Merge lp:~jr/bzr/i18n-add-pot-file into lp:bzr
- i18n-add-pot-file
- Merge into bzr.dev
Proposed by
Jonathan Riddell
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jelmer Vernooij | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 6102 | ||||
Proposed branch: | lp:~jr/bzr/i18n-add-pot-file | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
5313 lines (+5298/-0) 2 files modified
doc/en/release-notes/bzr-2.5.txt (+2/-0) po/bzr.pot (+5296/-0) |
||||
To merge this branch: | bzr merge lp:~jr/bzr/i18n-add-pot-file | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Review via email: mp+72725@code.launchpad.net |
Commit message
bzr now ships with translations for command help.
Description of the change
Add .pot file
Add translation template.
I have set Launchpad to import translations from trunk.
This doesn't include topic help yet nor is command output translated.
To post a comment you must log in.
Revision history for this message
Jonathan Riddell (jr) wrote : | # |
sent to pqm by email
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'doc/en/release-notes/bzr-2.5.txt' | |||
2 | --- doc/en/release-notes/bzr-2.5.txt 2011-08-23 10:27:54 +0000 | |||
3 | +++ doc/en/release-notes/bzr-2.5.txt 2011-08-24 14:22:26 +0000 | |||
4 | @@ -89,6 +89,8 @@ | |||
5 | 89 | option. A value of 0 disables skipping. Named items passed to add are | 89 | option. A value of 0 disables skipping. Named items passed to add are |
6 | 90 | never skipped. (Shannon Weyrick, #54624) | 90 | never skipped. (Shannon Weyrick, #54624) |
7 | 91 | 91 | ||
8 | 92 | * bzr now ships with translations for command help. (Jonathan | ||
9 | 93 | Riddell, INADA Naoki, #83941) | ||
10 | 92 | 94 | ||
11 | 93 | Improvements | 95 | Improvements |
12 | 94 | ************ | 96 | ************ |
13 | 95 | 97 | ||
14 | === added file 'po/bzr.pot' | |||
15 | --- po/bzr.pot 1970-01-01 00:00:00 +0000 | |||
16 | +++ po/bzr.pot 2011-08-24 14:22:26 +0000 | |||
17 | @@ -0,0 +1,5296 @@ | |||
18 | 1 | # SOME DESCRIPTIVE TITLE. | ||
19 | 2 | # Copyright (C) YEAR Canonical | ||
20 | 3 | # This file is distributed under the same license as the PACKAGE package. | ||
21 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
22 | 5 | # | ||
23 | 6 | #, fuzzy | ||
24 | 7 | msgid "" | ||
25 | 8 | msgstr "" | ||
26 | 9 | "Project-Id-Version: bzr\n" | ||
27 | 10 | "Report-Msgid-Bugs-To: <bazaar@canonical.com>\n" | ||
28 | 11 | "POT-Creation-Date: 2011-08-24 15:14+0100\n" | ||
29 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
30 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
31 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | ||
32 | 15 | "Language: \n" | ||
33 | 16 | "MIME-Version: 1.0\n" | ||
34 | 17 | "Content-Type: text/plain; charset=CHARSET\n" | ||
35 | 18 | "Content-Transfer-Encoding: 8bit\n" | ||
36 | 19 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" | ||
37 | 20 | |||
38 | 21 | #: bzrlib/builtins.py:209 | ||
39 | 22 | msgid "Display status summary." | ||
40 | 23 | msgstr "" | ||
41 | 24 | |||
42 | 25 | #: bzrlib/builtins.py:211 | ||
43 | 26 | msgid "" | ||
44 | 27 | "This reports on versioned and unknown files, reporting them\n" | ||
45 | 28 | "grouped by state. Possible states are:" | ||
46 | 29 | msgstr "" | ||
47 | 30 | |||
48 | 31 | #: bzrlib/builtins.py:214 | ||
49 | 32 | msgid "" | ||
50 | 33 | "added\n" | ||
51 | 34 | " Versioned in the working copy but not in the previous revision." | ||
52 | 35 | msgstr "" | ||
53 | 36 | |||
54 | 37 | #: bzrlib/builtins.py:217 | ||
55 | 38 | msgid "" | ||
56 | 39 | "removed\n" | ||
57 | 40 | " Versioned in the previous revision but removed or deleted\n" | ||
58 | 41 | " in the working copy." | ||
59 | 42 | msgstr "" | ||
60 | 43 | |||
61 | 44 | #: bzrlib/builtins.py:221 | ||
62 | 45 | msgid "" | ||
63 | 46 | "renamed\n" | ||
64 | 47 | " Path of this file changed from the previous revision;\n" | ||
65 | 48 | " the text may also have changed. This includes files whose\n" | ||
66 | 49 | " parent directory was renamed." | ||
67 | 50 | msgstr "" | ||
68 | 51 | |||
69 | 52 | #: bzrlib/builtins.py:226 | ||
70 | 53 | msgid "" | ||
71 | 54 | "modified\n" | ||
72 | 55 | " Text has changed since the previous revision." | ||
73 | 56 | msgstr "" | ||
74 | 57 | |||
75 | 58 | #: bzrlib/builtins.py:229 | ||
76 | 59 | msgid "" | ||
77 | 60 | "kind changed\n" | ||
78 | 61 | " File kind has been changed (e.g. from file to directory)." | ||
79 | 62 | msgstr "" | ||
80 | 63 | |||
81 | 64 | #: bzrlib/builtins.py:232 | ||
82 | 65 | msgid "" | ||
83 | 66 | "unknown\n" | ||
84 | 67 | " Not versioned and not matching an ignore pattern." | ||
85 | 68 | msgstr "" | ||
86 | 69 | |||
87 | 70 | #: bzrlib/builtins.py:235 | ||
88 | 71 | msgid "" | ||
89 | 72 | "Additionally for directories, symlinks and files with a changed\n" | ||
90 | 73 | "executable bit, Bazaar indicates their type using a trailing\n" | ||
91 | 74 | "character: '/', '@' or '*' respectively. These decorations can be\n" | ||
92 | 75 | "disabled using the '--no-classify' option." | ||
93 | 76 | msgstr "" | ||
94 | 77 | |||
95 | 78 | #: bzrlib/builtins.py:240 | ||
96 | 79 | msgid "" | ||
97 | 80 | "To see ignored files use 'bzr ignored'. For details on the\n" | ||
98 | 81 | "changes to file texts, use 'bzr diff'." | ||
99 | 82 | msgstr "" | ||
100 | 83 | |||
101 | 84 | #: bzrlib/builtins.py:243 | ||
102 | 85 | msgid "" | ||
103 | 86 | "Note that --short or -S gives status flags for each item, similar\n" | ||
104 | 87 | "to Subversion's status command. To get output similar to svn -q,\n" | ||
105 | 88 | "use bzr status -SV." | ||
106 | 89 | msgstr "" | ||
107 | 90 | |||
108 | 91 | #: bzrlib/builtins.py:247 | ||
109 | 92 | msgid "" | ||
110 | 93 | "If no arguments are specified, the status of the entire working\n" | ||
111 | 94 | "directory is shown. Otherwise, only the status of the specified\n" | ||
112 | 95 | "files or directories is reported. If a directory is given, status\n" | ||
113 | 96 | "is reported for everything inside that directory." | ||
114 | 97 | msgstr "" | ||
115 | 98 | |||
116 | 99 | #: bzrlib/builtins.py:252 | ||
117 | 100 | msgid "" | ||
118 | 101 | "Before merges are committed, the pending merge tip revisions are\n" | ||
119 | 102 | "shown. To see all pending merge revisions, use the -v option.\n" | ||
120 | 103 | "To skip the display of pending merge information altogether, use\n" | ||
121 | 104 | "the no-pending option or specify a file/directory." | ||
122 | 105 | msgstr "" | ||
123 | 106 | |||
124 | 107 | #: bzrlib/builtins.py:257 | ||
125 | 108 | msgid "" | ||
126 | 109 | "To compare the working directory to a specific revision, pass a\n" | ||
127 | 110 | "single revision to the revision argument." | ||
128 | 111 | msgstr "" | ||
129 | 112 | |||
130 | 113 | #: bzrlib/builtins.py:260 | ||
131 | 114 | msgid "" | ||
132 | 115 | "To see which files have changed in a specific revision, or between\n" | ||
133 | 116 | "two revisions, pass a revision range to the revision argument.\n" | ||
134 | 117 | "This will produce the same results as calling 'bzr diff --summarize'." | ||
135 | 118 | msgstr "" | ||
136 | 119 | |||
137 | 120 | # help of 'short' option of 'status' command | ||
138 | 121 | #: bzrlib/builtins.py:269 | ||
139 | 122 | msgid "Use short status indicators." | ||
140 | 123 | msgstr "" | ||
141 | 124 | |||
142 | 125 | # help of 'versioned' option of 'status' command | ||
143 | 126 | #: bzrlib/builtins.py:271 | ||
144 | 127 | msgid "Only show versioned files." | ||
145 | 128 | msgstr "" | ||
146 | 129 | |||
147 | 130 | # help of 'no-pending' option of 'status' command | ||
148 | 131 | #: bzrlib/builtins.py:273 | ||
149 | 132 | msgid "Don't show pending merges." | ||
150 | 133 | msgstr "" | ||
151 | 134 | |||
152 | 135 | # help of 'no-classify' option of 'status' command | ||
153 | 136 | #: bzrlib/builtins.py:276 | ||
154 | 137 | msgid "Do not mark object type using indicator." | ||
155 | 138 | msgstr "" | ||
156 | 139 | |||
157 | 140 | #: bzrlib/builtins.py:455 | ||
158 | 141 | msgid "Remove the working tree from a given branch/checkout." | ||
159 | 142 | msgstr "" | ||
160 | 143 | |||
161 | 144 | #: bzrlib/builtins.py:457 | ||
162 | 145 | msgid "" | ||
163 | 146 | "Since a lightweight checkout is little more than a working tree\n" | ||
164 | 147 | "this will refuse to run against one." | ||
165 | 148 | msgstr "" | ||
166 | 149 | |||
167 | 150 | #: bzrlib/builtins.py:460 | ||
168 | 151 | msgid "To re-create the working tree, use \"bzr checkout\"." | ||
169 | 152 | msgstr "" | ||
170 | 153 | |||
171 | 154 | # help of 'force' option of 'remove-tree' command | ||
172 | 155 | #: bzrlib/builtins.py:466 | ||
173 | 156 | msgid "Remove the working tree even if it has uncommitted or shelved changes." | ||
174 | 157 | msgstr "" | ||
175 | 158 | |||
176 | 159 | #: bzrlib/builtins.py:551 | ||
177 | 160 | msgid "Show current revision number." | ||
178 | 161 | msgstr "" | ||
179 | 162 | |||
180 | 163 | #: bzrlib/builtins.py:553 | ||
181 | 164 | msgid "This is equal to the number of revisions on this branch." | ||
182 | 165 | msgstr "" | ||
183 | 166 | |||
184 | 167 | # help of 'tree' option of 'revno' command | ||
185 | 168 | #: bzrlib/builtins.py:594 | ||
186 | 169 | msgid "Show revno of working tree" | ||
187 | 170 | msgstr "" | ||
188 | 171 | |||
189 | 172 | #: bzrlib/builtins.py:642 | ||
190 | 173 | msgid "Add specified files or directories." | ||
191 | 174 | msgstr "" | ||
192 | 175 | |||
193 | 176 | #: bzrlib/builtins.py:644 | ||
194 | 177 | msgid "" | ||
195 | 178 | "In non-recursive mode, all the named items are added, regardless\n" | ||
196 | 179 | "of whether they were previously ignored. A warning is given if\n" | ||
197 | 180 | "any of the named files are already versioned." | ||
198 | 181 | msgstr "" | ||
199 | 182 | |||
200 | 183 | #: bzrlib/builtins.py:648 | ||
201 | 184 | msgid "" | ||
202 | 185 | "In recursive mode (the default), files are treated the same way\n" | ||
203 | 186 | "but the behaviour for directories is different. Directories that\n" | ||
204 | 187 | "are already versioned do not give a warning. All directories,\n" | ||
205 | 188 | "whether already versioned or not, are searched for files or\n" | ||
206 | 189 | "subdirectories that are neither versioned or ignored, and these\n" | ||
207 | 190 | "are added. This search proceeds recursively into versioned\n" | ||
208 | 191 | "directories. If no names are given '.' is assumed." | ||
209 | 192 | msgstr "" | ||
210 | 193 | |||
211 | 194 | #: bzrlib/builtins.py:656 | ||
212 | 195 | msgid "" | ||
213 | 196 | "Therefore simply saying 'bzr add' will version all files that\n" | ||
214 | 197 | "are currently unknown." | ||
215 | 198 | msgstr "" | ||
216 | 199 | |||
217 | 200 | #: bzrlib/builtins.py:659 | ||
218 | 201 | msgid "" | ||
219 | 202 | "Adding a file whose parent directory is not versioned will\n" | ||
220 | 203 | "implicitly add the parent, and so on up to the root. This means\n" | ||
221 | 204 | "you should never need to explicitly add a directory, they'll just\n" | ||
222 | 205 | "get added when you add a file in the directory." | ||
223 | 206 | msgstr "" | ||
224 | 207 | |||
225 | 208 | #: bzrlib/builtins.py:664 | ||
226 | 209 | msgid "" | ||
227 | 210 | "--dry-run will show which files would be added, but not actually\n" | ||
228 | 211 | "add them." | ||
229 | 212 | msgstr "" | ||
230 | 213 | |||
231 | 214 | #: bzrlib/builtins.py:667 | ||
232 | 215 | msgid "" | ||
233 | 216 | "--file-ids-from will try to use the file ids from the supplied path.\n" | ||
234 | 217 | "It looks up ids trying to find a matching parent directory with the\n" | ||
235 | 218 | "same filename, and then by pure path. This option is rarely needed\n" | ||
236 | 219 | "but can be useful when adding the same logical file into two\n" | ||
237 | 220 | "branches that will be merged later (without showing the two different\n" | ||
238 | 221 | "adds as a conflict). It is also useful when merging another project\n" | ||
239 | 222 | "into a subdirectory of this one." | ||
240 | 223 | msgstr "" | ||
241 | 224 | |||
242 | 225 | #: bzrlib/builtins.py:675 | ||
243 | 226 | msgid "" | ||
244 | 227 | "Any files matching patterns in the ignore list will not be added\n" | ||
245 | 228 | "unless they are explicitly mentioned." | ||
246 | 229 | msgstr "" | ||
247 | 230 | |||
248 | 231 | #: bzrlib/builtins.py:678 | ||
249 | 232 | msgid "" | ||
250 | 233 | "In recursive mode, files larger than the configuration option \n" | ||
251 | 234 | "add.maximum_file_size will be skipped. Named items are never skipped due\n" | ||
252 | 235 | "to file size." | ||
253 | 236 | msgstr "" | ||
254 | 237 | |||
255 | 238 | # help of 'no-recurse' option of 'add' command | ||
256 | 239 | #: bzrlib/builtins.py:685 | ||
257 | 240 | msgid "Don't recursively add the contents of directories." | ||
258 | 241 | msgstr "" | ||
259 | 242 | |||
260 | 243 | # help of 'file-ids-from' option of 'add' command | ||
261 | 244 | #: bzrlib/builtins.py:691 | ||
262 | 245 | msgid "Lookup file ids from this tree." | ||
263 | 246 | msgstr "" | ||
264 | 247 | |||
265 | 248 | #: bzrlib/builtins.py:731 | ||
266 | 249 | msgid "Create a new versioned directory." | ||
267 | 250 | msgstr "" | ||
268 | 251 | |||
269 | 252 | #: bzrlib/builtins.py:733 | ||
270 | 253 | msgid "This is equivalent to creating the directory and then adding it." | ||
271 | 254 | msgstr "" | ||
272 | 255 | |||
273 | 256 | #: bzrlib/builtins.py:828 | ||
274 | 257 | msgid "Move or rename a file." | ||
275 | 258 | msgstr "" | ||
276 | 259 | |||
277 | 260 | #: bzrlib/builtins.py:830 | ||
278 | 261 | msgid " bzr mv SOURCE... DESTINATION" | ||
279 | 262 | msgstr "" | ||
280 | 263 | |||
281 | 264 | #: bzrlib/builtins.py:832 | ||
282 | 265 | msgid "" | ||
283 | 266 | "If the last argument is a versioned directory, all the other names\n" | ||
284 | 267 | "are moved into it. Otherwise, there must be exactly two arguments\n" | ||
285 | 268 | "and the file is changed to a new name." | ||
286 | 269 | msgstr "" | ||
287 | 270 | |||
288 | 271 | #: bzrlib/builtins.py:836 | ||
289 | 272 | msgid "" | ||
290 | 273 | "If OLDNAME does not exist on the filesystem but is versioned and\n" | ||
291 | 274 | "NEWNAME does exist on the filesystem but is not versioned, mv\n" | ||
292 | 275 | "assumes that the file has been manually moved and only updates\n" | ||
293 | 276 | "its internal inventory to reflect that change.\n" | ||
294 | 277 | "The same is valid when moving many SOURCE files to a DESTINATION." | ||
295 | 278 | msgstr "" | ||
296 | 279 | |||
297 | 280 | #: bzrlib/builtins.py:842 | ||
298 | 281 | msgid "Files cannot be moved between branches." | ||
299 | 282 | msgstr "" | ||
300 | 283 | |||
301 | 284 | # help of 'after' option of 'mv' command | ||
302 | 285 | #: bzrlib/builtins.py:849 | ||
303 | 286 | msgid "" | ||
304 | 287 | "Move only the bzr identifier of the file, because the file has already been " | ||
305 | 288 | "moved." | ||
306 | 289 | msgstr "" | ||
307 | 290 | |||
308 | 291 | # help of 'auto' option of 'mv' command | ||
309 | 292 | #: bzrlib/builtins.py:851 | ||
310 | 293 | msgid "Automatically guess renames." | ||
311 | 294 | msgstr "" | ||
312 | 295 | |||
313 | 296 | # help of 'dry-run' option of 'mv' command | ||
314 | 297 | #: bzrlib/builtins.py:852 | ||
315 | 298 | msgid "Avoid making changes when guessing renames." | ||
316 | 299 | msgstr "" | ||
317 | 300 | |||
318 | 301 | #: bzrlib/builtins.py:964 | ||
319 | 302 | msgid "Turn this branch into a mirror of another branch." | ||
320 | 303 | msgstr "" | ||
321 | 304 | |||
322 | 305 | #: bzrlib/builtins.py:966 | ||
323 | 306 | msgid "" | ||
324 | 307 | "By default, this command only works on branches that have not diverged.\n" | ||
325 | 308 | "Branches are considered diverged if the destination branch's most recent \n" | ||
326 | 309 | "commit is one that has not been merged (directly or indirectly) into the \n" | ||
327 | 310 | "parent." | ||
328 | 311 | msgstr "" | ||
329 | 312 | |||
330 | 313 | #: bzrlib/builtins.py:971 | ||
331 | 314 | msgid "" | ||
332 | 315 | "If branches have diverged, you can use 'bzr merge' to integrate the changes\n" | ||
333 | 316 | "from one into the other. Once one branch has merged, the other should\n" | ||
334 | 317 | "be able to pull it again." | ||
335 | 318 | msgstr "" | ||
336 | 319 | |||
337 | 320 | #: bzrlib/builtins.py:975 | ||
338 | 321 | msgid "" | ||
339 | 322 | "If you want to replace your local changes and just want your branch to\n" | ||
340 | 323 | "match the remote one, use pull --overwrite. This will work even if the two\n" | ||
341 | 324 | "branches have diverged." | ||
342 | 325 | msgstr "" | ||
343 | 326 | |||
344 | 327 | #: bzrlib/builtins.py:979 | ||
345 | 328 | msgid "" | ||
346 | 329 | "If there is no default location set, the first pull will set it (use\n" | ||
347 | 330 | "--no-remember to avoid settting it). After that, you can omit the\n" | ||
348 | 331 | "location to use the default. To change the default, use --remember. The\n" | ||
349 | 332 | "value will only be saved if the remote location can be accessed." | ||
350 | 333 | msgstr "" | ||
351 | 334 | |||
352 | 335 | #: bzrlib/builtins.py:984 | ||
353 | 336 | msgid "" | ||
354 | 337 | "Note: The location can be specified either in the form of a branch,\n" | ||
355 | 338 | "or in the form of a path to a file containing a merge directive generated\n" | ||
356 | 339 | "with bzr send." | ||
357 | 340 | msgstr "" | ||
358 | 341 | |||
359 | 342 | # help of 'verbose' option of 'pull' command | ||
360 | 343 | #: bzrlib/builtins.py:992 | ||
361 | 344 | msgid "Show logs of pulled revisions." | ||
362 | 345 | msgstr "" | ||
363 | 346 | |||
364 | 347 | # help of 'directory' option of 'pull' command | ||
365 | 348 | #: bzrlib/builtins.py:994 | ||
366 | 349 | msgid "" | ||
367 | 350 | "Branch to pull into, rather than the one containing the working directory." | ||
368 | 351 | msgstr "" | ||
369 | 352 | |||
370 | 353 | # help of 'local' option of 'pull' command | ||
371 | 354 | #: bzrlib/builtins.py:997 | ||
372 | 355 | msgid "" | ||
373 | 356 | "Perform a local pull in a bound branch. Local pulls are not applied to the " | ||
374 | 357 | "master branch." | ||
375 | 358 | msgstr "" | ||
376 | 359 | |||
377 | 360 | #: bzrlib/builtins.py:1097 | ||
378 | 361 | msgid "Update a mirror of this branch." | ||
379 | 362 | msgstr "" | ||
380 | 363 | |||
381 | 364 | #: bzrlib/builtins.py:1099 | ||
382 | 365 | msgid "" | ||
383 | 366 | "The target branch will not have its working tree populated because this\n" | ||
384 | 367 | "is both expensive, and is not supported on remote file systems." | ||
385 | 368 | msgstr "" | ||
386 | 369 | |||
387 | 370 | #: bzrlib/builtins.py:1102 | ||
388 | 371 | msgid "" | ||
389 | 372 | "Some smart servers or protocols *may* put the working tree in place in\n" | ||
390 | 373 | "the future." | ||
391 | 374 | msgstr "" | ||
392 | 375 | |||
393 | 376 | #: bzrlib/builtins.py:1105 | ||
394 | 377 | msgid "" | ||
395 | 378 | "This command only works on branches that have not diverged. Branches are\n" | ||
396 | 379 | "considered diverged if the destination branch's most recent commit is one\n" | ||
397 | 380 | "that has not been merged (directly or indirectly) by the source branch." | ||
398 | 381 | msgstr "" | ||
399 | 382 | |||
400 | 383 | #: bzrlib/builtins.py:1109 | ||
401 | 384 | msgid "" | ||
402 | 385 | "If branches have diverged, you can use 'bzr push --overwrite' to replace\n" | ||
403 | 386 | "the other branch completely, discarding its unmerged changes." | ||
404 | 387 | msgstr "" | ||
405 | 388 | |||
406 | 389 | #: bzrlib/builtins.py:1112 | ||
407 | 390 | msgid "" | ||
408 | 391 | "If you want to ensure you have the different changes in the other branch,\n" | ||
409 | 392 | "do a merge (see bzr help merge) from the other branch, and commit that.\n" | ||
410 | 393 | "After that you will be able to do a push without '--overwrite'." | ||
411 | 394 | msgstr "" | ||
412 | 395 | |||
413 | 396 | #: bzrlib/builtins.py:1116 | ||
414 | 397 | msgid "" | ||
415 | 398 | "If there is no default push location set, the first push will set it (use\n" | ||
416 | 399 | "--no-remember to avoid settting it). After that, you can omit the\n" | ||
417 | 400 | "location to use the default. To change the default, use --remember. The\n" | ||
418 | 401 | "value will only be saved if the remote location can be accessed." | ||
419 | 402 | msgstr "" | ||
420 | 403 | |||
421 | 404 | # help of 'directory' option of 'push' command | ||
422 | 405 | #: bzrlib/builtins.py:1128 | ||
423 | 406 | msgid "" | ||
424 | 407 | "Branch to push from, rather than the one containing the working directory." | ||
425 | 408 | msgstr "" | ||
426 | 409 | |||
427 | 410 | # help of 'use-existing-dir' option of 'push' command | ||
428 | 411 | #: bzrlib/builtins.py:1131 | ||
429 | 412 | msgid "" | ||
430 | 413 | "By default push will fail if the target directory exists, but does not " | ||
431 | 414 | "already have a control directory. This flag will allow push to proceed." | ||
432 | 415 | msgstr "" | ||
433 | 416 | |||
434 | 417 | # help of 'stacked' option of 'push' command | ||
435 | 418 | #: bzrlib/builtins.py:1136 | ||
436 | 419 | msgid "" | ||
437 | 420 | "Create a stacked branch that references the public location of the parent " | ||
438 | 421 | "branch." | ||
439 | 422 | msgstr "" | ||
440 | 423 | |||
441 | 424 | # help of 'stacked-on' option of 'push' command | ||
442 | 425 | #: bzrlib/builtins.py:1139 | ||
443 | 426 | msgid "" | ||
444 | 427 | "Create a stacked branch that refers to another branch for the commit " | ||
445 | 428 | "history. Only the work not present in the referenced branch is included in " | ||
446 | 429 | "the branch created." | ||
447 | 430 | msgstr "" | ||
448 | 431 | |||
449 | 432 | # help of 'strict' option of 'push' command | ||
450 | 433 | #: bzrlib/builtins.py:1144 | ||
451 | 434 | msgid "" | ||
452 | 435 | "Refuse to push if there are uncommitted changes in the working tree, --no-" | ||
453 | 436 | "strict disables the check." | ||
454 | 437 | msgstr "" | ||
455 | 438 | |||
456 | 439 | # help of 'no-tree' option of 'push' command | ||
457 | 440 | #: bzrlib/builtins.py:1147 | ||
458 | 441 | msgid "Don't populate the working tree, even for protocols that support it." | ||
459 | 442 | msgstr "" | ||
460 | 443 | |||
461 | 444 | #: bzrlib/builtins.py:1212 | ||
462 | 445 | msgid "Create a new branch that is a copy of an existing branch." | ||
463 | 446 | msgstr "" | ||
464 | 447 | |||
465 | 448 | #: bzrlib/builtins.py:1214 | ||
466 | 449 | msgid "" | ||
467 | 450 | "If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n" | ||
468 | 451 | "be used. In other words, \"branch ../foo/bar\" will attempt to create ./" | ||
469 | 452 | "bar.\n" | ||
470 | 453 | "If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n" | ||
471 | 454 | "is derived from the FROM_LOCATION by stripping a leading scheme or drive\n" | ||
472 | 455 | "identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n" | ||
473 | 456 | "create ./foo-bar." | ||
474 | 457 | msgstr "" | ||
475 | 458 | |||
476 | 459 | #: bzrlib/builtins.py:1221 | ||
477 | 460 | msgid "" | ||
478 | 461 | "To retrieve the branch as of a particular revision, supply the --revision\n" | ||
479 | 462 | "parameter, as in \"branch foo/bar -r 5\"." | ||
480 | 463 | msgstr "" | ||
481 | 464 | |||
482 | 465 | #: bzrlib/builtins.py:1224 | ||
483 | 466 | msgid "The synonyms 'clone' and 'get' for this command are deprecated." | ||
484 | 467 | msgstr "" | ||
485 | 468 | |||
486 | 469 | # help of 'no-tree' option of 'branch' command | ||
487 | 470 | #: bzrlib/builtins.py:1234 | ||
488 | 471 | msgid "Create a branch without a working-tree." | ||
489 | 472 | msgstr "" | ||
490 | 473 | |||
491 | 474 | # help of 'switch' option of 'branch' command | ||
492 | 475 | #: bzrlib/builtins.py:1236 | ||
493 | 476 | msgid "Switch the checkout in the current directory to the new branch." | ||
494 | 477 | msgstr "" | ||
495 | 478 | |||
496 | 479 | # help of 'stacked' option of 'branch' command | ||
497 | 480 | #: bzrlib/builtins.py:1239 | ||
498 | 481 | msgid "" | ||
499 | 482 | "Create a stacked branch referring to the source branch. The new branch will " | ||
500 | 483 | "depend on the availability of the source branch for all operations." | ||
501 | 484 | msgstr "" | ||
502 | 485 | |||
503 | 486 | # help of 'standalone' option of 'branch' command | ||
504 | 487 | #: bzrlib/builtins.py:1243 | ||
505 | 488 | msgid "Do not use a shared repository, even if available." | ||
506 | 489 | msgstr "" | ||
507 | 490 | |||
508 | 491 | # help of 'use-existing-dir' option of 'branch' command | ||
509 | 492 | #: bzrlib/builtins.py:1245 | ||
510 | 493 | msgid "" | ||
511 | 494 | "By default branch will fail if the target directory exists, but does not " | ||
512 | 495 | "already have a control directory. This flag will allow branch to proceed." | ||
513 | 496 | msgstr "" | ||
514 | 497 | |||
515 | 498 | # help of 'bind' option of 'branch' command | ||
516 | 499 | #: bzrlib/builtins.py:1250 | ||
517 | 500 | msgid "Bind new branch to from location." | ||
518 | 501 | msgstr "" | ||
519 | 502 | |||
520 | 503 | #: bzrlib/builtins.py:1342 | ||
521 | 504 | msgid "List the branches available at the current location." | ||
522 | 505 | msgstr "" | ||
523 | 506 | |||
524 | 507 | #: bzrlib/builtins.py:1344 | ||
525 | 508 | msgid "" | ||
526 | 509 | "This command will print the names of all the branches at the current " | ||
527 | 510 | "location." | ||
528 | 511 | msgstr "" | ||
529 | 512 | |||
530 | 513 | #: bzrlib/builtins.py:1359 | ||
531 | 514 | msgid "Create a new checkout of an existing branch." | ||
532 | 515 | msgstr "" | ||
533 | 516 | |||
534 | 517 | #: bzrlib/builtins.py:1361 | ||
535 | 518 | msgid "" | ||
536 | 519 | "If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree " | ||
537 | 520 | "for\n" | ||
538 | 521 | "the branch found in '.'. This is useful if you have removed the working " | ||
539 | 522 | "tree\n" | ||
540 | 523 | "or if it was never created - i.e. if you pushed the branch to its current\n" | ||
541 | 524 | "location using SFTP." | ||
542 | 525 | msgstr "" | ||
543 | 526 | |||
544 | 527 | #: bzrlib/builtins.py:1366 | ||
545 | 528 | msgid "" | ||
546 | 529 | "If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION " | ||
547 | 530 | "will\n" | ||
548 | 531 | "be used. In other words, \"checkout ../foo/bar\" will attempt to create ./" | ||
549 | 532 | "bar.\n" | ||
550 | 533 | "If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n" | ||
551 | 534 | "is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n" | ||
552 | 535 | "identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n" | ||
553 | 536 | "create ./foo-bar." | ||
554 | 537 | msgstr "" | ||
555 | 538 | |||
556 | 539 | #: bzrlib/builtins.py:1373 | ||
557 | 540 | msgid "" | ||
558 | 541 | "To retrieve the branch as of a particular revision, supply the --revision\n" | ||
559 | 542 | "parameter, as in \"checkout foo/bar -r 5\". Note that this will be " | ||
560 | 543 | "immediately\n" | ||
561 | 544 | "out of date [so you cannot commit] but it may be useful (i.e. to examine " | ||
562 | 545 | "old\n" | ||
563 | 546 | "code.)" | ||
564 | 547 | msgstr "" | ||
565 | 548 | |||
566 | 549 | # help of 'lightweight' option of 'checkout' command | ||
567 | 550 | #: bzrlib/builtins.py:1383 | ||
568 | 551 | msgid "" | ||
569 | 552 | "Perform a lightweight checkout. Lightweight checkouts depend on access to " | ||
570 | 553 | "the branch for every operation. Normal checkouts can perform common " | ||
571 | 554 | "operations like diff and status without such access, and also support local " | ||
572 | 555 | "commits." | ||
573 | 556 | msgstr "" | ||
574 | 557 | |||
575 | 558 | # help of 'files-from' option of 'branch' command | ||
576 | 559 | #: bzrlib/builtins.py:1390 | ||
577 | 560 | msgid "Get file contents from this tree." | ||
578 | 561 | msgstr "" | ||
579 | 562 | |||
580 | 563 | # help of 'hardlink' option of 'branch' command | ||
581 | 564 | #: bzrlib/builtins.py:1392 | ||
582 | 565 | msgid "Hard-link working tree files where possible." | ||
583 | 566 | msgstr "" | ||
584 | 567 | |||
585 | 568 | #: bzrlib/builtins.py:1433 | ||
586 | 569 | msgid "" | ||
587 | 570 | "Show list of renamed files.\n" | ||
588 | 571 | " " | ||
589 | 572 | msgstr "" | ||
590 | 573 | |||
591 | 574 | #: bzrlib/builtins.py:1463 | ||
592 | 575 | msgid "Update a tree to have the latest code committed to its branch." | ||
593 | 576 | msgstr "" | ||
594 | 577 | |||
595 | 578 | #: bzrlib/builtins.py:1465 | ||
596 | 579 | msgid "" | ||
597 | 580 | "This will perform a merge into the working tree, and may generate\n" | ||
598 | 581 | "conflicts. If you have any local changes, you will still\n" | ||
599 | 582 | "need to commit them after the update for the update to be complete." | ||
600 | 583 | msgstr "" | ||
601 | 584 | |||
602 | 585 | #: bzrlib/builtins.py:1469 | ||
603 | 586 | msgid "" | ||
604 | 587 | "If you want to discard your local changes, you can just do a\n" | ||
605 | 588 | "'bzr revert' instead of 'bzr commit' after the update." | ||
606 | 589 | msgstr "" | ||
607 | 590 | |||
608 | 591 | #: bzrlib/builtins.py:1472 | ||
609 | 592 | msgid "" | ||
610 | 593 | "If you want to restore a file that has been removed locally, use\n" | ||
611 | 594 | "'bzr revert' instead of 'bzr update'." | ||
612 | 595 | msgstr "" | ||
613 | 596 | |||
614 | 597 | #: bzrlib/builtins.py:1475 | ||
615 | 598 | msgid "" | ||
616 | 599 | "If the tree's branch is bound to a master branch, it will also update\n" | ||
617 | 600 | "the branch from the master." | ||
618 | 601 | msgstr "" | ||
619 | 602 | |||
620 | 603 | #: bzrlib/builtins.py:1556 | ||
621 | 604 | msgid "Show information about a working tree, branch or repository." | ||
622 | 605 | msgstr "" | ||
623 | 606 | |||
624 | 607 | #: bzrlib/builtins.py:1558 | ||
625 | 608 | msgid "" | ||
626 | 609 | "This command will show all known locations and formats associated to the\n" | ||
627 | 610 | "tree, branch or repository." | ||
628 | 611 | msgstr "" | ||
629 | 612 | |||
630 | 613 | #: bzrlib/builtins.py:1561 | ||
631 | 614 | msgid "" | ||
632 | 615 | "In verbose mode, statistical information is included with each report.\n" | ||
633 | 616 | "To see extended statistic information, use a verbosity level of 2 or\n" | ||
634 | 617 | "higher by specifying the verbose option multiple times, e.g. -vv." | ||
635 | 618 | msgstr "" | ||
636 | 619 | |||
637 | 620 | #: bzrlib/builtins.py:1565 | ||
638 | 621 | msgid "Branches and working trees will also report any missing revisions." | ||
639 | 622 | msgstr "" | ||
640 | 623 | |||
641 | 624 | #: bzrlib/builtins.py:1569 | ||
642 | 625 | msgid " Display information on the format and related locations:" | ||
643 | 626 | msgstr "" | ||
644 | 627 | |||
645 | 628 | #: bzrlib/builtins.py:1571 | ||
646 | 629 | msgid " bzr info" | ||
647 | 630 | msgstr "" | ||
648 | 631 | |||
649 | 632 | #: bzrlib/builtins.py:1573 | ||
650 | 633 | msgid "" | ||
651 | 634 | " Display the above together with extended format information and\n" | ||
652 | 635 | " basic statistics (like the number of files in the working tree and\n" | ||
653 | 636 | " number of revisions in the branch and repository):" | ||
654 | 637 | msgstr "" | ||
655 | 638 | |||
656 | 639 | #: bzrlib/builtins.py:1577 | ||
657 | 640 | msgid " bzr info -v" | ||
658 | 641 | msgstr "" | ||
659 | 642 | |||
660 | 643 | #: bzrlib/builtins.py:1579 | ||
661 | 644 | msgid " Display the above together with number of committers to the branch:" | ||
662 | 645 | msgstr "" | ||
663 | 646 | |||
664 | 647 | #: bzrlib/builtins.py:1581 | ||
665 | 648 | msgid " bzr info -vv" | ||
666 | 649 | msgstr "" | ||
667 | 650 | |||
668 | 651 | #: bzrlib/builtins.py:1600 | ||
669 | 652 | msgid "Remove files or directories." | ||
670 | 653 | msgstr "" | ||
671 | 654 | |||
672 | 655 | #: bzrlib/builtins.py:1602 | ||
673 | 656 | msgid "" | ||
674 | 657 | "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n" | ||
675 | 658 | "delete them if they can easily be recovered using revert otherwise they\n" | ||
676 | 659 | "will be backed up (adding an extention of the form .~#~). If no options or\n" | ||
677 | 660 | "parameters are given Bazaar will scan for files that are being tracked by\n" | ||
678 | 661 | "Bazaar but missing in your tree and stop tracking them for you." | ||
679 | 662 | msgstr "" | ||
680 | 663 | |||
681 | 664 | # help of 'new' option of 'remove' command | ||
682 | 665 | #: bzrlib/builtins.py:1610 | ||
683 | 666 | msgid "Only remove files that have never been committed." | ||
684 | 667 | msgstr "" | ||
685 | 668 | |||
686 | 669 | # help of 'file-deletion-strategy' option of 'remove' command | ||
687 | 670 | #: bzrlib/builtins.py:1612 | ||
688 | 671 | msgid "The file deletion mode to be used." | ||
689 | 672 | msgstr "" | ||
690 | 673 | |||
691 | 674 | # title of 'file-deletion-strategy' option of 'remove' command | ||
692 | 675 | #: bzrlib/builtins.py:1613 | ||
693 | 676 | msgid "Deletion Strategy" | ||
694 | 677 | msgstr "" | ||
695 | 678 | |||
696 | 679 | #: bzrlib/builtins.py:1704 | ||
697 | 680 | msgid "Reconcile bzr metadata in a branch." | ||
698 | 681 | msgstr "" | ||
699 | 682 | |||
700 | 683 | #: bzrlib/builtins.py:1706 | ||
701 | 684 | msgid "" | ||
702 | 685 | "This can correct data mismatches that may have been caused by\n" | ||
703 | 686 | "previous ghost operations or bzr upgrades. You should only\n" | ||
704 | 687 | "need to run this command if 'bzr check' or a bzr developer\n" | ||
705 | 688 | "advises you to run it." | ||
706 | 689 | msgstr "" | ||
707 | 690 | |||
708 | 691 | #: bzrlib/builtins.py:1711 | ||
709 | 692 | msgid "" | ||
710 | 693 | "If a second branch is provided, cross-branch reconciliation is\n" | ||
711 | 694 | "also attempted, which will check that data like the tree root\n" | ||
712 | 695 | "id which was not present in very early bzr versions is represented\n" | ||
713 | 696 | "correctly in both branches." | ||
714 | 697 | msgstr "" | ||
715 | 698 | |||
716 | 699 | #: bzrlib/builtins.py:1716 | ||
717 | 700 | msgid "" | ||
718 | 701 | "At the same time it is run it may recompress data resulting in\n" | ||
719 | 702 | "a potential saving in disk space or performance gain." | ||
720 | 703 | msgstr "" | ||
721 | 704 | |||
722 | 705 | #: bzrlib/builtins.py:1719 | ||
723 | 706 | msgid "The branch *MUST* be on a listable system such as local disk or sftp." | ||
724 | 707 | msgstr "" | ||
725 | 708 | |||
726 | 709 | #: bzrlib/builtins.py:1783 | ||
727 | 710 | msgid "Make a directory into a versioned branch." | ||
728 | 711 | msgstr "" | ||
729 | 712 | |||
730 | 713 | #: bzrlib/builtins.py:1785 | ||
731 | 714 | msgid "" | ||
732 | 715 | "Use this to create an empty branch, or before importing an\n" | ||
733 | 716 | "existing project." | ||
734 | 717 | msgstr "" | ||
735 | 718 | |||
736 | 719 | #: bzrlib/builtins.py:1788 | ||
737 | 720 | msgid "" | ||
738 | 721 | "If there is a repository in a parent directory of the location, then\n" | ||
739 | 722 | "the history of the branch will be stored in the repository. Otherwise\n" | ||
740 | 723 | "init creates a standalone branch which carries its own history\n" | ||
741 | 724 | "in the .bzr directory." | ||
742 | 725 | msgstr "" | ||
743 | 726 | |||
744 | 727 | #: bzrlib/builtins.py:1793 | ||
745 | 728 | msgid "" | ||
746 | 729 | "If there is already a branch at the location but it has no working tree,\n" | ||
747 | 730 | "the tree can be populated with 'bzr checkout'." | ||
748 | 731 | msgstr "" | ||
749 | 732 | |||
750 | 733 | #: bzrlib/builtins.py:1796 | ||
751 | 734 | msgid "Recipe for importing a tree of files::" | ||
752 | 735 | msgstr "" | ||
753 | 736 | |||
754 | 737 | #: bzrlib/builtins.py:1798 | ||
755 | 738 | msgid "" | ||
756 | 739 | " cd ~/project\n" | ||
757 | 740 | " bzr init\n" | ||
758 | 741 | " bzr add .\n" | ||
759 | 742 | " bzr status\n" | ||
760 | 743 | " bzr commit -m \"imported project\"" | ||
761 | 744 | msgstr "" | ||
762 | 745 | |||
763 | 746 | # help of 'create-prefix' option of 'init' command | ||
764 | 747 | #: bzrlib/builtins.py:1809 | ||
765 | 748 | msgid "Create the path leading up to the branch if it does not already exist." | ||
766 | 749 | msgstr "" | ||
767 | 750 | |||
768 | 751 | # help of 'format' option of 'init' command | ||
769 | 752 | #: bzrlib/builtins.py:1812 | ||
770 | 753 | msgid "Specify a format for this branch. See \"help formats\"." | ||
771 | 754 | msgstr "" | ||
772 | 755 | |||
773 | 756 | # help of 'append-revisions-only' option of 'init' command | ||
774 | 757 | #: bzrlib/builtins.py:1820 | ||
775 | 758 | msgid "Never change revnos or the existing log. Append revisions to it only." | ||
776 | 759 | msgstr "" | ||
777 | 760 | |||
778 | 761 | # help of 'no-tree' option of 'init' command | ||
779 | 762 | #: bzrlib/builtins.py:1823 | ||
780 | 763 | msgid "Create a branch without a working tree." | ||
781 | 764 | msgstr "" | ||
782 | 765 | |||
783 | 766 | #: bzrlib/builtins.py:1900 | ||
784 | 767 | msgid "Create a shared repository for branches to share storage space." | ||
785 | 768 | msgstr "" | ||
786 | 769 | |||
787 | 770 | #: bzrlib/builtins.py:1902 | ||
788 | 771 | msgid "" | ||
789 | 772 | "New branches created under the repository directory will store their\n" | ||
790 | 773 | "revisions in the repository, not in the branch directory. For branches\n" | ||
791 | 774 | "with shared history, this reduces the amount of storage needed and \n" | ||
792 | 775 | "speeds up the creation of new branches." | ||
793 | 776 | msgstr "" | ||
794 | 777 | |||
795 | 778 | #: bzrlib/builtins.py:1907 | ||
796 | 779 | msgid "" | ||
797 | 780 | "If the --no-trees option is given then the branches in the repository\n" | ||
798 | 781 | "will not have working trees by default. They will still exist as \n" | ||
799 | 782 | "directories on disk, but they will not have separate copies of the \n" | ||
800 | 783 | "files at a certain revision. This can be useful for repositories that\n" | ||
801 | 784 | "store branches which are interacted with through checkouts or remote\n" | ||
802 | 785 | "branches, such as on a server." | ||
803 | 786 | msgstr "" | ||
804 | 787 | |||
805 | 788 | #: bzrlib/builtins.py:1914 | ||
806 | 789 | msgid "" | ||
807 | 790 | ":Examples:\n" | ||
808 | 791 | " Create a shared repository holding just branches::" | ||
809 | 792 | msgstr "" | ||
810 | 793 | |||
811 | 794 | #: bzrlib/builtins.py:1917 | ||
812 | 795 | msgid "" | ||
813 | 796 | " bzr init-repo --no-trees repo\n" | ||
814 | 797 | " bzr init repo/trunk" | ||
815 | 798 | msgstr "" | ||
816 | 799 | |||
817 | 800 | #: bzrlib/builtins.py:1920 | ||
818 | 801 | msgid " Make a lightweight checkout elsewhere::" | ||
819 | 802 | msgstr "" | ||
820 | 803 | |||
821 | 804 | #: bzrlib/builtins.py:1922 | ||
822 | 805 | msgid "" | ||
823 | 806 | " bzr checkout --lightweight repo/trunk trunk-checkout\n" | ||
824 | 807 | " cd trunk-checkout\n" | ||
825 | 808 | " (add files here)" | ||
826 | 809 | msgstr "" | ||
827 | 810 | |||
828 | 811 | # help of 'format' option of 'init-repository' command | ||
829 | 812 | #: bzrlib/builtins.py:1930 | ||
830 | 813 | msgid "" | ||
831 | 814 | "Specify a format for this repository. See \"bzr help formats\" for details." | ||
832 | 815 | msgstr "" | ||
833 | 816 | |||
834 | 817 | # title of 'format' option of 'init-repository' command | ||
835 | 818 | #: bzrlib/builtins.py:1934 | ||
836 | 819 | msgid "Repository format" | ||
837 | 820 | msgstr "" | ||
838 | 821 | |||
839 | 822 | # help of 'no-trees' option of 'init-repository' command | ||
840 | 823 | #: bzrlib/builtins.py:1936 | ||
841 | 824 | msgid "Branches in the repository will default to not having a working tree." | ||
842 | 825 | msgstr "" | ||
843 | 826 | |||
844 | 827 | #: bzrlib/builtins.py:1960 | ||
845 | 828 | msgid "Show differences in the working tree, between revisions or branches." | ||
846 | 829 | msgstr "" | ||
847 | 830 | |||
848 | 831 | #: bzrlib/builtins.py:1962 | ||
849 | 832 | msgid "" | ||
850 | 833 | "If no arguments are given, all changes for the current tree are listed.\n" | ||
851 | 834 | "If files are given, only the changes in those files are listed.\n" | ||
852 | 835 | "Remote and multiple branches can be compared by using the --old and\n" | ||
853 | 836 | "--new options. If not provided, the default for both is derived from\n" | ||
854 | 837 | "the first argument, if any, or the current tree if no arguments are\n" | ||
855 | 838 | "given." | ||
856 | 839 | msgstr "" | ||
857 | 840 | |||
858 | 841 | #: bzrlib/builtins.py:1969 | ||
859 | 842 | msgid "" | ||
860 | 843 | "\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n" | ||
861 | 844 | "produces patches suitable for \"patch -p1\"." | ||
862 | 845 | msgstr "" | ||
863 | 846 | |||
864 | 847 | #: bzrlib/builtins.py:1972 | ||
865 | 848 | msgid "" | ||
866 | 849 | "Note that when using the -r argument with a range of revisions, the\n" | ||
867 | 850 | "differences are computed between the two specified revisions. That\n" | ||
868 | 851 | "is, the command does not show the changes introduced by the first \n" | ||
869 | 852 | "revision in the range. This differs from the interpretation of \n" | ||
870 | 853 | "revision ranges used by \"bzr log\" which includes the first revision\n" | ||
871 | 854 | "in the range." | ||
872 | 855 | msgstr "" | ||
873 | 856 | |||
874 | 857 | #: bzrlib/builtins.py:1979 | ||
875 | 858 | msgid "" | ||
876 | 859 | ":Exit values:\n" | ||
877 | 860 | " 1 - changed\n" | ||
878 | 861 | " 2 - unrepresentable changes\n" | ||
879 | 862 | " 3 - error\n" | ||
880 | 863 | " 0 - no change" | ||
881 | 864 | msgstr "" | ||
882 | 865 | |||
883 | 866 | #: bzrlib/builtins.py:1985 | ||
884 | 867 | msgid "" | ||
885 | 868 | ":Examples:\n" | ||
886 | 869 | " Shows the difference in the working tree versus the last commit::" | ||
887 | 870 | msgstr "" | ||
888 | 871 | |||
889 | 872 | #: bzrlib/builtins.py:1988 | ||
890 | 873 | msgid " bzr diff" | ||
891 | 874 | msgstr "" | ||
892 | 875 | |||
893 | 876 | #: bzrlib/builtins.py:1990 | ||
894 | 877 | msgid " Difference between the working tree and revision 1::" | ||
895 | 878 | msgstr "" | ||
896 | 879 | |||
897 | 880 | #: bzrlib/builtins.py:1992 | ||
898 | 881 | msgid " bzr diff -r1" | ||
899 | 882 | msgstr "" | ||
900 | 883 | |||
901 | 884 | #: bzrlib/builtins.py:1994 | ||
902 | 885 | msgid " Difference between revision 3 and revision 1::" | ||
903 | 886 | msgstr "" | ||
904 | 887 | |||
905 | 888 | #: bzrlib/builtins.py:1996 | ||
906 | 889 | msgid " bzr diff -r1..3" | ||
907 | 890 | msgstr "" | ||
908 | 891 | |||
909 | 892 | #: bzrlib/builtins.py:1998 | ||
910 | 893 | msgid " Difference between revision 3 and revision 1 for branch xxx::" | ||
911 | 894 | msgstr "" | ||
912 | 895 | |||
913 | 896 | #: bzrlib/builtins.py:2000 | ||
914 | 897 | msgid " bzr diff -r1..3 xxx" | ||
915 | 898 | msgstr "" | ||
916 | 899 | |||
917 | 900 | #: bzrlib/builtins.py:2002 | ||
918 | 901 | msgid " The changes introduced by revision 2 (equivalent to -r1..2)::" | ||
919 | 902 | msgstr "" | ||
920 | 903 | |||
921 | 904 | #: bzrlib/builtins.py:2004 | ||
922 | 905 | msgid " bzr diff -c2" | ||
923 | 906 | msgstr "" | ||
924 | 907 | |||
925 | 908 | #: bzrlib/builtins.py:2006 | ||
926 | 909 | msgid "" | ||
927 | 910 | " To see the changes introduced by revision X::\n" | ||
928 | 911 | " \n" | ||
929 | 912 | " bzr diff -cX" | ||
930 | 913 | msgstr "" | ||
931 | 914 | |||
932 | 915 | #: bzrlib/builtins.py:2010 | ||
933 | 916 | msgid "" | ||
934 | 917 | " Note that in the case of a merge, the -c option shows the changes\n" | ||
935 | 918 | " compared to the left hand parent. To see the changes against\n" | ||
936 | 919 | " another parent, use::" | ||
937 | 920 | msgstr "" | ||
938 | 921 | |||
939 | 922 | #: bzrlib/builtins.py:2014 | ||
940 | 923 | msgid " bzr diff -r<chosen_parent>..X" | ||
941 | 924 | msgstr "" | ||
942 | 925 | |||
943 | 926 | #: bzrlib/builtins.py:2016 | ||
944 | 927 | msgid "" | ||
945 | 928 | " The changes between the current revision and the previous revision\n" | ||
946 | 929 | " (equivalent to -c-1 and -r-2..-1)" | ||
947 | 930 | msgstr "" | ||
948 | 931 | |||
949 | 932 | #: bzrlib/builtins.py:2019 | ||
950 | 933 | msgid " bzr diff -r-2.." | ||
951 | 934 | msgstr "" | ||
952 | 935 | |||
953 | 936 | #: bzrlib/builtins.py:2021 | ||
954 | 937 | msgid " Show just the differences for file NEWS::" | ||
955 | 938 | msgstr "" | ||
956 | 939 | |||
957 | 940 | #: bzrlib/builtins.py:2023 | ||
958 | 941 | msgid " bzr diff NEWS" | ||
959 | 942 | msgstr "" | ||
960 | 943 | |||
961 | 944 | #: bzrlib/builtins.py:2025 | ||
962 | 945 | msgid " Show the differences in working tree xxx for file NEWS::" | ||
963 | 946 | msgstr "" | ||
964 | 947 | |||
965 | 948 | #: bzrlib/builtins.py:2027 | ||
966 | 949 | msgid " bzr diff xxx/NEWS" | ||
967 | 950 | msgstr "" | ||
968 | 951 | |||
969 | 952 | #: bzrlib/builtins.py:2029 | ||
970 | 953 | msgid " Show the differences from branch xxx to this working tree:" | ||
971 | 954 | msgstr "" | ||
972 | 955 | |||
973 | 956 | #: bzrlib/builtins.py:2031 | ||
974 | 957 | msgid " bzr diff --old xxx" | ||
975 | 958 | msgstr "" | ||
976 | 959 | |||
977 | 960 | #: bzrlib/builtins.py:2033 | ||
978 | 961 | msgid " Show the differences between two branches for file NEWS::" | ||
979 | 962 | msgstr "" | ||
980 | 963 | |||
981 | 964 | #: bzrlib/builtins.py:2035 | ||
982 | 965 | msgid " bzr diff --old xxx --new yyy NEWS" | ||
983 | 966 | msgstr "" | ||
984 | 967 | |||
985 | 968 | #: bzrlib/builtins.py:2037 | ||
986 | 969 | msgid " Same as 'bzr diff' but prefix paths with old/ and new/::" | ||
987 | 970 | msgstr "" | ||
988 | 971 | |||
989 | 972 | #: bzrlib/builtins.py:2039 | ||
990 | 973 | msgid "" | ||
991 | 974 | " bzr diff --prefix old/:new/\n" | ||
992 | 975 | " \n" | ||
993 | 976 | " Show the differences using a custom diff program with options::\n" | ||
994 | 977 | " \n" | ||
995 | 978 | " bzr diff --using /usr/bin/diff --diff-options -wu" | ||
996 | 979 | msgstr "" | ||
997 | 980 | |||
998 | 981 | # help of 'diff-options' option of 'diff' command | ||
999 | 982 | #: bzrlib/builtins.py:2049 | ||
1000 | 983 | msgid "Pass these options to the external diff program." | ||
1001 | 984 | msgstr "" | ||
1002 | 985 | |||
1003 | 986 | # help of 'prefix' option of 'diff' command | ||
1004 | 987 | #: bzrlib/builtins.py:2052 | ||
1005 | 988 | msgid "" | ||
1006 | 989 | "Set prefixes added to old and new filenames, as two values separated by a " | ||
1007 | 990 | "colon. (eg \"old/:new/\")." | ||
1008 | 991 | msgstr "" | ||
1009 | 992 | |||
1010 | 993 | # help of 'old' option of 'diff' command | ||
1011 | 994 | #: bzrlib/builtins.py:2055 | ||
1012 | 995 | msgid "Branch/tree to compare from." | ||
1013 | 996 | msgstr "" | ||
1014 | 997 | |||
1015 | 998 | # help of 'new' option of 'diff' command | ||
1016 | 999 | #: bzrlib/builtins.py:2059 | ||
1017 | 1000 | msgid "Branch/tree to compare to." | ||
1018 | 1001 | msgstr "" | ||
1019 | 1002 | |||
1020 | 1003 | # help of 'using' option of 'diff' command | ||
1021 | 1004 | #: bzrlib/builtins.py:2065 | ||
1022 | 1005 | msgid "Use this command to compare files." | ||
1023 | 1006 | msgstr "" | ||
1024 | 1007 | |||
1025 | 1008 | # help of 'format' option of 'diff' command | ||
1026 | 1009 | #: bzrlib/builtins.py:2070 | ||
1027 | 1010 | msgid "Diff format to use." | ||
1028 | 1011 | msgstr "" | ||
1029 | 1012 | |||
1030 | 1013 | # title of 'format' option of 'diff' command | ||
1031 | 1014 | #: bzrlib/builtins.py:2072 | ||
1032 | 1015 | msgid "Diff format" | ||
1033 | 1016 | msgstr "" | ||
1034 | 1017 | |||
1035 | 1018 | #: bzrlib/builtins.py:2122 | ||
1036 | 1019 | msgid "" | ||
1037 | 1020 | "List files deleted in the working tree.\n" | ||
1038 | 1021 | " " | ||
1039 | 1022 | msgstr "" | ||
1040 | 1023 | |||
1041 | 1024 | #: bzrlib/builtins.py:2200 | ||
1042 | 1025 | msgid "Show the tree root directory." | ||
1043 | 1026 | msgstr "" | ||
1044 | 1027 | |||
1045 | 1028 | #: bzrlib/builtins.py:2202 | ||
1046 | 1029 | msgid "" | ||
1047 | 1030 | "The root is the nearest enclosing directory with a .bzr control\n" | ||
1048 | 1031 | "directory." | ||
1049 | 1032 | msgstr "" | ||
1050 | 1033 | |||
1051 | 1034 | #: bzrlib/builtins.py:2230 | ||
1052 | 1035 | msgid "Show historical log for a branch or subset of a branch." | ||
1053 | 1036 | msgstr "" | ||
1054 | 1037 | |||
1055 | 1038 | #: bzrlib/builtins.py:2232 | ||
1056 | 1039 | msgid "" | ||
1057 | 1040 | "log is bzr's default tool for exploring the history of a branch.\n" | ||
1058 | 1041 | "The branch to use is taken from the first parameter. If no parameters\n" | ||
1059 | 1042 | "are given, the branch containing the working directory is logged.\n" | ||
1060 | 1043 | "Here are some simple examples::" | ||
1061 | 1044 | msgstr "" | ||
1062 | 1045 | |||
1063 | 1046 | #: bzrlib/builtins.py:2237 | ||
1064 | 1047 | msgid "" | ||
1065 | 1048 | " bzr log log the current branch\n" | ||
1066 | 1049 | " bzr log foo.py log a file in its branch\n" | ||
1067 | 1050 | " bzr log http://server/branch log a branch on a server" | ||
1068 | 1051 | msgstr "" | ||
1069 | 1052 | |||
1070 | 1053 | #: bzrlib/builtins.py:2241 | ||
1071 | 1054 | msgid "" | ||
1072 | 1055 | "The filtering, ordering and information shown for each revision can\n" | ||
1073 | 1056 | "be controlled as explained below. By default, all revisions are\n" | ||
1074 | 1057 | "shown sorted (topologically) so that newer revisions appear before\n" | ||
1075 | 1058 | "older ones and descendants always appear before ancestors. If displayed,\n" | ||
1076 | 1059 | "merged revisions are shown indented under the revision in which they\n" | ||
1077 | 1060 | "were merged." | ||
1078 | 1061 | msgstr "" | ||
1079 | 1062 | |||
1080 | 1063 | #: bzrlib/builtins.py:2248 | ||
1081 | 1064 | msgid ":Output control:" | ||
1082 | 1065 | msgstr "" | ||
1083 | 1066 | |||
1084 | 1067 | #: bzrlib/builtins.py:2250 | ||
1085 | 1068 | msgid "" | ||
1086 | 1069 | " The log format controls how information about each revision is\n" | ||
1087 | 1070 | " displayed. The standard log formats are called ``long``, ``short``\n" | ||
1088 | 1071 | " and ``line``. The default is long. See ``bzr help log-formats``\n" | ||
1089 | 1072 | " for more details on log formats." | ||
1090 | 1073 | msgstr "" | ||
1091 | 1074 | |||
1092 | 1075 | #: bzrlib/builtins.py:2255 | ||
1093 | 1076 | msgid "" | ||
1094 | 1077 | " The following options can be used to control what information is\n" | ||
1095 | 1078 | " displayed::" | ||
1096 | 1079 | msgstr "" | ||
1097 | 1080 | |||
1098 | 1081 | #: bzrlib/builtins.py:2258 | ||
1099 | 1082 | msgid "" | ||
1100 | 1083 | " -l N display a maximum of N revisions\n" | ||
1101 | 1084 | " -n N display N levels of revisions (0 for all, 1 for collapsed)\n" | ||
1102 | 1085 | " -v display a status summary (delta) for each revision\n" | ||
1103 | 1086 | " -p display a diff (patch) for each revision\n" | ||
1104 | 1087 | " --show-ids display revision-ids (and file-ids), not just revnos" | ||
1105 | 1088 | msgstr "" | ||
1106 | 1089 | |||
1107 | 1090 | #: bzrlib/builtins.py:2264 | ||
1108 | 1091 | msgid "" | ||
1109 | 1092 | " Note that the default number of levels to display is a function of the\n" | ||
1110 | 1093 | " log format. If the -n option is not used, the standard log formats show\n" | ||
1111 | 1094 | " just the top level (mainline)." | ||
1112 | 1095 | msgstr "" | ||
1113 | 1096 | |||
1114 | 1097 | #: bzrlib/builtins.py:2268 | ||
1115 | 1098 | msgid "" | ||
1116 | 1099 | " Status summaries are shown using status flags like A, M, etc. To see\n" | ||
1117 | 1100 | " the changes explained using words like ``added`` and ``modified``\n" | ||
1118 | 1101 | " instead, use the -vv option." | ||
1119 | 1102 | msgstr "" | ||
1120 | 1103 | |||
1121 | 1104 | #: bzrlib/builtins.py:2272 | ||
1122 | 1105 | msgid ":Ordering control:" | ||
1123 | 1106 | msgstr "" | ||
1124 | 1107 | |||
1125 | 1108 | #: bzrlib/builtins.py:2274 | ||
1126 | 1109 | msgid "" | ||
1127 | 1110 | " To display revisions from oldest to newest, use the --forward option.\n" | ||
1128 | 1111 | " In most cases, using this option will have little impact on the total\n" | ||
1129 | 1112 | " time taken to produce a log, though --forward does not incrementally\n" | ||
1130 | 1113 | " display revisions like --reverse does when it can." | ||
1131 | 1114 | msgstr "" | ||
1132 | 1115 | |||
1133 | 1116 | #: bzrlib/builtins.py:2279 | ||
1134 | 1117 | msgid ":Revision filtering:" | ||
1135 | 1118 | msgstr "" | ||
1136 | 1119 | |||
1137 | 1120 | #: bzrlib/builtins.py:2281 | ||
1138 | 1121 | msgid "" | ||
1139 | 1122 | " The -r option can be used to specify what revision or range of revisions\n" | ||
1140 | 1123 | " to filter against. The various forms are shown below::" | ||
1141 | 1124 | msgstr "" | ||
1142 | 1125 | |||
1143 | 1126 | #: bzrlib/builtins.py:2284 | ||
1144 | 1127 | msgid "" | ||
1145 | 1128 | " -rX display revision X\n" | ||
1146 | 1129 | " -rX.. display revision X and later\n" | ||
1147 | 1130 | " -r..Y display up to and including revision Y\n" | ||
1148 | 1131 | " -rX..Y display from X to Y inclusive" | ||
1149 | 1132 | msgstr "" | ||
1150 | 1133 | |||
1151 | 1134 | #: bzrlib/builtins.py:2289 | ||
1152 | 1135 | msgid "" | ||
1153 | 1136 | " See ``bzr help revisionspec`` for details on how to specify X and Y.\n" | ||
1154 | 1137 | " Some common examples are given below::" | ||
1155 | 1138 | msgstr "" | ||
1156 | 1139 | |||
1157 | 1140 | #: bzrlib/builtins.py:2292 | ||
1158 | 1141 | msgid "" | ||
1159 | 1142 | " -r-1 show just the tip\n" | ||
1160 | 1143 | " -r-10.. show the last 10 mainline revisions\n" | ||
1161 | 1144 | " -rsubmit:.. show what's new on this branch\n" | ||
1162 | 1145 | " -rancestor:path.. show changes since the common ancestor of this\n" | ||
1163 | 1146 | " branch and the one at location path\n" | ||
1164 | 1147 | " -rdate:yesterday.. show changes since yesterday" | ||
1165 | 1148 | msgstr "" | ||
1166 | 1149 | |||
1167 | 1150 | #: bzrlib/builtins.py:2299 | ||
1168 | 1151 | msgid "" | ||
1169 | 1152 | " When logging a range of revisions using -rX..Y, log starts at\n" | ||
1170 | 1153 | " revision Y and searches back in history through the primary\n" | ||
1171 | 1154 | " (\"left-hand\") parents until it finds X. When logging just the\n" | ||
1172 | 1155 | " top level (using -n1), an error is reported if X is not found\n" | ||
1173 | 1156 | " along the way. If multi-level logging is used (-n0), X may be\n" | ||
1174 | 1157 | " a nested merge revision and the log will be truncated accordingly." | ||
1175 | 1158 | msgstr "" | ||
1176 | 1159 | |||
1177 | 1160 | #: bzrlib/builtins.py:2306 | ||
1178 | 1161 | msgid ":Path filtering:" | ||
1179 | 1162 | msgstr "" | ||
1180 | 1163 | |||
1181 | 1164 | #: bzrlib/builtins.py:2308 | ||
1182 | 1165 | msgid "" | ||
1183 | 1166 | " If parameters are given and the first one is not a branch, the log\n" | ||
1184 | 1167 | " will be filtered to show only those revisions that changed the\n" | ||
1185 | 1168 | " nominated files or directories." | ||
1186 | 1169 | msgstr "" | ||
1187 | 1170 | |||
1188 | 1171 | #: bzrlib/builtins.py:2312 | ||
1189 | 1172 | msgid "" | ||
1190 | 1173 | " Filenames are interpreted within their historical context. To log a\n" | ||
1191 | 1174 | " deleted file, specify a revision range so that the file existed at\n" | ||
1192 | 1175 | " the end or start of the range." | ||
1193 | 1176 | msgstr "" | ||
1194 | 1177 | |||
1195 | 1178 | #: bzrlib/builtins.py:2316 | ||
1196 | 1179 | msgid "" | ||
1197 | 1180 | " Historical context is also important when interpreting pathnames of\n" | ||
1198 | 1181 | " renamed files/directories. Consider the following example:" | ||
1199 | 1182 | msgstr "" | ||
1200 | 1183 | |||
1201 | 1184 | #: bzrlib/builtins.py:2319 | ||
1202 | 1185 | msgid "" | ||
1203 | 1186 | " * revision 1: add tutorial.txt\n" | ||
1204 | 1187 | " * revision 2: modify tutorial.txt\n" | ||
1205 | 1188 | " * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt" | ||
1206 | 1189 | msgstr "" | ||
1207 | 1190 | |||
1208 | 1191 | #: bzrlib/builtins.py:2323 | ||
1209 | 1192 | msgid " In this case:" | ||
1210 | 1193 | msgstr "" | ||
1211 | 1194 | |||
1212 | 1195 | #: bzrlib/builtins.py:2325 | ||
1213 | 1196 | msgid " * ``bzr log guide.txt`` will log the file added in revision 1" | ||
1214 | 1197 | msgstr "" | ||
1215 | 1198 | |||
1216 | 1199 | #: bzrlib/builtins.py:2327 | ||
1217 | 1200 | msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3" | ||
1218 | 1201 | msgstr "" | ||
1219 | 1202 | |||
1220 | 1203 | #: bzrlib/builtins.py:2329 | ||
1221 | 1204 | msgid "" | ||
1222 | 1205 | " * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n" | ||
1223 | 1206 | " the original file in revision 2." | ||
1224 | 1207 | msgstr "" | ||
1225 | 1208 | |||
1226 | 1209 | #: bzrlib/builtins.py:2332 | ||
1227 | 1210 | msgid "" | ||
1228 | 1211 | " * ``bzr log -r2 -p guide.txt`` will display an error message as there\n" | ||
1229 | 1212 | " was no file called guide.txt in revision 2." | ||
1230 | 1213 | msgstr "" | ||
1231 | 1214 | |||
1232 | 1215 | #: bzrlib/builtins.py:2335 | ||
1233 | 1216 | msgid "" | ||
1234 | 1217 | " Renames are always followed by log. By design, there is no need to\n" | ||
1235 | 1218 | " explicitly ask for this (and no way to stop logging a file back\n" | ||
1236 | 1219 | " until it was last renamed)." | ||
1237 | 1220 | msgstr "" | ||
1238 | 1221 | |||
1239 | 1222 | #: bzrlib/builtins.py:2339 | ||
1240 | 1223 | msgid ":Other filtering:" | ||
1241 | 1224 | msgstr "" | ||
1242 | 1225 | |||
1243 | 1226 | #: bzrlib/builtins.py:2341 | ||
1244 | 1227 | msgid "" | ||
1245 | 1228 | " The --match option can be used for finding revisions that match a\n" | ||
1246 | 1229 | " regular expression in a commit message, committer, author or bug.\n" | ||
1247 | 1230 | " Specifying the option several times will match any of the supplied\n" | ||
1248 | 1231 | " expressions. --match-author, --match-bugs, --match-committer and\n" | ||
1249 | 1232 | " --match-message can be used to only match a specific field." | ||
1250 | 1233 | msgstr "" | ||
1251 | 1234 | |||
1252 | 1235 | #: bzrlib/builtins.py:2347 | ||
1253 | 1236 | msgid ":Tips & tricks:" | ||
1254 | 1237 | msgstr "" | ||
1255 | 1238 | |||
1256 | 1239 | #: bzrlib/builtins.py:2349 | ||
1257 | 1240 | msgid "" | ||
1258 | 1241 | " GUI tools and IDEs are often better at exploring history than command\n" | ||
1259 | 1242 | " line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n" | ||
1260 | 1243 | " bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n" | ||
1261 | 1244 | " Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n" | ||
1262 | 1245 | " <http://wiki.bazaar.canonical.com/IDEIntegration>. " | ||
1263 | 1246 | msgstr "" | ||
1264 | 1247 | |||
1265 | 1248 | #: bzrlib/builtins.py:2355 | ||
1266 | 1249 | msgid " You may find it useful to add the aliases below to ``bazaar.conf``::" | ||
1267 | 1250 | msgstr "" | ||
1268 | 1251 | |||
1269 | 1252 | #: bzrlib/builtins.py:2357 | ||
1270 | 1253 | msgid "" | ||
1271 | 1254 | " [ALIASES]\n" | ||
1272 | 1255 | " tip = log -r-1\n" | ||
1273 | 1256 | " top = log -l10 --line\n" | ||
1274 | 1257 | " show = log -v -p" | ||
1275 | 1258 | msgstr "" | ||
1276 | 1259 | |||
1277 | 1260 | #: bzrlib/builtins.py:2362 | ||
1278 | 1261 | msgid "" | ||
1279 | 1262 | " ``bzr tip`` will then show the latest revision while ``bzr top``\n" | ||
1280 | 1263 | " will show the last 10 mainline revisions. To see the details of a\n" | ||
1281 | 1264 | " particular revision X, ``bzr show -rX``." | ||
1282 | 1265 | msgstr "" | ||
1283 | 1266 | |||
1284 | 1267 | #: bzrlib/builtins.py:2366 | ||
1285 | 1268 | msgid "" | ||
1286 | 1269 | " If you are interested in looking deeper into a particular merge X,\n" | ||
1287 | 1270 | " use ``bzr log -n0 -rX``." | ||
1288 | 1271 | msgstr "" | ||
1289 | 1272 | |||
1290 | 1273 | #: bzrlib/builtins.py:2369 | ||
1291 | 1274 | msgid "" | ||
1292 | 1275 | " ``bzr log -v`` on a branch with lots of history is currently\n" | ||
1293 | 1276 | " very slow. A fix for this issue is currently under development.\n" | ||
1294 | 1277 | " With or without that fix, it is recommended that a revision range\n" | ||
1295 | 1278 | " be given when using the -v option." | ||
1296 | 1279 | msgstr "" | ||
1297 | 1280 | |||
1298 | 1281 | #: bzrlib/builtins.py:2374 | ||
1299 | 1282 | msgid "" | ||
1300 | 1283 | " bzr has a generic full-text matching plugin, bzr-search, that can be\n" | ||
1301 | 1284 | " used to find revisions matching user names, commit messages, etc.\n" | ||
1302 | 1285 | " Among other features, this plugin can find all revisions containing\n" | ||
1303 | 1286 | " a list of words but not others." | ||
1304 | 1287 | msgstr "" | ||
1305 | 1288 | |||
1306 | 1289 | #: bzrlib/builtins.py:2379 | ||
1307 | 1290 | msgid "" | ||
1308 | 1291 | " When exploring non-mainline history on large projects with deep\n" | ||
1309 | 1292 | " history, the performance of log can be greatly improved by installing\n" | ||
1310 | 1293 | " the historycache plugin. This plugin buffers historical information\n" | ||
1311 | 1294 | " trading disk space for faster speed." | ||
1312 | 1295 | msgstr "" | ||
1313 | 1296 | |||
1314 | 1297 | # help of 'forward' option of 'log' command | ||
1315 | 1298 | #: bzrlib/builtins.py:2388 | ||
1316 | 1299 | msgid "Show from oldest to newest." | ||
1317 | 1300 | msgstr "" | ||
1318 | 1301 | |||
1319 | 1302 | # help of 'verbose' option of 'log' command | ||
1320 | 1303 | #: bzrlib/builtins.py:2391 | ||
1321 | 1304 | msgid "Show files changed in each revision." | ||
1322 | 1305 | msgstr "" | ||
1323 | 1306 | |||
1324 | 1307 | # help of 'change' option of 'log' command | ||
1325 | 1308 | #: bzrlib/builtins.py:2397 | ||
1326 | 1309 | msgid "Show just the specified revision. See also \"help revisionspec\"." | ||
1327 | 1310 | msgstr "" | ||
1328 | 1311 | |||
1329 | 1312 | # help of 'authors' option of 'log' command | ||
1330 | 1313 | #: bzrlib/builtins.py:2401 | ||
1331 | 1314 | msgid "What names to list as authors - first, all or committer." | ||
1332 | 1315 | msgstr "" | ||
1333 | 1316 | |||
1334 | 1317 | # title of 'authors' option of 'log' command | ||
1335 | 1318 | #: bzrlib/builtins.py:2402 | ||
1336 | 1319 | msgid "Authors" | ||
1337 | 1320 | msgstr "" | ||
1338 | 1321 | |||
1339 | 1322 | # help of 'levels' option of 'log' command | ||
1340 | 1323 | #: bzrlib/builtins.py:2407 | ||
1341 | 1324 | msgid "Number of levels to display - 0 for all, 1 for flat." | ||
1342 | 1325 | msgstr "" | ||
1343 | 1326 | |||
1344 | 1327 | # help of 'limit' option of 'log' command | ||
1345 | 1328 | #: bzrlib/builtins.py:2417 | ||
1346 | 1329 | msgid "Limit the output to the first N revisions." | ||
1347 | 1330 | msgstr "" | ||
1348 | 1331 | |||
1349 | 1332 | # help of 'show-diff' option of 'log' command | ||
1350 | 1333 | #: bzrlib/builtins.py:2422 | ||
1351 | 1334 | msgid "Show changes made in each revision as a patch." | ||
1352 | 1335 | msgstr "" | ||
1353 | 1336 | |||
1354 | 1337 | # help of 'include-merges' option of 'log' command | ||
1355 | 1338 | #: bzrlib/builtins.py:2424 | ||
1356 | 1339 | msgid "Show merged revisions like --levels 0 does." | ||
1357 | 1340 | msgstr "" | ||
1358 | 1341 | |||
1359 | 1342 | # help of 'exclude-common-ancestry' option of 'log' command | ||
1360 | 1343 | #: bzrlib/builtins.py:2426 | ||
1361 | 1344 | msgid "" | ||
1362 | 1345 | "Display only the revisions that are not part of both ancestries (require -" | ||
1363 | 1346 | "rX..Y)" | ||
1364 | 1347 | msgstr "" | ||
1365 | 1348 | |||
1366 | 1349 | # help of 'signatures' option of 'log' command | ||
1367 | 1350 | #: bzrlib/builtins.py:2430 | ||
1368 | 1351 | msgid "Show digital signature validity" | ||
1369 | 1352 | msgstr "" | ||
1370 | 1353 | |||
1371 | 1354 | # help of 'match' option of 'log' command | ||
1372 | 1355 | #: bzrlib/builtins.py:2433 | ||
1373 | 1356 | msgid "Show revisions whose properties match this expression." | ||
1374 | 1357 | msgstr "" | ||
1375 | 1358 | |||
1376 | 1359 | # help of 'match-message' option of 'log' command | ||
1377 | 1360 | #: bzrlib/builtins.py:2437 | ||
1378 | 1361 | msgid "Show revisions whose message matches this expression." | ||
1379 | 1362 | msgstr "" | ||
1380 | 1363 | |||
1381 | 1364 | # help of 'match-committer' option of 'log' command | ||
1382 | 1365 | #: bzrlib/builtins.py:2441 | ||
1383 | 1366 | msgid "Show revisions whose committer matches this expression." | ||
1384 | 1367 | msgstr "" | ||
1385 | 1368 | |||
1386 | 1369 | # help of 'match-author' option of 'log' command | ||
1387 | 1370 | #: bzrlib/builtins.py:2445 | ||
1388 | 1371 | msgid "Show revisions whose authors match this expression." | ||
1389 | 1372 | msgstr "" | ||
1390 | 1373 | |||
1391 | 1374 | # help of 'match-bugs' option of 'log' command | ||
1392 | 1375 | #: bzrlib/builtins.py:2449 | ||
1393 | 1376 | msgid "Show revisions whose bugs match this expression." | ||
1394 | 1377 | msgstr "" | ||
1395 | 1378 | |||
1396 | 1379 | #: bzrlib/builtins.py:2690 | ||
1397 | 1380 | msgid "" | ||
1398 | 1381 | "List files in a tree.\n" | ||
1399 | 1382 | " " | ||
1400 | 1383 | msgstr "" | ||
1401 | 1384 | |||
1402 | 1385 | # help of 'recursive' option of 'ls' command | ||
1403 | 1386 | #: bzrlib/builtins.py:2699 | ||
1404 | 1387 | msgid "Recurse into subdirectories." | ||
1405 | 1388 | msgstr "" | ||
1406 | 1389 | |||
1407 | 1390 | # help of 'from-root' option of 'ls' command | ||
1408 | 1391 | #: bzrlib/builtins.py:2701 | ||
1409 | 1392 | msgid "Print paths relative to the root of the branch." | ||
1410 | 1393 | msgstr "" | ||
1411 | 1394 | |||
1412 | 1395 | # help of 'unknown' option of 'ls' command | ||
1413 | 1396 | #: bzrlib/builtins.py:2703 | ||
1414 | 1397 | msgid "Print unknown files." | ||
1415 | 1398 | msgstr "" | ||
1416 | 1399 | |||
1417 | 1400 | # help of 'versioned' option of 'ls' command | ||
1418 | 1401 | #: bzrlib/builtins.py:2704 | ||
1419 | 1402 | msgid "Print versioned files." | ||
1420 | 1403 | msgstr "" | ||
1421 | 1404 | |||
1422 | 1405 | # help of 'ignored' option of 'ls' command | ||
1423 | 1406 | #: bzrlib/builtins.py:2707 | ||
1424 | 1407 | msgid "Print ignored files." | ||
1425 | 1408 | msgstr "" | ||
1426 | 1409 | |||
1427 | 1410 | # help of 'kind' option of 'ls' command | ||
1428 | 1411 | #: bzrlib/builtins.py:2709 | ||
1429 | 1412 | msgid "List entries of a particular kind: file, directory, symlink." | ||
1430 | 1413 | msgstr "" | ||
1431 | 1414 | |||
1432 | 1415 | #: bzrlib/builtins.py:2821 | ||
1433 | 1416 | msgid "Ignore specified files or patterns." | ||
1434 | 1417 | msgstr "" | ||
1435 | 1418 | |||
1436 | 1419 | #: bzrlib/builtins.py:2823 | ||
1437 | 1420 | msgid "See ``bzr help patterns`` for details on the syntax of patterns." | ||
1438 | 1421 | msgstr "" | ||
1439 | 1422 | |||
1440 | 1423 | #: bzrlib/builtins.py:2825 | ||
1441 | 1424 | msgid "" | ||
1442 | 1425 | "If a .bzrignore file does not exist, the ignore command\n" | ||
1443 | 1426 | "will create one and add the specified files or patterns to the newly\n" | ||
1444 | 1427 | "created file. The ignore command will also automatically add the \n" | ||
1445 | 1428 | ".bzrignore file to be versioned. Creating a .bzrignore file without\n" | ||
1446 | 1429 | "the use of the ignore command will require an explicit add command." | ||
1447 | 1430 | msgstr "" | ||
1448 | 1431 | |||
1449 | 1432 | #: bzrlib/builtins.py:2831 | ||
1450 | 1433 | msgid "" | ||
1451 | 1434 | "To remove patterns from the ignore list, edit the .bzrignore file.\n" | ||
1452 | 1435 | "After adding, editing or deleting that file either indirectly by\n" | ||
1453 | 1436 | "using this command or directly by using an editor, be sure to commit\n" | ||
1454 | 1437 | "it." | ||
1455 | 1438 | msgstr "" | ||
1456 | 1439 | |||
1457 | 1440 | #: bzrlib/builtins.py:2836 | ||
1458 | 1441 | msgid "" | ||
1459 | 1442 | "Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n" | ||
1460 | 1443 | "the global ignore file can be found in the application data directory as\n" | ||
1461 | 1444 | "C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n" | ||
1462 | 1445 | "Global ignores are not touched by this command. The global ignore file\n" | ||
1463 | 1446 | "can be edited directly using an editor." | ||
1464 | 1447 | msgstr "" | ||
1465 | 1448 | |||
1466 | 1449 | #: bzrlib/builtins.py:2842 | ||
1467 | 1450 | msgid "" | ||
1468 | 1451 | "Patterns prefixed with '!' are exceptions to ignore patterns and take\n" | ||
1469 | 1452 | "precedence over regular ignores. Such exceptions are used to specify\n" | ||
1470 | 1453 | "files that should be versioned which would otherwise be ignored." | ||
1471 | 1454 | msgstr "" | ||
1472 | 1455 | |||
1473 | 1456 | #: bzrlib/builtins.py:2846 | ||
1474 | 1457 | msgid "" | ||
1475 | 1458 | "Patterns prefixed with '!!' act as regular ignore patterns, but have\n" | ||
1476 | 1459 | "precedence over the '!' exception patterns." | ||
1477 | 1460 | msgstr "" | ||
1478 | 1461 | |||
1479 | 1462 | #: bzrlib/builtins.py:2849 | ||
1480 | 1463 | msgid "" | ||
1481 | 1464 | ":Notes: \n" | ||
1482 | 1465 | " \n" | ||
1483 | 1466 | "* Ignore patterns containing shell wildcards must be quoted from\n" | ||
1484 | 1467 | " the shell on Unix." | ||
1485 | 1468 | msgstr "" | ||
1486 | 1469 | |||
1487 | 1470 | #: bzrlib/builtins.py:2854 | ||
1488 | 1471 | msgid "" | ||
1489 | 1472 | "* Ignore patterns starting with \"#\" act as comments in the ignore file.\n" | ||
1490 | 1473 | " To ignore patterns that begin with that character, use the \"RE:\" prefix." | ||
1491 | 1474 | msgstr "" | ||
1492 | 1475 | |||
1493 | 1476 | #: bzrlib/builtins.py:2857 | ||
1494 | 1477 | msgid "" | ||
1495 | 1478 | ":Examples:\n" | ||
1496 | 1479 | " Ignore the top level Makefile::" | ||
1497 | 1480 | msgstr "" | ||
1498 | 1481 | |||
1499 | 1482 | #: bzrlib/builtins.py:2860 | ||
1500 | 1483 | msgid " bzr ignore ./Makefile" | ||
1501 | 1484 | msgstr "" | ||
1502 | 1485 | |||
1503 | 1486 | #: bzrlib/builtins.py:2862 | ||
1504 | 1487 | msgid " Ignore .class files in all directories...::" | ||
1505 | 1488 | msgstr "" | ||
1506 | 1489 | |||
1507 | 1490 | #: bzrlib/builtins.py:2864 | ||
1508 | 1491 | msgid " bzr ignore \"*.class\"" | ||
1509 | 1492 | msgstr "" | ||
1510 | 1493 | |||
1511 | 1494 | #: bzrlib/builtins.py:2866 | ||
1512 | 1495 | msgid " ...but do not ignore \"special.class\"::" | ||
1513 | 1496 | msgstr "" | ||
1514 | 1497 | |||
1515 | 1498 | #: bzrlib/builtins.py:2868 | ||
1516 | 1499 | msgid " bzr ignore \"!special.class\"" | ||
1517 | 1500 | msgstr "" | ||
1518 | 1501 | |||
1519 | 1502 | #: bzrlib/builtins.py:2870 | ||
1520 | 1503 | msgid " Ignore files whose name begins with the \"#\" character::" | ||
1521 | 1504 | msgstr "" | ||
1522 | 1505 | |||
1523 | 1506 | #: bzrlib/builtins.py:2872 | ||
1524 | 1507 | msgid " bzr ignore \"RE:^#\"" | ||
1525 | 1508 | msgstr "" | ||
1526 | 1509 | |||
1527 | 1510 | #: bzrlib/builtins.py:2874 | ||
1528 | 1511 | msgid " Ignore .o files under the lib directory::" | ||
1529 | 1512 | msgstr "" | ||
1530 | 1513 | |||
1531 | 1514 | #: bzrlib/builtins.py:2876 | ||
1532 | 1515 | msgid " bzr ignore \"lib/**/*.o\"" | ||
1533 | 1516 | msgstr "" | ||
1534 | 1517 | |||
1535 | 1518 | #: bzrlib/builtins.py:2880 | ||
1536 | 1519 | msgid " bzr ignore \"RE:lib/.*\\.o\"" | ||
1537 | 1520 | msgstr "" | ||
1538 | 1521 | |||
1539 | 1522 | #: bzrlib/builtins.py:2882 | ||
1540 | 1523 | msgid " Ignore everything but the \"debian\" toplevel directory::" | ||
1541 | 1524 | msgstr "" | ||
1542 | 1525 | |||
1543 | 1526 | #: bzrlib/builtins.py:2884 | ||
1544 | 1527 | msgid "" | ||
1545 | 1528 | " bzr ignore \"RE:(?!debian/).*\"\n" | ||
1546 | 1529 | " \n" | ||
1547 | 1530 | " Ignore everything except the \"local\" toplevel directory,\n" | ||
1548 | 1531 | " but always ignore autosave files ending in ~, even under local/::\n" | ||
1549 | 1532 | " \n" | ||
1550 | 1533 | " bzr ignore \"*\"\n" | ||
1551 | 1534 | " bzr ignore \"!./local\"\n" | ||
1552 | 1535 | " bzr ignore \"!!*~\"" | ||
1553 | 1536 | msgstr "" | ||
1554 | 1537 | |||
1555 | 1538 | # help of 'default-rules' option of 'ignore' command | ||
1556 | 1539 | #: bzrlib/builtins.py:2898 | ||
1557 | 1540 | msgid "Display the default ignore rules that bzr uses." | ||
1558 | 1541 | msgstr "" | ||
1559 | 1542 | |||
1560 | 1543 | #: bzrlib/builtins.py:2946 | ||
1561 | 1544 | msgid "List ignored files and the patterns that matched them." | ||
1562 | 1545 | msgstr "" | ||
1563 | 1546 | |||
1564 | 1547 | #: bzrlib/builtins.py:2948 | ||
1565 | 1548 | msgid "" | ||
1566 | 1549 | "List all the ignored files and the ignore pattern that caused the file to\n" | ||
1567 | 1550 | "be ignored." | ||
1568 | 1551 | msgstr "" | ||
1569 | 1552 | |||
1570 | 1553 | #: bzrlib/builtins.py:2951 | ||
1571 | 1554 | msgid "Alternatively, to list just the files::" | ||
1572 | 1555 | msgstr "" | ||
1573 | 1556 | |||
1574 | 1557 | #: bzrlib/builtins.py:2953 | ||
1575 | 1558 | msgid " bzr ls --ignored" | ||
1576 | 1559 | msgstr "" | ||
1577 | 1560 | |||
1578 | 1561 | #: bzrlib/builtins.py:2994 | ||
1579 | 1562 | msgid "Export current or past revision to a destination directory or archive." | ||
1580 | 1563 | msgstr "" | ||
1581 | 1564 | |||
1582 | 1565 | #: bzrlib/builtins.py:2996 | ||
1583 | 1566 | msgid "If no revision is specified this exports the last committed revision." | ||
1584 | 1567 | msgstr "" | ||
1585 | 1568 | |||
1586 | 1569 | #: bzrlib/builtins.py:2998 | ||
1587 | 1570 | msgid "" | ||
1588 | 1571 | "Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n" | ||
1589 | 1572 | "given, try to find the format with the extension. If no extension\n" | ||
1590 | 1573 | "is found exports to a directory (equivalent to --format=dir)." | ||
1591 | 1574 | msgstr "" | ||
1592 | 1575 | |||
1593 | 1576 | #: bzrlib/builtins.py:3002 | ||
1594 | 1577 | msgid "" | ||
1595 | 1578 | "If root is supplied, it will be used as the root directory inside\n" | ||
1596 | 1579 | "container formats (tar, zip, etc). If it is not supplied it will default\n" | ||
1597 | 1580 | "to the exported filename. The root option has no effect for 'dir' format." | ||
1598 | 1581 | msgstr "" | ||
1599 | 1582 | |||
1600 | 1583 | #: bzrlib/builtins.py:3006 | ||
1601 | 1584 | msgid "" | ||
1602 | 1585 | "If branch is omitted then the branch containing the current working\n" | ||
1603 | 1586 | "directory will be used." | ||
1604 | 1587 | msgstr "" | ||
1605 | 1588 | |||
1606 | 1589 | #: bzrlib/builtins.py:3009 | ||
1607 | 1590 | msgid "Note: Export of tree with non-ASCII filenames to zip is not supported." | ||
1608 | 1591 | msgstr "" | ||
1609 | 1592 | |||
1610 | 1593 | #: bzrlib/builtins.py:3011 | ||
1611 | 1594 | msgid "" | ||
1612 | 1595 | " ================= =========================\n" | ||
1613 | 1596 | " Supported formats Autodetected by extension\n" | ||
1614 | 1597 | " ================= =========================\n" | ||
1615 | 1598 | " dir (none)\n" | ||
1616 | 1599 | " tar .tar\n" | ||
1617 | 1600 | " tbz2 .tar.bz2, .tbz2\n" | ||
1618 | 1601 | " tgz .tar.gz, .tgz\n" | ||
1619 | 1602 | " zip .zip\n" | ||
1620 | 1603 | " ================= =========================" | ||
1621 | 1604 | msgstr "" | ||
1622 | 1605 | |||
1623 | 1606 | # help of 'format' option of 'export' command | ||
1624 | 1607 | #: bzrlib/builtins.py:3025 | ||
1625 | 1608 | msgid "Type of file to export to." | ||
1626 | 1609 | msgstr "" | ||
1627 | 1610 | |||
1628 | 1611 | # help of 'filters' option of 'export' command | ||
1629 | 1612 | #: bzrlib/builtins.py:3028 | ||
1630 | 1613 | msgid "Apply content filters to export the convenient form." | ||
1631 | 1614 | msgstr "" | ||
1632 | 1615 | |||
1633 | 1616 | # help of 'root' option of 'export' command | ||
1634 | 1617 | #: bzrlib/builtins.py:3032 | ||
1635 | 1618 | msgid "Name of the root directory inside the exported file." | ||
1636 | 1619 | msgstr "" | ||
1637 | 1620 | |||
1638 | 1621 | # help of 'per-file-timestamps' option of 'export' command | ||
1639 | 1622 | #: bzrlib/builtins.py:3034 | ||
1640 | 1623 | msgid "" | ||
1641 | 1624 | "Set modification time of files to that of the last revision in which it was " | ||
1642 | 1625 | "changed." | ||
1643 | 1626 | msgstr "" | ||
1644 | 1627 | |||
1645 | 1628 | #: bzrlib/builtins.py:3058 | ||
1646 | 1629 | msgid "Write the contents of a file as of a given revision to standard output." | ||
1647 | 1630 | msgstr "" | ||
1648 | 1631 | |||
1649 | 1632 | #: bzrlib/builtins.py:3060 | ||
1650 | 1633 | msgid "If no revision is nominated, the last revision is used." | ||
1651 | 1634 | msgstr "" | ||
1652 | 1635 | |||
1653 | 1636 | #: bzrlib/builtins.py:3062 | ||
1654 | 1637 | msgid "" | ||
1655 | 1638 | "Note: Take care to redirect standard output when using this command on a\n" | ||
1656 | 1639 | "binary file." | ||
1657 | 1640 | msgstr "" | ||
1658 | 1641 | |||
1659 | 1642 | # help of 'filters' option of 'cat' command | ||
1660 | 1643 | #: bzrlib/builtins.py:3069 | ||
1661 | 1644 | msgid "Apply content filters to display the convenience form." | ||
1662 | 1645 | msgstr "" | ||
1663 | 1646 | |||
1664 | 1647 | #: bzrlib/builtins.py:3140 | ||
1665 | 1648 | msgid "Commit changes into a new revision." | ||
1666 | 1649 | msgstr "" | ||
1667 | 1650 | |||
1668 | 1651 | #: bzrlib/builtins.py:3142 | ||
1669 | 1652 | msgid "" | ||
1670 | 1653 | "An explanatory message needs to be given for each commit. This is\n" | ||
1671 | 1654 | "often done by using the --message option (getting the message from the\n" | ||
1672 | 1655 | "command line) or by using the --file option (getting the message from\n" | ||
1673 | 1656 | "a file). If neither of these options is given, an editor is opened for\n" | ||
1674 | 1657 | "the user to enter the message. To see the changed files in the\n" | ||
1675 | 1658 | "boilerplate text loaded into the editor, use the --show-diff option." | ||
1676 | 1659 | msgstr "" | ||
1677 | 1660 | |||
1678 | 1661 | #: bzrlib/builtins.py:3149 | ||
1679 | 1662 | msgid "" | ||
1680 | 1663 | "By default, the entire tree is committed and the person doing the\n" | ||
1681 | 1664 | "commit is assumed to be the author. These defaults can be overridden\n" | ||
1682 | 1665 | "as explained below." | ||
1683 | 1666 | msgstr "" | ||
1684 | 1667 | |||
1685 | 1668 | #: bzrlib/builtins.py:3153 | ||
1686 | 1669 | msgid ":Selective commits:" | ||
1687 | 1670 | msgstr "" | ||
1688 | 1671 | |||
1689 | 1672 | #: bzrlib/builtins.py:3155 | ||
1690 | 1673 | msgid "" | ||
1691 | 1674 | " If selected files are specified, only changes to those files are\n" | ||
1692 | 1675 | " committed. If a directory is specified then the directory and\n" | ||
1693 | 1676 | " everything within it is committed." | ||
1694 | 1677 | msgstr "" | ||
1695 | 1678 | |||
1696 | 1679 | #: bzrlib/builtins.py:3159 | ||
1697 | 1680 | msgid "" | ||
1698 | 1681 | " When excludes are given, they take precedence over selected files.\n" | ||
1699 | 1682 | " For example, to commit only changes within foo, but not changes\n" | ||
1700 | 1683 | " within foo/bar::" | ||
1701 | 1684 | msgstr "" | ||
1702 | 1685 | |||
1703 | 1686 | #: bzrlib/builtins.py:3163 | ||
1704 | 1687 | msgid " bzr commit foo -x foo/bar" | ||
1705 | 1688 | msgstr "" | ||
1706 | 1689 | |||
1707 | 1690 | #: bzrlib/builtins.py:3165 | ||
1708 | 1691 | msgid " A selective commit after a merge is not yet supported." | ||
1709 | 1692 | msgstr "" | ||
1710 | 1693 | |||
1711 | 1694 | #: bzrlib/builtins.py:3167 | ||
1712 | 1695 | msgid ":Custom authors:" | ||
1713 | 1696 | msgstr "" | ||
1714 | 1697 | |||
1715 | 1698 | #: bzrlib/builtins.py:3169 | ||
1716 | 1699 | msgid "" | ||
1717 | 1700 | " If the author of the change is not the same person as the committer,\n" | ||
1718 | 1701 | " you can specify the author's name using the --author option. The\n" | ||
1719 | 1702 | " name should be in the same format as a committer-id, e.g.\n" | ||
1720 | 1703 | " \"John Doe <jdoe@example.com>\". If there is more than one author of\n" | ||
1721 | 1704 | " the change you can specify the option multiple times, once for each\n" | ||
1722 | 1705 | " author." | ||
1723 | 1706 | msgstr "" | ||
1724 | 1707 | |||
1725 | 1708 | #: bzrlib/builtins.py:3176 | ||
1726 | 1709 | msgid ":Checks:" | ||
1727 | 1710 | msgstr "" | ||
1728 | 1711 | |||
1729 | 1712 | #: bzrlib/builtins.py:3178 | ||
1730 | 1713 | msgid "" | ||
1731 | 1714 | " A common mistake is to forget to add a new file or directory before\n" | ||
1732 | 1715 | " running the commit command. The --strict option checks for unknown\n" | ||
1733 | 1716 | " files and aborts the commit if any are found. More advanced pre-commit\n" | ||
1734 | 1717 | " checks can be implemented by defining hooks. See ``bzr help hooks``\n" | ||
1735 | 1718 | " for details." | ||
1736 | 1719 | msgstr "" | ||
1737 | 1720 | |||
1738 | 1721 | #: bzrlib/builtins.py:3184 | ||
1739 | 1722 | msgid ":Things to note:" | ||
1740 | 1723 | msgstr "" | ||
1741 | 1724 | |||
1742 | 1725 | #: bzrlib/builtins.py:3186 | ||
1743 | 1726 | msgid "" | ||
1744 | 1727 | " If you accidentially commit the wrong changes or make a spelling\n" | ||
1745 | 1728 | " mistake in the commit message say, you can use the uncommit command\n" | ||
1746 | 1729 | " to undo it. See ``bzr help uncommit`` for details." | ||
1747 | 1730 | msgstr "" | ||
1748 | 1731 | |||
1749 | 1732 | #: bzrlib/builtins.py:3190 | ||
1750 | 1733 | msgid "" | ||
1751 | 1734 | " Hooks can also be configured to run after a commit. This allows you\n" | ||
1752 | 1735 | " to trigger updates to external systems like bug trackers. The --fixes\n" | ||
1753 | 1736 | " option can be used to record the association between a revision and\n" | ||
1754 | 1737 | " one or more bugs. See ``bzr help bugs`` for details." | ||
1755 | 1738 | msgstr "" | ||
1756 | 1739 | |||
1757 | 1740 | # help of 'exclude' option of 'commit' command | ||
1758 | 1741 | #: bzrlib/builtins.py:3200 | ||
1759 | 1742 | msgid "Do not consider changes made to a given path." | ||
1760 | 1743 | msgstr "" | ||
1761 | 1744 | |||
1762 | 1745 | # help of 'message' option of 'commit' command | ||
1763 | 1746 | #: bzrlib/builtins.py:3203 | ||
1764 | 1747 | msgid "Description of the new revision." | ||
1765 | 1748 | msgstr "" | ||
1766 | 1749 | |||
1767 | 1750 | # help of 'unchanged' option of 'commit' command | ||
1768 | 1751 | #: bzrlib/builtins.py:3206 | ||
1769 | 1752 | msgid "Commit even if nothing has changed." | ||
1770 | 1753 | msgstr "" | ||
1771 | 1754 | |||
1772 | 1755 | # help of 'file' option of 'commit' command | ||
1773 | 1756 | #: bzrlib/builtins.py:3210 | ||
1774 | 1757 | msgid "Take commit message from this file." | ||
1775 | 1758 | msgstr "" | ||
1776 | 1759 | |||
1777 | 1760 | # help of 'strict' option of 'commit' command | ||
1778 | 1761 | #: bzrlib/builtins.py:3212 | ||
1779 | 1762 | msgid "Refuse to commit if there are unknown files in the working tree." | ||
1780 | 1763 | msgstr "" | ||
1781 | 1764 | |||
1782 | 1765 | # help of 'commit-time' option of 'commit' command | ||
1783 | 1766 | #: bzrlib/builtins.py:3215 | ||
1784 | 1767 | msgid "" | ||
1785 | 1768 | "Manually set a commit time using commit date format, e.g. '2009-10-10 " | ||
1786 | 1769 | "08:00:00 +0100'." | ||
1787 | 1770 | msgstr "" | ||
1788 | 1771 | |||
1789 | 1772 | # help of 'fixes' option of 'commit' command | ||
1790 | 1773 | #: bzrlib/builtins.py:3218 | ||
1791 | 1774 | msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")." | ||
1792 | 1775 | msgstr "" | ||
1793 | 1776 | |||
1794 | 1777 | # help of 'author' option of 'commit' command | ||
1795 | 1778 | #: bzrlib/builtins.py:3221 | ||
1796 | 1779 | msgid "Set the author's name, if it's different from the committer." | ||
1797 | 1780 | msgstr "" | ||
1798 | 1781 | |||
1799 | 1782 | # help of 'local' option of 'commit' command | ||
1800 | 1783 | #: bzrlib/builtins.py:3224 | ||
1801 | 1784 | msgid "" | ||
1802 | 1785 | "Perform a local commit in a bound branch. Local commits are not pushed to " | ||
1803 | 1786 | "the master branch until a normal commit is performed." | ||
1804 | 1787 | msgstr "" | ||
1805 | 1788 | |||
1806 | 1789 | # help of 'show-diff' option of 'commit' command | ||
1807 | 1790 | #: bzrlib/builtins.py:3230 | ||
1808 | 1791 | msgid "" | ||
1809 | 1792 | "When no message is supplied, show the diff along with the status summary in " | ||
1810 | 1793 | "the message editor." | ||
1811 | 1794 | msgstr "" | ||
1812 | 1795 | |||
1813 | 1796 | # help of 'lossy' option of 'commit' command | ||
1814 | 1797 | #: bzrlib/builtins.py:3233 | ||
1815 | 1798 | msgid "" | ||
1816 | 1799 | "When committing to a foreign version control system do not push data that " | ||
1817 | 1800 | "can not be natively represented." | ||
1818 | 1801 | msgstr "" | ||
1819 | 1802 | |||
1820 | 1803 | #: bzrlib/builtins.py:3391 | ||
1821 | 1804 | msgid "" | ||
1822 | 1805 | "Validate working tree structure, branch consistency and repository history." | ||
1823 | 1806 | msgstr "" | ||
1824 | 1807 | |||
1825 | 1808 | #: bzrlib/builtins.py:3393 | ||
1826 | 1809 | msgid "" | ||
1827 | 1810 | "This command checks various invariants about branch and repository storage\n" | ||
1828 | 1811 | "to detect data corruption or bzr bugs." | ||
1829 | 1812 | msgstr "" | ||
1830 | 1813 | |||
1831 | 1814 | #: bzrlib/builtins.py:3396 | ||
1832 | 1815 | msgid "" | ||
1833 | 1816 | "The working tree and branch checks will only give output if a problem is\n" | ||
1834 | 1817 | "detected. The output fields of the repository check are:" | ||
1835 | 1818 | msgstr "" | ||
1836 | 1819 | |||
1837 | 1820 | #: bzrlib/builtins.py:3399 | ||
1838 | 1821 | msgid "" | ||
1839 | 1822 | "revisions\n" | ||
1840 | 1823 | " This is just the number of revisions checked. It doesn't\n" | ||
1841 | 1824 | " indicate a problem." | ||
1842 | 1825 | msgstr "" | ||
1843 | 1826 | |||
1844 | 1827 | #: bzrlib/builtins.py:3403 | ||
1845 | 1828 | msgid "" | ||
1846 | 1829 | "versionedfiles\n" | ||
1847 | 1830 | " This is just the number of versionedfiles checked. It\n" | ||
1848 | 1831 | " doesn't indicate a problem." | ||
1849 | 1832 | msgstr "" | ||
1850 | 1833 | |||
1851 | 1834 | #: bzrlib/builtins.py:3407 | ||
1852 | 1835 | msgid "" | ||
1853 | 1836 | "unreferenced ancestors\n" | ||
1854 | 1837 | " Texts that are ancestors of other texts, but\n" | ||
1855 | 1838 | " are not properly referenced by the revision ancestry. This is a\n" | ||
1856 | 1839 | " subtle problem that Bazaar can work around." | ||
1857 | 1840 | msgstr "" | ||
1858 | 1841 | |||
1859 | 1842 | #: bzrlib/builtins.py:3412 | ||
1860 | 1843 | msgid "" | ||
1861 | 1844 | "unique file texts\n" | ||
1862 | 1845 | " This is the total number of unique file contents\n" | ||
1863 | 1846 | " seen in the checked revisions. It does not indicate a problem." | ||
1864 | 1847 | msgstr "" | ||
1865 | 1848 | |||
1866 | 1849 | #: bzrlib/builtins.py:3416 | ||
1867 | 1850 | msgid "" | ||
1868 | 1851 | "repeated file texts\n" | ||
1869 | 1852 | " This is the total number of repeated texts seen\n" | ||
1870 | 1853 | " in the checked revisions. Texts can be repeated when their file\n" | ||
1871 | 1854 | " entries are modified, but the file contents are not. It does not\n" | ||
1872 | 1855 | " indicate a problem." | ||
1873 | 1856 | msgstr "" | ||
1874 | 1857 | |||
1875 | 1858 | #: bzrlib/builtins.py:3422 | ||
1876 | 1859 | msgid "" | ||
1877 | 1860 | "If no restrictions are specified, all Bazaar data that is found at the " | ||
1878 | 1861 | "given\n" | ||
1879 | 1862 | "location will be checked." | ||
1880 | 1863 | msgstr "" | ||
1881 | 1864 | |||
1882 | 1865 | #: bzrlib/builtins.py:3425 | ||
1883 | 1866 | msgid ":Examples:" | ||
1884 | 1867 | msgstr "" | ||
1885 | 1868 | |||
1886 | 1869 | #: bzrlib/builtins.py:3427 | ||
1887 | 1870 | msgid " Check the tree and branch at 'foo'::" | ||
1888 | 1871 | msgstr "" | ||
1889 | 1872 | |||
1890 | 1873 | #: bzrlib/builtins.py:3429 | ||
1891 | 1874 | msgid " bzr check --tree --branch foo" | ||
1892 | 1875 | msgstr "" | ||
1893 | 1876 | |||
1894 | 1877 | #: bzrlib/builtins.py:3431 | ||
1895 | 1878 | msgid " Check only the repository at 'bar'::" | ||
1896 | 1879 | msgstr "" | ||
1897 | 1880 | |||
1898 | 1881 | #: bzrlib/builtins.py:3433 | ||
1899 | 1882 | msgid " bzr check --repo bar" | ||
1900 | 1883 | msgstr "" | ||
1901 | 1884 | |||
1902 | 1885 | #: bzrlib/builtins.py:3435 | ||
1903 | 1886 | msgid " Check everything at 'baz'::" | ||
1904 | 1887 | msgstr "" | ||
1905 | 1888 | |||
1906 | 1889 | #: bzrlib/builtins.py:3437 | ||
1907 | 1890 | msgid " bzr check baz" | ||
1908 | 1891 | msgstr "" | ||
1909 | 1892 | |||
1910 | 1893 | # help of 'branch' option of 'check' command | ||
1911 | 1894 | #: bzrlib/builtins.py:3443 | ||
1912 | 1895 | msgid "Check the branch related to the current directory." | ||
1913 | 1896 | msgstr "" | ||
1914 | 1897 | |||
1915 | 1898 | # help of 'repo' option of 'check' command | ||
1916 | 1899 | #: bzrlib/builtins.py:3445 | ||
1917 | 1900 | msgid "Check the repository related to the current directory." | ||
1918 | 1901 | msgstr "" | ||
1919 | 1902 | |||
1920 | 1903 | # help of 'tree' option of 'check' command | ||
1921 | 1904 | #: bzrlib/builtins.py:3447 | ||
1922 | 1905 | msgid "Check the working tree related to the current directory." | ||
1923 | 1906 | msgstr "" | ||
1924 | 1907 | |||
1925 | 1908 | #: bzrlib/builtins.py:3461 | ||
1926 | 1909 | msgid "Upgrade a repository, branch or working tree to a newer format." | ||
1927 | 1910 | msgstr "" | ||
1928 | 1911 | |||
1929 | 1912 | #: bzrlib/builtins.py:3463 | ||
1930 | 1913 | msgid "" | ||
1931 | 1914 | "When the default format has changed after a major new release of\n" | ||
1932 | 1915 | "Bazaar, you may be informed during certain operations that you\n" | ||
1933 | 1916 | "should upgrade. Upgrading to a newer format may improve performance\n" | ||
1934 | 1917 | "or make new features available. It may however limit interoperability\n" | ||
1935 | 1918 | "with older repositories or with older versions of Bazaar." | ||
1936 | 1919 | msgstr "" | ||
1937 | 1920 | |||
1938 | 1921 | #: bzrlib/builtins.py:3469 | ||
1939 | 1922 | msgid "" | ||
1940 | 1923 | "If you wish to upgrade to a particular format rather than the\n" | ||
1941 | 1924 | "current default, that can be specified using the --format option.\n" | ||
1942 | 1925 | "As a consequence, you can use the upgrade command this way to\n" | ||
1943 | 1926 | "\"downgrade\" to an earlier format, though some conversions are\n" | ||
1944 | 1927 | "a one way process (e.g. changing from the 1.x default to the\n" | ||
1945 | 1928 | "2.x default) so downgrading is not always possible." | ||
1946 | 1929 | msgstr "" | ||
1947 | 1930 | |||
1948 | 1931 | #: bzrlib/builtins.py:3476 | ||
1949 | 1932 | msgid "" | ||
1950 | 1933 | "A backup.bzr.~#~ directory is created at the start of the conversion\n" | ||
1951 | 1934 | "process (where # is a number). By default, this is left there on\n" | ||
1952 | 1935 | "completion. If the conversion fails, delete the new .bzr directory\n" | ||
1953 | 1936 | "and rename this one back in its place. Use the --clean option to ask\n" | ||
1954 | 1937 | "for the backup.bzr directory to be removed on successful conversion.\n" | ||
1955 | 1938 | "Alternatively, you can delete it by hand if everything looks good\n" | ||
1956 | 1939 | "afterwards." | ||
1957 | 1940 | msgstr "" | ||
1958 | 1941 | |||
1959 | 1942 | #: bzrlib/builtins.py:3484 | ||
1960 | 1943 | msgid "" | ||
1961 | 1944 | "If the location given is a shared repository, dependent branches\n" | ||
1962 | 1945 | "are also converted provided the repository converts successfully.\n" | ||
1963 | 1946 | "If the conversion of a branch fails, remaining branches are still\n" | ||
1964 | 1947 | "tried." | ||
1965 | 1948 | msgstr "" | ||
1966 | 1949 | |||
1967 | 1950 | #: bzrlib/builtins.py:3489 | ||
1968 | 1951 | msgid "" | ||
1969 | 1952 | "For more information on upgrades, see the Bazaar Upgrade Guide,\n" | ||
1970 | 1953 | "http://doc.bazaar.canonical.com/latest/en/upgrade-guide/." | ||
1971 | 1954 | msgstr "" | ||
1972 | 1955 | |||
1973 | 1956 | # help of 'format' option of 'upgrade' command | ||
1974 | 1957 | #: bzrlib/builtins.py:3497 | ||
1975 | 1958 | msgid "Upgrade to a specific format. See \"bzr help formats\" for details." | ||
1976 | 1959 | msgstr "" | ||
1977 | 1960 | |||
1978 | 1961 | # title of 'format' option of 'init' command | ||
1979 | 1962 | #: bzrlib/builtins.py:3501 | ||
1980 | 1963 | msgid "Branch format" | ||
1981 | 1964 | msgstr "" | ||
1982 | 1965 | |||
1983 | 1966 | # help of 'clean' option of 'upgrade' command | ||
1984 | 1967 | #: bzrlib/builtins.py:3503 | ||
1985 | 1968 | msgid "Remove the backup.bzr directory if successful." | ||
1986 | 1969 | msgstr "" | ||
1987 | 1970 | |||
1988 | 1971 | #: bzrlib/builtins.py:3520 | ||
1989 | 1972 | msgid "Show or set bzr user id." | ||
1990 | 1973 | msgstr "" | ||
1991 | 1974 | |||
1992 | 1975 | #: bzrlib/builtins.py:3522 | ||
1993 | 1976 | msgid "" | ||
1994 | 1977 | ":Examples:\n" | ||
1995 | 1978 | " Show the email of the current user::" | ||
1996 | 1979 | msgstr "" | ||
1997 | 1980 | |||
1998 | 1981 | #: bzrlib/builtins.py:3525 | ||
1999 | 1982 | msgid " bzr whoami --email" | ||
2000 | 1983 | msgstr "" | ||
2001 | 1984 | |||
2002 | 1985 | #: bzrlib/builtins.py:3527 | ||
2003 | 1986 | msgid " Set the current user::" | ||
2004 | 1987 | msgstr "" | ||
2005 | 1988 | |||
2006 | 1989 | #: bzrlib/builtins.py:3529 | ||
2007 | 1990 | msgid " bzr whoami \"Frank Chu <fchu@example.com>\"" | ||
2008 | 1991 | msgstr "" | ||
2009 | 1992 | |||
2010 | 1993 | # help of 'email' option of 'whoami' command | ||
2011 | 1994 | #: bzrlib/builtins.py:3533 | ||
2012 | 1995 | msgid "Display email address only." | ||
2013 | 1996 | msgstr "" | ||
2014 | 1997 | |||
2015 | 1998 | # help of 'branch' option of 'whoami' command | ||
2016 | 1999 | #: bzrlib/builtins.py:3535 | ||
2017 | 2000 | msgid "Set identity for the current branch instead of globally." | ||
2018 | 2001 | msgstr "" | ||
2019 | 2002 | |||
2020 | 2003 | #: bzrlib/builtins.py:3581 | ||
2021 | 2004 | msgid "Print or set the branch nickname." | ||
2022 | 2005 | msgstr "" | ||
2023 | 2006 | |||
2024 | 2007 | #: bzrlib/builtins.py:3583 | ||
2025 | 2008 | msgid "" | ||
2026 | 2009 | "If unset, the tree root directory name is used as the nickname.\n" | ||
2027 | 2010 | "To print the current nickname, execute with no argument." | ||
2028 | 2011 | msgstr "" | ||
2029 | 2012 | |||
2030 | 2013 | #: bzrlib/builtins.py:3586 | ||
2031 | 2014 | msgid "" | ||
2032 | 2015 | "Bound branches use the nickname of its master branch unless it is set\n" | ||
2033 | 2016 | "locally." | ||
2034 | 2017 | msgstr "" | ||
2035 | 2018 | |||
2036 | 2019 | #: bzrlib/builtins.py:3606 | ||
2037 | 2020 | msgid "Set/unset and display aliases." | ||
2038 | 2021 | msgstr "" | ||
2039 | 2022 | |||
2040 | 2023 | #: bzrlib/builtins.py:3608 | ||
2041 | 2024 | msgid "" | ||
2042 | 2025 | ":Examples:\n" | ||
2043 | 2026 | " Show the current aliases::" | ||
2044 | 2027 | msgstr "" | ||
2045 | 2028 | |||
2046 | 2029 | #: bzrlib/builtins.py:3611 | ||
2047 | 2030 | msgid " bzr alias" | ||
2048 | 2031 | msgstr "" | ||
2049 | 2032 | |||
2050 | 2033 | #: bzrlib/builtins.py:3613 | ||
2051 | 2034 | msgid " Show the alias specified for 'll'::" | ||
2052 | 2035 | msgstr "" | ||
2053 | 2036 | |||
2054 | 2037 | #: bzrlib/builtins.py:3615 | ||
2055 | 2038 | msgid " bzr alias ll" | ||
2056 | 2039 | msgstr "" | ||
2057 | 2040 | |||
2058 | 2041 | #: bzrlib/builtins.py:3617 | ||
2059 | 2042 | msgid " Set an alias for 'll'::" | ||
2060 | 2043 | msgstr "" | ||
2061 | 2044 | |||
2062 | 2045 | #: bzrlib/builtins.py:3619 | ||
2063 | 2046 | msgid " bzr alias ll=\"log --line -r-10..-1\"" | ||
2064 | 2047 | msgstr "" | ||
2065 | 2048 | |||
2066 | 2049 | #: bzrlib/builtins.py:3621 | ||
2067 | 2050 | msgid " To remove an alias for 'll'::" | ||
2068 | 2051 | msgstr "" | ||
2069 | 2052 | |||
2070 | 2053 | #: bzrlib/builtins.py:3623 | ||
2071 | 2054 | msgid " bzr alias --remove ll" | ||
2072 | 2055 | msgstr "" | ||
2073 | 2056 | |||
2074 | 2057 | # help of 'remove' option of 'alias' command | ||
2075 | 2058 | #: bzrlib/builtins.py:3628 | ||
2076 | 2059 | msgid "Remove the alias." | ||
2077 | 2060 | msgstr "" | ||
2078 | 2061 | |||
2079 | 2062 | #: bzrlib/builtins.py:3867 | ||
2080 | 2063 | msgid "Show version of bzr." | ||
2081 | 2064 | msgstr "" | ||
2082 | 2065 | |||
2083 | 2066 | # help of 'short' option of 'version' command | ||
2084 | 2067 | #: bzrlib/builtins.py:3871 | ||
2085 | 2068 | msgid "Print just the version number." | ||
2086 | 2069 | msgstr "" | ||
2087 | 2070 | |||
2088 | 2071 | #: bzrlib/builtins.py:3918 | ||
2089 | 2072 | msgid "Perform a three-way merge." | ||
2090 | 2073 | msgstr "" | ||
2091 | 2074 | |||
2092 | 2075 | #: bzrlib/builtins.py:3920 | ||
2093 | 2076 | msgid "" | ||
2094 | 2077 | "The source of the merge can be specified either in the form of a branch,\n" | ||
2095 | 2078 | "or in the form of a path to a file containing a merge directive generated\n" | ||
2096 | 2079 | "with bzr send. If neither is specified, the default is the upstream branch\n" | ||
2097 | 2080 | "or the branch most recently merged using --remember. The source of the\n" | ||
2098 | 2081 | "merge may also be specified in the form of a path to a file in another\n" | ||
2099 | 2082 | "branch: in this case, only the modifications to that file are merged into\n" | ||
2100 | 2083 | "the current working tree." | ||
2101 | 2084 | msgstr "" | ||
2102 | 2085 | |||
2103 | 2086 | #: bzrlib/builtins.py:3928 | ||
2104 | 2087 | msgid "" | ||
2105 | 2088 | "When merging from a branch, by default bzr will try to merge in all new\n" | ||
2106 | 2089 | "work from the other branch, automatically determining an appropriate base\n" | ||
2107 | 2090 | "revision. If this fails, you may need to give an explicit base." | ||
2108 | 2091 | msgstr "" | ||
2109 | 2092 | |||
2110 | 2093 | #: bzrlib/builtins.py:3932 | ||
2111 | 2094 | msgid "" | ||
2112 | 2095 | "To pick a different ending revision, pass \"--revision OTHER\". bzr will\n" | ||
2113 | 2096 | "try to merge in all new work up to and including revision OTHER." | ||
2114 | 2097 | msgstr "" | ||
2115 | 2098 | |||
2116 | 2099 | #: bzrlib/builtins.py:3935 | ||
2117 | 2100 | msgid "" | ||
2118 | 2101 | "If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n" | ||
2119 | 2102 | "through OTHER, excluding BASE but including OTHER, will be merged. If this\n" | ||
2120 | 2103 | "causes some revisions to be skipped, i.e. if the destination branch does\n" | ||
2121 | 2104 | "not already contain revision BASE, such a merge is commonly referred to as\n" | ||
2122 | 2105 | "a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n" | ||
2123 | 2106 | "cherrypicks. The changes look like a normal commit, and the history of the\n" | ||
2124 | 2107 | "changes from the other branch is not stored in the commit." | ||
2125 | 2108 | msgstr "" | ||
2126 | 2109 | |||
2127 | 2110 | #: bzrlib/builtins.py:3943 | ||
2128 | 2111 | msgid "Revision numbers are always relative to the source branch." | ||
2129 | 2112 | msgstr "" | ||
2130 | 2113 | |||
2131 | 2114 | #: bzrlib/builtins.py:3950 | ||
2132 | 2115 | msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts." | ||
2133 | 2116 | msgstr "" | ||
2134 | 2117 | |||
2135 | 2118 | #: bzrlib/builtins.py:3952 | ||
2136 | 2119 | msgid "" | ||
2137 | 2120 | "If there is no default branch set, the first merge will set it (use\n" | ||
2138 | 2121 | "--no-remember to avoid settting it). After that, you can omit the branch\n" | ||
2139 | 2122 | "to use the default. To change the default, use --remember. The value will\n" | ||
2140 | 2123 | "only be saved if the remote location can be accessed." | ||
2141 | 2124 | msgstr "" | ||
2142 | 2125 | |||
2143 | 2126 | #: bzrlib/builtins.py:3957 | ||
2144 | 2127 | msgid "" | ||
2145 | 2128 | "The results of the merge are placed into the destination working\n" | ||
2146 | 2129 | "directory, where they can be reviewed (with bzr diff), tested, and then\n" | ||
2147 | 2130 | "committed to record the result of the merge." | ||
2148 | 2131 | msgstr "" | ||
2149 | 2132 | |||
2150 | 2133 | #: bzrlib/builtins.py:3961 | ||
2151 | 2134 | msgid "" | ||
2152 | 2135 | "merge refuses to run if there are any uncommitted changes, unless\n" | ||
2153 | 2136 | "--force is given. If --force is given, then the changes from the source \n" | ||
2154 | 2137 | "will be merged with the current working tree, including any uncommitted\n" | ||
2155 | 2138 | "changes in the tree. The --force option can also be used to create a\n" | ||
2156 | 2139 | "merge revision which has more than two parents." | ||
2157 | 2140 | msgstr "" | ||
2158 | 2141 | |||
2159 | 2142 | #: bzrlib/builtins.py:3967 | ||
2160 | 2143 | msgid "" | ||
2161 | 2144 | "If one would like to merge changes from the working tree of the other\n" | ||
2162 | 2145 | "branch without merging any committed revisions, the --uncommitted option\n" | ||
2163 | 2146 | "can be given." | ||
2164 | 2147 | msgstr "" | ||
2165 | 2148 | |||
2166 | 2149 | #: bzrlib/builtins.py:3971 | ||
2167 | 2150 | msgid "" | ||
2168 | 2151 | "To select only some changes to merge, use \"merge -i\", which will prompt\n" | ||
2169 | 2152 | "you to apply each diff hunk and file change, similar to \"shelve\"." | ||
2170 | 2153 | msgstr "" | ||
2171 | 2154 | |||
2172 | 2155 | #: bzrlib/builtins.py:3974 | ||
2173 | 2156 | msgid "" | ||
2174 | 2157 | ":Examples:\n" | ||
2175 | 2158 | " To merge all new revisions from bzr.dev::" | ||
2176 | 2159 | msgstr "" | ||
2177 | 2160 | |||
2178 | 2161 | #: bzrlib/builtins.py:3977 | ||
2179 | 2162 | msgid " bzr merge ../bzr.dev" | ||
2180 | 2163 | msgstr "" | ||
2181 | 2164 | |||
2182 | 2165 | #: bzrlib/builtins.py:3979 | ||
2183 | 2166 | msgid " To merge changes up to and including revision 82 from bzr.dev::" | ||
2184 | 2167 | msgstr "" | ||
2185 | 2168 | |||
2186 | 2169 | #: bzrlib/builtins.py:3981 | ||
2187 | 2170 | msgid " bzr merge -r 82 ../bzr.dev" | ||
2188 | 2171 | msgstr "" | ||
2189 | 2172 | |||
2190 | 2173 | #: bzrlib/builtins.py:3983 | ||
2191 | 2174 | msgid " To merge the changes introduced by 82, without previous changes::" | ||
2192 | 2175 | msgstr "" | ||
2193 | 2176 | |||
2194 | 2177 | #: bzrlib/builtins.py:3985 | ||
2195 | 2178 | msgid " bzr merge -r 81..82 ../bzr.dev" | ||
2196 | 2179 | msgstr "" | ||
2197 | 2180 | |||
2198 | 2181 | #: bzrlib/builtins.py:3987 | ||
2199 | 2182 | msgid " To apply a merge directive contained in /tmp/merge::" | ||
2200 | 2183 | msgstr "" | ||
2201 | 2184 | |||
2202 | 2185 | #: bzrlib/builtins.py:3989 | ||
2203 | 2186 | msgid " bzr merge /tmp/merge" | ||
2204 | 2187 | msgstr "" | ||
2205 | 2188 | |||
2206 | 2189 | #: bzrlib/builtins.py:3991 | ||
2207 | 2190 | msgid "" | ||
2208 | 2191 | " To create a merge revision with three parents from two branches\n" | ||
2209 | 2192 | " feature1a and feature1b:" | ||
2210 | 2193 | msgstr "" | ||
2211 | 2194 | |||
2212 | 2195 | #: bzrlib/builtins.py:3994 | ||
2213 | 2196 | msgid "" | ||
2214 | 2197 | " bzr merge ../feature1a\n" | ||
2215 | 2198 | " bzr merge ../feature1b --force\n" | ||
2216 | 2199 | " bzr commit -m 'revision with three parents'" | ||
2217 | 2200 | msgstr "" | ||
2218 | 2201 | |||
2219 | 2202 | # help of 'force' option of 'merge' command | ||
2220 | 2203 | #: bzrlib/builtins.py:4006 | ||
2221 | 2204 | msgid "Merge even if the destination tree has uncommitted changes." | ||
2222 | 2205 | msgstr "" | ||
2223 | 2206 | |||
2224 | 2207 | # help of 'uncommitted' option of 'merge' command | ||
2225 | 2208 | #: bzrlib/builtins.py:4012 | ||
2226 | 2209 | msgid "" | ||
2227 | 2210 | "Apply uncommitted changes from a working copy, instead of branch changes." | ||
2228 | 2211 | msgstr "" | ||
2229 | 2212 | |||
2230 | 2213 | # help of 'pull' option of 'merge' command | ||
2231 | 2214 | #: bzrlib/builtins.py:4014 | ||
2232 | 2215 | msgid "" | ||
2233 | 2216 | "If the destination is already completely merged into the source, pull from " | ||
2234 | 2217 | "the source rather than merging. When this happens, you do not need to " | ||
2235 | 2218 | "commit the result." | ||
2236 | 2219 | msgstr "" | ||
2237 | 2220 | |||
2238 | 2221 | # help of 'directory' option of 'merge' command | ||
2239 | 2222 | #: bzrlib/builtins.py:4019 | ||
2240 | 2223 | msgid "" | ||
2241 | 2224 | "Branch to merge into, rather than the one containing the working directory." | ||
2242 | 2225 | msgstr "" | ||
2243 | 2226 | |||
2244 | 2227 | # help of 'preview' option of 'merge' command | ||
2245 | 2228 | #: bzrlib/builtins.py:4021 | ||
2246 | 2229 | msgid "Instead of merging, show a diff of the merge." | ||
2247 | 2230 | msgstr "" | ||
2248 | 2231 | |||
2249 | 2232 | # help of 'interactive' option of 'merge' command | ||
2250 | 2233 | #: bzrlib/builtins.py:4023 | ||
2251 | 2234 | msgid "Select changes interactively." | ||
2252 | 2235 | msgstr "" | ||
2253 | 2236 | |||
2254 | 2237 | #: bzrlib/builtins.py:4307 | ||
2255 | 2238 | msgid "Redo a merge." | ||
2256 | 2239 | msgstr "" | ||
2257 | 2240 | |||
2258 | 2241 | #: bzrlib/builtins.py:4309 | ||
2259 | 2242 | msgid "" | ||
2260 | 2243 | "Use this if you want to try a different merge technique while resolving\n" | ||
2261 | 2244 | "conflicts. Some merge techniques are better than others, and remerge\n" | ||
2262 | 2245 | "lets you try different ones on different files." | ||
2263 | 2246 | msgstr "" | ||
2264 | 2247 | |||
2265 | 2248 | #: bzrlib/builtins.py:4313 | ||
2266 | 2249 | msgid "" | ||
2267 | 2250 | "The options for remerge have the same meaning and defaults as the ones for\n" | ||
2268 | 2251 | "merge. The difference is that remerge can (only) be run when there is a\n" | ||
2269 | 2252 | "pending merge, and it lets you specify particular files." | ||
2270 | 2253 | msgstr "" | ||
2271 | 2254 | |||
2272 | 2255 | #: bzrlib/builtins.py:4317 | ||
2273 | 2256 | msgid "" | ||
2274 | 2257 | ":Examples:\n" | ||
2275 | 2258 | " Re-do the merge of all conflicted files, and show the base text in\n" | ||
2276 | 2259 | " conflict regions, in addition to the usual THIS and OTHER texts::" | ||
2277 | 2260 | msgstr "" | ||
2278 | 2261 | |||
2279 | 2262 | #: bzrlib/builtins.py:4321 | ||
2280 | 2263 | msgid " bzr remerge --show-base" | ||
2281 | 2264 | msgstr "" | ||
2282 | 2265 | |||
2283 | 2266 | #: bzrlib/builtins.py:4323 | ||
2284 | 2267 | msgid "" | ||
2285 | 2268 | " Re-do the merge of \"foobar\", using the weave merge algorithm, with\n" | ||
2286 | 2269 | " additional processing to reduce the size of conflict regions::" | ||
2287 | 2270 | msgstr "" | ||
2288 | 2271 | |||
2289 | 2272 | #: bzrlib/builtins.py:4326 | ||
2290 | 2273 | msgid " bzr remerge --merge-type weave --reprocess foobar" | ||
2291 | 2274 | msgstr "" | ||
2292 | 2275 | |||
2293 | 2276 | # help of 'show-base' option of 'merge' command | ||
2294 | 2277 | #: bzrlib/builtins.py:4333 | ||
2295 | 2278 | msgid "Show base revision text in conflicts." | ||
2296 | 2279 | msgstr "" | ||
2297 | 2280 | |||
2298 | 2281 | #: bzrlib/builtins.py:4401 | ||
2299 | 2282 | msgid "Revert files to a previous revision." | ||
2300 | 2283 | msgstr "" | ||
2301 | 2284 | |||
2302 | 2285 | #: bzrlib/builtins.py:4403 | ||
2303 | 2286 | msgid "" | ||
2304 | 2287 | "Giving a list of files will revert only those files. Otherwise, all files\n" | ||
2305 | 2288 | "will be reverted. If the revision is not specified with '--revision', the\n" | ||
2306 | 2289 | "last committed revision is used." | ||
2307 | 2290 | msgstr "" | ||
2308 | 2291 | |||
2309 | 2292 | #: bzrlib/builtins.py:4407 | ||
2310 | 2293 | msgid "" | ||
2311 | 2294 | "To remove only some changes, without reverting to a prior version, use\n" | ||
2312 | 2295 | "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n" | ||
2313 | 2296 | "will remove the changes introduced by the second last commit (-2), without\n" | ||
2314 | 2297 | "affecting the changes introduced by the last commit (-1). To remove\n" | ||
2315 | 2298 | "certain changes on a hunk-by-hunk basis, see the shelve command." | ||
2316 | 2299 | msgstr "" | ||
2317 | 2300 | |||
2318 | 2301 | #: bzrlib/builtins.py:4413 | ||
2319 | 2302 | msgid "" | ||
2320 | 2303 | "By default, any files that have been manually changed will be backed up\n" | ||
2321 | 2304 | "first. (Files changed only by merge are not backed up.) Backup files have\n" | ||
2322 | 2305 | "'.~#~' appended to their name, where # is a number." | ||
2323 | 2306 | msgstr "" | ||
2324 | 2307 | |||
2325 | 2308 | #: bzrlib/builtins.py:4417 | ||
2326 | 2309 | msgid "" | ||
2327 | 2310 | "When you provide files, you can use their current pathname or the pathname\n" | ||
2328 | 2311 | "from the target revision. So you can use revert to \"undelete\" a file by\n" | ||
2329 | 2312 | "name. If you name a directory, all the contents of that directory will be\n" | ||
2330 | 2313 | "reverted." | ||
2331 | 2314 | msgstr "" | ||
2332 | 2315 | |||
2333 | 2316 | #: bzrlib/builtins.py:4422 | ||
2334 | 2317 | msgid "" | ||
2335 | 2318 | "If you have newly added files since the target revision, they will be\n" | ||
2336 | 2319 | "removed. If the files to be removed have been changed, backups will be\n" | ||
2337 | 2320 | "created as above. Directories containing unknown files will not be\n" | ||
2338 | 2321 | "deleted." | ||
2339 | 2322 | msgstr "" | ||
2340 | 2323 | |||
2341 | 2324 | #: bzrlib/builtins.py:4427 | ||
2342 | 2325 | msgid "" | ||
2343 | 2326 | "The working tree contains a list of revisions that have been merged but\n" | ||
2344 | 2327 | "not yet committed. These revisions will be included as additional parents\n" | ||
2345 | 2328 | "of the next commit. Normally, using revert clears that list as well as\n" | ||
2346 | 2329 | "reverting the files. If any files are specified, revert leaves the list\n" | ||
2347 | 2330 | "of uncommitted merges alone and reverts only the files. Use ``bzr revert\n" | ||
2348 | 2331 | ".`` in the tree root to revert all files but keep the recorded merges,\n" | ||
2349 | 2332 | "and ``bzr revert --forget-merges`` to clear the pending merge list without\n" | ||
2350 | 2333 | "reverting any files." | ||
2351 | 2334 | msgstr "" | ||
2352 | 2335 | |||
2353 | 2336 | #: bzrlib/builtins.py:4436 | ||
2354 | 2337 | msgid "" | ||
2355 | 2338 | "Using \"bzr revert --forget-merges\", it is possible to apply all of the\n" | ||
2356 | 2339 | "changes from a branch in a single revision. To do this, perform the merge\n" | ||
2357 | 2340 | "as desired. Then doing revert with the \"--forget-merges\" option will " | ||
2358 | 2341 | "keep\n" | ||
2359 | 2342 | "the content of the tree as it was, but it will clear the list of pending\n" | ||
2360 | 2343 | "merges. The next commit will then contain all of the changes that are\n" | ||
2361 | 2344 | "present in the other branch, but without any other parent revisions.\n" | ||
2362 | 2345 | "Because this technique forgets where these changes originated, it may\n" | ||
2363 | 2346 | "cause additional conflicts on later merges involving the same source and\n" | ||
2364 | 2347 | "target branches." | ||
2365 | 2348 | msgstr "" | ||
2366 | 2349 | |||
2367 | 2350 | # help of 'no-backup' option of 'revert' command | ||
2368 | 2351 | #: bzrlib/builtins.py:4450 | ||
2369 | 2352 | msgid "Do not save backups of reverted files." | ||
2370 | 2353 | msgstr "" | ||
2371 | 2354 | |||
2372 | 2355 | # help of 'forget-merges' option of 'revert' command | ||
2373 | 2356 | #: bzrlib/builtins.py:4452 | ||
2374 | 2357 | msgid "Remove pending merge marker, without changing any files." | ||
2375 | 2358 | msgstr "" | ||
2376 | 2359 | |||
2377 | 2360 | #: bzrlib/builtins.py:4483 | ||
2378 | 2361 | msgid "" | ||
2379 | 2362 | "Show help on a command or other topic.\n" | ||
2380 | 2363 | " " | ||
2381 | 2364 | msgstr "" | ||
2382 | 2365 | |||
2383 | 2366 | # help of 'long' option of 'help' command | ||
2384 | 2367 | #: bzrlib/builtins.py:4488 | ||
2385 | 2368 | msgid "Show help on all commands." | ||
2386 | 2369 | msgstr "" | ||
2387 | 2370 | |||
2388 | 2371 | #: bzrlib/builtins.py:4517 | ||
2389 | 2372 | msgid "Show unmerged/unpulled revisions between two branches." | ||
2390 | 2373 | msgstr "" | ||
2391 | 2374 | |||
2392 | 2375 | #: bzrlib/builtins.py:4519 | ||
2393 | 2376 | msgid "OTHER_BRANCH may be local or remote." | ||
2394 | 2377 | msgstr "" | ||
2395 | 2378 | |||
2396 | 2379 | #: bzrlib/builtins.py:4521 | ||
2397 | 2380 | msgid "" | ||
2398 | 2381 | "To filter on a range of revisions, you can use the command -r begin..end\n" | ||
2399 | 2382 | "-r revision requests a specific revision, -r ..end or -r begin.. are\n" | ||
2400 | 2383 | "also valid.\n" | ||
2401 | 2384 | " \n" | ||
2402 | 2385 | ":Exit values:\n" | ||
2403 | 2386 | " 1 - some missing revisions\n" | ||
2404 | 2387 | " 0 - no missing revisions" | ||
2405 | 2388 | msgstr "" | ||
2406 | 2389 | |||
2407 | 2390 | #: bzrlib/builtins.py:4531 | ||
2408 | 2391 | msgid "" | ||
2409 | 2392 | " Determine the missing revisions between this and the branch at the\n" | ||
2410 | 2393 | " remembered pull location::" | ||
2411 | 2394 | msgstr "" | ||
2412 | 2395 | |||
2413 | 2396 | #: bzrlib/builtins.py:4534 | ||
2414 | 2397 | msgid " bzr missing" | ||
2415 | 2398 | msgstr "" | ||
2416 | 2399 | |||
2417 | 2400 | #: bzrlib/builtins.py:4536 | ||
2418 | 2401 | msgid " Determine the missing revisions between this and another branch::" | ||
2419 | 2402 | msgstr "" | ||
2420 | 2403 | |||
2421 | 2404 | #: bzrlib/builtins.py:4538 | ||
2422 | 2405 | msgid " bzr missing http://server/branch" | ||
2423 | 2406 | msgstr "" | ||
2424 | 2407 | |||
2425 | 2408 | #: bzrlib/builtins.py:4540 | ||
2426 | 2409 | msgid "" | ||
2427 | 2410 | " Determine the missing revisions up to a specific revision on the other\n" | ||
2428 | 2411 | " branch::" | ||
2429 | 2412 | msgstr "" | ||
2430 | 2413 | |||
2431 | 2414 | #: bzrlib/builtins.py:4543 | ||
2432 | 2415 | msgid " bzr missing -r ..-10" | ||
2433 | 2416 | msgstr "" | ||
2434 | 2417 | |||
2435 | 2418 | #: bzrlib/builtins.py:4545 | ||
2436 | 2419 | msgid "" | ||
2437 | 2420 | " Determine the missing revisions up to a specific revision on this\n" | ||
2438 | 2421 | " branch::" | ||
2439 | 2422 | msgstr "" | ||
2440 | 2423 | |||
2441 | 2424 | #: bzrlib/builtins.py:4548 | ||
2442 | 2425 | msgid " bzr missing --my-revision ..-10" | ||
2443 | 2426 | msgstr "" | ||
2444 | 2427 | |||
2445 | 2428 | # help of 'reverse' option of 'missing' command | ||
2446 | 2429 | #: bzrlib/builtins.py:4555 | ||
2447 | 2430 | msgid "Reverse the order of revisions." | ||
2448 | 2431 | msgstr "" | ||
2449 | 2432 | |||
2450 | 2433 | # help of 'mine-only' option of 'missing' command | ||
2451 | 2434 | #: bzrlib/builtins.py:4557 | ||
2452 | 2435 | msgid "Display changes in the local branch only." | ||
2453 | 2436 | msgstr "" | ||
2454 | 2437 | |||
2455 | 2438 | # help of 'this' option of 'missing' command | ||
2456 | 2439 | #: bzrlib/builtins.py:4558 | ||
2457 | 2440 | msgid "Same as --mine-only." | ||
2458 | 2441 | msgstr "" | ||
2459 | 2442 | |||
2460 | 2443 | # help of 'theirs-only' option of 'missing' command | ||
2461 | 2444 | #: bzrlib/builtins.py:4560 | ||
2462 | 2445 | msgid "Display changes in the remote branch only." | ||
2463 | 2446 | msgstr "" | ||
2464 | 2447 | |||
2465 | 2448 | # help of 'other' option of 'missing' command | ||
2466 | 2449 | #: bzrlib/builtins.py:4561 | ||
2467 | 2450 | msgid "Same as --theirs-only." | ||
2468 | 2451 | msgstr "" | ||
2469 | 2452 | |||
2470 | 2453 | # help of 'revision' option of 'missing' command | ||
2471 | 2454 | #: bzrlib/builtins.py:4566 | ||
2472 | 2455 | msgid "" | ||
2473 | 2456 | "Filter on other branch revisions (inclusive). See \"help revisionspec\" for " | ||
2474 | 2457 | "details." | ||
2475 | 2458 | msgstr "" | ||
2476 | 2459 | |||
2477 | 2460 | # help of 'my-revision' option of 'missing' command | ||
2478 | 2461 | #: bzrlib/builtins.py:4570 | ||
2479 | 2462 | msgid "" | ||
2480 | 2463 | "Filter on local branch revisions (inclusive). See \"help revisionspec\" for " | ||
2481 | 2464 | "details." | ||
2482 | 2465 | msgstr "" | ||
2483 | 2466 | |||
2484 | 2467 | # help of 'include-merges' option of 'missing' command | ||
2485 | 2468 | #: bzrlib/builtins.py:4573 | ||
2486 | 2469 | msgid "Show all revisions in addition to the mainline ones." | ||
2487 | 2470 | msgstr "" | ||
2488 | 2471 | |||
2489 | 2472 | #: bzrlib/builtins.py:4689 | ||
2490 | 2473 | msgid "Compress the data within a repository." | ||
2491 | 2474 | msgstr "" | ||
2492 | 2475 | |||
2493 | 2476 | #: bzrlib/builtins.py:4691 | ||
2494 | 2477 | msgid "" | ||
2495 | 2478 | "This operation compresses the data within a bazaar repository. As\n" | ||
2496 | 2479 | "bazaar supports automatic packing of repository, this operation is\n" | ||
2497 | 2480 | "normally not required to be done manually." | ||
2498 | 2481 | msgstr "" | ||
2499 | 2482 | |||
2500 | 2483 | #: bzrlib/builtins.py:4695 | ||
2501 | 2484 | msgid "" | ||
2502 | 2485 | "During the pack operation, bazaar takes a backup of existing repository\n" | ||
2503 | 2486 | "data, i.e. pack files. This backup is eventually removed by bazaar\n" | ||
2504 | 2487 | "automatically when it is safe to do so. To save disk space by removing\n" | ||
2505 | 2488 | "the backed up pack files, the --clean-obsolete-packs option may be\n" | ||
2506 | 2489 | "used." | ||
2507 | 2490 | msgstr "" | ||
2508 | 2491 | |||
2509 | 2492 | #: bzrlib/builtins.py:4701 | ||
2510 | 2493 | msgid "" | ||
2511 | 2494 | "Warning: If you use --clean-obsolete-packs and your machine crashes\n" | ||
2512 | 2495 | "during or immediately after repacking, you may be left with a state\n" | ||
2513 | 2496 | "where the deletion has been written to disk but the new packs have not\n" | ||
2514 | 2497 | "been. In this case the repository may be unusable." | ||
2515 | 2498 | msgstr "" | ||
2516 | 2499 | |||
2517 | 2500 | # help of 'clean-obsolete-packs' option of 'pack' command | ||
2518 | 2501 | #: bzrlib/builtins.py:4710 | ||
2519 | 2502 | msgid "Delete obsolete packs to save disk space." | ||
2520 | 2503 | msgstr "" | ||
2521 | 2504 | |||
2522 | 2505 | #: bzrlib/builtins.py:4724 | ||
2523 | 2506 | msgid "List the installed plugins." | ||
2524 | 2507 | msgstr "" | ||
2525 | 2508 | |||
2526 | 2509 | #: bzrlib/builtins.py:4726 | ||
2527 | 2510 | msgid "" | ||
2528 | 2511 | "This command displays the list of installed plugins including\n" | ||
2529 | 2512 | "version of plugin and a short description of each." | ||
2530 | 2513 | msgstr "" | ||
2531 | 2514 | |||
2532 | 2515 | #: bzrlib/builtins.py:4729 | ||
2533 | 2516 | msgid "--verbose shows the path where each plugin is located." | ||
2534 | 2517 | msgstr "" | ||
2535 | 2518 | |||
2536 | 2519 | #: bzrlib/builtins.py:4731 | ||
2537 | 2520 | msgid "" | ||
2538 | 2521 | "A plugin is an external component for Bazaar that extends the\n" | ||
2539 | 2522 | "revision control system, by adding or replacing code in Bazaar.\n" | ||
2540 | 2523 | "Plugins can do a variety of things, including overriding commands,\n" | ||
2541 | 2524 | "adding new commands, providing additional network transports and\n" | ||
2542 | 2525 | "customizing log output." | ||
2543 | 2526 | msgstr "" | ||
2544 | 2527 | |||
2545 | 2528 | #: bzrlib/builtins.py:4737 | ||
2546 | 2529 | msgid "" | ||
2547 | 2530 | "See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n" | ||
2548 | 2531 | "for further information on plugins including where to find them and how to\n" | ||
2549 | 2532 | "install them. Instructions are also provided there on how to write new\n" | ||
2550 | 2533 | "plugins using the Python programming language." | ||
2551 | 2534 | msgstr "" | ||
2552 | 2535 | |||
2553 | 2536 | #: bzrlib/builtins.py:4753 | ||
2554 | 2537 | msgid "Show testament (signing-form) of a revision." | ||
2555 | 2538 | msgstr "" | ||
2556 | 2539 | |||
2557 | 2540 | # help of 'long' option of 'testament' command | ||
2558 | 2541 | #: bzrlib/builtins.py:4756 | ||
2559 | 2542 | msgid "Produce long-format testament." | ||
2560 | 2543 | msgstr "" | ||
2561 | 2544 | |||
2562 | 2545 | # help of 'strict' option of 'testament' command | ||
2563 | 2546 | #: bzrlib/builtins.py:4758 | ||
2564 | 2547 | msgid "Produce a strict-format testament." | ||
2565 | 2548 | msgstr "" | ||
2566 | 2549 | |||
2567 | 2550 | #: bzrlib/builtins.py:4784 | ||
2568 | 2551 | msgid "Show the origin of each line in a file." | ||
2569 | 2552 | msgstr "" | ||
2570 | 2553 | |||
2571 | 2554 | #: bzrlib/builtins.py:4786 | ||
2572 | 2555 | msgid "" | ||
2573 | 2556 | "This prints out the given file with an annotation on the left side\n" | ||
2574 | 2557 | "indicating which revision, author and date introduced the change." | ||
2575 | 2558 | msgstr "" | ||
2576 | 2559 | |||
2577 | 2560 | #: bzrlib/builtins.py:4789 | ||
2578 | 2561 | msgid "" | ||
2579 | 2562 | "If the origin is the same for a run of consecutive lines, it is\n" | ||
2580 | 2563 | "shown only at the top, unless the --all option is given." | ||
2581 | 2564 | msgstr "" | ||
2582 | 2565 | |||
2583 | 2566 | # help of 'all' option of 'annotate' command | ||
2584 | 2567 | #: bzrlib/builtins.py:4797 | ||
2585 | 2568 | msgid "Show annotations on all lines." | ||
2586 | 2569 | msgstr "" | ||
2587 | 2570 | |||
2588 | 2571 | # help of 'long' option of 'annotate' command | ||
2589 | 2572 | #: bzrlib/builtins.py:4798 | ||
2590 | 2573 | msgid "Show commit date in annotations." | ||
2591 | 2574 | msgstr "" | ||
2592 | 2575 | |||
2593 | 2576 | #: bzrlib/builtins.py:4901 | ||
2594 | 2577 | msgid "" | ||
2595 | 2578 | "Convert the current branch into a checkout of the supplied branch.\n" | ||
2596 | 2579 | "If no branch is supplied, rebind to the last bound location." | ||
2597 | 2580 | msgstr "" | ||
2598 | 2581 | |||
2599 | 2582 | #: bzrlib/builtins.py:4904 | ||
2600 | 2583 | msgid "" | ||
2601 | 2584 | "Once converted into a checkout, commits must succeed on the master branch\n" | ||
2602 | 2585 | "before they will be applied to the local branch." | ||
2603 | 2586 | msgstr "" | ||
2604 | 2587 | |||
2605 | 2588 | #: bzrlib/builtins.py:4907 | ||
2606 | 2589 | msgid "" | ||
2607 | 2590 | "Bound branches use the nickname of its master branch unless it is set\n" | ||
2608 | 2591 | "locally, in which case binding will update the local nickname to be\n" | ||
2609 | 2592 | "that of the master." | ||
2610 | 2593 | msgstr "" | ||
2611 | 2594 | |||
2612 | 2595 | #: bzrlib/builtins.py:4942 | ||
2613 | 2596 | msgid "Convert the current checkout into a regular branch." | ||
2614 | 2597 | msgstr "" | ||
2615 | 2598 | |||
2616 | 2599 | #: bzrlib/builtins.py:4944 | ||
2617 | 2600 | msgid "" | ||
2618 | 2601 | "After unbinding, the local branch is considered independent and subsequent\n" | ||
2619 | 2602 | "commits will be local only." | ||
2620 | 2603 | msgstr "" | ||
2621 | 2604 | |||
2622 | 2605 | #: bzrlib/builtins.py:4959 | ||
2623 | 2606 | msgid "Remove the last committed revision." | ||
2624 | 2607 | msgstr "" | ||
2625 | 2608 | |||
2626 | 2609 | #: bzrlib/builtins.py:4961 | ||
2627 | 2610 | msgid "" | ||
2628 | 2611 | "--verbose will print out what is being removed.\n" | ||
2629 | 2612 | "--dry-run will go through all the motions, but not actually\n" | ||
2630 | 2613 | "remove anything." | ||
2631 | 2614 | msgstr "" | ||
2632 | 2615 | |||
2633 | 2616 | #: bzrlib/builtins.py:4965 | ||
2634 | 2617 | msgid "" | ||
2635 | 2618 | "If --revision is specified, uncommit revisions to leave the branch at the\n" | ||
2636 | 2619 | "specified revision. For example, \"bzr uncommit -r 15\" will leave the\n" | ||
2637 | 2620 | "branch at revision 15." | ||
2638 | 2621 | msgstr "" | ||
2639 | 2622 | |||
2640 | 2623 | #: bzrlib/builtins.py:4969 | ||
2641 | 2624 | msgid "" | ||
2642 | 2625 | "Uncommit leaves the working tree ready for a new commit. The only change\n" | ||
2643 | 2626 | "it may make is to restore any pending merges that were present before\n" | ||
2644 | 2627 | "the commit." | ||
2645 | 2628 | msgstr "" | ||
2646 | 2629 | |||
2647 | 2630 | # help of 'dry-run' option of 'uncommit' command | ||
2648 | 2631 | #: bzrlib/builtins.py:4980 | ||
2649 | 2632 | msgid "Don't actually make changes." | ||
2650 | 2633 | msgstr "" | ||
2651 | 2634 | |||
2652 | 2635 | # help of 'force' option of 'uncommit' command | ||
2653 | 2636 | #: bzrlib/builtins.py:4981 | ||
2654 | 2637 | msgid "Say yes to all questions." | ||
2655 | 2638 | msgstr "" | ||
2656 | 2639 | |||
2657 | 2640 | # help of 'local' option of 'uncommit' command | ||
2658 | 2641 | #: bzrlib/builtins.py:4983 | ||
2659 | 2642 | msgid "Only remove the commits from the local branch when in a checkout." | ||
2660 | 2643 | msgstr "" | ||
2661 | 2644 | |||
2662 | 2645 | #: bzrlib/builtins.py:5068 | ||
2663 | 2646 | msgid "Break a dead lock." | ||
2664 | 2647 | msgstr "" | ||
2665 | 2648 | |||
2666 | 2649 | #: bzrlib/builtins.py:5070 | ||
2667 | 2650 | msgid "" | ||
2668 | 2651 | "This command breaks a lock on a repository, branch, working directory or\n" | ||
2669 | 2652 | "config file." | ||
2670 | 2653 | msgstr "" | ||
2671 | 2654 | |||
2672 | 2655 | #: bzrlib/builtins.py:5073 | ||
2673 | 2656 | msgid "" | ||
2674 | 2657 | "CAUTION: Locks should only be broken when you are sure that the process\n" | ||
2675 | 2658 | "holding the lock has been stopped." | ||
2676 | 2659 | msgstr "" | ||
2677 | 2660 | |||
2678 | 2661 | #: bzrlib/builtins.py:5076 | ||
2679 | 2662 | msgid "" | ||
2680 | 2663 | "You can get information on what locks are open via the 'bzr info\n" | ||
2681 | 2664 | "[location]' command." | ||
2682 | 2665 | msgstr "" | ||
2683 | 2666 | |||
2684 | 2667 | #: bzrlib/builtins.py:5079 | ||
2685 | 2668 | msgid "" | ||
2686 | 2669 | ":Examples:\n" | ||
2687 | 2670 | " bzr break-lock\n" | ||
2688 | 2671 | " bzr break-lock bzr+ssh://example.com/bzr/foo\n" | ||
2689 | 2672 | " bzr break-lock --conf ~/.bazaar" | ||
2690 | 2673 | msgstr "" | ||
2691 | 2674 | |||
2692 | 2675 | # help of 'config' option of 'break-lock' command | ||
2693 | 2676 | #: bzrlib/builtins.py:5088 | ||
2694 | 2677 | msgid "LOCATION is the directory where the config lock is." | ||
2695 | 2678 | msgstr "" | ||
2696 | 2679 | |||
2697 | 2680 | # help of 'force' option of 'break-lock' command | ||
2698 | 2681 | #: bzrlib/builtins.py:5090 | ||
2699 | 2682 | msgid "Do not ask for confirmation before breaking the lock." | ||
2700 | 2683 | msgstr "" | ||
2701 | 2684 | |||
2702 | 2685 | #: bzrlib/builtins.py:5126 | ||
2703 | 2686 | msgid "Run the bzr server." | ||
2704 | 2687 | msgstr "" | ||
2705 | 2688 | |||
2706 | 2689 | # help of 'inet' option of 'serve' command | ||
2707 | 2690 | #: bzrlib/builtins.py:5132 | ||
2708 | 2691 | msgid "Serve on stdin/out for use from inetd or sshd." | ||
2709 | 2692 | msgstr "" | ||
2710 | 2693 | |||
2711 | 2694 | # title of 'protocol' option of 'serve' command | ||
2712 | 2695 | #: bzrlib/builtins.py:5133 | ||
2713 | 2696 | msgid "protocol" | ||
2714 | 2697 | msgstr "" | ||
2715 | 2698 | |||
2716 | 2699 | # help of 'protocol' option of 'serve' command | ||
2717 | 2700 | #: bzrlib/builtins.py:5134 | ||
2718 | 2701 | msgid "Protocol to serve." | ||
2719 | 2702 | msgstr "" | ||
2720 | 2703 | |||
2721 | 2704 | # help of 'port' option of 'serve' command | ||
2722 | 2705 | #: bzrlib/builtins.py:5138 | ||
2723 | 2706 | msgid "" | ||
2724 | 2707 | "Listen for connections on nominated port of the form [hostname:]portnumber. " | ||
2725 | 2708 | "Passing 0 as the port number will result in a dynamically allocated port. " | ||
2726 | 2709 | "The default port depends on the protocol." | ||
2727 | 2710 | msgstr "" | ||
2728 | 2711 | |||
2729 | 2712 | # help of 'directory' option of 'serve' command | ||
2730 | 2713 | #: bzrlib/builtins.py:5144 | ||
2731 | 2714 | msgid "Serve contents of this directory." | ||
2732 | 2715 | msgstr "" | ||
2733 | 2716 | |||
2734 | 2717 | # help of 'allow-writes' option of 'serve' command | ||
2735 | 2718 | #: bzrlib/builtins.py:5146 | ||
2736 | 2719 | msgid "" | ||
2737 | 2720 | "By default the server is a readonly server. Supplying --allow-writes " | ||
2738 | 2721 | "enables write access to the contents of the served directory and below. " | ||
2739 | 2722 | "Note that ``bzr serve`` does not perform authentication, so unless some form " | ||
2740 | 2723 | "of external authentication is arranged supplying this option leads to global " | ||
2741 | 2724 | "uncontrolled write access to your file system." | ||
2742 | 2725 | msgstr "" | ||
2743 | 2726 | |||
2744 | 2727 | #: bzrlib/builtins.py:5191 | ||
2745 | 2728 | msgid "Combine a tree into its containing tree." | ||
2746 | 2729 | msgstr "" | ||
2747 | 2730 | |||
2748 | 2731 | #: bzrlib/builtins.py:5193 | ||
2749 | 2732 | msgid "This command requires the target tree to be in a rich-root format." | ||
2750 | 2733 | msgstr "" | ||
2751 | 2734 | |||
2752 | 2735 | #: bzrlib/builtins.py:5195 | ||
2753 | 2736 | msgid "" | ||
2754 | 2737 | "The TREE argument should be an independent tree, inside another tree, but\n" | ||
2755 | 2738 | "not part of it. (Such trees can be produced by \"bzr split\", but also by\n" | ||
2756 | 2739 | "running \"bzr branch\" with the target inside a tree.)" | ||
2757 | 2740 | msgstr "" | ||
2758 | 2741 | |||
2759 | 2742 | #: bzrlib/builtins.py:5199 | ||
2760 | 2743 | msgid "" | ||
2761 | 2744 | "The result is a combined tree, with the subtree no longer an independent\n" | ||
2762 | 2745 | "part. This is marked as a merge of the subtree into the containing tree,\n" | ||
2763 | 2746 | "and all history is preserved." | ||
2764 | 2747 | msgstr "" | ||
2765 | 2748 | |||
2766 | 2749 | #: bzrlib/builtins.py:5237 | ||
2767 | 2750 | msgid "Split a subdirectory of a tree into a separate tree." | ||
2768 | 2751 | msgstr "" | ||
2769 | 2752 | |||
2770 | 2753 | #: bzrlib/builtins.py:5239 | ||
2771 | 2754 | msgid "" | ||
2772 | 2755 | "This command will produce a target tree in a format that supports\n" | ||
2773 | 2756 | "rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n" | ||
2774 | 2757 | "converted into earlier formats like 'dirstate-tags'." | ||
2775 | 2758 | msgstr "" | ||
2776 | 2759 | |||
2777 | 2760 | #: bzrlib/builtins.py:5243 | ||
2778 | 2761 | msgid "" | ||
2779 | 2762 | "The TREE argument should be a subdirectory of a working tree. That\n" | ||
2780 | 2763 | "subdirectory will be converted into an independent tree, with its own\n" | ||
2781 | 2764 | "branch. Commits in the top-level tree will not apply to the new subtree." | ||
2782 | 2765 | msgstr "" | ||
2783 | 2766 | |||
2784 | 2767 | #: bzrlib/builtins.py:5364 | ||
2785 | 2768 | msgid "Mail or create a merge-directive for submitting changes." | ||
2786 | 2769 | msgstr "" | ||
2787 | 2770 | |||
2788 | 2771 | #: bzrlib/builtins.py:5366 | ||
2789 | 2772 | msgid "A merge directive provides many things needed for requesting merges:" | ||
2790 | 2773 | msgstr "" | ||
2791 | 2774 | |||
2792 | 2775 | #: bzrlib/builtins.py:5368 | ||
2793 | 2776 | msgid "* A machine-readable description of the merge to perform" | ||
2794 | 2777 | msgstr "" | ||
2795 | 2778 | |||
2796 | 2779 | #: bzrlib/builtins.py:5370 | ||
2797 | 2780 | msgid "* An optional patch that is a preview of the changes requested" | ||
2798 | 2781 | msgstr "" | ||
2799 | 2782 | |||
2800 | 2783 | #: bzrlib/builtins.py:5372 | ||
2801 | 2784 | msgid "" | ||
2802 | 2785 | "* An optional bundle of revision data, so that the changes can be applied\n" | ||
2803 | 2786 | " directly from the merge directive, without retrieving data from a\n" | ||
2804 | 2787 | " branch." | ||
2805 | 2788 | msgstr "" | ||
2806 | 2789 | |||
2807 | 2790 | #: bzrlib/builtins.py:5376 | ||
2808 | 2791 | msgid "" | ||
2809 | 2792 | "`bzr send` creates a compact data set that, when applied using bzr\n" | ||
2810 | 2793 | "merge, has the same effect as merging from the source branch. " | ||
2811 | 2794 | msgstr "" | ||
2812 | 2795 | |||
2813 | 2796 | #: bzrlib/builtins.py:5379 | ||
2814 | 2797 | msgid "" | ||
2815 | 2798 | "By default the merge directive is self-contained and can be applied to any\n" | ||
2816 | 2799 | "branch containing submit_branch in its ancestory without needing access to\n" | ||
2817 | 2800 | "the source branch." | ||
2818 | 2801 | msgstr "" | ||
2819 | 2802 | |||
2820 | 2803 | #: bzrlib/builtins.py:5383 | ||
2821 | 2804 | msgid "" | ||
2822 | 2805 | "If --no-bundle is specified, then Bazaar doesn't send the contents of the\n" | ||
2823 | 2806 | "revisions, but only a structured request to merge from the\n" | ||
2824 | 2807 | "public_location. In that case the public_branch is needed and it must be\n" | ||
2825 | 2808 | "up-to-date and accessible to the recipient. The public_branch is always\n" | ||
2826 | 2809 | "included if known, so that people can check it later." | ||
2827 | 2810 | msgstr "" | ||
2828 | 2811 | |||
2829 | 2812 | #: bzrlib/builtins.py:5389 | ||
2830 | 2813 | msgid "" | ||
2831 | 2814 | "The submit branch defaults to the parent of the source branch, but can be\n" | ||
2832 | 2815 | "overridden. Both submit branch and public branch will be remembered in\n" | ||
2833 | 2816 | "branch.conf the first time they are used for a particular branch. The\n" | ||
2834 | 2817 | "source branch defaults to that containing the working directory, but can\n" | ||
2835 | 2818 | "be changed using --from." | ||
2836 | 2819 | msgstr "" | ||
2837 | 2820 | |||
2838 | 2821 | #: bzrlib/builtins.py:5395 | ||
2839 | 2822 | msgid "" | ||
2840 | 2823 | "Both the submit branch and the public branch follow the usual behavior with\n" | ||
2841 | 2824 | "respect to --remember: If there is no default location set, the first send\n" | ||
2842 | 2825 | "will set it (use --no-remember to avoid settting it). After that, you can\n" | ||
2843 | 2826 | "omit the location to use the default. To change the default, use\n" | ||
2844 | 2827 | "--remember. The value will only be saved if the location can be accessed." | ||
2845 | 2828 | msgstr "" | ||
2846 | 2829 | |||
2847 | 2830 | #: bzrlib/builtins.py:5401 | ||
2848 | 2831 | msgid "" | ||
2849 | 2832 | "In order to calculate those changes, bzr must analyse the submit branch.\n" | ||
2850 | 2833 | "Therefore it is most efficient for the submit branch to be a local mirror.\n" | ||
2851 | 2834 | "If a public location is known for the submit_branch, that location is used\n" | ||
2852 | 2835 | "in the merge directive." | ||
2853 | 2836 | msgstr "" | ||
2854 | 2837 | |||
2855 | 2838 | #: bzrlib/builtins.py:5406 | ||
2856 | 2839 | msgid "" | ||
2857 | 2840 | "The default behaviour is to send the merge directive by mail, unless -o is\n" | ||
2858 | 2841 | "given, in which case it is sent to a file." | ||
2859 | 2842 | msgstr "" | ||
2860 | 2843 | |||
2861 | 2844 | #: bzrlib/builtins.py:5409 | ||
2862 | 2845 | msgid "" | ||
2863 | 2846 | "Mail is sent using your preferred mail program. This should be transparent\n" | ||
2864 | 2847 | "on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n" | ||
2865 | 2848 | "If the preferred client can't be found (or used), your editor will be used." | ||
2866 | 2849 | msgstr "" | ||
2867 | 2850 | |||
2868 | 2851 | #: bzrlib/builtins.py:5413 | ||
2869 | 2852 | msgid "" | ||
2870 | 2853 | "To use a specific mail program, set the mail_client configuration option.\n" | ||
2871 | 2854 | "(For Thunderbird 1.5, this works around some bugs.) Supported values for\n" | ||
2872 | 2855 | "specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app" | ||
2873 | 2856 | "\" (MacOS X's\n" | ||
2874 | 2857 | "Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n" | ||
2875 | 2858 | "\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also " | ||
2876 | 2859 | "add\n" | ||
2877 | 2860 | "supported clients." | ||
2878 | 2861 | msgstr "" | ||
2879 | 2862 | |||
2880 | 2863 | #: bzrlib/builtins.py:5420 | ||
2881 | 2864 | msgid "" | ||
2882 | 2865 | "If mail is being sent, a to address is required. This can be supplied\n" | ||
2883 | 2866 | "either on the commandline, by setting the submit_to configuration\n" | ||
2884 | 2867 | "option in the branch itself or the child_submit_to configuration option\n" | ||
2885 | 2868 | "in the submit branch." | ||
2886 | 2869 | msgstr "" | ||
2887 | 2870 | |||
2888 | 2871 | #: bzrlib/builtins.py:5425 | ||
2889 | 2872 | msgid "" | ||
2890 | 2873 | "Two formats are currently supported: \"4\" uses revision bundle format 4 " | ||
2891 | 2874 | "and\n" | ||
2892 | 2875 | "merge directive format 2. It is significantly faster and smaller than\n" | ||
2893 | 2876 | "older formats. It is compatible with Bazaar 0.19 and later. It is the\n" | ||
2894 | 2877 | "default. \"0.9\" uses revision bundle format 0.9 and merge directive\n" | ||
2895 | 2878 | "format 1. It is compatible with Bazaar 0.12 - 0.18." | ||
2896 | 2879 | msgstr "" | ||
2897 | 2880 | |||
2898 | 2881 | #: bzrlib/builtins.py:5431 | ||
2899 | 2882 | msgid "" | ||
2900 | 2883 | "The merge directives created by bzr send may be applied using bzr merge or\n" | ||
2901 | 2884 | "bzr pull by specifying a file containing a merge directive as the location." | ||
2902 | 2885 | msgstr "" | ||
2903 | 2886 | |||
2904 | 2887 | #: bzrlib/builtins.py:5434 | ||
2905 | 2888 | msgid "" | ||
2906 | 2889 | "bzr send makes extensive use of public locations to map local locations " | ||
2907 | 2890 | "into\n" | ||
2908 | 2891 | "URLs that can be used by other people. See `bzr help configuration` to\n" | ||
2909 | 2892 | "set them, and use `bzr info` to display them." | ||
2910 | 2893 | msgstr "" | ||
2911 | 2894 | |||
2912 | 2895 | # help of 'output' option of 'send' command | ||
2913 | 2896 | #: bzrlib/builtins.py:5458 | ||
2914 | 2897 | msgid "Write merge directive to this file or directory; use - for stdout." | ||
2915 | 2898 | msgstr "" | ||
2916 | 2899 | |||
2917 | 2900 | # help of 'strict' option of 'send' command | ||
2918 | 2901 | #: bzrlib/builtins.py:5462 | ||
2919 | 2902 | msgid "" | ||
2920 | 2903 | "Refuse to send if there are uncommitted changes in the working tree, --no-" | ||
2921 | 2904 | "strict disables the check." | ||
2922 | 2905 | msgstr "" | ||
2923 | 2906 | |||
2924 | 2907 | # help of 'mail-to' option of 'send' command | ||
2925 | 2908 | #: bzrlib/builtins.py:5464 | ||
2926 | 2909 | msgid "Mail the request to this address." | ||
2927 | 2910 | msgstr "" | ||
2928 | 2911 | |||
2929 | 2912 | # help of 'body' option of 'send' command | ||
2930 | 2913 | #: bzrlib/builtins.py:5468 | ||
2931 | 2914 | msgid "Body for the email." | ||
2932 | 2915 | msgstr "" | ||
2933 | 2916 | |||
2934 | 2917 | # help of 'no-bundle' option of 'send' command | ||
2935 | 2918 | #: bzrlib/builtins.py:5521 | ||
2936 | 2919 | msgid "Do not include a bundle in the merge directive." | ||
2937 | 2920 | msgstr "" | ||
2938 | 2921 | |||
2939 | 2922 | # help of 'no-patch' option of 'send' command | ||
2940 | 2923 | #: bzrlib/builtins.py:5522 | ||
2941 | 2924 | msgid "Do not include a preview patch in the merge directive." | ||
2942 | 2925 | msgstr "" | ||
2943 | 2926 | |||
2944 | 2927 | # help of 'remember' option of 'send' command | ||
2945 | 2928 | #: bzrlib/builtins.py:5525 | ||
2946 | 2929 | msgid "Remember submit and public branch." | ||
2947 | 2930 | msgstr "" | ||
2948 | 2931 | |||
2949 | 2932 | # help of 'from' option of 'send' command | ||
2950 | 2933 | #: bzrlib/builtins.py:5527 | ||
2951 | 2934 | msgid "" | ||
2952 | 2935 | "Branch to generate the submission from, rather than the one containing the " | ||
2953 | 2936 | "working directory." | ||
2954 | 2937 | msgstr "" | ||
2955 | 2938 | |||
2956 | 2939 | # title of 'format' option of 'send' command | ||
2957 | 2940 | #: bzrlib/builtins.py:5537 | ||
2958 | 2941 | msgid "format" | ||
2959 | 2942 | msgstr "" | ||
2960 | 2943 | |||
2961 | 2944 | # help of 'format' option of 'send' command | ||
2962 | 2945 | #: bzrlib/builtins.py:5538 | ||
2963 | 2946 | msgid "Use the specified output format." | ||
2964 | 2947 | msgstr "" | ||
2965 | 2948 | |||
2966 | 2949 | #: bzrlib/builtins.py:5560 | ||
2967 | 2950 | msgid "Create, remove or modify a tag naming a revision." | ||
2968 | 2951 | msgstr "" | ||
2969 | 2952 | |||
2970 | 2953 | #: bzrlib/builtins.py:5562 | ||
2971 | 2954 | msgid "" | ||
2972 | 2955 | "Tags give human-meaningful names to revisions. Commands that take a -r\n" | ||
2973 | 2956 | "(--revision) option can be given -rtag:X, where X is any previously\n" | ||
2974 | 2957 | "created tag." | ||
2975 | 2958 | msgstr "" | ||
2976 | 2959 | |||
2977 | 2960 | #: bzrlib/builtins.py:5566 | ||
2978 | 2961 | msgid "" | ||
2979 | 2962 | "Tags are stored in the branch. Tags are copied from one branch to another\n" | ||
2980 | 2963 | "along when you branch, push, pull or merge." | ||
2981 | 2964 | msgstr "" | ||
2982 | 2965 | |||
2983 | 2966 | #: bzrlib/builtins.py:5569 | ||
2984 | 2967 | msgid "" | ||
2985 | 2968 | "It is an error to give a tag name that already exists unless you pass\n" | ||
2986 | 2969 | "--force, in which case the tag is moved to point to the new revision." | ||
2987 | 2970 | msgstr "" | ||
2988 | 2971 | |||
2989 | 2972 | #: bzrlib/builtins.py:5572 | ||
2990 | 2973 | msgid "" | ||
2991 | 2974 | "To rename a tag (change the name but keep it on the same revsion), run " | ||
2992 | 2975 | "``bzr\n" | ||
2993 | 2976 | "tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``." | ||
2994 | 2977 | msgstr "" | ||
2995 | 2978 | |||
2996 | 2979 | #: bzrlib/builtins.py:5575 | ||
2997 | 2980 | msgid "" | ||
2998 | 2981 | "If no tag name is specified it will be determined through the \n" | ||
2999 | 2982 | "'automatic_tag_name' hook. This can e.g. be used to automatically tag\n" | ||
3000 | 2983 | "upstream releases by reading configure.ac. See ``bzr help hooks`` for\n" | ||
3001 | 2984 | "details." | ||
3002 | 2985 | msgstr "" | ||
3003 | 2986 | |||
3004 | 2987 | # help of 'delete' option of 'tag' command | ||
3005 | 2988 | #: bzrlib/builtins.py:5585 | ||
3006 | 2989 | msgid "Delete this tag rather than placing it." | ||
3007 | 2990 | msgstr "" | ||
3008 | 2991 | |||
3009 | 2992 | # help of 'directory' option of 'tag' command | ||
3010 | 2993 | #: bzrlib/builtins.py:5588 | ||
3011 | 2994 | msgid "Branch in which to place the tag." | ||
3012 | 2995 | msgstr "" | ||
3013 | 2996 | |||
3014 | 2997 | # help of 'force' option of 'tag' command | ||
3015 | 2998 | #: bzrlib/builtins.py:5590 | ||
3016 | 2999 | msgid "Replace existing tags." | ||
3017 | 3000 | msgstr "" | ||
3018 | 3001 | |||
3019 | 3002 | #: bzrlib/builtins.py:5629 | ||
3020 | 3003 | msgid "List tags." | ||
3021 | 3004 | msgstr "" | ||
3022 | 3005 | |||
3023 | 3006 | #: bzrlib/builtins.py:5631 | ||
3024 | 3007 | msgid "" | ||
3025 | 3008 | "This command shows a table of tag names and the revisions they reference." | ||
3026 | 3009 | msgstr "" | ||
3027 | 3010 | |||
3028 | 3011 | # help of 'directory' option of 'tags' command | ||
3029 | 3012 | #: bzrlib/builtins.py:5637 | ||
3030 | 3013 | msgid "Branch whose tags should be displayed." | ||
3031 | 3014 | msgstr "" | ||
3032 | 3015 | |||
3033 | 3016 | # help of 'sort' option of 'tags' command | ||
3034 | 3017 | #: bzrlib/builtins.py:5639 | ||
3035 | 3018 | msgid "Sort tags by different criteria." | ||
3036 | 3019 | msgstr "" | ||
3037 | 3020 | |||
3038 | 3021 | # title of 'sort' option of 'tags' command | ||
3039 | 3022 | #: bzrlib/builtins.py:5639 | ||
3040 | 3023 | msgid "Sorting" | ||
3041 | 3024 | msgstr "" | ||
3042 | 3025 | |||
3043 | 3026 | #: bzrlib/builtins.py:5684 | ||
3044 | 3027 | msgid "Reconfigure the type of a bzr directory." | ||
3045 | 3028 | msgstr "" | ||
3046 | 3029 | |||
3047 | 3030 | #: bzrlib/builtins.py:5686 | ||
3048 | 3031 | msgid "A target configuration must be specified." | ||
3049 | 3032 | msgstr "" | ||
3050 | 3033 | |||
3051 | 3034 | #: bzrlib/builtins.py:5688 | ||
3052 | 3035 | msgid "" | ||
3053 | 3036 | "For checkouts, the bind-to location will be auto-detected if not specified.\n" | ||
3054 | 3037 | "The order of preference is\n" | ||
3055 | 3038 | "1. For a lightweight checkout, the current bound location.\n" | ||
3056 | 3039 | "2. For branches that used to be checkouts, the previously-bound location.\n" | ||
3057 | 3040 | "3. The push location.\n" | ||
3058 | 3041 | "4. The parent location.\n" | ||
3059 | 3042 | "If none of these is available, --bind-to must be specified." | ||
3060 | 3043 | msgstr "" | ||
3061 | 3044 | |||
3062 | 3045 | # title of 'target_type' option of 'reconfigure' command | ||
3063 | 3046 | #: bzrlib/builtins.py:5702 | ||
3064 | 3047 | msgid "Target type" | ||
3065 | 3048 | msgstr "" | ||
3066 | 3049 | |||
3067 | 3050 | # help of 'target_type' option of 'reconfigure' command | ||
3068 | 3051 | #: bzrlib/builtins.py:5703 | ||
3069 | 3052 | msgid "The type to reconfigure the directory to." | ||
3070 | 3053 | msgstr "" | ||
3071 | 3054 | |||
3072 | 3055 | # help of 'bind-to' option of 'reconfigure' command | ||
3073 | 3056 | #: bzrlib/builtins.py:5718 | ||
3074 | 3057 | msgid "Branch to bind checkout to." | ||
3075 | 3058 | msgstr "" | ||
3076 | 3059 | |||
3077 | 3060 | # help of 'force' option of 'reconfigure' command | ||
3078 | 3061 | #: bzrlib/builtins.py:5720 | ||
3079 | 3062 | msgid "Perform reconfiguration even if local changes will be lost." | ||
3080 | 3063 | msgstr "" | ||
3081 | 3064 | |||
3082 | 3065 | # help of 'stacked-on' option of 'reconfigure' command | ||
3083 | 3066 | #: bzrlib/builtins.py:5723 | ||
3084 | 3067 | msgid "Reconfigure a branch to be stacked on another branch." | ||
3085 | 3068 | msgstr "" | ||
3086 | 3069 | |||
3087 | 3070 | # help of 'unstacked' option of 'reconfigure' command | ||
3088 | 3071 | #: bzrlib/builtins.py:5727 | ||
3089 | 3072 | msgid "" | ||
3090 | 3073 | "Reconfigure a branch to be unstacked. This may require copying substantial " | ||
3091 | 3074 | "data into it." | ||
3092 | 3075 | msgstr "" | ||
3093 | 3076 | |||
3094 | 3077 | #: bzrlib/builtins.py:5775 | ||
3095 | 3078 | msgid "Set the branch of a checkout and update." | ||
3096 | 3079 | msgstr "" | ||
3097 | 3080 | |||
3098 | 3081 | #: bzrlib/builtins.py:5777 | ||
3099 | 3082 | msgid "" | ||
3100 | 3083 | "For lightweight checkouts, this changes the branch being referenced.\n" | ||
3101 | 3084 | "For heavyweight checkouts, this checks that there are no local commits\n" | ||
3102 | 3085 | "versus the current bound branch, then it makes the local branch a mirror\n" | ||
3103 | 3086 | "of the new location and binds to it." | ||
3104 | 3087 | msgstr "" | ||
3105 | 3088 | |||
3106 | 3089 | #: bzrlib/builtins.py:5782 | ||
3107 | 3090 | msgid "" | ||
3108 | 3091 | "In both cases, the working tree is updated and uncommitted changes\n" | ||
3109 | 3092 | "are merged. The user can commit or revert these as they desire." | ||
3110 | 3093 | msgstr "" | ||
3111 | 3094 | |||
3112 | 3095 | #: bzrlib/builtins.py:5785 | ||
3113 | 3096 | msgid "Pending merges need to be committed or reverted before using switch." | ||
3114 | 3097 | msgstr "" | ||
3115 | 3098 | |||
3116 | 3099 | #: bzrlib/builtins.py:5787 | ||
3117 | 3100 | msgid "" | ||
3118 | 3101 | "The path to the branch to switch to can be specified relative to the parent\n" | ||
3119 | 3102 | "directory of the current branch. For example, if you are currently in a\n" | ||
3120 | 3103 | "checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n" | ||
3121 | 3104 | "/path/to/newbranch." | ||
3122 | 3105 | msgstr "" | ||
3123 | 3106 | |||
3124 | 3107 | #: bzrlib/builtins.py:5792 | ||
3125 | 3108 | msgid "" | ||
3126 | 3109 | "Bound branches use the nickname of its master branch unless it is set\n" | ||
3127 | 3110 | "locally, in which case switching will update the local nickname to be\n" | ||
3128 | 3111 | "that of the master." | ||
3129 | 3112 | msgstr "" | ||
3130 | 3113 | |||
3131 | 3114 | # help of 'force' option of 'switch' command | ||
3132 | 3115 | #: bzrlib/builtins.py:5800 | ||
3133 | 3116 | msgid "Switch even if local commits will be lost." | ||
3134 | 3117 | msgstr "" | ||
3135 | 3118 | |||
3136 | 3119 | # help of 'create-branch' option of 'switch' command | ||
3137 | 3120 | #: bzrlib/builtins.py:5803 | ||
3138 | 3121 | msgid "Create the target branch from this one before switching to it." | ||
3139 | 3122 | msgstr "" | ||
3140 | 3123 | |||
3141 | 3124 | #: bzrlib/builtins.py:5872 | ||
3142 | 3125 | msgid "Manage filtered views." | ||
3143 | 3126 | msgstr "" | ||
3144 | 3127 | |||
3145 | 3128 | #: bzrlib/builtins.py:5874 | ||
3146 | 3129 | msgid "" | ||
3147 | 3130 | "Views provide a mask over the tree so that users can focus on\n" | ||
3148 | 3131 | "a subset of a tree when doing their work. After creating a view,\n" | ||
3149 | 3132 | "commands that support a list of files - status, diff, commit, etc -\n" | ||
3150 | 3133 | "effectively have that list of files implicitly given each time.\n" | ||
3151 | 3134 | "An explicit list of files can still be given but those files\n" | ||
3152 | 3135 | "must be within the current view." | ||
3153 | 3136 | msgstr "" | ||
3154 | 3137 | |||
3155 | 3138 | #: bzrlib/builtins.py:5881 | ||
3156 | 3139 | msgid "" | ||
3157 | 3140 | "In most cases, a view has a short life-span: it is created to make\n" | ||
3158 | 3141 | "a selected change and is deleted once that change is committed.\n" | ||
3159 | 3142 | "At other times, you may wish to create one or more named views\n" | ||
3160 | 3143 | "and switch between them." | ||
3161 | 3144 | msgstr "" | ||
3162 | 3145 | |||
3163 | 3146 | #: bzrlib/builtins.py:5886 | ||
3164 | 3147 | msgid "" | ||
3165 | 3148 | "To disable the current view without deleting it, you can switch to\n" | ||
3166 | 3149 | "the pseudo view called ``off``. This can be useful when you need\n" | ||
3167 | 3150 | "to see the whole tree for an operation or two (e.g. merge) but\n" | ||
3168 | 3151 | "want to switch back to your view after that." | ||
3169 | 3152 | msgstr "" | ||
3170 | 3153 | |||
3171 | 3154 | #: bzrlib/builtins.py:5891 | ||
3172 | 3155 | msgid "" | ||
3173 | 3156 | ":Examples:\n" | ||
3174 | 3157 | " To define the current view::" | ||
3175 | 3158 | msgstr "" | ||
3176 | 3159 | |||
3177 | 3160 | #: bzrlib/builtins.py:5894 | ||
3178 | 3161 | msgid " bzr view file1 dir1 ..." | ||
3179 | 3162 | msgstr "" | ||
3180 | 3163 | |||
3181 | 3164 | #: bzrlib/builtins.py:5896 | ||
3182 | 3165 | msgid " To list the current view::" | ||
3183 | 3166 | msgstr "" | ||
3184 | 3167 | |||
3185 | 3168 | #: bzrlib/builtins.py:5898 | ||
3186 | 3169 | msgid " bzr view" | ||
3187 | 3170 | msgstr "" | ||
3188 | 3171 | |||
3189 | 3172 | #: bzrlib/builtins.py:5900 | ||
3190 | 3173 | msgid " To delete the current view::" | ||
3191 | 3174 | msgstr "" | ||
3192 | 3175 | |||
3193 | 3176 | #: bzrlib/builtins.py:5902 | ||
3194 | 3177 | msgid " bzr view --delete" | ||
3195 | 3178 | msgstr "" | ||
3196 | 3179 | |||
3197 | 3180 | #: bzrlib/builtins.py:5904 | ||
3198 | 3181 | msgid " To disable the current view without deleting it::" | ||
3199 | 3182 | msgstr "" | ||
3200 | 3183 | |||
3201 | 3184 | #: bzrlib/builtins.py:5906 | ||
3202 | 3185 | msgid " bzr view --switch off" | ||
3203 | 3186 | msgstr "" | ||
3204 | 3187 | |||
3205 | 3188 | #: bzrlib/builtins.py:5908 | ||
3206 | 3189 | msgid " To define a named view and switch to it::" | ||
3207 | 3190 | msgstr "" | ||
3208 | 3191 | |||
3209 | 3192 | #: bzrlib/builtins.py:5910 | ||
3210 | 3193 | msgid " bzr view --name view-name file1 dir1 ..." | ||
3211 | 3194 | msgstr "" | ||
3212 | 3195 | |||
3213 | 3196 | #: bzrlib/builtins.py:5912 | ||
3214 | 3197 | msgid " To list a named view::" | ||
3215 | 3198 | msgstr "" | ||
3216 | 3199 | |||
3217 | 3200 | #: bzrlib/builtins.py:5914 | ||
3218 | 3201 | msgid " bzr view --name view-name" | ||
3219 | 3202 | msgstr "" | ||
3220 | 3203 | |||
3221 | 3204 | #: bzrlib/builtins.py:5916 | ||
3222 | 3205 | msgid " To delete a named view::" | ||
3223 | 3206 | msgstr "" | ||
3224 | 3207 | |||
3225 | 3208 | #: bzrlib/builtins.py:5918 | ||
3226 | 3209 | msgid " bzr view --name view-name --delete" | ||
3227 | 3210 | msgstr "" | ||
3228 | 3211 | |||
3229 | 3212 | #: bzrlib/builtins.py:5920 | ||
3230 | 3213 | msgid " To switch to a named view::" | ||
3231 | 3214 | msgstr "" | ||
3232 | 3215 | |||
3233 | 3216 | #: bzrlib/builtins.py:5922 | ||
3234 | 3217 | msgid " bzr view --switch view-name" | ||
3235 | 3218 | msgstr "" | ||
3236 | 3219 | |||
3237 | 3220 | #: bzrlib/builtins.py:5924 | ||
3238 | 3221 | msgid " To list all views defined::" | ||
3239 | 3222 | msgstr "" | ||
3240 | 3223 | |||
3241 | 3224 | #: bzrlib/builtins.py:5926 | ||
3242 | 3225 | msgid " bzr view --all" | ||
3243 | 3226 | msgstr "" | ||
3244 | 3227 | |||
3245 | 3228 | #: bzrlib/builtins.py:5928 | ||
3246 | 3229 | msgid " To delete all views::" | ||
3247 | 3230 | msgstr "" | ||
3248 | 3231 | |||
3249 | 3232 | #: bzrlib/builtins.py:5930 | ||
3250 | 3233 | msgid " bzr view --delete --all" | ||
3251 | 3234 | msgstr "" | ||
3252 | 3235 | |||
3253 | 3236 | # help of 'all' option of 'view' command | ||
3254 | 3237 | #: bzrlib/builtins.py:5937 | ||
3255 | 3238 | msgid "Apply list or delete action to all views." | ||
3256 | 3239 | msgstr "" | ||
3257 | 3240 | |||
3258 | 3241 | # help of 'delete' option of 'view' command | ||
3259 | 3242 | #: bzrlib/builtins.py:5940 | ||
3260 | 3243 | msgid "Delete the view." | ||
3261 | 3244 | msgstr "" | ||
3262 | 3245 | |||
3263 | 3246 | # help of 'name' option of 'view' command | ||
3264 | 3247 | #: bzrlib/builtins.py:5943 | ||
3265 | 3248 | msgid "Name of the view to define, list or delete." | ||
3266 | 3249 | msgstr "" | ||
3267 | 3250 | |||
3268 | 3251 | # help of 'switch' option of 'view' command | ||
3269 | 3252 | #: bzrlib/builtins.py:5947 | ||
3270 | 3253 | msgid "Name of the view to switch to." | ||
3271 | 3254 | msgstr "" | ||
3272 | 3255 | |||
3273 | 3256 | #: bzrlib/builtins.py:6047 | ||
3274 | 3257 | msgid "Remove a branch." | ||
3275 | 3258 | msgstr "" | ||
3276 | 3259 | |||
3277 | 3260 | #: bzrlib/builtins.py:6049 | ||
3278 | 3261 | msgid "" | ||
3279 | 3262 | "This will remove the branch from the specified location but \n" | ||
3280 | 3263 | "will keep any working tree or repository in place." | ||
3281 | 3264 | msgstr "" | ||
3282 | 3265 | |||
3283 | 3266 | #: bzrlib/builtins.py:6054 | ||
3284 | 3267 | msgid " Remove the branch at repo/trunk::" | ||
3285 | 3268 | msgstr "" | ||
3286 | 3269 | |||
3287 | 3270 | #: bzrlib/builtins.py:6056 | ||
3288 | 3271 | msgid " bzr remove-branch repo/trunk" | ||
3289 | 3272 | msgstr "" | ||
3290 | 3273 | |||
3291 | 3274 | #: bzrlib/builtins.py:6072 | ||
3292 | 3275 | msgid "Temporarily set aside some changes from the current tree." | ||
3293 | 3276 | msgstr "" | ||
3294 | 3277 | |||
3295 | 3278 | #: bzrlib/builtins.py:6074 | ||
3296 | 3279 | msgid "" | ||
3297 | 3280 | "Shelve allows you to temporarily put changes you've made \"on the shelf\",\n" | ||
3298 | 3281 | "ie. out of the way, until a later time when you can bring them back from\n" | ||
3299 | 3282 | "the shelf with the 'unshelve' command. The changes are stored alongside\n" | ||
3300 | 3283 | "your working tree, and so they aren't propagated along with your branch nor\n" | ||
3301 | 3284 | "will they survive its deletion." | ||
3302 | 3285 | msgstr "" | ||
3303 | 3286 | |||
3304 | 3287 | #: bzrlib/builtins.py:6080 | ||
3305 | 3288 | msgid "If shelve --list is specified, previously-shelved changes are listed." | ||
3306 | 3289 | msgstr "" | ||
3307 | 3290 | |||
3308 | 3291 | #: bzrlib/builtins.py:6082 | ||
3309 | 3292 | msgid "" | ||
3310 | 3293 | "Shelve is intended to help separate several sets of changes that have\n" | ||
3311 | 3294 | "been inappropriately mingled. If you just want to get rid of all changes\n" | ||
3312 | 3295 | "and you don't need to restore them later, use revert. If you want to\n" | ||
3313 | 3296 | "shelve all text changes at once, use shelve --all." | ||
3314 | 3297 | msgstr "" | ||
3315 | 3298 | |||
3316 | 3299 | #: bzrlib/builtins.py:6087 | ||
3317 | 3300 | msgid "" | ||
3318 | 3301 | "If filenames are specified, only the changes to those files will be\n" | ||
3319 | 3302 | "shelved. Other files will be left untouched." | ||
3320 | 3303 | msgstr "" | ||
3321 | 3304 | |||
3322 | 3305 | #: bzrlib/builtins.py:6090 | ||
3323 | 3306 | msgid "" | ||
3324 | 3307 | "If a revision is specified, changes since that revision will be shelved." | ||
3325 | 3308 | msgstr "" | ||
3326 | 3309 | |||
3327 | 3310 | #: bzrlib/builtins.py:6092 | ||
3328 | 3311 | msgid "" | ||
3329 | 3312 | "You can put multiple items on the shelf, and by default, 'unshelve' will\n" | ||
3330 | 3313 | "restore the most recently shelved changes." | ||
3331 | 3314 | msgstr "" | ||
3332 | 3315 | |||
3333 | 3316 | #: bzrlib/builtins.py:6095 | ||
3334 | 3317 | msgid "" | ||
3335 | 3318 | "For complicated changes, it is possible to edit the changes in a separate\n" | ||
3336 | 3319 | "editor program to decide what the file remaining in the working copy\n" | ||
3337 | 3320 | "should look like. To do this, add the configuration option" | ||
3338 | 3321 | msgstr "" | ||
3339 | 3322 | |||
3340 | 3323 | #: bzrlib/builtins.py:6099 | ||
3341 | 3324 | msgid " change_editor = PROGRAM @new_path @old_path" | ||
3342 | 3325 | msgstr "" | ||
3343 | 3326 | |||
3344 | 3327 | #: bzrlib/builtins.py:6101 | ||
3345 | 3328 | msgid "" | ||
3346 | 3329 | "where @new_path is replaced with the path of the new version of the \n" | ||
3347 | 3330 | "file and @old_path is replaced with the path of the old version of \n" | ||
3348 | 3331 | "the file. The PROGRAM should save the new file with the desired \n" | ||
3349 | 3332 | "contents of the file in the working tree.\n" | ||
3350 | 3333 | " " | ||
3351 | 3334 | msgstr "" | ||
3352 | 3335 | |||
3353 | 3336 | # help of 'all' option of 'shelve' command | ||
3354 | 3337 | #: bzrlib/builtins.py:6113 | ||
3355 | 3338 | msgid "Shelve all changes." | ||
3356 | 3339 | msgstr "" | ||
3357 | 3340 | |||
3358 | 3341 | # help of 'writer' option of 'shelve' command | ||
3359 | 3342 | #: bzrlib/builtins.py:6115 | ||
3360 | 3343 | msgid "Method to use for writing diffs." | ||
3361 | 3344 | msgstr "" | ||
3362 | 3345 | |||
3363 | 3346 | # title of 'writer' option of 'shelve' command | ||
3364 | 3347 | #: bzrlib/builtins.py:6115 | ||
3365 | 3348 | msgid "writer" | ||
3366 | 3349 | msgstr "" | ||
3367 | 3350 | |||
3368 | 3351 | # help of 'list' option of 'shelve' command | ||
3369 | 3352 | #: bzrlib/builtins.py:6119 | ||
3370 | 3353 | msgid "List shelved changes." | ||
3371 | 3354 | msgstr "" | ||
3372 | 3355 | |||
3373 | 3356 | # help of 'destroy' option of 'shelve' command | ||
3374 | 3357 | #: bzrlib/builtins.py:6121 | ||
3375 | 3358 | msgid "Destroy removed changes instead of shelving them." | ||
3376 | 3359 | msgstr "" | ||
3377 | 3360 | |||
3378 | 3361 | #: bzrlib/builtins.py:6161 | ||
3379 | 3362 | msgid "Restore shelved changes." | ||
3380 | 3363 | msgstr "" | ||
3381 | 3364 | |||
3382 | 3365 | #: bzrlib/builtins.py:6163 | ||
3383 | 3366 | msgid "" | ||
3384 | 3367 | "By default, the most recently shelved changes are restored. However if you\n" | ||
3385 | 3368 | "specify a shelf by id those changes will be restored instead. This works\n" | ||
3386 | 3369 | "best when the changes don't depend on each other." | ||
3387 | 3370 | msgstr "" | ||
3388 | 3371 | |||
3389 | 3372 | # help of 'action' option of 'unshelve' command | ||
3390 | 3373 | #: bzrlib/builtins.py:6172 | ||
3391 | 3374 | msgid "The action to perform." | ||
3392 | 3375 | msgstr "" | ||
3393 | 3376 | |||
3394 | 3377 | #: bzrlib/builtins.py:6194 | ||
3395 | 3378 | msgid "Remove unwanted files from working tree." | ||
3396 | 3379 | msgstr "" | ||
3397 | 3380 | |||
3398 | 3381 | #: bzrlib/builtins.py:6196 | ||
3399 | 3382 | msgid "" | ||
3400 | 3383 | "By default, only unknown files, not ignored files, are deleted. Versioned\n" | ||
3401 | 3384 | "files are never deleted." | ||
3402 | 3385 | msgstr "" | ||
3403 | 3386 | |||
3404 | 3387 | #: bzrlib/builtins.py:6199 | ||
3405 | 3388 | msgid "" | ||
3406 | 3389 | "Another class is 'detritus', which includes files emitted by bzr during\n" | ||
3407 | 3390 | "normal operations and selftests. (The value of these files decreases with\n" | ||
3408 | 3391 | "time.)" | ||
3409 | 3392 | msgstr "" | ||
3410 | 3393 | |||
3411 | 3394 | #: bzrlib/builtins.py:6203 | ||
3412 | 3395 | msgid "" | ||
3413 | 3396 | "If no options are specified, unknown files are deleted. Otherwise, option\n" | ||
3414 | 3397 | "flags are respected, and may be combined." | ||
3415 | 3398 | msgstr "" | ||
3416 | 3399 | |||
3417 | 3400 | #: bzrlib/builtins.py:6206 | ||
3418 | 3401 | msgid "To check what clean-tree will do, use --dry-run." | ||
3419 | 3402 | msgstr "" | ||
3420 | 3403 | |||
3421 | 3404 | # help of 'ignored' option of 'clean-tree' command | ||
3422 | 3405 | #: bzrlib/builtins.py:6209 | ||
3423 | 3406 | msgid "Delete all ignored files." | ||
3424 | 3407 | msgstr "" | ||
3425 | 3408 | |||
3426 | 3409 | # help of 'detritus' option of 'clean-tree' command | ||
3427 | 3410 | #: bzrlib/builtins.py:6210 | ||
3428 | 3411 | msgid "" | ||
3429 | 3412 | "Delete conflict files, merge and revert backups, and failed selftest dirs." | ||
3430 | 3413 | msgstr "" | ||
3431 | 3414 | |||
3432 | 3415 | # help of 'unknown' option of 'clean-tree' command | ||
3433 | 3416 | #: bzrlib/builtins.py:6213 | ||
3434 | 3417 | msgid "Delete files unknown to bzr (default)." | ||
3435 | 3418 | msgstr "" | ||
3436 | 3419 | |||
3437 | 3420 | # help of 'dry-run' option of 'clean-tree' command | ||
3438 | 3421 | #: bzrlib/builtins.py:6214 | ||
3439 | 3422 | msgid "Show files to delete instead of deleting them." | ||
3440 | 3423 | msgstr "" | ||
3441 | 3424 | |||
3442 | 3425 | # help of 'force' option of 'clean-tree' command | ||
3443 | 3426 | #: bzrlib/builtins.py:6216 | ||
3444 | 3427 | msgid "Do not prompt before deleting." | ||
3445 | 3428 | msgstr "" | ||
3446 | 3429 | |||
3447 | 3430 | #: bzrlib/cmd_version_info.py:50 | ||
3448 | 3431 | msgid "Show version information about this tree." | ||
3449 | 3432 | msgstr "" | ||
3450 | 3433 | |||
3451 | 3434 | #: bzrlib/cmd_version_info.py:52 | ||
3452 | 3435 | msgid "" | ||
3453 | 3436 | "You can use this command to add information about version into\n" | ||
3454 | 3437 | "source code of an application. The output can be in one of the\n" | ||
3455 | 3438 | "supported formats or in a custom format based on a template." | ||
3456 | 3439 | msgstr "" | ||
3457 | 3440 | |||
3458 | 3441 | #: bzrlib/cmd_version_info.py:56 | ||
3459 | 3442 | msgid "For example::" | ||
3460 | 3443 | msgstr "" | ||
3461 | 3444 | |||
3462 | 3445 | #: bzrlib/cmd_version_info.py:58 | ||
3463 | 3446 | msgid "" | ||
3464 | 3447 | " bzr version-info --custom \\\n" | ||
3465 | 3448 | " --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\"" | ||
3466 | 3449 | msgstr "" | ||
3467 | 3450 | |||
3468 | 3451 | #: bzrlib/cmd_version_info.py:61 | ||
3469 | 3452 | msgid "" | ||
3470 | 3453 | "will produce a C header file with formatted string containing the\n" | ||
3471 | 3454 | "current revision number. Other supported variables in templates are:" | ||
3472 | 3455 | msgstr "" | ||
3473 | 3456 | |||
3474 | 3457 | #: bzrlib/cmd_version_info.py:64 | ||
3475 | 3458 | msgid "" | ||
3476 | 3459 | " * {date} - date of the last revision\n" | ||
3477 | 3460 | " * {build_date} - current date\n" | ||
3478 | 3461 | " * {revno} - revision number\n" | ||
3479 | 3462 | " * {revision_id} - revision id\n" | ||
3480 | 3463 | " * {branch_nick} - branch nickname\n" | ||
3481 | 3464 | " * {clean} - 0 if the source tree contains uncommitted changes,\n" | ||
3482 | 3465 | " otherwise 1" | ||
3483 | 3466 | msgstr "" | ||
3484 | 3467 | |||
3485 | 3468 | # help of 'format' option of 'version-info' command | ||
3486 | 3469 | #: bzrlib/cmd_version_info.py:74 | ||
3487 | 3470 | msgid "Select the output format." | ||
3488 | 3471 | msgstr "" | ||
3489 | 3472 | |||
3490 | 3473 | # help of 'all' option of 'version-info' command | ||
3491 | 3474 | #: bzrlib/cmd_version_info.py:78 | ||
3492 | 3475 | msgid "Include all possible information." | ||
3493 | 3476 | msgstr "" | ||
3494 | 3477 | |||
3495 | 3478 | # help of 'check-clean' option of 'version-info' command | ||
3496 | 3479 | #: bzrlib/cmd_version_info.py:79 | ||
3497 | 3480 | msgid "Check if tree is clean." | ||
3498 | 3481 | msgstr "" | ||
3499 | 3482 | |||
3500 | 3483 | # help of 'include-history' option of 'version-info' command | ||
3501 | 3484 | #: bzrlib/cmd_version_info.py:81 | ||
3502 | 3485 | msgid "Include the revision-history." | ||
3503 | 3486 | msgstr "" | ||
3504 | 3487 | |||
3505 | 3488 | # help of 'include-file-revisions' option of 'version-info' command | ||
3506 | 3489 | #: bzrlib/cmd_version_info.py:83 | ||
3507 | 3490 | msgid "Include the last revision for each file." | ||
3508 | 3491 | msgstr "" | ||
3509 | 3492 | |||
3510 | 3493 | # help of 'template' option of 'version-info' command | ||
3511 | 3494 | #: bzrlib/cmd_version_info.py:84 | ||
3512 | 3495 | msgid "Template for the output." | ||
3513 | 3496 | msgstr "" | ||
3514 | 3497 | |||
3515 | 3498 | #: bzrlib/commands.py:479 | ||
3516 | 3499 | msgid "No help for this command." | ||
3517 | 3500 | msgstr "" | ||
3518 | 3501 | |||
3519 | 3502 | #: bzrlib/commands.py:492 | ||
3520 | 3503 | #, python-format | ||
3521 | 3504 | msgid ":Purpose: %s\n" | ||
3522 | 3505 | msgstr "" | ||
3523 | 3506 | |||
3524 | 3507 | #: bzrlib/commands.py:494 | ||
3525 | 3508 | #, python-format | ||
3526 | 3509 | msgid "" | ||
3527 | 3510 | ":Usage:\n" | ||
3528 | 3511 | "%s\n" | ||
3529 | 3512 | msgstr "" | ||
3530 | 3513 | |||
3531 | 3514 | #: bzrlib/commands.py:496 | ||
3532 | 3515 | #, python-format | ||
3533 | 3516 | msgid ":Usage: %s\n" | ||
3534 | 3517 | msgstr "" | ||
3535 | 3518 | |||
3536 | 3519 | #: bzrlib/commands.py:515 | ||
3537 | 3520 | #, python-format | ||
3538 | 3521 | msgid ":Options:%s" | ||
3539 | 3522 | msgstr "" | ||
3540 | 3523 | |||
3541 | 3524 | #: bzrlib/commands.py:526 | ||
3542 | 3525 | #, python-format | ||
3543 | 3526 | msgid "" | ||
3544 | 3527 | ":Description:\n" | ||
3545 | 3528 | " %s\n" | ||
3546 | 3529 | "\n" | ||
3547 | 3530 | msgstr "" | ||
3548 | 3531 | |||
3549 | 3532 | #: bzrlib/commands.py:536 | ||
3550 | 3533 | #, python-format | ||
3551 | 3534 | msgid "" | ||
3552 | 3535 | "See bzr help %s for more details and examples.\n" | ||
3553 | 3536 | "\n" | ||
3554 | 3537 | msgstr "" | ||
3555 | 3538 | |||
3556 | 3539 | #: bzrlib/commands.py:541 | ||
3557 | 3540 | msgid ":Aliases: " | ||
3558 | 3541 | msgstr "" | ||
3559 | 3542 | |||
3560 | 3543 | #: bzrlib/commands.py:545 | ||
3561 | 3544 | #, python-format | ||
3562 | 3545 | msgid ":From: plugin \"%s\"\n" | ||
3563 | 3546 | msgstr "" | ||
3564 | 3547 | |||
3565 | 3548 | #: bzrlib/commands.py:557 | ||
3566 | 3549 | #, python-format | ||
3567 | 3550 | msgid ":doc:`%s <%s-help>`" | ||
3568 | 3551 | msgstr "" | ||
3569 | 3552 | |||
3570 | 3553 | #: bzrlib/commands.py:560 | ||
3571 | 3554 | #, python-format | ||
3572 | 3555 | msgid ":See also: %s" | ||
3573 | 3556 | msgstr "" | ||
3574 | 3557 | |||
3575 | 3558 | #: bzrlib/commit_signature_commands.py:34 | ||
3576 | 3559 | msgid "Sign all commits by a given committer." | ||
3577 | 3560 | msgstr "" | ||
3578 | 3561 | |||
3579 | 3562 | #: bzrlib/commit_signature_commands.py:36 | ||
3580 | 3563 | msgid "" | ||
3581 | 3564 | "If location is not specified the local tree is used.\n" | ||
3582 | 3565 | "If committer is not specified the default committer is used." | ||
3583 | 3566 | msgstr "" | ||
3584 | 3567 | |||
3585 | 3568 | #: bzrlib/commit_signature_commands.py:39 | ||
3586 | 3569 | msgid "This does not sign commits that already have signatures." | ||
3587 | 3570 | msgstr "" | ||
3588 | 3571 | |||
3589 | 3572 | # help of 'dry-run' option of 'sign-my-commits' command | ||
3590 | 3573 | #: bzrlib/commit_signature_commands.py:47 | ||
3591 | 3574 | msgid "" | ||
3592 | 3575 | "Don't actually sign anything, just print the revisions that would be signed." | ||
3593 | 3576 | msgstr "" | ||
3594 | 3577 | |||
3595 | 3578 | #: bzrlib/commit_signature_commands.py:101 | ||
3596 | 3579 | msgid "Verify all commit signatures." | ||
3597 | 3580 | msgstr "" | ||
3598 | 3581 | |||
3599 | 3582 | #: bzrlib/commit_signature_commands.py:103 | ||
3600 | 3583 | msgid "Verifies that all commits in the branch are signed by known GnuPG keys." | ||
3601 | 3584 | msgstr "" | ||
3602 | 3585 | |||
3603 | 3586 | # help of 'acceptable-keys' option of 'verify-signatures' command | ||
3604 | 3587 | #: bzrlib/commit_signature_commands.py:108 | ||
3605 | 3588 | msgid "" | ||
3606 | 3589 | "Comma separated list of GPG key patterns which are acceptable for " | ||
3607 | 3590 | "verification." | ||
3608 | 3591 | msgstr "" | ||
3609 | 3592 | |||
3610 | 3593 | #: bzrlib/commit_signature_commands.py:166 | ||
3611 | 3594 | msgid "All commits signed with verifiable keys" | ||
3612 | 3595 | msgstr "" | ||
3613 | 3596 | |||
3614 | 3597 | #: bzrlib/config.py:3118 | ||
3615 | 3598 | msgid "Display, set or remove a configuration option." | ||
3616 | 3599 | msgstr "" | ||
3617 | 3600 | |||
3618 | 3601 | #: bzrlib/config.py:3120 | ||
3619 | 3602 | msgid "Display the active value for a given option." | ||
3620 | 3603 | msgstr "" | ||
3621 | 3604 | |||
3622 | 3605 | #: bzrlib/config.py:3122 | ||
3623 | 3606 | msgid "" | ||
3624 | 3607 | "If --all is specified, NAME is interpreted as a regular expression and all\n" | ||
3625 | 3608 | "matching options are displayed mentioning their scope. The active value\n" | ||
3626 | 3609 | "that bzr will take into account is the first one displayed for each option." | ||
3627 | 3610 | msgstr "" | ||
3628 | 3611 | |||
3629 | 3612 | #: bzrlib/config.py:3126 | ||
3630 | 3613 | msgid "If no NAME is given, --all .* is implied." | ||
3631 | 3614 | msgstr "" | ||
3632 | 3615 | |||
3633 | 3616 | #: bzrlib/config.py:3128 | ||
3634 | 3617 | msgid "" | ||
3635 | 3618 | "Setting a value is achieved by using name=value without spaces. The value\n" | ||
3636 | 3619 | "is set in the most relevant scope and can be checked by displaying the\n" | ||
3637 | 3620 | "option again." | ||
3638 | 3621 | msgstr "" | ||
3639 | 3622 | |||
3640 | 3623 | # help of 'scope' option of 'config' command | ||
3641 | 3624 | #: bzrlib/config.py:3139 | ||
3642 | 3625 | msgid "Reduce the scope to the specified configuration file" | ||
3643 | 3626 | msgstr "" | ||
3644 | 3627 | |||
3645 | 3628 | # help of 'all' option of 'config' command | ||
3646 | 3629 | #: bzrlib/config.py:3143 | ||
3647 | 3630 | msgid "Display all the defined values for the matching options." | ||
3648 | 3631 | msgstr "" | ||
3649 | 3632 | |||
3650 | 3633 | # help of 'remove' option of 'config' command | ||
3651 | 3634 | #: bzrlib/config.py:3145 | ||
3652 | 3635 | msgid "Remove the option from the configuration file" | ||
3653 | 3636 | msgstr "" | ||
3654 | 3637 | |||
3655 | 3638 | #: bzrlib/conflicts.py:47 | ||
3656 | 3639 | msgid "List files with conflicts." | ||
3657 | 3640 | msgstr "" | ||
3658 | 3641 | |||
3659 | 3642 | #: bzrlib/conflicts.py:49 | ||
3660 | 3643 | msgid "" | ||
3661 | 3644 | "Merge will do its best to combine the changes in two branches, but there\n" | ||
3662 | 3645 | "are some kinds of problems only a human can fix. When it encounters those,\n" | ||
3663 | 3646 | "it will mark a conflict. A conflict means that you need to fix something,\n" | ||
3664 | 3647 | "before you should commit." | ||
3665 | 3648 | msgstr "" | ||
3666 | 3649 | |||
3667 | 3650 | #: bzrlib/conflicts.py:54 | ||
3668 | 3651 | msgid "" | ||
3669 | 3652 | "Conflicts normally are listed as short, human-readable messages. If --text\n" | ||
3670 | 3653 | "is supplied, the pathnames of files with text conflicts are listed,\n" | ||
3671 | 3654 | "instead. (This is useful for editing all files with text conflicts.)" | ||
3672 | 3655 | msgstr "" | ||
3673 | 3656 | |||
3674 | 3657 | #: bzrlib/conflicts.py:58 | ||
3675 | 3658 | msgid "Use bzr resolve when you have fixed a problem." | ||
3676 | 3659 | msgstr "" | ||
3677 | 3660 | |||
3678 | 3661 | # help of 'text' option of 'conflicts' command | ||
3679 | 3662 | #: bzrlib/conflicts.py:63 | ||
3680 | 3663 | msgid "List paths of files with text conflicts." | ||
3681 | 3664 | msgstr "" | ||
3682 | 3665 | |||
3683 | 3666 | # help of 'action' option of 'resolve' command | ||
3684 | 3667 | #: bzrlib/conflicts.py:95 | ||
3685 | 3668 | msgid "How to resolve the conflict." | ||
3686 | 3669 | msgstr "" | ||
3687 | 3670 | |||
3688 | 3671 | #: bzrlib/conflicts.py:101 | ||
3689 | 3672 | msgid "Mark a conflict as resolved." | ||
3690 | 3673 | msgstr "" | ||
3691 | 3674 | |||
3692 | 3675 | #: bzrlib/conflicts.py:108 | ||
3693 | 3676 | msgid "" | ||
3694 | 3677 | "Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n" | ||
3695 | 3678 | "text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict " | ||
3696 | 3679 | "as\n" | ||
3697 | 3680 | "resolved, or \"bzr resolve --all\" to mark all conflicts as resolved." | ||
3698 | 3681 | msgstr "" | ||
3699 | 3682 | |||
3700 | 3683 | # help of 'all' option of 'resolve' command | ||
3701 | 3684 | #: bzrlib/conflicts.py:116 | ||
3702 | 3685 | msgid "Resolve all conflicts in this tree." | ||
3703 | 3686 | msgstr "" | ||
3704 | 3687 | |||
3705 | 3688 | # title of 'action' option of 'resolve' command | ||
3706 | 3689 | #: bzrlib/conflicts.py:688 | ||
3707 | 3690 | msgid "action" | ||
3708 | 3691 | msgstr "" | ||
3709 | 3692 | |||
3710 | 3693 | #: bzrlib/errors.py:208 | ||
3711 | 3694 | msgid "The tree builder is already building a tree." | ||
3712 | 3695 | msgstr "" | ||
3713 | 3696 | |||
3714 | 3697 | #: bzrlib/errors.py:229 | ||
3715 | 3698 | msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s" | ||
3716 | 3699 | msgstr "" | ||
3717 | 3700 | |||
3718 | 3701 | #: bzrlib/errors.py:248 | ||
3719 | 3702 | msgid "" | ||
3720 | 3703 | "The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports " | ||
3721 | 3704 | "versions \"%(minimum)s\" to \"%(current)s\"." | ||
3722 | 3705 | msgstr "" | ||
3723 | 3706 | |||
3724 | 3707 | #: bzrlib/errors.py:260 | ||
3725 | 3708 | msgid "The transport '%(transport)s' is only accessible within this process." | ||
3726 | 3709 | msgstr "" | ||
3727 | 3710 | |||
3728 | 3711 | #: bzrlib/errors.py:278 | ||
3729 | 3712 | msgid "Invalid revision number %(revno)s" | ||
3730 | 3713 | msgstr "" | ||
3731 | 3714 | |||
3732 | 3715 | #: bzrlib/errors.py:287 | ||
3733 | 3716 | msgid "Invalid revision-id {%(revision_id)s} in %(branch)s" | ||
3734 | 3717 | msgstr "" | ||
3735 | 3718 | |||
3736 | 3719 | #: bzrlib/errors.py:298 | ||
3737 | 3720 | msgid "Reserved revision-id {%(revision_id)s}" | ||
3738 | 3721 | msgstr "" | ||
3739 | 3722 | |||
3740 | 3723 | #: bzrlib/errors.py:312 | ||
3741 | 3724 | msgid "There is no public branch set for \"%(branch_url)s\"." | ||
3742 | 3725 | msgstr "" | ||
3743 | 3726 | |||
3744 | 3727 | #: bzrlib/errors.py:322 | ||
3745 | 3728 | msgid "" | ||
3746 | 3729 | "No help could be found for '%(topic)s'. Please use 'bzr help topics' to " | ||
3747 | 3730 | "obtain a list of topics." | ||
3748 | 3731 | msgstr "" | ||
3749 | 3732 | |||
3750 | 3733 | #: bzrlib/errors.py:331 | ||
3751 | 3734 | msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s." | ||
3752 | 3735 | msgstr "" | ||
3753 | 3736 | |||
3754 | 3737 | #: bzrlib/errors.py:341 | ||
3755 | 3738 | msgid "" | ||
3756 | 3739 | "The file id \"%(file_id)s\" is not present in the repository %(repository)r" | ||
3757 | 3740 | msgstr "" | ||
3758 | 3741 | |||
3759 | 3742 | #: bzrlib/errors.py:350 | ||
3760 | 3743 | msgid "The branch '%(branch)s' is not stacked." | ||
3761 | 3744 | msgstr "" | ||
3762 | 3745 | |||
3763 | 3746 | #: bzrlib/errors.py:364 | ||
3764 | 3747 | msgid "No WorkingTree exists for \"%(base)s\"." | ||
3765 | 3748 | msgstr "" | ||
3766 | 3749 | |||
3767 | 3750 | #: bzrlib/errors.py:373 | ||
3768 | 3751 | msgid "Not currently building a tree." | ||
3769 | 3752 | msgstr "" | ||
3770 | 3753 | |||
3771 | 3754 | #: bzrlib/errors.py:378 | ||
3772 | 3755 | msgid "%(url)s is not a local path." | ||
3773 | 3756 | msgstr "" | ||
3774 | 3757 | |||
3775 | 3758 | #: bzrlib/errors.py:406 | ||
3776 | 3759 | msgid "%(not_locked)r is not write locked but needs to be." | ||
3777 | 3760 | msgstr "" | ||
3778 | 3761 | |||
3779 | 3762 | #: bzrlib/errors.py:414 | ||
3780 | 3763 | msgid "Error in command line options" | ||
3781 | 3764 | msgstr "" | ||
3782 | 3765 | |||
3783 | 3766 | #: bzrlib/errors.py:419 | ||
3784 | 3767 | msgid "%(value)s is not an index of type %(_type)s." | ||
3785 | 3768 | msgstr "" | ||
3786 | 3769 | |||
3787 | 3770 | #: bzrlib/errors.py:429 | ||
3788 | 3771 | msgid "Error in data for index %(value)s." | ||
3789 | 3772 | msgstr "" | ||
3790 | 3773 | |||
3791 | 3774 | #: bzrlib/errors.py:438 | ||
3792 | 3775 | msgid "The key '%(key)s' is already in index '%(index)s'." | ||
3793 | 3776 | msgstr "" | ||
3794 | 3777 | |||
3795 | 3778 | #: bzrlib/errors.py:448 | ||
3796 | 3779 | msgid "The key '%(key)s' is not a valid key." | ||
3797 | 3780 | msgstr "" | ||
3798 | 3781 | |||
3799 | 3782 | #: bzrlib/errors.py:457 | ||
3800 | 3783 | msgid "Could not parse options for index %(value)s." | ||
3801 | 3784 | msgstr "" | ||
3802 | 3785 | |||
3803 | 3786 | #: bzrlib/errors.py:466 | ||
3804 | 3787 | msgid "The value '%(value)s' is not a valid value." | ||
3805 | 3788 | msgstr "" | ||
3806 | 3789 | |||
3807 | 3790 | #: bzrlib/errors.py:494 | ||
3808 | 3791 | msgid "Generic path error: %(path)r%(extra)s)" | ||
3809 | 3792 | msgstr "" | ||
3810 | 3793 | |||
3811 | 3794 | #: bzrlib/errors.py:507 | ||
3812 | 3795 | msgid "No such file: %(path)r%(extra)s" | ||
3813 | 3796 | msgstr "" | ||
3814 | 3797 | |||
3815 | 3798 | #: bzrlib/errors.py:512 | ||
3816 | 3799 | msgid "File exists: %(path)r%(extra)s" | ||
3817 | 3800 | msgstr "" | ||
3818 | 3801 | |||
3819 | 3802 | #: bzrlib/errors.py:518 | ||
3820 | 3803 | msgid "" | ||
3821 | 3804 | "Could not rename %(source)s => %(dest)s because both files exist. (Use --" | ||
3822 | 3805 | "after to tell bzr about a rename that has already happened)%(extra)s" | ||
3823 | 3806 | msgstr "" | ||
3824 | 3807 | |||
3825 | 3808 | #: bzrlib/errors.py:534 | ||
3826 | 3809 | msgid "\"%(path)s\" is not a directory %(extra)s" | ||
3827 | 3810 | msgstr "" | ||
3828 | 3811 | |||
3829 | 3812 | #: bzrlib/errors.py:539 | ||
3830 | 3813 | msgid "\"%(path)s\" is not in the working directory %(extra)s" | ||
3831 | 3814 | msgstr "" | ||
3832 | 3815 | |||
3833 | 3816 | #: bzrlib/errors.py:544 | ||
3834 | 3817 | msgid "Directory not empty: \"%(path)s\"%(extra)s" | ||
3835 | 3818 | msgstr "" | ||
3836 | 3819 | |||
3837 | 3820 | #: bzrlib/errors.py:549 | ||
3838 | 3821 | msgid "Hard-linking \"%(path)s\" is not supported" | ||
3839 | 3822 | msgstr "" | ||
3840 | 3823 | |||
3841 | 3824 | #: bzrlib/errors.py:564 | ||
3842 | 3825 | msgid "Device or resource busy: \"%(path)s\"%(extra)s" | ||
3843 | 3826 | msgstr "" | ||
3844 | 3827 | |||
3845 | 3828 | #: bzrlib/errors.py:569 | ||
3846 | 3829 | msgid "Permission denied: \"%(path)s\"%(extra)s" | ||
3847 | 3830 | msgstr "" | ||
3848 | 3831 | |||
3849 | 3832 | #: bzrlib/errors.py:574 | ||
3850 | 3833 | msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s" | ||
3851 | 3834 | msgstr "" | ||
3852 | 3835 | |||
3853 | 3836 | #: bzrlib/errors.py:579 | ||
3854 | 3837 | msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r" | ||
3855 | 3838 | msgstr "" | ||
3856 | 3839 | |||
3857 | 3840 | #: bzrlib/errors.py:590 | ||
3858 | 3841 | msgid "URLs differ by more than path: %(from_)r and %(to)r" | ||
3859 | 3842 | msgstr "" | ||
3860 | 3843 | |||
3861 | 3844 | #: bzrlib/errors.py:612 | ||
3862 | 3845 | msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib." | ||
3863 | 3846 | msgstr "" | ||
3864 | 3847 | |||
3865 | 3848 | #: bzrlib/errors.py:622 | ||
3866 | 3849 | msgid "Unsupported protocol for url \"%(path)s\"%(extra)s" | ||
3867 | 3850 | msgstr "" | ||
3868 | 3851 | |||
3869 | 3852 | #: bzrlib/errors.py:630 | ||
3870 | 3853 | msgid "" | ||
3871 | 3854 | "The branch '%(url)s'(%(format)s) is not a stackable format. You will need to " | ||
3872 | 3855 | "upgrade the branch to permit branch stacking." | ||
3873 | 3856 | msgstr "" | ||
3874 | 3857 | |||
3875 | 3858 | #: bzrlib/errors.py:641 | ||
3876 | 3859 | msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'." | ||
3877 | 3860 | msgstr "" | ||
3878 | 3861 | |||
3879 | 3862 | #: bzrlib/errors.py:651 | ||
3880 | 3863 | msgid "" | ||
3881 | 3864 | "The repository '%(url)s'(%(format)s) is not a stackable format. You will " | ||
3882 | 3865 | "need to upgrade the repository to permit branch stacking." | ||
3883 | 3866 | msgstr "" | ||
3884 | 3867 | |||
3885 | 3868 | #: bzrlib/errors.py:662 | ||
3886 | 3869 | msgid "Error reading from %(path)r." | ||
3887 | 3870 | msgstr "" | ||
3888 | 3871 | |||
3889 | 3872 | #: bzrlib/errors.py:681 | ||
3890 | 3873 | msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s" | ||
3891 | 3874 | msgstr "" | ||
3892 | 3875 | |||
3893 | 3876 | #: bzrlib/errors.py:697 | ||
3894 | 3877 | msgid "Path \"%(path)s\" is not unicode normalized" | ||
3895 | 3878 | msgstr "" | ||
3896 | 3879 | |||
3897 | 3880 | #: bzrlib/errors.py:705 | ||
3898 | 3881 | msgid "Not a branch: \"%(path)s\"%(detail)s." | ||
3899 | 3882 | msgstr "" | ||
3900 | 3883 | |||
3901 | 3884 | #: bzrlib/errors.py:747 | ||
3902 | 3885 | msgid "No submit branch available for branch \"%(path)s\"" | ||
3903 | 3886 | msgstr "" | ||
3904 | 3887 | |||
3905 | 3888 | #: bzrlib/errors.py:756 | ||
3906 | 3889 | msgid "Already a branch: \"%(path)s\"." | ||
3907 | 3890 | msgstr "" | ||
3908 | 3891 | |||
3909 | 3892 | #: bzrlib/errors.py:762 | ||
3910 | 3893 | msgid "" | ||
3911 | 3894 | "Directory contains a branch, but no working tree (use bzr checkout if you " | ||
3912 | 3895 | "wish to build a working tree): \"%(path)s\"" | ||
3913 | 3896 | msgstr "" | ||
3914 | 3897 | |||
3915 | 3898 | #: bzrlib/errors.py:767 | ||
3916 | 3899 | msgid "" | ||
3917 | 3900 | "\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\"" | ||
3918 | 3901 | msgstr "" | ||
3919 | 3902 | |||
3920 | 3903 | #: bzrlib/errors.py:777 | ||
3921 | 3904 | msgid "" | ||
3922 | 3905 | "Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\"" | ||
3923 | 3906 | msgstr "" | ||
3924 | 3907 | |||
3925 | 3908 | #: bzrlib/errors.py:787 | ||
3926 | 3909 | msgid "No repository present: \"%(path)s\"" | ||
3927 | 3910 | msgstr "" | ||
3928 | 3911 | |||
3929 | 3912 | #: bzrlib/errors.py:795 | ||
3930 | 3913 | msgid "File \"%(path)s\" is not in branch %(branch_base)s." | ||
3931 | 3914 | msgstr "" | ||
3932 | 3915 | |||
3933 | 3916 | #: bzrlib/errors.py:807 | ||
3934 | 3917 | msgid "" | ||
3935 | 3918 | "Unsupported branch format: %(format)s\n" | ||
3936 | 3919 | "Please run 'bzr upgrade'" | ||
3937 | 3920 | msgstr "" | ||
3938 | 3921 | |||
3939 | 3922 | #: bzrlib/errors.py:813 | ||
3940 | 3923 | msgid "Unknown %(kind)s format: %(format)r" | ||
3941 | 3924 | msgstr "" | ||
3942 | 3925 | |||
3943 | 3926 | #: bzrlib/errors.py:822 | ||
3944 | 3927 | msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s." | ||
3945 | 3928 | msgstr "" | ||
3946 | 3929 | |||
3947 | 3930 | #: bzrlib/errors.py:835 | ||
3948 | 3931 | msgid "" | ||
3949 | 3932 | "%(target)s\n" | ||
3950 | 3933 | "is not compatible with\n" | ||
3951 | 3934 | "%(source)s\n" | ||
3952 | 3935 | "%(details)s" | ||
3953 | 3936 | msgstr "" | ||
3954 | 3937 | |||
3955 | 3938 | #: bzrlib/errors.py:851 | ||
3956 | 3939 | msgid "Revision is not compatible with %(repo_format)s" | ||
3957 | 3940 | msgstr "" | ||
3958 | 3941 | |||
3959 | 3942 | #: bzrlib/errors.py:861 | ||
3960 | 3943 | msgid "%(context_info)s%(path)s is already versioned." | ||
3961 | 3944 | msgstr "" | ||
3962 | 3945 | |||
3963 | 3946 | #: bzrlib/errors.py:882 | ||
3964 | 3947 | msgid "%(context_info)s%(path)s is not versioned." | ||
3965 | 3948 | msgstr "" | ||
3966 | 3949 | |||
3967 | 3950 | #: bzrlib/errors.py:903 | ||
3968 | 3951 | msgid "Path(s) are not versioned: %(paths_as_string)s" | ||
3969 | 3952 | msgstr "" | ||
3970 | 3953 | |||
3971 | 3954 | #: bzrlib/errors.py:914 | ||
3972 | 3955 | msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s" | ||
3973 | 3956 | msgstr "" | ||
3974 | 3957 | |||
3975 | 3958 | #: bzrlib/errors.py:933 | ||
3976 | 3959 | msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\"" | ||
3977 | 3960 | msgstr "" | ||
3978 | 3961 | |||
3979 | 3962 | #: bzrlib/errors.py:941 | ||
3980 | 3963 | msgid "" | ||
3981 | 3964 | "Filename %(filename)r is not valid in your current filesystem encoding " | ||
3982 | 3965 | "%(fs_encoding)s" | ||
3983 | 3966 | msgstr "" | ||
3984 | 3967 | |||
3985 | 3968 | #: bzrlib/errors.py:952 | ||
3986 | 3969 | msgid "Cannot operate on \"%(filename)s\" because it is a control file" | ||
3987 | 3970 | msgstr "" | ||
3988 | 3971 | |||
3989 | 3972 | #: bzrlib/errors.py:970 | ||
3990 | 3973 | msgid "The lock for '%(lock_description)s' is in use and cannot be broken." | ||
3991 | 3974 | msgstr "" | ||
3992 | 3975 | |||
3993 | 3976 | #: bzrlib/errors.py:1009 | ||
3994 | 3977 | msgid "Cannot lock %(lock)s: %(why)s" | ||
3995 | 3978 | msgstr "" | ||
3996 | 3979 | |||
3997 | 3980 | #: bzrlib/errors.py:1019 | ||
3998 | 3981 | msgid "" | ||
3999 | 3982 | "A transaction related operation was attempted after the transaction finished." | ||
4000 | 3983 | msgstr "" | ||
4001 | 3984 | |||
4002 | 3985 | #: bzrlib/errors.py:1046 | ||
4003 | 3986 | msgid "Cannot lock: transport is read only: %(transport)s" | ||
4004 | 3987 | msgstr "" | ||
4005 | 3988 | |||
4006 | 3989 | #: bzrlib/errors.py:1054 | ||
4007 | 3990 | msgid "Could not acquire lock \"%(lock)s\": %(msg)s" | ||
4008 | 3991 | msgstr "" | ||
4009 | 3992 | |||
4010 | 3993 | #: bzrlib/errors.py:1065 | ||
4011 | 3994 | msgid "Lock was broken while still open: %(lock)s - check storage consistency!" | ||
4012 | 3995 | msgstr "" | ||
4013 | 3996 | |||
4014 | 3997 | #: bzrlib/errors.py:1076 | ||
4015 | 3998 | msgid "" | ||
4016 | 3999 | "Lock was released and re-acquired before being broken: %(lock)s: held by " | ||
4017 | 4000 | "%(holder)r, wanted to break %(target)r" | ||
4018 | 4001 | msgstr "" | ||
4019 | 4002 | |||
4020 | 4003 | #: bzrlib/errors.py:1088 | ||
4021 | 4004 | msgid "" | ||
4022 | 4005 | "Lock is apparently held, but corrupted: %(corruption_info)s\n" | ||
4023 | 4006 | "Use 'bzr break-lock' to clear it" | ||
4024 | 4007 | msgstr "" | ||
4025 | 4008 | |||
4026 | 4009 | #: bzrlib/errors.py:1101 | ||
4027 | 4010 | msgid "Lock not held: %(lock)s" | ||
4028 | 4011 | msgstr "" | ||
4029 | 4012 | |||
4030 | 4013 | #: bzrlib/errors.py:1130 | ||
4031 | 4014 | msgid "No changes to commit" | ||
4032 | 4015 | msgstr "" | ||
4033 | 4016 | |||
4034 | 4017 | #: bzrlib/errors.py:1135 | ||
4035 | 4018 | msgid "" | ||
4036 | 4019 | "Selected-file commit of merges is not supported yet: files %(files_str)s" | ||
4037 | 4020 | msgstr "" | ||
4038 | 4021 | |||
4039 | 4022 | #: bzrlib/errors.py:1145 | ||
4040 | 4023 | msgid "" | ||
4041 | 4024 | "Excluding paths during commit is not supported by repository at %(repository)" | ||
4042 | 4025 | "r." | ||
4043 | 4026 | msgstr "" | ||
4044 | 4027 | |||
4045 | 4028 | #: bzrlib/errors.py:1154 | ||
4046 | 4029 | msgid "" | ||
4047 | 4030 | "The specified commit message contains characters unsupported by the current " | ||
4048 | 4031 | "encoding." | ||
4049 | 4032 | msgstr "" | ||
4050 | 4033 | |||
4051 | 4034 | #: bzrlib/errors.py:1160 | ||
4052 | 4035 | msgid "Upgrade URL cannot work with readonly URLs." | ||
4053 | 4036 | msgstr "" | ||
4054 | 4037 | |||
4055 | 4038 | #: bzrlib/errors.py:1165 | ||
4056 | 4039 | msgid "The branch format %(format)s is already at the most recent format." | ||
4057 | 4040 | msgstr "" | ||
4058 | 4041 | |||
4059 | 4042 | #: bzrlib/errors.py:1188 | ||
4060 | 4043 | msgid "Option --change does not accept revision ranges" | ||
4061 | 4044 | msgstr "" | ||
4062 | 4045 | |||
4063 | 4046 | #: bzrlib/errors.py:1193 | ||
4064 | 4047 | msgid "No namespace registered for string: %(spec)r" | ||
4065 | 4048 | msgstr "" | ||
4066 | 4049 | |||
4067 | 4050 | #: bzrlib/errors.py:1212 | ||
4068 | 4051 | msgid "" | ||
4069 | 4052 | "Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s" | ||
4070 | 4053 | "%(extra)s" | ||
4071 | 4054 | msgstr "" | ||
4072 | 4055 | |||
4073 | 4056 | #: bzrlib/errors.py:1226 | ||
4074 | 4057 | msgid "%(branch)s is missing %(object_type)s {%(object_id)s}" | ||
4075 | 4058 | msgstr "" | ||
4076 | 4059 | |||
4077 | 4060 | #: bzrlib/errors.py:1231 | ||
4078 | 4061 | msgid "" | ||
4079 | 4062 | "Operation denied because it would change the main history, which is not " | ||
4080 | 4063 | "permitted by the append_revisions_only setting on branch \"%(location)s\"." | ||
4081 | 4064 | msgstr "" | ||
4082 | 4065 | |||
4083 | 4066 | #: bzrlib/errors.py:1242 | ||
4084 | 4067 | msgid "" | ||
4085 | 4068 | "These branches have diverged. Use the missing command to see how.\n" | ||
4086 | 4069 | "Use the merge command to reconcile them." | ||
4087 | 4070 | msgstr "" | ||
4088 | 4071 | |||
4089 | 4072 | #: bzrlib/errors.py:1262 | ||
4090 | 4073 | msgid "" | ||
4091 | 4074 | "Branches have no common ancestor, and no merge base revision was specified." | ||
4092 | 4075 | msgstr "" | ||
4093 | 4076 | |||
4094 | 4077 | #: bzrlib/errors.py:1268 | ||
4095 | 4078 | msgid "" | ||
4096 | 4079 | "Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3." | ||
4097 | 4080 | msgstr "" | ||
4098 | 4081 | |||
4099 | 4082 | #: bzrlib/errors.py:1274 | ||
4100 | 4083 | msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s" | ||
4101 | 4084 | msgstr "" | ||
4102 | 4085 | |||
4103 | 4086 | #: bzrlib/errors.py:1283 | ||
4104 | 4087 | msgid "" | ||
4105 | 4088 | "Revisions are not derived from the same root: %(revision_a)s %(revision_b)s." | ||
4106 | 4089 | msgstr "" | ||
4107 | 4090 | |||
4108 | 4091 | #: bzrlib/errors.py:1292 | ||
4109 | 4092 | msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s" | ||
4110 | 4093 | msgstr "" | ||
4111 | 4094 | |||
4112 | 4095 | #: bzrlib/errors.py:1312 | ||
4113 | 4096 | msgid "Branch %(branch)s has no commits." | ||
4114 | 4097 | msgstr "" | ||
4115 | 4098 | |||
4116 | 4099 | #: bzrlib/errors.py:1330 | ||
4117 | 4100 | msgid "" | ||
4118 | 4101 | "Bound branch %(branch)s is out of date with master branch %(master)s." | ||
4119 | 4102 | "%(extra_help)s" | ||
4120 | 4103 | msgstr "" | ||
4121 | 4104 | |||
4122 | 4105 | #: bzrlib/errors.py:1342 | ||
4123 | 4106 | msgid "" | ||
4124 | 4107 | "Cannot commit to branch %(branch)s. It is bound to %(master)s, which is " | ||
4125 | 4108 | "bound to %(remote)s." | ||
4126 | 4109 | msgstr "" | ||
4127 | 4110 | |||
4128 | 4111 | #: bzrlib/errors.py:1354 | ||
4129 | 4112 | msgid "Cannot pull --overwrite to a branch which is bound %(branch)s" | ||
4130 | 4113 | msgstr "" | ||
4131 | 4114 | |||
4132 | 4115 | #: bzrlib/errors.py:1363 | ||
4133 | 4116 | msgid "" | ||
4134 | 4117 | "Unable to connect to target of bound branch %(branch)s => %(target)s: " | ||
4135 | 4118 | "%(error)s" | ||
4136 | 4119 | msgstr "" | ||
4137 | 4120 | |||
4138 | 4121 | #: bzrlib/errors.py:1375 | ||
4139 | 4122 | msgid "Error in processing weave: %(msg)s" | ||
4140 | 4123 | msgstr "" | ||
4141 | 4124 | |||
4142 | 4125 | #: bzrlib/errors.py:1384 | ||
4143 | 4126 | msgid "Revision {%(revision_id)s} already present in %(weave)s" | ||
4144 | 4127 | msgstr "" | ||
4145 | 4128 | |||
4146 | 4129 | #: bzrlib/errors.py:1395 | ||
4147 | 4130 | msgid "Revision {%(revision_id)s} not present in %(weave)s" | ||
4148 | 4131 | msgstr "" | ||
4149 | 4132 | |||
4150 | 4133 | #: bzrlib/errors.py:1405 | ||
4151 | 4134 | msgid "Weave invariant violated: %(what)s" | ||
4152 | 4135 | msgstr "" | ||
4153 | 4136 | |||
4154 | 4137 | #: bzrlib/errors.py:1414 | ||
4155 | 4138 | msgid "Parents are mismatched between two revisions. %(msg)s" | ||
4156 | 4139 | msgstr "" | ||
4157 | 4140 | |||
4158 | 4141 | #: bzrlib/errors.py:1436 | ||
4159 | 4142 | msgid "" | ||
4160 | 4143 | "Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, " | ||
4161 | 4144 | "%(weave_b)s" | ||
4162 | 4145 | msgstr "" | ||
4163 | 4146 | |||
4164 | 4147 | #: bzrlib/errors.py:1448 | ||
4165 | 4148 | msgid "Versioned file error" | ||
4166 | 4149 | msgstr "" | ||
4167 | 4150 | |||
4168 | 4151 | #: bzrlib/errors.py:1453 | ||
4169 | 4152 | msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"." | ||
4170 | 4153 | msgstr "" | ||
4171 | 4154 | |||
4172 | 4155 | #: bzrlib/errors.py:1463 | ||
4173 | 4156 | msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"." | ||
4174 | 4157 | msgstr "" | ||
4175 | 4158 | |||
4176 | 4159 | #: bzrlib/errors.py:1473 | ||
4177 | 4160 | msgid "Text did not match its checksum: %(msg)s" | ||
4178 | 4161 | msgstr "" | ||
4179 | 4162 | |||
4180 | 4163 | #: bzrlib/errors.py:1598 | ||
4181 | 4164 | msgid "Export format %(format)r not supported" | ||
4182 | 4165 | msgstr "" | ||
4183 | 4166 | |||
4184 | 4167 | #: bzrlib/errors.py:1607 | ||
4185 | 4168 | msgid "Transport error: %(msg)s %(orig_error)s" | ||
4186 | 4169 | msgstr "" | ||
4187 | 4170 | |||
4188 | 4171 | #: bzrlib/errors.py:1633 | ||
4189 | 4172 | msgid "Generic bzr smart protocol error: %(details)s" | ||
4190 | 4173 | msgstr "" | ||
4191 | 4174 | |||
4192 | 4175 | #: bzrlib/errors.py:1641 | ||
4193 | 4176 | msgid "Received bad protocol version marker: %(marker)r" | ||
4194 | 4177 | msgstr "" | ||
4195 | 4178 | |||
4196 | 4179 | #: bzrlib/errors.py:1672 | ||
4197 | 4180 | msgid "Transport operation not possible: %(msg)s %(orig_error)s" | ||
4198 | 4181 | msgstr "" | ||
4199 | 4182 | |||
4200 | 4183 | #: bzrlib/errors.py:1677 | ||
4201 | 4184 | msgid "Connection error: %(msg)s %(orig_error)s" | ||
4202 | 4185 | msgstr "" | ||
4203 | 4186 | |||
4204 | 4187 | #: bzrlib/errors.py:1682 | ||
4205 | 4188 | msgid "%(msg)s %(host)s%(port)s%(orig_error)s" | ||
4206 | 4189 | msgstr "" | ||
4207 | 4190 | |||
4208 | 4191 | #: bzrlib/errors.py:1703 | ||
4209 | 4192 | msgid "Connection closed: %(msg)s %(orig_error)s" | ||
4210 | 4193 | msgstr "" | ||
4211 | 4194 | |||
4212 | 4195 | #: bzrlib/errors.py:1708 | ||
4213 | 4196 | msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s" | ||
4214 | 4197 | msgstr "" | ||
4215 | 4198 | |||
4216 | 4199 | #: bzrlib/errors.py:1718 | ||
4217 | 4200 | msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s" | ||
4218 | 4201 | msgstr "" | ||
4219 | 4202 | |||
4220 | 4203 | #: bzrlib/errors.py:1733 | ||
4221 | 4204 | msgid "Invalid http range %(range)r for %(path)s: %(msg)s" | ||
4222 | 4205 | msgstr "" | ||
4223 | 4206 | |||
4224 | 4207 | #: bzrlib/errors.py:1747 | ||
4225 | 4208 | msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s" | ||
4226 | 4209 | msgstr "" | ||
4227 | 4210 | |||
4228 | 4211 | #: bzrlib/errors.py:1755 | ||
4229 | 4212 | msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s" | ||
4230 | 4213 | msgstr "" | ||
4231 | 4214 | |||
4232 | 4215 | #: bzrlib/errors.py:1764 | ||
4233 | 4216 | msgid "%(source)s is%(permanently)s redirected to %(target)s" | ||
4234 | 4217 | msgstr "" | ||
4235 | 4218 | |||
4236 | 4219 | #: bzrlib/errors.py:1778 | ||
4237 | 4220 | msgid "Too many redirections" | ||
4238 | 4221 | msgstr "" | ||
4239 | 4222 | |||
4240 | 4223 | #: bzrlib/errors.py:1783 | ||
4241 | 4224 | msgid "Working tree has conflicts." | ||
4242 | 4225 | msgstr "" | ||
4243 | 4226 | |||
4244 | 4227 | #: bzrlib/errors.py:1787 | ||
4245 | 4228 | msgid "Config file %(filename)s is not UTF-8 encoded\n" | ||
4246 | 4229 | msgstr "" | ||
4247 | 4230 | |||
4248 | 4231 | #: bzrlib/errors.py:1796 | ||
4249 | 4232 | msgid "" | ||
4250 | 4233 | "Error(s) parsing config file %(filename)s:\n" | ||
4251 | 4234 | "%(errors)s" | ||
4252 | 4235 | msgstr "" | ||
4253 | 4236 | |||
4254 | 4237 | #: bzrlib/errors.py:1807 | ||
4255 | 4238 | msgid "Bad value \"%(value)s\" for option \"%(name)s\"." | ||
4256 | 4239 | msgstr "" | ||
4257 | 4240 | |||
4258 | 4241 | #: bzrlib/errors.py:1815 | ||
4259 | 4242 | msgid "%(username)r does not seem to contain a reasonable email address" | ||
4260 | 4243 | msgstr "" | ||
4261 | 4244 | |||
4262 | 4245 | #: bzrlib/errors.py:1824 | ||
4263 | 4246 | msgid "Failed to GPG sign data with command \"%(command_line)s\"" | ||
4264 | 4247 | msgstr "" | ||
4265 | 4248 | |||
4266 | 4249 | #: bzrlib/errors.py:1832 | ||
4267 | 4250 | msgid "Failed to verify GPG signature data with error \"%(error)s\"" | ||
4268 | 4251 | msgstr "" | ||
4269 | 4252 | |||
4270 | 4253 | #: bzrlib/errors.py:1840 | ||
4271 | 4254 | msgid "Unable to import library \"%(library)s\": %(error)s" | ||
4272 | 4255 | msgstr "" | ||
4273 | 4256 | |||
4274 | 4257 | #: bzrlib/errors.py:1848 | ||
4275 | 4258 | msgid "python-gpgme is not installed, it is needed to verify signatures" | ||
4276 | 4259 | msgstr "" | ||
4277 | 4260 | |||
4278 | 4261 | #: bzrlib/errors.py:1856 | ||
4279 | 4262 | msgid "" | ||
4280 | 4263 | "The working tree for %(basedir)s has changed since the last commit, but " | ||
4281 | 4264 | "weave merge requires that it be unchanged" | ||
4282 | 4265 | msgstr "" | ||
4283 | 4266 | |||
4284 | 4267 | #: bzrlib/errors.py:1866 | ||
4285 | 4268 | msgid "" | ||
4286 | 4269 | "Can't reprocess and show base, because reprocessing obscures the " | ||
4287 | 4270 | "relationship of conflicting lines to the base" | ||
4288 | 4271 | msgstr "" | ||
4289 | 4272 | |||
4290 | 4273 | #: bzrlib/errors.py:1872 | ||
4291 | 4274 | msgid "Cycle in graph %(graph)r" | ||
4292 | 4275 | msgstr "" | ||
4293 | 4276 | |||
4294 | 4277 | #: bzrlib/errors.py:1900 | ||
4295 | 4278 | msgid "File %(filename)s is not conflicted." | ||
4296 | 4279 | msgstr "" | ||
4297 | 4280 | |||
4298 | 4281 | #: bzrlib/errors.py:1922 | ||
4299 | 4282 | msgid "No bundle was found in \"%(filename)s\"." | ||
4300 | 4283 | msgstr "" | ||
4301 | 4284 | |||
4302 | 4285 | #: bzrlib/errors.py:1931 | ||
4303 | 4286 | msgid "Unable to handle bundle version %(version)s: %(msg)s" | ||
4304 | 4287 | msgstr "" | ||
4305 | 4288 | |||
4306 | 4289 | #: bzrlib/errors.py:1941 | ||
4307 | 4290 | msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s" | ||
4308 | 4291 | msgstr "" | ||
4309 | 4292 | |||
4310 | 4293 | #: bzrlib/errors.py:1954 | ||
4311 | 4294 | msgid "File id {%(file_id)s} already exists in inventory as %(entry)s" | ||
4312 | 4295 | msgstr "" | ||
4313 | 4296 | |||
4314 | 4297 | #: bzrlib/errors.py:1964 | ||
4315 | 4298 | msgid "Key %(key)s is already present in map" | ||
4316 | 4299 | msgstr "" | ||
4317 | 4300 | |||
4318 | 4301 | #: bzrlib/errors.py:1969 | ||
4319 | 4302 | msgid "The prefix %(prefix)s is in the help search path twice." | ||
4320 | 4303 | msgstr "" | ||
4321 | 4304 | |||
4322 | 4305 | #: bzrlib/errors.py:1977 | ||
4323 | 4306 | msgid "Tree transform is malformed %(conflicts)r" | ||
4324 | 4307 | msgstr "" | ||
4325 | 4308 | |||
4326 | 4309 | #: bzrlib/errors.py:1979 | ||
4327 | 4310 | msgid "" | ||
4328 | 4311 | "No final name for trans_id %(trans_id)r\n" | ||
4329 | 4312 | "file-id: %(file_id)r\n" | ||
4330 | 4313 | "root trans-id: %(root_trans_id)r\n" | ||
4331 | 4314 | msgstr "" | ||
4332 | 4315 | |||
4333 | 4316 | #: bzrlib/errors.py:2011 | ||
4334 | 4317 | msgid "Attempt to reuse a transform that has already been applied." | ||
4335 | 4318 | msgstr "" | ||
4336 | 4319 | |||
4337 | 4320 | #: bzrlib/errors.py:2016 | ||
4338 | 4321 | msgid "Moving the root directory is not supported at this time" | ||
4339 | 4322 | msgstr "" | ||
4340 | 4323 | |||
4341 | 4324 | #: bzrlib/errors.py:2021 | ||
4342 | 4325 | msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s" | ||
4343 | 4326 | msgstr "" | ||
4344 | 4327 | |||
4345 | 4328 | #: bzrlib/errors.py:2032 | ||
4346 | 4329 | msgid "" | ||
4347 | 4330 | "Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" | ||
4348 | 4331 | msgstr "" | ||
4349 | 4332 | |||
4350 | 4333 | #: bzrlib/errors.py:2068 | ||
4351 | 4334 | msgid "" | ||
4352 | 4335 | "Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" | ||
4353 | 4336 | msgstr "" | ||
4354 | 4337 | |||
4355 | 4338 | #: bzrlib/errors.py:2077 | ||
4356 | 4339 | msgid "" | ||
4357 | 4340 | "Can't safely remove modified or unknown files:\n" | ||
4358 | 4341 | "%(changes_as_text)sUse --keep to not delete them, or --force to delete them " | ||
4359 | 4342 | "regardless." | ||
4360 | 4343 | msgstr "" | ||
4361 | 4344 | |||
4362 | 4345 | #: bzrlib/errors.py:2114 | ||
4363 | 4346 | msgid "Unable to import paramiko (required for sftp support): %(error)s" | ||
4364 | 4347 | msgstr "" | ||
4365 | 4348 | |||
4366 | 4349 | #: bzrlib/errors.py:2122 | ||
4367 | 4350 | msgid "Nothing to merge." | ||
4368 | 4351 | msgstr "" | ||
4369 | 4352 | |||
4370 | 4353 | #: bzrlib/errors.py:2127 | ||
4371 | 4354 | msgid "Format %(format)s cannot be initialised by this version of bzr." | ||
4372 | 4355 | msgstr "" | ||
4373 | 4356 | |||
4374 | 4357 | #: bzrlib/errors.py:2136 | ||
4375 | 4358 | msgid "" | ||
4376 | 4359 | "Cannot convert from format %(from_format)s to format %(format)s. " | ||
4377 | 4360 | "%(problem)s" | ||
4378 | 4361 | msgstr "" | ||
4379 | 4362 | |||
4380 | 4363 | #: bzrlib/errors.py:2148 | ||
4381 | 4364 | msgid "Could not find an appropriate Differ for file \"%(path)s\"" | ||
4382 | 4365 | msgstr "" | ||
4383 | 4366 | |||
4384 | 4367 | #: bzrlib/errors.py:2156 | ||
4385 | 4368 | msgid "%(exe_name)s could not be found on this machine" | ||
4386 | 4369 | msgstr "" | ||
4387 | 4370 | |||
4388 | 4371 | #: bzrlib/errors.py:2164 | ||
4389 | 4372 | msgid "Diff is not installed on this machine: %(msg)s" | ||
4390 | 4373 | msgstr "" | ||
4391 | 4374 | |||
4392 | 4375 | #: bzrlib/errors.py:2172 | ||
4393 | 4376 | msgid "Diff3 is not installed on this machine." | ||
4394 | 4377 | msgstr "" | ||
4395 | 4378 | |||
4396 | 4379 | #: bzrlib/errors.py:2178 | ||
4397 | 4380 | msgid "The content being inserted is already present." | ||
4398 | 4381 | msgstr "" | ||
4399 | 4382 | |||
4400 | 4383 | #: bzrlib/errors.py:2183 | ||
4401 | 4384 | msgid "" | ||
4402 | 4385 | "This tree contains left-over files from a failed operation.\n" | ||
4403 | 4386 | " Please examine %(limbo_dir)s to see if it contains any files you wish " | ||
4404 | 4387 | "to\n" | ||
4405 | 4388 | " keep, and delete it when you are done." | ||
4406 | 4389 | msgstr "" | ||
4407 | 4390 | |||
4408 | 4391 | #: bzrlib/errors.py:2194 | ||
4409 | 4392 | msgid "" | ||
4410 | 4393 | "This tree contains left-over files from a failed operation.\n" | ||
4411 | 4394 | " Please examine %(pending_deletion)s to see if it contains any files you\n" | ||
4412 | 4395 | " wish to keep, and delete it when you are done." | ||
4413 | 4396 | msgstr "" | ||
4414 | 4397 | |||
4415 | 4398 | #: bzrlib/errors.py:2204 | ||
4416 | 4399 | msgid "" | ||
4417 | 4400 | "Unable to delete transform temporary directory %(limbo_dir)s.\n" | ||
4418 | 4401 | " Please examine %(limbo_dir)s to see if it contains any files you wish " | ||
4419 | 4402 | "to\n" | ||
4420 | 4403 | " keep, and delete it when you are done." | ||
4421 | 4404 | msgstr "" | ||
4422 | 4405 | |||
4423 | 4406 | #: bzrlib/errors.py:2215 | ||
4424 | 4407 | msgid "" | ||
4425 | 4408 | "Unable to delete transform temporary directory %(pending_deletion)s. Please " | ||
4426 | 4409 | "examine %(pending_deletion)s to see if it contains any files you wish to " | ||
4427 | 4410 | "keep, and delete it when you are done." | ||
4428 | 4411 | msgstr "" | ||
4429 | 4412 | |||
4430 | 4413 | #: bzrlib/errors.py:2225 | ||
4431 | 4414 | msgid "Working tree is out of date, please run 'bzr update'.%(more)s" | ||
4432 | 4415 | msgstr "" | ||
4433 | 4416 | |||
4434 | 4417 | #: bzrlib/errors.py:2239 | ||
4435 | 4418 | msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"." | ||
4436 | 4419 | msgstr "" | ||
4437 | 4420 | |||
4438 | 4421 | #: bzrlib/errors.py:2252 | ||
4439 | 4422 | msgid "Error in merge modified format" | ||
4440 | 4423 | msgstr "" | ||
4441 | 4424 | |||
4442 | 4425 | #: bzrlib/errors.py:2257 | ||
4443 | 4426 | msgid "Format error in conflict listings" | ||
4444 | 4427 | msgstr "" | ||
4445 | 4428 | |||
4446 | 4429 | #: bzrlib/errors.py:2261 | ||
4447 | 4430 | msgid "" | ||
4448 | 4431 | "Inconsistency in dirstate file %(dirstate_path)s.\n" | ||
4449 | 4432 | "Error: %(description)s" | ||
4450 | 4433 | msgstr "" | ||
4451 | 4434 | |||
4452 | 4435 | #: bzrlib/errors.py:2272 | ||
4453 | 4436 | msgid "" | ||
4454 | 4437 | "An error has been detected in the repository %(repo_path)s.\n" | ||
4455 | 4438 | "Please run bzr reconcile on this repository." | ||
4456 | 4439 | msgstr "" | ||
4457 | 4440 | |||
4458 | 4441 | #: bzrlib/errors.py:2283 | ||
4459 | 4442 | msgid "" | ||
4460 | 4443 | "An inconsistent delta was supplied involving %(path)r, %(file_id)r\n" | ||
4461 | 4444 | "reason: %(reason)s" | ||
4462 | 4445 | msgstr "" | ||
4463 | 4446 | |||
4464 | 4447 | #: bzrlib/errors.py:2296 | ||
4465 | 4448 | msgid "" | ||
4466 | 4449 | "An inconsistent delta was supplied: %(delta)r\n" | ||
4467 | 4450 | "reason: %(reason)s" | ||
4468 | 4451 | msgstr "" | ||
4469 | 4452 | |||
4470 | 4453 | #: bzrlib/errors.py:2308 | ||
4471 | 4454 | msgid "To use this feature you must upgrade your branch at %(path)s." | ||
4472 | 4455 | msgstr "" | ||
4473 | 4456 | |||
4474 | 4457 | #: bzrlib/errors.py:2317 | ||
4475 | 4458 | msgid "To use this feature you must upgrade your repository at %(path)s." | ||
4476 | 4459 | msgstr "" | ||
4477 | 4460 | |||
4478 | 4461 | #: bzrlib/errors.py:2322 | ||
4479 | 4462 | msgid "" | ||
4480 | 4463 | "To use this feature you must upgrade your branch at %(path)s to a format " | ||
4481 | 4464 | "which supports rich roots." | ||
4482 | 4465 | msgstr "" | ||
4483 | 4466 | |||
4484 | 4467 | #: bzrlib/errors.py:2328 | ||
4485 | 4468 | msgid "Cannot perform local-only commits on unbound branches." | ||
4486 | 4469 | msgstr "" | ||
4487 | 4470 | |||
4488 | 4471 | #: bzrlib/errors.py:2333 | ||
4489 | 4472 | msgid "The method %(mname)s is not supported on objects of type %(tname)s." | ||
4490 | 4473 | msgstr "" | ||
4491 | 4474 | |||
4492 | 4475 | #: bzrlib/errors.py:2354 | ||
4493 | 4476 | msgid "File is binary but should be text." | ||
4494 | 4477 | msgstr "" | ||
4495 | 4478 | |||
4496 | 4479 | #: bzrlib/errors.py:2359 | ||
4497 | 4480 | msgid "The path %(path)s is not permitted on this platform" | ||
4498 | 4481 | msgstr "" | ||
4499 | 4482 | |||
4500 | 4483 | #: bzrlib/errors.py:2368 | ||
4501 | 4484 | msgid "" | ||
4502 | 4485 | "Testament did not match expected value.\n" | ||
4503 | 4486 | " For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n" | ||
4504 | 4487 | " {%(measured)s}" | ||
4505 | 4488 | msgstr "" | ||
4506 | 4489 | |||
4507 | 4490 | #: bzrlib/errors.py:2380 | ||
4508 | 4491 | msgid "Not a bzr revision-bundle: %(text)r" | ||
4509 | 4492 | msgstr "" | ||
4510 | 4493 | |||
4511 | 4494 | #: bzrlib/errors.py:2389 | ||
4512 | 4495 | msgid "Bad bzr revision-bundle: %(text)r" | ||
4513 | 4496 | msgstr "" | ||
4514 | 4497 | |||
4515 | 4498 | #: bzrlib/errors.py:2398 | ||
4516 | 4499 | msgid "Malformed bzr revision-bundle header: %(text)r" | ||
4517 | 4500 | msgstr "" | ||
4518 | 4501 | |||
4519 | 4502 | #: bzrlib/errors.py:2403 | ||
4520 | 4503 | msgid "Malformed patches in bzr revision-bundle: %(text)r" | ||
4521 | 4504 | msgstr "" | ||
4522 | 4505 | |||
4523 | 4506 | #: bzrlib/errors.py:2408 | ||
4524 | 4507 | msgid "Malformed footer in bzr revision-bundle: %(text)r" | ||
4525 | 4508 | msgstr "" | ||
4526 | 4509 | |||
4527 | 4510 | #: bzrlib/errors.py:2413 | ||
4528 | 4511 | msgid "End of line marker was not \\n in bzr revision-bundle" | ||
4529 | 4512 | msgstr "" | ||
4530 | 4513 | |||
4531 | 4514 | #: bzrlib/errors.py:2423 | ||
4532 | 4515 | msgid "Bundle format %(bundle_format)s is incompatible with %(other)s" | ||
4533 | 4516 | msgstr "" | ||
4534 | 4517 | |||
4535 | 4518 | #: bzrlib/errors.py:2433 | ||
4536 | 4519 | msgid "Root class for inventory serialization errors" | ||
4537 | 4520 | msgstr "" | ||
4538 | 4521 | |||
4539 | 4522 | #: bzrlib/errors.py:2437 | ||
4540 | 4523 | msgid "" | ||
4541 | 4524 | "The inventory was not in the expected format:\n" | ||
4542 | 4525 | " %(msg)s" | ||
4543 | 4526 | msgstr "" | ||
4544 | 4527 | |||
4545 | 4528 | #: bzrlib/errors.py:2446 | ||
4546 | 4529 | msgid "This operation requires rich root data storage" | ||
4547 | 4530 | msgstr "" | ||
4548 | 4531 | |||
4549 | 4532 | #: bzrlib/errors.py:2459 | ||
4550 | 4533 | msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s" | ||
4551 | 4534 | msgstr "" | ||
4552 | 4535 | |||
4553 | 4536 | #: bzrlib/errors.py:2468 | ||
4554 | 4537 | msgid "" | ||
4555 | 4538 | "Don't know how to handle SSH connections. Please set BZR_SSH environment " | ||
4556 | 4539 | "variable." | ||
4557 | 4540 | msgstr "" | ||
4558 | 4541 | |||
4559 | 4542 | #: bzrlib/errors.py:2475 | ||
4560 | 4543 | msgid "" | ||
4561 | 4544 | "Could not determine revno for {%(revision_id)s} because its ancestry shows a " | ||
4562 | 4545 | "ghost at {%(ghost_revision_id)s}" | ||
4563 | 4546 | msgstr "" | ||
4564 | 4547 | |||
4565 | 4548 | #: bzrlib/errors.py:2485 | ||
4566 | 4549 | msgid "Ghost revision {%(revision_id)s} cannot be used here." | ||
4567 | 4550 | msgstr "" | ||
4568 | 4551 | |||
4569 | 4552 | #: bzrlib/errors.py:2536 | ||
4570 | 4553 | msgid "" | ||
4571 | 4554 | "A merge directive must provide either a bundle or a public branch location." | ||
4572 | 4555 | msgstr "" | ||
4573 | 4556 | |||
4574 | 4557 | #: bzrlib/errors.py:2543 | ||
4575 | 4558 | msgid "Bad merge directive payload %(start)r" | ||
4576 | 4559 | msgstr "" | ||
4577 | 4560 | |||
4578 | 4561 | #: bzrlib/errors.py:2553 | ||
4579 | 4562 | msgid "Preview patch does not match requested changes." | ||
4580 | 4563 | msgstr "" | ||
4581 | 4564 | |||
4582 | 4565 | #: bzrlib/errors.py:2559 | ||
4583 | 4566 | msgid "Patch_type was %(patch_type)s, but no patch was supplied." | ||
4584 | 4567 | msgstr "" | ||
4585 | 4568 | |||
4586 | 4569 | #: bzrlib/errors.py:2569 | ||
4587 | 4570 | msgid "" | ||
4588 | 4571 | "Your branch does not have all of the revisions required in order to merge " | ||
4589 | 4572 | "this merge directive and the target location specified in the merge " | ||
4590 | 4573 | "directive is not a branch: %(location)s." | ||
4591 | 4574 | msgstr "" | ||
4592 | 4575 | |||
4593 | 4576 | #: bzrlib/errors.py:2581 | ||
4594 | 4577 | msgid "Unsupported entry kind %(kind)s" | ||
4595 | 4578 | msgstr "" | ||
4596 | 4579 | |||
4597 | 4580 | #: bzrlib/errors.py:2589 | ||
4598 | 4581 | msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s" | ||
4599 | 4582 | msgstr "" | ||
4600 | 4583 | |||
4601 | 4584 | #: bzrlib/errors.py:2599 | ||
4602 | 4585 | msgid "Subsume target %(other_tree)s needs to be upgraded." | ||
4603 | 4586 | msgstr "" | ||
4604 | 4587 | |||
4605 | 4588 | #: bzrlib/errors.py:2618 | ||
4606 | 4589 | msgid "No such tag: %(tag_name)s" | ||
4607 | 4590 | msgstr "" | ||
4608 | 4591 | |||
4609 | 4592 | #: bzrlib/errors.py:2626 | ||
4610 | 4593 | msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade." | ||
4611 | 4594 | msgstr "" | ||
4612 | 4595 | |||
4613 | 4596 | #: bzrlib/errors.py:2635 | ||
4614 | 4597 | msgid "Tag %(tag_name)s already exists." | ||
4615 | 4598 | msgstr "" | ||
4616 | 4599 | |||
4617 | 4600 | #: bzrlib/errors.py:2643 | ||
4618 | 4601 | msgid "" | ||
4619 | 4602 | "Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs" | ||
4620 | 4603 | "\" for more information on this feature." | ||
4621 | 4604 | msgstr "" | ||
4622 | 4605 | |||
4623 | 4606 | #: bzrlib/errors.py:2653 | ||
4624 | 4607 | msgid "" | ||
4625 | 4608 | "The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s" | ||
4626 | 4609 | msgstr "" | ||
4627 | 4610 | |||
4628 | 4611 | #: bzrlib/errors.py:2663 | ||
4629 | 4612 | msgid "" | ||
4630 | 4613 | "Cannot find registered bug tracker called %(abbreviation)s on %(branch)s" | ||
4631 | 4614 | msgstr "" | ||
4632 | 4615 | |||
4633 | 4616 | #: bzrlib/errors.py:2673 | ||
4634 | 4617 | msgid "Invalid line in bugs property: '%(line)s'" | ||
4635 | 4618 | msgstr "" | ||
4636 | 4619 | |||
4637 | 4620 | #: bzrlib/errors.py:2681 | ||
4638 | 4621 | msgid "Invalid bug status: '%(status)s'" | ||
4639 | 4622 | msgstr "" | ||
4640 | 4623 | |||
4641 | 4624 | #: bzrlib/errors.py:2689 | ||
4642 | 4625 | msgid "Could not understand response from smart server: %(response_tuple)r" | ||
4643 | 4626 | msgstr "" | ||
4644 | 4627 | |||
4645 | 4628 | #: bzrlib/errors.py:2728 | ||
4646 | 4629 | msgid "Server sent an unexpected error: %(error_tuple)r" | ||
4647 | 4630 | msgstr "" | ||
4648 | 4631 | |||
4649 | 4632 | #: bzrlib/errors.py:2747 | ||
4650 | 4633 | msgid "Unrecognised container format: %(container_format)r" | ||
4651 | 4634 | msgstr "" | ||
4652 | 4635 | |||
4653 | 4636 | #: bzrlib/errors.py:2755 | ||
4654 | 4637 | msgid "Unexpected end of container stream" | ||
4655 | 4638 | msgstr "" | ||
4656 | 4639 | |||
4657 | 4640 | #: bzrlib/errors.py:2760 | ||
4658 | 4641 | msgid "Unknown record type: %(record_type)r" | ||
4659 | 4642 | msgstr "" | ||
4660 | 4643 | |||
4661 | 4644 | #: bzrlib/errors.py:2768 | ||
4662 | 4645 | msgid "Invalid record: %(reason)s" | ||
4663 | 4646 | msgstr "" | ||
4664 | 4647 | |||
4665 | 4648 | #: bzrlib/errors.py:2776 | ||
4666 | 4649 | msgid "Container has data after end marker: %(excess)r" | ||
4667 | 4650 | msgstr "" | ||
4668 | 4651 | |||
4669 | 4652 | #: bzrlib/errors.py:2784 | ||
4670 | 4653 | msgid "Container has multiple records with the same name: %(name)s" | ||
4671 | 4654 | msgstr "" | ||
4672 | 4655 | |||
4673 | 4656 | #: bzrlib/errors.py:2797 | ||
4674 | 4657 | msgid "Corrupt or incompatible data stream: %(reason)s" | ||
4675 | 4658 | msgstr "" | ||
4676 | 4659 | |||
4677 | 4660 | #: bzrlib/errors.py:2805 | ||
4678 | 4661 | msgid "SMTP error: %(error)s" | ||
4679 | 4662 | msgstr "" | ||
4680 | 4663 | |||
4681 | 4664 | #: bzrlib/errors.py:2813 | ||
4682 | 4665 | msgid "No message supplied." | ||
4683 | 4666 | msgstr "" | ||
4684 | 4667 | |||
4685 | 4668 | #: bzrlib/errors.py:2818 | ||
4686 | 4669 | msgid "No mail-to address (--mail-to) or output (-o) specified." | ||
4687 | 4670 | msgstr "" | ||
4688 | 4671 | |||
4689 | 4672 | #: bzrlib/errors.py:2823 | ||
4690 | 4673 | msgid "Unknown mail client: %(mail_client)s" | ||
4691 | 4674 | msgstr "" | ||
4692 | 4675 | |||
4693 | 4676 | #: bzrlib/errors.py:2831 | ||
4694 | 4677 | msgid "" | ||
4695 | 4678 | "Unable to find mail client with the following names: " | ||
4696 | 4679 | "%(mail_command_list_string)s" | ||
4697 | 4680 | msgstr "" | ||
4698 | 4681 | |||
4699 | 4682 | #: bzrlib/errors.py:2841 | ||
4700 | 4683 | msgid "SMTP connection to %(host)s refused" | ||
4701 | 4684 | msgstr "" | ||
4702 | 4685 | |||
4703 | 4686 | #: bzrlib/errors.py:2850 | ||
4704 | 4687 | msgid "Please specify smtp_server. No server at default %(host)s." | ||
4705 | 4688 | msgstr "" | ||
4706 | 4689 | |||
4707 | 4690 | #: bzrlib/errors.py:2864 | ||
4708 | 4691 | msgid "" | ||
4709 | 4692 | "'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-" | ||
4710 | 4693 | "reconfigure." | ||
4711 | 4694 | msgstr "" | ||
4712 | 4695 | |||
4713 | 4696 | #: bzrlib/errors.py:2876 | ||
4714 | 4697 | msgid "'%(display_url)s' is already a branch." | ||
4715 | 4698 | msgstr "" | ||
4716 | 4699 | |||
4717 | 4700 | #: bzrlib/errors.py:2881 | ||
4718 | 4701 | msgid "'%(display_url)s' is already a tree." | ||
4719 | 4702 | msgstr "" | ||
4720 | 4703 | |||
4721 | 4704 | #: bzrlib/errors.py:2886 | ||
4722 | 4705 | msgid "'%(display_url)s' is already a checkout." | ||
4723 | 4706 | msgstr "" | ||
4724 | 4707 | |||
4725 | 4708 | #: bzrlib/errors.py:2891 | ||
4726 | 4709 | msgid "'%(display_url)s' is already a lightweight checkout." | ||
4727 | 4710 | msgstr "" | ||
4728 | 4711 | |||
4729 | 4712 | #: bzrlib/errors.py:2896 | ||
4730 | 4713 | msgid "'%(display_url)s' is already using a shared repository." | ||
4731 | 4714 | msgstr "" | ||
4732 | 4715 | |||
4733 | 4716 | #: bzrlib/errors.py:2901 | ||
4734 | 4717 | msgid "'%(display_url)s' is already standalone." | ||
4735 | 4718 | msgstr "" | ||
4736 | 4719 | |||
4737 | 4720 | #: bzrlib/errors.py:2906 | ||
4738 | 4721 | msgid "Shared repository '%(display_url)s' already creates working trees." | ||
4739 | 4722 | msgstr "" | ||
4740 | 4723 | |||
4741 | 4724 | #: bzrlib/errors.py:2912 | ||
4742 | 4725 | msgid "" | ||
4743 | 4726 | "Shared repository '%(display_url)s' already doesn't create working trees." | ||
4744 | 4727 | msgstr "" | ||
4745 | 4728 | |||
4746 | 4729 | #: bzrlib/errors.py:2918 | ||
4747 | 4730 | msgid "Requested reconfiguration of '%(display_url)s' is not supported." | ||
4748 | 4731 | msgstr "" | ||
4749 | 4732 | |||
4750 | 4733 | #: bzrlib/errors.py:2923 | ||
4751 | 4734 | msgid "No location could be found to bind to at %(display_url)s." | ||
4752 | 4735 | msgstr "" | ||
4753 | 4736 | |||
4754 | 4737 | #: bzrlib/errors.py:2928 | ||
4755 | 4738 | msgid "" | ||
4756 | 4739 | "Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)." | ||
4757 | 4740 | "%(more)s" | ||
4758 | 4741 | msgstr "" | ||
4759 | 4742 | |||
4760 | 4743 | #: bzrlib/errors.py:2947 | ||
4761 | 4744 | msgid "" | ||
4762 | 4745 | "Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)." | ||
4763 | 4746 | "%(more)s" | ||
4764 | 4747 | msgstr "" | ||
4765 | 4748 | |||
4766 | 4749 | #: bzrlib/errors.py:2953 | ||
4767 | 4750 | msgid "Variable {%(name)s} is not available." | ||
4768 | 4751 | msgstr "" | ||
4769 | 4752 | |||
4770 | 4753 | #: bzrlib/errors.py:2961 | ||
4771 | 4754 | msgid "No template specified." | ||
4772 | 4755 | msgstr "" | ||
4773 | 4756 | |||
4774 | 4757 | #: bzrlib/errors.py:2966 | ||
4775 | 4758 | msgid "Unable to create symlink %(path_str)son this platform" | ||
4776 | 4759 | msgstr "" | ||
4777 | 4760 | |||
4778 | 4761 | #: bzrlib/errors.py:2981 | ||
4779 | 4762 | msgid "" | ||
4780 | 4763 | "Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original" | ||
4781 | 4764 | "\", \"local\"." | ||
4782 | 4765 | msgstr "" | ||
4783 | 4766 | |||
4784 | 4767 | #: bzrlib/errors.py:3015 | ||
4785 | 4768 | msgid "" | ||
4786 | 4769 | "Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s" | ||
4787 | 4770 | msgstr "" | ||
4788 | 4771 | |||
4789 | 4772 | #: bzrlib/errors.py:3027 | ||
4790 | 4773 | msgid "The \"%(config_id)s\" configuration does not exist." | ||
4791 | 4774 | msgstr "" | ||
4792 | 4775 | |||
4793 | 4776 | #: bzrlib/errors.py:3035 | ||
4794 | 4777 | msgid "The \"%(option_name)s\" configuration option does not exist." | ||
4795 | 4778 | msgstr "" | ||
4796 | 4779 | |||
4797 | 4780 | #: bzrlib/errors.py:3043 | ||
4798 | 4781 | msgid "The alias \"%(alias_name)s\" does not exist." | ||
4799 | 4782 | msgstr "" | ||
4800 | 4783 | |||
4801 | 4784 | #: bzrlib/errors.py:3057 | ||
4802 | 4785 | msgid "\"%(alias_name)s\" is not a valid location alias." | ||
4803 | 4786 | msgstr "" | ||
4804 | 4787 | |||
4805 | 4788 | #: bzrlib/errors.py:3065 | ||
4806 | 4789 | msgid "No %(alias_name)s location assigned." | ||
4807 | 4790 | msgstr "" | ||
4808 | 4791 | |||
4809 | 4792 | #: bzrlib/errors.py:3073 | ||
4810 | 4793 | msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s." | ||
4811 | 4794 | msgstr "" | ||
4812 | 4795 | |||
4813 | 4796 | #: bzrlib/errors.py:3083 | ||
4814 | 4797 | msgid "Unknown rules detected: %(unknowns_str)s." | ||
4815 | 4798 | msgstr "" | ||
4816 | 4799 | |||
4817 | 4800 | #: bzrlib/errors.py:3096 | ||
4818 | 4801 | msgid "" | ||
4819 | 4802 | "Hook '%(hook_name)s' during %(hook_stage)s failed:\n" | ||
4820 | 4803 | "%(traceback_text)s%(exc_value)s" | ||
4821 | 4804 | msgstr "" | ||
4822 | 4805 | |||
4823 | 4806 | #: bzrlib/errors.py:3119 | ||
4824 | 4807 | msgid "Tip change rejected: %(msg)s" | ||
4825 | 4808 | msgstr "" | ||
4826 | 4809 | |||
4827 | 4810 | #: bzrlib/errors.py:3127 | ||
4828 | 4811 | msgid "Shelf corrupt." | ||
4829 | 4812 | msgstr "" | ||
4830 | 4813 | |||
4831 | 4814 | #: bzrlib/errors.py:3132 | ||
4832 | 4815 | msgid "Corruption while decompressing repository file%(orig_error)s" | ||
4833 | 4816 | msgstr "" | ||
4834 | 4817 | |||
4835 | 4818 | #: bzrlib/errors.py:3144 | ||
4836 | 4819 | msgid "No changes are shelved with id \"%(shelf_id)d\"." | ||
4837 | 4820 | msgstr "" | ||
4838 | 4821 | |||
4839 | 4822 | #: bzrlib/errors.py:3152 | ||
4840 | 4823 | msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead." | ||
4841 | 4824 | msgstr "" | ||
4842 | 4825 | |||
4843 | 4826 | #: bzrlib/errors.py:3160 | ||
4844 | 4827 | msgid "An attempt to access a url outside the server jail was made: '%(url)s'." | ||
4845 | 4828 | msgstr "" | ||
4846 | 4829 | |||
4847 | 4830 | #: bzrlib/errors.py:3168 | ||
4848 | 4831 | msgid "The user aborted the operation." | ||
4849 | 4832 | msgstr "" | ||
4850 | 4833 | |||
4851 | 4834 | #: bzrlib/errors.py:3173 | ||
4852 | 4835 | msgid "Branching '%(url)s'(%(format)s) must create a working tree." | ||
4853 | 4836 | msgstr "" | ||
4854 | 4837 | |||
4855 | 4838 | #: bzrlib/errors.py:3183 | ||
4856 | 4839 | msgid "No such view: %(view_name)s." | ||
4857 | 4840 | msgstr "" | ||
4858 | 4841 | |||
4859 | 4842 | #: bzrlib/errors.py:3193 | ||
4860 | 4843 | msgid "" | ||
4861 | 4844 | "Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree " | ||
4862 | 4845 | "to a later format." | ||
4863 | 4846 | msgstr "" | ||
4864 | 4847 | |||
4865 | 4848 | #: bzrlib/errors.py:3202 | ||
4866 | 4849 | msgid "" | ||
4867 | 4850 | "Specified file \"%(file_name)s\" is outside the current view: %(view_str)s" | ||
4868 | 4851 | msgstr "" | ||
4869 | 4852 | |||
4870 | 4853 | #: bzrlib/errors.py:3269 | ||
4871 | 4854 | msgid "%(bzrdir)r does not support co-located branches." | ||
4872 | 4855 | msgstr "" | ||
4873 | 4856 | |||
4874 | 4857 | #: bzrlib/errors.py:3275 | ||
4875 | 4858 | msgid "" | ||
4876 | 4859 | "Unable to determine your name.\n" | ||
4877 | 4860 | "Please, set your name with the 'whoami' command.\n" | ||
4878 | 4861 | "E.g. bzr whoami \"Your Name <name@example.com>\"" | ||
4879 | 4862 | msgstr "" | ||
4880 | 4863 | |||
4881 | 4864 | #: bzrlib/errors.py:3284 | ||
4882 | 4865 | msgid "Invalid pattern(s) found. %(msg)s" | ||
4883 | 4866 | msgstr "" | ||
4884 | 4867 | |||
4885 | 4868 | #: bzrlib/errors.py:3292 | ||
4886 | 4869 | msgid "" | ||
4887 | 4870 | "Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr " | ||
4888 | 4871 | "unbind` to fix." | ||
4889 | 4872 | msgstr "" | ||
4890 | 4873 | |||
4891 | 4874 | #: bzrlib/errors.py:3303 | ||
4892 | 4875 | msgid "Loop involving %(refs)r while expanding \"%(string)s\"." | ||
4893 | 4876 | msgstr "" | ||
4894 | 4877 | |||
4895 | 4878 | #: bzrlib/errors.py:3312 | ||
4896 | 4879 | msgid "Option %(name)s is not defined while expanding \"%(string)s\"." | ||
4897 | 4880 | msgstr "" | ||
4898 | 4881 | |||
4899 | 4882 | #: bzrlib/errors.py:3321 | ||
4900 | 4883 | msgid "" | ||
4901 | 4884 | "No compatible object available for operations from %(source)r to %(target)r." | ||
4902 | 4885 | msgstr "" | ||
4903 | 4886 | |||
4904 | 4887 | #: bzrlib/gpg.py:126 bzrlib/gpg.py:464 | ||
4905 | 4888 | msgid "{0} commits with valid signatures" | ||
4906 | 4889 | msgstr "" | ||
4907 | 4890 | |||
4908 | 4891 | #: bzrlib/gpg.py:130 bzrlib/gpg.py:469 | ||
4909 | 4892 | msgid "{0} commit with unknown key" | ||
4910 | 4893 | msgid_plural "{0} commits with unknown keys" | ||
4911 | 4894 | msgstr[0] "" | ||
4912 | 4895 | msgstr[1] "" | ||
4913 | 4896 | |||
4914 | 4897 | #: bzrlib/gpg.py:136 bzrlib/gpg.py:476 | ||
4915 | 4898 | msgid "{0} commit not valid" | ||
4916 | 4899 | msgid_plural "{0} commits not valid" | ||
4917 | 4900 | msgstr[0] "" | ||
4918 | 4901 | msgstr[1] "" | ||
4919 | 4902 | |||
4920 | 4903 | #: bzrlib/gpg.py:142 bzrlib/gpg.py:483 | ||
4921 | 4904 | msgid "{0} commit not signed" | ||
4922 | 4905 | msgid_plural "{0} commits not signed" | ||
4923 | 4906 | msgstr[0] "" | ||
4924 | 4907 | msgstr[1] "" | ||
4925 | 4908 | |||
4926 | 4909 | #: bzrlib/gpg.py:148 bzrlib/gpg.py:490 | ||
4927 | 4910 | msgid "{0} commit with key now expired" | ||
4928 | 4911 | msgid_plural "{0} commits with key now expired" | ||
4929 | 4912 | msgstr[0] "" | ||
4930 | 4913 | msgstr[1] "" | ||
4931 | 4914 | |||
4932 | 4915 | #: bzrlib/gpg.py:346 | ||
4933 | 4916 | msgid "No GnuPG key results for pattern: {}" | ||
4934 | 4917 | msgstr "" | ||
4935 | 4918 | |||
4936 | 4919 | #: bzrlib/gpg.py:389 | ||
4937 | 4920 | msgid "{0} signed {1} commit" | ||
4938 | 4921 | msgid_plural "{0} signed {1} commits" | ||
4939 | 4922 | msgstr[0] "" | ||
4940 | 4923 | msgstr[1] "" | ||
4941 | 4924 | |||
4942 | 4925 | #: bzrlib/gpg.py:406 bzrlib/gpg.py:422 | ||
4943 | 4926 | msgid "{0} commit by author {1}" | ||
4944 | 4927 | msgid_plural "{0} commits by author {1}" | ||
4945 | 4928 | msgstr[0] "" | ||
4946 | 4929 | msgstr[1] "" | ||
4947 | 4930 | |||
4948 | 4931 | #: bzrlib/gpg.py:436 | ||
4949 | 4932 | msgid "Unknown key {0} signed {1} commit" | ||
4950 | 4933 | msgid_plural "Unknown key {0} signed {1} commits" | ||
4951 | 4934 | msgstr[0] "" | ||
4952 | 4935 | msgstr[1] "" | ||
4953 | 4936 | |||
4954 | 4937 | #: bzrlib/gpg.py:454 | ||
4955 | 4938 | msgid "{0} commit by author {1} with key {2} now expired" | ||
4956 | 4939 | msgid_plural "{0} commits by author {1} with key {2} now expired" | ||
4957 | 4940 | msgstr[0] "" | ||
4958 | 4941 | msgstr[1] "" | ||
4959 | 4942 | |||
4960 | 4943 | # help of 'help' option | ||
4961 | 4944 | #: bzrlib/option.py:515 | ||
4962 | 4945 | msgid "Show help message." | ||
4963 | 4946 | msgstr "" | ||
4964 | 4947 | |||
4965 | 4948 | # help of 'usage' option | ||
4966 | 4949 | #: bzrlib/option.py:517 | ||
4967 | 4950 | msgid "Show usage message and options." | ||
4968 | 4951 | msgstr "" | ||
4969 | 4952 | |||
4970 | 4953 | # help of 'verbose' option | ||
4971 | 4954 | #: bzrlib/option.py:519 | ||
4972 | 4955 | msgid "Display more information." | ||
4973 | 4956 | msgstr "" | ||
4974 | 4957 | |||
4975 | 4958 | # help of 'quiet' option | ||
4976 | 4959 | #: bzrlib/option.py:522 | ||
4977 | 4960 | msgid "Only display errors and warnings." | ||
4978 | 4961 | msgstr "" | ||
4979 | 4962 | |||
4980 | 4963 | # help of 'overwrite' option | ||
4981 | 4964 | #: bzrlib/option.py:527 | ||
4982 | 4965 | msgid "Ignore differences between branches and overwrite unconditionally." | ||
4983 | 4966 | msgstr "" | ||
4984 | 4967 | |||
4985 | 4968 | # help of 'message' option | ||
4986 | 4969 | #: bzrlib/option.py:538 | ||
4987 | 4970 | msgid "Message string." | ||
4988 | 4971 | msgstr "" | ||
4989 | 4972 | |||
4990 | 4973 | # help of 'null' option | ||
4991 | 4974 | #: bzrlib/option.py:541 | ||
4992 | 4975 | msgid "Use an ASCII NUL (\\0) separator rather than a newline." | ||
4993 | 4976 | msgstr "" | ||
4994 | 4977 | |||
4995 | 4978 | # help of 'profile' option | ||
4996 | 4979 | #: bzrlib/option.py:544 | ||
4997 | 4980 | msgid "Show performance profiling information." | ||
4998 | 4981 | msgstr "" | ||
4999 | 4982 | |||
5000 | 4983 | # help of 'revision' option |
The diff has been truncated for viewing.
W00T!
I guess this depends on your other to MPs, so conditionally approved.