1
# German translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
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"
13
"Language-Team: German <de@li.org>\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
"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"
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr "Überspringe {0} (Größer als {1} von {2} Bytes)"
26
#: bzrlib/branch.py:872
30
#: bzrlib/branch.py:3205
32
msgid "Pushed up to revision %d."
33
msgstr "In Revision %d hochgeladen."
35
#: bzrlib/branch.py:3207
37
msgid "%d tag updated."
38
msgid_plural "%d tags updated."
39
msgstr[0] "%d Schlüsselwort aktualisiert."
40
msgstr[1] "%d Schlüsselwörter aktualisiert."
42
#: bzrlib/branch.py:3210
43
msgid "No new revisions or tags to push."
44
msgstr "Keine neuen Revisionen oder Schlüsselwörter zum Hochladen."
46
#: bzrlib/branch.py:3212
47
msgid "No new revisions to push."
48
msgstr "Keine neuen Revisionen zum Hochladen."
50
#: bzrlib/branch.py:3232
51
msgid "checked branch {0} format {1}"
52
msgstr "überprüfter Zweig {0} Format {1}"
54
#: bzrlib/branch.py:3235
56
msgid "found error:%s"
57
msgstr "Fehler gefunden: %s"
59
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
61
msgid "Ignoring files outside view. View is %s"
62
msgstr "Ignoriere Dateien außerhalb der Ansicht. Die Ansicht ist %s"
64
#: bzrlib/builtins.py:218
66
msgid "bzr %s --revision takes exactly one revision identifier"
67
msgstr "bzr %s --revision benötigt genau eine Revisions-Nummer"
69
#: bzrlib/builtins.py:303
70
msgid "Display status summary."
71
msgstr "Zeige Status-Zusammenfassung an."
73
#: bzrlib/builtins.py:305
75
"This reports on versioned and unknown files, reporting them\n"
76
"grouped by state. Possible states are:"
78
"Dies zeigt versionierte und unbekannte Dateien an –\n"
79
"nach Zuständen gruppiert. Mögliche Zustände:"
81
#: bzrlib/builtins.py:308
84
" Versioned in the working copy but not in the previous revision."
87
" In der Arbeitskopie versioniert, jedoch nicht in der vorherigen Revision."
89
#: bzrlib/builtins.py:311
92
" Versioned in the previous revision but removed or deleted\n"
93
" in the working copy."
96
" In der vorherigen Revision versioniert, jedoch entfernt oder aus der\n"
97
" Arbeitskopie gelöscht."
99
#: bzrlib/builtins.py:315
102
" Path of this file changed from the previous revision;\n"
103
" the text may also have changed. This includes files whose\n"
104
" parent directory was renamed."
107
#: bzrlib/builtins.py:320
110
" Text has changed since the previous revision."
113
#: bzrlib/builtins.py:323
116
" File kind has been changed (e.g. from file to directory)."
118
"Dateiart wurde geändert\n"
119
" Dateiart hat sich geändert (z.B. von Datei zu Verzeichnis)"
121
#: bzrlib/builtins.py:326
124
" Not versioned and not matching an ignore pattern."
127
" Nicht versioniert und stimmt nicht mit einem Ignorierungsmuster überein."
129
#: bzrlib/builtins.py:329
131
"Additionally for directories, symlinks and files with a changed\n"
132
"executable bit, Bazaar indicates their type using a trailing\n"
133
"character: '/', '@' or '*' respectively. These decorations can be\n"
134
"disabled using the '--no-classify' option."
136
"Für Verzeichnisse, Symbolische Verweise sowie Dateien\n"
137
"mit veränderter Ausführungsberechtigung zeigt Bazaar\n"
138
"den Typ zusätzlich durch ein angehängtes Zeichen\n"
139
"»/«, »@« oder »*« an. Diese Kennzeichnung kann mit der Option\n"
140
"»--no-classify« unterbunden werden."
142
#: bzrlib/builtins.py:334
144
"To see ignored files use 'bzr ignored'. For details on the\n"
145
"changes to file texts, use 'bzr diff'."
147
"Mit »bzr ignored« werden ignorierte Dateien aufgelistet.\n"
148
"Änderungen an den Dateiinhalten werden mit »bzr diff« angezeigt."
150
#: bzrlib/builtins.py:337
152
"Note that --short or -S gives status flags for each item, similar\n"
153
"to Subversion's status command. To get output similar to svn -q,\n"
154
"use bzr status -SV."
156
"Beachten Sie, dass --short oder -S für jedes Element eine\n"
157
"Statusmarkierung anzeigt, ähnlich des Statusbefehls von\n"
158
"Subversion. Um eine mit svn -q vergleichbare Ausgabe zu\n"
159
"erhalten, verwenden Sie bzr status -SV."
161
#: bzrlib/builtins.py:341
163
"If no arguments are specified, the status of the entire working\n"
164
"directory is shown. Otherwise, only the status of the specified\n"
165
"files or directories is reported. If a directory is given, status\n"
166
"is reported for everything inside that directory."
168
"Wenn keine Argumente angegeben wurden, wird der Status des\n"
169
"gesamten Arbeitsverzeichnisses angezeigt, andernfalls nur der\n"
170
"Status der angegebenen Dateien und Verzeichnisse. Wenn ein\n"
171
"Verzeichnis angegeben wurde, wird der Status aller darin\n"
172
"enthaltenen Elemente aufgelistet."
174
#: bzrlib/builtins.py:346
176
"Before merges are committed, the pending merge tip revisions are\n"
177
"shown. To see all pending merge revisions, use the -v option.\n"
178
"To skip the display of pending merge information altogether, use\n"
179
"the no-pending option or specify a file/directory."
181
"Bevor Änderungen übertragen werden, wird für jede ausstehende\n"
182
"Zusammenführung die neueste Revision angezeigt. Mit der Option\n"
183
"-v werden alle ausstehenden Revisionen angezeigt. Um die\n"
184
"Informationen über ausstehende Zusammenführungen komplett\n"
185
"zu unterdrücken kann die Option no-pending verwendet oder\n"
186
"eine Datei oder ein Verzeichnis angegeben werden."
188
#: bzrlib/builtins.py:351
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
193
"Um das Arbeitsverzeichnis mit einer bestimmten Revision zu vergleichen,\n"
194
"geben Sie eine einzelne Revision mit dem Argument \"revision\" an."
196
#: bzrlib/builtins.py:354
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
202
"Um zu sehen, welche Dateien in einer bestimmten Revision\n"
203
"oder zwischen zwei Revisionen verändert wurden,\n"
204
"geben Sie einen Revisionebereich mit dem Argument \"revision\" an.\n"
205
"Dies erzeugt das gleiche Ergebnis wie der Aufruf 'bzr diff --summarize'."
207
#: bzrlib/builtins.py:363
208
msgid "Use short status indicators."
209
msgstr "Kurze Zustandsanzeiger verwenden."
211
#: bzrlib/builtins.py:365
212
msgid "Only show versioned files."
213
msgstr "Nur versionierte Dateien anzeigen."
215
#: bzrlib/builtins.py:367
216
msgid "Don't show pending merges."
217
msgstr "Ausstehende Zusammenführungen nicht anzeigen."
219
#: bzrlib/builtins.py:370
220
msgid "Do not mark object type using indicator."
221
msgstr "Objekte nicht entsprechend ihres Typs kennzeichnen."
223
#: bzrlib/builtins.py:385
224
msgid "bzr status --revision takes exactly one or two revision specifiers"
226
"bzr status --revision benötigt exakt eine oder zwei Revisionsspezifikation"
229
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
230
msgid "You can only supply one of revision_id or --revision"
231
msgstr "Sie können nur revision_id oder --revision angeben"
233
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
234
msgid "You must supply either --revision or a revision_id"
235
msgstr "Sie müssen entweder --revision oder eine revision_id angeben"
237
#: bzrlib/builtins.py:439
239
msgid "Repository %r does not support access to raw revision texts"
240
msgstr "Quelle %r unterstützt keinen Zugriff auf reine Revisionstexte"
242
#: bzrlib/builtins.py:450
243
msgid "The repository {0} contains no revision {1}."
244
msgstr "Die Quelle {0} enthält keine neue Überarbeitung {1}."
246
#: bzrlib/builtins.py:457
247
msgid "You cannot specify a NULL revision."
248
msgstr "Sie können keine NULL-Revision angeben."
250
#: bzrlib/builtins.py:549
251
msgid "Remove the working tree from a given branch/checkout."
252
msgstr "Entfernt den Arbeitsbaum zu einer Branch/einem Checkout."
254
#: bzrlib/builtins.py:551
256
"Since a lightweight checkout is little more than a working tree\n"
257
"this will refuse to run against one."
260
#: bzrlib/builtins.py:554
261
msgid "To re-create the working tree, use \"bzr checkout\"."
262
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
"Den Arbeitsbaum entfernen, auch wenn dieser nicht übertragene oder "
268
"zurückgestellte Änderungen enthält."
270
#: bzrlib/builtins.py:574
271
msgid "No working tree to remove"
272
msgstr "Keinen Arbeitsbaum zum Entfernen"
274
#: bzrlib/builtins.py:576
275
msgid "You cannot remove the working tree of a remote path"
276
msgstr "Sie können einen entfernten Arbeitsbaum nicht löschen"
278
#: bzrlib/builtins.py:585
279
msgid "You cannot remove the working tree from a lightweight checkout"
282
#: bzrlib/builtins.py:625
284
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
285
"instead. Use \"--force\" if you are sure you want to reset the working tree."
287
"Der Baum scheint nicht beschädigt zu sein. Wahrscheinlich möchten Sie "
288
"stattdessen \"bzr revert\" ausführen. Benutzen Sie \"--force\", wenn Sie den "
289
"Arbeitsbaum wirklich zurücksetzen möchten."
291
#: bzrlib/builtins.py:636
293
", the header appears corrupt, try passing -r -1 to set the state to the last "
296
", die Kopfzeilen scheinen beschädigt zu sein. Versuchen Sie -r -1 um den "
297
"Status der letzten Einreichung zu übernehmen."
299
#: bzrlib/builtins.py:640
300
msgid "failed to reset the tree state{0}"
301
msgstr "Baumstatus{0} konnte nicht zurückgesetzt werden"
303
#: bzrlib/builtins.py:644
304
msgid "Show current revision number."
305
msgstr "Aktuelle Revisionsnummer anzeigen."
307
#: bzrlib/builtins.py:646
308
msgid "This is equal to the number of revisions on this branch."
311
#: bzrlib/builtins.py:659
312
msgid "--tree and --revision can not be used together"
313
msgstr "--tree und --revision können nicht zusammen verwendet werden."
315
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
316
msgid "Tags can only be placed on a single revision, not on a range"
319
#: bzrlib/builtins.py:700
320
msgid "Show revno of working tree."
323
#: bzrlib/builtins.py:748
324
msgid "Add specified files or directories."
325
msgstr "Angegebene Dateien oder Verzeichnisse hinzufügen."
327
#: bzrlib/builtins.py:750
329
"In non-recursive mode, all the named items are added, regardless\n"
330
"of whether they were previously ignored. A warning is given if\n"
331
"any of the named files are already versioned."
334
#: bzrlib/builtins.py:754
336
"In recursive mode (the default), files are treated the same way\n"
337
"but the behaviour for directories is different. Directories that\n"
338
"are already versioned do not give a warning. All directories,\n"
339
"whether already versioned or not, are searched for files or\n"
340
"subdirectories that are neither versioned or ignored, and these\n"
341
"are added. This search proceeds recursively into versioned\n"
342
"directories. If no names are given '.' is assumed."
345
#: bzrlib/builtins.py:762
347
"A warning will be printed when nested trees are encountered,\n"
348
"unless they are explicitly ignored."
351
#: bzrlib/builtins.py:765
353
"Therefore simply saying 'bzr add' will version all files that\n"
354
"are currently unknown."
357
#: bzrlib/builtins.py:768
359
"Adding a file whose parent directory is not versioned will\n"
360
"implicitly add the parent, and so on up to the root. This means\n"
361
"you should never need to explicitly add a directory, they'll just\n"
362
"get added when you add a file in the directory."
365
#: bzrlib/builtins.py:773
367
"--dry-run will show which files would be added, but not actually\n"
370
"--dry-run zeigt die Dateien an, die hinzugefügt würden,\n"
371
"ohne diese wirklich hinzuzufügen."
373
#: bzrlib/builtins.py:776
375
"--file-ids-from will try to use the file ids from the supplied path.\n"
376
"It looks up ids trying to find a matching parent directory with the\n"
377
"same filename, and then by pure path. This option is rarely needed\n"
378
"but can be useful when adding the same logical file into two\n"
379
"branches that will be merged later (without showing the two different\n"
380
"adds as a conflict). It is also useful when merging another project\n"
381
"into a subdirectory of this one."
384
#: bzrlib/builtins.py:784
386
"Any files matching patterns in the ignore list will not be added\n"
387
"unless they are explicitly mentioned."
389
"Alle Dateien, die auf Muster in der Ignorierliste zutreffen, werden\n"
390
"nicht hinzugefügt, außer Sie geben diese explizit an."
392
#: bzrlib/builtins.py:787
394
"In recursive mode, files larger than the configuration option \n"
395
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
399
#: bzrlib/builtins.py:794
400
msgid "Don't recursively add the contents of directories."
401
msgstr "Inhalte von Verzeichnissen nicht rekursiv hinzufügen."
403
#: bzrlib/builtins.py:800
404
msgid "Lookup file ids from this tree."
407
#: bzrlib/builtins.py:836
408
msgid "ignored {0} matching \"{1}\"\n"
409
msgstr "ignoriert {0} übereinstimmend \"{1}\"\n"
411
#: bzrlib/builtins.py:841
412
msgid "Create a new versioned directory."
413
msgstr "Ein neues versioniertes Verzeichnis erstellen."
415
#: bzrlib/builtins.py:843
416
msgid "This is equivalent to creating the directory and then adding it."
417
msgstr "Dies entspricht dem Anlegen und Hinzufügen des Ordners."
419
#: bzrlib/builtins.py:850
420
msgid "No error if existing, make parent directories as needed."
423
#: bzrlib/builtins.py:884
426
msgstr "%s hinzugefügt\n"
428
#: bzrlib/builtins.py:926
430
msgid "invalid kind %r specified"
433
#: bzrlib/builtins.py:963
434
msgid "Move or rename a file."
435
msgstr "Eine Datei verschieben oder umbenennen."
437
#: bzrlib/builtins.py:965
438
msgid " bzr mv SOURCE... DESTINATION"
439
msgstr " bzr mv QUELLE... ZIEL"
441
#: bzrlib/builtins.py:967
443
"If the last argument is a versioned directory, all the other names\n"
444
"are moved into it. Otherwise, there must be exactly two arguments\n"
445
"and the file is changed to a new name."
448
#: bzrlib/builtins.py:971
450
"If OLDNAME does not exist on the filesystem but is versioned and\n"
451
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
452
"assumes that the file has been manually moved and only updates\n"
453
"its internal inventory to reflect that change.\n"
454
"The same is valid when moving many SOURCE files to a DESTINATION."
457
#: bzrlib/builtins.py:977
458
msgid "Files cannot be moved between branches."
459
msgstr "Dateien können nicht zwischen Zweigen verschoben werden."
461
#: bzrlib/builtins.py:984
463
"Move only the bzr identifier of the file, because the file has already been "
466
"Verschiebe nur den bzr-Bezeichner der Datei, da diese bereits verschoben "
469
#: bzrlib/builtins.py:986
470
msgid "Automatically guess renames."
471
msgstr "Umbenennungen automatisch erraten"
473
#: bzrlib/builtins.py:987
474
msgid "Avoid making changes when guessing renames."
475
msgstr "Keine Änderungen durchführen, wenn Umbenennungen erraten werden."
477
#: bzrlib/builtins.py:996
478
msgid "--dry-run requires --auto."
479
msgstr "--dry-run erfordert --auto."
481
#: bzrlib/builtins.py:1000
482
msgid "missing file argument"
483
msgstr "Datei-Argument fehlt"
485
#: bzrlib/builtins.py:1004
486
msgid "can not move root of branch"
487
msgstr "Wurzel des Zweiges kann nicht verschoben werden"
489
#: bzrlib/builtins.py:1010
490
msgid "Only one path may be specified to --auto."
491
msgstr "Es kann nur ein Pfad mit --auto angegeben werden."
493
#: bzrlib/builtins.py:1013
494
msgid "--after cannot be specified with --auto."
495
msgstr "--after kann nicht mit --auto angegeben werden."
497
#: bzrlib/builtins.py:1050
498
msgid "to mv multiple files the destination must be a versioned directory"
500
"um mehrere Dateien zu verschieben, muss das Ziel ein versioniertes "
503
#: bzrlib/builtins.py:1102
504
msgid "Turn this branch into a mirror of another branch."
505
msgstr "Diesen Zweig zu einer Spiegelung eines anderen Zweiges machen."
507
#: bzrlib/builtins.py:1104
509
"By default, this command only works on branches that have not diverged.\n"
510
"Branches are considered diverged if the destination branch's most recent \n"
511
"commit is one that has not been merged (directly or indirectly) into the \n"
515
#: bzrlib/builtins.py:1109
517
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
518
"from one into the other. Once one branch has merged, the other should\n"
519
"be able to pull it again."
522
#: bzrlib/builtins.py:1113
524
"If you want to replace your local changes and just want your branch to\n"
525
"match the remote one, use pull --overwrite. This will work even if the two\n"
526
"branches have diverged."
529
#: bzrlib/builtins.py:1117
531
"If there is no default location set, the first pull will set it (use\n"
532
"--no-remember to avoid setting it). After that, you can omit the\n"
533
"location to use the default. To change the default, use --remember. The\n"
534
"value will only be saved if the remote location can be accessed."
537
#: bzrlib/builtins.py:1122
539
"The --verbose option will display the revisions pulled using the log_format\n"
540
"configuration option. You can use a different format by overriding it with\n"
541
"-Olog_format=<other_format>."
544
#: bzrlib/builtins.py:1126
546
"Note: The location can be specified either in the form of a branch,\n"
547
"or in the form of a path to a file containing a merge directive generated\n"
551
#: bzrlib/builtins.py:1134
552
msgid "Show logs of pulled revisions."
555
#: bzrlib/builtins.py:1136
557
"Branch to pull into, rather than the one containing the working directory."
560
#: bzrlib/builtins.py:1139
562
"Perform a local pull in a bound branch. Local pulls are not applied to the "
566
#: bzrlib/builtins.py:1168
567
msgid "Need working tree for --show-base."
568
msgstr "Ein Arbeitsbaum wird für --show-base benötigt."
570
#: bzrlib/builtins.py:1184
571
msgid "No pull location known or specified."
574
#: bzrlib/builtins.py:1190
576
msgid "Using saved parent location: %s\n"
579
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
580
msgid "Cannot use -r with merge directives or bundles"
583
#: bzrlib/builtins.py:1238
584
msgid "Update a mirror of this branch."
585
msgstr "Eine Spiegelung dieses Zweiges aktualisieren."
587
#: bzrlib/builtins.py:1240
589
"The target branch will not have its working tree populated because this\n"
590
"is both expensive, and is not supported on remote file systems."
593
#: bzrlib/builtins.py:1243
595
"Some smart servers or protocols *may* put the working tree in place in\n"
598
"Einige intelligente Server oder Protokolle legen den Arbeitsbaum\n"
599
"*möglicherweise* in die Zukunft."
601
#: bzrlib/builtins.py:1246
603
"This command only works on branches that have not diverged. Branches are\n"
604
"considered diverged if the destination branch's most recent commit is one\n"
605
"that has not been merged (directly or indirectly) by the source branch."
608
#: bzrlib/builtins.py:1250
610
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
611
"the other branch completely, discarding its unmerged changes."
614
#: bzrlib/builtins.py:1253
616
"If you want to ensure you have the different changes in the other branch,\n"
617
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
618
"After that you will be able to do a push without '--overwrite'."
621
#: bzrlib/builtins.py:1257
623
"If there is no default push location set, the first push will set it (use\n"
624
"--no-remember to avoid setting it). After that, you can omit the\n"
625
"location to use the default. To change the default, use --remember. The\n"
626
"value will only be saved if the remote location can be accessed."
629
#: bzrlib/builtins.py:1262
631
"The --verbose option will display the revisions pushed using the log_format\n"
632
"configuration option. You can use a different format by overriding it with\n"
633
"-Olog_format=<other_format>."
636
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
638
"Branch to push from, rather than the one containing the working directory."
641
#: bzrlib/builtins.py:1276
643
"By default push will fail if the target directory exists, but does not "
644
"already have a control directory. This flag will allow push to proceed."
647
#: bzrlib/builtins.py:1281
649
"Create a stacked branch that references the public location of the parent "
652
"Einen gestapelten Zweig anlegen, der auf den öffentlichen Pfad des "
653
"übergeordneten Zweigs referenziert."
655
#: bzrlib/builtins.py:1284
657
"Create a stacked branch that refers to another branch for the commit "
658
"history. Only the work not present in the referenced branch is included in "
659
"the branch created."
662
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
664
"Refuse to push if there are uncommitted changes in the working tree, --no-"
665
"strict disables the check."
668
#: bzrlib/builtins.py:1292
669
msgid "Don't populate the working tree, even for protocols that support it."
672
#: bzrlib/builtins.py:1336
673
msgid "Could not determine branch to refer to."
676
#: bzrlib/builtins.py:1345
679
"No push location known or specified. To push to the parent branch (at %s), "
680
"use 'bzr push :parent'."
683
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
684
msgid "No push location known or specified."
687
#: bzrlib/builtins.py:1355
689
msgid "Using saved push location: %s"
692
#: bzrlib/builtins.py:1365
693
msgid "Create a new branch that is a copy of an existing branch."
696
#: bzrlib/builtins.py:1367
698
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
699
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
701
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
702
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
703
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
707
#: bzrlib/builtins.py:1374
709
"To retrieve the branch as of a particular revision, supply the --revision\n"
710
"parameter, as in \"branch foo/bar -r 5\"."
713
#: bzrlib/builtins.py:1377
714
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
717
#: bzrlib/builtins.py:1387
718
msgid "Create a branch without a working-tree."
721
#: bzrlib/builtins.py:1389
722
msgid "Switch the checkout in the current directory to the new branch."
725
#: bzrlib/builtins.py:1392
727
"Create a stacked branch referring to the source branch. The new branch will "
728
"depend on the availability of the source branch for all operations."
731
#: bzrlib/builtins.py:1396
732
msgid "Do not use a shared repository, even if available."
735
#: bzrlib/builtins.py:1398
737
"By default branch will fail if the target directory exists, but does not "
738
"already have a control directory. This flag will allow branch to proceed."
741
#: bzrlib/builtins.py:1403
742
msgid "Bind new branch to from location."
745
#: bzrlib/builtins.py:1450
747
msgid "Target directory \"%s\" already exists."
750
#: bzrlib/builtins.py:1462
752
msgid "Parent of \"%s\" does not exist."
755
#: bzrlib/builtins.py:1481
756
msgid "The branch {0} has no revision {1}."
759
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
761
msgid "Created new stacked branch referring to %s."
764
#: bzrlib/builtins.py:1500
766
msgid "Branched %d revision."
767
msgid_plural "Branched %d revisions."
771
#: bzrlib/builtins.py:1505
773
msgid "New branch bound to %s"
776
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
778
msgid "Switched to branch: %s"
779
msgstr "Zu Zweig gewechselt: %s"
781
#: bzrlib/builtins.py:1515
782
msgid "List the branches available at the current location."
783
msgstr "Die verfügbaren Zweige an der aktuellen Stelle auflisten."
785
#: bzrlib/builtins.py:1517
787
"This command will print the names of all the branches at the current\n"
790
"Dieser Befehl wird die Namen aller verfügbaren Zweige\n"
791
"an der aktuellen Stelle auflisten."
793
#: bzrlib/builtins.py:1524
795
"Recursively scan for branches rather than just looking in the specified "
799
#: bzrlib/builtins.py:1554
803
#: bzrlib/builtins.py:1566
804
msgid "Create a new checkout of an existing branch."
807
#: bzrlib/builtins.py:1568
809
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
811
"the branch found in '.'. This is useful if you have removed the working "
813
"or if it was never created - i.e. if you pushed the branch to its current\n"
814
"location using SFTP."
817
#: bzrlib/builtins.py:1573
819
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
821
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
823
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
824
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
825
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
829
#: bzrlib/builtins.py:1580
831
"To retrieve the branch as of a particular revision, supply the --revision\n"
832
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
834
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
839
#: bzrlib/builtins.py:1590
841
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
842
"the branch for every operation. Normal checkouts can perform common "
843
"operations like diff and status without such access, and also support local "
847
#: bzrlib/builtins.py:1597
848
msgid "Get file contents from this tree."
851
#: bzrlib/builtins.py:1599
852
msgid "Hard-link working tree files where possible."
855
#: bzrlib/builtins.py:1640
857
"Show list of renamed files.\n"
860
"Liste der umbenannten Dateien zeigen.\n"
863
#: bzrlib/builtins.py:1670
864
msgid "Update a working tree to a new revision."
867
#: bzrlib/builtins.py:1672
869
"This will perform a merge of the destination revision (the tip of the\n"
870
"branch, or the specified revision) into the working tree, and then make\n"
871
"that revision the basis revision for the working tree. "
874
#: bzrlib/builtins.py:1676
876
"You can use this to visit an older revision, or to update a working tree\n"
877
"that is out of date from its branch."
880
#: bzrlib/builtins.py:1679
882
"If there are any uncommitted changes in the tree, they will be carried\n"
883
"across and remain as uncommitted changes after the update. To discard\n"
884
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
885
"with the changes brought in by the change in basis revision."
888
#: bzrlib/builtins.py:1684
890
"If the tree's branch is bound to a master branch, bzr will also update\n"
891
"the branch from the master."
894
#: bzrlib/builtins.py:1687
896
"You cannot update just a single file or directory, because each Bazaar\n"
897
"working tree has just a single basis revision. If you want to restore a\n"
898
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
899
"update'. If you want to restore a file to its state in a previous\n"
900
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
901
"out the old content of that file to a new location."
904
#: bzrlib/builtins.py:1694
906
"The 'dir' argument, if given, must be the location of the root of a\n"
907
"working tree to update. By default, the working tree that contains the \n"
908
"current working directory is used."
911
#: bzrlib/builtins.py:1710
912
msgid "bzr update --revision takes exactly one revision"
915
#: bzrlib/builtins.py:1718
916
msgid "bzr update can only update a whole tree, not a file or subdirectory"
919
#: bzrlib/builtins.py:1749
920
msgid "Tree is up to date at revision {0} of branch {1}"
923
#: bzrlib/builtins.py:1765
926
"branch has no revision %s\n"
927
"bzr update --revision only works for a revision in the branch history"
930
#: bzrlib/builtins.py:1771
931
msgid "Updated to revision {0} of branch {1}"
934
#: bzrlib/builtins.py:1775
936
"Your local commits will now show as pending merges with 'bzr status', and "
937
"can be committed with 'bzr commit'."
940
#: bzrlib/builtins.py:1784
941
msgid "Show information about a working tree, branch or repository."
944
#: bzrlib/builtins.py:1786
946
"This command will show all known locations and formats associated to the\n"
947
"tree, branch or repository."
950
#: bzrlib/builtins.py:1789
952
"In verbose mode, statistical information is included with each report.\n"
953
"To see extended statistic information, use a verbosity level of 2 or\n"
954
"higher by specifying the verbose option multiple times, e.g. -vv."
957
#: bzrlib/builtins.py:1793
958
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
966
#: bzrlib/builtins.py:1797
967
msgid " Display information on the format and related locations:"
970
#: bzrlib/builtins.py:1799
974
#: bzrlib/builtins.py:1801
976
" Display the above together with extended format information and\n"
977
" basic statistics (like the number of files in the working tree and\n"
978
" number of revisions in the branch and repository):"
981
#: bzrlib/builtins.py:1805
983
msgstr " bzr info -v"
985
#: bzrlib/builtins.py:1807
986
msgid " Display the above together with number of committers to the branch:"
989
#: bzrlib/builtins.py:1809
990
msgid " bzr info -vv"
991
msgstr " bzr info -vv"
993
#: bzrlib/builtins.py:1828
994
msgid "Remove files or directories."
995
msgstr "Dateien oder Verzeichnisse entfernen."
997
#: bzrlib/builtins.py:1830
999
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1000
"delete them if they can easily be recovered using revert otherwise they\n"
1001
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1002
"parameters are given Bazaar will scan for files that are being tracked by\n"
1003
"Bazaar but missing in your tree and stop tracking them for you."
1006
#: bzrlib/builtins.py:1838
1007
msgid "Only remove files that have never been committed."
1010
#: bzrlib/builtins.py:1840
1011
msgid "The file deletion mode to be used."
1012
msgstr "Der Datei-Löschmodus, der verwendet wird."
1014
#: bzrlib/builtins.py:1841
1015
msgid "Deletion Strategy"
1016
msgstr "Lösch-Strategie"
1018
#: bzrlib/builtins.py:1842
1019
msgid "Backup changed files (default)."
1020
msgstr "Geänderte Dateien sichern (Vorgabe)."
1022
#: bzrlib/builtins.py:1843
1023
msgid "Delete from bzr but leave the working copy."
1026
#: bzrlib/builtins.py:1844
1027
msgid "Don't backup changed files."
1028
msgstr "Geänderte Dateien nicht sichern."
1030
#: bzrlib/builtins.py:1845
1032
"Delete all the specified files, even if they can not be recovered and even "
1033
"if they are non-empty directories. (deprecated, use no-backup)"
1036
#: bzrlib/builtins.py:1854
1037
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1040
#: bzrlib/builtins.py:1871
1041
msgid "No matching files."
1042
msgstr "Keine zutreffenden Dateien."
1044
#: bzrlib/builtins.py:1932
1045
msgid "Reconcile bzr metadata in a branch."
1048
#: bzrlib/builtins.py:1934
1050
"This can correct data mismatches that may have been caused by\n"
1051
"previous ghost operations or bzr upgrades. You should only\n"
1052
"need to run this command if 'bzr check' or a bzr developer\n"
1053
"advises you to run it."
1056
#: bzrlib/builtins.py:1939
1058
"If a second branch is provided, cross-branch reconciliation is\n"
1059
"also attempted, which will check that data like the tree root\n"
1060
"id which was not present in very early bzr versions is represented\n"
1061
"correctly in both branches."
1064
#: bzrlib/builtins.py:1944
1066
"At the same time it is run it may recompress data resulting in\n"
1067
"a potential saving in disk space or performance gain."
1070
#: bzrlib/builtins.py:1947
1071
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1074
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1076
"Format for the bzr 2.0 series.\n"
1077
"Uses group-compress storage.\n"
1078
"Provides rich roots which are a one-way transition.\n"
1081
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1083
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1084
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1087
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1088
msgid "The 2a format with experimental support for colocated branches.\n"
1091
#: bzrlib/builtins.py:2015
1092
msgid "Make a directory into a versioned branch."
1093
msgstr "Ein Verzeichnis zu einem versionierten Entwicklungszweig machen."
1095
#: bzrlib/builtins.py:2017
1097
"Use this to create an empty branch, or before importing an\n"
1101
#: bzrlib/builtins.py:2020
1103
"If there is a repository in a parent directory of the location, then\n"
1104
"the history of the branch will be stored in the repository. Otherwise\n"
1105
"init creates a standalone branch which carries its own history\n"
1106
"in the .bzr directory."
1109
#: bzrlib/builtins.py:2025
1111
"If there is already a branch at the location but it has no working tree,\n"
1112
"the tree can be populated with 'bzr checkout'."
1115
#: bzrlib/builtins.py:2028
1116
msgid "Recipe for importing a tree of files::"
1119
#: bzrlib/builtins.py:2030
1125
" 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
1133
msgid "Specify a format for this branch. See \"help formats\"."
1134
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."
1140
#: bzrlib/builtins.py:2055
1141
msgid "Create a branch without a working tree."
1144
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1147
"Parent directory of %s does not exist.\n"
1148
"You may supply --create-prefix to create all leading parent directories."
1151
#: bzrlib/builtins.py:2109
1153
"This branch format cannot be set to append-revisions-only. Try --default."
1156
#: bzrlib/builtins.py:2120
1157
msgid "Created a {0} (format: {1})\n"
1158
msgstr "Ein {0} wurde erstellt (Format: {1})\n"
1160
#: bzrlib/builtins.py:2129
1162
msgid "Using shared repository: %s\n"
1165
#: bzrlib/builtins.py:2133
1166
msgid "Create a shared repository for branches to share storage space."
1169
#: bzrlib/builtins.py:2135
1171
"New branches created under the repository directory will store their\n"
1172
"revisions in the repository, not in the branch directory. For branches\n"
1173
"with shared history, this reduces the amount of storage needed and \n"
1174
"speeds up the creation of new branches."
1177
#: bzrlib/builtins.py:2140
1179
"If the --no-trees option is given then the branches in the repository\n"
1180
"will not have working trees by default. They will still exist as \n"
1181
"directories on disk, but they will not have separate copies of the \n"
1182
"files at a certain revision. This can be useful for repositories that\n"
1183
"store branches which are interacted with through checkouts or remote\n"
1184
"branches, such as on a server."
1187
#: bzrlib/builtins.py:2147
1190
" Create a shared repository holding just branches::"
1193
#: bzrlib/builtins.py:2150
1195
" bzr init-repo --no-trees repo\n"
1196
" bzr init repo/trunk"
1198
" bzr init-repo --no-trees repo\n"
1199
" bzr init repo/trunk"
1201
#: bzrlib/builtins.py:2153
1202
msgid " Make a lightweight checkout elsewhere::"
1205
#: bzrlib/builtins.py:2155
1207
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1208
" cd trunk-checkout\n"
1211
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1212
" cd trunk-checkout\n"
1213
" (Hier Dateien hinzufügen)"
1215
#: bzrlib/builtins.py:2163
1217
"Specify a format for this repository. See \"bzr help formats\" for details."
1220
#: bzrlib/builtins.py:2167
1221
msgid "Repository format"
1224
#: bzrlib/builtins.py:2169
1225
msgid "Branches in the repository will default to not having a working tree."
1228
#: bzrlib/builtins.py:2195
1229
msgid "Show differences in the working tree, between revisions or branches."
1232
#: bzrlib/builtins.py:2197
1234
"If no arguments are given, all changes for the current tree are listed.\n"
1235
"If files are given, only the changes in those files are listed.\n"
1236
"Remote and multiple branches can be compared by using the --old and\n"
1237
"--new options. If not provided, the default for both is derived from\n"
1238
"the first argument, if any, or the current tree if no arguments are\n"
1242
#: bzrlib/builtins.py:2204
1244
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1245
"produces patches suitable for \"patch -p1\"."
1248
#: bzrlib/builtins.py:2207
1250
"Note that when using the -r argument with a range of revisions, the\n"
1251
"differences are computed between the two specified revisions. That\n"
1252
"is, the command does not show the changes introduced by the first \n"
1253
"revision in the range. This differs from the interpretation of \n"
1254
"revision ranges used by \"bzr log\" which includes the first revision\n"
1258
#: bzrlib/builtins.py:2214
1262
" 2 - unrepresentable changes\n"
1268
" 2 - Nicht darstellbare Änderungen\n"
1270
" 0 - Keine Änderungen"
1272
#: bzrlib/builtins.py:2220
1275
" Shows the difference in the working tree versus the last commit::"
1278
#: bzrlib/builtins.py:2223
1282
#: bzrlib/builtins.py:2225
1283
msgid " Difference between the working tree and revision 1::"
1286
#: bzrlib/builtins.py:2227
1287
msgid " bzr diff -r1"
1288
msgstr " bzr diff -r1"
1290
#: bzrlib/builtins.py:2229
1291
msgid " Difference between revision 3 and revision 1::"
1294
#: bzrlib/builtins.py:2231
1295
msgid " bzr diff -r1..3"
1296
msgstr " bzr diff -r1..3"
1298
#: bzrlib/builtins.py:2233
1299
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1302
#: bzrlib/builtins.py:2235
1303
msgid " bzr diff -r1..3 xxx"
1304
msgstr " bzr diff -r1..3 xxx"
1306
#: bzrlib/builtins.py:2237
1307
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1310
#: bzrlib/builtins.py:2239
1311
msgid " bzr diff -c2"
1312
msgstr " bzr diff -c2"
1314
#: bzrlib/builtins.py:2241
1316
" To see the changes introduced by revision X::\n"
1321
#: bzrlib/builtins.py:2245
1323
" Note that in the case of a merge, the -c option shows the changes\n"
1324
" compared to the left hand parent. To see the changes against\n"
1325
" another parent, use::"
1328
#: bzrlib/builtins.py:2249
1329
msgid " bzr diff -r<chosen_parent>..X"
1332
#: bzrlib/builtins.py:2251
1334
" The changes between the current revision and the previous revision\n"
1335
" (equivalent to -c-1 and -r-2..-1)"
1338
#: bzrlib/builtins.py:2254
1339
msgid " bzr diff -r-2.."
1340
msgstr " bzr diff -r-2.."
1342
#: bzrlib/builtins.py:2256
1343
msgid " Show just the differences for file NEWS::"
1346
#: bzrlib/builtins.py:2258
1347
msgid " bzr diff NEWS"
1350
#: bzrlib/builtins.py:2260
1351
msgid " Show the differences in working tree xxx for file NEWS::"
1354
#: bzrlib/builtins.py:2262
1355
msgid " bzr diff xxx/NEWS"
1358
#: bzrlib/builtins.py:2264
1359
msgid " Show the differences from branch xxx to this working tree:"
1362
#: bzrlib/builtins.py:2266
1363
msgid " bzr diff --old xxx"
1364
msgstr " bzr diff --old xxx"
1366
#: bzrlib/builtins.py:2268
1367
msgid " Show the differences between two branches for file NEWS::"
1370
#: bzrlib/builtins.py:2270
1371
msgid " bzr diff --old xxx --new yyy NEWS"
1374
#: bzrlib/builtins.py:2272
1375
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1378
#: bzrlib/builtins.py:2274
1380
" bzr diff --prefix old/:new/\n"
1382
" Show the differences using a custom diff program with options::\n"
1384
" bzr diff --using /usr/bin/diff --diff-options -wu"
1387
#: bzrlib/builtins.py:2284
1388
msgid "Pass these options to the external diff program."
1389
msgstr "Diese Optionen an das externe Programm diff übergeben."
1391
#: bzrlib/builtins.py:2287
1393
"Set prefixes added to old and new filenames, as two values separated by a "
1394
"colon. (eg \"old/:new/\")."
1397
#: bzrlib/builtins.py:2290
1398
msgid "Branch/tree to compare from."
1401
#: bzrlib/builtins.py:2294
1402
msgid "Branch/tree to compare to."
1405
#: bzrlib/builtins.py:2300
1406
msgid "Use this command to compare files."
1407
msgstr "Diesen Befehl zum Vergleichen von Dateien benutzen."
1409
#: bzrlib/builtins.py:2305
1410
msgid "Diff format to use."
1411
msgstr "Diff-Format, das benutzt werden soll."
1413
#: bzrlib/builtins.py:2307
1415
msgstr "Diff-Format"
1417
#: bzrlib/builtins.py:2329
1418
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1421
#: bzrlib/builtins.py:2333
1422
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1425
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1426
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1427
msgid "{0} and {1} are mutually exclusive"
1428
msgstr "{0} und {1} schließen sich gegenseitig aus"
1430
#: bzrlib/builtins.py:2358
1432
"List files deleted in the working tree.\n"
1436
#: bzrlib/builtins.py:2436
1437
msgid "Show the tree root directory."
1440
#: bzrlib/builtins.py:2438
1442
"The root is the nearest enclosing directory with a .bzr control\n"
1446
#: bzrlib/builtins.py:2453
1447
msgid "The limit argument must be an integer."
1450
#: bzrlib/builtins.py:2461
1451
msgid "The levels argument must be an integer."
1454
#: bzrlib/builtins.py:2466
1455
msgid "Show historical log for a branch or subset of a branch."
1458
#: bzrlib/builtins.py:2468
1460
"log is bzr's default tool for exploring the history of a branch.\n"
1461
"The branch to use is taken from the first parameter. If no parameters\n"
1462
"are given, the branch containing the working directory is logged.\n"
1463
"Here are some simple examples::"
1466
#: bzrlib/builtins.py:2473
1468
" bzr log log the current branch\n"
1469
" bzr log foo.py log a file in its branch\n"
1470
" bzr log http://server/branch log a branch on a server"
1473
#: bzrlib/builtins.py:2477
1475
"The filtering, ordering and information shown for each revision can\n"
1476
"be controlled as explained below. By default, all revisions are\n"
1477
"shown sorted (topologically) so that newer revisions appear before\n"
1478
"older ones and descendants always appear before ancestors. If displayed,\n"
1479
"merged revisions are shown indented under the revision in which they\n"
1483
#: bzrlib/builtins.py:2484
1484
msgid ":Output control:"
1485
msgstr ":Ausgabesteuerung:"
1487
#: bzrlib/builtins.py:2486
1489
" The log format controls how information about each revision is\n"
1490
" displayed. The standard log formats are called ``long``, ``short``\n"
1491
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1492
" for more details on log formats."
1495
#: bzrlib/builtins.py:2491
1497
" The following options can be used to control what information is\n"
1501
#: bzrlib/builtins.py:2494
1503
" -l N display a maximum of N revisions\n"
1504
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1505
" -v display a status summary (delta) for each revision\n"
1506
" -p display a diff (patch) for each revision\n"
1507
" --show-ids display revision-ids (and file-ids), not just revnos"
1510
#: bzrlib/builtins.py:2500
1512
" Note that the default number of levels to display is a function of the\n"
1513
" log format. If the -n option is not used, the standard log formats show\n"
1514
" just the top level (mainline)."
1517
#: bzrlib/builtins.py:2504
1519
" Status summaries are shown using status flags like A, M, etc. To see\n"
1520
" the changes explained using words like ``added`` and ``modified``\n"
1521
" instead, use the -vv option."
1524
#: bzrlib/builtins.py:2508
1525
msgid ":Ordering control:"
1526
msgstr ":Sortierungssteuerung:"
1528
#: bzrlib/builtins.py:2510
1530
" To display revisions from oldest to newest, use the --forward option.\n"
1531
" In most cases, using this option will have little impact on the total\n"
1532
" time taken to produce a log, though --forward does not incrementally\n"
1533
" display revisions like --reverse does when it can."
1536
#: bzrlib/builtins.py:2515
1537
msgid ":Revision filtering:"
1538
msgstr ":Revision-Filtern:"
1540
#: bzrlib/builtins.py:2517
1542
" The -r option can be used to specify what revision or range of revisions\n"
1543
" to filter against. The various forms are shown below::"
1546
#: bzrlib/builtins.py:2520
1548
" -rX display revision X\n"
1549
" -rX.. display revision X and later\n"
1550
" -r..Y display up to and including revision Y\n"
1551
" -rX..Y display from X to Y inclusive"
1554
#: bzrlib/builtins.py:2525
1556
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1557
" Some common examples are given below::"
1560
#: bzrlib/builtins.py:2528
1562
" -r-1 show just the tip\n"
1563
" -r-10.. show the last 10 mainline revisions\n"
1564
" -rsubmit:.. show what's new on this branch\n"
1565
" -rancestor:path.. show changes since the common ancestor of this\n"
1566
" branch and the one at location path\n"
1567
" -rdate:yesterday.. show changes since yesterday"
1570
#: bzrlib/builtins.py:2535
1572
" When logging a range of revisions using -rX..Y, log starts at\n"
1573
" revision Y and searches back in history through the primary\n"
1574
" (\"left-hand\") parents until it finds X. When logging just the\n"
1575
" top level (using -n1), an error is reported if X is not found\n"
1576
" along the way. If multi-level logging is used (-n0), X may be\n"
1577
" a nested merge revision and the log will be truncated accordingly."
1580
#: bzrlib/builtins.py:2542
1581
msgid ":Path filtering:"
1582
msgstr ":Pfad-Filtern:"
1584
#: bzrlib/builtins.py:2544
1586
" If parameters are given and the first one is not a branch, the log\n"
1587
" will be filtered to show only those revisions that changed the\n"
1588
" nominated files or directories."
1591
#: bzrlib/builtins.py:2548
1593
" Filenames are interpreted within their historical context. To log a\n"
1594
" deleted file, specify a revision range so that the file existed at\n"
1595
" the end or start of the range."
1598
#: bzrlib/builtins.py:2552
1600
" Historical context is also important when interpreting pathnames of\n"
1601
" renamed files/directories. Consider the following example:"
1604
#: bzrlib/builtins.py:2555
1606
" * revision 1: add tutorial.txt\n"
1607
" * revision 2: modify tutorial.txt\n"
1608
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1611
#: bzrlib/builtins.py:2559
1612
msgid " In this case:"
1613
msgstr " In diesem Fall:"
1615
#: bzrlib/builtins.py:2561
1616
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"
1623
#: bzrlib/builtins.py:2565
1625
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1626
" the original file in revision 2."
1629
#: bzrlib/builtins.py:2568
1631
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1632
" was no file called guide.txt in revision 2."
1635
#: bzrlib/builtins.py:2571
1637
" Renames are always followed by log. By design, there is no need to\n"
1638
" explicitly ask for this (and no way to stop logging a file back\n"
1639
" until it was last renamed)."
1642
#: bzrlib/builtins.py:2575
1643
msgid ":Other filtering:"
1644
msgstr ":Anderes Filtern:"
1646
#: bzrlib/builtins.py:2577
1648
" The --match option can be used for finding revisions that match a\n"
1649
" regular expression in a commit message, committer, author or bug.\n"
1650
" Specifying the option several times will match any of the supplied\n"
1651
" expressions. --match-author, --match-bugs, --match-committer and\n"
1652
" --match-message can be used to only match a specific field."
1655
#: bzrlib/builtins.py:2583
1656
msgid ":Tips & tricks:"
1657
msgstr ":Tipps & Tricks:"
1659
#: bzrlib/builtins.py:2585
1661
" GUI tools and IDEs are often better at exploring history than command\n"
1662
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1663
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1664
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1665
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1668
#: bzrlib/builtins.py:2591
1669
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1672
#: bzrlib/builtins.py:2593
1676
" top = log -l10 --line\n"
1680
#: bzrlib/builtins.py:2598
1682
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1683
" will show the last 10 mainline revisions. To see the details of a\n"
1684
" particular revision X, ``bzr show -rX``."
1687
#: bzrlib/builtins.py:2602
1689
" If you are interested in looking deeper into a particular merge X,\n"
1690
" use ``bzr log -n0 -rX``."
1693
#: bzrlib/builtins.py:2605
1695
" ``bzr log -v`` on a branch with lots of history is currently\n"
1696
" very slow. A fix for this issue is currently under development.\n"
1697
" With or without that fix, it is recommended that a revision range\n"
1698
" be given when using the -v option."
1701
#: bzrlib/builtins.py:2610
1703
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1704
" used to find revisions matching user names, commit messages, etc.\n"
1705
" Among other features, this plugin can find all revisions containing\n"
1706
" a list of words but not others."
1709
#: bzrlib/builtins.py:2615
1711
" When exploring non-mainline history on large projects with deep\n"
1712
" history, the performance of log can be greatly improved by installing\n"
1713
" the historycache plugin. This plugin buffers historical information\n"
1714
" trading disk space for faster speed."
1717
#: bzrlib/builtins.py:2624
1718
msgid "Show from oldest to newest."
1721
#: bzrlib/builtins.py:2627
1722
msgid "Show files changed in each revision."
1725
#: bzrlib/builtins.py:2633
1726
msgid "Show just the specified revision. See also \"help revisionspec\"."
1729
#: bzrlib/builtins.py:2637
1730
msgid "What names to list as authors - first, all or committer."
1733
#: bzrlib/builtins.py:2638
1737
#: bzrlib/builtins.py:2643
1738
msgid "Number of levels to display - 0 for all, 1 for flat."
1741
#: bzrlib/builtins.py:2653
1742
msgid "Limit the output to the first N revisions."
1745
#: bzrlib/builtins.py:2658
1746
msgid "Show changes made in each revision as a patch."
1749
#: bzrlib/builtins.py:2660
1750
msgid "Show merged revisions like --levels 0 does."
1753
#: bzrlib/builtins.py:2664
1754
msgid "Do not report commits with more than one parent."
1757
#: bzrlib/builtins.py:2666
1759
"Display only the revisions that are not part of both ancestries (require -"
1763
#: bzrlib/builtins.py:2670
1764
msgid "Show digital signature validity."
1767
#: bzrlib/builtins.py:2673
1768
msgid "Show revisions whose properties match this expression."
1771
#: bzrlib/builtins.py:2677
1772
msgid "Show revisions whose message matches this expression."
1775
#: bzrlib/builtins.py:2681
1776
msgid "Show revisions whose committer matches this expression."
1779
#: bzrlib/builtins.py:2685
1780
msgid "Show revisions whose authors match this expression."
1783
#: bzrlib/builtins.py:2689
1784
msgid "Show revisions whose bugs match this expression."
1787
#: bzrlib/builtins.py:2743
1788
msgid "--exclude-common-ancestry requires -r with two revisions"
1791
#: bzrlib/builtins.py:2771
1793
msgid "Path unknown at end or start of revision range: %s"
1796
#: bzrlib/builtins.py:2888
1798
msgid "bzr %s doesn't accept two revisions in different branches."
1801
#: bzrlib/builtins.py:2904
1803
msgid "bzr %s --revision takes one or two values."
1806
#: bzrlib/builtins.py:2949
1808
"List files in a tree.\n"
1812
#: bzrlib/builtins.py:2958
1813
msgid "Recurse into subdirectories."
1816
#: bzrlib/builtins.py:2960
1817
msgid "Print paths relative to the root of the branch."
1820
#: bzrlib/builtins.py:2962
1821
msgid "Print unknown files."
1822
msgstr "Unbekannte Dateien ausgeben."
1824
#: bzrlib/builtins.py:2963
1825
msgid "Print versioned files."
1826
msgstr "Versionierte Dateien ausgeben."
1828
#: bzrlib/builtins.py:2966
1829
msgid "Print ignored files."
1830
msgstr "Ignorierte Dateien ausgeben."
1832
#: bzrlib/builtins.py:2968
1833
msgid "List entries of a particular kind: file, directory, symlink."
1836
#: bzrlib/builtins.py:2981
1837
msgid "invalid kind specified"
1840
#: bzrlib/builtins.py:2984
1841
msgid "Cannot set both --verbose and --null"
1844
#: bzrlib/builtins.py:2993
1845
msgid "cannot specify both --from-root and PATH"
1848
#: bzrlib/builtins.py:3080
1849
msgid "Ignore specified files or patterns."
1852
#: bzrlib/builtins.py:3082
1853
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1856
#: bzrlib/builtins.py:3084
1858
"If a .bzrignore file does not exist, the ignore command\n"
1859
"will create one and add the specified files or patterns to the newly\n"
1860
"created file. The ignore command will also automatically add the \n"
1861
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1862
"the use of the ignore command will require an explicit add command."
1865
#: bzrlib/builtins.py:3090
1867
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1868
"After adding, editing or deleting that file either indirectly by\n"
1869
"using this command or directly by using an editor, be sure to commit\n"
1873
#: bzrlib/builtins.py:3095
1875
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1876
"the global ignore file can be found in the application data directory as\n"
1877
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1878
"Global ignores are not touched by this command. The global ignore file\n"
1879
"can be edited directly using an editor."
1882
#: bzrlib/builtins.py:3101
1884
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1885
"precedence over regular ignores. Such exceptions are used to specify\n"
1886
"files that should be versioned which would otherwise be ignored."
1889
#: bzrlib/builtins.py:3105
1891
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1892
"precedence over the '!' exception patterns."
1895
#: bzrlib/builtins.py:3108
1899
"* Ignore patterns containing shell wildcards must be quoted from\n"
1900
" the shell on Unix."
1903
#: bzrlib/builtins.py:3113
1905
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1906
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1909
#: bzrlib/builtins.py:3116
1912
" Ignore the top level Makefile::"
1915
#: bzrlib/builtins.py:3119
1916
msgid " bzr ignore ./Makefile"
1919
#: bzrlib/builtins.py:3121
1920
msgid " Ignore .class files in all directories...::"
1923
#: bzrlib/builtins.py:3123
1924
msgid " bzr ignore \"*.class\""
1927
#: bzrlib/builtins.py:3125
1928
msgid " ...but do not ignore \"special.class\"::"
1931
#: bzrlib/builtins.py:3127
1932
msgid " bzr ignore \"!special.class\""
1935
#: bzrlib/builtins.py:3129
1936
msgid " Ignore files whose name begins with the \"#\" character::"
1939
#: bzrlib/builtins.py:3131
1940
msgid " bzr ignore \"RE:^#\""
1941
msgstr " bzr ignore \"RE:^#\""
1943
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1944
msgid " Ignore .o files under the lib directory::"
1947
#: bzrlib/builtins.py:3135
1948
msgid " bzr ignore \"lib/**/*.o\""
1949
msgstr " bzr ignore \"lib/**/*.o\""
1951
#: bzrlib/builtins.py:3139
1952
msgid " bzr ignore \"RE:lib/.*\\.o\""
1953
msgstr " bzr ignore \"RE:lib/.*\\.o\""
1955
#: bzrlib/builtins.py:3141
1956
msgid " Ignore everything but the \"debian\" toplevel directory::"
1959
#: bzrlib/builtins.py:3143
1961
" bzr ignore \"RE:(?!debian/).*\"\n"
1963
" Ignore everything except the \"local\" toplevel directory,\n"
1964
" but always ignore autosave files ending in ~, even under local/::\n"
1966
" bzr ignore \"*\"\n"
1967
" bzr ignore \"!./local\"\n"
1968
" bzr ignore \"!!*~\""
1971
#: bzrlib/builtins.py:3157
1972
msgid "Display the default ignore rules that bzr uses."
1975
#: bzrlib/builtins.py:3169
1976
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1979
#: bzrlib/builtins.py:3180
1981
msgid "Invalid ignore pattern found. %s"
1982
msgid_plural "Invalid ignore patterns found. %s"
1983
msgstr[0] "Ungültiges Ignorierungsmuster gefunden. %s"
1984
msgstr[1] "Ungültige Ignorierungsmuster gefunden. %s"
1986
#: bzrlib/builtins.py:3189
1987
msgid "NAME_PATTERN should not be an absolute path"
1990
#: bzrlib/builtins.py:3202
1993
"Warning: the following files are version controlled and match your ignore "
1996
"These files will continue to be version controlled unless you 'bzr remove' "
2000
#: bzrlib/builtins.py:3209
2001
msgid "List ignored files and the patterns that matched them."
2004
#: bzrlib/builtins.py:3211
2006
"List all the ignored files and the ignore pattern that caused the file to\n"
2010
#: bzrlib/builtins.py:3214
2011
msgid "Alternatively, to list just the files::"
2012
msgstr "Alternativ, um nur die Dateien aufzulisten:"
2014
#: bzrlib/builtins.py:3216
2015
msgid " bzr ls --ignored"
2016
msgstr " bzr ls --ignored"
2018
#: bzrlib/builtins.py:3250
2020
msgid "not a valid revision-number: %r"
2021
msgstr "Keine gültige Revisionsnummer: %r"
2023
#: bzrlib/builtins.py:3257
2024
msgid "Export current or past revision to a destination directory or archive."
2027
#: bzrlib/builtins.py:3259
2028
msgid "If no revision is specified this exports the last committed revision."
2031
#: bzrlib/builtins.py:3261
2033
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2034
"given, try to find the format with the extension. If no extension\n"
2035
"is found exports to a directory (equivalent to --format=dir)."
2038
#: bzrlib/builtins.py:3265
2040
"If root is supplied, it will be used as the root directory inside\n"
2041
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2042
"to the exported filename. The root option has no effect for 'dir' format."
2045
#: bzrlib/builtins.py:3269
2047
"If branch is omitted then the branch containing the current working\n"
2048
"directory will be used."
2051
#: bzrlib/builtins.py:3272
2052
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2055
#: bzrlib/builtins.py:3274
2057
" ================= =========================\n"
2058
" Supported formats Autodetected by extension\n"
2059
" ================= =========================\n"
2062
" tbz2 .tar.bz2, .tbz2\n"
2063
" tgz .tar.gz, .tgz\n"
2065
" ================= ========================="
2068
#: bzrlib/builtins.py:3288
2069
msgid "Type of file to export to."
2070
msgstr "Art der Datei, in die exportiert wird."
2072
#: bzrlib/builtins.py:3291
2073
msgid "Apply content filters to export the convenient form."
2076
#: bzrlib/builtins.py:3295
2077
msgid "Name of the root directory inside the exported file."
2080
#: bzrlib/builtins.py:3297
2082
"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."
2090
#: bzrlib/builtins.py:3319
2091
msgid "--uncommitted requires a working tree"
2094
#: bzrlib/builtins.py:3328
2096
msgid "Unsupported export format: %s"
2097
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."
2103
#: bzrlib/builtins.py:3334
2104
msgid "If no revision is nominated, the last revision is used."
2105
msgstr "Wenn keine Revision bestimmt wurde, wird die neueste Revision benutzt."
2107
#: bzrlib/builtins.py:3336
2109
"Note: Take care to redirect standard output when using this command on a\n"
2113
#: bzrlib/builtins.py:3342
2114
msgid "The path name in the old tree."
2117
#: bzrlib/builtins.py:3343
2118
msgid "Apply content filters to display the convenience form."
2121
#: bzrlib/builtins.py:3354
2122
msgid "bzr cat --revision takes exactly one revision specifier"
2125
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2126
msgid "{0!r} is not present in revision {1}"
2127
msgstr "{0!r} ist in Revision {1} nicht vorhanden"
2129
#: bzrlib/builtins.py:3414
2130
msgid "Commit changes into a new revision."
2133
#: bzrlib/builtins.py:3416
2135
"An explanatory message needs to be given for each commit. This is\n"
2136
"often done by using the --message option (getting the message from the\n"
2137
"command line) or by using the --file option (getting the message from\n"
2138
"a file). If neither of these options is given, an editor is opened for\n"
2139
"the user to enter the message. To see the changed files in the\n"
2140
"boilerplate text loaded into the editor, use the --show-diff option."
2143
#: bzrlib/builtins.py:3423
2145
"By default, the entire tree is committed and the person doing the\n"
2146
"commit is assumed to be the author. These defaults can be overridden\n"
2147
"as explained below."
2150
#: bzrlib/builtins.py:3427
2151
msgid ":Selective commits:"
2154
#: bzrlib/builtins.py:3429
2156
" If selected files are specified, only changes to those files are\n"
2157
" committed. If a directory is specified then the directory and\n"
2158
" everything within it is committed."
2161
#: bzrlib/builtins.py:3433
2163
" When excludes are given, they take precedence over selected files.\n"
2164
" For example, to commit only changes within foo, but not changes\n"
2168
#: bzrlib/builtins.py:3437
2169
msgid " bzr commit foo -x foo/bar"
2172
#: bzrlib/builtins.py:3439
2173
msgid " A selective commit after a merge is not yet supported."
2176
#: bzrlib/builtins.py:3441
2177
msgid ":Custom authors:"
2178
msgstr ":Benutzerdefinierte Autoren:"
2180
#: bzrlib/builtins.py:3443
2182
" If the author of the change is not the same person as the committer,\n"
2183
" you can specify the author's name using the --author option. The\n"
2184
" name should be in the same format as a committer-id, e.g.\n"
2185
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2186
" the change you can specify the option multiple times, once for each\n"
2190
#: bzrlib/builtins.py:3450
2192
msgstr ":Prüfungen:"
2194
#: bzrlib/builtins.py:3452
2196
" A common mistake is to forget to add a new file or directory before\n"
2197
" running the commit command. The --strict option checks for unknown\n"
2198
" files and aborts the commit if any are found. More advanced pre-commit\n"
2199
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2203
#: bzrlib/builtins.py:3458
2204
msgid ":Things to note:"
2205
msgstr ":Dinge, die zu beachten sind:"
2207
#: bzrlib/builtins.py:3460
2209
" If you accidentially commit the wrong changes or make a spelling\n"
2210
" mistake in the commit message say, you can use the uncommit command\n"
2211
" to undo it. See ``bzr help uncommit`` for details."
2214
#: bzrlib/builtins.py:3464
2216
" Hooks can also be configured to run after a commit. This allows you\n"
2217
" to trigger updates to external systems like bug trackers. The --fixes\n"
2218
" option can be used to record the association between a revision and\n"
2219
" one or more bugs. See ``bzr help bugs`` for details."
2222
#: bzrlib/builtins.py:3474
2223
msgid "Do not consider changes made to a given path."
2226
#: bzrlib/builtins.py:3477
2227
msgid "Description of the new revision."
2228
msgstr "Beschreibung der neuen Revision."
2230
#: bzrlib/builtins.py:3480
2231
msgid "Commit even if nothing has changed."
2234
#: bzrlib/builtins.py:3484
2235
msgid "Take commit message from this file."
2238
#: bzrlib/builtins.py:3486
2239
msgid "Refuse to commit if there are unknown files in the working tree."
2242
#: bzrlib/builtins.py:3489
2244
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2248
#: bzrlib/builtins.py:3492
2249
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2252
#: bzrlib/builtins.py:3495
2253
msgid "Set the author's name, if it's different from the committer."
2256
#: bzrlib/builtins.py:3498
2258
"Perform a local commit in a bound branch. Local commits are not pushed to "
2259
"the master branch until a normal commit is performed."
2262
#: bzrlib/builtins.py:3504
2264
"When no message is supplied, show the diff along with the status summary in "
2265
"the message editor."
2268
#: bzrlib/builtins.py:3507
2270
"When committing to a foreign version control system do not push data that "
2271
"can not be natively represented."
2274
#: bzrlib/builtins.py:3525
2277
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2278
"default bug tracker using the `bugtracker` option.\n"
2279
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2282
#: bzrlib/builtins.py:3534
2285
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2286
"for more information on this feature.\n"
2290
#: bzrlib/builtins.py:3543
2292
msgid "Unrecognized bug %s. Commit refused."
2295
#: bzrlib/builtins.py:3546
2302
#: bzrlib/builtins.py:3570
2303
msgid "Could not parse --commit-time: "
2306
#: bzrlib/builtins.py:3610
2307
msgid "please specify either --message or --file"
2308
msgstr "Bitte geben Sie entweder --message oder --file an"
2310
#: bzrlib/builtins.py:3639
2311
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
2328
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2329
"resolve FILE\" to resolve."
2332
#: bzrlib/builtins.py:3670
2333
msgid "Commit refused because there are unknown files in the working tree."
2336
#: bzrlib/builtins.py:3673
2339
"To commit to master branch, run update and then commit.\n"
2340
"You can also pass --local to commit to continue working disconnected."
2343
#: bzrlib/builtins.py:3681
2345
"Validate working tree structure, branch consistency and repository history."
2348
#: bzrlib/builtins.py:3683
2350
"This command checks various invariants about branch and repository storage\n"
2351
"to detect data corruption or bzr bugs."
2354
#: bzrlib/builtins.py:3686
2356
"The working tree and branch checks will only give output if a problem is\n"
2357
"detected. The output fields of the repository check are:"
2360
#: bzrlib/builtins.py:3689
2363
" This is just the number of revisions checked. It doesn't\n"
2364
" indicate a problem."
2367
#: bzrlib/builtins.py:3693
2370
" This is just the number of versionedfiles checked. It\n"
2371
" doesn't indicate a problem."
2374
#: bzrlib/builtins.py:3697
2376
"unreferenced ancestors\n"
2377
" Texts that are ancestors of other texts, but\n"
2378
" are not properly referenced by the revision ancestry. This is a\n"
2379
" subtle problem that Bazaar can work around."
2382
#: bzrlib/builtins.py:3702
2384
"unique file texts\n"
2385
" This is the total number of unique file contents\n"
2386
" seen in the checked revisions. It does not indicate a problem."
2389
#: bzrlib/builtins.py:3706
2391
"repeated file texts\n"
2392
" This is the total number of repeated texts seen\n"
2393
" in the checked revisions. Texts can be repeated when their file\n"
2394
" entries are modified, but the file contents are not. It does not\n"
2395
" indicate a problem."
2398
#: bzrlib/builtins.py:3712
2400
"If no restrictions are specified, all Bazaar data that is found at the "
2402
"location will be checked."
2405
#: bzrlib/builtins.py:3717
2406
msgid " Check the tree and branch at 'foo'::"
2409
#: bzrlib/builtins.py:3719
2410
msgid " bzr check --tree --branch foo"
2413
#: bzrlib/builtins.py:3721
2414
msgid " Check only the repository at 'bar'::"
2417
#: bzrlib/builtins.py:3723
2418
msgid " bzr check --repo bar"
2421
#: bzrlib/builtins.py:3725
2422
msgid " Check everything at 'baz'::"
2425
#: bzrlib/builtins.py:3727
2426
msgid " bzr check baz"
2429
#: bzrlib/builtins.py:3733
2430
msgid "Check the branch related to the current directory."
2433
#: bzrlib/builtins.py:3735
2434
msgid "Check the repository related to the current directory."
2437
#: bzrlib/builtins.py:3737
2438
msgid "Check the working tree related to the current directory."
2441
#: bzrlib/builtins.py:3751
2442
msgid "Upgrade a repository, branch or working tree to a newer format."
2445
#: bzrlib/builtins.py:3753
2447
"When the default format has changed after a major new release of\n"
2448
"Bazaar, you may be informed during certain operations that you\n"
2449
"should upgrade. Upgrading to a newer format may improve performance\n"
2450
"or make new features available. It may however limit interoperability\n"
2451
"with older repositories or with older versions of Bazaar."
2454
#: bzrlib/builtins.py:3759
2456
"If you wish to upgrade to a particular format rather than the\n"
2457
"current default, that can be specified using the --format option.\n"
2458
"As a consequence, you can use the upgrade command this way to\n"
2459
"\"downgrade\" to an earlier format, though some conversions are\n"
2460
"a one way process (e.g. changing from the 1.x default to the\n"
2461
"2.x default) so downgrading is not always possible."
2464
#: bzrlib/builtins.py:3766
2466
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2467
"process (where # is a number). By default, this is left there on\n"
2468
"completion. If the conversion fails, delete the new .bzr directory\n"
2469
"and rename this one back in its place. Use the --clean option to ask\n"
2470
"for the backup.bzr directory to be removed on successful conversion.\n"
2471
"Alternatively, you can delete it by hand if everything looks good\n"
2475
#: bzrlib/builtins.py:3774
2477
"If the location given is a shared repository, dependent branches\n"
2478
"are also converted provided the repository converts successfully.\n"
2479
"If the conversion of a branch fails, remaining branches are still\n"
2483
#: bzrlib/builtins.py:3779
2485
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2486
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2489
#: bzrlib/builtins.py:3787
2490
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2493
#: bzrlib/builtins.py:3791
2494
msgid "Branch format"
2495
msgstr "Format des Zweiges"
2497
#: bzrlib/builtins.py:3793
2498
msgid "Remove the backup.bzr directory if successful."
2501
#: bzrlib/builtins.py:3795
2502
msgid "Show what would be done, but don't actually do anything."
2503
msgstr "Nur zeigen, was getan werden würde, aber nichts wirklich machen."
2505
#: bzrlib/builtins.py:3810
2506
msgid "Show or set bzr user id."
2509
#: bzrlib/builtins.py:3812
2512
" Show the email of the current user::"
2515
" Die E-Mail-Adresse des aktuellen Benutzers zeigen::"
2517
#: bzrlib/builtins.py:3815
2518
msgid " bzr whoami --email"
2519
msgstr " bzr whoami --email"
2521
#: bzrlib/builtins.py:3817
2522
msgid " Set the current user::"
2523
msgstr " Aktuellen Benutzer festlegen::"
2525
#: bzrlib/builtins.py:3819
2526
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2527
msgstr " bzr whoami \"Frank Chu <ich@beispiel.de>\""
2529
#: bzrlib/builtins.py:3823
2530
msgid "Display email address only."
2531
msgstr "Nur die E-Mail-Adresse anzeigen."
2533
#: bzrlib/builtins.py:3825
2534
msgid "Set identity for the current branch instead of globally."
2537
#: bzrlib/builtins.py:3851
2538
msgid "--email can only be used to display existing identity"
2541
#: bzrlib/builtins.py:3873
2542
msgid "Print or set the branch nickname."
2545
#: bzrlib/builtins.py:3875
2547
"If unset, the tree root directory name is used as the nickname.\n"
2548
"To print the current nickname, execute with no argument."
2551
#: bzrlib/builtins.py:3878
2553
"Bound branches use the nickname of its master branch unless it is set\n"
2557
#: bzrlib/builtins.py:3898
2558
msgid "Set/unset and display aliases."
2561
#: bzrlib/builtins.py:3900
2564
" Show the current aliases::"
2567
" Die aktuellen Aliase zeigen::"
2569
#: bzrlib/builtins.py:3903
2573
#: bzrlib/builtins.py:3905
2574
msgid " Show the alias specified for 'll'::"
2577
#: bzrlib/builtins.py:3907
2578
msgid " bzr alias ll"
2579
msgstr " bzr alias ll"
2581
#: bzrlib/builtins.py:3909
2582
msgid " Set an alias for 'll'::"
2585
#: bzrlib/builtins.py:3911
2586
msgid " bzr alias ll=\"log --line -r-10..-1\""
2587
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2589
#: bzrlib/builtins.py:3913
2590
msgid " To remove an alias for 'll'::"
2593
#: bzrlib/builtins.py:3915
2594
msgid " bzr alias --remove ll"
2595
msgstr " bzr alias --remove ll"
2597
#: bzrlib/builtins.py:3920
2598
msgid "Remove the alias."
2599
msgstr "Den Alias entfernen."
2601
#: bzrlib/builtins.py:3938
2602
msgid "bzr alias --remove expects an alias to remove."
2603
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."
2609
#: bzrlib/builtins.py:4136
2611
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2614
#: bzrlib/builtins.py:4183
2615
msgid "Show version of bzr."
2616
msgstr "Version von bzr anzeigen."
2618
#: bzrlib/builtins.py:4187
2619
msgid "Print just the version number."
2620
msgstr "Nur die Versionsnummer ausgeben."
2622
#: bzrlib/builtins.py:4206
2623
msgid "It sure does!\n"
2626
#: bzrlib/builtins.py:4230
2628
msgid "merge base is revision %s\n"
2631
#: bzrlib/builtins.py:4234
2632
msgid "Perform a three-way merge."
2635
#: bzrlib/builtins.py:4236
2637
"The source of the merge can be specified either in the form of a branch,\n"
2638
"or in the form of a path to a file containing a merge directive generated\n"
2639
"with bzr send. If neither is specified, the default is the upstream branch\n"
2640
"or the branch most recently merged using --remember. The source of the\n"
2641
"merge may also be specified in the form of a path to a file in another\n"
2642
"branch: in this case, only the modifications to that file are merged into\n"
2643
"the current working tree."
2646
#: bzrlib/builtins.py:4244
2648
"When merging from a branch, by default bzr will try to merge in all new\n"
2649
"work from the other branch, automatically determining an appropriate base\n"
2650
"revision. If this fails, you may need to give an explicit base."
2653
#: bzrlib/builtins.py:4248
2655
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2656
"try to merge in all new work up to and including revision OTHER."
2659
#: bzrlib/builtins.py:4251
2661
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2662
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2663
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2664
"not already contain revision BASE, such a merge is commonly referred to as\n"
2665
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2666
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2667
"changes from the other branch is not stored in the commit."
2670
#: bzrlib/builtins.py:4259
2671
msgid "Revision numbers are always relative to the source branch."
2674
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2676
"Merge will do its best to combine the changes in two branches, but there\n"
2677
"are some kinds of problems only a human can fix. When it encounters those,\n"
2678
"it will mark a conflict. A conflict means that you need to fix something,\n"
2679
"before you can commit."
2682
#: bzrlib/builtins.py:4266
2683
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2686
#: bzrlib/builtins.py:4268
2688
"If there is no default branch set, the first merge will set it (use\n"
2689
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2690
"to use the default. To change the default, use --remember. The value will\n"
2691
"only be saved if the remote location can be accessed."
2694
#: bzrlib/builtins.py:4273
2696
"The results of the merge are placed into the destination working\n"
2697
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2698
"committed to record the result of the merge."
2701
#: bzrlib/builtins.py:4277
2703
"merge refuses to run if there are any uncommitted changes, unless\n"
2704
"--force is given. If --force is given, then the changes from the source \n"
2705
"will be merged with the current working tree, including any uncommitted\n"
2706
"changes in the tree. The --force option can also be used to create a\n"
2707
"merge revision which has more than two parents."
2710
#: bzrlib/builtins.py:4283
2712
"If one would like to merge changes from the working tree of the other\n"
2713
"branch without merging any committed revisions, the --uncommitted option\n"
2717
#: bzrlib/builtins.py:4287
2719
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2720
"you to apply each diff hunk and file change, similar to \"shelve\"."
2723
#: bzrlib/builtins.py:4290
2726
" To merge all new revisions from bzr.dev::"
2729
#: bzrlib/builtins.py:4293
2730
msgid " bzr merge ../bzr.dev"
2731
msgstr " bzr merge ../bzr.dev"
2733
#: bzrlib/builtins.py:4295
2734
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2737
#: bzrlib/builtins.py:4297
2738
msgid " bzr merge -r 82 ../bzr.dev"
2739
msgstr " bzr merge -r 82 ../bzr.dev"
2741
#: bzrlib/builtins.py:4299
2742
msgid " To merge the changes introduced by 82, without previous changes::"
2745
#: bzrlib/builtins.py:4301
2746
msgid " bzr merge -r 81..82 ../bzr.dev"
2747
msgstr " bzr merge -r 81..82 ../bzr.dev"
2749
#: bzrlib/builtins.py:4303
2750
msgid " To apply a merge directive contained in /tmp/merge::"
2753
#: bzrlib/builtins.py:4305
2754
msgid " bzr merge /tmp/merge"
2755
msgstr " bzr merge /tmp/merge"
2757
#: bzrlib/builtins.py:4307
2759
" To create a merge revision with three parents from two branches\n"
2760
" feature1a and feature1b:"
2763
#: bzrlib/builtins.py:4310
2765
" bzr merge ../feature1a\n"
2766
" bzr merge ../feature1b --force\n"
2767
" bzr commit -m 'revision with three parents'"
2770
#: bzrlib/builtins.py:4322
2771
msgid "Merge even if the destination tree has uncommitted changes."
2774
#: bzrlib/builtins.py:4328
2776
"Apply uncommitted changes from a working copy, instead of branch changes."
2779
#: bzrlib/builtins.py:4330
2781
"If the destination is already completely merged into the source, pull from "
2782
"the source rather than merging. When this happens, you do not need to "
2783
"commit the result."
2786
#: bzrlib/builtins.py:4335
2788
"Branch to merge into, rather than the one containing the working directory."
2791
#: bzrlib/builtins.py:4337
2792
msgid "Instead of merging, show a diff of the merge."
2795
#: bzrlib/builtins.py:4339
2796
msgid "Select changes interactively."
2797
msgstr "Änderungen interaktiv auswählen."
2799
#: bzrlib/builtins.py:4361
2801
"Merging into empty branches not currently supported, https://bugs.launchpad."
2802
"net/bzr/+bug/308562"
2805
#: bzrlib/builtins.py:4388
2806
msgid "Cannot use --uncommitted with bundles or merge directives."
2809
#: bzrlib/builtins.py:4399
2810
msgid "Cannot use --uncommitted and --revision at the same time."
2813
#: bzrlib/builtins.py:4419
2817
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2818
msgid "Nothing to do."
2819
msgstr "Nichts zu tun."
2821
#: bzrlib/builtins.py:4425
2822
msgid "Cannot pull individual files"
2823
msgstr "Nicht möglich, einzelne Dateien zu laden"
2825
#: bzrlib/builtins.py:4433
2826
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2829
#: bzrlib/builtins.py:4491
2831
msgid "Show-base is not supported for this merge type. %s"
2834
#: bzrlib/builtins.py:4500
2836
msgid "Conflict reduction is not supported for merge type %s."
2839
#: bzrlib/builtins.py:4504
2840
msgid "Cannot do conflict reduction and show base."
2843
#: bzrlib/builtins.py:4615
2844
msgid "No location specified or remembered"
2847
#: bzrlib/builtins.py:4617
2848
msgid "{0} remembered {1} location {2}"
2851
#: bzrlib/builtins.py:4623
2852
msgid "Redo a merge."
2855
#: bzrlib/builtins.py:4625
2857
"Use this if you want to try a different merge technique while resolving\n"
2858
"conflicts. Some merge techniques are better than others, and remerge\n"
2859
"lets you try different ones on different files."
2862
#: bzrlib/builtins.py:4629
2864
"The options for remerge have the same meaning and defaults as the ones for\n"
2865
"merge. The difference is that remerge can (only) be run when there is a\n"
2866
"pending merge, and it lets you specify particular files."
2869
#: bzrlib/builtins.py:4633
2872
" Re-do the merge of all conflicted files, and show the base text in\n"
2873
" conflict regions, in addition to the usual THIS and OTHER texts::"
2876
#: bzrlib/builtins.py:4637
2877
msgid " bzr remerge --show-base"
2878
msgstr " bzr remerge --show-base"
2880
#: bzrlib/builtins.py:4639
2882
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2883
" additional processing to reduce the size of conflict regions::"
2886
#: bzrlib/builtins.py:4642
2887
msgid " bzr remerge --merge-type weave --reprocess foobar"
2890
#: bzrlib/builtins.py:4649
2891
msgid "Show base revision text in conflicts."
2894
#: bzrlib/builtins.py:4661
2896
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2900
#: bzrlib/builtins.py:4717
2901
msgid "Revert files to a previous revision."
2904
#: bzrlib/builtins.py:4719
2906
"Giving a list of files will revert only those files. Otherwise, all files\n"
2907
"will be reverted. If the revision is not specified with '--revision', the\n"
2908
"last committed revision is used."
2911
#: bzrlib/builtins.py:4723
2913
"To remove only some changes, without reverting to a prior version, use\n"
2914
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2915
"will remove the changes introduced by the second last commit (-2), without\n"
2916
"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."
2920
#: bzrlib/builtins.py:4729
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."
2927
#: bzrlib/builtins.py:4733
2929
"When you provide files, you can use their current pathname or the pathname\n"
2930
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2931
"name. If you name a directory, all the contents of that directory will be\n"
2935
#: bzrlib/builtins.py:4738
2937
"If you have newly added files since the target revision, they will be\n"
2938
"removed. If the files to be removed have been changed, backups will be\n"
2939
"created as above. Directories containing unknown files will not be\n"
2943
#: bzrlib/builtins.py:4743
2945
"The working tree contains a list of revisions that have been merged but\n"
2946
"not yet committed. These revisions will be included as additional parents\n"
2947
"of the next commit. Normally, using revert clears that list as well as\n"
2948
"reverting the files. If any files are specified, revert leaves the list\n"
2949
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2950
".`` in the tree root to revert all files but keep the recorded merges,\n"
2951
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2952
"reverting any files."
2955
#: bzrlib/builtins.py:4752
2957
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2958
"changes from a branch in a single revision. To do this, perform the merge\n"
2959
"as desired. Then doing revert with the \"--forget-merges\" option will "
2961
"the content of the tree as it was, but it will clear the list of pending\n"
2962
"merges. The next commit will then contain all of the changes that are\n"
2963
"present in the other branch, but without any other parent revisions.\n"
2964
"Because this technique forgets where these changes originated, it may\n"
2965
"cause additional conflicts on later merges involving the same source and\n"
2969
#: bzrlib/builtins.py:4766
2970
msgid "Do not save backups of reverted files."
2971
msgstr "Keine Sicherungskopien von zurückgesetzten Dateien erstellen."
2973
#: bzrlib/builtins.py:4768
2974
msgid "Remove pending merge marker, without changing any files."
2977
#: bzrlib/builtins.py:4799
2979
"Show help on a command or other topic.\n"
2982
"Hilfe zu einem Befehl oder Thema anzeigen.\n"
2985
#: bzrlib/builtins.py:4804
2986
msgid "Show help on all commands."
2987
msgstr "Hilfe zu allen Befehlen anzeigen."
2989
#: bzrlib/builtins.py:4833
2990
msgid "Show unmerged/unpulled revisions between two branches."
2993
#: bzrlib/builtins.py:4835
2994
msgid "OTHER_BRANCH may be local or remote."
2997
#: bzrlib/builtins.py:4837
2999
"To filter on a range of revisions, you can use the command -r begin..end\n"
3000
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3004
" 1 - some missing revisions\n"
3005
" 0 - no missing revisions"
3008
#: bzrlib/builtins.py:4847
3010
" Determine the missing revisions between this and the branch at the\n"
3011
" remembered pull location::"
3014
#: bzrlib/builtins.py:4850
3015
msgid " bzr missing"
3016
msgstr " bzr missing"
3018
#: bzrlib/builtins.py:4852
3019
msgid " Determine the missing revisions between this and another branch::"
3022
#: bzrlib/builtins.py:4854
3023
msgid " bzr missing http://server/branch"
3026
#: bzrlib/builtins.py:4856
3028
" Determine the missing revisions up to a specific revision on the other\n"
3032
#: bzrlib/builtins.py:4859
3033
msgid " bzr missing -r ..-10"
3034
msgstr " bzr missing -r ..-10"
3036
#: bzrlib/builtins.py:4861
3038
" Determine the missing revisions up to a specific revision on this\n"
3042
#: bzrlib/builtins.py:4864
3043
msgid " bzr missing --my-revision ..-10"
3044
msgstr " bzr missing --my-revision ..-10"
3046
#: bzrlib/builtins.py:4871
3047
msgid "Reverse the order of revisions."
3050
#: bzrlib/builtins.py:4873
3051
msgid "Display changes in the local branch only."
3052
msgstr "Nur Änderungen im lokalen Zweig anzeigen."
3054
#: bzrlib/builtins.py:4874
3055
msgid "Same as --mine-only."
3056
msgstr "Dasselbe wie --mine-only."
3058
#: bzrlib/builtins.py:4876
3059
msgid "Display changes in the remote branch only."
3060
msgstr "Nur Änderungen im entfernten Zweig anzeigen."
3062
#: bzrlib/builtins.py:4877
3063
msgid "Same as --theirs-only."
3064
msgstr "Dasselbe wie --theirs-only."
3066
#: bzrlib/builtins.py:4882
3068
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3072
#: bzrlib/builtins.py:4886
3074
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3078
#: bzrlib/builtins.py:4889
3079
msgid "Show all revisions in addition to the mainline ones."
3082
#: bzrlib/builtins.py:4943
3083
msgid "No peer location known or specified."
3086
#: bzrlib/builtins.py:4947
3087
msgid "Using saved parent location: {0}\n"
3090
#: bzrlib/builtins.py:4980
3092
msgid "You have %d extra revision:\n"
3093
msgid_plural "You have %d extra revisions:\n"
3094
msgstr[0] "Sie haben %d zusätzliche Revision:\n"
3095
msgstr[1] "Sie haben %d zusätzliche Revisionen:\n"
3097
#: bzrlib/builtins.py:4996
3099
msgid "You are missing %d revision:\n"
3100
msgid_plural "You are missing %d revisions:\n"
3101
msgstr[0] "Ihnen fehlt %d Revision:\n"
3102
msgstr[1] "Ihnen fehlen %d Revisionen:\n"
3104
#: bzrlib/builtins.py:5008
3105
msgid "This branch has no new revisions.\n"
3106
msgstr "Dieser Zweig hat keine neuen Revisionen.\n"
3108
#: bzrlib/builtins.py:5011
3109
msgid "Other branch has no new revisions.\n"
3110
msgstr "Anderer Zweig hat keine neuen Revisionen.\n"
3112
#: bzrlib/builtins.py:5016
3113
msgid "Branches are up to date.\n"
3114
msgstr "Zweige sind aktuell.\n"
3116
#: bzrlib/builtins.py:5027
3117
msgid "Compress the data within a repository."
3120
#: bzrlib/builtins.py:5029
3122
"This operation compresses the data within a bazaar repository. As\n"
3123
"bazaar supports automatic packing of repository, this operation is\n"
3124
"normally not required to be done manually."
3127
#: bzrlib/builtins.py:5033
3129
"During the pack operation, bazaar takes a backup of existing repository\n"
3130
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3131
"automatically when it is safe to do so. To save disk space by removing\n"
3132
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3136
#: bzrlib/builtins.py:5039
3138
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3139
"during or immediately after repacking, you may be left with a state\n"
3140
"where the deletion has been written to disk but the new packs have not\n"
3141
"been. In this case the repository may be unusable."
3144
#: bzrlib/builtins.py:5048
3145
msgid "Delete obsolete packs to save disk space."
3148
#: bzrlib/builtins.py:5062
3149
msgid "List the installed plugins."
3150
msgstr "Installierte Erweiterungen auflisten."
3152
#: bzrlib/builtins.py:5064
3154
"This command displays the list of installed plugins including\n"
3155
"version of plugin and a short description of each."
3158
#: bzrlib/builtins.py:5067
3159
msgid "--verbose shows the path where each plugin is located."
3162
#: bzrlib/builtins.py:5069
3164
"A plugin is an external component for Bazaar that extends the\n"
3165
"revision control system, by adding or replacing code in Bazaar.\n"
3166
"Plugins can do a variety of things, including overriding commands,\n"
3167
"adding new commands, providing additional network transports and\n"
3168
"customizing log output."
3171
#: bzrlib/builtins.py:5075
3173
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3174
"for further information on plugins including where to find them and how to\n"
3175
"install them. Instructions are also provided there on how to write new\n"
3176
"plugins using the Python programming language."
3179
#: bzrlib/builtins.py:5091
3180
msgid "Show testament (signing-form) of a revision."
3183
#: bzrlib/builtins.py:5094
3184
msgid "Produce long-format testament."
3187
#: bzrlib/builtins.py:5096
3188
msgid "Produce a strict-format testament."
3191
#: bzrlib/builtins.py:5122
3192
msgid "Show the origin of each line in a file."
3193
msgstr "Ursprung jeder Zeile in einer Datei anzeigen."
3195
#: bzrlib/builtins.py:5124
3197
"This prints out the given file with an annotation on the left side\n"
3198
"indicating which revision, author and date introduced the change."
3201
#: bzrlib/builtins.py:5127
3203
"If the origin is the same for a run of consecutive lines, it is\n"
3204
"shown only at the top, unless the --all option is given."
3207
#: bzrlib/builtins.py:5135
3208
msgid "Show annotations on all lines."
3211
#: bzrlib/builtins.py:5136
3212
msgid "Show commit date in annotations."
3215
#: bzrlib/builtins.py:5223
3216
msgid "Cannot sign a range of non-revision-history revisions"
3219
#: bzrlib/builtins.py:5235
3220
msgid "Please supply either one revision, or a range."
3221
msgstr "Bitte geben Sie entweder eine Revision oder einen Bereich an."
3223
#: bzrlib/builtins.py:5239
3225
"Convert the current branch into a checkout of the supplied branch.\n"
3226
"If no branch is supplied, rebind to the last bound location."
3229
#: bzrlib/builtins.py:5242
3231
"Once converted into a checkout, commits must succeed on the master branch\n"
3232
"before they will be applied to the local branch."
3235
#: bzrlib/builtins.py:5245
3237
"Bound branches use the nickname of its master branch unless it is set\n"
3238
"locally, in which case binding will update the local nickname to be\n"
3239
"that of the master."
3242
#: bzrlib/builtins.py:5260
3243
msgid "No location supplied. This format does not remember old locations."
3246
#: bzrlib/builtins.py:5265
3247
msgid "Branch is already bound"
3250
#: bzrlib/builtins.py:5267
3251
msgid "No location supplied and no previous location known"
3254
#: bzrlib/builtins.py:5273
3255
msgid "These branches have diverged. Try merging, and then bind again."
3258
#: bzrlib/builtins.py:5280
3259
msgid "Convert the current checkout into a regular branch."
3262
#: bzrlib/builtins.py:5282
3264
"After unbinding, the local branch is considered independent and subsequent\n"
3265
"commits will be local only."
3268
#: bzrlib/builtins.py:5293
3269
msgid "Local branch is not bound"
3272
#: bzrlib/builtins.py:5297
3273
msgid "Remove the last committed revision."
3276
#: bzrlib/builtins.py:5299
3278
"--verbose will print out what is being removed.\n"
3279
"--dry-run will go through all the motions, but not actually\n"
3283
#: bzrlib/builtins.py:5303
3285
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3286
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3287
"branch at revision 15."
3290
#: bzrlib/builtins.py:5307
3292
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3293
"it may make is to restore any pending merges that were present before\n"
3297
#: bzrlib/builtins.py:5318
3298
msgid "Don't actually make changes."
3299
msgstr "Keine Änderungen durchführen."
3301
#: bzrlib/builtins.py:5319
3302
msgid "Say yes to all questions."
3303
msgstr "Alle Fragen mit Ja beantworten."
3305
#: bzrlib/builtins.py:5321
3306
msgid "Keep tags that point to removed revisions."
3309
#: bzrlib/builtins.py:5323
3310
msgid "Only remove the commits from the local branch when in a checkout."
3313
#: bzrlib/builtins.py:5372
3314
msgid "No revisions to uncommit.\n"
3317
#: bzrlib/builtins.py:5387
3318
msgid "Dry-run, pretending to remove the above revisions.\n"
3320
"Testlauf, es wird so getan, als ob die obigen Revisionen entfernt würden.\n"
3322
#: bzrlib/builtins.py:5390
3323
msgid "The above revision(s) will be removed.\n"
3324
msgstr "Oben stehende Revision(en) wird/werden entfernt.\n"
3326
#: bzrlib/builtins.py:5394
3327
msgid "Uncommit these revisions"
3330
#: bzrlib/builtins.py:5397
3332
msgstr "Abgebrochen\n"
3334
#: bzrlib/builtins.py:5404
3337
"You can restore the old tip by running:\n"
3338
" bzr pull . -r revid:%s\n"
3341
#: bzrlib/builtins.py:5409
3342
msgid "Break a dead lock."
3345
#: bzrlib/builtins.py:5411
3347
"This command breaks a lock on a repository, branch, working directory or\n"
3351
#: bzrlib/builtins.py:5414
3353
"CAUTION: Locks should only be broken when you are sure that the process\n"
3354
"holding the lock has been stopped."
3357
#: bzrlib/builtins.py:5417
3359
"You can get information on what locks are open via the 'bzr info\n"
3360
"[location]' command."
3363
#: bzrlib/builtins.py:5420
3367
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3368
" bzr break-lock --conf ~/.bazaar"
3371
#: bzrlib/builtins.py:5429
3372
msgid "LOCATION is the directory where the config lock is."
3375
#: bzrlib/builtins.py:5431
3376
msgid "Do not ask for confirmation before breaking the lock."
3379
#: bzrlib/builtins.py:5466
3380
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3381
msgstr "Das Bazaar-Smart-Server-Protokoll via TCP. (Vorgabe-Port: 4155)"
3383
#: bzrlib/builtins.py:5467
3384
msgid "Run the bzr server."
3385
msgstr "Den bzr-Server starten."
3387
#: bzrlib/builtins.py:5473
3388
msgid "Serve on stdin/out for use from inetd or sshd."
3391
#: bzrlib/builtins.py:5474
3395
#: bzrlib/builtins.py:5475
3396
msgid "Protocol to serve."
3399
#: bzrlib/builtins.py:5479
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."
3406
#: bzrlib/builtins.py:5485
3407
msgid "Serve contents of this directory."
3410
#: bzrlib/builtins.py:5487
3412
"By default the server is a readonly server. Supplying --allow-writes "
3413
"enables write access to the contents of the served directory and below. "
3414
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3415
"of external authentication is arranged supplying this option leads to global "
3416
"uncontrolled write access to your file system."
3419
#: bzrlib/builtins.py:5496
3420
msgid "Override the default idle client timeout (5min)."
3423
#: bzrlib/builtins.py:5546
3424
msgid "Combine a tree into its containing tree."
3427
#: bzrlib/builtins.py:5548
3428
msgid "This command requires the target tree to be in a rich-root format."
3431
#: bzrlib/builtins.py:5550
3433
"The TREE argument should be an independent tree, inside another tree, but\n"
3434
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3435
"running \"bzr branch\" with the target inside a tree.)"
3438
#: bzrlib/builtins.py:5554
3440
"The result is a combined tree, with the subtree no longer an independent\n"
3441
"part. This is marked as a merge of the subtree into the containing tree,\n"
3442
"and all history is preserved."
3445
#: bzrlib/builtins.py:5572
3448
"Can't join trees because %s doesn't support rich root data.\n"
3449
"You can use bzr upgrade on the repository."
3452
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3453
msgid "Cannot join {0}. {1}"
3456
#: bzrlib/builtins.py:5592
3457
msgid "Split a subdirectory of a tree into a separate tree."
3460
#: bzrlib/builtins.py:5594
3462
"This command will produce a target tree in a format that supports\n"
3463
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3464
"converted into earlier formats like 'dirstate-tags'."
3467
#: bzrlib/builtins.py:5598
3469
"The TREE argument should be a subdirectory of a working tree. That\n"
3470
"subdirectory will be converted into an independent tree, with its own\n"
3471
"branch. Commits in the top-level tree will not apply to the new subtree."
3474
#: bzrlib/builtins.py:5678
3475
msgid "No submit branch specified or known"
3478
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3479
msgid "No public branch specified or known"
3482
#: bzrlib/builtins.py:5691
3483
msgid "bzr merge-directive takes at most two one revision identifiers"
3486
#: bzrlib/builtins.py:5700
3487
msgid "No revisions to bundle."
3490
#: bzrlib/builtins.py:5719
3491
msgid "Mail or create a merge-directive for submitting changes."
3494
#: bzrlib/builtins.py:5721
3495
msgid "A merge directive provides many things needed for requesting merges:"
3498
#: bzrlib/builtins.py:5723
3499
msgid "* A machine-readable description of the merge to perform"
3502
#: bzrlib/builtins.py:5725
3503
msgid "* An optional patch that is a preview of the changes requested"
3505
"* Ein optionaler Patch, der eine Vorschau der gewünschten Änderungen "
3508
#: bzrlib/builtins.py:5727
3510
"* An optional bundle of revision data, so that the changes can be applied\n"
3511
" directly from the merge directive, without retrieving data from a\n"
3515
#: bzrlib/builtins.py:5731
3517
"`bzr send` creates a compact data set that, when applied using bzr\n"
3518
"merge, has the same effect as merging from the source branch. "
3521
#: bzrlib/builtins.py:5734
3523
"By default the merge directive is self-contained and can be applied to any\n"
3524
"branch containing submit_branch in its ancestory without needing access to\n"
3525
"the source branch."
3528
#: bzrlib/builtins.py:5738
3530
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3531
"revisions, but only a structured request to merge from the\n"
3532
"public_location. In that case the public_branch is needed and it must be\n"
3533
"up-to-date and accessible to the recipient. The public_branch is always\n"
3534
"included if known, so that people can check it later."
3537
#: bzrlib/builtins.py:5744
3539
"The submit branch defaults to the parent of the source branch, but can be\n"
3540
"overridden. Both submit branch and public branch will be remembered in\n"
3541
"branch.conf the first time they are used for a particular branch. The\n"
3542
"source branch defaults to that containing the working directory, but can\n"
3543
"be changed using --from."
3546
#: bzrlib/builtins.py:5750
3548
"Both the submit branch and the public branch follow the usual behavior with\n"
3549
"respect to --remember: If there is no default location set, the first send\n"
3550
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3551
"omit the location to use the default. To change the default, use\n"
3552
"--remember. The value will only be saved if the location can be accessed."
3555
#: bzrlib/builtins.py:5756
3557
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3558
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3559
"If a public location is known for the submit_branch, that location is used\n"
3560
"in the merge directive."
3563
#: bzrlib/builtins.py:5761
3565
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3566
"given, in which case it is sent to a file."
3569
#: bzrlib/builtins.py:5764
3571
"Mail is sent using your preferred mail program. This should be transparent\n"
3572
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3573
"If the preferred client can't be found (or used), your editor will be used."
3576
#: bzrlib/builtins.py:5768
3578
"To use a specific mail program, set the mail_client configuration option.\n"
3579
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3580
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3582
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3583
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3585
"supported clients."
3588
#: bzrlib/builtins.py:5775
3590
"If mail is being sent, a to address is required. This can be supplied\n"
3591
"either on the commandline, by setting the submit_to configuration\n"
3592
"option in the branch itself or the child_submit_to configuration option\n"
3593
"in the submit branch."
3596
#: bzrlib/builtins.py:5780
3598
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3600
"merge directive format 2. It is significantly faster and smaller than\n"
3601
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3602
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3603
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3606
#: bzrlib/builtins.py:5786
3608
"The merge directives created by bzr send may be applied using bzr merge or\n"
3609
"bzr pull by specifying a file containing a merge directive as the location."
3612
#: bzrlib/builtins.py:5789
3614
"bzr send makes extensive use of public locations to map local locations "
3616
"URLs that can be used by other people. See `bzr help configuration` to\n"
3617
"set them, and use `bzr info` to display them."
3620
#: bzrlib/builtins.py:5813
3621
msgid "Write merge directive to this file or directory; use - for stdout."
3624
#: bzrlib/builtins.py:5817
3626
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3627
"strict disables the check."
3630
#: bzrlib/builtins.py:5819
3631
msgid "Mail the request to this address."
3632
msgstr "Die Anfrage an diese Adresse schicken."
3634
#: bzrlib/builtins.py:5823
3635
msgid "Body for the email."
3636
msgstr "Inhalt der E-Mail."
3638
#: bzrlib/builtins.py:5876
3639
msgid "Do not include a bundle in the merge directive."
3642
#: bzrlib/builtins.py:5877
3643
msgid "Do not include a preview patch in the merge directive."
3646
#: bzrlib/builtins.py:5880
3647
msgid "Remember submit and public branch."
3650
#: bzrlib/builtins.py:5882
3652
"Branch to generate the submission from, rather than the one containing the "
3653
"working directory."
3656
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3660
#: bzrlib/builtins.py:5893
3661
msgid "Use the specified output format."
3662
msgstr "Das angegebene Ausgabeformat benutzen."
3664
#: bzrlib/builtins.py:5915
3665
msgid "Create, remove or modify a tag naming a revision."
3668
#: bzrlib/builtins.py:5917
3670
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3671
"(--revision) option can be given -rtag:X, where X is any previously\n"
3675
#: bzrlib/builtins.py:5921
3677
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3678
"along when you branch, push, pull or merge."
3681
#: bzrlib/builtins.py:5924
3683
"It is an error to give a tag name that already exists unless you pass\n"
3684
"--force, in which case the tag is moved to point to the new revision."
3687
#: bzrlib/builtins.py:5927
3689
"To rename a tag (change the name but keep it on the same revsion), run "
3691
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3694
#: bzrlib/builtins.py:5930
3696
"If no tag name is specified it will be determined through the \n"
3697
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3698
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3702
#: bzrlib/builtins.py:5940
3703
msgid "Delete this tag rather than placing it."
3706
#: bzrlib/builtins.py:5943
3707
msgid "Branch in which to place the tag."
3710
#: bzrlib/builtins.py:5945
3711
msgid "Replace existing tags."
3714
#: bzrlib/builtins.py:5960
3715
msgid "No tag specified to delete."
3718
#: bzrlib/builtins.py:5962
3720
msgid "Deleted tag %s."
3723
#: bzrlib/builtins.py:5976
3724
msgid "Please specify a tag name."
3727
#: bzrlib/builtins.py:5984
3729
msgid "Tag %s already exists for that revision."
3732
#: bzrlib/builtins.py:5988
3734
msgid "Created tag %s."
3737
#: bzrlib/builtins.py:5990
3739
msgid "Updated tag %s."
3742
#: bzrlib/builtins.py:5994
3746
#: bzrlib/builtins.py:5996
3748
"This command shows a table of tag names and the revisions they reference."
3751
#: bzrlib/builtins.py:6002
3752
msgid "Branch whose tags should be displayed."
3755
#: bzrlib/builtins.py:6004
3756
msgid "Sort tags by different criteria."
3759
#: bzrlib/builtins.py:6004
3763
#: bzrlib/builtins.py:6073
3764
msgid "Reconfigure the type of a bzr directory."
3767
#: bzrlib/builtins.py:6075
3768
msgid "A target configuration must be specified."
3769
msgstr "Es muss eine Zielkonfiguration angegeben werden."
3771
#: bzrlib/builtins.py:6077
3773
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3774
"The order of preference is\n"
3775
"1. For a lightweight checkout, the current bound location.\n"
3776
"2. For branches that used to be checkouts, the previously-bound location.\n"
3777
"3. The push location.\n"
3778
"4. The parent location.\n"
3779
"If none of these is available, --bind-to must be specified."
3782
#: bzrlib/builtins.py:6091
3786
#: bzrlib/builtins.py:6092
3787
msgid "The relation between branch and tree."
3790
#: bzrlib/builtins.py:6094
3791
msgid "Reconfigure to be an unbound branch with no working tree."
3794
#: bzrlib/builtins.py:6095
3795
msgid "Reconfigure to be an unbound branch with a working tree."
3798
#: bzrlib/builtins.py:6096
3799
msgid "Reconfigure to be a bound branch with a working tree."
3802
#: bzrlib/builtins.py:6097
3803
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3806
#: bzrlib/builtins.py:6102
3807
msgid "Repository type"
3810
#: bzrlib/builtins.py:6103
3811
msgid "Location fo the repository."
3814
#: bzrlib/builtins.py:6105
3816
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3819
#: bzrlib/builtins.py:6107
3820
msgid "Reconfigure to use a shared repository."
3823
#: bzrlib/builtins.py:6111
3824
msgid "Trees in Repository"
3827
#: bzrlib/builtins.py:6112
3828
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."
3835
#: bzrlib/builtins.py:6116
3837
"Reconfigure repository to not create working trees on branches by default."
3840
#: bzrlib/builtins.py:6119
3841
msgid "Branch to bind checkout to."
3844
#: bzrlib/builtins.py:6121
3845
msgid "Perform reconfiguration even if local changes will be lost."
3848
#: bzrlib/builtins.py:6124
3849
msgid "Reconfigure a branch to be stacked on another branch."
3852
#: bzrlib/builtins.py:6128
3854
"Reconfigure a branch to be unstacked. This may require copying substantial "
3858
#: bzrlib/builtins.py:6138
3859
msgid "Can't use both --stacked-on and --unstacked"
3860
msgstr "Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
3862
#: bzrlib/builtins.py:6152
3863
msgid "No target configuration specified"
3864
msgstr "Keine Zielkonfiguration angegeben"
3866
#: bzrlib/builtins.py:6187
3867
msgid "Set the branch of a checkout and update."
3868
msgstr "Branch eines Checkout setzen und aktualisieren."
3870
#: bzrlib/builtins.py:6189
3872
"For lightweight checkouts, this changes the branch being referenced.\n"
3873
"For heavyweight checkouts, this checks that there are no local commits\n"
3874
"versus the current bound branch, then it makes the local branch a mirror\n"
3875
"of the new location and binds to it."
3878
#: bzrlib/builtins.py:6194
3880
"In both cases, the working tree is updated and uncommitted changes\n"
3881
"are merged. The user can commit or revert these as they desire."
3884
#: bzrlib/builtins.py:6197
3885
msgid "Pending merges need to be committed or reverted before using switch."
3888
#: bzrlib/builtins.py:6199
3890
"The path to the branch to switch to can be specified relative to the parent\n"
3891
"directory of the current branch. For example, if you are currently in a\n"
3892
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3893
"/path/to/newbranch."
3896
#: bzrlib/builtins.py:6204
3898
"Bound branches use the nickname of its master branch unless it is set\n"
3899
"locally, in which case switching will update the local nickname to be\n"
3900
"that of the master."
3903
#: bzrlib/builtins.py:6212
3904
msgid "Switch even if local commits will be lost."
3907
#: bzrlib/builtins.py:6215
3908
msgid "Create the target branch from this one before switching to it."
3911
#: bzrlib/builtins.py:6229
3912
msgid "You must supply either a revision or a location"
3915
#: bzrlib/builtins.py:6242
3916
msgid "cannot create branch without source branch"
3919
#: bzrlib/builtins.py:6262
3920
msgid "Manage filtered views."
3923
#: bzrlib/builtins.py:6264
3925
"Views provide a mask over the tree so that users can focus on\n"
3926
"a subset of a tree when doing their work. After creating a view,\n"
3927
"commands that support a list of files - status, diff, commit, etc -\n"
3928
"effectively have that list of files implicitly given each time.\n"
3929
"An explicit list of files can still be given but those files\n"
3930
"must be within the current view."
3933
#: bzrlib/builtins.py:6271
3935
"In most cases, a view has a short life-span: it is created to make\n"
3936
"a selected change and is deleted once that change is committed.\n"
3937
"At other times, you may wish to create one or more named views\n"
3938
"and switch between them."
3941
#: bzrlib/builtins.py:6276
3943
"To disable the current view without deleting it, you can switch to\n"
3944
"the pseudo view called ``off``. This can be useful when you need\n"
3945
"to see the whole tree for an operation or two (e.g. merge) but\n"
3946
"want to switch back to your view after that."
3949
#: bzrlib/builtins.py:6281
3952
" To define the current view::"
3955
#: bzrlib/builtins.py:6284
3956
msgid " bzr view file1 dir1 ..."
3959
#: bzrlib/builtins.py:6286
3960
msgid " To list the current view::"
3963
#: bzrlib/builtins.py:6288
3967
#: bzrlib/builtins.py:6290
3968
msgid " To delete the current view::"
3971
#: bzrlib/builtins.py:6292
3972
msgid " bzr view --delete"
3973
msgstr " bzr view --delete"
3975
#: bzrlib/builtins.py:6294
3976
msgid " To disable the current view without deleting it::"
3979
#: bzrlib/builtins.py:6296
3980
msgid " bzr view --switch off"
3981
msgstr " bzr view --switch off"
3983
#: bzrlib/builtins.py:6298
3984
msgid " To define a named view and switch to it::"
3987
#: bzrlib/builtins.py:6300
3988
msgid " bzr view --name view-name file1 dir1 ..."
3991
#: bzrlib/builtins.py:6302
3992
msgid " To list a named view::"
3995
#: bzrlib/builtins.py:6304
3996
msgid " bzr view --name view-name"
3999
#: bzrlib/builtins.py:6306
4000
msgid " To delete a named view::"
4003
#: bzrlib/builtins.py:6308
4004
msgid " bzr view --name view-name --delete"
4007
#: bzrlib/builtins.py:6310
4008
msgid " To switch to a named view::"
4011
#: bzrlib/builtins.py:6312
4012
msgid " bzr view --switch view-name"
4015
#: bzrlib/builtins.py:6314
4016
msgid " To list all views defined::"
4019
#: bzrlib/builtins.py:6316
4020
msgid " bzr view --all"
4021
msgstr " bzr view --all"
4023
#: bzrlib/builtins.py:6318
4024
msgid " To delete all views::"
4027
#: bzrlib/builtins.py:6320
4028
msgid " bzr view --delete --all"
4029
msgstr " bzr view --delete --all"
4031
#: bzrlib/builtins.py:6327
4032
msgid "Apply list or delete action to all views."
4035
#: bzrlib/builtins.py:6330
4036
msgid "Delete the view."
4039
#: bzrlib/builtins.py:6333
4040
msgid "Name of the view to define, list or delete."
4043
#: bzrlib/builtins.py:6337
4044
msgid "Name of the view to switch to."
4047
#: bzrlib/builtins.py:6356
4048
msgid "Both --delete and a file list specified"
4051
#: bzrlib/builtins.py:6359
4052
msgid "Both --delete and --switch specified"
4055
#: bzrlib/builtins.py:6362
4056
msgid "Deleted all views.\n"
4059
#: bzrlib/builtins.py:6364
4060
msgid "No current view to delete"
4063
#: bzrlib/builtins.py:6367
4065
msgid "Deleted '%s' view.\n"
4068
#: bzrlib/builtins.py:6371
4069
msgid "Both --switch and a file list specified"
4072
#: bzrlib/builtins.py:6374
4073
msgid "Both --switch and --all specified"
4076
#: bzrlib/builtins.py:6377
4077
msgid "No current view to disable"
4080
#: bzrlib/builtins.py:6379
4082
msgid "Disabled '%s' view.\n"
4085
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4086
msgid "Using '{0}' view: {1}\n"
4089
#: bzrlib/builtins.py:6386
4090
msgid "Views defined:\n"
4093
#: bzrlib/builtins.py:6395
4094
msgid "No views defined.\n"
4097
#: bzrlib/builtins.py:6402
4098
msgid "Cannot change the 'off' pseudo view"
4101
#: bzrlib/builtins.py:6410
4102
msgid "No current view.\n"
4105
#: bzrlib/builtins.py:6413
4106
msgid "'{0}' view is: {1}\n"
4109
#: bzrlib/builtins.py:6433
4110
msgid " <no hooks installed>\n"
4113
#: bzrlib/builtins.py:6437
4114
msgid "Remove a branch."
4115
msgstr "Einen Zweig entfernen."
4117
#: bzrlib/builtins.py:6439
4119
"This will remove the branch from the specified location but \n"
4120
"will keep any working tree or repository in place."
4123
#: bzrlib/builtins.py:6444
4124
msgid " Remove the branch at repo/trunk::"
4127
#: bzrlib/builtins.py:6446
4128
msgid " bzr remove-branch repo/trunk"
4129
msgstr " bzr remove-branch repo/trunk"
4131
#: bzrlib/builtins.py:6461
4132
msgid "Plaintext diff output."
4135
#: bzrlib/builtins.py:6462
4136
msgid "Temporarily set aside some changes from the current tree."
4139
#: bzrlib/builtins.py:6464
4141
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4142
"ie. out of the way, until a later time when you can bring them back from\n"
4143
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4144
"your working tree, and so they aren't propagated along with your branch nor\n"
4145
"will they survive its deletion."
4148
#: bzrlib/builtins.py:6470
4149
msgid "If shelve --list is specified, previously-shelved changes are listed."
4152
#: bzrlib/builtins.py:6472
4154
"Shelve is intended to help separate several sets of changes that have\n"
4155
"been inappropriately mingled. If you just want to get rid of all changes\n"
4156
"and you don't need to restore them later, use revert. If you want to\n"
4157
"shelve all text changes at once, use shelve --all."
4160
#: bzrlib/builtins.py:6477
4162
"If filenames are specified, only the changes to those files will be\n"
4163
"shelved. Other files will be left untouched."
4166
#: bzrlib/builtins.py:6480
4168
"If a revision is specified, changes since that revision will be shelved."
4171
#: bzrlib/builtins.py:6482
4173
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4174
"restore the most recently shelved changes."
4177
#: bzrlib/builtins.py:6485
4179
"For complicated changes, it is possible to edit the changes in a separate\n"
4180
"editor program to decide what the file remaining in the working copy\n"
4181
"should look like. To do this, add the configuration option"
4184
#: bzrlib/builtins.py:6489
4185
msgid " change_editor = PROGRAM @new_path @old_path"
4188
#: bzrlib/builtins.py:6491
4190
"where @new_path is replaced with the path of the new version of the \n"
4191
"file and @old_path is replaced with the path of the old version of \n"
4192
"the file. The PROGRAM should save the new file with the desired \n"
4193
"contents of the file in the working tree.\n"
4197
#: bzrlib/builtins.py:6503
4198
msgid "Shelve all changes."
4201
#: bzrlib/builtins.py:6505
4202
msgid "Method to use for writing diffs."
4205
#: bzrlib/builtins.py:6505
4209
#: bzrlib/builtins.py:6509
4210
msgid "List shelved changes."
4213
#: bzrlib/builtins.py:6511
4214
msgid "Destroy removed changes instead of shelving them."
4217
#: bzrlib/builtins.py:6540
4218
msgid "No shelved changes."
4221
#: bzrlib/builtins.py:6551
4222
msgid "Restore shelved changes."
4225
#: bzrlib/builtins.py:6553
4227
"By default, the most recently shelved changes are restored. However if you\n"
4228
"specify a shelf by id those changes will be restored instead. This works\n"
4229
"best when the changes don't depend on each other."
4232
#: bzrlib/builtins.py:6562
4233
msgid "The action to perform."
4234
msgstr "Die auszuführende Aktion."
4236
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4240
#: bzrlib/builtins.py:6564
4241
msgid "Apply changes and remove from the shelf."
4244
#: bzrlib/builtins.py:6565
4245
msgid "Show changes, but do not apply or remove them."
4246
msgstr "Änderungen anzeigen, aber nicht anwenden oder entfernen."
4248
#: bzrlib/builtins.py:6566
4250
"Instead of unshelving the changes, show the diff that would result from "
4254
#: bzrlib/builtins.py:6568
4255
msgid "Delete changes without applying them."
4256
msgstr "Änderungen löschen ohne diese anzuwenden."
4258
#: bzrlib/builtins.py:6569
4259
msgid "Apply changes but don't delete them."
4260
msgstr "Änderungen anwenden, aber diese nicht löschen."
4262
#: bzrlib/builtins.py:6584
4263
msgid "Remove unwanted files from working tree."
4266
#: bzrlib/builtins.py:6586
4268
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4269
"files are never deleted."
4272
#: bzrlib/builtins.py:6589
4274
"Another class is 'detritus', which includes files emitted by bzr during\n"
4275
"normal operations and selftests. (The value of these files decreases with\n"
4279
#: bzrlib/builtins.py:6593
4281
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4282
"flags are respected, and may be combined."
4285
#: bzrlib/builtins.py:6596
4286
msgid "To check what clean-tree will do, use --dry-run."
4287
msgstr "Um zu prüfen, was clean-tree tun wird, --dry-run benutzen."
4289
#: bzrlib/builtins.py:6599
4290
msgid "Delete all ignored files."
4291
msgstr "Alle ignorierten Dateien löschen."
4293
#: bzrlib/builtins.py:6600
4295
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4298
#: bzrlib/builtins.py:6603
4299
msgid "Delete files unknown to bzr (default)."
4300
msgstr "Dateien löschen, die bzr nicht bekannt sind (Vorgabe)."
4302
#: bzrlib/builtins.py:6604
4303
msgid "Show files to delete instead of deleting them."
4304
msgstr "Dateien zum Löschen anzeigen, anstelle diese zu löschen."
4306
#: bzrlib/builtins.py:6606
4307
msgid "Do not prompt before deleting."
4308
msgstr "Vor dem Löschen nicht nachfragen."
4310
#: bzrlib/bundle/__init__.py:59
4311
msgid "A directory cannot be a bundle"
4314
#: bzrlib/bundle/apply_bundle.py:40
4315
msgid "Install revisions"
4316
msgstr "Revisionen installieren"
4318
#: bzrlib/bundle/commands.py:64
4319
msgid "--verbose requires a merge directive"
4322
#: bzrlib/bundle/commands.py:67
4323
msgid "Bundle format not supported"
4326
#: bzrlib/bundle/commands.py:77
4330
#: bzrlib/bundle/commands.py:81
4331
msgid "{0}: {1} ({2} multiparent)\n"
4334
#: bzrlib/bundle/commands.py:83
4336
msgid "unique files: %d\n"
4339
#: bzrlib/bundle/commands.py:92
4341
msgstr "Revisionen\n"
4343
#: bzrlib/bundle/commands.py:93
4348
#: bzrlib/bundle/commands.py:95
4355
#: bzrlib/bundle/commands.py:103
4356
msgid "Decoded contents\n"
4359
#: bzrlib/bundle/serializer/v4.py:327
4361
msgid "Bundling %d revision."
4362
msgid_plural "Bundling %d revisions."
4366
#: bzrlib/bzrdir.py:490
4368
"making backup of {0}\n"
4372
#: bzrlib/bzrdir.py:513
4373
msgid "renamed {0} to {1}"
4374
msgstr "{0} wurde in {1} umbenannt"
4376
#: bzrlib/bzrdir.py:1652
4379
"Source repository format does not support stacking, using format:\n"
4383
#: bzrlib/bzrdir.py:1672
4386
"Source branch format does not support stacking, using format:\n"
4390
#: bzrlib/bzrdir.py:1818
4391
msgid "starting repository conversion"
4394
#: bzrlib/bzrdir.py:2039
4395
msgid "Using default stacking branch {0} at {1}"
4398
#: bzrlib/check.py:108
4402
#: bzrlib/check.py:110
4403
msgid "checking revisions"
4404
msgstr "Revisionen prüfen"
4406
#: bzrlib/check.py:112
4407
msgid "checking commit contents"
4410
#: bzrlib/check.py:114
4411
msgid "checking file graphs"
4414
#: bzrlib/check.py:118
4415
msgid "checking branches and trees"
4418
#: bzrlib/check.py:205
4419
msgid "checked repository {0} format {1}"
4422
#: bzrlib/check.py:208
4424
msgid "%6d revisions"
4425
msgstr "%6d Revisionen"
4427
#: bzrlib/check.py:209
4429
msgid "%6d file-ids"
4432
#: bzrlib/check.py:211
4434
msgid "%6d unreferenced text versions"
4437
#: bzrlib/check.py:215
4438
msgid "unreferenced version: {{{0}}} in {1}"
4441
#: bzrlib/check.py:218
4443
msgid "%6d revisions are missing inventory_sha1"
4446
#: bzrlib/check.py:221
4448
msgid "%6d revisions are mentioned but not present"
4451
#: bzrlib/check.py:224
4453
msgid "%6d ghost revisions"
4454
msgstr "%6d Geister-Revisionen"
4456
#: bzrlib/check.py:229
4458
msgid "%6d revisions missing parents in ancestry"
4461
#: bzrlib/check.py:233
4463
msgid " %s should be in the ancestry for:"
4466
#: bzrlib/check.py:237
4468
msgid "%6d inconsistent parents"
4471
#: bzrlib/check.py:241
4472
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4475
#: bzrlib/check.py:247
4477
msgid "%6d revisions have incorrect parents in the revision index"
4480
#: bzrlib/check.py:253
4481
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4484
#: bzrlib/check.py:267
4485
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4488
#: bzrlib/check.py:296
4490
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4494
#: bzrlib/check.py:354
4496
msgid "Checking branch at '%s'."
4497
msgstr "Zweig wird geprüft bei »%s«."
4499
#: bzrlib/check.py:374
4501
msgid "Checking working tree at '%s'."
4504
#: bzrlib/check.py:427 bzrlib/check.py:441
4505
msgid "No branch found at specified location."
4508
#: bzrlib/check.py:429 bzrlib/check.py:439
4509
msgid "No working tree found at specified location."
4512
#: bzrlib/check.py:432
4514
msgid "Checking repository at '%s'."
4517
#: bzrlib/check.py:443
4518
msgid "No repository found at specified location."
4521
#: bzrlib/clean_tree.py:63
4522
msgid "Nothing to delete."
4523
msgstr "Nichts zu löschen."
4525
#: bzrlib/clean_tree.py:68
4526
msgid "Are you sure you wish to delete these"
4527
msgstr "Sind Sie sicher, dass Sie diese löschen möchten"
4529
#: bzrlib/clean_tree.py:70
4531
msgstr "Abgebrochen"
4533
#: bzrlib/clean_tree.py:107
4535
msgid "unable to remove %s"
4536
msgstr "%s kann nicht entfernt werden"
4538
#: bzrlib/clean_tree.py:111
4539
msgid "deleting paths:"
4540
msgstr "Pfade werden gelöscht:"
4542
#: bzrlib/clean_tree.py:125
4543
msgid "unable to remove \"{0}\": {1}."
4544
msgstr "»{0}« kann nicht entfernt werden: {1}."
4546
#: bzrlib/clean_tree.py:130
4547
msgid "No files deleted."
4548
msgstr "Keine Dateien gelöscht."
4550
#: bzrlib/cmd_version_info.py:47
4551
msgid "No known version info format {0}. Supported types are: {1}"
4553
"Unbekanntes Format {0} für Versionsinformationen. Unterstützte Typen sind: "
4556
#: bzrlib/cmd_version_info.py:52
4557
msgid "Version info in Custom template-based format."
4560
#: bzrlib/cmd_version_info.py:52
4561
msgid "Version info in Python format."
4562
msgstr "Versionsinformationen im Python-Format."
4564
#: bzrlib/cmd_version_info.py:52
4565
msgid "Version info in RIO (simple text) format (default)."
4566
msgstr "Versionsinformationen im RIO (nur Text)-Format (Vorgabe)."
4568
#: bzrlib/cmd_version_info.py:53
4569
msgid "Show version information about this tree."
4572
#: bzrlib/cmd_version_info.py:55
4574
"You can use this command to add information about version into\n"
4575
"source code of an application. The output can be in one of the\n"
4576
"supported formats or in a custom format based on a template."
4579
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4580
#: en/help_topics/configuration.txt:710
4581
msgid "For example::"
4582
msgstr "Zum Beispiel:"
4584
#: bzrlib/cmd_version_info.py:61
4586
" bzr version-info --custom \\\n"
4587
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4590
#: bzrlib/cmd_version_info.py:64
4592
"will produce a C header file with formatted string containing the\n"
4593
"current revision number. Other supported variables in templates are:"
4596
#: bzrlib/cmd_version_info.py:67
4598
" * {date} - date of the last revision\n"
4599
" * {build_date} - current date\n"
4600
" * {revno} - revision number\n"
4601
" * {revision_id} - revision id\n"
4602
" * {branch_nick} - branch nickname\n"
4603
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4607
#: bzrlib/cmd_version_info.py:77
4608
msgid "Select the output format."
4609
msgstr "Wählen Sie das Ausgabeformat."
4611
#: bzrlib/cmd_version_info.py:81
4612
msgid "Include all possible information."
4613
msgstr "Sämtliche verfügbaren Informationen einschließen."
4615
#: bzrlib/cmd_version_info.py:82
4616
msgid "Check if tree is clean."
4619
#: bzrlib/cmd_version_info.py:84
4620
msgid "Include the revision-history."
4621
msgstr "Revisionsverlauf einschließen."
4623
#: bzrlib/cmd_version_info.py:86
4624
msgid "Include the last revision for each file."
4625
msgstr "Neueste Revision jeder Datei einschließen."
4627
#: bzrlib/cmd_version_info.py:87
4628
msgid "Template for the output."
4631
#: bzrlib/cmd_version_info.py:101
4632
msgid "bzr version-info --revision takes exactly one revision specifier"
4635
#: bzrlib/commands.py:229
4637
msgid "unknown command \"%s\""
4638
msgstr "Unbekannter Befehl »%s«"
4640
#: bzrlib/commands.py:476
4641
msgid "No help for this command."
4642
msgstr "Keine Hilfe zu diesem Befehl verfügbar."
4644
#: bzrlib/commands.py:489
4646
msgid ":Purpose: %s\n"
4647
msgstr ":Zweck: %s\n"
4649
#: bzrlib/commands.py:491
4658
#: bzrlib/commands.py:493
4660
msgid ":Usage: %s\n"
4661
msgstr ":Aufruf: %s\n"
4663
#: bzrlib/commands.py:512
4666
msgstr ":Optionen: %s"
4668
#: bzrlib/commands.py:523
4679
#: bzrlib/commands.py:533
4682
"See bzr help %s for more details and examples.\n"
4686
#: bzrlib/commands.py:538
4690
#: bzrlib/commands.py:542
4692
msgid ":From: plugin \"%s\"\n"
4693
msgstr ":Von: Erweiterung »%s«\n"
4695
#: bzrlib/commands.py:554
4696
msgid ":doc:`{0} <{1}-help>`"
4699
#: bzrlib/commands.py:558
4701
msgid ":See also: %s"
4702
msgstr ":Siehe auch: %s"
4704
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4705
msgid "Only ASCII permitted in option names"
4708
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4709
msgid "command {0!r} needs one or more {1}"
4712
#: bzrlib/commands.py:858
4713
msgid "command {0!r} requires argument {1}"
4716
#: bzrlib/commands.py:865
4717
msgid "extra argument to command {0}: {1}"
4720
#: bzrlib/commands.py:962
4722
msgid "Profile data written to \"%s\"."
4725
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4727
msgstr "Hinzugefügt"
4729
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4733
#: bzrlib/commit.py:131
4735
msgid "Committing%s"
4738
#: bzrlib/commit.py:134
4740
msgid "Committed revision %d."
4743
#: bzrlib/commit.py:143
4746
msgstr "%s gelöscht"
4748
#: bzrlib/commit.py:146
4753
#: bzrlib/commit.py:511
4755
"Conflicting tags in bound branch:\n"
4759
#: bzrlib/commit.py:742
4763
#: bzrlib/commit.py:977
4767
#: bzrlib/commit.py:999
4768
msgid "{0} [{1}] - Stage"
4771
#: bzrlib/commit.py:1002
4776
#: bzrlib/commit_signature_commands.py:36
4777
msgid "Sign all commits by a given committer."
4780
#: bzrlib/commit_signature_commands.py:38
4782
"If location is not specified the local tree is used.\n"
4783
"If committer is not specified the default committer is used."
4786
#: bzrlib/commit_signature_commands.py:41
4787
msgid "This does not sign commits that already have signatures."
4790
#: bzrlib/commit_signature_commands.py:49
4792
"Don't actually sign anything, just print the revisions that would be signed."
4795
#: bzrlib/commit_signature_commands.py:103
4796
msgid "Verify all commit signatures."
4799
#: bzrlib/commit_signature_commands.py:105
4800
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4803
#: bzrlib/commit_signature_commands.py:110
4805
"Comma separated list of GPG key patterns which are acceptable for "
4809
#: bzrlib/commit_signature_commands.py:147
4810
msgid "Cannot verify a range of non-revision-history revisions"
4813
#: bzrlib/commit_signature_commands.py:168
4814
msgid "All commits signed with verifiable keys"
4817
#: bzrlib/config.py:475
4818
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4821
#: bzrlib/config.py:2485
4822
msgid "{0} is not an SI unit."
4825
#: bzrlib/config.py:2949
4827
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4831
#: bzrlib/config.py:3093
4833
msgid "Invalid '%s', should be of the form 'name=value'"
4836
#: bzrlib/config.py:3962
4837
msgid "Display, set or remove a configuration option."
4838
msgstr "Eine Konfigurationsoption anzeigen, festlegen oder löschen."
4840
#: bzrlib/config.py:3964
4841
msgid "Display the active value for a given option."
4842
msgstr "Aktiven Wert zur angegebenen Option anzeigen."
4844
#: bzrlib/config.py:3966
4846
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4847
"matching options are displayed mentioning their scope. The active value\n"
4848
"that bzr will take into account is the first one displayed for each option."
4851
#: bzrlib/config.py:3970
4852
msgid "If no NAME is given, --all .* is implied."
4855
#: bzrlib/config.py:3972
4857
"Setting a value is achieved by using name=value without spaces. The value\n"
4858
"is set in the most relevant scope and can be checked by displaying the\n"
4862
#: bzrlib/config.py:3984
4863
msgid "Reduce the scope to the specified configuration file."
4866
#: bzrlib/config.py:3988
4867
msgid "Display all the defined values for the matching options."
4868
msgstr "Alle definierten Werte für die zutreffenden Optionen anzeigen."
4870
#: bzrlib/config.py:3990
4871
msgid "Remove the option from the configuration file."
4872
msgstr "Die Option aus der Konfigurationsdatei entfernen."
4874
#: bzrlib/conflicts.py:50
4875
msgid "List files with conflicts."
4876
msgstr "In Konflikt stehende Dateien auflisten."
4878
#: bzrlib/conflicts.py:57
4880
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4881
"is supplied, the pathnames of files with text conflicts are listed,\n"
4882
"instead. (This is useful for editing all files with text conflicts.)"
4885
#: bzrlib/conflicts.py:61
4886
msgid "Use bzr resolve when you have fixed a problem."
4887
msgstr "Benutzen Sie bzr resolve, wenn Sie ein Problem gelöst haben."
4889
#: bzrlib/conflicts.py:66
4890
msgid "List paths of files with text conflicts."
4893
#: bzrlib/conflicts.py:85
4894
msgid "Marks the conflict as resolved."
4897
#: bzrlib/conflicts.py:88
4898
msgid "Resolve the conflict preserving the version in the working tree."
4901
#: bzrlib/conflicts.py:91
4902
msgid "Resolve the conflict taking the merged version into account."
4905
#: bzrlib/conflicts.py:98
4906
msgid "How to resolve the conflict."
4909
#: bzrlib/conflicts.py:104
4910
msgid "Mark a conflict as resolved."
4913
#: bzrlib/conflicts.py:111
4915
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4916
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4918
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4921
#: bzrlib/conflicts.py:119
4922
msgid "Resolve all conflicts in this tree."
4925
#: bzrlib/conflicts.py:126
4926
msgid "If --all is specified, no FILE may be provided"
4929
#: bzrlib/conflicts.py:151
4931
msgid "%d conflict auto-resolved."
4932
msgid_plural "%d conflicts auto-resolved."
4936
#: bzrlib/conflicts.py:154
4937
msgid "Remaining conflicts:"
4938
msgstr "Verbleibende Konflikte:"
4940
#: bzrlib/conflicts.py:159
4941
msgid "All conflicts resolved."
4942
msgstr "Alle Konflikte gelöst."
4944
#: bzrlib/conflicts.py:168
4945
msgid "{0} conflict resolved, {1} remaining"
4946
msgid_plural "{0} conflicts resolved, {1} remaining"
4950
#: bzrlib/controldir.py:710
4951
msgid "{0} is{1} redirected to {2}"
4954
#: bzrlib/diff.py:399
4956
msgid "*** Ignoring files outside view. View is %s"
4959
#: bzrlib/errors.py:157
4960
msgid "The tree builder is already building a tree."
4963
#: bzrlib/errors.py:178
4964
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4967
#: bzrlib/errors.py:197
4969
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4970
"versions \"%(minimum)s\" to \"%(current)s\"."
4973
#: bzrlib/errors.py:209
4974
msgid "The transport '%(transport)s' is only accessible within this process."
4977
#: bzrlib/errors.py:227
4978
msgid "Invalid revision number %(revno)s"
4979
msgstr "Ungültige Revisionsnummer %(revno)s"
4981
#: bzrlib/errors.py:236
4982
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4985
#: bzrlib/errors.py:247
4986
msgid "Reserved revision-id {%(revision_id)s}"
4989
#: bzrlib/errors.py:261
4990
msgid "There is no public branch set for \"%(branch_url)s\"."
4991
msgstr "Kein öffentlicher Zweig für »%(branch_url)s« festgelegt."
4993
#: bzrlib/errors.py:271
4995
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4996
"obtain a list of topics."
4999
#: bzrlib/errors.py:280
5000
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5003
#: bzrlib/errors.py:290
5005
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5008
#: bzrlib/errors.py:299
5009
msgid "The branch '%(branch)s' is not stacked."
5012
#: bzrlib/errors.py:313
5013
msgid "No WorkingTree exists for \"%(base)s\"."
5016
#: bzrlib/errors.py:322
5017
msgid "Not currently building a tree."
5020
#: bzrlib/errors.py:327
5021
msgid "%(url)s is not a local path."
5022
msgstr "%(url)s ist kein lokaler Pfad."
5024
#: bzrlib/errors.py:355
5025
msgid "%(not_locked)r is not write locked but needs to be."
5028
#: bzrlib/errors.py:363
5029
msgid "Error in command line options"
5030
msgstr "Fehler in den Befehlszeilenoptionen"
5032
#: bzrlib/errors.py:368
5033
msgid "%(value)s is not an index of type %(_type)s."
5034
msgstr "%(value)s ist kein Index vom Typ %(_type)s."
5036
#: bzrlib/errors.py:378
5037
msgid "Error in data for index %(value)s."
5038
msgstr "Fehler in den Daten für Index %(value)s."
5040
#: bzrlib/errors.py:387
5041
msgid "The key '%(key)s' is already in index '%(index)s'."
5042
msgstr "Der Schlüssel »%(key)s« ist bereits im Index »%(index)s«."
5044
#: bzrlib/errors.py:397
5045
msgid "The key '%(key)s' is not a valid key."
5046
msgstr "Der Schlüssel »%(key)s« ist ein ungültiger Schlüssel."
5048
#: bzrlib/errors.py:406
5049
msgid "Could not parse options for index %(value)s."
5050
msgstr "Optionen für Index %(value)s konnten nicht verarbeitet werden."
5052
#: bzrlib/errors.py:415
5053
msgid "The value '%(value)s' is not a valid value."
5054
msgstr "Der Wert »%(value)s« ist ein ungültiger Wert."
5056
#: bzrlib/errors.py:424
5057
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5058
msgstr "Ungültiger Wert »%(value)s« für die Option »%(name)s«."
5060
#: bzrlib/errors.py:443
5061
msgid "Generic path error: %(path)r%(extra)s)"
5062
msgstr "Allgemeiner Fehler im Pfad: %(path)r%(extra)s)"
5064
#: bzrlib/errors.py:456
5065
msgid "No such file: %(path)r%(extra)s"
5066
msgstr "Datei existiert nicht: %(path)r%(extra)s"
5068
#: bzrlib/errors.py:461
5069
msgid "File exists: %(path)r%(extra)s"
5070
msgstr "Datei existiert: %(path)r%(extra)s"
5072
#: bzrlib/errors.py:467
5074
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5075
"after to tell bzr about a rename that has already happened)%(extra)s"
5078
#: bzrlib/errors.py:483
5079
msgid "\"%(path)s\" is not a directory %(extra)s"
5080
msgstr "»%(path)s« ist kein Verzeichnis %(extra)s"
5082
#: bzrlib/errors.py:488
5083
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5086
#: bzrlib/errors.py:493
5087
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5088
msgstr "Verzeichnis ist nicht leer: »%(path)s«%(extra)s"
5090
#: bzrlib/errors.py:498
5091
msgid "Hard-linking \"%(path)s\" is not supported"
5094
#: bzrlib/errors.py:513
5095
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5098
#: bzrlib/errors.py:518
5099
msgid "Permission denied: \"%(path)s\"%(extra)s"
5100
msgstr "Zugriff verweigert: »%(path)s«%(extra)s"
5102
#: bzrlib/errors.py:523
5103
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5106
#: bzrlib/errors.py:528
5107
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5110
#: bzrlib/errors.py:539
5111
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5114
#: bzrlib/errors.py:561
5115
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5118
#: bzrlib/errors.py:571
5119
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5122
#: bzrlib/errors.py:579
5124
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5125
"upgrade the branch to permit branch stacking."
5128
#: bzrlib/errors.py:590
5129
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5132
#: bzrlib/errors.py:600
5134
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5135
"need to upgrade the repository to permit branch stacking."
5138
#: bzrlib/errors.py:611
5139
msgid "Error reading from %(path)r."
5140
msgstr "Fehler beim Lesen von %(path)r."
5142
#: bzrlib/errors.py:630
5143
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5146
#: bzrlib/errors.py:646
5147
msgid "Path \"%(path)s\" is not unicode normalized"
5150
#: bzrlib/errors.py:654
5151
msgid "Not a branch: \"%(path)s\"%(detail)s."
5152
msgstr "Kein Zweig: »%(path)s«%(detail)s."
5154
#: bzrlib/errors.py:696
5155
msgid "No submit branch available for branch \"%(path)s\""
5158
#: bzrlib/errors.py:705
5159
msgid "A control directory already exists: \"%(path)s\"."
5162
#: bzrlib/errors.py:710
5163
msgid "Already a branch: \"%(path)s\"."
5164
msgstr "Bereits ein Zweig: »%(path)s«."
5166
#: bzrlib/errors.py:715
5167
msgid "Parent branch already exists: \"%(path)s\"."
5170
#: bzrlib/errors.py:721
5172
"Directory contains a branch, but no working tree (use bzr checkout if you "
5173
"wish to build a working tree): \"%(path)s\""
5176
#: bzrlib/errors.py:726
5178
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5181
#: bzrlib/errors.py:736
5183
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5186
#: bzrlib/errors.py:746
5187
msgid "No repository present: \"%(path)s\""
5190
#: bzrlib/errors.py:753
5192
"Unsupported branch format: %(format)s\n"
5193
"Please run 'bzr upgrade'"
5196
#: bzrlib/errors.py:759
5197
msgid "Unknown %(kind)s format: %(format)r"
5198
msgstr "Unbekanntes %(kind)s-Format: %(format)r"
5200
#: bzrlib/errors.py:768
5201
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5202
msgstr "Das Format %(format)s ist inkompatibel zu der .bzr-Version %(bzrdir)s."
5204
#: bzrlib/errors.py:778
5205
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5208
#: bzrlib/errors.py:793
5211
"is not compatible with\n"
5216
#: bzrlib/errors.py:809
5217
msgid "Revision is not compatible with %(repo_format)s"
5218
msgstr "Die Revision ist inkompatibel zu %(repo_format)s"
5220
#: bzrlib/errors.py:819
5221
msgid "%(context_info)s%(path)s is already versioned."
5222
msgstr "%(context_info)s%(path)s ist bereits versioniert."
5224
#: bzrlib/errors.py:840
5225
msgid "%(context_info)s%(path)s is not versioned."
5226
msgstr "%(context_info)s%(path)s ist nicht versioniert."
5228
#: bzrlib/errors.py:861
5229
msgid "Path(s) are not versioned: %(paths_as_string)s"
5230
msgstr "Pfad(e) ist/sind nicht versioniert: %(paths_as_string)s"
5232
#: bzrlib/errors.py:872
5233
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5234
msgstr "Pfad(e) existiert/existieren nicht: %(paths_as_string)s%(extra)s"
5236
#: bzrlib/errors.py:891
5237
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5240
#: bzrlib/errors.py:899
5242
"Filename %(filename)r is not valid in your current filesystem encoding "
5246
#: bzrlib/errors.py:910
5247
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5250
#: bzrlib/errors.py:928
5251
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5254
#: bzrlib/errors.py:967
5255
msgid "Cannot lock %(lock)s: %(why)s"
5258
#: bzrlib/errors.py:977
5260
"A transaction related operation was attempted after the transaction finished."
5263
#: bzrlib/errors.py:1004
5264
msgid "Cannot lock: transport is read only: %(transport)s"
5267
#: bzrlib/errors.py:1012
5268
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!"
5275
#: bzrlib/errors.py:1034
5277
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5278
"%(holder)r, wanted to break %(target)r"
5281
#: bzrlib/errors.py:1046
5283
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5284
"Use 'bzr break-lock' to clear it"
5287
#: bzrlib/errors.py:1059
5288
msgid "Lock not held: %(lock)s"
5291
#: bzrlib/errors.py:1088
5292
msgid "No changes to commit"
5295
#: bzrlib/errors.py:1093
5297
"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
#: bzrlib/errors.py:1112
5308
"The specified commit message contains characters unsupported by the current "
5312
#: bzrlib/errors.py:1118
5313
msgid "Upgrade URL cannot work with readonly URLs."
5316
#: bzrlib/errors.py:1123
5317
msgid "The branch format %(format)s is already at the most recent format."
5320
#: bzrlib/errors.py:1146
5321
msgid "Option --change does not accept revision ranges"
5322
msgstr "Die Option --change akzeptiert keine Revisionsbereiche"
5324
#: bzrlib/errors.py:1151
5325
msgid "No namespace registered for string: %(spec)r"
5328
#: bzrlib/errors.py:1170
5330
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5333
"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: %(branch_url)s"
5336
#: bzrlib/errors.py:1184
5338
"Operation denied because it would change the main history, which is not "
5339
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5342
#: bzrlib/errors.py:1195
5344
"These branches have diverged. Use the missing command to see how.\n"
5345
"Use the merge command to reconcile them."
5348
#: bzrlib/errors.py:1215
5350
"Branches have no common ancestor, and no merge base revision was specified."
5353
#: bzrlib/errors.py:1221
5355
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5358
#: bzrlib/errors.py:1227
5359
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5362
#: bzrlib/errors.py:1236
5364
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5367
#: bzrlib/errors.py:1245
5368
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5371
#: bzrlib/errors.py:1254
5372
msgid "Branch %(branch)s has no commits."
5375
#: bzrlib/errors.py:1272
5377
"Bound branch %(branch)s is out of date with master branch %(master)s."
5381
#: bzrlib/errors.py:1284
5383
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5384
"bound to %(remote)s."
5387
#: bzrlib/errors.py:1296
5388
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5391
#: bzrlib/errors.py:1305
5393
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5397
#: bzrlib/errors.py:1317
5398
msgid "Error in processing weave: %(msg)s"
5401
#: bzrlib/errors.py:1326
5402
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5403
msgstr "Revision {%(revision_id)s} ist bereits in %(weave)s vorhanden"
5405
#: bzrlib/errors.py:1337
5406
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5407
msgstr "Revision {%(revision_id)s} ist nicht in %(weave)s vorhanden"
5409
#: bzrlib/errors.py:1347
5410
msgid "Weave invariant violated: %(what)s"
5413
#: bzrlib/errors.py:1356
5414
msgid "Parents are mismatched between two revisions. %(msg)s"
5417
#: bzrlib/errors.py:1378
5419
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5423
#: bzrlib/errors.py:1390
5424
msgid "Versioned file error"
5425
msgstr "Fehler bei versionierter Datei"
5427
#: bzrlib/errors.py:1395
5428
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5429
msgstr "Revision {%(revision_id)s} ist nicht in »%(file_id)s« vorhanden."
5431
#: bzrlib/errors.py:1405
5432
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5433
msgstr "Revision {%(revision_id)s} ist bereits in »%(file_id)s« vorhanden."
5435
#: bzrlib/errors.py:1415
5436
msgid "Text did not match its checksum: %(msg)s"
5437
msgstr "Der Text entsprach nicht seiner Prüfsumme: %(msg)s"
5439
#: bzrlib/errors.py:1541
5440
msgid "Export format %(format)r not supported"
5441
msgstr "Exportformat %(format)r wird nicht unterstützt"
5443
#: bzrlib/errors.py:1550
5444
msgid "Transport error: %(msg)s %(orig_error)s"
5445
msgstr "Übertragungsfehler: %(msg)s %(orig_error)s"
5447
#: bzrlib/errors.py:1576
5448
msgid "Generic bzr smart protocol error: %(details)s"
5449
msgstr "Allgemeiner bzr-Smart-Protokoll-Fehler: %(details)s"
5451
#: bzrlib/errors.py:1584
5452
msgid "Received bad protocol version marker: %(marker)r"
5455
#: bzrlib/errors.py:1616
5456
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5459
#: bzrlib/errors.py:1621
5460
msgid "Connection error: %(msg)s %(orig_error)s"
5461
msgstr "Verbindungsfehler: %(msg)s %(orig_error)s"
5463
#: bzrlib/errors.py:1626
5464
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5465
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5467
#: bzrlib/errors.py:1647
5468
msgid "Connection closed: %(msg)s %(orig_error)s"
5469
msgstr "Verbindung geschlossen: %(msg)s %(orig_error)s"
5471
#: bzrlib/errors.py:1652
5472
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5473
msgstr "Verbindung abgelaufen: %(msg)s%(orig_error)s"
5475
#: bzrlib/errors.py:1657
5476
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5479
#: bzrlib/errors.py:1667
5480
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5481
msgstr "Ungültige HTTP-Antwort für %(path)s: %(msg)s%(orig_error)s"
5483
#: bzrlib/errors.py:1682
5484
msgid "Certificate error: %(error)s"
5485
msgstr "Zertifikatsfehler: %(error)s"
5487
#: bzrlib/errors.py:1690
5488
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5489
msgstr "Ungültiger HTTP-Bereich %(range)r für %(path)s: %(msg)s"
5491
#: bzrlib/errors.py:1704
5492
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5493
msgstr "»HTTP MIME Boundary« für %(path)s fehlt: %(msg)sy"
5495
#: bzrlib/errors.py:1712
5496
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5497
msgstr "Ungültiger HTTP-Content-type »%(ctype)s« für %(path)s: %(msg)s"
5499
#: bzrlib/errors.py:1721
5500
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5501
msgstr "%(source)s wird%(permanently)s umgeleitet nach %(target)s"
5503
#: bzrlib/errors.py:1735
5504
msgid "Too many redirections"
5505
msgstr "Zu viele Umleitungen"
5507
#: bzrlib/errors.py:1740
5508
msgid "Working tree has conflicts."
5511
#: bzrlib/errors.py:1744
5512
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5513
msgstr "Konfigurationsdatei %(filename)s ist nicht UTF-8-kodiert\n"
5515
#: bzrlib/errors.py:1753
5517
"Error(s) parsing config file %(filename)s:\n"
5521
#: bzrlib/errors.py:1763
5523
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5524
"See ``bzr help %(name)s``"
5527
#: bzrlib/errors.py:1773
5528
msgid "%(username)r does not seem to contain a reasonable email address"
5529
msgstr "%(username)r scheint keine vernünftige E-Mail-Adresse zu haben"
5531
#: bzrlib/errors.py:1782
5532
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5535
#: bzrlib/errors.py:1790
5536
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5539
#: bzrlib/errors.py:1798
5540
msgid "Unable to import library \"%(library)s\": %(error)s"
5541
msgstr "Importieren der Bibliothek »%(library)s« nicht möglich: %(error)s"
5543
#: bzrlib/errors.py:1806
5544
msgid "python-gpgme is not installed, it is needed to verify signatures"
5547
#: bzrlib/errors.py:1814
5549
"The working tree for %(basedir)s has changed since the last commit, but "
5550
"weave merge requires that it be unchanged"
5553
#: bzrlib/errors.py:1824
5555
"Can't reprocess and show base, because reprocessing obscures the "
5556
"relationship of conflicting lines to the base"
5559
#: bzrlib/errors.py:1830
5560
msgid "Cycle in graph %(graph)r"
5563
#: bzrlib/errors.py:1858
5564
msgid "File %(filename)s is not conflicted."
5567
#: bzrlib/errors.py:1880
5568
msgid "No bundle was found in \"%(filename)s\"."
5571
#: bzrlib/errors.py:1889
5572
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5575
#: bzrlib/errors.py:1899
5576
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5577
msgstr "Im Zweig %(base)s fehlt Revision %(text_revision)s von %(file_id)s"
5579
#: bzrlib/errors.py:1912
5580
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5583
#: bzrlib/errors.py:1922
5584
msgid "Key %(key)s is already present in map"
5587
#: bzrlib/errors.py:1927
5588
msgid "The prefix %(prefix)s is in the help search path twice."
5591
#: bzrlib/errors.py:1937
5593
"No final name for trans_id %(trans_id)r\n"
5594
"file-id: %(file_id)r\n"
5595
"root trans-id: %(root_trans_id)r\n"
5598
#: bzrlib/errors.py:1969
5599
msgid "Attempt to reuse a transform that has already been applied."
5602
#: bzrlib/errors.py:1974
5603
msgid "Moving the root directory is not supported at this time"
5606
#: bzrlib/errors.py:1979
5607
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5608
msgstr "Umbenennen von %(from_path)s in %(to_path)s gescheitert: %(why)s"
5610
#: bzrlib/errors.py:1990
5612
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5615
#: bzrlib/errors.py:2026
5617
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5620
#: bzrlib/errors.py:2056
5621
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5624
#: bzrlib/errors.py:2064
5625
msgid "Nothing to merge."
5628
#: bzrlib/errors.py:2069
5629
msgid "Format %(format)s cannot be initialised by this version of bzr."
5631
"Das Format %(format)s kann von dieser Bazaar-Version nicht initialisiert "
5634
#: bzrlib/errors.py:2078
5636
"Cannot convert from format %(from_format)s to format %(format)s. "
5640
#: bzrlib/errors.py:2090
5641
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5644
#: bzrlib/errors.py:2098
5645
msgid "%(exe_name)s could not be found on this machine"
5646
msgstr "%(exe_name)s konnte nicht auf diesem Rechner gefunden werden"
5648
#: bzrlib/errors.py:2106
5649
msgid "Diff is not installed on this machine: %(msg)s"
5650
msgstr "Diff ist auf diesem Rechner nicht installiert: %(msg)s"
5652
#: bzrlib/errors.py:2114
5653
msgid "Diff3 is not installed on this machine."
5654
msgstr "Diff3 ist auf diesem Rechner nicht installiert."
5656
#: bzrlib/errors.py:2120
5657
msgid "The content being inserted is already present."
5658
msgstr "Der gerade eingefügte Inhalt ist bereits vorhanden."
5660
#: bzrlib/errors.py:2125
5662
"This tree contains left-over files from a failed operation.\n"
5663
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5665
" keep, and delete it when you are done."
5668
#: bzrlib/errors.py:2136
5670
"This tree contains left-over files from a failed operation.\n"
5671
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5672
" wish to keep, and delete it when you are done."
5675
#: bzrlib/errors.py:2146
5677
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5678
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5680
" keep, and delete it when you are done."
5683
#: bzrlib/errors.py:2157
5685
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5686
"examine %(pending_deletion)s to see if it contains any files you wish to "
5687
"keep, and delete it when you are done."
5690
#: bzrlib/errors.py:2167
5691
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\"."
5697
"Im öffentlichen Zweig »%(public_location)s« fehlt Revision »%(revstring)s«."
5699
#: bzrlib/errors.py:2194
5700
msgid "Error in merge modified format"
5703
#: bzrlib/errors.py:2199
5704
msgid "Format error in conflict listings"
5707
#: bzrlib/errors.py:2203
5709
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5710
"Error: %(description)s"
5713
#: bzrlib/errors.py:2214
5715
"An error has been detected in the repository %(repo_path)s.\n"
5716
"Please run bzr reconcile on this repository."
5719
#: bzrlib/errors.py:2225
5721
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5722
"reason: %(reason)s"
5725
#: bzrlib/errors.py:2238
5727
"An inconsistent delta was supplied: %(delta)r\n"
5728
"reason: %(reason)s"
5731
#: bzrlib/errors.py:2250
5732
msgid "To use this feature you must upgrade your branch at %(path)s."
5735
#: bzrlib/errors.py:2259
5736
msgid "To use this feature you must upgrade your repository at %(path)s."
5739
#: bzrlib/errors.py:2264
5741
"To use this feature you must upgrade your branch at %(path)s to a format "
5742
"which supports rich roots."
5745
#: bzrlib/errors.py:2270
5746
msgid "Cannot perform local-only commits on unbound branches."
5749
#: bzrlib/errors.py:2275
5750
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5753
#: bzrlib/errors.py:2296
5754
msgid "Ghost tags not supported by format %(format)r."
5757
#: bzrlib/errors.py:2304
5758
msgid "File is binary but should be text."
5759
msgstr "Die Datei ist binär, sollte aber Text sein."
5761
#: bzrlib/errors.py:2309
5762
msgid "The path %(path)s is not permitted on this platform"
5763
msgstr "Der Pfad %(path)s ist auf dieser Plattform nicht erlaubt"
5765
#: bzrlib/errors.py:2318
5767
"Testament did not match expected value.\n"
5768
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5772
#: bzrlib/errors.py:2330
5773
msgid "Not a bzr revision-bundle: %(text)r"
5776
#: bzrlib/errors.py:2339
5777
msgid "Bad bzr revision-bundle: %(text)r"
5780
#: bzrlib/errors.py:2348
5781
msgid "Malformed bzr revision-bundle header: %(text)r"
5784
#: bzrlib/errors.py:2353
5785
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5788
#: bzrlib/errors.py:2358
5789
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5792
#: bzrlib/errors.py:2363
5793
msgid "End of line marker was not \\n in bzr revision-bundle"
5796
#: bzrlib/errors.py:2373
5797
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5800
#: bzrlib/errors.py:2383
5801
msgid "Root class for inventory serialization errors"
5804
#: bzrlib/errors.py:2387
5806
"The inventory was not in the expected format:\n"
5810
#: bzrlib/errors.py:2396
5811
msgid "This operation requires rich root data storage"
5814
#: bzrlib/errors.py:2409
5815
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5818
#: bzrlib/errors.py:2418
5820
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5824
#: bzrlib/errors.py:2425
5826
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5827
"ghost at {%(ghost_revision_id)s}"
5830
#: bzrlib/errors.py:2435
5831
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5832
msgstr "Geister-Revision {%(revision_id)s} kann hier nicht benutzt werden."
5834
#: bzrlib/errors.py:2486
5836
"A merge directive must provide either a bundle or a public branch location."
5839
#: bzrlib/errors.py:2493
5840
msgid "Bad merge directive payload %(start)r"
5843
#: bzrlib/errors.py:2503
5844
msgid "Preview patch does not match requested changes."
5847
#: bzrlib/errors.py:2509
5848
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5851
#: bzrlib/errors.py:2519
5853
"Your branch does not have all of the revisions required in order to merge "
5854
"this merge directive and the target location specified in the merge "
5855
"directive is not a branch: %(location)s."
5858
#: bzrlib/errors.py:2531
5859
msgid "Unsupported entry kind %(kind)s"
5862
#: bzrlib/errors.py:2539
5863
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5866
#: bzrlib/errors.py:2549
5867
msgid "Subsume target %(other_tree)s needs to be upgraded."
5870
#: bzrlib/errors.py:2568
5871
msgid "No such tag: %(tag_name)s"
5874
#: bzrlib/errors.py:2576
5875
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5878
#: bzrlib/errors.py:2585
5879
msgid "Tag %(tag_name)s already exists."
5882
#: bzrlib/errors.py:2593
5884
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
5885
"\" for more information on this feature."
5888
#: bzrlib/errors.py:2603
5890
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5893
#: bzrlib/errors.py:2613
5895
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5898
#: bzrlib/errors.py:2623
5899
msgid "Invalid line in bugs property: '%(line)s'"
5902
#: bzrlib/errors.py:2631
5903
msgid "Invalid bug status: '%(status)s'"
5906
#: bzrlib/errors.py:2639
5907
msgid "Could not understand response from smart server: %(response_tuple)r"
5910
#: bzrlib/errors.py:2678
5911
msgid "Server sent an unexpected error: %(error_tuple)r"
5912
msgstr "Der Server meldete einen unerwarteten Fehler: %(error_tuple)r"
5914
#: bzrlib/errors.py:2697
5915
msgid "Unrecognised container format: %(container_format)r"
5918
#: bzrlib/errors.py:2705
5919
msgid "Unexpected end of container stream"
5922
#: bzrlib/errors.py:2710
5923
msgid "Unknown record type: %(record_type)r"
5926
#: bzrlib/errors.py:2718
5927
msgid "Invalid record: %(reason)s"
5930
#: bzrlib/errors.py:2726
5931
msgid "Container has data after end marker: %(excess)r"
5934
#: bzrlib/errors.py:2734
5935
msgid "Container has multiple records with the same name: %(name)s"
5938
#: bzrlib/errors.py:2747
5939
msgid "Corrupt or incompatible data stream: %(reason)s"
5940
msgstr "Fehlerhafter oder inkompatibler Datenstrom: %(reason)s"
5942
#: bzrlib/errors.py:2755
5943
msgid "SMTP error: %(error)s"
5944
msgstr "SMTP-Fehler: %(error)s"
5946
#: bzrlib/errors.py:2763
5947
msgid "No message supplied."
5950
#: bzrlib/errors.py:2768
5951
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
5960
"Unable to find mail client with the following names: "
5961
"%(mail_command_list_string)s"
5964
#: bzrlib/errors.py:2791
5965
msgid "SMTP connection to %(host)s refused"
5966
msgstr "SMTP-Verbindung zu %(host)s wurde abgelehnt"
5968
#: bzrlib/errors.py:2800
5969
msgid "Please specify smtp_server. No server at default %(host)s."
5972
#: bzrlib/errors.py:2814
5974
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5978
#: bzrlib/errors.py:2826
5979
msgid "'%(display_url)s' is already a branch."
5980
msgstr "»%(display_url)s« ist bereits ein Zweig."
5982
#: bzrlib/errors.py:2831
5983
msgid "'%(display_url)s' is already a tree."
5986
#: bzrlib/errors.py:2836
5987
msgid "'%(display_url)s' is already a checkout."
5990
#: bzrlib/errors.py:2841
5991
msgid "'%(display_url)s' is already a lightweight checkout."
5994
#: bzrlib/errors.py:2846
5995
msgid "'%(display_url)s' is already using a shared repository."
5998
#: bzrlib/errors.py:2851
5999
msgid "'%(display_url)s' is already standalone."
6002
#: bzrlib/errors.py:2856
6003
msgid "Shared repository '%(display_url)s' already creates working trees."
6006
#: bzrlib/errors.py:2862
6008
"Shared repository '%(display_url)s' already doesn't create working trees."
6011
#: bzrlib/errors.py:2868
6012
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6015
#: bzrlib/errors.py:2873
6016
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
6032
msgid "Variable {%(name)s} is not available."
6033
msgstr "Variable {%(name)s} steht nicht zur Verfügung."
6035
#: bzrlib/errors.py:2911
6036
msgid "No template specified."
6039
#: bzrlib/errors.py:2916
6040
msgid "Unable to create symlink %(path_str)son this platform"
6043
#: bzrlib/errors.py:2931
6045
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6048
"Ungültiges Zeitzonenformat »%(timezone)s«, die Optionen sind »utc«, "
6049
"»original« und »local«."
6051
#: bzrlib/errors.py:2965
6053
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6056
#: bzrlib/errors.py:2977
6057
msgid "The \"%(config_id)s\" configuration does not exist."
6058
msgstr "Die Konfiguration »%(config_id)s« existiert nicht."
6060
#: bzrlib/errors.py:2985
6061
msgid "The \"%(option_name)s\" configuration option does not exist."
6062
msgstr "Die Konfigurationsoption »%(option_name)s« existiert nicht."
6064
#: bzrlib/errors.py:2993
6065
msgid "The alias \"%(alias_name)s\" does not exist."
6066
msgstr "Der Alias »%(alias_name)s« existiert nicht."
6068
#: bzrlib/errors.py:3007
6069
msgid "\"%(alias_name)s\" is not a valid location alias."
6072
#: bzrlib/errors.py:3015
6073
msgid "No %(alias_name)s location assigned."
6076
#: bzrlib/errors.py:3023
6077
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6080
#: bzrlib/errors.py:3033
6081
msgid "Unknown rules detected: %(unknowns_str)s."
6082
msgstr "Unbekannte Regeln festgestellt: %(unknowns_str)s."
6084
#: bzrlib/errors.py:3044
6085
msgid "Tip change rejected: %(msg)s"
6088
#: bzrlib/errors.py:3052
6089
msgid "Shelf corrupt."
6092
#: bzrlib/errors.py:3057
6093
msgid "Corruption while decompressing repository file%(orig_error)s"
6096
#: bzrlib/errors.py:3069
6097
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6100
#: bzrlib/errors.py:3077
6101
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'."
6108
#: bzrlib/errors.py:3093
6109
msgid "The user aborted the operation."
6110
msgstr "Der Vorgang wurde vom Benutzer abgebrochen."
6112
#: bzrlib/errors.py:3098
6113
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6116
#: bzrlib/errors.py:3108
6117
msgid "No such view: %(view_name)s."
6120
#: bzrlib/errors.py:3118
6122
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6123
"to a later format."
6126
#: bzrlib/errors.py:3127
6128
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6131
#: bzrlib/errors.py:3194
6132
msgid "%(bzrdir)r does not support co-located branches."
6135
#: bzrlib/errors.py:3200
6137
"Unable to determine your name.\n"
6138
"Please, set your name with the 'whoami' command.\n"
6139
"E.g. bzr whoami \"Your Name <name@example.com>\""
6142
#: bzrlib/errors.py:3209
6143
msgid "Invalid pattern(s) found. %(msg)s"
6144
msgstr "Ungültige(s) Muster gefunden. %(msg)s"
6146
#: bzrlib/errors.py:3217
6148
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6152
#: bzrlib/errors.py:3228
6153
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6156
#: bzrlib/errors.py:3237
6157
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6160
#: bzrlib/errors.py:3246
6162
"No compatible object available for operations from %(source)r to %(target)r."
6165
#: bzrlib/errors.py:3256
6167
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6171
#: bzrlib/errors.py:3266
6173
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6177
#: bzrlib/errors.py:3278
6179
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6182
"Die fehlende Funktion %(feature)s wird weder von dieser Bazaar-Version noch "
6183
"von irgendeiner Erweiterung unterstützt."
6185
#: bzrlib/errors.py:3291
6186
msgid "Binary files section encountered."
6187
msgstr "Auf einen Abschnitt für Binärdateien gestoßen."
6189
#: bzrlib/errors.py:3299
6191
"Malformed patch header. %(desc)s\n"
6195
#: bzrlib/errors.py:3308
6197
"Malformed hunk header. %(desc)s\n"
6201
#: bzrlib/errors.py:3317
6203
"Malformed line. %(desc)s\n"
6206
"Ungültige Zeile. %(desc)s\n"
6209
#: bzrlib/errors.py:3327
6211
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6212
"but patch says it should be \"%(patch_line)s\""
6215
#: bzrlib/errors.py:3338
6216
msgid "The feature %(feature)s has already been registered."
6219
#: bzrlib/export_pot.py:252
6221
msgid "Exporting messages from builtin command: %s"
6224
#: bzrlib/export_pot.py:271
6225
msgid "Exporting messages from plugin command: {0} in {1}"
6228
#: bzrlib/export_pot.py:292
6230
msgid "Exporting message from error: %s"
6233
#: bzrlib/fetch.py:98
6234
msgid "Finding revisions"
6235
msgstr "Revisionen finden"
6237
#: bzrlib/fetch.py:103
6238
msgid "Fetching revisions"
6239
msgstr "Revisionen herunterladen"
6241
#: bzrlib/foreign.py:262
6242
msgid "Push into a different VCS without any custom bzr metadata."
6245
#: bzrlib/foreign.py:264
6247
"This will afterwards rebase the local branch on the remote\n"
6248
"branch unless the --no-rebase option is used, in which case \n"
6249
"the two branches will be out of sync after the push. "
6252
#: bzrlib/foreign.py:277
6253
msgid "Do not rebase after push."
6256
#: bzrlib/foreign.py:311
6258
msgid "Using saved location: %s\n"
6261
#: bzrlib/foreign.py:321
6263
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6267
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6268
msgid "{0} commits with valid signatures"
6271
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6272
msgid "{0} commit with unknown key"
6273
msgid_plural "{0} commits with unknown keys"
6277
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6278
msgid "{0} commit not valid"
6279
msgid_plural "{0} commits not valid"
6283
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6284
msgid "{0} commit not signed"
6285
msgid_plural "{0} commits not signed"
6289
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6290
msgid "{0} commit with key now expired"
6291
msgid_plural "{0} commits with key now expired"
6295
#: bzrlib/gpg.py:343
6296
msgid "No GnuPG key results for pattern: {0}"
6299
#: bzrlib/gpg.py:386
6300
msgid "{0} signed {1} commit"
6301
msgid_plural "{0} signed {1} commits"
6305
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6306
msgid "{0} commit by author {1}"
6307
msgid_plural "{0} commits by author {1}"
6311
#: bzrlib/gpg.py:433
6312
msgid "Unknown key {0} signed {1} commit"
6313
msgid_plural "Unknown key {0} signed {1} commits"
6317
#: bzrlib/gpg.py:452
6318
msgid "{0} commit by author {1} with key {2} now expired"
6319
msgid_plural "{0} commits by author {1} with key {2} now expired"
6323
#: bzrlib/groupcompress.py:1739
6325
msgid "Insert claimed random_id=True, but then inserted %r two times"
6328
#: bzrlib/hooks.py:331
6330
msgid "Introduced in: %s"
6331
msgstr "Eingeführt in: %s"
6333
#: bzrlib/hooks.py:334
6335
msgid "Deprecated in: %s"
6336
msgstr "Veraltet in: %s"
6338
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6339
msgid "Walking content"
6342
#: bzrlib/knit.py:3330
6346
#: bzrlib/lock.py:548
6347
msgid "{0!r} was {1} locked again"
6350
#: bzrlib/lockdir.py:321
6352
msgid "error removing pending lock: %s"
6355
#: bzrlib/lockdir.py:616
6356
msgid "Unable to obtain"
6359
#: bzrlib/lockdir.py:618
6360
msgid "Lock owner changed for"
6363
#: bzrlib/lockdir.py:620
6364
msgid "{0} lock {1} {2}."
6367
#: bzrlib/lockdir.py:627
6369
msgid "Will continue to try until %s, unless you press Ctrl-C."
6372
#: bzrlib/lockdir.py:629
6373
msgid "See \"bzr help break-lock\" for more."
6374
msgstr "Siehe »bzr help break-lock« für mehr Informationen."
6376
#: bzrlib/lockdir.py:739
6379
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6382
#: bzrlib/log.py:572
6383
msgid "--exclude-common-ancestry requires two different revisions"
6384
msgstr "--exclude-common-ancestry erfordert zwei verschiedene Revisionen"
6386
#: bzrlib/log.py:574
6388
msgid "invalid direction %r"
6389
msgstr "Ungültige Richtung %r"
6391
#: bzrlib/log.py:662
6392
msgid "Start revision not found in history of end revision."
6395
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6396
msgid "Logging revision 0 is invalid."
6399
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6400
msgid "Start revision must be older than the end revision."
6403
#: bzrlib/log.py:1827
6405
msgid "unknown log formatter: %r"
6406
msgstr "Unbekannter Protokollformatierer: %r"
6408
#: bzrlib/log.py:2123
6410
msgid_plural "fixes bugs"
6411
msgstr[0] "behebt den Fehler"
6412
msgstr[1] "behebt die Fehler"
6414
#: bzrlib/merge.py:689
6415
msgid "All changes applied successfully."
6416
msgstr "Alle Änderungen erfolgreich angewendet."
6418
#: bzrlib/merge.py:691
6420
msgid "%d conflicts encountered."
6421
msgstr "Auf %d Konflikte gestoßen."
6423
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6424
msgid "Preparing file merge"
6427
#: bzrlib/multiparent.py:426
6428
msgid "Importing revisions"
6429
msgstr "Revisionen importieren"
6431
#: bzrlib/option.py:526
6432
msgid "Show help message."
6433
msgstr "Hilfetext anzeigen."
6435
#: bzrlib/option.py:528
6436
msgid "Only display errors and warnings."
6437
msgstr "Nur Fehler und Warnungen anzeigen."
6439
#: bzrlib/option.py:531
6440
msgid "Show usage message and options."
6441
msgstr "Aufruf und Optionen anzeigen."
6443
#: bzrlib/option.py:533
6444
msgid "Display more information."
6445
msgstr "Weitere Informationen anzeigen."
6447
#: bzrlib/option.py:541
6449
"Select changes introduced by the specified revision. See also \"help "
6453
#: bzrlib/option.py:543
6454
msgid "Branch to operate on, instead of working directory."
6457
#: bzrlib/option.py:545
6458
msgid "Detailed log format."
6459
msgstr "Ausführliches Protokollformat."
6461
#: bzrlib/option.py:545
6462
msgid "Format used by GNU ChangeLog files."
6463
msgstr "Format von »GNU ChangeLog«-Dateien."
6465
#: bzrlib/option.py:545
6466
msgid "Log format with one line per revision."
6467
msgstr "Protokollformat mit einer Zeile pro Revision."
6469
#: bzrlib/option.py:545
6470
msgid "Moderately short log format."
6471
msgstr "Relativ kurzes Protokollformat."
6473
#: bzrlib/option.py:545
6474
msgid "Use specified log format."
6475
msgstr "Angegebenes Protokollformat benutzen."
6477
#: bzrlib/option.py:547
6479
msgstr "Protokollformat"
6481
#: bzrlib/option.py:549
6482
msgid "LCA-newness merge."
6485
#: bzrlib/option.py:549
6486
msgid "Merge using external diff3."
6489
#: bzrlib/option.py:549
6490
msgid "Native diff3-style merge."
6493
#: bzrlib/option.py:549
6494
msgid "Select a particular merge algorithm."
6497
#: bzrlib/option.py:549
6498
msgid "Weave-based merge."
6501
#: bzrlib/option.py:551
6502
msgid "Merge algorithm"
6505
#: bzrlib/option.py:554
6506
msgid "Message string."
6507
msgstr "Nachrichtenzeichenkette."
6509
#: bzrlib/option.py:556
6510
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6513
#: bzrlib/option.py:558
6514
msgid "Ignore differences between branches and overwrite unconditionally."
6517
#: bzrlib/option.py:560
6518
msgid "Remember the specified location as a default."
6519
msgstr "Den angegebenen Ort als Vorgabe merken."
6521
#: bzrlib/option.py:562
6522
msgid "Reprocess to reduce spurious conflicts."
6523
msgstr "Erneut ausführen, um scheinbare Konflikte zu verringern."
6525
#: bzrlib/option.py:566
6526
msgid "See \"help revisionspec\" for details."
6527
msgstr "Siehe »help revisionspec« für Details."
6529
#: bzrlib/option.py:568
6530
msgid "Show internal object ids."
6533
#: bzrlib/option.py:571
6534
msgid "Display timezone as local, original, or utc."
6535
msgstr "Zeitzone als local, original oder utc anzeigen."
6537
#: bzrlib/osutils.py:100
6538
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6541
#: bzrlib/osutils.py:220
6542
msgid "lstat/stat of ({0!r}): {1!r}"
6545
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6547
msgid "sorry, %r not allowed in path"
6548
msgstr "Entschuldigung, %r ist im Pfad nicht erlaubt"
6550
#: bzrlib/osutils.py:1237
6552
msgid "%r is too short to calculate a relative path"
6553
msgstr "%r ist zu kurz, um einen relativen Pfad zu berechnen"
6555
#: bzrlib/plugin.py:143
6557
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6558
msgstr "»%s« ist keine gültige <plugin_name>@<plugin_path>-Beschreibung "
6560
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6561
msgid "Enable completions for the selected plugin (default: all plugins)"
6564
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6565
msgid "Generate a shell function for bash command line completion."
6568
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6570
"This command generates a shell function which can be used by bash to\n"
6571
"automatically complete the currently typed command when the user presses\n"
6572
"the completion key (usually tab)."
6575
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6577
"Commonly used like this:\n"
6578
" eval \"`bzr bash-completion`\""
6580
"Gebräuchlicher Aufruf wie folgt:\n"
6581
" eval \"`bzr bash-completion`\""
6583
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6584
msgid "Name of the generated function (default: _bzr)"
6585
msgstr "Name der erzeugten Funktion (Vorgabe: _bzr)"
6587
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6588
msgid "Generate only the shell function, don't enable it"
6591
#: bzrlib/plugins/launchpad/__init__.py:81
6592
msgid "Register a branch with launchpad.net."
6593
msgstr "Einen Zweig bei launchpad.net registrieren."
6595
#: bzrlib/plugins/launchpad/__init__.py:83
6597
"This command lists a bzr branch in the directory of branches on\n"
6598
"launchpad.net. Registration allows the branch to be associated with\n"
6599
"bugs or specifications."
6602
#: bzrlib/plugins/launchpad/__init__.py:87
6604
"Before using this command you must register the project to which the\n"
6605
"branch belongs, and create an account for yourself on launchpad.net."
6608
#: bzrlib/plugins/launchpad/__init__.py:90
6611
" public_url: The publicly visible url for the branch to register.\n"
6612
" This must be an http or https url (which Launchpad can read\n"
6613
" from to access the branch). Local file urls, SFTP urls, and\n"
6614
" bzr+ssh urls will not work.\n"
6615
" If no public_url is provided, bzr will use the configured\n"
6616
" public_url if there is one for the current branch, and\n"
6620
#: bzrlib/plugins/launchpad/__init__.py:99
6623
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6624
" --project fooproject"
6627
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6628
" --project fooproject"
6630
#: bzrlib/plugins/launchpad/__init__.py:106
6631
msgid "Launchpad project short name to associate with the branch."
6632
msgstr "Launchpad-Projekt-Kurzname, dem der Zweig zugeordnet wird."
6634
#: bzrlib/plugins/launchpad/__init__.py:113
6636
"Short name for the branch; by default taken from the last component of the "
6640
#: bzrlib/plugins/launchpad/__init__.py:117
6641
msgid "One-sentence description of the branch."
6642
msgstr "Beschreibung des Zweiges in einem Satz."
6644
#: bzrlib/plugins/launchpad/__init__.py:120
6645
msgid "Longer description of the purpose or contents of the branch."
6646
msgstr "Längere Beschreibung für den Zweck oder die Inhalte des Zweiges."
6648
#: bzrlib/plugins/launchpad/__init__.py:123
6649
msgid "Branch author's email address, if not yourself."
6650
msgstr "E-Mail-Adresse des Autors des Zweigs, wenn Sie es nicht selbst sind."
6652
#: bzrlib/plugins/launchpad/__init__.py:126
6653
msgid "The bug this branch fixes."
6654
msgstr "Der Fehler, den dieser Zweig behebt."
6656
#: bzrlib/plugins/launchpad/__init__.py:129
6657
msgid "Prepare the request but don't actually send it."
6658
msgstr "Die Anfrage vorbereiten, aber nicht absenden."
6660
#: bzrlib/plugins/launchpad/__init__.py:151
6662
"register-branch requires a public branch url - see bzr help register-branch."
6665
#: bzrlib/plugins/launchpad/__init__.py:159
6666
msgid "--product is deprecated; please use --project."
6667
msgstr "--product ist veraltet; bitte --project benutzen."
6669
#: bzrlib/plugins/launchpad/__init__.py:191
6670
msgid "Open a Launchpad branch page in your web browser."
6671
msgstr "Eine Launchpad-Zweig-Seite in Ihrem Web-Browser öffnen."
6673
#: bzrlib/plugins/launchpad/__init__.py:196
6674
msgid "Do not actually open the browser. Just say the URL we would use."
6677
#: bzrlib/plugins/launchpad/__init__.py:231
6679
msgid "Opening %s in web browser"
6680
msgstr "%s wird im Web-Browser geöffnet"
6682
#: bzrlib/plugins/launchpad/__init__.py:241
6683
msgid "Show or set the Launchpad user ID."
6684
msgstr "Den Launchpad-Benutzernamen anzeigen oder festlegen."
6686
#: bzrlib/plugins/launchpad/__init__.py:243
6688
"When communicating with Launchpad, some commands need to know your\n"
6689
"Launchpad user ID. This command can be used to set or show the\n"
6690
"user ID that Bazaar will use for such communication."
6693
#: bzrlib/plugins/launchpad/__init__.py:247
6696
" Show the Launchpad ID of the current user::"
6699
#: bzrlib/plugins/launchpad/__init__.py:250
6700
msgid " bzr launchpad-login"
6701
msgstr " bzr launchpad-login"
6703
#: bzrlib/plugins/launchpad/__init__.py:252
6704
msgid " Set the Launchpad ID of the current user to 'bob'::"
6707
#: bzrlib/plugins/launchpad/__init__.py:254
6708
msgid " bzr launchpad-login bob"
6709
msgstr " bzr launchpad-login bob"
6711
#: bzrlib/plugins/launchpad/__init__.py:261
6712
msgid "Don't check that the user name is valid."
6713
msgstr "Den Benutzernamen nicht auf Gültigkeit prüfen."
6715
#: bzrlib/plugins/launchpad/__init__.py:276
6716
#: bzrlib/plugins/launchpad/__init__.py:287
6717
msgid "Launchpad user ID exists and has SSH keys.\n"
6718
msgstr "Launchpad-Benutzername existiert und hat SSH-Schlüssel.\n"
6720
#: bzrlib/plugins/launchpad/__init__.py:279
6721
msgid "No Launchpad user ID configured.\n"
6722
msgstr "Kein Launchpad-Benutzername konfiguriert.\n"
6724
#: bzrlib/plugins/launchpad/__init__.py:290
6726
msgid "Launchpad user ID set to '%s'.\n"
6727
msgstr "Launchpad-Benutzername auf »%s« festgelegt.\n"
6729
#: bzrlib/plugins/launchpad/__init__.py:298
6730
msgid "Ask Launchpad to mirror a branch now."
6731
msgstr "Launchpad jetzt darum bitten, einen Zweig zu spiegeln."
6733
#: bzrlib/plugins/launchpad/__init__.py:318
6734
msgid "Propose merging a branch on Launchpad."
6737
#: bzrlib/plugins/launchpad/__init__.py:320
6739
"This will open your usual editor to provide the initial comment. When it\n"
6740
"has created the proposal, it will open it in your default web browser."
6743
#: bzrlib/plugins/launchpad/__init__.py:323
6745
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6746
"is not supplied, the remembered submit branch will be used. If no submit\n"
6747
"branch is remembered, the development focus will be used."
6750
#: bzrlib/plugins/launchpad/__init__.py:327
6752
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6753
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6754
"The parameter the launchpad account name of the desired reviewer. This\n"
6755
"may optionally be followed by '=' and the review type. For example:"
6758
#: bzrlib/plugins/launchpad/__init__.py:332
6759
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6762
#: bzrlib/plugins/launchpad/__init__.py:334
6764
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6765
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6768
#: bzrlib/plugins/launchpad/__init__.py:339
6769
msgid "Propose the merge on staging."
6772
#: bzrlib/plugins/launchpad/__init__.py:341
6773
msgid "Commit message."
6776
#: bzrlib/plugins/launchpad/__init__.py:343
6777
msgid "Mark the proposal as approved immediately."
6780
#: bzrlib/plugins/launchpad/__init__.py:345
6781
msgid "Requested reviewer and optional type."
6784
#: bzrlib/plugins/launchpad/__init__.py:382
6785
msgid "Find the proposal to merge this revision."
6788
#: bzrlib/plugins/launchpad/__init__.py:384
6790
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6791
"This works only if the selected branch was the merge proposal target, and\n"
6792
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6793
"are opened in a web browser."
6796
#: bzrlib/plugins/launchpad/__init__.py:389
6798
"Any revision involved in the merge may be specified-- the revision in\n"
6799
"which the merge was performed, or one of the revisions that was merged."
6802
#: bzrlib/plugins/launchpad/__init__.py:392
6803
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6806
#: bzrlib/plugins/launchpad/__init__.py:394
6807
msgid " bzr lp-find-proposal -r annotate:README:1"
6810
#: bzrlib/plugins/launchpad/__init__.py:409
6811
msgid "No review found."
6814
#: bzrlib/plugins/launchpad/__init__.py:410
6816
msgid "%d proposals(s) found."
6819
#: bzrlib/plugins/launchpad/__init__.py:420
6820
msgid "Finding revision-id"
6823
#: bzrlib/plugins/launchpad/__init__.py:427
6824
msgid "Finding merge"
6827
#: bzrlib/plugins/launchpad/__init__.py:432
6828
msgid "Finding revno"
6831
#: bzrlib/plugins/launchpad/__init__.py:437
6832
msgid "Finding Launchpad branch"
6835
#: bzrlib/plugins/launchpad/__init__.py:440
6836
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
#: bzrlib/plugins/launchpad/lp_api.py:241
6844
#: bzrlib/plugins/launchpad/lp_api.py:246
6846
msgid "%s is not registered on Launchpad"
6847
msgstr "%s ist nicht in Launchpad registriert"
6849
#: bzrlib/plugins/launchpad/lp_api.py:256
6851
msgid "%s has no development focus."
6854
#: bzrlib/plugins/launchpad/lp_api.py:261
6856
msgid "development focus %s has no branch."
6859
#: bzrlib/plugins/launchpad/lp_api.py:266
6861
msgid "source package %s has no branch."
6864
#: bzrlib/plugins/launchpad/lp_api.py:270
6866
msgid "%s has no associated product or source package."
6869
#: bzrlib/plugins/launchpad/lp_api.py:282
6871
msgid "%s is already up-to-date."
6872
msgstr "%s ist bereits auf dem neuesten Stand."
6874
#: bzrlib/plugins/launchpad/lp_api.py:289
6876
msgid "Pushing to %s"
6879
#: bzrlib/plugins/launchpad/lp_directory.py:170
6881
"resolution for {0}\n"
6886
#: bzrlib/plugins/launchpad/lp_propose.py:149
6888
msgid "There is already a branch merge proposal: %s"
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6892
msgid "pb parameter to convert() is deprecated"
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6896
msgid "starting upgrade from format 4 to 5"
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6900
msgid "note: upgrade may be faster if all store files are ungzipped first"
6903
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6904
msgid "converting revision"
6905
msgstr "Revision umwandeln"
6907
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6908
msgid "upgraded to weaves:"
6911
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6913
msgid "%6d revisions and inventories"
6916
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6918
msgid "%6d revisions not present"
6919
msgstr "%6d Revisionen nicht vorhanden"
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6926
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6927
msgid "writing weave"
6930
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6931
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6935
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6936
msgid "write revision"
6937
msgstr "Revision schreiben"
6939
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6940
msgid "loading revision"
6941
msgstr "Revision laden"
6943
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6945
msgid "revision {%s} not present in branch; will be converted as a ghost"
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6949
msgid "starting upgrade from format 5 to 6"
6952
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6954
msgid "adding prefixes to %s"
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6958
msgid "starting upgrade from format 6 to metadir"
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6962
msgid "Removing ancestry.weave"
6965
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6966
msgid "Finding branch files"
6967
msgstr "Dateien des Zweigs finden"
6969
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6970
msgid "Upgrading repository"
6973
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6974
msgid "Upgrading branch"
6977
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6978
msgid "No working tree."
6981
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6982
msgid "Upgrading working tree"
6985
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6987
msgid "Make %s lock"
6990
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6993
msgstr "%s wird verschoben"
6995
#: bzrlib/push.py:56
6996
msgid "Created new branch."
6997
msgstr "Neuer Zweig wurde erstellt."
6999
#: bzrlib/push.py:97
7002
"Target directory %s already contains a .bzr directory, but it is not valid."
7005
#: bzrlib/push.py:101
7008
"Target directory %s already exists, but does not have a .bzr directory. "
7009
"Supply --use-existing-dir to push there anyway."
7012
#: bzrlib/push.py:122
7014
msgid "Too many redirections trying to make %s."
7017
#: bzrlib/push.py:147
7019
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7023
#: bzrlib/push.py:151
7026
"It is not possible to losslessly push to %s. You may want to use dpush "
7030
#: bzrlib/push.py:157
7033
"At %s you have a valid .bzr control directory, but not a branch or "
7034
"repository. This is an unsupported configuration. Please move the target "
7035
"directory out of the way and try again."
7038
#: bzrlib/reconcile.py:97
7040
msgid "Reconciling branch %s"
7043
#: bzrlib/reconcile.py:103
7045
msgid "Reconciling repository %s"
7048
#: bzrlib/reconcile.py:105
7049
msgid "Reconciling repository"
7052
#: bzrlib/reconcile.py:111
7054
msgid "%s cannot canonicalize CHKs."
7057
#: bzrlib/reconcile.py:119
7058
msgid "Reconcile aborted: revision index has inconsistent parents."
7061
#: bzrlib/reconcile.py:121
7062
msgid "Run \"bzr check\" for more details."
7065
#: bzrlib/reconcile.py:123
7066
msgid "Reconciliation complete."
7069
#: bzrlib/reconcile.py:166
7070
msgid "Fixing last revision info {0} => {1}"
7073
#: bzrlib/reconcile.py:173
7074
msgid "revision_history ok."
7077
#: bzrlib/reconcile.py:234
7078
msgid "Reading inventory data"
7081
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7082
msgid "Inventory ok."
7085
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7086
msgid "Backing up inventory"
7089
#: bzrlib/reconcile.py:258
7090
msgid "Backup inventory created."
7093
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7094
msgid "Writing weave"
7097
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7098
msgid "Inventory regenerated."
7101
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7102
msgid "Reading indexes"
7105
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7106
msgid "Checking unused inventories"
7109
#: bzrlib/reconcile.py:388
7110
msgid "Backup Inventory created"
7113
#: bzrlib/reconcile.py:446
7114
msgid "Fixing text parents"
7117
#: bzrlib/reconfigure.py:54
7118
msgid "{0} is now stacked on {1}\n"
7121
#: bzrlib/reconfigure.py:69
7123
msgid "%s is now not stacked\n"
7126
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7128
msgid "bzr: ERROR (ignored): %s"
7131
#: bzrlib/remote.py:2541
7132
msgid "Copying repository content as tarball..."
7135
#: bzrlib/rename_map.py:69
7136
msgid "Calculating hashes"
7139
#: bzrlib/rename_map.py:107
7140
msgid "Determining hash hits"
7143
#: bzrlib/rename_map.py:242
7147
#: bzrlib/repository.py:1787
7148
msgid "Moving repository to repository.backup"
7151
#: bzrlib/repository.py:1794
7152
msgid "Creating new repository"
7155
#: bzrlib/repository.py:1799
7156
msgid "Copying content"
7159
#: bzrlib/repository.py:1803
7160
msgid "Deleting old repository content"
7163
#: bzrlib/repository.py:1805
7164
msgid "repository converted"
7167
#: bzrlib/revisionspec.py:903
7168
msgid "Using {0} {1}"
7171
#: bzrlib/send.py:58
7173
msgid "Mail client \"%s\" does not support specifying body"
7176
#: bzrlib/send.py:62
7177
msgid "--remember requires a branch to be specified."
7180
#: bzrlib/send.py:77
7181
msgid "No submit branch known or specified"
7184
#: bzrlib/send.py:80
7185
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7188
#: bzrlib/send.py:98
7190
msgid "No such send format '%s'."
7193
#: bzrlib/send.py:114
7194
msgid "bzr send takes at most two one revision identifiers"
7197
#: bzrlib/send.py:127
7198
msgid "No revisions to submit."
7201
#: bzrlib/send.py:139
7203
"- not supported for merge directives that use more than one output file."
7206
#: bzrlib/send.py:185
7207
msgid "Format 0.9 does not permit bundle with no patch"
7210
#: bzrlib/shelf_ui.py:46
7212
msgid "Shelve adding file \"%(path)s\"?"
7215
#: bzrlib/shelf_ui.py:47
7216
msgid "Shelve binary changes?"
7219
#: bzrlib/shelf_ui.py:48
7220
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7223
#: bzrlib/shelf_ui.py:50
7225
msgid "Shelve removing file \"%(path)s\"?"
7228
#: bzrlib/shelf_ui.py:51
7230
msgid "Shelve %d change(s)?"
7233
#: bzrlib/shelf_ui.py:52
7237
#: bzrlib/shelf_ui.py:53
7240
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7243
#: bzrlib/shelf_ui.py:55
7245
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7248
#: bzrlib/shelf_ui.py:70
7250
msgid "Changes shelved with id \"%d\"."
7253
#: bzrlib/shelf_ui.py:74
7254
msgid "Selected changes destroyed."
7257
#: bzrlib/shelf_ui.py:78
7258
msgid "Selected changes:"
7261
#: bzrlib/shelf_ui.py:98
7263
msgid "Delete file \"%(path)s\"?"
7266
#: bzrlib/shelf_ui.py:99
7267
msgid "Apply binary changes?"
7270
#: bzrlib/shelf_ui.py:100
7272
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7275
#: bzrlib/shelf_ui.py:102
7277
msgid "Add file \"%(path)s\"?"
7280
#: bzrlib/shelf_ui.py:103
7282
msgid "Apply %d change(s)?"
7285
#: bzrlib/shelf_ui.py:104
7286
msgid "Apply change?"
7289
#: bzrlib/shelf_ui.py:105
7291
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7294
#: bzrlib/shelf_ui.py:107
7296
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7299
#: bzrlib/shelf_ui.py:402
7300
msgid "No changes are shelved."
7303
#: bzrlib/shelf_ui.py:460
7305
msgid "Using changes with id \"%d\"."
7308
#: bzrlib/shelf_ui.py:464
7313
#: bzrlib/shelf_ui.py:476
7315
msgid "Deleted changes with id \"%d\"."
7318
#: bzrlib/smart/medium.py:714
7319
msgid "HPSS calls: {0} ({1} vfs) {2}"
7322
#: bzrlib/smart/server.py:169
7323
msgid "Requested to stop gracefully"
7326
#: bzrlib/smart/server.py:179
7328
msgid "Waiting for %d client(s) to finish"
7331
#: bzrlib/smart/server.py:185
7333
msgid "Still waiting for %d client(s) to finish"
7336
#: bzrlib/smart/server.py:219
7338
msgid "listening socket error: %s"
7341
#: bzrlib/smart/server.py:452
7343
msgid "listening on port: %s"
7346
#: bzrlib/switch.py:73
7347
msgid "Pending merges must be committed or reverted before using switch."
7350
#: bzrlib/switch.py:100
7352
"Cannot switch as local commits found in the checkout. Commit these to the "
7353
"bound branch or use --force to throw them away."
7356
#: bzrlib/switch.py:105
7359
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7360
"anyway, use --force."
7363
#: bzrlib/switch.py:125
7364
msgid "Cannot switch a branch, only a checkout."
7367
#: bzrlib/switch.py:163
7369
msgid "Tree is up to date at revision %d."
7372
#: bzrlib/switch.py:169
7374
msgid "Updated to revision %d."
7377
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7381
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7382
msgid "removing file"
7385
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7389
#: bzrlib/transform.py:2591
7390
msgid "Building tree"
7393
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7394
msgid "Adding file contents"
7397
#: bzrlib/transform.py:3028
7398
msgid "Resolution pass"
7401
#: bzrlib/transport/ftp/_gssapi.py:88
7403
msgid "Authenticated as %s"
7406
#: bzrlib/tree.py:634
7407
msgid "*** {0} content-filter: {1} => {2!r}"
7410
#: bzrlib/upgrade.py:77
7412
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7415
#: bzrlib/upgrade.py:100
7417
msgid "cannot upgrade from bzrdir format %s"
7420
#: bzrlib/upgrade.py:103
7422
msgid "starting upgrade of %s"
7425
#: bzrlib/upgrade.py:110
7429
#: bzrlib/upgrade.py:120
7430
msgid "Deleting backup.bzr"
7431
msgstr "Lösche backup.bzr"
7433
#: bzrlib/upgrade.py:151
7436
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7439
#: bzrlib/upgrade.py:208
7441
msgid "Found %d dependent branches - upgrading ..."
7444
#: bzrlib/upgrade.py:276
7445
msgid "Upgrading bzrdirs"
7448
#: bzrlib/upgrade.py:282
7450
msgid "Upgrading %s"
7451
msgstr "%s wird aktualisiert"
7453
#: bzrlib/upgrade.py:283
7454
msgid "Upgrading {0} {1} ..."
7457
#: bzrlib/upgrade.py:301
7458
msgid "Removing backup ..."
7459
msgstr "Entferne Backup…"
7461
#: bzrlib/upgrade.py:305
7462
msgid "failed to clean-up {0}: {1}"
7465
#: bzrlib/vf_repository.py:1090
7469
#: bzrlib/vf_repository.py:1116
7473
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7474
msgid "Calculating text parents"
7477
#: bzrlib/vf_repository.py:1706
7481
#: bzrlib/vf_repository.py:2535
7482
msgid "loading text store"
7485
#: bzrlib/vf_repository.py:2541
7486
msgid "checking text graph"
7489
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7490
#: bzrlib/vf_repository.py:3124
7491
msgid "Transferring revisions"
7494
#: bzrlib/win32utils.py:146
7495
msgid "Failed to GetProcessMemoryInfo()"
7498
#: bzrlib/win32utils.py:167
7499
msgid "Cannot debug memory on win32 without ctypes or win32process"
7502
#: bzrlib/win32utils.py:172
7503
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7506
#: bzrlib/win32utils.py:180
7508
msgid "WorkingSize %8d KiB"
7511
#: bzrlib/win32utils.py:181
7513
msgid "PeakWorking %8d KiB"
7516
#: bzrlib/win32utils.py:182
7518
msgid "PagefileUsage %8d KiB"
7521
#: bzrlib/win32utils.py:183
7523
msgid "PeakPagefileUsage %8d KiB"
7526
#: bzrlib/win32utils.py:185
7528
msgid "PrivateUsage %8d KiB"
7531
#: bzrlib/win32utils.py:186
7533
msgid "PageFaultCount %8d"
7536
#: bzrlib/workingtree.py:1478
7537
msgid "Rerun update after fixing the conflicts."
7540
#: dummy/help_topics/authentication/summary.txt:1
7541
msgid "Information on configuring authentication"
7544
#: dummy/help_topics/basic/detail.txt:1
7546
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7547
"http://bazaar.canonical.com/"
7549
"Bazaar 2.5b6 – Ein frei vertriebenes »Verteiltes Versionsverwaltungssystem«\n"
7550
"http://bazaar.canonical.com/"
7552
#: dummy/help_topics/basic/detail.txt:4
7555
" bzr init makes this directory a versioned branch\n"
7556
" bzr branch make a copy of another branch"
7559
" bzr init Aktuelles Verzeichnis wird zu einem versionierten Zweig "
7561
" bzr branch Eine Kopie eines anderen Entwicklungszweigs wird "
7564
#: dummy/help_topics/basic/detail.txt:8
7566
" bzr add make files or directories versioned\n"
7567
" bzr ignore ignore a file or pattern\n"
7568
" bzr mv move or rename a versioned file"
7570
" bzr add Dateien oder Verzeichnisse werden versioniert\n"
7571
" bzr ignore Eine Datei oder ein Dateimuster wird ignoriert\n"
7572
" bzr mv Eine versionierte Datei wird verschoben oder umbenannt"
7574
#: dummy/help_topics/basic/detail.txt:12
7576
" bzr status summarize changes in working copy\n"
7577
" bzr diff show detailed diffs"
7580
#: dummy/help_topics/basic/detail.txt:15
7582
" bzr merge pull in changes from another branch\n"
7583
" bzr commit save some or all changes\n"
7584
" bzr send send changes via email"
7587
#: dummy/help_topics/basic/detail.txt:19
7589
" bzr log show history of changes\n"
7590
" bzr check validate storage"
7593
#: dummy/help_topics/basic/detail.txt:22
7595
" bzr help init more help on e.g. init command\n"
7596
" bzr help commands list all commands\n"
7597
" bzr help topics list all help topics\n"
7600
#: dummy/help_topics/basic/summary.txt:1
7601
msgid "Basic commands"
7602
msgstr "Einfache Befehle"
7604
#: dummy/help_topics/branches/detail.txt:1
7608
#: dummy/help_topics/branches/detail.txt:3
7610
"A branch consists of the state of a project, including all of its\n"
7611
"history. All branches have a repository associated (which is where the\n"
7612
"branch history is stored), but multiple branches may share the same\n"
7613
"repository (a shared repository). Branches can be copied and merged."
7616
#: dummy/help_topics/branches/detail.txt:8
7618
"In addition, one branch may be bound to another one. Binding to another\n"
7619
"branch indicates that commits which happen in this branch must also \n"
7620
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7621
"commits when the two branches are out of date. In order for a commit \n"
7622
"to succeed, it may be necessary to update the current branch using \n"
7626
#: dummy/help_topics/branches/detail.txt:15
7627
#: dummy/help_topics/checkouts/detail.txt:66
7628
#: dummy/help_topics/repositories/detail.txt:36
7629
msgid "Related commands::"
7632
#: dummy/help_topics/branches/detail.txt:17
7634
" init Change a directory into a versioned branch.\n"
7635
" branch Create a new branch that is a copy of an existing branch.\n"
7636
" merge Perform a three-way merge.\n"
7637
" bind Bind a branch to another one.\n"
7639
" init Ein Verzeichnis wird als ein versionierter Zweig festgelegt\n"
7640
" branch Ein neuer Zweig wird durch Kopieren eines bestehenden Zweigs "
7642
" merge Ein Dreiwege-Merge wird durchgeführt\n"
7643
" bind Ein Zweig wird mit einem anderen verbunden\n"
7645
#: dummy/help_topics/branches/summary.txt:1
7646
msgid "Information on what a branch is"
7649
#: dummy/help_topics/bugs/summary.txt:1
7650
msgid "Bug tracker settings"
7651
msgstr "Bug Tracker Einstellungen"
7653
#: dummy/help_topics/checkouts/detail.txt:1
7657
#: dummy/help_topics/checkouts/detail.txt:3
7659
"Checkouts are source trees that are connected to a branch, so that when\n"
7660
"you commit in the source tree, the commit goes into that branch. They\n"
7661
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7662
"Bazaar's decentralized features until you want them. Using checkouts\n"
7663
"with shared repositories is very similar to working with SVN or CVS, but\n"
7664
"doesn't have the same restrictions. And using checkouts still allows\n"
7665
"others working on the project to use whatever workflow they like."
7668
#: dummy/help_topics/checkouts/detail.txt:11
7670
"A checkout is created with the bzr checkout command (see \"help checkout"
7672
"You pass it a reference to another branch, and it will create a local copy\n"
7673
"for you that still contains a reference to the branch you created the\n"
7674
"checkout from (the master branch). Then if you make any commits they will "
7676
"made on the other branch first. This creates an instant mirror of your work, "
7678
"facilitates lockstep development, where each developer is working together,\n"
7679
"continuously integrating the changes of others."
7682
#: dummy/help_topics/checkouts/detail.txt:19
7684
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7685
"you have the full history locally. As you have a first class branch you "
7687
"also commit locally if you want, for instance due to the temporary loss af "
7689
"network connection. Use the --local option to commit to do this. All the "
7691
"commits will then be made on the master branch the next time you do a non-"
7696
#: dummy/help_topics/checkouts/detail.txt:26
7698
"If you are using a checkout from a shared branch you will periodically want "
7700
"pull in all the changes made by others. This is done using the \"update\"\n"
7701
"command. The changes need to be applied before any non-local commit, but\n"
7702
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7703
"command when needed."
7706
#: dummy/help_topics/checkouts/detail.txt:32
7708
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7709
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7710
"SVN checkout in that it is not a first class branch, it mainly consists of "
7712
"working tree. This means that any history operations must query the master\n"
7713
"branch, which could be slow if a network connection is involved. Also, as "
7715
"don't have a local branch, then you cannot commit locally."
7718
#: dummy/help_topics/checkouts/detail.txt:39
7720
"Lightweight checkouts work best when you have fast reliable access to the\n"
7721
"master branch. This means that if the master branch is on the same disk or "
7723
"a lightweight checkout will be faster than a heavyweight one for any "
7725
"that modify the revision history (as only one copy of the branch needs to\n"
7726
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7727
"that uses the history but does not change it, but if the master branch is "
7729
"the same disk then there won't be a noticeable difference."
7732
#: dummy/help_topics/checkouts/detail.txt:47
7734
"Another possible use for a checkout is to use it with a treeless repository\n"
7735
"containing your branches, where you maintain only one working tree by\n"
7736
"switching the master branch that the checkout points to when you want to\n"
7737
"work on a different branch."
7740
#: dummy/help_topics/checkouts/detail.txt:52
7742
"Obviously to commit on a checkout you need to be able to write to the "
7744
"branch. This means that the master branch must be accessible over a "
7746
"protocol , such as sftp://, and that you have write permissions at the "
7748
"end. Checkouts also work on the local file system, so that all that matters "
7753
#: dummy/help_topics/checkouts/detail.txt:58
7755
"You can change the master of a checkout by using the \"switch\" command "
7757
"\"help switch\"). This will change the location that the commits are sent "
7759
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7760
"checkout. If you would like to convert your heavy checkout into a normal\n"
7761
"branch so that every commit is local, you can use the \"unbind\" command. To "
7763
"whether or not a branch is bound or not you can use the \"info\" command. If "
7765
"branch is bound it will tell you the location of the bound branch."
7768
#: dummy/help_topics/checkouts/detail.txt:68
7770
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7772
" update Pull any changes in the master branch in to your checkout\n"
7773
" commit Make a commit that is sent to the master branch. If you have\n"
7774
" a heavy checkout then the --local option will commit to the\n"
7775
" checkout without sending the commit to the master\n"
7776
" switch Change the master branch that the commits in the checkout "
7779
" bind Turn a standalone branch into a heavy checkout so that any\n"
7780
" commits will be sent to the master branch\n"
7781
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7782
" commits are only made locally\n"
7783
" info Displays whether a branch is bound or unbound. If the branch "
7785
" bound, then it will also display the location of the bound "
7789
#: dummy/help_topics/checkouts/summary.txt:1
7790
msgid "Information on what a checkout is"
7793
#: dummy/help_topics/commands/summary.txt:1
7794
msgid "Basic help for all commands"
7797
#: dummy/help_topics/configuration/summary.txt:1
7798
msgid "Details on the configuration settings available"
7801
#: dummy/help_topics/conflict-types/summary.txt:1
7802
msgid "Types of conflicts and what to do about them"
7805
#: dummy/help_topics/content-filters/summary.txt:1
7806
msgid "Conversion of content into/from working trees"
7809
#: dummy/help_topics/criss-cross/detail.txt:1
7811
msgstr "Kreuz und Quer"
7813
#: dummy/help_topics/criss-cross/detail.txt:3
7815
"A criss-cross in the branch history can cause the default merge technique\n"
7816
"to emit more conflicts than would normally be expected."
7819
#: dummy/help_topics/criss-cross/detail.txt:6
7821
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7823
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7824
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7827
#: dummy/help_topics/criss-cross/detail.txt:10
7829
"Criss-crosses occur in a branch's history if two branches merge the same "
7831
"and then merge one another, or if two branches merge one another at the "
7833
"time. They can be avoided by having each branch only merge from or into a\n"
7834
"designated central branch (a \"star topology\")."
7837
#: dummy/help_topics/criss-cross/detail.txt:15
7839
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7841
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7842
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7843
"differences between THIS and OTHER are due to one side adding lines, or\n"
7844
"from another side removing lines."
7847
#: dummy/help_topics/criss-cross/detail.txt:21
7849
"Criss-crosses mean there is no good choice for a base. Selecting the "
7851
"merge points could cause one side's changes to be silently discarded.\n"
7852
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7856
#: dummy/help_topics/criss-cross/detail.txt:26
7858
"The ``weave`` merge type is not affected by this problem because it uses\n"
7859
"line-origin detection instead of a basis revision to determine the cause of\n"
7863
#: dummy/help_topics/criss-cross/summary.txt:1
7864
msgid "Information on criss-cross merging"
7867
#: dummy/help_topics/current-formats/summary.txt:1
7868
msgid "Current storage formats"
7869
msgstr "Aktuelle Speicherformate"
7871
#: dummy/help_topics/debug-flags/summary.txt:1
7872
msgid "Options to show or record debug information"
7875
#: dummy/help_topics/diverged-branches/summary.txt:1
7876
msgid "How to fix diverged branches"
7879
#: dummy/help_topics/env-variables/detail.txt:1
7880
msgid "Environment Variables"
7881
msgstr "Umgebungsvariablen"
7883
#: dummy/help_topics/env-variables/detail.txt:3
7885
"=================== "
7886
"===========================================================\n"
7887
"BZRPATH Path where bzr is to look for shell plugin external\n"
7889
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7890
"EMAIL E-Mail address of the user.\n"
7891
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7892
"EDITOR Editor for editing commit messages.\n"
7893
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7894
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7895
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7896
"BZR_PLUGIN_PATH.\n"
7897
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7898
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7901
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7903
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7906
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7907
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7908
"BZR_COLUMNS Override implicit terminal width.\n"
7909
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7911
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7913
"BZR_PDB Control whether to launch a debugger on error.\n"
7914
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7915
" breakin debugger.\n"
7916
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7918
" of char-based).\n"
7919
"=================== "
7920
"===========================================================\n"
7923
#: dummy/help_topics/env-variables/summary.txt:1
7924
msgid "Environment variable names and values"
7927
#: dummy/help_topics/eol/summary.txt:1
7928
msgid "Information on end-of-line handling"
7931
#: dummy/help_topics/files/detail.txt:1
7935
#: dummy/help_topics/files/detail.txt:3
7937
":On Unix: ~/.bazaar/bazaar.conf\n"
7938
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
7939
"\\bazaar\\\\2.0\\\\bazaar.conf"
7941
":In Unix: ~/.bazaar/bazaar.conf\n"
7942
":In Windows: C:\\\\Dokumente und Einstellungen\\\\Benutzername\\"
7943
"\\Anwendungsdaten\\\\bazaar\\\\2.0\\\\bazaar.conf"
7945
#: dummy/help_topics/files/detail.txt:6
7947
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7948
"used to define general configuration that will be applied everywhere.\n"
7949
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7950
"commonly used options."
7953
#: dummy/help_topics/files/detail.txt:11
7954
msgid "A typical config file might look something like::"
7955
msgstr "Eine typische Konfigurationsdatei könnte so aussehen::"
7957
#: dummy/help_topics/files/detail.txt:13
7960
" email=John Doe <jdoe@isp.com>"
7963
#: dummy/help_topics/files/detail.txt:16
7966
" commit = commit --strict\n"
7967
" log10 = log --short -r -10..-1\n"
7970
#: dummy/help_topics/files/summary.txt:1
7971
msgid "Information on configuration and log files"
7974
#: dummy/help_topics/formats/detail.txt:1
7975
msgid "Storage Formats"
7976
msgstr "Speicherformate"
7978
#: dummy/help_topics/formats/detail.txt:3
7980
"To ensure that older clients do not access data incorrectly,\n"
7981
"Bazaar's policy is to introduce a new storage format whenever\n"
7982
"new features requiring new metadata are added. New storage\n"
7983
"formats may also be introduced to improve performance and\n"
7987
#: dummy/help_topics/formats/detail.txt:9
7989
"The newest format, 2a, is highly recommended. If your\n"
7990
"project is not using 2a, then you should suggest to the\n"
7991
"project owner to upgrade."
7994
#: dummy/help_topics/formats/detail.txt:13
8000
#: dummy/help_topics/formats/detail.txt:16
8002
" Some of the older formats have two variants:\n"
8003
" a plain one and a rich-root one. The latter include an additional\n"
8004
" field about the root of the tree. There is no performance cost\n"
8005
" for using a rich-root format but you cannot easily merge changes\n"
8006
" from a rich-root format into a plain format. As a consequence,\n"
8007
" moving a project to a rich-root format takes some co-ordination\n"
8008
" in that all contributors need to upgrade their repositories\n"
8009
" around the same time. 2a and all future formats will be\n"
8010
" implicitly rich-root."
8013
#: dummy/help_topics/formats/detail.txt:26
8015
"See :doc:`current-formats-help` for the complete list of\n"
8016
"currently supported formats. See :doc:`other-formats-help` for\n"
8017
"descriptions of any available experimental and deprecated formats.\n"
8020
#: dummy/help_topics/formats/summary.txt:1
8021
msgid "Information on choosing a storage format"
8022
msgstr "Informationen zur Auswahl eines Speicherformats"
8024
#: dummy/help_topics/global-options/detail.txt:1
8025
msgid "Global Options"
8026
msgstr "Globale Einstellungen"
8028
#: dummy/help_topics/global-options/detail.txt:3
8030
"These options may be used with any command, and may appear in front of any\n"
8031
"command. (e.g. ``bzr --profile help``)."
8034
#: dummy/help_topics/global-options/detail.txt:6
8036
"--version Print the version number. Must be supplied before the "
8038
"--no-aliases Do not process command aliases when running this command.\n"
8039
"--builtin Use the built-in version of a command, not the plugin "
8041
" This does not suppress other plugin effects.\n"
8042
"--no-plugins Do not process any plugins.\n"
8043
"--no-l10n Do not translate messages.\n"
8044
"--concurrency Number of processes that can be run concurrently (selftest)."
8047
#: dummy/help_topics/global-options/detail.txt:14
8049
"--profile Profile execution using the hotshot profiler.\n"
8050
"--lsprof Profile execution using the lsprof profiler.\n"
8051
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8052
" results to a specified file. If the filename ends with \".txt"
8054
" text format will be used. If the filename either starts "
8056
" \"callgrind.out\" or end with \".callgrind\", the output will "
8058
" formatted for use with KCacheGrind. Otherwise, the output\n"
8059
" will be a pickle.\n"
8060
"--coverage Generate line coverage report in the specified directory."
8063
#: dummy/help_topics/global-options/detail.txt:24
8065
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8067
" the duration of the command. This can be used multiple times "
8069
" several options need to be overridden."
8072
#: dummy/help_topics/global-options/detail.txt:28
8074
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8075
"information on profiling."
8078
#: dummy/help_topics/global-options/detail.txt:31
8080
"A number of debug flags are also available to assist troubleshooting and\n"
8081
"development. See :doc:`debug-flags-help`.\n"
8084
#: dummy/help_topics/global-options/summary.txt:1
8085
msgid "Options that control how Bazaar runs"
8088
#: dummy/help_topics/hidden-commands/summary.txt:1
8089
msgid "All hidden commands"
8090
msgstr "Alle versteckten Befehle"
8092
#: dummy/help_topics/hooks/summary.txt:1
8093
msgid "Points at which custom processing can be added"
8096
#: dummy/help_topics/launchpad/detail.txt:1
8097
msgid "Integration with Launchpad.net"
8098
msgstr "Integration mit Launchpad.net"
8100
#: dummy/help_topics/launchpad/detail.txt:3
8102
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8103
"specification tracking."
8106
#: dummy/help_topics/launchpad/detail.txt:6
8108
"The bzr client (through the plugin called 'launchpad') has special\n"
8109
"features to communicate with Launchpad:"
8112
#: dummy/help_topics/launchpad/detail.txt:9
8114
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8116
" is then used by the 'lp:' transport to download your branches using\n"
8120
#: dummy/help_topics/launchpad/detail.txt:13
8122
" * The 'lp:' transport uses Launchpad as a directory service: for "
8124
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8125
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8126
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8129
#: dummy/help_topics/launchpad/detail.txt:18
8131
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8132
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8134
" will record a revision property that marks that revision as fixing\n"
8135
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8136
" automatically be linked to the bug report."
8139
#: dummy/help_topics/launchpad/detail.txt:24
8141
" * The register-branch command tells Launchpad about the url of a\n"
8142
" public branch. Launchpad will then mirror the branch, display\n"
8143
" its contents and allow it to be attached to bugs and other\n"
8147
#: dummy/help_topics/launchpad/detail.txt:29
8148
msgid "For more information see http://help.launchpad.net/\n"
8149
msgstr "Für weitere Informationen siehe http://help.launchpad.net/\n"
8151
#: dummy/help_topics/launchpad/summary.txt:1
8152
msgid "Using Bazaar with Launchpad.net"
8155
#: dummy/help_topics/location-alias/summary.txt:1
8156
msgid "Aliases for remembered locations"
8159
#: dummy/help_topics/log-formats/summary.txt:1
8160
msgid "Details on the logging formats available"
8163
#: dummy/help_topics/other-formats/summary.txt:1
8164
msgid "Experimental and deprecated storage formats"
8167
#: dummy/help_topics/patterns/summary.txt:1
8168
msgid "Information on the pattern syntax"
8171
#: dummy/help_topics/repositories/detail.txt:1
8172
msgid "Repositories"
8175
#: dummy/help_topics/repositories/detail.txt:3
8177
"Repositories in Bazaar are where committed information is stored. There is\n"
8178
"a repository associated with every branch."
8181
#: dummy/help_topics/repositories/detail.txt:6
8183
"Repositories are a form of database. Bzr will usually maintain this for\n"
8184
"good performance automatically, but in some situations (e.g. when doing\n"
8185
"very many commits in a short time period) you may want to ask bzr to\n"
8186
"optimise the database indices. This can be done by the 'bzr pack' command."
8189
#: dummy/help_topics/repositories/detail.txt:11
8191
"By default just running 'bzr init' will create a repository within the new\n"
8192
"branch but it is possible to create a shared repository which allows "
8194
"branches to share their information in the same location. When a new branch "
8196
"created it will first look to see if there is a containing shared repository "
8201
#: dummy/help_topics/repositories/detail.txt:17
8203
"When two branches of the same project share a repository, there is\n"
8204
"generally a large space saving. For some operations (e.g. branching\n"
8205
"within the repository) this translates in to a large time saving."
8208
#: dummy/help_topics/repositories/detail.txt:21
8210
"To create a shared repository use the init-repository command (or the alias\n"
8211
"init-repo). This command takes the location of the repository to create. "
8213
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8214
"which contains a shared repository. Any new branches that are created in "
8216
"directory will then use it for storage."
8219
#: dummy/help_topics/repositories/detail.txt:27
8221
"It is a good idea to create a repository whenever you might create more\n"
8222
"than one branch of a project. This is true for both working areas where you\n"
8223
"are doing the development, and any server areas that you use for hosting\n"
8224
"projects. In the latter case, it is common to want branches without working\n"
8225
"trees. Since the files in the branch will not be edited directly there is "
8227
"need to use up disk space for a working tree. To create a repository in "
8229
"the branches will not have working trees pass the '--no-trees' option to\n"
8230
"'init-repository'."
8233
#: dummy/help_topics/repositories/detail.txt:38
8235
" init-repository Create a shared repository. Use --no-trees to create "
8237
" in which new branches won't get a working tree.\n"
8240
#: dummy/help_topics/repositories/summary.txt:1
8241
msgid "Basic information on shared repositories."
8244
#: dummy/help_topics/revisionspec/summary.txt:1
8245
msgid "Explain how to use --revision"
8248
#: dummy/help_topics/rules/summary.txt:1
8249
msgid "Information on defining rule-based preferences"
8252
#: dummy/help_topics/standalone-trees/detail.txt:1
8253
msgid "Standalone Trees"
8256
#: dummy/help_topics/standalone-trees/detail.txt:3
8258
"A standalone tree is a working tree with an associated repository. It\n"
8259
"is an independently usable branch, with no dependencies on any other.\n"
8260
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8261
"an existing project under version control."
8264
#: dummy/help_topics/standalone-trees/detail.txt:8
8265
msgid "Related Commands::"
8268
#: dummy/help_topics/standalone-trees/detail.txt:10
8269
msgid " init Make a directory into a versioned branch.\n"
8270
msgstr " init Ein Verzeichnis zu einem versionierten Zweig machen.\n"
8272
#: dummy/help_topics/standalone-trees/summary.txt:1
8273
msgid "Information on what a standalone tree is"
8276
#: dummy/help_topics/standard-options/detail.txt:1
8277
msgid "Standard Options"
8278
msgstr "Standard-Optionen"
8280
#: dummy/help_topics/standard-options/detail.txt:3
8281
msgid "Standard options are legal for all commands."
8284
#: dummy/help_topics/standard-options/detail.txt:5
8286
"--help, -h Show help message.\n"
8287
"--verbose, -v Display more information.\n"
8288
"--quiet, -q Only display errors and warnings."
8291
#: dummy/help_topics/standard-options/detail.txt:9
8292
msgid "Unlike global options, standard options can be used in aliases.\n"
8295
#: dummy/help_topics/standard-options/summary.txt:1
8296
msgid "Options that can be used with any command"
8299
#: dummy/help_topics/status-flags/detail.txt:1
8300
msgid "Status Flags"
8301
msgstr "Status-Flags"
8303
#: dummy/help_topics/status-flags/detail.txt:3
8305
"Status flags are used to summarise changes to the working tree in a concise\n"
8306
"manner. They are in the form::"
8309
#: dummy/help_topics/status-flags/detail.txt:6
8310
msgid " xxx <filename>"
8313
#: dummy/help_topics/status-flags/detail.txt:8
8314
msgid "where the columns' meanings are as follows."
8317
#: dummy/help_topics/status-flags/detail.txt:10
8318
msgid "Column 1 - versioning/renames::"
8321
#: dummy/help_topics/status-flags/detail.txt:12
8323
" + File versioned\n"
8324
" - File unversioned\n"
8327
" X File nonexistent (and unknown to bzr)\n"
8328
" C File has conflicts\n"
8329
" P Entry for a pending merge (not a file)"
8332
#: dummy/help_topics/status-flags/detail.txt:20
8333
msgid "Column 2 - contents::"
8336
#: dummy/help_topics/status-flags/detail.txt:22
8340
" K File kind changed\n"
8344
#: dummy/help_topics/status-flags/detail.txt:27
8345
msgid "Column 3 - execute::"
8348
#: dummy/help_topics/status-flags/detail.txt:29
8349
msgid " * The execute bit was changed\n"
8352
#: dummy/help_topics/status-flags/summary.txt:1
8353
msgid "Help on status flags"
8356
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8357
msgid "Branches Out of Sync"
8360
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8362
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8363
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8364
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8365
"have the same last revision as the new reference branch for the lightweight\n"
8366
"checkout, data could be lost, so Bazaar refuses."
8369
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8370
msgid "How you deal with this depends on *why* the branches are out of sync."
8373
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8375
"If you have a checkout and have done local commits, you can get back in "
8377
"by running \"bzr update\" (and possibly \"bzr commit\")."
8380
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8382
"If you have a branch and the remote branch is out-of-date, you can push\n"
8383
"the local changes using \"bzr push\". If the local branch is out of date, "
8385
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8387
"and then push your changes. If you decide that some of the changes aren't\n"
8388
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8391
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8392
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8395
#: dummy/help_topics/topics/summary.txt:1
8397
msgstr "Themen-Liste"
8399
#: dummy/help_topics/url-special-chars/summary.txt:1
8400
msgid "Special character handling in URLs"
8403
#: dummy/help_topics/urlspec/summary.txt:1
8404
msgid "Supported transport protocols"
8405
msgstr "Unterstützte Transportprotokolle"
8407
#: dummy/help_topics/working-trees/detail.txt:1
8408
msgid "Working Trees"
8411
#: dummy/help_topics/working-trees/detail.txt:3
8413
"A working tree is the contents of a branch placed on disk so that you can\n"
8414
"see the files and edit them. The working tree is where you make changes to "
8416
"branch, and when you commit the current state of the working tree is the\n"
8417
"snapshot that is recorded in the commit."
8420
#: dummy/help_topics/working-trees/detail.txt:8
8422
"When you push a branch to a remote system, a working tree will not be\n"
8423
"created. If one is already present the files will not be updated. The\n"
8424
"branch information will be updated and the working tree will be marked\n"
8425
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8426
"may be uncommitted changes or the update may cause content conflicts that "
8428
"difficult to deal with remotely."
8431
#: dummy/help_topics/working-trees/detail.txt:15
8433
"If you have a branch with no working tree you can use the 'checkout' "
8435
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8437
"create the working tree. If the branch is updated remotely, you can update "
8439
"working tree by running 'bzr update' in that directory."
8442
#: dummy/help_topics/working-trees/detail.txt:20
8444
"If you have a branch with a working tree that you do not want the 'remove-"
8446
"command will remove the tree if it is safe. This can be done to avoid the\n"
8447
"warning about the remote working tree not being updated when pushing to the\n"
8448
"branch. It can also be useful when working with a '--no-trees' repository\n"
8449
"(see 'bzr help repositories')."
8452
#: dummy/help_topics/working-trees/detail.txt:26
8454
"If you want to have a working tree on a remote machine that you push to you\n"
8455
"can either run 'bzr update' in the remote branch after each push, or use "
8457
"other method to update the tree during the push. There is an 'rspush' "
8459
"that will update the working tree using rsync as well as doing a push. "
8461
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8466
#: dummy/help_topics/working-trees/detail.txt:33
8467
msgid "Useful commands::"
8468
msgstr "Nützliche Befehle::"
8470
#: dummy/help_topics/working-trees/detail.txt:35
8472
" checkout Create a working tree when a branch does not have one.\n"
8473
" remove-tree Removes the working tree from a branch when it is safe to do "
8475
" update When a working tree is out of sync with its associated "
8477
" this will update the tree to match the branch.\n"
8480
#: dummy/help_topics/working-trees/summary.txt:1
8481
msgid "Information on working trees"
8484
#: en/help_topics/authentication.txt:1
8486
"Authentication Settings\n"
8487
"======================="
8490
#: en/help_topics/authentication.txt:4
8497
#: en/help_topics/authentication.txt:8
8499
"Many different authentication policies can be described in the\n"
8500
"``authentication.conf`` file but a particular user should need only a few\n"
8501
"definitions to cover his needs without having to specify a user and a "
8503
"for every branch he uses."
8506
#: en/help_topics/authentication.txt:13
8508
"The definitions found in this file are used to find the credentials to use "
8510
"a given url. The same credentials can generally be used for as many branches "
8512
"possible by grouping their declaration around the remote servers that need\n"
8513
"them. It's even possible to declare credentials that will be used by "
8518
#: en/help_topics/authentication.txt:19
8520
"The intent is to make this file as small as possible to minimize maintenance."
8523
#: en/help_topics/authentication.txt:21
8525
"Once the relevant credentials are declared in this file you may use branch "
8527
"without embedding passwords (security hazard) or even users (enabling "
8529
"of your urls with others)."
8532
#: en/help_topics/authentication.txt:25
8533
msgid "Instead of using::"
8536
#: en/help_topics/authentication.txt:27
8537
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8538
msgstr " bzr branch ftp://joe:secret@host.com/pfad/zu/meiner/branch"
8540
#: en/help_topics/authentication.txt:29
8541
msgid "you simply use::"
8544
#: en/help_topics/authentication.txt:31
8545
msgid " bzr branch ftp://host.com/path/to/my/branch"
8546
msgstr " bzr branch ftp://host.com/pfad/zu/meiner/branch"
8548
#: en/help_topics/authentication.txt:33
8549
msgid "provided you have created the following ``authentication.conf`` file::"
8552
#: en/help_topics/authentication.txt:35
8558
" password=secret\n"
8565
" password=secret\n"
8568
#: en/help_topics/authentication.txt:42
8570
"Authentication definitions\n"
8571
"--------------------------"
8574
#: en/help_topics/authentication.txt:45
8576
"There are two kinds of authentication used by the various schemes supported "
8581
#: en/help_topics/authentication.txt:48
8582
msgid "1. user and password"
8583
msgstr "1. Benutzername und Passwort"
8585
#: en/help_topics/authentication.txt:50
8587
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8588
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8589
"ssh agents are a better, more secure solution. So we have chosen to not "
8591
"our own less secure method."
8594
#: en/help_topics/authentication.txt:55
8595
msgid "2. user, realm and password"
8598
#: en/help_topics/authentication.txt:57
8600
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8601
"against a host. But, by using ``.htaccess`` files, for example, it is "
8603
"to define several (``user, realm, password``) for a given ``host``. So what "
8605
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8607
"not taken into account in the definitions, but will displayed if bzr "
8609
"you for a password."
8612
#: en/help_topics/authentication.txt:64
8614
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8615
"specifying the appropriate port."
8618
#: en/help_topics/authentication.txt:67
8620
"To take all schemes into account, the password will be deduced from a set "
8622
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8627
#: en/help_topics/authentication.txt:71
8629
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8631
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8633
" should be used instead since this is the real scheme regarding\n"
8637
#: en/help_topics/authentication.txt:76
8638
msgid " * ``host``: can be empty (to act as a default for any host),"
8641
#: en/help_topics/authentication.txt:78
8643
" * ``port`` can be empty (useful when an host provides several servers for "
8645
" same scheme), only numerical values are allowed, this should be used "
8647
" when the server uses a port different than the scheme standard port,"
8650
#: en/help_topics/authentication.txt:82
8651
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8654
#: en/help_topics/authentication.txt:84
8656
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8657
" ``getpass.get_user()``),"
8660
#: en/help_topics/authentication.txt:87
8662
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8666
#: en/help_topics/authentication.txt:90
8668
"Multiple definitions can be provided and, for a given URL, bzr will select "
8670
"(``user`` [, ``password``]) based on the following rules :"
8673
#: en/help_topics/authentication.txt:93
8674
msgid " 1. the first match wins,"
8677
#: en/help_topics/authentication.txt:95
8678
msgid " 2. empty fields match everything,"
8681
#: en/help_topics/authentication.txt:97
8683
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8686
#: en/help_topics/authentication.txt:99
8688
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8689
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
8691
" will not match ``bzr.sf.net``)."
8694
#: en/help_topics/authentication.txt:103
8696
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8699
#: en/help_topics/authentication.txt:105
8701
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8703
" empty paths will match any provided path)."
8706
#: en/help_topics/authentication.txt:110
8714
#: en/help_topics/authentication.txt:113
8716
"The general rules for :doc:`configuration files <configuration-help>`\n"
8717
"apply except for the variable policies."
8720
#: en/help_topics/authentication.txt:116
8721
msgid "Each section describes an authentication definition."
8724
#: en/help_topics/authentication.txt:118
8726
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8728
"and should appear as the *last* section."
8731
#: en/help_topics/authentication.txt:121
8732
msgid "Each section should define:"
8735
#: en/help_topics/authentication.txt:123
8736
msgid "* ``user``: the login to be used,"
8739
#: en/help_topics/authentication.txt:125
8740
msgid "Each section could define:"
8743
#: en/help_topics/authentication.txt:127
8744
msgid "* ``host``: the remote server,"
8747
#: en/help_topics/authentication.txt:129
8748
msgid "* ``port``: the port the server is listening,"
8749
msgstr "* ``port``: der Port auf dem der Server horcht,"
8751
#: en/help_topics/authentication.txt:131
8752
msgid "* ``path``: the branch location,"
8755
#: en/help_topics/authentication.txt:133
8756
msgid "* ``password``: the password."
8757
msgstr "* ``password``: das Passwort."
8759
#: en/help_topics/authentication.txt:135
8769
#: en/help_topics/authentication.txt:139
8772
"Personal projects hosted outside\n"
8773
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8776
#: en/help_topics/authentication.txt:143
8778
"All connections are done with the same ``user`` (the remote one for which "
8780
"default bzr one is not appropriate) and the password is always prompted "
8785
#: en/help_topics/authentication.txt:147
8787
" # Pet projects on hobby.net\n"
8789
" host=r.hobby.net\n"
8791
" password=obvious1234\n"
8798
" password=1essobV10us\n"
8801
" # Our local user is barbaz, on all remote sites we're known as "
8806
#: en/help_topics/authentication.txt:164
8809
"Source hosting provider\n"
8810
"~~~~~~~~~~~~~~~~~~~~~~~"
8813
#: en/help_topics/authentication.txt:168
8814
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8817
#: en/help_topics/authentication.txt:170
8819
" [shpnet domain]\n"
8820
" # we use sftp, but ssh is the scheme used for authentication\n"
8822
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8825
" # bzr don't support supplying a password for sftp,\n"
8826
" # consider using an ssh agent if you don't want to supply\n"
8827
" # a password interactively. (pageant, ssh-agent, etc)"
8830
#: en/help_topics/authentication.txt:180
8832
"HTTPS, SFTP servers and their proxy\n"
8833
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8836
#: en/help_topics/authentication.txt:183
8838
"At company.com, the server hosting release and integration branches is "
8840
"proxy, and the two branches use different authentication policies::"
8843
#: en/help_topics/authentication.txt:186
8845
" [reference code]\n"
8847
" host=dev.company.com\n"
8853
#: en/help_topics/authentication.txt:193
8855
" # development branches on dev server\n"
8857
" scheme=ssh # bzr+ssh and sftp are available here\n"
8858
" host=dev.company.com\n"
8859
" path=/dev/integration\n"
8865
" host=proxy.company.com\n"
8867
" user=proxyuser1\n"
8868
" password=proxypass1"
8871
#: en/help_topics/authentication.txt:208
8874
"Planned enhancements\n"
8875
"--------------------"
8878
#: en/help_topics/authentication.txt:212
8880
"The following are not yet implemented but planned as parts of a work in\n"
8884
#: en/help_topics/authentication.txt:215
8885
msgid "* add a ``password_encoding`` field allowing:"
8888
#: en/help_topics/authentication.txt:217
8890
" - storing the passwords in various obfuscating encodings (base64 for one),"
8893
#: en/help_topics/authentication.txt:219
8894
msgid " - delegate password storage to plugins (.netrc for example)."
8897
#: en/help_topics/authentication.txt:221
8899
"* update the credentials when the user is prompted for user or password,"
8902
#: en/help_topics/authentication.txt:223
8903
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8906
#: en/help_topics/authentication.txt:225
8908
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8910
"ignored in the actual implementation.\n"
8913
#: en/help_topics/bugs.txt:1
8914
msgid "Bug Tracker Settings"
8915
msgstr "Bug Tracker Einstellungen"
8917
#: en/help_topics/bugs.txt:3
8919
"When making a commit, metadata about bugs fixed by that change can be\n"
8920
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8921
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8922
"(The only ``status`` value currently supported is ``fixed.``)"
8925
#: en/help_topics/bugs.txt:8
8927
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8929
"rather than a full URL. This looks like::"
8932
#: en/help_topics/bugs.txt:11
8933
msgid " bzr commit --fixes <tracker>:<id>"
8934
msgstr " bzr commit --fixes <tracker>:<id>"
8936
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8940
#: en/help_topics/bugs.txt:15
8941
msgid " bzr commit --fixes <id>"
8944
#: en/help_topics/bugs.txt:17
8946
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8948
"identifier for that bug within the bugtracker, usually the bug number.\n"
8949
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8950
"or global configuration is used."
8953
#: en/help_topics/bugs.txt:22
8955
"Bazaar knows about a few bug trackers that have many users. If\n"
8956
"you use one of these bug trackers then there is no setup required to\n"
8957
"use this feature, you just need to know the tracker identifier to use.\n"
8958
"These are the bugtrackers that are built in:"
8961
#: en/help_topics/bugs.txt:27
8963
" ============================ ============ ============\n"
8964
" URL Abbreviation Example\n"
8965
" ============================ ============ ============\n"
8966
" https://bugs.launchpad.net/ lp lp:12345\n"
8967
" http://bugs.debian.org/ deb deb:12345\n"
8968
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8969
" ============================ ============ ============"
8972
#: en/help_topics/bugs.txt:35
8974
"For the bug trackers not listed above configuration is required.\n"
8975
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8976
"is built in, along with a template mechanism for other bugtrackers with\n"
8977
"simple URL schemes. If your bug tracker can't be described by one\n"
8978
"of the schemes described below then you can write a plugin to support\n"
8982
#: en/help_topics/bugs.txt:42
8984
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8985
"variable which contains the base URL of the bug tracker. These options\n"
8986
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8987
"configuration section in ``locations.conf``. You can set up these values\n"
8988
"for each of the projects you work on."
8991
#: en/help_topics/bugs.txt:48
8993
"Note: As you provide a short name for each tracker, you can specify one or\n"
8994
"more bugs in one or more trackers at commit time if you wish."
8997
#: en/help_topics/bugs.txt:51
9005
#: en/help_topics/bugs.txt:54
9006
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9009
#: en/help_topics/bugs.txt:56
9011
"bugzilla_<tracker>_url\n"
9012
"----------------------"
9014
"bugzilla_<tracker>_url\n"
9015
"----------------------"
9017
#: en/help_topics/bugs.txt:59
9019
"If present, the location of the Bugzilla bug tracker referred to by\n"
9020
"<tracker>. This option can then be used together with ``bzr commit\n"
9021
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9025
#: en/help_topics/bugs.txt:64
9026
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9027
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9029
#: en/help_topics/bugs.txt:66
9031
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9035
#: en/help_topics/bugs.txt:69
9037
"trac_<tracker>_url\n"
9038
"------------------"
9040
"trac_<tracker>_url\n"
9041
"------------------"
9043
#: en/help_topics/bugs.txt:72
9045
"If present, the location of the Trac instance referred to by\n"
9046
"<tracker>. This option can then be used together with ``bzr commit\n"
9047
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9051
#: en/help_topics/bugs.txt:77
9052
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9053
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9055
#: en/help_topics/bugs.txt:79
9057
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9062
#: en/help_topics/bugs.txt:82
9064
"bugtracker_<tracker>_url\n"
9065
"------------------------"
9067
"bugtracker_<tracker>_url\n"
9068
"------------------------"
9070
#: en/help_topics/bugs.txt:85
9072
"If present, the location of a generic bug tracker instance referred to by\n"
9073
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9074
"which will be replaced by a specific bug ID. This option can then be used\n"
9075
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9076
"fixed by that commit. For example::"
9079
#: en/help_topics/bugs.txt:91
9080
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9083
#: en/help_topics/bugs.txt:93
9085
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9086
"Roundup bug tracker as fixed, or::"
9089
#: en/help_topics/bugs.txt:96
9091
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9094
#: en/help_topics/bugs.txt:98
9096
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9097
"RT bug tracker as fixed, or::"
9100
#: en/help_topics/bugs.txt:101
9101
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9102
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9104
#: en/help_topics/bugs.txt:103
9106
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9108
"in Hudson's JIRA bug tracker as fixed.\n"
9111
#: en/help_topics/commands.txt:1
9113
"add Add specified files or directories.\n"
9114
"alias Set/unset and display aliases.\n"
9115
"annotate Show the origin of each line in a file.\n"
9116
"bash-completion Generate a shell function for bash command line "
9118
" [bash_completion]\n"
9119
"bind Convert the current branch into a checkout of the "
9122
"branch Create a new branch that is a copy of an existing branch.\n"
9123
"branches List the branches available at the current location.\n"
9124
"break-lock Break a dead lock.\n"
9125
"cat Write the contents of a file as of a given revision to\n"
9126
" standard output.\n"
9127
"check Validate working tree structure, branch consistency and\n"
9128
" repository history.\n"
9129
"checkout Create a new checkout of an existing branch.\n"
9130
"clean-tree Remove unwanted files from working tree.\n"
9131
"commit Commit changes into a new revision.\n"
9132
"config Display, set or remove a configuration option.\n"
9133
"conflicts List files with conflicts.\n"
9134
"deleted List files deleted in the working tree.\n"
9135
"diff Show differences in the working tree, between revisions "
9138
"dpush Push into a different VCS without any custom bzr "
9140
"export Export current or past revision to a destination directory "
9143
"help Show help on a command or other topic.\n"
9144
"ignore Ignore specified files or patterns.\n"
9145
"ignored List ignored files and the patterns that matched them.\n"
9146
"info Show information about a working tree, branch or "
9148
"init Make a directory into a versioned branch.\n"
9149
"init-repository Create a shared repository for branches to share storage\n"
9151
"join Combine a tree into its containing tree.\n"
9152
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9153
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9154
"launchpad-open Open a Launchpad branch page in your web browser. "
9156
"log Show historical log for a branch or subset of a branch.\n"
9157
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9158
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9159
"ls List files in a tree.\n"
9160
"merge Perform a three-way merge.\n"
9161
"missing Show unmerged/unpulled revisions between two branches.\n"
9162
"mkdir Create a new versioned directory.\n"
9163
"mv Move or rename a file.\n"
9164
"nick Print or set the branch nickname.\n"
9165
"pack Compress the data within a repository.\n"
9166
"plugins List the installed plugins.\n"
9167
"pull Turn this branch into a mirror of another branch.\n"
9168
"push Update a mirror of this branch.\n"
9169
"reconcile Reconcile bzr metadata in a branch.\n"
9170
"reconfigure Reconfigure the type of a bzr directory.\n"
9171
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9172
"remerge Redo a merge.\n"
9173
"remove Remove files or directories.\n"
9174
"remove-branch Remove a branch.\n"
9175
"remove-tree Remove the working tree from a given branch/checkout.\n"
9176
"renames Show list of renamed files.\n"
9177
"resolve Mark a conflict as resolved.\n"
9178
"revert Revert files to a previous revision.\n"
9179
"revno Show current revision number.\n"
9180
"root Show the tree root directory.\n"
9181
"send Mail or create a merge-directive for submitting changes.\n"
9182
"serve Run the bzr server.\n"
9183
"shelve Temporarily set aside some changes from the current tree.\n"
9184
"sign-my-commits Sign all commits by a given committer.\n"
9185
"split Split a subdirectory of a tree into a separate tree.\n"
9186
"status Display status summary.\n"
9187
"switch Set the branch of a checkout and update.\n"
9188
"tag Create, remove or modify a tag naming a revision.\n"
9190
"testament Show testament (signing-form) of a revision.\n"
9191
"unbind Convert the current checkout into a regular branch.\n"
9192
"uncommit Remove the last committed revision.\n"
9193
"unshelve Restore shelved changes.\n"
9194
"update Update a working tree to a new revision.\n"
9195
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9197
"verify-signatures Verify all commit signatures.\n"
9198
"version Show version of bzr.\n"
9199
"version-info Show version information about this tree.\n"
9200
"view Manage filtered views.\n"
9201
"whoami Show or set bzr user id.\n"
9204
#: en/help_topics/configuration.txt:1
9206
"Configuration Settings\n"
9207
"======================="
9210
#: en/help_topics/configuration.txt:4
9212
"Environment settings\n"
9213
"---------------------"
9216
#: en/help_topics/configuration.txt:7
9218
"While most configuration is handled by configuration files, some options\n"
9219
"which may be semi-permanent can also be controlled through the environment."
9222
#: en/help_topics/configuration.txt:10
9230
#: en/help_topics/configuration.txt:13
9231
msgid "Override the email id used by Bazaar. Typical format::"
9234
#: en/help_topics/configuration.txt:15
9235
msgid " \"John Doe <jdoe@example.com>\""
9236
msgstr " \"John Doe <jdoe@beispiel.de>\""
9238
#: en/help_topics/configuration.txt:17
9239
msgid "See also the ``email`` configuration option."
9242
#: en/help_topics/configuration.txt:19
9244
"BZR_PROGRESS_BAR\n"
9247
"BZR_PROGRESS_BAR\n"
9250
#: en/help_topics/configuration.txt:22
9252
"Override the progress display. Possible values are \"none\" or \"text\". "
9254
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9256
"the ordinary command line progress bar."
9259
#: en/help_topics/configuration.txt:26
9267
#: en/help_topics/configuration.txt:29
9268
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9271
#: en/help_topics/configuration.txt:31
9273
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9274
"* 1 = Invoke breakin debugger (default)"
9277
#: en/help_topics/configuration.txt:34
9285
#: en/help_topics/configuration.txt:37
9286
msgid "Override the home directory used by Bazaar."
9289
#: en/help_topics/configuration.txt:39
9297
#: en/help_topics/configuration.txt:42
9298
msgid "Select a different SSH implementation."
9299
msgstr "Wählen Sie eine andere SSH-Implementierung."
9301
#: en/help_topics/configuration.txt:44
9309
#: en/help_topics/configuration.txt:47
9310
msgid "Control whether to launch a debugger on error."
9313
#: en/help_topics/configuration.txt:49
9315
"* 0 = Standard behavior\n"
9316
"* 1 = Launch debugger"
9318
"* 0 = Standard Verhalten\n"
9319
"* 1 = Debugger starten"
9321
#: en/help_topics/configuration.txt:52
9329
#: en/help_topics/configuration.txt:55
9330
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9333
#: en/help_topics/configuration.txt:57
9334
msgid "See also the ``bzr_remote_path`` configuration option."
9337
#: en/help_topics/configuration.txt:59
9345
#: en/help_topics/configuration.txt:62
9346
msgid "Path to the editor Bazaar should use for commit messages, etc."
9349
#: en/help_topics/configuration.txt:64
9357
#: en/help_topics/configuration.txt:67
9359
"Location of the Bazaar log file. You can check the current location by\n"
9360
"running ``bzr version``."
9363
#: en/help_topics/configuration.txt:70
9365
"The log file contains debug information that is useful for diagnosing or\n"
9366
"reporting problems with Bazaar."
9369
#: en/help_topics/configuration.txt:73
9371
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9372
"will disable logging."
9375
#: en/help_topics/configuration.txt:76
9385
#: en/help_topics/configuration.txt:80
9387
"The path to the plugins directory that Bazaar should use.\n"
9388
"If not set, Bazaar will search for plugins in:"
9391
#: en/help_topics/configuration.txt:83
9392
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9395
#: en/help_topics/configuration.txt:85
9396
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9399
#: en/help_topics/configuration.txt:87
9401
"* the site specific plugin directory if applicable (containing\n"
9402
" the ``site`` plugins)."
9405
#: en/help_topics/configuration.txt:90
9407
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9408
"the way the plugin are searched. "
9411
#: en/help_topics/configuration.txt:93
9413
"As for the ``PATH`` variables, if multiple directories are\n"
9414
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9415
"platform specific appropriate character (':' on Unix,\n"
9419
#: en/help_topics/configuration.txt:98
9421
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9422
"in ``user``. However it will continue to search in ``core`` and\n"
9423
"``site`` unless they are explicitly removed."
9426
#: en/help_topics/configuration.txt:102
9428
"If you need to change the order or remove one of these\n"
9429
"directories, you should use special values:"
9432
#: en/help_topics/configuration.txt:105
9434
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9435
" path from the default values,"
9438
#: en/help_topics/configuration.txt:108
9440
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9441
" before the remaining default values (and also remove it from\n"
9442
" the default values)."
9445
#: en/help_topics/configuration.txt:112
9447
"Note that the special values 'user', 'core' and 'site' should be\n"
9448
"used literally, they will be substituted by the corresponding,\n"
9449
"platform specific, values."
9452
#: en/help_topics/configuration.txt:116
9454
"The examples below use ':' as the separator, windows users\n"
9458
#: en/help_topics/configuration.txt:119
9459
msgid "Overriding the default user plugin directory::"
9462
#: en/help_topics/configuration.txt:121
9463
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9466
#: en/help_topics/configuration.txt:123
9467
msgid "Disabling the site directory while retaining the user directory::"
9470
#: en/help_topics/configuration.txt:125
9471
msgid " BZR_PLUGIN_PATH='-site:+user'"
9474
#: en/help_topics/configuration.txt:127
9475
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9478
#: en/help_topics/configuration.txt:129
9479
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9482
#: en/help_topics/configuration.txt:131
9483
msgid "Overriding the default site plugin directory::"
9486
#: en/help_topics/configuration.txt:133
9487
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9489
" BZR_PLUGIN_PATH='/Pfad/zu/meiner/Seite/Erweiterungen:-Seite':+Benutzer"
9491
#: en/help_topics/configuration.txt:135
9493
"BZR_DISABLE_PLUGINS\n"
9494
"~~~~~~~~~~~~~~~~~~~"
9496
"BZR_DISABLE_PLUGINS\n"
9497
"~~~~~~~~~~~~~~~~~~~"
9499
#: en/help_topics/configuration.txt:138
9501
"Under special circumstances (mostly when trying to diagnose a\n"
9502
"bug), it's better to disable a plugin (or several) rather than\n"
9503
"uninstalling them completely. Such plugins can be specified in\n"
9504
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9507
#: en/help_topics/configuration.txt:143
9509
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9510
"will raise an import error if they are explicitly imported (by\n"
9511
"another plugin that depends on them for example)."
9514
#: en/help_topics/configuration.txt:147
9515
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9518
#: en/help_topics/configuration.txt:149
9519
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9520
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9522
#: en/help_topics/configuration.txt:151
9530
#: en/help_topics/configuration.txt:154
9532
"When adding a new feature or working on a bug in a plugin,\n"
9533
"developers often need to use a specific version of a given\n"
9534
"plugin. Since python requires that the directory containing the\n"
9535
"code is named like the plugin itself this make it impossible to\n"
9536
"use arbitrary directory names (using a two-level directory scheme\n"
9537
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9538
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9541
#: en/help_topics/configuration.txt:162
9543
"Plugins specified in this environment variable takes precedence\n"
9544
"over the ones in ``BZR_PLUGIN_PATH``."
9547
#: en/help_topics/configuration.txt:165
9549
"The variable specified a list of ``plugin_name@plugin path``,\n"
9550
"``plugin_name`` being the name of the plugin as it appears in\n"
9551
"python module paths, ``plugin_path`` being the path to the\n"
9552
"directory containing the plugin code itself\n"
9553
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9554
"separator, use ';' on windows."
9557
#: en/help_topics/configuration.txt:172
9565
#: en/help_topics/configuration.txt:175
9567
"Using a specific version of ``myplugin``:\n"
9568
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9571
#: en/help_topics/configuration.txt:178
9579
#: en/help_topics/configuration.txt:181
9580
msgid "The path where Bazaar should look for shell plugin external commands."
9583
#: en/help_topics/configuration.txt:183
9586
"http_proxy, https_proxy\n"
9587
"~~~~~~~~~~~~~~~~~~~~~~~"
9590
"http_proxy, https_proxy\n"
9591
"~~~~~~~~~~~~~~~~~~~~~~~"
9593
#: en/help_topics/configuration.txt:187
9594
msgid "Specifies the network proxy for outgoing connections, for example::"
9597
#: en/help_topics/configuration.txt:189
9599
" http_proxy=http://proxy.example.com:3128/ \n"
9600
" https_proxy=http://proxy.example.com:3128/"
9602
" http_proxy=http://proxy.beispiel.de:3128/ \n"
9603
" https_proxy=http://proxy.beispiel.de:3128/"
9605
#: en/help_topics/configuration.txt:192
9608
"Configuration files\n"
9609
"-------------------"
9612
"Konfigurationsdateien\n"
9613
"-------------------"
9615
#: en/help_topics/configuration.txt:196
9623
#: en/help_topics/configuration.txt:199
9625
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9626
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9628
"Windows. (You can check the location for your system by using\n"
9632
#: en/help_topics/configuration.txt:204
9633
msgid "There are three primary configuration files in this location:"
9636
#: en/help_topics/configuration.txt:206
9637
msgid "* ``bazaar.conf`` describes default configuration options,"
9640
#: en/help_topics/configuration.txt:208
9642
"* ``locations.conf`` describes configuration information for\n"
9643
" specific branch locations,"
9646
#: en/help_topics/configuration.txt:211
9648
"* ``authentication.conf`` describes credential information for\n"
9652
#: en/help_topics/configuration.txt:214
9654
"Each branch can also contain a configuration file that sets values specific\n"
9655
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9657
"branch. This file is visible to all users of a branch, if you wish to "
9659
"one of the values for a branch with a setting that is specific to you then "
9661
"can do so in ``locations.conf``."
9664
#: en/help_topics/configuration.txt:220
9670
#: en/help_topics/configuration.txt:223
9672
"An ini file has three types of contructs: section headers, section\n"
9673
"options and comments."
9676
#: en/help_topics/configuration.txt:226
9682
#: en/help_topics/configuration.txt:229
9684
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9685
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9686
"Bazaar when parsing ini files."
9689
#: en/help_topics/configuration.txt:233
9695
#: en/help_topics/configuration.txt:236
9697
"A section header is a word enclosed in brackets that starts at the begining\n"
9698
"of a line. A typical section header looks like this::"
9701
#: en/help_topics/configuration.txt:239
9705
#: en/help_topics/configuration.txt:241
9707
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9708
"[ALIASES]. Section headers are case sensitive. The default section provides "
9710
"setting options which can be overridden with the branch config file."
9713
#: en/help_topics/configuration.txt:245
9715
"For ``locations.conf``, the options from the section with the\n"
9716
"longest matching section header are used to the exclusion of other\n"
9717
"potentially valid section headers. A section header uses the path for\n"
9718
"the branch as the section header. Some examples include::"
9721
#: en/help_topics/configuration.txt:250
9723
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9724
" [/home/jdoe/branches/]"
9726
" [http://meinebranchen.isp.com/~jdoe/branchdir]\n"
9727
" [/home/jdoe/branches/]"
9729
#: en/help_topics/configuration.txt:253
9736
#: en/help_topics/configuration.txt:257
9738
"A section option resides within a section. A section option contains an\n"
9739
"option name, an equals sign and a value. For example::"
9742
#: en/help_topics/configuration.txt:260
9744
" email = John Doe <jdoe@isp.com>\n"
9745
" gpg_signing_key = Amy Pond <amy@example.com>"
9747
" email = John Doe <jdoe@isp.com>\n"
9748
" gpg_signing_key = Amy Pond <amy@beispiel.de>"
9750
#: en/help_topics/configuration.txt:263
9752
"A option can reference other options by enclosing them in curly brackets::"
9755
#: en/help_topics/configuration.txt:265
9757
" my_branch_name = feature_x\n"
9758
" my_server = bzr+ssh://example.com\n"
9759
" push_location = {my_server}/project/{my_branch_name}"
9762
#: en/help_topics/configuration.txt:269
9768
#: en/help_topics/configuration.txt:272
9770
"Options defined in a section affect the named directory or URL plus\n"
9771
"any locations they contain. Policies can be used to change how an\n"
9772
"option value is interpreted for contained locations. Currently\n"
9773
"there are three policies available:"
9776
#: en/help_topics/configuration.txt:277
9779
" the value is interpreted the same for contained locations. This is\n"
9780
" the default behaviour.\n"
9782
" the value is only used for the exact location specified by the\n"
9785
" for contained locations, any additional path components are\n"
9786
" appended to the value."
9789
#: en/help_topics/configuration.txt:287
9791
"Policies are specified by keys with names of the form \"<option_name>:policy"
9793
"For example, to define the push location for a tree of branches, the\n"
9794
"following could be used::"
9797
#: en/help_topics/configuration.txt:291
9799
" [/top/location]\n"
9800
" push_location = sftp://example.com/location\n"
9801
" push_location:policy = appendpath"
9804
#: en/help_topics/configuration.txt:295
9806
"With this configuration, the push location for ``/top/location/branch1``\n"
9807
"would be ``sftp://example.com/location/branch1``."
9810
#: en/help_topics/configuration.txt:298
9812
"Section local options\n"
9813
"^^^^^^^^^^^^^^^^^^^^^"
9816
#: en/help_topics/configuration.txt:301
9818
"Some options are defined automatically inside a given section and can be\n"
9819
"refered to in this section only. "
9822
#: en/help_topics/configuration.txt:304
9823
msgid "For example, the ``appendpath`` policy can be used like this::"
9826
#: en/help_topics/configuration.txt:306
9828
" [/home/vila/src/bzr/bugs]\n"
9829
" mypush = lp:~vila/bzr\n"
9830
" mypush:policy=appendpath"
9833
#: en/help_topics/configuration.txt:310
9834
msgid "Using ``relpath`` to achieve the same result is done like this::"
9837
#: en/help_topics/configuration.txt:312
9839
" [/home/vila/src/bzr/bugs]\n"
9840
" mypush = lp:~vila/bzr/{relpath}"
9843
#: en/help_topics/configuration.txt:315
9845
"In both cases, when used in a directory like\n"
9846
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9849
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9851
" $ bzr config mypush\n"
9852
" lp:~vila/bzr/832013-expand-in-stack"
9855
#: en/help_topics/configuration.txt:321
9856
msgid "Another such option is ``basename`` which can be used like this::"
9859
#: en/help_topics/configuration.txt:323
9861
" [/home/vila/src/bzr]\n"
9862
" mypush = lp:~vila/bzr/{basename}"
9865
#: en/help_topics/configuration.txt:326
9867
"When used in a directory like\n"
9868
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9871
#: en/help_topics/configuration.txt:332
9873
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9874
"itself is defined as the relative path between the section name and the\n"
9875
"location it matches."
9878
#: en/help_topics/configuration.txt:336
9880
"When an option is local to a Section, it cannot be referred to from option\n"
9881
"values in any other section from the same ``Store`` nor from any other\n"
9885
#: en/help_topics/configuration.txt:340
9888
"The main configuration file, bazaar.conf\n"
9889
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9892
#: en/help_topics/configuration.txt:344
9894
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9895
"The default section contains the default\n"
9896
"configuration options for all branches. The default section can be\n"
9897
"overriden by providing a branch-specific section in ``locations.conf``."
9900
#: en/help_topics/configuration.txt:349
9901
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9904
#: en/help_topics/configuration.txt:351
9907
" email = John Doe <jdoe@isp.com>\n"
9908
" editor = /usr/bin/vim\n"
9909
" create_signatures = when-required"
9912
#: en/help_topics/configuration.txt:356
9915
"The branch location configuration file, locations.conf\n"
9916
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9919
#: en/help_topics/configuration.txt:360
9921
"``locations.conf`` allows one to specify overriding settings for\n"
9922
"a specific branch. The format is almost identical to the default section in\n"
9923
"bazaar.conf with one significant change: The section header, instead of "
9925
"default, will be the path to a branch that you wish to override a value\n"
9926
"for. The '?' and '*' wildcards are supported::"
9929
#: en/help_topics/configuration.txt:366
9931
" [/home/jdoe/branches/nethack]\n"
9932
" email = Nethack Admin <nethack@nethack.com>"
9935
#: en/help_topics/configuration.txt:369
9937
" [http://hypothetical.site.com/branches/devel-branch]\n"
9938
" create_signatures = always"
9941
#: en/help_topics/configuration.txt:372
9943
"The authentication configuration file, authentication.conf\n"
9944
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9947
#: en/help_topics/configuration.txt:375
9949
"``authentication.conf`` allows one to specify credentials for\n"
9950
"remote servers. This can be used for all the supported transports and any "
9952
"of bzr that requires authentication (smtp for example)."
9955
#: en/help_topics/configuration.txt:379
9957
"The syntax of the file obeys the same rules as the others except for the\n"
9958
"option policies which don't apply."
9961
#: en/help_topics/configuration.txt:382
9963
"For more information on the possible uses of the authentication "
9965
"file see :doc:`authentication-help`."
9968
#: en/help_topics/configuration.txt:385
9975
#: en/help_topics/configuration.txt:389
9981
#: en/help_topics/configuration.txt:392
9983
"A comma-separated list of debugging options to turn on. The same values\n"
9984
"can be used as with the -D command-line option (see `help global-options`).\n"
9988
#: en/help_topics/configuration.txt:396
9989
msgid " debug_flags = hpss"
9990
msgstr " debug_flags = hpss"
9992
#: en/help_topics/configuration.txt:400
9993
msgid " debug_flags = hpss,evil"
9994
msgstr " debug_flags = hpss,evil"
9996
#: en/help_topics/configuration.txt:402
10002
#: en/help_topics/configuration.txt:405
10004
"The email address to use when committing a branch. Typically takes the form\n"
10008
#: en/help_topics/configuration.txt:408
10009
msgid " email = Full Name <account@hostname.tld>"
10012
#: en/help_topics/configuration.txt:410
10018
#: en/help_topics/configuration.txt:413
10020
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10021
"a commit message. This setting is trumped by the environment variable\n"
10022
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10026
#: en/help_topics/configuration.txt:418
10032
#: en/help_topics/configuration.txt:421
10034
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10035
"and ``line``. Additional formats may be provided by plugins. The default\n"
10036
"value is ``long``."
10039
#: en/help_topics/configuration.txt:425
10041
"check_signatures\n"
10045
#: en/help_topics/configuration.txt:428
10047
"Reserved for future use. These options will allow a policy for branches to\n"
10048
"require signatures."
10051
#: en/help_topics/configuration.txt:431
10054
" The gnupg signature for revisions must be present and must be valid."
10057
#: en/help_topics/configuration.txt:434
10060
" Do not check gnupg signatures of revisions."
10063
#: en/help_topics/configuration.txt:437
10065
"check-available\n"
10066
" (default) If gnupg signatures for revisions are present, check them.\n"
10067
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10068
" no signature is present."
10071
#: en/help_topics/configuration.txt:442
10073
"create_signatures\n"
10074
"~~~~~~~~~~~~~~~~~"
10077
#: en/help_topics/configuration.txt:445
10079
"Defines the behaviour of signing revisions on commits. By default bzr will "
10081
"sign new commits."
10084
#: en/help_topics/configuration.txt:448
10087
" Sign every new revision that is committed. If the signing fails then "
10089
" commit will not be made."
10092
#: en/help_topics/configuration.txt:452
10095
" Reserved for future use."
10098
#: en/help_topics/configuration.txt:455
10101
" Reserved for future use."
10104
#: en/help_topics/configuration.txt:458
10106
"In future it is planned that ``when-required`` will sign newly\n"
10107
"committed revisions only when the branch requires them. ``never`` will "
10109
"to sign newly committed revisions, even if the branch requires signatures."
10112
#: en/help_topics/configuration.txt:462
10114
"dirstate.fdatasync\n"
10115
"~~~~~~~~~~~~~~~~~~"
10118
#: en/help_topics/configuration.txt:465
10120
"If true (default), working tree metadata changes are flushed through the\n"
10121
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10122
"should not be lost if the machine crashes. See also repository.fdatasync."
10125
#: en/help_topics/configuration.txt:469
10127
"gpg_signing_key\n"
10131
#: en/help_topics/configuration.txt:472
10133
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10134
"address, key fingerprint or full key ID. When unset or when set to\n"
10135
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10138
#: en/help_topics/configuration.txt:476
10144
#: en/help_topics/configuration.txt:479
10146
"Only useful in ``locations.conf``. Defines whether or not the\n"
10147
"configuration for this section applies to subdirectories:"
10150
#: en/help_topics/configuration.txt:482
10153
" (default) This section applies to subdirectories as well."
10156
#: en/help_topics/configuration.txt:485
10159
" This section only applies to the branch at this directory and not\n"
10160
" branches below it."
10163
#: en/help_topics/configuration.txt:489
10165
"gpg_signing_command\n"
10166
"~~~~~~~~~~~~~~~~~~~"
10169
#: en/help_topics/configuration.txt:492
10171
"(Default: \"gpg\"). Which program should be used to sign and check "
10176
#: en/help_topics/configuration.txt:495
10177
msgid " gpg_signing_command = /usr/bin/gnpg"
10180
#: en/help_topics/configuration.txt:497
10182
"The specified command must accept the options \"--clearsign\" and \"-u "
10186
#: en/help_topics/configuration.txt:499
10188
"bzr_remote_path\n"
10192
#: en/help_topics/configuration.txt:502
10194
"(Default: \"bzr\"). The path to the command that should be used to run the "
10196
"server for bzr. This value may only be specified in locations.conf, because:"
10199
#: en/help_topics/configuration.txt:505
10201
"- it's needed before branch.conf is accessible\n"
10202
"- allowing remote branch.conf files to specify commands would be a security\n"
10206
#: en/help_topics/configuration.txt:509
10207
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10210
#: en/help_topics/configuration.txt:511
10216
#: en/help_topics/configuration.txt:514
10218
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10219
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10222
#: en/help_topics/configuration.txt:517
10224
"smtp_username, smtp_password\n"
10225
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10228
#: en/help_topics/configuration.txt:520
10230
"User and password to authenticate to the SMTP server. If smtp_username\n"
10231
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10232
"These settings are only needed if the SMTP server requires authentication\n"
10236
#: en/help_topics/configuration.txt:525
10238
"locks.steal_dead\n"
10242
#: en/help_topics/configuration.txt:528
10244
"If set to true, bzr will automatically break locks held by processes from\n"
10245
"the same machine and user that are no longer alive. Otherwise, it will\n"
10246
"print a message and you can break the lock manually, if you are satisfied\n"
10247
"the object is no longer in use."
10250
#: en/help_topics/configuration.txt:533
10256
#: en/help_topics/configuration.txt:536
10258
"A mail client to use for sending merge requests.\n"
10259
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10261
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10265
#: en/help_topics/configuration.txt:541
10266
msgid "Supported values for specific clients:"
10269
#: en/help_topics/configuration.txt:543
10271
":claws: Use Claws. This skips a dialog for attaching files.\n"
10272
":evolution: Use Evolution.\n"
10273
":kmail: Use KMail.\n"
10274
":mutt: Use Mutt.\n"
10275
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10277
" this works around some bugs that xdg-email doesn't handle."
10280
#: en/help_topics/configuration.txt:550
10281
msgid "Supported generic values are:"
10282
msgstr "Unterstützte generische Werte sind:"
10284
#: en/help_topics/configuration.txt:552
10286
":default: See above.\n"
10287
":editor: Use your editor to compose the merge request. This also uses\n"
10288
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10289
" smtp_username and smtp_password.\n"
10290
":mapi: Use your preferred e-mail client on Windows.\n"
10291
":xdg-email: Use xdg-email to run your preferred mail program"
10294
#: en/help_topics/configuration.txt:559
10296
"repository.fdatasync\n"
10297
"~~~~~~~~~~~~~~~~~~~~"
10300
#: en/help_topics/configuration.txt:562
10302
"If true (default), repository changes are flushed through the OS buffers\n"
10303
"to physical disk. This is somewhat slower, but means data should not be\n"
10304
"lost if the machine crashes. See also dirstate.fdatasync."
10307
#: en/help_topics/configuration.txt:566
10313
#: en/help_topics/configuration.txt:569
10315
"The branch you intend to submit your current work to. This is "
10317
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10319
"should usually be set on a per-branch or per-location basis."
10322
#: en/help_topics/configuration.txt:573
10328
#: en/help_topics/configuration.txt:576
10330
"A publically-accessible version of this branch (implying that this version "
10332
"not publically-accessible). Used (and set) by ``bzr send``."
10335
#: en/help_topics/configuration.txt:579
10337
"suppress_warnings\n"
10338
"~~~~~~~~~~~~~~~~~"
10341
#: en/help_topics/configuration.txt:582
10343
"A list of strings, each string represent a warning that can be emitted by\n"
10344
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10347
#: en/help_topics/configuration.txt:585
10348
msgid "Valid values:"
10349
msgstr "Gültige Werte:"
10351
#: en/help_topics/configuration.txt:587
10353
"* ``format_deprecation``:\n"
10354
" whether the format deprecation warning is shown on repositories that "
10356
" using deprecated formats."
10359
#: en/help_topics/configuration.txt:591
10365
#: en/help_topics/configuration.txt:594
10367
"A format name for the default format used when creating branches. See "
10369
"help formats`` for possible values."
10372
#: en/help_topics/configuration.txt:597
10375
"Unicode options\n"
10379
#: en/help_topics/configuration.txt:601
10381
"output_encoding\n"
10385
#: en/help_topics/configuration.txt:604
10387
"A Python unicode encoding name for text output from bzr, such as log\n"
10388
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10389
"is the terminal encoding prefered by the operating system."
10392
#: en/help_topics/configuration.txt:608
10395
"Branch type specific options\n"
10396
"----------------------------"
10399
#: en/help_topics/configuration.txt:612
10401
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10402
"later format. They\n"
10403
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10404
"manually set in ``locations.conf`` or ``bazaar.conf``."
10407
#: en/help_topics/configuration.txt:617
10409
"append_revisions_only\n"
10410
"~~~~~~~~~~~~~~~~~~~~~"
10413
#: en/help_topics/configuration.txt:620
10415
"If set to \"True\" then revisions can only be appended to the log, not\n"
10416
"removed. A branch with this setting enabled can only pull from another\n"
10417
"branch if the other branch's log is a longer version of its own. This is\n"
10418
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10419
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10420
"compatibility with previous bzr versions (older than 2.2)."
10423
#: en/help_topics/configuration.txt:627
10425
"parent_location\n"
10429
#: en/help_topics/configuration.txt:630
10431
"If present, the location of the default branch for pull or merge. This "
10433
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10437
#: en/help_topics/configuration.txt:634
10443
#: en/help_topics/configuration.txt:637
10445
"If present, the location of the default branch for push. This option\n"
10446
"is normally set by the first ``push`` or ``push --remember``."
10449
#: en/help_topics/configuration.txt:640
10455
#: en/help_topics/configuration.txt:643
10457
"If present, defines the ``--strict`` option default value for checking\n"
10458
"uncommitted changes before pushing."
10461
#: en/help_topics/configuration.txt:646
10467
#: en/help_topics/configuration.txt:649
10469
"If present, defines the ``--strict`` option default value for checking\n"
10470
"uncommitted changes before pushing into a different VCS without any\n"
10471
"custom bzr metadata."
10474
#: en/help_topics/configuration.txt:653
10480
#: en/help_topics/configuration.txt:656
10482
"The location that commits should go to when acting as a checkout.\n"
10483
"This option is normally set by ``bind``."
10486
#: en/help_topics/configuration.txt:659
10492
#: en/help_topics/configuration.txt:662
10494
"If set to \"True\", the branch should act as a checkout, and push each "
10496
"the bound_location. This option is normally set by ``bind``/``unbind``."
10499
#: en/help_topics/configuration.txt:665
10505
#: en/help_topics/configuration.txt:668
10507
"If present, defines the ``--strict`` option default value for checking\n"
10508
"uncommitted changes before sending a merge directive."
10511
#: en/help_topics/configuration.txt:671
10513
"add.maximum_file_size\n"
10514
"~~~~~~~~~~~~~~~~~~~~~"
10517
#: en/help_topics/configuration.txt:674
10519
"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 "
10524
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10526
"will disable skipping."
10529
#: en/help_topics/configuration.txt:680
10531
"External Merge Tools\n"
10532
"--------------------"
10535
#: en/help_topics/configuration.txt:683
10537
"bzr.mergetool.<name>\n"
10538
"~~~~~~~~~~~~~~~~~~~~"
10541
#: en/help_topics/configuration.txt:686
10543
"Defines an external merge tool called <name> with the given command-line.\n"
10544
"Arguments containing spaces should be quoted using single or double quotes. "
10546
"executable may omit its path if it can be found on the PATH."
10549
#: en/help_topics/configuration.txt:690
10551
"The following markers can be used in the command-line to substitute "
10553
"involved in the merge conflict::"
10556
#: en/help_topics/configuration.txt:693
10558
" {base} file.BASE\n"
10559
" {this} file.THIS\n"
10560
" {other} file.OTHER\n"
10561
" {result} output file\n"
10562
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10567
#: en/help_topics/configuration.txt:702
10568
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10571
#: en/help_topics/configuration.txt:704
10573
"bzr.default_mergetool\n"
10574
"~~~~~~~~~~~~~~~~~~~~~"
10577
#: en/help_topics/configuration.txt:707
10579
"Specifies which external merge tool (as defined above) should be selected "
10581
"default in tools such as ``bzr qconflicts``."
10584
#: en/help_topics/configuration.txt:712
10585
msgid " bzr.default_mergetool = kdiff3\n"
10588
#: en/help_topics/conflict-types.txt:1
10594
#: en/help_topics/conflict-types.txt:4
10596
"Some operations, like merge, revert and pull, modify the contents of your\n"
10597
"working tree. These modifications are programmatically generated, and so "
10599
"may conflict with the current state of your working tree. "
10602
#: en/help_topics/conflict-types.txt:8
10604
"When conflicts are present in your working tree (as shown by ``bzr\n"
10605
"conflicts``), you should resolve them and then inform bzr that the "
10607
"have been resolved."
10610
#: en/help_topics/conflict-types.txt:12
10612
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10613
"should resolve them is not the one responsible for their occurrence, as is "
10615
"case when merging other people's work or because some conflicts are "
10617
"in a way that is not easy to understand."
10620
#: en/help_topics/conflict-types.txt:17
10622
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10623
"conflict if and only if there's an actual conceptual conflict in the source\n"
10624
"tree. Because Bazaar doesn't understand the real meaning of the files "
10626
"versioned, it can, when faced with ambiguities, fall short in either "
10628
"trying to resolve the conflict itself. Many kinds of changes can be "
10630
"programmatically, but sometimes only a human can determine the right thing "
10635
#: en/help_topics/conflict-types.txt:25
10637
"When Bazaar generates a conflict, it adds information into the working tree "
10639
"present the conflicting versions, and it's up to you to find the correct\n"
10643
#: en/help_topics/conflict-types.txt:29
10644
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10647
#: en/help_topics/conflict-types.txt:31
10649
"1. Modify the working tree content so that the conflicted item is now in "
10651
" state you want to keep, then"
10654
#: en/help_topics/conflict-types.txt:34
10656
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10657
" remaining generated information (``bzr resolve <item>``)."
10660
#: en/help_topics/conflict-types.txt:37
10662
"For most conflict types, there are some obvious ways to modify the working\n"
10663
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10664
"itself already made a choice, when possible."
10667
#: en/help_topics/conflict-types.txt:41
10669
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10670
"different ways to resolve the conflict."
10673
#: en/help_topics/conflict-types.txt:44
10675
"Each type of conflict is explained below, and the action which must be done "
10677
"resolve the conflict is outlined."
10680
#: en/help_topics/conflict-types.txt:47
10682
"Various actions are available depending on the kind of conflict, for some "
10684
"these actions, Bazaar can provide some help. In the end you should at least\n"
10685
"inform Bazaar that you're done with the conflict with::"
10688
#: en/help_topics/conflict-types.txt:51
10689
msgid " ``bzr resolve FILE --action=done'"
10690
msgstr " ``bzr resolve FILE --action=done'"
10692
#: en/help_topics/conflict-types.txt:53
10694
"Note that this is the default action when a single file is involved so you "
10699
#: en/help_topics/conflict-types.txt:56
10700
msgid " ``bzr resolve FILE``"
10701
msgstr " ``bzr resolve FILE``"
10703
#: en/help_topics/conflict-types.txt:58
10704
msgid "See ``bzr help resolve`` for more details."
10707
#: en/help_topics/conflict-types.txt:60
10713
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10714
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10715
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10716
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10717
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10718
msgid "Typical message::"
10721
#: en/help_topics/conflict-types.txt:65
10722
msgid " Text conflict in FILE"
10725
#: en/help_topics/conflict-types.txt:67
10727
"These are produced when a text merge cannot completely reconcile two sets "
10729
"text changes. Bazaar will emit files for each version with the extensions\n"
10730
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10732
"i.e. the tree that you are merging changes into. OTHER is the version that "
10734
"are merging into the target. BASE is an older version that is used as a "
10739
#: en/help_topics/conflict-types.txt:74
10741
"In the main copy of the file, Bazaar will include all the changes that it\n"
10742
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10743
"\"herringbone\" markers like ``<<<<<<<``."
10746
#: en/help_topics/conflict-types.txt:78
10748
"Say the initial text is \"The project leader released it.\", and THIS "
10750
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10752
"released Bazaar.\" A conflict would look like this::"
10755
#: en/help_topics/conflict-types.txt:82
10758
" Martin Pool released it.\n"
10760
" The project leader released Bazaar.\n"
10761
" >>>>>>> MERGE-SOURCE"
10764
#: en/help_topics/conflict-types.txt:88
10765
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10768
#: en/help_topics/conflict-types.txt:90
10770
"You can handle text conflicts either by editing the main copy of the file,\n"
10771
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10772
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10773
"set of changes over the other (but see below when you encounter these\n"
10774
"cases). More often, the two sets of changes must be intelligently combined."
10777
#: en/help_topics/conflict-types.txt:96
10779
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10780
"you are done editing, the file should look like it never had a conflict, and "
10785
#: en/help_topics/conflict-types.txt:100
10787
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10788
"Bazaar will auto-detect which conflicts you have resolved."
10791
#: en/help_topics/conflict-types.txt:103
10793
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10794
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10798
#: en/help_topics/conflict-types.txt:107
10801
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10802
"resolve`` with one of the following actions:"
10805
#: en/help_topics/conflict-types.txt:111
10807
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10808
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10811
#: en/help_topics/conflict-types.txt:114
10813
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10814
"modifications will be taken into account."
10817
#: en/help_topics/conflict-types.txt:117
10819
"Content conflicts\n"
10820
"-----------------"
10823
#: en/help_topics/conflict-types.txt:122
10824
msgid " Contents conflict in FILE"
10827
#: en/help_topics/conflict-types.txt:124
10829
"This conflict happens when there are conflicting changes in the working "
10831
"and the merge source, but the conflicted items are not text files. They "
10833
"be binary files, or symlinks, or directories. It can even happen with "
10835
"that are deleted on one side, and modified on the other."
10838
#: en/help_topics/conflict-types.txt:129
10840
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10842
"regular files, symlinks or directories). But it will not include a \"main "
10844
"of the file with herringbone conflict markers. It will appear that the "
10846
"copy\" has been renamed to THIS or OTHER."
10849
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10851
"To resolve that kind of conflict, you should rebuild FILE from either "
10853
"or a combination of both."
10856
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10857
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10858
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10859
#: en/help_topics/conflict-types.txt:361
10860
msgid "``bzr resolve`` recognizes the following actions:"
10863
#: en/help_topics/conflict-types.txt:139
10865
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10866
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10867
"* ``--action=done`` will just mark the conflict as resolved."
10870
#: en/help_topics/conflict-types.txt:143
10872
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10874
"``.OTHER`` files if they are still present in the working tree."
10877
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10878
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10879
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10880
#: en/help_topics/conflict-types.txt:369
10882
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10885
#: en/help_topics/conflict-types.txt:148
10891
#: en/help_topics/conflict-types.txt:153
10893
" Conflicting tags:\n"
10897
#: en/help_topics/conflict-types.txt:156
10899
"When pulling from or pushing to another branch, Bazaar informs you about "
10901
"that conflict between the two branches; that is the same tag points to two\n"
10902
"different revisions. You need not resolve these conflicts, but subsequent\n"
10903
"uses of pull or push will result in the same message."
10906
#: en/help_topics/conflict-types.txt:161
10908
"To resolve the conflict, you must apply the correct tags to either the "
10910
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10911
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10912
"target branch's tags match the source branch, then in the target branch do\n"
10913
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10914
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10916
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10917
"favor of the target branch, you need to similarly use ``tag --force`` in "
10919
"source branch. (Note that pulling or pushing using --overwrite will "
10921
"all tags as well.)"
10924
#: en/help_topics/conflict-types.txt:172
10926
"Duplicate paths\n"
10930
#: en/help_topics/conflict-types.txt:177
10931
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10934
#: en/help_topics/conflict-types.txt:179
10936
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10937
"already been used. The existing file will be renamed to \"FILE.moved\". "
10940
#: en/help_topics/conflict-types.txt:187
10942
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10944
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10945
"* ``--action=done`` will just mark the conflict as resolved."
10948
#: en/help_topics/conflict-types.txt:191
10950
"Note that you must get rid of FILE.moved before using ``--action=done``."
10953
#: en/help_topics/conflict-types.txt:195
10955
"Unversioned parent\n"
10956
"------------------"
10959
#: en/help_topics/conflict-types.txt:200
10960
msgid " Conflict because FILE is not versioned, but has versioned children."
10963
#: en/help_topics/conflict-types.txt:202
10965
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10967
"versioned. This happens when the directory has been deleted in the target,\n"
10968
"but has a new child in the source, or vice versa. In this situation, "
10970
"will version the parent directory as well. Resolving this issue depends\n"
10971
"very much on the particular scenario. You may wish to rename or delete "
10973
"the file or the directory. When you are satisfied, you can run \"bzr "
10975
"FILE\" to mark the conflict as resolved."
10978
#: en/help_topics/conflict-types.txt:210
10984
#: en/help_topics/conflict-types.txt:215
10985
msgid " Conflict adding files to FILE. Created directory."
10988
#: en/help_topics/conflict-types.txt:217
10990
"This happens when a directory has been deleted in the target, but has new\n"
10991
"children in the source. This is similar to the \"unversioned parent\" "
10993
"except that the parent directory does not *exist*, instead of just being\n"
10994
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10995
"Resolving this issue depends very much on the particular scenario."
10998
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11000
"To resolve that kind of conflict, you should either remove or rename the\n"
11001
"children or the directory or a combination of both."
11004
#: en/help_topics/conflict-types.txt:228
11006
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11008
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11010
" and restoring the directory,\n"
11011
"* ``--action=done`` will just mark the conflict as resolved."
11014
#: en/help_topics/conflict-types.txt:236
11016
"Deleting parent\n"
11020
#: en/help_topics/conflict-types.txt:241
11021
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11024
#: en/help_topics/conflict-types.txt:243
11026
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11027
"source, but has new children in the target (either because a directory\n"
11028
"deletion is merged or because the merge introduce new children). Bazaar\n"
11029
"will retain the directory. Resolving this issue depends very much on the\n"
11030
"particular scenario."
11033
#: en/help_topics/conflict-types.txt:254
11035
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11039
#: en/help_topics/conflict-types.txt:256
11041
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11045
#: en/help_topics/conflict-types.txt:259
11046
msgid "* ``--action=done`` will just mark the conflict as resolved."
11049
#: en/help_topics/conflict-types.txt:261
11051
"Note that when merging a directory deletion, if unversioned files are\n"
11052
"present, they become potential orphans has they don't have a directory\n"
11056
#: en/help_topics/conflict-types.txt:265
11058
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11059
"setting the ``bzr.transform.orphan_policy`` configuration option."
11062
#: en/help_topics/conflict-types.txt:268
11063
msgid "There are two possible values for this option:"
11064
msgstr "Es gibt zwei mögliche Werte für diese Option:"
11066
#: en/help_topics/conflict-types.txt:270
11068
"* ``conflict`` (the default): will leave the orphans in place and\n"
11069
" generate a conflicts,"
11072
#: en/help_topics/conflict-types.txt:273
11074
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11076
" of the working tree with names like ``<file>.~#~``."
11079
#: en/help_topics/conflict-types.txt:278
11085
#: en/help_topics/conflict-types.txt:283
11086
msgid " Path conflict: PATH1 / PATH2"
11089
#: en/help_topics/conflict-types.txt:285
11091
"This happens when the source and target have each modified the name or "
11093
"directory of a file. Bazaar will use the path elements from the source."
11096
#: en/help_topics/conflict-types.txt:288
11098
"To resolve that kind of conflict, you just have to decide what name should "
11100
"retained for the file involved."
11103
#: en/help_topics/conflict-types.txt:293
11105
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11106
" issuing ``bzr mv PATH2 PATH1``,\n"
11107
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11109
"* ``--action=done`` will just mark the conflict as resolved."
11112
#: en/help_topics/conflict-types.txt:300
11118
#: en/help_topics/conflict-types.txt:305
11119
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11122
#: en/help_topics/conflict-types.txt:307
11124
"This happens when the source and the target have each moved directories, so\n"
11125
"that, if the change could be applied, a directory would be contained by "
11130
#: en/help_topics/conflict-types.txt:311
11133
" $ bzr mkdir white\n"
11134
" $ bzr mkdir black\n"
11135
" $ bzr commit -m \"BASE\"\n"
11136
" $ bzr branch . ../other\n"
11137
" $ bzr mv white black\n"
11138
" $ bzr commit -m \"THIS\"\n"
11139
" $ bzr mv ../other/black ../other/white\n"
11140
" $ bzr commit ../other -m \"OTHER\"\n"
11141
" $ bzr merge ../other"
11144
" $ bzr mkdir white\n"
11145
" $ bzr mkdir black\n"
11146
" $ bzr commit -m \"BASE\"\n"
11147
" $ bzr branch . ../other\n"
11148
" $ bzr mv white black\n"
11149
" $ bzr commit -m \"THIS\"\n"
11150
" $ bzr mv ../other/black ../other/white\n"
11151
" $ bzr commit ../other -m \"OTHER\"\n"
11152
" $ bzr merge ../other"
11154
#: en/help_topics/conflict-types.txt:322
11156
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11157
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11158
"name should be retained for the directories involved."
11161
#: en/help_topics/conflict-types.txt:328
11163
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11166
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11167
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11168
"* ``--action=done`` will just mark the conflict as resolved."
11171
#: en/help_topics/conflict-types.txt:336
11173
"Non-directory parent\n"
11174
"--------------------"
11177
#: en/help_topics/conflict-types.txt:341
11179
" Conflict: foo.new is not a directory, but has files in it.\n"
11180
" Created directory."
11183
#: en/help_topics/conflict-types.txt:344
11185
"This happens when one side has added files to a directory, and the other "
11187
"has changed the directory into a file or symlink. For example::"
11190
#: en/help_topics/conflict-types.txt:347
11193
" $ bzr mkdir foo\n"
11194
" $ bzr commit -m \"BASE\"\n"
11195
" $ bzr branch . ../other\n"
11198
" $ bzr commit -m \"THIS\"\n"
11199
" $ bzr mkdir ../other/foo/bar\n"
11200
" $ bzr commit ../other -m \"OTHER\"\n"
11201
" $ bzr merge ../other"
11204
" $ bzr mkdir foo\n"
11205
" $ bzr commit -m \"BASE\"\n"
11206
" $ bzr branch . ../other\n"
11209
" $ bzr commit -m \"THIS\"\n"
11210
" $ bzr mkdir ../other/foo/bar\n"
11211
" $ bzr commit ../other -m \"OTHER\"\n"
11212
" $ bzr merge ../other"
11214
#: en/help_topics/conflict-types.txt:358
11216
"To resolve that kind of conflict, you have to decide what name should be\n"
11217
"retained for the file, directory or symlink involved."
11220
#: en/help_topics/conflict-types.txt:363
11222
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11223
" ``bzr add foo``,\n"
11224
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11225
" ``bzr mv foo.new foo``,\n"
11226
"* ``--action=done`` will just mark the conflict as resolved."
11229
#: en/help_topics/conflict-types.txt:371
11231
"MalformedTransform\n"
11232
"------------------"
11235
#: en/help_topics/conflict-types.txt:374
11237
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11238
"exception. This means that Bazaar encountered a filesystem conflict that it "
11240
"unable to resolve. This usually indicates a bug. Please let us know if "
11242
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11245
#: en/help_topics/content-filters.txt:1
11247
"Content Filters\n"
11251
#: en/help_topics/content-filters.txt:4
11253
"Content formats\n"
11257
#: en/help_topics/content-filters.txt:7
11259
"Bazaar's content filtering allows you to store files in a different\n"
11260
"format from the copy in your working tree. This lets you, or your\n"
11261
"co-developers, use Windows development tools that expect CRLF files\n"
11262
"on projects that use other line-ending conventions. Among other things,\n"
11263
"content filters also let Unix developers more easily work on projects\n"
11264
"using Windows line-ending conventions, keyword expansion/compression,\n"
11265
"and trailing spaces on lines in text files to be implicitly stripped\n"
11269
#: en/help_topics/content-filters.txt:16
11270
msgid "To generalize, there are two content formats supported by Bazaar:"
11273
#: en/help_topics/content-filters.txt:18
11275
"* a canonical format - how files are stored internally\n"
11276
"* a convenience format - how files are created in a working tree."
11279
#: en/help_topics/content-filters.txt:21
11282
"Format conversion\n"
11283
"-----------------"
11286
#: en/help_topics/content-filters.txt:25
11288
"The conversion between these formats is done by content filters.\n"
11289
"A content filter has two parts:"
11292
#: en/help_topics/content-filters.txt:28
11294
"* a read converter - converts from convenience to canonical format\n"
11295
"* a write converter - converts from canonical to convenience format."
11298
#: en/help_topics/content-filters.txt:31
11300
"Many of these converters will provide *round-trip* conversion,\n"
11301
"i.e. applying the read converter followed by the write converter\n"
11302
"gives back the original content. However, others may provide an\n"
11303
"asymmetric conversion. For example, a read converter might strip\n"
11304
"trailing whitespace off lines in source code while the matching\n"
11305
"write converter might pass content through unchanged."
11308
#: en/help_topics/content-filters.txt:38
11311
"Enabling content filters\n"
11312
"------------------------"
11315
#: en/help_topics/content-filters.txt:42
11317
"Content filters are typically provided by plugins, so the first step\n"
11318
"in using them is to install the relevant plugins and read their\n"
11319
"documentation. Some plugins may be very specific about which files\n"
11320
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11321
"In other cases, the plugin may leave it in the user's hands to\n"
11322
"define which files are to be filtered. This is typically done\n"
11323
"using rule-based preferences. See ``bzr help rules`` for general\n"
11324
"information about defining these."
11327
#: en/help_topics/content-filters.txt:51
11330
"Impact on commands\n"
11331
"------------------"
11334
#: en/help_topics/content-filters.txt:55
11336
"Read converters are only applied to commands that read content from\n"
11337
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11338
"will apply read converters to files in the working tree, then compare\n"
11339
"the results to the content last committed."
11342
#: en/help_topics/content-filters.txt:60
11344
"Write converters are only applied by commands that **create files in a\n"
11345
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11346
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11350
#: en/help_topics/content-filters.txt:65
11352
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11353
"comitting files. If this makes sense for a given plugin providing\n"
11354
"a content filter, the plugin can usually achieve this effect by using a\n"
11355
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11356
"for more information on hooks."
11359
#: en/help_topics/content-filters.txt:71
11362
"Refreshing your working tree\n"
11363
"----------------------------"
11366
#: en/help_topics/content-filters.txt:75
11368
"For performance reasons, Bazaar caches the timestamps of files in\n"
11369
"a working tree, and assumes files are unchanged if their timestamps\n"
11370
"match the cached values. As a consequence, there are times when\n"
11371
"you may need to explicitly ask for content filtering to be reapplied\n"
11372
"in one or both directions, e.g. after installing or reconfiguring\n"
11373
"plugins providing it."
11376
#: en/help_topics/content-filters.txt:82
11377
msgid "Here are some general guidelines for doing this:"
11380
#: en/help_topics/content-filters.txt:84
11382
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11383
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11384
" relevant read converters and compare the end result with the\n"
11385
" canonical format."
11388
#: en/help_topics/content-filters.txt:89
11390
" * To reapply write converters, ensure there are no local changes,\n"
11391
" delete the relevant files and run ``bzr revert`` on those files."
11394
#: en/help_topics/content-filters.txt:92
11396
"Note: In the future, it is likely that additional options will be added\n"
11397
"to commands to make this refreshing process faster and safer.\n"
11400
#: en/help_topics/current-formats.txt:1
11401
msgid "Current Storage Formats"
11402
msgstr "Aktuelle Speicherformate"
11404
#: en/help_topics/current-formats.txt:3
11407
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11408
" compress storage. Provides rich roots which are a one-way\n"
11412
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11415
"See :doc:`formats-help` for more about storage formats."
11418
#: en/help_topics/debug-flags.txt:1
11424
#: en/help_topics/debug-flags.txt:4
11426
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11427
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11430
#: en/help_topics/debug-flags.txt:7
11432
"-Dauth Trace authentication sections used.\n"
11433
"-Dbytes Print out how many bytes were transferred\n"
11434
"-Ddirstate Trace dirstate activity (verbose!)\n"
11435
"-Derror Instead of normal error handling, always print a "
11438
"-Devil Capture call sites that do expensive or badly-scaling\n"
11440
"-Dfetch Trace history copying between repositories.\n"
11441
"-Dfilters Emit information for debugging content filtering.\n"
11442
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11444
"-Dgraph Trace graph traversal.\n"
11445
"-Dhashcache Log every time a working file is read to determine its "
11447
"-Dhooks Trace hook execution.\n"
11448
"-Dhpss Trace smart protocol requests and responses.\n"
11449
"-Dhpssdetail More hpss details.\n"
11450
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11451
"-Dhttp Trace http connections, requests and responses.\n"
11452
"-Dindex Trace major index operations.\n"
11453
"-Dknit Trace knit operations.\n"
11454
"-Dlock Trace when lockdir locks are taken or released.\n"
11455
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11456
" retrying the request.\n"
11457
"-Dprogress Trace progress bar operations.\n"
11458
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11459
"-Dmerge Emit information for debugging merges.\n"
11460
"-Dno_apport Don't use apport to report crashes.\n"
11461
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11462
"-Dpack Emit information about pack operations.\n"
11463
"-Drelock Emit a message every time a branch or repository object "
11465
" unlocked then relocked the same way.\n"
11466
"-Dsftp Trace SFTP internals.\n"
11467
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11469
"-Dstream Trace fetch streams.\n"
11470
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11473
"-Dunlock Some errors during unlock are treated as warnings.\n"
11474
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11475
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11477
" for the format, even for non-local fetches.\n"
11480
#: en/help_topics/diverged-branches.txt:1
11482
"Diverged Branches\n"
11483
"================="
11486
#: en/help_topics/diverged-branches.txt:4
11488
"When Bazaar tries to push one branch onto another, it requires that the\n"
11489
"destination branch must be ready to receive the source branch. If this "
11491
"the case, then we say that the branches have ``diverged``. Branches are\n"
11492
"considered diverged if the destination branch's most recent commit is one "
11494
"has not been merged (directly or indirectly) by the source branch. To "
11496
"from diverged branches, one must merge the missing revisions into the "
11501
#: en/help_topics/diverged-branches.txt:12
11503
"This situation commonly arises when using a centralized workflow with local\n"
11504
"commits. If someone else has committed new work to the mainline since your\n"
11505
"last pull and you have local commits that have not yet been pushed to the\n"
11506
"mainline, then your local branch and the mainline have diverged."
11509
#: en/help_topics/diverged-branches.txt:17
11511
"Discovering What Has Diverged\n"
11512
"-----------------------------"
11515
#: en/help_topics/diverged-branches.txt:20
11517
"The ``bzr missing`` command is used to find out what revisions are in "
11519
"branch that are not present in the current branch, and vice-versa. It shows "
11521
"summary of which extra revisions exist in each branch. If you want to see "
11523
"precise effects of those revisions, you can use ``bzr diff --"
11524
"old=other_branch``\n"
11525
"to show the differences between other_branch and your current branch."
11528
#: en/help_topics/diverged-branches.txt:26
11534
#: en/help_topics/diverged-branches.txt:29
11536
"The solution is to merge the revisions from the mainline into your local\n"
11537
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11538
"mainline. This merge may result in conflicts if the other developer's "
11540
"overlap with your changes. These conflicts should be resolved before\n"
11541
"continuing. After any conflicts have been resolved, or even if there were "
11543
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11544
"to your local branch. This requirement gives you an opportunity to test "
11546
"resulting working tree for correctness, since the merged revisions could "
11548
"made arbitrary changes. After testing, you should commit the merge using\n"
11549
"``bzr commit``. This clears up the diverged branches situation. Your "
11551
"branch can now be pushed to the mainline.\n"
11554
#: en/help_topics/eol.txt:1
11556
"End of Line Conversion\n"
11557
"======================"
11560
#: en/help_topics/eol.txt:4
11562
"EOL conversion is provided as a content filter where Bazaar internally\n"
11563
"stores a canonical format but outputs a convenience format. See\n"
11564
"``bzr help content-filters`` for general information about using these."
11567
#: en/help_topics/eol.txt:8
11569
"Note: Content filtering is only supported in recently added formats,\n"
11570
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11571
"in a recent format. (Just setting the format on the repository\n"
11572
"is not enough.) If content filtering does not appear to be working, use\n"
11573
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11577
#: en/help_topics/eol.txt:15
11579
"EOL conversion needs to be enabled for selected file patterns using\n"
11580
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11581
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11582
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11583
"supported in a future verison of Bazaar."
11586
#: en/help_topics/eol.txt:21
11588
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11589
"(If a value is not set, ``exact`` is the default.)"
11592
#: en/help_topics/eol.txt:24
11594
" ========== ===================================== ======================\n"
11595
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11596
" ========== ===================================== ======================\n"
11597
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11598
" ---------- ------------------------------------- ----------------------\n"
11599
" ``lf`` ``lf`` ``lf``\n"
11600
" ---------- ------------------------------------- ----------------------\n"
11601
" ``crlf`` ``crlf`` ``lf``\n"
11602
" ---------- ------------------------------------- ----------------------\n"
11603
" ``exact`` No conversion Exactly as in file\n"
11604
" ========== ===================================== ======================"
11607
#: en/help_topics/eol.txt:36
11609
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11610
"byte is detected in the file."
11613
#: en/help_topics/eol.txt:39
11615
"For users working on a cross-platform project, here is a suggested rule\n"
11616
"to use as a starting point::"
11619
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11620
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11626
#: en/help_topics/eol.txt:45
11628
"If you have binary files that do not contain a null byte though, be\n"
11629
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11630
"by giving more explicit patterns earlier in the rules file. For example::"
11633
#: en/help_topics/eol.txt:49
11639
#: en/help_topics/eol.txt:55
11641
"If your working tree is on a network drive shared by users on different\n"
11642
"operating systems, you typically want to force certain conventions for\n"
11643
"certain files. In that way, if a file is created with the wrong line\n"
11644
"endings or line endings get mixed during editing, it gets committed\n"
11645
"correctly and gets checked out correctly. For example::"
11648
#: en/help_topics/eol.txt:61
11654
#: en/help_topics/eol.txt:64
11660
#: en/help_topics/eol.txt:70
11662
"If you take the care to create files with their required endings, you can\n"
11663
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11664
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11665
"introducing mixed line endings will be corrected during commit for files\n"
11666
"with those settings."
11669
#: en/help_topics/eol.txt:76
11671
"If you have sample test data that deliberately has text files with mixed\n"
11672
"newline conventions, you can ask for those to be left alone like this::"
11675
#: en/help_topics/eol.txt:79
11677
" [name test_data/]\n"
11681
#: en/help_topics/eol.txt:85
11683
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11684
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11685
"of content analysis to detect binary files for commands like ``diff``.\n"
11686
"In the future, a ``binary = true`` rule may be added but it is not\n"
11690
#: en/help_topics/eol.txt:91
11692
"If you have an existing repository with text files already stored using\n"
11693
"Windows newline conventions (``crlf``), then you may want to keep using "
11695
"convention in the repository. Forcing certain files to this convention\n"
11696
"may also help users who do not have rules configured. To do this, set\n"
11697
"``eol`` to one of the values below."
11700
#: en/help_topics/eol.txt:97
11702
" ============================ ======================== "
11703
"======================\n"
11704
" Value Checkout end-of-lines as Commit end-of-lines "
11706
" ============================ ======================== "
11707
"======================\n"
11708
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11709
" ``lf`` otherwise\n"
11710
" ---------------------------- ------------------------ "
11711
"----------------------\n"
11712
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11713
" ---------------------------- ------------------------ "
11714
"----------------------\n"
11715
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11716
" ============================ ======================== ======================"
11719
#: en/help_topics/eol.txt:108
11721
"For users working on an existing project that uses Windows newline\n"
11722
"conventions in their Bazaar repository, this rule is suggested as a\n"
11726
#: en/help_topics/eol.txt:112
11729
" eol = native-with-crlf-in-repo"
11732
#: en/help_topics/eol.txt:115
11734
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11735
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11736
"``crlf`` and ``exact``."
11739
#: en/help_topics/eol.txt:119
11741
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11742
"never reject files because a given line ending or mixed line endings\n"
11743
"are found. A precommit hook should be used if you wish to validate\n"
11744
"(and not just convert) content before committing.\n"
11747
#: en/help_topics/hidden-commands.txt:1
11749
"added List files added in working tree.\n"
11750
"ancestry List all revisions merged into this branch.\n"
11751
"assert-fail Test reporting of assertion failures\n"
11752
"bundle-info Output interesting stats about a bundle\n"
11753
"bundle-revisions Create a merge-directive for submitting changes.\n"
11754
"cat-revision Write out metadata for a revision.\n"
11755
"dump-btree Dump the contents of a btree index file to stdout.\n"
11756
"export-pot Export command helps and error messages in po format.\n"
11757
"file-id Print file_id of a particular file or directory.\n"
11758
"file-path Print path of file_ids to a file or directory.\n"
11759
"find-merge-base Find and print a base revision for merging two "
11761
"hooks Show hooks.\n"
11762
"inventory Show inventory of the current working copy or a "
11764
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11765
"lookup-revision Lookup the revision-id from a revision-number\n"
11766
"merge-directive Generate a merge directive for auto-merge tools.\n"
11767
"modified List files modified in working tree.\n"
11768
"re-sign Create a digital signature for an existing revision.\n"
11769
"reference list, view and set branch locations for nested trees.\n"
11770
"relpath Show path of a file relative to root\n"
11771
"repair-workingtree Reset the working tree state file.\n"
11772
"revision-history Display the list of revision ids on a branch.\n"
11773
"revision-info Show revision number and revision id for a given "
11776
"rocks Statement of optimism.\n"
11777
"selftest Run internal test suite.\n"
11778
"shell-complete Show appropriate completions for context.\n"
11779
"test-script Run a shell-like test from a file.\n"
11780
"touching-revisions Return revision-ids which affected a particular file.\n"
11781
"unknowns List unknown files.\n"
11782
"wait-until-signalled Test helper for\n"
11783
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11786
#: en/help_topics/hooks.txt:1
11793
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11799
#: en/help_topics/hooks.txt:8
11800
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11803
#: en/help_topics/hooks.txt:10
11804
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11807
#: en/help_topics/hooks.txt:12
11809
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11812
#: en/help_topics/hooks.txt:14
11814
"The class that contains each hook is given before the hooks it supplies. "
11816
"instance, BranchHooks as the class is the hooks class for\n"
11817
"`bzrlib.branch.Branch.hooks`."
11820
#: en/help_topics/hooks.txt:18
11822
"Each description also indicates whether the hook runs on the client (the\n"
11823
"machine where bzr was invoked) or the server (the machine addressed by\n"
11824
"the branch URL). These may be, but are not necessarily, the same machine."
11827
#: en/help_topics/hooks.txt:22
11829
"Plugins (including hooks) are run on the server if all of these is true:"
11832
#: en/help_topics/hooks.txt:24
11834
" * The connection is via a smart server (accessed with a URL starting with\n"
11835
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11837
" URL when a smart server is available via HTTP)."
11840
#: en/help_topics/hooks.txt:28
11842
" * The hook is either server specific or part of general infrastructure "
11844
" than client specific code (such as commit)."
11847
#: en/help_topics/hooks.txt:31
11854
#: en/help_topics/hooks.txt:35
11856
"automatic_tag_name\n"
11857
"~~~~~~~~~~~~~~~~~~"
11860
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11861
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11862
msgid "Introduced in: 2.2"
11865
#: en/help_topics/hooks.txt:40
11867
"Called to determine an automatic tag name for a revision.\n"
11868
"automatic_tag_name is called with (branch, revision_id) and should\n"
11869
"return a tag name or None if no tag name could be determined. The\n"
11870
"first non-None tag name returned will be used."
11873
#: en/help_topics/hooks.txt:45
11879
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11880
#: en/help_topics/hooks.txt:304
11881
msgid "Introduced in: 1.8"
11884
#: en/help_topics/hooks.txt:50
11886
"Called with the Branch object that has been opened after a branch is\n"
11890
#: en/help_topics/hooks.txt:53
11892
"post_branch_init\n"
11896
#: en/help_topics/hooks.txt:58
11898
"Called after new branch initialization completes. post_branch_init is\n"
11899
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11900
"branch and checkout (both heavyweight and lightweight) will all\n"
11901
"trigger this hook."
11904
#: en/help_topics/hooks.txt:63
11906
"post_change_branch_tip\n"
11907
"~~~~~~~~~~~~~~~~~~~~~~"
11910
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11911
msgid "Introduced in: 1.4"
11914
#: en/help_topics/hooks.txt:68
11916
"Called in bzr client and server after a change to the tip of a branch\n"
11917
"is made. post_change_branch_tip is called with a\n"
11918
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11919
"uncommit will all trigger this hook."
11922
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11928
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11929
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11930
#: en/help_topics/hooks.txt:145
11931
msgid "Introduced in: 0.15"
11934
#: en/help_topics/hooks.txt:78
11936
"Called in the bzr client after a commit has completed. post_commit is\n"
11937
"called with (local, master, old_revno, old_revid, new_revno,\n"
11938
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11942
#: en/help_topics/hooks.txt:83
11948
#: en/help_topics/hooks.txt:88
11950
"Called after a pull operation completes. post_pull is called with a\n"
11951
"bzrlib.branch.PullResult object and only runs in the bzr client."
11954
#: en/help_topics/hooks.txt:91
11960
#: en/help_topics/hooks.txt:96
11962
"Called after a push operation completes. post_push is called with a\n"
11963
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11966
#: en/help_topics/hooks.txt:99
11972
#: en/help_topics/hooks.txt:104
11974
"Called after a checkout switches branch. post_switch is called with a\n"
11975
"bzrlib.branch.SwitchHookParams."
11978
#: en/help_topics/hooks.txt:107
11984
#: en/help_topics/hooks.txt:112
11986
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11987
"called with (local, master, old_revno, old_revid, new_revno,\n"
11988
"new_revid) where local is the local branch or None, master is the\n"
11989
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11993
#: en/help_topics/hooks.txt:118
11995
"pre_change_branch_tip\n"
11996
"~~~~~~~~~~~~~~~~~~~~~"
11999
#: en/help_topics/hooks.txt:121
12000
msgid "Introduced in: 1.6"
12001
msgstr "Eingeführt in: 1.6"
12003
#: en/help_topics/hooks.txt:123
12005
"Called in bzr client and server before a change to the tip of a branch\n"
12006
"is made. pre_change_branch_tip is called with a\n"
12007
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12008
"uncommit will all trigger this hook."
12011
#: en/help_topics/hooks.txt:128
12017
#: en/help_topics/hooks.txt:131
12018
msgid "Introduced in: 0.91"
12019
msgstr "Eingeführt in: 0.91"
12021
#: en/help_topics/hooks.txt:133
12023
"Called after a commit is calculated but before it is completed.\n"
12024
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12025
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12026
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12027
"TreeDelta object describing changes from the basis revision. hooks\n"
12028
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12029
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12033
#: en/help_topics/hooks.txt:142
12039
#: en/help_topics/hooks.txt:147
12041
"Invoked whenever the revision history has been set via\n"
12042
"set_revision_history. The api signature is (branch, revision_history),\n"
12043
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12044
"for bzr to trigger, a better hook to use is\n"
12045
"Branch.post_change_branch_tip."
12048
#: en/help_topics/hooks.txt:153
12050
"transform_fallback_location\n"
12051
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12054
#: en/help_topics/hooks.txt:156
12055
msgid "Introduced in: 1.9"
12056
msgstr "Eingeführt in: 1.9"
12058
#: en/help_topics/hooks.txt:158
12060
"Called when a stacked branch is activating its fallback locations.\n"
12061
"transform_fallback_location is called with (branch, url), and should\n"
12062
"return a new url. Returning the same url allows it to be used as-is,\n"
12063
"returning a different one can be used to cause the branch to stack on\n"
12064
"a closer copy of that fallback_location. Note that the branch cannot\n"
12065
"have history accessing methods called on it during this hook because\n"
12066
"the fallback locations have not been activated. When there are\n"
12067
"multiple hooks installed for transform_fallback_location, all are\n"
12068
"called with the url returned from the previous hook.The order is\n"
12069
"however undefined."
12072
#: en/help_topics/hooks.txt:169
12078
#: en/help_topics/hooks.txt:172
12084
#: en/help_topics/hooks.txt:175
12085
msgid "Introduced in: 1.13"
12086
msgstr "Eingeführt in: 1.13"
12088
#: en/help_topics/hooks.txt:177
12090
"Called after creating a command object to allow modifications such as\n"
12091
"adding or removing options, docs etc. Called with the new\n"
12092
"bzrlib.commands.Command object."
12095
#: en/help_topics/hooks.txt:181
12101
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12102
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12103
msgid "Introduced in: 1.17"
12104
msgstr "Eingeführt in: 1.17"
12106
#: en/help_topics/hooks.txt:186
12108
"Called when creating a single command. Called with (cmd_or_None,\n"
12109
"command_name). get_command should either return the cmd_or_None\n"
12110
"parameter, or a replacement Command object that should be used for the\n"
12111
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12112
"Many users will prefer to use bzrlib.commands.register_command or\n"
12113
"plugin_cmds.register_lazy."
12116
#: en/help_topics/hooks.txt:193
12118
"get_missing_command\n"
12119
"~~~~~~~~~~~~~~~~~~~"
12122
#: en/help_topics/hooks.txt:198
12124
"Called when creating a single command if no command could be found.\n"
12125
"Called with (command_name). get_missing_command should either return\n"
12126
"None, or a Command object to be used for the command."
12129
#: en/help_topics/hooks.txt:202
12135
#: en/help_topics/hooks.txt:207
12137
"Called when enumerating commands. Called with a set of cmd_name\n"
12138
"strings for all the commands found so far. This set is safe to mutate\n"
12139
"- e.g. to remove a command. list_commands should return the updated\n"
12140
"set of command names."
12143
#: en/help_topics/hooks.txt:212
12149
#: en/help_topics/hooks.txt:215
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
12159
msgid "Introduced in: 2.4"
12160
msgstr "Eingeführt in: 2.4"
12162
#: en/help_topics/hooks.txt:220
12164
"Invoked when a config option is read. The signature is (stack, name,\n"
12168
#: en/help_topics/hooks.txt:223
12174
#: en/help_topics/hooks.txt:228
12175
msgid "Invoked when a config store is loaded. The signature is (store)."
12178
#: en/help_topics/hooks.txt:230
12184
#: en/help_topics/hooks.txt:235
12186
"Invoked when a config option is removed. The signature is (stack,\n"
12190
#: en/help_topics/hooks.txt:238
12196
#: en/help_topics/hooks.txt:243
12197
msgid "Invoked when a config store is saved. The signature is (store)."
12200
#: en/help_topics/hooks.txt:245
12206
#: en/help_topics/hooks.txt:250
12208
"Invoked when a config option is set. The signature is (stack, name,\n"
12212
#: en/help_topics/hooks.txt:253
12214
"ControlDirHooks\n"
12218
#: en/help_topics/hooks.txt:256
12224
#: en/help_topics/hooks.txt:261
12226
"Invoked after a repository has been initialized. post_repo_init is\n"
12227
"called with a bzrlib.controldir.RepoInitHookParams."
12230
#: en/help_topics/hooks.txt:264
12236
#: en/help_topics/hooks.txt:267
12237
msgid "Introduced in: 1.14"
12238
msgstr "Eingeführt in: 1.14"
12240
#: en/help_topics/hooks.txt:269
12242
"Invoked before attempting to open a ControlDir with the transport that\n"
12243
"the open will use."
12246
#: en/help_topics/hooks.txt:272
12252
#: en/help_topics/hooks.txt:275
12258
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12259
#: en/help_topics/hooks.txt:521
12260
msgid "Introduced in: 1.15"
12261
msgstr "Eingeführt in: 1.15"
12263
#: en/help_topics/hooks.txt:280
12265
"Invoked when displaying the statistics for a repository. repository is\n"
12266
"called with a statistics dictionary as returned by the repository and\n"
12267
"a file-like object to write to."
12270
#: en/help_topics/hooks.txt:284
12276
#: en/help_topics/hooks.txt:287
12282
#: en/help_topics/hooks.txt:292
12283
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12286
#: en/help_topics/hooks.txt:294
12292
#: en/help_topics/hooks.txt:299
12293
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12296
#: en/help_topics/hooks.txt:301
12302
#: en/help_topics/hooks.txt:306
12303
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12306
#: en/help_topics/hooks.txt:308
12312
#: en/help_topics/hooks.txt:311
12314
"merge_file_content\n"
12315
"~~~~~~~~~~~~~~~~~~"
12318
#: en/help_topics/hooks.txt:314
12319
msgid "Introduced in: 2.1"
12322
#: en/help_topics/hooks.txt:316
12324
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12325
"object when starting a merge. Should return either None or a subclass\n"
12326
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12327
"called per file that needs to be merged (including when one side has\n"
12328
"deleted the file and the other has changed it). See the\n"
12329
"AbstractPerFileMerger API docs for details on how it is used by merge."
12332
#: en/help_topics/hooks.txt:323
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
12341
msgid "Introduced in: 2.5"
12344
#: en/help_topics/hooks.txt:328
12346
"Called after a merge. Receives a Merger object as the single argument.\n"
12347
"The return value is ignored."
12350
#: en/help_topics/hooks.txt:331
12356
#: en/help_topics/hooks.txt:336
12358
"Called before a merge. Receives a Merger object as the single\n"
12362
#: en/help_topics/hooks.txt:339
12364
"MergeDirectiveHooks\n"
12365
"-------------------"
12368
#: en/help_topics/hooks.txt:342
12370
"merge_request_body\n"
12371
"~~~~~~~~~~~~~~~~~~"
12374
#: en/help_topics/hooks.txt:345
12375
msgid "Introduced in: 1.15.0"
12378
#: en/help_topics/hooks.txt:347
12380
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12381
"request. Callbacks must return a body. If more than one callback is\n"
12382
"registered, the output of one callback is provided to the next."
12385
#: en/help_topics/hooks.txt:351
12387
"MessageEditorHooks\n"
12388
"------------------"
12391
#: en/help_topics/hooks.txt:354
12393
"commit_message_template\n"
12394
"~~~~~~~~~~~~~~~~~~~~~~~"
12397
#: en/help_topics/hooks.txt:357
12398
msgid "Introduced in: 1.10"
12401
#: en/help_topics/hooks.txt:359
12403
"Called when a commit message is being generated.\n"
12404
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12405
"and the message that is known so far. commit_message_template must\n"
12406
"return a new message to use (which could be the same as it was given).\n"
12407
"When there are multiple hooks registered for commit_message_template,\n"
12408
"they are chained with the result from the first passed into the\n"
12409
"second, and so on."
12412
#: en/help_topics/hooks.txt:367
12414
"set_commit_message\n"
12415
"~~~~~~~~~~~~~~~~~~"
12418
#: en/help_topics/hooks.txt:372
12420
"Set a fixed commit message. set_commit_message is called with the\n"
12421
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12422
"properties by editing commit.builder._revprops) and the message so\n"
12423
"far. set_commit_message must return the message to use or None if it\n"
12424
"should use the message editor as normal."
12427
#: en/help_topics/hooks.txt:378
12429
"MutableTreeHooks\n"
12433
#: en/help_topics/hooks.txt:381
12435
"post_build_tree\n"
12439
#: en/help_topics/hooks.txt:386
12441
"Called after a completely new tree is built. The hook is called with\n"
12442
"the tree as its only argument."
12445
#: en/help_topics/hooks.txt:392
12446
msgid "Introduced in: 2.0"
12449
#: en/help_topics/hooks.txt:394
12451
"Called after a commit is performed on a tree. The hook is called with\n"
12452
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12453
"commit was performed on is available via the mutable_tree attribute of\n"
12457
#: en/help_topics/hooks.txt:399
12463
#: en/help_topics/hooks.txt:404
12465
"Called after a tree transform has been performed on a tree. The hook\n"
12466
"is called with the tree that is being transformed and the transform."
12469
#: en/help_topics/hooks.txt:407
12475
#: en/help_topics/hooks.txt:412
12477
"Called before a tree transform on this tree. The hook is called with\n"
12478
"the tree that is being transformed and the transform."
12481
#: en/help_topics/hooks.txt:415
12487
#: en/help_topics/hooks.txt:420
12489
"Called before a commit is performed on a tree. The start commit hook\n"
12490
"is able to change the tree before the commit takes place. start_commit\n"
12491
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12492
"being performed on."
12495
#: en/help_topics/hooks.txt:425
12497
"SmartClientHooks\n"
12501
#: en/help_topics/hooks.txt:428
12507
#: en/help_topics/hooks.txt:431
12508
msgid "Introduced in: unknown"
12511
#: en/help_topics/hooks.txt:433
12513
"Called when the smart client is submitting a request to the smart\n"
12514
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12515
"Streaming request bodies, and responses, are not accessible."
12518
#: en/help_topics/hooks.txt:437
12520
"SmartServerHooks\n"
12524
#: en/help_topics/hooks.txt:440
12526
"server_exception\n"
12530
#: en/help_topics/hooks.txt:445
12532
"Called by the bzr server when an exception occurs. server_exception is\n"
12533
"called with the sys.exc_info() tuple return true for the hook if the\n"
12534
"exception has been handled, in which case the server will exit\n"
12538
#: en/help_topics/hooks.txt:450
12544
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12545
msgid "Introduced in: 0.16"
12548
#: en/help_topics/hooks.txt:455
12550
"Called by the bzr server when it starts serving a directory.\n"
12551
"server_started is called with (backing urls, public url), where\n"
12552
"backing_url is a list of URLs giving the server-specific directory\n"
12553
"locations, and public_url is the public URL for the directory being\n"
12557
#: en/help_topics/hooks.txt:461
12559
"server_started_ex\n"
12560
"~~~~~~~~~~~~~~~~~"
12563
#: en/help_topics/hooks.txt:466
12565
"Called by the bzr server when it starts serving a directory.\n"
12566
"server_started is called with (backing_urls, server_obj)."
12569
#: en/help_topics/hooks.txt:469
12575
#: en/help_topics/hooks.txt:474
12577
"Called by the bzr server when it stops serving a directory.\n"
12578
"server_stopped is called with the same parameters as the\n"
12579
"server_started hook: (backing_urls, public_url)."
12582
#: en/help_topics/hooks.txt:478
12588
#: en/help_topics/hooks.txt:481
12594
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12595
msgid "Introduced in: 2.3"
12598
#: en/help_topics/hooks.txt:486
12600
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12601
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12602
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12603
"correspond to the command line options specified by the user for the\n"
12604
"status command. to_file is the output stream for writing."
12607
#: en/help_topics/hooks.txt:492
12613
#: en/help_topics/hooks.txt:497
12615
"Called with argument StatusHookParams before Bazaar displays the\n"
12616
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12617
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12618
"correspond to the command line options specified by the user for the\n"
12619
"status command. to_file is the output stream for writing."
12622
#: en/help_topics/hooks.txt:503
12628
#: en/help_topics/hooks.txt:506
12634
#: en/help_topics/hooks.txt:511
12636
"Called after a new connection is established or a reconnect occurs.\n"
12637
"The sole argument passed is either the connected transport or smart\n"
12641
#: en/help_topics/hooks.txt:515
12643
"RioVersionInfoBuilderHooks\n"
12644
"--------------------------"
12647
#: en/help_topics/hooks.txt:518
12653
#: en/help_topics/hooks.txt:523
12655
"Invoked when adding information about a revision to the RIO stanza\n"
12656
"that is printed. revision is called with a revision object and a RIO\n"
12660
#: en/help_topics/location-alias.txt:1
12662
"Location aliases\n"
12666
#: en/help_topics/location-alias.txt:4
12668
"Bazaar defines several aliases for locations associated with a branch. "
12670
"can be used with most commands that expect a location, such as `bzr push`."
12673
#: en/help_topics/location-alias.txt:7
12674
msgid "The aliases are::"
12677
#: en/help_topics/location-alias.txt:9
12679
" :bound The branch this branch is bound to, for bound branches.\n"
12680
" :parent The parent of this branch.\n"
12681
" :public The public location of this branch.\n"
12682
" :push The saved location used for `bzr push` with no arguments.\n"
12683
" :submit The submit branch for this branch.\n"
12684
" :this This branch."
12687
#: en/help_topics/location-alias.txt:16
12688
msgid "For example, to push to the parent location::"
12691
#: en/help_topics/location-alias.txt:18
12692
msgid " bzr push :parent\n"
12695
#: en/help_topics/log-formats.txt:1
12701
#: en/help_topics/log-formats.txt:4
12703
"A log format controls how information about each revision is displayed.\n"
12704
"The standard log formats are compared below::"
12707
#: en/help_topics/log-formats.txt:7
12709
" Feature long short line\n"
12710
" ---------------------- ------------- ------------ -------------------\n"
12711
" design goal detailed view concise view 1 revision per line\n"
12712
" committer name+email name only name only\n"
12713
" author name+email - -\n"
12714
" date-time format full date only date only\n"
12715
" commit message full full top line\n"
12716
" tags yes yes yes\n"
12717
" merges indicator - yes -\n"
12718
" status/delta optional optional -\n"
12719
" diff/patch optional optional -\n"
12720
" revision-id optional optional -\n"
12721
" branch nick yes - -\n"
12722
" foreign vcs properties yes yes -\n"
12723
" preferred levels all 1 1\n"
12724
" digital signature optional - -"
12727
#: en/help_topics/log-formats.txt:24
12729
"The default format is ``long``. To change this, define the ``log_format``\n"
12730
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12733
#: en/help_topics/log-formats.txt:27
12736
" log_format = short"
12739
#: en/help_topics/log-formats.txt:30
12741
"Alternatively, to change the log format used for a given query, use the\n"
12742
"--long, --short or --line options."
12745
#: en/help_topics/log-formats.txt:33
12747
"If one of the standard log formats does not meet your needs, additional\n"
12748
"formats can be provided by plugins.\n"
12751
#: en/help_topics/other-formats.txt:1
12752
msgid "Other Storage Formats"
12753
msgstr "Andere Speicherformate"
12755
#: en/help_topics/other-formats.txt:3
12756
msgid "Experimental formats are shown below."
12759
#: en/help_topics/other-formats.txt:5
12761
":development-colo:\n"
12762
" (native) The 2a format with experimental support for colocated\n"
12766
#: en/help_topics/other-formats.txt:9
12769
"Deprecated formats are shown below."
12772
#: en/help_topics/other-formats.txt:12
12775
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12776
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12780
#: en/help_topics/patterns.txt:1
12786
#: en/help_topics/patterns.txt:4
12788
"Bazaar uses patterns to match files at various times. For example,\n"
12789
"the ``add`` command skips over files that match ignore patterns\n"
12790
"and preferences can be associated with files using rule patterns.\n"
12791
"The pattern syntax is described below."
12794
#: en/help_topics/patterns.txt:9
12796
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12797
"slash or is a regular expression, it is compared to the whole path\n"
12798
"from the branch root. Otherwise, it is compared to only the last\n"
12799
"component of the path. To match a file only in the root directory,\n"
12800
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12803
#: en/help_topics/patterns.txt:15
12804
msgid "Patterns may include globbing wildcards such as::"
12807
#: en/help_topics/patterns.txt:17
12809
" ? - Matches any single character except '/'\n"
12810
" * - Matches 0 or more characters except '/'\n"
12811
" /**/ - Matches 0 or more directories in a path\n"
12812
" [a-z] - Matches a single character from within a group of characters"
12815
#: en/help_topics/patterns.txt:22
12817
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12818
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12819
"expression. Regular expression patterns may not include named or\n"
12823
#: en/help_topics/patterns.txt:27
12825
"Case insensitive ignore patterns can be specified with regular expressions\n"
12826
"by using the ``i`` (for ignore case) flag in the pattern."
12829
#: en/help_topics/patterns.txt:30
12830
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
12833
#: en/help_topics/patterns.txt:32
12834
msgid " RE:(?i)foo"
12837
#: en/help_topics/patterns.txt:34
12839
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12840
"matched by that pattern will not be ignored."
12843
#: en/help_topics/patterns.txt:37
12844
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
12847
#: en/help_topics/revisionspec.txt:1
12848
msgid "Revision Identifiers"
12851
#: en/help_topics/revisionspec.txt:3
12853
"A revision identifier refers to a specific state of a branch's history. It\n"
12854
"can be expressed in several ways. It can begin with a keyword to\n"
12855
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12856
"'before:yesterday' and 'submit:'."
12859
#: en/help_topics/revisionspec.txt:8
12861
"Alternately, it can be given without a keyword, in which case it will be\n"
12862
"checked as a revision number, a tag, a revision id, a date specification, or "
12864
"branch specification, in that order. For example, 'date:today' could be\n"
12865
"written as simply 'today', though if you have a tag called 'today' that "
12870
#: en/help_topics/revisionspec.txt:14
12872
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12873
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12874
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12876
"spaces around the '..')."
12879
#: en/help_topics/revisionspec.txt:19
12881
"Ranges are interpreted differently by different commands. To the \"log\" "
12883
"a range is a sequence of log messages, but to the \"diff\" command, the "
12885
"denotes a change between revisions (and not a sequence of changes). In\n"
12886
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12888
"to be open-ended, that is, they include one end but not the other. For "
12890
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12892
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12894
"3649, but not 3647."
12897
#: en/help_topics/revisionspec.txt:28
12898
msgid "The keywords used as revision selection methods are the following:"
12901
#: en/help_topics/revisionspec.txt:30
12904
"\tSelects a revision using the revision id.\n"
12906
"\tSelects a common ancestor with the submit branch.\n"
12908
"\tSelects a common ancestor with a second branch.\n"
12910
"\tSelects a revision on the basis of a datestamp.\n"
12912
"\tSelects the last revision of a specified branch.\n"
12914
"\tSelects a revision identified by a tag name.\n"
12916
"\tSelects a revision using a number.\n"
12918
"\tSelects the parent of the revision specified.\n"
12920
"\tSelect the revision that last modified the specified line.\n"
12922
"\tSelect mainline revision that merged the specified revision.\n"
12924
"\tSelects the nth revision from the end."
12927
#: en/help_topics/revisionspec.txt:53
12928
msgid "In addition, plugins can provide other keywords."
12931
#: en/help_topics/revisionspec.txt:55
12932
msgid "A detailed description of each keyword is given below."
12935
#: en/help_topics/revisionspec.txt:57
12939
#: en/help_topics/revisionspec.txt:59
12941
" Supply a specific revision id, that can be used to specify any\n"
12942
" revision id in the ancestry of the branch.\n"
12943
" Including merges, and pending merges.\n"
12947
#: en/help_topics/revisionspec.txt:64
12949
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12952
#: en/help_topics/revisionspec.txt:66
12956
#: en/help_topics/revisionspec.txt:68
12958
" Diffing against this shows all the changes that were made in this "
12960
" and is a good predictor of what merge will do. The submit branch is\n"
12961
" used by the bundle and merge directive commands. If no submit branch\n"
12962
" is specified, the parent branch is used instead."
12965
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12967
" The common ancestor is the last revision that existed in both\n"
12968
" branches. Usually this is the branch point, but it could also be\n"
12969
" a revision that was merged."
12972
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12973
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12974
#: en/help_topics/revisionspec.txt:153
12975
msgid " Examples::"
12976
msgstr " Beispiele::"
12978
#: en/help_topics/revisionspec.txt:79
12979
msgid " $ bzr diff -r submit:"
12980
msgstr " $ bzr diff -r submit:"
12982
#: en/help_topics/revisionspec.txt:81
12984
msgstr ":ancestor:"
12986
#: en/help_topics/revisionspec.txt:83
12987
msgid " Supply the path to a branch to select the common ancestor."
12990
#: en/help_topics/revisionspec.txt:89
12992
" This is frequently used with 'diff' to return all of the changes\n"
12993
" that your branch introduces, while excluding the changes that you\n"
12994
" have not merged from the remote branch."
12997
#: en/help_topics/revisionspec.txt:95
12999
" ancestor:/path/to/branch\n"
13000
" $ bzr diff -r ancestor:../../mainline/branch"
13003
#: en/help_topics/revisionspec.txt:98
13007
#: en/help_topics/revisionspec.txt:100
13009
" Supply a datestamp to select the first revision that matches the date.\n"
13010
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13011
" Matches the first entry after a given date (either at midnight or\n"
13012
" at a specified time)."
13015
#: en/help_topics/revisionspec.txt:105
13016
msgid " One way to display all the changes since yesterday would be::"
13017
msgstr " Eine Möglichkeit, alle Änderungen seit gestern anzuzeigen wäre:"
13019
#: en/help_topics/revisionspec.txt:107
13020
msgid " bzr log -r date:yesterday.."
13021
msgstr " bzr log -r date:yesterday.."
13023
#: en/help_topics/revisionspec.txt:111
13025
" date:yesterday -> select the first revision since "
13027
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13028
" August 14th, 2006 at 5:10pm."
13031
#: en/help_topics/revisionspec.txt:115
13035
#: en/help_topics/revisionspec.txt:117
13036
msgid " Supply the path to a branch to select its last revision."
13039
#: en/help_topics/revisionspec.txt:121
13040
msgid " branch:/path/to/branch"
13041
msgstr " branch:/pfad/zur/branch"
13043
#: en/help_topics/revisionspec.txt:123
13047
#: en/help_topics/revisionspec.txt:125
13048
msgid " Tags are stored in the branch and created by the 'tag' command."
13051
#: en/help_topics/revisionspec.txt:127
13055
#: en/help_topics/revisionspec.txt:129
13057
" Use an integer to specify a revision in the history of the branch.\n"
13058
" Optionally a branch can be specified. A negative number will count\n"
13059
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13060
" one). If the negative number is larger than the branch's history, the\n"
13061
" first revision is returned.\n"
13065
#: en/help_topics/revisionspec.txt:136
13067
" revno:1 -> return the first revision of this branch\n"
13068
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13069
" the branch '/path/to/branch'\n"
13070
" revno:-1 -> The last revision in a branch.\n"
13071
" -2:http://other/branch -> The second to last revision in the\n"
13072
" remote branch.\n"
13073
" -1000000 -> Most likely the first revision, unless\n"
13074
" your history is very long."
13077
#: en/help_topics/revisionspec.txt:145
13081
#: en/help_topics/revisionspec.txt:147
13083
" Supply any revision spec to return the parent of that revision. This "
13085
" mostly useful when inspecting revisions that are not in the revision "
13090
#: en/help_topics/revisionspec.txt:151
13092
" It is an error to request the parent of the null revision (before:0)."
13095
#: en/help_topics/revisionspec.txt:155
13097
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13098
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13099
" aaaa@bbbb-1234567890\n"
13100
" bzr diff -r before:1913..1913\n"
13101
" -> Find the changes between revision 1913 and its parent "
13103
" (What changes did revision 1913 introduce).\n"
13104
" This is equivalent to: bzr diff -c 1913"
13107
#: en/help_topics/revisionspec.txt:163
13109
msgstr ":annotate:"
13111
#: en/help_topics/revisionspec.txt:165
13113
" Select the revision that last modified the specified line. Line is\n"
13114
" specified as path:number. Path is a relative path to the file. "
13116
" start at 1, and are relative to the current version, not the last-\n"
13117
" committed version of the file."
13120
#: en/help_topics/revisionspec.txt:170
13122
msgstr ":mainline:"
13124
#: en/help_topics/revisionspec.txt:172
13126
" Select the revision that merged the specified revision into mainline."
13129
#: en/help_topics/revisionspec.txt:174
13133
#: en/help_topics/revisionspec.txt:176
13135
" Supply a positive number to get the nth revision from the end.\n"
13136
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13140
#: en/help_topics/revisionspec.txt:180
13142
" last:1 -> return the last revision\n"
13143
" last:3 -> return the revision 2 before the end.\n"
13145
" last:1 -> Gibt die letzte Version zurück\n"
13146
" last:3 -> Gibt die Version zwei vor dem Ende zurück\n"
13148
#: en/help_topics/rules.txt:1
13156
#: en/help_topics/rules.txt:7
13158
"Rules are defined in ini file format where the sections are file glob\n"
13159
"patterns and the contents of each section are the preferences for files\n"
13160
"matching that pattern(s). For example::"
13163
#: en/help_topics/rules.txt:11
13169
#: en/help_topics/rules.txt:14
13171
" [name *.html *.xml]\n"
13172
" keywords = xml_escape"
13175
#: en/help_topics/rules.txt:17
13177
"Preferences like these are useful for commands and plugins wishing to\n"
13178
"provide custom behaviour for selected files. For more information on \n"
13179
"end of line conversion see :doc:`eol-help`.\n"
13180
"Keyword support is provided by the `keywords plugin\n"
13181
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13184
#: en/help_topics/rules.txt:23
13192
#: en/help_topics/rules.txt:26
13194
"Default rules for all branches are defined in the optional file\n"
13195
"``BZR_HOME/rules``. "
13198
#: en/help_topics/rules.txt:29
13206
#: en/help_topics/rules.txt:32
13208
"Patterns are ordered and searching stops as soon as one matches.\n"
13209
"As a consequence, more explicit patterns should be placed towards\n"
13210
"the top of the file. Rule patterns use exactly the same conventions\n"
13211
"as ignore patterns. See :doc:`patterns-help` for details."
13214
#: en/help_topics/rules.txt:37
13218
#: en/help_topics/rules.txt:39
13220
" Patterns containing square brackets or spaces should be\n"
13221
" surrounded in quotes to ensure they are correctly parsed.\n"
13224
#: en/help_topics/topics.txt:1
13226
"authentication Information on configuring authentication\n"
13227
"basic Basic commands\n"
13228
"branches Information on what a branch is\n"
13229
"bugs Bug tracker settings\n"
13230
"checkouts Information on what a checkout is\n"
13231
"commands Basic help for all commands\n"
13232
"configuration Details on the configuration settings available\n"
13233
"conflict-types Types of conflicts and what to do about them\n"
13234
"content-filters Conversion of content into/from working trees\n"
13235
"criss-cross Information on criss-cross merging\n"
13236
"current-formats Current storage formats\n"
13237
"debug-flags Options to show or record debug information\n"
13238
"diverged-branches How to fix diverged branches\n"
13239
"env-variables Environment variable names and values\n"
13240
"eol Information on end-of-line handling\n"
13241
"files Information on configuration and log files\n"
13242
"formats Information on choosing a storage format\n"
13243
"global-options Options that control how Bazaar runs\n"
13244
"hidden-commands All hidden commands\n"
13245
"hooks Points at which custom processing can be added\n"
13246
"launchpad Using Bazaar with Launchpad.net\n"
13247
"location-alias Aliases for remembered locations\n"
13248
"log-formats Details on the logging formats available\n"
13249
"other-formats Experimental and deprecated storage formats\n"
13250
"patterns Information on the pattern syntax\n"
13251
"repositories Basic information on shared repositories.\n"
13252
"revisionspec Explain how to use --revision\n"
13253
"rules Information on defining rule-based preferences\n"
13254
"standalone-trees Information on what a standalone tree is\n"
13255
"standard-options Options that can be used with any command\n"
13256
"status-flags Help on status flags\n"
13257
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13258
"topics Topics list\n"
13259
"url-special-chars Special character handling in URLs\n"
13260
"urlspec Supported transport protocols\n"
13261
"working-trees Information on working trees\n"
13264
#: en/help_topics/url-special-chars.txt:1
13266
"Special character handling in URLs\n"
13267
"=================================="
13270
#: en/help_topics/url-special-chars.txt:4
13271
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13274
#: en/help_topics/url-special-chars.txt:6
13275
msgid " * Fully qualified URLs"
13278
#: en/help_topics/url-special-chars.txt:8
13279
msgid " * File system paths, relative or absolute"
13282
#: en/help_topics/url-special-chars.txt:10
13284
"Internally bzr treats all locations as URLs. For any file system paths\n"
13285
"that are specified it will automatically determine the appropriate URL\n"
13286
"representation, and escape special characters where necessary."
13289
#: en/help_topics/url-special-chars.txt:14
13291
"There are a few characters which have special meaning in URLs and need "
13293
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13294
"value in URLs. Any non-ASCII characters in a file path will automatically "
13296
"urlencoded when the path is converted to a URL."
13299
#: en/help_topics/url-special-chars.txt:19
13301
"URLs represent non-ASCII characters in an encoding defined by the server, "
13303
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13305
"generous in what it accepts as a URL and to print them in a way that\n"
13306
"will be readable."
13309
#: en/help_topics/url-special-chars.txt:24
13311
"For example, if you have a directory named '/tmp/%2False' these are all "
13313
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13317
#: en/help_topics/url-special-chars.txt:27
13320
" bzr log /tmp/%2False\n"
13321
" bzr log %2False\n"
13322
" bzr log file:///tmp/%252False\n"
13323
" bzr log file://localhost/tmp/%252False\n"
13324
" bzr log file:%252False"
13327
" bzr log /tmp/%2False\n"
13328
" bzr log %2False\n"
13329
" bzr log file:///tmp/%252False\n"
13330
" bzr log file://localhost/tmp/%252False\n"
13331
" bzr log file:%252False"
13333
#: en/help_topics/url-special-chars.txt:34
13334
msgid "These are valid but do not refer to the same file::"
13337
#: en/help_topics/url-special-chars.txt:36
13339
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13340
" bzr log %252False (refers to a file called /tmp/%252False)"
13343
#: en/help_topics/url-special-chars.txt:39
13345
"Comma also has special meaning in URLs, because it denotes `segment "
13348
"Kommatas haben eine spezielle Bedeutung in URLs und markieren "
13349
"`Abschnittparameter`_"
13351
#: en/help_topics/url-special-chars.txt:41
13353
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13356
#: en/help_topics/url-special-chars.txt:43
13358
"Comma is also special in any file system paths that are specified. To use a "
13360
"comma in a file system path, specify a URL and URL encode the comma::"
13363
#: en/help_topics/url-special-chars.txt:46
13365
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
13366
"\" set to \"bla\"\n"
13367
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13368
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
13369
"\" set to \"bla\"\n"
13372
#: en/help_topics/urlspec.txt:1
13373
msgid "URL Identifiers"
13376
#: en/help_topics/urlspec.txt:3
13377
msgid "Supported URL prefixes::"
13378
msgstr "Unterstützte URL-Präfixe::"
13380
#: en/help_topics/urlspec.txt:5
13382
" aftp:// Access using active FTP.\n"
13383
" bzr:// Fast access using the Bazaar smart server.\n"
13384
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13385
" file:// Access using the standard filesystem (default)\n"
13386
" ftp:// Access using passive FTP.\n"
13387
" http:// Read-only access of branches exported on the web.\n"
13388
" https:// Read-only access of branches exported on the web using "
13390
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13393
#: en/help_topics/urlspec.txt:14
13394
msgid "Supported modifiers::"
13395
msgstr "Unterstützte Modifikatoren::"
13397
#: en/help_topics/urlspec.txt:16
13398
msgid " gio+ Access using any GIO supported protocols."
13401
#: en/help_topics/urlspec.txt:18
13402
msgid "Bazaar supports all of the standard parts within the URL::"
13405
#: en/help_topics/urlspec.txt:20
13406
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13409
#: en/help_topics/urlspec.txt:22
13410
msgid "allowing URLs such as::"
13413
#: en/help_topics/urlspec.txt:24
13414
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13415
msgstr " http://bzruser:BadPass@bzr.beispiel.de:8080/bzr/trunk"
13417
#: en/help_topics/urlspec.txt:26
13419
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13420
"with '~' as meaning that the rest of the path should be interpreted\n"
13421
"relative to the remote user's home directory. For example if the user\n"
13422
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13423
"shell.example.com, then::"
13426
#: en/help_topics/urlspec.txt:32
13427
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13428
msgstr " bzr+ssh://remote@shell.beispiel.de/~/meinprojekt/trunk"
13430
#: en/help_topics/urlspec.txt:34
13431
msgid "would refer to ``/home/remote/myproject/trunk``."
13432
msgstr "Würde verweisen auf »/home/remote/meinprojekt/trunk«."
13434
#: en/help_topics/urlspec.txt:36
13436
"Many commands that accept URLs also accept location aliases too.\n"
13437
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13439
"Viele Kommandos die URLs akzeptieren, akzeptieren auch Platzaliase.\n"
13440
"Siehe :doc:`location-alias-help` und :doc:`url-special-chars-help`.\n"