1
1
# German translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
8
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\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"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2013-01-15 13:45+0000\n"
12
"Last-Translator: DNS <dns@rbose.org>\n"
13
13
"Language-Team: German <de@li.org>\n"
15
14
"MIME-Version: 1.0\n"
16
15
"Content-Type: text/plain; charset=UTF-8\n"
17
16
"Content-Transfer-Encoding: 8bit\n"
18
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
19
"X-Launchpad-Export-Date: 2012-05-06 04:58+0000\n"
20
"X-Generator: Launchpad (build 15195)\n"
18
"X-Launchpad-Export-Date: 2013-01-16 04:30+0000\n"
19
"X-Generator: Launchpad (build 16420)\n"
23
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
23
msgstr "Überspringe {0} (Größer als {1} von {2} Bytes)"
26
#: bzrlib/branch.py:872
25
#: bzrlib/branch.py:854
30
#: bzrlib/branch.py:3205
29
#: bzrlib/branch.py:2955
32
31
msgid "Pushed up to revision %d."
33
32
msgstr "In Revision %d hochgeladen."
35
#: bzrlib/branch.py:3207
34
#: bzrlib/branch.py:2957
37
36
msgid "%d tag updated."
38
37
msgid_plural "%d tags updated."
39
38
msgstr[0] "%d Schlüsselwort aktualisiert."
40
39
msgstr[1] "%d Schlüsselwörter aktualisiert."
42
#: bzrlib/branch.py:3210
41
#: bzrlib/branch.py:2960
43
42
msgid "No new revisions or tags to push."
44
43
msgstr "Keine neuen Revisionen oder Schlüsselwörter zum Hochladen."
46
#: bzrlib/branch.py:3212
45
#: bzrlib/branch.py:2962
47
46
msgid "No new revisions to push."
48
47
msgstr "Keine neuen Revisionen zum Hochladen."
50
#: bzrlib/branch.py:3232
49
#: bzrlib/branch.py:2982
51
50
msgid "checked branch {0} format {1}"
52
51
msgstr "überprüfter Zweig {0} Format {1}"
54
#: bzrlib/branch.py:3235
53
#: bzrlib/branch.py:2985
56
55
msgid "found error:%s"
57
56
msgstr "Fehler gefunden: %s"
59
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
61
60
msgid "Ignoring files outside view. View is %s"
62
61
msgstr "Ignoriere Dateien außerhalb der Ansicht. Die Ansicht ist %s"
64
#: bzrlib/builtins.py:218
63
#: bzrlib/builtins.py:260
66
65
msgid "bzr %s --revision takes exactly one revision identifier"
67
66
msgstr "bzr %s --revision benötigt genau eine Revisions-Nummer"
69
#: bzrlib/builtins.py:303
68
#: bzrlib/builtins.py:315
70
69
msgid "Display status summary."
71
70
msgstr "Zeige Status-Zusammenfassung an."
73
#: bzrlib/builtins.py:305
72
#: bzrlib/builtins.py:317
75
74
"This reports on versioned and unknown files, reporting them\n"
76
75
"grouped by state. Possible states are:"
204
207
"geben Sie einen Revisionebereich mit dem Argument \"revision\" an.\n"
205
208
"Dies erzeugt das gleiche Ergebnis wie der Aufruf 'bzr diff --summarize'."
207
#: bzrlib/builtins.py:363
210
#: bzrlib/builtins.py:375
208
211
msgid "Use short status indicators."
209
212
msgstr "Kurze Zustandsanzeiger verwenden."
211
#: bzrlib/builtins.py:365
214
#: bzrlib/builtins.py:377
212
215
msgid "Only show versioned files."
213
216
msgstr "Nur versionierte Dateien anzeigen."
215
#: bzrlib/builtins.py:367
218
#: bzrlib/builtins.py:379
216
219
msgid "Don't show pending merges."
217
220
msgstr "Ausstehende Zusammenführungen nicht anzeigen."
219
#: bzrlib/builtins.py:370
222
#: bzrlib/builtins.py:382
220
223
msgid "Do not mark object type using indicator."
221
224
msgstr "Objekte nicht entsprechend ihres Typs kennzeichnen."
223
#: bzrlib/builtins.py:385
226
#: bzrlib/builtins.py:397
224
227
msgid "bzr status --revision takes exactly one or two revision specifiers"
226
"bzr status --revision benötigt exakt eine oder zwei Revisionsspezifikation"
229
"bzr status --revision benötigt exakt eine oder zwei "
230
"Revisionsspezifikation(en)."
229
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
232
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
230
233
msgid "You can only supply one of revision_id or --revision"
231
234
msgstr "Sie können nur revision_id oder --revision angeben"
233
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
236
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
234
237
msgid "You must supply either --revision or a revision_id"
235
238
msgstr "Sie müssen entweder --revision oder eine revision_id angeben"
237
#: bzrlib/builtins.py:439
240
#: bzrlib/builtins.py:451
239
242
msgid "Repository %r does not support access to raw revision texts"
240
243
msgstr "Quelle %r unterstützt keinen Zugriff auf reine Revisionstexte"
242
#: bzrlib/builtins.py:450
245
#: bzrlib/builtins.py:462
243
246
msgid "The repository {0} contains no revision {1}."
244
247
msgstr "Die Quelle {0} enthält keine neue Überarbeitung {1}."
246
#: bzrlib/builtins.py:457
249
#: bzrlib/builtins.py:469
247
250
msgid "You cannot specify a NULL revision."
248
251
msgstr "Sie können keine NULL-Revision angeben."
250
#: bzrlib/builtins.py:549
253
#: bzrlib/builtins.py:561
251
254
msgid "Remove the working tree from a given branch/checkout."
252
255
msgstr "Entfernt den Arbeitsbaum zu einer Branch/einem Checkout."
254
#: bzrlib/builtins.py:551
257
#: bzrlib/builtins.py:563
256
259
"Since a lightweight checkout is little more than a working tree\n"
257
260
"this will refuse to run against one."
260
#: bzrlib/builtins.py:554
263
#: bzrlib/builtins.py:566
261
264
msgid "To re-create the working tree, use \"bzr checkout\"."
262
265
msgstr "Benutzen Sie »bzr checkout«, um den Arbeitsbaum neu aufzubauen."
264
#: bzrlib/builtins.py:560
265
msgid "Remove the working tree even if it has uncommitted or shelved changes."
267
#: bzrlib/builtins.py:572
269
"Remove the working tree even if it has uncommitted or shelved changes."
267
271
"Den Arbeitsbaum entfernen, auch wenn dieser nicht übertragene oder "
268
272
"zurückgestellte Änderungen enthält."
270
#: bzrlib/builtins.py:574
274
#: bzrlib/builtins.py:586
271
275
msgid "No working tree to remove"
272
276
msgstr "Keinen Arbeitsbaum zum Entfernen"
274
#: bzrlib/builtins.py:576
278
#: bzrlib/builtins.py:588
275
279
msgid "You cannot remove the working tree of a remote path"
276
280
msgstr "Sie können einen entfernten Arbeitsbaum nicht löschen"
278
#: bzrlib/builtins.py:585
282
#: bzrlib/builtins.py:597
279
283
msgid "You cannot remove the working tree from a lightweight checkout"
284
msgstr "Entfernen des Arbeitsbaums von einem schlanken Abruf nicht möglich"
282
#: bzrlib/builtins.py:625
286
#: bzrlib/builtins.py:637
284
288
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
285
289
"instead. Use \"--force\" if you are sure you want to reset the working tree."
296
300
", die Kopfzeilen scheinen beschädigt zu sein. Versuchen Sie -r -1 um den "
297
301
"Status der letzten Einreichung zu übernehmen."
299
#: bzrlib/builtins.py:640
303
#: bzrlib/builtins.py:652
300
304
msgid "failed to reset the tree state{0}"
301
305
msgstr "Baumstatus{0} konnte nicht zurückgesetzt werden"
303
#: bzrlib/builtins.py:644
307
#: bzrlib/builtins.py:656
304
308
msgid "Show current revision number."
305
309
msgstr "Aktuelle Revisionsnummer anzeigen."
307
#: bzrlib/builtins.py:646
311
#: bzrlib/builtins.py:658
308
312
msgid "This is equal to the number of revisions on this branch."
313
msgstr "Entspricht der Anzahl der Revisionen in diesem Zweig."
311
#: bzrlib/builtins.py:659
315
#: bzrlib/builtins.py:671
312
316
msgid "--tree and --revision can not be used together"
313
317
msgstr "--tree und --revision können nicht zusammen verwendet werden."
315
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
319
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
316
320
msgid "Tags can only be placed on a single revision, not on a range"
322
"Tags können nur einzelnen Revisionen zugewiesen werden, nicht mehreren"
319
#: bzrlib/builtins.py:700
324
#: bzrlib/builtins.py:712
320
325
msgid "Show revno of working tree."
326
msgstr "Revno des Arbeitsbaums anzeigen."
323
#: bzrlib/builtins.py:748
328
#: bzrlib/builtins.py:760
324
329
msgid "Add specified files or directories."
325
330
msgstr "Angegebene Dateien oder Verzeichnisse hinzufügen."
327
#: bzrlib/builtins.py:750
332
#: bzrlib/builtins.py:762
329
334
"In non-recursive mode, all the named items are added, regardless\n"
330
335
"of whether they were previously ignored. A warning is given if\n"
331
336
"any of the named files are already versioned."
338
"Im nicht-rekursiven Modus werden alle Einträge mit Namen hinzugefügt,\n"
339
"auch wenn sie vorher ignoriert wurden. Es wird eine Warnung ausgegeben,\n"
340
"wenn eine der gewählten Dateien schon vorhanden ist."
334
#: bzrlib/builtins.py:754
342
#: bzrlib/builtins.py:766
336
344
"In recursive mode (the default), files are treated the same way\n"
337
345
"but the behaviour for directories is different. Directories that\n"
389
401
"Alle Dateien, die auf Muster in der Ignorierliste zutreffen, werden\n"
390
402
"nicht hinzugefügt, außer Sie geben diese explizit an."
392
#: bzrlib/builtins.py:787
404
#: bzrlib/builtins.py:799
394
406
"In recursive mode, files larger than the configuration option \n"
395
407
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
410
"Im rekursiven Modus werden Dateien übersprungen, die größer als die "
412
"von add.maximum_file_size sind. Einträge mit Namen\n"
413
"werden niemals aufgrund ihrer Größe übersprungen."
399
#: bzrlib/builtins.py:794
415
#: bzrlib/builtins.py:806
400
416
msgid "Don't recursively add the contents of directories."
401
417
msgstr "Inhalte von Verzeichnissen nicht rekursiv hinzufügen."
403
#: bzrlib/builtins.py:800
419
#: bzrlib/builtins.py:813
404
420
msgid "Lookup file ids from this tree."
421
msgstr "Datei-IDs von diesem Baum nachschauen."
407
#: bzrlib/builtins.py:836
423
#: bzrlib/builtins.py:849
408
424
msgid "ignored {0} matching \"{1}\"\n"
409
425
msgstr "ignoriert {0} übereinstimmend \"{1}\"\n"
411
#: bzrlib/builtins.py:841
427
#: bzrlib/builtins.py:854
412
428
msgid "Create a new versioned directory."
413
429
msgstr "Ein neues versioniertes Verzeichnis erstellen."
415
#: bzrlib/builtins.py:843
431
#: bzrlib/builtins.py:856
416
432
msgid "This is equivalent to creating the directory and then adding it."
417
433
msgstr "Dies entspricht dem Anlegen und Hinzufügen des Ordners."
419
#: bzrlib/builtins.py:850
435
#: bzrlib/builtins.py:863
420
436
msgid "No error if existing, make parent directories as needed."
438
"Kein Fehler, falls vorhanden, übergeordnete Verzeichnisse erstellen, falls "
423
#: bzrlib/builtins.py:884
441
#: bzrlib/builtins.py:897
425
443
msgid "added %s\n"
426
444
msgstr "%s hinzugefügt\n"
428
#: bzrlib/builtins.py:926
446
#: bzrlib/builtins.py:939
430
448
msgid "invalid kind %r specified"
449
msgstr "Ungültiger Typ %r angegeben"
433
#: bzrlib/builtins.py:963
451
#: bzrlib/builtins.py:976
434
452
msgid "Move or rename a file."
435
453
msgstr "Eine Datei verschieben oder umbenennen."
437
#: bzrlib/builtins.py:965
455
#: bzrlib/builtins.py:978
438
456
msgid " bzr mv SOURCE... DESTINATION"
439
457
msgstr " bzr mv QUELLE... ZIEL"
441
#: bzrlib/builtins.py:967
459
#: bzrlib/builtins.py:980
443
461
"If the last argument is a versioned directory, all the other names\n"
444
462
"are moved into it. Otherwise, there must be exactly two arguments\n"
445
463
"and the file is changed to a new name."
465
"Wenn das letzte Argument ein versioniertes Verzeichnis ist, dann werden\n"
466
"alle anderen Namen in dieses verschoben. Ansonsten müssen es exakt 2\n"
467
"Argumente sein, und die Datei wird umbenannt."
448
#: bzrlib/builtins.py:971
469
#: bzrlib/builtins.py:984
450
471
"If OLDNAME does not exist on the filesystem but is versioned and\n"
451
472
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
466
487
"Verschiebe nur den bzr-Bezeichner der Datei, da diese bereits verschoben "
469
#: bzrlib/builtins.py:986
490
#: bzrlib/builtins.py:999
470
491
msgid "Automatically guess renames."
471
492
msgstr "Umbenennungen automatisch erraten"
473
#: bzrlib/builtins.py:987
494
#: bzrlib/builtins.py:1000
474
495
msgid "Avoid making changes when guessing renames."
475
496
msgstr "Keine Änderungen durchführen, wenn Umbenennungen erraten werden."
477
#: bzrlib/builtins.py:996
498
#: bzrlib/builtins.py:1009
478
499
msgid "--dry-run requires --auto."
479
500
msgstr "--dry-run erfordert --auto."
481
#: bzrlib/builtins.py:1000
502
#: bzrlib/builtins.py:1013
482
503
msgid "missing file argument"
483
504
msgstr "Datei-Argument fehlt"
485
#: bzrlib/builtins.py:1004
506
#: bzrlib/builtins.py:1017
486
507
msgid "can not move root of branch"
487
508
msgstr "Wurzel des Zweiges kann nicht verschoben werden"
489
#: bzrlib/builtins.py:1010
510
#: bzrlib/builtins.py:1023
490
511
msgid "Only one path may be specified to --auto."
491
512
msgstr "Es kann nur ein Pfad mit --auto angegeben werden."
493
#: bzrlib/builtins.py:1013
514
#: bzrlib/builtins.py:1026
494
515
msgid "--after cannot be specified with --auto."
495
516
msgstr "--after kann nicht mit --auto angegeben werden."
497
#: bzrlib/builtins.py:1050
518
#: bzrlib/builtins.py:1062
498
519
msgid "to mv multiple files the destination must be a versioned directory"
500
521
"um mehrere Dateien zu verschieben, muss das Ziel ein versioniertes "
501
522
"Verzeichnis sein"
503
#: bzrlib/builtins.py:1102
524
#: bzrlib/builtins.py:1114
504
525
msgid "Turn this branch into a mirror of another branch."
505
526
msgstr "Diesen Zweig zu einer Spiegelung eines anderen Zweiges machen."
507
#: bzrlib/builtins.py:1104
528
#: bzrlib/builtins.py:1116
509
530
"By default, this command only works on branches that have not diverged.\n"
510
531
"Branches are considered diverged if the destination branch's most recent \n"
534
559
"value will only be saved if the remote location can be accessed."
537
#: bzrlib/builtins.py:1122
562
#: bzrlib/builtins.py:1134
539
564
"The --verbose option will display the revisions pulled using the log_format\n"
540
565
"configuration option. You can use a different format by overriding it with\n"
541
566
"-Olog_format=<other_format>."
544
#: bzrlib/builtins.py:1126
569
#: bzrlib/builtins.py:1138
546
571
"Note: The location can be specified either in the form of a branch,\n"
547
572
"or in the form of a path to a file containing a merge directive generated\n"
551
#: bzrlib/builtins.py:1134
576
#: bzrlib/builtins.py:1146
552
577
msgid "Show logs of pulled revisions."
578
msgstr "Protokolle geladener Revisionen anzeigen."
555
#: bzrlib/builtins.py:1136
580
#: bzrlib/builtins.py:1148
557
582
"Branch to pull into, rather than the one containing the working directory."
560
#: bzrlib/builtins.py:1139
585
#: bzrlib/builtins.py:1151
562
587
"Perform a local pull in a bound branch. Local pulls are not applied to the "
566
#: bzrlib/builtins.py:1168
591
#: bzrlib/builtins.py:1189
567
592
msgid "Need working tree for --show-base."
568
593
msgstr "Ein Arbeitsbaum wird für --show-base benötigt."
570
#: bzrlib/builtins.py:1184
595
#: bzrlib/builtins.py:1205
571
596
msgid "No pull location known or specified."
574
#: bzrlib/builtins.py:1190
599
#: bzrlib/builtins.py:1211
576
601
msgid "Using saved parent location: %s\n"
602
msgstr "Gespeichertes übergeordnetes Verzeichnis wird verwendet: %s\n"
579
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
604
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
580
605
msgid "Cannot use -r with merge directives or bundles"
583
#: bzrlib/builtins.py:1238
608
#: bzrlib/builtins.py:1261
584
609
msgid "Update a mirror of this branch."
585
610
msgstr "Eine Spiegelung dieses Zweiges aktualisieren."
587
#: bzrlib/builtins.py:1240
612
#: bzrlib/builtins.py:1263
589
614
"The target branch will not have its working tree populated because this\n"
590
615
"is both expensive, and is not supported on remote file systems."
593
#: bzrlib/builtins.py:1243
618
#: bzrlib/builtins.py:1266
595
620
"Some smart servers or protocols *may* put the working tree in place in\n"
652
678
"Einen gestapelten Zweig anlegen, der auf den öffentlichen Pfad des "
653
679
"übergeordneten Zweigs referenziert."
655
#: bzrlib/builtins.py:1284
681
#: bzrlib/builtins.py:1307
657
683
"Create a stacked branch that refers to another branch for the commit "
658
684
"history. Only the work not present in the referenced branch is included in "
659
685
"the branch created."
662
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
688
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
664
690
"Refuse to push if there are uncommitted changes in the working tree, --no-"
665
691
"strict disables the check."
693
"Hochladen verweigern, wenn Veränderungen in dem Arbeitsbaum noch nicht "
694
"eingereicht wurden, --no-strict deaktiviert die Überprüfung."
668
#: bzrlib/builtins.py:1292
696
#: bzrlib/builtins.py:1315
669
697
msgid "Don't populate the working tree, even for protocols that support it."
672
#: bzrlib/builtins.py:1336
700
#: bzrlib/builtins.py:1318
701
msgid "Overwrite tags only."
702
msgstr "Nur Schlüsselwörter überschreiben."
704
#: bzrlib/builtins.py:1369
673
705
msgid "Could not determine branch to refer to."
707
"Der Zweig, auf den Verwiesen werden soll, kann nicht bestimmt werden."
676
#: bzrlib/builtins.py:1345
709
#: bzrlib/builtins.py:1378
679
712
"No push location known or specified. To push to the parent branch (at %s), "
680
713
"use 'bzr push :parent'."
683
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
716
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
684
717
msgid "No push location known or specified."
718
msgstr "Kein Ort zum Hochladen bekannt oder nicht gewählt."
687
#: bzrlib/builtins.py:1355
720
#: bzrlib/builtins.py:1388
689
722
msgid "Using saved push location: %s"
723
msgstr "Gespeichertes Verzeichnis zum Hochladen wird verwendet: %s"
692
#: bzrlib/builtins.py:1365
725
#: bzrlib/builtins.py:1398
693
726
msgid "Create a new branch that is a copy of an existing branch."
728
"Einen neuen Zweig erstellen, der eine Kopie eines vorhandenen Zweigs ist."
696
#: bzrlib/builtins.py:1367
730
#: bzrlib/builtins.py:1400
698
732
"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 ./"
733
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
701
735
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
702
736
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
703
737
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
704
738
"create ./foo-bar."
707
#: bzrlib/builtins.py:1374
741
#: bzrlib/builtins.py:1407
709
743
"To retrieve the branch as of a particular revision, supply the --revision\n"
710
744
"parameter, as in \"branch foo/bar -r 5\"."
713
#: bzrlib/builtins.py:1377
747
#: bzrlib/builtins.py:1410
714
748
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
749
msgstr "DIe Synonyme »clone« und »get« sind für diesen Befehl sind veraltet."
717
#: bzrlib/builtins.py:1387
751
#: bzrlib/builtins.py:1420
718
752
msgid "Create a branch without a working-tree."
753
msgstr "Zweig ohne Arbeitsbaum erstellen."
721
#: bzrlib/builtins.py:1389
755
#: bzrlib/builtins.py:1422
722
756
msgid "Switch the checkout in the current directory to the new branch."
725
#: bzrlib/builtins.py:1392
759
#: bzrlib/builtins.py:1425
727
761
"Create a stacked branch referring to the source branch. The new branch will "
728
762
"depend on the availability of the source branch for all operations."
731
#: bzrlib/builtins.py:1396
765
#: bzrlib/builtins.py:1429
732
766
msgid "Do not use a shared repository, even if available."
767
msgstr "Keine verteilte Quelle nutzen, auch wenn vorhanden."
735
#: bzrlib/builtins.py:1398
769
#: bzrlib/builtins.py:1431
737
771
"By default branch will fail if the target directory exists, but does not "
738
772
"already have a control directory. This flag will allow branch to proceed."
741
#: bzrlib/builtins.py:1403
775
#: bzrlib/builtins.py:1436
742
776
msgid "Bind new branch to from location."
745
#: bzrlib/builtins.py:1450
779
#: bzrlib/builtins.py:1483
747
781
msgid "Target directory \"%s\" already exists."
782
msgstr "Zielverzeichnis »%s« ist schon vorhanden."
750
#: bzrlib/builtins.py:1462
784
#: bzrlib/builtins.py:1495
752
786
msgid "Parent of \"%s\" does not exist."
787
msgstr "Übergeordntes Verzeichnis von »%s« ist nicht vorhanden."
755
#: bzrlib/builtins.py:1481
789
#: bzrlib/builtins.py:1514
756
790
msgid "The branch {0} has no revision {1}."
791
msgstr "Der Zweig {0} hat keine Revision {1}."
759
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
793
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
761
795
msgid "Created new stacked branch referring to %s."
764
#: bzrlib/builtins.py:1500
798
#: bzrlib/builtins.py:1533
766
800
msgid "Branched %d revision."
767
801
msgid_plural "Branched %d revisions."
771
#: bzrlib/builtins.py:1505
805
#: bzrlib/builtins.py:1538
773
807
msgid "New branch bound to %s"
776
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
810
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
778
812
msgid "Switched to branch: %s"
779
813
msgstr "Zu Zweig gewechselt: %s"
781
#: bzrlib/builtins.py:1515
815
#: bzrlib/builtins.py:1548
782
816
msgid "List the branches available at the current location."
783
817
msgstr "Die verfügbaren Zweige an der aktuellen Stelle auflisten."
785
#: bzrlib/builtins.py:1517
819
#: bzrlib/builtins.py:1550
787
821
"This command will print the names of all the branches at the current\n"
901
935
"out the old content of that file to a new location."
904
#: bzrlib/builtins.py:1694
938
#: bzrlib/builtins.py:1724
906
940
"The 'dir' argument, if given, must be the location of the root of a\n"
907
941
"working tree to update. By default, the working tree that contains the \n"
908
942
"current working directory is used."
911
#: bzrlib/builtins.py:1710
945
#: bzrlib/builtins.py:1740
912
946
msgid "bzr update --revision takes exactly one revision"
947
msgstr "bzr update --revision benötigt exakt eine Revision"
915
#: bzrlib/builtins.py:1718
949
#: bzrlib/builtins.py:1748
916
950
msgid "bzr update can only update a whole tree, not a file or subdirectory"
952
"bzr update kann nur den gesamten Baum aktualisieren, keine Datei oder kein "
919
#: bzrlib/builtins.py:1749
955
#: bzrlib/builtins.py:1779
920
956
msgid "Tree is up to date at revision {0} of branch {1}"
957
msgstr "Baum ist auf den neusten Stand bei Revision {0} von Zweig {1}"
923
#: bzrlib/builtins.py:1765
959
#: bzrlib/builtins.py:1795
926
962
"branch has no revision %s\n"
927
963
"bzr update --revision only works for a revision in the branch history"
965
"Zweig hat keine Revision %s\n"
966
"bzr update --revision funktioniert nur mit einer Revision aus dem Verlauf "
930
#: bzrlib/builtins.py:1771
969
#: bzrlib/builtins.py:1801
931
970
msgid "Updated to revision {0} of branch {1}"
971
msgstr "Auf Revision {0} von Zweig {1} aktualisieren"
934
#: bzrlib/builtins.py:1775
973
#: bzrlib/builtins.py:1805
936
975
"Your local commits will now show as pending merges with 'bzr status', and "
937
976
"can be committed with 'bzr commit'."
940
#: bzrlib/builtins.py:1784
979
#: bzrlib/builtins.py:1814
941
980
msgid "Show information about a working tree, branch or repository."
944
#: bzrlib/builtins.py:1786
983
#: bzrlib/builtins.py:1816
946
985
"This command will show all known locations and formats associated to the\n"
947
986
"tree, branch or repository."
950
#: bzrlib/builtins.py:1789
989
#: bzrlib/builtins.py:1819
952
991
"In verbose mode, statistical information is included with each report.\n"
953
992
"To see extended statistic information, use a verbosity level of 2 or\n"
954
993
"higher by specifying the verbose option multiple times, e.g. -vv."
957
#: bzrlib/builtins.py:1793
996
#: bzrlib/builtins.py:1823
958
997
msgid "Branches and working trees will also report any missing revisions."
961
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
962
#: bzrlib/builtins.py:6442
1000
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1001
#: bzrlib/builtins.py:6466
963
1002
msgid ":Examples:"
964
1003
msgstr ":Beispiele:"
966
#: bzrlib/builtins.py:1797
1005
#: bzrlib/builtins.py:1827
967
1006
msgid " Display information on the format and related locations:"
1007
msgstr " Informationen über das Format und die dazugehörigen Orte anzeigen:"
970
#: bzrlib/builtins.py:1799
1009
#: bzrlib/builtins.py:1829
971
1010
msgid " bzr info"
974
#: bzrlib/builtins.py:1801
1013
#: bzrlib/builtins.py:1831
976
1015
" Display the above together with extended format information and\n"
977
1016
" basic statistics (like the number of files in the working tree and\n"
978
1017
" number of revisions in the branch and repository):"
981
#: bzrlib/builtins.py:1805
1020
#: bzrlib/builtins.py:1835
982
1021
msgid " bzr info -v"
983
1022
msgstr " bzr info -v"
985
#: bzrlib/builtins.py:1807
1024
#: bzrlib/builtins.py:1837
986
1025
msgid " Display the above together with number of committers to the branch:"
989
#: bzrlib/builtins.py:1809
1028
#: bzrlib/builtins.py:1839
990
1029
msgid " bzr info -vv"
991
1030
msgstr " bzr info -vv"
993
#: bzrlib/builtins.py:1828
1032
#: bzrlib/builtins.py:1858
994
1033
msgid "Remove files or directories."
995
1034
msgstr "Dateien oder Verzeichnisse entfernen."
997
#: bzrlib/builtins.py:1830
1036
#: bzrlib/builtins.py:1860
999
1038
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1000
1039
"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"
1040
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1002
1041
"parameters are given Bazaar will scan for files that are being tracked by\n"
1003
1042
"Bazaar but missing in your tree and stop tracking them for you."
1006
#: bzrlib/builtins.py:1838
1045
#: bzrlib/builtins.py:1868
1007
1046
msgid "Only remove files that have never been committed."
1047
msgstr "Nur Dateien entfernen, die niemals eingereicht wurden."
1010
#: bzrlib/builtins.py:1840
1049
#: bzrlib/builtins.py:1870
1011
1050
msgid "The file deletion mode to be used."
1012
1051
msgstr "Der Datei-Löschmodus, der verwendet wird."
1014
#: bzrlib/builtins.py:1841
1053
#: bzrlib/builtins.py:1871
1015
1054
msgid "Deletion Strategy"
1016
1055
msgstr "Lösch-Strategie"
1018
#: bzrlib/builtins.py:1842
1057
#: bzrlib/builtins.py:1872
1019
1058
msgid "Backup changed files (default)."
1020
1059
msgstr "Geänderte Dateien sichern (Vorgabe)."
1022
#: bzrlib/builtins.py:1843
1061
#: bzrlib/builtins.py:1873
1023
1062
msgid "Delete from bzr but leave the working copy."
1063
msgstr "Aus bzr entfernen, aber die funktionierende Arbeitskopie erhalten."
1026
#: bzrlib/builtins.py:1844
1065
#: bzrlib/builtins.py:1874
1027
1066
msgid "Don't backup changed files."
1028
1067
msgstr "Geänderte Dateien nicht sichern."
1030
#: bzrlib/builtins.py:1845
1069
#: bzrlib/builtins.py:1875
1032
1071
"Delete all the specified files, even if they can not be recovered and even "
1033
1072
"if they are non-empty directories. (deprecated, use no-backup)"
1074
"Alle spezifischen Dateien entfernen, auch wenn sie nicht wiederhergestellt "
1075
"werden können und wenn die Verzeichnisse nicht leer sind. (Veraltet, nutzen "
1036
#: bzrlib/builtins.py:1854
1078
#: bzrlib/builtins.py:1884
1037
1079
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1081
"(Die --force Option ist veraltet, nutzen Sie in Zukunft stattdessen --no-"
1040
#: bzrlib/builtins.py:1871
1084
#: bzrlib/builtins.py:1901
1041
1085
msgid "No matching files."
1042
1086
msgstr "Keine zutreffenden Dateien."
1044
#: bzrlib/builtins.py:1932
1088
#: bzrlib/builtins.py:1962
1045
1089
msgid "Reconcile bzr metadata in a branch."
1048
#: bzrlib/builtins.py:1934
1092
#: bzrlib/builtins.py:1964
1050
1094
"This can correct data mismatches that may have been caused by\n"
1051
1095
"previous ghost operations or bzr upgrades. You should only\n"
1061
1105
"correctly in both branches."
1064
#: bzrlib/builtins.py:1944
1108
#: bzrlib/builtins.py:1974
1066
1110
"At the same time it is run it may recompress data resulting in\n"
1067
1111
"a potential saving in disk space or performance gain."
1113
"Es kann während der Ausführung Daten rekomprimieren, wodurch\n"
1114
"potentiell Speicherplatz gespart und die Performanz verbessert werden können."
1070
#: bzrlib/builtins.py:1947
1116
#: bzrlib/builtins.py:1977
1071
1117
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1119
"Der Zweig *MUSS* ein auflistbares System sein, wie z.B. eine lokale "
1120
"Festplatte oder stftp."
1074
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1122
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1076
1124
"Format for the bzr 2.0 series.\n"
1077
1125
"Uses group-compress storage.\n"
1078
1126
"Provides rich roots which are a one-way transition.\n"
1081
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1129
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1083
1131
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1084
1132
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1087
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1135
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1088
1136
msgid "The 2a format with experimental support for colocated branches.\n"
1138
"Das 2a-Format mit experimenteller Unterstützung für gemeinsame Zweige.\n"
1091
#: bzrlib/builtins.py:2015
1140
#: bzrlib/builtins.py:2045
1092
1141
msgid "Make a directory into a versioned branch."
1093
1142
msgstr "Ein Verzeichnis zu einem versionierten Entwicklungszweig machen."
1095
#: bzrlib/builtins.py:2017
1144
#: bzrlib/builtins.py:2047
1097
1146
"Use this to create an empty branch, or before importing an\n"
1098
1147
"existing project."
1149
"Nutzen Sie dies, um einen leeren Zweig zu erstellen, oder bevor\n"
1150
"ein vorhandenes Projekt importiert wird."
1101
#: bzrlib/builtins.py:2020
1152
#: bzrlib/builtins.py:2050
1103
1154
"If there is a repository in a parent directory of the location, then\n"
1104
1155
"the history of the branch will be stored in the repository. Otherwise\n"
1124
1175
" bzr status\n"
1125
1176
" bzr commit -m \"imported project\""
1128
#: bzrlib/builtins.py:2041
1129
msgid "Create the path leading up to the branch if it does not already exist."
1132
#: bzrlib/builtins.py:2044
1182
" bzr commit -m »Importiertes Projekt«"
1184
#: bzrlib/builtins.py:2071
1186
"Create the path leading up to the branch if it does not already exist."
1187
msgstr "Den Pfad zum Zweig erzeugen, falls dieser noch nicht vorhanden ist."
1189
#: bzrlib/builtins.py:2074
1133
1190
msgid "Specify a format for this branch. See \"help formats\"."
1134
1191
msgstr "Geben Sie ein Format für diesen Zweig an. Siehe »help formats«."
1136
#: bzrlib/builtins.py:2052
1137
msgid "Never change revnos or the existing log. Append revisions to it only."
1193
#: bzrlib/builtins.py:2082
1195
"Never change revnos or the existing log. Append revisions to it only."
1197
"Revnos oder das vorhandene Protokoll niemals ändern. Revisionen nur am Ende "
1140
#: bzrlib/builtins.py:2055
1200
#: bzrlib/builtins.py:2085
1141
1201
msgid "Create a branch without a working tree."
1144
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1204
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1145
1205
#, python-format
1147
1207
"Parent directory of %s does not exist.\n"
1148
1208
"You may supply --create-prefix to create all leading parent directories."
1151
#: bzrlib/builtins.py:2109
1211
#: bzrlib/builtins.py:2139
1153
1213
"This branch format cannot be set to append-revisions-only. Try --default."
1156
#: bzrlib/builtins.py:2120
1216
#: bzrlib/builtins.py:2150
1157
1217
msgid "Created a {0} (format: {1})\n"
1158
1218
msgstr "Ein {0} wurde erstellt (Format: {1})\n"
1160
#: bzrlib/builtins.py:2129
1220
#: bzrlib/builtins.py:2159
1161
1221
#, python-format
1162
1222
msgid "Using shared repository: %s\n"
1165
#: bzrlib/builtins.py:2133
1225
#: bzrlib/builtins.py:2163
1166
1226
msgid "Create a shared repository for branches to share storage space."
1169
#: bzrlib/builtins.py:2135
1229
#: bzrlib/builtins.py:2165
1171
1231
"New branches created under the repository directory will store their\n"
1172
1232
"revisions in the repository, not in the branch directory. For branches\n"
1269
1331
" 3 - Fehler\n"
1270
1332
" 0 - Keine Änderungen"
1272
#: bzrlib/builtins.py:2220
1334
#: bzrlib/builtins.py:2250
1275
1337
" Shows the difference in the working tree versus the last commit::"
1278
#: bzrlib/builtins.py:2223
1340
#: bzrlib/builtins.py:2253
1279
1341
msgid " bzr diff"
1280
1342
msgstr " bzr diff"
1282
#: bzrlib/builtins.py:2225
1344
#: bzrlib/builtins.py:2255
1283
1345
msgid " Difference between the working tree and revision 1::"
1286
#: bzrlib/builtins.py:2227
1348
#: bzrlib/builtins.py:2257
1287
1349
msgid " bzr diff -r1"
1288
1350
msgstr " bzr diff -r1"
1290
#: bzrlib/builtins.py:2229
1352
#: bzrlib/builtins.py:2259
1291
1353
msgid " Difference between revision 3 and revision 1::"
1354
msgstr " Unterschied zwischen Revision 3 und Revision 1::"
1294
#: bzrlib/builtins.py:2231
1356
#: bzrlib/builtins.py:2261
1295
1357
msgid " bzr diff -r1..3"
1296
1358
msgstr " bzr diff -r1..3"
1298
#: bzrlib/builtins.py:2233
1360
#: bzrlib/builtins.py:2263
1299
1361
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1362
msgstr " Unterschied zwischen Revision 3 und Revision 1 von Zweig xxx::"
1302
#: bzrlib/builtins.py:2235
1364
#: bzrlib/builtins.py:2265
1303
1365
msgid " bzr diff -r1..3 xxx"
1304
1366
msgstr " bzr diff -r1..3 xxx"
1306
#: bzrlib/builtins.py:2237
1368
#: bzrlib/builtins.py:2267
1307
1369
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1370
msgstr " Die Änderungen von Revision 2 (äquivalent zu -r1..2)::"
1310
#: bzrlib/builtins.py:2239
1372
#: bzrlib/builtins.py:2269
1311
1373
msgid " bzr diff -c2"
1312
1374
msgstr " bzr diff -c2"
1314
#: bzrlib/builtins.py:2241
1376
#: bzrlib/builtins.py:2271
1316
1378
" To see the changes introduced by revision X::\n"
1318
1380
" bzr diff -cX"
1382
" So erhalten Sie die Änderungen von Revision X::\n"
1321
#: bzrlib/builtins.py:2245
1386
#: bzrlib/builtins.py:2275
1323
1388
" Note that in the case of a merge, the -c option shows the changes\n"
1324
1389
" compared to the left hand parent. To see the changes against\n"
1325
1390
" another parent, use::"
1328
#: bzrlib/builtins.py:2249
1393
#: bzrlib/builtins.py:2279
1329
1394
msgid " bzr diff -r<chosen_parent>..X"
1332
#: bzrlib/builtins.py:2251
1397
#: bzrlib/builtins.py:2281
1334
1399
" The changes between the current revision and the previous revision\n"
1335
1400
" (equivalent to -c-1 and -r-2..-1)"
1402
" Die Änderungen zwischen der gegenwärtigen Revision und der vorigen\n"
1403
" (äquivalent zu -c-1 und -r-2..-1)"
1338
#: bzrlib/builtins.py:2254
1405
#: bzrlib/builtins.py:2284
1339
1406
msgid " bzr diff -r-2.."
1340
1407
msgstr " bzr diff -r-2.."
1342
#: bzrlib/builtins.py:2256
1409
#: bzrlib/builtins.py:2286
1343
1410
msgid " Show just the differences for file NEWS::"
1411
msgstr " Nur die Unterschiede für die Datei NEWS anzeigen::"
1346
#: bzrlib/builtins.py:2258
1413
#: bzrlib/builtins.py:2288
1347
1414
msgid " bzr diff NEWS"
1350
#: bzrlib/builtins.py:2260
1417
#: bzrlib/builtins.py:2290
1351
1418
msgid " Show the differences in working tree xxx for file NEWS::"
1354
#: bzrlib/builtins.py:2262
1421
#: bzrlib/builtins.py:2292
1355
1422
msgid " bzr diff xxx/NEWS"
1358
#: bzrlib/builtins.py:2264
1425
#: bzrlib/builtins.py:2294
1359
1426
msgid " Show the differences from branch xxx to this working tree:"
1362
#: bzrlib/builtins.py:2266
1429
#: bzrlib/builtins.py:2296
1363
1430
msgid " bzr diff --old xxx"
1364
1431
msgstr " bzr diff --old xxx"
1366
#: bzrlib/builtins.py:2268
1433
#: bzrlib/builtins.py:2298
1367
1434
msgid " Show the differences between two branches for file NEWS::"
1436
" Die Unterschiede zwischen zwei Zweigen für die Datei NEWS anzeigen::"
1370
#: bzrlib/builtins.py:2270
1438
#: bzrlib/builtins.py:2300
1371
1439
msgid " bzr diff --old xxx --new yyy NEWS"
1374
#: bzrlib/builtins.py:2272
1442
#: bzrlib/builtins.py:2302
1375
1443
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1378
#: bzrlib/builtins.py:2274
1446
#: bzrlib/builtins.py:2304
1380
1448
" bzr diff --prefix old/:new/\n"
1384
1452
" bzr diff --using /usr/bin/diff --diff-options -wu"
1387
#: bzrlib/builtins.py:2284
1455
#: bzrlib/builtins.py:2314
1388
1456
msgid "Pass these options to the external diff program."
1389
1457
msgstr "Diese Optionen an das externe Programm diff übergeben."
1391
#: bzrlib/builtins.py:2287
1459
#: bzrlib/builtins.py:2317
1393
1461
"Set prefixes added to old and new filenames, as two values separated by a "
1394
1462
"colon. (eg \"old/:new/\")."
1397
#: bzrlib/builtins.py:2290
1465
#: bzrlib/builtins.py:2320
1398
1466
msgid "Branch/tree to compare from."
1467
msgstr "Von Zweig/Baum vergleichen."
1401
#: bzrlib/builtins.py:2294
1469
#: bzrlib/builtins.py:2324
1402
1470
msgid "Branch/tree to compare to."
1471
msgstr "Mit Zweig/Baum vergleichen."
1405
#: bzrlib/builtins.py:2300
1473
#: bzrlib/builtins.py:2330
1406
1474
msgid "Use this command to compare files."
1407
1475
msgstr "Diesen Befehl zum Vergleichen von Dateien benutzen."
1409
#: bzrlib/builtins.py:2305
1477
#: bzrlib/builtins.py:2335
1410
1478
msgid "Diff format to use."
1411
1479
msgstr "Diff-Format, das benutzt werden soll."
1413
#: bzrlib/builtins.py:2307
1481
#: bzrlib/builtins.py:2337
1414
1482
msgid "Diff format"
1415
1483
msgstr "Diff-Format"
1417
#: bzrlib/builtins.py:2329
1485
#: bzrlib/builtins.py:2359
1418
1486
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1488
"--prefix erwartet zwei Werte getrennt mit einem Doppelpunkt (z.B. "
1421
#: bzrlib/builtins.py:2333
1491
#: bzrlib/builtins.py:2363
1422
1492
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1494
"bzr diff --revision benötigt exakt ein oder zwei Revisions-Spezifikationen"
1425
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1426
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1496
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1497
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1427
1498
msgid "{0} and {1} are mutually exclusive"
1428
1499
msgstr "{0} und {1} schließen sich gegenseitig aus"
1430
#: bzrlib/builtins.py:2358
1501
#: bzrlib/builtins.py:2388
1432
1503
"List files deleted in the working tree.\n"
1436
#: bzrlib/builtins.py:2436
1507
#: bzrlib/builtins.py:2465
1437
1508
msgid "Show the tree root directory."
1509
msgstr "Den Wurzelverzeichnisbaum anzeigen."
1440
#: bzrlib/builtins.py:2438
1511
#: bzrlib/builtins.py:2467
1442
1513
"The root is the nearest enclosing directory with a .bzr control\n"
1446
#: bzrlib/builtins.py:2453
1517
#: bzrlib/builtins.py:2482
1447
1518
msgid "The limit argument must be an integer."
1450
#: bzrlib/builtins.py:2461
1521
#: bzrlib/builtins.py:2490
1451
1522
msgid "The levels argument must be an integer."
1454
#: bzrlib/builtins.py:2466
1525
#: bzrlib/builtins.py:2495
1455
1526
msgid "Show historical log for a branch or subset of a branch."
1458
#: bzrlib/builtins.py:2468
1529
#: bzrlib/builtins.py:2497
1460
1531
"log is bzr's default tool for exploring the history of a branch.\n"
1461
1532
"The branch to use is taken from the first parameter. If no parameters\n"
1506
1583
" -p display a diff (patch) for each revision\n"
1507
1584
" --show-ids display revision-ids (and file-ids), not just revnos"
1586
" -l N Maximal N Revisionen anzeigen\n"
1587
" -n N N Revisionsstufen anzeigen (0 für alle, 1 für "
1589
" -v Eine Status-Zusammenfassung (Delta) für jede Revision "
1591
" -p Einen diff (Patch) für jede Revision anzeigen\n"
1592
" --show-ids Revision-ids (und file-ids) anzeigen, nicht nur revnos"
1510
#: bzrlib/builtins.py:2500
1594
#: bzrlib/builtins.py:2529
1512
1596
" Note that the default number of levels to display is a function of the\n"
1513
1597
" log format. If the -n option is not used, the standard log formats show\n"
1514
1598
" just the top level (mainline)."
1600
" Beachten Sie, dass die Vorgabeanzahl zum Anzeigen von Stufen eine "
1602
" des Protokoll-Formats ist. Wenn die Option -n nicht genutzt wird, dann "
1604
" Standard-Protokoll-Formate nur die oberste Stufe (mainline)."
1517
#: bzrlib/builtins.py:2504
1606
#: bzrlib/builtins.py:2533
1519
1608
" Status summaries are shown using status flags like A, M, etc. To see\n"
1520
1609
" the changes explained using words like ``added`` and ``modified``\n"
1521
1610
" instead, use the -vv option."
1612
" Status-Zusammenfassungen werden mit Status-Markern wie A, M, usw.\n"
1613
" angezeigt. Nutzen Sie die Option -vv, um Änderungen durch\n"
1614
" Wörter wie ``added`` oder ``modified`` erklärt zu bekommen."
1524
#: bzrlib/builtins.py:2508
1616
#: bzrlib/builtins.py:2537
1525
1617
msgid ":Ordering control:"
1526
1618
msgstr ":Sortierungssteuerung:"
1528
#: bzrlib/builtins.py:2510
1620
#: bzrlib/builtins.py:2539
1530
1622
" To display revisions from oldest to newest, use the --forward option.\n"
1531
1623
" In most cases, using this option will have little impact on the total\n"
1532
1624
" time taken to produce a log, though --forward does not incrementally\n"
1533
1625
" display revisions like --reverse does when it can."
1627
" Nutzen Sie die Option --forward, um Revisionen von den ältesten zu den "
1629
" anzuzeigen. Der Gebrauch dieser Option hat meistens kleine\n"
1630
" Auswirkungen auf die Gesamtzeit, die benötigt wird, um ein Protokoll zu "
1632
" Außerdem zeigt --forward Revisionen nicht inkrementell an, wie --reverse "
1633
"dies tut, falls möglich."
1536
#: bzrlib/builtins.py:2515
1635
#: bzrlib/builtins.py:2544
1537
1636
msgid ":Revision filtering:"
1538
1637
msgstr ":Revision-Filtern:"
1540
#: bzrlib/builtins.py:2517
1639
#: bzrlib/builtins.py:2546
1542
1641
" The -r option can be used to specify what revision or range of revisions\n"
1543
1642
" to filter against. The various forms are shown below::"
1644
" Die Option -r kann genutzt werden, um eine Revision oder einen Bereich von "
1646
" zu bestimmen, die/der gefiltert werden soll. Es gibt folgende verschiedene "
1546
#: bzrlib/builtins.py:2520
1649
#: bzrlib/builtins.py:2549
1548
1651
" -rX display revision X\n"
1549
1652
" -rX.. display revision X and later\n"
1550
1653
" -r..Y display up to and including revision Y\n"
1551
1654
" -rX..Y display from X to Y inclusive"
1656
" -rX Revision X anzeigen\n"
1657
" -rX.. Revision X und spätere anzeigen\n"
1658
" -r..Y Bis Revision Y (inklusive) anzeigen\n"
1659
" -rX..Y Von X bis Y (inklusive) anzeigen"
1554
#: bzrlib/builtins.py:2525
1661
#: bzrlib/builtins.py:2554
1556
1663
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1557
1664
" Some common examples are given below::"
1666
" Siehe ``bzr help revisionspec`` für Informationen dazu, wie X und Y "
1667
"angegeben werden.\n"
1668
" Es folgen ein paar allgemeine Beispiele::"
1560
#: bzrlib/builtins.py:2528
1670
#: bzrlib/builtins.py:2557
1562
1672
" -r-1 show just the tip\n"
1563
1673
" -r-10.. show the last 10 mainline revisions\n"
1577
1687
" a nested merge revision and the log will be truncated accordingly."
1580
#: bzrlib/builtins.py:2542
1690
#: bzrlib/builtins.py:2571
1581
1691
msgid ":Path filtering:"
1582
1692
msgstr ":Pfad-Filtern:"
1584
#: bzrlib/builtins.py:2544
1694
#: bzrlib/builtins.py:2573
1586
1696
" If parameters are given and the first one is not a branch, the log\n"
1587
1697
" will be filtered to show only those revisions that changed the\n"
1588
1698
" nominated files or directories."
1591
#: bzrlib/builtins.py:2548
1701
#: bzrlib/builtins.py:2577
1593
1703
" Filenames are interpreted within their historical context. To log a\n"
1594
1704
" deleted file, specify a revision range so that the file existed at\n"
1595
1705
" the end or start of the range."
1598
#: bzrlib/builtins.py:2552
1708
#: bzrlib/builtins.py:2581
1600
1710
" Historical context is also important when interpreting pathnames of\n"
1601
1711
" renamed files/directories. Consider the following example:"
1604
#: bzrlib/builtins.py:2555
1714
#: bzrlib/builtins.py:2584
1606
1716
" * revision 1: add tutorial.txt\n"
1607
1717
" * revision 2: modify tutorial.txt\n"
1608
1718
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1611
#: bzrlib/builtins.py:2559
1721
#: bzrlib/builtins.py:2588
1612
1722
msgid " In this case:"
1613
1723
msgstr " In diesem Fall:"
1615
#: bzrlib/builtins.py:2561
1725
#: bzrlib/builtins.py:2590
1616
1726
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1619
#: bzrlib/builtins.py:2563
1620
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1729
#: bzrlib/builtins.py:2592
1731
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1623
#: bzrlib/builtins.py:2565
1734
#: bzrlib/builtins.py:2594
1625
1736
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1626
1737
" the original file in revision 2."
1629
#: bzrlib/builtins.py:2568
1740
#: bzrlib/builtins.py:2597
1631
1742
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1632
1743
" was no file called guide.txt in revision 2."
1635
#: bzrlib/builtins.py:2571
1746
#: bzrlib/builtins.py:2600
1637
1748
" Renames are always followed by log. By design, there is no need to\n"
1638
1749
" explicitly ask for this (and no way to stop logging a file back\n"
1639
1750
" until it was last renamed)."
1642
#: bzrlib/builtins.py:2575
1753
#: bzrlib/builtins.py:2604
1643
1754
msgid ":Other filtering:"
1644
1755
msgstr ":Anderes Filtern:"
1646
#: bzrlib/builtins.py:2577
1757
#: bzrlib/builtins.py:2606
1648
1759
" The --match option can be used for finding revisions that match a\n"
1649
1760
" regular expression in a commit message, committer, author or bug.\n"
1714
1826
" trading disk space for faster speed."
1717
#: bzrlib/builtins.py:2624
1829
#: bzrlib/builtins.py:2653
1718
1830
msgid "Show from oldest to newest."
1721
#: bzrlib/builtins.py:2627
1833
#: bzrlib/builtins.py:2656
1722
1834
msgid "Show files changed in each revision."
1725
#: bzrlib/builtins.py:2633
1837
#: bzrlib/builtins.py:2662
1726
1838
msgid "Show just the specified revision. See also \"help revisionspec\"."
1729
#: bzrlib/builtins.py:2637
1841
#: bzrlib/builtins.py:2666
1730
1842
msgid "What names to list as authors - first, all or committer."
1733
#: bzrlib/builtins.py:2638
1845
#: bzrlib/builtins.py:2667
1734
1846
msgid "Authors"
1735
1847
msgstr "Autoren"
1737
#: bzrlib/builtins.py:2643
1849
#: bzrlib/builtins.py:2672
1738
1850
msgid "Number of levels to display - 0 for all, 1 for flat."
1741
#: bzrlib/builtins.py:2653
1853
#: bzrlib/builtins.py:2682
1742
1854
msgid "Limit the output to the first N revisions."
1745
#: bzrlib/builtins.py:2658
1857
#: bzrlib/builtins.py:2687
1746
1858
msgid "Show changes made in each revision as a patch."
1749
#: bzrlib/builtins.py:2660
1861
#: bzrlib/builtins.py:2689
1750
1862
msgid "Show merged revisions like --levels 0 does."
1753
#: bzrlib/builtins.py:2664
1865
#: bzrlib/builtins.py:2693
1754
1866
msgid "Do not report commits with more than one parent."
1757
#: bzrlib/builtins.py:2666
1869
#: bzrlib/builtins.py:2695
1759
1871
"Display only the revisions that are not part of both ancestries (require -"
1763
#: bzrlib/builtins.py:2670
1875
#: bzrlib/builtins.py:2699
1764
1876
msgid "Show digital signature validity."
1767
#: bzrlib/builtins.py:2673
1879
#: bzrlib/builtins.py:2702
1768
1880
msgid "Show revisions whose properties match this expression."
1771
#: bzrlib/builtins.py:2677
1883
#: bzrlib/builtins.py:2706
1772
1884
msgid "Show revisions whose message matches this expression."
1775
#: bzrlib/builtins.py:2681
1887
#: bzrlib/builtins.py:2710
1776
1888
msgid "Show revisions whose committer matches this expression."
1779
#: bzrlib/builtins.py:2685
1891
#: bzrlib/builtins.py:2714
1780
1892
msgid "Show revisions whose authors match this expression."
1783
#: bzrlib/builtins.py:2689
1895
#: bzrlib/builtins.py:2718
1784
1896
msgid "Show revisions whose bugs match this expression."
1787
#: bzrlib/builtins.py:2743
1899
#: bzrlib/builtins.py:2772
1788
1900
msgid "--exclude-common-ancestry requires -r with two revisions"
1791
#: bzrlib/builtins.py:2771
1903
#: bzrlib/builtins.py:2800
1792
1904
#, python-format
1793
1905
msgid "Path unknown at end or start of revision range: %s"
1796
#: bzrlib/builtins.py:2888
1908
#: bzrlib/builtins.py:2917
1797
1909
#, python-format
1798
1910
msgid "bzr %s doesn't accept two revisions in different branches."
1801
#: bzrlib/builtins.py:2904
1913
#: bzrlib/builtins.py:2933
1802
1914
#, python-format
1803
1915
msgid "bzr %s --revision takes one or two values."
1806
#: bzrlib/builtins.py:2949
1918
#: bzrlib/builtins.py:2978
1808
1920
"List files in a tree.\n"
1812
#: bzrlib/builtins.py:2958
1924
#: bzrlib/builtins.py:2987
1813
1925
msgid "Recurse into subdirectories."
1816
#: bzrlib/builtins.py:2960
1928
#: bzrlib/builtins.py:2989
1817
1929
msgid "Print paths relative to the root of the branch."
1820
#: bzrlib/builtins.py:2962
1932
#: bzrlib/builtins.py:2991
1821
1933
msgid "Print unknown files."
1822
1934
msgstr "Unbekannte Dateien ausgeben."
1824
#: bzrlib/builtins.py:2963
1936
#: bzrlib/builtins.py:2992
1825
1937
msgid "Print versioned files."
1826
1938
msgstr "Versionierte Dateien ausgeben."
1828
#: bzrlib/builtins.py:2966
1940
#: bzrlib/builtins.py:2995
1829
1941
msgid "Print ignored files."
1830
1942
msgstr "Ignorierte Dateien ausgeben."
1832
#: bzrlib/builtins.py:2968
1944
#: bzrlib/builtins.py:2997
1833
1945
msgid "List entries of a particular kind: file, directory, symlink."
1836
#: bzrlib/builtins.py:2981
1948
#: bzrlib/builtins.py:3010
1837
1949
msgid "invalid kind specified"
1840
#: bzrlib/builtins.py:2984
1952
#: bzrlib/builtins.py:3013
1841
1953
msgid "Cannot set both --verbose and --null"
1844
#: bzrlib/builtins.py:2993
1956
#: bzrlib/builtins.py:3022
1845
1957
msgid "cannot specify both --from-root and PATH"
1848
#: bzrlib/builtins.py:3080
1960
#: bzrlib/builtins.py:3109
1849
1961
msgid "Ignore specified files or patterns."
1852
#: bzrlib/builtins.py:3082
1964
#: bzrlib/builtins.py:3111
1853
1965
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1856
#: bzrlib/builtins.py:3084
1968
#: bzrlib/builtins.py:3113
1858
1970
"If a .bzrignore file does not exist, the ignore command\n"
1859
1971
"will create one and add the specified files or patterns to the newly\n"
1900
2012
" the shell on Unix."
1903
#: bzrlib/builtins.py:3113
2015
#: bzrlib/builtins.py:3142
1905
2017
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1906
2018
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1909
#: bzrlib/builtins.py:3116
2021
#: bzrlib/builtins.py:3145
1912
2024
" Ignore the top level Makefile::"
1915
#: bzrlib/builtins.py:3119
2027
#: bzrlib/builtins.py:3148
1916
2028
msgid " bzr ignore ./Makefile"
1919
#: bzrlib/builtins.py:3121
2031
#: bzrlib/builtins.py:3150
1920
2032
msgid " Ignore .class files in all directories...::"
1923
#: bzrlib/builtins.py:3123
2035
#: bzrlib/builtins.py:3152
1924
2036
msgid " bzr ignore \"*.class\""
1927
#: bzrlib/builtins.py:3125
2039
#: bzrlib/builtins.py:3154
1928
2040
msgid " ...but do not ignore \"special.class\"::"
1931
#: bzrlib/builtins.py:3127
2043
#: bzrlib/builtins.py:3156
1932
2044
msgid " bzr ignore \"!special.class\""
1935
#: bzrlib/builtins.py:3129
2047
#: bzrlib/builtins.py:3158
1936
2048
msgid " Ignore files whose name begins with the \"#\" character::"
1939
#: bzrlib/builtins.py:3131
2051
#: bzrlib/builtins.py:3160
1940
2052
msgid " bzr ignore \"RE:^#\""
1941
2053
msgstr " bzr ignore \"RE:^#\""
1943
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2055
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1944
2056
msgid " Ignore .o files under the lib directory::"
1947
#: bzrlib/builtins.py:3135
2059
#: bzrlib/builtins.py:3164
1948
2060
msgid " bzr ignore \"lib/**/*.o\""
1949
2061
msgstr " bzr ignore \"lib/**/*.o\""
1951
#: bzrlib/builtins.py:3139
2063
#: bzrlib/builtins.py:3168
1952
2064
msgid " bzr ignore \"RE:lib/.*\\.o\""
1953
2065
msgstr " bzr ignore \"RE:lib/.*\\.o\""
1955
#: bzrlib/builtins.py:3141
2067
#: bzrlib/builtins.py:3170
1956
2068
msgid " Ignore everything but the \"debian\" toplevel directory::"
1959
#: bzrlib/builtins.py:3143
2071
#: bzrlib/builtins.py:3172
1961
2073
" bzr ignore \"RE:(?!debian/).*\"\n"
2000
#: bzrlib/builtins.py:3209
2112
#: bzrlib/builtins.py:3238
2001
2113
msgid "List ignored files and the patterns that matched them."
2004
#: bzrlib/builtins.py:3211
2116
#: bzrlib/builtins.py:3240
2006
2118
"List all the ignored files and the ignore pattern that caused the file to\n"
2010
#: bzrlib/builtins.py:3214
2122
#: bzrlib/builtins.py:3243
2011
2123
msgid "Alternatively, to list just the files::"
2012
2124
msgstr "Alternativ, um nur die Dateien aufzulisten:"
2014
#: bzrlib/builtins.py:3216
2126
#: bzrlib/builtins.py:3245
2015
2127
msgid " bzr ls --ignored"
2016
2128
msgstr " bzr ls --ignored"
2018
#: bzrlib/builtins.py:3250
2130
#: bzrlib/builtins.py:3279
2019
2131
#, python-format
2020
2132
msgid "not a valid revision-number: %r"
2021
2133
msgstr "Keine gültige Revisionsnummer: %r"
2023
#: bzrlib/builtins.py:3257
2024
msgid "Export current or past revision to a destination directory or archive."
2135
#: bzrlib/builtins.py:3286
2137
"Export current or past revision to a destination directory or archive."
2027
#: bzrlib/builtins.py:3259
2140
#: bzrlib/builtins.py:3288
2028
2141
msgid "If no revision is specified this exports the last committed revision."
2031
#: bzrlib/builtins.py:3261
2144
#: bzrlib/builtins.py:3290
2033
2146
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2034
2147
"given, try to find the format with the extension. If no extension\n"
2035
2148
"is found exports to a directory (equivalent to --format=dir)."
2038
#: bzrlib/builtins.py:3265
2151
#: bzrlib/builtins.py:3294
2040
2153
"If root is supplied, it will be used as the root directory inside\n"
2041
2154
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2042
2155
"to the exported filename. The root option has no effect for 'dir' format."
2045
#: bzrlib/builtins.py:3269
2158
#: bzrlib/builtins.py:3298
2047
2160
"If branch is omitted then the branch containing the current working\n"
2048
2161
"directory will be used."
2051
#: bzrlib/builtins.py:3272
2052
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2164
#: bzrlib/builtins.py:3301
2166
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2055
#: bzrlib/builtins.py:3274
2169
#: bzrlib/builtins.py:3303
2057
2171
" ================= =========================\n"
2058
2172
" Supported formats Autodetected by extension\n"
2065
2179
" ================= ========================="
2068
#: bzrlib/builtins.py:3288
2182
#: bzrlib/builtins.py:3317
2069
2183
msgid "Type of file to export to."
2070
2184
msgstr "Art der Datei, in die exportiert wird."
2072
#: bzrlib/builtins.py:3291
2186
#: bzrlib/builtins.py:3320
2073
2187
msgid "Apply content filters to export the convenient form."
2076
#: bzrlib/builtins.py:3295
2190
#: bzrlib/builtins.py:3324
2077
2191
msgid "Name of the root directory inside the exported file."
2080
#: bzrlib/builtins.py:3297
2194
#: bzrlib/builtins.py:3326
2082
2196
"Set modification time of files to that of the last revision in which it was "
2086
#: bzrlib/builtins.py:3300
2087
msgid "Export the working tree contents rather than that of the last revision."
2200
#: bzrlib/builtins.py:3329
2202
"Export the working tree contents rather than that of the last revision."
2090
#: bzrlib/builtins.py:3319
2205
#: bzrlib/builtins.py:3348
2091
2206
msgid "--uncommitted requires a working tree"
2094
#: bzrlib/builtins.py:3328
2209
#: bzrlib/builtins.py:3357
2095
2210
#, python-format
2096
2211
msgid "Unsupported export format: %s"
2097
2212
msgstr "Nicht unterstütztes Export-Format: %s"
2099
#: bzrlib/builtins.py:3332
2100
msgid "Write the contents of a file as of a given revision to standard output."
2214
#: bzrlib/builtins.py:3361
2216
"Write the contents of a file as of a given revision to standard output."
2103
#: bzrlib/builtins.py:3334
2219
#: bzrlib/builtins.py:3363
2104
2220
msgid "If no revision is nominated, the last revision is used."
2105
msgstr "Wenn keine Revision bestimmt wurde, wird die neueste Revision benutzt."
2222
"Wenn keine Revision bestimmt wurde, wird die neueste Revision benutzt."
2107
#: bzrlib/builtins.py:3336
2224
#: bzrlib/builtins.py:3365
2109
2226
"Note: Take care to redirect standard output when using this command on a\n"
2113
#: bzrlib/builtins.py:3342
2230
#: bzrlib/builtins.py:3371
2114
2231
msgid "The path name in the old tree."
2117
#: bzrlib/builtins.py:3343
2234
#: bzrlib/builtins.py:3372
2118
2235
msgid "Apply content filters to display the convenience form."
2121
#: bzrlib/builtins.py:3354
2238
#: bzrlib/builtins.py:3383
2122
2239
msgid "bzr cat --revision takes exactly one revision specifier"
2125
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2242
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2126
2243
msgid "{0!r} is not present in revision {1}"
2127
2244
msgstr "{0!r} ist in Revision {1} nicht vorhanden"
2129
#: bzrlib/builtins.py:3414
2246
#: bzrlib/builtins.py:3443
2130
2247
msgid "Commit changes into a new revision."
2133
#: bzrlib/builtins.py:3416
2250
#: bzrlib/builtins.py:3445
2135
2252
"An explanatory message needs to be given for each commit. This is\n"
2136
2253
"often done by using the --message option (getting the message from the\n"
2219
2336
" one or more bugs. See ``bzr help bugs`` for details."
2222
#: bzrlib/builtins.py:3474
2339
#: bzrlib/builtins.py:3503
2223
2340
msgid "Do not consider changes made to a given path."
2226
#: bzrlib/builtins.py:3477
2343
#: bzrlib/builtins.py:3506
2227
2344
msgid "Description of the new revision."
2228
2345
msgstr "Beschreibung der neuen Revision."
2230
#: bzrlib/builtins.py:3480
2347
#: bzrlib/builtins.py:3509
2231
2348
msgid "Commit even if nothing has changed."
2234
#: bzrlib/builtins.py:3484
2351
#: bzrlib/builtins.py:3513
2235
2352
msgid "Take commit message from this file."
2238
#: bzrlib/builtins.py:3486
2355
#: bzrlib/builtins.py:3515
2239
2356
msgid "Refuse to commit if there are unknown files in the working tree."
2242
#: bzrlib/builtins.py:3489
2359
#: bzrlib/builtins.py:3518
2244
2361
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2245
2362
"08:00:00 +0100'."
2248
#: bzrlib/builtins.py:3492
2365
#: bzrlib/builtins.py:3521
2249
2366
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2252
#: bzrlib/builtins.py:3495
2369
#: bzrlib/builtins.py:3524
2253
2370
msgid "Set the author's name, if it's different from the committer."
2256
#: bzrlib/builtins.py:3498
2373
#: bzrlib/builtins.py:3527
2258
2375
"Perform a local commit in a bound branch. Local commits are not pushed to "
2259
2376
"the master branch until a normal commit is performed."
2262
#: bzrlib/builtins.py:3504
2379
#: bzrlib/builtins.py:3533
2264
2381
"When no message is supplied, show the diff along with the status summary in "
2265
2382
"the message editor."
2268
#: bzrlib/builtins.py:3507
2385
#: bzrlib/builtins.py:3536
2270
2387
"When committing to a foreign version control system do not push data that "
2271
2388
"can not be natively represented."
2274
#: bzrlib/builtins.py:3525
2391
#: bzrlib/builtins.py:3554
2275
2392
#, python-format
2277
2394
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2287
2404
"Commit refused."
2290
#: bzrlib/builtins.py:3543
2407
#: bzrlib/builtins.py:3572
2291
2408
#, python-format
2292
2409
msgid "Unrecognized bug %s. Commit refused."
2295
#: bzrlib/builtins.py:3546
2412
#: bzrlib/builtins.py:3575
2296
2413
#, python-format
2299
2416
"Commit refused."
2302
#: bzrlib/builtins.py:3570
2419
#: bzrlib/builtins.py:3599
2303
2420
msgid "Could not parse --commit-time: "
2306
#: bzrlib/builtins.py:3610
2423
#: bzrlib/builtins.py:3639
2307
2424
msgid "please specify either --message or --file"
2308
2425
msgstr "Bitte geben Sie entweder --message oder --file an"
2310
#: bzrlib/builtins.py:3639
2427
#: bzrlib/builtins.py:3668
2311
2428
msgid "please specify a commit message with either --message or --file"
2314
#: bzrlib/builtins.py:3642
2316
"Empty commit message specified. Please specify a commit message with either "
2317
"--message or --file or leave a blank message with --message \"\"."
2320
#: bzrlib/builtins.py:3662
2322
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2323
"--unchanged to force an empty commit."
2326
#: bzrlib/builtins.py:3666
2431
#: bzrlib/builtins.py:3671
2433
"Empty commit message specified. Please specify a commit message with either -"
2434
"-message or --file or leave a blank message with --message \"\"."
2437
#: bzrlib/builtins.py:3691
2439
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2440
"-unchanged to force an empty commit."
2443
#: bzrlib/builtins.py:3695
2328
2445
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2329
2446
"resolve FILE\" to resolve."
2332
#: bzrlib/builtins.py:3670
2449
#: bzrlib/builtins.py:3699
2333
2450
msgid "Commit refused because there are unknown files in the working tree."
2336
#: bzrlib/builtins.py:3673
2453
#: bzrlib/builtins.py:3702
2339
2456
"To commit to master branch, run update and then commit.\n"
2340
2457
"You can also pass --local to commit to continue working disconnected."
2343
#: bzrlib/builtins.py:3681
2460
#: bzrlib/builtins.py:3710
2345
2462
"Validate working tree structure, branch consistency and repository history."
2348
#: bzrlib/builtins.py:3683
2465
#: bzrlib/builtins.py:3712
2350
2467
"This command checks various invariants about branch and repository storage\n"
2351
2468
"to detect data corruption or bzr bugs."
2354
#: bzrlib/builtins.py:3686
2471
#: bzrlib/builtins.py:3715
2356
2473
"The working tree and branch checks will only give output if a problem is\n"
2357
2474
"detected. The output fields of the repository check are:"
2360
#: bzrlib/builtins.py:3689
2477
#: bzrlib/builtins.py:3718
2363
2480
" This is just the number of revisions checked. It doesn't\n"
2364
2481
" indicate a problem."
2367
#: bzrlib/builtins.py:3693
2484
#: bzrlib/builtins.py:3722
2369
2486
"versionedfiles\n"
2370
2487
" This is just the number of versionedfiles checked. It\n"
2371
2488
" doesn't indicate a problem."
2374
#: bzrlib/builtins.py:3697
2491
#: bzrlib/builtins.py:3726
2376
2493
"unreferenced ancestors\n"
2377
2494
" Texts that are ancestors of other texts, but\n"
2395
2512
" indicate a problem."
2398
#: bzrlib/builtins.py:3712
2515
#: bzrlib/builtins.py:3741
2400
2517
"If no restrictions are specified, all Bazaar data that is found at the "
2402
2519
"location will be checked."
2405
#: bzrlib/builtins.py:3717
2522
#: bzrlib/builtins.py:3746
2406
2523
msgid " Check the tree and branch at 'foo'::"
2409
#: bzrlib/builtins.py:3719
2526
#: bzrlib/builtins.py:3748
2410
2527
msgid " bzr check --tree --branch foo"
2413
#: bzrlib/builtins.py:3721
2530
#: bzrlib/builtins.py:3750
2414
2531
msgid " Check only the repository at 'bar'::"
2417
#: bzrlib/builtins.py:3723
2534
#: bzrlib/builtins.py:3752
2418
2535
msgid " bzr check --repo bar"
2421
#: bzrlib/builtins.py:3725
2538
#: bzrlib/builtins.py:3754
2422
2539
msgid " Check everything at 'baz'::"
2425
#: bzrlib/builtins.py:3727
2542
#: bzrlib/builtins.py:3756
2426
2543
msgid " bzr check baz"
2429
#: bzrlib/builtins.py:3733
2546
#: bzrlib/builtins.py:3762
2430
2547
msgid "Check the branch related to the current directory."
2433
#: bzrlib/builtins.py:3735
2550
#: bzrlib/builtins.py:3764
2434
2551
msgid "Check the repository related to the current directory."
2437
#: bzrlib/builtins.py:3737
2554
#: bzrlib/builtins.py:3766
2438
2555
msgid "Check the working tree related to the current directory."
2441
#: bzrlib/builtins.py:3751
2558
#: bzrlib/builtins.py:3780
2442
2559
msgid "Upgrade a repository, branch or working tree to a newer format."
2445
#: bzrlib/builtins.py:3753
2562
#: bzrlib/builtins.py:3782
2447
2564
"When the default format has changed after a major new release of\n"
2448
2565
"Bazaar, you may be informed during certain operations that you\n"
2514
2631
":Beispiele:\n"
2515
2632
" Die E-Mail-Adresse des aktuellen Benutzers zeigen::"
2517
#: bzrlib/builtins.py:3815
2634
#: bzrlib/builtins.py:3844
2518
2635
msgid " bzr whoami --email"
2519
2636
msgstr " bzr whoami --email"
2521
#: bzrlib/builtins.py:3817
2638
#: bzrlib/builtins.py:3846
2522
2639
msgid " Set the current user::"
2523
2640
msgstr " Aktuellen Benutzer festlegen::"
2525
#: bzrlib/builtins.py:3819
2642
#: bzrlib/builtins.py:3848
2526
2643
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2527
2644
msgstr " bzr whoami \"Frank Chu <ich@beispiel.de>\""
2529
#: bzrlib/builtins.py:3823
2646
#: bzrlib/builtins.py:3852
2530
2647
msgid "Display email address only."
2531
2648
msgstr "Nur die E-Mail-Adresse anzeigen."
2533
#: bzrlib/builtins.py:3825
2650
#: bzrlib/builtins.py:3854
2534
2651
msgid "Set identity for the current branch instead of globally."
2537
#: bzrlib/builtins.py:3851
2654
#: bzrlib/builtins.py:3880
2538
2655
msgid "--email can only be used to display existing identity"
2541
#: bzrlib/builtins.py:3873
2658
#: bzrlib/builtins.py:3904
2542
2659
msgid "Print or set the branch nickname."
2545
#: bzrlib/builtins.py:3875
2662
#: bzrlib/builtins.py:3906
2547
"If unset, the tree root directory name is used as the nickname.\n"
2548
"To print the current nickname, execute with no argument."
2664
"If unset, the colocated branch name is used for colocated branches, and\n"
2665
"the branch directory name is used for other branches. To print the\n"
2666
"current nickname, execute with no argument."
2551
#: bzrlib/builtins.py:3878
2669
#: bzrlib/builtins.py:3910
2553
2671
"Bound branches use the nickname of its master branch unless it is set\n"
2557
#: bzrlib/builtins.py:3898
2675
#: bzrlib/builtins.py:3930
2558
2676
msgid "Set/unset and display aliases."
2561
#: bzrlib/builtins.py:3900
2679
#: bzrlib/builtins.py:3932
2564
2682
" Show the current aliases::"
2566
2684
":Beispiele:\n"
2567
2685
" Die aktuellen Aliase zeigen::"
2569
#: bzrlib/builtins.py:3903
2687
#: bzrlib/builtins.py:3935
2570
2688
msgid " bzr alias"
2571
2689
msgstr " bzr alias"
2573
#: bzrlib/builtins.py:3905
2691
#: bzrlib/builtins.py:3937
2574
2692
msgid " Show the alias specified for 'll'::"
2577
#: bzrlib/builtins.py:3907
2695
#: bzrlib/builtins.py:3939
2578
2696
msgid " bzr alias ll"
2579
2697
msgstr " bzr alias ll"
2581
#: bzrlib/builtins.py:3909
2699
#: bzrlib/builtins.py:3941
2582
2700
msgid " Set an alias for 'll'::"
2585
#: bzrlib/builtins.py:3911
2703
#: bzrlib/builtins.py:3943
2586
2704
msgid " bzr alias ll=\"log --line -r-10..-1\""
2587
2705
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2589
#: bzrlib/builtins.py:3913
2707
#: bzrlib/builtins.py:3945
2590
2708
msgid " To remove an alias for 'll'::"
2593
#: bzrlib/builtins.py:3915
2711
#: bzrlib/builtins.py:3947
2594
2712
msgid " bzr alias --remove ll"
2595
2713
msgstr " bzr alias --remove ll"
2597
#: bzrlib/builtins.py:3920
2715
#: bzrlib/builtins.py:3952
2598
2716
msgid "Remove the alias."
2599
2717
msgstr "Den Alias entfernen."
2601
#: bzrlib/builtins.py:3938
2719
#: bzrlib/builtins.py:3970
2602
2720
msgid "bzr alias --remove expects an alias to remove."
2603
2721
msgstr "bzr alias --remove erwartet einen Alias zum Entfernen."
2605
#: bzrlib/builtins.py:4119
2606
msgid "subunit not available. subunit needs to be installed to use --subunit."
2723
#: bzrlib/builtins.py:4151
2725
"subunit not available. subunit needs to be installed to use --subunit."
2609
#: bzrlib/builtins.py:4136
2728
#: bzrlib/builtins.py:4168
2611
2730
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2614
#: bzrlib/builtins.py:4183
2733
#: bzrlib/builtins.py:4215
2615
2734
msgid "Show version of bzr."
2616
2735
msgstr "Version von bzr anzeigen."
2618
#: bzrlib/builtins.py:4187
2737
#: bzrlib/builtins.py:4219
2619
2738
msgid "Print just the version number."
2620
2739
msgstr "Nur die Versionsnummer ausgeben."
2622
#: bzrlib/builtins.py:4206
2741
#: bzrlib/builtins.py:4238
2623
2742
msgid "It sure does!\n"
2626
#: bzrlib/builtins.py:4230
2745
#: bzrlib/builtins.py:4262
2627
2746
#, python-format
2628
2747
msgid "merge base is revision %s\n"
2631
#: bzrlib/builtins.py:4234
2750
#: bzrlib/builtins.py:4266
2632
2751
msgid "Perform a three-way merge."
2635
#: bzrlib/builtins.py:4236
2754
#: bzrlib/builtins.py:4268
2637
2756
"The source of the merge can be specified either in the form of a branch,\n"
2638
2757
"or in the form of a path to a file containing a merge directive generated\n"
2707
2827
"merge revision which has more than two parents."
2710
#: bzrlib/builtins.py:4283
2830
#: bzrlib/builtins.py:4315
2712
2832
"If one would like to merge changes from the working tree of the other\n"
2713
2833
"branch without merging any committed revisions, the --uncommitted option\n"
2714
2834
"can be given."
2717
#: bzrlib/builtins.py:4287
2837
#: bzrlib/builtins.py:4319
2719
2839
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2720
2840
"you to apply each diff hunk and file change, similar to \"shelve\"."
2723
#: bzrlib/builtins.py:4290
2843
#: bzrlib/builtins.py:4322
2726
2846
" To merge all new revisions from bzr.dev::"
2729
#: bzrlib/builtins.py:4293
2849
#: bzrlib/builtins.py:4325
2730
2850
msgid " bzr merge ../bzr.dev"
2731
2851
msgstr " bzr merge ../bzr.dev"
2733
#: bzrlib/builtins.py:4295
2853
#: bzrlib/builtins.py:4327
2734
2854
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2737
#: bzrlib/builtins.py:4297
2857
#: bzrlib/builtins.py:4329
2738
2858
msgid " bzr merge -r 82 ../bzr.dev"
2739
2859
msgstr " bzr merge -r 82 ../bzr.dev"
2741
#: bzrlib/builtins.py:4299
2861
#: bzrlib/builtins.py:4331
2742
2862
msgid " To merge the changes introduced by 82, without previous changes::"
2745
#: bzrlib/builtins.py:4301
2865
#: bzrlib/builtins.py:4333
2746
2866
msgid " bzr merge -r 81..82 ../bzr.dev"
2747
2867
msgstr " bzr merge -r 81..82 ../bzr.dev"
2749
#: bzrlib/builtins.py:4303
2869
#: bzrlib/builtins.py:4335
2750
2870
msgid " To apply a merge directive contained in /tmp/merge::"
2753
#: bzrlib/builtins.py:4305
2873
#: bzrlib/builtins.py:4337
2754
2874
msgid " bzr merge /tmp/merge"
2755
2875
msgstr " bzr merge /tmp/merge"
2757
#: bzrlib/builtins.py:4307
2877
#: bzrlib/builtins.py:4339
2759
2879
" To create a merge revision with three parents from two branches\n"
2760
2880
" feature1a and feature1b:"
2763
#: bzrlib/builtins.py:4310
2883
#: bzrlib/builtins.py:4342
2765
2885
" bzr merge ../feature1a\n"
2766
2886
" bzr merge ../feature1b --force\n"
2767
2887
" bzr commit -m 'revision with three parents'"
2770
#: bzrlib/builtins.py:4322
2890
#: bzrlib/builtins.py:4354
2771
2891
msgid "Merge even if the destination tree has uncommitted changes."
2774
#: bzrlib/builtins.py:4328
2894
#: bzrlib/builtins.py:4360
2776
2896
"Apply uncommitted changes from a working copy, instead of branch changes."
2779
#: bzrlib/builtins.py:4330
2899
#: bzrlib/builtins.py:4362
2781
2901
"If the destination is already completely merged into the source, pull from "
2782
2902
"the source rather than merging. When this happens, you do not need to "
2783
2903
"commit the result."
2786
#: bzrlib/builtins.py:4335
2906
#: bzrlib/builtins.py:4367
2788
2908
"Branch to merge into, rather than the one containing the working directory."
2791
#: bzrlib/builtins.py:4337
2911
#: bzrlib/builtins.py:4369
2792
2912
msgid "Instead of merging, show a diff of the merge."
2795
#: bzrlib/builtins.py:4339
2915
#: bzrlib/builtins.py:4371
2796
2916
msgid "Select changes interactively."
2797
2917
msgstr "Änderungen interaktiv auswählen."
2799
#: bzrlib/builtins.py:4361
2919
#: bzrlib/builtins.py:4393
2801
"Merging into empty branches not currently supported, https://bugs.launchpad."
2802
"net/bzr/+bug/308562"
2921
"Merging into empty branches not currently supported, "
2922
"https://bugs.launchpad.net/bzr/+bug/308562"
2805
#: bzrlib/builtins.py:4388
2925
#: bzrlib/builtins.py:4420
2806
2926
msgid "Cannot use --uncommitted with bundles or merge directives."
2809
#: bzrlib/builtins.py:4399
2929
#: bzrlib/builtins.py:4431
2810
2930
msgid "Cannot use --uncommitted and --revision at the same time."
2813
#: bzrlib/builtins.py:4419
2933
#: bzrlib/builtins.py:4451
2814
2934
msgid "merger: "
2817
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2937
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2818
2938
msgid "Nothing to do."
2819
2939
msgstr "Nichts zu tun."
2821
#: bzrlib/builtins.py:4425
2941
#: bzrlib/builtins.py:4457
2822
2942
msgid "Cannot pull individual files"
2823
2943
msgstr "Nicht möglich, einzelne Dateien zu laden"
2825
#: bzrlib/builtins.py:4433
2945
#: bzrlib/builtins.py:4465
2826
2946
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2829
#: bzrlib/builtins.py:4491
2949
#: bzrlib/builtins.py:4523
2830
2950
#, python-format
2831
2951
msgid "Show-base is not supported for this merge type. %s"
2834
#: bzrlib/builtins.py:4500
2954
#: bzrlib/builtins.py:4532
2835
2955
#, python-format
2836
2956
msgid "Conflict reduction is not supported for merge type %s."
2839
#: bzrlib/builtins.py:4504
2959
#: bzrlib/builtins.py:4536
2840
2960
msgid "Cannot do conflict reduction and show base."
2843
#: bzrlib/builtins.py:4615
2963
#: bzrlib/builtins.py:4647
2844
2964
msgid "No location specified or remembered"
2847
#: bzrlib/builtins.py:4617
2967
#: bzrlib/builtins.py:4649
2848
2968
msgid "{0} remembered {1} location {2}"
2851
#: bzrlib/builtins.py:4623
2971
#: bzrlib/builtins.py:4655
2852
2972
msgid "Redo a merge."
2855
#: bzrlib/builtins.py:4625
2975
#: bzrlib/builtins.py:4657
2857
2977
"Use this if you want to try a different merge technique while resolving\n"
2858
2978
"conflicts. Some merge techniques are better than others, and remerge\n"
2859
2979
"lets you try different ones on different files."
2862
#: bzrlib/builtins.py:4629
2982
#: bzrlib/builtins.py:4661
2864
2984
"The options for remerge have the same meaning and defaults as the ones for\n"
2865
2985
"merge. The difference is that remerge can (only) be run when there is a\n"
2866
2986
"pending merge, and it lets you specify particular files."
2869
#: bzrlib/builtins.py:4633
2989
#: bzrlib/builtins.py:4665
2872
2992
" Re-do the merge of all conflicted files, and show the base text in\n"
2873
2993
" conflict regions, in addition to the usual THIS and OTHER texts::"
2876
#: bzrlib/builtins.py:4637
2996
#: bzrlib/builtins.py:4669
2877
2997
msgid " bzr remerge --show-base"
2878
2998
msgstr " bzr remerge --show-base"
2880
#: bzrlib/builtins.py:4639
3000
#: bzrlib/builtins.py:4671
2882
3002
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2883
3003
" additional processing to reduce the size of conflict regions::"
2886
#: bzrlib/builtins.py:4642
3006
#: bzrlib/builtins.py:4674
2887
3007
msgid " bzr remerge --merge-type weave --reprocess foobar"
2890
#: bzrlib/builtins.py:4649
3010
#: bzrlib/builtins.py:4681
2891
3011
msgid "Show base revision text in conflicts."
2894
#: bzrlib/builtins.py:4661
3014
#: bzrlib/builtins.py:4693
2896
3016
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2900
#: bzrlib/builtins.py:4717
2901
msgid "Revert files to a previous revision."
3020
#: bzrlib/builtins.py:4751
3022
"Set files in the working tree back to the contents of a previous revision."
2904
#: bzrlib/builtins.py:4719
3025
#: bzrlib/builtins.py:4753
2906
3027
"Giving a list of files will revert only those files. Otherwise, all files\n"
2907
3028
"will be reverted. If the revision is not specified with '--revision', the\n"
2908
"last committed revision is used."
3029
"working tree basis revision is used. A revert operation affects only the\n"
3030
"working tree, not any revision history like the branch and repository or\n"
3031
"the working tree basis revision."
2911
#: bzrlib/builtins.py:4723
3034
#: bzrlib/builtins.py:4759
2913
3036
"To remove only some changes, without reverting to a prior version, use\n"
2914
3037
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2915
3038
"will remove the changes introduced by the second last commit (-2), without\n"
2916
3039
"affecting the changes introduced by the last commit (-1). To remove\n"
2917
"certain changes on a hunk-by-hunk basis, see the shelve command."
3040
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3041
"To update the branch to a specific revision or the latest revision and\n"
3042
"update the working tree accordingly while preserving local changes, see the\n"
2920
#: bzrlib/builtins.py:4729
3046
#: bzrlib/builtins.py:4768
2922
"By default, any files that have been manually changed will be backed up\n"
2923
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2924
"'.~#~' appended to their name, where # is a number."
3048
"Uncommitted changes to files that are reverted will be discarded.\n"
3049
"Howver, by default, any files that have been manually changed will be\n"
3050
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3051
"files have '.~#~' appended to their name, where # is a number."
2927
#: bzrlib/builtins.py:4733
3054
#: bzrlib/builtins.py:4773
2929
3056
"When you provide files, you can use their current pathname or the pathname\n"
2930
3057
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3005
3132
" 0 - no missing revisions"
3008
#: bzrlib/builtins.py:4847
3135
#: bzrlib/builtins.py:4887
3010
3137
" Determine the missing revisions between this and the branch at the\n"
3011
3138
" remembered pull location::"
3014
#: bzrlib/builtins.py:4850
3141
#: bzrlib/builtins.py:4890
3015
3142
msgid " bzr missing"
3016
3143
msgstr " bzr missing"
3018
#: bzrlib/builtins.py:4852
3145
#: bzrlib/builtins.py:4892
3019
3146
msgid " Determine the missing revisions between this and another branch::"
3022
#: bzrlib/builtins.py:4854
3149
#: bzrlib/builtins.py:4894
3023
3150
msgid " bzr missing http://server/branch"
3026
#: bzrlib/builtins.py:4856
3153
#: bzrlib/builtins.py:4896
3028
3155
" Determine the missing revisions up to a specific revision on the other\n"
3032
#: bzrlib/builtins.py:4859
3159
#: bzrlib/builtins.py:4899
3033
3160
msgid " bzr missing -r ..-10"
3034
3161
msgstr " bzr missing -r ..-10"
3036
#: bzrlib/builtins.py:4861
3163
#: bzrlib/builtins.py:4901
3038
3165
" Determine the missing revisions up to a specific revision on this\n"
3042
#: bzrlib/builtins.py:4864
3169
#: bzrlib/builtins.py:4904
3043
3170
msgid " bzr missing --my-revision ..-10"
3044
3171
msgstr " bzr missing --my-revision ..-10"
3046
#: bzrlib/builtins.py:4871
3173
#: bzrlib/builtins.py:4911
3047
3174
msgid "Reverse the order of revisions."
3050
#: bzrlib/builtins.py:4873
3177
#: bzrlib/builtins.py:4913
3051
3178
msgid "Display changes in the local branch only."
3052
3179
msgstr "Nur Änderungen im lokalen Zweig anzeigen."
3054
#: bzrlib/builtins.py:4874
3181
#: bzrlib/builtins.py:4914
3055
3182
msgid "Same as --mine-only."
3056
3183
msgstr "Dasselbe wie --mine-only."
3058
#: bzrlib/builtins.py:4876
3185
#: bzrlib/builtins.py:4916
3059
3186
msgid "Display changes in the remote branch only."
3060
3187
msgstr "Nur Änderungen im entfernten Zweig anzeigen."
3062
#: bzrlib/builtins.py:4877
3189
#: bzrlib/builtins.py:4917
3063
3190
msgid "Same as --theirs-only."
3064
3191
msgstr "Dasselbe wie --theirs-only."
3066
#: bzrlib/builtins.py:4882
3193
#: bzrlib/builtins.py:4922
3068
3195
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3072
#: bzrlib/builtins.py:4886
3199
#: bzrlib/builtins.py:4926
3074
3201
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3078
#: bzrlib/builtins.py:4889
3205
#: bzrlib/builtins.py:4929
3079
3206
msgid "Show all revisions in addition to the mainline ones."
3082
#: bzrlib/builtins.py:4943
3209
#: bzrlib/builtins.py:4983
3083
3210
msgid "No peer location known or specified."
3086
#: bzrlib/builtins.py:4947
3213
#: bzrlib/builtins.py:4987
3087
3214
msgid "Using saved parent location: {0}\n"
3090
#: bzrlib/builtins.py:4980
3217
#: bzrlib/builtins.py:5020
3091
3218
#, python-format
3092
3219
msgid "You have %d extra revision:\n"
3093
3220
msgid_plural "You have %d extra revisions:\n"
3094
3221
msgstr[0] "Sie haben %d zusätzliche Revision:\n"
3095
3222
msgstr[1] "Sie haben %d zusätzliche Revisionen:\n"
3097
#: bzrlib/builtins.py:4996
3224
#: bzrlib/builtins.py:5040
3098
3225
#, python-format
3099
3226
msgid "You are missing %d revision:\n"
3100
3227
msgid_plural "You are missing %d revisions:\n"
3101
3228
msgstr[0] "Ihnen fehlt %d Revision:\n"
3102
3229
msgstr[1] "Ihnen fehlen %d Revisionen:\n"
3104
#: bzrlib/builtins.py:5008
3231
#: bzrlib/builtins.py:5055
3105
3232
msgid "This branch has no new revisions.\n"
3106
3233
msgstr "Dieser Zweig hat keine neuen Revisionen.\n"
3108
#: bzrlib/builtins.py:5011
3235
#: bzrlib/builtins.py:5058
3109
3236
msgid "Other branch has no new revisions.\n"
3110
3237
msgstr "Anderer Zweig hat keine neuen Revisionen.\n"
3112
#: bzrlib/builtins.py:5016
3239
#: bzrlib/builtins.py:5063
3113
3240
msgid "Branches are up to date.\n"
3114
3241
msgstr "Zweige sind aktuell.\n"
3116
#: bzrlib/builtins.py:5027
3243
#: bzrlib/builtins.py:5074
3117
3244
msgid "Compress the data within a repository."
3120
#: bzrlib/builtins.py:5029
3247
#: bzrlib/builtins.py:5076
3122
3249
"This operation compresses the data within a bazaar repository. As\n"
3123
3250
"bazaar supports automatic packing of repository, this operation is\n"
3124
3251
"normally not required to be done manually."
3127
#: bzrlib/builtins.py:5033
3254
#: bzrlib/builtins.py:5080
3129
3256
"During the pack operation, bazaar takes a backup of existing repository\n"
3130
3257
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3176
3303
"plugins using the Python programming language."
3179
#: bzrlib/builtins.py:5091
3306
#: bzrlib/builtins.py:5138
3180
3307
msgid "Show testament (signing-form) of a revision."
3183
#: bzrlib/builtins.py:5094
3310
#: bzrlib/builtins.py:5141
3184
3311
msgid "Produce long-format testament."
3187
#: bzrlib/builtins.py:5096
3314
#: bzrlib/builtins.py:5143
3188
3315
msgid "Produce a strict-format testament."
3191
#: bzrlib/builtins.py:5122
3318
#: bzrlib/builtins.py:5169
3192
3319
msgid "Show the origin of each line in a file."
3193
3320
msgstr "Ursprung jeder Zeile in einer Datei anzeigen."
3195
#: bzrlib/builtins.py:5124
3322
#: bzrlib/builtins.py:5171
3197
3324
"This prints out the given file with an annotation on the left side\n"
3198
3325
"indicating which revision, author and date introduced the change."
3201
#: bzrlib/builtins.py:5127
3328
#: bzrlib/builtins.py:5174
3203
3330
"If the origin is the same for a run of consecutive lines, it is\n"
3204
3331
"shown only at the top, unless the --all option is given."
3207
#: bzrlib/builtins.py:5135
3334
#: bzrlib/builtins.py:5182
3208
3335
msgid "Show annotations on all lines."
3211
#: bzrlib/builtins.py:5136
3338
#: bzrlib/builtins.py:5183
3212
3339
msgid "Show commit date in annotations."
3215
#: bzrlib/builtins.py:5223
3342
#: bzrlib/builtins.py:5270
3216
3343
msgid "Cannot sign a range of non-revision-history revisions"
3219
#: bzrlib/builtins.py:5235
3346
#: bzrlib/builtins.py:5282
3220
3347
msgid "Please supply either one revision, or a range."
3221
3348
msgstr "Bitte geben Sie entweder eine Revision oder einen Bereich an."
3223
#: bzrlib/builtins.py:5239
3350
#: bzrlib/builtins.py:5286
3225
3352
"Convert the current branch into a checkout of the supplied branch.\n"
3226
3353
"If no branch is supplied, rebind to the last bound location."
3229
#: bzrlib/builtins.py:5242
3356
#: bzrlib/builtins.py:5289
3231
3358
"Once converted into a checkout, commits must succeed on the master branch\n"
3232
3359
"before they will be applied to the local branch."
3235
#: bzrlib/builtins.py:5245
3362
#: bzrlib/builtins.py:5292
3237
3364
"Bound branches use the nickname of its master branch unless it is set\n"
3238
3365
"locally, in which case binding will update the local nickname to be\n"
3239
3366
"that of the master."
3242
#: bzrlib/builtins.py:5260
3369
#: bzrlib/builtins.py:5307
3243
3370
msgid "No location supplied. This format does not remember old locations."
3246
#: bzrlib/builtins.py:5265
3373
#: bzrlib/builtins.py:5313
3247
3374
msgid "Branch is already bound"
3250
#: bzrlib/builtins.py:5267
3377
#: bzrlib/builtins.py:5316
3251
3378
msgid "No location supplied and no previous location known"
3254
#: bzrlib/builtins.py:5273
3381
#: bzrlib/builtins.py:5322
3255
3382
msgid "These branches have diverged. Try merging, and then bind again."
3258
#: bzrlib/builtins.py:5280
3385
#: bzrlib/builtins.py:5329
3259
3386
msgid "Convert the current checkout into a regular branch."
3262
#: bzrlib/builtins.py:5282
3389
#: bzrlib/builtins.py:5331
3264
3391
"After unbinding, the local branch is considered independent and subsequent\n"
3265
3392
"commits will be local only."
3268
#: bzrlib/builtins.py:5293
3395
#: bzrlib/builtins.py:5342
3269
3396
msgid "Local branch is not bound"
3272
#: bzrlib/builtins.py:5297
3399
#: bzrlib/builtins.py:5346
3273
3400
msgid "Remove the last committed revision."
3276
#: bzrlib/builtins.py:5299
3403
#: bzrlib/builtins.py:5348
3278
3405
"--verbose will print out what is being removed.\n"
3279
3406
"--dry-run will go through all the motions, but not actually\n"
3280
3407
"remove anything."
3283
#: bzrlib/builtins.py:5303
3410
#: bzrlib/builtins.py:5352
3285
3412
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3286
3413
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3287
3414
"branch at revision 15."
3290
#: bzrlib/builtins.py:5307
3417
#: bzrlib/builtins.py:5356
3292
3419
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3293
3420
"it may make is to restore any pending merges that were present before\n"
3297
#: bzrlib/builtins.py:5318
3424
#: bzrlib/builtins.py:5367
3298
3425
msgid "Don't actually make changes."
3299
3426
msgstr "Keine Änderungen durchführen."
3301
#: bzrlib/builtins.py:5319
3428
#: bzrlib/builtins.py:5368
3302
3429
msgid "Say yes to all questions."
3303
3430
msgstr "Alle Fragen mit Ja beantworten."
3305
#: bzrlib/builtins.py:5321
3432
#: bzrlib/builtins.py:5370
3306
3433
msgid "Keep tags that point to removed revisions."
3309
#: bzrlib/builtins.py:5323
3436
#: bzrlib/builtins.py:5372
3310
3437
msgid "Only remove the commits from the local branch when in a checkout."
3313
#: bzrlib/builtins.py:5372
3440
#: bzrlib/builtins.py:5421
3314
3441
msgid "No revisions to uncommit.\n"
3317
#: bzrlib/builtins.py:5387
3444
#: bzrlib/builtins.py:5436
3318
3445
msgid "Dry-run, pretending to remove the above revisions.\n"
3320
3447
"Testlauf, es wird so getan, als ob die obigen Revisionen entfernt würden.\n"
3322
#: bzrlib/builtins.py:5390
3449
#: bzrlib/builtins.py:5439
3323
3450
msgid "The above revision(s) will be removed.\n"
3324
3451
msgstr "Oben stehende Revision(en) wird/werden entfernt.\n"
3326
#: bzrlib/builtins.py:5394
3453
#: bzrlib/builtins.py:5443
3327
3454
msgid "Uncommit these revisions"
3330
#: bzrlib/builtins.py:5397
3457
#: bzrlib/builtins.py:5446
3331
3458
msgid "Canceled\n"
3332
3459
msgstr "Abgebrochen\n"
3334
#: bzrlib/builtins.py:5404
3461
#: bzrlib/builtins.py:5453
3335
3462
#, python-format
3337
3464
"You can restore the old tip by running:\n"
3338
3465
" bzr pull . -r revid:%s\n"
3341
#: bzrlib/builtins.py:5409
3468
#: bzrlib/builtins.py:5458
3342
3469
msgid "Break a dead lock."
3345
#: bzrlib/builtins.py:5411
3472
#: bzrlib/builtins.py:5460
3347
3474
"This command breaks a lock on a repository, branch, working directory or\n"
3351
#: bzrlib/builtins.py:5414
3478
#: bzrlib/builtins.py:5463
3353
3480
"CAUTION: Locks should only be broken when you are sure that the process\n"
3354
3481
"holding the lock has been stopped."
3357
#: bzrlib/builtins.py:5417
3484
#: bzrlib/builtins.py:5466
3359
3486
"You can get information on what locks are open via the 'bzr info\n"
3360
3487
"[location]' command."
3363
#: bzrlib/builtins.py:5420
3490
#: bzrlib/builtins.py:5469
3366
3493
" bzr break-lock\n"
3368
3495
" bzr break-lock --conf ~/.bazaar"
3371
#: bzrlib/builtins.py:5429
3498
#: bzrlib/builtins.py:5478
3372
3499
msgid "LOCATION is the directory where the config lock is."
3375
#: bzrlib/builtins.py:5431
3502
#: bzrlib/builtins.py:5480
3376
3503
msgid "Do not ask for confirmation before breaking the lock."
3379
#: bzrlib/builtins.py:5466
3506
#: bzrlib/builtins.py:5515
3380
3507
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3381
3508
msgstr "Das Bazaar-Smart-Server-Protokoll via TCP. (Vorgabe-Port: 4155)"
3383
#: bzrlib/builtins.py:5467
3510
#: bzrlib/builtins.py:5516
3384
3511
msgid "Run the bzr server."
3385
3512
msgstr "Den bzr-Server starten."
3387
#: bzrlib/builtins.py:5473
3514
#: bzrlib/builtins.py:5522
3388
3515
msgid "Serve on stdin/out for use from inetd or sshd."
3391
#: bzrlib/builtins.py:5474
3518
#: bzrlib/builtins.py:5523
3392
3519
msgid "protocol"
3393
3520
msgstr "Protokoll"
3395
#: bzrlib/builtins.py:5475
3522
#: bzrlib/builtins.py:5524
3396
3523
msgid "Protocol to serve."
3399
#: bzrlib/builtins.py:5479
3526
#: bzrlib/builtins.py:5528
3527
msgid "Listen for connections on nominated address."
3528
msgstr "An den angegebenen Adressen auf Verbindungen lauschen."
3530
#: bzrlib/builtins.py:5530
3401
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3402
"Passing 0 as the port number will result in a dynamically allocated port. "
3403
"The default port depends on the protocol."
3532
"Listen for connections on nominated port. Passing 0 as the port number will "
3533
"result in a dynamically allocated port. The default port depends on the "
3406
#: bzrlib/builtins.py:5485
3537
#: bzrlib/builtins.py:5535
3407
3538
msgid "Serve contents of this directory."
3410
#: bzrlib/builtins.py:5487
3541
#: bzrlib/builtins.py:5537
3412
3543
"By default the server is a readonly server. Supplying --allow-writes "
3413
3544
"enables write access to the contents of the served directory and below. "
3416
3547
"uncontrolled write access to your file system."
3419
#: bzrlib/builtins.py:5496
3550
#: bzrlib/builtins.py:5546
3420
3551
msgid "Override the default idle client timeout (5min)."
3423
#: bzrlib/builtins.py:5546
3554
#: bzrlib/builtins.py:5564
3424
3555
msgid "Combine a tree into its containing tree."
3427
#: bzrlib/builtins.py:5548
3558
#: bzrlib/builtins.py:5566
3428
3559
msgid "This command requires the target tree to be in a rich-root format."
3431
#: bzrlib/builtins.py:5550
3562
#: bzrlib/builtins.py:5568
3433
3564
"The TREE argument should be an independent tree, inside another tree, but\n"
3434
3565
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3435
3566
"running \"bzr branch\" with the target inside a tree.)"
3438
#: bzrlib/builtins.py:5554
3569
#: bzrlib/builtins.py:5572
3440
3571
"The result is a combined tree, with the subtree no longer an independent\n"
3441
3572
"part. This is marked as a merge of the subtree into the containing tree,\n"
3442
3573
"and all history is preserved."
3445
#: bzrlib/builtins.py:5572
3576
#: bzrlib/builtins.py:5590
3446
3577
#, python-format
3448
3579
"Can't join trees because %s doesn't support rich root data.\n"
3449
3580
"You can use bzr upgrade on the repository."
3452
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3583
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3453
3584
msgid "Cannot join {0}. {1}"
3456
#: bzrlib/builtins.py:5592
3587
#: bzrlib/builtins.py:5610
3457
3588
msgid "Split a subdirectory of a tree into a separate tree."
3460
#: bzrlib/builtins.py:5594
3591
#: bzrlib/builtins.py:5612
3462
3593
"This command will produce a target tree in a format that supports\n"
3463
3594
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3464
3595
"converted into earlier formats like 'dirstate-tags'."
3467
#: bzrlib/builtins.py:5598
3598
#: bzrlib/builtins.py:5616
3469
3600
"The TREE argument should be a subdirectory of a working tree. That\n"
3470
3601
"subdirectory will be converted into an independent tree, with its own\n"
3471
3602
"branch. Commits in the top-level tree will not apply to the new subtree."
3474
#: bzrlib/builtins.py:5678
3605
#: bzrlib/builtins.py:5696
3475
3606
msgid "No submit branch specified or known"
3478
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3609
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3479
3610
msgid "No public branch specified or known"
3482
#: bzrlib/builtins.py:5691
3613
#: bzrlib/builtins.py:5710
3483
3614
msgid "bzr merge-directive takes at most two one revision identifiers"
3486
#: bzrlib/builtins.py:5700
3617
#: bzrlib/builtins.py:5719
3487
3618
msgid "No revisions to bundle."
3490
#: bzrlib/builtins.py:5719
3621
#: bzrlib/builtins.py:5738
3491
3622
msgid "Mail or create a merge-directive for submitting changes."
3494
#: bzrlib/builtins.py:5721
3625
#: bzrlib/builtins.py:5740
3495
3626
msgid "A merge directive provides many things needed for requesting merges:"
3498
#: bzrlib/builtins.py:5723
3629
#: bzrlib/builtins.py:5742
3499
3630
msgid "* A machine-readable description of the merge to perform"
3502
#: bzrlib/builtins.py:5725
3633
#: bzrlib/builtins.py:5744
3503
3634
msgid "* An optional patch that is a preview of the changes requested"
3505
3636
"* Ein optionaler Patch, der eine Vorschau der gewünschten Änderungen "
3508
#: bzrlib/builtins.py:5727
3639
#: bzrlib/builtins.py:5746
3510
3641
"* An optional bundle of revision data, so that the changes can be applied\n"
3511
3642
" directly from the merge directive, without retrieving data from a\n"
3515
#: bzrlib/builtins.py:5731
3646
#: bzrlib/builtins.py:5750
3517
3648
"`bzr send` creates a compact data set that, when applied using bzr\n"
3518
3649
"merge, has the same effect as merging from the source branch. "
3521
#: bzrlib/builtins.py:5734
3652
#: bzrlib/builtins.py:5753
3523
3654
"By default the merge directive is self-contained and can be applied to any\n"
3524
3655
"branch containing submit_branch in its ancestory without needing access to\n"
3525
3656
"the source branch."
3528
#: bzrlib/builtins.py:5738
3659
#: bzrlib/builtins.py:5757
3530
3661
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3531
3662
"revisions, but only a structured request to merge from the\n"
3617
3748
"set them, and use `bzr info` to display them."
3620
#: bzrlib/builtins.py:5813
3751
#: bzrlib/builtins.py:5832
3621
3752
msgid "Write merge directive to this file or directory; use - for stdout."
3624
#: bzrlib/builtins.py:5817
3755
#: bzrlib/builtins.py:5836
3626
3757
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3627
3758
"strict disables the check."
3630
#: bzrlib/builtins.py:5819
3761
#: bzrlib/builtins.py:5838
3631
3762
msgid "Mail the request to this address."
3632
3763
msgstr "Die Anfrage an diese Adresse schicken."
3634
#: bzrlib/builtins.py:5823
3765
#: bzrlib/builtins.py:5842
3635
3766
msgid "Body for the email."
3636
3767
msgstr "Inhalt der E-Mail."
3638
#: bzrlib/builtins.py:5876
3769
#: bzrlib/builtins.py:5895
3639
3770
msgid "Do not include a bundle in the merge directive."
3642
#: bzrlib/builtins.py:5877
3773
#: bzrlib/builtins.py:5896
3643
3774
msgid "Do not include a preview patch in the merge directive."
3646
#: bzrlib/builtins.py:5880
3777
#: bzrlib/builtins.py:5899
3647
3778
msgid "Remember submit and public branch."
3650
#: bzrlib/builtins.py:5882
3781
#: bzrlib/builtins.py:5901
3652
3783
"Branch to generate the submission from, rather than the one containing the "
3653
3784
"working directory."
3656
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3787
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3658
3789
msgstr "Format"
3660
#: bzrlib/builtins.py:5893
3791
#: bzrlib/builtins.py:5912
3661
3792
msgid "Use the specified output format."
3662
3793
msgstr "Das angegebene Ausgabeformat benutzen."
3664
#: bzrlib/builtins.py:5915
3795
#: bzrlib/builtins.py:5934
3665
3796
msgid "Create, remove or modify a tag naming a revision."
3668
#: bzrlib/builtins.py:5917
3799
#: bzrlib/builtins.py:5936
3670
3801
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3671
3802
"(--revision) option can be given -rtag:X, where X is any previously\n"
3675
#: bzrlib/builtins.py:5921
3806
#: bzrlib/builtins.py:5940
3677
3808
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3678
3809
"along when you branch, push, pull or merge."
3681
#: bzrlib/builtins.py:5924
3812
#: bzrlib/builtins.py:5943
3683
3814
"It is an error to give a tag name that already exists unless you pass\n"
3684
3815
"--force, in which case the tag is moved to point to the new revision."
3687
#: bzrlib/builtins.py:5927
3818
#: bzrlib/builtins.py:5946
3689
3820
"To rename a tag (change the name but keep it on the same revsion), run "
3691
3822
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3694
#: bzrlib/builtins.py:5930
3825
#: bzrlib/builtins.py:5949
3696
3827
"If no tag name is specified it will be determined through the \n"
3697
3828
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3702
#: bzrlib/builtins.py:5940
3833
#: bzrlib/builtins.py:5959
3703
3834
msgid "Delete this tag rather than placing it."
3706
#: bzrlib/builtins.py:5943
3837
#: bzrlib/builtins.py:5962
3707
3838
msgid "Branch in which to place the tag."
3710
#: bzrlib/builtins.py:5945
3841
#: bzrlib/builtins.py:5964
3711
3842
msgid "Replace existing tags."
3714
#: bzrlib/builtins.py:5960
3845
#: bzrlib/builtins.py:5979
3715
3846
msgid "No tag specified to delete."
3718
#: bzrlib/builtins.py:5962
3849
#: bzrlib/builtins.py:5981
3719
3850
#, python-format
3720
3851
msgid "Deleted tag %s."
3723
#: bzrlib/builtins.py:5976
3854
#: bzrlib/builtins.py:5995
3724
3855
msgid "Please specify a tag name."
3727
#: bzrlib/builtins.py:5984
3858
#: bzrlib/builtins.py:6003
3728
3859
#, python-format
3729
3860
msgid "Tag %s already exists for that revision."
3732
#: bzrlib/builtins.py:5988
3863
#: bzrlib/builtins.py:6007
3733
3864
#, python-format
3734
3865
msgid "Created tag %s."
3737
#: bzrlib/builtins.py:5990
3868
#: bzrlib/builtins.py:6009
3738
3869
#, python-format
3739
3870
msgid "Updated tag %s."
3742
#: bzrlib/builtins.py:5994
3873
#: bzrlib/builtins.py:6013
3743
3874
msgid "List tags."
3746
#: bzrlib/builtins.py:5996
3877
#: bzrlib/builtins.py:6015
3748
3879
"This command shows a table of tag names and the revisions they reference."
3751
#: bzrlib/builtins.py:6002
3882
#: bzrlib/builtins.py:6021
3752
3883
msgid "Branch whose tags should be displayed."
3755
#: bzrlib/builtins.py:6004
3886
#: bzrlib/builtins.py:6023
3756
3887
msgid "Sort tags by different criteria."
3759
#: bzrlib/builtins.py:6004
3890
#: bzrlib/builtins.py:6023
3760
3891
msgid "Sorting"
3761
3892
msgstr "Sortierung"
3763
#: bzrlib/builtins.py:6073
3894
#: bzrlib/builtins.py:6092
3764
3895
msgid "Reconfigure the type of a bzr directory."
3767
#: bzrlib/builtins.py:6075
3898
#: bzrlib/builtins.py:6094
3768
3899
msgid "A target configuration must be specified."
3769
3900
msgstr "Es muss eine Zielkonfiguration angegeben werden."
3771
#: bzrlib/builtins.py:6077
3902
#: bzrlib/builtins.py:6096
3773
3904
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3774
3905
"The order of preference is\n"
3779
3910
"If none of these is available, --bind-to must be specified."
3782
#: bzrlib/builtins.py:6091
3913
#: bzrlib/builtins.py:6110
3783
3914
msgid "Tree type"
3786
#: bzrlib/builtins.py:6092
3917
#: bzrlib/builtins.py:6111
3787
3918
msgid "The relation between branch and tree."
3790
#: bzrlib/builtins.py:6094
3921
#: bzrlib/builtins.py:6113
3791
3922
msgid "Reconfigure to be an unbound branch with no working tree."
3794
#: bzrlib/builtins.py:6095
3925
#: bzrlib/builtins.py:6114
3795
3926
msgid "Reconfigure to be an unbound branch with a working tree."
3798
#: bzrlib/builtins.py:6096
3929
#: bzrlib/builtins.py:6115
3799
3930
msgid "Reconfigure to be a bound branch with a working tree."
3802
#: bzrlib/builtins.py:6097
3933
#: bzrlib/builtins.py:6116
3803
3934
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3806
#: bzrlib/builtins.py:6102
3937
#: bzrlib/builtins.py:6121
3807
3938
msgid "Repository type"
3810
#: bzrlib/builtins.py:6103
3941
#: bzrlib/builtins.py:6122
3811
3942
msgid "Location fo the repository."
3814
#: bzrlib/builtins.py:6105
3945
#: bzrlib/builtins.py:6124
3816
3947
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3819
#: bzrlib/builtins.py:6107
3950
#: bzrlib/builtins.py:6126
3820
3951
msgid "Reconfigure to use a shared repository."
3823
#: bzrlib/builtins.py:6111
3954
#: bzrlib/builtins.py:6130
3824
3955
msgid "Trees in Repository"
3827
#: bzrlib/builtins.py:6112
3958
#: bzrlib/builtins.py:6131
3828
3959
msgid "Whether new branches in the repository have trees."
3831
#: bzrlib/builtins.py:6114
3832
msgid "Reconfigure repository to create working trees on branches by default."
3962
#: bzrlib/builtins.py:6133
3964
"Reconfigure repository to create working trees on branches by default."
3835
#: bzrlib/builtins.py:6116
3967
#: bzrlib/builtins.py:6135
3837
3969
"Reconfigure repository to not create working trees on branches by default."
3840
#: bzrlib/builtins.py:6119
3972
#: bzrlib/builtins.py:6138
3841
3973
msgid "Branch to bind checkout to."
3844
#: bzrlib/builtins.py:6121
3976
#: bzrlib/builtins.py:6140
3845
3977
msgid "Perform reconfiguration even if local changes will be lost."
3848
#: bzrlib/builtins.py:6124
3980
#: bzrlib/builtins.py:6143
3849
3981
msgid "Reconfigure a branch to be stacked on another branch."
3852
#: bzrlib/builtins.py:6128
3984
#: bzrlib/builtins.py:6147
3854
3986
"Reconfigure a branch to be unstacked. This may require copying substantial "
3855
3987
"data into it."
3858
#: bzrlib/builtins.py:6138
3990
#: bzrlib/builtins.py:6157
3859
3991
msgid "Can't use both --stacked-on and --unstacked"
3860
msgstr "Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
3993
"Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
3862
#: bzrlib/builtins.py:6152
3995
#: bzrlib/builtins.py:6171
3863
3996
msgid "No target configuration specified"
3864
3997
msgstr "Keine Zielkonfiguration angegeben"
3866
#: bzrlib/builtins.py:6187
3999
#: bzrlib/builtins.py:6206
3867
4000
msgid "Set the branch of a checkout and update."
3868
4001
msgstr "Branch eines Checkout setzen und aktualisieren."
3870
#: bzrlib/builtins.py:6189
4003
#: bzrlib/builtins.py:6208
3872
4005
"For lightweight checkouts, this changes the branch being referenced.\n"
3873
4006
"For heavyweight checkouts, this checks that there are no local commits\n"
3946
4079
"want to switch back to your view after that."
3949
#: bzrlib/builtins.py:6281
4082
#: bzrlib/builtins.py:6305
3952
4085
" To define the current view::"
3955
#: bzrlib/builtins.py:6284
4088
#: bzrlib/builtins.py:6308
3956
4089
msgid " bzr view file1 dir1 ..."
3959
#: bzrlib/builtins.py:6286
4092
#: bzrlib/builtins.py:6310
3960
4093
msgid " To list the current view::"
3963
#: bzrlib/builtins.py:6288
4096
#: bzrlib/builtins.py:6312
3964
4097
msgid " bzr view"
3965
4098
msgstr " bzr view"
3967
#: bzrlib/builtins.py:6290
4100
#: bzrlib/builtins.py:6314
3968
4101
msgid " To delete the current view::"
3971
#: bzrlib/builtins.py:6292
4104
#: bzrlib/builtins.py:6316
3972
4105
msgid " bzr view --delete"
3973
4106
msgstr " bzr view --delete"
3975
#: bzrlib/builtins.py:6294
4108
#: bzrlib/builtins.py:6318
3976
4109
msgid " To disable the current view without deleting it::"
3979
#: bzrlib/builtins.py:6296
4112
#: bzrlib/builtins.py:6320
3980
4113
msgid " bzr view --switch off"
3981
4114
msgstr " bzr view --switch off"
3983
#: bzrlib/builtins.py:6298
4116
#: bzrlib/builtins.py:6322
3984
4117
msgid " To define a named view and switch to it::"
3987
#: bzrlib/builtins.py:6300
4120
#: bzrlib/builtins.py:6324
3988
4121
msgid " bzr view --name view-name file1 dir1 ..."
3991
#: bzrlib/builtins.py:6302
4124
#: bzrlib/builtins.py:6326
3992
4125
msgid " To list a named view::"
3995
#: bzrlib/builtins.py:6304
4128
#: bzrlib/builtins.py:6328
3996
4129
msgid " bzr view --name view-name"
3999
#: bzrlib/builtins.py:6306
4132
#: bzrlib/builtins.py:6330
4000
4133
msgid " To delete a named view::"
4003
#: bzrlib/builtins.py:6308
4136
#: bzrlib/builtins.py:6332
4004
4137
msgid " bzr view --name view-name --delete"
4007
#: bzrlib/builtins.py:6310
4140
#: bzrlib/builtins.py:6334
4008
4141
msgid " To switch to a named view::"
4011
#: bzrlib/builtins.py:6312
4144
#: bzrlib/builtins.py:6336
4012
4145
msgid " bzr view --switch view-name"
4015
#: bzrlib/builtins.py:6314
4148
#: bzrlib/builtins.py:6338
4016
4149
msgid " To list all views defined::"
4019
#: bzrlib/builtins.py:6316
4152
#: bzrlib/builtins.py:6340
4020
4153
msgid " bzr view --all"
4021
4154
msgstr " bzr view --all"
4023
#: bzrlib/builtins.py:6318
4156
#: bzrlib/builtins.py:6342
4024
4157
msgid " To delete all views::"
4027
#: bzrlib/builtins.py:6320
4160
#: bzrlib/builtins.py:6344
4028
4161
msgid " bzr view --delete --all"
4029
4162
msgstr " bzr view --delete --all"
4031
#: bzrlib/builtins.py:6327
4164
#: bzrlib/builtins.py:6351
4032
4165
msgid "Apply list or delete action to all views."
4035
#: bzrlib/builtins.py:6330
4168
#: bzrlib/builtins.py:6354
4036
4169
msgid "Delete the view."
4039
#: bzrlib/builtins.py:6333
4172
#: bzrlib/builtins.py:6357
4040
4173
msgid "Name of the view to define, list or delete."
4043
#: bzrlib/builtins.py:6337
4176
#: bzrlib/builtins.py:6361
4044
4177
msgid "Name of the view to switch to."
4047
#: bzrlib/builtins.py:6356
4180
#: bzrlib/builtins.py:6380
4048
4181
msgid "Both --delete and a file list specified"
4051
#: bzrlib/builtins.py:6359
4184
#: bzrlib/builtins.py:6383
4052
4185
msgid "Both --delete and --switch specified"
4055
#: bzrlib/builtins.py:6362
4188
#: bzrlib/builtins.py:6386
4056
4189
msgid "Deleted all views.\n"
4059
#: bzrlib/builtins.py:6364
4192
#: bzrlib/builtins.py:6388
4060
4193
msgid "No current view to delete"
4063
#: bzrlib/builtins.py:6367
4196
#: bzrlib/builtins.py:6391
4064
4197
#, python-format
4065
4198
msgid "Deleted '%s' view.\n"
4068
#: bzrlib/builtins.py:6371
4201
#: bzrlib/builtins.py:6395
4069
4202
msgid "Both --switch and a file list specified"
4072
#: bzrlib/builtins.py:6374
4205
#: bzrlib/builtins.py:6398
4073
4206
msgid "Both --switch and --all specified"
4076
#: bzrlib/builtins.py:6377
4209
#: bzrlib/builtins.py:6401
4077
4210
msgid "No current view to disable"
4080
#: bzrlib/builtins.py:6379
4213
#: bzrlib/builtins.py:6403
4081
4214
#, python-format
4082
4215
msgid "Disabled '%s' view.\n"
4085
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4218
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4086
4219
msgid "Using '{0}' view: {1}\n"
4089
#: bzrlib/builtins.py:6386
4222
#: bzrlib/builtins.py:6410
4090
4223
msgid "Views defined:\n"
4093
#: bzrlib/builtins.py:6395
4226
#: bzrlib/builtins.py:6419
4094
4227
msgid "No views defined.\n"
4097
#: bzrlib/builtins.py:6402
4230
#: bzrlib/builtins.py:6426
4098
4231
msgid "Cannot change the 'off' pseudo view"
4101
#: bzrlib/builtins.py:6410
4234
#: bzrlib/builtins.py:6434
4102
4235
msgid "No current view.\n"
4105
#: bzrlib/builtins.py:6413
4238
#: bzrlib/builtins.py:6437
4106
4239
msgid "'{0}' view is: {1}\n"
4109
#: bzrlib/builtins.py:6433
4242
#: bzrlib/builtins.py:6457
4110
4243
msgid " <no hooks installed>\n"
4113
#: bzrlib/builtins.py:6437
4246
#: bzrlib/builtins.py:6461
4114
4247
msgid "Remove a branch."
4115
4248
msgstr "Einen Zweig entfernen."
4117
#: bzrlib/builtins.py:6439
4250
#: bzrlib/builtins.py:6463
4119
4252
"This will remove the branch from the specified location but \n"
4120
4253
"will keep any working tree or repository in place."
4123
#: bzrlib/builtins.py:6444
4256
#: bzrlib/builtins.py:6468
4124
4257
msgid " Remove the branch at repo/trunk::"
4127
#: bzrlib/builtins.py:6446
4260
#: bzrlib/builtins.py:6470
4128
4261
msgid " bzr remove-branch repo/trunk"
4129
4262
msgstr " bzr remove-branch repo/trunk"
4131
#: bzrlib/builtins.py:6461
4264
#: bzrlib/builtins.py:6477
4265
msgid "Remove branch even if it is the active branch."
4266
msgstr "Zweig entfernen, selbst wenn es ein aktiver Zweig ist."
4268
#: bzrlib/builtins.py:6491
4269
msgid "Branch is active. Use --force to remove it."
4270
msgstr "Zweig ist aktiv. Benutzen Sie --force, um ihn zu entfernen."
4272
#: bzrlib/builtins.py:6495
4132
4273
msgid "Plaintext diff output."
4135
#: bzrlib/builtins.py:6462
4276
#: bzrlib/builtins.py:6496
4136
4277
msgid "Temporarily set aside some changes from the current tree."
4139
#: bzrlib/builtins.py:6464
4280
#: bzrlib/builtins.py:6498
4141
4282
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4142
4283
"ie. out of the way, until a later time when you can bring them back from\n"
4197
#: bzrlib/builtins.py:6503
4338
#: bzrlib/builtins.py:6537
4198
4339
msgid "Shelve all changes."
4201
#: bzrlib/builtins.py:6505
4342
#: bzrlib/builtins.py:6539
4202
4343
msgid "Method to use for writing diffs."
4205
#: bzrlib/builtins.py:6505
4346
#: bzrlib/builtins.py:6539
4209
#: bzrlib/builtins.py:6509
4350
#: bzrlib/builtins.py:6543
4210
4351
msgid "List shelved changes."
4213
#: bzrlib/builtins.py:6511
4354
#: bzrlib/builtins.py:6545
4214
4355
msgid "Destroy removed changes instead of shelving them."
4217
#: bzrlib/builtins.py:6540
4358
#: bzrlib/builtins.py:6574
4218
4359
msgid "No shelved changes."
4221
#: bzrlib/builtins.py:6551
4362
#: bzrlib/builtins.py:6585
4222
4363
msgid "Restore shelved changes."
4225
#: bzrlib/builtins.py:6553
4366
#: bzrlib/builtins.py:6587
4227
4368
"By default, the most recently shelved changes are restored. However if you\n"
4228
4369
"specify a shelf by id those changes will be restored instead. This works\n"
4229
4370
"best when the changes don't depend on each other."
4232
#: bzrlib/builtins.py:6562
4373
#: bzrlib/builtins.py:6596
4233
4374
msgid "The action to perform."
4234
4375
msgstr "Die auszuführende Aktion."
4236
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4377
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4238
4379
msgstr "Aktion"
4240
#: bzrlib/builtins.py:6564
4381
#: bzrlib/builtins.py:6598
4241
4382
msgid "Apply changes and remove from the shelf."
4244
#: bzrlib/builtins.py:6565
4385
#: bzrlib/builtins.py:6599
4245
4386
msgid "Show changes, but do not apply or remove them."
4246
4387
msgstr "Änderungen anzeigen, aber nicht anwenden oder entfernen."
4248
#: bzrlib/builtins.py:6566
4389
#: bzrlib/builtins.py:6600
4250
4391
"Instead of unshelving the changes, show the diff that would result from "
4254
#: bzrlib/builtins.py:6568
4395
#: bzrlib/builtins.py:6602
4255
4396
msgid "Delete changes without applying them."
4256
4397
msgstr "Änderungen löschen ohne diese anzuwenden."
4258
#: bzrlib/builtins.py:6569
4399
#: bzrlib/builtins.py:6603
4259
4400
msgid "Apply changes but don't delete them."
4260
4401
msgstr "Änderungen anwenden, aber diese nicht löschen."
4262
#: bzrlib/builtins.py:6584
4403
#: bzrlib/builtins.py:6618
4263
4404
msgid "Remove unwanted files from working tree."
4266
#: bzrlib/builtins.py:6586
4407
#: bzrlib/builtins.py:6620
4268
4409
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4269
4410
"files are never deleted."
4272
#: bzrlib/builtins.py:6589
4413
#: bzrlib/builtins.py:6623
4274
4415
"Another class is 'detritus', which includes files emitted by bzr during\n"
4275
4416
"normal operations and selftests. (The value of these files decreases with\n"
4279
#: bzrlib/builtins.py:6593
4420
#: bzrlib/builtins.py:6627
4281
4422
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4282
4423
"flags are respected, and may be combined."
4285
#: bzrlib/builtins.py:6596
4426
#: bzrlib/builtins.py:6630
4286
4427
msgid "To check what clean-tree will do, use --dry-run."
4287
4428
msgstr "Um zu prüfen, was clean-tree tun wird, --dry-run benutzen."
4289
#: bzrlib/builtins.py:6599
4430
#: bzrlib/builtins.py:6633
4290
4431
msgid "Delete all ignored files."
4291
4432
msgstr "Alle ignorierten Dateien löschen."
4293
#: bzrlib/builtins.py:6600
4434
#: bzrlib/builtins.py:6634
4295
4436
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4298
#: bzrlib/builtins.py:6603
4439
#: bzrlib/builtins.py:6637
4299
4440
msgid "Delete files unknown to bzr (default)."
4300
4441
msgstr "Dateien löschen, die bzr nicht bekannt sind (Vorgabe)."
4302
#: bzrlib/builtins.py:6604
4443
#: bzrlib/builtins.py:6638
4303
4444
msgid "Show files to delete instead of deleting them."
4304
4445
msgstr "Dateien zum Löschen anzeigen, anstelle diese zu löschen."
4306
#: bzrlib/builtins.py:6606
4447
#: bzrlib/builtins.py:6640
4307
4448
msgid "Do not prompt before deleting."
4308
4449
msgstr "Vor dem Löschen nicht nachfragen."
5216
#: bzrlib/errors.py:809
5370
#: bzrlib/errors.py:818
5217
5371
msgid "Revision is not compatible with %(repo_format)s"
5218
5372
msgstr "Die Revision ist inkompatibel zu %(repo_format)s"
5220
#: bzrlib/errors.py:819
5374
#: bzrlib/errors.py:828
5221
5375
msgid "%(context_info)s%(path)s is already versioned."
5222
5376
msgstr "%(context_info)s%(path)s ist bereits versioniert."
5224
#: bzrlib/errors.py:840
5378
#: bzrlib/errors.py:849
5225
5379
msgid "%(context_info)s%(path)s is not versioned."
5226
5380
msgstr "%(context_info)s%(path)s ist nicht versioniert."
5228
#: bzrlib/errors.py:861
5382
#: bzrlib/errors.py:870
5229
5383
msgid "Path(s) are not versioned: %(paths_as_string)s"
5230
5384
msgstr "Pfad(e) ist/sind nicht versioniert: %(paths_as_string)s"
5232
#: bzrlib/errors.py:872
5386
#: bzrlib/errors.py:881
5233
5387
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5234
5388
msgstr "Pfad(e) existiert/existieren nicht: %(paths_as_string)s%(extra)s"
5236
#: bzrlib/errors.py:891
5390
#: bzrlib/errors.py:900
5237
5391
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5240
#: bzrlib/errors.py:899
5394
#: bzrlib/errors.py:908
5242
5396
"Filename %(filename)r is not valid in your current filesystem encoding "
5243
5397
"%(fs_encoding)s"
5246
#: bzrlib/errors.py:910
5400
#: bzrlib/errors.py:919
5247
5401
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5250
#: bzrlib/errors.py:928
5404
#: bzrlib/errors.py:937
5251
5405
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5254
#: bzrlib/errors.py:967
5408
#: bzrlib/errors.py:976
5255
5409
msgid "Cannot lock %(lock)s: %(why)s"
5258
#: bzrlib/errors.py:977
5412
#: bzrlib/errors.py:986
5260
5414
"A transaction related operation was attempted after the transaction finished."
5263
#: bzrlib/errors.py:1004
5417
#: bzrlib/errors.py:1013
5264
5418
msgid "Cannot lock: transport is read only: %(transport)s"
5267
#: bzrlib/errors.py:1012
5421
#: bzrlib/errors.py:1021
5268
5422
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5271
#: bzrlib/errors.py:1023
5272
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5425
#: bzrlib/errors.py:1032
5427
"Lock was broken while still open: %(lock)s - check storage consistency!"
5275
#: bzrlib/errors.py:1034
5430
#: bzrlib/errors.py:1043
5277
5432
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5278
5433
"%(holder)r, wanted to break %(target)r"
5281
#: bzrlib/errors.py:1046
5436
#: bzrlib/errors.py:1055
5283
5438
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5284
5439
"Use 'bzr break-lock' to clear it"
5287
#: bzrlib/errors.py:1059
5442
#: bzrlib/errors.py:1068
5288
5443
msgid "Lock not held: %(lock)s"
5291
#: bzrlib/errors.py:1088
5446
#: bzrlib/errors.py:1097
5292
5447
msgid "No changes to commit"
5295
#: bzrlib/errors.py:1093
5450
#: bzrlib/errors.py:1102
5297
5452
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5300
#: bzrlib/errors.py:1103
5302
"Excluding paths during commit is not supported by repository at %(repository)"
5306
5455
#: bzrlib/errors.py:1112
5457
"Excluding paths during commit is not supported by repository at "
5461
#: bzrlib/errors.py:1121
5308
5463
"The specified commit message contains characters unsupported by the current "
5312
#: bzrlib/errors.py:1118
5467
#: bzrlib/errors.py:1127
5313
5468
msgid "Upgrade URL cannot work with readonly URLs."
5316
#: bzrlib/errors.py:1123
5471
#: bzrlib/errors.py:1132
5317
5472
msgid "The branch format %(format)s is already at the most recent format."
5320
#: bzrlib/errors.py:1146
5475
#: bzrlib/errors.py:1155
5321
5476
msgid "Option --change does not accept revision ranges"
5322
5477
msgstr "Die Option --change akzeptiert keine Revisionsbereiche"
5324
#: bzrlib/errors.py:1151
5479
#: bzrlib/errors.py:1160
5325
5480
msgid "No namespace registered for string: %(spec)r"
5328
#: bzrlib/errors.py:1170
5483
#: bzrlib/errors.py:1179
5330
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5485
"Requested revision: '%(spec)s' does not exist in branch: "
5486
"%(branch_url)s%(extra)s"
5333
"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: %(branch_url)s"
5488
"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: "
5489
"%(branch_url)s%(extra)s"
5336
#: bzrlib/errors.py:1184
5491
#: bzrlib/errors.py:1193
5338
5493
"Operation denied because it would change the main history, which is not "
5339
5494
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5342
#: bzrlib/errors.py:1195
5497
#: bzrlib/errors.py:1204
5344
5499
"These branches have diverged. Use the missing command to see how.\n"
5345
5500
"Use the merge command to reconcile them."
5348
#: bzrlib/errors.py:1215
5503
#: bzrlib/errors.py:1224
5350
5505
"Branches have no common ancestor, and no merge base revision was specified."
5353
#: bzrlib/errors.py:1221
5508
#: bzrlib/errors.py:1230
5355
5510
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5358
#: bzrlib/errors.py:1227
5513
#: bzrlib/errors.py:1236
5359
5514
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5362
#: bzrlib/errors.py:1236
5517
#: bzrlib/errors.py:1245
5364
5519
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5367
#: bzrlib/errors.py:1245
5522
#: bzrlib/errors.py:1254
5368
5523
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5371
#: bzrlib/errors.py:1254
5526
#: bzrlib/errors.py:1263
5372
5527
msgid "Branch %(branch)s has no commits."
5375
#: bzrlib/errors.py:1272
5530
#: bzrlib/errors.py:1281
5377
"Bound branch %(branch)s is out of date with master branch %(master)s."
5532
"Bound branch %(branch)s is out of date with master branch "
5533
"%(master)s.%(extra_help)s"
5381
#: bzrlib/errors.py:1284
5536
#: bzrlib/errors.py:1293
5383
5538
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5384
5539
"bound to %(remote)s."
5387
#: bzrlib/errors.py:1296
5542
#: bzrlib/errors.py:1305
5388
5543
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5391
#: bzrlib/errors.py:1305
5546
#: bzrlib/errors.py:1314
5393
5548
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5397
#: bzrlib/errors.py:1317
5552
#: bzrlib/errors.py:1326
5398
5553
msgid "Error in processing weave: %(msg)s"
5401
#: bzrlib/errors.py:1326
5556
#: bzrlib/errors.py:1335
5402
5557
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5403
5558
msgstr "Revision {%(revision_id)s} ist bereits in %(weave)s vorhanden"
5405
#: bzrlib/errors.py:1337
5560
#: bzrlib/errors.py:1346
5406
5561
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5407
5562
msgstr "Revision {%(revision_id)s} ist nicht in %(weave)s vorhanden"
5409
#: bzrlib/errors.py:1347
5564
#: bzrlib/errors.py:1356
5410
5565
msgid "Weave invariant violated: %(what)s"
5413
#: bzrlib/errors.py:1356
5568
#: bzrlib/errors.py:1365
5414
5569
msgid "Parents are mismatched between two revisions. %(msg)s"
5417
#: bzrlib/errors.py:1378
5572
#: bzrlib/errors.py:1387
5419
5574
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5423
#: bzrlib/errors.py:1390
5578
#: bzrlib/errors.py:1399
5424
5579
msgid "Versioned file error"
5425
5580
msgstr "Fehler bei versionierter Datei"
5427
#: bzrlib/errors.py:1395
5582
#: bzrlib/errors.py:1404
5428
5583
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5429
5584
msgstr "Revision {%(revision_id)s} ist nicht in »%(file_id)s« vorhanden."
5431
#: bzrlib/errors.py:1405
5586
#: bzrlib/errors.py:1414
5432
5587
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5433
5588
msgstr "Revision {%(revision_id)s} ist bereits in »%(file_id)s« vorhanden."
5435
#: bzrlib/errors.py:1415
5590
#: bzrlib/errors.py:1424
5436
5591
msgid "Text did not match its checksum: %(msg)s"
5437
5592
msgstr "Der Text entsprach nicht seiner Prüfsumme: %(msg)s"
5439
#: bzrlib/errors.py:1541
5594
#: bzrlib/errors.py:1550
5440
5595
msgid "Export format %(format)r not supported"
5441
5596
msgstr "Exportformat %(format)r wird nicht unterstützt"
5443
#: bzrlib/errors.py:1550
5598
#: bzrlib/errors.py:1559
5444
5599
msgid "Transport error: %(msg)s %(orig_error)s"
5445
5600
msgstr "Übertragungsfehler: %(msg)s %(orig_error)s"
5447
#: bzrlib/errors.py:1576
5602
#: bzrlib/errors.py:1585
5448
5603
msgid "Generic bzr smart protocol error: %(details)s"
5449
5604
msgstr "Allgemeiner bzr-Smart-Protokoll-Fehler: %(details)s"
5451
#: bzrlib/errors.py:1584
5606
#: bzrlib/errors.py:1593
5452
5607
msgid "Received bad protocol version marker: %(marker)r"
5455
#: bzrlib/errors.py:1616
5610
#: bzrlib/errors.py:1625
5456
5611
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5459
#: bzrlib/errors.py:1621
5614
#: bzrlib/errors.py:1630
5460
5615
msgid "Connection error: %(msg)s %(orig_error)s"
5461
5616
msgstr "Verbindungsfehler: %(msg)s %(orig_error)s"
5463
#: bzrlib/errors.py:1626
5618
#: bzrlib/errors.py:1635
5464
5619
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5465
5620
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5467
#: bzrlib/errors.py:1647
5622
#: bzrlib/errors.py:1656
5468
5623
msgid "Connection closed: %(msg)s %(orig_error)s"
5469
5624
msgstr "Verbindung geschlossen: %(msg)s %(orig_error)s"
5471
#: bzrlib/errors.py:1652
5626
#: bzrlib/errors.py:1661
5472
5627
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5473
5628
msgstr "Verbindung abgelaufen: %(msg)s%(orig_error)s"
5475
#: bzrlib/errors.py:1657
5630
#: bzrlib/errors.py:1666
5476
5631
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5479
#: bzrlib/errors.py:1667
5634
#: bzrlib/errors.py:1676
5480
5635
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5481
5636
msgstr "Ungültige HTTP-Antwort für %(path)s: %(msg)s%(orig_error)s"
5483
#: bzrlib/errors.py:1682
5638
#: bzrlib/errors.py:1691
5484
5639
msgid "Certificate error: %(error)s"
5485
5640
msgstr "Zertifikatsfehler: %(error)s"
5487
#: bzrlib/errors.py:1690
5642
#: bzrlib/errors.py:1699
5488
5643
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5489
5644
msgstr "Ungültiger HTTP-Bereich %(range)r für %(path)s: %(msg)s"
5491
#: bzrlib/errors.py:1704
5646
#: bzrlib/errors.py:1713
5492
5647
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5493
5648
msgstr "»HTTP MIME Boundary« für %(path)s fehlt: %(msg)sy"
5495
#: bzrlib/errors.py:1712
5650
#: bzrlib/errors.py:1721
5496
5651
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5497
5652
msgstr "Ungültiger HTTP-Content-type »%(ctype)s« für %(path)s: %(msg)s"
5499
#: bzrlib/errors.py:1721
5654
#: bzrlib/errors.py:1730
5500
5655
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5501
5656
msgstr "%(source)s wird%(permanently)s umgeleitet nach %(target)s"
5503
#: bzrlib/errors.py:1735
5658
#: bzrlib/errors.py:1744
5504
5659
msgid "Too many redirections"
5505
5660
msgstr "Zu viele Umleitungen"
5507
#: bzrlib/errors.py:1740
5662
#: bzrlib/errors.py:1749
5508
5663
msgid "Working tree has conflicts."
5511
#: bzrlib/errors.py:1744
5666
#: bzrlib/errors.py:1753
5512
5667
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5513
5668
msgstr "Konfigurationsdatei %(filename)s ist nicht UTF-8-kodiert\n"
5515
#: bzrlib/errors.py:1753
5670
#: bzrlib/errors.py:1762
5517
5672
"Error(s) parsing config file %(filename)s:\n"
5521
#: bzrlib/errors.py:1763
5676
#: bzrlib/errors.py:1772
5523
5678
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5524
5679
"See ``bzr help %(name)s``"
5527
#: bzrlib/errors.py:1773
5682
#: bzrlib/errors.py:1782
5528
5683
msgid "%(username)r does not seem to contain a reasonable email address"
5529
5684
msgstr "%(username)r scheint keine vernünftige E-Mail-Adresse zu haben"
5531
#: bzrlib/errors.py:1782
5686
#: bzrlib/errors.py:1791
5532
5687
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5535
#: bzrlib/errors.py:1790
5690
#: bzrlib/errors.py:1799
5536
5691
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5539
#: bzrlib/errors.py:1798
5694
#: bzrlib/errors.py:1807
5540
5695
msgid "Unable to import library \"%(library)s\": %(error)s"
5541
5696
msgstr "Importieren der Bibliothek »%(library)s« nicht möglich: %(error)s"
5543
#: bzrlib/errors.py:1806
5698
#: bzrlib/errors.py:1815
5544
5699
msgid "python-gpgme is not installed, it is needed to verify signatures"
5547
#: bzrlib/errors.py:1814
5702
#: bzrlib/errors.py:1823
5549
5704
"The working tree for %(basedir)s has changed since the last commit, but "
5550
5705
"weave merge requires that it be unchanged"
5553
#: bzrlib/errors.py:1824
5708
#: bzrlib/errors.py:1833
5555
5710
"Can't reprocess and show base, because reprocessing obscures the "
5556
5711
"relationship of conflicting lines to the base"
5559
#: bzrlib/errors.py:1830
5714
#: bzrlib/errors.py:1839
5560
5715
msgid "Cycle in graph %(graph)r"
5563
#: bzrlib/errors.py:1858
5718
#: bzrlib/errors.py:1867
5564
5719
msgid "File %(filename)s is not conflicted."
5567
#: bzrlib/errors.py:1880
5722
#: bzrlib/errors.py:1889
5568
5723
msgid "No bundle was found in \"%(filename)s\"."
5571
#: bzrlib/errors.py:1889
5726
#: bzrlib/errors.py:1898
5572
5727
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5575
#: bzrlib/errors.py:1899
5730
#: bzrlib/errors.py:1908
5576
5731
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5577
5732
msgstr "Im Zweig %(base)s fehlt Revision %(text_revision)s von %(file_id)s"
5579
#: bzrlib/errors.py:1912
5734
#: bzrlib/errors.py:1921
5580
5735
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5583
#: bzrlib/errors.py:1922
5738
#: bzrlib/errors.py:1931
5584
5739
msgid "Key %(key)s is already present in map"
5587
#: bzrlib/errors.py:1927
5742
#: bzrlib/errors.py:1936
5588
5743
msgid "The prefix %(prefix)s is in the help search path twice."
5591
#: bzrlib/errors.py:1937
5746
#: bzrlib/errors.py:1946
5593
5748
"No final name for trans_id %(trans_id)r\n"
5594
5749
"file-id: %(file_id)r\n"
5595
5750
"root trans-id: %(root_trans_id)r\n"
5598
#: bzrlib/errors.py:1969
5753
#: bzrlib/errors.py:1978
5599
5754
msgid "Attempt to reuse a transform that has already been applied."
5602
#: bzrlib/errors.py:1974
5757
#: bzrlib/errors.py:1983
5603
5758
msgid "Moving the root directory is not supported at this time"
5606
#: bzrlib/errors.py:1979
5761
#: bzrlib/errors.py:1988
5607
5762
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5608
5763
msgstr "Umbenennen von %(from_path)s in %(to_path)s gescheitert: %(why)s"
5610
#: bzrlib/errors.py:1990
5765
#: bzrlib/errors.py:1999
5612
5767
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5615
#: bzrlib/errors.py:2026
5770
#: bzrlib/errors.py:2035
5617
5772
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5620
#: bzrlib/errors.py:2056
5775
#: bzrlib/errors.py:2065
5621
5776
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5624
#: bzrlib/errors.py:2064
5779
#: bzrlib/errors.py:2073
5625
5780
msgid "Nothing to merge."
5628
#: bzrlib/errors.py:2069
5783
#: bzrlib/errors.py:2078
5629
5784
msgid "Format %(format)s cannot be initialised by this version of bzr."
5631
5786
"Das Format %(format)s kann von dieser Bazaar-Version nicht initialisiert "
5634
#: bzrlib/errors.py:2078
5789
#: bzrlib/errors.py:2087
5636
5791
"Cannot convert from format %(from_format)s to format %(format)s. "
5640
#: bzrlib/errors.py:2090
5795
#: bzrlib/errors.py:2099
5641
5796
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5644
#: bzrlib/errors.py:2098
5799
#: bzrlib/errors.py:2107
5645
5800
msgid "%(exe_name)s could not be found on this machine"
5646
5801
msgstr "%(exe_name)s konnte nicht auf diesem Rechner gefunden werden"
5648
#: bzrlib/errors.py:2106
5803
#: bzrlib/errors.py:2115
5649
5804
msgid "Diff is not installed on this machine: %(msg)s"
5650
5805
msgstr "Diff ist auf diesem Rechner nicht installiert: %(msg)s"
5652
#: bzrlib/errors.py:2114
5807
#: bzrlib/errors.py:2123
5653
5808
msgid "Diff3 is not installed on this machine."
5654
5809
msgstr "Diff3 ist auf diesem Rechner nicht installiert."
5656
#: bzrlib/errors.py:2120
5811
#: bzrlib/errors.py:2129
5657
5812
msgid "The content being inserted is already present."
5658
5813
msgstr "Der gerade eingefügte Inhalt ist bereits vorhanden."
5660
#: bzrlib/errors.py:2125
5815
#: bzrlib/errors.py:2134
5662
5817
"This tree contains left-over files from a failed operation.\n"
5663
5818
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5680
5835
" keep, and delete it when you are done."
5683
#: bzrlib/errors.py:2157
5838
#: bzrlib/errors.py:2166
5685
5840
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5686
5841
"examine %(pending_deletion)s to see if it contains any files you wish to "
5687
5842
"keep, and delete it when you are done."
5690
#: bzrlib/errors.py:2167
5845
#: bzrlib/errors.py:2176
5691
5846
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5694
#: bzrlib/errors.py:2181
5695
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5849
#: bzrlib/errors.py:2190
5851
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5697
5853
"Im öffentlichen Zweig »%(public_location)s« fehlt Revision »%(revstring)s«."
5699
#: bzrlib/errors.py:2194
5855
#: bzrlib/errors.py:2203
5700
5856
msgid "Error in merge modified format"
5703
#: bzrlib/errors.py:2199
5859
#: bzrlib/errors.py:2208
5704
5860
msgid "Format error in conflict listings"
5707
#: bzrlib/errors.py:2203
5863
#: bzrlib/errors.py:2212
5709
5865
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5710
5866
"Error: %(description)s"
5713
#: bzrlib/errors.py:2214
5869
#: bzrlib/errors.py:2223
5715
5871
"An error has been detected in the repository %(repo_path)s.\n"
5716
5872
"Please run bzr reconcile on this repository."
5719
#: bzrlib/errors.py:2225
5875
#: bzrlib/errors.py:2234
5721
5877
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5722
5878
"reason: %(reason)s"
5725
#: bzrlib/errors.py:2238
5881
#: bzrlib/errors.py:2247
5727
5883
"An inconsistent delta was supplied: %(delta)r\n"
5728
5884
"reason: %(reason)s"
5731
#: bzrlib/errors.py:2250
5887
#: bzrlib/errors.py:2259
5732
5888
msgid "To use this feature you must upgrade your branch at %(path)s."
5735
#: bzrlib/errors.py:2259
5891
#: bzrlib/errors.py:2268
5736
5892
msgid "To use this feature you must upgrade your repository at %(path)s."
5739
#: bzrlib/errors.py:2264
5895
#: bzrlib/errors.py:2273
5741
5897
"To use this feature you must upgrade your branch at %(path)s to a format "
5742
5898
"which supports rich roots."
5745
#: bzrlib/errors.py:2270
5901
#: bzrlib/errors.py:2279
5746
5902
msgid "Cannot perform local-only commits on unbound branches."
5749
#: bzrlib/errors.py:2275
5905
#: bzrlib/errors.py:2284
5750
5906
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5753
#: bzrlib/errors.py:2296
5909
#: bzrlib/errors.py:2305
5754
5910
msgid "Ghost tags not supported by format %(format)r."
5757
#: bzrlib/errors.py:2304
5913
#: bzrlib/errors.py:2313
5758
5914
msgid "File is binary but should be text."
5759
5915
msgstr "Die Datei ist binär, sollte aber Text sein."
5761
#: bzrlib/errors.py:2309
5917
#: bzrlib/errors.py:2318
5762
5918
msgid "The path %(path)s is not permitted on this platform"
5763
5919
msgstr "Der Pfad %(path)s ist auf dieser Plattform nicht erlaubt"
5765
#: bzrlib/errors.py:2318
5921
#: bzrlib/errors.py:2327
5767
5923
"Testament did not match expected value.\n"
5768
5924
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5769
5925
" {%(measured)s}"
5772
#: bzrlib/errors.py:2330
5928
#: bzrlib/errors.py:2339
5773
5929
msgid "Not a bzr revision-bundle: %(text)r"
5776
#: bzrlib/errors.py:2339
5932
#: bzrlib/errors.py:2348
5777
5933
msgid "Bad bzr revision-bundle: %(text)r"
5780
#: bzrlib/errors.py:2348
5936
#: bzrlib/errors.py:2357
5781
5937
msgid "Malformed bzr revision-bundle header: %(text)r"
5784
#: bzrlib/errors.py:2353
5940
#: bzrlib/errors.py:2362
5785
5941
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5788
#: bzrlib/errors.py:2358
5944
#: bzrlib/errors.py:2367
5789
5945
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5792
#: bzrlib/errors.py:2363
5948
#: bzrlib/errors.py:2372
5793
5949
msgid "End of line marker was not \\n in bzr revision-bundle"
5796
#: bzrlib/errors.py:2373
5952
#: bzrlib/errors.py:2382
5797
5953
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5800
#: bzrlib/errors.py:2383
5956
#: bzrlib/errors.py:2392
5801
5957
msgid "Root class for inventory serialization errors"
5804
#: bzrlib/errors.py:2387
5960
#: bzrlib/errors.py:2396
5806
5962
"The inventory was not in the expected format:\n"
5810
#: bzrlib/errors.py:2396
5966
#: bzrlib/errors.py:2405
5811
5967
msgid "This operation requires rich root data storage"
5814
#: bzrlib/errors.py:2409
5970
#: bzrlib/errors.py:2418
5815
5971
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5818
#: bzrlib/errors.py:2418
5974
#: bzrlib/errors.py:2427
5820
5976
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5824
#: bzrlib/errors.py:2425
5980
#: bzrlib/errors.py:2434
5826
5982
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5827
5983
"ghost at {%(ghost_revision_id)s}"
5830
#: bzrlib/errors.py:2435
5986
#: bzrlib/errors.py:2444
5831
5987
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5832
5988
msgstr "Geister-Revision {%(revision_id)s} kann hier nicht benutzt werden."
5834
#: bzrlib/errors.py:2486
5990
#: bzrlib/errors.py:2495
5836
5992
"A merge directive must provide either a bundle or a public branch location."
5839
#: bzrlib/errors.py:2493
5995
#: bzrlib/errors.py:2502
5840
5996
msgid "Bad merge directive payload %(start)r"
5843
#: bzrlib/errors.py:2503
5999
#: bzrlib/errors.py:2512
5844
6000
msgid "Preview patch does not match requested changes."
5847
#: bzrlib/errors.py:2509
6003
#: bzrlib/errors.py:2518
5848
6004
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5851
#: bzrlib/errors.py:2519
6007
#: bzrlib/errors.py:2528
5853
6009
"Your branch does not have all of the revisions required in order to merge "
5854
6010
"this merge directive and the target location specified in the merge "
5855
6011
"directive is not a branch: %(location)s."
5858
#: bzrlib/errors.py:2531
6014
#: bzrlib/errors.py:2540
5859
6015
msgid "Unsupported entry kind %(kind)s"
5862
#: bzrlib/errors.py:2539
6018
#: bzrlib/errors.py:2548
5863
6019
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5866
#: bzrlib/errors.py:2549
6022
#: bzrlib/errors.py:2558
5867
6023
msgid "Subsume target %(other_tree)s needs to be upgraded."
5870
#: bzrlib/errors.py:2568
6026
#: bzrlib/errors.py:2577
5871
6027
msgid "No such tag: %(tag_name)s"
5874
#: bzrlib/errors.py:2576
6030
#: bzrlib/errors.py:2585
5875
6031
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5878
#: bzrlib/errors.py:2585
6034
#: bzrlib/errors.py:2594
5879
6035
msgid "Tag %(tag_name)s already exists."
5882
#: bzrlib/errors.py:2593
6038
#: bzrlib/errors.py:2602
5884
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
5885
"\" for more information on this feature."
6040
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6041
"bugs\" for more information on this feature."
5888
#: bzrlib/errors.py:2603
6044
#: bzrlib/errors.py:2612
5890
6046
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5893
#: bzrlib/errors.py:2613
6049
#: bzrlib/errors.py:2622
5895
6051
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5898
#: bzrlib/errors.py:2623
6054
#: bzrlib/errors.py:2632
5899
6055
msgid "Invalid line in bugs property: '%(line)s'"
5902
#: bzrlib/errors.py:2631
6058
#: bzrlib/errors.py:2640
5903
6059
msgid "Invalid bug status: '%(status)s'"
5906
#: bzrlib/errors.py:2639
6062
#: bzrlib/errors.py:2648
5907
6063
msgid "Could not understand response from smart server: %(response_tuple)r"
5910
#: bzrlib/errors.py:2678
6066
#: bzrlib/errors.py:2687
5911
6067
msgid "Server sent an unexpected error: %(error_tuple)r"
5912
6068
msgstr "Der Server meldete einen unerwarteten Fehler: %(error_tuple)r"
5914
#: bzrlib/errors.py:2697
6070
#: bzrlib/errors.py:2706
5915
6071
msgid "Unrecognised container format: %(container_format)r"
5918
#: bzrlib/errors.py:2705
6074
#: bzrlib/errors.py:2714
5919
6075
msgid "Unexpected end of container stream"
5922
#: bzrlib/errors.py:2710
6078
#: bzrlib/errors.py:2719
5923
6079
msgid "Unknown record type: %(record_type)r"
5926
#: bzrlib/errors.py:2718
6082
#: bzrlib/errors.py:2727
5927
6083
msgid "Invalid record: %(reason)s"
5930
#: bzrlib/errors.py:2726
6086
#: bzrlib/errors.py:2735
5931
6087
msgid "Container has data after end marker: %(excess)r"
5934
#: bzrlib/errors.py:2734
6090
#: bzrlib/errors.py:2743
5935
6091
msgid "Container has multiple records with the same name: %(name)s"
5938
#: bzrlib/errors.py:2747
6094
#: bzrlib/errors.py:2756
5939
6095
msgid "Corrupt or incompatible data stream: %(reason)s"
5940
6096
msgstr "Fehlerhafter oder inkompatibler Datenstrom: %(reason)s"
5942
#: bzrlib/errors.py:2755
6098
#: bzrlib/errors.py:2764
5943
6099
msgid "SMTP error: %(error)s"
5944
6100
msgstr "SMTP-Fehler: %(error)s"
5946
#: bzrlib/errors.py:2763
6102
#: bzrlib/errors.py:2772
5947
6103
msgid "No message supplied."
5950
#: bzrlib/errors.py:2768
6106
#: bzrlib/errors.py:2777
5951
6107
msgid "No mail-to address (--mail-to) or output (-o) specified."
5954
#: bzrlib/errors.py:2773
5955
msgid "Unknown mail client: %(mail_client)s"
5958
#: bzrlib/errors.py:2781
6110
#: bzrlib/errors.py:2782
5960
6112
"Unable to find mail client with the following names: "
5961
6113
"%(mail_command_list_string)s"
5964
#: bzrlib/errors.py:2791
6116
#: bzrlib/errors.py:2792
5965
6117
msgid "SMTP connection to %(host)s refused"
5966
6118
msgstr "SMTP-Verbindung zu %(host)s wurde abgelehnt"
5968
#: bzrlib/errors.py:2800
6120
#: bzrlib/errors.py:2801
5969
6121
msgid "Please specify smtp_server. No server at default %(host)s."
5972
#: bzrlib/errors.py:2814
6124
#: bzrlib/errors.py:2815
5974
6126
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5978
#: bzrlib/errors.py:2826
6130
#: bzrlib/errors.py:2827
5979
6131
msgid "'%(display_url)s' is already a branch."
5980
6132
msgstr "»%(display_url)s« ist bereits ein Zweig."
5982
#: bzrlib/errors.py:2831
6134
#: bzrlib/errors.py:2832
5983
6135
msgid "'%(display_url)s' is already a tree."
5986
#: bzrlib/errors.py:2836
6138
#: bzrlib/errors.py:2837
5987
6139
msgid "'%(display_url)s' is already a checkout."
5990
#: bzrlib/errors.py:2841
6142
#: bzrlib/errors.py:2842
5991
6143
msgid "'%(display_url)s' is already a lightweight checkout."
5994
#: bzrlib/errors.py:2846
6146
#: bzrlib/errors.py:2847
5995
6147
msgid "'%(display_url)s' is already using a shared repository."
5998
#: bzrlib/errors.py:2851
6150
#: bzrlib/errors.py:2852
5999
6151
msgid "'%(display_url)s' is already standalone."
6002
#: bzrlib/errors.py:2856
6154
#: bzrlib/errors.py:2857
6003
6155
msgid "Shared repository '%(display_url)s' already creates working trees."
6006
#: bzrlib/errors.py:2862
6158
#: bzrlib/errors.py:2863
6008
6160
"Shared repository '%(display_url)s' already doesn't create working trees."
6011
#: bzrlib/errors.py:2868
6163
#: bzrlib/errors.py:2869
6012
6164
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6015
#: bzrlib/errors.py:2873
6167
#: bzrlib/errors.py:2874
6016
6168
msgid "No location could be found to bind to at %(display_url)s."
6019
#: bzrlib/errors.py:2878
6021
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6025
#: bzrlib/errors.py:2897
6027
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6031
#: bzrlib/errors.py:2903
6171
#: bzrlib/errors.py:2879
6173
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6177
#: bzrlib/errors.py:2898
6179
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6183
#: bzrlib/errors.py:2904
6032
6184
msgid "Variable {%(name)s} is not available."
6033
6185
msgstr "Variable {%(name)s} steht nicht zur Verfügung."
6035
#: bzrlib/errors.py:2911
6187
#: bzrlib/errors.py:2912
6036
6188
msgid "No template specified."
6039
#: bzrlib/errors.py:2916
6191
#: bzrlib/errors.py:2917
6040
6192
msgid "Unable to create symlink %(path_str)son this platform"
6043
#: bzrlib/errors.py:2931
6195
#: bzrlib/errors.py:2932
6045
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6197
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6198
"\"original\", \"local\"."
6048
6200
"Ungültiges Zeitzonenformat »%(timezone)s«, die Optionen sind »utc«, "
6049
6201
"»original« und »local«."
6051
#: bzrlib/errors.py:2965
6203
#: bzrlib/errors.py:2966
6053
6205
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6056
#: bzrlib/errors.py:2977
6208
#: bzrlib/errors.py:2978
6057
6209
msgid "The \"%(config_id)s\" configuration does not exist."
6058
6210
msgstr "Die Konfiguration »%(config_id)s« existiert nicht."
6060
#: bzrlib/errors.py:2985
6212
#: bzrlib/errors.py:2986
6061
6213
msgid "The \"%(option_name)s\" configuration option does not exist."
6062
6214
msgstr "Die Konfigurationsoption »%(option_name)s« existiert nicht."
6064
#: bzrlib/errors.py:2993
6216
#: bzrlib/errors.py:2994
6065
6217
msgid "The alias \"%(alias_name)s\" does not exist."
6066
6218
msgstr "Der Alias »%(alias_name)s« existiert nicht."
6068
#: bzrlib/errors.py:3007
6220
#: bzrlib/errors.py:3008
6069
6221
msgid "\"%(alias_name)s\" is not a valid location alias."
6072
#: bzrlib/errors.py:3015
6224
#: bzrlib/errors.py:3016
6073
6225
msgid "No %(alias_name)s location assigned."
6076
#: bzrlib/errors.py:3023
6228
#: bzrlib/errors.py:3024
6077
6229
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6080
#: bzrlib/errors.py:3033
6232
#: bzrlib/errors.py:3034
6081
6233
msgid "Unknown rules detected: %(unknowns_str)s."
6082
6234
msgstr "Unbekannte Regeln festgestellt: %(unknowns_str)s."
6084
#: bzrlib/errors.py:3044
6236
#: bzrlib/errors.py:3045
6085
6237
msgid "Tip change rejected: %(msg)s"
6088
#: bzrlib/errors.py:3052
6240
#: bzrlib/errors.py:3053
6089
6241
msgid "Shelf corrupt."
6092
#: bzrlib/errors.py:3057
6244
#: bzrlib/errors.py:3058
6093
6245
msgid "Corruption while decompressing repository file%(orig_error)s"
6096
#: bzrlib/errors.py:3069
6248
#: bzrlib/errors.py:3070
6097
6249
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6100
#: bzrlib/errors.py:3077
6252
#: bzrlib/errors.py:3078
6101
6253
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6104
#: bzrlib/errors.py:3085
6105
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6256
#: bzrlib/errors.py:3086
6258
"An attempt to access a url outside the server jail was made: '%(url)s'."
6108
#: bzrlib/errors.py:3093
6261
#: bzrlib/errors.py:3094
6109
6262
msgid "The user aborted the operation."
6110
6263
msgstr "Der Vorgang wurde vom Benutzer abgebrochen."
6112
#: bzrlib/errors.py:3098
6265
#: bzrlib/errors.py:3099
6113
6266
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6116
#: bzrlib/errors.py:3108
6269
#: bzrlib/errors.py:3109
6117
6270
msgid "No such view: %(view_name)s."
6120
#: bzrlib/errors.py:3118
6273
#: bzrlib/errors.py:3119
6122
6275
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6123
6276
"to a later format."
6126
#: bzrlib/errors.py:3127
6279
#: bzrlib/errors.py:3128
6128
6281
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6131
#: bzrlib/errors.py:3194
6284
#: bzrlib/errors.py:3195
6132
6285
msgid "%(bzrdir)r does not support co-located branches."
6135
#: bzrlib/errors.py:3200
6288
#: bzrlib/errors.py:3201
6137
6290
"Unable to determine your name.\n"
6138
6291
"Please, set your name with the 'whoami' command.\n"
6139
6292
"E.g. bzr whoami \"Your Name <name@example.com>\""
6142
#: bzrlib/errors.py:3209
6295
#: bzrlib/errors.py:3210
6143
6296
msgid "Invalid pattern(s) found. %(msg)s"
6144
6297
msgstr "Ungültige(s) Muster gefunden. %(msg)s"
6146
#: bzrlib/errors.py:3217
6299
#: bzrlib/errors.py:3218
6148
6301
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6149
6302
"unbind` to fix."
6152
#: bzrlib/errors.py:3228
6305
#: bzrlib/errors.py:3229
6153
6306
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6156
#: bzrlib/errors.py:3237
6309
#: bzrlib/errors.py:3238
6157
6310
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6160
#: bzrlib/errors.py:3246
6313
#: bzrlib/errors.py:3247
6162
6315
"No compatible object available for operations from %(source)r to %(target)r."
6165
#: bzrlib/errors.py:3256
6318
#: bzrlib/errors.py:3257
6167
6320
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6168
6321
"%(arguments)s."
6171
#: bzrlib/errors.py:3266
6324
#: bzrlib/errors.py:3267
6173
6326
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6174
6327
"format %(format)r"
6177
#: bzrlib/errors.py:3278
6330
#: bzrlib/errors.py:3279
6179
6332
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6627
6784
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6628
6785
" --project fooproject"
6630
#: bzrlib/plugins/launchpad/__init__.py:106
6787
#: bzrlib/plugins/launchpad/cmds.py:69
6631
6788
msgid "Launchpad project short name to associate with the branch."
6632
6789
msgstr "Launchpad-Projekt-Kurzname, dem der Zweig zugeordnet wird."
6634
#: bzrlib/plugins/launchpad/__init__.py:113
6791
#: bzrlib/plugins/launchpad/cmds.py:76
6636
6793
"Short name for the branch; by default taken from the last component of the "
6640
#: bzrlib/plugins/launchpad/__init__.py:117
6797
#: bzrlib/plugins/launchpad/cmds.py:80
6641
6798
msgid "One-sentence description of the branch."
6642
6799
msgstr "Beschreibung des Zweiges in einem Satz."
6644
#: bzrlib/plugins/launchpad/__init__.py:120
6801
#: bzrlib/plugins/launchpad/cmds.py:83
6645
6802
msgid "Longer description of the purpose or contents of the branch."
6646
6803
msgstr "Längere Beschreibung für den Zweck oder die Inhalte des Zweiges."
6648
#: bzrlib/plugins/launchpad/__init__.py:123
6805
#: bzrlib/plugins/launchpad/cmds.py:86
6649
6806
msgid "Branch author's email address, if not yourself."
6650
6807
msgstr "E-Mail-Adresse des Autors des Zweigs, wenn Sie es nicht selbst sind."
6652
#: bzrlib/plugins/launchpad/__init__.py:126
6809
#: bzrlib/plugins/launchpad/cmds.py:89
6653
6810
msgid "The bug this branch fixes."
6654
6811
msgstr "Der Fehler, den dieser Zweig behebt."
6656
#: bzrlib/plugins/launchpad/__init__.py:129
6813
#: bzrlib/plugins/launchpad/cmds.py:92
6657
6814
msgid "Prepare the request but don't actually send it."
6658
6815
msgstr "Die Anfrage vorbereiten, aber nicht absenden."
6660
#: bzrlib/plugins/launchpad/__init__.py:151
6817
#: bzrlib/plugins/launchpad/cmds.py:114
6662
6819
"register-branch requires a public branch url - see bzr help register-branch."
6665
#: bzrlib/plugins/launchpad/__init__.py:159
6822
#: bzrlib/plugins/launchpad/cmds.py:122
6666
6823
msgid "--product is deprecated; please use --project."
6667
6824
msgstr "--product ist veraltet; bitte --project benutzen."
6669
#: bzrlib/plugins/launchpad/__init__.py:191
6826
#: bzrlib/plugins/launchpad/cmds.py:152
6670
6827
msgid "Open a Launchpad branch page in your web browser."
6671
6828
msgstr "Eine Launchpad-Zweig-Seite in Ihrem Web-Browser öffnen."
6673
#: bzrlib/plugins/launchpad/__init__.py:196
6830
#: bzrlib/plugins/launchpad/cmds.py:157
6674
6831
msgid "Do not actually open the browser. Just say the URL we would use."
6677
#: bzrlib/plugins/launchpad/__init__.py:231
6834
#: bzrlib/plugins/launchpad/cmds.py:192
6678
6835
#, python-format
6679
6836
msgid "Opening %s in web browser"
6680
6837
msgstr "%s wird im Web-Browser geöffnet"
6682
#: bzrlib/plugins/launchpad/__init__.py:241
6839
#: bzrlib/plugins/launchpad/cmds.py:200
6683
6840
msgid "Show or set the Launchpad user ID."
6684
6841
msgstr "Den Launchpad-Benutzernamen anzeigen oder festlegen."
6686
#: bzrlib/plugins/launchpad/__init__.py:243
6843
#: bzrlib/plugins/launchpad/cmds.py:202
6688
6845
"When communicating with Launchpad, some commands need to know your\n"
6689
6846
"Launchpad user ID. This command can be used to set or show the\n"
6690
6847
"user ID that Bazaar will use for such communication."
6693
#: bzrlib/plugins/launchpad/__init__.py:247
6850
#: bzrlib/plugins/launchpad/cmds.py:206
6696
6853
" Show the Launchpad ID of the current user::"
6699
#: bzrlib/plugins/launchpad/__init__.py:250
6856
#: bzrlib/plugins/launchpad/cmds.py:209
6700
6857
msgid " bzr launchpad-login"
6701
6858
msgstr " bzr launchpad-login"
6703
#: bzrlib/plugins/launchpad/__init__.py:252
6860
#: bzrlib/plugins/launchpad/cmds.py:211
6704
6861
msgid " Set the Launchpad ID of the current user to 'bob'::"
6707
#: bzrlib/plugins/launchpad/__init__.py:254
6864
#: bzrlib/plugins/launchpad/cmds.py:213
6708
6865
msgid " bzr launchpad-login bob"
6709
6866
msgstr " bzr launchpad-login bob"
6711
#: bzrlib/plugins/launchpad/__init__.py:261
6868
#: bzrlib/plugins/launchpad/cmds.py:220
6712
6869
msgid "Don't check that the user name is valid."
6713
6870
msgstr "Den Benutzernamen nicht auf Gültigkeit prüfen."
6715
#: bzrlib/plugins/launchpad/__init__.py:276
6716
#: bzrlib/plugins/launchpad/__init__.py:287
6872
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6717
6873
msgid "Launchpad user ID exists and has SSH keys.\n"
6718
6874
msgstr "Launchpad-Benutzername existiert und hat SSH-Schlüssel.\n"
6720
#: bzrlib/plugins/launchpad/__init__.py:279
6876
#: bzrlib/plugins/launchpad/cmds.py:238
6721
6877
msgid "No Launchpad user ID configured.\n"
6722
6878
msgstr "Kein Launchpad-Benutzername konfiguriert.\n"
6724
#: bzrlib/plugins/launchpad/__init__.py:290
6880
#: bzrlib/plugins/launchpad/cmds.py:249
6725
6881
#, python-format
6726
6882
msgid "Launchpad user ID set to '%s'.\n"
6727
6883
msgstr "Launchpad-Benutzername auf »%s« festgelegt.\n"
6729
#: bzrlib/plugins/launchpad/__init__.py:298
6885
#: bzrlib/plugins/launchpad/cmds.py:255
6730
6886
msgid "Ask Launchpad to mirror a branch now."
6731
6887
msgstr "Launchpad jetzt darum bitten, einen Zweig zu spiegeln."
6733
#: bzrlib/plugins/launchpad/__init__.py:318
6889
#: bzrlib/plugins/launchpad/cmds.py:272
6734
6890
msgid "Propose merging a branch on Launchpad."
6737
#: bzrlib/plugins/launchpad/__init__.py:320
6893
#: bzrlib/plugins/launchpad/cmds.py:274
6739
6895
"This will open your usual editor to provide the initial comment. When it\n"
6740
6896
"has created the proposal, it will open it in your default web browser."
6743
#: bzrlib/plugins/launchpad/__init__.py:323
6899
#: bzrlib/plugins/launchpad/cmds.py:277
6745
6901
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6746
6902
"is not supplied, the remembered submit branch will be used. If no submit\n"
6747
6903
"branch is remembered, the development focus will be used."
6750
#: bzrlib/plugins/launchpad/__init__.py:327
6906
#: bzrlib/plugins/launchpad/cmds.py:281
6752
6908
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6753
6909
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6793
6953
"are opened in a web browser."
6796
#: bzrlib/plugins/launchpad/__init__.py:389
6956
#: bzrlib/plugins/launchpad/cmds.py:342
6798
6958
"Any revision involved in the merge may be specified-- the revision in\n"
6799
6959
"which the merge was performed, or one of the revisions that was merged."
6802
#: bzrlib/plugins/launchpad/__init__.py:392
6962
#: bzrlib/plugins/launchpad/cmds.py:345
6803
6963
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6806
#: bzrlib/plugins/launchpad/__init__.py:394
6966
#: bzrlib/plugins/launchpad/cmds.py:347
6807
6967
msgid " bzr lp-find-proposal -r annotate:README:1"
6810
#: bzrlib/plugins/launchpad/__init__.py:409
6970
#: bzrlib/plugins/launchpad/cmds.py:363
6811
6971
msgid "No review found."
6814
#: bzrlib/plugins/launchpad/__init__.py:410
6974
#: bzrlib/plugins/launchpad/cmds.py:364
6815
6975
#, python-format
6816
6976
msgid "%d proposals(s) found."
6819
#: bzrlib/plugins/launchpad/__init__.py:420
6979
#: bzrlib/plugins/launchpad/cmds.py:374
6820
6980
msgid "Finding revision-id"
6823
#: bzrlib/plugins/launchpad/__init__.py:427
6983
#: bzrlib/plugins/launchpad/cmds.py:381
6824
6984
msgid "Finding merge"
6827
#: bzrlib/plugins/launchpad/__init__.py:432
6987
#: bzrlib/plugins/launchpad/cmds.py:386
6828
6988
msgid "Finding revno"
6831
#: bzrlib/plugins/launchpad/__init__.py:437
6991
#: bzrlib/plugins/launchpad/cmds.py:392
6832
6992
msgid "Finding Launchpad branch"
6835
#: bzrlib/plugins/launchpad/__init__.py:440
6995
#: bzrlib/plugins/launchpad/cmds.py:395
6836
6996
msgid "Finding proposals"
6839
#: bzrlib/plugins/launchpad/account.py:66
6840
msgid "Setting ssh/sftp usernames for launchpad.net."
6841
msgstr "SSH/SFTP-Benutzernamen für launchpad.net festlegen."
6843
6999
#: bzrlib/plugins/launchpad/lp_api.py:241
6844
7000
#: bzrlib/plugins/launchpad/lp_api.py:246
6845
7001
#, python-format
6886
#: bzrlib/plugins/launchpad/lp_propose.py:149
7042
#: bzrlib/plugins/launchpad/lp_propose.py:150
6887
7043
#, python-format
6888
7044
msgid "There is already a branch merge proposal: %s"
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7047
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6892
7048
msgid "pb parameter to convert() is deprecated"
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7051
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6896
7052
msgid "starting upgrade from format 4 to 5"
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7055
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6900
7056
msgid "note: upgrade may be faster if all store files are ungzipped first"
6903
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7059
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6904
7060
msgid "converting revision"
6905
7061
msgstr "Revision umwandeln"
6907
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7063
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6908
7064
msgid "upgraded to weaves:"
6911
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7067
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6912
7068
#, python-format
6913
7069
msgid "%6d revisions and inventories"
6916
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7072
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6917
7073
#, python-format
6918
7074
msgid "%6d revisions not present"
6919
7075
msgstr "%6d Revisionen nicht vorhanden"
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7077
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6922
7078
#, python-format
6923
7079
msgid "%6d texts"
6924
7080
msgstr "%6d Texte"
6926
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7082
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6927
7083
msgid "writing weave"
6930
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6931
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7086
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7087
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6932
7088
msgid "inventory"
6935
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7091
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6936
7092
msgid "write revision"
6937
7093
msgstr "Revision schreiben"
6939
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7095
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6940
7096
msgid "loading revision"
6941
7097
msgstr "Revision laden"
6943
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7099
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6944
7100
#, python-format
6945
7101
msgid "revision {%s} not present in branch; will be converted as a ghost"
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7104
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6949
7105
msgid "starting upgrade from format 5 to 6"
6952
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7108
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6953
7109
#, python-format
6954
7110
msgid "adding prefixes to %s"
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7113
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6958
7114
msgid "starting upgrade from format 6 to metadir"
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7117
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6962
7118
msgid "Removing ancestry.weave"
6965
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7121
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6966
7122
msgid "Finding branch files"
6967
7123
msgstr "Dateien des Zweigs finden"
6969
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7125
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6970
7126
msgid "Upgrading repository"
6973
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7129
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6974
7130
msgid "Upgrading branch"
6977
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7133
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6978
7134
msgid "No working tree."
6981
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7137
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6982
7138
msgid "Upgrading working tree"
6985
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7141
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6986
7142
#, python-format
6987
7143
msgid "Make %s lock"
6990
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7146
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6991
7147
#, python-format
6992
7148
msgid "Moving %s"
6993
7149
msgstr "%s wird verschoben"
9952
10094
"of bzr that requires authentication (smtp for example)."
9955
#: en/help_topics/configuration.txt:379
10097
#: en/help_topics/configuration.txt:391
9957
10099
"The syntax of the file obeys the same rules as the others except for the\n"
9958
10100
"option policies which don't apply."
9961
#: en/help_topics/configuration.txt:382
10103
#: en/help_topics/configuration.txt:394
9963
10105
"For more information on the possible uses of the authentication "
9964
10106
"configuration\n"
9965
10107
"file see :doc:`authentication-help`."
9968
#: en/help_topics/configuration.txt:385
10110
#: en/help_topics/configuration.txt:397
9971
10113
"Common options\n"
9972
10114
"--------------"
9975
#: en/help_topics/configuration.txt:389
10117
#: en/help_topics/configuration.txt:401
9977
10119
"debug_flags\n"
9981
#: en/help_topics/configuration.txt:392
10123
#: en/help_topics/configuration.txt:404
9983
10125
"A comma-separated list of debugging options to turn on. The same values\n"
9984
10126
"can be used as with the -D command-line option (see `help global-options`).\n"
9985
10127
"For example::"
9988
#: en/help_topics/configuration.txt:396
10130
#: en/help_topics/configuration.txt:408
9989
10131
msgid " debug_flags = hpss"
9990
10132
msgstr " debug_flags = hpss"
9992
#: en/help_topics/configuration.txt:400
10134
#: en/help_topics/configuration.txt:412
9993
10135
msgid " debug_flags = hpss,evil"
9994
10136
msgstr " debug_flags = hpss,evil"
9996
#: en/help_topics/configuration.txt:402
10138
#: en/help_topics/configuration.txt:414
10002
#: en/help_topics/configuration.txt:405
10144
#: en/help_topics/configuration.txt:417
10004
10146
"The email address to use when committing a branch. Typically takes the form\n"
10008
#: en/help_topics/configuration.txt:408
10150
#: en/help_topics/configuration.txt:420
10009
10151
msgid " email = Full Name <account@hostname.tld>"
10012
#: en/help_topics/configuration.txt:410
10154
#: en/help_topics/configuration.txt:422
10018
#: en/help_topics/configuration.txt:413
10160
#: en/help_topics/configuration.txt:425
10020
10162
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10021
10163
"a commit message. This setting is trumped by the environment variable\n"
10109
10251
"to sign newly committed revisions, even if the branch requires signatures."
10112
#: en/help_topics/configuration.txt:462
10254
#: en/help_topics/configuration.txt:474
10114
10256
"dirstate.fdatasync\n"
10115
10257
"~~~~~~~~~~~~~~~~~~"
10118
#: en/help_topics/configuration.txt:465
10260
#: en/help_topics/configuration.txt:477
10120
10262
"If true (default), working tree metadata changes are flushed through the\n"
10121
10263
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10122
10264
"should not be lost if the machine crashes. See also repository.fdatasync."
10125
#: en/help_topics/configuration.txt:469
10267
#: en/help_topics/configuration.txt:481
10127
10269
"gpg_signing_key\n"
10128
10270
"~~~~~~~~~~~~~~~"
10131
#: en/help_topics/configuration.txt:472
10273
#: en/help_topics/configuration.txt:484
10133
10275
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10134
10276
"address, key fingerprint or full key ID. When unset or when set to\n"
10135
10277
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10138
#: en/help_topics/configuration.txt:476
10280
#: en/help_topics/configuration.txt:488
10144
#: en/help_topics/configuration.txt:479
10286
#: en/help_topics/configuration.txt:491
10146
10288
"Only useful in ``locations.conf``. Defines whether or not the\n"
10147
10289
"configuration for this section applies to subdirectories:"
10150
#: en/help_topics/configuration.txt:482
10292
#: en/help_topics/configuration.txt:494
10153
10295
" (default) This section applies to subdirectories as well."
10156
#: en/help_topics/configuration.txt:485
10298
#: en/help_topics/configuration.txt:497
10159
10301
" This section only applies to the branch at this directory and not\n"
10160
10302
" branches below it."
10163
#: en/help_topics/configuration.txt:489
10305
#: en/help_topics/configuration.txt:501
10165
10307
"gpg_signing_command\n"
10166
10308
"~~~~~~~~~~~~~~~~~~~"
10169
#: en/help_topics/configuration.txt:492
10311
#: en/help_topics/configuration.txt:504
10171
10313
"(Default: \"gpg\"). Which program should be used to sign and check "
10172
10314
"revisions.\n"
10173
10315
"For example::"
10176
#: en/help_topics/configuration.txt:495
10318
#: en/help_topics/configuration.txt:507
10177
10319
msgid " gpg_signing_command = /usr/bin/gnpg"
10180
#: en/help_topics/configuration.txt:497
10322
#: en/help_topics/configuration.txt:509
10182
10324
"The specified command must accept the options \"--clearsign\" and \"-u "
10186
#: en/help_topics/configuration.txt:499
10328
#: en/help_topics/configuration.txt:511
10188
10330
"bzr_remote_path\n"
10189
10331
"~~~~~~~~~~~~~~~"
10192
#: en/help_topics/configuration.txt:502
10334
#: en/help_topics/configuration.txt:514
10194
10336
"(Default: \"bzr\"). The path to the command that should be used to run the "
10196
10338
"server for bzr. This value may only be specified in locations.conf, because:"
10199
#: en/help_topics/configuration.txt:505
10341
#: en/help_topics/configuration.txt:517
10201
10343
"- it's needed before branch.conf is accessible\n"
10202
10344
"- allowing remote branch.conf files to specify commands would be a security\n"
10206
#: en/help_topics/configuration.txt:509
10348
#: en/help_topics/configuration.txt:521
10207
10349
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10210
#: en/help_topics/configuration.txt:511
10352
#: en/help_topics/configuration.txt:523
10212
10354
"smtp_server\n"
10213
10355
"~~~~~~~~~~~"
10216
#: en/help_topics/configuration.txt:514
10358
#: en/help_topics/configuration.txt:526
10218
10360
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10219
10361
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10222
#: en/help_topics/configuration.txt:517
10364
#: en/help_topics/configuration.txt:529
10224
10366
"smtp_username, smtp_password\n"
10225
10367
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10228
#: en/help_topics/configuration.txt:520
10370
#: en/help_topics/configuration.txt:532
10230
10372
"User and password to authenticate to the SMTP server. If smtp_username\n"
10231
10373
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10434
10576
"--remember``."
10437
#: en/help_topics/configuration.txt:634
10579
#: en/help_topics/configuration.txt:646
10439
10581
"push_location\n"
10440
10582
"~~~~~~~~~~~~~"
10443
#: en/help_topics/configuration.txt:637
10585
#: en/help_topics/configuration.txt:649
10445
10587
"If present, the location of the default branch for push. This option\n"
10446
10588
"is normally set by the first ``push`` or ``push --remember``."
10449
#: en/help_topics/configuration.txt:640
10591
#: en/help_topics/configuration.txt:652
10451
10593
"push_strict\n"
10452
10594
"~~~~~~~~~~~"
10455
#: en/help_topics/configuration.txt:643
10597
#: en/help_topics/configuration.txt:655
10457
10599
"If present, defines the ``--strict`` option default value for checking\n"
10458
10600
"uncommitted changes before pushing."
10461
#: en/help_topics/configuration.txt:646
10603
#: en/help_topics/configuration.txt:658
10463
10605
"dpush_strict\n"
10464
10606
"~~~~~~~~~~~~"
10467
#: en/help_topics/configuration.txt:649
10609
#: en/help_topics/configuration.txt:661
10469
10611
"If present, defines the ``--strict`` option default value for checking\n"
10470
10612
"uncommitted changes before pushing into a different VCS without any\n"
10471
10613
"custom bzr metadata."
10474
#: en/help_topics/configuration.txt:653
10616
#: en/help_topics/configuration.txt:665
10476
10618
"bound_location\n"
10477
10619
"~~~~~~~~~~~~~~"
10480
#: en/help_topics/configuration.txt:656
10622
#: en/help_topics/configuration.txt:668
10482
10624
"The location that commits should go to when acting as a checkout.\n"
10483
10625
"This option is normally set by ``bind``."
10486
#: en/help_topics/configuration.txt:659
10628
#: en/help_topics/configuration.txt:671
10492
#: en/help_topics/configuration.txt:662
10634
#: en/help_topics/configuration.txt:674
10494
10636
"If set to \"True\", the branch should act as a checkout, and push each "
10495
10637
"commit to\n"
10496
10638
"the bound_location. This option is normally set by ``bind``/``unbind``."
10499
#: en/help_topics/configuration.txt:665
10641
#: en/help_topics/configuration.txt:677
10501
10643
"send_strict\n"
10502
10644
"~~~~~~~~~~~"
10505
#: en/help_topics/configuration.txt:668
10647
#: en/help_topics/configuration.txt:680
10507
10649
"If present, defines the ``--strict`` option default value for checking\n"
10508
10650
"uncommitted changes before sending a merge directive."
10511
#: en/help_topics/configuration.txt:671
10653
#: en/help_topics/configuration.txt:683
10513
10655
"add.maximum_file_size\n"
10514
10656
"~~~~~~~~~~~~~~~~~~~~~"
10517
#: en/help_topics/configuration.txt:674
10659
#: en/help_topics/configuration.txt:686
10519
10661
"Defines the maximum file size the command line \"add\" operation will allow\n"
10520
"in recursive mode, with files larger than this value being skipped. You "
10522
"specify this value as an integer (in which case it is interpreted as "
10662
"in recursive mode, with files larger than this value being skipped. You may "
10664
"specify this value as an integer (in which case it is interpreted as bytes), "
10524
10666
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10526
10668
"will disable skipping."
10529
#: en/help_topics/configuration.txt:680
10671
#: en/help_topics/configuration.txt:692
10531
10673
"External Merge Tools\n"
10532
10674
"--------------------"
10535
#: en/help_topics/configuration.txt:683
10677
#: en/help_topics/configuration.txt:695
10537
10679
"bzr.mergetool.<name>\n"
10538
10680
"~~~~~~~~~~~~~~~~~~~~"
10541
#: en/help_topics/configuration.txt:686
10683
#: en/help_topics/configuration.txt:698
10543
10685
"Defines an external merge tool called <name> with the given command-line.\n"
10544
10686
"Arguments containing spaces should be quoted using single or double quotes. "
12140
12311
"set of command names."
12143
#: en/help_topics/hooks.txt:212
12314
#: en/help_topics/hooks.txt:201
12320
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12321
msgid "Introduced in: 2.6"
12324
#: en/help_topics/hooks.txt:206
12325
msgid "Called after executing a command. Called with the command object."
12328
#: en/help_topics/hooks.txt:208
12334
#: en/help_topics/hooks.txt:213
12335
msgid "Called prior to executing a command. Called with the command object."
12338
#: en/help_topics/hooks.txt:215
12145
12340
"_ConfigHooks\n"
12146
12341
"------------"
12149
#: en/help_topics/hooks.txt:215
12344
#: en/help_topics/hooks.txt:218
12155
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12156
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12157
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12158
#: en/help_topics/hooks.txt:443
12350
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12351
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12352
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12353
#: en/help_topics/hooks.txt:446
12159
12354
msgid "Introduced in: 2.4"
12160
12355
msgstr "Eingeführt in: 2.4"
12162
#: en/help_topics/hooks.txt:220
12357
#: en/help_topics/hooks.txt:223
12164
12359
"Invoked when a config option is read. The signature is (stack, name,\n"
12168
#: en/help_topics/hooks.txt:223
12363
#: en/help_topics/hooks.txt:226
12174
#: en/help_topics/hooks.txt:228
12369
#: en/help_topics/hooks.txt:231
12175
12370
msgid "Invoked when a config store is loaded. The signature is (store)."
12178
#: en/help_topics/hooks.txt:230
12373
#: en/help_topics/hooks.txt:233
12184
#: en/help_topics/hooks.txt:235
12379
#: en/help_topics/hooks.txt:238
12186
12381
"Invoked when a config option is removed. The signature is (stack,\n"
12190
#: en/help_topics/hooks.txt:238
12385
#: en/help_topics/hooks.txt:241
12196
#: en/help_topics/hooks.txt:243
12391
#: en/help_topics/hooks.txt:246
12197
12392
msgid "Invoked when a config store is saved. The signature is (store)."
12200
#: en/help_topics/hooks.txt:245
12395
#: en/help_topics/hooks.txt:248
12206
#: en/help_topics/hooks.txt:250
12401
#: en/help_topics/hooks.txt:253
12208
12403
"Invoked when a config option is set. The signature is (stack, name,\n"
12212
#: en/help_topics/hooks.txt:253
12407
#: en/help_topics/hooks.txt:256
12214
12409
"ControlDirHooks\n"
12215
12410
"---------------"
12218
#: en/help_topics/hooks.txt:256
12413
#: en/help_topics/hooks.txt:259
12220
12415
"post_repo_init\n"
12221
12416
"~~~~~~~~~~~~~~"
12224
#: en/help_topics/hooks.txt:261
12419
#: en/help_topics/hooks.txt:264
12226
12421
"Invoked after a repository has been initialized. post_repo_init is\n"
12227
12422
"called with a bzrlib.controldir.RepoInitHookParams."
12230
#: en/help_topics/hooks.txt:264
12425
#: en/help_topics/hooks.txt:267
12236
#: en/help_topics/hooks.txt:267
12431
#: en/help_topics/hooks.txt:270
12237
12432
msgid "Introduced in: 1.14"
12238
12433
msgstr "Eingeführt in: 1.14"
12240
#: en/help_topics/hooks.txt:269
12435
#: en/help_topics/hooks.txt:272
12242
12437
"Invoked before attempting to open a ControlDir with the transport that\n"
12243
12438
"the open will use."
12246
#: en/help_topics/hooks.txt:272
12441
#: en/help_topics/hooks.txt:275
12248
12443
"InfoHooks\n"
12252
#: en/help_topics/hooks.txt:275
12447
#: en/help_topics/hooks.txt:278
12254
12449
"repository\n"
12258
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12259
#: en/help_topics/hooks.txt:521
12453
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12454
#: en/help_topics/hooks.txt:524
12260
12455
msgid "Introduced in: 1.15"
12261
12456
msgstr "Eingeführt in: 1.15"
12263
#: en/help_topics/hooks.txt:280
12458
#: en/help_topics/hooks.txt:283
12265
12460
"Invoked when displaying the statistics for a repository. repository is\n"
12266
12461
"called with a statistics dictionary as returned by the repository and\n"
12267
12462
"a file-like object to write to."
12270
#: en/help_topics/hooks.txt:284
12465
#: en/help_topics/hooks.txt:287
12272
12467
"LockHooks\n"
12276
#: en/help_topics/hooks.txt:287
12471
#: en/help_topics/hooks.txt:290
12278
12473
"lock_acquired\n"
12279
12474
"~~~~~~~~~~~~~"
12282
#: en/help_topics/hooks.txt:292
12283
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12477
#: en/help_topics/hooks.txt:295
12479
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12286
#: en/help_topics/hooks.txt:294
12482
#: en/help_topics/hooks.txt:297
12288
12484
"lock_broken\n"
12289
12485
"~~~~~~~~~~~"
12292
#: en/help_topics/hooks.txt:299
12488
#: en/help_topics/hooks.txt:302
12293
12489
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12296
#: en/help_topics/hooks.txt:301
12492
#: en/help_topics/hooks.txt:304
12298
12494
"lock_released\n"
12299
12495
"~~~~~~~~~~~~~"
12302
#: en/help_topics/hooks.txt:306
12303
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12498
#: en/help_topics/hooks.txt:309
12500
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12306
#: en/help_topics/hooks.txt:308
12503
#: en/help_topics/hooks.txt:311
12308
12505
"MergeHooks\n"
12312
#: en/help_topics/hooks.txt:311
12509
#: en/help_topics/hooks.txt:314
12314
12511
"merge_file_content\n"
12315
12512
"~~~~~~~~~~~~~~~~~~"
12318
#: en/help_topics/hooks.txt:314
12515
#: en/help_topics/hooks.txt:317
12319
12516
msgid "Introduced in: 2.1"
12322
#: en/help_topics/hooks.txt:316
12519
#: en/help_topics/hooks.txt:319
12324
12521
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12325
12522
"object when starting a merge. Should return either None or a subclass\n"
12329
12526
"AbstractPerFileMerger API docs for details on how it is used by merge."
12332
#: en/help_topics/hooks.txt:323
12529
#: en/help_topics/hooks.txt:326
12334
12531
"post_merge\n"
12338
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12339
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12340
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12535
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12536
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12537
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12341
12538
msgid "Introduced in: 2.5"
12344
#: en/help_topics/hooks.txt:328
12541
#: en/help_topics/hooks.txt:331
12346
12543
"Called after a merge. Receives a Merger object as the single argument.\n"
12347
12544
"The return value is ignored."
12350
#: en/help_topics/hooks.txt:331
12547
#: en/help_topics/hooks.txt:334
12352
12549
"pre_merge\n"
12356
#: en/help_topics/hooks.txt:336
12553
#: en/help_topics/hooks.txt:339
12358
12555
"Called before a merge. Receives a Merger object as the single\n"
12362
#: en/help_topics/hooks.txt:339
12559
#: en/help_topics/hooks.txt:342
12364
12561
"MergeDirectiveHooks\n"
12365
12562
"-------------------"
12368
#: en/help_topics/hooks.txt:342
12565
#: en/help_topics/hooks.txt:345
12370
12567
"merge_request_body\n"
12371
12568
"~~~~~~~~~~~~~~~~~~"
12374
#: en/help_topics/hooks.txt:345
12571
#: en/help_topics/hooks.txt:348
12375
12572
msgid "Introduced in: 1.15.0"
12378
#: en/help_topics/hooks.txt:347
12575
#: en/help_topics/hooks.txt:350
12380
12577
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12381
12578
"request. Callbacks must return a body. If more than one callback is\n"
12382
12579
"registered, the output of one callback is provided to the next."
12385
#: en/help_topics/hooks.txt:351
12582
#: en/help_topics/hooks.txt:354
12387
12584
"MessageEditorHooks\n"
12388
12585
"------------------"
12391
#: en/help_topics/hooks.txt:354
12588
#: en/help_topics/hooks.txt:357
12393
12590
"commit_message_template\n"
12394
12591
"~~~~~~~~~~~~~~~~~~~~~~~"
12397
#: en/help_topics/hooks.txt:357
12594
#: en/help_topics/hooks.txt:360
12398
12595
msgid "Introduced in: 1.10"
12401
#: en/help_topics/hooks.txt:359
12598
#: en/help_topics/hooks.txt:362
12403
12600
"Called when a commit message is being generated.\n"
12404
12601
"commit_message_template is called with the bzrlib.commit.Commit object\n"