« back to all changes in this revision
Viewing changes to data/de/LC_MESSAGES/bzr.po
- browse files at revision 196
- compare with another revision
- download diff
- download tarball
- view history from revision 196
- Committer: Package Import Robot
- Author(s): Ubuntu automatic language-pack builder
- Date: 2013-08-21 10:34:41 UTC
- Revision ID: package-import@ubuntu.com-20130821103441-d5iar72ptnhtc8yc
Tags: 1:13.10+20130820
Automatic update to latest translation data.
- files added:
- data/de/LC_MESSAGES/alsa-utils.po
- files modified:
- data/de/LC_MESSAGES/app-install-data.po
added
removed
data/de/LC_MESSAGES/bzr.po
1
# German translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2013-07-27 12:45+0200\n"
11
"PO-Revision-Date: 2013-06-30 20:23+0000\n"
12
"Last-Translator: Hendrik Knackstedt <Unknown>\n"
13
"Language-Team: German <de@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2013-08-20 11:08+0000\n"
19
"X-Generator: Launchpad (build 16731)\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:872
26
msgid "Unstacking"
27
msgstr "Entstapeln"
28
29
#: bzrlib/branch.py:3012
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "In Revision %d hochgeladen."
33
34
#: bzrlib/branch.py:3014
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:3017
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:3019
46
msgid "No new revisions to push."
47
msgstr "Keine neuen Revisionen zum Hochladen."
48
49
#: bzrlib/branch.py:3039
50
msgid "checked branch {0} format {1}"
51
msgstr "überprüfter Zweig {0} Format {1}"
52
53
#: bzrlib/branch.py:3042
54
#, python-format
55
msgid "found error:%s"
56
msgstr "Fehler gefunden: %s"
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
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:5229
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:5231
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
320
msgid "Revision numbers only make sense for single revisions, not ranges"
321
msgstr ""
322
323
#: bzrlib/builtins.py:712
324
msgid "Show revno of working tree."
325
msgstr "Revno des Arbeitsbaums anzeigen."
326
327
#: bzrlib/builtins.py:760
328
msgid "Add specified files or directories."
329
msgstr "Angegebene Dateien oder Verzeichnisse hinzufügen."
330
331
#: bzrlib/builtins.py:762
332
msgid ""
333
"In non-recursive mode, all the named items are added, regardless\n"
334
"of whether they were previously ignored. A warning is given if\n"
335
"any of the named files are already versioned."
336
msgstr ""
337
"Im nicht-rekursiven Modus werden alle Einträge mit Namen hinzugefügt,\n"
338
"auch wenn sie vorher ignoriert wurden. Es wird eine Warnung ausgegeben,\n"
339
"wenn eine der gewählten Dateien schon vorhanden ist."
340
341
#: bzrlib/builtins.py:766
342
msgid ""
343
"In recursive mode (the default), files are treated the same way\n"
344
"but the behaviour for directories is different. Directories that\n"
345
"are already versioned do not give a warning. All directories,\n"
346
"whether already versioned or not, are searched for files or\n"
347
"subdirectories that are neither versioned or ignored, and these\n"
348
"are added. This search proceeds recursively into versioned\n"
349
"directories. If no names are given '.' is assumed."
350
msgstr ""
351
"Im rekursiven Modus (Standard) werden Dateien auf die selbe Art und \n"
352
"Weise behandelt, aber das Verhalten für Ordner ist anders. Ordner, die\n"
353
"bereits versioniert wurden, erzeugen keine Warnung. Alle Ordner,\n"
354
"bereits versioniert oder nicht, werden nach Dateien und Unterordnern\n"
355
"durchsucht, die weder versioniert sind noch ignoriert werden, die dann\n"
356
"hinzugefügt werden. Diese Suche setzt sich rekursiv in versionierten\n"
357
"Ordnern fort. Wenn kein Name angegeben wurde, wird ».« angenommen."
358
359
#: bzrlib/builtins.py:774
360
msgid ""
361
"A warning will be printed when nested trees are encountered,\n"
362
"unless they are explicitly ignored."
363
msgstr ""
364
"Es wird eine Warnung ausgegebern, wenn verschachtelte Bäume auftreten,\n"
365
"es sei denn diese werden explizit ignoriert."
366
367
#: bzrlib/builtins.py:777
368
msgid ""
369
"Therefore simply saying 'bzr add' will version all files that\n"
370
"are currently unknown."
371
msgstr ""
372
"Einfach gesagt: »bzr add« versioniert alle Dateien,\n"
373
"die bisher unbekannt sind."
374
375
#: bzrlib/builtins.py:780
376
msgid ""
377
"Adding a file whose parent directory is not versioned will\n"
378
"implicitly add the parent, and so on up to the root. This means\n"
379
"you should never need to explicitly add a directory, they'll just\n"
380
"get added when you add a file in the directory."
381
msgstr ""
382
"Wird eine Datei hinzugefügt, deren übergeordneter Ordner noch nicht\n"
383
"versioniert wurde, wird dieser ebenfalls automatisch hinzugefügt.\n"
384
"Dies bedeutet, dass Sie niemals explizit einen Ordner hinzufügen\n"
385
"müssen, da dieser hinzugefügt wird, sobald Sie eine Datei aus diesem Ordner\n"
386
"hinzufügen."
387
388
#: bzrlib/builtins.py:785
389
msgid ""
390
"--dry-run will show which files would be added, but not actually\n"
391
"add them."
392
msgstr ""
393
"--dry-run zeigt die Dateien an, die hinzugefügt würden,\n"
394
"ohne diese wirklich hinzuzufügen."
395
396
#: bzrlib/builtins.py:788
397
msgid ""
398
"--file-ids-from will try to use the file ids from the supplied path.\n"
399
"It looks up ids trying to find a matching parent directory with the\n"
400
"same filename, and then by pure path. This option is rarely needed\n"
401
"but can be useful when adding the same logical file into two\n"
402
"branches that will be merged later (without showing the two different\n"
403
"adds as a conflict). It is also useful when merging another project\n"
404
"into a subdirectory of this one."
405
msgstr ""
406
"--file-ids-from versucht die Datei-IDs des angegebenen Pfades zu benutzen.\n"
407
"Hiermit werden die Datei-IDs verglichen und gemeinsame Elternverzeichnisse\n"
408
"des selben Namen, danach des selben Pfades, gesucht. Diese Option wird "
409
"selten benötigt,\n"
410
"kann aber sehr hilfreich sein, wenn die selbe Datei in zwei Zweige eingefügt "
411
"wird, die\n"
412
"später zusammengeführt werden (ohne dabei das doppelte Hinzufügen als "
413
"Konflikt auszugeben).\n"
414
"Außerdem ist diese Option hilfreich, wenn ein anderes Projekt in ein "
415
"Unterverzeichnis\n"
416
"eingefügt wird."
417
418
#: bzrlib/builtins.py:796
419
msgid ""
420
"Any files matching patterns in the ignore list will not be added\n"
421
"unless they are explicitly mentioned."
422
msgstr ""
423
"Alle Dateien, die auf Muster in der Ignorierliste zutreffen, werden\n"
424
"nicht hinzugefügt, außer Sie geben diese explizit an."
425
426
#: bzrlib/builtins.py:799
427
msgid ""
428
"In recursive mode, files larger than the configuration option \n"
429
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
430
"to file size."
431
msgstr ""
432
"Im rekursiven Modus werden Dateien übersprungen, die größer als die "
433
"Einstellung \n"
434
"von add.maximum_file_size sind. Einträge mit Namen\n"
435
"werden niemals aufgrund ihrer Größe übersprungen."
436
437
#: bzrlib/builtins.py:806
438
msgid "Don't recursively add the contents of directories."
439
msgstr "Inhalte von Verzeichnissen nicht rekursiv hinzufügen."
440
441
#: bzrlib/builtins.py:813
442
msgid "Lookup file ids from this tree."
443
msgstr "Datei-IDs von diesem Baum nachschauen."
444
445
#: bzrlib/builtins.py:849
446
msgid "ignored {0} matching \"{1}\"\n"
447
msgstr "ignoriert {0} übereinstimmend \"{1}\"\n"
448
449
#: bzrlib/builtins.py:854
450
msgid "Create a new versioned directory."
451
msgstr "Ein neues versioniertes Verzeichnis erstellen."
452
453
#: bzrlib/builtins.py:856
454
msgid "This is equivalent to creating the directory and then adding it."
455
msgstr "Dies entspricht dem Anlegen und Hinzufügen des Ordners."
456
457
#: bzrlib/builtins.py:863
458
msgid "No error if existing, make parent directories as needed."
459
msgstr ""
460
"Kein Fehler, falls vorhanden, übergeordnete Verzeichnisse erstellen, falls "
461
"nötig."
462
463
#: bzrlib/builtins.py:897
464
#, python-format
465
msgid "added %s\n"
466
msgstr "%s hinzugefügt\n"
467
468
#: bzrlib/builtins.py:939
469
#, python-format
470
msgid "invalid kind %r specified"
471
msgstr "Ungültiger Typ %r angegeben"
472
473
#: bzrlib/builtins.py:976
474
msgid "Move or rename a file."
475
msgstr "Eine Datei verschieben oder umbenennen."
476
477
#: bzrlib/builtins.py:978
478
msgid " bzr mv SOURCE... DESTINATION"
479
msgstr " bzr mv QUELLE... ZIEL"
480
481
#: bzrlib/builtins.py:980
482
msgid ""
483
"If the last argument is a versioned directory, all the other names\n"
484
"are moved into it. Otherwise, there must be exactly two arguments\n"
485
"and the file is changed to a new name."
486
msgstr ""
487
"Wenn das letzte Argument ein versioniertes Verzeichnis ist, dann werden\n"
488
"alle anderen Namen in dieses verschoben. Ansonsten müssen es exakt 2\n"
489
"Argumente sein, und die Datei wird umbenannt."
490
491
#: bzrlib/builtins.py:984
492
msgid ""
493
"If OLDNAME does not exist on the filesystem but is versioned and\n"
494
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
495
"assumes that the file has been manually moved and only updates\n"
496
"its internal inventory to reflect that change.\n"
497
"The same is valid when moving many SOURCE files to a DESTINATION."
498
msgstr ""
499
500
#: bzrlib/builtins.py:990
501
msgid "Files cannot be moved between branches."
502
msgstr "Dateien können nicht zwischen Zweigen verschoben werden."
503
504
#: bzrlib/builtins.py:997
505
msgid ""
506
"Move only the bzr identifier of the file, because the file has already been "
507
"moved."
508
msgstr ""
509
"Verschiebe nur den bzr-Bezeichner der Datei, da diese bereits verschoben "
510
"wurde."
511
512
#: bzrlib/builtins.py:999
513
msgid "Automatically guess renames."
514
msgstr "Umbenennungen automatisch erraten"
515
516
#: bzrlib/builtins.py:1000
517
msgid "Avoid making changes when guessing renames."
518
msgstr "Keine Änderungen durchführen, wenn Umbenennungen erraten werden."
519
520
#: bzrlib/builtins.py:1009
521
msgid "--dry-run requires --auto."
522
msgstr "--dry-run erfordert --auto."
523
524
#: bzrlib/builtins.py:1013
525
msgid "missing file argument"
526
msgstr "Datei-Argument fehlt"
527
528
#: bzrlib/builtins.py:1017
529
msgid "can not move root of branch"
530
msgstr "Wurzel des Zweiges kann nicht verschoben werden"
531
532
#: bzrlib/builtins.py:1023
533
msgid "Only one path may be specified to --auto."
534
msgstr "Es kann nur ein Pfad mit --auto angegeben werden."
535
536
#: bzrlib/builtins.py:1026
537
msgid "--after cannot be specified with --auto."
538
msgstr "--after kann nicht mit --auto angegeben werden."
539
540
#: bzrlib/builtins.py:1062
541
msgid "to mv multiple files the destination must be a versioned directory"
542
msgstr ""
543
"um mehrere Dateien zu verschieben, muss das Ziel ein versioniertes "
544
"Verzeichnis sein"
545
546
#: bzrlib/builtins.py:1114
547
msgid "Turn this branch into a mirror of another branch."
548
msgstr "Diesen Zweig zu einer Spiegelung eines anderen Zweiges machen."
549
550
#: bzrlib/builtins.py:1116
551
msgid ""
552
"By default, this command only works on branches that have not diverged.\n"
553
"Branches are considered diverged if the destination branch's most recent \n"
554
"commit is one that has not been merged (directly or indirectly) into the \n"
555
"parent."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1121
559
msgid ""
560
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
561
"from one into the other. Once one branch has merged, the other should\n"
562
"be able to pull it again."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1125
566
msgid ""
567
"If you want to replace your local changes and just want your branch to\n"
568
"match the remote one, use pull --overwrite. This will work even if the two\n"
569
"branches have diverged."
570
msgstr ""
571
"Wenn Sie Ihre lokalen Änderungen ersetzen möchten und Ihr Zweig\n"
572
"nur mit dem entfernten Zweig übereinstimmen soll, nutzen Sie pull --"
573
"overwrite.\n"
574
"Das funktioniert auch, wenn zwei Zweige voneinander abweichen."
575
576
#: bzrlib/builtins.py:1129
577
msgid ""
578
"If there is no default location set, the first pull will set it (use\n"
579
"--no-remember to avoid setting it). After that, you can omit the\n"
580
"location to use the default. To change the default, use --remember. The\n"
581
"value will only be saved if the remote location can be accessed."
582
msgstr ""
583
"Wird kein Standardverzeichnis angegeben, wird dies mit dem ersten Abgleich "
584
"definiert\n"
585
"(benutzen Sie --no-remember, um es nicht zu definieren). Danach können Sie\n"
586
"das Standardverzeichnis bei der Voreinstellung belassen. Benutzen Sie --"
587
"remember, um den\n"
588
"Standard zu ändern . Der Wert wird nur gespeichert, wenn die Gegenstelle "
589
"erreichbar ist."
590
591
#: bzrlib/builtins.py:1134
592
msgid ""
593
"The --verbose option will display the revisions pulled using the log_format\n"
594
"configuration option. You can use a different format by overriding it with\n"
595
"-Olog_format=<other_format>."
596
msgstr ""
597
"Die Option --verbose zeigt die heruntergeladenen Versionen unter Benutzung "
598
"der\n"
599
"log_format-Konfiguration an. Sie können ein anderes Format verwenden, indem "
600
"Sie\n"
601
"es mit -Olog_format=<Anderes_Format> überschreiben."
602
603
#: bzrlib/builtins.py:1138
604
msgid ""
605
"Note: The location can be specified either in the form of a branch,\n"
606
"or in the form of a path to a file containing a merge directive generated\n"
607
"with bzr send."
608
msgstr ""
609
"Beachten Sie: Das Verzeichnis kann in Form eines Zweiges oder in Form\n"
610
"eines Pfades angegeben werden, in dem sich eine bei der bzr-Übertragung\n"
611
"entstandene Zusammenführungsanweisung befindet."
612
613
#: bzrlib/builtins.py:1146
614
msgid "Show logs of pulled revisions."
615
msgstr "Protokolle geladener Revisionen anzeigen."
616
617
#: bzrlib/builtins.py:1148
618
msgid ""
619
"Branch to pull into, rather than the one containing the working directory."
620
msgstr ""
621
"Zweig, in den an Stelle des aktuellen Arbeitsverzeichnisses heruntergeladen "
622
"wird."
623
624
#: bzrlib/builtins.py:1151
625
msgid ""
626
"Perform a local pull in a bound branch. Local pulls are not applied to the "
627
"master branch."
628
msgstr ""
629
630
#: bzrlib/builtins.py:1188
631
msgid "No working tree, ignoring --show-base"
632
msgstr ""
633
634
#: bzrlib/builtins.py:1204
635
msgid "No pull location known or specified."
636
msgstr "Kein Verzeichnis zum Herunterladen bekannt oder angegeben."
637
638
#: bzrlib/builtins.py:1210
639
#, python-format
640
msgid "Using saved parent location: %s\n"
641
msgstr "Gespeichertes übergeordnetes Verzeichnis wird verwendet: %s\n"
642
643
#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
644
msgid "Cannot use -r with merge directives or bundles"
645
msgstr ""
646
647
#: bzrlib/builtins.py:1260
648
msgid "Update a mirror of this branch."
649
msgstr "Eine Spiegelung dieses Zweiges aktualisieren."
650
651
#: bzrlib/builtins.py:1262
652
msgid ""
653
"The target branch will not have its working tree populated because this\n"
654
"is both expensive, and is not supported on remote file systems."
655
msgstr ""
656
"Die Arbeitsstruktur des Zielzweiges wird nicht eingepflegt, weil dies\n"
657
"aufwändig ist und auf entfernten Dateisystemen nicht unterstützt wird."
658
659
#: bzrlib/builtins.py:1265
660
msgid ""
661
"Some smart servers or protocols *may* put the working tree in place in\n"
662
"the future."
663
msgstr ""
664
"Einige intelligente Server oder Protokolle legen den Arbeitsbaum\n"
665
"*möglicherweise* in die Zukunft."
666
667
#: bzrlib/builtins.py:1268
668
msgid ""
669
"This command only works on branches that have not diverged. Branches are\n"
670
"considered diverged if the destination branch's most recent commit is one\n"
671
"that has not been merged (directly or indirectly) by the source branch."
672
msgstr ""
673
674
#: bzrlib/builtins.py:1272
675
msgid ""
676
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
677
"the other branch completely, discarding its unmerged changes."
678
msgstr ""
679
"Wenn sich Zweige unterscheiden, können Sie »bzr push --overwrite« zum "
680
"Ersetzen\n"
681
"des anderen Zweiges benutzen, wobei die nicht abgeglichenen Veränderungen "
682
"verworfen werden."
683
684
#: bzrlib/builtins.py:1275
685
msgid ""
686
"If you want to ensure you have the different changes in the other branch,\n"
687
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
688
"After that you will be able to do a push without '--overwrite'."
689
msgstr ""
690
"Wenn Sie sicherstellen möchten, dass in dem anderen Zweig abweichende "
691
"Veränderungen vorliegen,\n"
692
"so führen Sie diese zusammen (lesen Sie dazu bzr help merge). Danach können "
693
"Sie die Zweige ohne \n"
694
"die Option »--overwrite« hochladen."
695
696
#: bzrlib/builtins.py:1279
697
msgid ""
698
"If there is no default push location set, the first push will set it (use\n"
699
"--no-remember to avoid setting it). After that, you can omit the\n"
700
"location to use the default. To change the default, use --remember. The\n"
701
"value will only be saved if the remote location can be accessed."
702
msgstr ""
703
"Wenn kein Standardspeicherort für das Hochladen bekannt ist, wird dies mit "
704
"dem \n"
705
"ersten Hochladen gesetzt. (Benutzen Sie --no-remember um das Setzen zu "
706
"vermeiden).\n"
707
"Danach können Sie den Speicherort auf Standard belassen. Benutzen Sie --"
708
"remember, um den Standard zu verändern. Der Wert wird nur gespeichert, wenn "
709
"das entfernte Verzeichnis erreichbar ist."
710
711
#: bzrlib/builtins.py:1284
712
msgid ""
713
"The --verbose option will display the revisions pushed using the log_format\n"
714
"configuration option. You can use a different format by overriding it with\n"
715
"-Olog_format=<other_format>."
716
msgstr ""
717
"Die Option --verbose zeigt die verschiedenen hochgeladenen Versionen\n"
718
"unter Benutzung der log_format-Konfiguration an. Sie können ein anderes "
719
"Format\n"
720
"benutzen, indem Sie es mit -Olog_format=<Anderes_Format> überschreiben."
721
722
#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272
723
msgid ""
724
"Branch to push from, rather than the one containing the working directory."
725
msgstr ""
726
"Der Zweig zum Hochladen, statt dem Zweig, der das Arbeitsverzeichnis enthält."
727
728
#: bzrlib/builtins.py:1298
729
msgid ""
730
"By default push will fail if the target directory exists, but does not "
731
"already have a control directory. This flag will allow push to proceed."
732
msgstr ""
733
734
#: bzrlib/builtins.py:1303
735
msgid ""
736
"Create a stacked branch that references the public location of the parent "
737
"branch."
738
msgstr ""
739
"Einen gestapelten Zweig anlegen, der auf den öffentlichen Pfad des "
740
"übergeordneten Zweigs referenziert."
741
742
#: bzrlib/builtins.py:1306
743
msgid ""
744
"Create a stacked branch that refers to another branch for the commit "
745
"history. Only the work not present in the referenced branch is included in "
746
"the branch created."
747
msgstr ""
748
749
#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279
750
msgid ""
751
"Refuse to push if there are uncommitted changes in the working tree, --no-"
752
"strict disables the check."
753
msgstr ""
754
"Hochladen verweigern, wenn Veränderungen in dem Arbeitsbaum noch nicht "
755
"eingereicht wurden, --no-strict deaktiviert die Überprüfung."
756
757
#: bzrlib/builtins.py:1314
758
msgid "Don't populate the working tree, even for protocols that support it."
759
msgstr ""
760
761
#: bzrlib/builtins.py:1317
762
msgid "Overwrite tags only."
763
msgstr "Nur Schlüsselwörter überschreiben."
764
765
#: bzrlib/builtins.py:1368
766
msgid "Could not determine branch to refer to."
767
msgstr ""
768
"Der Zweig, auf den Verwiesen werden soll, kann nicht bestimmt werden."
769
770
#: bzrlib/builtins.py:1377
771
#, python-format
772
msgid ""
773
"No push location known or specified. To push to the parent branch (at %s), "
774
"use 'bzr push :parent'."
775
msgstr ""
776
777
#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306
778
msgid "No push location known or specified."
779
msgstr "Kein Ort zum Hochladen bekannt oder nicht gewählt."
780
781
#: bzrlib/builtins.py:1387
782
#, python-format
783
msgid "Using saved push location: %s"
784
msgstr "Gespeichertes Verzeichnis zum Hochladen wird verwendet: %s"
785
786
#: bzrlib/builtins.py:1397
787
msgid "Create a new branch that is a copy of an existing branch."
788
msgstr ""
789
"Einen neuen Zweig erstellen, der eine Kopie eines vorhandenen Zweigs ist."
790
791
#: bzrlib/builtins.py:1399
792
msgid ""
793
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
794
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
795
"./bar.\n"
796
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
797
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
798
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
799
"create ./foo-bar."
800
msgstr ""
801
802
#: bzrlib/builtins.py:1406
803
msgid ""
804
"To retrieve the branch as of a particular revision, supply the --revision\n"
805
"parameter, as in \"branch foo/bar -r 5\"."
806
msgstr ""
807
808
#: bzrlib/builtins.py:1409
809
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
810
msgstr "DIe Synonyme »clone« und »get« sind für diesen Befehl sind veraltet."
811
812
#: bzrlib/builtins.py:1419
813
msgid "Create a branch without a working-tree."
814
msgstr "Zweig ohne Arbeitsbaum erstellen."
815
816
#: bzrlib/builtins.py:1421
817
msgid "Switch the checkout in the current directory to the new branch."
818
msgstr ""
819
820
#: bzrlib/builtins.py:1424
821
msgid ""
822
"Create a stacked branch referring to the source branch. The new branch will "
823
"depend on the availability of the source branch for all operations."
824
msgstr ""
825
826
#: bzrlib/builtins.py:1428
827
msgid "Do not use a shared repository, even if available."
828
msgstr "Keine verteilte Quelle nutzen, auch wenn vorhanden."
829
830
#: bzrlib/builtins.py:1430
831
msgid ""
832
"By default branch will fail if the target directory exists, but does not "
833
"already have a control directory. This flag will allow branch to proceed."
834
msgstr ""
835
836
#: bzrlib/builtins.py:1435
837
msgid "Bind new branch to from location."
838
msgstr ""
839
840
#: bzrlib/builtins.py:1482
841
#, python-format
842
msgid "Target directory \"%s\" already exists."
843
msgstr "Zielverzeichnis »%s« ist schon vorhanden."
844
845
#: bzrlib/builtins.py:1494
846
#, python-format
847
msgid "Parent of \"%s\" does not exist."
848
msgstr "Übergeordntes Verzeichnis von »%s« ist nicht vorhanden."
849
850
#: bzrlib/builtins.py:1513
851
msgid "The branch {0} has no revision {1}."
852
msgstr "Der Zweig {0} hat keine Revision {1}."
853
854
#: bzrlib/builtins.py:1528 bzrlib/push.py:53
855
#, python-format
856
msgid "Created new stacked branch referring to %s."
857
msgstr ""
858
859
#: bzrlib/builtins.py:1532
860
#, python-format
861
msgid "Branched %d revision."
862
msgid_plural "Branched %d revisions."
863
msgstr[0] ""
864
msgstr[1] ""
865
866
#: bzrlib/builtins.py:1537
867
#, python-format
868
msgid "New branch bound to %s"
869
msgstr ""
870
871
#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
872
#, python-format
873
msgid "Switched to branch: %s"
874
msgstr "Zu Zweig gewechselt: %s"
875
876
#: bzrlib/builtins.py:1547
877
msgid "List the branches available at the current location."
878
msgstr "Die verfügbaren Zweige an der aktuellen Stelle auflisten."
879
880
#: bzrlib/builtins.py:1549
881
msgid ""
882
"This command will print the names of all the branches at the current\n"
883
"location."
884
msgstr ""
885
"Dieser Befehl wird die Namen aller verfügbaren Zweige\n"
886
"an der aktuellen Stelle auflisten."
887
888
#: bzrlib/builtins.py:1556
889
msgid ""
890
"Recursively scan for branches rather than just looking in the specified "
891
"location."
892
msgstr ""
893
"Rekursiv nach Zweigen suchen, statt nur an der angegebenen Stelle zu suchen."
894
895
#: bzrlib/builtins.py:1585
896
msgid "(default)"
897
msgstr "(Vorgabe)"
898
899
#: bzrlib/builtins.py:1597
900
msgid "Create a new checkout of an existing branch."
901
msgstr ""
902
903
#: bzrlib/builtins.py:1599
904
msgid ""
905
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
906
"for\n"
907
"the branch found in '.'. This is useful if you have removed the working "
908
"tree\n"
909
"or if it was never created - i.e. if you pushed the branch to its current\n"
910
"location using SFTP."
911
msgstr ""
912
913
#: bzrlib/builtins.py:1604
914
msgid ""
915
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
916
"will\n"
917
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
918
"./bar.\n"
919
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
920
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
921
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
922
"create ./foo-bar."
923
msgstr ""
924
925
#: bzrlib/builtins.py:1611
926
msgid ""
927
"To retrieve the branch as of a particular revision, supply the --revision\n"
928
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
929
"immediately\n"
930
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
931
"old\n"
932
"code.)"
933
msgstr ""
934
935
#: bzrlib/builtins.py:1621
936
msgid ""
937
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
938
"the branch for every operation. Normal checkouts can perform common "
939
"operations like diff and status without such access, and also support local "
940
"commits."
941
msgstr ""
942
943
#: bzrlib/builtins.py:1628
944
msgid "Get file contents from this tree."
945
msgstr ""
946
947
#: bzrlib/builtins.py:1630
948
msgid "Hard-link working tree files where possible."
949
msgstr ""
950
951
#: bzrlib/builtins.py:1671
952
msgid ""
953
"Show list of renamed files.\n"
954
" "
955
msgstr ""
956
"Liste der umbenannten Dateien zeigen.\n"
957
" "
958
959
#: bzrlib/builtins.py:1699
960
msgid "Update a working tree to a new revision."
961
msgstr ""
962
963
#: bzrlib/builtins.py:1701
964
msgid ""
965
"This will perform a merge of the destination revision (the tip of the\n"
966
"branch, or the specified revision) into the working tree, and then make\n"
967
"that revision the basis revision for the working tree. "
968
msgstr ""
969
970
#: bzrlib/builtins.py:1705
971
msgid ""
972
"You can use this to visit an older revision, or to update a working tree\n"
973
"that is out of date from its branch."
974
msgstr ""
975
976
#: bzrlib/builtins.py:1708
977
msgid ""
978
"If there are any uncommitted changes in the tree, they will be carried\n"
979
"across and remain as uncommitted changes after the update. To discard\n"
980
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
981
"with the changes brought in by the change in basis revision."
982
msgstr ""
983
984
#: bzrlib/builtins.py:1713
985
msgid ""
986
"If the tree's branch is bound to a master branch, bzr will also update\n"
987
"the branch from the master."
988
msgstr ""
989
990
#: bzrlib/builtins.py:1716
991
msgid ""
992
"You cannot update just a single file or directory, because each Bazaar\n"
993
"working tree has just a single basis revision. If you want to restore a\n"
994
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
995
"update'. If you want to restore a file to its state in a previous\n"
996
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
997
"out the old content of that file to a new location."
998
msgstr ""
999
1000
#: bzrlib/builtins.py:1723
1001
msgid ""
1002
"The 'dir' argument, if given, must be the location of the root of a\n"
1003
"working tree to update. By default, the working tree that contains the \n"
1004
"current working directory is used."
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1739
1008
msgid "bzr update --revision takes exactly one revision"
1009
msgstr "bzr update --revision benötigt exakt eine Revision"
1010
1011
#: bzrlib/builtins.py:1747
1012
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1013
msgstr ""
1014
"bzr update kann nur den gesamten Baum aktualisieren, keine Datei oder kein "
1015
"Unterverzeichnis."
1016
1017
#: bzrlib/builtins.py:1778
1018
msgid "Tree is up to date at revision {0} of branch {1}"
1019
msgstr "Baum ist auf den neusten Stand bei Revision {0} von Zweig {1}"
1020
1021
#: bzrlib/builtins.py:1794
1022
#, python-format
1023
msgid ""
1024
"branch has no revision %s\n"
1025
"bzr update --revision only works for a revision in the branch history"
1026
msgstr ""
1027
"Zweig hat keine Revision %s\n"
1028
"bzr update --revision funktioniert nur mit einer Revision aus dem Verlauf "
1029
"des Zweigs"
1030
1031
#: bzrlib/builtins.py:1800
1032
msgid "Updated to revision {0} of branch {1}"
1033
msgstr "Auf Revision {0} von Zweig {1} aktualisieren"
1034
1035
#: bzrlib/builtins.py:1804
1036
msgid ""
1037
"Your local commits will now show as pending merges with 'bzr status', and "
1038
"can be committed with 'bzr commit'."
1039
msgstr ""
1040
1041
#: bzrlib/builtins.py:1813
1042
msgid "Show information about a working tree, branch or repository."
1043
msgstr ""
1044
1045
#: bzrlib/builtins.py:1815
1046
msgid ""
1047
"This command will show all known locations and formats associated to the\n"
1048
"tree, branch or repository."
1049
msgstr ""
1050
1051
#: bzrlib/builtins.py:1818
1052
msgid ""
1053
"In verbose mode, statistical information is included with each report.\n"
1054
"To see extended statistic information, use a verbosity level of 2 or\n"
1055
"higher by specifying the verbose option multiple times, e.g. -vv."
1056
msgstr ""
1057
1058
#: bzrlib/builtins.py:1822
1059
msgid "Branches and working trees will also report any missing revisions."
1060
msgstr ""
1061
1062
#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883
1063
#: bzrlib/builtins.py:6469
1064
msgid ":Examples:"
1065
msgstr ":Beispiele:"
1066
1067
#: bzrlib/builtins.py:1826
1068
msgid " Display information on the format and related locations:"
1069
msgstr " Informationen über das Format und die dazugehörigen Orte anzeigen:"
1070
1071
#: bzrlib/builtins.py:1828
1072
msgid " bzr info"
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:1830
1076
msgid ""
1077
" Display the above together with extended format information and\n"
1078
" basic statistics (like the number of files in the working tree and\n"
1079
" number of revisions in the branch and repository):"
1080
msgstr ""
1081
1082
#: bzrlib/builtins.py:1834
1083
msgid " bzr info -v"
1084
msgstr " bzr info -v"
1085
1086
#: bzrlib/builtins.py:1836
1087
msgid " Display the above together with number of committers to the branch:"
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:1838
1091
msgid " bzr info -vv"
1092
msgstr " bzr info -vv"
1093
1094
#: bzrlib/builtins.py:1857
1095
msgid "Remove files or directories."
1096
msgstr "Dateien oder Verzeichnisse entfernen."
1097
1098
#: bzrlib/builtins.py:1859
1099
msgid ""
1100
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1101
"delete them if they can easily be recovered using revert otherwise they\n"
1102
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1103
"parameters are given Bazaar will scan for files that are being tracked by\n"
1104
"Bazaar but missing in your tree and stop tracking them for you."
1105
msgstr ""
1106
1107
#: bzrlib/builtins.py:1867
1108
msgid "Only remove files that have never been committed."
1109
msgstr "Nur Dateien entfernen, die niemals eingereicht wurden."
1110
1111
#: bzrlib/builtins.py:1869
1112
msgid "The file deletion mode to be used."
1113
msgstr "Der Datei-Löschmodus, der verwendet wird."
1114
1115
#: bzrlib/builtins.py:1870
1116
msgid "Deletion Strategy"
1117
msgstr "Lösch-Strategie"
1118
1119
#: bzrlib/builtins.py:1871
1120
msgid "Backup changed files (default)."
1121
msgstr "Geänderte Dateien sichern (Vorgabe)."
1122
1123
#: bzrlib/builtins.py:1872
1124
msgid "Delete from bzr but leave the working copy."
1125
msgstr "Aus bzr entfernen, aber die funktionierende Arbeitskopie erhalten."
1126
1127
#: bzrlib/builtins.py:1873
1128
msgid "Don't backup changed files."
1129
msgstr "Geänderte Dateien nicht sichern."
1130
1131
#: bzrlib/builtins.py:1894
1132
msgid "No matching files."
1133
msgstr "Keine zutreffenden Dateien."
1134
1135
#: bzrlib/builtins.py:1955
1136
msgid "Reconcile bzr metadata in a branch."
1137
msgstr ""
1138
1139
#: bzrlib/builtins.py:1957
1140
msgid ""
1141
"This can correct data mismatches that may have been caused by\n"
1142
"previous ghost operations or bzr upgrades. You should only\n"
1143
"need to run this command if 'bzr check' or a bzr developer\n"
1144
"advises you to run it."
1145
msgstr ""
1146
1147
#: bzrlib/builtins.py:1962
1148
msgid ""
1149
"If a second branch is provided, cross-branch reconciliation is\n"
1150
"also attempted, which will check that data like the tree root\n"
1151
"id which was not present in very early bzr versions is represented\n"
1152
"correctly in both branches."
1153
msgstr ""
1154
1155
#: bzrlib/builtins.py:1967
1156
msgid ""
1157
"At the same time it is run it may recompress data resulting in\n"
1158
"a potential saving in disk space or performance gain."
1159
msgstr ""
1160
"Es kann während der Ausführung Daten rekomprimieren, wodurch\n"
1161
"potentiell Speicherplatz gespart und die Performanz verbessert werden können."
1162
1163
#: bzrlib/builtins.py:1970
1164
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1165
msgstr ""
1166
"Der Zweig *MUSS* ein auflistbares System sein, wie z.B. eine lokale "
1167
"Festplatte oder stftp."
1168
1169
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1170
msgid ""
1171
"Format for the bzr 2.0 series.\n"
1172
"Uses group-compress storage.\n"
1173
"Provides rich roots which are a one-way transition.\n"
1174
msgstr ""
1175
1176
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1177
msgid ""
1178
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1179
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1183
msgid "The 2a format with experimental support for colocated branches.\n"
1184
msgstr ""
1185
"Das 2a-Format mit experimenteller Unterstützung für gemeinsame Zweige.\n"
1186
1187
#: bzrlib/builtins.py:2038
1188
msgid "Make a directory into a versioned branch."
1189
msgstr "Ein Verzeichnis zu einem versionierten Entwicklungszweig machen."
1190
1191
#: bzrlib/builtins.py:2040
1192
msgid ""
1193
"Use this to create an empty branch, or before importing an\n"
1194
"existing project."
1195
msgstr ""
1196
"Nutzen Sie dies, um einen leeren Zweig zu erstellen, oder bevor\n"
1197
"ein vorhandenes Projekt importiert wird."
1198
1199
#: bzrlib/builtins.py:2043
1200
msgid ""
1201
"If there is a repository in a parent directory of the location, then\n"
1202
"the history of the branch will be stored in the repository. Otherwise\n"
1203
"init creates a standalone branch which carries its own history\n"
1204
"in the .bzr directory."
1205
msgstr ""
1206
1207
#: bzrlib/builtins.py:2048
1208
msgid ""
1209
"If there is already a branch at the location but it has no working tree,\n"
1210
"the tree can be populated with 'bzr checkout'."
1211
msgstr ""
1212
1213
#: bzrlib/builtins.py:2051
1214
msgid "Recipe for importing a tree of files::"
1215
msgstr "Rezept für das Importieren eines Dateibaumes::"
1216
1217
#: bzrlib/builtins.py:2053
1218
msgid ""
1219
" cd ~/project\n"
1220
" bzr init\n"
1221
" bzr add .\n"
1222
" bzr status\n"
1223
" bzr commit -m \"imported project\""
1224
msgstr ""
1225
" cd ~/Projekt\n"
1226
" bzr init\n"
1227
" bzr add .\n"
1228
" bzr status\n"
1229
" bzr commit -m »Importiertes Projekt«"
1230
1231
#: bzrlib/builtins.py:2064
1232
msgid ""
1233
"Create the path leading up to the branch if it does not already exist."
1234
msgstr "Den Pfad zum Zweig erzeugen, falls dieser noch nicht vorhanden ist."
1235
1236
#: bzrlib/builtins.py:2067
1237
msgid "Specify a format for this branch. See \"help formats\"."
1238
msgstr "Geben Sie ein Format für diesen Zweig an. Siehe »help formats«."
1239
1240
#: bzrlib/builtins.py:2075
1241
msgid ""
1242
"Never change revnos or the existing log. Append revisions to it only."
1243
msgstr ""
1244
"Revnos oder das vorhandene Protokoll niemals ändern. Revisionen nur am Ende "
1245
"hinzufügen."
1246
1247
#: bzrlib/builtins.py:2078
1248
msgid "Create a branch without a working tree."
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2098 bzrlib/push.py:110
1252
#, python-format
1253
msgid ""
1254
"Parent directory of %s does not exist.\n"
1255
"You may supply --create-prefix to create all leading parent directories."
1256
msgstr ""
1257
1258
#: bzrlib/builtins.py:2132
1259
msgid ""
1260
"This branch format cannot be set to append-revisions-only. Try --default."
1261
msgstr ""
1262
1263
#: bzrlib/builtins.py:2143
1264
msgid "Created a {0} (format: {1})\n"
1265
msgstr "Ein {0} wurde erstellt (Format: {1})\n"
1266
1267
#: bzrlib/builtins.py:2152
1268
#, python-format
1269
msgid "Using shared repository: %s\n"
1270
msgstr ""
1271
1272
#: bzrlib/builtins.py:2156
1273
msgid "Create a shared repository for branches to share storage space."
1274
msgstr ""
1275
1276
#: bzrlib/builtins.py:2158
1277
msgid ""
1278
"New branches created under the repository directory will store their\n"
1279
"revisions in the repository, not in the branch directory. For branches\n"
1280
"with shared history, this reduces the amount of storage needed and \n"
1281
"speeds up the creation of new branches."
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2163
1285
msgid ""
1286
"If the --no-trees option is given then the branches in the repository\n"
1287
"will not have working trees by default. They will still exist as \n"
1288
"directories on disk, but they will not have separate copies of the \n"
1289
"files at a certain revision. This can be useful for repositories that\n"
1290
"store branches which are interacted with through checkouts or remote\n"
1291
"branches, such as on a server."
1292
msgstr ""
1293
1294
#: bzrlib/builtins.py:2170
1295
msgid ""
1296
":Examples:\n"
1297
" Create a shared repository holding just branches::"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2173
1301
msgid ""
1302
" bzr init-repo --no-trees repo\n"
1303
" bzr init repo/trunk"
1304
msgstr ""
1305
" bzr init-repo --no-trees repo\n"
1306
" bzr init repo/trunk"
1307
1308
#: bzrlib/builtins.py:2176
1309
msgid " Make a lightweight checkout elsewhere::"
1310
msgstr ""
1311
1312
#: bzrlib/builtins.py:2178
1313
msgid ""
1314
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1315
" cd trunk-checkout\n"
1316
" (add files here)"
1317
msgstr ""
1318
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1319
" cd trunk-checkout\n"
1320
" (Hier Dateien hinzufügen)"
1321
1322
#: bzrlib/builtins.py:2186
1323
msgid ""
1324
"Specify a format for this repository. See \"bzr help formats\" for details."
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2190
1328
msgid "Repository format"
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2192
1332
msgid "Branches in the repository will default to not having a working tree."
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2218
1336
msgid "Show differences in the working tree, between revisions or branches."
1337
msgstr ""
1338
1339
#: bzrlib/builtins.py:2220
1340
msgid ""
1341
"If no arguments are given, all changes for the current tree are listed.\n"
1342
"If files are given, only the changes in those files are listed.\n"
1343
"Remote and multiple branches can be compared by using the --old and\n"
1344
"--new options. If not provided, the default for both is derived from\n"
1345
"the first argument, if any, or the current tree if no arguments are\n"
1346
"given."
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2227
1350
msgid ""
1351
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1352
"produces patches suitable for \"patch -p1\"."
1353
msgstr ""
1354
"»bzr diff -p1« ist das gleiche wie »bzr diff --prefix alt/:neu/«\n"
1355
"und produziert angepasste Korrekturen für »patch -p1«."
1356
1357
#: bzrlib/builtins.py:2230
1358
msgid ""
1359
"Note that when using the -r argument with a range of revisions, the\n"
1360
"differences are computed between the two specified revisions. That\n"
1361
"is, the command does not show the changes introduced by the first \n"
1362
"revision in the range. This differs from the interpretation of \n"
1363
"revision ranges used by \"bzr log\" which includes the first revision\n"
1364
"in the range."
1365
msgstr ""
1366
1367
#: bzrlib/builtins.py:2237
1368
msgid ""
1369
":Exit values:\n"
1370
" 1 - changed\n"
1371
" 2 - unrepresentable changes\n"
1372
" 3 - error\n"
1373
" 0 - no change"
1374
msgstr ""
1375
":Rückgabewerte:\n"
1376
" 1 - Geändert\n"
1377
" 2 - Nicht darstellbare Änderungen\n"
1378
" 3 - Fehler\n"
1379
" 0 - Keine Änderungen"
1380
1381
#: bzrlib/builtins.py:2243
1382
msgid ""
1383
":Examples:\n"
1384
" Shows the difference in the working tree versus the last commit::"
1385
msgstr ""
1386
1387
#: bzrlib/builtins.py:2246
1388
msgid " bzr diff"
1389
msgstr " bzr diff"
1390
1391
#: bzrlib/builtins.py:2248
1392
msgid " Difference between the working tree and revision 1::"
1393
msgstr ""
1394
1395
#: bzrlib/builtins.py:2250
1396
msgid " bzr diff -r1"
1397
msgstr " bzr diff -r1"
1398
1399
#: bzrlib/builtins.py:2252
1400
msgid " Difference between revision 3 and revision 1::"
1401
msgstr " Unterschied zwischen Revision 3 und Revision 1::"
1402
1403
#: bzrlib/builtins.py:2254
1404
msgid " bzr diff -r1..3"
1405
msgstr " bzr diff -r1..3"
1406
1407
#: bzrlib/builtins.py:2256
1408
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1409
msgstr " Unterschied zwischen Revision 3 und Revision 1 von Zweig xxx::"
1410
1411
#: bzrlib/builtins.py:2258
1412
msgid " bzr diff -r1..3 xxx"
1413
msgstr " bzr diff -r1..3 xxx"
1414
1415
#: bzrlib/builtins.py:2260
1416
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1417
msgstr " Die Änderungen von Revision 2 (äquivalent zu -r1..2)::"
1418
1419
#: bzrlib/builtins.py:2262
1420
msgid " bzr diff -c2"
1421
msgstr " bzr diff -c2"
1422
1423
#: bzrlib/builtins.py:2264
1424
msgid ""
1425
" To see the changes introduced by revision X::\n"
1426
" \n"
1427
" bzr diff -cX"
1428
msgstr ""
1429
" So erhalten Sie die Änderungen von Revision X::\n"
1430
" \n"
1431
" bzr diff -cX"
1432
1433
#: bzrlib/builtins.py:2268
1434
msgid ""
1435
" Note that in the case of a merge, the -c option shows the changes\n"
1436
" compared to the left hand parent. To see the changes against\n"
1437
" another parent, use::"
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2272
1441
msgid " bzr diff -r<chosen_parent>..X"
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2274
1445
msgid ""
1446
" The changes between the current revision and the previous revision\n"
1447
" (equivalent to -c-1 and -r-2..-1)"
1448
msgstr ""
1449
" Die Änderungen zwischen der gegenwärtigen Revision und der vorigen\n"
1450
" (äquivalent zu -c-1 und -r-2..-1)"
1451
1452
#: bzrlib/builtins.py:2277
1453
msgid " bzr diff -r-2.."
1454
msgstr " bzr diff -r-2.."
1455
1456
#: bzrlib/builtins.py:2279
1457
msgid " Show just the differences for file NEWS::"
1458
msgstr " Nur die Unterschiede für die Datei NEWS anzeigen::"
1459
1460
#: bzrlib/builtins.py:2281
1461
msgid " bzr diff NEWS"
1462
msgstr ""
1463
1464
#: bzrlib/builtins.py:2283
1465
msgid " Show the differences in working tree xxx for file NEWS::"
1466
msgstr ""
1467
1468
#: bzrlib/builtins.py:2285
1469
msgid " bzr diff xxx/NEWS"
1470
msgstr ""
1471
1472
#: bzrlib/builtins.py:2287
1473
msgid " Show the differences from branch xxx to this working tree:"
1474
msgstr ""
1475
1476
#: bzrlib/builtins.py:2289
1477
msgid " bzr diff --old xxx"
1478
msgstr " bzr diff --old xxx"
1479
1480
#: bzrlib/builtins.py:2291
1481
msgid " Show the differences between two branches for file NEWS::"
1482
msgstr ""
1483
" Die Unterschiede zwischen zwei Zweigen für die Datei NEWS anzeigen::"
1484
1485
#: bzrlib/builtins.py:2293
1486
msgid " bzr diff --old xxx --new yyy NEWS"
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2295
1490
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2297
1494
msgid ""
1495
" bzr diff --prefix old/:new/\n"
1496
" \n"
1497
" Show the differences using a custom diff program with options::\n"
1498
" \n"
1499
" bzr diff --using /usr/bin/diff --diff-options -wu"
1500
msgstr ""
1501
1502
#: bzrlib/builtins.py:2307
1503
msgid "Pass these options to the external diff program."
1504
msgstr "Diese Optionen an das externe Programm diff übergeben."
1505
1506
#: bzrlib/builtins.py:2310
1507
msgid ""
1508
"Set prefixes added to old and new filenames, as two values separated by a "
1509
"colon. (eg \"old/:new/\")."
1510
msgstr ""
1511
1512
#: bzrlib/builtins.py:2313
1513
msgid "Branch/tree to compare from."
1514
msgstr "Von Zweig/Baum vergleichen."
1515
1516
#: bzrlib/builtins.py:2317
1517
msgid "Branch/tree to compare to."
1518
msgstr "Mit Zweig/Baum vergleichen."
1519
1520
#: bzrlib/builtins.py:2323
1521
msgid "Use this command to compare files."
1522
msgstr "Diesen Befehl zum Vergleichen von Dateien benutzen."
1523
1524
#: bzrlib/builtins.py:2328
1525
msgid "Diff format to use."
1526
msgstr "Diff-Format, das benutzt werden soll."
1527
1528
#: bzrlib/builtins.py:2330
1529
msgid "Diff format"
1530
msgstr "Diff-Format"
1531
1532
#: bzrlib/builtins.py:2332
1533
msgid "How many lines of context to show."
1534
msgstr ""
1535
1536
#: bzrlib/builtins.py:2357
1537
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1538
msgstr ""
1539
"--prefix erwartet zwei Werte getrennt mit einem Doppelpunkt (z.B. "
1540
"»alt/:neu/«)"
1541
1542
#: bzrlib/builtins.py:2361
1543
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1544
msgstr ""
1545
"bzr diff --revision benötigt exakt ein oder zwei Revisions-Spezifikationen"
1546
1547
#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
1548
#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
1549
msgid "{0} and {1} are mutually exclusive"
1550
msgstr "{0} und {1} schließen sich gegenseitig aus"
1551
1552
#: bzrlib/builtins.py:2386
1553
msgid ""
1554
"List files deleted in the working tree.\n"
1555
" "
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2463
1559
msgid "Show the tree root directory."
1560
msgstr "Den Wurzelverzeichnisbaum anzeigen."
1561
1562
#: bzrlib/builtins.py:2465
1563
msgid ""
1564
"The root is the nearest enclosing directory with a .bzr control\n"
1565
"directory."
1566
msgstr ""
1567
1568
#: bzrlib/builtins.py:2480
1569
msgid "The limit argument must be an integer."
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2488
1573
msgid "The levels argument must be an integer."
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2493
1577
msgid "Show historical log for a branch or subset of a branch."
1578
msgstr ""
1579
1580
#: bzrlib/builtins.py:2495
1581
msgid ""
1582
"log is bzr's default tool for exploring the history of a branch.\n"
1583
"The branch to use is taken from the first parameter. If no parameters\n"
1584
"are given, the branch containing the working directory is logged.\n"
1585
"Here are some simple examples::"
1586
msgstr ""
1587
1588
#: bzrlib/builtins.py:2500
1589
msgid ""
1590
" bzr log log the current branch\n"
1591
" bzr log foo.py log a file in its branch\n"
1592
" bzr log http://server/branch log a branch on a server"
1593
msgstr ""
1594
1595
#: bzrlib/builtins.py:2504
1596
msgid ""
1597
"The filtering, ordering and information shown for each revision can\n"
1598
"be controlled as explained below. By default, all revisions are\n"
1599
"shown sorted (topologically) so that newer revisions appear before\n"
1600
"older ones and descendants always appear before ancestors. If displayed,\n"
1601
"merged revisions are shown indented under the revision in which they\n"
1602
"were merged."
1603
msgstr ""
1604
1605
#: bzrlib/builtins.py:2511
1606
msgid ":Output control:"
1607
msgstr ":Ausgabesteuerung:"
1608
1609
#: bzrlib/builtins.py:2513
1610
msgid ""
1611
" The log format controls how information about each revision is\n"
1612
" displayed. The standard log formats are called ``long``, ``short``\n"
1613
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1614
" for more details on log formats."
1615
msgstr ""
1616
" Das Protokoll-Format bestimmt wie Informationen zu jeder Revision\n"
1617
" angezeigt werden. Die Standard-Protokoll-Formate heißen ``long``,\n"
1618
" ``short`` und ``line``. Die Vorgabe ist ``long``.\n"
1619
" Siehe``bzr help log-formats`` für mehr Einzelheiten zu Protokoll-Formaten."
1620
1621
#: bzrlib/builtins.py:2518
1622
msgid ""
1623
" The following options can be used to control what information is\n"
1624
" displayed::"
1625
msgstr ""
1626
" Die folgenden Einstellungen können genutzt werden, um zu kontrollieren,\n"
1627
" welche Informationen angezeigt werden::"
1628
1629
#: bzrlib/builtins.py:2521
1630
msgid ""
1631
" -l N display a maximum of N revisions\n"
1632
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1633
" -v display a status summary (delta) for each revision\n"
1634
" -p display a diff (patch) for each revision\n"
1635
" --show-ids display revision-ids (and file-ids), not just revnos"
1636
msgstr ""
1637
" -l N Maximal N Revisionen anzeigen\n"
1638
" -n N N Revisionsstufen anzeigen (0 für alle, 1 für "
1639
"eingeklappte)\n"
1640
" -v Eine Status-Zusammenfassung (Delta) für jede Revision "
1641
"anzeigen\n"
1642
" -p Einen diff (Patch) für jede Revision anzeigen\n"
1643
" --show-ids Revision-ids (und file-ids) anzeigen, nicht nur revnos"
1644
1645
#: bzrlib/builtins.py:2527
1646
msgid ""
1647
" Note that the default number of levels to display is a function of the\n"
1648
" log format. If the -n option is not used, the standard log formats show\n"
1649
" just the top level (mainline)."
1650
msgstr ""
1651
" Beachten Sie, dass die Vorgabeanzahl zum Anzeigen von Stufen eine "
1652
"Funktion\n"
1653
" des Protokoll-Formats ist. Wenn die Option -n nicht genutzt wird, dann "
1654
"zeigen die\n"
1655
" Standard-Protokoll-Formate nur die oberste Stufe (mainline)."
1656
1657
#: bzrlib/builtins.py:2531
1658
msgid ""
1659
" Status summaries are shown using status flags like A, M, etc. To see\n"
1660
" the changes explained using words like ``added`` and ``modified``\n"
1661
" instead, use the -vv option."
1662
msgstr ""
1663
" Status-Zusammenfassungen werden mit Status-Markern wie A, M, usw.\n"
1664
" angezeigt. Nutzen Sie die Option -vv, um Änderungen durch\n"
1665
" Wörter wie ``added`` oder ``modified`` erklärt zu bekommen."
1666
1667
#: bzrlib/builtins.py:2535
1668
msgid ":Ordering control:"
1669
msgstr ":Sortierungssteuerung:"
1670
1671
#: bzrlib/builtins.py:2537
1672
msgid ""
1673
" To display revisions from oldest to newest, use the --forward option.\n"
1674
" In most cases, using this option will have little impact on the total\n"
1675
" time taken to produce a log, though --forward does not incrementally\n"
1676
" display revisions like --reverse does when it can."
1677
msgstr ""
1678
" Nutzen Sie die Option --forward, um Revisionen von den ältesten zu den "
1679
"neusten\n"
1680
" anzuzeigen. Der Gebrauch dieser Option hat meistens kleine\n"
1681
" Auswirkungen auf die Gesamtzeit, die benötigt wird, um ein Protokoll zu "
1682
"erstellen.\n"
1683
" Außerdem zeigt --forward Revisionen nicht inkrementell an, wie --reverse "
1684
"dies tut, falls möglich."
1685
1686
#: bzrlib/builtins.py:2542
1687
msgid ":Revision filtering:"
1688
msgstr ":Revision-Filtern:"
1689
1690
#: bzrlib/builtins.py:2544
1691
msgid ""
1692
" The -r option can be used to specify what revision or range of revisions\n"
1693
" to filter against. The various forms are shown below::"
1694
msgstr ""
1695
" Die Option -r kann genutzt werden, um eine Revision oder einen Bereich von "
1696
"Revisionen\n"
1697
" zu bestimmen, die/der gefiltert werden soll. Es gibt folgende verschiedene "
1698
"Formen::"
1699
1700
#: bzrlib/builtins.py:2547
1701
msgid ""
1702
" -rX display revision X\n"
1703
" -rX.. display revision X and later\n"
1704
" -r..Y display up to and including revision Y\n"
1705
" -rX..Y display from X to Y inclusive"
1706
msgstr ""
1707
" -rX Revision X anzeigen\n"
1708
" -rX.. Revision X und spätere anzeigen\n"
1709
" -r..Y Bis Revision Y (inklusive) anzeigen\n"
1710
" -rX..Y Von X bis Y (inklusive) anzeigen"
1711
1712
#: bzrlib/builtins.py:2552
1713
msgid ""
1714
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1715
" Some common examples are given below::"
1716
msgstr ""
1717
" Siehe ``bzr help revisionspec`` für Informationen dazu, wie X und Y "
1718
"angegeben werden.\n"
1719
" Es folgen ein paar allgemeine Beispiele::"
1720
1721
#: bzrlib/builtins.py:2555
1722
msgid ""
1723
" -r-1 show just the tip\n"
1724
" -r-10.. show the last 10 mainline revisions\n"
1725
" -rsubmit:.. show what's new on this branch\n"
1726
" -rancestor:path.. show changes since the common ancestor of this\n"
1727
" branch and the one at location path\n"
1728
" -rdate:yesterday.. show changes since yesterday"
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2562
1732
msgid ""
1733
" When logging a range of revisions using -rX..Y, log starts at\n"
1734
" revision Y and searches back in history through the primary\n"
1735
" (\"left-hand\") parents until it finds X. When logging just the\n"
1736
" top level (using -n1), an error is reported if X is not found\n"
1737
" along the way. If multi-level logging is used (-n0), X may be\n"
1738
" a nested merge revision and the log will be truncated accordingly."
1739
msgstr ""
1740
1741
#: bzrlib/builtins.py:2569
1742
msgid ":Path filtering:"
1743
msgstr ":Pfad-Filtern:"
1744
1745
#: bzrlib/builtins.py:2571
1746
msgid ""
1747
" If parameters are given and the first one is not a branch, the log\n"
1748
" will be filtered to show only those revisions that changed the\n"
1749
" nominated files or directories."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2575
1753
msgid ""
1754
" Filenames are interpreted within their historical context. To log a\n"
1755
" deleted file, specify a revision range so that the file existed at\n"
1756
" the end or start of the range."
1757
msgstr ""
1758
1759
#: bzrlib/builtins.py:2579
1760
msgid ""
1761
" Historical context is also important when interpreting pathnames of\n"
1762
" renamed files/directories. Consider the following example:"
1763
msgstr ""
1764
1765
#: bzrlib/builtins.py:2582
1766
msgid ""
1767
" * revision 1: add tutorial.txt\n"
1768
" * revision 2: modify tutorial.txt\n"
1769
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:2586
1773
msgid " In this case:"
1774
msgstr " In diesem Fall:"
1775
1776
#: bzrlib/builtins.py:2588
1777
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:2590
1781
msgid ""
1782
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1783
msgstr ""
1784
1785
#: bzrlib/builtins.py:2592
1786
msgid ""
1787
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1788
" the original file in revision 2."
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:2595
1792
msgid ""
1793
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1794
" was no file called guide.txt in revision 2."
1795
msgstr ""
1796
1797
#: bzrlib/builtins.py:2598
1798
msgid ""
1799
" Renames are always followed by log. By design, there is no need to\n"
1800
" explicitly ask for this (and no way to stop logging a file back\n"
1801
" until it was last renamed)."
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:2602
1805
msgid ":Other filtering:"
1806
msgstr ":Anderes Filtern:"
1807
1808
#: bzrlib/builtins.py:2604
1809
msgid ""
1810
" The --match option can be used for finding revisions that match a\n"
1811
" regular expression in a commit message, committer, author or bug.\n"
1812
" Specifying the option several times will match any of the supplied\n"
1813
" expressions. --match-author, --match-bugs, --match-committer and\n"
1814
" --match-message can be used to only match a specific field."
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:2610
1818
msgid ":Tips & tricks:"
1819
msgstr ":Tipps & Tricks:"
1820
1821
#: bzrlib/builtins.py:2612
1822
msgid ""
1823
" GUI tools and IDEs are often better at exploring history than command\n"
1824
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1825
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1826
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1827
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1828
msgstr ""
1829
1830
#: bzrlib/builtins.py:2618
1831
msgid ""
1832
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1833
msgstr ""
1834
1835
#: bzrlib/builtins.py:2620
1836
msgid ""
1837
" [ALIASES]\n"
1838
" tip = log -r-1\n"
1839
" top = log -l10 --line\n"
1840
" show = log -v -p"
1841
msgstr ""
1842
1843
#: bzrlib/builtins.py:2625
1844
msgid ""
1845
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1846
" will show the last 10 mainline revisions. To see the details of a\n"
1847
" particular revision X, ``bzr show -rX``."
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:2629
1851
msgid ""
1852
" If you are interested in looking deeper into a particular merge X,\n"
1853
" use ``bzr log -n0 -rX``."
1854
msgstr ""
1855
1856
#: bzrlib/builtins.py:2632
1857
msgid ""
1858
" ``bzr log -v`` on a branch with lots of history is currently\n"
1859
" very slow. A fix for this issue is currently under development.\n"
1860
" With or without that fix, it is recommended that a revision range\n"
1861
" be given when using the -v option."
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:2637
1865
msgid ""
1866
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1867
" used to find revisions matching user names, commit messages, etc.\n"
1868
" Among other features, this plugin can find all revisions containing\n"
1869
" a list of words but not others."
1870
msgstr ""
1871
1872
#: bzrlib/builtins.py:2642
1873
msgid ""
1874
" When exploring non-mainline history on large projects with deep\n"
1875
" history, the performance of log can be greatly improved by installing\n"
1876
" the historycache plugin. This plugin buffers historical information\n"
1877
" trading disk space for faster speed."
1878
msgstr ""
1879
1880
#: bzrlib/builtins.py:2651
1881
msgid "Show from oldest to newest."
1882
msgstr ""
1883
1884
#: bzrlib/builtins.py:2654
1885
msgid "Show files changed in each revision."
1886
msgstr ""
1887
1888
#: bzrlib/builtins.py:2660
1889
msgid "Show just the specified revision. See also \"help revisionspec\"."
1890
msgstr ""
1891
1892
#: bzrlib/builtins.py:2664
1893
msgid "What names to list as authors - first, all or committer."
1894
msgstr ""
1895
1896
#: bzrlib/builtins.py:2665
1897
msgid "Authors"
1898
msgstr "Autoren"
1899
1900
#: bzrlib/builtins.py:2670
1901
msgid "Number of levels to display - 0 for all, 1 for flat."
1902
msgstr ""
1903
1904
#: bzrlib/builtins.py:2680
1905
msgid "Limit the output to the first N revisions."
1906
msgstr ""
1907
1908
#: bzrlib/builtins.py:2685
1909
msgid "Show changes made in each revision as a patch."
1910
msgstr ""
1911
1912
#: bzrlib/builtins.py:2687
1913
msgid "Show merged revisions like --levels 0 does."
1914
msgstr ""
1915
1916
#: bzrlib/builtins.py:2691
1917
msgid "Do not report commits with more than one parent."
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:2693
1921
msgid ""
1922
"Display only the revisions that are not part of both ancestries (require -"
1923
"rX..Y)."
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:2697
1927
msgid "Show digital signature validity."
1928
msgstr ""
1929
1930
#: bzrlib/builtins.py:2700
1931
msgid "Show revisions whose properties match this expression."
1932
msgstr ""
1933
1934
#: bzrlib/builtins.py:2704
1935
msgid "Show revisions whose message matches this expression."
1936
msgstr ""
1937
1938
#: bzrlib/builtins.py:2708
1939
msgid "Show revisions whose committer matches this expression."
1940
msgstr ""
1941
1942
#: bzrlib/builtins.py:2712
1943
msgid "Show revisions whose authors match this expression."
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:2716
1947
msgid "Show revisions whose bugs match this expression."
1948
msgstr ""
1949
1950
#: bzrlib/builtins.py:2770
1951
msgid "--exclude-common-ancestry requires -r with two revisions"
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:2798
1955
#, python-format
1956
msgid "Path unknown at end or start of revision range: %s"
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:2915
1960
#, python-format
1961
msgid "bzr %s doesn't accept two revisions in different branches."
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:2931
1965
#, python-format
1966
msgid "bzr %s --revision takes one or two values."
1967
msgstr ""
1968
1969
#: bzrlib/builtins.py:2976
1970
msgid ""
1971
"List files in a tree.\n"
1972
" "
1973
msgstr ""
1974
1975
#: bzrlib/builtins.py:2985
1976
msgid "Recurse into subdirectories."
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:2987
1980
msgid "Print paths relative to the root of the branch."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:2989
1984
msgid "Print unknown files."
1985
msgstr "Unbekannte Dateien ausgeben."
1986
1987
#: bzrlib/builtins.py:2990
1988
msgid "Print versioned files."
1989
msgstr "Versionierte Dateien ausgeben."
1990
1991
#: bzrlib/builtins.py:2993
1992
msgid "Print ignored files."
1993
msgstr "Ignorierte Dateien ausgeben."
1994
1995
#: bzrlib/builtins.py:2995
1996
msgid "List entries of a particular kind: file, directory, symlink."
1997
msgstr ""
1998
1999
#: bzrlib/builtins.py:3008
2000
msgid "invalid kind specified"
2001
msgstr ""
2002
2003
#: bzrlib/builtins.py:3011
2004
msgid "Cannot set both --verbose and --null"
2005
msgstr ""
2006
2007
#: bzrlib/builtins.py:3020
2008
msgid "cannot specify both --from-root and PATH"
2009
msgstr ""
2010
2011
#: bzrlib/builtins.py:3107
2012
msgid "Ignore specified files or patterns."
2013
msgstr ""
2014
2015
#: bzrlib/builtins.py:3109
2016
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3111
2020
msgid ""
2021
"If a .bzrignore file does not exist, the ignore command\n"
2022
"will create one and add the specified files or patterns to the newly\n"
2023
"created file. The ignore command will also automatically add the \n"
2024
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2025
"the use of the ignore command will require an explicit add command."
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3117
2029
msgid ""
2030
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2031
"After adding, editing or deleting that file either indirectly by\n"
2032
"using this command or directly by using an editor, be sure to commit\n"
2033
"it."
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3122
2037
msgid ""
2038
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2039
"the global ignore file can be found in the application data directory as\n"
2040
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2041
"Global ignores are not touched by this command. The global ignore file\n"
2042
"can be edited directly using an editor."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3128
2046
msgid ""
2047
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2048
"precedence over regular ignores. Such exceptions are used to specify\n"
2049
"files that should be versioned which would otherwise be ignored."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3132
2053
msgid ""
2054
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2055
"precedence over the '!' exception patterns."
2056
msgstr ""
2057
2058
#: bzrlib/builtins.py:3135
2059
msgid ""
2060
":Notes: \n"
2061
" \n"
2062
"* Ignore patterns containing shell wildcards must be quoted from\n"
2063
" the shell on Unix."
2064
msgstr ""
2065
2066
#: bzrlib/builtins.py:3140
2067
msgid ""
2068
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2069
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2070
msgstr ""
2071
2072
#: bzrlib/builtins.py:3143
2073
msgid ""
2074
":Examples:\n"
2075
" Ignore the top level Makefile::"
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3146
2079
msgid " bzr ignore ./Makefile"
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3148
2083
msgid " Ignore .class files in all directories...::"
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3150
2087
msgid " bzr ignore \"*.class\""
2088
msgstr ""
2089
2090
#: bzrlib/builtins.py:3152
2091
msgid " ...but do not ignore \"special.class\"::"
2092
msgstr ""
2093
2094
#: bzrlib/builtins.py:3154
2095
msgid " bzr ignore \"!special.class\""
2096
msgstr ""
2097
2098
#: bzrlib/builtins.py:3156
2099
msgid " Ignore files whose name begins with the \"#\" character::"
2100
msgstr ""
2101
2102
#: bzrlib/builtins.py:3158
2103
msgid " bzr ignore \"RE:^#\""
2104
msgstr " bzr ignore \"RE:^#\""
2105
2106
#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
2107
msgid " Ignore .o files under the lib directory::"
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3162
2111
msgid " bzr ignore \"lib/**/*.o\""
2112
msgstr " bzr ignore \"lib/**/*.o\""
2113
2114
#: bzrlib/builtins.py:3166
2115
msgid " bzr ignore \"RE:lib/.*\\.o\""
2116
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2117
2118
#: bzrlib/builtins.py:3168
2119
msgid " Ignore everything but the \"debian\" toplevel directory::"
2120
msgstr ""
2121
2122
#: bzrlib/builtins.py:3170
2123
msgid ""
2124
" bzr ignore \"RE:(?!debian/).*\"\n"
2125
" \n"
2126
" Ignore everything except the \"local\" toplevel directory,\n"
2127
" but always ignore autosave files ending in ~, even under local/::\n"
2128
" \n"
2129
" bzr ignore \"*\"\n"
2130
" bzr ignore \"!./local\"\n"
2131
" bzr ignore \"!!*~\""
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3184
2135
msgid "Display the default ignore rules that bzr uses."
2136
msgstr ""
2137
2138
#: bzrlib/builtins.py:3196
2139
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2140
msgstr ""
2141
2142
#: bzrlib/builtins.py:3207
2143
#, python-format
2144
msgid "Invalid ignore pattern found. %s"
2145
msgid_plural "Invalid ignore patterns found. %s"
2146
msgstr[0] "Ungültiges Ignorierungsmuster gefunden. %s"
2147
msgstr[1] "Ungültige Ignorierungsmuster gefunden. %s"
2148
2149
#: bzrlib/builtins.py:3216
2150
msgid "NAME_PATTERN should not be an absolute path"
2151
msgstr ""
2152
2153
#: bzrlib/builtins.py:3229
2154
#, python-format
2155
msgid ""
2156
"Warning: the following files are version controlled and match your ignore "
2157
"pattern:\n"
2158
"%s\n"
2159
"These files will continue to be version controlled unless you 'bzr remove' "
2160
"them.\n"
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3236
2164
msgid "List ignored files and the patterns that matched them."
2165
msgstr ""
2166
2167
#: bzrlib/builtins.py:3238
2168
msgid ""
2169
"List all the ignored files and the ignore pattern that caused the file to\n"
2170
"be ignored."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3241
2174
msgid "Alternatively, to list just the files::"
2175
msgstr "Alternativ, um nur die Dateien aufzulisten:"
2176
2177
#: bzrlib/builtins.py:3243
2178
msgid " bzr ls --ignored"
2179
msgstr " bzr ls --ignored"
2180
2181
#: bzrlib/builtins.py:3277
2182
#, python-format
2183
msgid "not a valid revision-number: %r"
2184
msgstr "Keine gültige Revisionsnummer: %r"
2185
2186
#: bzrlib/builtins.py:3284
2187
msgid ""
2188
"Export current or past revision to a destination directory or archive."
2189
msgstr ""
2190
2191
#: bzrlib/builtins.py:3286
2192
msgid "If no revision is specified this exports the last committed revision."
2193
msgstr ""
2194
2195
#: bzrlib/builtins.py:3288
2196
msgid ""
2197
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2198
"given, try to find the format with the extension. If no extension\n"
2199
"is found exports to a directory (equivalent to --format=dir)."
2200
msgstr ""
2201
2202
#: bzrlib/builtins.py:3292
2203
msgid ""
2204
"If root is supplied, it will be used as the root directory inside\n"
2205
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2206
"to the exported filename. The root option has no effect for 'dir' format."
2207
msgstr ""
2208
2209
#: bzrlib/builtins.py:3296
2210
msgid ""
2211
"If branch is omitted then the branch containing the current working\n"
2212
"directory will be used."
2213
msgstr ""
2214
2215
#: bzrlib/builtins.py:3299
2216
msgid ""
2217
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2218
msgstr ""
2219
2220
#: bzrlib/builtins.py:3301
2221
msgid ""
2222
" ================= =========================\n"
2223
" Supported formats Autodetected by extension\n"
2224
" ================= =========================\n"
2225
" dir (none)\n"
2226
" tar .tar\n"
2227
" tbz2 .tar.bz2, .tbz2\n"
2228
" tgz .tar.gz, .tgz\n"
2229
" zip .zip\n"
2230
" ================= ========================="
2231
msgstr ""
2232
2233
#: bzrlib/builtins.py:3315
2234
msgid "Type of file to export to."
2235
msgstr "Art der Datei, in die exportiert wird."
2236
2237
#: bzrlib/builtins.py:3318
2238
msgid "Apply content filters to export the convenient form."
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3322
2242
msgid "Name of the root directory inside the exported file."
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3324
2246
msgid ""
2247
"Set modification time of files to that of the last revision in which it was "
2248
"changed."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3327
2252
msgid ""
2253
"Export the working tree contents rather than that of the last revision."
2254
msgstr ""
2255
2256
#: bzrlib/builtins.py:3346
2257
msgid "--uncommitted requires a working tree"
2258
msgstr ""
2259
2260
#: bzrlib/builtins.py:3355
2261
#, python-format
2262
msgid "Unsupported export format: %s"
2263
msgstr "Nicht unterstütztes Export-Format: %s"
2264
2265
#: bzrlib/builtins.py:3359
2266
msgid ""
2267
"Write the contents of a file as of a given revision to standard output."
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3361
2271
msgid "If no revision is nominated, the last revision is used."
2272
msgstr ""
2273
"Wenn keine Revision bestimmt wurde, wird die neueste Revision benutzt."
2274
2275
#: bzrlib/builtins.py:3363
2276
msgid ""
2277
"Note: Take care to redirect standard output when using this command on a\n"
2278
"binary file."
2279
msgstr ""
2280
2281
#: bzrlib/builtins.py:3369
2282
msgid "The path name in the old tree."
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:3370
2286
msgid "Apply content filters to display the convenience form."
2287
msgstr ""
2288
2289
#: bzrlib/builtins.py:3381
2290
msgid "bzr cat --revision takes exactly one revision specifier"
2291
msgstr ""
2292
2293
#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
2294
msgid "{0!r} is not present in revision {1}"
2295
msgstr "{0!r} ist in Revision {1} nicht vorhanden"
2296
2297
#: bzrlib/builtins.py:3441
2298
msgid "Commit changes into a new revision."
2299
msgstr ""
2300
2301
#: bzrlib/builtins.py:3443
2302
msgid ""
2303
"An explanatory message needs to be given for each commit. This is\n"
2304
"often done by using the --message option (getting the message from the\n"
2305
"command line) or by using the --file option (getting the message from\n"
2306
"a file). If neither of these options is given, an editor is opened for\n"
2307
"the user to enter the message. To see the changed files in the\n"
2308
"boilerplate text loaded into the editor, use the --show-diff option."
2309
msgstr ""
2310
2311
#: bzrlib/builtins.py:3450
2312
msgid ""
2313
"By default, the entire tree is committed and the person doing the\n"
2314
"commit is assumed to be the author. These defaults can be overridden\n"
2315
"as explained below."
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3454
2319
msgid ":Selective commits:"
2320
msgstr ""
2321
2322
#: bzrlib/builtins.py:3456
2323
msgid ""
2324
" If selected files are specified, only changes to those files are\n"
2325
" committed. If a directory is specified then the directory and\n"
2326
" everything within it is committed."
2327
msgstr ""
2328
2329
#: bzrlib/builtins.py:3460
2330
msgid ""
2331
" When excludes are given, they take precedence over selected files.\n"
2332
" For example, to commit only changes within foo, but not changes\n"
2333
" within foo/bar::"
2334
msgstr ""
2335
2336
#: bzrlib/builtins.py:3464
2337
msgid " bzr commit foo -x foo/bar"
2338
msgstr ""
2339
2340
#: bzrlib/builtins.py:3466
2341
msgid " A selective commit after a merge is not yet supported."
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3468
2345
msgid ":Custom authors:"
2346
msgstr ":Benutzerdefinierte Autoren:"
2347
2348
#: bzrlib/builtins.py:3470
2349
msgid ""
2350
" If the author of the change is not the same person as the committer,\n"
2351
" you can specify the author's name using the --author option. The\n"
2352
" name should be in the same format as a committer-id, e.g.\n"
2353
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2354
" the change you can specify the option multiple times, once for each\n"
2355
" author."
2356
msgstr ""
2357
2358
#: bzrlib/builtins.py:3477
2359
msgid ":Checks:"
2360
msgstr ":Prüfungen:"
2361
2362
#: bzrlib/builtins.py:3479
2363
msgid ""
2364
" A common mistake is to forget to add a new file or directory before\n"
2365
" running the commit command. The --strict option checks for unknown\n"
2366
" files and aborts the commit if any are found. More advanced pre-commit\n"
2367
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2368
" for details."
2369
msgstr ""
2370
2371
#: bzrlib/builtins.py:3485
2372
msgid ":Things to note:"
2373
msgstr ":Dinge, die zu beachten sind:"
2374
2375
#: bzrlib/builtins.py:3487
2376
msgid ""
2377
" If you accidentially commit the wrong changes or make a spelling\n"
2378
" mistake in the commit message say, you can use the uncommit command\n"
2379
" to undo it. See ``bzr help uncommit`` for details."
2380
msgstr ""
2381
2382
#: bzrlib/builtins.py:3491
2383
msgid ""
2384
" Hooks can also be configured to run after a commit. This allows you\n"
2385
" to trigger updates to external systems like bug trackers. The --fixes\n"
2386
" option can be used to record the association between a revision and\n"
2387
" one or more bugs. See ``bzr help bugs`` for details."
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:3501
2391
msgid "Do not consider changes made to a given path."
2392
msgstr ""
2393
2394
#: bzrlib/builtins.py:3504
2395
msgid "Description of the new revision."
2396
msgstr "Beschreibung der neuen Revision."
2397
2398
#: bzrlib/builtins.py:3507
2399
msgid "Commit even if nothing has changed."
2400
msgstr ""
2401
2402
#: bzrlib/builtins.py:3511
2403
msgid "Take commit message from this file."
2404
msgstr ""
2405
2406
#: bzrlib/builtins.py:3513
2407
msgid "Refuse to commit if there are unknown files in the working tree."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3516
2411
msgid ""
2412
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2413
"08:00:00 +0100'."
2414
msgstr ""
2415
2416
#: bzrlib/builtins.py:3519
2417
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2418
msgstr ""
2419
2420
#: bzrlib/builtins.py:3522
2421
msgid "Set the author's name, if it's different from the committer."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3525
2425
msgid ""
2426
"Perform a local commit in a bound branch. Local commits are not pushed to "
2427
"the master branch until a normal commit is performed."
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3531
2431
msgid ""
2432
"When no message is supplied, show the diff along with the status summary in "
2433
"the message editor."
2434
msgstr ""
2435
2436
#: bzrlib/builtins.py:3534
2437
msgid ""
2438
"When committing to a foreign version control system do not push data that "
2439
"can not be natively represented."
2440
msgstr ""
2441
2442
#: bzrlib/builtins.py:3552
2443
#, python-format
2444
msgid ""
2445
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2446
"default bug tracker using the `bugtracker` option.\n"
2447
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3561
2451
#, python-format
2452
msgid ""
2453
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2454
"for more information on this feature.\n"
2455
"Commit refused."
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3570
2459
#, python-format
2460
msgid "Unrecognized bug %s. Commit refused."
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3573
2464
#, python-format
2465
msgid ""
2466
"%s\n"
2467
"Commit refused."
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3597
2471
msgid "Could not parse --commit-time: "
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3637
2475
msgid "please specify either --message or --file"
2476
msgstr "Bitte geben Sie entweder --message oder --file an"
2477
2478
#: bzrlib/builtins.py:3666
2479
msgid "please specify a commit message with either --message or --file"
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3669
2483
msgid ""
2484
"Empty commit message specified. Please specify a commit message with either -"
2485
"-message or --file or leave a blank message with --message \"\"."
2486
msgstr ""
2487
2488
#: bzrlib/builtins.py:3689
2489
msgid ""
2490
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2491
"-unchanged to force an empty commit."
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3693
2495
msgid ""
2496
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2497
"resolve FILE\" to resolve."
2498
msgstr ""
2499
2500
#: bzrlib/builtins.py:3697
2501
msgid "Commit refused because there are unknown files in the working tree."
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3700
2505
msgid ""
2506
"\n"
2507
"To commit to master branch, run update and then commit.\n"
2508
"You can also pass --local to commit to continue working disconnected."
2509
msgstr ""
2510
2511
#: bzrlib/builtins.py:3708
2512
msgid ""
2513
"Validate working tree structure, branch consistency and repository history."
2514
msgstr ""
2515
2516
#: bzrlib/builtins.py:3710
2517
msgid ""
2518
"This command checks various invariants about branch and repository storage\n"
2519
"to detect data corruption or bzr bugs."
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3713
2523
msgid ""
2524
"The working tree and branch checks will only give output if a problem is\n"
2525
"detected. The output fields of the repository check are:"
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3716
2529
msgid ""
2530
"revisions\n"
2531
" This is just the number of revisions checked. It doesn't\n"
2532
" indicate a problem."
2533
msgstr ""
2534
2535
#: bzrlib/builtins.py:3720
2536
msgid ""
2537
"versionedfiles\n"
2538
" This is just the number of versionedfiles checked. It\n"
2539
" doesn't indicate a problem."
2540
msgstr ""
2541
2542
#: bzrlib/builtins.py:3724
2543
msgid ""
2544
"unreferenced ancestors\n"
2545
" Texts that are ancestors of other texts, but\n"
2546
" are not properly referenced by the revision ancestry. This is a\n"
2547
" subtle problem that Bazaar can work around."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3729
2551
msgid ""
2552
"unique file texts\n"
2553
" This is the total number of unique file contents\n"
2554
" seen in the checked revisions. It does not indicate a problem."
2555
msgstr ""
2556
2557
#: bzrlib/builtins.py:3733
2558
msgid ""
2559
"repeated file texts\n"
2560
" This is the total number of repeated texts seen\n"
2561
" in the checked revisions. Texts can be repeated when their file\n"
2562
" entries are modified, but the file contents are not. It does not\n"
2563
" indicate a problem."
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:3739
2567
msgid ""
2568
"If no restrictions are specified, all Bazaar data that is found at the "
2569
"given\n"
2570
"location will be checked."
2571
msgstr ""
2572
2573
#: bzrlib/builtins.py:3744
2574
msgid " Check the tree and branch at 'foo'::"
2575
msgstr ""
2576
2577
#: bzrlib/builtins.py:3746
2578
msgid " bzr check --tree --branch foo"
2579
msgstr ""
2580
2581
#: bzrlib/builtins.py:3748
2582
msgid " Check only the repository at 'bar'::"
2583
msgstr ""
2584
2585
#: bzrlib/builtins.py:3750
2586
msgid " bzr check --repo bar"
2587
msgstr ""
2588
2589
#: bzrlib/builtins.py:3752
2590
msgid " Check everything at 'baz'::"
2591
msgstr ""
2592
2593
#: bzrlib/builtins.py:3754
2594
msgid " bzr check baz"
2595
msgstr ""
2596
2597
#: bzrlib/builtins.py:3760
2598
msgid "Check the branch related to the current directory."
2599
msgstr ""
2600
2601
#: bzrlib/builtins.py:3762
2602
msgid "Check the repository related to the current directory."
2603
msgstr ""
2604
2605
#: bzrlib/builtins.py:3764
2606
msgid "Check the working tree related to the current directory."
2607
msgstr ""
2608
2609
#: bzrlib/builtins.py:3778
2610
msgid "Upgrade a repository, branch or working tree to a newer format."
2611
msgstr ""
2612
2613
#: bzrlib/builtins.py:3780
2614
msgid ""
2615
"When the default format has changed after a major new release of\n"
2616
"Bazaar, you may be informed during certain operations that you\n"
2617
"should upgrade. Upgrading to a newer format may improve performance\n"
2618
"or make new features available. It may however limit interoperability\n"
2619
"with older repositories or with older versions of Bazaar."
2620
msgstr ""
2621
2622
#: bzrlib/builtins.py:3786
2623
msgid ""
2624
"If you wish to upgrade to a particular format rather than the\n"
2625
"current default, that can be specified using the --format option.\n"
2626
"As a consequence, you can use the upgrade command this way to\n"
2627
"\"downgrade\" to an earlier format, though some conversions are\n"
2628
"a one way process (e.g. changing from the 1.x default to the\n"
2629
"2.x default) so downgrading is not always possible."
2630
msgstr ""
2631
2632
#: bzrlib/builtins.py:3793
2633
msgid ""
2634
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2635
"process (where # is a number). By default, this is left there on\n"
2636
"completion. If the conversion fails, delete the new .bzr directory\n"
2637
"and rename this one back in its place. Use the --clean option to ask\n"
2638
"for the backup.bzr directory to be removed on successful conversion.\n"
2639
"Alternatively, you can delete it by hand if everything looks good\n"
2640
"afterwards."
2641
msgstr ""
2642
2643
#: bzrlib/builtins.py:3801
2644
msgid ""
2645
"If the location given is a shared repository, dependent branches\n"
2646
"are also converted provided the repository converts successfully.\n"
2647
"If the conversion of a branch fails, remaining branches are still\n"
2648
"tried."
2649
msgstr ""
2650
2651
#: bzrlib/builtins.py:3806
2652
msgid ""
2653
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2654
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:3814
2658
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2659
msgstr ""
2660
2661
#: bzrlib/builtins.py:3818
2662
msgid "Branch format"
2663
msgstr "Format des Zweiges"
2664
2665
#: bzrlib/builtins.py:3820
2666
msgid "Remove the backup.bzr directory if successful."
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:3822
2670
msgid "Show what would be done, but don't actually do anything."
2671
msgstr "Nur zeigen, was getan werden würde, aber nichts wirklich machen."
2672
2673
#: bzrlib/builtins.py:3837
2674
msgid "Show or set bzr user id."
2675
msgstr ""
2676
2677
#: bzrlib/builtins.py:3839
2678
msgid ""
2679
":Examples:\n"
2680
" Show the email of the current user::"
2681
msgstr ""
2682
":Beispiele:\n"
2683
" Die E-Mail-Adresse des aktuellen Benutzers zeigen::"
2684
2685
#: bzrlib/builtins.py:3842
2686
msgid " bzr whoami --email"
2687
msgstr " bzr whoami --email"
2688
2689
#: bzrlib/builtins.py:3844
2690
msgid " Set the current user::"
2691
msgstr " Aktuellen Benutzer festlegen::"
2692
2693
#: bzrlib/builtins.py:3846
2694
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2695
msgstr " bzr whoami \"Frank Chu <ich@beispiel.de>\""
2696
2697
#: bzrlib/builtins.py:3850
2698
msgid "Display email address only."
2699
msgstr "Nur die E-Mail-Adresse anzeigen."
2700
2701
#: bzrlib/builtins.py:3852
2702
msgid "Set identity for the current branch instead of globally."
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:3878
2706
msgid "--email can only be used to display existing identity"
2707
msgstr ""
2708
2709
#: bzrlib/builtins.py:3902
2710
msgid "Print or set the branch nickname."
2711
msgstr ""
2712
2713
#: bzrlib/builtins.py:3904
2714
msgid ""
2715
"If unset, the colocated branch name is used for colocated branches, and\n"
2716
"the branch directory name is used for other branches. To print the\n"
2717
"current nickname, execute with no argument."
2718
msgstr ""
2719
2720
#: bzrlib/builtins.py:3908
2721
msgid ""
2722
"Bound branches use the nickname of its master branch unless it is set\n"
2723
"locally."
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:3928
2727
msgid "Set/unset and display aliases."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:3930
2731
msgid ""
2732
":Examples:\n"
2733
" Show the current aliases::"
2734
msgstr ""
2735
":Beispiele:\n"
2736
" Die aktuellen Aliase zeigen::"
2737
2738
#: bzrlib/builtins.py:3933
2739
msgid " bzr alias"
2740
msgstr " bzr alias"
2741
2742
#: bzrlib/builtins.py:3935
2743
msgid " Show the alias specified for 'll'::"
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:3937
2747
msgid " bzr alias ll"
2748
msgstr " bzr alias ll"
2749
2750
#: bzrlib/builtins.py:3939
2751
msgid " Set an alias for 'll'::"
2752
msgstr ""
2753
2754
#: bzrlib/builtins.py:3941
2755
msgid " bzr alias ll=\"log --line -r-10..-1\""
2756
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2757
2758
#: bzrlib/builtins.py:3943
2759
msgid " To remove an alias for 'll'::"
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:3945
2763
msgid " bzr alias --remove ll"
2764
msgstr " bzr alias --remove ll"
2765
2766
#: bzrlib/builtins.py:3950
2767
msgid "Remove the alias."
2768
msgstr "Den Alias entfernen."
2769
2770
#: bzrlib/builtins.py:3968
2771
msgid "bzr alias --remove expects an alias to remove."
2772
msgstr "bzr alias --remove erwartet einen Alias zum Entfernen."
2773
2774
#: bzrlib/builtins.py:4149
2775
msgid ""
2776
"subunit not available. subunit needs to be installed to use --subunit."
2777
msgstr ""
2778
2779
#: bzrlib/builtins.py:4166
2780
msgid ""
2781
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4213
2785
msgid "Show version of bzr."
2786
msgstr "Version von bzr anzeigen."
2787
2788
#: bzrlib/builtins.py:4217
2789
msgid "Print just the version number."
2790
msgstr "Nur die Versionsnummer ausgeben."
2791
2792
#: bzrlib/builtins.py:4236
2793
msgid "It sure does!\n"
2794
msgstr ""
2795
2796
#: bzrlib/builtins.py:4260
2797
#, python-format
2798
msgid "merge base is revision %s\n"
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4264
2802
msgid "Perform a three-way merge."
2803
msgstr ""
2804
2805
#: bzrlib/builtins.py:4266
2806
msgid ""
2807
"The source of the merge can be specified either in the form of a branch,\n"
2808
"or in the form of a path to a file containing a merge directive generated\n"
2809
"with bzr send. If neither is specified, the default is the upstream branch\n"
2810
"or the branch most recently merged using --remember. The source of the\n"
2811
"merge may also be specified in the form of a path to a file in another\n"
2812
"branch: in this case, only the modifications to that file are merged into\n"
2813
"the current working tree."
2814
msgstr ""
2815
2816
#: bzrlib/builtins.py:4274
2817
msgid ""
2818
"When merging from a branch, by default bzr will try to merge in all new\n"
2819
"work from the other branch, automatically determining an appropriate base\n"
2820
"revision. If this fails, you may need to give an explicit base."
2821
msgstr ""
2822
2823
#: bzrlib/builtins.py:4278
2824
msgid ""
2825
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2826
"try to merge in all new work up to and including revision OTHER."
2827
msgstr ""
2828
2829
#: bzrlib/builtins.py:4281
2830
msgid ""
2831
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2832
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2833
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2834
"not already contain revision BASE, such a merge is commonly referred to as\n"
2835
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2836
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2837
"changes from the other branch is not stored in the commit."
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4289
2841
msgid "Revision numbers are always relative to the source branch."
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2845
msgid ""
2846
"Merge will do its best to combine the changes in two branches, but there\n"
2847
"are some kinds of problems only a human can fix. When it encounters those,\n"
2848
"it will mark a conflict. A conflict means that you need to fix something,\n"
2849
"before you can commit."
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4296
2853
msgid ""
2854
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2855
msgstr ""
2856
2857
#: bzrlib/builtins.py:4298
2858
msgid ""
2859
"If there is no default branch set, the first merge will set it (use\n"
2860
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2861
"to use the default. To change the default, use --remember. The value will\n"
2862
"only be saved if the remote location can be accessed."
2863
msgstr ""
2864
2865
#: bzrlib/builtins.py:4303
2866
msgid ""
2867
"The results of the merge are placed into the destination working\n"
2868
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2869
"committed to record the result of the merge."
2870
msgstr ""
2871
2872
#: bzrlib/builtins.py:4307
2873
msgid ""
2874
"merge refuses to run if there are any uncommitted changes, unless\n"
2875
"--force is given. If --force is given, then the changes from the source \n"
2876
"will be merged with the current working tree, including any uncommitted\n"
2877
"changes in the tree. The --force option can also be used to create a\n"
2878
"merge revision which has more than two parents."
2879
msgstr ""
2880
2881
#: bzrlib/builtins.py:4313
2882
msgid ""
2883
"If one would like to merge changes from the working tree of the other\n"
2884
"branch without merging any committed revisions, the --uncommitted option\n"
2885
"can be given."
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4317
2889
msgid ""
2890
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2891
"you to apply each diff hunk and file change, similar to \"shelve\"."
2892
msgstr ""
2893
2894
#: bzrlib/builtins.py:4320
2895
msgid ""
2896
":Examples:\n"
2897
" To merge all new revisions from bzr.dev::"
2898
msgstr ""
2899
2900
#: bzrlib/builtins.py:4323
2901
msgid " bzr merge ../bzr.dev"
2902
msgstr " bzr merge ../bzr.dev"
2903
2904
#: bzrlib/builtins.py:4325
2905
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2906
msgstr ""
2907
2908
#: bzrlib/builtins.py:4327
2909
msgid " bzr merge -r 82 ../bzr.dev"
2910
msgstr " bzr merge -r 82 ../bzr.dev"
2911
2912
#: bzrlib/builtins.py:4329
2913
msgid " To merge the changes introduced by 82, without previous changes::"
2914
msgstr ""
2915
2916
#: bzrlib/builtins.py:4331
2917
msgid " bzr merge -r 81..82 ../bzr.dev"
2918
msgstr " bzr merge -r 81..82 ../bzr.dev"
2919
2920
#: bzrlib/builtins.py:4333
2921
msgid " To apply a merge directive contained in /tmp/merge::"
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:4335
2925
msgid " bzr merge /tmp/merge"
2926
msgstr " bzr merge /tmp/merge"
2927
2928
#: bzrlib/builtins.py:4337
2929
msgid ""
2930
" To create a merge revision with three parents from two branches\n"
2931
" feature1a and feature1b:"
2932
msgstr ""
2933
2934
#: bzrlib/builtins.py:4340
2935
msgid ""
2936
" bzr merge ../feature1a\n"
2937
" bzr merge ../feature1b --force\n"
2938
" bzr commit -m 'revision with three parents'"
2939
msgstr ""
2940
2941
#: bzrlib/builtins.py:4352
2942
msgid "Merge even if the destination tree has uncommitted changes."
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4358
2946
msgid ""
2947
"Apply uncommitted changes from a working copy, instead of branch changes."
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4360
2951
msgid ""
2952
"If the destination is already completely merged into the source, pull from "
2953
"the source rather than merging. When this happens, you do not need to "
2954
"commit the result."
2955
msgstr ""
2956
2957
#: bzrlib/builtins.py:4365
2958
msgid ""
2959
"Branch to merge into, rather than the one containing the working directory."
2960
msgstr ""
2961
2962
#: bzrlib/builtins.py:4367
2963
msgid "Instead of merging, show a diff of the merge."
2964
msgstr ""
2965
2966
#: bzrlib/builtins.py:4369
2967
msgid "Select changes interactively."
2968
msgstr "Änderungen interaktiv auswählen."
2969
2970
#: bzrlib/builtins.py:4391
2971
msgid ""
2972
"Merging into empty branches not currently supported, "
2973
"https://bugs.launchpad.net/bzr/+bug/308562"
2974
msgstr ""
2975
2976
#: bzrlib/builtins.py:4418
2977
msgid "Cannot use --uncommitted with bundles or merge directives."
2978
msgstr ""
2979
2980
#: bzrlib/builtins.py:4429
2981
msgid "Cannot use --uncommitted and --revision at the same time."
2982
msgstr ""
2983
2984
#: bzrlib/builtins.py:4449
2985
msgid "merger: "
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
2989
msgid "Nothing to do."
2990
msgstr "Nichts zu tun."
2991
2992
#: bzrlib/builtins.py:4455
2993
msgid "Cannot pull individual files"
2994
msgstr "Nicht möglich, einzelne Dateien zu laden"
2995
2996
#: bzrlib/builtins.py:4463
2997
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2998
msgstr ""
2999
3000
#: bzrlib/builtins.py:4521
3001
#, python-format
3002
msgid "Show-base is not supported for this merge type. %s"
3003
msgstr ""
3004
3005
#: bzrlib/builtins.py:4530
3006
#, python-format
3007
msgid "Conflict reduction is not supported for merge type %s."
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4534
3011
msgid "Cannot do conflict reduction and show base."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4645
3015
msgid "No location specified or remembered"
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4647
3019
msgid "{0} remembered {1} location {2}"
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4653
3023
msgid "Redo a merge."
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:4655
3027
msgid ""
3028
"Use this if you want to try a different merge technique while resolving\n"
3029
"conflicts. Some merge techniques are better than others, and remerge\n"
3030
"lets you try different ones on different files."
3031
msgstr ""
3032
3033
#: bzrlib/builtins.py:4659
3034
msgid ""
3035
"The options for remerge have the same meaning and defaults as the ones for\n"
3036
"merge. The difference is that remerge can (only) be run when there is a\n"
3037
"pending merge, and it lets you specify particular files."
3038
msgstr ""
3039
3040
#: bzrlib/builtins.py:4663
3041
msgid ""
3042
":Examples:\n"
3043
" Re-do the merge of all conflicted files, and show the base text in\n"
3044
" conflict regions, in addition to the usual THIS and OTHER texts::"
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:4667
3048
msgid " bzr remerge --show-base"
3049
msgstr " bzr remerge --show-base"
3050
3051
#: bzrlib/builtins.py:4669
3052
msgid ""
3053
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3054
" additional processing to reduce the size of conflict regions::"
3055
msgstr ""
3056
3057
#: bzrlib/builtins.py:4672
3058
msgid " bzr remerge --merge-type weave --reprocess foobar"
3059
msgstr ""
3060
3061
#: bzrlib/builtins.py:4679
3062
msgid "Show base revision text in conflicts."
3063
msgstr ""
3064
3065
#: bzrlib/builtins.py:4691
3066
msgid ""
3067
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3068
"merges."
3069
msgstr ""
3070
3071
#: bzrlib/builtins.py:4749
3072
msgid ""
3073
"Set files in the working tree back to the contents of a previous revision."
3074
msgstr ""
3075
3076
#: bzrlib/builtins.py:4751
3077
msgid ""
3078
"Giving a list of files will revert only those files. Otherwise, all files\n"
3079
"will be reverted. If the revision is not specified with '--revision', the\n"
3080
"working tree basis revision is used. A revert operation affects only the\n"
3081
"working tree, not any revision history like the branch and repository or\n"
3082
"the working tree basis revision."
3083
msgstr ""
3084
3085
#: bzrlib/builtins.py:4757
3086
msgid ""
3087
"To remove only some changes, without reverting to a prior version, use\n"
3088
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3089
"will remove the changes introduced by the second last commit (-2), without\n"
3090
"affecting the changes introduced by the last commit (-1). To remove\n"
3091
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3092
"To update the branch to a specific revision or the latest revision and\n"
3093
"update the working tree accordingly while preserving local changes, see the\n"
3094
"update command."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:4766
3098
msgid ""
3099
"Uncommitted changes to files that are reverted will be discarded.\n"
3100
"Howver, by default, any files that have been manually changed will be\n"
3101
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3102
"files have '.~#~' appended to their name, where # is a number."
3103
msgstr ""
3104
3105
#: bzrlib/builtins.py:4771
3106
msgid ""
3107
"When you provide files, you can use their current pathname or the pathname\n"
3108
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3109
"name. If you name a directory, all the contents of that directory will be\n"
3110
"reverted."
3111
msgstr ""
3112
3113
#: bzrlib/builtins.py:4776
3114
msgid ""
3115
"If you have newly added files since the target revision, they will be\n"
3116
"removed. If the files to be removed have been changed, backups will be\n"
3117
"created as above. Directories containing unknown files will not be\n"
3118
"deleted."
3119
msgstr ""
3120
3121
#: bzrlib/builtins.py:4781
3122
msgid ""
3123
"The working tree contains a list of revisions that have been merged but\n"
3124
"not yet committed. These revisions will be included as additional parents\n"
3125
"of the next commit. Normally, using revert clears that list as well as\n"
3126
"reverting the files. If any files are specified, revert leaves the list\n"
3127
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3128
".`` in the tree root to revert all files but keep the recorded merges,\n"
3129
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3130
"reverting any files."
3131
msgstr ""
3132
3133
#: bzrlib/builtins.py:4790
3134
msgid ""
3135
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3136
"changes from a branch in a single revision. To do this, perform the merge\n"
3137
"as desired. Then doing revert with the \"--forget-merges\" option will "
3138
"keep\n"
3139
"the content of the tree as it was, but it will clear the list of pending\n"
3140
"merges. The next commit will then contain all of the changes that are\n"
3141
"present in the other branch, but without any other parent revisions.\n"
3142
"Because this technique forgets where these changes originated, it may\n"
3143
"cause additional conflicts on later merges involving the same source and\n"
3144
"target branches."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:4804
3148
msgid "Do not save backups of reverted files."
3149
msgstr "Keine Sicherungskopien von zurückgesetzten Dateien erstellen."
3150
3151
#: bzrlib/builtins.py:4806
3152
msgid "Remove pending merge marker, without changing any files."
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:4837
3156
msgid ""
3157
"Show help on a command or other topic.\n"
3158
" "
3159
msgstr ""
3160
"Hilfe zu einem Befehl oder Thema anzeigen.\n"
3161
" "
3162
3163
#: bzrlib/builtins.py:4842
3164
msgid "Show help on all commands."
3165
msgstr "Hilfe zu allen Befehlen anzeigen."
3166
3167
#: bzrlib/builtins.py:4871
3168
msgid "Show unmerged/unpulled revisions between two branches."
3169
msgstr ""
3170
3171
#: bzrlib/builtins.py:4873
3172
msgid "OTHER_BRANCH may be local or remote."
3173
msgstr ""
3174
3175
#: bzrlib/builtins.py:4875
3176
msgid ""
3177
"To filter on a range of revisions, you can use the command -r begin..end\n"
3178
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3179
"also valid.\n"
3180
" \n"
3181
":Exit values:\n"
3182
" 1 - some missing revisions\n"
3183
" 0 - no missing revisions"
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:4885
3187
msgid ""
3188
" Determine the missing revisions between this and the branch at the\n"
3189
" remembered pull location::"
3190
msgstr ""
3191
3192
#: bzrlib/builtins.py:4888
3193
msgid " bzr missing"
3194
msgstr " bzr missing"
3195
3196
#: bzrlib/builtins.py:4890
3197
msgid " Determine the missing revisions between this and another branch::"
3198
msgstr ""
3199
3200
#: bzrlib/builtins.py:4892
3201
msgid " bzr missing http://server/branch"
3202
msgstr ""
3203
3204
#: bzrlib/builtins.py:4894
3205
msgid ""
3206
" Determine the missing revisions up to a specific revision on the other\n"
3207
" branch::"
3208
msgstr ""
3209
3210
#: bzrlib/builtins.py:4897
3211
msgid " bzr missing -r ..-10"
3212
msgstr " bzr missing -r ..-10"
3213
3214
#: bzrlib/builtins.py:4899
3215
msgid ""
3216
" Determine the missing revisions up to a specific revision on this\n"
3217
" branch::"
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:4902
3221
msgid " bzr missing --my-revision ..-10"
3222
msgstr " bzr missing --my-revision ..-10"
3223
3224
#: bzrlib/builtins.py:4909
3225
msgid "Reverse the order of revisions."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:4911
3229
msgid "Display changes in the local branch only."
3230
msgstr "Nur Änderungen im lokalen Zweig anzeigen."
3231
3232
#: bzrlib/builtins.py:4912
3233
msgid "Same as --mine-only."
3234
msgstr "Dasselbe wie --mine-only."
3235
3236
#: bzrlib/builtins.py:4914
3237
msgid "Display changes in the remote branch only."
3238
msgstr "Nur Änderungen im entfernten Zweig anzeigen."
3239
3240
#: bzrlib/builtins.py:4915
3241
msgid "Same as --theirs-only."
3242
msgstr "Dasselbe wie --theirs-only."
3243
3244
#: bzrlib/builtins.py:4920
3245
msgid ""
3246
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3247
"details."
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:4924
3251
msgid ""
3252
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3253
"details."
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:4927
3257
msgid "Show all revisions in addition to the mainline ones."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:4981
3261
msgid "No peer location known or specified."
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:4985
3265
msgid "Using saved parent location: {0}\n"
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5018
3269
#, python-format
3270
msgid "You have %d extra revision:\n"
3271
msgid_plural "You have %d extra revisions:\n"
3272
msgstr[0] "Sie haben %d zusätzliche Revision:\n"
3273
msgstr[1] "Sie haben %d zusätzliche Revisionen:\n"
3274
3275
#: bzrlib/builtins.py:5038
3276
#, python-format
3277
msgid "You are missing %d revision:\n"
3278
msgid_plural "You are missing %d revisions:\n"
3279
msgstr[0] "Ihnen fehlt %d Revision:\n"
3280
msgstr[1] "Ihnen fehlen %d Revisionen:\n"
3281
3282
#: bzrlib/builtins.py:5053
3283
msgid "This branch has no new revisions.\n"
3284
msgstr "Dieser Zweig hat keine neuen Revisionen.\n"
3285
3286
#: bzrlib/builtins.py:5056
3287
msgid "Other branch has no new revisions.\n"
3288
msgstr "Anderer Zweig hat keine neuen Revisionen.\n"
3289
3290
#: bzrlib/builtins.py:5061
3291
msgid "Branches are up to date.\n"
3292
msgstr "Zweige sind aktuell.\n"
3293
3294
#: bzrlib/builtins.py:5072
3295
msgid "Compress the data within a repository."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:5074
3299
msgid ""
3300
"This operation compresses the data within a bazaar repository. As\n"
3301
"bazaar supports automatic packing of repository, this operation is\n"
3302
"normally not required to be done manually."
3303
msgstr ""
3304
3305
#: bzrlib/builtins.py:5078
3306
msgid ""
3307
"During the pack operation, bazaar takes a backup of existing repository\n"
3308
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3309
"automatically when it is safe to do so. To save disk space by removing\n"
3310
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3311
"used."
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:5084
3315
msgid ""
3316
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3317
"during or immediately after repacking, you may be left with a state\n"
3318
"where the deletion has been written to disk but the new packs have not\n"
3319
"been. In this case the repository may be unusable."
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:5093
3323
msgid "Delete obsolete packs to save disk space."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5107
3327
msgid "List the installed plugins."
3328
msgstr "Installierte Erweiterungen auflisten."
3329
3330
#: bzrlib/builtins.py:5109
3331
msgid ""
3332
"This command displays the list of installed plugins including\n"
3333
"version of plugin and a short description of each."
3334
msgstr ""
3335
3336
#: bzrlib/builtins.py:5112
3337
msgid "--verbose shows the path where each plugin is located."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:5114
3341
msgid ""
3342
"A plugin is an external component for Bazaar that extends the\n"
3343
"revision control system, by adding or replacing code in Bazaar.\n"
3344
"Plugins can do a variety of things, including overriding commands,\n"
3345
"adding new commands, providing additional network transports and\n"
3346
"customizing log output."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5120
3350
msgid ""
3351
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3352
"for further information on plugins including where to find them and how to\n"
3353
"install them. Instructions are also provided there on how to write new\n"
3354
"plugins using the Python programming language."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5136
3358
msgid "Show testament (signing-form) of a revision."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5139
3362
msgid "Produce long-format testament."
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5141
3366
msgid "Produce a strict-format testament."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5168
3370
msgid "Show the origin of each line in a file."
3371
msgstr "Ursprung jeder Zeile in einer Datei anzeigen."
3372
3373
#: bzrlib/builtins.py:5170
3374
msgid ""
3375
"This prints out the given file with an annotation on the left side\n"
3376
"indicating which revision, author and date introduced the change."
3377
msgstr ""
3378
3379
#: bzrlib/builtins.py:5173
3380
msgid ""
3381
"If the origin is the same for a run of consecutive lines, it is\n"
3382
"shown only at the top, unless the --all option is given."
3383
msgstr ""
3384
3385
#: bzrlib/builtins.py:5181
3386
msgid "Show annotations on all lines."
3387
msgstr ""
3388
3389
#: bzrlib/builtins.py:5182
3390
msgid "Show commit date in annotations."
3391
msgstr ""
3392
3393
#: bzrlib/builtins.py:5269
3394
msgid "Cannot sign a range of non-revision-history revisions"
3395
msgstr ""
3396
3397
#: bzrlib/builtins.py:5281
3398
msgid "Please supply either one revision, or a range."
3399
msgstr "Bitte geben Sie entweder eine Revision oder einen Bereich an."
3400
3401
#: bzrlib/builtins.py:5285
3402
msgid ""
3403
"Convert the current branch into a checkout of the supplied branch.\n"
3404
"If no branch is supplied, rebind to the last bound location."
3405
msgstr ""
3406
3407
#: bzrlib/builtins.py:5288
3408
msgid ""
3409
"Once converted into a checkout, commits must succeed on the master branch\n"
3410
"before they will be applied to the local branch."
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5291
3414
msgid ""
3415
"Bound branches use the nickname of its master branch unless it is set\n"
3416
"locally, in which case binding will update the local nickname to be\n"
3417
"that of the master."
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5306
3421
msgid "No location supplied. This format does not remember old locations."
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5312
3425
msgid "Branch is already bound"
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5315
3429
msgid "No location supplied and no previous location known"
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5321
3433
msgid "These branches have diverged. Try merging, and then bind again."
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5328
3437
msgid "Convert the current checkout into a regular branch."
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5330
3441
msgid ""
3442
"After unbinding, the local branch is considered independent and subsequent\n"
3443
"commits will be local only."
3444
msgstr ""
3445
3446
#: bzrlib/builtins.py:5341
3447
msgid "Local branch is not bound"
3448
msgstr ""
3449
3450
#: bzrlib/builtins.py:5345
3451
msgid "Remove the last committed revision."
3452
msgstr ""
3453
3454
#: bzrlib/builtins.py:5347
3455
msgid ""
3456
"--verbose will print out what is being removed.\n"
3457
"--dry-run will go through all the motions, but not actually\n"
3458
"remove anything."
3459
msgstr ""
3460
3461
#: bzrlib/builtins.py:5351
3462
msgid ""
3463
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3464
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3465
"branch at revision 15."
3466
msgstr ""
3467
3468
#: bzrlib/builtins.py:5355
3469
msgid ""
3470
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3471
"it may make is to restore any pending merges that were present before\n"
3472
"the commit."
3473
msgstr ""
3474
3475
#: bzrlib/builtins.py:5366
3476
msgid "Don't actually make changes."
3477
msgstr "Keine Änderungen durchführen."
3478
3479
#: bzrlib/builtins.py:5367
3480
msgid "Say yes to all questions."
3481
msgstr "Alle Fragen mit Ja beantworten."
3482
3483
#: bzrlib/builtins.py:5369
3484
msgid "Keep tags that point to removed revisions."
3485
msgstr ""
3486
3487
#: bzrlib/builtins.py:5371
3488
msgid "Only remove the commits from the local branch when in a checkout."
3489
msgstr ""
3490
3491
#: bzrlib/builtins.py:5420
3492
msgid "No revisions to uncommit.\n"
3493
msgstr ""
3494
3495
#: bzrlib/builtins.py:5435
3496
msgid "Dry-run, pretending to remove the above revisions.\n"
3497
msgstr ""
3498
"Testlauf, es wird so getan, als ob die obigen Revisionen entfernt würden.\n"
3499
3500
#: bzrlib/builtins.py:5438
3501
msgid "The above revision(s) will be removed.\n"
3502
msgstr "Oben stehende Revision(en) wird/werden entfernt.\n"
3503
3504
#: bzrlib/builtins.py:5442
3505
msgid "Uncommit these revisions"
3506
msgstr ""
3507
3508
#: bzrlib/builtins.py:5445
3509
msgid "Canceled\n"
3510
msgstr "Abgebrochen\n"
3511
3512
#: bzrlib/builtins.py:5452
3513
#, python-format
3514
msgid ""
3515
"You can restore the old tip by running:\n"
3516
" bzr pull . -r revid:%s\n"
3517
msgstr ""
3518
3519
#: bzrlib/builtins.py:5457
3520
msgid "Break a dead lock."
3521
msgstr ""
3522
3523
#: bzrlib/builtins.py:5459
3524
msgid ""
3525
"This command breaks a lock on a repository, branch, working directory or\n"
3526
"config file."
3527
msgstr ""
3528
3529
#: bzrlib/builtins.py:5462
3530
msgid ""
3531
"CAUTION: Locks should only be broken when you are sure that the process\n"
3532
"holding the lock has been stopped."
3533
msgstr ""
3534
3535
#: bzrlib/builtins.py:5465
3536
msgid ""
3537
"You can get information on what locks are open via the 'bzr info\n"
3538
"[location]' command."
3539
msgstr ""
3540
3541
#: bzrlib/builtins.py:5468
3542
msgid ""
3543
":Examples:\n"
3544
" bzr break-lock\n"
3545
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3546
" bzr break-lock --conf ~/.bazaar"
3547
msgstr ""
3548
3549
#: bzrlib/builtins.py:5477
3550
msgid "LOCATION is the directory where the config lock is."
3551
msgstr ""
3552
3553
#: bzrlib/builtins.py:5479
3554
msgid "Do not ask for confirmation before breaking the lock."
3555
msgstr ""
3556
3557
#: bzrlib/builtins.py:5514
3558
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3559
msgstr "Das Bazaar-Smart-Server-Protokoll via TCP. (Vorgabe-Port: 4155)"
3560
3561
#: bzrlib/builtins.py:5515
3562
msgid "Run the bzr server."
3563
msgstr "Den bzr-Server starten."
3564
3565
#: bzrlib/builtins.py:5521
3566
msgid "Serve on stdin/out for use from inetd or sshd."
3567
msgstr ""
3568
3569
#: bzrlib/builtins.py:5522
3570
msgid "protocol"
3571
msgstr "Protokoll"
3572
3573
#: bzrlib/builtins.py:5523
3574
msgid "Protocol to serve."
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5527
3578
msgid "Listen for connections on nominated address."
3579
msgstr "An den angegebenen Adressen auf Verbindungen lauschen."
3580
3581
#: bzrlib/builtins.py:5529
3582
msgid ""
3583
"Listen for connections on nominated port. Passing 0 as the port number will "
3584
"result in a dynamically allocated port. The default port depends on the "
3585
"protocol."
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5534
3589
msgid "Serve contents of this directory."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5536
3593
msgid ""
3594
"By default the server is a readonly server. Supplying --allow-writes "
3595
"enables write access to the contents of the served directory and below. "
3596
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3597
"of external authentication is arranged supplying this option leads to global "
3598
"uncontrolled write access to your file system."
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5545
3602
msgid "Override the default idle client timeout (5min)."
3603
msgstr ""
3604
3605
#: bzrlib/builtins.py:5563
3606
msgid "Combine a tree into its containing tree."
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5565
3610
msgid "This command requires the target tree to be in a rich-root format."
3611
msgstr ""
3612
3613
#: bzrlib/builtins.py:5567
3614
msgid ""
3615
"The TREE argument should be an independent tree, inside another tree, but\n"
3616
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3617
"running \"bzr branch\" with the target inside a tree.)"
3618
msgstr ""
3619
3620
#: bzrlib/builtins.py:5571
3621
msgid ""
3622
"The result is a combined tree, with the subtree no longer an independent\n"
3623
"part. This is marked as a merge of the subtree into the containing tree,\n"
3624
"and all history is preserved."
3625
msgstr ""
3626
3627
#: bzrlib/builtins.py:5589
3628
#, python-format
3629
msgid ""
3630
"Can't join trees because %s doesn't support rich root data.\n"
3631
"You can use bzr upgrade on the repository."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
3635
msgid "Cannot join {0}. {1}"
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5609
3639
msgid "Split a subdirectory of a tree into a separate tree."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5611
3643
msgid ""
3644
"This command will produce a target tree in a format that supports\n"
3645
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3646
"converted into earlier formats like 'dirstate-tags'."
3647
msgstr ""
3648
3649
#: bzrlib/builtins.py:5615
3650
msgid ""
3651
"The TREE argument should be a subdirectory of a working tree. That\n"
3652
"subdirectory will be converted into an independent tree, with its own\n"
3653
"branch. Commits in the top-level tree will not apply to the new subtree."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5695
3657
msgid "No submit branch specified or known"
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5704 bzrlib/send.py:109
3661
msgid "No public branch specified or known"
3662
msgstr ""
3663
3664
#: bzrlib/builtins.py:5709
3665
msgid "bzr merge-directive takes at most two one revision identifiers"
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5718
3669
msgid "No revisions to bundle."
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:5737
3673
msgid "Mail or create a merge-directive for submitting changes."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5739
3677
msgid "A merge directive provides many things needed for requesting merges:"
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:5741
3681
msgid "* A machine-readable description of the merge to perform"
3682
msgstr ""
3683
3684
#: bzrlib/builtins.py:5743
3685
msgid "* An optional patch that is a preview of the changes requested"
3686
msgstr ""
3687
"* Ein optionaler Patch, der eine Vorschau der gewünschten Änderungen "
3688
"darstellt"
3689
3690
#: bzrlib/builtins.py:5745
3691
msgid ""
3692
"* An optional bundle of revision data, so that the changes can be applied\n"
3693
" directly from the merge directive, without retrieving data from a\n"
3694
" branch."
3695
msgstr ""
3696
3697
#: bzrlib/builtins.py:5749
3698
msgid ""
3699
"`bzr send` creates a compact data set that, when applied using bzr\n"
3700
"merge, has the same effect as merging from the source branch. "
3701
msgstr ""
3702
3703
#: bzrlib/builtins.py:5752
3704
msgid ""
3705
"By default the merge directive is self-contained and can be applied to any\n"
3706
"branch containing submit_branch in its ancestory without needing access to\n"
3707
"the source branch."
3708
msgstr ""
3709
3710
#: bzrlib/builtins.py:5756
3711
msgid ""
3712
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3713
"revisions, but only a structured request to merge from the\n"
3714
"public_location. In that case the public_branch is needed and it must be\n"
3715
"up-to-date and accessible to the recipient. The public_branch is always\n"
3716
"included if known, so that people can check it later."
3717
msgstr ""
3718
3719
#: bzrlib/builtins.py:5762
3720
msgid ""
3721
"The submit branch defaults to the parent of the source branch, but can be\n"
3722
"overridden. Both submit branch and public branch will be remembered in\n"
3723
"branch.conf the first time they are used for a particular branch. The\n"
3724
"source branch defaults to that containing the working directory, but can\n"
3725
"be changed using --from."
3726
msgstr ""
3727
3728
#: bzrlib/builtins.py:5768
3729
msgid ""
3730
"Both the submit branch and the public branch follow the usual behavior with\n"
3731
"respect to --remember: If there is no default location set, the first send\n"
3732
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3733
"omit the location to use the default. To change the default, use\n"
3734
"--remember. The value will only be saved if the location can be accessed."
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:5774
3738
msgid ""
3739
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3740
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3741
"If a public location is known for the submit_branch, that location is used\n"
3742
"in the merge directive."
3743
msgstr ""
3744
3745
#: bzrlib/builtins.py:5779
3746
msgid ""
3747
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3748
"given, in which case it is sent to a file."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:5782
3752
msgid ""
3753
"Mail is sent using your preferred mail program. This should be transparent\n"
3754
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3755
"If the preferred client can't be found (or used), your editor will be used."
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:5786
3759
msgid ""
3760
"To use a specific mail program, set the mail_client configuration option.\n"
3761
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3762
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3763
"(MacOS X's\n"
3764
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3765
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3766
"add\n"
3767
"supported clients."
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:5793
3771
msgid ""
3772
"If mail is being sent, a to address is required. This can be supplied\n"
3773
"either on the commandline, by setting the submit_to configuration\n"
3774
"option in the branch itself or the child_submit_to configuration option\n"
3775
"in the submit branch."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:5798
3779
msgid ""
3780
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3781
"and\n"
3782
"merge directive format 2. It is significantly faster and smaller than\n"
3783
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3784
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3785
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3786
msgstr ""
3787
3788
#: bzrlib/builtins.py:5804
3789
msgid ""
3790
"The merge directives created by bzr send may be applied using bzr merge or\n"
3791
"bzr pull by specifying a file containing a merge directive as the location."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:5807
3795
msgid ""
3796
"bzr send makes extensive use of public locations to map local locations "
3797
"into\n"
3798
"URLs that can be used by other people. See `bzr help configuration` to\n"
3799
"set them, and use `bzr info` to display them."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:5831
3803
msgid "Write merge directive to this file or directory; use - for stdout."
3804
msgstr ""
3805
3806
#: bzrlib/builtins.py:5835
3807
msgid ""
3808
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3809
"strict disables the check."
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:5837
3813
msgid "Mail the request to this address."
3814
msgstr "Die Anfrage an diese Adresse schicken."
3815
3816
#: bzrlib/builtins.py:5841
3817
msgid "Body for the email."
3818
msgstr "Inhalt der E-Mail."
3819
3820
#: bzrlib/builtins.py:5894
3821
msgid "Do not include a bundle in the merge directive."
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:5895
3825
msgid "Do not include a preview patch in the merge directive."
3826
msgstr ""
3827
3828
#: bzrlib/builtins.py:5898
3829
msgid "Remember submit and public branch."
3830
msgstr ""
3831
3832
#: bzrlib/builtins.py:5900
3833
msgid ""
3834
"Branch to generate the submission from, rather than the one containing the "
3835
"working directory."
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
3839
msgid "format"
3840
msgstr "Format"
3841
3842
#: bzrlib/builtins.py:5911
3843
msgid "Use the specified output format."
3844
msgstr "Das angegebene Ausgabeformat benutzen."
3845
3846
#: bzrlib/builtins.py:5933
3847
msgid "Create, remove or modify a tag naming a revision."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:5935
3851
msgid ""
3852
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3853
"(--revision) option can be given -rtag:X, where X is any previously\n"
3854
"created tag."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:5939
3858
msgid ""
3859
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3860
"along when you branch, push, pull or merge."
3861
msgstr ""
3862
3863
#: bzrlib/builtins.py:5942
3864
msgid ""
3865
"It is an error to give a tag name that already exists unless you pass\n"
3866
"--force, in which case the tag is moved to point to the new revision."
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:5945
3870
msgid ""
3871
"To rename a tag (change the name but keep it on the same revsion), run "
3872
"``bzr\n"
3873
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3874
msgstr ""
3875
3876
#: bzrlib/builtins.py:5948
3877
msgid ""
3878
"If no tag name is specified it will be determined through the \n"
3879
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3880
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3881
"details."
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:5958
3885
msgid "Delete this tag rather than placing it."
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:5961
3889
msgid "Branch in which to place the tag."
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:5963
3893
msgid "Replace existing tags."
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:5978
3897
msgid "No tag specified to delete."
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:5980
3901
#, python-format
3902
msgid "Deleted tag %s."
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:5985
3906
msgid "Tags can only be placed on a single revision, not on a range"
3907
msgstr ""
3908
"Tags können nur einzelnen Revisionen zugewiesen werden, nicht mehreren"
3909
3910
#: bzrlib/builtins.py:5994
3911
msgid "Please specify a tag name."
3912
msgstr ""
3913
3914
#: bzrlib/builtins.py:6002
3915
#, python-format
3916
msgid "Tag %s already exists for that revision."
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:6006
3920
#, python-format
3921
msgid "Created tag %s."
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6008
3925
#, python-format
3926
msgid "Updated tag %s."
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6012
3930
msgid "List tags."
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6014
3934
msgid ""
3935
"This command shows a table of tag names and the revisions they reference."
3936
msgstr ""
3937
3938
#: bzrlib/builtins.py:6020
3939
msgid "Branch whose tags should be displayed."
3940
msgstr ""
3941
3942
#: bzrlib/builtins.py:6022
3943
msgid "Sort tags by different criteria."
3944
msgstr ""
3945
3946
#: bzrlib/builtins.py:6022
3947
msgid "Sorting"
3948
msgstr "Sortierung"
3949
3950
#: bzrlib/builtins.py:6091
3951
msgid "Reconfigure the type of a bzr directory."
3952
msgstr ""
3953
3954
#: bzrlib/builtins.py:6093
3955
msgid "A target configuration must be specified."
3956
msgstr "Es muss eine Zielkonfiguration angegeben werden."
3957
3958
#: bzrlib/builtins.py:6095
3959
msgid ""
3960
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3961
"The order of preference is\n"
3962
"1. For a lightweight checkout, the current bound location.\n"
3963
"2. For branches that used to be checkouts, the previously-bound location.\n"
3964
"3. The push location.\n"
3965
"4. The parent location.\n"
3966
"If none of these is available, --bind-to must be specified."
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6109
3970
msgid "Tree type"
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6110
3974
msgid "The relation between branch and tree."
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6112
3978
msgid "Reconfigure to be an unbound branch with no working tree."
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6113
3982
msgid "Reconfigure to be an unbound branch with a working tree."
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6114
3986
msgid "Reconfigure to be a bound branch with a working tree."
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6115
3990
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6120
3994
msgid "Repository type"
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6121
3998
msgid "Location fo the repository."
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6123
4002
msgid ""
4003
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6125
4007
msgid "Reconfigure to use a shared repository."
4008
msgstr ""
4009
4010
#: bzrlib/builtins.py:6129
4011
msgid "Trees in Repository"
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6130
4015
msgid "Whether new branches in the repository have trees."
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6132
4019
msgid ""
4020
"Reconfigure repository to create working trees on branches by default."
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:6134
4024
msgid ""
4025
"Reconfigure repository to not create working trees on branches by default."
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6137
4029
msgid "Branch to bind checkout to."
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6139
4033
msgid "Perform reconfiguration even if local changes will be lost."
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:6142
4037
msgid "Reconfigure a branch to be stacked on another branch."
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6146
4041
msgid ""
4042
"Reconfigure a branch to be unstacked. This may require copying substantial "
4043
"data into it."
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6156
4047
msgid "Can't use both --stacked-on and --unstacked"
4048
msgstr ""
4049
"Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
4050
4051
#: bzrlib/builtins.py:6170
4052
msgid "No target configuration specified"
4053
msgstr "Keine Zielkonfiguration angegeben"
4054
4055
#: bzrlib/builtins.py:6205
4056
msgid "Set the branch of a checkout and update."
4057
msgstr "Branch eines Checkout setzen und aktualisieren."
4058
4059
#: bzrlib/builtins.py:6207
4060
msgid ""
4061
"For lightweight checkouts, this changes the branch being referenced.\n"
4062
"For heavyweight checkouts, this checks that there are no local commits\n"
4063
"versus the current bound branch, then it makes the local branch a mirror\n"
4064
"of the new location and binds to it."
4065
msgstr ""
4066
4067
#: bzrlib/builtins.py:6212
4068
msgid ""
4069
"In both cases, the working tree is updated and uncommitted changes\n"
4070
"are merged. The user can commit or revert these as they desire."
4071
msgstr ""
4072
4073
#: bzrlib/builtins.py:6215
4074
msgid "Pending merges need to be committed or reverted before using switch."
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6217
4078
msgid ""
4079
"The path to the branch to switch to can be specified relative to the parent\n"
4080
"directory of the current branch. For example, if you are currently in a\n"
4081
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4082
"/path/to/newbranch."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6222
4086
msgid ""
4087
"Bound branches use the nickname of its master branch unless it is set\n"
4088
"locally, in which case switching will update the local nickname to be\n"
4089
"that of the master."
4090
msgstr ""
4091
4092
#: bzrlib/builtins.py:6230
4093
msgid "Switch even if local commits will be lost."
4094
msgstr ""
4095
4096
#: bzrlib/builtins.py:6233
4097
msgid "Create the target branch from this one before switching to it."
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6236
4101
msgid "Store and restore uncommitted changes in the branch."
4102
msgstr ""
4103
4104
#: bzrlib/builtins.py:6250
4105
msgid "You must supply either a revision or a location"
4106
msgstr ""
4107
4108
#: bzrlib/builtins.py:6263
4109
msgid "cannot create branch without source branch"
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6289
4113
msgid "Manage filtered views."
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:6291
4117
msgid ""
4118
"Views provide a mask over the tree so that users can focus on\n"
4119
"a subset of a tree when doing their work. After creating a view,\n"
4120
"commands that support a list of files - status, diff, commit, etc -\n"
4121
"effectively have that list of files implicitly given each time.\n"
4122
"An explicit list of files can still be given but those files\n"
4123
"must be within the current view."
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6298
4127
msgid ""
4128
"In most cases, a view has a short life-span: it is created to make\n"
4129
"a selected change and is deleted once that change is committed.\n"
4130
"At other times, you may wish to create one or more named views\n"
4131
"and switch between them."
4132
msgstr ""
4133
4134
#: bzrlib/builtins.py:6303
4135
msgid ""
4136
"To disable the current view without deleting it, you can switch to\n"
4137
"the pseudo view called ``off``. This can be useful when you need\n"
4138
"to see the whole tree for an operation or two (e.g. merge) but\n"
4139
"want to switch back to your view after that."
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6308
4143
msgid ""
4144
":Examples:\n"
4145
" To define the current view::"
4146
msgstr ""
4147
4148
#: bzrlib/builtins.py:6311
4149
msgid " bzr view file1 dir1 ..."
4150
msgstr ""
4151
4152
#: bzrlib/builtins.py:6313
4153
msgid " To list the current view::"
4154
msgstr ""
4155
4156
#: bzrlib/builtins.py:6315
4157
msgid " bzr view"
4158
msgstr " bzr view"
4159
4160
#: bzrlib/builtins.py:6317
4161
msgid " To delete the current view::"
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6319
4165
msgid " bzr view --delete"
4166
msgstr " bzr view --delete"
4167
4168
#: bzrlib/builtins.py:6321
4169
msgid " To disable the current view without deleting it::"
4170
msgstr ""
4171
4172
#: bzrlib/builtins.py:6323
4173
msgid " bzr view --switch off"
4174
msgstr " bzr view --switch off"
4175
4176
#: bzrlib/builtins.py:6325
4177
msgid " To define a named view and switch to it::"
4178
msgstr ""
4179
4180
#: bzrlib/builtins.py:6327
4181
msgid " bzr view --name view-name file1 dir1 ..."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6329
4185
msgid " To list a named view::"
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6331
4189
msgid " bzr view --name view-name"
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:6333
4193
msgid " To delete a named view::"
4194
msgstr ""
4195
4196
#: bzrlib/builtins.py:6335
4197
msgid " bzr view --name view-name --delete"
4198
msgstr ""
4199
4200
#: bzrlib/builtins.py:6337
4201
msgid " To switch to a named view::"
4202
msgstr ""
4203
4204
#: bzrlib/builtins.py:6339
4205
msgid " bzr view --switch view-name"
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6341
4209
msgid " To list all views defined::"
4210
msgstr ""
4211
4212
#: bzrlib/builtins.py:6343
4213
msgid " bzr view --all"
4214
msgstr " bzr view --all"
4215
4216
#: bzrlib/builtins.py:6345
4217
msgid " To delete all views::"
4218
msgstr ""
4219
4220
#: bzrlib/builtins.py:6347
4221
msgid " bzr view --delete --all"
4222
msgstr " bzr view --delete --all"
4223
4224
#: bzrlib/builtins.py:6354
4225
msgid "Apply list or delete action to all views."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6357
4229
msgid "Delete the view."
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6360
4233
msgid "Name of the view to define, list or delete."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:6364
4237
msgid "Name of the view to switch to."
4238
msgstr ""
4239
4240
#: bzrlib/builtins.py:6383
4241
msgid "Both --delete and a file list specified"
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:6386
4245
msgid "Both --delete and --switch specified"
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6389
4249
msgid "Deleted all views.\n"
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6391
4253
msgid "No current view to delete"
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6394
4257
#, python-format
4258
msgid "Deleted '%s' view.\n"
4259
msgstr ""
4260
4261
#: bzrlib/builtins.py:6398
4262
msgid "Both --switch and a file list specified"
4263
msgstr ""
4264
4265
#: bzrlib/builtins.py:6401
4266
msgid "Both --switch and --all specified"
4267
msgstr ""
4268
4269
#: bzrlib/builtins.py:6404
4270
msgid "No current view to disable"
4271
msgstr ""
4272
4273
#: bzrlib/builtins.py:6406
4274
#, python-format
4275
msgid "Disabled '%s' view.\n"
4276
msgstr ""
4277
4278
#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
4279
msgid "Using '{0}' view: {1}\n"
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6413
4283
msgid "Views defined:\n"
4284
msgstr ""
4285
4286
#: bzrlib/builtins.py:6422
4287
msgid "No views defined.\n"
4288
msgstr ""
4289
4290
#: bzrlib/builtins.py:6429
4291
msgid "Cannot change the 'off' pseudo view"
4292
msgstr ""
4293
4294
#: bzrlib/builtins.py:6437
4295
msgid "No current view.\n"
4296
msgstr ""
4297
4298
#: bzrlib/builtins.py:6440
4299
msgid "'{0}' view is: {1}\n"
4300
msgstr ""
4301
4302
#: bzrlib/builtins.py:6460
4303
msgid " <no hooks installed>\n"
4304
msgstr ""
4305
4306
#: bzrlib/builtins.py:6464
4307
msgid "Remove a branch."
4308
msgstr "Einen Zweig entfernen."
4309
4310
#: bzrlib/builtins.py:6466
4311
msgid ""
4312
"This will remove the branch from the specified location but \n"
4313
"will keep any working tree or repository in place."
4314
msgstr ""
4315
4316
#: bzrlib/builtins.py:6471
4317
msgid " Remove the branch at repo/trunk::"
4318
msgstr ""
4319
4320
#: bzrlib/builtins.py:6473
4321
msgid " bzr remove-branch repo/trunk"
4322
msgstr " bzr remove-branch repo/trunk"
4323
4324
#: bzrlib/builtins.py:6480
4325
msgid "Remove branch even if it is the active branch."
4326
msgstr "Zweig entfernen, selbst wenn es ein aktiver Zweig ist."
4327
4328
#: bzrlib/builtins.py:6494
4329
msgid "Branch is active. Use --force to remove it."
4330
msgstr "Zweig ist aktiv. Benutzen Sie --force, um ihn zu entfernen."
4331
4332
#: bzrlib/builtins.py:6498
4333
msgid "Plaintext diff output."
4334
msgstr ""
4335
4336
#: bzrlib/builtins.py:6499
4337
msgid "Temporarily set aside some changes from the current tree."
4338
msgstr ""
4339
4340
#: bzrlib/builtins.py:6501
4341
msgid ""
4342
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4343
"ie. out of the way, until a later time when you can bring them back from\n"
4344
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4345
"your working tree, and so they aren't propagated along with your branch nor\n"
4346
"will they survive its deletion."
4347
msgstr ""
4348
4349
#: bzrlib/builtins.py:6507
4350
msgid "If shelve --list is specified, previously-shelved changes are listed."
4351
msgstr ""
4352
4353
#: bzrlib/builtins.py:6509
4354
msgid ""
4355
"Shelve is intended to help separate several sets of changes that have\n"
4356
"been inappropriately mingled. If you just want to get rid of all changes\n"
4357
"and you don't need to restore them later, use revert. If you want to\n"
4358
"shelve all text changes at once, use shelve --all."
4359
msgstr ""
4360
4361
#: bzrlib/builtins.py:6514
4362
msgid ""
4363
"If filenames are specified, only the changes to those files will be\n"
4364
"shelved. Other files will be left untouched."
4365
msgstr ""
4366
4367
#: bzrlib/builtins.py:6517
4368
msgid ""
4369
"If a revision is specified, changes since that revision will be shelved."
4370
msgstr ""
4371
4372
#: bzrlib/builtins.py:6519
4373
msgid ""
4374
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4375
"restore the most recently shelved changes."
4376
msgstr ""
4377
4378
#: bzrlib/builtins.py:6522
4379
msgid ""
4380
"For complicated changes, it is possible to edit the changes in a separate\n"
4381
"editor program to decide what the file remaining in the working copy\n"
4382
"should look like. To do this, add the configuration option"
4383
msgstr ""
4384
4385
#: bzrlib/builtins.py:6526
4386
msgid " change_editor = PROGRAM @new_path @old_path"
4387
msgstr ""
4388
4389
#: bzrlib/builtins.py:6528
4390
msgid ""
4391
"where @new_path is replaced with the path of the new version of the \n"
4392
"file and @old_path is replaced with the path of the old version of \n"
4393
"the file. The PROGRAM should save the new file with the desired \n"
4394
"contents of the file in the working tree.\n"
4395
" "
4396
msgstr ""
4397
4398
#: bzrlib/builtins.py:6540
4399
msgid "Shelve all changes."
4400
msgstr ""
4401
4402
#: bzrlib/builtins.py:6542
4403
msgid "Method to use for writing diffs."
4404
msgstr ""
4405
4406
#: bzrlib/builtins.py:6542
4407
msgid "writer"
4408
msgstr ""
4409
4410
#: bzrlib/builtins.py:6546
4411
msgid "List shelved changes."
4412
msgstr ""
4413
4414
#: bzrlib/builtins.py:6548
4415
msgid "Destroy removed changes instead of shelving them."
4416
msgstr ""
4417
4418
#: bzrlib/builtins.py:6577
4419
msgid "No shelved changes."
4420
msgstr ""
4421
4422
#: bzrlib/builtins.py:6588
4423
msgid "Restore shelved changes."
4424
msgstr ""
4425
4426
#: bzrlib/builtins.py:6590
4427
msgid ""
4428
"By default, the most recently shelved changes are restored. However if you\n"
4429
"specify a shelf by id those changes will be restored instead. This works\n"
4430
"best when the changes don't depend on each other."
4431
msgstr ""
4432
4433
#: bzrlib/builtins.py:6599
4434
msgid "The action to perform."
4435
msgstr "Die auszuführende Aktion."
4436
4437
#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694
4438
msgid "action"
4439
msgstr "Aktion"
4440
4441
#: bzrlib/builtins.py:6601
4442
msgid "Apply changes and remove from the shelf."
4443
msgstr ""
4444
4445
#: bzrlib/builtins.py:6602
4446
msgid "Show changes, but do not apply or remove them."
4447
msgstr "Änderungen anzeigen, aber nicht anwenden oder entfernen."
4448
4449
#: bzrlib/builtins.py:6603
4450
msgid ""
4451
"Instead of unshelving the changes, show the diff that would result from "
4452
"unshelving."
4453
msgstr ""
4454
4455
#: bzrlib/builtins.py:6605
4456
msgid "Delete changes without applying them."
4457
msgstr "Änderungen löschen ohne diese anzuwenden."
4458
4459
#: bzrlib/builtins.py:6606
4460
msgid "Apply changes but don't delete them."
4461
msgstr "Änderungen anwenden, aber diese nicht löschen."
4462
4463
#: bzrlib/builtins.py:6621
4464
msgid "Remove unwanted files from working tree."
4465
msgstr ""
4466
4467
#: bzrlib/builtins.py:6623
4468
msgid ""
4469
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4470
"files are never deleted."
4471
msgstr ""
4472
4473
#: bzrlib/builtins.py:6626
4474
msgid ""
4475
"Another class is 'detritus', which includes files emitted by bzr during\n"
4476
"normal operations and selftests. (The value of these files decreases with\n"
4477
"time.)"
4478
msgstr ""
4479
4480
#: bzrlib/builtins.py:6630
4481
msgid ""
4482
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4483
"flags are respected, and may be combined."
4484
msgstr ""
4485
4486
#: bzrlib/builtins.py:6633
4487
msgid "To check what clean-tree will do, use --dry-run."
4488
msgstr "Um zu prüfen, was clean-tree tun wird, --dry-run benutzen."
4489
4490
#: bzrlib/builtins.py:6636
4491
msgid "Delete all ignored files."
4492
msgstr "Alle ignorierten Dateien löschen."
4493
4494
#: bzrlib/builtins.py:6637
4495
msgid ""
4496
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4497
msgstr ""
4498
4499
#: bzrlib/builtins.py:6640
4500
msgid "Delete files unknown to bzr (default)."
4501
msgstr "Dateien löschen, die bzr nicht bekannt sind (Vorgabe)."
4502
4503
#: bzrlib/builtins.py:6641
4504
msgid "Show files to delete instead of deleting them."
4505
msgstr "Dateien zum Löschen anzeigen, anstelle diese zu löschen."
4506
4507
#: bzrlib/builtins.py:6643
4508
msgid "Do not prompt before deleting."
4509
msgstr "Vor dem Löschen nicht nachfragen."
4510
4511
#: bzrlib/bundle/__init__.py:59
4512
msgid "A directory cannot be a bundle"
4513
msgstr ""
4514
4515
#: bzrlib/bundle/apply_bundle.py:40
4516
msgid "Install revisions"
4517
msgstr "Revisionen installieren"
4518
4519
#: bzrlib/bundle/commands.py:64
4520
msgid "--verbose requires a merge directive"
4521
msgstr ""
4522
4523
#: bzrlib/bundle/commands.py:67
4524
msgid "Bundle format not supported"
4525
msgstr ""
4526
4527
#: bzrlib/bundle/commands.py:77
4528
msgid "Records\n"
4529
msgstr ""
4530
4531
#: bzrlib/bundle/commands.py:81
4532
msgid "{0}: {1} ({2} multiparent)\n"
4533
msgstr ""
4534
4535
#: bzrlib/bundle/commands.py:83
4536
#, python-format
4537
msgid "unique files: %d\n"
4538
msgstr ""
4539
4540
#: bzrlib/bundle/commands.py:92
4541
msgid "Revisions\n"
4542
msgstr "Revisionen\n"
4543
4544
#: bzrlib/bundle/commands.py:93
4545
#, python-format
4546
msgid "nicks: %s\n"
4547
msgstr ""
4548
4549
#: bzrlib/bundle/commands.py:95
4550
#, python-format
4551
msgid ""
4552
"committers: \n"
4553
"%s\n"
4554
msgstr ""
4555
4556
#: bzrlib/bundle/commands.py:103
4557
msgid "Decoded contents\n"
4558
msgstr ""
4559
4560
#: bzrlib/bundle/serializer/v4.py:327
4561
#, python-format
4562
msgid "Bundling %d revision."
4563
msgid_plural "Bundling %d revisions."
4564
msgstr[0] ""
4565
msgstr[1] ""
4566
4567
#: bzrlib/bzrdir.py:487
4568
msgid ""
4569
"making backup of {0}\n"
4570
" to {1}"
4571
msgstr ""
4572
4573
#: bzrlib/bzrdir.py:510
4574
msgid "renamed {0} to {1}"
4575
msgstr "{0} wurde in {1} umbenannt"
4576
4577
#: bzrlib/bzrdir.py:1639
4578
#, python-format
4579
msgid ""
4580
"Source repository format does not support stacking, using format:\n"
4581
" %s"
4582
msgstr ""
4583
4584
#: bzrlib/bzrdir.py:1659
4585
#, python-format
4586
msgid ""
4587
"Source branch format does not support stacking, using format:\n"
4588
" %s"
4589
msgstr ""
4590
4591
#: bzrlib/bzrdir.py:1805
4592
msgid "starting repository conversion"
4593
msgstr ""
4594
4595
#: bzrlib/bzrdir.py:2026
4596
msgid "Using default stacking branch {0} at {1}"
4597
msgstr ""
4598
4599
#: bzrlib/check.py:108
4600
msgid "check"
4601
msgstr "Prüfen"
4602
4603
#: bzrlib/check.py:110
4604
msgid "checking revisions"
4605
msgstr "Revisionen prüfen"
4606
4607
#: bzrlib/check.py:112
4608
msgid "checking commit contents"
4609
msgstr ""
4610
4611
#: bzrlib/check.py:114
4612
msgid "checking file graphs"
4613
msgstr ""
4614
4615
#: bzrlib/check.py:118
4616
msgid "checking branches and trees"
4617
msgstr ""
4618
4619
#: bzrlib/check.py:205
4620
msgid "checked repository {0} format {1}"
4621
msgstr ""
4622
4623
#: bzrlib/check.py:208
4624
#, python-format
4625
msgid "%6d revisions"
4626
msgstr "%6d Revisionen"
4627
4628
#: bzrlib/check.py:209
4629
#, python-format
4630
msgid "%6d file-ids"
4631
msgstr ""
4632
4633
#: bzrlib/check.py:211
4634
#, python-format
4635
msgid "%6d unreferenced text versions"
4636
msgstr ""
4637
4638
#: bzrlib/check.py:215
4639
msgid "unreferenced version: {{{0}}} in {1}"
4640
msgstr ""
4641
4642
#: bzrlib/check.py:218
4643
#, python-format
4644
msgid "%6d revisions are missing inventory_sha1"
4645
msgstr ""
4646
4647
#: bzrlib/check.py:221
4648
#, python-format
4649
msgid "%6d revisions are mentioned but not present"
4650
msgstr ""
4651
4652
#: bzrlib/check.py:224
4653
#, python-format
4654
msgid "%6d ghost revisions"
4655
msgstr "%6d Geister-Revisionen"
4656
4657
#: bzrlib/check.py:229
4658
#, python-format
4659
msgid "%6d revisions missing parents in ancestry"
4660
msgstr ""
4661
4662
#: bzrlib/check.py:233
4663
#, python-format
4664
msgid " %s should be in the ancestry for:"
4665
msgstr ""
4666
4667
#: bzrlib/check.py:237
4668
#, python-format
4669
msgid "%6d inconsistent parents"
4670
msgstr ""
4671
4672
#: bzrlib/check.py:241
4673
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4674
msgstr ""
4675
4676
#: bzrlib/check.py:247
4677
#, python-format
4678
msgid "%6d revisions have incorrect parents in the revision index"
4679
msgstr ""
4680
4681
#: bzrlib/check.py:253
4682
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4683
msgstr ""
4684
4685
#: bzrlib/check.py:267
4686
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4687
msgstr ""
4688
4689
#: bzrlib/check.py:296
4690
msgid ""
4691
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4692
"{{{4}}}"
4693
msgstr ""
4694
4695
#: bzrlib/check.py:354
4696
#, python-format
4697
msgid "Checking branch at '%s'."
4698
msgstr "Zweig wird geprüft bei »%s«."
4699
4700
#: bzrlib/check.py:374
4701
#, python-format
4702
msgid "Checking working tree at '%s'."
4703
msgstr ""
4704
4705
#: bzrlib/check.py:427 bzrlib/check.py:441
4706
msgid "No branch found at specified location."
4707
msgstr ""
4708
4709
#: bzrlib/check.py:429 bzrlib/check.py:439
4710
msgid "No working tree found at specified location."
4711
msgstr ""
4712
4713
#: bzrlib/check.py:432
4714
#, python-format
4715
msgid "Checking repository at '%s'."
4716
msgstr ""
4717
4718
#: bzrlib/check.py:443
4719
msgid "No repository found at specified location."
4720
msgstr ""
4721
4722
#: bzrlib/clean_tree.py:63
4723
msgid "Nothing to delete."
4724
msgstr "Nichts zu löschen."
4725
4726
#: bzrlib/clean_tree.py:68
4727
msgid "Are you sure you wish to delete these"
4728
msgstr "Sind Sie sicher, dass Sie diese löschen möchten"
4729
4730
#: bzrlib/clean_tree.py:70
4731
msgid "Canceled"
4732
msgstr "Abgebrochen"
4733
4734
#: bzrlib/clean_tree.py:107
4735
#, python-format
4736
msgid "unable to remove %s"
4737
msgstr "%s kann nicht entfernt werden"
4738
4739
#: bzrlib/clean_tree.py:111
4740
msgid "deleting paths:"
4741
msgstr "Pfade werden gelöscht:"
4742
4743
#: bzrlib/clean_tree.py:125
4744
msgid "unable to remove \"{0}\": {1}."
4745
msgstr "»{0}« kann nicht entfernt werden: {1}."
4746
4747
#: bzrlib/clean_tree.py:130
4748
msgid "No files deleted."
4749
msgstr "Keine Dateien gelöscht."
4750
4751
#: bzrlib/cmd_version_info.py:47
4752
msgid "No known version info format {0}. Supported types are: {1}"
4753
msgstr ""
4754
"Unbekanntes Format {0} für Versionsinformationen. Unterstützte Typen sind: "
4755
"{1}"
4756
4757
#: bzrlib/cmd_version_info.py:52
4758
msgid "Version info in Custom template-based format."
4759
msgstr ""
4760
4761
#: bzrlib/cmd_version_info.py:52
4762
msgid "Version info in Python format."
4763
msgstr "Versionsinformationen im Python-Format."
4764
4765
#: bzrlib/cmd_version_info.py:52
4766
msgid "Version info in RIO (simple text) format (default)."
4767
msgstr "Versionsinformationen im RIO (nur Text)-Format (Vorgabe)."
4768
4769
#: bzrlib/cmd_version_info.py:53
4770
msgid "Show version information about this tree."
4771
msgstr ""
4772
4773
#: bzrlib/cmd_version_info.py:55
4774
msgid ""
4775
"You can use this command to add information about version into\n"
4776
"source code of an application. The output can be in one of the\n"
4777
"supported formats or in a custom format based on a template."
4778
msgstr ""
4779
4780
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4781
#: en/help_topics/configuration.txt:738
4782
msgid "For example::"
4783
msgstr "Zum Beispiel:"
4784
4785
#: bzrlib/cmd_version_info.py:61
4786
msgid ""
4787
" bzr version-info --custom \\\n"
4788
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4789
msgstr ""
4790
4791
#: bzrlib/cmd_version_info.py:64
4792
msgid ""
4793
"will produce a C header file with formatted string containing the\n"
4794
"current revision number. Other supported variables in templates are:"
4795
msgstr ""
4796
4797
#: bzrlib/cmd_version_info.py:67
4798
msgid ""
4799
" * {date} - date of the last revision\n"
4800
" * {build_date} - current date\n"
4801
" * {revno} - revision number\n"
4802
" * {revision_id} - revision id\n"
4803
" * {branch_nick} - branch nickname\n"
4804
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4805
" otherwise 1"
4806
msgstr ""
4807
4808
#: bzrlib/cmd_version_info.py:77
4809
msgid "Select the output format."
4810
msgstr "Wählen Sie das Ausgabeformat."
4811
4812
#: bzrlib/cmd_version_info.py:81
4813
msgid "Include all possible information."
4814
msgstr "Sämtliche verfügbaren Informationen einschließen."
4815
4816
#: bzrlib/cmd_version_info.py:82
4817
msgid "Check if tree is clean."
4818
msgstr ""
4819
4820
#: bzrlib/cmd_version_info.py:84
4821
msgid "Include the revision-history."
4822
msgstr "Revisionsverlauf einschließen."
4823
4824
#: bzrlib/cmd_version_info.py:86
4825
msgid "Include the last revision for each file."
4826
msgstr "Neueste Revision jeder Datei einschließen."
4827
4828
#: bzrlib/cmd_version_info.py:87
4829
msgid "Template for the output."
4830
msgstr ""
4831
4832
#: bzrlib/cmd_version_info.py:101
4833
msgid "bzr version-info --revision takes exactly one revision specifier"
4834
msgstr ""
4835
4836
#: bzrlib/commands.py:229
4837
#, python-format
4838
msgid "unknown command \"%s\""
4839
msgstr "Unbekannter Befehl »%s«"
4840
4841
#: bzrlib/commands.py:476
4842
msgid "No help for this command."
4843
msgstr "Keine Hilfe zu diesem Befehl verfügbar."
4844
4845
#: bzrlib/commands.py:489
4846
#, python-format
4847
msgid ":Purpose: %s\n"
4848
msgstr ":Zweck: %s\n"
4849
4850
#: bzrlib/commands.py:491
4851
#, python-format
4852
msgid ""
4853
":Usage:\n"
4854
"%s\n"
4855
msgstr ""
4856
":Aufruf:\n"
4857
"%s\n"
4858
4859
#: bzrlib/commands.py:493
4860
#, python-format
4861
msgid ":Usage: %s\n"
4862
msgstr ":Aufruf: %s\n"
4863
4864
#: bzrlib/commands.py:512
4865
#, python-format
4866
msgid ":Options:%s"
4867
msgstr ":Optionen: %s"
4868
4869
#: bzrlib/commands.py:523
4870
#, python-format
4871
msgid ""
4872
":Description:\n"
4873
" %s\n"
4874
"\n"
4875
msgstr ""
4876
":Beschreibung:\n"
4877
" %s\n"
4878
"\n"
4879
4880
#: bzrlib/commands.py:533
4881
#, python-format
4882
msgid ""
4883
"See bzr help %s for more details and examples.\n"
4884
"\n"
4885
msgstr ""
4886
4887
#: bzrlib/commands.py:538
4888
msgid ":Aliases: "
4889
msgstr ":Aliase: "
4890
4891
#: bzrlib/commands.py:542
4892
#, python-format
4893
msgid ":From: plugin \"%s\"\n"
4894
msgstr ":Von: Erweiterung »%s«\n"
4895
4896
#: bzrlib/commands.py:554
4897
msgid ":doc:`{0} <{1}-help>`"
4898
msgstr ""
4899
4900
#: bzrlib/commands.py:558
4901
#, python-format
4902
msgid ":See also: %s"
4903
msgstr ":Siehe auch: %s"
4904
4905
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4906
msgid "Only ASCII permitted in option names"
4907
msgstr ""
4908
4909
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4910
msgid "command {0!r} needs one or more {1}"
4911
msgstr ""
4912
4913
#: bzrlib/commands.py:868
4914
msgid "command {0!r} requires argument {1}"
4915
msgstr ""
4916
4917
#: bzrlib/commands.py:875
4918
msgid "extra argument to command {0}: {1}"
4919
msgstr ""
4920
4921
#: bzrlib/commands.py:952
4922
#, python-format
4923
msgid "Profile data written to \"%s\"."
4924
msgstr ""
4925
4926
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4927
msgid "added"
4928
msgstr "Hinzugefügt"
4929
4930
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4931
msgid "modified"
4932
msgstr "Geändert"
4933
4934
#: bzrlib/commit.py:131
4935
#, python-format
4936
msgid "Committing%s"
4937
msgstr ""
4938
4939
#: bzrlib/commit.py:134
4940
#, python-format
4941
msgid "Committed revision %d."
4942
msgstr ""
4943
4944
#: bzrlib/commit.py:143
4945
#, python-format
4946
msgid "deleted %s"
4947
msgstr "%s gelöscht"
4948
4949
#: bzrlib/commit.py:146
4950
#, python-format
4951
msgid "missing %s"
4952
msgstr "%s fehlt"
4953
4954
#: bzrlib/commit.py:511
4955
msgid ""
4956
"Conflicting tags in bound branch:\n"
4957
"{0}"
4958
msgstr ""
4959
4960
#: bzrlib/commit.py:742
4961
msgid "renamed"
4962
msgstr "Umbenannt"
4963
4964
#: bzrlib/commit.py:976
4965
msgid "unchanged"
4966
msgstr "Ungeändert"
4967
4968
#: bzrlib/commit.py:998
4969
msgid "{0} [{1}] - Stage"
4970
msgstr ""
4971
4972
#: bzrlib/commit.py:1001
4973
#, python-format
4974
msgid "%s - Stage"
4975
msgstr ""
4976
4977
#: bzrlib/commit_signature_commands.py:34
4978
msgid "Sign all commits by a given committer."
4979
msgstr ""
4980
4981
#: bzrlib/commit_signature_commands.py:36
4982
msgid ""
4983
"If location is not specified the local tree is used.\n"
4984
"If committer is not specified the default committer is used."
4985
msgstr ""
4986
4987
#: bzrlib/commit_signature_commands.py:39
4988
msgid "This does not sign commits that already have signatures."
4989
msgstr ""
4990
4991
#: bzrlib/commit_signature_commands.py:47
4992
msgid ""
4993
"Don't actually sign anything, just print the revisions that would be signed."
4994
msgstr ""
4995
4996
#: bzrlib/commit_signature_commands.py:98
4997
#, python-format
4998
msgid "Signed %d revision.\n"
4999
msgid_plural "Signed %d revisions.\n"
5000
msgstr[0] ""
5001
msgstr[1] ""
5002
5003
#: bzrlib/commit_signature_commands.py:103
5004
msgid "Verify all commit signatures."
5005
msgstr ""
5006
5007
#: bzrlib/commit_signature_commands.py:105
5008
msgid ""
5009
"Verifies that all commits in the branch are signed by known GnuPG keys."
5010
msgstr ""
5011
5012
#: bzrlib/commit_signature_commands.py:110
5013
msgid ""
5014
"Comma separated list of GPG key patterns which are acceptable for "
5015
"verification."
5016
msgstr ""
5017
5018
#: bzrlib/commit_signature_commands.py:148
5019
msgid "Cannot verify a range of non-revision-history revisions"
5020
msgstr ""
5021
5022
#: bzrlib/commit_signature_commands.py:166
5023
msgid "All commits signed with verifiable keys"
5024
msgstr ""
5025
5026
#: bzrlib/config.py:438
5027
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5028
msgstr ""
5029
5030
#: bzrlib/config.py:2468
5031
msgid "{0} is not an SI unit."
5032
msgstr ""
5033
5034
#: bzrlib/config.py:2989
5035
msgid ""
5036
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5037
"will be saved."
5038
msgstr ""
5039
5040
#: bzrlib/config.py:3134
5041
#, python-format
5042
msgid "Invalid '%s', should be of the form 'name=value'"
5043
msgstr ""
5044
5045
#: bzrlib/config.py:4089
5046
msgid "Display, set or remove a configuration option."
5047
msgstr "Eine Konfigurationsoption anzeigen, festlegen oder löschen."
5048
5049
#: bzrlib/config.py:4091
5050
msgid "Display the active value for option NAME."
5051
msgstr ""
5052
5053
#: bzrlib/config.py:4093
5054
msgid ""
5055
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5056
"matching options are displayed mentioning their scope and without resolving\n"
5057
"option references in the value). The active value that bzr will take into\n"
5058
"account is the first one displayed for each option."
5059
msgstr ""
5060
5061
#: bzrlib/config.py:4098
5062
msgid ""
5063
"If NAME is not given, --all .* is implied (all options are displayed for "
5064
"the\n"
5065
"current scope)."
5066
msgstr ""
5067
5068
#: bzrlib/config.py:4101
5069
msgid ""
5070
"Setting a value is achieved by using NAME=value without spaces. The value\n"
5071
"is set in the most relevant scope and can be checked by displaying the\n"
5072
"option again."
5073
msgstr ""
5074
5075
#: bzrlib/config.py:4105
5076
msgid "Removing a value is achieved by using --remove NAME."
5077
msgstr ""
5078
5079
#: bzrlib/config.py:4115
5080
msgid "Reduce the scope to the specified configuration file."
5081
msgstr ""
5082
5083
#: bzrlib/config.py:4119
5084
msgid "Display all the defined values for the matching options."
5085
msgstr "Alle definierten Werte für die zutreffenden Optionen anzeigen."
5086
5087
#: bzrlib/config.py:4121
5088
msgid "Remove the option from the configuration file."
5089
msgstr "Die Option aus der Konfigurationsdatei entfernen."
5090
5091
#: bzrlib/conflicts.py:50
5092
msgid "List files with conflicts."
5093
msgstr "In Konflikt stehende Dateien auflisten."
5094
5095
#: bzrlib/conflicts.py:57
5096
msgid ""
5097
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5098
"is supplied, the pathnames of files with text conflicts are listed,\n"
5099
"instead. (This is useful for editing all files with text conflicts.)"
5100
msgstr ""
5101
5102
#: bzrlib/conflicts.py:61
5103
msgid "Use bzr resolve when you have fixed a problem."
5104
msgstr "Benutzen Sie bzr resolve, wenn Sie ein Problem gelöst haben."
5105
5106
#: bzrlib/conflicts.py:66
5107
msgid "List paths of files with text conflicts."
5108
msgstr ""
5109
5110
#: bzrlib/conflicts.py:85
5111
msgid "Marks the conflict as resolved."
5112
msgstr ""
5113
5114
#: bzrlib/conflicts.py:88
5115
msgid "Resolve the conflict preserving the version in the working tree."
5116
msgstr ""
5117
5118
#: bzrlib/conflicts.py:91
5119
msgid "Resolve the conflict taking the merged version into account."
5120
msgstr ""
5121
5122
#: bzrlib/conflicts.py:98
5123
msgid "How to resolve the conflict."
5124
msgstr ""
5125
5126
#: bzrlib/conflicts.py:104
5127
msgid "Mark a conflict as resolved."
5128
msgstr ""
5129
5130
#: bzrlib/conflicts.py:111
5131
msgid ""
5132
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5133
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5134
"as\n"
5135
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5136
msgstr ""
5137
5138
#: bzrlib/conflicts.py:119
5139
msgid "Resolve all conflicts in this tree."
5140
msgstr ""
5141
5142
#: bzrlib/conflicts.py:126
5143
msgid "If --all is specified, no FILE may be provided"
5144
msgstr ""
5145
5146
#: bzrlib/conflicts.py:151
5147
#, python-format
5148
msgid "%d conflict auto-resolved."
5149
msgid_plural "%d conflicts auto-resolved."
5150
msgstr[0] "%d Konflikt automatisch aufgelöst."
5151
msgstr[1] "%d Konflikte automatisch aufgelöst."
5152
5153
#: bzrlib/conflicts.py:154
5154
msgid "Remaining conflicts:"
5155
msgstr "Verbleibende Konflikte:"
5156
5157
#: bzrlib/conflicts.py:159
5158
msgid "All conflicts resolved."
5159
msgstr "Alle Konflikte gelöst."
5160
5161
#: bzrlib/conflicts.py:168
5162
msgid "{0} conflict resolved, {1} remaining"
5163
msgid_plural "{0} conflicts resolved, {1} remaining"
5164
msgstr[0] ""
5165
msgstr[1] ""
5166
5167
#: bzrlib/controldir.py:712
5168
msgid "{0} is{1} redirected to {2}"
5169
msgstr ""
5170
5171
#: bzrlib/diff.py:400
5172
#, python-format
5173
msgid "*** Ignoring files outside view. View is %s"
5174
msgstr ""
5175
5176
#: bzrlib/errors.py:157
5177
msgid "The tree builder is already building a tree."
5178
msgstr ""
5179
5180
#: bzrlib/errors.py:178
5181
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5182
msgstr ""
5183
5184
#: bzrlib/errors.py:197
5185
msgid ""
5186
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5187
"versions \"%(minimum)s\" to \"%(current)s\"."
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:209
5191
msgid "The transport '%(transport)s' is only accessible within this process."
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:227
5195
msgid "Invalid revision number %(revno)s"
5196
msgstr "Ungültige Revisionsnummer %(revno)s"
5197
5198
#: bzrlib/errors.py:236
5199
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:247
5203
msgid "Reserved revision-id {%(revision_id)s}"
5204
msgstr ""
5205
5206
#: bzrlib/errors.py:261
5207
msgid "There is no public branch set for \"%(branch_url)s\"."
5208
msgstr "Kein öffentlicher Zweig für »%(branch_url)s« festgelegt."
5209
5210
#: bzrlib/errors.py:271
5211
msgid ""
5212
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5213
"obtain a list of topics."
5214
msgstr ""
5215
5216
#: bzrlib/errors.py:280
5217
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5218
msgstr ""
5219
5220
#: bzrlib/errors.py:290
5221
msgid ""
5222
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5223
msgstr ""
5224
5225
#: bzrlib/errors.py:299
5226
msgid "The branch '%(branch)s' is not stacked."
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:313
5230
msgid "No WorkingTree exists for \"%(base)s\"."
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:322
5234
msgid "Not currently building a tree."
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:327
5238
msgid "%(url)s is not a local path."
5239
msgstr "%(url)s ist kein lokaler Pfad."
5240
5241
#: bzrlib/errors.py:355
5242
msgid "%(not_locked)r is not write locked but needs to be."
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:363
5246
msgid "Error in command line options"
5247
msgstr "Fehler in den Befehlszeilenoptionen"
5248
5249
#: bzrlib/errors.py:368
5250
msgid "%(value)s is not an index of type %(_type)s."
5251
msgstr "%(value)s ist kein Index vom Typ %(_type)s."
5252
5253
#: bzrlib/errors.py:378
5254
msgid "Error in data for index %(value)s."
5255
msgstr "Fehler in den Daten für Index %(value)s."
5256
5257
#: bzrlib/errors.py:387
5258
msgid "The key '%(key)s' is already in index '%(index)s'."
5259
msgstr "Der Schlüssel »%(key)s« ist bereits im Index »%(index)s«."
5260
5261
#: bzrlib/errors.py:397
5262
msgid "The key '%(key)s' is not a valid key."
5263
msgstr "Der Schlüssel »%(key)s« ist ein ungültiger Schlüssel."
5264
5265
#: bzrlib/errors.py:406
5266
msgid "Could not parse options for index %(value)s."
5267
msgstr "Optionen für Index %(value)s konnten nicht verarbeitet werden."
5268
5269
#: bzrlib/errors.py:415
5270
msgid "The value '%(value)s' is not a valid value."
5271
msgstr "Der Wert »%(value)s« ist ein ungültiger Wert."
5272
5273
#: bzrlib/errors.py:424
5274
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5275
msgstr "Ungültiger Wert »%(value)s« für die Option »%(name)s«."
5276
5277
#: bzrlib/errors.py:443
5278
msgid "Generic path error: %(path)r%(extra)s)"
5279
msgstr "Allgemeiner Fehler im Pfad: %(path)r%(extra)s)"
5280
5281
#: bzrlib/errors.py:456
5282
msgid "No such file: %(path)r%(extra)s"
5283
msgstr "Datei existiert nicht: %(path)r%(extra)s"
5284
5285
#: bzrlib/errors.py:461
5286
msgid "File exists: %(path)r%(extra)s"
5287
msgstr "Datei existiert: %(path)r%(extra)s"
5288
5289
#: bzrlib/errors.py:467
5290
msgid ""
5291
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5292
"after to tell bzr about a rename that has already happened)%(extra)s"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:483
5296
msgid "\"%(path)s\" is not a directory %(extra)s"
5297
msgstr "»%(path)s« ist kein Verzeichnis %(extra)s"
5298
5299
#: bzrlib/errors.py:488
5300
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:493
5304
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5305
msgstr "Verzeichnis ist nicht leer: »%(path)s«%(extra)s"
5306
5307
#: bzrlib/errors.py:498
5308
msgid "Hard-linking \"%(path)s\" is not supported"
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:513
5312
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5313
msgstr ""
5314
5315
#: bzrlib/errors.py:518
5316
msgid "Permission denied: \"%(path)s\"%(extra)s"
5317
msgstr "Zugriff verweigert: »%(path)s«%(extra)s"
5318
5319
#: bzrlib/errors.py:523
5320
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:528
5324
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:539
5328
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5329
msgstr ""
5330
5331
#: bzrlib/errors.py:561
5332
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:571
5336
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5337
msgstr ""
5338
5339
#: bzrlib/errors.py:579
5340
msgid ""
5341
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5342
"upgrade the branch to permit branch stacking."
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:590
5346
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:600
5350
msgid ""
5351
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5352
"need to upgrade the repository to permit branch stacking."
5353
msgstr ""
5354
5355
#: bzrlib/errors.py:611
5356
msgid "Error reading from %(path)r."
5357
msgstr "Fehler beim Lesen von %(path)r."
5358
5359
#: bzrlib/errors.py:630
5360
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5361
msgstr ""
5362
5363
#: bzrlib/errors.py:646
5364
msgid "Path \"%(path)s\" is not unicode normalized"
5365
msgstr ""
5366
5367
#: bzrlib/errors.py:654
5368
msgid "Not a branch: \"%(path)s\"%(detail)s."
5369
msgstr "Kein Zweig: »%(path)s«%(detail)s."
5370
5371
#: bzrlib/errors.py:696
5372
msgid "No submit branch available for branch \"%(path)s\""
5373
msgstr ""
5374
5375
#: bzrlib/errors.py:705
5376
msgid "A control directory already exists: \"%(path)s\"."
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:710
5380
msgid "Already a branch: \"%(path)s\"."
5381
msgstr "Bereits ein Zweig: »%(path)s«."
5382
5383
#: bzrlib/errors.py:715
5384
msgid "Invalid branch name: %(name)s"
5385
msgstr "Ungültiger Zweigname: %(name)s"
5386
5387
#: bzrlib/errors.py:724
5388
msgid "Parent branch already exists: \"%(path)s\"."
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:730
5392
msgid ""
5393
"Directory contains a branch, but no working tree (use bzr checkout if you "
5394
"wish to build a working tree): \"%(path)s\""
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:735
5398
msgid ""
5399
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5400
msgstr ""
5401
5402
#: bzrlib/errors.py:745
5403
msgid ""
5404
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:755
5408
msgid "No repository present: \"%(path)s\""
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:762
5412
msgid ""
5413
"Unsupported branch format: %(format)s\n"
5414
"Please run 'bzr upgrade'"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:768
5418
msgid "Unknown %(kind)s format: %(format)r"
5419
msgstr "Unbekanntes %(kind)s-Format: %(format)r"
5420
5421
#: bzrlib/errors.py:777
5422
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5423
msgstr ""
5424
"Das Format %(format)s ist inkompatibel zu der .bzr-Version %(bzrdir)s."
5425
5426
#: bzrlib/errors.py:787
5427
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5428
msgstr ""
5429
5430
#: bzrlib/errors.py:802
5431
msgid ""
5432
"%(target)s\n"
5433
"is not compatible with\n"
5434
"%(source)s\n"
5435
"%(details)s"
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:818
5439
msgid "Revision is not compatible with %(repo_format)s"
5440
msgstr "Die Revision ist inkompatibel zu %(repo_format)s"
5441
5442
#: bzrlib/errors.py:828
5443
msgid "%(context_info)s%(path)s is already versioned."
5444
msgstr "%(context_info)s%(path)s ist bereits versioniert."
5445
5446
#: bzrlib/errors.py:849
5447
msgid "%(context_info)s%(path)s is not versioned."
5448
msgstr "%(context_info)s%(path)s ist nicht versioniert."
5449
5450
#: bzrlib/errors.py:870
5451
msgid "Path(s) are not versioned: %(paths_as_string)s"
5452
msgstr "Pfad(e) ist/sind nicht versioniert: %(paths_as_string)s"
5453
5454
#: bzrlib/errors.py:881
5455
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5456
msgstr "Pfad(e) existiert/existieren nicht: %(paths_as_string)s%(extra)s"
5457
5458
#: bzrlib/errors.py:900
5459
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5460
msgstr ""
5461
5462
#: bzrlib/errors.py:908
5463
msgid ""
5464
"Filename %(filename)r is not valid in your current filesystem encoding "
5465
"%(fs_encoding)s"
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:919
5469
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:937
5473
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:976
5477
msgid "Cannot lock %(lock)s: %(why)s"
5478
msgstr ""
5479
5480
#: bzrlib/errors.py:986
5481
msgid ""
5482
"A transaction related operation was attempted after the transaction finished."
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:1013
5486
msgid "Cannot lock: transport is read only: %(transport)s"
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1021
5490
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1032
5494
msgid ""
5495
"Lock was broken while still open: %(lock)s - check storage consistency!"
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:1043
5499
msgid ""
5500
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5501
"%(holder)r, wanted to break %(target)r"
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1055
5505
msgid ""
5506
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5507
"Use 'bzr break-lock' to clear it"
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:1068
5511
msgid "Lock not held: %(lock)s"
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:1097
5515
msgid "No changes to commit"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:1102
5519
msgid ""
5520
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1112
5524
msgid ""
5525
"Excluding paths during commit is not supported by repository at "
5526
"%(repository)r."
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:1121
5530
msgid ""
5531
"The specified commit message contains characters unsupported by the current "
5532
"encoding."
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:1127
5536
msgid "Upgrade URL cannot work with readonly URLs."
5537
msgstr ""
5538
5539
#: bzrlib/errors.py:1132
5540
msgid "The branch format %(format)s is already at the most recent format."
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1155
5544
msgid "Option --change does not accept revision ranges"
5545
msgstr "Die Option --change akzeptiert keine Revisionsbereiche"
5546
5547
#: bzrlib/errors.py:1160
5548
msgid "No namespace registered for string: %(spec)r"
5549
msgstr ""
5550
5551
#: bzrlib/errors.py:1179
5552
msgid ""
5553
"Requested revision: '%(spec)s' does not exist in branch: "
5554
"%(branch_url)s%(extra)s"
5555
msgstr ""
5556
"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: "
5557
"%(branch_url)s%(extra)s"
5558
5559
#: bzrlib/errors.py:1193
5560
msgid ""
5561
"Operation denied because it would change the main history, which is not "
5562
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:1204
5566
msgid ""
5567
"These branches have diverged. Use the missing command to see how.\n"
5568
"Use the merge command to reconcile them."
5569
msgstr ""
5570
5571
#: bzrlib/errors.py:1224
5572
msgid ""
5573
"Branches have no common ancestor, and no merge base revision was specified."
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:1230
5577
msgid ""
5578
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:1236
5582
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:1245
5586
msgid ""
5587
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:1254
5591
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:1263
5595
msgid "Branch %(branch)s has no commits."
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:1281
5599
msgid ""
5600
"Bound branch %(branch)s is out of date with master branch "
5601
"%(master)s.%(extra_help)s"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:1293
5605
msgid ""
5606
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5607
"bound to %(remote)s."
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:1305
5611
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:1314
5615
msgid ""
5616
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5617
"%(error)s"
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:1326
5621
msgid "Error in processing weave: %(msg)s"
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:1335
5625
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5626
msgstr "Revision {%(revision_id)s} ist bereits in %(weave)s vorhanden"
5627
5628
#: bzrlib/errors.py:1346
5629
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5630
msgstr "Revision {%(revision_id)s} ist nicht in %(weave)s vorhanden"
5631
5632
#: bzrlib/errors.py:1356
5633
msgid "Weave invariant violated: %(what)s"
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:1365
5637
msgid "Parents are mismatched between two revisions. %(msg)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:1387
5641
msgid ""
5642
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5643
"%(weave_b)s"
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:1399
5647
msgid "Versioned file error"
5648
msgstr "Fehler bei versionierter Datei"
5649
5650
#: bzrlib/errors.py:1404
5651
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5652
msgstr "Revision {%(revision_id)s} ist nicht in »%(file_id)s« vorhanden."
5653
5654
#: bzrlib/errors.py:1414
5655
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5656
msgstr "Revision {%(revision_id)s} ist bereits in »%(file_id)s« vorhanden."
5657
5658
#: bzrlib/errors.py:1424
5659
msgid "Text did not match its checksum: %(msg)s"
5660
msgstr "Der Text entsprach nicht seiner Prüfsumme: %(msg)s"
5661
5662
#: bzrlib/errors.py:1550
5663
msgid "Export format %(format)r not supported"
5664
msgstr "Exportformat %(format)r wird nicht unterstützt"
5665
5666
#: bzrlib/errors.py:1559
5667
msgid "Transport error: %(msg)s %(orig_error)s"
5668
msgstr "Übertragungsfehler: %(msg)s %(orig_error)s"
5669
5670
#: bzrlib/errors.py:1585
5671
msgid "Generic bzr smart protocol error: %(details)s"
5672
msgstr "Allgemeiner bzr-Smart-Protokoll-Fehler: %(details)s"
5673
5674
#: bzrlib/errors.py:1593
5675
msgid "Received bad protocol version marker: %(marker)r"
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:1625
5679
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:1630
5683
msgid "Connection error: %(msg)s %(orig_error)s"
5684
msgstr "Verbindungsfehler: %(msg)s %(orig_error)s"
5685
5686
#: bzrlib/errors.py:1635
5687
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5688
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5689
5690
#: bzrlib/errors.py:1656
5691
msgid "Connection closed: %(msg)s %(orig_error)s"
5692
msgstr "Verbindung geschlossen: %(msg)s %(orig_error)s"
5693
5694
#: bzrlib/errors.py:1661
5695
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5696
msgstr "Verbindung abgelaufen: %(msg)s%(orig_error)s"
5697
5698
#: bzrlib/errors.py:1666
5699
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:1676
5703
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5704
msgstr "Ungültige HTTP-Antwort für %(path)s: %(msg)s%(orig_error)s"
5705
5706
#: bzrlib/errors.py:1691
5707
msgid "Certificate error: %(error)s"
5708
msgstr "Zertifikatsfehler: %(error)s"
5709
5710
#: bzrlib/errors.py:1699
5711
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5712
msgstr "Ungültiger HTTP-Bereich %(range)r für %(path)s: %(msg)s"
5713
5714
#: bzrlib/errors.py:1713
5715
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5716
msgstr "»HTTP MIME Boundary« für %(path)s fehlt: %(msg)sy"
5717
5718
#: bzrlib/errors.py:1721
5719
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5720
msgstr "Ungültiger HTTP-Content-type »%(ctype)s« für %(path)s: %(msg)s"
5721
5722
#: bzrlib/errors.py:1730
5723
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5724
msgstr "%(source)s wird%(permanently)s umgeleitet nach %(target)s"
5725
5726
#: bzrlib/errors.py:1744
5727
msgid "Too many redirections"
5728
msgstr "Zu viele Umleitungen"
5729
5730
#: bzrlib/errors.py:1749
5731
msgid "Working tree has conflicts."
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:1753
5735
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5736
msgstr "Konfigurationsdatei %(filename)s ist nicht UTF-8-kodiert\n"
5737
5738
#: bzrlib/errors.py:1762
5739
msgid ""
5740
"Error(s) parsing config file %(filename)s:\n"
5741
"%(errors)s"
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:1772
5745
msgid ""
5746
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5747
"See ``bzr help %(name)s``"
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:1782
5751
msgid "%(username)r does not seem to contain a reasonable email address"
5752
msgstr "%(username)r scheint keine vernünftige E-Mail-Adresse zu haben"
5753
5754
#: bzrlib/errors.py:1791
5755
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5756
msgstr ""
5757
5758
#: bzrlib/errors.py:1799
5759
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5760
msgstr ""
5761
5762
#: bzrlib/errors.py:1807
5763
msgid "Unable to import library \"%(library)s\": %(error)s"
5764
msgstr "Importieren der Bibliothek »%(library)s« nicht möglich: %(error)s"
5765
5766
#: bzrlib/errors.py:1815
5767
msgid "python-gpgme is not installed, it is needed to verify signatures"
5768
msgstr ""
5769
5770
#: bzrlib/errors.py:1823
5771
msgid ""
5772
"The working tree for %(basedir)s has changed since the last commit, but "
5773
"weave merge requires that it be unchanged"
5774
msgstr ""
5775
5776
#: bzrlib/errors.py:1833
5777
msgid ""
5778
"Can't reprocess and show base, because reprocessing obscures the "
5779
"relationship of conflicting lines to the base"
5780
msgstr ""
5781
5782
#: bzrlib/errors.py:1839
5783
msgid "Cycle in graph %(graph)r"
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:1867
5787
msgid "File %(filename)s is not conflicted."
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:1889
5791
msgid "No bundle was found in \"%(filename)s\"."
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:1898
5795
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:1908
5799
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5800
msgstr "Im Zweig %(base)s fehlt Revision %(text_revision)s von %(file_id)s"
5801
5802
#: bzrlib/errors.py:1921
5803
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5804
msgstr ""
5805
5806
#: bzrlib/errors.py:1931
5807
msgid "Key %(key)s is already present in map"
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:1936
5811
msgid "The prefix %(prefix)s is in the help search path twice."
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:1946
5815
msgid ""
5816
"No final name for trans_id %(trans_id)r\n"
5817
"file-id: %(file_id)r\n"
5818
"root trans-id: %(root_trans_id)r\n"
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:1978
5822
msgid "Attempt to reuse a transform that has already been applied."
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:1983
5826
msgid "Moving the root directory is not supported at this time"
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:1988
5830
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5831
msgstr "Umbenennen von %(from_path)s in %(to_path)s gescheitert: %(why)s"
5832
5833
#: bzrlib/errors.py:1999
5834
msgid ""
5835
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2035
5839
msgid ""
5840
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2065
5844
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2073
5848
msgid "Nothing to merge."
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2078
5852
msgid "Format %(format)s cannot be initialised by this version of bzr."
5853
msgstr ""
5854
"Das Format %(format)s kann von dieser Bazaar-Version nicht initialisiert "
5855
"werden."
5856
5857
#: bzrlib/errors.py:2087
5858
msgid ""
5859
"Cannot convert from format %(from_format)s to format %(format)s. "
5860
"%(problem)s"
5861
msgstr ""
5862
5863
#: bzrlib/errors.py:2099
5864
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:2107
5868
msgid "%(exe_name)s could not be found on this machine"
5869
msgstr "%(exe_name)s konnte nicht auf diesem Rechner gefunden werden"
5870
5871
#: bzrlib/errors.py:2115
5872
msgid "Diff is not installed on this machine: %(msg)s"
5873
msgstr "Diff ist auf diesem Rechner nicht installiert: %(msg)s"
5874
5875
#: bzrlib/errors.py:2123
5876
msgid "Diff3 is not installed on this machine."
5877
msgstr "Diff3 ist auf diesem Rechner nicht installiert."
5878
5879
#: bzrlib/errors.py:2129
5880
msgid "The content being inserted is already present."
5881
msgstr "Der gerade eingefügte Inhalt ist bereits vorhanden."
5882
5883
#: bzrlib/errors.py:2134
5884
msgid ""
5885
"This tree contains left-over files from a failed operation.\n"
5886
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5887
"to\n"
5888
" keep, and delete it when you are done."
5889
msgstr ""
5890
5891
#: bzrlib/errors.py:2145
5892
msgid ""
5893
"This tree contains left-over files from a failed operation.\n"
5894
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5895
" wish to keep, and delete it when you are done."
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2155
5899
msgid ""
5900
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5901
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5902
"to\n"
5903
" keep, and delete it when you are done."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2166
5907
msgid ""
5908
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5909
"examine %(pending_deletion)s to see if it contains any files you wish to "
5910
"keep, and delete it when you are done."
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:2176
5914
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2190
5918
msgid ""
5919
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5920
msgstr ""
5921
"Im öffentlichen Zweig »%(public_location)s« fehlt Revision »%(revstring)s«."
5922
5923
#: bzrlib/errors.py:2203
5924
msgid "Error in merge modified format"
5925
msgstr ""
5926
5927
#: bzrlib/errors.py:2208
5928
msgid "Format error in conflict listings"
5929
msgstr ""
5930
5931
#: bzrlib/errors.py:2212
5932
msgid ""
5933
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5934
"Error: %(description)s"
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2223
5938
msgid ""
5939
"An error has been detected in the repository %(repo_path)s.\n"
5940
"Please run bzr reconcile on this repository."
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2234
5944
msgid ""
5945
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5946
"reason: %(reason)s"
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2247
5950
msgid ""
5951
"An inconsistent delta was supplied: %(delta)r\n"
5952
"reason: %(reason)s"
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2259
5956
msgid "To use this feature you must upgrade your branch at %(path)s."
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2268
5960
msgid "To use this feature you must upgrade your repository at %(path)s."
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2273
5964
msgid ""
5965
"To use this feature you must upgrade your branch at %(path)s to a format "
5966
"which supports rich roots."
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2279
5970
msgid "Cannot perform local-only commits on unbound branches."
5971
msgstr ""
5972
5973
#: bzrlib/errors.py:2284
5974
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:2305
5978
msgid "Ghost tags not supported by format %(format)r."
5979
msgstr ""
5980
5981
#: bzrlib/errors.py:2313
5982
msgid "File is binary but should be text."
5983
msgstr "Die Datei ist binär, sollte aber Text sein."
5984
5985
#: bzrlib/errors.py:2318
5986
msgid "The path %(path)s is not permitted on this platform"
5987
msgstr "Der Pfad %(path)s ist auf dieser Plattform nicht erlaubt"
5988
5989
#: bzrlib/errors.py:2327
5990
msgid ""
5991
"Testament did not match expected value.\n"
5992
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5993
" {%(measured)s}"
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2339
5997
msgid "Not a bzr revision-bundle: %(text)r"
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:2348
6001
msgid "Bad bzr revision-bundle: %(text)r"
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:2357
6005
msgid "Malformed bzr revision-bundle header: %(text)r"
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2362
6009
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:2367
6013
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:2372
6017
msgid "End of line marker was not \\n in bzr revision-bundle"
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:2382
6021
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6022
msgstr ""
6023
6024
#: bzrlib/errors.py:2392
6025
msgid "Root class for inventory serialization errors"
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:2396
6029
msgid ""
6030
"The inventory was not in the expected format:\n"
6031
" %(msg)s"
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:2405
6035
msgid "This operation requires rich root data storage"
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:2418
6039
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:2427
6043
msgid ""
6044
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6045
"variable."
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:2434
6049
msgid ""
6050
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6051
"ghost at {%(ghost_revision_id)s}"
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:2444
6055
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6056
msgstr "Geister-Revision {%(revision_id)s} kann hier nicht benutzt werden."
6057
6058
#: bzrlib/errors.py:2495
6059
msgid ""
6060
"A merge directive must provide either a bundle or a public branch location."
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:2502
6064
msgid "Bad merge directive payload %(start)r"
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:2512
6068
msgid "Preview patch does not match requested changes."
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:2518
6072
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:2528
6076
msgid ""
6077
"Your branch does not have all of the revisions required in order to merge "
6078
"this merge directive and the target location specified in the merge "
6079
"directive is not a branch: %(location)s."
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:2540
6083
msgid "Unsupported entry kind %(kind)s"
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:2548
6087
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:2558
6091
msgid "Subsume target %(other_tree)s needs to be upgraded."
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:2577
6095
msgid "No such tag: %(tag_name)s"
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:2585
6099
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:2594
6103
msgid "Tag %(tag_name)s already exists."
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:2602
6107
msgid ""
6108
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6109
"bugs\" for more information on this feature."
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:2612
6113
msgid ""
6114
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:2622
6118
msgid ""
6119
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6120
msgstr ""
6121
6122
#: bzrlib/errors.py:2632
6123
msgid "Invalid line in bugs property: '%(line)s'"
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:2640
6127
msgid "Invalid bug status: '%(status)s'"
6128
msgstr ""
6129
6130
#: bzrlib/errors.py:2648
6131
msgid "Could not understand response from smart server: %(response_tuple)r"
6132
msgstr ""
6133
6134
#: bzrlib/errors.py:2687
6135
msgid "Server sent an unexpected error: %(error_tuple)r"
6136
msgstr "Der Server meldete einen unerwarteten Fehler: %(error_tuple)r"
6137
6138
#: bzrlib/errors.py:2706
6139
msgid "Unrecognised container format: %(container_format)r"
6140
msgstr ""
6141
6142
#: bzrlib/errors.py:2714
6143
msgid "Unexpected end of container stream"
6144
msgstr ""
6145
6146
#: bzrlib/errors.py:2719
6147
msgid "Unknown record type: %(record_type)r"
6148
msgstr ""
6149
6150
#: bzrlib/errors.py:2727
6151
msgid "Invalid record: %(reason)s"
6152
msgstr ""
6153
6154
#: bzrlib/errors.py:2735
6155
msgid "Container has data after end marker: %(excess)r"
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:2743
6159
msgid "Container has multiple records with the same name: %(name)s"
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:2756
6163
msgid "Corrupt or incompatible data stream: %(reason)s"
6164
msgstr "Fehlerhafter oder inkompatibler Datenstrom: %(reason)s"
6165
6166
#: bzrlib/errors.py:2764
6167
msgid "SMTP error: %(error)s"
6168
msgstr "SMTP-Fehler: %(error)s"
6169
6170
#: bzrlib/errors.py:2772
6171
msgid "No message supplied."
6172
msgstr ""
6173
6174
#: bzrlib/errors.py:2777
6175
msgid "No mail-to address (--mail-to) or output (-o) specified."
6176
msgstr ""
6177
6178
#: bzrlib/errors.py:2782
6179
msgid ""
6180
"Unable to find mail client with the following names: "
6181
"%(mail_command_list_string)s"
6182
msgstr ""
6183
6184
#: bzrlib/errors.py:2792
6185
msgid "SMTP connection to %(host)s refused"
6186
msgstr "SMTP-Verbindung zu %(host)s wurde abgelehnt"
6187
6188
#: bzrlib/errors.py:2801
6189
msgid "Please specify smtp_server. No server at default %(host)s."
6190
msgstr ""
6191
6192
#: bzrlib/errors.py:2815
6193
msgid ""
6194
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6195
"reconfigure."
6196
msgstr ""
6197
6198
#: bzrlib/errors.py:2827
6199
msgid "'%(display_url)s' is already a branch."
6200
msgstr "»%(display_url)s« ist bereits ein Zweig."
6201
6202
#: bzrlib/errors.py:2832
6203
msgid "'%(display_url)s' is already a tree."
6204
msgstr ""
6205
6206
#: bzrlib/errors.py:2837
6207
msgid "'%(display_url)s' is already a checkout."
6208
msgstr ""
6209
6210
#: bzrlib/errors.py:2842
6211
msgid "'%(display_url)s' is already a lightweight checkout."
6212
msgstr ""
6213
6214
#: bzrlib/errors.py:2847
6215
msgid "'%(display_url)s' is already using a shared repository."
6216
msgstr ""
6217
6218
#: bzrlib/errors.py:2852
6219
msgid "'%(display_url)s' is already standalone."
6220
msgstr ""
6221
6222
#: bzrlib/errors.py:2857
6223
msgid "Shared repository '%(display_url)s' already creates working trees."
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:2863
6227
msgid ""
6228
"Shared repository '%(display_url)s' already doesn't create working trees."
6229
msgstr ""
6230
6231
#: bzrlib/errors.py:2869
6232
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6233
msgstr ""
6234
6235
#: bzrlib/errors.py:2874
6236
msgid "No location could be found to bind to at %(display_url)s."
6237
msgstr ""
6238
6239
#: bzrlib/errors.py:2879
6240
msgid ""
6241
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6242
"status).%(more)s"
6243
msgstr ""
6244
6245
#: bzrlib/errors.py:2898
6246
msgid ""
6247
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6248
msgstr ""
6249
6250
#: bzrlib/errors.py:2913
6251
msgid ""
6252
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6253
"list).%(more)s"
6254
msgstr ""
6255
6256
#: bzrlib/errors.py:2919
6257
msgid "Variable {%(name)s} is not available."
6258
msgstr "Variable {%(name)s} steht nicht zur Verfügung."
6259
6260
#: bzrlib/errors.py:2927
6261
msgid "No template specified."
6262
msgstr ""
6263
6264
#: bzrlib/errors.py:2932
6265
msgid "Unable to create symlink %(path_str)son this platform"
6266
msgstr ""
6267
6268
#: bzrlib/errors.py:2947
6269
msgid ""
6270
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6271
"\"original\", \"local\"."
6272
msgstr ""
6273
"Ungültiges Zeitzonenformat »%(timezone)s«, die Optionen sind »utc«, "
6274
"»original« und »local«."
6275
6276
#: bzrlib/errors.py:2981
6277
msgid ""
6278
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6279
msgstr ""
6280
6281
#: bzrlib/errors.py:2993
6282
msgid "The \"%(config_id)s\" configuration does not exist."
6283
msgstr "Die Konfiguration »%(config_id)s« existiert nicht."
6284
6285
#: bzrlib/errors.py:3001
6286
msgid "The \"%(option_name)s\" configuration option does not exist."
6287
msgstr "Die Konfigurationsoption »%(option_name)s« existiert nicht."
6288
6289
#: bzrlib/errors.py:3009
6290
msgid "The alias \"%(alias_name)s\" does not exist."
6291
msgstr "Der Alias »%(alias_name)s« existiert nicht."
6292
6293
#: bzrlib/errors.py:3023
6294
msgid "\"%(alias_name)s\" is not a valid location alias."
6295
msgstr ""
6296
6297
#: bzrlib/errors.py:3031
6298
msgid "No %(alias_name)s location assigned."
6299
msgstr ""
6300
6301
#: bzrlib/errors.py:3039
6302
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6303
msgstr ""
6304
6305
#: bzrlib/errors.py:3049
6306
msgid "Unknown rules detected: %(unknowns_str)s."
6307
msgstr "Unbekannte Regeln festgestellt: %(unknowns_str)s."
6308
6309
#: bzrlib/errors.py:3060
6310
msgid "Tip change rejected: %(msg)s"
6311
msgstr ""
6312
6313
#: bzrlib/errors.py:3068
6314
msgid "Shelf corrupt."
6315
msgstr ""
6316
6317
#: bzrlib/errors.py:3073
6318
msgid "Corruption while decompressing repository file%(orig_error)s"
6319
msgstr ""
6320
6321
#: bzrlib/errors.py:3085
6322
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6323
msgstr ""
6324
6325
#: bzrlib/errors.py:3093
6326
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6327
msgstr ""
6328
6329
#: bzrlib/errors.py:3101
6330
msgid ""
6331
"An attempt to access a url outside the server jail was made: '%(url)s'."
6332
msgstr ""
6333
6334
#: bzrlib/errors.py:3109
6335
msgid "The user aborted the operation."
6336
msgstr "Der Vorgang wurde vom Benutzer abgebrochen."
6337
6338
#: bzrlib/errors.py:3114
6339
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6340
msgstr ""
6341
6342
#: bzrlib/errors.py:3124
6343
msgid "No such view: %(view_name)s."
6344
msgstr ""
6345
6346
#: bzrlib/errors.py:3134
6347
msgid ""
6348
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6349
"to a later format."
6350
msgstr ""
6351
6352
#: bzrlib/errors.py:3143
6353
msgid ""
6354
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6355
msgstr ""
6356
6357
#: bzrlib/errors.py:3210
6358
msgid "%(bzrdir)r does not support co-located branches."
6359
msgstr ""
6360
6361
#: bzrlib/errors.py:3216
6362
msgid ""
6363
"Unable to determine your name.\n"
6364
"Please, set your name with the 'whoami' command.\n"
6365
"E.g. bzr whoami \"Your Name <name@example.com>\""
6366
msgstr ""
6367
6368
#: bzrlib/errors.py:3225
6369
msgid "Invalid pattern(s) found. %(msg)s"
6370
msgstr "Ungültige(s) Muster gefunden. %(msg)s"
6371
6372
#: bzrlib/errors.py:3233
6373
msgid ""
6374
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6375
"unbind` to fix."
6376
msgstr ""
6377
6378
#: bzrlib/errors.py:3244
6379
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6380
msgstr ""
6381
6382
#: bzrlib/errors.py:3253
6383
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6384
msgstr ""
6385
6386
#: bzrlib/errors.py:3262
6387
msgid ""
6388
"No compatible object available for operations from %(source)r to %(target)r."
6389
msgstr ""
6390
6391
#: bzrlib/errors.py:3272
6392
msgid ""
6393
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6394
"%(arguments)s."
6395
msgstr ""
6396
6397
#: bzrlib/errors.py:3282
6398
msgid ""
6399
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6400
"format %(format)r"
6401
msgstr ""
6402
6403
#: bzrlib/errors.py:3294
6404
msgid ""
6405
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6406
"plugin."
6407
msgstr ""
6408
"Die fehlende Funktion %(feature)s wird weder von dieser Bazaar-Version noch "
6409
"von irgendeiner Erweiterung unterstützt."
6410
6411
#: bzrlib/errors.py:3307
6412
msgid "Binary files section encountered."
6413
msgstr "Auf einen Abschnitt für Binärdateien gestoßen."
6414
6415
#: bzrlib/errors.py:3315
6416
msgid ""
6417
"Malformed patch header. %(desc)s\n"
6418
"%(line)r"
6419
msgstr ""
6420
6421
#: bzrlib/errors.py:3324
6422
msgid ""
6423
"Malformed hunk header. %(desc)s\n"
6424
"%(line)r"
6425
msgstr ""
6426
6427
#: bzrlib/errors.py:3333
6428
msgid ""
6429
"Malformed line. %(desc)s\n"
6430
"%(line)r"
6431
msgstr ""
6432
"Ungültige Zeile. %(desc)s\n"
6433
"%(line)r"
6434
6435
#: bzrlib/errors.py:3343
6436
msgid ""
6437
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6438
"but patch says it should be \"%(patch_line)s\""
6439
msgstr ""
6440
6441
#: bzrlib/errors.py:3354
6442
msgid "The feature %(feature)s has already been registered."
6443
msgstr ""
6444
6445
#: bzrlib/errors.py:3362
6446
msgid ""
6447
"Cannot store uncommitted changes because this branch already stores "
6448
"uncommitted changes."
6449
msgstr ""
6450
6451
#: bzrlib/export_pot.py:252
6452
#, python-format
6453
msgid "Exporting messages from builtin command: %s"
6454
msgstr ""
6455
6456
#: bzrlib/export_pot.py:271
6457
msgid "Exporting messages from plugin command: {0} in {1}"
6458
msgstr ""
6459
6460
#: bzrlib/export_pot.py:292
6461
#, python-format
6462
msgid "Exporting message from error: %s"
6463
msgstr ""
6464
6465
#: bzrlib/fetch.py:98
6466
msgid "Finding revisions"
6467
msgstr "Revisionen finden"
6468
6469
#: bzrlib/fetch.py:103
6470
msgid "Fetching revisions"
6471
msgstr "Revisionen herunterladen"
6472
6473
#: bzrlib/foreign.py:262
6474
msgid "Push into a different VCS without any custom bzr metadata."
6475
msgstr ""
6476
6477
#: bzrlib/foreign.py:264
6478
msgid ""
6479
"This will afterwards rebase the local branch on the remote\n"
6480
"branch unless the --no-rebase option is used, in which case \n"
6481
"the two branches will be out of sync after the push. "
6482
msgstr ""
6483
6484
#: bzrlib/foreign.py:277
6485
msgid "Do not rebase after push."
6486
msgstr ""
6487
6488
#: bzrlib/foreign.py:311
6489
#, python-format
6490
msgid "Using saved location: %s\n"
6491
msgstr ""
6492
6493
#: bzrlib/foreign.py:321
6494
msgid ""
6495
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6496
"regular push."
6497
msgstr ""
6498
6499
#: bzrlib/gpg.py:366
6500
msgid "No GnuPG key results for pattern: {0}"
6501
msgstr ""
6502
6503
#: bzrlib/gpg.py:439
6504
msgid "{0} commits with valid signatures"
6505
msgstr ""
6506
6507
#: bzrlib/gpg.py:445
6508
msgid "{0} commit with unknown key"
6509
msgid_plural "{0} commits with unknown keys"
6510
msgstr[0] ""
6511
msgstr[1] ""
6512
6513
#: bzrlib/gpg.py:453
6514
msgid "{0} commit not valid"
6515
msgid_plural "{0} commits not valid"
6516
msgstr[0] ""
6517
msgstr[1] ""
6518
6519
#: bzrlib/gpg.py:461
6520
msgid "{0} commit not signed"
6521
msgid_plural "{0} commits not signed"
6522
msgstr[0] ""
6523
msgstr[1] ""
6524
6525
#: bzrlib/gpg.py:469
6526
msgid "{0} commit with key now expired"
6527
msgid_plural "{0} commits with key now expired"
6528
msgstr[0] ""
6529
msgstr[1] ""
6530
6531
#: bzrlib/gpg.py:489
6532
msgid "{0} commit by author {1} with key {2} now expired"
6533
msgid_plural "{0} commits by author {1} with key {2} now expired"
6534
msgstr[0] ""
6535
msgstr[1] ""
6536
6537
#: bzrlib/gpg.py:505
6538
msgid "{0} signed {1} commit"
6539
msgid_plural "{0} signed {1} commits"
6540
msgstr[0] ""
6541
msgstr[1] ""
6542
6543
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6544
msgid "{0} commit by author {1}"
6545
msgid_plural "{0} commits by author {1}"
6546
msgstr[0] ""
6547
msgstr[1] ""
6548
6549
#: bzrlib/gpg.py:554
6550
msgid "Unknown key {0} signed {1} commit"
6551
msgid_plural "Unknown key {0} signed {1} commits"
6552
msgstr[0] ""
6553
msgstr[1] ""
6554
6555
#: bzrlib/groupcompress.py:1739
6556
#, python-format
6557
msgid "Insert claimed random_id=True, but then inserted %r two times"
6558
msgstr ""
6559
6560
#: bzrlib/hooks.py:313
6561
#, python-format
6562
msgid "Introduced in: %s"
6563
msgstr "Eingeführt in: %s"
6564
6565
#: bzrlib/hooks.py:316
6566
#, python-format
6567
msgid "Deprecated in: %s"
6568
msgstr "Veraltet in: %s"
6569
6570
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6571
msgid "Walking content"
6572
msgstr ""
6573
6574
#: bzrlib/knit.py:3330
6575
msgid "annotating"
6576
msgstr ""
6577
6578
#: bzrlib/lock.py:549
6579
msgid "{0!r} was {1} locked again"
6580
msgstr ""
6581
6582
#: bzrlib/lockdir.py:321
6583
#, python-format
6584
msgid "error removing pending lock: %s"
6585
msgstr ""
6586
6587
#: bzrlib/lockdir.py:616
6588
msgid "Unable to obtain"
6589
msgstr ""
6590
6591
#: bzrlib/lockdir.py:618
6592
msgid "Lock owner changed for"
6593
msgstr ""
6594
6595
#: bzrlib/lockdir.py:620
6596
msgid "{0} lock {1} {2}."
6597
msgstr ""
6598
6599
#: bzrlib/lockdir.py:627
6600
#, python-format
6601
msgid "Will continue to try until %s, unless you press Ctrl-C."
6602
msgstr ""
6603
6604
#: bzrlib/lockdir.py:629
6605
msgid "See \"bzr help break-lock\" for more."
6606
msgstr "Siehe »bzr help break-lock« für mehr Informationen."
6607
6608
#: bzrlib/lockdir.py:739
6609
#, python-format
6610
msgid ""
6611
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6612
msgstr ""
6613
6614
#: bzrlib/log.py:563
6615
msgid "--exclude-common-ancestry requires two different revisions"
6616
msgstr "--exclude-common-ancestry erfordert zwei verschiedene Revisionen"
6617
6618
#: bzrlib/log.py:565
6619
#, python-format
6620
msgid "invalid direction %r"
6621
msgstr "Ungültige Richtung %r"
6622
6623
#: bzrlib/log.py:653
6624
msgid "Start revision not found in history of end revision."
6625
msgstr ""
6626
6627
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6628
msgid "Logging revision 0 is invalid."
6629
msgstr ""
6630
6631
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6632
msgid "Start revision must be older than the end revision."
6633
msgstr ""
6634
6635
#: bzrlib/log.py:1818
6636
#, python-format
6637
msgid "unknown log formatter: %r"
6638
msgstr "Unbekannter Protokollformatierer: %r"
6639
6640
#: bzrlib/log.py:2114
6641
msgid "fixes bug"
6642
msgid_plural "fixes bugs"
6643
msgstr[0] "behebt den Fehler"
6644
msgstr[1] "behebt die Fehler"
6645
6646
#: bzrlib/merge.py:689
6647
msgid "All changes applied successfully."
6648
msgstr "Alle Änderungen erfolgreich angewendet."
6649
6650
#: bzrlib/merge.py:691
6651
#, python-format
6652
msgid "%d conflicts encountered."
6653
msgstr "Auf %d Konflikte gestoßen."
6654
6655
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6656
msgid "Preparing file merge"
6657
msgstr ""
6658
6659
#: bzrlib/multiparent.py:426
6660
msgid "Importing revisions"
6661
msgstr "Revisionen importieren"
6662
6663
#: bzrlib/option.py:526
6664
msgid "Show help message."
6665
msgstr "Hilfetext anzeigen."
6666
6667
#: bzrlib/option.py:528
6668
msgid "Only display errors and warnings."
6669
msgstr "Nur Fehler und Warnungen anzeigen."
6670
6671
#: bzrlib/option.py:531
6672
msgid "Show usage message and options."
6673
msgstr "Aufruf und Optionen anzeigen."
6674
6675
#: bzrlib/option.py:533
6676
msgid "Display more information."
6677
msgstr "Weitere Informationen anzeigen."
6678
6679
#: bzrlib/option.py:541
6680
msgid ""
6681
"Select changes introduced by the specified revision. See also \"help "
6682
"revisionspec\"."
6683
msgstr ""
6684
6685
#: bzrlib/option.py:543
6686
msgid "Branch to operate on, instead of working directory."
6687
msgstr ""
6688
6689
#: bzrlib/option.py:545
6690
msgid "Detailed log format."
6691
msgstr "Ausführliches Protokollformat."
6692
6693
#: bzrlib/option.py:545
6694
msgid "Format used by GNU ChangeLog files."
6695
msgstr "Format von »GNU ChangeLog«-Dateien."
6696
6697
#: bzrlib/option.py:545
6698
msgid "Log format with one line per revision."
6699
msgstr "Protokollformat mit einer Zeile pro Revision."
6700
6701
#: bzrlib/option.py:545
6702
msgid "Moderately short log format."
6703
msgstr "Relativ kurzes Protokollformat."
6704
6705
#: bzrlib/option.py:545
6706
msgid "Use specified log format."
6707
msgstr "Angegebenes Protokollformat benutzen."
6708
6709
#: bzrlib/option.py:547
6710
msgid "Log format"
6711
msgstr "Protokollformat"
6712
6713
#: bzrlib/option.py:549
6714
msgid "LCA-newness merge."
6715
msgstr ""
6716
6717
#: bzrlib/option.py:549
6718
msgid "Merge using external diff3."
6719
msgstr ""
6720
6721
#: bzrlib/option.py:549
6722
msgid "Native diff3-style merge."
6723
msgstr ""
6724
6725
#: bzrlib/option.py:549
6726
msgid "Select a particular merge algorithm."
6727
msgstr ""
6728
6729
#: bzrlib/option.py:549
6730
msgid "Weave-based merge."
6731
msgstr ""
6732
6733
#: bzrlib/option.py:551
6734
msgid "Merge algorithm"
6735
msgstr ""
6736
6737
#: bzrlib/option.py:554
6738
msgid "Message string."
6739
msgstr "Nachrichtenzeichenkette."
6740
6741
#: bzrlib/option.py:556
6742
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6743
msgstr ""
6744
6745
#: bzrlib/option.py:558
6746
msgid "Ignore differences between branches and overwrite unconditionally."
6747
msgstr ""
6748
6749
#: bzrlib/option.py:560
6750
msgid "Remember the specified location as a default."
6751
msgstr "Den angegebenen Ort als Vorgabe merken."
6752
6753
#: bzrlib/option.py:562
6754
msgid "Reprocess to reduce spurious conflicts."
6755
msgstr "Erneut ausführen, um scheinbare Konflikte zu verringern."
6756
6757
#: bzrlib/option.py:566
6758
msgid "See \"help revisionspec\" for details."
6759
msgstr "Siehe »help revisionspec« für Details."
6760
6761
#: bzrlib/option.py:568
6762
msgid "Show internal object ids."
6763
msgstr ""
6764
6765
#: bzrlib/option.py:571
6766
msgid "Display timezone as local, original, or utc."
6767
msgstr "Zeitzone als local, original oder utc anzeigen."
6768
6769
#: bzrlib/osutils.py:100
6770
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6771
msgstr ""
6772
6773
#: bzrlib/osutils.py:220
6774
msgid "lstat/stat of ({0!r}): {1!r}"
6775
msgstr ""
6776
6777
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6778
#, python-format
6779
msgid "sorry, %r not allowed in path"
6780
msgstr "Entschuldigung, %r ist im Pfad nicht erlaubt"
6781
6782
#: bzrlib/osutils.py:1259
6783
#, python-format
6784
msgid "%r is too short to calculate a relative path"
6785
msgstr "%r ist zu kurz, um einen relativen Pfad zu berechnen"
6786
6787
#: bzrlib/plugin.py:143
6788
#, python-format
6789
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6790
msgstr "»%s« ist keine gültige <plugin_name>@<plugin_path>-Beschreibung "
6791
6792
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6793
msgid "Enable completions for the selected plugin (default: all plugins)"
6794
msgstr ""
6795
6796
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6797
msgid "Generate a shell function for bash command line completion."
6798
msgstr ""
6799
6800
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6801
msgid ""
6802
"This command generates a shell function which can be used by bash to\n"
6803
"automatically complete the currently typed command when the user presses\n"
6804
"the completion key (usually tab)."
6805
msgstr ""
6806
6807
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6808
msgid ""
6809
"Commonly used like this:\n"
6810
" eval \"`bzr bash-completion`\""
6811
msgstr ""
6812
"Gebräuchlicher Aufruf wie folgt:\n"
6813
" eval \"`bzr bash-completion`\""
6814
6815
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6816
msgid "Name of the generated function (default: _bzr)"
6817
msgstr "Name der erzeugten Funktion (Vorgabe: _bzr)"
6818
6819
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6820
msgid "Generate only the shell function, don't enable it"
6821
msgstr ""
6822
6823
#: bzrlib/plugins/grep/cmds.py:77
6824
msgid "Print lines matching PATTERN for specified files and revisions."
6825
msgstr ""
6826
6827
#: bzrlib/plugins/grep/cmds.py:79
6828
msgid ""
6829
"This command searches the specified files and revisions for a given\n"
6830
"pattern. The pattern is specified as a Python regular expressions[1]."
6831
msgstr ""
6832
6833
#: bzrlib/plugins/grep/cmds.py:82
6834
msgid ""
6835
"If the file name is not specified, the revisions starting with the\n"
6836
"current directory are searched recursively. If the revision number is\n"
6837
"not specified, the working copy is searched. To search the last committed\n"
6838
"revision, use the '-r -1' or '-r last:1' option."
6839
msgstr ""
6840
6841
#: bzrlib/plugins/grep/cmds.py:87
6842
msgid ""
6843
"Unversioned files are not searched unless explicitly specified on the\n"
6844
"command line. Unversioned directores are not searched."
6845
msgstr ""
6846
6847
#: bzrlib/plugins/grep/cmds.py:90
6848
msgid ""
6849
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6850
"format. If a revision is explicitly searched, the output is shown as\n"
6851
"'filepath~N:string', where N is the revision number."
6852
msgstr ""
6853
6854
#: bzrlib/plugins/grep/cmds.py:94
6855
msgid ""
6856
"--include and --exclude options can be used to search only (or exclude\n"
6857
"from search) files with base name matches the specified Unix style GLOB\n"
6858
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6859
"to quote wildcard or backslash character literally. Note that the glob\n"
6860
"pattern is not a regular expression."
6861
msgstr ""
6862
6863
#: bzrlib/plugins/grep/cmds.py:100
6864
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6865
msgstr ""
6866
6867
#: bzrlib/plugins/grep/cmds.py:109
6868
msgid "Show match in color. WHEN is never, always or auto."
6869
msgstr ""
6870
6871
#: bzrlib/plugins/grep/cmds.py:111
6872
msgid "Grep for pattern in changeset for each revision."
6873
msgstr ""
6874
6875
#: bzrlib/plugins/grep/cmds.py:113
6876
msgid "Skip files whose base name matches GLOB."
6877
msgstr ""
6878
6879
#: bzrlib/plugins/grep/cmds.py:115
6880
msgid "Search only files whose base name matches GLOB."
6881
msgstr ""
6882
6883
#: bzrlib/plugins/grep/cmds.py:117
6884
msgid "Print only the name of each input file in which PATTERN is found."
6885
msgstr ""
6886
6887
#: bzrlib/plugins/grep/cmds.py:120
6888
msgid "Print only the name of each input file in which PATTERN is not found."
6889
msgstr ""
6890
6891
#: bzrlib/plugins/grep/cmds.py:123
6892
msgid "Interpret PATTERN is a single fixed string (not regex)."
6893
msgstr ""
6894
6895
#: bzrlib/plugins/grep/cmds.py:125
6896
msgid ""
6897
"Search for pattern starting from the root of the branch. (implies --"
6898
"recursive)"
6899
msgstr ""
6900
6901
#: bzrlib/plugins/grep/cmds.py:128
6902
msgid "ignore case distinctions while matching."
6903
msgstr ""
6904
6905
#: bzrlib/plugins/grep/cmds.py:130
6906
msgid ""
6907
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6908
msgstr ""
6909
6910
#: bzrlib/plugins/grep/cmds.py:135
6911
msgid "show 1-based line number."
6912
msgstr ""
6913
6914
#: bzrlib/plugins/grep/cmds.py:137
6915
msgid "Don't recurse into subdirectories. (default is --recursive)"
6916
msgstr ""
6917
6918
#: bzrlib/plugins/grep/cmds.py:139
6919
msgid ""
6920
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6921
"newline."
6922
msgstr ""
6923
6924
#: bzrlib/plugins/launchpad/account.py:66
6925
msgid "Setting ssh/sftp usernames for launchpad.net."
6926
msgstr "SSH/SFTP-Benutzernamen für launchpad.net festlegen."
6927
6928
#: bzrlib/plugins/launchpad/cmds.py:43
6929
msgid "Register a branch with launchpad.net."
6930
msgstr "Einen Zweig bei launchpad.net registrieren."
6931
6932
#: bzrlib/plugins/launchpad/cmds.py:45
6933
msgid ""
6934
"This command lists a bzr branch in the directory of branches on\n"
6935
"launchpad.net. Registration allows the branch to be associated with\n"
6936
"bugs or specifications."
6937
msgstr ""
6938
6939
#: bzrlib/plugins/launchpad/cmds.py:49
6940
msgid ""
6941
"Before using this command you must register the project to which the\n"
6942
"branch belongs, and create an account for yourself on launchpad.net."
6943
msgstr ""
6944
6945
#: bzrlib/plugins/launchpad/cmds.py:52
6946
msgid ""
6947
"arguments:\n"
6948
" public_url: The publicly visible url for the branch to register.\n"
6949
" This must be an http or https url (which Launchpad can read\n"
6950
" from to access the branch). Local file urls, SFTP urls, and\n"
6951
" bzr+ssh urls will not work.\n"
6952
" If no public_url is provided, bzr will use the configured\n"
6953
" public_url if there is one for the current branch, and\n"
6954
" otherwise error."
6955
msgstr ""
6956
6957
#: bzrlib/plugins/launchpad/cmds.py:61
6958
msgid ""
6959
"example:\n"
6960
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6961
" --project fooproject"
6962
msgstr ""
6963
"Beispiel:\n"
6964
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6965
" --project fooproject"
6966
6967
#: bzrlib/plugins/launchpad/cmds.py:68
6968
msgid "Launchpad project short name to associate with the branch."
6969
msgstr "Launchpad-Projekt-Kurzname, dem der Zweig zugeordnet wird."
6970
6971
#: bzrlib/plugins/launchpad/cmds.py:75
6972
msgid ""
6973
"Short name for the branch; by default taken from the last component of the "
6974
"url."
6975
msgstr ""
6976
6977
#: bzrlib/plugins/launchpad/cmds.py:79
6978
msgid "One-sentence description of the branch."
6979
msgstr "Beschreibung des Zweiges in einem Satz."
6980
6981
#: bzrlib/plugins/launchpad/cmds.py:82
6982
msgid "Longer description of the purpose or contents of the branch."
6983
msgstr "Längere Beschreibung für den Zweck oder die Inhalte des Zweiges."
6984
6985
#: bzrlib/plugins/launchpad/cmds.py:85
6986
msgid "Branch author's email address, if not yourself."
6987
msgstr "E-Mail-Adresse des Autors des Zweigs, wenn Sie es nicht selbst sind."
6988
6989
#: bzrlib/plugins/launchpad/cmds.py:88
6990
msgid "The bug this branch fixes."
6991
msgstr "Der Fehler, den dieser Zweig behebt."
6992
6993
#: bzrlib/plugins/launchpad/cmds.py:91
6994
msgid "Prepare the request but don't actually send it."
6995
msgstr "Die Anfrage vorbereiten, aber nicht absenden."
6996
6997
#: bzrlib/plugins/launchpad/cmds.py:113
6998
msgid ""
6999
"register-branch requires a public branch url - see bzr help register-branch."
7000
msgstr ""
7001
7002
#: bzrlib/plugins/launchpad/cmds.py:121
7003
msgid "--product is deprecated; please use --project."
7004
msgstr "--product ist veraltet; bitte --project benutzen."
7005
7006
#: bzrlib/plugins/launchpad/cmds.py:151
7007
msgid "Open a Launchpad branch page in your web browser."
7008
msgstr "Eine Launchpad-Zweig-Seite in Ihrem Web-Browser öffnen."
7009
7010
#: bzrlib/plugins/launchpad/cmds.py:156
7011
msgid "Do not actually open the browser. Just say the URL we would use."
7012
msgstr ""
7013
7014
#: bzrlib/plugins/launchpad/cmds.py:191
7015
#, python-format
7016
msgid "Opening %s in web browser"
7017
msgstr "%s wird im Web-Browser geöffnet"
7018
7019
#: bzrlib/plugins/launchpad/cmds.py:199
7020
msgid "Show or set the Launchpad user ID."
7021
msgstr "Den Launchpad-Benutzernamen anzeigen oder festlegen."
7022
7023
#: bzrlib/plugins/launchpad/cmds.py:201
7024
msgid ""
7025
"When communicating with Launchpad, some commands need to know your\n"
7026
"Launchpad user ID. This command can be used to set or show the\n"
7027
"user ID that Bazaar will use for such communication."
7028
msgstr ""
7029
7030
#: bzrlib/plugins/launchpad/cmds.py:205
7031
msgid ""
7032
":Examples:\n"
7033
" Show the Launchpad ID of the current user::"
7034
msgstr ""
7035
7036
#: bzrlib/plugins/launchpad/cmds.py:208
7037
msgid " bzr launchpad-login"
7038
msgstr " bzr launchpad-login"
7039
7040
#: bzrlib/plugins/launchpad/cmds.py:210
7041
msgid " Set the Launchpad ID of the current user to 'bob'::"
7042
msgstr ""
7043
7044
#: bzrlib/plugins/launchpad/cmds.py:212
7045
msgid " bzr launchpad-login bob"
7046
msgstr " bzr launchpad-login bob"
7047
7048
#: bzrlib/plugins/launchpad/cmds.py:219
7049
msgid "Don't check that the user name is valid."
7050
msgstr "Den Benutzernamen nicht auf Gültigkeit prüfen."
7051
7052
#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
7053
msgid "Launchpad user ID exists and has SSH keys.\n"
7054
msgstr "Launchpad-Benutzername existiert und hat SSH-Schlüssel.\n"
7055
7056
#: bzrlib/plugins/launchpad/cmds.py:237
7057
msgid "No Launchpad user ID configured.\n"
7058
msgstr "Kein Launchpad-Benutzername konfiguriert.\n"
7059
7060
#: bzrlib/plugins/launchpad/cmds.py:248
7061
#, python-format
7062
msgid "Launchpad user ID set to '%s'.\n"
7063
msgstr "Launchpad-Benutzername auf »%s« festgelegt.\n"
7064
7065
#: bzrlib/plugins/launchpad/cmds.py:254
7066
msgid "Ask Launchpad to mirror a branch now."
7067
msgstr "Launchpad jetzt darum bitten, einen Zweig zu spiegeln."
7068
7069
#: bzrlib/plugins/launchpad/cmds.py:271
7070
msgid "Propose merging a branch on Launchpad."
7071
msgstr ""
7072
7073
#: bzrlib/plugins/launchpad/cmds.py:273
7074
msgid ""
7075
"This will open your usual editor to provide the initial comment. When it\n"
7076
"has created the proposal, it will open it in your default web browser."
7077
msgstr ""
7078
7079
#: bzrlib/plugins/launchpad/cmds.py:276
7080
msgid ""
7081
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7082
"is not supplied, the remembered submit branch will be used. If no submit\n"
7083
"branch is remembered, the development focus will be used."
7084
msgstr ""
7085
7086
#: bzrlib/plugins/launchpad/cmds.py:280
7087
msgid ""
7088
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7089
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7090
"The parameter the launchpad account name of the desired reviewer. This\n"
7091
"may optionally be followed by '=' and the review type. For example:"
7092
msgstr ""
7093
7094
#: bzrlib/plugins/launchpad/cmds.py:285
7095
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7096
msgstr ""
7097
7098
#: bzrlib/plugins/launchpad/cmds.py:287
7099
msgid ""
7100
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7101
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7102
msgstr ""
7103
7104
#: bzrlib/plugins/launchpad/cmds.py:292
7105
msgid "Propose the merge on staging."
7106
msgstr ""
7107
7108
#: bzrlib/plugins/launchpad/cmds.py:294
7109
msgid "Commit message."
7110
msgstr ""
7111
7112
#: bzrlib/plugins/launchpad/cmds.py:296
7113
msgid ""
7114
"Mark the proposal as approved immediately, setting the approved revision to "
7115
"tip."
7116
msgstr ""
7117
7118
#: bzrlib/plugins/launchpad/cmds.py:298
7119
msgid "The bug this proposal fixes."
7120
msgstr ""
7121
7122
#: bzrlib/plugins/launchpad/cmds.py:300
7123
msgid "Requested reviewer and optional type."
7124
msgstr ""
7125
7126
#: bzrlib/plugins/launchpad/cmds.py:335
7127
msgid "Find the proposal to merge this revision."
7128
msgstr ""
7129
7130
#: bzrlib/plugins/launchpad/cmds.py:337
7131
msgid ""
7132
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7133
"This works only if the if the merged_revno was recorded for the merge\n"
7134
"proposal. The proposal(s) are opened in a web browser."
7135
msgstr ""
7136
7137
#: bzrlib/plugins/launchpad/cmds.py:341
7138
msgid ""
7139
"Only the revision specified is searched for. To find the mainline\n"
7140
"revision that merged it into mainline, use the \"mainline\" revision spec."
7141
msgstr ""
7142
7143
#: bzrlib/plugins/launchpad/cmds.py:344
7144
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7145
msgstr ""
7146
7147
#: bzrlib/plugins/launchpad/cmds.py:346
7148
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
7149
msgstr ""
7150
7151
#: bzrlib/plugins/launchpad/cmds.py:365
7152
msgid "No review found."
7153
msgstr ""
7154
7155
#: bzrlib/plugins/launchpad/cmds.py:366
7156
#, python-format
7157
msgid "%d proposals(s) found."
7158
msgstr ""
7159
7160
#: bzrlib/plugins/launchpad/cmds.py:378
7161
msgid "Finding proposals"
7162
msgstr ""
7163
7164
#: bzrlib/plugins/launchpad/lp_api.py:228
7165
#: bzrlib/plugins/launchpad/lp_api.py:233
7166
#, python-format
7167
msgid "%s is not registered on Launchpad"
7168
msgstr "%s ist nicht in Launchpad registriert"
7169
7170
#: bzrlib/plugins/launchpad/lp_api.py:243
7171
#, python-format
7172
msgid "%s has no development focus."
7173
msgstr ""
7174
7175
#: bzrlib/plugins/launchpad/lp_api.py:248
7176
#, python-format
7177
msgid "development focus %s has no branch."
7178
msgstr ""
7179
7180
#: bzrlib/plugins/launchpad/lp_api.py:253
7181
#, python-format
7182
msgid "source package %s has no branch."
7183
msgstr ""
7184
7185
#: bzrlib/plugins/launchpad/lp_api.py:257
7186
#, python-format
7187
msgid "%s has no associated product or source package."
7188
msgstr ""
7189
7190
#: bzrlib/plugins/launchpad/lp_api.py:269
7191
#, python-format
7192
msgid "%s is already up-to-date."
7193
msgstr "%s ist bereits auf dem neuesten Stand."
7194
7195
#: bzrlib/plugins/launchpad/lp_api.py:276
7196
#, python-format
7197
msgid "Pushing to %s"
7198
msgstr ""
7199
7200
#: bzrlib/plugins/launchpad/lp_directory.py:170
7201
msgid ""
7202
"resolution for {0}\n"
7203
" local: {1}\n"
7204
" remote: {2}"
7205
msgstr ""
7206
7207
#: bzrlib/plugins/launchpad/lp_propose.py:159
7208
#, python-format
7209
msgid "There is already a branch merge proposal: %s"
7210
msgstr ""
7211
7212
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7213
msgid "pb parameter to convert() is deprecated"
7214
msgstr ""
7215
7216
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7217
msgid "starting upgrade from format 4 to 5"
7218
msgstr ""
7219
7220
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7221
msgid "note: upgrade may be faster if all store files are ungzipped first"
7222
msgstr ""
7223
7224
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7225
msgid "converting revision"
7226
msgstr "Revision umwandeln"
7227
7228
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7229
msgid "upgraded to weaves:"
7230
msgstr ""
7231
7232
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7233
#, python-format
7234
msgid "%6d revisions and inventories"
7235
msgstr ""
7236
7237
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7238
#, python-format
7239
msgid "%6d revisions not present"
7240
msgstr "%6d Revisionen nicht vorhanden"
7241
7242
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7243
#, python-format
7244
msgid "%6d texts"
7245
msgstr "%6d Texte"
7246
7247
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7248
msgid "writing weave"
7249
msgstr ""
7250
7251
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7252
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7253
msgid "inventory"
7254
msgstr ""
7255
7256
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7257
msgid "write revision"
7258
msgstr "Revision schreiben"
7259
7260
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7261
msgid "loading revision"
7262
msgstr "Revision laden"
7263
7264
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7265
#, python-format
7266
msgid "revision {%s} not present in branch; will be converted as a ghost"
7267
msgstr ""
7268
7269
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7270
msgid "starting upgrade from format 5 to 6"
7271
msgstr ""
7272
7273
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7274
#, python-format
7275
msgid "adding prefixes to %s"
7276
msgstr ""
7277
7278
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7279
msgid "starting upgrade from format 6 to metadir"
7280
msgstr ""
7281
7282
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7283
msgid "Removing ancestry.weave"
7284
msgstr ""
7285
7286
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7287
msgid "Finding branch files"
7288
msgstr "Dateien des Zweigs finden"
7289
7290
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7291
msgid "Upgrading repository"
7292
msgstr ""
7293
7294
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7295
msgid "Upgrading branch"
7296
msgstr ""
7297
7298
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7299
msgid "No working tree."
7300
msgstr ""
7301
7302
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7303
msgid "Upgrading working tree"
7304
msgstr ""
7305
7306
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7307
#, python-format
7308
msgid "Make %s lock"
7309
msgstr ""
7310
7311
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7312
#, python-format
7313
msgid "Moving %s"
7314
msgstr "%s wird verschoben"
7315
7316
#: bzrlib/push.py:56
7317
msgid "Created new branch."
7318
msgstr "Neuer Zweig wurde erstellt."
7319
7320
#: bzrlib/push.py:97
7321
#, python-format
7322
msgid ""
7323
"Target directory %s already contains a .bzr directory, but it is not valid."
7324
msgstr ""
7325
7326
#: bzrlib/push.py:101
7327
#, python-format
7328
msgid ""
7329
"Target directory %s already exists, but does not have a .bzr directory. "
7330
"Supply --use-existing-dir to push there anyway."
7331
msgstr ""
7332
7333
#: bzrlib/push.py:122
7334
#, python-format
7335
msgid "Too many redirections trying to make %s."
7336
msgstr ""
7337
7338
#: bzrlib/push.py:148
7339
msgid ""
7340
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7341
"information."
7342
msgstr ""
7343
7344
#: bzrlib/push.py:152
7345
#, python-format
7346
msgid ""
7347
"It is not possible to losslessly push to %s. You may want to use dpush "
7348
"instead."
7349
msgstr ""
7350
7351
#: bzrlib/push.py:158
7352
#, python-format
7353
msgid ""
7354
"At %s you have a valid .bzr control directory, but not a branch or "
7355
"repository. This is an unsupported configuration. Please move the target "
7356
"directory out of the way and try again."
7357
msgstr ""
7358
7359
#: bzrlib/reconcile.py:97
7360
#, python-format
7361
msgid "Reconciling branch %s"
7362
msgstr ""
7363
7364
#: bzrlib/reconcile.py:103
7365
#, python-format
7366
msgid "Reconciling repository %s"
7367
msgstr ""
7368
7369
#: bzrlib/reconcile.py:105
7370
msgid "Reconciling repository"
7371
msgstr ""
7372
7373
#: bzrlib/reconcile.py:111
7374
#, python-format
7375
msgid "%s cannot canonicalize CHKs."
7376
msgstr ""
7377
7378
#: bzrlib/reconcile.py:119
7379
msgid "Reconcile aborted: revision index has inconsistent parents."
7380
msgstr ""
7381
7382
#: bzrlib/reconcile.py:121
7383
msgid "Run \"bzr check\" for more details."
7384
msgstr ""
7385
7386
#: bzrlib/reconcile.py:123
7387
msgid "Reconciliation complete."
7388
msgstr ""
7389
7390
#: bzrlib/reconcile.py:166
7391
msgid "Fixing last revision info {0} => {1}"
7392
msgstr ""
7393
7394
#: bzrlib/reconcile.py:173
7395
msgid "revision_history ok."
7396
msgstr ""
7397
7398
#: bzrlib/reconcile.py:234
7399
msgid "Reading inventory data"
7400
msgstr ""
7401
7402
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7403
msgid "Inventory ok."
7404
msgstr ""
7405
7406
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7407
msgid "Backing up inventory"
7408
msgstr ""
7409
7410
#: bzrlib/reconcile.py:258
7411
msgid "Backup inventory created."
7412
msgstr ""
7413
7414
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7415
msgid "Writing weave"
7416
msgstr ""
7417
7418
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7419
msgid "Inventory regenerated."
7420
msgstr ""
7421
7422
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7423
msgid "Reading indexes"
7424
msgstr ""
7425
7426
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7427
msgid "Checking unused inventories"
7428
msgstr ""
7429
7430
#: bzrlib/reconcile.py:388
7431
msgid "Backup Inventory created"
7432
msgstr ""
7433
7434
#: bzrlib/reconcile.py:446
7435
msgid "Fixing text parents"
7436
msgstr ""
7437
7438
#: bzrlib/reconfigure.py:54
7439
msgid "{0} is now stacked on {1}\n"
7440
msgstr ""
7441
7442
#: bzrlib/reconfigure.py:69
7443
#, python-format
7444
msgid "%s is now not stacked\n"
7445
msgstr ""
7446
7447
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7448
#, python-format
7449
msgid "bzr: ERROR (ignored): %s"
7450
msgstr ""
7451
7452
#: bzrlib/remote.py:2534
7453
msgid "Copying repository content as tarball..."
7454
msgstr ""
7455
7456
#: bzrlib/rename_map.py:69
7457
msgid "Calculating hashes"
7458
msgstr ""
7459
7460
#: bzrlib/rename_map.py:107
7461
msgid "Determining hash hits"
7462
msgstr ""
7463
7464
#: bzrlib/rename_map.py:242
7465
msgid "{0} => {1}"
7466
msgstr ""
7467
7468
#: bzrlib/repository.py:1738
7469
msgid "Moving repository to repository.backup"
7470
msgstr ""
7471
7472
#: bzrlib/repository.py:1745
7473
msgid "Creating new repository"
7474
msgstr ""
7475
7476
#: bzrlib/repository.py:1750
7477
msgid "Copying content"
7478
msgstr ""
7479
7480
#: bzrlib/repository.py:1754
7481
msgid "Deleting old repository content"
7482
msgstr ""
7483
7484
#: bzrlib/repository.py:1756
7485
msgid "repository converted"
7486
msgstr ""
7487
7488
#: bzrlib/revisionspec.py:903
7489
msgid "Using {0} {1}"
7490
msgstr ""
7491
7492
#: bzrlib/send.py:59
7493
#, python-format
7494
msgid "Mail client \"%s\" does not support specifying body"
7495
msgstr ""
7496
7497
#: bzrlib/send.py:63
7498
msgid "--remember requires a branch to be specified."
7499
msgstr ""
7500
7501
#: bzrlib/send.py:78
7502
msgid "No submit branch known or specified"
7503
msgstr ""
7504
7505
#: bzrlib/send.py:81
7506
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7507
msgstr ""
7508
7509
#: bzrlib/send.py:99
7510
#, python-format
7511
msgid "No such send format '%s'."
7512
msgstr ""
7513
7514
#: bzrlib/send.py:115
7515
msgid "bzr send takes at most two one revision identifiers"
7516
msgstr ""
7517
7518
#: bzrlib/send.py:128
7519
msgid "No revisions to submit."
7520
msgstr ""
7521
7522
#: bzrlib/send.py:140
7523
msgid ""
7524
"- not supported for merge directives that use more than one output file."
7525
msgstr ""
7526
7527
#: bzrlib/send.py:186
7528
msgid "Format 0.9 does not permit bundle with no patch"
7529
msgstr ""
7530
7531
#: bzrlib/shelf_ui.py:46
7532
#, python-format
7533
msgid "Shelve adding file \"%(path)s\"?"
7534
msgstr ""
7535
7536
#: bzrlib/shelf_ui.py:47
7537
msgid "Shelve binary changes?"
7538
msgstr ""
7539
7540
#: bzrlib/shelf_ui.py:48
7541
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7542
msgstr ""
7543
7544
#: bzrlib/shelf_ui.py:50
7545
#, python-format
7546
msgid "Shelve removing file \"%(path)s\"?"
7547
msgstr ""
7548
7549
#: bzrlib/shelf_ui.py:51
7550
#, python-format
7551
msgid "Shelve %d change(s)?"
7552
msgstr ""
7553
7554
#: bzrlib/shelf_ui.py:52
7555
msgid "Shelve?"
7556
msgstr ""
7557
7558
#: bzrlib/shelf_ui.py:53
7559
#, python-format
7560
msgid ""
7561
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7562
msgstr ""
7563
7564
#: bzrlib/shelf_ui.py:55
7565
#, python-format
7566
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7567
msgstr ""
7568
7569
#: bzrlib/shelf_ui.py:70
7570
#, python-format
7571
msgid "Changes shelved with id \"%d\"."
7572
msgstr ""
7573
7574
#: bzrlib/shelf_ui.py:74
7575
msgid "Selected changes destroyed."
7576
msgstr ""
7577
7578
#: bzrlib/shelf_ui.py:78
7579
msgid "Selected changes:"
7580
msgstr ""
7581
7582
#: bzrlib/shelf_ui.py:98
7583
#, python-format
7584
msgid "Delete file \"%(path)s\"?"
7585
msgstr ""
7586
7587
#: bzrlib/shelf_ui.py:99
7588
msgid "Apply binary changes?"
7589
msgstr ""
7590
7591
#: bzrlib/shelf_ui.py:100
7592
#, python-format
7593
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7594
msgstr ""
7595
7596
#: bzrlib/shelf_ui.py:102
7597
#, python-format
7598
msgid "Add file \"%(path)s\"?"
7599
msgstr ""
7600
7601
#: bzrlib/shelf_ui.py:103
7602
#, python-format
7603
msgid "Apply %d change(s)?"
7604
msgstr ""
7605
7606
#: bzrlib/shelf_ui.py:104
7607
msgid "Apply change?"
7608
msgstr ""
7609
7610
#: bzrlib/shelf_ui.py:105
7611
#, python-format
7612
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7613
msgstr ""
7614
7615
#: bzrlib/shelf_ui.py:107
7616
#, python-format
7617
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7618
msgstr ""
7619
7620
#: bzrlib/shelf_ui.py:402
7621
msgid "No changes are shelved."
7622
msgstr ""
7623
7624
#: bzrlib/shelf_ui.py:460
7625
#, python-format
7626
msgid "Using changes with id \"%d\"."
7627
msgstr ""
7628
7629
#: bzrlib/shelf_ui.py:464
7630
#, python-format
7631
msgid "Message: %s"
7632
msgstr ""
7633
7634
#: bzrlib/shelf_ui.py:476
7635
#, python-format
7636
msgid "Deleted changes with id \"%d\"."
7637
msgstr ""
7638
7639
#: bzrlib/smart/medium.py:714
7640
msgid "HPSS calls: {0} ({1} vfs) {2}"
7641
msgstr ""
7642
7643
#: bzrlib/smart/ping.py:32
7644
msgid "Pings a Bazaar smart server."
7645
msgstr ""
7646
7647
#: bzrlib/smart/ping.py:34
7648
msgid ""
7649
"This command sends a 'hello' request to the given location using the bzr\n"
7650
"smart protocol, and reports the response."
7651
msgstr ""
7652
7653
#: bzrlib/smart/server.py:169
7654
msgid "Requested to stop gracefully"
7655
msgstr ""
7656
7657
#: bzrlib/smart/server.py:179
7658
#, python-format
7659
msgid "Waiting for %d client(s) to finish"
7660
msgstr ""
7661
7662
#: bzrlib/smart/server.py:185
7663
#, python-format
7664
msgid "Still waiting for %d client(s) to finish"
7665
msgstr ""
7666
7667
#: bzrlib/smart/server.py:219
7668
#, python-format
7669
msgid "listening socket error: %s"
7670
msgstr ""
7671
7672
#: bzrlib/smart/server.py:452
7673
#, python-format
7674
msgid "listening on port: %s"
7675
msgstr ""
7676
7677
#: bzrlib/switch.py:84
7678
msgid "Pending merges must be committed or reverted before using switch."
7679
msgstr ""
7680
7681
#: bzrlib/switch.py:111
7682
msgid ""
7683
"Cannot switch as local commits found in the checkout. Commit these to the "
7684
"bound branch or use --force to throw them away."
7685
msgstr ""
7686
7687
#: bzrlib/switch.py:116
7688
#, python-format
7689
msgid ""
7690
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7691
"anyway, use --force."
7692
msgstr ""
7693
7694
#: bzrlib/switch.py:140
7695
msgid "Cannot switch a branch, only a checkout."
7696
msgstr ""
7697
7698
#: bzrlib/switch.py:183
7699
#, python-format
7700
msgid "Tree is up to date at revision %d."
7701
msgstr ""
7702
7703
#: bzrlib/switch.py:190
7704
#, python-format
7705
msgid "Updated to revision %d."
7706
msgstr ""
7707
7708
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7709
msgid "Apply phase"
7710
msgstr ""
7711
7712
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7713
msgid "removing file"
7714
msgstr ""
7715
7716
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7717
msgid "adding file"
7718
msgstr ""
7719
7720
#: bzrlib/transform.py:2598
7721
msgid "Building tree"
7722
msgstr ""
7723
7724
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7725
msgid "Adding file contents"
7726
msgstr ""
7727
7728
#: bzrlib/transform.py:3017
7729
msgid "Resolution pass"
7730
msgstr ""
7731
7732
#: bzrlib/transport/ftp/_gssapi.py:88
7733
#, python-format
7734
msgid "Authenticated as %s"
7735
msgstr ""
7736
7737
#: bzrlib/tree.py:647
7738
msgid "*** {0} content-filter: {1} => {2!r}"
7739
msgstr ""
7740
7741
#: bzrlib/upgrade.py:77
7742
#, python-format
7743
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7744
msgstr ""
7745
7746
#: bzrlib/upgrade.py:100
7747
#, python-format
7748
msgid "cannot upgrade from bzrdir format %s"
7749
msgstr ""
7750
7751
#: bzrlib/upgrade.py:103
7752
#, python-format
7753
msgid "starting upgrade of %s"
7754
msgstr ""
7755
7756
#: bzrlib/upgrade.py:110
7757
msgid "finished"
7758
msgstr ""
7759
7760
#: bzrlib/upgrade.py:120
7761
msgid "Deleting backup.bzr"
7762
msgstr "Lösche backup.bzr"
7763
7764
#: bzrlib/upgrade.py:151
7765
msgid ""
7766
"\n"
7767
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7768
msgstr ""
7769
7770
#: bzrlib/upgrade.py:208
7771
#, python-format
7772
msgid "Found %d dependent branches - upgrading ..."
7773
msgstr ""
7774
7775
#: bzrlib/upgrade.py:276
7776
msgid "Upgrading bzrdirs"
7777
msgstr ""
7778
7779
#: bzrlib/upgrade.py:282
7780
#, python-format
7781
msgid "Upgrading %s"
7782
msgstr "%s wird aktualisiert"
7783
7784
#: bzrlib/upgrade.py:283
7785
msgid "Upgrading {0} {1} ..."
7786
msgstr ""
7787
7788
#: bzrlib/upgrade.py:301
7789
msgid "Removing backup ..."
7790
msgstr "Entferne Backup…"
7791
7792
#: bzrlib/upgrade.py:305
7793
msgid "failed to clean-up {0}: {1}"
7794
msgstr ""
7795
7796
#: bzrlib/vf_repository.py:1091
7797
msgid "inventories"
7798
msgstr ""
7799
7800
#: bzrlib/vf_repository.py:1117
7801
msgid "texts"
7802
msgstr ""
7803
7804
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7805
msgid "Calculating text parents"
7806
msgstr ""
7807
7808
#: bzrlib/vf_repository.py:1707
7809
msgid "Fetch texts"
7810
msgstr ""
7811
7812
#: bzrlib/vf_repository.py:2536
7813
msgid "loading text store"
7814
msgstr ""
7815
7816
#: bzrlib/vf_repository.py:2542
7817
msgid "checking text graph"
7818
msgstr ""
7819
7820
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7821
#: bzrlib/vf_repository.py:3127
7822
msgid "Transferring revisions"
7823
msgstr ""
7824
7825
#: bzrlib/win32utils.py:146
7826
msgid "Failed to GetProcessMemoryInfo()"
7827
msgstr ""
7828
7829
#: bzrlib/win32utils.py:167
7830
msgid "Cannot debug memory on win32 without ctypes or win32process"
7831
msgstr ""
7832
7833
#: bzrlib/win32utils.py:172
7834
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7835
msgstr ""
7836
7837
#: bzrlib/win32utils.py:180
7838
#, python-format
7839
msgid "WorkingSize %8d KiB"
7840
msgstr ""
7841
7842
#: bzrlib/win32utils.py:181
7843
#, python-format
7844
msgid "PeakWorking %8d KiB"
7845
msgstr ""
7846
7847
#: bzrlib/win32utils.py:182
7848
#, python-format
7849
msgid "PagefileUsage %8d KiB"
7850
msgstr ""
7851
7852
#: bzrlib/win32utils.py:183
7853
#, python-format
7854
msgid "PeakPagefileUsage %8d KiB"
7855
msgstr ""
7856
7857
#: bzrlib/win32utils.py:185
7858
#, python-format
7859
msgid "PrivateUsage %8d KiB"
7860
msgstr ""
7861
7862
#: bzrlib/win32utils.py:186
7863
#, python-format
7864
msgid "PageFaultCount %8d"
7865
msgstr ""
7866
7867
#: bzrlib/workingtree.py:1516
7868
msgid "Rerun update after fixing the conflicts."
7869
msgstr ""
7870
7871
#: dummy/help_topics/authentication/summary.txt:1
7872
msgid "Information on configuring authentication"
7873
msgstr ""
7874
7875
#: dummy/help_topics/basic/detail.txt:1
7876
msgid ""
7877
"Bazaar 2.6.0 -- a free distributed version-control tool\n"
7878
"http://bazaar.canonical.com/"
7879
msgstr ""
7880
7881
#: dummy/help_topics/basic/detail.txt:4
7882
msgid ""
7883
"Basic commands:\n"
7884
" bzr init makes this directory a versioned branch\n"
7885
" bzr branch make a copy of another branch"
7886
msgstr ""
7887
"Grundbefehle:\n"
7888
" bzr init Aktuelles Verzeichnis wird zu einem versionierten Zweig "
7889
"gemacht\n"
7890
" bzr branch Eine Kopie eines anderen Entwicklungszweigs wird "
7891
"erstellt"
7892
7893
#: dummy/help_topics/basic/detail.txt:8
7894
msgid ""
7895
" bzr add make files or directories versioned\n"
7896
" bzr ignore ignore a file or pattern\n"
7897
" bzr mv move or rename a versioned file"
7898
msgstr ""
7899
" bzr add Dateien oder Verzeichnisse werden versioniert\n"
7900
" bzr ignore Eine Datei oder ein Dateimuster wird ignoriert\n"
7901
" bzr mv Eine versionierte Datei wird verschoben oder umbenannt"
7902
7903
#: dummy/help_topics/basic/detail.txt:12
7904
msgid ""
7905
" bzr status summarize changes in working copy\n"
7906
" bzr diff show detailed diffs"
7907
msgstr ""
7908
7909
#: dummy/help_topics/basic/detail.txt:15
7910
msgid ""
7911
" bzr merge pull in changes from another branch\n"
7912
" bzr commit save some or all changes\n"
7913
" bzr send send changes via email"
7914
msgstr ""
7915
7916
#: dummy/help_topics/basic/detail.txt:19
7917
msgid ""
7918
" bzr log show history of changes\n"
7919
" bzr check validate storage"
7920
msgstr ""
7921
7922
#: dummy/help_topics/basic/detail.txt:22
7923
msgid ""
7924
" bzr help init more help on e.g. init command\n"
7925
" bzr help commands list all commands\n"
7926
" bzr help topics list all help topics\n"
7927
msgstr ""
7928
7929
#: dummy/help_topics/basic/summary.txt:1
7930
msgid "Basic commands"
7931
msgstr "Einfache Befehle"
7932
7933
#: dummy/help_topics/branches/detail.txt:1
7934
msgid "Branches"
7935
msgstr "Zweige"
7936
7937
#: dummy/help_topics/branches/detail.txt:3
7938
msgid ""
7939
"A branch consists of the state of a project, including all of its\n"
7940
"history. All branches have a repository associated (which is where the\n"
7941
"branch history is stored), but multiple branches may share the same\n"
7942
"repository (a shared repository). Branches can be copied and merged."
7943
msgstr ""
7944
7945
#: dummy/help_topics/branches/detail.txt:8
7946
msgid ""
7947
"In addition, one branch may be bound to another one. Binding to another\n"
7948
"branch indicates that commits which happen in this branch must also \n"
7949
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7950
"commits when the two branches are out of date. In order for a commit \n"
7951
"to succeed, it may be necessary to update the current branch using \n"
7952
"``bzr update``."
7953
msgstr ""
7954
7955
#: dummy/help_topics/branches/detail.txt:15
7956
#: dummy/help_topics/checkouts/detail.txt:66
7957
#: dummy/help_topics/repositories/detail.txt:36
7958
msgid "Related commands::"
7959
msgstr ""
7960
7961
#: dummy/help_topics/branches/detail.txt:17
7962
msgid ""
7963
" init Change a directory into a versioned branch.\n"
7964
" branch Create a new branch that is a copy of an existing branch.\n"
7965
" merge Perform a three-way merge.\n"
7966
" bind Bind a branch to another one.\n"
7967
msgstr ""
7968
" init Ein Verzeichnis wird als ein versionierter Zweig festgelegt\n"
7969
" branch Ein neuer Zweig wird durch Kopieren eines bestehenden Zweigs "
7970
"erstellt\n"
7971
" merge Ein Dreiwege-Merge wird durchgeführt\n"
7972
" bind Ein Zweig wird mit einem anderen verbunden\n"
7973
7974
#: dummy/help_topics/branches/summary.txt:1
7975
msgid "Information on what a branch is"
7976
msgstr ""
7977
7978
#: dummy/help_topics/bugs/summary.txt:1
7979
msgid "Bug tracker settings"
7980
msgstr "Bug Tracker Einstellungen"
7981
7982
#: dummy/help_topics/checkouts/detail.txt:1
7983
msgid "Checkouts"
7984
msgstr ""
7985
7986
#: dummy/help_topics/checkouts/detail.txt:3
7987
msgid ""
7988
"Checkouts are source trees that are connected to a branch, so that when\n"
7989
"you commit in the source tree, the commit goes into that branch. They\n"
7990
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7991
"Bazaar's decentralized features until you want them. Using checkouts\n"
7992
"with shared repositories is very similar to working with SVN or CVS, but\n"
7993
"doesn't have the same restrictions. And using checkouts still allows\n"
7994
"others working on the project to use whatever workflow they like."
7995
msgstr ""
7996
7997
#: dummy/help_topics/checkouts/detail.txt:11
7998
msgid ""
7999
"A checkout is created with the bzr checkout command (see \"help "
8000
"checkout\").\n"
8001
"You pass it a reference to another branch, and it will create a local copy\n"
8002
"for you that still contains a reference to the branch you created the\n"
8003
"checkout from (the master branch). Then if you make any commits they will "
8004
"be\n"
8005
"made on the other branch first. This creates an instant mirror of your work, "
8006
"or\n"
8007
"facilitates lockstep development, where each developer is working together,\n"
8008
"continuously integrating the changes of others."
8009
msgstr ""
8010
8011
#: dummy/help_topics/checkouts/detail.txt:19
8012
msgid ""
8013
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8014
"you have the full history locally. As you have a first class branch you "
8015
"can\n"
8016
"also commit locally if you want, for instance due to the temporary loss af "
8017
"a\n"
8018
"network connection. Use the --local option to commit to do this. All the "
8019
"local\n"
8020
"commits will then be made on the master branch the next time you do a non-"
8021
"local\n"
8022
"commit."
8023
msgstr ""
8024
8025
#: dummy/help_topics/checkouts/detail.txt:26
8026
msgid ""
8027
"If you are using a checkout from a shared branch you will periodically want "
8028
"to\n"
8029
"pull in all the changes made by others. This is done using the \"update\"\n"
8030
"command. The changes need to be applied before any non-local commit, but\n"
8031
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8032
"command when needed."
8033
msgstr ""
8034
8035
#: dummy/help_topics/checkouts/detail.txt:32
8036
msgid ""
8037
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8038
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8039
"SVN checkout in that it is not a first class branch, it mainly consists of "
8040
"the\n"
8041
"working tree. This means that any history operations must query the master\n"
8042
"branch, which could be slow if a network connection is involved. Also, as "
8043
"you\n"
8044
"don't have a local branch, then you cannot commit locally."
8045
msgstr ""
8046
8047
#: dummy/help_topics/checkouts/detail.txt:39
8048
msgid ""
8049
"Lightweight checkouts work best when you have fast reliable access to the\n"
8050
"master branch. This means that if the master branch is on the same disk or "
8051
"LAN\n"
8052
"a lightweight checkout will be faster than a heavyweight one for any "
8053
"commands\n"
8054
"that modify the revision history (as only one copy of the branch needs to\n"
8055
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8056
"that uses the history but does not change it, but if the master branch is "
8057
"on\n"
8058
"the same disk then there won't be a noticeable difference."
8059
msgstr ""
8060
8061
#: dummy/help_topics/checkouts/detail.txt:47
8062
msgid ""
8063
"Another possible use for a checkout is to use it with a treeless repository\n"
8064
"containing your branches, where you maintain only one working tree by\n"
8065
"switching the master branch that the checkout points to when you want to\n"
8066
"work on a different branch."
8067
msgstr ""
8068
8069
#: dummy/help_topics/checkouts/detail.txt:52
8070
msgid ""
8071
"Obviously to commit on a checkout you need to be able to write to the "
8072
"master\n"
8073
"branch. This means that the master branch must be accessible over a "
8074
"writeable\n"
8075
"protocol , such as sftp://, and that you have write permissions at the "
8076
"other\n"
8077
"end. Checkouts also work on the local file system, so that all that matters "
8078
"is\n"
8079
"file permissions."
8080
msgstr ""
8081
8082
#: dummy/help_topics/checkouts/detail.txt:58
8083
msgid ""
8084
"You can change the master of a checkout by using the \"switch\" command "
8085
"(see\n"
8086
"\"help switch\"). This will change the location that the commits are sent "
8087
"to.\n"
8088
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8089
"checkout. If you would like to convert your heavy checkout into a normal\n"
8090
"branch so that every commit is local, you can use the \"unbind\" command. To "
8091
"see\n"
8092
"whether or not a branch is bound or not you can use the \"info\" command. If "
8093
"the\n"
8094
"branch is bound it will tell you the location of the bound branch."
8095
msgstr ""
8096
8097
#: dummy/help_topics/checkouts/detail.txt:68
8098
msgid ""
8099
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8100
" checkout\n"
8101
" update Pull any changes in the master branch in to your checkout\n"
8102
" commit Make a commit that is sent to the master branch. If you have\n"
8103
" a heavy checkout then the --local option will commit to the\n"
8104
" checkout without sending the commit to the master\n"
8105
" switch Change the master branch that the commits in the checkout "
8106
"will\n"
8107
" be sent to\n"
8108
" bind Turn a standalone branch into a heavy checkout so that any\n"
8109
" commits will be sent to the master branch\n"
8110
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8111
" commits are only made locally\n"
8112
" info Displays whether a branch is bound or unbound. If the branch "
8113
"is\n"
8114
" bound, then it will also display the location of the bound "
8115
"branch\n"
8116
msgstr ""
8117
8118
#: dummy/help_topics/checkouts/summary.txt:1
8119
msgid "Information on what a checkout is"
8120
msgstr ""
8121
8122
#: dummy/help_topics/commands/summary.txt:1
8123
msgid "Basic help for all commands"
8124
msgstr ""
8125
8126
#: dummy/help_topics/configuration/summary.txt:1
8127
msgid "Details on the configuration settings available"
8128
msgstr ""
8129
8130
#: dummy/help_topics/conflict-types/summary.txt:1
8131
msgid "Types of conflicts and what to do about them"
8132
msgstr ""
8133
8134
#: dummy/help_topics/content-filters/summary.txt:1
8135
msgid "Conversion of content into/from working trees"
8136
msgstr ""
8137
8138
#: dummy/help_topics/criss-cross/detail.txt:1
8139
msgid "Criss-Cross"
8140
msgstr "Kreuz und Quer"
8141
8142
#: dummy/help_topics/criss-cross/detail.txt:3
8143
msgid ""
8144
"A criss-cross in the branch history can cause the default merge technique\n"
8145
"to emit more conflicts than would normally be expected."
8146
msgstr ""
8147
8148
#: dummy/help_topics/criss-cross/detail.txt:6
8149
msgid ""
8150
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8151
"give\n"
8152
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8153
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8154
msgstr ""
8155
8156
#: dummy/help_topics/criss-cross/detail.txt:10
8157
msgid ""
8158
"Criss-crosses occur in a branch's history if two branches merge the same "
8159
"thing\n"
8160
"and then merge one another, or if two branches merge one another at the "
8161
"same\n"
8162
"time. They can be avoided by having each branch only merge from or into a\n"
8163
"designated central branch (a \"star topology\")."
8164
msgstr ""
8165
8166
#: dummy/help_topics/criss-cross/detail.txt:15
8167
msgid ""
8168
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8169
"default\n"
8170
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8171
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8172
"differences between THIS and OTHER are due to one side adding lines, or\n"
8173
"from another side removing lines."
8174
msgstr ""
8175
8176
#: dummy/help_topics/criss-cross/detail.txt:21
8177
msgid ""
8178
"Criss-crosses mean there is no good choice for a base. Selecting the "
8179
"recent\n"
8180
"merge points could cause one side's changes to be silently discarded.\n"
8181
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8182
"are emitted."
8183
msgstr ""
8184
8185
#: dummy/help_topics/criss-cross/detail.txt:26
8186
msgid ""
8187
"The ``weave`` merge type is not affected by this problem because it uses\n"
8188
"line-origin detection instead of a basis revision to determine the cause of\n"
8189
"differences.\n"
8190
msgstr ""
8191
8192
#: dummy/help_topics/criss-cross/summary.txt:1
8193
msgid "Information on criss-cross merging"
8194
msgstr ""
8195
8196
#: dummy/help_topics/current-formats/summary.txt:1
8197
msgid "Current storage formats"
8198
msgstr "Aktuelle Speicherformate"
8199
8200
#: dummy/help_topics/debug-flags/summary.txt:1
8201
msgid "Options to show or record debug information"
8202
msgstr ""
8203
8204
#: dummy/help_topics/diverged-branches/summary.txt:1
8205
msgid "How to fix diverged branches"
8206
msgstr ""
8207
8208
#: dummy/help_topics/env-variables/summary.txt:1
8209
msgid "Environment variable names and values"
8210
msgstr ""
8211
8212
#: dummy/help_topics/eol/summary.txt:1
8213
msgid "Information on end-of-line handling"
8214
msgstr ""
8215
8216
#: dummy/help_topics/files/detail.txt:1
8217
msgid "Files"
8218
msgstr "Dateien"
8219
8220
#: dummy/help_topics/files/detail.txt:3
8221
msgid ""
8222
":On Unix: ~/.bazaar/bazaar.conf\n"
8223
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8224
"bazaar\\\\2.0\\\\bazaar.conf"
8225
msgstr ""
8226
":In Unix: ~/.bazaar/bazaar.conf\n"
8227
":In Windows: C:\\\\Dokumente und Einstellungen\\\\Benutzername\\\\"
8228
"Anwendungsdaten\\\\bazaar\\\\2.0\\\\bazaar.conf"
8229
8230
#: dummy/help_topics/files/detail.txt:6
8231
msgid ""
8232
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8233
"used to define general configuration that will be applied everywhere.\n"
8234
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8235
"commonly used options."
8236
msgstr ""
8237
8238
#: dummy/help_topics/files/detail.txt:11
8239
msgid "A typical config file might look something like::"
8240
msgstr "Eine typische Konfigurationsdatei könnte so aussehen::"
8241
8242
#: dummy/help_topics/files/detail.txt:13
8243
msgid ""
8244
" [DEFAULT]\n"
8245
" email=John Doe <jdoe@isp.com>"
8246
msgstr ""
8247
8248
#: dummy/help_topics/files/detail.txt:16
8249
msgid ""
8250
" [ALIASES]\n"
8251
" commit = commit --strict\n"
8252
" log10 = log --short -r -10..-1\n"
8253
msgstr ""
8254
8255
#: dummy/help_topics/files/summary.txt:1
8256
msgid "Information on configuration and log files"
8257
msgstr ""
8258
8259
#: dummy/help_topics/formats/detail.txt:1
8260
msgid "Storage Formats"
8261
msgstr "Speicherformate"
8262
8263
#: dummy/help_topics/formats/detail.txt:3
8264
msgid ""
8265
"To ensure that older clients do not access data incorrectly,\n"
8266
"Bazaar's policy is to introduce a new storage format whenever\n"
8267
"new features requiring new metadata are added. New storage\n"
8268
"formats may also be introduced to improve performance and\n"
8269
"scalability."
8270
msgstr ""
8271
8272
#: dummy/help_topics/formats/detail.txt:9
8273
msgid ""
8274
"The newest format, 2a, is highly recommended. If your\n"
8275
"project is not using 2a, then you should suggest to the\n"
8276
"project owner to upgrade."
8277
msgstr ""
8278
8279
#: dummy/help_topics/formats/detail.txt:13
8280
msgid ""
8281
"\n"
8282
".. note::"
8283
msgstr ""
8284
8285
#: dummy/help_topics/formats/detail.txt:16
8286
msgid ""
8287
" Some of the older formats have two variants:\n"
8288
" a plain one and a rich-root one. The latter include an additional\n"
8289
" field about the root of the tree. There is no performance cost\n"
8290
" for using a rich-root format but you cannot easily merge changes\n"
8291
" from a rich-root format into a plain format. As a consequence,\n"
8292
" moving a project to a rich-root format takes some co-ordination\n"
8293
" in that all contributors need to upgrade their repositories\n"
8294
" around the same time. 2a and all future formats will be\n"
8295
" implicitly rich-root."
8296
msgstr ""
8297
8298
#: dummy/help_topics/formats/detail.txt:26
8299
msgid ""
8300
"See :doc:`current-formats-help` for the complete list of\n"
8301
"currently supported formats. See :doc:`other-formats-help` for\n"
8302
"descriptions of any available experimental and deprecated formats.\n"
8303
msgstr ""
8304
8305
#: dummy/help_topics/formats/summary.txt:1
8306
msgid "Information on choosing a storage format"
8307
msgstr "Informationen zur Auswahl eines Speicherformats"
8308
8309
#: dummy/help_topics/global-options/detail.txt:1
8310
msgid "Global Options"
8311
msgstr "Globale Einstellungen"
8312
8313
#: dummy/help_topics/global-options/detail.txt:3
8314
msgid ""
8315
"These options may be used with any command, and may appear in front of any\n"
8316
"command. (e.g. ``bzr --profile help``)."
8317
msgstr ""
8318
8319
#: dummy/help_topics/global-options/detail.txt:6
8320
msgid ""
8321
"--version Print the version number. Must be supplied before the "
8322
"command.\n"
8323
"--no-aliases Do not process command aliases when running this command.\n"
8324
"--builtin Use the built-in version of a command, not the plugin "
8325
"version.\n"
8326
" This does not suppress other plugin effects.\n"
8327
"--no-plugins Do not process any plugins.\n"
8328
"--no-l10n Do not translate messages.\n"
8329
"--concurrency Number of processes that can be run concurrently (selftest)."
8330
msgstr ""
8331
8332
#: dummy/help_topics/global-options/detail.txt:14
8333
msgid ""
8334
"--profile Profile execution using the hotshot profiler.\n"
8335
"--lsprof Profile execution using the lsprof profiler.\n"
8336
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8337
" results to a specified file. If the filename ends with "
8338
"\".txt\",\n"
8339
" text format will be used. If the filename either starts "
8340
"with\n"
8341
" \"callgrind.out\" or end with \".callgrind\", the output will "
8342
"be\n"
8343
" formatted for use with KCacheGrind. Otherwise, the output\n"
8344
" will be a pickle.\n"
8345
"--coverage Generate line coverage report in the specified directory."
8346
msgstr ""
8347
8348
#: dummy/help_topics/global-options/detail.txt:24
8349
msgid ""
8350
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8351
"for\n"
8352
" the duration of the command. This can be used multiple times "
8353
"if\n"
8354
" several options need to be overridden."
8355
msgstr ""
8356
8357
#: dummy/help_topics/global-options/detail.txt:28
8358
msgid ""
8359
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8360
"information on profiling."
8361
msgstr ""
8362
8363
#: dummy/help_topics/global-options/detail.txt:31
8364
msgid ""
8365
"A number of debug flags are also available to assist troubleshooting and\n"
8366
"development. See :doc:`debug-flags-help`.\n"
8367
msgstr ""
8368
8369
#: dummy/help_topics/global-options/summary.txt:1
8370
msgid "Options that control how Bazaar runs"
8371
msgstr ""
8372
8373
#: dummy/help_topics/hidden-commands/summary.txt:1
8374
msgid "All hidden commands"
8375
msgstr "Alle versteckten Befehle"
8376
8377
#: dummy/help_topics/hooks/summary.txt:1
8378
msgid "Points at which custom processing can be added"
8379
msgstr ""
8380
8381
#: dummy/help_topics/launchpad/detail.txt:1
8382
msgid "Integration with Launchpad.net"
8383
msgstr "Integration mit Launchpad.net"
8384
8385
#: dummy/help_topics/launchpad/detail.txt:3
8386
msgid ""
8387
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8388
"specification tracking."
8389
msgstr ""
8390
8391
#: dummy/help_topics/launchpad/detail.txt:6
8392
msgid ""
8393
"The bzr client (through the plugin called 'launchpad') has special\n"
8394
"features to communicate with Launchpad:"
8395
msgstr ""
8396
8397
#: dummy/help_topics/launchpad/detail.txt:9
8398
msgid ""
8399
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8400
"This\n"
8401
" is then used by the 'lp:' transport to download your branches using\n"
8402
" bzr+ssh://."
8403
msgstr ""
8404
8405
#: dummy/help_topics/launchpad/detail.txt:13
8406
msgid ""
8407
" * The 'lp:' transport uses Launchpad as a directory service: for "
8408
"example\n"
8409
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8410
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8411
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8412
msgstr ""
8413
8414
#: dummy/help_topics/launchpad/detail.txt:18
8415
msgid ""
8416
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8417
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8418
"lp:12345'\n"
8419
" will record a revision property that marks that revision as fixing\n"
8420
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8421
" automatically be linked to the bug report."
8422
msgstr ""
8423
8424
#: dummy/help_topics/launchpad/detail.txt:24
8425
msgid ""
8426
" * The register-branch command tells Launchpad about the url of a\n"
8427
" public branch. Launchpad will then mirror the branch, display\n"
8428
" its contents and allow it to be attached to bugs and other\n"
8429
" objects."
8430
msgstr ""
8431
8432
#: dummy/help_topics/launchpad/detail.txt:29
8433
msgid "For more information see http://help.launchpad.net/\n"
8434
msgstr "Für weitere Informationen siehe http://help.launchpad.net/\n"
8435
8436
#: dummy/help_topics/launchpad/summary.txt:1
8437
msgid "Using Bazaar with Launchpad.net"
8438
msgstr ""
8439
8440
#: dummy/help_topics/location-alias/summary.txt:1
8441
msgid "Aliases for remembered locations"
8442
msgstr ""
8443
8444
#: dummy/help_topics/log-formats/summary.txt:1
8445
msgid "Details on the logging formats available"
8446
msgstr ""
8447
8448
#: dummy/help_topics/other-formats/summary.txt:1
8449
msgid "Experimental and deprecated storage formats"
8450
msgstr ""
8451
8452
#: dummy/help_topics/patterns/summary.txt:1
8453
msgid "Information on the pattern syntax"
8454
msgstr ""
8455
8456
#: dummy/help_topics/repositories/detail.txt:1
8457
msgid "Repositories"
8458
msgstr ""
8459
8460
#: dummy/help_topics/repositories/detail.txt:3
8461
msgid ""
8462
"Repositories in Bazaar are where committed information is stored. There is\n"
8463
"a repository associated with every branch."
8464
msgstr ""
8465
8466
#: dummy/help_topics/repositories/detail.txt:6
8467
msgid ""
8468
"Repositories are a form of database. Bzr will usually maintain this for\n"
8469
"good performance automatically, but in some situations (e.g. when doing\n"
8470
"very many commits in a short time period) you may want to ask bzr to\n"
8471
"optimise the database indices. This can be done by the 'bzr pack' command."
8472
msgstr ""
8473
8474
#: dummy/help_topics/repositories/detail.txt:11
8475
msgid ""
8476
"By default just running 'bzr init' will create a repository within the new\n"
8477
"branch but it is possible to create a shared repository which allows "
8478
"multiple\n"
8479
"branches to share their information in the same location. When a new branch "
8480
"is\n"
8481
"created it will first look to see if there is a containing shared repository "
8482
"it\n"
8483
"can use."
8484
msgstr ""
8485
8486
#: dummy/help_topics/repositories/detail.txt:17
8487
msgid ""
8488
"When two branches of the same project share a repository, there is\n"
8489
"generally a large space saving. For some operations (e.g. branching\n"
8490
"within the repository) this translates in to a large time saving."
8491
msgstr ""
8492
8493
#: dummy/help_topics/repositories/detail.txt:21
8494
msgid ""
8495
"To create a shared repository use the init-repository command (or the alias\n"
8496
"init-repo). This command takes the location of the repository to create. "
8497
"This\n"
8498
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8499
"which contains a shared repository. Any new branches that are created in "
8500
"this\n"
8501
"directory will then use it for storage."
8502
msgstr ""
8503
8504
#: dummy/help_topics/repositories/detail.txt:27
8505
msgid ""
8506
"It is a good idea to create a repository whenever you might create more\n"
8507
"than one branch of a project. This is true for both working areas where you\n"
8508
"are doing the development, and any server areas that you use for hosting\n"
8509
"projects. In the latter case, it is common to want branches without working\n"
8510
"trees. Since the files in the branch will not be edited directly there is "
8511
"no\n"
8512
"need to use up disk space for a working tree. To create a repository in "
8513
"which\n"
8514
"the branches will not have working trees pass the '--no-trees' option to\n"
8515
"'init-repository'."
8516
msgstr ""
8517
8518
#: dummy/help_topics/repositories/detail.txt:38
8519
msgid ""
8520
" init-repository Create a shared repository. Use --no-trees to create "
8521
"one\n"
8522
" in which new branches won't get a working tree.\n"
8523
msgstr ""
8524
8525
#: dummy/help_topics/repositories/summary.txt:1
8526
msgid "Basic information on shared repositories."
8527
msgstr ""
8528
8529
#: dummy/help_topics/revisionspec/summary.txt:1
8530
msgid "Explain how to use --revision"
8531
msgstr ""
8532
8533
#: dummy/help_topics/rules/summary.txt:1
8534
msgid "Information on defining rule-based preferences"
8535
msgstr ""
8536
8537
#: dummy/help_topics/standalone-trees/detail.txt:1
8538
msgid "Standalone Trees"
8539
msgstr ""
8540
8541
#: dummy/help_topics/standalone-trees/detail.txt:3
8542
msgid ""
8543
"A standalone tree is a working tree with an associated repository. It\n"
8544
"is an independently usable branch, with no dependencies on any other.\n"
8545
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8546
"an existing project under version control."
8547
msgstr ""
8548
8549
#: dummy/help_topics/standalone-trees/detail.txt:8
8550
msgid "Related Commands::"
8551
msgstr ""
8552
8553
#: dummy/help_topics/standalone-trees/detail.txt:10
8554
msgid " init Make a directory into a versioned branch.\n"
8555
msgstr " init Ein Verzeichnis zu einem versionierten Zweig machen.\n"
8556
8557
#: dummy/help_topics/standalone-trees/summary.txt:1
8558
msgid "Information on what a standalone tree is"
8559
msgstr ""
8560
8561
#: dummy/help_topics/standard-options/detail.txt:1
8562
msgid "Standard Options"
8563
msgstr "Standard-Optionen"
8564
8565
#: dummy/help_topics/standard-options/detail.txt:3
8566
msgid "Standard options are legal for all commands."
8567
msgstr ""
8568
8569
#: dummy/help_topics/standard-options/detail.txt:5
8570
msgid ""
8571
"--help, -h Show help message.\n"
8572
"--verbose, -v Display more information.\n"
8573
"--quiet, -q Only display errors and warnings."
8574
msgstr ""
8575
8576
#: dummy/help_topics/standard-options/detail.txt:9
8577
msgid "Unlike global options, standard options can be used in aliases.\n"
8578
msgstr ""
8579
8580
#: dummy/help_topics/standard-options/summary.txt:1
8581
msgid "Options that can be used with any command"
8582
msgstr ""
8583
8584
#: dummy/help_topics/status-flags/detail.txt:1
8585
msgid "Status Flags"
8586
msgstr "Status-Flags"
8587
8588
#: dummy/help_topics/status-flags/detail.txt:3
8589
msgid ""
8590
"Status flags are used to summarise changes to the working tree in a concise\n"
8591
"manner. They are in the form::"
8592
msgstr ""
8593
8594
#: dummy/help_topics/status-flags/detail.txt:6
8595
msgid " xxx <filename>"
8596
msgstr ""
8597
8598
#: dummy/help_topics/status-flags/detail.txt:8
8599
msgid "where the columns' meanings are as follows."
8600
msgstr ""
8601
8602
#: dummy/help_topics/status-flags/detail.txt:10
8603
msgid "Column 1 - versioning/renames::"
8604
msgstr ""
8605
8606
#: dummy/help_topics/status-flags/detail.txt:12
8607
msgid ""
8608
" + File versioned\n"
8609
" - File unversioned\n"
8610
" R File renamed\n"
8611
" ? File unknown\n"
8612
" X File nonexistent (and unknown to bzr)\n"
8613
" C File has conflicts\n"
8614
" P Entry for a pending merge (not a file)"
8615
msgstr ""
8616
8617
#: dummy/help_topics/status-flags/detail.txt:20
8618
msgid "Column 2 - contents::"
8619
msgstr ""
8620
8621
#: dummy/help_topics/status-flags/detail.txt:22
8622
msgid ""
8623
" N File created\n"
8624
" D File deleted\n"
8625
" K File kind changed\n"
8626
" M File modified"
8627
msgstr ""
8628
8629
#: dummy/help_topics/status-flags/detail.txt:27
8630
msgid "Column 3 - execute::"
8631
msgstr ""
8632
8633
#: dummy/help_topics/status-flags/detail.txt:29
8634
msgid " * The execute bit was changed\n"
8635
msgstr ""
8636
8637
#: dummy/help_topics/status-flags/summary.txt:1
8638
msgid "Help on status flags"
8639
msgstr ""
8640
8641
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8642
msgid "Branches Out of Sync"
8643
msgstr ""
8644
8645
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8646
msgid ""
8647
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8648
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8649
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8650
"have the same last revision as the new reference branch for the lightweight\n"
8651
"checkout, data could be lost, so Bazaar refuses."
8652
msgstr ""
8653
8654
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8655
msgid "How you deal with this depends on *why* the branches are out of sync."
8656
msgstr ""
8657
8658
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8659
msgid ""
8660
"If you have a checkout and have done local commits, you can get back in "
8661
"sync\n"
8662
"by running \"bzr update\" (and possibly \"bzr commit\")."
8663
msgstr ""
8664
8665
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8666
msgid ""
8667
"If you have a branch and the remote branch is out-of-date, you can push\n"
8668
"the local changes using \"bzr push\". If the local branch is out of date, "
8669
"you\n"
8670
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8671
"commit\n"
8672
"and then push your changes. If you decide that some of the changes aren't\n"
8673
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8674
msgstr ""
8675
8676
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8677
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8678
msgstr ""
8679
8680
#: dummy/help_topics/topics/summary.txt:1
8681
msgid "Topics list"
8682
msgstr "Themen-Liste"
8683
8684
#: dummy/help_topics/url-special-chars/summary.txt:1
8685
msgid "Special character handling in URLs"
8686
msgstr ""
8687
8688
#: dummy/help_topics/urlspec/summary.txt:1
8689
msgid "Supported transport protocols"
8690
msgstr "Unterstützte Transportprotokolle"
8691
8692
#: dummy/help_topics/working-trees/detail.txt:1
8693
msgid "Working Trees"
8694
msgstr ""
8695
8696
#: dummy/help_topics/working-trees/detail.txt:3
8697
msgid ""
8698
"A working tree is the contents of a branch placed on disk so that you can\n"
8699
"see the files and edit them. The working tree is where you make changes to "
8700
"a\n"
8701
"branch, and when you commit the current state of the working tree is the\n"
8702
"snapshot that is recorded in the commit."
8703
msgstr ""
8704
8705
#: dummy/help_topics/working-trees/detail.txt:8
8706
msgid ""
8707
"When you push a branch to a remote system, a working tree will not be\n"
8708
"created. If one is already present the files will not be updated. The\n"
8709
"branch information will be updated and the working tree will be marked\n"
8710
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8711
"may be uncommitted changes or the update may cause content conflicts that "
8712
"are\n"
8713
"difficult to deal with remotely."
8714
msgstr ""
8715
8716
#: dummy/help_topics/working-trees/detail.txt:15
8717
msgid ""
8718
"If you have a branch with no working tree you can use the 'checkout' "
8719
"command\n"
8720
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8721
"will\n"
8722
"create the working tree. If the branch is updated remotely, you can update "
8723
"the\n"
8724
"working tree by running 'bzr update' in that directory."
8725
msgstr ""
8726
8727
#: dummy/help_topics/working-trees/detail.txt:20
8728
msgid ""
8729
"If you have a branch with a working tree that you do not want the 'remove-"
8730
"tree'\n"
8731
"command will remove the tree if it is safe. This can be done to avoid the\n"
8732
"warning about the remote working tree not being updated when pushing to the\n"
8733
"branch. It can also be useful when working with a '--no-trees' repository\n"
8734
"(see 'bzr help repositories')."
8735
msgstr ""
8736
8737
#: dummy/help_topics/working-trees/detail.txt:26
8738
msgid ""
8739
"If you want to have a working tree on a remote machine that you push to you\n"
8740
"can either run 'bzr update' in the remote branch after each push, or use "
8741
"some\n"
8742
"other method to update the tree during the push. There is an 'rspush' "
8743
"plugin\n"
8744
"that will update the working tree using rsync as well as doing a push. "
8745
"There\n"
8746
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8747
"SSH\n"
8748
"after each push."
8749
msgstr ""
8750
8751
#: dummy/help_topics/working-trees/detail.txt:33
8752
msgid "Useful commands::"
8753
msgstr "Nützliche Befehle::"
8754
8755
#: dummy/help_topics/working-trees/detail.txt:35
8756
msgid ""
8757
" checkout Create a working tree when a branch does not have one.\n"
8758
" remove-tree Removes the working tree from a branch when it is safe to do "
8759
"so.\n"
8760
" update When a working tree is out of sync with its associated "
8761
"branch\n"
8762
" this will update the tree to match the branch.\n"
8763
msgstr ""
8764
8765
#: dummy/help_topics/working-trees/summary.txt:1
8766
msgid "Information on working trees"
8767
msgstr ""
8768
8769
#: en/help_topics/authentication.txt:1
8770
msgid ""
8771
"Authentication Settings\n"
8772
"======================="
8773
msgstr ""
8774
8775
#: en/help_topics/authentication.txt:4
8776
msgid ""
8777
"\n"
8778
"Intent\n"
8779
"------"
8780
msgstr ""
8781
8782
#: en/help_topics/authentication.txt:8
8783
msgid ""
8784
"Many different authentication policies can be described in the\n"
8785
"``authentication.conf`` file but a particular user should need only a few\n"
8786
"definitions to cover his needs without having to specify a user and a "
8787
"password\n"
8788
"for every branch he uses."
8789
msgstr ""
8790
8791
#: en/help_topics/authentication.txt:13
8792
msgid ""
8793
"The definitions found in this file are used to find the credentials to use "
8794
"for\n"
8795
"a given url. The same credentials can generally be used for as many branches "
8796
"as\n"
8797
"possible by grouping their declaration around the remote servers that need\n"
8798
"them. It's even possible to declare credentials that will be used by "
8799
"different\n"
8800
"servers."
8801
msgstr ""
8802
8803
#: en/help_topics/authentication.txt:19
8804
msgid ""
8805
"The intent is to make this file as small as possible to minimize maintenance."
8806
msgstr ""
8807
8808
#: en/help_topics/authentication.txt:21
8809
msgid ""
8810
"Once the relevant credentials are declared in this file you may use branch "
8811
"urls\n"
8812
"without embedding passwords (security hazard) or even users (enabling "
8813
"sharing\n"
8814
"of your urls with others)."
8815
msgstr ""
8816
8817
#: en/help_topics/authentication.txt:25
8818
msgid "Instead of using::"
8819
msgstr ""
8820
8821
#: en/help_topics/authentication.txt:27
8822
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8823
msgstr " bzr branch ftp://joe:secret@host.com/pfad/zu/meiner/branch"
8824
8825
#: en/help_topics/authentication.txt:29
8826
msgid "you simply use::"
8827
msgstr ""
8828
8829
#: en/help_topics/authentication.txt:31
8830
msgid " bzr branch ftp://host.com/path/to/my/branch"
8831
msgstr " bzr branch ftp://host.com/pfad/zu/meiner/branch"
8832
8833
#: en/help_topics/authentication.txt:33
8834
msgid ""
8835
"provided you have created the following ``authentication.conf`` file::"
8836
msgstr ""
8837
8838
#: en/help_topics/authentication.txt:35
8839
msgid ""
8840
" [myprojects]\n"
8841
" scheme=ftp\n"
8842
" host=host.com\n"
8843
" user=joe\n"
8844
" password=secret\n"
8845
" "
8846
msgstr ""
8847
" [myprojects]\n"
8848
" scheme=ftp\n"
8849
" host=host.de\n"
8850
" user=joe\n"
8851
" password=secret\n"
8852
" "
8853
8854
#: en/help_topics/authentication.txt:42
8855
msgid ""
8856
"Authentication definitions\n"
8857
"--------------------------"
8858
msgstr ""
8859
8860
#: en/help_topics/authentication.txt:45
8861
msgid ""
8862
"There are two kinds of authentication used by the various schemes supported "
8863
"by\n"
8864
"bzr:"
8865
msgstr ""
8866
8867
#: en/help_topics/authentication.txt:48
8868
msgid "1. user and password"
8869
msgstr "1. Benutzername und Passwort"
8870
8871
#: en/help_topics/authentication.txt:50
8872
msgid ""
8873
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8874
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8875
"ssh agents are a better, more secure solution. So we have chosen to not "
8876
"provide\n"
8877
"our own less secure method."
8878
msgstr ""
8879
8880
#: en/help_topics/authentication.txt:55
8881
msgid "2. user, realm and password"
8882
msgstr ""
8883
8884
#: en/help_topics/authentication.txt:57
8885
msgid ""
8886
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8887
"against a host. But, by using ``.htaccess`` files, for example, it is "
8888
"possible\n"
8889
"to define several (``user, realm, password``) for a given ``host``. So what "
8890
"is\n"
8891
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8892
"is\n"
8893
"not taken into account in the definitions, but will displayed if bzr "
8894
"prompts\n"
8895
"you for a password."
8896
msgstr ""
8897
8898
#: en/help_topics/authentication.txt:64
8899
msgid ""
8900
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8901
"specifying the appropriate port."
8902
msgstr ""
8903
8904
#: en/help_topics/authentication.txt:67
8905
msgid ""
8906
"To take all schemes into account, the password will be deduced from a set "
8907
"of\n"
8908
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8909
"``user``,\n"
8910
"``password``)."
8911
msgstr ""
8912
8913
#: en/help_topics/authentication.txt:71
8914
msgid ""
8915
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8916
"used\n"
8917
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8918
"``ssh``\n"
8919
" should be used instead since this is the real scheme regarding\n"
8920
" authentication,"
8921
msgstr ""
8922
8923
#: en/help_topics/authentication.txt:76
8924
msgid " * ``host``: can be empty (to act as a default for any host),"
8925
msgstr ""
8926
8927
#: en/help_topics/authentication.txt:78
8928
msgid ""
8929
" * ``port`` can be empty (useful when an host provides several servers for "
8930
"the\n"
8931
" same scheme), only numerical values are allowed, this should be used "
8932
"only\n"
8933
" when the server uses a port different than the scheme standard port,"
8934
msgstr ""
8935
8936
#: en/help_topics/authentication.txt:82
8937
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8938
msgstr ""
8939
8940
#: en/help_topics/authentication.txt:84
8941
msgid ""
8942
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8943
" ``getpass.get_user()``),"
8944
msgstr ""
8945
8946
#: en/help_topics/authentication.txt:87
8947
msgid ""
8948
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8949
" password."
8950
msgstr ""
8951
8952
#: en/help_topics/authentication.txt:90
8953
msgid ""
8954
"Multiple definitions can be provided and, for a given URL, bzr will select "
8955
"a\n"
8956
"(``user`` [, ``password``]) based on the following rules :"
8957
msgstr ""
8958
8959
#: en/help_topics/authentication.txt:93
8960
msgid " 1. the first match wins,"
8961
msgstr ""
8962
8963
#: en/help_topics/authentication.txt:95
8964
msgid " 2. empty fields match everything,"
8965
msgstr ""
8966
8967
#: en/help_topics/authentication.txt:97
8968
msgid ""
8969
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8970
msgstr ""
8971
8972
#: en/help_topics/authentication.txt:99
8973
msgid ""
8974
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8975
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8976
"``projectbzr.sf.net``\n"
8977
" will not match ``bzr.sf.net``)."
8978
msgstr ""
8979
8980
#: en/help_topics/authentication.txt:103
8981
msgid ""
8982
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8983
msgstr ""
8984
8985
#: en/help_topics/authentication.txt:105
8986
msgid ""
8987
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8988
"above,\n"
8989
" empty paths will match any provided path)."
8990
msgstr ""
8991
8992
#: en/help_topics/authentication.txt:110
8993
msgid ""
8994
"File format\n"
8995
"-----------"
8996
msgstr ""
8997
"Dateiformat\n"
8998
"-----------"
8999
9000
#: en/help_topics/authentication.txt:113
9001
msgid ""
9002
"The general rules for :doc:`configuration files <configuration-help>`\n"
9003
"apply except for the variable policies."
9004
msgstr ""
9005
9006
#: en/help_topics/authentication.txt:116
9007
msgid "Each section describes an authentication definition."
9008
msgstr ""
9009
9010
#: en/help_topics/authentication.txt:118
9011
msgid ""
9012
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9013
"reserved\n"
9014
"and should appear as the *last* section."
9015
msgstr ""
9016
9017
#: en/help_topics/authentication.txt:121
9018
msgid "Each section should define:"
9019
msgstr ""
9020
9021
#: en/help_topics/authentication.txt:123
9022
msgid "* ``user``: the login to be used,"
9023
msgstr ""
9024
9025
#: en/help_topics/authentication.txt:125
9026
msgid "Each section could define:"
9027
msgstr ""
9028
9029
#: en/help_topics/authentication.txt:127
9030
msgid "* ``host``: the remote server,"
9031
msgstr ""
9032
9033
#: en/help_topics/authentication.txt:129
9034
msgid "* ``port``: the port the server is listening,"
9035
msgstr "* ``port``: der Port auf dem der Server horcht,"
9036
9037
#: en/help_topics/authentication.txt:131
9038
msgid "* ``path``: the branch location,"
9039
msgstr ""
9040
9041
#: en/help_topics/authentication.txt:133
9042
msgid "* ``password``: the password."
9043
msgstr "* ``password``: das Passwort."
9044
9045
#: en/help_topics/authentication.txt:135
9046
msgid ""
9047
"\n"
9048
"Examples\n"
9049
"--------"
9050
msgstr ""
9051
"\n"
9052
"Beispiele\n"
9053
"---------"
9054
9055
#: en/help_topics/authentication.txt:139
9056
msgid ""
9057
"\n"
9058
"Personal projects hosted outside\n"
9059
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9060
msgstr ""
9061
9062
#: en/help_topics/authentication.txt:143
9063
msgid ""
9064
"All connections are done with the same ``user`` (the remote one for which "
9065
"the\n"
9066
"default bzr one is not appropriate) and the password is always prompted "
9067
"with\n"
9068
"some exceptions::"
9069
msgstr ""
9070
9071
#: en/help_topics/authentication.txt:147
9072
msgid ""
9073
" # Pet projects on hobby.net\n"
9074
" [hobby]\n"
9075
" host=r.hobby.net\n"
9076
" user=jim\n"
9077
" password=obvious1234\n"
9078
" \n"
9079
" # Home server\n"
9080
" [home]\n"
9081
" scheme=https\n"
9082
" host=home.net\n"
9083
" user=joe\n"
9084
" password=1essobV10us\n"
9085
" \n"
9086
" [DEFAULT]\n"
9087
" # Our local user is barbaz, on all remote sites we're known as "
9088
"foobar\n"
9089
" user=foobar"
9090
msgstr ""
9091
9092
#: en/help_topics/authentication.txt:164
9093
msgid ""
9094
"\n"
9095
"Source hosting provider\n"
9096
"~~~~~~~~~~~~~~~~~~~~~~~"
9097
msgstr ""
9098
9099
#: en/help_topics/authentication.txt:168
9100
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9101
msgstr ""
9102
9103
#: en/help_topics/authentication.txt:170
9104
msgid ""
9105
" [shpnet domain]\n"
9106
" # we use sftp, but ssh is the scheme used for authentication\n"
9107
" scheme=ssh\n"
9108
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9109
" host=.shp.net\n"
9110
" user=joe\n"
9111
" # bzr don't support supplying a password for sftp,\n"
9112
" # consider using an ssh agent if you don't want to supply\n"
9113
" # a password interactively. (pageant, ssh-agent, etc)"
9114
msgstr ""
9115
9116
#: en/help_topics/authentication.txt:180
9117
msgid ""
9118
"HTTPS, SFTP servers and their proxy\n"
9119
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9120
msgstr ""
9121
9122
#: en/help_topics/authentication.txt:183
9123
msgid ""
9124
"At company.com, the server hosting release and integration branches is "
9125
"behind a\n"
9126
"proxy, and the two branches use different authentication policies::"
9127
msgstr ""
9128
9129
#: en/help_topics/authentication.txt:186
9130
msgid ""
9131
" [reference code]\n"
9132
" scheme=https\n"
9133
" host=dev.company.com\n"
9134
" path=/dev\n"
9135
" user=user1\n"
9136
" password=pass1"
9137
msgstr ""
9138
9139
#: en/help_topics/authentication.txt:193
9140
msgid ""
9141
" # development branches on dev server\n"
9142
" [dev]\n"
9143
" scheme=ssh # bzr+ssh and sftp are available here\n"
9144
" host=dev.company.com\n"
9145
" path=/dev/integration\n"
9146
" user=user2\n"
9147
" \n"
9148
" # proxy\n"
9149
" [proxy]\n"
9150
" scheme=http\n"
9151
" host=proxy.company.com\n"
9152
" port=3128\n"
9153
" user=proxyuser1\n"
9154
" password=proxypass1"
9155
msgstr ""
9156
9157
#: en/help_topics/authentication.txt:208
9158
msgid ""
9159
"\n"
9160
"Planned enhancements\n"
9161
"--------------------"
9162
msgstr ""
9163
9164
#: en/help_topics/authentication.txt:212
9165
msgid ""
9166
"The following are not yet implemented but planned as parts of a work in\n"
9167
"progress:"
9168
msgstr ""
9169
9170
#: en/help_topics/authentication.txt:215
9171
msgid "* add a ``password_encoding`` field allowing:"
9172
msgstr ""
9173
9174
#: en/help_topics/authentication.txt:217
9175
msgid ""
9176
" - storing the passwords in various obfuscating encodings (base64 for one),"
9177
msgstr ""
9178
9179
#: en/help_topics/authentication.txt:219
9180
msgid " - delegate password storage to plugins (.netrc for example)."
9181
msgstr ""
9182
9183
#: en/help_topics/authentication.txt:221
9184
msgid ""
9185
"* update the credentials when the user is prompted for user or password,"
9186
msgstr ""
9187
9188
#: en/help_topics/authentication.txt:223
9189
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9190
msgstr ""
9191
9192
#: en/help_topics/authentication.txt:225
9193
msgid ""
9194
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9195
"but\n"
9196
"ignored in the actual implementation.\n"
9197
msgstr ""
9198
9199
#: en/help_topics/bugs.txt:1
9200
msgid "Bug Tracker Settings"
9201
msgstr "Bug Tracker Einstellungen"
9202
9203
#: en/help_topics/bugs.txt:3
9204
msgid ""
9205
"When making a commit, metadata about bugs fixed by that change can be\n"
9206
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9207
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9208
"(The only ``status`` value currently supported is ``fixed.``)"
9209
msgstr ""
9210
9211
#: en/help_topics/bugs.txt:8
9212
msgid ""
9213
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9214
"identifier\n"
9215
"rather than a full URL. This looks like::"
9216
msgstr ""
9217
9218
#: en/help_topics/bugs.txt:11
9219
msgid " bzr commit --fixes <tracker>:<id>"
9220
msgstr " bzr commit --fixes <tracker>:<id>"
9221
9222
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9223
msgid "or::"
9224
msgstr "oder::"
9225
9226
#: en/help_topics/bugs.txt:15
9227
msgid " bzr commit --fixes <id>"
9228
msgstr ""
9229
9230
#: en/help_topics/bugs.txt:17
9231
msgid ""
9232
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9233
"the\n"
9234
"identifier for that bug within the bugtracker, usually the bug number.\n"
9235
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9236
"or global configuration is used."
9237
msgstr ""
9238
9239
#: en/help_topics/bugs.txt:22
9240
msgid ""
9241
"Bazaar knows about a few bug trackers that have many users. If\n"
9242
"you use one of these bug trackers then there is no setup required to\n"
9243
"use this feature, you just need to know the tracker identifier to use.\n"
9244
"These are the bugtrackers that are built in:"
9245
msgstr ""
9246
9247
#: en/help_topics/bugs.txt:27
9248
msgid ""
9249
" ============================ ============ ============\n"
9250
" URL Abbreviation Example\n"
9251
" ============================ ============ ============\n"
9252
" https://bugs.launchpad.net/ lp lp:12345\n"
9253
" http://bugs.debian.org/ deb deb:12345\n"
9254
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9255
" ============================ ============ ============"
9256
msgstr ""
9257
9258
#: en/help_topics/bugs.txt:35
9259
msgid ""
9260
"For the bug trackers not listed above configuration is required.\n"
9261
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9262
"is built in, along with a template mechanism for other bugtrackers with\n"
9263
"simple URL schemes. If your bug tracker can't be described by one\n"
9264
"of the schemes described below then you can write a plugin to support\n"
9265
"it."
9266
msgstr ""
9267
9268
#: en/help_topics/bugs.txt:42
9269
msgid ""
9270
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9271
"variable which contains the base URL of the bug tracker. These options\n"
9272
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9273
"configuration section in ``locations.conf``. You can set up these values\n"
9274
"for each of the projects you work on."
9275
msgstr ""
9276
9277
#: en/help_topics/bugs.txt:48
9278
msgid ""
9279
"Note: As you provide a short name for each tracker, you can specify one or\n"
9280
"more bugs in one or more trackers at commit time if you wish."
9281
msgstr ""
9282
9283
#: en/help_topics/bugs.txt:51
9284
msgid ""
9285
"Launchpad\n"
9286
"---------"
9287
msgstr ""
9288
"Launchpad\n"
9289
"---------"
9290
9291
#: en/help_topics/bugs.txt:54
9292
msgid ""
9293
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9294
msgstr ""
9295
9296
#: en/help_topics/bugs.txt:56
9297
msgid ""
9298
"bugzilla_<tracker>_url\n"
9299
"----------------------"
9300
msgstr ""
9301
"bugzilla_<tracker>_url\n"
9302
"----------------------"
9303
9304
#: en/help_topics/bugs.txt:59
9305
msgid ""
9306
"If present, the location of the Bugzilla bug tracker referred to by\n"
9307
"<tracker>. This option can then be used together with ``bzr commit\n"
9308
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9309
"example::"
9310
msgstr ""
9311
9312
#: en/help_topics/bugs.txt:64
9313
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9314
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9315
9316
#: en/help_topics/bugs.txt:66
9317
msgid ""
9318
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9319
"fixed."
9320
msgstr ""
9321
9322
#: en/help_topics/bugs.txt:69
9323
msgid ""
9324
"trac_<tracker>_url\n"
9325
"------------------"
9326
msgstr ""
9327
"trac_<tracker>_url\n"
9328
"------------------"
9329
9330
#: en/help_topics/bugs.txt:72
9331
msgid ""
9332
"If present, the location of the Trac instance referred to by\n"
9333
"<tracker>. This option can then be used together with ``bzr commit\n"
9334
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9335
"example::"
9336
msgstr ""
9337
9338
#: en/help_topics/bugs.txt:77
9339
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9340
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9341
9342
#: en/help_topics/bugs.txt:79
9343
msgid ""
9344
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9345
"as\n"
9346
"fixed."
9347
msgstr ""
9348
9349
#: en/help_topics/bugs.txt:82
9350
msgid ""
9351
"bugtracker_<tracker>_url\n"
9352
"------------------------"
9353
msgstr ""
9354
"bugtracker_<tracker>_url\n"
9355
"------------------------"
9356
9357
#: en/help_topics/bugs.txt:85
9358
msgid ""
9359
"If present, the location of a generic bug tracker instance referred to by\n"
9360
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9361
"which will be replaced by a specific bug ID. This option can then be used\n"
9362
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9363
"fixed by that commit. For example::"
9364
msgstr ""
9365
9366
#: en/help_topics/bugs.txt:91
9367
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9368
msgstr ""
9369
9370
#: en/help_topics/bugs.txt:93
9371
msgid ""
9372
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9373
"Roundup bug tracker as fixed, or::"
9374
msgstr ""
9375
9376
#: en/help_topics/bugs.txt:96
9377
msgid ""
9378
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9379
msgstr ""
9380
9381
#: en/help_topics/bugs.txt:98
9382
msgid ""
9383
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9384
"RT bug tracker as fixed, or::"
9385
msgstr ""
9386
9387
#: en/help_topics/bugs.txt:101
9388
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9389
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9390
9391
#: en/help_topics/bugs.txt:103
9392
msgid ""
9393
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9394
"1234\n"
9395
"in Hudson's JIRA bug tracker as fixed.\n"
9396
msgstr ""
9397
9398
#: en/help_topics/commands.txt:1
9399
msgid ""
9400
"add Add specified files or directories.\n"
9401
"alias Set/unset and display aliases.\n"
9402
"annotate Show the origin of each line in a file.\n"
9403
"bash-completion Generate a shell function for bash command line "
9404
"completion.\n"
9405
" [bash_completion]\n"
9406
"bind Convert the current branch into a checkout of the "
9407
"supplied\n"
9408
" branch.\n"
9409
"branch Create a new branch that is a copy of an existing branch.\n"
9410
"branches List the branches available at the current location.\n"
9411
"break-lock Break a dead lock.\n"
9412
"cat Write the contents of a file as of a given revision to\n"
9413
" standard output.\n"
9414
"check Validate working tree structure, branch consistency and\n"
9415
" repository history.\n"
9416
"checkout Create a new checkout of an existing branch.\n"
9417
"clean-tree Remove unwanted files from working tree.\n"
9418
"commit Commit changes into a new revision.\n"
9419
"config Display, set or remove a configuration option.\n"
9420
"conflicts List files with conflicts.\n"
9421
"deleted List files deleted in the working tree.\n"
9422
"diff Show differences in the working tree, between revisions "
9423
"or\n"
9424
" branches.\n"
9425
"dpush Push into a different VCS without any custom bzr "
9426
"metadata.\n"
9427
"export Export current or past revision to a destination directory "
9428
"or\n"
9429
" archive.\n"
9430
"grep Print lines matching PATTERN for specified files and\n"
9431
" revisions. [grep]\n"
9432
"help Show help on a command or other topic.\n"
9433
"ignore Ignore specified files or patterns.\n"
9434
"ignored List ignored files and the patterns that matched them.\n"
9435
"info Show information about a working tree, branch or "
9436
"repository.\n"
9437
"init Make a directory into a versioned branch.\n"
9438
"init-repository Create a shared repository for branches to share storage\n"
9439
" space.\n"
9440
"join Combine a tree into its containing tree.\n"
9441
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9442
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9443
"launchpad-open Open a Launchpad branch page in your web browser. "
9444
"[launchpad]\n"
9445
"log Show historical log for a branch or subset of a branch.\n"
9446
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9447
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9448
"ls List files in a tree.\n"
9449
"merge Perform a three-way merge.\n"
9450
"missing Show unmerged/unpulled revisions between two branches.\n"
9451
"mkdir Create a new versioned directory.\n"
9452
"mv Move or rename a file.\n"
9453
"nick Print or set the branch nickname.\n"
9454
"pack Compress the data within a repository.\n"
9455
"ping Pings a Bazaar smart server.\n"
9456
"plugins List the installed plugins.\n"
9457
"pull Turn this branch into a mirror of another branch.\n"
9458
"push Update a mirror of this branch.\n"
9459
"reconcile Reconcile bzr metadata in a branch.\n"
9460
"reconfigure Reconfigure the type of a bzr directory.\n"
9461
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9462
"remerge Redo a merge.\n"
9463
"remove Remove files or directories.\n"
9464
"remove-branch Remove a branch.\n"
9465
"remove-tree Remove the working tree from a given branch/checkout.\n"
9466
"renames Show list of renamed files.\n"
9467
"resolve Mark a conflict as resolved.\n"
9468
"revert Set files in the working tree back to the contents of a\n"
9469
" previous revision.\n"
9470
"revno Show current revision number.\n"
9471
"root Show the tree root directory.\n"
9472
"send Mail or create a merge-directive for submitting changes.\n"
9473
"serve Run the bzr server.\n"
9474
"shelve Temporarily set aside some changes from the current tree.\n"
9475
"sign-my-commits Sign all commits by a given committer.\n"
9476
"split Split a subdirectory of a tree into a separate tree.\n"
9477
"status Display status summary.\n"
9478
"switch Set the branch of a checkout and update.\n"
9479
"tag Create, remove or modify a tag naming a revision.\n"
9480
"tags List tags.\n"
9481
"testament Show testament (signing-form) of a revision.\n"
9482
"unbind Convert the current checkout into a regular branch.\n"
9483
"uncommit Remove the last committed revision.\n"
9484
"unshelve Restore shelved changes.\n"
9485
"update Update a working tree to a new revision.\n"
9486
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9487
" format.\n"
9488
"verify-signatures Verify all commit signatures.\n"
9489
"version Show version of bzr.\n"
9490
"version-info Show version information about this tree.\n"
9491
"view Manage filtered views.\n"
9492
"whoami Show or set bzr user id.\n"
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:1
9496
msgid ""
9497
"Configuration Settings\n"
9498
"======================="
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:4
9502
msgid ""
9503
"Environment settings\n"
9504
"---------------------"
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:7
9508
msgid ""
9509
"While most configuration is handled by configuration files, some options\n"
9510
"which may be semi-permanent can also be controlled through the environment."
9511
msgstr ""
9512
9513
#: en/help_topics/configuration.txt:10
9514
msgid ""
9515
"BZR_EMAIL\n"
9516
"~~~~~~~~~"
9517
msgstr ""
9518
"BZR_EMAIL\n"
9519
"~~~~~~~~~"
9520
9521
#: en/help_topics/configuration.txt:13
9522
msgid "Override the email id used by Bazaar. Typical format::"
9523
msgstr ""
9524
9525
#: en/help_topics/configuration.txt:15
9526
msgid " \"John Doe <jdoe@example.com>\""
9527
msgstr " \"John Doe <jdoe@beispiel.de>\""
9528
9529
#: en/help_topics/configuration.txt:17
9530
msgid "See also the ``email`` configuration option."
9531
msgstr ""
9532
9533
#: en/help_topics/configuration.txt:19
9534
msgid ""
9535
"BZR_PROGRESS_BAR\n"
9536
"~~~~~~~~~~~~~~~~"
9537
msgstr ""
9538
"BZR_PROGRESS_BAR\n"
9539
"~~~~~~~~~~~~~~~~"
9540
9541
#: en/help_topics/configuration.txt:22
9542
msgid ""
9543
"Override the progress display. Possible values are \"none\" or \"text\". "
9544
"If\n"
9545
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9546
"draws\n"
9547
"the ordinary command line progress bar."
9548
msgstr ""
9549
9550
#: en/help_topics/configuration.txt:26
9551
msgid ""
9552
"BZR_SIGQUIT_PDB\n"
9553
"~~~~~~~~~~~~~~~"
9554
msgstr ""
9555
"BZR_SIGQUIT_PDB\n"
9556
"~~~~~~~~~~~~~~~"
9557
9558
#: en/help_topics/configuration.txt:29
9559
msgid ""
9560
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9561
msgstr ""
9562
9563
#: en/help_topics/configuration.txt:31
9564
msgid ""
9565
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9566
"* 1 = Invoke breakin debugger (default)"
9567
msgstr ""
9568
9569
#: en/help_topics/configuration.txt:34
9570
msgid ""
9571
"BZR_HOME\n"
9572
"~~~~~~~~"
9573
msgstr ""
9574
"BZR_HOME\n"
9575
"~~~~~~~~"
9576
9577
#: en/help_topics/configuration.txt:37
9578
msgid "Override the home directory used by Bazaar."
9579
msgstr ""
9580
9581
#: en/help_topics/configuration.txt:39
9582
msgid ""
9583
"BZR_SSH\n"
9584
"~~~~~~~"
9585
msgstr ""
9586
"BZR_SSH\n"
9587
"~~~~~~~"
9588
9589
#: en/help_topics/configuration.txt:42
9590
msgid "Select a different SSH implementation."
9591
msgstr "Wählen Sie eine andere SSH-Implementierung."
9592
9593
#: en/help_topics/configuration.txt:44
9594
msgid ""
9595
"BZR_PDB\n"
9596
"~~~~~~~"
9597
msgstr ""
9598
"BZR_PDB\n"
9599
"~~~~~~~"
9600
9601
#: en/help_topics/configuration.txt:47
9602
msgid "Control whether to launch a debugger on error."
9603
msgstr ""
9604
9605
#: en/help_topics/configuration.txt:49
9606
msgid ""
9607
"* 0 = Standard behavior\n"
9608
"* 1 = Launch debugger"
9609
msgstr ""
9610
"* 0 = Standard Verhalten\n"
9611
"* 1 = Debugger starten"
9612
9613
#: en/help_topics/configuration.txt:52
9614
msgid ""
9615
"BZR_REMOTE_PATH\n"
9616
"~~~~~~~~~~~~~~~"
9617
msgstr ""
9618
"BZR_REMOTE_PATH\n"
9619
"~~~~~~~~~~~~~~~"
9620
9621
#: en/help_topics/configuration.txt:55
9622
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9623
msgstr ""
9624
9625
#: en/help_topics/configuration.txt:57
9626
msgid "See also the ``bzr_remote_path`` configuration option."
9627
msgstr ""
9628
9629
#: en/help_topics/configuration.txt:59
9630
msgid ""
9631
"BZR_EDITOR\n"
9632
"~~~~~~~~~~"
9633
msgstr ""
9634
"BZR_EDITOR\n"
9635
"~~~~~~~~~~"
9636
9637
#: en/help_topics/configuration.txt:62
9638
msgid "Path to the editor Bazaar should use for commit messages, etc."
9639
msgstr ""
9640
9641
#: en/help_topics/configuration.txt:64
9642
msgid ""
9643
"BZR_LOG\n"
9644
"~~~~~~~"
9645
msgstr ""
9646
"BZR_LOG\n"
9647
"~~~~~~~"
9648
9649
#: en/help_topics/configuration.txt:67
9650
msgid ""
9651
"Location of the Bazaar log file. You can check the current location by\n"
9652
"running ``bzr version``."
9653
msgstr ""
9654
9655
#: en/help_topics/configuration.txt:70
9656
msgid ""
9657
"The log file contains debug information that is useful for diagnosing or\n"
9658
"reporting problems with Bazaar."
9659
msgstr ""
9660
9661
#: en/help_topics/configuration.txt:73
9662
msgid ""
9663
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9664
"will disable logging."
9665
msgstr ""
9666
9667
#: en/help_topics/configuration.txt:76
9668
msgid ""
9669
"\n"
9670
"BZR_PLUGIN_PATH\n"
9671
"~~~~~~~~~~~~~~~"
9672
msgstr ""
9673
"\n"
9674
"BZR_PLUGIN_PATH\n"
9675
"~~~~~~~~~~~~~~~"
9676
9677
#: en/help_topics/configuration.txt:80
9678
msgid ""
9679
"The path to the plugins directory that Bazaar should use.\n"
9680
"If not set, Bazaar will search for plugins in:"
9681
msgstr ""
9682
9683
#: en/help_topics/configuration.txt:83
9684
msgid ""
9685
"* the user specific plugin directory (containing the ``user`` plugins),"
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:85
9689
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9690
msgstr ""
9691
9692
#: en/help_topics/configuration.txt:87
9693
msgid ""
9694
"* the site specific plugin directory if applicable (containing\n"
9695
" the ``site`` plugins)."
9696
msgstr ""
9697
9698
#: en/help_topics/configuration.txt:90
9699
msgid ""
9700
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9701
"the way the plugin are searched. "
9702
msgstr ""
9703
9704
#: en/help_topics/configuration.txt:93
9705
msgid ""
9706
"As for the ``PATH`` variables, if multiple directories are\n"
9707
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9708
"platform specific appropriate character (':' on Unix,\n"
9709
"';' on windows)"
9710
msgstr ""
9711
9712
#: en/help_topics/configuration.txt:98
9713
msgid ""
9714
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9715
"in ``user``. However it will continue to search in ``core`` and\n"
9716
"``site`` unless they are explicitly removed."
9717
msgstr ""
9718
9719
#: en/help_topics/configuration.txt:102
9720
msgid ""
9721
"If you need to change the order or remove one of these\n"
9722
"directories, you should use special values:"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:105
9726
msgid ""
9727
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9728
" path from the default values,"
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:108
9732
msgid ""
9733
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9734
" before the remaining default values (and also remove it from\n"
9735
" the default values)."
9736
msgstr ""
9737
9738
#: en/help_topics/configuration.txt:112
9739
msgid ""
9740
"Note that the special values 'user', 'core' and 'site' should be\n"
9741
"used literally, they will be substituted by the corresponding,\n"
9742
"platform specific, values."
9743
msgstr ""
9744
9745
#: en/help_topics/configuration.txt:116
9746
msgid ""
9747
"The examples below use ':' as the separator, windows users\n"
9748
"should use ';'."
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:119
9752
msgid "Overriding the default user plugin directory::"
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:121
9756
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9757
msgstr ""
9758
9759
#: en/help_topics/configuration.txt:123
9760
msgid "Disabling the site directory while retaining the user directory::"
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:125
9764
msgid " BZR_PLUGIN_PATH='-site:+user'"
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:127
9768
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9769
msgstr ""
9770
9771
#: en/help_topics/configuration.txt:129
9772
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9773
msgstr ""
9774
9775
#: en/help_topics/configuration.txt:131
9776
msgid "Overriding the default site plugin directory::"
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:133
9780
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9781
msgstr ""
9782
" BZR_PLUGIN_PATH='/Pfad/zu/meiner/Seite/Erweiterungen:-Seite':+Benutzer"
9783
9784
#: en/help_topics/configuration.txt:135
9785
msgid ""
9786
"BZR_DISABLE_PLUGINS\n"
9787
"~~~~~~~~~~~~~~~~~~~"
9788
msgstr ""
9789
"BZR_DISABLE_PLUGINS\n"
9790
"~~~~~~~~~~~~~~~~~~~"
9791
9792
#: en/help_topics/configuration.txt:138
9793
msgid ""
9794
"Under special circumstances (mostly when trying to diagnose a\n"
9795
"bug), it's better to disable a plugin (or several) rather than\n"
9796
"uninstalling them completely. Such plugins can be specified in\n"
9797
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9798
msgstr ""
9799
9800
#: en/help_topics/configuration.txt:143
9801
msgid ""
9802
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9803
"will raise an import error if they are explicitly imported (by\n"
9804
"another plugin that depends on them for example)."
9805
msgstr ""
9806
9807
#: en/help_topics/configuration.txt:147
9808
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:149
9812
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9813
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9814
9815
#: en/help_topics/configuration.txt:151
9816
msgid ""
9817
"BZR_PLUGINS_AT\n"
9818
"~~~~~~~~~~~~~~"
9819
msgstr ""
9820
"BZR_PLUGINS_AT\n"
9821
"~~~~~~~~~~~~~~"
9822
9823
#: en/help_topics/configuration.txt:154
9824
msgid ""
9825
"When adding a new feature or working on a bug in a plugin,\n"
9826
"developers often need to use a specific version of a given\n"
9827
"plugin. Since python requires that the directory containing the\n"
9828
"code is named like the plugin itself this make it impossible to\n"
9829
"use arbitrary directory names (using a two-level directory scheme\n"
9830
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9831
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9832
msgstr ""
9833
9834
#: en/help_topics/configuration.txt:162
9835
msgid ""
9836
"Plugins specified in this environment variable takes precedence\n"
9837
"over the ones in ``BZR_PLUGIN_PATH``."
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:165
9841
msgid ""
9842
"The variable specified a list of ``plugin_name@plugin path``,\n"
9843
"``plugin_name`` being the name of the plugin as it appears in\n"
9844
"python module paths, ``plugin_path`` being the path to the\n"
9845
"directory containing the plugin code itself\n"
9846
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9847
"separator, use ';' on windows."
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:172
9851
msgid ""
9852
"Example:\n"
9853
"~~~~~~~~"
9854
msgstr ""
9855
"Beispiel:\n"
9856
"~~~~~~~~~"
9857
9858
#: en/help_topics/configuration.txt:175
9859
msgid ""
9860
"Using a specific version of ``myplugin``:\n"
9861
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9862
msgstr ""
9863
9864
#: en/help_topics/configuration.txt:178
9865
msgid ""
9866
"BZRPATH\n"
9867
"~~~~~~~"
9868
msgstr ""
9869
"BZRPATH\n"
9870
"~~~~~~~"
9871
9872
#: en/help_topics/configuration.txt:181
9873
msgid "The path where Bazaar should look for shell plugin external commands."
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:183
9877
msgid ""
9878
"\n"
9879
"http_proxy, https_proxy\n"
9880
"~~~~~~~~~~~~~~~~~~~~~~~"
9881
msgstr ""
9882
"\n"
9883
"http_proxy, https_proxy\n"
9884
"~~~~~~~~~~~~~~~~~~~~~~~"
9885
9886
#: en/help_topics/configuration.txt:187
9887
msgid "Specifies the network proxy for outgoing connections, for example::"
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:189
9891
msgid ""
9892
" http_proxy=http://proxy.example.com:3128/ \n"
9893
" https_proxy=http://proxy.example.com:3128/"
9894
msgstr ""
9895
" http_proxy=http://proxy.beispiel.de:3128/ \n"
9896
" https_proxy=http://proxy.beispiel.de:3128/"
9897
9898
#: en/help_topics/configuration.txt:192
9899
msgid ""
9900
"\n"
9901
"Configuration files\n"
9902
"-------------------"
9903
msgstr ""
9904
"\n"
9905
"Konfigurationsdateien\n"
9906
"-------------------"
9907
9908
#: en/help_topics/configuration.txt:196
9909
msgid ""
9910
"Location\n"
9911
"~~~~~~~~"
9912
msgstr ""
9913
"Ort\n"
9914
"~~~~~~~~"
9915
9916
#: en/help_topics/configuration.txt:199
9917
msgid ""
9918
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9919
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9920
"on\n"
9921
"Windows. (You can check the location for your system by using\n"
9922
"``bzr version``.)"
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:204
9926
msgid "There are three primary configuration files in this location:"
9927
msgstr ""
9928
9929
#: en/help_topics/configuration.txt:206
9930
msgid "* ``bazaar.conf`` describes default configuration options,"
9931
msgstr ""
9932
9933
#: en/help_topics/configuration.txt:208
9934
msgid ""
9935
"* ``locations.conf`` describes configuration information for\n"
9936
" specific branch locations,"
9937
msgstr ""
9938
9939
#: en/help_topics/configuration.txt:211
9940
msgid ""
9941
"* ``authentication.conf`` describes credential information for\n"
9942
" remote servers."
9943
msgstr ""
9944
9945
#: en/help_topics/configuration.txt:214
9946
msgid ""
9947
"Each branch can also contain a configuration file that sets values specific\n"
9948
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9949
"the\n"
9950
"branch. This file is visible to all users of a branch, if you wish to "
9951
"override\n"
9952
"one of the values for a branch with a setting that is specific to you then "
9953
"you\n"
9954
"can do so in ``locations.conf``."
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:220
9958
msgid ""
9959
"General format\n"
9960
"~~~~~~~~~~~~~~"
9961
msgstr ""
9962
9963
#: en/help_topics/configuration.txt:223
9964
msgid ""
9965
"An ini file has three types of contructs: section headers, section\n"
9966
"options and comments."
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:226
9970
msgid ""
9971
"Comments\n"
9972
"^^^^^^^^"
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:229
9976
msgid ""
9977
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9978
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9979
"Bazaar when parsing ini files."
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:233
9983
msgid ""
9984
"Section headers\n"
9985
"^^^^^^^^^^^^^^^"
9986
msgstr ""
9987
9988
#: en/help_topics/configuration.txt:236
9989
msgid ""
9990
"A section header is a word enclosed in brackets that starts at the begining\n"
9991
"of a line. A typical section header looks like this::"
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:239
9995
msgid " [DEFAULT]"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:241
9999
msgid ""
10000
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10001
"[ALIASES]. Section headers are case sensitive. The default section provides "
10002
"for\n"
10003
"setting options which can be overridden with the branch config file."
10004
msgstr ""
10005
10006
#: en/help_topics/configuration.txt:245
10007
msgid ""
10008
"For ``locations.conf``, the options from the section with the\n"
10009
"longest matching section header are used to the exclusion of other\n"
10010
"potentially valid section headers. A section header uses the path for\n"
10011
"the branch as the section header. Some examples include::"
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:250
10015
msgid ""
10016
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10017
" [/home/jdoe/branches/]"
10018
msgstr ""
10019
" [http://meinebranchen.isp.com/~jdoe/branchdir]\n"
10020
" [/home/jdoe/branches/]"
10021
10022
#: en/help_topics/configuration.txt:253
10023
msgid ""
10024
"\n"
10025
"Section options\n"
10026
"^^^^^^^^^^^^^^^"
10027
msgstr ""
10028
10029
#: en/help_topics/configuration.txt:257
10030
msgid ""
10031
"A section option resides within a section. A section option contains an\n"
10032
"option name, an equals sign and a value. For example::"
10033
msgstr ""
10034
10035
#: en/help_topics/configuration.txt:260
10036
msgid ""
10037
" email = John Doe <jdoe@isp.com>\n"
10038
" gpg_signing_key = Amy Pond <amy@example.com>"
10039
msgstr ""
10040
" email = John Doe <jdoe@isp.com>\n"
10041
" gpg_signing_key = Amy Pond <amy@beispiel.de>"
10042
10043
#: en/help_topics/configuration.txt:263
10044
msgid ""
10045
"A option can reference other options by enclosing them in curly brackets::"
10046
msgstr ""
10047
10048
#: en/help_topics/configuration.txt:265
10049
msgid ""
10050
" my_branch_name = feature_x\n"
10051
" my_server = bzr+ssh://example.com\n"
10052
" push_location = {my_server}/project/{my_branch_name}"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:269
10056
msgid ""
10057
"Option policies\n"
10058
"^^^^^^^^^^^^^^^"
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:272
10062
msgid ""
10063
"Options defined in a section affect the named directory or URL plus\n"
10064
"any locations they contain. Policies can be used to change how an\n"
10065
"option value is interpreted for contained locations. Currently\n"
10066
"there are three policies available:"
10067
msgstr ""
10068
10069
#: en/help_topics/configuration.txt:277
10070
msgid ""
10071
" none:\n"
10072
" the value is interpreted the same for contained locations. This is\n"
10073
" the default behaviour.\n"
10074
" norecurse:\n"
10075
" the value is only used for the exact location specified by the\n"
10076
" section name.\n"
10077
" appendpath:\n"
10078
" for contained locations, any additional path components are\n"
10079
" appended to the value."
10080
msgstr ""
10081
10082
#: en/help_topics/configuration.txt:287
10083
msgid ""
10084
"Policies are specified by keys with names of the form "
10085
"\"<option_name>:policy\".\n"
10086
"For example, to define the push location for a tree of branches, the\n"
10087
"following could be used::"
10088
msgstr ""
10089
10090
#: en/help_topics/configuration.txt:291
10091
msgid ""
10092
" [/top/location]\n"
10093
" push_location = sftp://example.com/location\n"
10094
" push_location:policy = appendpath"
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:295
10098
msgid ""
10099
"With this configuration, the push location for ``/top/location/branch1``\n"
10100
"would be ``sftp://example.com/location/branch1``."
10101
msgstr ""
10102
10103
#: en/help_topics/configuration.txt:298
10104
msgid ""
10105
"Section local options\n"
10106
"^^^^^^^^^^^^^^^^^^^^^"
10107
msgstr ""
10108
10109
#: en/help_topics/configuration.txt:301
10110
msgid ""
10111
"Some options are defined automatically inside a given section and can be\n"
10112
"refered to in this section only. "
10113
msgstr ""
10114
10115
#: en/help_topics/configuration.txt:304
10116
msgid "For example, the ``appendpath`` policy can be used like this::"
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:306
10120
msgid ""
10121
" [/home/vila/src/bzr/bugs]\n"
10122
" mypush = lp:~vila/bzr\n"
10123
" mypush:policy=appendpath"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:310
10127
msgid "Using ``relpath`` to achieve the same result is done like this::"
10128
msgstr ""
10129
10130
#: en/help_topics/configuration.txt:312
10131
msgid ""
10132
" [/home/vila/src/bzr/bugs]\n"
10133
" mypush = lp:~vila/bzr/{relpath}"
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:315
10137
msgid ""
10138
"In both cases, when used in a directory like\n"
10139
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10143
msgid ""
10144
" $ bzr config mypush\n"
10145
" lp:~vila/bzr/832013-expand-in-stack"
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:321
10149
msgid "Another such option is ``basename`` which can be used like this::"
10150
msgstr ""
10151
10152
#: en/help_topics/configuration.txt:323
10153
msgid ""
10154
" [/home/vila/src/bzr]\n"
10155
" mypush = lp:~vila/bzr/{basename}"
10156
msgstr ""
10157
10158
#: en/help_topics/configuration.txt:326
10159
msgid ""
10160
"When used in a directory like\n"
10161
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10162
msgstr ""
10163
10164
#: en/help_topics/configuration.txt:332
10165
msgid ""
10166
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10167
"itself is defined as the relative path between the section name and the\n"
10168
"location it matches."
10169
msgstr ""
10170
10171
#: en/help_topics/configuration.txt:336
10172
msgid ""
10173
"Another such option is ``branchname``, which refers to the name of a "
10174
"colocated\n"
10175
"branch. For non-colocated branches, it behaves like basename. It can be "
10176
"used\n"
10177
"like this::"
10178
msgstr ""
10179
10180
#: en/help_topics/configuration.txt:340
10181
msgid ""
10182
" [/home/vila/src/bzr/bugs]\n"
10183
" mypush = lp:~vila/bzr/{branchname}"
10184
msgstr ""
10185
10186
#: en/help_topics/configuration.txt:343
10187
msgid ""
10188
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10189
"get::"
10190
msgstr ""
10191
10192
#: en/help_topics/configuration.txt:345
10193
msgid ""
10194
" bzr config mypush\n"
10195
" lp:~vila/bzr/832013-expand-in-stack"
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:348
10199
msgid ""
10200
"When an option is local to a Section, it cannot be referred to from option\n"
10201
"values in any other section from the same ``Store`` nor from any other\n"
10202
"``Store``."
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:352
10206
msgid ""
10207
"\n"
10208
"The main configuration file, bazaar.conf\n"
10209
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:356
10213
msgid ""
10214
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10215
"The default section contains the default\n"
10216
"configuration options for all branches. The default section can be\n"
10217
"overriden by providing a branch-specific section in ``locations.conf``."
10218
msgstr ""
10219
10220
#: en/help_topics/configuration.txt:361
10221
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:363
10225
msgid ""
10226
" [DEFAULT]\n"
10227
" email = John Doe <jdoe@isp.com>\n"
10228
" editor = /usr/bin/vim\n"
10229
" create_signatures = when-required"
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:368
10233
msgid ""
10234
"\n"
10235
"The branch location configuration file, locations.conf\n"
10236
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10237
msgstr ""
10238
10239
#: en/help_topics/configuration.txt:372
10240
msgid ""
10241
"``locations.conf`` allows one to specify overriding settings for\n"
10242
"a specific branch. The format is almost identical to the default section in\n"
10243
"bazaar.conf with one significant change: The section header, instead of "
10244
"saying\n"
10245
"default, will be the path to a branch that you wish to override a value\n"
10246
"for. The '?' and '*' wildcards are supported::"
10247
msgstr ""
10248
10249
#: en/help_topics/configuration.txt:378
10250
msgid ""
10251
" [/home/jdoe/branches/nethack]\n"
10252
" email = Nethack Admin <nethack@nethack.com>"
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:381
10256
msgid ""
10257
" [http://hypothetical.site.com/branches/devel-branch]\n"
10258
" create_signatures = always"
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:384
10262
msgid ""
10263
"The authentication configuration file, authentication.conf\n"
10264
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10265
msgstr ""
10266
10267
#: en/help_topics/configuration.txt:387
10268
msgid ""
10269
"``authentication.conf`` allows one to specify credentials for\n"
10270
"remote servers. This can be used for all the supported transports and any "
10271
"part\n"
10272
"of bzr that requires authentication (smtp for example)."
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:391
10276
msgid ""
10277
"The syntax of the file obeys the same rules as the others except for the\n"
10278
"option policies which don't apply."
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:394
10282
msgid ""
10283
"For more information on the possible uses of the authentication "
10284
"configuration\n"
10285
"file see :doc:`authentication-help`."
10286
msgstr ""
10287
10288
#: en/help_topics/configuration.txt:397
10289
msgid ""
10290
"\n"
10291
"Common options\n"
10292
"--------------"
10293
msgstr ""
10294
10295
#: en/help_topics/configuration.txt:401
10296
msgid ""
10297
"debug_flags\n"
10298
"~~~~~~~~~~~"
10299
msgstr ""
10300
10301
#: en/help_topics/configuration.txt:404
10302
msgid ""
10303
"A comma-separated list of debugging options to turn on. The same values\n"
10304
"can be used as with the -D command-line option (see `help global-options`).\n"
10305
"For example::"
10306
msgstr ""
10307
10308
#: en/help_topics/configuration.txt:408
10309
msgid " debug_flags = hpss"
10310
msgstr " debug_flags = hpss"
10311
10312
#: en/help_topics/configuration.txt:412
10313
msgid " debug_flags = hpss,evil"
10314
msgstr " debug_flags = hpss,evil"
10315
10316
#: en/help_topics/configuration.txt:414
10317
msgid ""
10318
"email\n"
10319
"~~~~~"
10320
msgstr ""
10321
10322
#: en/help_topics/configuration.txt:417
10323
msgid ""
10324
"The email address to use when committing a branch. Typically takes the form\n"
10325
"of::"
10326
msgstr ""
10327
10328
#: en/help_topics/configuration.txt:420
10329
msgid " email = Full Name <account@hostname.tld>"
10330
msgstr ""
10331
10332
#: en/help_topics/configuration.txt:422
10333
msgid ""
10334
"editor\n"
10335
"~~~~~~"
10336
msgstr ""
10337
10338
#: en/help_topics/configuration.txt:425
10339
msgid ""
10340
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10341
"a commit message. This setting is trumped by the environment variable\n"
10342
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10343
"variables."
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:430
10347
msgid ""
10348
"log_format\n"
10349
"~~~~~~~~~~"
10350
msgstr ""
10351
10352
#: en/help_topics/configuration.txt:433
10353
msgid ""
10354
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10355
"and ``line``. Additional formats may be provided by plugins. The default\n"
10356
"value is ``long``."
10357
msgstr ""
10358
10359
#: en/help_topics/configuration.txt:437
10360
msgid ""
10361
"check_signatures\n"
10362
"~~~~~~~~~~~~~~~~"
10363
msgstr ""
10364
10365
#: en/help_topics/configuration.txt:440
10366
msgid ""
10367
"Reserved for future use. These options will allow a policy for branches to\n"
10368
"require signatures."
10369
msgstr ""
10370
10371
#: en/help_topics/configuration.txt:443
10372
msgid ""
10373
"require\n"
10374
" The gnupg signature for revisions must be present and must be valid."
10375
msgstr ""
10376
10377
#: en/help_topics/configuration.txt:446
10378
msgid ""
10379
"ignore\n"
10380
" Do not check gnupg signatures of revisions."
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:449
10384
msgid ""
10385
"check-available\n"
10386
" (default) If gnupg signatures for revisions are present, check them.\n"
10387
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10388
" no signature is present."
10389
msgstr ""
10390
10391
#: en/help_topics/configuration.txt:454
10392
msgid ""
10393
"create_signatures\n"
10394
"~~~~~~~~~~~~~~~~~"
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:457
10398
msgid ""
10399
"Defines the behaviour of signing revisions on commits. By default bzr will "
10400
"not\n"
10401
"sign new commits."
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:460
10405
msgid ""
10406
"always\n"
10407
" Sign every new revision that is committed. If the signing fails then "
10408
"the\n"
10409
" commit will not be made."
10410
msgstr ""
10411
10412
#: en/help_topics/configuration.txt:464
10413
msgid ""
10414
"when-required\n"
10415
" Reserved for future use."
10416
msgstr ""
10417
10418
#: en/help_topics/configuration.txt:467
10419
msgid ""
10420
"never\n"
10421
" Reserved for future use."
10422
msgstr ""
10423
10424
#: en/help_topics/configuration.txt:470
10425
msgid ""
10426
"In future it is planned that ``when-required`` will sign newly\n"
10427
"committed revisions only when the branch requires them. ``never`` will "
10428
"refuse\n"
10429
"to sign newly committed revisions, even if the branch requires signatures."
10430
msgstr ""
10431
10432
#: en/help_topics/configuration.txt:474
10433
msgid ""
10434
"dirstate.fdatasync\n"
10435
"~~~~~~~~~~~~~~~~~~"
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:477
10439
msgid ""
10440
"If true (default), working tree metadata changes are flushed through the\n"
10441
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10442
"should not be lost if the machine crashes. See also repository.fdatasync."
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:481
10446
msgid ""
10447
"gpg_signing_key\n"
10448
"~~~~~~~~~~~~~~~"
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:484
10452
msgid ""
10453
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10454
"address, key fingerprint or full key ID. When unset or when set to\n"
10455
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10456
msgstr ""
10457
10458
#: en/help_topics/configuration.txt:488
10459
msgid ""
10460
"recurse\n"
10461
"~~~~~~~"
10462
msgstr ""
10463
10464
#: en/help_topics/configuration.txt:491
10465
msgid ""
10466
"Only useful in ``locations.conf``. Defines whether or not the\n"
10467
"configuration for this section applies to subdirectories:"
10468
msgstr ""
10469
10470
#: en/help_topics/configuration.txt:494
10471
msgid ""
10472
"true\n"
10473
" (default) This section applies to subdirectories as well."
10474
msgstr ""
10475
10476
#: en/help_topics/configuration.txt:497
10477
msgid ""
10478
"false\n"
10479
" This section only applies to the branch at this directory and not\n"
10480
" branches below it."
10481
msgstr ""
10482
10483
#: en/help_topics/configuration.txt:501
10484
msgid ""
10485
"gpg_signing_command\n"
10486
"~~~~~~~~~~~~~~~~~~~"
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:504
10490
msgid ""
10491
"(Default: \"gpg\"). Which program should be used to sign and check "
10492
"revisions.\n"
10493
"For example::"
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:507
10497
msgid " gpg_signing_command = /usr/bin/gnpg"
10498
msgstr ""
10499
10500
#: en/help_topics/configuration.txt:509
10501
msgid ""
10502
"The specified command must accept the options \"--clearsign\" and \"-u "
10503
"<email>\"."
10504
msgstr ""
10505
10506
#: en/help_topics/configuration.txt:511
10507
msgid ""
10508
"bzr_remote_path\n"
10509
"~~~~~~~~~~~~~~~"
10510
msgstr ""
10511
10512
#: en/help_topics/configuration.txt:514
10513
msgid ""
10514
"(Default: \"bzr\"). The path to the command that should be used to run the "
10515
"smart\n"
10516
"server for bzr. This value may only be specified in locations.conf, because:"
10517
msgstr ""
10518
10519
#: en/help_topics/configuration.txt:517
10520
msgid ""
10521
"- it's needed before branch.conf is accessible\n"
10522
"- allowing remote branch.conf files to specify commands would be a security\n"
10523
" risk"
10524
msgstr ""
10525
10526
#: en/help_topics/configuration.txt:521
10527
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10528
msgstr ""
10529
10530
#: en/help_topics/configuration.txt:523
10531
msgid ""
10532
"smtp_server\n"
10533
"~~~~~~~~~~~"
10534
msgstr ""
10535
10536
#: en/help_topics/configuration.txt:526
10537
msgid ""
10538
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10539
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10540
msgstr ""
10541
10542
#: en/help_topics/configuration.txt:529
10543
msgid ""
10544
"smtp_username, smtp_password\n"
10545
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10546
msgstr ""
10547
10548
#: en/help_topics/configuration.txt:532
10549
msgid ""
10550
"User and password to authenticate to the SMTP server. If smtp_username\n"
10551
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10552
"These settings are only needed if the SMTP server requires authentication\n"
10553
"to send mail."
10554
msgstr ""
10555
10556
#: en/help_topics/configuration.txt:537
10557
msgid ""
10558
"locks.steal_dead\n"
10559
"~~~~~~~~~~~~~~~~"
10560
msgstr ""
10561
10562
#: en/help_topics/configuration.txt:540
10563
msgid ""
10564
"If set to true, bzr will automatically break locks held by processes from\n"
10565
"the same machine and user that are no longer alive. Otherwise, it will\n"
10566
"print a message and you can break the lock manually, if you are satisfied\n"
10567
"the object is no longer in use."
10568
msgstr ""
10569
10570
#: en/help_topics/configuration.txt:545
10571
msgid ""
10572
"mail_client\n"
10573
"~~~~~~~~~~~"
10574
msgstr ""
10575
10576
#: en/help_topics/configuration.txt:548
10577
msgid ""
10578
"A mail client to use for sending merge requests.\n"
10579
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10580
"it\n"
10581
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10582
"``editor``."
10583
msgstr ""
10584
10585
#: en/help_topics/configuration.txt:553
10586
msgid "Supported values for specific clients:"
10587
msgstr ""
10588
10589
#: en/help_topics/configuration.txt:555
10590
msgid ""
10591
":claws: Use Claws. This skips a dialog for attaching files.\n"
10592
":evolution: Use Evolution.\n"
10593
":kmail: Use KMail.\n"
10594
":mutt: Use Mutt.\n"
10595
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10596
"1.5,\n"
10597
" this works around some bugs that xdg-email doesn't handle."
10598
msgstr ""
10599
10600
#: en/help_topics/configuration.txt:562
10601
msgid "Supported generic values are:"
10602
msgstr "Unterstützte generische Werte sind:"
10603
10604
#: en/help_topics/configuration.txt:564
10605
msgid ""
10606
":default: See above.\n"
10607
":editor: Use your editor to compose the merge request. This also uses\n"
10608
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10609
" smtp_username and smtp_password.\n"
10610
":mapi: Use your preferred e-mail client on Windows.\n"
10611
":xdg-email: Use xdg-email to run your preferred mail program"
10612
msgstr ""
10613
10614
#: en/help_topics/configuration.txt:571
10615
msgid ""
10616
"repository.fdatasync\n"
10617
"~~~~~~~~~~~~~~~~~~~~"
10618
msgstr ""
10619
10620
#: en/help_topics/configuration.txt:574
10621
msgid ""
10622
"If true (default), repository changes are flushed through the OS buffers\n"
10623
"to physical disk. This is somewhat slower, but means data should not be\n"
10624
"lost if the machine crashes. See also dirstate.fdatasync."
10625
msgstr ""
10626
10627
#: en/help_topics/configuration.txt:578
10628
msgid ""
10629
"submit_branch\n"
10630
"~~~~~~~~~~~~~"
10631
msgstr ""
10632
10633
#: en/help_topics/configuration.txt:581
10634
msgid ""
10635
"The branch you intend to submit your current work to. This is "
10636
"automatically\n"
10637
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10638
"This\n"
10639
"should usually be set on a per-branch or per-location basis."
10640
msgstr ""
10641
10642
#: en/help_topics/configuration.txt:585
10643
msgid ""
10644
"public_branch\n"
10645
"~~~~~~~~~~~~~"
10646
msgstr ""
10647
10648
#: en/help_topics/configuration.txt:588
10649
msgid ""
10650
"A publically-accessible version of this branch (implying that this version "
10651
"is\n"
10652
"not publically-accessible). Used (and set) by ``bzr send``."
10653
msgstr ""
10654
10655
#: en/help_topics/configuration.txt:591
10656
msgid ""
10657
"suppress_warnings\n"
10658
"~~~~~~~~~~~~~~~~~"
10659
msgstr ""
10660
10661
#: en/help_topics/configuration.txt:594
10662
msgid ""
10663
"A list of strings, each string represent a warning that can be emitted by\n"
10664
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10665
msgstr ""
10666
10667
#: en/help_topics/configuration.txt:597
10668
msgid "Valid values:"
10669
msgstr "Gültige Werte:"
10670
10671
#: en/help_topics/configuration.txt:599
10672
msgid ""
10673
"* ``format_deprecation``:\n"
10674
" whether the format deprecation warning is shown on repositories that "
10675
"are\n"
10676
" using deprecated formats."
10677
msgstr ""
10678
10679
#: en/help_topics/configuration.txt:603
10680
msgid ""
10681
"default_format\n"
10682
"~~~~~~~~~~~~~~"
10683
msgstr ""
10684
10685
#: en/help_topics/configuration.txt:606
10686
msgid ""
10687
"A format name for the default format used when creating branches. See "
10688
"``bzr\n"
10689
"help formats`` for possible values."
10690
msgstr ""
10691
10692
#: en/help_topics/configuration.txt:609
10693
msgid ""
10694
"\n"
10695
"Unicode options\n"
10696
"---------------"
10697
msgstr ""
10698
10699
#: en/help_topics/configuration.txt:613
10700
msgid ""
10701
"output_encoding\n"
10702
"~~~~~~~~~~~~~~~"
10703
msgstr ""
10704
10705
#: en/help_topics/configuration.txt:616
10706
msgid ""
10707
"A Python unicode encoding name for text output from bzr, such as log\n"
10708
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10709
"is the terminal encoding prefered by the operating system."
10710
msgstr ""
10711
10712
#: en/help_topics/configuration.txt:620
10713
msgid ""
10714
"\n"
10715
"Branch type specific options\n"
10716
"----------------------------"
10717
msgstr ""
10718
10719
#: en/help_topics/configuration.txt:624
10720
msgid ""
10721
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10722
"later format. They\n"
10723
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10724
"manually set in ``locations.conf`` or ``bazaar.conf``."
10725
msgstr ""
10726
10727
#: en/help_topics/configuration.txt:629
10728
msgid ""
10729
"append_revisions_only\n"
10730
"~~~~~~~~~~~~~~~~~~~~~"
10731
msgstr ""
10732
10733
#: en/help_topics/configuration.txt:632
10734
msgid ""
10735
"If set to \"True\" then revisions can only be appended to the log, not\n"
10736
"removed. A branch with this setting enabled can only pull from another\n"
10737
"branch if the other branch's log is a longer version of its own. This is\n"
10738
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10739
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10740
"compatibility with previous bzr versions (older than 2.2)."
10741
msgstr ""
10742
10743
#: en/help_topics/configuration.txt:639
10744
msgid ""
10745
"parent_location\n"
10746
"~~~~~~~~~~~~~~~"
10747
msgstr ""
10748
10749
#: en/help_topics/configuration.txt:642
10750
msgid ""
10751
"If present, the location of the default branch for pull or merge. This "
10752
"option\n"
10753
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10754
"--remember``."
10755
msgstr ""
10756
10757
#: en/help_topics/configuration.txt:646
10758
msgid ""
10759
"push_location\n"
10760
"~~~~~~~~~~~~~"
10761
msgstr ""
10762
10763
#: en/help_topics/configuration.txt:649
10764
msgid ""
10765
"If present, the location of the default branch for push. This option\n"
10766
"is normally set by the first ``push`` or ``push --remember``."
10767
msgstr ""
10768
10769
#: en/help_topics/configuration.txt:652
10770
msgid ""
10771
"push_strict\n"
10772
"~~~~~~~~~~~"
10773
msgstr ""
10774
10775
#: en/help_topics/configuration.txt:655
10776
msgid ""
10777
"If present, defines the ``--strict`` option default value for checking\n"
10778
"uncommitted changes before pushing."
10779
msgstr ""
10780
10781
#: en/help_topics/configuration.txt:658
10782
msgid ""
10783
"dpush_strict\n"
10784
"~~~~~~~~~~~~"
10785
msgstr ""
10786
10787
#: en/help_topics/configuration.txt:661
10788
msgid ""
10789
"If present, defines the ``--strict`` option default value for checking\n"
10790
"uncommitted changes before pushing into a different VCS without any\n"
10791
"custom bzr metadata."
10792
msgstr ""
10793
10794
#: en/help_topics/configuration.txt:665
10795
msgid ""
10796
"bound_location\n"
10797
"~~~~~~~~~~~~~~"
10798
msgstr ""
10799
10800
#: en/help_topics/configuration.txt:668
10801
msgid ""
10802
"The location that commits should go to when acting as a checkout.\n"
10803
"This option is normally set by ``bind``."
10804
msgstr ""
10805
10806
#: en/help_topics/configuration.txt:671
10807
msgid ""
10808
"bound\n"
10809
"~~~~~"
10810
msgstr ""
10811
10812
#: en/help_topics/configuration.txt:674
10813
msgid ""
10814
"If set to \"True\", the branch should act as a checkout, and push each "
10815
"commit to\n"
10816
"the bound_location. This option is normally set by ``bind``/``unbind``."
10817
msgstr ""
10818
10819
#: en/help_topics/configuration.txt:677
10820
msgid ""
10821
"send_strict\n"
10822
"~~~~~~~~~~~"
10823
msgstr ""
10824
10825
#: en/help_topics/configuration.txt:680
10826
msgid ""
10827
"If present, defines the ``--strict`` option default value for checking\n"
10828
"uncommitted changes before sending a merge directive."
10829
msgstr ""
10830
10831
#: en/help_topics/configuration.txt:683
10832
msgid ""
10833
"add.maximum_file_size\n"
10834
"~~~~~~~~~~~~~~~~~~~~~"
10835
msgstr ""
10836
10837
#: en/help_topics/configuration.txt:686
10838
msgid ""
10839
"Defines the maximum file size the command line \"add\" operation will allow\n"
10840
"in recursive mode, with files larger than this value being skipped. You may "
10841
"\n"
10842
"specify this value as an integer (in which case it is interpreted as bytes), "
10843
"\n"
10844
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10845
"0 \n"
10846
"will disable skipping."
10847
msgstr ""
10848
10849
#: en/help_topics/configuration.txt:692
10850
msgid ""
10851
"External Merge Tools\n"
10852
"--------------------"
10853
msgstr ""
10854
10855
#: en/help_topics/configuration.txt:695
10856
msgid ""
10857
"bzr.mergetool.<name>\n"
10858
"~~~~~~~~~~~~~~~~~~~~"
10859
msgstr ""
10860
10861
#: en/help_topics/configuration.txt:698
10862
msgid ""
10863
"Defines an external merge tool called <name> with the given command-line.\n"
10864
"Arguments containing spaces should be quoted using single or double quotes. "
10865
"The\n"
10866
"executable may omit its path if it can be found on the PATH."
10867
msgstr ""
10868
10869
#: en/help_topics/configuration.txt:702
10870
msgid ""
10871
"The following markers can be used in the command-line to substitute "
10872
"filenames\n"
10873
"involved in the merge conflict::"
10874
msgstr ""
10875
10876
#: en/help_topics/configuration.txt:705
10877
msgid ""
10878
" {base} file.BASE\n"
10879
" {this} file.THIS\n"
10880
" {other} file.OTHER\n"
10881
" {result} output file\n"
10882
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10883
"merge\n"
10884
" succeeds."
10885
msgstr ""
10886
10887
#: en/help_topics/configuration.txt:714
10888
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10889
msgstr ""
10890
10891
#: en/help_topics/configuration.txt:716
10892
msgid ""
10893
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10894
"interpolation markers, trying to display the mergetool line results in the\n"
10895
"following problem::"
10896
msgstr ""
10897
10898
#: en/help_topics/configuration.txt:720
10899
msgid ""
10900
"\n"
10901
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10902
"{result}'\n"
10903
" $ bzr config bzr.mergetool.kdiff3\n"
10904
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10905
"{this} {other} -o {result}\"."
10906
msgstr ""
10907
10908
#: en/help_topics/configuration.txt:725
10909
msgid ""
10910
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10911
msgstr ""
10912
10913
#: en/help_topics/configuration.txt:727
10914
msgid ""
10915
" $ bzr config --all bzr.mergetool.kdiff3\n"
10916
" branch:\n"
10917
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10918
msgstr ""
10919
10920
#: en/help_topics/configuration.txt:731
10921
msgid ""
10922
"\n"
10923
"bzr.default_mergetool\n"
10924
"~~~~~~~~~~~~~~~~~~~~~"
10925
msgstr ""
10926
10927
#: en/help_topics/configuration.txt:735
10928
msgid ""
10929
"Specifies which external merge tool (as defined above) should be selected "
10930
"by\n"
10931
"default in tools such as ``bzr qconflicts``."
10932
msgstr ""
10933
10934
#: en/help_topics/configuration.txt:740
10935
msgid " bzr.default_mergetool = kdiff3\n"
10936
msgstr ""
10937
10938
#: en/help_topics/conflict-types.txt:1
10939
msgid ""
10940
"Conflict Types\n"
10941
"=============="
10942
msgstr ""
10943
10944
#: en/help_topics/conflict-types.txt:4
10945
msgid ""
10946
"Some operations, like merge, revert and pull, modify the contents of your\n"
10947
"working tree. These modifications are programmatically generated, and so "
10948
"they\n"
10949
"may conflict with the current state of your working tree. "
10950
msgstr ""
10951
10952
#: en/help_topics/conflict-types.txt:8
10953
msgid ""
10954
"When conflicts are present in your working tree (as shown by ``bzr\n"
10955
"conflicts``), you should resolve them and then inform bzr that the "
10956
"conflicts\n"
10957
"have been resolved."
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:12
10961
msgid ""
10962
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10963
"should resolve them is not the one responsible for their occurrence, as is "
10964
"the\n"
10965
"case when merging other people's work or because some conflicts are "
10966
"presented\n"
10967
"in a way that is not easy to understand."
10968
msgstr ""
10969
10970
#: en/help_topics/conflict-types.txt:17
10971
msgid ""
10972
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10973
"conflict if and only if there's an actual conceptual conflict in the source\n"
10974
"tree. Because Bazaar doesn't understand the real meaning of the files "
10975
"being\n"
10976
"versioned, it can, when faced with ambiguities, fall short in either "
10977
"direction\n"
10978
"trying to resolve the conflict itself. Many kinds of changes can be "
10979
"combined\n"
10980
"programmatically, but sometimes only a human can determine the right thing "
10981
"to\n"
10982
"do."
10983
msgstr ""
10984
10985
#: en/help_topics/conflict-types.txt:25
10986
msgid ""
10987
"When Bazaar generates a conflict, it adds information into the working tree "
10988
"to\n"
10989
"present the conflicting versions, and it's up to you to find the correct\n"
10990
"resolution."
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:29
10994
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:31
10998
msgid ""
10999
"1. Modify the working tree content so that the conflicted item is now in "
11000
"the\n"
11001
" state you want to keep, then"
11002
msgstr ""
11003
11004
#: en/help_topics/conflict-types.txt:34
11005
msgid ""
11006
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11007
" remaining generated information (``bzr resolve <item>``)."
11008
msgstr ""
11009
11010
#: en/help_topics/conflict-types.txt:37
11011
msgid ""
11012
"For most conflict types, there are some obvious ways to modify the working\n"
11013
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11014
"itself already made a choice, when possible."
11015
msgstr ""
11016
11017
#: en/help_topics/conflict-types.txt:41
11018
msgid ""
11019
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11020
"different ways to resolve the conflict."
11021
msgstr ""
11022
11023
#: en/help_topics/conflict-types.txt:44
11024
msgid ""
11025
"Each type of conflict is explained below, and the action which must be done "
11026
"to\n"
11027
"resolve the conflict is outlined."
11028
msgstr ""
11029
11030
#: en/help_topics/conflict-types.txt:47
11031
msgid ""
11032
"Various actions are available depending on the kind of conflict, for some "
11033
"of\n"
11034
"these actions, Bazaar can provide some help. In the end you should at least\n"
11035
"inform Bazaar that you're done with the conflict with::"
11036
msgstr ""
11037
11038
#: en/help_topics/conflict-types.txt:51
11039
msgid " ``bzr resolve FILE --action=done'"
11040
msgstr " ``bzr resolve FILE --action=done'"
11041
11042
#: en/help_topics/conflict-types.txt:53
11043
msgid ""
11044
"Note that this is the default action when a single file is involved so you "
11045
"can\n"
11046
"simply use::"
11047
msgstr ""
11048
11049
#: en/help_topics/conflict-types.txt:56
11050
msgid " ``bzr resolve FILE``"
11051
msgstr " ``bzr resolve FILE``"
11052
11053
#: en/help_topics/conflict-types.txt:58
11054
msgid "See ``bzr help resolve`` for more details."
11055
msgstr ""
11056
11057
#: en/help_topics/conflict-types.txt:60
11058
msgid ""
11059
"Text conflicts\n"
11060
"--------------"
11061
msgstr ""
11062
11063
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11064
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11065
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11066
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11067
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11068
msgid "Typical message::"
11069
msgstr ""
11070
11071
#: en/help_topics/conflict-types.txt:65
11072
msgid " Text conflict in FILE"
11073
msgstr ""
11074
11075
#: en/help_topics/conflict-types.txt:67
11076
msgid ""
11077
"These are produced when a text merge cannot completely reconcile two sets "
11078
"of\n"
11079
"text changes. Bazaar will emit files for each version with the extensions\n"
11080
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11081
"tree,\n"
11082
"i.e. the tree that you are merging changes into. OTHER is the version that "
11083
"you\n"
11084
"are merging into the target. BASE is an older version that is used as a "
11085
"basis\n"
11086
"for comparison."
11087
msgstr ""
11088
11089
#: en/help_topics/conflict-types.txt:74
11090
msgid ""
11091
"In the main copy of the file, Bazaar will include all the changes that it\n"
11092
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11093
"\"herringbone\" markers like ``<<<<<<<``."
11094
msgstr ""
11095
11096
#: en/help_topics/conflict-types.txt:78
11097
msgid ""
11098
"Say the initial text is \"The project leader released it.\", and THIS "
11099
"modifies it\n"
11100
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11101
"leader\n"
11102
"released Bazaar.\" A conflict would look like this::"
11103
msgstr ""
11104
11105
#: en/help_topics/conflict-types.txt:82
11106
msgid ""
11107
" <<<<<<< TREE\n"
11108
" Martin Pool released it.\n"
11109
" =======\n"
11110
" The project leader released Bazaar.\n"
11111
" >>>>>>> MERGE-SOURCE"
11112
msgstr ""
11113
11114
#: en/help_topics/conflict-types.txt:88
11115
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11116
msgstr ""
11117
11118
#: en/help_topics/conflict-types.txt:90
11119
msgid ""
11120
"You can handle text conflicts either by editing the main copy of the file,\n"
11121
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11122
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11123
"set of changes over the other (but see below when you encounter these\n"
11124
"cases). More often, the two sets of changes must be intelligently combined."
11125
msgstr ""
11126
11127
#: en/help_topics/conflict-types.txt:96
11128
msgid ""
11129
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11130
"you are done editing, the file should look like it never had a conflict, and "
11131
"be\n"
11132
"ready to commit."
11133
msgstr ""
11134
11135
#: en/help_topics/conflict-types.txt:100
11136
msgid ""
11137
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11138
"Bazaar will auto-detect which conflicts you have resolved."
11139
msgstr ""
11140
11141
#: en/help_topics/conflict-types.txt:103
11142
msgid ""
11143
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11144
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11145
"working tree."
11146
msgstr ""
11147
11148
#: en/help_topics/conflict-types.txt:107
11149
msgid ""
11150
"\n"
11151
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11152
"resolve`` with one of the following actions:"
11153
msgstr ""
11154
11155
#: en/help_topics/conflict-types.txt:111
11156
msgid ""
11157
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11158
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11159
msgstr ""
11160
11161
#: en/help_topics/conflict-types.txt:114
11162
msgid ""
11163
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11164
"modifications will be taken into account."
11165
msgstr ""
11166
11167
#: en/help_topics/conflict-types.txt:117
11168
msgid ""
11169
"Content conflicts\n"
11170
"-----------------"
11171
msgstr ""
11172
11173
#: en/help_topics/conflict-types.txt:122
11174
msgid " Contents conflict in FILE"
11175
msgstr ""
11176
11177
#: en/help_topics/conflict-types.txt:124
11178
msgid ""
11179
"This conflict happens when there are conflicting changes in the working "
11180
"tree\n"
11181
"and the merge source, but the conflicted items are not text files. They "
11182
"may\n"
11183
"be binary files, or symlinks, or directories. It can even happen with "
11184
"files\n"
11185
"that are deleted on one side, and modified on the other."
11186
msgstr ""
11187
11188
#: en/help_topics/conflict-types.txt:129
11189
msgid ""
11190
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11191
"be\n"
11192
"regular files, symlinks or directories). But it will not include a \"main "
11193
"copy\"\n"
11194
"of the file with herringbone conflict markers. It will appear that the "
11195
"\"main\n"
11196
"copy\" has been renamed to THIS or OTHER."
11197
msgstr ""
11198
11199
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11200
msgid ""
11201
"To resolve that kind of conflict, you should rebuild FILE from either "
11202
"version\n"
11203
"or a combination of both."
11204
msgstr ""
11205
11206
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11207
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11208
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11209
#: en/help_topics/conflict-types.txt:361
11210
msgid "``bzr resolve`` recognizes the following actions:"
11211
msgstr ""
11212
11213
#: en/help_topics/conflict-types.txt:139
11214
msgid ""
11215
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11216
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11217
"* ``--action=done`` will just mark the conflict as resolved."
11218
msgstr ""
11219
11220
#: en/help_topics/conflict-types.txt:143
11221
msgid ""
11222
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11223
"and\n"
11224
"``.OTHER`` files if they are still present in the working tree."
11225
msgstr ""
11226
11227
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11228
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11229
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11230
#: en/help_topics/conflict-types.txt:369
11231
msgid ""
11232
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11233
msgstr ""
11234
11235
#: en/help_topics/conflict-types.txt:148
11236
msgid ""
11237
"Tag conflicts\n"
11238
"-------------"
11239
msgstr ""
11240
11241
#: en/help_topics/conflict-types.txt:153
11242
msgid ""
11243
" Conflicting tags:\n"
11244
" version-0.1"
11245
msgstr ""
11246
11247
#: en/help_topics/conflict-types.txt:156
11248
msgid ""
11249
"When pulling from or pushing to another branch, Bazaar informs you about "
11250
"tags\n"
11251
"that conflict between the two branches; that is the same tag points to two\n"
11252
"different revisions. You need not resolve these conflicts, but subsequent\n"
11253
"uses of pull or push will result in the same message."
11254
msgstr ""
11255
11256
#: en/help_topics/conflict-types.txt:161
11257
msgid ""
11258
"To resolve the conflict, you must apply the correct tags to either the "
11259
"target\n"
11260
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11261
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11262
"target branch's tags match the source branch, then in the target branch do\n"
11263
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11264
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11265
"source\n"
11266
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11267
"favor of the target branch, you need to similarly use ``tag --force`` in "
11268
"the\n"
11269
"source branch. (Note that pulling or pushing using --overwrite will "
11270
"overwrite\n"
11271
"all tags as well.)"
11272
msgstr ""
11273
11274
#: en/help_topics/conflict-types.txt:172
11275
msgid ""
11276
"Duplicate paths\n"
11277
"---------------"
11278
msgstr ""
11279
11280
#: en/help_topics/conflict-types.txt:177
11281
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11282
msgstr ""
11283
11284
#: en/help_topics/conflict-types.txt:179
11285
msgid ""
11286
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11287
"already been used. The existing file will be renamed to \"FILE.moved\". "
11288
msgstr ""
11289
11290
#: en/help_topics/conflict-types.txt:187
11291
msgid ""
11292
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11293
"FILE``,\n"
11294
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11295
"* ``--action=done`` will just mark the conflict as resolved."
11296
msgstr ""
11297
11298
#: en/help_topics/conflict-types.txt:191
11299
msgid ""
11300
"Note that you must get rid of FILE.moved before using ``--action=done``."
11301
msgstr ""
11302
11303
#: en/help_topics/conflict-types.txt:195
11304
msgid ""
11305
"Unversioned parent\n"
11306
"------------------"
11307
msgstr ""
11308
11309
#: en/help_topics/conflict-types.txt:200
11310
msgid ""
11311
" Conflict because FILE is not versioned, but has versioned children."
11312
msgstr ""
11313
11314
#: en/help_topics/conflict-types.txt:202
11315
msgid ""
11316
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11317
"not\n"
11318
"versioned. This happens when the directory has been deleted in the target,\n"
11319
"but has a new child in the source, or vice versa. In this situation, "
11320
"Bazaar\n"
11321
"will version the parent directory as well. Resolving this issue depends\n"
11322
"very much on the particular scenario. You may wish to rename or delete "
11323
"either\n"
11324
"the file or the directory. When you are satisfied, you can run \"bzr "
11325
"resolve\n"
11326
"FILE\" to mark the conflict as resolved."
11327
msgstr ""
11328
11329
#: en/help_topics/conflict-types.txt:210
11330
msgid ""
11331
"Missing parent\n"
11332
"--------------"
11333
msgstr ""
11334
11335
#: en/help_topics/conflict-types.txt:215
11336
msgid " Conflict adding files to FILE. Created directory."
11337
msgstr ""
11338
11339
#: en/help_topics/conflict-types.txt:217
11340
msgid ""
11341
"This happens when a directory has been deleted in the target, but has new\n"
11342
"children in the source. This is similar to the \"unversioned parent\" "
11343
"conflict,\n"
11344
"except that the parent directory does not *exist*, instead of just being\n"
11345
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11346
"Resolving this issue depends very much on the particular scenario."
11347
msgstr ""
11348
11349
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11350
msgid ""
11351
"To resolve that kind of conflict, you should either remove or rename the\n"
11352
"children or the directory or a combination of both."
11353
msgstr ""
11354
11355
#: en/help_topics/conflict-types.txt:228
11356
msgid ""
11357
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11358
" children,\n"
11359
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11360
"children\n"
11361
" and restoring the directory,\n"
11362
"* ``--action=done`` will just mark the conflict as resolved."
11363
msgstr ""
11364
11365
#: en/help_topics/conflict-types.txt:236
11366
msgid ""
11367
"Deleting parent\n"
11368
"---------------"
11369
msgstr ""
11370
11371
#: en/help_topics/conflict-types.txt:241
11372
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11373
msgstr ""
11374
11375
#: en/help_topics/conflict-types.txt:243
11376
msgid ""
11377
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11378
"source, but has new children in the target (either because a directory\n"
11379
"deletion is merged or because the merge introduce new children). Bazaar\n"
11380
"will retain the directory. Resolving this issue depends very much on the\n"
11381
"particular scenario."
11382
msgstr ""
11383
11384
#: en/help_topics/conflict-types.txt:254
11385
msgid ""
11386
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11387
"directory,"
11388
msgstr ""
11389
11390
#: en/help_topics/conflict-types.txt:256
11391
msgid ""
11392
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11393
" children,"
11394
msgstr ""
11395
11396
#: en/help_topics/conflict-types.txt:259
11397
msgid "* ``--action=done`` will just mark the conflict as resolved."
11398
msgstr ""
11399
11400
#: en/help_topics/conflict-types.txt:261
11401
msgid ""
11402
"Note that when merging a directory deletion, if unversioned files are\n"
11403
"present, they become potential orphans has they don't have a directory\n"
11404
"parent anymore."
11405
msgstr ""
11406
11407
#: en/help_topics/conflict-types.txt:265
11408
msgid ""
11409
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11410
"setting the ``bzr.transform.orphan_policy`` configuration option."
11411
msgstr ""
11412
11413
#: en/help_topics/conflict-types.txt:268
11414
msgid "There are two possible values for this option:"
11415
msgstr "Es gibt zwei mögliche Werte für diese Option:"
11416
11417
#: en/help_topics/conflict-types.txt:270
11418
msgid ""
11419
"* ``conflict`` (the default): will leave the orphans in place and\n"
11420
" generate a conflicts,"
11421
msgstr ""
11422
11423
#: en/help_topics/conflict-types.txt:273
11424
msgid ""
11425
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11426
"root\n"
11427
" of the working tree with names like ``<file>.~#~``."
11428
msgstr ""
11429
11430
#: en/help_topics/conflict-types.txt:278
11431
msgid ""
11432
"Path conflict\n"
11433
"-------------"
11434
msgstr ""
11435
11436
#: en/help_topics/conflict-types.txt:283
11437
msgid " Path conflict: PATH1 / PATH2"
11438
msgstr ""
11439
11440
#: en/help_topics/conflict-types.txt:285
11441
msgid ""
11442
"This happens when the source and target have each modified the name or "
11443
"parent\n"
11444
"directory of a file. Bazaar will use the path elements from the source."
11445
msgstr ""
11446
11447
#: en/help_topics/conflict-types.txt:288
11448
msgid ""
11449
"To resolve that kind of conflict, you just have to decide what name should "
11450
"be\n"
11451
"retained for the file involved."
11452
msgstr ""
11453
11454
#: en/help_topics/conflict-types.txt:293
11455
msgid ""
11456
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11457
" issuing ``bzr mv PATH2 PATH1``,\n"
11458
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11459
"``PATH2``,\n"
11460
"* ``--action=done`` will just mark the conflict as resolved."
11461
msgstr ""
11462
11463
#: en/help_topics/conflict-types.txt:300
11464
msgid ""
11465
"Parent loop\n"
11466
"-----------"
11467
msgstr ""
11468
11469
#: en/help_topics/conflict-types.txt:305
11470
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11471
msgstr ""
11472
11473
#: en/help_topics/conflict-types.txt:307
11474
msgid ""
11475
"This happens when the source and the target have each moved directories, so\n"
11476
"that, if the change could be applied, a directory would be contained by "
11477
"itself.\n"
11478
"For example::"
11479
msgstr ""
11480
11481
#: en/help_topics/conflict-types.txt:311
11482
msgid ""
11483
" $ bzr init\n"
11484
" $ bzr mkdir white\n"
11485
" $ bzr mkdir black\n"
11486
" $ bzr commit -m \"BASE\"\n"
11487
" $ bzr branch . ../other\n"
11488
" $ bzr mv white black\n"
11489
" $ bzr commit -m \"THIS\"\n"
11490
" $ bzr mv ../other/black ../other/white\n"
11491
" $ bzr commit ../other -m \"OTHER\"\n"
11492
" $ bzr merge ../other"
11493
msgstr ""
11494
" $ bzr init\n"
11495
" $ bzr mkdir white\n"
11496
" $ bzr mkdir black\n"
11497
" $ bzr commit -m \"BASE\"\n"
11498
" $ bzr branch . ../other\n"
11499
" $ bzr mv white black\n"
11500
" $ bzr commit -m \"THIS\"\n"
11501
" $ bzr mv ../other/black ../other/white\n"
11502
" $ bzr commit ../other -m \"OTHER\"\n"
11503
" $ bzr merge ../other"
11504
11505
#: en/help_topics/conflict-types.txt:322
11506
msgid ""
11507
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11508
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11509
"name should be retained for the directories involved."
11510
msgstr ""
11511
11512
#: en/help_topics/conflict-types.txt:328
11513
msgid ""
11514
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11515
"\n"
11516
" in ``black``,\n"
11517
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11518
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11519
"* ``--action=done`` will just mark the conflict as resolved."
11520
msgstr ""
11521
11522
#: en/help_topics/conflict-types.txt:336
11523
msgid ""
11524
"Non-directory parent\n"
11525
"--------------------"
11526
msgstr ""
11527
11528
#: en/help_topics/conflict-types.txt:341
11529
msgid ""
11530
" Conflict: foo.new is not a directory, but has files in it.\n"
11531
" Created directory."
11532
msgstr ""
11533
11534
#: en/help_topics/conflict-types.txt:344
11535
msgid ""
11536
"This happens when one side has added files to a directory, and the other "
11537
"side\n"
11538
"has changed the directory into a file or symlink. For example::"
11539
msgstr ""
11540
11541
#: en/help_topics/conflict-types.txt:347
11542
msgid ""
11543
" $ bzr init\n"
11544
" $ bzr mkdir foo\n"
11545
" $ bzr commit -m \"BASE\"\n"
11546
" $ bzr branch . ../other\n"
11547
" $ rmdir foo\n"
11548
" $ touch foo\n"
11549
" $ bzr commit -m \"THIS\"\n"
11550
" $ bzr mkdir ../other/foo/bar\n"
11551
" $ bzr commit ../other -m \"OTHER\"\n"
11552
" $ bzr merge ../other"
11553
msgstr ""
11554
" $ bzr init\n"
11555
" $ bzr mkdir foo\n"
11556
" $ bzr commit -m \"BASE\"\n"
11557
" $ bzr branch . ../other\n"
11558
" $ rmdir foo\n"
11559
" $ touch foo\n"
11560
" $ bzr commit -m \"THIS\"\n"
11561
" $ bzr mkdir ../other/foo/bar\n"
11562
" $ bzr commit ../other -m \"OTHER\"\n"
11563
" $ bzr merge ../other"
11564
11565
#: en/help_topics/conflict-types.txt:358
11566
msgid ""
11567
"To resolve that kind of conflict, you have to decide what name should be\n"
11568
"retained for the file, directory or symlink involved."
11569
msgstr ""
11570
11571
#: en/help_topics/conflict-types.txt:363
11572
msgid ""
11573
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11574
" ``bzr add foo``,\n"
11575
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11576
" ``bzr mv foo.new foo``,\n"
11577
"* ``--action=done`` will just mark the conflict as resolved."
11578
msgstr ""
11579
11580
#: en/help_topics/conflict-types.txt:371
11581
msgid ""
11582
"MalformedTransform\n"
11583
"------------------"
11584
msgstr ""
11585
11586
#: en/help_topics/conflict-types.txt:374
11587
msgid ""
11588
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11589
"exception. This means that Bazaar encountered a filesystem conflict that it "
11590
"was\n"
11591
"unable to resolve. This usually indicates a bug. Please let us know if "
11592
"you\n"
11593
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11594
msgstr ""
11595
11596
#: en/help_topics/content-filters.txt:1
11597
msgid ""
11598
"Content Filters\n"
11599
"==============="
11600
msgstr ""
11601
11602
#: en/help_topics/content-filters.txt:4
11603
msgid ""
11604
"Content formats\n"
11605
"---------------"
11606
msgstr ""
11607
11608
#: en/help_topics/content-filters.txt:7
11609
msgid ""
11610
"Bazaar's content filtering allows you to store files in a different\n"
11611
"format from the copy in your working tree. This lets you, or your\n"
11612
"co-developers, use Windows development tools that expect CRLF files\n"
11613
"on projects that use other line-ending conventions. Among other things,\n"
11614
"content filters also let Unix developers more easily work on projects\n"
11615
"using Windows line-ending conventions, keyword expansion/compression,\n"
11616
"and trailing spaces on lines in text files to be implicitly stripped\n"
11617
"when committed."
11618
msgstr ""
11619
11620
#: en/help_topics/content-filters.txt:16
11621
msgid "To generalize, there are two content formats supported by Bazaar:"
11622
msgstr ""
11623
11624
#: en/help_topics/content-filters.txt:18
11625
msgid ""
11626
"* a canonical format - how files are stored internally\n"
11627
"* a convenience format - how files are created in a working tree."
11628
msgstr ""
11629
11630
#: en/help_topics/content-filters.txt:21
11631
msgid ""
11632
"\n"
11633
"Format conversion\n"
11634
"-----------------"
11635
msgstr ""
11636
11637
#: en/help_topics/content-filters.txt:25
11638
msgid ""
11639
"The conversion between these formats is done by content filters.\n"
11640
"A content filter has two parts:"
11641
msgstr ""
11642
11643
#: en/help_topics/content-filters.txt:28
11644
msgid ""
11645
"* a read converter - converts from convenience to canonical format\n"
11646
"* a write converter - converts from canonical to convenience format."
11647
msgstr ""
11648
11649
#: en/help_topics/content-filters.txt:31
11650
msgid ""
11651
"Many of these converters will provide *round-trip* conversion,\n"
11652
"i.e. applying the read converter followed by the write converter\n"
11653
"gives back the original content. However, others may provide an\n"
11654
"asymmetric conversion. For example, a read converter might strip\n"
11655
"trailing whitespace off lines in source code while the matching\n"
11656
"write converter might pass content through unchanged."
11657
msgstr ""
11658
11659
#: en/help_topics/content-filters.txt:38
11660
msgid ""
11661
"\n"
11662
"Enabling content filters\n"
11663
"------------------------"
11664
msgstr ""
11665
11666
#: en/help_topics/content-filters.txt:42
11667
msgid ""
11668
"Content filters are typically provided by plugins, so the first step\n"
11669
"in using them is to install the relevant plugins and read their\n"
11670
"documentation. Some plugins may be very specific about which files\n"
11671
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11672
"In other cases, the plugin may leave it in the user's hands to\n"
11673
"define which files are to be filtered. This is typically done\n"
11674
"using rule-based preferences. See ``bzr help rules`` for general\n"
11675
"information about defining these."
11676
msgstr ""
11677
11678
#: en/help_topics/content-filters.txt:51
11679
msgid ""
11680
"\n"
11681
"Impact on commands\n"
11682
"------------------"
11683
msgstr ""
11684
11685
#: en/help_topics/content-filters.txt:55
11686
msgid ""
11687
"Read converters are only applied to commands that read content from\n"
11688
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11689
"will apply read converters to files in the working tree, then compare\n"
11690
"the results to the content last committed."
11691
msgstr ""
11692
11693
#: en/help_topics/content-filters.txt:60
11694
msgid ""
11695
"Write converters are only applied by commands that **create files in a\n"
11696
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11697
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11698
"respectively."
11699
msgstr ""
11700
11701
#: en/help_topics/content-filters.txt:65
11702
msgid ""
11703
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11704
"comitting files. If this makes sense for a given plugin providing\n"
11705
"a content filter, the plugin can usually achieve this effect by using a\n"
11706
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11707
"for more information on hooks."
11708
msgstr ""
11709
11710
#: en/help_topics/content-filters.txt:71
11711
msgid ""
11712
"\n"
11713
"Refreshing your working tree\n"
11714
"----------------------------"
11715
msgstr ""
11716
11717
#: en/help_topics/content-filters.txt:75
11718
msgid ""
11719
"For performance reasons, Bazaar caches the timestamps of files in\n"
11720
"a working tree, and assumes files are unchanged if their timestamps\n"
11721
"match the cached values. As a consequence, there are times when\n"
11722
"you may need to explicitly ask for content filtering to be reapplied\n"
11723
"in one or both directions, e.g. after installing or reconfiguring\n"
11724
"plugins providing it."
11725
msgstr ""
11726
11727
#: en/help_topics/content-filters.txt:82
11728
msgid "Here are some general guidelines for doing this:"
11729
msgstr ""
11730
11731
#: en/help_topics/content-filters.txt:84
11732
msgid ""
11733
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11734
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11735
" relevant read converters and compare the end result with the\n"
11736
" canonical format."
11737
msgstr ""
11738
11739
#: en/help_topics/content-filters.txt:89
11740
msgid ""
11741
" * To reapply write converters, ensure there are no local changes,\n"
11742
" delete the relevant files and run ``bzr revert`` on those files."
11743
msgstr ""
11744
11745
#: en/help_topics/content-filters.txt:92
11746
msgid ""
11747
"Note: In the future, it is likely that additional options will be added\n"
11748
"to commands to make this refreshing process faster and safer.\n"
11749
msgstr ""
11750
11751
#: en/help_topics/current-formats.txt:1
11752
msgid "Current Storage Formats"
11753
msgstr "Aktuelle Speicherformate"
11754
11755
#: en/help_topics/current-formats.txt:3
11756
msgid ""
11757
":2a:\n"
11758
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11759
" compress storage. Provides rich roots which are a one-way\n"
11760
" transition."
11761
msgstr ""
11762
11763
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11764
msgid ""
11765
"\n"
11766
"See :doc:`formats-help` for more about storage formats."
11767
msgstr ""
11768
11769
#: en/help_topics/debug-flags.txt:1
11770
msgid ""
11771
"Debug Flags\n"
11772
"==========="
11773
msgstr ""
11774
11775
#: en/help_topics/debug-flags.txt:4
11776
msgid ""
11777
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11778
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11779
msgstr ""
11780
11781
#: en/help_topics/debug-flags.txt:7
11782
msgid ""
11783
"-Dauth Trace authentication sections used.\n"
11784
"-Dbytes Print out how many bytes were transferred\n"
11785
"-Ddirstate Trace dirstate activity (verbose!)\n"
11786
"-Derror Instead of normal error handling, always print a "
11787
"traceback\n"
11788
" on error.\n"
11789
"-Devil Capture call sites that do expensive or badly-scaling\n"
11790
" operations.\n"
11791
"-Dfetch Trace history copying between repositories.\n"
11792
"-Dfilters Emit information for debugging content filtering.\n"
11793
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11794
"fetch.\n"
11795
"-Dgraph Trace graph traversal.\n"
11796
"-Dhashcache Log every time a working file is read to determine its "
11797
"hash.\n"
11798
"-Dhooks Trace hook execution.\n"
11799
"-Dhpss Trace smart protocol requests and responses.\n"
11800
"-Dhpssdetail More hpss details.\n"
11801
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11802
"-Dhttp Trace http connections, requests and responses.\n"
11803
"-Dindex Trace major index operations.\n"
11804
"-Dknit Trace knit operations.\n"
11805
"-Dlock Trace when lockdir locks are taken or released.\n"
11806
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11807
" retrying the request.\n"
11808
"-Dprogress Trace progress bar operations.\n"
11809
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11810
"-Dmerge Emit information for debugging merges.\n"
11811
"-Dno_apport Don't use apport to report crashes.\n"
11812
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11813
"-Dpack Emit information about pack operations.\n"
11814
"-Drelock Emit a message every time a branch or repository object "
11815
"is\n"
11816
" unlocked then relocked the same way.\n"
11817
"-Dsftp Trace SFTP internals.\n"
11818
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11819
"expected\n"
11820
"-Dstream Trace fetch streams.\n"
11821
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11822
"portable\n"
11823
" manner.\n"
11824
"-Dunlock Some errors during unlock are treated as warnings.\n"
11825
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11826
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11827
"appropriate\n"
11828
" for the format, even for non-local fetches.\n"
11829
msgstr ""
11830
11831
#: en/help_topics/diverged-branches.txt:1
11832
msgid ""
11833
"Diverged Branches\n"
11834
"================="
11835
msgstr ""
11836
11837
#: en/help_topics/diverged-branches.txt:4
11838
msgid ""
11839
"When Bazaar tries to push one branch onto another, it requires that the\n"
11840
"destination branch must be ready to receive the source branch. If this "
11841
"isn't\n"
11842
"the case, then we say that the branches have ``diverged``. Branches are\n"
11843
"considered diverged if the destination branch's most recent commit is one "
11844
"that\n"
11845
"has not been merged (directly or indirectly) by the source branch. To "
11846
"recover\n"
11847
"from diverged branches, one must merge the missing revisions into the "
11848
"source\n"
11849
"branch."
11850
msgstr ""
11851
11852
#: en/help_topics/diverged-branches.txt:12
11853
msgid ""
11854
"This situation commonly arises when using a centralized workflow with local\n"
11855
"commits. If someone else has committed new work to the mainline since your\n"
11856
"last pull and you have local commits that have not yet been pushed to the\n"
11857
"mainline, then your local branch and the mainline have diverged."
11858
msgstr ""
11859
11860
#: en/help_topics/diverged-branches.txt:17
11861
msgid ""
11862
"Discovering What Has Diverged\n"
11863
"-----------------------------"
11864
msgstr ""
11865
11866
#: en/help_topics/diverged-branches.txt:20
11867
msgid ""
11868
"The ``bzr missing`` command is used to find out what revisions are in "
11869
"another\n"
11870
"branch that are not present in the current branch, and vice-versa. It shows "
11871
"a\n"
11872
"summary of which extra revisions exist in each branch. If you want to see "
11873
"the\n"
11874
"precise effects of those revisions, you can use ``bzr diff --"
11875
"old=other_branch``\n"
11876
"to show the differences between other_branch and your current branch."
11877
msgstr ""
11878
11879
#: en/help_topics/diverged-branches.txt:26
11880
msgid ""
11881
"A Solution\n"
11882
"----------"
11883
msgstr ""
11884
11885
#: en/help_topics/diverged-branches.txt:29
11886
msgid ""
11887
"The solution is to merge the revisions from the mainline into your local\n"
11888
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11889
"mainline. This merge may result in conflicts if the other developer's "
11890
"changes\n"
11891
"overlap with your changes. These conflicts should be resolved before\n"
11892
"continuing. After any conflicts have been resolved, or even if there were "
11893
"no\n"
11894
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11895
"to your local branch. This requirement gives you an opportunity to test "
11896
"the\n"
11897
"resulting working tree for correctness, since the merged revisions could "
11898
"have\n"
11899
"made arbitrary changes. After testing, you should commit the merge using\n"
11900
"``bzr commit``. This clears up the diverged branches situation. Your "
11901
"local\n"
11902
"branch can now be pushed to the mainline.\n"
11903
msgstr ""
11904
11905
#: en/help_topics/env-variables.txt:1
11906
msgid "Environment Variables"
11907
msgstr "Umgebungsvariablen"
11908
11909
#: en/help_topics/env-variables.txt:3
11910
msgid "See bzr help configuration for more details."
11911
msgstr ""
11912
11913
#: en/help_topics/env-variables.txt:5
11914
msgid ""
11915
"=================== "
11916
"===========================================================\n"
11917
"BZRPATH Path where bzr is to look for shell plugin external\n"
11918
" commands.\n"
11919
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11920
"EMAIL E-Mail address of the user.\n"
11921
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11922
"EDITOR Editor for editing commit messages.\n"
11923
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11924
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11925
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11926
"BZR_PLUGIN_PATH.\n"
11927
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11928
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11929
"and\n"
11930
" HOME.\n"
11931
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11932
"URLs).\n"
11933
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11934
"sshcorp,\n"
11935
" plink or lsh.\n"
11936
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11937
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11938
"BZR_COLUMNS Override implicit terminal width.\n"
11939
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11940
"(selftest)\n"
11941
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11942
"'text'.\n"
11943
"BZR_PDB Control whether to launch a debugger on error.\n"
11944
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11945
" breakin debugger.\n"
11946
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11947
"(instead\n"
11948
" of char-based).\n"
11949
"=================== "
11950
"===========================================================\n"
11951
msgstr ""
11952
11953
#: en/help_topics/eol.txt:1
11954
msgid ""
11955
"End of Line Conversion\n"
11956
"======================"
11957
msgstr ""
11958
11959
#: en/help_topics/eol.txt:4
11960
msgid ""
11961
"EOL conversion is provided as a content filter where Bazaar internally\n"
11962
"stores a canonical format but outputs a convenience format. See\n"
11963
"``bzr help content-filters`` for general information about using these."
11964
msgstr ""
11965
11966
#: en/help_topics/eol.txt:8
11967
msgid ""
11968
"Note: Content filtering is only supported in recently added formats,\n"
11969
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11970
"in a recent format. (Just setting the format on the repository\n"
11971
"is not enough.) If content filtering does not appear to be working, use\n"
11972
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11973
"or later."
11974
msgstr ""
11975
11976
#: en/help_topics/eol.txt:15
11977
msgid ""
11978
"EOL conversion needs to be enabled for selected file patterns using\n"
11979
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11980
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11981
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11982
"supported in a future verison of Bazaar."
11983
msgstr ""
11984
11985
#: en/help_topics/eol.txt:21
11986
msgid ""
11987
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11988
"(If a value is not set, ``exact`` is the default.)"
11989
msgstr ""
11990
11991
#: en/help_topics/eol.txt:24
11992
msgid ""
11993
" ========== ===================================== ======================\n"
11994
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11995
" ========== ===================================== ======================\n"
11996
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11997
" ---------- ------------------------------------- ----------------------\n"
11998
" ``lf`` ``lf`` ``lf``\n"
11999
" ---------- ------------------------------------- ----------------------\n"
12000
" ``crlf`` ``crlf`` ``lf``\n"
12001
" ---------- ------------------------------------- ----------------------\n"
12002
" ``exact`` No conversion Exactly as in file\n"
12003
" ========== ===================================== ======================"
12004
msgstr ""
12005
12006
#: en/help_topics/eol.txt:36
12007
msgid ""
12008
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12009
"byte is detected in the file."
12010
msgstr ""
12011
12012
#: en/help_topics/eol.txt:39
12013
msgid ""
12014
"For users working on a cross-platform project, here is a suggested rule\n"
12015
"to use as a starting point::"
12016
msgstr ""
12017
12018
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12019
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12020
msgid ""
12021
" [name *]\n"
12022
" eol = native"
12023
msgstr ""
12024
12025
#: en/help_topics/eol.txt:45
12026
msgid ""
12027
"If you have binary files that do not contain a null byte though, be\n"
12028
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12029
"by giving more explicit patterns earlier in the rules file. For example::"
12030
msgstr ""
12031
12032
#: en/help_topics/eol.txt:49
12033
msgid ""
12034
" [name *.png]\n"
12035
" eol = exact"
12036
msgstr ""
12037
12038
#: en/help_topics/eol.txt:55
12039
msgid ""
12040
"If your working tree is on a network drive shared by users on different\n"
12041
"operating systems, you typically want to force certain conventions for\n"
12042
"certain files. In that way, if a file is created with the wrong line\n"
12043
"endings or line endings get mixed during editing, it gets committed\n"
12044
"correctly and gets checked out correctly. For example::"
12045
msgstr ""
12046
12047
#: en/help_topics/eol.txt:61
12048
msgid ""
12049
" [name *.bat]\n"
12050
" eol = crlf"
12051
msgstr ""
12052
12053
#: en/help_topics/eol.txt:64
12054
msgid ""
12055
" [name *.sh]\n"
12056
" eol = lf"
12057
msgstr ""
12058
12059
#: en/help_topics/eol.txt:70
12060
msgid ""
12061
"If you take the care to create files with their required endings, you can\n"
12062
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12063
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12064
"introducing mixed line endings will be corrected during commit for files\n"
12065
"with those settings."
12066
msgstr ""
12067
12068
#: en/help_topics/eol.txt:76
12069
msgid ""
12070
"If you have sample test data that deliberately has text files with mixed\n"
12071
"newline conventions, you can ask for those to be left alone like this::"
12072
msgstr ""
12073
12074
#: en/help_topics/eol.txt:79
12075
msgid ""
12076
" [name test_data/]\n"
12077
" eol = exact"
12078
msgstr ""
12079
12080
#: en/help_topics/eol.txt:85
12081
msgid ""
12082
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12083
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12084
"of content analysis to detect binary files for commands like ``diff``.\n"
12085
"In the future, a ``binary = true`` rule may be added but it is not\n"
12086
"supported yet.)"
12087
msgstr ""
12088
12089
#: en/help_topics/eol.txt:91
12090
msgid ""
12091
"If you have an existing repository with text files already stored using\n"
12092
"Windows newline conventions (``crlf``), then you may want to keep using "
12093
"that\n"
12094
"convention in the repository. Forcing certain files to this convention\n"
12095
"may also help users who do not have rules configured. To do this, set\n"
12096
"``eol`` to one of the values below."
12097
msgstr ""
12098
12099
#: en/help_topics/eol.txt:97
12100
msgid ""
12101
" ============================ ======================== "
12102
"======================\n"
12103
" Value Checkout end-of-lines as Commit end-of-lines "
12104
"as\n"
12105
" ============================ ======================== "
12106
"======================\n"
12107
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12108
" ``lf`` otherwise\n"
12109
" ---------------------------- ------------------------ ----------------------"
12110
"\n"
12111
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12112
" ---------------------------- ------------------------ ----------------------"
12113
"\n"
12114
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12115
" ============================ ======================== ======================"
12116
msgstr ""
12117
12118
#: en/help_topics/eol.txt:108
12119
msgid ""
12120
"For users working on an existing project that uses Windows newline\n"
12121
"conventions in their Bazaar repository, this rule is suggested as a\n"
12122
"starting point::"
12123
msgstr ""
12124
12125
#: en/help_topics/eol.txt:112
12126
msgid ""
12127
" [name *]\n"
12128
" eol = native-with-crlf-in-repo"
12129
msgstr ""
12130
12131
#: en/help_topics/eol.txt:115
12132
msgid ""
12133
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12134
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12135
"``crlf`` and ``exact``."
12136
msgstr ""
12137
12138
#: en/help_topics/eol.txt:119
12139
msgid ""
12140
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12141
"never reject files because a given line ending or mixed line endings\n"
12142
"are found. A precommit hook should be used if you wish to validate\n"
12143
"(and not just convert) content before committing.\n"
12144
msgstr ""
12145
12146
#: en/help_topics/hidden-commands.txt:1
12147
msgid ""
12148
"added List files added in working tree.\n"
12149
"ancestry List all revisions merged into this branch.\n"
12150
"assert-fail Test reporting of assertion failures\n"
12151
"bundle-info Output interesting stats about a bundle\n"
12152
"bundle-revisions Create a merge-directive for submitting changes.\n"
12153
"cat-revision Write out metadata for a revision.\n"
12154
"dump-btree Dump the contents of a btree index file to stdout.\n"
12155
"export-pot Export command helps and error messages in po format.\n"
12156
"file-id Print file_id of a particular file or directory.\n"
12157
"file-path Print path of file_ids to a file or directory.\n"
12158
"find-merge-base Find and print a base revision for merging two "
12159
"branches.\n"
12160
"hooks Show hooks.\n"
12161
"inventory Show inventory of the current working copy or a "
12162
"revision.\n"
12163
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12164
"lookup-revision Lookup the revision-id from a revision-number\n"
12165
"merge-directive Generate a merge directive for auto-merge tools.\n"
12166
"modified List files modified in working tree.\n"
12167
"re-sign Create a digital signature for an existing revision.\n"
12168
"reference list, view and set branch locations for nested trees.\n"
12169
"relpath Show path of a file relative to root\n"
12170
"repair-workingtree Reset the working tree state file.\n"
12171
"revision-history Display the list of revision ids on a branch.\n"
12172
"revision-info Show revision number and revision id for a given "
12173
"revision\n"
12174
" identifier.\n"
12175
"rocks Statement of optimism.\n"
12176
"selftest Run internal test suite.\n"
12177
"shell-complete Show appropriate completions for context.\n"
12178
"test-script Run a shell-like test from a file.\n"
12179
"touching-revisions Return revision-ids which affected a particular file.\n"
12180
"unknowns List unknown files.\n"
12181
"wait-until-signalled Test helper for\n"
12182
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12183
msgstr ""
12184
12185
#: en/help_topics/hooks.txt:1
12186
msgid ""
12187
"\n"
12188
"Hooks\n"
12189
"====="
12190
msgstr ""
12191
12192
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12193
msgid ""
12194
"Introduction\n"
12195
"------------"
12196
msgstr ""
12197
12198
#: en/help_topics/hooks.txt:8
12199
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:10
12203
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:12
12207
msgid ""
12208
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12209
msgstr ""
12210
12211
#: en/help_topics/hooks.txt:14
12212
msgid ""
12213
"The class that contains each hook is given before the hooks it supplies. "
12214
"For\n"
12215
"instance, BranchHooks as the class is the hooks class for\n"
12216
"`bzrlib.branch.Branch.hooks`."
12217
msgstr ""
12218
12219
#: en/help_topics/hooks.txt:18
12220
msgid ""
12221
"Each description also indicates whether the hook runs on the client (the\n"
12222
"machine where bzr was invoked) or the server (the machine addressed by\n"
12223
"the branch URL). These may be, but are not necessarily, the same machine."
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:22
12227
msgid ""
12228
"Plugins (including hooks) are run on the server if all of these is true:"
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:24
12232
msgid ""
12233
" * The connection is via a smart server (accessed with a URL starting with\n"
12234
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12235
"\"http://\"\n"
12236
" URL when a smart server is available via HTTP)."
12237
msgstr ""
12238
12239
#: en/help_topics/hooks.txt:28
12240
msgid ""
12241
" * The hook is either server specific or part of general infrastructure "
12242
"rather\n"
12243
" than client specific code (such as commit)."
12244
msgstr ""
12245
12246
#: en/help_topics/hooks.txt:31
12247
msgid ""
12248
"\n"
12249
"BranchHooks\n"
12250
"-----------"
12251
msgstr ""
12252
12253
#: en/help_topics/hooks.txt:35
12254
msgid ""
12255
"automatic_tag_name\n"
12256
"~~~~~~~~~~~~~~~~~~"
12257
msgstr ""
12258
12259
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12260
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12261
msgid "Introduced in: 2.2"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:40
12265
msgid ""
12266
"Called to determine an automatic tag name for a revision.\n"
12267
"automatic_tag_name is called with (branch, revision_id) and should\n"
12268
"return a tag name or None if no tag name could be determined. The\n"
12269
"first non-None tag name returned will be used."
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:45
12273
msgid ""
12274
"open\n"
12275
"~~~~"
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12279
#: en/help_topics/hooks.txt:307
12280
msgid "Introduced in: 1.8"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:50
12284
msgid ""
12285
"Called with the Branch object that has been opened after a branch is\n"
12286
"opened."
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:53
12290
msgid ""
12291
"post_branch_init\n"
12292
"~~~~~~~~~~~~~~~~"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:58
12296
msgid ""
12297
"Called after new branch initialization completes. post_branch_init is\n"
12298
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12299
"branch and checkout (both heavyweight and lightweight) will all\n"
12300
"trigger this hook."
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:63
12304
msgid ""
12305
"post_change_branch_tip\n"
12306
"~~~~~~~~~~~~~~~~~~~~~~"
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12310
msgid "Introduced in: 1.4"
12311
msgstr ""
12312
12313
#: en/help_topics/hooks.txt:68
12314
msgid ""
12315
"Called in bzr client and server after a change to the tip of a branch\n"
12316
"is made. post_change_branch_tip is called with a\n"
12317
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12318
"uncommit will all trigger this hook."
12319
msgstr ""
12320
12321
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12322
msgid ""
12323
"post_commit\n"
12324
"~~~~~~~~~~~"
12325
msgstr ""
12326
12327
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12328
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12329
msgid "Introduced in: 0.15"
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:78
12333
msgid ""
12334
"Called in the bzr client after a commit has completed. post_commit is\n"
12335
"called with (local, master, old_revno, old_revid, new_revno,\n"
12336
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12337
"branch."
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:83
12341
msgid ""
12342
"post_pull\n"
12343
"~~~~~~~~~"
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:88
12347
msgid ""
12348
"Called after a pull operation completes. post_pull is called with a\n"
12349
"bzrlib.branch.PullResult object and only runs in the bzr client."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:91
12353
msgid ""
12354
"post_push\n"
12355
"~~~~~~~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:96
12359
msgid ""
12360
"Called after a push operation completes. post_push is called with a\n"
12361
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:99
12365
msgid ""
12366
"post_switch\n"
12367
"~~~~~~~~~~~"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:104
12371
msgid ""
12372
"Called after a checkout switches branch. post_switch is called with a\n"
12373
"bzrlib.branch.SwitchHookParams."
12374
msgstr ""
12375
12376
#: en/help_topics/hooks.txt:107
12377
msgid ""
12378
"post_uncommit\n"
12379
"~~~~~~~~~~~~~"
12380
msgstr ""
12381
12382
#: en/help_topics/hooks.txt:112
12383
msgid ""
12384
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12385
"called with (local, master, old_revno, old_revid, new_revno,\n"
12386
"new_revid) where local is the local branch or None, master is the\n"
12387
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12388
"of None."
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:118
12392
msgid ""
12393
"pre_change_branch_tip\n"
12394
"~~~~~~~~~~~~~~~~~~~~~"
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:121
12398
msgid "Introduced in: 1.6"
12399
msgstr "Eingeführt in: 1.6"
12400
12401
#: en/help_topics/hooks.txt:123
12402
msgid ""
12403
"Called in bzr client and server before a change to the tip of a branch\n"
12404
"is made. pre_change_branch_tip is called with a\n"
12405
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12406
"uncommit will all trigger this hook."
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:128
12410
msgid ""
12411
"pre_commit\n"
12412
"~~~~~~~~~~"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:131
12416
msgid "Introduced in: 0.91"
12417
msgstr "Eingeführt in: 0.91"
12418
12419
#: en/help_topics/hooks.txt:133
12420
msgid ""
12421
"Called after a commit is calculated but before it is completed.\n"
12422
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12423
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12424
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12425
"TreeDelta object describing changes from the basis revision. hooks\n"
12426
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12427
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12428
"tree."
12429
msgstr ""
12430
12431
#: en/help_topics/hooks.txt:142
12432
msgid ""
12433
"transform_fallback_location\n"
12434
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12435
msgstr ""
12436
12437
#: en/help_topics/hooks.txt:145
12438
msgid "Introduced in: 1.9"
12439
msgstr "Eingeführt in: 1.9"
12440
12441
#: en/help_topics/hooks.txt:147
12442
msgid ""
12443
"Called when a stacked branch is activating its fallback locations.\n"
12444
"transform_fallback_location is called with (branch, url), and should\n"
12445
"return a new url. Returning the same url allows it to be used as-is,\n"
12446
"returning a different one can be used to cause the branch to stack on\n"
12447
"a closer copy of that fallback_location. Note that the branch cannot\n"
12448
"have history accessing methods called on it during this hook because\n"
12449
"the fallback locations have not been activated. When there are\n"
12450
"multiple hooks installed for transform_fallback_location, all are\n"
12451
"called with the url returned from the previous hook.The order is\n"
12452
"however undefined."
12453
msgstr ""
12454
12455
#: en/help_topics/hooks.txt:158
12456
msgid ""
12457
"CommandHooks\n"
12458
"------------"
12459
msgstr ""
12460
12461
#: en/help_topics/hooks.txt:161
12462
msgid ""
12463
"extend_command\n"
12464
"~~~~~~~~~~~~~~"
12465
msgstr ""
12466
12467
#: en/help_topics/hooks.txt:164
12468
msgid "Introduced in: 1.13"
12469
msgstr "Eingeführt in: 1.13"
12470
12471
#: en/help_topics/hooks.txt:166
12472
msgid ""
12473
"Called after creating a command object to allow modifications such as\n"
12474
"adding or removing options, docs etc. Called with the new\n"
12475
"bzrlib.commands.Command object."
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:170
12479
msgid ""
12480
"get_command\n"
12481
"~~~~~~~~~~~"
12482
msgstr ""
12483
12484
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12485
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12486
msgid "Introduced in: 1.17"
12487
msgstr "Eingeführt in: 1.17"
12488
12489
#: en/help_topics/hooks.txt:175
12490
msgid ""
12491
"Called when creating a single command. Called with (cmd_or_None,\n"
12492
"command_name). get_command should either return the cmd_or_None\n"
12493
"parameter, or a replacement Command object that should be used for the\n"
12494
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12495
"Many users will prefer to use bzrlib.commands.register_command or\n"
12496
"plugin_cmds.register_lazy."
12497
msgstr ""
12498
12499
#: en/help_topics/hooks.txt:182
12500
msgid ""
12501
"get_missing_command\n"
12502
"~~~~~~~~~~~~~~~~~~~"
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:187
12506
msgid ""
12507
"Called when creating a single command if no command could be found.\n"
12508
"Called with (command_name). get_missing_command should either return\n"
12509
"None, or a Command object to be used for the command."
12510
msgstr ""
12511
12512
#: en/help_topics/hooks.txt:191
12513
msgid ""
12514
"list_commands\n"
12515
"~~~~~~~~~~~~~"
12516
msgstr ""
12517
12518
#: en/help_topics/hooks.txt:196
12519
msgid ""
12520
"Called when enumerating commands. Called with a set of cmd_name\n"
12521
"strings for all the commands found so far. This set is safe to mutate\n"
12522
"- e.g. to remove a command. list_commands should return the updated\n"
12523
"set of command names."
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:201
12527
msgid ""
12528
"post_command\n"
12529
"~~~~~~~~~~~~"
12530
msgstr ""
12531
12532
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12533
msgid "Introduced in: 2.6"
12534
msgstr ""
12535
12536
#: en/help_topics/hooks.txt:206
12537
msgid "Called after executing a command. Called with the command object."
12538
msgstr ""
12539
12540
#: en/help_topics/hooks.txt:208
12541
msgid ""
12542
"pre_command\n"
12543
"~~~~~~~~~~~"
12544
msgstr ""
12545
12546
#: en/help_topics/hooks.txt:213
12547
msgid "Called prior to executing a command. Called with the command object."
12548
msgstr ""
12549
12550
#: en/help_topics/hooks.txt:215
12551
msgid ""
12552
"_ConfigHooks\n"
12553
"------------"
12554
msgstr ""
12555
12556
#: en/help_topics/hooks.txt:218
12557
msgid ""
12558
"get\n"
12559
"~~~"
12560
msgstr ""
12561
12562
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12563
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12564
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12565
#: en/help_topics/hooks.txt:446
12566
msgid "Introduced in: 2.4"
12567
msgstr "Eingeführt in: 2.4"
12568
12569
#: en/help_topics/hooks.txt:223
12570
msgid ""
12571
"Invoked when a config option is read. The signature is (stack, name,\n"
12572
"value)."
12573
msgstr ""
12574
12575
#: en/help_topics/hooks.txt:226
12576
msgid ""
12577
"load\n"
12578
"~~~~"
12579
msgstr ""
12580
12581
#: en/help_topics/hooks.txt:231
12582
msgid "Invoked when a config store is loaded. The signature is (store)."
12583
msgstr ""
12584
12585
#: en/help_topics/hooks.txt:233
12586
msgid ""
12587
"remove\n"
12588
"~~~~~~"
12589
msgstr ""
12590
12591
#: en/help_topics/hooks.txt:238
12592
msgid ""
12593
"Invoked when a config option is removed. The signature is (stack,\n"
12594
"name)."
12595
msgstr ""
12596
12597
#: en/help_topics/hooks.txt:241
12598
msgid ""
12599
"save\n"
12600
"~~~~"
12601
msgstr ""
12602
12603
#: en/help_topics/hooks.txt:246
12604
msgid "Invoked when a config store is saved. The signature is (store)."
12605
msgstr ""
12606
12607
#: en/help_topics/hooks.txt:248
12608
msgid ""
12609
"set\n"
12610
"~~~"
12611
msgstr ""
12612
12613
#: en/help_topics/hooks.txt:253
12614
msgid ""
12615
"Invoked when a config option is set. The signature is (stack, name,\n"
12616
"value)."
12617
msgstr ""
12618
12619
#: en/help_topics/hooks.txt:256
12620
msgid ""
12621
"ControlDirHooks\n"
12622
"---------------"
12623
msgstr ""
12624
12625
#: en/help_topics/hooks.txt:259
12626
msgid ""
12627
"post_repo_init\n"
12628
"~~~~~~~~~~~~~~"
12629
msgstr ""
12630
12631
#: en/help_topics/hooks.txt:264
12632
msgid ""
12633
"Invoked after a repository has been initialized. post_repo_init is\n"
12634
"called with a bzrlib.controldir.RepoInitHookParams."
12635
msgstr ""
12636
12637
#: en/help_topics/hooks.txt:267
12638
msgid ""
12639
"pre_open\n"
12640
"~~~~~~~~"
12641
msgstr ""
12642
12643
#: en/help_topics/hooks.txt:270
12644
msgid "Introduced in: 1.14"
12645
msgstr "Eingeführt in: 1.14"
12646
12647
#: en/help_topics/hooks.txt:272
12648
msgid ""
12649
"Invoked before attempting to open a ControlDir with the transport that\n"
12650
"the open will use."
12651
msgstr ""
12652
12653
#: en/help_topics/hooks.txt:275
12654
msgid ""
12655
"InfoHooks\n"
12656
"---------"
12657
msgstr ""
12658
12659
#: en/help_topics/hooks.txt:278
12660
msgid ""
12661
"repository\n"
12662
"~~~~~~~~~~"
12663
msgstr ""
12664
12665
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12666
#: en/help_topics/hooks.txt:524
12667
msgid "Introduced in: 1.15"
12668
msgstr "Eingeführt in: 1.15"
12669
12670
#: en/help_topics/hooks.txt:283
12671
msgid ""
12672
"Invoked when displaying the statistics for a repository. repository is\n"
12673
"called with a statistics dictionary as returned by the repository and\n"
12674
"a file-like object to write to."
12675
msgstr ""
12676
12677
#: en/help_topics/hooks.txt:287
12678
msgid ""
12679
"LockHooks\n"
12680
"---------"
12681
msgstr ""
12682
12683
#: en/help_topics/hooks.txt:290
12684
msgid ""
12685
"lock_acquired\n"
12686
"~~~~~~~~~~~~~"
12687
msgstr ""
12688
12689
#: en/help_topics/hooks.txt:295
12690
msgid ""
12691
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12692
msgstr ""
12693
12694
#: en/help_topics/hooks.txt:297
12695
msgid ""
12696
"lock_broken\n"
12697
"~~~~~~~~~~~"
12698
msgstr ""
12699
12700
#: en/help_topics/hooks.txt:302
12701
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12702
msgstr ""
12703
12704
#: en/help_topics/hooks.txt:304
12705
msgid ""
12706
"lock_released\n"
12707
"~~~~~~~~~~~~~"
12708
msgstr ""
12709
12710
#: en/help_topics/hooks.txt:309
12711
msgid ""
12712
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12713
msgstr ""
12714
12715
#: en/help_topics/hooks.txt:311
12716
msgid ""
12717
"MergeHooks\n"
12718
"----------"
12719
msgstr ""
12720
12721
#: en/help_topics/hooks.txt:314
12722
msgid ""
12723
"merge_file_content\n"
12724
"~~~~~~~~~~~~~~~~~~"
12725
msgstr ""
12726
12727
#: en/help_topics/hooks.txt:317
12728
msgid "Introduced in: 2.1"
12729
msgstr ""
12730
12731
#: en/help_topics/hooks.txt:319
12732
msgid ""
12733
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12734
"object when starting a merge. Should return either None or a subclass\n"
12735
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12736
"called per file that needs to be merged (including when one side has\n"
12737
"deleted the file and the other has changed it). See the\n"
12738
"AbstractPerFileMerger API docs for details on how it is used by merge."
12739
msgstr ""
12740
12741
#: en/help_topics/hooks.txt:326
12742
msgid ""
12743
"post_merge\n"
12744
"~~~~~~~~~~"
12745
msgstr ""
12746
12747
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12748
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12749
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12750
msgid "Introduced in: 2.5"
12751
msgstr ""
12752
12753
#: en/help_topics/hooks.txt:331
12754
msgid ""
12755
"Called after a merge. Receives a Merger object as the single argument.\n"
12756
"The return value is ignored."
12757
msgstr ""
12758
12759
#: en/help_topics/hooks.txt:334
12760
msgid ""
12761
"pre_merge\n"
12762
"~~~~~~~~~"
12763
msgstr ""
12764
12765
#: en/help_topics/hooks.txt:339
12766
msgid ""
12767
"Called before a merge. Receives a Merger object as the single\n"
12768
"argument."
12769
msgstr ""
12770
12771
#: en/help_topics/hooks.txt:342
12772
msgid ""
12773
"MergeDirectiveHooks\n"
12774
"-------------------"
12775
msgstr ""
12776
12777
#: en/help_topics/hooks.txt:345
12778
msgid ""
12779
"merge_request_body\n"
12780
"~~~~~~~~~~~~~~~~~~"
12781
msgstr ""
12782
12783
#: en/help_topics/hooks.txt:348
12784
msgid "Introduced in: 1.15.0"
12785
msgstr ""
12786
12787
#: en/help_topics/hooks.txt:350
12788
msgid ""
12789
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12790
"request. Callbacks must return a body. If more than one callback is\n"
12791
"registered, the output of one callback is provided to the next."
12792
msgstr ""
12793
12794
#: en/help_topics/hooks.txt:354
12795
msgid ""
12796
"MessageEditorHooks\n"
12797
"------------------"
12798
msgstr ""
12799
12800
#: en/help_topics/hooks.txt:357
12801
msgid ""
12802
"commit_message_template\n"
12803
"~~~~~~~~~~~~~~~~~~~~~~~"
12804
msgstr ""
12805
12806
#: en/help_topics/hooks.txt:360
12807
msgid "Introduced in: 1.10"
12808
msgstr ""
12809
12810
#: en/help_topics/hooks.txt:362
12811
msgid ""
12812
"Called when a commit message is being generated.\n"
12813
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12814
"and the message that is known so far. commit_message_template must\n"
12815
"return a new message to use (which could be the same as it was given).\n"
12816
"When there are multiple hooks registered for commit_message_template,\n"
12817
"they are chained with the result from the first passed into the\n"
12818
"second, and so on."
12819
msgstr ""
12820
12821
#: en/help_topics/hooks.txt:370
12822
msgid ""
12823
"set_commit_message\n"
12824
"~~~~~~~~~~~~~~~~~~"
12825
msgstr ""
12826
12827
#: en/help_topics/hooks.txt:375
12828
msgid ""
12829
"Set a fixed commit message. set_commit_message is called with the\n"
12830
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12831
"properties by editing commit.builder._revprops) and the message so\n"
12832
"far. set_commit_message must return the message to use or None if it\n"
12833
"should use the message editor as normal."
12834
msgstr ""
12835
12836
#: en/help_topics/hooks.txt:381
12837
msgid ""
12838
"MutableTreeHooks\n"
12839
"----------------"
12840
msgstr ""
12841
12842
#: en/help_topics/hooks.txt:384
12843
msgid ""
12844
"post_build_tree\n"
12845
"~~~~~~~~~~~~~~~"
12846
msgstr ""
12847
12848
#: en/help_topics/hooks.txt:389
12849
msgid ""
12850
"Called after a completely new tree is built. The hook is called with\n"
12851
"the tree as its only argument."
12852
msgstr ""
12853
12854
#: en/help_topics/hooks.txt:395
12855
msgid "Introduced in: 2.0"
12856
msgstr ""
12857
12858
#: en/help_topics/hooks.txt:397
12859
msgid ""
12860
"Called after a commit is performed on a tree. The hook is called with\n"
12861
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12862
"commit was performed on is available via the mutable_tree attribute of\n"
12863
"that object."
12864
msgstr ""
12865
12866
#: en/help_topics/hooks.txt:402
12867
msgid ""
12868
"post_transform\n"
12869
"~~~~~~~~~~~~~~"
12870
msgstr ""
12871
12872
#: en/help_topics/hooks.txt:407
12873
msgid ""
12874
"Called after a tree transform has been performed on a tree. The hook\n"
12875
"is called with the tree that is being transformed and the transform."
12876
msgstr ""
12877
12878
#: en/help_topics/hooks.txt:410
12879
msgid ""
12880
"pre_transform\n"
12881
"~~~~~~~~~~~~~"
12882
msgstr ""
12883
12884
#: en/help_topics/hooks.txt:415
12885
msgid ""
12886
"Called before a tree transform on this tree. The hook is called with\n"
12887
"the tree that is being transformed and the transform."
12888
msgstr ""
12889
12890
#: en/help_topics/hooks.txt:418
12891
msgid ""
12892
"start_commit\n"
12893
"~~~~~~~~~~~~"
12894
msgstr ""
12895
12896
#: en/help_topics/hooks.txt:423
12897
msgid ""
12898
"Called before a commit is performed on a tree. The start commit hook\n"
12899
"is able to change the tree before the commit takes place. start_commit\n"
12900
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12901
"being performed on."
12902
msgstr ""
12903
12904
#: en/help_topics/hooks.txt:428
12905
msgid ""
12906
"SmartClientHooks\n"
12907
"----------------"
12908
msgstr ""
12909
12910
#: en/help_topics/hooks.txt:431
12911
msgid ""
12912
"call\n"
12913
"~~~~"
12914
msgstr ""
12915
12916
#: en/help_topics/hooks.txt:434
12917
msgid "Introduced in: unknown"
12918
msgstr ""
12919
12920
#: en/help_topics/hooks.txt:436
12921
msgid ""
12922
"Called when the smart client is submitting a request to the smart\n"
12923
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12924
"Streaming request bodies, and responses, are not accessible."
12925
msgstr ""
12926
12927
#: en/help_topics/hooks.txt:440
12928
msgid ""
12929
"SmartServerHooks\n"
12930
"----------------"
12931
msgstr ""
12932
12933
#: en/help_topics/hooks.txt:443
12934
msgid ""
12935
"server_exception\n"
12936
"~~~~~~~~~~~~~~~~"
12937
msgstr ""
12938
12939
#: en/help_topics/hooks.txt:448
12940
msgid ""
12941
"Called by the bzr server when an exception occurs. server_exception is\n"
12942
"called with the sys.exc_info() tuple return true for the hook if the\n"
12943
"exception has been handled, in which case the server will exit\n"
12944
"normally."
12945
msgstr ""
12946
12947
#: en/help_topics/hooks.txt:453
12948
msgid ""
12949
"server_started\n"
12950
"~~~~~~~~~~~~~~"
12951
msgstr ""
12952
12953
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12954
msgid "Introduced in: 0.16"
12955
msgstr ""
12956
12957
#: en/help_topics/hooks.txt:458
12958
msgid ""
12959
"Called by the bzr server when it starts serving a directory.\n"
12960
"server_started is called with (backing urls, public url), where\n"
12961
"backing_url is a list of URLs giving the server-specific directory\n"
12962
"locations, and public_url is the public URL for the directory being\n"
12963
"served."
12964
msgstr ""
12965
12966
#: en/help_topics/hooks.txt:464
12967
msgid ""
12968
"server_started_ex\n"
12969
"~~~~~~~~~~~~~~~~~"
12970
msgstr ""
12971
12972
#: en/help_topics/hooks.txt:469
12973
msgid ""
12974
"Called by the bzr server when it starts serving a directory.\n"
12975
"server_started is called with (backing_urls, server_obj)."
12976
msgstr ""
12977
12978
#: en/help_topics/hooks.txt:472
12979
msgid ""
12980
"server_stopped\n"
12981
"~~~~~~~~~~~~~~"
12982
msgstr ""
12983
12984
#: en/help_topics/hooks.txt:477
12985
msgid ""
12986
"Called by the bzr server when it stops serving a directory.\n"
12987
"server_stopped is called with the same parameters as the\n"
12988
"server_started hook: (backing_urls, public_url)."
12989
msgstr ""
12990
12991
#: en/help_topics/hooks.txt:481
12992
msgid ""
12993
"StatusHooks\n"
12994
"-----------"
12995
msgstr ""
12996
12997
#: en/help_topics/hooks.txt:484
12998
msgid ""
12999
"post_status\n"
13000
"~~~~~~~~~~~"
13001
msgstr ""
13002
13003
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
13004
msgid "Introduced in: 2.3"
13005
msgstr ""
13006
13007
#: en/help_topics/hooks.txt:489
13008
msgid ""
13009
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13010
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13011
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13012
"correspond to the command line options specified by the user for the\n"
13013
"status command. to_file is the output stream for writing."
13014
msgstr ""
13015
13016
#: en/help_topics/hooks.txt:495
13017
msgid ""
13018
"pre_status\n"
13019
"~~~~~~~~~~"
13020
msgstr ""
13021
13022
#: en/help_topics/hooks.txt:500
13023
msgid ""
13024
"Called with argument StatusHookParams before Bazaar displays the\n"
13025
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13026
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13027
"correspond to the command line options specified by the user for the\n"
13028
"status command. to_file is the output stream for writing."
13029
msgstr ""
13030
13031
#: en/help_topics/hooks.txt:506
13032
msgid ""
13033
"TransportHooks\n"
13034
"--------------"
13035
msgstr ""
13036
13037
#: en/help_topics/hooks.txt:509
13038
msgid ""
13039
"post_connect\n"
13040
"~~~~~~~~~~~~"
13041
msgstr ""
13042
13043
#: en/help_topics/hooks.txt:514
13044
msgid ""
13045
"Called after a new connection is established or a reconnect occurs.\n"
13046
"The sole argument passed is either the connected transport or smart\n"
13047
"medium instance."
13048
msgstr ""
13049
13050
#: en/help_topics/hooks.txt:518
13051
msgid ""
13052
"RioVersionInfoBuilderHooks\n"
13053
"--------------------------"
13054
msgstr ""
13055
13056
#: en/help_topics/hooks.txt:521
13057
msgid ""
13058
"revision\n"
13059
"~~~~~~~~"
13060
msgstr ""
13061
13062
#: en/help_topics/hooks.txt:526
13063
msgid ""
13064
"Invoked when adding information about a revision to the RIO stanza\n"
13065
"that is printed. revision is called with a revision object and a RIO\n"
13066
"stanza.\n"
13067
msgstr ""
13068
13069
#: en/help_topics/location-alias.txt:1
13070
msgid ""
13071
"Location aliases\n"
13072
"================"
13073
msgstr ""
13074
13075
#: en/help_topics/location-alias.txt:4
13076
msgid ""
13077
"Bazaar defines several aliases for locations associated with a branch. "
13078
"These\n"
13079
"can be used with most commands that expect a location, such as `bzr push`."
13080
msgstr ""
13081
13082
#: en/help_topics/location-alias.txt:7
13083
msgid "The aliases are::"
13084
msgstr ""
13085
13086
#: en/help_topics/location-alias.txt:9
13087
msgid ""
13088
" :bound The branch this branch is bound to, for bound branches.\n"
13089
" :parent The parent of this branch.\n"
13090
" :public The public location of this branch.\n"
13091
" :push The saved location used for `bzr push` with no arguments.\n"
13092
" :submit The submit branch for this branch.\n"
13093
" :this This branch."
13094
msgstr ""
13095
13096
#: en/help_topics/location-alias.txt:16
13097
msgid "For example, to push to the parent location::"
13098
msgstr ""
13099
13100
#: en/help_topics/location-alias.txt:18
13101
msgid " bzr push :parent\n"
13102
msgstr ""
13103
13104
#: en/help_topics/log-formats.txt:1
13105
msgid ""
13106
"Log Formats\n"
13107
"==========="
13108
msgstr ""
13109
13110
#: en/help_topics/log-formats.txt:4
13111
msgid ""
13112
"A log format controls how information about each revision is displayed.\n"
13113
"The standard log formats are compared below::"
13114
msgstr ""
13115
13116
#: en/help_topics/log-formats.txt:7
13117
msgid ""
13118
" Feature long short line\n"
13119
" ---------------------- ------------- ------------ -------------------\n"
13120
" design goal detailed view concise view 1 revision per line\n"
13121
" committer name+email name only name only\n"
13122
" author name+email - -\n"
13123
" date-time format full date only date only\n"
13124
" commit message full full top line\n"
13125
" tags yes yes yes\n"
13126
" merges indicator - yes -\n"
13127
" status/delta optional optional -\n"
13128
" diff/patch optional optional -\n"
13129
" revision-id optional optional -\n"
13130
" branch nick yes - -\n"
13131
" foreign vcs properties yes yes -\n"
13132
" preferred levels all 1 1\n"
13133
" digital signature optional - -"
13134
msgstr ""
13135
13136
#: en/help_topics/log-formats.txt:24
13137
msgid ""
13138
"The default format is ``long``. To change this, define the ``log_format``\n"
13139
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13140
msgstr ""
13141
13142
#: en/help_topics/log-formats.txt:27
13143
msgid ""
13144
" [DEFAULT]\n"
13145
" log_format = short"
13146
msgstr ""
13147
13148
#: en/help_topics/log-formats.txt:30
13149
msgid ""
13150
"Alternatively, to change the log format used for a given query, use the\n"
13151
"--long, --short or --line options."
13152
msgstr ""
13153
13154
#: en/help_topics/log-formats.txt:33
13155
msgid ""
13156
"If one of the standard log formats does not meet your needs, additional\n"
13157
"formats can be provided by plugins.\n"
13158
msgstr ""
13159
13160
#: en/help_topics/other-formats.txt:1
13161
msgid "Other Storage Formats"
13162
msgstr "Andere Speicherformate"
13163
13164
#: en/help_topics/other-formats.txt:3
13165
msgid "Experimental formats are shown below."
13166
msgstr ""
13167
13168
#: en/help_topics/other-formats.txt:5
13169
msgid ""
13170
":development-colo:\n"
13171
" (native) The 2a format with experimental support for colocated\n"
13172
" branches."
13173
msgstr ""
13174
13175
#: en/help_topics/other-formats.txt:9
13176
msgid ""
13177
"\n"
13178
"Deprecated formats are shown below."
13179
msgstr ""
13180
13181
#: en/help_topics/other-formats.txt:12
13182
msgid ""
13183
":pack-0.92:\n"
13184
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13185
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13186
" by bzr < 0.92."
13187
msgstr ""
13188
13189
#: en/help_topics/patterns.txt:1
13190
msgid ""
13191
"Patterns\n"
13192
"========"
13193
msgstr ""
13194
13195
#: en/help_topics/patterns.txt:4
13196
msgid ""
13197
"Bazaar uses patterns to match files at various times. For example,\n"
13198
"the ``add`` command skips over files that match ignore patterns\n"
13199
"and preferences can be associated with files using rule patterns.\n"
13200
"The pattern syntax is described below."
13201
msgstr ""
13202
13203
#: en/help_topics/patterns.txt:9
13204
msgid ""
13205
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13206
"slash or is a regular expression, it is compared to the whole path\n"
13207
"from the branch root. Otherwise, it is compared to only the last\n"
13208
"component of the path. To match a file only in the root directory,\n"
13209
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13210
msgstr ""
13211
13212
#: en/help_topics/patterns.txt:15
13213
msgid "Patterns may include globbing wildcards such as::"
13214
msgstr ""
13215
13216
#: en/help_topics/patterns.txt:17
13217
msgid ""
13218
" ? - Matches any single character except '/'\n"
13219
" * - Matches 0 or more characters except '/'\n"
13220
" /**/ - Matches 0 or more directories in a path\n"
13221
" [a-z] - Matches a single character from within a group of characters"
13222
msgstr ""
13223
13224
#: en/help_topics/patterns.txt:22
13225
msgid ""
13226
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13227
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13228
"expression. Regular expression patterns may not include named or\n"
13229
"numbered groups."
13230
msgstr ""
13231
13232
#: en/help_topics/patterns.txt:27
13233
msgid ""
13234
"Case insensitive ignore patterns can be specified with regular expressions\n"
13235
"by using the ``i`` (for ignore case) flag in the pattern."
13236
msgstr ""
13237
13238
#: en/help_topics/patterns.txt:30
13239
msgid ""
13240
"For example, a case insensitive match for ``foo`` may be specified as::"
13241
msgstr ""
13242
13243
#: en/help_topics/patterns.txt:32
13244
msgid " RE:(?i)foo"
13245
msgstr ""
13246
13247
#: en/help_topics/patterns.txt:34
13248
msgid ""
13249
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13250
"matched by that pattern will not be ignored."
13251
msgstr ""
13252
13253
#: en/help_topics/patterns.txt:37
13254
msgid ""
13255
".. _Python regular expressions: http://docs.python.org/library/re.html"
13256
msgstr ""
13257
13258
#: en/help_topics/revisionspec.txt:1
13259
msgid "Revision Identifiers"
13260
msgstr ""
13261
13262
#: en/help_topics/revisionspec.txt:3
13263
msgid ""
13264
"A revision identifier refers to a specific state of a branch's history. It\n"
13265
"can be expressed in several ways. It can begin with a keyword to\n"
13266
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13267
"'before:yesterday' and 'submit:'."
13268
msgstr ""
13269
13270
#: en/help_topics/revisionspec.txt:8
13271
msgid ""
13272
"Alternately, it can be given without a keyword, in which case it will be\n"
13273
"checked as a revision number, a tag, a revision id, a date specification, or "
13274
"a\n"
13275
"branch specification, in that order. For example, 'date:today' could be\n"
13276
"written as simply 'today', though if you have a tag called 'today' that "
13277
"will\n"
13278
"be found first."
13279
msgstr ""
13280
13281
#: en/help_topics/revisionspec.txt:14
13282
msgid ""
13283
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13284
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13285
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13286
"or\n"
13287
"spaces around the '..')."
13288
msgstr ""
13289
13290
#: en/help_topics/revisionspec.txt:19
13291
msgid ""
13292
"Ranges are interpreted differently by different commands. To the \"log\" "
13293
"command,\n"
13294
"a range is a sequence of log messages, but to the \"diff\" command, the "
13295
"range\n"
13296
"denotes a change between revisions (and not a sequence of changes). In\n"
13297
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13298
"consider it\n"
13299
"to be open-ended, that is, they include one end but not the other. For "
13300
"example:\n"
13301
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13302
"3649,\n"
13303
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13304
"and\n"
13305
"3649, but not 3647."
13306
msgstr ""
13307
13308
#: en/help_topics/revisionspec.txt:28
13309
msgid "The keywords used as revision selection methods are the following:"
13310
msgstr ""
13311
13312
#: en/help_topics/revisionspec.txt:30
13313
msgid ""
13314
":revid:\n"
13315
"\tSelects a revision using the revision id.\n"
13316
":submit:\n"
13317
"\tSelects a common ancestor with the submit branch.\n"
13318
":ancestor:\n"
13319
"\tSelects a common ancestor with a second branch.\n"
13320
":date:\n"
13321
"\tSelects a revision on the basis of a datestamp.\n"
13322
":branch:\n"
13323
"\tSelects the last revision of a specified branch.\n"
13324
":tag:\n"
13325
"\tSelects a revision identified by a tag name.\n"
13326
":revno:\n"
13327
"\tSelects a revision using a number.\n"
13328
":before:\n"
13329
"\tSelects the parent of the revision specified.\n"
13330
":annotate:\n"
13331
"\tSelect the revision that last modified the specified line.\n"
13332
":mainline:\n"
13333
"\tSelect mainline revision that merged the specified revision.\n"
13334
":last:\n"
13335
"\tSelects the nth revision from the end."
13336
msgstr ""
13337
13338
#: en/help_topics/revisionspec.txt:53
13339
msgid "In addition, plugins can provide other keywords."
13340
msgstr ""
13341
13342
#: en/help_topics/revisionspec.txt:55
13343
msgid "A detailed description of each keyword is given below."
13344
msgstr ""
13345
13346
#: en/help_topics/revisionspec.txt:57
13347
msgid ":revid:"
13348
msgstr ":revid:"
13349
13350
#: en/help_topics/revisionspec.txt:59
13351
msgid ""
13352
" Supply a specific revision id, that can be used to specify any\n"
13353
" revision id in the ancestry of the branch.\n"
13354
" Including merges, and pending merges.\n"
13355
" Examples::"
13356
msgstr ""
13357
13358
#: en/help_topics/revisionspec.txt:64
13359
msgid ""
13360
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13361
msgstr ""
13362
13363
#: en/help_topics/revisionspec.txt:66
13364
msgid ":submit:"
13365
msgstr ":submit:"
13366
13367
#: en/help_topics/revisionspec.txt:68
13368
msgid ""
13369
" Diffing against this shows all the changes that were made in this "
13370
"branch,\n"
13371
" and is a good predictor of what merge will do. The submit branch is\n"
13372
" used by the bundle and merge directive commands. If no submit branch\n"
13373
" is specified, the parent branch is used instead."
13374
msgstr ""
13375
13376
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13377
msgid ""
13378
" The common ancestor is the last revision that existed in both\n"
13379
" branches. Usually this is the branch point, but it could also be\n"
13380
" a revision that was merged."
13381
msgstr ""
13382
13383
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13384
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13385
#: en/help_topics/revisionspec.txt:153
13386
msgid " Examples::"
13387
msgstr " Beispiele::"
13388
13389
#: en/help_topics/revisionspec.txt:79
13390
msgid " $ bzr diff -r submit:"
13391
msgstr " $ bzr diff -r submit:"
13392
13393
#: en/help_topics/revisionspec.txt:81
13394
msgid ":ancestor:"
13395
msgstr ":ancestor:"
13396
13397
#: en/help_topics/revisionspec.txt:83
13398
msgid " Supply the path to a branch to select the common ancestor."
13399
msgstr ""
13400
13401
#: en/help_topics/revisionspec.txt:89
13402
msgid ""
13403
" This is frequently used with 'diff' to return all of the changes\n"
13404
" that your branch introduces, while excluding the changes that you\n"
13405
" have not merged from the remote branch."
13406
msgstr ""
13407
13408
#: en/help_topics/revisionspec.txt:95
13409
msgid ""
13410
" ancestor:/path/to/branch\n"
13411
" $ bzr diff -r ancestor:../../mainline/branch"
13412
msgstr ""
13413
13414
#: en/help_topics/revisionspec.txt:98
13415
msgid ":date:"
13416
msgstr ":date:"
13417
13418
#: en/help_topics/revisionspec.txt:100
13419
msgid ""
13420
" Supply a datestamp to select the first revision that matches the date.\n"
13421
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13422
" Matches the first entry after a given date (either at midnight or\n"
13423
" at a specified time)."
13424
msgstr ""
13425
13426
#: en/help_topics/revisionspec.txt:105
13427
msgid " One way to display all the changes since yesterday would be::"
13428
msgstr " Eine Möglichkeit, alle Änderungen seit gestern anzuzeigen wäre:"
13429
13430
#: en/help_topics/revisionspec.txt:107
13431
msgid " bzr log -r date:yesterday.."
13432
msgstr " bzr log -r date:yesterday.."
13433
13434
#: en/help_topics/revisionspec.txt:111
13435
msgid ""
13436
" date:yesterday -> select the first revision since "
13437
"yesterday\n"
13438
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13439
" August 14th, 2006 at 5:10pm."
13440
msgstr ""
13441
13442
#: en/help_topics/revisionspec.txt:115
13443
msgid ":branch:"
13444
msgstr ":branch:"
13445
13446
#: en/help_topics/revisionspec.txt:117
13447
msgid " Supply the path to a branch to select its last revision."
13448
msgstr ""
13449
13450
#: en/help_topics/revisionspec.txt:121
13451
msgid " branch:/path/to/branch"
13452
msgstr " branch:/pfad/zur/branch"
13453
13454
#: en/help_topics/revisionspec.txt:123
13455
msgid ":tag:"
13456
msgstr ":tag:"
13457
13458
#: en/help_topics/revisionspec.txt:125
13459
msgid " Tags are stored in the branch and created by the 'tag' command."
13460
msgstr ""
13461
13462
#: en/help_topics/revisionspec.txt:127
13463
msgid ":revno:"
13464
msgstr ":revno:"
13465
13466
#: en/help_topics/revisionspec.txt:129
13467
msgid ""
13468
" Use an integer to specify a revision in the history of the branch.\n"
13469
" Optionally a branch can be specified. A negative number will count\n"
13470
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13471
" one). If the negative number is larger than the branch's history, the\n"
13472
" first revision is returned.\n"
13473
" Examples::"
13474
msgstr ""
13475
13476
#: en/help_topics/revisionspec.txt:136
13477
msgid ""
13478
" revno:1 -> return the first revision of this branch\n"
13479
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13480
" the branch '/path/to/branch'\n"
13481
" revno:-1 -> The last revision in a branch.\n"
13482
" -2:http://other/branch -> The second to last revision in the\n"
13483
" remote branch.\n"
13484
" -1000000 -> Most likely the first revision, unless\n"
13485
" your history is very long."
13486
msgstr ""
13487
13488
#: en/help_topics/revisionspec.txt:145
13489
msgid ":before:"
13490
msgstr ":before:"
13491
13492
#: en/help_topics/revisionspec.txt:147
13493
msgid ""
13494
" Supply any revision spec to return the parent of that revision. This "
13495
"is\n"
13496
" mostly useful when inspecting revisions that are not in the revision "
13497
"history\n"
13498
" of a branch."
13499
msgstr ""
13500
13501
#: en/help_topics/revisionspec.txt:151
13502
msgid ""
13503
" It is an error to request the parent of the null revision (before:0)."
13504
msgstr ""
13505
13506
#: en/help_topics/revisionspec.txt:155
13507
msgid ""
13508
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13509
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13510
" aaaa@bbbb-1234567890\n"
13511
" bzr diff -r before:1913..1913\n"
13512
" -> Find the changes between revision 1913 and its parent "
13513
"(1912).\n"
13514
" (What changes did revision 1913 introduce).\n"
13515
" This is equivalent to: bzr diff -c 1913"
13516
msgstr ""
13517
13518
#: en/help_topics/revisionspec.txt:163
13519
msgid ":annotate:"
13520
msgstr ":annotate:"
13521
13522
#: en/help_topics/revisionspec.txt:165
13523
msgid ""
13524
" Select the revision that last modified the specified line. Line is\n"
13525
" specified as path:number. Path is a relative path to the file. "
13526
"Numbers\n"
13527
" start at 1, and are relative to the current version, not the last-\n"
13528
" committed version of the file."
13529
msgstr ""
13530
13531
#: en/help_topics/revisionspec.txt:170
13532
msgid ":mainline:"
13533
msgstr ":mainline:"
13534
13535
#: en/help_topics/revisionspec.txt:172
13536
msgid ""
13537
" Select the revision that merged the specified revision into mainline."
13538
msgstr ""
13539
13540
#: en/help_topics/revisionspec.txt:174
13541
msgid ":last:"
13542
msgstr ""
13543
13544
#: en/help_topics/revisionspec.txt:176
13545
msgid ""
13546
" Supply a positive number to get the nth revision from the end.\n"
13547
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13548
" Examples::"
13549
msgstr ""
13550
13551
#: en/help_topics/revisionspec.txt:180
13552
msgid ""
13553
" last:1 -> return the last revision\n"
13554
" last:3 -> return the revision 2 before the end.\n"
13555
msgstr ""
13556
" last:1 -> Gibt die letzte Version zurück\n"
13557
" last:3 -> Gibt die Version zwei vor dem Ende zurück\n"
13558
13559
#: en/help_topics/rules.txt:1
13560
msgid ""
13561
"Rules\n"
13562
"====="
13563
msgstr ""
13564
"Regeln\n"
13565
"======"
13566
13567
#: en/help_topics/rules.txt:7
13568
msgid ""
13569
"Rules are defined in ini file format where the sections are file glob\n"
13570
"patterns and the contents of each section are the preferences for files\n"
13571
"matching that pattern(s). For example::"
13572
msgstr ""
13573
13574
#: en/help_topics/rules.txt:11
13575
msgid ""
13576
" [name *.bat]\n"
13577
" eol = native"
13578
msgstr ""
13579
13580
#: en/help_topics/rules.txt:14
13581
msgid ""
13582
" [name *.html *.xml]\n"
13583
" keywords = xml_escape"
13584
msgstr ""
13585
13586
#: en/help_topics/rules.txt:17
13587
msgid ""
13588
"Preferences like these are useful for commands and plugins wishing to\n"
13589
"provide custom behaviour for selected files. For more information on \n"
13590
"end of line conversion see :doc:`eol-help`.\n"
13591
"Keyword support is provided by the `keywords plugin\n"
13592
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13593
msgstr ""
13594
13595
#: en/help_topics/rules.txt:23
13596
msgid ""
13597
"Files\n"
13598
"-----"
13599
msgstr ""
13600
"Dateien\n"
13601
"-------"
13602
13603
#: en/help_topics/rules.txt:26
13604
msgid ""
13605
"Default rules for all branches are defined in the optional file\n"
13606
"``BZR_HOME/rules``. "
13607
msgstr ""
13608
13609
#: en/help_topics/rules.txt:29
13610
msgid ""
13611
"Rule Patterns\n"
13612
"-------------"
13613
msgstr ""
13614
"Regel-Muster\n"
13615
"-------------"
13616
13617
#: en/help_topics/rules.txt:32
13618
msgid ""
13619
"Patterns are ordered and searching stops as soon as one matches.\n"
13620
"As a consequence, more explicit patterns should be placed towards\n"
13621
"the top of the file. Rule patterns use exactly the same conventions\n"
13622
"as ignore patterns. See :doc:`patterns-help` for details."
13623
msgstr ""
13624
13625
#: en/help_topics/rules.txt:37
13626
msgid ".. note::"
13627
msgstr ""
13628
13629
#: en/help_topics/rules.txt:39
13630
msgid ""
13631
" Patterns containing square brackets or spaces should be\n"
13632
" surrounded in quotes to ensure they are correctly parsed.\n"
13633
msgstr ""
13634
13635
#: en/help_topics/topics.txt:1
13636
msgid ""
13637
"authentication Information on configuring authentication\n"
13638
"basic Basic commands\n"
13639
"branches Information on what a branch is\n"
13640
"bugs Bug tracker settings\n"
13641
"checkouts Information on what a checkout is\n"
13642
"commands Basic help for all commands\n"
13643
"configuration Details on the configuration settings available\n"
13644
"conflict-types Types of conflicts and what to do about them\n"
13645
"content-filters Conversion of content into/from working trees\n"
13646
"criss-cross Information on criss-cross merging\n"
13647
"current-formats Current storage formats\n"
13648
"debug-flags Options to show or record debug information\n"
13649
"diverged-branches How to fix diverged branches\n"
13650
"env-variables Environment variable names and values\n"
13651
"eol Information on end-of-line handling\n"
13652
"files Information on configuration and log files\n"
13653
"formats Information on choosing a storage format\n"
13654
"global-options Options that control how Bazaar runs\n"
13655
"hidden-commands All hidden commands\n"
13656
"hooks Points at which custom processing can be added\n"
13657
"launchpad Using Bazaar with Launchpad.net\n"
13658
"location-alias Aliases for remembered locations\n"
13659
"log-formats Details on the logging formats available\n"
13660
"other-formats Experimental and deprecated storage formats\n"
13661
"patterns Information on the pattern syntax\n"
13662
"repositories Basic information on shared repositories.\n"
13663
"revisionspec Explain how to use --revision\n"
13664
"rules Information on defining rule-based preferences\n"
13665
"standalone-trees Information on what a standalone tree is\n"
13666
"standard-options Options that can be used with any command\n"
13667
"status-flags Help on status flags\n"
13668
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13669
"topics Topics list\n"
13670
"url-special-chars Special character handling in URLs\n"
13671
"urlspec Supported transport protocols\n"
13672
"working-trees Information on working trees\n"
13673
msgstr ""
13674
13675
#: en/help_topics/url-special-chars.txt:1
13676
msgid ""
13677
"Special character handling in URLs\n"
13678
"=================================="
13679
msgstr ""
13680
13681
#: en/help_topics/url-special-chars.txt:4
13682
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13683
msgstr ""
13684
13685
#: en/help_topics/url-special-chars.txt:6
13686
msgid " * Fully qualified URLs"
13687
msgstr ""
13688
13689
#: en/help_topics/url-special-chars.txt:8
13690
msgid " * File system paths, relative or absolute"
13691
msgstr ""
13692
13693
#: en/help_topics/url-special-chars.txt:10
13694
msgid ""
13695
"Internally bzr treats all locations as URLs. For any file system paths\n"
13696
"that are specified it will automatically determine the appropriate URL\n"
13697
"representation, and escape special characters where necessary."
13698
msgstr ""
13699
13700
#: en/help_topics/url-special-chars.txt:14
13701
msgid ""
13702
"There are a few characters which have special meaning in URLs and need "
13703
"careful\n"
13704
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13705
"value in URLs. Any non-ASCII characters in a file path will automatically "
13706
"be\n"
13707
"urlencoded when the path is converted to a URL."
13708
msgstr ""
13709
13710
#: en/help_topics/url-special-chars.txt:19
13711
msgid ""
13712
"URLs represent non-ASCII characters in an encoding defined by the server, "
13713
"but\n"
13714
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13715
"be\n"
13716
"generous in what it accepts as a URL and to print them in a way that\n"
13717
"will be readable."
13718
msgstr ""
13719
13720
#: en/help_topics/url-special-chars.txt:24
13721
msgid ""
13722
"For example, if you have a directory named '/tmp/%2False' these are all "
13723
"valid\n"
13724
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13725
"slash)::"
13726
msgstr ""
13727
13728
#: en/help_topics/url-special-chars.txt:27
13729
msgid ""
13730
" cd /tmp\n"
13731
" bzr log /tmp/%2False\n"
13732
" bzr log %2False\n"
13733
" bzr log file:///tmp/%252False\n"
13734
" bzr log file://localhost/tmp/%252False\n"
13735
" bzr log file:%252False"
13736
msgstr ""
13737
" cd /tmp\n"
13738
" bzr log /tmp/%2False\n"
13739
" bzr log %2False\n"
13740
" bzr log file:///tmp/%252False\n"
13741
" bzr log file://localhost/tmp/%252False\n"
13742
" bzr log file:%252False"
13743
13744
#: en/help_topics/url-special-chars.txt:34
13745
msgid "These are valid but do not refer to the same file::"
13746
msgstr ""
13747
13748
#: en/help_topics/url-special-chars.txt:36
13749
msgid ""
13750
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13751
" bzr log %252False (refers to a file called /tmp/%252False)"
13752
msgstr ""
13753
13754
#: en/help_topics/url-special-chars.txt:39
13755
msgid ""
13756
"Comma also has special meaning in URLs, because it denotes `segment "
13757
"parameters`_"
13758
msgstr ""
13759
"Kommatas haben eine spezielle Bedeutung in URLs und markieren "
13760
"`Abschnittparameter`_"
13761
13762
#: en/help_topics/url-special-chars.txt:41
13763
msgid ""
13764
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13765
msgstr ""
13766
13767
#: en/help_topics/url-special-chars.txt:43
13768
msgid ""
13769
"Comma is also special in any file system paths that are specified. To use a "
13770
"literal\n"
13771
"comma in a file system path, specify a URL and URL encode the comma::"
13772
msgstr ""
13773
13774
#: en/help_topics/url-special-chars.txt:46
13775
msgid ""
13776
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13777
"\"branch\" set to \"bla\"\n"
13778
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13779
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13780
"\"branch\" set to \"bla\"\n"
13781
msgstr ""
13782
13783
#: en/help_topics/urlspec.txt:1
13784
msgid "URL Identifiers"
13785
msgstr ""
13786
13787
#: en/help_topics/urlspec.txt:3
13788
msgid "Supported URL prefixes::"
13789
msgstr "Unterstützte URL-Präfixe::"
13790
13791
#: en/help_topics/urlspec.txt:5
13792
msgid ""
13793
" aftp:// Access using active FTP.\n"
13794
" bzr:// Fast access using the Bazaar smart server.\n"
13795
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13796
" file:// Access using the standard filesystem (default)\n"
13797
" ftp:// Access using passive FTP.\n"
13798
" http:// Read-only access of branches exported on the web.\n"
13799
" https:// Read-only access of branches exported on the web using "
13800
"SSL.\n"
13801
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13802
msgstr ""
13803
13804
#: en/help_topics/urlspec.txt:14
13805
msgid "Supported modifiers::"
13806
msgstr "Unterstützte Modifikatoren::"
13807
13808
#: en/help_topics/urlspec.txt:16
13809
msgid " gio+ Access using any GIO supported protocols."
13810
msgstr ""
13811
13812
#: en/help_topics/urlspec.txt:18
13813
msgid "Bazaar supports all of the standard parts within the URL::"
13814
msgstr ""
13815
13816
#: en/help_topics/urlspec.txt:20
13817
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13818
msgstr ""
13819
13820
#: en/help_topics/urlspec.txt:22
13821
msgid "allowing URLs such as::"
13822
msgstr ""
13823
13824
#: en/help_topics/urlspec.txt:24
13825
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13826
msgstr " http://bzruser:BadPass@bzr.beispiel.de:8080/bzr/trunk"
13827
13828
#: en/help_topics/urlspec.txt:26
13829
msgid ""
13830
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13831
"with '~' as meaning that the rest of the path should be interpreted\n"
13832
"relative to the remote user's home directory. For example if the user\n"
13833
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13834
"shell.example.com, then::"
13835
msgstr ""
13836
13837
#: en/help_topics/urlspec.txt:32
13838
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13839
msgstr " bzr+ssh://remote@shell.beispiel.de/~/meinprojekt/trunk"
13840
13841
#: en/help_topics/urlspec.txt:34
13842
msgid "would refer to ``/home/remote/myproject/trunk``."
13843
msgstr "Würde verweisen auf »/home/remote/meinprojekt/trunk«."
13844
13845
#: en/help_topics/urlspec.txt:36
13846
msgid ""
13847
"Many commands that accept URLs also accept location aliases too.\n"
13848
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13849
msgstr ""
13850
"Viele Kommandos die URLs akzeptieren, akzeptieren auch Platzaliase.\n"
13851
"Siehe :doc:`location-alias-help` und :doc:`url-special-chars-help`.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1