~ubuntu-branches/ubuntu/raring/language-pack-de/raring-proposed
» Revision
187
: data/de/LC_MESSAGES/bzr.po
« back to all changes in this revision
Viewing changes to data/de/LC_MESSAGES/bzr.po
- browse files at revision 187
- compare with another revision
- download diff
- download tarball
- view history from revision 187
- Committer: Package Import Robot
- Author(s): Ubuntu automatic language-pack builder
- Date: 2013-04-19 08:37:19 UTC
- Revision ID: package-import@ubuntu.com-20130419083719-cq7m1l1nsscdfojx
Tags: 1:13.04+20130418
Initial release.
- files removed:
- data/de
- data/de/LC_MESSAGES
- files modified:
- debian/changelog
added
removed
data/de/LC_MESSAGES/bzr.po
1
# German translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2013-02-18 09:15+0000\n"
12
"Last-Translator: Hendrik Knackstedt <Unknown>\n"
13
"Language-Team: German <de@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2013-04-11 11:03+0000\n"
19
"X-Generator: Launchpad (build 16550)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "Überspringe {0} (Größer als {1} von {2} Bytes)"
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr "Entstapeln"
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "In Revision %d hochgeladen."
33
34
#: bzrlib/branch.py:2957
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d Schlüsselwort aktualisiert."
39
msgstr[1] "%d Schlüsselwörter aktualisiert."
40
41
#: bzrlib/branch.py:2960
42
msgid "No new revisions or tags to push."
43
msgstr "Keine neuen Revisionen oder Schlüsselwörter zum Hochladen."
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr "Keine neuen Revisionen zum Hochladen."
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr "überprüfter Zweig {0} Format {1}"
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr "Fehler gefunden: %s"
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignoriere Dateien außerhalb der Ansicht. Die Ansicht ist %s"
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision benötigt genau eine Revisions-Nummer"
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr "Zeige Status-Zusammenfassung an."
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Dies zeigt versionierte und unbekannte Dateien an –\n"
78
"nach Zuständen gruppiert. Mögliche Zustände:"
79
80
#: bzrlib/builtins.py:320
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"hinzugefügt\n"
86
" In der Arbeitskopie versioniert, jedoch nicht in der vorherigen Revision."
87
88
#: bzrlib/builtins.py:323
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"entfernt\n"
95
" In der vorherigen Revision versioniert, jedoch entfernt oder aus der\n"
96
" Arbeitskopie gelöscht."
97
98
#: bzrlib/builtins.py:327
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"umbenannt\n"
106
" Pfad dieser Datei unterscheidet sich von der vorigen Revision;\n"
107
" der Text hat sich evtl. auch geändert. Das betrifft die Dateien, deren\n"
108
" übergeordneter Ordner umbenannt wurde."
109
110
#: bzrlib/builtins.py:332
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr "verändert"
115
116
#: bzrlib/builtins.py:335
117
msgid ""
118
"kind changed\n"
119
" File kind has been changed (e.g. from file to directory)."
120
msgstr ""
121
"Dateiart wurde geändert\n"
122
" Dateiart hat sich geändert (z.B. von Datei zu Verzeichnis)"
123
124
#: bzrlib/builtins.py:338
125
msgid ""
126
"unknown\n"
127
" Not versioned and not matching an ignore pattern."
128
msgstr ""
129
"unbekannt\n"
130
" Nicht versioniert und stimmt nicht mit einem Ignorierungsmuster überein."
131
132
#: bzrlib/builtins.py:341
133
msgid ""
134
"Additionally for directories, symlinks and files with a changed\n"
135
"executable bit, Bazaar indicates their type using a trailing\n"
136
"character: '/', '@' or '*' respectively. These decorations can be\n"
137
"disabled using the '--no-classify' option."
138
msgstr ""
139
"Für Verzeichnisse, Symbolische Verweise sowie Dateien\n"
140
"mit veränderter Ausführungsberechtigung zeigt Bazaar\n"
141
"den Typ zusätzlich durch ein angehängtes Zeichen\n"
142
"»/«, »@« oder »*« an. Diese Kennzeichnung kann mit der Option\n"
143
"»--no-classify« unterbunden werden."
144
145
#: bzrlib/builtins.py:346
146
msgid ""
147
"To see ignored files use 'bzr ignored'. For details on the\n"
148
"changes to file texts, use 'bzr diff'."
149
msgstr ""
150
"Mit »bzr ignored« werden ignorierte Dateien aufgelistet.\n"
151
"Änderungen an den Dateiinhalten werden mit »bzr diff« angezeigt."
152
153
#: bzrlib/builtins.py:349
154
msgid ""
155
"Note that --short or -S gives status flags for each item, similar\n"
156
"to Subversion's status command. To get output similar to svn -q,\n"
157
"use bzr status -SV."
158
msgstr ""
159
"Beachten Sie, dass --short oder -S für jedes Element eine\n"
160
"Statusmarkierung anzeigt, ähnlich des Statusbefehls von\n"
161
"Subversion. Um eine mit svn -q vergleichbare Ausgabe zu\n"
162
"erhalten, verwenden Sie bzr status -SV."
163
164
#: bzrlib/builtins.py:353
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"Wenn keine Argumente angegeben wurden, wird der Status des\n"
172
"gesamten Arbeitsverzeichnisses angezeigt, andernfalls nur der\n"
173
"Status der angegebenen Dateien und Verzeichnisse. Wenn ein\n"
174
"Verzeichnis angegeben wurde, wird der Status aller darin\n"
175
"enthaltenen Elemente aufgelistet."
176
177
#: bzrlib/builtins.py:358
178
msgid ""
179
"Before merges are committed, the pending merge tip revisions are\n"
180
"shown. To see all pending merge revisions, use the -v option.\n"
181
"To skip the display of pending merge information altogether, use\n"
182
"the no-pending option or specify a file/directory."
183
msgstr ""
184
"Bevor Änderungen übertragen werden, wird für jede ausstehende\n"
185
"Zusammenführung die neueste Revision angezeigt. Mit der Option\n"
186
"-v werden alle ausstehenden Revisionen angezeigt. Um die\n"
187
"Informationen über ausstehende Zusammenführungen komplett\n"
188
"zu unterdrücken kann die Option no-pending verwendet oder\n"
189
"eine Datei oder ein Verzeichnis angegeben werden."
190
191
#: bzrlib/builtins.py:363
192
msgid ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
msgstr ""
196
"Um das Arbeitsverzeichnis mit einer bestimmten Revision zu vergleichen,\n"
197
"geben Sie eine einzelne Revision mit dem Argument \"revision\" an."
198
199
#: bzrlib/builtins.py:366
200
msgid ""
201
"To see which files have changed in a specific revision, or between\n"
202
"two revisions, pass a revision range to the revision argument.\n"
203
"This will produce the same results as calling 'bzr diff --summarize'."
204
msgstr ""
205
"Um zu sehen, welche Dateien in einer bestimmten Revision\n"
206
"oder zwischen zwei Revisionen verändert wurden,\n"
207
"geben Sie einen Revisionebereich mit dem Argument \"revision\" an.\n"
208
"Dies erzeugt das gleiche Ergebnis wie der Aufruf 'bzr diff --summarize'."
209
210
#: bzrlib/builtins.py:375
211
msgid "Use short status indicators."
212
msgstr "Kurze Zustandsanzeiger verwenden."
213
214
#: bzrlib/builtins.py:377
215
msgid "Only show versioned files."
216
msgstr "Nur versionierte Dateien anzeigen."
217
218
#: bzrlib/builtins.py:379
219
msgid "Don't show pending merges."
220
msgstr "Ausstehende Zusammenführungen nicht anzeigen."
221
222
#: bzrlib/builtins.py:382
223
msgid "Do not mark object type using indicator."
224
msgstr "Objekte nicht entsprechend ihres Typs kennzeichnen."
225
226
#: bzrlib/builtins.py:397
227
msgid "bzr status --revision takes exactly one or two revision specifiers"
228
msgstr ""
229
"bzr status --revision benötigt exakt eine oder zwei "
230
"Revisionsspezifikation(en)."
231
232
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
233
msgid "You can only supply one of revision_id or --revision"
234
msgstr "Sie können nur revision_id oder --revision angeben"
235
236
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
237
msgid "You must supply either --revision or a revision_id"
238
msgstr "Sie müssen entweder --revision oder eine revision_id angeben"
239
240
#: bzrlib/builtins.py:451
241
#, python-format
242
msgid "Repository %r does not support access to raw revision texts"
243
msgstr "Quelle %r unterstützt keinen Zugriff auf reine Revisionstexte"
244
245
#: bzrlib/builtins.py:462
246
msgid "The repository {0} contains no revision {1}."
247
msgstr "Die Quelle {0} enthält keine neue Überarbeitung {1}."
248
249
#: bzrlib/builtins.py:469
250
msgid "You cannot specify a NULL revision."
251
msgstr "Sie können keine NULL-Revision angeben."
252
253
#: bzrlib/builtins.py:561
254
msgid "Remove the working tree from a given branch/checkout."
255
msgstr "Entfernt den Arbeitsbaum zu einer Branch/einem Checkout."
256
257
#: bzrlib/builtins.py:563
258
msgid ""
259
"Since a lightweight checkout is little more than a working tree\n"
260
"this will refuse to run against one."
261
msgstr ""
262
263
#: bzrlib/builtins.py:566
264
msgid "To re-create the working tree, use \"bzr checkout\"."
265
msgstr "Benutzen Sie »bzr checkout«, um den Arbeitsbaum neu aufzubauen."
266
267
#: bzrlib/builtins.py:572
268
msgid ""
269
"Remove the working tree even if it has uncommitted or shelved changes."
270
msgstr ""
271
"Den Arbeitsbaum entfernen, auch wenn dieser nicht übertragene oder "
272
"zurückgestellte Änderungen enthält."
273
274
#: bzrlib/builtins.py:586
275
msgid "No working tree to remove"
276
msgstr "Keinen Arbeitsbaum zum Entfernen"
277
278
#: bzrlib/builtins.py:588
279
msgid "You cannot remove the working tree of a remote path"
280
msgstr "Sie können einen entfernten Arbeitsbaum nicht löschen"
281
282
#: bzrlib/builtins.py:597
283
msgid "You cannot remove the working tree from a lightweight checkout"
284
msgstr "Entfernen des Arbeitsbaums von einem schlanken Abruf nicht möglich"
285
286
#: bzrlib/builtins.py:637
287
msgid ""
288
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
289
"instead. Use \"--force\" if you are sure you want to reset the working tree."
290
msgstr ""
291
"Der Baum scheint nicht beschädigt zu sein. Wahrscheinlich möchten Sie "
292
"stattdessen \"bzr revert\" ausführen. Benutzen Sie \"--force\", wenn Sie den "
293
"Arbeitsbaum wirklich zurücksetzen möchten."
294
295
#: bzrlib/builtins.py:648
296
msgid ""
297
", the header appears corrupt, try passing -r -1 to set the state to the last "
298
"commit"
299
msgstr ""
300
", die Kopfzeilen scheinen beschädigt zu sein. Versuchen Sie -r -1 um den "
301
"Status der letzten Einreichung zu übernehmen."
302
303
#: bzrlib/builtins.py:652
304
msgid "failed to reset the tree state{0}"
305
msgstr "Baumstatus{0} konnte nicht zurückgesetzt werden"
306
307
#: bzrlib/builtins.py:656
308
msgid "Show current revision number."
309
msgstr "Aktuelle Revisionsnummer anzeigen."
310
311
#: bzrlib/builtins.py:658
312
msgid "This is equal to the number of revisions on this branch."
313
msgstr "Entspricht der Anzahl der Revisionen in diesem Zweig."
314
315
#: bzrlib/builtins.py:671
316
msgid "--tree and --revision can not be used together"
317
msgstr "--tree und --revision können nicht zusammen verwendet werden."
318
319
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
320
msgid "Tags can only be placed on a single revision, not on a range"
321
msgstr ""
322
"Tags können nur einzelnen Revisionen zugewiesen werden, nicht mehreren"
323
324
#: bzrlib/builtins.py:712
325
msgid "Show revno of working tree."
326
msgstr "Revno des Arbeitsbaums anzeigen."
327
328
#: bzrlib/builtins.py:760
329
msgid "Add specified files or directories."
330
msgstr "Angegebene Dateien oder Verzeichnisse hinzufügen."
331
332
#: bzrlib/builtins.py:762
333
msgid ""
334
"In non-recursive mode, all the named items are added, regardless\n"
335
"of whether they were previously ignored. A warning is given if\n"
336
"any of the named files are already versioned."
337
msgstr ""
338
"Im nicht-rekursiven Modus werden alle Einträge mit Namen hinzugefügt,\n"
339
"auch wenn sie vorher ignoriert wurden. Es wird eine Warnung ausgegeben,\n"
340
"wenn eine der gewählten Dateien schon vorhanden ist."
341
342
#: bzrlib/builtins.py:766
343
msgid ""
344
"In recursive mode (the default), files are treated the same way\n"
345
"but the behaviour for directories is different. Directories that\n"
346
"are already versioned do not give a warning. All directories,\n"
347
"whether already versioned or not, are searched for files or\n"
348
"subdirectories that are neither versioned or ignored, and these\n"
349
"are added. This search proceeds recursively into versioned\n"
350
"directories. If no names are given '.' is assumed."
351
msgstr ""
352
"Im rekursiven Modus (Standard) werden Dateien auf die selbe Art und \n"
353
"Weise behandelt, aber das Verhalten für Ordner ist anders. Ordner, die\n"
354
"bereits versioniert wurden, erzeugen keine Warnung. Alle Ordner,\n"
355
"bereits versioniert oder nicht, werden nach Dateien und Unterordnern\n"
356
"durchsucht, die weder versioniert sind noch ignoriert werden, die dann\n"
357
"hinzugefügt werden. Diese Suche setzt sich rekursiv in versionierten\n"
358
"Ordnern fort. Wenn kein Name angegeben wurde, wird ».« angenommen."
359
360
#: bzrlib/builtins.py:774
361
msgid ""
362
"A warning will be printed when nested trees are encountered,\n"
363
"unless they are explicitly ignored."
364
msgstr ""
365
"Es wird eine Warnung ausgegebern, wenn verschachtelte Bäume auftreten,\n"
366
"es sei denn diese werden explizit ignoriert."
367
368
#: bzrlib/builtins.py:777
369
msgid ""
370
"Therefore simply saying 'bzr add' will version all files that\n"
371
"are currently unknown."
372
msgstr ""
373
"Einfach gesagt: »bzr add« versioniert alle Dateien,\n"
374
"die bisher unbekannt sind."
375
376
#: bzrlib/builtins.py:780
377
msgid ""
378
"Adding a file whose parent directory is not versioned will\n"
379
"implicitly add the parent, and so on up to the root. This means\n"
380
"you should never need to explicitly add a directory, they'll just\n"
381
"get added when you add a file in the directory."
382
msgstr ""
383
"Wird eine Datei hinzugefügt, deren übergeordneter Ordner noch nicht\n"
384
"versioniert wurde, wird dieser ebenfalls automatisch hinzugefügt.\n"
385
"Dies bedeutet, dass Sie niemals explizit einen Ordner hinzufügen\n"
386
"müssen, da dieser hinzugefügt wird, sobald Sie eine Datei aus diesem Ordner\n"
387
"hinzufügen."
388
389
#: bzrlib/builtins.py:785
390
msgid ""
391
"--dry-run will show which files would be added, but not actually\n"
392
"add them."
393
msgstr ""
394
"--dry-run zeigt die Dateien an, die hinzugefügt würden,\n"
395
"ohne diese wirklich hinzuzufügen."
396
397
#: bzrlib/builtins.py:788
398
msgid ""
399
"--file-ids-from will try to use the file ids from the supplied path.\n"
400
"It looks up ids trying to find a matching parent directory with the\n"
401
"same filename, and then by pure path. This option is rarely needed\n"
402
"but can be useful when adding the same logical file into two\n"
403
"branches that will be merged later (without showing the two different\n"
404
"adds as a conflict). It is also useful when merging another project\n"
405
"into a subdirectory of this one."
406
msgstr ""
407
408
#: bzrlib/builtins.py:796
409
msgid ""
410
"Any files matching patterns in the ignore list will not be added\n"
411
"unless they are explicitly mentioned."
412
msgstr ""
413
"Alle Dateien, die auf Muster in der Ignorierliste zutreffen, werden\n"
414
"nicht hinzugefügt, außer Sie geben diese explizit an."
415
416
#: bzrlib/builtins.py:799
417
msgid ""
418
"In recursive mode, files larger than the configuration option \n"
419
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
420
"to file size."
421
msgstr ""
422
"Im rekursiven Modus werden Dateien übersprungen, die größer als die "
423
"Einstellung \n"
424
"von add.maximum_file_size sind. Einträge mit Namen\n"
425
"werden niemals aufgrund ihrer Größe übersprungen."
426
427
#: bzrlib/builtins.py:806
428
msgid "Don't recursively add the contents of directories."
429
msgstr "Inhalte von Verzeichnissen nicht rekursiv hinzufügen."
430
431
#: bzrlib/builtins.py:813
432
msgid "Lookup file ids from this tree."
433
msgstr "Datei-IDs von diesem Baum nachschauen."
434
435
#: bzrlib/builtins.py:849
436
msgid "ignored {0} matching \"{1}\"\n"
437
msgstr "ignoriert {0} übereinstimmend \"{1}\"\n"
438
439
#: bzrlib/builtins.py:854
440
msgid "Create a new versioned directory."
441
msgstr "Ein neues versioniertes Verzeichnis erstellen."
442
443
#: bzrlib/builtins.py:856
444
msgid "This is equivalent to creating the directory and then adding it."
445
msgstr "Dies entspricht dem Anlegen und Hinzufügen des Ordners."
446
447
#: bzrlib/builtins.py:863
448
msgid "No error if existing, make parent directories as needed."
449
msgstr ""
450
"Kein Fehler, falls vorhanden, übergeordnete Verzeichnisse erstellen, falls "
451
"nötig."
452
453
#: bzrlib/builtins.py:897
454
#, python-format
455
msgid "added %s\n"
456
msgstr "%s hinzugefügt\n"
457
458
#: bzrlib/builtins.py:939
459
#, python-format
460
msgid "invalid kind %r specified"
461
msgstr "Ungültiger Typ %r angegeben"
462
463
#: bzrlib/builtins.py:976
464
msgid "Move or rename a file."
465
msgstr "Eine Datei verschieben oder umbenennen."
466
467
#: bzrlib/builtins.py:978
468
msgid " bzr mv SOURCE... DESTINATION"
469
msgstr " bzr mv QUELLE... ZIEL"
470
471
#: bzrlib/builtins.py:980
472
msgid ""
473
"If the last argument is a versioned directory, all the other names\n"
474
"are moved into it. Otherwise, there must be exactly two arguments\n"
475
"and the file is changed to a new name."
476
msgstr ""
477
"Wenn das letzte Argument ein versioniertes Verzeichnis ist, dann werden\n"
478
"alle anderen Namen in dieses verschoben. Ansonsten müssen es exakt 2\n"
479
"Argumente sein, und die Datei wird umbenannt."
480
481
#: bzrlib/builtins.py:984
482
msgid ""
483
"If OLDNAME does not exist on the filesystem but is versioned and\n"
484
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
485
"assumes that the file has been manually moved and only updates\n"
486
"its internal inventory to reflect that change.\n"
487
"The same is valid when moving many SOURCE files to a DESTINATION."
488
msgstr ""
489
490
#: bzrlib/builtins.py:990
491
msgid "Files cannot be moved between branches."
492
msgstr "Dateien können nicht zwischen Zweigen verschoben werden."
493
494
#: bzrlib/builtins.py:997
495
msgid ""
496
"Move only the bzr identifier of the file, because the file has already been "
497
"moved."
498
msgstr ""
499
"Verschiebe nur den bzr-Bezeichner der Datei, da diese bereits verschoben "
500
"wurde."
501
502
#: bzrlib/builtins.py:999
503
msgid "Automatically guess renames."
504
msgstr "Umbenennungen automatisch erraten"
505
506
#: bzrlib/builtins.py:1000
507
msgid "Avoid making changes when guessing renames."
508
msgstr "Keine Änderungen durchführen, wenn Umbenennungen erraten werden."
509
510
#: bzrlib/builtins.py:1009
511
msgid "--dry-run requires --auto."
512
msgstr "--dry-run erfordert --auto."
513
514
#: bzrlib/builtins.py:1013
515
msgid "missing file argument"
516
msgstr "Datei-Argument fehlt"
517
518
#: bzrlib/builtins.py:1017
519
msgid "can not move root of branch"
520
msgstr "Wurzel des Zweiges kann nicht verschoben werden"
521
522
#: bzrlib/builtins.py:1023
523
msgid "Only one path may be specified to --auto."
524
msgstr "Es kann nur ein Pfad mit --auto angegeben werden."
525
526
#: bzrlib/builtins.py:1026
527
msgid "--after cannot be specified with --auto."
528
msgstr "--after kann nicht mit --auto angegeben werden."
529
530
#: bzrlib/builtins.py:1062
531
msgid "to mv multiple files the destination must be a versioned directory"
532
msgstr ""
533
"um mehrere Dateien zu verschieben, muss das Ziel ein versioniertes "
534
"Verzeichnis sein"
535
536
#: bzrlib/builtins.py:1114
537
msgid "Turn this branch into a mirror of another branch."
538
msgstr "Diesen Zweig zu einer Spiegelung eines anderen Zweiges machen."
539
540
#: bzrlib/builtins.py:1116
541
msgid ""
542
"By default, this command only works on branches that have not diverged.\n"
543
"Branches are considered diverged if the destination branch's most recent \n"
544
"commit is one that has not been merged (directly or indirectly) into the \n"
545
"parent."
546
msgstr ""
547
548
#: bzrlib/builtins.py:1121
549
msgid ""
550
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
551
"from one into the other. Once one branch has merged, the other should\n"
552
"be able to pull it again."
553
msgstr ""
554
555
#: bzrlib/builtins.py:1125
556
msgid ""
557
"If you want to replace your local changes and just want your branch to\n"
558
"match the remote one, use pull --overwrite. This will work even if the two\n"
559
"branches have diverged."
560
msgstr ""
561
"Wenn Sie Ihre lokalen Änderungen ersetzen möchten und Ihr Zweig\n"
562
"nur mit dem entfernten Zweig übereinstimmen soll, nutzen Sie pull --"
563
"overwrite.\n"
564
"Das funktioniert auch, wenn zwei Zweige voneinander abweichen."
565
566
#: bzrlib/builtins.py:1129
567
msgid ""
568
"If there is no default location set, the first pull will set it (use\n"
569
"--no-remember to avoid setting it). After that, you can omit the\n"
570
"location to use the default. To change the default, use --remember. The\n"
571
"value will only be saved if the remote location can be accessed."
572
msgstr ""
573
574
#: bzrlib/builtins.py:1134
575
msgid ""
576
"The --verbose option will display the revisions pulled using the log_format\n"
577
"configuration option. You can use a different format by overriding it with\n"
578
"-Olog_format=<other_format>."
579
msgstr ""
580
581
#: bzrlib/builtins.py:1138
582
msgid ""
583
"Note: The location can be specified either in the form of a branch,\n"
584
"or in the form of a path to a file containing a merge directive generated\n"
585
"with bzr send."
586
msgstr ""
587
588
#: bzrlib/builtins.py:1146
589
msgid "Show logs of pulled revisions."
590
msgstr "Protokolle geladener Revisionen anzeigen."
591
592
#: bzrlib/builtins.py:1148
593
msgid ""
594
"Branch to pull into, rather than the one containing the working directory."
595
msgstr ""
596
597
#: bzrlib/builtins.py:1151
598
msgid ""
599
"Perform a local pull in a bound branch. Local pulls are not applied to the "
600
"master branch."
601
msgstr ""
602
603
#: bzrlib/builtins.py:1189
604
msgid "Need working tree for --show-base."
605
msgstr "Ein Arbeitsbaum wird für --show-base benötigt."
606
607
#: bzrlib/builtins.py:1205
608
msgid "No pull location known or specified."
609
msgstr ""
610
611
#: bzrlib/builtins.py:1211
612
#, python-format
613
msgid "Using saved parent location: %s\n"
614
msgstr "Gespeichertes übergeordnetes Verzeichnis wird verwendet: %s\n"
615
616
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
617
msgid "Cannot use -r with merge directives or bundles"
618
msgstr ""
619
620
#: bzrlib/builtins.py:1261
621
msgid "Update a mirror of this branch."
622
msgstr "Eine Spiegelung dieses Zweiges aktualisieren."
623
624
#: bzrlib/builtins.py:1263
625
msgid ""
626
"The target branch will not have its working tree populated because this\n"
627
"is both expensive, and is not supported on remote file systems."
628
msgstr ""
629
630
#: bzrlib/builtins.py:1266
631
msgid ""
632
"Some smart servers or protocols *may* put the working tree in place in\n"
633
"the future."
634
msgstr ""
635
"Einige intelligente Server oder Protokolle legen den Arbeitsbaum\n"
636
"*möglicherweise* in die Zukunft."
637
638
#: bzrlib/builtins.py:1269
639
msgid ""
640
"This command only works on branches that have not diverged. Branches are\n"
641
"considered diverged if the destination branch's most recent commit is one\n"
642
"that has not been merged (directly or indirectly) by the source branch."
643
msgstr ""
644
645
#: bzrlib/builtins.py:1273
646
msgid ""
647
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
648
"the other branch completely, discarding its unmerged changes."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1276
652
msgid ""
653
"If you want to ensure you have the different changes in the other branch,\n"
654
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
655
"After that you will be able to do a push without '--overwrite'."
656
msgstr ""
657
658
#: bzrlib/builtins.py:1280
659
msgid ""
660
"If there is no default push location set, the first push will set it (use\n"
661
"--no-remember to avoid setting it). After that, you can omit the\n"
662
"location to use the default. To change the default, use --remember. The\n"
663
"value will only be saved if the remote location can be accessed."
664
msgstr ""
665
666
#: bzrlib/builtins.py:1285
667
msgid ""
668
"The --verbose option will display the revisions pushed using the log_format\n"
669
"configuration option. You can use a different format by overriding it with\n"
670
"-Olog_format=<other_format>."
671
msgstr ""
672
673
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
674
msgid ""
675
"Branch to push from, rather than the one containing the working directory."
676
msgstr ""
677
"Der Zweig zum Hochladen, statt dem Zweig, der das Arbeitsverzeichnis enthält."
678
679
#: bzrlib/builtins.py:1299
680
msgid ""
681
"By default push will fail if the target directory exists, but does not "
682
"already have a control directory. This flag will allow push to proceed."
683
msgstr ""
684
685
#: bzrlib/builtins.py:1304
686
msgid ""
687
"Create a stacked branch that references the public location of the parent "
688
"branch."
689
msgstr ""
690
"Einen gestapelten Zweig anlegen, der auf den öffentlichen Pfad des "
691
"übergeordneten Zweigs referenziert."
692
693
#: bzrlib/builtins.py:1307
694
msgid ""
695
"Create a stacked branch that refers to another branch for the commit "
696
"history. Only the work not present in the referenced branch is included in "
697
"the branch created."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
701
msgid ""
702
"Refuse to push if there are uncommitted changes in the working tree, --no-"
703
"strict disables the check."
704
msgstr ""
705
"Hochladen verweigern, wenn Veränderungen in dem Arbeitsbaum noch nicht "
706
"eingereicht wurden, --no-strict deaktiviert die Überprüfung."
707
708
#: bzrlib/builtins.py:1315
709
msgid "Don't populate the working tree, even for protocols that support it."
710
msgstr ""
711
712
#: bzrlib/builtins.py:1318
713
msgid "Overwrite tags only."
714
msgstr "Nur Schlüsselwörter überschreiben."
715
716
#: bzrlib/builtins.py:1369
717
msgid "Could not determine branch to refer to."
718
msgstr ""
719
"Der Zweig, auf den Verwiesen werden soll, kann nicht bestimmt werden."
720
721
#: bzrlib/builtins.py:1378
722
#, python-format
723
msgid ""
724
"No push location known or specified. To push to the parent branch (at %s), "
725
"use 'bzr push :parent'."
726
msgstr ""
727
728
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
729
msgid "No push location known or specified."
730
msgstr "Kein Ort zum Hochladen bekannt oder nicht gewählt."
731
732
#: bzrlib/builtins.py:1388
733
#, python-format
734
msgid "Using saved push location: %s"
735
msgstr "Gespeichertes Verzeichnis zum Hochladen wird verwendet: %s"
736
737
#: bzrlib/builtins.py:1398
738
msgid "Create a new branch that is a copy of an existing branch."
739
msgstr ""
740
"Einen neuen Zweig erstellen, der eine Kopie eines vorhandenen Zweigs ist."
741
742
#: bzrlib/builtins.py:1400
743
msgid ""
744
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
745
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
746
"./bar.\n"
747
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
748
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
749
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
750
"create ./foo-bar."
751
msgstr ""
752
753
#: bzrlib/builtins.py:1407
754
msgid ""
755
"To retrieve the branch as of a particular revision, supply the --revision\n"
756
"parameter, as in \"branch foo/bar -r 5\"."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1410
760
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
761
msgstr "DIe Synonyme »clone« und »get« sind für diesen Befehl sind veraltet."
762
763
#: bzrlib/builtins.py:1420
764
msgid "Create a branch without a working-tree."
765
msgstr "Zweig ohne Arbeitsbaum erstellen."
766
767
#: bzrlib/builtins.py:1422
768
msgid "Switch the checkout in the current directory to the new branch."
769
msgstr ""
770
771
#: bzrlib/builtins.py:1425
772
msgid ""
773
"Create a stacked branch referring to the source branch. The new branch will "
774
"depend on the availability of the source branch for all operations."
775
msgstr ""
776
777
#: bzrlib/builtins.py:1429
778
msgid "Do not use a shared repository, even if available."
779
msgstr "Keine verteilte Quelle nutzen, auch wenn vorhanden."
780
781
#: bzrlib/builtins.py:1431
782
msgid ""
783
"By default branch will fail if the target directory exists, but does not "
784
"already have a control directory. This flag will allow branch to proceed."
785
msgstr ""
786
787
#: bzrlib/builtins.py:1436
788
msgid "Bind new branch to from location."
789
msgstr ""
790
791
#: bzrlib/builtins.py:1483
792
#, python-format
793
msgid "Target directory \"%s\" already exists."
794
msgstr "Zielverzeichnis »%s« ist schon vorhanden."
795
796
#: bzrlib/builtins.py:1495
797
#, python-format
798
msgid "Parent of \"%s\" does not exist."
799
msgstr "Übergeordntes Verzeichnis von »%s« ist nicht vorhanden."
800
801
#: bzrlib/builtins.py:1514
802
msgid "The branch {0} has no revision {1}."
803
msgstr "Der Zweig {0} hat keine Revision {1}."
804
805
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
806
#, python-format
807
msgid "Created new stacked branch referring to %s."
808
msgstr ""
809
810
#: bzrlib/builtins.py:1533
811
#, python-format
812
msgid "Branched %d revision."
813
msgid_plural "Branched %d revisions."
814
msgstr[0] ""
815
msgstr[1] ""
816
817
#: bzrlib/builtins.py:1538
818
#, python-format
819
msgid "New branch bound to %s"
820
msgstr ""
821
822
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
823
#, python-format
824
msgid "Switched to branch: %s"
825
msgstr "Zu Zweig gewechselt: %s"
826
827
#: bzrlib/builtins.py:1548
828
msgid "List the branches available at the current location."
829
msgstr "Die verfügbaren Zweige an der aktuellen Stelle auflisten."
830
831
#: bzrlib/builtins.py:1550
832
msgid ""
833
"This command will print the names of all the branches at the current\n"
834
"location."
835
msgstr ""
836
"Dieser Befehl wird die Namen aller verfügbaren Zweige\n"
837
"an der aktuellen Stelle auflisten."
838
839
#: bzrlib/builtins.py:1557
840
msgid ""
841
"Recursively scan for branches rather than just looking in the specified "
842
"location."
843
msgstr ""
844
"Rekursiv nach Zweigen suchen, statt nur an der angegebenen Stelle zu suchen."
845
846
#: bzrlib/builtins.py:1586
847
msgid "(default)"
848
msgstr "(Vorgabe)"
849
850
#: bzrlib/builtins.py:1598
851
msgid "Create a new checkout of an existing branch."
852
msgstr ""
853
854
#: bzrlib/builtins.py:1600
855
msgid ""
856
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
857
"for\n"
858
"the branch found in '.'. This is useful if you have removed the working "
859
"tree\n"
860
"or if it was never created - i.e. if you pushed the branch to its current\n"
861
"location using SFTP."
862
msgstr ""
863
864
#: bzrlib/builtins.py:1605
865
msgid ""
866
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
867
"will\n"
868
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
869
"./bar.\n"
870
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
871
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
872
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
873
"create ./foo-bar."
874
msgstr ""
875
876
#: bzrlib/builtins.py:1612
877
msgid ""
878
"To retrieve the branch as of a particular revision, supply the --revision\n"
879
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
880
"immediately\n"
881
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
882
"old\n"
883
"code.)"
884
msgstr ""
885
886
#: bzrlib/builtins.py:1622
887
msgid ""
888
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
889
"the branch for every operation. Normal checkouts can perform common "
890
"operations like diff and status without such access, and also support local "
891
"commits."
892
msgstr ""
893
894
#: bzrlib/builtins.py:1629
895
msgid "Get file contents from this tree."
896
msgstr ""
897
898
#: bzrlib/builtins.py:1631
899
msgid "Hard-link working tree files where possible."
900
msgstr ""
901
902
#: bzrlib/builtins.py:1672
903
msgid ""
904
"Show list of renamed files.\n"
905
" "
906
msgstr ""
907
"Liste der umbenannten Dateien zeigen.\n"
908
" "
909
910
#: bzrlib/builtins.py:1700
911
msgid "Update a working tree to a new revision."
912
msgstr ""
913
914
#: bzrlib/builtins.py:1702
915
msgid ""
916
"This will perform a merge of the destination revision (the tip of the\n"
917
"branch, or the specified revision) into the working tree, and then make\n"
918
"that revision the basis revision for the working tree. "
919
msgstr ""
920
921
#: bzrlib/builtins.py:1706
922
msgid ""
923
"You can use this to visit an older revision, or to update a working tree\n"
924
"that is out of date from its branch."
925
msgstr ""
926
927
#: bzrlib/builtins.py:1709
928
msgid ""
929
"If there are any uncommitted changes in the tree, they will be carried\n"
930
"across and remain as uncommitted changes after the update. To discard\n"
931
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
932
"with the changes brought in by the change in basis revision."
933
msgstr ""
934
935
#: bzrlib/builtins.py:1714
936
msgid ""
937
"If the tree's branch is bound to a master branch, bzr will also update\n"
938
"the branch from the master."
939
msgstr ""
940
941
#: bzrlib/builtins.py:1717
942
msgid ""
943
"You cannot update just a single file or directory, because each Bazaar\n"
944
"working tree has just a single basis revision. If you want to restore a\n"
945
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
946
"update'. If you want to restore a file to its state in a previous\n"
947
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
948
"out the old content of that file to a new location."
949
msgstr ""
950
951
#: bzrlib/builtins.py:1724
952
msgid ""
953
"The 'dir' argument, if given, must be the location of the root of a\n"
954
"working tree to update. By default, the working tree that contains the \n"
955
"current working directory is used."
956
msgstr ""
957
958
#: bzrlib/builtins.py:1740
959
msgid "bzr update --revision takes exactly one revision"
960
msgstr "bzr update --revision benötigt exakt eine Revision"
961
962
#: bzrlib/builtins.py:1748
963
msgid "bzr update can only update a whole tree, not a file or subdirectory"
964
msgstr ""
965
"bzr update kann nur den gesamten Baum aktualisieren, keine Datei oder kein "
966
"Unterverzeichnis."
967
968
#: bzrlib/builtins.py:1779
969
msgid "Tree is up to date at revision {0} of branch {1}"
970
msgstr "Baum ist auf den neusten Stand bei Revision {0} von Zweig {1}"
971
972
#: bzrlib/builtins.py:1795
973
#, python-format
974
msgid ""
975
"branch has no revision %s\n"
976
"bzr update --revision only works for a revision in the branch history"
977
msgstr ""
978
"Zweig hat keine Revision %s\n"
979
"bzr update --revision funktioniert nur mit einer Revision aus dem Verlauf "
980
"des Zweigs"
981
982
#: bzrlib/builtins.py:1801
983
msgid "Updated to revision {0} of branch {1}"
984
msgstr "Auf Revision {0} von Zweig {1} aktualisieren"
985
986
#: bzrlib/builtins.py:1805
987
msgid ""
988
"Your local commits will now show as pending merges with 'bzr status', and "
989
"can be committed with 'bzr commit'."
990
msgstr ""
991
992
#: bzrlib/builtins.py:1814
993
msgid "Show information about a working tree, branch or repository."
994
msgstr ""
995
996
#: bzrlib/builtins.py:1816
997
msgid ""
998
"This command will show all known locations and formats associated to the\n"
999
"tree, branch or repository."
1000
msgstr ""
1001
1002
#: bzrlib/builtins.py:1819
1003
msgid ""
1004
"In verbose mode, statistical information is included with each report.\n"
1005
"To see extended statistic information, use a verbosity level of 2 or\n"
1006
"higher by specifying the verbose option multiple times, e.g. -vv."
1007
msgstr ""
1008
1009
#: bzrlib/builtins.py:1823
1010
msgid "Branches and working trees will also report any missing revisions."
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1014
#: bzrlib/builtins.py:6466
1015
msgid ":Examples:"
1016
msgstr ":Beispiele:"
1017
1018
#: bzrlib/builtins.py:1827
1019
msgid " Display information on the format and related locations:"
1020
msgstr " Informationen über das Format und die dazugehörigen Orte anzeigen:"
1021
1022
#: bzrlib/builtins.py:1829
1023
msgid " bzr info"
1024
msgstr ""
1025
1026
#: bzrlib/builtins.py:1831
1027
msgid ""
1028
" Display the above together with extended format information and\n"
1029
" basic statistics (like the number of files in the working tree and\n"
1030
" number of revisions in the branch and repository):"
1031
msgstr ""
1032
1033
#: bzrlib/builtins.py:1835
1034
msgid " bzr info -v"
1035
msgstr " bzr info -v"
1036
1037
#: bzrlib/builtins.py:1837
1038
msgid " Display the above together with number of committers to the branch:"
1039
msgstr ""
1040
1041
#: bzrlib/builtins.py:1839
1042
msgid " bzr info -vv"
1043
msgstr " bzr info -vv"
1044
1045
#: bzrlib/builtins.py:1858
1046
msgid "Remove files or directories."
1047
msgstr "Dateien oder Verzeichnisse entfernen."
1048
1049
#: bzrlib/builtins.py:1860
1050
msgid ""
1051
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1052
"delete them if they can easily be recovered using revert otherwise they\n"
1053
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1054
"parameters are given Bazaar will scan for files that are being tracked by\n"
1055
"Bazaar but missing in your tree and stop tracking them for you."
1056
msgstr ""
1057
1058
#: bzrlib/builtins.py:1868
1059
msgid "Only remove files that have never been committed."
1060
msgstr "Nur Dateien entfernen, die niemals eingereicht wurden."
1061
1062
#: bzrlib/builtins.py:1870
1063
msgid "The file deletion mode to be used."
1064
msgstr "Der Datei-Löschmodus, der verwendet wird."
1065
1066
#: bzrlib/builtins.py:1871
1067
msgid "Deletion Strategy"
1068
msgstr "Lösch-Strategie"
1069
1070
#: bzrlib/builtins.py:1872
1071
msgid "Backup changed files (default)."
1072
msgstr "Geänderte Dateien sichern (Vorgabe)."
1073
1074
#: bzrlib/builtins.py:1873
1075
msgid "Delete from bzr but leave the working copy."
1076
msgstr "Aus bzr entfernen, aber die funktionierende Arbeitskopie erhalten."
1077
1078
#: bzrlib/builtins.py:1874
1079
msgid "Don't backup changed files."
1080
msgstr "Geänderte Dateien nicht sichern."
1081
1082
#: bzrlib/builtins.py:1875
1083
msgid ""
1084
"Delete all the specified files, even if they can not be recovered and even "
1085
"if they are non-empty directories. (deprecated, use no-backup)"
1086
msgstr ""
1087
"Alle spezifischen Dateien entfernen, auch wenn sie nicht wiederhergestellt "
1088
"werden können und wenn die Verzeichnisse nicht leer sind. (Veraltet, nutzen "
1089
"Sie no-backup)"
1090
1091
#: bzrlib/builtins.py:1884
1092
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1093
msgstr ""
1094
"(Die --force Option ist veraltet, nutzen Sie in Zukunft stattdessen --no-"
1095
"backup.)"
1096
1097
#: bzrlib/builtins.py:1901
1098
msgid "No matching files."
1099
msgstr "Keine zutreffenden Dateien."
1100
1101
#: bzrlib/builtins.py:1962
1102
msgid "Reconcile bzr metadata in a branch."
1103
msgstr ""
1104
1105
#: bzrlib/builtins.py:1964
1106
msgid ""
1107
"This can correct data mismatches that may have been caused by\n"
1108
"previous ghost operations or bzr upgrades. You should only\n"
1109
"need to run this command if 'bzr check' or a bzr developer\n"
1110
"advises you to run it."
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:1969
1114
msgid ""
1115
"If a second branch is provided, cross-branch reconciliation is\n"
1116
"also attempted, which will check that data like the tree root\n"
1117
"id which was not present in very early bzr versions is represented\n"
1118
"correctly in both branches."
1119
msgstr ""
1120
1121
#: bzrlib/builtins.py:1974
1122
msgid ""
1123
"At the same time it is run it may recompress data resulting in\n"
1124
"a potential saving in disk space or performance gain."
1125
msgstr ""
1126
"Es kann während der Ausführung Daten rekomprimieren, wodurch\n"
1127
"potentiell Speicherplatz gespart und die Performanz verbessert werden können."
1128
1129
#: bzrlib/builtins.py:1977
1130
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1131
msgstr ""
1132
"Der Zweig *MUSS* ein auflistbares System sein, wie z.B. eine lokale "
1133
"Festplatte oder stftp."
1134
1135
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1136
msgid ""
1137
"Format for the bzr 2.0 series.\n"
1138
"Uses group-compress storage.\n"
1139
"Provides rich roots which are a one-way transition.\n"
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1143
msgid ""
1144
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1145
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1146
msgstr ""
1147
1148
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1149
msgid "The 2a format with experimental support for colocated branches.\n"
1150
msgstr ""
1151
"Das 2a-Format mit experimenteller Unterstützung für gemeinsame Zweige.\n"
1152
1153
#: bzrlib/builtins.py:2045
1154
msgid "Make a directory into a versioned branch."
1155
msgstr "Ein Verzeichnis zu einem versionierten Entwicklungszweig machen."
1156
1157
#: bzrlib/builtins.py:2047
1158
msgid ""
1159
"Use this to create an empty branch, or before importing an\n"
1160
"existing project."
1161
msgstr ""
1162
"Nutzen Sie dies, um einen leeren Zweig zu erstellen, oder bevor\n"
1163
"ein vorhandenes Projekt importiert wird."
1164
1165
#: bzrlib/builtins.py:2050
1166
msgid ""
1167
"If there is a repository in a parent directory of the location, then\n"
1168
"the history of the branch will be stored in the repository. Otherwise\n"
1169
"init creates a standalone branch which carries its own history\n"
1170
"in the .bzr directory."
1171
msgstr ""
1172
1173
#: bzrlib/builtins.py:2055
1174
msgid ""
1175
"If there is already a branch at the location but it has no working tree,\n"
1176
"the tree can be populated with 'bzr checkout'."
1177
msgstr ""
1178
1179
#: bzrlib/builtins.py:2058
1180
msgid "Recipe for importing a tree of files::"
1181
msgstr "Rezept für das Importieren eines Dateibaumes::"
1182
1183
#: bzrlib/builtins.py:2060
1184
msgid ""
1185
" cd ~/project\n"
1186
" bzr init\n"
1187
" bzr add .\n"
1188
" bzr status\n"
1189
" bzr commit -m \"imported project\""
1190
msgstr ""
1191
" cd ~/Projekt\n"
1192
" bzr init\n"
1193
" bzr add .\n"
1194
" bzr status\n"
1195
" bzr commit -m »Importiertes Projekt«"
1196
1197
#: bzrlib/builtins.py:2071
1198
msgid ""
1199
"Create the path leading up to the branch if it does not already exist."
1200
msgstr "Den Pfad zum Zweig erzeugen, falls dieser noch nicht vorhanden ist."
1201
1202
#: bzrlib/builtins.py:2074
1203
msgid "Specify a format for this branch. See \"help formats\"."
1204
msgstr "Geben Sie ein Format für diesen Zweig an. Siehe »help formats«."
1205
1206
#: bzrlib/builtins.py:2082
1207
msgid ""
1208
"Never change revnos or the existing log. Append revisions to it only."
1209
msgstr ""
1210
"Revnos oder das vorhandene Protokoll niemals ändern. Revisionen nur am Ende "
1211
"hinzufügen."
1212
1213
#: bzrlib/builtins.py:2085
1214
msgid "Create a branch without a working tree."
1215
msgstr ""
1216
1217
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1218
#, python-format
1219
msgid ""
1220
"Parent directory of %s does not exist.\n"
1221
"You may supply --create-prefix to create all leading parent directories."
1222
msgstr ""
1223
1224
#: bzrlib/builtins.py:2139
1225
msgid ""
1226
"This branch format cannot be set to append-revisions-only. Try --default."
1227
msgstr ""
1228
1229
#: bzrlib/builtins.py:2150
1230
msgid "Created a {0} (format: {1})\n"
1231
msgstr "Ein {0} wurde erstellt (Format: {1})\n"
1232
1233
#: bzrlib/builtins.py:2159
1234
#, python-format
1235
msgid "Using shared repository: %s\n"
1236
msgstr ""
1237
1238
#: bzrlib/builtins.py:2163
1239
msgid "Create a shared repository for branches to share storage space."
1240
msgstr ""
1241
1242
#: bzrlib/builtins.py:2165
1243
msgid ""
1244
"New branches created under the repository directory will store their\n"
1245
"revisions in the repository, not in the branch directory. For branches\n"
1246
"with shared history, this reduces the amount of storage needed and \n"
1247
"speeds up the creation of new branches."
1248
msgstr ""
1249
1250
#: bzrlib/builtins.py:2170
1251
msgid ""
1252
"If the --no-trees option is given then the branches in the repository\n"
1253
"will not have working trees by default. They will still exist as \n"
1254
"directories on disk, but they will not have separate copies of the \n"
1255
"files at a certain revision. This can be useful for repositories that\n"
1256
"store branches which are interacted with through checkouts or remote\n"
1257
"branches, such as on a server."
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2177
1261
msgid ""
1262
":Examples:\n"
1263
" Create a shared repository holding just branches::"
1264
msgstr ""
1265
1266
#: bzrlib/builtins.py:2180
1267
msgid ""
1268
" bzr init-repo --no-trees repo\n"
1269
" bzr init repo/trunk"
1270
msgstr ""
1271
" bzr init-repo --no-trees repo\n"
1272
" bzr init repo/trunk"
1273
1274
#: bzrlib/builtins.py:2183
1275
msgid " Make a lightweight checkout elsewhere::"
1276
msgstr ""
1277
1278
#: bzrlib/builtins.py:2185
1279
msgid ""
1280
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1281
" cd trunk-checkout\n"
1282
" (add files here)"
1283
msgstr ""
1284
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1285
" cd trunk-checkout\n"
1286
" (Hier Dateien hinzufügen)"
1287
1288
#: bzrlib/builtins.py:2193
1289
msgid ""
1290
"Specify a format for this repository. See \"bzr help formats\" for details."
1291
msgstr ""
1292
1293
#: bzrlib/builtins.py:2197
1294
msgid "Repository format"
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2199
1298
msgid "Branches in the repository will default to not having a working tree."
1299
msgstr ""
1300
1301
#: bzrlib/builtins.py:2225
1302
msgid "Show differences in the working tree, between revisions or branches."
1303
msgstr ""
1304
1305
#: bzrlib/builtins.py:2227
1306
msgid ""
1307
"If no arguments are given, all changes for the current tree are listed.\n"
1308
"If files are given, only the changes in those files are listed.\n"
1309
"Remote and multiple branches can be compared by using the --old and\n"
1310
"--new options. If not provided, the default for both is derived from\n"
1311
"the first argument, if any, or the current tree if no arguments are\n"
1312
"given."
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2234
1316
msgid ""
1317
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1318
"produces patches suitable for \"patch -p1\"."
1319
msgstr ""
1320
"»bzr diff -p1« ist das gleiche wie »bzr diff --prefix alt/:neu/«\n"
1321
"und produziert angepasste Korrekturen für »patch -p1«."
1322
1323
#: bzrlib/builtins.py:2237
1324
msgid ""
1325
"Note that when using the -r argument with a range of revisions, the\n"
1326
"differences are computed between the two specified revisions. That\n"
1327
"is, the command does not show the changes introduced by the first \n"
1328
"revision in the range. This differs from the interpretation of \n"
1329
"revision ranges used by \"bzr log\" which includes the first revision\n"
1330
"in the range."
1331
msgstr ""
1332
1333
#: bzrlib/builtins.py:2244
1334
msgid ""
1335
":Exit values:\n"
1336
" 1 - changed\n"
1337
" 2 - unrepresentable changes\n"
1338
" 3 - error\n"
1339
" 0 - no change"
1340
msgstr ""
1341
":Rückgabewerte:\n"
1342
" 1 - Geändert\n"
1343
" 2 - Nicht darstellbare Änderungen\n"
1344
" 3 - Fehler\n"
1345
" 0 - Keine Änderungen"
1346
1347
#: bzrlib/builtins.py:2250
1348
msgid ""
1349
":Examples:\n"
1350
" Shows the difference in the working tree versus the last commit::"
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2253
1354
msgid " bzr diff"
1355
msgstr " bzr diff"
1356
1357
#: bzrlib/builtins.py:2255
1358
msgid " Difference between the working tree and revision 1::"
1359
msgstr ""
1360
1361
#: bzrlib/builtins.py:2257
1362
msgid " bzr diff -r1"
1363
msgstr " bzr diff -r1"
1364
1365
#: bzrlib/builtins.py:2259
1366
msgid " Difference between revision 3 and revision 1::"
1367
msgstr " Unterschied zwischen Revision 3 und Revision 1::"
1368
1369
#: bzrlib/builtins.py:2261
1370
msgid " bzr diff -r1..3"
1371
msgstr " bzr diff -r1..3"
1372
1373
#: bzrlib/builtins.py:2263
1374
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1375
msgstr " Unterschied zwischen Revision 3 und Revision 1 von Zweig xxx::"
1376
1377
#: bzrlib/builtins.py:2265
1378
msgid " bzr diff -r1..3 xxx"
1379
msgstr " bzr diff -r1..3 xxx"
1380
1381
#: bzrlib/builtins.py:2267
1382
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1383
msgstr " Die Änderungen von Revision 2 (äquivalent zu -r1..2)::"
1384
1385
#: bzrlib/builtins.py:2269
1386
msgid " bzr diff -c2"
1387
msgstr " bzr diff -c2"
1388
1389
#: bzrlib/builtins.py:2271
1390
msgid ""
1391
" To see the changes introduced by revision X::\n"
1392
" \n"
1393
" bzr diff -cX"
1394
msgstr ""
1395
" So erhalten Sie die Änderungen von Revision X::\n"
1396
" \n"
1397
" bzr diff -cX"
1398
1399
#: bzrlib/builtins.py:2275
1400
msgid ""
1401
" Note that in the case of a merge, the -c option shows the changes\n"
1402
" compared to the left hand parent. To see the changes against\n"
1403
" another parent, use::"
1404
msgstr ""
1405
1406
#: bzrlib/builtins.py:2279
1407
msgid " bzr diff -r<chosen_parent>..X"
1408
msgstr ""
1409
1410
#: bzrlib/builtins.py:2281
1411
msgid ""
1412
" The changes between the current revision and the previous revision\n"
1413
" (equivalent to -c-1 and -r-2..-1)"
1414
msgstr ""
1415
" Die Änderungen zwischen der gegenwärtigen Revision und der vorigen\n"
1416
" (äquivalent zu -c-1 und -r-2..-1)"
1417
1418
#: bzrlib/builtins.py:2284
1419
msgid " bzr diff -r-2.."
1420
msgstr " bzr diff -r-2.."
1421
1422
#: bzrlib/builtins.py:2286
1423
msgid " Show just the differences for file NEWS::"
1424
msgstr " Nur die Unterschiede für die Datei NEWS anzeigen::"
1425
1426
#: bzrlib/builtins.py:2288
1427
msgid " bzr diff NEWS"
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2290
1431
msgid " Show the differences in working tree xxx for file NEWS::"
1432
msgstr ""
1433
1434
#: bzrlib/builtins.py:2292
1435
msgid " bzr diff xxx/NEWS"
1436
msgstr ""
1437
1438
#: bzrlib/builtins.py:2294
1439
msgid " Show the differences from branch xxx to this working tree:"
1440
msgstr ""
1441
1442
#: bzrlib/builtins.py:2296
1443
msgid " bzr diff --old xxx"
1444
msgstr " bzr diff --old xxx"
1445
1446
#: bzrlib/builtins.py:2298
1447
msgid " Show the differences between two branches for file NEWS::"
1448
msgstr ""
1449
" Die Unterschiede zwischen zwei Zweigen für die Datei NEWS anzeigen::"
1450
1451
#: bzrlib/builtins.py:2300
1452
msgid " bzr diff --old xxx --new yyy NEWS"
1453
msgstr ""
1454
1455
#: bzrlib/builtins.py:2302
1456
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1457
msgstr ""
1458
1459
#: bzrlib/builtins.py:2304
1460
msgid ""
1461
" bzr diff --prefix old/:new/\n"
1462
" \n"
1463
" Show the differences using a custom diff program with options::\n"
1464
" \n"
1465
" bzr diff --using /usr/bin/diff --diff-options -wu"
1466
msgstr ""
1467
1468
#: bzrlib/builtins.py:2314
1469
msgid "Pass these options to the external diff program."
1470
msgstr "Diese Optionen an das externe Programm diff übergeben."
1471
1472
#: bzrlib/builtins.py:2317
1473
msgid ""
1474
"Set prefixes added to old and new filenames, as two values separated by a "
1475
"colon. (eg \"old/:new/\")."
1476
msgstr ""
1477
1478
#: bzrlib/builtins.py:2320
1479
msgid "Branch/tree to compare from."
1480
msgstr "Von Zweig/Baum vergleichen."
1481
1482
#: bzrlib/builtins.py:2324
1483
msgid "Branch/tree to compare to."
1484
msgstr "Mit Zweig/Baum vergleichen."
1485
1486
#: bzrlib/builtins.py:2330
1487
msgid "Use this command to compare files."
1488
msgstr "Diesen Befehl zum Vergleichen von Dateien benutzen."
1489
1490
#: bzrlib/builtins.py:2335
1491
msgid "Diff format to use."
1492
msgstr "Diff-Format, das benutzt werden soll."
1493
1494
#: bzrlib/builtins.py:2337
1495
msgid "Diff format"
1496
msgstr "Diff-Format"
1497
1498
#: bzrlib/builtins.py:2359
1499
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1500
msgstr ""
1501
"--prefix erwartet zwei Werte getrennt mit einem Doppelpunkt (z.B. "
1502
"»alt/:neu/«)"
1503
1504
#: bzrlib/builtins.py:2363
1505
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1506
msgstr ""
1507
"bzr diff --revision benötigt exakt ein oder zwei Revisions-Spezifikationen"
1508
1509
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1510
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1511
msgid "{0} and {1} are mutually exclusive"
1512
msgstr "{0} und {1} schließen sich gegenseitig aus"
1513
1514
#: bzrlib/builtins.py:2388
1515
msgid ""
1516
"List files deleted in the working tree.\n"
1517
" "
1518
msgstr ""
1519
1520
#: bzrlib/builtins.py:2465
1521
msgid "Show the tree root directory."
1522
msgstr "Den Wurzelverzeichnisbaum anzeigen."
1523
1524
#: bzrlib/builtins.py:2467
1525
msgid ""
1526
"The root is the nearest enclosing directory with a .bzr control\n"
1527
"directory."
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2482
1531
msgid "The limit argument must be an integer."
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2490
1535
msgid "The levels argument must be an integer."
1536
msgstr ""
1537
1538
#: bzrlib/builtins.py:2495
1539
msgid "Show historical log for a branch or subset of a branch."
1540
msgstr ""
1541
1542
#: bzrlib/builtins.py:2497
1543
msgid ""
1544
"log is bzr's default tool for exploring the history of a branch.\n"
1545
"The branch to use is taken from the first parameter. If no parameters\n"
1546
"are given, the branch containing the working directory is logged.\n"
1547
"Here are some simple examples::"
1548
msgstr ""
1549
1550
#: bzrlib/builtins.py:2502
1551
msgid ""
1552
" bzr log log the current branch\n"
1553
" bzr log foo.py log a file in its branch\n"
1554
" bzr log http://server/branch log a branch on a server"
1555
msgstr ""
1556
1557
#: bzrlib/builtins.py:2506
1558
msgid ""
1559
"The filtering, ordering and information shown for each revision can\n"
1560
"be controlled as explained below. By default, all revisions are\n"
1561
"shown sorted (topologically) so that newer revisions appear before\n"
1562
"older ones and descendants always appear before ancestors. If displayed,\n"
1563
"merged revisions are shown indented under the revision in which they\n"
1564
"were merged."
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2513
1568
msgid ":Output control:"
1569
msgstr ":Ausgabesteuerung:"
1570
1571
#: bzrlib/builtins.py:2515
1572
msgid ""
1573
" The log format controls how information about each revision is\n"
1574
" displayed. The standard log formats are called ``long``, ``short``\n"
1575
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1576
" for more details on log formats."
1577
msgstr ""
1578
" Das Protokoll-Format bestimmt wie Informationen zu jeder Revision\n"
1579
" angezeigt werden. Die Standard-Protokoll-Formate heißen ``long``,\n"
1580
" ``short`` und ``line``. Die Vorgabe ist ``long``.\n"
1581
" Siehe``bzr help log-formats`` für mehr Einzelheiten zu Protokoll-Formaten."
1582
1583
#: bzrlib/builtins.py:2520
1584
msgid ""
1585
" The following options can be used to control what information is\n"
1586
" displayed::"
1587
msgstr ""
1588
" Die folgenden Einstellungen können genutzt werden, um zu kontrollieren,\n"
1589
" welche Informationen angezeigt werden::"
1590
1591
#: bzrlib/builtins.py:2523
1592
msgid ""
1593
" -l N display a maximum of N revisions\n"
1594
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1595
" -v display a status summary (delta) for each revision\n"
1596
" -p display a diff (patch) for each revision\n"
1597
" --show-ids display revision-ids (and file-ids), not just revnos"
1598
msgstr ""
1599
" -l N Maximal N Revisionen anzeigen\n"
1600
" -n N N Revisionsstufen anzeigen (0 für alle, 1 für "
1601
"eingeklappte)\n"
1602
" -v Eine Status-Zusammenfassung (Delta) für jede Revision "
1603
"anzeigen\n"
1604
" -p Einen diff (Patch) für jede Revision anzeigen\n"
1605
" --show-ids Revision-ids (und file-ids) anzeigen, nicht nur revnos"
1606
1607
#: bzrlib/builtins.py:2529
1608
msgid ""
1609
" Note that the default number of levels to display is a function of the\n"
1610
" log format. If the -n option is not used, the standard log formats show\n"
1611
" just the top level (mainline)."
1612
msgstr ""
1613
" Beachten Sie, dass die Vorgabeanzahl zum Anzeigen von Stufen eine "
1614
"Funktion\n"
1615
" des Protokoll-Formats ist. Wenn die Option -n nicht genutzt wird, dann "
1616
"zeigen die\n"
1617
" Standard-Protokoll-Formate nur die oberste Stufe (mainline)."
1618
1619
#: bzrlib/builtins.py:2533
1620
msgid ""
1621
" Status summaries are shown using status flags like A, M, etc. To see\n"
1622
" the changes explained using words like ``added`` and ``modified``\n"
1623
" instead, use the -vv option."
1624
msgstr ""
1625
" Status-Zusammenfassungen werden mit Status-Markern wie A, M, usw.\n"
1626
" angezeigt. Nutzen Sie die Option -vv, um Änderungen durch\n"
1627
" Wörter wie ``added`` oder ``modified`` erklärt zu bekommen."
1628
1629
#: bzrlib/builtins.py:2537
1630
msgid ":Ordering control:"
1631
msgstr ":Sortierungssteuerung:"
1632
1633
#: bzrlib/builtins.py:2539
1634
msgid ""
1635
" To display revisions from oldest to newest, use the --forward option.\n"
1636
" In most cases, using this option will have little impact on the total\n"
1637
" time taken to produce a log, though --forward does not incrementally\n"
1638
" display revisions like --reverse does when it can."
1639
msgstr ""
1640
" Nutzen Sie die Option --forward, um Revisionen von den ältesten zu den "
1641
"neusten\n"
1642
" anzuzeigen. Der Gebrauch dieser Option hat meistens kleine\n"
1643
" Auswirkungen auf die Gesamtzeit, die benötigt wird, um ein Protokoll zu "
1644
"erstellen.\n"
1645
" Außerdem zeigt --forward Revisionen nicht inkrementell an, wie --reverse "
1646
"dies tut, falls möglich."
1647
1648
#: bzrlib/builtins.py:2544
1649
msgid ":Revision filtering:"
1650
msgstr ":Revision-Filtern:"
1651
1652
#: bzrlib/builtins.py:2546
1653
msgid ""
1654
" The -r option can be used to specify what revision or range of revisions\n"
1655
" to filter against. The various forms are shown below::"
1656
msgstr ""
1657
" Die Option -r kann genutzt werden, um eine Revision oder einen Bereich von "
1658
"Revisionen\n"
1659
" zu bestimmen, die/der gefiltert werden soll. Es gibt folgende verschiedene "
1660
"Formen::"
1661
1662
#: bzrlib/builtins.py:2549
1663
msgid ""
1664
" -rX display revision X\n"
1665
" -rX.. display revision X and later\n"
1666
" -r..Y display up to and including revision Y\n"
1667
" -rX..Y display from X to Y inclusive"
1668
msgstr ""
1669
" -rX Revision X anzeigen\n"
1670
" -rX.. Revision X und spätere anzeigen\n"
1671
" -r..Y Bis Revision Y (inklusive) anzeigen\n"
1672
" -rX..Y Von X bis Y (inklusive) anzeigen"
1673
1674
#: bzrlib/builtins.py:2554
1675
msgid ""
1676
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1677
" Some common examples are given below::"
1678
msgstr ""
1679
" Siehe ``bzr help revisionspec`` für Informationen dazu, wie X und Y "
1680
"angegeben werden.\n"
1681
" Es folgen ein paar allgemeine Beispiele::"
1682
1683
#: bzrlib/builtins.py:2557
1684
msgid ""
1685
" -r-1 show just the tip\n"
1686
" -r-10.. show the last 10 mainline revisions\n"
1687
" -rsubmit:.. show what's new on this branch\n"
1688
" -rancestor:path.. show changes since the common ancestor of this\n"
1689
" branch and the one at location path\n"
1690
" -rdate:yesterday.. show changes since yesterday"
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2564
1694
msgid ""
1695
" When logging a range of revisions using -rX..Y, log starts at\n"
1696
" revision Y and searches back in history through the primary\n"
1697
" (\"left-hand\") parents until it finds X. When logging just the\n"
1698
" top level (using -n1), an error is reported if X is not found\n"
1699
" along the way. If multi-level logging is used (-n0), X may be\n"
1700
" a nested merge revision and the log will be truncated accordingly."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2571
1704
msgid ":Path filtering:"
1705
msgstr ":Pfad-Filtern:"
1706
1707
#: bzrlib/builtins.py:2573
1708
msgid ""
1709
" If parameters are given and the first one is not a branch, the log\n"
1710
" will be filtered to show only those revisions that changed the\n"
1711
" nominated files or directories."
1712
msgstr ""
1713
1714
#: bzrlib/builtins.py:2577
1715
msgid ""
1716
" Filenames are interpreted within their historical context. To log a\n"
1717
" deleted file, specify a revision range so that the file existed at\n"
1718
" the end or start of the range."
1719
msgstr ""
1720
1721
#: bzrlib/builtins.py:2581
1722
msgid ""
1723
" Historical context is also important when interpreting pathnames of\n"
1724
" renamed files/directories. Consider the following example:"
1725
msgstr ""
1726
1727
#: bzrlib/builtins.py:2584
1728
msgid ""
1729
" * revision 1: add tutorial.txt\n"
1730
" * revision 2: modify tutorial.txt\n"
1731
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1732
msgstr ""
1733
1734
#: bzrlib/builtins.py:2588
1735
msgid " In this case:"
1736
msgstr " In diesem Fall:"
1737
1738
#: bzrlib/builtins.py:2590
1739
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1740
msgstr ""
1741
1742
#: bzrlib/builtins.py:2592
1743
msgid ""
1744
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2594
1748
msgid ""
1749
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1750
" the original file in revision 2."
1751
msgstr ""
1752
1753
#: bzrlib/builtins.py:2597
1754
msgid ""
1755
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1756
" was no file called guide.txt in revision 2."
1757
msgstr ""
1758
1759
#: bzrlib/builtins.py:2600
1760
msgid ""
1761
" Renames are always followed by log. By design, there is no need to\n"
1762
" explicitly ask for this (and no way to stop logging a file back\n"
1763
" until it was last renamed)."
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2604
1767
msgid ":Other filtering:"
1768
msgstr ":Anderes Filtern:"
1769
1770
#: bzrlib/builtins.py:2606
1771
msgid ""
1772
" The --match option can be used for finding revisions that match a\n"
1773
" regular expression in a commit message, committer, author or bug.\n"
1774
" Specifying the option several times will match any of the supplied\n"
1775
" expressions. --match-author, --match-bugs, --match-committer and\n"
1776
" --match-message can be used to only match a specific field."
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:2612
1780
msgid ":Tips & tricks:"
1781
msgstr ":Tipps & Tricks:"
1782
1783
#: bzrlib/builtins.py:2614
1784
msgid ""
1785
" GUI tools and IDEs are often better at exploring history than command\n"
1786
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1787
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1788
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1789
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1790
msgstr ""
1791
1792
#: bzrlib/builtins.py:2620
1793
msgid ""
1794
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1795
msgstr ""
1796
1797
#: bzrlib/builtins.py:2622
1798
msgid ""
1799
" [ALIASES]\n"
1800
" tip = log -r-1\n"
1801
" top = log -l10 --line\n"
1802
" show = log -v -p"
1803
msgstr ""
1804
1805
#: bzrlib/builtins.py:2627
1806
msgid ""
1807
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1808
" will show the last 10 mainline revisions. To see the details of a\n"
1809
" particular revision X, ``bzr show -rX``."
1810
msgstr ""
1811
1812
#: bzrlib/builtins.py:2631
1813
msgid ""
1814
" If you are interested in looking deeper into a particular merge X,\n"
1815
" use ``bzr log -n0 -rX``."
1816
msgstr ""
1817
1818
#: bzrlib/builtins.py:2634
1819
msgid ""
1820
" ``bzr log -v`` on a branch with lots of history is currently\n"
1821
" very slow. A fix for this issue is currently under development.\n"
1822
" With or without that fix, it is recommended that a revision range\n"
1823
" be given when using the -v option."
1824
msgstr ""
1825
1826
#: bzrlib/builtins.py:2639
1827
msgid ""
1828
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1829
" used to find revisions matching user names, commit messages, etc.\n"
1830
" Among other features, this plugin can find all revisions containing\n"
1831
" a list of words but not others."
1832
msgstr ""
1833
1834
#: bzrlib/builtins.py:2644
1835
msgid ""
1836
" When exploring non-mainline history on large projects with deep\n"
1837
" history, the performance of log can be greatly improved by installing\n"
1838
" the historycache plugin. This plugin buffers historical information\n"
1839
" trading disk space for faster speed."
1840
msgstr ""
1841
1842
#: bzrlib/builtins.py:2653
1843
msgid "Show from oldest to newest."
1844
msgstr ""
1845
1846
#: bzrlib/builtins.py:2656
1847
msgid "Show files changed in each revision."
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:2662
1851
msgid "Show just the specified revision. See also \"help revisionspec\"."
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:2666
1855
msgid "What names to list as authors - first, all or committer."
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:2667
1859
msgid "Authors"
1860
msgstr "Autoren"
1861
1862
#: bzrlib/builtins.py:2672
1863
msgid "Number of levels to display - 0 for all, 1 for flat."
1864
msgstr ""
1865
1866
#: bzrlib/builtins.py:2682
1867
msgid "Limit the output to the first N revisions."
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:2687
1871
msgid "Show changes made in each revision as a patch."
1872
msgstr ""
1873
1874
#: bzrlib/builtins.py:2689
1875
msgid "Show merged revisions like --levels 0 does."
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:2693
1879
msgid "Do not report commits with more than one parent."
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:2695
1883
msgid ""
1884
"Display only the revisions that are not part of both ancestries (require -"
1885
"rX..Y)."
1886
msgstr ""
1887
1888
#: bzrlib/builtins.py:2699
1889
msgid "Show digital signature validity."
1890
msgstr ""
1891
1892
#: bzrlib/builtins.py:2702
1893
msgid "Show revisions whose properties match this expression."
1894
msgstr ""
1895
1896
#: bzrlib/builtins.py:2706
1897
msgid "Show revisions whose message matches this expression."
1898
msgstr ""
1899
1900
#: bzrlib/builtins.py:2710
1901
msgid "Show revisions whose committer matches this expression."
1902
msgstr ""
1903
1904
#: bzrlib/builtins.py:2714
1905
msgid "Show revisions whose authors match this expression."
1906
msgstr ""
1907
1908
#: bzrlib/builtins.py:2718
1909
msgid "Show revisions whose bugs match this expression."
1910
msgstr ""
1911
1912
#: bzrlib/builtins.py:2772
1913
msgid "--exclude-common-ancestry requires -r with two revisions"
1914
msgstr ""
1915
1916
#: bzrlib/builtins.py:2800
1917
#, python-format
1918
msgid "Path unknown at end or start of revision range: %s"
1919
msgstr ""
1920
1921
#: bzrlib/builtins.py:2917
1922
#, python-format
1923
msgid "bzr %s doesn't accept two revisions in different branches."
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:2933
1927
#, python-format
1928
msgid "bzr %s --revision takes one or two values."
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:2978
1932
msgid ""
1933
"List files in a tree.\n"
1934
" "
1935
msgstr ""
1936
1937
#: bzrlib/builtins.py:2987
1938
msgid "Recurse into subdirectories."
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:2989
1942
msgid "Print paths relative to the root of the branch."
1943
msgstr ""
1944
1945
#: bzrlib/builtins.py:2991
1946
msgid "Print unknown files."
1947
msgstr "Unbekannte Dateien ausgeben."
1948
1949
#: bzrlib/builtins.py:2992
1950
msgid "Print versioned files."
1951
msgstr "Versionierte Dateien ausgeben."
1952
1953
#: bzrlib/builtins.py:2995
1954
msgid "Print ignored files."
1955
msgstr "Ignorierte Dateien ausgeben."
1956
1957
#: bzrlib/builtins.py:2997
1958
msgid "List entries of a particular kind: file, directory, symlink."
1959
msgstr ""
1960
1961
#: bzrlib/builtins.py:3010
1962
msgid "invalid kind specified"
1963
msgstr ""
1964
1965
#: bzrlib/builtins.py:3013
1966
msgid "Cannot set both --verbose and --null"
1967
msgstr ""
1968
1969
#: bzrlib/builtins.py:3022
1970
msgid "cannot specify both --from-root and PATH"
1971
msgstr ""
1972
1973
#: bzrlib/builtins.py:3109
1974
msgid "Ignore specified files or patterns."
1975
msgstr ""
1976
1977
#: bzrlib/builtins.py:3111
1978
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1979
msgstr ""
1980
1981
#: bzrlib/builtins.py:3113
1982
msgid ""
1983
"If a .bzrignore file does not exist, the ignore command\n"
1984
"will create one and add the specified files or patterns to the newly\n"
1985
"created file. The ignore command will also automatically add the \n"
1986
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1987
"the use of the ignore command will require an explicit add command."
1988
msgstr ""
1989
1990
#: bzrlib/builtins.py:3119
1991
msgid ""
1992
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1993
"After adding, editing or deleting that file either indirectly by\n"
1994
"using this command or directly by using an editor, be sure to commit\n"
1995
"it."
1996
msgstr ""
1997
1998
#: bzrlib/builtins.py:3124
1999
msgid ""
2000
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2001
"the global ignore file can be found in the application data directory as\n"
2002
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2003
"Global ignores are not touched by this command. The global ignore file\n"
2004
"can be edited directly using an editor."
2005
msgstr ""
2006
2007
#: bzrlib/builtins.py:3130
2008
msgid ""
2009
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2010
"precedence over regular ignores. Such exceptions are used to specify\n"
2011
"files that should be versioned which would otherwise be ignored."
2012
msgstr ""
2013
2014
#: bzrlib/builtins.py:3134
2015
msgid ""
2016
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2017
"precedence over the '!' exception patterns."
2018
msgstr ""
2019
2020
#: bzrlib/builtins.py:3137
2021
msgid ""
2022
":Notes: \n"
2023
" \n"
2024
"* Ignore patterns containing shell wildcards must be quoted from\n"
2025
" the shell on Unix."
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3142
2029
msgid ""
2030
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2031
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3145
2035
msgid ""
2036
":Examples:\n"
2037
" Ignore the top level Makefile::"
2038
msgstr ""
2039
2040
#: bzrlib/builtins.py:3148
2041
msgid " bzr ignore ./Makefile"
2042
msgstr ""
2043
2044
#: bzrlib/builtins.py:3150
2045
msgid " Ignore .class files in all directories...::"
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3152
2049
msgid " bzr ignore \"*.class\""
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3154
2053
msgid " ...but do not ignore \"special.class\"::"
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3156
2057
msgid " bzr ignore \"!special.class\""
2058
msgstr ""
2059
2060
#: bzrlib/builtins.py:3158
2061
msgid " Ignore files whose name begins with the \"#\" character::"
2062
msgstr ""
2063
2064
#: bzrlib/builtins.py:3160
2065
msgid " bzr ignore \"RE:^#\""
2066
msgstr " bzr ignore \"RE:^#\""
2067
2068
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2069
msgid " Ignore .o files under the lib directory::"
2070
msgstr ""
2071
2072
#: bzrlib/builtins.py:3164
2073
msgid " bzr ignore \"lib/**/*.o\""
2074
msgstr " bzr ignore \"lib/**/*.o\""
2075
2076
#: bzrlib/builtins.py:3168
2077
msgid " bzr ignore \"RE:lib/.*\\.o\""
2078
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2079
2080
#: bzrlib/builtins.py:3170
2081
msgid " Ignore everything but the \"debian\" toplevel directory::"
2082
msgstr ""
2083
2084
#: bzrlib/builtins.py:3172
2085
msgid ""
2086
" bzr ignore \"RE:(?!debian/).*\"\n"
2087
" \n"
2088
" Ignore everything except the \"local\" toplevel directory,\n"
2089
" but always ignore autosave files ending in ~, even under local/::\n"
2090
" \n"
2091
" bzr ignore \"*\"\n"
2092
" bzr ignore \"!./local\"\n"
2093
" bzr ignore \"!!*~\""
2094
msgstr ""
2095
2096
#: bzrlib/builtins.py:3186
2097
msgid "Display the default ignore rules that bzr uses."
2098
msgstr ""
2099
2100
#: bzrlib/builtins.py:3198
2101
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2102
msgstr ""
2103
2104
#: bzrlib/builtins.py:3209
2105
#, python-format
2106
msgid "Invalid ignore pattern found. %s"
2107
msgid_plural "Invalid ignore patterns found. %s"
2108
msgstr[0] "Ungültiges Ignorierungsmuster gefunden. %s"
2109
msgstr[1] "Ungültige Ignorierungsmuster gefunden. %s"
2110
2111
#: bzrlib/builtins.py:3218
2112
msgid "NAME_PATTERN should not be an absolute path"
2113
msgstr ""
2114
2115
#: bzrlib/builtins.py:3231
2116
#, python-format
2117
msgid ""
2118
"Warning: the following files are version controlled and match your ignore "
2119
"pattern:\n"
2120
"%s\n"
2121
"These files will continue to be version controlled unless you 'bzr remove' "
2122
"them.\n"
2123
msgstr ""
2124
2125
#: bzrlib/builtins.py:3238
2126
msgid "List ignored files and the patterns that matched them."
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3240
2130
msgid ""
2131
"List all the ignored files and the ignore pattern that caused the file to\n"
2132
"be ignored."
2133
msgstr ""
2134
2135
#: bzrlib/builtins.py:3243
2136
msgid "Alternatively, to list just the files::"
2137
msgstr "Alternativ, um nur die Dateien aufzulisten:"
2138
2139
#: bzrlib/builtins.py:3245
2140
msgid " bzr ls --ignored"
2141
msgstr " bzr ls --ignored"
2142
2143
#: bzrlib/builtins.py:3279
2144
#, python-format
2145
msgid "not a valid revision-number: %r"
2146
msgstr "Keine gültige Revisionsnummer: %r"
2147
2148
#: bzrlib/builtins.py:3286
2149
msgid ""
2150
"Export current or past revision to a destination directory or archive."
2151
msgstr ""
2152
2153
#: bzrlib/builtins.py:3288
2154
msgid "If no revision is specified this exports the last committed revision."
2155
msgstr ""
2156
2157
#: bzrlib/builtins.py:3290
2158
msgid ""
2159
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2160
"given, try to find the format with the extension. If no extension\n"
2161
"is found exports to a directory (equivalent to --format=dir)."
2162
msgstr ""
2163
2164
#: bzrlib/builtins.py:3294
2165
msgid ""
2166
"If root is supplied, it will be used as the root directory inside\n"
2167
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2168
"to the exported filename. The root option has no effect for 'dir' format."
2169
msgstr ""
2170
2171
#: bzrlib/builtins.py:3298
2172
msgid ""
2173
"If branch is omitted then the branch containing the current working\n"
2174
"directory will be used."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3301
2178
msgid ""
2179
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3303
2183
msgid ""
2184
" ================= =========================\n"
2185
" Supported formats Autodetected by extension\n"
2186
" ================= =========================\n"
2187
" dir (none)\n"
2188
" tar .tar\n"
2189
" tbz2 .tar.bz2, .tbz2\n"
2190
" tgz .tar.gz, .tgz\n"
2191
" zip .zip\n"
2192
" ================= ========================="
2193
msgstr ""
2194
2195
#: bzrlib/builtins.py:3317
2196
msgid "Type of file to export to."
2197
msgstr "Art der Datei, in die exportiert wird."
2198
2199
#: bzrlib/builtins.py:3320
2200
msgid "Apply content filters to export the convenient form."
2201
msgstr ""
2202
2203
#: bzrlib/builtins.py:3324
2204
msgid "Name of the root directory inside the exported file."
2205
msgstr ""
2206
2207
#: bzrlib/builtins.py:3326
2208
msgid ""
2209
"Set modification time of files to that of the last revision in which it was "
2210
"changed."
2211
msgstr ""
2212
2213
#: bzrlib/builtins.py:3329
2214
msgid ""
2215
"Export the working tree contents rather than that of the last revision."
2216
msgstr ""
2217
2218
#: bzrlib/builtins.py:3348
2219
msgid "--uncommitted requires a working tree"
2220
msgstr ""
2221
2222
#: bzrlib/builtins.py:3357
2223
#, python-format
2224
msgid "Unsupported export format: %s"
2225
msgstr "Nicht unterstütztes Export-Format: %s"
2226
2227
#: bzrlib/builtins.py:3361
2228
msgid ""
2229
"Write the contents of a file as of a given revision to standard output."
2230
msgstr ""
2231
2232
#: bzrlib/builtins.py:3363
2233
msgid "If no revision is nominated, the last revision is used."
2234
msgstr ""
2235
"Wenn keine Revision bestimmt wurde, wird die neueste Revision benutzt."
2236
2237
#: bzrlib/builtins.py:3365
2238
msgid ""
2239
"Note: Take care to redirect standard output when using this command on a\n"
2240
"binary file."
2241
msgstr ""
2242
2243
#: bzrlib/builtins.py:3371
2244
msgid "The path name in the old tree."
2245
msgstr ""
2246
2247
#: bzrlib/builtins.py:3372
2248
msgid "Apply content filters to display the convenience form."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3383
2252
msgid "bzr cat --revision takes exactly one revision specifier"
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2256
msgid "{0!r} is not present in revision {1}"
2257
msgstr "{0!r} ist in Revision {1} nicht vorhanden"
2258
2259
#: bzrlib/builtins.py:3443
2260
msgid "Commit changes into a new revision."
2261
msgstr ""
2262
2263
#: bzrlib/builtins.py:3445
2264
msgid ""
2265
"An explanatory message needs to be given for each commit. This is\n"
2266
"often done by using the --message option (getting the message from the\n"
2267
"command line) or by using the --file option (getting the message from\n"
2268
"a file). If neither of these options is given, an editor is opened for\n"
2269
"the user to enter the message. To see the changed files in the\n"
2270
"boilerplate text loaded into the editor, use the --show-diff option."
2271
msgstr ""
2272
2273
#: bzrlib/builtins.py:3452
2274
msgid ""
2275
"By default, the entire tree is committed and the person doing the\n"
2276
"commit is assumed to be the author. These defaults can be overridden\n"
2277
"as explained below."
2278
msgstr ""
2279
2280
#: bzrlib/builtins.py:3456
2281
msgid ":Selective commits:"
2282
msgstr ""
2283
2284
#: bzrlib/builtins.py:3458
2285
msgid ""
2286
" If selected files are specified, only changes to those files are\n"
2287
" committed. If a directory is specified then the directory and\n"
2288
" everything within it is committed."
2289
msgstr ""
2290
2291
#: bzrlib/builtins.py:3462
2292
msgid ""
2293
" When excludes are given, they take precedence over selected files.\n"
2294
" For example, to commit only changes within foo, but not changes\n"
2295
" within foo/bar::"
2296
msgstr ""
2297
2298
#: bzrlib/builtins.py:3466
2299
msgid " bzr commit foo -x foo/bar"
2300
msgstr ""
2301
2302
#: bzrlib/builtins.py:3468
2303
msgid " A selective commit after a merge is not yet supported."
2304
msgstr ""
2305
2306
#: bzrlib/builtins.py:3470
2307
msgid ":Custom authors:"
2308
msgstr ":Benutzerdefinierte Autoren:"
2309
2310
#: bzrlib/builtins.py:3472
2311
msgid ""
2312
" If the author of the change is not the same person as the committer,\n"
2313
" you can specify the author's name using the --author option. The\n"
2314
" name should be in the same format as a committer-id, e.g.\n"
2315
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2316
" the change you can specify the option multiple times, once for each\n"
2317
" author."
2318
msgstr ""
2319
2320
#: bzrlib/builtins.py:3479
2321
msgid ":Checks:"
2322
msgstr ":Prüfungen:"
2323
2324
#: bzrlib/builtins.py:3481
2325
msgid ""
2326
" A common mistake is to forget to add a new file or directory before\n"
2327
" running the commit command. The --strict option checks for unknown\n"
2328
" files and aborts the commit if any are found. More advanced pre-commit\n"
2329
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2330
" for details."
2331
msgstr ""
2332
2333
#: bzrlib/builtins.py:3487
2334
msgid ":Things to note:"
2335
msgstr ":Dinge, die zu beachten sind:"
2336
2337
#: bzrlib/builtins.py:3489
2338
msgid ""
2339
" If you accidentially commit the wrong changes or make a spelling\n"
2340
" mistake in the commit message say, you can use the uncommit command\n"
2341
" to undo it. See ``bzr help uncommit`` for details."
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3493
2345
msgid ""
2346
" Hooks can also be configured to run after a commit. This allows you\n"
2347
" to trigger updates to external systems like bug trackers. The --fixes\n"
2348
" option can be used to record the association between a revision and\n"
2349
" one or more bugs. See ``bzr help bugs`` for details."
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3503
2353
msgid "Do not consider changes made to a given path."
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3506
2357
msgid "Description of the new revision."
2358
msgstr "Beschreibung der neuen Revision."
2359
2360
#: bzrlib/builtins.py:3509
2361
msgid "Commit even if nothing has changed."
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3513
2365
msgid "Take commit message from this file."
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3515
2369
msgid "Refuse to commit if there are unknown files in the working tree."
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3518
2373
msgid ""
2374
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2375
"08:00:00 +0100'."
2376
msgstr ""
2377
2378
#: bzrlib/builtins.py:3521
2379
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2380
msgstr ""
2381
2382
#: bzrlib/builtins.py:3524
2383
msgid "Set the author's name, if it's different from the committer."
2384
msgstr ""
2385
2386
#: bzrlib/builtins.py:3527
2387
msgid ""
2388
"Perform a local commit in a bound branch. Local commits are not pushed to "
2389
"the master branch until a normal commit is performed."
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3533
2393
msgid ""
2394
"When no message is supplied, show the diff along with the status summary in "
2395
"the message editor."
2396
msgstr ""
2397
2398
#: bzrlib/builtins.py:3536
2399
msgid ""
2400
"When committing to a foreign version control system do not push data that "
2401
"can not be natively represented."
2402
msgstr ""
2403
2404
#: bzrlib/builtins.py:3554
2405
#, python-format
2406
msgid ""
2407
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2408
"default bug tracker using the `bugtracker` option.\n"
2409
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2410
msgstr ""
2411
2412
#: bzrlib/builtins.py:3563
2413
#, python-format
2414
msgid ""
2415
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2416
"for more information on this feature.\n"
2417
"Commit refused."
2418
msgstr ""
2419
2420
#: bzrlib/builtins.py:3572
2421
#, python-format
2422
msgid "Unrecognized bug %s. Commit refused."
2423
msgstr ""
2424
2425
#: bzrlib/builtins.py:3575
2426
#, python-format
2427
msgid ""
2428
"%s\n"
2429
"Commit refused."
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3599
2433
msgid "Could not parse --commit-time: "
2434
msgstr ""
2435
2436
#: bzrlib/builtins.py:3639
2437
msgid "please specify either --message or --file"
2438
msgstr "Bitte geben Sie entweder --message oder --file an"
2439
2440
#: bzrlib/builtins.py:3668
2441
msgid "please specify a commit message with either --message or --file"
2442
msgstr ""
2443
2444
#: bzrlib/builtins.py:3671
2445
msgid ""
2446
"Empty commit message specified. Please specify a commit message with either -"
2447
"-message or --file or leave a blank message with --message \"\"."
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3691
2451
msgid ""
2452
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2453
"-unchanged to force an empty commit."
2454
msgstr ""
2455
2456
#: bzrlib/builtins.py:3695
2457
msgid ""
2458
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2459
"resolve FILE\" to resolve."
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3699
2463
msgid "Commit refused because there are unknown files in the working tree."
2464
msgstr ""
2465
2466
#: bzrlib/builtins.py:3702
2467
msgid ""
2468
"\n"
2469
"To commit to master branch, run update and then commit.\n"
2470
"You can also pass --local to commit to continue working disconnected."
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3710
2474
msgid ""
2475
"Validate working tree structure, branch consistency and repository history."
2476
msgstr ""
2477
2478
#: bzrlib/builtins.py:3712
2479
msgid ""
2480
"This command checks various invariants about branch and repository storage\n"
2481
"to detect data corruption or bzr bugs."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3715
2485
msgid ""
2486
"The working tree and branch checks will only give output if a problem is\n"
2487
"detected. The output fields of the repository check are:"
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3718
2491
msgid ""
2492
"revisions\n"
2493
" This is just the number of revisions checked. It doesn't\n"
2494
" indicate a problem."
2495
msgstr ""
2496
2497
#: bzrlib/builtins.py:3722
2498
msgid ""
2499
"versionedfiles\n"
2500
" This is just the number of versionedfiles checked. It\n"
2501
" doesn't indicate a problem."
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3726
2505
msgid ""
2506
"unreferenced ancestors\n"
2507
" Texts that are ancestors of other texts, but\n"
2508
" are not properly referenced by the revision ancestry. This is a\n"
2509
" subtle problem that Bazaar can work around."
2510
msgstr ""
2511
2512
#: bzrlib/builtins.py:3731
2513
msgid ""
2514
"unique file texts\n"
2515
" This is the total number of unique file contents\n"
2516
" seen in the checked revisions. It does not indicate a problem."
2517
msgstr ""
2518
2519
#: bzrlib/builtins.py:3735
2520
msgid ""
2521
"repeated file texts\n"
2522
" This is the total number of repeated texts seen\n"
2523
" in the checked revisions. Texts can be repeated when their file\n"
2524
" entries are modified, but the file contents are not. It does not\n"
2525
" indicate a problem."
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3741
2529
msgid ""
2530
"If no restrictions are specified, all Bazaar data that is found at the "
2531
"given\n"
2532
"location will be checked."
2533
msgstr ""
2534
2535
#: bzrlib/builtins.py:3746
2536
msgid " Check the tree and branch at 'foo'::"
2537
msgstr ""
2538
2539
#: bzrlib/builtins.py:3748
2540
msgid " bzr check --tree --branch foo"
2541
msgstr ""
2542
2543
#: bzrlib/builtins.py:3750
2544
msgid " Check only the repository at 'bar'::"
2545
msgstr ""
2546
2547
#: bzrlib/builtins.py:3752
2548
msgid " bzr check --repo bar"
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:3754
2552
msgid " Check everything at 'baz'::"
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:3756
2556
msgid " bzr check baz"
2557
msgstr ""
2558
2559
#: bzrlib/builtins.py:3762
2560
msgid "Check the branch related to the current directory."
2561
msgstr ""
2562
2563
#: bzrlib/builtins.py:3764
2564
msgid "Check the repository related to the current directory."
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:3766
2568
msgid "Check the working tree related to the current directory."
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:3780
2572
msgid "Upgrade a repository, branch or working tree to a newer format."
2573
msgstr ""
2574
2575
#: bzrlib/builtins.py:3782
2576
msgid ""
2577
"When the default format has changed after a major new release of\n"
2578
"Bazaar, you may be informed during certain operations that you\n"
2579
"should upgrade. Upgrading to a newer format may improve performance\n"
2580
"or make new features available. It may however limit interoperability\n"
2581
"with older repositories or with older versions of Bazaar."
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:3788
2585
msgid ""
2586
"If you wish to upgrade to a particular format rather than the\n"
2587
"current default, that can be specified using the --format option.\n"
2588
"As a consequence, you can use the upgrade command this way to\n"
2589
"\"downgrade\" to an earlier format, though some conversions are\n"
2590
"a one way process (e.g. changing from the 1.x default to the\n"
2591
"2.x default) so downgrading is not always possible."
2592
msgstr ""
2593
2594
#: bzrlib/builtins.py:3795
2595
msgid ""
2596
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2597
"process (where # is a number). By default, this is left there on\n"
2598
"completion. If the conversion fails, delete the new .bzr directory\n"
2599
"and rename this one back in its place. Use the --clean option to ask\n"
2600
"for the backup.bzr directory to be removed on successful conversion.\n"
2601
"Alternatively, you can delete it by hand if everything looks good\n"
2602
"afterwards."
2603
msgstr ""
2604
2605
#: bzrlib/builtins.py:3803
2606
msgid ""
2607
"If the location given is a shared repository, dependent branches\n"
2608
"are also converted provided the repository converts successfully.\n"
2609
"If the conversion of a branch fails, remaining branches are still\n"
2610
"tried."
2611
msgstr ""
2612
2613
#: bzrlib/builtins.py:3808
2614
msgid ""
2615
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2616
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2617
msgstr ""
2618
2619
#: bzrlib/builtins.py:3816
2620
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2621
msgstr ""
2622
2623
#: bzrlib/builtins.py:3820
2624
msgid "Branch format"
2625
msgstr "Format des Zweiges"
2626
2627
#: bzrlib/builtins.py:3822
2628
msgid "Remove the backup.bzr directory if successful."
2629
msgstr ""
2630
2631
#: bzrlib/builtins.py:3824
2632
msgid "Show what would be done, but don't actually do anything."
2633
msgstr "Nur zeigen, was getan werden würde, aber nichts wirklich machen."
2634
2635
#: bzrlib/builtins.py:3839
2636
msgid "Show or set bzr user id."
2637
msgstr ""
2638
2639
#: bzrlib/builtins.py:3841
2640
msgid ""
2641
":Examples:\n"
2642
" Show the email of the current user::"
2643
msgstr ""
2644
":Beispiele:\n"
2645
" Die E-Mail-Adresse des aktuellen Benutzers zeigen::"
2646
2647
#: bzrlib/builtins.py:3844
2648
msgid " bzr whoami --email"
2649
msgstr " bzr whoami --email"
2650
2651
#: bzrlib/builtins.py:3846
2652
msgid " Set the current user::"
2653
msgstr " Aktuellen Benutzer festlegen::"
2654
2655
#: bzrlib/builtins.py:3848
2656
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2657
msgstr " bzr whoami \"Frank Chu <ich@beispiel.de>\""
2658
2659
#: bzrlib/builtins.py:3852
2660
msgid "Display email address only."
2661
msgstr "Nur die E-Mail-Adresse anzeigen."
2662
2663
#: bzrlib/builtins.py:3854
2664
msgid "Set identity for the current branch instead of globally."
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:3880
2668
msgid "--email can only be used to display existing identity"
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:3904
2672
msgid "Print or set the branch nickname."
2673
msgstr ""
2674
2675
#: bzrlib/builtins.py:3906
2676
msgid ""
2677
"If unset, the colocated branch name is used for colocated branches, and\n"
2678
"the branch directory name is used for other branches. To print the\n"
2679
"current nickname, execute with no argument."
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:3910
2683
msgid ""
2684
"Bound branches use the nickname of its master branch unless it is set\n"
2685
"locally."
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:3930
2689
msgid "Set/unset and display aliases."
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:3932
2693
msgid ""
2694
":Examples:\n"
2695
" Show the current aliases::"
2696
msgstr ""
2697
":Beispiele:\n"
2698
" Die aktuellen Aliase zeigen::"
2699
2700
#: bzrlib/builtins.py:3935
2701
msgid " bzr alias"
2702
msgstr " bzr alias"
2703
2704
#: bzrlib/builtins.py:3937
2705
msgid " Show the alias specified for 'll'::"
2706
msgstr ""
2707
2708
#: bzrlib/builtins.py:3939
2709
msgid " bzr alias ll"
2710
msgstr " bzr alias ll"
2711
2712
#: bzrlib/builtins.py:3941
2713
msgid " Set an alias for 'll'::"
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:3943
2717
msgid " bzr alias ll=\"log --line -r-10..-1\""
2718
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2719
2720
#: bzrlib/builtins.py:3945
2721
msgid " To remove an alias for 'll'::"
2722
msgstr ""
2723
2724
#: bzrlib/builtins.py:3947
2725
msgid " bzr alias --remove ll"
2726
msgstr " bzr alias --remove ll"
2727
2728
#: bzrlib/builtins.py:3952
2729
msgid "Remove the alias."
2730
msgstr "Den Alias entfernen."
2731
2732
#: bzrlib/builtins.py:3970
2733
msgid "bzr alias --remove expects an alias to remove."
2734
msgstr "bzr alias --remove erwartet einen Alias zum Entfernen."
2735
2736
#: bzrlib/builtins.py:4151
2737
msgid ""
2738
"subunit not available. subunit needs to be installed to use --subunit."
2739
msgstr ""
2740
2741
#: bzrlib/builtins.py:4168
2742
msgid ""
2743
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4215
2747
msgid "Show version of bzr."
2748
msgstr "Version von bzr anzeigen."
2749
2750
#: bzrlib/builtins.py:4219
2751
msgid "Print just the version number."
2752
msgstr "Nur die Versionsnummer ausgeben."
2753
2754
#: bzrlib/builtins.py:4238
2755
msgid "It sure does!\n"
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4262
2759
#, python-format
2760
msgid "merge base is revision %s\n"
2761
msgstr ""
2762
2763
#: bzrlib/builtins.py:4266
2764
msgid "Perform a three-way merge."
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4268
2768
msgid ""
2769
"The source of the merge can be specified either in the form of a branch,\n"
2770
"or in the form of a path to a file containing a merge directive generated\n"
2771
"with bzr send. If neither is specified, the default is the upstream branch\n"
2772
"or the branch most recently merged using --remember. The source of the\n"
2773
"merge may also be specified in the form of a path to a file in another\n"
2774
"branch: in this case, only the modifications to that file are merged into\n"
2775
"the current working tree."
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4276
2779
msgid ""
2780
"When merging from a branch, by default bzr will try to merge in all new\n"
2781
"work from the other branch, automatically determining an appropriate base\n"
2782
"revision. If this fails, you may need to give an explicit base."
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4280
2786
msgid ""
2787
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2788
"try to merge in all new work up to and including revision OTHER."
2789
msgstr ""
2790
2791
#: bzrlib/builtins.py:4283
2792
msgid ""
2793
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2794
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2795
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2796
"not already contain revision BASE, such a merge is commonly referred to as\n"
2797
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2798
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2799
"changes from the other branch is not stored in the commit."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4291
2803
msgid "Revision numbers are always relative to the source branch."
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2807
msgid ""
2808
"Merge will do its best to combine the changes in two branches, but there\n"
2809
"are some kinds of problems only a human can fix. When it encounters those,\n"
2810
"it will mark a conflict. A conflict means that you need to fix something,\n"
2811
"before you can commit."
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4298
2815
msgid ""
2816
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:4300
2820
msgid ""
2821
"If there is no default branch set, the first merge will set it (use\n"
2822
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2823
"to use the default. To change the default, use --remember. The value will\n"
2824
"only be saved if the remote location can be accessed."
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4305
2828
msgid ""
2829
"The results of the merge are placed into the destination working\n"
2830
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2831
"committed to record the result of the merge."
2832
msgstr ""
2833
2834
#: bzrlib/builtins.py:4309
2835
msgid ""
2836
"merge refuses to run if there are any uncommitted changes, unless\n"
2837
"--force is given. If --force is given, then the changes from the source \n"
2838
"will be merged with the current working tree, including any uncommitted\n"
2839
"changes in the tree. The --force option can also be used to create a\n"
2840
"merge revision which has more than two parents."
2841
msgstr ""
2842
2843
#: bzrlib/builtins.py:4315
2844
msgid ""
2845
"If one would like to merge changes from the working tree of the other\n"
2846
"branch without merging any committed revisions, the --uncommitted option\n"
2847
"can be given."
2848
msgstr ""
2849
2850
#: bzrlib/builtins.py:4319
2851
msgid ""
2852
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2853
"you to apply each diff hunk and file change, similar to \"shelve\"."
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:4322
2857
msgid ""
2858
":Examples:\n"
2859
" To merge all new revisions from bzr.dev::"
2860
msgstr ""
2861
2862
#: bzrlib/builtins.py:4325
2863
msgid " bzr merge ../bzr.dev"
2864
msgstr " bzr merge ../bzr.dev"
2865
2866
#: bzrlib/builtins.py:4327
2867
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2868
msgstr ""
2869
2870
#: bzrlib/builtins.py:4329
2871
msgid " bzr merge -r 82 ../bzr.dev"
2872
msgstr " bzr merge -r 82 ../bzr.dev"
2873
2874
#: bzrlib/builtins.py:4331
2875
msgid " To merge the changes introduced by 82, without previous changes::"
2876
msgstr ""
2877
2878
#: bzrlib/builtins.py:4333
2879
msgid " bzr merge -r 81..82 ../bzr.dev"
2880
msgstr " bzr merge -r 81..82 ../bzr.dev"
2881
2882
#: bzrlib/builtins.py:4335
2883
msgid " To apply a merge directive contained in /tmp/merge::"
2884
msgstr ""
2885
2886
#: bzrlib/builtins.py:4337
2887
msgid " bzr merge /tmp/merge"
2888
msgstr " bzr merge /tmp/merge"
2889
2890
#: bzrlib/builtins.py:4339
2891
msgid ""
2892
" To create a merge revision with three parents from two branches\n"
2893
" feature1a and feature1b:"
2894
msgstr ""
2895
2896
#: bzrlib/builtins.py:4342
2897
msgid ""
2898
" bzr merge ../feature1a\n"
2899
" bzr merge ../feature1b --force\n"
2900
" bzr commit -m 'revision with three parents'"
2901
msgstr ""
2902
2903
#: bzrlib/builtins.py:4354
2904
msgid "Merge even if the destination tree has uncommitted changes."
2905
msgstr ""
2906
2907
#: bzrlib/builtins.py:4360
2908
msgid ""
2909
"Apply uncommitted changes from a working copy, instead of branch changes."
2910
msgstr ""
2911
2912
#: bzrlib/builtins.py:4362
2913
msgid ""
2914
"If the destination is already completely merged into the source, pull from "
2915
"the source rather than merging. When this happens, you do not need to "
2916
"commit the result."
2917
msgstr ""
2918
2919
#: bzrlib/builtins.py:4367
2920
msgid ""
2921
"Branch to merge into, rather than the one containing the working directory."
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:4369
2925
msgid "Instead of merging, show a diff of the merge."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4371
2929
msgid "Select changes interactively."
2930
msgstr "Änderungen interaktiv auswählen."
2931
2932
#: bzrlib/builtins.py:4393
2933
msgid ""
2934
"Merging into empty branches not currently supported, "
2935
"https://bugs.launchpad.net/bzr/+bug/308562"
2936
msgstr ""
2937
2938
#: bzrlib/builtins.py:4420
2939
msgid "Cannot use --uncommitted with bundles or merge directives."
2940
msgstr ""
2941
2942
#: bzrlib/builtins.py:4431
2943
msgid "Cannot use --uncommitted and --revision at the same time."
2944
msgstr ""
2945
2946
#: bzrlib/builtins.py:4451
2947
msgid "merger: "
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2951
msgid "Nothing to do."
2952
msgstr "Nichts zu tun."
2953
2954
#: bzrlib/builtins.py:4457
2955
msgid "Cannot pull individual files"
2956
msgstr "Nicht möglich, einzelne Dateien zu laden"
2957
2958
#: bzrlib/builtins.py:4465
2959
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2960
msgstr ""
2961
2962
#: bzrlib/builtins.py:4523
2963
#, python-format
2964
msgid "Show-base is not supported for this merge type. %s"
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:4532
2968
#, python-format
2969
msgid "Conflict reduction is not supported for merge type %s."
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4536
2973
msgid "Cannot do conflict reduction and show base."
2974
msgstr ""
2975
2976
#: bzrlib/builtins.py:4647
2977
msgid "No location specified or remembered"
2978
msgstr ""
2979
2980
#: bzrlib/builtins.py:4649
2981
msgid "{0} remembered {1} location {2}"
2982
msgstr ""
2983
2984
#: bzrlib/builtins.py:4655
2985
msgid "Redo a merge."
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4657
2989
msgid ""
2990
"Use this if you want to try a different merge technique while resolving\n"
2991
"conflicts. Some merge techniques are better than others, and remerge\n"
2992
"lets you try different ones on different files."
2993
msgstr ""
2994
2995
#: bzrlib/builtins.py:4661
2996
msgid ""
2997
"The options for remerge have the same meaning and defaults as the ones for\n"
2998
"merge. The difference is that remerge can (only) be run when there is a\n"
2999
"pending merge, and it lets you specify particular files."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:4665
3003
msgid ""
3004
":Examples:\n"
3005
" Re-do the merge of all conflicted files, and show the base text in\n"
3006
" conflict regions, in addition to the usual THIS and OTHER texts::"
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4669
3010
msgid " bzr remerge --show-base"
3011
msgstr " bzr remerge --show-base"
3012
3013
#: bzrlib/builtins.py:4671
3014
msgid ""
3015
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3016
" additional processing to reduce the size of conflict regions::"
3017
msgstr ""
3018
3019
#: bzrlib/builtins.py:4674
3020
msgid " bzr remerge --merge-type weave --reprocess foobar"
3021
msgstr ""
3022
3023
#: bzrlib/builtins.py:4681
3024
msgid "Show base revision text in conflicts."
3025
msgstr ""
3026
3027
#: bzrlib/builtins.py:4693
3028
msgid ""
3029
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3030
"merges."
3031
msgstr ""
3032
3033
#: bzrlib/builtins.py:4751
3034
msgid ""
3035
"Set files in the working tree back to the contents of a previous revision."
3036
msgstr ""
3037
3038
#: bzrlib/builtins.py:4753
3039
msgid ""
3040
"Giving a list of files will revert only those files. Otherwise, all files\n"
3041
"will be reverted. If the revision is not specified with '--revision', the\n"
3042
"working tree basis revision is used. A revert operation affects only the\n"
3043
"working tree, not any revision history like the branch and repository or\n"
3044
"the working tree basis revision."
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:4759
3048
msgid ""
3049
"To remove only some changes, without reverting to a prior version, use\n"
3050
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3051
"will remove the changes introduced by the second last commit (-2), without\n"
3052
"affecting the changes introduced by the last commit (-1). To remove\n"
3053
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3054
"To update the branch to a specific revision or the latest revision and\n"
3055
"update the working tree accordingly while preserving local changes, see the\n"
3056
"update command."
3057
msgstr ""
3058
3059
#: bzrlib/builtins.py:4768
3060
msgid ""
3061
"Uncommitted changes to files that are reverted will be discarded.\n"
3062
"Howver, by default, any files that have been manually changed will be\n"
3063
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3064
"files have '.~#~' appended to their name, where # is a number."
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:4773
3068
msgid ""
3069
"When you provide files, you can use their current pathname or the pathname\n"
3070
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3071
"name. If you name a directory, all the contents of that directory will be\n"
3072
"reverted."
3073
msgstr ""
3074
3075
#: bzrlib/builtins.py:4778
3076
msgid ""
3077
"If you have newly added files since the target revision, they will be\n"
3078
"removed. If the files to be removed have been changed, backups will be\n"
3079
"created as above. Directories containing unknown files will not be\n"
3080
"deleted."
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:4783
3084
msgid ""
3085
"The working tree contains a list of revisions that have been merged but\n"
3086
"not yet committed. These revisions will be included as additional parents\n"
3087
"of the next commit. Normally, using revert clears that list as well as\n"
3088
"reverting the files. If any files are specified, revert leaves the list\n"
3089
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3090
".`` in the tree root to revert all files but keep the recorded merges,\n"
3091
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3092
"reverting any files."
3093
msgstr ""
3094
3095
#: bzrlib/builtins.py:4792
3096
msgid ""
3097
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3098
"changes from a branch in a single revision. To do this, perform the merge\n"
3099
"as desired. Then doing revert with the \"--forget-merges\" option will "
3100
"keep\n"
3101
"the content of the tree as it was, but it will clear the list of pending\n"
3102
"merges. The next commit will then contain all of the changes that are\n"
3103
"present in the other branch, but without any other parent revisions.\n"
3104
"Because this technique forgets where these changes originated, it may\n"
3105
"cause additional conflicts on later merges involving the same source and\n"
3106
"target branches."
3107
msgstr ""
3108
3109
#: bzrlib/builtins.py:4806
3110
msgid "Do not save backups of reverted files."
3111
msgstr "Keine Sicherungskopien von zurückgesetzten Dateien erstellen."
3112
3113
#: bzrlib/builtins.py:4808
3114
msgid "Remove pending merge marker, without changing any files."
3115
msgstr ""
3116
3117
#: bzrlib/builtins.py:4839
3118
msgid ""
3119
"Show help on a command or other topic.\n"
3120
" "
3121
msgstr ""
3122
"Hilfe zu einem Befehl oder Thema anzeigen.\n"
3123
" "
3124
3125
#: bzrlib/builtins.py:4844
3126
msgid "Show help on all commands."
3127
msgstr "Hilfe zu allen Befehlen anzeigen."
3128
3129
#: bzrlib/builtins.py:4873
3130
msgid "Show unmerged/unpulled revisions between two branches."
3131
msgstr ""
3132
3133
#: bzrlib/builtins.py:4875
3134
msgid "OTHER_BRANCH may be local or remote."
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:4877
3138
msgid ""
3139
"To filter on a range of revisions, you can use the command -r begin..end\n"
3140
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3141
"also valid.\n"
3142
" \n"
3143
":Exit values:\n"
3144
" 1 - some missing revisions\n"
3145
" 0 - no missing revisions"
3146
msgstr ""
3147
3148
#: bzrlib/builtins.py:4887
3149
msgid ""
3150
" Determine the missing revisions between this and the branch at the\n"
3151
" remembered pull location::"
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:4890
3155
msgid " bzr missing"
3156
msgstr " bzr missing"
3157
3158
#: bzrlib/builtins.py:4892
3159
msgid " Determine the missing revisions between this and another branch::"
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:4894
3163
msgid " bzr missing http://server/branch"
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:4896
3167
msgid ""
3168
" Determine the missing revisions up to a specific revision on the other\n"
3169
" branch::"
3170
msgstr ""
3171
3172
#: bzrlib/builtins.py:4899
3173
msgid " bzr missing -r ..-10"
3174
msgstr " bzr missing -r ..-10"
3175
3176
#: bzrlib/builtins.py:4901
3177
msgid ""
3178
" Determine the missing revisions up to a specific revision on this\n"
3179
" branch::"
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:4904
3183
msgid " bzr missing --my-revision ..-10"
3184
msgstr " bzr missing --my-revision ..-10"
3185
3186
#: bzrlib/builtins.py:4911
3187
msgid "Reverse the order of revisions."
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:4913
3191
msgid "Display changes in the local branch only."
3192
msgstr "Nur Änderungen im lokalen Zweig anzeigen."
3193
3194
#: bzrlib/builtins.py:4914
3195
msgid "Same as --mine-only."
3196
msgstr "Dasselbe wie --mine-only."
3197
3198
#: bzrlib/builtins.py:4916
3199
msgid "Display changes in the remote branch only."
3200
msgstr "Nur Änderungen im entfernten Zweig anzeigen."
3201
3202
#: bzrlib/builtins.py:4917
3203
msgid "Same as --theirs-only."
3204
msgstr "Dasselbe wie --theirs-only."
3205
3206
#: bzrlib/builtins.py:4922
3207
msgid ""
3208
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3209
"details."
3210
msgstr ""
3211
3212
#: bzrlib/builtins.py:4926
3213
msgid ""
3214
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3215
"details."
3216
msgstr ""
3217
3218
#: bzrlib/builtins.py:4929
3219
msgid "Show all revisions in addition to the mainline ones."
3220
msgstr ""
3221
3222
#: bzrlib/builtins.py:4983
3223
msgid "No peer location known or specified."
3224
msgstr ""
3225
3226
#: bzrlib/builtins.py:4987
3227
msgid "Using saved parent location: {0}\n"
3228
msgstr ""
3229
3230
#: bzrlib/builtins.py:5020
3231
#, python-format
3232
msgid "You have %d extra revision:\n"
3233
msgid_plural "You have %d extra revisions:\n"
3234
msgstr[0] "Sie haben %d zusätzliche Revision:\n"
3235
msgstr[1] "Sie haben %d zusätzliche Revisionen:\n"
3236
3237
#: bzrlib/builtins.py:5040
3238
#, python-format
3239
msgid "You are missing %d revision:\n"
3240
msgid_plural "You are missing %d revisions:\n"
3241
msgstr[0] "Ihnen fehlt %d Revision:\n"
3242
msgstr[1] "Ihnen fehlen %d Revisionen:\n"
3243
3244
#: bzrlib/builtins.py:5055
3245
msgid "This branch has no new revisions.\n"
3246
msgstr "Dieser Zweig hat keine neuen Revisionen.\n"
3247
3248
#: bzrlib/builtins.py:5058
3249
msgid "Other branch has no new revisions.\n"
3250
msgstr "Anderer Zweig hat keine neuen Revisionen.\n"
3251
3252
#: bzrlib/builtins.py:5063
3253
msgid "Branches are up to date.\n"
3254
msgstr "Zweige sind aktuell.\n"
3255
3256
#: bzrlib/builtins.py:5074
3257
msgid "Compress the data within a repository."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5076
3261
msgid ""
3262
"This operation compresses the data within a bazaar repository. As\n"
3263
"bazaar supports automatic packing of repository, this operation is\n"
3264
"normally not required to be done manually."
3265
msgstr ""
3266
3267
#: bzrlib/builtins.py:5080
3268
msgid ""
3269
"During the pack operation, bazaar takes a backup of existing repository\n"
3270
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3271
"automatically when it is safe to do so. To save disk space by removing\n"
3272
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3273
"used."
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5086
3277
msgid ""
3278
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3279
"during or immediately after repacking, you may be left with a state\n"
3280
"where the deletion has been written to disk but the new packs have not\n"
3281
"been. In this case the repository may be unusable."
3282
msgstr ""
3283
3284
#: bzrlib/builtins.py:5095
3285
msgid "Delete obsolete packs to save disk space."
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5109
3289
msgid "List the installed plugins."
3290
msgstr "Installierte Erweiterungen auflisten."
3291
3292
#: bzrlib/builtins.py:5111
3293
msgid ""
3294
"This command displays the list of installed plugins including\n"
3295
"version of plugin and a short description of each."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:5114
3299
msgid "--verbose shows the path where each plugin is located."
3300
msgstr ""
3301
3302
#: bzrlib/builtins.py:5116
3303
msgid ""
3304
"A plugin is an external component for Bazaar that extends the\n"
3305
"revision control system, by adding or replacing code in Bazaar.\n"
3306
"Plugins can do a variety of things, including overriding commands,\n"
3307
"adding new commands, providing additional network transports and\n"
3308
"customizing log output."
3309
msgstr ""
3310
3311
#: bzrlib/builtins.py:5122
3312
msgid ""
3313
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3314
"for further information on plugins including where to find them and how to\n"
3315
"install them. Instructions are also provided there on how to write new\n"
3316
"plugins using the Python programming language."
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5138
3320
msgid "Show testament (signing-form) of a revision."
3321
msgstr ""
3322
3323
#: bzrlib/builtins.py:5141
3324
msgid "Produce long-format testament."
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5143
3328
msgid "Produce a strict-format testament."
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5169
3332
msgid "Show the origin of each line in a file."
3333
msgstr "Ursprung jeder Zeile in einer Datei anzeigen."
3334
3335
#: bzrlib/builtins.py:5171
3336
msgid ""
3337
"This prints out the given file with an annotation on the left side\n"
3338
"indicating which revision, author and date introduced the change."
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5174
3342
msgid ""
3343
"If the origin is the same for a run of consecutive lines, it is\n"
3344
"shown only at the top, unless the --all option is given."
3345
msgstr ""
3346
3347
#: bzrlib/builtins.py:5182
3348
msgid "Show annotations on all lines."
3349
msgstr ""
3350
3351
#: bzrlib/builtins.py:5183
3352
msgid "Show commit date in annotations."
3353
msgstr ""
3354
3355
#: bzrlib/builtins.py:5270
3356
msgid "Cannot sign a range of non-revision-history revisions"
3357
msgstr ""
3358
3359
#: bzrlib/builtins.py:5282
3360
msgid "Please supply either one revision, or a range."
3361
msgstr "Bitte geben Sie entweder eine Revision oder einen Bereich an."
3362
3363
#: bzrlib/builtins.py:5286
3364
msgid ""
3365
"Convert the current branch into a checkout of the supplied branch.\n"
3366
"If no branch is supplied, rebind to the last bound location."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5289
3370
msgid ""
3371
"Once converted into a checkout, commits must succeed on the master branch\n"
3372
"before they will be applied to the local branch."
3373
msgstr ""
3374
3375
#: bzrlib/builtins.py:5292
3376
msgid ""
3377
"Bound branches use the nickname of its master branch unless it is set\n"
3378
"locally, in which case binding will update the local nickname to be\n"
3379
"that of the master."
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5307
3383
msgid "No location supplied. This format does not remember old locations."
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5313
3387
msgid "Branch is already bound"
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5316
3391
msgid "No location supplied and no previous location known"
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5322
3395
msgid "These branches have diverged. Try merging, and then bind again."
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5329
3399
msgid "Convert the current checkout into a regular branch."
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5331
3403
msgid ""
3404
"After unbinding, the local branch is considered independent and subsequent\n"
3405
"commits will be local only."
3406
msgstr ""
3407
3408
#: bzrlib/builtins.py:5342
3409
msgid "Local branch is not bound"
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5346
3413
msgid "Remove the last committed revision."
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5348
3417
msgid ""
3418
"--verbose will print out what is being removed.\n"
3419
"--dry-run will go through all the motions, but not actually\n"
3420
"remove anything."
3421
msgstr ""
3422
3423
#: bzrlib/builtins.py:5352
3424
msgid ""
3425
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3426
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3427
"branch at revision 15."
3428
msgstr ""
3429
3430
#: bzrlib/builtins.py:5356
3431
msgid ""
3432
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3433
"it may make is to restore any pending merges that were present before\n"
3434
"the commit."
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5367
3438
msgid "Don't actually make changes."
3439
msgstr "Keine Änderungen durchführen."
3440
3441
#: bzrlib/builtins.py:5368
3442
msgid "Say yes to all questions."
3443
msgstr "Alle Fragen mit Ja beantworten."
3444
3445
#: bzrlib/builtins.py:5370
3446
msgid "Keep tags that point to removed revisions."
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5372
3450
msgid "Only remove the commits from the local branch when in a checkout."
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5421
3454
msgid "No revisions to uncommit.\n"
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5436
3458
msgid "Dry-run, pretending to remove the above revisions.\n"
3459
msgstr ""
3460
"Testlauf, es wird so getan, als ob die obigen Revisionen entfernt würden.\n"
3461
3462
#: bzrlib/builtins.py:5439
3463
msgid "The above revision(s) will be removed.\n"
3464
msgstr "Oben stehende Revision(en) wird/werden entfernt.\n"
3465
3466
#: bzrlib/builtins.py:5443
3467
msgid "Uncommit these revisions"
3468
msgstr ""
3469
3470
#: bzrlib/builtins.py:5446
3471
msgid "Canceled\n"
3472
msgstr "Abgebrochen\n"
3473
3474
#: bzrlib/builtins.py:5453
3475
#, python-format
3476
msgid ""
3477
"You can restore the old tip by running:\n"
3478
" bzr pull . -r revid:%s\n"
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:5458
3482
msgid "Break a dead lock."
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:5460
3486
msgid ""
3487
"This command breaks a lock on a repository, branch, working directory or\n"
3488
"config file."
3489
msgstr ""
3490
3491
#: bzrlib/builtins.py:5463
3492
msgid ""
3493
"CAUTION: Locks should only be broken when you are sure that the process\n"
3494
"holding the lock has been stopped."
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:5466
3498
msgid ""
3499
"You can get information on what locks are open via the 'bzr info\n"
3500
"[location]' command."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:5469
3504
msgid ""
3505
":Examples:\n"
3506
" bzr break-lock\n"
3507
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3508
" bzr break-lock --conf ~/.bazaar"
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5478
3512
msgid "LOCATION is the directory where the config lock is."
3513
msgstr ""
3514
3515
#: bzrlib/builtins.py:5480
3516
msgid "Do not ask for confirmation before breaking the lock."
3517
msgstr ""
3518
3519
#: bzrlib/builtins.py:5515
3520
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3521
msgstr "Das Bazaar-Smart-Server-Protokoll via TCP. (Vorgabe-Port: 4155)"
3522
3523
#: bzrlib/builtins.py:5516
3524
msgid "Run the bzr server."
3525
msgstr "Den bzr-Server starten."
3526
3527
#: bzrlib/builtins.py:5522
3528
msgid "Serve on stdin/out for use from inetd or sshd."
3529
msgstr ""
3530
3531
#: bzrlib/builtins.py:5523
3532
msgid "protocol"
3533
msgstr "Protokoll"
3534
3535
#: bzrlib/builtins.py:5524
3536
msgid "Protocol to serve."
3537
msgstr ""
3538
3539
#: bzrlib/builtins.py:5528
3540
msgid "Listen for connections on nominated address."
3541
msgstr "An den angegebenen Adressen auf Verbindungen lauschen."
3542
3543
#: bzrlib/builtins.py:5530
3544
msgid ""
3545
"Listen for connections on nominated port. Passing 0 as the port number will "
3546
"result in a dynamically allocated port. The default port depends on the "
3547
"protocol."
3548
msgstr ""
3549
3550
#: bzrlib/builtins.py:5535
3551
msgid "Serve contents of this directory."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5537
3555
msgid ""
3556
"By default the server is a readonly server. Supplying --allow-writes "
3557
"enables write access to the contents of the served directory and below. "
3558
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3559
"of external authentication is arranged supplying this option leads to global "
3560
"uncontrolled write access to your file system."
3561
msgstr ""
3562
3563
#: bzrlib/builtins.py:5546
3564
msgid "Override the default idle client timeout (5min)."
3565
msgstr ""
3566
3567
#: bzrlib/builtins.py:5564
3568
msgid "Combine a tree into its containing tree."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:5566
3572
msgid "This command requires the target tree to be in a rich-root format."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:5568
3576
msgid ""
3577
"The TREE argument should be an independent tree, inside another tree, but\n"
3578
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3579
"running \"bzr branch\" with the target inside a tree.)"
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5572
3583
msgid ""
3584
"The result is a combined tree, with the subtree no longer an independent\n"
3585
"part. This is marked as a merge of the subtree into the containing tree,\n"
3586
"and all history is preserved."
3587
msgstr ""
3588
3589
#: bzrlib/builtins.py:5590
3590
#, python-format
3591
msgid ""
3592
"Can't join trees because %s doesn't support rich root data.\n"
3593
"You can use bzr upgrade on the repository."
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3597
msgid "Cannot join {0}. {1}"
3598
msgstr ""
3599
3600
#: bzrlib/builtins.py:5610
3601
msgid "Split a subdirectory of a tree into a separate tree."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5612
3605
msgid ""
3606
"This command will produce a target tree in a format that supports\n"
3607
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3608
"converted into earlier formats like 'dirstate-tags'."
3609
msgstr ""
3610
3611
#: bzrlib/builtins.py:5616
3612
msgid ""
3613
"The TREE argument should be a subdirectory of a working tree. That\n"
3614
"subdirectory will be converted into an independent tree, with its own\n"
3615
"branch. Commits in the top-level tree will not apply to the new subtree."
3616
msgstr ""
3617
3618
#: bzrlib/builtins.py:5696
3619
msgid "No submit branch specified or known"
3620
msgstr ""
3621
3622
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3623
msgid "No public branch specified or known"
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5710
3627
msgid "bzr merge-directive takes at most two one revision identifiers"
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5719
3631
msgid "No revisions to bundle."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5738
3635
msgid "Mail or create a merge-directive for submitting changes."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5740
3639
msgid "A merge directive provides many things needed for requesting merges:"
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5742
3643
msgid "* A machine-readable description of the merge to perform"
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5744
3647
msgid "* An optional patch that is a preview of the changes requested"
3648
msgstr ""
3649
"* Ein optionaler Patch, der eine Vorschau der gewünschten Änderungen "
3650
"darstellt"
3651
3652
#: bzrlib/builtins.py:5746
3653
msgid ""
3654
"* An optional bundle of revision data, so that the changes can be applied\n"
3655
" directly from the merge directive, without retrieving data from a\n"
3656
" branch."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5750
3660
msgid ""
3661
"`bzr send` creates a compact data set that, when applied using bzr\n"
3662
"merge, has the same effect as merging from the source branch. "
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5753
3666
msgid ""
3667
"By default the merge directive is self-contained and can be applied to any\n"
3668
"branch containing submit_branch in its ancestory without needing access to\n"
3669
"the source branch."
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:5757
3673
msgid ""
3674
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3675
"revisions, but only a structured request to merge from the\n"
3676
"public_location. In that case the public_branch is needed and it must be\n"
3677
"up-to-date and accessible to the recipient. The public_branch is always\n"
3678
"included if known, so that people can check it later."
3679
msgstr ""
3680
3681
#: bzrlib/builtins.py:5763
3682
msgid ""
3683
"The submit branch defaults to the parent of the source branch, but can be\n"
3684
"overridden. Both submit branch and public branch will be remembered in\n"
3685
"branch.conf the first time they are used for a particular branch. The\n"
3686
"source branch defaults to that containing the working directory, but can\n"
3687
"be changed using --from."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5769
3691
msgid ""
3692
"Both the submit branch and the public branch follow the usual behavior with\n"
3693
"respect to --remember: If there is no default location set, the first send\n"
3694
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3695
"omit the location to use the default. To change the default, use\n"
3696
"--remember. The value will only be saved if the location can be accessed."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:5775
3700
msgid ""
3701
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3702
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3703
"If a public location is known for the submit_branch, that location is used\n"
3704
"in the merge directive."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:5780
3708
msgid ""
3709
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3710
"given, in which case it is sent to a file."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5783
3714
msgid ""
3715
"Mail is sent using your preferred mail program. This should be transparent\n"
3716
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3717
"If the preferred client can't be found (or used), your editor will be used."
3718
msgstr ""
3719
3720
#: bzrlib/builtins.py:5787
3721
msgid ""
3722
"To use a specific mail program, set the mail_client configuration option.\n"
3723
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3724
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3725
"(MacOS X's\n"
3726
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3727
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3728
"add\n"
3729
"supported clients."
3730
msgstr ""
3731
3732
#: bzrlib/builtins.py:5794
3733
msgid ""
3734
"If mail is being sent, a to address is required. This can be supplied\n"
3735
"either on the commandline, by setting the submit_to configuration\n"
3736
"option in the branch itself or the child_submit_to configuration option\n"
3737
"in the submit branch."
3738
msgstr ""
3739
3740
#: bzrlib/builtins.py:5799
3741
msgid ""
3742
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3743
"and\n"
3744
"merge directive format 2. It is significantly faster and smaller than\n"
3745
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3746
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3747
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:5805
3751
msgid ""
3752
"The merge directives created by bzr send may be applied using bzr merge or\n"
3753
"bzr pull by specifying a file containing a merge directive as the location."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:5808
3757
msgid ""
3758
"bzr send makes extensive use of public locations to map local locations "
3759
"into\n"
3760
"URLs that can be used by other people. See `bzr help configuration` to\n"
3761
"set them, and use `bzr info` to display them."
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:5832
3765
msgid "Write merge directive to this file or directory; use - for stdout."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:5836
3769
msgid ""
3770
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3771
"strict disables the check."
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:5838
3775
msgid "Mail the request to this address."
3776
msgstr "Die Anfrage an diese Adresse schicken."
3777
3778
#: bzrlib/builtins.py:5842
3779
msgid "Body for the email."
3780
msgstr "Inhalt der E-Mail."
3781
3782
#: bzrlib/builtins.py:5895
3783
msgid "Do not include a bundle in the merge directive."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:5896
3787
msgid "Do not include a preview patch in the merge directive."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:5899
3791
msgid "Remember submit and public branch."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:5901
3795
msgid ""
3796
"Branch to generate the submission from, rather than the one containing the "
3797
"working directory."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3801
msgid "format"
3802
msgstr "Format"
3803
3804
#: bzrlib/builtins.py:5912
3805
msgid "Use the specified output format."
3806
msgstr "Das angegebene Ausgabeformat benutzen."
3807
3808
#: bzrlib/builtins.py:5934
3809
msgid "Create, remove or modify a tag naming a revision."
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:5936
3813
msgid ""
3814
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3815
"(--revision) option can be given -rtag:X, where X is any previously\n"
3816
"created tag."
3817
msgstr ""
3818
3819
#: bzrlib/builtins.py:5940
3820
msgid ""
3821
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3822
"along when you branch, push, pull or merge."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:5943
3826
msgid ""
3827
"It is an error to give a tag name that already exists unless you pass\n"
3828
"--force, in which case the tag is moved to point to the new revision."
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:5946
3832
msgid ""
3833
"To rename a tag (change the name but keep it on the same revsion), run "
3834
"``bzr\n"
3835
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:5949
3839
msgid ""
3840
"If no tag name is specified it will be determined through the \n"
3841
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3842
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3843
"details."
3844
msgstr ""
3845
3846
#: bzrlib/builtins.py:5959
3847
msgid "Delete this tag rather than placing it."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:5962
3851
msgid "Branch in which to place the tag."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:5964
3855
msgid "Replace existing tags."
3856
msgstr ""
3857
3858
#: bzrlib/builtins.py:5979
3859
msgid "No tag specified to delete."
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:5981
3863
#, python-format
3864
msgid "Deleted tag %s."
3865
msgstr ""
3866
3867
#: bzrlib/builtins.py:5995
3868
msgid "Please specify a tag name."
3869
msgstr ""
3870
3871
#: bzrlib/builtins.py:6003
3872
#, python-format
3873
msgid "Tag %s already exists for that revision."
3874
msgstr ""
3875
3876
#: bzrlib/builtins.py:6007
3877
#, python-format
3878
msgid "Created tag %s."
3879
msgstr ""
3880
3881
#: bzrlib/builtins.py:6009
3882
#, python-format
3883
msgid "Updated tag %s."
3884
msgstr ""
3885
3886
#: bzrlib/builtins.py:6013
3887
msgid "List tags."
3888
msgstr ""
3889
3890
#: bzrlib/builtins.py:6015
3891
msgid ""
3892
"This command shows a table of tag names and the revisions they reference."
3893
msgstr ""
3894
3895
#: bzrlib/builtins.py:6021
3896
msgid "Branch whose tags should be displayed."
3897
msgstr ""
3898
3899
#: bzrlib/builtins.py:6023
3900
msgid "Sort tags by different criteria."
3901
msgstr ""
3902
3903
#: bzrlib/builtins.py:6023
3904
msgid "Sorting"
3905
msgstr "Sortierung"
3906
3907
#: bzrlib/builtins.py:6092
3908
msgid "Reconfigure the type of a bzr directory."
3909
msgstr ""
3910
3911
#: bzrlib/builtins.py:6094
3912
msgid "A target configuration must be specified."
3913
msgstr "Es muss eine Zielkonfiguration angegeben werden."
3914
3915
#: bzrlib/builtins.py:6096
3916
msgid ""
3917
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3918
"The order of preference is\n"
3919
"1. For a lightweight checkout, the current bound location.\n"
3920
"2. For branches that used to be checkouts, the previously-bound location.\n"
3921
"3. The push location.\n"
3922
"4. The parent location.\n"
3923
"If none of these is available, --bind-to must be specified."
3924
msgstr ""
3925
3926
#: bzrlib/builtins.py:6110
3927
msgid "Tree type"
3928
msgstr ""
3929
3930
#: bzrlib/builtins.py:6111
3931
msgid "The relation between branch and tree."
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:6113
3935
msgid "Reconfigure to be an unbound branch with no working tree."
3936
msgstr ""
3937
3938
#: bzrlib/builtins.py:6114
3939
msgid "Reconfigure to be an unbound branch with a working tree."
3940
msgstr ""
3941
3942
#: bzrlib/builtins.py:6115
3943
msgid "Reconfigure to be a bound branch with a working tree."
3944
msgstr ""
3945
3946
#: bzrlib/builtins.py:6116
3947
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3948
msgstr ""
3949
3950
#: bzrlib/builtins.py:6121
3951
msgid "Repository type"
3952
msgstr ""
3953
3954
#: bzrlib/builtins.py:6122
3955
msgid "Location fo the repository."
3956
msgstr ""
3957
3958
#: bzrlib/builtins.py:6124
3959
msgid ""
3960
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3961
msgstr ""
3962
3963
#: bzrlib/builtins.py:6126
3964
msgid "Reconfigure to use a shared repository."
3965
msgstr ""
3966
3967
#: bzrlib/builtins.py:6130
3968
msgid "Trees in Repository"
3969
msgstr ""
3970
3971
#: bzrlib/builtins.py:6131
3972
msgid "Whether new branches in the repository have trees."
3973
msgstr ""
3974
3975
#: bzrlib/builtins.py:6133
3976
msgid ""
3977
"Reconfigure repository to create working trees on branches by default."
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6135
3981
msgid ""
3982
"Reconfigure repository to not create working trees on branches by default."
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6138
3986
msgid "Branch to bind checkout to."
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6140
3990
msgid "Perform reconfiguration even if local changes will be lost."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6143
3994
msgid "Reconfigure a branch to be stacked on another branch."
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6147
3998
msgid ""
3999
"Reconfigure a branch to be unstacked. This may require copying substantial "
4000
"data into it."
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:6157
4004
msgid "Can't use both --stacked-on and --unstacked"
4005
msgstr ""
4006
"Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
4007
4008
#: bzrlib/builtins.py:6171
4009
msgid "No target configuration specified"
4010
msgstr "Keine Zielkonfiguration angegeben"
4011
4012
#: bzrlib/builtins.py:6206
4013
msgid "Set the branch of a checkout and update."
4014
msgstr "Branch eines Checkout setzen und aktualisieren."
4015
4016
#: bzrlib/builtins.py:6208
4017
msgid ""
4018
"For lightweight checkouts, this changes the branch being referenced.\n"
4019
"For heavyweight checkouts, this checks that there are no local commits\n"
4020
"versus the current bound branch, then it makes the local branch a mirror\n"
4021
"of the new location and binds to it."
4022
msgstr ""
4023
4024
#: bzrlib/builtins.py:6213
4025
msgid ""
4026
"In both cases, the working tree is updated and uncommitted changes\n"
4027
"are merged. The user can commit or revert these as they desire."
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6216
4031
msgid "Pending merges need to be committed or reverted before using switch."
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6218
4035
msgid ""
4036
"The path to the branch to switch to can be specified relative to the parent\n"
4037
"directory of the current branch. For example, if you are currently in a\n"
4038
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4039
"/path/to/newbranch."
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6223
4043
msgid ""
4044
"Bound branches use the nickname of its master branch unless it is set\n"
4045
"locally, in which case switching will update the local nickname to be\n"
4046
"that of the master."
4047
msgstr ""
4048
4049
#: bzrlib/builtins.py:6231
4050
msgid "Switch even if local commits will be lost."
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:6234
4054
msgid "Create the target branch from this one before switching to it."
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6248
4058
msgid "You must supply either a revision or a location"
4059
msgstr ""
4060
4061
#: bzrlib/builtins.py:6261
4062
msgid "cannot create branch without source branch"
4063
msgstr ""
4064
4065
#: bzrlib/builtins.py:6286
4066
msgid "Manage filtered views."
4067
msgstr ""
4068
4069
#: bzrlib/builtins.py:6288
4070
msgid ""
4071
"Views provide a mask over the tree so that users can focus on\n"
4072
"a subset of a tree when doing their work. After creating a view,\n"
4073
"commands that support a list of files - status, diff, commit, etc -\n"
4074
"effectively have that list of files implicitly given each time.\n"
4075
"An explicit list of files can still be given but those files\n"
4076
"must be within the current view."
4077
msgstr ""
4078
4079
#: bzrlib/builtins.py:6295
4080
msgid ""
4081
"In most cases, a view has a short life-span: it is created to make\n"
4082
"a selected change and is deleted once that change is committed.\n"
4083
"At other times, you may wish to create one or more named views\n"
4084
"and switch between them."
4085
msgstr ""
4086
4087
#: bzrlib/builtins.py:6300
4088
msgid ""
4089
"To disable the current view without deleting it, you can switch to\n"
4090
"the pseudo view called ``off``. This can be useful when you need\n"
4091
"to see the whole tree for an operation or two (e.g. merge) but\n"
4092
"want to switch back to your view after that."
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:6305
4096
msgid ""
4097
":Examples:\n"
4098
" To define the current view::"
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6308
4102
msgid " bzr view file1 dir1 ..."
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6310
4106
msgid " To list the current view::"
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6312
4110
msgid " bzr view"
4111
msgstr " bzr view"
4112
4113
#: bzrlib/builtins.py:6314
4114
msgid " To delete the current view::"
4115
msgstr ""
4116
4117
#: bzrlib/builtins.py:6316
4118
msgid " bzr view --delete"
4119
msgstr " bzr view --delete"
4120
4121
#: bzrlib/builtins.py:6318
4122
msgid " To disable the current view without deleting it::"
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6320
4126
msgid " bzr view --switch off"
4127
msgstr " bzr view --switch off"
4128
4129
#: bzrlib/builtins.py:6322
4130
msgid " To define a named view and switch to it::"
4131
msgstr ""
4132
4133
#: bzrlib/builtins.py:6324
4134
msgid " bzr view --name view-name file1 dir1 ..."
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:6326
4138
msgid " To list a named view::"
4139
msgstr ""
4140
4141
#: bzrlib/builtins.py:6328
4142
msgid " bzr view --name view-name"
4143
msgstr ""
4144
4145
#: bzrlib/builtins.py:6330
4146
msgid " To delete a named view::"
4147
msgstr ""
4148
4149
#: bzrlib/builtins.py:6332
4150
msgid " bzr view --name view-name --delete"
4151
msgstr ""
4152
4153
#: bzrlib/builtins.py:6334
4154
msgid " To switch to a named view::"
4155
msgstr ""
4156
4157
#: bzrlib/builtins.py:6336
4158
msgid " bzr view --switch view-name"
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:6338
4162
msgid " To list all views defined::"
4163
msgstr ""
4164
4165
#: bzrlib/builtins.py:6340
4166
msgid " bzr view --all"
4167
msgstr " bzr view --all"
4168
4169
#: bzrlib/builtins.py:6342
4170
msgid " To delete all views::"
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6344
4174
msgid " bzr view --delete --all"
4175
msgstr " bzr view --delete --all"
4176
4177
#: bzrlib/builtins.py:6351
4178
msgid "Apply list or delete action to all views."
4179
msgstr ""
4180
4181
#: bzrlib/builtins.py:6354
4182
msgid "Delete the view."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6357
4186
msgid "Name of the view to define, list or delete."
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6361
4190
msgid "Name of the view to switch to."
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6380
4194
msgid "Both --delete and a file list specified"
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6383
4198
msgid "Both --delete and --switch specified"
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6386
4202
msgid "Deleted all views.\n"
4203
msgstr ""
4204
4205
#: bzrlib/builtins.py:6388
4206
msgid "No current view to delete"
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:6391
4210
#, python-format
4211
msgid "Deleted '%s' view.\n"
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6395
4215
msgid "Both --switch and a file list specified"
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6398
4219
msgid "Both --switch and --all specified"
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6401
4223
msgid "No current view to disable"
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6403
4227
#, python-format
4228
msgid "Disabled '%s' view.\n"
4229
msgstr ""
4230
4231
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4232
msgid "Using '{0}' view: {1}\n"
4233
msgstr ""
4234
4235
#: bzrlib/builtins.py:6410
4236
msgid "Views defined:\n"
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6419
4240
msgid "No views defined.\n"
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6426
4244
msgid "Cannot change the 'off' pseudo view"
4245
msgstr ""
4246
4247
#: bzrlib/builtins.py:6434
4248
msgid "No current view.\n"
4249
msgstr ""
4250
4251
#: bzrlib/builtins.py:6437
4252
msgid "'{0}' view is: {1}\n"
4253
msgstr ""
4254
4255
#: bzrlib/builtins.py:6457
4256
msgid " <no hooks installed>\n"
4257
msgstr ""
4258
4259
#: bzrlib/builtins.py:6461
4260
msgid "Remove a branch."
4261
msgstr "Einen Zweig entfernen."
4262
4263
#: bzrlib/builtins.py:6463
4264
msgid ""
4265
"This will remove the branch from the specified location but \n"
4266
"will keep any working tree or repository in place."
4267
msgstr ""
4268
4269
#: bzrlib/builtins.py:6468
4270
msgid " Remove the branch at repo/trunk::"
4271
msgstr ""
4272
4273
#: bzrlib/builtins.py:6470
4274
msgid " bzr remove-branch repo/trunk"
4275
msgstr " bzr remove-branch repo/trunk"
4276
4277
#: bzrlib/builtins.py:6477
4278
msgid "Remove branch even if it is the active branch."
4279
msgstr "Zweig entfernen, selbst wenn es ein aktiver Zweig ist."
4280
4281
#: bzrlib/builtins.py:6491
4282
msgid "Branch is active. Use --force to remove it."
4283
msgstr "Zweig ist aktiv. Benutzen Sie --force, um ihn zu entfernen."
4284
4285
#: bzrlib/builtins.py:6495
4286
msgid "Plaintext diff output."
4287
msgstr ""
4288
4289
#: bzrlib/builtins.py:6496
4290
msgid "Temporarily set aside some changes from the current tree."
4291
msgstr ""
4292
4293
#: bzrlib/builtins.py:6498
4294
msgid ""
4295
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4296
"ie. out of the way, until a later time when you can bring them back from\n"
4297
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4298
"your working tree, and so they aren't propagated along with your branch nor\n"
4299
"will they survive its deletion."
4300
msgstr ""
4301
4302
#: bzrlib/builtins.py:6504
4303
msgid "If shelve --list is specified, previously-shelved changes are listed."
4304
msgstr ""
4305
4306
#: bzrlib/builtins.py:6506
4307
msgid ""
4308
"Shelve is intended to help separate several sets of changes that have\n"
4309
"been inappropriately mingled. If you just want to get rid of all changes\n"
4310
"and you don't need to restore them later, use revert. If you want to\n"
4311
"shelve all text changes at once, use shelve --all."
4312
msgstr ""
4313
4314
#: bzrlib/builtins.py:6511
4315
msgid ""
4316
"If filenames are specified, only the changes to those files will be\n"
4317
"shelved. Other files will be left untouched."
4318
msgstr ""
4319
4320
#: bzrlib/builtins.py:6514
4321
msgid ""
4322
"If a revision is specified, changes since that revision will be shelved."
4323
msgstr ""
4324
4325
#: bzrlib/builtins.py:6516
4326
msgid ""
4327
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4328
"restore the most recently shelved changes."
4329
msgstr ""
4330
4331
#: bzrlib/builtins.py:6519
4332
msgid ""
4333
"For complicated changes, it is possible to edit the changes in a separate\n"
4334
"editor program to decide what the file remaining in the working copy\n"
4335
"should look like. To do this, add the configuration option"
4336
msgstr ""
4337
4338
#: bzrlib/builtins.py:6523
4339
msgid " change_editor = PROGRAM @new_path @old_path"
4340
msgstr ""
4341
4342
#: bzrlib/builtins.py:6525
4343
msgid ""
4344
"where @new_path is replaced with the path of the new version of the \n"
4345
"file and @old_path is replaced with the path of the old version of \n"
4346
"the file. The PROGRAM should save the new file with the desired \n"
4347
"contents of the file in the working tree.\n"
4348
" "
4349
msgstr ""
4350
4351
#: bzrlib/builtins.py:6537
4352
msgid "Shelve all changes."
4353
msgstr ""
4354
4355
#: bzrlib/builtins.py:6539
4356
msgid "Method to use for writing diffs."
4357
msgstr ""
4358
4359
#: bzrlib/builtins.py:6539
4360
msgid "writer"
4361
msgstr ""
4362
4363
#: bzrlib/builtins.py:6543
4364
msgid "List shelved changes."
4365
msgstr ""
4366
4367
#: bzrlib/builtins.py:6545
4368
msgid "Destroy removed changes instead of shelving them."
4369
msgstr ""
4370
4371
#: bzrlib/builtins.py:6574
4372
msgid "No shelved changes."
4373
msgstr ""
4374
4375
#: bzrlib/builtins.py:6585
4376
msgid "Restore shelved changes."
4377
msgstr ""
4378
4379
#: bzrlib/builtins.py:6587
4380
msgid ""
4381
"By default, the most recently shelved changes are restored. However if you\n"
4382
"specify a shelf by id those changes will be restored instead. This works\n"
4383
"best when the changes don't depend on each other."
4384
msgstr ""
4385
4386
#: bzrlib/builtins.py:6596
4387
msgid "The action to perform."
4388
msgstr "Die auszuführende Aktion."
4389
4390
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4391
msgid "action"
4392
msgstr "Aktion"
4393
4394
#: bzrlib/builtins.py:6598
4395
msgid "Apply changes and remove from the shelf."
4396
msgstr ""
4397
4398
#: bzrlib/builtins.py:6599
4399
msgid "Show changes, but do not apply or remove them."
4400
msgstr "Änderungen anzeigen, aber nicht anwenden oder entfernen."
4401
4402
#: bzrlib/builtins.py:6600
4403
msgid ""
4404
"Instead of unshelving the changes, show the diff that would result from "
4405
"unshelving."
4406
msgstr ""
4407
4408
#: bzrlib/builtins.py:6602
4409
msgid "Delete changes without applying them."
4410
msgstr "Änderungen löschen ohne diese anzuwenden."
4411
4412
#: bzrlib/builtins.py:6603
4413
msgid "Apply changes but don't delete them."
4414
msgstr "Änderungen anwenden, aber diese nicht löschen."
4415
4416
#: bzrlib/builtins.py:6618
4417
msgid "Remove unwanted files from working tree."
4418
msgstr ""
4419
4420
#: bzrlib/builtins.py:6620
4421
msgid ""
4422
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4423
"files are never deleted."
4424
msgstr ""
4425
4426
#: bzrlib/builtins.py:6623
4427
msgid ""
4428
"Another class is 'detritus', which includes files emitted by bzr during\n"
4429
"normal operations and selftests. (The value of these files decreases with\n"
4430
"time.)"
4431
msgstr ""
4432
4433
#: bzrlib/builtins.py:6627
4434
msgid ""
4435
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4436
"flags are respected, and may be combined."
4437
msgstr ""
4438
4439
#: bzrlib/builtins.py:6630
4440
msgid "To check what clean-tree will do, use --dry-run."
4441
msgstr "Um zu prüfen, was clean-tree tun wird, --dry-run benutzen."
4442
4443
#: bzrlib/builtins.py:6633
4444
msgid "Delete all ignored files."
4445
msgstr "Alle ignorierten Dateien löschen."
4446
4447
#: bzrlib/builtins.py:6634
4448
msgid ""
4449
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4450
msgstr ""
4451
4452
#: bzrlib/builtins.py:6637
4453
msgid "Delete files unknown to bzr (default)."
4454
msgstr "Dateien löschen, die bzr nicht bekannt sind (Vorgabe)."
4455
4456
#: bzrlib/builtins.py:6638
4457
msgid "Show files to delete instead of deleting them."
4458
msgstr "Dateien zum Löschen anzeigen, anstelle diese zu löschen."
4459
4460
#: bzrlib/builtins.py:6640
4461
msgid "Do not prompt before deleting."
4462
msgstr "Vor dem Löschen nicht nachfragen."
4463
4464
#: bzrlib/bundle/__init__.py:59
4465
msgid "A directory cannot be a bundle"
4466
msgstr ""
4467
4468
#: bzrlib/bundle/apply_bundle.py:40
4469
msgid "Install revisions"
4470
msgstr "Revisionen installieren"
4471
4472
#: bzrlib/bundle/commands.py:64
4473
msgid "--verbose requires a merge directive"
4474
msgstr ""
4475
4476
#: bzrlib/bundle/commands.py:67
4477
msgid "Bundle format not supported"
4478
msgstr ""
4479
4480
#: bzrlib/bundle/commands.py:77
4481
msgid "Records\n"
4482
msgstr ""
4483
4484
#: bzrlib/bundle/commands.py:81
4485
msgid "{0}: {1} ({2} multiparent)\n"
4486
msgstr ""
4487
4488
#: bzrlib/bundle/commands.py:83
4489
#, python-format
4490
msgid "unique files: %d\n"
4491
msgstr ""
4492
4493
#: bzrlib/bundle/commands.py:92
4494
msgid "Revisions\n"
4495
msgstr "Revisionen\n"
4496
4497
#: bzrlib/bundle/commands.py:93
4498
#, python-format
4499
msgid "nicks: %s\n"
4500
msgstr ""
4501
4502
#: bzrlib/bundle/commands.py:95
4503
#, python-format
4504
msgid ""
4505
"committers: \n"
4506
"%s\n"
4507
msgstr ""
4508
4509
#: bzrlib/bundle/commands.py:103
4510
msgid "Decoded contents\n"
4511
msgstr ""
4512
4513
#: bzrlib/bundle/serializer/v4.py:327
4514
#, python-format
4515
msgid "Bundling %d revision."
4516
msgid_plural "Bundling %d revisions."
4517
msgstr[0] ""
4518
msgstr[1] ""
4519
4520
#: bzrlib/bzrdir.py:487
4521
msgid ""
4522
"making backup of {0}\n"
4523
" to {1}"
4524
msgstr ""
4525
4526
#: bzrlib/bzrdir.py:510
4527
msgid "renamed {0} to {1}"
4528
msgstr "{0} wurde in {1} umbenannt"
4529
4530
#: bzrlib/bzrdir.py:1639
4531
#, python-format
4532
msgid ""
4533
"Source repository format does not support stacking, using format:\n"
4534
" %s"
4535
msgstr ""
4536
4537
#: bzrlib/bzrdir.py:1659
4538
#, python-format
4539
msgid ""
4540
"Source branch format does not support stacking, using format:\n"
4541
" %s"
4542
msgstr ""
4543
4544
#: bzrlib/bzrdir.py:1805
4545
msgid "starting repository conversion"
4546
msgstr ""
4547
4548
#: bzrlib/bzrdir.py:2026
4549
msgid "Using default stacking branch {0} at {1}"
4550
msgstr ""
4551
4552
#: bzrlib/check.py:108
4553
msgid "check"
4554
msgstr "Prüfen"
4555
4556
#: bzrlib/check.py:110
4557
msgid "checking revisions"
4558
msgstr "Revisionen prüfen"
4559
4560
#: bzrlib/check.py:112
4561
msgid "checking commit contents"
4562
msgstr ""
4563
4564
#: bzrlib/check.py:114
4565
msgid "checking file graphs"
4566
msgstr ""
4567
4568
#: bzrlib/check.py:118
4569
msgid "checking branches and trees"
4570
msgstr ""
4571
4572
#: bzrlib/check.py:205
4573
msgid "checked repository {0} format {1}"
4574
msgstr ""
4575
4576
#: bzrlib/check.py:208
4577
#, python-format
4578
msgid "%6d revisions"
4579
msgstr "%6d Revisionen"
4580
4581
#: bzrlib/check.py:209
4582
#, python-format
4583
msgid "%6d file-ids"
4584
msgstr ""
4585
4586
#: bzrlib/check.py:211
4587
#, python-format
4588
msgid "%6d unreferenced text versions"
4589
msgstr ""
4590
4591
#: bzrlib/check.py:215
4592
msgid "unreferenced version: {{{0}}} in {1}"
4593
msgstr ""
4594
4595
#: bzrlib/check.py:218
4596
#, python-format
4597
msgid "%6d revisions are missing inventory_sha1"
4598
msgstr ""
4599
4600
#: bzrlib/check.py:221
4601
#, python-format
4602
msgid "%6d revisions are mentioned but not present"
4603
msgstr ""
4604
4605
#: bzrlib/check.py:224
4606
#, python-format
4607
msgid "%6d ghost revisions"
4608
msgstr "%6d Geister-Revisionen"
4609
4610
#: bzrlib/check.py:229
4611
#, python-format
4612
msgid "%6d revisions missing parents in ancestry"
4613
msgstr ""
4614
4615
#: bzrlib/check.py:233
4616
#, python-format
4617
msgid " %s should be in the ancestry for:"
4618
msgstr ""
4619
4620
#: bzrlib/check.py:237
4621
#, python-format
4622
msgid "%6d inconsistent parents"
4623
msgstr ""
4624
4625
#: bzrlib/check.py:241
4626
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4627
msgstr ""
4628
4629
#: bzrlib/check.py:247
4630
#, python-format
4631
msgid "%6d revisions have incorrect parents in the revision index"
4632
msgstr ""
4633
4634
#: bzrlib/check.py:253
4635
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4636
msgstr ""
4637
4638
#: bzrlib/check.py:267
4639
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4640
msgstr ""
4641
4642
#: bzrlib/check.py:296
4643
msgid ""
4644
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4645
"{{{4}}}"
4646
msgstr ""
4647
4648
#: bzrlib/check.py:354
4649
#, python-format
4650
msgid "Checking branch at '%s'."
4651
msgstr "Zweig wird geprüft bei »%s«."
4652
4653
#: bzrlib/check.py:374
4654
#, python-format
4655
msgid "Checking working tree at '%s'."
4656
msgstr ""
4657
4658
#: bzrlib/check.py:427 bzrlib/check.py:441
4659
msgid "No branch found at specified location."
4660
msgstr ""
4661
4662
#: bzrlib/check.py:429 bzrlib/check.py:439
4663
msgid "No working tree found at specified location."
4664
msgstr ""
4665
4666
#: bzrlib/check.py:432
4667
#, python-format
4668
msgid "Checking repository at '%s'."
4669
msgstr ""
4670
4671
#: bzrlib/check.py:443
4672
msgid "No repository found at specified location."
4673
msgstr ""
4674
4675
#: bzrlib/clean_tree.py:63
4676
msgid "Nothing to delete."
4677
msgstr "Nichts zu löschen."
4678
4679
#: bzrlib/clean_tree.py:68
4680
msgid "Are you sure you wish to delete these"
4681
msgstr "Sind Sie sicher, dass Sie diese löschen möchten"
4682
4683
#: bzrlib/clean_tree.py:70
4684
msgid "Canceled"
4685
msgstr "Abgebrochen"
4686
4687
#: bzrlib/clean_tree.py:107
4688
#, python-format
4689
msgid "unable to remove %s"
4690
msgstr "%s kann nicht entfernt werden"
4691
4692
#: bzrlib/clean_tree.py:111
4693
msgid "deleting paths:"
4694
msgstr "Pfade werden gelöscht:"
4695
4696
#: bzrlib/clean_tree.py:125
4697
msgid "unable to remove \"{0}\": {1}."
4698
msgstr "»{0}« kann nicht entfernt werden: {1}."
4699
4700
#: bzrlib/clean_tree.py:130
4701
msgid "No files deleted."
4702
msgstr "Keine Dateien gelöscht."
4703
4704
#: bzrlib/cmd_version_info.py:47
4705
msgid "No known version info format {0}. Supported types are: {1}"
4706
msgstr ""
4707
"Unbekanntes Format {0} für Versionsinformationen. Unterstützte Typen sind: "
4708
"{1}"
4709
4710
#: bzrlib/cmd_version_info.py:52
4711
msgid "Version info in Custom template-based format."
4712
msgstr ""
4713
4714
#: bzrlib/cmd_version_info.py:52
4715
msgid "Version info in Python format."
4716
msgstr "Versionsinformationen im Python-Format."
4717
4718
#: bzrlib/cmd_version_info.py:52
4719
msgid "Version info in RIO (simple text) format (default)."
4720
msgstr "Versionsinformationen im RIO (nur Text)-Format (Vorgabe)."
4721
4722
#: bzrlib/cmd_version_info.py:53
4723
msgid "Show version information about this tree."
4724
msgstr ""
4725
4726
#: bzrlib/cmd_version_info.py:55
4727
msgid ""
4728
"You can use this command to add information about version into\n"
4729
"source code of an application. The output can be in one of the\n"
4730
"supported formats or in a custom format based on a template."
4731
msgstr ""
4732
4733
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4734
#: en/help_topics/configuration.txt:722
4735
msgid "For example::"
4736
msgstr "Zum Beispiel:"
4737
4738
#: bzrlib/cmd_version_info.py:61
4739
msgid ""
4740
" bzr version-info --custom \\\n"
4741
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4742
msgstr ""
4743
4744
#: bzrlib/cmd_version_info.py:64
4745
msgid ""
4746
"will produce a C header file with formatted string containing the\n"
4747
"current revision number. Other supported variables in templates are:"
4748
msgstr ""
4749
4750
#: bzrlib/cmd_version_info.py:67
4751
msgid ""
4752
" * {date} - date of the last revision\n"
4753
" * {build_date} - current date\n"
4754
" * {revno} - revision number\n"
4755
" * {revision_id} - revision id\n"
4756
" * {branch_nick} - branch nickname\n"
4757
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4758
" otherwise 1"
4759
msgstr ""
4760
4761
#: bzrlib/cmd_version_info.py:77
4762
msgid "Select the output format."
4763
msgstr "Wählen Sie das Ausgabeformat."
4764
4765
#: bzrlib/cmd_version_info.py:81
4766
msgid "Include all possible information."
4767
msgstr "Sämtliche verfügbaren Informationen einschließen."
4768
4769
#: bzrlib/cmd_version_info.py:82
4770
msgid "Check if tree is clean."
4771
msgstr ""
4772
4773
#: bzrlib/cmd_version_info.py:84
4774
msgid "Include the revision-history."
4775
msgstr "Revisionsverlauf einschließen."
4776
4777
#: bzrlib/cmd_version_info.py:86
4778
msgid "Include the last revision for each file."
4779
msgstr "Neueste Revision jeder Datei einschließen."
4780
4781
#: bzrlib/cmd_version_info.py:87
4782
msgid "Template for the output."
4783
msgstr ""
4784
4785
#: bzrlib/cmd_version_info.py:101
4786
msgid "bzr version-info --revision takes exactly one revision specifier"
4787
msgstr ""
4788
4789
#: bzrlib/commands.py:229
4790
#, python-format
4791
msgid "unknown command \"%s\""
4792
msgstr "Unbekannter Befehl »%s«"
4793
4794
#: bzrlib/commands.py:476
4795
msgid "No help for this command."
4796
msgstr "Keine Hilfe zu diesem Befehl verfügbar."
4797
4798
#: bzrlib/commands.py:489
4799
#, python-format
4800
msgid ":Purpose: %s\n"
4801
msgstr ":Zweck: %s\n"
4802
4803
#: bzrlib/commands.py:491
4804
#, python-format
4805
msgid ""
4806
":Usage:\n"
4807
"%s\n"
4808
msgstr ""
4809
":Aufruf:\n"
4810
"%s\n"
4811
4812
#: bzrlib/commands.py:493
4813
#, python-format
4814
msgid ":Usage: %s\n"
4815
msgstr ":Aufruf: %s\n"
4816
4817
#: bzrlib/commands.py:512
4818
#, python-format
4819
msgid ":Options:%s"
4820
msgstr ":Optionen: %s"
4821
4822
#: bzrlib/commands.py:523
4823
#, python-format
4824
msgid ""
4825
":Description:\n"
4826
" %s\n"
4827
"\n"
4828
msgstr ""
4829
":Beschreibung:\n"
4830
" %s\n"
4831
"\n"
4832
4833
#: bzrlib/commands.py:533
4834
#, python-format
4835
msgid ""
4836
"See bzr help %s for more details and examples.\n"
4837
"\n"
4838
msgstr ""
4839
4840
#: bzrlib/commands.py:538
4841
msgid ":Aliases: "
4842
msgstr ":Aliase: "
4843
4844
#: bzrlib/commands.py:542
4845
#, python-format
4846
msgid ":From: plugin \"%s\"\n"
4847
msgstr ":Von: Erweiterung »%s«\n"
4848
4849
#: bzrlib/commands.py:554
4850
msgid ":doc:`{0} <{1}-help>`"
4851
msgstr ""
4852
4853
#: bzrlib/commands.py:558
4854
#, python-format
4855
msgid ":See also: %s"
4856
msgstr ":Siehe auch: %s"
4857
4858
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4859
msgid "Only ASCII permitted in option names"
4860
msgstr ""
4861
4862
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4863
msgid "command {0!r} needs one or more {1}"
4864
msgstr ""
4865
4866
#: bzrlib/commands.py:868
4867
msgid "command {0!r} requires argument {1}"
4868
msgstr ""
4869
4870
#: bzrlib/commands.py:875
4871
msgid "extra argument to command {0}: {1}"
4872
msgstr ""
4873
4874
#: bzrlib/commands.py:972
4875
#, python-format
4876
msgid "Profile data written to \"%s\"."
4877
msgstr ""
4878
4879
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4880
msgid "added"
4881
msgstr "Hinzugefügt"
4882
4883
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4884
msgid "modified"
4885
msgstr "Geändert"
4886
4887
#: bzrlib/commit.py:131
4888
#, python-format
4889
msgid "Committing%s"
4890
msgstr ""
4891
4892
#: bzrlib/commit.py:134
4893
#, python-format
4894
msgid "Committed revision %d."
4895
msgstr ""
4896
4897
#: bzrlib/commit.py:143
4898
#, python-format
4899
msgid "deleted %s"
4900
msgstr "%s gelöscht"
4901
4902
#: bzrlib/commit.py:146
4903
#, python-format
4904
msgid "missing %s"
4905
msgstr "%s fehlt"
4906
4907
#: bzrlib/commit.py:511
4908
msgid ""
4909
"Conflicting tags in bound branch:\n"
4910
"{0}"
4911
msgstr ""
4912
4913
#: bzrlib/commit.py:742
4914
msgid "renamed"
4915
msgstr "Umbenannt"
4916
4917
#: bzrlib/commit.py:976
4918
msgid "unchanged"
4919
msgstr "Ungeändert"
4920
4921
#: bzrlib/commit.py:998
4922
msgid "{0} [{1}] - Stage"
4923
msgstr ""
4924
4925
#: bzrlib/commit.py:1001
4926
#, python-format
4927
msgid "%s - Stage"
4928
msgstr ""
4929
4930
#: bzrlib/commit_signature_commands.py:34
4931
msgid "Sign all commits by a given committer."
4932
msgstr ""
4933
4934
#: bzrlib/commit_signature_commands.py:36
4935
msgid ""
4936
"If location is not specified the local tree is used.\n"
4937
"If committer is not specified the default committer is used."
4938
msgstr ""
4939
4940
#: bzrlib/commit_signature_commands.py:39
4941
msgid "This does not sign commits that already have signatures."
4942
msgstr ""
4943
4944
#: bzrlib/commit_signature_commands.py:47
4945
msgid ""
4946
"Don't actually sign anything, just print the revisions that would be signed."
4947
msgstr ""
4948
4949
#: bzrlib/commit_signature_commands.py:98
4950
#, python-format
4951
msgid "Signed %d revision.\n"
4952
msgid_plural "Signed %d revisions.\n"
4953
msgstr[0] ""
4954
msgstr[1] ""
4955
4956
#: bzrlib/commit_signature_commands.py:103
4957
msgid "Verify all commit signatures."
4958
msgstr ""
4959
4960
#: bzrlib/commit_signature_commands.py:105
4961
msgid ""
4962
"Verifies that all commits in the branch are signed by known GnuPG keys."
4963
msgstr ""
4964
4965
#: bzrlib/commit_signature_commands.py:110
4966
msgid ""
4967
"Comma separated list of GPG key patterns which are acceptable for "
4968
"verification."
4969
msgstr ""
4970
4971
#: bzrlib/commit_signature_commands.py:148
4972
msgid "Cannot verify a range of non-revision-history revisions"
4973
msgstr ""
4974
4975
#: bzrlib/commit_signature_commands.py:166
4976
msgid "All commits signed with verifiable keys"
4977
msgstr ""
4978
4979
#: bzrlib/config.py:436
4980
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4981
msgstr ""
4982
4983
#: bzrlib/config.py:2452
4984
msgid "{0} is not an SI unit."
4985
msgstr ""
4986
4987
#: bzrlib/config.py:2971
4988
msgid ""
4989
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4990
"will be saved."
4991
msgstr ""
4992
4993
#: bzrlib/config.py:3116
4994
#, python-format
4995
msgid "Invalid '%s', should be of the form 'name=value'"
4996
msgstr ""
4997
4998
#: bzrlib/config.py:4018
4999
msgid "Display, set or remove a configuration option."
5000
msgstr "Eine Konfigurationsoption anzeigen, festlegen oder löschen."
5001
5002
#: bzrlib/config.py:4020
5003
msgid "Display the active value for a given option."
5004
msgstr "Aktiven Wert zur angegebenen Option anzeigen."
5005
5006
#: bzrlib/config.py:4022
5007
msgid ""
5008
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5009
"matching options are displayed mentioning their scope. The active value\n"
5010
"that bzr will take into account is the first one displayed for each option."
5011
msgstr ""
5012
5013
#: bzrlib/config.py:4026
5014
msgid "If no NAME is given, --all .* is implied."
5015
msgstr ""
5016
5017
#: bzrlib/config.py:4028
5018
msgid ""
5019
"Setting a value is achieved by using name=value without spaces. The value\n"
5020
"is set in the most relevant scope and can be checked by displaying the\n"
5021
"option again."
5022
msgstr ""
5023
5024
#: bzrlib/config.py:4040
5025
msgid "Reduce the scope to the specified configuration file."
5026
msgstr ""
5027
5028
#: bzrlib/config.py:4044
5029
msgid "Display all the defined values for the matching options."
5030
msgstr "Alle definierten Werte für die zutreffenden Optionen anzeigen."
5031
5032
#: bzrlib/config.py:4046
5033
msgid "Remove the option from the configuration file."
5034
msgstr "Die Option aus der Konfigurationsdatei entfernen."
5035
5036
#: bzrlib/conflicts.py:50
5037
msgid "List files with conflicts."
5038
msgstr "In Konflikt stehende Dateien auflisten."
5039
5040
#: bzrlib/conflicts.py:57
5041
msgid ""
5042
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5043
"is supplied, the pathnames of files with text conflicts are listed,\n"
5044
"instead. (This is useful for editing all files with text conflicts.)"
5045
msgstr ""
5046
5047
#: bzrlib/conflicts.py:61
5048
msgid "Use bzr resolve when you have fixed a problem."
5049
msgstr "Benutzen Sie bzr resolve, wenn Sie ein Problem gelöst haben."
5050
5051
#: bzrlib/conflicts.py:66
5052
msgid "List paths of files with text conflicts."
5053
msgstr ""
5054
5055
#: bzrlib/conflicts.py:85
5056
msgid "Marks the conflict as resolved."
5057
msgstr ""
5058
5059
#: bzrlib/conflicts.py:88
5060
msgid "Resolve the conflict preserving the version in the working tree."
5061
msgstr ""
5062
5063
#: bzrlib/conflicts.py:91
5064
msgid "Resolve the conflict taking the merged version into account."
5065
msgstr ""
5066
5067
#: bzrlib/conflicts.py:98
5068
msgid "How to resolve the conflict."
5069
msgstr ""
5070
5071
#: bzrlib/conflicts.py:104
5072
msgid "Mark a conflict as resolved."
5073
msgstr ""
5074
5075
#: bzrlib/conflicts.py:111
5076
msgid ""
5077
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5078
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5079
"as\n"
5080
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5081
msgstr ""
5082
5083
#: bzrlib/conflicts.py:119
5084
msgid "Resolve all conflicts in this tree."
5085
msgstr ""
5086
5087
#: bzrlib/conflicts.py:126
5088
msgid "If --all is specified, no FILE may be provided"
5089
msgstr ""
5090
5091
#: bzrlib/conflicts.py:151
5092
#, python-format
5093
msgid "%d conflict auto-resolved."
5094
msgid_plural "%d conflicts auto-resolved."
5095
msgstr[0] "%d Konflikt automatisch aufgelöst."
5096
msgstr[1] "%d Konflikte automatisch aufgelöst."
5097
5098
#: bzrlib/conflicts.py:154
5099
msgid "Remaining conflicts:"
5100
msgstr "Verbleibende Konflikte:"
5101
5102
#: bzrlib/conflicts.py:159
5103
msgid "All conflicts resolved."
5104
msgstr "Alle Konflikte gelöst."
5105
5106
#: bzrlib/conflicts.py:168
5107
msgid "{0} conflict resolved, {1} remaining"
5108
msgid_plural "{0} conflicts resolved, {1} remaining"
5109
msgstr[0] ""
5110
msgstr[1] ""
5111
5112
#: bzrlib/controldir.py:712
5113
msgid "{0} is{1} redirected to {2}"
5114
msgstr ""
5115
5116
#: bzrlib/diff.py:399
5117
#, python-format
5118
msgid "*** Ignoring files outside view. View is %s"
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:157
5122
msgid "The tree builder is already building a tree."
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:178
5126
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5127
msgstr ""
5128
5129
#: bzrlib/errors.py:197
5130
msgid ""
5131
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5132
"versions \"%(minimum)s\" to \"%(current)s\"."
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:209
5136
msgid "The transport '%(transport)s' is only accessible within this process."
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:227
5140
msgid "Invalid revision number %(revno)s"
5141
msgstr "Ungültige Revisionsnummer %(revno)s"
5142
5143
#: bzrlib/errors.py:236
5144
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:247
5148
msgid "Reserved revision-id {%(revision_id)s}"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:261
5152
msgid "There is no public branch set for \"%(branch_url)s\"."
5153
msgstr "Kein öffentlicher Zweig für »%(branch_url)s« festgelegt."
5154
5155
#: bzrlib/errors.py:271
5156
msgid ""
5157
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5158
"obtain a list of topics."
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:280
5162
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:290
5166
msgid ""
5167
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5168
msgstr ""
5169
5170
#: bzrlib/errors.py:299
5171
msgid "The branch '%(branch)s' is not stacked."
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:313
5175
msgid "No WorkingTree exists for \"%(base)s\"."
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:322
5179
msgid "Not currently building a tree."
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:327
5183
msgid "%(url)s is not a local path."
5184
msgstr "%(url)s ist kein lokaler Pfad."
5185
5186
#: bzrlib/errors.py:355
5187
msgid "%(not_locked)r is not write locked but needs to be."
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:363
5191
msgid "Error in command line options"
5192
msgstr "Fehler in den Befehlszeilenoptionen"
5193
5194
#: bzrlib/errors.py:368
5195
msgid "%(value)s is not an index of type %(_type)s."
5196
msgstr "%(value)s ist kein Index vom Typ %(_type)s."
5197
5198
#: bzrlib/errors.py:378
5199
msgid "Error in data for index %(value)s."
5200
msgstr "Fehler in den Daten für Index %(value)s."
5201
5202
#: bzrlib/errors.py:387
5203
msgid "The key '%(key)s' is already in index '%(index)s'."
5204
msgstr "Der Schlüssel »%(key)s« ist bereits im Index »%(index)s«."
5205
5206
#: bzrlib/errors.py:397
5207
msgid "The key '%(key)s' is not a valid key."
5208
msgstr "Der Schlüssel »%(key)s« ist ein ungültiger Schlüssel."
5209
5210
#: bzrlib/errors.py:406
5211
msgid "Could not parse options for index %(value)s."
5212
msgstr "Optionen für Index %(value)s konnten nicht verarbeitet werden."
5213
5214
#: bzrlib/errors.py:415
5215
msgid "The value '%(value)s' is not a valid value."
5216
msgstr "Der Wert »%(value)s« ist ein ungültiger Wert."
5217
5218
#: bzrlib/errors.py:424
5219
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5220
msgstr "Ungültiger Wert »%(value)s« für die Option »%(name)s«."
5221
5222
#: bzrlib/errors.py:443
5223
msgid "Generic path error: %(path)r%(extra)s)"
5224
msgstr "Allgemeiner Fehler im Pfad: %(path)r%(extra)s)"
5225
5226
#: bzrlib/errors.py:456
5227
msgid "No such file: %(path)r%(extra)s"
5228
msgstr "Datei existiert nicht: %(path)r%(extra)s"
5229
5230
#: bzrlib/errors.py:461
5231
msgid "File exists: %(path)r%(extra)s"
5232
msgstr "Datei existiert: %(path)r%(extra)s"
5233
5234
#: bzrlib/errors.py:467
5235
msgid ""
5236
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5237
"after to tell bzr about a rename that has already happened)%(extra)s"
5238
msgstr ""
5239
5240
#: bzrlib/errors.py:483
5241
msgid "\"%(path)s\" is not a directory %(extra)s"
5242
msgstr "»%(path)s« ist kein Verzeichnis %(extra)s"
5243
5244
#: bzrlib/errors.py:488
5245
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:493
5249
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5250
msgstr "Verzeichnis ist nicht leer: »%(path)s«%(extra)s"
5251
5252
#: bzrlib/errors.py:498
5253
msgid "Hard-linking \"%(path)s\" is not supported"
5254
msgstr ""
5255
5256
#: bzrlib/errors.py:513
5257
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:518
5261
msgid "Permission denied: \"%(path)s\"%(extra)s"
5262
msgstr "Zugriff verweigert: »%(path)s«%(extra)s"
5263
5264
#: bzrlib/errors.py:523
5265
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:528
5269
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:539
5273
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5274
msgstr ""
5275
5276
#: bzrlib/errors.py:561
5277
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5278
msgstr ""
5279
5280
#: bzrlib/errors.py:571
5281
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:579
5285
msgid ""
5286
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5287
"upgrade the branch to permit branch stacking."
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:590
5291
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5292
msgstr ""
5293
5294
#: bzrlib/errors.py:600
5295
msgid ""
5296
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5297
"need to upgrade the repository to permit branch stacking."
5298
msgstr ""
5299
5300
#: bzrlib/errors.py:611
5301
msgid "Error reading from %(path)r."
5302
msgstr "Fehler beim Lesen von %(path)r."
5303
5304
#: bzrlib/errors.py:630
5305
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:646
5309
msgid "Path \"%(path)s\" is not unicode normalized"
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:654
5313
msgid "Not a branch: \"%(path)s\"%(detail)s."
5314
msgstr "Kein Zweig: »%(path)s«%(detail)s."
5315
5316
#: bzrlib/errors.py:696
5317
msgid "No submit branch available for branch \"%(path)s\""
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:705
5321
msgid "A control directory already exists: \"%(path)s\"."
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:710
5325
msgid "Already a branch: \"%(path)s\"."
5326
msgstr "Bereits ein Zweig: »%(path)s«."
5327
5328
#: bzrlib/errors.py:715
5329
msgid "Invalid branch name: %(name)s"
5330
msgstr "Ungültiger Zweigname: %(name)s"
5331
5332
#: bzrlib/errors.py:724
5333
msgid "Parent branch already exists: \"%(path)s\"."
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:730
5337
msgid ""
5338
"Directory contains a branch, but no working tree (use bzr checkout if you "
5339
"wish to build a working tree): \"%(path)s\""
5340
msgstr ""
5341
5342
#: bzrlib/errors.py:735
5343
msgid ""
5344
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5345
msgstr ""
5346
5347
#: bzrlib/errors.py:745
5348
msgid ""
5349
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:755
5353
msgid "No repository present: \"%(path)s\""
5354
msgstr ""
5355
5356
#: bzrlib/errors.py:762
5357
msgid ""
5358
"Unsupported branch format: %(format)s\n"
5359
"Please run 'bzr upgrade'"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:768
5363
msgid "Unknown %(kind)s format: %(format)r"
5364
msgstr "Unbekanntes %(kind)s-Format: %(format)r"
5365
5366
#: bzrlib/errors.py:777
5367
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5368
msgstr ""
5369
"Das Format %(format)s ist inkompatibel zu der .bzr-Version %(bzrdir)s."
5370
5371
#: bzrlib/errors.py:787
5372
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5373
msgstr ""
5374
5375
#: bzrlib/errors.py:802
5376
msgid ""
5377
"%(target)s\n"
5378
"is not compatible with\n"
5379
"%(source)s\n"
5380
"%(details)s"
5381
msgstr ""
5382
5383
#: bzrlib/errors.py:818
5384
msgid "Revision is not compatible with %(repo_format)s"
5385
msgstr "Die Revision ist inkompatibel zu %(repo_format)s"
5386
5387
#: bzrlib/errors.py:828
5388
msgid "%(context_info)s%(path)s is already versioned."
5389
msgstr "%(context_info)s%(path)s ist bereits versioniert."
5390
5391
#: bzrlib/errors.py:849
5392
msgid "%(context_info)s%(path)s is not versioned."
5393
msgstr "%(context_info)s%(path)s ist nicht versioniert."
5394
5395
#: bzrlib/errors.py:870
5396
msgid "Path(s) are not versioned: %(paths_as_string)s"
5397
msgstr "Pfad(e) ist/sind nicht versioniert: %(paths_as_string)s"
5398
5399
#: bzrlib/errors.py:881
5400
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5401
msgstr "Pfad(e) existiert/existieren nicht: %(paths_as_string)s%(extra)s"
5402
5403
#: bzrlib/errors.py:900
5404
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:908
5408
msgid ""
5409
"Filename %(filename)r is not valid in your current filesystem encoding "
5410
"%(fs_encoding)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:919
5414
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:937
5418
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:976
5422
msgid "Cannot lock %(lock)s: %(why)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:986
5426
msgid ""
5427
"A transaction related operation was attempted after the transaction finished."
5428
msgstr ""
5429
5430
#: bzrlib/errors.py:1013
5431
msgid "Cannot lock: transport is read only: %(transport)s"
5432
msgstr ""
5433
5434
#: bzrlib/errors.py:1021
5435
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:1032
5439
msgid ""
5440
"Lock was broken while still open: %(lock)s - check storage consistency!"
5441
msgstr ""
5442
5443
#: bzrlib/errors.py:1043
5444
msgid ""
5445
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5446
"%(holder)r, wanted to break %(target)r"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1055
5450
msgid ""
5451
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5452
"Use 'bzr break-lock' to clear it"
5453
msgstr ""
5454
5455
#: bzrlib/errors.py:1068
5456
msgid "Lock not held: %(lock)s"
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:1097
5460
msgid "No changes to commit"
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:1102
5464
msgid ""
5465
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:1112
5469
msgid ""
5470
"Excluding paths during commit is not supported by repository at "
5471
"%(repository)r."
5472
msgstr ""
5473
5474
#: bzrlib/errors.py:1121
5475
msgid ""
5476
"The specified commit message contains characters unsupported by the current "
5477
"encoding."
5478
msgstr ""
5479
5480
#: bzrlib/errors.py:1127
5481
msgid "Upgrade URL cannot work with readonly URLs."
5482
msgstr ""
5483
5484
#: bzrlib/errors.py:1132
5485
msgid "The branch format %(format)s is already at the most recent format."
5486
msgstr ""
5487
5488
#: bzrlib/errors.py:1155
5489
msgid "Option --change does not accept revision ranges"
5490
msgstr "Die Option --change akzeptiert keine Revisionsbereiche"
5491
5492
#: bzrlib/errors.py:1160
5493
msgid "No namespace registered for string: %(spec)r"
5494
msgstr ""
5495
5496
#: bzrlib/errors.py:1179
5497
msgid ""
5498
"Requested revision: '%(spec)s' does not exist in branch: "
5499
"%(branch_url)s%(extra)s"
5500
msgstr ""
5501
"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: "
5502
"%(branch_url)s%(extra)s"
5503
5504
#: bzrlib/errors.py:1193
5505
msgid ""
5506
"Operation denied because it would change the main history, which is not "
5507
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:1204
5511
msgid ""
5512
"These branches have diverged. Use the missing command to see how.\n"
5513
"Use the merge command to reconcile them."
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:1224
5517
msgid ""
5518
"Branches have no common ancestor, and no merge base revision was specified."
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:1230
5522
msgid ""
5523
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:1236
5527
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5528
msgstr ""
5529
5530
#: bzrlib/errors.py:1245
5531
msgid ""
5532
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:1254
5536
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5537
msgstr ""
5538
5539
#: bzrlib/errors.py:1263
5540
msgid "Branch %(branch)s has no commits."
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1281
5544
msgid ""
5545
"Bound branch %(branch)s is out of date with master branch "
5546
"%(master)s.%(extra_help)s"
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:1293
5550
msgid ""
5551
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5552
"bound to %(remote)s."
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:1305
5556
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5557
msgstr ""
5558
5559
#: bzrlib/errors.py:1314
5560
msgid ""
5561
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5562
"%(error)s"
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:1326
5566
msgid "Error in processing weave: %(msg)s"
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:1335
5570
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5571
msgstr "Revision {%(revision_id)s} ist bereits in %(weave)s vorhanden"
5572
5573
#: bzrlib/errors.py:1346
5574
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5575
msgstr "Revision {%(revision_id)s} ist nicht in %(weave)s vorhanden"
5576
5577
#: bzrlib/errors.py:1356
5578
msgid "Weave invariant violated: %(what)s"
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:1365
5582
msgid "Parents are mismatched between two revisions. %(msg)s"
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:1387
5586
msgid ""
5587
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5588
"%(weave_b)s"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:1399
5592
msgid "Versioned file error"
5593
msgstr "Fehler bei versionierter Datei"
5594
5595
#: bzrlib/errors.py:1404
5596
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5597
msgstr "Revision {%(revision_id)s} ist nicht in »%(file_id)s« vorhanden."
5598
5599
#: bzrlib/errors.py:1414
5600
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5601
msgstr "Revision {%(revision_id)s} ist bereits in »%(file_id)s« vorhanden."
5602
5603
#: bzrlib/errors.py:1424
5604
msgid "Text did not match its checksum: %(msg)s"
5605
msgstr "Der Text entsprach nicht seiner Prüfsumme: %(msg)s"
5606
5607
#: bzrlib/errors.py:1550
5608
msgid "Export format %(format)r not supported"
5609
msgstr "Exportformat %(format)r wird nicht unterstützt"
5610
5611
#: bzrlib/errors.py:1559
5612
msgid "Transport error: %(msg)s %(orig_error)s"
5613
msgstr "Übertragungsfehler: %(msg)s %(orig_error)s"
5614
5615
#: bzrlib/errors.py:1585
5616
msgid "Generic bzr smart protocol error: %(details)s"
5617
msgstr "Allgemeiner bzr-Smart-Protokoll-Fehler: %(details)s"
5618
5619
#: bzrlib/errors.py:1593
5620
msgid "Received bad protocol version marker: %(marker)r"
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:1625
5624
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:1630
5628
msgid "Connection error: %(msg)s %(orig_error)s"
5629
msgstr "Verbindungsfehler: %(msg)s %(orig_error)s"
5630
5631
#: bzrlib/errors.py:1635
5632
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5633
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5634
5635
#: bzrlib/errors.py:1656
5636
msgid "Connection closed: %(msg)s %(orig_error)s"
5637
msgstr "Verbindung geschlossen: %(msg)s %(orig_error)s"
5638
5639
#: bzrlib/errors.py:1661
5640
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5641
msgstr "Verbindung abgelaufen: %(msg)s%(orig_error)s"
5642
5643
#: bzrlib/errors.py:1666
5644
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5645
msgstr ""
5646
5647
#: bzrlib/errors.py:1676
5648
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5649
msgstr "Ungültige HTTP-Antwort für %(path)s: %(msg)s%(orig_error)s"
5650
5651
#: bzrlib/errors.py:1691
5652
msgid "Certificate error: %(error)s"
5653
msgstr "Zertifikatsfehler: %(error)s"
5654
5655
#: bzrlib/errors.py:1699
5656
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5657
msgstr "Ungültiger HTTP-Bereich %(range)r für %(path)s: %(msg)s"
5658
5659
#: bzrlib/errors.py:1713
5660
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5661
msgstr "»HTTP MIME Boundary« für %(path)s fehlt: %(msg)sy"
5662
5663
#: bzrlib/errors.py:1721
5664
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5665
msgstr "Ungültiger HTTP-Content-type »%(ctype)s« für %(path)s: %(msg)s"
5666
5667
#: bzrlib/errors.py:1730
5668
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5669
msgstr "%(source)s wird%(permanently)s umgeleitet nach %(target)s"
5670
5671
#: bzrlib/errors.py:1744
5672
msgid "Too many redirections"
5673
msgstr "Zu viele Umleitungen"
5674
5675
#: bzrlib/errors.py:1749
5676
msgid "Working tree has conflicts."
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:1753
5680
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5681
msgstr "Konfigurationsdatei %(filename)s ist nicht UTF-8-kodiert\n"
5682
5683
#: bzrlib/errors.py:1762
5684
msgid ""
5685
"Error(s) parsing config file %(filename)s:\n"
5686
"%(errors)s"
5687
msgstr ""
5688
5689
#: bzrlib/errors.py:1772
5690
msgid ""
5691
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5692
"See ``bzr help %(name)s``"
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:1782
5696
msgid "%(username)r does not seem to contain a reasonable email address"
5697
msgstr "%(username)r scheint keine vernünftige E-Mail-Adresse zu haben"
5698
5699
#: bzrlib/errors.py:1791
5700
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:1799
5704
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5705
msgstr ""
5706
5707
#: bzrlib/errors.py:1807
5708
msgid "Unable to import library \"%(library)s\": %(error)s"
5709
msgstr "Importieren der Bibliothek »%(library)s« nicht möglich: %(error)s"
5710
5711
#: bzrlib/errors.py:1815
5712
msgid "python-gpgme is not installed, it is needed to verify signatures"
5713
msgstr ""
5714
5715
#: bzrlib/errors.py:1823
5716
msgid ""
5717
"The working tree for %(basedir)s has changed since the last commit, but "
5718
"weave merge requires that it be unchanged"
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:1833
5722
msgid ""
5723
"Can't reprocess and show base, because reprocessing obscures the "
5724
"relationship of conflicting lines to the base"
5725
msgstr ""
5726
5727
#: bzrlib/errors.py:1839
5728
msgid "Cycle in graph %(graph)r"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:1867
5732
msgid "File %(filename)s is not conflicted."
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:1889
5736
msgid "No bundle was found in \"%(filename)s\"."
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:1898
5740
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:1908
5744
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5745
msgstr "Im Zweig %(base)s fehlt Revision %(text_revision)s von %(file_id)s"
5746
5747
#: bzrlib/errors.py:1921
5748
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:1931
5752
msgid "Key %(key)s is already present in map"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:1936
5756
msgid "The prefix %(prefix)s is in the help search path twice."
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:1946
5760
msgid ""
5761
"No final name for trans_id %(trans_id)r\n"
5762
"file-id: %(file_id)r\n"
5763
"root trans-id: %(root_trans_id)r\n"
5764
msgstr ""
5765
5766
#: bzrlib/errors.py:1978
5767
msgid "Attempt to reuse a transform that has already been applied."
5768
msgstr ""
5769
5770
#: bzrlib/errors.py:1983
5771
msgid "Moving the root directory is not supported at this time"
5772
msgstr ""
5773
5774
#: bzrlib/errors.py:1988
5775
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5776
msgstr "Umbenennen von %(from_path)s in %(to_path)s gescheitert: %(why)s"
5777
5778
#: bzrlib/errors.py:1999
5779
msgid ""
5780
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:2035
5784
msgid ""
5785
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:2065
5789
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5790
msgstr ""
5791
5792
#: bzrlib/errors.py:2073
5793
msgid "Nothing to merge."
5794
msgstr ""
5795
5796
#: bzrlib/errors.py:2078
5797
msgid "Format %(format)s cannot be initialised by this version of bzr."
5798
msgstr ""
5799
"Das Format %(format)s kann von dieser Bazaar-Version nicht initialisiert "
5800
"werden."
5801
5802
#: bzrlib/errors.py:2087
5803
msgid ""
5804
"Cannot convert from format %(from_format)s to format %(format)s. "
5805
"%(problem)s"
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:2099
5809
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:2107
5813
msgid "%(exe_name)s could not be found on this machine"
5814
msgstr "%(exe_name)s konnte nicht auf diesem Rechner gefunden werden"
5815
5816
#: bzrlib/errors.py:2115
5817
msgid "Diff is not installed on this machine: %(msg)s"
5818
msgstr "Diff ist auf diesem Rechner nicht installiert: %(msg)s"
5819
5820
#: bzrlib/errors.py:2123
5821
msgid "Diff3 is not installed on this machine."
5822
msgstr "Diff3 ist auf diesem Rechner nicht installiert."
5823
5824
#: bzrlib/errors.py:2129
5825
msgid "The content being inserted is already present."
5826
msgstr "Der gerade eingefügte Inhalt ist bereits vorhanden."
5827
5828
#: bzrlib/errors.py:2134
5829
msgid ""
5830
"This tree contains left-over files from a failed operation.\n"
5831
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5832
"to\n"
5833
" keep, and delete it when you are done."
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:2145
5837
msgid ""
5838
"This tree contains left-over files from a failed operation.\n"
5839
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5840
" wish to keep, and delete it when you are done."
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2155
5844
msgid ""
5845
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5846
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5847
"to\n"
5848
" keep, and delete it when you are done."
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2166
5852
msgid ""
5853
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5854
"examine %(pending_deletion)s to see if it contains any files you wish to "
5855
"keep, and delete it when you are done."
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2176
5859
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2190
5863
msgid ""
5864
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5865
msgstr ""
5866
"Im öffentlichen Zweig »%(public_location)s« fehlt Revision »%(revstring)s«."
5867
5868
#: bzrlib/errors.py:2203
5869
msgid "Error in merge modified format"
5870
msgstr ""
5871
5872
#: bzrlib/errors.py:2208
5873
msgid "Format error in conflict listings"
5874
msgstr ""
5875
5876
#: bzrlib/errors.py:2212
5877
msgid ""
5878
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5879
"Error: %(description)s"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2223
5883
msgid ""
5884
"An error has been detected in the repository %(repo_path)s.\n"
5885
"Please run bzr reconcile on this repository."
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:2234
5889
msgid ""
5890
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5891
"reason: %(reason)s"
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2247
5895
msgid ""
5896
"An inconsistent delta was supplied: %(delta)r\n"
5897
"reason: %(reason)s"
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:2259
5901
msgid "To use this feature you must upgrade your branch at %(path)s."
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:2268
5905
msgid "To use this feature you must upgrade your repository at %(path)s."
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:2273
5909
msgid ""
5910
"To use this feature you must upgrade your branch at %(path)s to a format "
5911
"which supports rich roots."
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2279
5915
msgid "Cannot perform local-only commits on unbound branches."
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2284
5919
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2305
5923
msgid "Ghost tags not supported by format %(format)r."
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2313
5927
msgid "File is binary but should be text."
5928
msgstr "Die Datei ist binär, sollte aber Text sein."
5929
5930
#: bzrlib/errors.py:2318
5931
msgid "The path %(path)s is not permitted on this platform"
5932
msgstr "Der Pfad %(path)s ist auf dieser Plattform nicht erlaubt"
5933
5934
#: bzrlib/errors.py:2327
5935
msgid ""
5936
"Testament did not match expected value.\n"
5937
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5938
" {%(measured)s}"
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2339
5942
msgid "Not a bzr revision-bundle: %(text)r"
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2348
5946
msgid "Bad bzr revision-bundle: %(text)r"
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2357
5950
msgid "Malformed bzr revision-bundle header: %(text)r"
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:2362
5954
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:2367
5958
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:2372
5962
msgid "End of line marker was not \\n in bzr revision-bundle"
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2382
5966
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2392
5970
msgid "Root class for inventory serialization errors"
5971
msgstr ""
5972
5973
#: bzrlib/errors.py:2396
5974
msgid ""
5975
"The inventory was not in the expected format:\n"
5976
" %(msg)s"
5977
msgstr ""
5978
5979
#: bzrlib/errors.py:2405
5980
msgid "This operation requires rich root data storage"
5981
msgstr ""
5982
5983
#: bzrlib/errors.py:2418
5984
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5985
msgstr ""
5986
5987
#: bzrlib/errors.py:2427
5988
msgid ""
5989
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5990
"variable."
5991
msgstr ""
5992
5993
#: bzrlib/errors.py:2434
5994
msgid ""
5995
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5996
"ghost at {%(ghost_revision_id)s}"
5997
msgstr ""
5998
5999
#: bzrlib/errors.py:2444
6000
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6001
msgstr "Geister-Revision {%(revision_id)s} kann hier nicht benutzt werden."
6002
6003
#: bzrlib/errors.py:2495
6004
msgid ""
6005
"A merge directive must provide either a bundle or a public branch location."
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2502
6009
msgid "Bad merge directive payload %(start)r"
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:2512
6013
msgid "Preview patch does not match requested changes."
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:2518
6017
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:2528
6021
msgid ""
6022
"Your branch does not have all of the revisions required in order to merge "
6023
"this merge directive and the target location specified in the merge "
6024
"directive is not a branch: %(location)s."
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:2540
6028
msgid "Unsupported entry kind %(kind)s"
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:2548
6032
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:2558
6036
msgid "Subsume target %(other_tree)s needs to be upgraded."
6037
msgstr ""
6038
6039
#: bzrlib/errors.py:2577
6040
msgid "No such tag: %(tag_name)s"
6041
msgstr ""
6042
6043
#: bzrlib/errors.py:2585
6044
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:2594
6048
msgid "Tag %(tag_name)s already exists."
6049
msgstr ""
6050
6051
#: bzrlib/errors.py:2602
6052
msgid ""
6053
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6054
"bugs\" for more information on this feature."
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:2612
6058
msgid ""
6059
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:2622
6063
msgid ""
6064
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:2632
6068
msgid "Invalid line in bugs property: '%(line)s'"
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:2640
6072
msgid "Invalid bug status: '%(status)s'"
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:2648
6076
msgid "Could not understand response from smart server: %(response_tuple)r"
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:2687
6080
msgid "Server sent an unexpected error: %(error_tuple)r"
6081
msgstr "Der Server meldete einen unerwarteten Fehler: %(error_tuple)r"
6082
6083
#: bzrlib/errors.py:2706
6084
msgid "Unrecognised container format: %(container_format)r"
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:2714
6088
msgid "Unexpected end of container stream"
6089
msgstr ""
6090
6091
#: bzrlib/errors.py:2719
6092
msgid "Unknown record type: %(record_type)r"
6093
msgstr ""
6094
6095
#: bzrlib/errors.py:2727
6096
msgid "Invalid record: %(reason)s"
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:2735
6100
msgid "Container has data after end marker: %(excess)r"
6101
msgstr ""
6102
6103
#: bzrlib/errors.py:2743
6104
msgid "Container has multiple records with the same name: %(name)s"
6105
msgstr ""
6106
6107
#: bzrlib/errors.py:2756
6108
msgid "Corrupt or incompatible data stream: %(reason)s"
6109
msgstr "Fehlerhafter oder inkompatibler Datenstrom: %(reason)s"
6110
6111
#: bzrlib/errors.py:2764
6112
msgid "SMTP error: %(error)s"
6113
msgstr "SMTP-Fehler: %(error)s"
6114
6115
#: bzrlib/errors.py:2772
6116
msgid "No message supplied."
6117
msgstr ""
6118
6119
#: bzrlib/errors.py:2777
6120
msgid "No mail-to address (--mail-to) or output (-o) specified."
6121
msgstr ""
6122
6123
#: bzrlib/errors.py:2782
6124
msgid ""
6125
"Unable to find mail client with the following names: "
6126
"%(mail_command_list_string)s"
6127
msgstr ""
6128
6129
#: bzrlib/errors.py:2792
6130
msgid "SMTP connection to %(host)s refused"
6131
msgstr "SMTP-Verbindung zu %(host)s wurde abgelehnt"
6132
6133
#: bzrlib/errors.py:2801
6134
msgid "Please specify smtp_server. No server at default %(host)s."
6135
msgstr ""
6136
6137
#: bzrlib/errors.py:2815
6138
msgid ""
6139
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6140
"reconfigure."
6141
msgstr ""
6142
6143
#: bzrlib/errors.py:2827
6144
msgid "'%(display_url)s' is already a branch."
6145
msgstr "»%(display_url)s« ist bereits ein Zweig."
6146
6147
#: bzrlib/errors.py:2832
6148
msgid "'%(display_url)s' is already a tree."
6149
msgstr ""
6150
6151
#: bzrlib/errors.py:2837
6152
msgid "'%(display_url)s' is already a checkout."
6153
msgstr ""
6154
6155
#: bzrlib/errors.py:2842
6156
msgid "'%(display_url)s' is already a lightweight checkout."
6157
msgstr ""
6158
6159
#: bzrlib/errors.py:2847
6160
msgid "'%(display_url)s' is already using a shared repository."
6161
msgstr ""
6162
6163
#: bzrlib/errors.py:2852
6164
msgid "'%(display_url)s' is already standalone."
6165
msgstr ""
6166
6167
#: bzrlib/errors.py:2857
6168
msgid "Shared repository '%(display_url)s' already creates working trees."
6169
msgstr ""
6170
6171
#: bzrlib/errors.py:2863
6172
msgid ""
6173
"Shared repository '%(display_url)s' already doesn't create working trees."
6174
msgstr ""
6175
6176
#: bzrlib/errors.py:2869
6177
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:2874
6181
msgid "No location could be found to bind to at %(display_url)s."
6182
msgstr ""
6183
6184
#: bzrlib/errors.py:2879
6185
msgid ""
6186
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6187
"status).%(more)s"
6188
msgstr ""
6189
6190
#: bzrlib/errors.py:2898
6191
msgid ""
6192
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6193
"list).%(more)s"
6194
msgstr ""
6195
6196
#: bzrlib/errors.py:2904
6197
msgid "Variable {%(name)s} is not available."
6198
msgstr "Variable {%(name)s} steht nicht zur Verfügung."
6199
6200
#: bzrlib/errors.py:2912
6201
msgid "No template specified."
6202
msgstr ""
6203
6204
#: bzrlib/errors.py:2917
6205
msgid "Unable to create symlink %(path_str)son this platform"
6206
msgstr ""
6207
6208
#: bzrlib/errors.py:2932
6209
msgid ""
6210
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6211
"\"original\", \"local\"."
6212
msgstr ""
6213
"Ungültiges Zeitzonenformat »%(timezone)s«, die Optionen sind »utc«, "
6214
"»original« und »local«."
6215
6216
#: bzrlib/errors.py:2966
6217
msgid ""
6218
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6219
msgstr ""
6220
6221
#: bzrlib/errors.py:2978
6222
msgid "The \"%(config_id)s\" configuration does not exist."
6223
msgstr "Die Konfiguration »%(config_id)s« existiert nicht."
6224
6225
#: bzrlib/errors.py:2986
6226
msgid "The \"%(option_name)s\" configuration option does not exist."
6227
msgstr "Die Konfigurationsoption »%(option_name)s« existiert nicht."
6228
6229
#: bzrlib/errors.py:2994
6230
msgid "The alias \"%(alias_name)s\" does not exist."
6231
msgstr "Der Alias »%(alias_name)s« existiert nicht."
6232
6233
#: bzrlib/errors.py:3008
6234
msgid "\"%(alias_name)s\" is not a valid location alias."
6235
msgstr ""
6236
6237
#: bzrlib/errors.py:3016
6238
msgid "No %(alias_name)s location assigned."
6239
msgstr ""
6240
6241
#: bzrlib/errors.py:3024
6242
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6243
msgstr ""
6244
6245
#: bzrlib/errors.py:3034
6246
msgid "Unknown rules detected: %(unknowns_str)s."
6247
msgstr "Unbekannte Regeln festgestellt: %(unknowns_str)s."
6248
6249
#: bzrlib/errors.py:3045
6250
msgid "Tip change rejected: %(msg)s"
6251
msgstr ""
6252
6253
#: bzrlib/errors.py:3053
6254
msgid "Shelf corrupt."
6255
msgstr ""
6256
6257
#: bzrlib/errors.py:3058
6258
msgid "Corruption while decompressing repository file%(orig_error)s"
6259
msgstr ""
6260
6261
#: bzrlib/errors.py:3070
6262
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6263
msgstr ""
6264
6265
#: bzrlib/errors.py:3078
6266
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6267
msgstr ""
6268
6269
#: bzrlib/errors.py:3086
6270
msgid ""
6271
"An attempt to access a url outside the server jail was made: '%(url)s'."
6272
msgstr ""
6273
6274
#: bzrlib/errors.py:3094
6275
msgid "The user aborted the operation."
6276
msgstr "Der Vorgang wurde vom Benutzer abgebrochen."
6277
6278
#: bzrlib/errors.py:3099
6279
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6280
msgstr ""
6281
6282
#: bzrlib/errors.py:3109
6283
msgid "No such view: %(view_name)s."
6284
msgstr ""
6285
6286
#: bzrlib/errors.py:3119
6287
msgid ""
6288
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6289
"to a later format."
6290
msgstr ""
6291
6292
#: bzrlib/errors.py:3128
6293
msgid ""
6294
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6295
msgstr ""
6296
6297
#: bzrlib/errors.py:3195
6298
msgid "%(bzrdir)r does not support co-located branches."
6299
msgstr ""
6300
6301
#: bzrlib/errors.py:3201
6302
msgid ""
6303
"Unable to determine your name.\n"
6304
"Please, set your name with the 'whoami' command.\n"
6305
"E.g. bzr whoami \"Your Name <name@example.com>\""
6306
msgstr ""
6307
6308
#: bzrlib/errors.py:3210
6309
msgid "Invalid pattern(s) found. %(msg)s"
6310
msgstr "Ungültige(s) Muster gefunden. %(msg)s"
6311
6312
#: bzrlib/errors.py:3218
6313
msgid ""
6314
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6315
"unbind` to fix."
6316
msgstr ""
6317
6318
#: bzrlib/errors.py:3229
6319
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6320
msgstr ""
6321
6322
#: bzrlib/errors.py:3238
6323
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6324
msgstr ""
6325
6326
#: bzrlib/errors.py:3247
6327
msgid ""
6328
"No compatible object available for operations from %(source)r to %(target)r."
6329
msgstr ""
6330
6331
#: bzrlib/errors.py:3257
6332
msgid ""
6333
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6334
"%(arguments)s."
6335
msgstr ""
6336
6337
#: bzrlib/errors.py:3267
6338
msgid ""
6339
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6340
"format %(format)r"
6341
msgstr ""
6342
6343
#: bzrlib/errors.py:3279
6344
msgid ""
6345
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6346
"plugin."
6347
msgstr ""
6348
"Die fehlende Funktion %(feature)s wird weder von dieser Bazaar-Version noch "
6349
"von irgendeiner Erweiterung unterstützt."
6350
6351
#: bzrlib/errors.py:3292
6352
msgid "Binary files section encountered."
6353
msgstr "Auf einen Abschnitt für Binärdateien gestoßen."
6354
6355
#: bzrlib/errors.py:3300
6356
msgid ""
6357
"Malformed patch header. %(desc)s\n"
6358
"%(line)r"
6359
msgstr ""
6360
6361
#: bzrlib/errors.py:3309
6362
msgid ""
6363
"Malformed hunk header. %(desc)s\n"
6364
"%(line)r"
6365
msgstr ""
6366
6367
#: bzrlib/errors.py:3318
6368
msgid ""
6369
"Malformed line. %(desc)s\n"
6370
"%(line)r"
6371
msgstr ""
6372
"Ungültige Zeile. %(desc)s\n"
6373
"%(line)r"
6374
6375
#: bzrlib/errors.py:3328
6376
msgid ""
6377
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6378
"but patch says it should be \"%(patch_line)s\""
6379
msgstr ""
6380
6381
#: bzrlib/errors.py:3339
6382
msgid "The feature %(feature)s has already been registered."
6383
msgstr ""
6384
6385
#: bzrlib/export_pot.py:252
6386
#, python-format
6387
msgid "Exporting messages from builtin command: %s"
6388
msgstr ""
6389
6390
#: bzrlib/export_pot.py:271
6391
msgid "Exporting messages from plugin command: {0} in {1}"
6392
msgstr ""
6393
6394
#: bzrlib/export_pot.py:292
6395
#, python-format
6396
msgid "Exporting message from error: %s"
6397
msgstr ""
6398
6399
#: bzrlib/fetch.py:98
6400
msgid "Finding revisions"
6401
msgstr "Revisionen finden"
6402
6403
#: bzrlib/fetch.py:103
6404
msgid "Fetching revisions"
6405
msgstr "Revisionen herunterladen"
6406
6407
#: bzrlib/foreign.py:262
6408
msgid "Push into a different VCS without any custom bzr metadata."
6409
msgstr ""
6410
6411
#: bzrlib/foreign.py:264
6412
msgid ""
6413
"This will afterwards rebase the local branch on the remote\n"
6414
"branch unless the --no-rebase option is used, in which case \n"
6415
"the two branches will be out of sync after the push. "
6416
msgstr ""
6417
6418
#: bzrlib/foreign.py:277
6419
msgid "Do not rebase after push."
6420
msgstr ""
6421
6422
#: bzrlib/foreign.py:311
6423
#, python-format
6424
msgid "Using saved location: %s\n"
6425
msgstr ""
6426
6427
#: bzrlib/foreign.py:321
6428
msgid ""
6429
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6430
"regular push."
6431
msgstr ""
6432
6433
#: bzrlib/gpg.py:366
6434
msgid "No GnuPG key results for pattern: {0}"
6435
msgstr ""
6436
6437
#: bzrlib/gpg.py:439
6438
msgid "{0} commits with valid signatures"
6439
msgstr ""
6440
6441
#: bzrlib/gpg.py:445
6442
msgid "{0} commit with unknown key"
6443
msgid_plural "{0} commits with unknown keys"
6444
msgstr[0] ""
6445
msgstr[1] ""
6446
6447
#: bzrlib/gpg.py:453
6448
msgid "{0} commit not valid"
6449
msgid_plural "{0} commits not valid"
6450
msgstr[0] ""
6451
msgstr[1] ""
6452
6453
#: bzrlib/gpg.py:461
6454
msgid "{0} commit not signed"
6455
msgid_plural "{0} commits not signed"
6456
msgstr[0] ""
6457
msgstr[1] ""
6458
6459
#: bzrlib/gpg.py:469
6460
msgid "{0} commit with key now expired"
6461
msgid_plural "{0} commits with key now expired"
6462
msgstr[0] ""
6463
msgstr[1] ""
6464
6465
#: bzrlib/gpg.py:489
6466
msgid "{0} commit by author {1} with key {2} now expired"
6467
msgid_plural "{0} commits by author {1} with key {2} now expired"
6468
msgstr[0] ""
6469
msgstr[1] ""
6470
6471
#: bzrlib/gpg.py:505
6472
msgid "{0} signed {1} commit"
6473
msgid_plural "{0} signed {1} commits"
6474
msgstr[0] ""
6475
msgstr[1] ""
6476
6477
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6478
msgid "{0} commit by author {1}"
6479
msgid_plural "{0} commits by author {1}"
6480
msgstr[0] ""
6481
msgstr[1] ""
6482
6483
#: bzrlib/gpg.py:554
6484
msgid "Unknown key {0} signed {1} commit"
6485
msgid_plural "Unknown key {0} signed {1} commits"
6486
msgstr[0] ""
6487
msgstr[1] ""
6488
6489
#: bzrlib/groupcompress.py:1739
6490
#, python-format
6491
msgid "Insert claimed random_id=True, but then inserted %r two times"
6492
msgstr ""
6493
6494
#: bzrlib/hooks.py:313
6495
#, python-format
6496
msgid "Introduced in: %s"
6497
msgstr "Eingeführt in: %s"
6498
6499
#: bzrlib/hooks.py:316
6500
#, python-format
6501
msgid "Deprecated in: %s"
6502
msgstr "Veraltet in: %s"
6503
6504
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6505
msgid "Walking content"
6506
msgstr ""
6507
6508
#: bzrlib/knit.py:3330
6509
msgid "annotating"
6510
msgstr ""
6511
6512
#: bzrlib/lock.py:548
6513
msgid "{0!r} was {1} locked again"
6514
msgstr ""
6515
6516
#: bzrlib/lockdir.py:321
6517
#, python-format
6518
msgid "error removing pending lock: %s"
6519
msgstr ""
6520
6521
#: bzrlib/lockdir.py:616
6522
msgid "Unable to obtain"
6523
msgstr ""
6524
6525
#: bzrlib/lockdir.py:618
6526
msgid "Lock owner changed for"
6527
msgstr ""
6528
6529
#: bzrlib/lockdir.py:620
6530
msgid "{0} lock {1} {2}."
6531
msgstr ""
6532
6533
#: bzrlib/lockdir.py:627
6534
#, python-format
6535
msgid "Will continue to try until %s, unless you press Ctrl-C."
6536
msgstr ""
6537
6538
#: bzrlib/lockdir.py:629
6539
msgid "See \"bzr help break-lock\" for more."
6540
msgstr "Siehe »bzr help break-lock« für mehr Informationen."
6541
6542
#: bzrlib/lockdir.py:739
6543
#, python-format
6544
msgid ""
6545
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6546
msgstr ""
6547
6548
#: bzrlib/log.py:563
6549
msgid "--exclude-common-ancestry requires two different revisions"
6550
msgstr "--exclude-common-ancestry erfordert zwei verschiedene Revisionen"
6551
6552
#: bzrlib/log.py:565
6553
#, python-format
6554
msgid "invalid direction %r"
6555
msgstr "Ungültige Richtung %r"
6556
6557
#: bzrlib/log.py:653
6558
msgid "Start revision not found in history of end revision."
6559
msgstr ""
6560
6561
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6562
msgid "Logging revision 0 is invalid."
6563
msgstr ""
6564
6565
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6566
msgid "Start revision must be older than the end revision."
6567
msgstr ""
6568
6569
#: bzrlib/log.py:1818
6570
#, python-format
6571
msgid "unknown log formatter: %r"
6572
msgstr "Unbekannter Protokollformatierer: %r"
6573
6574
#: bzrlib/log.py:2114
6575
msgid "fixes bug"
6576
msgid_plural "fixes bugs"
6577
msgstr[0] "behebt den Fehler"
6578
msgstr[1] "behebt die Fehler"
6579
6580
#: bzrlib/merge.py:689
6581
msgid "All changes applied successfully."
6582
msgstr "Alle Änderungen erfolgreich angewendet."
6583
6584
#: bzrlib/merge.py:691
6585
#, python-format
6586
msgid "%d conflicts encountered."
6587
msgstr "Auf %d Konflikte gestoßen."
6588
6589
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6590
msgid "Preparing file merge"
6591
msgstr ""
6592
6593
#: bzrlib/multiparent.py:426
6594
msgid "Importing revisions"
6595
msgstr "Revisionen importieren"
6596
6597
#: bzrlib/option.py:526
6598
msgid "Show help message."
6599
msgstr "Hilfetext anzeigen."
6600
6601
#: bzrlib/option.py:528
6602
msgid "Only display errors and warnings."
6603
msgstr "Nur Fehler und Warnungen anzeigen."
6604
6605
#: bzrlib/option.py:531
6606
msgid "Show usage message and options."
6607
msgstr "Aufruf und Optionen anzeigen."
6608
6609
#: bzrlib/option.py:533
6610
msgid "Display more information."
6611
msgstr "Weitere Informationen anzeigen."
6612
6613
#: bzrlib/option.py:541
6614
msgid ""
6615
"Select changes introduced by the specified revision. See also \"help "
6616
"revisionspec\"."
6617
msgstr ""
6618
6619
#: bzrlib/option.py:543
6620
msgid "Branch to operate on, instead of working directory."
6621
msgstr ""
6622
6623
#: bzrlib/option.py:545
6624
msgid "Detailed log format."
6625
msgstr "Ausführliches Protokollformat."
6626
6627
#: bzrlib/option.py:545
6628
msgid "Format used by GNU ChangeLog files."
6629
msgstr "Format von »GNU ChangeLog«-Dateien."
6630
6631
#: bzrlib/option.py:545
6632
msgid "Log format with one line per revision."
6633
msgstr "Protokollformat mit einer Zeile pro Revision."
6634
6635
#: bzrlib/option.py:545
6636
msgid "Moderately short log format."
6637
msgstr "Relativ kurzes Protokollformat."
6638
6639
#: bzrlib/option.py:545
6640
msgid "Use specified log format."
6641
msgstr "Angegebenes Protokollformat benutzen."
6642
6643
#: bzrlib/option.py:547
6644
msgid "Log format"
6645
msgstr "Protokollformat"
6646
6647
#: bzrlib/option.py:549
6648
msgid "LCA-newness merge."
6649
msgstr ""
6650
6651
#: bzrlib/option.py:549
6652
msgid "Merge using external diff3."
6653
msgstr ""
6654
6655
#: bzrlib/option.py:549
6656
msgid "Native diff3-style merge."
6657
msgstr ""
6658
6659
#: bzrlib/option.py:549
6660
msgid "Select a particular merge algorithm."
6661
msgstr ""
6662
6663
#: bzrlib/option.py:549
6664
msgid "Weave-based merge."
6665
msgstr ""
6666
6667
#: bzrlib/option.py:551
6668
msgid "Merge algorithm"
6669
msgstr ""
6670
6671
#: bzrlib/option.py:554
6672
msgid "Message string."
6673
msgstr "Nachrichtenzeichenkette."
6674
6675
#: bzrlib/option.py:556
6676
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6677
msgstr ""
6678
6679
#: bzrlib/option.py:558
6680
msgid "Ignore differences between branches and overwrite unconditionally."
6681
msgstr ""
6682
6683
#: bzrlib/option.py:560
6684
msgid "Remember the specified location as a default."
6685
msgstr "Den angegebenen Ort als Vorgabe merken."
6686
6687
#: bzrlib/option.py:562
6688
msgid "Reprocess to reduce spurious conflicts."
6689
msgstr "Erneut ausführen, um scheinbare Konflikte zu verringern."
6690
6691
#: bzrlib/option.py:566
6692
msgid "See \"help revisionspec\" for details."
6693
msgstr "Siehe »help revisionspec« für Details."
6694
6695
#: bzrlib/option.py:568
6696
msgid "Show internal object ids."
6697
msgstr ""
6698
6699
#: bzrlib/option.py:571
6700
msgid "Display timezone as local, original, or utc."
6701
msgstr "Zeitzone als local, original oder utc anzeigen."
6702
6703
#: bzrlib/osutils.py:100
6704
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6705
msgstr ""
6706
6707
#: bzrlib/osutils.py:220
6708
msgid "lstat/stat of ({0!r}): {1!r}"
6709
msgstr ""
6710
6711
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6712
#, python-format
6713
msgid "sorry, %r not allowed in path"
6714
msgstr "Entschuldigung, %r ist im Pfad nicht erlaubt"
6715
6716
#: bzrlib/osutils.py:1259
6717
#, python-format
6718
msgid "%r is too short to calculate a relative path"
6719
msgstr "%r ist zu kurz, um einen relativen Pfad zu berechnen"
6720
6721
#: bzrlib/plugin.py:143
6722
#, python-format
6723
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6724
msgstr "»%s« ist keine gültige <plugin_name>@<plugin_path>-Beschreibung "
6725
6726
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6727
msgid "Enable completions for the selected plugin (default: all plugins)"
6728
msgstr ""
6729
6730
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6731
msgid "Generate a shell function for bash command line completion."
6732
msgstr ""
6733
6734
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6735
msgid ""
6736
"This command generates a shell function which can be used by bash to\n"
6737
"automatically complete the currently typed command when the user presses\n"
6738
"the completion key (usually tab)."
6739
msgstr ""
6740
6741
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6742
msgid ""
6743
"Commonly used like this:\n"
6744
" eval \"`bzr bash-completion`\""
6745
msgstr ""
6746
"Gebräuchlicher Aufruf wie folgt:\n"
6747
" eval \"`bzr bash-completion`\""
6748
6749
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6750
msgid "Name of the generated function (default: _bzr)"
6751
msgstr "Name der erzeugten Funktion (Vorgabe: _bzr)"
6752
6753
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6754
msgid "Generate only the shell function, don't enable it"
6755
msgstr ""
6756
6757
#: bzrlib/plugins/launchpad/account.py:66
6758
msgid "Setting ssh/sftp usernames for launchpad.net."
6759
msgstr "SSH/SFTP-Benutzernamen für launchpad.net festlegen."
6760
6761
#: bzrlib/plugins/launchpad/cmds.py:44
6762
msgid "Register a branch with launchpad.net."
6763
msgstr "Einen Zweig bei launchpad.net registrieren."
6764
6765
#: bzrlib/plugins/launchpad/cmds.py:46
6766
msgid ""
6767
"This command lists a bzr branch in the directory of branches on\n"
6768
"launchpad.net. Registration allows the branch to be associated with\n"
6769
"bugs or specifications."
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/cmds.py:50
6773
msgid ""
6774
"Before using this command you must register the project to which the\n"
6775
"branch belongs, and create an account for yourself on launchpad.net."
6776
msgstr ""
6777
6778
#: bzrlib/plugins/launchpad/cmds.py:53
6779
msgid ""
6780
"arguments:\n"
6781
" public_url: The publicly visible url for the branch to register.\n"
6782
" This must be an http or https url (which Launchpad can read\n"
6783
" from to access the branch). Local file urls, SFTP urls, and\n"
6784
" bzr+ssh urls will not work.\n"
6785
" If no public_url is provided, bzr will use the configured\n"
6786
" public_url if there is one for the current branch, and\n"
6787
" otherwise error."
6788
msgstr ""
6789
6790
#: bzrlib/plugins/launchpad/cmds.py:62
6791
msgid ""
6792
"example:\n"
6793
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6794
" --project fooproject"
6795
msgstr ""
6796
"Beispiel:\n"
6797
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6798
" --project fooproject"
6799
6800
#: bzrlib/plugins/launchpad/cmds.py:69
6801
msgid "Launchpad project short name to associate with the branch."
6802
msgstr "Launchpad-Projekt-Kurzname, dem der Zweig zugeordnet wird."
6803
6804
#: bzrlib/plugins/launchpad/cmds.py:76
6805
msgid ""
6806
"Short name for the branch; by default taken from the last component of the "
6807
"url."
6808
msgstr ""
6809
6810
#: bzrlib/plugins/launchpad/cmds.py:80
6811
msgid "One-sentence description of the branch."
6812
msgstr "Beschreibung des Zweiges in einem Satz."
6813
6814
#: bzrlib/plugins/launchpad/cmds.py:83
6815
msgid "Longer description of the purpose or contents of the branch."
6816
msgstr "Längere Beschreibung für den Zweck oder die Inhalte des Zweiges."
6817
6818
#: bzrlib/plugins/launchpad/cmds.py:86
6819
msgid "Branch author's email address, if not yourself."
6820
msgstr "E-Mail-Adresse des Autors des Zweigs, wenn Sie es nicht selbst sind."
6821
6822
#: bzrlib/plugins/launchpad/cmds.py:89
6823
msgid "The bug this branch fixes."
6824
msgstr "Der Fehler, den dieser Zweig behebt."
6825
6826
#: bzrlib/plugins/launchpad/cmds.py:92
6827
msgid "Prepare the request but don't actually send it."
6828
msgstr "Die Anfrage vorbereiten, aber nicht absenden."
6829
6830
#: bzrlib/plugins/launchpad/cmds.py:114
6831
msgid ""
6832
"register-branch requires a public branch url - see bzr help register-branch."
6833
msgstr ""
6834
6835
#: bzrlib/plugins/launchpad/cmds.py:122
6836
msgid "--product is deprecated; please use --project."
6837
msgstr "--product ist veraltet; bitte --project benutzen."
6838
6839
#: bzrlib/plugins/launchpad/cmds.py:152
6840
msgid "Open a Launchpad branch page in your web browser."
6841
msgstr "Eine Launchpad-Zweig-Seite in Ihrem Web-Browser öffnen."
6842
6843
#: bzrlib/plugins/launchpad/cmds.py:157
6844
msgid "Do not actually open the browser. Just say the URL we would use."
6845
msgstr ""
6846
6847
#: bzrlib/plugins/launchpad/cmds.py:192
6848
#, python-format
6849
msgid "Opening %s in web browser"
6850
msgstr "%s wird im Web-Browser geöffnet"
6851
6852
#: bzrlib/plugins/launchpad/cmds.py:200
6853
msgid "Show or set the Launchpad user ID."
6854
msgstr "Den Launchpad-Benutzernamen anzeigen oder festlegen."
6855
6856
#: bzrlib/plugins/launchpad/cmds.py:202
6857
msgid ""
6858
"When communicating with Launchpad, some commands need to know your\n"
6859
"Launchpad user ID. This command can be used to set or show the\n"
6860
"user ID that Bazaar will use for such communication."
6861
msgstr ""
6862
6863
#: bzrlib/plugins/launchpad/cmds.py:206
6864
msgid ""
6865
":Examples:\n"
6866
" Show the Launchpad ID of the current user::"
6867
msgstr ""
6868
6869
#: bzrlib/plugins/launchpad/cmds.py:209
6870
msgid " bzr launchpad-login"
6871
msgstr " bzr launchpad-login"
6872
6873
#: bzrlib/plugins/launchpad/cmds.py:211
6874
msgid " Set the Launchpad ID of the current user to 'bob'::"
6875
msgstr ""
6876
6877
#: bzrlib/plugins/launchpad/cmds.py:213
6878
msgid " bzr launchpad-login bob"
6879
msgstr " bzr launchpad-login bob"
6880
6881
#: bzrlib/plugins/launchpad/cmds.py:220
6882
msgid "Don't check that the user name is valid."
6883
msgstr "Den Benutzernamen nicht auf Gültigkeit prüfen."
6884
6885
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6886
msgid "Launchpad user ID exists and has SSH keys.\n"
6887
msgstr "Launchpad-Benutzername existiert und hat SSH-Schlüssel.\n"
6888
6889
#: bzrlib/plugins/launchpad/cmds.py:238
6890
msgid "No Launchpad user ID configured.\n"
6891
msgstr "Kein Launchpad-Benutzername konfiguriert.\n"
6892
6893
#: bzrlib/plugins/launchpad/cmds.py:249
6894
#, python-format
6895
msgid "Launchpad user ID set to '%s'.\n"
6896
msgstr "Launchpad-Benutzername auf »%s« festgelegt.\n"
6897
6898
#: bzrlib/plugins/launchpad/cmds.py:255
6899
msgid "Ask Launchpad to mirror a branch now."
6900
msgstr "Launchpad jetzt darum bitten, einen Zweig zu spiegeln."
6901
6902
#: bzrlib/plugins/launchpad/cmds.py:272
6903
msgid "Propose merging a branch on Launchpad."
6904
msgstr ""
6905
6906
#: bzrlib/plugins/launchpad/cmds.py:274
6907
msgid ""
6908
"This will open your usual editor to provide the initial comment. When it\n"
6909
"has created the proposal, it will open it in your default web browser."
6910
msgstr ""
6911
6912
#: bzrlib/plugins/launchpad/cmds.py:277
6913
msgid ""
6914
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6915
"is not supplied, the remembered submit branch will be used. If no submit\n"
6916
"branch is remembered, the development focus will be used."
6917
msgstr ""
6918
6919
#: bzrlib/plugins/launchpad/cmds.py:281
6920
msgid ""
6921
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6922
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6923
"The parameter the launchpad account name of the desired reviewer. This\n"
6924
"may optionally be followed by '=' and the review type. For example:"
6925
msgstr ""
6926
6927
#: bzrlib/plugins/launchpad/cmds.py:286
6928
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6929
msgstr ""
6930
6931
#: bzrlib/plugins/launchpad/cmds.py:288
6932
msgid ""
6933
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6934
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6935
msgstr ""
6936
6937
#: bzrlib/plugins/launchpad/cmds.py:293
6938
msgid "Propose the merge on staging."
6939
msgstr ""
6940
6941
#: bzrlib/plugins/launchpad/cmds.py:295
6942
msgid "Commit message."
6943
msgstr ""
6944
6945
#: bzrlib/plugins/launchpad/cmds.py:297
6946
msgid "Mark the proposal as approved immediately."
6947
msgstr ""
6948
6949
#: bzrlib/plugins/launchpad/cmds.py:298
6950
msgid "The bug this proposal fixes."
6951
msgstr ""
6952
6953
#: bzrlib/plugins/launchpad/cmds.py:300
6954
msgid "Requested reviewer and optional type."
6955
msgstr ""
6956
6957
#: bzrlib/plugins/launchpad/cmds.py:335
6958
msgid "Find the proposal to merge this revision."
6959
msgstr ""
6960
6961
#: bzrlib/plugins/launchpad/cmds.py:337
6962
msgid ""
6963
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6964
"This works only if the selected branch was the merge proposal target, and\n"
6965
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6966
"are opened in a web browser."
6967
msgstr ""
6968
6969
#: bzrlib/plugins/launchpad/cmds.py:342
6970
msgid ""
6971
"Any revision involved in the merge may be specified-- the revision in\n"
6972
"which the merge was performed, or one of the revisions that was merged."
6973
msgstr ""
6974
6975
#: bzrlib/plugins/launchpad/cmds.py:345
6976
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6977
msgstr ""
6978
6979
#: bzrlib/plugins/launchpad/cmds.py:347
6980
msgid " bzr lp-find-proposal -r annotate:README:1"
6981
msgstr ""
6982
6983
#: bzrlib/plugins/launchpad/cmds.py:363
6984
msgid "No review found."
6985
msgstr ""
6986
6987
#: bzrlib/plugins/launchpad/cmds.py:364
6988
#, python-format
6989
msgid "%d proposals(s) found."
6990
msgstr ""
6991
6992
#: bzrlib/plugins/launchpad/cmds.py:374
6993
msgid "Finding revision-id"
6994
msgstr ""
6995
6996
#: bzrlib/plugins/launchpad/cmds.py:381
6997
msgid "Finding merge"
6998
msgstr ""
6999
7000
#: bzrlib/plugins/launchpad/cmds.py:386
7001
msgid "Finding revno"
7002
msgstr ""
7003
7004
#: bzrlib/plugins/launchpad/cmds.py:392
7005
msgid "Finding Launchpad branch"
7006
msgstr ""
7007
7008
#: bzrlib/plugins/launchpad/cmds.py:395
7009
msgid "Finding proposals"
7010
msgstr ""
7011
7012
#: bzrlib/plugins/launchpad/lp_api.py:241
7013
#: bzrlib/plugins/launchpad/lp_api.py:246
7014
#, python-format
7015
msgid "%s is not registered on Launchpad"
7016
msgstr "%s ist nicht in Launchpad registriert"
7017
7018
#: bzrlib/plugins/launchpad/lp_api.py:256
7019
#, python-format
7020
msgid "%s has no development focus."
7021
msgstr ""
7022
7023
#: bzrlib/plugins/launchpad/lp_api.py:261
7024
#, python-format
7025
msgid "development focus %s has no branch."
7026
msgstr ""
7027
7028
#: bzrlib/plugins/launchpad/lp_api.py:266
7029
#, python-format
7030
msgid "source package %s has no branch."
7031
msgstr ""
7032
7033
#: bzrlib/plugins/launchpad/lp_api.py:270
7034
#, python-format
7035
msgid "%s has no associated product or source package."
7036
msgstr ""
7037
7038
#: bzrlib/plugins/launchpad/lp_api.py:282
7039
#, python-format
7040
msgid "%s is already up-to-date."
7041
msgstr "%s ist bereits auf dem neuesten Stand."
7042
7043
#: bzrlib/plugins/launchpad/lp_api.py:289
7044
#, python-format
7045
msgid "Pushing to %s"
7046
msgstr ""
7047
7048
#: bzrlib/plugins/launchpad/lp_directory.py:170
7049
msgid ""
7050
"resolution for {0}\n"
7051
" local: {1}\n"
7052
" remote: {2}"
7053
msgstr ""
7054
7055
#: bzrlib/plugins/launchpad/lp_propose.py:150
7056
#, python-format
7057
msgid "There is already a branch merge proposal: %s"
7058
msgstr ""
7059
7060
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7061
msgid "pb parameter to convert() is deprecated"
7062
msgstr ""
7063
7064
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7065
msgid "starting upgrade from format 4 to 5"
7066
msgstr ""
7067
7068
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7069
msgid "note: upgrade may be faster if all store files are ungzipped first"
7070
msgstr ""
7071
7072
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7073
msgid "converting revision"
7074
msgstr "Revision umwandeln"
7075
7076
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7077
msgid "upgraded to weaves:"
7078
msgstr ""
7079
7080
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7081
#, python-format
7082
msgid "%6d revisions and inventories"
7083
msgstr ""
7084
7085
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7086
#, python-format
7087
msgid "%6d revisions not present"
7088
msgstr "%6d Revisionen nicht vorhanden"
7089
7090
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7091
#, python-format
7092
msgid "%6d texts"
7093
msgstr "%6d Texte"
7094
7095
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7096
msgid "writing weave"
7097
msgstr ""
7098
7099
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7100
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7101
msgid "inventory"
7102
msgstr ""
7103
7104
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7105
msgid "write revision"
7106
msgstr "Revision schreiben"
7107
7108
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7109
msgid "loading revision"
7110
msgstr "Revision laden"
7111
7112
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7113
#, python-format
7114
msgid "revision {%s} not present in branch; will be converted as a ghost"
7115
msgstr ""
7116
7117
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7118
msgid "starting upgrade from format 5 to 6"
7119
msgstr ""
7120
7121
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7122
#, python-format
7123
msgid "adding prefixes to %s"
7124
msgstr ""
7125
7126
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7127
msgid "starting upgrade from format 6 to metadir"
7128
msgstr ""
7129
7130
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7131
msgid "Removing ancestry.weave"
7132
msgstr ""
7133
7134
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7135
msgid "Finding branch files"
7136
msgstr "Dateien des Zweigs finden"
7137
7138
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7139
msgid "Upgrading repository"
7140
msgstr ""
7141
7142
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7143
msgid "Upgrading branch"
7144
msgstr ""
7145
7146
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7147
msgid "No working tree."
7148
msgstr ""
7149
7150
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7151
msgid "Upgrading working tree"
7152
msgstr ""
7153
7154
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7155
#, python-format
7156
msgid "Make %s lock"
7157
msgstr ""
7158
7159
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7160
#, python-format
7161
msgid "Moving %s"
7162
msgstr "%s wird verschoben"
7163
7164
#: bzrlib/push.py:56
7165
msgid "Created new branch."
7166
msgstr "Neuer Zweig wurde erstellt."
7167
7168
#: bzrlib/push.py:97
7169
#, python-format
7170
msgid ""
7171
"Target directory %s already contains a .bzr directory, but it is not valid."
7172
msgstr ""
7173
7174
#: bzrlib/push.py:101
7175
#, python-format
7176
msgid ""
7177
"Target directory %s already exists, but does not have a .bzr directory. "
7178
"Supply --use-existing-dir to push there anyway."
7179
msgstr ""
7180
7181
#: bzrlib/push.py:122
7182
#, python-format
7183
msgid "Too many redirections trying to make %s."
7184
msgstr ""
7185
7186
#: bzrlib/push.py:148
7187
msgid ""
7188
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7189
"information."
7190
msgstr ""
7191
7192
#: bzrlib/push.py:152
7193
#, python-format
7194
msgid ""
7195
"It is not possible to losslessly push to %s. You may want to use dpush "
7196
"instead."
7197
msgstr ""
7198
7199
#: bzrlib/push.py:158
7200
#, python-format
7201
msgid ""
7202
"At %s you have a valid .bzr control directory, but not a branch or "
7203
"repository. This is an unsupported configuration. Please move the target "
7204
"directory out of the way and try again."
7205
msgstr ""
7206
7207
#: bzrlib/reconcile.py:97
7208
#, python-format
7209
msgid "Reconciling branch %s"
7210
msgstr ""
7211
7212
#: bzrlib/reconcile.py:103
7213
#, python-format
7214
msgid "Reconciling repository %s"
7215
msgstr ""
7216
7217
#: bzrlib/reconcile.py:105
7218
msgid "Reconciling repository"
7219
msgstr ""
7220
7221
#: bzrlib/reconcile.py:111
7222
#, python-format
7223
msgid "%s cannot canonicalize CHKs."
7224
msgstr ""
7225
7226
#: bzrlib/reconcile.py:119
7227
msgid "Reconcile aborted: revision index has inconsistent parents."
7228
msgstr ""
7229
7230
#: bzrlib/reconcile.py:121
7231
msgid "Run \"bzr check\" for more details."
7232
msgstr ""
7233
7234
#: bzrlib/reconcile.py:123
7235
msgid "Reconciliation complete."
7236
msgstr ""
7237
7238
#: bzrlib/reconcile.py:166
7239
msgid "Fixing last revision info {0} => {1}"
7240
msgstr ""
7241
7242
#: bzrlib/reconcile.py:173
7243
msgid "revision_history ok."
7244
msgstr ""
7245
7246
#: bzrlib/reconcile.py:234
7247
msgid "Reading inventory data"
7248
msgstr ""
7249
7250
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7251
msgid "Inventory ok."
7252
msgstr ""
7253
7254
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7255
msgid "Backing up inventory"
7256
msgstr ""
7257
7258
#: bzrlib/reconcile.py:258
7259
msgid "Backup inventory created."
7260
msgstr ""
7261
7262
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7263
msgid "Writing weave"
7264
msgstr ""
7265
7266
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7267
msgid "Inventory regenerated."
7268
msgstr ""
7269
7270
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7271
msgid "Reading indexes"
7272
msgstr ""
7273
7274
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7275
msgid "Checking unused inventories"
7276
msgstr ""
7277
7278
#: bzrlib/reconcile.py:388
7279
msgid "Backup Inventory created"
7280
msgstr ""
7281
7282
#: bzrlib/reconcile.py:446
7283
msgid "Fixing text parents"
7284
msgstr ""
7285
7286
#: bzrlib/reconfigure.py:54
7287
msgid "{0} is now stacked on {1}\n"
7288
msgstr ""
7289
7290
#: bzrlib/reconfigure.py:69
7291
#, python-format
7292
msgid "%s is now not stacked\n"
7293
msgstr ""
7294
7295
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7296
#, python-format
7297
msgid "bzr: ERROR (ignored): %s"
7298
msgstr ""
7299
7300
#: bzrlib/remote.py:2534
7301
msgid "Copying repository content as tarball..."
7302
msgstr ""
7303
7304
#: bzrlib/rename_map.py:69
7305
msgid "Calculating hashes"
7306
msgstr ""
7307
7308
#: bzrlib/rename_map.py:107
7309
msgid "Determining hash hits"
7310
msgstr ""
7311
7312
#: bzrlib/rename_map.py:242
7313
msgid "{0} => {1}"
7314
msgstr ""
7315
7316
#: bzrlib/repository.py:1738
7317
msgid "Moving repository to repository.backup"
7318
msgstr ""
7319
7320
#: bzrlib/repository.py:1745
7321
msgid "Creating new repository"
7322
msgstr ""
7323
7324
#: bzrlib/repository.py:1750
7325
msgid "Copying content"
7326
msgstr ""
7327
7328
#: bzrlib/repository.py:1754
7329
msgid "Deleting old repository content"
7330
msgstr ""
7331
7332
#: bzrlib/repository.py:1756
7333
msgid "repository converted"
7334
msgstr ""
7335
7336
#: bzrlib/revisionspec.py:903
7337
msgid "Using {0} {1}"
7338
msgstr ""
7339
7340
#: bzrlib/send.py:59
7341
#, python-format
7342
msgid "Mail client \"%s\" does not support specifying body"
7343
msgstr ""
7344
7345
#: bzrlib/send.py:63
7346
msgid "--remember requires a branch to be specified."
7347
msgstr ""
7348
7349
#: bzrlib/send.py:78
7350
msgid "No submit branch known or specified"
7351
msgstr ""
7352
7353
#: bzrlib/send.py:81
7354
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7355
msgstr ""
7356
7357
#: bzrlib/send.py:99
7358
#, python-format
7359
msgid "No such send format '%s'."
7360
msgstr ""
7361
7362
#: bzrlib/send.py:115
7363
msgid "bzr send takes at most two one revision identifiers"
7364
msgstr ""
7365
7366
#: bzrlib/send.py:128
7367
msgid "No revisions to submit."
7368
msgstr ""
7369
7370
#: bzrlib/send.py:140
7371
msgid ""
7372
"- not supported for merge directives that use more than one output file."
7373
msgstr ""
7374
7375
#: bzrlib/send.py:186
7376
msgid "Format 0.9 does not permit bundle with no patch"
7377
msgstr ""
7378
7379
#: bzrlib/shelf_ui.py:46
7380
#, python-format
7381
msgid "Shelve adding file \"%(path)s\"?"
7382
msgstr ""
7383
7384
#: bzrlib/shelf_ui.py:47
7385
msgid "Shelve binary changes?"
7386
msgstr ""
7387
7388
#: bzrlib/shelf_ui.py:48
7389
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7390
msgstr ""
7391
7392
#: bzrlib/shelf_ui.py:50
7393
#, python-format
7394
msgid "Shelve removing file \"%(path)s\"?"
7395
msgstr ""
7396
7397
#: bzrlib/shelf_ui.py:51
7398
#, python-format
7399
msgid "Shelve %d change(s)?"
7400
msgstr ""
7401
7402
#: bzrlib/shelf_ui.py:52
7403
msgid "Shelve?"
7404
msgstr ""
7405
7406
#: bzrlib/shelf_ui.py:53
7407
#, python-format
7408
msgid ""
7409
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7410
msgstr ""
7411
7412
#: bzrlib/shelf_ui.py:55
7413
#, python-format
7414
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7415
msgstr ""
7416
7417
#: bzrlib/shelf_ui.py:70
7418
#, python-format
7419
msgid "Changes shelved with id \"%d\"."
7420
msgstr ""
7421
7422
#: bzrlib/shelf_ui.py:74
7423
msgid "Selected changes destroyed."
7424
msgstr ""
7425
7426
#: bzrlib/shelf_ui.py:78
7427
msgid "Selected changes:"
7428
msgstr ""
7429
7430
#: bzrlib/shelf_ui.py:98
7431
#, python-format
7432
msgid "Delete file \"%(path)s\"?"
7433
msgstr ""
7434
7435
#: bzrlib/shelf_ui.py:99
7436
msgid "Apply binary changes?"
7437
msgstr ""
7438
7439
#: bzrlib/shelf_ui.py:100
7440
#, python-format
7441
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7442
msgstr ""
7443
7444
#: bzrlib/shelf_ui.py:102
7445
#, python-format
7446
msgid "Add file \"%(path)s\"?"
7447
msgstr ""
7448
7449
#: bzrlib/shelf_ui.py:103
7450
#, python-format
7451
msgid "Apply %d change(s)?"
7452
msgstr ""
7453
7454
#: bzrlib/shelf_ui.py:104
7455
msgid "Apply change?"
7456
msgstr ""
7457
7458
#: bzrlib/shelf_ui.py:105
7459
#, python-format
7460
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7461
msgstr ""
7462
7463
#: bzrlib/shelf_ui.py:107
7464
#, python-format
7465
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7466
msgstr ""
7467
7468
#: bzrlib/shelf_ui.py:402
7469
msgid "No changes are shelved."
7470
msgstr ""
7471
7472
#: bzrlib/shelf_ui.py:460
7473
#, python-format
7474
msgid "Using changes with id \"%d\"."
7475
msgstr ""
7476
7477
#: bzrlib/shelf_ui.py:464
7478
#, python-format
7479
msgid "Message: %s"
7480
msgstr ""
7481
7482
#: bzrlib/shelf_ui.py:476
7483
#, python-format
7484
msgid "Deleted changes with id \"%d\"."
7485
msgstr ""
7486
7487
#: bzrlib/smart/medium.py:714
7488
msgid "HPSS calls: {0} ({1} vfs) {2}"
7489
msgstr ""
7490
7491
#: bzrlib/smart/server.py:169
7492
msgid "Requested to stop gracefully"
7493
msgstr ""
7494
7495
#: bzrlib/smart/server.py:179
7496
#, python-format
7497
msgid "Waiting for %d client(s) to finish"
7498
msgstr ""
7499
7500
#: bzrlib/smart/server.py:185
7501
#, python-format
7502
msgid "Still waiting for %d client(s) to finish"
7503
msgstr ""
7504
7505
#: bzrlib/smart/server.py:219
7506
#, python-format
7507
msgid "listening socket error: %s"
7508
msgstr ""
7509
7510
#: bzrlib/smart/server.py:452
7511
#, python-format
7512
msgid "listening on port: %s"
7513
msgstr ""
7514
7515
#: bzrlib/switch.py:73
7516
msgid "Pending merges must be committed or reverted before using switch."
7517
msgstr ""
7518
7519
#: bzrlib/switch.py:100
7520
msgid ""
7521
"Cannot switch as local commits found in the checkout. Commit these to the "
7522
"bound branch or use --force to throw them away."
7523
msgstr ""
7524
7525
#: bzrlib/switch.py:105
7526
#, python-format
7527
msgid ""
7528
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7529
"anyway, use --force."
7530
msgstr ""
7531
7532
#: bzrlib/switch.py:129
7533
msgid "Cannot switch a branch, only a checkout."
7534
msgstr ""
7535
7536
#: bzrlib/switch.py:167
7537
#, python-format
7538
msgid "Tree is up to date at revision %d."
7539
msgstr ""
7540
7541
#: bzrlib/switch.py:173
7542
#, python-format
7543
msgid "Updated to revision %d."
7544
msgstr ""
7545
7546
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7547
msgid "Apply phase"
7548
msgstr ""
7549
7550
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7551
msgid "removing file"
7552
msgstr ""
7553
7554
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7555
msgid "adding file"
7556
msgstr ""
7557
7558
#: bzrlib/transform.py:2598
7559
msgid "Building tree"
7560
msgstr ""
7561
7562
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7563
msgid "Adding file contents"
7564
msgstr ""
7565
7566
#: bzrlib/transform.py:3017
7567
msgid "Resolution pass"
7568
msgstr ""
7569
7570
#: bzrlib/transport/ftp/_gssapi.py:88
7571
#, python-format
7572
msgid "Authenticated as %s"
7573
msgstr ""
7574
7575
#: bzrlib/tree.py:647
7576
msgid "*** {0} content-filter: {1} => {2!r}"
7577
msgstr ""
7578
7579
#: bzrlib/upgrade.py:77
7580
#, python-format
7581
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7582
msgstr ""
7583
7584
#: bzrlib/upgrade.py:100
7585
#, python-format
7586
msgid "cannot upgrade from bzrdir format %s"
7587
msgstr ""
7588
7589
#: bzrlib/upgrade.py:103
7590
#, python-format
7591
msgid "starting upgrade of %s"
7592
msgstr ""
7593
7594
#: bzrlib/upgrade.py:110
7595
msgid "finished"
7596
msgstr ""
7597
7598
#: bzrlib/upgrade.py:120
7599
msgid "Deleting backup.bzr"
7600
msgstr "Lösche backup.bzr"
7601
7602
#: bzrlib/upgrade.py:151
7603
msgid ""
7604
"\n"
7605
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7606
msgstr ""
7607
7608
#: bzrlib/upgrade.py:208
7609
#, python-format
7610
msgid "Found %d dependent branches - upgrading ..."
7611
msgstr ""
7612
7613
#: bzrlib/upgrade.py:276
7614
msgid "Upgrading bzrdirs"
7615
msgstr ""
7616
7617
#: bzrlib/upgrade.py:282
7618
#, python-format
7619
msgid "Upgrading %s"
7620
msgstr "%s wird aktualisiert"
7621
7622
#: bzrlib/upgrade.py:283
7623
msgid "Upgrading {0} {1} ..."
7624
msgstr ""
7625
7626
#: bzrlib/upgrade.py:301
7627
msgid "Removing backup ..."
7628
msgstr "Entferne Backup…"
7629
7630
#: bzrlib/upgrade.py:305
7631
msgid "failed to clean-up {0}: {1}"
7632
msgstr ""
7633
7634
#: bzrlib/vf_repository.py:1091
7635
msgid "inventories"
7636
msgstr ""
7637
7638
#: bzrlib/vf_repository.py:1117
7639
msgid "texts"
7640
msgstr ""
7641
7642
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7643
msgid "Calculating text parents"
7644
msgstr ""
7645
7646
#: bzrlib/vf_repository.py:1707
7647
msgid "Fetch texts"
7648
msgstr ""
7649
7650
#: bzrlib/vf_repository.py:2536
7651
msgid "loading text store"
7652
msgstr ""
7653
7654
#: bzrlib/vf_repository.py:2542
7655
msgid "checking text graph"
7656
msgstr ""
7657
7658
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7659
#: bzrlib/vf_repository.py:3127
7660
msgid "Transferring revisions"
7661
msgstr ""
7662
7663
#: bzrlib/win32utils.py:146
7664
msgid "Failed to GetProcessMemoryInfo()"
7665
msgstr ""
7666
7667
#: bzrlib/win32utils.py:167
7668
msgid "Cannot debug memory on win32 without ctypes or win32process"
7669
msgstr ""
7670
7671
#: bzrlib/win32utils.py:172
7672
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7673
msgstr ""
7674
7675
#: bzrlib/win32utils.py:180
7676
#, python-format
7677
msgid "WorkingSize %8d KiB"
7678
msgstr ""
7679
7680
#: bzrlib/win32utils.py:181
7681
#, python-format
7682
msgid "PeakWorking %8d KiB"
7683
msgstr ""
7684
7685
#: bzrlib/win32utils.py:182
7686
#, python-format
7687
msgid "PagefileUsage %8d KiB"
7688
msgstr ""
7689
7690
#: bzrlib/win32utils.py:183
7691
#, python-format
7692
msgid "PeakPagefileUsage %8d KiB"
7693
msgstr ""
7694
7695
#: bzrlib/win32utils.py:185
7696
#, python-format
7697
msgid "PrivateUsage %8d KiB"
7698
msgstr ""
7699
7700
#: bzrlib/win32utils.py:186
7701
#, python-format
7702
msgid "PageFaultCount %8d"
7703
msgstr ""
7704
7705
#: bzrlib/workingtree.py:1482
7706
msgid "Rerun update after fixing the conflicts."
7707
msgstr ""
7708
7709
#: dummy/help_topics/authentication/summary.txt:1
7710
msgid "Information on configuring authentication"
7711
msgstr ""
7712
7713
#: dummy/help_topics/basic/detail.txt:1
7714
msgid ""
7715
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7716
"http://bazaar.canonical.com/"
7717
msgstr ""
7718
7719
#: dummy/help_topics/basic/detail.txt:4
7720
msgid ""
7721
"Basic commands:\n"
7722
" bzr init makes this directory a versioned branch\n"
7723
" bzr branch make a copy of another branch"
7724
msgstr ""
7725
"Grundbefehle:\n"
7726
" bzr init Aktuelles Verzeichnis wird zu einem versionierten Zweig "
7727
"gemacht\n"
7728
" bzr branch Eine Kopie eines anderen Entwicklungszweigs wird "
7729
"erstellt"
7730
7731
#: dummy/help_topics/basic/detail.txt:8
7732
msgid ""
7733
" bzr add make files or directories versioned\n"
7734
" bzr ignore ignore a file or pattern\n"
7735
" bzr mv move or rename a versioned file"
7736
msgstr ""
7737
" bzr add Dateien oder Verzeichnisse werden versioniert\n"
7738
" bzr ignore Eine Datei oder ein Dateimuster wird ignoriert\n"
7739
" bzr mv Eine versionierte Datei wird verschoben oder umbenannt"
7740
7741
#: dummy/help_topics/basic/detail.txt:12
7742
msgid ""
7743
" bzr status summarize changes in working copy\n"
7744
" bzr diff show detailed diffs"
7745
msgstr ""
7746
7747
#: dummy/help_topics/basic/detail.txt:15
7748
msgid ""
7749
" bzr merge pull in changes from another branch\n"
7750
" bzr commit save some or all changes\n"
7751
" bzr send send changes via email"
7752
msgstr ""
7753
7754
#: dummy/help_topics/basic/detail.txt:19
7755
msgid ""
7756
" bzr log show history of changes\n"
7757
" bzr check validate storage"
7758
msgstr ""
7759
7760
#: dummy/help_topics/basic/detail.txt:22
7761
msgid ""
7762
" bzr help init more help on e.g. init command\n"
7763
" bzr help commands list all commands\n"
7764
" bzr help topics list all help topics\n"
7765
msgstr ""
7766
7767
#: dummy/help_topics/basic/summary.txt:1
7768
msgid "Basic commands"
7769
msgstr "Einfache Befehle"
7770
7771
#: dummy/help_topics/branches/detail.txt:1
7772
msgid "Branches"
7773
msgstr "Zweige"
7774
7775
#: dummy/help_topics/branches/detail.txt:3
7776
msgid ""
7777
"A branch consists of the state of a project, including all of its\n"
7778
"history. All branches have a repository associated (which is where the\n"
7779
"branch history is stored), but multiple branches may share the same\n"
7780
"repository (a shared repository). Branches can be copied and merged."
7781
msgstr ""
7782
7783
#: dummy/help_topics/branches/detail.txt:8
7784
msgid ""
7785
"In addition, one branch may be bound to another one. Binding to another\n"
7786
"branch indicates that commits which happen in this branch must also \n"
7787
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7788
"commits when the two branches are out of date. In order for a commit \n"
7789
"to succeed, it may be necessary to update the current branch using \n"
7790
"``bzr update``."
7791
msgstr ""
7792
7793
#: dummy/help_topics/branches/detail.txt:15
7794
#: dummy/help_topics/checkouts/detail.txt:66
7795
#: dummy/help_topics/repositories/detail.txt:36
7796
msgid "Related commands::"
7797
msgstr ""
7798
7799
#: dummy/help_topics/branches/detail.txt:17
7800
msgid ""
7801
" init Change a directory into a versioned branch.\n"
7802
" branch Create a new branch that is a copy of an existing branch.\n"
7803
" merge Perform a three-way merge.\n"
7804
" bind Bind a branch to another one.\n"
7805
msgstr ""
7806
" init Ein Verzeichnis wird als ein versionierter Zweig festgelegt\n"
7807
" branch Ein neuer Zweig wird durch Kopieren eines bestehenden Zweigs "
7808
"erstellt\n"
7809
" merge Ein Dreiwege-Merge wird durchgeführt\n"
7810
" bind Ein Zweig wird mit einem anderen verbunden\n"
7811
7812
#: dummy/help_topics/branches/summary.txt:1
7813
msgid "Information on what a branch is"
7814
msgstr ""
7815
7816
#: dummy/help_topics/bugs/summary.txt:1
7817
msgid "Bug tracker settings"
7818
msgstr "Bug Tracker Einstellungen"
7819
7820
#: dummy/help_topics/checkouts/detail.txt:1
7821
msgid "Checkouts"
7822
msgstr ""
7823
7824
#: dummy/help_topics/checkouts/detail.txt:3
7825
msgid ""
7826
"Checkouts are source trees that are connected to a branch, so that when\n"
7827
"you commit in the source tree, the commit goes into that branch. They\n"
7828
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7829
"Bazaar's decentralized features until you want them. Using checkouts\n"
7830
"with shared repositories is very similar to working with SVN or CVS, but\n"
7831
"doesn't have the same restrictions. And using checkouts still allows\n"
7832
"others working on the project to use whatever workflow they like."
7833
msgstr ""
7834
7835
#: dummy/help_topics/checkouts/detail.txt:11
7836
msgid ""
7837
"A checkout is created with the bzr checkout command (see \"help "
7838
"checkout\").\n"
7839
"You pass it a reference to another branch, and it will create a local copy\n"
7840
"for you that still contains a reference to the branch you created the\n"
7841
"checkout from (the master branch). Then if you make any commits they will "
7842
"be\n"
7843
"made on the other branch first. This creates an instant mirror of your work, "
7844
"or\n"
7845
"facilitates lockstep development, where each developer is working together,\n"
7846
"continuously integrating the changes of others."
7847
msgstr ""
7848
7849
#: dummy/help_topics/checkouts/detail.txt:19
7850
msgid ""
7851
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7852
"you have the full history locally. As you have a first class branch you "
7853
"can\n"
7854
"also commit locally if you want, for instance due to the temporary loss af "
7855
"a\n"
7856
"network connection. Use the --local option to commit to do this. All the "
7857
"local\n"
7858
"commits will then be made on the master branch the next time you do a non-"
7859
"local\n"
7860
"commit."
7861
msgstr ""
7862
7863
#: dummy/help_topics/checkouts/detail.txt:26
7864
msgid ""
7865
"If you are using a checkout from a shared branch you will periodically want "
7866
"to\n"
7867
"pull in all the changes made by others. This is done using the \"update\"\n"
7868
"command. The changes need to be applied before any non-local commit, but\n"
7869
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7870
"command when needed."
7871
msgstr ""
7872
7873
#: dummy/help_topics/checkouts/detail.txt:32
7874
msgid ""
7875
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7876
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7877
"SVN checkout in that it is not a first class branch, it mainly consists of "
7878
"the\n"
7879
"working tree. This means that any history operations must query the master\n"
7880
"branch, which could be slow if a network connection is involved. Also, as "
7881
"you\n"
7882
"don't have a local branch, then you cannot commit locally."
7883
msgstr ""
7884
7885
#: dummy/help_topics/checkouts/detail.txt:39
7886
msgid ""
7887
"Lightweight checkouts work best when you have fast reliable access to the\n"
7888
"master branch. This means that if the master branch is on the same disk or "
7889
"LAN\n"
7890
"a lightweight checkout will be faster than a heavyweight one for any "
7891
"commands\n"
7892
"that modify the revision history (as only one copy of the branch needs to\n"
7893
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7894
"that uses the history but does not change it, but if the master branch is "
7895
"on\n"
7896
"the same disk then there won't be a noticeable difference."
7897
msgstr ""
7898
7899
#: dummy/help_topics/checkouts/detail.txt:47
7900
msgid ""
7901
"Another possible use for a checkout is to use it with a treeless repository\n"
7902
"containing your branches, where you maintain only one working tree by\n"
7903
"switching the master branch that the checkout points to when you want to\n"
7904
"work on a different branch."
7905
msgstr ""
7906
7907
#: dummy/help_topics/checkouts/detail.txt:52
7908
msgid ""
7909
"Obviously to commit on a checkout you need to be able to write to the "
7910
"master\n"
7911
"branch. This means that the master branch must be accessible over a "
7912
"writeable\n"
7913
"protocol , such as sftp://, and that you have write permissions at the "
7914
"other\n"
7915
"end. Checkouts also work on the local file system, so that all that matters "
7916
"is\n"
7917
"file permissions."
7918
msgstr ""
7919
7920
#: dummy/help_topics/checkouts/detail.txt:58
7921
msgid ""
7922
"You can change the master of a checkout by using the \"switch\" command "
7923
"(see\n"
7924
"\"help switch\"). This will change the location that the commits are sent "
7925
"to.\n"
7926
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7927
"checkout. If you would like to convert your heavy checkout into a normal\n"
7928
"branch so that every commit is local, you can use the \"unbind\" command. To "
7929
"see\n"
7930
"whether or not a branch is bound or not you can use the \"info\" command. If "
7931
"the\n"
7932
"branch is bound it will tell you the location of the bound branch."
7933
msgstr ""
7934
7935
#: dummy/help_topics/checkouts/detail.txt:68
7936
msgid ""
7937
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7938
" checkout\n"
7939
" update Pull any changes in the master branch in to your checkout\n"
7940
" commit Make a commit that is sent to the master branch. If you have\n"
7941
" a heavy checkout then the --local option will commit to the\n"
7942
" checkout without sending the commit to the master\n"
7943
" switch Change the master branch that the commits in the checkout "
7944
"will\n"
7945
" be sent to\n"
7946
" bind Turn a standalone branch into a heavy checkout so that any\n"
7947
" commits will be sent to the master branch\n"
7948
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7949
" commits are only made locally\n"
7950
" info Displays whether a branch is bound or unbound. If the branch "
7951
"is\n"
7952
" bound, then it will also display the location of the bound "
7953
"branch\n"
7954
msgstr ""
7955
7956
#: dummy/help_topics/checkouts/summary.txt:1
7957
msgid "Information on what a checkout is"
7958
msgstr ""
7959
7960
#: dummy/help_topics/commands/summary.txt:1
7961
msgid "Basic help for all commands"
7962
msgstr ""
7963
7964
#: dummy/help_topics/configuration/summary.txt:1
7965
msgid "Details on the configuration settings available"
7966
msgstr ""
7967
7968
#: dummy/help_topics/conflict-types/summary.txt:1
7969
msgid "Types of conflicts and what to do about them"
7970
msgstr ""
7971
7972
#: dummy/help_topics/content-filters/summary.txt:1
7973
msgid "Conversion of content into/from working trees"
7974
msgstr ""
7975
7976
#: dummy/help_topics/criss-cross/detail.txt:1
7977
msgid "Criss-Cross"
7978
msgstr "Kreuz und Quer"
7979
7980
#: dummy/help_topics/criss-cross/detail.txt:3
7981
msgid ""
7982
"A criss-cross in the branch history can cause the default merge technique\n"
7983
"to emit more conflicts than would normally be expected."
7984
msgstr ""
7985
7986
#: dummy/help_topics/criss-cross/detail.txt:6
7987
msgid ""
7988
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7989
"give\n"
7990
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7991
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7992
msgstr ""
7993
7994
#: dummy/help_topics/criss-cross/detail.txt:10
7995
msgid ""
7996
"Criss-crosses occur in a branch's history if two branches merge the same "
7997
"thing\n"
7998
"and then merge one another, or if two branches merge one another at the "
7999
"same\n"
8000
"time. They can be avoided by having each branch only merge from or into a\n"
8001
"designated central branch (a \"star topology\")."
8002
msgstr ""
8003
8004
#: dummy/help_topics/criss-cross/detail.txt:15
8005
msgid ""
8006
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8007
"default\n"
8008
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8009
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8010
"differences between THIS and OTHER are due to one side adding lines, or\n"
8011
"from another side removing lines."
8012
msgstr ""
8013
8014
#: dummy/help_topics/criss-cross/detail.txt:21
8015
msgid ""
8016
"Criss-crosses mean there is no good choice for a base. Selecting the "
8017
"recent\n"
8018
"merge points could cause one side's changes to be silently discarded.\n"
8019
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8020
"are emitted."
8021
msgstr ""
8022
8023
#: dummy/help_topics/criss-cross/detail.txt:26
8024
msgid ""
8025
"The ``weave`` merge type is not affected by this problem because it uses\n"
8026
"line-origin detection instead of a basis revision to determine the cause of\n"
8027
"differences.\n"
8028
msgstr ""
8029
8030
#: dummy/help_topics/criss-cross/summary.txt:1
8031
msgid "Information on criss-cross merging"
8032
msgstr ""
8033
8034
#: dummy/help_topics/current-formats/summary.txt:1
8035
msgid "Current storage formats"
8036
msgstr "Aktuelle Speicherformate"
8037
8038
#: dummy/help_topics/debug-flags/summary.txt:1
8039
msgid "Options to show or record debug information"
8040
msgstr ""
8041
8042
#: dummy/help_topics/diverged-branches/summary.txt:1
8043
msgid "How to fix diverged branches"
8044
msgstr ""
8045
8046
#: dummy/help_topics/env-variables/summary.txt:1
8047
msgid "Environment variable names and values"
8048
msgstr ""
8049
8050
#: dummy/help_topics/eol/summary.txt:1
8051
msgid "Information on end-of-line handling"
8052
msgstr ""
8053
8054
#: dummy/help_topics/files/detail.txt:1
8055
msgid "Files"
8056
msgstr "Dateien"
8057
8058
#: dummy/help_topics/files/detail.txt:3
8059
msgid ""
8060
":On Unix: ~/.bazaar/bazaar.conf\n"
8061
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8062
"bazaar\\\\2.0\\\\bazaar.conf"
8063
msgstr ""
8064
":In Unix: ~/.bazaar/bazaar.conf\n"
8065
":In Windows: C:\\\\Dokumente und Einstellungen\\\\Benutzername\\\\"
8066
"Anwendungsdaten\\\\bazaar\\\\2.0\\\\bazaar.conf"
8067
8068
#: dummy/help_topics/files/detail.txt:6
8069
msgid ""
8070
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8071
"used to define general configuration that will be applied everywhere.\n"
8072
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8073
"commonly used options."
8074
msgstr ""
8075
8076
#: dummy/help_topics/files/detail.txt:11
8077
msgid "A typical config file might look something like::"
8078
msgstr "Eine typische Konfigurationsdatei könnte so aussehen::"
8079
8080
#: dummy/help_topics/files/detail.txt:13
8081
msgid ""
8082
" [DEFAULT]\n"
8083
" email=John Doe <jdoe@isp.com>"
8084
msgstr ""
8085
8086
#: dummy/help_topics/files/detail.txt:16
8087
msgid ""
8088
" [ALIASES]\n"
8089
" commit = commit --strict\n"
8090
" log10 = log --short -r -10..-1\n"
8091
msgstr ""
8092
8093
#: dummy/help_topics/files/summary.txt:1
8094
msgid "Information on configuration and log files"
8095
msgstr ""
8096
8097
#: dummy/help_topics/formats/detail.txt:1
8098
msgid "Storage Formats"
8099
msgstr "Speicherformate"
8100
8101
#: dummy/help_topics/formats/detail.txt:3
8102
msgid ""
8103
"To ensure that older clients do not access data incorrectly,\n"
8104
"Bazaar's policy is to introduce a new storage format whenever\n"
8105
"new features requiring new metadata are added. New storage\n"
8106
"formats may also be introduced to improve performance and\n"
8107
"scalability."
8108
msgstr ""
8109
8110
#: dummy/help_topics/formats/detail.txt:9
8111
msgid ""
8112
"The newest format, 2a, is highly recommended. If your\n"
8113
"project is not using 2a, then you should suggest to the\n"
8114
"project owner to upgrade."
8115
msgstr ""
8116
8117
#: dummy/help_topics/formats/detail.txt:13
8118
msgid ""
8119
"\n"
8120
".. note::"
8121
msgstr ""
8122
8123
#: dummy/help_topics/formats/detail.txt:16
8124
msgid ""
8125
" Some of the older formats have two variants:\n"
8126
" a plain one and a rich-root one. The latter include an additional\n"
8127
" field about the root of the tree. There is no performance cost\n"
8128
" for using a rich-root format but you cannot easily merge changes\n"
8129
" from a rich-root format into a plain format. As a consequence,\n"
8130
" moving a project to a rich-root format takes some co-ordination\n"
8131
" in that all contributors need to upgrade their repositories\n"
8132
" around the same time. 2a and all future formats will be\n"
8133
" implicitly rich-root."
8134
msgstr ""
8135
8136
#: dummy/help_topics/formats/detail.txt:26
8137
msgid ""
8138
"See :doc:`current-formats-help` for the complete list of\n"
8139
"currently supported formats. See :doc:`other-formats-help` for\n"
8140
"descriptions of any available experimental and deprecated formats.\n"
8141
msgstr ""
8142
8143
#: dummy/help_topics/formats/summary.txt:1
8144
msgid "Information on choosing a storage format"
8145
msgstr "Informationen zur Auswahl eines Speicherformats"
8146
8147
#: dummy/help_topics/global-options/detail.txt:1
8148
msgid "Global Options"
8149
msgstr "Globale Einstellungen"
8150
8151
#: dummy/help_topics/global-options/detail.txt:3
8152
msgid ""
8153
"These options may be used with any command, and may appear in front of any\n"
8154
"command. (e.g. ``bzr --profile help``)."
8155
msgstr ""
8156
8157
#: dummy/help_topics/global-options/detail.txt:6
8158
msgid ""
8159
"--version Print the version number. Must be supplied before the "
8160
"command.\n"
8161
"--no-aliases Do not process command aliases when running this command.\n"
8162
"--builtin Use the built-in version of a command, not the plugin "
8163
"version.\n"
8164
" This does not suppress other plugin effects.\n"
8165
"--no-plugins Do not process any plugins.\n"
8166
"--no-l10n Do not translate messages.\n"
8167
"--concurrency Number of processes that can be run concurrently (selftest)."
8168
msgstr ""
8169
8170
#: dummy/help_topics/global-options/detail.txt:14
8171
msgid ""
8172
"--profile Profile execution using the hotshot profiler.\n"
8173
"--lsprof Profile execution using the lsprof profiler.\n"
8174
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8175
" results to a specified file. If the filename ends with "
8176
"\".txt\",\n"
8177
" text format will be used. If the filename either starts "
8178
"with\n"
8179
" \"callgrind.out\" or end with \".callgrind\", the output will "
8180
"be\n"
8181
" formatted for use with KCacheGrind. Otherwise, the output\n"
8182
" will be a pickle.\n"
8183
"--coverage Generate line coverage report in the specified directory."
8184
msgstr ""
8185
8186
#: dummy/help_topics/global-options/detail.txt:24
8187
msgid ""
8188
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8189
"for\n"
8190
" the duration of the command. This can be used multiple times "
8191
"if\n"
8192
" several options need to be overridden."
8193
msgstr ""
8194
8195
#: dummy/help_topics/global-options/detail.txt:28
8196
msgid ""
8197
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8198
"information on profiling."
8199
msgstr ""
8200
8201
#: dummy/help_topics/global-options/detail.txt:31
8202
msgid ""
8203
"A number of debug flags are also available to assist troubleshooting and\n"
8204
"development. See :doc:`debug-flags-help`.\n"
8205
msgstr ""
8206
8207
#: dummy/help_topics/global-options/summary.txt:1
8208
msgid "Options that control how Bazaar runs"
8209
msgstr ""
8210
8211
#: dummy/help_topics/hidden-commands/summary.txt:1
8212
msgid "All hidden commands"
8213
msgstr "Alle versteckten Befehle"
8214
8215
#: dummy/help_topics/hooks/summary.txt:1
8216
msgid "Points at which custom processing can be added"
8217
msgstr ""
8218
8219
#: dummy/help_topics/launchpad/detail.txt:1
8220
msgid "Integration with Launchpad.net"
8221
msgstr "Integration mit Launchpad.net"
8222
8223
#: dummy/help_topics/launchpad/detail.txt:3
8224
msgid ""
8225
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8226
"specification tracking."
8227
msgstr ""
8228
8229
#: dummy/help_topics/launchpad/detail.txt:6
8230
msgid ""
8231
"The bzr client (through the plugin called 'launchpad') has special\n"
8232
"features to communicate with Launchpad:"
8233
msgstr ""
8234
8235
#: dummy/help_topics/launchpad/detail.txt:9
8236
msgid ""
8237
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8238
"This\n"
8239
" is then used by the 'lp:' transport to download your branches using\n"
8240
" bzr+ssh://."
8241
msgstr ""
8242
8243
#: dummy/help_topics/launchpad/detail.txt:13
8244
msgid ""
8245
" * The 'lp:' transport uses Launchpad as a directory service: for "
8246
"example\n"
8247
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8248
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8249
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8250
msgstr ""
8251
8252
#: dummy/help_topics/launchpad/detail.txt:18
8253
msgid ""
8254
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8255
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8256
"lp:12345'\n"
8257
" will record a revision property that marks that revision as fixing\n"
8258
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8259
" automatically be linked to the bug report."
8260
msgstr ""
8261
8262
#: dummy/help_topics/launchpad/detail.txt:24
8263
msgid ""
8264
" * The register-branch command tells Launchpad about the url of a\n"
8265
" public branch. Launchpad will then mirror the branch, display\n"
8266
" its contents and allow it to be attached to bugs and other\n"
8267
" objects."
8268
msgstr ""
8269
8270
#: dummy/help_topics/launchpad/detail.txt:29
8271
msgid "For more information see http://help.launchpad.net/\n"
8272
msgstr "Für weitere Informationen siehe http://help.launchpad.net/\n"
8273
8274
#: dummy/help_topics/launchpad/summary.txt:1
8275
msgid "Using Bazaar with Launchpad.net"
8276
msgstr ""
8277
8278
#: dummy/help_topics/location-alias/summary.txt:1
8279
msgid "Aliases for remembered locations"
8280
msgstr ""
8281
8282
#: dummy/help_topics/log-formats/summary.txt:1
8283
msgid "Details on the logging formats available"
8284
msgstr ""
8285
8286
#: dummy/help_topics/other-formats/summary.txt:1
8287
msgid "Experimental and deprecated storage formats"
8288
msgstr ""
8289
8290
#: dummy/help_topics/patterns/summary.txt:1
8291
msgid "Information on the pattern syntax"
8292
msgstr ""
8293
8294
#: dummy/help_topics/repositories/detail.txt:1
8295
msgid "Repositories"
8296
msgstr ""
8297
8298
#: dummy/help_topics/repositories/detail.txt:3
8299
msgid ""
8300
"Repositories in Bazaar are where committed information is stored. There is\n"
8301
"a repository associated with every branch."
8302
msgstr ""
8303
8304
#: dummy/help_topics/repositories/detail.txt:6
8305
msgid ""
8306
"Repositories are a form of database. Bzr will usually maintain this for\n"
8307
"good performance automatically, but in some situations (e.g. when doing\n"
8308
"very many commits in a short time period) you may want to ask bzr to\n"
8309
"optimise the database indices. This can be done by the 'bzr pack' command."
8310
msgstr ""
8311
8312
#: dummy/help_topics/repositories/detail.txt:11
8313
msgid ""
8314
"By default just running 'bzr init' will create a repository within the new\n"
8315
"branch but it is possible to create a shared repository which allows "
8316
"multiple\n"
8317
"branches to share their information in the same location. When a new branch "
8318
"is\n"
8319
"created it will first look to see if there is a containing shared repository "
8320
"it\n"
8321
"can use."
8322
msgstr ""
8323
8324
#: dummy/help_topics/repositories/detail.txt:17
8325
msgid ""
8326
"When two branches of the same project share a repository, there is\n"
8327
"generally a large space saving. For some operations (e.g. branching\n"
8328
"within the repository) this translates in to a large time saving."
8329
msgstr ""
8330
8331
#: dummy/help_topics/repositories/detail.txt:21
8332
msgid ""
8333
"To create a shared repository use the init-repository command (or the alias\n"
8334
"init-repo). This command takes the location of the repository to create. "
8335
"This\n"
8336
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8337
"which contains a shared repository. Any new branches that are created in "
8338
"this\n"
8339
"directory will then use it for storage."
8340
msgstr ""
8341
8342
#: dummy/help_topics/repositories/detail.txt:27
8343
msgid ""
8344
"It is a good idea to create a repository whenever you might create more\n"
8345
"than one branch of a project. This is true for both working areas where you\n"
8346
"are doing the development, and any server areas that you use for hosting\n"
8347
"projects. In the latter case, it is common to want branches without working\n"
8348
"trees. Since the files in the branch will not be edited directly there is "
8349
"no\n"
8350
"need to use up disk space for a working tree. To create a repository in "
8351
"which\n"
8352
"the branches will not have working trees pass the '--no-trees' option to\n"
8353
"'init-repository'."
8354
msgstr ""
8355
8356
#: dummy/help_topics/repositories/detail.txt:38
8357
msgid ""
8358
" init-repository Create a shared repository. Use --no-trees to create "
8359
"one\n"
8360
" in which new branches won't get a working tree.\n"
8361
msgstr ""
8362
8363
#: dummy/help_topics/repositories/summary.txt:1
8364
msgid "Basic information on shared repositories."
8365
msgstr ""
8366
8367
#: dummy/help_topics/revisionspec/summary.txt:1
8368
msgid "Explain how to use --revision"
8369
msgstr ""
8370
8371
#: dummy/help_topics/rules/summary.txt:1
8372
msgid "Information on defining rule-based preferences"
8373
msgstr ""
8374
8375
#: dummy/help_topics/standalone-trees/detail.txt:1
8376
msgid "Standalone Trees"
8377
msgstr ""
8378
8379
#: dummy/help_topics/standalone-trees/detail.txt:3
8380
msgid ""
8381
"A standalone tree is a working tree with an associated repository. It\n"
8382
"is an independently usable branch, with no dependencies on any other.\n"
8383
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8384
"an existing project under version control."
8385
msgstr ""
8386
8387
#: dummy/help_topics/standalone-trees/detail.txt:8
8388
msgid "Related Commands::"
8389
msgstr ""
8390
8391
#: dummy/help_topics/standalone-trees/detail.txt:10
8392
msgid " init Make a directory into a versioned branch.\n"
8393
msgstr " init Ein Verzeichnis zu einem versionierten Zweig machen.\n"
8394
8395
#: dummy/help_topics/standalone-trees/summary.txt:1
8396
msgid "Information on what a standalone tree is"
8397
msgstr ""
8398
8399
#: dummy/help_topics/standard-options/detail.txt:1
8400
msgid "Standard Options"
8401
msgstr "Standard-Optionen"
8402
8403
#: dummy/help_topics/standard-options/detail.txt:3
8404
msgid "Standard options are legal for all commands."
8405
msgstr ""
8406
8407
#: dummy/help_topics/standard-options/detail.txt:5
8408
msgid ""
8409
"--help, -h Show help message.\n"
8410
"--verbose, -v Display more information.\n"
8411
"--quiet, -q Only display errors and warnings."
8412
msgstr ""
8413
8414
#: dummy/help_topics/standard-options/detail.txt:9
8415
msgid "Unlike global options, standard options can be used in aliases.\n"
8416
msgstr ""
8417
8418
#: dummy/help_topics/standard-options/summary.txt:1
8419
msgid "Options that can be used with any command"
8420
msgstr ""
8421
8422
#: dummy/help_topics/status-flags/detail.txt:1
8423
msgid "Status Flags"
8424
msgstr "Status-Flags"
8425
8426
#: dummy/help_topics/status-flags/detail.txt:3
8427
msgid ""
8428
"Status flags are used to summarise changes to the working tree in a concise\n"
8429
"manner. They are in the form::"
8430
msgstr ""
8431
8432
#: dummy/help_topics/status-flags/detail.txt:6
8433
msgid " xxx <filename>"
8434
msgstr ""
8435
8436
#: dummy/help_topics/status-flags/detail.txt:8
8437
msgid "where the columns' meanings are as follows."
8438
msgstr ""
8439
8440
#: dummy/help_topics/status-flags/detail.txt:10
8441
msgid "Column 1 - versioning/renames::"
8442
msgstr ""
8443
8444
#: dummy/help_topics/status-flags/detail.txt:12
8445
msgid ""
8446
" + File versioned\n"
8447
" - File unversioned\n"
8448
" R File renamed\n"
8449
" ? File unknown\n"
8450
" X File nonexistent (and unknown to bzr)\n"
8451
" C File has conflicts\n"
8452
" P Entry for a pending merge (not a file)"
8453
msgstr ""
8454
8455
#: dummy/help_topics/status-flags/detail.txt:20
8456
msgid "Column 2 - contents::"
8457
msgstr ""
8458
8459
#: dummy/help_topics/status-flags/detail.txt:22
8460
msgid ""
8461
" N File created\n"
8462
" D File deleted\n"
8463
" K File kind changed\n"
8464
" M File modified"
8465
msgstr ""
8466
8467
#: dummy/help_topics/status-flags/detail.txt:27
8468
msgid "Column 3 - execute::"
8469
msgstr ""
8470
8471
#: dummy/help_topics/status-flags/detail.txt:29
8472
msgid " * The execute bit was changed\n"
8473
msgstr ""
8474
8475
#: dummy/help_topics/status-flags/summary.txt:1
8476
msgid "Help on status flags"
8477
msgstr ""
8478
8479
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8480
msgid "Branches Out of Sync"
8481
msgstr ""
8482
8483
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8484
msgid ""
8485
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8486
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8487
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8488
"have the same last revision as the new reference branch for the lightweight\n"
8489
"checkout, data could be lost, so Bazaar refuses."
8490
msgstr ""
8491
8492
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8493
msgid "How you deal with this depends on *why* the branches are out of sync."
8494
msgstr ""
8495
8496
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8497
msgid ""
8498
"If you have a checkout and have done local commits, you can get back in "
8499
"sync\n"
8500
"by running \"bzr update\" (and possibly \"bzr commit\")."
8501
msgstr ""
8502
8503
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8504
msgid ""
8505
"If you have a branch and the remote branch is out-of-date, you can push\n"
8506
"the local changes using \"bzr push\". If the local branch is out of date, "
8507
"you\n"
8508
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8509
"commit\n"
8510
"and then push your changes. If you decide that some of the changes aren't\n"
8511
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8512
msgstr ""
8513
8514
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8515
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8516
msgstr ""
8517
8518
#: dummy/help_topics/topics/summary.txt:1
8519
msgid "Topics list"
8520
msgstr "Themen-Liste"
8521
8522
#: dummy/help_topics/url-special-chars/summary.txt:1
8523
msgid "Special character handling in URLs"
8524
msgstr ""
8525
8526
#: dummy/help_topics/urlspec/summary.txt:1
8527
msgid "Supported transport protocols"
8528
msgstr "Unterstützte Transportprotokolle"
8529
8530
#: dummy/help_topics/working-trees/detail.txt:1
8531
msgid "Working Trees"
8532
msgstr ""
8533
8534
#: dummy/help_topics/working-trees/detail.txt:3
8535
msgid ""
8536
"A working tree is the contents of a branch placed on disk so that you can\n"
8537
"see the files and edit them. The working tree is where you make changes to "
8538
"a\n"
8539
"branch, and when you commit the current state of the working tree is the\n"
8540
"snapshot that is recorded in the commit."
8541
msgstr ""
8542
8543
#: dummy/help_topics/working-trees/detail.txt:8
8544
msgid ""
8545
"When you push a branch to a remote system, a working tree will not be\n"
8546
"created. If one is already present the files will not be updated. The\n"
8547
"branch information will be updated and the working tree will be marked\n"
8548
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8549
"may be uncommitted changes or the update may cause content conflicts that "
8550
"are\n"
8551
"difficult to deal with remotely."
8552
msgstr ""
8553
8554
#: dummy/help_topics/working-trees/detail.txt:15
8555
msgid ""
8556
"If you have a branch with no working tree you can use the 'checkout' "
8557
"command\n"
8558
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8559
"will\n"
8560
"create the working tree. If the branch is updated remotely, you can update "
8561
"the\n"
8562
"working tree by running 'bzr update' in that directory."
8563
msgstr ""
8564
8565
#: dummy/help_topics/working-trees/detail.txt:20
8566
msgid ""
8567
"If you have a branch with a working tree that you do not want the 'remove-"
8568
"tree'\n"
8569
"command will remove the tree if it is safe. This can be done to avoid the\n"
8570
"warning about the remote working tree not being updated when pushing to the\n"
8571
"branch. It can also be useful when working with a '--no-trees' repository\n"
8572
"(see 'bzr help repositories')."
8573
msgstr ""
8574
8575
#: dummy/help_topics/working-trees/detail.txt:26
8576
msgid ""
8577
"If you want to have a working tree on a remote machine that you push to you\n"
8578
"can either run 'bzr update' in the remote branch after each push, or use "
8579
"some\n"
8580
"other method to update the tree during the push. There is an 'rspush' "
8581
"plugin\n"
8582
"that will update the working tree using rsync as well as doing a push. "
8583
"There\n"
8584
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8585
"SSH\n"
8586
"after each push."
8587
msgstr ""
8588
8589
#: dummy/help_topics/working-trees/detail.txt:33
8590
msgid "Useful commands::"
8591
msgstr "Nützliche Befehle::"
8592
8593
#: dummy/help_topics/working-trees/detail.txt:35
8594
msgid ""
8595
" checkout Create a working tree when a branch does not have one.\n"
8596
" remove-tree Removes the working tree from a branch when it is safe to do "
8597
"so.\n"
8598
" update When a working tree is out of sync with its associated "
8599
"branch\n"
8600
" this will update the tree to match the branch.\n"
8601
msgstr ""
8602
8603
#: dummy/help_topics/working-trees/summary.txt:1
8604
msgid "Information on working trees"
8605
msgstr ""
8606
8607
#: en/help_topics/authentication.txt:1
8608
msgid ""
8609
"Authentication Settings\n"
8610
"======================="
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:4
8614
msgid ""
8615
"\n"
8616
"Intent\n"
8617
"------"
8618
msgstr ""
8619
8620
#: en/help_topics/authentication.txt:8
8621
msgid ""
8622
"Many different authentication policies can be described in the\n"
8623
"``authentication.conf`` file but a particular user should need only a few\n"
8624
"definitions to cover his needs without having to specify a user and a "
8625
"password\n"
8626
"for every branch he uses."
8627
msgstr ""
8628
8629
#: en/help_topics/authentication.txt:13
8630
msgid ""
8631
"The definitions found in this file are used to find the credentials to use "
8632
"for\n"
8633
"a given url. The same credentials can generally be used for as many branches "
8634
"as\n"
8635
"possible by grouping their declaration around the remote servers that need\n"
8636
"them. It's even possible to declare credentials that will be used by "
8637
"different\n"
8638
"servers."
8639
msgstr ""
8640
8641
#: en/help_topics/authentication.txt:19
8642
msgid ""
8643
"The intent is to make this file as small as possible to minimize maintenance."
8644
msgstr ""
8645
8646
#: en/help_topics/authentication.txt:21
8647
msgid ""
8648
"Once the relevant credentials are declared in this file you may use branch "
8649
"urls\n"
8650
"without embedding passwords (security hazard) or even users (enabling "
8651
"sharing\n"
8652
"of your urls with others)."
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:25
8656
msgid "Instead of using::"
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:27
8660
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8661
msgstr " bzr branch ftp://joe:secret@host.com/pfad/zu/meiner/branch"
8662
8663
#: en/help_topics/authentication.txt:29
8664
msgid "you simply use::"
8665
msgstr ""
8666
8667
#: en/help_topics/authentication.txt:31
8668
msgid " bzr branch ftp://host.com/path/to/my/branch"
8669
msgstr " bzr branch ftp://host.com/pfad/zu/meiner/branch"
8670
8671
#: en/help_topics/authentication.txt:33
8672
msgid ""
8673
"provided you have created the following ``authentication.conf`` file::"
8674
msgstr ""
8675
8676
#: en/help_topics/authentication.txt:35
8677
msgid ""
8678
" [myprojects]\n"
8679
" scheme=ftp\n"
8680
" host=host.com\n"
8681
" user=joe\n"
8682
" password=secret\n"
8683
" "
8684
msgstr ""
8685
" [myprojects]\n"
8686
" scheme=ftp\n"
8687
" host=host.de\n"
8688
" user=joe\n"
8689
" password=secret\n"
8690
" "
8691
8692
#: en/help_topics/authentication.txt:42
8693
msgid ""
8694
"Authentication definitions\n"
8695
"--------------------------"
8696
msgstr ""
8697
8698
#: en/help_topics/authentication.txt:45
8699
msgid ""
8700
"There are two kinds of authentication used by the various schemes supported "
8701
"by\n"
8702
"bzr:"
8703
msgstr ""
8704
8705
#: en/help_topics/authentication.txt:48
8706
msgid "1. user and password"
8707
msgstr "1. Benutzername und Passwort"
8708
8709
#: en/help_topics/authentication.txt:50
8710
msgid ""
8711
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8712
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8713
"ssh agents are a better, more secure solution. So we have chosen to not "
8714
"provide\n"
8715
"our own less secure method."
8716
msgstr ""
8717
8718
#: en/help_topics/authentication.txt:55
8719
msgid "2. user, realm and password"
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:57
8723
msgid ""
8724
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8725
"against a host. But, by using ``.htaccess`` files, for example, it is "
8726
"possible\n"
8727
"to define several (``user, realm, password``) for a given ``host``. So what "
8728
"is\n"
8729
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8730
"is\n"
8731
"not taken into account in the definitions, but will displayed if bzr "
8732
"prompts\n"
8733
"you for a password."
8734
msgstr ""
8735
8736
#: en/help_topics/authentication.txt:64
8737
msgid ""
8738
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8739
"specifying the appropriate port."
8740
msgstr ""
8741
8742
#: en/help_topics/authentication.txt:67
8743
msgid ""
8744
"To take all schemes into account, the password will be deduced from a set "
8745
"of\n"
8746
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8747
"``user``,\n"
8748
"``password``)."
8749
msgstr ""
8750
8751
#: en/help_topics/authentication.txt:71
8752
msgid ""
8753
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8754
"used\n"
8755
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8756
"``ssh``\n"
8757
" should be used instead since this is the real scheme regarding\n"
8758
" authentication,"
8759
msgstr ""
8760
8761
#: en/help_topics/authentication.txt:76
8762
msgid " * ``host``: can be empty (to act as a default for any host),"
8763
msgstr ""
8764
8765
#: en/help_topics/authentication.txt:78
8766
msgid ""
8767
" * ``port`` can be empty (useful when an host provides several servers for "
8768
"the\n"
8769
" same scheme), only numerical values are allowed, this should be used "
8770
"only\n"
8771
" when the server uses a port different than the scheme standard port,"
8772
msgstr ""
8773
8774
#: en/help_topics/authentication.txt:82
8775
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8776
msgstr ""
8777
8778
#: en/help_topics/authentication.txt:84
8779
msgid ""
8780
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8781
" ``getpass.get_user()``),"
8782
msgstr ""
8783
8784
#: en/help_topics/authentication.txt:87
8785
msgid ""
8786
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8787
" password."
8788
msgstr ""
8789
8790
#: en/help_topics/authentication.txt:90
8791
msgid ""
8792
"Multiple definitions can be provided and, for a given URL, bzr will select "
8793
"a\n"
8794
"(``user`` [, ``password``]) based on the following rules :"
8795
msgstr ""
8796
8797
#: en/help_topics/authentication.txt:93
8798
msgid " 1. the first match wins,"
8799
msgstr ""
8800
8801
#: en/help_topics/authentication.txt:95
8802
msgid " 2. empty fields match everything,"
8803
msgstr ""
8804
8805
#: en/help_topics/authentication.txt:97
8806
msgid ""
8807
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8808
msgstr ""
8809
8810
#: en/help_topics/authentication.txt:99
8811
msgid ""
8812
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8813
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8814
"``projectbzr.sf.net``\n"
8815
" will not match ``bzr.sf.net``)."
8816
msgstr ""
8817
8818
#: en/help_topics/authentication.txt:103
8819
msgid ""
8820
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8821
msgstr ""
8822
8823
#: en/help_topics/authentication.txt:105
8824
msgid ""
8825
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8826
"above,\n"
8827
" empty paths will match any provided path)."
8828
msgstr ""
8829
8830
#: en/help_topics/authentication.txt:110
8831
msgid ""
8832
"File format\n"
8833
"-----------"
8834
msgstr ""
8835
"Dateiformat\n"
8836
"-----------"
8837
8838
#: en/help_topics/authentication.txt:113
8839
msgid ""
8840
"The general rules for :doc:`configuration files <configuration-help>`\n"
8841
"apply except for the variable policies."
8842
msgstr ""
8843
8844
#: en/help_topics/authentication.txt:116
8845
msgid "Each section describes an authentication definition."
8846
msgstr ""
8847
8848
#: en/help_topics/authentication.txt:118
8849
msgid ""
8850
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8851
"reserved\n"
8852
"and should appear as the *last* section."
8853
msgstr ""
8854
8855
#: en/help_topics/authentication.txt:121
8856
msgid "Each section should define:"
8857
msgstr ""
8858
8859
#: en/help_topics/authentication.txt:123
8860
msgid "* ``user``: the login to be used,"
8861
msgstr ""
8862
8863
#: en/help_topics/authentication.txt:125
8864
msgid "Each section could define:"
8865
msgstr ""
8866
8867
#: en/help_topics/authentication.txt:127
8868
msgid "* ``host``: the remote server,"
8869
msgstr ""
8870
8871
#: en/help_topics/authentication.txt:129
8872
msgid "* ``port``: the port the server is listening,"
8873
msgstr "* ``port``: der Port auf dem der Server horcht,"
8874
8875
#: en/help_topics/authentication.txt:131
8876
msgid "* ``path``: the branch location,"
8877
msgstr ""
8878
8879
#: en/help_topics/authentication.txt:133
8880
msgid "* ``password``: the password."
8881
msgstr "* ``password``: das Passwort."
8882
8883
#: en/help_topics/authentication.txt:135
8884
msgid ""
8885
"\n"
8886
"Examples\n"
8887
"--------"
8888
msgstr ""
8889
"\n"
8890
"Beispiele\n"
8891
"---------"
8892
8893
#: en/help_topics/authentication.txt:139
8894
msgid ""
8895
"\n"
8896
"Personal projects hosted outside\n"
8897
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8898
msgstr ""
8899
8900
#: en/help_topics/authentication.txt:143
8901
msgid ""
8902
"All connections are done with the same ``user`` (the remote one for which "
8903
"the\n"
8904
"default bzr one is not appropriate) and the password is always prompted "
8905
"with\n"
8906
"some exceptions::"
8907
msgstr ""
8908
8909
#: en/help_topics/authentication.txt:147
8910
msgid ""
8911
" # Pet projects on hobby.net\n"
8912
" [hobby]\n"
8913
" host=r.hobby.net\n"
8914
" user=jim\n"
8915
" password=obvious1234\n"
8916
" \n"
8917
" # Home server\n"
8918
" [home]\n"
8919
" scheme=https\n"
8920
" host=home.net\n"
8921
" user=joe\n"
8922
" password=1essobV10us\n"
8923
" \n"
8924
" [DEFAULT]\n"
8925
" # Our local user is barbaz, on all remote sites we're known as "
8926
"foobar\n"
8927
" user=foobar"
8928
msgstr ""
8929
8930
#: en/help_topics/authentication.txt:164
8931
msgid ""
8932
"\n"
8933
"Source hosting provider\n"
8934
"~~~~~~~~~~~~~~~~~~~~~~~"
8935
msgstr ""
8936
8937
#: en/help_topics/authentication.txt:168
8938
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8939
msgstr ""
8940
8941
#: en/help_topics/authentication.txt:170
8942
msgid ""
8943
" [shpnet domain]\n"
8944
" # we use sftp, but ssh is the scheme used for authentication\n"
8945
" scheme=ssh\n"
8946
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8947
" host=.shp.net\n"
8948
" user=joe\n"
8949
" # bzr don't support supplying a password for sftp,\n"
8950
" # consider using an ssh agent if you don't want to supply\n"
8951
" # a password interactively. (pageant, ssh-agent, etc)"
8952
msgstr ""
8953
8954
#: en/help_topics/authentication.txt:180
8955
msgid ""
8956
"HTTPS, SFTP servers and their proxy\n"
8957
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8958
msgstr ""
8959
8960
#: en/help_topics/authentication.txt:183
8961
msgid ""
8962
"At company.com, the server hosting release and integration branches is "
8963
"behind a\n"
8964
"proxy, and the two branches use different authentication policies::"
8965
msgstr ""
8966
8967
#: en/help_topics/authentication.txt:186
8968
msgid ""
8969
" [reference code]\n"
8970
" scheme=https\n"
8971
" host=dev.company.com\n"
8972
" path=/dev\n"
8973
" user=user1\n"
8974
" password=pass1"
8975
msgstr ""
8976
8977
#: en/help_topics/authentication.txt:193
8978
msgid ""
8979
" # development branches on dev server\n"
8980
" [dev]\n"
8981
" scheme=ssh # bzr+ssh and sftp are available here\n"
8982
" host=dev.company.com\n"
8983
" path=/dev/integration\n"
8984
" user=user2\n"
8985
" \n"
8986
" # proxy\n"
8987
" [proxy]\n"
8988
" scheme=http\n"
8989
" host=proxy.company.com\n"
8990
" port=3128\n"
8991
" user=proxyuser1\n"
8992
" password=proxypass1"
8993
msgstr ""
8994
8995
#: en/help_topics/authentication.txt:208
8996
msgid ""
8997
"\n"
8998
"Planned enhancements\n"
8999
"--------------------"
9000
msgstr ""
9001
9002
#: en/help_topics/authentication.txt:212
9003
msgid ""
9004
"The following are not yet implemented but planned as parts of a work in\n"
9005
"progress:"
9006
msgstr ""
9007
9008
#: en/help_topics/authentication.txt:215
9009
msgid "* add a ``password_encoding`` field allowing:"
9010
msgstr ""
9011
9012
#: en/help_topics/authentication.txt:217
9013
msgid ""
9014
" - storing the passwords in various obfuscating encodings (base64 for one),"
9015
msgstr ""
9016
9017
#: en/help_topics/authentication.txt:219
9018
msgid " - delegate password storage to plugins (.netrc for example)."
9019
msgstr ""
9020
9021
#: en/help_topics/authentication.txt:221
9022
msgid ""
9023
"* update the credentials when the user is prompted for user or password,"
9024
msgstr ""
9025
9026
#: en/help_topics/authentication.txt:223
9027
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9028
msgstr ""
9029
9030
#: en/help_topics/authentication.txt:225
9031
msgid ""
9032
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9033
"but\n"
9034
"ignored in the actual implementation.\n"
9035
msgstr ""
9036
9037
#: en/help_topics/bugs.txt:1
9038
msgid "Bug Tracker Settings"
9039
msgstr "Bug Tracker Einstellungen"
9040
9041
#: en/help_topics/bugs.txt:3
9042
msgid ""
9043
"When making a commit, metadata about bugs fixed by that change can be\n"
9044
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9045
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9046
"(The only ``status`` value currently supported is ``fixed.``)"
9047
msgstr ""
9048
9049
#: en/help_topics/bugs.txt:8
9050
msgid ""
9051
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9052
"identifier\n"
9053
"rather than a full URL. This looks like::"
9054
msgstr ""
9055
9056
#: en/help_topics/bugs.txt:11
9057
msgid " bzr commit --fixes <tracker>:<id>"
9058
msgstr " bzr commit --fixes <tracker>:<id>"
9059
9060
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9061
msgid "or::"
9062
msgstr "oder::"
9063
9064
#: en/help_topics/bugs.txt:15
9065
msgid " bzr commit --fixes <id>"
9066
msgstr ""
9067
9068
#: en/help_topics/bugs.txt:17
9069
msgid ""
9070
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9071
"the\n"
9072
"identifier for that bug within the bugtracker, usually the bug number.\n"
9073
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9074
"or global configuration is used."
9075
msgstr ""
9076
9077
#: en/help_topics/bugs.txt:22
9078
msgid ""
9079
"Bazaar knows about a few bug trackers that have many users. If\n"
9080
"you use one of these bug trackers then there is no setup required to\n"
9081
"use this feature, you just need to know the tracker identifier to use.\n"
9082
"These are the bugtrackers that are built in:"
9083
msgstr ""
9084
9085
#: en/help_topics/bugs.txt:27
9086
msgid ""
9087
" ============================ ============ ============\n"
9088
" URL Abbreviation Example\n"
9089
" ============================ ============ ============\n"
9090
" https://bugs.launchpad.net/ lp lp:12345\n"
9091
" http://bugs.debian.org/ deb deb:12345\n"
9092
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9093
" ============================ ============ ============"
9094
msgstr ""
9095
9096
#: en/help_topics/bugs.txt:35
9097
msgid ""
9098
"For the bug trackers not listed above configuration is required.\n"
9099
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9100
"is built in, along with a template mechanism for other bugtrackers with\n"
9101
"simple URL schemes. If your bug tracker can't be described by one\n"
9102
"of the schemes described below then you can write a plugin to support\n"
9103
"it."
9104
msgstr ""
9105
9106
#: en/help_topics/bugs.txt:42
9107
msgid ""
9108
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9109
"variable which contains the base URL of the bug tracker. These options\n"
9110
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9111
"configuration section in ``locations.conf``. You can set up these values\n"
9112
"for each of the projects you work on."
9113
msgstr ""
9114
9115
#: en/help_topics/bugs.txt:48
9116
msgid ""
9117
"Note: As you provide a short name for each tracker, you can specify one or\n"
9118
"more bugs in one or more trackers at commit time if you wish."
9119
msgstr ""
9120
9121
#: en/help_topics/bugs.txt:51
9122
msgid ""
9123
"Launchpad\n"
9124
"---------"
9125
msgstr ""
9126
"Launchpad\n"
9127
"---------"
9128
9129
#: en/help_topics/bugs.txt:54
9130
msgid ""
9131
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9132
msgstr ""
9133
9134
#: en/help_topics/bugs.txt:56
9135
msgid ""
9136
"bugzilla_<tracker>_url\n"
9137
"----------------------"
9138
msgstr ""
9139
"bugzilla_<tracker>_url\n"
9140
"----------------------"
9141
9142
#: en/help_topics/bugs.txt:59
9143
msgid ""
9144
"If present, the location of the Bugzilla bug tracker referred to by\n"
9145
"<tracker>. This option can then be used together with ``bzr commit\n"
9146
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9147
"example::"
9148
msgstr ""
9149
9150
#: en/help_topics/bugs.txt:64
9151
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9152
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9153
9154
#: en/help_topics/bugs.txt:66
9155
msgid ""
9156
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9157
"fixed."
9158
msgstr ""
9159
9160
#: en/help_topics/bugs.txt:69
9161
msgid ""
9162
"trac_<tracker>_url\n"
9163
"------------------"
9164
msgstr ""
9165
"trac_<tracker>_url\n"
9166
"------------------"
9167
9168
#: en/help_topics/bugs.txt:72
9169
msgid ""
9170
"If present, the location of the Trac instance referred to by\n"
9171
"<tracker>. This option can then be used together with ``bzr commit\n"
9172
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9173
"example::"
9174
msgstr ""
9175
9176
#: en/help_topics/bugs.txt:77
9177
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9178
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9179
9180
#: en/help_topics/bugs.txt:79
9181
msgid ""
9182
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9183
"as\n"
9184
"fixed."
9185
msgstr ""
9186
9187
#: en/help_topics/bugs.txt:82
9188
msgid ""
9189
"bugtracker_<tracker>_url\n"
9190
"------------------------"
9191
msgstr ""
9192
"bugtracker_<tracker>_url\n"
9193
"------------------------"
9194
9195
#: en/help_topics/bugs.txt:85
9196
msgid ""
9197
"If present, the location of a generic bug tracker instance referred to by\n"
9198
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9199
"which will be replaced by a specific bug ID. This option can then be used\n"
9200
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9201
"fixed by that commit. For example::"
9202
msgstr ""
9203
9204
#: en/help_topics/bugs.txt:91
9205
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9206
msgstr ""
9207
9208
#: en/help_topics/bugs.txt:93
9209
msgid ""
9210
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9211
"Roundup bug tracker as fixed, or::"
9212
msgstr ""
9213
9214
#: en/help_topics/bugs.txt:96
9215
msgid ""
9216
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9217
msgstr ""
9218
9219
#: en/help_topics/bugs.txt:98
9220
msgid ""
9221
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9222
"RT bug tracker as fixed, or::"
9223
msgstr ""
9224
9225
#: en/help_topics/bugs.txt:101
9226
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9227
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9228
9229
#: en/help_topics/bugs.txt:103
9230
msgid ""
9231
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9232
"1234\n"
9233
"in Hudson's JIRA bug tracker as fixed.\n"
9234
msgstr ""
9235
9236
#: en/help_topics/commands.txt:1
9237
msgid ""
9238
"add Add specified files or directories.\n"
9239
"alias Set/unset and display aliases.\n"
9240
"annotate Show the origin of each line in a file.\n"
9241
"bash-completion Generate a shell function for bash command line "
9242
"completion.\n"
9243
" [bash_completion]\n"
9244
"bind Convert the current branch into a checkout of the "
9245
"supplied\n"
9246
" branch.\n"
9247
"branch Create a new branch that is a copy of an existing branch.\n"
9248
"branches List the branches available at the current location.\n"
9249
"break-lock Break a dead lock.\n"
9250
"cat Write the contents of a file as of a given revision to\n"
9251
" standard output.\n"
9252
"check Validate working tree structure, branch consistency and\n"
9253
" repository history.\n"
9254
"checkout Create a new checkout of an existing branch.\n"
9255
"clean-tree Remove unwanted files from working tree.\n"
9256
"commit Commit changes into a new revision.\n"
9257
"config Display, set or remove a configuration option.\n"
9258
"conflicts List files with conflicts.\n"
9259
"deleted List files deleted in the working tree.\n"
9260
"diff Show differences in the working tree, between revisions "
9261
"or\n"
9262
" branches.\n"
9263
"dpush Push into a different VCS without any custom bzr "
9264
"metadata.\n"
9265
"export Export current or past revision to a destination directory "
9266
"or\n"
9267
" archive.\n"
9268
"help Show help on a command or other topic.\n"
9269
"ignore Ignore specified files or patterns.\n"
9270
"ignored List ignored files and the patterns that matched them.\n"
9271
"info Show information about a working tree, branch or "
9272
"repository.\n"
9273
"init Make a directory into a versioned branch.\n"
9274
"init-repository Create a shared repository for branches to share storage\n"
9275
" space.\n"
9276
"join Combine a tree into its containing tree.\n"
9277
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9278
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9279
"launchpad-open Open a Launchpad branch page in your web browser. "
9280
"[launchpad]\n"
9281
"log Show historical log for a branch or subset of a branch.\n"
9282
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9283
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9284
"ls List files in a tree.\n"
9285
"merge Perform a three-way merge.\n"
9286
"missing Show unmerged/unpulled revisions between two branches.\n"
9287
"mkdir Create a new versioned directory.\n"
9288
"mv Move or rename a file.\n"
9289
"nick Print or set the branch nickname.\n"
9290
"pack Compress the data within a repository.\n"
9291
"plugins List the installed plugins.\n"
9292
"pull Turn this branch into a mirror of another branch.\n"
9293
"push Update a mirror of this branch.\n"
9294
"reconcile Reconcile bzr metadata in a branch.\n"
9295
"reconfigure Reconfigure the type of a bzr directory.\n"
9296
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9297
"remerge Redo a merge.\n"
9298
"remove Remove files or directories.\n"
9299
"remove-branch Remove a branch.\n"
9300
"remove-tree Remove the working tree from a given branch/checkout.\n"
9301
"renames Show list of renamed files.\n"
9302
"resolve Mark a conflict as resolved.\n"
9303
"revert Set files in the working tree back to the contents of a\n"
9304
" previous revision.\n"
9305
"revno Show current revision number.\n"
9306
"root Show the tree root directory.\n"
9307
"send Mail or create a merge-directive for submitting changes.\n"
9308
"serve Run the bzr server.\n"
9309
"shelve Temporarily set aside some changes from the current tree.\n"
9310
"sign-my-commits Sign all commits by a given committer.\n"
9311
"split Split a subdirectory of a tree into a separate tree.\n"
9312
"status Display status summary.\n"
9313
"switch Set the branch of a checkout and update.\n"
9314
"tag Create, remove or modify a tag naming a revision.\n"
9315
"tags List tags.\n"
9316
"testament Show testament (signing-form) of a revision.\n"
9317
"unbind Convert the current checkout into a regular branch.\n"
9318
"uncommit Remove the last committed revision.\n"
9319
"unshelve Restore shelved changes.\n"
9320
"update Update a working tree to a new revision.\n"
9321
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9322
" format.\n"
9323
"verify-signatures Verify all commit signatures.\n"
9324
"version Show version of bzr.\n"
9325
"version-info Show version information about this tree.\n"
9326
"view Manage filtered views.\n"
9327
"whoami Show or set bzr user id.\n"
9328
msgstr ""
9329
9330
#: en/help_topics/configuration.txt:1
9331
msgid ""
9332
"Configuration Settings\n"
9333
"======================="
9334
msgstr ""
9335
9336
#: en/help_topics/configuration.txt:4
9337
msgid ""
9338
"Environment settings\n"
9339
"---------------------"
9340
msgstr ""
9341
9342
#: en/help_topics/configuration.txt:7
9343
msgid ""
9344
"While most configuration is handled by configuration files, some options\n"
9345
"which may be semi-permanent can also be controlled through the environment."
9346
msgstr ""
9347
9348
#: en/help_topics/configuration.txt:10
9349
msgid ""
9350
"BZR_EMAIL\n"
9351
"~~~~~~~~~"
9352
msgstr ""
9353
"BZR_EMAIL\n"
9354
"~~~~~~~~~"
9355
9356
#: en/help_topics/configuration.txt:13
9357
msgid "Override the email id used by Bazaar. Typical format::"
9358
msgstr ""
9359
9360
#: en/help_topics/configuration.txt:15
9361
msgid " \"John Doe <jdoe@example.com>\""
9362
msgstr " \"John Doe <jdoe@beispiel.de>\""
9363
9364
#: en/help_topics/configuration.txt:17
9365
msgid "See also the ``email`` configuration option."
9366
msgstr ""
9367
9368
#: en/help_topics/configuration.txt:19
9369
msgid ""
9370
"BZR_PROGRESS_BAR\n"
9371
"~~~~~~~~~~~~~~~~"
9372
msgstr ""
9373
"BZR_PROGRESS_BAR\n"
9374
"~~~~~~~~~~~~~~~~"
9375
9376
#: en/help_topics/configuration.txt:22
9377
msgid ""
9378
"Override the progress display. Possible values are \"none\" or \"text\". "
9379
"If\n"
9380
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9381
"draws\n"
9382
"the ordinary command line progress bar."
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:26
9386
msgid ""
9387
"BZR_SIGQUIT_PDB\n"
9388
"~~~~~~~~~~~~~~~"
9389
msgstr ""
9390
"BZR_SIGQUIT_PDB\n"
9391
"~~~~~~~~~~~~~~~"
9392
9393
#: en/help_topics/configuration.txt:29
9394
msgid ""
9395
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9396
msgstr ""
9397
9398
#: en/help_topics/configuration.txt:31
9399
msgid ""
9400
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9401
"* 1 = Invoke breakin debugger (default)"
9402
msgstr ""
9403
9404
#: en/help_topics/configuration.txt:34
9405
msgid ""
9406
"BZR_HOME\n"
9407
"~~~~~~~~"
9408
msgstr ""
9409
"BZR_HOME\n"
9410
"~~~~~~~~"
9411
9412
#: en/help_topics/configuration.txt:37
9413
msgid "Override the home directory used by Bazaar."
9414
msgstr ""
9415
9416
#: en/help_topics/configuration.txt:39
9417
msgid ""
9418
"BZR_SSH\n"
9419
"~~~~~~~"
9420
msgstr ""
9421
"BZR_SSH\n"
9422
"~~~~~~~"
9423
9424
#: en/help_topics/configuration.txt:42
9425
msgid "Select a different SSH implementation."
9426
msgstr "Wählen Sie eine andere SSH-Implementierung."
9427
9428
#: en/help_topics/configuration.txt:44
9429
msgid ""
9430
"BZR_PDB\n"
9431
"~~~~~~~"
9432
msgstr ""
9433
"BZR_PDB\n"
9434
"~~~~~~~"
9435
9436
#: en/help_topics/configuration.txt:47
9437
msgid "Control whether to launch a debugger on error."
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:49
9441
msgid ""
9442
"* 0 = Standard behavior\n"
9443
"* 1 = Launch debugger"
9444
msgstr ""
9445
"* 0 = Standard Verhalten\n"
9446
"* 1 = Debugger starten"
9447
9448
#: en/help_topics/configuration.txt:52
9449
msgid ""
9450
"BZR_REMOTE_PATH\n"
9451
"~~~~~~~~~~~~~~~"
9452
msgstr ""
9453
"BZR_REMOTE_PATH\n"
9454
"~~~~~~~~~~~~~~~"
9455
9456
#: en/help_topics/configuration.txt:55
9457
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9458
msgstr ""
9459
9460
#: en/help_topics/configuration.txt:57
9461
msgid "See also the ``bzr_remote_path`` configuration option."
9462
msgstr ""
9463
9464
#: en/help_topics/configuration.txt:59
9465
msgid ""
9466
"BZR_EDITOR\n"
9467
"~~~~~~~~~~"
9468
msgstr ""
9469
"BZR_EDITOR\n"
9470
"~~~~~~~~~~"
9471
9472
#: en/help_topics/configuration.txt:62
9473
msgid "Path to the editor Bazaar should use for commit messages, etc."
9474
msgstr ""
9475
9476
#: en/help_topics/configuration.txt:64
9477
msgid ""
9478
"BZR_LOG\n"
9479
"~~~~~~~"
9480
msgstr ""
9481
"BZR_LOG\n"
9482
"~~~~~~~"
9483
9484
#: en/help_topics/configuration.txt:67
9485
msgid ""
9486
"Location of the Bazaar log file. You can check the current location by\n"
9487
"running ``bzr version``."
9488
msgstr ""
9489
9490
#: en/help_topics/configuration.txt:70
9491
msgid ""
9492
"The log file contains debug information that is useful for diagnosing or\n"
9493
"reporting problems with Bazaar."
9494
msgstr ""
9495
9496
#: en/help_topics/configuration.txt:73
9497
msgid ""
9498
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9499
"will disable logging."
9500
msgstr ""
9501
9502
#: en/help_topics/configuration.txt:76
9503
msgid ""
9504
"\n"
9505
"BZR_PLUGIN_PATH\n"
9506
"~~~~~~~~~~~~~~~"
9507
msgstr ""
9508
"\n"
9509
"BZR_PLUGIN_PATH\n"
9510
"~~~~~~~~~~~~~~~"
9511
9512
#: en/help_topics/configuration.txt:80
9513
msgid ""
9514
"The path to the plugins directory that Bazaar should use.\n"
9515
"If not set, Bazaar will search for plugins in:"
9516
msgstr ""
9517
9518
#: en/help_topics/configuration.txt:83
9519
msgid ""
9520
"* the user specific plugin directory (containing the ``user`` plugins),"
9521
msgstr ""
9522
9523
#: en/help_topics/configuration.txt:85
9524
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:87
9528
msgid ""
9529
"* the site specific plugin directory if applicable (containing\n"
9530
" the ``site`` plugins)."
9531
msgstr ""
9532
9533
#: en/help_topics/configuration.txt:90
9534
msgid ""
9535
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9536
"the way the plugin are searched. "
9537
msgstr ""
9538
9539
#: en/help_topics/configuration.txt:93
9540
msgid ""
9541
"As for the ``PATH`` variables, if multiple directories are\n"
9542
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9543
"platform specific appropriate character (':' on Unix,\n"
9544
"';' on windows)"
9545
msgstr ""
9546
9547
#: en/help_topics/configuration.txt:98
9548
msgid ""
9549
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9550
"in ``user``. However it will continue to search in ``core`` and\n"
9551
"``site`` unless they are explicitly removed."
9552
msgstr ""
9553
9554
#: en/help_topics/configuration.txt:102
9555
msgid ""
9556
"If you need to change the order or remove one of these\n"
9557
"directories, you should use special values:"
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:105
9561
msgid ""
9562
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9563
" path from the default values,"
9564
msgstr ""
9565
9566
#: en/help_topics/configuration.txt:108
9567
msgid ""
9568
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9569
" before the remaining default values (and also remove it from\n"
9570
" the default values)."
9571
msgstr ""
9572
9573
#: en/help_topics/configuration.txt:112
9574
msgid ""
9575
"Note that the special values 'user', 'core' and 'site' should be\n"
9576
"used literally, they will be substituted by the corresponding,\n"
9577
"platform specific, values."
9578
msgstr ""
9579
9580
#: en/help_topics/configuration.txt:116
9581
msgid ""
9582
"The examples below use ':' as the separator, windows users\n"
9583
"should use ';'."
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:119
9587
msgid "Overriding the default user plugin directory::"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:121
9591
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9592
msgstr ""
9593
9594
#: en/help_topics/configuration.txt:123
9595
msgid "Disabling the site directory while retaining the user directory::"
9596
msgstr ""
9597
9598
#: en/help_topics/configuration.txt:125
9599
msgid " BZR_PLUGIN_PATH='-site:+user'"
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:127
9603
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9604
msgstr ""
9605
9606
#: en/help_topics/configuration.txt:129
9607
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:131
9611
msgid "Overriding the default site plugin directory::"
9612
msgstr ""
9613
9614
#: en/help_topics/configuration.txt:133
9615
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9616
msgstr ""
9617
" BZR_PLUGIN_PATH='/Pfad/zu/meiner/Seite/Erweiterungen:-Seite':+Benutzer"
9618
9619
#: en/help_topics/configuration.txt:135
9620
msgid ""
9621
"BZR_DISABLE_PLUGINS\n"
9622
"~~~~~~~~~~~~~~~~~~~"
9623
msgstr ""
9624
"BZR_DISABLE_PLUGINS\n"
9625
"~~~~~~~~~~~~~~~~~~~"
9626
9627
#: en/help_topics/configuration.txt:138
9628
msgid ""
9629
"Under special circumstances (mostly when trying to diagnose a\n"
9630
"bug), it's better to disable a plugin (or several) rather than\n"
9631
"uninstalling them completely. Such plugins can be specified in\n"
9632
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9633
msgstr ""
9634
9635
#: en/help_topics/configuration.txt:143
9636
msgid ""
9637
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9638
"will raise an import error if they are explicitly imported (by\n"
9639
"another plugin that depends on them for example)."
9640
msgstr ""
9641
9642
#: en/help_topics/configuration.txt:147
9643
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:149
9647
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9648
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9649
9650
#: en/help_topics/configuration.txt:151
9651
msgid ""
9652
"BZR_PLUGINS_AT\n"
9653
"~~~~~~~~~~~~~~"
9654
msgstr ""
9655
"BZR_PLUGINS_AT\n"
9656
"~~~~~~~~~~~~~~"
9657
9658
#: en/help_topics/configuration.txt:154
9659
msgid ""
9660
"When adding a new feature or working on a bug in a plugin,\n"
9661
"developers often need to use a specific version of a given\n"
9662
"plugin. Since python requires that the directory containing the\n"
9663
"code is named like the plugin itself this make it impossible to\n"
9664
"use arbitrary directory names (using a two-level directory scheme\n"
9665
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9666
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9667
msgstr ""
9668
9669
#: en/help_topics/configuration.txt:162
9670
msgid ""
9671
"Plugins specified in this environment variable takes precedence\n"
9672
"over the ones in ``BZR_PLUGIN_PATH``."
9673
msgstr ""
9674
9675
#: en/help_topics/configuration.txt:165
9676
msgid ""
9677
"The variable specified a list of ``plugin_name@plugin path``,\n"
9678
"``plugin_name`` being the name of the plugin as it appears in\n"
9679
"python module paths, ``plugin_path`` being the path to the\n"
9680
"directory containing the plugin code itself\n"
9681
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9682
"separator, use ';' on windows."
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:172
9686
msgid ""
9687
"Example:\n"
9688
"~~~~~~~~"
9689
msgstr ""
9690
"Beispiel:\n"
9691
"~~~~~~~~~"
9692
9693
#: en/help_topics/configuration.txt:175
9694
msgid ""
9695
"Using a specific version of ``myplugin``:\n"
9696
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9697
msgstr ""
9698
9699
#: en/help_topics/configuration.txt:178
9700
msgid ""
9701
"BZRPATH\n"
9702
"~~~~~~~"
9703
msgstr ""
9704
"BZRPATH\n"
9705
"~~~~~~~"
9706
9707
#: en/help_topics/configuration.txt:181
9708
msgid "The path where Bazaar should look for shell plugin external commands."
9709
msgstr ""
9710
9711
#: en/help_topics/configuration.txt:183
9712
msgid ""
9713
"\n"
9714
"http_proxy, https_proxy\n"
9715
"~~~~~~~~~~~~~~~~~~~~~~~"
9716
msgstr ""
9717
"\n"
9718
"http_proxy, https_proxy\n"
9719
"~~~~~~~~~~~~~~~~~~~~~~~"
9720
9721
#: en/help_topics/configuration.txt:187
9722
msgid "Specifies the network proxy for outgoing connections, for example::"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:189
9726
msgid ""
9727
" http_proxy=http://proxy.example.com:3128/ \n"
9728
" https_proxy=http://proxy.example.com:3128/"
9729
msgstr ""
9730
" http_proxy=http://proxy.beispiel.de:3128/ \n"
9731
" https_proxy=http://proxy.beispiel.de:3128/"
9732
9733
#: en/help_topics/configuration.txt:192
9734
msgid ""
9735
"\n"
9736
"Configuration files\n"
9737
"-------------------"
9738
msgstr ""
9739
"\n"
9740
"Konfigurationsdateien\n"
9741
"-------------------"
9742
9743
#: en/help_topics/configuration.txt:196
9744
msgid ""
9745
"Location\n"
9746
"~~~~~~~~"
9747
msgstr ""
9748
"Ort\n"
9749
"~~~~~~~~"
9750
9751
#: en/help_topics/configuration.txt:199
9752
msgid ""
9753
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9754
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9755
"on\n"
9756
"Windows. (You can check the location for your system by using\n"
9757
"``bzr version``.)"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:204
9761
msgid "There are three primary configuration files in this location:"
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:206
9765
msgid "* ``bazaar.conf`` describes default configuration options,"
9766
msgstr ""
9767
9768
#: en/help_topics/configuration.txt:208
9769
msgid ""
9770
"* ``locations.conf`` describes configuration information for\n"
9771
" specific branch locations,"
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:211
9775
msgid ""
9776
"* ``authentication.conf`` describes credential information for\n"
9777
" remote servers."
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:214
9781
msgid ""
9782
"Each branch can also contain a configuration file that sets values specific\n"
9783
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9784
"the\n"
9785
"branch. This file is visible to all users of a branch, if you wish to "
9786
"override\n"
9787
"one of the values for a branch with a setting that is specific to you then "
9788
"you\n"
9789
"can do so in ``locations.conf``."
9790
msgstr ""
9791
9792
#: en/help_topics/configuration.txt:220
9793
msgid ""
9794
"General format\n"
9795
"~~~~~~~~~~~~~~"
9796
msgstr ""
9797
9798
#: en/help_topics/configuration.txt:223
9799
msgid ""
9800
"An ini file has three types of contructs: section headers, section\n"
9801
"options and comments."
9802
msgstr ""
9803
9804
#: en/help_topics/configuration.txt:226
9805
msgid ""
9806
"Comments\n"
9807
"^^^^^^^^"
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:229
9811
msgid ""
9812
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9813
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9814
"Bazaar when parsing ini files."
9815
msgstr ""
9816
9817
#: en/help_topics/configuration.txt:233
9818
msgid ""
9819
"Section headers\n"
9820
"^^^^^^^^^^^^^^^"
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:236
9824
msgid ""
9825
"A section header is a word enclosed in brackets that starts at the begining\n"
9826
"of a line. A typical section header looks like this::"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:239
9830
msgid " [DEFAULT]"
9831
msgstr ""
9832
9833
#: en/help_topics/configuration.txt:241
9834
msgid ""
9835
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9836
"[ALIASES]. Section headers are case sensitive. The default section provides "
9837
"for\n"
9838
"setting options which can be overridden with the branch config file."
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:245
9842
msgid ""
9843
"For ``locations.conf``, the options from the section with the\n"
9844
"longest matching section header are used to the exclusion of other\n"
9845
"potentially valid section headers. A section header uses the path for\n"
9846
"the branch as the section header. Some examples include::"
9847
msgstr ""
9848
9849
#: en/help_topics/configuration.txt:250
9850
msgid ""
9851
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9852
" [/home/jdoe/branches/]"
9853
msgstr ""
9854
" [http://meinebranchen.isp.com/~jdoe/branchdir]\n"
9855
" [/home/jdoe/branches/]"
9856
9857
#: en/help_topics/configuration.txt:253
9858
msgid ""
9859
"\n"
9860
"Section options\n"
9861
"^^^^^^^^^^^^^^^"
9862
msgstr ""
9863
9864
#: en/help_topics/configuration.txt:257
9865
msgid ""
9866
"A section option resides within a section. A section option contains an\n"
9867
"option name, an equals sign and a value. For example::"
9868
msgstr ""
9869
9870
#: en/help_topics/configuration.txt:260
9871
msgid ""
9872
" email = John Doe <jdoe@isp.com>\n"
9873
" gpg_signing_key = Amy Pond <amy@example.com>"
9874
msgstr ""
9875
" email = John Doe <jdoe@isp.com>\n"
9876
" gpg_signing_key = Amy Pond <amy@beispiel.de>"
9877
9878
#: en/help_topics/configuration.txt:263
9879
msgid ""
9880
"A option can reference other options by enclosing them in curly brackets::"
9881
msgstr ""
9882
9883
#: en/help_topics/configuration.txt:265
9884
msgid ""
9885
" my_branch_name = feature_x\n"
9886
" my_server = bzr+ssh://example.com\n"
9887
" push_location = {my_server}/project/{my_branch_name}"
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:269
9891
msgid ""
9892
"Option policies\n"
9893
"^^^^^^^^^^^^^^^"
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:272
9897
msgid ""
9898
"Options defined in a section affect the named directory or URL plus\n"
9899
"any locations they contain. Policies can be used to change how an\n"
9900
"option value is interpreted for contained locations. Currently\n"
9901
"there are three policies available:"
9902
msgstr ""
9903
9904
#: en/help_topics/configuration.txt:277
9905
msgid ""
9906
" none:\n"
9907
" the value is interpreted the same for contained locations. This is\n"
9908
" the default behaviour.\n"
9909
" norecurse:\n"
9910
" the value is only used for the exact location specified by the\n"
9911
" section name.\n"
9912
" appendpath:\n"
9913
" for contained locations, any additional path components are\n"
9914
" appended to the value."
9915
msgstr ""
9916
9917
#: en/help_topics/configuration.txt:287
9918
msgid ""
9919
"Policies are specified by keys with names of the form "
9920
"\"<option_name>:policy\".\n"
9921
"For example, to define the push location for a tree of branches, the\n"
9922
"following could be used::"
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:291
9926
msgid ""
9927
" [/top/location]\n"
9928
" push_location = sftp://example.com/location\n"
9929
" push_location:policy = appendpath"
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:295
9933
msgid ""
9934
"With this configuration, the push location for ``/top/location/branch1``\n"
9935
"would be ``sftp://example.com/location/branch1``."
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:298
9939
msgid ""
9940
"Section local options\n"
9941
"^^^^^^^^^^^^^^^^^^^^^"
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:301
9945
msgid ""
9946
"Some options are defined automatically inside a given section and can be\n"
9947
"refered to in this section only. "
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:304
9951
msgid "For example, the ``appendpath`` policy can be used like this::"
9952
msgstr ""
9953
9954
#: en/help_topics/configuration.txt:306
9955
msgid ""
9956
" [/home/vila/src/bzr/bugs]\n"
9957
" mypush = lp:~vila/bzr\n"
9958
" mypush:policy=appendpath"
9959
msgstr ""
9960
9961
#: en/help_topics/configuration.txt:310
9962
msgid "Using ``relpath`` to achieve the same result is done like this::"
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:312
9966
msgid ""
9967
" [/home/vila/src/bzr/bugs]\n"
9968
" mypush = lp:~vila/bzr/{relpath}"
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:315
9972
msgid ""
9973
"In both cases, when used in a directory like\n"
9974
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9978
msgid ""
9979
" $ bzr config mypush\n"
9980
" lp:~vila/bzr/832013-expand-in-stack"
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:321
9984
msgid "Another such option is ``basename`` which can be used like this::"
9985
msgstr ""
9986
9987
#: en/help_topics/configuration.txt:323
9988
msgid ""
9989
" [/home/vila/src/bzr]\n"
9990
" mypush = lp:~vila/bzr/{basename}"
9991
msgstr ""
9992
9993
#: en/help_topics/configuration.txt:326
9994
msgid ""
9995
"When used in a directory like\n"
9996
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9997
msgstr ""
9998
9999
#: en/help_topics/configuration.txt:332
10000
msgid ""
10001
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10002
"itself is defined as the relative path between the section name and the\n"
10003
"location it matches."
10004
msgstr ""
10005
10006
#: en/help_topics/configuration.txt:336
10007
msgid ""
10008
"Another such option is ``branchname``, which refers to the name of a "
10009
"colocated\n"
10010
"branch. For non-colocated branches, it behaves like basename. It can be "
10011
"used\n"
10012
"like this::"
10013
msgstr ""
10014
10015
#: en/help_topics/configuration.txt:340
10016
msgid ""
10017
" [/home/vila/src/bzr/bugs]\n"
10018
" mypush = lp:~vila/bzr/{branchname}"
10019
msgstr ""
10020
10021
#: en/help_topics/configuration.txt:343
10022
msgid ""
10023
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10024
"get::"
10025
msgstr ""
10026
10027
#: en/help_topics/configuration.txt:345
10028
msgid ""
10029
" bzr config mypush\n"
10030
" lp:~vila/bzr/832013-expand-in-stack"
10031
msgstr ""
10032
10033
#: en/help_topics/configuration.txt:348
10034
msgid ""
10035
"When an option is local to a Section, it cannot be referred to from option\n"
10036
"values in any other section from the same ``Store`` nor from any other\n"
10037
"``Store``."
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:352
10041
msgid ""
10042
"\n"
10043
"The main configuration file, bazaar.conf\n"
10044
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:356
10048
msgid ""
10049
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10050
"The default section contains the default\n"
10051
"configuration options for all branches. The default section can be\n"
10052
"overriden by providing a branch-specific section in ``locations.conf``."
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:361
10056
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10057
msgstr ""
10058
10059
#: en/help_topics/configuration.txt:363
10060
msgid ""
10061
" [DEFAULT]\n"
10062
" email = John Doe <jdoe@isp.com>\n"
10063
" editor = /usr/bin/vim\n"
10064
" create_signatures = when-required"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:368
10068
msgid ""
10069
"\n"
10070
"The branch location configuration file, locations.conf\n"
10071
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10072
msgstr ""
10073
10074
#: en/help_topics/configuration.txt:372
10075
msgid ""
10076
"``locations.conf`` allows one to specify overriding settings for\n"
10077
"a specific branch. The format is almost identical to the default section in\n"
10078
"bazaar.conf with one significant change: The section header, instead of "
10079
"saying\n"
10080
"default, will be the path to a branch that you wish to override a value\n"
10081
"for. The '?' and '*' wildcards are supported::"
10082
msgstr ""
10083
10084
#: en/help_topics/configuration.txt:378
10085
msgid ""
10086
" [/home/jdoe/branches/nethack]\n"
10087
" email = Nethack Admin <nethack@nethack.com>"
10088
msgstr ""
10089
10090
#: en/help_topics/configuration.txt:381
10091
msgid ""
10092
" [http://hypothetical.site.com/branches/devel-branch]\n"
10093
" create_signatures = always"
10094
msgstr ""
10095
10096
#: en/help_topics/configuration.txt:384
10097
msgid ""
10098
"The authentication configuration file, authentication.conf\n"
10099
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10100
msgstr ""
10101
10102
#: en/help_topics/configuration.txt:387
10103
msgid ""
10104
"``authentication.conf`` allows one to specify credentials for\n"
10105
"remote servers. This can be used for all the supported transports and any "
10106
"part\n"
10107
"of bzr that requires authentication (smtp for example)."
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:391
10111
msgid ""
10112
"The syntax of the file obeys the same rules as the others except for the\n"
10113
"option policies which don't apply."
10114
msgstr ""
10115
10116
#: en/help_topics/configuration.txt:394
10117
msgid ""
10118
"For more information on the possible uses of the authentication "
10119
"configuration\n"
10120
"file see :doc:`authentication-help`."
10121
msgstr ""
10122
10123
#: en/help_topics/configuration.txt:397
10124
msgid ""
10125
"\n"
10126
"Common options\n"
10127
"--------------"
10128
msgstr ""
10129
10130
#: en/help_topics/configuration.txt:401
10131
msgid ""
10132
"debug_flags\n"
10133
"~~~~~~~~~~~"
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:404
10137
msgid ""
10138
"A comma-separated list of debugging options to turn on. The same values\n"
10139
"can be used as with the -D command-line option (see `help global-options`).\n"
10140
"For example::"
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:408
10144
msgid " debug_flags = hpss"
10145
msgstr " debug_flags = hpss"
10146
10147
#: en/help_topics/configuration.txt:412
10148
msgid " debug_flags = hpss,evil"
10149
msgstr " debug_flags = hpss,evil"
10150
10151
#: en/help_topics/configuration.txt:414
10152
msgid ""
10153
"email\n"
10154
"~~~~~"
10155
msgstr ""
10156
10157
#: en/help_topics/configuration.txt:417
10158
msgid ""
10159
"The email address to use when committing a branch. Typically takes the form\n"
10160
"of::"
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:420
10164
msgid " email = Full Name <account@hostname.tld>"
10165
msgstr ""
10166
10167
#: en/help_topics/configuration.txt:422
10168
msgid ""
10169
"editor\n"
10170
"~~~~~~"
10171
msgstr ""
10172
10173
#: en/help_topics/configuration.txt:425
10174
msgid ""
10175
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10176
"a commit message. This setting is trumped by the environment variable\n"
10177
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10178
"variables."
10179
msgstr ""
10180
10181
#: en/help_topics/configuration.txt:430
10182
msgid ""
10183
"log_format\n"
10184
"~~~~~~~~~~"
10185
msgstr ""
10186
10187
#: en/help_topics/configuration.txt:433
10188
msgid ""
10189
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10190
"and ``line``. Additional formats may be provided by plugins. The default\n"
10191
"value is ``long``."
10192
msgstr ""
10193
10194
#: en/help_topics/configuration.txt:437
10195
msgid ""
10196
"check_signatures\n"
10197
"~~~~~~~~~~~~~~~~"
10198
msgstr ""
10199
10200
#: en/help_topics/configuration.txt:440
10201
msgid ""
10202
"Reserved for future use. These options will allow a policy for branches to\n"
10203
"require signatures."
10204
msgstr ""
10205
10206
#: en/help_topics/configuration.txt:443
10207
msgid ""
10208
"require\n"
10209
" The gnupg signature for revisions must be present and must be valid."
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:446
10213
msgid ""
10214
"ignore\n"
10215
" Do not check gnupg signatures of revisions."
10216
msgstr ""
10217
10218
#: en/help_topics/configuration.txt:449
10219
msgid ""
10220
"check-available\n"
10221
" (default) If gnupg signatures for revisions are present, check them.\n"
10222
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10223
" no signature is present."
10224
msgstr ""
10225
10226
#: en/help_topics/configuration.txt:454
10227
msgid ""
10228
"create_signatures\n"
10229
"~~~~~~~~~~~~~~~~~"
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:457
10233
msgid ""
10234
"Defines the behaviour of signing revisions on commits. By default bzr will "
10235
"not\n"
10236
"sign new commits."
10237
msgstr ""
10238
10239
#: en/help_topics/configuration.txt:460
10240
msgid ""
10241
"always\n"
10242
" Sign every new revision that is committed. If the signing fails then "
10243
"the\n"
10244
" commit will not be made."
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:464
10248
msgid ""
10249
"when-required\n"
10250
" Reserved for future use."
10251
msgstr ""
10252
10253
#: en/help_topics/configuration.txt:467
10254
msgid ""
10255
"never\n"
10256
" Reserved for future use."
10257
msgstr ""
10258
10259
#: en/help_topics/configuration.txt:470
10260
msgid ""
10261
"In future it is planned that ``when-required`` will sign newly\n"
10262
"committed revisions only when the branch requires them. ``never`` will "
10263
"refuse\n"
10264
"to sign newly committed revisions, even if the branch requires signatures."
10265
msgstr ""
10266
10267
#: en/help_topics/configuration.txt:474
10268
msgid ""
10269
"dirstate.fdatasync\n"
10270
"~~~~~~~~~~~~~~~~~~"
10271
msgstr ""
10272
10273
#: en/help_topics/configuration.txt:477
10274
msgid ""
10275
"If true (default), working tree metadata changes are flushed through the\n"
10276
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10277
"should not be lost if the machine crashes. See also repository.fdatasync."
10278
msgstr ""
10279
10280
#: en/help_topics/configuration.txt:481
10281
msgid ""
10282
"gpg_signing_key\n"
10283
"~~~~~~~~~~~~~~~"
10284
msgstr ""
10285
10286
#: en/help_topics/configuration.txt:484
10287
msgid ""
10288
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10289
"address, key fingerprint or full key ID. When unset or when set to\n"
10290
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10291
msgstr ""
10292
10293
#: en/help_topics/configuration.txt:488
10294
msgid ""
10295
"recurse\n"
10296
"~~~~~~~"
10297
msgstr ""
10298
10299
#: en/help_topics/configuration.txt:491
10300
msgid ""
10301
"Only useful in ``locations.conf``. Defines whether or not the\n"
10302
"configuration for this section applies to subdirectories:"
10303
msgstr ""
10304
10305
#: en/help_topics/configuration.txt:494
10306
msgid ""
10307
"true\n"
10308
" (default) This section applies to subdirectories as well."
10309
msgstr ""
10310
10311
#: en/help_topics/configuration.txt:497
10312
msgid ""
10313
"false\n"
10314
" This section only applies to the branch at this directory and not\n"
10315
" branches below it."
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:501
10319
msgid ""
10320
"gpg_signing_command\n"
10321
"~~~~~~~~~~~~~~~~~~~"
10322
msgstr ""
10323
10324
#: en/help_topics/configuration.txt:504
10325
msgid ""
10326
"(Default: \"gpg\"). Which program should be used to sign and check "
10327
"revisions.\n"
10328
"For example::"
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:507
10332
msgid " gpg_signing_command = /usr/bin/gnpg"
10333
msgstr ""
10334
10335
#: en/help_topics/configuration.txt:509
10336
msgid ""
10337
"The specified command must accept the options \"--clearsign\" and \"-u "
10338
"<email>\"."
10339
msgstr ""
10340
10341
#: en/help_topics/configuration.txt:511
10342
msgid ""
10343
"bzr_remote_path\n"
10344
"~~~~~~~~~~~~~~~"
10345
msgstr ""
10346
10347
#: en/help_topics/configuration.txt:514
10348
msgid ""
10349
"(Default: \"bzr\"). The path to the command that should be used to run the "
10350
"smart\n"
10351
"server for bzr. This value may only be specified in locations.conf, because:"
10352
msgstr ""
10353
10354
#: en/help_topics/configuration.txt:517
10355
msgid ""
10356
"- it's needed before branch.conf is accessible\n"
10357
"- allowing remote branch.conf files to specify commands would be a security\n"
10358
" risk"
10359
msgstr ""
10360
10361
#: en/help_topics/configuration.txt:521
10362
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10363
msgstr ""
10364
10365
#: en/help_topics/configuration.txt:523
10366
msgid ""
10367
"smtp_server\n"
10368
"~~~~~~~~~~~"
10369
msgstr ""
10370
10371
#: en/help_topics/configuration.txt:526
10372
msgid ""
10373
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10374
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10375
msgstr ""
10376
10377
#: en/help_topics/configuration.txt:529
10378
msgid ""
10379
"smtp_username, smtp_password\n"
10380
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:532
10384
msgid ""
10385
"User and password to authenticate to the SMTP server. If smtp_username\n"
10386
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10387
"These settings are only needed if the SMTP server requires authentication\n"
10388
"to send mail."
10389
msgstr ""
10390
10391
#: en/help_topics/configuration.txt:537
10392
msgid ""
10393
"locks.steal_dead\n"
10394
"~~~~~~~~~~~~~~~~"
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:540
10398
msgid ""
10399
"If set to true, bzr will automatically break locks held by processes from\n"
10400
"the same machine and user that are no longer alive. Otherwise, it will\n"
10401
"print a message and you can break the lock manually, if you are satisfied\n"
10402
"the object is no longer in use."
10403
msgstr ""
10404
10405
#: en/help_topics/configuration.txt:545
10406
msgid ""
10407
"mail_client\n"
10408
"~~~~~~~~~~~"
10409
msgstr ""
10410
10411
#: en/help_topics/configuration.txt:548
10412
msgid ""
10413
"A mail client to use for sending merge requests.\n"
10414
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10415
"it\n"
10416
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10417
"``editor``."
10418
msgstr ""
10419
10420
#: en/help_topics/configuration.txt:553
10421
msgid "Supported values for specific clients:"
10422
msgstr ""
10423
10424
#: en/help_topics/configuration.txt:555
10425
msgid ""
10426
":claws: Use Claws. This skips a dialog for attaching files.\n"
10427
":evolution: Use Evolution.\n"
10428
":kmail: Use KMail.\n"
10429
":mutt: Use Mutt.\n"
10430
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10431
"1.5,\n"
10432
" this works around some bugs that xdg-email doesn't handle."
10433
msgstr ""
10434
10435
#: en/help_topics/configuration.txt:562
10436
msgid "Supported generic values are:"
10437
msgstr "Unterstützte generische Werte sind:"
10438
10439
#: en/help_topics/configuration.txt:564
10440
msgid ""
10441
":default: See above.\n"
10442
":editor: Use your editor to compose the merge request. This also uses\n"
10443
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10444
" smtp_username and smtp_password.\n"
10445
":mapi: Use your preferred e-mail client on Windows.\n"
10446
":xdg-email: Use xdg-email to run your preferred mail program"
10447
msgstr ""
10448
10449
#: en/help_topics/configuration.txt:571
10450
msgid ""
10451
"repository.fdatasync\n"
10452
"~~~~~~~~~~~~~~~~~~~~"
10453
msgstr ""
10454
10455
#: en/help_topics/configuration.txt:574
10456
msgid ""
10457
"If true (default), repository changes are flushed through the OS buffers\n"
10458
"to physical disk. This is somewhat slower, but means data should not be\n"
10459
"lost if the machine crashes. See also dirstate.fdatasync."
10460
msgstr ""
10461
10462
#: en/help_topics/configuration.txt:578
10463
msgid ""
10464
"submit_branch\n"
10465
"~~~~~~~~~~~~~"
10466
msgstr ""
10467
10468
#: en/help_topics/configuration.txt:581
10469
msgid ""
10470
"The branch you intend to submit your current work to. This is "
10471
"automatically\n"
10472
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10473
"This\n"
10474
"should usually be set on a per-branch or per-location basis."
10475
msgstr ""
10476
10477
#: en/help_topics/configuration.txt:585
10478
msgid ""
10479
"public_branch\n"
10480
"~~~~~~~~~~~~~"
10481
msgstr ""
10482
10483
#: en/help_topics/configuration.txt:588
10484
msgid ""
10485
"A publically-accessible version of this branch (implying that this version "
10486
"is\n"
10487
"not publically-accessible). Used (and set) by ``bzr send``."
10488
msgstr ""
10489
10490
#: en/help_topics/configuration.txt:591
10491
msgid ""
10492
"suppress_warnings\n"
10493
"~~~~~~~~~~~~~~~~~"
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:594
10497
msgid ""
10498
"A list of strings, each string represent a warning that can be emitted by\n"
10499
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10500
msgstr ""
10501
10502
#: en/help_topics/configuration.txt:597
10503
msgid "Valid values:"
10504
msgstr "Gültige Werte:"
10505
10506
#: en/help_topics/configuration.txt:599
10507
msgid ""
10508
"* ``format_deprecation``:\n"
10509
" whether the format deprecation warning is shown on repositories that "
10510
"are\n"
10511
" using deprecated formats."
10512
msgstr ""
10513
10514
#: en/help_topics/configuration.txt:603
10515
msgid ""
10516
"default_format\n"
10517
"~~~~~~~~~~~~~~"
10518
msgstr ""
10519
10520
#: en/help_topics/configuration.txt:606
10521
msgid ""
10522
"A format name for the default format used when creating branches. See "
10523
"``bzr\n"
10524
"help formats`` for possible values."
10525
msgstr ""
10526
10527
#: en/help_topics/configuration.txt:609
10528
msgid ""
10529
"\n"
10530
"Unicode options\n"
10531
"---------------"
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:613
10535
msgid ""
10536
"output_encoding\n"
10537
"~~~~~~~~~~~~~~~"
10538
msgstr ""
10539
10540
#: en/help_topics/configuration.txt:616
10541
msgid ""
10542
"A Python unicode encoding name for text output from bzr, such as log\n"
10543
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10544
"is the terminal encoding prefered by the operating system."
10545
msgstr ""
10546
10547
#: en/help_topics/configuration.txt:620
10548
msgid ""
10549
"\n"
10550
"Branch type specific options\n"
10551
"----------------------------"
10552
msgstr ""
10553
10554
#: en/help_topics/configuration.txt:624
10555
msgid ""
10556
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10557
"later format. They\n"
10558
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10559
"manually set in ``locations.conf`` or ``bazaar.conf``."
10560
msgstr ""
10561
10562
#: en/help_topics/configuration.txt:629
10563
msgid ""
10564
"append_revisions_only\n"
10565
"~~~~~~~~~~~~~~~~~~~~~"
10566
msgstr ""
10567
10568
#: en/help_topics/configuration.txt:632
10569
msgid ""
10570
"If set to \"True\" then revisions can only be appended to the log, not\n"
10571
"removed. A branch with this setting enabled can only pull from another\n"
10572
"branch if the other branch's log is a longer version of its own. This is\n"
10573
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10574
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10575
"compatibility with previous bzr versions (older than 2.2)."
10576
msgstr ""
10577
10578
#: en/help_topics/configuration.txt:639
10579
msgid ""
10580
"parent_location\n"
10581
"~~~~~~~~~~~~~~~"
10582
msgstr ""
10583
10584
#: en/help_topics/configuration.txt:642
10585
msgid ""
10586
"If present, the location of the default branch for pull or merge. This "
10587
"option\n"
10588
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10589
"--remember``."
10590
msgstr ""
10591
10592
#: en/help_topics/configuration.txt:646
10593
msgid ""
10594
"push_location\n"
10595
"~~~~~~~~~~~~~"
10596
msgstr ""
10597
10598
#: en/help_topics/configuration.txt:649
10599
msgid ""
10600
"If present, the location of the default branch for push. This option\n"
10601
"is normally set by the first ``push`` or ``push --remember``."
10602
msgstr ""
10603
10604
#: en/help_topics/configuration.txt:652
10605
msgid ""
10606
"push_strict\n"
10607
"~~~~~~~~~~~"
10608
msgstr ""
10609
10610
#: en/help_topics/configuration.txt:655
10611
msgid ""
10612
"If present, defines the ``--strict`` option default value for checking\n"
10613
"uncommitted changes before pushing."
10614
msgstr ""
10615
10616
#: en/help_topics/configuration.txt:658
10617
msgid ""
10618
"dpush_strict\n"
10619
"~~~~~~~~~~~~"
10620
msgstr ""
10621
10622
#: en/help_topics/configuration.txt:661
10623
msgid ""
10624
"If present, defines the ``--strict`` option default value for checking\n"
10625
"uncommitted changes before pushing into a different VCS without any\n"
10626
"custom bzr metadata."
10627
msgstr ""
10628
10629
#: en/help_topics/configuration.txt:665
10630
msgid ""
10631
"bound_location\n"
10632
"~~~~~~~~~~~~~~"
10633
msgstr ""
10634
10635
#: en/help_topics/configuration.txt:668
10636
msgid ""
10637
"The location that commits should go to when acting as a checkout.\n"
10638
"This option is normally set by ``bind``."
10639
msgstr ""
10640
10641
#: en/help_topics/configuration.txt:671
10642
msgid ""
10643
"bound\n"
10644
"~~~~~"
10645
msgstr ""
10646
10647
#: en/help_topics/configuration.txt:674
10648
msgid ""
10649
"If set to \"True\", the branch should act as a checkout, and push each "
10650
"commit to\n"
10651
"the bound_location. This option is normally set by ``bind``/``unbind``."
10652
msgstr ""
10653
10654
#: en/help_topics/configuration.txt:677
10655
msgid ""
10656
"send_strict\n"
10657
"~~~~~~~~~~~"
10658
msgstr ""
10659
10660
#: en/help_topics/configuration.txt:680
10661
msgid ""
10662
"If present, defines the ``--strict`` option default value for checking\n"
10663
"uncommitted changes before sending a merge directive."
10664
msgstr ""
10665
10666
#: en/help_topics/configuration.txt:683
10667
msgid ""
10668
"add.maximum_file_size\n"
10669
"~~~~~~~~~~~~~~~~~~~~~"
10670
msgstr ""
10671
10672
#: en/help_topics/configuration.txt:686
10673
msgid ""
10674
"Defines the maximum file size the command line \"add\" operation will allow\n"
10675
"in recursive mode, with files larger than this value being skipped. You may "
10676
"\n"
10677
"specify this value as an integer (in which case it is interpreted as bytes), "
10678
"\n"
10679
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10680
"0 \n"
10681
"will disable skipping."
10682
msgstr ""
10683
10684
#: en/help_topics/configuration.txt:692
10685
msgid ""
10686
"External Merge Tools\n"
10687
"--------------------"
10688
msgstr ""
10689
10690
#: en/help_topics/configuration.txt:695
10691
msgid ""
10692
"bzr.mergetool.<name>\n"
10693
"~~~~~~~~~~~~~~~~~~~~"
10694
msgstr ""
10695
10696
#: en/help_topics/configuration.txt:698
10697
msgid ""
10698
"Defines an external merge tool called <name> with the given command-line.\n"
10699
"Arguments containing spaces should be quoted using single or double quotes. "
10700
"The\n"
10701
"executable may omit its path if it can be found on the PATH."
10702
msgstr ""
10703
10704
#: en/help_topics/configuration.txt:702
10705
msgid ""
10706
"The following markers can be used in the command-line to substitute "
10707
"filenames\n"
10708
"involved in the merge conflict::"
10709
msgstr ""
10710
10711
#: en/help_topics/configuration.txt:705
10712
msgid ""
10713
" {base} file.BASE\n"
10714
" {this} file.THIS\n"
10715
" {other} file.OTHER\n"
10716
" {result} output file\n"
10717
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10718
"merge\n"
10719
" succeeds."
10720
msgstr ""
10721
10722
#: en/help_topics/configuration.txt:714
10723
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10724
msgstr ""
10725
10726
#: en/help_topics/configuration.txt:716
10727
msgid ""
10728
"bzr.default_mergetool\n"
10729
"~~~~~~~~~~~~~~~~~~~~~"
10730
msgstr ""
10731
10732
#: en/help_topics/configuration.txt:719
10733
msgid ""
10734
"Specifies which external merge tool (as defined above) should be selected "
10735
"by\n"
10736
"default in tools such as ``bzr qconflicts``."
10737
msgstr ""
10738
10739
#: en/help_topics/configuration.txt:724
10740
msgid " bzr.default_mergetool = kdiff3\n"
10741
msgstr ""
10742
10743
#: en/help_topics/conflict-types.txt:1
10744
msgid ""
10745
"Conflict Types\n"
10746
"=============="
10747
msgstr ""
10748
10749
#: en/help_topics/conflict-types.txt:4
10750
msgid ""
10751
"Some operations, like merge, revert and pull, modify the contents of your\n"
10752
"working tree. These modifications are programmatically generated, and so "
10753
"they\n"
10754
"may conflict with the current state of your working tree. "
10755
msgstr ""
10756
10757
#: en/help_topics/conflict-types.txt:8
10758
msgid ""
10759
"When conflicts are present in your working tree (as shown by ``bzr\n"
10760
"conflicts``), you should resolve them and then inform bzr that the "
10761
"conflicts\n"
10762
"have been resolved."
10763
msgstr ""
10764
10765
#: en/help_topics/conflict-types.txt:12
10766
msgid ""
10767
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10768
"should resolve them is not the one responsible for their occurrence, as is "
10769
"the\n"
10770
"case when merging other people's work or because some conflicts are "
10771
"presented\n"
10772
"in a way that is not easy to understand."
10773
msgstr ""
10774
10775
#: en/help_topics/conflict-types.txt:17
10776
msgid ""
10777
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10778
"conflict if and only if there's an actual conceptual conflict in the source\n"
10779
"tree. Because Bazaar doesn't understand the real meaning of the files "
10780
"being\n"
10781
"versioned, it can, when faced with ambiguities, fall short in either "
10782
"direction\n"
10783
"trying to resolve the conflict itself. Many kinds of changes can be "
10784
"combined\n"
10785
"programmatically, but sometimes only a human can determine the right thing "
10786
"to\n"
10787
"do."
10788
msgstr ""
10789
10790
#: en/help_topics/conflict-types.txt:25
10791
msgid ""
10792
"When Bazaar generates a conflict, it adds information into the working tree "
10793
"to\n"
10794
"present the conflicting versions, and it's up to you to find the correct\n"
10795
"resolution."
10796
msgstr ""
10797
10798
#: en/help_topics/conflict-types.txt:29
10799
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10800
msgstr ""
10801
10802
#: en/help_topics/conflict-types.txt:31
10803
msgid ""
10804
"1. Modify the working tree content so that the conflicted item is now in "
10805
"the\n"
10806
" state you want to keep, then"
10807
msgstr ""
10808
10809
#: en/help_topics/conflict-types.txt:34
10810
msgid ""
10811
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10812
" remaining generated information (``bzr resolve <item>``)."
10813
msgstr ""
10814
10815
#: en/help_topics/conflict-types.txt:37
10816
msgid ""
10817
"For most conflict types, there are some obvious ways to modify the working\n"
10818
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10819
"itself already made a choice, when possible."
10820
msgstr ""
10821
10822
#: en/help_topics/conflict-types.txt:41
10823
msgid ""
10824
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10825
"different ways to resolve the conflict."
10826
msgstr ""
10827
10828
#: en/help_topics/conflict-types.txt:44
10829
msgid ""
10830
"Each type of conflict is explained below, and the action which must be done "
10831
"to\n"
10832
"resolve the conflict is outlined."
10833
msgstr ""
10834
10835
#: en/help_topics/conflict-types.txt:47
10836
msgid ""
10837
"Various actions are available depending on the kind of conflict, for some "
10838
"of\n"
10839
"these actions, Bazaar can provide some help. In the end you should at least\n"
10840
"inform Bazaar that you're done with the conflict with::"
10841
msgstr ""
10842
10843
#: en/help_topics/conflict-types.txt:51
10844
msgid " ``bzr resolve FILE --action=done'"
10845
msgstr " ``bzr resolve FILE --action=done'"
10846
10847
#: en/help_topics/conflict-types.txt:53
10848
msgid ""
10849
"Note that this is the default action when a single file is involved so you "
10850
"can\n"
10851
"simply use::"
10852
msgstr ""
10853
10854
#: en/help_topics/conflict-types.txt:56
10855
msgid " ``bzr resolve FILE``"
10856
msgstr " ``bzr resolve FILE``"
10857
10858
#: en/help_topics/conflict-types.txt:58
10859
msgid "See ``bzr help resolve`` for more details."
10860
msgstr ""
10861
10862
#: en/help_topics/conflict-types.txt:60
10863
msgid ""
10864
"Text conflicts\n"
10865
"--------------"
10866
msgstr ""
10867
10868
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10869
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10870
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10871
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10872
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10873
msgid "Typical message::"
10874
msgstr ""
10875
10876
#: en/help_topics/conflict-types.txt:65
10877
msgid " Text conflict in FILE"
10878
msgstr ""
10879
10880
#: en/help_topics/conflict-types.txt:67
10881
msgid ""
10882
"These are produced when a text merge cannot completely reconcile two sets "
10883
"of\n"
10884
"text changes. Bazaar will emit files for each version with the extensions\n"
10885
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10886
"tree,\n"
10887
"i.e. the tree that you are merging changes into. OTHER is the version that "
10888
"you\n"
10889
"are merging into the target. BASE is an older version that is used as a "
10890
"basis\n"
10891
"for comparison."
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:74
10895
msgid ""
10896
"In the main copy of the file, Bazaar will include all the changes that it\n"
10897
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10898
"\"herringbone\" markers like ``<<<<<<<``."
10899
msgstr ""
10900
10901
#: en/help_topics/conflict-types.txt:78
10902
msgid ""
10903
"Say the initial text is \"The project leader released it.\", and THIS "
10904
"modifies it\n"
10905
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10906
"leader\n"
10907
"released Bazaar.\" A conflict would look like this::"
10908
msgstr ""
10909
10910
#: en/help_topics/conflict-types.txt:82
10911
msgid ""
10912
" <<<<<<< TREE\n"
10913
" Martin Pool released it.\n"
10914
" =======\n"
10915
" The project leader released Bazaar.\n"
10916
" >>>>>>> MERGE-SOURCE"
10917
msgstr ""
10918
10919
#: en/help_topics/conflict-types.txt:88
10920
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10921
msgstr ""
10922
10923
#: en/help_topics/conflict-types.txt:90
10924
msgid ""
10925
"You can handle text conflicts either by editing the main copy of the file,\n"
10926
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10927
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10928
"set of changes over the other (but see below when you encounter these\n"
10929
"cases). More often, the two sets of changes must be intelligently combined."
10930
msgstr ""
10931
10932
#: en/help_topics/conflict-types.txt:96
10933
msgid ""
10934
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10935
"you are done editing, the file should look like it never had a conflict, and "
10936
"be\n"
10937
"ready to commit."
10938
msgstr ""
10939
10940
#: en/help_topics/conflict-types.txt:100
10941
msgid ""
10942
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10943
"Bazaar will auto-detect which conflicts you have resolved."
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:103
10947
msgid ""
10948
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10949
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10950
"working tree."
10951
msgstr ""
10952
10953
#: en/help_topics/conflict-types.txt:107
10954
msgid ""
10955
"\n"
10956
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10957
"resolve`` with one of the following actions:"
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:111
10961
msgid ""
10962
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10963
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10964
msgstr ""
10965
10966
#: en/help_topics/conflict-types.txt:114
10967
msgid ""
10968
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10969
"modifications will be taken into account."
10970
msgstr ""
10971
10972
#: en/help_topics/conflict-types.txt:117
10973
msgid ""
10974
"Content conflicts\n"
10975
"-----------------"
10976
msgstr ""
10977
10978
#: en/help_topics/conflict-types.txt:122
10979
msgid " Contents conflict in FILE"
10980
msgstr ""
10981
10982
#: en/help_topics/conflict-types.txt:124
10983
msgid ""
10984
"This conflict happens when there are conflicting changes in the working "
10985
"tree\n"
10986
"and the merge source, but the conflicted items are not text files. They "
10987
"may\n"
10988
"be binary files, or symlinks, or directories. It can even happen with "
10989
"files\n"
10990
"that are deleted on one side, and modified on the other."
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:129
10994
msgid ""
10995
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10996
"be\n"
10997
"regular files, symlinks or directories). But it will not include a \"main "
10998
"copy\"\n"
10999
"of the file with herringbone conflict markers. It will appear that the "
11000
"\"main\n"
11001
"copy\" has been renamed to THIS or OTHER."
11002
msgstr ""
11003
11004
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11005
msgid ""
11006
"To resolve that kind of conflict, you should rebuild FILE from either "
11007
"version\n"
11008
"or a combination of both."
11009
msgstr ""
11010
11011
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11012
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11013
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11014
#: en/help_topics/conflict-types.txt:361
11015
msgid "``bzr resolve`` recognizes the following actions:"
11016
msgstr ""
11017
11018
#: en/help_topics/conflict-types.txt:139
11019
msgid ""
11020
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11021
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11022
"* ``--action=done`` will just mark the conflict as resolved."
11023
msgstr ""
11024
11025
#: en/help_topics/conflict-types.txt:143
11026
msgid ""
11027
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11028
"and\n"
11029
"``.OTHER`` files if they are still present in the working tree."
11030
msgstr ""
11031
11032
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11033
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11034
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11035
#: en/help_topics/conflict-types.txt:369
11036
msgid ""
11037
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11038
msgstr ""
11039
11040
#: en/help_topics/conflict-types.txt:148
11041
msgid ""
11042
"Tag conflicts\n"
11043
"-------------"
11044
msgstr ""
11045
11046
#: en/help_topics/conflict-types.txt:153
11047
msgid ""
11048
" Conflicting tags:\n"
11049
" version-0.1"
11050
msgstr ""
11051
11052
#: en/help_topics/conflict-types.txt:156
11053
msgid ""
11054
"When pulling from or pushing to another branch, Bazaar informs you about "
11055
"tags\n"
11056
"that conflict between the two branches; that is the same tag points to two\n"
11057
"different revisions. You need not resolve these conflicts, but subsequent\n"
11058
"uses of pull or push will result in the same message."
11059
msgstr ""
11060
11061
#: en/help_topics/conflict-types.txt:161
11062
msgid ""
11063
"To resolve the conflict, you must apply the correct tags to either the "
11064
"target\n"
11065
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11066
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11067
"target branch's tags match the source branch, then in the target branch do\n"
11068
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11069
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11070
"source\n"
11071
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11072
"favor of the target branch, you need to similarly use ``tag --force`` in "
11073
"the\n"
11074
"source branch. (Note that pulling or pushing using --overwrite will "
11075
"overwrite\n"
11076
"all tags as well.)"
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:172
11080
msgid ""
11081
"Duplicate paths\n"
11082
"---------------"
11083
msgstr ""
11084
11085
#: en/help_topics/conflict-types.txt:177
11086
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11087
msgstr ""
11088
11089
#: en/help_topics/conflict-types.txt:179
11090
msgid ""
11091
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11092
"already been used. The existing file will be renamed to \"FILE.moved\". "
11093
msgstr ""
11094
11095
#: en/help_topics/conflict-types.txt:187
11096
msgid ""
11097
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11098
"FILE``,\n"
11099
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11100
"* ``--action=done`` will just mark the conflict as resolved."
11101
msgstr ""
11102
11103
#: en/help_topics/conflict-types.txt:191
11104
msgid ""
11105
"Note that you must get rid of FILE.moved before using ``--action=done``."
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:195
11109
msgid ""
11110
"Unversioned parent\n"
11111
"------------------"
11112
msgstr ""
11113
11114
#: en/help_topics/conflict-types.txt:200
11115
msgid ""
11116
" Conflict because FILE is not versioned, but has versioned children."
11117
msgstr ""
11118
11119
#: en/help_topics/conflict-types.txt:202
11120
msgid ""
11121
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11122
"not\n"
11123
"versioned. This happens when the directory has been deleted in the target,\n"
11124
"but has a new child in the source, or vice versa. In this situation, "
11125
"Bazaar\n"
11126
"will version the parent directory as well. Resolving this issue depends\n"
11127
"very much on the particular scenario. You may wish to rename or delete "
11128
"either\n"
11129
"the file or the directory. When you are satisfied, you can run \"bzr "
11130
"resolve\n"
11131
"FILE\" to mark the conflict as resolved."
11132
msgstr ""
11133
11134
#: en/help_topics/conflict-types.txt:210
11135
msgid ""
11136
"Missing parent\n"
11137
"--------------"
11138
msgstr ""
11139
11140
#: en/help_topics/conflict-types.txt:215
11141
msgid " Conflict adding files to FILE. Created directory."
11142
msgstr ""
11143
11144
#: en/help_topics/conflict-types.txt:217
11145
msgid ""
11146
"This happens when a directory has been deleted in the target, but has new\n"
11147
"children in the source. This is similar to the \"unversioned parent\" "
11148
"conflict,\n"
11149
"except that the parent directory does not *exist*, instead of just being\n"
11150
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11151
"Resolving this issue depends very much on the particular scenario."
11152
msgstr ""
11153
11154
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11155
msgid ""
11156
"To resolve that kind of conflict, you should either remove or rename the\n"
11157
"children or the directory or a combination of both."
11158
msgstr ""
11159
11160
#: en/help_topics/conflict-types.txt:228
11161
msgid ""
11162
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11163
" children,\n"
11164
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11165
"children\n"
11166
" and restoring the directory,\n"
11167
"* ``--action=done`` will just mark the conflict as resolved."
11168
msgstr ""
11169
11170
#: en/help_topics/conflict-types.txt:236
11171
msgid ""
11172
"Deleting parent\n"
11173
"---------------"
11174
msgstr ""
11175
11176
#: en/help_topics/conflict-types.txt:241
11177
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11178
msgstr ""
11179
11180
#: en/help_topics/conflict-types.txt:243
11181
msgid ""
11182
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11183
"source, but has new children in the target (either because a directory\n"
11184
"deletion is merged or because the merge introduce new children). Bazaar\n"
11185
"will retain the directory. Resolving this issue depends very much on the\n"
11186
"particular scenario."
11187
msgstr ""
11188
11189
#: en/help_topics/conflict-types.txt:254
11190
msgid ""
11191
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11192
"directory,"
11193
msgstr ""
11194
11195
#: en/help_topics/conflict-types.txt:256
11196
msgid ""
11197
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11198
" children,"
11199
msgstr ""
11200
11201
#: en/help_topics/conflict-types.txt:259
11202
msgid "* ``--action=done`` will just mark the conflict as resolved."
11203
msgstr ""
11204
11205
#: en/help_topics/conflict-types.txt:261
11206
msgid ""
11207
"Note that when merging a directory deletion, if unversioned files are\n"
11208
"present, they become potential orphans has they don't have a directory\n"
11209
"parent anymore."
11210
msgstr ""
11211
11212
#: en/help_topics/conflict-types.txt:265
11213
msgid ""
11214
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11215
"setting the ``bzr.transform.orphan_policy`` configuration option."
11216
msgstr ""
11217
11218
#: en/help_topics/conflict-types.txt:268
11219
msgid "There are two possible values for this option:"
11220
msgstr "Es gibt zwei mögliche Werte für diese Option:"
11221
11222
#: en/help_topics/conflict-types.txt:270
11223
msgid ""
11224
"* ``conflict`` (the default): will leave the orphans in place and\n"
11225
" generate a conflicts,"
11226
msgstr ""
11227
11228
#: en/help_topics/conflict-types.txt:273
11229
msgid ""
11230
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11231
"root\n"
11232
" of the working tree with names like ``<file>.~#~``."
11233
msgstr ""
11234
11235
#: en/help_topics/conflict-types.txt:278
11236
msgid ""
11237
"Path conflict\n"
11238
"-------------"
11239
msgstr ""
11240
11241
#: en/help_topics/conflict-types.txt:283
11242
msgid " Path conflict: PATH1 / PATH2"
11243
msgstr ""
11244
11245
#: en/help_topics/conflict-types.txt:285
11246
msgid ""
11247
"This happens when the source and target have each modified the name or "
11248
"parent\n"
11249
"directory of a file. Bazaar will use the path elements from the source."
11250
msgstr ""
11251
11252
#: en/help_topics/conflict-types.txt:288
11253
msgid ""
11254
"To resolve that kind of conflict, you just have to decide what name should "
11255
"be\n"
11256
"retained for the file involved."
11257
msgstr ""
11258
11259
#: en/help_topics/conflict-types.txt:293
11260
msgid ""
11261
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11262
" issuing ``bzr mv PATH2 PATH1``,\n"
11263
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11264
"``PATH2``,\n"
11265
"* ``--action=done`` will just mark the conflict as resolved."
11266
msgstr ""
11267
11268
#: en/help_topics/conflict-types.txt:300
11269
msgid ""
11270
"Parent loop\n"
11271
"-----------"
11272
msgstr ""
11273
11274
#: en/help_topics/conflict-types.txt:305
11275
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11276
msgstr ""
11277
11278
#: en/help_topics/conflict-types.txt:307
11279
msgid ""
11280
"This happens when the source and the target have each moved directories, so\n"
11281
"that, if the change could be applied, a directory would be contained by "
11282
"itself.\n"
11283
"For example::"
11284
msgstr ""
11285
11286
#: en/help_topics/conflict-types.txt:311
11287
msgid ""
11288
" $ bzr init\n"
11289
" $ bzr mkdir white\n"
11290
" $ bzr mkdir black\n"
11291
" $ bzr commit -m \"BASE\"\n"
11292
" $ bzr branch . ../other\n"
11293
" $ bzr mv white black\n"
11294
" $ bzr commit -m \"THIS\"\n"
11295
" $ bzr mv ../other/black ../other/white\n"
11296
" $ bzr commit ../other -m \"OTHER\"\n"
11297
" $ bzr merge ../other"
11298
msgstr ""
11299
" $ bzr init\n"
11300
" $ bzr mkdir white\n"
11301
" $ bzr mkdir black\n"
11302
" $ bzr commit -m \"BASE\"\n"
11303
" $ bzr branch . ../other\n"
11304
" $ bzr mv white black\n"
11305
" $ bzr commit -m \"THIS\"\n"
11306
" $ bzr mv ../other/black ../other/white\n"
11307
" $ bzr commit ../other -m \"OTHER\"\n"
11308
" $ bzr merge ../other"
11309
11310
#: en/help_topics/conflict-types.txt:322
11311
msgid ""
11312
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11313
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11314
"name should be retained for the directories involved."
11315
msgstr ""
11316
11317
#: en/help_topics/conflict-types.txt:328
11318
msgid ""
11319
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11320
"\n"
11321
" in ``black``,\n"
11322
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11323
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11324
"* ``--action=done`` will just mark the conflict as resolved."
11325
msgstr ""
11326
11327
#: en/help_topics/conflict-types.txt:336
11328
msgid ""
11329
"Non-directory parent\n"
11330
"--------------------"
11331
msgstr ""
11332
11333
#: en/help_topics/conflict-types.txt:341
11334
msgid ""
11335
" Conflict: foo.new is not a directory, but has files in it.\n"
11336
" Created directory."
11337
msgstr ""
11338
11339
#: en/help_topics/conflict-types.txt:344
11340
msgid ""
11341
"This happens when one side has added files to a directory, and the other "
11342
"side\n"
11343
"has changed the directory into a file or symlink. For example::"
11344
msgstr ""
11345
11346
#: en/help_topics/conflict-types.txt:347
11347
msgid ""
11348
" $ bzr init\n"
11349
" $ bzr mkdir foo\n"
11350
" $ bzr commit -m \"BASE\"\n"
11351
" $ bzr branch . ../other\n"
11352
" $ rmdir foo\n"
11353
" $ touch foo\n"
11354
" $ bzr commit -m \"THIS\"\n"
11355
" $ bzr mkdir ../other/foo/bar\n"
11356
" $ bzr commit ../other -m \"OTHER\"\n"
11357
" $ bzr merge ../other"
11358
msgstr ""
11359
" $ bzr init\n"
11360
" $ bzr mkdir foo\n"
11361
" $ bzr commit -m \"BASE\"\n"
11362
" $ bzr branch . ../other\n"
11363
" $ rmdir foo\n"
11364
" $ touch foo\n"
11365
" $ bzr commit -m \"THIS\"\n"
11366
" $ bzr mkdir ../other/foo/bar\n"
11367
" $ bzr commit ../other -m \"OTHER\"\n"
11368
" $ bzr merge ../other"
11369
11370
#: en/help_topics/conflict-types.txt:358
11371
msgid ""
11372
"To resolve that kind of conflict, you have to decide what name should be\n"
11373
"retained for the file, directory or symlink involved."
11374
msgstr ""
11375
11376
#: en/help_topics/conflict-types.txt:363
11377
msgid ""
11378
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11379
" ``bzr add foo``,\n"
11380
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11381
" ``bzr mv foo.new foo``,\n"
11382
"* ``--action=done`` will just mark the conflict as resolved."
11383
msgstr ""
11384
11385
#: en/help_topics/conflict-types.txt:371
11386
msgid ""
11387
"MalformedTransform\n"
11388
"------------------"
11389
msgstr ""
11390
11391
#: en/help_topics/conflict-types.txt:374
11392
msgid ""
11393
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11394
"exception. This means that Bazaar encountered a filesystem conflict that it "
11395
"was\n"
11396
"unable to resolve. This usually indicates a bug. Please let us know if "
11397
"you\n"
11398
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11399
msgstr ""
11400
11401
#: en/help_topics/content-filters.txt:1
11402
msgid ""
11403
"Content Filters\n"
11404
"==============="
11405
msgstr ""
11406
11407
#: en/help_topics/content-filters.txt:4
11408
msgid ""
11409
"Content formats\n"
11410
"---------------"
11411
msgstr ""
11412
11413
#: en/help_topics/content-filters.txt:7
11414
msgid ""
11415
"Bazaar's content filtering allows you to store files in a different\n"
11416
"format from the copy in your working tree. This lets you, or your\n"
11417
"co-developers, use Windows development tools that expect CRLF files\n"
11418
"on projects that use other line-ending conventions. Among other things,\n"
11419
"content filters also let Unix developers more easily work on projects\n"
11420
"using Windows line-ending conventions, keyword expansion/compression,\n"
11421
"and trailing spaces on lines in text files to be implicitly stripped\n"
11422
"when committed."
11423
msgstr ""
11424
11425
#: en/help_topics/content-filters.txt:16
11426
msgid "To generalize, there are two content formats supported by Bazaar:"
11427
msgstr ""
11428
11429
#: en/help_topics/content-filters.txt:18
11430
msgid ""
11431
"* a canonical format - how files are stored internally\n"
11432
"* a convenience format - how files are created in a working tree."
11433
msgstr ""
11434
11435
#: en/help_topics/content-filters.txt:21
11436
msgid ""
11437
"\n"
11438
"Format conversion\n"
11439
"-----------------"
11440
msgstr ""
11441
11442
#: en/help_topics/content-filters.txt:25
11443
msgid ""
11444
"The conversion between these formats is done by content filters.\n"
11445
"A content filter has two parts:"
11446
msgstr ""
11447
11448
#: en/help_topics/content-filters.txt:28
11449
msgid ""
11450
"* a read converter - converts from convenience to canonical format\n"
11451
"* a write converter - converts from canonical to convenience format."
11452
msgstr ""
11453
11454
#: en/help_topics/content-filters.txt:31
11455
msgid ""
11456
"Many of these converters will provide *round-trip* conversion,\n"
11457
"i.e. applying the read converter followed by the write converter\n"
11458
"gives back the original content. However, others may provide an\n"
11459
"asymmetric conversion. For example, a read converter might strip\n"
11460
"trailing whitespace off lines in source code while the matching\n"
11461
"write converter might pass content through unchanged."
11462
msgstr ""
11463
11464
#: en/help_topics/content-filters.txt:38
11465
msgid ""
11466
"\n"
11467
"Enabling content filters\n"
11468
"------------------------"
11469
msgstr ""
11470
11471
#: en/help_topics/content-filters.txt:42
11472
msgid ""
11473
"Content filters are typically provided by plugins, so the first step\n"
11474
"in using them is to install the relevant plugins and read their\n"
11475
"documentation. Some plugins may be very specific about which files\n"
11476
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11477
"In other cases, the plugin may leave it in the user's hands to\n"
11478
"define which files are to be filtered. This is typically done\n"
11479
"using rule-based preferences. See ``bzr help rules`` for general\n"
11480
"information about defining these."
11481
msgstr ""
11482
11483
#: en/help_topics/content-filters.txt:51
11484
msgid ""
11485
"\n"
11486
"Impact on commands\n"
11487
"------------------"
11488
msgstr ""
11489
11490
#: en/help_topics/content-filters.txt:55
11491
msgid ""
11492
"Read converters are only applied to commands that read content from\n"
11493
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11494
"will apply read converters to files in the working tree, then compare\n"
11495
"the results to the content last committed."
11496
msgstr ""
11497
11498
#: en/help_topics/content-filters.txt:60
11499
msgid ""
11500
"Write converters are only applied by commands that **create files in a\n"
11501
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11502
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11503
"respectively."
11504
msgstr ""
11505
11506
#: en/help_topics/content-filters.txt:65
11507
msgid ""
11508
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11509
"comitting files. If this makes sense for a given plugin providing\n"
11510
"a content filter, the plugin can usually achieve this effect by using a\n"
11511
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11512
"for more information on hooks."
11513
msgstr ""
11514
11515
#: en/help_topics/content-filters.txt:71
11516
msgid ""
11517
"\n"
11518
"Refreshing your working tree\n"
11519
"----------------------------"
11520
msgstr ""
11521
11522
#: en/help_topics/content-filters.txt:75
11523
msgid ""
11524
"For performance reasons, Bazaar caches the timestamps of files in\n"
11525
"a working tree, and assumes files are unchanged if their timestamps\n"
11526
"match the cached values. As a consequence, there are times when\n"
11527
"you may need to explicitly ask for content filtering to be reapplied\n"
11528
"in one or both directions, e.g. after installing or reconfiguring\n"
11529
"plugins providing it."
11530
msgstr ""
11531
11532
#: en/help_topics/content-filters.txt:82
11533
msgid "Here are some general guidelines for doing this:"
11534
msgstr ""
11535
11536
#: en/help_topics/content-filters.txt:84
11537
msgid ""
11538
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11539
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11540
" relevant read converters and compare the end result with the\n"
11541
" canonical format."
11542
msgstr ""
11543
11544
#: en/help_topics/content-filters.txt:89
11545
msgid ""
11546
" * To reapply write converters, ensure there are no local changes,\n"
11547
" delete the relevant files and run ``bzr revert`` on those files."
11548
msgstr ""
11549
11550
#: en/help_topics/content-filters.txt:92
11551
msgid ""
11552
"Note: In the future, it is likely that additional options will be added\n"
11553
"to commands to make this refreshing process faster and safer.\n"
11554
msgstr ""
11555
11556
#: en/help_topics/current-formats.txt:1
11557
msgid "Current Storage Formats"
11558
msgstr "Aktuelle Speicherformate"
11559
11560
#: en/help_topics/current-formats.txt:3
11561
msgid ""
11562
":2a:\n"
11563
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11564
" compress storage. Provides rich roots which are a one-way\n"
11565
" transition."
11566
msgstr ""
11567
11568
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11569
msgid ""
11570
"\n"
11571
"See :doc:`formats-help` for more about storage formats."
11572
msgstr ""
11573
11574
#: en/help_topics/debug-flags.txt:1
11575
msgid ""
11576
"Debug Flags\n"
11577
"==========="
11578
msgstr ""
11579
11580
#: en/help_topics/debug-flags.txt:4
11581
msgid ""
11582
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11583
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11584
msgstr ""
11585
11586
#: en/help_topics/debug-flags.txt:7
11587
msgid ""
11588
"-Dauth Trace authentication sections used.\n"
11589
"-Dbytes Print out how many bytes were transferred\n"
11590
"-Ddirstate Trace dirstate activity (verbose!)\n"
11591
"-Derror Instead of normal error handling, always print a "
11592
"traceback\n"
11593
" on error.\n"
11594
"-Devil Capture call sites that do expensive or badly-scaling\n"
11595
" operations.\n"
11596
"-Dfetch Trace history copying between repositories.\n"
11597
"-Dfilters Emit information for debugging content filtering.\n"
11598
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11599
"fetch.\n"
11600
"-Dgraph Trace graph traversal.\n"
11601
"-Dhashcache Log every time a working file is read to determine its "
11602
"hash.\n"
11603
"-Dhooks Trace hook execution.\n"
11604
"-Dhpss Trace smart protocol requests and responses.\n"
11605
"-Dhpssdetail More hpss details.\n"
11606
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11607
"-Dhttp Trace http connections, requests and responses.\n"
11608
"-Dindex Trace major index operations.\n"
11609
"-Dknit Trace knit operations.\n"
11610
"-Dlock Trace when lockdir locks are taken or released.\n"
11611
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11612
" retrying the request.\n"
11613
"-Dprogress Trace progress bar operations.\n"
11614
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11615
"-Dmerge Emit information for debugging merges.\n"
11616
"-Dno_apport Don't use apport to report crashes.\n"
11617
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11618
"-Dpack Emit information about pack operations.\n"
11619
"-Drelock Emit a message every time a branch or repository object "
11620
"is\n"
11621
" unlocked then relocked the same way.\n"
11622
"-Dsftp Trace SFTP internals.\n"
11623
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11624
"expected\n"
11625
"-Dstream Trace fetch streams.\n"
11626
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11627
"portable\n"
11628
" manner.\n"
11629
"-Dunlock Some errors during unlock are treated as warnings.\n"
11630
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11631
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11632
"appropriate\n"
11633
" for the format, even for non-local fetches.\n"
11634
msgstr ""
11635
11636
#: en/help_topics/diverged-branches.txt:1
11637
msgid ""
11638
"Diverged Branches\n"
11639
"================="
11640
msgstr ""
11641
11642
#: en/help_topics/diverged-branches.txt:4
11643
msgid ""
11644
"When Bazaar tries to push one branch onto another, it requires that the\n"
11645
"destination branch must be ready to receive the source branch. If this "
11646
"isn't\n"
11647
"the case, then we say that the branches have ``diverged``. Branches are\n"
11648
"considered diverged if the destination branch's most recent commit is one "
11649
"that\n"
11650
"has not been merged (directly or indirectly) by the source branch. To "
11651
"recover\n"
11652
"from diverged branches, one must merge the missing revisions into the "
11653
"source\n"
11654
"branch."
11655
msgstr ""
11656
11657
#: en/help_topics/diverged-branches.txt:12
11658
msgid ""
11659
"This situation commonly arises when using a centralized workflow with local\n"
11660
"commits. If someone else has committed new work to the mainline since your\n"
11661
"last pull and you have local commits that have not yet been pushed to the\n"
11662
"mainline, then your local branch and the mainline have diverged."
11663
msgstr ""
11664
11665
#: en/help_topics/diverged-branches.txt:17
11666
msgid ""
11667
"Discovering What Has Diverged\n"
11668
"-----------------------------"
11669
msgstr ""
11670
11671
#: en/help_topics/diverged-branches.txt:20
11672
msgid ""
11673
"The ``bzr missing`` command is used to find out what revisions are in "
11674
"another\n"
11675
"branch that are not present in the current branch, and vice-versa. It shows "
11676
"a\n"
11677
"summary of which extra revisions exist in each branch. If you want to see "
11678
"the\n"
11679
"precise effects of those revisions, you can use ``bzr diff --"
11680
"old=other_branch``\n"
11681
"to show the differences between other_branch and your current branch."
11682
msgstr ""
11683
11684
#: en/help_topics/diverged-branches.txt:26
11685
msgid ""
11686
"A Solution\n"
11687
"----------"
11688
msgstr ""
11689
11690
#: en/help_topics/diverged-branches.txt:29
11691
msgid ""
11692
"The solution is to merge the revisions from the mainline into your local\n"
11693
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11694
"mainline. This merge may result in conflicts if the other developer's "
11695
"changes\n"
11696
"overlap with your changes. These conflicts should be resolved before\n"
11697
"continuing. After any conflicts have been resolved, or even if there were "
11698
"no\n"
11699
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11700
"to your local branch. This requirement gives you an opportunity to test "
11701
"the\n"
11702
"resulting working tree for correctness, since the merged revisions could "
11703
"have\n"
11704
"made arbitrary changes. After testing, you should commit the merge using\n"
11705
"``bzr commit``. This clears up the diverged branches situation. Your "
11706
"local\n"
11707
"branch can now be pushed to the mainline.\n"
11708
msgstr ""
11709
11710
#: en/help_topics/env-variables.txt:1
11711
msgid "Environment Variables"
11712
msgstr "Umgebungsvariablen"
11713
11714
#: en/help_topics/env-variables.txt:3
11715
msgid ""
11716
"=================== "
11717
"===========================================================\n"
11718
"BZRPATH Path where bzr is to look for shell plugin external\n"
11719
" commands.\n"
11720
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11721
"EMAIL E-Mail address of the user.\n"
11722
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11723
"EDITOR Editor for editing commit messages.\n"
11724
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11725
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11726
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11727
"BZR_PLUGIN_PATH.\n"
11728
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11729
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11730
"and\n"
11731
" HOME.\n"
11732
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11733
"URLs).\n"
11734
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11735
"sshcorp,\n"
11736
" plink or lsh.\n"
11737
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11738
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11739
"BZR_COLUMNS Override implicit terminal width.\n"
11740
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11741
"(selftest)\n"
11742
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11743
"'text'.\n"
11744
"BZR_PDB Control whether to launch a debugger on error.\n"
11745
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11746
" breakin debugger.\n"
11747
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11748
"(instead\n"
11749
" of char-based).\n"
11750
"=================== "
11751
"===========================================================\n"
11752
msgstr ""
11753
11754
#: en/help_topics/eol.txt:1
11755
msgid ""
11756
"End of Line Conversion\n"
11757
"======================"
11758
msgstr ""
11759
11760
#: en/help_topics/eol.txt:4
11761
msgid ""
11762
"EOL conversion is provided as a content filter where Bazaar internally\n"
11763
"stores a canonical format but outputs a convenience format. See\n"
11764
"``bzr help content-filters`` for general information about using these."
11765
msgstr ""
11766
11767
#: en/help_topics/eol.txt:8
11768
msgid ""
11769
"Note: Content filtering is only supported in recently added formats,\n"
11770
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11771
"in a recent format. (Just setting the format on the repository\n"
11772
"is not enough.) If content filtering does not appear to be working, use\n"
11773
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11774
"or later."
11775
msgstr ""
11776
11777
#: en/help_topics/eol.txt:15
11778
msgid ""
11779
"EOL conversion needs to be enabled for selected file patterns using\n"
11780
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11781
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11782
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11783
"supported in a future verison of Bazaar."
11784
msgstr ""
11785
11786
#: en/help_topics/eol.txt:21
11787
msgid ""
11788
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11789
"(If a value is not set, ``exact`` is the default.)"
11790
msgstr ""
11791
11792
#: en/help_topics/eol.txt:24
11793
msgid ""
11794
" ========== ===================================== ======================\n"
11795
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11796
" ========== ===================================== ======================\n"
11797
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11798
" ---------- ------------------------------------- ----------------------\n"
11799
" ``lf`` ``lf`` ``lf``\n"
11800
" ---------- ------------------------------------- ----------------------\n"
11801
" ``crlf`` ``crlf`` ``lf``\n"
11802
" ---------- ------------------------------------- ----------------------\n"
11803
" ``exact`` No conversion Exactly as in file\n"
11804
" ========== ===================================== ======================"
11805
msgstr ""
11806
11807
#: en/help_topics/eol.txt:36
11808
msgid ""
11809
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11810
"byte is detected in the file."
11811
msgstr ""
11812
11813
#: en/help_topics/eol.txt:39
11814
msgid ""
11815
"For users working on a cross-platform project, here is a suggested rule\n"
11816
"to use as a starting point::"
11817
msgstr ""
11818
11819
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11820
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11821
msgid ""
11822
" [name *]\n"
11823
" eol = native"
11824
msgstr ""
11825
11826
#: en/help_topics/eol.txt:45
11827
msgid ""
11828
"If you have binary files that do not contain a null byte though, be\n"
11829
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11830
"by giving more explicit patterns earlier in the rules file. For example::"
11831
msgstr ""
11832
11833
#: en/help_topics/eol.txt:49
11834
msgid ""
11835
" [name *.png]\n"
11836
" eol = exact"
11837
msgstr ""
11838
11839
#: en/help_topics/eol.txt:55
11840
msgid ""
11841
"If your working tree is on a network drive shared by users on different\n"
11842
"operating systems, you typically want to force certain conventions for\n"
11843
"certain files. In that way, if a file is created with the wrong line\n"
11844
"endings or line endings get mixed during editing, it gets committed\n"
11845
"correctly and gets checked out correctly. For example::"
11846
msgstr ""
11847
11848
#: en/help_topics/eol.txt:61
11849
msgid ""
11850
" [name *.bat]\n"
11851
" eol = crlf"
11852
msgstr ""
11853
11854
#: en/help_topics/eol.txt:64
11855
msgid ""
11856
" [name *.sh]\n"
11857
" eol = lf"
11858
msgstr ""
11859
11860
#: en/help_topics/eol.txt:70
11861
msgid ""
11862
"If you take the care to create files with their required endings, you can\n"
11863
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11864
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11865
"introducing mixed line endings will be corrected during commit for files\n"
11866
"with those settings."
11867
msgstr ""
11868
11869
#: en/help_topics/eol.txt:76
11870
msgid ""
11871
"If you have sample test data that deliberately has text files with mixed\n"
11872
"newline conventions, you can ask for those to be left alone like this::"
11873
msgstr ""
11874
11875
#: en/help_topics/eol.txt:79
11876
msgid ""
11877
" [name test_data/]\n"
11878
" eol = exact"
11879
msgstr ""
11880
11881
#: en/help_topics/eol.txt:85
11882
msgid ""
11883
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11884
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11885
"of content analysis to detect binary files for commands like ``diff``.\n"
11886
"In the future, a ``binary = true`` rule may be added but it is not\n"
11887
"supported yet.)"
11888
msgstr ""
11889
11890
#: en/help_topics/eol.txt:91
11891
msgid ""
11892
"If you have an existing repository with text files already stored using\n"
11893
"Windows newline conventions (``crlf``), then you may want to keep using "
11894
"that\n"
11895
"convention in the repository. Forcing certain files to this convention\n"
11896
"may also help users who do not have rules configured. To do this, set\n"
11897
"``eol`` to one of the values below."
11898
msgstr ""
11899
11900
#: en/help_topics/eol.txt:97
11901
msgid ""
11902
" ============================ ======================== "
11903
"======================\n"
11904
" Value Checkout end-of-lines as Commit end-of-lines "
11905
"as\n"
11906
" ============================ ======================== "
11907
"======================\n"
11908
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11909
" ``lf`` otherwise\n"
11910
" ---------------------------- ------------------------ ----------------------"
11911
"\n"
11912
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11913
" ---------------------------- ------------------------ ----------------------"
11914
"\n"
11915
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11916
" ============================ ======================== ======================"
11917
msgstr ""
11918
11919
#: en/help_topics/eol.txt:108
11920
msgid ""
11921
"For users working on an existing project that uses Windows newline\n"
11922
"conventions in their Bazaar repository, this rule is suggested as a\n"
11923
"starting point::"
11924
msgstr ""
11925
11926
#: en/help_topics/eol.txt:112
11927
msgid ""
11928
" [name *]\n"
11929
" eol = native-with-crlf-in-repo"
11930
msgstr ""
11931
11932
#: en/help_topics/eol.txt:115
11933
msgid ""
11934
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11935
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11936
"``crlf`` and ``exact``."
11937
msgstr ""
11938
11939
#: en/help_topics/eol.txt:119
11940
msgid ""
11941
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11942
"never reject files because a given line ending or mixed line endings\n"
11943
"are found. A precommit hook should be used if you wish to validate\n"
11944
"(and not just convert) content before committing.\n"
11945
msgstr ""
11946
11947
#: en/help_topics/hidden-commands.txt:1
11948
msgid ""
11949
"added List files added in working tree.\n"
11950
"ancestry List all revisions merged into this branch.\n"
11951
"assert-fail Test reporting of assertion failures\n"
11952
"bundle-info Output interesting stats about a bundle\n"
11953
"bundle-revisions Create a merge-directive for submitting changes.\n"
11954
"cat-revision Write out metadata for a revision.\n"
11955
"dump-btree Dump the contents of a btree index file to stdout.\n"
11956
"export-pot Export command helps and error messages in po format.\n"
11957
"file-id Print file_id of a particular file or directory.\n"
11958
"file-path Print path of file_ids to a file or directory.\n"
11959
"find-merge-base Find and print a base revision for merging two "
11960
"branches.\n"
11961
"hooks Show hooks.\n"
11962
"inventory Show inventory of the current working copy or a "
11963
"revision.\n"
11964
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11965
"lookup-revision Lookup the revision-id from a revision-number\n"
11966
"merge-directive Generate a merge directive for auto-merge tools.\n"
11967
"modified List files modified in working tree.\n"
11968
"re-sign Create a digital signature for an existing revision.\n"
11969
"reference list, view and set branch locations for nested trees.\n"
11970
"relpath Show path of a file relative to root\n"
11971
"repair-workingtree Reset the working tree state file.\n"
11972
"revision-history Display the list of revision ids on a branch.\n"
11973
"revision-info Show revision number and revision id for a given "
11974
"revision\n"
11975
" identifier.\n"
11976
"rocks Statement of optimism.\n"
11977
"selftest Run internal test suite.\n"
11978
"shell-complete Show appropriate completions for context.\n"
11979
"test-script Run a shell-like test from a file.\n"
11980
"touching-revisions Return revision-ids which affected a particular file.\n"
11981
"unknowns List unknown files.\n"
11982
"wait-until-signalled Test helper for\n"
11983
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11984
msgstr ""
11985
11986
#: en/help_topics/hooks.txt:1
11987
msgid ""
11988
"\n"
11989
"Hooks\n"
11990
"====="
11991
msgstr ""
11992
11993
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11994
msgid ""
11995
"Introduction\n"
11996
"------------"
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:8
12000
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12001
msgstr ""
12002
12003
#: en/help_topics/hooks.txt:10
12004
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12005
msgstr ""
12006
12007
#: en/help_topics/hooks.txt:12
12008
msgid ""
12009
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12010
msgstr ""
12011
12012
#: en/help_topics/hooks.txt:14
12013
msgid ""
12014
"The class that contains each hook is given before the hooks it supplies. "
12015
"For\n"
12016
"instance, BranchHooks as the class is the hooks class for\n"
12017
"`bzrlib.branch.Branch.hooks`."
12018
msgstr ""
12019
12020
#: en/help_topics/hooks.txt:18
12021
msgid ""
12022
"Each description also indicates whether the hook runs on the client (the\n"
12023
"machine where bzr was invoked) or the server (the machine addressed by\n"
12024
"the branch URL). These may be, but are not necessarily, the same machine."
12025
msgstr ""
12026
12027
#: en/help_topics/hooks.txt:22
12028
msgid ""
12029
"Plugins (including hooks) are run on the server if all of these is true:"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:24
12033
msgid ""
12034
" * The connection is via a smart server (accessed with a URL starting with\n"
12035
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12036
"\"http://\"\n"
12037
" URL when a smart server is available via HTTP)."
12038
msgstr ""
12039
12040
#: en/help_topics/hooks.txt:28
12041
msgid ""
12042
" * The hook is either server specific or part of general infrastructure "
12043
"rather\n"
12044
" than client specific code (such as commit)."
12045
msgstr ""
12046
12047
#: en/help_topics/hooks.txt:31
12048
msgid ""
12049
"\n"
12050
"BranchHooks\n"
12051
"-----------"
12052
msgstr ""
12053
12054
#: en/help_topics/hooks.txt:35
12055
msgid ""
12056
"automatic_tag_name\n"
12057
"~~~~~~~~~~~~~~~~~~"
12058
msgstr ""
12059
12060
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12061
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12062
msgid "Introduced in: 2.2"
12063
msgstr ""
12064
12065
#: en/help_topics/hooks.txt:40
12066
msgid ""
12067
"Called to determine an automatic tag name for a revision.\n"
12068
"automatic_tag_name is called with (branch, revision_id) and should\n"
12069
"return a tag name or None if no tag name could be determined. The\n"
12070
"first non-None tag name returned will be used."
12071
msgstr ""
12072
12073
#: en/help_topics/hooks.txt:45
12074
msgid ""
12075
"open\n"
12076
"~~~~"
12077
msgstr ""
12078
12079
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12080
#: en/help_topics/hooks.txt:307
12081
msgid "Introduced in: 1.8"
12082
msgstr ""
12083
12084
#: en/help_topics/hooks.txt:50
12085
msgid ""
12086
"Called with the Branch object that has been opened after a branch is\n"
12087
"opened."
12088
msgstr ""
12089
12090
#: en/help_topics/hooks.txt:53
12091
msgid ""
12092
"post_branch_init\n"
12093
"~~~~~~~~~~~~~~~~"
12094
msgstr ""
12095
12096
#: en/help_topics/hooks.txt:58
12097
msgid ""
12098
"Called after new branch initialization completes. post_branch_init is\n"
12099
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12100
"branch and checkout (both heavyweight and lightweight) will all\n"
12101
"trigger this hook."
12102
msgstr ""
12103
12104
#: en/help_topics/hooks.txt:63
12105
msgid ""
12106
"post_change_branch_tip\n"
12107
"~~~~~~~~~~~~~~~~~~~~~~"
12108
msgstr ""
12109
12110
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12111
msgid "Introduced in: 1.4"
12112
msgstr ""
12113
12114
#: en/help_topics/hooks.txt:68
12115
msgid ""
12116
"Called in bzr client and server after a change to the tip of a branch\n"
12117
"is made. post_change_branch_tip is called with a\n"
12118
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12119
"uncommit will all trigger this hook."
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12123
msgid ""
12124
"post_commit\n"
12125
"~~~~~~~~~~~"
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12129
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12130
msgid "Introduced in: 0.15"
12131
msgstr ""
12132
12133
#: en/help_topics/hooks.txt:78
12134
msgid ""
12135
"Called in the bzr client after a commit has completed. post_commit is\n"
12136
"called with (local, master, old_revno, old_revid, new_revno,\n"
12137
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12138
"branch."
12139
msgstr ""
12140
12141
#: en/help_topics/hooks.txt:83
12142
msgid ""
12143
"post_pull\n"
12144
"~~~~~~~~~"
12145
msgstr ""
12146
12147
#: en/help_topics/hooks.txt:88
12148
msgid ""
12149
"Called after a pull operation completes. post_pull is called with a\n"
12150
"bzrlib.branch.PullResult object and only runs in the bzr client."
12151
msgstr ""
12152
12153
#: en/help_topics/hooks.txt:91
12154
msgid ""
12155
"post_push\n"
12156
"~~~~~~~~~"
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:96
12160
msgid ""
12161
"Called after a push operation completes. post_push is called with a\n"
12162
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:99
12166
msgid ""
12167
"post_switch\n"
12168
"~~~~~~~~~~~"
12169
msgstr ""
12170
12171
#: en/help_topics/hooks.txt:104
12172
msgid ""
12173
"Called after a checkout switches branch. post_switch is called with a\n"
12174
"bzrlib.branch.SwitchHookParams."
12175
msgstr ""
12176
12177
#: en/help_topics/hooks.txt:107
12178
msgid ""
12179
"post_uncommit\n"
12180
"~~~~~~~~~~~~~"
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:112
12184
msgid ""
12185
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12186
"called with (local, master, old_revno, old_revid, new_revno,\n"
12187
"new_revid) where local is the local branch or None, master is the\n"
12188
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12189
"of None."
12190
msgstr ""
12191
12192
#: en/help_topics/hooks.txt:118
12193
msgid ""
12194
"pre_change_branch_tip\n"
12195
"~~~~~~~~~~~~~~~~~~~~~"
12196
msgstr ""
12197
12198
#: en/help_topics/hooks.txt:121
12199
msgid "Introduced in: 1.6"
12200
msgstr "Eingeführt in: 1.6"
12201
12202
#: en/help_topics/hooks.txt:123
12203
msgid ""
12204
"Called in bzr client and server before a change to the tip of a branch\n"
12205
"is made. pre_change_branch_tip is called with a\n"
12206
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12207
"uncommit will all trigger this hook."
12208
msgstr ""
12209
12210
#: en/help_topics/hooks.txt:128
12211
msgid ""
12212
"pre_commit\n"
12213
"~~~~~~~~~~"
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:131
12217
msgid "Introduced in: 0.91"
12218
msgstr "Eingeführt in: 0.91"
12219
12220
#: en/help_topics/hooks.txt:133
12221
msgid ""
12222
"Called after a commit is calculated but before it is completed.\n"
12223
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12224
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12225
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12226
"TreeDelta object describing changes from the basis revision. hooks\n"
12227
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12228
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12229
"tree."
12230
msgstr ""
12231
12232
#: en/help_topics/hooks.txt:142
12233
msgid ""
12234
"transform_fallback_location\n"
12235
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12236
msgstr ""
12237
12238
#: en/help_topics/hooks.txt:145
12239
msgid "Introduced in: 1.9"
12240
msgstr "Eingeführt in: 1.9"
12241
12242
#: en/help_topics/hooks.txt:147
12243
msgid ""
12244
"Called when a stacked branch is activating its fallback locations.\n"
12245
"transform_fallback_location is called with (branch, url), and should\n"
12246
"return a new url. Returning the same url allows it to be used as-is,\n"
12247
"returning a different one can be used to cause the branch to stack on\n"
12248
"a closer copy of that fallback_location. Note that the branch cannot\n"
12249
"have history accessing methods called on it during this hook because\n"
12250
"the fallback locations have not been activated. When there are\n"
12251
"multiple hooks installed for transform_fallback_location, all are\n"
12252
"called with the url returned from the previous hook.The order is\n"
12253
"however undefined."
12254
msgstr ""
12255
12256
#: en/help_topics/hooks.txt:158
12257
msgid ""
12258
"CommandHooks\n"
12259
"------------"
12260
msgstr ""
12261
12262
#: en/help_topics/hooks.txt:161
12263
msgid ""
12264
"extend_command\n"
12265
"~~~~~~~~~~~~~~"
12266
msgstr ""
12267
12268
#: en/help_topics/hooks.txt:164
12269
msgid "Introduced in: 1.13"
12270
msgstr "Eingeführt in: 1.13"
12271
12272
#: en/help_topics/hooks.txt:166
12273
msgid ""
12274
"Called after creating a command object to allow modifications such as\n"
12275
"adding or removing options, docs etc. Called with the new\n"
12276
"bzrlib.commands.Command object."
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:170
12280
msgid ""
12281
"get_command\n"
12282
"~~~~~~~~~~~"
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12286
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12287
msgid "Introduced in: 1.17"
12288
msgstr "Eingeführt in: 1.17"
12289
12290
#: en/help_topics/hooks.txt:175
12291
msgid ""
12292
"Called when creating a single command. Called with (cmd_or_None,\n"
12293
"command_name). get_command should either return the cmd_or_None\n"
12294
"parameter, or a replacement Command object that should be used for the\n"
12295
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12296
"Many users will prefer to use bzrlib.commands.register_command or\n"
12297
"plugin_cmds.register_lazy."
12298
msgstr ""
12299
12300
#: en/help_topics/hooks.txt:182
12301
msgid ""
12302
"get_missing_command\n"
12303
"~~~~~~~~~~~~~~~~~~~"
12304
msgstr ""
12305
12306
#: en/help_topics/hooks.txt:187
12307
msgid ""
12308
"Called when creating a single command if no command could be found.\n"
12309
"Called with (command_name). get_missing_command should either return\n"
12310
"None, or a Command object to be used for the command."
12311
msgstr ""
12312
12313
#: en/help_topics/hooks.txt:191
12314
msgid ""
12315
"list_commands\n"
12316
"~~~~~~~~~~~~~"
12317
msgstr ""
12318
12319
#: en/help_topics/hooks.txt:196
12320
msgid ""
12321
"Called when enumerating commands. Called with a set of cmd_name\n"
12322
"strings for all the commands found so far. This set is safe to mutate\n"
12323
"- e.g. to remove a command. list_commands should return the updated\n"
12324
"set of command names."
12325
msgstr ""
12326
12327
#: en/help_topics/hooks.txt:201
12328
msgid ""
12329
"post_command\n"
12330
"~~~~~~~~~~~~"
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12334
msgid "Introduced in: 2.6"
12335
msgstr ""
12336
12337
#: en/help_topics/hooks.txt:206
12338
msgid "Called after executing a command. Called with the command object."
12339
msgstr ""
12340
12341
#: en/help_topics/hooks.txt:208
12342
msgid ""
12343
"pre_command\n"
12344
"~~~~~~~~~~~"
12345
msgstr ""
12346
12347
#: en/help_topics/hooks.txt:213
12348
msgid "Called prior to executing a command. Called with the command object."
12349
msgstr ""
12350
12351
#: en/help_topics/hooks.txt:215
12352
msgid ""
12353
"_ConfigHooks\n"
12354
"------------"
12355
msgstr ""
12356
12357
#: en/help_topics/hooks.txt:218
12358
msgid ""
12359
"get\n"
12360
"~~~"
12361
msgstr ""
12362
12363
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12364
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12365
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12366
#: en/help_topics/hooks.txt:446
12367
msgid "Introduced in: 2.4"
12368
msgstr "Eingeführt in: 2.4"
12369
12370
#: en/help_topics/hooks.txt:223
12371
msgid ""
12372
"Invoked when a config option is read. The signature is (stack, name,\n"
12373
"value)."
12374
msgstr ""
12375
12376
#: en/help_topics/hooks.txt:226
12377
msgid ""
12378
"load\n"
12379
"~~~~"
12380
msgstr ""
12381
12382
#: en/help_topics/hooks.txt:231
12383
msgid "Invoked when a config store is loaded. The signature is (store)."
12384
msgstr ""
12385
12386
#: en/help_topics/hooks.txt:233
12387
msgid ""
12388
"remove\n"
12389
"~~~~~~"
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:238
12393
msgid ""
12394
"Invoked when a config option is removed. The signature is (stack,\n"
12395
"name)."
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:241
12399
msgid ""
12400
"save\n"
12401
"~~~~"
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:246
12405
msgid "Invoked when a config store is saved. The signature is (store)."
12406
msgstr ""
12407
12408
#: en/help_topics/hooks.txt:248
12409
msgid ""
12410
"set\n"
12411
"~~~"
12412
msgstr ""
12413
12414
#: en/help_topics/hooks.txt:253
12415
msgid ""
12416
"Invoked when a config option is set. The signature is (stack, name,\n"
12417
"value)."
12418
msgstr ""
12419
12420
#: en/help_topics/hooks.txt:256
12421
msgid ""
12422
"ControlDirHooks\n"
12423
"---------------"
12424
msgstr ""
12425
12426
#: en/help_topics/hooks.txt:259
12427
msgid ""
12428
"post_repo_init\n"
12429
"~~~~~~~~~~~~~~"
12430
msgstr ""
12431
12432
#: en/help_topics/hooks.txt:264
12433
msgid ""
12434
"Invoked after a repository has been initialized. post_repo_init is\n"
12435
"called with a bzrlib.controldir.RepoInitHookParams."
12436
msgstr ""
12437
12438
#: en/help_topics/hooks.txt:267
12439
msgid ""
12440
"pre_open\n"
12441
"~~~~~~~~"
12442
msgstr ""
12443
12444
#: en/help_topics/hooks.txt:270
12445
msgid "Introduced in: 1.14"
12446
msgstr "Eingeführt in: 1.14"
12447
12448
#: en/help_topics/hooks.txt:272
12449
msgid ""
12450
"Invoked before attempting to open a ControlDir with the transport that\n"
12451
"the open will use."
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:275
12455
msgid ""
12456
"InfoHooks\n"
12457
"---------"
12458
msgstr ""
12459
12460
#: en/help_topics/hooks.txt:278
12461
msgid ""
12462
"repository\n"
12463
"~~~~~~~~~~"
12464
msgstr ""
12465
12466
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12467
#: en/help_topics/hooks.txt:524
12468
msgid "Introduced in: 1.15"
12469
msgstr "Eingeführt in: 1.15"
12470
12471
#: en/help_topics/hooks.txt:283
12472
msgid ""
12473
"Invoked when displaying the statistics for a repository. repository is\n"
12474
"called with a statistics dictionary as returned by the repository and\n"
12475
"a file-like object to write to."
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:287
12479
msgid ""
12480
"LockHooks\n"
12481
"---------"
12482
msgstr ""
12483
12484
#: en/help_topics/hooks.txt:290
12485
msgid ""
12486
"lock_acquired\n"
12487
"~~~~~~~~~~~~~"
12488
msgstr ""
12489
12490
#: en/help_topics/hooks.txt:295
12491
msgid ""
12492
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12493
msgstr ""
12494
12495
#: en/help_topics/hooks.txt:297
12496
msgid ""
12497
"lock_broken\n"
12498
"~~~~~~~~~~~"
12499
msgstr ""
12500
12501
#: en/help_topics/hooks.txt:302
12502
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:304
12506
msgid ""
12507
"lock_released\n"
12508
"~~~~~~~~~~~~~"
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:309
12512
msgid ""
12513
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12514
msgstr ""
12515
12516
#: en/help_topics/hooks.txt:311
12517
msgid ""
12518
"MergeHooks\n"
12519
"----------"
12520
msgstr ""
12521
12522
#: en/help_topics/hooks.txt:314
12523
msgid ""
12524
"merge_file_content\n"
12525
"~~~~~~~~~~~~~~~~~~"
12526
msgstr ""
12527
12528
#: en/help_topics/hooks.txt:317
12529
msgid "Introduced in: 2.1"
12530
msgstr ""
12531
12532
#: en/help_topics/hooks.txt:319
12533
msgid ""
12534
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12535
"object when starting a merge. Should return either None or a subclass\n"
12536
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12537
"called per file that needs to be merged (including when one side has\n"
12538
"deleted the file and the other has changed it). See the\n"
12539
"AbstractPerFileMerger API docs for details on how it is used by merge."
12540
msgstr ""
12541
12542
#: en/help_topics/hooks.txt:326
12543
msgid ""
12544
"post_merge\n"
12545
"~~~~~~~~~~"
12546
msgstr ""
12547
12548
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12549
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12550
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12551
msgid "Introduced in: 2.5"
12552
msgstr ""
12553
12554
#: en/help_topics/hooks.txt:331
12555
msgid ""
12556
"Called after a merge. Receives a Merger object as the single argument.\n"
12557
"The return value is ignored."
12558
msgstr ""
12559
12560
#: en/help_topics/hooks.txt:334
12561
msgid ""
12562
"pre_merge\n"
12563
"~~~~~~~~~"
12564
msgstr ""
12565
12566
#: en/help_topics/hooks.txt:339
12567
msgid ""
12568
"Called before a merge. Receives a Merger object as the single\n"
12569
"argument."
12570
msgstr ""
12571
12572
#: en/help_topics/hooks.txt:342
12573
msgid ""
12574
"MergeDirectiveHooks\n"
12575
"-------------------"
12576
msgstr ""
12577
12578
#: en/help_topics/hooks.txt:345
12579
msgid ""
12580
"merge_request_body\n"
12581
"~~~~~~~~~~~~~~~~~~"
12582
msgstr ""
12583
12584
#: en/help_topics/hooks.txt:348
12585
msgid "Introduced in: 1.15.0"
12586
msgstr ""
12587
12588
#: en/help_topics/hooks.txt:350
12589
msgid ""
12590
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12591
"request. Callbacks must return a body. If more than one callback is\n"
12592
"registered, the output of one callback is provided to the next."
12593
msgstr ""
12594
12595
#: en/help_topics/hooks.txt:354
12596
msgid ""
12597
"MessageEditorHooks\n"
12598
"------------------"
12599
msgstr ""
12600
12601
#: en/help_topics/hooks.txt:357
12602
msgid ""
12603
"commit_message_template\n"
12604
"~~~~~~~~~~~~~~~~~~~~~~~"
12605
msgstr ""
12606
12607
#: en/help_topics/hooks.txt:360
12608
msgid "Introduced in: 1.10"
12609
msgstr ""
12610
12611
#: en/help_topics/hooks.txt:362
12612
msgid ""
12613
"Called when a commit message is being generated.\n"
12614
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12615
"and the message that is known so far. commit_message_template must\n"
12616
"return a new message to use (which could be the same as it was given).\n"
12617
"When there are multiple hooks registered for commit_message_template,\n"
12618
"they are chained with the result from the first passed into the\n"
12619
"second, and so on."
12620
msgstr ""
12621
12622
#: en/help_topics/hooks.txt:370
12623
msgid ""
12624
"set_commit_message\n"
12625
"~~~~~~~~~~~~~~~~~~"
12626
msgstr ""
12627
12628
#: en/help_topics/hooks.txt:375
12629
msgid ""
12630
"Set a fixed commit message. set_commit_message is called with the\n"
12631
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12632
"properties by editing commit.builder._revprops) and the message so\n"
12633
"far. set_commit_message must return the message to use or None if it\n"
12634
"should use the message editor as normal."
12635
msgstr ""
12636
12637
#: en/help_topics/hooks.txt:381
12638
msgid ""
12639
"MutableTreeHooks\n"
12640
"----------------"
12641
msgstr ""
12642
12643
#: en/help_topics/hooks.txt:384
12644
msgid ""
12645
"post_build_tree\n"
12646
"~~~~~~~~~~~~~~~"
12647
msgstr ""
12648
12649
#: en/help_topics/hooks.txt:389
12650
msgid ""
12651
"Called after a completely new tree is built. The hook is called with\n"
12652
"the tree as its only argument."
12653
msgstr ""
12654
12655
#: en/help_topics/hooks.txt:395
12656
msgid "Introduced in: 2.0"
12657
msgstr ""
12658
12659
#: en/help_topics/hooks.txt:397
12660
msgid ""
12661
"Called after a commit is performed on a tree. The hook is called with\n"
12662
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12663
"commit was performed on is available via the mutable_tree attribute of\n"
12664
"that object."
12665
msgstr ""
12666
12667
#: en/help_topics/hooks.txt:402
12668
msgid ""
12669
"post_transform\n"
12670
"~~~~~~~~~~~~~~"
12671
msgstr ""
12672
12673
#: en/help_topics/hooks.txt:407
12674
msgid ""
12675
"Called after a tree transform has been performed on a tree. The hook\n"
12676
"is called with the tree that is being transformed and the transform."
12677
msgstr ""
12678
12679
#: en/help_topics/hooks.txt:410
12680
msgid ""
12681
"pre_transform\n"
12682
"~~~~~~~~~~~~~"
12683
msgstr ""
12684
12685
#: en/help_topics/hooks.txt:415
12686
msgid ""
12687
"Called before a tree transform on this tree. The hook is called with\n"
12688
"the tree that is being transformed and the transform."
12689
msgstr ""
12690
12691
#: en/help_topics/hooks.txt:418
12692
msgid ""
12693
"start_commit\n"
12694
"~~~~~~~~~~~~"
12695
msgstr ""
12696
12697
#: en/help_topics/hooks.txt:423
12698
msgid ""
12699
"Called before a commit is performed on a tree. The start commit hook\n"
12700
"is able to change the tree before the commit takes place. start_commit\n"
12701
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12702
"being performed on."
12703
msgstr ""
12704
12705
#: en/help_topics/hooks.txt:428
12706
msgid ""
12707
"SmartClientHooks\n"
12708
"----------------"
12709
msgstr ""
12710
12711
#: en/help_topics/hooks.txt:431
12712
msgid ""
12713
"call\n"
12714
"~~~~"
12715
msgstr ""
12716
12717
#: en/help_topics/hooks.txt:434
12718
msgid "Introduced in: unknown"
12719
msgstr ""
12720
12721
#: en/help_topics/hooks.txt:436
12722
msgid ""
12723
"Called when the smart client is submitting a request to the smart\n"
12724
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12725
"Streaming request bodies, and responses, are not accessible."
12726
msgstr ""
12727
12728
#: en/help_topics/hooks.txt:440
12729
msgid ""
12730
"SmartServerHooks\n"
12731
"----------------"
12732
msgstr ""
12733
12734
#: en/help_topics/hooks.txt:443
12735
msgid ""
12736
"server_exception\n"
12737
"~~~~~~~~~~~~~~~~"
12738
msgstr ""
12739
12740
#: en/help_topics/hooks.txt:448
12741
msgid ""
12742
"Called by the bzr server when an exception occurs. server_exception is\n"
12743
"called with the sys.exc_info() tuple return true for the hook if the\n"
12744
"exception has been handled, in which case the server will exit\n"
12745
"normally."
12746
msgstr ""
12747
12748
#: en/help_topics/hooks.txt:453
12749
msgid ""
12750
"server_started\n"
12751
"~~~~~~~~~~~~~~"
12752
msgstr ""
12753
12754
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12755
msgid "Introduced in: 0.16"
12756
msgstr ""
12757
12758
#: en/help_topics/hooks.txt:458
12759
msgid ""
12760
"Called by the bzr server when it starts serving a directory.\n"
12761
"server_started is called with (backing urls, public url), where\n"
12762
"backing_url is a list of URLs giving the server-specific directory\n"
12763
"locations, and public_url is the public URL for the directory being\n"
12764
"served."
12765
msgstr ""
12766
12767
#: en/help_topics/hooks.txt:464
12768
msgid ""
12769
"server_started_ex\n"
12770
"~~~~~~~~~~~~~~~~~"
12771
msgstr ""
12772
12773
#: en/help_topics/hooks.txt:469
12774
msgid ""
12775
"Called by the bzr server when it starts serving a directory.\n"
12776
"server_started is called with (backing_urls, server_obj)."
12777
msgstr ""
12778
12779
#: en/help_topics/hooks.txt:472
12780
msgid ""
12781
"server_stopped\n"
12782
"~~~~~~~~~~~~~~"
12783
msgstr ""
12784
12785
#: en/help_topics/hooks.txt:477
12786
msgid ""
12787
"Called by the bzr server when it stops serving a directory.\n"
12788
"server_stopped is called with the same parameters as the\n"
12789
"server_started hook: (backing_urls, public_url)."
12790
msgstr ""
12791
12792
#: en/help_topics/hooks.txt:481
12793
msgid ""
12794
"StatusHooks\n"
12795
"-----------"
12796
msgstr ""
12797
12798
#: en/help_topics/hooks.txt:484
12799
msgid ""
12800
"post_status\n"
12801
"~~~~~~~~~~~"
12802
msgstr ""
12803
12804
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12805
msgid "Introduced in: 2.3"
12806
msgstr ""
12807
12808
#: en/help_topics/hooks.txt:489
12809
msgid ""
12810
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12811
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12812
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12813
"correspond to the command line options specified by the user for the\n"
12814
"status command. to_file is the output stream for writing."
12815
msgstr ""
12816
12817
#: en/help_topics/hooks.txt:495
12818
msgid ""
12819
"pre_status\n"
12820
"~~~~~~~~~~"
12821
msgstr ""
12822
12823
#: en/help_topics/hooks.txt:500
12824
msgid ""
12825
"Called with argument StatusHookParams before Bazaar displays the\n"
12826
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12827
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12828
"correspond to the command line options specified by the user for the\n"
12829
"status command. to_file is the output stream for writing."
12830
msgstr ""
12831
12832
#: en/help_topics/hooks.txt:506
12833
msgid ""
12834
"TransportHooks\n"
12835
"--------------"
12836
msgstr ""
12837
12838
#: en/help_topics/hooks.txt:509
12839
msgid ""
12840
"post_connect\n"
12841
"~~~~~~~~~~~~"
12842
msgstr ""
12843
12844
#: en/help_topics/hooks.txt:514
12845
msgid ""
12846
"Called after a new connection is established or a reconnect occurs.\n"
12847
"The sole argument passed is either the connected transport or smart\n"
12848
"medium instance."
12849
msgstr ""
12850
12851
#: en/help_topics/hooks.txt:518
12852
msgid ""
12853
"RioVersionInfoBuilderHooks\n"
12854
"--------------------------"
12855
msgstr ""
12856
12857
#: en/help_topics/hooks.txt:521
12858
msgid ""
12859
"revision\n"
12860
"~~~~~~~~"
12861
msgstr ""
12862
12863
#: en/help_topics/hooks.txt:526
12864
msgid ""
12865
"Invoked when adding information about a revision to the RIO stanza\n"
12866
"that is printed. revision is called with a revision object and a RIO\n"
12867
"stanza.\n"
12868
msgstr ""
12869
12870
#: en/help_topics/location-alias.txt:1
12871
msgid ""
12872
"Location aliases\n"
12873
"================"
12874
msgstr ""
12875
12876
#: en/help_topics/location-alias.txt:4
12877
msgid ""
12878
"Bazaar defines several aliases for locations associated with a branch. "
12879
"These\n"
12880
"can be used with most commands that expect a location, such as `bzr push`."
12881
msgstr ""
12882
12883
#: en/help_topics/location-alias.txt:7
12884
msgid "The aliases are::"
12885
msgstr ""
12886
12887
#: en/help_topics/location-alias.txt:9
12888
msgid ""
12889
" :bound The branch this branch is bound to, for bound branches.\n"
12890
" :parent The parent of this branch.\n"
12891
" :public The public location of this branch.\n"
12892
" :push The saved location used for `bzr push` with no arguments.\n"
12893
" :submit The submit branch for this branch.\n"
12894
" :this This branch."
12895
msgstr ""
12896
12897
#: en/help_topics/location-alias.txt:16
12898
msgid "For example, to push to the parent location::"
12899
msgstr ""
12900
12901
#: en/help_topics/location-alias.txt:18
12902
msgid " bzr push :parent\n"
12903
msgstr ""
12904
12905
#: en/help_topics/log-formats.txt:1
12906
msgid ""
12907
"Log Formats\n"
12908
"==========="
12909
msgstr ""
12910
12911
#: en/help_topics/log-formats.txt:4
12912
msgid ""
12913
"A log format controls how information about each revision is displayed.\n"
12914
"The standard log formats are compared below::"
12915
msgstr ""
12916
12917
#: en/help_topics/log-formats.txt:7
12918
msgid ""
12919
" Feature long short line\n"
12920
" ---------------------- ------------- ------------ -------------------\n"
12921
" design goal detailed view concise view 1 revision per line\n"
12922
" committer name+email name only name only\n"
12923
" author name+email - -\n"
12924
" date-time format full date only date only\n"
12925
" commit message full full top line\n"
12926
" tags yes yes yes\n"
12927
" merges indicator - yes -\n"
12928
" status/delta optional optional -\n"
12929
" diff/patch optional optional -\n"
12930
" revision-id optional optional -\n"
12931
" branch nick yes - -\n"
12932
" foreign vcs properties yes yes -\n"
12933
" preferred levels all 1 1\n"
12934
" digital signature optional - -"
12935
msgstr ""
12936
12937
#: en/help_topics/log-formats.txt:24
12938
msgid ""
12939
"The default format is ``long``. To change this, define the ``log_format``\n"
12940
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12941
msgstr ""
12942
12943
#: en/help_topics/log-formats.txt:27
12944
msgid ""
12945
" [DEFAULT]\n"
12946
" log_format = short"
12947
msgstr ""
12948
12949
#: en/help_topics/log-formats.txt:30
12950
msgid ""
12951
"Alternatively, to change the log format used for a given query, use the\n"
12952
"--long, --short or --line options."
12953
msgstr ""
12954
12955
#: en/help_topics/log-formats.txt:33
12956
msgid ""
12957
"If one of the standard log formats does not meet your needs, additional\n"
12958
"formats can be provided by plugins.\n"
12959
msgstr ""
12960
12961
#: en/help_topics/other-formats.txt:1
12962
msgid "Other Storage Formats"
12963
msgstr "Andere Speicherformate"
12964
12965
#: en/help_topics/other-formats.txt:3
12966
msgid "Experimental formats are shown below."
12967
msgstr ""
12968
12969
#: en/help_topics/other-formats.txt:5
12970
msgid ""
12971
":development-colo:\n"
12972
" (native) The 2a format with experimental support for colocated\n"
12973
" branches."
12974
msgstr ""
12975
12976
#: en/help_topics/other-formats.txt:9
12977
msgid ""
12978
"\n"
12979
"Deprecated formats are shown below."
12980
msgstr ""
12981
12982
#: en/help_topics/other-formats.txt:12
12983
msgid ""
12984
":pack-0.92:\n"
12985
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12986
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12987
" by bzr < 0.92."
12988
msgstr ""
12989
12990
#: en/help_topics/patterns.txt:1
12991
msgid ""
12992
"Patterns\n"
12993
"========"
12994
msgstr ""
12995
12996
#: en/help_topics/patterns.txt:4
12997
msgid ""
12998
"Bazaar uses patterns to match files at various times. For example,\n"
12999
"the ``add`` command skips over files that match ignore patterns\n"
13000
"and preferences can be associated with files using rule patterns.\n"
13001
"The pattern syntax is described below."
13002
msgstr ""
13003
13004
#: en/help_topics/patterns.txt:9
13005
msgid ""
13006
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13007
"slash or is a regular expression, it is compared to the whole path\n"
13008
"from the branch root. Otherwise, it is compared to only the last\n"
13009
"component of the path. To match a file only in the root directory,\n"
13010
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13011
msgstr ""
13012
13013
#: en/help_topics/patterns.txt:15
13014
msgid "Patterns may include globbing wildcards such as::"
13015
msgstr ""
13016
13017
#: en/help_topics/patterns.txt:17
13018
msgid ""
13019
" ? - Matches any single character except '/'\n"
13020
" * - Matches 0 or more characters except '/'\n"
13021
" /**/ - Matches 0 or more directories in a path\n"
13022
" [a-z] - Matches a single character from within a group of characters"
13023
msgstr ""
13024
13025
#: en/help_topics/patterns.txt:22
13026
msgid ""
13027
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13028
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13029
"expression. Regular expression patterns may not include named or\n"
13030
"numbered groups."
13031
msgstr ""
13032
13033
#: en/help_topics/patterns.txt:27
13034
msgid ""
13035
"Case insensitive ignore patterns can be specified with regular expressions\n"
13036
"by using the ``i`` (for ignore case) flag in the pattern."
13037
msgstr ""
13038
13039
#: en/help_topics/patterns.txt:30
13040
msgid ""
13041
"For example, a case insensitive match for ``foo`` may be specified as::"
13042
msgstr ""
13043
13044
#: en/help_topics/patterns.txt:32
13045
msgid " RE:(?i)foo"
13046
msgstr ""
13047
13048
#: en/help_topics/patterns.txt:34
13049
msgid ""
13050
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13051
"matched by that pattern will not be ignored."
13052
msgstr ""
13053
13054
#: en/help_topics/patterns.txt:37
13055
msgid ""
13056
".. _Python regular expressions: http://docs.python.org/library/re.html"
13057
msgstr ""
13058
13059
#: en/help_topics/revisionspec.txt:1
13060
msgid "Revision Identifiers"
13061
msgstr ""
13062
13063
#: en/help_topics/revisionspec.txt:3
13064
msgid ""
13065
"A revision identifier refers to a specific state of a branch's history. It\n"
13066
"can be expressed in several ways. It can begin with a keyword to\n"
13067
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13068
"'before:yesterday' and 'submit:'."
13069
msgstr ""
13070
13071
#: en/help_topics/revisionspec.txt:8
13072
msgid ""
13073
"Alternately, it can be given without a keyword, in which case it will be\n"
13074
"checked as a revision number, a tag, a revision id, a date specification, or "
13075
"a\n"
13076
"branch specification, in that order. For example, 'date:today' could be\n"
13077
"written as simply 'today', though if you have a tag called 'today' that "
13078
"will\n"
13079
"be found first."
13080
msgstr ""
13081
13082
#: en/help_topics/revisionspec.txt:14
13083
msgid ""
13084
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13085
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13086
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13087
"or\n"
13088
"spaces around the '..')."
13089
msgstr ""
13090
13091
#: en/help_topics/revisionspec.txt:19
13092
msgid ""
13093
"Ranges are interpreted differently by different commands. To the \"log\" "
13094
"command,\n"
13095
"a range is a sequence of log messages, but to the \"diff\" command, the "
13096
"range\n"
13097
"denotes a change between revisions (and not a sequence of changes). In\n"
13098
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13099
"consider it\n"
13100
"to be open-ended, that is, they include one end but not the other. For "
13101
"example:\n"
13102
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13103
"3649,\n"
13104
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13105
"and\n"
13106
"3649, but not 3647."
13107
msgstr ""
13108
13109
#: en/help_topics/revisionspec.txt:28
13110
msgid "The keywords used as revision selection methods are the following:"
13111
msgstr ""
13112
13113
#: en/help_topics/revisionspec.txt:30
13114
msgid ""
13115
":revid:\n"
13116
"\tSelects a revision using the revision id.\n"
13117
":submit:\n"
13118
"\tSelects a common ancestor with the submit branch.\n"
13119
":ancestor:\n"
13120
"\tSelects a common ancestor with a second branch.\n"
13121
":date:\n"
13122
"\tSelects a revision on the basis of a datestamp.\n"
13123
":branch:\n"
13124
"\tSelects the last revision of a specified branch.\n"
13125
":tag:\n"
13126
"\tSelects a revision identified by a tag name.\n"
13127
":revno:\n"
13128
"\tSelects a revision using a number.\n"
13129
":before:\n"
13130
"\tSelects the parent of the revision specified.\n"
13131
":annotate:\n"
13132
"\tSelect the revision that last modified the specified line.\n"
13133
":mainline:\n"
13134
"\tSelect mainline revision that merged the specified revision.\n"
13135
":last:\n"
13136
"\tSelects the nth revision from the end."
13137
msgstr ""
13138
13139
#: en/help_topics/revisionspec.txt:53
13140
msgid "In addition, plugins can provide other keywords."
13141
msgstr ""
13142
13143
#: en/help_topics/revisionspec.txt:55
13144
msgid "A detailed description of each keyword is given below."
13145
msgstr ""
13146
13147
#: en/help_topics/revisionspec.txt:57
13148
msgid ":revid:"
13149
msgstr ":revid:"
13150
13151
#: en/help_topics/revisionspec.txt:59
13152
msgid ""
13153
" Supply a specific revision id, that can be used to specify any\n"
13154
" revision id in the ancestry of the branch.\n"
13155
" Including merges, and pending merges.\n"
13156
" Examples::"
13157
msgstr ""
13158
13159
#: en/help_topics/revisionspec.txt:64
13160
msgid ""
13161
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13162
msgstr ""
13163
13164
#: en/help_topics/revisionspec.txt:66
13165
msgid ":submit:"
13166
msgstr ":submit:"
13167
13168
#: en/help_topics/revisionspec.txt:68
13169
msgid ""
13170
" Diffing against this shows all the changes that were made in this "
13171
"branch,\n"
13172
" and is a good predictor of what merge will do. The submit branch is\n"
13173
" used by the bundle and merge directive commands. If no submit branch\n"
13174
" is specified, the parent branch is used instead."
13175
msgstr ""
13176
13177
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13178
msgid ""
13179
" The common ancestor is the last revision that existed in both\n"
13180
" branches. Usually this is the branch point, but it could also be\n"
13181
" a revision that was merged."
13182
msgstr ""
13183
13184
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13185
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13186
#: en/help_topics/revisionspec.txt:153
13187
msgid " Examples::"
13188
msgstr " Beispiele::"
13189
13190
#: en/help_topics/revisionspec.txt:79
13191
msgid " $ bzr diff -r submit:"
13192
msgstr " $ bzr diff -r submit:"
13193
13194
#: en/help_topics/revisionspec.txt:81
13195
msgid ":ancestor:"
13196
msgstr ":ancestor:"
13197
13198
#: en/help_topics/revisionspec.txt:83
13199
msgid " Supply the path to a branch to select the common ancestor."
13200
msgstr ""
13201
13202
#: en/help_topics/revisionspec.txt:89
13203
msgid ""
13204
" This is frequently used with 'diff' to return all of the changes\n"
13205
" that your branch introduces, while excluding the changes that you\n"
13206
" have not merged from the remote branch."
13207
msgstr ""
13208
13209
#: en/help_topics/revisionspec.txt:95
13210
msgid ""
13211
" ancestor:/path/to/branch\n"
13212
" $ bzr diff -r ancestor:../../mainline/branch"
13213
msgstr ""
13214
13215
#: en/help_topics/revisionspec.txt:98
13216
msgid ":date:"
13217
msgstr ":date:"
13218
13219
#: en/help_topics/revisionspec.txt:100
13220
msgid ""
13221
" Supply a datestamp to select the first revision that matches the date.\n"
13222
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13223
" Matches the first entry after a given date (either at midnight or\n"
13224
" at a specified time)."
13225
msgstr ""
13226
13227
#: en/help_topics/revisionspec.txt:105
13228
msgid " One way to display all the changes since yesterday would be::"
13229
msgstr " Eine Möglichkeit, alle Änderungen seit gestern anzuzeigen wäre:"
13230
13231
#: en/help_topics/revisionspec.txt:107
13232
msgid " bzr log -r date:yesterday.."
13233
msgstr " bzr log -r date:yesterday.."
13234
13235
#: en/help_topics/revisionspec.txt:111
13236
msgid ""
13237
" date:yesterday -> select the first revision since "
13238
"yesterday\n"
13239
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13240
" August 14th, 2006 at 5:10pm."
13241
msgstr ""
13242
13243
#: en/help_topics/revisionspec.txt:115
13244
msgid ":branch:"
13245
msgstr ":branch:"
13246
13247
#: en/help_topics/revisionspec.txt:117
13248
msgid " Supply the path to a branch to select its last revision."
13249
msgstr ""
13250
13251
#: en/help_topics/revisionspec.txt:121
13252
msgid " branch:/path/to/branch"
13253
msgstr " branch:/pfad/zur/branch"
13254
13255
#: en/help_topics/revisionspec.txt:123
13256
msgid ":tag:"
13257
msgstr ":tag:"
13258
13259
#: en/help_topics/revisionspec.txt:125
13260
msgid " Tags are stored in the branch and created by the 'tag' command."
13261
msgstr ""
13262
13263
#: en/help_topics/revisionspec.txt:127
13264
msgid ":revno:"
13265
msgstr ":revno:"
13266
13267
#: en/help_topics/revisionspec.txt:129
13268
msgid ""
13269
" Use an integer to specify a revision in the history of the branch.\n"
13270
" Optionally a branch can be specified. A negative number will count\n"
13271
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13272
" one). If the negative number is larger than the branch's history, the\n"
13273
" first revision is returned.\n"
13274
" Examples::"
13275
msgstr ""
13276
13277
#: en/help_topics/revisionspec.txt:136
13278
msgid ""
13279
" revno:1 -> return the first revision of this branch\n"
13280
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13281
" the branch '/path/to/branch'\n"
13282
" revno:-1 -> The last revision in a branch.\n"
13283
" -2:http://other/branch -> The second to last revision in the\n"
13284
" remote branch.\n"
13285
" -1000000 -> Most likely the first revision, unless\n"
13286
" your history is very long."
13287
msgstr ""
13288
13289
#: en/help_topics/revisionspec.txt:145
13290
msgid ":before:"
13291
msgstr ":before:"
13292
13293
#: en/help_topics/revisionspec.txt:147
13294
msgid ""
13295
" Supply any revision spec to return the parent of that revision. This "
13296
"is\n"
13297
" mostly useful when inspecting revisions that are not in the revision "
13298
"history\n"
13299
" of a branch."
13300
msgstr ""
13301
13302
#: en/help_topics/revisionspec.txt:151
13303
msgid ""
13304
" It is an error to request the parent of the null revision (before:0)."
13305
msgstr ""
13306
13307
#: en/help_topics/revisionspec.txt:155
13308
msgid ""
13309
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13310
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13311
" aaaa@bbbb-1234567890\n"
13312
" bzr diff -r before:1913..1913\n"
13313
" -> Find the changes between revision 1913 and its parent "
13314
"(1912).\n"
13315
" (What changes did revision 1913 introduce).\n"
13316
" This is equivalent to: bzr diff -c 1913"
13317
msgstr ""
13318
13319
#: en/help_topics/revisionspec.txt:163
13320
msgid ":annotate:"
13321
msgstr ":annotate:"
13322
13323
#: en/help_topics/revisionspec.txt:165
13324
msgid ""
13325
" Select the revision that last modified the specified line. Line is\n"
13326
" specified as path:number. Path is a relative path to the file. "
13327
"Numbers\n"
13328
" start at 1, and are relative to the current version, not the last-\n"
13329
" committed version of the file."
13330
msgstr ""
13331
13332
#: en/help_topics/revisionspec.txt:170
13333
msgid ":mainline:"
13334
msgstr ":mainline:"
13335
13336
#: en/help_topics/revisionspec.txt:172
13337
msgid ""
13338
" Select the revision that merged the specified revision into mainline."
13339
msgstr ""
13340
13341
#: en/help_topics/revisionspec.txt:174
13342
msgid ":last:"
13343
msgstr ""
13344
13345
#: en/help_topics/revisionspec.txt:176
13346
msgid ""
13347
" Supply a positive number to get the nth revision from the end.\n"
13348
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13349
" Examples::"
13350
msgstr ""
13351
13352
#: en/help_topics/revisionspec.txt:180
13353
msgid ""
13354
" last:1 -> return the last revision\n"
13355
" last:3 -> return the revision 2 before the end.\n"
13356
msgstr ""
13357
" last:1 -> Gibt die letzte Version zurück\n"
13358
" last:3 -> Gibt die Version zwei vor dem Ende zurück\n"
13359
13360
#: en/help_topics/rules.txt:1
13361
msgid ""
13362
"Rules\n"
13363
"====="
13364
msgstr ""
13365
"Regeln\n"
13366
"======"
13367
13368
#: en/help_topics/rules.txt:7
13369
msgid ""
13370
"Rules are defined in ini file format where the sections are file glob\n"
13371
"patterns and the contents of each section are the preferences for files\n"
13372
"matching that pattern(s). For example::"
13373
msgstr ""
13374
13375
#: en/help_topics/rules.txt:11
13376
msgid ""
13377
" [name *.bat]\n"
13378
" eol = native"
13379
msgstr ""
13380
13381
#: en/help_topics/rules.txt:14
13382
msgid ""
13383
" [name *.html *.xml]\n"
13384
" keywords = xml_escape"
13385
msgstr ""
13386
13387
#: en/help_topics/rules.txt:17
13388
msgid ""
13389
"Preferences like these are useful for commands and plugins wishing to\n"
13390
"provide custom behaviour for selected files. For more information on \n"
13391
"end of line conversion see :doc:`eol-help`.\n"
13392
"Keyword support is provided by the `keywords plugin\n"
13393
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13394
msgstr ""
13395
13396
#: en/help_topics/rules.txt:23
13397
msgid ""
13398
"Files\n"
13399
"-----"
13400
msgstr ""
13401
"Dateien\n"
13402
"-------"
13403
13404
#: en/help_topics/rules.txt:26
13405
msgid ""
13406
"Default rules for all branches are defined in the optional file\n"
13407
"``BZR_HOME/rules``. "
13408
msgstr ""
13409
13410
#: en/help_topics/rules.txt:29
13411
msgid ""
13412
"Rule Patterns\n"
13413
"-------------"
13414
msgstr ""
13415
"Regel-Muster\n"
13416
"-------------"
13417
13418
#: en/help_topics/rules.txt:32
13419
msgid ""
13420
"Patterns are ordered and searching stops as soon as one matches.\n"
13421
"As a consequence, more explicit patterns should be placed towards\n"
13422
"the top of the file. Rule patterns use exactly the same conventions\n"
13423
"as ignore patterns. See :doc:`patterns-help` for details."
13424
msgstr ""
13425
13426
#: en/help_topics/rules.txt:37
13427
msgid ".. note::"
13428
msgstr ""
13429
13430
#: en/help_topics/rules.txt:39
13431
msgid ""
13432
" Patterns containing square brackets or spaces should be\n"
13433
" surrounded in quotes to ensure they are correctly parsed.\n"
13434
msgstr ""
13435
13436
#: en/help_topics/topics.txt:1
13437
msgid ""
13438
"authentication Information on configuring authentication\n"
13439
"basic Basic commands\n"
13440
"branches Information on what a branch is\n"
13441
"bugs Bug tracker settings\n"
13442
"checkouts Information on what a checkout is\n"
13443
"commands Basic help for all commands\n"
13444
"configuration Details on the configuration settings available\n"
13445
"conflict-types Types of conflicts and what to do about them\n"
13446
"content-filters Conversion of content into/from working trees\n"
13447
"criss-cross Information on criss-cross merging\n"
13448
"current-formats Current storage formats\n"
13449
"debug-flags Options to show or record debug information\n"
13450
"diverged-branches How to fix diverged branches\n"
13451
"env-variables Environment variable names and values\n"
13452
"eol Information on end-of-line handling\n"
13453
"files Information on configuration and log files\n"
13454
"formats Information on choosing a storage format\n"
13455
"global-options Options that control how Bazaar runs\n"
13456
"hidden-commands All hidden commands\n"
13457
"hooks Points at which custom processing can be added\n"
13458
"launchpad Using Bazaar with Launchpad.net\n"
13459
"location-alias Aliases for remembered locations\n"
13460
"log-formats Details on the logging formats available\n"
13461
"other-formats Experimental and deprecated storage formats\n"
13462
"patterns Information on the pattern syntax\n"
13463
"repositories Basic information on shared repositories.\n"
13464
"revisionspec Explain how to use --revision\n"
13465
"rules Information on defining rule-based preferences\n"
13466
"standalone-trees Information on what a standalone tree is\n"
13467
"standard-options Options that can be used with any command\n"
13468
"status-flags Help on status flags\n"
13469
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13470
"topics Topics list\n"
13471
"url-special-chars Special character handling in URLs\n"
13472
"urlspec Supported transport protocols\n"
13473
"working-trees Information on working trees\n"
13474
msgstr ""
13475
13476
#: en/help_topics/url-special-chars.txt:1
13477
msgid ""
13478
"Special character handling in URLs\n"
13479
"=================================="
13480
msgstr ""
13481
13482
#: en/help_topics/url-special-chars.txt:4
13483
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13484
msgstr ""
13485
13486
#: en/help_topics/url-special-chars.txt:6
13487
msgid " * Fully qualified URLs"
13488
msgstr ""
13489
13490
#: en/help_topics/url-special-chars.txt:8
13491
msgid " * File system paths, relative or absolute"
13492
msgstr ""
13493
13494
#: en/help_topics/url-special-chars.txt:10
13495
msgid ""
13496
"Internally bzr treats all locations as URLs. For any file system paths\n"
13497
"that are specified it will automatically determine the appropriate URL\n"
13498
"representation, and escape special characters where necessary."
13499
msgstr ""
13500
13501
#: en/help_topics/url-special-chars.txt:14
13502
msgid ""
13503
"There are a few characters which have special meaning in URLs and need "
13504
"careful\n"
13505
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13506
"value in URLs. Any non-ASCII characters in a file path will automatically "
13507
"be\n"
13508
"urlencoded when the path is converted to a URL."
13509
msgstr ""
13510
13511
#: en/help_topics/url-special-chars.txt:19
13512
msgid ""
13513
"URLs represent non-ASCII characters in an encoding defined by the server, "
13514
"but\n"
13515
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13516
"be\n"
13517
"generous in what it accepts as a URL and to print them in a way that\n"
13518
"will be readable."
13519
msgstr ""
13520
13521
#: en/help_topics/url-special-chars.txt:24
13522
msgid ""
13523
"For example, if you have a directory named '/tmp/%2False' these are all "
13524
"valid\n"
13525
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13526
"slash)::"
13527
msgstr ""
13528
13529
#: en/help_topics/url-special-chars.txt:27
13530
msgid ""
13531
" cd /tmp\n"
13532
" bzr log /tmp/%2False\n"
13533
" bzr log %2False\n"
13534
" bzr log file:///tmp/%252False\n"
13535
" bzr log file://localhost/tmp/%252False\n"
13536
" bzr log file:%252False"
13537
msgstr ""
13538
" cd /tmp\n"
13539
" bzr log /tmp/%2False\n"
13540
" bzr log %2False\n"
13541
" bzr log file:///tmp/%252False\n"
13542
" bzr log file://localhost/tmp/%252False\n"
13543
" bzr log file:%252False"
13544
13545
#: en/help_topics/url-special-chars.txt:34
13546
msgid "These are valid but do not refer to the same file::"
13547
msgstr ""
13548
13549
#: en/help_topics/url-special-chars.txt:36
13550
msgid ""
13551
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13552
" bzr log %252False (refers to a file called /tmp/%252False)"
13553
msgstr ""
13554
13555
#: en/help_topics/url-special-chars.txt:39
13556
msgid ""
13557
"Comma also has special meaning in URLs, because it denotes `segment "
13558
"parameters`_"
13559
msgstr ""
13560
"Kommatas haben eine spezielle Bedeutung in URLs und markieren "
13561
"`Abschnittparameter`_"
13562
13563
#: en/help_topics/url-special-chars.txt:41
13564
msgid ""
13565
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13566
msgstr ""
13567
13568
#: en/help_topics/url-special-chars.txt:43
13569
msgid ""
13570
"Comma is also special in any file system paths that are specified. To use a "
13571
"literal\n"
13572
"comma in a file system path, specify a URL and URL encode the comma::"
13573
msgstr ""
13574
13575
#: en/help_topics/url-special-chars.txt:46
13576
msgid ""
13577
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13578
"\"branch\" set to \"bla\"\n"
13579
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13580
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13581
"\"branch\" set to \"bla\"\n"
13582
msgstr ""
13583
13584
#: en/help_topics/urlspec.txt:1
13585
msgid "URL Identifiers"
13586
msgstr ""
13587
13588
#: en/help_topics/urlspec.txt:3
13589
msgid "Supported URL prefixes::"
13590
msgstr "Unterstützte URL-Präfixe::"
13591
13592
#: en/help_topics/urlspec.txt:5
13593
msgid ""
13594
" aftp:// Access using active FTP.\n"
13595
" bzr:// Fast access using the Bazaar smart server.\n"
13596
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13597
" file:// Access using the standard filesystem (default)\n"
13598
" ftp:// Access using passive FTP.\n"
13599
" http:// Read-only access of branches exported on the web.\n"
13600
" https:// Read-only access of branches exported on the web using "
13601
"SSL.\n"
13602
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13603
msgstr ""
13604
13605
#: en/help_topics/urlspec.txt:14
13606
msgid "Supported modifiers::"
13607
msgstr "Unterstützte Modifikatoren::"
13608
13609
#: en/help_topics/urlspec.txt:16
13610
msgid " gio+ Access using any GIO supported protocols."
13611
msgstr ""
13612
13613
#: en/help_topics/urlspec.txt:18
13614
msgid "Bazaar supports all of the standard parts within the URL::"
13615
msgstr ""
13616
13617
#: en/help_topics/urlspec.txt:20
13618
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13619
msgstr ""
13620
13621
#: en/help_topics/urlspec.txt:22
13622
msgid "allowing URLs such as::"
13623
msgstr ""
13624
13625
#: en/help_topics/urlspec.txt:24
13626
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13627
msgstr " http://bzruser:BadPass@bzr.beispiel.de:8080/bzr/trunk"
13628
13629
#: en/help_topics/urlspec.txt:26
13630
msgid ""
13631
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13632
"with '~' as meaning that the rest of the path should be interpreted\n"
13633
"relative to the remote user's home directory. For example if the user\n"
13634
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13635
"shell.example.com, then::"
13636
msgstr ""
13637
13638
#: en/help_topics/urlspec.txt:32
13639
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13640
msgstr " bzr+ssh://remote@shell.beispiel.de/~/meinprojekt/trunk"
13641
13642
#: en/help_topics/urlspec.txt:34
13643
msgid "would refer to ``/home/remote/myproject/trunk``."
13644
msgstr "Würde verweisen auf »/home/remote/meinprojekt/trunk«."
13645
13646
#: en/help_topics/urlspec.txt:36
13647
msgid ""
13648
"Many commands that accept URLs also accept location aliases too.\n"
13649
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13650
msgstr ""
13651
"Viele Kommandos die URLs akzeptieren, akzeptieren auch Platzaliase.\n"
13652
"Siehe :doc:`location-alias-help` und :doc:`url-special-chars-help`.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1