« back to all changes in this revision
Viewing changes to po/de.po
- browse files at revision 6582.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6582.1.1
- Committer: Vincent Ladeuil
- Date: 2013-07-27 12:53:28 UTC
- mto: This revision was merged to the branch mainline in revision 6583.
- Revision ID: v.ladeuil+lp@free.fr-20130727125328-b5e0mzrfrpmnmy9t
Open trunk again as 2.7b1
- files added:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- files modified:
- .bzrignore
added
removed
po/de.po
1
# German translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
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-22 14:19+0000\n"
12
"Last-Translator: Phillip Sz <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-02-23 04:35+0000\n"
19
"X-Generator: Launchpad (build 16506)\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
845
#: bzrlib/builtins.py:1586
846
msgid "(default)"
847
msgstr "(Vorgabe)"
848
849
#: bzrlib/builtins.py:1598
850
msgid "Create a new checkout of an existing branch."
851
msgstr ""
852
853
#: bzrlib/builtins.py:1600
854
msgid ""
855
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
856
"for\n"
857
"the branch found in '.'. This is useful if you have removed the working "
858
"tree\n"
859
"or if it was never created - i.e. if you pushed the branch to its current\n"
860
"location using SFTP."
861
msgstr ""
862
863
#: bzrlib/builtins.py:1605
864
msgid ""
865
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
866
"will\n"
867
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
868
"./bar.\n"
869
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
870
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
871
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
872
"create ./foo-bar."
873
msgstr ""
874
875
#: bzrlib/builtins.py:1612
876
msgid ""
877
"To retrieve the branch as of a particular revision, supply the --revision\n"
878
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
879
"immediately\n"
880
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
881
"old\n"
882
"code.)"
883
msgstr ""
884
885
#: bzrlib/builtins.py:1622
886
msgid ""
887
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
888
"the branch for every operation. Normal checkouts can perform common "
889
"operations like diff and status without such access, and also support local "
890
"commits."
891
msgstr ""
892
893
#: bzrlib/builtins.py:1629
894
msgid "Get file contents from this tree."
895
msgstr ""
896
897
#: bzrlib/builtins.py:1631
898
msgid "Hard-link working tree files where possible."
899
msgstr ""
900
901
#: bzrlib/builtins.py:1672
902
msgid ""
903
"Show list of renamed files.\n"
904
" "
905
msgstr ""
906
"Liste der umbenannten Dateien zeigen.\n"
907
" "
908
909
#: bzrlib/builtins.py:1700
910
msgid "Update a working tree to a new revision."
911
msgstr ""
912
913
#: bzrlib/builtins.py:1702
914
msgid ""
915
"This will perform a merge of the destination revision (the tip of the\n"
916
"branch, or the specified revision) into the working tree, and then make\n"
917
"that revision the basis revision for the working tree. "
918
msgstr ""
919
920
#: bzrlib/builtins.py:1706
921
msgid ""
922
"You can use this to visit an older revision, or to update a working tree\n"
923
"that is out of date from its branch."
924
msgstr ""
925
926
#: bzrlib/builtins.py:1709
927
msgid ""
928
"If there are any uncommitted changes in the tree, they will be carried\n"
929
"across and remain as uncommitted changes after the update. To discard\n"
930
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
931
"with the changes brought in by the change in basis revision."
932
msgstr ""
933
934
#: bzrlib/builtins.py:1714
935
msgid ""
936
"If the tree's branch is bound to a master branch, bzr will also update\n"
937
"the branch from the master."
938
msgstr ""
939
940
#: bzrlib/builtins.py:1717
941
msgid ""
942
"You cannot update just a single file or directory, because each Bazaar\n"
943
"working tree has just a single basis revision. If you want to restore a\n"
944
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
945
"update'. If you want to restore a file to its state in a previous\n"
946
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
947
"out the old content of that file to a new location."
948
msgstr ""
949
950
#: bzrlib/builtins.py:1724
951
msgid ""
952
"The 'dir' argument, if given, must be the location of the root of a\n"
953
"working tree to update. By default, the working tree that contains the \n"
954
"current working directory is used."
955
msgstr ""
956
957
#: bzrlib/builtins.py:1740
958
msgid "bzr update --revision takes exactly one revision"
959
msgstr "bzr update --revision benötigt exakt eine Revision"
960
961
#: bzrlib/builtins.py:1748
962
msgid "bzr update can only update a whole tree, not a file or subdirectory"
963
msgstr ""
964
"bzr update kann nur den gesamten Baum aktualisieren, keine Datei oder kein "
965
"Unterverzeichnis."
966
967
#: bzrlib/builtins.py:1779
968
msgid "Tree is up to date at revision {0} of branch {1}"
969
msgstr "Baum ist auf den neusten Stand bei Revision {0} von Zweig {1}"
970
971
#: bzrlib/builtins.py:1795
972
#, python-format
973
msgid ""
974
"branch has no revision %s\n"
975
"bzr update --revision only works for a revision in the branch history"
976
msgstr ""
977
"Zweig hat keine Revision %s\n"
978
"bzr update --revision funktioniert nur mit einer Revision aus dem Verlauf "
979
"des Zweigs"
980
981
#: bzrlib/builtins.py:1801
982
msgid "Updated to revision {0} of branch {1}"
983
msgstr "Auf Revision {0} von Zweig {1} aktualisieren"
984
985
#: bzrlib/builtins.py:1805
986
msgid ""
987
"Your local commits will now show as pending merges with 'bzr status', and "
988
"can be committed with 'bzr commit'."
989
msgstr ""
990
991
#: bzrlib/builtins.py:1814
992
msgid "Show information about a working tree, branch or repository."
993
msgstr ""
994
995
#: bzrlib/builtins.py:1816
996
msgid ""
997
"This command will show all known locations and formats associated to the\n"
998
"tree, branch or repository."
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1819
1002
msgid ""
1003
"In verbose mode, statistical information is included with each report.\n"
1004
"To see extended statistic information, use a verbosity level of 2 or\n"
1005
"higher by specifying the verbose option multiple times, e.g. -vv."
1006
msgstr ""
1007
1008
#: bzrlib/builtins.py:1823
1009
msgid "Branches and working trees will also report any missing revisions."
1010
msgstr ""
1011
1012
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1013
#: bzrlib/builtins.py:6466
1014
msgid ":Examples:"
1015
msgstr ":Beispiele:"
1016
1017
#: bzrlib/builtins.py:1827
1018
msgid " Display information on the format and related locations:"
1019
msgstr " Informationen über das Format und die dazugehörigen Orte anzeigen:"
1020
1021
#: bzrlib/builtins.py:1829
1022
msgid " bzr info"
1023
msgstr " bzr info"
1024
1025
#: bzrlib/builtins.py:1831
1026
msgid ""
1027
" Display the above together with extended format information and\n"
1028
" basic statistics (like the number of files in the working tree and\n"
1029
" number of revisions in the branch and repository):"
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:1835
1033
msgid " bzr info -v"
1034
msgstr " bzr info -v"
1035
1036
#: bzrlib/builtins.py:1837
1037
msgid " Display the above together with number of committers to the branch:"
1038
msgstr ""
1039
1040
#: bzrlib/builtins.py:1839
1041
msgid " bzr info -vv"
1042
msgstr " bzr info -vv"
1043
1044
#: bzrlib/builtins.py:1858
1045
msgid "Remove files or directories."
1046
msgstr "Dateien oder Verzeichnisse entfernen."
1047
1048
#: bzrlib/builtins.py:1860
1049
msgid ""
1050
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1051
"delete them if they can easily be recovered using revert otherwise they\n"
1052
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1053
"parameters are given Bazaar will scan for files that are being tracked by\n"
1054
"Bazaar but missing in your tree and stop tracking them for you."
1055
msgstr ""
1056
1057
#: bzrlib/builtins.py:1868
1058
msgid "Only remove files that have never been committed."
1059
msgstr "Nur Dateien entfernen, die niemals eingereicht wurden."
1060
1061
#: bzrlib/builtins.py:1870
1062
msgid "The file deletion mode to be used."
1063
msgstr "Der Datei-Löschmodus, der verwendet wird."
1064
1065
#: bzrlib/builtins.py:1871
1066
msgid "Deletion Strategy"
1067
msgstr "Lösch-Strategie"
1068
1069
#: bzrlib/builtins.py:1872
1070
msgid "Backup changed files (default)."
1071
msgstr "Geänderte Dateien sichern (Vorgabe)."
1072
1073
#: bzrlib/builtins.py:1873
1074
msgid "Delete from bzr but leave the working copy."
1075
msgstr "Aus bzr entfernen, aber die funktionierende Arbeitskopie erhalten."
1076
1077
#: bzrlib/builtins.py:1874
1078
msgid "Don't backup changed files."
1079
msgstr "Geänderte Dateien nicht sichern."
1080
1081
#: bzrlib/builtins.py:1875
1082
msgid ""
1083
"Delete all the specified files, even if they can not be recovered and even "
1084
"if they are non-empty directories. (deprecated, use no-backup)"
1085
msgstr ""
1086
"Alle spezifischen Dateien entfernen, auch wenn sie nicht wiederhergestellt "
1087
"werden können und wenn die Verzeichnisse nicht leer sind. (Veraltet, nutzen "
1088
"Sie no-backup)"
1089
1090
#: bzrlib/builtins.py:1884
1091
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1092
msgstr ""
1093
"(Die --force Option ist veraltet, nutzen Sie in Zukunft stattdessen --no-"
1094
"backup.)"
1095
1096
#: bzrlib/builtins.py:1901
1097
msgid "No matching files."
1098
msgstr "Keine zutreffenden Dateien."
1099
1100
#: bzrlib/builtins.py:1962
1101
msgid "Reconcile bzr metadata in a branch."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:1964
1105
msgid ""
1106
"This can correct data mismatches that may have been caused by\n"
1107
"previous ghost operations or bzr upgrades. You should only\n"
1108
"need to run this command if 'bzr check' or a bzr developer\n"
1109
"advises you to run it."
1110
msgstr ""
1111
1112
#: bzrlib/builtins.py:1969
1113
msgid ""
1114
"If a second branch is provided, cross-branch reconciliation is\n"
1115
"also attempted, which will check that data like the tree root\n"
1116
"id which was not present in very early bzr versions is represented\n"
1117
"correctly in both branches."
1118
msgstr ""
1119
1120
#: bzrlib/builtins.py:1974
1121
msgid ""
1122
"At the same time it is run it may recompress data resulting in\n"
1123
"a potential saving in disk space or performance gain."
1124
msgstr ""
1125
"Es kann während der Ausführung Daten rekomprimieren, wodurch\n"
1126
"potentiell Speicherplatz gespart und die Performanz verbessert werden können."
1127
1128
#: bzrlib/builtins.py:1977
1129
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1130
msgstr ""
1131
"Der Zweig *MUSS* ein auflistbares System sein, wie z.B. eine lokale "
1132
"Festplatte oder stftp."
1133
1134
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1135
msgid ""
1136
"Format for the bzr 2.0 series.\n"
1137
"Uses group-compress storage.\n"
1138
"Provides rich roots which are a one-way transition.\n"
1139
msgstr ""
1140
1141
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1142
msgid ""
1143
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1144
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1145
msgstr ""
1146
1147
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1148
msgid "The 2a format with experimental support for colocated branches.\n"
1149
msgstr ""
1150
"Das 2a-Format mit experimenteller Unterstützung für gemeinsame Zweige.\n"
1151
1152
#: bzrlib/builtins.py:2045
1153
msgid "Make a directory into a versioned branch."
1154
msgstr "Ein Verzeichnis zu einem versionierten Entwicklungszweig machen."
1155
1156
#: bzrlib/builtins.py:2047
1157
msgid ""
1158
"Use this to create an empty branch, or before importing an\n"
1159
"existing project."
1160
msgstr ""
1161
"Nutzen Sie dies, um einen leeren Zweig zu erstellen, oder bevor\n"
1162
"ein vorhandenes Projekt importiert wird."
1163
1164
#: bzrlib/builtins.py:2050
1165
msgid ""
1166
"If there is a repository in a parent directory of the location, then\n"
1167
"the history of the branch will be stored in the repository. Otherwise\n"
1168
"init creates a standalone branch which carries its own history\n"
1169
"in the .bzr directory."
1170
msgstr ""
1171
1172
#: bzrlib/builtins.py:2055
1173
msgid ""
1174
"If there is already a branch at the location but it has no working tree,\n"
1175
"the tree can be populated with 'bzr checkout'."
1176
msgstr ""
1177
1178
#: bzrlib/builtins.py:2058
1179
msgid "Recipe for importing a tree of files::"
1180
msgstr "Rezept für das Importieren eines Dateibaumes::"
1181
1182
#: bzrlib/builtins.py:2060
1183
msgid ""
1184
" cd ~/project\n"
1185
" bzr init\n"
1186
" bzr add .\n"
1187
" bzr status\n"
1188
" bzr commit -m \"imported project\""
1189
msgstr ""
1190
" cd ~/Projekt\n"
1191
" bzr init\n"
1192
" bzr add .\n"
1193
" bzr status\n"
1194
" bzr commit -m »Importiertes Projekt«"
1195
1196
#: bzrlib/builtins.py:2071
1197
msgid ""
1198
"Create the path leading up to the branch if it does not already exist."
1199
msgstr "Den Pfad zum Zweig erzeugen, falls dieser noch nicht vorhanden ist."
1200
1201
#: bzrlib/builtins.py:2074
1202
msgid "Specify a format for this branch. See \"help formats\"."
1203
msgstr "Geben Sie ein Format für diesen Zweig an. Siehe »help formats«."
1204
1205
#: bzrlib/builtins.py:2082
1206
msgid ""
1207
"Never change revnos or the existing log. Append revisions to it only."
1208
msgstr ""
1209
"Revnos oder das vorhandene Protokoll niemals ändern. Revisionen nur am Ende "
1210
"hinzufügen."
1211
1212
#: bzrlib/builtins.py:2085
1213
msgid "Create a branch without a working tree."
1214
msgstr ""
1215
1216
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1217
#, python-format
1218
msgid ""
1219
"Parent directory of %s does not exist.\n"
1220
"You may supply --create-prefix to create all leading parent directories."
1221
msgstr ""
1222
1223
#: bzrlib/builtins.py:2139
1224
msgid ""
1225
"This branch format cannot be set to append-revisions-only. Try --default."
1226
msgstr ""
1227
1228
#: bzrlib/builtins.py:2150
1229
msgid "Created a {0} (format: {1})\n"
1230
msgstr "Ein {0} wurde erstellt (Format: {1})\n"
1231
1232
#: bzrlib/builtins.py:2159
1233
#, python-format
1234
msgid "Using shared repository: %s\n"
1235
msgstr ""
1236
1237
#: bzrlib/builtins.py:2163
1238
msgid "Create a shared repository for branches to share storage space."
1239
msgstr ""
1240
1241
#: bzrlib/builtins.py:2165
1242
msgid ""
1243
"New branches created under the repository directory will store their\n"
1244
"revisions in the repository, not in the branch directory. For branches\n"
1245
"with shared history, this reduces the amount of storage needed and \n"
1246
"speeds up the creation of new branches."
1247
msgstr ""
1248
1249
#: bzrlib/builtins.py:2170
1250
msgid ""
1251
"If the --no-trees option is given then the branches in the repository\n"
1252
"will not have working trees by default. They will still exist as \n"
1253
"directories on disk, but they will not have separate copies of the \n"
1254
"files at a certain revision. This can be useful for repositories that\n"
1255
"store branches which are interacted with through checkouts or remote\n"
1256
"branches, such as on a server."
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2177
1260
msgid ""
1261
":Examples:\n"
1262
" Create a shared repository holding just branches::"
1263
msgstr ""
1264
1265
#: bzrlib/builtins.py:2180
1266
msgid ""
1267
" bzr init-repo --no-trees repo\n"
1268
" bzr init repo/trunk"
1269
msgstr ""
1270
" bzr init-repo --no-trees repo\n"
1271
" bzr init repo/trunk"
1272
1273
#: bzrlib/builtins.py:2183
1274
msgid " Make a lightweight checkout elsewhere::"
1275
msgstr ""
1276
1277
#: bzrlib/builtins.py:2185
1278
msgid ""
1279
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1280
" cd trunk-checkout\n"
1281
" (add files here)"
1282
msgstr ""
1283
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1284
" cd trunk-checkout\n"
1285
" (Hier Dateien hinzufügen)"
1286
1287
#: bzrlib/builtins.py:2193
1288
msgid ""
1289
"Specify a format for this repository. See \"bzr help formats\" for details."
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2197
1293
msgid "Repository format"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2199
1297
msgid "Branches in the repository will default to not having a working tree."
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2225
1301
msgid "Show differences in the working tree, between revisions or branches."
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2227
1305
msgid ""
1306
"If no arguments are given, all changes for the current tree are listed.\n"
1307
"If files are given, only the changes in those files are listed.\n"
1308
"Remote and multiple branches can be compared by using the --old and\n"
1309
"--new options. If not provided, the default for both is derived from\n"
1310
"the first argument, if any, or the current tree if no arguments are\n"
1311
"given."
1312
msgstr ""
1313
1314
#: bzrlib/builtins.py:2234
1315
msgid ""
1316
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1317
"produces patches suitable for \"patch -p1\"."
1318
msgstr ""
1319
"»bzr diff -p1« ist das gleiche wie »bzr diff --prefix alt/:neu/«\n"
1320
"und produziert angepasste Korrekturen für »patch -p1«."
1321
1322
#: bzrlib/builtins.py:2237
1323
msgid ""
1324
"Note that when using the -r argument with a range of revisions, the\n"
1325
"differences are computed between the two specified revisions. That\n"
1326
"is, the command does not show the changes introduced by the first \n"
1327
"revision in the range. This differs from the interpretation of \n"
1328
"revision ranges used by \"bzr log\" which includes the first revision\n"
1329
"in the range."
1330
msgstr ""
1331
1332
#: bzrlib/builtins.py:2244
1333
msgid ""
1334
":Exit values:\n"
1335
" 1 - changed\n"
1336
" 2 - unrepresentable changes\n"
1337
" 3 - error\n"
1338
" 0 - no change"
1339
msgstr ""
1340
":Rückgabewerte:\n"
1341
" 1 - Geändert\n"
1342
" 2 - Nicht darstellbare Änderungen\n"
1343
" 3 - Fehler\n"
1344
" 0 - Keine Änderungen"
1345
1346
#: bzrlib/builtins.py:2250
1347
msgid ""
1348
":Examples:\n"
1349
" Shows the difference in the working tree versus the last commit::"
1350
msgstr ""
1351
1352
#: bzrlib/builtins.py:2253
1353
msgid " bzr diff"
1354
msgstr " bzr diff"
1355
1356
#: bzrlib/builtins.py:2255
1357
msgid " Difference between the working tree and revision 1::"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2257
1361
msgid " bzr diff -r1"
1362
msgstr " bzr diff -r1"
1363
1364
#: bzrlib/builtins.py:2259
1365
msgid " Difference between revision 3 and revision 1::"
1366
msgstr " Unterschied zwischen Revision 3 und Revision 1::"
1367
1368
#: bzrlib/builtins.py:2261
1369
msgid " bzr diff -r1..3"
1370
msgstr " bzr diff -r1..3"
1371
1372
#: bzrlib/builtins.py:2263
1373
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1374
msgstr " Unterschied zwischen Revision 3 und Revision 1 von Zweig xxx::"
1375
1376
#: bzrlib/builtins.py:2265
1377
msgid " bzr diff -r1..3 xxx"
1378
msgstr " bzr diff -r1..3 xxx"
1379
1380
#: bzrlib/builtins.py:2267
1381
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1382
msgstr " Die Änderungen von Revision 2 (äquivalent zu -r1..2)::"
1383
1384
#: bzrlib/builtins.py:2269
1385
msgid " bzr diff -c2"
1386
msgstr " bzr diff -c2"
1387
1388
#: bzrlib/builtins.py:2271
1389
msgid ""
1390
" To see the changes introduced by revision X::\n"
1391
" \n"
1392
" bzr diff -cX"
1393
msgstr ""
1394
" So erhalten Sie die Änderungen von Revision X::\n"
1395
" \n"
1396
" bzr diff -cX"
1397
1398
#: bzrlib/builtins.py:2275
1399
msgid ""
1400
" Note that in the case of a merge, the -c option shows the changes\n"
1401
" compared to the left hand parent. To see the changes against\n"
1402
" another parent, use::"
1403
msgstr ""
1404
1405
#: bzrlib/builtins.py:2279
1406
msgid " bzr diff -r<chosen_parent>..X"
1407
msgstr ""
1408
1409
#: bzrlib/builtins.py:2281
1410
msgid ""
1411
" The changes between the current revision and the previous revision\n"
1412
" (equivalent to -c-1 and -r-2..-1)"
1413
msgstr ""
1414
" Die Änderungen zwischen der gegenwärtigen Revision und der vorigen\n"
1415
" (äquivalent zu -c-1 und -r-2..-1)"
1416
1417
#: bzrlib/builtins.py:2284
1418
msgid " bzr diff -r-2.."
1419
msgstr " bzr diff -r-2.."
1420
1421
#: bzrlib/builtins.py:2286
1422
msgid " Show just the differences for file NEWS::"
1423
msgstr " Nur die Unterschiede für die Datei NEWS anzeigen::"
1424
1425
#: bzrlib/builtins.py:2288
1426
msgid " bzr diff NEWS"
1427
msgstr ""
1428
1429
#: bzrlib/builtins.py:2290
1430
msgid " Show the differences in working tree xxx for file NEWS::"
1431
msgstr ""
1432
1433
#: bzrlib/builtins.py:2292
1434
msgid " bzr diff xxx/NEWS"
1435
msgstr ""
1436
1437
#: bzrlib/builtins.py:2294
1438
msgid " Show the differences from branch xxx to this working tree:"
1439
msgstr ""
1440
1441
#: bzrlib/builtins.py:2296
1442
msgid " bzr diff --old xxx"
1443
msgstr " bzr diff --old xxx"
1444
1445
#: bzrlib/builtins.py:2298
1446
msgid " Show the differences between two branches for file NEWS::"
1447
msgstr ""
1448
" Die Unterschiede zwischen zwei Zweigen für die Datei NEWS anzeigen::"
1449
1450
#: bzrlib/builtins.py:2300
1451
msgid " bzr diff --old xxx --new yyy NEWS"
1452
msgstr ""
1453
1454
#: bzrlib/builtins.py:2302
1455
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1456
msgstr ""
1457
1458
#: bzrlib/builtins.py:2304
1459
msgid ""
1460
" bzr diff --prefix old/:new/\n"
1461
" \n"
1462
" Show the differences using a custom diff program with options::\n"
1463
" \n"
1464
" bzr diff --using /usr/bin/diff --diff-options -wu"
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2314
1468
msgid "Pass these options to the external diff program."
1469
msgstr "Diese Optionen an das externe Programm diff übergeben."
1470
1471
#: bzrlib/builtins.py:2317
1472
msgid ""
1473
"Set prefixes added to old and new filenames, as two values separated by a "
1474
"colon. (eg \"old/:new/\")."
1475
msgstr ""
1476
1477
#: bzrlib/builtins.py:2320
1478
msgid "Branch/tree to compare from."
1479
msgstr "Von Zweig/Baum vergleichen."
1480
1481
#: bzrlib/builtins.py:2324
1482
msgid "Branch/tree to compare to."
1483
msgstr "Mit Zweig/Baum vergleichen."
1484
1485
#: bzrlib/builtins.py:2330
1486
msgid "Use this command to compare files."
1487
msgstr "Diesen Befehl zum Vergleichen von Dateien benutzen."
1488
1489
#: bzrlib/builtins.py:2335
1490
msgid "Diff format to use."
1491
msgstr "Diff-Format, das benutzt werden soll."
1492
1493
#: bzrlib/builtins.py:2337
1494
msgid "Diff format"
1495
msgstr "Diff-Format"
1496
1497
#: bzrlib/builtins.py:2359
1498
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1499
msgstr ""
1500
"--prefix erwartet zwei Werte getrennt mit einem Doppelpunkt (z.B. "
1501
"»alt/:neu/«)"
1502
1503
#: bzrlib/builtins.py:2363
1504
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1505
msgstr ""
1506
"bzr diff --revision benötigt exakt ein oder zwei Revisions-Spezifikationen"
1507
1508
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1509
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1510
msgid "{0} and {1} are mutually exclusive"
1511
msgstr "{0} und {1} schließen sich gegenseitig aus"
1512
1513
#: bzrlib/builtins.py:2388
1514
msgid ""
1515
"List files deleted in the working tree.\n"
1516
" "
1517
msgstr ""
1518
1519
#: bzrlib/builtins.py:2465
1520
msgid "Show the tree root directory."
1521
msgstr "Den Wurzelverzeichnisbaum anzeigen."
1522
1523
#: bzrlib/builtins.py:2467
1524
msgid ""
1525
"The root is the nearest enclosing directory with a .bzr control\n"
1526
"directory."
1527
msgstr ""
1528
1529
#: bzrlib/builtins.py:2482
1530
msgid "The limit argument must be an integer."
1531
msgstr ""
1532
1533
#: bzrlib/builtins.py:2490
1534
msgid "The levels argument must be an integer."
1535
msgstr ""
1536
1537
#: bzrlib/builtins.py:2495
1538
msgid "Show historical log for a branch or subset of a branch."
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2497
1542
msgid ""
1543
"log is bzr's default tool for exploring the history of a branch.\n"
1544
"The branch to use is taken from the first parameter. If no parameters\n"
1545
"are given, the branch containing the working directory is logged.\n"
1546
"Here are some simple examples::"
1547
msgstr ""
1548
1549
#: bzrlib/builtins.py:2502
1550
msgid ""
1551
" bzr log log the current branch\n"
1552
" bzr log foo.py log a file in its branch\n"
1553
" bzr log http://server/branch log a branch on a server"
1554
msgstr ""
1555
1556
#: bzrlib/builtins.py:2506
1557
msgid ""
1558
"The filtering, ordering and information shown for each revision can\n"
1559
"be controlled as explained below. By default, all revisions are\n"
1560
"shown sorted (topologically) so that newer revisions appear before\n"
1561
"older ones and descendants always appear before ancestors. If displayed,\n"
1562
"merged revisions are shown indented under the revision in which they\n"
1563
"were merged."
1564
msgstr ""
1565
1566
#: bzrlib/builtins.py:2513
1567
msgid ":Output control:"
1568
msgstr ":Ausgabesteuerung:"
1569
1570
#: bzrlib/builtins.py:2515
1571
msgid ""
1572
" The log format controls how information about each revision is\n"
1573
" displayed. The standard log formats are called ``long``, ``short``\n"
1574
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1575
" for more details on log formats."
1576
msgstr ""
1577
" Das Protokoll-Format bestimmt wie Informationen zu jeder Revision\n"
1578
" angezeigt werden. Die Standard-Protokoll-Formate heißen ``long``,\n"
1579
" ``short`` und ``line``. Die Vorgabe ist ``long``.\n"
1580
" Siehe``bzr help log-formats`` für mehr Einzelheiten zu Protokoll-Formaten."
1581
1582
#: bzrlib/builtins.py:2520
1583
msgid ""
1584
" The following options can be used to control what information is\n"
1585
" displayed::"
1586
msgstr ""
1587
" Die folgenden Einstellungen können genutzt werden, um zu kontrollieren,\n"
1588
" welche Informationen angezeigt werden::"
1589
1590
#: bzrlib/builtins.py:2523
1591
msgid ""
1592
" -l N display a maximum of N revisions\n"
1593
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1594
" -v display a status summary (delta) for each revision\n"
1595
" -p display a diff (patch) for each revision\n"
1596
" --show-ids display revision-ids (and file-ids), not just revnos"
1597
msgstr ""
1598
" -l N Maximal N Revisionen anzeigen\n"
1599
" -n N N Revisionsstufen anzeigen (0 für alle, 1 für "
1600
"eingeklappte)\n"
1601
" -v Eine Status-Zusammenfassung (Delta) für jede Revision "
1602
"anzeigen\n"
1603
" -p Einen diff (Patch) für jede Revision anzeigen\n"
1604
" --show-ids Revision-ids (und file-ids) anzeigen, nicht nur revnos"
1605
1606
#: bzrlib/builtins.py:2529
1607
msgid ""
1608
" Note that the default number of levels to display is a function of the\n"
1609
" log format. If the -n option is not used, the standard log formats show\n"
1610
" just the top level (mainline)."
1611
msgstr ""
1612
" Beachten Sie, dass die Vorgabeanzahl zum Anzeigen von Stufen eine "
1613
"Funktion\n"
1614
" des Protokoll-Formats ist. Wenn die Option -n nicht genutzt wird, dann "
1615
"zeigen die\n"
1616
" Standard-Protokoll-Formate nur die oberste Stufe (mainline)."
1617
1618
#: bzrlib/builtins.py:2533
1619
msgid ""
1620
" Status summaries are shown using status flags like A, M, etc. To see\n"
1621
" the changes explained using words like ``added`` and ``modified``\n"
1622
" instead, use the -vv option."
1623
msgstr ""
1624
" Status-Zusammenfassungen werden mit Status-Markern wie A, M, usw.\n"
1625
" angezeigt. Nutzen Sie die Option -vv, um Änderungen durch\n"
1626
" Wörter wie ``added`` oder ``modified`` erklärt zu bekommen."
1627
1628
#: bzrlib/builtins.py:2537
1629
msgid ":Ordering control:"
1630
msgstr ":Sortierungssteuerung:"
1631
1632
#: bzrlib/builtins.py:2539
1633
msgid ""
1634
" To display revisions from oldest to newest, use the --forward option.\n"
1635
" In most cases, using this option will have little impact on the total\n"
1636
" time taken to produce a log, though --forward does not incrementally\n"
1637
" display revisions like --reverse does when it can."
1638
msgstr ""
1639
" Nutzen Sie die Option --forward, um Revisionen von den ältesten zu den "
1640
"neusten\n"
1641
" anzuzeigen. Der Gebrauch dieser Option hat meistens kleine\n"
1642
" Auswirkungen auf die Gesamtzeit, die benötigt wird, um ein Protokoll zu "
1643
"erstellen.\n"
1644
" Außerdem zeigt --forward Revisionen nicht inkrementell an, wie --reverse "
1645
"dies tut, falls möglich."
1646
1647
#: bzrlib/builtins.py:2544
1648
msgid ":Revision filtering:"
1649
msgstr ":Revision-Filtern:"
1650
1651
#: bzrlib/builtins.py:2546
1652
msgid ""
1653
" The -r option can be used to specify what revision or range of revisions\n"
1654
" to filter against. The various forms are shown below::"
1655
msgstr ""
1656
" Die Option -r kann genutzt werden, um eine Revision oder einen Bereich von "
1657
"Revisionen\n"
1658
" zu bestimmen, die/der gefiltert werden soll. Es gibt folgende verschiedene "
1659
"Formen::"
1660
1661
#: bzrlib/builtins.py:2549
1662
msgid ""
1663
" -rX display revision X\n"
1664
" -rX.. display revision X and later\n"
1665
" -r..Y display up to and including revision Y\n"
1666
" -rX..Y display from X to Y inclusive"
1667
msgstr ""
1668
" -rX Revision X anzeigen\n"
1669
" -rX.. Revision X und spätere anzeigen\n"
1670
" -r..Y Bis Revision Y (inklusive) anzeigen\n"
1671
" -rX..Y Von X bis Y (inklusive) anzeigen"
1672
1673
#: bzrlib/builtins.py:2554
1674
msgid ""
1675
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1676
" Some common examples are given below::"
1677
msgstr ""
1678
" Siehe ``bzr help revisionspec`` für Informationen dazu, wie X und Y "
1679
"angegeben werden.\n"
1680
" Es folgen ein paar allgemeine Beispiele::"
1681
1682
#: bzrlib/builtins.py:2557
1683
msgid ""
1684
" -r-1 show just the tip\n"
1685
" -r-10.. show the last 10 mainline revisions\n"
1686
" -rsubmit:.. show what's new on this branch\n"
1687
" -rancestor:path.. show changes since the common ancestor of this\n"
1688
" branch and the one at location path\n"
1689
" -rdate:yesterday.. show changes since yesterday"
1690
msgstr ""
1691
1692
#: bzrlib/builtins.py:2564
1693
msgid ""
1694
" When logging a range of revisions using -rX..Y, log starts at\n"
1695
" revision Y and searches back in history through the primary\n"
1696
" (\"left-hand\") parents until it finds X. When logging just the\n"
1697
" top level (using -n1), an error is reported if X is not found\n"
1698
" along the way. If multi-level logging is used (-n0), X may be\n"
1699
" a nested merge revision and the log will be truncated accordingly."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2571
1703
msgid ":Path filtering:"
1704
msgstr ":Pfad-Filtern:"
1705
1706
#: bzrlib/builtins.py:2573
1707
msgid ""
1708
" If parameters are given and the first one is not a branch, the log\n"
1709
" will be filtered to show only those revisions that changed the\n"
1710
" nominated files or directories."
1711
msgstr ""
1712
1713
#: bzrlib/builtins.py:2577
1714
msgid ""
1715
" Filenames are interpreted within their historical context. To log a\n"
1716
" deleted file, specify a revision range so that the file existed at\n"
1717
" the end or start of the range."
1718
msgstr ""
1719
1720
#: bzrlib/builtins.py:2581
1721
msgid ""
1722
" Historical context is also important when interpreting pathnames of\n"
1723
" renamed files/directories. Consider the following example:"
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2584
1727
msgid ""
1728
" * revision 1: add tutorial.txt\n"
1729
" * revision 2: modify tutorial.txt\n"
1730
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1731
msgstr ""
1732
1733
#: bzrlib/builtins.py:2588
1734
msgid " In this case:"
1735
msgstr " In diesem Fall:"
1736
1737
#: bzrlib/builtins.py:2590
1738
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1739
msgstr ""
1740
1741
#: bzrlib/builtins.py:2592
1742
msgid ""
1743
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2594
1747
msgid ""
1748
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1749
" the original file in revision 2."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2597
1753
msgid ""
1754
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1755
" was no file called guide.txt in revision 2."
1756
msgstr ""
1757
1758
#: bzrlib/builtins.py:2600
1759
msgid ""
1760
" Renames are always followed by log. By design, there is no need to\n"
1761
" explicitly ask for this (and no way to stop logging a file back\n"
1762
" until it was last renamed)."
1763
msgstr ""
1764
1765
#: bzrlib/builtins.py:2604
1766
msgid ":Other filtering:"
1767
msgstr ":Anderes Filtern:"
1768
1769
#: bzrlib/builtins.py:2606
1770
msgid ""
1771
" The --match option can be used for finding revisions that match a\n"
1772
" regular expression in a commit message, committer, author or bug.\n"
1773
" Specifying the option several times will match any of the supplied\n"
1774
" expressions. --match-author, --match-bugs, --match-committer and\n"
1775
" --match-message can be used to only match a specific field."
1776
msgstr ""
1777
1778
#: bzrlib/builtins.py:2612
1779
msgid ":Tips & tricks:"
1780
msgstr ":Tipps & Tricks:"
1781
1782
#: bzrlib/builtins.py:2614
1783
msgid ""
1784
" GUI tools and IDEs are often better at exploring history than command\n"
1785
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1786
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1787
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1788
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:2620
1792
msgid ""
1793
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1794
msgstr ""
1795
1796
#: bzrlib/builtins.py:2622
1797
msgid ""
1798
" [ALIASES]\n"
1799
" tip = log -r-1\n"
1800
" top = log -l10 --line\n"
1801
" show = log -v -p"
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:2627
1805
msgid ""
1806
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1807
" will show the last 10 mainline revisions. To see the details of a\n"
1808
" particular revision X, ``bzr show -rX``."
1809
msgstr ""
1810
1811
#: bzrlib/builtins.py:2631
1812
msgid ""
1813
" If you are interested in looking deeper into a particular merge X,\n"
1814
" use ``bzr log -n0 -rX``."
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:2634
1818
msgid ""
1819
" ``bzr log -v`` on a branch with lots of history is currently\n"
1820
" very slow. A fix for this issue is currently under development.\n"
1821
" With or without that fix, it is recommended that a revision range\n"
1822
" be given when using the -v option."
1823
msgstr ""
1824
1825
#: bzrlib/builtins.py:2639
1826
msgid ""
1827
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1828
" used to find revisions matching user names, commit messages, etc.\n"
1829
" Among other features, this plugin can find all revisions containing\n"
1830
" a list of words but not others."
1831
msgstr ""
1832
1833
#: bzrlib/builtins.py:2644
1834
msgid ""
1835
" When exploring non-mainline history on large projects with deep\n"
1836
" history, the performance of log can be greatly improved by installing\n"
1837
" the historycache plugin. This plugin buffers historical information\n"
1838
" trading disk space for faster speed."
1839
msgstr ""
1840
1841
#: bzrlib/builtins.py:2653
1842
msgid "Show from oldest to newest."
1843
msgstr ""
1844
1845
#: bzrlib/builtins.py:2656
1846
msgid "Show files changed in each revision."
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:2662
1850
msgid "Show just the specified revision. See also \"help revisionspec\"."
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:2666
1854
msgid "What names to list as authors - first, all or committer."
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:2667
1858
msgid "Authors"
1859
msgstr "Autoren"
1860
1861
#: bzrlib/builtins.py:2672
1862
msgid "Number of levels to display - 0 for all, 1 for flat."
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:2682
1866
msgid "Limit the output to the first N revisions."
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:2687
1870
msgid "Show changes made in each revision as a patch."
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:2689
1874
msgid "Show merged revisions like --levels 0 does."
1875
msgstr ""
1876
1877
#: bzrlib/builtins.py:2693
1878
msgid "Do not report commits with more than one parent."
1879
msgstr ""
1880
1881
#: bzrlib/builtins.py:2695
1882
msgid ""
1883
"Display only the revisions that are not part of both ancestries (require -"
1884
"rX..Y)."
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:2699
1888
msgid "Show digital signature validity."
1889
msgstr "Gültigkeit der digitalen Signatur anzeigen."
1890
1891
#: bzrlib/builtins.py:2702
1892
msgid "Show revisions whose properties match this expression."
1893
msgstr ""
1894
1895
#: bzrlib/builtins.py:2706
1896
msgid "Show revisions whose message matches this expression."
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:2710
1900
msgid "Show revisions whose committer matches this expression."
1901
msgstr ""
1902
1903
#: bzrlib/builtins.py:2714
1904
msgid "Show revisions whose authors match this expression."
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:2718
1908
msgid "Show revisions whose bugs match this expression."
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:2772
1912
msgid "--exclude-common-ancestry requires -r with two revisions"
1913
msgstr ""
1914
1915
#: bzrlib/builtins.py:2800
1916
#, python-format
1917
msgid "Path unknown at end or start of revision range: %s"
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:2917
1921
#, python-format
1922
msgid "bzr %s doesn't accept two revisions in different branches."
1923
msgstr ""
1924
1925
#: bzrlib/builtins.py:2933
1926
#, python-format
1927
msgid "bzr %s --revision takes one or two values."
1928
msgstr "bzr %s --revision benötigt ein oder zwei Werte."
1929
1930
#: bzrlib/builtins.py:2978
1931
msgid ""
1932
"List files in a tree.\n"
1933
" "
1934
msgstr ""
1935
1936
#: bzrlib/builtins.py:2987
1937
msgid "Recurse into subdirectories."
1938
msgstr ""
1939
1940
#: bzrlib/builtins.py:2989
1941
msgid "Print paths relative to the root of the branch."
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:2991
1945
msgid "Print unknown files."
1946
msgstr "Unbekannte Dateien ausgeben."
1947
1948
#: bzrlib/builtins.py:2992
1949
msgid "Print versioned files."
1950
msgstr "Versionierte Dateien ausgeben."
1951
1952
#: bzrlib/builtins.py:2995
1953
msgid "Print ignored files."
1954
msgstr "Ignorierte Dateien ausgeben."
1955
1956
#: bzrlib/builtins.py:2997
1957
msgid "List entries of a particular kind: file, directory, symlink."
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3010
1961
msgid "invalid kind specified"
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3013
1965
msgid "Cannot set both --verbose and --null"
1966
msgstr "--verbose und --null können nicht beide festgelegt werden"
1967
1968
#: bzrlib/builtins.py:3022
1969
msgid "cannot specify both --from-root and PATH"
1970
msgstr ""
1971
1972
#: bzrlib/builtins.py:3109
1973
msgid "Ignore specified files or patterns."
1974
msgstr ""
1975
1976
#: bzrlib/builtins.py:3111
1977
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1978
msgstr ""
1979
1980
#: bzrlib/builtins.py:3113
1981
msgid ""
1982
"If a .bzrignore file does not exist, the ignore command\n"
1983
"will create one and add the specified files or patterns to the newly\n"
1984
"created file. The ignore command will also automatically add the \n"
1985
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1986
"the use of the ignore command will require an explicit add command."
1987
msgstr ""
1988
1989
#: bzrlib/builtins.py:3119
1990
msgid ""
1991
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1992
"After adding, editing or deleting that file either indirectly by\n"
1993
"using this command or directly by using an editor, be sure to commit\n"
1994
"it."
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3124
1998
msgid ""
1999
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2000
"the global ignore file can be found in the application data directory as\n"
2001
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2002
"Global ignores are not touched by this command. The global ignore file\n"
2003
"can be edited directly using an editor."
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3130
2007
msgid ""
2008
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2009
"precedence over regular ignores. Such exceptions are used to specify\n"
2010
"files that should be versioned which would otherwise be ignored."
2011
msgstr ""
2012
2013
#: bzrlib/builtins.py:3134
2014
msgid ""
2015
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2016
"precedence over the '!' exception patterns."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3137
2020
msgid ""
2021
":Notes: \n"
2022
" \n"
2023
"* Ignore patterns containing shell wildcards must be quoted from\n"
2024
" the shell on Unix."
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3142
2028
msgid ""
2029
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2030
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3145
2034
msgid ""
2035
":Examples:\n"
2036
" Ignore the top level Makefile::"
2037
msgstr ""
2038
2039
#: bzrlib/builtins.py:3148
2040
msgid " bzr ignore ./Makefile"
2041
msgstr ""
2042
2043
#: bzrlib/builtins.py:3150
2044
msgid " Ignore .class files in all directories...::"
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3152
2048
msgid " bzr ignore \"*.class\""
2049
msgstr ""
2050
2051
#: bzrlib/builtins.py:3154
2052
msgid " ...but do not ignore \"special.class\"::"
2053
msgstr ""
2054
2055
#: bzrlib/builtins.py:3156
2056
msgid " bzr ignore \"!special.class\""
2057
msgstr ""
2058
2059
#: bzrlib/builtins.py:3158
2060
msgid " Ignore files whose name begins with the \"#\" character::"
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3160
2064
msgid " bzr ignore \"RE:^#\""
2065
msgstr " bzr ignore \"RE:^#\""
2066
2067
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2068
msgid " Ignore .o files under the lib directory::"
2069
msgstr ""
2070
2071
#: bzrlib/builtins.py:3164
2072
msgid " bzr ignore \"lib/**/*.o\""
2073
msgstr " bzr ignore \"lib/**/*.o\""
2074
2075
#: bzrlib/builtins.py:3168
2076
msgid " bzr ignore \"RE:lib/.*\\.o\""
2077
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2078
2079
#: bzrlib/builtins.py:3170
2080
msgid " Ignore everything but the \"debian\" toplevel directory::"
2081
msgstr ""
2082
2083
#: bzrlib/builtins.py:3172
2084
msgid ""
2085
" bzr ignore \"RE:(?!debian/).*\"\n"
2086
" \n"
2087
" Ignore everything except the \"local\" toplevel directory,\n"
2088
" but always ignore autosave files ending in ~, even under local/::\n"
2089
" \n"
2090
" bzr ignore \"*\"\n"
2091
" bzr ignore \"!./local\"\n"
2092
" bzr ignore \"!!*~\""
2093
msgstr ""
2094
2095
#: bzrlib/builtins.py:3186
2096
msgid "Display the default ignore rules that bzr uses."
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:3198
2100
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3209
2104
#, python-format
2105
msgid "Invalid ignore pattern found. %s"
2106
msgid_plural "Invalid ignore patterns found. %s"
2107
msgstr[0] "Ungültiges Ignorierungsmuster gefunden. %s"
2108
msgstr[1] "Ungültige Ignorierungsmuster gefunden. %s"
2109
2110
#: bzrlib/builtins.py:3218
2111
msgid "NAME_PATTERN should not be an absolute path"
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3231
2115
#, python-format
2116
msgid ""
2117
"Warning: the following files are version controlled and match your ignore "
2118
"pattern:\n"
2119
"%s\n"
2120
"These files will continue to be version controlled unless you 'bzr remove' "
2121
"them.\n"
2122
msgstr ""
2123
2124
#: bzrlib/builtins.py:3238
2125
msgid "List ignored files and the patterns that matched them."
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3240
2129
msgid ""
2130
"List all the ignored files and the ignore pattern that caused the file to\n"
2131
"be ignored."
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3243
2135
msgid "Alternatively, to list just the files::"
2136
msgstr "Alternativ, um nur die Dateien aufzulisten:"
2137
2138
#: bzrlib/builtins.py:3245
2139
msgid " bzr ls --ignored"
2140
msgstr " bzr ls --ignored"
2141
2142
#: bzrlib/builtins.py:3279
2143
#, python-format
2144
msgid "not a valid revision-number: %r"
2145
msgstr "Keine gültige Revisionsnummer: %r"
2146
2147
#: bzrlib/builtins.py:3286
2148
msgid ""
2149
"Export current or past revision to a destination directory or archive."
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3288
2153
msgid "If no revision is specified this exports the last committed revision."
2154
msgstr ""
2155
2156
#: bzrlib/builtins.py:3290
2157
msgid ""
2158
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2159
"given, try to find the format with the extension. If no extension\n"
2160
"is found exports to a directory (equivalent to --format=dir)."
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3294
2164
msgid ""
2165
"If root is supplied, it will be used as the root directory inside\n"
2166
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2167
"to the exported filename. The root option has no effect for 'dir' format."
2168
msgstr ""
2169
2170
#: bzrlib/builtins.py:3298
2171
msgid ""
2172
"If branch is omitted then the branch containing the current working\n"
2173
"directory will be used."
2174
msgstr ""
2175
2176
#: bzrlib/builtins.py:3301
2177
msgid ""
2178
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3303
2182
msgid ""
2183
" ================= =========================\n"
2184
" Supported formats Autodetected by extension\n"
2185
" ================= =========================\n"
2186
" dir (none)\n"
2187
" tar .tar\n"
2188
" tbz2 .tar.bz2, .tbz2\n"
2189
" tgz .tar.gz, .tgz\n"
2190
" zip .zip\n"
2191
" ================= ========================="
2192
msgstr ""
2193
2194
#: bzrlib/builtins.py:3317
2195
msgid "Type of file to export to."
2196
msgstr "Art der Datei, in die exportiert wird."
2197
2198
#: bzrlib/builtins.py:3320
2199
msgid "Apply content filters to export the convenient form."
2200
msgstr ""
2201
2202
#: bzrlib/builtins.py:3324
2203
msgid "Name of the root directory inside the exported file."
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3326
2207
msgid ""
2208
"Set modification time of files to that of the last revision in which it was "
2209
"changed."
2210
msgstr ""
2211
2212
#: bzrlib/builtins.py:3329
2213
msgid ""
2214
"Export the working tree contents rather than that of the last revision."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3348
2218
msgid "--uncommitted requires a working tree"
2219
msgstr ""
2220
2221
#: bzrlib/builtins.py:3357
2222
#, python-format
2223
msgid "Unsupported export format: %s"
2224
msgstr "Nicht unterstütztes Export-Format: %s"
2225
2226
#: bzrlib/builtins.py:3361
2227
msgid ""
2228
"Write the contents of a file as of a given revision to standard output."
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3363
2232
msgid "If no revision is nominated, the last revision is used."
2233
msgstr ""
2234
"Wenn keine Revision bestimmt wurde, wird die neueste Revision benutzt."
2235
2236
#: bzrlib/builtins.py:3365
2237
msgid ""
2238
"Note: Take care to redirect standard output when using this command on a\n"
2239
"binary file."
2240
msgstr ""
2241
2242
#: bzrlib/builtins.py:3371
2243
msgid "The path name in the old tree."
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3372
2247
msgid "Apply content filters to display the convenience form."
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3383
2251
msgid "bzr cat --revision takes exactly one revision specifier"
2252
msgstr ""
2253
2254
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2255
msgid "{0!r} is not present in revision {1}"
2256
msgstr "{0!r} ist in Revision {1} nicht vorhanden"
2257
2258
#: bzrlib/builtins.py:3443
2259
msgid "Commit changes into a new revision."
2260
msgstr ""
2261
2262
#: bzrlib/builtins.py:3445
2263
msgid ""
2264
"An explanatory message needs to be given for each commit. This is\n"
2265
"often done by using the --message option (getting the message from the\n"
2266
"command line) or by using the --file option (getting the message from\n"
2267
"a file). If neither of these options is given, an editor is opened for\n"
2268
"the user to enter the message. To see the changed files in the\n"
2269
"boilerplate text loaded into the editor, use the --show-diff option."
2270
msgstr ""
2271
2272
#: bzrlib/builtins.py:3452
2273
msgid ""
2274
"By default, the entire tree is committed and the person doing the\n"
2275
"commit is assumed to be the author. These defaults can be overridden\n"
2276
"as explained below."
2277
msgstr ""
2278
2279
#: bzrlib/builtins.py:3456
2280
msgid ":Selective commits:"
2281
msgstr ""
2282
2283
#: bzrlib/builtins.py:3458
2284
msgid ""
2285
" If selected files are specified, only changes to those files are\n"
2286
" committed. If a directory is specified then the directory and\n"
2287
" everything within it is committed."
2288
msgstr ""
2289
2290
#: bzrlib/builtins.py:3462
2291
msgid ""
2292
" When excludes are given, they take precedence over selected files.\n"
2293
" For example, to commit only changes within foo, but not changes\n"
2294
" within foo/bar::"
2295
msgstr ""
2296
2297
#: bzrlib/builtins.py:3466
2298
msgid " bzr commit foo -x foo/bar"
2299
msgstr " bzr commit foo -x foo/bar"
2300
2301
#: bzrlib/builtins.py:3468
2302
msgid " A selective commit after a merge is not yet supported."
2303
msgstr ""
2304
2305
#: bzrlib/builtins.py:3470
2306
msgid ":Custom authors:"
2307
msgstr ":Benutzerdefinierte Autoren:"
2308
2309
#: bzrlib/builtins.py:3472
2310
msgid ""
2311
" If the author of the change is not the same person as the committer,\n"
2312
" you can specify the author's name using the --author option. The\n"
2313
" name should be in the same format as a committer-id, e.g.\n"
2314
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2315
" the change you can specify the option multiple times, once for each\n"
2316
" author."
2317
msgstr ""
2318
2319
#: bzrlib/builtins.py:3479
2320
msgid ":Checks:"
2321
msgstr ":Prüfungen:"
2322
2323
#: bzrlib/builtins.py:3481
2324
msgid ""
2325
" A common mistake is to forget to add a new file or directory before\n"
2326
" running the commit command. The --strict option checks for unknown\n"
2327
" files and aborts the commit if any are found. More advanced pre-commit\n"
2328
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2329
" for details."
2330
msgstr ""
2331
2332
#: bzrlib/builtins.py:3487
2333
msgid ":Things to note:"
2334
msgstr ":Dinge, die zu beachten sind:"
2335
2336
#: bzrlib/builtins.py:3489
2337
msgid ""
2338
" If you accidentially commit the wrong changes or make a spelling\n"
2339
" mistake in the commit message say, you can use the uncommit command\n"
2340
" to undo it. See ``bzr help uncommit`` for details."
2341
msgstr ""
2342
2343
#: bzrlib/builtins.py:3493
2344
msgid ""
2345
" Hooks can also be configured to run after a commit. This allows you\n"
2346
" to trigger updates to external systems like bug trackers. The --fixes\n"
2347
" option can be used to record the association between a revision and\n"
2348
" one or more bugs. See ``bzr help bugs`` for details."
2349
msgstr ""
2350
2351
#: bzrlib/builtins.py:3503
2352
msgid "Do not consider changes made to a given path."
2353
msgstr ""
2354
2355
#: bzrlib/builtins.py:3506
2356
msgid "Description of the new revision."
2357
msgstr "Beschreibung der neuen Revision."
2358
2359
#: bzrlib/builtins.py:3509
2360
msgid "Commit even if nothing has changed."
2361
msgstr ""
2362
2363
#: bzrlib/builtins.py:3513
2364
msgid "Take commit message from this file."
2365
msgstr ""
2366
2367
#: bzrlib/builtins.py:3515
2368
msgid "Refuse to commit if there are unknown files in the working tree."
2369
msgstr ""
2370
2371
#: bzrlib/builtins.py:3518
2372
msgid ""
2373
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2374
"08:00:00 +0100'."
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3521
2378
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3524
2382
msgid "Set the author's name, if it's different from the committer."
2383
msgstr ""
2384
2385
#: bzrlib/builtins.py:3527
2386
msgid ""
2387
"Perform a local commit in a bound branch. Local commits are not pushed to "
2388
"the master branch until a normal commit is performed."
2389
msgstr ""
2390
2391
#: bzrlib/builtins.py:3533
2392
msgid ""
2393
"When no message is supplied, show the diff along with the status summary in "
2394
"the message editor."
2395
msgstr ""
2396
2397
#: bzrlib/builtins.py:3536
2398
msgid ""
2399
"When committing to a foreign version control system do not push data that "
2400
"can not be natively represented."
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3554
2404
#, python-format
2405
msgid ""
2406
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2407
"default bug tracker using the `bugtracker` option.\n"
2408
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2409
msgstr ""
2410
2411
#: bzrlib/builtins.py:3563
2412
#, python-format
2413
msgid ""
2414
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2415
"for more information on this feature.\n"
2416
"Commit refused."
2417
msgstr ""
2418
2419
#: bzrlib/builtins.py:3572
2420
#, python-format
2421
msgid "Unrecognized bug %s. Commit refused."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3575
2425
#, python-format
2426
msgid ""
2427
"%s\n"
2428
"Commit refused."
2429
msgstr ""
2430
2431
#: bzrlib/builtins.py:3599
2432
msgid "Could not parse --commit-time: "
2433
msgstr ""
2434
2435
#: bzrlib/builtins.py:3639
2436
msgid "please specify either --message or --file"
2437
msgstr "Bitte geben Sie entweder --message oder --file an"
2438
2439
#: bzrlib/builtins.py:3668
2440
msgid "please specify a commit message with either --message or --file"
2441
msgstr ""
2442
2443
#: bzrlib/builtins.py:3671
2444
msgid ""
2445
"Empty commit message specified. Please specify a commit message with either -"
2446
"-message or --file or leave a blank message with --message \"\"."
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3691
2450
msgid ""
2451
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2452
"-unchanged to force an empty commit."
2453
msgstr ""
2454
2455
#: bzrlib/builtins.py:3695
2456
msgid ""
2457
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2458
"resolve FILE\" to resolve."
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3699
2462
msgid "Commit refused because there are unknown files in the working tree."
2463
msgstr ""
2464
2465
#: bzrlib/builtins.py:3702
2466
msgid ""
2467
"\n"
2468
"To commit to master branch, run update and then commit.\n"
2469
"You can also pass --local to commit to continue working disconnected."
2470
msgstr ""
2471
2472
#: bzrlib/builtins.py:3710
2473
msgid ""
2474
"Validate working tree structure, branch consistency and repository history."
2475
msgstr ""
2476
2477
#: bzrlib/builtins.py:3712
2478
msgid ""
2479
"This command checks various invariants about branch and repository storage\n"
2480
"to detect data corruption or bzr bugs."
2481
msgstr ""
2482
2483
#: bzrlib/builtins.py:3715
2484
msgid ""
2485
"The working tree and branch checks will only give output if a problem is\n"
2486
"detected. The output fields of the repository check are:"
2487
msgstr ""
2488
2489
#: bzrlib/builtins.py:3718
2490
msgid ""
2491
"revisions\n"
2492
" This is just the number of revisions checked. It doesn't\n"
2493
" indicate a problem."
2494
msgstr ""
2495
2496
#: bzrlib/builtins.py:3722
2497
msgid ""
2498
"versionedfiles\n"
2499
" This is just the number of versionedfiles checked. It\n"
2500
" doesn't indicate a problem."
2501
msgstr ""
2502
2503
#: bzrlib/builtins.py:3726
2504
msgid ""
2505
"unreferenced ancestors\n"
2506
" Texts that are ancestors of other texts, but\n"
2507
" are not properly referenced by the revision ancestry. This is a\n"
2508
" subtle problem that Bazaar can work around."
2509
msgstr ""
2510
2511
#: bzrlib/builtins.py:3731
2512
msgid ""
2513
"unique file texts\n"
2514
" This is the total number of unique file contents\n"
2515
" seen in the checked revisions. It does not indicate a problem."
2516
msgstr ""
2517
2518
#: bzrlib/builtins.py:3735
2519
msgid ""
2520
"repeated file texts\n"
2521
" This is the total number of repeated texts seen\n"
2522
" in the checked revisions. Texts can be repeated when their file\n"
2523
" entries are modified, but the file contents are not. It does not\n"
2524
" indicate a problem."
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3741
2528
msgid ""
2529
"If no restrictions are specified, all Bazaar data that is found at the "
2530
"given\n"
2531
"location will be checked."
2532
msgstr ""
2533
2534
#: bzrlib/builtins.py:3746
2535
msgid " Check the tree and branch at 'foo'::"
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:3748
2539
msgid " bzr check --tree --branch foo"
2540
msgstr ""
2541
2542
#: bzrlib/builtins.py:3750
2543
msgid " Check only the repository at 'bar'::"
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3752
2547
msgid " bzr check --repo bar"
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3754
2551
msgid " Check everything at 'baz'::"
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:3756
2555
msgid " bzr check baz"
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:3762
2559
msgid "Check the branch related to the current directory."
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:3764
2563
msgid "Check the repository related to the current directory."
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:3766
2567
msgid "Check the working tree related to the current directory."
2568
msgstr ""
2569
2570
#: bzrlib/builtins.py:3780
2571
msgid "Upgrade a repository, branch or working tree to a newer format."
2572
msgstr ""
2573
2574
#: bzrlib/builtins.py:3782
2575
msgid ""
2576
"When the default format has changed after a major new release of\n"
2577
"Bazaar, you may be informed during certain operations that you\n"
2578
"should upgrade. Upgrading to a newer format may improve performance\n"
2579
"or make new features available. It may however limit interoperability\n"
2580
"with older repositories or with older versions of Bazaar."
2581
msgstr ""
2582
2583
#: bzrlib/builtins.py:3788
2584
msgid ""
2585
"If you wish to upgrade to a particular format rather than the\n"
2586
"current default, that can be specified using the --format option.\n"
2587
"As a consequence, you can use the upgrade command this way to\n"
2588
"\"downgrade\" to an earlier format, though some conversions are\n"
2589
"a one way process (e.g. changing from the 1.x default to the\n"
2590
"2.x default) so downgrading is not always possible."
2591
msgstr ""
2592
2593
#: bzrlib/builtins.py:3795
2594
msgid ""
2595
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2596
"process (where # is a number). By default, this is left there on\n"
2597
"completion. If the conversion fails, delete the new .bzr directory\n"
2598
"and rename this one back in its place. Use the --clean option to ask\n"
2599
"for the backup.bzr directory to be removed on successful conversion.\n"
2600
"Alternatively, you can delete it by hand if everything looks good\n"
2601
"afterwards."
2602
msgstr ""
2603
2604
#: bzrlib/builtins.py:3803
2605
msgid ""
2606
"If the location given is a shared repository, dependent branches\n"
2607
"are also converted provided the repository converts successfully.\n"
2608
"If the conversion of a branch fails, remaining branches are still\n"
2609
"tried."
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:3808
2613
msgid ""
2614
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2615
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2616
msgstr ""
2617
2618
#: bzrlib/builtins.py:3816
2619
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2620
msgstr ""
2621
2622
#: bzrlib/builtins.py:3820
2623
msgid "Branch format"
2624
msgstr "Format des Zweiges"
2625
2626
#: bzrlib/builtins.py:3822
2627
msgid "Remove the backup.bzr directory if successful."
2628
msgstr ""
2629
2630
#: bzrlib/builtins.py:3824
2631
msgid "Show what would be done, but don't actually do anything."
2632
msgstr "Nur zeigen, was getan werden würde, aber nichts wirklich machen."
2633
2634
#: bzrlib/builtins.py:3839
2635
msgid "Show or set bzr user id."
2636
msgstr ""
2637
2638
#: bzrlib/builtins.py:3841
2639
msgid ""
2640
":Examples:\n"
2641
" Show the email of the current user::"
2642
msgstr ""
2643
":Beispiele:\n"
2644
" Die E-Mail-Adresse des aktuellen Benutzers zeigen::"
2645
2646
#: bzrlib/builtins.py:3844
2647
msgid " bzr whoami --email"
2648
msgstr " bzr whoami --email"
2649
2650
#: bzrlib/builtins.py:3846
2651
msgid " Set the current user::"
2652
msgstr " Aktuellen Benutzer festlegen::"
2653
2654
#: bzrlib/builtins.py:3848
2655
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2656
msgstr " bzr whoami \"Frank Chu <ich@beispiel.de>\""
2657
2658
#: bzrlib/builtins.py:3852
2659
msgid "Display email address only."
2660
msgstr "Nur die E-Mail-Adresse anzeigen."
2661
2662
#: bzrlib/builtins.py:3854
2663
msgid "Set identity for the current branch instead of globally."
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:3880
2667
msgid "--email can only be used to display existing identity"
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:3904
2671
msgid "Print or set the branch nickname."
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:3906
2675
msgid ""
2676
"If unset, the colocated branch name is used for colocated branches, and\n"
2677
"the branch directory name is used for other branches. To print the\n"
2678
"current nickname, execute with no argument."
2679
msgstr ""
2680
2681
#: bzrlib/builtins.py:3910
2682
msgid ""
2683
"Bound branches use the nickname of its master branch unless it is set\n"
2684
"locally."
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:3930
2688
msgid "Set/unset and display aliases."
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:3932
2692
msgid ""
2693
":Examples:\n"
2694
" Show the current aliases::"
2695
msgstr ""
2696
":Beispiele:\n"
2697
" Die aktuellen Aliase zeigen::"
2698
2699
#: bzrlib/builtins.py:3935
2700
msgid " bzr alias"
2701
msgstr " bzr alias"
2702
2703
#: bzrlib/builtins.py:3937
2704
msgid " Show the alias specified for 'll'::"
2705
msgstr ""
2706
2707
#: bzrlib/builtins.py:3939
2708
msgid " bzr alias ll"
2709
msgstr " bzr alias ll"
2710
2711
#: bzrlib/builtins.py:3941
2712
msgid " Set an alias for 'll'::"
2713
msgstr ""
2714
2715
#: bzrlib/builtins.py:3943
2716
msgid " bzr alias ll=\"log --line -r-10..-1\""
2717
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2718
2719
#: bzrlib/builtins.py:3945
2720
msgid " To remove an alias for 'll'::"
2721
msgstr ""
2722
2723
#: bzrlib/builtins.py:3947
2724
msgid " bzr alias --remove ll"
2725
msgstr " bzr alias --remove ll"
2726
2727
#: bzrlib/builtins.py:3952
2728
msgid "Remove the alias."
2729
msgstr "Den Alias entfernen."
2730
2731
#: bzrlib/builtins.py:3970
2732
msgid "bzr alias --remove expects an alias to remove."
2733
msgstr "bzr alias --remove erwartet einen Alias zum Entfernen."
2734
2735
#: bzrlib/builtins.py:4151
2736
msgid ""
2737
"subunit not available. subunit needs to be installed to use --subunit."
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4168
2741
msgid ""
2742
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2743
msgstr ""
2744
2745
#: bzrlib/builtins.py:4215
2746
msgid "Show version of bzr."
2747
msgstr "Version von bzr anzeigen."
2748
2749
#: bzrlib/builtins.py:4219
2750
msgid "Print just the version number."
2751
msgstr "Nur die Versionsnummer ausgeben."
2752
2753
#: bzrlib/builtins.py:4238
2754
msgid "It sure does!\n"
2755
msgstr ""
2756
2757
#: bzrlib/builtins.py:4262
2758
#, python-format
2759
msgid "merge base is revision %s\n"
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4266
2763
msgid "Perform a three-way merge."
2764
msgstr ""
2765
2766
#: bzrlib/builtins.py:4268
2767
msgid ""
2768
"The source of the merge can be specified either in the form of a branch,\n"
2769
"or in the form of a path to a file containing a merge directive generated\n"
2770
"with bzr send. If neither is specified, the default is the upstream branch\n"
2771
"or the branch most recently merged using --remember. The source of the\n"
2772
"merge may also be specified in the form of a path to a file in another\n"
2773
"branch: in this case, only the modifications to that file are merged into\n"
2774
"the current working tree."
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4276
2778
msgid ""
2779
"When merging from a branch, by default bzr will try to merge in all new\n"
2780
"work from the other branch, automatically determining an appropriate base\n"
2781
"revision. If this fails, you may need to give an explicit base."
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4280
2785
msgid ""
2786
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2787
"try to merge in all new work up to and including revision OTHER."
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4283
2791
msgid ""
2792
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2793
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2794
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2795
"not already contain revision BASE, such a merge is commonly referred to as\n"
2796
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2797
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2798
"changes from the other branch is not stored in the commit."
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4291
2802
msgid "Revision numbers are always relative to the source branch."
2803
msgstr ""
2804
2805
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2806
msgid ""
2807
"Merge will do its best to combine the changes in two branches, but there\n"
2808
"are some kinds of problems only a human can fix. When it encounters those,\n"
2809
"it will mark a conflict. A conflict means that you need to fix something,\n"
2810
"before you can commit."
2811
msgstr ""
2812
2813
#: bzrlib/builtins.py:4298
2814
msgid ""
2815
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4300
2819
msgid ""
2820
"If there is no default branch set, the first merge will set it (use\n"
2821
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2822
"to use the default. To change the default, use --remember. The value will\n"
2823
"only be saved if the remote location can be accessed."
2824
msgstr ""
2825
2826
#: bzrlib/builtins.py:4305
2827
msgid ""
2828
"The results of the merge are placed into the destination working\n"
2829
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2830
"committed to record the result of the merge."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4309
2834
msgid ""
2835
"merge refuses to run if there are any uncommitted changes, unless\n"
2836
"--force is given. If --force is given, then the changes from the source \n"
2837
"will be merged with the current working tree, including any uncommitted\n"
2838
"changes in the tree. The --force option can also be used to create a\n"
2839
"merge revision which has more than two parents."
2840
msgstr ""
2841
2842
#: bzrlib/builtins.py:4315
2843
msgid ""
2844
"If one would like to merge changes from the working tree of the other\n"
2845
"branch without merging any committed revisions, the --uncommitted option\n"
2846
"can be given."
2847
msgstr ""
2848
2849
#: bzrlib/builtins.py:4319
2850
msgid ""
2851
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2852
"you to apply each diff hunk and file change, similar to \"shelve\"."
2853
msgstr ""
2854
2855
#: bzrlib/builtins.py:4322
2856
msgid ""
2857
":Examples:\n"
2858
" To merge all new revisions from bzr.dev::"
2859
msgstr ""
2860
2861
#: bzrlib/builtins.py:4325
2862
msgid " bzr merge ../bzr.dev"
2863
msgstr " bzr merge ../bzr.dev"
2864
2865
#: bzrlib/builtins.py:4327
2866
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2867
msgstr ""
2868
2869
#: bzrlib/builtins.py:4329
2870
msgid " bzr merge -r 82 ../bzr.dev"
2871
msgstr " bzr merge -r 82 ../bzr.dev"
2872
2873
#: bzrlib/builtins.py:4331
2874
msgid " To merge the changes introduced by 82, without previous changes::"
2875
msgstr ""
2876
2877
#: bzrlib/builtins.py:4333
2878
msgid " bzr merge -r 81..82 ../bzr.dev"
2879
msgstr " bzr merge -r 81..82 ../bzr.dev"
2880
2881
#: bzrlib/builtins.py:4335
2882
msgid " To apply a merge directive contained in /tmp/merge::"
2883
msgstr ""
2884
2885
#: bzrlib/builtins.py:4337
2886
msgid " bzr merge /tmp/merge"
2887
msgstr " bzr merge /tmp/merge"
2888
2889
#: bzrlib/builtins.py:4339
2890
msgid ""
2891
" To create a merge revision with three parents from two branches\n"
2892
" feature1a and feature1b:"
2893
msgstr ""
2894
2895
#: bzrlib/builtins.py:4342
2896
msgid ""
2897
" bzr merge ../feature1a\n"
2898
" bzr merge ../feature1b --force\n"
2899
" bzr commit -m 'revision with three parents'"
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4354
2903
msgid "Merge even if the destination tree has uncommitted changes."
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4360
2907
msgid ""
2908
"Apply uncommitted changes from a working copy, instead of branch changes."
2909
msgstr ""
2910
2911
#: bzrlib/builtins.py:4362
2912
msgid ""
2913
"If the destination is already completely merged into the source, pull from "
2914
"the source rather than merging. When this happens, you do not need to "
2915
"commit the result."
2916
msgstr ""
2917
2918
#: bzrlib/builtins.py:4367
2919
msgid ""
2920
"Branch to merge into, rather than the one containing the working directory."
2921
msgstr ""
2922
2923
#: bzrlib/builtins.py:4369
2924
msgid "Instead of merging, show a diff of the merge."
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4371
2928
msgid "Select changes interactively."
2929
msgstr "Änderungen interaktiv auswählen."
2930
2931
#: bzrlib/builtins.py:4393
2932
msgid ""
2933
"Merging into empty branches not currently supported, "
2934
"https://bugs.launchpad.net/bzr/+bug/308562"
2935
msgstr ""
2936
2937
#: bzrlib/builtins.py:4420
2938
msgid "Cannot use --uncommitted with bundles or merge directives."
2939
msgstr ""
2940
2941
#: bzrlib/builtins.py:4431
2942
msgid "Cannot use --uncommitted and --revision at the same time."
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4451
2946
msgid "merger: "
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2950
msgid "Nothing to do."
2951
msgstr "Nichts zu tun."
2952
2953
#: bzrlib/builtins.py:4457
2954
msgid "Cannot pull individual files"
2955
msgstr "Nicht möglich, einzelne Dateien zu laden"
2956
2957
#: bzrlib/builtins.py:4465
2958
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4523
2962
#, python-format
2963
msgid "Show-base is not supported for this merge type. %s"
2964
msgstr ""
2965
2966
#: bzrlib/builtins.py:4532
2967
#, python-format
2968
msgid "Conflict reduction is not supported for merge type %s."
2969
msgstr ""
2970
2971
#: bzrlib/builtins.py:4536
2972
msgid "Cannot do conflict reduction and show base."
2973
msgstr ""
2974
2975
#: bzrlib/builtins.py:4647
2976
msgid "No location specified or remembered"
2977
msgstr ""
2978
2979
#: bzrlib/builtins.py:4649
2980
msgid "{0} remembered {1} location {2}"
2981
msgstr ""
2982
2983
#: bzrlib/builtins.py:4655
2984
msgid "Redo a merge."
2985
msgstr ""
2986
2987
#: bzrlib/builtins.py:4657
2988
msgid ""
2989
"Use this if you want to try a different merge technique while resolving\n"
2990
"conflicts. Some merge techniques are better than others, and remerge\n"
2991
"lets you try different ones on different files."
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:4661
2995
msgid ""
2996
"The options for remerge have the same meaning and defaults as the ones for\n"
2997
"merge. The difference is that remerge can (only) be run when there is a\n"
2998
"pending merge, and it lets you specify particular files."
2999
msgstr ""
3000
3001
#: bzrlib/builtins.py:4665
3002
msgid ""
3003
":Examples:\n"
3004
" Re-do the merge of all conflicted files, and show the base text in\n"
3005
" conflict regions, in addition to the usual THIS and OTHER texts::"
3006
msgstr ""
3007
3008
#: bzrlib/builtins.py:4669
3009
msgid " bzr remerge --show-base"
3010
msgstr " bzr remerge --show-base"
3011
3012
#: bzrlib/builtins.py:4671
3013
msgid ""
3014
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3015
" additional processing to reduce the size of conflict regions::"
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4674
3019
msgid " bzr remerge --merge-type weave --reprocess foobar"
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4681
3023
msgid "Show base revision text in conflicts."
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:4693
3027
msgid ""
3028
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3029
"merges."
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:4751
3033
msgid ""
3034
"Set files in the working tree back to the contents of a previous revision."
3035
msgstr ""
3036
3037
#: bzrlib/builtins.py:4753
3038
msgid ""
3039
"Giving a list of files will revert only those files. Otherwise, all files\n"
3040
"will be reverted. If the revision is not specified with '--revision', the\n"
3041
"working tree basis revision is used. A revert operation affects only the\n"
3042
"working tree, not any revision history like the branch and repository or\n"
3043
"the working tree basis revision."
3044
msgstr ""
3045
3046
#: bzrlib/builtins.py:4759
3047
msgid ""
3048
"To remove only some changes, without reverting to a prior version, use\n"
3049
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3050
"will remove the changes introduced by the second last commit (-2), without\n"
3051
"affecting the changes introduced by the last commit (-1). To remove\n"
3052
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3053
"To update the branch to a specific revision or the latest revision and\n"
3054
"update the working tree accordingly while preserving local changes, see the\n"
3055
"update command."
3056
msgstr ""
3057
3058
#: bzrlib/builtins.py:4768
3059
msgid ""
3060
"Uncommitted changes to files that are reverted will be discarded.\n"
3061
"Howver, by default, any files that have been manually changed will be\n"
3062
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3063
"files have '.~#~' appended to their name, where # is a number."
3064
msgstr ""
3065
3066
#: bzrlib/builtins.py:4773
3067
msgid ""
3068
"When you provide files, you can use their current pathname or the pathname\n"
3069
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3070
"name. If you name a directory, all the contents of that directory will be\n"
3071
"reverted."
3072
msgstr ""
3073
3074
#: bzrlib/builtins.py:4778
3075
msgid ""
3076
"If you have newly added files since the target revision, they will be\n"
3077
"removed. If the files to be removed have been changed, backups will be\n"
3078
"created as above. Directories containing unknown files will not be\n"
3079
"deleted."
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:4783
3083
msgid ""
3084
"The working tree contains a list of revisions that have been merged but\n"
3085
"not yet committed. These revisions will be included as additional parents\n"
3086
"of the next commit. Normally, using revert clears that list as well as\n"
3087
"reverting the files. If any files are specified, revert leaves the list\n"
3088
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3089
".`` in the tree root to revert all files but keep the recorded merges,\n"
3090
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3091
"reverting any files."
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:4792
3095
msgid ""
3096
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3097
"changes from a branch in a single revision. To do this, perform the merge\n"
3098
"as desired. Then doing revert with the \"--forget-merges\" option will "
3099
"keep\n"
3100
"the content of the tree as it was, but it will clear the list of pending\n"
3101
"merges. The next commit will then contain all of the changes that are\n"
3102
"present in the other branch, but without any other parent revisions.\n"
3103
"Because this technique forgets where these changes originated, it may\n"
3104
"cause additional conflicts on later merges involving the same source and\n"
3105
"target branches."
3106
msgstr ""
3107
3108
#: bzrlib/builtins.py:4806
3109
msgid "Do not save backups of reverted files."
3110
msgstr "Keine Sicherungskopien von zurückgesetzten Dateien erstellen."
3111
3112
#: bzrlib/builtins.py:4808
3113
msgid "Remove pending merge marker, without changing any files."
3114
msgstr ""
3115
3116
#: bzrlib/builtins.py:4839
3117
msgid ""
3118
"Show help on a command or other topic.\n"
3119
" "
3120
msgstr ""
3121
"Hilfe zu einem Befehl oder Thema anzeigen.\n"
3122
" "
3123
3124
#: bzrlib/builtins.py:4844
3125
msgid "Show help on all commands."
3126
msgstr "Hilfe zu allen Befehlen anzeigen."
3127
3128
#: bzrlib/builtins.py:4873
3129
msgid "Show unmerged/unpulled revisions between two branches."
3130
msgstr ""
3131
3132
#: bzrlib/builtins.py:4875
3133
msgid "OTHER_BRANCH may be local or remote."
3134
msgstr ""
3135
3136
#: bzrlib/builtins.py:4877
3137
msgid ""
3138
"To filter on a range of revisions, you can use the command -r begin..end\n"
3139
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3140
"also valid.\n"
3141
" \n"
3142
":Exit values:\n"
3143
" 1 - some missing revisions\n"
3144
" 0 - no missing revisions"
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:4887
3148
msgid ""
3149
" Determine the missing revisions between this and the branch at the\n"
3150
" remembered pull location::"
3151
msgstr ""
3152
3153
#: bzrlib/builtins.py:4890
3154
msgid " bzr missing"
3155
msgstr " bzr missing"
3156
3157
#: bzrlib/builtins.py:4892
3158
msgid " Determine the missing revisions between this and another branch::"
3159
msgstr ""
3160
3161
#: bzrlib/builtins.py:4894
3162
msgid " bzr missing http://server/branch"
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:4896
3166
msgid ""
3167
" Determine the missing revisions up to a specific revision on the other\n"
3168
" branch::"
3169
msgstr ""
3170
3171
#: bzrlib/builtins.py:4899
3172
msgid " bzr missing -r ..-10"
3173
msgstr " bzr missing -r ..-10"
3174
3175
#: bzrlib/builtins.py:4901
3176
msgid ""
3177
" Determine the missing revisions up to a specific revision on this\n"
3178
" branch::"
3179
msgstr ""
3180
3181
#: bzrlib/builtins.py:4904
3182
msgid " bzr missing --my-revision ..-10"
3183
msgstr " bzr missing --my-revision ..-10"
3184
3185
#: bzrlib/builtins.py:4911
3186
msgid "Reverse the order of revisions."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:4913
3190
msgid "Display changes in the local branch only."
3191
msgstr "Nur Änderungen im lokalen Zweig anzeigen."
3192
3193
#: bzrlib/builtins.py:4914
3194
msgid "Same as --mine-only."
3195
msgstr "Dasselbe wie --mine-only."
3196
3197
#: bzrlib/builtins.py:4916
3198
msgid "Display changes in the remote branch only."
3199
msgstr "Nur Änderungen im entfernten Zweig anzeigen."
3200
3201
#: bzrlib/builtins.py:4917
3202
msgid "Same as --theirs-only."
3203
msgstr "Dasselbe wie --theirs-only."
3204
3205
#: bzrlib/builtins.py:4922
3206
msgid ""
3207
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3208
"details."
3209
msgstr ""
3210
3211
#: bzrlib/builtins.py:4926
3212
msgid ""
3213
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3214
"details."
3215
msgstr ""
3216
3217
#: bzrlib/builtins.py:4929
3218
msgid "Show all revisions in addition to the mainline ones."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:4983
3222
msgid "No peer location known or specified."
3223
msgstr ""
3224
3225
#: bzrlib/builtins.py:4987
3226
msgid "Using saved parent location: {0}\n"
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:5020
3230
#, python-format
3231
msgid "You have %d extra revision:\n"
3232
msgid_plural "You have %d extra revisions:\n"
3233
msgstr[0] "Sie haben %d zusätzliche Revision:\n"
3234
msgstr[1] "Sie haben %d zusätzliche Revisionen:\n"
3235
3236
#: bzrlib/builtins.py:5040
3237
#, python-format
3238
msgid "You are missing %d revision:\n"
3239
msgid_plural "You are missing %d revisions:\n"
3240
msgstr[0] "Ihnen fehlt %d Revision:\n"
3241
msgstr[1] "Ihnen fehlen %d Revisionen:\n"
3242
3243
#: bzrlib/builtins.py:5055
3244
msgid "This branch has no new revisions.\n"
3245
msgstr "Dieser Zweig hat keine neuen Revisionen.\n"
3246
3247
#: bzrlib/builtins.py:5058
3248
msgid "Other branch has no new revisions.\n"
3249
msgstr "Anderer Zweig hat keine neuen Revisionen.\n"
3250
3251
#: bzrlib/builtins.py:5063
3252
msgid "Branches are up to date.\n"
3253
msgstr "Zweige sind aktuell.\n"
3254
3255
#: bzrlib/builtins.py:5074
3256
msgid "Compress the data within a repository."
3257
msgstr ""
3258
3259
#: bzrlib/builtins.py:5076
3260
msgid ""
3261
"This operation compresses the data within a bazaar repository. As\n"
3262
"bazaar supports automatic packing of repository, this operation is\n"
3263
"normally not required to be done manually."
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5080
3267
msgid ""
3268
"During the pack operation, bazaar takes a backup of existing repository\n"
3269
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3270
"automatically when it is safe to do so. To save disk space by removing\n"
3271
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3272
"used."
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5086
3276
msgid ""
3277
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3278
"during or immediately after repacking, you may be left with a state\n"
3279
"where the deletion has been written to disk but the new packs have not\n"
3280
"been. In this case the repository may be unusable."
3281
msgstr ""
3282
3283
#: bzrlib/builtins.py:5095
3284
msgid "Delete obsolete packs to save disk space."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5109
3288
msgid "List the installed plugins."
3289
msgstr "Installierte Erweiterungen auflisten."
3290
3291
#: bzrlib/builtins.py:5111
3292
msgid ""
3293
"This command displays the list of installed plugins including\n"
3294
"version of plugin and a short description of each."
3295
msgstr ""
3296
3297
#: bzrlib/builtins.py:5114
3298
msgid "--verbose shows the path where each plugin is located."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5116
3302
msgid ""
3303
"A plugin is an external component for Bazaar that extends the\n"
3304
"revision control system, by adding or replacing code in Bazaar.\n"
3305
"Plugins can do a variety of things, including overriding commands,\n"
3306
"adding new commands, providing additional network transports and\n"
3307
"customizing log output."
3308
msgstr ""
3309
3310
#: bzrlib/builtins.py:5122
3311
msgid ""
3312
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3313
"for further information on plugins including where to find them and how to\n"
3314
"install them. Instructions are also provided there on how to write new\n"
3315
"plugins using the Python programming language."
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:5138
3319
msgid "Show testament (signing-form) of a revision."
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:5141
3323
msgid "Produce long-format testament."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5143
3327
msgid "Produce a strict-format testament."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5169
3331
msgid "Show the origin of each line in a file."
3332
msgstr "Ursprung jeder Zeile in einer Datei anzeigen."
3333
3334
#: bzrlib/builtins.py:5171
3335
msgid ""
3336
"This prints out the given file with an annotation on the left side\n"
3337
"indicating which revision, author and date introduced the change."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:5174
3341
msgid ""
3342
"If the origin is the same for a run of consecutive lines, it is\n"
3343
"shown only at the top, unless the --all option is given."
3344
msgstr ""
3345
3346
#: bzrlib/builtins.py:5182
3347
msgid "Show annotations on all lines."
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5183
3351
msgid "Show commit date in annotations."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5270
3355
msgid "Cannot sign a range of non-revision-history revisions"
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5282
3359
msgid "Please supply either one revision, or a range."
3360
msgstr "Bitte geben Sie entweder eine Revision oder einen Bereich an."
3361
3362
#: bzrlib/builtins.py:5286
3363
msgid ""
3364
"Convert the current branch into a checkout of the supplied branch.\n"
3365
"If no branch is supplied, rebind to the last bound location."
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5289
3369
msgid ""
3370
"Once converted into a checkout, commits must succeed on the master branch\n"
3371
"before they will be applied to the local branch."
3372
msgstr ""
3373
3374
#: bzrlib/builtins.py:5292
3375
msgid ""
3376
"Bound branches use the nickname of its master branch unless it is set\n"
3377
"locally, in which case binding will update the local nickname to be\n"
3378
"that of the master."
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:5307
3382
msgid "No location supplied. This format does not remember old locations."
3383
msgstr ""
3384
3385
#: bzrlib/builtins.py:5313
3386
msgid "Branch is already bound"
3387
msgstr ""
3388
3389
#: bzrlib/builtins.py:5316
3390
msgid "No location supplied and no previous location known"
3391
msgstr ""
3392
3393
#: bzrlib/builtins.py:5322
3394
msgid "These branches have diverged. Try merging, and then bind again."
3395
msgstr ""
3396
3397
#: bzrlib/builtins.py:5329
3398
msgid "Convert the current checkout into a regular branch."
3399
msgstr ""
3400
3401
#: bzrlib/builtins.py:5331
3402
msgid ""
3403
"After unbinding, the local branch is considered independent and subsequent\n"
3404
"commits will be local only."
3405
msgstr ""
3406
3407
#: bzrlib/builtins.py:5342
3408
msgid "Local branch is not bound"
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5346
3412
msgid "Remove the last committed revision."
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:5348
3416
msgid ""
3417
"--verbose will print out what is being removed.\n"
3418
"--dry-run will go through all the motions, but not actually\n"
3419
"remove anything."
3420
msgstr ""
3421
3422
#: bzrlib/builtins.py:5352
3423
msgid ""
3424
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3425
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3426
"branch at revision 15."
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5356
3430
msgid ""
3431
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3432
"it may make is to restore any pending merges that were present before\n"
3433
"the commit."
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5367
3437
msgid "Don't actually make changes."
3438
msgstr "Keine Änderungen durchführen."
3439
3440
#: bzrlib/builtins.py:5368
3441
msgid "Say yes to all questions."
3442
msgstr "Alle Fragen mit Ja beantworten."
3443
3444
#: bzrlib/builtins.py:5370
3445
msgid "Keep tags that point to removed revisions."
3446
msgstr ""
3447
3448
#: bzrlib/builtins.py:5372
3449
msgid "Only remove the commits from the local branch when in a checkout."
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:5421
3453
msgid "No revisions to uncommit.\n"
3454
msgstr ""
3455
3456
#: bzrlib/builtins.py:5436
3457
msgid "Dry-run, pretending to remove the above revisions.\n"
3458
msgstr ""
3459
"Testlauf, es wird so getan, als ob die obigen Revisionen entfernt würden.\n"
3460
3461
#: bzrlib/builtins.py:5439
3462
msgid "The above revision(s) will be removed.\n"
3463
msgstr "Oben stehende Revision(en) wird/werden entfernt.\n"
3464
3465
#: bzrlib/builtins.py:5443
3466
msgid "Uncommit these revisions"
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:5446
3470
msgid "Canceled\n"
3471
msgstr "Abgebrochen\n"
3472
3473
#: bzrlib/builtins.py:5453
3474
#, python-format
3475
msgid ""
3476
"You can restore the old tip by running:\n"
3477
" bzr pull . -r revid:%s\n"
3478
msgstr ""
3479
3480
#: bzrlib/builtins.py:5458
3481
msgid "Break a dead lock."
3482
msgstr ""
3483
3484
#: bzrlib/builtins.py:5460
3485
msgid ""
3486
"This command breaks a lock on a repository, branch, working directory or\n"
3487
"config file."
3488
msgstr ""
3489
3490
#: bzrlib/builtins.py:5463
3491
msgid ""
3492
"CAUTION: Locks should only be broken when you are sure that the process\n"
3493
"holding the lock has been stopped."
3494
msgstr ""
3495
3496
#: bzrlib/builtins.py:5466
3497
msgid ""
3498
"You can get information on what locks are open via the 'bzr info\n"
3499
"[location]' command."
3500
msgstr ""
3501
3502
#: bzrlib/builtins.py:5469
3503
msgid ""
3504
":Examples:\n"
3505
" bzr break-lock\n"
3506
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3507
" bzr break-lock --conf ~/.bazaar"
3508
msgstr ""
3509
3510
#: bzrlib/builtins.py:5478
3511
msgid "LOCATION is the directory where the config lock is."
3512
msgstr ""
3513
3514
#: bzrlib/builtins.py:5480
3515
msgid "Do not ask for confirmation before breaking the lock."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5515
3519
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3520
msgstr "Das Bazaar-Smart-Server-Protokoll via TCP. (Vorgabe-Port: 4155)"
3521
3522
#: bzrlib/builtins.py:5516
3523
msgid "Run the bzr server."
3524
msgstr "Den bzr-Server starten."
3525
3526
#: bzrlib/builtins.py:5522
3527
msgid "Serve on stdin/out for use from inetd or sshd."
3528
msgstr ""
3529
3530
#: bzrlib/builtins.py:5523
3531
msgid "protocol"
3532
msgstr "Protokoll"
3533
3534
#: bzrlib/builtins.py:5524
3535
msgid "Protocol to serve."
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:5528
3539
msgid "Listen for connections on nominated address."
3540
msgstr "An den angegebenen Adressen auf Verbindungen lauschen."
3541
3542
#: bzrlib/builtins.py:5530
3543
msgid ""
3544
"Listen for connections on nominated port. Passing 0 as the port number will "
3545
"result in a dynamically allocated port. The default port depends on the "
3546
"protocol."
3547
msgstr ""
3548
3549
#: bzrlib/builtins.py:5535
3550
msgid "Serve contents of this directory."
3551
msgstr ""
3552
3553
#: bzrlib/builtins.py:5537
3554
msgid ""
3555
"By default the server is a readonly server. Supplying --allow-writes "
3556
"enables write access to the contents of the served directory and below. "
3557
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3558
"of external authentication is arranged supplying this option leads to global "
3559
"uncontrolled write access to your file system."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5546
3563
msgid "Override the default idle client timeout (5min)."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5564
3567
msgid "Combine a tree into its containing tree."
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5566
3571
msgid "This command requires the target tree to be in a rich-root format."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5568
3575
msgid ""
3576
"The TREE argument should be an independent tree, inside another tree, but\n"
3577
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3578
"running \"bzr branch\" with the target inside a tree.)"
3579
msgstr ""
3580
3581
#: bzrlib/builtins.py:5572
3582
msgid ""
3583
"The result is a combined tree, with the subtree no longer an independent\n"
3584
"part. This is marked as a merge of the subtree into the containing tree,\n"
3585
"and all history is preserved."
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5590
3589
#, python-format
3590
msgid ""
3591
"Can't join trees because %s doesn't support rich root data.\n"
3592
"You can use bzr upgrade on the repository."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3596
msgid "Cannot join {0}. {1}"
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5610
3600
msgid "Split a subdirectory of a tree into a separate tree."
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5612
3604
msgid ""
3605
"This command will produce a target tree in a format that supports\n"
3606
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3607
"converted into earlier formats like 'dirstate-tags'."
3608
msgstr ""
3609
3610
#: bzrlib/builtins.py:5616
3611
msgid ""
3612
"The TREE argument should be a subdirectory of a working tree. That\n"
3613
"subdirectory will be converted into an independent tree, with its own\n"
3614
"branch. Commits in the top-level tree will not apply to the new subtree."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5696
3618
msgid "No submit branch specified or known"
3619
msgstr ""
3620
3621
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3622
msgid "No public branch specified or known"
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5710
3626
msgid "bzr merge-directive takes at most two one revision identifiers"
3627
msgstr ""
3628
3629
#: bzrlib/builtins.py:5719
3630
msgid "No revisions to bundle."
3631
msgstr ""
3632
3633
#: bzrlib/builtins.py:5738
3634
msgid "Mail or create a merge-directive for submitting changes."
3635
msgstr ""
3636
3637
#: bzrlib/builtins.py:5740
3638
msgid "A merge directive provides many things needed for requesting merges:"
3639
msgstr ""
3640
3641
#: bzrlib/builtins.py:5742
3642
msgid "* A machine-readable description of the merge to perform"
3643
msgstr ""
3644
3645
#: bzrlib/builtins.py:5744
3646
msgid "* An optional patch that is a preview of the changes requested"
3647
msgstr ""
3648
"* Ein optionaler Patch, der eine Vorschau der gewünschten Änderungen "
3649
"darstellt"
3650
3651
#: bzrlib/builtins.py:5746
3652
msgid ""
3653
"* An optional bundle of revision data, so that the changes can be applied\n"
3654
" directly from the merge directive, without retrieving data from a\n"
3655
" branch."
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5750
3659
msgid ""
3660
"`bzr send` creates a compact data set that, when applied using bzr\n"
3661
"merge, has the same effect as merging from the source branch. "
3662
msgstr ""
3663
3664
#: bzrlib/builtins.py:5753
3665
msgid ""
3666
"By default the merge directive is self-contained and can be applied to any\n"
3667
"branch containing submit_branch in its ancestory without needing access to\n"
3668
"the source branch."
3669
msgstr ""
3670
3671
#: bzrlib/builtins.py:5757
3672
msgid ""
3673
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3674
"revisions, but only a structured request to merge from the\n"
3675
"public_location. In that case the public_branch is needed and it must be\n"
3676
"up-to-date and accessible to the recipient. The public_branch is always\n"
3677
"included if known, so that people can check it later."
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:5763
3681
msgid ""
3682
"The submit branch defaults to the parent of the source branch, but can be\n"
3683
"overridden. Both submit branch and public branch will be remembered in\n"
3684
"branch.conf the first time they are used for a particular branch. The\n"
3685
"source branch defaults to that containing the working directory, but can\n"
3686
"be changed using --from."
3687
msgstr ""
3688
3689
#: bzrlib/builtins.py:5769
3690
msgid ""
3691
"Both the submit branch and the public branch follow the usual behavior with\n"
3692
"respect to --remember: If there is no default location set, the first send\n"
3693
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3694
"omit the location to use the default. To change the default, use\n"
3695
"--remember. The value will only be saved if the location can be accessed."
3696
msgstr ""
3697
3698
#: bzrlib/builtins.py:5775
3699
msgid ""
3700
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3701
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3702
"If a public location is known for the submit_branch, that location is used\n"
3703
"in the merge directive."
3704
msgstr ""
3705
3706
#: bzrlib/builtins.py:5780
3707
msgid ""
3708
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3709
"given, in which case it is sent to a file."
3710
msgstr ""
3711
3712
#: bzrlib/builtins.py:5783
3713
msgid ""
3714
"Mail is sent using your preferred mail program. This should be transparent\n"
3715
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3716
"If the preferred client can't be found (or used), your editor will be used."
3717
msgstr ""
3718
3719
#: bzrlib/builtins.py:5787
3720
msgid ""
3721
"To use a specific mail program, set the mail_client configuration option.\n"
3722
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3723
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3724
"(MacOS X's\n"
3725
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3726
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3727
"add\n"
3728
"supported clients."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:5794
3732
msgid ""
3733
"If mail is being sent, a to address is required. This can be supplied\n"
3734
"either on the commandline, by setting the submit_to configuration\n"
3735
"option in the branch itself or the child_submit_to configuration option\n"
3736
"in the submit branch."
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:5799
3740
msgid ""
3741
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3742
"and\n"
3743
"merge directive format 2. It is significantly faster and smaller than\n"
3744
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3745
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3746
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3747
msgstr ""
3748
3749
#: bzrlib/builtins.py:5805
3750
msgid ""
3751
"The merge directives created by bzr send may be applied using bzr merge or\n"
3752
"bzr pull by specifying a file containing a merge directive as the location."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:5808
3756
msgid ""
3757
"bzr send makes extensive use of public locations to map local locations "
3758
"into\n"
3759
"URLs that can be used by other people. See `bzr help configuration` to\n"
3760
"set them, and use `bzr info` to display them."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:5832
3764
msgid "Write merge directive to this file or directory; use - for stdout."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:5836
3768
msgid ""
3769
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3770
"strict disables the check."
3771
msgstr ""
3772
3773
#: bzrlib/builtins.py:5838
3774
msgid "Mail the request to this address."
3775
msgstr "Die Anfrage an diese Adresse schicken."
3776
3777
#: bzrlib/builtins.py:5842
3778
msgid "Body for the email."
3779
msgstr "Inhalt der E-Mail."
3780
3781
#: bzrlib/builtins.py:5895
3782
msgid "Do not include a bundle in the merge directive."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:5896
3786
msgid "Do not include a preview patch in the merge directive."
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:5899
3790
msgid "Remember submit and public branch."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:5901
3794
msgid ""
3795
"Branch to generate the submission from, rather than the one containing the "
3796
"working directory."
3797
msgstr ""
3798
3799
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3800
msgid "format"
3801
msgstr "Format"
3802
3803
#: bzrlib/builtins.py:5912
3804
msgid "Use the specified output format."
3805
msgstr "Das angegebene Ausgabeformat benutzen."
3806
3807
#: bzrlib/builtins.py:5934
3808
msgid "Create, remove or modify a tag naming a revision."
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:5936
3812
msgid ""
3813
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3814
"(--revision) option can be given -rtag:X, where X is any previously\n"
3815
"created tag."
3816
msgstr ""
3817
3818
#: bzrlib/builtins.py:5940
3819
msgid ""
3820
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3821
"along when you branch, push, pull or merge."
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:5943
3825
msgid ""
3826
"It is an error to give a tag name that already exists unless you pass\n"
3827
"--force, in which case the tag is moved to point to the new revision."
3828
msgstr ""
3829
3830
#: bzrlib/builtins.py:5946
3831
msgid ""
3832
"To rename a tag (change the name but keep it on the same revsion), run "
3833
"``bzr\n"
3834
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:5949
3838
msgid ""
3839
"If no tag name is specified it will be determined through the \n"
3840
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3841
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3842
"details."
3843
msgstr ""
3844
3845
#: bzrlib/builtins.py:5959
3846
msgid "Delete this tag rather than placing it."
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:5962
3850
msgid "Branch in which to place the tag."
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:5964
3854
msgid "Replace existing tags."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:5979
3858
msgid "No tag specified to delete."
3859
msgstr ""
3860
3861
#: bzrlib/builtins.py:5981
3862
#, python-format
3863
msgid "Deleted tag %s."
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:5995
3867
msgid "Please specify a tag name."
3868
msgstr ""
3869
3870
#: bzrlib/builtins.py:6003
3871
#, python-format
3872
msgid "Tag %s already exists for that revision."
3873
msgstr ""
3874
3875
#: bzrlib/builtins.py:6007
3876
#, python-format
3877
msgid "Created tag %s."
3878
msgstr ""
3879
3880
#: bzrlib/builtins.py:6009
3881
#, python-format
3882
msgid "Updated tag %s."
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6013
3886
msgid "List tags."
3887
msgstr ""
3888
3889
#: bzrlib/builtins.py:6015
3890
msgid ""
3891
"This command shows a table of tag names and the revisions they reference."
3892
msgstr ""
3893
3894
#: bzrlib/builtins.py:6021
3895
msgid "Branch whose tags should be displayed."
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:6023
3899
msgid "Sort tags by different criteria."
3900
msgstr ""
3901
3902
#: bzrlib/builtins.py:6023
3903
msgid "Sorting"
3904
msgstr "Sortierung"
3905
3906
#: bzrlib/builtins.py:6092
3907
msgid "Reconfigure the type of a bzr directory."
3908
msgstr ""
3909
3910
#: bzrlib/builtins.py:6094
3911
msgid "A target configuration must be specified."
3912
msgstr "Es muss eine Zielkonfiguration angegeben werden."
3913
3914
#: bzrlib/builtins.py:6096
3915
msgid ""
3916
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3917
"The order of preference is\n"
3918
"1. For a lightweight checkout, the current bound location.\n"
3919
"2. For branches that used to be checkouts, the previously-bound location.\n"
3920
"3. The push location.\n"
3921
"4. The parent location.\n"
3922
"If none of these is available, --bind-to must be specified."
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6110
3926
msgid "Tree type"
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6111
3930
msgid "The relation between branch and tree."
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6113
3934
msgid "Reconfigure to be an unbound branch with no working tree."
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6114
3938
msgid "Reconfigure to be an unbound branch with a working tree."
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6115
3942
msgid "Reconfigure to be a bound branch with a working tree."
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6116
3946
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6121
3950
msgid "Repository type"
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6122
3954
msgid "Location fo the repository."
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6124
3958
msgid ""
3959
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3960
msgstr ""
3961
3962
#: bzrlib/builtins.py:6126
3963
msgid "Reconfigure to use a shared repository."
3964
msgstr ""
3965
3966
#: bzrlib/builtins.py:6130
3967
msgid "Trees in Repository"
3968
msgstr ""
3969
3970
#: bzrlib/builtins.py:6131
3971
msgid "Whether new branches in the repository have trees."
3972
msgstr ""
3973
3974
#: bzrlib/builtins.py:6133
3975
msgid ""
3976
"Reconfigure repository to create working trees on branches by default."
3977
msgstr ""
3978
3979
#: bzrlib/builtins.py:6135
3980
msgid ""
3981
"Reconfigure repository to not create working trees on branches by default."
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6138
3985
msgid "Branch to bind checkout to."
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6140
3989
msgid "Perform reconfiguration even if local changes will be lost."
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6143
3993
msgid "Reconfigure a branch to be stacked on another branch."
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6147
3997
msgid ""
3998
"Reconfigure a branch to be unstacked. This may require copying substantial "
3999
"data into it."
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6157
4003
msgid "Can't use both --stacked-on and --unstacked"
4004
msgstr ""
4005
"Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
4006
4007
#: bzrlib/builtins.py:6171
4008
msgid "No target configuration specified"
4009
msgstr "Keine Zielkonfiguration angegeben"
4010
4011
#: bzrlib/builtins.py:6206
4012
msgid "Set the branch of a checkout and update."
4013
msgstr "Branch eines Checkout setzen und aktualisieren."
4014
4015
#: bzrlib/builtins.py:6208
4016
msgid ""
4017
"For lightweight checkouts, this changes the branch being referenced.\n"
4018
"For heavyweight checkouts, this checks that there are no local commits\n"
4019
"versus the current bound branch, then it makes the local branch a mirror\n"
4020
"of the new location and binds to it."
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:6213
4024
msgid ""
4025
"In both cases, the working tree is updated and uncommitted changes\n"
4026
"are merged. The user can commit or revert these as they desire."
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:6216
4030
msgid "Pending merges need to be committed or reverted before using switch."
4031
msgstr ""
4032
4033
#: bzrlib/builtins.py:6218
4034
msgid ""
4035
"The path to the branch to switch to can be specified relative to the parent\n"
4036
"directory of the current branch. For example, if you are currently in a\n"
4037
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4038
"/path/to/newbranch."
4039
msgstr ""
4040
4041
#: bzrlib/builtins.py:6223
4042
msgid ""
4043
"Bound branches use the nickname of its master branch unless it is set\n"
4044
"locally, in which case switching will update the local nickname to be\n"
4045
"that of the master."
4046
msgstr ""
4047
4048
#: bzrlib/builtins.py:6231
4049
msgid "Switch even if local commits will be lost."
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6234
4053
msgid "Create the target branch from this one before switching to it."
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:6248
4057
msgid "You must supply either a revision or a location"
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6261
4061
msgid "cannot create branch without source branch"
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:6286
4065
msgid "Manage filtered views."
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6288
4069
msgid ""
4070
"Views provide a mask over the tree so that users can focus on\n"
4071
"a subset of a tree when doing their work. After creating a view,\n"
4072
"commands that support a list of files - status, diff, commit, etc -\n"
4073
"effectively have that list of files implicitly given each time.\n"
4074
"An explicit list of files can still be given but those files\n"
4075
"must be within the current view."
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:6295
4079
msgid ""
4080
"In most cases, a view has a short life-span: it is created to make\n"
4081
"a selected change and is deleted once that change is committed.\n"
4082
"At other times, you may wish to create one or more named views\n"
4083
"and switch between them."
4084
msgstr ""
4085
4086
#: bzrlib/builtins.py:6300
4087
msgid ""
4088
"To disable the current view without deleting it, you can switch to\n"
4089
"the pseudo view called ``off``. This can be useful when you need\n"
4090
"to see the whole tree for an operation or two (e.g. merge) but\n"
4091
"want to switch back to your view after that."
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:6305
4095
msgid ""
4096
":Examples:\n"
4097
" To define the current view::"
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6308
4101
msgid " bzr view file1 dir1 ..."
4102
msgstr ""
4103
4104
#: bzrlib/builtins.py:6310
4105
msgid " To list the current view::"
4106
msgstr ""
4107
4108
#: bzrlib/builtins.py:6312
4109
msgid " bzr view"
4110
msgstr " bzr view"
4111
4112
#: bzrlib/builtins.py:6314
4113
msgid " To delete the current view::"
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:6316
4117
msgid " bzr view --delete"
4118
msgstr " bzr view --delete"
4119
4120
#: bzrlib/builtins.py:6318
4121
msgid " To disable the current view without deleting it::"
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:6320
4125
msgid " bzr view --switch off"
4126
msgstr " bzr view --switch off"
4127
4128
#: bzrlib/builtins.py:6322
4129
msgid " To define a named view and switch to it::"
4130
msgstr ""
4131
4132
#: bzrlib/builtins.py:6324
4133
msgid " bzr view --name view-name file1 dir1 ..."
4134
msgstr ""
4135
4136
#: bzrlib/builtins.py:6326
4137
msgid " To list a named view::"
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6328
4141
msgid " bzr view --name view-name"
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6330
4145
msgid " To delete a named view::"
4146
msgstr ""
4147
4148
#: bzrlib/builtins.py:6332
4149
msgid " bzr view --name view-name --delete"
4150
msgstr ""
4151
4152
#: bzrlib/builtins.py:6334
4153
msgid " To switch to a named view::"
4154
msgstr ""
4155
4156
#: bzrlib/builtins.py:6336
4157
msgid " bzr view --switch view-name"
4158
msgstr ""
4159
4160
#: bzrlib/builtins.py:6338
4161
msgid " To list all views defined::"
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6340
4165
msgid " bzr view --all"
4166
msgstr " bzr view --all"
4167
4168
#: bzrlib/builtins.py:6342
4169
msgid " To delete all views::"
4170
msgstr ""
4171
4172
#: bzrlib/builtins.py:6344
4173
msgid " bzr view --delete --all"
4174
msgstr " bzr view --delete --all"
4175
4176
#: bzrlib/builtins.py:6351
4177
msgid "Apply list or delete action to all views."
4178
msgstr ""
4179
4180
#: bzrlib/builtins.py:6354
4181
msgid "Delete the view."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6357
4185
msgid "Name of the view to define, list or delete."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6361
4189
msgid "Name of the view to switch to."
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:6380
4193
msgid "Both --delete and a file list specified"
4194
msgstr ""
4195
4196
#: bzrlib/builtins.py:6383
4197
msgid "Both --delete and --switch specified"
4198
msgstr ""
4199
4200
#: bzrlib/builtins.py:6386
4201
msgid "Deleted all views.\n"
4202
msgstr ""
4203
4204
#: bzrlib/builtins.py:6388
4205
msgid "No current view to delete"
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6391
4209
#, python-format
4210
msgid "Deleted '%s' view.\n"
4211
msgstr ""
4212
4213
#: bzrlib/builtins.py:6395
4214
msgid "Both --switch and a file list specified"
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:6398
4218
msgid "Both --switch and --all specified"
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:6401
4222
msgid "No current view to disable"
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:6403
4226
#, python-format
4227
msgid "Disabled '%s' view.\n"
4228
msgstr ""
4229
4230
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4231
msgid "Using '{0}' view: {1}\n"
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6410
4235
msgid "Views defined:\n"
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6419
4239
msgid "No views defined.\n"
4240
msgstr ""
4241
4242
#: bzrlib/builtins.py:6426
4243
msgid "Cannot change the 'off' pseudo view"
4244
msgstr ""
4245
4246
#: bzrlib/builtins.py:6434
4247
msgid "No current view.\n"
4248
msgstr ""
4249
4250
#: bzrlib/builtins.py:6437
4251
msgid "'{0}' view is: {1}\n"
4252
msgstr ""
4253
4254
#: bzrlib/builtins.py:6457
4255
msgid " <no hooks installed>\n"
4256
msgstr ""
4257
4258
#: bzrlib/builtins.py:6461
4259
msgid "Remove a branch."
4260
msgstr "Einen Zweig entfernen."
4261
4262
#: bzrlib/builtins.py:6463
4263
msgid ""
4264
"This will remove the branch from the specified location but \n"
4265
"will keep any working tree or repository in place."
4266
msgstr ""
4267
4268
#: bzrlib/builtins.py:6468
4269
msgid " Remove the branch at repo/trunk::"
4270
msgstr ""
4271
4272
#: bzrlib/builtins.py:6470
4273
msgid " bzr remove-branch repo/trunk"
4274
msgstr " bzr remove-branch repo/trunk"
4275
4276
#: bzrlib/builtins.py:6477
4277
msgid "Remove branch even if it is the active branch."
4278
msgstr "Zweig entfernen, selbst wenn es ein aktiver Zweig ist."
4279
4280
#: bzrlib/builtins.py:6491
4281
msgid "Branch is active. Use --force to remove it."
4282
msgstr "Zweig ist aktiv. Benutzen Sie --force, um ihn zu entfernen."
4283
4284
#: bzrlib/builtins.py:6495
4285
msgid "Plaintext diff output."
4286
msgstr ""
4287
4288
#: bzrlib/builtins.py:6496
4289
msgid "Temporarily set aside some changes from the current tree."
4290
msgstr ""
4291
4292
#: bzrlib/builtins.py:6498
4293
msgid ""
4294
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4295
"ie. out of the way, until a later time when you can bring them back from\n"
4296
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4297
"your working tree, and so they aren't propagated along with your branch nor\n"
4298
"will they survive its deletion."
4299
msgstr ""
4300
4301
#: bzrlib/builtins.py:6504
4302
msgid "If shelve --list is specified, previously-shelved changes are listed."
4303
msgstr ""
4304
4305
#: bzrlib/builtins.py:6506
4306
msgid ""
4307
"Shelve is intended to help separate several sets of changes that have\n"
4308
"been inappropriately mingled. If you just want to get rid of all changes\n"
4309
"and you don't need to restore them later, use revert. If you want to\n"
4310
"shelve all text changes at once, use shelve --all."
4311
msgstr ""
4312
4313
#: bzrlib/builtins.py:6511
4314
msgid ""
4315
"If filenames are specified, only the changes to those files will be\n"
4316
"shelved. Other files will be left untouched."
4317
msgstr ""
4318
4319
#: bzrlib/builtins.py:6514
4320
msgid ""
4321
"If a revision is specified, changes since that revision will be shelved."
4322
msgstr ""
4323
4324
#: bzrlib/builtins.py:6516
4325
msgid ""
4326
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4327
"restore the most recently shelved changes."
4328
msgstr ""
4329
4330
#: bzrlib/builtins.py:6519
4331
msgid ""
4332
"For complicated changes, it is possible to edit the changes in a separate\n"
4333
"editor program to decide what the file remaining in the working copy\n"
4334
"should look like. To do this, add the configuration option"
4335
msgstr ""
4336
4337
#: bzrlib/builtins.py:6523
4338
msgid " change_editor = PROGRAM @new_path @old_path"
4339
msgstr ""
4340
4341
#: bzrlib/builtins.py:6525
4342
msgid ""
4343
"where @new_path is replaced with the path of the new version of the \n"
4344
"file and @old_path is replaced with the path of the old version of \n"
4345
"the file. The PROGRAM should save the new file with the desired \n"
4346
"contents of the file in the working tree.\n"
4347
" "
4348
msgstr ""
4349
4350
#: bzrlib/builtins.py:6537
4351
msgid "Shelve all changes."
4352
msgstr ""
4353
4354
#: bzrlib/builtins.py:6539
4355
msgid "Method to use for writing diffs."
4356
msgstr ""
4357
4358
#: bzrlib/builtins.py:6539
4359
msgid "writer"
4360
msgstr ""
4361
4362
#: bzrlib/builtins.py:6543
4363
msgid "List shelved changes."
4364
msgstr ""
4365
4366
#: bzrlib/builtins.py:6545
4367
msgid "Destroy removed changes instead of shelving them."
4368
msgstr ""
4369
4370
#: bzrlib/builtins.py:6574
4371
msgid "No shelved changes."
4372
msgstr ""
4373
4374
#: bzrlib/builtins.py:6585
4375
msgid "Restore shelved changes."
4376
msgstr ""
4377
4378
#: bzrlib/builtins.py:6587
4379
msgid ""
4380
"By default, the most recently shelved changes are restored. However if you\n"
4381
"specify a shelf by id those changes will be restored instead. This works\n"
4382
"best when the changes don't depend on each other."
4383
msgstr ""
4384
4385
#: bzrlib/builtins.py:6596
4386
msgid "The action to perform."
4387
msgstr "Die auszuführende Aktion."
4388
4389
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4390
msgid "action"
4391
msgstr "Aktion"
4392
4393
#: bzrlib/builtins.py:6598
4394
msgid "Apply changes and remove from the shelf."
4395
msgstr ""
4396
4397
#: bzrlib/builtins.py:6599
4398
msgid "Show changes, but do not apply or remove them."
4399
msgstr "Änderungen anzeigen, aber nicht anwenden oder entfernen."
4400
4401
#: bzrlib/builtins.py:6600
4402
msgid ""
4403
"Instead of unshelving the changes, show the diff that would result from "
4404
"unshelving."
4405
msgstr ""
4406
4407
#: bzrlib/builtins.py:6602
4408
msgid "Delete changes without applying them."
4409
msgstr "Änderungen löschen ohne diese anzuwenden."
4410
4411
#: bzrlib/builtins.py:6603
4412
msgid "Apply changes but don't delete them."
4413
msgstr "Änderungen anwenden, aber diese nicht löschen."
4414
4415
#: bzrlib/builtins.py:6618
4416
msgid "Remove unwanted files from working tree."
4417
msgstr ""
4418
4419
#: bzrlib/builtins.py:6620
4420
msgid ""
4421
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4422
"files are never deleted."
4423
msgstr ""
4424
4425
#: bzrlib/builtins.py:6623
4426
msgid ""
4427
"Another class is 'detritus', which includes files emitted by bzr during\n"
4428
"normal operations and selftests. (The value of these files decreases with\n"
4429
"time.)"
4430
msgstr ""
4431
4432
#: bzrlib/builtins.py:6627
4433
msgid ""
4434
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4435
"flags are respected, and may be combined."
4436
msgstr ""
4437
4438
#: bzrlib/builtins.py:6630
4439
msgid "To check what clean-tree will do, use --dry-run."
4440
msgstr "Um zu prüfen, was clean-tree tun wird, --dry-run benutzen."
4441
4442
#: bzrlib/builtins.py:6633
4443
msgid "Delete all ignored files."
4444
msgstr "Alle ignorierten Dateien löschen."
4445
4446
#: bzrlib/builtins.py:6634
4447
msgid ""
4448
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4449
msgstr ""
4450
4451
#: bzrlib/builtins.py:6637
4452
msgid "Delete files unknown to bzr (default)."
4453
msgstr "Dateien löschen, die bzr nicht bekannt sind (Vorgabe)."
4454
4455
#: bzrlib/builtins.py:6638
4456
msgid "Show files to delete instead of deleting them."
4457
msgstr "Dateien zum Löschen anzeigen, anstelle diese zu löschen."
4458
4459
#: bzrlib/builtins.py:6640
4460
msgid "Do not prompt before deleting."
4461
msgstr "Vor dem Löschen nicht nachfragen."
4462
4463
#: bzrlib/bundle/__init__.py:59
4464
msgid "A directory cannot be a bundle"
4465
msgstr ""
4466
4467
#: bzrlib/bundle/apply_bundle.py:40
4468
msgid "Install revisions"
4469
msgstr "Revisionen installieren"
4470
4471
#: bzrlib/bundle/commands.py:64
4472
msgid "--verbose requires a merge directive"
4473
msgstr ""
4474
4475
#: bzrlib/bundle/commands.py:67
4476
msgid "Bundle format not supported"
4477
msgstr ""
4478
4479
#: bzrlib/bundle/commands.py:77
4480
msgid "Records\n"
4481
msgstr ""
4482
4483
#: bzrlib/bundle/commands.py:81
4484
msgid "{0}: {1} ({2} multiparent)\n"
4485
msgstr ""
4486
4487
#: bzrlib/bundle/commands.py:83
4488
#, python-format
4489
msgid "unique files: %d\n"
4490
msgstr ""
4491
4492
#: bzrlib/bundle/commands.py:92
4493
msgid "Revisions\n"
4494
msgstr "Revisionen\n"
4495
4496
#: bzrlib/bundle/commands.py:93
4497
#, python-format
4498
msgid "nicks: %s\n"
4499
msgstr ""
4500
4501
#: bzrlib/bundle/commands.py:95
4502
#, python-format
4503
msgid ""
4504
"committers: \n"
4505
"%s\n"
4506
msgstr ""
4507
4508
#: bzrlib/bundle/commands.py:103
4509
msgid "Decoded contents\n"
4510
msgstr ""
4511
4512
#: bzrlib/bundle/serializer/v4.py:327
4513
#, python-format
4514
msgid "Bundling %d revision."
4515
msgid_plural "Bundling %d revisions."
4516
msgstr[0] ""
4517
msgstr[1] ""
4518
4519
#: bzrlib/bzrdir.py:487
4520
msgid ""
4521
"making backup of {0}\n"
4522
" to {1}"
4523
msgstr ""
4524
4525
#: bzrlib/bzrdir.py:510
4526
msgid "renamed {0} to {1}"
4527
msgstr "{0} wurde in {1} umbenannt"
4528
4529
#: bzrlib/bzrdir.py:1639
4530
#, python-format
4531
msgid ""
4532
"Source repository format does not support stacking, using format:\n"
4533
" %s"
4534
msgstr ""
4535
4536
#: bzrlib/bzrdir.py:1659
4537
#, python-format
4538
msgid ""
4539
"Source branch format does not support stacking, using format:\n"
4540
" %s"
4541
msgstr ""
4542
4543
#: bzrlib/bzrdir.py:1805
4544
msgid "starting repository conversion"
4545
msgstr ""
4546
4547
#: bzrlib/bzrdir.py:2026
4548
msgid "Using default stacking branch {0} at {1}"
4549
msgstr ""
4550
4551
#: bzrlib/check.py:108
4552
msgid "check"
4553
msgstr "Prüfen"
4554
4555
#: bzrlib/check.py:110
4556
msgid "checking revisions"
4557
msgstr "Revisionen prüfen"
4558
4559
#: bzrlib/check.py:112
4560
msgid "checking commit contents"
4561
msgstr ""
4562
4563
#: bzrlib/check.py:114
4564
msgid "checking file graphs"
4565
msgstr ""
4566
4567
#: bzrlib/check.py:118
4568
msgid "checking branches and trees"
4569
msgstr ""
4570
4571
#: bzrlib/check.py:205
4572
msgid "checked repository {0} format {1}"
4573
msgstr ""
4574
4575
#: bzrlib/check.py:208
4576
#, python-format
4577
msgid "%6d revisions"
4578
msgstr "%6d Revisionen"
4579
4580
#: bzrlib/check.py:209
4581
#, python-format
4582
msgid "%6d file-ids"
4583
msgstr ""
4584
4585
#: bzrlib/check.py:211
4586
#, python-format
4587
msgid "%6d unreferenced text versions"
4588
msgstr ""
4589
4590
#: bzrlib/check.py:215
4591
msgid "unreferenced version: {{{0}}} in {1}"
4592
msgstr ""
4593
4594
#: bzrlib/check.py:218
4595
#, python-format
4596
msgid "%6d revisions are missing inventory_sha1"
4597
msgstr ""
4598
4599
#: bzrlib/check.py:221
4600
#, python-format
4601
msgid "%6d revisions are mentioned but not present"
4602
msgstr ""
4603
4604
#: bzrlib/check.py:224
4605
#, python-format
4606
msgid "%6d ghost revisions"
4607
msgstr "%6d Geister-Revisionen"
4608
4609
#: bzrlib/check.py:229
4610
#, python-format
4611
msgid "%6d revisions missing parents in ancestry"
4612
msgstr ""
4613
4614
#: bzrlib/check.py:233
4615
#, python-format
4616
msgid " %s should be in the ancestry for:"
4617
msgstr ""
4618
4619
#: bzrlib/check.py:237
4620
#, python-format
4621
msgid "%6d inconsistent parents"
4622
msgstr ""
4623
4624
#: bzrlib/check.py:241
4625
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4626
msgstr ""
4627
4628
#: bzrlib/check.py:247
4629
#, python-format
4630
msgid "%6d revisions have incorrect parents in the revision index"
4631
msgstr ""
4632
4633
#: bzrlib/check.py:253
4634
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4635
msgstr ""
4636
4637
#: bzrlib/check.py:267
4638
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4639
msgstr ""
4640
4641
#: bzrlib/check.py:296
4642
msgid ""
4643
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4644
"{{{4}}}"
4645
msgstr ""
4646
4647
#: bzrlib/check.py:354
4648
#, python-format
4649
msgid "Checking branch at '%s'."
4650
msgstr "Zweig wird geprüft bei »%s«."
4651
4652
#: bzrlib/check.py:374
4653
#, python-format
4654
msgid "Checking working tree at '%s'."
4655
msgstr ""
4656
4657
#: bzrlib/check.py:427 bzrlib/check.py:441
4658
msgid "No branch found at specified location."
4659
msgstr ""
4660
4661
#: bzrlib/check.py:429 bzrlib/check.py:439
4662
msgid "No working tree found at specified location."
4663
msgstr ""
4664
4665
#: bzrlib/check.py:432
4666
#, python-format
4667
msgid "Checking repository at '%s'."
4668
msgstr ""
4669
4670
#: bzrlib/check.py:443
4671
msgid "No repository found at specified location."
4672
msgstr ""
4673
4674
#: bzrlib/clean_tree.py:63
4675
msgid "Nothing to delete."
4676
msgstr "Nichts zu löschen."
4677
4678
#: bzrlib/clean_tree.py:68
4679
msgid "Are you sure you wish to delete these"
4680
msgstr "Sind Sie sicher, dass Sie diese löschen möchten"
4681
4682
#: bzrlib/clean_tree.py:70
4683
msgid "Canceled"
4684
msgstr "Abgebrochen"
4685
4686
#: bzrlib/clean_tree.py:107
4687
#, python-format
4688
msgid "unable to remove %s"
4689
msgstr "%s kann nicht entfernt werden"
4690
4691
#: bzrlib/clean_tree.py:111
4692
msgid "deleting paths:"
4693
msgstr "Pfade werden gelöscht:"
4694
4695
#: bzrlib/clean_tree.py:125
4696
msgid "unable to remove \"{0}\": {1}."
4697
msgstr "»{0}« kann nicht entfernt werden: {1}."
4698
4699
#: bzrlib/clean_tree.py:130
4700
msgid "No files deleted."
4701
msgstr "Keine Dateien gelöscht."
4702
4703
#: bzrlib/cmd_version_info.py:47
4704
msgid "No known version info format {0}. Supported types are: {1}"
4705
msgstr ""
4706
"Unbekanntes Format {0} für Versionsinformationen. Unterstützte Typen sind: "
4707
"{1}"
4708
4709
#: bzrlib/cmd_version_info.py:52
4710
msgid "Version info in Custom template-based format."
4711
msgstr ""
4712
4713
#: bzrlib/cmd_version_info.py:52
4714
msgid "Version info in Python format."
4715
msgstr "Versionsinformationen im Python-Format."
4716
4717
#: bzrlib/cmd_version_info.py:52
4718
msgid "Version info in RIO (simple text) format (default)."
4719
msgstr "Versionsinformationen im RIO (nur Text)-Format (Vorgabe)."
4720
4721
#: bzrlib/cmd_version_info.py:53
4722
msgid "Show version information about this tree."
4723
msgstr ""
4724
4725
#: bzrlib/cmd_version_info.py:55
4726
msgid ""
4727
"You can use this command to add information about version into\n"
4728
"source code of an application. The output can be in one of the\n"
4729
"supported formats or in a custom format based on a template."
4730
msgstr ""
4731
4732
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4733
#: en/help_topics/configuration.txt:722
4734
msgid "For example::"
4735
msgstr "Zum Beispiel:"
4736
4737
#: bzrlib/cmd_version_info.py:61
4738
msgid ""
4739
" bzr version-info --custom \\\n"
4740
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4741
msgstr ""
4742
4743
#: bzrlib/cmd_version_info.py:64
4744
msgid ""
4745
"will produce a C header file with formatted string containing the\n"
4746
"current revision number. Other supported variables in templates are:"
4747
msgstr ""
4748
4749
#: bzrlib/cmd_version_info.py:67
4750
msgid ""
4751
" * {date} - date of the last revision\n"
4752
" * {build_date} - current date\n"
4753
" * {revno} - revision number\n"
4754
" * {revision_id} - revision id\n"
4755
" * {branch_nick} - branch nickname\n"
4756
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4757
" otherwise 1"
4758
msgstr ""
4759
4760
#: bzrlib/cmd_version_info.py:77
4761
msgid "Select the output format."
4762
msgstr "Wählen Sie das Ausgabeformat."
4763
4764
#: bzrlib/cmd_version_info.py:81
4765
msgid "Include all possible information."
4766
msgstr "Sämtliche verfügbaren Informationen einschließen."
4767
4768
#: bzrlib/cmd_version_info.py:82
4769
msgid "Check if tree is clean."
4770
msgstr ""
4771
4772
#: bzrlib/cmd_version_info.py:84
4773
msgid "Include the revision-history."
4774
msgstr "Revisionsverlauf einschließen."
4775
4776
#: bzrlib/cmd_version_info.py:86
4777
msgid "Include the last revision for each file."
4778
msgstr "Neueste Revision jeder Datei einschließen."
4779
4780
#: bzrlib/cmd_version_info.py:87
4781
msgid "Template for the output."
4782
msgstr ""
4783
4784
#: bzrlib/cmd_version_info.py:101
4785
msgid "bzr version-info --revision takes exactly one revision specifier"
4786
msgstr ""
4787
4788
#: bzrlib/commands.py:229
4789
#, python-format
4790
msgid "unknown command \"%s\""
4791
msgstr "Unbekannter Befehl »%s«"
4792
4793
#: bzrlib/commands.py:476
4794
msgid "No help for this command."
4795
msgstr "Keine Hilfe zu diesem Befehl verfügbar."
4796
4797
#: bzrlib/commands.py:489
4798
#, python-format
4799
msgid ":Purpose: %s\n"
4800
msgstr ":Zweck: %s\n"
4801
4802
#: bzrlib/commands.py:491
4803
#, python-format
4804
msgid ""
4805
":Usage:\n"
4806
"%s\n"
4807
msgstr ""
4808
":Aufruf:\n"
4809
"%s\n"
4810
4811
#: bzrlib/commands.py:493
4812
#, python-format
4813
msgid ":Usage: %s\n"
4814
msgstr ":Aufruf: %s\n"
4815
4816
#: bzrlib/commands.py:512
4817
#, python-format
4818
msgid ":Options:%s"
4819
msgstr ":Optionen: %s"
4820
4821
#: bzrlib/commands.py:523
4822
#, python-format
4823
msgid ""
4824
":Description:\n"
4825
" %s\n"
4826
"\n"
4827
msgstr ""
4828
":Beschreibung:\n"
4829
" %s\n"
4830
"\n"
4831
4832
#: bzrlib/commands.py:533
4833
#, python-format
4834
msgid ""
4835
"See bzr help %s for more details and examples.\n"
4836
"\n"
4837
msgstr ""
4838
4839
#: bzrlib/commands.py:538
4840
msgid ":Aliases: "
4841
msgstr ":Aliase: "
4842
4843
#: bzrlib/commands.py:542
4844
#, python-format
4845
msgid ":From: plugin \"%s\"\n"
4846
msgstr ":Von: Erweiterung »%s«\n"
4847
4848
#: bzrlib/commands.py:554
4849
msgid ":doc:`{0} <{1}-help>`"
4850
msgstr ""
4851
4852
#: bzrlib/commands.py:558
4853
#, python-format
4854
msgid ":See also: %s"
4855
msgstr ":Siehe auch: %s"
4856
4857
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4858
msgid "Only ASCII permitted in option names"
4859
msgstr ""
4860
4861
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4862
msgid "command {0!r} needs one or more {1}"
4863
msgstr ""
4864
4865
#: bzrlib/commands.py:868
4866
msgid "command {0!r} requires argument {1}"
4867
msgstr ""
4868
4869
#: bzrlib/commands.py:875
4870
msgid "extra argument to command {0}: {1}"
4871
msgstr ""
4872
4873
#: bzrlib/commands.py:972
4874
#, python-format
4875
msgid "Profile data written to \"%s\"."
4876
msgstr ""
4877
4878
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4879
msgid "added"
4880
msgstr "Hinzugefügt"
4881
4882
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4883
msgid "modified"
4884
msgstr "Geändert"
4885
4886
#: bzrlib/commit.py:131
4887
#, python-format
4888
msgid "Committing%s"
4889
msgstr ""
4890
4891
#: bzrlib/commit.py:134
4892
#, python-format
4893
msgid "Committed revision %d."
4894
msgstr ""
4895
4896
#: bzrlib/commit.py:143
4897
#, python-format
4898
msgid "deleted %s"
4899
msgstr "%s gelöscht"
4900
4901
#: bzrlib/commit.py:146
4902
#, python-format
4903
msgid "missing %s"
4904
msgstr "%s fehlt"
4905
4906
#: bzrlib/commit.py:511
4907
msgid ""
4908
"Conflicting tags in bound branch:\n"
4909
"{0}"
4910
msgstr ""
4911
4912
#: bzrlib/commit.py:742
4913
msgid "renamed"
4914
msgstr "Umbenannt"
4915
4916
#: bzrlib/commit.py:976
4917
msgid "unchanged"
4918
msgstr "Ungeändert"
4919
4920
#: bzrlib/commit.py:998
4921
msgid "{0} [{1}] - Stage"
4922
msgstr ""
4923
4924
#: bzrlib/commit.py:1001
4925
#, python-format
4926
msgid "%s - Stage"
4927
msgstr ""
4928
4929
#: bzrlib/commit_signature_commands.py:34
4930
msgid "Sign all commits by a given committer."
4931
msgstr ""
4932
4933
#: bzrlib/commit_signature_commands.py:36
4934
msgid ""
4935
"If location is not specified the local tree is used.\n"
4936
"If committer is not specified the default committer is used."
4937
msgstr ""
4938
4939
#: bzrlib/commit_signature_commands.py:39
4940
msgid "This does not sign commits that already have signatures."
4941
msgstr ""
4942
4943
#: bzrlib/commit_signature_commands.py:47
4944
msgid ""
4945
"Don't actually sign anything, just print the revisions that would be signed."
4946
msgstr ""
4947
4948
#: bzrlib/commit_signature_commands.py:98
4949
#, python-format
4950
msgid "Signed %d revision.\n"
4951
msgid_plural "Signed %d revisions.\n"
4952
msgstr[0] ""
4953
msgstr[1] ""
4954
4955
#: bzrlib/commit_signature_commands.py:103
4956
msgid "Verify all commit signatures."
4957
msgstr ""
4958
4959
#: bzrlib/commit_signature_commands.py:105
4960
msgid ""
4961
"Verifies that all commits in the branch are signed by known GnuPG keys."
4962
msgstr ""
4963
4964
#: bzrlib/commit_signature_commands.py:110
4965
msgid ""
4966
"Comma separated list of GPG key patterns which are acceptable for "
4967
"verification."
4968
msgstr ""
4969
4970
#: bzrlib/commit_signature_commands.py:148
4971
msgid "Cannot verify a range of non-revision-history revisions"
4972
msgstr ""
4973
4974
#: bzrlib/commit_signature_commands.py:166
4975
msgid "All commits signed with verifiable keys"
4976
msgstr ""
4977
4978
#: bzrlib/config.py:436
4979
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4980
msgstr ""
4981
4982
#: bzrlib/config.py:2452
4983
msgid "{0} is not an SI unit."
4984
msgstr ""
4985
4986
#: bzrlib/config.py:2971
4987
msgid ""
4988
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4989
"will be saved."
4990
msgstr ""
4991
4992
#: bzrlib/config.py:3116
4993
#, python-format
4994
msgid "Invalid '%s', should be of the form 'name=value'"
4995
msgstr ""
4996
4997
#: bzrlib/config.py:4018
4998
msgid "Display, set or remove a configuration option."
4999
msgstr "Eine Konfigurationsoption anzeigen, festlegen oder löschen."
5000
5001
#: bzrlib/config.py:4020
5002
msgid "Display the active value for a given option."
5003
msgstr "Aktiven Wert zur angegebenen Option anzeigen."
5004
5005
#: bzrlib/config.py:4022
5006
msgid ""
5007
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5008
"matching options are displayed mentioning their scope. The active value\n"
5009
"that bzr will take into account is the first one displayed for each option."
5010
msgstr ""
5011
5012
#: bzrlib/config.py:4026
5013
msgid "If no NAME is given, --all .* is implied."
5014
msgstr ""
5015
5016
#: bzrlib/config.py:4028
5017
msgid ""
5018
"Setting a value is achieved by using name=value without spaces. The value\n"
5019
"is set in the most relevant scope and can be checked by displaying the\n"
5020
"option again."
5021
msgstr ""
5022
5023
#: bzrlib/config.py:4040
5024
msgid "Reduce the scope to the specified configuration file."
5025
msgstr ""
5026
5027
#: bzrlib/config.py:4044
5028
msgid "Display all the defined values for the matching options."
5029
msgstr "Alle definierten Werte für die zutreffenden Optionen anzeigen."
5030
5031
#: bzrlib/config.py:4046
5032
msgid "Remove the option from the configuration file."
5033
msgstr "Die Option aus der Konfigurationsdatei entfernen."
5034
5035
#: bzrlib/conflicts.py:50
5036
msgid "List files with conflicts."
5037
msgstr "In Konflikt stehende Dateien auflisten."
5038
5039
#: bzrlib/conflicts.py:57
5040
msgid ""
5041
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5042
"is supplied, the pathnames of files with text conflicts are listed,\n"
5043
"instead. (This is useful for editing all files with text conflicts.)"
5044
msgstr ""
5045
5046
#: bzrlib/conflicts.py:61
5047
msgid "Use bzr resolve when you have fixed a problem."
5048
msgstr "Benutzen Sie bzr resolve, wenn Sie ein Problem gelöst haben."
5049
5050
#: bzrlib/conflicts.py:66
5051
msgid "List paths of files with text conflicts."
5052
msgstr ""
5053
5054
#: bzrlib/conflicts.py:85
5055
msgid "Marks the conflict as resolved."
5056
msgstr ""
5057
5058
#: bzrlib/conflicts.py:88
5059
msgid "Resolve the conflict preserving the version in the working tree."
5060
msgstr ""
5061
5062
#: bzrlib/conflicts.py:91
5063
msgid "Resolve the conflict taking the merged version into account."
5064
msgstr ""
5065
5066
#: bzrlib/conflicts.py:98
5067
msgid "How to resolve the conflict."
5068
msgstr ""
5069
5070
#: bzrlib/conflicts.py:104
5071
msgid "Mark a conflict as resolved."
5072
msgstr ""
5073
5074
#: bzrlib/conflicts.py:111
5075
msgid ""
5076
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5077
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5078
"as\n"
5079
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5080
msgstr ""
5081
5082
#: bzrlib/conflicts.py:119
5083
msgid "Resolve all conflicts in this tree."
5084
msgstr ""
5085
5086
#: bzrlib/conflicts.py:126
5087
msgid "If --all is specified, no FILE may be provided"
5088
msgstr ""
5089
5090
#: bzrlib/conflicts.py:151
5091
#, python-format
5092
msgid "%d conflict auto-resolved."
5093
msgid_plural "%d conflicts auto-resolved."
5094
msgstr[0] "%d Konflikt automatisch aufgelöst."
5095
msgstr[1] "%d Konflikte automatisch aufgelöst."
5096
5097
#: bzrlib/conflicts.py:154
5098
msgid "Remaining conflicts:"
5099
msgstr "Verbleibende Konflikte:"
5100
5101
#: bzrlib/conflicts.py:159
5102
msgid "All conflicts resolved."
5103
msgstr "Alle Konflikte gelöst."
5104
5105
#: bzrlib/conflicts.py:168
5106
msgid "{0} conflict resolved, {1} remaining"
5107
msgid_plural "{0} conflicts resolved, {1} remaining"
5108
msgstr[0] ""
5109
msgstr[1] ""
5110
5111
#: bzrlib/controldir.py:712
5112
msgid "{0} is{1} redirected to {2}"
5113
msgstr ""
5114
5115
#: bzrlib/diff.py:399
5116
#, python-format
5117
msgid "*** Ignoring files outside view. View is %s"
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:157
5121
msgid "The tree builder is already building a tree."
5122
msgstr ""
5123
5124
#: bzrlib/errors.py:178
5125
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:197
5129
msgid ""
5130
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5131
"versions \"%(minimum)s\" to \"%(current)s\"."
5132
msgstr ""
5133
5134
#: bzrlib/errors.py:209
5135
msgid "The transport '%(transport)s' is only accessible within this process."
5136
msgstr ""
5137
5138
#: bzrlib/errors.py:227
5139
msgid "Invalid revision number %(revno)s"
5140
msgstr "Ungültige Revisionsnummer %(revno)s"
5141
5142
#: bzrlib/errors.py:236
5143
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5144
msgstr ""
5145
5146
#: bzrlib/errors.py:247
5147
msgid "Reserved revision-id {%(revision_id)s}"
5148
msgstr ""
5149
5150
#: bzrlib/errors.py:261
5151
msgid "There is no public branch set for \"%(branch_url)s\"."
5152
msgstr "Kein öffentlicher Zweig für »%(branch_url)s« festgelegt."
5153
5154
#: bzrlib/errors.py:271
5155
msgid ""
5156
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5157
"obtain a list of topics."
5158
msgstr ""
5159
5160
#: bzrlib/errors.py:280
5161
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5162
msgstr ""
5163
5164
#: bzrlib/errors.py:290
5165
msgid ""
5166
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:299
5170
msgid "The branch '%(branch)s' is not stacked."
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:313
5174
msgid "No WorkingTree exists for \"%(base)s\"."
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:322
5178
msgid "Not currently building a tree."
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:327
5182
msgid "%(url)s is not a local path."
5183
msgstr "%(url)s ist kein lokaler Pfad."
5184
5185
#: bzrlib/errors.py:355
5186
msgid "%(not_locked)r is not write locked but needs to be."
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:363
5190
msgid "Error in command line options"
5191
msgstr "Fehler in den Befehlszeilenoptionen"
5192
5193
#: bzrlib/errors.py:368
5194
msgid "%(value)s is not an index of type %(_type)s."
5195
msgstr "%(value)s ist kein Index vom Typ %(_type)s."
5196
5197
#: bzrlib/errors.py:378
5198
msgid "Error in data for index %(value)s."
5199
msgstr "Fehler in den Daten für Index %(value)s."
5200
5201
#: bzrlib/errors.py:387
5202
msgid "The key '%(key)s' is already in index '%(index)s'."
5203
msgstr "Der Schlüssel »%(key)s« ist bereits im Index »%(index)s«."
5204
5205
#: bzrlib/errors.py:397
5206
msgid "The key '%(key)s' is not a valid key."
5207
msgstr "Der Schlüssel »%(key)s« ist ein ungültiger Schlüssel."
5208
5209
#: bzrlib/errors.py:406
5210
msgid "Could not parse options for index %(value)s."
5211
msgstr "Optionen für Index %(value)s konnten nicht verarbeitet werden."
5212
5213
#: bzrlib/errors.py:415
5214
msgid "The value '%(value)s' is not a valid value."
5215
msgstr "Der Wert »%(value)s« ist ein ungültiger Wert."
5216
5217
#: bzrlib/errors.py:424
5218
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5219
msgstr "Ungültiger Wert »%(value)s« für die Option »%(name)s«."
5220
5221
#: bzrlib/errors.py:443
5222
msgid "Generic path error: %(path)r%(extra)s)"
5223
msgstr "Allgemeiner Fehler im Pfad: %(path)r%(extra)s)"
5224
5225
#: bzrlib/errors.py:456
5226
msgid "No such file: %(path)r%(extra)s"
5227
msgstr "Datei existiert nicht: %(path)r%(extra)s"
5228
5229
#: bzrlib/errors.py:461
5230
msgid "File exists: %(path)r%(extra)s"
5231
msgstr "Datei existiert: %(path)r%(extra)s"
5232
5233
#: bzrlib/errors.py:467
5234
msgid ""
5235
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5236
"after to tell bzr about a rename that has already happened)%(extra)s"
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:483
5240
msgid "\"%(path)s\" is not a directory %(extra)s"
5241
msgstr "»%(path)s« ist kein Verzeichnis %(extra)s"
5242
5243
#: bzrlib/errors.py:488
5244
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5245
msgstr ""
5246
5247
#: bzrlib/errors.py:493
5248
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5249
msgstr "Verzeichnis ist nicht leer: »%(path)s«%(extra)s"
5250
5251
#: bzrlib/errors.py:498
5252
msgid "Hard-linking \"%(path)s\" is not supported"
5253
msgstr ""
5254
5255
#: bzrlib/errors.py:513
5256
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:518
5260
msgid "Permission denied: \"%(path)s\"%(extra)s"
5261
msgstr "Zugriff verweigert: »%(path)s«%(extra)s"
5262
5263
#: bzrlib/errors.py:523
5264
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:528
5268
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:539
5272
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5273
msgstr ""
5274
5275
#: bzrlib/errors.py:561
5276
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:571
5280
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:579
5284
msgid ""
5285
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5286
"upgrade the branch to permit branch stacking."
5287
msgstr ""
5288
5289
#: bzrlib/errors.py:590
5290
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:600
5294
msgid ""
5295
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5296
"need to upgrade the repository to permit branch stacking."
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:611
5300
msgid "Error reading from %(path)r."
5301
msgstr "Fehler beim Lesen von %(path)r."
5302
5303
#: bzrlib/errors.py:630
5304
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:646
5308
msgid "Path \"%(path)s\" is not unicode normalized"
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:654
5312
msgid "Not a branch: \"%(path)s\"%(detail)s."
5313
msgstr "Kein Zweig: »%(path)s«%(detail)s."
5314
5315
#: bzrlib/errors.py:696
5316
msgid "No submit branch available for branch \"%(path)s\""
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:705
5320
msgid "A control directory already exists: \"%(path)s\"."
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:710
5324
msgid "Already a branch: \"%(path)s\"."
5325
msgstr "Bereits ein Zweig: »%(path)s«."
5326
5327
#: bzrlib/errors.py:715
5328
msgid "Invalid branch name: %(name)s"
5329
msgstr "Ungültiger Zweigname: %(name)s"
5330
5331
#: bzrlib/errors.py:724
5332
msgid "Parent branch already exists: \"%(path)s\"."
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:730
5336
msgid ""
5337
"Directory contains a branch, but no working tree (use bzr checkout if you "
5338
"wish to build a working tree): \"%(path)s\""
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:735
5342
msgid ""
5343
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:745
5347
msgid ""
5348
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5349
msgstr ""
5350
5351
#: bzrlib/errors.py:755
5352
msgid "No repository present: \"%(path)s\""
5353
msgstr ""
5354
5355
#: bzrlib/errors.py:762
5356
msgid ""
5357
"Unsupported branch format: %(format)s\n"
5358
"Please run 'bzr upgrade'"
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:768
5362
msgid "Unknown %(kind)s format: %(format)r"
5363
msgstr "Unbekanntes %(kind)s-Format: %(format)r"
5364
5365
#: bzrlib/errors.py:777
5366
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5367
msgstr ""
5368
"Das Format %(format)s ist inkompatibel zu der .bzr-Version %(bzrdir)s."
5369
5370
#: bzrlib/errors.py:787
5371
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:802
5375
msgid ""
5376
"%(target)s\n"
5377
"is not compatible with\n"
5378
"%(source)s\n"
5379
"%(details)s"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:818
5383
msgid "Revision is not compatible with %(repo_format)s"
5384
msgstr "Die Revision ist inkompatibel zu %(repo_format)s"
5385
5386
#: bzrlib/errors.py:828
5387
msgid "%(context_info)s%(path)s is already versioned."
5388
msgstr "%(context_info)s%(path)s ist bereits versioniert."
5389
5390
#: bzrlib/errors.py:849
5391
msgid "%(context_info)s%(path)s is not versioned."
5392
msgstr "%(context_info)s%(path)s ist nicht versioniert."
5393
5394
#: bzrlib/errors.py:870
5395
msgid "Path(s) are not versioned: %(paths_as_string)s"
5396
msgstr "Pfad(e) ist/sind nicht versioniert: %(paths_as_string)s"
5397
5398
#: bzrlib/errors.py:881
5399
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5400
msgstr "Pfad(e) existiert/existieren nicht: %(paths_as_string)s%(extra)s"
5401
5402
#: bzrlib/errors.py:900
5403
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5404
msgstr ""
5405
5406
#: bzrlib/errors.py:908
5407
msgid ""
5408
"Filename %(filename)r is not valid in your current filesystem encoding "
5409
"%(fs_encoding)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:919
5413
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:937
5417
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:976
5421
msgid "Cannot lock %(lock)s: %(why)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:986
5425
msgid ""
5426
"A transaction related operation was attempted after the transaction finished."
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1013
5430
msgid "Cannot lock: transport is read only: %(transport)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1021
5434
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1032
5438
msgid ""
5439
"Lock was broken while still open: %(lock)s - check storage consistency!"
5440
msgstr ""
5441
5442
#: bzrlib/errors.py:1043
5443
msgid ""
5444
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5445
"%(holder)r, wanted to break %(target)r"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1055
5449
msgid ""
5450
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5451
"Use 'bzr break-lock' to clear it"
5452
msgstr ""
5453
5454
#: bzrlib/errors.py:1068
5455
msgid "Lock not held: %(lock)s"
5456
msgstr ""
5457
5458
#: bzrlib/errors.py:1097
5459
msgid "No changes to commit"
5460
msgstr ""
5461
5462
#: bzrlib/errors.py:1102
5463
msgid ""
5464
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1112
5468
msgid ""
5469
"Excluding paths during commit is not supported by repository at "
5470
"%(repository)r."
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1121
5474
msgid ""
5475
"The specified commit message contains characters unsupported by the current "
5476
"encoding."
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1127
5480
msgid "Upgrade URL cannot work with readonly URLs."
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1132
5484
msgid "The branch format %(format)s is already at the most recent format."
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1155
5488
msgid "Option --change does not accept revision ranges"
5489
msgstr "Die Option --change akzeptiert keine Revisionsbereiche"
5490
5491
#: bzrlib/errors.py:1160
5492
msgid "No namespace registered for string: %(spec)r"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1179
5496
msgid ""
5497
"Requested revision: '%(spec)s' does not exist in branch: "
5498
"%(branch_url)s%(extra)s"
5499
msgstr ""
5500
"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: "
5501
"%(branch_url)s%(extra)s"
5502
5503
#: bzrlib/errors.py:1193
5504
msgid ""
5505
"Operation denied because it would change the main history, which is not "
5506
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1204
5510
msgid ""
5511
"These branches have diverged. Use the missing command to see how.\n"
5512
"Use the merge command to reconcile them."
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1224
5516
msgid ""
5517
"Branches have no common ancestor, and no merge base revision was specified."
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1230
5521
msgid ""
5522
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:1236
5526
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:1245
5530
msgid ""
5531
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5532
msgstr ""
5533
5534
#: bzrlib/errors.py:1254
5535
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:1263
5539
msgid "Branch %(branch)s has no commits."
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:1281
5543
msgid ""
5544
"Bound branch %(branch)s is out of date with master branch "
5545
"%(master)s.%(extra_help)s"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1293
5549
msgid ""
5550
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5551
"bound to %(remote)s."
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:1305
5555
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:1314
5559
msgid ""
5560
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5561
"%(error)s"
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:1326
5565
msgid "Error in processing weave: %(msg)s"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:1335
5569
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5570
msgstr "Revision {%(revision_id)s} ist bereits in %(weave)s vorhanden"
5571
5572
#: bzrlib/errors.py:1346
5573
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5574
msgstr "Revision {%(revision_id)s} ist nicht in %(weave)s vorhanden"
5575
5576
#: bzrlib/errors.py:1356
5577
msgid "Weave invariant violated: %(what)s"
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:1365
5581
msgid "Parents are mismatched between two revisions. %(msg)s"
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:1387
5585
msgid ""
5586
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5587
"%(weave_b)s"
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:1399
5591
msgid "Versioned file error"
5592
msgstr "Fehler bei versionierter Datei"
5593
5594
#: bzrlib/errors.py:1404
5595
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5596
msgstr "Revision {%(revision_id)s} ist nicht in »%(file_id)s« vorhanden."
5597
5598
#: bzrlib/errors.py:1414
5599
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5600
msgstr "Revision {%(revision_id)s} ist bereits in »%(file_id)s« vorhanden."
5601
5602
#: bzrlib/errors.py:1424
5603
msgid "Text did not match its checksum: %(msg)s"
5604
msgstr "Der Text entsprach nicht seiner Prüfsumme: %(msg)s"
5605
5606
#: bzrlib/errors.py:1550
5607
msgid "Export format %(format)r not supported"
5608
msgstr "Exportformat %(format)r wird nicht unterstützt"
5609
5610
#: bzrlib/errors.py:1559
5611
msgid "Transport error: %(msg)s %(orig_error)s"
5612
msgstr "Übertragungsfehler: %(msg)s %(orig_error)s"
5613
5614
#: bzrlib/errors.py:1585
5615
msgid "Generic bzr smart protocol error: %(details)s"
5616
msgstr "Allgemeiner bzr-Smart-Protokoll-Fehler: %(details)s"
5617
5618
#: bzrlib/errors.py:1593
5619
msgid "Received bad protocol version marker: %(marker)r"
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:1625
5623
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:1630
5627
msgid "Connection error: %(msg)s %(orig_error)s"
5628
msgstr "Verbindungsfehler: %(msg)s %(orig_error)s"
5629
5630
#: bzrlib/errors.py:1635
5631
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5632
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5633
5634
#: bzrlib/errors.py:1656
5635
msgid "Connection closed: %(msg)s %(orig_error)s"
5636
msgstr "Verbindung geschlossen: %(msg)s %(orig_error)s"
5637
5638
#: bzrlib/errors.py:1661
5639
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5640
msgstr "Verbindung abgelaufen: %(msg)s%(orig_error)s"
5641
5642
#: bzrlib/errors.py:1666
5643
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:1676
5647
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5648
msgstr "Ungültige HTTP-Antwort für %(path)s: %(msg)s%(orig_error)s"
5649
5650
#: bzrlib/errors.py:1691
5651
msgid "Certificate error: %(error)s"
5652
msgstr "Zertifikatsfehler: %(error)s"
5653
5654
#: bzrlib/errors.py:1699
5655
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5656
msgstr "Ungültiger HTTP-Bereich %(range)r für %(path)s: %(msg)s"
5657
5658
#: bzrlib/errors.py:1713
5659
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5660
msgstr "»HTTP MIME Boundary« für %(path)s fehlt: %(msg)sy"
5661
5662
#: bzrlib/errors.py:1721
5663
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5664
msgstr "Ungültiger HTTP-Content-type »%(ctype)s« für %(path)s: %(msg)s"
5665
5666
#: bzrlib/errors.py:1730
5667
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5668
msgstr "%(source)s wird%(permanently)s umgeleitet nach %(target)s"
5669
5670
#: bzrlib/errors.py:1744
5671
msgid "Too many redirections"
5672
msgstr "Zu viele Umleitungen"
5673
5674
#: bzrlib/errors.py:1749
5675
msgid "Working tree has conflicts."
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:1753
5679
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5680
msgstr "Konfigurationsdatei %(filename)s ist nicht UTF-8-kodiert\n"
5681
5682
#: bzrlib/errors.py:1762
5683
msgid ""
5684
"Error(s) parsing config file %(filename)s:\n"
5685
"%(errors)s"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:1772
5689
msgid ""
5690
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5691
"See ``bzr help %(name)s``"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:1782
5695
msgid "%(username)r does not seem to contain a reasonable email address"
5696
msgstr "%(username)r scheint keine vernünftige E-Mail-Adresse zu haben"
5697
5698
#: bzrlib/errors.py:1791
5699
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:1799
5703
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:1807
5707
msgid "Unable to import library \"%(library)s\": %(error)s"
5708
msgstr "Importieren der Bibliothek »%(library)s« nicht möglich: %(error)s"
5709
5710
#: bzrlib/errors.py:1815
5711
msgid "python-gpgme is not installed, it is needed to verify signatures"
5712
msgstr ""
5713
5714
#: bzrlib/errors.py:1823
5715
msgid ""
5716
"The working tree for %(basedir)s has changed since the last commit, but "
5717
"weave merge requires that it be unchanged"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:1833
5721
msgid ""
5722
"Can't reprocess and show base, because reprocessing obscures the "
5723
"relationship of conflicting lines to the base"
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:1839
5727
msgid "Cycle in graph %(graph)r"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:1867
5731
msgid "File %(filename)s is not conflicted."
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:1889
5735
msgid "No bundle was found in \"%(filename)s\"."
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:1898
5739
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:1908
5743
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5744
msgstr "Im Zweig %(base)s fehlt Revision %(text_revision)s von %(file_id)s"
5745
5746
#: bzrlib/errors.py:1921
5747
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:1931
5751
msgid "Key %(key)s is already present in map"
5752
msgstr ""
5753
5754
#: bzrlib/errors.py:1936
5755
msgid "The prefix %(prefix)s is in the help search path twice."
5756
msgstr ""
5757
5758
#: bzrlib/errors.py:1946
5759
msgid ""
5760
"No final name for trans_id %(trans_id)r\n"
5761
"file-id: %(file_id)r\n"
5762
"root trans-id: %(root_trans_id)r\n"
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:1978
5766
msgid "Attempt to reuse a transform that has already been applied."
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:1983
5770
msgid "Moving the root directory is not supported at this time"
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:1988
5774
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5775
msgstr "Umbenennen von %(from_path)s in %(to_path)s gescheitert: %(why)s"
5776
5777
#: bzrlib/errors.py:1999
5778
msgid ""
5779
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5780
msgstr ""
5781
5782
#: bzrlib/errors.py:2035
5783
msgid ""
5784
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2065
5788
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:2073
5792
msgid "Nothing to merge."
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2078
5796
msgid "Format %(format)s cannot be initialised by this version of bzr."
5797
msgstr ""
5798
"Das Format %(format)s kann von dieser Bazaar-Version nicht initialisiert "
5799
"werden."
5800
5801
#: bzrlib/errors.py:2087
5802
msgid ""
5803
"Cannot convert from format %(from_format)s to format %(format)s. "
5804
"%(problem)s"
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:2099
5808
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:2107
5812
msgid "%(exe_name)s could not be found on this machine"
5813
msgstr "%(exe_name)s konnte nicht auf diesem Rechner gefunden werden"
5814
5815
#: bzrlib/errors.py:2115
5816
msgid "Diff is not installed on this machine: %(msg)s"
5817
msgstr "Diff ist auf diesem Rechner nicht installiert: %(msg)s"
5818
5819
#: bzrlib/errors.py:2123
5820
msgid "Diff3 is not installed on this machine."
5821
msgstr "Diff3 ist auf diesem Rechner nicht installiert."
5822
5823
#: bzrlib/errors.py:2129
5824
msgid "The content being inserted is already present."
5825
msgstr "Der gerade eingefügte Inhalt ist bereits vorhanden."
5826
5827
#: bzrlib/errors.py:2134
5828
msgid ""
5829
"This tree contains left-over files from a failed operation.\n"
5830
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5831
"to\n"
5832
" keep, and delete it when you are done."
5833
msgstr ""
5834
5835
#: bzrlib/errors.py:2145
5836
msgid ""
5837
"This tree contains left-over files from a failed operation.\n"
5838
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5839
" wish to keep, and delete it when you are done."
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2155
5843
msgid ""
5844
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5845
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5846
"to\n"
5847
" keep, and delete it when you are done."
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:2166
5851
msgid ""
5852
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5853
"examine %(pending_deletion)s to see if it contains any files you wish to "
5854
"keep, and delete it when you are done."
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2176
5858
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2190
5862
msgid ""
5863
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5864
msgstr ""
5865
"Im öffentlichen Zweig »%(public_location)s« fehlt Revision »%(revstring)s«."
5866
5867
#: bzrlib/errors.py:2203
5868
msgid "Error in merge modified format"
5869
msgstr ""
5870
5871
#: bzrlib/errors.py:2208
5872
msgid "Format error in conflict listings"
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:2212
5876
msgid ""
5877
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5878
"Error: %(description)s"
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2223
5882
msgid ""
5883
"An error has been detected in the repository %(repo_path)s.\n"
5884
"Please run bzr reconcile on this repository."
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:2234
5888
msgid ""
5889
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5890
"reason: %(reason)s"
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2247
5894
msgid ""
5895
"An inconsistent delta was supplied: %(delta)r\n"
5896
"reason: %(reason)s"
5897
msgstr ""
5898
5899
#: bzrlib/errors.py:2259
5900
msgid "To use this feature you must upgrade your branch at %(path)s."
5901
msgstr ""
5902
5903
#: bzrlib/errors.py:2268
5904
msgid "To use this feature you must upgrade your repository at %(path)s."
5905
msgstr ""
5906
5907
#: bzrlib/errors.py:2273
5908
msgid ""
5909
"To use this feature you must upgrade your branch at %(path)s to a format "
5910
"which supports rich roots."
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:2279
5914
msgid "Cannot perform local-only commits on unbound branches."
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2284
5918
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2305
5922
msgid "Ghost tags not supported by format %(format)r."
5923
msgstr ""
5924
5925
#: bzrlib/errors.py:2313
5926
msgid "File is binary but should be text."
5927
msgstr "Die Datei ist binär, sollte aber Text sein."
5928
5929
#: bzrlib/errors.py:2318
5930
msgid "The path %(path)s is not permitted on this platform"
5931
msgstr "Der Pfad %(path)s ist auf dieser Plattform nicht erlaubt"
5932
5933
#: bzrlib/errors.py:2327
5934
msgid ""
5935
"Testament did not match expected value.\n"
5936
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5937
" {%(measured)s}"
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2339
5941
msgid "Not a bzr revision-bundle: %(text)r"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2348
5945
msgid "Bad bzr revision-bundle: %(text)r"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2357
5949
msgid "Malformed bzr revision-bundle header: %(text)r"
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2362
5953
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:2367
5957
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:2372
5961
msgid "End of line marker was not \\n in bzr revision-bundle"
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2382
5965
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5966
msgstr ""
5967
5968
#: bzrlib/errors.py:2392
5969
msgid "Root class for inventory serialization errors"
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:2396
5973
msgid ""
5974
"The inventory was not in the expected format:\n"
5975
" %(msg)s"
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2405
5979
msgid "This operation requires rich root data storage"
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2418
5983
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2427
5987
msgid ""
5988
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5989
"variable."
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:2434
5993
msgid ""
5994
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5995
"ghost at {%(ghost_revision_id)s}"
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:2444
5999
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6000
msgstr "Geister-Revision {%(revision_id)s} kann hier nicht benutzt werden."
6001
6002
#: bzrlib/errors.py:2495
6003
msgid ""
6004
"A merge directive must provide either a bundle or a public branch location."
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:2502
6008
msgid "Bad merge directive payload %(start)r"
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:2512
6012
msgid "Preview patch does not match requested changes."
6013
msgstr ""
6014
6015
#: bzrlib/errors.py:2518
6016
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6017
msgstr ""
6018
6019
#: bzrlib/errors.py:2528
6020
msgid ""
6021
"Your branch does not have all of the revisions required in order to merge "
6022
"this merge directive and the target location specified in the merge "
6023
"directive is not a branch: %(location)s."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:2540
6027
msgid "Unsupported entry kind %(kind)s"
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:2548
6031
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:2558
6035
msgid "Subsume target %(other_tree)s needs to be upgraded."
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:2577
6039
msgid "No such tag: %(tag_name)s"
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:2585
6043
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:2594
6047
msgid "Tag %(tag_name)s already exists."
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:2602
6051
msgid ""
6052
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6053
"bugs\" for more information on this feature."
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:2612
6057
msgid ""
6058
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:2622
6062
msgid ""
6063
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:2632
6067
msgid "Invalid line in bugs property: '%(line)s'"
6068
msgstr ""
6069
6070
#: bzrlib/errors.py:2640
6071
msgid "Invalid bug status: '%(status)s'"
6072
msgstr ""
6073
6074
#: bzrlib/errors.py:2648
6075
msgid "Could not understand response from smart server: %(response_tuple)r"
6076
msgstr ""
6077
6078
#: bzrlib/errors.py:2687
6079
msgid "Server sent an unexpected error: %(error_tuple)r"
6080
msgstr "Der Server meldete einen unerwarteten Fehler: %(error_tuple)r"
6081
6082
#: bzrlib/errors.py:2706
6083
msgid "Unrecognised container format: %(container_format)r"
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:2714
6087
msgid "Unexpected end of container stream"
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:2719
6091
msgid "Unknown record type: %(record_type)r"
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:2727
6095
msgid "Invalid record: %(reason)s"
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:2735
6099
msgid "Container has data after end marker: %(excess)r"
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:2743
6103
msgid "Container has multiple records with the same name: %(name)s"
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:2756
6107
msgid "Corrupt or incompatible data stream: %(reason)s"
6108
msgstr "Fehlerhafter oder inkompatibler Datenstrom: %(reason)s"
6109
6110
#: bzrlib/errors.py:2764
6111
msgid "SMTP error: %(error)s"
6112
msgstr "SMTP-Fehler: %(error)s"
6113
6114
#: bzrlib/errors.py:2772
6115
msgid "No message supplied."
6116
msgstr ""
6117
6118
#: bzrlib/errors.py:2777
6119
msgid "No mail-to address (--mail-to) or output (-o) specified."
6120
msgstr ""
6121
6122
#: bzrlib/errors.py:2782
6123
msgid ""
6124
"Unable to find mail client with the following names: "
6125
"%(mail_command_list_string)s"
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:2792
6129
msgid "SMTP connection to %(host)s refused"
6130
msgstr "SMTP-Verbindung zu %(host)s wurde abgelehnt"
6131
6132
#: bzrlib/errors.py:2801
6133
msgid "Please specify smtp_server. No server at default %(host)s."
6134
msgstr ""
6135
6136
#: bzrlib/errors.py:2815
6137
msgid ""
6138
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6139
"reconfigure."
6140
msgstr ""
6141
6142
#: bzrlib/errors.py:2827
6143
msgid "'%(display_url)s' is already a branch."
6144
msgstr "»%(display_url)s« ist bereits ein Zweig."
6145
6146
#: bzrlib/errors.py:2832
6147
msgid "'%(display_url)s' is already a tree."
6148
msgstr ""
6149
6150
#: bzrlib/errors.py:2837
6151
msgid "'%(display_url)s' is already a checkout."
6152
msgstr ""
6153
6154
#: bzrlib/errors.py:2842
6155
msgid "'%(display_url)s' is already a lightweight checkout."
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:2847
6159
msgid "'%(display_url)s' is already using a shared repository."
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:2852
6163
msgid "'%(display_url)s' is already standalone."
6164
msgstr ""
6165
6166
#: bzrlib/errors.py:2857
6167
msgid "Shared repository '%(display_url)s' already creates working trees."
6168
msgstr ""
6169
6170
#: bzrlib/errors.py:2863
6171
msgid ""
6172
"Shared repository '%(display_url)s' already doesn't create working trees."
6173
msgstr ""
6174
6175
#: bzrlib/errors.py:2869
6176
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6177
msgstr ""
6178
6179
#: bzrlib/errors.py:2874
6180
msgid "No location could be found to bind to at %(display_url)s."
6181
msgstr ""
6182
6183
#: bzrlib/errors.py:2879
6184
msgid ""
6185
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6186
"status).%(more)s"
6187
msgstr ""
6188
6189
#: bzrlib/errors.py:2898
6190
msgid ""
6191
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6192
"list).%(more)s"
6193
msgstr ""
6194
6195
#: bzrlib/errors.py:2904
6196
msgid "Variable {%(name)s} is not available."
6197
msgstr "Variable {%(name)s} steht nicht zur Verfügung."
6198
6199
#: bzrlib/errors.py:2912
6200
msgid "No template specified."
6201
msgstr ""
6202
6203
#: bzrlib/errors.py:2917
6204
msgid "Unable to create symlink %(path_str)son this platform"
6205
msgstr ""
6206
6207
#: bzrlib/errors.py:2932
6208
msgid ""
6209
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6210
"\"original\", \"local\"."
6211
msgstr ""
6212
"Ungültiges Zeitzonenformat »%(timezone)s«, die Optionen sind »utc«, "
6213
"»original« und »local«."
6214
6215
#: bzrlib/errors.py:2966
6216
msgid ""
6217
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6218
msgstr ""
6219
6220
#: bzrlib/errors.py:2978
6221
msgid "The \"%(config_id)s\" configuration does not exist."
6222
msgstr "Die Konfiguration »%(config_id)s« existiert nicht."
6223
6224
#: bzrlib/errors.py:2986
6225
msgid "The \"%(option_name)s\" configuration option does not exist."
6226
msgstr "Die Konfigurationsoption »%(option_name)s« existiert nicht."
6227
6228
#: bzrlib/errors.py:2994
6229
msgid "The alias \"%(alias_name)s\" does not exist."
6230
msgstr "Der Alias »%(alias_name)s« existiert nicht."
6231
6232
#: bzrlib/errors.py:3008
6233
msgid "\"%(alias_name)s\" is not a valid location alias."
6234
msgstr ""
6235
6236
#: bzrlib/errors.py:3016
6237
msgid "No %(alias_name)s location assigned."
6238
msgstr ""
6239
6240
#: bzrlib/errors.py:3024
6241
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6242
msgstr ""
6243
6244
#: bzrlib/errors.py:3034
6245
msgid "Unknown rules detected: %(unknowns_str)s."
6246
msgstr "Unbekannte Regeln festgestellt: %(unknowns_str)s."
6247
6248
#: bzrlib/errors.py:3045
6249
msgid "Tip change rejected: %(msg)s"
6250
msgstr ""
6251
6252
#: bzrlib/errors.py:3053
6253
msgid "Shelf corrupt."
6254
msgstr ""
6255
6256
#: bzrlib/errors.py:3058
6257
msgid "Corruption while decompressing repository file%(orig_error)s"
6258
msgstr ""
6259
6260
#: bzrlib/errors.py:3070
6261
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6262
msgstr ""
6263
6264
#: bzrlib/errors.py:3078
6265
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6266
msgstr ""
6267
6268
#: bzrlib/errors.py:3086
6269
msgid ""
6270
"An attempt to access a url outside the server jail was made: '%(url)s'."
6271
msgstr ""
6272
6273
#: bzrlib/errors.py:3094
6274
msgid "The user aborted the operation."
6275
msgstr "Der Vorgang wurde vom Benutzer abgebrochen."
6276
6277
#: bzrlib/errors.py:3099
6278
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6279
msgstr ""
6280
6281
#: bzrlib/errors.py:3109
6282
msgid "No such view: %(view_name)s."
6283
msgstr ""
6284
6285
#: bzrlib/errors.py:3119
6286
msgid ""
6287
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6288
"to a later format."
6289
msgstr ""
6290
6291
#: bzrlib/errors.py:3128
6292
msgid ""
6293
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6294
msgstr ""
6295
6296
#: bzrlib/errors.py:3195
6297
msgid "%(bzrdir)r does not support co-located branches."
6298
msgstr ""
6299
6300
#: bzrlib/errors.py:3201
6301
msgid ""
6302
"Unable to determine your name.\n"
6303
"Please, set your name with the 'whoami' command.\n"
6304
"E.g. bzr whoami \"Your Name <name@example.com>\""
6305
msgstr ""
6306
6307
#: bzrlib/errors.py:3210
6308
msgid "Invalid pattern(s) found. %(msg)s"
6309
msgstr "Ungültige(s) Muster gefunden. %(msg)s"
6310
6311
#: bzrlib/errors.py:3218
6312
msgid ""
6313
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6314
"unbind` to fix."
6315
msgstr ""
6316
6317
#: bzrlib/errors.py:3229
6318
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6319
msgstr ""
6320
6321
#: bzrlib/errors.py:3238
6322
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6323
msgstr ""
6324
6325
#: bzrlib/errors.py:3247
6326
msgid ""
6327
"No compatible object available for operations from %(source)r to %(target)r."
6328
msgstr ""
6329
6330
#: bzrlib/errors.py:3257
6331
msgid ""
6332
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6333
"%(arguments)s."
6334
msgstr ""
6335
6336
#: bzrlib/errors.py:3267
6337
msgid ""
6338
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6339
"format %(format)r"
6340
msgstr ""
6341
6342
#: bzrlib/errors.py:3279
6343
msgid ""
6344
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6345
"plugin."
6346
msgstr ""
6347
"Die fehlende Funktion %(feature)s wird weder von dieser Bazaar-Version noch "
6348
"von irgendeiner Erweiterung unterstützt."
6349
6350
#: bzrlib/errors.py:3292
6351
msgid "Binary files section encountered."
6352
msgstr "Auf einen Abschnitt für Binärdateien gestoßen."
6353
6354
#: bzrlib/errors.py:3300
6355
msgid ""
6356
"Malformed patch header. %(desc)s\n"
6357
"%(line)r"
6358
msgstr ""
6359
6360
#: bzrlib/errors.py:3309
6361
msgid ""
6362
"Malformed hunk header. %(desc)s\n"
6363
"%(line)r"
6364
msgstr ""
6365
6366
#: bzrlib/errors.py:3318
6367
msgid ""
6368
"Malformed line. %(desc)s\n"
6369
"%(line)r"
6370
msgstr ""
6371
"Ungültige Zeile. %(desc)s\n"
6372
"%(line)r"
6373
6374
#: bzrlib/errors.py:3328
6375
msgid ""
6376
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6377
"but patch says it should be \"%(patch_line)s\""
6378
msgstr ""
6379
6380
#: bzrlib/errors.py:3339
6381
msgid "The feature %(feature)s has already been registered."
6382
msgstr ""
6383
6384
#: bzrlib/export_pot.py:252
6385
#, python-format
6386
msgid "Exporting messages from builtin command: %s"
6387
msgstr ""
6388
6389
#: bzrlib/export_pot.py:271
6390
msgid "Exporting messages from plugin command: {0} in {1}"
6391
msgstr ""
6392
6393
#: bzrlib/export_pot.py:292
6394
#, python-format
6395
msgid "Exporting message from error: %s"
6396
msgstr ""
6397
6398
#: bzrlib/fetch.py:98
6399
msgid "Finding revisions"
6400
msgstr "Revisionen finden"
6401
6402
#: bzrlib/fetch.py:103
6403
msgid "Fetching revisions"
6404
msgstr "Revisionen herunterladen"
6405
6406
#: bzrlib/foreign.py:262
6407
msgid "Push into a different VCS without any custom bzr metadata."
6408
msgstr ""
6409
6410
#: bzrlib/foreign.py:264
6411
msgid ""
6412
"This will afterwards rebase the local branch on the remote\n"
6413
"branch unless the --no-rebase option is used, in which case \n"
6414
"the two branches will be out of sync after the push. "
6415
msgstr ""
6416
6417
#: bzrlib/foreign.py:277
6418
msgid "Do not rebase after push."
6419
msgstr ""
6420
6421
#: bzrlib/foreign.py:311
6422
#, python-format
6423
msgid "Using saved location: %s\n"
6424
msgstr ""
6425
6426
#: bzrlib/foreign.py:321
6427
msgid ""
6428
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6429
"regular push."
6430
msgstr ""
6431
6432
#: bzrlib/gpg.py:366
6433
msgid "No GnuPG key results for pattern: {0}"
6434
msgstr ""
6435
6436
#: bzrlib/gpg.py:439
6437
msgid "{0} commits with valid signatures"
6438
msgstr ""
6439
6440
#: bzrlib/gpg.py:445
6441
msgid "{0} commit with unknown key"
6442
msgid_plural "{0} commits with unknown keys"
6443
msgstr[0] ""
6444
msgstr[1] ""
6445
6446
#: bzrlib/gpg.py:453
6447
msgid "{0} commit not valid"
6448
msgid_plural "{0} commits not valid"
6449
msgstr[0] ""
6450
msgstr[1] ""
6451
6452
#: bzrlib/gpg.py:461
6453
msgid "{0} commit not signed"
6454
msgid_plural "{0} commits not signed"
6455
msgstr[0] ""
6456
msgstr[1] ""
6457
6458
#: bzrlib/gpg.py:469
6459
msgid "{0} commit with key now expired"
6460
msgid_plural "{0} commits with key now expired"
6461
msgstr[0] ""
6462
msgstr[1] ""
6463
6464
#: bzrlib/gpg.py:489
6465
msgid "{0} commit by author {1} with key {2} now expired"
6466
msgid_plural "{0} commits by author {1} with key {2} now expired"
6467
msgstr[0] ""
6468
msgstr[1] ""
6469
6470
#: bzrlib/gpg.py:505
6471
msgid "{0} signed {1} commit"
6472
msgid_plural "{0} signed {1} commits"
6473
msgstr[0] ""
6474
msgstr[1] ""
6475
6476
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6477
msgid "{0} commit by author {1}"
6478
msgid_plural "{0} commits by author {1}"
6479
msgstr[0] ""
6480
msgstr[1] ""
6481
6482
#: bzrlib/gpg.py:554
6483
msgid "Unknown key {0} signed {1} commit"
6484
msgid_plural "Unknown key {0} signed {1} commits"
6485
msgstr[0] ""
6486
msgstr[1] ""
6487
6488
#: bzrlib/groupcompress.py:1739
6489
#, python-format
6490
msgid "Insert claimed random_id=True, but then inserted %r two times"
6491
msgstr ""
6492
6493
#: bzrlib/hooks.py:313
6494
#, python-format
6495
msgid "Introduced in: %s"
6496
msgstr "Eingeführt in: %s"
6497
6498
#: bzrlib/hooks.py:316
6499
#, python-format
6500
msgid "Deprecated in: %s"
6501
msgstr "Veraltet in: %s"
6502
6503
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6504
msgid "Walking content"
6505
msgstr ""
6506
6507
#: bzrlib/knit.py:3330
6508
msgid "annotating"
6509
msgstr ""
6510
6511
#: bzrlib/lock.py:548
6512
msgid "{0!r} was {1} locked again"
6513
msgstr ""
6514
6515
#: bzrlib/lockdir.py:321
6516
#, python-format
6517
msgid "error removing pending lock: %s"
6518
msgstr ""
6519
6520
#: bzrlib/lockdir.py:616
6521
msgid "Unable to obtain"
6522
msgstr ""
6523
6524
#: bzrlib/lockdir.py:618
6525
msgid "Lock owner changed for"
6526
msgstr ""
6527
6528
#: bzrlib/lockdir.py:620
6529
msgid "{0} lock {1} {2}."
6530
msgstr ""
6531
6532
#: bzrlib/lockdir.py:627
6533
#, python-format
6534
msgid "Will continue to try until %s, unless you press Ctrl-C."
6535
msgstr ""
6536
6537
#: bzrlib/lockdir.py:629
6538
msgid "See \"bzr help break-lock\" for more."
6539
msgstr "Siehe »bzr help break-lock« für mehr Informationen."
6540
6541
#: bzrlib/lockdir.py:739
6542
#, python-format
6543
msgid ""
6544
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6545
msgstr ""
6546
6547
#: bzrlib/log.py:563
6548
msgid "--exclude-common-ancestry requires two different revisions"
6549
msgstr "--exclude-common-ancestry erfordert zwei verschiedene Revisionen"
6550
6551
#: bzrlib/log.py:565
6552
#, python-format
6553
msgid "invalid direction %r"
6554
msgstr "Ungültige Richtung %r"
6555
6556
#: bzrlib/log.py:653
6557
msgid "Start revision not found in history of end revision."
6558
msgstr ""
6559
6560
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6561
msgid "Logging revision 0 is invalid."
6562
msgstr ""
6563
6564
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6565
msgid "Start revision must be older than the end revision."
6566
msgstr ""
6567
6568
#: bzrlib/log.py:1818
6569
#, python-format
6570
msgid "unknown log formatter: %r"
6571
msgstr "Unbekannter Protokollformatierer: %r"
6572
6573
#: bzrlib/log.py:2114
6574
msgid "fixes bug"
6575
msgid_plural "fixes bugs"
6576
msgstr[0] "behebt den Fehler"
6577
msgstr[1] "behebt die Fehler"
6578
6579
#: bzrlib/merge.py:689
6580
msgid "All changes applied successfully."
6581
msgstr "Alle Änderungen erfolgreich angewendet."
6582
6583
#: bzrlib/merge.py:691
6584
#, python-format
6585
msgid "%d conflicts encountered."
6586
msgstr "Auf %d Konflikte gestoßen."
6587
6588
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6589
msgid "Preparing file merge"
6590
msgstr ""
6591
6592
#: bzrlib/multiparent.py:426
6593
msgid "Importing revisions"
6594
msgstr "Revisionen importieren"
6595
6596
#: bzrlib/option.py:526
6597
msgid "Show help message."
6598
msgstr "Hilfetext anzeigen."
6599
6600
#: bzrlib/option.py:528
6601
msgid "Only display errors and warnings."
6602
msgstr "Nur Fehler und Warnungen anzeigen."
6603
6604
#: bzrlib/option.py:531
6605
msgid "Show usage message and options."
6606
msgstr "Aufruf und Optionen anzeigen."
6607
6608
#: bzrlib/option.py:533
6609
msgid "Display more information."
6610
msgstr "Weitere Informationen anzeigen."
6611
6612
#: bzrlib/option.py:541
6613
msgid ""
6614
"Select changes introduced by the specified revision. See also \"help "
6615
"revisionspec\"."
6616
msgstr ""
6617
6618
#: bzrlib/option.py:543
6619
msgid "Branch to operate on, instead of working directory."
6620
msgstr ""
6621
6622
#: bzrlib/option.py:545
6623
msgid "Detailed log format."
6624
msgstr "Ausführliches Protokollformat."
6625
6626
#: bzrlib/option.py:545
6627
msgid "Format used by GNU ChangeLog files."
6628
msgstr "Format von »GNU ChangeLog«-Dateien."
6629
6630
#: bzrlib/option.py:545
6631
msgid "Log format with one line per revision."
6632
msgstr "Protokollformat mit einer Zeile pro Revision."
6633
6634
#: bzrlib/option.py:545
6635
msgid "Moderately short log format."
6636
msgstr "Relativ kurzes Protokollformat."
6637
6638
#: bzrlib/option.py:545
6639
msgid "Use specified log format."
6640
msgstr "Angegebenes Protokollformat benutzen."
6641
6642
#: bzrlib/option.py:547
6643
msgid "Log format"
6644
msgstr "Protokollformat"
6645
6646
#: bzrlib/option.py:549
6647
msgid "LCA-newness merge."
6648
msgstr ""
6649
6650
#: bzrlib/option.py:549
6651
msgid "Merge using external diff3."
6652
msgstr ""
6653
6654
#: bzrlib/option.py:549
6655
msgid "Native diff3-style merge."
6656
msgstr ""
6657
6658
#: bzrlib/option.py:549
6659
msgid "Select a particular merge algorithm."
6660
msgstr ""
6661
6662
#: bzrlib/option.py:549
6663
msgid "Weave-based merge."
6664
msgstr ""
6665
6666
#: bzrlib/option.py:551
6667
msgid "Merge algorithm"
6668
msgstr ""
6669
6670
#: bzrlib/option.py:554
6671
msgid "Message string."
6672
msgstr "Nachrichtenzeichenkette."
6673
6674
#: bzrlib/option.py:556
6675
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6676
msgstr ""
6677
6678
#: bzrlib/option.py:558
6679
msgid "Ignore differences between branches and overwrite unconditionally."
6680
msgstr ""
6681
6682
#: bzrlib/option.py:560
6683
msgid "Remember the specified location as a default."
6684
msgstr "Den angegebenen Ort als Vorgabe merken."
6685
6686
#: bzrlib/option.py:562
6687
msgid "Reprocess to reduce spurious conflicts."
6688
msgstr "Erneut ausführen, um scheinbare Konflikte zu verringern."
6689
6690
#: bzrlib/option.py:566
6691
msgid "See \"help revisionspec\" for details."
6692
msgstr "Siehe »help revisionspec« für Details."
6693
6694
#: bzrlib/option.py:568
6695
msgid "Show internal object ids."
6696
msgstr ""
6697
6698
#: bzrlib/option.py:571
6699
msgid "Display timezone as local, original, or utc."
6700
msgstr "Zeitzone als local, original oder utc anzeigen."
6701
6702
#: bzrlib/osutils.py:100
6703
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6704
msgstr ""
6705
6706
#: bzrlib/osutils.py:220
6707
msgid "lstat/stat of ({0!r}): {1!r}"
6708
msgstr ""
6709
6710
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6711
#, python-format
6712
msgid "sorry, %r not allowed in path"
6713
msgstr "Entschuldigung, %r ist im Pfad nicht erlaubt"
6714
6715
#: bzrlib/osutils.py:1259
6716
#, python-format
6717
msgid "%r is too short to calculate a relative path"
6718
msgstr "%r ist zu kurz, um einen relativen Pfad zu berechnen"
6719
6720
#: bzrlib/plugin.py:143
6721
#, python-format
6722
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6723
msgstr "»%s« ist keine gültige <plugin_name>@<plugin_path>-Beschreibung "
6724
6725
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6726
msgid "Enable completions for the selected plugin (default: all plugins)"
6727
msgstr ""
6728
6729
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6730
msgid "Generate a shell function for bash command line completion."
6731
msgstr ""
6732
6733
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6734
msgid ""
6735
"This command generates a shell function which can be used by bash to\n"
6736
"automatically complete the currently typed command when the user presses\n"
6737
"the completion key (usually tab)."
6738
msgstr ""
6739
6740
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6741
msgid ""
6742
"Commonly used like this:\n"
6743
" eval \"`bzr bash-completion`\""
6744
msgstr ""
6745
"Gebräuchlicher Aufruf wie folgt:\n"
6746
" eval \"`bzr bash-completion`\""
6747
6748
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6749
msgid "Name of the generated function (default: _bzr)"
6750
msgstr "Name der erzeugten Funktion (Vorgabe: _bzr)"
6751
6752
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6753
msgid "Generate only the shell function, don't enable it"
6754
msgstr ""
6755
6756
#: bzrlib/plugins/launchpad/account.py:66
6757
msgid "Setting ssh/sftp usernames for launchpad.net."
6758
msgstr "SSH/SFTP-Benutzernamen für launchpad.net festlegen."
6759
6760
#: bzrlib/plugins/launchpad/cmds.py:44
6761
msgid "Register a branch with launchpad.net."
6762
msgstr "Einen Zweig bei launchpad.net registrieren."
6763
6764
#: bzrlib/plugins/launchpad/cmds.py:46
6765
msgid ""
6766
"This command lists a bzr branch in the directory of branches on\n"
6767
"launchpad.net. Registration allows the branch to be associated with\n"
6768
"bugs or specifications."
6769
msgstr ""
6770
6771
#: bzrlib/plugins/launchpad/cmds.py:50
6772
msgid ""
6773
"Before using this command you must register the project to which the\n"
6774
"branch belongs, and create an account for yourself on launchpad.net."
6775
msgstr ""
6776
6777
#: bzrlib/plugins/launchpad/cmds.py:53
6778
msgid ""
6779
"arguments:\n"
6780
" public_url: The publicly visible url for the branch to register.\n"
6781
" This must be an http or https url (which Launchpad can read\n"
6782
" from to access the branch). Local file urls, SFTP urls, and\n"
6783
" bzr+ssh urls will not work.\n"
6784
" If no public_url is provided, bzr will use the configured\n"
6785
" public_url if there is one for the current branch, and\n"
6786
" otherwise error."
6787
msgstr ""
6788
6789
#: bzrlib/plugins/launchpad/cmds.py:62
6790
msgid ""
6791
"example:\n"
6792
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6793
" --project fooproject"
6794
msgstr ""
6795
"Beispiel:\n"
6796
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6797
" --project fooproject"
6798
6799
#: bzrlib/plugins/launchpad/cmds.py:69
6800
msgid "Launchpad project short name to associate with the branch."
6801
msgstr "Launchpad-Projekt-Kurzname, dem der Zweig zugeordnet wird."
6802
6803
#: bzrlib/plugins/launchpad/cmds.py:76
6804
msgid ""
6805
"Short name for the branch; by default taken from the last component of the "
6806
"url."
6807
msgstr ""
6808
6809
#: bzrlib/plugins/launchpad/cmds.py:80
6810
msgid "One-sentence description of the branch."
6811
msgstr "Beschreibung des Zweiges in einem Satz."
6812
6813
#: bzrlib/plugins/launchpad/cmds.py:83
6814
msgid "Longer description of the purpose or contents of the branch."
6815
msgstr "Längere Beschreibung für den Zweck oder die Inhalte des Zweiges."
6816
6817
#: bzrlib/plugins/launchpad/cmds.py:86
6818
msgid "Branch author's email address, if not yourself."
6819
msgstr "E-Mail-Adresse des Autors des Zweigs, wenn Sie es nicht selbst sind."
6820
6821
#: bzrlib/plugins/launchpad/cmds.py:89
6822
msgid "The bug this branch fixes."
6823
msgstr "Der Fehler, den dieser Zweig behebt."
6824
6825
#: bzrlib/plugins/launchpad/cmds.py:92
6826
msgid "Prepare the request but don't actually send it."
6827
msgstr "Die Anfrage vorbereiten, aber nicht absenden."
6828
6829
#: bzrlib/plugins/launchpad/cmds.py:114
6830
msgid ""
6831
"register-branch requires a public branch url - see bzr help register-branch."
6832
msgstr ""
6833
6834
#: bzrlib/plugins/launchpad/cmds.py:122
6835
msgid "--product is deprecated; please use --project."
6836
msgstr "--product ist veraltet; bitte --project benutzen."
6837
6838
#: bzrlib/plugins/launchpad/cmds.py:152
6839
msgid "Open a Launchpad branch page in your web browser."
6840
msgstr "Eine Launchpad-Zweig-Seite in Ihrem Web-Browser öffnen."
6841
6842
#: bzrlib/plugins/launchpad/cmds.py:157
6843
msgid "Do not actually open the browser. Just say the URL we would use."
6844
msgstr ""
6845
6846
#: bzrlib/plugins/launchpad/cmds.py:192
6847
#, python-format
6848
msgid "Opening %s in web browser"
6849
msgstr "%s wird im Web-Browser geöffnet"
6850
6851
#: bzrlib/plugins/launchpad/cmds.py:200
6852
msgid "Show or set the Launchpad user ID."
6853
msgstr "Den Launchpad-Benutzernamen anzeigen oder festlegen."
6854
6855
#: bzrlib/plugins/launchpad/cmds.py:202
6856
msgid ""
6857
"When communicating with Launchpad, some commands need to know your\n"
6858
"Launchpad user ID. This command can be used to set or show the\n"
6859
"user ID that Bazaar will use for such communication."
6860
msgstr ""
6861
6862
#: bzrlib/plugins/launchpad/cmds.py:206
6863
msgid ""
6864
":Examples:\n"
6865
" Show the Launchpad ID of the current user::"
6866
msgstr ""
6867
6868
#: bzrlib/plugins/launchpad/cmds.py:209
6869
msgid " bzr launchpad-login"
6870
msgstr " bzr launchpad-login"
6871
6872
#: bzrlib/plugins/launchpad/cmds.py:211
6873
msgid " Set the Launchpad ID of the current user to 'bob'::"
6874
msgstr ""
6875
6876
#: bzrlib/plugins/launchpad/cmds.py:213
6877
msgid " bzr launchpad-login bob"
6878
msgstr " bzr launchpad-login bob"
6879
6880
#: bzrlib/plugins/launchpad/cmds.py:220
6881
msgid "Don't check that the user name is valid."
6882
msgstr "Den Benutzernamen nicht auf Gültigkeit prüfen."
6883
6884
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6885
msgid "Launchpad user ID exists and has SSH keys.\n"
6886
msgstr "Launchpad-Benutzername existiert und hat SSH-Schlüssel.\n"
6887
6888
#: bzrlib/plugins/launchpad/cmds.py:238
6889
msgid "No Launchpad user ID configured.\n"
6890
msgstr "Kein Launchpad-Benutzername konfiguriert.\n"
6891
6892
#: bzrlib/plugins/launchpad/cmds.py:249
6893
#, python-format
6894
msgid "Launchpad user ID set to '%s'.\n"
6895
msgstr "Launchpad-Benutzername auf »%s« festgelegt.\n"
6896
6897
#: bzrlib/plugins/launchpad/cmds.py:255
6898
msgid "Ask Launchpad to mirror a branch now."
6899
msgstr "Launchpad jetzt darum bitten, einen Zweig zu spiegeln."
6900
6901
#: bzrlib/plugins/launchpad/cmds.py:272
6902
msgid "Propose merging a branch on Launchpad."
6903
msgstr ""
6904
6905
#: bzrlib/plugins/launchpad/cmds.py:274
6906
msgid ""
6907
"This will open your usual editor to provide the initial comment. When it\n"
6908
"has created the proposal, it will open it in your default web browser."
6909
msgstr ""
6910
6911
#: bzrlib/plugins/launchpad/cmds.py:277
6912
msgid ""
6913
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6914
"is not supplied, the remembered submit branch will be used. If no submit\n"
6915
"branch is remembered, the development focus will be used."
6916
msgstr ""
6917
6918
#: bzrlib/plugins/launchpad/cmds.py:281
6919
msgid ""
6920
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6921
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6922
"The parameter the launchpad account name of the desired reviewer. This\n"
6923
"may optionally be followed by '=' and the review type. For example:"
6924
msgstr ""
6925
6926
#: bzrlib/plugins/launchpad/cmds.py:286
6927
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6928
msgstr ""
6929
6930
#: bzrlib/plugins/launchpad/cmds.py:288
6931
msgid ""
6932
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6933
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6934
msgstr ""
6935
6936
#: bzrlib/plugins/launchpad/cmds.py:293
6937
msgid "Propose the merge on staging."
6938
msgstr ""
6939
6940
#: bzrlib/plugins/launchpad/cmds.py:295
6941
msgid "Commit message."
6942
msgstr ""
6943
6944
#: bzrlib/plugins/launchpad/cmds.py:297
6945
msgid "Mark the proposal as approved immediately."
6946
msgstr ""
6947
6948
#: bzrlib/plugins/launchpad/cmds.py:298
6949
msgid "The bug this proposal fixes."
6950
msgstr ""
6951
6952
#: bzrlib/plugins/launchpad/cmds.py:300
6953
msgid "Requested reviewer and optional type."
6954
msgstr ""
6955
6956
#: bzrlib/plugins/launchpad/cmds.py:335
6957
msgid "Find the proposal to merge this revision."
6958
msgstr ""
6959
6960
#: bzrlib/plugins/launchpad/cmds.py:337
6961
msgid ""
6962
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6963
"This works only if the selected branch was the merge proposal target, and\n"
6964
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6965
"are opened in a web browser."
6966
msgstr ""
6967
6968
#: bzrlib/plugins/launchpad/cmds.py:342
6969
msgid ""
6970
"Any revision involved in the merge may be specified-- the revision in\n"
6971
"which the merge was performed, or one of the revisions that was merged."
6972
msgstr ""
6973
6974
#: bzrlib/plugins/launchpad/cmds.py:345
6975
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6976
msgstr ""
6977
6978
#: bzrlib/plugins/launchpad/cmds.py:347
6979
msgid " bzr lp-find-proposal -r annotate:README:1"
6980
msgstr ""
6981
6982
#: bzrlib/plugins/launchpad/cmds.py:363
6983
msgid "No review found."
6984
msgstr ""
6985
6986
#: bzrlib/plugins/launchpad/cmds.py:364
6987
#, python-format
6988
msgid "%d proposals(s) found."
6989
msgstr ""
6990
6991
#: bzrlib/plugins/launchpad/cmds.py:374
6992
msgid "Finding revision-id"
6993
msgstr ""
6994
6995
#: bzrlib/plugins/launchpad/cmds.py:381
6996
msgid "Finding merge"
6997
msgstr ""
6998
6999
#: bzrlib/plugins/launchpad/cmds.py:386
7000
msgid "Finding revno"
7001
msgstr ""
7002
7003
#: bzrlib/plugins/launchpad/cmds.py:392
7004
msgid "Finding Launchpad branch"
7005
msgstr ""
7006
7007
#: bzrlib/plugins/launchpad/cmds.py:395
7008
msgid "Finding proposals"
7009
msgstr ""
7010
7011
#: bzrlib/plugins/launchpad/lp_api.py:241
7012
#: bzrlib/plugins/launchpad/lp_api.py:246
7013
#, python-format
7014
msgid "%s is not registered on Launchpad"
7015
msgstr "%s ist nicht in Launchpad registriert"
7016
7017
#: bzrlib/plugins/launchpad/lp_api.py:256
7018
#, python-format
7019
msgid "%s has no development focus."
7020
msgstr ""
7021
7022
#: bzrlib/plugins/launchpad/lp_api.py:261
7023
#, python-format
7024
msgid "development focus %s has no branch."
7025
msgstr ""
7026
7027
#: bzrlib/plugins/launchpad/lp_api.py:266
7028
#, python-format
7029
msgid "source package %s has no branch."
7030
msgstr ""
7031
7032
#: bzrlib/plugins/launchpad/lp_api.py:270
7033
#, python-format
7034
msgid "%s has no associated product or source package."
7035
msgstr ""
7036
7037
#: bzrlib/plugins/launchpad/lp_api.py:282
7038
#, python-format
7039
msgid "%s is already up-to-date."
7040
msgstr "%s ist bereits auf dem neuesten Stand."
7041
7042
#: bzrlib/plugins/launchpad/lp_api.py:289
7043
#, python-format
7044
msgid "Pushing to %s"
7045
msgstr ""
7046
7047
#: bzrlib/plugins/launchpad/lp_directory.py:170
7048
msgid ""
7049
"resolution for {0}\n"
7050
" local: {1}\n"
7051
" remote: {2}"
7052
msgstr ""
7053
7054
#: bzrlib/plugins/launchpad/lp_propose.py:150
7055
#, python-format
7056
msgid "There is already a branch merge proposal: %s"
7057
msgstr ""
7058
7059
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7060
msgid "pb parameter to convert() is deprecated"
7061
msgstr ""
7062
7063
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7064
msgid "starting upgrade from format 4 to 5"
7065
msgstr ""
7066
7067
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7068
msgid "note: upgrade may be faster if all store files are ungzipped first"
7069
msgstr ""
7070
7071
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7072
msgid "converting revision"
7073
msgstr "Revision umwandeln"
7074
7075
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7076
msgid "upgraded to weaves:"
7077
msgstr ""
7078
7079
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7080
#, python-format
7081
msgid "%6d revisions and inventories"
7082
msgstr ""
7083
7084
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7085
#, python-format
7086
msgid "%6d revisions not present"
7087
msgstr "%6d Revisionen nicht vorhanden"
7088
7089
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7090
#, python-format
7091
msgid "%6d texts"
7092
msgstr "%6d Texte"
7093
7094
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7095
msgid "writing weave"
7096
msgstr ""
7097
7098
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7099
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7100
msgid "inventory"
7101
msgstr ""
7102
7103
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7104
msgid "write revision"
7105
msgstr "Revision schreiben"
7106
7107
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7108
msgid "loading revision"
7109
msgstr "Revision laden"
7110
7111
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7112
#, python-format
7113
msgid "revision {%s} not present in branch; will be converted as a ghost"
7114
msgstr ""
7115
7116
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7117
msgid "starting upgrade from format 5 to 6"
7118
msgstr ""
7119
7120
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7121
#, python-format
7122
msgid "adding prefixes to %s"
7123
msgstr ""
7124
7125
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7126
msgid "starting upgrade from format 6 to metadir"
7127
msgstr ""
7128
7129
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7130
msgid "Removing ancestry.weave"
7131
msgstr ""
7132
7133
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7134
msgid "Finding branch files"
7135
msgstr "Dateien des Zweigs finden"
7136
7137
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7138
msgid "Upgrading repository"
7139
msgstr ""
7140
7141
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7142
msgid "Upgrading branch"
7143
msgstr ""
7144
7145
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7146
msgid "No working tree."
7147
msgstr ""
7148
7149
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7150
msgid "Upgrading working tree"
7151
msgstr ""
7152
7153
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7154
#, python-format
7155
msgid "Make %s lock"
7156
msgstr ""
7157
7158
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7159
#, python-format
7160
msgid "Moving %s"
7161
msgstr "%s wird verschoben"
7162
7163
#: bzrlib/push.py:56
7164
msgid "Created new branch."
7165
msgstr "Neuer Zweig wurde erstellt."
7166
7167
#: bzrlib/push.py:97
7168
#, python-format
7169
msgid ""
7170
"Target directory %s already contains a .bzr directory, but it is not valid."
7171
msgstr ""
7172
7173
#: bzrlib/push.py:101
7174
#, python-format
7175
msgid ""
7176
"Target directory %s already exists, but does not have a .bzr directory. "
7177
"Supply --use-existing-dir to push there anyway."
7178
msgstr ""
7179
7180
#: bzrlib/push.py:122
7181
#, python-format
7182
msgid "Too many redirections trying to make %s."
7183
msgstr ""
7184
7185
#: bzrlib/push.py:148
7186
msgid ""
7187
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7188
"information."
7189
msgstr ""
7190
7191
#: bzrlib/push.py:152
7192
#, python-format
7193
msgid ""
7194
"It is not possible to losslessly push to %s. You may want to use dpush "
7195
"instead."
7196
msgstr ""
7197
7198
#: bzrlib/push.py:158
7199
#, python-format
7200
msgid ""
7201
"At %s you have a valid .bzr control directory, but not a branch or "
7202
"repository. This is an unsupported configuration. Please move the target "
7203
"directory out of the way and try again."
7204
msgstr ""
7205
7206
#: bzrlib/reconcile.py:97
7207
#, python-format
7208
msgid "Reconciling branch %s"
7209
msgstr ""
7210
7211
#: bzrlib/reconcile.py:103
7212
#, python-format
7213
msgid "Reconciling repository %s"
7214
msgstr ""
7215
7216
#: bzrlib/reconcile.py:105
7217
msgid "Reconciling repository"
7218
msgstr ""
7219
7220
#: bzrlib/reconcile.py:111
7221
#, python-format
7222
msgid "%s cannot canonicalize CHKs."
7223
msgstr ""
7224
7225
#: bzrlib/reconcile.py:119
7226
msgid "Reconcile aborted: revision index has inconsistent parents."
7227
msgstr ""
7228
7229
#: bzrlib/reconcile.py:121
7230
msgid "Run \"bzr check\" for more details."
7231
msgstr ""
7232
7233
#: bzrlib/reconcile.py:123
7234
msgid "Reconciliation complete."
7235
msgstr ""
7236
7237
#: bzrlib/reconcile.py:166
7238
msgid "Fixing last revision info {0} => {1}"
7239
msgstr ""
7240
7241
#: bzrlib/reconcile.py:173
7242
msgid "revision_history ok."
7243
msgstr ""
7244
7245
#: bzrlib/reconcile.py:234
7246
msgid "Reading inventory data"
7247
msgstr ""
7248
7249
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7250
msgid "Inventory ok."
7251
msgstr ""
7252
7253
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7254
msgid "Backing up inventory"
7255
msgstr ""
7256
7257
#: bzrlib/reconcile.py:258
7258
msgid "Backup inventory created."
7259
msgstr ""
7260
7261
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7262
msgid "Writing weave"
7263
msgstr ""
7264
7265
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7266
msgid "Inventory regenerated."
7267
msgstr ""
7268
7269
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7270
msgid "Reading indexes"
7271
msgstr ""
7272
7273
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7274
msgid "Checking unused inventories"
7275
msgstr ""
7276
7277
#: bzrlib/reconcile.py:388
7278
msgid "Backup Inventory created"
7279
msgstr ""
7280
7281
#: bzrlib/reconcile.py:446
7282
msgid "Fixing text parents"
7283
msgstr ""
7284
7285
#: bzrlib/reconfigure.py:54
7286
msgid "{0} is now stacked on {1}\n"
7287
msgstr ""
7288
7289
#: bzrlib/reconfigure.py:69
7290
#, python-format
7291
msgid "%s is now not stacked\n"
7292
msgstr ""
7293
7294
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7295
#, python-format
7296
msgid "bzr: ERROR (ignored): %s"
7297
msgstr ""
7298
7299
#: bzrlib/remote.py:2534
7300
msgid "Copying repository content as tarball..."
7301
msgstr ""
7302
7303
#: bzrlib/rename_map.py:69
7304
msgid "Calculating hashes"
7305
msgstr ""
7306
7307
#: bzrlib/rename_map.py:107
7308
msgid "Determining hash hits"
7309
msgstr ""
7310
7311
#: bzrlib/rename_map.py:242
7312
msgid "{0} => {1}"
7313
msgstr ""
7314
7315
#: bzrlib/repository.py:1738
7316
msgid "Moving repository to repository.backup"
7317
msgstr ""
7318
7319
#: bzrlib/repository.py:1745
7320
msgid "Creating new repository"
7321
msgstr ""
7322
7323
#: bzrlib/repository.py:1750
7324
msgid "Copying content"
7325
msgstr ""
7326
7327
#: bzrlib/repository.py:1754
7328
msgid "Deleting old repository content"
7329
msgstr ""
7330
7331
#: bzrlib/repository.py:1756
7332
msgid "repository converted"
7333
msgstr ""
7334
7335
#: bzrlib/revisionspec.py:903
7336
msgid "Using {0} {1}"
7337
msgstr ""
7338
7339
#: bzrlib/send.py:59
7340
#, python-format
7341
msgid "Mail client \"%s\" does not support specifying body"
7342
msgstr ""
7343
7344
#: bzrlib/send.py:63
7345
msgid "--remember requires a branch to be specified."
7346
msgstr ""
7347
7348
#: bzrlib/send.py:78
7349
msgid "No submit branch known or specified"
7350
msgstr ""
7351
7352
#: bzrlib/send.py:81
7353
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7354
msgstr ""
7355
7356
#: bzrlib/send.py:99
7357
#, python-format
7358
msgid "No such send format '%s'."
7359
msgstr ""
7360
7361
#: bzrlib/send.py:115
7362
msgid "bzr send takes at most two one revision identifiers"
7363
msgstr ""
7364
7365
#: bzrlib/send.py:128
7366
msgid "No revisions to submit."
7367
msgstr ""
7368
7369
#: bzrlib/send.py:140
7370
msgid ""
7371
"- not supported for merge directives that use more than one output file."
7372
msgstr ""
7373
7374
#: bzrlib/send.py:186
7375
msgid "Format 0.9 does not permit bundle with no patch"
7376
msgstr ""
7377
7378
#: bzrlib/shelf_ui.py:46
7379
#, python-format
7380
msgid "Shelve adding file \"%(path)s\"?"
7381
msgstr ""
7382
7383
#: bzrlib/shelf_ui.py:47
7384
msgid "Shelve binary changes?"
7385
msgstr ""
7386
7387
#: bzrlib/shelf_ui.py:48
7388
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7389
msgstr ""
7390
7391
#: bzrlib/shelf_ui.py:50
7392
#, python-format
7393
msgid "Shelve removing file \"%(path)s\"?"
7394
msgstr ""
7395
7396
#: bzrlib/shelf_ui.py:51
7397
#, python-format
7398
msgid "Shelve %d change(s)?"
7399
msgstr ""
7400
7401
#: bzrlib/shelf_ui.py:52
7402
msgid "Shelve?"
7403
msgstr ""
7404
7405
#: bzrlib/shelf_ui.py:53
7406
#, python-format
7407
msgid ""
7408
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7409
msgstr ""
7410
7411
#: bzrlib/shelf_ui.py:55
7412
#, python-format
7413
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7414
msgstr ""
7415
7416
#: bzrlib/shelf_ui.py:70
7417
#, python-format
7418
msgid "Changes shelved with id \"%d\"."
7419
msgstr ""
7420
7421
#: bzrlib/shelf_ui.py:74
7422
msgid "Selected changes destroyed."
7423
msgstr ""
7424
7425
#: bzrlib/shelf_ui.py:78
7426
msgid "Selected changes:"
7427
msgstr ""
7428
7429
#: bzrlib/shelf_ui.py:98
7430
#, python-format
7431
msgid "Delete file \"%(path)s\"?"
7432
msgstr ""
7433
7434
#: bzrlib/shelf_ui.py:99
7435
msgid "Apply binary changes?"
7436
msgstr ""
7437
7438
#: bzrlib/shelf_ui.py:100
7439
#, python-format
7440
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7441
msgstr ""
7442
7443
#: bzrlib/shelf_ui.py:102
7444
#, python-format
7445
msgid "Add file \"%(path)s\"?"
7446
msgstr ""
7447
7448
#: bzrlib/shelf_ui.py:103
7449
#, python-format
7450
msgid "Apply %d change(s)?"
7451
msgstr ""
7452
7453
#: bzrlib/shelf_ui.py:104
7454
msgid "Apply change?"
7455
msgstr ""
7456
7457
#: bzrlib/shelf_ui.py:105
7458
#, python-format
7459
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7460
msgstr ""
7461
7462
#: bzrlib/shelf_ui.py:107
7463
#, python-format
7464
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7465
msgstr ""
7466
7467
#: bzrlib/shelf_ui.py:402
7468
msgid "No changes are shelved."
7469
msgstr ""
7470
7471
#: bzrlib/shelf_ui.py:460
7472
#, python-format
7473
msgid "Using changes with id \"%d\"."
7474
msgstr ""
7475
7476
#: bzrlib/shelf_ui.py:464
7477
#, python-format
7478
msgid "Message: %s"
7479
msgstr ""
7480
7481
#: bzrlib/shelf_ui.py:476
7482
#, python-format
7483
msgid "Deleted changes with id \"%d\"."
7484
msgstr ""
7485
7486
#: bzrlib/smart/medium.py:714
7487
msgid "HPSS calls: {0} ({1} vfs) {2}"
7488
msgstr ""
7489
7490
#: bzrlib/smart/server.py:169
7491
msgid "Requested to stop gracefully"
7492
msgstr ""
7493
7494
#: bzrlib/smart/server.py:179
7495
#, python-format
7496
msgid "Waiting for %d client(s) to finish"
7497
msgstr ""
7498
7499
#: bzrlib/smart/server.py:185
7500
#, python-format
7501
msgid "Still waiting for %d client(s) to finish"
7502
msgstr ""
7503
7504
#: bzrlib/smart/server.py:219
7505
#, python-format
7506
msgid "listening socket error: %s"
7507
msgstr ""
7508
7509
#: bzrlib/smart/server.py:452
7510
#, python-format
7511
msgid "listening on port: %s"
7512
msgstr ""
7513
7514
#: bzrlib/switch.py:73
7515
msgid "Pending merges must be committed or reverted before using switch."
7516
msgstr ""
7517
7518
#: bzrlib/switch.py:100
7519
msgid ""
7520
"Cannot switch as local commits found in the checkout. Commit these to the "
7521
"bound branch or use --force to throw them away."
7522
msgstr ""
7523
7524
#: bzrlib/switch.py:105
7525
#, python-format
7526
msgid ""
7527
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7528
"anyway, use --force."
7529
msgstr ""
7530
7531
#: bzrlib/switch.py:129
7532
msgid "Cannot switch a branch, only a checkout."
7533
msgstr ""
7534
7535
#: bzrlib/switch.py:167
7536
#, python-format
7537
msgid "Tree is up to date at revision %d."
7538
msgstr ""
7539
7540
#: bzrlib/switch.py:173
7541
#, python-format
7542
msgid "Updated to revision %d."
7543
msgstr ""
7544
7545
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7546
msgid "Apply phase"
7547
msgstr ""
7548
7549
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7550
msgid "removing file"
7551
msgstr ""
7552
7553
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7554
msgid "adding file"
7555
msgstr ""
7556
7557
#: bzrlib/transform.py:2598
7558
msgid "Building tree"
7559
msgstr ""
7560
7561
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7562
msgid "Adding file contents"
7563
msgstr ""
7564
7565
#: bzrlib/transform.py:3017
7566
msgid "Resolution pass"
7567
msgstr ""
7568
7569
#: bzrlib/transport/ftp/_gssapi.py:88
7570
#, python-format
7571
msgid "Authenticated as %s"
7572
msgstr ""
7573
7574
#: bzrlib/tree.py:647
7575
msgid "*** {0} content-filter: {1} => {2!r}"
7576
msgstr ""
7577
7578
#: bzrlib/upgrade.py:77
7579
#, python-format
7580
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7581
msgstr ""
7582
7583
#: bzrlib/upgrade.py:100
7584
#, python-format
7585
msgid "cannot upgrade from bzrdir format %s"
7586
msgstr ""
7587
7588
#: bzrlib/upgrade.py:103
7589
#, python-format
7590
msgid "starting upgrade of %s"
7591
msgstr ""
7592
7593
#: bzrlib/upgrade.py:110
7594
msgid "finished"
7595
msgstr ""
7596
7597
#: bzrlib/upgrade.py:120
7598
msgid "Deleting backup.bzr"
7599
msgstr "Lösche backup.bzr"
7600
7601
#: bzrlib/upgrade.py:151
7602
msgid ""
7603
"\n"
7604
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7605
msgstr ""
7606
7607
#: bzrlib/upgrade.py:208
7608
#, python-format
7609
msgid "Found %d dependent branches - upgrading ..."
7610
msgstr ""
7611
7612
#: bzrlib/upgrade.py:276
7613
msgid "Upgrading bzrdirs"
7614
msgstr ""
7615
7616
#: bzrlib/upgrade.py:282
7617
#, python-format
7618
msgid "Upgrading %s"
7619
msgstr "%s wird aktualisiert"
7620
7621
#: bzrlib/upgrade.py:283
7622
msgid "Upgrading {0} {1} ..."
7623
msgstr ""
7624
7625
#: bzrlib/upgrade.py:301
7626
msgid "Removing backup ..."
7627
msgstr "Entferne Backup…"
7628
7629
#: bzrlib/upgrade.py:305
7630
msgid "failed to clean-up {0}: {1}"
7631
msgstr ""
7632
7633
#: bzrlib/vf_repository.py:1091
7634
msgid "inventories"
7635
msgstr ""
7636
7637
#: bzrlib/vf_repository.py:1117
7638
msgid "texts"
7639
msgstr ""
7640
7641
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7642
msgid "Calculating text parents"
7643
msgstr ""
7644
7645
#: bzrlib/vf_repository.py:1707
7646
msgid "Fetch texts"
7647
msgstr ""
7648
7649
#: bzrlib/vf_repository.py:2536
7650
msgid "loading text store"
7651
msgstr ""
7652
7653
#: bzrlib/vf_repository.py:2542
7654
msgid "checking text graph"
7655
msgstr ""
7656
7657
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7658
#: bzrlib/vf_repository.py:3127
7659
msgid "Transferring revisions"
7660
msgstr ""
7661
7662
#: bzrlib/win32utils.py:146
7663
msgid "Failed to GetProcessMemoryInfo()"
7664
msgstr ""
7665
7666
#: bzrlib/win32utils.py:167
7667
msgid "Cannot debug memory on win32 without ctypes or win32process"
7668
msgstr ""
7669
7670
#: bzrlib/win32utils.py:172
7671
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7672
msgstr ""
7673
7674
#: bzrlib/win32utils.py:180
7675
#, python-format
7676
msgid "WorkingSize %8d KiB"
7677
msgstr ""
7678
7679
#: bzrlib/win32utils.py:181
7680
#, python-format
7681
msgid "PeakWorking %8d KiB"
7682
msgstr ""
7683
7684
#: bzrlib/win32utils.py:182
7685
#, python-format
7686
msgid "PagefileUsage %8d KiB"
7687
msgstr ""
7688
7689
#: bzrlib/win32utils.py:183
7690
#, python-format
7691
msgid "PeakPagefileUsage %8d KiB"
7692
msgstr ""
7693
7694
#: bzrlib/win32utils.py:185
7695
#, python-format
7696
msgid "PrivateUsage %8d KiB"
7697
msgstr ""
7698
7699
#: bzrlib/win32utils.py:186
7700
#, python-format
7701
msgid "PageFaultCount %8d"
7702
msgstr ""
7703
7704
#: bzrlib/workingtree.py:1482
7705
msgid "Rerun update after fixing the conflicts."
7706
msgstr ""
7707
7708
#: dummy/help_topics/authentication/summary.txt:1
7709
msgid "Information on configuring authentication"
7710
msgstr ""
7711
7712
#: dummy/help_topics/basic/detail.txt:1
7713
msgid ""
7714
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7715
"http://bazaar.canonical.com/"
7716
msgstr ""
7717
7718
#: dummy/help_topics/basic/detail.txt:4
7719
msgid ""
7720
"Basic commands:\n"
7721
" bzr init makes this directory a versioned branch\n"
7722
" bzr branch make a copy of another branch"
7723
msgstr ""
7724
"Grundbefehle:\n"
7725
" bzr init Aktuelles Verzeichnis wird zu einem versionierten Zweig "
7726
"gemacht\n"
7727
" bzr branch Eine Kopie eines anderen Entwicklungszweigs wird "
7728
"erstellt"
7729
7730
#: dummy/help_topics/basic/detail.txt:8
7731
msgid ""
7732
" bzr add make files or directories versioned\n"
7733
" bzr ignore ignore a file or pattern\n"
7734
" bzr mv move or rename a versioned file"
7735
msgstr ""
7736
" bzr add Dateien oder Verzeichnisse werden versioniert\n"
7737
" bzr ignore Eine Datei oder ein Dateimuster wird ignoriert\n"
7738
" bzr mv Eine versionierte Datei wird verschoben oder umbenannt"
7739
7740
#: dummy/help_topics/basic/detail.txt:12
7741
msgid ""
7742
" bzr status summarize changes in working copy\n"
7743
" bzr diff show detailed diffs"
7744
msgstr ""
7745
7746
#: dummy/help_topics/basic/detail.txt:15
7747
msgid ""
7748
" bzr merge pull in changes from another branch\n"
7749
" bzr commit save some or all changes\n"
7750
" bzr send send changes via email"
7751
msgstr ""
7752
7753
#: dummy/help_topics/basic/detail.txt:19
7754
msgid ""
7755
" bzr log show history of changes\n"
7756
" bzr check validate storage"
7757
msgstr ""
7758
7759
#: dummy/help_topics/basic/detail.txt:22
7760
msgid ""
7761
" bzr help init more help on e.g. init command\n"
7762
" bzr help commands list all commands\n"
7763
" bzr help topics list all help topics\n"
7764
msgstr ""
7765
7766
#: dummy/help_topics/basic/summary.txt:1
7767
msgid "Basic commands"
7768
msgstr "Einfache Befehle"
7769
7770
#: dummy/help_topics/branches/detail.txt:1
7771
msgid "Branches"
7772
msgstr "Zweige"
7773
7774
#: dummy/help_topics/branches/detail.txt:3
7775
msgid ""
7776
"A branch consists of the state of a project, including all of its\n"
7777
"history. All branches have a repository associated (which is where the\n"
7778
"branch history is stored), but multiple branches may share the same\n"
7779
"repository (a shared repository). Branches can be copied and merged."
7780
msgstr ""
7781
7782
#: dummy/help_topics/branches/detail.txt:8
7783
msgid ""
7784
"In addition, one branch may be bound to another one. Binding to another\n"
7785
"branch indicates that commits which happen in this branch must also \n"
7786
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7787
"commits when the two branches are out of date. In order for a commit \n"
7788
"to succeed, it may be necessary to update the current branch using \n"
7789
"``bzr update``."
7790
msgstr ""
7791
7792
#: dummy/help_topics/branches/detail.txt:15
7793
#: dummy/help_topics/checkouts/detail.txt:66
7794
#: dummy/help_topics/repositories/detail.txt:36
7795
msgid "Related commands::"
7796
msgstr ""
7797
7798
#: dummy/help_topics/branches/detail.txt:17
7799
msgid ""
7800
" init Change a directory into a versioned branch.\n"
7801
" branch Create a new branch that is a copy of an existing branch.\n"
7802
" merge Perform a three-way merge.\n"
7803
" bind Bind a branch to another one.\n"
7804
msgstr ""
7805
" init Ein Verzeichnis wird als ein versionierter Zweig festgelegt\n"
7806
" branch Ein neuer Zweig wird durch Kopieren eines bestehenden Zweigs "
7807
"erstellt\n"
7808
" merge Ein Dreiwege-Merge wird durchgeführt\n"
7809
" bind Ein Zweig wird mit einem anderen verbunden\n"
7810
7811
#: dummy/help_topics/branches/summary.txt:1
7812
msgid "Information on what a branch is"
7813
msgstr ""
7814
7815
#: dummy/help_topics/bugs/summary.txt:1
7816
msgid "Bug tracker settings"
7817
msgstr "Bug Tracker Einstellungen"
7818
7819
#: dummy/help_topics/checkouts/detail.txt:1
7820
msgid "Checkouts"
7821
msgstr ""
7822
7823
#: dummy/help_topics/checkouts/detail.txt:3
7824
msgid ""
7825
"Checkouts are source trees that are connected to a branch, so that when\n"
7826
"you commit in the source tree, the commit goes into that branch. They\n"
7827
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7828
"Bazaar's decentralized features until you want them. Using checkouts\n"
7829
"with shared repositories is very similar to working with SVN or CVS, but\n"
7830
"doesn't have the same restrictions. And using checkouts still allows\n"
7831
"others working on the project to use whatever workflow they like."
7832
msgstr ""
7833
7834
#: dummy/help_topics/checkouts/detail.txt:11
7835
msgid ""
7836
"A checkout is created with the bzr checkout command (see \"help "
7837
"checkout\").\n"
7838
"You pass it a reference to another branch, and it will create a local copy\n"
7839
"for you that still contains a reference to the branch you created the\n"
7840
"checkout from (the master branch). Then if you make any commits they will "
7841
"be\n"
7842
"made on the other branch first. This creates an instant mirror of your work, "
7843
"or\n"
7844
"facilitates lockstep development, where each developer is working together,\n"
7845
"continuously integrating the changes of others."
7846
msgstr ""
7847
7848
#: dummy/help_topics/checkouts/detail.txt:19
7849
msgid ""
7850
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7851
"you have the full history locally. As you have a first class branch you "
7852
"can\n"
7853
"also commit locally if you want, for instance due to the temporary loss af "
7854
"a\n"
7855
"network connection. Use the --local option to commit to do this. All the "
7856
"local\n"
7857
"commits will then be made on the master branch the next time you do a non-"
7858
"local\n"
7859
"commit."
7860
msgstr ""
7861
7862
#: dummy/help_topics/checkouts/detail.txt:26
7863
msgid ""
7864
"If you are using a checkout from a shared branch you will periodically want "
7865
"to\n"
7866
"pull in all the changes made by others. This is done using the \"update\"\n"
7867
"command. The changes need to be applied before any non-local commit, but\n"
7868
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7869
"command when needed."
7870
msgstr ""
7871
7872
#: dummy/help_topics/checkouts/detail.txt:32
7873
msgid ""
7874
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7875
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7876
"SVN checkout in that it is not a first class branch, it mainly consists of "
7877
"the\n"
7878
"working tree. This means that any history operations must query the master\n"
7879
"branch, which could be slow if a network connection is involved. Also, as "
7880
"you\n"
7881
"don't have a local branch, then you cannot commit locally."
7882
msgstr ""
7883
7884
#: dummy/help_topics/checkouts/detail.txt:39
7885
msgid ""
7886
"Lightweight checkouts work best when you have fast reliable access to the\n"
7887
"master branch. This means that if the master branch is on the same disk or "
7888
"LAN\n"
7889
"a lightweight checkout will be faster than a heavyweight one for any "
7890
"commands\n"
7891
"that modify the revision history (as only one copy of the branch needs to\n"
7892
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7893
"that uses the history but does not change it, but if the master branch is "
7894
"on\n"
7895
"the same disk then there won't be a noticeable difference."
7896
msgstr ""
7897
7898
#: dummy/help_topics/checkouts/detail.txt:47
7899
msgid ""
7900
"Another possible use for a checkout is to use it with a treeless repository\n"
7901
"containing your branches, where you maintain only one working tree by\n"
7902
"switching the master branch that the checkout points to when you want to\n"
7903
"work on a different branch."
7904
msgstr ""
7905
7906
#: dummy/help_topics/checkouts/detail.txt:52
7907
msgid ""
7908
"Obviously to commit on a checkout you need to be able to write to the "
7909
"master\n"
7910
"branch. This means that the master branch must be accessible over a "
7911
"writeable\n"
7912
"protocol , such as sftp://, and that you have write permissions at the "
7913
"other\n"
7914
"end. Checkouts also work on the local file system, so that all that matters "
7915
"is\n"
7916
"file permissions."
7917
msgstr ""
7918
7919
#: dummy/help_topics/checkouts/detail.txt:58
7920
msgid ""
7921
"You can change the master of a checkout by using the \"switch\" command "
7922
"(see\n"
7923
"\"help switch\"). This will change the location that the commits are sent "
7924
"to.\n"
7925
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7926
"checkout. If you would like to convert your heavy checkout into a normal\n"
7927
"branch so that every commit is local, you can use the \"unbind\" command. To "
7928
"see\n"
7929
"whether or not a branch is bound or not you can use the \"info\" command. If "
7930
"the\n"
7931
"branch is bound it will tell you the location of the bound branch."
7932
msgstr ""
7933
7934
#: dummy/help_topics/checkouts/detail.txt:68
7935
msgid ""
7936
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7937
" checkout\n"
7938
" update Pull any changes in the master branch in to your checkout\n"
7939
" commit Make a commit that is sent to the master branch. If you have\n"
7940
" a heavy checkout then the --local option will commit to the\n"
7941
" checkout without sending the commit to the master\n"
7942
" switch Change the master branch that the commits in the checkout "
7943
"will\n"
7944
" be sent to\n"
7945
" bind Turn a standalone branch into a heavy checkout so that any\n"
7946
" commits will be sent to the master branch\n"
7947
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7948
" commits are only made locally\n"
7949
" info Displays whether a branch is bound or unbound. If the branch "
7950
"is\n"
7951
" bound, then it will also display the location of the bound "
7952
"branch\n"
7953
msgstr ""
7954
7955
#: dummy/help_topics/checkouts/summary.txt:1
7956
msgid "Information on what a checkout is"
7957
msgstr ""
7958
7959
#: dummy/help_topics/commands/summary.txt:1
7960
msgid "Basic help for all commands"
7961
msgstr ""
7962
7963
#: dummy/help_topics/configuration/summary.txt:1
7964
msgid "Details on the configuration settings available"
7965
msgstr ""
7966
7967
#: dummy/help_topics/conflict-types/summary.txt:1
7968
msgid "Types of conflicts and what to do about them"
7969
msgstr ""
7970
7971
#: dummy/help_topics/content-filters/summary.txt:1
7972
msgid "Conversion of content into/from working trees"
7973
msgstr ""
7974
7975
#: dummy/help_topics/criss-cross/detail.txt:1
7976
msgid "Criss-Cross"
7977
msgstr "Kreuz und Quer"
7978
7979
#: dummy/help_topics/criss-cross/detail.txt:3
7980
msgid ""
7981
"A criss-cross in the branch history can cause the default merge technique\n"
7982
"to emit more conflicts than would normally be expected."
7983
msgstr ""
7984
7985
#: dummy/help_topics/criss-cross/detail.txt:6
7986
msgid ""
7987
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7988
"give\n"
7989
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7990
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7991
msgstr ""
7992
7993
#: dummy/help_topics/criss-cross/detail.txt:10
7994
msgid ""
7995
"Criss-crosses occur in a branch's history if two branches merge the same "
7996
"thing\n"
7997
"and then merge one another, or if two branches merge one another at the "
7998
"same\n"
7999
"time. They can be avoided by having each branch only merge from or into a\n"
8000
"designated central branch (a \"star topology\")."
8001
msgstr ""
8002
8003
#: dummy/help_topics/criss-cross/detail.txt:15
8004
msgid ""
8005
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8006
"default\n"
8007
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8008
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8009
"differences between THIS and OTHER are due to one side adding lines, or\n"
8010
"from another side removing lines."
8011
msgstr ""
8012
8013
#: dummy/help_topics/criss-cross/detail.txt:21
8014
msgid ""
8015
"Criss-crosses mean there is no good choice for a base. Selecting the "
8016
"recent\n"
8017
"merge points could cause one side's changes to be silently discarded.\n"
8018
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8019
"are emitted."
8020
msgstr ""
8021
8022
#: dummy/help_topics/criss-cross/detail.txt:26
8023
msgid ""
8024
"The ``weave`` merge type is not affected by this problem because it uses\n"
8025
"line-origin detection instead of a basis revision to determine the cause of\n"
8026
"differences.\n"
8027
msgstr ""
8028
8029
#: dummy/help_topics/criss-cross/summary.txt:1
8030
msgid "Information on criss-cross merging"
8031
msgstr ""
8032
8033
#: dummy/help_topics/current-formats/summary.txt:1
8034
msgid "Current storage formats"
8035
msgstr "Aktuelle Speicherformate"
8036
8037
#: dummy/help_topics/debug-flags/summary.txt:1
8038
msgid "Options to show or record debug information"
8039
msgstr ""
8040
8041
#: dummy/help_topics/diverged-branches/summary.txt:1
8042
msgid "How to fix diverged branches"
8043
msgstr ""
8044
8045
#: dummy/help_topics/env-variables/summary.txt:1
8046
msgid "Environment variable names and values"
8047
msgstr ""
8048
8049
#: dummy/help_topics/eol/summary.txt:1
8050
msgid "Information on end-of-line handling"
8051
msgstr ""
8052
8053
#: dummy/help_topics/files/detail.txt:1
8054
msgid "Files"
8055
msgstr "Dateien"
8056
8057
#: dummy/help_topics/files/detail.txt:3
8058
msgid ""
8059
":On Unix: ~/.bazaar/bazaar.conf\n"
8060
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8061
"bazaar\\\\2.0\\\\bazaar.conf"
8062
msgstr ""
8063
":In Unix: ~/.bazaar/bazaar.conf\n"
8064
":In Windows: C:\\\\Dokumente und Einstellungen\\\\Benutzername\\\\"
8065
"Anwendungsdaten\\\\bazaar\\\\2.0\\\\bazaar.conf"
8066
8067
#: dummy/help_topics/files/detail.txt:6
8068
msgid ""
8069
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8070
"used to define general configuration that will be applied everywhere.\n"
8071
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8072
"commonly used options."
8073
msgstr ""
8074
8075
#: dummy/help_topics/files/detail.txt:11
8076
msgid "A typical config file might look something like::"
8077
msgstr "Eine typische Konfigurationsdatei könnte so aussehen::"
8078
8079
#: dummy/help_topics/files/detail.txt:13
8080
msgid ""
8081
" [DEFAULT]\n"
8082
" email=John Doe <jdoe@isp.com>"
8083
msgstr ""
8084
8085
#: dummy/help_topics/files/detail.txt:16
8086
msgid ""
8087
" [ALIASES]\n"
8088
" commit = commit --strict\n"
8089
" log10 = log --short -r -10..-1\n"
8090
msgstr ""
8091
8092
#: dummy/help_topics/files/summary.txt:1
8093
msgid "Information on configuration and log files"
8094
msgstr ""
8095
8096
#: dummy/help_topics/formats/detail.txt:1
8097
msgid "Storage Formats"
8098
msgstr "Speicherformate"
8099
8100
#: dummy/help_topics/formats/detail.txt:3
8101
msgid ""
8102
"To ensure that older clients do not access data incorrectly,\n"
8103
"Bazaar's policy is to introduce a new storage format whenever\n"
8104
"new features requiring new metadata are added. New storage\n"
8105
"formats may also be introduced to improve performance and\n"
8106
"scalability."
8107
msgstr ""
8108
8109
#: dummy/help_topics/formats/detail.txt:9
8110
msgid ""
8111
"The newest format, 2a, is highly recommended. If your\n"
8112
"project is not using 2a, then you should suggest to the\n"
8113
"project owner to upgrade."
8114
msgstr ""
8115
8116
#: dummy/help_topics/formats/detail.txt:13
8117
msgid ""
8118
"\n"
8119
".. note::"
8120
msgstr ""
8121
8122
#: dummy/help_topics/formats/detail.txt:16
8123
msgid ""
8124
" Some of the older formats have two variants:\n"
8125
" a plain one and a rich-root one. The latter include an additional\n"
8126
" field about the root of the tree. There is no performance cost\n"
8127
" for using a rich-root format but you cannot easily merge changes\n"
8128
" from a rich-root format into a plain format. As a consequence,\n"
8129
" moving a project to a rich-root format takes some co-ordination\n"
8130
" in that all contributors need to upgrade their repositories\n"
8131
" around the same time. 2a and all future formats will be\n"
8132
" implicitly rich-root."
8133
msgstr ""
8134
8135
#: dummy/help_topics/formats/detail.txt:26
8136
msgid ""
8137
"See :doc:`current-formats-help` for the complete list of\n"
8138
"currently supported formats. See :doc:`other-formats-help` for\n"
8139
"descriptions of any available experimental and deprecated formats.\n"
8140
msgstr ""
8141
8142
#: dummy/help_topics/formats/summary.txt:1
8143
msgid "Information on choosing a storage format"
8144
msgstr "Informationen zur Auswahl eines Speicherformats"
8145
8146
#: dummy/help_topics/global-options/detail.txt:1
8147
msgid "Global Options"
8148
msgstr "Globale Einstellungen"
8149
8150
#: dummy/help_topics/global-options/detail.txt:3
8151
msgid ""
8152
"These options may be used with any command, and may appear in front of any\n"
8153
"command. (e.g. ``bzr --profile help``)."
8154
msgstr ""
8155
8156
#: dummy/help_topics/global-options/detail.txt:6
8157
msgid ""
8158
"--version Print the version number. Must be supplied before the "
8159
"command.\n"
8160
"--no-aliases Do not process command aliases when running this command.\n"
8161
"--builtin Use the built-in version of a command, not the plugin "
8162
"version.\n"
8163
" This does not suppress other plugin effects.\n"
8164
"--no-plugins Do not process any plugins.\n"
8165
"--no-l10n Do not translate messages.\n"
8166
"--concurrency Number of processes that can be run concurrently (selftest)."
8167
msgstr ""
8168
8169
#: dummy/help_topics/global-options/detail.txt:14
8170
msgid ""
8171
"--profile Profile execution using the hotshot profiler.\n"
8172
"--lsprof Profile execution using the lsprof profiler.\n"
8173
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8174
" results to a specified file. If the filename ends with "
8175
"\".txt\",\n"
8176
" text format will be used. If the filename either starts "
8177
"with\n"
8178
" \"callgrind.out\" or end with \".callgrind\", the output will "
8179
"be\n"
8180
" formatted for use with KCacheGrind. Otherwise, the output\n"
8181
" will be a pickle.\n"
8182
"--coverage Generate line coverage report in the specified directory."
8183
msgstr ""
8184
8185
#: dummy/help_topics/global-options/detail.txt:24
8186
msgid ""
8187
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8188
"for\n"
8189
" the duration of the command. This can be used multiple times "
8190
"if\n"
8191
" several options need to be overridden."
8192
msgstr ""
8193
8194
#: dummy/help_topics/global-options/detail.txt:28
8195
msgid ""
8196
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8197
"information on profiling."
8198
msgstr ""
8199
8200
#: dummy/help_topics/global-options/detail.txt:31
8201
msgid ""
8202
"A number of debug flags are also available to assist troubleshooting and\n"
8203
"development. See :doc:`debug-flags-help`.\n"
8204
msgstr ""
8205
8206
#: dummy/help_topics/global-options/summary.txt:1
8207
msgid "Options that control how Bazaar runs"
8208
msgstr ""
8209
8210
#: dummy/help_topics/hidden-commands/summary.txt:1
8211
msgid "All hidden commands"
8212
msgstr "Alle versteckten Befehle"
8213
8214
#: dummy/help_topics/hooks/summary.txt:1
8215
msgid "Points at which custom processing can be added"
8216
msgstr ""
8217
8218
#: dummy/help_topics/launchpad/detail.txt:1
8219
msgid "Integration with Launchpad.net"
8220
msgstr "Integration mit Launchpad.net"
8221
8222
#: dummy/help_topics/launchpad/detail.txt:3
8223
msgid ""
8224
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8225
"specification tracking."
8226
msgstr ""
8227
8228
#: dummy/help_topics/launchpad/detail.txt:6
8229
msgid ""
8230
"The bzr client (through the plugin called 'launchpad') has special\n"
8231
"features to communicate with Launchpad:"
8232
msgstr ""
8233
8234
#: dummy/help_topics/launchpad/detail.txt:9
8235
msgid ""
8236
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8237
"This\n"
8238
" is then used by the 'lp:' transport to download your branches using\n"
8239
" bzr+ssh://."
8240
msgstr ""
8241
8242
#: dummy/help_topics/launchpad/detail.txt:13
8243
msgid ""
8244
" * The 'lp:' transport uses Launchpad as a directory service: for "
8245
"example\n"
8246
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8247
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8248
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8249
msgstr ""
8250
8251
#: dummy/help_topics/launchpad/detail.txt:18
8252
msgid ""
8253
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8254
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8255
"lp:12345'\n"
8256
" will record a revision property that marks that revision as fixing\n"
8257
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8258
" automatically be linked to the bug report."
8259
msgstr ""
8260
8261
#: dummy/help_topics/launchpad/detail.txt:24
8262
msgid ""
8263
" * The register-branch command tells Launchpad about the url of a\n"
8264
" public branch. Launchpad will then mirror the branch, display\n"
8265
" its contents and allow it to be attached to bugs and other\n"
8266
" objects."
8267
msgstr ""
8268
8269
#: dummy/help_topics/launchpad/detail.txt:29
8270
msgid "For more information see http://help.launchpad.net/\n"
8271
msgstr "Für weitere Informationen siehe http://help.launchpad.net/\n"
8272
8273
#: dummy/help_topics/launchpad/summary.txt:1
8274
msgid "Using Bazaar with Launchpad.net"
8275
msgstr ""
8276
8277
#: dummy/help_topics/location-alias/summary.txt:1
8278
msgid "Aliases for remembered locations"
8279
msgstr ""
8280
8281
#: dummy/help_topics/log-formats/summary.txt:1
8282
msgid "Details on the logging formats available"
8283
msgstr ""
8284
8285
#: dummy/help_topics/other-formats/summary.txt:1
8286
msgid "Experimental and deprecated storage formats"
8287
msgstr ""
8288
8289
#: dummy/help_topics/patterns/summary.txt:1
8290
msgid "Information on the pattern syntax"
8291
msgstr ""
8292
8293
#: dummy/help_topics/repositories/detail.txt:1
8294
msgid "Repositories"
8295
msgstr ""
8296
8297
#: dummy/help_topics/repositories/detail.txt:3
8298
msgid ""
8299
"Repositories in Bazaar are where committed information is stored. There is\n"
8300
"a repository associated with every branch."
8301
msgstr ""
8302
8303
#: dummy/help_topics/repositories/detail.txt:6
8304
msgid ""
8305
"Repositories are a form of database. Bzr will usually maintain this for\n"
8306
"good performance automatically, but in some situations (e.g. when doing\n"
8307
"very many commits in a short time period) you may want to ask bzr to\n"
8308
"optimise the database indices. This can be done by the 'bzr pack' command."
8309
msgstr ""
8310
8311
#: dummy/help_topics/repositories/detail.txt:11
8312
msgid ""
8313
"By default just running 'bzr init' will create a repository within the new\n"
8314
"branch but it is possible to create a shared repository which allows "
8315
"multiple\n"
8316
"branches to share their information in the same location. When a new branch "
8317
"is\n"
8318
"created it will first look to see if there is a containing shared repository "
8319
"it\n"
8320
"can use."
8321
msgstr ""
8322
8323
#: dummy/help_topics/repositories/detail.txt:17
8324
msgid ""
8325
"When two branches of the same project share a repository, there is\n"
8326
"generally a large space saving. For some operations (e.g. branching\n"
8327
"within the repository) this translates in to a large time saving."
8328
msgstr ""
8329
8330
#: dummy/help_topics/repositories/detail.txt:21
8331
msgid ""
8332
"To create a shared repository use the init-repository command (or the alias\n"
8333
"init-repo). This command takes the location of the repository to create. "
8334
"This\n"
8335
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8336
"which contains a shared repository. Any new branches that are created in "
8337
"this\n"
8338
"directory will then use it for storage."
8339
msgstr ""
8340
8341
#: dummy/help_topics/repositories/detail.txt:27
8342
msgid ""
8343
"It is a good idea to create a repository whenever you might create more\n"
8344
"than one branch of a project. This is true for both working areas where you\n"
8345
"are doing the development, and any server areas that you use for hosting\n"
8346
"projects. In the latter case, it is common to want branches without working\n"
8347
"trees. Since the files in the branch will not be edited directly there is "
8348
"no\n"
8349
"need to use up disk space for a working tree. To create a repository in "
8350
"which\n"
8351
"the branches will not have working trees pass the '--no-trees' option to\n"
8352
"'init-repository'."
8353
msgstr ""
8354
8355
#: dummy/help_topics/repositories/detail.txt:38
8356
msgid ""
8357
" init-repository Create a shared repository. Use --no-trees to create "
8358
"one\n"
8359
" in which new branches won't get a working tree.\n"
8360
msgstr ""
8361
8362
#: dummy/help_topics/repositories/summary.txt:1
8363
msgid "Basic information on shared repositories."
8364
msgstr ""
8365
8366
#: dummy/help_topics/revisionspec/summary.txt:1
8367
msgid "Explain how to use --revision"
8368
msgstr ""
8369
8370
#: dummy/help_topics/rules/summary.txt:1
8371
msgid "Information on defining rule-based preferences"
8372
msgstr ""
8373
8374
#: dummy/help_topics/standalone-trees/detail.txt:1
8375
msgid "Standalone Trees"
8376
msgstr ""
8377
8378
#: dummy/help_topics/standalone-trees/detail.txt:3
8379
msgid ""
8380
"A standalone tree is a working tree with an associated repository. It\n"
8381
"is an independently usable branch, with no dependencies on any other.\n"
8382
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8383
"an existing project under version control."
8384
msgstr ""
8385
8386
#: dummy/help_topics/standalone-trees/detail.txt:8
8387
msgid "Related Commands::"
8388
msgstr ""
8389
8390
#: dummy/help_topics/standalone-trees/detail.txt:10
8391
msgid " init Make a directory into a versioned branch.\n"
8392
msgstr " init Ein Verzeichnis zu einem versionierten Zweig machen.\n"
8393
8394
#: dummy/help_topics/standalone-trees/summary.txt:1
8395
msgid "Information on what a standalone tree is"
8396
msgstr ""
8397
8398
#: dummy/help_topics/standard-options/detail.txt:1
8399
msgid "Standard Options"
8400
msgstr "Standard-Optionen"
8401
8402
#: dummy/help_topics/standard-options/detail.txt:3
8403
msgid "Standard options are legal for all commands."
8404
msgstr ""
8405
8406
#: dummy/help_topics/standard-options/detail.txt:5
8407
msgid ""
8408
"--help, -h Show help message.\n"
8409
"--verbose, -v Display more information.\n"
8410
"--quiet, -q Only display errors and warnings."
8411
msgstr ""
8412
8413
#: dummy/help_topics/standard-options/detail.txt:9
8414
msgid "Unlike global options, standard options can be used in aliases.\n"
8415
msgstr ""
8416
8417
#: dummy/help_topics/standard-options/summary.txt:1
8418
msgid "Options that can be used with any command"
8419
msgstr ""
8420
8421
#: dummy/help_topics/status-flags/detail.txt:1
8422
msgid "Status Flags"
8423
msgstr "Status-Flags"
8424
8425
#: dummy/help_topics/status-flags/detail.txt:3
8426
msgid ""
8427
"Status flags are used to summarise changes to the working tree in a concise\n"
8428
"manner. They are in the form::"
8429
msgstr ""
8430
8431
#: dummy/help_topics/status-flags/detail.txt:6
8432
msgid " xxx <filename>"
8433
msgstr ""
8434
8435
#: dummy/help_topics/status-flags/detail.txt:8
8436
msgid "where the columns' meanings are as follows."
8437
msgstr ""
8438
8439
#: dummy/help_topics/status-flags/detail.txt:10
8440
msgid "Column 1 - versioning/renames::"
8441
msgstr ""
8442
8443
#: dummy/help_topics/status-flags/detail.txt:12
8444
msgid ""
8445
" + File versioned\n"
8446
" - File unversioned\n"
8447
" R File renamed\n"
8448
" ? File unknown\n"
8449
" X File nonexistent (and unknown to bzr)\n"
8450
" C File has conflicts\n"
8451
" P Entry for a pending merge (not a file)"
8452
msgstr ""
8453
8454
#: dummy/help_topics/status-flags/detail.txt:20
8455
msgid "Column 2 - contents::"
8456
msgstr ""
8457
8458
#: dummy/help_topics/status-flags/detail.txt:22
8459
msgid ""
8460
" N File created\n"
8461
" D File deleted\n"
8462
" K File kind changed\n"
8463
" M File modified"
8464
msgstr ""
8465
8466
#: dummy/help_topics/status-flags/detail.txt:27
8467
msgid "Column 3 - execute::"
8468
msgstr ""
8469
8470
#: dummy/help_topics/status-flags/detail.txt:29
8471
msgid " * The execute bit was changed\n"
8472
msgstr ""
8473
8474
#: dummy/help_topics/status-flags/summary.txt:1
8475
msgid "Help on status flags"
8476
msgstr ""
8477
8478
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8479
msgid "Branches Out of Sync"
8480
msgstr ""
8481
8482
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8483
msgid ""
8484
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8485
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8486
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8487
"have the same last revision as the new reference branch for the lightweight\n"
8488
"checkout, data could be lost, so Bazaar refuses."
8489
msgstr ""
8490
8491
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8492
msgid "How you deal with this depends on *why* the branches are out of sync."
8493
msgstr ""
8494
8495
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8496
msgid ""
8497
"If you have a checkout and have done local commits, you can get back in "
8498
"sync\n"
8499
"by running \"bzr update\" (and possibly \"bzr commit\")."
8500
msgstr ""
8501
8502
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8503
msgid ""
8504
"If you have a branch and the remote branch is out-of-date, you can push\n"
8505
"the local changes using \"bzr push\". If the local branch is out of date, "
8506
"you\n"
8507
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8508
"commit\n"
8509
"and then push your changes. If you decide that some of the changes aren't\n"
8510
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8511
msgstr ""
8512
8513
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8514
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8515
msgstr ""
8516
8517
#: dummy/help_topics/topics/summary.txt:1
8518
msgid "Topics list"
8519
msgstr "Themen-Liste"
8520
8521
#: dummy/help_topics/url-special-chars/summary.txt:1
8522
msgid "Special character handling in URLs"
8523
msgstr ""
8524
8525
#: dummy/help_topics/urlspec/summary.txt:1
8526
msgid "Supported transport protocols"
8527
msgstr "Unterstützte Transportprotokolle"
8528
8529
#: dummy/help_topics/working-trees/detail.txt:1
8530
msgid "Working Trees"
8531
msgstr ""
8532
8533
#: dummy/help_topics/working-trees/detail.txt:3
8534
msgid ""
8535
"A working tree is the contents of a branch placed on disk so that you can\n"
8536
"see the files and edit them. The working tree is where you make changes to "
8537
"a\n"
8538
"branch, and when you commit the current state of the working tree is the\n"
8539
"snapshot that is recorded in the commit."
8540
msgstr ""
8541
8542
#: dummy/help_topics/working-trees/detail.txt:8
8543
msgid ""
8544
"When you push a branch to a remote system, a working tree will not be\n"
8545
"created. If one is already present the files will not be updated. The\n"
8546
"branch information will be updated and the working tree will be marked\n"
8547
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8548
"may be uncommitted changes or the update may cause content conflicts that "
8549
"are\n"
8550
"difficult to deal with remotely."
8551
msgstr ""
8552
8553
#: dummy/help_topics/working-trees/detail.txt:15
8554
msgid ""
8555
"If you have a branch with no working tree you can use the 'checkout' "
8556
"command\n"
8557
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8558
"will\n"
8559
"create the working tree. If the branch is updated remotely, you can update "
8560
"the\n"
8561
"working tree by running 'bzr update' in that directory."
8562
msgstr ""
8563
8564
#: dummy/help_topics/working-trees/detail.txt:20
8565
msgid ""
8566
"If you have a branch with a working tree that you do not want the 'remove-"
8567
"tree'\n"
8568
"command will remove the tree if it is safe. This can be done to avoid the\n"
8569
"warning about the remote working tree not being updated when pushing to the\n"
8570
"branch. It can also be useful when working with a '--no-trees' repository\n"
8571
"(see 'bzr help repositories')."
8572
msgstr ""
8573
8574
#: dummy/help_topics/working-trees/detail.txt:26
8575
msgid ""
8576
"If you want to have a working tree on a remote machine that you push to you\n"
8577
"can either run 'bzr update' in the remote branch after each push, or use "
8578
"some\n"
8579
"other method to update the tree during the push. There is an 'rspush' "
8580
"plugin\n"
8581
"that will update the working tree using rsync as well as doing a push. "
8582
"There\n"
8583
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8584
"SSH\n"
8585
"after each push."
8586
msgstr ""
8587
8588
#: dummy/help_topics/working-trees/detail.txt:33
8589
msgid "Useful commands::"
8590
msgstr "Nützliche Befehle::"
8591
8592
#: dummy/help_topics/working-trees/detail.txt:35
8593
msgid ""
8594
" checkout Create a working tree when a branch does not have one.\n"
8595
" remove-tree Removes the working tree from a branch when it is safe to do "
8596
"so.\n"
8597
" update When a working tree is out of sync with its associated "
8598
"branch\n"
8599
" this will update the tree to match the branch.\n"
8600
msgstr ""
8601
8602
#: dummy/help_topics/working-trees/summary.txt:1
8603
msgid "Information on working trees"
8604
msgstr ""
8605
8606
#: en/help_topics/authentication.txt:1
8607
msgid ""
8608
"Authentication Settings\n"
8609
"======================="
8610
msgstr ""
8611
8612
#: en/help_topics/authentication.txt:4
8613
msgid ""
8614
"\n"
8615
"Intent\n"
8616
"------"
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:8
8620
msgid ""
8621
"Many different authentication policies can be described in the\n"
8622
"``authentication.conf`` file but a particular user should need only a few\n"
8623
"definitions to cover his needs without having to specify a user and a "
8624
"password\n"
8625
"for every branch he uses."
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:13
8629
msgid ""
8630
"The definitions found in this file are used to find the credentials to use "
8631
"for\n"
8632
"a given url. The same credentials can generally be used for as many branches "
8633
"as\n"
8634
"possible by grouping their declaration around the remote servers that need\n"
8635
"them. It's even possible to declare credentials that will be used by "
8636
"different\n"
8637
"servers."
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:19
8641
msgid ""
8642
"The intent is to make this file as small as possible to minimize maintenance."
8643
msgstr ""
8644
8645
#: en/help_topics/authentication.txt:21
8646
msgid ""
8647
"Once the relevant credentials are declared in this file you may use branch "
8648
"urls\n"
8649
"without embedding passwords (security hazard) or even users (enabling "
8650
"sharing\n"
8651
"of your urls with others)."
8652
msgstr ""
8653
8654
#: en/help_topics/authentication.txt:25
8655
msgid "Instead of using::"
8656
msgstr ""
8657
8658
#: en/help_topics/authentication.txt:27
8659
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8660
msgstr " bzr branch ftp://joe:secret@host.com/pfad/zu/meiner/branch"
8661
8662
#: en/help_topics/authentication.txt:29
8663
msgid "you simply use::"
8664
msgstr ""
8665
8666
#: en/help_topics/authentication.txt:31
8667
msgid " bzr branch ftp://host.com/path/to/my/branch"
8668
msgstr " bzr branch ftp://host.com/pfad/zu/meiner/branch"
8669
8670
#: en/help_topics/authentication.txt:33
8671
msgid ""
8672
"provided you have created the following ``authentication.conf`` file::"
8673
msgstr ""
8674
8675
#: en/help_topics/authentication.txt:35
8676
msgid ""
8677
" [myprojects]\n"
8678
" scheme=ftp\n"
8679
" host=host.com\n"
8680
" user=joe\n"
8681
" password=secret\n"
8682
" "
8683
msgstr ""
8684
" [myprojects]\n"
8685
" scheme=ftp\n"
8686
" host=host.de\n"
8687
" user=joe\n"
8688
" password=secret\n"
8689
" "
8690
8691
#: en/help_topics/authentication.txt:42
8692
msgid ""
8693
"Authentication definitions\n"
8694
"--------------------------"
8695
msgstr ""
8696
8697
#: en/help_topics/authentication.txt:45
8698
msgid ""
8699
"There are two kinds of authentication used by the various schemes supported "
8700
"by\n"
8701
"bzr:"
8702
msgstr ""
8703
8704
#: en/help_topics/authentication.txt:48
8705
msgid "1. user and password"
8706
msgstr "1. Benutzername und Passwort"
8707
8708
#: en/help_topics/authentication.txt:50
8709
msgid ""
8710
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8711
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8712
"ssh agents are a better, more secure solution. So we have chosen to not "
8713
"provide\n"
8714
"our own less secure method."
8715
msgstr ""
8716
8717
#: en/help_topics/authentication.txt:55
8718
msgid "2. user, realm and password"
8719
msgstr ""
8720
8721
#: en/help_topics/authentication.txt:57
8722
msgid ""
8723
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8724
"against a host. But, by using ``.htaccess`` files, for example, it is "
8725
"possible\n"
8726
"to define several (``user, realm, password``) for a given ``host``. So what "
8727
"is\n"
8728
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8729
"is\n"
8730
"not taken into account in the definitions, but will displayed if bzr "
8731
"prompts\n"
8732
"you for a password."
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:64
8736
msgid ""
8737
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8738
"specifying the appropriate port."
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:67
8742
msgid ""
8743
"To take all schemes into account, the password will be deduced from a set "
8744
"of\n"
8745
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8746
"``user``,\n"
8747
"``password``)."
8748
msgstr ""
8749
8750
#: en/help_topics/authentication.txt:71
8751
msgid ""
8752
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8753
"used\n"
8754
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8755
"``ssh``\n"
8756
" should be used instead since this is the real scheme regarding\n"
8757
" authentication,"
8758
msgstr ""
8759
8760
#: en/help_topics/authentication.txt:76
8761
msgid " * ``host``: can be empty (to act as a default for any host),"
8762
msgstr ""
8763
8764
#: en/help_topics/authentication.txt:78
8765
msgid ""
8766
" * ``port`` can be empty (useful when an host provides several servers for "
8767
"the\n"
8768
" same scheme), only numerical values are allowed, this should be used "
8769
"only\n"
8770
" when the server uses a port different than the scheme standard port,"
8771
msgstr ""
8772
8773
#: en/help_topics/authentication.txt:82
8774
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8775
msgstr ""
8776
8777
#: en/help_topics/authentication.txt:84
8778
msgid ""
8779
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8780
" ``getpass.get_user()``),"
8781
msgstr ""
8782
8783
#: en/help_topics/authentication.txt:87
8784
msgid ""
8785
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8786
" password."
8787
msgstr ""
8788
8789
#: en/help_topics/authentication.txt:90
8790
msgid ""
8791
"Multiple definitions can be provided and, for a given URL, bzr will select "
8792
"a\n"
8793
"(``user`` [, ``password``]) based on the following rules :"
8794
msgstr ""
8795
8796
#: en/help_topics/authentication.txt:93
8797
msgid " 1. the first match wins,"
8798
msgstr ""
8799
8800
#: en/help_topics/authentication.txt:95
8801
msgid " 2. empty fields match everything,"
8802
msgstr ""
8803
8804
#: en/help_topics/authentication.txt:97
8805
msgid ""
8806
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8807
msgstr ""
8808
8809
#: en/help_topics/authentication.txt:99
8810
msgid ""
8811
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8812
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8813
"``projectbzr.sf.net``\n"
8814
" will not match ``bzr.sf.net``)."
8815
msgstr ""
8816
8817
#: en/help_topics/authentication.txt:103
8818
msgid ""
8819
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8820
msgstr ""
8821
8822
#: en/help_topics/authentication.txt:105
8823
msgid ""
8824
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8825
"above,\n"
8826
" empty paths will match any provided path)."
8827
msgstr ""
8828
8829
#: en/help_topics/authentication.txt:110
8830
msgid ""
8831
"File format\n"
8832
"-----------"
8833
msgstr ""
8834
"Dateiformat\n"
8835
"-----------"
8836
8837
#: en/help_topics/authentication.txt:113
8838
msgid ""
8839
"The general rules for :doc:`configuration files <configuration-help>`\n"
8840
"apply except for the variable policies."
8841
msgstr ""
8842
8843
#: en/help_topics/authentication.txt:116
8844
msgid "Each section describes an authentication definition."
8845
msgstr ""
8846
8847
#: en/help_topics/authentication.txt:118
8848
msgid ""
8849
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8850
"reserved\n"
8851
"and should appear as the *last* section."
8852
msgstr ""
8853
8854
#: en/help_topics/authentication.txt:121
8855
msgid "Each section should define:"
8856
msgstr ""
8857
8858
#: en/help_topics/authentication.txt:123
8859
msgid "* ``user``: the login to be used,"
8860
msgstr ""
8861
8862
#: en/help_topics/authentication.txt:125
8863
msgid "Each section could define:"
8864
msgstr ""
8865
8866
#: en/help_topics/authentication.txt:127
8867
msgid "* ``host``: the remote server,"
8868
msgstr ""
8869
8870
#: en/help_topics/authentication.txt:129
8871
msgid "* ``port``: the port the server is listening,"
8872
msgstr "* ``port``: der Port auf dem der Server horcht,"
8873
8874
#: en/help_topics/authentication.txt:131
8875
msgid "* ``path``: the branch location,"
8876
msgstr ""
8877
8878
#: en/help_topics/authentication.txt:133
8879
msgid "* ``password``: the password."
8880
msgstr "* ``password``: das Passwort."
8881
8882
#: en/help_topics/authentication.txt:135
8883
msgid ""
8884
"\n"
8885
"Examples\n"
8886
"--------"
8887
msgstr ""
8888
"\n"
8889
"Beispiele\n"
8890
"---------"
8891
8892
#: en/help_topics/authentication.txt:139
8893
msgid ""
8894
"\n"
8895
"Personal projects hosted outside\n"
8896
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8897
msgstr ""
8898
8899
#: en/help_topics/authentication.txt:143
8900
msgid ""
8901
"All connections are done with the same ``user`` (the remote one for which "
8902
"the\n"
8903
"default bzr one is not appropriate) and the password is always prompted "
8904
"with\n"
8905
"some exceptions::"
8906
msgstr ""
8907
8908
#: en/help_topics/authentication.txt:147
8909
msgid ""
8910
" # Pet projects on hobby.net\n"
8911
" [hobby]\n"
8912
" host=r.hobby.net\n"
8913
" user=jim\n"
8914
" password=obvious1234\n"
8915
" \n"
8916
" # Home server\n"
8917
" [home]\n"
8918
" scheme=https\n"
8919
" host=home.net\n"
8920
" user=joe\n"
8921
" password=1essobV10us\n"
8922
" \n"
8923
" [DEFAULT]\n"
8924
" # Our local user is barbaz, on all remote sites we're known as "
8925
"foobar\n"
8926
" user=foobar"
8927
msgstr ""
8928
8929
#: en/help_topics/authentication.txt:164
8930
msgid ""
8931
"\n"
8932
"Source hosting provider\n"
8933
"~~~~~~~~~~~~~~~~~~~~~~~"
8934
msgstr ""
8935
8936
#: en/help_topics/authentication.txt:168
8937
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8938
msgstr ""
8939
8940
#: en/help_topics/authentication.txt:170
8941
msgid ""
8942
" [shpnet domain]\n"
8943
" # we use sftp, but ssh is the scheme used for authentication\n"
8944
" scheme=ssh\n"
8945
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8946
" host=.shp.net\n"
8947
" user=joe\n"
8948
" # bzr don't support supplying a password for sftp,\n"
8949
" # consider using an ssh agent if you don't want to supply\n"
8950
" # a password interactively. (pageant, ssh-agent, etc)"
8951
msgstr ""
8952
8953
#: en/help_topics/authentication.txt:180
8954
msgid ""
8955
"HTTPS, SFTP servers and their proxy\n"
8956
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8957
msgstr ""
8958
8959
#: en/help_topics/authentication.txt:183
8960
msgid ""
8961
"At company.com, the server hosting release and integration branches is "
8962
"behind a\n"
8963
"proxy, and the two branches use different authentication policies::"
8964
msgstr ""
8965
8966
#: en/help_topics/authentication.txt:186
8967
msgid ""
8968
" [reference code]\n"
8969
" scheme=https\n"
8970
" host=dev.company.com\n"
8971
" path=/dev\n"
8972
" user=user1\n"
8973
" password=pass1"
8974
msgstr ""
8975
8976
#: en/help_topics/authentication.txt:193
8977
msgid ""
8978
" # development branches on dev server\n"
8979
" [dev]\n"
8980
" scheme=ssh # bzr+ssh and sftp are available here\n"
8981
" host=dev.company.com\n"
8982
" path=/dev/integration\n"
8983
" user=user2\n"
8984
" \n"
8985
" # proxy\n"
8986
" [proxy]\n"
8987
" scheme=http\n"
8988
" host=proxy.company.com\n"
8989
" port=3128\n"
8990
" user=proxyuser1\n"
8991
" password=proxypass1"
8992
msgstr ""
8993
8994
#: en/help_topics/authentication.txt:208
8995
msgid ""
8996
"\n"
8997
"Planned enhancements\n"
8998
"--------------------"
8999
msgstr ""
9000
9001
#: en/help_topics/authentication.txt:212
9002
msgid ""
9003
"The following are not yet implemented but planned as parts of a work in\n"
9004
"progress:"
9005
msgstr ""
9006
9007
#: en/help_topics/authentication.txt:215
9008
msgid "* add a ``password_encoding`` field allowing:"
9009
msgstr ""
9010
9011
#: en/help_topics/authentication.txt:217
9012
msgid ""
9013
" - storing the passwords in various obfuscating encodings (base64 for one),"
9014
msgstr ""
9015
9016
#: en/help_topics/authentication.txt:219
9017
msgid " - delegate password storage to plugins (.netrc for example)."
9018
msgstr ""
9019
9020
#: en/help_topics/authentication.txt:221
9021
msgid ""
9022
"* update the credentials when the user is prompted for user or password,"
9023
msgstr ""
9024
9025
#: en/help_topics/authentication.txt:223
9026
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9027
msgstr ""
9028
9029
#: en/help_topics/authentication.txt:225
9030
msgid ""
9031
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9032
"but\n"
9033
"ignored in the actual implementation.\n"
9034
msgstr ""
9035
9036
#: en/help_topics/bugs.txt:1
9037
msgid "Bug Tracker Settings"
9038
msgstr "Bug Tracker Einstellungen"
9039
9040
#: en/help_topics/bugs.txt:3
9041
msgid ""
9042
"When making a commit, metadata about bugs fixed by that change can be\n"
9043
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9044
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9045
"(The only ``status`` value currently supported is ``fixed.``)"
9046
msgstr ""
9047
9048
#: en/help_topics/bugs.txt:8
9049
msgid ""
9050
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9051
"identifier\n"
9052
"rather than a full URL. This looks like::"
9053
msgstr ""
9054
9055
#: en/help_topics/bugs.txt:11
9056
msgid " bzr commit --fixes <tracker>:<id>"
9057
msgstr " bzr commit --fixes <tracker>:<id>"
9058
9059
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9060
msgid "or::"
9061
msgstr "oder::"
9062
9063
#: en/help_topics/bugs.txt:15
9064
msgid " bzr commit --fixes <id>"
9065
msgstr ""
9066
9067
#: en/help_topics/bugs.txt:17
9068
msgid ""
9069
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9070
"the\n"
9071
"identifier for that bug within the bugtracker, usually the bug number.\n"
9072
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9073
"or global configuration is used."
9074
msgstr ""
9075
9076
#: en/help_topics/bugs.txt:22
9077
msgid ""
9078
"Bazaar knows about a few bug trackers that have many users. If\n"
9079
"you use one of these bug trackers then there is no setup required to\n"
9080
"use this feature, you just need to know the tracker identifier to use.\n"
9081
"These are the bugtrackers that are built in:"
9082
msgstr ""
9083
9084
#: en/help_topics/bugs.txt:27
9085
msgid ""
9086
" ============================ ============ ============\n"
9087
" URL Abbreviation Example\n"
9088
" ============================ ============ ============\n"
9089
" https://bugs.launchpad.net/ lp lp:12345\n"
9090
" http://bugs.debian.org/ deb deb:12345\n"
9091
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9092
" ============================ ============ ============"
9093
msgstr ""
9094
9095
#: en/help_topics/bugs.txt:35
9096
msgid ""
9097
"For the bug trackers not listed above configuration is required.\n"
9098
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9099
"is built in, along with a template mechanism for other bugtrackers with\n"
9100
"simple URL schemes. If your bug tracker can't be described by one\n"
9101
"of the schemes described below then you can write a plugin to support\n"
9102
"it."
9103
msgstr ""
9104
9105
#: en/help_topics/bugs.txt:42
9106
msgid ""
9107
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9108
"variable which contains the base URL of the bug tracker. These options\n"
9109
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9110
"configuration section in ``locations.conf``. You can set up these values\n"
9111
"for each of the projects you work on."
9112
msgstr ""
9113
9114
#: en/help_topics/bugs.txt:48
9115
msgid ""
9116
"Note: As you provide a short name for each tracker, you can specify one or\n"
9117
"more bugs in one or more trackers at commit time if you wish."
9118
msgstr ""
9119
9120
#: en/help_topics/bugs.txt:51
9121
msgid ""
9122
"Launchpad\n"
9123
"---------"
9124
msgstr ""
9125
"Launchpad\n"
9126
"---------"
9127
9128
#: en/help_topics/bugs.txt:54
9129
msgid ""
9130
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9131
msgstr ""
9132
9133
#: en/help_topics/bugs.txt:56
9134
msgid ""
9135
"bugzilla_<tracker>_url\n"
9136
"----------------------"
9137
msgstr ""
9138
"bugzilla_<tracker>_url\n"
9139
"----------------------"
9140
9141
#: en/help_topics/bugs.txt:59
9142
msgid ""
9143
"If present, the location of the Bugzilla bug tracker referred to by\n"
9144
"<tracker>. This option can then be used together with ``bzr commit\n"
9145
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9146
"example::"
9147
msgstr ""
9148
9149
#: en/help_topics/bugs.txt:64
9150
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9151
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9152
9153
#: en/help_topics/bugs.txt:66
9154
msgid ""
9155
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9156
"fixed."
9157
msgstr ""
9158
9159
#: en/help_topics/bugs.txt:69
9160
msgid ""
9161
"trac_<tracker>_url\n"
9162
"------------------"
9163
msgstr ""
9164
"trac_<tracker>_url\n"
9165
"------------------"
9166
9167
#: en/help_topics/bugs.txt:72
9168
msgid ""
9169
"If present, the location of the Trac instance referred to by\n"
9170
"<tracker>. This option can then be used together with ``bzr commit\n"
9171
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9172
"example::"
9173
msgstr ""
9174
9175
#: en/help_topics/bugs.txt:77
9176
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9177
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9178
9179
#: en/help_topics/bugs.txt:79
9180
msgid ""
9181
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9182
"as\n"
9183
"fixed."
9184
msgstr ""
9185
9186
#: en/help_topics/bugs.txt:82
9187
msgid ""
9188
"bugtracker_<tracker>_url\n"
9189
"------------------------"
9190
msgstr ""
9191
"bugtracker_<tracker>_url\n"
9192
"------------------------"
9193
9194
#: en/help_topics/bugs.txt:85
9195
msgid ""
9196
"If present, the location of a generic bug tracker instance referred to by\n"
9197
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9198
"which will be replaced by a specific bug ID. This option can then be used\n"
9199
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9200
"fixed by that commit. For example::"
9201
msgstr ""
9202
9203
#: en/help_topics/bugs.txt:91
9204
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9205
msgstr ""
9206
9207
#: en/help_topics/bugs.txt:93
9208
msgid ""
9209
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9210
"Roundup bug tracker as fixed, or::"
9211
msgstr ""
9212
9213
#: en/help_topics/bugs.txt:96
9214
msgid ""
9215
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9216
msgstr ""
9217
9218
#: en/help_topics/bugs.txt:98
9219
msgid ""
9220
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9221
"RT bug tracker as fixed, or::"
9222
msgstr ""
9223
9224
#: en/help_topics/bugs.txt:101
9225
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9226
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9227
9228
#: en/help_topics/bugs.txt:103
9229
msgid ""
9230
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9231
"1234\n"
9232
"in Hudson's JIRA bug tracker as fixed.\n"
9233
msgstr ""
9234
9235
#: en/help_topics/commands.txt:1
9236
msgid ""
9237
"add Add specified files or directories.\n"
9238
"alias Set/unset and display aliases.\n"
9239
"annotate Show the origin of each line in a file.\n"
9240
"bash-completion Generate a shell function for bash command line "
9241
"completion.\n"
9242
" [bash_completion]\n"
9243
"bind Convert the current branch into a checkout of the "
9244
"supplied\n"
9245
" branch.\n"
9246
"branch Create a new branch that is a copy of an existing branch.\n"
9247
"branches List the branches available at the current location.\n"
9248
"break-lock Break a dead lock.\n"
9249
"cat Write the contents of a file as of a given revision to\n"
9250
" standard output.\n"
9251
"check Validate working tree structure, branch consistency and\n"
9252
" repository history.\n"
9253
"checkout Create a new checkout of an existing branch.\n"
9254
"clean-tree Remove unwanted files from working tree.\n"
9255
"commit Commit changes into a new revision.\n"
9256
"config Display, set or remove a configuration option.\n"
9257
"conflicts List files with conflicts.\n"
9258
"deleted List files deleted in the working tree.\n"
9259
"diff Show differences in the working tree, between revisions "
9260
"or\n"
9261
" branches.\n"
9262
"dpush Push into a different VCS without any custom bzr "
9263
"metadata.\n"
9264
"export Export current or past revision to a destination directory "
9265
"or\n"
9266
" archive.\n"
9267
"help Show help on a command or other topic.\n"
9268
"ignore Ignore specified files or patterns.\n"
9269
"ignored List ignored files and the patterns that matched them.\n"
9270
"info Show information about a working tree, branch or "
9271
"repository.\n"
9272
"init Make a directory into a versioned branch.\n"
9273
"init-repository Create a shared repository for branches to share storage\n"
9274
" space.\n"
9275
"join Combine a tree into its containing tree.\n"
9276
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9277
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9278
"launchpad-open Open a Launchpad branch page in your web browser. "
9279
"[launchpad]\n"
9280
"log Show historical log for a branch or subset of a branch.\n"
9281
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9282
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9283
"ls List files in a tree.\n"
9284
"merge Perform a three-way merge.\n"
9285
"missing Show unmerged/unpulled revisions between two branches.\n"
9286
"mkdir Create a new versioned directory.\n"
9287
"mv Move or rename a file.\n"
9288
"nick Print or set the branch nickname.\n"
9289
"pack Compress the data within a repository.\n"
9290
"plugins List the installed plugins.\n"
9291
"pull Turn this branch into a mirror of another branch.\n"
9292
"push Update a mirror of this branch.\n"
9293
"reconcile Reconcile bzr metadata in a branch.\n"
9294
"reconfigure Reconfigure the type of a bzr directory.\n"
9295
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9296
"remerge Redo a merge.\n"
9297
"remove Remove files or directories.\n"
9298
"remove-branch Remove a branch.\n"
9299
"remove-tree Remove the working tree from a given branch/checkout.\n"
9300
"renames Show list of renamed files.\n"
9301
"resolve Mark a conflict as resolved.\n"
9302
"revert Set files in the working tree back to the contents of a\n"
9303
" previous revision.\n"
9304
"revno Show current revision number.\n"
9305
"root Show the tree root directory.\n"
9306
"send Mail or create a merge-directive for submitting changes.\n"
9307
"serve Run the bzr server.\n"
9308
"shelve Temporarily set aside some changes from the current tree.\n"
9309
"sign-my-commits Sign all commits by a given committer.\n"
9310
"split Split a subdirectory of a tree into a separate tree.\n"
9311
"status Display status summary.\n"
9312
"switch Set the branch of a checkout and update.\n"
9313
"tag Create, remove or modify a tag naming a revision.\n"
9314
"tags List tags.\n"
9315
"testament Show testament (signing-form) of a revision.\n"
9316
"unbind Convert the current checkout into a regular branch.\n"
9317
"uncommit Remove the last committed revision.\n"
9318
"unshelve Restore shelved changes.\n"
9319
"update Update a working tree to a new revision.\n"
9320
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9321
" format.\n"
9322
"verify-signatures Verify all commit signatures.\n"
9323
"version Show version of bzr.\n"
9324
"version-info Show version information about this tree.\n"
9325
"view Manage filtered views.\n"
9326
"whoami Show or set bzr user id.\n"
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:1
9330
msgid ""
9331
"Configuration Settings\n"
9332
"======================="
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:4
9336
msgid ""
9337
"Environment settings\n"
9338
"---------------------"
9339
msgstr ""
9340
9341
#: en/help_topics/configuration.txt:7
9342
msgid ""
9343
"While most configuration is handled by configuration files, some options\n"
9344
"which may be semi-permanent can also be controlled through the environment."
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:10
9348
msgid ""
9349
"BZR_EMAIL\n"
9350
"~~~~~~~~~"
9351
msgstr ""
9352
"BZR_EMAIL\n"
9353
"~~~~~~~~~"
9354
9355
#: en/help_topics/configuration.txt:13
9356
msgid "Override the email id used by Bazaar. Typical format::"
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:15
9360
msgid " \"John Doe <jdoe@example.com>\""
9361
msgstr " \"John Doe <jdoe@beispiel.de>\""
9362
9363
#: en/help_topics/configuration.txt:17
9364
msgid "See also the ``email`` configuration option."
9365
msgstr ""
9366
9367
#: en/help_topics/configuration.txt:19
9368
msgid ""
9369
"BZR_PROGRESS_BAR\n"
9370
"~~~~~~~~~~~~~~~~"
9371
msgstr ""
9372
"BZR_PROGRESS_BAR\n"
9373
"~~~~~~~~~~~~~~~~"
9374
9375
#: en/help_topics/configuration.txt:22
9376
msgid ""
9377
"Override the progress display. Possible values are \"none\" or \"text\". "
9378
"If\n"
9379
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9380
"draws\n"
9381
"the ordinary command line progress bar."
9382
msgstr ""
9383
9384
#: en/help_topics/configuration.txt:26
9385
msgid ""
9386
"BZR_SIGQUIT_PDB\n"
9387
"~~~~~~~~~~~~~~~"
9388
msgstr ""
9389
"BZR_SIGQUIT_PDB\n"
9390
"~~~~~~~~~~~~~~~"
9391
9392
#: en/help_topics/configuration.txt:29
9393
msgid ""
9394
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9395
msgstr ""
9396
9397
#: en/help_topics/configuration.txt:31
9398
msgid ""
9399
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9400
"* 1 = Invoke breakin debugger (default)"
9401
msgstr ""
9402
9403
#: en/help_topics/configuration.txt:34
9404
msgid ""
9405
"BZR_HOME\n"
9406
"~~~~~~~~"
9407
msgstr ""
9408
"BZR_HOME\n"
9409
"~~~~~~~~"
9410
9411
#: en/help_topics/configuration.txt:37
9412
msgid "Override the home directory used by Bazaar."
9413
msgstr ""
9414
9415
#: en/help_topics/configuration.txt:39
9416
msgid ""
9417
"BZR_SSH\n"
9418
"~~~~~~~"
9419
msgstr ""
9420
"BZR_SSH\n"
9421
"~~~~~~~"
9422
9423
#: en/help_topics/configuration.txt:42
9424
msgid "Select a different SSH implementation."
9425
msgstr "Wählen Sie eine andere SSH-Implementierung."
9426
9427
#: en/help_topics/configuration.txt:44
9428
msgid ""
9429
"BZR_PDB\n"
9430
"~~~~~~~"
9431
msgstr ""
9432
"BZR_PDB\n"
9433
"~~~~~~~"
9434
9435
#: en/help_topics/configuration.txt:47
9436
msgid "Control whether to launch a debugger on error."
9437
msgstr ""
9438
9439
#: en/help_topics/configuration.txt:49
9440
msgid ""
9441
"* 0 = Standard behavior\n"
9442
"* 1 = Launch debugger"
9443
msgstr ""
9444
"* 0 = Standard Verhalten\n"
9445
"* 1 = Debugger starten"
9446
9447
#: en/help_topics/configuration.txt:52
9448
msgid ""
9449
"BZR_REMOTE_PATH\n"
9450
"~~~~~~~~~~~~~~~"
9451
msgstr ""
9452
"BZR_REMOTE_PATH\n"
9453
"~~~~~~~~~~~~~~~"
9454
9455
#: en/help_topics/configuration.txt:55
9456
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:57
9460
msgid "See also the ``bzr_remote_path`` configuration option."
9461
msgstr ""
9462
9463
#: en/help_topics/configuration.txt:59
9464
msgid ""
9465
"BZR_EDITOR\n"
9466
"~~~~~~~~~~"
9467
msgstr ""
9468
"BZR_EDITOR\n"
9469
"~~~~~~~~~~"
9470
9471
#: en/help_topics/configuration.txt:62
9472
msgid "Path to the editor Bazaar should use for commit messages, etc."
9473
msgstr ""
9474
9475
#: en/help_topics/configuration.txt:64
9476
msgid ""
9477
"BZR_LOG\n"
9478
"~~~~~~~"
9479
msgstr ""
9480
"BZR_LOG\n"
9481
"~~~~~~~"
9482
9483
#: en/help_topics/configuration.txt:67
9484
msgid ""
9485
"Location of the Bazaar log file. You can check the current location by\n"
9486
"running ``bzr version``."
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:70
9490
msgid ""
9491
"The log file contains debug information that is useful for diagnosing or\n"
9492
"reporting problems with Bazaar."
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:73
9496
msgid ""
9497
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9498
"will disable logging."
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:76
9502
msgid ""
9503
"\n"
9504
"BZR_PLUGIN_PATH\n"
9505
"~~~~~~~~~~~~~~~"
9506
msgstr ""
9507
"\n"
9508
"BZR_PLUGIN_PATH\n"
9509
"~~~~~~~~~~~~~~~"
9510
9511
#: en/help_topics/configuration.txt:80
9512
msgid ""
9513
"The path to the plugins directory that Bazaar should use.\n"
9514
"If not set, Bazaar will search for plugins in:"
9515
msgstr ""
9516
9517
#: en/help_topics/configuration.txt:83
9518
msgid ""
9519
"* the user specific plugin directory (containing the ``user`` plugins),"
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:85
9523
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9524
msgstr ""
9525
9526
#: en/help_topics/configuration.txt:87
9527
msgid ""
9528
"* the site specific plugin directory if applicable (containing\n"
9529
" the ``site`` plugins)."
9530
msgstr ""
9531
9532
#: en/help_topics/configuration.txt:90
9533
msgid ""
9534
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9535
"the way the plugin are searched. "
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:93
9539
msgid ""
9540
"As for the ``PATH`` variables, if multiple directories are\n"
9541
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9542
"platform specific appropriate character (':' on Unix,\n"
9543
"';' on windows)"
9544
msgstr ""
9545
9546
#: en/help_topics/configuration.txt:98
9547
msgid ""
9548
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9549
"in ``user``. However it will continue to search in ``core`` and\n"
9550
"``site`` unless they are explicitly removed."
9551
msgstr ""
9552
9553
#: en/help_topics/configuration.txt:102
9554
msgid ""
9555
"If you need to change the order or remove one of these\n"
9556
"directories, you should use special values:"
9557
msgstr ""
9558
9559
#: en/help_topics/configuration.txt:105
9560
msgid ""
9561
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9562
" path from the default values,"
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:108
9566
msgid ""
9567
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9568
" before the remaining default values (and also remove it from\n"
9569
" the default values)."
9570
msgstr ""
9571
9572
#: en/help_topics/configuration.txt:112
9573
msgid ""
9574
"Note that the special values 'user', 'core' and 'site' should be\n"
9575
"used literally, they will be substituted by the corresponding,\n"
9576
"platform specific, values."
9577
msgstr ""
9578
9579
#: en/help_topics/configuration.txt:116
9580
msgid ""
9581
"The examples below use ':' as the separator, windows users\n"
9582
"should use ';'."
9583
msgstr ""
9584
9585
#: en/help_topics/configuration.txt:119
9586
msgid "Overriding the default user plugin directory::"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:121
9590
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9591
msgstr ""
9592
9593
#: en/help_topics/configuration.txt:123
9594
msgid "Disabling the site directory while retaining the user directory::"
9595
msgstr ""
9596
9597
#: en/help_topics/configuration.txt:125
9598
msgid " BZR_PLUGIN_PATH='-site:+user'"
9599
msgstr ""
9600
9601
#: en/help_topics/configuration.txt:127
9602
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9603
msgstr ""
9604
9605
#: en/help_topics/configuration.txt:129
9606
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:131
9610
msgid "Overriding the default site plugin directory::"
9611
msgstr ""
9612
9613
#: en/help_topics/configuration.txt:133
9614
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9615
msgstr ""
9616
" BZR_PLUGIN_PATH='/Pfad/zu/meiner/Seite/Erweiterungen:-Seite':+Benutzer"
9617
9618
#: en/help_topics/configuration.txt:135
9619
msgid ""
9620
"BZR_DISABLE_PLUGINS\n"
9621
"~~~~~~~~~~~~~~~~~~~"
9622
msgstr ""
9623
"BZR_DISABLE_PLUGINS\n"
9624
"~~~~~~~~~~~~~~~~~~~"
9625
9626
#: en/help_topics/configuration.txt:138
9627
msgid ""
9628
"Under special circumstances (mostly when trying to diagnose a\n"
9629
"bug), it's better to disable a plugin (or several) rather than\n"
9630
"uninstalling them completely. Such plugins can be specified in\n"
9631
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9632
msgstr ""
9633
9634
#: en/help_topics/configuration.txt:143
9635
msgid ""
9636
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9637
"will raise an import error if they are explicitly imported (by\n"
9638
"another plugin that depends on them for example)."
9639
msgstr ""
9640
9641
#: en/help_topics/configuration.txt:147
9642
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9643
msgstr ""
9644
9645
#: en/help_topics/configuration.txt:149
9646
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9647
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9648
9649
#: en/help_topics/configuration.txt:151
9650
msgid ""
9651
"BZR_PLUGINS_AT\n"
9652
"~~~~~~~~~~~~~~"
9653
msgstr ""
9654
"BZR_PLUGINS_AT\n"
9655
"~~~~~~~~~~~~~~"
9656
9657
#: en/help_topics/configuration.txt:154
9658
msgid ""
9659
"When adding a new feature or working on a bug in a plugin,\n"
9660
"developers often need to use a specific version of a given\n"
9661
"plugin. Since python requires that the directory containing the\n"
9662
"code is named like the plugin itself this make it impossible to\n"
9663
"use arbitrary directory names (using a two-level directory scheme\n"
9664
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9665
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9666
msgstr ""
9667
9668
#: en/help_topics/configuration.txt:162
9669
msgid ""
9670
"Plugins specified in this environment variable takes precedence\n"
9671
"over the ones in ``BZR_PLUGIN_PATH``."
9672
msgstr ""
9673
9674
#: en/help_topics/configuration.txt:165
9675
msgid ""
9676
"The variable specified a list of ``plugin_name@plugin path``,\n"
9677
"``plugin_name`` being the name of the plugin as it appears in\n"
9678
"python module paths, ``plugin_path`` being the path to the\n"
9679
"directory containing the plugin code itself\n"
9680
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9681
"separator, use ';' on windows."
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:172
9685
msgid ""
9686
"Example:\n"
9687
"~~~~~~~~"
9688
msgstr ""
9689
"Beispiel:\n"
9690
"~~~~~~~~~"
9691
9692
#: en/help_topics/configuration.txt:175
9693
msgid ""
9694
"Using a specific version of ``myplugin``:\n"
9695
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9696
msgstr ""
9697
9698
#: en/help_topics/configuration.txt:178
9699
msgid ""
9700
"BZRPATH\n"
9701
"~~~~~~~"
9702
msgstr ""
9703
"BZRPATH\n"
9704
"~~~~~~~"
9705
9706
#: en/help_topics/configuration.txt:181
9707
msgid "The path where Bazaar should look for shell plugin external commands."
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:183
9711
msgid ""
9712
"\n"
9713
"http_proxy, https_proxy\n"
9714
"~~~~~~~~~~~~~~~~~~~~~~~"
9715
msgstr ""
9716
"\n"
9717
"http_proxy, https_proxy\n"
9718
"~~~~~~~~~~~~~~~~~~~~~~~"
9719
9720
#: en/help_topics/configuration.txt:187
9721
msgid "Specifies the network proxy for outgoing connections, for example::"
9722
msgstr ""
9723
9724
#: en/help_topics/configuration.txt:189
9725
msgid ""
9726
" http_proxy=http://proxy.example.com:3128/ \n"
9727
" https_proxy=http://proxy.example.com:3128/"
9728
msgstr ""
9729
" http_proxy=http://proxy.beispiel.de:3128/ \n"
9730
" https_proxy=http://proxy.beispiel.de:3128/"
9731
9732
#: en/help_topics/configuration.txt:192
9733
msgid ""
9734
"\n"
9735
"Configuration files\n"
9736
"-------------------"
9737
msgstr ""
9738
"\n"
9739
"Konfigurationsdateien\n"
9740
"-------------------"
9741
9742
#: en/help_topics/configuration.txt:196
9743
msgid ""
9744
"Location\n"
9745
"~~~~~~~~"
9746
msgstr ""
9747
"Ort\n"
9748
"~~~~~~~~"
9749
9750
#: en/help_topics/configuration.txt:199
9751
msgid ""
9752
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9753
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9754
"on\n"
9755
"Windows. (You can check the location for your system by using\n"
9756
"``bzr version``.)"
9757
msgstr ""
9758
9759
#: en/help_topics/configuration.txt:204
9760
msgid "There are three primary configuration files in this location:"
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:206
9764
msgid "* ``bazaar.conf`` describes default configuration options,"
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:208
9768
msgid ""
9769
"* ``locations.conf`` describes configuration information for\n"
9770
" specific branch locations,"
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:211
9774
msgid ""
9775
"* ``authentication.conf`` describes credential information for\n"
9776
" remote servers."
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:214
9780
msgid ""
9781
"Each branch can also contain a configuration file that sets values specific\n"
9782
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9783
"the\n"
9784
"branch. This file is visible to all users of a branch, if you wish to "
9785
"override\n"
9786
"one of the values for a branch with a setting that is specific to you then "
9787
"you\n"
9788
"can do so in ``locations.conf``."
9789
msgstr ""
9790
9791
#: en/help_topics/configuration.txt:220
9792
msgid ""
9793
"General format\n"
9794
"~~~~~~~~~~~~~~"
9795
msgstr ""
9796
9797
#: en/help_topics/configuration.txt:223
9798
msgid ""
9799
"An ini file has three types of contructs: section headers, section\n"
9800
"options and comments."
9801
msgstr ""
9802
9803
#: en/help_topics/configuration.txt:226
9804
msgid ""
9805
"Comments\n"
9806
"^^^^^^^^"
9807
msgstr ""
9808
9809
#: en/help_topics/configuration.txt:229
9810
msgid ""
9811
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9812
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9813
"Bazaar when parsing ini files."
9814
msgstr ""
9815
9816
#: en/help_topics/configuration.txt:233
9817
msgid ""
9818
"Section headers\n"
9819
"^^^^^^^^^^^^^^^"
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:236
9823
msgid ""
9824
"A section header is a word enclosed in brackets that starts at the begining\n"
9825
"of a line. A typical section header looks like this::"
9826
msgstr ""
9827
9828
#: en/help_topics/configuration.txt:239
9829
msgid " [DEFAULT]"
9830
msgstr ""
9831
9832
#: en/help_topics/configuration.txt:241
9833
msgid ""
9834
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9835
"[ALIASES]. Section headers are case sensitive. The default section provides "
9836
"for\n"
9837
"setting options which can be overridden with the branch config file."
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:245
9841
msgid ""
9842
"For ``locations.conf``, the options from the section with the\n"
9843
"longest matching section header are used to the exclusion of other\n"
9844
"potentially valid section headers. A section header uses the path for\n"
9845
"the branch as the section header. Some examples include::"
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:250
9849
msgid ""
9850
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9851
" [/home/jdoe/branches/]"
9852
msgstr ""
9853
" [http://meinebranchen.isp.com/~jdoe/branchdir]\n"
9854
" [/home/jdoe/branches/]"
9855
9856
#: en/help_topics/configuration.txt:253
9857
msgid ""
9858
"\n"
9859
"Section options\n"
9860
"^^^^^^^^^^^^^^^"
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:257
9864
msgid ""
9865
"A section option resides within a section. A section option contains an\n"
9866
"option name, an equals sign and a value. For example::"
9867
msgstr ""
9868
9869
#: en/help_topics/configuration.txt:260
9870
msgid ""
9871
" email = John Doe <jdoe@isp.com>\n"
9872
" gpg_signing_key = Amy Pond <amy@example.com>"
9873
msgstr ""
9874
" email = John Doe <jdoe@isp.com>\n"
9875
" gpg_signing_key = Amy Pond <amy@beispiel.de>"
9876
9877
#: en/help_topics/configuration.txt:263
9878
msgid ""
9879
"A option can reference other options by enclosing them in curly brackets::"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:265
9883
msgid ""
9884
" my_branch_name = feature_x\n"
9885
" my_server = bzr+ssh://example.com\n"
9886
" push_location = {my_server}/project/{my_branch_name}"
9887
msgstr ""
9888
9889
#: en/help_topics/configuration.txt:269
9890
msgid ""
9891
"Option policies\n"
9892
"^^^^^^^^^^^^^^^"
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:272
9896
msgid ""
9897
"Options defined in a section affect the named directory or URL plus\n"
9898
"any locations they contain. Policies can be used to change how an\n"
9899
"option value is interpreted for contained locations. Currently\n"
9900
"there are three policies available:"
9901
msgstr ""
9902
9903
#: en/help_topics/configuration.txt:277
9904
msgid ""
9905
" none:\n"
9906
" the value is interpreted the same for contained locations. This is\n"
9907
" the default behaviour.\n"
9908
" norecurse:\n"
9909
" the value is only used for the exact location specified by the\n"
9910
" section name.\n"
9911
" appendpath:\n"
9912
" for contained locations, any additional path components are\n"
9913
" appended to the value."
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:287
9917
msgid ""
9918
"Policies are specified by keys with names of the form "
9919
"\"<option_name>:policy\".\n"
9920
"For example, to define the push location for a tree of branches, the\n"
9921
"following could be used::"
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:291
9925
msgid ""
9926
" [/top/location]\n"
9927
" push_location = sftp://example.com/location\n"
9928
" push_location:policy = appendpath"
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:295
9932
msgid ""
9933
"With this configuration, the push location for ``/top/location/branch1``\n"
9934
"would be ``sftp://example.com/location/branch1``."
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:298
9938
msgid ""
9939
"Section local options\n"
9940
"^^^^^^^^^^^^^^^^^^^^^"
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:301
9944
msgid ""
9945
"Some options are defined automatically inside a given section and can be\n"
9946
"refered to in this section only. "
9947
msgstr ""
9948
9949
#: en/help_topics/configuration.txt:304
9950
msgid "For example, the ``appendpath`` policy can be used like this::"
9951
msgstr ""
9952
9953
#: en/help_topics/configuration.txt:306
9954
msgid ""
9955
" [/home/vila/src/bzr/bugs]\n"
9956
" mypush = lp:~vila/bzr\n"
9957
" mypush:policy=appendpath"
9958
msgstr ""
9959
9960
#: en/help_topics/configuration.txt:310
9961
msgid "Using ``relpath`` to achieve the same result is done like this::"
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:312
9965
msgid ""
9966
" [/home/vila/src/bzr/bugs]\n"
9967
" mypush = lp:~vila/bzr/{relpath}"
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:315
9971
msgid ""
9972
"In both cases, when used in a directory like\n"
9973
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9977
msgid ""
9978
" $ bzr config mypush\n"
9979
" lp:~vila/bzr/832013-expand-in-stack"
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:321
9983
msgid "Another such option is ``basename`` which can be used like this::"
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:323
9987
msgid ""
9988
" [/home/vila/src/bzr]\n"
9989
" mypush = lp:~vila/bzr/{basename}"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:326
9993
msgid ""
9994
"When used in a directory like\n"
9995
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:332
9999
msgid ""
10000
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10001
"itself is defined as the relative path between the section name and the\n"
10002
"location it matches."
10003
msgstr ""
10004
10005
#: en/help_topics/configuration.txt:336
10006
msgid ""
10007
"Another such option is ``branchname``, which refers to the name of a "
10008
"colocated\n"
10009
"branch. For non-colocated branches, it behaves like basename. It can be "
10010
"used\n"
10011
"like this::"
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:340
10015
msgid ""
10016
" [/home/vila/src/bzr/bugs]\n"
10017
" mypush = lp:~vila/bzr/{branchname}"
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:343
10021
msgid ""
10022
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10023
"get::"
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:345
10027
msgid ""
10028
" bzr config mypush\n"
10029
" lp:~vila/bzr/832013-expand-in-stack"
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:348
10033
msgid ""
10034
"When an option is local to a Section, it cannot be referred to from option\n"
10035
"values in any other section from the same ``Store`` nor from any other\n"
10036
"``Store``."
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:352
10040
msgid ""
10041
"\n"
10042
"The main configuration file, bazaar.conf\n"
10043
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:356
10047
msgid ""
10048
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10049
"The default section contains the default\n"
10050
"configuration options for all branches. The default section can be\n"
10051
"overriden by providing a branch-specific section in ``locations.conf``."
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:361
10055
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10056
msgstr ""
10057
10058
#: en/help_topics/configuration.txt:363
10059
msgid ""
10060
" [DEFAULT]\n"
10061
" email = John Doe <jdoe@isp.com>\n"
10062
" editor = /usr/bin/vim\n"
10063
" create_signatures = when-required"
10064
msgstr ""
10065
10066
#: en/help_topics/configuration.txt:368
10067
msgid ""
10068
"\n"
10069
"The branch location configuration file, locations.conf\n"
10070
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:372
10074
msgid ""
10075
"``locations.conf`` allows one to specify overriding settings for\n"
10076
"a specific branch. The format is almost identical to the default section in\n"
10077
"bazaar.conf with one significant change: The section header, instead of "
10078
"saying\n"
10079
"default, will be the path to a branch that you wish to override a value\n"
10080
"for. The '?' and '*' wildcards are supported::"
10081
msgstr ""
10082
10083
#: en/help_topics/configuration.txt:378
10084
msgid ""
10085
" [/home/jdoe/branches/nethack]\n"
10086
" email = Nethack Admin <nethack@nethack.com>"
10087
msgstr ""
10088
10089
#: en/help_topics/configuration.txt:381
10090
msgid ""
10091
" [http://hypothetical.site.com/branches/devel-branch]\n"
10092
" create_signatures = always"
10093
msgstr ""
10094
10095
#: en/help_topics/configuration.txt:384
10096
msgid ""
10097
"The authentication configuration file, authentication.conf\n"
10098
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:387
10102
msgid ""
10103
"``authentication.conf`` allows one to specify credentials for\n"
10104
"remote servers. This can be used for all the supported transports and any "
10105
"part\n"
10106
"of bzr that requires authentication (smtp for example)."
10107
msgstr ""
10108
10109
#: en/help_topics/configuration.txt:391
10110
msgid ""
10111
"The syntax of the file obeys the same rules as the others except for the\n"
10112
"option policies which don't apply."
10113
msgstr ""
10114
10115
#: en/help_topics/configuration.txt:394
10116
msgid ""
10117
"For more information on the possible uses of the authentication "
10118
"configuration\n"
10119
"file see :doc:`authentication-help`."
10120
msgstr ""
10121
10122
#: en/help_topics/configuration.txt:397
10123
msgid ""
10124
"\n"
10125
"Common options\n"
10126
"--------------"
10127
msgstr ""
10128
10129
#: en/help_topics/configuration.txt:401
10130
msgid ""
10131
"debug_flags\n"
10132
"~~~~~~~~~~~"
10133
msgstr ""
10134
10135
#: en/help_topics/configuration.txt:404
10136
msgid ""
10137
"A comma-separated list of debugging options to turn on. The same values\n"
10138
"can be used as with the -D command-line option (see `help global-options`).\n"
10139
"For example::"
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:408
10143
msgid " debug_flags = hpss"
10144
msgstr " debug_flags = hpss"
10145
10146
#: en/help_topics/configuration.txt:412
10147
msgid " debug_flags = hpss,evil"
10148
msgstr " debug_flags = hpss,evil"
10149
10150
#: en/help_topics/configuration.txt:414
10151
msgid ""
10152
"email\n"
10153
"~~~~~"
10154
msgstr ""
10155
10156
#: en/help_topics/configuration.txt:417
10157
msgid ""
10158
"The email address to use when committing a branch. Typically takes the form\n"
10159
"of::"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:420
10163
msgid " email = Full Name <account@hostname.tld>"
10164
msgstr ""
10165
10166
#: en/help_topics/configuration.txt:422
10167
msgid ""
10168
"editor\n"
10169
"~~~~~~"
10170
msgstr ""
10171
10172
#: en/help_topics/configuration.txt:425
10173
msgid ""
10174
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10175
"a commit message. This setting is trumped by the environment variable\n"
10176
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10177
"variables."
10178
msgstr ""
10179
10180
#: en/help_topics/configuration.txt:430
10181
msgid ""
10182
"log_format\n"
10183
"~~~~~~~~~~"
10184
msgstr ""
10185
10186
#: en/help_topics/configuration.txt:433
10187
msgid ""
10188
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10189
"and ``line``. Additional formats may be provided by plugins. The default\n"
10190
"value is ``long``."
10191
msgstr ""
10192
10193
#: en/help_topics/configuration.txt:437
10194
msgid ""
10195
"check_signatures\n"
10196
"~~~~~~~~~~~~~~~~"
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:440
10200
msgid ""
10201
"Reserved for future use. These options will allow a policy for branches to\n"
10202
"require signatures."
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:443
10206
msgid ""
10207
"require\n"
10208
" The gnupg signature for revisions must be present and must be valid."
10209
msgstr ""
10210
10211
#: en/help_topics/configuration.txt:446
10212
msgid ""
10213
"ignore\n"
10214
" Do not check gnupg signatures of revisions."
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:449
10218
msgid ""
10219
"check-available\n"
10220
" (default) If gnupg signatures for revisions are present, check them.\n"
10221
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10222
" no signature is present."
10223
msgstr ""
10224
10225
#: en/help_topics/configuration.txt:454
10226
msgid ""
10227
"create_signatures\n"
10228
"~~~~~~~~~~~~~~~~~"
10229
msgstr ""
10230
10231
#: en/help_topics/configuration.txt:457
10232
msgid ""
10233
"Defines the behaviour of signing revisions on commits. By default bzr will "
10234
"not\n"
10235
"sign new commits."
10236
msgstr ""
10237
10238
#: en/help_topics/configuration.txt:460
10239
msgid ""
10240
"always\n"
10241
" Sign every new revision that is committed. If the signing fails then "
10242
"the\n"
10243
" commit will not be made."
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:464
10247
msgid ""
10248
"when-required\n"
10249
" Reserved for future use."
10250
msgstr ""
10251
10252
#: en/help_topics/configuration.txt:467
10253
msgid ""
10254
"never\n"
10255
" Reserved for future use."
10256
msgstr ""
10257
10258
#: en/help_topics/configuration.txt:470
10259
msgid ""
10260
"In future it is planned that ``when-required`` will sign newly\n"
10261
"committed revisions only when the branch requires them. ``never`` will "
10262
"refuse\n"
10263
"to sign newly committed revisions, even if the branch requires signatures."
10264
msgstr ""
10265
10266
#: en/help_topics/configuration.txt:474
10267
msgid ""
10268
"dirstate.fdatasync\n"
10269
"~~~~~~~~~~~~~~~~~~"
10270
msgstr ""
10271
10272
#: en/help_topics/configuration.txt:477
10273
msgid ""
10274
"If true (default), working tree metadata changes are flushed through the\n"
10275
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10276
"should not be lost if the machine crashes. See also repository.fdatasync."
10277
msgstr ""
10278
10279
#: en/help_topics/configuration.txt:481
10280
msgid ""
10281
"gpg_signing_key\n"
10282
"~~~~~~~~~~~~~~~"
10283
msgstr ""
10284
10285
#: en/help_topics/configuration.txt:484
10286
msgid ""
10287
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10288
"address, key fingerprint or full key ID. When unset or when set to\n"
10289
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10290
msgstr ""
10291
10292
#: en/help_topics/configuration.txt:488
10293
msgid ""
10294
"recurse\n"
10295
"~~~~~~~"
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:491
10299
msgid ""
10300
"Only useful in ``locations.conf``. Defines whether or not the\n"
10301
"configuration for this section applies to subdirectories:"
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:494
10305
msgid ""
10306
"true\n"
10307
" (default) This section applies to subdirectories as well."
10308
msgstr ""
10309
10310
#: en/help_topics/configuration.txt:497
10311
msgid ""
10312
"false\n"
10313
" This section only applies to the branch at this directory and not\n"
10314
" branches below it."
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:501
10318
msgid ""
10319
"gpg_signing_command\n"
10320
"~~~~~~~~~~~~~~~~~~~"
10321
msgstr ""
10322
10323
#: en/help_topics/configuration.txt:504
10324
msgid ""
10325
"(Default: \"gpg\"). Which program should be used to sign and check "
10326
"revisions.\n"
10327
"For example::"
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:507
10331
msgid " gpg_signing_command = /usr/bin/gnpg"
10332
msgstr ""
10333
10334
#: en/help_topics/configuration.txt:509
10335
msgid ""
10336
"The specified command must accept the options \"--clearsign\" and \"-u "
10337
"<email>\"."
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:511
10341
msgid ""
10342
"bzr_remote_path\n"
10343
"~~~~~~~~~~~~~~~"
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:514
10347
msgid ""
10348
"(Default: \"bzr\"). The path to the command that should be used to run the "
10349
"smart\n"
10350
"server for bzr. This value may only be specified in locations.conf, because:"
10351
msgstr ""
10352
10353
#: en/help_topics/configuration.txt:517
10354
msgid ""
10355
"- it's needed before branch.conf is accessible\n"
10356
"- allowing remote branch.conf files to specify commands would be a security\n"
10357
" risk"
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:521
10361
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10362
msgstr ""
10363
10364
#: en/help_topics/configuration.txt:523
10365
msgid ""
10366
"smtp_server\n"
10367
"~~~~~~~~~~~"
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:526
10371
msgid ""
10372
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10373
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:529
10377
msgid ""
10378
"smtp_username, smtp_password\n"
10379
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10380
msgstr ""
10381
10382
#: en/help_topics/configuration.txt:532
10383
msgid ""
10384
"User and password to authenticate to the SMTP server. If smtp_username\n"
10385
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10386
"These settings are only needed if the SMTP server requires authentication\n"
10387
"to send mail."
10388
msgstr ""
10389
10390
#: en/help_topics/configuration.txt:537
10391
msgid ""
10392
"locks.steal_dead\n"
10393
"~~~~~~~~~~~~~~~~"
10394
msgstr ""
10395
10396
#: en/help_topics/configuration.txt:540
10397
msgid ""
10398
"If set to true, bzr will automatically break locks held by processes from\n"
10399
"the same machine and user that are no longer alive. Otherwise, it will\n"
10400
"print a message and you can break the lock manually, if you are satisfied\n"
10401
"the object is no longer in use."
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:545
10405
msgid ""
10406
"mail_client\n"
10407
"~~~~~~~~~~~"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:548
10411
msgid ""
10412
"A mail client to use for sending merge requests.\n"
10413
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10414
"it\n"
10415
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10416
"``editor``."
10417
msgstr ""
10418
10419
#: en/help_topics/configuration.txt:553
10420
msgid "Supported values for specific clients:"
10421
msgstr ""
10422
10423
#: en/help_topics/configuration.txt:555
10424
msgid ""
10425
":claws: Use Claws. This skips a dialog for attaching files.\n"
10426
":evolution: Use Evolution.\n"
10427
":kmail: Use KMail.\n"
10428
":mutt: Use Mutt.\n"
10429
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10430
"1.5,\n"
10431
" this works around some bugs that xdg-email doesn't handle."
10432
msgstr ""
10433
10434
#: en/help_topics/configuration.txt:562
10435
msgid "Supported generic values are:"
10436
msgstr "Unterstützte generische Werte sind:"
10437
10438
#: en/help_topics/configuration.txt:564
10439
msgid ""
10440
":default: See above.\n"
10441
":editor: Use your editor to compose the merge request. This also uses\n"
10442
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10443
" smtp_username and smtp_password.\n"
10444
":mapi: Use your preferred e-mail client on Windows.\n"
10445
":xdg-email: Use xdg-email to run your preferred mail program"
10446
msgstr ""
10447
10448
#: en/help_topics/configuration.txt:571
10449
msgid ""
10450
"repository.fdatasync\n"
10451
"~~~~~~~~~~~~~~~~~~~~"
10452
msgstr ""
10453
10454
#: en/help_topics/configuration.txt:574
10455
msgid ""
10456
"If true (default), repository changes are flushed through the OS buffers\n"
10457
"to physical disk. This is somewhat slower, but means data should not be\n"
10458
"lost if the machine crashes. See also dirstate.fdatasync."
10459
msgstr ""
10460
10461
#: en/help_topics/configuration.txt:578
10462
msgid ""
10463
"submit_branch\n"
10464
"~~~~~~~~~~~~~"
10465
msgstr ""
10466
10467
#: en/help_topics/configuration.txt:581
10468
msgid ""
10469
"The branch you intend to submit your current work to. This is "
10470
"automatically\n"
10471
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10472
"This\n"
10473
"should usually be set on a per-branch or per-location basis."
10474
msgstr ""
10475
10476
#: en/help_topics/configuration.txt:585
10477
msgid ""
10478
"public_branch\n"
10479
"~~~~~~~~~~~~~"
10480
msgstr ""
10481
10482
#: en/help_topics/configuration.txt:588
10483
msgid ""
10484
"A publically-accessible version of this branch (implying that this version "
10485
"is\n"
10486
"not publically-accessible). Used (and set) by ``bzr send``."
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:591
10490
msgid ""
10491
"suppress_warnings\n"
10492
"~~~~~~~~~~~~~~~~~"
10493
msgstr ""
10494
10495
#: en/help_topics/configuration.txt:594
10496
msgid ""
10497
"A list of strings, each string represent a warning that can be emitted by\n"
10498
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10499
msgstr ""
10500
10501
#: en/help_topics/configuration.txt:597
10502
msgid "Valid values:"
10503
msgstr "Gültige Werte:"
10504
10505
#: en/help_topics/configuration.txt:599
10506
msgid ""
10507
"* ``format_deprecation``:\n"
10508
" whether the format deprecation warning is shown on repositories that "
10509
"are\n"
10510
" using deprecated formats."
10511
msgstr ""
10512
10513
#: en/help_topics/configuration.txt:603
10514
msgid ""
10515
"default_format\n"
10516
"~~~~~~~~~~~~~~"
10517
msgstr ""
10518
10519
#: en/help_topics/configuration.txt:606
10520
msgid ""
10521
"A format name for the default format used when creating branches. See "
10522
"``bzr\n"
10523
"help formats`` for possible values."
10524
msgstr ""
10525
10526
#: en/help_topics/configuration.txt:609
10527
msgid ""
10528
"\n"
10529
"Unicode options\n"
10530
"---------------"
10531
msgstr ""
10532
10533
#: en/help_topics/configuration.txt:613
10534
msgid ""
10535
"output_encoding\n"
10536
"~~~~~~~~~~~~~~~"
10537
msgstr ""
10538
10539
#: en/help_topics/configuration.txt:616
10540
msgid ""
10541
"A Python unicode encoding name for text output from bzr, such as log\n"
10542
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10543
"is the terminal encoding prefered by the operating system."
10544
msgstr ""
10545
10546
#: en/help_topics/configuration.txt:620
10547
msgid ""
10548
"\n"
10549
"Branch type specific options\n"
10550
"----------------------------"
10551
msgstr ""
10552
10553
#: en/help_topics/configuration.txt:624
10554
msgid ""
10555
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10556
"later format. They\n"
10557
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10558
"manually set in ``locations.conf`` or ``bazaar.conf``."
10559
msgstr ""
10560
10561
#: en/help_topics/configuration.txt:629
10562
msgid ""
10563
"append_revisions_only\n"
10564
"~~~~~~~~~~~~~~~~~~~~~"
10565
msgstr ""
10566
10567
#: en/help_topics/configuration.txt:632
10568
msgid ""
10569
"If set to \"True\" then revisions can only be appended to the log, not\n"
10570
"removed. A branch with this setting enabled can only pull from another\n"
10571
"branch if the other branch's log is a longer version of its own. This is\n"
10572
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10573
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10574
"compatibility with previous bzr versions (older than 2.2)."
10575
msgstr ""
10576
10577
#: en/help_topics/configuration.txt:639
10578
msgid ""
10579
"parent_location\n"
10580
"~~~~~~~~~~~~~~~"
10581
msgstr ""
10582
10583
#: en/help_topics/configuration.txt:642
10584
msgid ""
10585
"If present, the location of the default branch for pull or merge. This "
10586
"option\n"
10587
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10588
"--remember``."
10589
msgstr ""
10590
10591
#: en/help_topics/configuration.txt:646
10592
msgid ""
10593
"push_location\n"
10594
"~~~~~~~~~~~~~"
10595
msgstr ""
10596
10597
#: en/help_topics/configuration.txt:649
10598
msgid ""
10599
"If present, the location of the default branch for push. This option\n"
10600
"is normally set by the first ``push`` or ``push --remember``."
10601
msgstr ""
10602
10603
#: en/help_topics/configuration.txt:652
10604
msgid ""
10605
"push_strict\n"
10606
"~~~~~~~~~~~"
10607
msgstr ""
10608
10609
#: en/help_topics/configuration.txt:655
10610
msgid ""
10611
"If present, defines the ``--strict`` option default value for checking\n"
10612
"uncommitted changes before pushing."
10613
msgstr ""
10614
10615
#: en/help_topics/configuration.txt:658
10616
msgid ""
10617
"dpush_strict\n"
10618
"~~~~~~~~~~~~"
10619
msgstr ""
10620
10621
#: en/help_topics/configuration.txt:661
10622
msgid ""
10623
"If present, defines the ``--strict`` option default value for checking\n"
10624
"uncommitted changes before pushing into a different VCS without any\n"
10625
"custom bzr metadata."
10626
msgstr ""
10627
10628
#: en/help_topics/configuration.txt:665
10629
msgid ""
10630
"bound_location\n"
10631
"~~~~~~~~~~~~~~"
10632
msgstr ""
10633
10634
#: en/help_topics/configuration.txt:668
10635
msgid ""
10636
"The location that commits should go to when acting as a checkout.\n"
10637
"This option is normally set by ``bind``."
10638
msgstr ""
10639
10640
#: en/help_topics/configuration.txt:671
10641
msgid ""
10642
"bound\n"
10643
"~~~~~"
10644
msgstr ""
10645
10646
#: en/help_topics/configuration.txt:674
10647
msgid ""
10648
"If set to \"True\", the branch should act as a checkout, and push each "
10649
"commit to\n"
10650
"the bound_location. This option is normally set by ``bind``/``unbind``."
10651
msgstr ""
10652
10653
#: en/help_topics/configuration.txt:677
10654
msgid ""
10655
"send_strict\n"
10656
"~~~~~~~~~~~"
10657
msgstr ""
10658
10659
#: en/help_topics/configuration.txt:680
10660
msgid ""
10661
"If present, defines the ``--strict`` option default value for checking\n"
10662
"uncommitted changes before sending a merge directive."
10663
msgstr ""
10664
10665
#: en/help_topics/configuration.txt:683
10666
msgid ""
10667
"add.maximum_file_size\n"
10668
"~~~~~~~~~~~~~~~~~~~~~"
10669
msgstr ""
10670
10671
#: en/help_topics/configuration.txt:686
10672
msgid ""
10673
"Defines the maximum file size the command line \"add\" operation will allow\n"
10674
"in recursive mode, with files larger than this value being skipped. You may "
10675
"\n"
10676
"specify this value as an integer (in which case it is interpreted as bytes), "
10677
"\n"
10678
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10679
"0 \n"
10680
"will disable skipping."
10681
msgstr ""
10682
10683
#: en/help_topics/configuration.txt:692
10684
msgid ""
10685
"External Merge Tools\n"
10686
"--------------------"
10687
msgstr ""
10688
10689
#: en/help_topics/configuration.txt:695
10690
msgid ""
10691
"bzr.mergetool.<name>\n"
10692
"~~~~~~~~~~~~~~~~~~~~"
10693
msgstr ""
10694
10695
#: en/help_topics/configuration.txt:698
10696
msgid ""
10697
"Defines an external merge tool called <name> with the given command-line.\n"
10698
"Arguments containing spaces should be quoted using single or double quotes. "
10699
"The\n"
10700
"executable may omit its path if it can be found on the PATH."
10701
msgstr ""
10702
10703
#: en/help_topics/configuration.txt:702
10704
msgid ""
10705
"The following markers can be used in the command-line to substitute "
10706
"filenames\n"
10707
"involved in the merge conflict::"
10708
msgstr ""
10709
10710
#: en/help_topics/configuration.txt:705
10711
msgid ""
10712
" {base} file.BASE\n"
10713
" {this} file.THIS\n"
10714
" {other} file.OTHER\n"
10715
" {result} output file\n"
10716
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10717
"merge\n"
10718
" succeeds."
10719
msgstr ""
10720
10721
#: en/help_topics/configuration.txt:714
10722
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10723
msgstr ""
10724
10725
#: en/help_topics/configuration.txt:716
10726
msgid ""
10727
"bzr.default_mergetool\n"
10728
"~~~~~~~~~~~~~~~~~~~~~"
10729
msgstr ""
10730
10731
#: en/help_topics/configuration.txt:719
10732
msgid ""
10733
"Specifies which external merge tool (as defined above) should be selected "
10734
"by\n"
10735
"default in tools such as ``bzr qconflicts``."
10736
msgstr ""
10737
10738
#: en/help_topics/configuration.txt:724
10739
msgid " bzr.default_mergetool = kdiff3\n"
10740
msgstr ""
10741
10742
#: en/help_topics/conflict-types.txt:1
10743
msgid ""
10744
"Conflict Types\n"
10745
"=============="
10746
msgstr ""
10747
10748
#: en/help_topics/conflict-types.txt:4
10749
msgid ""
10750
"Some operations, like merge, revert and pull, modify the contents of your\n"
10751
"working tree. These modifications are programmatically generated, and so "
10752
"they\n"
10753
"may conflict with the current state of your working tree. "
10754
msgstr ""
10755
10756
#: en/help_topics/conflict-types.txt:8
10757
msgid ""
10758
"When conflicts are present in your working tree (as shown by ``bzr\n"
10759
"conflicts``), you should resolve them and then inform bzr that the "
10760
"conflicts\n"
10761
"have been resolved."
10762
msgstr ""
10763
10764
#: en/help_topics/conflict-types.txt:12
10765
msgid ""
10766
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10767
"should resolve them is not the one responsible for their occurrence, as is "
10768
"the\n"
10769
"case when merging other people's work or because some conflicts are "
10770
"presented\n"
10771
"in a way that is not easy to understand."
10772
msgstr ""
10773
10774
#: en/help_topics/conflict-types.txt:17
10775
msgid ""
10776
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10777
"conflict if and only if there's an actual conceptual conflict in the source\n"
10778
"tree. Because Bazaar doesn't understand the real meaning of the files "
10779
"being\n"
10780
"versioned, it can, when faced with ambiguities, fall short in either "
10781
"direction\n"
10782
"trying to resolve the conflict itself. Many kinds of changes can be "
10783
"combined\n"
10784
"programmatically, but sometimes only a human can determine the right thing "
10785
"to\n"
10786
"do."
10787
msgstr ""
10788
10789
#: en/help_topics/conflict-types.txt:25
10790
msgid ""
10791
"When Bazaar generates a conflict, it adds information into the working tree "
10792
"to\n"
10793
"present the conflicting versions, and it's up to you to find the correct\n"
10794
"resolution."
10795
msgstr ""
10796
10797
#: en/help_topics/conflict-types.txt:29
10798
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10799
msgstr ""
10800
10801
#: en/help_topics/conflict-types.txt:31
10802
msgid ""
10803
"1. Modify the working tree content so that the conflicted item is now in "
10804
"the\n"
10805
" state you want to keep, then"
10806
msgstr ""
10807
10808
#: en/help_topics/conflict-types.txt:34
10809
msgid ""
10810
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10811
" remaining generated information (``bzr resolve <item>``)."
10812
msgstr ""
10813
10814
#: en/help_topics/conflict-types.txt:37
10815
msgid ""
10816
"For most conflict types, there are some obvious ways to modify the working\n"
10817
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10818
"itself already made a choice, when possible."
10819
msgstr ""
10820
10821
#: en/help_topics/conflict-types.txt:41
10822
msgid ""
10823
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10824
"different ways to resolve the conflict."
10825
msgstr ""
10826
10827
#: en/help_topics/conflict-types.txt:44
10828
msgid ""
10829
"Each type of conflict is explained below, and the action which must be done "
10830
"to\n"
10831
"resolve the conflict is outlined."
10832
msgstr ""
10833
10834
#: en/help_topics/conflict-types.txt:47
10835
msgid ""
10836
"Various actions are available depending on the kind of conflict, for some "
10837
"of\n"
10838
"these actions, Bazaar can provide some help. In the end you should at least\n"
10839
"inform Bazaar that you're done with the conflict with::"
10840
msgstr ""
10841
10842
#: en/help_topics/conflict-types.txt:51
10843
msgid " ``bzr resolve FILE --action=done'"
10844
msgstr " ``bzr resolve FILE --action=done'"
10845
10846
#: en/help_topics/conflict-types.txt:53
10847
msgid ""
10848
"Note that this is the default action when a single file is involved so you "
10849
"can\n"
10850
"simply use::"
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:56
10854
msgid " ``bzr resolve FILE``"
10855
msgstr " ``bzr resolve FILE``"
10856
10857
#: en/help_topics/conflict-types.txt:58
10858
msgid "See ``bzr help resolve`` for more details."
10859
msgstr ""
10860
10861
#: en/help_topics/conflict-types.txt:60
10862
msgid ""
10863
"Text conflicts\n"
10864
"--------------"
10865
msgstr ""
10866
10867
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10868
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10869
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10870
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10871
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10872
msgid "Typical message::"
10873
msgstr ""
10874
10875
#: en/help_topics/conflict-types.txt:65
10876
msgid " Text conflict in FILE"
10877
msgstr ""
10878
10879
#: en/help_topics/conflict-types.txt:67
10880
msgid ""
10881
"These are produced when a text merge cannot completely reconcile two sets "
10882
"of\n"
10883
"text changes. Bazaar will emit files for each version with the extensions\n"
10884
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10885
"tree,\n"
10886
"i.e. the tree that you are merging changes into. OTHER is the version that "
10887
"you\n"
10888
"are merging into the target. BASE is an older version that is used as a "
10889
"basis\n"
10890
"for comparison."
10891
msgstr ""
10892
10893
#: en/help_topics/conflict-types.txt:74
10894
msgid ""
10895
"In the main copy of the file, Bazaar will include all the changes that it\n"
10896
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10897
"\"herringbone\" markers like ``<<<<<<<``."
10898
msgstr ""
10899
10900
#: en/help_topics/conflict-types.txt:78
10901
msgid ""
10902
"Say the initial text is \"The project leader released it.\", and THIS "
10903
"modifies it\n"
10904
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10905
"leader\n"
10906
"released Bazaar.\" A conflict would look like this::"
10907
msgstr ""
10908
10909
#: en/help_topics/conflict-types.txt:82
10910
msgid ""
10911
" <<<<<<< TREE\n"
10912
" Martin Pool released it.\n"
10913
" =======\n"
10914
" The project leader released Bazaar.\n"
10915
" >>>>>>> MERGE-SOURCE"
10916
msgstr ""
10917
10918
#: en/help_topics/conflict-types.txt:88
10919
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10920
msgstr ""
10921
10922
#: en/help_topics/conflict-types.txt:90
10923
msgid ""
10924
"You can handle text conflicts either by editing the main copy of the file,\n"
10925
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10926
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10927
"set of changes over the other (but see below when you encounter these\n"
10928
"cases). More often, the two sets of changes must be intelligently combined."
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:96
10932
msgid ""
10933
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10934
"you are done editing, the file should look like it never had a conflict, and "
10935
"be\n"
10936
"ready to commit."
10937
msgstr ""
10938
10939
#: en/help_topics/conflict-types.txt:100
10940
msgid ""
10941
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10942
"Bazaar will auto-detect which conflicts you have resolved."
10943
msgstr ""
10944
10945
#: en/help_topics/conflict-types.txt:103
10946
msgid ""
10947
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10948
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10949
"working tree."
10950
msgstr ""
10951
10952
#: en/help_topics/conflict-types.txt:107
10953
msgid ""
10954
"\n"
10955
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10956
"resolve`` with one of the following actions:"
10957
msgstr ""
10958
10959
#: en/help_topics/conflict-types.txt:111
10960
msgid ""
10961
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10962
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10963
msgstr ""
10964
10965
#: en/help_topics/conflict-types.txt:114
10966
msgid ""
10967
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10968
"modifications will be taken into account."
10969
msgstr ""
10970
10971
#: en/help_topics/conflict-types.txt:117
10972
msgid ""
10973
"Content conflicts\n"
10974
"-----------------"
10975
msgstr ""
10976
10977
#: en/help_topics/conflict-types.txt:122
10978
msgid " Contents conflict in FILE"
10979
msgstr ""
10980
10981
#: en/help_topics/conflict-types.txt:124
10982
msgid ""
10983
"This conflict happens when there are conflicting changes in the working "
10984
"tree\n"
10985
"and the merge source, but the conflicted items are not text files. They "
10986
"may\n"
10987
"be binary files, or symlinks, or directories. It can even happen with "
10988
"files\n"
10989
"that are deleted on one side, and modified on the other."
10990
msgstr ""
10991
10992
#: en/help_topics/conflict-types.txt:129
10993
msgid ""
10994
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10995
"be\n"
10996
"regular files, symlinks or directories). But it will not include a \"main "
10997
"copy\"\n"
10998
"of the file with herringbone conflict markers. It will appear that the "
10999
"\"main\n"
11000
"copy\" has been renamed to THIS or OTHER."
11001
msgstr ""
11002
11003
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11004
msgid ""
11005
"To resolve that kind of conflict, you should rebuild FILE from either "
11006
"version\n"
11007
"or a combination of both."
11008
msgstr ""
11009
11010
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11011
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11012
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11013
#: en/help_topics/conflict-types.txt:361
11014
msgid "``bzr resolve`` recognizes the following actions:"
11015
msgstr ""
11016
11017
#: en/help_topics/conflict-types.txt:139
11018
msgid ""
11019
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11020
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11021
"* ``--action=done`` will just mark the conflict as resolved."
11022
msgstr ""
11023
11024
#: en/help_topics/conflict-types.txt:143
11025
msgid ""
11026
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11027
"and\n"
11028
"``.OTHER`` files if they are still present in the working tree."
11029
msgstr ""
11030
11031
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11032
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11033
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11034
#: en/help_topics/conflict-types.txt:369
11035
msgid ""
11036
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11037
msgstr ""
11038
11039
#: en/help_topics/conflict-types.txt:148
11040
msgid ""
11041
"Tag conflicts\n"
11042
"-------------"
11043
msgstr ""
11044
11045
#: en/help_topics/conflict-types.txt:153
11046
msgid ""
11047
" Conflicting tags:\n"
11048
" version-0.1"
11049
msgstr ""
11050
11051
#: en/help_topics/conflict-types.txt:156
11052
msgid ""
11053
"When pulling from or pushing to another branch, Bazaar informs you about "
11054
"tags\n"
11055
"that conflict between the two branches; that is the same tag points to two\n"
11056
"different revisions. You need not resolve these conflicts, but subsequent\n"
11057
"uses of pull or push will result in the same message."
11058
msgstr ""
11059
11060
#: en/help_topics/conflict-types.txt:161
11061
msgid ""
11062
"To resolve the conflict, you must apply the correct tags to either the "
11063
"target\n"
11064
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11065
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11066
"target branch's tags match the source branch, then in the target branch do\n"
11067
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11068
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11069
"source\n"
11070
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11071
"favor of the target branch, you need to similarly use ``tag --force`` in "
11072
"the\n"
11073
"source branch. (Note that pulling or pushing using --overwrite will "
11074
"overwrite\n"
11075
"all tags as well.)"
11076
msgstr ""
11077
11078
#: en/help_topics/conflict-types.txt:172
11079
msgid ""
11080
"Duplicate paths\n"
11081
"---------------"
11082
msgstr ""
11083
11084
#: en/help_topics/conflict-types.txt:177
11085
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11086
msgstr ""
11087
11088
#: en/help_topics/conflict-types.txt:179
11089
msgid ""
11090
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11091
"already been used. The existing file will be renamed to \"FILE.moved\". "
11092
msgstr ""
11093
11094
#: en/help_topics/conflict-types.txt:187
11095
msgid ""
11096
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11097
"FILE``,\n"
11098
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11099
"* ``--action=done`` will just mark the conflict as resolved."
11100
msgstr ""
11101
11102
#: en/help_topics/conflict-types.txt:191
11103
msgid ""
11104
"Note that you must get rid of FILE.moved before using ``--action=done``."
11105
msgstr ""
11106
11107
#: en/help_topics/conflict-types.txt:195
11108
msgid ""
11109
"Unversioned parent\n"
11110
"------------------"
11111
msgstr ""
11112
11113
#: en/help_topics/conflict-types.txt:200
11114
msgid ""
11115
" Conflict because FILE is not versioned, but has versioned children."
11116
msgstr ""
11117
11118
#: en/help_topics/conflict-types.txt:202
11119
msgid ""
11120
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11121
"not\n"
11122
"versioned. This happens when the directory has been deleted in the target,\n"
11123
"but has a new child in the source, or vice versa. In this situation, "
11124
"Bazaar\n"
11125
"will version the parent directory as well. Resolving this issue depends\n"
11126
"very much on the particular scenario. You may wish to rename or delete "
11127
"either\n"
11128
"the file or the directory. When you are satisfied, you can run \"bzr "
11129
"resolve\n"
11130
"FILE\" to mark the conflict as resolved."
11131
msgstr ""
11132
11133
#: en/help_topics/conflict-types.txt:210
11134
msgid ""
11135
"Missing parent\n"
11136
"--------------"
11137
msgstr ""
11138
11139
#: en/help_topics/conflict-types.txt:215
11140
msgid " Conflict adding files to FILE. Created directory."
11141
msgstr ""
11142
11143
#: en/help_topics/conflict-types.txt:217
11144
msgid ""
11145
"This happens when a directory has been deleted in the target, but has new\n"
11146
"children in the source. This is similar to the \"unversioned parent\" "
11147
"conflict,\n"
11148
"except that the parent directory does not *exist*, instead of just being\n"
11149
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11150
"Resolving this issue depends very much on the particular scenario."
11151
msgstr ""
11152
11153
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11154
msgid ""
11155
"To resolve that kind of conflict, you should either remove or rename the\n"
11156
"children or the directory or a combination of both."
11157
msgstr ""
11158
11159
#: en/help_topics/conflict-types.txt:228
11160
msgid ""
11161
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11162
" children,\n"
11163
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11164
"children\n"
11165
" and restoring the directory,\n"
11166
"* ``--action=done`` will just mark the conflict as resolved."
11167
msgstr ""
11168
11169
#: en/help_topics/conflict-types.txt:236
11170
msgid ""
11171
"Deleting parent\n"
11172
"---------------"
11173
msgstr ""
11174
11175
#: en/help_topics/conflict-types.txt:241
11176
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11177
msgstr ""
11178
11179
#: en/help_topics/conflict-types.txt:243
11180
msgid ""
11181
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11182
"source, but has new children in the target (either because a directory\n"
11183
"deletion is merged or because the merge introduce new children). Bazaar\n"
11184
"will retain the directory. Resolving this issue depends very much on the\n"
11185
"particular scenario."
11186
msgstr ""
11187
11188
#: en/help_topics/conflict-types.txt:254
11189
msgid ""
11190
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11191
"directory,"
11192
msgstr ""
11193
11194
#: en/help_topics/conflict-types.txt:256
11195
msgid ""
11196
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11197
" children,"
11198
msgstr ""
11199
11200
#: en/help_topics/conflict-types.txt:259
11201
msgid "* ``--action=done`` will just mark the conflict as resolved."
11202
msgstr ""
11203
11204
#: en/help_topics/conflict-types.txt:261
11205
msgid ""
11206
"Note that when merging a directory deletion, if unversioned files are\n"
11207
"present, they become potential orphans has they don't have a directory\n"
11208
"parent anymore."
11209
msgstr ""
11210
11211
#: en/help_topics/conflict-types.txt:265
11212
msgid ""
11213
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11214
"setting the ``bzr.transform.orphan_policy`` configuration option."
11215
msgstr ""
11216
11217
#: en/help_topics/conflict-types.txt:268
11218
msgid "There are two possible values for this option:"
11219
msgstr "Es gibt zwei mögliche Werte für diese Option:"
11220
11221
#: en/help_topics/conflict-types.txt:270
11222
msgid ""
11223
"* ``conflict`` (the default): will leave the orphans in place and\n"
11224
" generate a conflicts,"
11225
msgstr ""
11226
11227
#: en/help_topics/conflict-types.txt:273
11228
msgid ""
11229
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11230
"root\n"
11231
" of the working tree with names like ``<file>.~#~``."
11232
msgstr ""
11233
11234
#: en/help_topics/conflict-types.txt:278
11235
msgid ""
11236
"Path conflict\n"
11237
"-------------"
11238
msgstr ""
11239
11240
#: en/help_topics/conflict-types.txt:283
11241
msgid " Path conflict: PATH1 / PATH2"
11242
msgstr ""
11243
11244
#: en/help_topics/conflict-types.txt:285
11245
msgid ""
11246
"This happens when the source and target have each modified the name or "
11247
"parent\n"
11248
"directory of a file. Bazaar will use the path elements from the source."
11249
msgstr ""
11250
11251
#: en/help_topics/conflict-types.txt:288
11252
msgid ""
11253
"To resolve that kind of conflict, you just have to decide what name should "
11254
"be\n"
11255
"retained for the file involved."
11256
msgstr ""
11257
11258
#: en/help_topics/conflict-types.txt:293
11259
msgid ""
11260
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11261
" issuing ``bzr mv PATH2 PATH1``,\n"
11262
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11263
"``PATH2``,\n"
11264
"* ``--action=done`` will just mark the conflict as resolved."
11265
msgstr ""
11266
11267
#: en/help_topics/conflict-types.txt:300
11268
msgid ""
11269
"Parent loop\n"
11270
"-----------"
11271
msgstr ""
11272
11273
#: en/help_topics/conflict-types.txt:305
11274
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11275
msgstr ""
11276
11277
#: en/help_topics/conflict-types.txt:307
11278
msgid ""
11279
"This happens when the source and the target have each moved directories, so\n"
11280
"that, if the change could be applied, a directory would be contained by "
11281
"itself.\n"
11282
"For example::"
11283
msgstr ""
11284
11285
#: en/help_topics/conflict-types.txt:311
11286
msgid ""
11287
" $ bzr init\n"
11288
" $ bzr mkdir white\n"
11289
" $ bzr mkdir black\n"
11290
" $ bzr commit -m \"BASE\"\n"
11291
" $ bzr branch . ../other\n"
11292
" $ bzr mv white black\n"
11293
" $ bzr commit -m \"THIS\"\n"
11294
" $ bzr mv ../other/black ../other/white\n"
11295
" $ bzr commit ../other -m \"OTHER\"\n"
11296
" $ bzr merge ../other"
11297
msgstr ""
11298
" $ bzr init\n"
11299
" $ bzr mkdir white\n"
11300
" $ bzr mkdir black\n"
11301
" $ bzr commit -m \"BASE\"\n"
11302
" $ bzr branch . ../other\n"
11303
" $ bzr mv white black\n"
11304
" $ bzr commit -m \"THIS\"\n"
11305
" $ bzr mv ../other/black ../other/white\n"
11306
" $ bzr commit ../other -m \"OTHER\"\n"
11307
" $ bzr merge ../other"
11308
11309
#: en/help_topics/conflict-types.txt:322
11310
msgid ""
11311
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11312
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11313
"name should be retained for the directories involved."
11314
msgstr ""
11315
11316
#: en/help_topics/conflict-types.txt:328
11317
msgid ""
11318
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11319
"\n"
11320
" in ``black``,\n"
11321
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11322
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11323
"* ``--action=done`` will just mark the conflict as resolved."
11324
msgstr ""
11325
11326
#: en/help_topics/conflict-types.txt:336
11327
msgid ""
11328
"Non-directory parent\n"
11329
"--------------------"
11330
msgstr ""
11331
11332
#: en/help_topics/conflict-types.txt:341
11333
msgid ""
11334
" Conflict: foo.new is not a directory, but has files in it.\n"
11335
" Created directory."
11336
msgstr ""
11337
11338
#: en/help_topics/conflict-types.txt:344
11339
msgid ""
11340
"This happens when one side has added files to a directory, and the other "
11341
"side\n"
11342
"has changed the directory into a file or symlink. For example::"
11343
msgstr ""
11344
11345
#: en/help_topics/conflict-types.txt:347
11346
msgid ""
11347
" $ bzr init\n"
11348
" $ bzr mkdir foo\n"
11349
" $ bzr commit -m \"BASE\"\n"
11350
" $ bzr branch . ../other\n"
11351
" $ rmdir foo\n"
11352
" $ touch foo\n"
11353
" $ bzr commit -m \"THIS\"\n"
11354
" $ bzr mkdir ../other/foo/bar\n"
11355
" $ bzr commit ../other -m \"OTHER\"\n"
11356
" $ bzr merge ../other"
11357
msgstr ""
11358
" $ bzr init\n"
11359
" $ bzr mkdir foo\n"
11360
" $ bzr commit -m \"BASE\"\n"
11361
" $ bzr branch . ../other\n"
11362
" $ rmdir foo\n"
11363
" $ touch foo\n"
11364
" $ bzr commit -m \"THIS\"\n"
11365
" $ bzr mkdir ../other/foo/bar\n"
11366
" $ bzr commit ../other -m \"OTHER\"\n"
11367
" $ bzr merge ../other"
11368
11369
#: en/help_topics/conflict-types.txt:358
11370
msgid ""
11371
"To resolve that kind of conflict, you have to decide what name should be\n"
11372
"retained for the file, directory or symlink involved."
11373
msgstr ""
11374
11375
#: en/help_topics/conflict-types.txt:363
11376
msgid ""
11377
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11378
" ``bzr add foo``,\n"
11379
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11380
" ``bzr mv foo.new foo``,\n"
11381
"* ``--action=done`` will just mark the conflict as resolved."
11382
msgstr ""
11383
11384
#: en/help_topics/conflict-types.txt:371
11385
msgid ""
11386
"MalformedTransform\n"
11387
"------------------"
11388
msgstr ""
11389
11390
#: en/help_topics/conflict-types.txt:374
11391
msgid ""
11392
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11393
"exception. This means that Bazaar encountered a filesystem conflict that it "
11394
"was\n"
11395
"unable to resolve. This usually indicates a bug. Please let us know if "
11396
"you\n"
11397
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11398
msgstr ""
11399
11400
#: en/help_topics/content-filters.txt:1
11401
msgid ""
11402
"Content Filters\n"
11403
"==============="
11404
msgstr ""
11405
11406
#: en/help_topics/content-filters.txt:4
11407
msgid ""
11408
"Content formats\n"
11409
"---------------"
11410
msgstr ""
11411
11412
#: en/help_topics/content-filters.txt:7
11413
msgid ""
11414
"Bazaar's content filtering allows you to store files in a different\n"
11415
"format from the copy in your working tree. This lets you, or your\n"
11416
"co-developers, use Windows development tools that expect CRLF files\n"
11417
"on projects that use other line-ending conventions. Among other things,\n"
11418
"content filters also let Unix developers more easily work on projects\n"
11419
"using Windows line-ending conventions, keyword expansion/compression,\n"
11420
"and trailing spaces on lines in text files to be implicitly stripped\n"
11421
"when committed."
11422
msgstr ""
11423
11424
#: en/help_topics/content-filters.txt:16
11425
msgid "To generalize, there are two content formats supported by Bazaar:"
11426
msgstr ""
11427
11428
#: en/help_topics/content-filters.txt:18
11429
msgid ""
11430
"* a canonical format - how files are stored internally\n"
11431
"* a convenience format - how files are created in a working tree."
11432
msgstr ""
11433
11434
#: en/help_topics/content-filters.txt:21
11435
msgid ""
11436
"\n"
11437
"Format conversion\n"
11438
"-----------------"
11439
msgstr ""
11440
11441
#: en/help_topics/content-filters.txt:25
11442
msgid ""
11443
"The conversion between these formats is done by content filters.\n"
11444
"A content filter has two parts:"
11445
msgstr ""
11446
11447
#: en/help_topics/content-filters.txt:28
11448
msgid ""
11449
"* a read converter - converts from convenience to canonical format\n"
11450
"* a write converter - converts from canonical to convenience format."
11451
msgstr ""
11452
11453
#: en/help_topics/content-filters.txt:31
11454
msgid ""
11455
"Many of these converters will provide *round-trip* conversion,\n"
11456
"i.e. applying the read converter followed by the write converter\n"
11457
"gives back the original content. However, others may provide an\n"
11458
"asymmetric conversion. For example, a read converter might strip\n"
11459
"trailing whitespace off lines in source code while the matching\n"
11460
"write converter might pass content through unchanged."
11461
msgstr ""
11462
11463
#: en/help_topics/content-filters.txt:38
11464
msgid ""
11465
"\n"
11466
"Enabling content filters\n"
11467
"------------------------"
11468
msgstr ""
11469
11470
#: en/help_topics/content-filters.txt:42
11471
msgid ""
11472
"Content filters are typically provided by plugins, so the first step\n"
11473
"in using them is to install the relevant plugins and read their\n"
11474
"documentation. Some plugins may be very specific about which files\n"
11475
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11476
"In other cases, the plugin may leave it in the user's hands to\n"
11477
"define which files are to be filtered. This is typically done\n"
11478
"using rule-based preferences. See ``bzr help rules`` for general\n"
11479
"information about defining these."
11480
msgstr ""
11481
11482
#: en/help_topics/content-filters.txt:51
11483
msgid ""
11484
"\n"
11485
"Impact on commands\n"
11486
"------------------"
11487
msgstr ""
11488
11489
#: en/help_topics/content-filters.txt:55
11490
msgid ""
11491
"Read converters are only applied to commands that read content from\n"
11492
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11493
"will apply read converters to files in the working tree, then compare\n"
11494
"the results to the content last committed."
11495
msgstr ""
11496
11497
#: en/help_topics/content-filters.txt:60
11498
msgid ""
11499
"Write converters are only applied by commands that **create files in a\n"
11500
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11501
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11502
"respectively."
11503
msgstr ""
11504
11505
#: en/help_topics/content-filters.txt:65
11506
msgid ""
11507
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11508
"comitting files. If this makes sense for a given plugin providing\n"
11509
"a content filter, the plugin can usually achieve this effect by using a\n"
11510
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11511
"for more information on hooks."
11512
msgstr ""
11513
11514
#: en/help_topics/content-filters.txt:71
11515
msgid ""
11516
"\n"
11517
"Refreshing your working tree\n"
11518
"----------------------------"
11519
msgstr ""
11520
11521
#: en/help_topics/content-filters.txt:75
11522
msgid ""
11523
"For performance reasons, Bazaar caches the timestamps of files in\n"
11524
"a working tree, and assumes files are unchanged if their timestamps\n"
11525
"match the cached values. As a consequence, there are times when\n"
11526
"you may need to explicitly ask for content filtering to be reapplied\n"
11527
"in one or both directions, e.g. after installing or reconfiguring\n"
11528
"plugins providing it."
11529
msgstr ""
11530
11531
#: en/help_topics/content-filters.txt:82
11532
msgid "Here are some general guidelines for doing this:"
11533
msgstr ""
11534
11535
#: en/help_topics/content-filters.txt:84
11536
msgid ""
11537
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11538
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11539
" relevant read converters and compare the end result with the\n"
11540
" canonical format."
11541
msgstr ""
11542
11543
#: en/help_topics/content-filters.txt:89
11544
msgid ""
11545
" * To reapply write converters, ensure there are no local changes,\n"
11546
" delete the relevant files and run ``bzr revert`` on those files."
11547
msgstr ""
11548
11549
#: en/help_topics/content-filters.txt:92
11550
msgid ""
11551
"Note: In the future, it is likely that additional options will be added\n"
11552
"to commands to make this refreshing process faster and safer.\n"
11553
msgstr ""
11554
11555
#: en/help_topics/current-formats.txt:1
11556
msgid "Current Storage Formats"
11557
msgstr "Aktuelle Speicherformate"
11558
11559
#: en/help_topics/current-formats.txt:3
11560
msgid ""
11561
":2a:\n"
11562
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11563
" compress storage. Provides rich roots which are a one-way\n"
11564
" transition."
11565
msgstr ""
11566
11567
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11568
msgid ""
11569
"\n"
11570
"See :doc:`formats-help` for more about storage formats."
11571
msgstr ""
11572
11573
#: en/help_topics/debug-flags.txt:1
11574
msgid ""
11575
"Debug Flags\n"
11576
"==========="
11577
msgstr ""
11578
11579
#: en/help_topics/debug-flags.txt:4
11580
msgid ""
11581
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11582
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11583
msgstr ""
11584
11585
#: en/help_topics/debug-flags.txt:7
11586
msgid ""
11587
"-Dauth Trace authentication sections used.\n"
11588
"-Dbytes Print out how many bytes were transferred\n"
11589
"-Ddirstate Trace dirstate activity (verbose!)\n"
11590
"-Derror Instead of normal error handling, always print a "
11591
"traceback\n"
11592
" on error.\n"
11593
"-Devil Capture call sites that do expensive or badly-scaling\n"
11594
" operations.\n"
11595
"-Dfetch Trace history copying between repositories.\n"
11596
"-Dfilters Emit information for debugging content filtering.\n"
11597
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11598
"fetch.\n"
11599
"-Dgraph Trace graph traversal.\n"
11600
"-Dhashcache Log every time a working file is read to determine its "
11601
"hash.\n"
11602
"-Dhooks Trace hook execution.\n"
11603
"-Dhpss Trace smart protocol requests and responses.\n"
11604
"-Dhpssdetail More hpss details.\n"
11605
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11606
"-Dhttp Trace http connections, requests and responses.\n"
11607
"-Dindex Trace major index operations.\n"
11608
"-Dknit Trace knit operations.\n"
11609
"-Dlock Trace when lockdir locks are taken or released.\n"
11610
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11611
" retrying the request.\n"
11612
"-Dprogress Trace progress bar operations.\n"
11613
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11614
"-Dmerge Emit information for debugging merges.\n"
11615
"-Dno_apport Don't use apport to report crashes.\n"
11616
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11617
"-Dpack Emit information about pack operations.\n"
11618
"-Drelock Emit a message every time a branch or repository object "
11619
"is\n"
11620
" unlocked then relocked the same way.\n"
11621
"-Dsftp Trace SFTP internals.\n"
11622
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11623
"expected\n"
11624
"-Dstream Trace fetch streams.\n"
11625
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11626
"portable\n"
11627
" manner.\n"
11628
"-Dunlock Some errors during unlock are treated as warnings.\n"
11629
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11630
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11631
"appropriate\n"
11632
" for the format, even for non-local fetches.\n"
11633
msgstr ""
11634
11635
#: en/help_topics/diverged-branches.txt:1
11636
msgid ""
11637
"Diverged Branches\n"
11638
"================="
11639
msgstr ""
11640
11641
#: en/help_topics/diverged-branches.txt:4
11642
msgid ""
11643
"When Bazaar tries to push one branch onto another, it requires that the\n"
11644
"destination branch must be ready to receive the source branch. If this "
11645
"isn't\n"
11646
"the case, then we say that the branches have ``diverged``. Branches are\n"
11647
"considered diverged if the destination branch's most recent commit is one "
11648
"that\n"
11649
"has not been merged (directly or indirectly) by the source branch. To "
11650
"recover\n"
11651
"from diverged branches, one must merge the missing revisions into the "
11652
"source\n"
11653
"branch."
11654
msgstr ""
11655
11656
#: en/help_topics/diverged-branches.txt:12
11657
msgid ""
11658
"This situation commonly arises when using a centralized workflow with local\n"
11659
"commits. If someone else has committed new work to the mainline since your\n"
11660
"last pull and you have local commits that have not yet been pushed to the\n"
11661
"mainline, then your local branch and the mainline have diverged."
11662
msgstr ""
11663
11664
#: en/help_topics/diverged-branches.txt:17
11665
msgid ""
11666
"Discovering What Has Diverged\n"
11667
"-----------------------------"
11668
msgstr ""
11669
11670
#: en/help_topics/diverged-branches.txt:20
11671
msgid ""
11672
"The ``bzr missing`` command is used to find out what revisions are in "
11673
"another\n"
11674
"branch that are not present in the current branch, and vice-versa. It shows "
11675
"a\n"
11676
"summary of which extra revisions exist in each branch. If you want to see "
11677
"the\n"
11678
"precise effects of those revisions, you can use ``bzr diff --"
11679
"old=other_branch``\n"
11680
"to show the differences between other_branch and your current branch."
11681
msgstr ""
11682
11683
#: en/help_topics/diverged-branches.txt:26
11684
msgid ""
11685
"A Solution\n"
11686
"----------"
11687
msgstr ""
11688
11689
#: en/help_topics/diverged-branches.txt:29
11690
msgid ""
11691
"The solution is to merge the revisions from the mainline into your local\n"
11692
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11693
"mainline. This merge may result in conflicts if the other developer's "
11694
"changes\n"
11695
"overlap with your changes. These conflicts should be resolved before\n"
11696
"continuing. After any conflicts have been resolved, or even if there were "
11697
"no\n"
11698
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11699
"to your local branch. This requirement gives you an opportunity to test "
11700
"the\n"
11701
"resulting working tree for correctness, since the merged revisions could "
11702
"have\n"
11703
"made arbitrary changes. After testing, you should commit the merge using\n"
11704
"``bzr commit``. This clears up the diverged branches situation. Your "
11705
"local\n"
11706
"branch can now be pushed to the mainline.\n"
11707
msgstr ""
11708
11709
#: en/help_topics/env-variables.txt:1
11710
msgid "Environment Variables"
11711
msgstr "Umgebungsvariablen"
11712
11713
#: en/help_topics/env-variables.txt:3
11714
msgid ""
11715
"=================== "
11716
"===========================================================\n"
11717
"BZRPATH Path where bzr is to look for shell plugin external\n"
11718
" commands.\n"
11719
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11720
"EMAIL E-Mail address of the user.\n"
11721
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11722
"EDITOR Editor for editing commit messages.\n"
11723
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11724
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11725
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11726
"BZR_PLUGIN_PATH.\n"
11727
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11728
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11729
"and\n"
11730
" HOME.\n"
11731
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11732
"URLs).\n"
11733
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11734
"sshcorp,\n"
11735
" plink or lsh.\n"
11736
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11737
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11738
"BZR_COLUMNS Override implicit terminal width.\n"
11739
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11740
"(selftest)\n"
11741
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11742
"'text'.\n"
11743
"BZR_PDB Control whether to launch a debugger on error.\n"
11744
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11745
" breakin debugger.\n"
11746
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11747
"(instead\n"
11748
" of char-based).\n"
11749
"=================== "
11750
"===========================================================\n"
11751
msgstr ""
11752
11753
#: en/help_topics/eol.txt:1
11754
msgid ""
11755
"End of Line Conversion\n"
11756
"======================"
11757
msgstr ""
11758
11759
#: en/help_topics/eol.txt:4
11760
msgid ""
11761
"EOL conversion is provided as a content filter where Bazaar internally\n"
11762
"stores a canonical format but outputs a convenience format. See\n"
11763
"``bzr help content-filters`` for general information about using these."
11764
msgstr ""
11765
11766
#: en/help_topics/eol.txt:8
11767
msgid ""
11768
"Note: Content filtering is only supported in recently added formats,\n"
11769
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11770
"in a recent format. (Just setting the format on the repository\n"
11771
"is not enough.) If content filtering does not appear to be working, use\n"
11772
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11773
"or later."
11774
msgstr ""
11775
11776
#: en/help_topics/eol.txt:15
11777
msgid ""
11778
"EOL conversion needs to be enabled for selected file patterns using\n"
11779
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11780
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11781
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11782
"supported in a future verison of Bazaar."
11783
msgstr ""
11784
11785
#: en/help_topics/eol.txt:21
11786
msgid ""
11787
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11788
"(If a value is not set, ``exact`` is the default.)"
11789
msgstr ""
11790
11791
#: en/help_topics/eol.txt:24
11792
msgid ""
11793
" ========== ===================================== ======================\n"
11794
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11795
" ========== ===================================== ======================\n"
11796
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11797
" ---------- ------------------------------------- ----------------------\n"
11798
" ``lf`` ``lf`` ``lf``\n"
11799
" ---------- ------------------------------------- ----------------------\n"
11800
" ``crlf`` ``crlf`` ``lf``\n"
11801
" ---------- ------------------------------------- ----------------------\n"
11802
" ``exact`` No conversion Exactly as in file\n"
11803
" ========== ===================================== ======================"
11804
msgstr ""
11805
11806
#: en/help_topics/eol.txt:36
11807
msgid ""
11808
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11809
"byte is detected in the file."
11810
msgstr ""
11811
11812
#: en/help_topics/eol.txt:39
11813
msgid ""
11814
"For users working on a cross-platform project, here is a suggested rule\n"
11815
"to use as a starting point::"
11816
msgstr ""
11817
11818
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11819
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11820
msgid ""
11821
" [name *]\n"
11822
" eol = native"
11823
msgstr ""
11824
11825
#: en/help_topics/eol.txt:45
11826
msgid ""
11827
"If you have binary files that do not contain a null byte though, be\n"
11828
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11829
"by giving more explicit patterns earlier in the rules file. For example::"
11830
msgstr ""
11831
11832
#: en/help_topics/eol.txt:49
11833
msgid ""
11834
" [name *.png]\n"
11835
" eol = exact"
11836
msgstr ""
11837
11838
#: en/help_topics/eol.txt:55
11839
msgid ""
11840
"If your working tree is on a network drive shared by users on different\n"
11841
"operating systems, you typically want to force certain conventions for\n"
11842
"certain files. In that way, if a file is created with the wrong line\n"
11843
"endings or line endings get mixed during editing, it gets committed\n"
11844
"correctly and gets checked out correctly. For example::"
11845
msgstr ""
11846
11847
#: en/help_topics/eol.txt:61
11848
msgid ""
11849
" [name *.bat]\n"
11850
" eol = crlf"
11851
msgstr ""
11852
11853
#: en/help_topics/eol.txt:64
11854
msgid ""
11855
" [name *.sh]\n"
11856
" eol = lf"
11857
msgstr ""
11858
11859
#: en/help_topics/eol.txt:70
11860
msgid ""
11861
"If you take the care to create files with their required endings, you can\n"
11862
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11863
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11864
"introducing mixed line endings will be corrected during commit for files\n"
11865
"with those settings."
11866
msgstr ""
11867
11868
#: en/help_topics/eol.txt:76
11869
msgid ""
11870
"If you have sample test data that deliberately has text files with mixed\n"
11871
"newline conventions, you can ask for those to be left alone like this::"
11872
msgstr ""
11873
11874
#: en/help_topics/eol.txt:79
11875
msgid ""
11876
" [name test_data/]\n"
11877
" eol = exact"
11878
msgstr ""
11879
11880
#: en/help_topics/eol.txt:85
11881
msgid ""
11882
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11883
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11884
"of content analysis to detect binary files for commands like ``diff``.\n"
11885
"In the future, a ``binary = true`` rule may be added but it is not\n"
11886
"supported yet.)"
11887
msgstr ""
11888
11889
#: en/help_topics/eol.txt:91
11890
msgid ""
11891
"If you have an existing repository with text files already stored using\n"
11892
"Windows newline conventions (``crlf``), then you may want to keep using "
11893
"that\n"
11894
"convention in the repository. Forcing certain files to this convention\n"
11895
"may also help users who do not have rules configured. To do this, set\n"
11896
"``eol`` to one of the values below."
11897
msgstr ""
11898
11899
#: en/help_topics/eol.txt:97
11900
msgid ""
11901
" ============================ ======================== "
11902
"======================\n"
11903
" Value Checkout end-of-lines as Commit end-of-lines "
11904
"as\n"
11905
" ============================ ======================== "
11906
"======================\n"
11907
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11908
" ``lf`` otherwise\n"
11909
" ---------------------------- ------------------------ ----------------------"
11910
"\n"
11911
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11912
" ---------------------------- ------------------------ ----------------------"
11913
"\n"
11914
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11915
" ============================ ======================== ======================"
11916
msgstr ""
11917
11918
#: en/help_topics/eol.txt:108
11919
msgid ""
11920
"For users working on an existing project that uses Windows newline\n"
11921
"conventions in their Bazaar repository, this rule is suggested as a\n"
11922
"starting point::"
11923
msgstr ""
11924
11925
#: en/help_topics/eol.txt:112
11926
msgid ""
11927
" [name *]\n"
11928
" eol = native-with-crlf-in-repo"
11929
msgstr ""
11930
11931
#: en/help_topics/eol.txt:115
11932
msgid ""
11933
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11934
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11935
"``crlf`` and ``exact``."
11936
msgstr ""
11937
11938
#: en/help_topics/eol.txt:119
11939
msgid ""
11940
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11941
"never reject files because a given line ending or mixed line endings\n"
11942
"are found. A precommit hook should be used if you wish to validate\n"
11943
"(and not just convert) content before committing.\n"
11944
msgstr ""
11945
11946
#: en/help_topics/hidden-commands.txt:1
11947
msgid ""
11948
"added List files added in working tree.\n"
11949
"ancestry List all revisions merged into this branch.\n"
11950
"assert-fail Test reporting of assertion failures\n"
11951
"bundle-info Output interesting stats about a bundle\n"
11952
"bundle-revisions Create a merge-directive for submitting changes.\n"
11953
"cat-revision Write out metadata for a revision.\n"
11954
"dump-btree Dump the contents of a btree index file to stdout.\n"
11955
"export-pot Export command helps and error messages in po format.\n"
11956
"file-id Print file_id of a particular file or directory.\n"
11957
"file-path Print path of file_ids to a file or directory.\n"
11958
"find-merge-base Find and print a base revision for merging two "
11959
"branches.\n"
11960
"hooks Show hooks.\n"
11961
"inventory Show inventory of the current working copy or a "
11962
"revision.\n"
11963
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11964
"lookup-revision Lookup the revision-id from a revision-number\n"
11965
"merge-directive Generate a merge directive for auto-merge tools.\n"
11966
"modified List files modified in working tree.\n"
11967
"re-sign Create a digital signature for an existing revision.\n"
11968
"reference list, view and set branch locations for nested trees.\n"
11969
"relpath Show path of a file relative to root\n"
11970
"repair-workingtree Reset the working tree state file.\n"
11971
"revision-history Display the list of revision ids on a branch.\n"
11972
"revision-info Show revision number and revision id for a given "
11973
"revision\n"
11974
" identifier.\n"
11975
"rocks Statement of optimism.\n"
11976
"selftest Run internal test suite.\n"
11977
"shell-complete Show appropriate completions for context.\n"
11978
"test-script Run a shell-like test from a file.\n"
11979
"touching-revisions Return revision-ids which affected a particular file.\n"
11980
"unknowns List unknown files.\n"
11981
"wait-until-signalled Test helper for\n"
11982
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11983
msgstr ""
11984
11985
#: en/help_topics/hooks.txt:1
11986
msgid ""
11987
"\n"
11988
"Hooks\n"
11989
"====="
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11993
msgid ""
11994
"Introduction\n"
11995
"------------"
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:8
11999
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12000
msgstr ""
12001
12002
#: en/help_topics/hooks.txt:10
12003
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12004
msgstr ""
12005
12006
#: en/help_topics/hooks.txt:12
12007
msgid ""
12008
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12009
msgstr ""
12010
12011
#: en/help_topics/hooks.txt:14
12012
msgid ""
12013
"The class that contains each hook is given before the hooks it supplies. "
12014
"For\n"
12015
"instance, BranchHooks as the class is the hooks class for\n"
12016
"`bzrlib.branch.Branch.hooks`."
12017
msgstr ""
12018
12019
#: en/help_topics/hooks.txt:18
12020
msgid ""
12021
"Each description also indicates whether the hook runs on the client (the\n"
12022
"machine where bzr was invoked) or the server (the machine addressed by\n"
12023
"the branch URL). These may be, but are not necessarily, the same machine."
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:22
12027
msgid ""
12028
"Plugins (including hooks) are run on the server if all of these is true:"
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:24
12032
msgid ""
12033
" * The connection is via a smart server (accessed with a URL starting with\n"
12034
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12035
"\"http://\"\n"
12036
" URL when a smart server is available via HTTP)."
12037
msgstr ""
12038
12039
#: en/help_topics/hooks.txt:28
12040
msgid ""
12041
" * The hook is either server specific or part of general infrastructure "
12042
"rather\n"
12043
" than client specific code (such as commit)."
12044
msgstr ""
12045
12046
#: en/help_topics/hooks.txt:31
12047
msgid ""
12048
"\n"
12049
"BranchHooks\n"
12050
"-----------"
12051
msgstr ""
12052
12053
#: en/help_topics/hooks.txt:35
12054
msgid ""
12055
"automatic_tag_name\n"
12056
"~~~~~~~~~~~~~~~~~~"
12057
msgstr ""
12058
12059
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12060
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12061
msgid "Introduced in: 2.2"
12062
msgstr ""
12063
12064
#: en/help_topics/hooks.txt:40
12065
msgid ""
12066
"Called to determine an automatic tag name for a revision.\n"
12067
"automatic_tag_name is called with (branch, revision_id) and should\n"
12068
"return a tag name or None if no tag name could be determined. The\n"
12069
"first non-None tag name returned will be used."
12070
msgstr ""
12071
12072
#: en/help_topics/hooks.txt:45
12073
msgid ""
12074
"open\n"
12075
"~~~~"
12076
msgstr ""
12077
12078
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12079
#: en/help_topics/hooks.txt:307
12080
msgid "Introduced in: 1.8"
12081
msgstr ""
12082
12083
#: en/help_topics/hooks.txt:50
12084
msgid ""
12085
"Called with the Branch object that has been opened after a branch is\n"
12086
"opened."
12087
msgstr ""
12088
12089
#: en/help_topics/hooks.txt:53
12090
msgid ""
12091
"post_branch_init\n"
12092
"~~~~~~~~~~~~~~~~"
12093
msgstr ""
12094
12095
#: en/help_topics/hooks.txt:58
12096
msgid ""
12097
"Called after new branch initialization completes. post_branch_init is\n"
12098
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12099
"branch and checkout (both heavyweight and lightweight) will all\n"
12100
"trigger this hook."
12101
msgstr ""
12102
12103
#: en/help_topics/hooks.txt:63
12104
msgid ""
12105
"post_change_branch_tip\n"
12106
"~~~~~~~~~~~~~~~~~~~~~~"
12107
msgstr ""
12108
12109
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12110
msgid "Introduced in: 1.4"
12111
msgstr ""
12112
12113
#: en/help_topics/hooks.txt:68
12114
msgid ""
12115
"Called in bzr client and server after a change to the tip of a branch\n"
12116
"is made. post_change_branch_tip is called with a\n"
12117
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12118
"uncommit will all trigger this hook."
12119
msgstr ""
12120
12121
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12122
msgid ""
12123
"post_commit\n"
12124
"~~~~~~~~~~~"
12125
msgstr ""
12126
12127
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12128
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12129
msgid "Introduced in: 0.15"
12130
msgstr ""
12131
12132
#: en/help_topics/hooks.txt:78
12133
msgid ""
12134
"Called in the bzr client after a commit has completed. post_commit is\n"
12135
"called with (local, master, old_revno, old_revid, new_revno,\n"
12136
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12137
"branch."
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:83
12141
msgid ""
12142
"post_pull\n"
12143
"~~~~~~~~~"
12144
msgstr ""
12145
12146
#: en/help_topics/hooks.txt:88
12147
msgid ""
12148
"Called after a pull operation completes. post_pull is called with a\n"
12149
"bzrlib.branch.PullResult object and only runs in the bzr client."
12150
msgstr ""
12151
12152
#: en/help_topics/hooks.txt:91
12153
msgid ""
12154
"post_push\n"
12155
"~~~~~~~~~"
12156
msgstr ""
12157
12158
#: en/help_topics/hooks.txt:96
12159
msgid ""
12160
"Called after a push operation completes. post_push is called with a\n"
12161
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:99
12165
msgid ""
12166
"post_switch\n"
12167
"~~~~~~~~~~~"
12168
msgstr ""
12169
12170
#: en/help_topics/hooks.txt:104
12171
msgid ""
12172
"Called after a checkout switches branch. post_switch is called with a\n"
12173
"bzrlib.branch.SwitchHookParams."
12174
msgstr ""
12175
12176
#: en/help_topics/hooks.txt:107
12177
msgid ""
12178
"post_uncommit\n"
12179
"~~~~~~~~~~~~~"
12180
msgstr ""
12181
12182
#: en/help_topics/hooks.txt:112
12183
msgid ""
12184
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12185
"called with (local, master, old_revno, old_revid, new_revno,\n"
12186
"new_revid) where local is the local branch or None, master is the\n"
12187
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12188
"of None."
12189
msgstr ""
12190
12191
#: en/help_topics/hooks.txt:118
12192
msgid ""
12193
"pre_change_branch_tip\n"
12194
"~~~~~~~~~~~~~~~~~~~~~"
12195
msgstr ""
12196
12197
#: en/help_topics/hooks.txt:121
12198
msgid "Introduced in: 1.6"
12199
msgstr "Eingeführt in: 1.6"
12200
12201
#: en/help_topics/hooks.txt:123
12202
msgid ""
12203
"Called in bzr client and server before a change to the tip of a branch\n"
12204
"is made. pre_change_branch_tip is called with a\n"
12205
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12206
"uncommit will all trigger this hook."
12207
msgstr ""
12208
12209
#: en/help_topics/hooks.txt:128
12210
msgid ""
12211
"pre_commit\n"
12212
"~~~~~~~~~~"
12213
msgstr ""
12214
12215
#: en/help_topics/hooks.txt:131
12216
msgid "Introduced in: 0.91"
12217
msgstr "Eingeführt in: 0.91"
12218
12219
#: en/help_topics/hooks.txt:133
12220
msgid ""
12221
"Called after a commit is calculated but before it is completed.\n"
12222
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12223
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12224
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12225
"TreeDelta object describing changes from the basis revision. hooks\n"
12226
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12227
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12228
"tree."
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:142
12232
msgid ""
12233
"transform_fallback_location\n"
12234
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12235
msgstr ""
12236
12237
#: en/help_topics/hooks.txt:145
12238
msgid "Introduced in: 1.9"
12239
msgstr "Eingeführt in: 1.9"
12240
12241
#: en/help_topics/hooks.txt:147
12242
msgid ""
12243
"Called when a stacked branch is activating its fallback locations.\n"
12244
"transform_fallback_location is called with (branch, url), and should\n"
12245
"return a new url. Returning the same url allows it to be used as-is,\n"
12246
"returning a different one can be used to cause the branch to stack on\n"
12247
"a closer copy of that fallback_location. Note that the branch cannot\n"
12248
"have history accessing methods called on it during this hook because\n"
12249
"the fallback locations have not been activated. When there are\n"
12250
"multiple hooks installed for transform_fallback_location, all are\n"
12251
"called with the url returned from the previous hook.The order is\n"
12252
"however undefined."
12253
msgstr ""
12254
12255
#: en/help_topics/hooks.txt:158
12256
msgid ""
12257
"CommandHooks\n"
12258
"------------"
12259
msgstr ""
12260
12261
#: en/help_topics/hooks.txt:161
12262
msgid ""
12263
"extend_command\n"
12264
"~~~~~~~~~~~~~~"
12265
msgstr ""
12266
12267
#: en/help_topics/hooks.txt:164
12268
msgid "Introduced in: 1.13"
12269
msgstr "Eingeführt in: 1.13"
12270
12271
#: en/help_topics/hooks.txt:166
12272
msgid ""
12273
"Called after creating a command object to allow modifications such as\n"
12274
"adding or removing options, docs etc. Called with the new\n"
12275
"bzrlib.commands.Command object."
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:170
12279
msgid ""
12280
"get_command\n"
12281
"~~~~~~~~~~~"
12282
msgstr ""
12283
12284
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12285
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12286
msgid "Introduced in: 1.17"
12287
msgstr "Eingeführt in: 1.17"
12288
12289
#: en/help_topics/hooks.txt:175
12290
msgid ""
12291
"Called when creating a single command. Called with (cmd_or_None,\n"
12292
"command_name). get_command should either return the cmd_or_None\n"
12293
"parameter, or a replacement Command object that should be used for the\n"
12294
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12295
"Many users will prefer to use bzrlib.commands.register_command or\n"
12296
"plugin_cmds.register_lazy."
12297
msgstr ""
12298
12299
#: en/help_topics/hooks.txt:182
12300
msgid ""
12301
"get_missing_command\n"
12302
"~~~~~~~~~~~~~~~~~~~"
12303
msgstr ""
12304
12305
#: en/help_topics/hooks.txt:187
12306
msgid ""
12307
"Called when creating a single command if no command could be found.\n"
12308
"Called with (command_name). get_missing_command should either return\n"
12309
"None, or a Command object to be used for the command."
12310
msgstr ""
12311
12312
#: en/help_topics/hooks.txt:191
12313
msgid ""
12314
"list_commands\n"
12315
"~~~~~~~~~~~~~"
12316
msgstr ""
12317
12318
#: en/help_topics/hooks.txt:196
12319
msgid ""
12320
"Called when enumerating commands. Called with a set of cmd_name\n"
12321
"strings for all the commands found so far. This set is safe to mutate\n"
12322
"- e.g. to remove a command. list_commands should return the updated\n"
12323
"set of command names."
12324
msgstr ""
12325
12326
#: en/help_topics/hooks.txt:201
12327
msgid ""
12328
"post_command\n"
12329
"~~~~~~~~~~~~"
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12333
msgid "Introduced in: 2.6"
12334
msgstr ""
12335
12336
#: en/help_topics/hooks.txt:206
12337
msgid "Called after executing a command. Called with the command object."
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:208
12341
msgid ""
12342
"pre_command\n"
12343
"~~~~~~~~~~~"
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:213
12347
msgid "Called prior to executing a command. Called with the command object."
12348
msgstr ""
12349
12350
#: en/help_topics/hooks.txt:215
12351
msgid ""
12352
"_ConfigHooks\n"
12353
"------------"
12354
msgstr ""
12355
12356
#: en/help_topics/hooks.txt:218
12357
msgid ""
12358
"get\n"
12359
"~~~"
12360
msgstr ""
12361
12362
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12363
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12364
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12365
#: en/help_topics/hooks.txt:446
12366
msgid "Introduced in: 2.4"
12367
msgstr "Eingeführt in: 2.4"
12368
12369
#: en/help_topics/hooks.txt:223
12370
msgid ""
12371
"Invoked when a config option is read. The signature is (stack, name,\n"
12372
"value)."
12373
msgstr ""
12374
12375
#: en/help_topics/hooks.txt:226
12376
msgid ""
12377
"load\n"
12378
"~~~~"
12379
msgstr ""
12380
12381
#: en/help_topics/hooks.txt:231
12382
msgid "Invoked when a config store is loaded. The signature is (store)."
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:233
12386
msgid ""
12387
"remove\n"
12388
"~~~~~~"
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:238
12392
msgid ""
12393
"Invoked when a config option is removed. The signature is (stack,\n"
12394
"name)."
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:241
12398
msgid ""
12399
"save\n"
12400
"~~~~"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:246
12404
msgid "Invoked when a config store is saved. The signature is (store)."
12405
msgstr ""
12406
12407
#: en/help_topics/hooks.txt:248
12408
msgid ""
12409
"set\n"
12410
"~~~"
12411
msgstr ""
12412
12413
#: en/help_topics/hooks.txt:253
12414
msgid ""
12415
"Invoked when a config option is set. The signature is (stack, name,\n"
12416
"value)."
12417
msgstr ""
12418
12419
#: en/help_topics/hooks.txt:256
12420
msgid ""
12421
"ControlDirHooks\n"
12422
"---------------"
12423
msgstr ""
12424
12425
#: en/help_topics/hooks.txt:259
12426
msgid ""
12427
"post_repo_init\n"
12428
"~~~~~~~~~~~~~~"
12429
msgstr ""
12430
12431
#: en/help_topics/hooks.txt:264
12432
msgid ""
12433
"Invoked after a repository has been initialized. post_repo_init is\n"
12434
"called with a bzrlib.controldir.RepoInitHookParams."
12435
msgstr ""
12436
12437
#: en/help_topics/hooks.txt:267
12438
msgid ""
12439
"pre_open\n"
12440
"~~~~~~~~"
12441
msgstr ""
12442
12443
#: en/help_topics/hooks.txt:270
12444
msgid "Introduced in: 1.14"
12445
msgstr "Eingeführt in: 1.14"
12446
12447
#: en/help_topics/hooks.txt:272
12448
msgid ""
12449
"Invoked before attempting to open a ControlDir with the transport that\n"
12450
"the open will use."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:275
12454
msgid ""
12455
"InfoHooks\n"
12456
"---------"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:278
12460
msgid ""
12461
"repository\n"
12462
"~~~~~~~~~~"
12463
msgstr ""
12464
12465
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12466
#: en/help_topics/hooks.txt:524
12467
msgid "Introduced in: 1.15"
12468
msgstr "Eingeführt in: 1.15"
12469
12470
#: en/help_topics/hooks.txt:283
12471
msgid ""
12472
"Invoked when displaying the statistics for a repository. repository is\n"
12473
"called with a statistics dictionary as returned by the repository and\n"
12474
"a file-like object to write to."
12475
msgstr ""
12476
12477
#: en/help_topics/hooks.txt:287
12478
msgid ""
12479
"LockHooks\n"
12480
"---------"
12481
msgstr ""
12482
12483
#: en/help_topics/hooks.txt:290
12484
msgid ""
12485
"lock_acquired\n"
12486
"~~~~~~~~~~~~~"
12487
msgstr ""
12488
12489
#: en/help_topics/hooks.txt:295
12490
msgid ""
12491
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12492
msgstr ""
12493
12494
#: en/help_topics/hooks.txt:297
12495
msgid ""
12496
"lock_broken\n"
12497
"~~~~~~~~~~~"
12498
msgstr ""
12499
12500
#: en/help_topics/hooks.txt:302
12501
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12502
msgstr ""
12503
12504
#: en/help_topics/hooks.txt:304
12505
msgid ""
12506
"lock_released\n"
12507
"~~~~~~~~~~~~~"
12508
msgstr ""
12509
12510
#: en/help_topics/hooks.txt:309
12511
msgid ""
12512
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:311
12516
msgid ""
12517
"MergeHooks\n"
12518
"----------"
12519
msgstr ""
12520
12521
#: en/help_topics/hooks.txt:314
12522
msgid ""
12523
"merge_file_content\n"
12524
"~~~~~~~~~~~~~~~~~~"
12525
msgstr ""
12526
12527
#: en/help_topics/hooks.txt:317
12528
msgid "Introduced in: 2.1"
12529
msgstr ""
12530
12531
#: en/help_topics/hooks.txt:319
12532
msgid ""
12533
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12534
"object when starting a merge. Should return either None or a subclass\n"
12535
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12536
"called per file that needs to be merged (including when one side has\n"
12537
"deleted the file and the other has changed it). See the\n"
12538
"AbstractPerFileMerger API docs for details on how it is used by merge."
12539
msgstr ""
12540
12541
#: en/help_topics/hooks.txt:326
12542
msgid ""
12543
"post_merge\n"
12544
"~~~~~~~~~~"
12545
msgstr ""
12546
12547
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12548
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12549
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12550
msgid "Introduced in: 2.5"
12551
msgstr ""
12552
12553
#: en/help_topics/hooks.txt:331
12554
msgid ""
12555
"Called after a merge. Receives a Merger object as the single argument.\n"
12556
"The return value is ignored."
12557
msgstr ""
12558
12559
#: en/help_topics/hooks.txt:334
12560
msgid ""
12561
"pre_merge\n"
12562
"~~~~~~~~~"
12563
msgstr ""
12564
12565
#: en/help_topics/hooks.txt:339
12566
msgid ""
12567
"Called before a merge. Receives a Merger object as the single\n"
12568
"argument."
12569
msgstr ""
12570
12571
#: en/help_topics/hooks.txt:342
12572
msgid ""
12573
"MergeDirectiveHooks\n"
12574
"-------------------"
12575
msgstr ""
12576
12577
#: en/help_topics/hooks.txt:345
12578
msgid ""
12579
"merge_request_body\n"
12580
"~~~~~~~~~~~~~~~~~~"
12581
msgstr ""
12582
12583
#: en/help_topics/hooks.txt:348
12584
msgid "Introduced in: 1.15.0"
12585
msgstr ""
12586
12587
#: en/help_topics/hooks.txt:350
12588
msgid ""
12589
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12590
"request. Callbacks must return a body. If more than one callback is\n"
12591
"registered, the output of one callback is provided to the next."
12592
msgstr ""
12593
12594
#: en/help_topics/hooks.txt:354
12595
msgid ""
12596
"MessageEditorHooks\n"
12597
"------------------"
12598
msgstr ""
12599
12600
#: en/help_topics/hooks.txt:357
12601
msgid ""
12602
"commit_message_template\n"
12603
"~~~~~~~~~~~~~~~~~~~~~~~"
12604
msgstr ""
12605
12606
#: en/help_topics/hooks.txt:360
12607
msgid "Introduced in: 1.10"
12608
msgstr ""
12609
12610
#: en/help_topics/hooks.txt:362
12611
msgid ""
12612
"Called when a commit message is being generated.\n"
12613
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12614
"and the message that is known so far. commit_message_template must\n"
12615
"return a new message to use (which could be the same as it was given).\n"
12616
"When there are multiple hooks registered for commit_message_template,\n"
12617
"they are chained with the result from the first passed into the\n"
12618
"second, and so on."
12619
msgstr ""
12620
12621
#: en/help_topics/hooks.txt:370
12622
msgid ""
12623
"set_commit_message\n"
12624
"~~~~~~~~~~~~~~~~~~"
12625
msgstr ""
12626
12627
#: en/help_topics/hooks.txt:375
12628
msgid ""
12629
"Set a fixed commit message. set_commit_message is called with the\n"
12630
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12631
"properties by editing commit.builder._revprops) and the message so\n"
12632
"far. set_commit_message must return the message to use or None if it\n"
12633
"should use the message editor as normal."
12634
msgstr ""
12635
12636
#: en/help_topics/hooks.txt:381
12637
msgid ""
12638
"MutableTreeHooks\n"
12639
"----------------"
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:384
12643
msgid ""
12644
"post_build_tree\n"
12645
"~~~~~~~~~~~~~~~"
12646
msgstr ""
12647
12648
#: en/help_topics/hooks.txt:389
12649
msgid ""
12650
"Called after a completely new tree is built. The hook is called with\n"
12651
"the tree as its only argument."
12652
msgstr ""
12653
12654
#: en/help_topics/hooks.txt:395
12655
msgid "Introduced in: 2.0"
12656
msgstr ""
12657
12658
#: en/help_topics/hooks.txt:397
12659
msgid ""
12660
"Called after a commit is performed on a tree. The hook is called with\n"
12661
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12662
"commit was performed on is available via the mutable_tree attribute of\n"
12663
"that object."
12664
msgstr ""
12665
12666
#: en/help_topics/hooks.txt:402
12667
msgid ""
12668
"post_transform\n"
12669
"~~~~~~~~~~~~~~"
12670
msgstr ""
12671
12672
#: en/help_topics/hooks.txt:407
12673
msgid ""
12674
"Called after a tree transform has been performed on a tree. The hook\n"
12675
"is called with the tree that is being transformed and the transform."
12676
msgstr ""
12677
12678
#: en/help_topics/hooks.txt:410
12679
msgid ""
12680
"pre_transform\n"
12681
"~~~~~~~~~~~~~"
12682
msgstr ""
12683
12684
#: en/help_topics/hooks.txt:415
12685
msgid ""
12686
"Called before a tree transform on this tree. The hook is called with\n"
12687
"the tree that is being transformed and the transform."
12688
msgstr ""
12689
12690
#: en/help_topics/hooks.txt:418
12691
msgid ""
12692
"start_commit\n"
12693
"~~~~~~~~~~~~"
12694
msgstr ""
12695
12696
#: en/help_topics/hooks.txt:423
12697
msgid ""
12698
"Called before a commit is performed on a tree. The start commit hook\n"
12699
"is able to change the tree before the commit takes place. start_commit\n"
12700
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12701
"being performed on."
12702
msgstr ""
12703
12704
#: en/help_topics/hooks.txt:428
12705
msgid ""
12706
"SmartClientHooks\n"
12707
"----------------"
12708
msgstr ""
12709
12710
#: en/help_topics/hooks.txt:431
12711
msgid ""
12712
"call\n"
12713
"~~~~"
12714
msgstr ""
12715
12716
#: en/help_topics/hooks.txt:434
12717
msgid "Introduced in: unknown"
12718
msgstr ""
12719
12720
#: en/help_topics/hooks.txt:436
12721
msgid ""
12722
"Called when the smart client is submitting a request to the smart\n"
12723
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12724
"Streaming request bodies, and responses, are not accessible."
12725
msgstr ""
12726
12727
#: en/help_topics/hooks.txt:440
12728
msgid ""
12729
"SmartServerHooks\n"
12730
"----------------"
12731
msgstr ""
12732
12733
#: en/help_topics/hooks.txt:443
12734
msgid ""
12735
"server_exception\n"
12736
"~~~~~~~~~~~~~~~~"
12737
msgstr ""
12738
12739
#: en/help_topics/hooks.txt:448
12740
msgid ""
12741
"Called by the bzr server when an exception occurs. server_exception is\n"
12742
"called with the sys.exc_info() tuple return true for the hook if the\n"
12743
"exception has been handled, in which case the server will exit\n"
12744
"normally."
12745
msgstr ""
12746
12747
#: en/help_topics/hooks.txt:453
12748
msgid ""
12749
"server_started\n"
12750
"~~~~~~~~~~~~~~"
12751
msgstr ""
12752
12753
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12754
msgid "Introduced in: 0.16"
12755
msgstr ""
12756
12757
#: en/help_topics/hooks.txt:458
12758
msgid ""
12759
"Called by the bzr server when it starts serving a directory.\n"
12760
"server_started is called with (backing urls, public url), where\n"
12761
"backing_url is a list of URLs giving the server-specific directory\n"
12762
"locations, and public_url is the public URL for the directory being\n"
12763
"served."
12764
msgstr ""
12765
12766
#: en/help_topics/hooks.txt:464
12767
msgid ""
12768
"server_started_ex\n"
12769
"~~~~~~~~~~~~~~~~~"
12770
msgstr ""
12771
12772
#: en/help_topics/hooks.txt:469
12773
msgid ""
12774
"Called by the bzr server when it starts serving a directory.\n"
12775
"server_started is called with (backing_urls, server_obj)."
12776
msgstr ""
12777
12778
#: en/help_topics/hooks.txt:472
12779
msgid ""
12780
"server_stopped\n"
12781
"~~~~~~~~~~~~~~"
12782
msgstr ""
12783
12784
#: en/help_topics/hooks.txt:477
12785
msgid ""
12786
"Called by the bzr server when it stops serving a directory.\n"
12787
"server_stopped is called with the same parameters as the\n"
12788
"server_started hook: (backing_urls, public_url)."
12789
msgstr ""
12790
12791
#: en/help_topics/hooks.txt:481
12792
msgid ""
12793
"StatusHooks\n"
12794
"-----------"
12795
msgstr ""
12796
12797
#: en/help_topics/hooks.txt:484
12798
msgid ""
12799
"post_status\n"
12800
"~~~~~~~~~~~"
12801
msgstr ""
12802
12803
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12804
msgid "Introduced in: 2.3"
12805
msgstr ""
12806
12807
#: en/help_topics/hooks.txt:489
12808
msgid ""
12809
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12810
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12811
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12812
"correspond to the command line options specified by the user for the\n"
12813
"status command. to_file is the output stream for writing."
12814
msgstr ""
12815
12816
#: en/help_topics/hooks.txt:495
12817
msgid ""
12818
"pre_status\n"
12819
"~~~~~~~~~~"
12820
msgstr ""
12821
12822
#: en/help_topics/hooks.txt:500
12823
msgid ""
12824
"Called with argument StatusHookParams before Bazaar displays the\n"
12825
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12826
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12827
"correspond to the command line options specified by the user for the\n"
12828
"status command. to_file is the output stream for writing."
12829
msgstr ""
12830
12831
#: en/help_topics/hooks.txt:506
12832
msgid ""
12833
"TransportHooks\n"
12834
"--------------"
12835
msgstr ""
12836
12837
#: en/help_topics/hooks.txt:509
12838
msgid ""
12839
"post_connect\n"
12840
"~~~~~~~~~~~~"
12841
msgstr ""
12842
12843
#: en/help_topics/hooks.txt:514
12844
msgid ""
12845
"Called after a new connection is established or a reconnect occurs.\n"
12846
"The sole argument passed is either the connected transport or smart\n"
12847
"medium instance."
12848
msgstr ""
12849
12850
#: en/help_topics/hooks.txt:518
12851
msgid ""
12852
"RioVersionInfoBuilderHooks\n"
12853
"--------------------------"
12854
msgstr ""
12855
12856
#: en/help_topics/hooks.txt:521
12857
msgid ""
12858
"revision\n"
12859
"~~~~~~~~"
12860
msgstr ""
12861
12862
#: en/help_topics/hooks.txt:526
12863
msgid ""
12864
"Invoked when adding information about a revision to the RIO stanza\n"
12865
"that is printed. revision is called with a revision object and a RIO\n"
12866
"stanza.\n"
12867
msgstr ""
12868
12869
#: en/help_topics/location-alias.txt:1
12870
msgid ""
12871
"Location aliases\n"
12872
"================"
12873
msgstr ""
12874
12875
#: en/help_topics/location-alias.txt:4
12876
msgid ""
12877
"Bazaar defines several aliases for locations associated with a branch. "
12878
"These\n"
12879
"can be used with most commands that expect a location, such as `bzr push`."
12880
msgstr ""
12881
12882
#: en/help_topics/location-alias.txt:7
12883
msgid "The aliases are::"
12884
msgstr ""
12885
12886
#: en/help_topics/location-alias.txt:9
12887
msgid ""
12888
" :bound The branch this branch is bound to, for bound branches.\n"
12889
" :parent The parent of this branch.\n"
12890
" :public The public location of this branch.\n"
12891
" :push The saved location used for `bzr push` with no arguments.\n"
12892
" :submit The submit branch for this branch.\n"
12893
" :this This branch."
12894
msgstr ""
12895
12896
#: en/help_topics/location-alias.txt:16
12897
msgid "For example, to push to the parent location::"
12898
msgstr ""
12899
12900
#: en/help_topics/location-alias.txt:18
12901
msgid " bzr push :parent\n"
12902
msgstr ""
12903
12904
#: en/help_topics/log-formats.txt:1
12905
msgid ""
12906
"Log Formats\n"
12907
"==========="
12908
msgstr ""
12909
12910
#: en/help_topics/log-formats.txt:4
12911
msgid ""
12912
"A log format controls how information about each revision is displayed.\n"
12913
"The standard log formats are compared below::"
12914
msgstr ""
12915
12916
#: en/help_topics/log-formats.txt:7
12917
msgid ""
12918
" Feature long short line\n"
12919
" ---------------------- ------------- ------------ -------------------\n"
12920
" design goal detailed view concise view 1 revision per line\n"
12921
" committer name+email name only name only\n"
12922
" author name+email - -\n"
12923
" date-time format full date only date only\n"
12924
" commit message full full top line\n"
12925
" tags yes yes yes\n"
12926
" merges indicator - yes -\n"
12927
" status/delta optional optional -\n"
12928
" diff/patch optional optional -\n"
12929
" revision-id optional optional -\n"
12930
" branch nick yes - -\n"
12931
" foreign vcs properties yes yes -\n"
12932
" preferred levels all 1 1\n"
12933
" digital signature optional - -"
12934
msgstr ""
12935
12936
#: en/help_topics/log-formats.txt:24
12937
msgid ""
12938
"The default format is ``long``. To change this, define the ``log_format``\n"
12939
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12940
msgstr ""
12941
12942
#: en/help_topics/log-formats.txt:27
12943
msgid ""
12944
" [DEFAULT]\n"
12945
" log_format = short"
12946
msgstr ""
12947
12948
#: en/help_topics/log-formats.txt:30
12949
msgid ""
12950
"Alternatively, to change the log format used for a given query, use the\n"
12951
"--long, --short or --line options."
12952
msgstr ""
12953
12954
#: en/help_topics/log-formats.txt:33
12955
msgid ""
12956
"If one of the standard log formats does not meet your needs, additional\n"
12957
"formats can be provided by plugins.\n"
12958
msgstr ""
12959
12960
#: en/help_topics/other-formats.txt:1
12961
msgid "Other Storage Formats"
12962
msgstr "Andere Speicherformate"
12963
12964
#: en/help_topics/other-formats.txt:3
12965
msgid "Experimental formats are shown below."
12966
msgstr ""
12967
12968
#: en/help_topics/other-formats.txt:5
12969
msgid ""
12970
":development-colo:\n"
12971
" (native) The 2a format with experimental support for colocated\n"
12972
" branches."
12973
msgstr ""
12974
12975
#: en/help_topics/other-formats.txt:9
12976
msgid ""
12977
"\n"
12978
"Deprecated formats are shown below."
12979
msgstr ""
12980
12981
#: en/help_topics/other-formats.txt:12
12982
msgid ""
12983
":pack-0.92:\n"
12984
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12985
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12986
" by bzr < 0.92."
12987
msgstr ""
12988
12989
#: en/help_topics/patterns.txt:1
12990
msgid ""
12991
"Patterns\n"
12992
"========"
12993
msgstr ""
12994
12995
#: en/help_topics/patterns.txt:4
12996
msgid ""
12997
"Bazaar uses patterns to match files at various times. For example,\n"
12998
"the ``add`` command skips over files that match ignore patterns\n"
12999
"and preferences can be associated with files using rule patterns.\n"
13000
"The pattern syntax is described below."
13001
msgstr ""
13002
13003
#: en/help_topics/patterns.txt:9
13004
msgid ""
13005
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13006
"slash or is a regular expression, it is compared to the whole path\n"
13007
"from the branch root. Otherwise, it is compared to only the last\n"
13008
"component of the path. To match a file only in the root directory,\n"
13009
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13010
msgstr ""
13011
13012
#: en/help_topics/patterns.txt:15
13013
msgid "Patterns may include globbing wildcards such as::"
13014
msgstr ""
13015
13016
#: en/help_topics/patterns.txt:17
13017
msgid ""
13018
" ? - Matches any single character except '/'\n"
13019
" * - Matches 0 or more characters except '/'\n"
13020
" /**/ - Matches 0 or more directories in a path\n"
13021
" [a-z] - Matches a single character from within a group of characters"
13022
msgstr ""
13023
13024
#: en/help_topics/patterns.txt:22
13025
msgid ""
13026
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13027
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13028
"expression. Regular expression patterns may not include named or\n"
13029
"numbered groups."
13030
msgstr ""
13031
13032
#: en/help_topics/patterns.txt:27
13033
msgid ""
13034
"Case insensitive ignore patterns can be specified with regular expressions\n"
13035
"by using the ``i`` (for ignore case) flag in the pattern."
13036
msgstr ""
13037
13038
#: en/help_topics/patterns.txt:30
13039
msgid ""
13040
"For example, a case insensitive match for ``foo`` may be specified as::"
13041
msgstr ""
13042
13043
#: en/help_topics/patterns.txt:32
13044
msgid " RE:(?i)foo"
13045
msgstr ""
13046
13047
#: en/help_topics/patterns.txt:34
13048
msgid ""
13049
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13050
"matched by that pattern will not be ignored."
13051
msgstr ""
13052
13053
#: en/help_topics/patterns.txt:37
13054
msgid ""
13055
".. _Python regular expressions: http://docs.python.org/library/re.html"
13056
msgstr ""
13057
13058
#: en/help_topics/revisionspec.txt:1
13059
msgid "Revision Identifiers"
13060
msgstr ""
13061
13062
#: en/help_topics/revisionspec.txt:3
13063
msgid ""
13064
"A revision identifier refers to a specific state of a branch's history. It\n"
13065
"can be expressed in several ways. It can begin with a keyword to\n"
13066
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13067
"'before:yesterday' and 'submit:'."
13068
msgstr ""
13069
13070
#: en/help_topics/revisionspec.txt:8
13071
msgid ""
13072
"Alternately, it can be given without a keyword, in which case it will be\n"
13073
"checked as a revision number, a tag, a revision id, a date specification, or "
13074
"a\n"
13075
"branch specification, in that order. For example, 'date:today' could be\n"
13076
"written as simply 'today', though if you have a tag called 'today' that "
13077
"will\n"
13078
"be found first."
13079
msgstr ""
13080
13081
#: en/help_topics/revisionspec.txt:14
13082
msgid ""
13083
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13084
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13085
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13086
"or\n"
13087
"spaces around the '..')."
13088
msgstr ""
13089
13090
#: en/help_topics/revisionspec.txt:19
13091
msgid ""
13092
"Ranges are interpreted differently by different commands. To the \"log\" "
13093
"command,\n"
13094
"a range is a sequence of log messages, but to the \"diff\" command, the "
13095
"range\n"
13096
"denotes a change between revisions (and not a sequence of changes). In\n"
13097
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13098
"consider it\n"
13099
"to be open-ended, that is, they include one end but not the other. For "
13100
"example:\n"
13101
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13102
"3649,\n"
13103
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13104
"and\n"
13105
"3649, but not 3647."
13106
msgstr ""
13107
13108
#: en/help_topics/revisionspec.txt:28
13109
msgid "The keywords used as revision selection methods are the following:"
13110
msgstr ""
13111
13112
#: en/help_topics/revisionspec.txt:30
13113
msgid ""
13114
":revid:\n"
13115
"\tSelects a revision using the revision id.\n"
13116
":submit:\n"
13117
"\tSelects a common ancestor with the submit branch.\n"
13118
":ancestor:\n"
13119
"\tSelects a common ancestor with a second branch.\n"
13120
":date:\n"
13121
"\tSelects a revision on the basis of a datestamp.\n"
13122
":branch:\n"
13123
"\tSelects the last revision of a specified branch.\n"
13124
":tag:\n"
13125
"\tSelects a revision identified by a tag name.\n"
13126
":revno:\n"
13127
"\tSelects a revision using a number.\n"
13128
":before:\n"
13129
"\tSelects the parent of the revision specified.\n"
13130
":annotate:\n"
13131
"\tSelect the revision that last modified the specified line.\n"
13132
":mainline:\n"
13133
"\tSelect mainline revision that merged the specified revision.\n"
13134
":last:\n"
13135
"\tSelects the nth revision from the end."
13136
msgstr ""
13137
13138
#: en/help_topics/revisionspec.txt:53
13139
msgid "In addition, plugins can provide other keywords."
13140
msgstr ""
13141
13142
#: en/help_topics/revisionspec.txt:55
13143
msgid "A detailed description of each keyword is given below."
13144
msgstr ""
13145
13146
#: en/help_topics/revisionspec.txt:57
13147
msgid ":revid:"
13148
msgstr ":revid:"
13149
13150
#: en/help_topics/revisionspec.txt:59
13151
msgid ""
13152
" Supply a specific revision id, that can be used to specify any\n"
13153
" revision id in the ancestry of the branch.\n"
13154
" Including merges, and pending merges.\n"
13155
" Examples::"
13156
msgstr ""
13157
13158
#: en/help_topics/revisionspec.txt:64
13159
msgid ""
13160
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13161
msgstr ""
13162
13163
#: en/help_topics/revisionspec.txt:66
13164
msgid ":submit:"
13165
msgstr ":submit:"
13166
13167
#: en/help_topics/revisionspec.txt:68
13168
msgid ""
13169
" Diffing against this shows all the changes that were made in this "
13170
"branch,\n"
13171
" and is a good predictor of what merge will do. The submit branch is\n"
13172
" used by the bundle and merge directive commands. If no submit branch\n"
13173
" is specified, the parent branch is used instead."
13174
msgstr ""
13175
13176
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13177
msgid ""
13178
" The common ancestor is the last revision that existed in both\n"
13179
" branches. Usually this is the branch point, but it could also be\n"
13180
" a revision that was merged."
13181
msgstr ""
13182
13183
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13184
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13185
#: en/help_topics/revisionspec.txt:153
13186
msgid " Examples::"
13187
msgstr " Beispiele::"
13188
13189
#: en/help_topics/revisionspec.txt:79
13190
msgid " $ bzr diff -r submit:"
13191
msgstr " $ bzr diff -r submit:"
13192
13193
#: en/help_topics/revisionspec.txt:81
13194
msgid ":ancestor:"
13195
msgstr ":ancestor:"
13196
13197
#: en/help_topics/revisionspec.txt:83
13198
msgid " Supply the path to a branch to select the common ancestor."
13199
msgstr ""
13200
13201
#: en/help_topics/revisionspec.txt:89
13202
msgid ""
13203
" This is frequently used with 'diff' to return all of the changes\n"
13204
" that your branch introduces, while excluding the changes that you\n"
13205
" have not merged from the remote branch."
13206
msgstr ""
13207
13208
#: en/help_topics/revisionspec.txt:95
13209
msgid ""
13210
" ancestor:/path/to/branch\n"
13211
" $ bzr diff -r ancestor:../../mainline/branch"
13212
msgstr ""
13213
13214
#: en/help_topics/revisionspec.txt:98
13215
msgid ":date:"
13216
msgstr ":date:"
13217
13218
#: en/help_topics/revisionspec.txt:100
13219
msgid ""
13220
" Supply a datestamp to select the first revision that matches the date.\n"
13221
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13222
" Matches the first entry after a given date (either at midnight or\n"
13223
" at a specified time)."
13224
msgstr ""
13225
13226
#: en/help_topics/revisionspec.txt:105
13227
msgid " One way to display all the changes since yesterday would be::"
13228
msgstr " Eine Möglichkeit, alle Änderungen seit gestern anzuzeigen wäre:"
13229
13230
#: en/help_topics/revisionspec.txt:107
13231
msgid " bzr log -r date:yesterday.."
13232
msgstr " bzr log -r date:yesterday.."
13233
13234
#: en/help_topics/revisionspec.txt:111
13235
msgid ""
13236
" date:yesterday -> select the first revision since "
13237
"yesterday\n"
13238
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13239
" August 14th, 2006 at 5:10pm."
13240
msgstr ""
13241
13242
#: en/help_topics/revisionspec.txt:115
13243
msgid ":branch:"
13244
msgstr ":branch:"
13245
13246
#: en/help_topics/revisionspec.txt:117
13247
msgid " Supply the path to a branch to select its last revision."
13248
msgstr ""
13249
13250
#: en/help_topics/revisionspec.txt:121
13251
msgid " branch:/path/to/branch"
13252
msgstr " branch:/pfad/zur/branch"
13253
13254
#: en/help_topics/revisionspec.txt:123
13255
msgid ":tag:"
13256
msgstr ":tag:"
13257
13258
#: en/help_topics/revisionspec.txt:125
13259
msgid " Tags are stored in the branch and created by the 'tag' command."
13260
msgstr ""
13261
13262
#: en/help_topics/revisionspec.txt:127
13263
msgid ":revno:"
13264
msgstr ":revno:"
13265
13266
#: en/help_topics/revisionspec.txt:129
13267
msgid ""
13268
" Use an integer to specify a revision in the history of the branch.\n"
13269
" Optionally a branch can be specified. A negative number will count\n"
13270
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13271
" one). If the negative number is larger than the branch's history, the\n"
13272
" first revision is returned.\n"
13273
" Examples::"
13274
msgstr ""
13275
13276
#: en/help_topics/revisionspec.txt:136
13277
msgid ""
13278
" revno:1 -> return the first revision of this branch\n"
13279
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13280
" the branch '/path/to/branch'\n"
13281
" revno:-1 -> The last revision in a branch.\n"
13282
" -2:http://other/branch -> The second to last revision in the\n"
13283
" remote branch.\n"
13284
" -1000000 -> Most likely the first revision, unless\n"
13285
" your history is very long."
13286
msgstr ""
13287
13288
#: en/help_topics/revisionspec.txt:145
13289
msgid ":before:"
13290
msgstr ":before:"
13291
13292
#: en/help_topics/revisionspec.txt:147
13293
msgid ""
13294
" Supply any revision spec to return the parent of that revision. This "
13295
"is\n"
13296
" mostly useful when inspecting revisions that are not in the revision "
13297
"history\n"
13298
" of a branch."
13299
msgstr ""
13300
13301
#: en/help_topics/revisionspec.txt:151
13302
msgid ""
13303
" It is an error to request the parent of the null revision (before:0)."
13304
msgstr ""
13305
13306
#: en/help_topics/revisionspec.txt:155
13307
msgid ""
13308
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13309
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13310
" aaaa@bbbb-1234567890\n"
13311
" bzr diff -r before:1913..1913\n"
13312
" -> Find the changes between revision 1913 and its parent "
13313
"(1912).\n"
13314
" (What changes did revision 1913 introduce).\n"
13315
" This is equivalent to: bzr diff -c 1913"
13316
msgstr ""
13317
13318
#: en/help_topics/revisionspec.txt:163
13319
msgid ":annotate:"
13320
msgstr ":annotate:"
13321
13322
#: en/help_topics/revisionspec.txt:165
13323
msgid ""
13324
" Select the revision that last modified the specified line. Line is\n"
13325
" specified as path:number. Path is a relative path to the file. "
13326
"Numbers\n"
13327
" start at 1, and are relative to the current version, not the last-\n"
13328
" committed version of the file."
13329
msgstr ""
13330
13331
#: en/help_topics/revisionspec.txt:170
13332
msgid ":mainline:"
13333
msgstr ":mainline:"
13334
13335
#: en/help_topics/revisionspec.txt:172
13336
msgid ""
13337
" Select the revision that merged the specified revision into mainline."
13338
msgstr ""
13339
13340
#: en/help_topics/revisionspec.txt:174
13341
msgid ":last:"
13342
msgstr ""
13343
13344
#: en/help_topics/revisionspec.txt:176
13345
msgid ""
13346
" Supply a positive number to get the nth revision from the end.\n"
13347
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13348
" Examples::"
13349
msgstr ""
13350
13351
#: en/help_topics/revisionspec.txt:180
13352
msgid ""
13353
" last:1 -> return the last revision\n"
13354
" last:3 -> return the revision 2 before the end.\n"
13355
msgstr ""
13356
" last:1 -> Gibt die letzte Version zurück\n"
13357
" last:3 -> Gibt die Version zwei vor dem Ende zurück\n"
13358
13359
#: en/help_topics/rules.txt:1
13360
msgid ""
13361
"Rules\n"
13362
"====="
13363
msgstr ""
13364
"Regeln\n"
13365
"======"
13366
13367
#: en/help_topics/rules.txt:7
13368
msgid ""
13369
"Rules are defined in ini file format where the sections are file glob\n"
13370
"patterns and the contents of each section are the preferences for files\n"
13371
"matching that pattern(s). For example::"
13372
msgstr ""
13373
13374
#: en/help_topics/rules.txt:11
13375
msgid ""
13376
" [name *.bat]\n"
13377
" eol = native"
13378
msgstr ""
13379
13380
#: en/help_topics/rules.txt:14
13381
msgid ""
13382
" [name *.html *.xml]\n"
13383
" keywords = xml_escape"
13384
msgstr ""
13385
13386
#: en/help_topics/rules.txt:17
13387
msgid ""
13388
"Preferences like these are useful for commands and plugins wishing to\n"
13389
"provide custom behaviour for selected files. For more information on \n"
13390
"end of line conversion see :doc:`eol-help`.\n"
13391
"Keyword support is provided by the `keywords plugin\n"
13392
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13393
msgstr ""
13394
13395
#: en/help_topics/rules.txt:23
13396
msgid ""
13397
"Files\n"
13398
"-----"
13399
msgstr ""
13400
"Dateien\n"
13401
"-------"
13402
13403
#: en/help_topics/rules.txt:26
13404
msgid ""
13405
"Default rules for all branches are defined in the optional file\n"
13406
"``BZR_HOME/rules``. "
13407
msgstr ""
13408
13409
#: en/help_topics/rules.txt:29
13410
msgid ""
13411
"Rule Patterns\n"
13412
"-------------"
13413
msgstr ""
13414
"Regel-Muster\n"
13415
"-------------"
13416
13417
#: en/help_topics/rules.txt:32
13418
msgid ""
13419
"Patterns are ordered and searching stops as soon as one matches.\n"
13420
"As a consequence, more explicit patterns should be placed towards\n"
13421
"the top of the file. Rule patterns use exactly the same conventions\n"
13422
"as ignore patterns. See :doc:`patterns-help` for details."
13423
msgstr ""
13424
13425
#: en/help_topics/rules.txt:37
13426
msgid ".. note::"
13427
msgstr ""
13428
13429
#: en/help_topics/rules.txt:39
13430
msgid ""
13431
" Patterns containing square brackets or spaces should be\n"
13432
" surrounded in quotes to ensure they are correctly parsed.\n"
13433
msgstr ""
13434
13435
#: en/help_topics/topics.txt:1
13436
msgid ""
13437
"authentication Information on configuring authentication\n"
13438
"basic Basic commands\n"
13439
"branches Information on what a branch is\n"
13440
"bugs Bug tracker settings\n"
13441
"checkouts Information on what a checkout is\n"
13442
"commands Basic help for all commands\n"
13443
"configuration Details on the configuration settings available\n"
13444
"conflict-types Types of conflicts and what to do about them\n"
13445
"content-filters Conversion of content into/from working trees\n"
13446
"criss-cross Information on criss-cross merging\n"
13447
"current-formats Current storage formats\n"
13448
"debug-flags Options to show or record debug information\n"
13449
"diverged-branches How to fix diverged branches\n"
13450
"env-variables Environment variable names and values\n"
13451
"eol Information on end-of-line handling\n"
13452
"files Information on configuration and log files\n"
13453
"formats Information on choosing a storage format\n"
13454
"global-options Options that control how Bazaar runs\n"
13455
"hidden-commands All hidden commands\n"
13456
"hooks Points at which custom processing can be added\n"
13457
"launchpad Using Bazaar with Launchpad.net\n"
13458
"location-alias Aliases for remembered locations\n"
13459
"log-formats Details on the logging formats available\n"
13460
"other-formats Experimental and deprecated storage formats\n"
13461
"patterns Information on the pattern syntax\n"
13462
"repositories Basic information on shared repositories.\n"
13463
"revisionspec Explain how to use --revision\n"
13464
"rules Information on defining rule-based preferences\n"
13465
"standalone-trees Information on what a standalone tree is\n"
13466
"standard-options Options that can be used with any command\n"
13467
"status-flags Help on status flags\n"
13468
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13469
"topics Topics list\n"
13470
"url-special-chars Special character handling in URLs\n"
13471
"urlspec Supported transport protocols\n"
13472
"working-trees Information on working trees\n"
13473
msgstr ""
13474
13475
#: en/help_topics/url-special-chars.txt:1
13476
msgid ""
13477
"Special character handling in URLs\n"
13478
"=================================="
13479
msgstr ""
13480
13481
#: en/help_topics/url-special-chars.txt:4
13482
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13483
msgstr ""
13484
13485
#: en/help_topics/url-special-chars.txt:6
13486
msgid " * Fully qualified URLs"
13487
msgstr ""
13488
13489
#: en/help_topics/url-special-chars.txt:8
13490
msgid " * File system paths, relative or absolute"
13491
msgstr ""
13492
13493
#: en/help_topics/url-special-chars.txt:10
13494
msgid ""
13495
"Internally bzr treats all locations as URLs. For any file system paths\n"
13496
"that are specified it will automatically determine the appropriate URL\n"
13497
"representation, and escape special characters where necessary."
13498
msgstr ""
13499
13500
#: en/help_topics/url-special-chars.txt:14
13501
msgid ""
13502
"There are a few characters which have special meaning in URLs and need "
13503
"careful\n"
13504
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13505
"value in URLs. Any non-ASCII characters in a file path will automatically "
13506
"be\n"
13507
"urlencoded when the path is converted to a URL."
13508
msgstr ""
13509
13510
#: en/help_topics/url-special-chars.txt:19
13511
msgid ""
13512
"URLs represent non-ASCII characters in an encoding defined by the server, "
13513
"but\n"
13514
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13515
"be\n"
13516
"generous in what it accepts as a URL and to print them in a way that\n"
13517
"will be readable."
13518
msgstr ""
13519
13520
#: en/help_topics/url-special-chars.txt:24
13521
msgid ""
13522
"For example, if you have a directory named '/tmp/%2False' these are all "
13523
"valid\n"
13524
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13525
"slash)::"
13526
msgstr ""
13527
13528
#: en/help_topics/url-special-chars.txt:27
13529
msgid ""
13530
" cd /tmp\n"
13531
" bzr log /tmp/%2False\n"
13532
" bzr log %2False\n"
13533
" bzr log file:///tmp/%252False\n"
13534
" bzr log file://localhost/tmp/%252False\n"
13535
" bzr log file:%252False"
13536
msgstr ""
13537
" cd /tmp\n"
13538
" bzr log /tmp/%2False\n"
13539
" bzr log %2False\n"
13540
" bzr log file:///tmp/%252False\n"
13541
" bzr log file://localhost/tmp/%252False\n"
13542
" bzr log file:%252False"
13543
13544
#: en/help_topics/url-special-chars.txt:34
13545
msgid "These are valid but do not refer to the same file::"
13546
msgstr ""
13547
13548
#: en/help_topics/url-special-chars.txt:36
13549
msgid ""
13550
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13551
" bzr log %252False (refers to a file called /tmp/%252False)"
13552
msgstr ""
13553
13554
#: en/help_topics/url-special-chars.txt:39
13555
msgid ""
13556
"Comma also has special meaning in URLs, because it denotes `segment "
13557
"parameters`_"
13558
msgstr ""
13559
"Kommatas haben eine spezielle Bedeutung in URLs und markieren "
13560
"`Abschnittparameter`_"
13561
13562
#: en/help_topics/url-special-chars.txt:41
13563
msgid ""
13564
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13565
msgstr ""
13566
13567
#: en/help_topics/url-special-chars.txt:43
13568
msgid ""
13569
"Comma is also special in any file system paths that are specified. To use a "
13570
"literal\n"
13571
"comma in a file system path, specify a URL and URL encode the comma::"
13572
msgstr ""
13573
13574
#: en/help_topics/url-special-chars.txt:46
13575
msgid ""
13576
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13577
"\"branch\" set to \"bla\"\n"
13578
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13579
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13580
"\"branch\" set to \"bla\"\n"
13581
msgstr ""
13582
13583
#: en/help_topics/urlspec.txt:1
13584
msgid "URL Identifiers"
13585
msgstr ""
13586
13587
#: en/help_topics/urlspec.txt:3
13588
msgid "Supported URL prefixes::"
13589
msgstr "Unterstützte URL-Präfixe::"
13590
13591
#: en/help_topics/urlspec.txt:5
13592
msgid ""
13593
" aftp:// Access using active FTP.\n"
13594
" bzr:// Fast access using the Bazaar smart server.\n"
13595
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13596
" file:// Access using the standard filesystem (default)\n"
13597
" ftp:// Access using passive FTP.\n"
13598
" http:// Read-only access of branches exported on the web.\n"
13599
" https:// Read-only access of branches exported on the web using "
13600
"SSL.\n"
13601
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13602
msgstr ""
13603
13604
#: en/help_topics/urlspec.txt:14
13605
msgid "Supported modifiers::"
13606
msgstr "Unterstützte Modifikatoren::"
13607
13608
#: en/help_topics/urlspec.txt:16
13609
msgid " gio+ Access using any GIO supported protocols."
13610
msgstr ""
13611
13612
#: en/help_topics/urlspec.txt:18
13613
msgid "Bazaar supports all of the standard parts within the URL::"
13614
msgstr ""
13615
13616
#: en/help_topics/urlspec.txt:20
13617
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13618
msgstr ""
13619
13620
#: en/help_topics/urlspec.txt:22
13621
msgid "allowing URLs such as::"
13622
msgstr ""
13623
13624
#: en/help_topics/urlspec.txt:24
13625
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13626
msgstr " http://bzruser:BadPass@bzr.beispiel.de:8080/bzr/trunk"
13627
13628
#: en/help_topics/urlspec.txt:26
13629
msgid ""
13630
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13631
"with '~' as meaning that the rest of the path should be interpreted\n"
13632
"relative to the remote user's home directory. For example if the user\n"
13633
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13634
"shell.example.com, then::"
13635
msgstr ""
13636
13637
#: en/help_topics/urlspec.txt:32
13638
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13639
msgstr " bzr+ssh://remote@shell.beispiel.de/~/meinprojekt/trunk"
13640
13641
#: en/help_topics/urlspec.txt:34
13642
msgid "would refer to ``/home/remote/myproject/trunk``."
13643
msgstr "Würde verweisen auf »/home/remote/meinprojekt/trunk«."
13644
13645
#: en/help_topics/urlspec.txt:36
13646
msgid ""
13647
"Many commands that accept URLs also accept location aliases too.\n"
13648
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13649
msgstr ""
13650
"Viele Kommandos die URLs akzeptieren, akzeptieren auch Platzaliase.\n"
13651
"Siehe :doc:`location-alias-help` und :doc:`url-special-chars-help`.\n"
13652
13653
#~ msgid ""
13654
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
13655
#~ "http://bazaar.canonical.com/"
13656
#~ msgstr ""
13657
#~ "Bazaar 2.5b6 – Ein frei vertriebenes »Verteiltes Versionsverwaltungssystem«\n"
13658
#~ "http://bazaar.canonical.com/"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1