~bzr-pqm/bzr/bzr.dev

6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1
# English (Australia) translation for bzr
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3
# This file is distributed under the same license as the bzr package.
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11
"PO-Revision-Date: 2012-07-20 14:35+0000\n"
12
"Last-Translator: Rafael Neri <Unknown>\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13
"Language-Team: English (Australia) <en_AU@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
18
"X-Launchpad-Export-Date: 2012-07-21 04:30+0000\n"
19
"X-Generator: Launchpad (build 15654)\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
20
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
21
#: bzrlib/add.py:93
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "skipping {0} (larger than {1} of {2} bytes)"
24
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
25
#: bzrlib/branch.py:854
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
26
msgid "Unstacking"
27
msgstr "Unstacking"
28
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
29
#: bzrlib/branch.py:2955
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Pushed up to revision %d."
33
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
34
#: bzrlib/branch.py:2957
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
38
msgstr[0] "%d tag updated."
39
msgstr[1] "%d tags updated."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
40
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
41
#: bzrlib/branch.py:2960
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
42
msgid "No new revisions or tags to push."
43
msgstr "No new revisions or tags to push."
44
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
45
#: bzrlib/branch.py:2962
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
46
msgid "No new revisions to push."
47
msgstr "No new revisions to push."
48
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
49
#: bzrlib/branch.py:2982
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
50
msgid "checked branch {0} format {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
51
msgstr "checked branch {0} format {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
52
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
53
#: bzrlib/branch.py:2985
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
54
#, python-format
55
msgid "found error:%s"
56
msgstr "found error:%s"
57
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignoring files outside view. View is %s"
62
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
63
#: bzrlib/builtins.py:260
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
68
#: bzrlib/builtins.py:315
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
69
msgid "Display status summary."
70
msgstr "Display status summary."
71
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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:"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
79
80
#: bzrlib/builtins.py:320
81
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
82
"added\n"
83
"    Versioned in the working copy but not in the previous revision."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
84
msgstr ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
85
"added\n"
86
"    Versioned in the working copy but not in the previous revision."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
87
88
#: bzrlib/builtins.py:323
89
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
133
134
#: bzrlib/builtins.py:341
135
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
140
msgstr ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
145
146
#: bzrlib/builtins.py:346
147
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
187
188
#: bzrlib/builtins.py:363
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
207
msgid "Use short status indicators."
208
msgstr "Use short status indicators."
209
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
210
#: bzrlib/builtins.py:377
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
211
msgid "Only show versioned files."
212
msgstr "Only show versioned files."
213
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
214
#: bzrlib/builtins.py:379
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
215
msgid "Don't show pending merges."
216
msgstr "Don't show pending merges."
217
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
218
#: bzrlib/builtins.py:382
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
219
msgid "Do not mark object type using indicator."
220
msgstr "Do not mark object type using indicator."
221
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
222
#: bzrlib/builtins.py:397
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
msgstr "bzr status --revision takes exactly one or two revision specifiers"
225
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
227
msgid "You can only supply one of revision_id or --revision"
228
msgstr "You can only supply one of revision_id or --revision"
229
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
231
msgid "You must supply either --revision or a revision_id"
232
msgstr "You must supply either --revision or a revision_id"
233
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
234
#: bzrlib/builtins.py:451
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
235
#, python-format
236
msgid "Repository %r does not support access to raw revision texts"
237
msgstr "Repository %r does not support access to raw revision texts"
238
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
239
#: bzrlib/builtins.py:462
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
240
msgid "The repository {0} contains no revision {1}."
241
msgstr "The repository {0} contains no revision {1}."
242
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
243
#: bzrlib/builtins.py:469
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
244
msgid "You cannot specify a NULL revision."
245
msgstr "You cannot specify a NULL revision."
246
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
247
#: bzrlib/builtins.py:561
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
248
msgid "Remove the working tree from a given branch/checkout."
249
msgstr "Remove the working tree from a given branch/checkout."
250
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
251
#: bzrlib/builtins.py:563
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
252
msgid ""
253
"Since a lightweight checkout is little more than a working tree\n"
254
"this will refuse to run against one."
255
msgstr ""
256
"Since a lightweight checkout is little more than a working tree\n"
257
"this will refuse to run against one."
258
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
259
#: bzrlib/builtins.py:566
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "To re-create the working tree, use \"bzr checkout\"."
262
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
263
#: bzrlib/builtins.py:572
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
264
msgid ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
msgstr ""
267
"Remove the working tree even if it has uncommitted or shelved changes."
268
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
269
#: bzrlib/builtins.py:586
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
270
msgid "No working tree to remove"
271
msgstr "No working tree to remove"
272
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
273
#: bzrlib/builtins.py:588
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
274
msgid "You cannot remove the working tree of a remote path"
275
msgstr "You cannot remove the working tree of a remote path"
276
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
277
#: bzrlib/builtins.py:597
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
278
msgid "You cannot remove the working tree from a lightweight checkout"
279
msgstr "You cannot remove the working tree from a lightweight checkout"
280
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
298
msgid "failed to reset the tree state{0}"
299
msgstr "failed to reset the tree state{0}"
300
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
301
#: bzrlib/builtins.py:656
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
302
msgid "Show current revision number."
303
msgstr "Show current revision number."
304
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
305
#: bzrlib/builtins.py:658
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
306
msgid "This is equal to the number of revisions on this branch."
307
msgstr "This is equal to the number of revisions on this branch."
308
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
309
#: bzrlib/builtins.py:671
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
310
msgid "--tree and --revision can not be used together"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
311
msgstr "--tree and --revision can not be used together"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
312
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
313
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
314
msgid "Tags can only be placed on a single revision, not on a range"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
315
msgstr "Tags can only be placed on a single revision, not on a range"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
316
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
317
#: bzrlib/builtins.py:712
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
318
msgid "Show revno of working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
319
msgstr "Show revno of working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
320
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
321
#: bzrlib/builtins.py:760
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
322
msgid "Add specified files or directories."
323
msgstr "Add specified files or directories."
324
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
325
#: bzrlib/builtins.py:762
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
326
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
355
"A warning will be printed when nested trees are encountered,\n"
356
"unless they are explicitly ignored."
357
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
358
"A warning will be printed when nested trees are encountered,\n"
359
"unless they are explicitly ignored."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
360
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
426
msgid "Don't recursively add the contents of directories."
427
msgstr "Don't recursively add the contents of directories."
428
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
429
#: bzrlib/builtins.py:813
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
430
msgid "Lookup file ids from this tree."
431
msgstr "Lookup file ids from this tree."
432
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
433
#: bzrlib/builtins.py:849
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
434
msgid "ignored {0} matching \"{1}\"\n"
435
msgstr "ignored {0} matching \"{1}\"\n"
436
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
437
#: bzrlib/builtins.py:854
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
438
msgid "Create a new versioned directory."
439
msgstr "Create a new versioned directory."
440
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
441
#: bzrlib/builtins.py:856
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
442
msgid "This is equivalent to creating the directory and then adding it."
443
msgstr "This is equivalent to creating the directory and then adding it."
444
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
445
#: bzrlib/builtins.py:863
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
446
msgid "No error if existing, make parent directories as needed."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
447
msgstr "No error if existing, make parent directories as needed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
448
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
449
#: bzrlib/builtins.py:897
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
450
#, python-format
451
msgid "added %s\n"
452
msgstr "added %s\n"
453
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
454
#: bzrlib/builtins.py:939
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
455
#, python-format
456
msgid "invalid kind %r specified"
457
msgstr "invalid kind %r specified"
458
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
459
#: bzrlib/builtins.py:976
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
460
msgid "Move or rename a file."
461
msgstr "Move or rename a file."
462
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
463
#: bzrlib/builtins.py:978
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
464
msgid "    bzr mv SOURCE... DESTINATION"
465
msgstr "    bzr mv SOURCE... DESTINATION"
466
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
492
msgid "Files cannot be moved between branches."
493
msgstr "Files cannot be moved between branches."
494
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
495
#: bzrlib/builtins.py:997
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
496
msgid ""
497
"Move only the bzr identifier of the file, because the file has already been "
498
"moved."
499
msgstr ""
500
"Move only the bzr identifier of the file, because the file has already been "
501
"moved."
502
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
503
#: bzrlib/builtins.py:999
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
504
msgid "Automatically guess renames."
505
msgstr "Automatically guess renames."
506
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
507
#: bzrlib/builtins.py:1000
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
508
msgid "Avoid making changes when guessing renames."
509
msgstr "Avoid making changes when guessing renames."
510
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
511
#: bzrlib/builtins.py:1009
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
512
msgid "--dry-run requires --auto."
513
msgstr "--dry-run requires --auto."
514
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
515
#: bzrlib/builtins.py:1013
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
516
msgid "missing file argument"
517
msgstr "missing file argument"
518
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
519
#: bzrlib/builtins.py:1017
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
520
msgid "can not move root of branch"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
521
msgstr "can not move root of branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
522
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
523
#: bzrlib/builtins.py:1023
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
524
msgid "Only one path may be specified to --auto."
525
msgstr "Only one path may be specified to --auto."
526
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
527
#: bzrlib/builtins.py:1026
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
528
msgid "--after cannot be specified with --auto."
529
msgstr "--after cannot be specified with --auto."
530
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
531
#: bzrlib/builtins.py:1062
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
532
msgid "to mv multiple files the destination must be a versioned directory"
533
msgstr "to mv multiple files the destination must be a versioned directory"
534
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
535
#: bzrlib/builtins.py:1114
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
536
msgid "Turn this branch into a mirror of another branch."
537
msgstr "Turn this branch into a mirror of another branch."
538
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
582
583
#: bzrlib/builtins.py:1134
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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>."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
592
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
593
#: bzrlib/builtins.py:1138
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
603
#: bzrlib/builtins.py:1146
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
604
msgid "Show logs of pulled revisions."
605
msgstr "Show logs of pulled revisions."
606
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
621
#: bzrlib/builtins.py:1189
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
622
msgid "Need working tree for --show-base."
623
msgstr "Need working tree for --show-base."
624
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
625
#: bzrlib/builtins.py:1205
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
626
msgid "No pull location known or specified."
627
msgstr "No pull location known or specified."
628
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
629
#: bzrlib/builtins.py:1211
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
630
#, python-format
631
msgid "Using saved parent location: %s\n"
632
msgstr "Using saved parent location: %s\n"
633
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
634
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
635
msgid "Cannot use -r with merge directives or bundles"
636
msgstr "Cannot use -r with merge directives or bundles"
637
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
638
#: bzrlib/builtins.py:1261
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
639
msgid "Update a mirror of this branch."
640
msgstr "Update a mirror of this branch."
641
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
642
#: bzrlib/builtins.py:1263
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
643
msgid ""
644
"The target branch will not have its working tree populated because this\n"
645
"is both expensive, and is not supported on remote file systems."
646
msgstr ""
647
"The target branch will not have its working tree populated because this\n"
648
"is both expensive and is not supported on remote file systems."
649
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
675
676
#: bzrlib/builtins.py:1276
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
677
msgid ""
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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>."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
707
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
739
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
740
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
741
msgid ""
742
"Refuse to push if there are uncommitted changes in the working tree, --no-"
743
"strict disables the check."
744
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
745
"Refuse to push if there are uncommitted changes in the working tree, --no-"
746
"strict disables the check."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
747
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
748
#: bzrlib/builtins.py:1315
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
749
msgid "Don't populate the working tree, even for protocols that support it."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
750
msgstr "Don't populate the working tree, even for protocols that support it."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
751
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
752
#: bzrlib/builtins.py:1318
753
msgid "Overwrite tags only."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
754
msgstr "Overwrite tags only."
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
755
756
#: bzrlib/builtins.py:1369
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
757
msgid "Could not determine branch to refer to."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
758
msgstr "Could not determine branch to refer to."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
759
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
760
#: bzrlib/builtins.py:1378
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
761
#, python-format
762
msgid ""
763
"No push location known or specified. To push to the parent branch (at %s), "
764
"use 'bzr push :parent'."
765
msgstr ""
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
766
"No push location known or specified. To push to the parent branch (at %s), "
767
"use 'bzr push :parent'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
768
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
769
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
770
msgid "No push location known or specified."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
771
msgstr "No push location known or specified."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
772
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
773
#: bzrlib/builtins.py:1388
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
774
#, python-format
775
msgid "Using saved push location: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
776
msgstr "Using saved push location: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
777
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
778
#: bzrlib/builtins.py:1398
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
779
msgid "Create a new branch that is a copy of an existing branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
780
msgstr "Create a new branch that is a copy of an existing branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
781
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
782
#: bzrlib/builtins.py:1400
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
799
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
800
#: bzrlib/builtins.py:1407
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
805
"To retrieve the branch as of a particular revision, supply the --revision\n"
806
"parameter, as in \"branch foo/bar -r 5\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
807
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
808
#: bzrlib/builtins.py:1410
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
809
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
810
msgstr "The synonyms 'clone' and 'get' for this command are deprecated."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
811
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
812
#: bzrlib/builtins.py:1420
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
813
msgid "Create a branch without a working-tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
814
msgstr "Create a branch without a working-tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
815
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
816
#: bzrlib/builtins.py:1422
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
817
msgid "Switch the checkout in the current directory to the new branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
818
msgstr "Switch the checkout in the current directory to the new branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
819
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
820
#: bzrlib/builtins.py:1425
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
821
msgid ""
822
"Create a stacked branch referring to the source branch. The new branch will "
823
"depend on the availability of the source branch for all operations."
824
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
827
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
828
#: bzrlib/builtins.py:1429
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
829
msgid "Do not use a shared repository, even if available."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
830
msgstr "Do not use a shared repository, even if available."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
831
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
832
#: bzrlib/builtins.py:1431
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
833
msgid ""
834
"By default branch will fail if the target directory exists, but does not "
835
"already have a control directory.  This flag will allow branch to proceed."
836
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
839
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
840
#: bzrlib/builtins.py:1436
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
841
msgid "Bind new branch to from location."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
842
msgstr "Bind new branch to from location."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
843
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
844
#: bzrlib/builtins.py:1483
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
845
#, python-format
846
msgid "Target directory \"%s\" already exists."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
847
msgstr "Target directory \"%s\" already exists."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
848
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
849
#: bzrlib/builtins.py:1495
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
850
#, python-format
851
msgid "Parent of \"%s\" does not exist."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
852
msgstr "Parent of \"%s\" does not exist."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
853
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
854
#: bzrlib/builtins.py:1514
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
855
msgid "The branch {0} has no revision {1}."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
856
msgstr "The branch {0} has no revision {1}."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
857
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
858
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
859
#, python-format
860
msgid "Created new stacked branch referring to %s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
861
msgstr "Created new stacked branch referring to %s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
862
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
863
#: bzrlib/builtins.py:1533
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
864
#, python-format
865
msgid "Branched %d revision."
866
msgid_plural "Branched %d revisions."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
867
msgstr[0] "Branched %d revision."
868
msgstr[1] "Branched %d revisions."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
869
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
870
#: bzrlib/builtins.py:1538
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
871
#, python-format
872
msgid "New branch bound to %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
873
msgstr "New branch bound to %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
874
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
875
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
876
#, python-format
877
msgid "Switched to branch: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
878
msgstr "Switched to branch: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
879
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
880
#: bzrlib/builtins.py:1548
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
881
msgid "List the branches available at the current location."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
882
msgstr "List the branches available at the current location."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
883
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
884
#: bzrlib/builtins.py:1550
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
885
msgid ""
886
"This command will print the names of all the branches at the current\n"
887
"location."
888
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
889
"This command will print the names of all the branches at the current\n"
890
"location."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
891
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
892
#: bzrlib/builtins.py:1557
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
893
msgid ""
894
"Recursively scan for branches rather than just looking in the specified "
895
"location."
896
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
897
"Recursively scan for branches rather than just looking in the specified "
898
"location."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
899
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
900
#: bzrlib/builtins.py:1586
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
901
msgid "(default)"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
902
msgstr "(default)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
903
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
904
#: bzrlib/builtins.py:1598
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
905
msgid "Create a new checkout of an existing branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
906
msgstr "Create a new checkout of an existing branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
907
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
908
#: bzrlib/builtins.py:1600
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
923
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
924
#: bzrlib/builtins.py:1605
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
943
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
944
#: bzrlib/builtins.py:1612
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
959
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
960
#: bzrlib/builtins.py:1622
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
971
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
972
#: bzrlib/builtins.py:1629
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
973
msgid "Get file contents from this tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
974
msgstr "Get file contents from this tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
975
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
976
#: bzrlib/builtins.py:1631
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
977
msgid "Hard-link working tree files where possible."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
978
msgstr "Hard-link working tree files where possible."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
979
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
980
#: bzrlib/builtins.py:1672
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
981
msgid ""
982
"Show list of renamed files.\n"
983
"    "
984
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
985
"Show list of renamed files.\n"
986
"    "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
987
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
988
#: bzrlib/builtins.py:1700
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
989
msgid "Update a working tree to a new revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
990
msgstr "Update a working tree to a new revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
991
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
992
#: bzrlib/builtins.py:1702
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.  "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1001
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1002
#: bzrlib/builtins.py:1706
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1009
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1010
#: bzrlib/builtins.py:1709
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1021
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1022
#: bzrlib/builtins.py:1714
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1027
"If the tree's branch is bound to a master branch, bzr will also update\n"
1028
"the branch from the master."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1029
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1030
#: bzrlib/builtins.py:1717
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1045
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1046
#: bzrlib/builtins.py:1724
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1055
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1056
#: bzrlib/builtins.py:1740
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1057
msgid "bzr update --revision takes exactly one revision"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1058
msgstr "bzr update --revision takes exactly one revision"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1059
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1060
#: bzrlib/builtins.py:1748
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1061
msgid "bzr update can only update a whole tree, not a file or subdirectory"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1062
msgstr "bzr update can only update a whole tree, not a file or subdirectory"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1063
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1064
#: bzrlib/builtins.py:1779
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1065
msgid "Tree is up to date at revision {0} of branch {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1066
msgstr "Tree is up to date at revision {0} of branch {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1067
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1068
#: bzrlib/builtins.py:1795
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1069
#, python-format
1070
msgid ""
1071
"branch has no revision %s\n"
1072
"bzr update --revision only works for a revision in the branch history"
1073
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1074
"branch has no revision %s\n"
1075
"bzr update --revision only works for a revision in the branch history"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1076
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1077
#: bzrlib/builtins.py:1801
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1078
msgid "Updated to revision {0} of branch {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1079
msgstr "Updated to revision {0} of branch {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1080
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1081
#: bzrlib/builtins.py:1805
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1082
msgid ""
1083
"Your local commits will now show as pending merges with 'bzr status', and "
1084
"can be committed with 'bzr commit'."
1085
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1086
"Your local commits will now show as pending merges with 'bzr status', and "
1087
"can be committed with 'bzr commit'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1088
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1089
#: bzrlib/builtins.py:1814
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1090
msgid "Show information about a working tree, branch or repository."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1091
msgstr "Show information about a working tree, branch or repository."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1092
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1093
#: bzrlib/builtins.py:1816
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1094
msgid ""
1095
"This command will show all known locations and formats associated to the\n"
1096
"tree, branch or repository."
1097
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1098
"This command will show all known locations and formats associated to the\n"
1099
"tree, branch or repository."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1100
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1101
#: bzrlib/builtins.py:1819
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1110
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1111
#: bzrlib/builtins.py:1823
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1112
msgid "Branches and working trees will also report any missing revisions."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1113
msgstr "Branches and working trees will also report any missing revisions."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1114
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1115
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1116
#: bzrlib/builtins.py:6466
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1117
msgid ":Examples:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1118
msgstr ":Examples:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1119
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1120
#: bzrlib/builtins.py:1827
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1121
msgid "  Display information on the format and related locations:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1122
msgstr "  Display information on the format and related locations:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1123
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1124
#: bzrlib/builtins.py:1829
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1125
msgid "    bzr info"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1126
msgstr "    bzr info"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1127
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1128
#: bzrlib/builtins.py:1831
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1129
msgid ""
1130
"  Display the above together with extended format information and\n"
1131
"  basic statistics (like the number of files in the working tree and\n"
1132
"  number of revisions in the branch and repository):"
1133
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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):"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1137
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1138
#: bzrlib/builtins.py:1835
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1139
msgid "    bzr info -v"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1140
msgstr "    bzr info -v"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1141
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1142
#: bzrlib/builtins.py:1837
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1143
msgid "  Display the above together with number of committers to the branch:"
1144
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1145
"  Display the above together with number of committers to the branch:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1146
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1147
#: bzrlib/builtins.py:1839
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1148
msgid "    bzr info -vv"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1149
msgstr "    bzr info -vv"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1150
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1151
#: bzrlib/builtins.py:1858
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1152
msgid "Remove files or directories."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1153
msgstr "Remove files or directories."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1154
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1155
#: bzrlib/builtins.py:1860
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1156
msgid ""
1157
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1158
"delete them if they can easily be recovered using revert otherwise they\n"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1159
"will be backed up (adding an extension of the form .~#~). If no options or\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1160
"parameters are given Bazaar will scan for files that are being tracked by\n"
1161
"Bazaar but missing in your tree and stop tracking them for you."
1162
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1168
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1169
#: bzrlib/builtins.py:1868
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1170
msgid "Only remove files that have never been committed."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1171
msgstr "Only remove files that have never been committed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1172
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1173
#: bzrlib/builtins.py:1870
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1174
msgid "The file deletion mode to be used."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1175
msgstr "The file deletion mode to be used."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1176
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1177
#: bzrlib/builtins.py:1871
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1178
msgid "Deletion Strategy"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1179
msgstr "Deletion Strategy"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1180
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1181
#: bzrlib/builtins.py:1872
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1182
msgid "Backup changed files (default)."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1183
msgstr "Backup changed files (default)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1184
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1185
#: bzrlib/builtins.py:1873
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1186
msgid "Delete from bzr but leave the working copy."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1187
msgstr "Delete from bzr but leave the working copy."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1188
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1189
#: bzrlib/builtins.py:1874
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1190
msgid "Don't backup changed files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1191
msgstr "Don't backup changed files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1192
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1193
#: bzrlib/builtins.py:1875
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1194
msgid ""
1195
"Delete all the specified files, even if they can not be recovered and even "
1196
"if they are non-empty directories. (deprecated, use no-backup)"
1197
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1200
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1201
#: bzrlib/builtins.py:1884
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1202
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1203
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1204
"(The --force option is deprecated, rather use --no-backup in future.)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1205
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1206
#: bzrlib/builtins.py:1901
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1207
msgid "No matching files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1208
msgstr "No matching files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1209
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1210
#: bzrlib/builtins.py:1962
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1211
msgid "Reconcile bzr metadata in a branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1212
msgstr "Reconcile bzr metadata in a branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1213
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1214
#: bzrlib/builtins.py:1964
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1225
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1226
#: bzrlib/builtins.py:1969
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1237
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1238
#: bzrlib/builtins.py:1974
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1245
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1246
#: bzrlib/builtins.py:1977
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1247
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1248
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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. "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1268
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1269
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1270
msgid "The 2a format with experimental support for colocated branches.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1271
msgstr "The 2a format with experimental support for collocated branches.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1272
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1273
#: bzrlib/builtins.py:2045
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1274
msgid "Make a directory into a versioned branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1275
msgstr "Make a directory into a versioned branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1276
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1277
#: bzrlib/builtins.py:2047
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1278
msgid ""
1279
"Use this to create an empty branch, or before importing an\n"
1280
"existing project."
1281
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1282
"Use this to create an empty branch, or before importing an\n"
1283
"existing project."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1284
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1285
#: bzrlib/builtins.py:2050
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1296
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1297
#: bzrlib/builtins.py:2055
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1304
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1305
#: bzrlib/builtins.py:2058
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1306
msgid "Recipe for importing a tree of files::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1307
msgstr "Recipe for importing a tree of files::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1308
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1309
#: bzrlib/builtins.py:2060
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1317
"    cd ~/project\n"
1318
"    bzr init\n"
1319
"    bzr add .\n"
1320
"    bzr status\n"
1321
"    bzr commit -m \"imported project\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1322
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1323
#: bzrlib/builtins.py:2071
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1324
msgid ""
1325
"Create the path leading up to the branch if it does not already exist."
1326
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1327
"Create the path leading up to the branch if it does not already exist."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1328
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1329
#: bzrlib/builtins.py:2074
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1330
msgid "Specify a format for this branch. See \"help formats\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1331
msgstr "Specify a format for this branch. See \"help formats\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1332
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1333
#: bzrlib/builtins.py:2082
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1334
msgid ""
1335
"Never change revnos or the existing log.  Append revisions to it only."
1336
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1337
"Never change revnos or the existing log.  Append revisions to it only."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1338
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1339
#: bzrlib/builtins.py:2085
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1340
msgid "Create a branch without a working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1341
msgstr "Create a branch without a working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1342
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1343
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1344
#, python-format
1345
msgid ""
1346
"Parent directory of %s does not exist.\n"
1347
"You may supply --create-prefix to create all leading parent directories."
1348
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1349
"Parent directory of %s does not exist.\n"
1350
"You may supply --create-prefix to create all leading parent directories."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1351
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1352
#: bzrlib/builtins.py:2139
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1353
msgid ""
1354
"This branch format cannot be set to append-revisions-only.  Try --default."
1355
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1356
"This branch format cannot be set to append-revisions-only.  Try --default."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1357
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1358
#: bzrlib/builtins.py:2150
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1359
msgid "Created a {0} (format: {1})\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1360
msgstr "Created a {0} (format: {1})\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1361
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1362
#: bzrlib/builtins.py:2159
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1363
#, python-format
1364
msgid "Using shared repository: %s\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1365
msgstr "Using shared repository: %s\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1366
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1367
#: bzrlib/builtins.py:2163
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1368
msgid "Create a shared repository for branches to share storage space."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1369
msgstr "Create a shared repository for branches to share storage space."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1370
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1371
#: bzrlib/builtins.py:2165
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1382
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1383
#: bzrlib/builtins.py:2170
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1398
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1399
#: bzrlib/builtins.py:2177
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1400
msgid ""
1401
":Examples:\n"
1402
"    Create a shared repository holding just branches::"
1403
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1404
":Examples:\n"
1405
"    Create a shared repository holding just branches::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1406
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1407
#: bzrlib/builtins.py:2180
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1408
msgid ""
1409
"        bzr init-repo --no-trees repo\n"
1410
"        bzr init repo/trunk"
1411
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1412
"        bzr init-repo --no-trees repo\n"
1413
"        bzr init repo/trunk"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1414
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1415
#: bzrlib/builtins.py:2183
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1416
msgid "    Make a lightweight checkout elsewhere::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1417
msgstr "    Make a lightweight checkout elsewhere::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1418
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1419
#: bzrlib/builtins.py:2185
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1420
msgid ""
1421
"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
1422
"        cd trunk-checkout\n"
1423
"        (add files here)"
1424
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1425
"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
1426
"        cd trunk-checkout\n"
1427
"        (add files here)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1428
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1429
#: bzrlib/builtins.py:2193
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1430
msgid ""
1431
"Specify a format for this repository. See \"bzr help formats\" for details."
1432
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1433
"Specify a format for this repository. See \"bzr help formats\" for details."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1434
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1435
#: bzrlib/builtins.py:2197
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1436
msgid "Repository format"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1437
msgstr "Repository format"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1438
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1439
#: bzrlib/builtins.py:2199
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1440
msgid "Branches in the repository will default to not having a working tree."
1441
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1442
"Branches in the repository will default to not having a working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1443
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1444
#: bzrlib/builtins.py:2225
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1445
msgid "Show differences in the working tree, between revisions or branches."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1446
msgstr "Show differences in the working tree, between revisions or branches."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1447
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1448
#: bzrlib/builtins.py:2227
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1463
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1464
#: bzrlib/builtins.py:2234
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1469
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1470
"produces patches suitable for \"patch -p1\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1471
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1472
#: bzrlib/builtins.py:2237
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1487
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1488
#: bzrlib/builtins.py:2244
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1496
":Exit values:\n"
1497
"    1 - changed\n"
1498
"    2 - unrepresentable changes\n"
1499
"    3 - error\n"
1500
"    0 - no change"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1501
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1502
#: bzrlib/builtins.py:2250
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1503
msgid ""
1504
":Examples:\n"
1505
"    Shows the difference in the working tree versus the last commit::"
1506
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1507
":Examples:\n"
1508
"    Shows the difference in the working tree versus the last commit::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1509
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1510
#: bzrlib/builtins.py:2253
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1511
msgid "        bzr diff"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1512
msgstr "        bzr diff"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1513
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1514
#: bzrlib/builtins.py:2255
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1515
msgid "    Difference between the working tree and revision 1::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1516
msgstr "    Difference between the working tree and revision 1::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1517
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1518
#: bzrlib/builtins.py:2257
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1519
msgid "        bzr diff -r1"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1520
msgstr "        bzr diff -r1"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1521
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1522
#: bzrlib/builtins.py:2259
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1523
msgid "    Difference between revision 3 and revision 1::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1524
msgstr "    Difference between revision 3 and revision 1::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1525
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1526
#: bzrlib/builtins.py:2261
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1527
msgid "        bzr diff -r1..3"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1528
msgstr "        bzr diff -r1..3"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1529
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1530
#: bzrlib/builtins.py:2263
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1531
msgid "    Difference between revision 3 and revision 1 for branch xxx::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1532
msgstr "    Difference between revision 3 and revision 1 for branch xxx::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1533
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1534
#: bzrlib/builtins.py:2265
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1535
msgid "        bzr diff -r1..3 xxx"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1536
msgstr "        bzr diff -r1..3 xxx"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1537
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1538
#: bzrlib/builtins.py:2267
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1539
msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1540
msgstr "    The changes introduced by revision 2 (equivalent to -r1..2)::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1541
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1542
#: bzrlib/builtins.py:2269
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1543
msgid "        bzr diff -c2"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1544
msgstr "        bzr diff -c2"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1545
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1546
#: bzrlib/builtins.py:2271
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1547
msgid ""
1548
"    To see the changes introduced by revision X::\n"
1549
"    \n"
1550
"        bzr diff -cX"
1551
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1552
"    To see the changes introduced by revision X::\n"
1553
"    \n"
1554
"        bzr diff -cX"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1555
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1556
#: bzrlib/builtins.py:2275
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1565
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1566
#: bzrlib/builtins.py:2279
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1567
msgid "        bzr diff -r<chosen_parent>..X"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1568
msgstr "        bzr diff -r<chosen_parent>..X"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1569
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1570
#: bzrlib/builtins.py:2281
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1571
msgid ""
1572
"    The changes between the current revision and the previous revision\n"
1573
"    (equivalent to -c-1 and -r-2..-1)"
1574
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1575
"    The changes between the current revision and the previous revision\n"
1576
"    (equivalent to -c-1 and -r-2..-1)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1577
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1578
#: bzrlib/builtins.py:2284
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1579
msgid "        bzr diff -r-2.."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1580
msgstr "        bzr diff -r-2.."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1581
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1582
#: bzrlib/builtins.py:2286
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1583
msgid "    Show just the differences for file NEWS::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1584
msgstr "    Show just the differences for file NEWS::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1585
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1586
#: bzrlib/builtins.py:2288
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1587
msgid "        bzr diff NEWS"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1588
msgstr "        bzr diff NEWS"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1589
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1590
#: bzrlib/builtins.py:2290
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1591
msgid "    Show the differences in working tree xxx for file NEWS::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1592
msgstr "    Show the differences in working tree xxx for file NEWS::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1593
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1594
#: bzrlib/builtins.py:2292
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1595
msgid "        bzr diff xxx/NEWS"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1596
msgstr "        bzr diff xxx/NEWS"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1597
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1598
#: bzrlib/builtins.py:2294
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1599
msgid "    Show the differences from branch xxx to this working tree:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1600
msgstr "    Show the differences from branch xxx to this working tree:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1601
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1602
#: bzrlib/builtins.py:2296
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1603
msgid "        bzr diff --old xxx"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1604
msgstr "        bzr diff --old xxx"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1605
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1606
#: bzrlib/builtins.py:2298
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1607
msgid "    Show the differences between two branches for file NEWS::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1608
msgstr "    Show the differences between two branches for file NEWS::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1609
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1610
#: bzrlib/builtins.py:2300
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1611
msgid "        bzr diff --old xxx --new yyy NEWS"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1612
msgstr "        bzr diff --old xxx --new yyy NEWS"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1613
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1614
#: bzrlib/builtins.py:2302
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1615
msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1616
msgstr "    Same as 'bzr diff' but prefix paths with old/ and new/::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1617
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1618
#: bzrlib/builtins.py:2304
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1619
msgid ""
1620
"        bzr diff --prefix old/:new/\n"
1621
"        \n"
1622
"    Show the differences using a custom diff program with options::\n"
1623
"    \n"
1624
"        bzr diff --using /usr/bin/diff --diff-options -wu"
1625
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1631
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1632
#: bzrlib/builtins.py:2314
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1633
msgid "Pass these options to the external diff program."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1634
msgstr "Pass these options to the external diff program."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1635
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1636
#: bzrlib/builtins.py:2317
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1637
msgid ""
1638
"Set prefixes added to old and new filenames, as two values separated by a "
1639
"colon. (eg \"old/:new/\")."
1640
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1641
"Set prefixes added to old and new filenames, as two values separated by a "
1642
"colon. (eg \"old/:new/\")."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1643
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1644
#: bzrlib/builtins.py:2320
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1645
msgid "Branch/tree to compare from."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1646
msgstr "Branch/tree to compare from."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1647
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1648
#: bzrlib/builtins.py:2324
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1649
msgid "Branch/tree to compare to."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1650
msgstr "Branch/tree to compare to."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1651
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1652
#: bzrlib/builtins.py:2330
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1653
msgid "Use this command to compare files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1654
msgstr "Use this command to compare files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1655
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1656
#: bzrlib/builtins.py:2335
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1657
msgid "Diff format to use."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1658
msgstr "Diff format to use."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1659
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1660
#: bzrlib/builtins.py:2337
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1661
msgid "Diff format"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1662
msgstr "Diff format"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1663
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1664
#: bzrlib/builtins.py:2359
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1665
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1666
msgstr "--prefix expects two values separated by a colon (eg \"old/:new/\")"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1667
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1668
#: bzrlib/builtins.py:2363
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1669
msgid "bzr diff --revision takes exactly one or two revision specifiers"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1670
msgstr "bzr diff --revision takes exactly one or two revision specifiers"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1671
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1672
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1673
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1674
msgid "{0} and {1} are mutually exclusive"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1675
msgstr "{0} and {1} are mutually exclusive"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1676
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1677
#: bzrlib/builtins.py:2388
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1678
msgid ""
1679
"List files deleted in the working tree.\n"
1680
"    "
1681
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1682
"List files deleted in the working tree.\n"
1683
"    "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1684
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1685
#: bzrlib/builtins.py:2465
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1686
msgid "Show the tree root directory."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1687
msgstr "Show the tree root directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1688
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1689
#: bzrlib/builtins.py:2467
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1690
msgid ""
1691
"The root is the nearest enclosing directory with a .bzr control\n"
1692
"directory."
1693
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1694
"The root is the nearest enclosing directory with a .bzr control\n"
1695
"directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1696
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1697
#: bzrlib/builtins.py:2482
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1698
msgid "The limit argument must be an integer."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1699
msgstr "The limit argument must be an integer."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1700
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1701
#: bzrlib/builtins.py:2490
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1702
msgid "The levels argument must be an integer."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1703
msgstr "The levels argument must be an integer."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1704
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1705
#: bzrlib/builtins.py:2495
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1706
msgid "Show historical log for a branch or subset of a branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1707
msgstr "Show historical log for a branch or subset of a branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1708
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1709
#: bzrlib/builtins.py:2497
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1720
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1721
#: bzrlib/builtins.py:2502
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1730
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1731
#: bzrlib/builtins.py:2506
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1746
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1747
#: bzrlib/builtins.py:2513
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1748
msgid ":Output control:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1749
msgstr ":Output control:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1750
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1751
#: bzrlib/builtins.py:2515
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1762
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1763
#: bzrlib/builtins.py:2520
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1764
msgid ""
1765
"  The following options can be used to control what information is\n"
1766
"  displayed::"
1767
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1768
"  The following options can be used to control what information is\n"
1769
"  displayed::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1770
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1771
#: bzrlib/builtins.py:2523
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1784
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1785
#: bzrlib/builtins.py:2529
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1794
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1795
#: bzrlib/builtins.py:2533
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1804
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1805
#: bzrlib/builtins.py:2537
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1806
msgid ":Ordering control:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1807
msgstr ":Ordering control:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1808
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1809
#: bzrlib/builtins.py:2539
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1810
msgid ""
1811
"  To display revisions from oldest to newest, use the --forward option.\n"
1812
"  In most cases, using this option will have little impact on the total\n"
1813
"  time taken to produce a log, though --forward does not incrementally\n"
1814
"  display revisions like --reverse does when it can."
1815
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1820
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1821
#: bzrlib/builtins.py:2544
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1822
msgid ":Revision filtering:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1823
msgstr ":Revision filtering:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1824
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1825
#: bzrlib/builtins.py:2546
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1832
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1833
#: bzrlib/builtins.py:2549
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1844
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1845
#: bzrlib/builtins.py:2554
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1850
"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1851
"  Some common examples are given below::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1852
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1853
#: bzrlib/builtins.py:2557
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1868
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1869
#: bzrlib/builtins.py:2564
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1884
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1885
#: bzrlib/builtins.py:2571
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1886
msgid ":Path filtering:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1887
msgstr ":Path filtering:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1888
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1889
#: bzrlib/builtins.py:2573
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1898
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1899
#: bzrlib/builtins.py:2577
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1908
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1909
#: bzrlib/builtins.py:2581
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1910
msgid ""
1911
"  Historical context is also important when interpreting pathnames of\n"
1912
"  renamed files/directories. Consider the following example:"
1913
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1914
"  Historical context is also important when interpreting pathnames of\n"
1915
"  renamed files/directories. Consider the following example:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1916
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1917
#: bzrlib/builtins.py:2584
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1926
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1927
#: bzrlib/builtins.py:2588
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1928
msgid "  In this case:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1929
msgstr "  In this case:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1930
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1931
#: bzrlib/builtins.py:2590
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1932
msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1933
msgstr "  * ``bzr log guide.txt`` will log the file added in revision 1"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1934
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1935
#: bzrlib/builtins.py:2592
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1936
msgid ""
1937
"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1938
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1939
"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1940
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1941
#: bzrlib/builtins.py:2594
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1946
"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1947
"    the original file in revision 2."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1948
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1949
#: bzrlib/builtins.py:2597
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1956
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1957
#: bzrlib/builtins.py:2600
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1966
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1967
#: bzrlib/builtins.py:2604
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1968
msgid ":Other filtering:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1969
msgstr ":Other filtering:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1970
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1971
#: bzrlib/builtins.py:2606
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1972
msgid ""
1973
"  The --match option can be used for finding revisions that match a\n"
1974
"  regular expression in a commit message, committer, author or bug.\n"
1975
"  Specifying the option several times will match any of the supplied\n"
1976
"  expressions. --match-author, --match-bugs, --match-committer and\n"
1977
"  --match-message can be used to only match a specific field."
1978
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1984
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1985
#: bzrlib/builtins.py:2612
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1986
msgid ":Tips & tricks:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1987
msgstr ":Tips & tricks:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1988
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
1989
#: bzrlib/builtins.py:2614
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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>.  "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2002
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2003
#: bzrlib/builtins.py:2620
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2004
msgid ""
2005
"  You may find it useful to add the aliases below to ``bazaar.conf``::"
2006
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2007
"  You may find it useful to add the aliases below to ``bazaar.conf``::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2008
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2009
#: bzrlib/builtins.py:2622
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2010
msgid ""
2011
"    [ALIASES]\n"
2012
"    tip = log -r-1\n"
2013
"    top = log -l10 --line\n"
2014
"    show = log -v -p"
2015
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2016
"    [ALIASES]\n"
2017
"    tip = log -r-1\n"
2018
"    top = log -l10 --line\n"
2019
"    show = log -v -p"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2020
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2021
#: bzrlib/builtins.py:2627
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2030
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2031
#: bzrlib/builtins.py:2631
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2032
msgid ""
2033
"  If you are interested in looking deeper into a particular merge X,\n"
2034
"  use ``bzr log -n0 -rX``."
2035
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2036
"  If you are interested in looking deeper into a particular merge X,\n"
2037
"  use ``bzr log -n0 -rX``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2038
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2039
#: bzrlib/builtins.py:2634
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2050
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2051
#: bzrlib/builtins.py:2639
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2062
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2063
#: bzrlib/builtins.py:2644
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2074
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2075
#: bzrlib/builtins.py:2653
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2076
msgid "Show from oldest to newest."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2077
msgstr "Show from oldest to newest."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2078
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2079
#: bzrlib/builtins.py:2656
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2080
msgid "Show files changed in each revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2081
msgstr "Show files changed in each revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2082
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2083
#: bzrlib/builtins.py:2662
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2084
msgid "Show just the specified revision. See also \"help revisionspec\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2085
msgstr "Show just the specified revision. See also \"help revisionspec\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2086
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2087
#: bzrlib/builtins.py:2666
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2088
msgid "What names to list as authors - first, all or committer."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2089
msgstr "What names to list as authors - first, all or committer."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2090
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2091
#: bzrlib/builtins.py:2667
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2092
msgid "Authors"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2093
msgstr "Authors"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2094
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2095
#: bzrlib/builtins.py:2672
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2096
msgid "Number of levels to display - 0 for all, 1 for flat."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2097
msgstr "Number of levels to display - 0 for all, 1 for flat."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2098
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2099
#: bzrlib/builtins.py:2682
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2100
msgid "Limit the output to the first N revisions."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2101
msgstr "Limit the output to the first N revisions."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2102
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2103
#: bzrlib/builtins.py:2687
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2104
msgid "Show changes made in each revision as a patch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2105
msgstr "Show changes made in each revision as a patch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2106
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2107
#: bzrlib/builtins.py:2689
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2108
msgid "Show merged revisions like --levels 0 does."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2109
msgstr "Show merged revisions like --levels 0 does."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2110
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2111
#: bzrlib/builtins.py:2693
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2112
msgid "Do not report commits with more than one parent."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2113
msgstr "Do not report commits with more than one parent."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2114
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2115
#: bzrlib/builtins.py:2695
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2116
msgid ""
2117
"Display only the revisions that are not part of both ancestries (require -"
2118
"rX..Y)."
2119
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2120
"Display only the revisions that are not part of both ancestries (require -"
2121
"rX..Y)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2122
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2123
#: bzrlib/builtins.py:2699
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2124
msgid "Show digital signature validity."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2125
msgstr "Show digital signature validity."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2126
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2127
#: bzrlib/builtins.py:2702
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2128
msgid "Show revisions whose properties match this expression."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2129
msgstr "Show revisions whose properties match this expression."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2130
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2131
#: bzrlib/builtins.py:2706
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2132
msgid "Show revisions whose message matches this expression."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2133
msgstr "Show revisions whose message matches this expression."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2134
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2135
#: bzrlib/builtins.py:2710
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2136
msgid "Show revisions whose committer matches this expression."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2137
msgstr "Show revisions whose committer matches this expression."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2138
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2139
#: bzrlib/builtins.py:2714
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2140
msgid "Show revisions whose authors match this expression."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2141
msgstr "Show revisions whose authors match this expression."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2142
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2143
#: bzrlib/builtins.py:2718
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2144
msgid "Show revisions whose bugs match this expression."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2145
msgstr "Show revisions whose bugs match this expression."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2146
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2147
#: bzrlib/builtins.py:2772
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2148
msgid "--exclude-common-ancestry requires -r with two revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2149
msgstr "--exclude-common-ancestry requires -r with two revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2150
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2151
#: bzrlib/builtins.py:2800
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2152
#, python-format
2153
msgid "Path unknown at end or start of revision range: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2154
msgstr "Path unknown at end or start of revision range: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2155
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2156
#: bzrlib/builtins.py:2917
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2157
#, python-format
2158
msgid "bzr %s doesn't accept two revisions in different branches."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2159
msgstr "bzr %s doesn't accept two revisions in different branches."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2160
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2161
#: bzrlib/builtins.py:2933
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2162
#, python-format
2163
msgid "bzr %s --revision takes one or two values."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2164
msgstr "bzr %s --revision takes one or two values."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2165
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2166
#: bzrlib/builtins.py:2978
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2167
msgid ""
2168
"List files in a tree.\n"
2169
"    "
2170
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2171
"List files in a tree.\n"
2172
"    "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2173
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2174
#: bzrlib/builtins.py:2987
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2175
msgid "Recurse into subdirectories."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2176
msgstr "Recurse into subdirectories."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2177
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2178
#: bzrlib/builtins.py:2989
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2179
msgid "Print paths relative to the root of the branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2180
msgstr "Print paths relative to the root of the branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2181
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2182
#: bzrlib/builtins.py:2991
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2183
msgid "Print unknown files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2184
msgstr "Print unknown files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2185
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2186
#: bzrlib/builtins.py:2992
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2187
msgid "Print versioned files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2188
msgstr "Print versioned files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2189
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2190
#: bzrlib/builtins.py:2995
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2191
msgid "Print ignored files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2192
msgstr "Print ignored files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2193
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2194
#: bzrlib/builtins.py:2997
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2195
msgid "List entries of a particular kind: file, directory, symlink."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2196
msgstr "List entries of a particular kind: file, directory, symlink."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2197
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2198
#: bzrlib/builtins.py:3010
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2199
msgid "invalid kind specified"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2200
msgstr "invalid kind specified"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2201
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2202
#: bzrlib/builtins.py:3013
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2203
msgid "Cannot set both --verbose and --null"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2204
msgstr "Cannot set both --verbose and --null"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2205
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2206
#: bzrlib/builtins.py:3022
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2207
msgid "cannot specify both --from-root and PATH"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2208
msgstr "cannot specify both --from-root and PATH"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2209
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2210
#: bzrlib/builtins.py:3109
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2211
msgid "Ignore specified files or patterns."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2212
msgstr "Ignore specified files or patterns."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2213
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2214
#: bzrlib/builtins.py:3111
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2215
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2216
msgstr "See ``bzr help patterns`` for details on the syntax of patterns."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2217
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2218
#: bzrlib/builtins.py:3113
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2219
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2231
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2232
#: bzrlib/builtins.py:3119
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2243
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2244
#: bzrlib/builtins.py:3124
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2257
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2258
#: bzrlib/builtins.py:3130
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2267
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2268
#: bzrlib/builtins.py:3134
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2269
msgid ""
2270
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2271
"precedence over the '!' exception patterns."
2272
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2273
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2274
"precedence over the '!' exception patterns."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2275
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2276
#: bzrlib/builtins.py:3137
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2283
":Notes: \n"
2284
"    \n"
2285
"* Ignore patterns containing shell wildcards must be quoted from\n"
2286
"  the shell on Unix."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2287
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2288
#: bzrlib/builtins.py:3142
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2295
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2296
#: bzrlib/builtins.py:3145
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2297
msgid ""
2298
":Examples:\n"
2299
"    Ignore the top level Makefile::"
2300
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2301
":Examples:\n"
2302
"    Ignore the top level Makefile::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2303
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2304
#: bzrlib/builtins.py:3148
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2305
msgid "        bzr ignore ./Makefile"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2306
msgstr "        bzr ignore ./Makefile"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2307
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2308
#: bzrlib/builtins.py:3150
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2309
msgid "    Ignore .class files in all directories...::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2310
msgstr "    Ignore .class files in all directories...::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2311
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2312
#: bzrlib/builtins.py:3152
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2313
msgid "        bzr ignore \"*.class\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2314
msgstr "        bzr ignore \"*.class\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2315
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2316
#: bzrlib/builtins.py:3154
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2317
msgid "    ...but do not ignore \"special.class\"::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2318
msgstr "    ...but do not ignore \"special.class\"::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2319
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2320
#: bzrlib/builtins.py:3156
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2321
msgid "        bzr ignore \"!special.class\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2322
msgstr "        bzr ignore \"!special.class\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2323
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2324
#: bzrlib/builtins.py:3158
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2325
msgid "    Ignore files whose name begins with the \"#\" character::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2326
msgstr "    Ignore files whose name begins with the \"#\" character::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2327
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2328
#: bzrlib/builtins.py:3160
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2329
msgid "        bzr ignore \"RE:^#\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2330
msgstr "        bzr ignore \"RE:^#\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2331
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2332
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2333
msgid "    Ignore .o files under the lib directory::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2334
msgstr "    Ignore .o files under the lib directory::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2335
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2336
#: bzrlib/builtins.py:3164
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2337
msgid "        bzr ignore \"lib/**/*.o\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2338
msgstr "        bzr ignore \"lib/**/*.o\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2339
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2340
#: bzrlib/builtins.py:3168
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2341
msgid "        bzr ignore \"RE:lib/.*\\.o\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2342
msgstr "        bzr ignore \"RE:lib/.*\\.o\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2343
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2344
#: bzrlib/builtins.py:3170
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2345
msgid "    Ignore everything but the \"debian\" toplevel directory::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2346
msgstr "    Ignore everything but the \"debian\" top-level directory::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2347
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2348
#: bzrlib/builtins.py:3172
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2349
msgid ""
2350
"        bzr ignore \"RE:(?!debian/).*\"\n"
2351
"    \n"
2352
"    Ignore everything except the \"local\" toplevel directory,\n"
2353
"    but always ignore autosave files ending in ~, even under local/::\n"
2354
"    \n"
2355
"        bzr ignore \"*\"\n"
2356
"        bzr ignore \"!./local\"\n"
2357
"        bzr ignore \"!!*~\""
2358
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 \"!!*~\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2367
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2368
#: bzrlib/builtins.py:3186
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2369
msgid "Display the default ignore rules that bzr uses."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2370
msgstr "Display the default ignore rules that bzr uses."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2371
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2372
#: bzrlib/builtins.py:3198
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2373
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2374
msgstr "ignore requires at least one NAME_PATTERN or --default-rules."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2375
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2376
#: bzrlib/builtins.py:3209
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2377
#, python-format
2378
msgid "Invalid ignore pattern found. %s"
2379
msgid_plural "Invalid ignore patterns found. %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2380
msgstr[0] "Invalid ignore pattern found. %s"
2381
msgstr[1] "Invalid ignore patterns found. %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2382
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2383
#: bzrlib/builtins.py:3218
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2384
msgid "NAME_PATTERN should not be an absolute path"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2385
msgstr "NAME_PATTERN should not be an absolute path"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2386
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2387
#: bzrlib/builtins.py:3231
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2388
#, python-format
2389
msgid ""
2390
"Warning: the following files are version controlled and match your ignore "
2391
"pattern:\n"
2392
"%s\n"
2393
"These files will continue to be version controlled unless you 'bzr remove' "
2394
"them.\n"
2395
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2401
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2402
#: bzrlib/builtins.py:3238
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2403
msgid "List ignored files and the patterns that matched them."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2404
msgstr "List ignored files and the patterns that matched them."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2405
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2406
#: bzrlib/builtins.py:3240
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2407
msgid ""
2408
"List all the ignored files and the ignore pattern that caused the file to\n"
2409
"be ignored."
2410
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2411
"List all the ignored files and the ignore pattern that caused the file to\n"
2412
"be ignored."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2413
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2414
#: bzrlib/builtins.py:3243
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2415
msgid "Alternatively, to list just the files::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2416
msgstr "Alternatively, to list just the files::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2417
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2418
#: bzrlib/builtins.py:3245
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2419
msgid "    bzr ls --ignored"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2420
msgstr "    bzr ls --ignored"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2421
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2422
#: bzrlib/builtins.py:3279
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2423
#, python-format
2424
msgid "not a valid revision-number: %r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2425
msgstr "not a valid revision-number: %r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2426
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2427
#: bzrlib/builtins.py:3286
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2428
msgid ""
2429
"Export current or past revision to a destination directory or archive."
2430
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2431
"Export current or past revision to a destination directory or archive."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2432
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2433
#: bzrlib/builtins.py:3288
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2434
msgid "If no revision is specified this exports the last committed revision."
2435
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2436
"If no revision is specified this exports the last committed revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2437
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2438
#: bzrlib/builtins.py:3290
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2447
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2448
#: bzrlib/builtins.py:3294
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2457
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2458
#: bzrlib/builtins.py:3298
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2459
msgid ""
2460
"If branch is omitted then the branch containing the current working\n"
2461
"directory will be used."
2462
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2463
"If branch is omitted then the branch containing the current working\n"
2464
"directory will be used."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2465
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2466
#: bzrlib/builtins.py:3301
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2467
msgid ""
2468
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2469
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2470
"Note: Export of tree with non-ASCII filenames to zip is not supported."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2471
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2472
#: bzrlib/builtins.py:3303
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
"  =================       ========================="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2493
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2494
#: bzrlib/builtins.py:3317
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2495
msgid "Type of file to export to."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2496
msgstr "Type of file to export to."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2497
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2498
#: bzrlib/builtins.py:3320
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2499
msgid "Apply content filters to export the convenient form."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2500
msgstr "Apply content filters to export the convenient form."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2501
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2502
#: bzrlib/builtins.py:3324
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2503
msgid "Name of the root directory inside the exported file."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2504
msgstr "Name of the root directory inside the exported file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2505
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2506
#: bzrlib/builtins.py:3326
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2507
msgid ""
2508
"Set modification time of files to that of the last revision in which it was "
2509
"changed."
2510
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2511
"Set modification time of files to that of the last revision in which it was "
2512
"changed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2513
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2514
#: bzrlib/builtins.py:3329
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2515
msgid ""
2516
"Export the working tree contents rather than that of the last revision."
2517
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2518
"Export the working tree contents rather than that of the last revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2519
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2520
#: bzrlib/builtins.py:3348
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2521
msgid "--uncommitted requires a working tree"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2522
msgstr "--uncommitted requires a working tree"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2523
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2524
#: bzrlib/builtins.py:3357
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2525
#, python-format
2526
msgid "Unsupported export format: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2527
msgstr "Unsupported export format: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2528
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2529
#: bzrlib/builtins.py:3361
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2530
msgid ""
2531
"Write the contents of a file as of a given revision to standard output."
2532
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2533
"Write the contents of a file as of a given revision to standard output."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2534
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2535
#: bzrlib/builtins.py:3363
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2536
msgid "If no revision is nominated, the last revision is used."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2537
msgstr "If no revision is nominated, the last revision is used."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2538
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2539
#: bzrlib/builtins.py:3365
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2540
msgid ""
2541
"Note: Take care to redirect standard output when using this command on a\n"
2542
"binary file."
2543
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2544
"Note: Take care to redirect standard output when using this command on a\n"
2545
"binary file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2546
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2547
#: bzrlib/builtins.py:3371
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2548
msgid "The path name in the old tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2549
msgstr "The path name in the old tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2550
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2551
#: bzrlib/builtins.py:3372
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2552
msgid "Apply content filters to display the convenience form."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2553
msgstr "Apply content filters to display the convenience form."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2554
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2555
#: bzrlib/builtins.py:3383
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2556
msgid "bzr cat --revision takes exactly one revision specifier"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2557
msgstr "bzr cat --revision takes exactly one revision specifier"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2558
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2559
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2560
msgid "{0!r} is not present in revision {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2561
msgstr "{0!r} is not present in revision {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2562
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2563
#: bzrlib/builtins.py:3443
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2564
msgid "Commit changes into a new revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2565
msgstr "Commit changes into a new revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2566
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2567
#: bzrlib/builtins.py:3445
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2582
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2583
#: bzrlib/builtins.py:3452
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2592
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2593
#: bzrlib/builtins.py:3456
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2594
msgid ":Selective commits:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2595
msgstr ":Selective commits:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2596
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2597
#: bzrlib/builtins.py:3458
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2606
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2607
#: bzrlib/builtins.py:3462
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2616
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2617
#: bzrlib/builtins.py:3466
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2618
msgid "    bzr commit foo -x foo/bar"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2619
msgstr "    bzr commit foo -x foo/bar"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2620
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2621
#: bzrlib/builtins.py:3468
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2622
msgid "  A selective commit after a merge is not yet supported."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2623
msgstr "  A selective commit after a merge is not yet supported."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2624
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2625
#: bzrlib/builtins.py:3470
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2626
msgid ":Custom authors:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2627
msgstr ":Custom authors:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2628
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2629
#: bzrlib/builtins.py:3472
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2630
msgid ""
2631
"  If the author of the change is not the same person as the committer,\n"
2632
"  you can specify the author's name using the --author option. The\n"
2633
"  name should be in the same format as a committer-id, e.g.\n"
2634
"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2635
"  the change you can specify the option multiple times, once for each\n"
2636
"  author."
2637
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2644
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2645
#: bzrlib/builtins.py:3479
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2646
msgid ":Checks:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2647
msgstr ":Checks:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2648
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2649
#: bzrlib/builtins.py:3481
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2650
msgid ""
2651
"  A common mistake is to forget to add a new file or directory before\n"
2652
"  running the commit command. The --strict option checks for unknown\n"
2653
"  files and aborts the commit if any are found. More advanced pre-commit\n"
2654
"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2655
"  for details."
2656
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2662
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2663
#: bzrlib/builtins.py:3487
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2664
msgid ":Things to note:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2665
msgstr ":Things to note:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2666
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2667
#: bzrlib/builtins.py:3489
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2668
msgid ""
2669
"  If you accidentially commit the wrong changes or make a spelling\n"
2670
"  mistake in the commit message say, you can use the uncommit command\n"
2671
"  to undo it. See ``bzr help uncommit`` for details."
2672
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2676
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2677
#: bzrlib/builtins.py:3493
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2678
msgid ""
2679
"  Hooks can also be configured to run after a commit. This allows you\n"
2680
"  to trigger updates to external systems like bug trackers. The --fixes\n"
2681
"  option can be used to record the association between a revision and\n"
2682
"  one or more bugs. See ``bzr help bugs`` for details."
2683
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2688
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2689
#: bzrlib/builtins.py:3503
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2690
msgid "Do not consider changes made to a given path."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2691
msgstr "Do not consider changes made to a given path."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2692
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2693
#: bzrlib/builtins.py:3506
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2694
msgid "Description of the new revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2695
msgstr "Description of the new revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2696
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2697
#: bzrlib/builtins.py:3509
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2698
msgid "Commit even if nothing has changed."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2699
msgstr "Commit even if nothing has changed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2700
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2701
#: bzrlib/builtins.py:3513
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2702
msgid "Take commit message from this file."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2703
msgstr "Take commit message from this file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2704
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2705
#: bzrlib/builtins.py:3515
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2706
msgid "Refuse to commit if there are unknown files in the working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2707
msgstr "Refuse to commit if there are unknown files in the working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2708
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2709
#: bzrlib/builtins.py:3518
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2710
msgid ""
2711
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2712
"08:00:00 +0100'."
2713
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2714
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2715
"08:00:00 +0100'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2716
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2717
#: bzrlib/builtins.py:3521
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2718
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2719
msgstr "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2720
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2721
#: bzrlib/builtins.py:3524
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2722
msgid "Set the author's name, if it's different from the committer."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2723
msgstr "Set the author's name, if it's different from the committer."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2724
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2725
#: bzrlib/builtins.py:3527
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2732
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2733
#: bzrlib/builtins.py:3533
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2734
msgid ""
2735
"When no message is supplied, show the diff along with the status summary in "
2736
"the message editor."
2737
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2738
"When no message is supplied, show the diff along with the status summary in "
2739
"the message editor."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2740
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2741
#: bzrlib/builtins.py:3536
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2742
msgid ""
2743
"When committing to a foreign version control system do not push data that "
2744
"can not be natively represented."
2745
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2746
"When committing to a foreign version control system do not push data that "
2747
"can not be natively represented."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2748
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2749
#: bzrlib/builtins.py:3554
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2759
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2760
#: bzrlib/builtins.py:3563
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2770
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2771
#: bzrlib/builtins.py:3572
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2772
#, python-format
2773
msgid "Unrecognized bug %s. Commit refused."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2774
msgstr "Unrecognised bug %s. Commit refused."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2775
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2776
#: bzrlib/builtins.py:3575
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2777
#, python-format
2778
msgid ""
2779
"%s\n"
2780
"Commit refused."
2781
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2782
"%s\n"
2783
"Commit refused."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2784
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2785
#: bzrlib/builtins.py:3599
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2786
msgid "Could not parse --commit-time: "
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2787
msgstr "Could not parse --commit-time: "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2788
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2789
#: bzrlib/builtins.py:3639
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2790
msgid "please specify either --message or --file"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2791
msgstr "please specify either --message or --file"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2792
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2793
#: bzrlib/builtins.py:3668
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2794
msgid "please specify a commit message with either --message or --file"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2795
msgstr "please specify a commit message with either --message or --file"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2796
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2797
#: bzrlib/builtins.py:3671
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2802
"Empty commit message specified. Please specify a commit message with either -"
2803
"-message or --file or leave a blank message with --message \"\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2804
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2805
#: bzrlib/builtins.py:3691
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2810
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2811
"-unchanged to force an empty commit."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2812
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2813
#: bzrlib/builtins.py:3695
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2814
msgid ""
2815
"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
2816
"resolve FILE\" to resolve."
2817
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2818
"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
2819
"resolve FILE\" to resolve."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2820
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2821
#: bzrlib/builtins.py:3699
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2822
msgid "Commit refused because there are unknown files in the working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2823
msgstr "Commit refused because there are unknown files in the working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2824
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2825
#: bzrlib/builtins.py:3702
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2826
msgid ""
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."
2830
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2834
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2835
#: bzrlib/builtins.py:3710
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2836
msgid ""
2837
"Validate working tree structure, branch consistency and repository history."
2838
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2839
"Validate working tree structure, branch consistency and repository history."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2840
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2841
#: bzrlib/builtins.py:3712
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2842
msgid ""
2843
"This command checks various invariants about branch and repository storage\n"
2844
"to detect data corruption or bzr bugs."
2845
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2846
"This command checks various invariants about branch and repository storage\n"
2847
"to detect data corruption or bzr bugs."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2848
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2849
#: bzrlib/builtins.py:3715
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2856
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2857
#: bzrlib/builtins.py:3718
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2858
msgid ""
2859
"revisions\n"
2860
"    This is just the number of revisions checked.  It doesn't\n"
2861
"    indicate a problem."
2862
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2863
"revisions\n"
2864
"    This is just the number of revisions checked.  It doesn't\n"
2865
"    indicate a problem."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2866
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2867
#: bzrlib/builtins.py:3722
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2868
msgid ""
2869
"versionedfiles\n"
2870
"    This is just the number of versionedfiles checked.  It\n"
2871
"    doesn't indicate a problem."
2872
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2873
"versionedfiles\n"
2874
"    This is just the number of versionedfiles checked.  It\n"
2875
"    doesn't indicate a problem."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2876
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2877
#: bzrlib/builtins.py:3726
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2888
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2889
#: bzrlib/builtins.py:3731
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2898
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2899
#: bzrlib/builtins.py:3735
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2912
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2913
#: bzrlib/builtins.py:3741
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2919
"If no restrictions are specified, all Bazaar data that is found at the "
2920
"given\n"
2921
"location will be checked."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2922
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2923
#: bzrlib/builtins.py:3746
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2924
msgid "    Check the tree and branch at 'foo'::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2925
msgstr "    Check the tree and branch at 'foo'::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2926
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2927
#: bzrlib/builtins.py:3748
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2928
msgid "        bzr check --tree --branch foo"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2929
msgstr "        bzr check --tree --branch foo"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2930
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2931
#: bzrlib/builtins.py:3750
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2932
msgid "    Check only the repository at 'bar'::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2933
msgstr "    Check only the repository at 'bar'::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2934
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2935
#: bzrlib/builtins.py:3752
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2936
msgid "        bzr check --repo bar"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2937
msgstr "        bzr check --repo bar"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2938
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2939
#: bzrlib/builtins.py:3754
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2940
msgid "    Check everything at 'baz'::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2941
msgstr "    Check everything at 'baz'::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2942
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2943
#: bzrlib/builtins.py:3756
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2944
msgid "        bzr check baz"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2945
msgstr "        bzr check baz"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2946
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2947
#: bzrlib/builtins.py:3762
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2948
msgid "Check the branch related to the current directory."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2949
msgstr "Check the branch related to the current directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2950
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2951
#: bzrlib/builtins.py:3764
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2952
msgid "Check the repository related to the current directory."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2953
msgstr "Check the repository related to the current directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2954
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2955
#: bzrlib/builtins.py:3766
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2956
msgid "Check the working tree related to the current directory."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2957
msgstr "Check the working tree related to the current directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2958
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2959
#: bzrlib/builtins.py:3780
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2960
msgid "Upgrade a repository, branch or working tree to a newer format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2961
msgstr "Upgrade a repository, branch or working tree to a newer format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2962
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2963
#: bzrlib/builtins.py:3782
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2976
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2977
#: bzrlib/builtins.py:3788
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2992
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
2993
#: bzrlib/builtins.py:3795
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3010
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3011
#: bzrlib/builtins.py:3803
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3022
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3023
#: bzrlib/builtins.py:3808
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3028
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3029
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3030
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3031
#: bzrlib/builtins.py:3816
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3032
msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3033
msgstr "Upgrade to a specific format.  See \"bzr help formats\" for details."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3034
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3035
#: bzrlib/builtins.py:3820
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3036
msgid "Branch format"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3037
msgstr "Branch format"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3038
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3039
#: bzrlib/builtins.py:3822
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3040
msgid "Remove the backup.bzr directory if successful."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3041
msgstr "Remove the backup.bzr directory if successful."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3042
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3043
#: bzrlib/builtins.py:3824
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3044
msgid "Show what would be done, but don't actually do anything."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3045
msgstr "Show what would be done, but don't actually do anything."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3046
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3047
#: bzrlib/builtins.py:3839
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3048
msgid "Show or set bzr user id."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3049
msgstr "Show or set bzr user id."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3050
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3051
#: bzrlib/builtins.py:3841
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3052
msgid ""
3053
":Examples:\n"
3054
"    Show the email of the current user::"
3055
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3056
":Examples:\n"
3057
"    Show the email of the current user::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3058
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3059
#: bzrlib/builtins.py:3844
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3060
msgid "        bzr whoami --email"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3061
msgstr "        bzr whoami --email"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3062
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3063
#: bzrlib/builtins.py:3846
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3064
msgid "    Set the current user::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3065
msgstr "    Set the current user::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3066
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3067
#: bzrlib/builtins.py:3848
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3068
msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3069
msgstr "        bzr whoami \"Frank Chu <fchu@example.com>\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3070
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3071
#: bzrlib/builtins.py:3852
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3072
msgid "Display email address only."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3073
msgstr "Display email address only."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3074
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3075
#: bzrlib/builtins.py:3854
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3076
msgid "Set identity for the current branch instead of globally."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3077
msgstr "Set identity for the current branch instead of globally."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3078
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3079
#: bzrlib/builtins.py:3880
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3080
msgid "--email can only be used to display existing identity"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3081
msgstr "--email can only be used to display existing identity"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3082
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3083
#: bzrlib/builtins.py:3904
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3084
msgid "Print or set the branch nickname."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3085
msgstr "Print or set the branch nickname."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3086
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3087
#: bzrlib/builtins.py:3906
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3088
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3092
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3096
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3097
#: bzrlib/builtins.py:3910
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3098
msgid ""
3099
"Bound branches use the nickname of its master branch unless it is set\n"
3100
"locally."
3101
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3102
"Bound branches use the nickname of its master branch unless it is set\n"
3103
"locally."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3104
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3105
#: bzrlib/builtins.py:3930
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3106
msgid "Set/unset and display aliases."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3107
msgstr "Set/unset and display aliases."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3108
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3109
#: bzrlib/builtins.py:3932
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3110
msgid ""
3111
":Examples:\n"
3112
"    Show the current aliases::"
3113
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3114
":Examples:\n"
3115
"    Show the current aliases::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3116
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3117
#: bzrlib/builtins.py:3935
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3118
msgid "        bzr alias"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3119
msgstr "        bzr alias"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3120
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3121
#: bzrlib/builtins.py:3937
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3122
msgid "    Show the alias specified for 'll'::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3123
msgstr "    Show the alias specified for 'll'::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3124
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3125
#: bzrlib/builtins.py:3939
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3126
msgid "        bzr alias ll"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3127
msgstr "        bzr alias ll"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3128
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3129
#: bzrlib/builtins.py:3941
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3130
msgid "    Set an alias for 'll'::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3131
msgstr "    Set an alias for 'll'::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3132
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3133
#: bzrlib/builtins.py:3943
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3134
msgid "        bzr alias ll=\"log --line -r-10..-1\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3135
msgstr "        bzr alias ll=\"log --line -r-10..-1\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3136
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3137
#: bzrlib/builtins.py:3945
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3138
msgid "    To remove an alias for 'll'::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3139
msgstr "    To remove an alias for 'll'::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3140
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3141
#: bzrlib/builtins.py:3947
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3142
msgid "        bzr alias --remove ll"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3143
msgstr "        bzr alias --remove ll"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3144
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3145
#: bzrlib/builtins.py:3952
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3146
msgid "Remove the alias."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3147
msgstr "Remove the alias."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3148
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3149
#: bzrlib/builtins.py:3970
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3150
msgid "bzr alias --remove expects an alias to remove."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3151
msgstr "bzr alias --remove expects an alias to remove."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3152
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3153
#: bzrlib/builtins.py:4151
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3154
msgid ""
3155
"subunit not available. subunit needs to be installed to use --subunit."
3156
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3157
"subunit not available. subunit needs to be installed to use --subunit."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3158
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3159
#: bzrlib/builtins.py:4168
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3160
msgid ""
3161
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3162
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3163
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3164
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3165
#: bzrlib/builtins.py:4215
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3166
msgid "Show version of bzr."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3167
msgstr "Show version of bzr."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3168
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3169
#: bzrlib/builtins.py:4219
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3170
msgid "Print just the version number."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3171
msgstr "Print just the version number."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3172
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3173
#: bzrlib/builtins.py:4238
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3174
msgid "It sure does!\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3175
msgstr "It sure does!\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3176
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3177
#: bzrlib/builtins.py:4262
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3178
#, python-format
3179
msgid "merge base is revision %s\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3180
msgstr "merge base is revision %s\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3181
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3182
#: bzrlib/builtins.py:4266
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3183
msgid "Perform a three-way merge."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3184
msgstr "Perform a three-way merge."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3185
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3186
#: bzrlib/builtins.py:4268
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3187
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3203
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3204
#: bzrlib/builtins.py:4276
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3213
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3214
#: bzrlib/builtins.py:4280
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3221
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3222
#: bzrlib/builtins.py:4283
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3223
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3239
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3240
#: bzrlib/builtins.py:4291
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3241
msgid "Revision numbers are always relative to the source branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3242
msgstr "Revision numbers are always relative to the source branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3243
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3244
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3249
"before you can commit."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3250
msgstr ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3255
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3256
#: bzrlib/builtins.py:4298
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3257
msgid ""
3258
"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
3259
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3260
"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3261
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3262
#: bzrlib/builtins.py:4300
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3273
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3274
#: bzrlib/builtins.py:4305
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3283
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3284
#: bzrlib/builtins.py:4309
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3297
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3298
#: bzrlib/builtins.py:4315
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3307
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3308
#: bzrlib/builtins.py:4319
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3315
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3316
#: bzrlib/builtins.py:4322
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3317
msgid ""
3318
":Examples:\n"
3319
"    To merge all new revisions from bzr.dev::"
3320
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3321
":Examples:\n"
3322
"    To merge all new revisions from bzr.dev::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3323
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3324
#: bzrlib/builtins.py:4325
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3325
msgid "        bzr merge ../bzr.dev"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3326
msgstr "        bzr merge ../bzr.dev"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3327
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3328
#: bzrlib/builtins.py:4327
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3329
msgid "    To merge changes up to and including revision 82 from bzr.dev::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3330
msgstr "    To merge changes up to and including revision 82 from bzr.dev::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3331
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3332
#: bzrlib/builtins.py:4329
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3333
msgid "        bzr merge -r 82 ../bzr.dev"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3334
msgstr "        bzr merge -r 82 ../bzr.dev"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3335
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3336
#: bzrlib/builtins.py:4331
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3337
msgid "    To merge the changes introduced by 82, without previous changes::"
3338
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3339
"    To merge the changes introduced by 82, without previous changes::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3340
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3341
#: bzrlib/builtins.py:4333
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3342
msgid "        bzr merge -r 81..82 ../bzr.dev"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3343
msgstr "        bzr merge -r 81..82 ../bzr.dev"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3344
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3345
#: bzrlib/builtins.py:4335
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3346
msgid "    To apply a merge directive contained in /tmp/merge::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3347
msgstr "    To apply a merge directive contained in /tmp/merge::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3348
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3349
#: bzrlib/builtins.py:4337
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3350
msgid "        bzr merge /tmp/merge"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3351
msgstr "        bzr merge /tmp/merge"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3352
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3353
#: bzrlib/builtins.py:4339
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3354
msgid ""
3355
"    To create a merge revision with three parents from two branches\n"
3356
"    feature1a and feature1b:"
3357
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3358
"    To create a merge revision with three parents from two branches\n"
3359
"    feature1a and feature1b:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3360
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3361
#: bzrlib/builtins.py:4342
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3362
msgid ""
3363
"        bzr merge ../feature1a\n"
3364
"        bzr merge ../feature1b --force\n"
3365
"        bzr commit -m 'revision with three parents'"
3366
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3367
"        bzr merge ../feature1a\n"
3368
"        bzr merge ../feature1b --force\n"
3369
"        bzr commit -m 'revision with three parents'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3370
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3371
#: bzrlib/builtins.py:4354
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3372
msgid "Merge even if the destination tree has uncommitted changes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3373
msgstr "Merge even if the destination tree has uncommitted changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3374
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3375
#: bzrlib/builtins.py:4360
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3376
msgid ""
3377
"Apply uncommitted changes from a working copy, instead of branch changes."
3378
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3379
"Apply uncommitted changes from a working copy, instead of branch changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3380
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3381
#: bzrlib/builtins.py:4362
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3390
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3391
#: bzrlib/builtins.py:4367
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3392
msgid ""
3393
"Branch to merge into, rather than the one containing the working directory."
3394
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3395
"Branch to merge into, rather than the one containing the working directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3396
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3397
#: bzrlib/builtins.py:4369
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3398
msgid "Instead of merging, show a diff of the merge."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3399
msgstr "Instead of merging, show a diff of the merge."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3400
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3401
#: bzrlib/builtins.py:4371
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3402
msgid "Select changes interactively."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3403
msgstr "Select changes interactively."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3404
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3405
#: bzrlib/builtins.py:4393
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3406
msgid ""
3407
"Merging into empty branches not currently supported, "
3408
"https://bugs.launchpad.net/bzr/+bug/308562"
3409
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3410
"Merging into empty branches not currently supported, "
3411
"https://bugs.launchpad.net/bzr/+bug/308562"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3412
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3413
#: bzrlib/builtins.py:4420
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3414
msgid "Cannot use --uncommitted with bundles or merge directives."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3415
msgstr "Cannot use --uncommitted with bundles or merge directives."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3416
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3417
#: bzrlib/builtins.py:4431
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3418
msgid "Cannot use --uncommitted and --revision at the same time."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3419
msgstr "Cannot use --uncommitted and --revision at the same time."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3420
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3421
#: bzrlib/builtins.py:4451
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3422
msgid "merger: "
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3423
msgstr "merger: "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3424
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3425
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3426
msgid "Nothing to do."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3427
msgstr "Nothing to do."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3428
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3429
#: bzrlib/builtins.py:4457
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3430
msgid "Cannot pull individual files"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3431
msgstr "Cannot pull individual files"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3432
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3433
#: bzrlib/builtins.py:4465
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3434
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3435
msgstr "This branch has no commits. (perhaps you would prefer 'bzr pull')"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3436
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3437
#: bzrlib/builtins.py:4523
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3438
#, python-format
3439
msgid "Show-base is not supported for this merge type. %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3440
msgstr "Show-base is not supported for this merge type. %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3441
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3442
#: bzrlib/builtins.py:4532
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3443
#, python-format
3444
msgid "Conflict reduction is not supported for merge type %s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3445
msgstr "Conflict reduction is not supported for merge type %s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3446
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3447
#: bzrlib/builtins.py:4536
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3448
msgid "Cannot do conflict reduction and show base."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3449
msgstr "Cannot do conflict reduction and show base."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3450
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3451
#: bzrlib/builtins.py:4647
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3452
msgid "No location specified or remembered"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3453
msgstr "No location specified or remembered"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3454
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3455
#: bzrlib/builtins.py:4649
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3456
msgid "{0} remembered {1} location {2}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3457
msgstr "{0} remembered {1} location {2}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3458
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3459
#: bzrlib/builtins.py:4655
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3460
msgid "Redo a merge."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3461
msgstr "Redo a merge."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3462
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3463
#: bzrlib/builtins.py:4657
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3464
msgid ""
3465
"Use this if you want to try a different merge technique while resolving\n"
3466
"conflicts.  Some merge techniques are better than others, and remerge\n"
3467
"lets you try different ones on different files."
3468
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3472
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3473
#: bzrlib/builtins.py:4661
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3474
msgid ""
3475
"The options for remerge have the same meaning and defaults as the ones for\n"
3476
"merge.  The difference is that remerge can (only) be run when there is a\n"
3477
"pending merge, and it lets you specify particular files."
3478
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3482
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3483
#: bzrlib/builtins.py:4665
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3484
msgid ""
3485
":Examples:\n"
3486
"    Re-do the merge of all conflicted files, and show the base text in\n"
3487
"    conflict regions, in addition to the usual THIS and OTHER texts::"
3488
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3492
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3493
#: bzrlib/builtins.py:4669
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3494
msgid "        bzr remerge --show-base"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3495
msgstr "        bzr remerge --show-base"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3496
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3497
#: bzrlib/builtins.py:4671
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3498
msgid ""
3499
"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3500
"    additional processing to reduce the size of conflict regions::"
3501
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3502
"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3503
"    additional processing to reduce the size of conflict regions::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3504
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3505
#: bzrlib/builtins.py:4674
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3506
msgid "        bzr remerge --merge-type weave --reprocess foobar"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3507
msgstr "        bzr remerge --merge-type weave --reprocess foobar"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3508
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3509
#: bzrlib/builtins.py:4681
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3510
msgid "Show base revision text in conflicts."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3511
msgstr "Show base revision text in conflicts."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3512
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3513
#: bzrlib/builtins.py:4693
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3514
msgid ""
3515
"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
3516
"merges."
3517
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3518
"Sorry, re-merge only works after normal merges.  Not cherrypicking or multi-"
3519
"merges."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3520
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3521
#: bzrlib/builtins.py:4751
3522
msgid ""
3523
"Set files in the working tree back to the contents of a previous revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3524
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3525
"Set files in the working tree back to the contents of a previous revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3526
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3527
#: bzrlib/builtins.py:4753
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3534
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3540
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3541
#: bzrlib/builtins.py:4759
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3551
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3560
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3561
#: bzrlib/builtins.py:4768
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3562
msgid ""
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3567
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3572
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3573
#: bzrlib/builtins.py:4773
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3584
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3585
#: bzrlib/builtins.py:4778
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3596
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3597
#: bzrlib/builtins.py:4783
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3616
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3617
#: bzrlib/builtins.py:4792
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3640
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3641
#: bzrlib/builtins.py:4806
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3642
msgid "Do not save backups of reverted files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3643
msgstr "Do not save backups of reverted files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3644
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3645
#: bzrlib/builtins.py:4808
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3646
msgid "Remove pending merge marker, without changing any files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3647
msgstr "Remove pending merge marker, without changing any files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3648
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3649
#: bzrlib/builtins.py:4839
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3650
msgid ""
3651
"Show help on a command or other topic.\n"
3652
"    "
3653
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3654
"Show help on a command or other topic.\n"
3655
"    "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3656
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3657
#: bzrlib/builtins.py:4844
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3658
msgid "Show help on all commands."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3659
msgstr "Show help on all commands."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3660
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3661
#: bzrlib/builtins.py:4873
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3662
msgid "Show unmerged/unpulled revisions between two branches."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3663
msgstr "Show unmerged/unpulled revisions between two branches."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3664
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3665
#: bzrlib/builtins.py:4875
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3666
msgid "OTHER_BRANCH may be local or remote."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3667
msgstr "OTHER_BRANCH may be local or remote."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3668
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3669
#: bzrlib/builtins.py:4877
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3686
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3687
#: bzrlib/builtins.py:4887
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3688
msgid ""
3689
"    Determine the missing revisions between this and the branch at the\n"
3690
"    remembered pull location::"
3691
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3692
"    Determine the missing revisions between this and the branch at the\n"
3693
"    remembered pull location::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3694
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3695
#: bzrlib/builtins.py:4890
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3696
msgid "        bzr missing"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3697
msgstr "        bzr missing"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3698
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3699
#: bzrlib/builtins.py:4892
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3700
msgid "    Determine the missing revisions between this and another branch::"
3701
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3702
"    Determine the missing revisions between this and another branch::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3703
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3704
#: bzrlib/builtins.py:4894
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3705
msgid "        bzr missing http://server/branch"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3706
msgstr "        bzr missing http://server/branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3707
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3708
#: bzrlib/builtins.py:4896
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3709
msgid ""
3710
"    Determine the missing revisions up to a specific revision on the other\n"
3711
"    branch::"
3712
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3713
"    Determine the missing revisions up to a specific revision on the other\n"
3714
"    branch::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3715
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3716
#: bzrlib/builtins.py:4899
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3717
msgid "        bzr missing -r ..-10"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3718
msgstr "        bzr missing -r ..-10"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3719
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3720
#: bzrlib/builtins.py:4901
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3721
msgid ""
3722
"    Determine the missing revisions up to a specific revision on this\n"
3723
"    branch::"
3724
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3725
"    Determine the missing revisions up to a specific revision on this\n"
3726
"    branch::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3727
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3728
#: bzrlib/builtins.py:4904
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3729
msgid "        bzr missing --my-revision ..-10"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3730
msgstr "        bzr missing --my-revision ..-10"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3731
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3732
#: bzrlib/builtins.py:4911
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3733
msgid "Reverse the order of revisions."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3734
msgstr "Reverse the order of revisions."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3735
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3736
#: bzrlib/builtins.py:4913
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3737
msgid "Display changes in the local branch only."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3738
msgstr "Display changes in the local branch only."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3739
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3740
#: bzrlib/builtins.py:4914
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3741
msgid "Same as --mine-only."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3742
msgstr "Same as --mine-only."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3743
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3744
#: bzrlib/builtins.py:4916
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3745
msgid "Display changes in the remote branch only."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3746
msgstr "Display changes in the remote branch only."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3747
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3748
#: bzrlib/builtins.py:4917
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3749
msgid "Same as --theirs-only."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3750
msgstr "Same as --theirs-only."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3751
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3752
#: bzrlib/builtins.py:4922
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3753
msgid ""
3754
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3755
"details."
3756
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3757
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3758
"details."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3759
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3760
#: bzrlib/builtins.py:4926
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3761
msgid ""
3762
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3763
"details."
3764
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3765
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3766
"details."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3767
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3768
#: bzrlib/builtins.py:4929
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3769
msgid "Show all revisions in addition to the mainline ones."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3770
msgstr "Show all revisions in addition to the mainline ones."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3771
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3772
#: bzrlib/builtins.py:4983
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3773
msgid "No peer location known or specified."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3774
msgstr "No peer location known or specified."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3775
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3776
#: bzrlib/builtins.py:4987
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3777
msgid "Using saved parent location: {0}\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3778
msgstr "Using saved parent location: {0}\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3779
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3780
#: bzrlib/builtins.py:5020
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3781
#, python-format
3782
msgid "You have %d extra revision:\n"
3783
msgid_plural "You have %d extra revisions:\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3784
msgstr[0] "You have %d extra revision:\n"
3785
msgstr[1] "You have %d extra revisions:\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3786
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3787
#: bzrlib/builtins.py:5040
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3788
#, python-format
3789
msgid "You are missing %d revision:\n"
3790
msgid_plural "You are missing %d revisions:\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3791
msgstr[0] "You are missing %d revision:\n"
3792
msgstr[1] "You are missing %d revisions:\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3793
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3794
#: bzrlib/builtins.py:5055
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3795
msgid "This branch has no new revisions.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3796
msgstr "This branch has no new revisions.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3797
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3798
#: bzrlib/builtins.py:5058
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3799
msgid "Other branch has no new revisions.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3800
msgstr "Other branch has no new revisions.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3801
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3802
#: bzrlib/builtins.py:5063
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3803
msgid "Branches are up to date.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3804
msgstr "Branches are up to date.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3805
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3806
#: bzrlib/builtins.py:5074
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3807
msgid "Compress the data within a repository."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3808
msgstr "Compress the data within a repository."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3809
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3810
#: bzrlib/builtins.py:5076
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3819
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3820
#: bzrlib/builtins.py:5080
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3833
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3834
#: bzrlib/builtins.py:5086
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3845
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3846
#: bzrlib/builtins.py:5095
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3847
msgid "Delete obsolete packs to save disk space."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3848
msgstr "Delete obsolete packs to save disk space."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3849
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3850
#: bzrlib/builtins.py:5109
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3851
msgid "List the installed plugins."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3852
msgstr "List the installed plugins."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3853
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3854
#: bzrlib/builtins.py:5111
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3855
msgid ""
3856
"This command displays the list of installed plugins including\n"
3857
"version of plugin and a short description of each."
3858
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3859
"This command displays the list of installed plugins including\n"
3860
"version of plugin and a short description of each."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3861
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3862
#: bzrlib/builtins.py:5114
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3863
msgid "--verbose shows the path where each plugin is located."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3864
msgstr "--verbose shows the path where each plugin is located."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3865
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3866
#: bzrlib/builtins.py:5116
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3867
msgid ""
3868
"A plugin is an external component for Bazaar that extends the\n"
3869
"revision control system, by adding or replacing code in Bazaar.\n"
3870
"Plugins can do a variety of things, including overriding commands,\n"
3871
"adding new commands, providing additional network transports and\n"
3872
"customizing log output."
3873
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3879
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3880
#: bzrlib/builtins.py:5122
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3881
msgid ""
3882
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3883
"for further information on plugins including where to find them and how to\n"
3884
"install them. Instructions are also provided there on how to write new\n"
3885
"plugins using the Python programming language."
3886
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3891
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3892
#: bzrlib/builtins.py:5138
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3893
msgid "Show testament (signing-form) of a revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3894
msgstr "Show testament (signing-form) of a revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3895
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3896
#: bzrlib/builtins.py:5141
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3897
msgid "Produce long-format testament."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3898
msgstr "Produce long-format testament."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3899
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3900
#: bzrlib/builtins.py:5143
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3901
msgid "Produce a strict-format testament."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3902
msgstr "Produce a strict-format testament."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3903
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3904
#: bzrlib/builtins.py:5169
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3905
msgid "Show the origin of each line in a file."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3906
msgstr "Show the origin of each line in a file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3907
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3908
#: bzrlib/builtins.py:5171
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3915
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3916
#: bzrlib/builtins.py:5174
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3923
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3924
#: bzrlib/builtins.py:5182
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3925
msgid "Show annotations on all lines."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3926
msgstr "Show annotations on all lines."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3927
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3928
#: bzrlib/builtins.py:5183
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3929
msgid "Show commit date in annotations."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3930
msgstr "Show commit date in annotations."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3931
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3932
#: bzrlib/builtins.py:5270
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3933
msgid "Cannot sign a range of non-revision-history revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3934
msgstr "Cannot sign a range of non-revision-history revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3935
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3936
#: bzrlib/builtins.py:5282
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3937
msgid "Please supply either one revision, or a range."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3938
msgstr "Please supply either one revision, or a range."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3939
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3940
#: bzrlib/builtins.py:5286
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3947
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3948
#: bzrlib/builtins.py:5289
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3953
"Once converted into a checkout, commits must succeed on the master branch\n"
3954
"before they will be applied to the local branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3955
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3956
#: bzrlib/builtins.py:5292
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3965
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3966
#: bzrlib/builtins.py:5307
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3967
msgid "No location supplied.  This format does not remember old locations."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3968
msgstr "No location supplied.  This format does not remember old locations."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3969
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3970
#: bzrlib/builtins.py:5313
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3971
msgid "Branch is already bound"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3972
msgstr "Branch is already bound"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3973
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3974
#: bzrlib/builtins.py:5316
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3975
msgid "No location supplied and no previous location known"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3976
msgstr "No location supplied and no previous location known"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3977
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3978
#: bzrlib/builtins.py:5322
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3979
msgid "These branches have diverged. Try merging, and then bind again."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3980
msgstr "These branches have diverged. Try merging, and then bind again."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3981
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3982
#: bzrlib/builtins.py:5329
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3983
msgid "Convert the current checkout into a regular branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3984
msgstr "Convert the current checkout into a regular branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3985
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3986
#: bzrlib/builtins.py:5331
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3987
msgid ""
3988
"After unbinding, the local branch is considered independent and subsequent\n"
3989
"commits will be local only."
3990
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3991
"After unbinding, the local branch is considered independent and subsequent\n"
3992
"commits will be local only."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3993
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3994
#: bzrlib/builtins.py:5342
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3995
msgid "Local branch is not bound"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3996
msgstr "Local branch is not bound"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3997
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3998
#: bzrlib/builtins.py:5346
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
3999
msgid "Remove the last committed revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4000
msgstr "Remove the last committed revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4001
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4002
#: bzrlib/builtins.py:5348
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4011
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4012
#: bzrlib/builtins.py:5352
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4021
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4022
#: bzrlib/builtins.py:5356
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4031
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4032
#: bzrlib/builtins.py:5367
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4033
msgid "Don't actually make changes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4034
msgstr "Don't actually make changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4035
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4036
#: bzrlib/builtins.py:5368
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4037
msgid "Say yes to all questions."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4038
msgstr "Say yes to all questions."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4039
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4040
#: bzrlib/builtins.py:5370
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4041
msgid "Keep tags that point to removed revisions."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4042
msgstr "Keep tags that point to removed revisions."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4043
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4044
#: bzrlib/builtins.py:5372
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4045
msgid "Only remove the commits from the local branch when in a checkout."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4046
msgstr "Only remove the commits from the local branch when in a checkout."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4047
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4048
#: bzrlib/builtins.py:5421
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4049
msgid "No revisions to uncommit.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4050
msgstr "No revisions to uncommit.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4051
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4052
#: bzrlib/builtins.py:5436
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4053
msgid "Dry-run, pretending to remove the above revisions.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4054
msgstr "Dry-run, pretending to remove the above revisions.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4055
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4056
#: bzrlib/builtins.py:5439
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4057
msgid "The above revision(s) will be removed.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4058
msgstr "The above revision(s) will be removed.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4059
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4060
#: bzrlib/builtins.py:5443
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4061
msgid "Uncommit these revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4062
msgstr "Uncommit these revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4063
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4064
#: bzrlib/builtins.py:5446
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4065
msgid "Canceled\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4066
msgstr "Cancelled\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4067
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4068
#: bzrlib/builtins.py:5453
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4069
#, python-format
4070
msgid ""
4071
"You can restore the old tip by running:\n"
4072
"  bzr pull . -r revid:%s\n"
4073
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4074
"You can restore the old tip by running:\n"
4075
"  bzr pull . -r revid:%s\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4076
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4077
#: bzrlib/builtins.py:5458
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4078
msgid "Break a dead lock."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4079
msgstr "Break a dead lock."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4080
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4081
#: bzrlib/builtins.py:5460
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4082
msgid ""
4083
"This command breaks a lock on a repository, branch, working directory or\n"
4084
"config file."
4085
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4086
"This command breaks a lock on a repository, branch, working directory or\n"
4087
"config file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4088
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4089
#: bzrlib/builtins.py:5463
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4094
"CAUTION: Locks should only be broken when you are sure that the process\n"
4095
"holding the lock has been stopped."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4096
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4097
#: bzrlib/builtins.py:5466
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4098
msgid ""
4099
"You can get information on what locks are open via the 'bzr info\n"
4100
"[location]' command."
4101
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4102
"You can get information on what locks are open via the 'bzr info\n"
4103
"[location]' command."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4104
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4105
#: bzrlib/builtins.py:5469
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4116
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4117
#: bzrlib/builtins.py:5478
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4118
msgid "LOCATION is the directory where the config lock is."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4119
msgstr "LOCATION is the directory where the config lock is."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4120
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4121
#: bzrlib/builtins.py:5480
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4122
msgid "Do not ask for confirmation before breaking the lock."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4123
msgstr "Do not ask for confirmation before breaking the lock."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4124
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4125
#: bzrlib/builtins.py:5515
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4126
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4127
msgstr "The Bazaar smart server protocol over TCP. (default port: 4155)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4128
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4129
#: bzrlib/builtins.py:5516
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4130
msgid "Run the bzr server."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4131
msgstr "Run the bzr server."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4132
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4133
#: bzrlib/builtins.py:5522
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4134
msgid "Serve on stdin/out for use from inetd or sshd."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4135
msgstr "Serve on stdin/out for use from inetd or sshd."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4136
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4137
#: bzrlib/builtins.py:5523
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4138
msgid "protocol"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4139
msgstr "protocol"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4140
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4141
#: bzrlib/builtins.py:5524
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4142
msgid "Protocol to serve."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4143
msgstr "Protocol to serve."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4144
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4145
#: bzrlib/builtins.py:5528
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4146
msgid "Listen for connections on nominated address."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4147
msgstr "Listen for connections on nominated address."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4148
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4149
#: bzrlib/builtins.py:5530
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4150
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4154
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4158
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4159
#: bzrlib/builtins.py:5535
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4160
msgid "Serve contents of this directory."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4161
msgstr "Serve contents of this directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4162
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4163
#: bzrlib/builtins.py:5537
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4164
msgid ""
4165
"By default the server is a readonly server.  Supplying --allow-writes "
4166
"enables write access to the contents of the served directory and below.  "
4167
"Note that ``bzr serve`` does not perform authentication, so unless some form "
4168
"of external authentication is arranged supplying this option leads to global "
4169
"uncontrolled write access to your file system."
4170
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4176
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4177
#: bzrlib/builtins.py:5546
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4178
msgid "Override the default idle client timeout (5min)."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4179
msgstr "Override the default idle client timeout (5min)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4180
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4181
#: bzrlib/builtins.py:5564
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4182
msgid "Combine a tree into its containing tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4183
msgstr "Combine a tree into its containing tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4184
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4185
#: bzrlib/builtins.py:5566
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4186
msgid "This command requires the target tree to be in a rich-root format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4187
msgstr "This command requires the target tree to be in a rich-root format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4188
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4189
#: bzrlib/builtins.py:5568
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4198
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4199
#: bzrlib/builtins.py:5572
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4208
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4209
#: bzrlib/builtins.py:5590
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4210
#, python-format
4211
msgid ""
4212
"Can't join trees because %s doesn't support rich root data.\n"
4213
"You can use bzr upgrade on the repository."
4214
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4215
"Can't join trees because %s doesn't support rich root data.\n"
4216
"You can use bzr upgrade on the repository."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4217
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4218
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4219
msgid "Cannot join {0}.  {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4220
msgstr "Cannot join {0}.  {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4221
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4222
#: bzrlib/builtins.py:5610
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4223
msgid "Split a subdirectory of a tree into a separate tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4224
msgstr "Split a subdirectory of a tree into a separate tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4225
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4226
#: bzrlib/builtins.py:5612
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4235
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4236
#: bzrlib/builtins.py:5616
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4245
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4246
#: bzrlib/builtins.py:5696
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4247
msgid "No submit branch specified or known"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4248
msgstr "No submit branch specified or known"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4249
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4250
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4251
msgid "No public branch specified or known"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4252
msgstr "No public branch specified or known"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4253
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4254
#: bzrlib/builtins.py:5710
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4255
msgid "bzr merge-directive takes at most two one revision identifiers"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4256
msgstr "bzr merge-directive takes at most two one revision identifiers"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4257
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4258
#: bzrlib/builtins.py:5719
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4259
msgid "No revisions to bundle."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4260
msgstr "No revisions to bundle."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4261
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4262
#: bzrlib/builtins.py:5738
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4263
msgid "Mail or create a merge-directive for submitting changes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4264
msgstr "Mail or create a merge-directive for submitting changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4265
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4266
#: bzrlib/builtins.py:5740
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4267
msgid "A merge directive provides many things needed for requesting merges:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4268
msgstr "A merge directive provides many things needed for requesting merges:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4269
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4270
#: bzrlib/builtins.py:5742
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4271
msgid "* A machine-readable description of the merge to perform"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4272
msgstr "* A machine-readable description of the merge to perform"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4273
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4274
#: bzrlib/builtins.py:5744
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4275
msgid "* An optional patch that is a preview of the changes requested"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4276
msgstr "* An optional patch that is a preview of the changes requested"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4277
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4278
#: bzrlib/builtins.py:5746
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4287
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4288
#: bzrlib/builtins.py:5750
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.  "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4295
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4296
#: bzrlib/builtins.py:5753
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4305
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4306
#: bzrlib/builtins.py:5757
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4319
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4320
#: bzrlib/builtins.py:5763
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4333
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4334
#: bzrlib/builtins.py:5769
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4335
msgid ""
4336
"Both the submit branch and the public branch follow the usual behavior with\n"
4337
"respect to --remember: If there is no default location set, the first send\n"
4338
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4339
"omit the location to use the default.  To change the default, use\n"
4340
"--remember. The value will only be saved if the location can be accessed."
4341
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4348
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4349
#: bzrlib/builtins.py:5775
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4350
msgid ""
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."
4355
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4360
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4361
#: bzrlib/builtins.py:5780
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4362
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4368
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4369
#: bzrlib/builtins.py:5783
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4378
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4379
#: bzrlib/builtins.py:5787
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4398
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4399
#: bzrlib/builtins.py:5794
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4410
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4411
#: bzrlib/builtins.py:5799
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4426
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4427
#: bzrlib/builtins.py:5805
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4434
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4435
#: bzrlib/builtins.py:5808
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4446
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4447
#: bzrlib/builtins.py:5832
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4448
msgid "Write merge directive to this file or directory; use - for stdout."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4449
msgstr "Write merge directive to this file or directory; use - for stdout."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4450
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4451
#: bzrlib/builtins.py:5836
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4452
msgid ""
4453
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4454
"strict disables the check."
4455
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4456
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4457
"strict disables the check."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4458
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4459
#: bzrlib/builtins.py:5838
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4460
msgid "Mail the request to this address."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4461
msgstr "Mail the request to this address."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4462
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4463
#: bzrlib/builtins.py:5842
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4464
msgid "Body for the email."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4465
msgstr "Body for the email."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4466
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4467
#: bzrlib/builtins.py:5895
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4468
msgid "Do not include a bundle in the merge directive."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4469
msgstr "Do not include a bundle in the merge directive."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4470
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4471
#: bzrlib/builtins.py:5896
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4472
msgid "Do not include a preview patch in the merge directive."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4473
msgstr "Do not include a preview patch in the merge directive."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4474
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4475
#: bzrlib/builtins.py:5899
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4476
msgid "Remember submit and public branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4477
msgstr "Remember submit and public branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4478
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4479
#: bzrlib/builtins.py:5901
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4480
msgid ""
4481
"Branch to generate the submission from, rather than the one containing the "
4482
"working directory."
4483
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4484
"Branch to generate the submission from, rather than the one containing the "
4485
"working directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4486
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4487
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4488
msgid "format"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4489
msgstr "format"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4490
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4491
#: bzrlib/builtins.py:5912
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4492
msgid "Use the specified output format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4493
msgstr "Use the specified output format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4494
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4495
#: bzrlib/builtins.py:5934
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4496
msgid "Create, remove or modify a tag naming a revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4497
msgstr "Create, remove or modify a tag naming a revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4498
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4499
#: bzrlib/builtins.py:5936
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4508
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4509
#: bzrlib/builtins.py:5940
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4516
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4517
#: bzrlib/builtins.py:5943
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4524
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4525
#: bzrlib/builtins.py:5946
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4534
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4535
#: bzrlib/builtins.py:5949
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4546
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4547
#: bzrlib/builtins.py:5959
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4548
msgid "Delete this tag rather than placing it."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4549
msgstr "Delete this tag rather than placing it."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4550
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4551
#: bzrlib/builtins.py:5962
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4552
msgid "Branch in which to place the tag."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4553
msgstr "Branch in which to place the tag."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4554
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4555
#: bzrlib/builtins.py:5964
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4556
msgid "Replace existing tags."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4557
msgstr "Replace existing tags."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4558
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4559
#: bzrlib/builtins.py:5979
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4560
msgid "No tag specified to delete."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4561
msgstr "No tag specified to delete."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4562
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4563
#: bzrlib/builtins.py:5981
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4564
#, python-format
4565
msgid "Deleted tag %s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4566
msgstr "Deleted tag %s."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4567
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4568
#: bzrlib/builtins.py:5995
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4569
msgid "Please specify a tag name."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4570
msgstr "Please specify a tag name."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4571
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4572
#: bzrlib/builtins.py:6003
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4573
#, python-format
4574
msgid "Tag %s already exists for that revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4575
msgstr "Tag %s already exists for that revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4576
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4577
#: bzrlib/builtins.py:6007
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4578
#, python-format
4579
msgid "Created tag %s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4580
msgstr "Created tag %s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4581
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4582
#: bzrlib/builtins.py:6009
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4583
#, python-format
4584
msgid "Updated tag %s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4585
msgstr "Updated tag %s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4586
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4587
#: bzrlib/builtins.py:6013
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4588
msgid "List tags."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4589
msgstr "List tags."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4590
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4591
#: bzrlib/builtins.py:6015
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4592
msgid ""
4593
"This command shows a table of tag names and the revisions they reference."
4594
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4595
"This command shows a table of tag names and the revisions they reference."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4596
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4597
#: bzrlib/builtins.py:6021
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4598
msgid "Branch whose tags should be displayed."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4599
msgstr "Branch whose tags should be displayed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4600
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4601
#: bzrlib/builtins.py:6023
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4602
msgid "Sort tags by different criteria."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4603
msgstr "Sort tags by different criteria."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4604
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4605
#: bzrlib/builtins.py:6023
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4606
msgid "Sorting"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4607
msgstr "Sorting"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4608
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4609
#: bzrlib/builtins.py:6092
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4610
msgid "Reconfigure the type of a bzr directory."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4611
msgstr "Reconfigure the type of a bzr directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4612
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4613
#: bzrlib/builtins.py:6094
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4614
msgid "A target configuration must be specified."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4615
msgstr "A target configuration must be specified."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4616
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4617
#: bzrlib/builtins.py:6096
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4618
msgid ""
4619
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4620
"The order of preference is\n"
4621
"1. For a lightweight checkout, the current bound location.\n"
4622
"2. For branches that used to be checkouts, the previously-bound location.\n"
4623
"3. The push location.\n"
4624
"4. The parent location.\n"
4625
"If none of these is available, --bind-to must be specified."
4626
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4634
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4635
#: bzrlib/builtins.py:6110
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4636
msgid "Tree type"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4637
msgstr "Tree type"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4638
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4639
#: bzrlib/builtins.py:6111
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4640
msgid "The relation between branch and tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4641
msgstr "The relation between branch and tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4642
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4643
#: bzrlib/builtins.py:6113
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4644
msgid "Reconfigure to be an unbound branch with no working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4645
msgstr "Reconfigure to be an unbound branch with no working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4646
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4647
#: bzrlib/builtins.py:6114
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4648
msgid "Reconfigure to be an unbound branch with a working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4649
msgstr "Reconfigure to be an unbound branch with a working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4650
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4651
#: bzrlib/builtins.py:6115
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4652
msgid "Reconfigure to be a bound branch with a working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4653
msgstr "Reconfigure to be a bound branch with a working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4654
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4655
#: bzrlib/builtins.py:6116
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4656
msgid "Reconfigure to be a lightweight checkout (with no local history)."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4657
msgstr "Reconfigure to be a lightweight checkout (with no local history)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4658
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4659
#: bzrlib/builtins.py:6121
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4660
msgid "Repository type"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4661
msgstr "Repository type"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4662
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4663
#: bzrlib/builtins.py:6122
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4664
msgid "Location fo the repository."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4665
msgstr "Location fo the repository."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4666
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4667
#: bzrlib/builtins.py:6124
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4668
msgid ""
4669
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4670
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4671
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4672
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4673
#: bzrlib/builtins.py:6126
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4674
msgid "Reconfigure to use a shared repository."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4675
msgstr "Reconfigure to use a shared repository."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4676
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4677
#: bzrlib/builtins.py:6130
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4678
msgid "Trees in Repository"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4679
msgstr "Trees in Repository"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4680
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4681
#: bzrlib/builtins.py:6131
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4682
msgid "Whether new branches in the repository have trees."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4683
msgstr "Whether new branches in the repository have trees."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4684
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4685
#: bzrlib/builtins.py:6133
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4686
msgid ""
4687
"Reconfigure repository to create working trees on branches by default."
4688
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4689
"Reconfigure repository to create working trees on branches by default."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4690
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4691
#: bzrlib/builtins.py:6135
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4692
msgid ""
4693
"Reconfigure repository to not create working trees on branches by default."
4694
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4695
"Reconfigure repository to not create working trees on branches by default."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4696
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4697
#: bzrlib/builtins.py:6138
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4698
msgid "Branch to bind checkout to."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4699
msgstr "Branch to bind checkout to."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4700
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4701
#: bzrlib/builtins.py:6140
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4702
msgid "Perform reconfiguration even if local changes will be lost."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4703
msgstr "Perform reconfiguration even if local changes will be lost."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4704
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4705
#: bzrlib/builtins.py:6143
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4706
msgid "Reconfigure a branch to be stacked on another branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4707
msgstr "Reconfigure a branch to be stacked on another branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4708
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4709
#: bzrlib/builtins.py:6147
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4710
msgid ""
4711
"Reconfigure a branch to be unstacked.  This may require copying substantial "
4712
"data into it."
4713
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4714
"Reconfigure a branch to be unstacked.  This may require copying substantial "
4715
"data into it."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4716
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4717
#: bzrlib/builtins.py:6157
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4718
msgid "Can't use both --stacked-on and --unstacked"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4719
msgstr "Can't use both --stacked-on and --unstacked"
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4720
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4721
#: bzrlib/builtins.py:6171
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4722
msgid "No target configuration specified"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4723
msgstr "No target configuration specified"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4724
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4725
#: bzrlib/builtins.py:6206
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4726
msgid "Set the branch of a checkout and update."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4727
msgstr "Set the branch of a checkout and update."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4728
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4729
#: bzrlib/builtins.py:6208
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4740
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4741
#: bzrlib/builtins.py:6213
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4748
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4749
#: bzrlib/builtins.py:6216
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4750
msgid "Pending merges need to be committed or reverted before using switch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4751
msgstr "Pending merges need to be committed or reverted before using switch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4752
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4753
#: bzrlib/builtins.py:6218
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4764
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4765
#: bzrlib/builtins.py:6223
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4774
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4775
#: bzrlib/builtins.py:6231
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4776
msgid "Switch even if local commits will be lost."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4777
msgstr "Switch even if local commits will be lost."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4778
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4779
#: bzrlib/builtins.py:6234
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4780
msgid "Create the target branch from this one before switching to it."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4781
msgstr "Create the target branch from this one before switching to it."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4782
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4783
#: bzrlib/builtins.py:6248
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4784
msgid "You must supply either a revision or a location"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4785
msgstr "You must supply either a revision or a location"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4786
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4787
#: bzrlib/builtins.py:6261
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4788
msgid "cannot create branch without source branch"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4789
msgstr "cannot create branch without source branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4790
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4791
#: bzrlib/builtins.py:6286
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4792
msgid "Manage filtered views."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4793
msgstr "Manage filtered views."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4794
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4795
#: bzrlib/builtins.py:6288
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4810
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4811
#: bzrlib/builtins.py:6295
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4822
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4823
#: bzrlib/builtins.py:6300
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4834
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4835
#: bzrlib/builtins.py:6305
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4836
msgid ""
4837
":Examples:\n"
4838
"  To define the current view::"
4839
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4840
":Examples:\n"
4841
"  To define the current view::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4842
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4843
#: bzrlib/builtins.py:6308
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4844
msgid "    bzr view file1 dir1 ..."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4845
msgstr "    bzr view file1 dir1 ..."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4846
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4847
#: bzrlib/builtins.py:6310
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4848
msgid "  To list the current view::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4849
msgstr "  To list the current view::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4850
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4851
#: bzrlib/builtins.py:6312
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4852
msgid "    bzr view"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4853
msgstr "    bzr view"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4854
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4855
#: bzrlib/builtins.py:6314
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4856
msgid "  To delete the current view::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4857
msgstr "  To delete the current view::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4858
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4859
#: bzrlib/builtins.py:6316
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4860
msgid "    bzr view --delete"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4861
msgstr "    bzr view --delete"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4862
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4863
#: bzrlib/builtins.py:6318
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4864
msgid "  To disable the current view without deleting it::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4865
msgstr "  To disable the current view without deleting it::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4866
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4867
#: bzrlib/builtins.py:6320
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4868
msgid "    bzr view --switch off"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4869
msgstr "    bzr view --switch off"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4870
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4871
#: bzrlib/builtins.py:6322
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4872
msgid "  To define a named view and switch to it::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4873
msgstr "  To define a named view and switch to it::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4874
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4875
#: bzrlib/builtins.py:6324
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4876
msgid "    bzr view --name view-name file1 dir1 ..."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4877
msgstr "    bzr view --name view-name file1 dir1 ..."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4878
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4879
#: bzrlib/builtins.py:6326
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4880
msgid "  To list a named view::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4881
msgstr "  To list a named view::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4882
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4883
#: bzrlib/builtins.py:6328
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4884
msgid "    bzr view --name view-name"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4885
msgstr "    bzr view --name view-name"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4886
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4887
#: bzrlib/builtins.py:6330
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4888
msgid "  To delete a named view::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4889
msgstr "  To delete a named view::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4890
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4891
#: bzrlib/builtins.py:6332
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4892
msgid "    bzr view --name view-name --delete"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4893
msgstr "    bzr view --name view-name --delete"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4894
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4895
#: bzrlib/builtins.py:6334
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4896
msgid "  To switch to a named view::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4897
msgstr "  To switch to a named view::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4898
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4899
#: bzrlib/builtins.py:6336
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4900
msgid "    bzr view --switch view-name"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4901
msgstr "    bzr view --switch view-name"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4902
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4903
#: bzrlib/builtins.py:6338
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4904
msgid "  To list all views defined::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4905
msgstr "  To list all views defined::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4906
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4907
#: bzrlib/builtins.py:6340
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4908
msgid "    bzr view --all"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4909
msgstr "    bzr view --all"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4910
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4911
#: bzrlib/builtins.py:6342
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4912
msgid "  To delete all views::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4913
msgstr "  To delete all views::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4914
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4915
#: bzrlib/builtins.py:6344
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4916
msgid "    bzr view --delete --all"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4917
msgstr "    bzr view --delete --all"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4918
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4919
#: bzrlib/builtins.py:6351
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4920
msgid "Apply list or delete action to all views."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4921
msgstr "Apply list or delete action to all views."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4922
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4923
#: bzrlib/builtins.py:6354
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4924
msgid "Delete the view."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4925
msgstr "Delete the view."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4926
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4927
#: bzrlib/builtins.py:6357
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4928
msgid "Name of the view to define, list or delete."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4929
msgstr "Name of the view to define, list or delete."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4930
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4931
#: bzrlib/builtins.py:6361
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4932
msgid "Name of the view to switch to."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4933
msgstr "Name of the view to switch to."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4934
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4935
#: bzrlib/builtins.py:6380
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4936
msgid "Both --delete and a file list specified"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4937
msgstr "Both --delete and a file list specified"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4938
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4939
#: bzrlib/builtins.py:6383
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4940
msgid "Both --delete and --switch specified"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4941
msgstr "Both --delete and --switch specified"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4942
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4943
#: bzrlib/builtins.py:6386
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4944
msgid "Deleted all views.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4945
msgstr "Deleted all views.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4946
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4947
#: bzrlib/builtins.py:6388
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4948
msgid "No current view to delete"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4949
msgstr "No current view to delete"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4950
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4951
#: bzrlib/builtins.py:6391
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4952
#, python-format
4953
msgid "Deleted '%s' view.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4954
msgstr "Deleted '%s' view.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4955
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4956
#: bzrlib/builtins.py:6395
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4957
msgid "Both --switch and a file list specified"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4958
msgstr "Both --switch and a file list specified"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4959
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4960
#: bzrlib/builtins.py:6398
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4961
msgid "Both --switch and --all specified"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4962
msgstr "Both --switch and --all specified"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4963
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4964
#: bzrlib/builtins.py:6401
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4965
msgid "No current view to disable"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4966
msgstr "No current view to disable"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4967
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4968
#: bzrlib/builtins.py:6403
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4969
#, python-format
4970
msgid "Disabled '%s' view.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4971
msgstr "Disabled '%s' view.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4972
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4973
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4974
msgid "Using '{0}' view: {1}\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4975
msgstr "Using '{0}' view: {1}\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4976
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4977
#: bzrlib/builtins.py:6410
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4978
msgid "Views defined:\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4979
msgstr "Views defined:\n"
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4980
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4981
#: bzrlib/builtins.py:6419
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4982
msgid "No views defined.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4983
msgstr "No views defined.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4984
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4985
#: bzrlib/builtins.py:6426
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4986
msgid "Cannot change the 'off' pseudo view"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4987
msgstr "Cannot change the 'off' pseudo view"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4988
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4989
#: bzrlib/builtins.py:6434
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4990
msgid "No current view.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4991
msgstr "No current view.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4992
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4993
#: bzrlib/builtins.py:6437
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4994
msgid "'{0}' view is: {1}\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4995
msgstr "'{0}' view is: {1}\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4996
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4997
#: bzrlib/builtins.py:6457
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4998
msgid "    <no hooks installed>\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
4999
msgstr "    <no hooks installed>\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5000
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5001
#: bzrlib/builtins.py:6461
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5002
msgid "Remove a branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5003
msgstr "Remove a branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5004
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5005
#: bzrlib/builtins.py:6463
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5006
msgid ""
5007
"This will remove the branch from the specified location but \n"
5008
"will keep any working tree or repository in place."
5009
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5010
"This will remove the branch from the specified location but \n"
5011
"will keep any working tree or repository in place."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5012
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5013
#: bzrlib/builtins.py:6468
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5014
msgid "  Remove the branch at repo/trunk::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5015
msgstr "  Remove the branch at repo/trunk::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5016
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5017
#: bzrlib/builtins.py:6470
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5018
msgid "    bzr remove-branch repo/trunk"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5019
msgstr "    bzr remove-branch repo/trunk"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5020
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5021
#: bzrlib/builtins.py:6477
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5022
msgid "Remove branch even if it is the active branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5023
msgstr "Remove branch even if it is the active branch."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5024
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5025
#: bzrlib/builtins.py:6491
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5026
msgid "Branch is active. Use --force to remove it."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5027
msgstr "Branch is active. Use --force to remove it."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5028
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5029
#: bzrlib/builtins.py:6495
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5030
msgid "Plaintext diff output."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5031
msgstr "Plaintext diff output."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5032
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5033
#: bzrlib/builtins.py:6496
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5034
msgid "Temporarily set aside some changes from the current tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5035
msgstr "Temporarily set aside some changes from the current tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5036
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5037
#: bzrlib/builtins.py:6498
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5038
msgid ""
5039
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
5040
"ie. out of the way, until a later time when you can bring them back from\n"
5041
"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
5042
"your working tree, and so they aren't propagated along with your branch nor\n"
5043
"will they survive its deletion."
5044
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5050
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5051
#: bzrlib/builtins.py:6504
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5052
msgid "If shelve --list is specified, previously-shelved changes are listed."
5053
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5054
"If shelve --list is specified, previously-shelved changes are listed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5055
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5056
#: bzrlib/builtins.py:6506
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5067
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5068
#: bzrlib/builtins.py:6511
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5073
"If filenames are specified, only the changes to those files will be\n"
5074
"shelved. Other files will be left untouched."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5075
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5076
#: bzrlib/builtins.py:6514
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5077
msgid ""
5078
"If a revision is specified, changes since that revision will be shelved."
5079
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5080
"If a revision is specified, changes since that revision will be shelved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5081
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5082
#: bzrlib/builtins.py:6516
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5087
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
5088
"restore the most recently shelved changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5089
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5090
#: bzrlib/builtins.py:6519
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5099
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5100
#: bzrlib/builtins.py:6523
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5101
msgid "    change_editor = PROGRAM @new_path @old_path"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5102
msgstr "    change_editor = PROGRAM @new_path @old_path"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5103
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5104
#: bzrlib/builtins.py:6525
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5105
msgid ""
5106
"where @new_path is replaced with the path of the new version of the \n"
5107
"file and @old_path is replaced with the path of the old version of \n"
5108
"the file.  The PROGRAM should save the new file with the desired \n"
5109
"contents of the file in the working tree.\n"
5110
"    "
5111
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
"    "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5117
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5118
#: bzrlib/builtins.py:6537
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5119
msgid "Shelve all changes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5120
msgstr "Shelve all changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5121
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5122
#: bzrlib/builtins.py:6539
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5123
msgid "Method to use for writing diffs."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5124
msgstr "Method to use for writing diffs."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5125
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5126
#: bzrlib/builtins.py:6539
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5127
msgid "writer"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5128
msgstr "writer"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5129
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5130
#: bzrlib/builtins.py:6543
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5131
msgid "List shelved changes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5132
msgstr "List shelved changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5133
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5134
#: bzrlib/builtins.py:6545
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5135
msgid "Destroy removed changes instead of shelving them."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5136
msgstr "Destroy removed changes instead of shelving them."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5137
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5138
#: bzrlib/builtins.py:6574
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5139
msgid "No shelved changes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5140
msgstr "No shelved changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5141
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5142
#: bzrlib/builtins.py:6585
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5143
msgid "Restore shelved changes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5144
msgstr "Restore shelved changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5145
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5146
#: bzrlib/builtins.py:6587
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5147
msgid ""
5148
"By default, the most recently shelved changes are restored. However if you\n"
5149
"specify a shelf by id those changes will be restored instead.  This works\n"
5150
"best when the changes don't depend on each other."
5151
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5155
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5156
#: bzrlib/builtins.py:6596
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5157
msgid "The action to perform."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5158
msgstr "The action to perform."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5159
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5160
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5161
msgid "action"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5162
msgstr "action"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5163
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5164
#: bzrlib/builtins.py:6598
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5165
msgid "Apply changes and remove from the shelf."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5166
msgstr "Apply changes and remove from the shelf."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5167
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5168
#: bzrlib/builtins.py:6599
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5169
msgid "Show changes, but do not apply or remove them."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5170
msgstr "Show changes, but do not apply or remove them."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5171
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5172
#: bzrlib/builtins.py:6600
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5173
msgid ""
5174
"Instead of unshelving the changes, show the diff that would result from "
5175
"unshelving."
5176
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5177
"Instead of unshelving the changes, show the diff that would result from "
5178
"unshelving."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5179
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5180
#: bzrlib/builtins.py:6602
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5181
msgid "Delete changes without applying them."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5182
msgstr "Delete changes without applying them."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5183
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5184
#: bzrlib/builtins.py:6603
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5185
msgid "Apply changes but don't delete them."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5186
msgstr "Apply changes but don't delete them."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5187
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5188
#: bzrlib/builtins.py:6618
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5189
msgid "Remove unwanted files from working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5190
msgstr "Remove unwanted files from working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5191
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5192
#: bzrlib/builtins.py:6620
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5193
msgid ""
5194
"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
5195
"files are never deleted."
5196
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5197
"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
5198
"files are never deleted."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5199
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5200
#: bzrlib/builtins.py:6623
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5209
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5210
#: bzrlib/builtins.py:6627
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5215
"If no options are specified, unknown files are deleted.  Otherwise, option\n"
5216
"flags are respected, and may be combined."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5217
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5218
#: bzrlib/builtins.py:6630
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5219
msgid "To check what clean-tree will do, use --dry-run."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5220
msgstr "To check what clean-tree will do, use --dry-run."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5221
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5222
#: bzrlib/builtins.py:6633
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5223
msgid "Delete all ignored files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5224
msgstr "Delete all ignored files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5225
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5226
#: bzrlib/builtins.py:6634
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5227
msgid ""
5228
"Delete conflict files, merge and revert backups, and failed selftest dirs."
5229
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5230
"Delete conflict files, merge and revert backups, and failed selftest dirs."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5231
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5232
#: bzrlib/builtins.py:6637
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5233
msgid "Delete files unknown to bzr (default)."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5234
msgstr "Delete files unknown to bzr (default)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5235
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5236
#: bzrlib/builtins.py:6638
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5237
msgid "Show files to delete instead of deleting them."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5238
msgstr "Show files to delete instead of deleting them."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5239
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5240
#: bzrlib/builtins.py:6640
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5241
msgid "Do not prompt before deleting."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5242
msgstr "Do not prompt before deleting."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5243
5244
#: bzrlib/bundle/__init__.py:59
5245
msgid "A directory cannot be a bundle"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5246
msgstr "A directory cannot be a bundle"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5247
5248
#: bzrlib/bundle/apply_bundle.py:40
5249
msgid "Install revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5250
msgstr "Install revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5251
5252
#: bzrlib/bundle/commands.py:64
5253
msgid "--verbose requires a merge directive"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5254
msgstr "--verbose requires a merge directive"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5255
5256
#: bzrlib/bundle/commands.py:67
5257
msgid "Bundle format not supported"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5258
msgstr "Bundle format not supported"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5259
5260
#: bzrlib/bundle/commands.py:77
5261
msgid "Records\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5262
msgstr "Records\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5263
5264
#: bzrlib/bundle/commands.py:81
5265
msgid "{0}: {1} ({2} multiparent)\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5266
msgstr "{0}: {1} ({2} multiparent)\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5267
5268
#: bzrlib/bundle/commands.py:83
5269
#, python-format
5270
msgid "unique files: %d\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5271
msgstr "unique files: %d\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5272
5273
#: bzrlib/bundle/commands.py:92
5274
msgid "Revisions\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5275
msgstr "Revisions\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5276
5277
#: bzrlib/bundle/commands.py:93
5278
#, python-format
5279
msgid "nicks: %s\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5280
msgstr "nicks: %s\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5281
5282
#: bzrlib/bundle/commands.py:95
5283
#, python-format
5284
msgid ""
5285
"committers: \n"
5286
"%s\n"
5287
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5288
"committers: \n"
5289
"%s\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5290
5291
#: bzrlib/bundle/commands.py:103
5292
msgid "Decoded contents\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5293
msgstr "Decoded contents\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5294
5295
#: bzrlib/bundle/serializer/v4.py:327
5296
#, python-format
5297
msgid "Bundling %d revision."
5298
msgid_plural "Bundling %d revisions."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5299
msgstr[0] "Bundling %d revision."
5300
msgstr[1] "Bundling %d revisions."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5301
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5302
#: bzrlib/bzrdir.py:487
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5303
msgid ""
5304
"making backup of {0}\n"
5305
"  to {1}"
5306
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5307
"making backup of {0}\n"
5308
"  to {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5309
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5310
#: bzrlib/bzrdir.py:510
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5311
msgid "renamed {0} to {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5312
msgstr "renamed {0} to {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5313
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5314
#: bzrlib/bzrdir.py:1639
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5315
#, python-format
5316
msgid ""
5317
"Source repository format does not support stacking, using format:\n"
5318
"  %s"
5319
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5320
"Source repository format does not support stacking, using format:\n"
5321
"  %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5322
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5323
#: bzrlib/bzrdir.py:1659
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5324
#, python-format
5325
msgid ""
5326
"Source branch format does not support stacking, using format:\n"
5327
"  %s"
5328
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5329
"Source branch format does not support stacking, using format:\n"
5330
"  %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5331
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5332
#: bzrlib/bzrdir.py:1805
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5333
msgid "starting repository conversion"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5334
msgstr "starting repository conversion"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5335
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5336
#: bzrlib/bzrdir.py:2026
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5337
msgid "Using default stacking branch {0} at {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5338
msgstr "Using default stacking branch {0} at {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5339
5340
#: bzrlib/check.py:108
5341
msgid "check"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5342
msgstr "check"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5343
5344
#: bzrlib/check.py:110
5345
msgid "checking revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5346
msgstr "checking revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5347
5348
#: bzrlib/check.py:112
5349
msgid "checking commit contents"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5350
msgstr "checking commit contents"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5351
5352
#: bzrlib/check.py:114
5353
msgid "checking file graphs"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5354
msgstr "checking file graphs"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5355
5356
#: bzrlib/check.py:118
5357
msgid "checking branches and trees"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5358
msgstr "checking branches and trees"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5359
5360
#: bzrlib/check.py:205
5361
msgid "checked repository {0} format {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5362
msgstr "checked repository {0} format {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5363
5364
#: bzrlib/check.py:208
5365
#, python-format
5366
msgid "%6d revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5367
msgstr "%6d revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5368
5369
#: bzrlib/check.py:209
5370
#, python-format
5371
msgid "%6d file-ids"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5372
msgstr "%6d file-ids"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5373
5374
#: bzrlib/check.py:211
5375
#, python-format
5376
msgid "%6d unreferenced text versions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5377
msgstr "%6d unreferenced text versions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5378
5379
#: bzrlib/check.py:215
5380
msgid "unreferenced version: {{{0}}} in {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5381
msgstr "unreferenced version: {{{0}}} in {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5382
5383
#: bzrlib/check.py:218
5384
#, python-format
5385
msgid "%6d revisions are missing inventory_sha1"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5386
msgstr "%6d revisions are missing inventory_sha1"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5387
5388
#: bzrlib/check.py:221
5389
#, python-format
5390
msgid "%6d revisions are mentioned but not present"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5391
msgstr "%6d revisions are mentioned but not present"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5392
5393
#: bzrlib/check.py:224
5394
#, python-format
5395
msgid "%6d ghost revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5396
msgstr "%6d ghost revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5397
5398
#: bzrlib/check.py:229
5399
#, python-format
5400
msgid "%6d revisions missing parents in ancestry"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5401
msgstr "%6d revisions missing parents in ancestry"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5402
5403
#: bzrlib/check.py:233
5404
#, python-format
5405
msgid "      %s should be in the ancestry for:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5406
msgstr "      %s should be in the ancestry for:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5407
5408
#: bzrlib/check.py:237
5409
#, python-format
5410
msgid "%6d inconsistent parents"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5411
msgstr "%6d inconsistent parents"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5412
5413
#: bzrlib/check.py:241
5414
msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5415
msgstr "      * {0} version {1} has parents {2!r} but should have {3!r}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5416
5417
#: bzrlib/check.py:247
5418
#, python-format
5419
msgid "%6d revisions have incorrect parents in the revision index"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5420
msgstr "%6d revisions have incorrect parents in the revision index"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5421
5422
#: bzrlib/check.py:253
5423
msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5424
msgstr "       {0} has wrong parents in index: {1!r} should be {2!r}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5425
5426
#: bzrlib/check.py:267
5427
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5428
msgstr "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5429
5430
#: bzrlib/check.py:296
5431
msgid ""
5432
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5433
"{{{4}}}"
5434
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5435
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5436
"{{{4}}}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5437
5438
#: bzrlib/check.py:354
5439
#, python-format
5440
msgid "Checking branch at '%s'."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5441
msgstr "Checking branch at '%s'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5442
5443
#: bzrlib/check.py:374
5444
#, python-format
5445
msgid "Checking working tree at '%s'."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5446
msgstr "Checking working tree at '%s'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5447
5448
#: bzrlib/check.py:427 bzrlib/check.py:441
5449
msgid "No branch found at specified location."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5450
msgstr "No branch found at specified location."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5451
5452
#: bzrlib/check.py:429 bzrlib/check.py:439
5453
msgid "No working tree found at specified location."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5454
msgstr "No working tree found at specified location."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5455
5456
#: bzrlib/check.py:432
5457
#, python-format
5458
msgid "Checking repository at '%s'."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5459
msgstr "Checking repository at '%s'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5460
5461
#: bzrlib/check.py:443
5462
msgid "No repository found at specified location."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5463
msgstr "No repository found at specified location."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5464
5465
#: bzrlib/clean_tree.py:63
5466
msgid "Nothing to delete."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5467
msgstr "Nothing to delete."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5468
5469
#: bzrlib/clean_tree.py:68
5470
msgid "Are you sure you wish to delete these"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5471
msgstr "Are you sure you wish to delete these"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5472
5473
#: bzrlib/clean_tree.py:70
5474
msgid "Canceled"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5475
msgstr "Cancelled"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5476
5477
#: bzrlib/clean_tree.py:107
5478
#, python-format
5479
msgid "unable to remove %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5480
msgstr "unable to remove %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5481
5482
#: bzrlib/clean_tree.py:111
5483
msgid "deleting paths:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5484
msgstr "deleting paths:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5485
5486
#: bzrlib/clean_tree.py:125
5487
msgid "unable to remove \"{0}\": {1}."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5488
msgstr "unable to remove \"{0}\": {1}."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5489
5490
#: bzrlib/clean_tree.py:130
5491
msgid "No files deleted."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5492
msgstr "No files deleted."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5493
5494
#: bzrlib/cmd_version_info.py:47
5495
msgid "No known version info format {0}. Supported types are: {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5496
msgstr "No known version info format {0}. Supported types are: {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5497
5498
#: bzrlib/cmd_version_info.py:52
5499
msgid "Version info in Custom template-based format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5500
msgstr "Version info in Custom template-based format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5501
5502
#: bzrlib/cmd_version_info.py:52
5503
msgid "Version info in Python format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5504
msgstr "Version info in Python format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5505
5506
#: bzrlib/cmd_version_info.py:52
5507
msgid "Version info in RIO (simple text) format (default)."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5508
msgstr "Version info in RIO (simple text) format (default)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5509
5510
#: bzrlib/cmd_version_info.py:53
5511
msgid "Show version information about this tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5512
msgstr "Show version information about this tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5513
5514
#: bzrlib/cmd_version_info.py:55
5515
msgid ""
5516
"You can use this command to add information about version into\n"
5517
"source code of an application. The output can be in one of the\n"
5518
"supported formats or in a custom format based on a template."
5519
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5523
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5524
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5525
#: en/help_topics/configuration.txt:722
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5526
msgid "For example::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5527
msgstr "For example::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5528
5529
#: bzrlib/cmd_version_info.py:61
5530
msgid ""
5531
"  bzr version-info --custom \\\n"
5532
"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5533
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5534
"  bzr version-info --custom \\\n"
5535
"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5536
5537
#: bzrlib/cmd_version_info.py:64
5538
msgid ""
5539
"will produce a C header file with formatted string containing the\n"
5540
"current revision number. Other supported variables in templates are:"
5541
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5542
"will produce a C header file with formatted string containing the\n"
5543
"current revision number. Other supported variables in templates are:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5544
5545
#: bzrlib/cmd_version_info.py:67
5546
msgid ""
5547
"  * {date} - date of the last revision\n"
5548
"  * {build_date} - current date\n"
5549
"  * {revno} - revision number\n"
5550
"  * {revision_id} - revision id\n"
5551
"  * {branch_nick} - branch nickname\n"
5552
"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
5553
"              otherwise 1"
5554
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5562
5563
#: bzrlib/cmd_version_info.py:77
5564
msgid "Select the output format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5565
msgstr "Select the output format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5566
5567
#: bzrlib/cmd_version_info.py:81
5568
msgid "Include all possible information."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5569
msgstr "Include all possible information."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5570
5571
#: bzrlib/cmd_version_info.py:82
5572
msgid "Check if tree is clean."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5573
msgstr "Check if tree is clean."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5574
5575
#: bzrlib/cmd_version_info.py:84
5576
msgid "Include the revision-history."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5577
msgstr "Include the revision-history."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5578
5579
#: bzrlib/cmd_version_info.py:86
5580
msgid "Include the last revision for each file."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5581
msgstr "Include the last revision for each file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5582
5583
#: bzrlib/cmd_version_info.py:87
5584
msgid "Template for the output."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5585
msgstr "Template for the output."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5586
5587
#: bzrlib/cmd_version_info.py:101
5588
msgid "bzr version-info --revision takes exactly one revision specifier"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5589
msgstr "bzr version-info --revision takes exactly one revision specifier"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5590
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5591
#: bzrlib/commands.py:229
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5592
#, python-format
5593
msgid "unknown command \"%s\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5594
msgstr "unknown command \"%s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5595
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5596
#: bzrlib/commands.py:476
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5597
msgid "No help for this command."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5598
msgstr "No help for this command."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5599
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5600
#: bzrlib/commands.py:489
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5601
#, python-format
5602
msgid ":Purpose: %s\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5603
msgstr ":Purpose: %s\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5604
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5605
#: bzrlib/commands.py:491
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5606
#, python-format
5607
msgid ""
5608
":Usage:\n"
5609
"%s\n"
5610
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5611
":Usage:\n"
5612
"%s\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5613
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5614
#: bzrlib/commands.py:493
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5615
#, python-format
5616
msgid ":Usage:   %s\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5617
msgstr ":Usage:   %s\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5618
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5619
#: bzrlib/commands.py:512
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5620
#, python-format
5621
msgid ":Options:%s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5622
msgstr ":Options:%s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5623
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5624
#: bzrlib/commands.py:523
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5625
#, python-format
5626
msgid ""
5627
":Description:\n"
5628
"  %s\n"
5629
"\n"
5630
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5631
":Description:\n"
5632
"  %s\n"
5633
"\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5634
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5635
#: bzrlib/commands.py:533
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5636
#, python-format
5637
msgid ""
5638
"See bzr help %s for more details and examples.\n"
5639
"\n"
5640
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5641
"See bzr help %s for more details and examples.\n"
5642
"\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5643
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5644
#: bzrlib/commands.py:538
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5645
msgid ":Aliases:  "
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5646
msgstr ":Aliases:  "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5647
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5648
#: bzrlib/commands.py:542
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5649
#, python-format
5650
msgid ":From:     plugin \"%s\"\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5651
msgstr ":From:     plugin \"%s\"\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5652
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5653
#: bzrlib/commands.py:554
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5654
msgid ":doc:`{0} <{1}-help>`"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5655
msgstr ":doc:`{0} <{1}-help>`"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5656
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5657
#: bzrlib/commands.py:558
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5658
#, python-format
5659
msgid ":See also: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5660
msgstr ":See also: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5661
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5662
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5663
msgid "Only ASCII permitted in option names"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5664
msgstr "Only ASCII permitted in option names"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5665
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5666
#: bzrlib/commands.py:851 bzrlib/commands.py:859
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5667
msgid "command {0!r} needs one or more {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5668
msgstr "command {0!r} needs one or more {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5669
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5670
#: bzrlib/commands.py:868
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5671
msgid "command {0!r} requires argument {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5672
msgstr "command {0!r} requires argument {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5673
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5674
#: bzrlib/commands.py:875
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5675
msgid "extra argument to command {0}: {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5676
msgstr "extra argument to command {0}: {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5677
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5678
#: bzrlib/commands.py:972
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5679
#, python-format
5680
msgid "Profile data written to \"%s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5681
msgstr "Profile data written to \"%s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5682
5683
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5684
msgid "added"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5685
msgstr "added"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5686
5687
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5688
msgid "modified"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5689
msgstr "modified"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5690
5691
#: bzrlib/commit.py:131
5692
#, python-format
5693
msgid "Committing%s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5694
msgstr "Committing%s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5695
5696
#: bzrlib/commit.py:134
5697
#, python-format
5698
msgid "Committed revision %d."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5699
msgstr "Committed revision %d."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5700
5701
#: bzrlib/commit.py:143
5702
#, python-format
5703
msgid "deleted %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5704
msgstr "deleted %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5705
5706
#: bzrlib/commit.py:146
5707
#, python-format
5708
msgid "missing %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5709
msgstr "missing %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5710
5711
#: bzrlib/commit.py:511
5712
msgid ""
5713
"Conflicting tags in bound branch:\n"
5714
"{0}"
5715
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5716
"Conflicting tags in bound branch:\n"
5717
"{0}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5718
5719
#: bzrlib/commit.py:742
5720
msgid "renamed"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5721
msgstr "renamed"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5722
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5723
#: bzrlib/commit.py:976
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5724
msgid "unchanged"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5725
msgstr "unchanged"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5726
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5727
#: bzrlib/commit.py:998
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5728
msgid "{0} [{1}] - Stage"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5729
msgstr "{0} [{1}] - Stage"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5730
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5731
#: bzrlib/commit.py:1001
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5732
#, python-format
5733
msgid "%s - Stage"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5734
msgstr "%s - Stage"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5735
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5736
#: bzrlib/commit_signature_commands.py:34
5737
msgid "Sign all commits by a given committer."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5738
msgstr "Sign all commits by a given committer."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5739
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5740
#: bzrlib/commit_signature_commands.py:36
5741
msgid ""
5742
"If location is not specified the local tree is used.\n"
5743
"If committer is not specified the default committer is used."
5744
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5745
"If location is not specified the local tree is used.\n"
5746
"If committer is not specified the default committer is used."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5747
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5748
#: bzrlib/commit_signature_commands.py:39
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5749
msgid "This does not sign commits that already have signatures."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5750
msgstr "This does not sign commits that already have signatures."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5751
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5752
#: bzrlib/commit_signature_commands.py:47
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5753
msgid ""
5754
"Don't actually sign anything, just print the revisions that would be signed."
5755
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5756
"Don't actually sign anything, just print the revisions that would be signed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5757
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5758
#: bzrlib/commit_signature_commands.py:98
5759
#, python-format
5760
msgid "Signed %d revision.\n"
5761
msgid_plural "Signed %d revisions.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5762
msgstr[0] "Signed %d revision.\n"
5763
msgstr[1] "Signed %d revisions.\n"
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5764
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5765
#: bzrlib/commit_signature_commands.py:103
5766
msgid "Verify all commit signatures."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5767
msgstr "Verify all commit signatures."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5768
5769
#: bzrlib/commit_signature_commands.py:105
5770
msgid ""
5771
"Verifies that all commits in the branch are signed by known GnuPG keys."
5772
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5773
"Verifies that all commits in the branch are signed by known GnuPG keys."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5774
5775
#: bzrlib/commit_signature_commands.py:110
5776
msgid ""
5777
"Comma separated list of GPG key patterns which are acceptable for "
5778
"verification."
5779
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5780
"Comma separated list of GPG key patterns which are acceptable for "
5781
"verification."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5782
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5783
#: bzrlib/commit_signature_commands.py:148
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5784
msgid "Cannot verify a range of non-revision-history revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5785
msgstr "Cannot verify a range of non-revision-history revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5786
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5787
#: bzrlib/commit_signature_commands.py:166
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5788
msgid "All commits signed with verifiable keys"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5789
msgstr "All commits signed with verifiable keys"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5790
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5791
#: bzrlib/config.py:436
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5792
msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5793
msgstr "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5794
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5795
#: bzrlib/config.py:2452
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5796
msgid "{0} is not an SI unit."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5797
msgstr "{0} is not an SI unit."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5798
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5799
#: bzrlib/config.py:2971
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5800
msgid ""
5801
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5802
"will be saved."
5803
msgstr ""
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5804
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5805
"will be saved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5806
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5807
#: bzrlib/config.py:3116
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5808
#, python-format
5809
msgid "Invalid '%s', should be of the form 'name=value'"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5810
msgstr "Invalid '%s', should be of the form 'name=value'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5811
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5812
#: bzrlib/config.py:4018
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5813
msgid "Display, set or remove a configuration option."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5814
msgstr "Display, set or remove a configuration option."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5815
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5816
#: bzrlib/config.py:4020
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5817
msgid "Display the active value for a given option."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5818
msgstr "Display the active value for a given option."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5819
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5820
#: bzrlib/config.py:4022
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5821
msgid ""
5822
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5823
"matching options are displayed mentioning their scope. The active value\n"
5824
"that bzr will take into account is the first one displayed for each option."
5825
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5829
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5830
#: bzrlib/config.py:4026
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5831
msgid "If no NAME is given, --all .* is implied."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5832
msgstr "If no NAME is given, --all .* is implied."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5833
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5834
#: bzrlib/config.py:4028
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5835
msgid ""
5836
"Setting a value is achieved by using name=value without spaces. The value\n"
5837
"is set in the most relevant scope and can be checked by displaying the\n"
5838
"option again."
5839
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5843
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5844
#: bzrlib/config.py:4040
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5845
msgid "Reduce the scope to the specified configuration file."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5846
msgstr "Reduce the scope to the specified configuration file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5847
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5848
#: bzrlib/config.py:4044
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5849
msgid "Display all the defined values for the matching options."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5850
msgstr "Display all the defined values for the matching options."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5851
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5852
#: bzrlib/config.py:4046
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5853
msgid "Remove the option from the configuration file."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5854
msgstr "Remove the option from the configuration file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5855
5856
#: bzrlib/conflicts.py:50
5857
msgid "List files with conflicts."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5858
msgstr "List files with conflicts."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5859
5860
#: bzrlib/conflicts.py:57
5861
msgid ""
5862
"Conflicts normally are listed as short, human-readable messages.  If --text\n"
5863
"is supplied, the pathnames of files with text conflicts are listed,\n"
5864
"instead.  (This is useful for editing all files with text conflicts.)"
5865
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5869
5870
#: bzrlib/conflicts.py:61
5871
msgid "Use bzr resolve when you have fixed a problem."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5872
msgstr "Use bzr resolve when you have fixed a problem."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5873
5874
#: bzrlib/conflicts.py:66
5875
msgid "List paths of files with text conflicts."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5876
msgstr "List paths of files with text conflicts."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5877
5878
#: bzrlib/conflicts.py:85
5879
msgid "Marks the conflict as resolved."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5880
msgstr "Marks the conflict as resolved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5881
5882
#: bzrlib/conflicts.py:88
5883
msgid "Resolve the conflict preserving the version in the working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5884
msgstr "Resolve the conflict preserving the version in the working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5885
5886
#: bzrlib/conflicts.py:91
5887
msgid "Resolve the conflict taking the merged version into account."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5888
msgstr "Resolve the conflict taking the merged version into account."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5889
5890
#: bzrlib/conflicts.py:98
5891
msgid "How to resolve the conflict."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5892
msgstr "How to resolve the conflict."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5893
5894
#: bzrlib/conflicts.py:104
5895
msgid "Mark a conflict as resolved."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5896
msgstr "Mark a conflict as resolved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5897
5898
#: bzrlib/conflicts.py:111
5899
msgid ""
5900
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5901
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5902
"as\n"
5903
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5904
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5909
5910
#: bzrlib/conflicts.py:119
5911
msgid "Resolve all conflicts in this tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5912
msgstr "Resolve all conflicts in this tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5913
5914
#: bzrlib/conflicts.py:126
5915
msgid "If --all is specified, no FILE may be provided"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5916
msgstr "If --all is specified, no FILE may be provided"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5917
5918
#: bzrlib/conflicts.py:151
5919
#, python-format
5920
msgid "%d conflict auto-resolved."
5921
msgid_plural "%d conflicts auto-resolved."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5922
msgstr[0] "%d conflict auto-resolved."
5923
msgstr[1] "%d conflicts auto-resolved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5924
5925
#: bzrlib/conflicts.py:154
5926
msgid "Remaining conflicts:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5927
msgstr "Remaining conflicts:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5928
5929
#: bzrlib/conflicts.py:159
5930
msgid "All conflicts resolved."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5931
msgstr "All conflicts resolved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5932
5933
#: bzrlib/conflicts.py:168
5934
msgid "{0} conflict resolved, {1} remaining"
5935
msgid_plural "{0} conflicts resolved, {1} remaining"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5936
msgstr[0] "{0} conflict resolved, {1} remaining"
5937
msgstr[1] "{0} conflicts resolved, {1} remaining"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5938
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5939
#: bzrlib/controldir.py:712
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5940
msgid "{0} is{1} redirected to {2}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5941
msgstr "{0} is{1} redirected to {2}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5942
5943
#: bzrlib/diff.py:399
5944
#, python-format
5945
msgid "*** Ignoring files outside view. View is %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5946
msgstr "*** Ignoring files outside view. View is %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5947
5948
#: bzrlib/errors.py:157
5949
msgid "The tree builder is already building a tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5950
msgstr "The tree builder is already building a tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5951
5952
#: bzrlib/errors.py:178
5953
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5954
msgstr "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5955
5956
#: bzrlib/errors.py:197
5957
msgid ""
5958
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5959
"versions \"%(minimum)s\" to \"%(current)s\"."
5960
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5961
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5962
"versions \"%(minimum)s\" to \"%(current)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5963
5964
#: bzrlib/errors.py:209
5965
msgid "The transport '%(transport)s' is only accessible within this process."
5966
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5967
"The transport '%(transport)s' is only accessible within this process."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5968
5969
#: bzrlib/errors.py:227
5970
msgid "Invalid revision number %(revno)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5971
msgstr "Invalid revision number %(revno)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5972
5973
#: bzrlib/errors.py:236
5974
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5975
msgstr "Invalid revision-id {%(revision_id)s} in %(branch)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5976
5977
#: bzrlib/errors.py:247
5978
msgid "Reserved revision-id {%(revision_id)s}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5979
msgstr "Reserved revision-id {%(revision_id)s}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5980
5981
#: bzrlib/errors.py:261
5982
msgid "There is no public branch set for \"%(branch_url)s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5983
msgstr "There is no public branch set for \"%(branch_url)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5984
5985
#: bzrlib/errors.py:271
5986
msgid ""
5987
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5988
"obtain a list of topics."
5989
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5990
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5991
"obtain a list of topics."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5992
5993
#: bzrlib/errors.py:280
5994
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5995
msgstr "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
5996
5997
#: bzrlib/errors.py:290
5998
msgid ""
5999
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
6000
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6001
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6002
6003
#: bzrlib/errors.py:299
6004
msgid "The branch '%(branch)s' is not stacked."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6005
msgstr "The branch '%(branch)s' is not stacked."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6006
6007
#: bzrlib/errors.py:313
6008
msgid "No WorkingTree exists for \"%(base)s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6009
msgstr "No WorkingTree exists for \"%(base)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6010
6011
#: bzrlib/errors.py:322
6012
msgid "Not currently building a tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6013
msgstr "Not currently building a tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6014
6015
#: bzrlib/errors.py:327
6016
msgid "%(url)s is not a local path."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6017
msgstr "%(url)s is not a local path."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6018
6019
#: bzrlib/errors.py:355
6020
msgid "%(not_locked)r is not write locked but needs to be."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6021
msgstr "%(not_locked)r is not write locked but needs to be."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6022
6023
#: bzrlib/errors.py:363
6024
msgid "Error in command line options"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6025
msgstr "Error in command line options"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6026
6027
#: bzrlib/errors.py:368
6028
msgid "%(value)s is not an index of type %(_type)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6029
msgstr "%(value)s is not an index of type %(_type)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6030
6031
#: bzrlib/errors.py:378
6032
msgid "Error in data for index %(value)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6033
msgstr "Error in data for index %(value)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6034
6035
#: bzrlib/errors.py:387
6036
msgid "The key '%(key)s' is already in index '%(index)s'."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6037
msgstr "The key '%(key)s' is already in index '%(index)s'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6038
6039
#: bzrlib/errors.py:397
6040
msgid "The key '%(key)s' is not a valid key."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6041
msgstr "The key '%(key)s' is not a valid key."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6042
6043
#: bzrlib/errors.py:406
6044
msgid "Could not parse options for index %(value)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6045
msgstr "Could not parse options for index %(value)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6046
6047
#: bzrlib/errors.py:415
6048
msgid "The value '%(value)s' is not a valid value."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6049
msgstr "The value '%(value)s' is not a valid value."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6050
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6051
#: bzrlib/errors.py:424
6052
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6053
msgstr "Bad value \"%(value)s\" for option \"%(name)s\"."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6054
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6055
#: bzrlib/errors.py:443
6056
msgid "Generic path error: %(path)r%(extra)s)"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6057
msgstr "Generic path error: %(path)r%(extra)s)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6058
6059
#: bzrlib/errors.py:456
6060
msgid "No such file: %(path)r%(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6061
msgstr "No such file: %(path)r%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6062
6063
#: bzrlib/errors.py:461
6064
msgid "File exists: %(path)r%(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6065
msgstr "File exists: %(path)r%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6066
6067
#: bzrlib/errors.py:467
6068
msgid ""
6069
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
6070
"after to tell bzr about a rename that has already happened)%(extra)s"
6071
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6074
6075
#: bzrlib/errors.py:483
6076
msgid "\"%(path)s\" is not a directory %(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6077
msgstr "\"%(path)s\" is not a directory %(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6078
6079
#: bzrlib/errors.py:488
6080
msgid "\"%(path)s\" is not in the working directory %(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6081
msgstr "\"%(path)s\" is not in the working directory %(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6082
6083
#: bzrlib/errors.py:493
6084
msgid "Directory not empty: \"%(path)s\"%(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6085
msgstr "Directory not empty: \"%(path)s\"%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6086
6087
#: bzrlib/errors.py:498
6088
msgid "Hard-linking \"%(path)s\" is not supported"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6089
msgstr "Hard-linking \"%(path)s\" is not supported"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6090
6091
#: bzrlib/errors.py:513
6092
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6093
msgstr "Device or resource busy: \"%(path)s\"%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6094
6095
#: bzrlib/errors.py:518
6096
msgid "Permission denied: \"%(path)s\"%(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6097
msgstr "Permission denied: \"%(path)s\"%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6098
6099
#: bzrlib/errors.py:523
6100
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6101
msgstr "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6102
6103
#: bzrlib/errors.py:528
6104
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6105
msgstr "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6106
6107
#: bzrlib/errors.py:539
6108
msgid "URLs differ by more than path: %(from_)r and %(to)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6109
msgstr "URLs differ by more than path: %(from_)r and %(to)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6110
6111
#: bzrlib/errors.py:561
6112
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6113
msgstr "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6114
6115
#: bzrlib/errors.py:571
6116
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6117
msgstr "Unsupported protocol for url \"%(path)s\"%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6118
6119
#: bzrlib/errors.py:579
6120
msgid ""
6121
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
6122
"upgrade the branch to permit branch stacking."
6123
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6124
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
6125
"upgrade the branch to permit branch stacking."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6126
6127
#: bzrlib/errors.py:590
6128
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6129
msgstr "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6130
6131
#: bzrlib/errors.py:600
6132
msgid ""
6133
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
6134
"need to upgrade the repository to permit branch stacking."
6135
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6136
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
6137
"need to upgrade the repository to permit branch stacking."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6138
6139
#: bzrlib/errors.py:611
6140
msgid "Error reading from %(path)r."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6141
msgstr "Error reading from %(path)r."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6142
6143
#: bzrlib/errors.py:630
6144
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6145
msgstr "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6146
6147
#: bzrlib/errors.py:646
6148
msgid "Path \"%(path)s\" is not unicode normalized"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6149
msgstr "Path \"%(path)s\" is not unicode normalised"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6150
6151
#: bzrlib/errors.py:654
6152
msgid "Not a branch: \"%(path)s\"%(detail)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6153
msgstr "Not a branch: \"%(path)s\"%(detail)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6154
6155
#: bzrlib/errors.py:696
6156
msgid "No submit branch available for branch \"%(path)s\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6157
msgstr "No submit branch available for branch \"%(path)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6158
6159
#: bzrlib/errors.py:705
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6160
msgid "A control directory already exists: \"%(path)s\"."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6161
msgstr "A control directory already exists: \"%(path)s\"."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6162
6163
#: bzrlib/errors.py:710
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6164
msgid "Already a branch: \"%(path)s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6165
msgstr "Already a branch: \"%(path)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6166
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6167
#: bzrlib/errors.py:715
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6168
msgid "Invalid branch name: %(name)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6169
msgstr "Invalid branch name: %(name)s"
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6170
6171
#: bzrlib/errors.py:724
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6172
msgid "Parent branch already exists: \"%(path)s\"."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6173
msgstr "Parent branch already exists: \"%(path)s\"."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6174
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6175
#: bzrlib/errors.py:730
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6180
"Directory contains a branch, but no working tree (use bzr checkout if you "
6181
"wish to build a working tree): \"%(path)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6182
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6183
#: bzrlib/errors.py:735
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6184
msgid ""
6185
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
6186
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6187
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6188
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6189
#: bzrlib/errors.py:745
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6190
msgid ""
6191
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
6192
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6193
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6194
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6195
#: bzrlib/errors.py:755
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6196
msgid "No repository present: \"%(path)s\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6197
msgstr "No repository present: \"%(path)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6198
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6199
#: bzrlib/errors.py:762
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6200
msgid ""
6201
"Unsupported branch format: %(format)s\n"
6202
"Please run 'bzr upgrade'"
6203
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6204
"Unsupported branch format: %(format)s\n"
6205
"Please run 'bzr upgrade'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6206
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6207
#: bzrlib/errors.py:768
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6208
msgid "Unknown %(kind)s format: %(format)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6209
msgstr "Unknown %(kind)s format: %(format)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6210
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6211
#: bzrlib/errors.py:777
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6212
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6213
msgstr "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6214
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6215
#: bzrlib/errors.py:787
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6216
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6217
msgstr "Parse error on line %(lineno)d of %(format)s format: %(line)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6218
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6219
#: bzrlib/errors.py:802
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6220
msgid ""
6221
"%(target)s\n"
6222
"is not compatible with\n"
6223
"%(source)s\n"
6224
"%(details)s"
6225
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6226
"%(target)s\n"
6227
"is not compatible with\n"
6228
"%(source)s\n"
6229
"%(details)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6230
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6231
#: bzrlib/errors.py:818
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6232
msgid "Revision is not compatible with %(repo_format)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6233
msgstr "Revision is not compatible with %(repo_format)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6234
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6235
#: bzrlib/errors.py:828
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6236
msgid "%(context_info)s%(path)s is already versioned."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6237
msgstr "%(context_info)s%(path)s is already versioned."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6238
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6239
#: bzrlib/errors.py:849
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6240
msgid "%(context_info)s%(path)s is not versioned."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6241
msgstr "%(context_info)s%(path)s is not versioned."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6242
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6243
#: bzrlib/errors.py:870
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6244
msgid "Path(s) are not versioned: %(paths_as_string)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6245
msgstr "Path(s) are not versioned: %(paths_as_string)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6246
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6247
#: bzrlib/errors.py:881
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6248
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6249
msgstr "Path(s) do not exist: %(paths_as_string)s%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6250
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6251
#: bzrlib/errors.py:900
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6252
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6253
msgstr "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6254
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6255
#: bzrlib/errors.py:908
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6256
msgid ""
6257
"Filename %(filename)r is not valid in your current filesystem encoding "
6258
"%(fs_encoding)s"
6259
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6260
"Filename %(filename)r is not valid in your current filesystem encoding "
6261
"%(fs_encoding)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6262
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6263
#: bzrlib/errors.py:919
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6264
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6265
msgstr "Cannot operate on \"%(filename)s\" because it is a control file"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6266
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6267
#: bzrlib/errors.py:937
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6268
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6269
msgstr "The lock for '%(lock_description)s' is in use and cannot be broken."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6270
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6271
#: bzrlib/errors.py:976
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6272
msgid "Cannot lock %(lock)s: %(why)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6273
msgstr "Cannot lock %(lock)s: %(why)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6274
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6275
#: bzrlib/errors.py:986
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6276
msgid ""
6277
"A transaction related operation was attempted after the transaction finished."
6278
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6279
"A transaction related operation was attempted after the transaction finished."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6280
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6281
#: bzrlib/errors.py:1013
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6282
msgid "Cannot lock: transport is read only: %(transport)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6283
msgstr "Cannot lock: transport is read only: %(transport)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6284
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6285
#: bzrlib/errors.py:1021
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6286
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6287
msgstr "Could not acquire lock \"%(lock)s\": %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6288
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6289
#: bzrlib/errors.py:1032
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6290
msgid ""
6291
"Lock was broken while still open: %(lock)s - check storage consistency!"
6292
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6293
"Lock was broken while still open: %(lock)s - check storage consistency!"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6294
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6295
#: bzrlib/errors.py:1043
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6300
"Lock was released and re-acquired before being broken: %(lock)s: held by "
6301
"%(holder)r, wanted to break %(target)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6302
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6303
#: bzrlib/errors.py:1055
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6304
msgid ""
6305
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6306
"Use 'bzr break-lock' to clear it"
6307
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6308
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6309
"Use 'bzr break-lock' to clear it"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6310
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6311
#: bzrlib/errors.py:1068
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6312
msgid "Lock not held: %(lock)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6313
msgstr "Lock not held: %(lock)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6314
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6315
#: bzrlib/errors.py:1097
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6316
msgid "No changes to commit"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6317
msgstr "No changes to commit"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6318
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6319
#: bzrlib/errors.py:1102
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6320
msgid ""
6321
"Selected-file commit of merges is not supported yet: files %(files_str)s"
6322
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6323
"Selected-file commit of merges is not supported yet: files %(files_str)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6324
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6325
#: bzrlib/errors.py:1112
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6326
msgid ""
6327
"Excluding paths during commit is not supported by repository at "
6328
"%(repository)r."
6329
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6330
"Excluding paths during commit is not supported by repository at "
6331
"%(repository)r."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6332
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6333
#: bzrlib/errors.py:1121
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6334
msgid ""
6335
"The specified commit message contains characters unsupported by the current "
6336
"encoding."
6337
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6338
"The specified commit message contains characters unsupported by the current "
6339
"encoding."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6340
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6341
#: bzrlib/errors.py:1127
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6342
msgid "Upgrade URL cannot work with readonly URLs."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6343
msgstr "Upgrade URL cannot work with readonly URLs."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6344
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6345
#: bzrlib/errors.py:1132
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6346
msgid "The branch format %(format)s is already at the most recent format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6347
msgstr "The branch format %(format)s is already at the most recent format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6348
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6349
#: bzrlib/errors.py:1155
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6350
msgid "Option --change does not accept revision ranges"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6351
msgstr "Option --change does not accept revision ranges"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6352
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6353
#: bzrlib/errors.py:1160
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6354
msgid "No namespace registered for string: %(spec)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6355
msgstr "No namespace registered for string: %(spec)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6356
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6357
#: bzrlib/errors.py:1179
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6358
msgid ""
6359
"Requested revision: '%(spec)s' does not exist in branch: "
6360
"%(branch_url)s%(extra)s"
6361
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6362
"Requested revision: '%(spec)s' does not exist in branch: "
6363
"%(branch_url)s%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6364
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6365
#: bzrlib/errors.py:1193
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6372
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6373
#: bzrlib/errors.py:1204
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6378
"These branches have diverged. Use the missing command to see how.\n"
6379
"Use the merge command to reconcile them."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6380
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6381
#: bzrlib/errors.py:1224
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6382
msgid ""
6383
"Branches have no common ancestor, and no merge base revision was specified."
6384
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6385
"Branches have no common ancestor, and no merge base revision was specified."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6386
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6387
#: bzrlib/errors.py:1230
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6388
msgid ""
6389
"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
6390
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6391
"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6392
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6393
#: bzrlib/errors.py:1236
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6394
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6395
msgstr "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6396
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6397
#: bzrlib/errors.py:1245
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6398
msgid ""
6399
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
6400
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6401
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6402
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6403
#: bzrlib/errors.py:1254
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6404
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6405
msgstr "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6406
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6407
#: bzrlib/errors.py:1263
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6408
msgid "Branch %(branch)s has no commits."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6409
msgstr "Branch %(branch)s has no commits."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6410
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6411
#: bzrlib/errors.py:1281
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6412
msgid ""
6413
"Bound branch %(branch)s is out of date with master branch "
6414
"%(master)s.%(extra_help)s"
6415
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6416
"Bound branch %(branch)s is out of date with master branch "
6417
"%(master)s.%(extra_help)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6418
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6419
#: bzrlib/errors.py:1293
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6420
msgid ""
6421
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6422
"bound to %(remote)s."
6423
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6424
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6425
"bound to %(remote)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6426
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6427
#: bzrlib/errors.py:1305
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6428
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6429
msgstr "Cannot pull --overwrite to a branch which is bound %(branch)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6430
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6431
#: bzrlib/errors.py:1314
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6432
msgid ""
6433
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
6434
"%(error)s"
6435
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6436
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
6437
"%(error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6438
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6439
#: bzrlib/errors.py:1326
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6440
msgid "Error in processing weave: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6441
msgstr "Error in processing weave: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6442
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6443
#: bzrlib/errors.py:1335
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6444
msgid "Revision {%(revision_id)s} already present in %(weave)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6445
msgstr "Revision {%(revision_id)s} already present in %(weave)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6446
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6447
#: bzrlib/errors.py:1346
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6448
msgid "Revision {%(revision_id)s} not present in %(weave)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6449
msgstr "Revision {%(revision_id)s} not present in %(weave)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6450
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6451
#: bzrlib/errors.py:1356
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6452
msgid "Weave invariant violated: %(what)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6453
msgstr "Weave invariant violated: %(what)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6454
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6455
#: bzrlib/errors.py:1365
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6456
msgid "Parents are mismatched between two revisions. %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6457
msgstr "Parents are mismatched between two revisions. %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6458
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6459
#: bzrlib/errors.py:1387
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6460
msgid ""
6461
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
6462
"%(weave_b)s"
6463
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6464
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
6465
"%(weave_b)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6466
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6467
#: bzrlib/errors.py:1399
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6468
msgid "Versioned file error"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6469
msgstr "Versioned file error"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6470
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6471
#: bzrlib/errors.py:1404
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6472
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6473
msgstr "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6474
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6475
#: bzrlib/errors.py:1414
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6476
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6477
msgstr "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6478
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6479
#: bzrlib/errors.py:1424
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6480
msgid "Text did not match its checksum: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6481
msgstr "Text did not match its checksum: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6482
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6483
#: bzrlib/errors.py:1550
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6484
msgid "Export format %(format)r not supported"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6485
msgstr "Export format %(format)r not supported"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6486
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6487
#: bzrlib/errors.py:1559
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6488
msgid "Transport error: %(msg)s %(orig_error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6489
msgstr "Transport error: %(msg)s %(orig_error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6490
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6491
#: bzrlib/errors.py:1585
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6492
msgid "Generic bzr smart protocol error: %(details)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6493
msgstr "Generic bzr smart protocol error: %(details)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6494
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6495
#: bzrlib/errors.py:1593
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6496
msgid "Received bad protocol version marker: %(marker)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6497
msgstr "Received bad protocol version marker: %(marker)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6498
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6499
#: bzrlib/errors.py:1625
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6500
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6501
msgstr "Transport operation not possible: %(msg)s %(orig_error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6502
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6503
#: bzrlib/errors.py:1630
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6504
msgid "Connection error: %(msg)s %(orig_error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6505
msgstr "Connection error: %(msg)s %(orig_error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6506
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6507
#: bzrlib/errors.py:1635
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6508
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6509
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6510
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6511
#: bzrlib/errors.py:1656
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6512
msgid "Connection closed: %(msg)s %(orig_error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6513
msgstr "Connection closed: %(msg)s %(orig_error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6514
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6515
#: bzrlib/errors.py:1661
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6516
msgid "Connection Timeout: %(msg)s%(orig_error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6517
msgstr "Connection Timeout: %(msg)s%(orig_error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6518
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6519
#: bzrlib/errors.py:1666
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6520
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6521
msgstr "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6522
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6523
#: bzrlib/errors.py:1676
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6524
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6525
msgstr "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6526
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6527
#: bzrlib/errors.py:1691
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6528
msgid "Certificate error: %(error)s"
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6529
msgstr "Certificate error: %(error)s"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6530
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6531
#: bzrlib/errors.py:1699
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6532
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6533
msgstr "Invalid http range %(range)r for %(path)s: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6534
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6535
#: bzrlib/errors.py:1713
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6536
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6537
msgstr "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6538
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6539
#: bzrlib/errors.py:1721
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6540
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6541
msgstr "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6542
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6543
#: bzrlib/errors.py:1730
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6544
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6545
msgstr "%(source)s is%(permanently)s redirected to %(target)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6546
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6547
#: bzrlib/errors.py:1744
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6548
msgid "Too many redirections"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6549
msgstr "Too many redirections"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6550
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6551
#: bzrlib/errors.py:1749
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6552
msgid "Working tree has conflicts."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6553
msgstr "Working tree has conflicts."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6554
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6555
#: bzrlib/errors.py:1753
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6556
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6557
msgstr "Config file %(filename)s is not UTF-8 encoded\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6558
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6559
#: bzrlib/errors.py:1762
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6560
msgid ""
6561
"Error(s) parsing config file %(filename)s:\n"
6562
"%(errors)s"
6563
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6564
"Error(s) parsing config file %(filename)s:\n"
6565
"%(errors)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6566
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6567
#: bzrlib/errors.py:1772
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6568
msgid ""
6569
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6570
"See ``bzr help %(name)s``"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6571
msgstr ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6572
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6573
"See ``bzr help %(name)s``"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6574
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6575
#: bzrlib/errors.py:1782
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6576
msgid "%(username)r does not seem to contain a reasonable email address"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6577
msgstr "%(username)r does not seem to contain a reasonable email address"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6578
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6579
#: bzrlib/errors.py:1791
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6580
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6581
msgstr "Failed to GPG sign data with command \"%(command_line)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6582
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6583
#: bzrlib/errors.py:1799
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6584
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6585
msgstr "Failed to verify GPG signature data with error \"%(error)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6586
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6587
#: bzrlib/errors.py:1807
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6588
msgid "Unable to import library \"%(library)s\": %(error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6589
msgstr "Unable to import library \"%(library)s\": %(error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6590
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6591
#: bzrlib/errors.py:1815
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6592
msgid "python-gpgme is not installed, it is needed to verify signatures"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6593
msgstr "python-gpgme is not installed, it is needed to verify signatures"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6594
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6595
#: bzrlib/errors.py:1823
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6600
"The working tree for %(basedir)s has changed since the last commit, but "
6601
"weave merge requires that it be unchanged"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6602
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6603
#: bzrlib/errors.py:1833
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6604
msgid ""
6605
"Can't reprocess and show base, because reprocessing obscures the "
6606
"relationship of conflicting lines to the base"
6607
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6608
"Can't reprocess and show base, because reprocessing obscures the "
6609
"relationship of conflicting lines to the base"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6610
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6611
#: bzrlib/errors.py:1839
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6612
msgid "Cycle in graph %(graph)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6613
msgstr "Cycle in graph %(graph)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6614
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6615
#: bzrlib/errors.py:1867
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6616
msgid "File %(filename)s is not conflicted."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6617
msgstr "File %(filename)s is not conflicted."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6618
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6619
#: bzrlib/errors.py:1889
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6620
msgid "No bundle was found in \"%(filename)s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6621
msgstr "No bundle was found in \"%(filename)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6622
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6623
#: bzrlib/errors.py:1898
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6624
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6625
msgstr "Unable to handle bundle version %(version)s: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6626
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6627
#: bzrlib/errors.py:1908
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6628
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6629
msgstr "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6630
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6631
#: bzrlib/errors.py:1921
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6632
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6633
msgstr "File id {%(file_id)s} already exists in inventory as %(entry)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6634
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6635
#: bzrlib/errors.py:1931
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6636
msgid "Key %(key)s is already present in map"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6637
msgstr "Key %(key)s is already present in map"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6638
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6639
#: bzrlib/errors.py:1936
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6640
msgid "The prefix %(prefix)s is in the help search path twice."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6641
msgstr "The prefix %(prefix)s is in the help search path twice."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6642
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6643
#: bzrlib/errors.py:1946
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6644
msgid ""
6645
"No final name for trans_id %(trans_id)r\n"
6646
"file-id: %(file_id)r\n"
6647
"root trans-id: %(root_trans_id)r\n"
6648
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6652
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6653
#: bzrlib/errors.py:1978
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6654
msgid "Attempt to reuse a transform that has already been applied."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6655
msgstr "Attempt to reuse a transform that has already been applied."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6656
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6657
#: bzrlib/errors.py:1983
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6658
msgid "Moving the root directory is not supported at this time"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6659
msgstr "Moving the root directory is not supported at this time"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6660
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6661
#: bzrlib/errors.py:1988
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6662
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6663
msgstr "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6664
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6665
#: bzrlib/errors.py:1999
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6666
msgid ""
6667
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6668
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6669
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6670
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6671
#: bzrlib/errors.py:2035
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6672
msgid ""
6673
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6674
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6675
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6676
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6677
#: bzrlib/errors.py:2065
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6678
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6679
msgstr "Unable to import paramiko (required for sftp support): %(error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6680
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6681
#: bzrlib/errors.py:2073
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6682
msgid "Nothing to merge."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6683
msgstr "Nothing to merge."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6684
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6685
#: bzrlib/errors.py:2078
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6686
msgid "Format %(format)s cannot be initialised by this version of bzr."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6687
msgstr "Format %(format)s cannot be initialised by this version of bzr."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6688
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6689
#: bzrlib/errors.py:2087
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6690
msgid ""
6691
"Cannot convert from format %(from_format)s to format %(format)s.    "
6692
"%(problem)s"
6693
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6694
"Cannot convert from format %(from_format)s to format %(format)s.    "
6695
"%(problem)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6696
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6697
#: bzrlib/errors.py:2099
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6698
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6699
msgstr "Could not find an appropriate Differ for file \"%(path)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6700
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6701
#: bzrlib/errors.py:2107
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6702
msgid "%(exe_name)s could not be found on this machine"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6703
msgstr "%(exe_name)s could not be found on this machine"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6704
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6705
#: bzrlib/errors.py:2115
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6706
msgid "Diff is not installed on this machine: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6707
msgstr "Diff is not installed on this machine: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6708
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6709
#: bzrlib/errors.py:2123
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6710
msgid "Diff3 is not installed on this machine."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6711
msgstr "Diff3 is not installed on this machine."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6712
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6713
#: bzrlib/errors.py:2129
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6714
msgid "The content being inserted is already present."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6715
msgstr "The content being inserted is already present."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6716
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6717
#: bzrlib/errors.py:2134
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6728
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6729
#: bzrlib/errors.py:2145
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6738
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6739
#: bzrlib/errors.py:2155
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6750
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6751
#: bzrlib/errors.py:2166
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6760
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6761
#: bzrlib/errors.py:2176
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6762
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6763
msgstr "Working tree is out of date, please run 'bzr update'.%(more)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6764
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6765
#: bzrlib/errors.py:2190
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6766
msgid ""
6767
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6768
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6769
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6770
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6771
#: bzrlib/errors.py:2203
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6772
msgid "Error in merge modified format"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6773
msgstr "Error in merge modified format"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6774
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6775
#: bzrlib/errors.py:2208
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6776
msgid "Format error in conflict listings"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6777
msgstr "Format error in conflict listings"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6778
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6779
#: bzrlib/errors.py:2212
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6780
msgid ""
6781
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6782
"Error: %(description)s"
6783
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6784
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6785
"Error: %(description)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6786
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6787
#: bzrlib/errors.py:2223
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6792
"An error has been detected in the repository %(repo_path)s.\n"
6793
"Please run bzr reconcile on this repository."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6794
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6795
#: bzrlib/errors.py:2234
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6796
msgid ""
6797
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6798
"reason: %(reason)s"
6799
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6800
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6801
"reason: %(reason)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6802
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6803
#: bzrlib/errors.py:2247
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6804
msgid ""
6805
"An inconsistent delta was supplied: %(delta)r\n"
6806
"reason: %(reason)s"
6807
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6808
"An inconsistent delta was supplied: %(delta)r\n"
6809
"reason: %(reason)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6810
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6811
#: bzrlib/errors.py:2259
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6812
msgid "To use this feature you must upgrade your branch at %(path)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6813
msgstr "To use this feature you must upgrade your branch at %(path)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6814
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6815
#: bzrlib/errors.py:2268
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6816
msgid "To use this feature you must upgrade your repository at %(path)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6817
msgstr "To use this feature you must upgrade your repository at %(path)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6818
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6819
#: bzrlib/errors.py:2273
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6820
msgid ""
6821
"To use this feature you must upgrade your branch at %(path)s to a format "
6822
"which supports rich roots."
6823
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6824
"To use this feature you must upgrade your branch at %(path)s to a format "
6825
"which supports rich roots."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6826
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6827
#: bzrlib/errors.py:2279
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6828
msgid "Cannot perform local-only commits on unbound branches."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6829
msgstr "Cannot perform local-only commits on unbound branches."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6830
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6831
#: bzrlib/errors.py:2284
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6832
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6833
msgstr "The method %(mname)s is not supported on objects of type %(tname)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6834
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6835
#: bzrlib/errors.py:2305
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6836
msgid "Ghost tags not supported by format %(format)r."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6837
msgstr "Ghost tags not supported by format %(format)r."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6838
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6839
#: bzrlib/errors.py:2313
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6840
msgid "File is binary but should be text."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6841
msgstr "File is binary but should be text."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6842
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6843
#: bzrlib/errors.py:2318
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6844
msgid "The path %(path)s is not permitted on this platform"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6845
msgstr "The path %(path)s is not permitted on this platform"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6846
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6847
#: bzrlib/errors.py:2327
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6848
msgid ""
6849
"Testament did not match expected value.\n"
6850
"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6851
"       {%(measured)s}"
6852
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6853
"Testament did not match expected value.\n"
6854
"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6855
"       {%(measured)s}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6856
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6857
#: bzrlib/errors.py:2339
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6858
msgid "Not a bzr revision-bundle: %(text)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6859
msgstr "Not a bzr revision-bundle: %(text)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6860
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6861
#: bzrlib/errors.py:2348
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6862
msgid "Bad bzr revision-bundle: %(text)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6863
msgstr "Bad bzr revision-bundle: %(text)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6864
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6865
#: bzrlib/errors.py:2357
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6866
msgid "Malformed bzr revision-bundle header: %(text)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6867
msgstr "Malformed bzr revision-bundle header: %(text)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6868
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6869
#: bzrlib/errors.py:2362
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6870
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6871
msgstr "Malformed patches in bzr revision-bundle: %(text)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6872
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6873
#: bzrlib/errors.py:2367
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6874
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6875
msgstr "Malformed footer in bzr revision-bundle: %(text)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6876
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6877
#: bzrlib/errors.py:2372
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6878
msgid "End of line marker was not \\n in bzr revision-bundle"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6879
msgstr "End of line marker was not \\n in bzr revision-bundle"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6880
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6881
#: bzrlib/errors.py:2382
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6882
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6883
msgstr "Bundle format %(bundle_format)s is incompatible with %(other)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6884
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6885
#: bzrlib/errors.py:2392
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6886
msgid "Root class for inventory serialization errors"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6887
msgstr "Root class for inventory serialisation errors"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6888
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6889
#: bzrlib/errors.py:2396
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6890
msgid ""
6891
"The inventory was not in the expected format:\n"
6892
" %(msg)s"
6893
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6894
"The inventory was not in the expected format:\n"
6895
" %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6896
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6897
#: bzrlib/errors.py:2405
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6898
msgid "This operation requires rich root data storage"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6899
msgstr "This operation requires rich root data storage"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6900
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6901
#: bzrlib/errors.py:2418
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6902
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6903
msgstr "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6904
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6905
#: bzrlib/errors.py:2427
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6906
msgid ""
6907
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6908
"variable."
6909
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6910
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6911
"variable."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6912
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6913
#: bzrlib/errors.py:2434
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6918
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6919
"ghost at {%(ghost_revision_id)s}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6920
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6921
#: bzrlib/errors.py:2444
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6922
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6923
msgstr "Ghost revision {%(revision_id)s} cannot be used here."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6924
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6925
#: bzrlib/errors.py:2495
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6926
msgid ""
6927
"A merge directive must provide either a bundle or a public branch location."
6928
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6929
"A merge directive must provide either a bundle or a public branch location."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6930
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6931
#: bzrlib/errors.py:2502
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6932
msgid "Bad merge directive payload %(start)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6933
msgstr "Bad merge directive payload %(start)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6934
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6935
#: bzrlib/errors.py:2512
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6936
msgid "Preview patch does not match requested changes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6937
msgstr "Preview patch does not match requested changes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6938
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6939
#: bzrlib/errors.py:2518
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6940
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6941
msgstr "Patch_type was %(patch_type)s, but no patch was supplied."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6942
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6943
#: bzrlib/errors.py:2528
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6944
msgid ""
6945
"Your branch does not have all of the revisions required in order to merge "
6946
"this merge directive and the target location specified in the merge "
6947
"directive is not a branch: %(location)s."
6948
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6952
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6953
#: bzrlib/errors.py:2540
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6954
msgid "Unsupported entry kind %(kind)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6955
msgstr "Unsupported entry kind %(kind)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6956
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6957
#: bzrlib/errors.py:2548
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6958
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6959
msgstr "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6960
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6961
#: bzrlib/errors.py:2558
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6962
msgid "Subsume target %(other_tree)s needs to be upgraded."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6963
msgstr "Subsume target %(other_tree)s needs to be upgraded."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6964
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6965
#: bzrlib/errors.py:2577
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6966
msgid "No such tag: %(tag_name)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6967
msgstr "No such tag: %(tag_name)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6968
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6969
#: bzrlib/errors.py:2585
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6970
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6971
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6972
"Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6973
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6974
#: bzrlib/errors.py:2594
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6975
msgid "Tag %(tag_name)s already exists."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6976
msgstr "Tag %(tag_name)s already exists."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6977
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6978
#: bzrlib/errors.py:2602
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6983
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6984
"bugs\" for more information on this feature."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6985
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6986
#: bzrlib/errors.py:2612
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6987
msgid ""
6988
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6989
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6990
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6991
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6992
#: bzrlib/errors.py:2622
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6993
msgid ""
6994
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6995
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6996
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6997
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6998
#: bzrlib/errors.py:2632
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
6999
msgid "Invalid line in bugs property: '%(line)s'"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7000
msgstr "Invalid line in bugs property: '%(line)s'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7001
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7002
#: bzrlib/errors.py:2640
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7003
msgid "Invalid bug status: '%(status)s'"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7004
msgstr "Invalid bug status: '%(status)s'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7005
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7006
#: bzrlib/errors.py:2648
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7007
msgid "Could not understand response from smart server: %(response_tuple)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7008
msgstr "Could not understand response from smart server: %(response_tuple)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7009
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7010
#: bzrlib/errors.py:2687
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7011
msgid "Server sent an unexpected error: %(error_tuple)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7012
msgstr "Server sent an unexpected error: %(error_tuple)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7013
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7014
#: bzrlib/errors.py:2706
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7015
msgid "Unrecognised container format: %(container_format)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7016
msgstr "Unrecognised container format: %(container_format)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7017
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7018
#: bzrlib/errors.py:2714
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7019
msgid "Unexpected end of container stream"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7020
msgstr "Unexpected end of container stream"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7021
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7022
#: bzrlib/errors.py:2719
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7023
msgid "Unknown record type: %(record_type)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7024
msgstr "Unknown record type: %(record_type)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7025
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7026
#: bzrlib/errors.py:2727
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7027
msgid "Invalid record: %(reason)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7028
msgstr "Invalid record: %(reason)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7029
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7030
#: bzrlib/errors.py:2735
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7031
msgid "Container has data after end marker: %(excess)r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7032
msgstr "Container has data after end marker: %(excess)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7033
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7034
#: bzrlib/errors.py:2743
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7035
msgid "Container has multiple records with the same name: %(name)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7036
msgstr "Container has multiple records with the same name: %(name)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7037
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7038
#: bzrlib/errors.py:2756
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7039
msgid "Corrupt or incompatible data stream: %(reason)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7040
msgstr "Corrupt or incompatible data stream: %(reason)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7041
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7042
#: bzrlib/errors.py:2764
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7043
msgid "SMTP error: %(error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7044
msgstr "SMTP error: %(error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7045
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7046
#: bzrlib/errors.py:2772
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7047
msgid "No message supplied."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7048
msgstr "No message supplied."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7049
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7050
#: bzrlib/errors.py:2777
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7051
msgid "No mail-to address (--mail-to) or output (-o) specified."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7052
msgstr "No mail-to address (--mail-to) or output (-o) specified."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7053
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7054
#: bzrlib/errors.py:2782
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7055
msgid ""
7056
"Unable to find mail client with the following names: "
7057
"%(mail_command_list_string)s"
7058
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7059
"Unable to find mail client with the following names: "
7060
"%(mail_command_list_string)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7061
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7062
#: bzrlib/errors.py:2792
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7063
msgid "SMTP connection to %(host)s refused"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7064
msgstr "SMTP connection to %(host)s refused"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7065
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7066
#: bzrlib/errors.py:2801
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7067
msgid "Please specify smtp_server.  No server at default %(host)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7068
msgstr "Please specify smtp_server.  No server at default %(host)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7069
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7070
#: bzrlib/errors.py:2815
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7071
msgid ""
7072
"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
7073
"reconfigure."
7074
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7075
"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
7076
"reconfigure."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7077
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7078
#: bzrlib/errors.py:2827
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7079
msgid "'%(display_url)s' is already a branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7080
msgstr "'%(display_url)s' is already a branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7081
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7082
#: bzrlib/errors.py:2832
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7083
msgid "'%(display_url)s' is already a tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7084
msgstr "'%(display_url)s' is already a tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7085
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7086
#: bzrlib/errors.py:2837
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7087
msgid "'%(display_url)s' is already a checkout."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7088
msgstr "'%(display_url)s' is already a checkout."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7089
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7090
#: bzrlib/errors.py:2842
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7091
msgid "'%(display_url)s' is already a lightweight checkout."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7092
msgstr "'%(display_url)s' is already a lightweight checkout."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7093
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7094
#: bzrlib/errors.py:2847
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7095
msgid "'%(display_url)s' is already using a shared repository."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7096
msgstr "'%(display_url)s' is already using a shared repository."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7097
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7098
#: bzrlib/errors.py:2852
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7099
msgid "'%(display_url)s' is already standalone."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7100
msgstr "'%(display_url)s' is already standalone."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7101
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7102
#: bzrlib/errors.py:2857
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7103
msgid "Shared repository '%(display_url)s' already creates working trees."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7104
msgstr "Shared repository '%(display_url)s' already creates working trees."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7105
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7106
#: bzrlib/errors.py:2863
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7107
msgid ""
7108
"Shared repository '%(display_url)s' already doesn't create working trees."
7109
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7110
"Shared repository '%(display_url)s' already doesn't create working trees."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7111
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7112
#: bzrlib/errors.py:2869
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7113
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7114
msgstr "Requested reconfiguration of '%(display_url)s' is not supported."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7115
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7116
#: bzrlib/errors.py:2874
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7117
msgid "No location could be found to bind to at %(display_url)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7118
msgstr "No location could be found to bind to at %(display_url)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7119
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7120
#: bzrlib/errors.py:2879
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7121
msgid ""
7122
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
7123
"status).%(more)s"
7124
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7125
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
7126
"status).%(more)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7127
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7128
#: bzrlib/errors.py:2898
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7129
msgid ""
7130
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
7131
"list).%(more)s"
7132
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7133
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
7134
"list).%(more)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7135
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7136
#: bzrlib/errors.py:2904
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7137
msgid "Variable {%(name)s} is not available."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7138
msgstr "Variable {%(name)s} is not available."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7139
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7140
#: bzrlib/errors.py:2912
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7141
msgid "No template specified."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7142
msgstr "No template specified."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7143
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7144
#: bzrlib/errors.py:2917
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7145
msgid "Unable to create symlink %(path_str)son this platform"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7146
msgstr "Unable to create symlink %(path_str)son this platform"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7147
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7148
#: bzrlib/errors.py:2932
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7149
msgid ""
7150
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
7151
"\"original\", \"local\"."
7152
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7153
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
7154
"\"original\", \"local\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7155
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7156
#: bzrlib/errors.py:2966
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7157
msgid ""
7158
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
7159
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7160
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7161
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7162
#: bzrlib/errors.py:2978
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7163
msgid "The \"%(config_id)s\" configuration does not exist."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7164
msgstr "The \"%(config_id)s\" configuration does not exist."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7165
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7166
#: bzrlib/errors.py:2986
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7167
msgid "The \"%(option_name)s\" configuration option does not exist."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7168
msgstr "The \"%(option_name)s\" configuration option does not exist."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7169
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7170
#: bzrlib/errors.py:2994
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7171
msgid "The alias \"%(alias_name)s\" does not exist."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7172
msgstr "The alias \"%(alias_name)s\" does not exist."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7173
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7174
#: bzrlib/errors.py:3008
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7175
msgid "\"%(alias_name)s\" is not a valid location alias."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7176
msgstr "\"%(alias_name)s\" is not a valid location alias."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7177
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7178
#: bzrlib/errors.py:3016
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7179
msgid "No %(alias_name)s location assigned."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7180
msgstr "No %(alias_name)s location assigned."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7181
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7182
#: bzrlib/errors.py:3024
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7183
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7184
msgstr "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7185
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7186
#: bzrlib/errors.py:3034
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7187
msgid "Unknown rules detected: %(unknowns_str)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7188
msgstr "Unknown rules detected: %(unknowns_str)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7189
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7190
#: bzrlib/errors.py:3045
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7191
msgid "Tip change rejected: %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7192
msgstr "Tip change rejected: %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7193
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7194
#: bzrlib/errors.py:3053
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7195
msgid "Shelf corrupt."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7196
msgstr "Shelf corrupt."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7197
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7198
#: bzrlib/errors.py:3058
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7199
msgid "Corruption while decompressing repository file%(orig_error)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7200
msgstr "Corruption while decompressing repository file%(orig_error)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7201
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7202
#: bzrlib/errors.py:3070
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7203
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7204
msgstr "No changes are shelved with id \"%(shelf_id)d\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7205
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7206
#: bzrlib/errors.py:3078
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7207
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7208
msgstr "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7209
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7210
#: bzrlib/errors.py:3086
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7211
msgid ""
7212
"An attempt to access a url outside the server jail was made: '%(url)s'."
7213
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7214
"An attempt to access a url outside the server jail was made: '%(url)s'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7215
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7216
#: bzrlib/errors.py:3094
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7217
msgid "The user aborted the operation."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7218
msgstr "The user aborted the operation."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7219
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7220
#: bzrlib/errors.py:3099
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7221
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7222
msgstr "Branching '%(url)s'(%(format)s) must create a working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7223
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7224
#: bzrlib/errors.py:3109
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7225
msgid "No such view: %(view_name)s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7226
msgstr "No such view: %(view_name)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7227
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7228
#: bzrlib/errors.py:3119
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7229
msgid ""
7230
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
7231
"to a later format."
7232
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7233
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
7234
"to a later format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7235
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7236
#: bzrlib/errors.py:3128
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7237
msgid ""
7238
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
7239
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7240
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7241
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7242
#: bzrlib/errors.py:3195
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7243
msgid "%(bzrdir)r does not support co-located branches."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7244
msgstr "%(bzrdir)r does not support co-located branches."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7245
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7246
#: bzrlib/errors.py:3201
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7247
msgid ""
7248
"Unable to determine your name.\n"
7249
"Please, set your name with the 'whoami' command.\n"
7250
"E.g. bzr whoami \"Your Name <name@example.com>\""
7251
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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>\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7255
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7256
#: bzrlib/errors.py:3210
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7257
msgid "Invalid pattern(s) found. %(msg)s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7258
msgstr "Invalid pattern(s) found. %(msg)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7259
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7260
#: bzrlib/errors.py:3218
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7261
msgid ""
7262
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
7263
"unbind` to fix."
7264
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7265
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
7266
"unbind` to fix."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7267
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7268
#: bzrlib/errors.py:3229
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7269
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7270
msgstr "Loop involving %(refs)r while expanding \"%(string)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7271
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7272
#: bzrlib/errors.py:3238
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7273
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7274
msgstr "Option %(name)s is not defined while expanding \"%(string)s\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7275
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7276
#: bzrlib/errors.py:3247
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7277
msgid ""
7278
"No compatible object available for operations from %(source)r to %(target)r."
7279
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7280
"No compatible object available for operations from %(source)r to %(target)r."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7281
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7282
#: bzrlib/errors.py:3257
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7283
msgid ""
7284
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
7285
"%(arguments)s."
7286
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7287
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
7288
"%(arguments)s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7289
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7290
#: bzrlib/errors.py:3267
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7295
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
7296
"format %(format)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7297
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7298
#: bzrlib/errors.py:3279
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7299
msgid ""
7300
"Missing feature %(feature)s not provided by this version of Bazaar or any "
7301
"plugin."
7302
msgstr ""
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7303
"Missing feature %(feature)s not provided by this version of Bazaar or any "
7304
"plugin."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7305
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7306
#: bzrlib/errors.py:3292
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7307
msgid "Binary files section encountered."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7308
msgstr "Binary files section encountered."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7309
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7310
#: bzrlib/errors.py:3300
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7311
msgid ""
7312
"Malformed patch header.  %(desc)s\n"
7313
"%(line)r"
7314
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7315
"Malformed patch header.  %(desc)s\n"
7316
"%(line)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7317
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7318
#: bzrlib/errors.py:3309
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7319
msgid ""
7320
"Malformed hunk header.  %(desc)s\n"
7321
"%(line)r"
7322
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7323
"Malformed hunk header.  %(desc)s\n"
7324
"%(line)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7325
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7326
#: bzrlib/errors.py:3318
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7327
msgid ""
7328
"Malformed line.  %(desc)s\n"
7329
"%(line)r"
7330
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7331
"Malformed line.  %(desc)s\n"
7332
"%(line)r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7333
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7334
#: bzrlib/errors.py:3328
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7339
"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
7340
"but patch says it should be \"%(patch_line)s\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7341
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7342
#: bzrlib/errors.py:3339
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7343
msgid "The feature %(feature)s has already been registered."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7344
msgstr "The feature %(feature)s has already been registered."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7345
7346
#: bzrlib/export_pot.py:252
7347
#, python-format
7348
msgid "Exporting messages from builtin command: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7349
msgstr "Exporting messages from builtin command: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7350
7351
#: bzrlib/export_pot.py:271
7352
msgid "Exporting messages from plugin command: {0} in {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7353
msgstr "Exporting messages from plugin command: {0} in {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7354
7355
#: bzrlib/export_pot.py:292
7356
#, python-format
7357
msgid "Exporting message from error: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7358
msgstr "Exporting message from error: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7359
7360
#: bzrlib/fetch.py:98
7361
msgid "Finding revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7362
msgstr "Finding revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7363
7364
#: bzrlib/fetch.py:103
7365
msgid "Fetching revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7366
msgstr "Fetching revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7367
7368
#: bzrlib/foreign.py:262
7369
msgid "Push into a different VCS without any custom bzr metadata."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7370
msgstr "Push into a different VCS without any custom bzr metadata."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7371
7372
#: bzrlib/foreign.py:264
7373
msgid ""
7374
"This will afterwards rebase the local branch on the remote\n"
7375
"branch unless the --no-rebase option is used, in which case \n"
7376
"the two branches will be out of sync after the push. "
7377
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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. "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7381
7382
#: bzrlib/foreign.py:277
7383
msgid "Do not rebase after push."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7384
msgstr "Do not rebase after push."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7385
7386
#: bzrlib/foreign.py:311
7387
#, python-format
7388
msgid "Using saved location: %s\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7389
msgstr "Using saved location: %s\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7390
7391
#: bzrlib/foreign.py:321
7392
msgid ""
7393
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
7394
"regular push."
7395
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7396
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
7397
"regular push."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7398
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7399
#: bzrlib/gpg.py:366
7400
msgid "No GnuPG key results for pattern: {0}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7401
msgstr "No GnuPG key results for pattern: {0}"
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7402
7403
#: bzrlib/gpg.py:439
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7404
msgid "{0} commits with valid signatures"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7405
msgstr "{0} commits with valid signatures"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7406
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7407
#: bzrlib/gpg.py:445
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7408
msgid "{0} commit with unknown key"
7409
msgid_plural "{0} commits with unknown keys"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7410
msgstr[0] "{0} commit with unknown key"
7411
msgstr[1] "{0} commits with unknown keys"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7412
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7413
#: bzrlib/gpg.py:453
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7414
msgid "{0} commit not valid"
7415
msgid_plural "{0} commits not valid"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7416
msgstr[0] "{0} commit not valid"
7417
msgstr[1] "{0} commits not valid"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7418
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7419
#: bzrlib/gpg.py:461
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7420
msgid "{0} commit not signed"
7421
msgid_plural "{0} commits not signed"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7422
msgstr[0] "{0} commit not signed"
7423
msgstr[1] "{0} commits not signed"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7424
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7425
#: bzrlib/gpg.py:469
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7426
msgid "{0} commit with key now expired"
7427
msgid_plural "{0} commits with key now expired"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7428
msgstr[0] "{0} commit with key now expired"
7429
msgstr[1] "{0} commits with key now expired"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7430
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7436
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7437
#: bzrlib/gpg.py:505
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7438
msgid "{0} signed {1} commit"
7439
msgid_plural "{0} signed {1} commits"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7440
msgstr[0] "{0} signed {1} commit"
7441
msgstr[1] "{0} signed {1} commits"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7442
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7443
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7444
msgid "{0} commit by author {1}"
7445
msgid_plural "{0} commits by author {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7446
msgstr[0] "{0} commit by author {1}"
7447
msgstr[1] "{0} commits by author {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7448
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7449
#: bzrlib/gpg.py:554
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7450
msgid "Unknown key {0} signed {1} commit"
7451
msgid_plural "Unknown key {0} signed {1} commits"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7452
msgstr[0] "Unknown key {0} signed {1} commit"
7453
msgstr[1] "Unknown key {0} signed {1} commits"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7454
7455
#: bzrlib/groupcompress.py:1739
7456
#, python-format
7457
msgid "Insert claimed random_id=True, but then inserted %r two times"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7458
msgstr "Insert claimed random_id=True, but then inserted %r two times"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7459
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7460
#: bzrlib/hooks.py:313
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7461
#, python-format
7462
msgid "Introduced in: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7463
msgstr "Introduced in: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7464
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7465
#: bzrlib/hooks.py:316
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7466
#, python-format
7467
msgid "Deprecated in: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7468
msgstr "Deprecated in: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7469
7470
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
7471
msgid "Walking content"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7472
msgstr "Walking content"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7473
7474
#: bzrlib/knit.py:3330
7475
msgid "annotating"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7476
msgstr "annotating"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7477
7478
#: bzrlib/lock.py:548
7479
msgid "{0!r} was {1} locked again"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7480
msgstr "{0!r} was {1} locked again"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7481
7482
#: bzrlib/lockdir.py:321
7483
#, python-format
7484
msgid "error removing pending lock: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7485
msgstr "error removing pending lock: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7486
7487
#: bzrlib/lockdir.py:616
7488
msgid "Unable to obtain"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7489
msgstr "Unable to obtain"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7490
7491
#: bzrlib/lockdir.py:618
7492
msgid "Lock owner changed for"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7493
msgstr "Lock owner changed for"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7494
7495
#: bzrlib/lockdir.py:620
7496
msgid "{0} lock {1} {2}."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7497
msgstr "{0} lock {1} {2}."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7498
7499
#: bzrlib/lockdir.py:627
7500
#, python-format
7501
msgid "Will continue to try until %s, unless you press Ctrl-C."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7502
msgstr "Will continue to try until %s, unless you press Ctrl-C."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7503
7504
#: bzrlib/lockdir.py:629
7505
msgid "See \"bzr help break-lock\" for more."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7506
msgstr "See \"bzr help break-lock\" for more."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7507
7508
#: bzrlib/lockdir.py:739
7509
#, python-format
7510
msgid ""
7511
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
7512
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7513
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7514
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7515
#: bzrlib/log.py:563
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7516
msgid "--exclude-common-ancestry requires two different revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7517
msgstr "--exclude-common-ancestry requires two different revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7518
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7519
#: bzrlib/log.py:565
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7520
#, python-format
7521
msgid "invalid direction %r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7522
msgstr "invalid direction %r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7523
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7524
#: bzrlib/log.py:653
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7525
msgid "Start revision not found in history of end revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7526
msgstr "Start revision not found in history of end revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7527
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7528
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7529
msgid "Logging revision 0 is invalid."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7530
msgstr "Logging revision 0 is invalid."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7531
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7532
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7533
msgid "Start revision must be older than the end revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7534
msgstr "Start revision must be older than the end revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7535
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7536
#: bzrlib/log.py:1818
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7537
#, python-format
7538
msgid "unknown log formatter: %r"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7539
msgstr "unknown log formatter: %r"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7540
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7541
#: bzrlib/log.py:2114
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7542
msgid "fixes bug"
7543
msgid_plural "fixes bugs"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7544
msgstr[0] "fixes bug"
7545
msgstr[1] "fixes bugs"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7546
7547
#: bzrlib/merge.py:689
7548
msgid "All changes applied successfully."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7549
msgstr "All changes applied successfully."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7550
7551
#: bzrlib/merge.py:691
7552
#, python-format
7553
msgid "%d conflicts encountered."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7554
msgstr "%d conflicts encountered."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7555
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7556
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7557
msgid "Preparing file merge"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7558
msgstr "Preparing file merge"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7559
7560
#: bzrlib/multiparent.py:426
7561
msgid "Importing revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7562
msgstr "Importing revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7563
7564
#: bzrlib/option.py:526
7565
msgid "Show help message."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7566
msgstr "Show help message."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7567
7568
#: bzrlib/option.py:528
7569
msgid "Only display errors and warnings."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7570
msgstr "Only display errors and warnings."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7571
7572
#: bzrlib/option.py:531
7573
msgid "Show usage message and options."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7574
msgstr "Show usage message and options."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7575
7576
#: bzrlib/option.py:533
7577
msgid "Display more information."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7578
msgstr "Display more information."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7579
7580
#: bzrlib/option.py:541
7581
msgid ""
7582
"Select changes introduced by the specified revision. See also \"help "
7583
"revisionspec\"."
7584
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7585
"Select changes introduced by the specified revision. See also \"help "
7586
"revisionspec\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7587
7588
#: bzrlib/option.py:543
7589
msgid "Branch to operate on, instead of working directory."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7590
msgstr "Branch to operate on, instead of working directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7591
7592
#: bzrlib/option.py:545
7593
msgid "Detailed log format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7594
msgstr "Detailed log format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7595
7596
#: bzrlib/option.py:545
7597
msgid "Format used by GNU ChangeLog files."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7598
msgstr "Format used by GNU ChangeLog files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7599
7600
#: bzrlib/option.py:545
7601
msgid "Log format with one line per revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7602
msgstr "Log format with one line per revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7603
7604
#: bzrlib/option.py:545
7605
msgid "Moderately short log format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7606
msgstr "Moderately short log format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7607
7608
#: bzrlib/option.py:545
7609
msgid "Use specified log format."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7610
msgstr "Use specified log format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7611
7612
#: bzrlib/option.py:547
7613
msgid "Log format"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7614
msgstr "Log format"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7615
7616
#: bzrlib/option.py:549
7617
msgid "LCA-newness merge."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7618
msgstr "LCA-newness merge."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7619
7620
#: bzrlib/option.py:549
7621
msgid "Merge using external diff3."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7622
msgstr "Merge using external diff3."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7623
7624
#: bzrlib/option.py:549
7625
msgid "Native diff3-style merge."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7626
msgstr "Native diff3-style merge."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7627
7628
#: bzrlib/option.py:549
7629
msgid "Select a particular merge algorithm."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7630
msgstr "Select a particular merge algorithm."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7631
7632
#: bzrlib/option.py:549
7633
msgid "Weave-based merge."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7634
msgstr "Weave-based merge."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7635
7636
#: bzrlib/option.py:551
7637
msgid "Merge algorithm"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7638
msgstr "Merge algorithm"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7639
7640
#: bzrlib/option.py:554
7641
msgid "Message string."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7642
msgstr "Message string."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7643
7644
#: bzrlib/option.py:556
7645
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7646
msgstr "Use an ASCII NUL (\\0) separator rather than a newline."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7647
7648
#: bzrlib/option.py:558
7649
msgid "Ignore differences between branches and overwrite unconditionally."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7650
msgstr "Ignore differences between branches and overwrite unconditionally."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7651
7652
#: bzrlib/option.py:560
7653
msgid "Remember the specified location as a default."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7654
msgstr "Remember the specified location as a default."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7655
7656
#: bzrlib/option.py:562
7657
msgid "Reprocess to reduce spurious conflicts."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7658
msgstr "Reprocess to reduce spurious conflicts."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7659
7660
#: bzrlib/option.py:566
7661
msgid "See \"help revisionspec\" for details."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7662
msgstr "See \"help revisionspec\" for details."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7663
7664
#: bzrlib/option.py:568
7665
msgid "Show internal object ids."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7666
msgstr "Show internal object ids."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7667
7668
#: bzrlib/option.py:571
7669
msgid "Display timezone as local, original, or utc."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7670
msgstr "Display timezone as local, original, or utc."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7671
7672
#: bzrlib/osutils.py:100
7673
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7674
msgstr "Parameter {0!r} encoding is unsupported by {1} application locale."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7675
7676
#: bzrlib/osutils.py:220
7677
msgid "lstat/stat of ({0!r}): {1!r}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7678
msgstr "lstat/stat of ({0!r}): {1!r}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7679
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7680
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7681
#, python-format
7682
msgid "sorry, %r not allowed in path"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7683
msgstr "sorry, %r not allowed in path"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7684
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7685
#: bzrlib/osutils.py:1259
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7686
#, python-format
7687
msgid "%r is too short to calculate a relative path"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7688
msgstr "%r is too short to calculate a relative path"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7689
7690
#: bzrlib/plugin.py:143
7691
#, python-format
7692
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7693
msgstr "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7694
7695
#: bzrlib/plugins/bash_completion/bashcomp.py:411
7696
msgid "Enable completions for the selected plugin (default: all plugins)"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7697
msgstr "Enable completions for the selected plugin (default: all plugins)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7698
7699
#: bzrlib/plugins/bash_completion/bashcomp.py:412
7700
msgid "Generate a shell function for bash command line completion."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7701
msgstr "Generate a shell function for bash command line completion."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7702
7703
#: bzrlib/plugins/bash_completion/bashcomp.py:414
7704
msgid ""
7705
"This command generates a shell function which can be used by bash to\n"
7706
"automatically complete the currently typed command when the user presses\n"
7707
"the completion key (usually tab)."
7708
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7712
7713
#: bzrlib/plugins/bash_completion/bashcomp.py:418
7714
msgid ""
7715
"Commonly used like this:\n"
7716
"    eval \"`bzr bash-completion`\""
7717
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7718
"Commonly used like this:\n"
7719
"    eval \"`bzr bash-completion`\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7720
7721
#: bzrlib/plugins/bash_completion/bashcomp.py:424
7722
msgid "Name of the generated function (default: _bzr)"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7723
msgstr "Name of the generated function (default: _bzr)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7724
7725
#: bzrlib/plugins/bash_completion/bashcomp.py:426
7726
msgid "Generate only the shell function, don't enable it"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7727
msgstr "Generate only the shell function, don't enable it"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7728
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7729
#: bzrlib/plugins/launchpad/account.py:66
7730
msgid "Setting ssh/sftp usernames for launchpad.net."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7731
msgstr "Setting ssh/sftp usernames for launchpad.net."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7732
7733
#: bzrlib/plugins/launchpad/cmds.py:44
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7734
msgid "Register a branch with launchpad.net."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7735
msgstr "Register a branch with launchpad.net."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7736
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7737
#: bzrlib/plugins/launchpad/cmds.py:46
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7746
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7747
#: bzrlib/plugins/launchpad/cmds.py:50
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7754
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7755
#: bzrlib/plugins/launchpad/cmds.py:53
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7774
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7775
#: bzrlib/plugins/launchpad/cmds.py:62
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7776
msgid ""
7777
"example:\n"
7778
"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7779
"            --project fooproject"
7780
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7781
"example:\n"
7782
"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7783
"            --project fooproject"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7784
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7785
#: bzrlib/plugins/launchpad/cmds.py:69
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7786
msgid "Launchpad project short name to associate with the branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7787
msgstr "Launchpad project short name to associate with the branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7788
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7789
#: bzrlib/plugins/launchpad/cmds.py:76
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7790
msgid ""
7791
"Short name for the branch; by default taken from the last component of the "
7792
"url."
7793
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7794
"Short name for the branch; by default taken from the last component of the "
7795
"url."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7796
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7797
#: bzrlib/plugins/launchpad/cmds.py:80
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7798
msgid "One-sentence description of the branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7799
msgstr "One-sentence description of the branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7800
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7801
#: bzrlib/plugins/launchpad/cmds.py:83
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7802
msgid "Longer description of the purpose or contents of the branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7803
msgstr "Longer description of the purpose or contents of the branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7804
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7805
#: bzrlib/plugins/launchpad/cmds.py:86
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7806
msgid "Branch author's email address, if not yourself."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7807
msgstr "Branch author's email address, if not yourself."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7808
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7809
#: bzrlib/plugins/launchpad/cmds.py:89
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7810
msgid "The bug this branch fixes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7811
msgstr "The bug this branch fixes."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7812
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7813
#: bzrlib/plugins/launchpad/cmds.py:92
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7814
msgid "Prepare the request but don't actually send it."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7815
msgstr "Prepare the request but don't actually send it."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7816
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7817
#: bzrlib/plugins/launchpad/cmds.py:114
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7818
msgid ""
7819
"register-branch requires a public branch url - see bzr help register-branch."
7820
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7821
"register-branch requires a public branch url - see bzr help register-branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7822
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7823
#: bzrlib/plugins/launchpad/cmds.py:122
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7824
msgid "--product is deprecated; please use --project."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7825
msgstr "--product is deprecated; please use --project."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7826
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7827
#: bzrlib/plugins/launchpad/cmds.py:152
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7828
msgid "Open a Launchpad branch page in your web browser."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7829
msgstr "Open a Launchpad branch page in your web browser."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7830
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7831
#: bzrlib/plugins/launchpad/cmds.py:157
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7832
msgid "Do not actually open the browser. Just say the URL we would use."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7833
msgstr "Do not actually open the browser. Just say the URL we would use."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7834
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7835
#: bzrlib/plugins/launchpad/cmds.py:192
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7836
#, python-format
7837
msgid "Opening %s in web browser"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7838
msgstr "Opening %s in web browser"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7839
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7840
#: bzrlib/plugins/launchpad/cmds.py:200
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7841
msgid "Show or set the Launchpad user ID."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7842
msgstr "Show or set the Launchpad user ID."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7843
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7844
#: bzrlib/plugins/launchpad/cmds.py:202
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7853
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7854
#: bzrlib/plugins/launchpad/cmds.py:206
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7855
msgid ""
7856
":Examples:\n"
7857
"  Show the Launchpad ID of the current user::"
7858
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7859
":Examples:\n"
7860
"  Show the Launchpad ID of the current user::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7861
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7862
#: bzrlib/plugins/launchpad/cmds.py:209
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7863
msgid "      bzr launchpad-login"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7864
msgstr "      bzr launchpad-login"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7865
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7866
#: bzrlib/plugins/launchpad/cmds.py:211
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7867
msgid "  Set the Launchpad ID of the current user to 'bob'::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7868
msgstr "  Set the Launchpad ID of the current user to 'bob'::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7869
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7870
#: bzrlib/plugins/launchpad/cmds.py:213
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7871
msgid "      bzr launchpad-login bob"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7872
msgstr "      bzr launchpad-login bob"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7873
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7874
#: bzrlib/plugins/launchpad/cmds.py:220
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7875
msgid "Don't check that the user name is valid."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7876
msgstr "Don't check that the user name is valid."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7877
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7878
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7879
msgid "Launchpad user ID exists and has SSH keys.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7880
msgstr "Launchpad user ID exists and has SSH keys.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7881
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7882
#: bzrlib/plugins/launchpad/cmds.py:238
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7883
msgid "No Launchpad user ID configured.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7884
msgstr "No Launchpad user ID configured.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7885
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7886
#: bzrlib/plugins/launchpad/cmds.py:249
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7887
#, python-format
7888
msgid "Launchpad user ID set to '%s'.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7889
msgstr "Launchpad user ID set to '%s'.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7890
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7891
#: bzrlib/plugins/launchpad/cmds.py:255
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7892
msgid "Ask Launchpad to mirror a branch now."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7893
msgstr "Ask Launchpad to mirror a branch now."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7894
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7895
#: bzrlib/plugins/launchpad/cmds.py:272
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7896
msgid "Propose merging a branch on Launchpad."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7897
msgstr "Propose merging a branch on Launchpad."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7898
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7899
#: bzrlib/plugins/launchpad/cmds.py:274
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7906
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7907
#: bzrlib/plugins/launchpad/cmds.py:277
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7916
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7917
#: bzrlib/plugins/launchpad/cmds.py:281
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7918
msgid ""
7919
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7920
"the merge proposal.  This can be overriden by specifying --review (-R).\n"
7921
"The parameter the launchpad account name of the desired reviewer.  This\n"
7922
"may optionally be followed by '=' and the review type.  For example:"
7923
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7928
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7929
#: bzrlib/plugins/launchpad/cmds.py:286
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7930
msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7931
msgstr "  bzr lp-propose-merge --review jrandom --review review-team=qa"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7932
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7933
#: bzrlib/plugins/launchpad/cmds.py:288
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7934
msgid ""
7935
"This will propose a merge,  request \"jrandom\" to perform a review of\n"
7936
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7937
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7940
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7941
#: bzrlib/plugins/launchpad/cmds.py:293
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7942
msgid "Propose the merge on staging."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7943
msgstr "Propose the merge on staging."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7944
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7945
#: bzrlib/plugins/launchpad/cmds.py:295
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7946
msgid "Commit message."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7947
msgstr "Commit message."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7948
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7949
#: bzrlib/plugins/launchpad/cmds.py:297
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7950
msgid "Mark the proposal as approved immediately."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7951
msgstr "Mark the proposal as approved immediately."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7952
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7953
#: bzrlib/plugins/launchpad/cmds.py:298
7954
msgid "The bug this proposal fixes."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7955
msgstr "The bug this proposal fixes."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7956
7957
#: bzrlib/plugins/launchpad/cmds.py:300
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7958
msgid "Requested reviewer and optional type."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7959
msgstr "Requested reviewer and optional type."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7960
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7961
#: bzrlib/plugins/launchpad/cmds.py:335
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7962
msgid "Find the proposal to merge this revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7963
msgstr "Find the proposal to merge this revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7964
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7965
#: bzrlib/plugins/launchpad/cmds.py:337
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7976
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7977
#: bzrlib/plugins/launchpad/cmds.py:342
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7984
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7985
#: bzrlib/plugins/launchpad/cmds.py:345
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7986
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7987
msgstr "So, to find the merge proposal that reviewed line 1 of README::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7988
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7989
#: bzrlib/plugins/launchpad/cmds.py:347
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7990
msgid "  bzr lp-find-proposal -r annotate:README:1"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7991
msgstr "  bzr lp-find-proposal -r annotate:README:1"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7992
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7993
#: bzrlib/plugins/launchpad/cmds.py:363
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7994
msgid "No review found."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7995
msgstr "No review found."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7996
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7997
#: bzrlib/plugins/launchpad/cmds.py:364
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
7998
#, python-format
7999
msgid "%d proposals(s) found."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8000
msgstr "%d proposals(s) found."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8001
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8002
#: bzrlib/plugins/launchpad/cmds.py:374
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8003
msgid "Finding revision-id"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8004
msgstr "Finding revision-id"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8005
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8006
#: bzrlib/plugins/launchpad/cmds.py:381
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8007
msgid "Finding merge"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8008
msgstr "Finding merge"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8009
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8010
#: bzrlib/plugins/launchpad/cmds.py:386
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8011
msgid "Finding revno"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8012
msgstr "Finding revno"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8013
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8014
#: bzrlib/plugins/launchpad/cmds.py:392
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8015
msgid "Finding Launchpad branch"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8016
msgstr "Finding Launchpad branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8017
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8018
#: bzrlib/plugins/launchpad/cmds.py:395
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8019
msgid "Finding proposals"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8020
msgstr "Finding proposals"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8021
8022
#: bzrlib/plugins/launchpad/lp_api.py:241
8023
#: bzrlib/plugins/launchpad/lp_api.py:246
8024
#, python-format
8025
msgid "%s is not registered on Launchpad"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8026
msgstr "%s is not registered on Launchpad"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8027
8028
#: bzrlib/plugins/launchpad/lp_api.py:256
8029
#, python-format
8030
msgid "%s has no development focus."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8031
msgstr "%s has no development focus."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8032
8033
#: bzrlib/plugins/launchpad/lp_api.py:261
8034
#, python-format
8035
msgid "development focus %s has no branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8036
msgstr "development focus %s has no branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8037
8038
#: bzrlib/plugins/launchpad/lp_api.py:266
8039
#, python-format
8040
msgid "source package %s has no branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8041
msgstr "source package %s has no branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8042
8043
#: bzrlib/plugins/launchpad/lp_api.py:270
8044
#, python-format
8045
msgid "%s has no associated product or source package."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8046
msgstr "%s has no associated product or source package."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8047
8048
#: bzrlib/plugins/launchpad/lp_api.py:282
8049
#, python-format
8050
msgid "%s is already up-to-date."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8051
msgstr "%s is already up-to-date."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8052
8053
#: bzrlib/plugins/launchpad/lp_api.py:289
8054
#, python-format
8055
msgid "Pushing to %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8056
msgstr "Pushing to %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8057
8058
#: bzrlib/plugins/launchpad/lp_directory.py:170
8059
msgid ""
8060
"resolution for {0}\n"
8061
"  local: {1}\n"
8062
" remote: {2}"
8063
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8064
"resolution for {0}\n"
8065
"  local: {1}\n"
8066
" remote: {2}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8067
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8068
#: bzrlib/plugins/launchpad/lp_propose.py:150
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8069
#, python-format
8070
msgid "There is already a branch merge proposal: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8071
msgstr "There is already a branch merge proposal: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8072
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8073
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8074
msgid "pb parameter to convert() is deprecated"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8075
msgstr "pb parameter to convert() is deprecated"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8076
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8077
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8078
msgid "starting upgrade from format 4 to 5"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8079
msgstr "starting upgrade from format 4 to 5"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8080
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8081
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8082
msgid "note: upgrade may be faster if all store files are ungzipped first"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8083
msgstr "note: upgrade may be faster if all store files are ungzipped first"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8084
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8085
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8086
msgid "converting revision"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8087
msgstr "converting revision"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8088
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8089
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8090
msgid "upgraded to weaves:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8091
msgstr "upgraded to weaves:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8092
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8093
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8094
#, python-format
8095
msgid "%6d revisions and inventories"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8096
msgstr "%6d revisions and inventories"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8097
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8098
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8099
#, python-format
8100
msgid "%6d revisions not present"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8101
msgstr "%6d revisions not present"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8102
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8103
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8104
#, python-format
8105
msgid "%6d texts"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8106
msgstr "%6d texts"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8107
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8108
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8109
msgid "writing weave"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8110
msgstr "writing weave"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8111
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8112
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
8113
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8114
msgid "inventory"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8115
msgstr "inventory"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8116
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8117
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8118
msgid "write revision"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8119
msgstr "write revision"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8120
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8121
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8122
msgid "loading revision"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8123
msgstr "loading revision"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8124
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8125
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8126
#, python-format
8127
msgid "revision {%s} not present in branch; will be converted as a ghost"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8128
msgstr "revision {%s} not present in branch; will be converted as a ghost"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8129
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8130
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8131
msgid "starting upgrade from format 5 to 6"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8132
msgstr "starting upgrade from format 5 to 6"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8133
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8134
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8135
#, python-format
8136
msgid "adding prefixes to %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8137
msgstr "adding prefixes to %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8138
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8139
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8140
msgid "starting upgrade from format 6 to metadir"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8141
msgstr "starting upgrade from format 6 to metadir"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8142
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8143
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8144
msgid "Removing ancestry.weave"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8145
msgstr "Removing ancestry.weave"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8146
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8147
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8148
msgid "Finding branch files"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8149
msgstr "Finding branch files"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8150
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8151
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8152
msgid "Upgrading repository"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8153
msgstr "Upgrading repository"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8154
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8155
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8156
msgid "Upgrading branch"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8157
msgstr "Upgrading branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8158
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8159
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8160
msgid "No working tree."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8161
msgstr "No working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8162
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8163
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8164
msgid "Upgrading working tree"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8165
msgstr "Upgrading working tree"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8166
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8167
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8168
#, python-format
8169
msgid "Make %s lock"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8170
msgstr "Make %s lock"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8171
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8172
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8173
#, python-format
8174
msgid "Moving %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8175
msgstr "Moving %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8176
8177
#: bzrlib/push.py:56
8178
msgid "Created new branch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8179
msgstr "Created new branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8180
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8181
#: bzrlib/push.py:97
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8182
#, python-format
8183
msgid ""
8184
"Target directory %s already contains a .bzr directory, but it is not valid."
8185
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8186
"Target directory %s already contains a .bzr directory, but it is not valid."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8187
8188
#: bzrlib/push.py:101
8189
#, python-format
8190
msgid ""
8191
"Target directory %s already exists, but does not have a .bzr directory. "
8192
"Supply --use-existing-dir to push there anyway."
8193
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8194
"Target directory %s already exists, but does not have a .bzr directory. "
8195
"Supply --use-existing-dir to push there anyway."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8196
8197
#: bzrlib/push.py:122
8198
#, python-format
8199
msgid "Too many redirections trying to make %s."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8200
msgstr "Too many redirections trying to make %s."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8201
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8202
#: bzrlib/push.py:148
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8203
msgid ""
8204
"These branches have diverged.  See \"bzr help diverged-branches\" for more "
8205
"information."
8206
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8207
"These branches have diverged.  See \"bzr help diverged-branches\" for more "
8208
"information."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8209
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8210
#: bzrlib/push.py:152
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8216
"It is not possible to losslessly push to %s. You may want to use dpush "
8217
"instead."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8218
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8219
#: bzrlib/push.py:158
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8229
8230
#: bzrlib/reconcile.py:97
8231
#, python-format
8232
msgid "Reconciling branch %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8233
msgstr "Reconciling branch %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8234
8235
#: bzrlib/reconcile.py:103
8236
#, python-format
8237
msgid "Reconciling repository %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8238
msgstr "Reconciling repository %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8239
8240
#: bzrlib/reconcile.py:105
8241
msgid "Reconciling repository"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8242
msgstr "Reconciling repository"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8243
8244
#: bzrlib/reconcile.py:111
8245
#, python-format
8246
msgid "%s cannot canonicalize CHKs."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8247
msgstr "%s cannot canonicalise CHKs."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8248
8249
#: bzrlib/reconcile.py:119
8250
msgid "Reconcile aborted: revision index has inconsistent parents."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8251
msgstr "Reconcile aborted: revision index has inconsistent parents."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8252
8253
#: bzrlib/reconcile.py:121
8254
msgid "Run \"bzr check\" for more details."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8255
msgstr "Run \"bzr check\" for more details."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8256
8257
#: bzrlib/reconcile.py:123
8258
msgid "Reconciliation complete."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8259
msgstr "Reconciliation complete."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8260
8261
#: bzrlib/reconcile.py:166
8262
msgid "Fixing last revision info {0}  => {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8263
msgstr "Fixing last revision info {0}  => {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8264
8265
#: bzrlib/reconcile.py:173
8266
msgid "revision_history ok."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8267
msgstr "revision_history ok."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8268
8269
#: bzrlib/reconcile.py:234
8270
msgid "Reading inventory data"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8271
msgstr "Reading inventory data"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8272
8273
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
8274
msgid "Inventory ok."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8275
msgstr "Inventory ok."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8276
8277
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
8278
msgid "Backing up inventory"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8279
msgstr "Backing up inventory"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8280
8281
#: bzrlib/reconcile.py:258
8282
msgid "Backup inventory created."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8283
msgstr "Backup inventory created."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8284
8285
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
8286
msgid "Writing weave"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8287
msgstr "Writing weave"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8288
8289
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
8290
msgid "Inventory regenerated."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8291
msgstr "Inventory regenerated."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8292
8293
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
8294
msgid "Reading indexes"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8295
msgstr "Reading indexes"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8296
8297
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
8298
msgid "Checking unused inventories"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8299
msgstr "Checking unused inventories"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8300
8301
#: bzrlib/reconcile.py:388
8302
msgid "Backup Inventory created"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8303
msgstr "Backup Inventory created"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8304
8305
#: bzrlib/reconcile.py:446
8306
msgid "Fixing text parents"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8307
msgstr "Fixing text parents"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8308
8309
#: bzrlib/reconfigure.py:54
8310
msgid "{0} is now stacked on {1}\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8311
msgstr "{0} is now stacked on {1}\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8312
8313
#: bzrlib/reconfigure.py:69
8314
#, python-format
8315
msgid "%s is now not stacked\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8316
msgstr "%s is now not stacked\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8317
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8318
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8319
#, python-format
8320
msgid "bzr: ERROR (ignored): %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8321
msgstr "bzr: ERROR (ignored): %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8322
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8323
#: bzrlib/remote.py:2534
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8324
msgid "Copying repository content as tarball..."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8325
msgstr "Copying repository content as tarball..."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8326
8327
#: bzrlib/rename_map.py:69
8328
msgid "Calculating hashes"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8329
msgstr "Calculating hashes"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8330
8331
#: bzrlib/rename_map.py:107
8332
msgid "Determining hash hits"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8333
msgstr "Determining hash hits"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8334
8335
#: bzrlib/rename_map.py:242
8336
msgid "{0} => {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8337
msgstr "{0} => {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8338
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8339
#: bzrlib/repository.py:1738
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8340
msgid "Moving repository to repository.backup"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8341
msgstr "Moving repository to repository.backup"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8342
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8343
#: bzrlib/repository.py:1745
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8344
msgid "Creating new repository"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8345
msgstr "Creating new repository"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8346
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8347
#: bzrlib/repository.py:1750
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8348
msgid "Copying content"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8349
msgstr "Copying content"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8350
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8351
#: bzrlib/repository.py:1754
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8352
msgid "Deleting old repository content"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8353
msgstr "Deleting old repository content"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8354
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8355
#: bzrlib/repository.py:1756
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8356
msgid "repository converted"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8357
msgstr "repository converted"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8358
8359
#: bzrlib/revisionspec.py:903
8360
msgid "Using {0} {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8361
msgstr "Using {0} {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8362
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8363
#: bzrlib/send.py:59
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8364
#, python-format
8365
msgid "Mail client \"%s\" does not support specifying body"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8366
msgstr "Mail client \"%s\" does not support specifying body"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8367
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8368
#: bzrlib/send.py:63
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8369
msgid "--remember requires a branch to be specified."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8370
msgstr "--remember requires a branch to be specified."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8371
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8372
#: bzrlib/send.py:78
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8373
msgid "No submit branch known or specified"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8374
msgstr "No submit branch known or specified"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8375
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8376
#: bzrlib/send.py:81
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8377
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
8378
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8379
"Using saved {0} location \"{1}\" to determine what changes to submit."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8380
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8381
#: bzrlib/send.py:99
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8382
#, python-format
8383
msgid "No such send format '%s'."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8384
msgstr "No such send format '%s'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8385
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8386
#: bzrlib/send.py:115
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8387
msgid "bzr send takes at most two one revision identifiers"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8388
msgstr "bzr send takes at most two one revision identifiers"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8389
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8390
#: bzrlib/send.py:128
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8391
msgid "No revisions to submit."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8392
msgstr "No revisions to submit."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8393
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8394
#: bzrlib/send.py:140
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8395
msgid ""
8396
"- not supported for merge directives that use more than one output file."
8397
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8398
"- not supported for merge directives that use more than one output file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8399
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8400
#: bzrlib/send.py:186
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8401
msgid "Format 0.9 does not permit bundle with no patch"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8402
msgstr "Format 0.9 does not permit bundle with no patch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8403
8404
#: bzrlib/shelf_ui.py:46
8405
#, python-format
8406
msgid "Shelve adding file \"%(path)s\"?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8407
msgstr "Shelve adding file \"%(path)s\"?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8408
8409
#: bzrlib/shelf_ui.py:47
8410
msgid "Shelve binary changes?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8411
msgstr "Shelve binary changes?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8412
8413
#: bzrlib/shelf_ui.py:48
8414
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8415
msgstr "Shelve changing \"%s\" from %(other)s to %(this)s?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8416
8417
#: bzrlib/shelf_ui.py:50
8418
#, python-format
8419
msgid "Shelve removing file \"%(path)s\"?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8420
msgstr "Shelve removing file \"%(path)s\"?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8421
8422
#: bzrlib/shelf_ui.py:51
8423
#, python-format
8424
msgid "Shelve %d change(s)?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8425
msgstr "Shelve %d change(s)?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8426
8427
#: bzrlib/shelf_ui.py:52
8428
msgid "Shelve?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8429
msgstr "Shelve?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8430
8431
#: bzrlib/shelf_ui.py:53
8432
#, python-format
8433
msgid ""
8434
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
8435
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8436
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8437
8438
#: bzrlib/shelf_ui.py:55
8439
#, python-format
8440
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8441
msgstr "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8442
8443
#: bzrlib/shelf_ui.py:70
8444
#, python-format
8445
msgid "Changes shelved with id \"%d\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8446
msgstr "Changes shelved with id \"%d\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8447
8448
#: bzrlib/shelf_ui.py:74
8449
msgid "Selected changes destroyed."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8450
msgstr "Selected changes destroyed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8451
8452
#: bzrlib/shelf_ui.py:78
8453
msgid "Selected changes:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8454
msgstr "Selected changes:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8455
8456
#: bzrlib/shelf_ui.py:98
8457
#, python-format
8458
msgid "Delete file \"%(path)s\"?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8459
msgstr "Delete file \"%(path)s\"?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8460
8461
#: bzrlib/shelf_ui.py:99
8462
msgid "Apply binary changes?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8463
msgstr "Apply binary changes?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8464
8465
#: bzrlib/shelf_ui.py:100
8466
#, python-format
8467
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8468
msgstr "Change \"%(path)s\" from %(this)s to %(other)s?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8469
8470
#: bzrlib/shelf_ui.py:102
8471
#, python-format
8472
msgid "Add file \"%(path)s\"?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8473
msgstr "Add file \"%(path)s\"?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8474
8475
#: bzrlib/shelf_ui.py:103
8476
#, python-format
8477
msgid "Apply %d change(s)?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8478
msgstr "Apply %d change(s)?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8479
8480
#: bzrlib/shelf_ui.py:104
8481
msgid "Apply change?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8482
msgstr "Apply change?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8483
8484
#: bzrlib/shelf_ui.py:105
8485
#, python-format
8486
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8487
msgstr "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8488
8489
#: bzrlib/shelf_ui.py:107
8490
#, python-format
8491
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8492
msgstr "Rename \"%(this)s\" => \"%(other)s\"?"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8493
8494
#: bzrlib/shelf_ui.py:402
8495
msgid "No changes are shelved."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8496
msgstr "No changes are shelved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8497
8498
#: bzrlib/shelf_ui.py:460
8499
#, python-format
8500
msgid "Using changes with id \"%d\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8501
msgstr "Using changes with id \"%d\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8502
8503
#: bzrlib/shelf_ui.py:464
8504
#, python-format
8505
msgid "Message: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8506
msgstr "Message: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8507
8508
#: bzrlib/shelf_ui.py:476
8509
#, python-format
8510
msgid "Deleted changes with id \"%d\"."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8511
msgstr "Deleted changes with id \"%d\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8512
8513
#: bzrlib/smart/medium.py:714
8514
msgid "HPSS calls: {0} ({1} vfs) {2}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8515
msgstr "HPSS calls: {0} ({1} vfs) {2}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8516
8517
#: bzrlib/smart/server.py:169
8518
msgid "Requested to stop gracefully"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8519
msgstr "Requested to stop gracefully"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8520
8521
#: bzrlib/smart/server.py:179
8522
#, python-format
8523
msgid "Waiting for %d client(s) to finish"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8524
msgstr "Waiting for %d client(s) to finish"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8525
8526
#: bzrlib/smart/server.py:185
8527
#, python-format
8528
msgid "Still waiting for %d client(s) to finish"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8529
msgstr "Still waiting for %d client(s) to finish"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8530
8531
#: bzrlib/smart/server.py:219
8532
#, python-format
8533
msgid "listening socket error: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8534
msgstr "listening socket error: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8535
8536
#: bzrlib/smart/server.py:452
8537
#, python-format
8538
msgid "listening on port: %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8539
msgstr "listening on port: %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8540
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8541
#: bzrlib/switch.py:73
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8542
msgid "Pending merges must be committed or reverted before using switch."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8543
msgstr "Pending merges must be committed or reverted before using switch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8544
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8545
#: bzrlib/switch.py:100
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8546
msgid ""
8547
"Cannot switch as local commits found in the checkout. Commit these to the "
8548
"bound branch or use --force to throw them away."
8549
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8550
"Cannot switch as local commits found in the checkout. Commit these to the "
8551
"bound branch or use --force to throw them away."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8552
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8553
#: bzrlib/switch.py:105
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8554
#, python-format
8555
msgid ""
8556
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8557
"anyway, use --force."
8558
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8559
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8560
"anyway, use --force."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8561
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8562
#: bzrlib/switch.py:129
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8563
msgid "Cannot switch a branch, only a checkout."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8564
msgstr "Cannot switch a branch, only a checkout."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8565
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8566
#: bzrlib/switch.py:167
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8567
#, python-format
8568
msgid "Tree is up to date at revision %d."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8569
msgstr "Tree is up to date at revision %d."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8570
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8571
#: bzrlib/switch.py:173
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8572
#, python-format
8573
msgid "Updated to revision %d."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8574
msgstr "Updated to revision %d."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8575
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8576
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8577
msgid "Apply phase"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8578
msgstr "Apply phase"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8579
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8580
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8581
msgid "removing file"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8582
msgstr "removing file"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8583
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8584
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8585
msgid "adding file"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8586
msgstr "adding file"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8587
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8588
#: bzrlib/transform.py:2598
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8589
msgid "Building tree"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8590
msgstr "Building tree"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8591
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8592
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8593
msgid "Adding file contents"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8594
msgstr "Adding file contents"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8595
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8596
#: bzrlib/transform.py:3017
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8597
msgid "Resolution pass"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8598
msgstr "Resolution pass"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8599
8600
#: bzrlib/transport/ftp/_gssapi.py:88
8601
#, python-format
8602
msgid "Authenticated as %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8603
msgstr "Authenticated as %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8604
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8605
#: bzrlib/tree.py:647
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8606
msgid "*** {0} content-filter: {1} => {2!r}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8607
msgstr "*** {0} content-filter: {1} => {2!r}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8608
8609
#: bzrlib/upgrade.py:77
8610
#, python-format
8611
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8612
msgstr "This is a checkout. The branch (%s) needs to be upgraded separately."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8613
8614
#: bzrlib/upgrade.py:100
8615
#, python-format
8616
msgid "cannot upgrade from bzrdir format %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8617
msgstr "cannot upgrade from bzrdir format %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8618
8619
#: bzrlib/upgrade.py:103
8620
#, python-format
8621
msgid "starting upgrade of %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8622
msgstr "starting upgrade of %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8623
8624
#: bzrlib/upgrade.py:110
8625
msgid "finished"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8626
msgstr "finished"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8627
8628
#: bzrlib/upgrade.py:120
8629
msgid "Deleting backup.bzr"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8630
msgstr "Deleting backup.bzr"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8631
8632
#: bzrlib/upgrade.py:151
8633
msgid ""
8634
"\n"
8635
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
8636
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8637
"\n"
8638
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8639
8640
#: bzrlib/upgrade.py:208
8641
#, python-format
8642
msgid "Found %d dependent branches - upgrading ..."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8643
msgstr "Found %d dependent branches - upgrading ..."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8644
8645
#: bzrlib/upgrade.py:276
8646
msgid "Upgrading bzrdirs"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8647
msgstr "Upgrading bzrdirs"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8648
8649
#: bzrlib/upgrade.py:282
8650
#, python-format
8651
msgid "Upgrading %s"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8652
msgstr "Upgrading %s"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8653
8654
#: bzrlib/upgrade.py:283
8655
msgid "Upgrading {0} {1} ..."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8656
msgstr "Upgrading {0} {1} ..."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8657
8658
#: bzrlib/upgrade.py:301
8659
msgid "Removing backup ..."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8660
msgstr "Removing backup ..."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8661
8662
#: bzrlib/upgrade.py:305
8663
msgid "failed to clean-up {0}: {1}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8664
msgstr "failed to clean-up {0}: {1}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8665
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8666
#: bzrlib/vf_repository.py:1091
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8667
msgid "inventories"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8668
msgstr "inventories"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8669
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8670
#: bzrlib/vf_repository.py:1117
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8671
msgid "texts"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8672
msgstr "texts"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8673
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8674
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8675
msgid "Calculating text parents"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8676
msgstr "Calculating text parents"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8677
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8678
#: bzrlib/vf_repository.py:1707
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8679
msgid "Fetch texts"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8680
msgstr "Fetch texts"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8681
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8682
#: bzrlib/vf_repository.py:2536
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8683
msgid "loading text store"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8684
msgstr "loading text store"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8685
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8686
#: bzrlib/vf_repository.py:2542
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8687
msgid "checking text graph"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8688
msgstr "checking text graph"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8689
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8690
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8691
#: bzrlib/vf_repository.py:3127
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8692
msgid "Transferring revisions"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8693
msgstr "Transferring revisions"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8694
8695
#: bzrlib/win32utils.py:146
8696
msgid "Failed to GetProcessMemoryInfo()"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8697
msgstr "Failed to GetProcessMemoryInfo()"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8698
8699
#: bzrlib/win32utils.py:167
8700
msgid "Cannot debug memory on win32 without ctypes or win32process"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8701
msgstr "Cannot debug memory on win32 without ctypes or win32process"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8702
8703
#: bzrlib/win32utils.py:172
8704
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8705
msgstr "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8706
8707
#: bzrlib/win32utils.py:180
8708
#, python-format
8709
msgid "WorkingSize       %8d KiB"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8710
msgstr "WorkingSize       %8d KiB"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8711
8712
#: bzrlib/win32utils.py:181
8713
#, python-format
8714
msgid "PeakWorking       %8d KiB"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8715
msgstr "PeakWorking       %8d KiB"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8716
8717
#: bzrlib/win32utils.py:182
8718
#, python-format
8719
msgid "PagefileUsage     %8d KiB"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8720
msgstr "PagefileUsage     %8d KiB"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8721
8722
#: bzrlib/win32utils.py:183
8723
#, python-format
8724
msgid "PeakPagefileUsage %8d KiB"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8725
msgstr "PeakPagefileUsage %8d KiB"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8726
8727
#: bzrlib/win32utils.py:185
8728
#, python-format
8729
msgid "PrivateUsage      %8d KiB"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8730
msgstr "PrivateUsage      %8d KiB"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8731
8732
#: bzrlib/win32utils.py:186
8733
#, python-format
8734
msgid "PageFaultCount    %8d"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8735
msgstr "PageFaultCount    %8d"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8736
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8737
#: bzrlib/workingtree.py:1482
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8738
msgid "Rerun update after fixing the conflicts."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8739
msgstr "Rerun update after fixing the conflicts."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8740
8741
#: dummy/help_topics/authentication/summary.txt:1
8742
msgid "Information on configuring authentication"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8743
msgstr "Information on configuring authentication"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8744
8745
#: dummy/help_topics/basic/detail.txt:1
8746
msgid ""
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8747
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8748
"http://bazaar.canonical.com/"
8749
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8750
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8751
"http://bazaar.canonical.com/"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8752
8753
#: dummy/help_topics/basic/detail.txt:4
8754
msgid ""
8755
"Basic commands:\n"
8756
"  bzr init           makes this directory a versioned branch\n"
8757
"  bzr branch         make a copy of another branch"
8758
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8759
"Basic commands:\n"
8760
"  bzr init           makes this directory a versioned branch\n"
8761
"  bzr branch         make a copy of another branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8762
8763
#: dummy/help_topics/basic/detail.txt:8
8764
msgid ""
8765
"  bzr add            make files or directories versioned\n"
8766
"  bzr ignore         ignore a file or pattern\n"
8767
"  bzr mv             move or rename a versioned file"
8768
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8772
8773
#: dummy/help_topics/basic/detail.txt:12
8774
msgid ""
8775
"  bzr status         summarize changes in working copy\n"
8776
"  bzr diff           show detailed diffs"
8777
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8778
"  bzr status         summarise changes in working copy\n"
8779
"  bzr diff           show detailed diffs"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8780
8781
#: dummy/help_topics/basic/detail.txt:15
8782
msgid ""
8783
"  bzr merge          pull in changes from another branch\n"
8784
"  bzr commit         save some or all changes\n"
8785
"  bzr send           send changes via email"
8786
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8790
8791
#: dummy/help_topics/basic/detail.txt:19
8792
msgid ""
8793
"  bzr log            show history of changes\n"
8794
"  bzr check          validate storage"
8795
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8796
"  bzr log            show history of changes\n"
8797
"  bzr check          validate storage"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8798
8799
#: dummy/help_topics/basic/detail.txt:22
8800
msgid ""
8801
"  bzr help init      more help on e.g. init command\n"
8802
"  bzr help commands  list all commands\n"
8803
"  bzr help topics    list all help topics\n"
8804
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8808
8809
#: dummy/help_topics/basic/summary.txt:1
8810
msgid "Basic commands"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8811
msgstr "Basic commands"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8812
8813
#: dummy/help_topics/branches/detail.txt:1
8814
msgid "Branches"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8815
msgstr "Branches"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8816
8817
#: dummy/help_topics/branches/detail.txt:3
8818
msgid ""
8819
"A branch consists of the state of a project, including all of its\n"
8820
"history. All branches have a repository associated (which is where the\n"
8821
"branch history is stored), but multiple branches may share the same\n"
8822
"repository (a shared repository). Branches can be copied and merged."
8823
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8828
8829
#: dummy/help_topics/branches/detail.txt:8
8830
msgid ""
8831
"In addition, one branch may be bound to another one.  Binding to another\n"
8832
"branch indicates that commits which happen in this branch must also \n"
8833
"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
8834
"commits when the two branches are out of date.  In order for a commit \n"
8835
"to succeed, it may be necessary to update the current branch using \n"
8836
"``bzr update``."
8837
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8844
8845
#: dummy/help_topics/branches/detail.txt:15
8846
#: dummy/help_topics/checkouts/detail.txt:66
8847
#: dummy/help_topics/repositories/detail.txt:36
8848
msgid "Related commands::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8849
msgstr "Related commands::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8850
8851
#: dummy/help_topics/branches/detail.txt:17
8852
msgid ""
8853
"  init    Change a directory into a versioned branch.\n"
8854
"  branch  Create a new branch that is a copy of an existing branch.\n"
8855
"  merge   Perform a three-way merge.\n"
8856
"  bind    Bind a branch to another one.\n"
8857
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8862
8863
#: dummy/help_topics/branches/summary.txt:1
8864
msgid "Information on what a branch is"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8865
msgstr "Information on what a branch is"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8866
8867
#: dummy/help_topics/bugs/summary.txt:1
8868
msgid "Bug tracker settings"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8869
msgstr "Bug tracker settings"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8870
8871
#: dummy/help_topics/checkouts/detail.txt:1
8872
msgid "Checkouts"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8873
msgstr "Checkouts"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8874
8875
#: dummy/help_topics/checkouts/detail.txt:3
8876
msgid ""
8877
"Checkouts are source trees that are connected to a branch, so that when\n"
8878
"you commit in the source tree, the commit goes into that branch.  They\n"
8879
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8880
"Bazaar's decentralized features until you want them. Using checkouts\n"
8881
"with shared repositories is very similar to working with SVN or CVS, but\n"
8882
"doesn't have the same restrictions.  And using checkouts still allows\n"
8883
"others working on the project to use whatever workflow they like."
8884
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8892
8893
#: dummy/help_topics/checkouts/detail.txt:11
8894
msgid ""
8895
"A checkout is created with the bzr checkout command (see \"help "
8896
"checkout\").\n"
8897
"You pass it a reference to another branch, and it will create a local copy\n"
8898
"for you that still contains a reference to the branch you created the\n"
8899
"checkout from (the master branch). Then if you make any commits they will "
8900
"be\n"
8901
"made on the other branch first. This creates an instant mirror of your work, "
8902
"or\n"
8903
"facilitates lockstep development, where each developer is working together,\n"
8904
"continuously integrating the changes of others."
8905
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8916
8917
#: dummy/help_topics/checkouts/detail.txt:19
8918
msgid ""
8919
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8920
"you have the full history locally.  As you have a first class branch you "
8921
"can\n"
8922
"also commit locally if you want, for instance due to the temporary loss af "
8923
"a\n"
8924
"network connection. Use the --local option to commit to do this. All the "
8925
"local\n"
8926
"commits will then be made on the master branch the next time you do a non-"
8927
"local\n"
8928
"commit."
8929
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8940
8941
#: dummy/help_topics/checkouts/detail.txt:26
8942
msgid ""
8943
"If you are using a checkout from a shared branch you will periodically want "
8944
"to\n"
8945
"pull in all the changes made by others. This is done using the \"update\"\n"
8946
"command. The changes need to be applied before any non-local commit, but\n"
8947
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8948
"command when needed."
8949
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8956
8957
#: dummy/help_topics/checkouts/detail.txt:32
8958
msgid ""
8959
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8960
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8961
"SVN checkout in that it is not a first class branch, it mainly consists of "
8962
"the\n"
8963
"working tree. This means that any history operations must query the master\n"
8964
"branch, which could be slow if a network connection is involved. Also, as "
8965
"you\n"
8966
"don't have a local branch, then you cannot commit locally."
8967
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
8976
8977
#: dummy/help_topics/checkouts/detail.txt:39
8978
msgid ""
8979
"Lightweight checkouts work best when you have fast reliable access to the\n"
8980
"master branch. This means that if the master branch is on the same disk or "
8981
"LAN\n"
8982
"a lightweight checkout will be faster than a heavyweight one for any "
8983
"commands\n"
8984
"that modify the revision history (as only one copy of the branch needs to\n"
8985
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8986
"that uses the history but does not change it, but if the master branch is "
8987
"on\n"
8988
"the same disk then there won't be a noticeable difference."
8989
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9000
9001
#: dummy/help_topics/checkouts/detail.txt:47
9002
msgid ""
9003
"Another possible use for a checkout is to use it with a treeless repository\n"
9004
"containing your branches, where you maintain only one working tree by\n"
9005
"switching the master branch that the checkout points to when you want to\n"
9006
"work on a different branch."
9007
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9012
9013
#: dummy/help_topics/checkouts/detail.txt:52
9014
msgid ""
9015
"Obviously to commit on a checkout you need to be able to write to the "
9016
"master\n"
9017
"branch. This means that the master branch must be accessible over a "
9018
"writeable\n"
9019
"protocol , such as sftp://, and that you have write permissions at the "
9020
"other\n"
9021
"end. Checkouts also work on the local file system, so that all that matters "
9022
"is\n"
9023
"file permissions."
9024
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9034
9035
#: dummy/help_topics/checkouts/detail.txt:58
9036
msgid ""
9037
"You can change the master of a checkout by using the \"switch\" command "
9038
"(see\n"
9039
"\"help switch\").  This will change the location that the commits are sent "
9040
"to.\n"
9041
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
9042
"checkout. If you would like to convert your heavy checkout into a normal\n"
9043
"branch so that every commit is local, you can use the \"unbind\" command. To "
9044
"see\n"
9045
"whether or not a branch is bound or not you can use the \"info\" command. If "
9046
"the\n"
9047
"branch is bound it will tell you the location of the bound branch."
9048
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9060
9061
#: dummy/help_topics/checkouts/detail.txt:68
9062
msgid ""
9063
"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
9064
"              checkout\n"
9065
"  update      Pull any changes in the master branch in to your checkout\n"
9066
"  commit      Make a commit that is sent to the master branch. If you have\n"
9067
"              a heavy checkout then the --local option will commit to the\n"
9068
"              checkout without sending the commit to the master\n"
9069
"  switch      Change the master branch that the commits in the checkout "
9070
"will\n"
9071
"              be sent to\n"
9072
"  bind        Turn a standalone branch into a heavy checkout so that any\n"
9073
"              commits will be sent to the master branch\n"
9074
"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
9075
"              commits are only made locally\n"
9076
"  info        Displays whether a branch is bound or unbound. If the branch "
9077
"is\n"
9078
"              bound, then it will also display the location of the bound "
9079
"branch\n"
9080
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9098
9099
#: dummy/help_topics/checkouts/summary.txt:1
9100
msgid "Information on what a checkout is"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9101
msgstr "Information on what a checkout is"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9102
9103
#: dummy/help_topics/commands/summary.txt:1
9104
msgid "Basic help for all commands"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9105
msgstr "Basic help for all commands"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9106
9107
#: dummy/help_topics/configuration/summary.txt:1
9108
msgid "Details on the configuration settings available"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9109
msgstr "Details on the configuration settings available"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9110
9111
#: dummy/help_topics/conflict-types/summary.txt:1
9112
msgid "Types of conflicts and what to do about them"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9113
msgstr "Types of conflicts and what to do about them"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9114
9115
#: dummy/help_topics/content-filters/summary.txt:1
9116
msgid "Conversion of content into/from working trees"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9117
msgstr "Conversion of content into/from working trees"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9118
9119
#: dummy/help_topics/criss-cross/detail.txt:1
9120
msgid "Criss-Cross"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9121
msgstr "Criss-Cross"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9122
9123
#: dummy/help_topics/criss-cross/detail.txt:3
9124
msgid ""
9125
"A criss-cross in the branch history can cause the default merge technique\n"
9126
"to emit more conflicts than would normally be expected."
9127
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9130
9131
#: dummy/help_topics/criss-cross/detail.txt:6
9132
msgid ""
9133
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
9134
"give\n"
9135
"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
9136
"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
9137
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9142
9143
#: dummy/help_topics/criss-cross/detail.txt:10
9144
msgid ""
9145
"Criss-crosses occur in a branch's history if two branches merge the same "
9146
"thing\n"
9147
"and then merge one another, or if two branches merge one another at the "
9148
"same\n"
9149
"time.  They can be avoided by having each branch only merge from or into a\n"
9150
"designated central branch (a \"star topology\")."
9151
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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\")."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9158
9159
#: dummy/help_topics/criss-cross/detail.txt:15
9160
msgid ""
9161
"Criss-crosses cause problems because of the way merge works.  Bazaar's "
9162
"default\n"
9163
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
9164
"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
9165
"differences between THIS and OTHER are due to one side adding lines, or\n"
9166
"from another side removing lines."
9167
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9174
9175
#: dummy/help_topics/criss-cross/detail.txt:21
9176
msgid ""
9177
"Criss-crosses mean there is no good choice for a base.  Selecting the "
9178
"recent\n"
9179
"merge points could cause one side's changes to be silently discarded.\n"
9180
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
9181
"are emitted."
9182
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9188
9189
#: dummy/help_topics/criss-cross/detail.txt:26
9190
msgid ""
9191
"The ``weave`` merge type is not affected by this problem because it uses\n"
9192
"line-origin detection instead of a basis revision to determine the cause of\n"
9193
"differences.\n"
9194
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9198
9199
#: dummy/help_topics/criss-cross/summary.txt:1
9200
msgid "Information on criss-cross merging"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9201
msgstr "Information on criss-cross merging"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9202
9203
#: dummy/help_topics/current-formats/summary.txt:1
9204
msgid "Current storage formats"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9205
msgstr "Current storage formats"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9206
9207
#: dummy/help_topics/debug-flags/summary.txt:1
9208
msgid "Options to show or record debug information"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9209
msgstr "Options to show or record debug information"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9210
9211
#: dummy/help_topics/diverged-branches/summary.txt:1
9212
msgid "How to fix diverged branches"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9213
msgstr "How to fix diverged branches"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9214
9215
#: dummy/help_topics/env-variables/summary.txt:1
9216
msgid "Environment variable names and values"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9217
msgstr "Environment variable names and values"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9218
9219
#: dummy/help_topics/eol/summary.txt:1
9220
msgid "Information on end-of-line handling"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9221
msgstr "Information on end-of-line handling"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9222
9223
#: dummy/help_topics/files/detail.txt:1
9224
msgid "Files"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9225
msgstr "Files"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9226
9227
#: dummy/help_topics/files/detail.txt:3
9228
msgid ""
9229
":On Unix:   ~/.bazaar/bazaar.conf\n"
9230
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
9231
"bazaar\\\\2.0\\\\bazaar.conf"
9232
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9233
":On Unix:   ~/.bazaar/bazaar.conf\n"
9234
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
9235
"bazaar\\\\2.0\\\\bazaar.conf"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9236
9237
#: dummy/help_topics/files/detail.txt:6
9238
msgid ""
9239
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
9240
"used to define general configuration that will be applied everywhere.\n"
9241
"The section ``[ALIASES]`` can be used to create command aliases for\n"
9242
"commonly used options."
9243
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9248
9249
#: dummy/help_topics/files/detail.txt:11
9250
msgid "A typical config file might look something like::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9251
msgstr "A typical config file might look something like::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9252
9253
#: dummy/help_topics/files/detail.txt:13
9254
msgid ""
9255
"  [DEFAULT]\n"
9256
"  email=John Doe <jdoe@isp.com>"
9257
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9258
"  [DEFAULT]\n"
9259
"  email=John Doe <jdoe@isp.com>"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9260
9261
#: dummy/help_topics/files/detail.txt:16
9262
msgid ""
9263
"  [ALIASES]\n"
9264
"  commit = commit --strict\n"
9265
"  log10 = log --short -r -10..-1\n"
9266
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9267
"  [ALIASES]\n"
9268
"  commit = commit --strict\n"
9269
"  log10 = log --short -r -10..-1\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9270
9271
#: dummy/help_topics/files/summary.txt:1
9272
msgid "Information on configuration and log files"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9273
msgstr "Information on configuration and log files"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9274
9275
#: dummy/help_topics/formats/detail.txt:1
9276
msgid "Storage Formats"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9277
msgstr "Storage Formats"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9278
9279
#: dummy/help_topics/formats/detail.txt:3
9280
msgid ""
9281
"To ensure that older clients do not access data incorrectly,\n"
9282
"Bazaar's policy is to introduce a new storage format whenever\n"
9283
"new features requiring new metadata are added. New storage\n"
9284
"formats may also be introduced to improve performance and\n"
9285
"scalability."
9286
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9292
9293
#: dummy/help_topics/formats/detail.txt:9
9294
msgid ""
9295
"The newest format, 2a, is highly recommended. If your\n"
9296
"project is not using 2a, then you should suggest to the\n"
9297
"project owner to upgrade."
9298
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9302
9303
#: dummy/help_topics/formats/detail.txt:13
9304
msgid ""
9305
"\n"
9306
".. note::"
9307
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9308
"\n"
9309
".. note::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9310
9311
#: dummy/help_topics/formats/detail.txt:16
9312
msgid ""
9313
"   Some of the older formats have two variants:\n"
9314
"   a plain one and a rich-root one. The latter include an additional\n"
9315
"   field about the root of the tree. There is no performance cost\n"
9316
"   for using a rich-root format but you cannot easily merge changes\n"
9317
"   from a rich-root format into a plain format. As a consequence,\n"
9318
"   moving a project to a rich-root format takes some co-ordination\n"
9319
"   in that all contributors need to upgrade their repositories\n"
9320
"   around the same time. 2a and all future formats will be\n"
9321
"   implicitly rich-root."
9322
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9332
9333
#: dummy/help_topics/formats/detail.txt:26
9334
msgid ""
9335
"See :doc:`current-formats-help` for the complete list of\n"
9336
"currently supported formats. See :doc:`other-formats-help` for\n"
9337
"descriptions of any available experimental and deprecated formats.\n"
9338
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9342
9343
#: dummy/help_topics/formats/summary.txt:1
9344
msgid "Information on choosing a storage format"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9345
msgstr "Information on choosing a storage format"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9346
9347
#: dummy/help_topics/global-options/detail.txt:1
9348
msgid "Global Options"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9349
msgstr "Global Options"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9350
9351
#: dummy/help_topics/global-options/detail.txt:3
9352
msgid ""
9353
"These options may be used with any command, and may appear in front of any\n"
9354
"command.  (e.g. ``bzr --profile help``)."
9355
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9356
"These options may be used with any command, and may appear in front of any\n"
9357
"command.  (e.g. ``bzr --profile help``)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9358
9359
#: dummy/help_topics/global-options/detail.txt:6
9360
msgid ""
9361
"--version      Print the version number. Must be supplied before the "
9362
"command.\n"
9363
"--no-aliases   Do not process command aliases when running this command.\n"
9364
"--builtin      Use the built-in version of a command, not the plugin "
9365
"version.\n"
9366
"               This does not suppress other plugin effects.\n"
9367
"--no-plugins   Do not process any plugins.\n"
9368
"--no-l10n      Do not translate messages.\n"
9369
"--concurrency  Number of processes that can be run concurrently (selftest)."
9370
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9380
9381
#: dummy/help_topics/global-options/detail.txt:14
9382
msgid ""
9383
"--profile      Profile execution using the hotshot profiler.\n"
9384
"--lsprof       Profile execution using the lsprof profiler.\n"
9385
"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
9386
"               results to a specified file.  If the filename ends with "
9387
"\".txt\",\n"
9388
"               text format will be used.  If the filename either starts "
9389
"with\n"
9390
"               \"callgrind.out\" or end with \".callgrind\", the output will "
9391
"be\n"
9392
"               formatted for use with KCacheGrind. Otherwise, the output\n"
9393
"               will be a pickle.\n"
9394
"--coverage     Generate line coverage report in the specified directory."
9395
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9408
9409
#: dummy/help_topics/global-options/detail.txt:24
9410
msgid ""
9411
"-Oname=value   Override the ``name`` config option setting it to ``value`` "
9412
"for\n"
9413
"               the duration of the command.  This can be used multiple times "
9414
"if\n"
9415
"               several options need to be overridden."
9416
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9422
9423
#: dummy/help_topics/global-options/detail.txt:28
9424
msgid ""
9425
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
9426
"information on profiling."
9427
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9428
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
9429
"information on profiling."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9430
9431
#: dummy/help_topics/global-options/detail.txt:31
9432
msgid ""
9433
"A number of debug flags are also available to assist troubleshooting and\n"
9434
"development.  See :doc:`debug-flags-help`.\n"
9435
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9436
"A number of debug flags are also available to assist troubleshooting and\n"
9437
"development.  See :doc:`debug-flags-help`.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9438
9439
#: dummy/help_topics/global-options/summary.txt:1
9440
msgid "Options that control how Bazaar runs"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9441
msgstr "Options that control how Bazaar runs"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9442
9443
#: dummy/help_topics/hidden-commands/summary.txt:1
9444
msgid "All hidden commands"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9445
msgstr "All hidden commands"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9446
9447
#: dummy/help_topics/hooks/summary.txt:1
9448
msgid "Points at which custom processing can be added"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9449
msgstr "Points at which custom processing can be added"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9450
9451
#: dummy/help_topics/launchpad/detail.txt:1
9452
msgid "Integration with Launchpad.net"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9453
msgstr "Integration with Launchpad.net"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9454
9455
#: dummy/help_topics/launchpad/detail.txt:3
9456
msgid ""
9457
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
9458
"specification tracking."
9459
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9460
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
9461
"specification tracking."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9462
9463
#: dummy/help_topics/launchpad/detail.txt:6
9464
msgid ""
9465
"The bzr client (through the plugin called 'launchpad') has special\n"
9466
"features to communicate with Launchpad:"
9467
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9468
"The bzr client (through the plugin called 'launchpad') has special\n"
9469
"features to communicate with Launchpad:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9470
9471
#: dummy/help_topics/launchpad/detail.txt:9
9472
msgid ""
9473
"    * The launchpad-login command tells Bazaar your Launchpad user name. "
9474
"This\n"
9475
"      is then used by the 'lp:' transport to download your branches using\n"
9476
"      bzr+ssh://."
9477
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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://."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9482
9483
#: dummy/help_topics/launchpad/detail.txt:13
9484
msgid ""
9485
"    * The 'lp:' transport uses Launchpad as a directory service: for "
9486
"example\n"
9487
"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
9488
"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
9489
"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
9490
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9496
9497
#: dummy/help_topics/launchpad/detail.txt:18
9498
msgid ""
9499
"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
9500
"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
9501
"lp:12345'\n"
9502
"      will record a revision property that marks that revision as fixing\n"
9503
"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
9504
"      automatically be linked to the bug report."
9505
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9512
9513
#: dummy/help_topics/launchpad/detail.txt:24
9514
msgid ""
9515
"    * The register-branch command tells Launchpad about the url of a\n"
9516
"      public branch.  Launchpad will then mirror the branch, display\n"
9517
"      its contents and allow it to be attached to bugs and other\n"
9518
"      objects."
9519
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9524
9525
#: dummy/help_topics/launchpad/detail.txt:29
9526
msgid "For more information see http://help.launchpad.net/\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9527
msgstr "For more information see http://help.launchpad.net/\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9528
9529
#: dummy/help_topics/launchpad/summary.txt:1
9530
msgid "Using Bazaar with Launchpad.net"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9531
msgstr "Using Bazaar with Launchpad.net"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9532
9533
#: dummy/help_topics/location-alias/summary.txt:1
9534
msgid "Aliases for remembered locations"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9535
msgstr "Aliases for remembered locations"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9536
9537
#: dummy/help_topics/log-formats/summary.txt:1
9538
msgid "Details on the logging formats available"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9539
msgstr "Details on the logging formats available"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9540
9541
#: dummy/help_topics/other-formats/summary.txt:1
9542
msgid "Experimental and deprecated storage formats"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9543
msgstr "Experimental and deprecated storage formats"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9544
9545
#: dummy/help_topics/patterns/summary.txt:1
9546
msgid "Information on the pattern syntax"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9547
msgstr "Information on the pattern syntax"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9548
9549
#: dummy/help_topics/repositories/detail.txt:1
9550
msgid "Repositories"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9551
msgstr "Repositories"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9552
9553
#: dummy/help_topics/repositories/detail.txt:3
9554
msgid ""
9555
"Repositories in Bazaar are where committed information is stored. There is\n"
9556
"a repository associated with every branch."
9557
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9558
"Repositories in Bazaar are where committed information is stored. There is\n"
9559
"a repository associated with every branch."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9560
9561
#: dummy/help_topics/repositories/detail.txt:6
9562
msgid ""
9563
"Repositories are a form of database. Bzr will usually maintain this for\n"
9564
"good performance automatically, but in some situations (e.g. when doing\n"
9565
"very many commits in a short time period) you may want to ask bzr to\n"
9566
"optimise the database indices. This can be done by the 'bzr pack' command."
9567
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9572
9573
#: dummy/help_topics/repositories/detail.txt:11
9574
msgid ""
9575
"By default just running 'bzr init' will create a repository within the new\n"
9576
"branch but it is possible to create a shared repository which allows "
9577
"multiple\n"
9578
"branches to share their information in the same location. When a new branch "
9579
"is\n"
9580
"created it will first look to see if there is a containing shared repository "
9581
"it\n"
9582
"can use."
9583
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9592
9593
#: dummy/help_topics/repositories/detail.txt:17
9594
msgid ""
9595
"When two branches of the same project share a repository, there is\n"
9596
"generally a large space saving. For some operations (e.g. branching\n"
9597
"within the repository) this translates in to a large time saving."
9598
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9602
9603
#: dummy/help_topics/repositories/detail.txt:21
9604
msgid ""
9605
"To create a shared repository use the init-repository command (or the alias\n"
9606
"init-repo). This command takes the location of the repository to create. "
9607
"This\n"
9608
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
9609
"which contains a shared repository. Any new branches that are created in "
9610
"this\n"
9611
"directory will then use it for storage."
9612
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9620
9621
#: dummy/help_topics/repositories/detail.txt:27
9622
msgid ""
9623
"It is a good idea to create a repository whenever you might create more\n"
9624
"than one branch of a project. This is true for both working areas where you\n"
9625
"are doing the development, and any server areas that you use for hosting\n"
9626
"projects. In the latter case, it is common to want branches without working\n"
9627
"trees. Since the files in the branch will not be edited directly there is "
9628
"no\n"
9629
"need to use up disk space for a working tree. To create a repository in "
9630
"which\n"
9631
"the branches will not have working trees pass the '--no-trees' option to\n"
9632
"'init-repository'."
9633
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9644
9645
#: dummy/help_topics/repositories/detail.txt:38
9646
msgid ""
9647
"  init-repository   Create a shared repository. Use --no-trees to create "
9648
"one\n"
9649
"                    in which new branches won't get a working tree.\n"
9650
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9654
9655
#: dummy/help_topics/repositories/summary.txt:1
9656
msgid "Basic information on shared repositories."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9657
msgstr "Basic information on shared repositories."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9658
9659
#: dummy/help_topics/revisionspec/summary.txt:1
9660
msgid "Explain how to use --revision"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9661
msgstr "Explain how to use --revision"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9662
9663
#: dummy/help_topics/rules/summary.txt:1
9664
msgid "Information on defining rule-based preferences"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9665
msgstr "Information on defining rule-based preferences"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9666
9667
#: dummy/help_topics/standalone-trees/detail.txt:1
9668
msgid "Standalone Trees"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9669
msgstr "Standalone Trees"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9670
9671
#: dummy/help_topics/standalone-trees/detail.txt:3
9672
msgid ""
9673
"A standalone tree is a working tree with an associated repository. It\n"
9674
"is an independently usable branch, with no dependencies on any other.\n"
9675
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
9676
"an existing project under version control."
9677
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9682
9683
#: dummy/help_topics/standalone-trees/detail.txt:8
9684
msgid "Related Commands::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9685
msgstr "Related Commands::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9686
9687
#: dummy/help_topics/standalone-trees/detail.txt:10
9688
msgid "  init    Make a directory into a versioned branch.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9689
msgstr "  init    Make a directory into a versioned branch.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9690
9691
#: dummy/help_topics/standalone-trees/summary.txt:1
9692
msgid "Information on what a standalone tree is"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9693
msgstr "Information on what a standalone tree is"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9694
9695
#: dummy/help_topics/standard-options/detail.txt:1
9696
msgid "Standard Options"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9697
msgstr "Standard Options"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9698
9699
#: dummy/help_topics/standard-options/detail.txt:3
9700
msgid "Standard options are legal for all commands."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9701
msgstr "Standard options are legal for all commands."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9702
9703
#: dummy/help_topics/standard-options/detail.txt:5
9704
msgid ""
9705
"--help, -h     Show help message.\n"
9706
"--verbose, -v  Display more information.\n"
9707
"--quiet, -q    Only display errors and warnings."
9708
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9709
"--help, -h     Show help message.\n"
9710
"--verbose, -v  Display more information.\n"
9711
"--quiet, -q    Only display errors and warnings."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9712
9713
#: dummy/help_topics/standard-options/detail.txt:9
9714
msgid "Unlike global options, standard options can be used in aliases.\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9715
msgstr "Unlike global options, standard options can be used in aliases.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9716
9717
#: dummy/help_topics/standard-options/summary.txt:1
9718
msgid "Options that can be used with any command"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9719
msgstr "Options that can be used with any command"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9720
9721
#: dummy/help_topics/status-flags/detail.txt:1
9722
msgid "Status Flags"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9723
msgstr "Status Flags"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9724
9725
#: dummy/help_topics/status-flags/detail.txt:3
9726
msgid ""
9727
"Status flags are used to summarise changes to the working tree in a concise\n"
9728
"manner.  They are in the form::"
9729
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9730
"Status flags are used to summarise changes to the working tree in a concise\n"
9731
"manner.  They are in the form::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9732
9733
#: dummy/help_topics/status-flags/detail.txt:6
9734
msgid "   xxx   <filename>"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9735
msgstr "   xxx   <filename>"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9736
9737
#: dummy/help_topics/status-flags/detail.txt:8
9738
msgid "where the columns' meanings are as follows."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9739
msgstr "where the columns' meanings are as follows."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9740
9741
#: dummy/help_topics/status-flags/detail.txt:10
9742
msgid "Column 1 - versioning/renames::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9743
msgstr "Column 1 - versioning/renames::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9744
9745
#: dummy/help_topics/status-flags/detail.txt:12
9746
msgid ""
9747
"  + File versioned\n"
9748
"  - File unversioned\n"
9749
"  R File renamed\n"
9750
"  ? File unknown\n"
9751
"  X File nonexistent (and unknown to bzr)\n"
9752
"  C File has conflicts\n"
9753
"  P Entry for a pending merge (not a file)"
9754
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9762
9763
#: dummy/help_topics/status-flags/detail.txt:20
9764
msgid "Column 2 - contents::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9765
msgstr "Column 2 - contents::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9766
9767
#: dummy/help_topics/status-flags/detail.txt:22
9768
msgid ""
9769
"  N File created\n"
9770
"  D File deleted\n"
9771
"  K File kind changed\n"
9772
"  M File modified"
9773
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9774
"  N File created\n"
9775
"  D File deleted\n"
9776
"  K File kind changed\n"
9777
"  M File modified"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9778
9779
#: dummy/help_topics/status-flags/detail.txt:27
9780
msgid "Column 3 - execute::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9781
msgstr "Column 3 - execute::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9782
9783
#: dummy/help_topics/status-flags/detail.txt:29
9784
msgid "  * The execute bit was changed\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9785
msgstr "  * The execute bit was changed\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9786
9787
#: dummy/help_topics/status-flags/summary.txt:1
9788
msgid "Help on status flags"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9789
msgstr "Help on status flags"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9790
9791
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
9792
msgid "Branches Out of Sync"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9793
msgstr "Branches Out of Sync"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9794
9795
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
9796
msgid ""
9797
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
9798
"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
9799
"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
9800
"have the same last revision as the new reference branch for the lightweight\n"
9801
"checkout, data could be lost, so Bazaar refuses."
9802
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9808
9809
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
9810
msgid "How you deal with this depends on *why* the branches are out of sync."
9811
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9812
"How you deal with this depends on *why* the branches are out of sync."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9813
9814
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
9815
msgid ""
9816
"If you have a checkout and have done local commits, you can get back in "
9817
"sync\n"
9818
"by running \"bzr update\" (and possibly \"bzr commit\")."
9819
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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\")."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9823
9824
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
9825
msgid ""
9826
"If you have a branch and the remote branch is out-of-date, you can push\n"
9827
"the local changes using \"bzr push\".  If the local branch is out of date, "
9828
"you\n"
9829
"can do \"bzr pull\".  If both branches have had changes, you can merge, "
9830
"commit\n"
9831
"and then push your changes.  If you decide that some of the changes aren't\n"
9832
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
9833
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9841
9842
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
9843
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9844
msgstr "Steps to resolve \"out-of-sync\" when reconfiguring"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9845
9846
#: dummy/help_topics/topics/summary.txt:1
9847
msgid "Topics list"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9848
msgstr "Topics list"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9849
9850
#: dummy/help_topics/url-special-chars/summary.txt:1
9851
msgid "Special character handling in URLs"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9852
msgstr "Special character handling in URLs"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9853
9854
#: dummy/help_topics/urlspec/summary.txt:1
9855
msgid "Supported transport protocols"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9856
msgstr "Supported transport protocols"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9857
9858
#: dummy/help_topics/working-trees/detail.txt:1
9859
msgid "Working Trees"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9860
msgstr "Working Trees"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9861
9862
#: dummy/help_topics/working-trees/detail.txt:3
9863
msgid ""
9864
"A working tree is the contents of a branch placed on disk so that you can\n"
9865
"see the files and edit them. The working tree is where you make changes to "
9866
"a\n"
9867
"branch, and when you commit the current state of the working tree is the\n"
9868
"snapshot that is recorded in the commit."
9869
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9875
9876
#: dummy/help_topics/working-trees/detail.txt:8
9877
msgid ""
9878
"When you push a branch to a remote system, a working tree will not be\n"
9879
"created. If one is already present the files will not be updated. The\n"
9880
"branch information will be updated and the working tree will be marked\n"
9881
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
9882
"may be uncommitted changes or the update may cause content conflicts that "
9883
"are\n"
9884
"difficult to deal with remotely."
9885
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9893
9894
#: dummy/help_topics/working-trees/detail.txt:15
9895
msgid ""
9896
"If you have a branch with no working tree you can use the 'checkout' "
9897
"command\n"
9898
"to create a working tree. If you run 'bzr checkout .' from the branch it "
9899
"will\n"
9900
"create the working tree. If the branch is updated remotely, you can update "
9901
"the\n"
9902
"working tree by running 'bzr update' in that directory."
9903
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9911
9912
#: dummy/help_topics/working-trees/detail.txt:20
9913
msgid ""
9914
"If you have a branch with a working tree that you do not want the 'remove-"
9915
"tree'\n"
9916
"command will remove the tree if it is safe. This can be done to avoid the\n"
9917
"warning about the remote working tree not being updated when pushing to the\n"
9918
"branch. It can also be useful when working with a '--no-trees' repository\n"
9919
"(see 'bzr help repositories')."
9920
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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')."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9927
9928
#: dummy/help_topics/working-trees/detail.txt:26
9929
msgid ""
9930
"If you want to have a working tree on a remote machine that you push to you\n"
9931
"can either run 'bzr update' in the remote branch after each push, or use "
9932
"some\n"
9933
"other method to update the tree during the push. There is an 'rspush' "
9934
"plugin\n"
9935
"that will update the working tree using rsync as well as doing a push. "
9936
"There\n"
9937
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
9938
"SSH\n"
9939
"after each push."
9940
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9951
9952
#: dummy/help_topics/working-trees/detail.txt:33
9953
msgid "Useful commands::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9954
msgstr "Useful commands::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9955
9956
#: dummy/help_topics/working-trees/detail.txt:35
9957
msgid ""
9958
"  checkout     Create a working tree when a branch does not have one.\n"
9959
"  remove-tree  Removes the working tree from a branch when it is safe to do "
9960
"so.\n"
9961
"  update       When a working tree is out of sync with its associated "
9962
"branch\n"
9963
"               this will update the tree to match the branch.\n"
9964
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9971
9972
#: dummy/help_topics/working-trees/summary.txt:1
9973
msgid "Information on working trees"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9974
msgstr "Information on working trees"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9975
9976
#: en/help_topics/authentication.txt:1
9977
msgid ""
9978
"Authentication Settings\n"
9979
"======================="
9980
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9981
"Authentication Settings\n"
9982
"======================="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9983
9984
#: en/help_topics/authentication.txt:4
9985
msgid ""
9986
"\n"
9987
"Intent\n"
9988
"------"
9989
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9990
"\n"
9991
"Intent\n"
9992
"------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
9993
9994
#: en/help_topics/authentication.txt:8
9995
msgid ""
9996
"Many different authentication policies can be described in the\n"
9997
"``authentication.conf`` file but a particular user should need only a few\n"
9998
"definitions to cover his needs without having to specify a user and a "
9999
"password\n"
10000
"for every branch he uses."
10001
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10007
10008
#: en/help_topics/authentication.txt:13
10009
msgid ""
10010
"The definitions found in this file are used to find the credentials to use "
10011
"for\n"
10012
"a given url. The same credentials can generally be used for as many branches "
10013
"as\n"
10014
"possible by grouping their declaration around the remote servers that need\n"
10015
"them. It's even possible to declare credentials that will be used by "
10016
"different\n"
10017
"servers."
10018
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10027
10028
#: en/help_topics/authentication.txt:19
10029
msgid ""
10030
"The intent is to make this file as small as possible to minimize maintenance."
10031
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10032
"The intent is to make this file as small as possible to minimise maintenance."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10033
10034
#: en/help_topics/authentication.txt:21
10035
msgid ""
10036
"Once the relevant credentials are declared in this file you may use branch "
10037
"urls\n"
10038
"without embedding passwords (security hazard) or even users (enabling "
10039
"sharing\n"
10040
"of your urls with others)."
10041
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10047
10048
#: en/help_topics/authentication.txt:25
10049
msgid "Instead of using::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10050
msgstr "Instead of using::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10051
10052
#: en/help_topics/authentication.txt:27
10053
msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10054
msgstr "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10055
10056
#: en/help_topics/authentication.txt:29
10057
msgid "you simply use::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10058
msgstr "you simply use::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10059
10060
#: en/help_topics/authentication.txt:31
10061
msgid "  bzr branch ftp://host.com/path/to/my/branch"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10062
msgstr "  bzr branch ftp://host.com/path/to/my/branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10063
10064
#: en/help_topics/authentication.txt:33
10065
msgid ""
10066
"provided you have created the following ``authentication.conf`` file::"
10067
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10068
"provided you have created the following ``authentication.conf`` file::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10069
10070
#: en/help_topics/authentication.txt:35
10071
msgid ""
10072
"  [myprojects]\n"
10073
"  scheme=ftp\n"
10074
"  host=host.com\n"
10075
"  user=joe\n"
10076
"  password=secret\n"
10077
"  "
10078
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10079
"  [myprojects]\n"
10080
"  scheme=ftp\n"
10081
"  host=host.com\n"
10082
"  user=joe\n"
10083
"  password=secret\n"
10084
"  "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10085
10086
#: en/help_topics/authentication.txt:42
10087
msgid ""
10088
"Authentication definitions\n"
10089
"--------------------------"
10090
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10091
"Authentication definitions\n"
10092
"--------------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10093
10094
#: en/help_topics/authentication.txt:45
10095
msgid ""
10096
"There are two kinds of authentication used by the various schemes supported "
10097
"by\n"
10098
"bzr:"
10099
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10100
"There are two kinds of authentication used by the various schemes supported "
10101
"by\n"
10102
"bzr:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10103
10104
#: en/help_topics/authentication.txt:48
10105
msgid "1. user and password"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10106
msgstr "1. user and password"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10107
10108
#: en/help_topics/authentication.txt:50
10109
msgid ""
10110
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
10111
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
10112
"ssh agents are a better, more secure solution. So we have chosen to not "
10113
"provide\n"
10114
"our own less secure method."
10115
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10121
10122
#: en/help_topics/authentication.txt:55
10123
msgid "2. user, realm and password"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10124
msgstr "2. user, realm and password"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10125
10126
#: en/help_topics/authentication.txt:57
10127
msgid ""
10128
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
10129
"against a host. But, by using ``.htaccess`` files, for example, it is "
10130
"possible\n"
10131
"to define several (``user, realm, password``) for a given ``host``. So what "
10132
"is\n"
10133
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
10134
"is\n"
10135
"not taken into account in the definitions, but will displayed if bzr "
10136
"prompts\n"
10137
"you for a password."
10138
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10149
10150
#: en/help_topics/authentication.txt:64
10151
msgid ""
10152
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
10153
"specifying the appropriate port."
10154
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10155
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
10156
"specifying the appropriate port."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10157
10158
#: en/help_topics/authentication.txt:67
10159
msgid ""
10160
"To take all schemes into account, the password will be deduced from a set "
10161
"of\n"
10162
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
10163
"``user``,\n"
10164
"``password``)."
10165
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10171
10172
#: en/help_topics/authentication.txt:71
10173
msgid ""
10174
"  * ``scheme``: can be empty (meaning the rest of the definition can be "
10175
"used\n"
10176
"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
10177
"``ssh``\n"
10178
"    should be used instead since this is the real scheme regarding\n"
10179
"    authentication,"
10180
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10187
10188
#: en/help_topics/authentication.txt:76
10189
msgid "  * ``host``: can be empty (to act as a default for any host),"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10190
msgstr "  * ``host``: can be empty (to act as a default for any host),"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10191
10192
#: en/help_topics/authentication.txt:78
10193
msgid ""
10194
"  * ``port`` can be empty (useful when an host provides several servers for "
10195
"the\n"
10196
"    same scheme), only numerical values are allowed, this should be used "
10197
"only\n"
10198
"    when the server uses a port different than the scheme standard port,"
10199
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10205
10206
#: en/help_topics/authentication.txt:82
10207
msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10208
msgstr "  * ``path``: can be empty (FTP or SFTP will never user it),"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10209
10210
#: en/help_topics/authentication.txt:84
10211
msgid ""
10212
"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
10213
"    ``getpass.get_user()``),"
10214
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10215
"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
10216
"    ``getpass.get_user()``),"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10217
10218
#: en/help_topics/authentication.txt:87
10219
msgid ""
10220
"  * ``password``: can be empty if you prefer to always be prompted for your\n"
10221
"    password."
10222
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10223
"  * ``password``: can be empty if you prefer to always be prompted for your\n"
10224
"    password."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10225
10226
#: en/help_topics/authentication.txt:90
10227
msgid ""
10228
"Multiple definitions can be provided and, for a given URL, bzr will select "
10229
"a\n"
10230
"(``user`` [, ``password``]) based on the following rules :"
10231
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 :"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10235
10236
#: en/help_topics/authentication.txt:93
10237
msgid " 1. the first match wins,"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10238
msgstr " 1. the first match wins,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10239
10240
#: en/help_topics/authentication.txt:95
10241
msgid " 2. empty fields match everything,"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10242
msgstr " 2. empty fields match everything,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10243
10244
#: en/help_topics/authentication.txt:97
10245
msgid ""
10246
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
10247
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10248
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10249
10250
#: en/help_topics/authentication.txt:99
10251
msgid ""
10252
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
10253
"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
10254
"``projectbzr.sf.net``\n"
10255
"    will not match ``bzr.sf.net``)."
10256
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10261
10262
#: en/help_topics/authentication.txt:103
10263
msgid ""
10264
" 5. ``port`` matches if included in the requested URL (exact matches only)"
10265
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10266
" 5. ``port`` matches if included in the requested URL (exact matches only)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10267
10268
#: en/help_topics/authentication.txt:105
10269
msgid ""
10270
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
10271
"above,\n"
10272
"    empty paths will match any provided path)."
10273
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10277
10278
#: en/help_topics/authentication.txt:110
10279
msgid ""
10280
"File format\n"
10281
"-----------"
10282
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10283
"File format\n"
10284
"-----------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10285
10286
#: en/help_topics/authentication.txt:113
10287
msgid ""
10288
"The general rules for :doc:`configuration files <configuration-help>`\n"
10289
"apply except for the variable policies."
10290
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10291
"The general rules for :doc:`configuration files <configuration-help>`\n"
10292
"apply except for the variable policies."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10293
10294
#: en/help_topics/authentication.txt:116
10295
msgid "Each section describes an authentication definition."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10296
msgstr "Each section describes an authentication definition."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10297
10298
#: en/help_topics/authentication.txt:118
10299
msgid ""
10300
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
10301
"reserved\n"
10302
"and should appear as the *last* section."
10303
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10304
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
10305
"reserved\n"
10306
"and should appear as the *last* section."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10307
10308
#: en/help_topics/authentication.txt:121
10309
msgid "Each section should define:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10310
msgstr "Each section should define:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10311
10312
#: en/help_topics/authentication.txt:123
10313
msgid "* ``user``: the login to be used,"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10314
msgstr "* ``user``: the login to be used,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10315
10316
#: en/help_topics/authentication.txt:125
10317
msgid "Each section could define:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10318
msgstr "Each section could define:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10319
10320
#: en/help_topics/authentication.txt:127
10321
msgid "* ``host``: the remote server,"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10322
msgstr "* ``host``: the remote server,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10323
10324
#: en/help_topics/authentication.txt:129
10325
msgid "* ``port``: the port the server is listening,"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10326
msgstr "* ``port``: the port the server is listening,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10327
10328
#: en/help_topics/authentication.txt:131
10329
msgid "* ``path``: the branch location,"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10330
msgstr "* ``path``: the branch location,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10331
10332
#: en/help_topics/authentication.txt:133
10333
msgid "* ``password``: the password."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10334
msgstr "* ``password``: the password."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10335
10336
#: en/help_topics/authentication.txt:135
10337
msgid ""
10338
"\n"
10339
"Examples\n"
10340
"--------"
10341
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10342
"\n"
10343
"Examples\n"
10344
"--------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10345
10346
#: en/help_topics/authentication.txt:139
10347
msgid ""
10348
"\n"
10349
"Personal projects hosted outside\n"
10350
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10351
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10352
"\n"
10353
"Personal projects hosted outside\n"
10354
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10355
10356
#: en/help_topics/authentication.txt:143
10357
msgid ""
10358
"All connections are done with the same ``user`` (the remote one for which "
10359
"the\n"
10360
"default bzr one is not appropriate) and the password is always prompted "
10361
"with\n"
10362
"some exceptions::"
10363
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10369
10370
#: en/help_topics/authentication.txt:147
10371
msgid ""
10372
"        # Pet projects on hobby.net\n"
10373
"        [hobby]\n"
10374
"        host=r.hobby.net\n"
10375
"        user=jim\n"
10376
"        password=obvious1234\n"
10377
"        \n"
10378
"        # Home server\n"
10379
"        [home]\n"
10380
"        scheme=https\n"
10381
"        host=home.net\n"
10382
"        user=joe\n"
10383
"        password=1essobV10us\n"
10384
"        \n"
10385
"        [DEFAULT]\n"
10386
"        # Our local user is barbaz, on all remote sites we're known as "
10387
"foobar\n"
10388
"        user=foobar"
10389
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10407
10408
#: en/help_topics/authentication.txt:164
10409
msgid ""
10410
"\n"
10411
"Source hosting provider\n"
10412
"~~~~~~~~~~~~~~~~~~~~~~~"
10413
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10414
"\n"
10415
"Source hosting provider\n"
10416
"~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10417
10418
#: en/help_topics/authentication.txt:168
10419
msgid "In the shp.net (fictitious) domain, each project has its own site::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10420
msgstr "In the shp.net (fictitious) domain, each project has its own site::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10421
10422
#: en/help_topics/authentication.txt:170
10423
msgid ""
10424
"        [shpnet domain]\n"
10425
"        # we use sftp, but ssh is the scheme used for authentication\n"
10426
"        scheme=ssh\n"
10427
"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
10428
"        host=.shp.net\n"
10429
"        user=joe\n"
10430
"        # bzr don't support supplying a password for sftp,\n"
10431
"        # consider using an ssh agent if you don't want to supply\n"
10432
"        # a password interactively. (pageant, ssh-agent, etc)"
10433
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10443
10444
#: en/help_topics/authentication.txt:180
10445
msgid ""
10446
"HTTPS, SFTP servers and their proxy\n"
10447
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10448
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10449
"HTTPS, SFTP servers and their proxy\n"
10450
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10451
10452
#: en/help_topics/authentication.txt:183
10453
msgid ""
10454
"At company.com, the server hosting release and integration branches is "
10455
"behind a\n"
10456
"proxy, and the two branches use different authentication policies::"
10457
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10461
10462
#: en/help_topics/authentication.txt:186
10463
msgid ""
10464
"        [reference code]\n"
10465
"        scheme=https\n"
10466
"        host=dev.company.com\n"
10467
"        path=/dev\n"
10468
"        user=user1\n"
10469
"        password=pass1"
10470
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10477
10478
#: en/help_topics/authentication.txt:193
10479
msgid ""
10480
"        # development branches on dev server\n"
10481
"        [dev]\n"
10482
"        scheme=ssh # bzr+ssh and sftp are available here\n"
10483
"        host=dev.company.com\n"
10484
"        path=/dev/integration\n"
10485
"        user=user2\n"
10486
"        \n"
10487
"        # proxy\n"
10488
"        [proxy]\n"
10489
"        scheme=http\n"
10490
"        host=proxy.company.com\n"
10491
"        port=3128\n"
10492
"        user=proxyuser1\n"
10493
"        password=proxypass1"
10494
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10509
10510
#: en/help_topics/authentication.txt:208
10511
msgid ""
10512
"\n"
10513
"Planned enhancements\n"
10514
"--------------------"
10515
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10516
"\n"
10517
"Planned enhancements\n"
10518
"--------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10519
10520
#: en/help_topics/authentication.txt:212
10521
msgid ""
10522
"The following are not yet implemented but planned as parts of a work in\n"
10523
"progress:"
10524
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10525
"The following are not yet implemented but planned as parts of a work in\n"
10526
"progress:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10527
10528
#: en/help_topics/authentication.txt:215
10529
msgid "* add a  ``password_encoding`` field allowing:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10530
msgstr "* add a  ``password_encoding`` field allowing:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10531
10532
#: en/help_topics/authentication.txt:217
10533
msgid ""
10534
"  - storing the passwords in various obfuscating encodings (base64 for one),"
10535
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10536
"  - storing the passwords in various obfuscating encodings (base64 for one),"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10537
10538
#: en/help_topics/authentication.txt:219
10539
msgid "  - delegate password storage to plugins (.netrc for example)."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10540
msgstr "  - delegate password storage to plugins (.netrc for example)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10541
10542
#: en/help_topics/authentication.txt:221
10543
msgid ""
10544
"* update the credentials when the user is prompted for user or password,"
10545
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10546
"* update the credentials when the user is prompted for user or password,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10547
10548
#: en/help_topics/authentication.txt:223
10549
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10550
msgstr "* add a ``verify_certificates`` field for ``HTTPS``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10551
10552
#: en/help_topics/authentication.txt:225
10553
msgid ""
10554
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
10555
"but\n"
10556
"ignored in the actual implementation.\n"
10557
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10558
"The ``password_encoding`` and ``verify_certificates`` fields are recognised "
10559
"but\n"
10560
"ignored in the actual implementation.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10561
10562
#: en/help_topics/bugs.txt:1
10563
msgid "Bug Tracker Settings"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10564
msgstr "Bug Tracker Settings"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10565
10566
#: en/help_topics/bugs.txt:3
10567
msgid ""
10568
"When making a commit, metadata about bugs fixed by that change can be\n"
10569
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
10570
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
10571
"(The only ``status`` value currently supported is ``fixed.``)"
10572
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.``)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10577
10578
#: en/help_topics/bugs.txt:8
10579
msgid ""
10580
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
10581
"identifier\n"
10582
"rather than a full URL. This looks like::"
10583
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10587
10588
#: en/help_topics/bugs.txt:11
10589
msgid "    bzr commit --fixes <tracker>:<id>"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10590
msgstr "    bzr commit --fixes <tracker>:<id>"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10591
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10592
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10593
msgid "or::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10594
msgstr "or::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10595
10596
#: en/help_topics/bugs.txt:15
10597
msgid "    bzr commit --fixes <id>"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10598
msgstr "    bzr commit --fixes <id>"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10599
10600
#: en/help_topics/bugs.txt:17
10601
msgid ""
10602
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
10603
"the\n"
10604
"identifier for that bug within the bugtracker, usually the bug number.\n"
10605
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
10606
"or global configuration is used."
10607
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10613
10614
#: en/help_topics/bugs.txt:22
10615
msgid ""
10616
"Bazaar knows about a few bug trackers that have many users. If\n"
10617
"you use one of these bug trackers then there is no setup required to\n"
10618
"use this feature, you just need to know the tracker identifier to use.\n"
10619
"These are the bugtrackers that are built in:"
10620
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10625
10626
#: en/help_topics/bugs.txt:27
10627
msgid ""
10628
"  ============================ ============ ============\n"
10629
"  URL                          Abbreviation Example\n"
10630
"  ============================ ============ ============\n"
10631
"  https://bugs.launchpad.net/  lp           lp:12345\n"
10632
"  http://bugs.debian.org/      deb          deb:12345\n"
10633
"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
10634
"  ============================ ============ ============"
10635
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
"  ============================ ============ ============"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10643
10644
#: en/help_topics/bugs.txt:35
10645
msgid ""
10646
"For the bug trackers not listed above configuration is required.\n"
10647
"Support for generating the URLs for any project using Bugzilla or Trac\n"
10648
"is built in, along with a template mechanism for other bugtrackers with\n"
10649
"simple URL schemes. If your bug tracker can't be described by one\n"
10650
"of the schemes described below then you can write a plugin to support\n"
10651
"it."
10652
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10659
10660
#: en/help_topics/bugs.txt:42
10661
msgid ""
10662
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
10663
"variable which contains the base URL of the bug tracker. These options\n"
10664
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
10665
"configuration section in ``locations.conf``.  You can set up these values\n"
10666
"for each of the projects you work on."
10667
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10673
10674
#: en/help_topics/bugs.txt:48
10675
msgid ""
10676
"Note: As you provide a short name for each tracker, you can specify one or\n"
10677
"more bugs in one or more trackers at commit time if you wish."
10678
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10681
10682
#: en/help_topics/bugs.txt:51
10683
msgid ""
10684
"Launchpad\n"
10685
"---------"
10686
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10687
"Launchpad\n"
10688
"---------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10689
10690
#: en/help_topics/bugs.txt:54
10691
msgid ""
10692
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
10693
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10694
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10695
10696
#: en/help_topics/bugs.txt:56
10697
msgid ""
10698
"bugzilla_<tracker>_url\n"
10699
"----------------------"
10700
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10701
"bugzilla_<tracker>_url\n"
10702
"----------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10703
10704
#: en/help_topics/bugs.txt:59
10705
msgid ""
10706
"If present, the location of the Bugzilla bug tracker referred to by\n"
10707
"<tracker>. This option can then be used together with ``bzr commit\n"
10708
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10709
"example::"
10710
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10715
10716
#: en/help_topics/bugs.txt:64
10717
msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10718
msgstr "    bugzilla_squid_url = http://bugs.squid-cache.org"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10719
10720
#: en/help_topics/bugs.txt:66
10721
msgid ""
10722
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
10723
"fixed."
10724
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10725
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
10726
"fixed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10727
10728
#: en/help_topics/bugs.txt:69
10729
msgid ""
10730
"trac_<tracker>_url\n"
10731
"------------------"
10732
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10733
"trac_<tracker>_url\n"
10734
"------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10735
10736
#: en/help_topics/bugs.txt:72
10737
msgid ""
10738
"If present, the location of the Trac instance referred to by\n"
10739
"<tracker>. This option can then be used together with ``bzr commit\n"
10740
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10741
"example::"
10742
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10747
10748
#: en/help_topics/bugs.txt:77
10749
msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10750
msgstr "    trac_twisted_url = http://www.twistedmatrix.com/trac"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10751
10752
#: en/help_topics/bugs.txt:79
10753
msgid ""
10754
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
10755
"as\n"
10756
"fixed."
10757
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10758
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
10759
"as\n"
10760
"fixed."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10761
10762
#: en/help_topics/bugs.txt:82
10763
msgid ""
10764
"bugtracker_<tracker>_url\n"
10765
"------------------------"
10766
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10767
"bugtracker_<tracker>_url\n"
10768
"------------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10769
10770
#: en/help_topics/bugs.txt:85
10771
msgid ""
10772
"If present, the location of a generic bug tracker instance referred to by\n"
10773
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
10774
"which will be replaced by a specific bug ID. This option can then be used\n"
10775
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
10776
"fixed by that commit. For example::"
10777
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10783
10784
#: en/help_topics/bugs.txt:91
10785
msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10786
msgstr "    bugtracker_python_url = http://bugs.python.org/issue{id}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10787
10788
#: en/help_topics/bugs.txt:93
10789
msgid ""
10790
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
10791
"Roundup bug tracker as fixed, or::"
10792
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10793
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
10794
"Roundup bug tracker as fixed, or::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10795
10796
#: en/help_topics/bugs.txt:96
10797
msgid ""
10798
"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
10799
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10800
"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10801
10802
#: en/help_topics/bugs.txt:98
10803
msgid ""
10804
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
10805
"RT bug tracker as fixed, or::"
10806
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10807
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
10808
"RT bug tracker as fixed, or::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10809
10810
#: en/help_topics/bugs.txt:101
10811
msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10812
msgstr "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10813
10814
#: en/help_topics/bugs.txt:103
10815
msgid ""
10816
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
10817
"1234\n"
10818
"in Hudson's JIRA bug tracker as fixed.\n"
10819
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10823
10824
#: en/help_topics/commands.txt:1
10825
msgid ""
10826
"add               Add specified files or directories.\n"
10827
"alias             Set/unset and display aliases.\n"
10828
"annotate          Show the origin of each line in a file.\n"
10829
"bash-completion   Generate a shell function for bash command line "
10830
"completion.\n"
10831
"                  [bash_completion]\n"
10832
"bind              Convert the current branch into a checkout of the "
10833
"supplied\n"
10834
"                  branch.\n"
10835
"branch            Create a new branch that is a copy of an existing branch.\n"
10836
"branches          List the branches available at the current location.\n"
10837
"break-lock        Break a dead lock.\n"
10838
"cat               Write the contents of a file as of a given revision to\n"
10839
"                  standard output.\n"
10840
"check             Validate working tree structure, branch consistency and\n"
10841
"                  repository history.\n"
10842
"checkout          Create a new checkout of an existing branch.\n"
10843
"clean-tree        Remove unwanted files from working tree.\n"
10844
"commit            Commit changes into a new revision.\n"
10845
"config            Display, set or remove a configuration option.\n"
10846
"conflicts         List files with conflicts.\n"
10847
"deleted           List files deleted in the working tree.\n"
10848
"diff              Show differences in the working tree, between revisions "
10849
"or\n"
10850
"                  branches.\n"
10851
"dpush             Push into a different VCS without any custom bzr "
10852
"metadata.\n"
10853
"export            Export current or past revision to a destination directory "
10854
"or\n"
10855
"                  archive.\n"
10856
"help              Show help on a command or other topic.\n"
10857
"ignore            Ignore specified files or patterns.\n"
10858
"ignored           List ignored files and the patterns that matched them.\n"
10859
"info              Show information about a working tree, branch or "
10860
"repository.\n"
10861
"init              Make a directory into a versioned branch.\n"
10862
"init-repository   Create a shared repository for branches to share storage\n"
10863
"                  space.\n"
10864
"join              Combine a tree into its containing tree.\n"
10865
"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
10866
"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
10867
"launchpad-open    Open a Launchpad branch page in your web browser. "
10868
"[launchpad]\n"
10869
"log               Show historical log for a branch or subset of a branch.\n"
10870
"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
10871
"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
10872
"ls                List files in a tree.\n"
10873
"merge             Perform a three-way merge.\n"
10874
"missing           Show unmerged/unpulled revisions between two branches.\n"
10875
"mkdir             Create a new versioned directory.\n"
10876
"mv                Move or rename a file.\n"
10877
"nick              Print or set the branch nickname.\n"
10878
"pack              Compress the data within a repository.\n"
10879
"plugins           List the installed plugins.\n"
10880
"pull              Turn this branch into a mirror of another branch.\n"
10881
"push              Update a mirror of this branch.\n"
10882
"reconcile         Reconcile bzr metadata in a branch.\n"
10883
"reconfigure       Reconfigure the type of a bzr directory.\n"
10884
"register-branch   Register a branch with launchpad.net. [launchpad]\n"
10885
"remerge           Redo a merge.\n"
10886
"remove            Remove files or directories.\n"
10887
"remove-branch     Remove a branch.\n"
10888
"remove-tree       Remove the working tree from a given branch/checkout.\n"
10889
"renames           Show list of renamed files.\n"
10890
"resolve           Mark a conflict as resolved.\n"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10891
"revert            Set files in the working tree back to the contents of a\n"
10892
"                  previous revision.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
10893
"revno             Show current revision number.\n"
10894
"root              Show the tree root directory.\n"
10895
"send              Mail or create a merge-directive for submitting changes.\n"
10896
"serve             Run the bzr server.\n"
10897
"shelve            Temporarily set aside some changes from the current tree.\n"
10898
"sign-my-commits   Sign all commits by a given committer.\n"
10899
"split             Split a subdirectory of a tree into a separate tree.\n"
10900
"status            Display status summary.\n"
10901
"switch            Set the branch of a checkout and update.\n"
10902
"tag               Create, remove or modify a tag naming a revision.\n"
10903
"tags              List tags.\n"
10904
"testament         Show testament (signing-form) of a revision.\n"
10905
"unbind            Convert the current checkout into a regular branch.\n"
10906
"uncommit          Remove the last committed revision.\n"
10907
"unshelve          Restore shelved changes.\n"
10908
"update            Update a working tree to a new revision.\n"
10909
"upgrade           Upgrade a repository, branch or working tree to a newer\n"
10910
"                  format.\n"
10911
"verify-signatures Verify all commit signatures.\n"
10912
"version           Show version of bzr.\n"
10913
"version-info      Show version information about this tree.\n"
10914
"view              Manage filtered views.\n"
10915
"whoami            Show or set bzr user id.\n"
10916
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11007
11008
#: en/help_topics/configuration.txt:1
11009
msgid ""
11010
"Configuration Settings\n"
11011
"======================="
11012
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11013
"Configuration Settings\n"
11014
"======================="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11015
11016
#: en/help_topics/configuration.txt:4
11017
msgid ""
11018
"Environment settings\n"
11019
"---------------------"
11020
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11021
"Environment settings\n"
11022
"---------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11023
11024
#: en/help_topics/configuration.txt:7
11025
msgid ""
11026
"While most configuration is handled by configuration files, some options\n"
11027
"which may be semi-permanent can also be controlled through the environment."
11028
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11031
11032
#: en/help_topics/configuration.txt:10
11033
msgid ""
11034
"BZR_EMAIL\n"
11035
"~~~~~~~~~"
11036
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11037
"BZR_EMAIL\n"
11038
"~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11039
11040
#: en/help_topics/configuration.txt:13
11041
msgid "Override the email id used by Bazaar.  Typical format::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11042
msgstr "Override the email id used by Bazaar.  Typical format::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11043
11044
#: en/help_topics/configuration.txt:15
11045
msgid "  \"John Doe <jdoe@example.com>\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11046
msgstr "  \"John Doe <jdoe@example.com>\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11047
11048
#: en/help_topics/configuration.txt:17
11049
msgid "See also the ``email`` configuration option."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11050
msgstr "See also the ``email`` configuration option."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11051
11052
#: en/help_topics/configuration.txt:19
11053
msgid ""
11054
"BZR_PROGRESS_BAR\n"
11055
"~~~~~~~~~~~~~~~~"
11056
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11057
"BZR_PROGRESS_BAR\n"
11058
"~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11059
11060
#: en/help_topics/configuration.txt:22
11061
msgid ""
11062
"Override the progress display.  Possible values are \"none\" or \"text\".  "
11063
"If\n"
11064
"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
11065
"draws\n"
11066
"the ordinary command line progress bar."
11067
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11073
11074
#: en/help_topics/configuration.txt:26
11075
msgid ""
11076
"BZR_SIGQUIT_PDB\n"
11077
"~~~~~~~~~~~~~~~"
11078
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11079
"BZR_SIGQUIT_PDB\n"
11080
"~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11081
11082
#: en/help_topics/configuration.txt:29
11083
msgid ""
11084
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
11085
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11086
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11087
11088
#: en/help_topics/configuration.txt:31
11089
msgid ""
11090
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
11091
"* 1 = Invoke breakin debugger (default)"
11092
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11093
"* 0 = Standard SIGQUIT behaviour (normally, exit with a core dump)\n"
11094
"* 1 = Invoke breakin debugger (default)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11095
11096
#: en/help_topics/configuration.txt:34
11097
msgid ""
11098
"BZR_HOME\n"
11099
"~~~~~~~~"
11100
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11101
"BZR_HOME\n"
11102
"~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11103
11104
#: en/help_topics/configuration.txt:37
11105
msgid "Override the home directory used by Bazaar."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11106
msgstr "Override the home directory used by Bazaar."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11107
11108
#: en/help_topics/configuration.txt:39
11109
msgid ""
11110
"BZR_SSH\n"
11111
"~~~~~~~"
11112
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11113
"BZR_SSH\n"
11114
"~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11115
11116
#: en/help_topics/configuration.txt:42
11117
msgid "Select a different SSH implementation."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11118
msgstr "Select a different SSH implementation."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11119
11120
#: en/help_topics/configuration.txt:44
11121
msgid ""
11122
"BZR_PDB\n"
11123
"~~~~~~~"
11124
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11125
"BZR_PDB\n"
11126
"~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11127
11128
#: en/help_topics/configuration.txt:47
11129
msgid "Control whether to launch a debugger on error."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11130
msgstr "Control whether to launch a debugger on error."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11131
11132
#: en/help_topics/configuration.txt:49
11133
msgid ""
11134
"* 0 = Standard behavior\n"
11135
"* 1 = Launch debugger"
11136
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11137
"* 0 = Standard behaviour\n"
11138
"* 1 = Launch debugger"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11139
11140
#: en/help_topics/configuration.txt:52
11141
msgid ""
11142
"BZR_REMOTE_PATH\n"
11143
"~~~~~~~~~~~~~~~"
11144
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11145
"BZR_REMOTE_PATH\n"
11146
"~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11147
11148
#: en/help_topics/configuration.txt:55
11149
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
11150
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11151
"Path to the Bazaar executable to use when using the bzr+ssh protocol."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11152
11153
#: en/help_topics/configuration.txt:57
11154
msgid "See also the ``bzr_remote_path`` configuration option."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11155
msgstr "See also the ``bzr_remote_path`` configuration option."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11156
11157
#: en/help_topics/configuration.txt:59
11158
msgid ""
11159
"BZR_EDITOR\n"
11160
"~~~~~~~~~~"
11161
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11162
"BZR_EDITOR\n"
11163
"~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11164
11165
#: en/help_topics/configuration.txt:62
11166
msgid "Path to the editor Bazaar should use for commit messages, etc."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11167
msgstr "Path to the editor Bazaar should use for commit messages, etc."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11168
11169
#: en/help_topics/configuration.txt:64
11170
msgid ""
11171
"BZR_LOG\n"
11172
"~~~~~~~"
11173
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11174
"BZR_LOG\n"
11175
"~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11176
11177
#: en/help_topics/configuration.txt:67
11178
msgid ""
11179
"Location of the Bazaar log file. You can check the current location by\n"
11180
"running ``bzr version``."
11181
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11182
"Location of the Bazaar log file. You can check the current location by\n"
11183
"running ``bzr version``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11184
11185
#: en/help_topics/configuration.txt:70
11186
msgid ""
11187
"The log file contains debug information that is useful for diagnosing or\n"
11188
"reporting problems with Bazaar."
11189
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11190
"The log file contains debug information that is useful for diagnosing or\n"
11191
"reporting problems with Bazaar."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11192
11193
#: en/help_topics/configuration.txt:73
11194
msgid ""
11195
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
11196
"will disable logging."
11197
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11198
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
11199
"will disable logging."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11200
11201
#: en/help_topics/configuration.txt:76
11202
msgid ""
11203
"\n"
11204
"BZR_PLUGIN_PATH\n"
11205
"~~~~~~~~~~~~~~~"
11206
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11207
"\n"
11208
"BZR_PLUGIN_PATH\n"
11209
"~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11210
11211
#: en/help_topics/configuration.txt:80
11212
msgid ""
11213
"The path to the plugins directory that Bazaar should use.\n"
11214
"If not set, Bazaar will search for plugins in:"
11215
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11216
"The path to the plugins directory that Bazaar should use.\n"
11217
"If not set, Bazaar will search for plugins in:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11218
11219
#: en/help_topics/configuration.txt:83
11220
msgid ""
11221
"* the user specific plugin directory (containing the ``user`` plugins),"
11222
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11223
"* the user specific plugin directory (containing the ``user`` plugins),"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11224
11225
#: en/help_topics/configuration.txt:85
11226
msgid "* the bzrlib directory (containing the ``core`` plugins),"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11227
msgstr "* the bzrlib directory (containing the ``core`` plugins),"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11228
11229
#: en/help_topics/configuration.txt:87
11230
msgid ""
11231
"* the site specific plugin directory if applicable (containing\n"
11232
"  the ``site`` plugins)."
11233
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11234
"* the site specific plugin directory if applicable (containing\n"
11235
"  the ``site`` plugins)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11236
11237
#: en/help_topics/configuration.txt:90
11238
msgid ""
11239
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
11240
"the way the plugin are searched. "
11241
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11242
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
11243
"the way the plugin are searched. "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11244
11245
#: en/help_topics/configuration.txt:93
11246
msgid ""
11247
"As for the ``PATH`` variables, if multiple directories are\n"
11248
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
11249
"platform specific appropriate character (':' on Unix,\n"
11250
"';' on windows)"
11251
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11256
11257
#: en/help_topics/configuration.txt:98
11258
msgid ""
11259
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
11260
"in ``user``.  However it will continue to search in ``core`` and\n"
11261
"``site`` unless they are explicitly removed."
11262
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11266
11267
#: en/help_topics/configuration.txt:102
11268
msgid ""
11269
"If you need to change the order or remove one of these\n"
11270
"directories, you should use special values:"
11271
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11272
"If you need to change the order or remove one of these\n"
11273
"directories, you should use special values:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11274
11275
#: en/help_topics/configuration.txt:105
11276
msgid ""
11277
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
11278
"  path from the default values,"
11279
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11280
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
11281
"  path from the default values,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11282
11283
#: en/help_topics/configuration.txt:108
11284
msgid ""
11285
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
11286
"  before the remaining default values (and also remove it from\n"
11287
"  the default values)."
11288
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11292
11293
#: en/help_topics/configuration.txt:112
11294
msgid ""
11295
"Note that the special values 'user', 'core' and 'site' should be\n"
11296
"used literally, they will be substituted by the corresponding,\n"
11297
"platform specific, values."
11298
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11302
11303
#: en/help_topics/configuration.txt:116
11304
msgid ""
11305
"The examples below use ':' as the separator, windows users\n"
11306
"should use ';'."
11307
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11308
"The examples below use ':' as the separator, windows users\n"
11309
"should use ';'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11310
11311
#: en/help_topics/configuration.txt:119
11312
msgid "Overriding the default user plugin directory::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11313
msgstr "Overriding the default user plugin directory::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11314
11315
#: en/help_topics/configuration.txt:121
11316
msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11317
msgstr "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11318
11319
#: en/help_topics/configuration.txt:123
11320
msgid "Disabling the site directory while retaining the user directory::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11321
msgstr "Disabling the site directory while retaining the user directory::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11322
11323
#: en/help_topics/configuration.txt:125
11324
msgid "  BZR_PLUGIN_PATH='-site:+user'"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11325
msgstr "  BZR_PLUGIN_PATH='-site:+user'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11326
11327
#: en/help_topics/configuration.txt:127
11328
msgid "Disabling all plugins (better achieved with --no-plugins)::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11329
msgstr "Disabling all plugins (better achieved with --no-plugins)::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11330
11331
#: en/help_topics/configuration.txt:129
11332
msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11333
msgstr "  BZR_PLUGIN_PATH='-user:-core:-site'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11334
11335
#: en/help_topics/configuration.txt:131
11336
msgid "Overriding the default site plugin directory::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11337
msgstr "Overriding the default site plugin directory::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11338
11339
#: en/help_topics/configuration.txt:133
11340
msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11341
msgstr "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11342
11343
#: en/help_topics/configuration.txt:135
11344
msgid ""
11345
"BZR_DISABLE_PLUGINS\n"
11346
"~~~~~~~~~~~~~~~~~~~"
11347
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11348
"BZR_DISABLE_PLUGINS\n"
11349
"~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11350
11351
#: en/help_topics/configuration.txt:138
11352
msgid ""
11353
"Under special circumstances (mostly when trying to diagnose a\n"
11354
"bug), it's better to disable a plugin (or several) rather than\n"
11355
"uninstalling them completely. Such plugins can be specified in\n"
11356
"the ``BZR_DISABLE_PLUGINS`` environment variable."
11357
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11362
11363
#: en/help_topics/configuration.txt:143
11364
msgid ""
11365
"In that case, ``bzr`` will stop loading the specified plugins and\n"
11366
"will raise an import error if they are explicitly imported (by\n"
11367
"another plugin that depends on them for example)."
11368
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11372
11373
#: en/help_topics/configuration.txt:147
11374
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11375
msgstr "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11376
11377
#: en/help_topics/configuration.txt:149
11378
msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11379
msgstr "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11380
11381
#: en/help_topics/configuration.txt:151
11382
msgid ""
11383
"BZR_PLUGINS_AT\n"
11384
"~~~~~~~~~~~~~~"
11385
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11386
"BZR_PLUGINS_AT\n"
11387
"~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11388
11389
#: en/help_topics/configuration.txt:154
11390
msgid ""
11391
"When adding a new feature or working on a bug in a plugin,\n"
11392
"developers often need to use a specific version of a given\n"
11393
"plugin. Since python requires that the directory containing the\n"
11394
"code is named like the plugin itself this make it impossible to\n"
11395
"use arbitrary directory names (using a two-level directory scheme\n"
11396
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
11397
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
11398
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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`` ."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11406
11407
#: en/help_topics/configuration.txt:162
11408
msgid ""
11409
"Plugins specified in this environment variable takes precedence\n"
11410
"over the ones in ``BZR_PLUGIN_PATH``."
11411
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11412
"Plugins specified in this environment variable takes precedence\n"
11413
"over the ones in ``BZR_PLUGIN_PATH``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11414
11415
#: en/help_topics/configuration.txt:165
11416
msgid ""
11417
"The variable specified a list of ``plugin_name@plugin path``,\n"
11418
"``plugin_name`` being the name of the plugin as it appears in\n"
11419
"python module paths, ``plugin_path`` being the path to the\n"
11420
"directory containing the plugin code itself\n"
11421
"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
11422
"separator, use ';' on windows."
11423
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11430
11431
#: en/help_topics/configuration.txt:172
11432
msgid ""
11433
"Example:\n"
11434
"~~~~~~~~"
11435
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11436
"Example:\n"
11437
"~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11438
11439
#: en/help_topics/configuration.txt:175
11440
msgid ""
11441
"Using a specific version of ``myplugin``:\n"
11442
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
11443
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11444
"Using a specific version of ``myplugin``:\n"
11445
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11446
11447
#: en/help_topics/configuration.txt:178
11448
msgid ""
11449
"BZRPATH\n"
11450
"~~~~~~~"
11451
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11452
"BZRPATH\n"
11453
"~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11454
11455
#: en/help_topics/configuration.txt:181
11456
msgid "The path where Bazaar should look for shell plugin external commands."
11457
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11458
"The path where Bazaar should look for shell plugin external commands."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11459
11460
#: en/help_topics/configuration.txt:183
11461
msgid ""
11462
"\n"
11463
"http_proxy, https_proxy\n"
11464
"~~~~~~~~~~~~~~~~~~~~~~~"
11465
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11466
"\n"
11467
"http_proxy, https_proxy\n"
11468
"~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11469
11470
#: en/help_topics/configuration.txt:187
11471
msgid "Specifies the network proxy for outgoing connections, for example::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11472
msgstr "Specifies the network proxy for outgoing connections, for example::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11473
11474
#: en/help_topics/configuration.txt:189
11475
msgid ""
11476
"  http_proxy=http://proxy.example.com:3128/ \n"
11477
"  https_proxy=http://proxy.example.com:3128/"
11478
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11479
"  http_proxy=http://proxy.example.com:3128/ \n"
11480
"  https_proxy=http://proxy.example.com:3128/"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11481
11482
#: en/help_topics/configuration.txt:192
11483
msgid ""
11484
"\n"
11485
"Configuration files\n"
11486
"-------------------"
11487
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11488
"\n"
11489
"Configuration files\n"
11490
"-------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11491
11492
#: en/help_topics/configuration.txt:196
11493
msgid ""
11494
"Location\n"
11495
"~~~~~~~~"
11496
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11497
"Location\n"
11498
"~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11499
11500
#: en/help_topics/configuration.txt:199
11501
msgid ""
11502
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
11503
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
11504
"on\n"
11505
"Windows. (You can check the location for your system by using\n"
11506
"``bzr version``.)"
11507
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``.)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11513
11514
#: en/help_topics/configuration.txt:204
11515
msgid "There are three primary configuration files in this location:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11516
msgstr "There are three primary configuration files in this location:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11517
11518
#: en/help_topics/configuration.txt:206
11519
msgid "* ``bazaar.conf`` describes default configuration options,"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11520
msgstr "* ``bazaar.conf`` describes default configuration options,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11521
11522
#: en/help_topics/configuration.txt:208
11523
msgid ""
11524
"* ``locations.conf`` describes configuration information for\n"
11525
"  specific branch locations,"
11526
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11527
"* ``locations.conf`` describes configuration information for\n"
11528
"  specific branch locations,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11529
11530
#: en/help_topics/configuration.txt:211
11531
msgid ""
11532
"* ``authentication.conf`` describes credential information for\n"
11533
"  remote servers."
11534
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11535
"* ``authentication.conf`` describes credential information for\n"
11536
"  remote servers."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11537
11538
#: en/help_topics/configuration.txt:214
11539
msgid ""
11540
"Each branch can also contain a configuration file that sets values specific\n"
11541
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
11542
"the\n"
11543
"branch. This file is visible to all users of a branch, if you wish to "
11544
"override\n"
11545
"one of the values for a branch with a setting that is specific to you then "
11546
"you\n"
11547
"can do so in ``locations.conf``."
11548
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11557
11558
#: en/help_topics/configuration.txt:220
11559
msgid ""
11560
"General format\n"
11561
"~~~~~~~~~~~~~~"
11562
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11563
"General format\n"
11564
"~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11565
11566
#: en/help_topics/configuration.txt:223
11567
msgid ""
11568
"An ini file has three types of contructs: section headers, section\n"
11569
"options and comments."
11570
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11571
"An ini file has three types of contructs: section headers, section\n"
11572
"options and comments."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11573
11574
#: en/help_topics/configuration.txt:226
11575
msgid ""
11576
"Comments\n"
11577
"^^^^^^^^"
11578
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11579
"Comments\n"
11580
"^^^^^^^^"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11581
11582
#: en/help_topics/configuration.txt:229
11583
msgid ""
11584
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
11585
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
11586
"Bazaar when parsing ini files."
11587
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11591
11592
#: en/help_topics/configuration.txt:233
11593
msgid ""
11594
"Section headers\n"
11595
"^^^^^^^^^^^^^^^"
11596
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11597
"Section headers\n"
11598
"^^^^^^^^^^^^^^^"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11599
11600
#: en/help_topics/configuration.txt:236
11601
msgid ""
11602
"A section header is a word enclosed in brackets that starts at the begining\n"
11603
"of a line.  A typical section header looks like this::"
11604
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11608
11609
#: en/help_topics/configuration.txt:239
11610
msgid "    [DEFAULT]"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11611
msgstr "    [DEFAULT]"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11612
11613
#: en/help_topics/configuration.txt:241
11614
msgid ""
11615
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
11616
"[ALIASES].  Section headers are case sensitive. The default section provides "
11617
"for\n"
11618
"setting options which can be overridden with the branch config file."
11619
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11624
11625
#: en/help_topics/configuration.txt:245
11626
msgid ""
11627
"For ``locations.conf``, the options from the section with the\n"
11628
"longest matching section header are used to the exclusion of other\n"
11629
"potentially valid section headers. A section header uses the path for\n"
11630
"the branch as the section header. Some examples include::"
11631
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11636
11637
#: en/help_topics/configuration.txt:250
11638
msgid ""
11639
"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
11640
"    [/home/jdoe/branches/]"
11641
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11642
"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
11643
"    [/home/jdoe/branches/]"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11644
11645
#: en/help_topics/configuration.txt:253
11646
msgid ""
11647
"\n"
11648
"Section options\n"
11649
"^^^^^^^^^^^^^^^"
11650
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11651
"\n"
11652
"Section options\n"
11653
"^^^^^^^^^^^^^^^"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11654
11655
#: en/help_topics/configuration.txt:257
11656
msgid ""
11657
"A section option resides within a section. A section option contains an\n"
11658
"option name, an equals sign and a value.  For example::"
11659
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11662
11663
#: en/help_topics/configuration.txt:260
11664
msgid ""
11665
"    email            = John Doe <jdoe@isp.com>\n"
11666
"    gpg_signing_key  = Amy Pond <amy@example.com>"
11667
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11668
"    email            = John Doe <jdoe@isp.com>\n"
11669
"    gpg_signing_key  = Amy Pond <amy@example.com>"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11670
11671
#: en/help_topics/configuration.txt:263
11672
msgid ""
11673
"A option can reference other options by enclosing them in curly brackets::"
11674
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11675
"A option can reference other options by enclosing them in curly brackets::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11676
11677
#: en/help_topics/configuration.txt:265
11678
msgid ""
11679
"    my_branch_name = feature_x\n"
11680
"    my_server      = bzr+ssh://example.com\n"
11681
"    push_location   = {my_server}/project/{my_branch_name}"
11682
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11683
"    my_branch_name = feature_x\n"
11684
"    my_server      = bzr+ssh://example.com\n"
11685
"    push_location   = {my_server}/project/{my_branch_name}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11686
11687
#: en/help_topics/configuration.txt:269
11688
msgid ""
11689
"Option policies\n"
11690
"^^^^^^^^^^^^^^^"
11691
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11692
"Option policies\n"
11693
"^^^^^^^^^^^^^^^"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11694
11695
#: en/help_topics/configuration.txt:272
11696
msgid ""
11697
"Options defined in a section affect the named directory or URL plus\n"
11698
"any locations they contain.  Policies can be used to change how an\n"
11699
"option value is interpreted for contained locations.  Currently\n"
11700
"there are three policies available:"
11701
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11706
11707
#: en/help_topics/configuration.txt:277
11708
msgid ""
11709
" none:\n"
11710
"   the value is interpreted the same for contained locations.  This is\n"
11711
"   the default behaviour.\n"
11712
" norecurse:\n"
11713
"   the value is only used for the exact location specified by the\n"
11714
"   section name.\n"
11715
" appendpath:\n"
11716
"   for contained locations, any additional path components are\n"
11717
"   appended to the value."
11718
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11728
11729
#: en/help_topics/configuration.txt:287
11730
msgid ""
11731
"Policies are specified by keys with names of the form "
11732
"\"<option_name>:policy\".\n"
11733
"For example, to define the push location for a tree of branches, the\n"
11734
"following could be used::"
11735
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11740
11741
#: en/help_topics/configuration.txt:291
11742
msgid ""
11743
"  [/top/location]\n"
11744
"  push_location = sftp://example.com/location\n"
11745
"  push_location:policy = appendpath"
11746
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11747
"  [/top/location]\n"
11748
"  push_location = sftp://example.com/location\n"
11749
"  push_location:policy = appendpath"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11750
11751
#: en/help_topics/configuration.txt:295
11752
msgid ""
11753
"With this configuration, the push location for ``/top/location/branch1``\n"
11754
"would be ``sftp://example.com/location/branch1``."
11755
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11756
"With this configuration, the push location for ``/top/location/branch1``\n"
11757
"would be ``sftp://example.com/location/branch1``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11758
11759
#: en/help_topics/configuration.txt:298
11760
msgid ""
11761
"Section local options\n"
11762
"^^^^^^^^^^^^^^^^^^^^^"
11763
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11764
"Section local options\n"
11765
"^^^^^^^^^^^^^^^^^^^^^"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11766
11767
#: en/help_topics/configuration.txt:301
11768
msgid ""
11769
"Some options are defined automatically inside a given section and can be\n"
11770
"refered to in this section only. "
11771
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11772
"Some options are defined automatically inside a given section and can be\n"
11773
"referred to in this section only. "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11774
11775
#: en/help_topics/configuration.txt:304
11776
msgid "For example, the ``appendpath`` policy can be used like this::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11777
msgstr "For example, the ``appendpath`` policy can be used like this::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11778
11779
#: en/help_topics/configuration.txt:306
11780
msgid ""
11781
"  [/home/vila/src/bzr/bugs]\n"
11782
"  mypush = lp:~vila/bzr\n"
11783
"  mypush:policy=appendpath"
11784
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11785
"  [/home/vila/src/bzr/bugs]\n"
11786
"  mypush = lp:~vila/bzr\n"
11787
"  mypush:policy=appendpath"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11788
11789
#: en/help_topics/configuration.txt:310
11790
msgid "Using ``relpath`` to achieve the same result is done like this::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11791
msgstr "Using ``relpath`` to achieve the same result is done like this::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11792
11793
#: en/help_topics/configuration.txt:312
11794
msgid ""
11795
"  [/home/vila/src/bzr/bugs]\n"
11796
"  mypush = lp:~vila/bzr/{relpath}"
11797
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11798
"  [/home/vila/src/bzr/bugs]\n"
11799
"  mypush = lp:~vila/bzr/{relpath}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11800
11801
#: en/help_topics/configuration.txt:315
11802
msgid ""
11803
"In both cases, when used in a directory like\n"
11804
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
11805
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11806
"In both cases, when used in a directory like\n"
11807
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11808
11809
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
11810
msgid ""
11811
"   $ bzr config mypush\n"
11812
"   lp:~vila/bzr/832013-expand-in-stack"
11813
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11814
"   $ bzr config mypush\n"
11815
"   lp:~vila/bzr/832013-expand-in-stack"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11816
11817
#: en/help_topics/configuration.txt:321
11818
msgid "Another such option is ``basename`` which can be used like this::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11819
msgstr "Another such option is ``basename`` which can be used like this::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11820
11821
#: en/help_topics/configuration.txt:323
11822
msgid ""
11823
"  [/home/vila/src/bzr]\n"
11824
"  mypush = lp:~vila/bzr/{basename}"
11825
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11826
"  [/home/vila/src/bzr]\n"
11827
"  mypush = lp:~vila/bzr/{basename}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11828
11829
#: en/help_topics/configuration.txt:326
11830
msgid ""
11831
"When used in a directory like\n"
11832
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
11833
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11834
"When used in a directory like\n"
11835
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11836
11837
#: en/help_topics/configuration.txt:332
11838
msgid ""
11839
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
11840
"itself is defined as the relative path between the section name and the\n"
11841
"location it matches."
11842
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11846
11847
#: en/help_topics/configuration.txt:336
11848
msgid ""
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
11854
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11860
11861
#: en/help_topics/configuration.txt:340
11862
msgid ""
11863
"  [/home/vila/src/bzr/bugs]\n"
11864
"  mypush = lp:~vila/bzr/{branchname}"
11865
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11866
"  [/home/vila/src/bzr/bugs]\n"
11867
"  mypush = lp:~vila/bzr/{branchname}"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11874
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
11875
"get::"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11882
"  bzr config mypush\n"
11883
"  lp:~vila/bzr/832013-expand-in-stack"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11884
11885
#: en/help_topics/configuration.txt:348
11886
msgid ""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11894
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11895
#: en/help_topics/configuration.txt:352
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11896
msgid ""
11897
"\n"
11898
"The main configuration file, bazaar.conf\n"
11899
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11900
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11901
"\n"
11902
"The main configuration file, bazaar.conf\n"
11903
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11904
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11905
#: en/help_topics/configuration.txt:356
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11906
msgid ""
11907
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
11908
"The default section contains the default\n"
11909
"configuration options for all branches. The default section can be\n"
11910
"overriden by providing a branch-specific section in ``locations.conf``."
11911
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11916
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11917
#: en/help_topics/configuration.txt:361
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11918
msgid "A typical ``bazaar.conf`` section often looks like the following::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11919
msgstr "A typical ``bazaar.conf`` section often looks like the following::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11920
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11921
#: en/help_topics/configuration.txt:363
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11928
"    [DEFAULT]\n"
11929
"    email             = John Doe <jdoe@isp.com>\n"
11930
"    editor            = /usr/bin/vim\n"
11931
"    create_signatures = when-required"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11932
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11933
#: en/help_topics/configuration.txt:368
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11934
msgid ""
11935
"\n"
11936
"The branch location configuration file, locations.conf\n"
11937
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11938
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11939
"\n"
11940
"The branch location configuration file, locations.conf\n"
11941
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11942
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11943
#: en/help_topics/configuration.txt:372
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11944
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11958
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11959
#: en/help_topics/configuration.txt:378
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11960
msgid ""
11961
"    [/home/jdoe/branches/nethack]\n"
11962
"    email = Nethack Admin <nethack@nethack.com>"
11963
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11964
"    [/home/jdoe/branches/nethack]\n"
11965
"    email = Nethack Admin <nethack@nethack.com>"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11966
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11967
#: en/help_topics/configuration.txt:381
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11968
msgid ""
11969
"    [http://hypothetical.site.com/branches/devel-branch]\n"
11970
"    create_signatures = always"
11971
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11972
"    [http://hypothetical.site.com/branches/devel-branch]\n"
11973
"    create_signatures = always"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11974
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11975
#: en/help_topics/configuration.txt:384
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11976
msgid ""
11977
"The authentication configuration file, authentication.conf\n"
11978
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11979
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11980
"The authentication configuration file, authentication.conf\n"
11981
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11982
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11983
#: en/help_topics/configuration.txt:387
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11994
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
11995
#: en/help_topics/configuration.txt:391
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12000
"The syntax of the file obeys the same rules as the others except for the\n"
12001
"option policies which don't apply."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12002
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12003
#: en/help_topics/configuration.txt:394
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12004
msgid ""
12005
"For more information on the possible uses of the authentication "
12006
"configuration\n"
12007
"file see :doc:`authentication-help`."
12008
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12009
"For more information on the possible uses of the authentication "
12010
"configuration\n"
12011
"file see :doc:`authentication-help`."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12012
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12013
#: en/help_topics/configuration.txt:397
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12014
msgid ""
12015
"\n"
12016
"Common options\n"
12017
"--------------"
12018
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12019
"\n"
12020
"Common options\n"
12021
"--------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12022
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12023
#: en/help_topics/configuration.txt:401
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12024
msgid ""
12025
"debug_flags\n"
12026
"~~~~~~~~~~~"
12027
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12028
"debug_flags\n"
12029
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12030
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12031
#: en/help_topics/configuration.txt:404
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12040
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12041
#: en/help_topics/configuration.txt:408
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12042
msgid "    debug_flags = hpss"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12043
msgstr "    debug_flags = hpss"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12044
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12045
#: en/help_topics/configuration.txt:412
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12046
msgid "    debug_flags = hpss,evil"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12047
msgstr "    debug_flags = hpss,evil"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12048
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12049
#: en/help_topics/configuration.txt:414
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12050
msgid ""
12051
"email\n"
12052
"~~~~~"
12053
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12054
"email\n"
12055
"~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12056
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12057
#: en/help_topics/configuration.txt:417
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12058
msgid ""
12059
"The email address to use when committing a branch. Typically takes the form\n"
12060
"of::"
12061
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12062
"The email address to use when committing a branch. Typically takes the form\n"
12063
"of::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12064
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12065
#: en/help_topics/configuration.txt:420
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12066
msgid "    email = Full Name <account@hostname.tld>"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12067
msgstr "    email = Full Name <account@hostname.tld>"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12068
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12069
#: en/help_topics/configuration.txt:422
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12070
msgid ""
12071
"editor\n"
12072
"~~~~~~"
12073
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12074
"editor\n"
12075
"~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12076
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12077
#: en/help_topics/configuration.txt:425
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12078
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12088
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12089
#: en/help_topics/configuration.txt:430
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12090
msgid ""
12091
"log_format\n"
12092
"~~~~~~~~~~"
12093
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12094
"log_format\n"
12095
"~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12096
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12097
#: en/help_topics/configuration.txt:433
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12106
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12107
#: en/help_topics/configuration.txt:437
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12108
msgid ""
12109
"check_signatures\n"
12110
"~~~~~~~~~~~~~~~~"
12111
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12112
"check_signatures\n"
12113
"~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12114
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12115
#: en/help_topics/configuration.txt:440
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12116
msgid ""
12117
"Reserved for future use.  These options will allow a policy for branches to\n"
12118
"require signatures."
12119
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12120
"Reserved for future use.  These options will allow a policy for branches to\n"
12121
"require signatures."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12122
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12123
#: en/help_topics/configuration.txt:443
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12124
msgid ""
12125
"require\n"
12126
"    The gnupg signature for revisions must be present and must be valid."
12127
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12128
"require\n"
12129
"    The gnupg signature for revisions must be present and must be valid."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12130
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12131
#: en/help_topics/configuration.txt:446
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12132
msgid ""
12133
"ignore\n"
12134
"    Do not check gnupg signatures of revisions."
12135
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12136
"ignore\n"
12137
"    Do not check gnupg signatures of revisions."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12138
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12139
#: en/help_topics/configuration.txt:449
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12150
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12151
#: en/help_topics/configuration.txt:454
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12152
msgid ""
12153
"create_signatures\n"
12154
"~~~~~~~~~~~~~~~~~"
12155
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12156
"create_signatures\n"
12157
"~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12158
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12159
#: en/help_topics/configuration.txt:457
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12160
msgid ""
12161
"Defines the behaviour of signing revisions on commits.  By default bzr will "
12162
"not\n"
12163
"sign new commits."
12164
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12165
"Defines the behaviour of signing revisions on commits.  By default bzr will "
12166
"not\n"
12167
"sign new commits."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12168
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12169
#: en/help_topics/configuration.txt:460
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12180
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12181
#: en/help_topics/configuration.txt:464
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12182
msgid ""
12183
"when-required\n"
12184
"    Reserved for future use."
12185
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12186
"when-required\n"
12187
"    Reserved for future use."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12188
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12189
#: en/help_topics/configuration.txt:467
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12190
msgid ""
12191
"never\n"
12192
"    Reserved for future use."
12193
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12194
"never\n"
12195
"    Reserved for future use."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12196
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12197
#: en/help_topics/configuration.txt:470
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12208
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12209
#: en/help_topics/configuration.txt:474
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12210
msgid ""
12211
"dirstate.fdatasync\n"
12212
"~~~~~~~~~~~~~~~~~~"
12213
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12214
"dirstate.fdatasync\n"
12215
"~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12216
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12217
#: en/help_topics/configuration.txt:477
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12226
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12227
#: en/help_topics/configuration.txt:481
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12228
msgid ""
12229
"gpg_signing_key\n"
12230
"~~~~~~~~~~~~~~~"
12231
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12232
"gpg_signing_key\n"
12233
"~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12234
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12235
#: en/help_topics/configuration.txt:484
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12244
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12245
#: en/help_topics/configuration.txt:488
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12246
msgid ""
12247
"recurse\n"
12248
"~~~~~~~"
12249
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12250
"recurse\n"
12251
"~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12252
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12253
#: en/help_topics/configuration.txt:491
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12254
msgid ""
12255
"Only useful in ``locations.conf``. Defines whether or not the\n"
12256
"configuration for this section applies to subdirectories:"
12257
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12258
"Only useful in ``locations.conf``. Defines whether or not the\n"
12259
"configuration for this section applies to subdirectories:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12260
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12261
#: en/help_topics/configuration.txt:494
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12262
msgid ""
12263
"true\n"
12264
"    (default) This section applies to subdirectories as well."
12265
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12266
"true\n"
12267
"    (default) This section applies to subdirectories as well."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12268
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12269
#: en/help_topics/configuration.txt:497
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12275
"false\n"
12276
"    This section only applies to the branch at this directory and not\n"
12277
"    branches below it."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12278
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12279
#: en/help_topics/configuration.txt:501
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12280
msgid ""
12281
"gpg_signing_command\n"
12282
"~~~~~~~~~~~~~~~~~~~"
12283
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12284
"gpg_signing_command\n"
12285
"~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12286
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12287
#: en/help_topics/configuration.txt:504
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12288
msgid ""
12289
"(Default: \"gpg\"). Which program should be used to sign and check "
12290
"revisions.\n"
12291
"For example::"
12292
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12293
"(Default: \"gpg\"). Which program should be used to sign and check "
12294
"revisions.\n"
12295
"For example::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12296
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12297
#: en/help_topics/configuration.txt:507
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12298
msgid "    gpg_signing_command = /usr/bin/gnpg"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12299
msgstr "    gpg_signing_command = /usr/bin/gnpg"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12300
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12301
#: en/help_topics/configuration.txt:509
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12302
msgid ""
12303
"The specified command must accept the options \"--clearsign\" and \"-u "
12304
"<email>\"."
12305
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12306
"The specified command must accept the options \"--clearsign\" and \"-u "
12307
"<email>\"."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12308
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12309
#: en/help_topics/configuration.txt:511
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12310
msgid ""
12311
"bzr_remote_path\n"
12312
"~~~~~~~~~~~~~~~"
12313
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12314
"bzr_remote_path\n"
12315
"~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12316
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12317
#: en/help_topics/configuration.txt:514
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12318
msgid ""
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:"
12322
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12326
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12327
#: en/help_topics/configuration.txt:517
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12328
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12336
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12337
#: en/help_topics/configuration.txt:521
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12338
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12339
msgstr "It is overridden by the BZR_REMOTE_PATH environment variable."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12340
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12341
#: en/help_topics/configuration.txt:523
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12342
msgid ""
12343
"smtp_server\n"
12344
"~~~~~~~~~~~"
12345
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12346
"smtp_server\n"
12347
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12348
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12349
#: en/help_topics/configuration.txt:526
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12356
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12357
#: en/help_topics/configuration.txt:529
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12358
msgid ""
12359
"smtp_username, smtp_password\n"
12360
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12361
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12362
"smtp_username, smtp_password\n"
12363
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12364
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12365
#: en/help_topics/configuration.txt:532
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12376
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12377
#: en/help_topics/configuration.txt:537
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12378
msgid ""
12379
"locks.steal_dead\n"
12380
"~~~~~~~~~~~~~~~~"
12381
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12382
"locks.steal_dead\n"
12383
"~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12384
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12385
#: en/help_topics/configuration.txt:540
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12396
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12397
#: en/help_topics/configuration.txt:545
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12398
msgid ""
12399
"mail_client\n"
12400
"~~~~~~~~~~~"
12401
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12402
"mail_client\n"
12403
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12404
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12405
#: en/help_topics/configuration.txt:548
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12418
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12419
#: en/help_topics/configuration.txt:553
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12420
msgid "Supported values for specific clients:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12421
msgstr "Supported values for specific clients:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12422
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12423
#: en/help_topics/configuration.txt:555
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12424
msgid ""
12425
":claws: Use Claws.  This skips a dialog for attaching files.\n"
12426
":evolution: Use Evolution.\n"
12427
":kmail: Use KMail.\n"
12428
":mutt: Use Mutt.\n"
12429
":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
12430
"1.5,\n"
12431
"    this works around some bugs that xdg-email doesn't handle."
12432
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12440
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12441
#: en/help_topics/configuration.txt:562
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12442
msgid "Supported generic values are:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12443
msgstr "Supported generic values are:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12444
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12445
#: en/help_topics/configuration.txt:564
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12460
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12461
#: en/help_topics/configuration.txt:571
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12462
msgid ""
12463
"repository.fdatasync\n"
12464
"~~~~~~~~~~~~~~~~~~~~"
12465
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12466
"repository.fdatasync\n"
12467
"~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12468
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12469
#: en/help_topics/configuration.txt:574
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12478
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12479
#: en/help_topics/configuration.txt:578
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12480
msgid ""
12481
"submit_branch\n"
12482
"~~~~~~~~~~~~~"
12483
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12484
"submit_branch\n"
12485
"~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12486
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12487
#: en/help_topics/configuration.txt:581
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12500
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12501
#: en/help_topics/configuration.txt:585
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12502
msgid ""
12503
"public_branch\n"
12504
"~~~~~~~~~~~~~"
12505
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12506
"public_branch\n"
12507
"~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12508
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12509
#: en/help_topics/configuration.txt:588
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12510
msgid ""
12511
"A publically-accessible version of this branch (implying that this version "
12512
"is\n"
12513
"not publically-accessible).  Used (and set) by ``bzr send``."
12514
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12515
"A publicly-accessible version of this branch (implying that this version is\n"
12516
"not publicly-accessible).  Used (and set) by ``bzr send``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12517
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12518
#: en/help_topics/configuration.txt:591
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12519
msgid ""
12520
"suppress_warnings\n"
12521
"~~~~~~~~~~~~~~~~~"
12522
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12523
"suppress_warnings\n"
12524
"~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12525
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12526
#: en/help_topics/configuration.txt:594
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12527
msgid ""
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."
12530
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12533
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12534
#: en/help_topics/configuration.txt:597
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12535
msgid "Valid values:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12536
msgstr "Valid values:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12537
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12538
#: en/help_topics/configuration.txt:599
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12545
"* ``format_deprecation``:\n"
12546
"    whether the format deprecation warning is shown on repositories that "
12547
"are\n"
12548
"    using deprecated formats."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12549
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12550
#: en/help_topics/configuration.txt:603
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12551
msgid ""
12552
"default_format\n"
12553
"~~~~~~~~~~~~~~"
12554
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12555
"default_format\n"
12556
"~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12557
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12558
#: en/help_topics/configuration.txt:606
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12564
"A format name for the default format used when creating branches.  See "
12565
"``bzr\n"
12566
"help formats`` for possible values."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12567
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12568
#: en/help_topics/configuration.txt:609
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12569
msgid ""
12570
"\n"
12571
"Unicode options\n"
12572
"---------------"
12573
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12574
"\n"
12575
"Unicode options\n"
12576
"---------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12577
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12578
#: en/help_topics/configuration.txt:613
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12579
msgid ""
12580
"output_encoding\n"
12581
"~~~~~~~~~~~~~~~"
12582
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12583
"output_encoding\n"
12584
"~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12585
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12586
#: en/help_topics/configuration.txt:616
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12587
msgid ""
12588
"A Python unicode encoding name for text output from bzr, such as log\n"
12589
"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
12590
"is the terminal encoding prefered by the operating system."
12591
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12595
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12596
#: en/help_topics/configuration.txt:620
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12597
msgid ""
12598
"\n"
12599
"Branch type specific options\n"
12600
"----------------------------"
12601
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12602
"\n"
12603
"Branch type specific options\n"
12604
"----------------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12605
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12606
#: en/help_topics/configuration.txt:624
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12617
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12618
#: en/help_topics/configuration.txt:629
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12619
msgid ""
12620
"append_revisions_only\n"
12621
"~~~~~~~~~~~~~~~~~~~~~"
12622
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12623
"append_revisions_only\n"
12624
"~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12625
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12626
#: en/help_topics/configuration.txt:632
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12641
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12642
#: en/help_topics/configuration.txt:639
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12643
msgid ""
12644
"parent_location\n"
12645
"~~~~~~~~~~~~~~~"
12646
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12647
"parent_location\n"
12648
"~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12649
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12650
#: en/help_topics/configuration.txt:642
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12661
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12662
#: en/help_topics/configuration.txt:646
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12663
msgid ""
12664
"push_location\n"
12665
"~~~~~~~~~~~~~"
12666
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12667
"push_location\n"
12668
"~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12669
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12670
#: en/help_topics/configuration.txt:649
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12671
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12677
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12678
#: en/help_topics/configuration.txt:652
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12679
msgid ""
12680
"push_strict\n"
12681
"~~~~~~~~~~~"
12682
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12683
"push_strict\n"
12684
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12685
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12686
#: en/help_topics/configuration.txt:655
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12687
msgid ""
12688
"If present, defines the ``--strict`` option default value for checking\n"
12689
"uncommitted changes before pushing."
12690
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12691
"If present, defines the ``--strict`` option default value for checking\n"
12692
"uncommitted changes before pushing."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12693
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12694
#: en/help_topics/configuration.txt:658
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12695
msgid ""
12696
"dpush_strict\n"
12697
"~~~~~~~~~~~~"
12698
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12699
"dpush_strict\n"
12700
"~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12701
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12702
#: en/help_topics/configuration.txt:661
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12711
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12712
#: en/help_topics/configuration.txt:665
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12713
msgid ""
12714
"bound_location\n"
12715
"~~~~~~~~~~~~~~"
12716
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12717
"bound_location\n"
12718
"~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12719
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12720
#: en/help_topics/configuration.txt:668
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12721
msgid ""
12722
"The location that commits should go to when acting as a checkout.\n"
12723
"This option is normally set by ``bind``."
12724
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12725
"The location that commits should go to when acting as a checkout.\n"
12726
"This option is normally set by ``bind``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12727
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12728
#: en/help_topics/configuration.txt:671
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12729
msgid ""
12730
"bound\n"
12731
"~~~~~"
12732
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12733
"bound\n"
12734
"~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12735
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12736
#: en/help_topics/configuration.txt:674
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12737
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12745
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12746
#: en/help_topics/configuration.txt:677
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12747
msgid ""
12748
"send_strict\n"
12749
"~~~~~~~~~~~"
12750
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12751
"send_strict\n"
12752
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12753
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12754
#: en/help_topics/configuration.txt:680
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12755
msgid ""
12756
"If present, defines the ``--strict`` option default value for checking\n"
12757
"uncommitted changes before sending a merge directive."
12758
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12759
"If present, defines the ``--strict`` option default value for checking\n"
12760
"uncommitted changes before sending a merge directive."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12761
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12762
#: en/help_topics/configuration.txt:683
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12763
msgid ""
12764
"add.maximum_file_size\n"
12765
"~~~~~~~~~~~~~~~~~~~~~"
12766
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12767
"add.maximum_file_size\n"
12768
"~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12769
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12770
#: en/help_topics/configuration.txt:686
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12771
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12789
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12790
#: en/help_topics/configuration.txt:692
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12791
msgid ""
12792
"External Merge Tools\n"
12793
"--------------------"
12794
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12795
"External Merge Tools\n"
12796
"--------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12797
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12798
#: en/help_topics/configuration.txt:695
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12799
msgid ""
12800
"bzr.mergetool.<name>\n"
12801
"~~~~~~~~~~~~~~~~~~~~"
12802
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12803
"bzr.mergetool.<name>\n"
12804
"~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12805
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12806
#: en/help_topics/configuration.txt:698
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12817
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12818
#: en/help_topics/configuration.txt:702
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12824
"The following markers can be used in the command-line to substitute "
12825
"filenames\n"
12826
"involved in the merge conflict::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12827
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12828
#: en/help_topics/configuration.txt:705
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12845
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12846
#: en/help_topics/configuration.txt:714
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12847
msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12848
msgstr "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12849
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12850
#: en/help_topics/configuration.txt:716
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12851
msgid ""
12852
"bzr.default_mergetool\n"
12853
"~~~~~~~~~~~~~~~~~~~~~"
12854
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12855
"bzr.default_mergetool\n"
12856
"~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12857
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12858
#: en/help_topics/configuration.txt:719
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12864
"Specifies which external merge tool (as defined above) should be selected "
12865
"by\n"
12866
"default in tools such as ``bzr qconflicts``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12867
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12868
#: en/help_topics/configuration.txt:724
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12869
msgid "  bzr.default_mergetool = kdiff3\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12870
msgstr "  bzr.default_mergetool = kdiff3\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12871
12872
#: en/help_topics/conflict-types.txt:1
12873
msgid ""
12874
"Conflict Types\n"
12875
"=============="
12876
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12877
"Conflict Types\n"
12878
"=============="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12879
12880
#: en/help_topics/conflict-types.txt:4
12881
msgid ""
12882
"Some operations, like merge, revert and pull, modify the contents of your\n"
12883
"working tree.  These modifications are programmatically generated, and so "
12884
"they\n"
12885
"may conflict with the current state of your working tree. "
12886
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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. "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12891
12892
#: en/help_topics/conflict-types.txt:8
12893
msgid ""
12894
"When conflicts are present in your working tree (as shown by ``bzr\n"
12895
"conflicts``), you should resolve them and then inform bzr that the "
12896
"conflicts\n"
12897
"have been resolved."
12898
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12903
12904
#: en/help_topics/conflict-types.txt:12
12905
msgid ""
12906
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
12907
"should resolve them is not the one responsible for their occurrence, as is "
12908
"the\n"
12909
"case when merging other people's work or because some conflicts are "
12910
"presented\n"
12911
"in a way that is not easy to understand."
12912
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12919
12920
#: en/help_topics/conflict-types.txt:17
12921
msgid ""
12922
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
12923
"conflict if and only if there's an actual conceptual conflict in the source\n"
12924
"tree.  Because Bazaar doesn't understand the real meaning of the files "
12925
"being\n"
12926
"versioned, it can, when faced with ambiguities, fall short in either "
12927
"direction\n"
12928
"trying to resolve the conflict itself. Many kinds of changes can be "
12929
"combined\n"
12930
"programmatically, but sometimes only a human can determine the right thing "
12931
"to\n"
12932
"do."
12933
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12945
12946
#: en/help_topics/conflict-types.txt:25
12947
msgid ""
12948
"When Bazaar generates a conflict, it adds information into the working tree "
12949
"to\n"
12950
"present the conflicting versions, and it's up to you to find the correct\n"
12951
"resolution."
12952
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12957
12958
#: en/help_topics/conflict-types.txt:29
12959
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12960
msgstr "Whatever the conflict is, resolving it is roughly done in two steps:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12961
12962
#: en/help_topics/conflict-types.txt:31
12963
msgid ""
12964
"1. Modify the working tree content so that the conflicted item is now in "
12965
"the\n"
12966
"   state you want to keep, then"
12967
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12971
12972
#: en/help_topics/conflict-types.txt:34
12973
msgid ""
12974
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
12975
"   remaining generated information (``bzr resolve <item>``)."
12976
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12977
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
12978
"   remaining generated information (``bzr resolve <item>``)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12979
12980
#: en/help_topics/conflict-types.txt:37
12981
msgid ""
12982
"For most conflict types, there are some obvious ways to modify the working\n"
12983
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
12984
"itself already made a choice, when possible."
12985
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12989
12990
#: en/help_topics/conflict-types.txt:41
12991
msgid ""
12992
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
12993
"different ways to resolve the conflict."
12994
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12995
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
12996
"different ways to resolve the conflict."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
12997
12998
#: en/help_topics/conflict-types.txt:44
12999
msgid ""
13000
"Each type of conflict is explained below, and the action which must be done "
13001
"to\n"
13002
"resolve the conflict is outlined."
13003
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13004
"Each type of conflict is explained below, and the action which must be done "
13005
"to\n"
13006
"resolve the conflict is outlined."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13007
13008
#: en/help_topics/conflict-types.txt:47
13009
msgid ""
13010
"Various actions are available depending on the kind of conflict, for some "
13011
"of\n"
13012
"these actions, Bazaar can provide some help. In the end you should at least\n"
13013
"inform Bazaar that you're done with the conflict with::"
13014
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13019
13020
#: en/help_topics/conflict-types.txt:51
13021
msgid "  ``bzr resolve FILE --action=done'"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13022
msgstr "  ``bzr resolve FILE --action=done'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13023
13024
#: en/help_topics/conflict-types.txt:53
13025
msgid ""
13026
"Note that this is the default action when a single file is involved so you "
13027
"can\n"
13028
"simply use::"
13029
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13030
"Note that this is the default action when a single file is involved so you "
13031
"can\n"
13032
"simply use::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13033
13034
#: en/help_topics/conflict-types.txt:56
13035
msgid "   ``bzr resolve FILE``"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13036
msgstr "   ``bzr resolve FILE``"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13037
13038
#: en/help_topics/conflict-types.txt:58
13039
msgid "See ``bzr help resolve`` for more details."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13040
msgstr "See ``bzr help resolve`` for more details."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13041
13042
#: en/help_topics/conflict-types.txt:60
13043
msgid ""
13044
"Text conflicts\n"
13045
"--------------"
13046
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13047
"Text conflicts\n"
13048
"--------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13049
13050
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
13051
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
13052
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
13053
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
13054
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
13055
msgid "Typical message::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13056
msgstr "Typical message::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13057
13058
#: en/help_topics/conflict-types.txt:65
13059
msgid "  Text conflict in FILE"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13060
msgstr "  Text conflict in FILE"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13061
13062
#: en/help_topics/conflict-types.txt:67
13063
msgid ""
13064
"These are produced when a text merge cannot completely reconcile two sets "
13065
"of\n"
13066
"text changes.  Bazaar will emit files for each version with the extensions\n"
13067
"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
13068
"tree,\n"
13069
"i.e. the tree that you are merging changes into.  OTHER is the version that "
13070
"you\n"
13071
"are merging into the target.  BASE is an older version that is used as a "
13072
"basis\n"
13073
"for comparison."
13074
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13085
13086
#: en/help_topics/conflict-types.txt:74
13087
msgid ""
13088
"In the main copy of the file, Bazaar will include all the changes that it\n"
13089
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
13090
"\"herringbone\" markers like ``<<<<<<<``."
13091
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ``<<<<<<<``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13095
13096
#: en/help_topics/conflict-types.txt:78
13097
msgid ""
13098
"Say the initial text is \"The project leader released it.\", and THIS "
13099
"modifies it\n"
13100
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
13101
"leader\n"
13102
"released Bazaar.\"  A conflict would look like this::"
13103
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13109
13110
#: en/help_topics/conflict-types.txt:82
13111
msgid ""
13112
"  <<<<<<< TREE\n"
13113
"  Martin Pool released it.\n"
13114
"  =======\n"
13115
"  The project leader released Bazaar.\n"
13116
"  >>>>>>> MERGE-SOURCE"
13117
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13118
"  <<<<<<< TREE\n"
13119
"  Martin Pool released it.\n"
13120
"  =======\n"
13121
"  The project leader released Bazaar.\n"
13122
"  >>>>>>> MERGE-SOURCE"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13123
13124
#: en/help_topics/conflict-types.txt:88
13125
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13126
msgstr "The correct resolution would be \"Martin Pool released Bazaar.\""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13127
13128
#: en/help_topics/conflict-types.txt:90
13129
msgid ""
13130
"You can handle text conflicts either by editing the main copy of the file,\n"
13131
"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
13132
"worth mentioning that resolving text conflicts rarely involves picking one\n"
13133
"set of changes over the other (but see below when you encounter these\n"
13134
"cases).  More often, the two sets of changes must be intelligently combined."
13135
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13141
13142
#: en/help_topics/conflict-types.txt:96
13143
msgid ""
13144
"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
13145
"you are done editing, the file should look like it never had a conflict, and "
13146
"be\n"
13147
"ready to commit."
13148
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13153
13154
#: en/help_topics/conflict-types.txt:100
13155
msgid ""
13156
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
13157
"Bazaar will auto-detect which conflicts you have resolved."
13158
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13159
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
13160
"Bazaar will auto-detect which conflicts you have resolved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13161
13162
#: en/help_topics/conflict-types.txt:103
13163
msgid ""
13164
"When the conflict is resolved, Bazaar deletes the previously generated\n"
13165
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
13166
"working tree."
13167
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13171
13172
#: en/help_topics/conflict-types.txt:107
13173
msgid ""
13174
"\n"
13175
"When you want to pick one set of changes over the other, you can use ``bzr\n"
13176
"resolve`` with one of the following actions:"
13177
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13181
13182
#: en/help_topics/conflict-types.txt:111
13183
msgid ""
13184
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
13185
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
13186
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13187
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
13188
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13189
13190
#: en/help_topics/conflict-types.txt:114
13191
msgid ""
13192
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
13193
"modifications will be taken into account."
13194
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13195
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
13196
"modifications will be taken into account."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13197
13198
#: en/help_topics/conflict-types.txt:117
13199
msgid ""
13200
"Content conflicts\n"
13201
"-----------------"
13202
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13203
"Content conflicts\n"
13204
"-----------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13205
13206
#: en/help_topics/conflict-types.txt:122
13207
msgid "  Contents conflict in FILE"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13208
msgstr "  Contents conflict in FILE"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13209
13210
#: en/help_topics/conflict-types.txt:124
13211
msgid ""
13212
"This conflict happens when there are conflicting changes in the working "
13213
"tree\n"
13214
"and the merge source, but the conflicted items are not text files.  They "
13215
"may\n"
13216
"be binary files, or symlinks, or directories.  It can even happen with "
13217
"files\n"
13218
"that are deleted on one side, and modified on the other."
13219
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13227
13228
#: en/help_topics/conflict-types.txt:129
13229
msgid ""
13230
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
13231
"be\n"
13232
"regular files, symlinks or directories).  But it will not include a \"main "
13233
"copy\"\n"
13234
"of the file with herringbone conflict markers.  It will appear that the "
13235
"\"main\n"
13236
"copy\" has been renamed to THIS or OTHER."
13237
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13245
13246
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
13247
msgid ""
13248
"To resolve that kind of conflict, you should rebuild FILE from either "
13249
"version\n"
13250
"or a combination of both."
13251
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13252
"To resolve that kind of conflict, you should rebuild FILE from either "
13253
"version\n"
13254
"or a combination of both."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13255
13256
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
13257
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
13258
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
13259
#: en/help_topics/conflict-types.txt:361
13260
msgid "``bzr resolve`` recognizes the following actions:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13261
msgstr "``bzr resolve`` recognises the following actions:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13262
13263
#: en/help_topics/conflict-types.txt:139
13264
msgid ""
13265
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
13266
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
13267
"* ``--action=done`` will just mark the conflict as resolved."
13268
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13272
13273
#: en/help_topics/conflict-types.txt:143
13274
msgid ""
13275
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
13276
"and\n"
13277
"``.OTHER`` files if they are still present in the working tree."
13278
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13282
13283
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
13284
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
13285
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
13286
#: en/help_topics/conflict-types.txt:369
13287
msgid ""
13288
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
13289
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13290
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13291
13292
#: en/help_topics/conflict-types.txt:148
13293
msgid ""
13294
"Tag conflicts\n"
13295
"-------------"
13296
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13297
"Tag conflicts\n"
13298
"-------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13299
13300
#: en/help_topics/conflict-types.txt:153
13301
msgid ""
13302
"  Conflicting tags:\n"
13303
"      version-0.1"
13304
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13305
"  Conflicting tags:\n"
13306
"      version-0.1"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13307
13308
#: en/help_topics/conflict-types.txt:156
13309
msgid ""
13310
"When pulling from or pushing to another branch, Bazaar informs you about "
13311
"tags\n"
13312
"that conflict between the two branches; that is the same tag points to two\n"
13313
"different revisions.  You need not resolve these conflicts, but subsequent\n"
13314
"uses of pull or push will result in the same message."
13315
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13321
13322
#: en/help_topics/conflict-types.txt:161
13323
msgid ""
13324
"To resolve the conflict, you must apply the correct tags to either the "
13325
"target\n"
13326
"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
13327
"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
13328
"target branch's tags match the source branch, then in the target branch do\n"
13329
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
13330
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
13331
"source\n"
13332
"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
13333
"favor of the target branch, you need to similarly use ``tag --force`` in "
13334
"the\n"
13335
"source branch.  (Note that pulling or pushing using --overwrite will "
13336
"overwrite\n"
13337
"all tags as well.)"
13338
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13353
13354
#: en/help_topics/conflict-types.txt:172
13355
msgid ""
13356
"Duplicate paths\n"
13357
"---------------"
13358
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13359
"Duplicate paths\n"
13360
"---------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13361
13362
#: en/help_topics/conflict-types.txt:177
13363
msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13364
msgstr "  Conflict adding file FILE.  Moved existing file to FILE.moved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13365
13366
#: en/help_topics/conflict-types.txt:179
13367
msgid ""
13368
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
13369
"already been used.  The existing file will be renamed to \"FILE.moved\".  "
13370
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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\".  "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13373
13374
#: en/help_topics/conflict-types.txt:187
13375
msgid ""
13376
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
13377
"FILE``,\n"
13378
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
13379
"* ``--action=done`` will just mark the conflict as resolved."
13380
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13385
13386
#: en/help_topics/conflict-types.txt:191
13387
msgid ""
13388
"Note that you must get rid of FILE.moved before using ``--action=done``."
13389
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13390
"Note that you must get rid of FILE.moved before using ``--action=done``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13391
13392
#: en/help_topics/conflict-types.txt:195
13393
msgid ""
13394
"Unversioned parent\n"
13395
"------------------"
13396
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13397
"Unversioned parent\n"
13398
"------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13399
13400
#: en/help_topics/conflict-types.txt:200
13401
msgid ""
13402
"    Conflict because FILE is not versioned, but has versioned children."
13403
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13404
"    Conflict because FILE is not versioned, but has versioned children."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13405
13406
#: en/help_topics/conflict-types.txt:202
13407
msgid ""
13408
"Sometimes Bazaar will attempt to create a file whose parent directory is "
13409
"not\n"
13410
"versioned.  This happens when the directory has been deleted in the target,\n"
13411
"but has a new child in the source, or vice versa.  In this situation, "
13412
"Bazaar\n"
13413
"will version the parent directory as well.  Resolving this issue depends\n"
13414
"very much on the particular scenario.  You may wish to rename or delete "
13415
"either\n"
13416
"the file or the directory.  When you are satisfied, you can run \"bzr "
13417
"resolve\n"
13418
"FILE\" to mark the conflict as resolved."
13419
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13431
13432
#: en/help_topics/conflict-types.txt:210
13433
msgid ""
13434
"Missing parent\n"
13435
"--------------"
13436
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13437
"Missing parent\n"
13438
"--------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13439
13440
#: en/help_topics/conflict-types.txt:215
13441
msgid "  Conflict adding files to FILE.  Created directory."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13442
msgstr "  Conflict adding files to FILE.  Created directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13443
13444
#: en/help_topics/conflict-types.txt:217
13445
msgid ""
13446
"This happens when a directory has been deleted in the target, but has new\n"
13447
"children in the source.  This is similar to the \"unversioned parent\" "
13448
"conflict,\n"
13449
"except that the parent directory does not *exist*, instead of just being\n"
13450
"unversioned.  In this situation, Bazaar will create the missing parent.\n"
13451
"Resolving this issue depends very much on the particular scenario."
13452
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13459
13460
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
13461
msgid ""
13462
"To resolve that kind of conflict, you should either remove or rename the\n"
13463
"children or the directory or a combination of both."
13464
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13467
13468
#: en/help_topics/conflict-types.txt:228
13469
msgid ""
13470
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
13471
"  children,\n"
13472
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
13473
"children\n"
13474
"  and restoring the directory,\n"
13475
"* ``--action=done`` will just mark the conflict as resolved."
13476
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13483
13484
#: en/help_topics/conflict-types.txt:236
13485
msgid ""
13486
"Deleting parent\n"
13487
"---------------"
13488
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13489
"Deleting parent\n"
13490
"---------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13491
13492
#: en/help_topics/conflict-types.txt:241
13493
msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13494
msgstr "  Conflict: can't delete DIR because it is not empty.  Not deleting."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13495
13496
#: en/help_topics/conflict-types.txt:243
13497
msgid ""
13498
"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
13499
"source, but has new children in the target (either because a directory\n"
13500
"deletion is merged or because the merge introduce new children).  Bazaar\n"
13501
"will retain the directory.  Resolving this issue depends very much on the\n"
13502
"particular scenario."
13503
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13509
13510
#: en/help_topics/conflict-types.txt:254
13511
msgid ""
13512
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
13513
"directory,"
13514
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13515
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
13516
"directory,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13517
13518
#: en/help_topics/conflict-types.txt:256
13519
msgid ""
13520
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
13521
"  children,"
13522
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13523
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
13524
"  children,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13525
13526
#: en/help_topics/conflict-types.txt:259
13527
msgid "* ``--action=done`` will just mark the conflict as resolved."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13528
msgstr "* ``--action=done`` will just mark the conflict as resolved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13529
13530
#: en/help_topics/conflict-types.txt:261
13531
msgid ""
13532
"Note that when merging a directory deletion, if unversioned files are\n"
13533
"present, they become potential orphans has they don't have a directory\n"
13534
"parent anymore."
13535
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13539
13540
#: en/help_topics/conflict-types.txt:265
13541
msgid ""
13542
"Handling such orphans, *before* the conflict is created, is controlled by\n"
13543
"setting the ``bzr.transform.orphan_policy`` configuration option."
13544
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13545
"Handling such orphans, *before* the conflict is created, is controlled by\n"
13546
"setting the ``bzr.transform.orphan_policy`` configuration option."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13547
13548
#: en/help_topics/conflict-types.txt:268
13549
msgid "There are two possible values for this option:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13550
msgstr "There are two possible values for this option:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13551
13552
#: en/help_topics/conflict-types.txt:270
13553
msgid ""
13554
"* ``conflict`` (the default): will leave the orphans in place and\n"
13555
"  generate a conflicts,"
13556
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13557
"* ``conflict`` (the default): will leave the orphans in place and\n"
13558
"  generate a conflicts,"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13559
13560
#: en/help_topics/conflict-types.txt:273
13561
msgid ""
13562
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
13563
"root\n"
13564
"  of the working tree with names like ``<file>.~#~``."
13565
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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>.~#~``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13569
13570
#: en/help_topics/conflict-types.txt:278
13571
msgid ""
13572
"Path conflict\n"
13573
"-------------"
13574
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13575
"Path conflict\n"
13576
"-------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13577
13578
#: en/help_topics/conflict-types.txt:283
13579
msgid "  Path conflict: PATH1 / PATH2"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13580
msgstr "  Path conflict: PATH1 / PATH2"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13581
13582
#: en/help_topics/conflict-types.txt:285
13583
msgid ""
13584
"This happens when the source and target have each modified the name or "
13585
"parent\n"
13586
"directory of a file.  Bazaar will use the path elements from the source."
13587
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13591
13592
#: en/help_topics/conflict-types.txt:288
13593
msgid ""
13594
"To resolve that kind of conflict, you just have to decide what name should "
13595
"be\n"
13596
"retained for the file involved."
13597
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13598
"To resolve that kind of conflict, you just have to decide what name should "
13599
"be\n"
13600
"retained for the file involved."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13601
13602
#: en/help_topics/conflict-types.txt:293
13603
msgid ""
13604
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
13605
"  issuing ``bzr mv PATH2 PATH1``,\n"
13606
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
13607
"``PATH2``,\n"
13608
"* ``--action=done`` will just mark the conflict as resolved."
13609
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13615
13616
#: en/help_topics/conflict-types.txt:300
13617
msgid ""
13618
"Parent loop\n"
13619
"-----------"
13620
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13621
"Parent loop\n"
13622
"-----------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13623
13624
#: en/help_topics/conflict-types.txt:305
13625
msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13626
msgstr "  Conflict moving FILE into DIRECTORY.  Cancelled move."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13627
13628
#: en/help_topics/conflict-types.txt:307
13629
msgid ""
13630
"This happens when the source and the target have each moved directories, so\n"
13631
"that, if the change could be applied, a directory would be contained by "
13632
"itself.\n"
13633
"For example::"
13634
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13639
13640
#: en/help_topics/conflict-types.txt:311
13641
msgid ""
13642
"  $ bzr init\n"
13643
"  $ bzr mkdir white\n"
13644
"  $ bzr mkdir black\n"
13645
"  $ bzr commit -m \"BASE\"\n"
13646
"  $ bzr branch . ../other\n"
13647
"  $ bzr mv white black\n"
13648
"  $ bzr commit -m \"THIS\"\n"
13649
"  $ bzr mv ../other/black ../other/white\n"
13650
"  $ bzr commit ../other -m \"OTHER\"\n"
13651
"  $ bzr merge ../other"
13652
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13663
13664
#: en/help_topics/conflict-types.txt:322
13665
msgid ""
13666
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
13667
"``black``.  To resolve that kind of conflict, you just have to decide what\n"
13668
"name should be retained for the directories involved."
13669
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13673
13674
#: en/help_topics/conflict-types.txt:328
13675
msgid ""
13676
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
13677
"\n"
13678
"  in ``black``,\n"
13679
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
13680
"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
13681
"* ``--action=done`` will just mark the conflict as resolved."
13682
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13689
13690
#: en/help_topics/conflict-types.txt:336
13691
msgid ""
13692
"Non-directory parent\n"
13693
"--------------------"
13694
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13695
"Non-directory parent\n"
13696
"--------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13697
13698
#: en/help_topics/conflict-types.txt:341
13699
msgid ""
13700
"  Conflict: foo.new is not a directory, but has files in it.\n"
13701
"  Created directory."
13702
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13703
"  Conflict: foo.new is not a directory, but has files in it.\n"
13704
"  Created directory."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13705
13706
#: en/help_topics/conflict-types.txt:344
13707
msgid ""
13708
"This happens when one side has added files to a directory, and the other "
13709
"side\n"
13710
"has changed the directory into a file or symlink.  For example::"
13711
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13715
13716
#: en/help_topics/conflict-types.txt:347
13717
msgid ""
13718
"  $ bzr init\n"
13719
"  $ bzr mkdir foo\n"
13720
"  $ bzr commit -m \"BASE\"\n"
13721
"  $ bzr branch . ../other\n"
13722
"  $ rmdir foo\n"
13723
"  $ touch foo\n"
13724
"  $ bzr commit -m \"THIS\"\n"
13725
"  $ bzr mkdir ../other/foo/bar\n"
13726
"  $ bzr commit ../other -m \"OTHER\"\n"
13727
"  $ bzr merge ../other"
13728
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13739
13740
#: en/help_topics/conflict-types.txt:358
13741
msgid ""
13742
"To resolve that kind of conflict, you have to decide what name should be\n"
13743
"retained for the file, directory or symlink involved."
13744
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13747
13748
#: en/help_topics/conflict-types.txt:363
13749
msgid ""
13750
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
13751
"  ``bzr add foo``,\n"
13752
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
13753
"  ``bzr mv foo.new foo``,\n"
13754
"* ``--action=done`` will just mark the conflict as resolved."
13755
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13761
13762
#: en/help_topics/conflict-types.txt:371
13763
msgid ""
13764
"MalformedTransform\n"
13765
"------------------"
13766
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13767
"MalformedTransform\n"
13768
"------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13769
13770
#: en/help_topics/conflict-types.txt:374
13771
msgid ""
13772
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
13773
"exception.  This means that Bazaar encountered a filesystem conflict that it "
13774
"was\n"
13775
"unable to resolve.  This usually indicates a bug.  Please let us know if "
13776
"you\n"
13777
"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
13778
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13785
13786
#: en/help_topics/content-filters.txt:1
13787
msgid ""
13788
"Content Filters\n"
13789
"==============="
13790
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13791
"Content Filters\n"
13792
"==============="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13793
13794
#: en/help_topics/content-filters.txt:4
13795
msgid ""
13796
"Content formats\n"
13797
"---------------"
13798
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13799
"Content formats\n"
13800
"---------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13801
13802
#: en/help_topics/content-filters.txt:7
13803
msgid ""
13804
"Bazaar's content filtering allows you to store files in a different\n"
13805
"format from the copy in your working tree.  This lets you, or your\n"
13806
"co-developers, use Windows development tools that expect CRLF files\n"
13807
"on projects that use other line-ending conventions. Among other things,\n"
13808
"content filters also let Unix developers more easily work on projects\n"
13809
"using Windows line-ending conventions, keyword expansion/compression,\n"
13810
"and trailing spaces on lines in text files to be implicitly stripped\n"
13811
"when committed."
13812
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13821
13822
#: en/help_topics/content-filters.txt:16
13823
msgid "To generalize, there are two content formats supported by Bazaar:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13824
msgstr "To generalise, there are two content formats supported by Bazaar:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13825
13826
#: en/help_topics/content-filters.txt:18
13827
msgid ""
13828
"* a canonical format - how files are stored internally\n"
13829
"* a convenience format - how files are created in a working tree."
13830
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13831
"* a canonical format - how files are stored internally\n"
13832
"* a convenience format - how files are created in a working tree."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13833
13834
#: en/help_topics/content-filters.txt:21
13835
msgid ""
13836
"\n"
13837
"Format conversion\n"
13838
"-----------------"
13839
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13840
"\n"
13841
"Format conversion\n"
13842
"-----------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13843
13844
#: en/help_topics/content-filters.txt:25
13845
msgid ""
13846
"The conversion between these formats is done by content filters.\n"
13847
"A content filter has two parts:"
13848
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13849
"The conversion between these formats is done by content filters.\n"
13850
"A content filter has two parts:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13851
13852
#: en/help_topics/content-filters.txt:28
13853
msgid ""
13854
"* a read converter - converts from convenience to canonical format\n"
13855
"* a write converter - converts from canonical to convenience format."
13856
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13857
"* a read converter - converts from convenience to canonical format\n"
13858
"* a write converter - converts from canonical to convenience format."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13859
13860
#: en/help_topics/content-filters.txt:31
13861
msgid ""
13862
"Many of these converters will provide *round-trip* conversion,\n"
13863
"i.e. applying the read converter followed by the write converter\n"
13864
"gives back the original content. However, others may provide an\n"
13865
"asymmetric conversion. For example, a read converter might strip\n"
13866
"trailing whitespace off lines in source code while the matching\n"
13867
"write converter might pass content through unchanged."
13868
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13875
13876
#: en/help_topics/content-filters.txt:38
13877
msgid ""
13878
"\n"
13879
"Enabling content filters\n"
13880
"------------------------"
13881
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13882
"\n"
13883
"Enabling content filters\n"
13884
"------------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13885
13886
#: en/help_topics/content-filters.txt:42
13887
msgid ""
13888
"Content filters are typically provided by plugins, so the first step\n"
13889
"in using them is to install the relevant plugins and read their\n"
13890
"documentation. Some plugins may be very specific about which files\n"
13891
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
13892
"In other cases, the plugin may leave it in the user's hands to\n"
13893
"define which files are to be filtered. This is typically done\n"
13894
"using rule-based preferences. See ``bzr help rules`` for general\n"
13895
"information about defining these."
13896
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13905
13906
#: en/help_topics/content-filters.txt:51
13907
msgid ""
13908
"\n"
13909
"Impact on commands\n"
13910
"------------------"
13911
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13912
"\n"
13913
"Impact on commands\n"
13914
"------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13915
13916
#: en/help_topics/content-filters.txt:55
13917
msgid ""
13918
"Read converters are only applied to commands that read content from\n"
13919
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
13920
"will apply read converters to files in the working tree, then compare\n"
13921
"the results to the content last committed."
13922
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13927
13928
#: en/help_topics/content-filters.txt:60
13929
msgid ""
13930
"Write converters are only applied by commands that **create files in a\n"
13931
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
13932
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
13933
"respectively."
13934
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13939
13940
#: en/help_topics/content-filters.txt:65
13941
msgid ""
13942
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
13943
"comitting files. If this makes sense for a given plugin providing\n"
13944
"a content filter, the plugin can usually achieve this effect by using a\n"
13945
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
13946
"for more information on hooks."
13947
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13953
13954
#: en/help_topics/content-filters.txt:71
13955
msgid ""
13956
"\n"
13957
"Refreshing your working tree\n"
13958
"----------------------------"
13959
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13960
"\n"
13961
"Refreshing your working tree\n"
13962
"----------------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13963
13964
#: en/help_topics/content-filters.txt:75
13965
msgid ""
13966
"For performance reasons, Bazaar caches the timestamps of files in\n"
13967
"a working tree, and assumes files are unchanged if their timestamps\n"
13968
"match the cached values. As a consequence, there are times when\n"
13969
"you may need to explicitly ask for content filtering to be reapplied\n"
13970
"in one or both directions, e.g. after installing or reconfiguring\n"
13971
"plugins providing it."
13972
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13979
13980
#: en/help_topics/content-filters.txt:82
13981
msgid "Here are some general guidelines for doing this:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13982
msgstr "Here are some general guidelines for doing this:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13983
13984
#: en/help_topics/content-filters.txt:84
13985
msgid ""
13986
" * To reapply read converters, ``touch`` files, i.e. update their\n"
13987
"   timestamp. Operations like ``bzr status`` should then reapply the\n"
13988
"   relevant read converters and compare the end result with the\n"
13989
"   canonical format."
13990
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
13995
13996
#: en/help_topics/content-filters.txt:89
13997
msgid ""
13998
" * To reapply write converters, ensure there are no local changes,\n"
13999
"   delete the relevant files and run ``bzr revert`` on those files."
14000
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14001
" * To reapply write converters, ensure there are no local changes,\n"
14002
"   delete the relevant files and run ``bzr revert`` on those files."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14003
14004
#: en/help_topics/content-filters.txt:92
14005
msgid ""
14006
"Note: In the future, it is likely that additional options will be added\n"
14007
"to commands to make this refreshing process faster and safer.\n"
14008
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14011
14012
#: en/help_topics/current-formats.txt:1
14013
msgid "Current Storage Formats"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14014
msgstr "Current Storage Formats"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14015
14016
#: en/help_topics/current-formats.txt:3
14017
msgid ""
14018
":2a:\n"
14019
"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
14020
"    compress storage. Provides rich roots which are a one-way\n"
14021
"    transition."
14022
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14027
14028
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
14029
msgid ""
14030
"\n"
14031
"See :doc:`formats-help` for more about storage formats."
14032
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14033
"\n"
14034
"See :doc:`formats-help` for more about storage formats."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14035
14036
#: en/help_topics/debug-flags.txt:1
14037
msgid ""
14038
"Debug Flags\n"
14039
"==========="
14040
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14041
"Debug Flags\n"
14042
"==========="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14043
14044
#: en/help_topics/debug-flags.txt:4
14045
msgid ""
14046
"These flags can be passed on the bzr command line or (without the ``-D``\n"
14047
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
14048
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14051
14052
#: en/help_topics/debug-flags.txt:7
14053
msgid ""
14054
"-Dauth            Trace authentication sections used.\n"
14055
"-Dbytes           Print out how many bytes were transferred\n"
14056
"-Ddirstate        Trace dirstate activity (verbose!)\n"
14057
"-Derror           Instead of normal error handling, always print a "
14058
"traceback\n"
14059
"                  on error.\n"
14060
"-Devil            Capture call sites that do expensive or badly-scaling\n"
14061
"                  operations.\n"
14062
"-Dfetch           Trace history copying between repositories.\n"
14063
"-Dfilters         Emit information for debugging content filtering.\n"
14064
"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
14065
"fetch.\n"
14066
"-Dgraph           Trace graph traversal.\n"
14067
"-Dhashcache       Log every time a working file is read to determine its "
14068
"hash.\n"
14069
"-Dhooks           Trace hook execution.\n"
14070
"-Dhpss            Trace smart protocol requests and responses.\n"
14071
"-Dhpssdetail      More hpss details.\n"
14072
"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
14073
"-Dhttp            Trace http connections, requests and responses.\n"
14074
"-Dindex           Trace major index operations.\n"
14075
"-Dknit            Trace knit operations.\n"
14076
"-Dlock            Trace when lockdir locks are taken or released.\n"
14077
"-Dnoretry         If a connection is reset, fail immediately rather than\n"
14078
"                  retrying the request.\n"
14079
"-Dprogress        Trace progress bar operations.\n"
14080
"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
14081
"-Dmerge           Emit information for debugging merges.\n"
14082
"-Dno_apport       Don't use apport to report crashes.\n"
14083
"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
14084
"-Dpack            Emit information about pack operations.\n"
14085
"-Drelock          Emit a message every time a branch or repository object "
14086
"is\n"
14087
"                  unlocked then relocked the same way.\n"
14088
"-Dsftp            Trace SFTP internals.\n"
14089
"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
14090
"expected\n"
14091
"-Dstream          Trace fetch streams.\n"
14092
"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
14093
"portable\n"
14094
"                  manner.\n"
14095
"-Dunlock          Some errors during unlock are treated as warnings.\n"
14096
"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
14097
"-DIDS_always      Always use InterDifferingSerializer to fetch if "
14098
"appropriate\n"
14099
"                  for the format, even for non-local fetches.\n"
14100
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14147
14148
#: en/help_topics/diverged-branches.txt:1
14149
msgid ""
14150
"Diverged Branches\n"
14151
"================="
14152
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14153
"Diverged Branches\n"
14154
"================="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14155
14156
#: en/help_topics/diverged-branches.txt:4
14157
msgid ""
14158
"When Bazaar tries to push one branch onto another, it requires that the\n"
14159
"destination branch must be ready to receive the source branch.  If this "
14160
"isn't\n"
14161
"the case, then we say that the branches have ``diverged``.  Branches are\n"
14162
"considered diverged if the destination branch's most recent commit is one "
14163
"that\n"
14164
"has not been merged (directly or indirectly) by the source branch.  To "
14165
"recover\n"
14166
"from diverged branches, one must merge the missing revisions into the "
14167
"source\n"
14168
"branch."
14169
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14181
14182
#: en/help_topics/diverged-branches.txt:12
14183
msgid ""
14184
"This situation commonly arises when using a centralized workflow with local\n"
14185
"commits.  If someone else has committed new work to the mainline since your\n"
14186
"last pull and you have local commits that have not yet been pushed to the\n"
14187
"mainline, then your local branch and the mainline have diverged."
14188
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14193
14194
#: en/help_topics/diverged-branches.txt:17
14195
msgid ""
14196
"Discovering What Has Diverged\n"
14197
"-----------------------------"
14198
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14199
"Discovering What Has Diverged\n"
14200
"-----------------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14201
14202
#: en/help_topics/diverged-branches.txt:20
14203
msgid ""
14204
"The ``bzr missing`` command is used to find out what revisions are in "
14205
"another\n"
14206
"branch that are not present in the current branch, and vice-versa.  It shows "
14207
"a\n"
14208
"summary of  which extra revisions exist in each branch.  If you want to see "
14209
"the\n"
14210
"precise effects of those revisions, you can use ``bzr diff --"
14211
"old=other_branch``\n"
14212
"to show the differences between other_branch and your current branch."
14213
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14223
14224
#: en/help_topics/diverged-branches.txt:26
14225
msgid ""
14226
"A Solution\n"
14227
"----------"
14228
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14229
"A Solution\n"
14230
"----------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14231
14232
#: en/help_topics/diverged-branches.txt:29
14233
msgid ""
14234
"The solution is to merge the revisions from the mainline into your local\n"
14235
"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
14236
"mainline.  This merge may result in conflicts if the other developer's "
14237
"changes\n"
14238
"overlap with your changes.  These conflicts should be resolved before\n"
14239
"continuing. After any conflicts have been resolved, or even if there were "
14240
"no\n"
14241
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
14242
"to your local branch.  This requirement gives you an opportunity to test "
14243
"the\n"
14244
"resulting working tree for correctness, since the merged revisions could "
14245
"have\n"
14246
"made arbitrary changes.  After testing, you should commit the merge using\n"
14247
"``bzr commit``.  This clears up the diverged branches situation.  Your "
14248
"local\n"
14249
"branch can now be pushed to the mainline.\n"
14250
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14267
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14268
#: en/help_topics/env-variables.txt:1
14269
msgid "Environment Variables"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14270
msgstr "Environment Variables"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6093.4.149 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14347
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14348
#: en/help_topics/eol.txt:1
14349
msgid ""
14350
"End of Line Conversion\n"
14351
"======================"
14352
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14353
"End of Line Conversion\n"
14354
"======================"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14355
14356
#: en/help_topics/eol.txt:4
14357
msgid ""
14358
"EOL conversion is provided as a content filter where Bazaar internally\n"
14359
"stores a canonical format but outputs a convenience format. See\n"
14360
"``bzr help content-filters`` for general information about using these."
14361
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14365
14366
#: en/help_topics/eol.txt:8
14367
msgid ""
14368
"Note: Content filtering is only supported in recently added formats,\n"
14369
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
14370
"in a recent format. (Just setting the format on the repository\n"
14371
"is not enough.) If content filtering does not appear to be working, use\n"
14372
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
14373
"or later."
14374
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14381
14382
#: en/help_topics/eol.txt:15
14383
msgid ""
14384
"EOL conversion needs to be enabled for selected file patterns using\n"
14385
"rules. See ``bzr help rules`` for general information on defining rules.\n"
14386
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
14387
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
14388
"supported in a future verison of Bazaar."
14389
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14395
14396
#: en/help_topics/eol.txt:21
14397
msgid ""
14398
"To configure which files to filter, set ``eol`` to one of the values below.\n"
14399
"(If a value is not set, ``exact`` is the default.)"
14400
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14403
14404
#: en/help_topics/eol.txt:24
14405
msgid ""
14406
" ========== ===================================== ======================\n"
14407
" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
14408
" ========== ===================================== ======================\n"
14409
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
14410
" ---------- ------------------------------------- ----------------------\n"
14411
" ``lf``     ``lf``                                ``lf``\n"
14412
" ---------- ------------------------------------- ----------------------\n"
14413
" ``crlf``   ``crlf``                              ``lf``\n"
14414
" ---------- ------------------------------------- ----------------------\n"
14415
" ``exact``  No conversion                         Exactly as in file\n"
14416
" ========== ===================================== ======================"
14417
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
" ========== ===================================== ======================"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14429
14430
#: en/help_topics/eol.txt:36
14431
msgid ""
14432
"Note: For safety reasons, no conversion is applied to any file where a null\n"
14433
"byte is detected in the file."
14434
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14435
"Note: For safety reasons, no conversion is applied to any file where a null\n"
14436
"byte is detected in the file."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14437
14438
#: en/help_topics/eol.txt:39
14439
msgid ""
14440
"For users working on a cross-platform project, here is a suggested rule\n"
14441
"to use as a starting point::"
14442
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14443
"For users working on a cross-platform project, here is a suggested rule\n"
14444
"to use as a starting point::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14445
14446
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
14447
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
14448
msgid ""
14449
"  [name *]\n"
14450
"  eol = native"
14451
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14452
"  [name *]\n"
14453
"  eol = native"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14454
14455
#: en/help_topics/eol.txt:45
14456
msgid ""
14457
"If you have binary files that do not contain a null byte though, be\n"
14458
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
14459
"by giving more explicit patterns earlier in the rules file. For example::"
14460
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14464
14465
#: en/help_topics/eol.txt:49
14466
msgid ""
14467
"  [name *.png]\n"
14468
"  eol = exact"
14469
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14470
"  [name *.png]\n"
14471
"  eol = exact"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14472
14473
#: en/help_topics/eol.txt:55
14474
msgid ""
14475
"If your working tree is on a network drive shared by users on different\n"
14476
"operating systems, you typically want to force certain conventions for\n"
14477
"certain files. In that way, if a file is created with the wrong line\n"
14478
"endings or line endings get mixed during editing, it gets committed\n"
14479
"correctly and gets checked out correctly. For example::"
14480
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14486
14487
#: en/help_topics/eol.txt:61
14488
msgid ""
14489
"  [name *.bat]\n"
14490
"  eol = crlf"
14491
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14492
"  [name *.bat]\n"
14493
"  eol = crlf"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14494
14495
#: en/help_topics/eol.txt:64
14496
msgid ""
14497
"  [name *.sh]\n"
14498
"  eol = lf"
14499
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14500
"  [name *.sh]\n"
14501
"  eol = lf"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14502
14503
#: en/help_topics/eol.txt:70
14504
msgid ""
14505
"If you take the care to create files with their required endings, you can\n"
14506
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
14507
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
14508
"introducing mixed line endings will be corrected during commit for files\n"
14509
"with those settings."
14510
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14516
14517
#: en/help_topics/eol.txt:76
14518
msgid ""
14519
"If you have sample test data that deliberately has text files with mixed\n"
14520
"newline conventions, you can ask for those to be left alone like this::"
14521
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14524
14525
#: en/help_topics/eol.txt:79
14526
msgid ""
14527
"  [name test_data/]\n"
14528
"  eol = exact"
14529
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14530
"  [name test_data/]\n"
14531
"  eol = exact"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14532
14533
#: en/help_topics/eol.txt:85
14534
msgid ""
14535
"Note that ``exact`` does not imply the file is binary but it does mean\n"
14536
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
14537
"of content analysis to detect binary files for commands like ``diff``.\n"
14538
"In the future, a ``binary = true`` rule may be added but it is not\n"
14539
"supported yet.)"
14540
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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.)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14546
14547
#: en/help_topics/eol.txt:91
14548
msgid ""
14549
"If you have an existing repository with text files already stored using\n"
14550
"Windows newline conventions (``crlf``), then you may want to keep using "
14551
"that\n"
14552
"convention in the repository. Forcing certain files to this convention\n"
14553
"may also help users who do not have rules configured. To do this, set\n"
14554
"``eol`` to one of the values below."
14555
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14562
14563
#: en/help_topics/eol.txt:97
14564
msgid ""
14565
" ============================ ======================== "
14566
"======================\n"
14567
" Value                        Checkout end-of-lines as Commit end-of-lines "
14568
"as\n"
14569
" ============================ ======================== "
14570
"======================\n"
14571
" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
14572
"                              ``lf`` otherwise\n"
14573
" ---------------------------- ------------------------ ----------------------"
14574
"\n"
14575
" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
14576
" ---------------------------- ------------------------ ----------------------"
14577
"\n"
14578
" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
14579
" ============================ ======================== ======================"
14580
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
" ============================ ======================== ======================"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14596
14597
#: en/help_topics/eol.txt:108
14598
msgid ""
14599
"For users working on an existing project that uses Windows newline\n"
14600
"conventions in their Bazaar repository, this rule is suggested as a\n"
14601
"starting point::"
14602
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14606
14607
#: en/help_topics/eol.txt:112
14608
msgid ""
14609
"  [name *]\n"
14610
"  eol = native-with-crlf-in-repo"
14611
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14612
"  [name *]\n"
14613
"  eol = native-with-crlf-in-repo"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14614
14615
#: en/help_topics/eol.txt:115
14616
msgid ""
14617
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
14618
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
14619
"``crlf`` and ``exact``."
14620
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14624
14625
#: en/help_topics/eol.txt:119
14626
msgid ""
14627
"Note: Bazaar's EOL conversion will convert the content of files but\n"
14628
"never reject files because a given line ending or mixed line endings\n"
14629
"are found. A precommit hook should be used if you wish to validate\n"
14630
"(and not just convert) content before committing.\n"
14631
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14636
14637
#: en/help_topics/hidden-commands.txt:1
14638
msgid ""
14639
"added                List files added in working tree.\n"
14640
"ancestry             List all revisions merged into this branch.\n"
14641
"assert-fail          Test reporting of assertion failures\n"
14642
"bundle-info          Output interesting stats about a bundle\n"
14643
"bundle-revisions     Create a merge-directive for submitting changes.\n"
14644
"cat-revision         Write out metadata for a revision.\n"
14645
"dump-btree           Dump the contents of a btree index file to stdout.\n"
14646
"export-pot           Export command helps and error messages in po format.\n"
14647
"file-id              Print file_id of a particular file or directory.\n"
14648
"file-path            Print path of file_ids to a file or directory.\n"
14649
"find-merge-base      Find and print a base revision for merging two "
14650
"branches.\n"
14651
"hooks                Show hooks.\n"
14652
"inventory            Show inventory of the current working copy or a "
14653
"revision.\n"
14654
"local-time-offset    Show the offset in seconds from GMT to local time.\n"
14655
"lookup-revision      Lookup the revision-id from a revision-number\n"
14656
"merge-directive      Generate a merge directive for auto-merge tools.\n"
14657
"modified             List files modified in working tree.\n"
14658
"re-sign              Create a digital signature for an existing revision.\n"
14659
"reference            list, view and set branch locations for nested trees.\n"
14660
"relpath              Show path of a file relative to root\n"
14661
"repair-workingtree   Reset the working tree state file.\n"
14662
"revision-history     Display the list of revision ids on a branch.\n"
14663
"revision-info        Show revision number and revision id for a given "
14664
"revision\n"
14665
"                     identifier.\n"
14666
"rocks                Statement of optimism.\n"
14667
"selftest             Run internal test suite.\n"
14668
"shell-complete       Show appropriate completions for context.\n"
14669
"test-script          Run a shell-like test from a file.\n"
14670
"touching-revisions   Return revision-ids which affected a particular file.\n"
14671
"unknowns             List unknown files.\n"
14672
"wait-until-signalled Test helper for\n"
14673
"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
14674
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14710
14711
#: en/help_topics/hooks.txt:1
14712
msgid ""
14713
"\n"
14714
"Hooks\n"
14715
"====="
14716
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14717
"\n"
14718
"Hooks\n"
14719
"====="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14720
14721
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
14722
msgid ""
14723
"Introduction\n"
14724
"------------"
14725
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14726
"Introduction\n"
14727
"------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14728
14729
#: en/help_topics/hooks.txt:8
14730
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14731
msgstr "A hook of type *xxx* of class *yyy* needs to be registered using::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14732
14733
#: en/help_topics/hooks.txt:10
14734
msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14735
msgstr "  yyy.hooks.install_named_hook(\"xxx\", ...)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14736
14737
#: en/help_topics/hooks.txt:12
14738
msgid ""
14739
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
14740
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14741
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14742
14743
#: en/help_topics/hooks.txt:14
14744
msgid ""
14745
"The class that contains each hook is given before the hooks it supplies. "
14746
"For\n"
14747
"instance, BranchHooks as the class is the hooks class for\n"
14748
"`bzrlib.branch.Branch.hooks`."
14749
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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`."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14754
14755
#: en/help_topics/hooks.txt:18
14756
msgid ""
14757
"Each description also indicates whether the hook runs on the client (the\n"
14758
"machine where bzr was invoked) or the server (the machine addressed by\n"
14759
"the branch URL).  These may be, but are not necessarily, the same machine."
14760
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14764
14765
#: en/help_topics/hooks.txt:22
14766
msgid ""
14767
"Plugins (including hooks) are run on the server if all of these is true:"
14768
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14769
"Plugins (including hooks) are run on the server if all of these is true:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14770
14771
#: en/help_topics/hooks.txt:24
14772
msgid ""
14773
"  * The connection is via a smart server (accessed with a URL starting with\n"
14774
"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
14775
"\"http://\"\n"
14776
"    URL when a smart server is available via HTTP)."
14777
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14782
14783
#: en/help_topics/hooks.txt:28
14784
msgid ""
14785
"  * The hook is either server specific or part of general infrastructure "
14786
"rather\n"
14787
"    than client specific code (such as commit)."
14788
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14789
"  * The hook is either server specific or part of general infrastructure "
14790
"rather\n"
14791
"    than client specific code (such as commit)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14792
14793
#: en/help_topics/hooks.txt:31
14794
msgid ""
14795
"\n"
14796
"BranchHooks\n"
14797
"-----------"
14798
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14799
"\n"
14800
"BranchHooks\n"
14801
"-----------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14802
14803
#: en/help_topics/hooks.txt:35
14804
msgid ""
14805
"automatic_tag_name\n"
14806
"~~~~~~~~~~~~~~~~~~"
14807
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14808
"automatic_tag_name\n"
14809
"~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14810
14811
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14812
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14813
msgid "Introduced in: 2.2"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14814
msgstr "Introduced in: 2.2"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14815
14816
#: en/help_topics/hooks.txt:40
14817
msgid ""
14818
"Called to determine an automatic tag name for a revision.\n"
14819
"automatic_tag_name is called with (branch, revision_id) and should\n"
14820
"return a tag name or None if no tag name could be determined. The\n"
14821
"first non-None tag name returned will be used."
14822
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14827
14828
#: en/help_topics/hooks.txt:45
14829
msgid ""
14830
"open\n"
14831
"~~~~"
14832
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14833
"open\n"
14834
"~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14835
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14836
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
14837
#: en/help_topics/hooks.txt:307
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14838
msgid "Introduced in: 1.8"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14839
msgstr "Introduced in: 1.8"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14840
14841
#: en/help_topics/hooks.txt:50
14842
msgid ""
14843
"Called with the Branch object that has been opened after a branch is\n"
14844
"opened."
14845
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14846
"Called with the Branch object that has been opened after a branch is\n"
14847
"opened."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14848
14849
#: en/help_topics/hooks.txt:53
14850
msgid ""
14851
"post_branch_init\n"
14852
"~~~~~~~~~~~~~~~~"
14853
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14854
"post_branch_init\n"
14855
"~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14856
14857
#: en/help_topics/hooks.txt:58
14858
msgid ""
14859
"Called after new branch initialization completes. post_branch_init is\n"
14860
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
14861
"branch and checkout (both heavyweight and lightweight) will all\n"
14862
"trigger this hook."
14863
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14868
14869
#: en/help_topics/hooks.txt:63
14870
msgid ""
14871
"post_change_branch_tip\n"
14872
"~~~~~~~~~~~~~~~~~~~~~~"
14873
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14874
"post_change_branch_tip\n"
14875
"~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14876
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14877
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14878
msgid "Introduced in: 1.4"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14879
msgstr "Introduced in: 1.4"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14880
14881
#: en/help_topics/hooks.txt:68
14882
msgid ""
14883
"Called in bzr client and server after a change to the tip of a branch\n"
14884
"is made. post_change_branch_tip is called with a\n"
14885
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
14886
"uncommit will all trigger this hook."
14887
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14892
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14893
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14894
msgid ""
14895
"post_commit\n"
14896
"~~~~~~~~~~~"
14897
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14898
"post_commit\n"
14899
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14900
14901
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
14902
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
14903
msgid "Introduced in: 0.15"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14904
msgstr "Introduced in: 0.15"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14905
14906
#: en/help_topics/hooks.txt:78
14907
msgid ""
14908
"Called in the bzr client after a commit has completed. post_commit is\n"
14909
"called with (local, master, old_revno, old_revid, new_revno,\n"
14910
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
14911
"branch."
14912
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14917
14918
#: en/help_topics/hooks.txt:83
14919
msgid ""
14920
"post_pull\n"
14921
"~~~~~~~~~"
14922
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14923
"post_pull\n"
14924
"~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14925
14926
#: en/help_topics/hooks.txt:88
14927
msgid ""
14928
"Called after a pull operation completes. post_pull is called with a\n"
14929
"bzrlib.branch.PullResult object and only runs in the bzr client."
14930
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14933
14934
#: en/help_topics/hooks.txt:91
14935
msgid ""
14936
"post_push\n"
14937
"~~~~~~~~~"
14938
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14939
"post_push\n"
14940
"~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14941
14942
#: en/help_topics/hooks.txt:96
14943
msgid ""
14944
"Called after a push operation completes. post_push is called with a\n"
14945
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
14946
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14949
14950
#: en/help_topics/hooks.txt:99
14951
msgid ""
14952
"post_switch\n"
14953
"~~~~~~~~~~~"
14954
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14955
"post_switch\n"
14956
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14957
14958
#: en/help_topics/hooks.txt:104
14959
msgid ""
14960
"Called after a checkout switches branch. post_switch is called with a\n"
14961
"bzrlib.branch.SwitchHookParams."
14962
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14963
"Called after a checkout switches branch. post_switch is called with a\n"
14964
"bzrlib.branch.SwitchHookParams."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14965
14966
#: en/help_topics/hooks.txt:107
14967
msgid ""
14968
"post_uncommit\n"
14969
"~~~~~~~~~~~~~"
14970
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14971
"post_uncommit\n"
14972
"~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14973
14974
#: en/help_topics/hooks.txt:112
14975
msgid ""
14976
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
14977
"called with (local, master, old_revno, old_revid, new_revno,\n"
14978
"new_revid) where local is the local branch or None, master is the\n"
14979
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
14980
"of None."
14981
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14987
14988
#: en/help_topics/hooks.txt:118
14989
msgid ""
14990
"pre_change_branch_tip\n"
14991
"~~~~~~~~~~~~~~~~~~~~~"
14992
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14993
"pre_change_branch_tip\n"
14994
"~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14995
14996
#: en/help_topics/hooks.txt:121
14997
msgid "Introduced in: 1.6"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14998
msgstr "Introduced in: 1.6"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
14999
15000
#: en/help_topics/hooks.txt:123
15001
msgid ""
15002
"Called in bzr client and server before a change to the tip of a branch\n"
15003
"is made. pre_change_branch_tip is called with a\n"
15004
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
15005
"uncommit will all trigger this hook."
15006
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15011
15012
#: en/help_topics/hooks.txt:128
15013
msgid ""
15014
"pre_commit\n"
15015
"~~~~~~~~~~"
15016
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15017
"pre_commit\n"
15018
"~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15019
15020
#: en/help_topics/hooks.txt:131
15021
msgid "Introduced in: 0.91"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15022
msgstr "Introduced in: 0.91"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15023
15024
#: en/help_topics/hooks.txt:133
15025
msgid ""
15026
"Called after a commit is calculated but before it is completed.\n"
15027
"pre_commit is called with (local, master, old_revno, old_revid,\n"
15028
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
15029
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
15030
"TreeDelta object describing changes from the basis revision. hooks\n"
15031
"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
15032
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
15033
"tree."
15034
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15043
15044
#: en/help_topics/hooks.txt:142
15045
msgid ""
15046
"transform_fallback_location\n"
15047
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
15048
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15049
"transform_fallback_location\n"
15050
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15051
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15052
#: en/help_topics/hooks.txt:145
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15053
msgid "Introduced in: 1.9"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15054
msgstr "Introduced in: 1.9"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15055
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15056
#: en/help_topics/hooks.txt:147
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15057
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15079
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15080
#: en/help_topics/hooks.txt:158
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15081
msgid ""
15082
"CommandHooks\n"
15083
"------------"
15084
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15085
"CommandHooks\n"
15086
"------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15087
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15088
#: en/help_topics/hooks.txt:161
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15089
msgid ""
15090
"extend_command\n"
15091
"~~~~~~~~~~~~~~"
15092
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15093
"extend_command\n"
15094
"~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15095
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15096
#: en/help_topics/hooks.txt:164
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15097
msgid "Introduced in: 1.13"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15098
msgstr "Introduced in: 1.13"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15099
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15100
#: en/help_topics/hooks.txt:166
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15109
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15110
#: en/help_topics/hooks.txt:170
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15111
msgid ""
15112
"get_command\n"
15113
"~~~~~~~~~~~"
15114
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15115
"get_command\n"
15116
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15117
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15120
msgid "Introduced in: 1.17"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15121
msgstr "Introduced in: 1.17"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15122
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15123
#: en/help_topics/hooks.txt:175
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15138
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15139
#: en/help_topics/hooks.txt:182
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15140
msgid ""
15141
"get_missing_command\n"
15142
"~~~~~~~~~~~~~~~~~~~"
15143
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15144
"get_missing_command\n"
15145
"~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15146
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15147
#: en/help_topics/hooks.txt:187
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15156
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15157
#: en/help_topics/hooks.txt:191
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15158
msgid ""
15159
"list_commands\n"
15160
"~~~~~~~~~~~~~"
15161
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15162
"list_commands\n"
15163
"~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15164
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15165
#: en/help_topics/hooks.txt:196
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15176
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15177
#: en/help_topics/hooks.txt:201
15178
msgid ""
15179
"post_command\n"
15180
"~~~~~~~~~~~~"
15181
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15182
"post_command\n"
15183
"~~~~~~~~~~~~"
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15184
15185
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
15186
msgid "Introduced in: 2.6"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15187
msgstr "Introduced in: 2.6"
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15188
15189
#: en/help_topics/hooks.txt:206
15190
msgid "Called after executing a command. Called with the command object."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15191
msgstr "Called after executing a command. Called with the command object."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15192
15193
#: en/help_topics/hooks.txt:208
15194
msgid ""
15195
"pre_command\n"
15196
"~~~~~~~~~~~"
15197
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15198
"pre_command\n"
15199
"~~~~~~~~~~~"
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15200
15201
#: en/help_topics/hooks.txt:213
15202
msgid "Called prior to executing a command. Called with the command object."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15203
msgstr "Called prior to executing a command. Called with the command object."
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15204
15205
#: en/help_topics/hooks.txt:215
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15206
msgid ""
15207
"_ConfigHooks\n"
15208
"------------"
15209
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15210
"_ConfigHooks\n"
15211
"------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15212
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15213
#: en/help_topics/hooks.txt:218
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15214
msgid ""
15215
"get\n"
15216
"~~~"
15217
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15218
"get\n"
15219
"~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15220
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15225
msgid "Introduced in: 2.4"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15226
msgstr "Introduced in: 2.4"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15227
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15228
#: en/help_topics/hooks.txt:223
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15229
msgid ""
15230
"Invoked when a config option is read. The signature is (stack, name,\n"
15231
"value)."
15232
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15233
"Invoked when a config option is read. The signature is (stack, name,\n"
15234
"value)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15235
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15236
#: en/help_topics/hooks.txt:226
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15237
msgid ""
15238
"load\n"
15239
"~~~~"
15240
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15241
"load\n"
15242
"~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15243
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15244
#: en/help_topics/hooks.txt:231
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15245
msgid "Invoked when a config store is loaded. The signature is (store)."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15246
msgstr "Invoked when a config store is loaded. The signature is (store)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15247
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15248
#: en/help_topics/hooks.txt:233
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15249
msgid ""
15250
"remove\n"
15251
"~~~~~~"
15252
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15253
"remove\n"
15254
"~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15255
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15256
#: en/help_topics/hooks.txt:238
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15257
msgid ""
15258
"Invoked when a config option is removed. The signature is (stack,\n"
15259
"name)."
15260
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15261
"Invoked when a config option is removed. The signature is (stack,\n"
15262
"name)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15263
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15264
#: en/help_topics/hooks.txt:241
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15265
msgid ""
15266
"save\n"
15267
"~~~~"
15268
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15269
"save\n"
15270
"~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15271
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15272
#: en/help_topics/hooks.txt:246
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15273
msgid "Invoked when a config store is saved. The signature is (store)."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15274
msgstr "Invoked when a config store is saved. The signature is (store)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15275
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15276
#: en/help_topics/hooks.txt:248
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15277
msgid ""
15278
"set\n"
15279
"~~~"
15280
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15281
"set\n"
15282
"~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15283
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15284
#: en/help_topics/hooks.txt:253
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15285
msgid ""
15286
"Invoked when a config option is set. The signature is (stack, name,\n"
15287
"value)."
15288
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15289
"Invoked when a config option is set. The signature is (stack, name,\n"
15290
"value)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15291
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15292
#: en/help_topics/hooks.txt:256
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15293
msgid ""
15294
"ControlDirHooks\n"
15295
"---------------"
15296
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15297
"ControlDirHooks\n"
15298
"---------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15299
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15300
#: en/help_topics/hooks.txt:259
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15301
msgid ""
15302
"post_repo_init\n"
15303
"~~~~~~~~~~~~~~"
15304
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15305
"post_repo_init\n"
15306
"~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15307
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15308
#: en/help_topics/hooks.txt:264
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15309
msgid ""
15310
"Invoked after a repository has been initialized. post_repo_init is\n"
15311
"called with a bzrlib.controldir.RepoInitHookParams."
15312
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15313
"Invoked after a repository has been initialised. post_repo_init is\n"
15314
"called with a bzrlib.controldir.RepoInitHookParams."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15315
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15316
#: en/help_topics/hooks.txt:267
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15317
msgid ""
15318
"pre_open\n"
15319
"~~~~~~~~"
15320
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15321
"pre_open\n"
15322
"~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15323
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15324
#: en/help_topics/hooks.txt:270
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15325
msgid "Introduced in: 1.14"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15326
msgstr "Introduced in: 1.14"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15327
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15328
#: en/help_topics/hooks.txt:272
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15329
msgid ""
15330
"Invoked before attempting to open a ControlDir with the transport that\n"
15331
"the open will use."
15332
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15333
"Invoked before attempting to open a ControlDir with the transport that\n"
15334
"the open will use."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15335
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15336
#: en/help_topics/hooks.txt:275
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15337
msgid ""
15338
"InfoHooks\n"
15339
"---------"
15340
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15341
"InfoHooks\n"
15342
"---------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15343
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15344
#: en/help_topics/hooks.txt:278
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15345
msgid ""
15346
"repository\n"
15347
"~~~~~~~~~~"
15348
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15349
"repository\n"
15350
"~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15351
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15352
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
15353
#: en/help_topics/hooks.txt:524
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15354
msgid "Introduced in: 1.15"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15355
msgstr "Introduced in: 1.15"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15356
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15357
#: en/help_topics/hooks.txt:283
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15366
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15367
#: en/help_topics/hooks.txt:287
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15368
msgid ""
15369
"LockHooks\n"
15370
"---------"
15371
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15372
"LockHooks\n"
15373
"---------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15374
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15375
#: en/help_topics/hooks.txt:290
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15376
msgid ""
15377
"lock_acquired\n"
15378
"~~~~~~~~~~~~~"
15379
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15380
"lock_acquired\n"
15381
"~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15382
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15383
#: en/help_topics/hooks.txt:295
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15384
msgid ""
15385
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
15386
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15387
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15388
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15389
#: en/help_topics/hooks.txt:297
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15390
msgid ""
15391
"lock_broken\n"
15392
"~~~~~~~~~~~"
15393
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15394
"lock_broken\n"
15395
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15396
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15397
#: en/help_topics/hooks.txt:302
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15398
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15399
msgstr "Called with a bzrlib.lock.LockResult when a physical lock is broken."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15400
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15401
#: en/help_topics/hooks.txt:304
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15402
msgid ""
15403
"lock_released\n"
15404
"~~~~~~~~~~~~~"
15405
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15406
"lock_released\n"
15407
"~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15408
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15409
#: en/help_topics/hooks.txt:309
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15410
msgid ""
15411
"Called with a bzrlib.lock.LockResult when a physical lock is released."
15412
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15413
"Called with a bzrlib.lock.LockResult when a physical lock is released."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15414
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15415
#: en/help_topics/hooks.txt:311
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15416
msgid ""
15417
"MergeHooks\n"
15418
"----------"
15419
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15420
"MergeHooks\n"
15421
"----------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15422
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15423
#: en/help_topics/hooks.txt:314
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15424
msgid ""
15425
"merge_file_content\n"
15426
"~~~~~~~~~~~~~~~~~~"
15427
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15428
"merge_file_content\n"
15429
"~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15430
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15431
#: en/help_topics/hooks.txt:317
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15432
msgid "Introduced in: 2.1"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15433
msgstr "Introduced in: 2.1"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15434
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15435
#: en/help_topics/hooks.txt:319
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15450
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15451
#: en/help_topics/hooks.txt:326
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15452
msgid ""
15453
"post_merge\n"
15454
"~~~~~~~~~~"
15455
msgstr ""
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15456
"post_merge\n"
15457
"~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15458
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15462
msgid "Introduced in: 2.5"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15463
msgstr "Introduced in: 2.5"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15464
15465
#: en/help_topics/hooks.txt:331
15466
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15467
"Called after a merge. Receives a Merger object as the single argument.\n"
15468
"The return value is ignored."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15469
msgstr ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15470
"Called after a merge. Receives a Merger object as the single argument.\n"
15471
"The return value is ignored."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15472
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15473
#: en/help_topics/hooks.txt:334
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15474
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15475
"pre_merge\n"
15476
"~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15477
msgstr ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15478
"pre_merge\n"
15479
"~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15480
15481
#: en/help_topics/hooks.txt:339
15482
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15483
"Called before a merge. Receives a Merger object as the single\n"
15484
"argument."
15485
msgstr ""
15486
"Called before a merge. Receives a Merger object as the single\n"
15487
"argument."
15488
15489
#: en/help_topics/hooks.txt:342
15490
msgid ""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15491
"MergeDirectiveHooks\n"
15492
"-------------------"
15493
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15494
"MergeDirectiveHooks\n"
15495
"-------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15496
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15497
#: en/help_topics/hooks.txt:345
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15498
msgid ""
15499
"merge_request_body\n"
15500
"~~~~~~~~~~~~~~~~~~"
15501
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15502
"merge_request_body\n"
15503
"~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15504
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15505
#: en/help_topics/hooks.txt:348
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15506
msgid "Introduced in: 1.15.0"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15507
msgstr "Introduced in: 1.15.0"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15508
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15509
#: en/help_topics/hooks.txt:350
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15518
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15519
#: en/help_topics/hooks.txt:354
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15520
msgid ""
15521
"MessageEditorHooks\n"
15522
"------------------"
15523
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15524
"MessageEditorHooks\n"
15525
"------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15526
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15527
#: en/help_topics/hooks.txt:357
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15528
msgid ""
15529
"commit_message_template\n"
15530
"~~~~~~~~~~~~~~~~~~~~~~~"
15531
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15532
"commit_message_template\n"
15533
"~~~~~~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15534
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15535
#: en/help_topics/hooks.txt:360
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15536
msgid "Introduced in: 1.10"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15537
msgstr "Introduced in: 1.10"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15538
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15539
#: en/help_topics/hooks.txt:362
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15556
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15557
#: en/help_topics/hooks.txt:370
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15558
msgid ""
15559
"set_commit_message\n"
15560
"~~~~~~~~~~~~~~~~~~"
15561
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15562
"set_commit_message\n"
15563
"~~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15564
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15565
#: en/help_topics/hooks.txt:375
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15578
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15579
#: en/help_topics/hooks.txt:381
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15580
msgid ""
15581
"MutableTreeHooks\n"
15582
"----------------"
15583
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15584
"MutableTreeHooks\n"
15585
"----------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15586
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15604
msgid "Introduced in: 2.0"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15605
msgstr "Introduced in: 2.0"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15606
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15607
#: en/help_topics/hooks.txt:397
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15618
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15619
#: en/help_topics/hooks.txt:402
15620
msgid ""
15621
"post_transform\n"
15622
"~~~~~~~~~~~~~~"
15623
msgstr ""
15624
"post_transform\n"
15625
"~~~~~~~~~~~~~~"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15626
15627
#: en/help_topics/hooks.txt:407
15628
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15631
msgstr ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15634
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15635
#: en/help_topics/hooks.txt:410
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15636
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15637
"pre_transform\n"
15638
"~~~~~~~~~~~~~"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15639
msgstr ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15640
"pre_transform\n"
15641
"~~~~~~~~~~~~~"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15642
15643
#: en/help_topics/hooks.txt:415
15644
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15653
"start_commit\n"
15654
"~~~~~~~~~~~~"
15655
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15656
"start_commit\n"
15657
"~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15658
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15659
#: en/help_topics/hooks.txt:423
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15670
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15671
#: en/help_topics/hooks.txt:428
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15672
msgid ""
15673
"SmartClientHooks\n"
15674
"----------------"
15675
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15676
"SmartClientHooks\n"
15677
"----------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15678
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15679
#: en/help_topics/hooks.txt:431
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15680
msgid ""
15681
"call\n"
15682
"~~~~"
15683
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15684
"call\n"
15685
"~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15686
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15687
#: en/help_topics/hooks.txt:434
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15688
msgid "Introduced in: unknown"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15689
msgstr "Introduced in: unknown"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15690
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15691
#: en/help_topics/hooks.txt:436
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15700
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15701
#: en/help_topics/hooks.txt:440
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15702
msgid ""
15703
"SmartServerHooks\n"
15704
"----------------"
15705
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15706
"SmartServerHooks\n"
15707
"----------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15708
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15709
#: en/help_topics/hooks.txt:443
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15710
msgid ""
15711
"server_exception\n"
15712
"~~~~~~~~~~~~~~~~"
15713
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15714
"server_exception\n"
15715
"~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15716
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15717
#: en/help_topics/hooks.txt:448
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15728
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15729
#: en/help_topics/hooks.txt:453
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15730
msgid ""
15731
"server_started\n"
15732
"~~~~~~~~~~~~~~"
15733
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15734
"server_started\n"
15735
"~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15736
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15737
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15738
msgid "Introduced in: 0.16"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15739
msgstr "Introduced in: 0.16"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15740
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15741
#: en/help_topics/hooks.txt:458
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15754
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15755
#: en/help_topics/hooks.txt:464
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15756
msgid ""
15757
"server_started_ex\n"
15758
"~~~~~~~~~~~~~~~~~"
15759
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15760
"server_started_ex\n"
15761
"~~~~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15762
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15763
#: en/help_topics/hooks.txt:469
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15764
msgid ""
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15768
"Called by the bzr server when it starts serving a directory.\n"
15769
"server_started is called with (backing_urls, server_obj)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15770
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15771
#: en/help_topics/hooks.txt:472
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15772
msgid ""
15773
"server_stopped\n"
15774
"~~~~~~~~~~~~~~"
15775
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15776
"server_stopped\n"
15777
"~~~~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15778
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15779
#: en/help_topics/hooks.txt:477
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15788
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15789
#: en/help_topics/hooks.txt:481
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15790
msgid ""
15791
"StatusHooks\n"
15792
"-----------"
15793
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15794
"StatusHooks\n"
15795
"-----------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15796
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15797
#: en/help_topics/hooks.txt:484
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15798
msgid ""
15799
"post_status\n"
15800
"~~~~~~~~~~~"
15801
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15802
"post_status\n"
15803
"~~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15804
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15805
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15806
msgid "Introduced in: 2.3"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15807
msgstr "Introduced in: 2.3"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15808
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15809
#: en/help_topics/hooks.txt:489
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15822
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15823
#: en/help_topics/hooks.txt:495
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15824
msgid ""
15825
"pre_status\n"
15826
"~~~~~~~~~~"
15827
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15828
"pre_status\n"
15829
"~~~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15830
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15831
#: en/help_topics/hooks.txt:500
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15844
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15845
#: en/help_topics/hooks.txt:506
15846
msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
15870
15871
#: en/help_topics/hooks.txt:518
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15872
msgid ""
15873
"RioVersionInfoBuilderHooks\n"
15874
"--------------------------"
15875
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15876
"RioVersionInfoBuilderHooks\n"
15877
"--------------------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15878
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15879
#: en/help_topics/hooks.txt:521
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15880
msgid ""
15881
"revision\n"
15882
"~~~~~~~~"
15883
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15884
"revision\n"
15885
"~~~~~~~~"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15886
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15887
#: en/help_topics/hooks.txt:526
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15896
15897
#: en/help_topics/location-alias.txt:1
15898
msgid ""
15899
"Location aliases\n"
15900
"================"
15901
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15902
"Location aliases\n"
15903
"================"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15904
15905
#: en/help_topics/location-alias.txt:4
15906
msgid ""
15907
"Bazaar defines several aliases for locations associated with a branch.  "
15908
"These\n"
15909
"can be used with most commands that expect a location, such as `bzr push`."
15910
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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`."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15914
15915
#: en/help_topics/location-alias.txt:7
15916
msgid "The aliases are::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15917
msgstr "The aliases are::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15918
15919
#: en/help_topics/location-alias.txt:9
15920
msgid ""
15921
"  :bound     The branch this branch is bound to, for bound branches.\n"
15922
"  :parent    The parent of this branch.\n"
15923
"  :public    The public location of this branch.\n"
15924
"  :push      The saved location used for `bzr push` with no arguments.\n"
15925
"  :submit    The submit branch for this branch.\n"
15926
"  :this      This branch."
15927
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15934
15935
#: en/help_topics/location-alias.txt:16
15936
msgid "For example, to push to the parent location::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15937
msgstr "For example, to push to the parent location::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15938
15939
#: en/help_topics/location-alias.txt:18
15940
msgid "    bzr push :parent\n"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15941
msgstr "    bzr push :parent\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15942
15943
#: en/help_topics/log-formats.txt:1
15944
msgid ""
15945
"Log Formats\n"
15946
"==========="
15947
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15948
"Log Formats\n"
15949
"==========="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15950
15951
#: en/help_topics/log-formats.txt:4
15952
msgid ""
15953
"A log format controls how information about each revision is displayed.\n"
15954
"The standard log formats are compared below::"
15955
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15956
"A log format controls how information about each revision is displayed.\n"
15957
"The standard log formats are compared below::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15958
15959
#: en/help_topics/log-formats.txt:7
15960
msgid ""
15961
"  Feature                 long           short         line\n"
15962
"  ----------------------  -------------  ------------  -------------------\n"
15963
"  design goal             detailed view  concise view  1 revision per line\n"
15964
"  committer               name+email     name only     name only\n"
15965
"  author                  name+email     -             -\n"
15966
"  date-time format        full           date only     date only\n"
15967
"  commit message          full           full          top line\n"
15968
"  tags                    yes            yes           yes\n"
15969
"  merges indicator        -              yes           -\n"
15970
"  status/delta            optional       optional      -\n"
15971
"  diff/patch              optional       optional      -\n"
15972
"  revision-id             optional       optional      -\n"
15973
"  branch nick             yes            -             -\n"
15974
"  foreign vcs properties  yes            yes           -\n"
15975
"  preferred levels        all            1             1\n"
15976
"  digital signature       optional       -             -"
15977
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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       -             -"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
15994
15995
#: en/help_topics/log-formats.txt:24
15996
msgid ""
15997
"The default format is ``long``. To change this, define the ``log_format``\n"
15998
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
15999
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16002
16003
#: en/help_topics/log-formats.txt:27
16004
msgid ""
16005
"  [DEFAULT]\n"
16006
"  log_format = short"
16007
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16008
"  [DEFAULT]\n"
16009
"  log_format = short"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16010
16011
#: en/help_topics/log-formats.txt:30
16012
msgid ""
16013
"Alternatively, to change the log format used for a given query, use the\n"
16014
"--long, --short or --line options."
16015
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16016
"Alternatively, to change the log format used for a given query, use the\n"
16017
"--long, --short or --line options."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16018
16019
#: en/help_topics/log-formats.txt:33
16020
msgid ""
16021
"If one of the standard log formats does not meet your needs, additional\n"
16022
"formats can be provided by plugins.\n"
16023
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16024
"If one of the standard log formats does not meet your needs, additional\n"
16025
"formats can be provided by plugins.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16026
16027
#: en/help_topics/other-formats.txt:1
16028
msgid "Other Storage Formats"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16029
msgstr "Other Storage Formats"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16030
16031
#: en/help_topics/other-formats.txt:3
16032
msgid "Experimental formats are shown below."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16033
msgstr "Experimental formats are shown below."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16034
16035
#: en/help_topics/other-formats.txt:5
16036
msgid ""
16037
":development-colo:\n"
16038
"    (native) The 2a format with experimental support for colocated\n"
16039
"    branches."
16040
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16041
":development-colo:\n"
16042
"    (native) The 2a format with experimental support for colocated\n"
16043
"    branches."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16044
16045
#: en/help_topics/other-formats.txt:9
16046
msgid ""
16047
"\n"
16048
"Deprecated formats are shown below."
16049
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16050
"\n"
16051
"Deprecated formats are shown below."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16052
16053
#: en/help_topics/other-formats.txt:12
16054
msgid ""
16055
":pack-0.92:\n"
16056
"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
16057
"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
16058
"    by bzr < 0.92."
16059
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16064
16065
#: en/help_topics/patterns.txt:1
16066
msgid ""
16067
"Patterns\n"
16068
"========"
16069
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16070
"Patterns\n"
16071
"========"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16072
16073
#: en/help_topics/patterns.txt:4
16074
msgid ""
16075
"Bazaar uses patterns to match files at various times. For example,\n"
16076
"the ``add`` command skips over files that match ignore patterns\n"
16077
"and preferences can be associated with files using rule patterns.\n"
16078
"The pattern syntax is described below."
16079
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16084
16085
#: en/help_topics/patterns.txt:9
16086
msgid ""
16087
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
16088
"slash or is a regular expression, it is compared to the whole path\n"
16089
"from the branch root. Otherwise, it is compared to only the last\n"
16090
"component of the path. To match a file only in the root directory,\n"
16091
"prepend ``./``. Patterns specifying absolute paths are not allowed."
16092
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16098
16099
#: en/help_topics/patterns.txt:15
16100
msgid "Patterns may include globbing wildcards such as::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16101
msgstr "Patterns may include globbing wildcards such as::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16102
16103
#: en/help_topics/patterns.txt:17
16104
msgid ""
16105
"  ? - Matches any single character except '/'\n"
16106
"  * - Matches 0 or more characters except '/'\n"
16107
"  /**/ - Matches 0 or more directories in a path\n"
16108
"  [a-z] - Matches a single character from within a group of characters"
16109
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16114
16115
#: en/help_topics/patterns.txt:22
16116
msgid ""
16117
"Patterns may also be `Python regular expressions`_. Regular expression\n"
16118
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
16119
"expression.  Regular expression patterns may not include named or\n"
16120
"numbered groups."
16121
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16126
16127
#: en/help_topics/patterns.txt:27
16128
msgid ""
16129
"Case insensitive ignore patterns can be specified with regular expressions\n"
16130
"by using the ``i`` (for ignore case) flag in the pattern."
16131
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16132
"Case insensitive ignore patterns can be specified with regular expressions\n"
16133
"by using the ``i`` (for ignore case) flag in the pattern."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16134
16135
#: en/help_topics/patterns.txt:30
16136
msgid ""
16137
"For example, a case insensitive match for ``foo`` may be specified as::"
16138
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16139
"For example, a case insensitive match for ``foo`` may be specified as::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16140
16141
#: en/help_topics/patterns.txt:32
16142
msgid "  RE:(?i)foo"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16143
msgstr "  RE:(?i)foo"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16144
16145
#: en/help_topics/patterns.txt:34
16146
msgid ""
16147
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
16148
"matched by that pattern will not be ignored."
16149
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16150
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
16151
"matched by that pattern will not be ignored."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16152
16153
#: en/help_topics/patterns.txt:37
16154
msgid ""
16155
".. _Python regular expressions: http://docs.python.org/library/re.html"
16156
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16157
".. _Python regular expressions: http://docs.python.org/library/re.html"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16158
16159
#: en/help_topics/revisionspec.txt:1
16160
msgid "Revision Identifiers"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16161
msgstr "Revision Identifiers"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16162
16163
#: en/help_topics/revisionspec.txt:3
16164
msgid ""
16165
"A revision identifier refers to a specific state of a branch's history.  It\n"
16166
"can be expressed in several ways.  It can begin with a keyword to\n"
16167
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
16168
"'before:yesterday' and 'submit:'."
16169
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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:'."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16174
16175
#: en/help_topics/revisionspec.txt:8
16176
msgid ""
16177
"Alternately, it can be given without a keyword, in which case it will be\n"
16178
"checked as a revision number, a tag, a revision id, a date specification, or "
16179
"a\n"
16180
"branch specification, in that order.  For example, 'date:today' could be\n"
16181
"written as simply 'today', though if you have a tag called 'today' that "
16182
"will\n"
16183
"be found first."
16184
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16192
16193
#: en/help_topics/revisionspec.txt:14
16194
msgid ""
16195
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
16196
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
16197
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
16198
"or\n"
16199
"spaces around the '..')."
16200
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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 '..')."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16206
16207
#: en/help_topics/revisionspec.txt:19
16208
msgid ""
16209
"Ranges are interpreted differently by different commands. To the \"log\" "
16210
"command,\n"
16211
"a range is a sequence of log messages, but to the \"diff\" command, the "
16212
"range\n"
16213
"denotes a change between revisions (and not a sequence of changes).  In\n"
16214
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
16215
"consider it\n"
16216
"to be open-ended, that is, they include one end but not the other.  For "
16217
"example:\n"
16218
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
16219
"3649,\n"
16220
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
16221
"and\n"
16222
"3649, but not 3647."
16223
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16238
16239
#: en/help_topics/revisionspec.txt:28
16240
msgid "The keywords used as revision selection methods are the following:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16241
msgstr "The keywords used as revision selection methods are the following:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16242
16243
#: en/help_topics/revisionspec.txt:30
16244
msgid ""
16245
":revid:\n"
16246
"\tSelects a revision using the revision id.\n"
16247
":submit:\n"
16248
"\tSelects a common ancestor with the submit branch.\n"
16249
":ancestor:\n"
16250
"\tSelects a common ancestor with a second branch.\n"
16251
":date:\n"
16252
"\tSelects a revision on the basis of a datestamp.\n"
16253
":branch:\n"
16254
"\tSelects the last revision of a specified branch.\n"
16255
":tag:\n"
16256
"\tSelects a revision identified by a tag name.\n"
16257
":revno:\n"
16258
"\tSelects a revision using a number.\n"
16259
":before:\n"
16260
"\tSelects the parent of the revision specified.\n"
16261
":annotate:\n"
16262
"\tSelect the revision that last modified the specified line.\n"
16263
":mainline:\n"
16264
"\tSelect mainline revision that merged the specified revision.\n"
16265
":last:\n"
16266
"\tSelects the nth revision from the end."
16267
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16290
16291
#: en/help_topics/revisionspec.txt:53
16292
msgid "In addition, plugins can provide other keywords."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16293
msgstr "In addition, plugins can provide other keywords."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16294
16295
#: en/help_topics/revisionspec.txt:55
16296
msgid "A detailed description of each keyword is given below."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16297
msgstr "A detailed description of each keyword is given below."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16298
16299
#: en/help_topics/revisionspec.txt:57
16300
msgid ":revid:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16301
msgstr ":revid:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16302
16303
#: en/help_topics/revisionspec.txt:59
16304
msgid ""
16305
"    Supply a specific revision id, that can be used to specify any\n"
16306
"    revision id in the ancestry of the branch.\n"
16307
"    Including merges, and pending merges.\n"
16308
"    Examples::"
16309
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16314
16315
#: en/help_topics/revisionspec.txt:64
16316
msgid ""
16317
"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
16318
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16319
"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16320
16321
#: en/help_topics/revisionspec.txt:66
16322
msgid ":submit:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16323
msgstr ":submit:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16324
16325
#: en/help_topics/revisionspec.txt:68
16326
msgid ""
16327
"    Diffing against this shows all the changes that were made in this "
16328
"branch,\n"
16329
"    and is a good predictor of what merge will do.  The submit branch is\n"
16330
"    used by the bundle and merge directive commands.  If no submit branch\n"
16331
"    is specified, the parent branch is used instead."
16332
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16338
16339
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
16340
msgid ""
16341
"    The common ancestor is the last revision that existed in both\n"
16342
"    branches. Usually this is the branch point, but it could also be\n"
16343
"    a revision that was merged."
16344
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16348
16349
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
16350
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
16351
#: en/help_topics/revisionspec.txt:153
16352
msgid "    Examples::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16353
msgstr "    Examples::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16354
16355
#: en/help_topics/revisionspec.txt:79
16356
msgid "      $ bzr diff -r submit:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16357
msgstr "      $ bzr diff -r submit:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16358
16359
#: en/help_topics/revisionspec.txt:81
16360
msgid ":ancestor:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16361
msgstr ":ancestor:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16362
16363
#: en/help_topics/revisionspec.txt:83
16364
msgid "    Supply the path to a branch to select the common ancestor."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16365
msgstr "    Supply the path to a branch to select the common ancestor."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16366
16367
#: en/help_topics/revisionspec.txt:89
16368
msgid ""
16369
"    This is frequently used with 'diff' to return all of the changes\n"
16370
"    that your branch introduces, while excluding the changes that you\n"
16371
"    have not merged from the remote branch."
16372
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16376
16377
#: en/help_topics/revisionspec.txt:95
16378
msgid ""
16379
"      ancestor:/path/to/branch\n"
16380
"      $ bzr diff -r ancestor:../../mainline/branch"
16381
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16382
"      ancestor:/path/to/branch\n"
16383
"      $ bzr diff -r ancestor:../../mainline/branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16384
16385
#: en/help_topics/revisionspec.txt:98
16386
msgid ":date:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16387
msgstr ":date:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16388
16389
#: en/help_topics/revisionspec.txt:100
16390
msgid ""
16391
"    Supply a datestamp to select the first revision that matches the date.\n"
16392
"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
16393
"    Matches the first entry after a given date (either at midnight or\n"
16394
"    at a specified time)."
16395
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16400
16401
#: en/help_topics/revisionspec.txt:105
16402
msgid "    One way to display all the changes since yesterday would be::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16403
msgstr "    One way to display all the changes since yesterday would be::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16404
16405
#: en/help_topics/revisionspec.txt:107
16406
msgid "        bzr log -r date:yesterday.."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16407
msgstr "        bzr log -r date:yesterday.."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16408
16409
#: en/help_topics/revisionspec.txt:111
16410
msgid ""
16411
"      date:yesterday            -> select the first revision since "
16412
"yesterday\n"
16413
"      date:2006-08-14,17:10:14  -> select the first revision after\n"
16414
"                                   August 14th, 2006 at 5:10pm."
16415
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16420
16421
#: en/help_topics/revisionspec.txt:115
16422
msgid ":branch:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16423
msgstr ":branch:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16424
16425
#: en/help_topics/revisionspec.txt:117
16426
msgid "    Supply the path to a branch to select its last revision."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16427
msgstr "    Supply the path to a branch to select its last revision."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16428
16429
#: en/help_topics/revisionspec.txt:121
16430
msgid "      branch:/path/to/branch"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16431
msgstr "      branch:/path/to/branch"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16432
16433
#: en/help_topics/revisionspec.txt:123
16434
msgid ":tag:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16435
msgstr ":tag:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16436
16437
#: en/help_topics/revisionspec.txt:125
16438
msgid "    Tags are stored in the branch and created by the 'tag' command."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16439
msgstr "    Tags are stored in the branch and created by the 'tag' command."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16440
16441
#: en/help_topics/revisionspec.txt:127
16442
msgid ":revno:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16443
msgstr ":revno:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16444
16445
#: en/help_topics/revisionspec.txt:129
16446
msgid ""
16447
"    Use an integer to specify a revision in the history of the branch.\n"
16448
"    Optionally a branch can be specified.  A negative number will count\n"
16449
"    from the end of the branch (-1 is the last revision, -2 the previous\n"
16450
"    one). If the negative number is larger than the branch's history, the\n"
16451
"    first revision is returned.\n"
16452
"    Examples::"
16453
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16460
16461
#: en/help_topics/revisionspec.txt:136
16462
msgid ""
16463
"      revno:1                   -> return the first revision of this branch\n"
16464
"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
16465
"                                   the branch '/path/to/branch'\n"
16466
"      revno:-1                  -> The last revision in a branch.\n"
16467
"      -2:http://other/branch    -> The second to last revision in the\n"
16468
"                                   remote branch.\n"
16469
"      -1000000                  -> Most likely the first revision, unless\n"
16470
"                                   your history is very long."
16471
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16480
16481
#: en/help_topics/revisionspec.txt:145
16482
msgid ":before:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16483
msgstr ":before:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16484
16485
#: en/help_topics/revisionspec.txt:147
16486
msgid ""
16487
"    Supply any revision spec to return the parent of that revision.  This "
16488
"is\n"
16489
"    mostly useful when inspecting revisions that are not in the revision "
16490
"history\n"
16491
"    of a branch."
16492
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16498
16499
#: en/help_topics/revisionspec.txt:151
16500
msgid ""
16501
"    It is an error to request the parent of the null revision (before:0)."
16502
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16503
"    It is an error to request the parent of the null revision (before:0)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16504
16505
#: en/help_topics/revisionspec.txt:155
16506
msgid ""
16507
"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
16508
"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
16509
"                                            aaaa@bbbb-1234567890\n"
16510
"      bzr diff -r before:1913..1913\n"
16511
"            -> Find the changes between revision 1913 and its parent "
16512
"(1912).\n"
16513
"               (What changes did revision 1913 introduce).\n"
16514
"               This is equivalent to:  bzr diff -c 1913"
16515
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16524
16525
#: en/help_topics/revisionspec.txt:163
16526
msgid ":annotate:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16527
msgstr ":annotate:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16528
16529
#: en/help_topics/revisionspec.txt:165
16530
msgid ""
16531
"    Select the revision that last modified the specified line.  Line is\n"
16532
"    specified as path:number.  Path is a relative path to the file.  "
16533
"Numbers\n"
16534
"    start at 1, and are relative to the current version, not the last-\n"
16535
"    committed version of the file."
16536
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16542
16543
#: en/help_topics/revisionspec.txt:170
16544
msgid ":mainline:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16545
msgstr ":mainline:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16546
16547
#: en/help_topics/revisionspec.txt:172
16548
msgid ""
16549
"    Select the revision that merged the specified revision into mainline."
16550
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16551
"    Select the revision that merged the specified revision into mainline."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16552
16553
#: en/help_topics/revisionspec.txt:174
16554
msgid ":last:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16555
msgstr ":last:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16556
16557
#: en/help_topics/revisionspec.txt:176
16558
msgid ""
16559
"    Supply a positive number to get the nth revision from the end.\n"
16560
"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
16561
"    Examples::"
16562
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16566
16567
#: en/help_topics/revisionspec.txt:180
16568
msgid ""
16569
"      last:1        -> return the last revision\n"
16570
"      last:3        -> return the revision 2 before the end.\n"
16571
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16572
"      last:1        -> return the last revision\n"
16573
"      last:3        -> return the revision 2 before the end.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16574
16575
#: en/help_topics/rules.txt:1
16576
msgid ""
16577
"Rules\n"
16578
"====="
16579
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16580
"Rules\n"
16581
"====="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16582
16583
#: en/help_topics/rules.txt:7
16584
msgid ""
16585
"Rules are defined in ini file format where the sections are file glob\n"
16586
"patterns and the contents of each section are the preferences for files\n"
16587
"matching that pattern(s). For example::"
16588
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16592
16593
#: en/help_topics/rules.txt:11
16594
msgid ""
16595
"    [name *.bat]\n"
16596
"    eol = native"
16597
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16598
"    [name *.bat]\n"
16599
"    eol = native"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16600
16601
#: en/help_topics/rules.txt:14
16602
msgid ""
16603
"    [name *.html *.xml]\n"
16604
"    keywords = xml_escape"
16605
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16606
"    [name *.html *.xml]\n"
16607
"    keywords = xml_escape"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16608
16609
#: en/help_topics/rules.txt:17
16610
msgid ""
16611
"Preferences like these are useful for commands and plugins wishing to\n"
16612
"provide custom behaviour for selected files.  For more information on \n"
16613
"end of line conversion see :doc:`eol-help`.\n"
16614
"Keyword support is provided by the `keywords plugin\n"
16615
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
16616
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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>`_."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16622
16623
#: en/help_topics/rules.txt:23
16624
msgid ""
16625
"Files\n"
16626
"-----"
16627
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16628
"Files\n"
16629
"-----"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16630
16631
#: en/help_topics/rules.txt:26
16632
msgid ""
16633
"Default rules for all branches are defined in the optional file\n"
16634
"``BZR_HOME/rules``. "
16635
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16636
"Default rules for all branches are defined in the optional file\n"
16637
"``BZR_HOME/rules``. "
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16638
16639
#: en/help_topics/rules.txt:29
16640
msgid ""
16641
"Rule Patterns\n"
16642
"-------------"
16643
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16644
"Rule Patterns\n"
16645
"-------------"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16646
16647
#: en/help_topics/rules.txt:32
16648
msgid ""
16649
"Patterns are ordered and searching stops as soon as one matches.\n"
16650
"As a consequence, more explicit patterns should be placed towards\n"
16651
"the top of the file. Rule patterns use exactly the same conventions\n"
16652
"as ignore patterns. See :doc:`patterns-help` for details."
16653
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16658
16659
#: en/help_topics/rules.txt:37
16660
msgid ".. note::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16661
msgstr ".. note::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16662
16663
#: en/help_topics/rules.txt:39
16664
msgid ""
16665
"   Patterns containing square brackets or spaces should be\n"
16666
"   surrounded in quotes to ensure they are correctly parsed.\n"
16667
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16668
"   Patterns containing square brackets or spaces should be\n"
16669
"   surrounded in quotes to ensure they are correctly parsed.\n"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16670
16671
#: en/help_topics/topics.txt:1
16672
msgid ""
16673
"authentication       Information on configuring authentication\n"
16674
"basic                Basic commands\n"
16675
"branches             Information on what a branch is\n"
16676
"bugs                 Bug tracker settings\n"
16677
"checkouts            Information on what a checkout is\n"
16678
"commands             Basic help for all commands\n"
16679
"configuration        Details on the configuration settings available\n"
16680
"conflict-types       Types of conflicts and what to do about them\n"
16681
"content-filters      Conversion of content into/from working trees\n"
16682
"criss-cross          Information on criss-cross merging\n"
16683
"current-formats      Current storage formats\n"
16684
"debug-flags          Options to show or record debug information\n"
16685
"diverged-branches    How to fix diverged branches\n"
16686
"env-variables        Environment variable names and values\n"
16687
"eol                  Information on end-of-line handling\n"
16688
"files                Information on configuration and log files\n"
16689
"formats              Information on choosing a storage format\n"
16690
"global-options       Options that control how Bazaar runs\n"
16691
"hidden-commands      All hidden commands\n"
16692
"hooks                Points at which custom processing can be added\n"
16693
"launchpad            Using Bazaar with Launchpad.net\n"
16694
"location-alias       Aliases for remembered locations\n"
16695
"log-formats          Details on the logging formats available\n"
16696
"other-formats        Experimental and deprecated storage formats\n"
16697
"patterns             Information on the pattern syntax\n"
16698
"repositories         Basic information on shared repositories.\n"
16699
"revisionspec         Explain how to use --revision\n"
16700
"rules                Information on defining rule-based preferences\n"
16701
"standalone-trees     Information on what a standalone tree is\n"
16702
"standard-options     Options that can be used with any command\n"
16703
"status-flags         Help on status flags\n"
16704
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
16705
"topics               Topics list\n"
16706
"url-special-chars    Special character handling in URLs\n"
16707
"urlspec              Supported transport protocols\n"
16708
"working-trees        Information on working trees\n"
16709
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16746
16747
#: en/help_topics/url-special-chars.txt:1
16748
msgid ""
16749
"Special character handling in URLs\n"
16750
"=================================="
16751
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16752
"Special character handling in URLs\n"
16753
"=================================="
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16754
16755
#: en/help_topics/url-special-chars.txt:4
16756
msgid "Bazaar allows locations to be specified in multiple ways, either:"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16757
msgstr "Bazaar allows locations to be specified in multiple ways, either:"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16758
16759
#: en/help_topics/url-special-chars.txt:6
16760
msgid " * Fully qualified URLs"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16761
msgstr " * Fully qualified URLs"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16762
16763
#: en/help_topics/url-special-chars.txt:8
16764
msgid " * File system paths, relative or absolute"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16765
msgstr " * File system paths, relative or absolute"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16766
16767
#: en/help_topics/url-special-chars.txt:10
16768
msgid ""
16769
"Internally bzr treats all locations as URLs. For any file system paths\n"
16770
"that are specified it will automatically determine the appropriate URL\n"
16771
"representation, and escape special characters where necessary."
16772
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16776
16777
#: en/help_topics/url-special-chars.txt:14
16778
msgid ""
16779
"There are a few characters which have special meaning in URLs and need "
16780
"careful\n"
16781
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
16782
"value in URLs. Any non-ASCII characters in a file path will automatically "
16783
"be\n"
16784
"urlencoded when the path is converted to a URL."
16785
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16792
16793
#: en/help_topics/url-special-chars.txt:19
16794
msgid ""
16795
"URLs represent non-ASCII characters in an encoding defined by the server, "
16796
"but\n"
16797
"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
16798
"be\n"
16799
"generous in what it accepts as a URL and to print them in a way that\n"
16800
"will be readable."
16801
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16808
16809
#: en/help_topics/url-special-chars.txt:24
16810
msgid ""
16811
"For example, if you have a directory named '/tmp/%2False' these are all "
16812
"valid\n"
16813
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
16814
"slash)::"
16815
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16820
16821
#: en/help_topics/url-special-chars.txt:27
16822
msgid ""
16823
"  cd /tmp\n"
16824
"  bzr log /tmp/%2False\n"
16825
"  bzr log %2False\n"
16826
"  bzr log file:///tmp/%252False\n"
16827
"  bzr log file://localhost/tmp/%252False\n"
16828
"  bzr log file:%252False"
16829
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16836
16837
#: en/help_topics/url-special-chars.txt:34
16838
msgid "These are valid but do not refer to the same file::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16839
msgstr "These are valid but do not refer to the same file::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16840
16841
#: en/help_topics/url-special-chars.txt:36
16842
msgid ""
16843
"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
16844
"  bzr log %252False (refers to a file called /tmp/%252False)"
16845
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16848
16849
#: en/help_topics/url-special-chars.txt:39
16850
msgid ""
16851
"Comma also has special meaning in URLs, because it denotes `segment "
16852
"parameters`_"
16853
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16854
"Comma also has special meaning in URLs, because it denotes `segment "
16855
"parameters`_"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16856
16857
#: en/help_topics/url-special-chars.txt:41
16858
msgid ""
16859
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
16860
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16861
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16862
16863
#: en/help_topics/url-special-chars.txt:43
16864
msgid ""
16865
"Comma is also special in any file system paths that are specified. To use a "
16866
"literal\n"
16867
"comma in a file system path, specify a URL and URL encode the comma::"
16868
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16872
16873
#: en/help_topics/url-special-chars.txt:46
16874
msgid ""
16875
"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
16876
"\"branch\" set to \"bla\"\n"
16877
"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
16878
"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
16879
"\"branch\" set to \"bla\"\n"
16880
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16886
16887
#: en/help_topics/urlspec.txt:1
16888
msgid "URL Identifiers"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16889
msgstr "URL Identifiers"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16890
16891
#: en/help_topics/urlspec.txt:3
16892
msgid "Supported URL prefixes::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16893
msgstr "Supported URL prefixes::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16894
16895
#: en/help_topics/urlspec.txt:5
16896
msgid ""
16897
"  aftp://             Access using active FTP.\n"
16898
"  bzr://              Fast access using the Bazaar smart server.\n"
16899
"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
16900
"  file://             Access using the standard filesystem (default)\n"
16901
"  ftp://              Access using passive FTP.\n"
16902
"  http://             Read-only access of branches exported on the web.\n"
16903
"  https://            Read-only access of branches exported on the web using "
16904
"SSL.\n"
16905
"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
16906
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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)."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16916
16917
#: en/help_topics/urlspec.txt:14
16918
msgid "Supported modifiers::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16919
msgstr "Supported modifiers::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16920
16921
#: en/help_topics/urlspec.txt:16
16922
msgid "  gio+                Access using any GIO supported protocols."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16923
msgstr "  gio+                Access using any GIO supported protocols."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16924
16925
#: en/help_topics/urlspec.txt:18
16926
msgid "Bazaar supports all of the standard parts within the URL::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16927
msgstr "Bazaar supports all of the standard parts within the URL::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16928
16929
#: en/help_topics/urlspec.txt:20
16930
msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16931
msgstr "  <protocol>://[user[:password]@]host[:port]/[path]"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16932
16933
#: en/help_topics/urlspec.txt:22
16934
msgid "allowing URLs such as::"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16935
msgstr "allowing URLs such as::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16936
16937
#: en/help_topics/urlspec.txt:24
16938
msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16939
msgstr "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16940
16941
#: en/help_topics/urlspec.txt:26
16942
msgid ""
16943
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
16944
"with '~' as meaning that the rest of the path should be interpreted\n"
16945
"relative to the remote user's home directory.  For example if the user\n"
16946
"``remote`` has a  home directory of ``/home/remote`` on the server\n"
16947
"shell.example.com, then::"
16948
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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::"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16954
16955
#: en/help_topics/urlspec.txt:32
16956
msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16957
msgstr "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16958
16959
#: en/help_topics/urlspec.txt:34
16960
msgid "would refer to ``/home/remote/myproject/trunk``."
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16961
msgstr "would refer to ``/home/remote/myproject/trunk``."
6437.2.3 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
16962
16963
#: en/help_topics/urlspec.txt:36
16964
msgid ""
16965
"Many commands that accept URLs also accept location aliases too.\n"
16966
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
16967
msgstr ""
6093.4.155 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
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."
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
17237
17238
#~ msgid ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
17239
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
17240
#~ "http://bazaar.canonical.com/"
17241
#~ msgstr ""
6093.4.92 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
17242
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
6437.2.5 by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update.
17243
#~ "http://bazaar.canonical.com/"