« back to all changes in this revision
Viewing changes to po/de.po
- browse files at revision 6538.4.6
- compare with another revision
- download diff
- download tarball
- view history from revision 6538.4.6
- Committer: Haw Loeung (hloeung)
- Date: 2012-07-24 12:53:36 UTC
- mfrom: (6541 +trunk)
- mto: This revision was merged to the branch mainline in revision 6542.
- Revision ID: haw.loeung@canonical.com-20120724125336-r3wzxm02lyec7jm6
[hloeung] Merged with upstream resolving conflicts.
- files added:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- files modified:
- .bzrignore
added
removed
po/de.po
1
# German translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-05-05 14:13+0000\n"
12
"Last-Translator: Daniel Winzen <d@winzen4.de>\n"
13
"Language-Team: German <de@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-05-06 04:58+0000\n"
19
"X-Generator: Launchpad (build 15195)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "Überspringe {0} (Größer als {1} von {2} Bytes)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "In Revision %d hochgeladen."
33
34
#: bzrlib/branch.py:3207
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d Schlüsselwort aktualisiert."
39
msgstr[1] "%d Schlüsselwörter aktualisiert."
40
41
#: bzrlib/branch.py:3210
42
msgid "No new revisions or tags to push."
43
msgstr "Keine neuen Revisionen oder Schlüsselwörter zum Hochladen."
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr "Keine neuen Revisionen zum Hochladen."
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr "überprüfter Zweig {0} Format {1}"
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr "Fehler gefunden: %s"
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignoriere Dateien außerhalb der Ansicht. Die Ansicht ist %s"
62
63
#: bzrlib/builtins.py:218
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision benötigt genau eine Revisions-Nummer"
67
68
#: bzrlib/builtins.py:303
69
msgid "Display status summary."
70
msgstr "Zeige Status-Zusammenfassung an."
71
72
#: bzrlib/builtins.py:305
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Dies zeigt versionierte und unbekannte Dateien an –\n"
78
"nach Zuständen gruppiert. Mögliche Zustände:"
79
80
#: bzrlib/builtins.py:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"hinzugefügt\n"
86
" In der Arbeitskopie versioniert, jedoch nicht in der vorherigen Revision."
87
88
#: bzrlib/builtins.py:311
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"entfernt\n"
95
" In der vorherigen Revision versioniert, jedoch entfernt oder aus der\n"
96
" Arbeitskopie gelöscht."
97
98
#: bzrlib/builtins.py:315
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr "umbenannt"
105
106
#: bzrlib/builtins.py:320
107
msgid ""
108
"modified\n"
109
" Text has changed since the previous revision."
110
msgstr "verändert"
111
112
#: bzrlib/builtins.py:323
113
msgid ""
114
"kind changed\n"
115
" File kind has been changed (e.g. from file to directory)."
116
msgstr ""
117
"Dateiart wurde geändert\n"
118
" Dateiart hat sich geändert (z.B. von Datei zu Verzeichnis)"
119
120
#: bzrlib/builtins.py:326
121
msgid ""
122
"unknown\n"
123
" Not versioned and not matching an ignore pattern."
124
msgstr ""
125
"unbekannt\n"
126
" Nicht versioniert und stimmt nicht mit einem Ignorierungsmuster überein."
127
128
#: bzrlib/builtins.py:329
129
msgid ""
130
"Additionally for directories, symlinks and files with a changed\n"
131
"executable bit, Bazaar indicates their type using a trailing\n"
132
"character: '/', '@' or '*' respectively. These decorations can be\n"
133
"disabled using the '--no-classify' option."
134
msgstr ""
135
"Für Verzeichnisse, Symbolische Verweise sowie Dateien\n"
136
"mit veränderter Ausführungsberechtigung zeigt Bazaar\n"
137
"den Typ zusätzlich durch ein angehängtes Zeichen\n"
138
"»/«, »@« oder »*« an. Diese Kennzeichnung kann mit der Option\n"
139
"»--no-classify« unterbunden werden."
140
141
#: bzrlib/builtins.py:334
142
msgid ""
143
"To see ignored files use 'bzr ignored'. For details on the\n"
144
"changes to file texts, use 'bzr diff'."
145
msgstr ""
146
"Mit »bzr ignored« werden ignorierte Dateien aufgelistet.\n"
147
"Änderungen an den Dateiinhalten werden mit »bzr diff« angezeigt."
148
149
#: bzrlib/builtins.py:337
150
msgid ""
151
"Note that --short or -S gives status flags for each item, similar\n"
152
"to Subversion's status command. To get output similar to svn -q,\n"
153
"use bzr status -SV."
154
msgstr ""
155
"Beachten Sie, dass --short oder -S für jedes Element eine\n"
156
"Statusmarkierung anzeigt, ähnlich des Statusbefehls von\n"
157
"Subversion. Um eine mit svn -q vergleichbare Ausgabe zu\n"
158
"erhalten, verwenden Sie bzr status -SV."
159
160
#: bzrlib/builtins.py:341
161
msgid ""
162
"If no arguments are specified, the status of the entire working\n"
163
"directory is shown. Otherwise, only the status of the specified\n"
164
"files or directories is reported. If a directory is given, status\n"
165
"is reported for everything inside that directory."
166
msgstr ""
167
"Wenn keine Argumente angegeben wurden, wird der Status des\n"
168
"gesamten Arbeitsverzeichnisses angezeigt, andernfalls nur der\n"
169
"Status der angegebenen Dateien und Verzeichnisse. Wenn ein\n"
170
"Verzeichnis angegeben wurde, wird der Status aller darin\n"
171
"enthaltenen Elemente aufgelistet."
172
173
#: bzrlib/builtins.py:346
174
msgid ""
175
"Before merges are committed, the pending merge tip revisions are\n"
176
"shown. To see all pending merge revisions, use the -v option.\n"
177
"To skip the display of pending merge information altogether, use\n"
178
"the no-pending option or specify a file/directory."
179
msgstr ""
180
"Bevor Änderungen übertragen werden, wird für jede ausstehende\n"
181
"Zusammenführung die neueste Revision angezeigt. Mit der Option\n"
182
"-v werden alle ausstehenden Revisionen angezeigt. Um die\n"
183
"Informationen über ausstehende Zusammenführungen komplett\n"
184
"zu unterdrücken kann die Option no-pending verwendet oder\n"
185
"eine Datei oder ein Verzeichnis angegeben werden."
186
187
#: bzrlib/builtins.py:351
188
msgid ""
189
"To compare the working directory to a specific revision, pass a\n"
190
"single revision to the revision argument."
191
msgstr ""
192
"Um das Arbeitsverzeichnis mit einer bestimmten Revision zu vergleichen,\n"
193
"geben Sie eine einzelne Revision mit dem Argument \"revision\" an."
194
195
#: bzrlib/builtins.py:354
196
msgid ""
197
"To see which files have changed in a specific revision, or between\n"
198
"two revisions, pass a revision range to the revision argument.\n"
199
"This will produce the same results as calling 'bzr diff --summarize'."
200
msgstr ""
201
"Um zu sehen, welche Dateien in einer bestimmten Revision\n"
202
"oder zwischen zwei Revisionen verändert wurden,\n"
203
"geben Sie einen Revisionebereich mit dem Argument \"revision\" an.\n"
204
"Dies erzeugt das gleiche Ergebnis wie der Aufruf 'bzr diff --summarize'."
205
206
#: bzrlib/builtins.py:363
207
msgid "Use short status indicators."
208
msgstr "Kurze Zustandsanzeiger verwenden."
209
210
#: bzrlib/builtins.py:365
211
msgid "Only show versioned files."
212
msgstr "Nur versionierte Dateien anzeigen."
213
214
#: bzrlib/builtins.py:367
215
msgid "Don't show pending merges."
216
msgstr "Ausstehende Zusammenführungen nicht anzeigen."
217
218
#: bzrlib/builtins.py:370
219
msgid "Do not mark object type using indicator."
220
msgstr "Objekte nicht entsprechend ihres Typs kennzeichnen."
221
222
#: bzrlib/builtins.py:385
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
msgstr ""
225
"bzr status --revision benötigt exakt eine oder zwei "
226
"Revisionsspezifikation(en)."
227
228
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
229
msgid "You can only supply one of revision_id or --revision"
230
msgstr "Sie können nur revision_id oder --revision angeben"
231
232
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
233
msgid "You must supply either --revision or a revision_id"
234
msgstr "Sie müssen entweder --revision oder eine revision_id angeben"
235
236
#: bzrlib/builtins.py:439
237
#, python-format
238
msgid "Repository %r does not support access to raw revision texts"
239
msgstr "Quelle %r unterstützt keinen Zugriff auf reine Revisionstexte"
240
241
#: bzrlib/builtins.py:450
242
msgid "The repository {0} contains no revision {1}."
243
msgstr "Die Quelle {0} enthält keine neue Überarbeitung {1}."
244
245
#: bzrlib/builtins.py:457
246
msgid "You cannot specify a NULL revision."
247
msgstr "Sie können keine NULL-Revision angeben."
248
249
#: bzrlib/builtins.py:549
250
msgid "Remove the working tree from a given branch/checkout."
251
msgstr "Entfernt den Arbeitsbaum zu einer Branch/einem Checkout."
252
253
#: bzrlib/builtins.py:551
254
msgid ""
255
"Since a lightweight checkout is little more than a working tree\n"
256
"this will refuse to run against one."
257
msgstr ""
258
259
#: bzrlib/builtins.py:554
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "Benutzen Sie »bzr checkout«, um den Arbeitsbaum neu aufzubauen."
262
263
#: bzrlib/builtins.py:560
264
msgid ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
msgstr ""
267
"Den Arbeitsbaum entfernen, auch wenn dieser nicht übertragene oder "
268
"zurückgestellte Änderungen enthält."
269
270
#: bzrlib/builtins.py:574
271
msgid "No working tree to remove"
272
msgstr "Keinen Arbeitsbaum zum Entfernen"
273
274
#: bzrlib/builtins.py:576
275
msgid "You cannot remove the working tree of a remote path"
276
msgstr "Sie können einen entfernten Arbeitsbaum nicht löschen"
277
278
#: bzrlib/builtins.py:585
279
msgid "You cannot remove the working tree from a lightweight checkout"
280
msgstr ""
281
282
#: bzrlib/builtins.py:625
283
msgid ""
284
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
285
"instead. Use \"--force\" if you are sure you want to reset the working tree."
286
msgstr ""
287
"Der Baum scheint nicht beschädigt zu sein. Wahrscheinlich möchten Sie "
288
"stattdessen \"bzr revert\" ausführen. Benutzen Sie \"--force\", wenn Sie den "
289
"Arbeitsbaum wirklich zurücksetzen möchten."
290
291
#: bzrlib/builtins.py:636
292
msgid ""
293
", the header appears corrupt, try passing -r -1 to set the state to the last "
294
"commit"
295
msgstr ""
296
", die Kopfzeilen scheinen beschädigt zu sein. Versuchen Sie -r -1 um den "
297
"Status der letzten Einreichung zu übernehmen."
298
299
#: bzrlib/builtins.py:640
300
msgid "failed to reset the tree state{0}"
301
msgstr "Baumstatus{0} konnte nicht zurückgesetzt werden"
302
303
#: bzrlib/builtins.py:644
304
msgid "Show current revision number."
305
msgstr "Aktuelle Revisionsnummer anzeigen."
306
307
#: bzrlib/builtins.py:646
308
msgid "This is equal to the number of revisions on this branch."
309
msgstr ""
310
311
#: bzrlib/builtins.py:659
312
msgid "--tree and --revision can not be used together"
313
msgstr ""
314
315
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
316
msgid "Tags can only be placed on a single revision, not on a range"
317
msgstr ""
318
319
#: bzrlib/builtins.py:700
320
msgid "Show revno of working tree."
321
msgstr ""
322
323
#: bzrlib/builtins.py:748
324
msgid "Add specified files or directories."
325
msgstr "Angegebene Dateien oder Verzeichnisse hinzufügen."
326
327
#: bzrlib/builtins.py:750
328
msgid ""
329
"In non-recursive mode, all the named items are added, regardless\n"
330
"of whether they were previously ignored. A warning is given if\n"
331
"any of the named files are already versioned."
332
msgstr ""
333
334
#: bzrlib/builtins.py:754
335
msgid ""
336
"In recursive mode (the default), files are treated the same way\n"
337
"but the behaviour for directories is different. Directories that\n"
338
"are already versioned do not give a warning. All directories,\n"
339
"whether already versioned or not, are searched for files or\n"
340
"subdirectories that are neither versioned or ignored, and these\n"
341
"are added. This search proceeds recursively into versioned\n"
342
"directories. If no names are given '.' is assumed."
343
msgstr ""
344
345
#: bzrlib/builtins.py:762
346
msgid ""
347
"A warning will be printed when nested trees are encountered,\n"
348
"unless they are explicitly ignored."
349
msgstr ""
350
351
#: bzrlib/builtins.py:765
352
msgid ""
353
"Therefore simply saying 'bzr add' will version all files that\n"
354
"are currently unknown."
355
msgstr ""
356
357
#: bzrlib/builtins.py:768
358
msgid ""
359
"Adding a file whose parent directory is not versioned will\n"
360
"implicitly add the parent, and so on up to the root. This means\n"
361
"you should never need to explicitly add a directory, they'll just\n"
362
"get added when you add a file in the directory."
363
msgstr ""
364
365
#: bzrlib/builtins.py:773
366
msgid ""
367
"--dry-run will show which files would be added, but not actually\n"
368
"add them."
369
msgstr ""
370
"--dry-run zeigt die Dateien an, die hinzugefügt würden,\n"
371
"ohne diese wirklich hinzuzufügen."
372
373
#: bzrlib/builtins.py:776
374
msgid ""
375
"--file-ids-from will try to use the file ids from the supplied path.\n"
376
"It looks up ids trying to find a matching parent directory with the\n"
377
"same filename, and then by pure path. This option is rarely needed\n"
378
"but can be useful when adding the same logical file into two\n"
379
"branches that will be merged later (without showing the two different\n"
380
"adds as a conflict). It is also useful when merging another project\n"
381
"into a subdirectory of this one."
382
msgstr ""
383
384
#: bzrlib/builtins.py:784
385
msgid ""
386
"Any files matching patterns in the ignore list will not be added\n"
387
"unless they are explicitly mentioned."
388
msgstr ""
389
"Alle Dateien, die auf Muster in der Ignorierliste zutreffen, werden\n"
390
"nicht hinzugefügt, außer Sie geben diese explizit an."
391
392
#: bzrlib/builtins.py:787
393
msgid ""
394
"In recursive mode, files larger than the configuration option \n"
395
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
396
"to file size."
397
msgstr ""
398
399
#: bzrlib/builtins.py:794
400
msgid "Don't recursively add the contents of directories."
401
msgstr "Inhalte von Verzeichnissen nicht rekursiv hinzufügen."
402
403
#: bzrlib/builtins.py:800
404
msgid "Lookup file ids from this tree."
405
msgstr ""
406
407
#: bzrlib/builtins.py:836
408
msgid "ignored {0} matching \"{1}\"\n"
409
msgstr "ignoriert {0} übereinstimmend \"{1}\"\n"
410
411
#: bzrlib/builtins.py:841
412
msgid "Create a new versioned directory."
413
msgstr "Ein neues versioniertes Verzeichnis erstellen."
414
415
#: bzrlib/builtins.py:843
416
msgid "This is equivalent to creating the directory and then adding it."
417
msgstr "Dies entspricht dem Anlegen und Hinzufügen des Ordners."
418
419
#: bzrlib/builtins.py:850
420
msgid "No error if existing, make parent directories as needed."
421
msgstr ""
422
423
#: bzrlib/builtins.py:884
424
#, python-format
425
msgid "added %s\n"
426
msgstr "%s hinzugefügt\n"
427
428
#: bzrlib/builtins.py:926
429
#, python-format
430
msgid "invalid kind %r specified"
431
msgstr ""
432
433
#: bzrlib/builtins.py:963
434
msgid "Move or rename a file."
435
msgstr "Eine Datei verschieben oder umbenennen."
436
437
#: bzrlib/builtins.py:965
438
msgid " bzr mv SOURCE... DESTINATION"
439
msgstr " bzr mv QUELLE... ZIEL"
440
441
#: bzrlib/builtins.py:967
442
msgid ""
443
"If the last argument is a versioned directory, all the other names\n"
444
"are moved into it. Otherwise, there must be exactly two arguments\n"
445
"and the file is changed to a new name."
446
msgstr ""
447
448
#: bzrlib/builtins.py:971
449
msgid ""
450
"If OLDNAME does not exist on the filesystem but is versioned and\n"
451
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
452
"assumes that the file has been manually moved and only updates\n"
453
"its internal inventory to reflect that change.\n"
454
"The same is valid when moving many SOURCE files to a DESTINATION."
455
msgstr ""
456
457
#: bzrlib/builtins.py:977
458
msgid "Files cannot be moved between branches."
459
msgstr "Dateien können nicht zwischen Zweigen verschoben werden."
460
461
#: bzrlib/builtins.py:984
462
msgid ""
463
"Move only the bzr identifier of the file, because the file has already been "
464
"moved."
465
msgstr ""
466
"Verschiebe nur den bzr-Bezeichner der Datei, da diese bereits verschoben "
467
"wurde."
468
469
#: bzrlib/builtins.py:986
470
msgid "Automatically guess renames."
471
msgstr "Umbenennungen automatisch erraten"
472
473
#: bzrlib/builtins.py:987
474
msgid "Avoid making changes when guessing renames."
475
msgstr "Keine Änderungen durchführen, wenn Umbenennungen erraten werden."
476
477
#: bzrlib/builtins.py:996
478
msgid "--dry-run requires --auto."
479
msgstr "--dry-run erfordert --auto."
480
481
#: bzrlib/builtins.py:1000
482
msgid "missing file argument"
483
msgstr "Datei-Argument fehlt"
484
485
#: bzrlib/builtins.py:1004
486
msgid "can not move root of branch"
487
msgstr "Wurzel des Zweiges kann nicht verschoben werden"
488
489
#: bzrlib/builtins.py:1010
490
msgid "Only one path may be specified to --auto."
491
msgstr "Es kann nur ein Pfad mit --auto angegeben werden."
492
493
#: bzrlib/builtins.py:1013
494
msgid "--after cannot be specified with --auto."
495
msgstr "--after kann nicht mit --auto angegeben werden."
496
497
#: bzrlib/builtins.py:1050
498
msgid "to mv multiple files the destination must be a versioned directory"
499
msgstr ""
500
"um mehrere Dateien zu verschieben, muss das Ziel ein versioniertes "
501
"Verzeichnis sein"
502
503
#: bzrlib/builtins.py:1102
504
msgid "Turn this branch into a mirror of another branch."
505
msgstr "Diesen Zweig zu einer Spiegelung eines anderen Zweiges machen."
506
507
#: bzrlib/builtins.py:1104
508
msgid ""
509
"By default, this command only works on branches that have not diverged.\n"
510
"Branches are considered diverged if the destination branch's most recent \n"
511
"commit is one that has not been merged (directly or indirectly) into the \n"
512
"parent."
513
msgstr ""
514
515
#: bzrlib/builtins.py:1109
516
msgid ""
517
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
518
"from one into the other. Once one branch has merged, the other should\n"
519
"be able to pull it again."
520
msgstr ""
521
522
#: bzrlib/builtins.py:1113
523
msgid ""
524
"If you want to replace your local changes and just want your branch to\n"
525
"match the remote one, use pull --overwrite. This will work even if the two\n"
526
"branches have diverged."
527
msgstr ""
528
529
#: bzrlib/builtins.py:1117
530
msgid ""
531
"If there is no default location set, the first pull will set it (use\n"
532
"--no-remember to avoid setting it). After that, you can omit the\n"
533
"location to use the default. To change the default, use --remember. The\n"
534
"value will only be saved if the remote location can be accessed."
535
msgstr ""
536
537
#: bzrlib/builtins.py:1122
538
msgid ""
539
"The --verbose option will display the revisions pulled using the log_format\n"
540
"configuration option. You can use a different format by overriding it with\n"
541
"-Olog_format=<other_format>."
542
msgstr ""
543
544
#: bzrlib/builtins.py:1126
545
msgid ""
546
"Note: The location can be specified either in the form of a branch,\n"
547
"or in the form of a path to a file containing a merge directive generated\n"
548
"with bzr send."
549
msgstr ""
550
551
#: bzrlib/builtins.py:1134
552
msgid "Show logs of pulled revisions."
553
msgstr ""
554
555
#: bzrlib/builtins.py:1136
556
msgid ""
557
"Branch to pull into, rather than the one containing the working directory."
558
msgstr ""
559
560
#: bzrlib/builtins.py:1139
561
msgid ""
562
"Perform a local pull in a bound branch. Local pulls are not applied to the "
563
"master branch."
564
msgstr ""
565
566
#: bzrlib/builtins.py:1168
567
msgid "Need working tree for --show-base."
568
msgstr "Ein Arbeitsbaum wird für --show-base benötigt."
569
570
#: bzrlib/builtins.py:1184
571
msgid "No pull location known or specified."
572
msgstr ""
573
574
#: bzrlib/builtins.py:1190
575
#, python-format
576
msgid "Using saved parent location: %s\n"
577
msgstr ""
578
579
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
580
msgid "Cannot use -r with merge directives or bundles"
581
msgstr ""
582
583
#: bzrlib/builtins.py:1238
584
msgid "Update a mirror of this branch."
585
msgstr "Eine Spiegelung dieses Zweiges aktualisieren."
586
587
#: bzrlib/builtins.py:1240
588
msgid ""
589
"The target branch will not have its working tree populated because this\n"
590
"is both expensive, and is not supported on remote file systems."
591
msgstr ""
592
593
#: bzrlib/builtins.py:1243
594
msgid ""
595
"Some smart servers or protocols *may* put the working tree in place in\n"
596
"the future."
597
msgstr ""
598
"Einige intelligente Server oder Protokolle legen den Arbeitsbaum\n"
599
"*möglicherweise* in die Zukunft."
600
601
#: bzrlib/builtins.py:1246
602
msgid ""
603
"This command only works on branches that have not diverged. Branches are\n"
604
"considered diverged if the destination branch's most recent commit is one\n"
605
"that has not been merged (directly or indirectly) by the source branch."
606
msgstr ""
607
608
#: bzrlib/builtins.py:1250
609
msgid ""
610
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
611
"the other branch completely, discarding its unmerged changes."
612
msgstr ""
613
614
#: bzrlib/builtins.py:1253
615
msgid ""
616
"If you want to ensure you have the different changes in the other branch,\n"
617
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
618
"After that you will be able to do a push without '--overwrite'."
619
msgstr ""
620
621
#: bzrlib/builtins.py:1257
622
msgid ""
623
"If there is no default push location set, the first push will set it (use\n"
624
"--no-remember to avoid setting it). After that, you can omit the\n"
625
"location to use the default. To change the default, use --remember. The\n"
626
"value will only be saved if the remote location can be accessed."
627
msgstr ""
628
629
#: bzrlib/builtins.py:1262
630
msgid ""
631
"The --verbose option will display the revisions pushed using the log_format\n"
632
"configuration option. You can use a different format by overriding it with\n"
633
"-Olog_format=<other_format>."
634
msgstr ""
635
636
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
637
msgid ""
638
"Branch to push from, rather than the one containing the working directory."
639
msgstr ""
640
641
#: bzrlib/builtins.py:1276
642
msgid ""
643
"By default push will fail if the target directory exists, but does not "
644
"already have a control directory. This flag will allow push to proceed."
645
msgstr ""
646
647
#: bzrlib/builtins.py:1281
648
msgid ""
649
"Create a stacked branch that references the public location of the parent "
650
"branch."
651
msgstr ""
652
"Einen gestapelten Zweig anlegen, der auf den öffentlichen Pfad des "
653
"übergeordneten Zweigs referenziert."
654
655
#: bzrlib/builtins.py:1284
656
msgid ""
657
"Create a stacked branch that refers to another branch for the commit "
658
"history. Only the work not present in the referenced branch is included in "
659
"the branch created."
660
msgstr ""
661
662
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
663
msgid ""
664
"Refuse to push if there are uncommitted changes in the working tree, --no-"
665
"strict disables the check."
666
msgstr ""
667
668
#: bzrlib/builtins.py:1292
669
msgid "Don't populate the working tree, even for protocols that support it."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1336
673
msgid "Could not determine branch to refer to."
674
msgstr ""
675
676
#: bzrlib/builtins.py:1345
677
#, python-format
678
msgid ""
679
"No push location known or specified. To push to the parent branch (at %s), "
680
"use 'bzr push :parent'."
681
msgstr ""
682
683
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
684
msgid "No push location known or specified."
685
msgstr ""
686
687
#: bzrlib/builtins.py:1355
688
#, python-format
689
msgid "Using saved push location: %s"
690
msgstr ""
691
692
#: bzrlib/builtins.py:1365
693
msgid "Create a new branch that is a copy of an existing branch."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1367
697
msgid ""
698
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
699
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
700
"./bar.\n"
701
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
702
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
703
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
704
"create ./foo-bar."
705
msgstr ""
706
707
#: bzrlib/builtins.py:1374
708
msgid ""
709
"To retrieve the branch as of a particular revision, supply the --revision\n"
710
"parameter, as in \"branch foo/bar -r 5\"."
711
msgstr ""
712
713
#: bzrlib/builtins.py:1377
714
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
715
msgstr ""
716
717
#: bzrlib/builtins.py:1387
718
msgid "Create a branch without a working-tree."
719
msgstr ""
720
721
#: bzrlib/builtins.py:1389
722
msgid "Switch the checkout in the current directory to the new branch."
723
msgstr ""
724
725
#: bzrlib/builtins.py:1392
726
msgid ""
727
"Create a stacked branch referring to the source branch. The new branch will "
728
"depend on the availability of the source branch for all operations."
729
msgstr ""
730
731
#: bzrlib/builtins.py:1396
732
msgid "Do not use a shared repository, even if available."
733
msgstr ""
734
735
#: bzrlib/builtins.py:1398
736
msgid ""
737
"By default branch will fail if the target directory exists, but does not "
738
"already have a control directory. This flag will allow branch to proceed."
739
msgstr ""
740
741
#: bzrlib/builtins.py:1403
742
msgid "Bind new branch to from location."
743
msgstr ""
744
745
#: bzrlib/builtins.py:1450
746
#, python-format
747
msgid "Target directory \"%s\" already exists."
748
msgstr ""
749
750
#: bzrlib/builtins.py:1462
751
#, python-format
752
msgid "Parent of \"%s\" does not exist."
753
msgstr ""
754
755
#: bzrlib/builtins.py:1481
756
msgid "The branch {0} has no revision {1}."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
760
#, python-format
761
msgid "Created new stacked branch referring to %s."
762
msgstr ""
763
764
#: bzrlib/builtins.py:1500
765
#, python-format
766
msgid "Branched %d revision."
767
msgid_plural "Branched %d revisions."
768
msgstr[0] ""
769
msgstr[1] ""
770
771
#: bzrlib/builtins.py:1505
772
#, python-format
773
msgid "New branch bound to %s"
774
msgstr ""
775
776
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
777
#, python-format
778
msgid "Switched to branch: %s"
779
msgstr "Zu Zweig gewechselt: %s"
780
781
#: bzrlib/builtins.py:1515
782
msgid "List the branches available at the current location."
783
msgstr "Die verfügbaren Zweige an der aktuellen Stelle auflisten."
784
785
#: bzrlib/builtins.py:1517
786
msgid ""
787
"This command will print the names of all the branches at the current\n"
788
"location."
789
msgstr ""
790
"Dieser Befehl wird die Namen aller verfügbaren Zweige\n"
791
"an der aktuellen Stelle auflisten."
792
793
#: bzrlib/builtins.py:1524
794
msgid ""
795
"Recursively scan for branches rather than just looking in the specified "
796
"location."
797
msgstr ""
798
799
#: bzrlib/builtins.py:1554
800
msgid "(default)"
801
msgstr "(Vorgabe)"
802
803
#: bzrlib/builtins.py:1566
804
msgid "Create a new checkout of an existing branch."
805
msgstr ""
806
807
#: bzrlib/builtins.py:1568
808
msgid ""
809
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
810
"for\n"
811
"the branch found in '.'. This is useful if you have removed the working "
812
"tree\n"
813
"or if it was never created - i.e. if you pushed the branch to its current\n"
814
"location using SFTP."
815
msgstr ""
816
817
#: bzrlib/builtins.py:1573
818
msgid ""
819
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
820
"will\n"
821
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
822
"./bar.\n"
823
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
824
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
825
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
826
"create ./foo-bar."
827
msgstr ""
828
829
#: bzrlib/builtins.py:1580
830
msgid ""
831
"To retrieve the branch as of a particular revision, supply the --revision\n"
832
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
833
"immediately\n"
834
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
835
"old\n"
836
"code.)"
837
msgstr ""
838
839
#: bzrlib/builtins.py:1590
840
msgid ""
841
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
842
"the branch for every operation. Normal checkouts can perform common "
843
"operations like diff and status without such access, and also support local "
844
"commits."
845
msgstr ""
846
847
#: bzrlib/builtins.py:1597
848
msgid "Get file contents from this tree."
849
msgstr ""
850
851
#: bzrlib/builtins.py:1599
852
msgid "Hard-link working tree files where possible."
853
msgstr ""
854
855
#: bzrlib/builtins.py:1640
856
msgid ""
857
"Show list of renamed files.\n"
858
" "
859
msgstr ""
860
"Liste der umbenannten Dateien zeigen.\n"
861
" "
862
863
#: bzrlib/builtins.py:1670
864
msgid "Update a working tree to a new revision."
865
msgstr ""
866
867
#: bzrlib/builtins.py:1672
868
msgid ""
869
"This will perform a merge of the destination revision (the tip of the\n"
870
"branch, or the specified revision) into the working tree, and then make\n"
871
"that revision the basis revision for the working tree. "
872
msgstr ""
873
874
#: bzrlib/builtins.py:1676
875
msgid ""
876
"You can use this to visit an older revision, or to update a working tree\n"
877
"that is out of date from its branch."
878
msgstr ""
879
880
#: bzrlib/builtins.py:1679
881
msgid ""
882
"If there are any uncommitted changes in the tree, they will be carried\n"
883
"across and remain as uncommitted changes after the update. To discard\n"
884
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
885
"with the changes brought in by the change in basis revision."
886
msgstr ""
887
888
#: bzrlib/builtins.py:1684
889
msgid ""
890
"If the tree's branch is bound to a master branch, bzr will also update\n"
891
"the branch from the master."
892
msgstr ""
893
894
#: bzrlib/builtins.py:1687
895
msgid ""
896
"You cannot update just a single file or directory, because each Bazaar\n"
897
"working tree has just a single basis revision. If you want to restore a\n"
898
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
899
"update'. If you want to restore a file to its state in a previous\n"
900
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
901
"out the old content of that file to a new location."
902
msgstr ""
903
904
#: bzrlib/builtins.py:1694
905
msgid ""
906
"The 'dir' argument, if given, must be the location of the root of a\n"
907
"working tree to update. By default, the working tree that contains the \n"
908
"current working directory is used."
909
msgstr ""
910
911
#: bzrlib/builtins.py:1710
912
msgid "bzr update --revision takes exactly one revision"
913
msgstr ""
914
915
#: bzrlib/builtins.py:1718
916
msgid "bzr update can only update a whole tree, not a file or subdirectory"
917
msgstr ""
918
919
#: bzrlib/builtins.py:1749
920
msgid "Tree is up to date at revision {0} of branch {1}"
921
msgstr ""
922
923
#: bzrlib/builtins.py:1765
924
#, python-format
925
msgid ""
926
"branch has no revision %s\n"
927
"bzr update --revision only works for a revision in the branch history"
928
msgstr ""
929
930
#: bzrlib/builtins.py:1771
931
msgid "Updated to revision {0} of branch {1}"
932
msgstr ""
933
934
#: bzrlib/builtins.py:1775
935
msgid ""
936
"Your local commits will now show as pending merges with 'bzr status', and "
937
"can be committed with 'bzr commit'."
938
msgstr ""
939
940
#: bzrlib/builtins.py:1784
941
msgid "Show information about a working tree, branch or repository."
942
msgstr ""
943
944
#: bzrlib/builtins.py:1786
945
msgid ""
946
"This command will show all known locations and formats associated to the\n"
947
"tree, branch or repository."
948
msgstr ""
949
950
#: bzrlib/builtins.py:1789
951
msgid ""
952
"In verbose mode, statistical information is included with each report.\n"
953
"To see extended statistic information, use a verbosity level of 2 or\n"
954
"higher by specifying the verbose option multiple times, e.g. -vv."
955
msgstr ""
956
957
#: bzrlib/builtins.py:1793
958
msgid "Branches and working trees will also report any missing revisions."
959
msgstr ""
960
961
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
962
#: bzrlib/builtins.py:6442
963
msgid ":Examples:"
964
msgstr ":Beispiele:"
965
966
#: bzrlib/builtins.py:1797
967
msgid " Display information on the format and related locations:"
968
msgstr ""
969
970
#: bzrlib/builtins.py:1799
971
msgid " bzr info"
972
msgstr ""
973
974
#: bzrlib/builtins.py:1801
975
msgid ""
976
" Display the above together with extended format information and\n"
977
" basic statistics (like the number of files in the working tree and\n"
978
" number of revisions in the branch and repository):"
979
msgstr ""
980
981
#: bzrlib/builtins.py:1805
982
msgid " bzr info -v"
983
msgstr " bzr info -v"
984
985
#: bzrlib/builtins.py:1807
986
msgid " Display the above together with number of committers to the branch:"
987
msgstr ""
988
989
#: bzrlib/builtins.py:1809
990
msgid " bzr info -vv"
991
msgstr " bzr info -vv"
992
993
#: bzrlib/builtins.py:1828
994
msgid "Remove files or directories."
995
msgstr "Dateien oder Verzeichnisse entfernen."
996
997
#: bzrlib/builtins.py:1830
998
msgid ""
999
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1000
"delete them if they can easily be recovered using revert otherwise they\n"
1001
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1002
"parameters are given Bazaar will scan for files that are being tracked by\n"
1003
"Bazaar but missing in your tree and stop tracking them for you."
1004
msgstr ""
1005
1006
#: bzrlib/builtins.py:1838
1007
msgid "Only remove files that have never been committed."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:1840
1011
msgid "The file deletion mode to be used."
1012
msgstr "Der Datei-Löschmodus, der verwendet wird."
1013
1014
#: bzrlib/builtins.py:1841
1015
msgid "Deletion Strategy"
1016
msgstr "Lösch-Strategie"
1017
1018
#: bzrlib/builtins.py:1842
1019
msgid "Backup changed files (default)."
1020
msgstr "Geänderte Dateien sichern (Vorgabe)."
1021
1022
#: bzrlib/builtins.py:1843
1023
msgid "Delete from bzr but leave the working copy."
1024
msgstr ""
1025
1026
#: bzrlib/builtins.py:1844
1027
msgid "Don't backup changed files."
1028
msgstr "Geänderte Dateien nicht sichern."
1029
1030
#: bzrlib/builtins.py:1845
1031
msgid ""
1032
"Delete all the specified files, even if they can not be recovered and even "
1033
"if they are non-empty directories. (deprecated, use no-backup)"
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:1854
1037
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1038
msgstr ""
1039
1040
#: bzrlib/builtins.py:1871
1041
msgid "No matching files."
1042
msgstr "Keine zutreffenden Dateien."
1043
1044
#: bzrlib/builtins.py:1932
1045
msgid "Reconcile bzr metadata in a branch."
1046
msgstr ""
1047
1048
#: bzrlib/builtins.py:1934
1049
msgid ""
1050
"This can correct data mismatches that may have been caused by\n"
1051
"previous ghost operations or bzr upgrades. You should only\n"
1052
"need to run this command if 'bzr check' or a bzr developer\n"
1053
"advises you to run it."
1054
msgstr ""
1055
1056
#: bzrlib/builtins.py:1939
1057
msgid ""
1058
"If a second branch is provided, cross-branch reconciliation is\n"
1059
"also attempted, which will check that data like the tree root\n"
1060
"id which was not present in very early bzr versions is represented\n"
1061
"correctly in both branches."
1062
msgstr ""
1063
1064
#: bzrlib/builtins.py:1944
1065
msgid ""
1066
"At the same time it is run it may recompress data resulting in\n"
1067
"a potential saving in disk space or performance gain."
1068
msgstr ""
1069
1070
#: bzrlib/builtins.py:1947
1071
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1072
msgstr ""
1073
1074
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1075
msgid ""
1076
"Format for the bzr 2.0 series.\n"
1077
"Uses group-compress storage.\n"
1078
"Provides rich roots which are a one-way transition.\n"
1079
msgstr ""
1080
1081
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1082
msgid ""
1083
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1084
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1085
msgstr ""
1086
1087
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1088
msgid "The 2a format with experimental support for colocated branches.\n"
1089
msgstr ""
1090
1091
#: bzrlib/builtins.py:2015
1092
msgid "Make a directory into a versioned branch."
1093
msgstr "Ein Verzeichnis zu einem versionierten Entwicklungszweig machen."
1094
1095
#: bzrlib/builtins.py:2017
1096
msgid ""
1097
"Use this to create an empty branch, or before importing an\n"
1098
"existing project."
1099
msgstr ""
1100
1101
#: bzrlib/builtins.py:2020
1102
msgid ""
1103
"If there is a repository in a parent directory of the location, then\n"
1104
"the history of the branch will be stored in the repository. Otherwise\n"
1105
"init creates a standalone branch which carries its own history\n"
1106
"in the .bzr directory."
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:2025
1110
msgid ""
1111
"If there is already a branch at the location but it has no working tree,\n"
1112
"the tree can be populated with 'bzr checkout'."
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:2028
1116
msgid "Recipe for importing a tree of files::"
1117
msgstr ""
1118
1119
#: bzrlib/builtins.py:2030
1120
msgid ""
1121
" cd ~/project\n"
1122
" bzr init\n"
1123
" bzr add .\n"
1124
" bzr status\n"
1125
" bzr commit -m \"imported project\""
1126
msgstr ""
1127
1128
#: bzrlib/builtins.py:2041
1129
msgid ""
1130
"Create the path leading up to the branch if it does not already exist."
1131
msgstr ""
1132
1133
#: bzrlib/builtins.py:2044
1134
msgid "Specify a format for this branch. See \"help formats\"."
1135
msgstr "Geben Sie ein Format für diesen Zweig an. Siehe »help formats«."
1136
1137
#: bzrlib/builtins.py:2052
1138
msgid ""
1139
"Never change revnos or the existing log. Append revisions to it only."
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:2055
1143
msgid "Create a branch without a working tree."
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1147
#, python-format
1148
msgid ""
1149
"Parent directory of %s does not exist.\n"
1150
"You may supply --create-prefix to create all leading parent directories."
1151
msgstr ""
1152
1153
#: bzrlib/builtins.py:2109
1154
msgid ""
1155
"This branch format cannot be set to append-revisions-only. Try --default."
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2120
1159
msgid "Created a {0} (format: {1})\n"
1160
msgstr "Ein {0} wurde erstellt (Format: {1})\n"
1161
1162
#: bzrlib/builtins.py:2129
1163
#, python-format
1164
msgid "Using shared repository: %s\n"
1165
msgstr ""
1166
1167
#: bzrlib/builtins.py:2133
1168
msgid "Create a shared repository for branches to share storage space."
1169
msgstr ""
1170
1171
#: bzrlib/builtins.py:2135
1172
msgid ""
1173
"New branches created under the repository directory will store their\n"
1174
"revisions in the repository, not in the branch directory. For branches\n"
1175
"with shared history, this reduces the amount of storage needed and \n"
1176
"speeds up the creation of new branches."
1177
msgstr ""
1178
1179
#: bzrlib/builtins.py:2140
1180
msgid ""
1181
"If the --no-trees option is given then the branches in the repository\n"
1182
"will not have working trees by default. They will still exist as \n"
1183
"directories on disk, but they will not have separate copies of the \n"
1184
"files at a certain revision. This can be useful for repositories that\n"
1185
"store branches which are interacted with through checkouts or remote\n"
1186
"branches, such as on a server."
1187
msgstr ""
1188
1189
#: bzrlib/builtins.py:2147
1190
msgid ""
1191
":Examples:\n"
1192
" Create a shared repository holding just branches::"
1193
msgstr ""
1194
1195
#: bzrlib/builtins.py:2150
1196
msgid ""
1197
" bzr init-repo --no-trees repo\n"
1198
" bzr init repo/trunk"
1199
msgstr ""
1200
" bzr init-repo --no-trees repo\n"
1201
" bzr init repo/trunk"
1202
1203
#: bzrlib/builtins.py:2153
1204
msgid " Make a lightweight checkout elsewhere::"
1205
msgstr ""
1206
1207
#: bzrlib/builtins.py:2155
1208
msgid ""
1209
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1210
" cd trunk-checkout\n"
1211
" (add files here)"
1212
msgstr ""
1213
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1214
" cd trunk-checkout\n"
1215
" (Hier Dateien hinzufügen)"
1216
1217
#: bzrlib/builtins.py:2163
1218
msgid ""
1219
"Specify a format for this repository. See \"bzr help formats\" for details."
1220
msgstr ""
1221
1222
#: bzrlib/builtins.py:2167
1223
msgid "Repository format"
1224
msgstr ""
1225
1226
#: bzrlib/builtins.py:2169
1227
msgid "Branches in the repository will default to not having a working tree."
1228
msgstr ""
1229
1230
#: bzrlib/builtins.py:2195
1231
msgid "Show differences in the working tree, between revisions or branches."
1232
msgstr ""
1233
1234
#: bzrlib/builtins.py:2197
1235
msgid ""
1236
"If no arguments are given, all changes for the current tree are listed.\n"
1237
"If files are given, only the changes in those files are listed.\n"
1238
"Remote and multiple branches can be compared by using the --old and\n"
1239
"--new options. If not provided, the default for both is derived from\n"
1240
"the first argument, if any, or the current tree if no arguments are\n"
1241
"given."
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2204
1245
msgid ""
1246
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1247
"produces patches suitable for \"patch -p1\"."
1248
msgstr ""
1249
1250
#: bzrlib/builtins.py:2207
1251
msgid ""
1252
"Note that when using the -r argument with a range of revisions, the\n"
1253
"differences are computed between the two specified revisions. That\n"
1254
"is, the command does not show the changes introduced by the first \n"
1255
"revision in the range. This differs from the interpretation of \n"
1256
"revision ranges used by \"bzr log\" which includes the first revision\n"
1257
"in the range."
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2214
1261
msgid ""
1262
":Exit values:\n"
1263
" 1 - changed\n"
1264
" 2 - unrepresentable changes\n"
1265
" 3 - error\n"
1266
" 0 - no change"
1267
msgstr ""
1268
":Rückgabewerte:\n"
1269
" 1 - Geändert\n"
1270
" 2 - Nicht darstellbare Änderungen\n"
1271
" 3 - Fehler\n"
1272
" 0 - Keine Änderungen"
1273
1274
#: bzrlib/builtins.py:2220
1275
msgid ""
1276
":Examples:\n"
1277
" Shows the difference in the working tree versus the last commit::"
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2223
1281
msgid " bzr diff"
1282
msgstr " bzr diff"
1283
1284
#: bzrlib/builtins.py:2225
1285
msgid " Difference between the working tree and revision 1::"
1286
msgstr ""
1287
1288
#: bzrlib/builtins.py:2227
1289
msgid " bzr diff -r1"
1290
msgstr " bzr diff -r1"
1291
1292
#: bzrlib/builtins.py:2229
1293
msgid " Difference between revision 3 and revision 1::"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2231
1297
msgid " bzr diff -r1..3"
1298
msgstr " bzr diff -r1..3"
1299
1300
#: bzrlib/builtins.py:2233
1301
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2235
1305
msgid " bzr diff -r1..3 xxx"
1306
msgstr " bzr diff -r1..3 xxx"
1307
1308
#: bzrlib/builtins.py:2237
1309
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1310
msgstr ""
1311
1312
#: bzrlib/builtins.py:2239
1313
msgid " bzr diff -c2"
1314
msgstr " bzr diff -c2"
1315
1316
#: bzrlib/builtins.py:2241
1317
msgid ""
1318
" To see the changes introduced by revision X::\n"
1319
" \n"
1320
" bzr diff -cX"
1321
msgstr ""
1322
1323
#: bzrlib/builtins.py:2245
1324
msgid ""
1325
" Note that in the case of a merge, the -c option shows the changes\n"
1326
" compared to the left hand parent. To see the changes against\n"
1327
" another parent, use::"
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2249
1331
msgid " bzr diff -r<chosen_parent>..X"
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2251
1335
msgid ""
1336
" The changes between the current revision and the previous revision\n"
1337
" (equivalent to -c-1 and -r-2..-1)"
1338
msgstr ""
1339
1340
#: bzrlib/builtins.py:2254
1341
msgid " bzr diff -r-2.."
1342
msgstr " bzr diff -r-2.."
1343
1344
#: bzrlib/builtins.py:2256
1345
msgid " Show just the differences for file NEWS::"
1346
msgstr ""
1347
1348
#: bzrlib/builtins.py:2258
1349
msgid " bzr diff NEWS"
1350
msgstr ""
1351
1352
#: bzrlib/builtins.py:2260
1353
msgid " Show the differences in working tree xxx for file NEWS::"
1354
msgstr ""
1355
1356
#: bzrlib/builtins.py:2262
1357
msgid " bzr diff xxx/NEWS"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2264
1361
msgid " Show the differences from branch xxx to this working tree:"
1362
msgstr ""
1363
1364
#: bzrlib/builtins.py:2266
1365
msgid " bzr diff --old xxx"
1366
msgstr " bzr diff --old xxx"
1367
1368
#: bzrlib/builtins.py:2268
1369
msgid " Show the differences between two branches for file NEWS::"
1370
msgstr ""
1371
1372
#: bzrlib/builtins.py:2270
1373
msgid " bzr diff --old xxx --new yyy NEWS"
1374
msgstr ""
1375
1376
#: bzrlib/builtins.py:2272
1377
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2274
1381
msgid ""
1382
" bzr diff --prefix old/:new/\n"
1383
" \n"
1384
" Show the differences using a custom diff program with options::\n"
1385
" \n"
1386
" bzr diff --using /usr/bin/diff --diff-options -wu"
1387
msgstr ""
1388
1389
#: bzrlib/builtins.py:2284
1390
msgid "Pass these options to the external diff program."
1391
msgstr "Diese Optionen an das externe Programm diff übergeben."
1392
1393
#: bzrlib/builtins.py:2287
1394
msgid ""
1395
"Set prefixes added to old and new filenames, as two values separated by a "
1396
"colon. (eg \"old/:new/\")."
1397
msgstr ""
1398
1399
#: bzrlib/builtins.py:2290
1400
msgid "Branch/tree to compare from."
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2294
1404
msgid "Branch/tree to compare to."
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2300
1408
msgid "Use this command to compare files."
1409
msgstr "Diesen Befehl zum Vergleichen von Dateien benutzen."
1410
1411
#: bzrlib/builtins.py:2305
1412
msgid "Diff format to use."
1413
msgstr "Diff-Format, das benutzt werden soll."
1414
1415
#: bzrlib/builtins.py:2307
1416
msgid "Diff format"
1417
msgstr "Diff-Format"
1418
1419
#: bzrlib/builtins.py:2329
1420
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2333
1424
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1425
msgstr ""
1426
1427
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1428
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1429
msgid "{0} and {1} are mutually exclusive"
1430
msgstr "{0} und {1} schließen sich gegenseitig aus"
1431
1432
#: bzrlib/builtins.py:2358
1433
msgid ""
1434
"List files deleted in the working tree.\n"
1435
" "
1436
msgstr ""
1437
1438
#: bzrlib/builtins.py:2436
1439
msgid "Show the tree root directory."
1440
msgstr ""
1441
1442
#: bzrlib/builtins.py:2438
1443
msgid ""
1444
"The root is the nearest enclosing directory with a .bzr control\n"
1445
"directory."
1446
msgstr ""
1447
1448
#: bzrlib/builtins.py:2453
1449
msgid "The limit argument must be an integer."
1450
msgstr ""
1451
1452
#: bzrlib/builtins.py:2461
1453
msgid "The levels argument must be an integer."
1454
msgstr ""
1455
1456
#: bzrlib/builtins.py:2466
1457
msgid "Show historical log for a branch or subset of a branch."
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2468
1461
msgid ""
1462
"log is bzr's default tool for exploring the history of a branch.\n"
1463
"The branch to use is taken from the first parameter. If no parameters\n"
1464
"are given, the branch containing the working directory is logged.\n"
1465
"Here are some simple examples::"
1466
msgstr ""
1467
1468
#: bzrlib/builtins.py:2473
1469
msgid ""
1470
" bzr log log the current branch\n"
1471
" bzr log foo.py log a file in its branch\n"
1472
" bzr log http://server/branch log a branch on a server"
1473
msgstr ""
1474
1475
#: bzrlib/builtins.py:2477
1476
msgid ""
1477
"The filtering, ordering and information shown for each revision can\n"
1478
"be controlled as explained below. By default, all revisions are\n"
1479
"shown sorted (topologically) so that newer revisions appear before\n"
1480
"older ones and descendants always appear before ancestors. If displayed,\n"
1481
"merged revisions are shown indented under the revision in which they\n"
1482
"were merged."
1483
msgstr ""
1484
1485
#: bzrlib/builtins.py:2484
1486
msgid ":Output control:"
1487
msgstr ":Ausgabesteuerung:"
1488
1489
#: bzrlib/builtins.py:2486
1490
msgid ""
1491
" The log format controls how information about each revision is\n"
1492
" displayed. The standard log formats are called ``long``, ``short``\n"
1493
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1494
" for more details on log formats."
1495
msgstr ""
1496
1497
#: bzrlib/builtins.py:2491
1498
msgid ""
1499
" The following options can be used to control what information is\n"
1500
" displayed::"
1501
msgstr ""
1502
1503
#: bzrlib/builtins.py:2494
1504
msgid ""
1505
" -l N display a maximum of N revisions\n"
1506
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1507
" -v display a status summary (delta) for each revision\n"
1508
" -p display a diff (patch) for each revision\n"
1509
" --show-ids display revision-ids (and file-ids), not just revnos"
1510
msgstr ""
1511
1512
#: bzrlib/builtins.py:2500
1513
msgid ""
1514
" Note that the default number of levels to display is a function of the\n"
1515
" log format. If the -n option is not used, the standard log formats show\n"
1516
" just the top level (mainline)."
1517
msgstr ""
1518
1519
#: bzrlib/builtins.py:2504
1520
msgid ""
1521
" Status summaries are shown using status flags like A, M, etc. To see\n"
1522
" the changes explained using words like ``added`` and ``modified``\n"
1523
" instead, use the -vv option."
1524
msgstr ""
1525
1526
#: bzrlib/builtins.py:2508
1527
msgid ":Ordering control:"
1528
msgstr ":Sortierungssteuerung:"
1529
1530
#: bzrlib/builtins.py:2510
1531
msgid ""
1532
" To display revisions from oldest to newest, use the --forward option.\n"
1533
" In most cases, using this option will have little impact on the total\n"
1534
" time taken to produce a log, though --forward does not incrementally\n"
1535
" display revisions like --reverse does when it can."
1536
msgstr ""
1537
1538
#: bzrlib/builtins.py:2515
1539
msgid ":Revision filtering:"
1540
msgstr ":Revision-Filtern:"
1541
1542
#: bzrlib/builtins.py:2517
1543
msgid ""
1544
" The -r option can be used to specify what revision or range of revisions\n"
1545
" to filter against. The various forms are shown below::"
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2520
1549
msgid ""
1550
" -rX display revision X\n"
1551
" -rX.. display revision X and later\n"
1552
" -r..Y display up to and including revision Y\n"
1553
" -rX..Y display from X to Y inclusive"
1554
msgstr ""
1555
1556
#: bzrlib/builtins.py:2525
1557
msgid ""
1558
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1559
" Some common examples are given below::"
1560
msgstr ""
1561
1562
#: bzrlib/builtins.py:2528
1563
msgid ""
1564
" -r-1 show just the tip\n"
1565
" -r-10.. show the last 10 mainline revisions\n"
1566
" -rsubmit:.. show what's new on this branch\n"
1567
" -rancestor:path.. show changes since the common ancestor of this\n"
1568
" branch and the one at location path\n"
1569
" -rdate:yesterday.. show changes since yesterday"
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2535
1573
msgid ""
1574
" When logging a range of revisions using -rX..Y, log starts at\n"
1575
" revision Y and searches back in history through the primary\n"
1576
" (\"left-hand\") parents until it finds X. When logging just the\n"
1577
" top level (using -n1), an error is reported if X is not found\n"
1578
" along the way. If multi-level logging is used (-n0), X may be\n"
1579
" a nested merge revision and the log will be truncated accordingly."
1580
msgstr ""
1581
1582
#: bzrlib/builtins.py:2542
1583
msgid ":Path filtering:"
1584
msgstr ":Pfad-Filtern:"
1585
1586
#: bzrlib/builtins.py:2544
1587
msgid ""
1588
" If parameters are given and the first one is not a branch, the log\n"
1589
" will be filtered to show only those revisions that changed the\n"
1590
" nominated files or directories."
1591
msgstr ""
1592
1593
#: bzrlib/builtins.py:2548
1594
msgid ""
1595
" Filenames are interpreted within their historical context. To log a\n"
1596
" deleted file, specify a revision range so that the file existed at\n"
1597
" the end or start of the range."
1598
msgstr ""
1599
1600
#: bzrlib/builtins.py:2552
1601
msgid ""
1602
" Historical context is also important when interpreting pathnames of\n"
1603
" renamed files/directories. Consider the following example:"
1604
msgstr ""
1605
1606
#: bzrlib/builtins.py:2555
1607
msgid ""
1608
" * revision 1: add tutorial.txt\n"
1609
" * revision 2: modify tutorial.txt\n"
1610
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1611
msgstr ""
1612
1613
#: bzrlib/builtins.py:2559
1614
msgid " In this case:"
1615
msgstr " In diesem Fall:"
1616
1617
#: bzrlib/builtins.py:2561
1618
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1619
msgstr ""
1620
1621
#: bzrlib/builtins.py:2563
1622
msgid ""
1623
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1624
msgstr ""
1625
1626
#: bzrlib/builtins.py:2565
1627
msgid ""
1628
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1629
" the original file in revision 2."
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2568
1633
msgid ""
1634
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1635
" was no file called guide.txt in revision 2."
1636
msgstr ""
1637
1638
#: bzrlib/builtins.py:2571
1639
msgid ""
1640
" Renames are always followed by log. By design, there is no need to\n"
1641
" explicitly ask for this (and no way to stop logging a file back\n"
1642
" until it was last renamed)."
1643
msgstr ""
1644
1645
#: bzrlib/builtins.py:2575
1646
msgid ":Other filtering:"
1647
msgstr ":Anderes Filtern:"
1648
1649
#: bzrlib/builtins.py:2577
1650
msgid ""
1651
" The --match option can be used for finding revisions that match a\n"
1652
" regular expression in a commit message, committer, author or bug.\n"
1653
" Specifying the option several times will match any of the supplied\n"
1654
" expressions. --match-author, --match-bugs, --match-committer and\n"
1655
" --match-message can be used to only match a specific field."
1656
msgstr ""
1657
1658
#: bzrlib/builtins.py:2583
1659
msgid ":Tips & tricks:"
1660
msgstr ":Tipps & Tricks:"
1661
1662
#: bzrlib/builtins.py:2585
1663
msgid ""
1664
" GUI tools and IDEs are often better at exploring history than command\n"
1665
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1666
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1667
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1668
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1669
msgstr ""
1670
1671
#: bzrlib/builtins.py:2591
1672
msgid ""
1673
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2593
1677
msgid ""
1678
" [ALIASES]\n"
1679
" tip = log -r-1\n"
1680
" top = log -l10 --line\n"
1681
" show = log -v -p"
1682
msgstr ""
1683
1684
#: bzrlib/builtins.py:2598
1685
msgid ""
1686
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1687
" will show the last 10 mainline revisions. To see the details of a\n"
1688
" particular revision X, ``bzr show -rX``."
1689
msgstr ""
1690
1691
#: bzrlib/builtins.py:2602
1692
msgid ""
1693
" If you are interested in looking deeper into a particular merge X,\n"
1694
" use ``bzr log -n0 -rX``."
1695
msgstr ""
1696
1697
#: bzrlib/builtins.py:2605
1698
msgid ""
1699
" ``bzr log -v`` on a branch with lots of history is currently\n"
1700
" very slow. A fix for this issue is currently under development.\n"
1701
" With or without that fix, it is recommended that a revision range\n"
1702
" be given when using the -v option."
1703
msgstr ""
1704
1705
#: bzrlib/builtins.py:2610
1706
msgid ""
1707
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1708
" used to find revisions matching user names, commit messages, etc.\n"
1709
" Among other features, this plugin can find all revisions containing\n"
1710
" a list of words but not others."
1711
msgstr ""
1712
1713
#: bzrlib/builtins.py:2615
1714
msgid ""
1715
" When exploring non-mainline history on large projects with deep\n"
1716
" history, the performance of log can be greatly improved by installing\n"
1717
" the historycache plugin. This plugin buffers historical information\n"
1718
" trading disk space for faster speed."
1719
msgstr ""
1720
1721
#: bzrlib/builtins.py:2624
1722
msgid "Show from oldest to newest."
1723
msgstr ""
1724
1725
#: bzrlib/builtins.py:2627
1726
msgid "Show files changed in each revision."
1727
msgstr ""
1728
1729
#: bzrlib/builtins.py:2633
1730
msgid "Show just the specified revision. See also \"help revisionspec\"."
1731
msgstr ""
1732
1733
#: bzrlib/builtins.py:2637
1734
msgid "What names to list as authors - first, all or committer."
1735
msgstr ""
1736
1737
#: bzrlib/builtins.py:2638
1738
msgid "Authors"
1739
msgstr "Autoren"
1740
1741
#: bzrlib/builtins.py:2643
1742
msgid "Number of levels to display - 0 for all, 1 for flat."
1743
msgstr ""
1744
1745
#: bzrlib/builtins.py:2653
1746
msgid "Limit the output to the first N revisions."
1747
msgstr ""
1748
1749
#: bzrlib/builtins.py:2658
1750
msgid "Show changes made in each revision as a patch."
1751
msgstr ""
1752
1753
#: bzrlib/builtins.py:2660
1754
msgid "Show merged revisions like --levels 0 does."
1755
msgstr ""
1756
1757
#: bzrlib/builtins.py:2664
1758
msgid "Do not report commits with more than one parent."
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2666
1762
msgid ""
1763
"Display only the revisions that are not part of both ancestries (require -"
1764
"rX..Y)."
1765
msgstr ""
1766
1767
#: bzrlib/builtins.py:2670
1768
msgid "Show digital signature validity."
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2673
1772
msgid "Show revisions whose properties match this expression."
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2677
1776
msgid "Show revisions whose message matches this expression."
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:2681
1780
msgid "Show revisions whose committer matches this expression."
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:2685
1784
msgid "Show revisions whose authors match this expression."
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:2689
1788
msgid "Show revisions whose bugs match this expression."
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:2743
1792
msgid "--exclude-common-ancestry requires -r with two revisions"
1793
msgstr ""
1794
1795
#: bzrlib/builtins.py:2771
1796
#, python-format
1797
msgid "Path unknown at end or start of revision range: %s"
1798
msgstr ""
1799
1800
#: bzrlib/builtins.py:2888
1801
#, python-format
1802
msgid "bzr %s doesn't accept two revisions in different branches."
1803
msgstr ""
1804
1805
#: bzrlib/builtins.py:2904
1806
#, python-format
1807
msgid "bzr %s --revision takes one or two values."
1808
msgstr ""
1809
1810
#: bzrlib/builtins.py:2949
1811
msgid ""
1812
"List files in a tree.\n"
1813
" "
1814
msgstr ""
1815
1816
#: bzrlib/builtins.py:2958
1817
msgid "Recurse into subdirectories."
1818
msgstr ""
1819
1820
#: bzrlib/builtins.py:2960
1821
msgid "Print paths relative to the root of the branch."
1822
msgstr ""
1823
1824
#: bzrlib/builtins.py:2962
1825
msgid "Print unknown files."
1826
msgstr "Unbekannte Dateien ausgeben."
1827
1828
#: bzrlib/builtins.py:2963
1829
msgid "Print versioned files."
1830
msgstr "Versionierte Dateien ausgeben."
1831
1832
#: bzrlib/builtins.py:2966
1833
msgid "Print ignored files."
1834
msgstr "Ignorierte Dateien ausgeben."
1835
1836
#: bzrlib/builtins.py:2968
1837
msgid "List entries of a particular kind: file, directory, symlink."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:2981
1841
msgid "invalid kind specified"
1842
msgstr ""
1843
1844
#: bzrlib/builtins.py:2984
1845
msgid "Cannot set both --verbose and --null"
1846
msgstr ""
1847
1848
#: bzrlib/builtins.py:2993
1849
msgid "cannot specify both --from-root and PATH"
1850
msgstr ""
1851
1852
#: bzrlib/builtins.py:3080
1853
msgid "Ignore specified files or patterns."
1854
msgstr ""
1855
1856
#: bzrlib/builtins.py:3082
1857
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1858
msgstr ""
1859
1860
#: bzrlib/builtins.py:3084
1861
msgid ""
1862
"If a .bzrignore file does not exist, the ignore command\n"
1863
"will create one and add the specified files or patterns to the newly\n"
1864
"created file. The ignore command will also automatically add the \n"
1865
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1866
"the use of the ignore command will require an explicit add command."
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3090
1870
msgid ""
1871
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1872
"After adding, editing or deleting that file either indirectly by\n"
1873
"using this command or directly by using an editor, be sure to commit\n"
1874
"it."
1875
msgstr ""
1876
1877
#: bzrlib/builtins.py:3095
1878
msgid ""
1879
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1880
"the global ignore file can be found in the application data directory as\n"
1881
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1882
"Global ignores are not touched by this command. The global ignore file\n"
1883
"can be edited directly using an editor."
1884
msgstr ""
1885
1886
#: bzrlib/builtins.py:3101
1887
msgid ""
1888
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1889
"precedence over regular ignores. Such exceptions are used to specify\n"
1890
"files that should be versioned which would otherwise be ignored."
1891
msgstr ""
1892
1893
#: bzrlib/builtins.py:3105
1894
msgid ""
1895
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1896
"precedence over the '!' exception patterns."
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:3108
1900
msgid ""
1901
":Notes: \n"
1902
" \n"
1903
"* Ignore patterns containing shell wildcards must be quoted from\n"
1904
" the shell on Unix."
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3113
1908
msgid ""
1909
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1910
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1911
msgstr ""
1912
1913
#: bzrlib/builtins.py:3116
1914
msgid ""
1915
":Examples:\n"
1916
" Ignore the top level Makefile::"
1917
msgstr ""
1918
1919
#: bzrlib/builtins.py:3119
1920
msgid " bzr ignore ./Makefile"
1921
msgstr ""
1922
1923
#: bzrlib/builtins.py:3121
1924
msgid " Ignore .class files in all directories...::"
1925
msgstr ""
1926
1927
#: bzrlib/builtins.py:3123
1928
msgid " bzr ignore \"*.class\""
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3125
1932
msgid " ...but do not ignore \"special.class\"::"
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3127
1936
msgid " bzr ignore \"!special.class\""
1937
msgstr ""
1938
1939
#: bzrlib/builtins.py:3129
1940
msgid " Ignore files whose name begins with the \"#\" character::"
1941
msgstr ""
1942
1943
#: bzrlib/builtins.py:3131
1944
msgid " bzr ignore \"RE:^#\""
1945
msgstr " bzr ignore \"RE:^#\""
1946
1947
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1948
msgid " Ignore .o files under the lib directory::"
1949
msgstr ""
1950
1951
#: bzrlib/builtins.py:3135
1952
msgid " bzr ignore \"lib/**/*.o\""
1953
msgstr " bzr ignore \"lib/**/*.o\""
1954
1955
#: bzrlib/builtins.py:3139
1956
msgid " bzr ignore \"RE:lib/.*\\.o\""
1957
msgstr " bzr ignore \"RE:lib/.*\\.o\""
1958
1959
#: bzrlib/builtins.py:3141
1960
msgid " Ignore everything but the \"debian\" toplevel directory::"
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3143
1964
msgid ""
1965
" bzr ignore \"RE:(?!debian/).*\"\n"
1966
" \n"
1967
" Ignore everything except the \"local\" toplevel directory,\n"
1968
" but always ignore autosave files ending in ~, even under local/::\n"
1969
" \n"
1970
" bzr ignore \"*\"\n"
1971
" bzr ignore \"!./local\"\n"
1972
" bzr ignore \"!!*~\""
1973
msgstr ""
1974
1975
#: bzrlib/builtins.py:3157
1976
msgid "Display the default ignore rules that bzr uses."
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:3169
1980
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:3180
1984
#, python-format
1985
msgid "Invalid ignore pattern found. %s"
1986
msgid_plural "Invalid ignore patterns found. %s"
1987
msgstr[0] "Ungültiges Ignorierungsmuster gefunden. %s"
1988
msgstr[1] "Ungültige Ignorierungsmuster gefunden. %s"
1989
1990
#: bzrlib/builtins.py:3189
1991
msgid "NAME_PATTERN should not be an absolute path"
1992
msgstr ""
1993
1994
#: bzrlib/builtins.py:3202
1995
#, python-format
1996
msgid ""
1997
"Warning: the following files are version controlled and match your ignore "
1998
"pattern:\n"
1999
"%s\n"
2000
"These files will continue to be version controlled unless you 'bzr remove' "
2001
"them.\n"
2002
msgstr ""
2003
2004
#: bzrlib/builtins.py:3209
2005
msgid "List ignored files and the patterns that matched them."
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3211
2009
msgid ""
2010
"List all the ignored files and the ignore pattern that caused the file to\n"
2011
"be ignored."
2012
msgstr ""
2013
2014
#: bzrlib/builtins.py:3214
2015
msgid "Alternatively, to list just the files::"
2016
msgstr "Alternativ, um nur die Dateien aufzulisten:"
2017
2018
#: bzrlib/builtins.py:3216
2019
msgid " bzr ls --ignored"
2020
msgstr " bzr ls --ignored"
2021
2022
#: bzrlib/builtins.py:3250
2023
#, python-format
2024
msgid "not a valid revision-number: %r"
2025
msgstr "Keine gültige Revisionsnummer: %r"
2026
2027
#: bzrlib/builtins.py:3257
2028
msgid ""
2029
"Export current or past revision to a destination directory or archive."
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3259
2033
msgid "If no revision is specified this exports the last committed revision."
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3261
2037
msgid ""
2038
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2039
"given, try to find the format with the extension. If no extension\n"
2040
"is found exports to a directory (equivalent to --format=dir)."
2041
msgstr ""
2042
2043
#: bzrlib/builtins.py:3265
2044
msgid ""
2045
"If root is supplied, it will be used as the root directory inside\n"
2046
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2047
"to the exported filename. The root option has no effect for 'dir' format."
2048
msgstr ""
2049
2050
#: bzrlib/builtins.py:3269
2051
msgid ""
2052
"If branch is omitted then the branch containing the current working\n"
2053
"directory will be used."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3272
2057
msgid ""
2058
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2059
msgstr ""
2060
2061
#: bzrlib/builtins.py:3274
2062
msgid ""
2063
" ================= =========================\n"
2064
" Supported formats Autodetected by extension\n"
2065
" ================= =========================\n"
2066
" dir (none)\n"
2067
" tar .tar\n"
2068
" tbz2 .tar.bz2, .tbz2\n"
2069
" tgz .tar.gz, .tgz\n"
2070
" zip .zip\n"
2071
" ================= ========================="
2072
msgstr ""
2073
2074
#: bzrlib/builtins.py:3288
2075
msgid "Type of file to export to."
2076
msgstr "Art der Datei, in die exportiert wird."
2077
2078
#: bzrlib/builtins.py:3291
2079
msgid "Apply content filters to export the convenient form."
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3295
2083
msgid "Name of the root directory inside the exported file."
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3297
2087
msgid ""
2088
"Set modification time of files to that of the last revision in which it was "
2089
"changed."
2090
msgstr ""
2091
2092
#: bzrlib/builtins.py:3300
2093
msgid ""
2094
"Export the working tree contents rather than that of the last revision."
2095
msgstr ""
2096
2097
#: bzrlib/builtins.py:3319
2098
msgid "--uncommitted requires a working tree"
2099
msgstr ""
2100
2101
#: bzrlib/builtins.py:3328
2102
#, python-format
2103
msgid "Unsupported export format: %s"
2104
msgstr "Nicht unterstütztes Export-Format: %s"
2105
2106
#: bzrlib/builtins.py:3332
2107
msgid ""
2108
"Write the contents of a file as of a given revision to standard output."
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3334
2112
msgid "If no revision is nominated, the last revision is used."
2113
msgstr ""
2114
"Wenn keine Revision bestimmt wurde, wird die neueste Revision benutzt."
2115
2116
#: bzrlib/builtins.py:3336
2117
msgid ""
2118
"Note: Take care to redirect standard output when using this command on a\n"
2119
"binary file."
2120
msgstr ""
2121
2122
#: bzrlib/builtins.py:3342
2123
msgid "The path name in the old tree."
2124
msgstr ""
2125
2126
#: bzrlib/builtins.py:3343
2127
msgid "Apply content filters to display the convenience form."
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3354
2131
msgid "bzr cat --revision takes exactly one revision specifier"
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2135
msgid "{0!r} is not present in revision {1}"
2136
msgstr "{0!r} ist in Revision {1} nicht vorhanden"
2137
2138
#: bzrlib/builtins.py:3414
2139
msgid "Commit changes into a new revision."
2140
msgstr ""
2141
2142
#: bzrlib/builtins.py:3416
2143
msgid ""
2144
"An explanatory message needs to be given for each commit. This is\n"
2145
"often done by using the --message option (getting the message from the\n"
2146
"command line) or by using the --file option (getting the message from\n"
2147
"a file). If neither of these options is given, an editor is opened for\n"
2148
"the user to enter the message. To see the changed files in the\n"
2149
"boilerplate text loaded into the editor, use the --show-diff option."
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3423
2153
msgid ""
2154
"By default, the entire tree is committed and the person doing the\n"
2155
"commit is assumed to be the author. These defaults can be overridden\n"
2156
"as explained below."
2157
msgstr ""
2158
2159
#: bzrlib/builtins.py:3427
2160
msgid ":Selective commits:"
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3429
2164
msgid ""
2165
" If selected files are specified, only changes to those files are\n"
2166
" committed. If a directory is specified then the directory and\n"
2167
" everything within it is committed."
2168
msgstr ""
2169
2170
#: bzrlib/builtins.py:3433
2171
msgid ""
2172
" When excludes are given, they take precedence over selected files.\n"
2173
" For example, to commit only changes within foo, but not changes\n"
2174
" within foo/bar::"
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3437
2178
msgid " bzr commit foo -x foo/bar"
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3439
2182
msgid " A selective commit after a merge is not yet supported."
2183
msgstr ""
2184
2185
#: bzrlib/builtins.py:3441
2186
msgid ":Custom authors:"
2187
msgstr ":Benutzerdefinierte Autoren:"
2188
2189
#: bzrlib/builtins.py:3443
2190
msgid ""
2191
" If the author of the change is not the same person as the committer,\n"
2192
" you can specify the author's name using the --author option. The\n"
2193
" name should be in the same format as a committer-id, e.g.\n"
2194
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2195
" the change you can specify the option multiple times, once for each\n"
2196
" author."
2197
msgstr ""
2198
2199
#: bzrlib/builtins.py:3450
2200
msgid ":Checks:"
2201
msgstr ":Prüfungen:"
2202
2203
#: bzrlib/builtins.py:3452
2204
msgid ""
2205
" A common mistake is to forget to add a new file or directory before\n"
2206
" running the commit command. The --strict option checks for unknown\n"
2207
" files and aborts the commit if any are found. More advanced pre-commit\n"
2208
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2209
" for details."
2210
msgstr ""
2211
2212
#: bzrlib/builtins.py:3458
2213
msgid ":Things to note:"
2214
msgstr ":Dinge, die zu beachten sind:"
2215
2216
#: bzrlib/builtins.py:3460
2217
msgid ""
2218
" If you accidentially commit the wrong changes or make a spelling\n"
2219
" mistake in the commit message say, you can use the uncommit command\n"
2220
" to undo it. See ``bzr help uncommit`` for details."
2221
msgstr ""
2222
2223
#: bzrlib/builtins.py:3464
2224
msgid ""
2225
" Hooks can also be configured to run after a commit. This allows you\n"
2226
" to trigger updates to external systems like bug trackers. The --fixes\n"
2227
" option can be used to record the association between a revision and\n"
2228
" one or more bugs. See ``bzr help bugs`` for details."
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3474
2232
msgid "Do not consider changes made to a given path."
2233
msgstr ""
2234
2235
#: bzrlib/builtins.py:3477
2236
msgid "Description of the new revision."
2237
msgstr "Beschreibung der neuen Revision."
2238
2239
#: bzrlib/builtins.py:3480
2240
msgid "Commit even if nothing has changed."
2241
msgstr ""
2242
2243
#: bzrlib/builtins.py:3484
2244
msgid "Take commit message from this file."
2245
msgstr ""
2246
2247
#: bzrlib/builtins.py:3486
2248
msgid "Refuse to commit if there are unknown files in the working tree."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3489
2252
msgid ""
2253
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2254
"08:00:00 +0100'."
2255
msgstr ""
2256
2257
#: bzrlib/builtins.py:3492
2258
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2259
msgstr ""
2260
2261
#: bzrlib/builtins.py:3495
2262
msgid "Set the author's name, if it's different from the committer."
2263
msgstr ""
2264
2265
#: bzrlib/builtins.py:3498
2266
msgid ""
2267
"Perform a local commit in a bound branch. Local commits are not pushed to "
2268
"the master branch until a normal commit is performed."
2269
msgstr ""
2270
2271
#: bzrlib/builtins.py:3504
2272
msgid ""
2273
"When no message is supplied, show the diff along with the status summary in "
2274
"the message editor."
2275
msgstr ""
2276
2277
#: bzrlib/builtins.py:3507
2278
msgid ""
2279
"When committing to a foreign version control system do not push data that "
2280
"can not be natively represented."
2281
msgstr ""
2282
2283
#: bzrlib/builtins.py:3525
2284
#, python-format
2285
msgid ""
2286
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2287
"default bug tracker using the `bugtracker` option.\n"
2288
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2289
msgstr ""
2290
2291
#: bzrlib/builtins.py:3534
2292
#, python-format
2293
msgid ""
2294
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2295
"for more information on this feature.\n"
2296
"Commit refused."
2297
msgstr ""
2298
2299
#: bzrlib/builtins.py:3543
2300
#, python-format
2301
msgid "Unrecognized bug %s. Commit refused."
2302
msgstr ""
2303
2304
#: bzrlib/builtins.py:3546
2305
#, python-format
2306
msgid ""
2307
"%s\n"
2308
"Commit refused."
2309
msgstr ""
2310
2311
#: bzrlib/builtins.py:3570
2312
msgid "Could not parse --commit-time: "
2313
msgstr ""
2314
2315
#: bzrlib/builtins.py:3610
2316
msgid "please specify either --message or --file"
2317
msgstr "Bitte geben Sie entweder --message oder --file an"
2318
2319
#: bzrlib/builtins.py:3639
2320
msgid "please specify a commit message with either --message or --file"
2321
msgstr ""
2322
2323
#: bzrlib/builtins.py:3642
2324
msgid ""
2325
"Empty commit message specified. Please specify a commit message with either -"
2326
"-message or --file or leave a blank message with --message \"\"."
2327
msgstr ""
2328
2329
#: bzrlib/builtins.py:3662
2330
msgid ""
2331
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2332
"-unchanged to force an empty commit."
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3666
2336
msgid ""
2337
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2338
"resolve FILE\" to resolve."
2339
msgstr ""
2340
2341
#: bzrlib/builtins.py:3670
2342
msgid "Commit refused because there are unknown files in the working tree."
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3673
2346
msgid ""
2347
"\n"
2348
"To commit to master branch, run update and then commit.\n"
2349
"You can also pass --local to commit to continue working disconnected."
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3681
2353
msgid ""
2354
"Validate working tree structure, branch consistency and repository history."
2355
msgstr ""
2356
2357
#: bzrlib/builtins.py:3683
2358
msgid ""
2359
"This command checks various invariants about branch and repository storage\n"
2360
"to detect data corruption or bzr bugs."
2361
msgstr ""
2362
2363
#: bzrlib/builtins.py:3686
2364
msgid ""
2365
"The working tree and branch checks will only give output if a problem is\n"
2366
"detected. The output fields of the repository check are:"
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3689
2370
msgid ""
2371
"revisions\n"
2372
" This is just the number of revisions checked. It doesn't\n"
2373
" indicate a problem."
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3693
2377
msgid ""
2378
"versionedfiles\n"
2379
" This is just the number of versionedfiles checked. It\n"
2380
" doesn't indicate a problem."
2381
msgstr ""
2382
2383
#: bzrlib/builtins.py:3697
2384
msgid ""
2385
"unreferenced ancestors\n"
2386
" Texts that are ancestors of other texts, but\n"
2387
" are not properly referenced by the revision ancestry. This is a\n"
2388
" subtle problem that Bazaar can work around."
2389
msgstr ""
2390
2391
#: bzrlib/builtins.py:3702
2392
msgid ""
2393
"unique file texts\n"
2394
" This is the total number of unique file contents\n"
2395
" seen in the checked revisions. It does not indicate a problem."
2396
msgstr ""
2397
2398
#: bzrlib/builtins.py:3706
2399
msgid ""
2400
"repeated file texts\n"
2401
" This is the total number of repeated texts seen\n"
2402
" in the checked revisions. Texts can be repeated when their file\n"
2403
" entries are modified, but the file contents are not. It does not\n"
2404
" indicate a problem."
2405
msgstr ""
2406
2407
#: bzrlib/builtins.py:3712
2408
msgid ""
2409
"If no restrictions are specified, all Bazaar data that is found at the "
2410
"given\n"
2411
"location will be checked."
2412
msgstr ""
2413
2414
#: bzrlib/builtins.py:3717
2415
msgid " Check the tree and branch at 'foo'::"
2416
msgstr ""
2417
2418
#: bzrlib/builtins.py:3719
2419
msgid " bzr check --tree --branch foo"
2420
msgstr ""
2421
2422
#: bzrlib/builtins.py:3721
2423
msgid " Check only the repository at 'bar'::"
2424
msgstr ""
2425
2426
#: bzrlib/builtins.py:3723
2427
msgid " bzr check --repo bar"
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3725
2431
msgid " Check everything at 'baz'::"
2432
msgstr ""
2433
2434
#: bzrlib/builtins.py:3727
2435
msgid " bzr check baz"
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3733
2439
msgid "Check the branch related to the current directory."
2440
msgstr ""
2441
2442
#: bzrlib/builtins.py:3735
2443
msgid "Check the repository related to the current directory."
2444
msgstr ""
2445
2446
#: bzrlib/builtins.py:3737
2447
msgid "Check the working tree related to the current directory."
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3751
2451
msgid "Upgrade a repository, branch or working tree to a newer format."
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3753
2455
msgid ""
2456
"When the default format has changed after a major new release of\n"
2457
"Bazaar, you may be informed during certain operations that you\n"
2458
"should upgrade. Upgrading to a newer format may improve performance\n"
2459
"or make new features available. It may however limit interoperability\n"
2460
"with older repositories or with older versions of Bazaar."
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3759
2464
msgid ""
2465
"If you wish to upgrade to a particular format rather than the\n"
2466
"current default, that can be specified using the --format option.\n"
2467
"As a consequence, you can use the upgrade command this way to\n"
2468
"\"downgrade\" to an earlier format, though some conversions are\n"
2469
"a one way process (e.g. changing from the 1.x default to the\n"
2470
"2.x default) so downgrading is not always possible."
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3766
2474
msgid ""
2475
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2476
"process (where # is a number). By default, this is left there on\n"
2477
"completion. If the conversion fails, delete the new .bzr directory\n"
2478
"and rename this one back in its place. Use the --clean option to ask\n"
2479
"for the backup.bzr directory to be removed on successful conversion.\n"
2480
"Alternatively, you can delete it by hand if everything looks good\n"
2481
"afterwards."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3774
2485
msgid ""
2486
"If the location given is a shared repository, dependent branches\n"
2487
"are also converted provided the repository converts successfully.\n"
2488
"If the conversion of a branch fails, remaining branches are still\n"
2489
"tried."
2490
msgstr ""
2491
2492
#: bzrlib/builtins.py:3779
2493
msgid ""
2494
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2495
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3787
2499
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2500
msgstr ""
2501
2502
#: bzrlib/builtins.py:3791
2503
msgid "Branch format"
2504
msgstr "Format des Zweiges"
2505
2506
#: bzrlib/builtins.py:3793
2507
msgid "Remove the backup.bzr directory if successful."
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3795
2511
msgid "Show what would be done, but don't actually do anything."
2512
msgstr "Nur zeigen, was getan werden würde, aber nichts wirklich machen."
2513
2514
#: bzrlib/builtins.py:3810
2515
msgid "Show or set bzr user id."
2516
msgstr ""
2517
2518
#: bzrlib/builtins.py:3812
2519
msgid ""
2520
":Examples:\n"
2521
" Show the email of the current user::"
2522
msgstr ""
2523
":Beispiele:\n"
2524
" Die E-Mail-Adresse des aktuellen Benutzers zeigen::"
2525
2526
#: bzrlib/builtins.py:3815
2527
msgid " bzr whoami --email"
2528
msgstr " bzr whoami --email"
2529
2530
#: bzrlib/builtins.py:3817
2531
msgid " Set the current user::"
2532
msgstr " Aktuellen Benutzer festlegen::"
2533
2534
#: bzrlib/builtins.py:3819
2535
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2536
msgstr " bzr whoami \"Frank Chu <ich@beispiel.de>\""
2537
2538
#: bzrlib/builtins.py:3823
2539
msgid "Display email address only."
2540
msgstr "Nur die E-Mail-Adresse anzeigen."
2541
2542
#: bzrlib/builtins.py:3825
2543
msgid "Set identity for the current branch instead of globally."
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3851
2547
msgid "--email can only be used to display existing identity"
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3873
2551
msgid "Print or set the branch nickname."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:3875
2555
msgid ""
2556
"If unset, the tree root directory name is used as the nickname.\n"
2557
"To print the current nickname, execute with no argument."
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:3878
2561
msgid ""
2562
"Bound branches use the nickname of its master branch unless it is set\n"
2563
"locally."
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:3898
2567
msgid "Set/unset and display aliases."
2568
msgstr ""
2569
2570
#: bzrlib/builtins.py:3900
2571
msgid ""
2572
":Examples:\n"
2573
" Show the current aliases::"
2574
msgstr ""
2575
":Beispiele:\n"
2576
" Die aktuellen Aliase zeigen::"
2577
2578
#: bzrlib/builtins.py:3903
2579
msgid " bzr alias"
2580
msgstr " bzr alias"
2581
2582
#: bzrlib/builtins.py:3905
2583
msgid " Show the alias specified for 'll'::"
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:3907
2587
msgid " bzr alias ll"
2588
msgstr " bzr alias ll"
2589
2590
#: bzrlib/builtins.py:3909
2591
msgid " Set an alias for 'll'::"
2592
msgstr ""
2593
2594
#: bzrlib/builtins.py:3911
2595
msgid " bzr alias ll=\"log --line -r-10..-1\""
2596
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2597
2598
#: bzrlib/builtins.py:3913
2599
msgid " To remove an alias for 'll'::"
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:3915
2603
msgid " bzr alias --remove ll"
2604
msgstr " bzr alias --remove ll"
2605
2606
#: bzrlib/builtins.py:3920
2607
msgid "Remove the alias."
2608
msgstr "Den Alias entfernen."
2609
2610
#: bzrlib/builtins.py:3938
2611
msgid "bzr alias --remove expects an alias to remove."
2612
msgstr "bzr alias --remove erwartet einen Alias zum Entfernen."
2613
2614
#: bzrlib/builtins.py:4119
2615
msgid ""
2616
"subunit not available. subunit needs to be installed to use --subunit."
2617
msgstr ""
2618
2619
#: bzrlib/builtins.py:4136
2620
msgid ""
2621
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2622
msgstr ""
2623
2624
#: bzrlib/builtins.py:4183
2625
msgid "Show version of bzr."
2626
msgstr "Version von bzr anzeigen."
2627
2628
#: bzrlib/builtins.py:4187
2629
msgid "Print just the version number."
2630
msgstr "Nur die Versionsnummer ausgeben."
2631
2632
#: bzrlib/builtins.py:4206
2633
msgid "It sure does!\n"
2634
msgstr ""
2635
2636
#: bzrlib/builtins.py:4230
2637
#, python-format
2638
msgid "merge base is revision %s\n"
2639
msgstr ""
2640
2641
#: bzrlib/builtins.py:4234
2642
msgid "Perform a three-way merge."
2643
msgstr ""
2644
2645
#: bzrlib/builtins.py:4236
2646
msgid ""
2647
"The source of the merge can be specified either in the form of a branch,\n"
2648
"or in the form of a path to a file containing a merge directive generated\n"
2649
"with bzr send. If neither is specified, the default is the upstream branch\n"
2650
"or the branch most recently merged using --remember. The source of the\n"
2651
"merge may also be specified in the form of a path to a file in another\n"
2652
"branch: in this case, only the modifications to that file are merged into\n"
2653
"the current working tree."
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:4244
2657
msgid ""
2658
"When merging from a branch, by default bzr will try to merge in all new\n"
2659
"work from the other branch, automatically determining an appropriate base\n"
2660
"revision. If this fails, you may need to give an explicit base."
2661
msgstr ""
2662
2663
#: bzrlib/builtins.py:4248
2664
msgid ""
2665
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2666
"try to merge in all new work up to and including revision OTHER."
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:4251
2670
msgid ""
2671
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2672
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2673
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2674
"not already contain revision BASE, such a merge is commonly referred to as\n"
2675
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2676
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2677
"changes from the other branch is not stored in the commit."
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4259
2681
msgid "Revision numbers are always relative to the source branch."
2682
msgstr ""
2683
2684
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2685
msgid ""
2686
"Merge will do its best to combine the changes in two branches, but there\n"
2687
"are some kinds of problems only a human can fix. When it encounters those,\n"
2688
"it will mark a conflict. A conflict means that you need to fix something,\n"
2689
"before you can commit."
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4266
2693
msgid ""
2694
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2695
msgstr ""
2696
2697
#: bzrlib/builtins.py:4268
2698
msgid ""
2699
"If there is no default branch set, the first merge will set it (use\n"
2700
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2701
"to use the default. To change the default, use --remember. The value will\n"
2702
"only be saved if the remote location can be accessed."
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4273
2706
msgid ""
2707
"The results of the merge are placed into the destination working\n"
2708
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2709
"committed to record the result of the merge."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4277
2713
msgid ""
2714
"merge refuses to run if there are any uncommitted changes, unless\n"
2715
"--force is given. If --force is given, then the changes from the source \n"
2716
"will be merged with the current working tree, including any uncommitted\n"
2717
"changes in the tree. The --force option can also be used to create a\n"
2718
"merge revision which has more than two parents."
2719
msgstr ""
2720
2721
#: bzrlib/builtins.py:4283
2722
msgid ""
2723
"If one would like to merge changes from the working tree of the other\n"
2724
"branch without merging any committed revisions, the --uncommitted option\n"
2725
"can be given."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4287
2729
msgid ""
2730
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2731
"you to apply each diff hunk and file change, similar to \"shelve\"."
2732
msgstr ""
2733
2734
#: bzrlib/builtins.py:4290
2735
msgid ""
2736
":Examples:\n"
2737
" To merge all new revisions from bzr.dev::"
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4293
2741
msgid " bzr merge ../bzr.dev"
2742
msgstr " bzr merge ../bzr.dev"
2743
2744
#: bzrlib/builtins.py:4295
2745
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2746
msgstr ""
2747
2748
#: bzrlib/builtins.py:4297
2749
msgid " bzr merge -r 82 ../bzr.dev"
2750
msgstr " bzr merge -r 82 ../bzr.dev"
2751
2752
#: bzrlib/builtins.py:4299
2753
msgid " To merge the changes introduced by 82, without previous changes::"
2754
msgstr ""
2755
2756
#: bzrlib/builtins.py:4301
2757
msgid " bzr merge -r 81..82 ../bzr.dev"
2758
msgstr " bzr merge -r 81..82 ../bzr.dev"
2759
2760
#: bzrlib/builtins.py:4303
2761
msgid " To apply a merge directive contained in /tmp/merge::"
2762
msgstr ""
2763
2764
#: bzrlib/builtins.py:4305
2765
msgid " bzr merge /tmp/merge"
2766
msgstr " bzr merge /tmp/merge"
2767
2768
#: bzrlib/builtins.py:4307
2769
msgid ""
2770
" To create a merge revision with three parents from two branches\n"
2771
" feature1a and feature1b:"
2772
msgstr ""
2773
2774
#: bzrlib/builtins.py:4310
2775
msgid ""
2776
" bzr merge ../feature1a\n"
2777
" bzr merge ../feature1b --force\n"
2778
" bzr commit -m 'revision with three parents'"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4322
2782
msgid "Merge even if the destination tree has uncommitted changes."
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4328
2786
msgid ""
2787
"Apply uncommitted changes from a working copy, instead of branch changes."
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4330
2791
msgid ""
2792
"If the destination is already completely merged into the source, pull from "
2793
"the source rather than merging. When this happens, you do not need to "
2794
"commit the result."
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:4335
2798
msgid ""
2799
"Branch to merge into, rather than the one containing the working directory."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4337
2803
msgid "Instead of merging, show a diff of the merge."
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4339
2807
msgid "Select changes interactively."
2808
msgstr "Änderungen interaktiv auswählen."
2809
2810
#: bzrlib/builtins.py:4361
2811
msgid ""
2812
"Merging into empty branches not currently supported, "
2813
"https://bugs.launchpad.net/bzr/+bug/308562"
2814
msgstr ""
2815
2816
#: bzrlib/builtins.py:4388
2817
msgid "Cannot use --uncommitted with bundles or merge directives."
2818
msgstr ""
2819
2820
#: bzrlib/builtins.py:4399
2821
msgid "Cannot use --uncommitted and --revision at the same time."
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4419
2825
msgid "merger: "
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2829
msgid "Nothing to do."
2830
msgstr "Nichts zu tun."
2831
2832
#: bzrlib/builtins.py:4425
2833
msgid "Cannot pull individual files"
2834
msgstr ""
2835
2836
#: bzrlib/builtins.py:4433
2837
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4491
2841
#, python-format
2842
msgid "Show-base is not supported for this merge type. %s"
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4500
2846
#, python-format
2847
msgid "Conflict reduction is not supported for merge type %s."
2848
msgstr ""
2849
2850
#: bzrlib/builtins.py:4504
2851
msgid "Cannot do conflict reduction and show base."
2852
msgstr ""
2853
2854
#: bzrlib/builtins.py:4615
2855
msgid "No location specified or remembered"
2856
msgstr ""
2857
2858
#: bzrlib/builtins.py:4617
2859
msgid "{0} remembered {1} location {2}"
2860
msgstr ""
2861
2862
#: bzrlib/builtins.py:4623
2863
msgid "Redo a merge."
2864
msgstr ""
2865
2866
#: bzrlib/builtins.py:4625
2867
msgid ""
2868
"Use this if you want to try a different merge technique while resolving\n"
2869
"conflicts. Some merge techniques are better than others, and remerge\n"
2870
"lets you try different ones on different files."
2871
msgstr ""
2872
2873
#: bzrlib/builtins.py:4629
2874
msgid ""
2875
"The options for remerge have the same meaning and defaults as the ones for\n"
2876
"merge. The difference is that remerge can (only) be run when there is a\n"
2877
"pending merge, and it lets you specify particular files."
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4633
2881
msgid ""
2882
":Examples:\n"
2883
" Re-do the merge of all conflicted files, and show the base text in\n"
2884
" conflict regions, in addition to the usual THIS and OTHER texts::"
2885
msgstr ""
2886
2887
#: bzrlib/builtins.py:4637
2888
msgid " bzr remerge --show-base"
2889
msgstr " bzr remerge --show-base"
2890
2891
#: bzrlib/builtins.py:4639
2892
msgid ""
2893
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2894
" additional processing to reduce the size of conflict regions::"
2895
msgstr ""
2896
2897
#: bzrlib/builtins.py:4642
2898
msgid " bzr remerge --merge-type weave --reprocess foobar"
2899
msgstr ""
2900
2901
#: bzrlib/builtins.py:4649
2902
msgid "Show base revision text in conflicts."
2903
msgstr ""
2904
2905
#: bzrlib/builtins.py:4661
2906
msgid ""
2907
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2908
"merges."
2909
msgstr ""
2910
2911
#: bzrlib/builtins.py:4717
2912
msgid "Revert files to a previous revision."
2913
msgstr ""
2914
2915
#: bzrlib/builtins.py:4719
2916
msgid ""
2917
"Giving a list of files will revert only those files. Otherwise, all files\n"
2918
"will be reverted. If the revision is not specified with '--revision', the\n"
2919
"last committed revision is used."
2920
msgstr ""
2921
2922
#: bzrlib/builtins.py:4723
2923
msgid ""
2924
"To remove only some changes, without reverting to a prior version, use\n"
2925
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2926
"will remove the changes introduced by the second last commit (-2), without\n"
2927
"affecting the changes introduced by the last commit (-1). To remove\n"
2928
"certain changes on a hunk-by-hunk basis, see the shelve command."
2929
msgstr ""
2930
2931
#: bzrlib/builtins.py:4729
2932
msgid ""
2933
"By default, any files that have been manually changed will be backed up\n"
2934
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2935
"'.~#~' appended to their name, where # is a number."
2936
msgstr ""
2937
2938
#: bzrlib/builtins.py:4733
2939
msgid ""
2940
"When you provide files, you can use their current pathname or the pathname\n"
2941
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2942
"name. If you name a directory, all the contents of that directory will be\n"
2943
"reverted."
2944
msgstr ""
2945
2946
#: bzrlib/builtins.py:4738
2947
msgid ""
2948
"If you have newly added files since the target revision, they will be\n"
2949
"removed. If the files to be removed have been changed, backups will be\n"
2950
"created as above. Directories containing unknown files will not be\n"
2951
"deleted."
2952
msgstr ""
2953
2954
#: bzrlib/builtins.py:4743
2955
msgid ""
2956
"The working tree contains a list of revisions that have been merged but\n"
2957
"not yet committed. These revisions will be included as additional parents\n"
2958
"of the next commit. Normally, using revert clears that list as well as\n"
2959
"reverting the files. If any files are specified, revert leaves the list\n"
2960
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2961
".`` in the tree root to revert all files but keep the recorded merges,\n"
2962
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2963
"reverting any files."
2964
msgstr ""
2965
2966
#: bzrlib/builtins.py:4752
2967
msgid ""
2968
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2969
"changes from a branch in a single revision. To do this, perform the merge\n"
2970
"as desired. Then doing revert with the \"--forget-merges\" option will "
2971
"keep\n"
2972
"the content of the tree as it was, but it will clear the list of pending\n"
2973
"merges. The next commit will then contain all of the changes that are\n"
2974
"present in the other branch, but without any other parent revisions.\n"
2975
"Because this technique forgets where these changes originated, it may\n"
2976
"cause additional conflicts on later merges involving the same source and\n"
2977
"target branches."
2978
msgstr ""
2979
2980
#: bzrlib/builtins.py:4766
2981
msgid "Do not save backups of reverted files."
2982
msgstr ""
2983
2984
#: bzrlib/builtins.py:4768
2985
msgid "Remove pending merge marker, without changing any files."
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4799
2989
msgid ""
2990
"Show help on a command or other topic.\n"
2991
" "
2992
msgstr ""
2993
"Hilfe zu einem Befehl oder Thema anzeigen.\n"
2994
" "
2995
2996
#: bzrlib/builtins.py:4804
2997
msgid "Show help on all commands."
2998
msgstr "Hilfe zu allen Befehlen anzeigen."
2999
3000
#: bzrlib/builtins.py:4833
3001
msgid "Show unmerged/unpulled revisions between two branches."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4835
3005
msgid "OTHER_BRANCH may be local or remote."
3006
msgstr ""
3007
3008
#: bzrlib/builtins.py:4837
3009
msgid ""
3010
"To filter on a range of revisions, you can use the command -r begin..end\n"
3011
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3012
"also valid.\n"
3013
" \n"
3014
":Exit values:\n"
3015
" 1 - some missing revisions\n"
3016
" 0 - no missing revisions"
3017
msgstr ""
3018
3019
#: bzrlib/builtins.py:4847
3020
msgid ""
3021
" Determine the missing revisions between this and the branch at the\n"
3022
" remembered pull location::"
3023
msgstr ""
3024
3025
#: bzrlib/builtins.py:4850
3026
msgid " bzr missing"
3027
msgstr " bzr missing"
3028
3029
#: bzrlib/builtins.py:4852
3030
msgid " Determine the missing revisions between this and another branch::"
3031
msgstr ""
3032
3033
#: bzrlib/builtins.py:4854
3034
msgid " bzr missing http://server/branch"
3035
msgstr ""
3036
3037
#: bzrlib/builtins.py:4856
3038
msgid ""
3039
" Determine the missing revisions up to a specific revision on the other\n"
3040
" branch::"
3041
msgstr ""
3042
3043
#: bzrlib/builtins.py:4859
3044
msgid " bzr missing -r ..-10"
3045
msgstr " bzr missing -r ..-10"
3046
3047
#: bzrlib/builtins.py:4861
3048
msgid ""
3049
" Determine the missing revisions up to a specific revision on this\n"
3050
" branch::"
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:4864
3054
msgid " bzr missing --my-revision ..-10"
3055
msgstr " bzr missing --my-revision ..-10"
3056
3057
#: bzrlib/builtins.py:4871
3058
msgid "Reverse the order of revisions."
3059
msgstr ""
3060
3061
#: bzrlib/builtins.py:4873
3062
msgid "Display changes in the local branch only."
3063
msgstr "Nur Änderungen im lokalen Zweig anzeigen."
3064
3065
#: bzrlib/builtins.py:4874
3066
msgid "Same as --mine-only."
3067
msgstr "Dasselbe wie --mine-only."
3068
3069
#: bzrlib/builtins.py:4876
3070
msgid "Display changes in the remote branch only."
3071
msgstr "Nur Änderungen im entfernten Zweig anzeigen."
3072
3073
#: bzrlib/builtins.py:4877
3074
msgid "Same as --theirs-only."
3075
msgstr "Dasselbe wie --theirs-only."
3076
3077
#: bzrlib/builtins.py:4882
3078
msgid ""
3079
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3080
"details."
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:4886
3084
msgid ""
3085
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3086
"details."
3087
msgstr ""
3088
3089
#: bzrlib/builtins.py:4889
3090
msgid "Show all revisions in addition to the mainline ones."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:4943
3094
msgid "No peer location known or specified."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:4947
3098
msgid "Using saved parent location: {0}\n"
3099
msgstr ""
3100
3101
#: bzrlib/builtins.py:4980
3102
#, python-format
3103
msgid "You have %d extra revision:\n"
3104
msgid_plural "You have %d extra revisions:\n"
3105
msgstr[0] "Sie haben %d zusätzliche Revision:\n"
3106
msgstr[1] "Sie haben %d zusätzliche Revisionen:\n"
3107
3108
#: bzrlib/builtins.py:4996
3109
#, python-format
3110
msgid "You are missing %d revision:\n"
3111
msgid_plural "You are missing %d revisions:\n"
3112
msgstr[0] "Ihnen fehlt %d Revision:\n"
3113
msgstr[1] "Ihnen fehlen %d Revisionen:\n"
3114
3115
#: bzrlib/builtins.py:5008
3116
msgid "This branch has no new revisions.\n"
3117
msgstr "Dieser Zweig hat keine neuen Revisionen.\n"
3118
3119
#: bzrlib/builtins.py:5011
3120
msgid "Other branch has no new revisions.\n"
3121
msgstr "Anderer Zweig hat keine neuen Revisionen.\n"
3122
3123
#: bzrlib/builtins.py:5016
3124
msgid "Branches are up to date.\n"
3125
msgstr "Zweige sind aktuell.\n"
3126
3127
#: bzrlib/builtins.py:5027
3128
msgid "Compress the data within a repository."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:5029
3132
msgid ""
3133
"This operation compresses the data within a bazaar repository. As\n"
3134
"bazaar supports automatic packing of repository, this operation is\n"
3135
"normally not required to be done manually."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:5033
3139
msgid ""
3140
"During the pack operation, bazaar takes a backup of existing repository\n"
3141
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3142
"automatically when it is safe to do so. To save disk space by removing\n"
3143
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3144
"used."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:5039
3148
msgid ""
3149
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3150
"during or immediately after repacking, you may be left with a state\n"
3151
"where the deletion has been written to disk but the new packs have not\n"
3152
"been. In this case the repository may be unusable."
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:5048
3156
msgid "Delete obsolete packs to save disk space."
3157
msgstr ""
3158
3159
#: bzrlib/builtins.py:5062
3160
msgid "List the installed plugins."
3161
msgstr "Installierte Erweiterungen auflisten."
3162
3163
#: bzrlib/builtins.py:5064
3164
msgid ""
3165
"This command displays the list of installed plugins including\n"
3166
"version of plugin and a short description of each."
3167
msgstr ""
3168
3169
#: bzrlib/builtins.py:5067
3170
msgid "--verbose shows the path where each plugin is located."
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:5069
3174
msgid ""
3175
"A plugin is an external component for Bazaar that extends the\n"
3176
"revision control system, by adding or replacing code in Bazaar.\n"
3177
"Plugins can do a variety of things, including overriding commands,\n"
3178
"adding new commands, providing additional network transports and\n"
3179
"customizing log output."
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:5075
3183
msgid ""
3184
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3185
"for further information on plugins including where to find them and how to\n"
3186
"install them. Instructions are also provided there on how to write new\n"
3187
"plugins using the Python programming language."
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:5091
3191
msgid "Show testament (signing-form) of a revision."
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5094
3195
msgid "Produce long-format testament."
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5096
3199
msgid "Produce a strict-format testament."
3200
msgstr ""
3201
3202
#: bzrlib/builtins.py:5122
3203
msgid "Show the origin of each line in a file."
3204
msgstr "Ursprung jeder Zeile in einer Datei anzeigen."
3205
3206
#: bzrlib/builtins.py:5124
3207
msgid ""
3208
"This prints out the given file with an annotation on the left side\n"
3209
"indicating which revision, author and date introduced the change."
3210
msgstr ""
3211
3212
#: bzrlib/builtins.py:5127
3213
msgid ""
3214
"If the origin is the same for a run of consecutive lines, it is\n"
3215
"shown only at the top, unless the --all option is given."
3216
msgstr ""
3217
3218
#: bzrlib/builtins.py:5135
3219
msgid "Show annotations on all lines."
3220
msgstr ""
3221
3222
#: bzrlib/builtins.py:5136
3223
msgid "Show commit date in annotations."
3224
msgstr ""
3225
3226
#: bzrlib/builtins.py:5223
3227
msgid "Cannot sign a range of non-revision-history revisions"
3228
msgstr ""
3229
3230
#: bzrlib/builtins.py:5235
3231
msgid "Please supply either one revision, or a range."
3232
msgstr "Bitte geben Sie entweder eine Revision oder einen Bereich an."
3233
3234
#: bzrlib/builtins.py:5239
3235
msgid ""
3236
"Convert the current branch into a checkout of the supplied branch.\n"
3237
"If no branch is supplied, rebind to the last bound location."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5242
3241
msgid ""
3242
"Once converted into a checkout, commits must succeed on the master branch\n"
3243
"before they will be applied to the local branch."
3244
msgstr ""
3245
3246
#: bzrlib/builtins.py:5245
3247
msgid ""
3248
"Bound branches use the nickname of its master branch unless it is set\n"
3249
"locally, in which case binding will update the local nickname to be\n"
3250
"that of the master."
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5260
3254
msgid "No location supplied. This format does not remember old locations."
3255
msgstr ""
3256
3257
#: bzrlib/builtins.py:5265
3258
msgid "Branch is already bound"
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:5267
3262
msgid "No location supplied and no previous location known"
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:5273
3266
msgid "These branches have diverged. Try merging, and then bind again."
3267
msgstr ""
3268
3269
#: bzrlib/builtins.py:5280
3270
msgid "Convert the current checkout into a regular branch."
3271
msgstr ""
3272
3273
#: bzrlib/builtins.py:5282
3274
msgid ""
3275
"After unbinding, the local branch is considered independent and subsequent\n"
3276
"commits will be local only."
3277
msgstr ""
3278
3279
#: bzrlib/builtins.py:5293
3280
msgid "Local branch is not bound"
3281
msgstr ""
3282
3283
#: bzrlib/builtins.py:5297
3284
msgid "Remove the last committed revision."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5299
3288
msgid ""
3289
"--verbose will print out what is being removed.\n"
3290
"--dry-run will go through all the motions, but not actually\n"
3291
"remove anything."
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:5303
3295
msgid ""
3296
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3297
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3298
"branch at revision 15."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5307
3302
msgid ""
3303
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3304
"it may make is to restore any pending merges that were present before\n"
3305
"the commit."
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:5318
3309
msgid "Don't actually make changes."
3310
msgstr "Keine Änderungen durchführen."
3311
3312
#: bzrlib/builtins.py:5319
3313
msgid "Say yes to all questions."
3314
msgstr "Alle Fragen mit Ja beantworten."
3315
3316
#: bzrlib/builtins.py:5321
3317
msgid "Keep tags that point to removed revisions."
3318
msgstr ""
3319
3320
#: bzrlib/builtins.py:5323
3321
msgid "Only remove the commits from the local branch when in a checkout."
3322
msgstr ""
3323
3324
#: bzrlib/builtins.py:5372
3325
msgid "No revisions to uncommit.\n"
3326
msgstr ""
3327
3328
#: bzrlib/builtins.py:5387
3329
msgid "Dry-run, pretending to remove the above revisions.\n"
3330
msgstr ""
3331
"Testlauf, es wird so getan, als ob die obigen Revisionen entfernt würden.\n"
3332
3333
#: bzrlib/builtins.py:5390
3334
msgid "The above revision(s) will be removed.\n"
3335
msgstr "Oben stehende Revision(en) wird/werden entfernt.\n"
3336
3337
#: bzrlib/builtins.py:5394
3338
msgid "Uncommit these revisions"
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5397
3342
msgid "Canceled\n"
3343
msgstr "Abgebrochen\n"
3344
3345
#: bzrlib/builtins.py:5404
3346
#, python-format
3347
msgid ""
3348
"You can restore the old tip by running:\n"
3349
" bzr pull . -r revid:%s\n"
3350
msgstr ""
3351
3352
#: bzrlib/builtins.py:5409
3353
msgid "Break a dead lock."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5411
3357
msgid ""
3358
"This command breaks a lock on a repository, branch, working directory or\n"
3359
"config file."
3360
msgstr ""
3361
3362
#: bzrlib/builtins.py:5414
3363
msgid ""
3364
"CAUTION: Locks should only be broken when you are sure that the process\n"
3365
"holding the lock has been stopped."
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5417
3369
msgid ""
3370
"You can get information on what locks are open via the 'bzr info\n"
3371
"[location]' command."
3372
msgstr ""
3373
3374
#: bzrlib/builtins.py:5420
3375
msgid ""
3376
":Examples:\n"
3377
" bzr break-lock\n"
3378
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3379
" bzr break-lock --conf ~/.bazaar"
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5429
3383
msgid "LOCATION is the directory where the config lock is."
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5431
3387
msgid "Do not ask for confirmation before breaking the lock."
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5466
3391
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3392
msgstr "Das Bazaar-Smart-Server-Protokoll via TCP. (Vorgabe-Port: 4155)"
3393
3394
#: bzrlib/builtins.py:5467
3395
msgid "Run the bzr server."
3396
msgstr "Den bzr-Server starten."
3397
3398
#: bzrlib/builtins.py:5473
3399
msgid "Serve on stdin/out for use from inetd or sshd."
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5474
3403
msgid "protocol"
3404
msgstr "Protokoll"
3405
3406
#: bzrlib/builtins.py:5475
3407
msgid "Protocol to serve."
3408
msgstr ""
3409
3410
#: bzrlib/builtins.py:5479
3411
msgid ""
3412
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3413
"Passing 0 as the port number will result in a dynamically allocated port. "
3414
"The default port depends on the protocol."
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5485
3418
msgid "Serve contents of this directory."
3419
msgstr ""
3420
3421
#: bzrlib/builtins.py:5487
3422
msgid ""
3423
"By default the server is a readonly server. Supplying --allow-writes "
3424
"enables write access to the contents of the served directory and below. "
3425
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3426
"of external authentication is arranged supplying this option leads to global "
3427
"uncontrolled write access to your file system."
3428
msgstr ""
3429
3430
#: bzrlib/builtins.py:5496
3431
msgid "Override the default idle client timeout (5min)."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5546
3435
msgid "Combine a tree into its containing tree."
3436
msgstr ""
3437
3438
#: bzrlib/builtins.py:5548
3439
msgid "This command requires the target tree to be in a rich-root format."
3440
msgstr ""
3441
3442
#: bzrlib/builtins.py:5550
3443
msgid ""
3444
"The TREE argument should be an independent tree, inside another tree, but\n"
3445
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3446
"running \"bzr branch\" with the target inside a tree.)"
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5554
3450
msgid ""
3451
"The result is a combined tree, with the subtree no longer an independent\n"
3452
"part. This is marked as a merge of the subtree into the containing tree,\n"
3453
"and all history is preserved."
3454
msgstr ""
3455
3456
#: bzrlib/builtins.py:5572
3457
#, python-format
3458
msgid ""
3459
"Can't join trees because %s doesn't support rich root data.\n"
3460
"You can use bzr upgrade on the repository."
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3464
msgid "Cannot join {0}. {1}"
3465
msgstr ""
3466
3467
#: bzrlib/builtins.py:5592
3468
msgid "Split a subdirectory of a tree into a separate tree."
3469
msgstr ""
3470
3471
#: bzrlib/builtins.py:5594
3472
msgid ""
3473
"This command will produce a target tree in a format that supports\n"
3474
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3475
"converted into earlier formats like 'dirstate-tags'."
3476
msgstr ""
3477
3478
#: bzrlib/builtins.py:5598
3479
msgid ""
3480
"The TREE argument should be a subdirectory of a working tree. That\n"
3481
"subdirectory will be converted into an independent tree, with its own\n"
3482
"branch. Commits in the top-level tree will not apply to the new subtree."
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:5678
3486
msgid "No submit branch specified or known"
3487
msgstr ""
3488
3489
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3490
msgid "No public branch specified or known"
3491
msgstr ""
3492
3493
#: bzrlib/builtins.py:5691
3494
msgid "bzr merge-directive takes at most two one revision identifiers"
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:5700
3498
msgid "No revisions to bundle."
3499
msgstr ""
3500
3501
#: bzrlib/builtins.py:5719
3502
msgid "Mail or create a merge-directive for submitting changes."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5721
3506
msgid "A merge directive provides many things needed for requesting merges:"
3507
msgstr ""
3508
3509
#: bzrlib/builtins.py:5723
3510
msgid "* A machine-readable description of the merge to perform"
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:5725
3514
msgid "* An optional patch that is a preview of the changes requested"
3515
msgstr ""
3516
"* Ein optionaler Patch, der eine Vorschau der gewünschten Änderungen "
3517
"darstellt"
3518
3519
#: bzrlib/builtins.py:5727
3520
msgid ""
3521
"* An optional bundle of revision data, so that the changes can be applied\n"
3522
" directly from the merge directive, without retrieving data from a\n"
3523
" branch."
3524
msgstr ""
3525
3526
#: bzrlib/builtins.py:5731
3527
msgid ""
3528
"`bzr send` creates a compact data set that, when applied using bzr\n"
3529
"merge, has the same effect as merging from the source branch. "
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:5734
3533
msgid ""
3534
"By default the merge directive is self-contained and can be applied to any\n"
3535
"branch containing submit_branch in its ancestory without needing access to\n"
3536
"the source branch."
3537
msgstr ""
3538
3539
#: bzrlib/builtins.py:5738
3540
msgid ""
3541
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3542
"revisions, but only a structured request to merge from the\n"
3543
"public_location. In that case the public_branch is needed and it must be\n"
3544
"up-to-date and accessible to the recipient. The public_branch is always\n"
3545
"included if known, so that people can check it later."
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5744
3549
msgid ""
3550
"The submit branch defaults to the parent of the source branch, but can be\n"
3551
"overridden. Both submit branch and public branch will be remembered in\n"
3552
"branch.conf the first time they are used for a particular branch. The\n"
3553
"source branch defaults to that containing the working directory, but can\n"
3554
"be changed using --from."
3555
msgstr ""
3556
3557
#: bzrlib/builtins.py:5750
3558
msgid ""
3559
"Both the submit branch and the public branch follow the usual behavior with\n"
3560
"respect to --remember: If there is no default location set, the first send\n"
3561
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3562
"omit the location to use the default. To change the default, use\n"
3563
"--remember. The value will only be saved if the location can be accessed."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5756
3567
msgid ""
3568
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3569
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3570
"If a public location is known for the submit_branch, that location is used\n"
3571
"in the merge directive."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5761
3575
msgid ""
3576
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3577
"given, in which case it is sent to a file."
3578
msgstr ""
3579
3580
#: bzrlib/builtins.py:5764
3581
msgid ""
3582
"Mail is sent using your preferred mail program. This should be transparent\n"
3583
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3584
"If the preferred client can't be found (or used), your editor will be used."
3585
msgstr ""
3586
3587
#: bzrlib/builtins.py:5768
3588
msgid ""
3589
"To use a specific mail program, set the mail_client configuration option.\n"
3590
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3591
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3592
"(MacOS X's\n"
3593
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3594
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3595
"add\n"
3596
"supported clients."
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5775
3600
msgid ""
3601
"If mail is being sent, a to address is required. This can be supplied\n"
3602
"either on the commandline, by setting the submit_to configuration\n"
3603
"option in the branch itself or the child_submit_to configuration option\n"
3604
"in the submit branch."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5780
3608
msgid ""
3609
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3610
"and\n"
3611
"merge directive format 2. It is significantly faster and smaller than\n"
3612
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3613
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3614
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5786
3618
msgid ""
3619
"The merge directives created by bzr send may be applied using bzr merge or\n"
3620
"bzr pull by specifying a file containing a merge directive as the location."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5789
3624
msgid ""
3625
"bzr send makes extensive use of public locations to map local locations "
3626
"into\n"
3627
"URLs that can be used by other people. See `bzr help configuration` to\n"
3628
"set them, and use `bzr info` to display them."
3629
msgstr ""
3630
3631
#: bzrlib/builtins.py:5813
3632
msgid "Write merge directive to this file or directory; use - for stdout."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5817
3636
msgid ""
3637
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3638
"strict disables the check."
3639
msgstr ""
3640
3641
#: bzrlib/builtins.py:5819
3642
msgid "Mail the request to this address."
3643
msgstr "Die Anfrage an diese Adresse schicken."
3644
3645
#: bzrlib/builtins.py:5823
3646
msgid "Body for the email."
3647
msgstr "Inhalt der E-Mail."
3648
3649
#: bzrlib/builtins.py:5876
3650
msgid "Do not include a bundle in the merge directive."
3651
msgstr ""
3652
3653
#: bzrlib/builtins.py:5877
3654
msgid "Do not include a preview patch in the merge directive."
3655
msgstr ""
3656
3657
#: bzrlib/builtins.py:5880
3658
msgid "Remember submit and public branch."
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5882
3662
msgid ""
3663
"Branch to generate the submission from, rather than the one containing the "
3664
"working directory."
3665
msgstr ""
3666
3667
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3668
msgid "format"
3669
msgstr "Format"
3670
3671
#: bzrlib/builtins.py:5893
3672
msgid "Use the specified output format."
3673
msgstr "Das angegebene Ausgabeformat benutzen."
3674
3675
#: bzrlib/builtins.py:5915
3676
msgid "Create, remove or modify a tag naming a revision."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5917
3680
msgid ""
3681
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3682
"(--revision) option can be given -rtag:X, where X is any previously\n"
3683
"created tag."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5921
3687
msgid ""
3688
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3689
"along when you branch, push, pull or merge."
3690
msgstr ""
3691
3692
#: bzrlib/builtins.py:5924
3693
msgid ""
3694
"It is an error to give a tag name that already exists unless you pass\n"
3695
"--force, in which case the tag is moved to point to the new revision."
3696
msgstr ""
3697
3698
#: bzrlib/builtins.py:5927
3699
msgid ""
3700
"To rename a tag (change the name but keep it on the same revsion), run "
3701
"``bzr\n"
3702
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:5930
3706
msgid ""
3707
"If no tag name is specified it will be determined through the \n"
3708
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3709
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3710
"details."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5940
3714
msgid "Delete this tag rather than placing it."
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:5943
3718
msgid "Branch in which to place the tag."
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:5945
3722
msgid "Replace existing tags."
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:5960
3726
msgid "No tag specified to delete."
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:5962
3730
#, python-format
3731
msgid "Deleted tag %s."
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:5976
3735
msgid "Please specify a tag name."
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:5984
3739
#, python-format
3740
msgid "Tag %s already exists for that revision."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:5988
3744
#, python-format
3745
msgid "Created tag %s."
3746
msgstr ""
3747
3748
#: bzrlib/builtins.py:5990
3749
#, python-format
3750
msgid "Updated tag %s."
3751
msgstr ""
3752
3753
#: bzrlib/builtins.py:5994
3754
msgid "List tags."
3755
msgstr ""
3756
3757
#: bzrlib/builtins.py:5996
3758
msgid ""
3759
"This command shows a table of tag names and the revisions they reference."
3760
msgstr ""
3761
3762
#: bzrlib/builtins.py:6002
3763
msgid "Branch whose tags should be displayed."
3764
msgstr ""
3765
3766
#: bzrlib/builtins.py:6004
3767
msgid "Sort tags by different criteria."
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:6004
3771
msgid "Sorting"
3772
msgstr "Sortierung"
3773
3774
#: bzrlib/builtins.py:6073
3775
msgid "Reconfigure the type of a bzr directory."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:6075
3779
msgid "A target configuration must be specified."
3780
msgstr "Es muss eine Zielkonfiguration angegeben werden."
3781
3782
#: bzrlib/builtins.py:6077
3783
msgid ""
3784
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3785
"The order of preference is\n"
3786
"1. For a lightweight checkout, the current bound location.\n"
3787
"2. For branches that used to be checkouts, the previously-bound location.\n"
3788
"3. The push location.\n"
3789
"4. The parent location.\n"
3790
"If none of these is available, --bind-to must be specified."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:6091
3794
msgid "Tree type"
3795
msgstr ""
3796
3797
#: bzrlib/builtins.py:6092
3798
msgid "The relation between branch and tree."
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:6094
3802
msgid "Reconfigure to be an unbound branch with no working tree."
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:6095
3806
msgid "Reconfigure to be an unbound branch with a working tree."
3807
msgstr ""
3808
3809
#: bzrlib/builtins.py:6096
3810
msgid "Reconfigure to be a bound branch with a working tree."
3811
msgstr ""
3812
3813
#: bzrlib/builtins.py:6097
3814
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:6102
3818
msgid "Repository type"
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:6103
3822
msgid "Location fo the repository."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:6105
3826
msgid ""
3827
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3828
msgstr ""
3829
3830
#: bzrlib/builtins.py:6107
3831
msgid "Reconfigure to use a shared repository."
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:6111
3835
msgid "Trees in Repository"
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:6112
3839
msgid "Whether new branches in the repository have trees."
3840
msgstr ""
3841
3842
#: bzrlib/builtins.py:6114
3843
msgid ""
3844
"Reconfigure repository to create working trees on branches by default."
3845
msgstr ""
3846
3847
#: bzrlib/builtins.py:6116
3848
msgid ""
3849
"Reconfigure repository to not create working trees on branches by default."
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6119
3853
msgid "Branch to bind checkout to."
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:6121
3857
msgid "Perform reconfiguration even if local changes will be lost."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6124
3861
msgid "Reconfigure a branch to be stacked on another branch."
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:6128
3865
msgid ""
3866
"Reconfigure a branch to be unstacked. This may require copying substantial "
3867
"data into it."
3868
msgstr ""
3869
3870
#: bzrlib/builtins.py:6138
3871
msgid "Can't use both --stacked-on and --unstacked"
3872
msgstr ""
3873
"Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
3874
3875
#: bzrlib/builtins.py:6152
3876
msgid "No target configuration specified"
3877
msgstr "Keine Zielkonfiguration angegeben"
3878
3879
#: bzrlib/builtins.py:6187
3880
msgid "Set the branch of a checkout and update."
3881
msgstr ""
3882
3883
#: bzrlib/builtins.py:6189
3884
msgid ""
3885
"For lightweight checkouts, this changes the branch being referenced.\n"
3886
"For heavyweight checkouts, this checks that there are no local commits\n"
3887
"versus the current bound branch, then it makes the local branch a mirror\n"
3888
"of the new location and binds to it."
3889
msgstr ""
3890
3891
#: bzrlib/builtins.py:6194
3892
msgid ""
3893
"In both cases, the working tree is updated and uncommitted changes\n"
3894
"are merged. The user can commit or revert these as they desire."
3895
msgstr ""
3896
3897
#: bzrlib/builtins.py:6197
3898
msgid "Pending merges need to be committed or reverted before using switch."
3899
msgstr ""
3900
3901
#: bzrlib/builtins.py:6199
3902
msgid ""
3903
"The path to the branch to switch to can be specified relative to the parent\n"
3904
"directory of the current branch. For example, if you are currently in a\n"
3905
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3906
"/path/to/newbranch."
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:6204
3910
msgid ""
3911
"Bound branches use the nickname of its master branch unless it is set\n"
3912
"locally, in which case switching will update the local nickname to be\n"
3913
"that of the master."
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6212
3917
msgid "Switch even if local commits will be lost."
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6215
3921
msgid "Create the target branch from this one before switching to it."
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6229
3925
msgid "You must supply either a revision or a location"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6242
3929
msgid "cannot create branch without source branch"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6262
3933
msgid "Manage filtered views."
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6264
3937
msgid ""
3938
"Views provide a mask over the tree so that users can focus on\n"
3939
"a subset of a tree when doing their work. After creating a view,\n"
3940
"commands that support a list of files - status, diff, commit, etc -\n"
3941
"effectively have that list of files implicitly given each time.\n"
3942
"An explicit list of files can still be given but those files\n"
3943
"must be within the current view."
3944
msgstr ""
3945
3946
#: bzrlib/builtins.py:6271
3947
msgid ""
3948
"In most cases, a view has a short life-span: it is created to make\n"
3949
"a selected change and is deleted once that change is committed.\n"
3950
"At other times, you may wish to create one or more named views\n"
3951
"and switch between them."
3952
msgstr ""
3953
3954
#: bzrlib/builtins.py:6276
3955
msgid ""
3956
"To disable the current view without deleting it, you can switch to\n"
3957
"the pseudo view called ``off``. This can be useful when you need\n"
3958
"to see the whole tree for an operation or two (e.g. merge) but\n"
3959
"want to switch back to your view after that."
3960
msgstr ""
3961
3962
#: bzrlib/builtins.py:6281
3963
msgid ""
3964
":Examples:\n"
3965
" To define the current view::"
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6284
3969
msgid " bzr view file1 dir1 ..."
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6286
3973
msgid " To list the current view::"
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6288
3977
msgid " bzr view"
3978
msgstr " bzr view"
3979
3980
#: bzrlib/builtins.py:6290
3981
msgid " To delete the current view::"
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6292
3985
msgid " bzr view --delete"
3986
msgstr " bzr view --delete"
3987
3988
#: bzrlib/builtins.py:6294
3989
msgid " To disable the current view without deleting it::"
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6296
3993
msgid " bzr view --switch off"
3994
msgstr " bzr view --switch off"
3995
3996
#: bzrlib/builtins.py:6298
3997
msgid " To define a named view and switch to it::"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6300
4001
msgid " bzr view --name view-name file1 dir1 ..."
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6302
4005
msgid " To list a named view::"
4006
msgstr ""
4007
4008
#: bzrlib/builtins.py:6304
4009
msgid " bzr view --name view-name"
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6306
4013
msgid " To delete a named view::"
4014
msgstr ""
4015
4016
#: bzrlib/builtins.py:6308
4017
msgid " bzr view --name view-name --delete"
4018
msgstr ""
4019
4020
#: bzrlib/builtins.py:6310
4021
msgid " To switch to a named view::"
4022
msgstr ""
4023
4024
#: bzrlib/builtins.py:6312
4025
msgid " bzr view --switch view-name"
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6314
4029
msgid " To list all views defined::"
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6316
4033
msgid " bzr view --all"
4034
msgstr " bzr view --all"
4035
4036
#: bzrlib/builtins.py:6318
4037
msgid " To delete all views::"
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6320
4041
msgid " bzr view --delete --all"
4042
msgstr " bzr view --delete --all"
4043
4044
#: bzrlib/builtins.py:6327
4045
msgid "Apply list or delete action to all views."
4046
msgstr ""
4047
4048
#: bzrlib/builtins.py:6330
4049
msgid "Delete the view."
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6333
4053
msgid "Name of the view to define, list or delete."
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:6337
4057
msgid "Name of the view to switch to."
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6356
4061
msgid "Both --delete and a file list specified"
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:6359
4065
msgid "Both --delete and --switch specified"
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6362
4069
msgid "Deleted all views.\n"
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6364
4073
msgid "No current view to delete"
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6367
4077
#, python-format
4078
msgid "Deleted '%s' view.\n"
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6371
4082
msgid "Both --switch and a file list specified"
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6374
4086
msgid "Both --switch and --all specified"
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6377
4090
msgid "No current view to disable"
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6379
4094
#, python-format
4095
msgid "Disabled '%s' view.\n"
4096
msgstr ""
4097
4098
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4099
msgid "Using '{0}' view: {1}\n"
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:6386
4103
msgid "Views defined:\n"
4104
msgstr ""
4105
4106
#: bzrlib/builtins.py:6395
4107
msgid "No views defined.\n"
4108
msgstr ""
4109
4110
#: bzrlib/builtins.py:6402
4111
msgid "Cannot change the 'off' pseudo view"
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:6410
4115
msgid "No current view.\n"
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6413
4119
msgid "'{0}' view is: {1}\n"
4120
msgstr ""
4121
4122
#: bzrlib/builtins.py:6433
4123
msgid " <no hooks installed>\n"
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6437
4127
msgid "Remove a branch."
4128
msgstr "Einen Zweig entfernen."
4129
4130
#: bzrlib/builtins.py:6439
4131
msgid ""
4132
"This will remove the branch from the specified location but \n"
4133
"will keep any working tree or repository in place."
4134
msgstr ""
4135
4136
#: bzrlib/builtins.py:6444
4137
msgid " Remove the branch at repo/trunk::"
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6446
4141
msgid " bzr remove-branch repo/trunk"
4142
msgstr " bzr remove-branch repo/trunk"
4143
4144
#: bzrlib/builtins.py:6461
4145
msgid "Plaintext diff output."
4146
msgstr ""
4147
4148
#: bzrlib/builtins.py:6462
4149
msgid "Temporarily set aside some changes from the current tree."
4150
msgstr ""
4151
4152
#: bzrlib/builtins.py:6464
4153
msgid ""
4154
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4155
"ie. out of the way, until a later time when you can bring them back from\n"
4156
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4157
"your working tree, and so they aren't propagated along with your branch nor\n"
4158
"will they survive its deletion."
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:6470
4162
msgid "If shelve --list is specified, previously-shelved changes are listed."
4163
msgstr ""
4164
4165
#: bzrlib/builtins.py:6472
4166
msgid ""
4167
"Shelve is intended to help separate several sets of changes that have\n"
4168
"been inappropriately mingled. If you just want to get rid of all changes\n"
4169
"and you don't need to restore them later, use revert. If you want to\n"
4170
"shelve all text changes at once, use shelve --all."
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6477
4174
msgid ""
4175
"If filenames are specified, only the changes to those files will be\n"
4176
"shelved. Other files will be left untouched."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:6480
4180
msgid ""
4181
"If a revision is specified, changes since that revision will be shelved."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6482
4185
msgid ""
4186
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4187
"restore the most recently shelved changes."
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6485
4191
msgid ""
4192
"For complicated changes, it is possible to edit the changes in a separate\n"
4193
"editor program to decide what the file remaining in the working copy\n"
4194
"should look like. To do this, add the configuration option"
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6489
4198
msgid " change_editor = PROGRAM @new_path @old_path"
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6491
4202
msgid ""
4203
"where @new_path is replaced with the path of the new version of the \n"
4204
"file and @old_path is replaced with the path of the old version of \n"
4205
"the file. The PROGRAM should save the new file with the desired \n"
4206
"contents of the file in the working tree.\n"
4207
" "
4208
msgstr ""
4209
4210
#: bzrlib/builtins.py:6503
4211
msgid "Shelve all changes."
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6505
4215
msgid "Method to use for writing diffs."
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6505
4219
msgid "writer"
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6509
4223
msgid "List shelved changes."
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6511
4227
msgid "Destroy removed changes instead of shelving them."
4228
msgstr ""
4229
4230
#: bzrlib/builtins.py:6540
4231
msgid "No shelved changes."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6551
4235
msgid "Restore shelved changes."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6553
4239
msgid ""
4240
"By default, the most recently shelved changes are restored. However if you\n"
4241
"specify a shelf by id those changes will be restored instead. This works\n"
4242
"best when the changes don't depend on each other."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6562
4246
msgid "The action to perform."
4247
msgstr "Die auszuführende Aktion."
4248
4249
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4250
msgid "action"
4251
msgstr "Aktion"
4252
4253
#: bzrlib/builtins.py:6564
4254
msgid "Apply changes and remove from the shelf."
4255
msgstr ""
4256
4257
#: bzrlib/builtins.py:6565
4258
msgid "Show changes, but do not apply or remove them."
4259
msgstr "Änderungen anzeigen, aber nicht anwenden oder entfernen."
4260
4261
#: bzrlib/builtins.py:6566
4262
msgid ""
4263
"Instead of unshelving the changes, show the diff that would result from "
4264
"unshelving."
4265
msgstr ""
4266
4267
#: bzrlib/builtins.py:6568
4268
msgid "Delete changes without applying them."
4269
msgstr "Änderungen löschen ohne diese anzuwenden."
4270
4271
#: bzrlib/builtins.py:6569
4272
msgid "Apply changes but don't delete them."
4273
msgstr "Änderungen anwenden, aber diese nicht löschen."
4274
4275
#: bzrlib/builtins.py:6584
4276
msgid "Remove unwanted files from working tree."
4277
msgstr ""
4278
4279
#: bzrlib/builtins.py:6586
4280
msgid ""
4281
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4282
"files are never deleted."
4283
msgstr ""
4284
4285
#: bzrlib/builtins.py:6589
4286
msgid ""
4287
"Another class is 'detritus', which includes files emitted by bzr during\n"
4288
"normal operations and selftests. (The value of these files decreases with\n"
4289
"time.)"
4290
msgstr ""
4291
4292
#: bzrlib/builtins.py:6593
4293
msgid ""
4294
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4295
"flags are respected, and may be combined."
4296
msgstr ""
4297
4298
#: bzrlib/builtins.py:6596
4299
msgid "To check what clean-tree will do, use --dry-run."
4300
msgstr "Um zu prüfen, was clean-tree tun wird, --dry-run benutzen."
4301
4302
#: bzrlib/builtins.py:6599
4303
msgid "Delete all ignored files."
4304
msgstr "Alle ignorierten Dateien löschen."
4305
4306
#: bzrlib/builtins.py:6600
4307
msgid ""
4308
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4309
msgstr ""
4310
4311
#: bzrlib/builtins.py:6603
4312
msgid "Delete files unknown to bzr (default)."
4313
msgstr "Dateien löschen, die bzr nicht bekannt sind (Vorgabe)."
4314
4315
#: bzrlib/builtins.py:6604
4316
msgid "Show files to delete instead of deleting them."
4317
msgstr "Dateien zum Löschen anzeigen, anstelle diese zu löschen."
4318
4319
#: bzrlib/builtins.py:6606
4320
msgid "Do not prompt before deleting."
4321
msgstr "Vor dem Löschen nicht nachfragen."
4322
4323
#: bzrlib/bundle/__init__.py:59
4324
msgid "A directory cannot be a bundle"
4325
msgstr ""
4326
4327
#: bzrlib/bundle/apply_bundle.py:40
4328
msgid "Install revisions"
4329
msgstr "Revisionen installieren"
4330
4331
#: bzrlib/bundle/commands.py:64
4332
msgid "--verbose requires a merge directive"
4333
msgstr ""
4334
4335
#: bzrlib/bundle/commands.py:67
4336
msgid "Bundle format not supported"
4337
msgstr ""
4338
4339
#: bzrlib/bundle/commands.py:77
4340
msgid "Records\n"
4341
msgstr ""
4342
4343
#: bzrlib/bundle/commands.py:81
4344
msgid "{0}: {1} ({2} multiparent)\n"
4345
msgstr ""
4346
4347
#: bzrlib/bundle/commands.py:83
4348
#, python-format
4349
msgid "unique files: %d\n"
4350
msgstr ""
4351
4352
#: bzrlib/bundle/commands.py:92
4353
msgid "Revisions\n"
4354
msgstr "Revisionen\n"
4355
4356
#: bzrlib/bundle/commands.py:93
4357
#, python-format
4358
msgid "nicks: %s\n"
4359
msgstr ""
4360
4361
#: bzrlib/bundle/commands.py:95
4362
#, python-format
4363
msgid ""
4364
"committers: \n"
4365
"%s\n"
4366
msgstr ""
4367
4368
#: bzrlib/bundle/commands.py:103
4369
msgid "Decoded contents\n"
4370
msgstr ""
4371
4372
#: bzrlib/bundle/serializer/v4.py:327
4373
#, python-format
4374
msgid "Bundling %d revision."
4375
msgid_plural "Bundling %d revisions."
4376
msgstr[0] ""
4377
msgstr[1] ""
4378
4379
#: bzrlib/bzrdir.py:490
4380
msgid ""
4381
"making backup of {0}\n"
4382
" to {1}"
4383
msgstr ""
4384
4385
#: bzrlib/bzrdir.py:513
4386
msgid "renamed {0} to {1}"
4387
msgstr "{0} wurde in {1} umbenannt"
4388
4389
#: bzrlib/bzrdir.py:1652
4390
#, python-format
4391
msgid ""
4392
"Source repository format does not support stacking, using format:\n"
4393
" %s"
4394
msgstr ""
4395
4396
#: bzrlib/bzrdir.py:1672
4397
#, python-format
4398
msgid ""
4399
"Source branch format does not support stacking, using format:\n"
4400
" %s"
4401
msgstr ""
4402
4403
#: bzrlib/bzrdir.py:1818
4404
msgid "starting repository conversion"
4405
msgstr ""
4406
4407
#: bzrlib/bzrdir.py:2039
4408
msgid "Using default stacking branch {0} at {1}"
4409
msgstr ""
4410
4411
#: bzrlib/check.py:108
4412
msgid "check"
4413
msgstr ""
4414
4415
#: bzrlib/check.py:110
4416
msgid "checking revisions"
4417
msgstr "Revisionen prüfen"
4418
4419
#: bzrlib/check.py:112
4420
msgid "checking commit contents"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:114
4424
msgid "checking file graphs"
4425
msgstr ""
4426
4427
#: bzrlib/check.py:118
4428
msgid "checking branches and trees"
4429
msgstr ""
4430
4431
#: bzrlib/check.py:205
4432
msgid "checked repository {0} format {1}"
4433
msgstr ""
4434
4435
#: bzrlib/check.py:208
4436
#, python-format
4437
msgid "%6d revisions"
4438
msgstr "%6d Revisionen"
4439
4440
#: bzrlib/check.py:209
4441
#, python-format
4442
msgid "%6d file-ids"
4443
msgstr ""
4444
4445
#: bzrlib/check.py:211
4446
#, python-format
4447
msgid "%6d unreferenced text versions"
4448
msgstr ""
4449
4450
#: bzrlib/check.py:215
4451
msgid "unreferenced version: {{{0}}} in {1}"
4452
msgstr ""
4453
4454
#: bzrlib/check.py:218
4455
#, python-format
4456
msgid "%6d revisions are missing inventory_sha1"
4457
msgstr ""
4458
4459
#: bzrlib/check.py:221
4460
#, python-format
4461
msgid "%6d revisions are mentioned but not present"
4462
msgstr ""
4463
4464
#: bzrlib/check.py:224
4465
#, python-format
4466
msgid "%6d ghost revisions"
4467
msgstr "%6d Geister-Revisionen"
4468
4469
#: bzrlib/check.py:229
4470
#, python-format
4471
msgid "%6d revisions missing parents in ancestry"
4472
msgstr ""
4473
4474
#: bzrlib/check.py:233
4475
#, python-format
4476
msgid " %s should be in the ancestry for:"
4477
msgstr ""
4478
4479
#: bzrlib/check.py:237
4480
#, python-format
4481
msgid "%6d inconsistent parents"
4482
msgstr ""
4483
4484
#: bzrlib/check.py:241
4485
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4486
msgstr ""
4487
4488
#: bzrlib/check.py:247
4489
#, python-format
4490
msgid "%6d revisions have incorrect parents in the revision index"
4491
msgstr ""
4492
4493
#: bzrlib/check.py:253
4494
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4495
msgstr ""
4496
4497
#: bzrlib/check.py:267
4498
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4499
msgstr ""
4500
4501
#: bzrlib/check.py:296
4502
msgid ""
4503
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4504
"{{{4}}}"
4505
msgstr ""
4506
4507
#: bzrlib/check.py:354
4508
#, python-format
4509
msgid "Checking branch at '%s'."
4510
msgstr "Zweig wird geprüft bei »%s«."
4511
4512
#: bzrlib/check.py:374
4513
#, python-format
4514
msgid "Checking working tree at '%s'."
4515
msgstr ""
4516
4517
#: bzrlib/check.py:427 bzrlib/check.py:441
4518
msgid "No branch found at specified location."
4519
msgstr ""
4520
4521
#: bzrlib/check.py:429 bzrlib/check.py:439
4522
msgid "No working tree found at specified location."
4523
msgstr ""
4524
4525
#: bzrlib/check.py:432
4526
#, python-format
4527
msgid "Checking repository at '%s'."
4528
msgstr ""
4529
4530
#: bzrlib/check.py:443
4531
msgid "No repository found at specified location."
4532
msgstr ""
4533
4534
#: bzrlib/clean_tree.py:63
4535
msgid "Nothing to delete."
4536
msgstr "Nichts zu löschen."
4537
4538
#: bzrlib/clean_tree.py:68
4539
msgid "Are you sure you wish to delete these"
4540
msgstr "Sind Sie sicher, dass Sie diese löschen möchten"
4541
4542
#: bzrlib/clean_tree.py:70
4543
msgid "Canceled"
4544
msgstr "Abgebrochen"
4545
4546
#: bzrlib/clean_tree.py:107
4547
#, python-format
4548
msgid "unable to remove %s"
4549
msgstr "%s kann nicht entfernt werden"
4550
4551
#: bzrlib/clean_tree.py:111
4552
msgid "deleting paths:"
4553
msgstr "Pfade werden gelöscht:"
4554
4555
#: bzrlib/clean_tree.py:125
4556
msgid "unable to remove \"{0}\": {1}."
4557
msgstr "»{0}« kann nicht entfernt werden: {1}."
4558
4559
#: bzrlib/clean_tree.py:130
4560
msgid "No files deleted."
4561
msgstr "Keine Dateien gelöscht."
4562
4563
#: bzrlib/cmd_version_info.py:47
4564
msgid "No known version info format {0}. Supported types are: {1}"
4565
msgstr ""
4566
"Unbekanntes Format {0} für Versionsinformationen. Unterstützte Typen sind: "
4567
"{1}"
4568
4569
#: bzrlib/cmd_version_info.py:52
4570
msgid "Version info in Custom template-based format."
4571
msgstr ""
4572
4573
#: bzrlib/cmd_version_info.py:52
4574
msgid "Version info in Python format."
4575
msgstr "Versionsinformationen im Python-Format."
4576
4577
#: bzrlib/cmd_version_info.py:52
4578
msgid "Version info in RIO (simple text) format (default)."
4579
msgstr "Versionsinformationen im RIO (nur Text)-Format (Vorgabe)."
4580
4581
#: bzrlib/cmd_version_info.py:53
4582
msgid "Show version information about this tree."
4583
msgstr ""
4584
4585
#: bzrlib/cmd_version_info.py:55
4586
msgid ""
4587
"You can use this command to add information about version into\n"
4588
"source code of an application. The output can be in one of the\n"
4589
"supported formats or in a custom format based on a template."
4590
msgstr ""
4591
4592
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4593
#: en/help_topics/configuration.txt:710
4594
msgid "For example::"
4595
msgstr "Zum Beispiel:"
4596
4597
#: bzrlib/cmd_version_info.py:61
4598
msgid ""
4599
" bzr version-info --custom \\\n"
4600
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4601
msgstr ""
4602
4603
#: bzrlib/cmd_version_info.py:64
4604
msgid ""
4605
"will produce a C header file with formatted string containing the\n"
4606
"current revision number. Other supported variables in templates are:"
4607
msgstr ""
4608
4609
#: bzrlib/cmd_version_info.py:67
4610
msgid ""
4611
" * {date} - date of the last revision\n"
4612
" * {build_date} - current date\n"
4613
" * {revno} - revision number\n"
4614
" * {revision_id} - revision id\n"
4615
" * {branch_nick} - branch nickname\n"
4616
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4617
" otherwise 1"
4618
msgstr ""
4619
4620
#: bzrlib/cmd_version_info.py:77
4621
msgid "Select the output format."
4622
msgstr "Wählen Sie das Ausgabeformat."
4623
4624
#: bzrlib/cmd_version_info.py:81
4625
msgid "Include all possible information."
4626
msgstr "Sämtliche verfügbaren Informationen einschließen."
4627
4628
#: bzrlib/cmd_version_info.py:82
4629
msgid "Check if tree is clean."
4630
msgstr ""
4631
4632
#: bzrlib/cmd_version_info.py:84
4633
msgid "Include the revision-history."
4634
msgstr "Revisionsverlauf einschließen."
4635
4636
#: bzrlib/cmd_version_info.py:86
4637
msgid "Include the last revision for each file."
4638
msgstr "Neueste Revision jeder Datei einschließen."
4639
4640
#: bzrlib/cmd_version_info.py:87
4641
msgid "Template for the output."
4642
msgstr ""
4643
4644
#: bzrlib/cmd_version_info.py:101
4645
msgid "bzr version-info --revision takes exactly one revision specifier"
4646
msgstr ""
4647
4648
#: bzrlib/commands.py:229
4649
#, python-format
4650
msgid "unknown command \"%s\""
4651
msgstr "Unbekannter Befehl »%s«"
4652
4653
#: bzrlib/commands.py:476
4654
msgid "No help for this command."
4655
msgstr "Keine Hilfe zu diesem Befehl verfügbar."
4656
4657
#: bzrlib/commands.py:489
4658
#, python-format
4659
msgid ":Purpose: %s\n"
4660
msgstr ":Zweck: %s\n"
4661
4662
#: bzrlib/commands.py:491
4663
#, python-format
4664
msgid ""
4665
":Usage:\n"
4666
"%s\n"
4667
msgstr ""
4668
":Aufruf:\n"
4669
"%s\n"
4670
4671
#: bzrlib/commands.py:493
4672
#, python-format
4673
msgid ":Usage: %s\n"
4674
msgstr ":Aufruf: %s\n"
4675
4676
#: bzrlib/commands.py:512
4677
#, python-format
4678
msgid ":Options:%s"
4679
msgstr ":Optionen: %s"
4680
4681
#: bzrlib/commands.py:523
4682
#, python-format
4683
msgid ""
4684
":Description:\n"
4685
" %s\n"
4686
"\n"
4687
msgstr ""
4688
":Beschreibung:\n"
4689
" %s\n"
4690
"\n"
4691
4692
#: bzrlib/commands.py:533
4693
#, python-format
4694
msgid ""
4695
"See bzr help %s for more details and examples.\n"
4696
"\n"
4697
msgstr ""
4698
4699
#: bzrlib/commands.py:538
4700
msgid ":Aliases: "
4701
msgstr ":Aliase: "
4702
4703
#: bzrlib/commands.py:542
4704
#, python-format
4705
msgid ":From: plugin \"%s\"\n"
4706
msgstr ":Von: Erweiterung »%s«\n"
4707
4708
#: bzrlib/commands.py:554
4709
msgid ":doc:`{0} <{1}-help>`"
4710
msgstr ""
4711
4712
#: bzrlib/commands.py:558
4713
#, python-format
4714
msgid ":See also: %s"
4715
msgstr ":Siehe auch: %s"
4716
4717
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4718
msgid "Only ASCII permitted in option names"
4719
msgstr ""
4720
4721
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4722
msgid "command {0!r} needs one or more {1}"
4723
msgstr ""
4724
4725
#: bzrlib/commands.py:858
4726
msgid "command {0!r} requires argument {1}"
4727
msgstr ""
4728
4729
#: bzrlib/commands.py:865
4730
msgid "extra argument to command {0}: {1}"
4731
msgstr ""
4732
4733
#: bzrlib/commands.py:962
4734
#, python-format
4735
msgid "Profile data written to \"%s\"."
4736
msgstr ""
4737
4738
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4739
msgid "added"
4740
msgstr "Hinzugefügt"
4741
4742
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4743
msgid "modified"
4744
msgstr "Geändert"
4745
4746
#: bzrlib/commit.py:131
4747
#, python-format
4748
msgid "Committing%s"
4749
msgstr ""
4750
4751
#: bzrlib/commit.py:134
4752
#, python-format
4753
msgid "Committed revision %d."
4754
msgstr ""
4755
4756
#: bzrlib/commit.py:143
4757
#, python-format
4758
msgid "deleted %s"
4759
msgstr "%s gelöscht"
4760
4761
#: bzrlib/commit.py:146
4762
#, python-format
4763
msgid "missing %s"
4764
msgstr "%s fehlt"
4765
4766
#: bzrlib/commit.py:511
4767
msgid ""
4768
"Conflicting tags in bound branch:\n"
4769
"{0}"
4770
msgstr ""
4771
4772
#: bzrlib/commit.py:742
4773
msgid "renamed"
4774
msgstr "Umbenannt"
4775
4776
#: bzrlib/commit.py:977
4777
msgid "unchanged"
4778
msgstr "Ungeändert"
4779
4780
#: bzrlib/commit.py:999
4781
msgid "{0} [{1}] - Stage"
4782
msgstr ""
4783
4784
#: bzrlib/commit.py:1002
4785
#, python-format
4786
msgid "%s - Stage"
4787
msgstr ""
4788
4789
#: bzrlib/commit_signature_commands.py:36
4790
msgid "Sign all commits by a given committer."
4791
msgstr ""
4792
4793
#: bzrlib/commit_signature_commands.py:38
4794
msgid ""
4795
"If location is not specified the local tree is used.\n"
4796
"If committer is not specified the default committer is used."
4797
msgstr ""
4798
4799
#: bzrlib/commit_signature_commands.py:41
4800
msgid "This does not sign commits that already have signatures."
4801
msgstr ""
4802
4803
#: bzrlib/commit_signature_commands.py:49
4804
msgid ""
4805
"Don't actually sign anything, just print the revisions that would be signed."
4806
msgstr ""
4807
4808
#: bzrlib/commit_signature_commands.py:103
4809
msgid "Verify all commit signatures."
4810
msgstr ""
4811
4812
#: bzrlib/commit_signature_commands.py:105
4813
msgid ""
4814
"Verifies that all commits in the branch are signed by known GnuPG keys."
4815
msgstr ""
4816
4817
#: bzrlib/commit_signature_commands.py:110
4818
msgid ""
4819
"Comma separated list of GPG key patterns which are acceptable for "
4820
"verification."
4821
msgstr ""
4822
4823
#: bzrlib/commit_signature_commands.py:147
4824
msgid "Cannot verify a range of non-revision-history revisions"
4825
msgstr ""
4826
4827
#: bzrlib/commit_signature_commands.py:168
4828
msgid "All commits signed with verifiable keys"
4829
msgstr ""
4830
4831
#: bzrlib/config.py:475
4832
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4833
msgstr ""
4834
4835
#: bzrlib/config.py:2485
4836
msgid "{0} is not an SI unit."
4837
msgstr ""
4838
4839
#: bzrlib/config.py:2949
4840
msgid ""
4841
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4842
"will be saved."
4843
msgstr ""
4844
4845
#: bzrlib/config.py:3093
4846
#, python-format
4847
msgid "Invalid '%s', should be of the form 'name=value'"
4848
msgstr ""
4849
4850
#: bzrlib/config.py:3962
4851
msgid "Display, set or remove a configuration option."
4852
msgstr "Eine Konfigurationsoption anzeigen, festlegen oder löschen."
4853
4854
#: bzrlib/config.py:3964
4855
msgid "Display the active value for a given option."
4856
msgstr "Aktiven Wert zur angegebenen Option anzeigen."
4857
4858
#: bzrlib/config.py:3966
4859
msgid ""
4860
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4861
"matching options are displayed mentioning their scope. The active value\n"
4862
"that bzr will take into account is the first one displayed for each option."
4863
msgstr ""
4864
4865
#: bzrlib/config.py:3970
4866
msgid "If no NAME is given, --all .* is implied."
4867
msgstr ""
4868
4869
#: bzrlib/config.py:3972
4870
msgid ""
4871
"Setting a value is achieved by using name=value without spaces. The value\n"
4872
"is set in the most relevant scope and can be checked by displaying the\n"
4873
"option again."
4874
msgstr ""
4875
4876
#: bzrlib/config.py:3984
4877
msgid "Reduce the scope to the specified configuration file."
4878
msgstr ""
4879
4880
#: bzrlib/config.py:3988
4881
msgid "Display all the defined values for the matching options."
4882
msgstr "Alle definierten Werte für die zutreffenden Optionen anzeigen."
4883
4884
#: bzrlib/config.py:3990
4885
msgid "Remove the option from the configuration file."
4886
msgstr "Die Option aus der Konfigurationsdatei entfernen."
4887
4888
#: bzrlib/conflicts.py:50
4889
msgid "List files with conflicts."
4890
msgstr "In Konflikt stehende Dateien auflisten."
4891
4892
#: bzrlib/conflicts.py:57
4893
msgid ""
4894
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4895
"is supplied, the pathnames of files with text conflicts are listed,\n"
4896
"instead. (This is useful for editing all files with text conflicts.)"
4897
msgstr ""
4898
4899
#: bzrlib/conflicts.py:61
4900
msgid "Use bzr resolve when you have fixed a problem."
4901
msgstr "Benutzen Sie bzr resolve, wenn Sie ein Problem gelöst haben."
4902
4903
#: bzrlib/conflicts.py:66
4904
msgid "List paths of files with text conflicts."
4905
msgstr ""
4906
4907
#: bzrlib/conflicts.py:85
4908
msgid "Marks the conflict as resolved."
4909
msgstr ""
4910
4911
#: bzrlib/conflicts.py:88
4912
msgid "Resolve the conflict preserving the version in the working tree."
4913
msgstr ""
4914
4915
#: bzrlib/conflicts.py:91
4916
msgid "Resolve the conflict taking the merged version into account."
4917
msgstr ""
4918
4919
#: bzrlib/conflicts.py:98
4920
msgid "How to resolve the conflict."
4921
msgstr ""
4922
4923
#: bzrlib/conflicts.py:104
4924
msgid "Mark a conflict as resolved."
4925
msgstr ""
4926
4927
#: bzrlib/conflicts.py:111
4928
msgid ""
4929
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4930
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4931
"as\n"
4932
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4933
msgstr ""
4934
4935
#: bzrlib/conflicts.py:119
4936
msgid "Resolve all conflicts in this tree."
4937
msgstr ""
4938
4939
#: bzrlib/conflicts.py:126
4940
msgid "If --all is specified, no FILE may be provided"
4941
msgstr ""
4942
4943
#: bzrlib/conflicts.py:151
4944
#, python-format
4945
msgid "%d conflict auto-resolved."
4946
msgid_plural "%d conflicts auto-resolved."
4947
msgstr[0] ""
4948
msgstr[1] ""
4949
4950
#: bzrlib/conflicts.py:154
4951
msgid "Remaining conflicts:"
4952
msgstr "Verbleibende Konflikte:"
4953
4954
#: bzrlib/conflicts.py:159
4955
msgid "All conflicts resolved."
4956
msgstr ""
4957
4958
#: bzrlib/conflicts.py:168
4959
msgid "{0} conflict resolved, {1} remaining"
4960
msgid_plural "{0} conflicts resolved, {1} remaining"
4961
msgstr[0] ""
4962
msgstr[1] ""
4963
4964
#: bzrlib/controldir.py:710
4965
msgid "{0} is{1} redirected to {2}"
4966
msgstr ""
4967
4968
#: bzrlib/diff.py:399
4969
#, python-format
4970
msgid "*** Ignoring files outside view. View is %s"
4971
msgstr ""
4972
4973
#: bzrlib/errors.py:157
4974
msgid "The tree builder is already building a tree."
4975
msgstr ""
4976
4977
#: bzrlib/errors.py:178
4978
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4979
msgstr ""
4980
4981
#: bzrlib/errors.py:197
4982
msgid ""
4983
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4984
"versions \"%(minimum)s\" to \"%(current)s\"."
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:209
4988
msgid "The transport '%(transport)s' is only accessible within this process."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:227
4992
msgid "Invalid revision number %(revno)s"
4993
msgstr "Ungültige Revisionsnummer %(revno)s"
4994
4995
#: bzrlib/errors.py:236
4996
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4997
msgstr ""
4998
4999
#: bzrlib/errors.py:247
5000
msgid "Reserved revision-id {%(revision_id)s}"
5001
msgstr ""
5002
5003
#: bzrlib/errors.py:261
5004
msgid "There is no public branch set for \"%(branch_url)s\"."
5005
msgstr "Kein öffentlicher Zweig für »%(branch_url)s« festgelegt."
5006
5007
#: bzrlib/errors.py:271
5008
msgid ""
5009
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5010
"obtain a list of topics."
5011
msgstr ""
5012
5013
#: bzrlib/errors.py:280
5014
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5015
msgstr ""
5016
5017
#: bzrlib/errors.py:290
5018
msgid ""
5019
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:299
5023
msgid "The branch '%(branch)s' is not stacked."
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:313
5027
msgid "No WorkingTree exists for \"%(base)s\"."
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:322
5031
msgid "Not currently building a tree."
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:327
5035
msgid "%(url)s is not a local path."
5036
msgstr "%(url)s ist kein lokaler Pfad."
5037
5038
#: bzrlib/errors.py:355
5039
msgid "%(not_locked)r is not write locked but needs to be."
5040
msgstr ""
5041
5042
#: bzrlib/errors.py:363
5043
msgid "Error in command line options"
5044
msgstr "Fehler in den Befehlszeilenoptionen"
5045
5046
#: bzrlib/errors.py:368
5047
msgid "%(value)s is not an index of type %(_type)s."
5048
msgstr "%(value)s ist kein Index vom Typ %(_type)s."
5049
5050
#: bzrlib/errors.py:378
5051
msgid "Error in data for index %(value)s."
5052
msgstr "Fehler in den Daten für Index %(value)s."
5053
5054
#: bzrlib/errors.py:387
5055
msgid "The key '%(key)s' is already in index '%(index)s'."
5056
msgstr "Der Schlüssel »%(key)s« ist bereits im Index »%(index)s«."
5057
5058
#: bzrlib/errors.py:397
5059
msgid "The key '%(key)s' is not a valid key."
5060
msgstr "Der Schlüssel »%(key)s« ist ein ungültiger Schlüssel."
5061
5062
#: bzrlib/errors.py:406
5063
msgid "Could not parse options for index %(value)s."
5064
msgstr "Optionen für Index %(value)s konnten nicht verarbeitet werden."
5065
5066
#: bzrlib/errors.py:415
5067
msgid "The value '%(value)s' is not a valid value."
5068
msgstr "Der Wert »%(value)s« ist ein ungültiger Wert."
5069
5070
#: bzrlib/errors.py:424
5071
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5072
msgstr "Ungültiger Wert »%(value)s« für die Option »%(name)s«."
5073
5074
#: bzrlib/errors.py:443
5075
msgid "Generic path error: %(path)r%(extra)s)"
5076
msgstr "Allgemeiner Fehler im Pfad: %(path)r%(extra)s)"
5077
5078
#: bzrlib/errors.py:456
5079
msgid "No such file: %(path)r%(extra)s"
5080
msgstr "Datei existiert nicht: %(path)r%(extra)s"
5081
5082
#: bzrlib/errors.py:461
5083
msgid "File exists: %(path)r%(extra)s"
5084
msgstr "Datei existiert: %(path)r%(extra)s"
5085
5086
#: bzrlib/errors.py:467
5087
msgid ""
5088
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5089
"after to tell bzr about a rename that has already happened)%(extra)s"
5090
msgstr ""
5091
5092
#: bzrlib/errors.py:483
5093
msgid "\"%(path)s\" is not a directory %(extra)s"
5094
msgstr "»%(path)s« ist kein Verzeichnis %(extra)s"
5095
5096
#: bzrlib/errors.py:488
5097
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5098
msgstr ""
5099
5100
#: bzrlib/errors.py:493
5101
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5102
msgstr "Verzeichnis ist nicht leer: »%(path)s«%(extra)s"
5103
5104
#: bzrlib/errors.py:498
5105
msgid "Hard-linking \"%(path)s\" is not supported"
5106
msgstr ""
5107
5108
#: bzrlib/errors.py:513
5109
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:518
5113
msgid "Permission denied: \"%(path)s\"%(extra)s"
5114
msgstr "Zugriff verweigert: »%(path)s«%(extra)s"
5115
5116
#: bzrlib/errors.py:523
5117
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:528
5121
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5122
msgstr ""
5123
5124
#: bzrlib/errors.py:539
5125
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:561
5129
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5130
msgstr ""
5131
5132
#: bzrlib/errors.py:571
5133
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5134
msgstr ""
5135
5136
#: bzrlib/errors.py:579
5137
msgid ""
5138
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5139
"upgrade the branch to permit branch stacking."
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:590
5143
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5144
msgstr ""
5145
5146
#: bzrlib/errors.py:600
5147
msgid ""
5148
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5149
"need to upgrade the repository to permit branch stacking."
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:611
5153
msgid "Error reading from %(path)r."
5154
msgstr "Fehler beim Lesen von %(path)r."
5155
5156
#: bzrlib/errors.py:630
5157
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5158
msgstr ""
5159
5160
#: bzrlib/errors.py:646
5161
msgid "Path \"%(path)s\" is not unicode normalized"
5162
msgstr ""
5163
5164
#: bzrlib/errors.py:654
5165
msgid "Not a branch: \"%(path)s\"%(detail)s."
5166
msgstr "Kein Zweig: »%(path)s«%(detail)s."
5167
5168
#: bzrlib/errors.py:696
5169
msgid "No submit branch available for branch \"%(path)s\""
5170
msgstr ""
5171
5172
#: bzrlib/errors.py:705
5173
msgid "A control directory already exists: \"%(path)s\"."
5174
msgstr ""
5175
5176
#: bzrlib/errors.py:710
5177
msgid "Already a branch: \"%(path)s\"."
5178
msgstr "Bereits ein Zweig: »%(path)s«."
5179
5180
#: bzrlib/errors.py:715
5181
msgid "Parent branch already exists: \"%(path)s\"."
5182
msgstr ""
5183
5184
#: bzrlib/errors.py:721
5185
msgid ""
5186
"Directory contains a branch, but no working tree (use bzr checkout if you "
5187
"wish to build a working tree): \"%(path)s\""
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:726
5191
msgid ""
5192
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:736
5196
msgid ""
5197
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5198
msgstr ""
5199
5200
#: bzrlib/errors.py:746
5201
msgid "No repository present: \"%(path)s\""
5202
msgstr ""
5203
5204
#: bzrlib/errors.py:753
5205
msgid ""
5206
"Unsupported branch format: %(format)s\n"
5207
"Please run 'bzr upgrade'"
5208
msgstr ""
5209
5210
#: bzrlib/errors.py:759
5211
msgid "Unknown %(kind)s format: %(format)r"
5212
msgstr "Unbekanntes %(kind)s-Format: %(format)r"
5213
5214
#: bzrlib/errors.py:768
5215
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5216
msgstr ""
5217
"Das Format %(format)s ist inkompatibel zu der .bzr-Version %(bzrdir)s."
5218
5219
#: bzrlib/errors.py:778
5220
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:793
5224
msgid ""
5225
"%(target)s\n"
5226
"is not compatible with\n"
5227
"%(source)s\n"
5228
"%(details)s"
5229
msgstr ""
5230
5231
#: bzrlib/errors.py:809
5232
msgid "Revision is not compatible with %(repo_format)s"
5233
msgstr "Die Revision ist inkompatibel zu %(repo_format)s"
5234
5235
#: bzrlib/errors.py:819
5236
msgid "%(context_info)s%(path)s is already versioned."
5237
msgstr "%(context_info)s%(path)s ist bereits versioniert."
5238
5239
#: bzrlib/errors.py:840
5240
msgid "%(context_info)s%(path)s is not versioned."
5241
msgstr "%(context_info)s%(path)s ist nicht versioniert."
5242
5243
#: bzrlib/errors.py:861
5244
msgid "Path(s) are not versioned: %(paths_as_string)s"
5245
msgstr "Pfad(e) ist/sind nicht versioniert: %(paths_as_string)s"
5246
5247
#: bzrlib/errors.py:872
5248
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5249
msgstr "Pfad(e) existiert/existieren nicht: %(paths_as_string)s%(extra)s"
5250
5251
#: bzrlib/errors.py:891
5252
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5253
msgstr ""
5254
5255
#: bzrlib/errors.py:899
5256
msgid ""
5257
"Filename %(filename)r is not valid in your current filesystem encoding "
5258
"%(fs_encoding)s"
5259
msgstr ""
5260
5261
#: bzrlib/errors.py:910
5262
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5263
msgstr ""
5264
5265
#: bzrlib/errors.py:928
5266
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5267
msgstr ""
5268
5269
#: bzrlib/errors.py:967
5270
msgid "Cannot lock %(lock)s: %(why)s"
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:977
5274
msgid ""
5275
"A transaction related operation was attempted after the transaction finished."
5276
msgstr ""
5277
5278
#: bzrlib/errors.py:1004
5279
msgid "Cannot lock: transport is read only: %(transport)s"
5280
msgstr ""
5281
5282
#: bzrlib/errors.py:1012
5283
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5284
msgstr ""
5285
5286
#: bzrlib/errors.py:1023
5287
msgid ""
5288
"Lock was broken while still open: %(lock)s - check storage consistency!"
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:1034
5292
msgid ""
5293
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5294
"%(holder)r, wanted to break %(target)r"
5295
msgstr ""
5296
5297
#: bzrlib/errors.py:1046
5298
msgid ""
5299
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5300
"Use 'bzr break-lock' to clear it"
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:1059
5304
msgid "Lock not held: %(lock)s"
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:1088
5308
msgid "No changes to commit"
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:1093
5312
msgid ""
5313
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:1103
5317
msgid ""
5318
"Excluding paths during commit is not supported by repository at "
5319
"%(repository)r."
5320
msgstr ""
5321
5322
#: bzrlib/errors.py:1112
5323
msgid ""
5324
"The specified commit message contains characters unsupported by the current "
5325
"encoding."
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:1118
5329
msgid "Upgrade URL cannot work with readonly URLs."
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1123
5333
msgid "The branch format %(format)s is already at the most recent format."
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1146
5337
msgid "Option --change does not accept revision ranges"
5338
msgstr "Die Option --change akzeptiert keine Revisionsbereiche"
5339
5340
#: bzrlib/errors.py:1151
5341
msgid "No namespace registered for string: %(spec)r"
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:1170
5345
msgid ""
5346
"Requested revision: '%(spec)s' does not exist in branch: "
5347
"%(branch_url)s%(extra)s"
5348
msgstr ""
5349
"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: "
5350
"%(branch_url)s%(extra)s"
5351
5352
#: bzrlib/errors.py:1184
5353
msgid ""
5354
"Operation denied because it would change the main history, which is not "
5355
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1195
5359
msgid ""
5360
"These branches have diverged. Use the missing command to see how.\n"
5361
"Use the merge command to reconcile them."
5362
msgstr ""
5363
5364
#: bzrlib/errors.py:1215
5365
msgid ""
5366
"Branches have no common ancestor, and no merge base revision was specified."
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1221
5370
msgid ""
5371
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1227
5375
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1236
5379
msgid ""
5380
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5381
msgstr ""
5382
5383
#: bzrlib/errors.py:1245
5384
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5385
msgstr ""
5386
5387
#: bzrlib/errors.py:1254
5388
msgid "Branch %(branch)s has no commits."
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:1272
5392
msgid ""
5393
"Bound branch %(branch)s is out of date with master branch "
5394
"%(master)s.%(extra_help)s"
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:1284
5398
msgid ""
5399
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5400
"bound to %(remote)s."
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:1296
5404
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:1305
5408
msgid ""
5409
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5410
"%(error)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1317
5414
msgid "Error in processing weave: %(msg)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1326
5418
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5419
msgstr "Revision {%(revision_id)s} ist bereits in %(weave)s vorhanden"
5420
5421
#: bzrlib/errors.py:1337
5422
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5423
msgstr "Revision {%(revision_id)s} ist nicht in %(weave)s vorhanden"
5424
5425
#: bzrlib/errors.py:1347
5426
msgid "Weave invariant violated: %(what)s"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1356
5430
msgid "Parents are mismatched between two revisions. %(msg)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1378
5434
msgid ""
5435
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5436
"%(weave_b)s"
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:1390
5440
msgid "Versioned file error"
5441
msgstr "Fehler bei versionierter Datei"
5442
5443
#: bzrlib/errors.py:1395
5444
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5445
msgstr "Revision {%(revision_id)s} ist nicht in »%(file_id)s« vorhanden."
5446
5447
#: bzrlib/errors.py:1405
5448
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5449
msgstr "Revision {%(revision_id)s} ist bereits in »%(file_id)s« vorhanden."
5450
5451
#: bzrlib/errors.py:1415
5452
msgid "Text did not match its checksum: %(msg)s"
5453
msgstr "Der Text entsprach nicht seiner Prüfsumme: %(msg)s"
5454
5455
#: bzrlib/errors.py:1541
5456
msgid "Export format %(format)r not supported"
5457
msgstr "Exportformat %(format)r wird nicht unterstützt"
5458
5459
#: bzrlib/errors.py:1550
5460
msgid "Transport error: %(msg)s %(orig_error)s"
5461
msgstr "Übertragungsfehler: %(msg)s %(orig_error)s"
5462
5463
#: bzrlib/errors.py:1576
5464
msgid "Generic bzr smart protocol error: %(details)s"
5465
msgstr "Allgemeiner bzr-Smart-Protokoll-Fehler: %(details)s"
5466
5467
#: bzrlib/errors.py:1584
5468
msgid "Received bad protocol version marker: %(marker)r"
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1616
5472
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1621
5476
msgid "Connection error: %(msg)s %(orig_error)s"
5477
msgstr "Verbindungsfehler: %(msg)s %(orig_error)s"
5478
5479
#: bzrlib/errors.py:1626
5480
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5481
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5482
5483
#: bzrlib/errors.py:1647
5484
msgid "Connection closed: %(msg)s %(orig_error)s"
5485
msgstr "Verbindung geschlossen: %(msg)s %(orig_error)s"
5486
5487
#: bzrlib/errors.py:1652
5488
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5489
msgstr "Verbindung abgelaufen: %(msg)s%(orig_error)s"
5490
5491
#: bzrlib/errors.py:1657
5492
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1667
5496
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5497
msgstr "Ungültige HTTP-Antwort für %(path)s: %(msg)s%(orig_error)s"
5498
5499
#: bzrlib/errors.py:1682
5500
msgid "Certificate error: %(error)s"
5501
msgstr "Zertifikatsfehler: %(error)s"
5502
5503
#: bzrlib/errors.py:1690
5504
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5505
msgstr "Ungültiger HTTP-Bereich %(range)r für %(path)s: %(msg)s"
5506
5507
#: bzrlib/errors.py:1704
5508
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5509
msgstr "»HTTP MIME Boundary« für %(path)s fehlt: %(msg)sy"
5510
5511
#: bzrlib/errors.py:1712
5512
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5513
msgstr "Ungültiger HTTP-Content-type »%(ctype)s« für %(path)s: %(msg)s"
5514
5515
#: bzrlib/errors.py:1721
5516
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5517
msgstr "%(source)s wird%(permanently)s umgeleitet nach %(target)s"
5518
5519
#: bzrlib/errors.py:1735
5520
msgid "Too many redirections"
5521
msgstr "Zu viele Umleitungen"
5522
5523
#: bzrlib/errors.py:1740
5524
msgid "Working tree has conflicts."
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1744
5528
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5529
msgstr "Konfigurationsdatei %(filename)s ist nicht UTF-8-kodiert\n"
5530
5531
#: bzrlib/errors.py:1753
5532
msgid ""
5533
"Error(s) parsing config file %(filename)s:\n"
5534
"%(errors)s"
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:1763
5538
msgid ""
5539
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5540
"See ``bzr help %(name)s``"
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1773
5544
msgid "%(username)r does not seem to contain a reasonable email address"
5545
msgstr "%(username)r scheint keine vernünftige E-Mail-Adresse zu haben"
5546
5547
#: bzrlib/errors.py:1782
5548
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5549
msgstr ""
5550
5551
#: bzrlib/errors.py:1790
5552
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:1798
5556
msgid "Unable to import library \"%(library)s\": %(error)s"
5557
msgstr "Importieren der Bibliothek »%(library)s« nicht möglich: %(error)s"
5558
5559
#: bzrlib/errors.py:1806
5560
msgid "python-gpgme is not installed, it is needed to verify signatures"
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:1814
5564
msgid ""
5565
"The working tree for %(basedir)s has changed since the last commit, but "
5566
"weave merge requires that it be unchanged"
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:1824
5570
msgid ""
5571
"Can't reprocess and show base, because reprocessing obscures the "
5572
"relationship of conflicting lines to the base"
5573
msgstr ""
5574
5575
#: bzrlib/errors.py:1830
5576
msgid "Cycle in graph %(graph)r"
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:1858
5580
msgid "File %(filename)s is not conflicted."
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:1880
5584
msgid "No bundle was found in \"%(filename)s\"."
5585
msgstr ""
5586
5587
#: bzrlib/errors.py:1889
5588
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:1899
5592
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5593
msgstr "Im Zweig %(base)s fehlt Revision %(text_revision)s von %(file_id)s"
5594
5595
#: bzrlib/errors.py:1912
5596
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:1922
5600
msgid "Key %(key)s is already present in map"
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:1927
5604
msgid "The prefix %(prefix)s is in the help search path twice."
5605
msgstr ""
5606
5607
#: bzrlib/errors.py:1937
5608
msgid ""
5609
"No final name for trans_id %(trans_id)r\n"
5610
"file-id: %(file_id)r\n"
5611
"root trans-id: %(root_trans_id)r\n"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:1969
5615
msgid "Attempt to reuse a transform that has already been applied."
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:1974
5619
msgid "Moving the root directory is not supported at this time"
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:1979
5623
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5624
msgstr "Umbenennen von %(from_path)s in %(to_path)s gescheitert: %(why)s"
5625
5626
#: bzrlib/errors.py:1990
5627
msgid ""
5628
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:2026
5632
msgid ""
5633
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:2056
5637
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:2064
5641
msgid "Nothing to merge."
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:2069
5645
msgid "Format %(format)s cannot be initialised by this version of bzr."
5646
msgstr ""
5647
"Das Format %(format)s kann von dieser Bazaar-Version nicht initialisiert "
5648
"werden."
5649
5650
#: bzrlib/errors.py:2078
5651
msgid ""
5652
"Cannot convert from format %(from_format)s to format %(format)s. "
5653
"%(problem)s"
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:2090
5657
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:2098
5661
msgid "%(exe_name)s could not be found on this machine"
5662
msgstr "%(exe_name)s konnte nicht auf diesem Rechner gefunden werden"
5663
5664
#: bzrlib/errors.py:2106
5665
msgid "Diff is not installed on this machine: %(msg)s"
5666
msgstr "Diff ist auf diesem Rechner nicht installiert: %(msg)s"
5667
5668
#: bzrlib/errors.py:2114
5669
msgid "Diff3 is not installed on this machine."
5670
msgstr "Diff3 ist auf diesem Rechner nicht installiert."
5671
5672
#: bzrlib/errors.py:2120
5673
msgid "The content being inserted is already present."
5674
msgstr "Der gerade eingefügte Inhalt ist bereits vorhanden."
5675
5676
#: bzrlib/errors.py:2125
5677
msgid ""
5678
"This tree contains left-over files from a failed operation.\n"
5679
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5680
"to\n"
5681
" keep, and delete it when you are done."
5682
msgstr ""
5683
5684
#: bzrlib/errors.py:2136
5685
msgid ""
5686
"This tree contains left-over files from a failed operation.\n"
5687
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5688
" wish to keep, and delete it when you are done."
5689
msgstr ""
5690
5691
#: bzrlib/errors.py:2146
5692
msgid ""
5693
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5694
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5695
"to\n"
5696
" keep, and delete it when you are done."
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2157
5700
msgid ""
5701
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5702
"examine %(pending_deletion)s to see if it contains any files you wish to "
5703
"keep, and delete it when you are done."
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:2167
5707
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:2181
5711
msgid ""
5712
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5713
msgstr ""
5714
"Im öffentlichen Zweig »%(public_location)s« fehlt Revision »%(revstring)s«."
5715
5716
#: bzrlib/errors.py:2194
5717
msgid "Error in merge modified format"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2199
5721
msgid "Format error in conflict listings"
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:2203
5725
msgid ""
5726
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5727
"Error: %(description)s"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:2214
5731
msgid ""
5732
"An error has been detected in the repository %(repo_path)s.\n"
5733
"Please run bzr reconcile on this repository."
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:2225
5737
msgid ""
5738
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5739
"reason: %(reason)s"
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:2238
5743
msgid ""
5744
"An inconsistent delta was supplied: %(delta)r\n"
5745
"reason: %(reason)s"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:2250
5749
msgid "To use this feature you must upgrade your branch at %(path)s."
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2259
5753
msgid "To use this feature you must upgrade your repository at %(path)s."
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:2264
5757
msgid ""
5758
"To use this feature you must upgrade your branch at %(path)s to a format "
5759
"which supports rich roots."
5760
msgstr ""
5761
5762
#: bzrlib/errors.py:2270
5763
msgid "Cannot perform local-only commits on unbound branches."
5764
msgstr ""
5765
5766
#: bzrlib/errors.py:2275
5767
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5768
msgstr ""
5769
5770
#: bzrlib/errors.py:2296
5771
msgid "Ghost tags not supported by format %(format)r."
5772
msgstr ""
5773
5774
#: bzrlib/errors.py:2304
5775
msgid "File is binary but should be text."
5776
msgstr "Die Datei ist binär, sollte aber Text sein."
5777
5778
#: bzrlib/errors.py:2309
5779
msgid "The path %(path)s is not permitted on this platform"
5780
msgstr "Der Pfad %(path)s ist auf dieser Plattform nicht erlaubt"
5781
5782
#: bzrlib/errors.py:2318
5783
msgid ""
5784
"Testament did not match expected value.\n"
5785
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5786
" {%(measured)s}"
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2330
5790
msgid "Not a bzr revision-bundle: %(text)r"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2339
5794
msgid "Bad bzr revision-bundle: %(text)r"
5795
msgstr ""
5796
5797
#: bzrlib/errors.py:2348
5798
msgid "Malformed bzr revision-bundle header: %(text)r"
5799
msgstr ""
5800
5801
#: bzrlib/errors.py:2353
5802
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2358
5806
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5807
msgstr ""
5808
5809
#: bzrlib/errors.py:2363
5810
msgid "End of line marker was not \\n in bzr revision-bundle"
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:2373
5814
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:2383
5818
msgid "Root class for inventory serialization errors"
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2387
5822
msgid ""
5823
"The inventory was not in the expected format:\n"
5824
" %(msg)s"
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:2396
5828
msgid "This operation requires rich root data storage"
5829
msgstr ""
5830
5831
#: bzrlib/errors.py:2409
5832
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5833
msgstr ""
5834
5835
#: bzrlib/errors.py:2418
5836
msgid ""
5837
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5838
"variable."
5839
msgstr ""
5840
5841
#: bzrlib/errors.py:2425
5842
msgid ""
5843
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5844
"ghost at {%(ghost_revision_id)s}"
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2435
5848
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5849
msgstr "Geister-Revision {%(revision_id)s} kann hier nicht benutzt werden."
5850
5851
#: bzrlib/errors.py:2486
5852
msgid ""
5853
"A merge directive must provide either a bundle or a public branch location."
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2493
5857
msgid "Bad merge directive payload %(start)r"
5858
msgstr ""
5859
5860
#: bzrlib/errors.py:2503
5861
msgid "Preview patch does not match requested changes."
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2509
5865
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:2519
5869
msgid ""
5870
"Your branch does not have all of the revisions required in order to merge "
5871
"this merge directive and the target location specified in the merge "
5872
"directive is not a branch: %(location)s."
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:2531
5876
msgid "Unsupported entry kind %(kind)s"
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:2539
5880
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5881
msgstr ""
5882
5883
#: bzrlib/errors.py:2549
5884
msgid "Subsume target %(other_tree)s needs to be upgraded."
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:2568
5888
msgid "No such tag: %(tag_name)s"
5889
msgstr ""
5890
5891
#: bzrlib/errors.py:2576
5892
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5893
msgstr ""
5894
5895
#: bzrlib/errors.py:2585
5896
msgid "Tag %(tag_name)s already exists."
5897
msgstr ""
5898
5899
#: bzrlib/errors.py:2593
5900
msgid ""
5901
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5902
"bugs\" for more information on this feature."
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2603
5906
msgid ""
5907
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2613
5911
msgid ""
5912
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5913
msgstr ""
5914
5915
#: bzrlib/errors.py:2623
5916
msgid "Invalid line in bugs property: '%(line)s'"
5917
msgstr ""
5918
5919
#: bzrlib/errors.py:2631
5920
msgid "Invalid bug status: '%(status)s'"
5921
msgstr ""
5922
5923
#: bzrlib/errors.py:2639
5924
msgid "Could not understand response from smart server: %(response_tuple)r"
5925
msgstr ""
5926
5927
#: bzrlib/errors.py:2678
5928
msgid "Server sent an unexpected error: %(error_tuple)r"
5929
msgstr "Der Server meldete einen unerwarteten Fehler: %(error_tuple)r"
5930
5931
#: bzrlib/errors.py:2697
5932
msgid "Unrecognised container format: %(container_format)r"
5933
msgstr ""
5934
5935
#: bzrlib/errors.py:2705
5936
msgid "Unexpected end of container stream"
5937
msgstr ""
5938
5939
#: bzrlib/errors.py:2710
5940
msgid "Unknown record type: %(record_type)r"
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2718
5944
msgid "Invalid record: %(reason)s"
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:2726
5948
msgid "Container has data after end marker: %(excess)r"
5949
msgstr ""
5950
5951
#: bzrlib/errors.py:2734
5952
msgid "Container has multiple records with the same name: %(name)s"
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2747
5956
msgid "Corrupt or incompatible data stream: %(reason)s"
5957
msgstr "Fehlerhafter oder inkompatibler Datenstrom: %(reason)s"
5958
5959
#: bzrlib/errors.py:2755
5960
msgid "SMTP error: %(error)s"
5961
msgstr "SMTP-Fehler: %(error)s"
5962
5963
#: bzrlib/errors.py:2763
5964
msgid "No message supplied."
5965
msgstr ""
5966
5967
#: bzrlib/errors.py:2768
5968
msgid "No mail-to address (--mail-to) or output (-o) specified."
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2773
5972
msgid "Unknown mail client: %(mail_client)s"
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:2781
5976
msgid ""
5977
"Unable to find mail client with the following names: "
5978
"%(mail_command_list_string)s"
5979
msgstr ""
5980
5981
#: bzrlib/errors.py:2791
5982
msgid "SMTP connection to %(host)s refused"
5983
msgstr "SMTP-Verbindung zu %(host)s wurde abgelehnt"
5984
5985
#: bzrlib/errors.py:2800
5986
msgid "Please specify smtp_server. No server at default %(host)s."
5987
msgstr ""
5988
5989
#: bzrlib/errors.py:2814
5990
msgid ""
5991
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5992
"reconfigure."
5993
msgstr ""
5994
5995
#: bzrlib/errors.py:2826
5996
msgid "'%(display_url)s' is already a branch."
5997
msgstr "»%(display_url)s« ist bereits ein Zweig."
5998
5999
#: bzrlib/errors.py:2831
6000
msgid "'%(display_url)s' is already a tree."
6001
msgstr ""
6002
6003
#: bzrlib/errors.py:2836
6004
msgid "'%(display_url)s' is already a checkout."
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:2841
6008
msgid "'%(display_url)s' is already a lightweight checkout."
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:2846
6012
msgid "'%(display_url)s' is already using a shared repository."
6013
msgstr ""
6014
6015
#: bzrlib/errors.py:2851
6016
msgid "'%(display_url)s' is already standalone."
6017
msgstr ""
6018
6019
#: bzrlib/errors.py:2856
6020
msgid "Shared repository '%(display_url)s' already creates working trees."
6021
msgstr ""
6022
6023
#: bzrlib/errors.py:2862
6024
msgid ""
6025
"Shared repository '%(display_url)s' already doesn't create working trees."
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:2868
6029
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:2873
6033
msgid "No location could be found to bind to at %(display_url)s."
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:2878
6037
msgid ""
6038
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6039
"status).%(more)s"
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:2897
6043
msgid ""
6044
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6045
"list).%(more)s"
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:2903
6049
msgid "Variable {%(name)s} is not available."
6050
msgstr "Variable {%(name)s} steht nicht zur Verfügung."
6051
6052
#: bzrlib/errors.py:2911
6053
msgid "No template specified."
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:2916
6057
msgid "Unable to create symlink %(path_str)son this platform"
6058
msgstr ""
6059
6060
#: bzrlib/errors.py:2931
6061
msgid ""
6062
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6063
"\"original\", \"local\"."
6064
msgstr ""
6065
"Ungültiges Zeitzonenformat »%(timezone)s«, die Optionen sind »utc«, "
6066
"»original« und »local«."
6067
6068
#: bzrlib/errors.py:2965
6069
msgid ""
6070
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:2977
6074
msgid "The \"%(config_id)s\" configuration does not exist."
6075
msgstr "Die Konfiguration »%(config_id)s« existiert nicht."
6076
6077
#: bzrlib/errors.py:2985
6078
msgid "The \"%(option_name)s\" configuration option does not exist."
6079
msgstr "Die Konfigurationsoption »%(option_name)s« existiert nicht."
6080
6081
#: bzrlib/errors.py:2993
6082
msgid "The alias \"%(alias_name)s\" does not exist."
6083
msgstr "Der Alias »%(alias_name)s« existiert nicht."
6084
6085
#: bzrlib/errors.py:3007
6086
msgid "\"%(alias_name)s\" is not a valid location alias."
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:3015
6090
msgid "No %(alias_name)s location assigned."
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:3023
6094
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:3033
6098
msgid "Unknown rules detected: %(unknowns_str)s."
6099
msgstr "Unbekannte Regeln festgestellt: %(unknowns_str)s."
6100
6101
#: bzrlib/errors.py:3044
6102
msgid "Tip change rejected: %(msg)s"
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3052
6106
msgid "Shelf corrupt."
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:3057
6110
msgid "Corruption while decompressing repository file%(orig_error)s"
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:3069
6114
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:3077
6118
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:3085
6122
msgid ""
6123
"An attempt to access a url outside the server jail was made: '%(url)s'."
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3093
6127
msgid "The user aborted the operation."
6128
msgstr "Der Vorgang wurde vom Benutzer abgebrochen."
6129
6130
#: bzrlib/errors.py:3098
6131
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6132
msgstr ""
6133
6134
#: bzrlib/errors.py:3108
6135
msgid "No such view: %(view_name)s."
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:3118
6139
msgid ""
6140
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6141
"to a later format."
6142
msgstr ""
6143
6144
#: bzrlib/errors.py:3127
6145
msgid ""
6146
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:3194
6150
msgid "%(bzrdir)r does not support co-located branches."
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:3200
6154
msgid ""
6155
"Unable to determine your name.\n"
6156
"Please, set your name with the 'whoami' command.\n"
6157
"E.g. bzr whoami \"Your Name <name@example.com>\""
6158
msgstr ""
6159
6160
#: bzrlib/errors.py:3209
6161
msgid "Invalid pattern(s) found. %(msg)s"
6162
msgstr "Ungültige(s) Muster gefunden. %(msg)s"
6163
6164
#: bzrlib/errors.py:3217
6165
msgid ""
6166
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6167
"unbind` to fix."
6168
msgstr ""
6169
6170
#: bzrlib/errors.py:3228
6171
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6172
msgstr ""
6173
6174
#: bzrlib/errors.py:3237
6175
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6176
msgstr ""
6177
6178
#: bzrlib/errors.py:3246
6179
msgid ""
6180
"No compatible object available for operations from %(source)r to %(target)r."
6181
msgstr ""
6182
6183
#: bzrlib/errors.py:3256
6184
msgid ""
6185
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6186
"%(arguments)s."
6187
msgstr ""
6188
6189
#: bzrlib/errors.py:3266
6190
msgid ""
6191
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6192
"format %(format)r"
6193
msgstr ""
6194
6195
#: bzrlib/errors.py:3278
6196
msgid ""
6197
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6198
"plugin."
6199
msgstr ""
6200
"Die fehlende Funktion %(feature)s wird weder von dieser Bazaar-Version noch "
6201
"von irgendeiner Erweiterung unterstützt."
6202
6203
#: bzrlib/errors.py:3291
6204
msgid "Binary files section encountered."
6205
msgstr "Auf einen Abschnitt für Binärdateien gestoßen."
6206
6207
#: bzrlib/errors.py:3299
6208
msgid ""
6209
"Malformed patch header. %(desc)s\n"
6210
"%(line)r"
6211
msgstr ""
6212
6213
#: bzrlib/errors.py:3308
6214
msgid ""
6215
"Malformed hunk header. %(desc)s\n"
6216
"%(line)r"
6217
msgstr ""
6218
6219
#: bzrlib/errors.py:3317
6220
msgid ""
6221
"Malformed line. %(desc)s\n"
6222
"%(line)r"
6223
msgstr ""
6224
"Ungültige Zeile. %(desc)s\n"
6225
"%(line)r"
6226
6227
#: bzrlib/errors.py:3327
6228
msgid ""
6229
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6230
"but patch says it should be \"%(patch_line)s\""
6231
msgstr ""
6232
6233
#: bzrlib/errors.py:3338
6234
msgid "The feature %(feature)s has already been registered."
6235
msgstr ""
6236
6237
#: bzrlib/export_pot.py:252
6238
#, python-format
6239
msgid "Exporting messages from builtin command: %s"
6240
msgstr ""
6241
6242
#: bzrlib/export_pot.py:271
6243
msgid "Exporting messages from plugin command: {0} in {1}"
6244
msgstr ""
6245
6246
#: bzrlib/export_pot.py:292
6247
#, python-format
6248
msgid "Exporting message from error: %s"
6249
msgstr ""
6250
6251
#: bzrlib/fetch.py:98
6252
msgid "Finding revisions"
6253
msgstr "Revisionen finden"
6254
6255
#: bzrlib/fetch.py:103
6256
msgid "Fetching revisions"
6257
msgstr "Revisionen herunterladen"
6258
6259
#: bzrlib/foreign.py:262
6260
msgid "Push into a different VCS without any custom bzr metadata."
6261
msgstr ""
6262
6263
#: bzrlib/foreign.py:264
6264
msgid ""
6265
"This will afterwards rebase the local branch on the remote\n"
6266
"branch unless the --no-rebase option is used, in which case \n"
6267
"the two branches will be out of sync after the push. "
6268
msgstr ""
6269
6270
#: bzrlib/foreign.py:277
6271
msgid "Do not rebase after push."
6272
msgstr ""
6273
6274
#: bzrlib/foreign.py:311
6275
#, python-format
6276
msgid "Using saved location: %s\n"
6277
msgstr ""
6278
6279
#: bzrlib/foreign.py:321
6280
msgid ""
6281
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6282
"regular push."
6283
msgstr ""
6284
6285
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6286
msgid "{0} commits with valid signatures"
6287
msgstr ""
6288
6289
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6290
msgid "{0} commit with unknown key"
6291
msgid_plural "{0} commits with unknown keys"
6292
msgstr[0] ""
6293
msgstr[1] ""
6294
6295
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6296
msgid "{0} commit not valid"
6297
msgid_plural "{0} commits not valid"
6298
msgstr[0] ""
6299
msgstr[1] ""
6300
6301
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6302
msgid "{0} commit not signed"
6303
msgid_plural "{0} commits not signed"
6304
msgstr[0] ""
6305
msgstr[1] ""
6306
6307
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6308
msgid "{0} commit with key now expired"
6309
msgid_plural "{0} commits with key now expired"
6310
msgstr[0] ""
6311
msgstr[1] ""
6312
6313
#: bzrlib/gpg.py:343
6314
msgid "No GnuPG key results for pattern: {0}"
6315
msgstr ""
6316
6317
#: bzrlib/gpg.py:386
6318
msgid "{0} signed {1} commit"
6319
msgid_plural "{0} signed {1} commits"
6320
msgstr[0] ""
6321
msgstr[1] ""
6322
6323
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6324
msgid "{0} commit by author {1}"
6325
msgid_plural "{0} commits by author {1}"
6326
msgstr[0] ""
6327
msgstr[1] ""
6328
6329
#: bzrlib/gpg.py:433
6330
msgid "Unknown key {0} signed {1} commit"
6331
msgid_plural "Unknown key {0} signed {1} commits"
6332
msgstr[0] ""
6333
msgstr[1] ""
6334
6335
#: bzrlib/gpg.py:452
6336
msgid "{0} commit by author {1} with key {2} now expired"
6337
msgid_plural "{0} commits by author {1} with key {2} now expired"
6338
msgstr[0] ""
6339
msgstr[1] ""
6340
6341
#: bzrlib/groupcompress.py:1739
6342
#, python-format
6343
msgid "Insert claimed random_id=True, but then inserted %r two times"
6344
msgstr ""
6345
6346
#: bzrlib/hooks.py:331
6347
#, python-format
6348
msgid "Introduced in: %s"
6349
msgstr "Eingeführt in: %s"
6350
6351
#: bzrlib/hooks.py:334
6352
#, python-format
6353
msgid "Deprecated in: %s"
6354
msgstr "Veraltet in: %s"
6355
6356
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6357
msgid "Walking content"
6358
msgstr ""
6359
6360
#: bzrlib/knit.py:3330
6361
msgid "annotating"
6362
msgstr ""
6363
6364
#: bzrlib/lock.py:548
6365
msgid "{0!r} was {1} locked again"
6366
msgstr ""
6367
6368
#: bzrlib/lockdir.py:321
6369
#, python-format
6370
msgid "error removing pending lock: %s"
6371
msgstr ""
6372
6373
#: bzrlib/lockdir.py:616
6374
msgid "Unable to obtain"
6375
msgstr ""
6376
6377
#: bzrlib/lockdir.py:618
6378
msgid "Lock owner changed for"
6379
msgstr ""
6380
6381
#: bzrlib/lockdir.py:620
6382
msgid "{0} lock {1} {2}."
6383
msgstr ""
6384
6385
#: bzrlib/lockdir.py:627
6386
#, python-format
6387
msgid "Will continue to try until %s, unless you press Ctrl-C."
6388
msgstr ""
6389
6390
#: bzrlib/lockdir.py:629
6391
msgid "See \"bzr help break-lock\" for more."
6392
msgstr "Siehe »bzr help break-lock« für mehr Informationen."
6393
6394
#: bzrlib/lockdir.py:739
6395
#, python-format
6396
msgid ""
6397
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6398
msgstr ""
6399
6400
#: bzrlib/log.py:572
6401
msgid "--exclude-common-ancestry requires two different revisions"
6402
msgstr "--exclude-common-ancestry erfordert zwei verschiedene Revisionen"
6403
6404
#: bzrlib/log.py:574
6405
#, python-format
6406
msgid "invalid direction %r"
6407
msgstr "Ungültige Richtung %r"
6408
6409
#: bzrlib/log.py:662
6410
msgid "Start revision not found in history of end revision."
6411
msgstr ""
6412
6413
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6414
msgid "Logging revision 0 is invalid."
6415
msgstr ""
6416
6417
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6418
msgid "Start revision must be older than the end revision."
6419
msgstr ""
6420
6421
#: bzrlib/log.py:1827
6422
#, python-format
6423
msgid "unknown log formatter: %r"
6424
msgstr "Unbekannter Protokollformatierer: %r"
6425
6426
#: bzrlib/log.py:2123
6427
msgid "fixes bug"
6428
msgid_plural "fixes bugs"
6429
msgstr[0] "behebt den Fehler"
6430
msgstr[1] "behebt die Fehler"
6431
6432
#: bzrlib/merge.py:689
6433
msgid "All changes applied successfully."
6434
msgstr "Alle Änderungen erfolgreich angewendet."
6435
6436
#: bzrlib/merge.py:691
6437
#, python-format
6438
msgid "%d conflicts encountered."
6439
msgstr "Auf %d Konflikte gestoßen."
6440
6441
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6442
msgid "Preparing file merge"
6443
msgstr ""
6444
6445
#: bzrlib/multiparent.py:426
6446
msgid "Importing revisions"
6447
msgstr "Revisionen importieren"
6448
6449
#: bzrlib/option.py:526
6450
msgid "Show help message."
6451
msgstr "Hilfetext anzeigen."
6452
6453
#: bzrlib/option.py:528
6454
msgid "Only display errors and warnings."
6455
msgstr "Nur Fehler und Warnungen anzeigen."
6456
6457
#: bzrlib/option.py:531
6458
msgid "Show usage message and options."
6459
msgstr "Aufruf und Optionen anzeigen."
6460
6461
#: bzrlib/option.py:533
6462
msgid "Display more information."
6463
msgstr "Weitere Informationen anzeigen."
6464
6465
#: bzrlib/option.py:541
6466
msgid ""
6467
"Select changes introduced by the specified revision. See also \"help "
6468
"revisionspec\"."
6469
msgstr ""
6470
6471
#: bzrlib/option.py:543
6472
msgid "Branch to operate on, instead of working directory."
6473
msgstr ""
6474
6475
#: bzrlib/option.py:545
6476
msgid "Detailed log format."
6477
msgstr "Ausführliches Protokollformat."
6478
6479
#: bzrlib/option.py:545
6480
msgid "Format used by GNU ChangeLog files."
6481
msgstr "Format von »GNU ChangeLog«-Dateien."
6482
6483
#: bzrlib/option.py:545
6484
msgid "Log format with one line per revision."
6485
msgstr "Protokollformat mit einer Zeile pro Revision."
6486
6487
#: bzrlib/option.py:545
6488
msgid "Moderately short log format."
6489
msgstr "Relativ kurzes Protokollformat."
6490
6491
#: bzrlib/option.py:545
6492
msgid "Use specified log format."
6493
msgstr "Angegebenes Protokollformat benutzen."
6494
6495
#: bzrlib/option.py:547
6496
msgid "Log format"
6497
msgstr "Protokollformat"
6498
6499
#: bzrlib/option.py:549
6500
msgid "LCA-newness merge."
6501
msgstr ""
6502
6503
#: bzrlib/option.py:549
6504
msgid "Merge using external diff3."
6505
msgstr ""
6506
6507
#: bzrlib/option.py:549
6508
msgid "Native diff3-style merge."
6509
msgstr ""
6510
6511
#: bzrlib/option.py:549
6512
msgid "Select a particular merge algorithm."
6513
msgstr ""
6514
6515
#: bzrlib/option.py:549
6516
msgid "Weave-based merge."
6517
msgstr ""
6518
6519
#: bzrlib/option.py:551
6520
msgid "Merge algorithm"
6521
msgstr ""
6522
6523
#: bzrlib/option.py:554
6524
msgid "Message string."
6525
msgstr "Nachrichtenzeichenkette."
6526
6527
#: bzrlib/option.py:556
6528
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6529
msgstr ""
6530
6531
#: bzrlib/option.py:558
6532
msgid "Ignore differences between branches and overwrite unconditionally."
6533
msgstr ""
6534
6535
#: bzrlib/option.py:560
6536
msgid "Remember the specified location as a default."
6537
msgstr "Den angegebenen Ort als Vorgabe merken."
6538
6539
#: bzrlib/option.py:562
6540
msgid "Reprocess to reduce spurious conflicts."
6541
msgstr "Erneut ausführen, um scheinbare Konflikte zu verringern."
6542
6543
#: bzrlib/option.py:566
6544
msgid "See \"help revisionspec\" for details."
6545
msgstr "Siehe »help revisionspec« für Details."
6546
6547
#: bzrlib/option.py:568
6548
msgid "Show internal object ids."
6549
msgstr ""
6550
6551
#: bzrlib/option.py:571
6552
msgid "Display timezone as local, original, or utc."
6553
msgstr "Zeitzone als local, original oder utc anzeigen."
6554
6555
#: bzrlib/osutils.py:100
6556
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6557
msgstr ""
6558
6559
#: bzrlib/osutils.py:220
6560
msgid "lstat/stat of ({0!r}): {1!r}"
6561
msgstr ""
6562
6563
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6564
#, python-format
6565
msgid "sorry, %r not allowed in path"
6566
msgstr "Entschuldigung, %r ist im Pfad nicht erlaubt"
6567
6568
#: bzrlib/osutils.py:1237
6569
#, python-format
6570
msgid "%r is too short to calculate a relative path"
6571
msgstr "%r ist zu kurz, um einen relativen Pfad zu berechnen"
6572
6573
#: bzrlib/plugin.py:143
6574
#, python-format
6575
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6576
msgstr "»%s« ist keine gültige <plugin_name>@<plugin_path>-Beschreibung "
6577
6578
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6579
msgid "Enable completions for the selected plugin (default: all plugins)"
6580
msgstr ""
6581
6582
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6583
msgid "Generate a shell function for bash command line completion."
6584
msgstr ""
6585
6586
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6587
msgid ""
6588
"This command generates a shell function which can be used by bash to\n"
6589
"automatically complete the currently typed command when the user presses\n"
6590
"the completion key (usually tab)."
6591
msgstr ""
6592
6593
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6594
msgid ""
6595
"Commonly used like this:\n"
6596
" eval \"`bzr bash-completion`\""
6597
msgstr ""
6598
"Gebräuchlicher Aufruf wie folgt:\n"
6599
" eval \"`bzr bash-completion`\""
6600
6601
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6602
msgid "Name of the generated function (default: _bzr)"
6603
msgstr "Name der erzeugten Funktion (Vorgabe: _bzr)"
6604
6605
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6606
msgid "Generate only the shell function, don't enable it"
6607
msgstr ""
6608
6609
#: bzrlib/plugins/launchpad/__init__.py:81
6610
msgid "Register a branch with launchpad.net."
6611
msgstr "Einen Zweig bei launchpad.net registrieren."
6612
6613
#: bzrlib/plugins/launchpad/__init__.py:83
6614
msgid ""
6615
"This command lists a bzr branch in the directory of branches on\n"
6616
"launchpad.net. Registration allows the branch to be associated with\n"
6617
"bugs or specifications."
6618
msgstr ""
6619
6620
#: bzrlib/plugins/launchpad/__init__.py:87
6621
msgid ""
6622
"Before using this command you must register the project to which the\n"
6623
"branch belongs, and create an account for yourself on launchpad.net."
6624
msgstr ""
6625
6626
#: bzrlib/plugins/launchpad/__init__.py:90
6627
msgid ""
6628
"arguments:\n"
6629
" public_url: The publicly visible url for the branch to register.\n"
6630
" This must be an http or https url (which Launchpad can read\n"
6631
" from to access the branch). Local file urls, SFTP urls, and\n"
6632
" bzr+ssh urls will not work.\n"
6633
" If no public_url is provided, bzr will use the configured\n"
6634
" public_url if there is one for the current branch, and\n"
6635
" otherwise error."
6636
msgstr ""
6637
6638
#: bzrlib/plugins/launchpad/__init__.py:99
6639
msgid ""
6640
"example:\n"
6641
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6642
" --project fooproject"
6643
msgstr ""
6644
"Beispiel:\n"
6645
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6646
" --project fooproject"
6647
6648
#: bzrlib/plugins/launchpad/__init__.py:106
6649
msgid "Launchpad project short name to associate with the branch."
6650
msgstr "Launchpad-Projekt-Kurzname, dem der Zweig zugeordnet wird."
6651
6652
#: bzrlib/plugins/launchpad/__init__.py:113
6653
msgid ""
6654
"Short name for the branch; by default taken from the last component of the "
6655
"url."
6656
msgstr ""
6657
6658
#: bzrlib/plugins/launchpad/__init__.py:117
6659
msgid "One-sentence description of the branch."
6660
msgstr "Beschreibung des Zweiges in einem Satz."
6661
6662
#: bzrlib/plugins/launchpad/__init__.py:120
6663
msgid "Longer description of the purpose or contents of the branch."
6664
msgstr "Längere Beschreibung für den Zweck oder die Inhalte des Zweiges."
6665
6666
#: bzrlib/plugins/launchpad/__init__.py:123
6667
msgid "Branch author's email address, if not yourself."
6668
msgstr "E-Mail-Adresse des Autors des Zweigs, wenn Sie es nicht selbst sind."
6669
6670
#: bzrlib/plugins/launchpad/__init__.py:126
6671
msgid "The bug this branch fixes."
6672
msgstr "Der Fehler, den dieser Zweig behebt."
6673
6674
#: bzrlib/plugins/launchpad/__init__.py:129
6675
msgid "Prepare the request but don't actually send it."
6676
msgstr "Die Anfrage vorbereiten, aber nicht absenden."
6677
6678
#: bzrlib/plugins/launchpad/__init__.py:151
6679
msgid ""
6680
"register-branch requires a public branch url - see bzr help register-branch."
6681
msgstr ""
6682
6683
#: bzrlib/plugins/launchpad/__init__.py:159
6684
msgid "--product is deprecated; please use --project."
6685
msgstr "--product ist veraltet; bitte --project benutzen."
6686
6687
#: bzrlib/plugins/launchpad/__init__.py:191
6688
msgid "Open a Launchpad branch page in your web browser."
6689
msgstr "Eine Launchpad-Zweig-Seite in Ihrem Web-Browser öffnen."
6690
6691
#: bzrlib/plugins/launchpad/__init__.py:196
6692
msgid "Do not actually open the browser. Just say the URL we would use."
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/__init__.py:231
6696
#, python-format
6697
msgid "Opening %s in web browser"
6698
msgstr "%s wird im Web-Browser geöffnet"
6699
6700
#: bzrlib/plugins/launchpad/__init__.py:241
6701
msgid "Show or set the Launchpad user ID."
6702
msgstr "Den Launchpad-Benutzernamen anzeigen oder festlegen."
6703
6704
#: bzrlib/plugins/launchpad/__init__.py:243
6705
msgid ""
6706
"When communicating with Launchpad, some commands need to know your\n"
6707
"Launchpad user ID. This command can be used to set or show the\n"
6708
"user ID that Bazaar will use for such communication."
6709
msgstr ""
6710
6711
#: bzrlib/plugins/launchpad/__init__.py:247
6712
msgid ""
6713
":Examples:\n"
6714
" Show the Launchpad ID of the current user::"
6715
msgstr ""
6716
6717
#: bzrlib/plugins/launchpad/__init__.py:250
6718
msgid " bzr launchpad-login"
6719
msgstr " bzr launchpad-login"
6720
6721
#: bzrlib/plugins/launchpad/__init__.py:252
6722
msgid " Set the Launchpad ID of the current user to 'bob'::"
6723
msgstr ""
6724
6725
#: bzrlib/plugins/launchpad/__init__.py:254
6726
msgid " bzr launchpad-login bob"
6727
msgstr " bzr launchpad-login bob"
6728
6729
#: bzrlib/plugins/launchpad/__init__.py:261
6730
msgid "Don't check that the user name is valid."
6731
msgstr "Den Benutzernamen nicht auf Gültigkeit prüfen."
6732
6733
#: bzrlib/plugins/launchpad/__init__.py:276
6734
#: bzrlib/plugins/launchpad/__init__.py:287
6735
msgid "Launchpad user ID exists and has SSH keys.\n"
6736
msgstr "Launchpad-Benutzername existiert und hat SSH-Schlüssel.\n"
6737
6738
#: bzrlib/plugins/launchpad/__init__.py:279
6739
msgid "No Launchpad user ID configured.\n"
6740
msgstr "Kein Launchpad-Benutzername konfiguriert.\n"
6741
6742
#: bzrlib/plugins/launchpad/__init__.py:290
6743
#, python-format
6744
msgid "Launchpad user ID set to '%s'.\n"
6745
msgstr "Launchpad-Benutzername auf »%s« festgelegt.\n"
6746
6747
#: bzrlib/plugins/launchpad/__init__.py:298
6748
msgid "Ask Launchpad to mirror a branch now."
6749
msgstr "Launchpad jetzt darum bitten, einen Zweig zu spiegeln."
6750
6751
#: bzrlib/plugins/launchpad/__init__.py:318
6752
msgid "Propose merging a branch on Launchpad."
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/__init__.py:320
6756
msgid ""
6757
"This will open your usual editor to provide the initial comment. When it\n"
6758
"has created the proposal, it will open it in your default web browser."
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/__init__.py:323
6762
msgid ""
6763
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6764
"is not supplied, the remembered submit branch will be used. If no submit\n"
6765
"branch is remembered, the development focus will be used."
6766
msgstr ""
6767
6768
#: bzrlib/plugins/launchpad/__init__.py:327
6769
msgid ""
6770
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6771
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6772
"The parameter the launchpad account name of the desired reviewer. This\n"
6773
"may optionally be followed by '=' and the review type. For example:"
6774
msgstr ""
6775
6776
#: bzrlib/plugins/launchpad/__init__.py:332
6777
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6778
msgstr ""
6779
6780
#: bzrlib/plugins/launchpad/__init__.py:334
6781
msgid ""
6782
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6783
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6784
msgstr ""
6785
6786
#: bzrlib/plugins/launchpad/__init__.py:339
6787
msgid "Propose the merge on staging."
6788
msgstr ""
6789
6790
#: bzrlib/plugins/launchpad/__init__.py:341
6791
msgid "Commit message."
6792
msgstr ""
6793
6794
#: bzrlib/plugins/launchpad/__init__.py:343
6795
msgid "Mark the proposal as approved immediately."
6796
msgstr ""
6797
6798
#: bzrlib/plugins/launchpad/__init__.py:345
6799
msgid "Requested reviewer and optional type."
6800
msgstr ""
6801
6802
#: bzrlib/plugins/launchpad/__init__.py:382
6803
msgid "Find the proposal to merge this revision."
6804
msgstr ""
6805
6806
#: bzrlib/plugins/launchpad/__init__.py:384
6807
msgid ""
6808
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6809
"This works only if the selected branch was the merge proposal target, and\n"
6810
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6811
"are opened in a web browser."
6812
msgstr ""
6813
6814
#: bzrlib/plugins/launchpad/__init__.py:389
6815
msgid ""
6816
"Any revision involved in the merge may be specified-- the revision in\n"
6817
"which the merge was performed, or one of the revisions that was merged."
6818
msgstr ""
6819
6820
#: bzrlib/plugins/launchpad/__init__.py:392
6821
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6822
msgstr ""
6823
6824
#: bzrlib/plugins/launchpad/__init__.py:394
6825
msgid " bzr lp-find-proposal -r annotate:README:1"
6826
msgstr ""
6827
6828
#: bzrlib/plugins/launchpad/__init__.py:409
6829
msgid "No review found."
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/__init__.py:410
6833
#, python-format
6834
msgid "%d proposals(s) found."
6835
msgstr ""
6836
6837
#: bzrlib/plugins/launchpad/__init__.py:420
6838
msgid "Finding revision-id"
6839
msgstr ""
6840
6841
#: bzrlib/plugins/launchpad/__init__.py:427
6842
msgid "Finding merge"
6843
msgstr ""
6844
6845
#: bzrlib/plugins/launchpad/__init__.py:432
6846
msgid "Finding revno"
6847
msgstr ""
6848
6849
#: bzrlib/plugins/launchpad/__init__.py:437
6850
msgid "Finding Launchpad branch"
6851
msgstr ""
6852
6853
#: bzrlib/plugins/launchpad/__init__.py:440
6854
msgid "Finding proposals"
6855
msgstr ""
6856
6857
#: bzrlib/plugins/launchpad/account.py:66
6858
msgid "Setting ssh/sftp usernames for launchpad.net."
6859
msgstr "SSH/SFTP-Benutzernamen für launchpad.net festlegen."
6860
6861
#: bzrlib/plugins/launchpad/lp_api.py:241
6862
#: bzrlib/plugins/launchpad/lp_api.py:246
6863
#, python-format
6864
msgid "%s is not registered on Launchpad"
6865
msgstr "%s ist nicht in Launchpad registriert"
6866
6867
#: bzrlib/plugins/launchpad/lp_api.py:256
6868
#, python-format
6869
msgid "%s has no development focus."
6870
msgstr ""
6871
6872
#: bzrlib/plugins/launchpad/lp_api.py:261
6873
#, python-format
6874
msgid "development focus %s has no branch."
6875
msgstr ""
6876
6877
#: bzrlib/plugins/launchpad/lp_api.py:266
6878
#, python-format
6879
msgid "source package %s has no branch."
6880
msgstr ""
6881
6882
#: bzrlib/plugins/launchpad/lp_api.py:270
6883
#, python-format
6884
msgid "%s has no associated product or source package."
6885
msgstr ""
6886
6887
#: bzrlib/plugins/launchpad/lp_api.py:282
6888
#, python-format
6889
msgid "%s is already up-to-date."
6890
msgstr "%s ist bereits auf dem neuesten Stand."
6891
6892
#: bzrlib/plugins/launchpad/lp_api.py:289
6893
#, python-format
6894
msgid "Pushing to %s"
6895
msgstr ""
6896
6897
#: bzrlib/plugins/launchpad/lp_directory.py:170
6898
msgid ""
6899
"resolution for {0}\n"
6900
" local: {1}\n"
6901
" remote: {2}"
6902
msgstr ""
6903
6904
#: bzrlib/plugins/launchpad/lp_propose.py:149
6905
#, python-format
6906
msgid "There is already a branch merge proposal: %s"
6907
msgstr ""
6908
6909
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6910
msgid "pb parameter to convert() is deprecated"
6911
msgstr ""
6912
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6914
msgid "starting upgrade from format 4 to 5"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6918
msgid "note: upgrade may be faster if all store files are ungzipped first"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6922
msgid "converting revision"
6923
msgstr "Revision umwandeln"
6924
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6926
msgid "upgraded to weaves:"
6927
msgstr ""
6928
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6930
#, python-format
6931
msgid "%6d revisions and inventories"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6935
#, python-format
6936
msgid "%6d revisions not present"
6937
msgstr "%6d Revisionen nicht vorhanden"
6938
6939
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6940
#, python-format
6941
msgid "%6d texts"
6942
msgstr "%6d Texte"
6943
6944
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6945
msgid "writing weave"
6946
msgstr ""
6947
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6949
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6950
msgid "inventory"
6951
msgstr ""
6952
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6954
msgid "write revision"
6955
msgstr "Revision schreiben"
6956
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6958
msgid "loading revision"
6959
msgstr "Revision laden"
6960
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6962
#, python-format
6963
msgid "revision {%s} not present in branch; will be converted as a ghost"
6964
msgstr ""
6965
6966
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6967
msgid "starting upgrade from format 5 to 6"
6968
msgstr ""
6969
6970
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6971
#, python-format
6972
msgid "adding prefixes to %s"
6973
msgstr ""
6974
6975
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6976
msgid "starting upgrade from format 6 to metadir"
6977
msgstr ""
6978
6979
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6980
msgid "Removing ancestry.weave"
6981
msgstr ""
6982
6983
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6984
msgid "Finding branch files"
6985
msgstr "Dateien des Zweigs finden"
6986
6987
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6988
msgid "Upgrading repository"
6989
msgstr ""
6990
6991
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6992
msgid "Upgrading branch"
6993
msgstr ""
6994
6995
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6996
msgid "No working tree."
6997
msgstr ""
6998
6999
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7000
msgid "Upgrading working tree"
7001
msgstr ""
7002
7003
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7004
#, python-format
7005
msgid "Make %s lock"
7006
msgstr ""
7007
7008
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7009
#, python-format
7010
msgid "Moving %s"
7011
msgstr "%s wird verschoben"
7012
7013
#: bzrlib/push.py:56
7014
msgid "Created new branch."
7015
msgstr "Neuer Zweig wurde erstellt."
7016
7017
#: bzrlib/push.py:97
7018
#, python-format
7019
msgid ""
7020
"Target directory %s already contains a .bzr directory, but it is not valid."
7021
msgstr ""
7022
7023
#: bzrlib/push.py:101
7024
#, python-format
7025
msgid ""
7026
"Target directory %s already exists, but does not have a .bzr directory. "
7027
"Supply --use-existing-dir to push there anyway."
7028
msgstr ""
7029
7030
#: bzrlib/push.py:122
7031
#, python-format
7032
msgid "Too many redirections trying to make %s."
7033
msgstr ""
7034
7035
#: bzrlib/push.py:147
7036
msgid ""
7037
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7038
"information."
7039
msgstr ""
7040
7041
#: bzrlib/push.py:151
7042
#, python-format
7043
msgid ""
7044
"It is not possible to losslessly push to %s. You may want to use dpush "
7045
"instead."
7046
msgstr ""
7047
7048
#: bzrlib/push.py:157
7049
#, python-format
7050
msgid ""
7051
"At %s you have a valid .bzr control directory, but not a branch or "
7052
"repository. This is an unsupported configuration. Please move the target "
7053
"directory out of the way and try again."
7054
msgstr ""
7055
7056
#: bzrlib/reconcile.py:97
7057
#, python-format
7058
msgid "Reconciling branch %s"
7059
msgstr ""
7060
7061
#: bzrlib/reconcile.py:103
7062
#, python-format
7063
msgid "Reconciling repository %s"
7064
msgstr ""
7065
7066
#: bzrlib/reconcile.py:105
7067
msgid "Reconciling repository"
7068
msgstr ""
7069
7070
#: bzrlib/reconcile.py:111
7071
#, python-format
7072
msgid "%s cannot canonicalize CHKs."
7073
msgstr ""
7074
7075
#: bzrlib/reconcile.py:119
7076
msgid "Reconcile aborted: revision index has inconsistent parents."
7077
msgstr ""
7078
7079
#: bzrlib/reconcile.py:121
7080
msgid "Run \"bzr check\" for more details."
7081
msgstr ""
7082
7083
#: bzrlib/reconcile.py:123
7084
msgid "Reconciliation complete."
7085
msgstr ""
7086
7087
#: bzrlib/reconcile.py:166
7088
msgid "Fixing last revision info {0} => {1}"
7089
msgstr ""
7090
7091
#: bzrlib/reconcile.py:173
7092
msgid "revision_history ok."
7093
msgstr ""
7094
7095
#: bzrlib/reconcile.py:234
7096
msgid "Reading inventory data"
7097
msgstr ""
7098
7099
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7100
msgid "Inventory ok."
7101
msgstr ""
7102
7103
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7104
msgid "Backing up inventory"
7105
msgstr ""
7106
7107
#: bzrlib/reconcile.py:258
7108
msgid "Backup inventory created."
7109
msgstr ""
7110
7111
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7112
msgid "Writing weave"
7113
msgstr ""
7114
7115
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7116
msgid "Inventory regenerated."
7117
msgstr ""
7118
7119
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7120
msgid "Reading indexes"
7121
msgstr ""
7122
7123
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7124
msgid "Checking unused inventories"
7125
msgstr ""
7126
7127
#: bzrlib/reconcile.py:388
7128
msgid "Backup Inventory created"
7129
msgstr ""
7130
7131
#: bzrlib/reconcile.py:446
7132
msgid "Fixing text parents"
7133
msgstr ""
7134
7135
#: bzrlib/reconfigure.py:54
7136
msgid "{0} is now stacked on {1}\n"
7137
msgstr ""
7138
7139
#: bzrlib/reconfigure.py:69
7140
#, python-format
7141
msgid "%s is now not stacked\n"
7142
msgstr ""
7143
7144
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7145
#, python-format
7146
msgid "bzr: ERROR (ignored): %s"
7147
msgstr ""
7148
7149
#: bzrlib/remote.py:2541
7150
msgid "Copying repository content as tarball..."
7151
msgstr ""
7152
7153
#: bzrlib/rename_map.py:69
7154
msgid "Calculating hashes"
7155
msgstr ""
7156
7157
#: bzrlib/rename_map.py:107
7158
msgid "Determining hash hits"
7159
msgstr ""
7160
7161
#: bzrlib/rename_map.py:242
7162
msgid "{0} => {1}"
7163
msgstr ""
7164
7165
#: bzrlib/repository.py:1787
7166
msgid "Moving repository to repository.backup"
7167
msgstr ""
7168
7169
#: bzrlib/repository.py:1794
7170
msgid "Creating new repository"
7171
msgstr ""
7172
7173
#: bzrlib/repository.py:1799
7174
msgid "Copying content"
7175
msgstr ""
7176
7177
#: bzrlib/repository.py:1803
7178
msgid "Deleting old repository content"
7179
msgstr ""
7180
7181
#: bzrlib/repository.py:1805
7182
msgid "repository converted"
7183
msgstr ""
7184
7185
#: bzrlib/revisionspec.py:903
7186
msgid "Using {0} {1}"
7187
msgstr ""
7188
7189
#: bzrlib/send.py:58
7190
#, python-format
7191
msgid "Mail client \"%s\" does not support specifying body"
7192
msgstr ""
7193
7194
#: bzrlib/send.py:62
7195
msgid "--remember requires a branch to be specified."
7196
msgstr ""
7197
7198
#: bzrlib/send.py:77
7199
msgid "No submit branch known or specified"
7200
msgstr ""
7201
7202
#: bzrlib/send.py:80
7203
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7204
msgstr ""
7205
7206
#: bzrlib/send.py:98
7207
#, python-format
7208
msgid "No such send format '%s'."
7209
msgstr ""
7210
7211
#: bzrlib/send.py:114
7212
msgid "bzr send takes at most two one revision identifiers"
7213
msgstr ""
7214
7215
#: bzrlib/send.py:127
7216
msgid "No revisions to submit."
7217
msgstr ""
7218
7219
#: bzrlib/send.py:139
7220
msgid ""
7221
"- not supported for merge directives that use more than one output file."
7222
msgstr ""
7223
7224
#: bzrlib/send.py:185
7225
msgid "Format 0.9 does not permit bundle with no patch"
7226
msgstr ""
7227
7228
#: bzrlib/shelf_ui.py:46
7229
#, python-format
7230
msgid "Shelve adding file \"%(path)s\"?"
7231
msgstr ""
7232
7233
#: bzrlib/shelf_ui.py:47
7234
msgid "Shelve binary changes?"
7235
msgstr ""
7236
7237
#: bzrlib/shelf_ui.py:48
7238
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7239
msgstr ""
7240
7241
#: bzrlib/shelf_ui.py:50
7242
#, python-format
7243
msgid "Shelve removing file \"%(path)s\"?"
7244
msgstr ""
7245
7246
#: bzrlib/shelf_ui.py:51
7247
#, python-format
7248
msgid "Shelve %d change(s)?"
7249
msgstr ""
7250
7251
#: bzrlib/shelf_ui.py:52
7252
msgid "Shelve?"
7253
msgstr ""
7254
7255
#: bzrlib/shelf_ui.py:53
7256
#, python-format
7257
msgid ""
7258
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7259
msgstr ""
7260
7261
#: bzrlib/shelf_ui.py:55
7262
#, python-format
7263
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7264
msgstr ""
7265
7266
#: bzrlib/shelf_ui.py:70
7267
#, python-format
7268
msgid "Changes shelved with id \"%d\"."
7269
msgstr ""
7270
7271
#: bzrlib/shelf_ui.py:74
7272
msgid "Selected changes destroyed."
7273
msgstr ""
7274
7275
#: bzrlib/shelf_ui.py:78
7276
msgid "Selected changes:"
7277
msgstr ""
7278
7279
#: bzrlib/shelf_ui.py:98
7280
#, python-format
7281
msgid "Delete file \"%(path)s\"?"
7282
msgstr ""
7283
7284
#: bzrlib/shelf_ui.py:99
7285
msgid "Apply binary changes?"
7286
msgstr ""
7287
7288
#: bzrlib/shelf_ui.py:100
7289
#, python-format
7290
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7291
msgstr ""
7292
7293
#: bzrlib/shelf_ui.py:102
7294
#, python-format
7295
msgid "Add file \"%(path)s\"?"
7296
msgstr ""
7297
7298
#: bzrlib/shelf_ui.py:103
7299
#, python-format
7300
msgid "Apply %d change(s)?"
7301
msgstr ""
7302
7303
#: bzrlib/shelf_ui.py:104
7304
msgid "Apply change?"
7305
msgstr ""
7306
7307
#: bzrlib/shelf_ui.py:105
7308
#, python-format
7309
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7310
msgstr ""
7311
7312
#: bzrlib/shelf_ui.py:107
7313
#, python-format
7314
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7315
msgstr ""
7316
7317
#: bzrlib/shelf_ui.py:402
7318
msgid "No changes are shelved."
7319
msgstr ""
7320
7321
#: bzrlib/shelf_ui.py:460
7322
#, python-format
7323
msgid "Using changes with id \"%d\"."
7324
msgstr ""
7325
7326
#: bzrlib/shelf_ui.py:464
7327
#, python-format
7328
msgid "Message: %s"
7329
msgstr ""
7330
7331
#: bzrlib/shelf_ui.py:476
7332
#, python-format
7333
msgid "Deleted changes with id \"%d\"."
7334
msgstr ""
7335
7336
#: bzrlib/smart/medium.py:714
7337
msgid "HPSS calls: {0} ({1} vfs) {2}"
7338
msgstr ""
7339
7340
#: bzrlib/smart/server.py:169
7341
msgid "Requested to stop gracefully"
7342
msgstr ""
7343
7344
#: bzrlib/smart/server.py:179
7345
#, python-format
7346
msgid "Waiting for %d client(s) to finish"
7347
msgstr ""
7348
7349
#: bzrlib/smart/server.py:185
7350
#, python-format
7351
msgid "Still waiting for %d client(s) to finish"
7352
msgstr ""
7353
7354
#: bzrlib/smart/server.py:219
7355
#, python-format
7356
msgid "listening socket error: %s"
7357
msgstr ""
7358
7359
#: bzrlib/smart/server.py:452
7360
#, python-format
7361
msgid "listening on port: %s"
7362
msgstr ""
7363
7364
#: bzrlib/switch.py:73
7365
msgid "Pending merges must be committed or reverted before using switch."
7366
msgstr ""
7367
7368
#: bzrlib/switch.py:100
7369
msgid ""
7370
"Cannot switch as local commits found in the checkout. Commit these to the "
7371
"bound branch or use --force to throw them away."
7372
msgstr ""
7373
7374
#: bzrlib/switch.py:105
7375
#, python-format
7376
msgid ""
7377
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7378
"anyway, use --force."
7379
msgstr ""
7380
7381
#: bzrlib/switch.py:125
7382
msgid "Cannot switch a branch, only a checkout."
7383
msgstr ""
7384
7385
#: bzrlib/switch.py:163
7386
#, python-format
7387
msgid "Tree is up to date at revision %d."
7388
msgstr ""
7389
7390
#: bzrlib/switch.py:169
7391
#, python-format
7392
msgid "Updated to revision %d."
7393
msgstr ""
7394
7395
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7396
msgid "Apply phase"
7397
msgstr ""
7398
7399
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7400
msgid "removing file"
7401
msgstr ""
7402
7403
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7404
msgid "adding file"
7405
msgstr ""
7406
7407
#: bzrlib/transform.py:2591
7408
msgid "Building tree"
7409
msgstr ""
7410
7411
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7412
msgid "Adding file contents"
7413
msgstr ""
7414
7415
#: bzrlib/transform.py:3028
7416
msgid "Resolution pass"
7417
msgstr ""
7418
7419
#: bzrlib/transport/ftp/_gssapi.py:88
7420
#, python-format
7421
msgid "Authenticated as %s"
7422
msgstr ""
7423
7424
#: bzrlib/tree.py:634
7425
msgid "*** {0} content-filter: {1} => {2!r}"
7426
msgstr ""
7427
7428
#: bzrlib/upgrade.py:77
7429
#, python-format
7430
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7431
msgstr ""
7432
7433
#: bzrlib/upgrade.py:100
7434
#, python-format
7435
msgid "cannot upgrade from bzrdir format %s"
7436
msgstr ""
7437
7438
#: bzrlib/upgrade.py:103
7439
#, python-format
7440
msgid "starting upgrade of %s"
7441
msgstr ""
7442
7443
#: bzrlib/upgrade.py:110
7444
msgid "finished"
7445
msgstr ""
7446
7447
#: bzrlib/upgrade.py:120
7448
msgid "Deleting backup.bzr"
7449
msgstr "Lösche backup.bzr"
7450
7451
#: bzrlib/upgrade.py:151
7452
msgid ""
7453
"\n"
7454
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7455
msgstr ""
7456
7457
#: bzrlib/upgrade.py:208
7458
#, python-format
7459
msgid "Found %d dependent branches - upgrading ..."
7460
msgstr ""
7461
7462
#: bzrlib/upgrade.py:276
7463
msgid "Upgrading bzrdirs"
7464
msgstr ""
7465
7466
#: bzrlib/upgrade.py:282
7467
#, python-format
7468
msgid "Upgrading %s"
7469
msgstr ""
7470
7471
#: bzrlib/upgrade.py:283
7472
msgid "Upgrading {0} {1} ..."
7473
msgstr ""
7474
7475
#: bzrlib/upgrade.py:301
7476
msgid "Removing backup ..."
7477
msgstr "Entferne Backup…"
7478
7479
#: bzrlib/upgrade.py:305
7480
msgid "failed to clean-up {0}: {1}"
7481
msgstr ""
7482
7483
#: bzrlib/vf_repository.py:1090
7484
msgid "inventories"
7485
msgstr ""
7486
7487
#: bzrlib/vf_repository.py:1116
7488
msgid "texts"
7489
msgstr ""
7490
7491
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7492
msgid "Calculating text parents"
7493
msgstr ""
7494
7495
#: bzrlib/vf_repository.py:1706
7496
msgid "Fetch texts"
7497
msgstr ""
7498
7499
#: bzrlib/vf_repository.py:2535
7500
msgid "loading text store"
7501
msgstr ""
7502
7503
#: bzrlib/vf_repository.py:2541
7504
msgid "checking text graph"
7505
msgstr ""
7506
7507
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7508
#: bzrlib/vf_repository.py:3124
7509
msgid "Transferring revisions"
7510
msgstr ""
7511
7512
#: bzrlib/win32utils.py:146
7513
msgid "Failed to GetProcessMemoryInfo()"
7514
msgstr ""
7515
7516
#: bzrlib/win32utils.py:167
7517
msgid "Cannot debug memory on win32 without ctypes or win32process"
7518
msgstr ""
7519
7520
#: bzrlib/win32utils.py:172
7521
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7522
msgstr ""
7523
7524
#: bzrlib/win32utils.py:180
7525
#, python-format
7526
msgid "WorkingSize %8d KiB"
7527
msgstr ""
7528
7529
#: bzrlib/win32utils.py:181
7530
#, python-format
7531
msgid "PeakWorking %8d KiB"
7532
msgstr ""
7533
7534
#: bzrlib/win32utils.py:182
7535
#, python-format
7536
msgid "PagefileUsage %8d KiB"
7537
msgstr ""
7538
7539
#: bzrlib/win32utils.py:183
7540
#, python-format
7541
msgid "PeakPagefileUsage %8d KiB"
7542
msgstr ""
7543
7544
#: bzrlib/win32utils.py:185
7545
#, python-format
7546
msgid "PrivateUsage %8d KiB"
7547
msgstr ""
7548
7549
#: bzrlib/win32utils.py:186
7550
#, python-format
7551
msgid "PageFaultCount %8d"
7552
msgstr ""
7553
7554
#: bzrlib/workingtree.py:1478
7555
msgid "Rerun update after fixing the conflicts."
7556
msgstr ""
7557
7558
#: dummy/help_topics/authentication/summary.txt:1
7559
msgid "Information on configuring authentication"
7560
msgstr ""
7561
7562
#: dummy/help_topics/basic/detail.txt:1
7563
msgid ""
7564
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7565
"http://bazaar.canonical.com/"
7566
msgstr ""
7567
"Bazaar 2.5b6 – Ein frei vertriebenes »Verteiltes Versionsverwaltungssystem«\n"
7568
"http://bazaar.canonical.com/"
7569
7570
#: dummy/help_topics/basic/detail.txt:4
7571
msgid ""
7572
"Basic commands:\n"
7573
" bzr init makes this directory a versioned branch\n"
7574
" bzr branch make a copy of another branch"
7575
msgstr ""
7576
"Grundbefehle:\n"
7577
" bzr init Aktuelles Verzeichnis wird zu einem versionierten Zweig "
7578
"gemacht\n"
7579
" bzr branch Eine Kopie eines anderen Entwicklungszweigs wird "
7580
"erstellt"
7581
7582
#: dummy/help_topics/basic/detail.txt:8
7583
msgid ""
7584
" bzr add make files or directories versioned\n"
7585
" bzr ignore ignore a file or pattern\n"
7586
" bzr mv move or rename a versioned file"
7587
msgstr ""
7588
" bzr add Dateien oder Verzeichnisse werden versioniert\n"
7589
" bzr ignore Eine Datei oder ein Dateimuster wird ignoriert\n"
7590
" bzr mv Eine versionierte Datei wird verschoben oder umbenannt"
7591
7592
#: dummy/help_topics/basic/detail.txt:12
7593
msgid ""
7594
" bzr status summarize changes in working copy\n"
7595
" bzr diff show detailed diffs"
7596
msgstr ""
7597
7598
#: dummy/help_topics/basic/detail.txt:15
7599
msgid ""
7600
" bzr merge pull in changes from another branch\n"
7601
" bzr commit save some or all changes\n"
7602
" bzr send send changes via email"
7603
msgstr ""
7604
7605
#: dummy/help_topics/basic/detail.txt:19
7606
msgid ""
7607
" bzr log show history of changes\n"
7608
" bzr check validate storage"
7609
msgstr ""
7610
7611
#: dummy/help_topics/basic/detail.txt:22
7612
msgid ""
7613
" bzr help init more help on e.g. init command\n"
7614
" bzr help commands list all commands\n"
7615
" bzr help topics list all help topics\n"
7616
msgstr ""
7617
7618
#: dummy/help_topics/basic/summary.txt:1
7619
msgid "Basic commands"
7620
msgstr ""
7621
7622
#: dummy/help_topics/branches/detail.txt:1
7623
msgid "Branches"
7624
msgstr ""
7625
7626
#: dummy/help_topics/branches/detail.txt:3
7627
msgid ""
7628
"A branch consists of the state of a project, including all of its\n"
7629
"history. All branches have a repository associated (which is where the\n"
7630
"branch history is stored), but multiple branches may share the same\n"
7631
"repository (a shared repository). Branches can be copied and merged."
7632
msgstr ""
7633
7634
#: dummy/help_topics/branches/detail.txt:8
7635
msgid ""
7636
"In addition, one branch may be bound to another one. Binding to another\n"
7637
"branch indicates that commits which happen in this branch must also \n"
7638
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7639
"commits when the two branches are out of date. In order for a commit \n"
7640
"to succeed, it may be necessary to update the current branch using \n"
7641
"``bzr update``."
7642
msgstr ""
7643
7644
#: dummy/help_topics/branches/detail.txt:15
7645
#: dummy/help_topics/checkouts/detail.txt:66
7646
#: dummy/help_topics/repositories/detail.txt:36
7647
msgid "Related commands::"
7648
msgstr ""
7649
7650
#: dummy/help_topics/branches/detail.txt:17
7651
msgid ""
7652
" init Change a directory into a versioned branch.\n"
7653
" branch Create a new branch that is a copy of an existing branch.\n"
7654
" merge Perform a three-way merge.\n"
7655
" bind Bind a branch to another one.\n"
7656
msgstr ""
7657
" init Ein Verzeichnis wird als ein versionierter Zweig festgelegt\n"
7658
" branch Ein neuer Zweig wird durch Kopieren eines bestehenden Zweigs "
7659
"erstellt\n"
7660
" merge Ein Dreiwege-Merge wird durchgeführt\n"
7661
" bind Ein Zweig wird mit einem anderen verbunden\n"
7662
7663
#: dummy/help_topics/branches/summary.txt:1
7664
msgid "Information on what a branch is"
7665
msgstr ""
7666
7667
#: dummy/help_topics/bugs/summary.txt:1
7668
msgid "Bug tracker settings"
7669
msgstr "Bug Tracker Einstellungen"
7670
7671
#: dummy/help_topics/checkouts/detail.txt:1
7672
msgid "Checkouts"
7673
msgstr ""
7674
7675
#: dummy/help_topics/checkouts/detail.txt:3
7676
msgid ""
7677
"Checkouts are source trees that are connected to a branch, so that when\n"
7678
"you commit in the source tree, the commit goes into that branch. They\n"
7679
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7680
"Bazaar's decentralized features until you want them. Using checkouts\n"
7681
"with shared repositories is very similar to working with SVN or CVS, but\n"
7682
"doesn't have the same restrictions. And using checkouts still allows\n"
7683
"others working on the project to use whatever workflow they like."
7684
msgstr ""
7685
7686
#: dummy/help_topics/checkouts/detail.txt:11
7687
msgid ""
7688
"A checkout is created with the bzr checkout command (see \"help "
7689
"checkout\").\n"
7690
"You pass it a reference to another branch, and it will create a local copy\n"
7691
"for you that still contains a reference to the branch you created the\n"
7692
"checkout from (the master branch). Then if you make any commits they will "
7693
"be\n"
7694
"made on the other branch first. This creates an instant mirror of your work, "
7695
"or\n"
7696
"facilitates lockstep development, where each developer is working together,\n"
7697
"continuously integrating the changes of others."
7698
msgstr ""
7699
7700
#: dummy/help_topics/checkouts/detail.txt:19
7701
msgid ""
7702
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7703
"you have the full history locally. As you have a first class branch you "
7704
"can\n"
7705
"also commit locally if you want, for instance due to the temporary loss af "
7706
"a\n"
7707
"network connection. Use the --local option to commit to do this. All the "
7708
"local\n"
7709
"commits will then be made on the master branch the next time you do a non-"
7710
"local\n"
7711
"commit."
7712
msgstr ""
7713
7714
#: dummy/help_topics/checkouts/detail.txt:26
7715
msgid ""
7716
"If you are using a checkout from a shared branch you will periodically want "
7717
"to\n"
7718
"pull in all the changes made by others. This is done using the \"update\"\n"
7719
"command. The changes need to be applied before any non-local commit, but\n"
7720
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7721
"command when needed."
7722
msgstr ""
7723
7724
#: dummy/help_topics/checkouts/detail.txt:32
7725
msgid ""
7726
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7727
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7728
"SVN checkout in that it is not a first class branch, it mainly consists of "
7729
"the\n"
7730
"working tree. This means that any history operations must query the master\n"
7731
"branch, which could be slow if a network connection is involved. Also, as "
7732
"you\n"
7733
"don't have a local branch, then you cannot commit locally."
7734
msgstr ""
7735
7736
#: dummy/help_topics/checkouts/detail.txt:39
7737
msgid ""
7738
"Lightweight checkouts work best when you have fast reliable access to the\n"
7739
"master branch. This means that if the master branch is on the same disk or "
7740
"LAN\n"
7741
"a lightweight checkout will be faster than a heavyweight one for any "
7742
"commands\n"
7743
"that modify the revision history (as only one copy of the branch needs to\n"
7744
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7745
"that uses the history but does not change it, but if the master branch is "
7746
"on\n"
7747
"the same disk then there won't be a noticeable difference."
7748
msgstr ""
7749
7750
#: dummy/help_topics/checkouts/detail.txt:47
7751
msgid ""
7752
"Another possible use for a checkout is to use it with a treeless repository\n"
7753
"containing your branches, where you maintain only one working tree by\n"
7754
"switching the master branch that the checkout points to when you want to\n"
7755
"work on a different branch."
7756
msgstr ""
7757
7758
#: dummy/help_topics/checkouts/detail.txt:52
7759
msgid ""
7760
"Obviously to commit on a checkout you need to be able to write to the "
7761
"master\n"
7762
"branch. This means that the master branch must be accessible over a "
7763
"writeable\n"
7764
"protocol , such as sftp://, and that you have write permissions at the "
7765
"other\n"
7766
"end. Checkouts also work on the local file system, so that all that matters "
7767
"is\n"
7768
"file permissions."
7769
msgstr ""
7770
7771
#: dummy/help_topics/checkouts/detail.txt:58
7772
msgid ""
7773
"You can change the master of a checkout by using the \"switch\" command "
7774
"(see\n"
7775
"\"help switch\"). This will change the location that the commits are sent "
7776
"to.\n"
7777
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7778
"checkout. If you would like to convert your heavy checkout into a normal\n"
7779
"branch so that every commit is local, you can use the \"unbind\" command. To "
7780
"see\n"
7781
"whether or not a branch is bound or not you can use the \"info\" command. If "
7782
"the\n"
7783
"branch is bound it will tell you the location of the bound branch."
7784
msgstr ""
7785
7786
#: dummy/help_topics/checkouts/detail.txt:68
7787
msgid ""
7788
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7789
" checkout\n"
7790
" update Pull any changes in the master branch in to your checkout\n"
7791
" commit Make a commit that is sent to the master branch. If you have\n"
7792
" a heavy checkout then the --local option will commit to the\n"
7793
" checkout without sending the commit to the master\n"
7794
" switch Change the master branch that the commits in the checkout "
7795
"will\n"
7796
" be sent to\n"
7797
" bind Turn a standalone branch into a heavy checkout so that any\n"
7798
" commits will be sent to the master branch\n"
7799
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7800
" commits are only made locally\n"
7801
" info Displays whether a branch is bound or unbound. If the branch "
7802
"is\n"
7803
" bound, then it will also display the location of the bound "
7804
"branch\n"
7805
msgstr ""
7806
7807
#: dummy/help_topics/checkouts/summary.txt:1
7808
msgid "Information on what a checkout is"
7809
msgstr ""
7810
7811
#: dummy/help_topics/commands/summary.txt:1
7812
msgid "Basic help for all commands"
7813
msgstr ""
7814
7815
#: dummy/help_topics/configuration/summary.txt:1
7816
msgid "Details on the configuration settings available"
7817
msgstr ""
7818
7819
#: dummy/help_topics/conflict-types/summary.txt:1
7820
msgid "Types of conflicts and what to do about them"
7821
msgstr ""
7822
7823
#: dummy/help_topics/content-filters/summary.txt:1
7824
msgid "Conversion of content into/from working trees"
7825
msgstr ""
7826
7827
#: dummy/help_topics/criss-cross/detail.txt:1
7828
msgid "Criss-Cross"
7829
msgstr ""
7830
7831
#: dummy/help_topics/criss-cross/detail.txt:3
7832
msgid ""
7833
"A criss-cross in the branch history can cause the default merge technique\n"
7834
"to emit more conflicts than would normally be expected."
7835
msgstr ""
7836
7837
#: dummy/help_topics/criss-cross/detail.txt:6
7838
msgid ""
7839
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7840
"give\n"
7841
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7842
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7843
msgstr ""
7844
7845
#: dummy/help_topics/criss-cross/detail.txt:10
7846
msgid ""
7847
"Criss-crosses occur in a branch's history if two branches merge the same "
7848
"thing\n"
7849
"and then merge one another, or if two branches merge one another at the "
7850
"same\n"
7851
"time. They can be avoided by having each branch only merge from or into a\n"
7852
"designated central branch (a \"star topology\")."
7853
msgstr ""
7854
7855
#: dummy/help_topics/criss-cross/detail.txt:15
7856
msgid ""
7857
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7858
"default\n"
7859
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7860
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7861
"differences between THIS and OTHER are due to one side adding lines, or\n"
7862
"from another side removing lines."
7863
msgstr ""
7864
7865
#: dummy/help_topics/criss-cross/detail.txt:21
7866
msgid ""
7867
"Criss-crosses mean there is no good choice for a base. Selecting the "
7868
"recent\n"
7869
"merge points could cause one side's changes to be silently discarded.\n"
7870
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7871
"are emitted."
7872
msgstr ""
7873
7874
#: dummy/help_topics/criss-cross/detail.txt:26
7875
msgid ""
7876
"The ``weave`` merge type is not affected by this problem because it uses\n"
7877
"line-origin detection instead of a basis revision to determine the cause of\n"
7878
"differences.\n"
7879
msgstr ""
7880
7881
#: dummy/help_topics/criss-cross/summary.txt:1
7882
msgid "Information on criss-cross merging"
7883
msgstr ""
7884
7885
#: dummy/help_topics/current-formats/summary.txt:1
7886
msgid "Current storage formats"
7887
msgstr "Aktuelle Speicherformate"
7888
7889
#: dummy/help_topics/debug-flags/summary.txt:1
7890
msgid "Options to show or record debug information"
7891
msgstr ""
7892
7893
#: dummy/help_topics/diverged-branches/summary.txt:1
7894
msgid "How to fix diverged branches"
7895
msgstr ""
7896
7897
#: dummy/help_topics/env-variables/detail.txt:1
7898
msgid "Environment Variables"
7899
msgstr ""
7900
7901
#: dummy/help_topics/env-variables/detail.txt:3
7902
msgid ""
7903
"=================== "
7904
"===========================================================\n"
7905
"BZRPATH Path where bzr is to look for shell plugin external\n"
7906
" commands.\n"
7907
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7908
"EMAIL E-Mail address of the user.\n"
7909
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7910
"EDITOR Editor for editing commit messages.\n"
7911
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7912
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7913
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7914
"BZR_PLUGIN_PATH.\n"
7915
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7916
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7917
"and\n"
7918
" HOME.\n"
7919
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7920
"URLs).\n"
7921
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7922
"sshcorp,\n"
7923
" plink or lsh.\n"
7924
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7925
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7926
"BZR_COLUMNS Override implicit terminal width.\n"
7927
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7928
"(selftest)\n"
7929
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7930
"'text'.\n"
7931
"BZR_PDB Control whether to launch a debugger on error.\n"
7932
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7933
" breakin debugger.\n"
7934
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7935
"(instead\n"
7936
" of char-based).\n"
7937
"=================== "
7938
"===========================================================\n"
7939
msgstr ""
7940
7941
#: dummy/help_topics/env-variables/summary.txt:1
7942
msgid "Environment variable names and values"
7943
msgstr ""
7944
7945
#: dummy/help_topics/eol/summary.txt:1
7946
msgid "Information on end-of-line handling"
7947
msgstr ""
7948
7949
#: dummy/help_topics/files/detail.txt:1
7950
msgid "Files"
7951
msgstr ""
7952
7953
#: dummy/help_topics/files/detail.txt:3
7954
msgid ""
7955
":On Unix: ~/.bazaar/bazaar.conf\n"
7956
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7957
"bazaar\\\\2.0\\\\bazaar.conf"
7958
msgstr ""
7959
7960
#: dummy/help_topics/files/detail.txt:6
7961
msgid ""
7962
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7963
"used to define general configuration that will be applied everywhere.\n"
7964
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7965
"commonly used options."
7966
msgstr ""
7967
7968
#: dummy/help_topics/files/detail.txt:11
7969
msgid "A typical config file might look something like::"
7970
msgstr "Eine typische Konfigurationsdatei könnte so aussehen::"
7971
7972
#: dummy/help_topics/files/detail.txt:13
7973
msgid ""
7974
" [DEFAULT]\n"
7975
" email=John Doe <jdoe@isp.com>"
7976
msgstr ""
7977
7978
#: dummy/help_topics/files/detail.txt:16
7979
msgid ""
7980
" [ALIASES]\n"
7981
" commit = commit --strict\n"
7982
" log10 = log --short -r -10..-1\n"
7983
msgstr ""
7984
7985
#: dummy/help_topics/files/summary.txt:1
7986
msgid "Information on configuration and log files"
7987
msgstr ""
7988
7989
#: dummy/help_topics/formats/detail.txt:1
7990
msgid "Storage Formats"
7991
msgstr "Speicherformate"
7992
7993
#: dummy/help_topics/formats/detail.txt:3
7994
msgid ""
7995
"To ensure that older clients do not access data incorrectly,\n"
7996
"Bazaar's policy is to introduce a new storage format whenever\n"
7997
"new features requiring new metadata are added. New storage\n"
7998
"formats may also be introduced to improve performance and\n"
7999
"scalability."
8000
msgstr ""
8001
8002
#: dummy/help_topics/formats/detail.txt:9
8003
msgid ""
8004
"The newest format, 2a, is highly recommended. If your\n"
8005
"project is not using 2a, then you should suggest to the\n"
8006
"project owner to upgrade."
8007
msgstr ""
8008
8009
#: dummy/help_topics/formats/detail.txt:13
8010
msgid ""
8011
"\n"
8012
".. note::"
8013
msgstr ""
8014
8015
#: dummy/help_topics/formats/detail.txt:16
8016
msgid ""
8017
" Some of the older formats have two variants:\n"
8018
" a plain one and a rich-root one. The latter include an additional\n"
8019
" field about the root of the tree. There is no performance cost\n"
8020
" for using a rich-root format but you cannot easily merge changes\n"
8021
" from a rich-root format into a plain format. As a consequence,\n"
8022
" moving a project to a rich-root format takes some co-ordination\n"
8023
" in that all contributors need to upgrade their repositories\n"
8024
" around the same time. 2a and all future formats will be\n"
8025
" implicitly rich-root."
8026
msgstr ""
8027
8028
#: dummy/help_topics/formats/detail.txt:26
8029
msgid ""
8030
"See :doc:`current-formats-help` for the complete list of\n"
8031
"currently supported formats. See :doc:`other-formats-help` for\n"
8032
"descriptions of any available experimental and deprecated formats.\n"
8033
msgstr ""
8034
8035
#: dummy/help_topics/formats/summary.txt:1
8036
msgid "Information on choosing a storage format"
8037
msgstr "Informationen zur Auswahl eines Speicherformats"
8038
8039
#: dummy/help_topics/global-options/detail.txt:1
8040
msgid "Global Options"
8041
msgstr ""
8042
8043
#: dummy/help_topics/global-options/detail.txt:3
8044
msgid ""
8045
"These options may be used with any command, and may appear in front of any\n"
8046
"command. (e.g. ``bzr --profile help``)."
8047
msgstr ""
8048
8049
#: dummy/help_topics/global-options/detail.txt:6
8050
msgid ""
8051
"--version Print the version number. Must be supplied before the "
8052
"command.\n"
8053
"--no-aliases Do not process command aliases when running this command.\n"
8054
"--builtin Use the built-in version of a command, not the plugin "
8055
"version.\n"
8056
" This does not suppress other plugin effects.\n"
8057
"--no-plugins Do not process any plugins.\n"
8058
"--no-l10n Do not translate messages.\n"
8059
"--concurrency Number of processes that can be run concurrently (selftest)."
8060
msgstr ""
8061
8062
#: dummy/help_topics/global-options/detail.txt:14
8063
msgid ""
8064
"--profile Profile execution using the hotshot profiler.\n"
8065
"--lsprof Profile execution using the lsprof profiler.\n"
8066
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8067
" results to a specified file. If the filename ends with "
8068
"\".txt\",\n"
8069
" text format will be used. If the filename either starts "
8070
"with\n"
8071
" \"callgrind.out\" or end with \".callgrind\", the output will "
8072
"be\n"
8073
" formatted for use with KCacheGrind. Otherwise, the output\n"
8074
" will be a pickle.\n"
8075
"--coverage Generate line coverage report in the specified directory."
8076
msgstr ""
8077
8078
#: dummy/help_topics/global-options/detail.txt:24
8079
msgid ""
8080
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8081
"for\n"
8082
" the duration of the command. This can be used multiple times "
8083
"if\n"
8084
" several options need to be overridden."
8085
msgstr ""
8086
8087
#: dummy/help_topics/global-options/detail.txt:28
8088
msgid ""
8089
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8090
"information on profiling."
8091
msgstr ""
8092
8093
#: dummy/help_topics/global-options/detail.txt:31
8094
msgid ""
8095
"A number of debug flags are also available to assist troubleshooting and\n"
8096
"development. See :doc:`debug-flags-help`.\n"
8097
msgstr ""
8098
8099
#: dummy/help_topics/global-options/summary.txt:1
8100
msgid "Options that control how Bazaar runs"
8101
msgstr ""
8102
8103
#: dummy/help_topics/hidden-commands/summary.txt:1
8104
msgid "All hidden commands"
8105
msgstr "Alle versteckten Befehle"
8106
8107
#: dummy/help_topics/hooks/summary.txt:1
8108
msgid "Points at which custom processing can be added"
8109
msgstr ""
8110
8111
#: dummy/help_topics/launchpad/detail.txt:1
8112
msgid "Integration with Launchpad.net"
8113
msgstr "Integration mit Launchpad.net"
8114
8115
#: dummy/help_topics/launchpad/detail.txt:3
8116
msgid ""
8117
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8118
"specification tracking."
8119
msgstr ""
8120
8121
#: dummy/help_topics/launchpad/detail.txt:6
8122
msgid ""
8123
"The bzr client (through the plugin called 'launchpad') has special\n"
8124
"features to communicate with Launchpad:"
8125
msgstr ""
8126
8127
#: dummy/help_topics/launchpad/detail.txt:9
8128
msgid ""
8129
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8130
"This\n"
8131
" is then used by the 'lp:' transport to download your branches using\n"
8132
" bzr+ssh://."
8133
msgstr ""
8134
8135
#: dummy/help_topics/launchpad/detail.txt:13
8136
msgid ""
8137
" * The 'lp:' transport uses Launchpad as a directory service: for "
8138
"example\n"
8139
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8140
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8141
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8142
msgstr ""
8143
8144
#: dummy/help_topics/launchpad/detail.txt:18
8145
msgid ""
8146
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8147
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8148
"lp:12345'\n"
8149
" will record a revision property that marks that revision as fixing\n"
8150
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8151
" automatically be linked to the bug report."
8152
msgstr ""
8153
8154
#: dummy/help_topics/launchpad/detail.txt:24
8155
msgid ""
8156
" * The register-branch command tells Launchpad about the url of a\n"
8157
" public branch. Launchpad will then mirror the branch, display\n"
8158
" its contents and allow it to be attached to bugs and other\n"
8159
" objects."
8160
msgstr ""
8161
8162
#: dummy/help_topics/launchpad/detail.txt:29
8163
msgid "For more information see http://help.launchpad.net/\n"
8164
msgstr "Für weitere Informationen siehe http://help.launchpad.net/\n"
8165
8166
#: dummy/help_topics/launchpad/summary.txt:1
8167
msgid "Using Bazaar with Launchpad.net"
8168
msgstr ""
8169
8170
#: dummy/help_topics/location-alias/summary.txt:1
8171
msgid "Aliases for remembered locations"
8172
msgstr ""
8173
8174
#: dummy/help_topics/log-formats/summary.txt:1
8175
msgid "Details on the logging formats available"
8176
msgstr ""
8177
8178
#: dummy/help_topics/other-formats/summary.txt:1
8179
msgid "Experimental and deprecated storage formats"
8180
msgstr ""
8181
8182
#: dummy/help_topics/patterns/summary.txt:1
8183
msgid "Information on the pattern syntax"
8184
msgstr ""
8185
8186
#: dummy/help_topics/repositories/detail.txt:1
8187
msgid "Repositories"
8188
msgstr ""
8189
8190
#: dummy/help_topics/repositories/detail.txt:3
8191
msgid ""
8192
"Repositories in Bazaar are where committed information is stored. There is\n"
8193
"a repository associated with every branch."
8194
msgstr ""
8195
8196
#: dummy/help_topics/repositories/detail.txt:6
8197
msgid ""
8198
"Repositories are a form of database. Bzr will usually maintain this for\n"
8199
"good performance automatically, but in some situations (e.g. when doing\n"
8200
"very many commits in a short time period) you may want to ask bzr to\n"
8201
"optimise the database indices. This can be done by the 'bzr pack' command."
8202
msgstr ""
8203
8204
#: dummy/help_topics/repositories/detail.txt:11
8205
msgid ""
8206
"By default just running 'bzr init' will create a repository within the new\n"
8207
"branch but it is possible to create a shared repository which allows "
8208
"multiple\n"
8209
"branches to share their information in the same location. When a new branch "
8210
"is\n"
8211
"created it will first look to see if there is a containing shared repository "
8212
"it\n"
8213
"can use."
8214
msgstr ""
8215
8216
#: dummy/help_topics/repositories/detail.txt:17
8217
msgid ""
8218
"When two branches of the same project share a repository, there is\n"
8219
"generally a large space saving. For some operations (e.g. branching\n"
8220
"within the repository) this translates in to a large time saving."
8221
msgstr ""
8222
8223
#: dummy/help_topics/repositories/detail.txt:21
8224
msgid ""
8225
"To create a shared repository use the init-repository command (or the alias\n"
8226
"init-repo). This command takes the location of the repository to create. "
8227
"This\n"
8228
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8229
"which contains a shared repository. Any new branches that are created in "
8230
"this\n"
8231
"directory will then use it for storage."
8232
msgstr ""
8233
8234
#: dummy/help_topics/repositories/detail.txt:27
8235
msgid ""
8236
"It is a good idea to create a repository whenever you might create more\n"
8237
"than one branch of a project. This is true for both working areas where you\n"
8238
"are doing the development, and any server areas that you use for hosting\n"
8239
"projects. In the latter case, it is common to want branches without working\n"
8240
"trees. Since the files in the branch will not be edited directly there is "
8241
"no\n"
8242
"need to use up disk space for a working tree. To create a repository in "
8243
"which\n"
8244
"the branches will not have working trees pass the '--no-trees' option to\n"
8245
"'init-repository'."
8246
msgstr ""
8247
8248
#: dummy/help_topics/repositories/detail.txt:38
8249
msgid ""
8250
" init-repository Create a shared repository. Use --no-trees to create "
8251
"one\n"
8252
" in which new branches won't get a working tree.\n"
8253
msgstr ""
8254
8255
#: dummy/help_topics/repositories/summary.txt:1
8256
msgid "Basic information on shared repositories."
8257
msgstr ""
8258
8259
#: dummy/help_topics/revisionspec/summary.txt:1
8260
msgid "Explain how to use --revision"
8261
msgstr ""
8262
8263
#: dummy/help_topics/rules/summary.txt:1
8264
msgid "Information on defining rule-based preferences"
8265
msgstr ""
8266
8267
#: dummy/help_topics/standalone-trees/detail.txt:1
8268
msgid "Standalone Trees"
8269
msgstr ""
8270
8271
#: dummy/help_topics/standalone-trees/detail.txt:3
8272
msgid ""
8273
"A standalone tree is a working tree with an associated repository. It\n"
8274
"is an independently usable branch, with no dependencies on any other.\n"
8275
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8276
"an existing project under version control."
8277
msgstr ""
8278
8279
#: dummy/help_topics/standalone-trees/detail.txt:8
8280
msgid "Related Commands::"
8281
msgstr ""
8282
8283
#: dummy/help_topics/standalone-trees/detail.txt:10
8284
msgid " init Make a directory into a versioned branch.\n"
8285
msgstr " init Ein Verzeichnis zu einem versionierten Zweig machen.\n"
8286
8287
#: dummy/help_topics/standalone-trees/summary.txt:1
8288
msgid "Information on what a standalone tree is"
8289
msgstr ""
8290
8291
#: dummy/help_topics/standard-options/detail.txt:1
8292
msgid "Standard Options"
8293
msgstr "Standard-Optionen"
8294
8295
#: dummy/help_topics/standard-options/detail.txt:3
8296
msgid "Standard options are legal for all commands."
8297
msgstr ""
8298
8299
#: dummy/help_topics/standard-options/detail.txt:5
8300
msgid ""
8301
"--help, -h Show help message.\n"
8302
"--verbose, -v Display more information.\n"
8303
"--quiet, -q Only display errors and warnings."
8304
msgstr ""
8305
8306
#: dummy/help_topics/standard-options/detail.txt:9
8307
msgid "Unlike global options, standard options can be used in aliases.\n"
8308
msgstr ""
8309
8310
#: dummy/help_topics/standard-options/summary.txt:1
8311
msgid "Options that can be used with any command"
8312
msgstr ""
8313
8314
#: dummy/help_topics/status-flags/detail.txt:1
8315
msgid "Status Flags"
8316
msgstr "Status-Flags"
8317
8318
#: dummy/help_topics/status-flags/detail.txt:3
8319
msgid ""
8320
"Status flags are used to summarise changes to the working tree in a concise\n"
8321
"manner. They are in the form::"
8322
msgstr ""
8323
8324
#: dummy/help_topics/status-flags/detail.txt:6
8325
msgid " xxx <filename>"
8326
msgstr ""
8327
8328
#: dummy/help_topics/status-flags/detail.txt:8
8329
msgid "where the columns' meanings are as follows."
8330
msgstr ""
8331
8332
#: dummy/help_topics/status-flags/detail.txt:10
8333
msgid "Column 1 - versioning/renames::"
8334
msgstr ""
8335
8336
#: dummy/help_topics/status-flags/detail.txt:12
8337
msgid ""
8338
" + File versioned\n"
8339
" - File unversioned\n"
8340
" R File renamed\n"
8341
" ? File unknown\n"
8342
" X File nonexistent (and unknown to bzr)\n"
8343
" C File has conflicts\n"
8344
" P Entry for a pending merge (not a file)"
8345
msgstr ""
8346
8347
#: dummy/help_topics/status-flags/detail.txt:20
8348
msgid "Column 2 - contents::"
8349
msgstr ""
8350
8351
#: dummy/help_topics/status-flags/detail.txt:22
8352
msgid ""
8353
" N File created\n"
8354
" D File deleted\n"
8355
" K File kind changed\n"
8356
" M File modified"
8357
msgstr ""
8358
8359
#: dummy/help_topics/status-flags/detail.txt:27
8360
msgid "Column 3 - execute::"
8361
msgstr ""
8362
8363
#: dummy/help_topics/status-flags/detail.txt:29
8364
msgid " * The execute bit was changed\n"
8365
msgstr ""
8366
8367
#: dummy/help_topics/status-flags/summary.txt:1
8368
msgid "Help on status flags"
8369
msgstr ""
8370
8371
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8372
msgid "Branches Out of Sync"
8373
msgstr ""
8374
8375
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8376
msgid ""
8377
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8378
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8379
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8380
"have the same last revision as the new reference branch for the lightweight\n"
8381
"checkout, data could be lost, so Bazaar refuses."
8382
msgstr ""
8383
8384
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8385
msgid "How you deal with this depends on *why* the branches are out of sync."
8386
msgstr ""
8387
8388
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8389
msgid ""
8390
"If you have a checkout and have done local commits, you can get back in "
8391
"sync\n"
8392
"by running \"bzr update\" (and possibly \"bzr commit\")."
8393
msgstr ""
8394
8395
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8396
msgid ""
8397
"If you have a branch and the remote branch is out-of-date, you can push\n"
8398
"the local changes using \"bzr push\". If the local branch is out of date, "
8399
"you\n"
8400
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8401
"commit\n"
8402
"and then push your changes. If you decide that some of the changes aren't\n"
8403
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8404
msgstr ""
8405
8406
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8407
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8408
msgstr ""
8409
8410
#: dummy/help_topics/topics/summary.txt:1
8411
msgid "Topics list"
8412
msgstr "Themen-Liste"
8413
8414
#: dummy/help_topics/url-special-chars/summary.txt:1
8415
msgid "Special character handling in URLs"
8416
msgstr ""
8417
8418
#: dummy/help_topics/urlspec/summary.txt:1
8419
msgid "Supported transport protocols"
8420
msgstr "Unterstützte Transportprotokolle"
8421
8422
#: dummy/help_topics/working-trees/detail.txt:1
8423
msgid "Working Trees"
8424
msgstr ""
8425
8426
#: dummy/help_topics/working-trees/detail.txt:3
8427
msgid ""
8428
"A working tree is the contents of a branch placed on disk so that you can\n"
8429
"see the files and edit them. The working tree is where you make changes to "
8430
"a\n"
8431
"branch, and when you commit the current state of the working tree is the\n"
8432
"snapshot that is recorded in the commit."
8433
msgstr ""
8434
8435
#: dummy/help_topics/working-trees/detail.txt:8
8436
msgid ""
8437
"When you push a branch to a remote system, a working tree will not be\n"
8438
"created. If one is already present the files will not be updated. The\n"
8439
"branch information will be updated and the working tree will be marked\n"
8440
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8441
"may be uncommitted changes or the update may cause content conflicts that "
8442
"are\n"
8443
"difficult to deal with remotely."
8444
msgstr ""
8445
8446
#: dummy/help_topics/working-trees/detail.txt:15
8447
msgid ""
8448
"If you have a branch with no working tree you can use the 'checkout' "
8449
"command\n"
8450
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8451
"will\n"
8452
"create the working tree. If the branch is updated remotely, you can update "
8453
"the\n"
8454
"working tree by running 'bzr update' in that directory."
8455
msgstr ""
8456
8457
#: dummy/help_topics/working-trees/detail.txt:20
8458
msgid ""
8459
"If you have a branch with a working tree that you do not want the 'remove-"
8460
"tree'\n"
8461
"command will remove the tree if it is safe. This can be done to avoid the\n"
8462
"warning about the remote working tree not being updated when pushing to the\n"
8463
"branch. It can also be useful when working with a '--no-trees' repository\n"
8464
"(see 'bzr help repositories')."
8465
msgstr ""
8466
8467
#: dummy/help_topics/working-trees/detail.txt:26
8468
msgid ""
8469
"If you want to have a working tree on a remote machine that you push to you\n"
8470
"can either run 'bzr update' in the remote branch after each push, or use "
8471
"some\n"
8472
"other method to update the tree during the push. There is an 'rspush' "
8473
"plugin\n"
8474
"that will update the working tree using rsync as well as doing a push. "
8475
"There\n"
8476
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8477
"SSH\n"
8478
"after each push."
8479
msgstr ""
8480
8481
#: dummy/help_topics/working-trees/detail.txt:33
8482
msgid "Useful commands::"
8483
msgstr "Nützliche Befehle::"
8484
8485
#: dummy/help_topics/working-trees/detail.txt:35
8486
msgid ""
8487
" checkout Create a working tree when a branch does not have one.\n"
8488
" remove-tree Removes the working tree from a branch when it is safe to do "
8489
"so.\n"
8490
" update When a working tree is out of sync with its associated "
8491
"branch\n"
8492
" this will update the tree to match the branch.\n"
8493
msgstr ""
8494
8495
#: dummy/help_topics/working-trees/summary.txt:1
8496
msgid "Information on working trees"
8497
msgstr ""
8498
8499
#: en/help_topics/authentication.txt:1
8500
msgid ""
8501
"Authentication Settings\n"
8502
"======================="
8503
msgstr ""
8504
8505
#: en/help_topics/authentication.txt:4
8506
msgid ""
8507
"\n"
8508
"Intent\n"
8509
"------"
8510
msgstr ""
8511
8512
#: en/help_topics/authentication.txt:8
8513
msgid ""
8514
"Many different authentication policies can be described in the\n"
8515
"``authentication.conf`` file but a particular user should need only a few\n"
8516
"definitions to cover his needs without having to specify a user and a "
8517
"password\n"
8518
"for every branch he uses."
8519
msgstr ""
8520
8521
#: en/help_topics/authentication.txt:13
8522
msgid ""
8523
"The definitions found in this file are used to find the credentials to use "
8524
"for\n"
8525
"a given url. The same credentials can generally be used for as many branches "
8526
"as\n"
8527
"possible by grouping their declaration around the remote servers that need\n"
8528
"them. It's even possible to declare credentials that will be used by "
8529
"different\n"
8530
"servers."
8531
msgstr ""
8532
8533
#: en/help_topics/authentication.txt:19
8534
msgid ""
8535
"The intent is to make this file as small as possible to minimize maintenance."
8536
msgstr ""
8537
8538
#: en/help_topics/authentication.txt:21
8539
msgid ""
8540
"Once the relevant credentials are declared in this file you may use branch "
8541
"urls\n"
8542
"without embedding passwords (security hazard) or even users (enabling "
8543
"sharing\n"
8544
"of your urls with others)."
8545
msgstr ""
8546
8547
#: en/help_topics/authentication.txt:25
8548
msgid "Instead of using::"
8549
msgstr ""
8550
8551
#: en/help_topics/authentication.txt:27
8552
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8553
msgstr " bzr branch ftp://joe:secret@host.com/pfad/zu/meiner/branch"
8554
8555
#: en/help_topics/authentication.txt:29
8556
msgid "you simply use::"
8557
msgstr ""
8558
8559
#: en/help_topics/authentication.txt:31
8560
msgid " bzr branch ftp://host.com/path/to/my/branch"
8561
msgstr " bzr branch ftp://host.com/pfad/zu/meiner/branch"
8562
8563
#: en/help_topics/authentication.txt:33
8564
msgid ""
8565
"provided you have created the following ``authentication.conf`` file::"
8566
msgstr ""
8567
8568
#: en/help_topics/authentication.txt:35
8569
msgid ""
8570
" [myprojects]\n"
8571
" scheme=ftp\n"
8572
" host=host.com\n"
8573
" user=joe\n"
8574
" password=secret\n"
8575
" "
8576
msgstr ""
8577
" [myprojects]\n"
8578
" scheme=ftp\n"
8579
" host=host.de\n"
8580
" user=joe\n"
8581
" password=secret\n"
8582
" "
8583
8584
#: en/help_topics/authentication.txt:42
8585
msgid ""
8586
"Authentication definitions\n"
8587
"--------------------------"
8588
msgstr ""
8589
8590
#: en/help_topics/authentication.txt:45
8591
msgid ""
8592
"There are two kinds of authentication used by the various schemes supported "
8593
"by\n"
8594
"bzr:"
8595
msgstr ""
8596
8597
#: en/help_topics/authentication.txt:48
8598
msgid "1. user and password"
8599
msgstr "1. Benutzername und Passwort"
8600
8601
#: en/help_topics/authentication.txt:50
8602
msgid ""
8603
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8604
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8605
"ssh agents are a better, more secure solution. So we have chosen to not "
8606
"provide\n"
8607
"our own less secure method."
8608
msgstr ""
8609
8610
#: en/help_topics/authentication.txt:55
8611
msgid "2. user, realm and password"
8612
msgstr ""
8613
8614
#: en/help_topics/authentication.txt:57
8615
msgid ""
8616
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8617
"against a host. But, by using ``.htaccess`` files, for example, it is "
8618
"possible\n"
8619
"to define several (``user, realm, password``) for a given ``host``. So what "
8620
"is\n"
8621
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8622
"is\n"
8623
"not taken into account in the definitions, but will displayed if bzr "
8624
"prompts\n"
8625
"you for a password."
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:64
8629
msgid ""
8630
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8631
"specifying the appropriate port."
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:67
8635
msgid ""
8636
"To take all schemes into account, the password will be deduced from a set "
8637
"of\n"
8638
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8639
"``user``,\n"
8640
"``password``)."
8641
msgstr ""
8642
8643
#: en/help_topics/authentication.txt:71
8644
msgid ""
8645
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8646
"used\n"
8647
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8648
"``ssh``\n"
8649
" should be used instead since this is the real scheme regarding\n"
8650
" authentication,"
8651
msgstr ""
8652
8653
#: en/help_topics/authentication.txt:76
8654
msgid " * ``host``: can be empty (to act as a default for any host),"
8655
msgstr ""
8656
8657
#: en/help_topics/authentication.txt:78
8658
msgid ""
8659
" * ``port`` can be empty (useful when an host provides several servers for "
8660
"the\n"
8661
" same scheme), only numerical values are allowed, this should be used "
8662
"only\n"
8663
" when the server uses a port different than the scheme standard port,"
8664
msgstr ""
8665
8666
#: en/help_topics/authentication.txt:82
8667
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8668
msgstr ""
8669
8670
#: en/help_topics/authentication.txt:84
8671
msgid ""
8672
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8673
" ``getpass.get_user()``),"
8674
msgstr ""
8675
8676
#: en/help_topics/authentication.txt:87
8677
msgid ""
8678
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8679
" password."
8680
msgstr ""
8681
8682
#: en/help_topics/authentication.txt:90
8683
msgid ""
8684
"Multiple definitions can be provided and, for a given URL, bzr will select "
8685
"a\n"
8686
"(``user`` [, ``password``]) based on the following rules :"
8687
msgstr ""
8688
8689
#: en/help_topics/authentication.txt:93
8690
msgid " 1. the first match wins,"
8691
msgstr ""
8692
8693
#: en/help_topics/authentication.txt:95
8694
msgid " 2. empty fields match everything,"
8695
msgstr ""
8696
8697
#: en/help_topics/authentication.txt:97
8698
msgid ""
8699
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8700
msgstr ""
8701
8702
#: en/help_topics/authentication.txt:99
8703
msgid ""
8704
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8705
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8706
"``projectbzr.sf.net``\n"
8707
" will not match ``bzr.sf.net``)."
8708
msgstr ""
8709
8710
#: en/help_topics/authentication.txt:103
8711
msgid ""
8712
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8713
msgstr ""
8714
8715
#: en/help_topics/authentication.txt:105
8716
msgid ""
8717
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8718
"above,\n"
8719
" empty paths will match any provided path)."
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:110
8723
msgid ""
8724
"File format\n"
8725
"-----------"
8726
msgstr ""
8727
"Dateiformat\n"
8728
"-----------"
8729
8730
#: en/help_topics/authentication.txt:113
8731
msgid ""
8732
"The general rules for :doc:`configuration files <configuration-help>`\n"
8733
"apply except for the variable policies."
8734
msgstr ""
8735
8736
#: en/help_topics/authentication.txt:116
8737
msgid "Each section describes an authentication definition."
8738
msgstr ""
8739
8740
#: en/help_topics/authentication.txt:118
8741
msgid ""
8742
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8743
"reserved\n"
8744
"and should appear as the *last* section."
8745
msgstr ""
8746
8747
#: en/help_topics/authentication.txt:121
8748
msgid "Each section should define:"
8749
msgstr ""
8750
8751
#: en/help_topics/authentication.txt:123
8752
msgid "* ``user``: the login to be used,"
8753
msgstr ""
8754
8755
#: en/help_topics/authentication.txt:125
8756
msgid "Each section could define:"
8757
msgstr ""
8758
8759
#: en/help_topics/authentication.txt:127
8760
msgid "* ``host``: the remote server,"
8761
msgstr ""
8762
8763
#: en/help_topics/authentication.txt:129
8764
msgid "* ``port``: the port the server is listening,"
8765
msgstr "* ``port``: der Port auf dem der Server horcht,"
8766
8767
#: en/help_topics/authentication.txt:131
8768
msgid "* ``path``: the branch location,"
8769
msgstr ""
8770
8771
#: en/help_topics/authentication.txt:133
8772
msgid "* ``password``: the password."
8773
msgstr "* ``password``: das Passwort."
8774
8775
#: en/help_topics/authentication.txt:135
8776
msgid ""
8777
"\n"
8778
"Examples\n"
8779
"--------"
8780
msgstr ""
8781
"\n"
8782
"Beispiele\n"
8783
"---------"
8784
8785
#: en/help_topics/authentication.txt:139
8786
msgid ""
8787
"\n"
8788
"Personal projects hosted outside\n"
8789
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8790
msgstr ""
8791
8792
#: en/help_topics/authentication.txt:143
8793
msgid ""
8794
"All connections are done with the same ``user`` (the remote one for which "
8795
"the\n"
8796
"default bzr one is not appropriate) and the password is always prompted "
8797
"with\n"
8798
"some exceptions::"
8799
msgstr ""
8800
8801
#: en/help_topics/authentication.txt:147
8802
msgid ""
8803
" # Pet projects on hobby.net\n"
8804
" [hobby]\n"
8805
" host=r.hobby.net\n"
8806
" user=jim\n"
8807
" password=obvious1234\n"
8808
" \n"
8809
" # Home server\n"
8810
" [home]\n"
8811
" scheme=https\n"
8812
" host=home.net\n"
8813
" user=joe\n"
8814
" password=1essobV10us\n"
8815
" \n"
8816
" [DEFAULT]\n"
8817
" # Our local user is barbaz, on all remote sites we're known as "
8818
"foobar\n"
8819
" user=foobar"
8820
msgstr ""
8821
8822
#: en/help_topics/authentication.txt:164
8823
msgid ""
8824
"\n"
8825
"Source hosting provider\n"
8826
"~~~~~~~~~~~~~~~~~~~~~~~"
8827
msgstr ""
8828
8829
#: en/help_topics/authentication.txt:168
8830
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8831
msgstr ""
8832
8833
#: en/help_topics/authentication.txt:170
8834
msgid ""
8835
" [shpnet domain]\n"
8836
" # we use sftp, but ssh is the scheme used for authentication\n"
8837
" scheme=ssh\n"
8838
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8839
" host=.shp.net\n"
8840
" user=joe\n"
8841
" # bzr don't support supplying a password for sftp,\n"
8842
" # consider using an ssh agent if you don't want to supply\n"
8843
" # a password interactively. (pageant, ssh-agent, etc)"
8844
msgstr ""
8845
8846
#: en/help_topics/authentication.txt:180
8847
msgid ""
8848
"HTTPS, SFTP servers and their proxy\n"
8849
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8850
msgstr ""
8851
8852
#: en/help_topics/authentication.txt:183
8853
msgid ""
8854
"At company.com, the server hosting release and integration branches is "
8855
"behind a\n"
8856
"proxy, and the two branches use different authentication policies::"
8857
msgstr ""
8858
8859
#: en/help_topics/authentication.txt:186
8860
msgid ""
8861
" [reference code]\n"
8862
" scheme=https\n"
8863
" host=dev.company.com\n"
8864
" path=/dev\n"
8865
" user=user1\n"
8866
" password=pass1"
8867
msgstr ""
8868
8869
#: en/help_topics/authentication.txt:193
8870
msgid ""
8871
" # development branches on dev server\n"
8872
" [dev]\n"
8873
" scheme=ssh # bzr+ssh and sftp are available here\n"
8874
" host=dev.company.com\n"
8875
" path=/dev/integration\n"
8876
" user=user2\n"
8877
" \n"
8878
" # proxy\n"
8879
" [proxy]\n"
8880
" scheme=http\n"
8881
" host=proxy.company.com\n"
8882
" port=3128\n"
8883
" user=proxyuser1\n"
8884
" password=proxypass1"
8885
msgstr ""
8886
8887
#: en/help_topics/authentication.txt:208
8888
msgid ""
8889
"\n"
8890
"Planned enhancements\n"
8891
"--------------------"
8892
msgstr ""
8893
8894
#: en/help_topics/authentication.txt:212
8895
msgid ""
8896
"The following are not yet implemented but planned as parts of a work in\n"
8897
"progress:"
8898
msgstr ""
8899
8900
#: en/help_topics/authentication.txt:215
8901
msgid "* add a ``password_encoding`` field allowing:"
8902
msgstr ""
8903
8904
#: en/help_topics/authentication.txt:217
8905
msgid ""
8906
" - storing the passwords in various obfuscating encodings (base64 for one),"
8907
msgstr ""
8908
8909
#: en/help_topics/authentication.txt:219
8910
msgid " - delegate password storage to plugins (.netrc for example)."
8911
msgstr ""
8912
8913
#: en/help_topics/authentication.txt:221
8914
msgid ""
8915
"* update the credentials when the user is prompted for user or password,"
8916
msgstr ""
8917
8918
#: en/help_topics/authentication.txt:223
8919
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8920
msgstr ""
8921
8922
#: en/help_topics/authentication.txt:225
8923
msgid ""
8924
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8925
"but\n"
8926
"ignored in the actual implementation.\n"
8927
msgstr ""
8928
8929
#: en/help_topics/bugs.txt:1
8930
msgid "Bug Tracker Settings"
8931
msgstr "Bug Tracker Einstellungen"
8932
8933
#: en/help_topics/bugs.txt:3
8934
msgid ""
8935
"When making a commit, metadata about bugs fixed by that change can be\n"
8936
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8937
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8938
"(The only ``status`` value currently supported is ``fixed.``)"
8939
msgstr ""
8940
8941
#: en/help_topics/bugs.txt:8
8942
msgid ""
8943
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8944
"identifier\n"
8945
"rather than a full URL. This looks like::"
8946
msgstr ""
8947
8948
#: en/help_topics/bugs.txt:11
8949
msgid " bzr commit --fixes <tracker>:<id>"
8950
msgstr " bzr commit --fixes <tracker>:<id>"
8951
8952
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8953
msgid "or::"
8954
msgstr "oder::"
8955
8956
#: en/help_topics/bugs.txt:15
8957
msgid " bzr commit --fixes <id>"
8958
msgstr ""
8959
8960
#: en/help_topics/bugs.txt:17
8961
msgid ""
8962
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8963
"the\n"
8964
"identifier for that bug within the bugtracker, usually the bug number.\n"
8965
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8966
"or global configuration is used."
8967
msgstr ""
8968
8969
#: en/help_topics/bugs.txt:22
8970
msgid ""
8971
"Bazaar knows about a few bug trackers that have many users. If\n"
8972
"you use one of these bug trackers then there is no setup required to\n"
8973
"use this feature, you just need to know the tracker identifier to use.\n"
8974
"These are the bugtrackers that are built in:"
8975
msgstr ""
8976
8977
#: en/help_topics/bugs.txt:27
8978
msgid ""
8979
" ============================ ============ ============\n"
8980
" URL Abbreviation Example\n"
8981
" ============================ ============ ============\n"
8982
" https://bugs.launchpad.net/ lp lp:12345\n"
8983
" http://bugs.debian.org/ deb deb:12345\n"
8984
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8985
" ============================ ============ ============"
8986
msgstr ""
8987
8988
#: en/help_topics/bugs.txt:35
8989
msgid ""
8990
"For the bug trackers not listed above configuration is required.\n"
8991
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8992
"is built in, along with a template mechanism for other bugtrackers with\n"
8993
"simple URL schemes. If your bug tracker can't be described by one\n"
8994
"of the schemes described below then you can write a plugin to support\n"
8995
"it."
8996
msgstr ""
8997
8998
#: en/help_topics/bugs.txt:42
8999
msgid ""
9000
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9001
"variable which contains the base URL of the bug tracker. These options\n"
9002
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9003
"configuration section in ``locations.conf``. You can set up these values\n"
9004
"for each of the projects you work on."
9005
msgstr ""
9006
9007
#: en/help_topics/bugs.txt:48
9008
msgid ""
9009
"Note: As you provide a short name for each tracker, you can specify one or\n"
9010
"more bugs in one or more trackers at commit time if you wish."
9011
msgstr ""
9012
9013
#: en/help_topics/bugs.txt:51
9014
msgid ""
9015
"Launchpad\n"
9016
"---------"
9017
msgstr ""
9018
"Launchpad\n"
9019
"---------"
9020
9021
#: en/help_topics/bugs.txt:54
9022
msgid ""
9023
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9024
msgstr ""
9025
9026
#: en/help_topics/bugs.txt:56
9027
msgid ""
9028
"bugzilla_<tracker>_url\n"
9029
"----------------------"
9030
msgstr ""
9031
"bugzilla_<tracker>_url\n"
9032
"----------------------"
9033
9034
#: en/help_topics/bugs.txt:59
9035
msgid ""
9036
"If present, the location of the Bugzilla bug tracker referred to by\n"
9037
"<tracker>. This option can then be used together with ``bzr commit\n"
9038
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9039
"example::"
9040
msgstr ""
9041
9042
#: en/help_topics/bugs.txt:64
9043
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9044
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9045
9046
#: en/help_topics/bugs.txt:66
9047
msgid ""
9048
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9049
"fixed."
9050
msgstr ""
9051
9052
#: en/help_topics/bugs.txt:69
9053
msgid ""
9054
"trac_<tracker>_url\n"
9055
"------------------"
9056
msgstr ""
9057
"trac_<tracker>_url\n"
9058
"------------------"
9059
9060
#: en/help_topics/bugs.txt:72
9061
msgid ""
9062
"If present, the location of the Trac instance referred to by\n"
9063
"<tracker>. This option can then be used together with ``bzr commit\n"
9064
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9065
"example::"
9066
msgstr ""
9067
9068
#: en/help_topics/bugs.txt:77
9069
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9070
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9071
9072
#: en/help_topics/bugs.txt:79
9073
msgid ""
9074
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9075
"as\n"
9076
"fixed."
9077
msgstr ""
9078
9079
#: en/help_topics/bugs.txt:82
9080
msgid ""
9081
"bugtracker_<tracker>_url\n"
9082
"------------------------"
9083
msgstr ""
9084
"bugtracker_<tracker>_url\n"
9085
"------------------------"
9086
9087
#: en/help_topics/bugs.txt:85
9088
msgid ""
9089
"If present, the location of a generic bug tracker instance referred to by\n"
9090
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9091
"which will be replaced by a specific bug ID. This option can then be used\n"
9092
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9093
"fixed by that commit. For example::"
9094
msgstr ""
9095
9096
#: en/help_topics/bugs.txt:91
9097
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9098
msgstr ""
9099
9100
#: en/help_topics/bugs.txt:93
9101
msgid ""
9102
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9103
"Roundup bug tracker as fixed, or::"
9104
msgstr ""
9105
9106
#: en/help_topics/bugs.txt:96
9107
msgid ""
9108
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9109
msgstr ""
9110
9111
#: en/help_topics/bugs.txt:98
9112
msgid ""
9113
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9114
"RT bug tracker as fixed, or::"
9115
msgstr ""
9116
9117
#: en/help_topics/bugs.txt:101
9118
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9119
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9120
9121
#: en/help_topics/bugs.txt:103
9122
msgid ""
9123
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9124
"1234\n"
9125
"in Hudson's JIRA bug tracker as fixed.\n"
9126
msgstr ""
9127
9128
#: en/help_topics/commands.txt:1
9129
msgid ""
9130
"add Add specified files or directories.\n"
9131
"alias Set/unset and display aliases.\n"
9132
"annotate Show the origin of each line in a file.\n"
9133
"bash-completion Generate a shell function for bash command line "
9134
"completion.\n"
9135
" [bash_completion]\n"
9136
"bind Convert the current branch into a checkout of the "
9137
"supplied\n"
9138
" branch.\n"
9139
"branch Create a new branch that is a copy of an existing branch.\n"
9140
"branches List the branches available at the current location.\n"
9141
"break-lock Break a dead lock.\n"
9142
"cat Write the contents of a file as of a given revision to\n"
9143
" standard output.\n"
9144
"check Validate working tree structure, branch consistency and\n"
9145
" repository history.\n"
9146
"checkout Create a new checkout of an existing branch.\n"
9147
"clean-tree Remove unwanted files from working tree.\n"
9148
"commit Commit changes into a new revision.\n"
9149
"config Display, set or remove a configuration option.\n"
9150
"conflicts List files with conflicts.\n"
9151
"deleted List files deleted in the working tree.\n"
9152
"diff Show differences in the working tree, between revisions "
9153
"or\n"
9154
" branches.\n"
9155
"dpush Push into a different VCS without any custom bzr "
9156
"metadata.\n"
9157
"export Export current or past revision to a destination directory "
9158
"or\n"
9159
" archive.\n"
9160
"help Show help on a command or other topic.\n"
9161
"ignore Ignore specified files or patterns.\n"
9162
"ignored List ignored files and the patterns that matched them.\n"
9163
"info Show information about a working tree, branch or "
9164
"repository.\n"
9165
"init Make a directory into a versioned branch.\n"
9166
"init-repository Create a shared repository for branches to share storage\n"
9167
" space.\n"
9168
"join Combine a tree into its containing tree.\n"
9169
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9170
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9171
"launchpad-open Open a Launchpad branch page in your web browser. "
9172
"[launchpad]\n"
9173
"log Show historical log for a branch or subset of a branch.\n"
9174
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9175
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9176
"ls List files in a tree.\n"
9177
"merge Perform a three-way merge.\n"
9178
"missing Show unmerged/unpulled revisions between two branches.\n"
9179
"mkdir Create a new versioned directory.\n"
9180
"mv Move or rename a file.\n"
9181
"nick Print or set the branch nickname.\n"
9182
"pack Compress the data within a repository.\n"
9183
"plugins List the installed plugins.\n"
9184
"pull Turn this branch into a mirror of another branch.\n"
9185
"push Update a mirror of this branch.\n"
9186
"reconcile Reconcile bzr metadata in a branch.\n"
9187
"reconfigure Reconfigure the type of a bzr directory.\n"
9188
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9189
"remerge Redo a merge.\n"
9190
"remove Remove files or directories.\n"
9191
"remove-branch Remove a branch.\n"
9192
"remove-tree Remove the working tree from a given branch/checkout.\n"
9193
"renames Show list of renamed files.\n"
9194
"resolve Mark a conflict as resolved.\n"
9195
"revert Revert files to a previous revision.\n"
9196
"revno Show current revision number.\n"
9197
"root Show the tree root directory.\n"
9198
"send Mail or create a merge-directive for submitting changes.\n"
9199
"serve Run the bzr server.\n"
9200
"shelve Temporarily set aside some changes from the current tree.\n"
9201
"sign-my-commits Sign all commits by a given committer.\n"
9202
"split Split a subdirectory of a tree into a separate tree.\n"
9203
"status Display status summary.\n"
9204
"switch Set the branch of a checkout and update.\n"
9205
"tag Create, remove or modify a tag naming a revision.\n"
9206
"tags List tags.\n"
9207
"testament Show testament (signing-form) of a revision.\n"
9208
"unbind Convert the current checkout into a regular branch.\n"
9209
"uncommit Remove the last committed revision.\n"
9210
"unshelve Restore shelved changes.\n"
9211
"update Update a working tree to a new revision.\n"
9212
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9213
" format.\n"
9214
"verify-signatures Verify all commit signatures.\n"
9215
"version Show version of bzr.\n"
9216
"version-info Show version information about this tree.\n"
9217
"view Manage filtered views.\n"
9218
"whoami Show or set bzr user id.\n"
9219
msgstr ""
9220
9221
#: en/help_topics/configuration.txt:1
9222
msgid ""
9223
"Configuration Settings\n"
9224
"======================="
9225
msgstr ""
9226
9227
#: en/help_topics/configuration.txt:4
9228
msgid ""
9229
"Environment settings\n"
9230
"---------------------"
9231
msgstr ""
9232
9233
#: en/help_topics/configuration.txt:7
9234
msgid ""
9235
"While most configuration is handled by configuration files, some options\n"
9236
"which may be semi-permanent can also be controlled through the environment."
9237
msgstr ""
9238
9239
#: en/help_topics/configuration.txt:10
9240
msgid ""
9241
"BZR_EMAIL\n"
9242
"~~~~~~~~~"
9243
msgstr ""
9244
"BZR_EMAIL\n"
9245
"~~~~~~~~~"
9246
9247
#: en/help_topics/configuration.txt:13
9248
msgid "Override the email id used by Bazaar. Typical format::"
9249
msgstr ""
9250
9251
#: en/help_topics/configuration.txt:15
9252
msgid " \"John Doe <jdoe@example.com>\""
9253
msgstr " \"John Doe <jdoe@beispiel.de>\""
9254
9255
#: en/help_topics/configuration.txt:17
9256
msgid "See also the ``email`` configuration option."
9257
msgstr ""
9258
9259
#: en/help_topics/configuration.txt:19
9260
msgid ""
9261
"BZR_PROGRESS_BAR\n"
9262
"~~~~~~~~~~~~~~~~"
9263
msgstr ""
9264
"BZR_PROGRESS_BAR\n"
9265
"~~~~~~~~~~~~~~~~"
9266
9267
#: en/help_topics/configuration.txt:22
9268
msgid ""
9269
"Override the progress display. Possible values are \"none\" or \"text\". "
9270
"If\n"
9271
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9272
"draws\n"
9273
"the ordinary command line progress bar."
9274
msgstr ""
9275
9276
#: en/help_topics/configuration.txt:26
9277
msgid ""
9278
"BZR_SIGQUIT_PDB\n"
9279
"~~~~~~~~~~~~~~~"
9280
msgstr ""
9281
"BZR_SIGQUIT_PDB\n"
9282
"~~~~~~~~~~~~~~~"
9283
9284
#: en/help_topics/configuration.txt:29
9285
msgid ""
9286
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9287
msgstr ""
9288
9289
#: en/help_topics/configuration.txt:31
9290
msgid ""
9291
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9292
"* 1 = Invoke breakin debugger (default)"
9293
msgstr ""
9294
9295
#: en/help_topics/configuration.txt:34
9296
msgid ""
9297
"BZR_HOME\n"
9298
"~~~~~~~~"
9299
msgstr ""
9300
"BZR_HOME\n"
9301
"~~~~~~~~"
9302
9303
#: en/help_topics/configuration.txt:37
9304
msgid "Override the home directory used by Bazaar."
9305
msgstr ""
9306
9307
#: en/help_topics/configuration.txt:39
9308
msgid ""
9309
"BZR_SSH\n"
9310
"~~~~~~~"
9311
msgstr ""
9312
"BZR_SSH\n"
9313
"~~~~~~~"
9314
9315
#: en/help_topics/configuration.txt:42
9316
msgid "Select a different SSH implementation."
9317
msgstr "Wählen Sie eine andere SSH-Implementierung."
9318
9319
#: en/help_topics/configuration.txt:44
9320
msgid ""
9321
"BZR_PDB\n"
9322
"~~~~~~~"
9323
msgstr ""
9324
"BZR_PDB\n"
9325
"~~~~~~~"
9326
9327
#: en/help_topics/configuration.txt:47
9328
msgid "Control whether to launch a debugger on error."
9329
msgstr ""
9330
9331
#: en/help_topics/configuration.txt:49
9332
msgid ""
9333
"* 0 = Standard behavior\n"
9334
"* 1 = Launch debugger"
9335
msgstr ""
9336
"* 0 = Standard Verhalten\n"
9337
"* 1 = Debugger starten"
9338
9339
#: en/help_topics/configuration.txt:52
9340
msgid ""
9341
"BZR_REMOTE_PATH\n"
9342
"~~~~~~~~~~~~~~~"
9343
msgstr ""
9344
"BZR_REMOTE_PATH\n"
9345
"~~~~~~~~~~~~~~~"
9346
9347
#: en/help_topics/configuration.txt:55
9348
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9349
msgstr ""
9350
9351
#: en/help_topics/configuration.txt:57
9352
msgid "See also the ``bzr_remote_path`` configuration option."
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:59
9356
msgid ""
9357
"BZR_EDITOR\n"
9358
"~~~~~~~~~~"
9359
msgstr ""
9360
"BZR_EDITOR\n"
9361
"~~~~~~~~~~"
9362
9363
#: en/help_topics/configuration.txt:62
9364
msgid "Path to the editor Bazaar should use for commit messages, etc."
9365
msgstr ""
9366
9367
#: en/help_topics/configuration.txt:64
9368
msgid ""
9369
"BZR_LOG\n"
9370
"~~~~~~~"
9371
msgstr ""
9372
"BZR_LOG\n"
9373
"~~~~~~~"
9374
9375
#: en/help_topics/configuration.txt:67
9376
msgid ""
9377
"Location of the Bazaar log file. You can check the current location by\n"
9378
"running ``bzr version``."
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:70
9382
msgid ""
9383
"The log file contains debug information that is useful for diagnosing or\n"
9384
"reporting problems with Bazaar."
9385
msgstr ""
9386
9387
#: en/help_topics/configuration.txt:73
9388
msgid ""
9389
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9390
"will disable logging."
9391
msgstr ""
9392
9393
#: en/help_topics/configuration.txt:76
9394
msgid ""
9395
"\n"
9396
"BZR_PLUGIN_PATH\n"
9397
"~~~~~~~~~~~~~~~"
9398
msgstr ""
9399
"\n"
9400
"BZR_PLUGIN_PATH\n"
9401
"~~~~~~~~~~~~~~~"
9402
9403
#: en/help_topics/configuration.txt:80
9404
msgid ""
9405
"The path to the plugins directory that Bazaar should use.\n"
9406
"If not set, Bazaar will search for plugins in:"
9407
msgstr ""
9408
9409
#: en/help_topics/configuration.txt:83
9410
msgid ""
9411
"* the user specific plugin directory (containing the ``user`` plugins),"
9412
msgstr ""
9413
9414
#: en/help_topics/configuration.txt:85
9415
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9416
msgstr ""
9417
9418
#: en/help_topics/configuration.txt:87
9419
msgid ""
9420
"* the site specific plugin directory if applicable (containing\n"
9421
" the ``site`` plugins)."
9422
msgstr ""
9423
9424
#: en/help_topics/configuration.txt:90
9425
msgid ""
9426
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9427
"the way the plugin are searched. "
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:93
9431
msgid ""
9432
"As for the ``PATH`` variables, if multiple directories are\n"
9433
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9434
"platform specific appropriate character (':' on Unix,\n"
9435
"';' on windows)"
9436
msgstr ""
9437
9438
#: en/help_topics/configuration.txt:98
9439
msgid ""
9440
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9441
"in ``user``. However it will continue to search in ``core`` and\n"
9442
"``site`` unless they are explicitly removed."
9443
msgstr ""
9444
9445
#: en/help_topics/configuration.txt:102
9446
msgid ""
9447
"If you need to change the order or remove one of these\n"
9448
"directories, you should use special values:"
9449
msgstr ""
9450
9451
#: en/help_topics/configuration.txt:105
9452
msgid ""
9453
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9454
" path from the default values,"
9455
msgstr ""
9456
9457
#: en/help_topics/configuration.txt:108
9458
msgid ""
9459
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9460
" before the remaining default values (and also remove it from\n"
9461
" the default values)."
9462
msgstr ""
9463
9464
#: en/help_topics/configuration.txt:112
9465
msgid ""
9466
"Note that the special values 'user', 'core' and 'site' should be\n"
9467
"used literally, they will be substituted by the corresponding,\n"
9468
"platform specific, values."
9469
msgstr ""
9470
9471
#: en/help_topics/configuration.txt:116
9472
msgid ""
9473
"The examples below use ':' as the separator, windows users\n"
9474
"should use ';'."
9475
msgstr ""
9476
9477
#: en/help_topics/configuration.txt:119
9478
msgid "Overriding the default user plugin directory::"
9479
msgstr ""
9480
9481
#: en/help_topics/configuration.txt:121
9482
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9483
msgstr ""
9484
9485
#: en/help_topics/configuration.txt:123
9486
msgid "Disabling the site directory while retaining the user directory::"
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:125
9490
msgid " BZR_PLUGIN_PATH='-site:+user'"
9491
msgstr ""
9492
9493
#: en/help_topics/configuration.txt:127
9494
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9495
msgstr ""
9496
9497
#: en/help_topics/configuration.txt:129
9498
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:131
9502
msgid "Overriding the default site plugin directory::"
9503
msgstr ""
9504
9505
#: en/help_topics/configuration.txt:133
9506
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9507
msgstr ""
9508
" BZR_PLUGIN_PATH='/Pfad/zu/meiner/Seite/Erweiterungen:-Seite':+Benutzer"
9509
9510
#: en/help_topics/configuration.txt:135
9511
msgid ""
9512
"BZR_DISABLE_PLUGINS\n"
9513
"~~~~~~~~~~~~~~~~~~~"
9514
msgstr ""
9515
"BZR_DISABLE_PLUGINS\n"
9516
"~~~~~~~~~~~~~~~~~~~"
9517
9518
#: en/help_topics/configuration.txt:138
9519
msgid ""
9520
"Under special circumstances (mostly when trying to diagnose a\n"
9521
"bug), it's better to disable a plugin (or several) rather than\n"
9522
"uninstalling them completely. Such plugins can be specified in\n"
9523
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9524
msgstr ""
9525
9526
#: en/help_topics/configuration.txt:143
9527
msgid ""
9528
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9529
"will raise an import error if they are explicitly imported (by\n"
9530
"another plugin that depends on them for example)."
9531
msgstr ""
9532
9533
#: en/help_topics/configuration.txt:147
9534
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9535
msgstr ""
9536
9537
#: en/help_topics/configuration.txt:149
9538
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:151
9542
msgid ""
9543
"BZR_PLUGINS_AT\n"
9544
"~~~~~~~~~~~~~~"
9545
msgstr ""
9546
"BZR_PLUGINS_AT\n"
9547
"~~~~~~~~~~~~~~"
9548
9549
#: en/help_topics/configuration.txt:154
9550
msgid ""
9551
"When adding a new feature or working on a bug in a plugin,\n"
9552
"developers often need to use a specific version of a given\n"
9553
"plugin. Since python requires that the directory containing the\n"
9554
"code is named like the plugin itself this make it impossible to\n"
9555
"use arbitrary directory names (using a two-level directory scheme\n"
9556
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9557
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:162
9561
msgid ""
9562
"Plugins specified in this environment variable takes precedence\n"
9563
"over the ones in ``BZR_PLUGIN_PATH``."
9564
msgstr ""
9565
9566
#: en/help_topics/configuration.txt:165
9567
msgid ""
9568
"The variable specified a list of ``plugin_name@plugin path``,\n"
9569
"``plugin_name`` being the name of the plugin as it appears in\n"
9570
"python module paths, ``plugin_path`` being the path to the\n"
9571
"directory containing the plugin code itself\n"
9572
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9573
"separator, use ';' on windows."
9574
msgstr ""
9575
9576
#: en/help_topics/configuration.txt:172
9577
msgid ""
9578
"Example:\n"
9579
"~~~~~~~~"
9580
msgstr ""
9581
"Beispiel:\n"
9582
"~~~~~~~~~"
9583
9584
#: en/help_topics/configuration.txt:175
9585
msgid ""
9586
"Using a specific version of ``myplugin``:\n"
9587
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:178
9591
msgid ""
9592
"BZRPATH\n"
9593
"~~~~~~~"
9594
msgstr ""
9595
"BZRPATH\n"
9596
"~~~~~~~"
9597
9598
#: en/help_topics/configuration.txt:181
9599
msgid "The path where Bazaar should look for shell plugin external commands."
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:183
9603
msgid ""
9604
"\n"
9605
"http_proxy, https_proxy\n"
9606
"~~~~~~~~~~~~~~~~~~~~~~~"
9607
msgstr ""
9608
"\n"
9609
"http_proxy, https_proxy\n"
9610
"~~~~~~~~~~~~~~~~~~~~~~~"
9611
9612
#: en/help_topics/configuration.txt:187
9613
msgid "Specifies the network proxy for outgoing connections, for example::"
9614
msgstr ""
9615
9616
#: en/help_topics/configuration.txt:189
9617
msgid ""
9618
" http_proxy=http://proxy.example.com:3128/ \n"
9619
" https_proxy=http://proxy.example.com:3128/"
9620
msgstr ""
9621
" http_proxy=http://proxy.beispiel.de:3128/ \n"
9622
" https_proxy=http://proxy.beispiel.de:3128/"
9623
9624
#: en/help_topics/configuration.txt:192
9625
msgid ""
9626
"\n"
9627
"Configuration files\n"
9628
"-------------------"
9629
msgstr ""
9630
9631
#: en/help_topics/configuration.txt:196
9632
msgid ""
9633
"Location\n"
9634
"~~~~~~~~"
9635
msgstr ""
9636
9637
#: en/help_topics/configuration.txt:199
9638
msgid ""
9639
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9640
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9641
"on\n"
9642
"Windows. (You can check the location for your system by using\n"
9643
"``bzr version``.)"
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:204
9647
msgid "There are three primary configuration files in this location:"
9648
msgstr ""
9649
9650
#: en/help_topics/configuration.txt:206
9651
msgid "* ``bazaar.conf`` describes default configuration options,"
9652
msgstr ""
9653
9654
#: en/help_topics/configuration.txt:208
9655
msgid ""
9656
"* ``locations.conf`` describes configuration information for\n"
9657
" specific branch locations,"
9658
msgstr ""
9659
9660
#: en/help_topics/configuration.txt:211
9661
msgid ""
9662
"* ``authentication.conf`` describes credential information for\n"
9663
" remote servers."
9664
msgstr ""
9665
9666
#: en/help_topics/configuration.txt:214
9667
msgid ""
9668
"Each branch can also contain a configuration file that sets values specific\n"
9669
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9670
"the\n"
9671
"branch. This file is visible to all users of a branch, if you wish to "
9672
"override\n"
9673
"one of the values for a branch with a setting that is specific to you then "
9674
"you\n"
9675
"can do so in ``locations.conf``."
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:220
9679
msgid ""
9680
"General format\n"
9681
"~~~~~~~~~~~~~~"
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:223
9685
msgid ""
9686
"An ini file has three types of contructs: section headers, section\n"
9687
"options and comments."
9688
msgstr ""
9689
9690
#: en/help_topics/configuration.txt:226
9691
msgid ""
9692
"Comments\n"
9693
"^^^^^^^^"
9694
msgstr ""
9695
9696
#: en/help_topics/configuration.txt:229
9697
msgid ""
9698
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9699
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9700
"Bazaar when parsing ini files."
9701
msgstr ""
9702
9703
#: en/help_topics/configuration.txt:233
9704
msgid ""
9705
"Section headers\n"
9706
"^^^^^^^^^^^^^^^"
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:236
9710
msgid ""
9711
"A section header is a word enclosed in brackets that starts at the begining\n"
9712
"of a line. A typical section header looks like this::"
9713
msgstr ""
9714
9715
#: en/help_topics/configuration.txt:239
9716
msgid " [DEFAULT]"
9717
msgstr ""
9718
9719
#: en/help_topics/configuration.txt:241
9720
msgid ""
9721
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9722
"[ALIASES]. Section headers are case sensitive. The default section provides "
9723
"for\n"
9724
"setting options which can be overridden with the branch config file."
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:245
9728
msgid ""
9729
"For ``locations.conf``, the options from the section with the\n"
9730
"longest matching section header are used to the exclusion of other\n"
9731
"potentially valid section headers. A section header uses the path for\n"
9732
"the branch as the section header. Some examples include::"
9733
msgstr ""
9734
9735
#: en/help_topics/configuration.txt:250
9736
msgid ""
9737
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9738
" [/home/jdoe/branches/]"
9739
msgstr ""
9740
" [http://meinebranchen.isp.com/~jdoe/branchdir]\n"
9741
" [/home/jdoe/branches/]"
9742
9743
#: en/help_topics/configuration.txt:253
9744
msgid ""
9745
"\n"
9746
"Section options\n"
9747
"^^^^^^^^^^^^^^^"
9748
msgstr ""
9749
9750
#: en/help_topics/configuration.txt:257
9751
msgid ""
9752
"A section option resides within a section. A section option contains an\n"
9753
"option name, an equals sign and a value. For example::"
9754
msgstr ""
9755
9756
#: en/help_topics/configuration.txt:260
9757
msgid ""
9758
" email = John Doe <jdoe@isp.com>\n"
9759
" gpg_signing_key = Amy Pond <amy@example.com>"
9760
msgstr ""
9761
" email = John Doe <jdoe@isp.com>\n"
9762
" gpg_signing_key = Amy Pond <amy@beispiel.de>"
9763
9764
#: en/help_topics/configuration.txt:263
9765
msgid ""
9766
"A option can reference other options by enclosing them in curly brackets::"
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:265
9770
msgid ""
9771
" my_branch_name = feature_x\n"
9772
" my_server = bzr+ssh://example.com\n"
9773
" push_location = {my_server}/project/{my_branch_name}"
9774
msgstr ""
9775
9776
#: en/help_topics/configuration.txt:269
9777
msgid ""
9778
"Option policies\n"
9779
"^^^^^^^^^^^^^^^"
9780
msgstr ""
9781
9782
#: en/help_topics/configuration.txt:272
9783
msgid ""
9784
"Options defined in a section affect the named directory or URL plus\n"
9785
"any locations they contain. Policies can be used to change how an\n"
9786
"option value is interpreted for contained locations. Currently\n"
9787
"there are three policies available:"
9788
msgstr ""
9789
9790
#: en/help_topics/configuration.txt:277
9791
msgid ""
9792
" none:\n"
9793
" the value is interpreted the same for contained locations. This is\n"
9794
" the default behaviour.\n"
9795
" norecurse:\n"
9796
" the value is only used for the exact location specified by the\n"
9797
" section name.\n"
9798
" appendpath:\n"
9799
" for contained locations, any additional path components are\n"
9800
" appended to the value."
9801
msgstr ""
9802
9803
#: en/help_topics/configuration.txt:287
9804
msgid ""
9805
"Policies are specified by keys with names of the form "
9806
"\"<option_name>:policy\".\n"
9807
"For example, to define the push location for a tree of branches, the\n"
9808
"following could be used::"
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:291
9812
msgid ""
9813
" [/top/location]\n"
9814
" push_location = sftp://example.com/location\n"
9815
" push_location:policy = appendpath"
9816
msgstr ""
9817
9818
#: en/help_topics/configuration.txt:295
9819
msgid ""
9820
"With this configuration, the push location for ``/top/location/branch1``\n"
9821
"would be ``sftp://example.com/location/branch1``."
9822
msgstr ""
9823
9824
#: en/help_topics/configuration.txt:298
9825
msgid ""
9826
"Section local options\n"
9827
"^^^^^^^^^^^^^^^^^^^^^"
9828
msgstr ""
9829
9830
#: en/help_topics/configuration.txt:301
9831
msgid ""
9832
"Some options are defined automatically inside a given section and can be\n"
9833
"refered to in this section only. "
9834
msgstr ""
9835
9836
#: en/help_topics/configuration.txt:304
9837
msgid "For example, the ``appendpath`` policy can be used like this::"
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:306
9841
msgid ""
9842
" [/home/vila/src/bzr/bugs]\n"
9843
" mypush = lp:~vila/bzr\n"
9844
" mypush:policy=appendpath"
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:310
9848
msgid "Using ``relpath`` to achieve the same result is done like this::"
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:312
9852
msgid ""
9853
" [/home/vila/src/bzr/bugs]\n"
9854
" mypush = lp:~vila/bzr/{relpath}"
9855
msgstr ""
9856
9857
#: en/help_topics/configuration.txt:315
9858
msgid ""
9859
"In both cases, when used in a directory like\n"
9860
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9864
msgid ""
9865
" $ bzr config mypush\n"
9866
" lp:~vila/bzr/832013-expand-in-stack"
9867
msgstr ""
9868
9869
#: en/help_topics/configuration.txt:321
9870
msgid "Another such option is ``basename`` which can be used like this::"
9871
msgstr ""
9872
9873
#: en/help_topics/configuration.txt:323
9874
msgid ""
9875
" [/home/vila/src/bzr]\n"
9876
" mypush = lp:~vila/bzr/{basename}"
9877
msgstr ""
9878
9879
#: en/help_topics/configuration.txt:326
9880
msgid ""
9881
"When used in a directory like\n"
9882
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9883
msgstr ""
9884
9885
#: en/help_topics/configuration.txt:332
9886
msgid ""
9887
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9888
"itself is defined as the relative path between the section name and the\n"
9889
"location it matches."
9890
msgstr ""
9891
9892
#: en/help_topics/configuration.txt:336
9893
msgid ""
9894
"When an option is local to a Section, it cannot be referred to from option\n"
9895
"values in any other section from the same ``Store`` nor from any other\n"
9896
"``Store``."
9897
msgstr ""
9898
9899
#: en/help_topics/configuration.txt:340
9900
msgid ""
9901
"\n"
9902
"The main configuration file, bazaar.conf\n"
9903
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9904
msgstr ""
9905
9906
#: en/help_topics/configuration.txt:344
9907
msgid ""
9908
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9909
"The default section contains the default\n"
9910
"configuration options for all branches. The default section can be\n"
9911
"overriden by providing a branch-specific section in ``locations.conf``."
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:349
9915
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:351
9919
msgid ""
9920
" [DEFAULT]\n"
9921
" email = John Doe <jdoe@isp.com>\n"
9922
" editor = /usr/bin/vim\n"
9923
" create_signatures = when-required"
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:356
9927
msgid ""
9928
"\n"
9929
"The branch location configuration file, locations.conf\n"
9930
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9931
msgstr ""
9932
9933
#: en/help_topics/configuration.txt:360
9934
msgid ""
9935
"``locations.conf`` allows one to specify overriding settings for\n"
9936
"a specific branch. The format is almost identical to the default section in\n"
9937
"bazaar.conf with one significant change: The section header, instead of "
9938
"saying\n"
9939
"default, will be the path to a branch that you wish to override a value\n"
9940
"for. The '?' and '*' wildcards are supported::"
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:366
9944
msgid ""
9945
" [/home/jdoe/branches/nethack]\n"
9946
" email = Nethack Admin <nethack@nethack.com>"
9947
msgstr ""
9948
9949
#: en/help_topics/configuration.txt:369
9950
msgid ""
9951
" [http://hypothetical.site.com/branches/devel-branch]\n"
9952
" create_signatures = always"
9953
msgstr ""
9954
9955
#: en/help_topics/configuration.txt:372
9956
msgid ""
9957
"The authentication configuration file, authentication.conf\n"
9958
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9959
msgstr ""
9960
9961
#: en/help_topics/configuration.txt:375
9962
msgid ""
9963
"``authentication.conf`` allows one to specify credentials for\n"
9964
"remote servers. This can be used for all the supported transports and any "
9965
"part\n"
9966
"of bzr that requires authentication (smtp for example)."
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:379
9970
msgid ""
9971
"The syntax of the file obeys the same rules as the others except for the\n"
9972
"option policies which don't apply."
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:382
9976
msgid ""
9977
"For more information on the possible uses of the authentication "
9978
"configuration\n"
9979
"file see :doc:`authentication-help`."
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:385
9983
msgid ""
9984
"\n"
9985
"Common options\n"
9986
"--------------"
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:389
9990
msgid ""
9991
"debug_flags\n"
9992
"~~~~~~~~~~~"
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:392
9996
msgid ""
9997
"A comma-separated list of debugging options to turn on. The same values\n"
9998
"can be used as with the -D command-line option (see `help global-options`).\n"
9999
"For example::"
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:396
10003
msgid " debug_flags = hpss"
10004
msgstr " debug_flags = hpss"
10005
10006
#: en/help_topics/configuration.txt:400
10007
msgid " debug_flags = hpss,evil"
10008
msgstr " debug_flags = hpss,evil"
10009
10010
#: en/help_topics/configuration.txt:402
10011
msgid ""
10012
"email\n"
10013
"~~~~~"
10014
msgstr ""
10015
10016
#: en/help_topics/configuration.txt:405
10017
msgid ""
10018
"The email address to use when committing a branch. Typically takes the form\n"
10019
"of::"
10020
msgstr ""
10021
10022
#: en/help_topics/configuration.txt:408
10023
msgid " email = Full Name <account@hostname.tld>"
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:410
10027
msgid ""
10028
"editor\n"
10029
"~~~~~~"
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:413
10033
msgid ""
10034
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10035
"a commit message. This setting is trumped by the environment variable\n"
10036
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10037
"variables."
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:418
10041
msgid ""
10042
"log_format\n"
10043
"~~~~~~~~~~"
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:421
10047
msgid ""
10048
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10049
"and ``line``. Additional formats may be provided by plugins. The default\n"
10050
"value is ``long``."
10051
msgstr ""
10052
10053
#: en/help_topics/configuration.txt:425
10054
msgid ""
10055
"check_signatures\n"
10056
"~~~~~~~~~~~~~~~~"
10057
msgstr ""
10058
10059
#: en/help_topics/configuration.txt:428
10060
msgid ""
10061
"Reserved for future use. These options will allow a policy for branches to\n"
10062
"require signatures."
10063
msgstr ""
10064
10065
#: en/help_topics/configuration.txt:431
10066
msgid ""
10067
"require\n"
10068
" The gnupg signature for revisions must be present and must be valid."
10069
msgstr ""
10070
10071
#: en/help_topics/configuration.txt:434
10072
msgid ""
10073
"ignore\n"
10074
" Do not check gnupg signatures of revisions."
10075
msgstr ""
10076
10077
#: en/help_topics/configuration.txt:437
10078
msgid ""
10079
"check-available\n"
10080
" (default) If gnupg signatures for revisions are present, check them.\n"
10081
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10082
" no signature is present."
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:442
10086
msgid ""
10087
"create_signatures\n"
10088
"~~~~~~~~~~~~~~~~~"
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:445
10092
msgid ""
10093
"Defines the behaviour of signing revisions on commits. By default bzr will "
10094
"not\n"
10095
"sign new commits."
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:448
10099
msgid ""
10100
"always\n"
10101
" Sign every new revision that is committed. If the signing fails then "
10102
"the\n"
10103
" commit will not be made."
10104
msgstr ""
10105
10106
#: en/help_topics/configuration.txt:452
10107
msgid ""
10108
"when-required\n"
10109
" Reserved for future use."
10110
msgstr ""
10111
10112
#: en/help_topics/configuration.txt:455
10113
msgid ""
10114
"never\n"
10115
" Reserved for future use."
10116
msgstr ""
10117
10118
#: en/help_topics/configuration.txt:458
10119
msgid ""
10120
"In future it is planned that ``when-required`` will sign newly\n"
10121
"committed revisions only when the branch requires them. ``never`` will "
10122
"refuse\n"
10123
"to sign newly committed revisions, even if the branch requires signatures."
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:462
10127
msgid ""
10128
"dirstate.fdatasync\n"
10129
"~~~~~~~~~~~~~~~~~~"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:465
10133
msgid ""
10134
"If true (default), working tree metadata changes are flushed through the\n"
10135
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10136
"should not be lost if the machine crashes. See also repository.fdatasync."
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:469
10140
msgid ""
10141
"gpg_signing_key\n"
10142
"~~~~~~~~~~~~~~~"
10143
msgstr ""
10144
10145
#: en/help_topics/configuration.txt:472
10146
msgid ""
10147
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10148
"address, key fingerprint or full key ID. When unset or when set to\n"
10149
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10150
msgstr ""
10151
10152
#: en/help_topics/configuration.txt:476
10153
msgid ""
10154
"recurse\n"
10155
"~~~~~~~"
10156
msgstr ""
10157
10158
#: en/help_topics/configuration.txt:479
10159
msgid ""
10160
"Only useful in ``locations.conf``. Defines whether or not the\n"
10161
"configuration for this section applies to subdirectories:"
10162
msgstr ""
10163
10164
#: en/help_topics/configuration.txt:482
10165
msgid ""
10166
"true\n"
10167
" (default) This section applies to subdirectories as well."
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:485
10171
msgid ""
10172
"false\n"
10173
" This section only applies to the branch at this directory and not\n"
10174
" branches below it."
10175
msgstr ""
10176
10177
#: en/help_topics/configuration.txt:489
10178
msgid ""
10179
"gpg_signing_command\n"
10180
"~~~~~~~~~~~~~~~~~~~"
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:492
10184
msgid ""
10185
"(Default: \"gpg\"). Which program should be used to sign and check "
10186
"revisions.\n"
10187
"For example::"
10188
msgstr ""
10189
10190
#: en/help_topics/configuration.txt:495
10191
msgid " gpg_signing_command = /usr/bin/gnpg"
10192
msgstr ""
10193
10194
#: en/help_topics/configuration.txt:497
10195
msgid ""
10196
"The specified command must accept the options \"--clearsign\" and \"-u "
10197
"<email>\"."
10198
msgstr ""
10199
10200
#: en/help_topics/configuration.txt:499
10201
msgid ""
10202
"bzr_remote_path\n"
10203
"~~~~~~~~~~~~~~~"
10204
msgstr ""
10205
10206
#: en/help_topics/configuration.txt:502
10207
msgid ""
10208
"(Default: \"bzr\"). The path to the command that should be used to run the "
10209
"smart\n"
10210
"server for bzr. This value may only be specified in locations.conf, because:"
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:505
10214
msgid ""
10215
"- it's needed before branch.conf is accessible\n"
10216
"- allowing remote branch.conf files to specify commands would be a security\n"
10217
" risk"
10218
msgstr ""
10219
10220
#: en/help_topics/configuration.txt:509
10221
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:511
10225
msgid ""
10226
"smtp_server\n"
10227
"~~~~~~~~~~~"
10228
msgstr ""
10229
10230
#: en/help_topics/configuration.txt:514
10231
msgid ""
10232
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10233
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10234
msgstr ""
10235
10236
#: en/help_topics/configuration.txt:517
10237
msgid ""
10238
"smtp_username, smtp_password\n"
10239
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:520
10243
msgid ""
10244
"User and password to authenticate to the SMTP server. If smtp_username\n"
10245
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10246
"These settings are only needed if the SMTP server requires authentication\n"
10247
"to send mail."
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:525
10251
msgid ""
10252
"locks.steal_dead\n"
10253
"~~~~~~~~~~~~~~~~"
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:528
10257
msgid ""
10258
"If set to true, bzr will automatically break locks held by processes from\n"
10259
"the same machine and user that are no longer alive. Otherwise, it will\n"
10260
"print a message and you can break the lock manually, if you are satisfied\n"
10261
"the object is no longer in use."
10262
msgstr ""
10263
10264
#: en/help_topics/configuration.txt:533
10265
msgid ""
10266
"mail_client\n"
10267
"~~~~~~~~~~~"
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:536
10271
msgid ""
10272
"A mail client to use for sending merge requests.\n"
10273
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10274
"it\n"
10275
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10276
"``editor``."
10277
msgstr ""
10278
10279
#: en/help_topics/configuration.txt:541
10280
msgid "Supported values for specific clients:"
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:543
10284
msgid ""
10285
":claws: Use Claws. This skips a dialog for attaching files.\n"
10286
":evolution: Use Evolution.\n"
10287
":kmail: Use KMail.\n"
10288
":mutt: Use Mutt.\n"
10289
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10290
"1.5,\n"
10291
" this works around some bugs that xdg-email doesn't handle."
10292
msgstr ""
10293
10294
#: en/help_topics/configuration.txt:550
10295
msgid "Supported generic values are:"
10296
msgstr "Unterstützte generische Werte sind:"
10297
10298
#: en/help_topics/configuration.txt:552
10299
msgid ""
10300
":default: See above.\n"
10301
":editor: Use your editor to compose the merge request. This also uses\n"
10302
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10303
" smtp_username and smtp_password.\n"
10304
":mapi: Use your preferred e-mail client on Windows.\n"
10305
":xdg-email: Use xdg-email to run your preferred mail program"
10306
msgstr ""
10307
10308
#: en/help_topics/configuration.txt:559
10309
msgid ""
10310
"repository.fdatasync\n"
10311
"~~~~~~~~~~~~~~~~~~~~"
10312
msgstr ""
10313
10314
#: en/help_topics/configuration.txt:562
10315
msgid ""
10316
"If true (default), repository changes are flushed through the OS buffers\n"
10317
"to physical disk. This is somewhat slower, but means data should not be\n"
10318
"lost if the machine crashes. See also dirstate.fdatasync."
10319
msgstr ""
10320
10321
#: en/help_topics/configuration.txt:566
10322
msgid ""
10323
"submit_branch\n"
10324
"~~~~~~~~~~~~~"
10325
msgstr ""
10326
10327
#: en/help_topics/configuration.txt:569
10328
msgid ""
10329
"The branch you intend to submit your current work to. This is "
10330
"automatically\n"
10331
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10332
"This\n"
10333
"should usually be set on a per-branch or per-location basis."
10334
msgstr ""
10335
10336
#: en/help_topics/configuration.txt:573
10337
msgid ""
10338
"public_branch\n"
10339
"~~~~~~~~~~~~~"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:576
10343
msgid ""
10344
"A publically-accessible version of this branch (implying that this version "
10345
"is\n"
10346
"not publically-accessible). Used (and set) by ``bzr send``."
10347
msgstr ""
10348
10349
#: en/help_topics/configuration.txt:579
10350
msgid ""
10351
"suppress_warnings\n"
10352
"~~~~~~~~~~~~~~~~~"
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:582
10356
msgid ""
10357
"A list of strings, each string represent a warning that can be emitted by\n"
10358
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10359
msgstr ""
10360
10361
#: en/help_topics/configuration.txt:585
10362
msgid "Valid values:"
10363
msgstr "Gültige Werte:"
10364
10365
#: en/help_topics/configuration.txt:587
10366
msgid ""
10367
"* ``format_deprecation``:\n"
10368
" whether the format deprecation warning is shown on repositories that "
10369
"are\n"
10370
" using deprecated formats."
10371
msgstr ""
10372
10373
#: en/help_topics/configuration.txt:591
10374
msgid ""
10375
"default_format\n"
10376
"~~~~~~~~~~~~~~"
10377
msgstr ""
10378
10379
#: en/help_topics/configuration.txt:594
10380
msgid ""
10381
"A format name for the default format used when creating branches. See "
10382
"``bzr\n"
10383
"help formats`` for possible values."
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:597
10387
msgid ""
10388
"\n"
10389
"Unicode options\n"
10390
"---------------"
10391
msgstr ""
10392
10393
#: en/help_topics/configuration.txt:601
10394
msgid ""
10395
"output_encoding\n"
10396
"~~~~~~~~~~~~~~~"
10397
msgstr ""
10398
10399
#: en/help_topics/configuration.txt:604
10400
msgid ""
10401
"A Python unicode encoding name for text output from bzr, such as log\n"
10402
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10403
"is the terminal encoding prefered by the operating system."
10404
msgstr ""
10405
10406
#: en/help_topics/configuration.txt:608
10407
msgid ""
10408
"\n"
10409
"Branch type specific options\n"
10410
"----------------------------"
10411
msgstr ""
10412
10413
#: en/help_topics/configuration.txt:612
10414
msgid ""
10415
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10416
"later format. They\n"
10417
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10418
"manually set in ``locations.conf`` or ``bazaar.conf``."
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:617
10422
msgid ""
10423
"append_revisions_only\n"
10424
"~~~~~~~~~~~~~~~~~~~~~"
10425
msgstr ""
10426
10427
#: en/help_topics/configuration.txt:620
10428
msgid ""
10429
"If set to \"True\" then revisions can only be appended to the log, not\n"
10430
"removed. A branch with this setting enabled can only pull from another\n"
10431
"branch if the other branch's log is a longer version of its own. This is\n"
10432
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10433
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10434
"compatibility with previous bzr versions (older than 2.2)."
10435
msgstr ""
10436
10437
#: en/help_topics/configuration.txt:627
10438
msgid ""
10439
"parent_location\n"
10440
"~~~~~~~~~~~~~~~"
10441
msgstr ""
10442
10443
#: en/help_topics/configuration.txt:630
10444
msgid ""
10445
"If present, the location of the default branch for pull or merge. This "
10446
"option\n"
10447
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10448
"--remember``."
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:634
10452
msgid ""
10453
"push_location\n"
10454
"~~~~~~~~~~~~~"
10455
msgstr ""
10456
10457
#: en/help_topics/configuration.txt:637
10458
msgid ""
10459
"If present, the location of the default branch for push. This option\n"
10460
"is normally set by the first ``push`` or ``push --remember``."
10461
msgstr ""
10462
10463
#: en/help_topics/configuration.txt:640
10464
msgid ""
10465
"push_strict\n"
10466
"~~~~~~~~~~~"
10467
msgstr ""
10468
10469
#: en/help_topics/configuration.txt:643
10470
msgid ""
10471
"If present, defines the ``--strict`` option default value for checking\n"
10472
"uncommitted changes before pushing."
10473
msgstr ""
10474
10475
#: en/help_topics/configuration.txt:646
10476
msgid ""
10477
"dpush_strict\n"
10478
"~~~~~~~~~~~~"
10479
msgstr ""
10480
10481
#: en/help_topics/configuration.txt:649
10482
msgid ""
10483
"If present, defines the ``--strict`` option default value for checking\n"
10484
"uncommitted changes before pushing into a different VCS without any\n"
10485
"custom bzr metadata."
10486
msgstr ""
10487
10488
#: en/help_topics/configuration.txt:653
10489
msgid ""
10490
"bound_location\n"
10491
"~~~~~~~~~~~~~~"
10492
msgstr ""
10493
10494
#: en/help_topics/configuration.txt:656
10495
msgid ""
10496
"The location that commits should go to when acting as a checkout.\n"
10497
"This option is normally set by ``bind``."
10498
msgstr ""
10499
10500
#: en/help_topics/configuration.txt:659
10501
msgid ""
10502
"bound\n"
10503
"~~~~~"
10504
msgstr ""
10505
10506
#: en/help_topics/configuration.txt:662
10507
msgid ""
10508
"If set to \"True\", the branch should act as a checkout, and push each "
10509
"commit to\n"
10510
"the bound_location. This option is normally set by ``bind``/``unbind``."
10511
msgstr ""
10512
10513
#: en/help_topics/configuration.txt:665
10514
msgid ""
10515
"send_strict\n"
10516
"~~~~~~~~~~~"
10517
msgstr ""
10518
10519
#: en/help_topics/configuration.txt:668
10520
msgid ""
10521
"If present, defines the ``--strict`` option default value for checking\n"
10522
"uncommitted changes before sending a merge directive."
10523
msgstr ""
10524
10525
#: en/help_topics/configuration.txt:671
10526
msgid ""
10527
"add.maximum_file_size\n"
10528
"~~~~~~~~~~~~~~~~~~~~~"
10529
msgstr ""
10530
10531
#: en/help_topics/configuration.txt:674
10532
msgid ""
10533
"Defines the maximum file size the command line \"add\" operation will allow\n"
10534
"in recursive mode, with files larger than this value being skipped. You may "
10535
"\n"
10536
"specify this value as an integer (in which case it is interpreted as bytes), "
10537
"\n"
10538
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10539
"0 \n"
10540
"will disable skipping."
10541
msgstr ""
10542
10543
#: en/help_topics/configuration.txt:680
10544
msgid ""
10545
"External Merge Tools\n"
10546
"--------------------"
10547
msgstr ""
10548
10549
#: en/help_topics/configuration.txt:683
10550
msgid ""
10551
"bzr.mergetool.<name>\n"
10552
"~~~~~~~~~~~~~~~~~~~~"
10553
msgstr ""
10554
10555
#: en/help_topics/configuration.txt:686
10556
msgid ""
10557
"Defines an external merge tool called <name> with the given command-line.\n"
10558
"Arguments containing spaces should be quoted using single or double quotes. "
10559
"The\n"
10560
"executable may omit its path if it can be found on the PATH."
10561
msgstr ""
10562
10563
#: en/help_topics/configuration.txt:690
10564
msgid ""
10565
"The following markers can be used in the command-line to substitute "
10566
"filenames\n"
10567
"involved in the merge conflict::"
10568
msgstr ""
10569
10570
#: en/help_topics/configuration.txt:693
10571
msgid ""
10572
" {base} file.BASE\n"
10573
" {this} file.THIS\n"
10574
" {other} file.OTHER\n"
10575
" {result} output file\n"
10576
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10577
"merge\n"
10578
" succeeds."
10579
msgstr ""
10580
10581
#: en/help_topics/configuration.txt:702
10582
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10583
msgstr ""
10584
10585
#: en/help_topics/configuration.txt:704
10586
msgid ""
10587
"bzr.default_mergetool\n"
10588
"~~~~~~~~~~~~~~~~~~~~~"
10589
msgstr ""
10590
10591
#: en/help_topics/configuration.txt:707
10592
msgid ""
10593
"Specifies which external merge tool (as defined above) should be selected "
10594
"by\n"
10595
"default in tools such as ``bzr qconflicts``."
10596
msgstr ""
10597
10598
#: en/help_topics/configuration.txt:712
10599
msgid " bzr.default_mergetool = kdiff3\n"
10600
msgstr ""
10601
10602
#: en/help_topics/conflict-types.txt:1
10603
msgid ""
10604
"Conflict Types\n"
10605
"=============="
10606
msgstr ""
10607
10608
#: en/help_topics/conflict-types.txt:4
10609
msgid ""
10610
"Some operations, like merge, revert and pull, modify the contents of your\n"
10611
"working tree. These modifications are programmatically generated, and so "
10612
"they\n"
10613
"may conflict with the current state of your working tree. "
10614
msgstr ""
10615
10616
#: en/help_topics/conflict-types.txt:8
10617
msgid ""
10618
"When conflicts are present in your working tree (as shown by ``bzr\n"
10619
"conflicts``), you should resolve them and then inform bzr that the "
10620
"conflicts\n"
10621
"have been resolved."
10622
msgstr ""
10623
10624
#: en/help_topics/conflict-types.txt:12
10625
msgid ""
10626
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10627
"should resolve them is not the one responsible for their occurrence, as is "
10628
"the\n"
10629
"case when merging other people's work or because some conflicts are "
10630
"presented\n"
10631
"in a way that is not easy to understand."
10632
msgstr ""
10633
10634
#: en/help_topics/conflict-types.txt:17
10635
msgid ""
10636
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10637
"conflict if and only if there's an actual conceptual conflict in the source\n"
10638
"tree. Because Bazaar doesn't understand the real meaning of the files "
10639
"being\n"
10640
"versioned, it can, when faced with ambiguities, fall short in either "
10641
"direction\n"
10642
"trying to resolve the conflict itself. Many kinds of changes can be "
10643
"combined\n"
10644
"programmatically, but sometimes only a human can determine the right thing "
10645
"to\n"
10646
"do."
10647
msgstr ""
10648
10649
#: en/help_topics/conflict-types.txt:25
10650
msgid ""
10651
"When Bazaar generates a conflict, it adds information into the working tree "
10652
"to\n"
10653
"present the conflicting versions, and it's up to you to find the correct\n"
10654
"resolution."
10655
msgstr ""
10656
10657
#: en/help_topics/conflict-types.txt:29
10658
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10659
msgstr ""
10660
10661
#: en/help_topics/conflict-types.txt:31
10662
msgid ""
10663
"1. Modify the working tree content so that the conflicted item is now in "
10664
"the\n"
10665
" state you want to keep, then"
10666
msgstr ""
10667
10668
#: en/help_topics/conflict-types.txt:34
10669
msgid ""
10670
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10671
" remaining generated information (``bzr resolve <item>``)."
10672
msgstr ""
10673
10674
#: en/help_topics/conflict-types.txt:37
10675
msgid ""
10676
"For most conflict types, there are some obvious ways to modify the working\n"
10677
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10678
"itself already made a choice, when possible."
10679
msgstr ""
10680
10681
#: en/help_topics/conflict-types.txt:41
10682
msgid ""
10683
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10684
"different ways to resolve the conflict."
10685
msgstr ""
10686
10687
#: en/help_topics/conflict-types.txt:44
10688
msgid ""
10689
"Each type of conflict is explained below, and the action which must be done "
10690
"to\n"
10691
"resolve the conflict is outlined."
10692
msgstr ""
10693
10694
#: en/help_topics/conflict-types.txt:47
10695
msgid ""
10696
"Various actions are available depending on the kind of conflict, for some "
10697
"of\n"
10698
"these actions, Bazaar can provide some help. In the end you should at least\n"
10699
"inform Bazaar that you're done with the conflict with::"
10700
msgstr ""
10701
10702
#: en/help_topics/conflict-types.txt:51
10703
msgid " ``bzr resolve FILE --action=done'"
10704
msgstr " ``bzr resolve FILE --action=done'"
10705
10706
#: en/help_topics/conflict-types.txt:53
10707
msgid ""
10708
"Note that this is the default action when a single file is involved so you "
10709
"can\n"
10710
"simply use::"
10711
msgstr ""
10712
10713
#: en/help_topics/conflict-types.txt:56
10714
msgid " ``bzr resolve FILE``"
10715
msgstr " ``bzr resolve FILE``"
10716
10717
#: en/help_topics/conflict-types.txt:58
10718
msgid "See ``bzr help resolve`` for more details."
10719
msgstr ""
10720
10721
#: en/help_topics/conflict-types.txt:60
10722
msgid ""
10723
"Text conflicts\n"
10724
"--------------"
10725
msgstr ""
10726
10727
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10728
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10729
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10730
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10731
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10732
msgid "Typical message::"
10733
msgstr ""
10734
10735
#: en/help_topics/conflict-types.txt:65
10736
msgid " Text conflict in FILE"
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:67
10740
msgid ""
10741
"These are produced when a text merge cannot completely reconcile two sets "
10742
"of\n"
10743
"text changes. Bazaar will emit files for each version with the extensions\n"
10744
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10745
"tree,\n"
10746
"i.e. the tree that you are merging changes into. OTHER is the version that "
10747
"you\n"
10748
"are merging into the target. BASE is an older version that is used as a "
10749
"basis\n"
10750
"for comparison."
10751
msgstr ""
10752
10753
#: en/help_topics/conflict-types.txt:74
10754
msgid ""
10755
"In the main copy of the file, Bazaar will include all the changes that it\n"
10756
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10757
"\"herringbone\" markers like ``<<<<<<<``."
10758
msgstr ""
10759
10760
#: en/help_topics/conflict-types.txt:78
10761
msgid ""
10762
"Say the initial text is \"The project leader released it.\", and THIS "
10763
"modifies it\n"
10764
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10765
"leader\n"
10766
"released Bazaar.\" A conflict would look like this::"
10767
msgstr ""
10768
10769
#: en/help_topics/conflict-types.txt:82
10770
msgid ""
10771
" <<<<<<< TREE\n"
10772
" Martin Pool released it.\n"
10773
" =======\n"
10774
" The project leader released Bazaar.\n"
10775
" >>>>>>> MERGE-SOURCE"
10776
msgstr ""
10777
10778
#: en/help_topics/conflict-types.txt:88
10779
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10780
msgstr ""
10781
10782
#: en/help_topics/conflict-types.txt:90
10783
msgid ""
10784
"You can handle text conflicts either by editing the main copy of the file,\n"
10785
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10786
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10787
"set of changes over the other (but see below when you encounter these\n"
10788
"cases). More often, the two sets of changes must be intelligently combined."
10789
msgstr ""
10790
10791
#: en/help_topics/conflict-types.txt:96
10792
msgid ""
10793
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10794
"you are done editing, the file should look like it never had a conflict, and "
10795
"be\n"
10796
"ready to commit."
10797
msgstr ""
10798
10799
#: en/help_topics/conflict-types.txt:100
10800
msgid ""
10801
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10802
"Bazaar will auto-detect which conflicts you have resolved."
10803
msgstr ""
10804
10805
#: en/help_topics/conflict-types.txt:103
10806
msgid ""
10807
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10808
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10809
"working tree."
10810
msgstr ""
10811
10812
#: en/help_topics/conflict-types.txt:107
10813
msgid ""
10814
"\n"
10815
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10816
"resolve`` with one of the following actions:"
10817
msgstr ""
10818
10819
#: en/help_topics/conflict-types.txt:111
10820
msgid ""
10821
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10822
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10823
msgstr ""
10824
10825
#: en/help_topics/conflict-types.txt:114
10826
msgid ""
10827
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10828
"modifications will be taken into account."
10829
msgstr ""
10830
10831
#: en/help_topics/conflict-types.txt:117
10832
msgid ""
10833
"Content conflicts\n"
10834
"-----------------"
10835
msgstr ""
10836
10837
#: en/help_topics/conflict-types.txt:122
10838
msgid " Contents conflict in FILE"
10839
msgstr ""
10840
10841
#: en/help_topics/conflict-types.txt:124
10842
msgid ""
10843
"This conflict happens when there are conflicting changes in the working "
10844
"tree\n"
10845
"and the merge source, but the conflicted items are not text files. They "
10846
"may\n"
10847
"be binary files, or symlinks, or directories. It can even happen with "
10848
"files\n"
10849
"that are deleted on one side, and modified on the other."
10850
msgstr ""
10851
10852
#: en/help_topics/conflict-types.txt:129
10853
msgid ""
10854
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10855
"be\n"
10856
"regular files, symlinks or directories). But it will not include a \"main "
10857
"copy\"\n"
10858
"of the file with herringbone conflict markers. It will appear that the "
10859
"\"main\n"
10860
"copy\" has been renamed to THIS or OTHER."
10861
msgstr ""
10862
10863
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10864
msgid ""
10865
"To resolve that kind of conflict, you should rebuild FILE from either "
10866
"version\n"
10867
"or a combination of both."
10868
msgstr ""
10869
10870
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10871
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10872
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10873
#: en/help_topics/conflict-types.txt:361
10874
msgid "``bzr resolve`` recognizes the following actions:"
10875
msgstr ""
10876
10877
#: en/help_topics/conflict-types.txt:139
10878
msgid ""
10879
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10880
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10881
"* ``--action=done`` will just mark the conflict as resolved."
10882
msgstr ""
10883
10884
#: en/help_topics/conflict-types.txt:143
10885
msgid ""
10886
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10887
"and\n"
10888
"``.OTHER`` files if they are still present in the working tree."
10889
msgstr ""
10890
10891
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10892
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10893
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10894
#: en/help_topics/conflict-types.txt:369
10895
msgid ""
10896
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10897
msgstr ""
10898
10899
#: en/help_topics/conflict-types.txt:148
10900
msgid ""
10901
"Tag conflicts\n"
10902
"-------------"
10903
msgstr ""
10904
10905
#: en/help_topics/conflict-types.txt:153
10906
msgid ""
10907
" Conflicting tags:\n"
10908
" version-0.1"
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:156
10912
msgid ""
10913
"When pulling from or pushing to another branch, Bazaar informs you about "
10914
"tags\n"
10915
"that conflict between the two branches; that is the same tag points to two\n"
10916
"different revisions. You need not resolve these conflicts, but subsequent\n"
10917
"uses of pull or push will result in the same message."
10918
msgstr ""
10919
10920
#: en/help_topics/conflict-types.txt:161
10921
msgid ""
10922
"To resolve the conflict, you must apply the correct tags to either the "
10923
"target\n"
10924
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10925
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10926
"target branch's tags match the source branch, then in the target branch do\n"
10927
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10928
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10929
"source\n"
10930
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10931
"favor of the target branch, you need to similarly use ``tag --force`` in "
10932
"the\n"
10933
"source branch. (Note that pulling or pushing using --overwrite will "
10934
"overwrite\n"
10935
"all tags as well.)"
10936
msgstr ""
10937
10938
#: en/help_topics/conflict-types.txt:172
10939
msgid ""
10940
"Duplicate paths\n"
10941
"---------------"
10942
msgstr ""
10943
10944
#: en/help_topics/conflict-types.txt:177
10945
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10946
msgstr ""
10947
10948
#: en/help_topics/conflict-types.txt:179
10949
msgid ""
10950
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10951
"already been used. The existing file will be renamed to \"FILE.moved\". "
10952
msgstr ""
10953
10954
#: en/help_topics/conflict-types.txt:187
10955
msgid ""
10956
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10957
"FILE``,\n"
10958
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10959
"* ``--action=done`` will just mark the conflict as resolved."
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:191
10963
msgid ""
10964
"Note that you must get rid of FILE.moved before using ``--action=done``."
10965
msgstr ""
10966
10967
#: en/help_topics/conflict-types.txt:195
10968
msgid ""
10969
"Unversioned parent\n"
10970
"------------------"
10971
msgstr ""
10972
10973
#: en/help_topics/conflict-types.txt:200
10974
msgid ""
10975
" Conflict because FILE is not versioned, but has versioned children."
10976
msgstr ""
10977
10978
#: en/help_topics/conflict-types.txt:202
10979
msgid ""
10980
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10981
"not\n"
10982
"versioned. This happens when the directory has been deleted in the target,\n"
10983
"but has a new child in the source, or vice versa. In this situation, "
10984
"Bazaar\n"
10985
"will version the parent directory as well. Resolving this issue depends\n"
10986
"very much on the particular scenario. You may wish to rename or delete "
10987
"either\n"
10988
"the file or the directory. When you are satisfied, you can run \"bzr "
10989
"resolve\n"
10990
"FILE\" to mark the conflict as resolved."
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:210
10994
msgid ""
10995
"Missing parent\n"
10996
"--------------"
10997
msgstr ""
10998
10999
#: en/help_topics/conflict-types.txt:215
11000
msgid " Conflict adding files to FILE. Created directory."
11001
msgstr ""
11002
11003
#: en/help_topics/conflict-types.txt:217
11004
msgid ""
11005
"This happens when a directory has been deleted in the target, but has new\n"
11006
"children in the source. This is similar to the \"unversioned parent\" "
11007
"conflict,\n"
11008
"except that the parent directory does not *exist*, instead of just being\n"
11009
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11010
"Resolving this issue depends very much on the particular scenario."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11014
msgid ""
11015
"To resolve that kind of conflict, you should either remove or rename the\n"
11016
"children or the directory or a combination of both."
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:228
11020
msgid ""
11021
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11022
" children,\n"
11023
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11024
"children\n"
11025
" and restoring the directory,\n"
11026
"* ``--action=done`` will just mark the conflict as resolved."
11027
msgstr ""
11028
11029
#: en/help_topics/conflict-types.txt:236
11030
msgid ""
11031
"Deleting parent\n"
11032
"---------------"
11033
msgstr ""
11034
11035
#: en/help_topics/conflict-types.txt:241
11036
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11037
msgstr ""
11038
11039
#: en/help_topics/conflict-types.txt:243
11040
msgid ""
11041
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11042
"source, but has new children in the target (either because a directory\n"
11043
"deletion is merged or because the merge introduce new children). Bazaar\n"
11044
"will retain the directory. Resolving this issue depends very much on the\n"
11045
"particular scenario."
11046
msgstr ""
11047
11048
#: en/help_topics/conflict-types.txt:254
11049
msgid ""
11050
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11051
"directory,"
11052
msgstr ""
11053
11054
#: en/help_topics/conflict-types.txt:256
11055
msgid ""
11056
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11057
" children,"
11058
msgstr ""
11059
11060
#: en/help_topics/conflict-types.txt:259
11061
msgid "* ``--action=done`` will just mark the conflict as resolved."
11062
msgstr ""
11063
11064
#: en/help_topics/conflict-types.txt:261
11065
msgid ""
11066
"Note that when merging a directory deletion, if unversioned files are\n"
11067
"present, they become potential orphans has they don't have a directory\n"
11068
"parent anymore."
11069
msgstr ""
11070
11071
#: en/help_topics/conflict-types.txt:265
11072
msgid ""
11073
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11074
"setting the ``bzr.transform.orphan_policy`` configuration option."
11075
msgstr ""
11076
11077
#: en/help_topics/conflict-types.txt:268
11078
msgid "There are two possible values for this option:"
11079
msgstr "Es gibt zwei mögliche Werte für diese Option:"
11080
11081
#: en/help_topics/conflict-types.txt:270
11082
msgid ""
11083
"* ``conflict`` (the default): will leave the orphans in place and\n"
11084
" generate a conflicts,"
11085
msgstr ""
11086
11087
#: en/help_topics/conflict-types.txt:273
11088
msgid ""
11089
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11090
"root\n"
11091
" of the working tree with names like ``<file>.~#~``."
11092
msgstr ""
11093
11094
#: en/help_topics/conflict-types.txt:278
11095
msgid ""
11096
"Path conflict\n"
11097
"-------------"
11098
msgstr ""
11099
11100
#: en/help_topics/conflict-types.txt:283
11101
msgid " Path conflict: PATH1 / PATH2"
11102
msgstr ""
11103
11104
#: en/help_topics/conflict-types.txt:285
11105
msgid ""
11106
"This happens when the source and target have each modified the name or "
11107
"parent\n"
11108
"directory of a file. Bazaar will use the path elements from the source."
11109
msgstr ""
11110
11111
#: en/help_topics/conflict-types.txt:288
11112
msgid ""
11113
"To resolve that kind of conflict, you just have to decide what name should "
11114
"be\n"
11115
"retained for the file involved."
11116
msgstr ""
11117
11118
#: en/help_topics/conflict-types.txt:293
11119
msgid ""
11120
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11121
" issuing ``bzr mv PATH2 PATH1``,\n"
11122
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11123
"``PATH2``,\n"
11124
"* ``--action=done`` will just mark the conflict as resolved."
11125
msgstr ""
11126
11127
#: en/help_topics/conflict-types.txt:300
11128
msgid ""
11129
"Parent loop\n"
11130
"-----------"
11131
msgstr ""
11132
11133
#: en/help_topics/conflict-types.txt:305
11134
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11135
msgstr ""
11136
11137
#: en/help_topics/conflict-types.txt:307
11138
msgid ""
11139
"This happens when the source and the target have each moved directories, so\n"
11140
"that, if the change could be applied, a directory would be contained by "
11141
"itself.\n"
11142
"For example::"
11143
msgstr ""
11144
11145
#: en/help_topics/conflict-types.txt:311
11146
msgid ""
11147
" $ bzr init\n"
11148
" $ bzr mkdir white\n"
11149
" $ bzr mkdir black\n"
11150
" $ bzr commit -m \"BASE\"\n"
11151
" $ bzr branch . ../other\n"
11152
" $ bzr mv white black\n"
11153
" $ bzr commit -m \"THIS\"\n"
11154
" $ bzr mv ../other/black ../other/white\n"
11155
" $ bzr commit ../other -m \"OTHER\"\n"
11156
" $ bzr merge ../other"
11157
msgstr ""
11158
" $ bzr init\n"
11159
" $ bzr mkdir white\n"
11160
" $ bzr mkdir black\n"
11161
" $ bzr commit -m \"BASE\"\n"
11162
" $ bzr branch . ../other\n"
11163
" $ bzr mv white black\n"
11164
" $ bzr commit -m \"THIS\"\n"
11165
" $ bzr mv ../other/black ../other/white\n"
11166
" $ bzr commit ../other -m \"OTHER\"\n"
11167
" $ bzr merge ../other"
11168
11169
#: en/help_topics/conflict-types.txt:322
11170
msgid ""
11171
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11172
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11173
"name should be retained for the directories involved."
11174
msgstr ""
11175
11176
#: en/help_topics/conflict-types.txt:328
11177
msgid ""
11178
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11179
"\n"
11180
" in ``black``,\n"
11181
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11182
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11183
"* ``--action=done`` will just mark the conflict as resolved."
11184
msgstr ""
11185
11186
#: en/help_topics/conflict-types.txt:336
11187
msgid ""
11188
"Non-directory parent\n"
11189
"--------------------"
11190
msgstr ""
11191
11192
#: en/help_topics/conflict-types.txt:341
11193
msgid ""
11194
" Conflict: foo.new is not a directory, but has files in it.\n"
11195
" Created directory."
11196
msgstr ""
11197
11198
#: en/help_topics/conflict-types.txt:344
11199
msgid ""
11200
"This happens when one side has added files to a directory, and the other "
11201
"side\n"
11202
"has changed the directory into a file or symlink. For example::"
11203
msgstr ""
11204
11205
#: en/help_topics/conflict-types.txt:347
11206
msgid ""
11207
" $ bzr init\n"
11208
" $ bzr mkdir foo\n"
11209
" $ bzr commit -m \"BASE\"\n"
11210
" $ bzr branch . ../other\n"
11211
" $ rmdir foo\n"
11212
" $ touch foo\n"
11213
" $ bzr commit -m \"THIS\"\n"
11214
" $ bzr mkdir ../other/foo/bar\n"
11215
" $ bzr commit ../other -m \"OTHER\"\n"
11216
" $ bzr merge ../other"
11217
msgstr ""
11218
" $ bzr init\n"
11219
" $ bzr mkdir foo\n"
11220
" $ bzr commit -m \"BASE\"\n"
11221
" $ bzr branch . ../other\n"
11222
" $ rmdir foo\n"
11223
" $ touch foo\n"
11224
" $ bzr commit -m \"THIS\"\n"
11225
" $ bzr mkdir ../other/foo/bar\n"
11226
" $ bzr commit ../other -m \"OTHER\"\n"
11227
" $ bzr merge ../other"
11228
11229
#: en/help_topics/conflict-types.txt:358
11230
msgid ""
11231
"To resolve that kind of conflict, you have to decide what name should be\n"
11232
"retained for the file, directory or symlink involved."
11233
msgstr ""
11234
11235
#: en/help_topics/conflict-types.txt:363
11236
msgid ""
11237
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11238
" ``bzr add foo``,\n"
11239
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11240
" ``bzr mv foo.new foo``,\n"
11241
"* ``--action=done`` will just mark the conflict as resolved."
11242
msgstr ""
11243
11244
#: en/help_topics/conflict-types.txt:371
11245
msgid ""
11246
"MalformedTransform\n"
11247
"------------------"
11248
msgstr ""
11249
11250
#: en/help_topics/conflict-types.txt:374
11251
msgid ""
11252
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11253
"exception. This means that Bazaar encountered a filesystem conflict that it "
11254
"was\n"
11255
"unable to resolve. This usually indicates a bug. Please let us know if "
11256
"you\n"
11257
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11258
msgstr ""
11259
11260
#: en/help_topics/content-filters.txt:1
11261
msgid ""
11262
"Content Filters\n"
11263
"==============="
11264
msgstr ""
11265
11266
#: en/help_topics/content-filters.txt:4
11267
msgid ""
11268
"Content formats\n"
11269
"---------------"
11270
msgstr ""
11271
11272
#: en/help_topics/content-filters.txt:7
11273
msgid ""
11274
"Bazaar's content filtering allows you to store files in a different\n"
11275
"format from the copy in your working tree. This lets you, or your\n"
11276
"co-developers, use Windows development tools that expect CRLF files\n"
11277
"on projects that use other line-ending conventions. Among other things,\n"
11278
"content filters also let Unix developers more easily work on projects\n"
11279
"using Windows line-ending conventions, keyword expansion/compression,\n"
11280
"and trailing spaces on lines in text files to be implicitly stripped\n"
11281
"when committed."
11282
msgstr ""
11283
11284
#: en/help_topics/content-filters.txt:16
11285
msgid "To generalize, there are two content formats supported by Bazaar:"
11286
msgstr ""
11287
11288
#: en/help_topics/content-filters.txt:18
11289
msgid ""
11290
"* a canonical format - how files are stored internally\n"
11291
"* a convenience format - how files are created in a working tree."
11292
msgstr ""
11293
11294
#: en/help_topics/content-filters.txt:21
11295
msgid ""
11296
"\n"
11297
"Format conversion\n"
11298
"-----------------"
11299
msgstr ""
11300
11301
#: en/help_topics/content-filters.txt:25
11302
msgid ""
11303
"The conversion between these formats is done by content filters.\n"
11304
"A content filter has two parts:"
11305
msgstr ""
11306
11307
#: en/help_topics/content-filters.txt:28
11308
msgid ""
11309
"* a read converter - converts from convenience to canonical format\n"
11310
"* a write converter - converts from canonical to convenience format."
11311
msgstr ""
11312
11313
#: en/help_topics/content-filters.txt:31
11314
msgid ""
11315
"Many of these converters will provide *round-trip* conversion,\n"
11316
"i.e. applying the read converter followed by the write converter\n"
11317
"gives back the original content. However, others may provide an\n"
11318
"asymmetric conversion. For example, a read converter might strip\n"
11319
"trailing whitespace off lines in source code while the matching\n"
11320
"write converter might pass content through unchanged."
11321
msgstr ""
11322
11323
#: en/help_topics/content-filters.txt:38
11324
msgid ""
11325
"\n"
11326
"Enabling content filters\n"
11327
"------------------------"
11328
msgstr ""
11329
11330
#: en/help_topics/content-filters.txt:42
11331
msgid ""
11332
"Content filters are typically provided by plugins, so the first step\n"
11333
"in using them is to install the relevant plugins and read their\n"
11334
"documentation. Some plugins may be very specific about which files\n"
11335
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11336
"In other cases, the plugin may leave it in the user's hands to\n"
11337
"define which files are to be filtered. This is typically done\n"
11338
"using rule-based preferences. See ``bzr help rules`` for general\n"
11339
"information about defining these."
11340
msgstr ""
11341
11342
#: en/help_topics/content-filters.txt:51
11343
msgid ""
11344
"\n"
11345
"Impact on commands\n"
11346
"------------------"
11347
msgstr ""
11348
11349
#: en/help_topics/content-filters.txt:55
11350
msgid ""
11351
"Read converters are only applied to commands that read content from\n"
11352
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11353
"will apply read converters to files in the working tree, then compare\n"
11354
"the results to the content last committed."
11355
msgstr ""
11356
11357
#: en/help_topics/content-filters.txt:60
11358
msgid ""
11359
"Write converters are only applied by commands that **create files in a\n"
11360
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11361
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11362
"respectively."
11363
msgstr ""
11364
11365
#: en/help_topics/content-filters.txt:65
11366
msgid ""
11367
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11368
"comitting files. If this makes sense for a given plugin providing\n"
11369
"a content filter, the plugin can usually achieve this effect by using a\n"
11370
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11371
"for more information on hooks."
11372
msgstr ""
11373
11374
#: en/help_topics/content-filters.txt:71
11375
msgid ""
11376
"\n"
11377
"Refreshing your working tree\n"
11378
"----------------------------"
11379
msgstr ""
11380
11381
#: en/help_topics/content-filters.txt:75
11382
msgid ""
11383
"For performance reasons, Bazaar caches the timestamps of files in\n"
11384
"a working tree, and assumes files are unchanged if their timestamps\n"
11385
"match the cached values. As a consequence, there are times when\n"
11386
"you may need to explicitly ask for content filtering to be reapplied\n"
11387
"in one or both directions, e.g. after installing or reconfiguring\n"
11388
"plugins providing it."
11389
msgstr ""
11390
11391
#: en/help_topics/content-filters.txt:82
11392
msgid "Here are some general guidelines for doing this:"
11393
msgstr ""
11394
11395
#: en/help_topics/content-filters.txt:84
11396
msgid ""
11397
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11398
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11399
" relevant read converters and compare the end result with the\n"
11400
" canonical format."
11401
msgstr ""
11402
11403
#: en/help_topics/content-filters.txt:89
11404
msgid ""
11405
" * To reapply write converters, ensure there are no local changes,\n"
11406
" delete the relevant files and run ``bzr revert`` on those files."
11407
msgstr ""
11408
11409
#: en/help_topics/content-filters.txt:92
11410
msgid ""
11411
"Note: In the future, it is likely that additional options will be added\n"
11412
"to commands to make this refreshing process faster and safer.\n"
11413
msgstr ""
11414
11415
#: en/help_topics/current-formats.txt:1
11416
msgid "Current Storage Formats"
11417
msgstr "Aktuelle Speicherformate"
11418
11419
#: en/help_topics/current-formats.txt:3
11420
msgid ""
11421
":2a:\n"
11422
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11423
" compress storage. Provides rich roots which are a one-way\n"
11424
" transition."
11425
msgstr ""
11426
11427
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11428
msgid ""
11429
"\n"
11430
"See :doc:`formats-help` for more about storage formats."
11431
msgstr ""
11432
11433
#: en/help_topics/debug-flags.txt:1
11434
msgid ""
11435
"Debug Flags\n"
11436
"==========="
11437
msgstr ""
11438
11439
#: en/help_topics/debug-flags.txt:4
11440
msgid ""
11441
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11442
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11443
msgstr ""
11444
11445
#: en/help_topics/debug-flags.txt:7
11446
msgid ""
11447
"-Dauth Trace authentication sections used.\n"
11448
"-Dbytes Print out how many bytes were transferred\n"
11449
"-Ddirstate Trace dirstate activity (verbose!)\n"
11450
"-Derror Instead of normal error handling, always print a "
11451
"traceback\n"
11452
" on error.\n"
11453
"-Devil Capture call sites that do expensive or badly-scaling\n"
11454
" operations.\n"
11455
"-Dfetch Trace history copying between repositories.\n"
11456
"-Dfilters Emit information for debugging content filtering.\n"
11457
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11458
"fetch.\n"
11459
"-Dgraph Trace graph traversal.\n"
11460
"-Dhashcache Log every time a working file is read to determine its "
11461
"hash.\n"
11462
"-Dhooks Trace hook execution.\n"
11463
"-Dhpss Trace smart protocol requests and responses.\n"
11464
"-Dhpssdetail More hpss details.\n"
11465
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11466
"-Dhttp Trace http connections, requests and responses.\n"
11467
"-Dindex Trace major index operations.\n"
11468
"-Dknit Trace knit operations.\n"
11469
"-Dlock Trace when lockdir locks are taken or released.\n"
11470
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11471
" retrying the request.\n"
11472
"-Dprogress Trace progress bar operations.\n"
11473
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11474
"-Dmerge Emit information for debugging merges.\n"
11475
"-Dno_apport Don't use apport to report crashes.\n"
11476
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11477
"-Dpack Emit information about pack operations.\n"
11478
"-Drelock Emit a message every time a branch or repository object "
11479
"is\n"
11480
" unlocked then relocked the same way.\n"
11481
"-Dsftp Trace SFTP internals.\n"
11482
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11483
"expected\n"
11484
"-Dstream Trace fetch streams.\n"
11485
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11486
"portable\n"
11487
" manner.\n"
11488
"-Dunlock Some errors during unlock are treated as warnings.\n"
11489
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11490
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11491
"appropriate\n"
11492
" for the format, even for non-local fetches.\n"
11493
msgstr ""
11494
11495
#: en/help_topics/diverged-branches.txt:1
11496
msgid ""
11497
"Diverged Branches\n"
11498
"================="
11499
msgstr ""
11500
11501
#: en/help_topics/diverged-branches.txt:4
11502
msgid ""
11503
"When Bazaar tries to push one branch onto another, it requires that the\n"
11504
"destination branch must be ready to receive the source branch. If this "
11505
"isn't\n"
11506
"the case, then we say that the branches have ``diverged``. Branches are\n"
11507
"considered diverged if the destination branch's most recent commit is one "
11508
"that\n"
11509
"has not been merged (directly or indirectly) by the source branch. To "
11510
"recover\n"
11511
"from diverged branches, one must merge the missing revisions into the "
11512
"source\n"
11513
"branch."
11514
msgstr ""
11515
11516
#: en/help_topics/diverged-branches.txt:12
11517
msgid ""
11518
"This situation commonly arises when using a centralized workflow with local\n"
11519
"commits. If someone else has committed new work to the mainline since your\n"
11520
"last pull and you have local commits that have not yet been pushed to the\n"
11521
"mainline, then your local branch and the mainline have diverged."
11522
msgstr ""
11523
11524
#: en/help_topics/diverged-branches.txt:17
11525
msgid ""
11526
"Discovering What Has Diverged\n"
11527
"-----------------------------"
11528
msgstr ""
11529
11530
#: en/help_topics/diverged-branches.txt:20
11531
msgid ""
11532
"The ``bzr missing`` command is used to find out what revisions are in "
11533
"another\n"
11534
"branch that are not present in the current branch, and vice-versa. It shows "
11535
"a\n"
11536
"summary of which extra revisions exist in each branch. If you want to see "
11537
"the\n"
11538
"precise effects of those revisions, you can use ``bzr diff --"
11539
"old=other_branch``\n"
11540
"to show the differences between other_branch and your current branch."
11541
msgstr ""
11542
11543
#: en/help_topics/diverged-branches.txt:26
11544
msgid ""
11545
"A Solution\n"
11546
"----------"
11547
msgstr ""
11548
11549
#: en/help_topics/diverged-branches.txt:29
11550
msgid ""
11551
"The solution is to merge the revisions from the mainline into your local\n"
11552
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11553
"mainline. This merge may result in conflicts if the other developer's "
11554
"changes\n"
11555
"overlap with your changes. These conflicts should be resolved before\n"
11556
"continuing. After any conflicts have been resolved, or even if there were "
11557
"no\n"
11558
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11559
"to your local branch. This requirement gives you an opportunity to test "
11560
"the\n"
11561
"resulting working tree for correctness, since the merged revisions could "
11562
"have\n"
11563
"made arbitrary changes. After testing, you should commit the merge using\n"
11564
"``bzr commit``. This clears up the diverged branches situation. Your "
11565
"local\n"
11566
"branch can now be pushed to the mainline.\n"
11567
msgstr ""
11568
11569
#: en/help_topics/eol.txt:1
11570
msgid ""
11571
"End of Line Conversion\n"
11572
"======================"
11573
msgstr ""
11574
11575
#: en/help_topics/eol.txt:4
11576
msgid ""
11577
"EOL conversion is provided as a content filter where Bazaar internally\n"
11578
"stores a canonical format but outputs a convenience format. See\n"
11579
"``bzr help content-filters`` for general information about using these."
11580
msgstr ""
11581
11582
#: en/help_topics/eol.txt:8
11583
msgid ""
11584
"Note: Content filtering is only supported in recently added formats,\n"
11585
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11586
"in a recent format. (Just setting the format on the repository\n"
11587
"is not enough.) If content filtering does not appear to be working, use\n"
11588
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11589
"or later."
11590
msgstr ""
11591
11592
#: en/help_topics/eol.txt:15
11593
msgid ""
11594
"EOL conversion needs to be enabled for selected file patterns using\n"
11595
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11596
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11597
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11598
"supported in a future verison of Bazaar."
11599
msgstr ""
11600
11601
#: en/help_topics/eol.txt:21
11602
msgid ""
11603
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11604
"(If a value is not set, ``exact`` is the default.)"
11605
msgstr ""
11606
11607
#: en/help_topics/eol.txt:24
11608
msgid ""
11609
" ========== ===================================== ======================\n"
11610
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11611
" ========== ===================================== ======================\n"
11612
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11613
" ---------- ------------------------------------- ----------------------\n"
11614
" ``lf`` ``lf`` ``lf``\n"
11615
" ---------- ------------------------------------- ----------------------\n"
11616
" ``crlf`` ``crlf`` ``lf``\n"
11617
" ---------- ------------------------------------- ----------------------\n"
11618
" ``exact`` No conversion Exactly as in file\n"
11619
" ========== ===================================== ======================"
11620
msgstr ""
11621
11622
#: en/help_topics/eol.txt:36
11623
msgid ""
11624
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11625
"byte is detected in the file."
11626
msgstr ""
11627
11628
#: en/help_topics/eol.txt:39
11629
msgid ""
11630
"For users working on a cross-platform project, here is a suggested rule\n"
11631
"to use as a starting point::"
11632
msgstr ""
11633
11634
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11635
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11636
msgid ""
11637
" [name *]\n"
11638
" eol = native"
11639
msgstr ""
11640
11641
#: en/help_topics/eol.txt:45
11642
msgid ""
11643
"If you have binary files that do not contain a null byte though, be\n"
11644
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11645
"by giving more explicit patterns earlier in the rules file. For example::"
11646
msgstr ""
11647
11648
#: en/help_topics/eol.txt:49
11649
msgid ""
11650
" [name *.png]\n"
11651
" eol = exact"
11652
msgstr ""
11653
11654
#: en/help_topics/eol.txt:55
11655
msgid ""
11656
"If your working tree is on a network drive shared by users on different\n"
11657
"operating systems, you typically want to force certain conventions for\n"
11658
"certain files. In that way, if a file is created with the wrong line\n"
11659
"endings or line endings get mixed during editing, it gets committed\n"
11660
"correctly and gets checked out correctly. For example::"
11661
msgstr ""
11662
11663
#: en/help_topics/eol.txt:61
11664
msgid ""
11665
" [name *.bat]\n"
11666
" eol = crlf"
11667
msgstr ""
11668
11669
#: en/help_topics/eol.txt:64
11670
msgid ""
11671
" [name *.sh]\n"
11672
" eol = lf"
11673
msgstr ""
11674
11675
#: en/help_topics/eol.txt:70
11676
msgid ""
11677
"If you take the care to create files with their required endings, you can\n"
11678
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11679
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11680
"introducing mixed line endings will be corrected during commit for files\n"
11681
"with those settings."
11682
msgstr ""
11683
11684
#: en/help_topics/eol.txt:76
11685
msgid ""
11686
"If you have sample test data that deliberately has text files with mixed\n"
11687
"newline conventions, you can ask for those to be left alone like this::"
11688
msgstr ""
11689
11690
#: en/help_topics/eol.txt:79
11691
msgid ""
11692
" [name test_data/]\n"
11693
" eol = exact"
11694
msgstr ""
11695
11696
#: en/help_topics/eol.txt:85
11697
msgid ""
11698
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11699
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11700
"of content analysis to detect binary files for commands like ``diff``.\n"
11701
"In the future, a ``binary = true`` rule may be added but it is not\n"
11702
"supported yet.)"
11703
msgstr ""
11704
11705
#: en/help_topics/eol.txt:91
11706
msgid ""
11707
"If you have an existing repository with text files already stored using\n"
11708
"Windows newline conventions (``crlf``), then you may want to keep using "
11709
"that\n"
11710
"convention in the repository. Forcing certain files to this convention\n"
11711
"may also help users who do not have rules configured. To do this, set\n"
11712
"``eol`` to one of the values below."
11713
msgstr ""
11714
11715
#: en/help_topics/eol.txt:97
11716
msgid ""
11717
" ============================ ======================== "
11718
"======================\n"
11719
" Value Checkout end-of-lines as Commit end-of-lines "
11720
"as\n"
11721
" ============================ ======================== "
11722
"======================\n"
11723
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11724
" ``lf`` otherwise\n"
11725
" ---------------------------- ------------------------ ----------------------"
11726
"\n"
11727
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11728
" ---------------------------- ------------------------ ----------------------"
11729
"\n"
11730
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11731
" ============================ ======================== ======================"
11732
msgstr ""
11733
11734
#: en/help_topics/eol.txt:108
11735
msgid ""
11736
"For users working on an existing project that uses Windows newline\n"
11737
"conventions in their Bazaar repository, this rule is suggested as a\n"
11738
"starting point::"
11739
msgstr ""
11740
11741
#: en/help_topics/eol.txt:112
11742
msgid ""
11743
" [name *]\n"
11744
" eol = native-with-crlf-in-repo"
11745
msgstr ""
11746
11747
#: en/help_topics/eol.txt:115
11748
msgid ""
11749
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11750
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11751
"``crlf`` and ``exact``."
11752
msgstr ""
11753
11754
#: en/help_topics/eol.txt:119
11755
msgid ""
11756
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11757
"never reject files because a given line ending or mixed line endings\n"
11758
"are found. A precommit hook should be used if you wish to validate\n"
11759
"(and not just convert) content before committing.\n"
11760
msgstr ""
11761
11762
#: en/help_topics/hidden-commands.txt:1
11763
msgid ""
11764
"added List files added in working tree.\n"
11765
"ancestry List all revisions merged into this branch.\n"
11766
"assert-fail Test reporting of assertion failures\n"
11767
"bundle-info Output interesting stats about a bundle\n"
11768
"bundle-revisions Create a merge-directive for submitting changes.\n"
11769
"cat-revision Write out metadata for a revision.\n"
11770
"dump-btree Dump the contents of a btree index file to stdout.\n"
11771
"export-pot Export command helps and error messages in po format.\n"
11772
"file-id Print file_id of a particular file or directory.\n"
11773
"file-path Print path of file_ids to a file or directory.\n"
11774
"find-merge-base Find and print a base revision for merging two "
11775
"branches.\n"
11776
"hooks Show hooks.\n"
11777
"inventory Show inventory of the current working copy or a "
11778
"revision.\n"
11779
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11780
"lookup-revision Lookup the revision-id from a revision-number\n"
11781
"merge-directive Generate a merge directive for auto-merge tools.\n"
11782
"modified List files modified in working tree.\n"
11783
"re-sign Create a digital signature for an existing revision.\n"
11784
"reference list, view and set branch locations for nested trees.\n"
11785
"relpath Show path of a file relative to root\n"
11786
"repair-workingtree Reset the working tree state file.\n"
11787
"revision-history Display the list of revision ids on a branch.\n"
11788
"revision-info Show revision number and revision id for a given "
11789
"revision\n"
11790
" identifier.\n"
11791
"rocks Statement of optimism.\n"
11792
"selftest Run internal test suite.\n"
11793
"shell-complete Show appropriate completions for context.\n"
11794
"test-script Run a shell-like test from a file.\n"
11795
"touching-revisions Return revision-ids which affected a particular file.\n"
11796
"unknowns List unknown files.\n"
11797
"wait-until-signalled Test helper for\n"
11798
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11799
msgstr ""
11800
11801
#: en/help_topics/hooks.txt:1
11802
msgid ""
11803
"\n"
11804
"Hooks\n"
11805
"====="
11806
msgstr ""
11807
11808
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11809
msgid ""
11810
"Introduction\n"
11811
"------------"
11812
msgstr ""
11813
11814
#: en/help_topics/hooks.txt:8
11815
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11816
msgstr ""
11817
11818
#: en/help_topics/hooks.txt:10
11819
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11820
msgstr ""
11821
11822
#: en/help_topics/hooks.txt:12
11823
msgid ""
11824
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11825
msgstr ""
11826
11827
#: en/help_topics/hooks.txt:14
11828
msgid ""
11829
"The class that contains each hook is given before the hooks it supplies. "
11830
"For\n"
11831
"instance, BranchHooks as the class is the hooks class for\n"
11832
"`bzrlib.branch.Branch.hooks`."
11833
msgstr ""
11834
11835
#: en/help_topics/hooks.txt:18
11836
msgid ""
11837
"Each description also indicates whether the hook runs on the client (the\n"
11838
"machine where bzr was invoked) or the server (the machine addressed by\n"
11839
"the branch URL). These may be, but are not necessarily, the same machine."
11840
msgstr ""
11841
11842
#: en/help_topics/hooks.txt:22
11843
msgid ""
11844
"Plugins (including hooks) are run on the server if all of these is true:"
11845
msgstr ""
11846
11847
#: en/help_topics/hooks.txt:24
11848
msgid ""
11849
" * The connection is via a smart server (accessed with a URL starting with\n"
11850
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11851
"\"http://\"\n"
11852
" URL when a smart server is available via HTTP)."
11853
msgstr ""
11854
11855
#: en/help_topics/hooks.txt:28
11856
msgid ""
11857
" * The hook is either server specific or part of general infrastructure "
11858
"rather\n"
11859
" than client specific code (such as commit)."
11860
msgstr ""
11861
11862
#: en/help_topics/hooks.txt:31
11863
msgid ""
11864
"\n"
11865
"BranchHooks\n"
11866
"-----------"
11867
msgstr ""
11868
11869
#: en/help_topics/hooks.txt:35
11870
msgid ""
11871
"automatic_tag_name\n"
11872
"~~~~~~~~~~~~~~~~~~"
11873
msgstr ""
11874
11875
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11876
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11877
msgid "Introduced in: 2.2"
11878
msgstr ""
11879
11880
#: en/help_topics/hooks.txt:40
11881
msgid ""
11882
"Called to determine an automatic tag name for a revision.\n"
11883
"automatic_tag_name is called with (branch, revision_id) and should\n"
11884
"return a tag name or None if no tag name could be determined. The\n"
11885
"first non-None tag name returned will be used."
11886
msgstr ""
11887
11888
#: en/help_topics/hooks.txt:45
11889
msgid ""
11890
"open\n"
11891
"~~~~"
11892
msgstr ""
11893
11894
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11895
#: en/help_topics/hooks.txt:304
11896
msgid "Introduced in: 1.8"
11897
msgstr ""
11898
11899
#: en/help_topics/hooks.txt:50
11900
msgid ""
11901
"Called with the Branch object that has been opened after a branch is\n"
11902
"opened."
11903
msgstr ""
11904
11905
#: en/help_topics/hooks.txt:53
11906
msgid ""
11907
"post_branch_init\n"
11908
"~~~~~~~~~~~~~~~~"
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:58
11912
msgid ""
11913
"Called after new branch initialization completes. post_branch_init is\n"
11914
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11915
"branch and checkout (both heavyweight and lightweight) will all\n"
11916
"trigger this hook."
11917
msgstr ""
11918
11919
#: en/help_topics/hooks.txt:63
11920
msgid ""
11921
"post_change_branch_tip\n"
11922
"~~~~~~~~~~~~~~~~~~~~~~"
11923
msgstr ""
11924
11925
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11926
msgid "Introduced in: 1.4"
11927
msgstr ""
11928
11929
#: en/help_topics/hooks.txt:68
11930
msgid ""
11931
"Called in bzr client and server after a change to the tip of a branch\n"
11932
"is made. post_change_branch_tip is called with a\n"
11933
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11934
"uncommit will all trigger this hook."
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11938
msgid ""
11939
"post_commit\n"
11940
"~~~~~~~~~~~"
11941
msgstr ""
11942
11943
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11944
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11945
#: en/help_topics/hooks.txt:145
11946
msgid "Introduced in: 0.15"
11947
msgstr ""
11948
11949
#: en/help_topics/hooks.txt:78
11950
msgid ""
11951
"Called in the bzr client after a commit has completed. post_commit is\n"
11952
"called with (local, master, old_revno, old_revid, new_revno,\n"
11953
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11954
"branch."
11955
msgstr ""
11956
11957
#: en/help_topics/hooks.txt:83
11958
msgid ""
11959
"post_pull\n"
11960
"~~~~~~~~~"
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:88
11964
msgid ""
11965
"Called after a pull operation completes. post_pull is called with a\n"
11966
"bzrlib.branch.PullResult object and only runs in the bzr client."
11967
msgstr ""
11968
11969
#: en/help_topics/hooks.txt:91
11970
msgid ""
11971
"post_push\n"
11972
"~~~~~~~~~"
11973
msgstr ""
11974
11975
#: en/help_topics/hooks.txt:96
11976
msgid ""
11977
"Called after a push operation completes. post_push is called with a\n"
11978
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11979
msgstr ""
11980
11981
#: en/help_topics/hooks.txt:99
11982
msgid ""
11983
"post_switch\n"
11984
"~~~~~~~~~~~"
11985
msgstr ""
11986
11987
#: en/help_topics/hooks.txt:104
11988
msgid ""
11989
"Called after a checkout switches branch. post_switch is called with a\n"
11990
"bzrlib.branch.SwitchHookParams."
11991
msgstr ""
11992
11993
#: en/help_topics/hooks.txt:107
11994
msgid ""
11995
"post_uncommit\n"
11996
"~~~~~~~~~~~~~"
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:112
12000
msgid ""
12001
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12002
"called with (local, master, old_revno, old_revid, new_revno,\n"
12003
"new_revid) where local is the local branch or None, master is the\n"
12004
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12005
"of None."
12006
msgstr ""
12007
12008
#: en/help_topics/hooks.txt:118
12009
msgid ""
12010
"pre_change_branch_tip\n"
12011
"~~~~~~~~~~~~~~~~~~~~~"
12012
msgstr ""
12013
12014
#: en/help_topics/hooks.txt:121
12015
msgid "Introduced in: 1.6"
12016
msgstr "Eingeführt in: 1.6"
12017
12018
#: en/help_topics/hooks.txt:123
12019
msgid ""
12020
"Called in bzr client and server before a change to the tip of a branch\n"
12021
"is made. pre_change_branch_tip is called with a\n"
12022
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12023
"uncommit will all trigger this hook."
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:128
12027
msgid ""
12028
"pre_commit\n"
12029
"~~~~~~~~~~"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:131
12033
msgid "Introduced in: 0.91"
12034
msgstr "Eingeführt in: 0.91"
12035
12036
#: en/help_topics/hooks.txt:133
12037
msgid ""
12038
"Called after a commit is calculated but before it is completed.\n"
12039
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12040
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12041
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12042
"TreeDelta object describing changes from the basis revision. hooks\n"
12043
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12044
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12045
"tree."
12046
msgstr ""
12047
12048
#: en/help_topics/hooks.txt:142
12049
msgid ""
12050
"set_rh\n"
12051
"~~~~~~"
12052
msgstr ""
12053
12054
#: en/help_topics/hooks.txt:147
12055
msgid ""
12056
"Invoked whenever the revision history has been set via\n"
12057
"set_revision_history. The api signature is (branch, revision_history),\n"
12058
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12059
"for bzr to trigger, a better hook to use is\n"
12060
"Branch.post_change_branch_tip."
12061
msgstr ""
12062
12063
#: en/help_topics/hooks.txt:153
12064
msgid ""
12065
"transform_fallback_location\n"
12066
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12067
msgstr ""
12068
12069
#: en/help_topics/hooks.txt:156
12070
msgid "Introduced in: 1.9"
12071
msgstr "Eingeführt in: 1.9"
12072
12073
#: en/help_topics/hooks.txt:158
12074
msgid ""
12075
"Called when a stacked branch is activating its fallback locations.\n"
12076
"transform_fallback_location is called with (branch, url), and should\n"
12077
"return a new url. Returning the same url allows it to be used as-is,\n"
12078
"returning a different one can be used to cause the branch to stack on\n"
12079
"a closer copy of that fallback_location. Note that the branch cannot\n"
12080
"have history accessing methods called on it during this hook because\n"
12081
"the fallback locations have not been activated. When there are\n"
12082
"multiple hooks installed for transform_fallback_location, all are\n"
12083
"called with the url returned from the previous hook.The order is\n"
12084
"however undefined."
12085
msgstr ""
12086
12087
#: en/help_topics/hooks.txt:169
12088
msgid ""
12089
"CommandHooks\n"
12090
"------------"
12091
msgstr ""
12092
12093
#: en/help_topics/hooks.txt:172
12094
msgid ""
12095
"extend_command\n"
12096
"~~~~~~~~~~~~~~"
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:175
12100
msgid "Introduced in: 1.13"
12101
msgstr "Eingeführt in: 1.13"
12102
12103
#: en/help_topics/hooks.txt:177
12104
msgid ""
12105
"Called after creating a command object to allow modifications such as\n"
12106
"adding or removing options, docs etc. Called with the new\n"
12107
"bzrlib.commands.Command object."
12108
msgstr ""
12109
12110
#: en/help_topics/hooks.txt:181
12111
msgid ""
12112
"get_command\n"
12113
"~~~~~~~~~~~"
12114
msgstr ""
12115
12116
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12117
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12118
msgid "Introduced in: 1.17"
12119
msgstr "Eingeführt in: 1.17"
12120
12121
#: en/help_topics/hooks.txt:186
12122
msgid ""
12123
"Called when creating a single command. Called with (cmd_or_None,\n"
12124
"command_name). get_command should either return the cmd_or_None\n"
12125
"parameter, or a replacement Command object that should be used for the\n"
12126
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12127
"Many users will prefer to use bzrlib.commands.register_command or\n"
12128
"plugin_cmds.register_lazy."
12129
msgstr ""
12130
12131
#: en/help_topics/hooks.txt:193
12132
msgid ""
12133
"get_missing_command\n"
12134
"~~~~~~~~~~~~~~~~~~~"
12135
msgstr ""
12136
12137
#: en/help_topics/hooks.txt:198
12138
msgid ""
12139
"Called when creating a single command if no command could be found.\n"
12140
"Called with (command_name). get_missing_command should either return\n"
12141
"None, or a Command object to be used for the command."
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:202
12145
msgid ""
12146
"list_commands\n"
12147
"~~~~~~~~~~~~~"
12148
msgstr ""
12149
12150
#: en/help_topics/hooks.txt:207
12151
msgid ""
12152
"Called when enumerating commands. Called with a set of cmd_name\n"
12153
"strings for all the commands found so far. This set is safe to mutate\n"
12154
"- e.g. to remove a command. list_commands should return the updated\n"
12155
"set of command names."
12156
msgstr ""
12157
12158
#: en/help_topics/hooks.txt:212
12159
msgid ""
12160
"_ConfigHooks\n"
12161
"------------"
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:215
12165
msgid ""
12166
"get\n"
12167
"~~~"
12168
msgstr ""
12169
12170
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12171
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12172
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12173
#: en/help_topics/hooks.txt:443
12174
msgid "Introduced in: 2.4"
12175
msgstr "Eingeführt in: 2.4"
12176
12177
#: en/help_topics/hooks.txt:220
12178
msgid ""
12179
"Invoked when a config option is read. The signature is (stack, name,\n"
12180
"value)."
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:223
12184
msgid ""
12185
"load\n"
12186
"~~~~"
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:228
12190
msgid "Invoked when a config store is loaded. The signature is (store)."
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:230
12194
msgid ""
12195
"remove\n"
12196
"~~~~~~"
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:235
12200
msgid ""
12201
"Invoked when a config option is removed. The signature is (stack,\n"
12202
"name)."
12203
msgstr ""
12204
12205
#: en/help_topics/hooks.txt:238
12206
msgid ""
12207
"save\n"
12208
"~~~~"
12209
msgstr ""
12210
12211
#: en/help_topics/hooks.txt:243
12212
msgid "Invoked when a config store is saved. The signature is (store)."
12213
msgstr ""
12214
12215
#: en/help_topics/hooks.txt:245
12216
msgid ""
12217
"set\n"
12218
"~~~"
12219
msgstr ""
12220
12221
#: en/help_topics/hooks.txt:250
12222
msgid ""
12223
"Invoked when a config option is set. The signature is (stack, name,\n"
12224
"value)."
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:253
12228
msgid ""
12229
"ControlDirHooks\n"
12230
"---------------"
12231
msgstr ""
12232
12233
#: en/help_topics/hooks.txt:256
12234
msgid ""
12235
"post_repo_init\n"
12236
"~~~~~~~~~~~~~~"
12237
msgstr ""
12238
12239
#: en/help_topics/hooks.txt:261
12240
msgid ""
12241
"Invoked after a repository has been initialized. post_repo_init is\n"
12242
"called with a bzrlib.controldir.RepoInitHookParams."
12243
msgstr ""
12244
12245
#: en/help_topics/hooks.txt:264
12246
msgid ""
12247
"pre_open\n"
12248
"~~~~~~~~"
12249
msgstr ""
12250
12251
#: en/help_topics/hooks.txt:267
12252
msgid "Introduced in: 1.14"
12253
msgstr "Eingeführt in: 1.14"
12254
12255
#: en/help_topics/hooks.txt:269
12256
msgid ""
12257
"Invoked before attempting to open a ControlDir with the transport that\n"
12258
"the open will use."
12259
msgstr ""
12260
12261
#: en/help_topics/hooks.txt:272
12262
msgid ""
12263
"InfoHooks\n"
12264
"---------"
12265
msgstr ""
12266
12267
#: en/help_topics/hooks.txt:275
12268
msgid ""
12269
"repository\n"
12270
"~~~~~~~~~~"
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12274
#: en/help_topics/hooks.txt:521
12275
msgid "Introduced in: 1.15"
12276
msgstr "Eingeführt in: 1.15"
12277
12278
#: en/help_topics/hooks.txt:280
12279
msgid ""
12280
"Invoked when displaying the statistics for a repository. repository is\n"
12281
"called with a statistics dictionary as returned by the repository and\n"
12282
"a file-like object to write to."
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:284
12286
msgid ""
12287
"LockHooks\n"
12288
"---------"
12289
msgstr ""
12290
12291
#: en/help_topics/hooks.txt:287
12292
msgid ""
12293
"lock_acquired\n"
12294
"~~~~~~~~~~~~~"
12295
msgstr ""
12296
12297
#: en/help_topics/hooks.txt:292
12298
msgid ""
12299
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12300
msgstr ""
12301
12302
#: en/help_topics/hooks.txt:294
12303
msgid ""
12304
"lock_broken\n"
12305
"~~~~~~~~~~~"
12306
msgstr ""
12307
12308
#: en/help_topics/hooks.txt:299
12309
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12310
msgstr ""
12311
12312
#: en/help_topics/hooks.txt:301
12313
msgid ""
12314
"lock_released\n"
12315
"~~~~~~~~~~~~~"
12316
msgstr ""
12317
12318
#: en/help_topics/hooks.txt:306
12319
msgid ""
12320
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12321
msgstr ""
12322
12323
#: en/help_topics/hooks.txt:308
12324
msgid ""
12325
"MergeHooks\n"
12326
"----------"
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:311
12330
msgid ""
12331
"merge_file_content\n"
12332
"~~~~~~~~~~~~~~~~~~"
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:314
12336
msgid "Introduced in: 2.1"
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:316
12340
msgid ""
12341
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12342
"object when starting a merge. Should return either None or a subclass\n"
12343
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12344
"called per file that needs to be merged (including when one side has\n"
12345
"deleted the file and the other has changed it). See the\n"
12346
"AbstractPerFileMerger API docs for details on how it is used by merge."
12347
msgstr ""
12348
12349
#: en/help_topics/hooks.txt:323
12350
msgid ""
12351
"post_merge\n"
12352
"~~~~~~~~~~"
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12356
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12357
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12358
msgid "Introduced in: 2.5"
12359
msgstr ""
12360
12361
#: en/help_topics/hooks.txt:328
12362
msgid ""
12363
"Called after a merge. Receives a Merger object as the single argument.\n"
12364
"The return value is ignored."
12365
msgstr ""
12366
12367
#: en/help_topics/hooks.txt:331
12368
msgid ""
12369
"pre_merge\n"
12370
"~~~~~~~~~"
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:336
12374
msgid ""
12375
"Called before a merge. Receives a Merger object as the single\n"
12376
"argument."
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:339
12380
msgid ""
12381
"MergeDirectiveHooks\n"
12382
"-------------------"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:342
12386
msgid ""
12387
"merge_request_body\n"
12388
"~~~~~~~~~~~~~~~~~~"
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:345
12392
msgid "Introduced in: 1.15.0"
12393
msgstr ""
12394
12395
#: en/help_topics/hooks.txt:347
12396
msgid ""
12397
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12398
"request. Callbacks must return a body. If more than one callback is\n"
12399
"registered, the output of one callback is provided to the next."
12400
msgstr ""
12401
12402
#: en/help_topics/hooks.txt:351
12403
msgid ""
12404
"MessageEditorHooks\n"
12405
"------------------"
12406
msgstr ""
12407
12408
#: en/help_topics/hooks.txt:354
12409
msgid ""
12410
"commit_message_template\n"
12411
"~~~~~~~~~~~~~~~~~~~~~~~"
12412
msgstr ""
12413
12414
#: en/help_topics/hooks.txt:357
12415
msgid "Introduced in: 1.10"
12416
msgstr ""
12417
12418
#: en/help_topics/hooks.txt:359
12419
msgid ""
12420
"Called when a commit message is being generated.\n"
12421
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12422
"and the message that is known so far. commit_message_template must\n"
12423
"return a new message to use (which could be the same as it was given).\n"
12424
"When there are multiple hooks registered for commit_message_template,\n"
12425
"they are chained with the result from the first passed into the\n"
12426
"second, and so on."
12427
msgstr ""
12428
12429
#: en/help_topics/hooks.txt:367
12430
msgid ""
12431
"set_commit_message\n"
12432
"~~~~~~~~~~~~~~~~~~"
12433
msgstr ""
12434
12435
#: en/help_topics/hooks.txt:372
12436
msgid ""
12437
"Set a fixed commit message. set_commit_message is called with the\n"
12438
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12439
"properties by editing commit.builder._revprops) and the message so\n"
12440
"far. set_commit_message must return the message to use or None if it\n"
12441
"should use the message editor as normal."
12442
msgstr ""
12443
12444
#: en/help_topics/hooks.txt:378
12445
msgid ""
12446
"MutableTreeHooks\n"
12447
"----------------"
12448
msgstr ""
12449
12450
#: en/help_topics/hooks.txt:381
12451
msgid ""
12452
"post_build_tree\n"
12453
"~~~~~~~~~~~~~~~"
12454
msgstr ""
12455
12456
#: en/help_topics/hooks.txt:386
12457
msgid ""
12458
"Called after a completely new tree is built. The hook is called with\n"
12459
"the tree as its only argument."
12460
msgstr ""
12461
12462
#: en/help_topics/hooks.txt:392
12463
msgid "Introduced in: 2.0"
12464
msgstr ""
12465
12466
#: en/help_topics/hooks.txt:394
12467
msgid ""
12468
"Called after a commit is performed on a tree. The hook is called with\n"
12469
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12470
"commit was performed on is available via the mutable_tree attribute of\n"
12471
"that object."
12472
msgstr ""
12473
12474
#: en/help_topics/hooks.txt:399
12475
msgid ""
12476
"post_transform\n"
12477
"~~~~~~~~~~~~~~"
12478
msgstr ""
12479
12480
#: en/help_topics/hooks.txt:404
12481
msgid ""
12482
"Called after a tree transform has been performed on a tree. The hook\n"
12483
"is called with the tree that is being transformed and the transform."
12484
msgstr ""
12485
12486
#: en/help_topics/hooks.txt:407
12487
msgid ""
12488
"pre_transform\n"
12489
"~~~~~~~~~~~~~"
12490
msgstr ""
12491
12492
#: en/help_topics/hooks.txt:412
12493
msgid ""
12494
"Called before a tree transform on this tree. The hook is called with\n"
12495
"the tree that is being transformed and the transform."
12496
msgstr ""
12497
12498
#: en/help_topics/hooks.txt:415
12499
msgid ""
12500
"start_commit\n"
12501
"~~~~~~~~~~~~"
12502
msgstr ""
12503
12504
#: en/help_topics/hooks.txt:420
12505
msgid ""
12506
"Called before a commit is performed on a tree. The start commit hook\n"
12507
"is able to change the tree before the commit takes place. start_commit\n"
12508
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12509
"being performed on."
12510
msgstr ""
12511
12512
#: en/help_topics/hooks.txt:425
12513
msgid ""
12514
"SmartClientHooks\n"
12515
"----------------"
12516
msgstr ""
12517
12518
#: en/help_topics/hooks.txt:428
12519
msgid ""
12520
"call\n"
12521
"~~~~"
12522
msgstr ""
12523
12524
#: en/help_topics/hooks.txt:431
12525
msgid "Introduced in: unknown"
12526
msgstr ""
12527
12528
#: en/help_topics/hooks.txt:433
12529
msgid ""
12530
"Called when the smart client is submitting a request to the smart\n"
12531
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12532
"Streaming request bodies, and responses, are not accessible."
12533
msgstr ""
12534
12535
#: en/help_topics/hooks.txt:437
12536
msgid ""
12537
"SmartServerHooks\n"
12538
"----------------"
12539
msgstr ""
12540
12541
#: en/help_topics/hooks.txt:440
12542
msgid ""
12543
"server_exception\n"
12544
"~~~~~~~~~~~~~~~~"
12545
msgstr ""
12546
12547
#: en/help_topics/hooks.txt:445
12548
msgid ""
12549
"Called by the bzr server when an exception occurs. server_exception is\n"
12550
"called with the sys.exc_info() tuple return true for the hook if the\n"
12551
"exception has been handled, in which case the server will exit\n"
12552
"normally."
12553
msgstr ""
12554
12555
#: en/help_topics/hooks.txt:450
12556
msgid ""
12557
"server_started\n"
12558
"~~~~~~~~~~~~~~"
12559
msgstr ""
12560
12561
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12562
msgid "Introduced in: 0.16"
12563
msgstr ""
12564
12565
#: en/help_topics/hooks.txt:455
12566
msgid ""
12567
"Called by the bzr server when it starts serving a directory.\n"
12568
"server_started is called with (backing urls, public url), where\n"
12569
"backing_url is a list of URLs giving the server-specific directory\n"
12570
"locations, and public_url is the public URL for the directory being\n"
12571
"served."
12572
msgstr ""
12573
12574
#: en/help_topics/hooks.txt:461
12575
msgid ""
12576
"server_started_ex\n"
12577
"~~~~~~~~~~~~~~~~~"
12578
msgstr ""
12579
12580
#: en/help_topics/hooks.txt:466
12581
msgid ""
12582
"Called by the bzr server when it starts serving a directory.\n"
12583
"server_started is called with (backing_urls, server_obj)."
12584
msgstr ""
12585
12586
#: en/help_topics/hooks.txt:469
12587
msgid ""
12588
"server_stopped\n"
12589
"~~~~~~~~~~~~~~"
12590
msgstr ""
12591
12592
#: en/help_topics/hooks.txt:474
12593
msgid ""
12594
"Called by the bzr server when it stops serving a directory.\n"
12595
"server_stopped is called with the same parameters as the\n"
12596
"server_started hook: (backing_urls, public_url)."
12597
msgstr ""
12598
12599
#: en/help_topics/hooks.txt:478
12600
msgid ""
12601
"StatusHooks\n"
12602
"-----------"
12603
msgstr ""
12604
12605
#: en/help_topics/hooks.txt:481
12606
msgid ""
12607
"post_status\n"
12608
"~~~~~~~~~~~"
12609
msgstr ""
12610
12611
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12612
msgid "Introduced in: 2.3"
12613
msgstr ""
12614
12615
#: en/help_topics/hooks.txt:486
12616
msgid ""
12617
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12618
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12619
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12620
"correspond to the command line options specified by the user for the\n"
12621
"status command. to_file is the output stream for writing."
12622
msgstr ""
12623
12624
#: en/help_topics/hooks.txt:492
12625
msgid ""
12626
"pre_status\n"
12627
"~~~~~~~~~~"
12628
msgstr ""
12629
12630
#: en/help_topics/hooks.txt:497
12631
msgid ""
12632
"Called with argument StatusHookParams before Bazaar displays the\n"
12633
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12634
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12635
"correspond to the command line options specified by the user for the\n"
12636
"status command. to_file is the output stream for writing."
12637
msgstr ""
12638
12639
#: en/help_topics/hooks.txt:503
12640
msgid ""
12641
"TransportHooks\n"
12642
"--------------"
12643
msgstr ""
12644
12645
#: en/help_topics/hooks.txt:506
12646
msgid ""
12647
"post_connect\n"
12648
"~~~~~~~~~~~~"
12649
msgstr ""
12650
12651
#: en/help_topics/hooks.txt:511
12652
msgid ""
12653
"Called after a new connection is established or a reconnect occurs.\n"
12654
"The sole argument passed is either the connected transport or smart\n"
12655
"medium instance."
12656
msgstr ""
12657
12658
#: en/help_topics/hooks.txt:515
12659
msgid ""
12660
"RioVersionInfoBuilderHooks\n"
12661
"--------------------------"
12662
msgstr ""
12663
12664
#: en/help_topics/hooks.txt:518
12665
msgid ""
12666
"revision\n"
12667
"~~~~~~~~"
12668
msgstr ""
12669
12670
#: en/help_topics/hooks.txt:523
12671
msgid ""
12672
"Invoked when adding information about a revision to the RIO stanza\n"
12673
"that is printed. revision is called with a revision object and a RIO\n"
12674
"stanza.\n"
12675
msgstr ""
12676
12677
#: en/help_topics/location-alias.txt:1
12678
msgid ""
12679
"Location aliases\n"
12680
"================"
12681
msgstr ""
12682
12683
#: en/help_topics/location-alias.txt:4
12684
msgid ""
12685
"Bazaar defines several aliases for locations associated with a branch. "
12686
"These\n"
12687
"can be used with most commands that expect a location, such as `bzr push`."
12688
msgstr ""
12689
12690
#: en/help_topics/location-alias.txt:7
12691
msgid "The aliases are::"
12692
msgstr ""
12693
12694
#: en/help_topics/location-alias.txt:9
12695
msgid ""
12696
" :bound The branch this branch is bound to, for bound branches.\n"
12697
" :parent The parent of this branch.\n"
12698
" :public The public location of this branch.\n"
12699
" :push The saved location used for `bzr push` with no arguments.\n"
12700
" :submit The submit branch for this branch.\n"
12701
" :this This branch."
12702
msgstr ""
12703
12704
#: en/help_topics/location-alias.txt:16
12705
msgid "For example, to push to the parent location::"
12706
msgstr ""
12707
12708
#: en/help_topics/location-alias.txt:18
12709
msgid " bzr push :parent\n"
12710
msgstr ""
12711
12712
#: en/help_topics/log-formats.txt:1
12713
msgid ""
12714
"Log Formats\n"
12715
"==========="
12716
msgstr ""
12717
12718
#: en/help_topics/log-formats.txt:4
12719
msgid ""
12720
"A log format controls how information about each revision is displayed.\n"
12721
"The standard log formats are compared below::"
12722
msgstr ""
12723
12724
#: en/help_topics/log-formats.txt:7
12725
msgid ""
12726
" Feature long short line\n"
12727
" ---------------------- ------------- ------------ -------------------\n"
12728
" design goal detailed view concise view 1 revision per line\n"
12729
" committer name+email name only name only\n"
12730
" author name+email - -\n"
12731
" date-time format full date only date only\n"
12732
" commit message full full top line\n"
12733
" tags yes yes yes\n"
12734
" merges indicator - yes -\n"
12735
" status/delta optional optional -\n"
12736
" diff/patch optional optional -\n"
12737
" revision-id optional optional -\n"
12738
" branch nick yes - -\n"
12739
" foreign vcs properties yes yes -\n"
12740
" preferred levels all 1 1\n"
12741
" digital signature optional - -"
12742
msgstr ""
12743
12744
#: en/help_topics/log-formats.txt:24
12745
msgid ""
12746
"The default format is ``long``. To change this, define the ``log_format``\n"
12747
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12748
msgstr ""
12749
12750
#: en/help_topics/log-formats.txt:27
12751
msgid ""
12752
" [DEFAULT]\n"
12753
" log_format = short"
12754
msgstr ""
12755
12756
#: en/help_topics/log-formats.txt:30
12757
msgid ""
12758
"Alternatively, to change the log format used for a given query, use the\n"
12759
"--long, --short or --line options."
12760
msgstr ""
12761
12762
#: en/help_topics/log-formats.txt:33
12763
msgid ""
12764
"If one of the standard log formats does not meet your needs, additional\n"
12765
"formats can be provided by plugins.\n"
12766
msgstr ""
12767
12768
#: en/help_topics/other-formats.txt:1
12769
msgid "Other Storage Formats"
12770
msgstr "Andere Speicherformate"
12771
12772
#: en/help_topics/other-formats.txt:3
12773
msgid "Experimental formats are shown below."
12774
msgstr ""
12775
12776
#: en/help_topics/other-formats.txt:5
12777
msgid ""
12778
":development-colo:\n"
12779
" (native) The 2a format with experimental support for colocated\n"
12780
" branches."
12781
msgstr ""
12782
12783
#: en/help_topics/other-formats.txt:9
12784
msgid ""
12785
"\n"
12786
"Deprecated formats are shown below."
12787
msgstr ""
12788
12789
#: en/help_topics/other-formats.txt:12
12790
msgid ""
12791
":pack-0.92:\n"
12792
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12793
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12794
" by bzr < 0.92."
12795
msgstr ""
12796
12797
#: en/help_topics/patterns.txt:1
12798
msgid ""
12799
"Patterns\n"
12800
"========"
12801
msgstr ""
12802
12803
#: en/help_topics/patterns.txt:4
12804
msgid ""
12805
"Bazaar uses patterns to match files at various times. For example,\n"
12806
"the ``add`` command skips over files that match ignore patterns\n"
12807
"and preferences can be associated with files using rule patterns.\n"
12808
"The pattern syntax is described below."
12809
msgstr ""
12810
12811
#: en/help_topics/patterns.txt:9
12812
msgid ""
12813
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12814
"slash or is a regular expression, it is compared to the whole path\n"
12815
"from the branch root. Otherwise, it is compared to only the last\n"
12816
"component of the path. To match a file only in the root directory,\n"
12817
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12818
msgstr ""
12819
12820
#: en/help_topics/patterns.txt:15
12821
msgid "Patterns may include globbing wildcards such as::"
12822
msgstr ""
12823
12824
#: en/help_topics/patterns.txt:17
12825
msgid ""
12826
" ? - Matches any single character except '/'\n"
12827
" * - Matches 0 or more characters except '/'\n"
12828
" /**/ - Matches 0 or more directories in a path\n"
12829
" [a-z] - Matches a single character from within a group of characters"
12830
msgstr ""
12831
12832
#: en/help_topics/patterns.txt:22
12833
msgid ""
12834
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12835
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12836
"expression. Regular expression patterns may not include named or\n"
12837
"numbered groups."
12838
msgstr ""
12839
12840
#: en/help_topics/patterns.txt:27
12841
msgid ""
12842
"Case insensitive ignore patterns can be specified with regular expressions\n"
12843
"by using the ``i`` (for ignore case) flag in the pattern."
12844
msgstr ""
12845
12846
#: en/help_topics/patterns.txt:30
12847
msgid ""
12848
"For example, a case insensitive match for ``foo`` may be specified as::"
12849
msgstr ""
12850
12851
#: en/help_topics/patterns.txt:32
12852
msgid " RE:(?i)foo"
12853
msgstr ""
12854
12855
#: en/help_topics/patterns.txt:34
12856
msgid ""
12857
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12858
"matched by that pattern will not be ignored."
12859
msgstr ""
12860
12861
#: en/help_topics/patterns.txt:37
12862
msgid ""
12863
".. _Python regular expressions: http://docs.python.org/library/re.html"
12864
msgstr ""
12865
12866
#: en/help_topics/revisionspec.txt:1
12867
msgid "Revision Identifiers"
12868
msgstr ""
12869
12870
#: en/help_topics/revisionspec.txt:3
12871
msgid ""
12872
"A revision identifier refers to a specific state of a branch's history. It\n"
12873
"can be expressed in several ways. It can begin with a keyword to\n"
12874
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12875
"'before:yesterday' and 'submit:'."
12876
msgstr ""
12877
12878
#: en/help_topics/revisionspec.txt:8
12879
msgid ""
12880
"Alternately, it can be given without a keyword, in which case it will be\n"
12881
"checked as a revision number, a tag, a revision id, a date specification, or "
12882
"a\n"
12883
"branch specification, in that order. For example, 'date:today' could be\n"
12884
"written as simply 'today', though if you have a tag called 'today' that "
12885
"will\n"
12886
"be found first."
12887
msgstr ""
12888
12889
#: en/help_topics/revisionspec.txt:14
12890
msgid ""
12891
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12892
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12893
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12894
"or\n"
12895
"spaces around the '..')."
12896
msgstr ""
12897
12898
#: en/help_topics/revisionspec.txt:19
12899
msgid ""
12900
"Ranges are interpreted differently by different commands. To the \"log\" "
12901
"command,\n"
12902
"a range is a sequence of log messages, but to the \"diff\" command, the "
12903
"range\n"
12904
"denotes a change between revisions (and not a sequence of changes). In\n"
12905
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12906
"consider it\n"
12907
"to be open-ended, that is, they include one end but not the other. For "
12908
"example:\n"
12909
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12910
"3649,\n"
12911
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12912
"and\n"
12913
"3649, but not 3647."
12914
msgstr ""
12915
12916
#: en/help_topics/revisionspec.txt:28
12917
msgid "The keywords used as revision selection methods are the following:"
12918
msgstr ""
12919
12920
#: en/help_topics/revisionspec.txt:30
12921
msgid ""
12922
":revid:\n"
12923
"\tSelects a revision using the revision id.\n"
12924
":submit:\n"
12925
"\tSelects a common ancestor with the submit branch.\n"
12926
":ancestor:\n"
12927
"\tSelects a common ancestor with a second branch.\n"
12928
":date:\n"
12929
"\tSelects a revision on the basis of a datestamp.\n"
12930
":branch:\n"
12931
"\tSelects the last revision of a specified branch.\n"
12932
":tag:\n"
12933
"\tSelects a revision identified by a tag name.\n"
12934
":revno:\n"
12935
"\tSelects a revision using a number.\n"
12936
":before:\n"
12937
"\tSelects the parent of the revision specified.\n"
12938
":annotate:\n"
12939
"\tSelect the revision that last modified the specified line.\n"
12940
":mainline:\n"
12941
"\tSelect mainline revision that merged the specified revision.\n"
12942
":last:\n"
12943
"\tSelects the nth revision from the end."
12944
msgstr ""
12945
12946
#: en/help_topics/revisionspec.txt:53
12947
msgid "In addition, plugins can provide other keywords."
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:55
12951
msgid "A detailed description of each keyword is given below."
12952
msgstr ""
12953
12954
#: en/help_topics/revisionspec.txt:57
12955
msgid ":revid:"
12956
msgstr ":revid:"
12957
12958
#: en/help_topics/revisionspec.txt:59
12959
msgid ""
12960
" Supply a specific revision id, that can be used to specify any\n"
12961
" revision id in the ancestry of the branch.\n"
12962
" Including merges, and pending merges.\n"
12963
" Examples::"
12964
msgstr ""
12965
12966
#: en/help_topics/revisionspec.txt:64
12967
msgid ""
12968
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12969
msgstr ""
12970
12971
#: en/help_topics/revisionspec.txt:66
12972
msgid ":submit:"
12973
msgstr ":submit:"
12974
12975
#: en/help_topics/revisionspec.txt:68
12976
msgid ""
12977
" Diffing against this shows all the changes that were made in this "
12978
"branch,\n"
12979
" and is a good predictor of what merge will do. The submit branch is\n"
12980
" used by the bundle and merge directive commands. If no submit branch\n"
12981
" is specified, the parent branch is used instead."
12982
msgstr ""
12983
12984
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12985
msgid ""
12986
" The common ancestor is the last revision that existed in both\n"
12987
" branches. Usually this is the branch point, but it could also be\n"
12988
" a revision that was merged."
12989
msgstr ""
12990
12991
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12992
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12993
#: en/help_topics/revisionspec.txt:153
12994
msgid " Examples::"
12995
msgstr " Beispiele::"
12996
12997
#: en/help_topics/revisionspec.txt:79
12998
msgid " $ bzr diff -r submit:"
12999
msgstr " $ bzr diff -r submit:"
13000
13001
#: en/help_topics/revisionspec.txt:81
13002
msgid ":ancestor:"
13003
msgstr ":ancestor:"
13004
13005
#: en/help_topics/revisionspec.txt:83
13006
msgid " Supply the path to a branch to select the common ancestor."
13007
msgstr ""
13008
13009
#: en/help_topics/revisionspec.txt:89
13010
msgid ""
13011
" This is frequently used with 'diff' to return all of the changes\n"
13012
" that your branch introduces, while excluding the changes that you\n"
13013
" have not merged from the remote branch."
13014
msgstr ""
13015
13016
#: en/help_topics/revisionspec.txt:95
13017
msgid ""
13018
" ancestor:/path/to/branch\n"
13019
" $ bzr diff -r ancestor:../../mainline/branch"
13020
msgstr ""
13021
13022
#: en/help_topics/revisionspec.txt:98
13023
msgid ":date:"
13024
msgstr ":date:"
13025
13026
#: en/help_topics/revisionspec.txt:100
13027
msgid ""
13028
" Supply a datestamp to select the first revision that matches the date.\n"
13029
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13030
" Matches the first entry after a given date (either at midnight or\n"
13031
" at a specified time)."
13032
msgstr ""
13033
13034
#: en/help_topics/revisionspec.txt:105
13035
msgid " One way to display all the changes since yesterday would be::"
13036
msgstr " Eine Möglichkeit, alle Änderungen seit gestern anzuzeigen wäre:"
13037
13038
#: en/help_topics/revisionspec.txt:107
13039
msgid " bzr log -r date:yesterday.."
13040
msgstr " bzr log -r date:yesterday.."
13041
13042
#: en/help_topics/revisionspec.txt:111
13043
msgid ""
13044
" date:yesterday -> select the first revision since "
13045
"yesterday\n"
13046
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13047
" August 14th, 2006 at 5:10pm."
13048
msgstr ""
13049
13050
#: en/help_topics/revisionspec.txt:115
13051
msgid ":branch:"
13052
msgstr ":branch:"
13053
13054
#: en/help_topics/revisionspec.txt:117
13055
msgid " Supply the path to a branch to select its last revision."
13056
msgstr ""
13057
13058
#: en/help_topics/revisionspec.txt:121
13059
msgid " branch:/path/to/branch"
13060
msgstr " branch:/pfad/zur/branch"
13061
13062
#: en/help_topics/revisionspec.txt:123
13063
msgid ":tag:"
13064
msgstr ":tag:"
13065
13066
#: en/help_topics/revisionspec.txt:125
13067
msgid " Tags are stored in the branch and created by the 'tag' command."
13068
msgstr ""
13069
13070
#: en/help_topics/revisionspec.txt:127
13071
msgid ":revno:"
13072
msgstr ":revno:"
13073
13074
#: en/help_topics/revisionspec.txt:129
13075
msgid ""
13076
" Use an integer to specify a revision in the history of the branch.\n"
13077
" Optionally a branch can be specified. A negative number will count\n"
13078
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13079
" one). If the negative number is larger than the branch's history, the\n"
13080
" first revision is returned.\n"
13081
" Examples::"
13082
msgstr ""
13083
13084
#: en/help_topics/revisionspec.txt:136
13085
msgid ""
13086
" revno:1 -> return the first revision of this branch\n"
13087
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13088
" the branch '/path/to/branch'\n"
13089
" revno:-1 -> The last revision in a branch.\n"
13090
" -2:http://other/branch -> The second to last revision in the\n"
13091
" remote branch.\n"
13092
" -1000000 -> Most likely the first revision, unless\n"
13093
" your history is very long."
13094
msgstr ""
13095
13096
#: en/help_topics/revisionspec.txt:145
13097
msgid ":before:"
13098
msgstr ":before:"
13099
13100
#: en/help_topics/revisionspec.txt:147
13101
msgid ""
13102
" Supply any revision spec to return the parent of that revision. This "
13103
"is\n"
13104
" mostly useful when inspecting revisions that are not in the revision "
13105
"history\n"
13106
" of a branch."
13107
msgstr ""
13108
13109
#: en/help_topics/revisionspec.txt:151
13110
msgid ""
13111
" It is an error to request the parent of the null revision (before:0)."
13112
msgstr ""
13113
13114
#: en/help_topics/revisionspec.txt:155
13115
msgid ""
13116
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13117
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13118
" aaaa@bbbb-1234567890\n"
13119
" bzr diff -r before:1913..1913\n"
13120
" -> Find the changes between revision 1913 and its parent "
13121
"(1912).\n"
13122
" (What changes did revision 1913 introduce).\n"
13123
" This is equivalent to: bzr diff -c 1913"
13124
msgstr ""
13125
13126
#: en/help_topics/revisionspec.txt:163
13127
msgid ":annotate:"
13128
msgstr ":annotate:"
13129
13130
#: en/help_topics/revisionspec.txt:165
13131
msgid ""
13132
" Select the revision that last modified the specified line. Line is\n"
13133
" specified as path:number. Path is a relative path to the file. "
13134
"Numbers\n"
13135
" start at 1, and are relative to the current version, not the last-\n"
13136
" committed version of the file."
13137
msgstr ""
13138
13139
#: en/help_topics/revisionspec.txt:170
13140
msgid ":mainline:"
13141
msgstr ":mainline:"
13142
13143
#: en/help_topics/revisionspec.txt:172
13144
msgid ""
13145
" Select the revision that merged the specified revision into mainline."
13146
msgstr ""
13147
13148
#: en/help_topics/revisionspec.txt:174
13149
msgid ":last:"
13150
msgstr ""
13151
13152
#: en/help_topics/revisionspec.txt:176
13153
msgid ""
13154
" Supply a positive number to get the nth revision from the end.\n"
13155
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13156
" Examples::"
13157
msgstr ""
13158
13159
#: en/help_topics/revisionspec.txt:180
13160
msgid ""
13161
" last:1 -> return the last revision\n"
13162
" last:3 -> return the revision 2 before the end.\n"
13163
msgstr ""
13164
" last:1 -> Gibt die letzte Version zurück\n"
13165
" last:3 -> Gibt die Version zwei vor dem Ende zurück\n"
13166
13167
#: en/help_topics/rules.txt:1
13168
msgid ""
13169
"Rules\n"
13170
"====="
13171
msgstr ""
13172
"Regeln\n"
13173
"======"
13174
13175
#: en/help_topics/rules.txt:7
13176
msgid ""
13177
"Rules are defined in ini file format where the sections are file glob\n"
13178
"patterns and the contents of each section are the preferences for files\n"
13179
"matching that pattern(s). For example::"
13180
msgstr ""
13181
13182
#: en/help_topics/rules.txt:11
13183
msgid ""
13184
" [name *.bat]\n"
13185
" eol = native"
13186
msgstr ""
13187
13188
#: en/help_topics/rules.txt:14
13189
msgid ""
13190
" [name *.html *.xml]\n"
13191
" keywords = xml_escape"
13192
msgstr ""
13193
13194
#: en/help_topics/rules.txt:17
13195
msgid ""
13196
"Preferences like these are useful for commands and plugins wishing to\n"
13197
"provide custom behaviour for selected files. For more information on \n"
13198
"end of line conversion see :doc:`eol-help`.\n"
13199
"Keyword support is provided by the `keywords plugin\n"
13200
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13201
msgstr ""
13202
13203
#: en/help_topics/rules.txt:23
13204
msgid ""
13205
"Files\n"
13206
"-----"
13207
msgstr ""
13208
"Dateien\n"
13209
"-------"
13210
13211
#: en/help_topics/rules.txt:26
13212
msgid ""
13213
"Default rules for all branches are defined in the optional file\n"
13214
"``BZR_HOME/rules``. "
13215
msgstr ""
13216
13217
#: en/help_topics/rules.txt:29
13218
msgid ""
13219
"Rule Patterns\n"
13220
"-------------"
13221
msgstr ""
13222
"Regel-Muster\n"
13223
"-------------"
13224
13225
#: en/help_topics/rules.txt:32
13226
msgid ""
13227
"Patterns are ordered and searching stops as soon as one matches.\n"
13228
"As a consequence, more explicit patterns should be placed towards\n"
13229
"the top of the file. Rule patterns use exactly the same conventions\n"
13230
"as ignore patterns. See :doc:`patterns-help` for details."
13231
msgstr ""
13232
13233
#: en/help_topics/rules.txt:37
13234
msgid ".. note::"
13235
msgstr ""
13236
13237
#: en/help_topics/rules.txt:39
13238
msgid ""
13239
" Patterns containing square brackets or spaces should be\n"
13240
" surrounded in quotes to ensure they are correctly parsed.\n"
13241
msgstr ""
13242
13243
#: en/help_topics/topics.txt:1
13244
msgid ""
13245
"authentication Information on configuring authentication\n"
13246
"basic Basic commands\n"
13247
"branches Information on what a branch is\n"
13248
"bugs Bug tracker settings\n"
13249
"checkouts Information on what a checkout is\n"
13250
"commands Basic help for all commands\n"
13251
"configuration Details on the configuration settings available\n"
13252
"conflict-types Types of conflicts and what to do about them\n"
13253
"content-filters Conversion of content into/from working trees\n"
13254
"criss-cross Information on criss-cross merging\n"
13255
"current-formats Current storage formats\n"
13256
"debug-flags Options to show or record debug information\n"
13257
"diverged-branches How to fix diverged branches\n"
13258
"env-variables Environment variable names and values\n"
13259
"eol Information on end-of-line handling\n"
13260
"files Information on configuration and log files\n"
13261
"formats Information on choosing a storage format\n"
13262
"global-options Options that control how Bazaar runs\n"
13263
"hidden-commands All hidden commands\n"
13264
"hooks Points at which custom processing can be added\n"
13265
"launchpad Using Bazaar with Launchpad.net\n"
13266
"location-alias Aliases for remembered locations\n"
13267
"log-formats Details on the logging formats available\n"
13268
"other-formats Experimental and deprecated storage formats\n"
13269
"patterns Information on the pattern syntax\n"
13270
"repositories Basic information on shared repositories.\n"
13271
"revisionspec Explain how to use --revision\n"
13272
"rules Information on defining rule-based preferences\n"
13273
"standalone-trees Information on what a standalone tree is\n"
13274
"standard-options Options that can be used with any command\n"
13275
"status-flags Help on status flags\n"
13276
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13277
"topics Topics list\n"
13278
"url-special-chars Special character handling in URLs\n"
13279
"urlspec Supported transport protocols\n"
13280
"working-trees Information on working trees\n"
13281
msgstr ""
13282
13283
#: en/help_topics/url-special-chars.txt:1
13284
msgid ""
13285
"Special character handling in URLs\n"
13286
"=================================="
13287
msgstr ""
13288
13289
#: en/help_topics/url-special-chars.txt:4
13290
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13291
msgstr ""
13292
13293
#: en/help_topics/url-special-chars.txt:6
13294
msgid " * Fully qualified URLs"
13295
msgstr ""
13296
13297
#: en/help_topics/url-special-chars.txt:8
13298
msgid " * File system paths, relative or absolute"
13299
msgstr ""
13300
13301
#: en/help_topics/url-special-chars.txt:10
13302
msgid ""
13303
"Internally bzr treats all locations as URLs. For any file system paths\n"
13304
"that are specified it will automatically determine the appropriate URL\n"
13305
"representation, and escape special characters where necessary."
13306
msgstr ""
13307
13308
#: en/help_topics/url-special-chars.txt:14
13309
msgid ""
13310
"There are a few characters which have special meaning in URLs and need "
13311
"careful\n"
13312
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13313
"value in URLs. Any non-ASCII characters in a file path will automatically "
13314
"be\n"
13315
"urlencoded when the path is converted to a URL."
13316
msgstr ""
13317
13318
#: en/help_topics/url-special-chars.txt:19
13319
msgid ""
13320
"URLs represent non-ASCII characters in an encoding defined by the server, "
13321
"but\n"
13322
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13323
"be\n"
13324
"generous in what it accepts as a URL and to print them in a way that\n"
13325
"will be readable."
13326
msgstr ""
13327
13328
#: en/help_topics/url-special-chars.txt:24
13329
msgid ""
13330
"For example, if you have a directory named '/tmp/%2False' these are all "
13331
"valid\n"
13332
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13333
"slash)::"
13334
msgstr ""
13335
13336
#: en/help_topics/url-special-chars.txt:27
13337
msgid ""
13338
" cd /tmp\n"
13339
" bzr log /tmp/%2False\n"
13340
" bzr log %2False\n"
13341
" bzr log file:///tmp/%252False\n"
13342
" bzr log file://localhost/tmp/%252False\n"
13343
" bzr log file:%252False"
13344
msgstr ""
13345
" cd /tmp\n"
13346
" bzr log /tmp/%2False\n"
13347
" bzr log %2False\n"
13348
" bzr log file:///tmp/%252False\n"
13349
" bzr log file://localhost/tmp/%252False\n"
13350
" bzr log file:%252False"
13351
13352
#: en/help_topics/url-special-chars.txt:34
13353
msgid "These are valid but do not refer to the same file::"
13354
msgstr ""
13355
13356
#: en/help_topics/url-special-chars.txt:36
13357
msgid ""
13358
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13359
" bzr log %252False (refers to a file called /tmp/%252False)"
13360
msgstr ""
13361
13362
#: en/help_topics/url-special-chars.txt:39
13363
msgid ""
13364
"Comma also has special meaning in URLs, because it denotes `segment "
13365
"parameters`_"
13366
msgstr ""
13367
"Kommatas haben eine spezielle Bedeutung in URLs und markieren "
13368
"`Abschnittparameter`_"
13369
13370
#: en/help_topics/url-special-chars.txt:41
13371
msgid ""
13372
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13373
msgstr ""
13374
13375
#: en/help_topics/url-special-chars.txt:43
13376
msgid ""
13377
"Comma is also special in any file system paths that are specified. To use a "
13378
"literal\n"
13379
"comma in a file system path, specify a URL and URL encode the comma::"
13380
msgstr ""
13381
13382
#: en/help_topics/url-special-chars.txt:46
13383
msgid ""
13384
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13385
"\"branch\" set to \"bla\"\n"
13386
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13387
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13388
"\"branch\" set to \"bla\"\n"
13389
msgstr ""
13390
13391
#: en/help_topics/urlspec.txt:1
13392
msgid "URL Identifiers"
13393
msgstr ""
13394
13395
#: en/help_topics/urlspec.txt:3
13396
msgid "Supported URL prefixes::"
13397
msgstr "Unterstützte URL-Präfixe::"
13398
13399
#: en/help_topics/urlspec.txt:5
13400
msgid ""
13401
" aftp:// Access using active FTP.\n"
13402
" bzr:// Fast access using the Bazaar smart server.\n"
13403
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13404
" file:// Access using the standard filesystem (default)\n"
13405
" ftp:// Access using passive FTP.\n"
13406
" http:// Read-only access of branches exported on the web.\n"
13407
" https:// Read-only access of branches exported on the web using "
13408
"SSL.\n"
13409
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13410
msgstr ""
13411
13412
#: en/help_topics/urlspec.txt:14
13413
msgid "Supported modifiers::"
13414
msgstr "Unterstützte Modifikatoren::"
13415
13416
#: en/help_topics/urlspec.txt:16
13417
msgid " gio+ Access using any GIO supported protocols."
13418
msgstr ""
13419
13420
#: en/help_topics/urlspec.txt:18
13421
msgid "Bazaar supports all of the standard parts within the URL::"
13422
msgstr ""
13423
13424
#: en/help_topics/urlspec.txt:20
13425
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13426
msgstr ""
13427
13428
#: en/help_topics/urlspec.txt:22
13429
msgid "allowing URLs such as::"
13430
msgstr ""
13431
13432
#: en/help_topics/urlspec.txt:24
13433
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13434
msgstr " http://bzruser:BadPass@bzr.beispiel.de:8080/bzr/trunk"
13435
13436
#: en/help_topics/urlspec.txt:26
13437
msgid ""
13438
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13439
"with '~' as meaning that the rest of the path should be interpreted\n"
13440
"relative to the remote user's home directory. For example if the user\n"
13441
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13442
"shell.example.com, then::"
13443
msgstr ""
13444
13445
#: en/help_topics/urlspec.txt:32
13446
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13447
msgstr " bzr+ssh://remote@shell.beispiel.de/~/meinprojekt/trunk"
13448
13449
#: en/help_topics/urlspec.txt:34
13450
msgid "would refer to ``/home/remote/myproject/trunk``."
13451
msgstr "Würde verweisen auf »/home/remote/meinprojekt/trunk«."
13452
13453
#: en/help_topics/urlspec.txt:36
13454
msgid ""
13455
"Many commands that accept URLs also accept location aliases too.\n"
13456
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13457
msgstr ""
13458
"Viele Kommandos die URLs akzeptieren, akzeptieren auch Platzaliase.\n"
13459
"Siehe :doc:`location-alias-help` und :doc:`url-special-chars-help`.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1