1
1
# German translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-01-16 15:18+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2013-02-22 14:19+0000\n"
12
"Last-Translator: Phillip Sz <Unknown>\n"
13
13
"Language-Team: German <de@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:16+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
18
"X-Launchpad-Export-Date: 2013-02-23 04:35+0000\n"
19
"X-Generator: Launchpad (build 16506)\n"
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr "Überspringe {0} (Größer als {1} von {2} Bytes)"
25
#: bzrlib/branch.py:872
25
#: bzrlib/branch.py:854
29
#: bzrlib/branch.py:3183
29
#: bzrlib/branch.py:2955
31
31
msgid "Pushed up to revision %d."
32
msgstr "In Revision %d hochgeladen."
34
#: bzrlib/branch.py:3185
34
#: bzrlib/branch.py:2957
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d Schlüsselwort aktualisiert."
39
msgstr[1] "%d Schlüsselwörter aktualisiert."
41
#: bzrlib/branch.py:3188
41
#: bzrlib/branch.py:2960
42
42
msgid "No new revisions or tags to push."
43
msgstr "Keine neuen Revisionen oder Schlüsselwörter zum Hochladen."
45
#: bzrlib/branch.py:3190
45
#: bzrlib/branch.py:2962
46
46
msgid "No new revisions to push."
47
msgstr "Keine neuen Revisionen zum Hochladen."
49
#: bzrlib/branch.py:3210
49
#: bzrlib/branch.py:2982
50
50
msgid "checked branch {0} format {1}"
51
msgstr "überprüfter Zweig {0} Format {1}"
53
#: bzrlib/branch.py:3213
53
#: bzrlib/branch.py:2985
55
55
msgid "found error:%s"
56
56
msgstr "Fehler gefunden: %s"
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr "Ignoriere Dateien außerhalb der Ansicht. Die Ansicht ist %s"
63
#: bzrlib/builtins.py:130
63
#: bzrlib/builtins.py:260
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision benötigt genau eine Revisions-Nummer"
68
#: bzrlib/builtins.py:215
68
#: bzrlib/builtins.py:315
69
69
msgid "Display status summary."
70
70
msgstr "Zeige Status-Zusammenfassung an."
72
#: bzrlib/builtins.py:217
72
#: bzrlib/builtins.py:317
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
77
"Zeigt versionierte und unbekannte Dateien an, Gruppiert nach Zustand.\n"
77
"Dies zeigt versionierte und unbekannte Dateien an –\n"
78
"nach Zuständen gruppiert. Mögliche Zustände:"
80
#: bzrlib/builtins.py:220
80
#: bzrlib/builtins.py:320
83
83
" Versioned in the working copy but not in the previous revision."
86
" In der Arbeitskopie versioniert, jedoch nicht in der vorherigen Revision."
86
#: bzrlib/builtins.py:223
88
#: bzrlib/builtins.py:323
89
91
" Versioned in the previous revision but removed or deleted\n"
90
92
" in the working copy."
95
" In der vorherigen Revision versioniert, jedoch entfernt oder aus der\n"
96
" Arbeitskopie gelöscht."
93
#: bzrlib/builtins.py:227
98
#: bzrlib/builtins.py:327
96
101
" Path of this file changed from the previous revision;\n"
97
102
" the text may also have changed. This includes files whose\n"
98
103
" parent directory was renamed."
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."
101
#: bzrlib/builtins.py:232
110
#: bzrlib/builtins.py:332
104
113
" Text has changed since the previous revision."
105
114
msgstr "verändert"
107
#: bzrlib/builtins.py:235
116
#: bzrlib/builtins.py:335
110
119
" File kind has been changed (e.g. from file to directory)."
121
"Dateiart wurde geändert\n"
122
" Dateiart hat sich geändert (z.B. von Datei zu Verzeichnis)"
113
#: bzrlib/builtins.py:238
124
#: bzrlib/builtins.py:338
116
127
" Not versioned and not matching an ignore pattern."
130
" Nicht versioniert und stimmt nicht mit einem Ignorierungsmuster überein."
119
#: bzrlib/builtins.py:241
132
#: bzrlib/builtins.py:341
121
134
"Additionally for directories, symlinks and files with a changed\n"
122
135
"executable bit, Bazaar indicates their type using a trailing\n"
123
136
"character: '/', '@' or '*' respectively. These decorations can be\n"
124
137
"disabled using the '--no-classify' option."
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."
127
#: bzrlib/builtins.py:246
145
#: bzrlib/builtins.py:346
129
147
"To see ignored files use 'bzr ignored'. For details on the\n"
130
148
"changes to file texts, use 'bzr diff'."
150
"Mit »bzr ignored« werden ignorierte Dateien aufgelistet.\n"
151
"Änderungen an den Dateiinhalten werden mit »bzr diff« angezeigt."
133
#: bzrlib/builtins.py:249
153
#: bzrlib/builtins.py:349
135
155
"Note that --short or -S gives status flags for each item, similar\n"
136
156
"to Subversion's status command. To get output similar to svn -q,\n"
137
157
"use bzr status -SV."
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."
140
#: bzrlib/builtins.py:253
164
#: bzrlib/builtins.py:353
142
166
"If no arguments are specified, the status of the entire working\n"
143
167
"directory is shown. Otherwise, only the status of the specified\n"
144
168
"files or directories is reported. If a directory is given, status\n"
145
169
"is reported for everything inside that directory."
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."
148
#: bzrlib/builtins.py:258
177
#: bzrlib/builtins.py:358
150
179
"Before merges are committed, the pending merge tip revisions are\n"
151
180
"shown. To see all pending merge revisions, use the -v option.\n"
152
181
"To skip the display of pending merge information altogether, use\n"
153
182
"the no-pending option or specify a file/directory."
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."
156
#: bzrlib/builtins.py:263
191
#: bzrlib/builtins.py:363
158
193
"To compare the working directory to a specific revision, pass a\n"
159
194
"single revision to the revision argument."
196
"Um das Arbeitsverzeichnis mit einer bestimmten Revision zu vergleichen,\n"
197
"geben Sie eine einzelne Revision mit dem Argument \"revision\" an."
162
#: bzrlib/builtins.py:266
199
#: bzrlib/builtins.py:366
164
201
"To see which files have changed in a specific revision, or between\n"
165
202
"two revisions, pass a revision range to the revision argument.\n"
166
203
"This will produce the same results as calling 'bzr diff --summarize'."
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'."
169
#: bzrlib/builtins.py:275
210
#: bzrlib/builtins.py:375
170
211
msgid "Use short status indicators."
212
msgstr "Kurze Zustandsanzeiger verwenden."
173
#: bzrlib/builtins.py:277
214
#: bzrlib/builtins.py:377
174
215
msgid "Only show versioned files."
216
msgstr "Nur versionierte Dateien anzeigen."
177
#: bzrlib/builtins.py:279
218
#: bzrlib/builtins.py:379
178
219
msgid "Don't show pending merges."
220
msgstr "Ausstehende Zusammenführungen nicht anzeigen."
181
#: bzrlib/builtins.py:282
222
#: bzrlib/builtins.py:382
182
223
msgid "Do not mark object type using indicator."
224
msgstr "Objekte nicht entsprechend ihres Typs kennzeichnen."
185
#: bzrlib/builtins.py:297
226
#: bzrlib/builtins.py:397
186
227
msgid "bzr status --revision takes exactly one or two revision specifiers"
229
"bzr status --revision benötigt exakt eine oder zwei "
230
"Revisionsspezifikation(en)."
189
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
232
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
190
233
msgid "You can only supply one of revision_id or --revision"
234
msgstr "Sie können nur revision_id oder --revision angeben"
193
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
236
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
194
237
msgid "You must supply either --revision or a revision_id"
238
msgstr "Sie müssen entweder --revision oder eine revision_id angeben"
197
#: bzrlib/builtins.py:351
240
#: bzrlib/builtins.py:451
199
242
msgid "Repository %r does not support access to raw revision texts"
243
msgstr "Quelle %r unterstützt keinen Zugriff auf reine Revisionstexte"
202
#: bzrlib/builtins.py:362
245
#: bzrlib/builtins.py:462
203
246
msgid "The repository {0} contains no revision {1}."
247
msgstr "Die Quelle {0} enthält keine neue Überarbeitung {1}."
206
#: bzrlib/builtins.py:369
249
#: bzrlib/builtins.py:469
207
250
msgid "You cannot specify a NULL revision."
251
msgstr "Sie können keine NULL-Revision angeben."
210
#: bzrlib/builtins.py:461
253
#: bzrlib/builtins.py:561
211
254
msgid "Remove the working tree from a given branch/checkout."
255
msgstr "Entfernt den Arbeitsbaum zu einer Branch/einem Checkout."
214
#: bzrlib/builtins.py:463
257
#: bzrlib/builtins.py:563
216
259
"Since a lightweight checkout is little more than a working tree\n"
217
260
"this will refuse to run against one."
220
#: bzrlib/builtins.py:466
263
#: bzrlib/builtins.py:566
221
264
msgid "To re-create the working tree, use \"bzr checkout\"."
265
msgstr "Benutzen Sie »bzr checkout«, um den Arbeitsbaum neu aufzubauen."
224
#: bzrlib/builtins.py:472
267
#: bzrlib/builtins.py:572
226
269
"Remove the working tree even if it has uncommitted or shelved changes."
271
"Den Arbeitsbaum entfernen, auch wenn dieser nicht übertragene oder "
272
"zurückgestellte Änderungen enthält."
229
#: bzrlib/builtins.py:486
274
#: bzrlib/builtins.py:586
230
275
msgid "No working tree to remove"
276
msgstr "Keinen Arbeitsbaum zum Entfernen"
233
#: bzrlib/builtins.py:488
278
#: bzrlib/builtins.py:588
234
279
msgid "You cannot remove the working tree of a remote path"
280
msgstr "Sie können einen entfernten Arbeitsbaum nicht löschen"
237
#: bzrlib/builtins.py:497
282
#: bzrlib/builtins.py:597
238
283
msgid "You cannot remove the working tree from a lightweight checkout"
284
msgstr "Entfernen des Arbeitsbaums von einem schlanken Abruf nicht möglich"
241
#: bzrlib/builtins.py:537
286
#: bzrlib/builtins.py:637
243
288
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
244
289
"instead. Use \"--force\" if you are sure you want to reset the working tree."
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."
247
#: bzrlib/builtins.py:548
295
#: bzrlib/builtins.py:648
249
297
", the header appears corrupt, try passing -r -1 to set the state to the last "
300
", die Kopfzeilen scheinen beschädigt zu sein. Versuchen Sie -r -1 um den "
301
"Status der letzten Einreichung zu übernehmen."
253
#: bzrlib/builtins.py:552
303
#: bzrlib/builtins.py:652
254
304
msgid "failed to reset the tree state{0}"
305
msgstr "Baumstatus{0} konnte nicht zurückgesetzt werden"
257
#: bzrlib/builtins.py:556
307
#: bzrlib/builtins.py:656
258
308
msgid "Show current revision number."
309
msgstr "Aktuelle Revisionsnummer anzeigen."
261
#: bzrlib/builtins.py:558
311
#: bzrlib/builtins.py:658
262
312
msgid "This is equal to the number of revisions on this branch."
313
msgstr "Entspricht der Anzahl der Revisionen in diesem Zweig."
265
#: bzrlib/builtins.py:571
315
#: bzrlib/builtins.py:671
266
316
msgid "--tree and --revision can not be used together"
317
msgstr "--tree und --revision können nicht zusammen verwendet werden."
269
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
319
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
270
320
msgid "Tags can only be placed on a single revision, not on a range"
322
"Tags können nur einzelnen Revisionen zugewiesen werden, nicht mehreren"
273
#: bzrlib/builtins.py:612
324
#: bzrlib/builtins.py:712
274
325
msgid "Show revno of working tree."
326
msgstr "Revno des Arbeitsbaums anzeigen."
277
#: bzrlib/builtins.py:660
328
#: bzrlib/builtins.py:760
278
329
msgid "Add specified files or directories."
330
msgstr "Angegebene Dateien oder Verzeichnisse hinzufügen."
281
#: bzrlib/builtins.py:662
332
#: bzrlib/builtins.py:762
283
334
"In non-recursive mode, all the named items are added, regardless\n"
284
335
"of whether they were previously ignored. A warning is given if\n"
285
336
"any of the named files are already versioned."
338
"Im nicht-rekursiven Modus werden alle Einträge mit Namen hinzugefügt,\n"
339
"auch wenn sie vorher ignoriert wurden. Es wird eine Warnung ausgegeben,\n"
340
"wenn eine der gewählten Dateien schon vorhanden ist."
288
#: bzrlib/builtins.py:666
342
#: bzrlib/builtins.py:766
290
344
"In recursive mode (the default), files are treated the same way\n"
291
345
"but the behaviour for directories is different. Directories that\n"
333
405
"into a subdirectory of this one."
336
#: bzrlib/builtins.py:696
408
#: bzrlib/builtins.py:796
338
410
"Any files matching patterns in the ignore list will not be added\n"
339
411
"unless they are explicitly mentioned."
413
"Alle Dateien, die auf Muster in der Ignorierliste zutreffen, werden\n"
414
"nicht hinzugefügt, außer Sie geben diese explizit an."
342
#: bzrlib/builtins.py:699
416
#: bzrlib/builtins.py:799
344
418
"In recursive mode, files larger than the configuration option \n"
345
419
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
422
"Im rekursiven Modus werden Dateien übersprungen, die größer als die "
424
"von add.maximum_file_size sind. Einträge mit Namen\n"
425
"werden niemals aufgrund ihrer Größe übersprungen."
349
#: bzrlib/builtins.py:706
427
#: bzrlib/builtins.py:806
350
428
msgid "Don't recursively add the contents of directories."
429
msgstr "Inhalte von Verzeichnissen nicht rekursiv hinzufügen."
353
#: bzrlib/builtins.py:712
431
#: bzrlib/builtins.py:813
354
432
msgid "Lookup file ids from this tree."
433
msgstr "Datei-IDs von diesem Baum nachschauen."
357
#: bzrlib/builtins.py:748
435
#: bzrlib/builtins.py:849
358
436
msgid "ignored {0} matching \"{1}\"\n"
437
msgstr "ignoriert {0} übereinstimmend \"{1}\"\n"
361
#: bzrlib/builtins.py:753
439
#: bzrlib/builtins.py:854
362
440
msgid "Create a new versioned directory."
441
msgstr "Ein neues versioniertes Verzeichnis erstellen."
365
#: bzrlib/builtins.py:755
443
#: bzrlib/builtins.py:856
366
444
msgid "This is equivalent to creating the directory and then adding it."
445
msgstr "Dies entspricht dem Anlegen und Hinzufügen des Ordners."
369
#: bzrlib/builtins.py:762
447
#: bzrlib/builtins.py:863
370
448
msgid "No error if existing, make parent directories as needed."
450
"Kein Fehler, falls vorhanden, übergeordnete Verzeichnisse erstellen, falls "
373
#: bzrlib/builtins.py:796
453
#: bzrlib/builtins.py:897
375
455
msgid "added %s\n"
456
msgstr "%s hinzugefügt\n"
378
#: bzrlib/builtins.py:838
458
#: bzrlib/builtins.py:939
380
460
msgid "invalid kind %r specified"
461
msgstr "Ungültiger Typ %r angegeben"
383
#: bzrlib/builtins.py:875
463
#: bzrlib/builtins.py:976
384
464
msgid "Move or rename a file."
465
msgstr "Eine Datei verschieben oder umbenennen."
387
#: bzrlib/builtins.py:877
467
#: bzrlib/builtins.py:978
388
468
msgid " bzr mv SOURCE... DESTINATION"
469
msgstr " bzr mv QUELLE... ZIEL"
391
#: bzrlib/builtins.py:879
471
#: bzrlib/builtins.py:980
393
473
"If the last argument is a versioned directory, all the other names\n"
394
474
"are moved into it. Otherwise, there must be exactly two arguments\n"
395
475
"and the file is changed to a new name."
477
"Wenn das letzte Argument ein versioniertes Verzeichnis ist, dann werden\n"
478
"alle anderen Namen in dieses verschoben. Ansonsten müssen es exakt 2\n"
479
"Argumente sein, und die Datei wird umbenannt."
398
#: bzrlib/builtins.py:883
481
#: bzrlib/builtins.py:984
400
483
"If OLDNAME does not exist on the filesystem but is versioned and\n"
401
484
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
480
571
"value will only be saved if the remote location can be accessed."
483
#: bzrlib/builtins.py:1034
574
#: bzrlib/builtins.py:1134
485
576
"The --verbose option will display the revisions pulled using the log_format\n"
486
577
"configuration option. You can use a different format by overriding it with\n"
487
578
"-Olog_format=<other_format>."
490
#: bzrlib/builtins.py:1038
581
#: bzrlib/builtins.py:1138
492
583
"Note: The location can be specified either in the form of a branch,\n"
493
584
"or in the form of a path to a file containing a merge directive generated\n"
497
#: bzrlib/builtins.py:1046
588
#: bzrlib/builtins.py:1146
498
589
msgid "Show logs of pulled revisions."
590
msgstr "Protokolle geladener Revisionen anzeigen."
501
#: bzrlib/builtins.py:1048
592
#: bzrlib/builtins.py:1148
503
594
"Branch to pull into, rather than the one containing the working directory."
506
#: bzrlib/builtins.py:1051
597
#: bzrlib/builtins.py:1151
508
599
"Perform a local pull in a bound branch. Local pulls are not applied to the "
512
#: bzrlib/builtins.py:1080
603
#: bzrlib/builtins.py:1189
513
604
msgid "Need working tree for --show-base."
605
msgstr "Ein Arbeitsbaum wird für --show-base benötigt."
516
#: bzrlib/builtins.py:1096
607
#: bzrlib/builtins.py:1205
517
608
msgid "No pull location known or specified."
520
#: bzrlib/builtins.py:1102
611
#: bzrlib/builtins.py:1211
522
613
msgid "Using saved parent location: %s\n"
614
msgstr "Gespeichertes übergeordnetes Verzeichnis wird verwendet: %s\n"
525
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
616
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
526
617
msgid "Cannot use -r with merge directives or bundles"
529
#: bzrlib/builtins.py:1150
620
#: bzrlib/builtins.py:1261
530
621
msgid "Update a mirror of this branch."
622
msgstr "Eine Spiegelung dieses Zweiges aktualisieren."
533
#: bzrlib/builtins.py:1152
624
#: bzrlib/builtins.py:1263
535
626
"The target branch will not have its working tree populated because this\n"
536
627
"is both expensive, and is not supported on remote file systems."
539
#: bzrlib/builtins.py:1155
630
#: bzrlib/builtins.py:1266
541
632
"Some smart servers or protocols *may* put the working tree in place in\n"
635
"Einige intelligente Server oder Protokolle legen den Arbeitsbaum\n"
636
"*möglicherweise* in die Zukunft."
545
#: bzrlib/builtins.py:1158
638
#: bzrlib/builtins.py:1269
547
640
"This command only works on branches that have not diverged. Branches are\n"
548
641
"considered diverged if the destination branch's most recent commit is one\n"
549
642
"that has not been merged (directly or indirectly) by the source branch."
552
#: bzrlib/builtins.py:1162
645
#: bzrlib/builtins.py:1273
554
647
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
555
648
"the other branch completely, discarding its unmerged changes."
558
#: bzrlib/builtins.py:1165
651
#: bzrlib/builtins.py:1276
560
653
"If you want to ensure you have the different changes in the other branch,\n"
561
654
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
562
655
"After that you will be able to do a push without '--overwrite'."
565
#: bzrlib/builtins.py:1169
658
#: bzrlib/builtins.py:1280
567
660
"If there is no default push location set, the first push will set it (use\n"
568
661
"--no-remember to avoid setting it). After that, you can omit the\n"
570
663
"value will only be saved if the remote location can be accessed."
573
#: bzrlib/builtins.py:1174
666
#: bzrlib/builtins.py:1285
575
668
"The --verbose option will display the revisions pushed using the log_format\n"
576
669
"configuration option. You can use a different format by overriding it with\n"
577
670
"-Olog_format=<other_format>."
580
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
673
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
582
675
"Branch to push from, rather than the one containing the working directory."
677
"Der Zweig zum Hochladen, statt dem Zweig, der das Arbeitsverzeichnis enthält."
585
#: bzrlib/builtins.py:1188
679
#: bzrlib/builtins.py:1299
587
681
"By default push will fail if the target directory exists, but does not "
588
682
"already have a control directory. This flag will allow push to proceed."
591
#: bzrlib/builtins.py:1193
685
#: bzrlib/builtins.py:1304
593
687
"Create a stacked branch that references the public location of the parent "
690
"Einen gestapelten Zweig anlegen, der auf den öffentlichen Pfad des "
691
"übergeordneten Zweigs referenziert."
597
#: bzrlib/builtins.py:1196
693
#: bzrlib/builtins.py:1307
599
695
"Create a stacked branch that refers to another branch for the commit "
600
696
"history. Only the work not present in the referenced branch is included in "
601
697
"the branch created."
604
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
700
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
606
702
"Refuse to push if there are uncommitted changes in the working tree, --no-"
607
703
"strict disables the check."
705
"Hochladen verweigern, wenn Veränderungen in dem Arbeitsbaum noch nicht "
706
"eingereicht wurden, --no-strict deaktiviert die Überprüfung."
610
#: bzrlib/builtins.py:1204
708
#: bzrlib/builtins.py:1315
611
709
msgid "Don't populate the working tree, even for protocols that support it."
614
#: bzrlib/builtins.py:1248
712
#: bzrlib/builtins.py:1318
713
msgid "Overwrite tags only."
714
msgstr "Nur Schlüsselwörter überschreiben."
716
#: bzrlib/builtins.py:1369
615
717
msgid "Could not determine branch to refer to."
719
"Der Zweig, auf den Verwiesen werden soll, kann nicht bestimmt werden."
618
#: bzrlib/builtins.py:1257
721
#: bzrlib/builtins.py:1378
621
724
"No push location known or specified. To push to the parent branch (at %s), "
622
725
"use 'bzr push :parent'."
625
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
728
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
626
729
msgid "No push location known or specified."
730
msgstr "Kein Ort zum Hochladen bekannt oder nicht gewählt."
629
#: bzrlib/builtins.py:1267
732
#: bzrlib/builtins.py:1388
631
734
msgid "Using saved push location: %s"
735
msgstr "Gespeichertes Verzeichnis zum Hochladen wird verwendet: %s"
634
#: bzrlib/builtins.py:1277
737
#: bzrlib/builtins.py:1398
635
738
msgid "Create a new branch that is a copy of an existing branch."
740
"Einen neuen Zweig erstellen, der eine Kopie eines vorhandenen Zweigs ist."
638
#: bzrlib/builtins.py:1279
742
#: bzrlib/builtins.py:1400
640
744
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
641
745
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
646
750
"create ./foo-bar."
649
#: bzrlib/builtins.py:1286
753
#: bzrlib/builtins.py:1407
651
755
"To retrieve the branch as of a particular revision, supply the --revision\n"
652
756
"parameter, as in \"branch foo/bar -r 5\"."
655
#: bzrlib/builtins.py:1289
759
#: bzrlib/builtins.py:1410
656
760
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
761
msgstr "DIe Synonyme »clone« und »get« sind für diesen Befehl sind veraltet."
659
#: bzrlib/builtins.py:1299
763
#: bzrlib/builtins.py:1420
660
764
msgid "Create a branch without a working-tree."
765
msgstr "Zweig ohne Arbeitsbaum erstellen."
663
#: bzrlib/builtins.py:1301
767
#: bzrlib/builtins.py:1422
664
768
msgid "Switch the checkout in the current directory to the new branch."
667
#: bzrlib/builtins.py:1304
771
#: bzrlib/builtins.py:1425
669
773
"Create a stacked branch referring to the source branch. The new branch will "
670
774
"depend on the availability of the source branch for all operations."
673
#: bzrlib/builtins.py:1308
777
#: bzrlib/builtins.py:1429
674
778
msgid "Do not use a shared repository, even if available."
779
msgstr "Keine verteilte Quelle nutzen, auch wenn vorhanden."
677
#: bzrlib/builtins.py:1310
781
#: bzrlib/builtins.py:1431
679
783
"By default branch will fail if the target directory exists, but does not "
680
784
"already have a control directory. This flag will allow branch to proceed."
683
#: bzrlib/builtins.py:1315
787
#: bzrlib/builtins.py:1436
684
788
msgid "Bind new branch to from location."
687
#: bzrlib/builtins.py:1362
791
#: bzrlib/builtins.py:1483
689
793
msgid "Target directory \"%s\" already exists."
794
msgstr "Zielverzeichnis »%s« ist schon vorhanden."
692
#: bzrlib/builtins.py:1374
796
#: bzrlib/builtins.py:1495
694
798
msgid "Parent of \"%s\" does not exist."
799
msgstr "Übergeordntes Verzeichnis von »%s« ist nicht vorhanden."
697
#: bzrlib/builtins.py:1393
801
#: bzrlib/builtins.py:1514
698
802
msgid "The branch {0} has no revision {1}."
803
msgstr "Der Zweig {0} hat keine Revision {1}."
701
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
805
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
703
807
msgid "Created new stacked branch referring to %s."
706
#: bzrlib/builtins.py:1407
810
#: bzrlib/builtins.py:1533
708
812
msgid "Branched %d revision."
709
813
msgid_plural "Branched %d revisions."
713
#: bzrlib/builtins.py:1412
817
#: bzrlib/builtins.py:1538
715
819
msgid "New branch bound to %s"
718
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
822
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
720
824
msgid "Switched to branch: %s"
825
msgstr "Zu Zweig gewechselt: %s"
723
#: bzrlib/builtins.py:1422
827
#: bzrlib/builtins.py:1548
724
828
msgid "List the branches available at the current location."
829
msgstr "Die verfügbaren Zweige an der aktuellen Stelle auflisten."
727
#: bzrlib/builtins.py:1424
831
#: bzrlib/builtins.py:1550
729
833
"This command will print the names of all the branches at the current\n"
836
"Dieser Befehl wird die Namen aller verfügbaren Zweige\n"
837
"an der aktuellen Stelle auflisten."
733
#: bzrlib/builtins.py:1431
839
#: bzrlib/builtins.py:1557
735
841
"Recursively scan for branches rather than just looking in the specified "
739
#: bzrlib/builtins.py:1461
845
#: bzrlib/builtins.py:1586
740
846
msgid "(default)"
743
#: bzrlib/builtins.py:1473
849
#: bzrlib/builtins.py:1598
744
850
msgid "Create a new checkout of an existing branch."
747
#: bzrlib/builtins.py:1475
853
#: bzrlib/builtins.py:1600
749
855
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
839
947
"out the old content of that file to a new location."
842
#: bzrlib/builtins.py:1601
950
#: bzrlib/builtins.py:1724
844
952
"The 'dir' argument, if given, must be the location of the root of a\n"
845
953
"working tree to update. By default, the working tree that contains the \n"
846
954
"current working directory is used."
849
#: bzrlib/builtins.py:1617
957
#: bzrlib/builtins.py:1740
850
958
msgid "bzr update --revision takes exactly one revision"
959
msgstr "bzr update --revision benötigt exakt eine Revision"
853
#: bzrlib/builtins.py:1625
961
#: bzrlib/builtins.py:1748
854
962
msgid "bzr update can only update a whole tree, not a file or subdirectory"
964
"bzr update kann nur den gesamten Baum aktualisieren, keine Datei oder kein "
857
#: bzrlib/builtins.py:1656
967
#: bzrlib/builtins.py:1779
858
968
msgid "Tree is up to date at revision {0} of branch {1}"
969
msgstr "Baum ist auf den neusten Stand bei Revision {0} von Zweig {1}"
861
#: bzrlib/builtins.py:1672
971
#: bzrlib/builtins.py:1795
864
974
"branch has no revision %s\n"
865
975
"bzr update --revision only works for a revision in the branch history"
977
"Zweig hat keine Revision %s\n"
978
"bzr update --revision funktioniert nur mit einer Revision aus dem Verlauf "
868
#: bzrlib/builtins.py:1678
981
#: bzrlib/builtins.py:1801
869
982
msgid "Updated to revision {0} of branch {1}"
983
msgstr "Auf Revision {0} von Zweig {1} aktualisieren"
872
#: bzrlib/builtins.py:1682
985
#: bzrlib/builtins.py:1805
874
987
"Your local commits will now show as pending merges with 'bzr status', and "
875
988
"can be committed with 'bzr commit'."
878
#: bzrlib/builtins.py:1691
991
#: bzrlib/builtins.py:1814
879
992
msgid "Show information about a working tree, branch or repository."
882
#: bzrlib/builtins.py:1693
995
#: bzrlib/builtins.py:1816
884
997
"This command will show all known locations and formats associated to the\n"
885
998
"tree, branch or repository."
888
#: bzrlib/builtins.py:1696
1001
#: bzrlib/builtins.py:1819
890
1003
"In verbose mode, statistical information is included with each report.\n"
891
1004
"To see extended statistic information, use a verbosity level of 2 or\n"
892
1005
"higher by specifying the verbose option multiple times, e.g. -vv."
895
#: bzrlib/builtins.py:1700
1008
#: bzrlib/builtins.py:1823
896
1009
msgid "Branches and working trees will also report any missing revisions."
899
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
900
#: bzrlib/builtins.py:6389
1012
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1013
#: bzrlib/builtins.py:6466
901
1014
msgid ":Examples:"
1015
msgstr ":Beispiele:"
904
#: bzrlib/builtins.py:1704
1017
#: bzrlib/builtins.py:1827
905
1018
msgid " Display information on the format and related locations:"
1019
msgstr " Informationen über das Format und die dazugehörigen Orte anzeigen:"
908
#: bzrlib/builtins.py:1706
1021
#: bzrlib/builtins.py:1829
909
1022
msgid " bzr info"
912
#: bzrlib/builtins.py:1708
1025
#: bzrlib/builtins.py:1831
914
1027
" Display the above together with extended format information and\n"
915
1028
" basic statistics (like the number of files in the working tree and\n"
916
1029
" number of revisions in the branch and repository):"
919
#: bzrlib/builtins.py:1712
1032
#: bzrlib/builtins.py:1835
920
1033
msgid " bzr info -v"
1034
msgstr " bzr info -v"
923
#: bzrlib/builtins.py:1714
1036
#: bzrlib/builtins.py:1837
924
1037
msgid " Display the above together with number of committers to the branch:"
927
#: bzrlib/builtins.py:1716
1040
#: bzrlib/builtins.py:1839
928
1041
msgid " bzr info -vv"
1042
msgstr " bzr info -vv"
931
#: bzrlib/builtins.py:1735
1044
#: bzrlib/builtins.py:1858
932
1045
msgid "Remove files or directories."
1046
msgstr "Dateien oder Verzeichnisse entfernen."
935
#: bzrlib/builtins.py:1737
1048
#: bzrlib/builtins.py:1860
937
1050
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
938
1051
"delete them if they can easily be recovered using revert otherwise they\n"
939
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1052
"will be backed up (adding an extension of the form .~#~). If no options or\n"
940
1053
"parameters are given Bazaar will scan for files that are being tracked by\n"
941
1054
"Bazaar but missing in your tree and stop tracking them for you."
944
#: bzrlib/builtins.py:1745
1057
#: bzrlib/builtins.py:1868
945
1058
msgid "Only remove files that have never been committed."
1059
msgstr "Nur Dateien entfernen, die niemals eingereicht wurden."
948
#: bzrlib/builtins.py:1747
1061
#: bzrlib/builtins.py:1870
949
1062
msgid "The file deletion mode to be used."
1063
msgstr "Der Datei-Löschmodus, der verwendet wird."
952
#: bzrlib/builtins.py:1748
1065
#: bzrlib/builtins.py:1871
953
1066
msgid "Deletion Strategy"
1067
msgstr "Lösch-Strategie"
956
#: bzrlib/builtins.py:1749
1069
#: bzrlib/builtins.py:1872
957
1070
msgid "Backup changed files (default)."
1071
msgstr "Geänderte Dateien sichern (Vorgabe)."
960
#: bzrlib/builtins.py:1750
1073
#: bzrlib/builtins.py:1873
961
1074
msgid "Delete from bzr but leave the working copy."
1075
msgstr "Aus bzr entfernen, aber die funktionierende Arbeitskopie erhalten."
964
#: bzrlib/builtins.py:1751
1077
#: bzrlib/builtins.py:1874
965
1078
msgid "Don't backup changed files."
1079
msgstr "Geänderte Dateien nicht sichern."
968
#: bzrlib/builtins.py:1752
1081
#: bzrlib/builtins.py:1875
970
1083
"Delete all the specified files, even if they can not be recovered and even "
971
1084
"if they are non-empty directories. (deprecated, use no-backup)"
1086
"Alle spezifischen Dateien entfernen, auch wenn sie nicht wiederhergestellt "
1087
"werden können und wenn die Verzeichnisse nicht leer sind. (Veraltet, nutzen "
974
#: bzrlib/builtins.py:1761
1090
#: bzrlib/builtins.py:1884
975
1091
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1093
"(Die --force Option ist veraltet, nutzen Sie in Zukunft stattdessen --no-"
978
#: bzrlib/builtins.py:1778
1096
#: bzrlib/builtins.py:1901
979
1097
msgid "No matching files."
1098
msgstr "Keine zutreffenden Dateien."
982
#: bzrlib/builtins.py:1839
1100
#: bzrlib/builtins.py:1962
983
1101
msgid "Reconcile bzr metadata in a branch."
986
#: bzrlib/builtins.py:1841
1104
#: bzrlib/builtins.py:1964
988
1106
"This can correct data mismatches that may have been caused by\n"
989
1107
"previous ghost operations or bzr upgrades. You should only\n"
1199
1338
" 0 - no change"
1342
" 2 - Nicht darstellbare Änderungen\n"
1344
" 0 - Keine Änderungen"
1202
#: bzrlib/builtins.py:2127
1346
#: bzrlib/builtins.py:2250
1205
1349
" Shows the difference in the working tree versus the last commit::"
1208
#: bzrlib/builtins.py:2130
1352
#: bzrlib/builtins.py:2253
1209
1353
msgid " bzr diff"
1212
#: bzrlib/builtins.py:2132
1356
#: bzrlib/builtins.py:2255
1213
1357
msgid " Difference between the working tree and revision 1::"
1216
#: bzrlib/builtins.py:2134
1360
#: bzrlib/builtins.py:2257
1217
1361
msgid " bzr diff -r1"
1362
msgstr " bzr diff -r1"
1220
#: bzrlib/builtins.py:2136
1364
#: bzrlib/builtins.py:2259
1221
1365
msgid " Difference between revision 3 and revision 1::"
1366
msgstr " Unterschied zwischen Revision 3 und Revision 1::"
1224
#: bzrlib/builtins.py:2138
1368
#: bzrlib/builtins.py:2261
1225
1369
msgid " bzr diff -r1..3"
1370
msgstr " bzr diff -r1..3"
1228
#: bzrlib/builtins.py:2140
1372
#: bzrlib/builtins.py:2263
1229
1373
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1374
msgstr " Unterschied zwischen Revision 3 und Revision 1 von Zweig xxx::"
1232
#: bzrlib/builtins.py:2142
1376
#: bzrlib/builtins.py:2265
1233
1377
msgid " bzr diff -r1..3 xxx"
1378
msgstr " bzr diff -r1..3 xxx"
1236
#: bzrlib/builtins.py:2144
1380
#: bzrlib/builtins.py:2267
1237
1381
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1382
msgstr " Die Änderungen von Revision 2 (äquivalent zu -r1..2)::"
1240
#: bzrlib/builtins.py:2146
1384
#: bzrlib/builtins.py:2269
1241
1385
msgid " bzr diff -c2"
1386
msgstr " bzr diff -c2"
1244
#: bzrlib/builtins.py:2148
1388
#: bzrlib/builtins.py:2271
1246
1390
" To see the changes introduced by revision X::\n"
1248
1392
" bzr diff -cX"
1394
" So erhalten Sie die Änderungen von Revision X::\n"
1251
#: bzrlib/builtins.py:2152
1398
#: bzrlib/builtins.py:2275
1253
1400
" Note that in the case of a merge, the -c option shows the changes\n"
1254
1401
" compared to the left hand parent. To see the changes against\n"
1255
1402
" another parent, use::"
1258
#: bzrlib/builtins.py:2156
1405
#: bzrlib/builtins.py:2279
1259
1406
msgid " bzr diff -r<chosen_parent>..X"
1262
#: bzrlib/builtins.py:2158
1409
#: bzrlib/builtins.py:2281
1264
1411
" The changes between the current revision and the previous revision\n"
1265
1412
" (equivalent to -c-1 and -r-2..-1)"
1414
" Die Änderungen zwischen der gegenwärtigen Revision und der vorigen\n"
1415
" (äquivalent zu -c-1 und -r-2..-1)"
1268
#: bzrlib/builtins.py:2161
1417
#: bzrlib/builtins.py:2284
1269
1418
msgid " bzr diff -r-2.."
1419
msgstr " bzr diff -r-2.."
1272
#: bzrlib/builtins.py:2163
1421
#: bzrlib/builtins.py:2286
1273
1422
msgid " Show just the differences for file NEWS::"
1423
msgstr " Nur die Unterschiede für die Datei NEWS anzeigen::"
1276
#: bzrlib/builtins.py:2165
1425
#: bzrlib/builtins.py:2288
1277
1426
msgid " bzr diff NEWS"
1280
#: bzrlib/builtins.py:2167
1429
#: bzrlib/builtins.py:2290
1281
1430
msgid " Show the differences in working tree xxx for file NEWS::"
1284
#: bzrlib/builtins.py:2169
1433
#: bzrlib/builtins.py:2292
1285
1434
msgid " bzr diff xxx/NEWS"
1288
#: bzrlib/builtins.py:2171
1437
#: bzrlib/builtins.py:2294
1289
1438
msgid " Show the differences from branch xxx to this working tree:"
1292
#: bzrlib/builtins.py:2173
1441
#: bzrlib/builtins.py:2296
1293
1442
msgid " bzr diff --old xxx"
1443
msgstr " bzr diff --old xxx"
1296
#: bzrlib/builtins.py:2175
1445
#: bzrlib/builtins.py:2298
1297
1446
msgid " Show the differences between two branches for file NEWS::"
1448
" Die Unterschiede zwischen zwei Zweigen für die Datei NEWS anzeigen::"
1300
#: bzrlib/builtins.py:2177
1450
#: bzrlib/builtins.py:2300
1301
1451
msgid " bzr diff --old xxx --new yyy NEWS"
1304
#: bzrlib/builtins.py:2179
1454
#: bzrlib/builtins.py:2302
1305
1455
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1308
#: bzrlib/builtins.py:2181
1458
#: bzrlib/builtins.py:2304
1310
1460
" bzr diff --prefix old/:new/\n"
1314
1464
" bzr diff --using /usr/bin/diff --diff-options -wu"
1317
#: bzrlib/builtins.py:2191
1467
#: bzrlib/builtins.py:2314
1318
1468
msgid "Pass these options to the external diff program."
1469
msgstr "Diese Optionen an das externe Programm diff übergeben."
1321
#: bzrlib/builtins.py:2194
1471
#: bzrlib/builtins.py:2317
1323
1473
"Set prefixes added to old and new filenames, as two values separated by a "
1324
1474
"colon. (eg \"old/:new/\")."
1327
#: bzrlib/builtins.py:2197
1477
#: bzrlib/builtins.py:2320
1328
1478
msgid "Branch/tree to compare from."
1479
msgstr "Von Zweig/Baum vergleichen."
1331
#: bzrlib/builtins.py:2201
1481
#: bzrlib/builtins.py:2324
1332
1482
msgid "Branch/tree to compare to."
1483
msgstr "Mit Zweig/Baum vergleichen."
1335
#: bzrlib/builtins.py:2207
1485
#: bzrlib/builtins.py:2330
1336
1486
msgid "Use this command to compare files."
1487
msgstr "Diesen Befehl zum Vergleichen von Dateien benutzen."
1339
#: bzrlib/builtins.py:2212
1489
#: bzrlib/builtins.py:2335
1340
1490
msgid "Diff format to use."
1491
msgstr "Diff-Format, das benutzt werden soll."
1343
#: bzrlib/builtins.py:2214
1493
#: bzrlib/builtins.py:2337
1344
1494
msgid "Diff format"
1495
msgstr "Diff-Format"
1347
#: bzrlib/builtins.py:2236
1497
#: bzrlib/builtins.py:2359
1348
1498
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1500
"--prefix erwartet zwei Werte getrennt mit einem Doppelpunkt (z.B. "
1351
#: bzrlib/builtins.py:2240
1503
#: bzrlib/builtins.py:2363
1352
1504
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1506
"bzr diff --revision benötigt exakt ein oder zwei Revisions-Spezifikationen"
1355
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1356
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1508
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1509
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1357
1510
msgid "{0} and {1} are mutually exclusive"
1511
msgstr "{0} und {1} schließen sich gegenseitig aus"
1360
#: bzrlib/builtins.py:2265
1513
#: bzrlib/builtins.py:2388
1362
1515
"List files deleted in the working tree.\n"
1366
#: bzrlib/builtins.py:2343
1519
#: bzrlib/builtins.py:2465
1367
1520
msgid "Show the tree root directory."
1521
msgstr "Den Wurzelverzeichnisbaum anzeigen."
1370
#: bzrlib/builtins.py:2345
1523
#: bzrlib/builtins.py:2467
1372
1525
"The root is the nearest enclosing directory with a .bzr control\n"
1376
#: bzrlib/builtins.py:2360
1529
#: bzrlib/builtins.py:2482
1377
1530
msgid "The limit argument must be an integer."
1380
#: bzrlib/builtins.py:2368
1533
#: bzrlib/builtins.py:2490
1381
1534
msgid "The levels argument must be an integer."
1384
#: bzrlib/builtins.py:2373
1537
#: bzrlib/builtins.py:2495
1385
1538
msgid "Show historical log for a branch or subset of a branch."
1388
#: bzrlib/builtins.py:2375
1541
#: bzrlib/builtins.py:2497
1390
1543
"log is bzr's default tool for exploring the history of a branch.\n"
1391
1544
"The branch to use is taken from the first parameter. If no parameters\n"
1436
1595
" -p display a diff (patch) for each revision\n"
1437
1596
" --show-ids display revision-ids (and file-ids), not just revnos"
1598
" -l N Maximal N Revisionen anzeigen\n"
1599
" -n N N Revisionsstufen anzeigen (0 für alle, 1 für "
1601
" -v Eine Status-Zusammenfassung (Delta) für jede Revision "
1603
" -p Einen diff (Patch) für jede Revision anzeigen\n"
1604
" --show-ids Revision-ids (und file-ids) anzeigen, nicht nur revnos"
1440
#: bzrlib/builtins.py:2407
1606
#: bzrlib/builtins.py:2529
1442
1608
" Note that the default number of levels to display is a function of the\n"
1443
1609
" log format. If the -n option is not used, the standard log formats show\n"
1444
1610
" just the top level (mainline)."
1612
" Beachten Sie, dass die Vorgabeanzahl zum Anzeigen von Stufen eine "
1614
" des Protokoll-Formats ist. Wenn die Option -n nicht genutzt wird, dann "
1616
" Standard-Protokoll-Formate nur die oberste Stufe (mainline)."
1447
#: bzrlib/builtins.py:2411
1618
#: bzrlib/builtins.py:2533
1449
1620
" Status summaries are shown using status flags like A, M, etc. To see\n"
1450
1621
" the changes explained using words like ``added`` and ``modified``\n"
1451
1622
" instead, use the -vv option."
1624
" Status-Zusammenfassungen werden mit Status-Markern wie A, M, usw.\n"
1625
" angezeigt. Nutzen Sie die Option -vv, um Änderungen durch\n"
1626
" Wörter wie ``added`` oder ``modified`` erklärt zu bekommen."
1454
#: bzrlib/builtins.py:2415
1628
#: bzrlib/builtins.py:2537
1455
1629
msgid ":Ordering control:"
1630
msgstr ":Sortierungssteuerung:"
1458
#: bzrlib/builtins.py:2417
1632
#: bzrlib/builtins.py:2539
1460
1634
" To display revisions from oldest to newest, use the --forward option.\n"
1461
1635
" In most cases, using this option will have little impact on the total\n"
1462
1636
" time taken to produce a log, though --forward does not incrementally\n"
1463
1637
" display revisions like --reverse does when it can."
1639
" Nutzen Sie die Option --forward, um Revisionen von den ältesten zu den "
1641
" anzuzeigen. Der Gebrauch dieser Option hat meistens kleine\n"
1642
" Auswirkungen auf die Gesamtzeit, die benötigt wird, um ein Protokoll zu "
1644
" Außerdem zeigt --forward Revisionen nicht inkrementell an, wie --reverse "
1645
"dies tut, falls möglich."
1466
#: bzrlib/builtins.py:2422
1647
#: bzrlib/builtins.py:2544
1467
1648
msgid ":Revision filtering:"
1649
msgstr ":Revision-Filtern:"
1470
#: bzrlib/builtins.py:2424
1651
#: bzrlib/builtins.py:2546
1472
1653
" The -r option can be used to specify what revision or range of revisions\n"
1473
1654
" to filter against. The various forms are shown below::"
1656
" Die Option -r kann genutzt werden, um eine Revision oder einen Bereich von "
1658
" zu bestimmen, die/der gefiltert werden soll. Es gibt folgende verschiedene "
1476
#: bzrlib/builtins.py:2427
1661
#: bzrlib/builtins.py:2549
1478
1663
" -rX display revision X\n"
1479
1664
" -rX.. display revision X and later\n"
1480
1665
" -r..Y display up to and including revision Y\n"
1481
1666
" -rX..Y display from X to Y inclusive"
1668
" -rX Revision X anzeigen\n"
1669
" -rX.. Revision X und spätere anzeigen\n"
1670
" -r..Y Bis Revision Y (inklusive) anzeigen\n"
1671
" -rX..Y Von X bis Y (inklusive) anzeigen"
1484
#: bzrlib/builtins.py:2432
1673
#: bzrlib/builtins.py:2554
1486
1675
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1487
1676
" Some common examples are given below::"
1678
" Siehe ``bzr help revisionspec`` für Informationen dazu, wie X und Y "
1679
"angegeben werden.\n"
1680
" Es folgen ein paar allgemeine Beispiele::"
1490
#: bzrlib/builtins.py:2435
1682
#: bzrlib/builtins.py:2557
1492
1684
" -r-1 show just the tip\n"
1493
1685
" -r-10.. show the last 10 mainline revisions\n"
1646
1838
" trading disk space for faster speed."
1649
#: bzrlib/builtins.py:2531
1841
#: bzrlib/builtins.py:2653
1650
1842
msgid "Show from oldest to newest."
1653
#: bzrlib/builtins.py:2534
1845
#: bzrlib/builtins.py:2656
1654
1846
msgid "Show files changed in each revision."
1657
#: bzrlib/builtins.py:2540
1849
#: bzrlib/builtins.py:2662
1658
1850
msgid "Show just the specified revision. See also \"help revisionspec\"."
1661
#: bzrlib/builtins.py:2544
1853
#: bzrlib/builtins.py:2666
1662
1854
msgid "What names to list as authors - first, all or committer."
1665
#: bzrlib/builtins.py:2545
1857
#: bzrlib/builtins.py:2667
1666
1858
msgid "Authors"
1669
#: bzrlib/builtins.py:2550
1861
#: bzrlib/builtins.py:2672
1670
1862
msgid "Number of levels to display - 0 for all, 1 for flat."
1673
#: bzrlib/builtins.py:2560
1865
#: bzrlib/builtins.py:2682
1674
1866
msgid "Limit the output to the first N revisions."
1677
#: bzrlib/builtins.py:2565
1869
#: bzrlib/builtins.py:2687
1678
1870
msgid "Show changes made in each revision as a patch."
1681
#: bzrlib/builtins.py:2567
1873
#: bzrlib/builtins.py:2689
1682
1874
msgid "Show merged revisions like --levels 0 does."
1685
#: bzrlib/builtins.py:2571
1877
#: bzrlib/builtins.py:2693
1686
1878
msgid "Do not report commits with more than one parent."
1689
#: bzrlib/builtins.py:2573
1881
#: bzrlib/builtins.py:2695
1691
1883
"Display only the revisions that are not part of both ancestries (require -"
1695
#: bzrlib/builtins.py:2577
1887
#: bzrlib/builtins.py:2699
1696
1888
msgid "Show digital signature validity."
1889
msgstr "Gültigkeit der digitalen Signatur anzeigen."
1699
#: bzrlib/builtins.py:2580
1891
#: bzrlib/builtins.py:2702
1700
1892
msgid "Show revisions whose properties match this expression."
1703
#: bzrlib/builtins.py:2584
1895
#: bzrlib/builtins.py:2706
1704
1896
msgid "Show revisions whose message matches this expression."
1707
#: bzrlib/builtins.py:2588
1899
#: bzrlib/builtins.py:2710
1708
1900
msgid "Show revisions whose committer matches this expression."
1711
#: bzrlib/builtins.py:2592
1903
#: bzrlib/builtins.py:2714
1712
1904
msgid "Show revisions whose authors match this expression."
1715
#: bzrlib/builtins.py:2596
1907
#: bzrlib/builtins.py:2718
1716
1908
msgid "Show revisions whose bugs match this expression."
1719
#: bzrlib/builtins.py:2650
1911
#: bzrlib/builtins.py:2772
1720
1912
msgid "--exclude-common-ancestry requires -r with two revisions"
1723
#: bzrlib/builtins.py:2678
1915
#: bzrlib/builtins.py:2800
1724
1916
#, python-format
1725
1917
msgid "Path unknown at end or start of revision range: %s"
1728
#: bzrlib/builtins.py:2795
1920
#: bzrlib/builtins.py:2917
1729
1921
#, python-format
1730
1922
msgid "bzr %s doesn't accept two revisions in different branches."
1733
#: bzrlib/builtins.py:2811
1925
#: bzrlib/builtins.py:2933
1734
1926
#, python-format
1735
1927
msgid "bzr %s --revision takes one or two values."
1928
msgstr "bzr %s --revision benötigt ein oder zwei Werte."
1738
#: bzrlib/builtins.py:2856
1930
#: bzrlib/builtins.py:2978
1740
1932
"List files in a tree.\n"
1744
#: bzrlib/builtins.py:2865
1936
#: bzrlib/builtins.py:2987
1745
1937
msgid "Recurse into subdirectories."
1748
#: bzrlib/builtins.py:2867
1940
#: bzrlib/builtins.py:2989
1749
1941
msgid "Print paths relative to the root of the branch."
1752
#: bzrlib/builtins.py:2869
1944
#: bzrlib/builtins.py:2991
1753
1945
msgid "Print unknown files."
1946
msgstr "Unbekannte Dateien ausgeben."
1756
#: bzrlib/builtins.py:2870
1948
#: bzrlib/builtins.py:2992
1757
1949
msgid "Print versioned files."
1950
msgstr "Versionierte Dateien ausgeben."
1760
#: bzrlib/builtins.py:2873
1952
#: bzrlib/builtins.py:2995
1761
1953
msgid "Print ignored files."
1954
msgstr "Ignorierte Dateien ausgeben."
1764
#: bzrlib/builtins.py:2875
1956
#: bzrlib/builtins.py:2997
1765
1957
msgid "List entries of a particular kind: file, directory, symlink."
1768
#: bzrlib/builtins.py:2888
1960
#: bzrlib/builtins.py:3010
1769
1961
msgid "invalid kind specified"
1772
#: bzrlib/builtins.py:2891
1964
#: bzrlib/builtins.py:3013
1773
1965
msgid "Cannot set both --verbose and --null"
1966
msgstr "--verbose und --null können nicht beide festgelegt werden"
1776
#: bzrlib/builtins.py:2900
1968
#: bzrlib/builtins.py:3022
1777
1969
msgid "cannot specify both --from-root and PATH"
1780
#: bzrlib/builtins.py:2987
1972
#: bzrlib/builtins.py:3109
1781
1973
msgid "Ignore specified files or patterns."
1784
#: bzrlib/builtins.py:2989
1976
#: bzrlib/builtins.py:3111
1785
1977
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1788
#: bzrlib/builtins.py:2991
1980
#: bzrlib/builtins.py:3113
1790
1982
"If a .bzrignore file does not exist, the ignore command\n"
1791
1983
"will create one and add the specified files or patterns to the newly\n"
2223
2416
"Commit refused."
2226
#: bzrlib/builtins.py:3450
2419
#: bzrlib/builtins.py:3572
2227
2420
#, python-format
2228
2421
msgid "Unrecognized bug %s. Commit refused."
2231
#: bzrlib/builtins.py:3453
2424
#: bzrlib/builtins.py:3575
2232
2425
#, python-format
2235
2428
"Commit refused."
2238
#: bzrlib/builtins.py:3477
2431
#: bzrlib/builtins.py:3599
2239
2432
msgid "Could not parse --commit-time: "
2242
#: bzrlib/builtins.py:3517
2435
#: bzrlib/builtins.py:3639
2243
2436
msgid "please specify either --message or --file"
2437
msgstr "Bitte geben Sie entweder --message oder --file an"
2246
#: bzrlib/builtins.py:3546
2439
#: bzrlib/builtins.py:3668
2247
2440
msgid "please specify a commit message with either --message or --file"
2250
#: bzrlib/builtins.py:3549
2443
#: bzrlib/builtins.py:3671
2252
2445
"Empty commit message specified. Please specify a commit message with either -"
2253
2446
"-message or --file or leave a blank message with --message \"\"."
2256
#: bzrlib/builtins.py:3569
2449
#: bzrlib/builtins.py:3691
2258
2451
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2259
2452
"-unchanged to force an empty commit."
2262
#: bzrlib/builtins.py:3573
2455
#: bzrlib/builtins.py:3695
2264
2457
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2265
2458
"resolve FILE\" to resolve."
2268
#: bzrlib/builtins.py:3577
2461
#: bzrlib/builtins.py:3699
2269
2462
msgid "Commit refused because there are unknown files in the working tree."
2272
#: bzrlib/builtins.py:3580
2465
#: bzrlib/builtins.py:3702
2275
2468
"To commit to master branch, run update and then commit.\n"
2276
2469
"You can also pass --local to commit to continue working disconnected."
2279
#: bzrlib/builtins.py:3588
2472
#: bzrlib/builtins.py:3710
2281
2474
"Validate working tree structure, branch consistency and repository history."
2284
#: bzrlib/builtins.py:3590
2477
#: bzrlib/builtins.py:3712
2286
2479
"This command checks various invariants about branch and repository storage\n"
2287
2480
"to detect data corruption or bzr bugs."
2290
#: bzrlib/builtins.py:3593
2483
#: bzrlib/builtins.py:3715
2292
2485
"The working tree and branch checks will only give output if a problem is\n"
2293
2486
"detected. The output fields of the repository check are:"
2296
#: bzrlib/builtins.py:3596
2489
#: bzrlib/builtins.py:3718
2299
2492
" This is just the number of revisions checked. It doesn't\n"
2300
2493
" indicate a problem."
2303
#: bzrlib/builtins.py:3600
2496
#: bzrlib/builtins.py:3722
2305
2498
"versionedfiles\n"
2306
2499
" This is just the number of versionedfiles checked. It\n"
2307
2500
" doesn't indicate a problem."
2310
#: bzrlib/builtins.py:3604
2503
#: bzrlib/builtins.py:3726
2312
2505
"unreferenced ancestors\n"
2313
2506
" Texts that are ancestors of other texts, but\n"
2419
#: bzrlib/builtins.py:3686
2612
#: bzrlib/builtins.py:3808
2421
2614
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2422
2615
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2425
#: bzrlib/builtins.py:3694
2618
#: bzrlib/builtins.py:3816
2426
2619
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2429
#: bzrlib/builtins.py:3698
2622
#: bzrlib/builtins.py:3820
2430
2623
msgid "Branch format"
2624
msgstr "Format des Zweiges"
2433
#: bzrlib/builtins.py:3700
2626
#: bzrlib/builtins.py:3822
2434
2627
msgid "Remove the backup.bzr directory if successful."
2437
#: bzrlib/builtins.py:3702
2630
#: bzrlib/builtins.py:3824
2438
2631
msgid "Show what would be done, but don't actually do anything."
2632
msgstr "Nur zeigen, was getan werden würde, aber nichts wirklich machen."
2441
#: bzrlib/builtins.py:3717
2634
#: bzrlib/builtins.py:3839
2442
2635
msgid "Show or set bzr user id."
2445
#: bzrlib/builtins.py:3719
2638
#: bzrlib/builtins.py:3841
2448
2641
" Show the email of the current user::"
2644
" Die E-Mail-Adresse des aktuellen Benutzers zeigen::"
2451
#: bzrlib/builtins.py:3722
2646
#: bzrlib/builtins.py:3844
2452
2647
msgid " bzr whoami --email"
2648
msgstr " bzr whoami --email"
2455
#: bzrlib/builtins.py:3724
2650
#: bzrlib/builtins.py:3846
2456
2651
msgid " Set the current user::"
2652
msgstr " Aktuellen Benutzer festlegen::"
2459
#: bzrlib/builtins.py:3726
2654
#: bzrlib/builtins.py:3848
2460
2655
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2656
msgstr " bzr whoami \"Frank Chu <ich@beispiel.de>\""
2463
#: bzrlib/builtins.py:3730
2658
#: bzrlib/builtins.py:3852
2464
2659
msgid "Display email address only."
2660
msgstr "Nur die E-Mail-Adresse anzeigen."
2467
#: bzrlib/builtins.py:3732
2662
#: bzrlib/builtins.py:3854
2468
2663
msgid "Set identity for the current branch instead of globally."
2471
#: bzrlib/builtins.py:3758
2666
#: bzrlib/builtins.py:3880
2472
2667
msgid "--email can only be used to display existing identity"
2475
#: bzrlib/builtins.py:3780
2670
#: bzrlib/builtins.py:3904
2476
2671
msgid "Print or set the branch nickname."
2479
#: bzrlib/builtins.py:3782
2674
#: bzrlib/builtins.py:3906
2481
"If unset, the tree root directory name is used as the nickname.\n"
2482
"To print the current nickname, execute with no argument."
2676
"If unset, the colocated branch name is used for colocated branches, and\n"
2677
"the branch directory name is used for other branches. To print the\n"
2678
"current nickname, execute with no argument."
2485
#: bzrlib/builtins.py:3785
2681
#: bzrlib/builtins.py:3910
2487
2683
"Bound branches use the nickname of its master branch unless it is set\n"
2491
#: bzrlib/builtins.py:3805
2687
#: bzrlib/builtins.py:3930
2492
2688
msgid "Set/unset and display aliases."
2495
#: bzrlib/builtins.py:3807
2691
#: bzrlib/builtins.py:3932
2498
2694
" Show the current aliases::"
2697
" Die aktuellen Aliase zeigen::"
2501
#: bzrlib/builtins.py:3810
2699
#: bzrlib/builtins.py:3935
2502
2700
msgid " bzr alias"
2505
#: bzrlib/builtins.py:3812
2703
#: bzrlib/builtins.py:3937
2506
2704
msgid " Show the alias specified for 'll'::"
2509
#: bzrlib/builtins.py:3814
2707
#: bzrlib/builtins.py:3939
2510
2708
msgid " bzr alias ll"
2709
msgstr " bzr alias ll"
2513
#: bzrlib/builtins.py:3816
2711
#: bzrlib/builtins.py:3941
2514
2712
msgid " Set an alias for 'll'::"
2517
#: bzrlib/builtins.py:3818
2715
#: bzrlib/builtins.py:3943
2518
2716
msgid " bzr alias ll=\"log --line -r-10..-1\""
2717
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2521
#: bzrlib/builtins.py:3820
2719
#: bzrlib/builtins.py:3945
2522
2720
msgid " To remove an alias for 'll'::"
2525
#: bzrlib/builtins.py:3822
2723
#: bzrlib/builtins.py:3947
2526
2724
msgid " bzr alias --remove ll"
2725
msgstr " bzr alias --remove ll"
2529
#: bzrlib/builtins.py:3827
2727
#: bzrlib/builtins.py:3952
2530
2728
msgid "Remove the alias."
2729
msgstr "Den Alias entfernen."
2533
#: bzrlib/builtins.py:3845
2731
#: bzrlib/builtins.py:3970
2534
2732
msgid "bzr alias --remove expects an alias to remove."
2733
msgstr "bzr alias --remove erwartet einen Alias zum Entfernen."
2537
#: bzrlib/builtins.py:4026
2735
#: bzrlib/builtins.py:4151
2539
2737
"subunit not available. subunit needs to be installed to use --subunit."
2542
#: bzrlib/builtins.py:4043
2740
#: bzrlib/builtins.py:4168
2544
2742
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2547
#: bzrlib/builtins.py:4090
2745
#: bzrlib/builtins.py:4215
2548
2746
msgid "Show version of bzr."
2747
msgstr "Version von bzr anzeigen."
2551
#: bzrlib/builtins.py:4094
2749
#: bzrlib/builtins.py:4219
2552
2750
msgid "Print just the version number."
2751
msgstr "Nur die Versionsnummer ausgeben."
2555
#: bzrlib/builtins.py:4113
2753
#: bzrlib/builtins.py:4238
2556
2754
msgid "It sure does!\n"
2559
#: bzrlib/builtins.py:4137
2757
#: bzrlib/builtins.py:4262
2560
2758
#, python-format
2561
2759
msgid "merge base is revision %s\n"
2564
#: bzrlib/builtins.py:4141
2762
#: bzrlib/builtins.py:4266
2565
2763
msgid "Perform a three-way merge."
2568
#: bzrlib/builtins.py:4143
2766
#: bzrlib/builtins.py:4268
2570
2768
"The source of the merge can be specified either in the form of a branch,\n"
2571
2769
"or in the form of a path to a file containing a merge directive generated\n"
2641
2839
"merge revision which has more than two parents."
2644
#: bzrlib/builtins.py:4190
2842
#: bzrlib/builtins.py:4315
2646
2844
"If one would like to merge changes from the working tree of the other\n"
2647
2845
"branch without merging any committed revisions, the --uncommitted option\n"
2648
2846
"can be given."
2651
#: bzrlib/builtins.py:4194
2849
#: bzrlib/builtins.py:4319
2653
2851
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2654
2852
"you to apply each diff hunk and file change, similar to \"shelve\"."
2657
#: bzrlib/builtins.py:4197
2855
#: bzrlib/builtins.py:4322
2660
2858
" To merge all new revisions from bzr.dev::"
2663
#: bzrlib/builtins.py:4200
2861
#: bzrlib/builtins.py:4325
2664
2862
msgid " bzr merge ../bzr.dev"
2863
msgstr " bzr merge ../bzr.dev"
2667
#: bzrlib/builtins.py:4202
2865
#: bzrlib/builtins.py:4327
2668
2866
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2671
#: bzrlib/builtins.py:4204
2869
#: bzrlib/builtins.py:4329
2672
2870
msgid " bzr merge -r 82 ../bzr.dev"
2871
msgstr " bzr merge -r 82 ../bzr.dev"
2675
#: bzrlib/builtins.py:4206
2873
#: bzrlib/builtins.py:4331
2676
2874
msgid " To merge the changes introduced by 82, without previous changes::"
2679
#: bzrlib/builtins.py:4208
2877
#: bzrlib/builtins.py:4333
2680
2878
msgid " bzr merge -r 81..82 ../bzr.dev"
2879
msgstr " bzr merge -r 81..82 ../bzr.dev"
2683
#: bzrlib/builtins.py:4210
2881
#: bzrlib/builtins.py:4335
2684
2882
msgid " To apply a merge directive contained in /tmp/merge::"
2687
#: bzrlib/builtins.py:4212
2885
#: bzrlib/builtins.py:4337
2688
2886
msgid " bzr merge /tmp/merge"
2887
msgstr " bzr merge /tmp/merge"
2691
#: bzrlib/builtins.py:4214
2889
#: bzrlib/builtins.py:4339
2693
2891
" To create a merge revision with three parents from two branches\n"
2694
2892
" feature1a and feature1b:"
2697
#: bzrlib/builtins.py:4217
2895
#: bzrlib/builtins.py:4342
2699
2897
" bzr merge ../feature1a\n"
2700
2898
" bzr merge ../feature1b --force\n"
2701
2899
" bzr commit -m 'revision with three parents'"
2704
#: bzrlib/builtins.py:4229
2902
#: bzrlib/builtins.py:4354
2705
2903
msgid "Merge even if the destination tree has uncommitted changes."
2708
#: bzrlib/builtins.py:4235
2906
#: bzrlib/builtins.py:4360
2710
2908
"Apply uncommitted changes from a working copy, instead of branch changes."
2713
#: bzrlib/builtins.py:4237
2911
#: bzrlib/builtins.py:4362
2715
2913
"If the destination is already completely merged into the source, pull from "
2716
2914
"the source rather than merging. When this happens, you do not need to "
2717
2915
"commit the result."
2720
#: bzrlib/builtins.py:4242
2918
#: bzrlib/builtins.py:4367
2722
2920
"Branch to merge into, rather than the one containing the working directory."
2725
#: bzrlib/builtins.py:4244
2923
#: bzrlib/builtins.py:4369
2726
2924
msgid "Instead of merging, show a diff of the merge."
2729
#: bzrlib/builtins.py:4246
2927
#: bzrlib/builtins.py:4371
2730
2928
msgid "Select changes interactively."
2929
msgstr "Änderungen interaktiv auswählen."
2733
#: bzrlib/builtins.py:4268
2931
#: bzrlib/builtins.py:4393
2735
2933
"Merging into empty branches not currently supported, "
2736
2934
"https://bugs.launchpad.net/bzr/+bug/308562"
2739
#: bzrlib/builtins.py:4295
2937
#: bzrlib/builtins.py:4420
2740
2938
msgid "Cannot use --uncommitted with bundles or merge directives."
2743
#: bzrlib/builtins.py:4306
2941
#: bzrlib/builtins.py:4431
2744
2942
msgid "Cannot use --uncommitted and --revision at the same time."
2747
#: bzrlib/builtins.py:4326
2945
#: bzrlib/builtins.py:4451
2748
2946
msgid "merger: "
2751
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2949
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2752
2950
msgid "Nothing to do."
2951
msgstr "Nichts zu tun."
2755
#: bzrlib/builtins.py:4332
2953
#: bzrlib/builtins.py:4457
2756
2954
msgid "Cannot pull individual files"
2955
msgstr "Nicht möglich, einzelne Dateien zu laden"
2759
#: bzrlib/builtins.py:4340
2957
#: bzrlib/builtins.py:4465
2760
2958
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2763
#: bzrlib/builtins.py:4398
2961
#: bzrlib/builtins.py:4523
2764
2962
#, python-format
2765
2963
msgid "Show-base is not supported for this merge type. %s"
2768
#: bzrlib/builtins.py:4407
2966
#: bzrlib/builtins.py:4532
2769
2967
#, python-format
2770
2968
msgid "Conflict reduction is not supported for merge type %s."
2773
#: bzrlib/builtins.py:4411
2971
#: bzrlib/builtins.py:4536
2774
2972
msgid "Cannot do conflict reduction and show base."
2777
#: bzrlib/builtins.py:4522
2975
#: bzrlib/builtins.py:4647
2778
2976
msgid "No location specified or remembered"
2781
#: bzrlib/builtins.py:4524
2979
#: bzrlib/builtins.py:4649
2782
2980
msgid "{0} remembered {1} location {2}"
2785
#: bzrlib/builtins.py:4530
2983
#: bzrlib/builtins.py:4655
2786
2984
msgid "Redo a merge."
2789
#: bzrlib/builtins.py:4532
2987
#: bzrlib/builtins.py:4657
2791
2989
"Use this if you want to try a different merge technique while resolving\n"
2792
2990
"conflicts. Some merge techniques are better than others, and remerge\n"
2793
2991
"lets you try different ones on different files."
2796
#: bzrlib/builtins.py:4536
2994
#: bzrlib/builtins.py:4661
2798
2996
"The options for remerge have the same meaning and defaults as the ones for\n"
2799
2997
"merge. The difference is that remerge can (only) be run when there is a\n"
2800
2998
"pending merge, and it lets you specify particular files."
2803
#: bzrlib/builtins.py:4540
3001
#: bzrlib/builtins.py:4665
2806
3004
" Re-do the merge of all conflicted files, and show the base text in\n"
2807
3005
" conflict regions, in addition to the usual THIS and OTHER texts::"
2810
#: bzrlib/builtins.py:4544
3008
#: bzrlib/builtins.py:4669
2811
3009
msgid " bzr remerge --show-base"
3010
msgstr " bzr remerge --show-base"
2814
#: bzrlib/builtins.py:4546
3012
#: bzrlib/builtins.py:4671
2816
3014
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2817
3015
" additional processing to reduce the size of conflict regions::"
2820
#: bzrlib/builtins.py:4549
3018
#: bzrlib/builtins.py:4674
2821
3019
msgid " bzr remerge --merge-type weave --reprocess foobar"
2824
#: bzrlib/builtins.py:4556
3022
#: bzrlib/builtins.py:4681
2825
3023
msgid "Show base revision text in conflicts."
2828
#: bzrlib/builtins.py:4568
3026
#: bzrlib/builtins.py:4693
2830
3028
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2834
#: bzrlib/builtins.py:4624
2835
msgid "Revert files to a previous revision."
3032
#: bzrlib/builtins.py:4751
3034
"Set files in the working tree back to the contents of a previous revision."
2838
#: bzrlib/builtins.py:4626
3037
#: bzrlib/builtins.py:4753
2840
3039
"Giving a list of files will revert only those files. Otherwise, all files\n"
2841
3040
"will be reverted. If the revision is not specified with '--revision', the\n"
2842
"last committed revision is used."
3041
"working tree basis revision is used. A revert operation affects only the\n"
3042
"working tree, not any revision history like the branch and repository or\n"
3043
"the working tree basis revision."
2845
#: bzrlib/builtins.py:4630
3046
#: bzrlib/builtins.py:4759
2847
3048
"To remove only some changes, without reverting to a prior version, use\n"
2848
3049
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2849
3050
"will remove the changes introduced by the second last commit (-2), without\n"
2850
3051
"affecting the changes introduced by the last commit (-1). To remove\n"
2851
"certain changes on a hunk-by-hunk basis, see the shelve command."
3052
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3053
"To update the branch to a specific revision or the latest revision and\n"
3054
"update the working tree accordingly while preserving local changes, see the\n"
2854
#: bzrlib/builtins.py:4636
3058
#: bzrlib/builtins.py:4768
2856
"By default, any files that have been manually changed will be backed up\n"
2857
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2858
"'.~#~' appended to their name, where # is a number."
3060
"Uncommitted changes to files that are reverted will be discarded.\n"
3061
"Howver, by default, any files that have been manually changed will be\n"
3062
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3063
"files have '.~#~' appended to their name, where # is a number."
2861
#: bzrlib/builtins.py:4640
3066
#: bzrlib/builtins.py:4773
2863
3068
"When you provide files, you can use their current pathname or the pathname\n"
2864
3069
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2937
3144
" 0 - no missing revisions"
2940
#: bzrlib/builtins.py:4754
3147
#: bzrlib/builtins.py:4887
2942
3149
" Determine the missing revisions between this and the branch at the\n"
2943
3150
" remembered pull location::"
2946
#: bzrlib/builtins.py:4757
3153
#: bzrlib/builtins.py:4890
2947
3154
msgid " bzr missing"
3155
msgstr " bzr missing"
2950
#: bzrlib/builtins.py:4759
3157
#: bzrlib/builtins.py:4892
2951
3158
msgid " Determine the missing revisions between this and another branch::"
2954
#: bzrlib/builtins.py:4761
3161
#: bzrlib/builtins.py:4894
2955
3162
msgid " bzr missing http://server/branch"
2958
#: bzrlib/builtins.py:4763
3165
#: bzrlib/builtins.py:4896
2960
3167
" Determine the missing revisions up to a specific revision on the other\n"
2964
#: bzrlib/builtins.py:4766
3171
#: bzrlib/builtins.py:4899
2965
3172
msgid " bzr missing -r ..-10"
3173
msgstr " bzr missing -r ..-10"
2968
#: bzrlib/builtins.py:4768
3175
#: bzrlib/builtins.py:4901
2970
3177
" Determine the missing revisions up to a specific revision on this\n"
2974
#: bzrlib/builtins.py:4771
3181
#: bzrlib/builtins.py:4904
2975
3182
msgid " bzr missing --my-revision ..-10"
3183
msgstr " bzr missing --my-revision ..-10"
2978
#: bzrlib/builtins.py:4778
3185
#: bzrlib/builtins.py:4911
2979
3186
msgid "Reverse the order of revisions."
2982
#: bzrlib/builtins.py:4780
3189
#: bzrlib/builtins.py:4913
2983
3190
msgid "Display changes in the local branch only."
3191
msgstr "Nur Änderungen im lokalen Zweig anzeigen."
2986
#: bzrlib/builtins.py:4781
3193
#: bzrlib/builtins.py:4914
2987
3194
msgid "Same as --mine-only."
3195
msgstr "Dasselbe wie --mine-only."
2990
#: bzrlib/builtins.py:4783
3197
#: bzrlib/builtins.py:4916
2991
3198
msgid "Display changes in the remote branch only."
3199
msgstr "Nur Änderungen im entfernten Zweig anzeigen."
2994
#: bzrlib/builtins.py:4784
3201
#: bzrlib/builtins.py:4917
2995
3202
msgid "Same as --theirs-only."
3203
msgstr "Dasselbe wie --theirs-only."
2998
#: bzrlib/builtins.py:4789
3205
#: bzrlib/builtins.py:4922
3000
3207
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3004
#: bzrlib/builtins.py:4793
3211
#: bzrlib/builtins.py:4926
3006
3213
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3010
#: bzrlib/builtins.py:4796
3217
#: bzrlib/builtins.py:4929
3011
3218
msgid "Show all revisions in addition to the mainline ones."
3014
#: bzrlib/builtins.py:4850
3221
#: bzrlib/builtins.py:4983
3015
3222
msgid "No peer location known or specified."
3018
#: bzrlib/builtins.py:4854
3225
#: bzrlib/builtins.py:4987
3019
3226
msgid "Using saved parent location: {0}\n"
3022
#: bzrlib/builtins.py:4887
3229
#: bzrlib/builtins.py:5020
3023
3230
#, python-format
3024
3231
msgid "You have %d extra revision:\n"
3025
3232
msgid_plural "You have %d extra revisions:\n"
3233
msgstr[0] "Sie haben %d zusätzliche Revision:\n"
3234
msgstr[1] "Sie haben %d zusätzliche Revisionen:\n"
3029
#: bzrlib/builtins.py:4903
3236
#: bzrlib/builtins.py:5040
3030
3237
#, python-format
3031
3238
msgid "You are missing %d revision:\n"
3032
3239
msgid_plural "You are missing %d revisions:\n"
3240
msgstr[0] "Ihnen fehlt %d Revision:\n"
3241
msgstr[1] "Ihnen fehlen %d Revisionen:\n"
3036
#: bzrlib/builtins.py:4915
3243
#: bzrlib/builtins.py:5055
3037
3244
msgid "This branch has no new revisions.\n"
3245
msgstr "Dieser Zweig hat keine neuen Revisionen.\n"
3040
#: bzrlib/builtins.py:4918
3247
#: bzrlib/builtins.py:5058
3041
3248
msgid "Other branch has no new revisions.\n"
3249
msgstr "Anderer Zweig hat keine neuen Revisionen.\n"
3044
#: bzrlib/builtins.py:4923
3251
#: bzrlib/builtins.py:5063
3045
3252
msgid "Branches are up to date.\n"
3253
msgstr "Zweige sind aktuell.\n"
3048
#: bzrlib/builtins.py:4934
3255
#: bzrlib/builtins.py:5074
3049
3256
msgid "Compress the data within a repository."
3052
#: bzrlib/builtins.py:4936
3259
#: bzrlib/builtins.py:5076
3054
3261
"This operation compresses the data within a bazaar repository. As\n"
3055
3262
"bazaar supports automatic packing of repository, this operation is\n"
3056
3263
"normally not required to be done manually."
3059
#: bzrlib/builtins.py:4940
3266
#: bzrlib/builtins.py:5080
3061
3268
"During the pack operation, bazaar takes a backup of existing repository\n"
3062
3269
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3108
3315
"plugins using the Python programming language."
3111
#: bzrlib/builtins.py:4998
3318
#: bzrlib/builtins.py:5138
3112
3319
msgid "Show testament (signing-form) of a revision."
3115
#: bzrlib/builtins.py:5001
3322
#: bzrlib/builtins.py:5141
3116
3323
msgid "Produce long-format testament."
3119
#: bzrlib/builtins.py:5003
3326
#: bzrlib/builtins.py:5143
3120
3327
msgid "Produce a strict-format testament."
3123
#: bzrlib/builtins.py:5029
3330
#: bzrlib/builtins.py:5169
3124
3331
msgid "Show the origin of each line in a file."
3332
msgstr "Ursprung jeder Zeile in einer Datei anzeigen."
3127
#: bzrlib/builtins.py:5031
3334
#: bzrlib/builtins.py:5171
3129
3336
"This prints out the given file with an annotation on the left side\n"
3130
3337
"indicating which revision, author and date introduced the change."
3133
#: bzrlib/builtins.py:5034
3340
#: bzrlib/builtins.py:5174
3135
3342
"If the origin is the same for a run of consecutive lines, it is\n"
3136
3343
"shown only at the top, unless the --all option is given."
3139
#: bzrlib/builtins.py:5042
3346
#: bzrlib/builtins.py:5182
3140
3347
msgid "Show annotations on all lines."
3143
#: bzrlib/builtins.py:5043
3350
#: bzrlib/builtins.py:5183
3144
3351
msgid "Show commit date in annotations."
3147
#: bzrlib/builtins.py:5130
3354
#: bzrlib/builtins.py:5270
3148
3355
msgid "Cannot sign a range of non-revision-history revisions"
3151
#: bzrlib/builtins.py:5142
3358
#: bzrlib/builtins.py:5282
3152
3359
msgid "Please supply either one revision, or a range."
3360
msgstr "Bitte geben Sie entweder eine Revision oder einen Bereich an."
3155
#: bzrlib/builtins.py:5146
3362
#: bzrlib/builtins.py:5286
3157
3364
"Convert the current branch into a checkout of the supplied branch.\n"
3158
3365
"If no branch is supplied, rebind to the last bound location."
3161
#: bzrlib/builtins.py:5149
3368
#: bzrlib/builtins.py:5289
3163
3370
"Once converted into a checkout, commits must succeed on the master branch\n"
3164
3371
"before they will be applied to the local branch."
3167
#: bzrlib/builtins.py:5152
3374
#: bzrlib/builtins.py:5292
3169
3376
"Bound branches use the nickname of its master branch unless it is set\n"
3170
3377
"locally, in which case binding will update the local nickname to be\n"
3171
3378
"that of the master."
3174
#: bzrlib/builtins.py:5167
3381
#: bzrlib/builtins.py:5307
3175
3382
msgid "No location supplied. This format does not remember old locations."
3178
#: bzrlib/builtins.py:5172
3385
#: bzrlib/builtins.py:5313
3179
3386
msgid "Branch is already bound"
3182
#: bzrlib/builtins.py:5174
3389
#: bzrlib/builtins.py:5316
3183
3390
msgid "No location supplied and no previous location known"
3186
#: bzrlib/builtins.py:5180
3393
#: bzrlib/builtins.py:5322
3187
3394
msgid "These branches have diverged. Try merging, and then bind again."
3190
#: bzrlib/builtins.py:5187
3397
#: bzrlib/builtins.py:5329
3191
3398
msgid "Convert the current checkout into a regular branch."
3194
#: bzrlib/builtins.py:5189
3401
#: bzrlib/builtins.py:5331
3196
3403
"After unbinding, the local branch is considered independent and subsequent\n"
3197
3404
"commits will be local only."
3200
#: bzrlib/builtins.py:5200
3407
#: bzrlib/builtins.py:5342
3201
3408
msgid "Local branch is not bound"
3204
#: bzrlib/builtins.py:5204
3411
#: bzrlib/builtins.py:5346
3205
3412
msgid "Remove the last committed revision."
3208
#: bzrlib/builtins.py:5206
3415
#: bzrlib/builtins.py:5348
3210
3417
"--verbose will print out what is being removed.\n"
3211
3418
"--dry-run will go through all the motions, but not actually\n"
3212
3419
"remove anything."
3215
#: bzrlib/builtins.py:5210
3422
#: bzrlib/builtins.py:5352
3217
3424
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3218
3425
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3219
3426
"branch at revision 15."
3222
#: bzrlib/builtins.py:5214
3429
#: bzrlib/builtins.py:5356
3224
3431
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3225
3432
"it may make is to restore any pending merges that were present before\n"
3229
#: bzrlib/builtins.py:5225
3436
#: bzrlib/builtins.py:5367
3230
3437
msgid "Don't actually make changes."
3438
msgstr "Keine Änderungen durchführen."
3233
#: bzrlib/builtins.py:5226
3440
#: bzrlib/builtins.py:5368
3234
3441
msgid "Say yes to all questions."
3442
msgstr "Alle Fragen mit Ja beantworten."
3237
#: bzrlib/builtins.py:5228
3444
#: bzrlib/builtins.py:5370
3238
3445
msgid "Keep tags that point to removed revisions."
3241
#: bzrlib/builtins.py:5230
3448
#: bzrlib/builtins.py:5372
3242
3449
msgid "Only remove the commits from the local branch when in a checkout."
3245
#: bzrlib/builtins.py:5279
3452
#: bzrlib/builtins.py:5421
3246
3453
msgid "No revisions to uncommit.\n"
3249
#: bzrlib/builtins.py:5294
3456
#: bzrlib/builtins.py:5436
3250
3457
msgid "Dry-run, pretending to remove the above revisions.\n"
3459
"Testlauf, es wird so getan, als ob die obigen Revisionen entfernt würden.\n"
3253
#: bzrlib/builtins.py:5297
3461
#: bzrlib/builtins.py:5439
3254
3462
msgid "The above revision(s) will be removed.\n"
3463
msgstr "Oben stehende Revision(en) wird/werden entfernt.\n"
3257
#: bzrlib/builtins.py:5301
3465
#: bzrlib/builtins.py:5443
3258
3466
msgid "Uncommit these revisions"
3261
#: bzrlib/builtins.py:5304
3469
#: bzrlib/builtins.py:5446
3262
3470
msgid "Canceled\n"
3471
msgstr "Abgebrochen\n"
3265
#: bzrlib/builtins.py:5311
3473
#: bzrlib/builtins.py:5453
3266
3474
#, python-format
3268
3476
"You can restore the old tip by running:\n"
3269
3477
" bzr pull . -r revid:%s\n"
3272
#: bzrlib/builtins.py:5316
3480
#: bzrlib/builtins.py:5458
3273
3481
msgid "Break a dead lock."
3276
#: bzrlib/builtins.py:5318
3484
#: bzrlib/builtins.py:5460
3278
3486
"This command breaks a lock on a repository, branch, working directory or\n"
3282
#: bzrlib/builtins.py:5321
3490
#: bzrlib/builtins.py:5463
3284
3492
"CAUTION: Locks should only be broken when you are sure that the process\n"
3285
3493
"holding the lock has been stopped."
3288
#: bzrlib/builtins.py:5324
3496
#: bzrlib/builtins.py:5466
3290
3498
"You can get information on what locks are open via the 'bzr info\n"
3291
3499
"[location]' command."
3294
#: bzrlib/builtins.py:5327
3502
#: bzrlib/builtins.py:5469
3297
3505
" bzr break-lock\n"
3347
3559
"uncontrolled write access to your file system."
3350
#: bzrlib/builtins.py:5403
3562
#: bzrlib/builtins.py:5546
3351
3563
msgid "Override the default idle client timeout (5min)."
3354
#: bzrlib/builtins.py:5453
3566
#: bzrlib/builtins.py:5564
3355
3567
msgid "Combine a tree into its containing tree."
3358
#: bzrlib/builtins.py:5455
3570
#: bzrlib/builtins.py:5566
3359
3571
msgid "This command requires the target tree to be in a rich-root format."
3362
#: bzrlib/builtins.py:5457
3574
#: bzrlib/builtins.py:5568
3364
3576
"The TREE argument should be an independent tree, inside another tree, but\n"
3365
3577
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3366
3578
"running \"bzr branch\" with the target inside a tree.)"
3369
#: bzrlib/builtins.py:5461
3581
#: bzrlib/builtins.py:5572
3371
3583
"The result is a combined tree, with the subtree no longer an independent\n"
3372
3584
"part. This is marked as a merge of the subtree into the containing tree,\n"
3373
3585
"and all history is preserved."
3376
#: bzrlib/builtins.py:5479
3588
#: bzrlib/builtins.py:5590
3377
3589
#, python-format
3379
3591
"Can't join trees because %s doesn't support rich root data.\n"
3380
3592
"You can use bzr upgrade on the repository."
3383
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3595
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3384
3596
msgid "Cannot join {0}. {1}"
3387
#: bzrlib/builtins.py:5499
3599
#: bzrlib/builtins.py:5610
3388
3600
msgid "Split a subdirectory of a tree into a separate tree."
3391
#: bzrlib/builtins.py:5501
3603
#: bzrlib/builtins.py:5612
3393
3605
"This command will produce a target tree in a format that supports\n"
3394
3606
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3395
3607
"converted into earlier formats like 'dirstate-tags'."
3398
#: bzrlib/builtins.py:5505
3610
#: bzrlib/builtins.py:5616
3400
3612
"The TREE argument should be a subdirectory of a working tree. That\n"
3401
3613
"subdirectory will be converted into an independent tree, with its own\n"
3402
3614
"branch. Commits in the top-level tree will not apply to the new subtree."
3405
#: bzrlib/builtins.py:5585
3617
#: bzrlib/builtins.py:5696
3406
3618
msgid "No submit branch specified or known"
3409
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3621
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3410
3622
msgid "No public branch specified or known"
3413
#: bzrlib/builtins.py:5598
3625
#: bzrlib/builtins.py:5710
3414
3626
msgid "bzr merge-directive takes at most two one revision identifiers"
3417
#: bzrlib/builtins.py:5607
3629
#: bzrlib/builtins.py:5719
3418
3630
msgid "No revisions to bundle."
3421
#: bzrlib/builtins.py:5626
3633
#: bzrlib/builtins.py:5738
3422
3634
msgid "Mail or create a merge-directive for submitting changes."
3425
#: bzrlib/builtins.py:5628
3637
#: bzrlib/builtins.py:5740
3426
3638
msgid "A merge directive provides many things needed for requesting merges:"
3429
#: bzrlib/builtins.py:5630
3641
#: bzrlib/builtins.py:5742
3430
3642
msgid "* A machine-readable description of the merge to perform"
3433
#: bzrlib/builtins.py:5632
3645
#: bzrlib/builtins.py:5744
3434
3646
msgid "* An optional patch that is a preview of the changes requested"
3648
"* Ein optionaler Patch, der eine Vorschau der gewünschten Änderungen "
3437
#: bzrlib/builtins.py:5634
3651
#: bzrlib/builtins.py:5746
3439
3653
"* An optional bundle of revision data, so that the changes can be applied\n"
3440
3654
" directly from the merge directive, without retrieving data from a\n"
3444
#: bzrlib/builtins.py:5638
3658
#: bzrlib/builtins.py:5750
3446
3660
"`bzr send` creates a compact data set that, when applied using bzr\n"
3447
3661
"merge, has the same effect as merging from the source branch. "
3450
#: bzrlib/builtins.py:5641
3664
#: bzrlib/builtins.py:5753
3452
3666
"By default the merge directive is self-contained and can be applied to any\n"
3453
3667
"branch containing submit_branch in its ancestory without needing access to\n"
3454
3668
"the source branch."
3457
#: bzrlib/builtins.py:5645
3671
#: bzrlib/builtins.py:5757
3459
3673
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3460
3674
"revisions, but only a structured request to merge from the\n"
3546
3760
"set them, and use `bzr info` to display them."
3549
#: bzrlib/builtins.py:5720
3763
#: bzrlib/builtins.py:5832
3550
3764
msgid "Write merge directive to this file or directory; use - for stdout."
3553
#: bzrlib/builtins.py:5724
3767
#: bzrlib/builtins.py:5836
3555
3769
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3556
3770
"strict disables the check."
3559
#: bzrlib/builtins.py:5726
3773
#: bzrlib/builtins.py:5838
3560
3774
msgid "Mail the request to this address."
3775
msgstr "Die Anfrage an diese Adresse schicken."
3563
#: bzrlib/builtins.py:5730
3777
#: bzrlib/builtins.py:5842
3564
3778
msgid "Body for the email."
3779
msgstr "Inhalt der E-Mail."
3567
#: bzrlib/builtins.py:5783
3781
#: bzrlib/builtins.py:5895
3568
3782
msgid "Do not include a bundle in the merge directive."
3571
#: bzrlib/builtins.py:5784
3785
#: bzrlib/builtins.py:5896
3572
3786
msgid "Do not include a preview patch in the merge directive."
3575
#: bzrlib/builtins.py:5787
3789
#: bzrlib/builtins.py:5899
3576
3790
msgid "Remember submit and public branch."
3579
#: bzrlib/builtins.py:5789
3793
#: bzrlib/builtins.py:5901
3581
3795
"Branch to generate the submission from, rather than the one containing the "
3582
3796
"working directory."
3585
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3799
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3589
#: bzrlib/builtins.py:5800
3803
#: bzrlib/builtins.py:5912
3590
3804
msgid "Use the specified output format."
3805
msgstr "Das angegebene Ausgabeformat benutzen."
3593
#: bzrlib/builtins.py:5822
3807
#: bzrlib/builtins.py:5934
3594
3808
msgid "Create, remove or modify a tag naming a revision."
3597
#: bzrlib/builtins.py:5824
3811
#: bzrlib/builtins.py:5936
3599
3813
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3600
3814
"(--revision) option can be given -rtag:X, where X is any previously\n"
3604
#: bzrlib/builtins.py:5828
3818
#: bzrlib/builtins.py:5940
3606
3820
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3607
3821
"along when you branch, push, pull or merge."
3610
#: bzrlib/builtins.py:5831
3824
#: bzrlib/builtins.py:5943
3612
3826
"It is an error to give a tag name that already exists unless you pass\n"
3613
3827
"--force, in which case the tag is moved to point to the new revision."
3616
#: bzrlib/builtins.py:5834
3830
#: bzrlib/builtins.py:5946
3618
3832
"To rename a tag (change the name but keep it on the same revsion), run "
3620
3834
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3623
#: bzrlib/builtins.py:5837
3837
#: bzrlib/builtins.py:5949
3625
3839
"If no tag name is specified it will be determined through the \n"
3626
3840
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3708
3922
"If none of these is available, --bind-to must be specified."
3711
#: bzrlib/builtins.py:5998
3925
#: bzrlib/builtins.py:6110
3712
3926
msgid "Tree type"
3715
#: bzrlib/builtins.py:5999
3929
#: bzrlib/builtins.py:6111
3716
3930
msgid "The relation between branch and tree."
3719
#: bzrlib/builtins.py:6001
3933
#: bzrlib/builtins.py:6113
3720
3934
msgid "Reconfigure to be an unbound branch with no working tree."
3723
#: bzrlib/builtins.py:6002
3937
#: bzrlib/builtins.py:6114
3724
3938
msgid "Reconfigure to be an unbound branch with a working tree."
3727
#: bzrlib/builtins.py:6003
3941
#: bzrlib/builtins.py:6115
3728
3942
msgid "Reconfigure to be a bound branch with a working tree."
3731
#: bzrlib/builtins.py:6004
3945
#: bzrlib/builtins.py:6116
3732
3946
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3735
#: bzrlib/builtins.py:6009
3949
#: bzrlib/builtins.py:6121
3736
3950
msgid "Repository type"
3739
#: bzrlib/builtins.py:6010
3953
#: bzrlib/builtins.py:6122
3740
3954
msgid "Location fo the repository."
3743
#: bzrlib/builtins.py:6012
3957
#: bzrlib/builtins.py:6124
3745
3959
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3748
#: bzrlib/builtins.py:6014
3962
#: bzrlib/builtins.py:6126
3749
3963
msgid "Reconfigure to use a shared repository."
3752
#: bzrlib/builtins.py:6018
3966
#: bzrlib/builtins.py:6130
3753
3967
msgid "Trees in Repository"
3756
#: bzrlib/builtins.py:6019
3970
#: bzrlib/builtins.py:6131
3757
3971
msgid "Whether new branches in the repository have trees."
3760
#: bzrlib/builtins.py:6021
3974
#: bzrlib/builtins.py:6133
3762
3976
"Reconfigure repository to create working trees on branches by default."
3765
#: bzrlib/builtins.py:6023
3979
#: bzrlib/builtins.py:6135
3767
3981
"Reconfigure repository to not create working trees on branches by default."
3770
#: bzrlib/builtins.py:6026
3984
#: bzrlib/builtins.py:6138
3771
3985
msgid "Branch to bind checkout to."
3774
#: bzrlib/builtins.py:6028
3988
#: bzrlib/builtins.py:6140
3775
3989
msgid "Perform reconfiguration even if local changes will be lost."
3778
#: bzrlib/builtins.py:6031
3992
#: bzrlib/builtins.py:6143
3779
3993
msgid "Reconfigure a branch to be stacked on another branch."
3782
#: bzrlib/builtins.py:6035
3996
#: bzrlib/builtins.py:6147
3784
3998
"Reconfigure a branch to be unstacked. This may require copying substantial "
3785
3999
"data into it."
3788
#: bzrlib/builtins.py:6045
4002
#: bzrlib/builtins.py:6157
3789
4003
msgid "Can't use both --stacked-on and --unstacked"
4005
"Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
3792
#: bzrlib/builtins.py:6059
4007
#: bzrlib/builtins.py:6171
3793
4008
msgid "No target configuration specified"
4009
msgstr "Keine Zielkonfiguration angegeben"
3796
#: bzrlib/builtins.py:6094
4011
#: bzrlib/builtins.py:6206
3797
4012
msgid "Set the branch of a checkout and update."
4013
msgstr "Branch eines Checkout setzen und aktualisieren."
3800
#: bzrlib/builtins.py:6096
4015
#: bzrlib/builtins.py:6208
3802
4017
"For lightweight checkouts, this changes the branch being referenced.\n"
3803
4018
"For heavyweight checkouts, this checks that there are no local commits\n"
3876
4091
"want to switch back to your view after that."
3879
#: bzrlib/builtins.py:6228
4094
#: bzrlib/builtins.py:6305
3882
4097
" To define the current view::"
3885
#: bzrlib/builtins.py:6231
4100
#: bzrlib/builtins.py:6308
3886
4101
msgid " bzr view file1 dir1 ..."
3889
#: bzrlib/builtins.py:6233
4104
#: bzrlib/builtins.py:6310
3890
4105
msgid " To list the current view::"
3893
#: bzrlib/builtins.py:6235
4108
#: bzrlib/builtins.py:6312
3894
4109
msgid " bzr view"
3897
#: bzrlib/builtins.py:6237
4112
#: bzrlib/builtins.py:6314
3898
4113
msgid " To delete the current view::"
3901
#: bzrlib/builtins.py:6239
4116
#: bzrlib/builtins.py:6316
3902
4117
msgid " bzr view --delete"
4118
msgstr " bzr view --delete"
3905
#: bzrlib/builtins.py:6241
4120
#: bzrlib/builtins.py:6318
3906
4121
msgid " To disable the current view without deleting it::"
3909
#: bzrlib/builtins.py:6243
4124
#: bzrlib/builtins.py:6320
3910
4125
msgid " bzr view --switch off"
4126
msgstr " bzr view --switch off"
3913
#: bzrlib/builtins.py:6245
4128
#: bzrlib/builtins.py:6322
3914
4129
msgid " To define a named view and switch to it::"
3917
#: bzrlib/builtins.py:6247
4132
#: bzrlib/builtins.py:6324
3918
4133
msgid " bzr view --name view-name file1 dir1 ..."
3921
#: bzrlib/builtins.py:6249
4136
#: bzrlib/builtins.py:6326
3922
4137
msgid " To list a named view::"
3925
#: bzrlib/builtins.py:6251
4140
#: bzrlib/builtins.py:6328
3926
4141
msgid " bzr view --name view-name"
3929
#: bzrlib/builtins.py:6253
4144
#: bzrlib/builtins.py:6330
3930
4145
msgid " To delete a named view::"
3933
#: bzrlib/builtins.py:6255
4148
#: bzrlib/builtins.py:6332
3934
4149
msgid " bzr view --name view-name --delete"
3937
#: bzrlib/builtins.py:6257
4152
#: bzrlib/builtins.py:6334
3938
4153
msgid " To switch to a named view::"
3941
#: bzrlib/builtins.py:6259
4156
#: bzrlib/builtins.py:6336
3942
4157
msgid " bzr view --switch view-name"
3945
#: bzrlib/builtins.py:6261
4160
#: bzrlib/builtins.py:6338
3946
4161
msgid " To list all views defined::"
3949
#: bzrlib/builtins.py:6263
4164
#: bzrlib/builtins.py:6340
3950
4165
msgid " bzr view --all"
4166
msgstr " bzr view --all"
3953
#: bzrlib/builtins.py:6265
4168
#: bzrlib/builtins.py:6342
3954
4169
msgid " To delete all views::"
3957
#: bzrlib/builtins.py:6267
4172
#: bzrlib/builtins.py:6344
3958
4173
msgid " bzr view --delete --all"
4174
msgstr " bzr view --delete --all"
3961
#: bzrlib/builtins.py:6274
4176
#: bzrlib/builtins.py:6351
3962
4177
msgid "Apply list or delete action to all views."
3965
#: bzrlib/builtins.py:6277
4180
#: bzrlib/builtins.py:6354
3966
4181
msgid "Delete the view."
3969
#: bzrlib/builtins.py:6280
4184
#: bzrlib/builtins.py:6357
3970
4185
msgid "Name of the view to define, list or delete."
3973
#: bzrlib/builtins.py:6284
4188
#: bzrlib/builtins.py:6361
3974
4189
msgid "Name of the view to switch to."
3977
#: bzrlib/builtins.py:6303
4192
#: bzrlib/builtins.py:6380
3978
4193
msgid "Both --delete and a file list specified"
3981
#: bzrlib/builtins.py:6306
4196
#: bzrlib/builtins.py:6383
3982
4197
msgid "Both --delete and --switch specified"
3985
#: bzrlib/builtins.py:6309
4200
#: bzrlib/builtins.py:6386
3986
4201
msgid "Deleted all views.\n"
3989
#: bzrlib/builtins.py:6311
4204
#: bzrlib/builtins.py:6388
3990
4205
msgid "No current view to delete"
3993
#: bzrlib/builtins.py:6314
4208
#: bzrlib/builtins.py:6391
3994
4209
#, python-format
3995
4210
msgid "Deleted '%s' view.\n"
3998
#: bzrlib/builtins.py:6318
4213
#: bzrlib/builtins.py:6395
3999
4214
msgid "Both --switch and a file list specified"
4002
#: bzrlib/builtins.py:6321
4217
#: bzrlib/builtins.py:6398
4003
4218
msgid "Both --switch and --all specified"
4006
#: bzrlib/builtins.py:6324
4221
#: bzrlib/builtins.py:6401
4007
4222
msgid "No current view to disable"
4010
#: bzrlib/builtins.py:6326
4225
#: bzrlib/builtins.py:6403
4011
4226
#, python-format
4012
4227
msgid "Disabled '%s' view.\n"
4015
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4230
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4016
4231
msgid "Using '{0}' view: {1}\n"
4019
#: bzrlib/builtins.py:6333
4234
#: bzrlib/builtins.py:6410
4020
4235
msgid "Views defined:\n"
4023
#: bzrlib/builtins.py:6342
4238
#: bzrlib/builtins.py:6419
4024
4239
msgid "No views defined.\n"
4027
#: bzrlib/builtins.py:6349
4242
#: bzrlib/builtins.py:6426
4028
4243
msgid "Cannot change the 'off' pseudo view"
4031
#: bzrlib/builtins.py:6357
4246
#: bzrlib/builtins.py:6434
4032
4247
msgid "No current view.\n"
4035
#: bzrlib/builtins.py:6360
4250
#: bzrlib/builtins.py:6437
4036
4251
msgid "'{0}' view is: {1}\n"
4039
#: bzrlib/builtins.py:6380
4254
#: bzrlib/builtins.py:6457
4040
4255
msgid " <no hooks installed>\n"
4043
#: bzrlib/builtins.py:6384
4258
#: bzrlib/builtins.py:6461
4044
4259
msgid "Remove a branch."
4260
msgstr "Einen Zweig entfernen."
4047
#: bzrlib/builtins.py:6386
4262
#: bzrlib/builtins.py:6463
4049
4264
"This will remove the branch from the specified location but \n"
4050
4265
"will keep any working tree or repository in place."
4053
#: bzrlib/builtins.py:6391
4268
#: bzrlib/builtins.py:6468
4054
4269
msgid " Remove the branch at repo/trunk::"
4057
#: bzrlib/builtins.py:6393
4272
#: bzrlib/builtins.py:6470
4058
4273
msgid " bzr remove-branch repo/trunk"
4061
#: bzrlib/builtins.py:6408
4274
msgstr " bzr remove-branch repo/trunk"
4276
#: bzrlib/builtins.py:6477
4277
msgid "Remove branch even if it is the active branch."
4278
msgstr "Zweig entfernen, selbst wenn es ein aktiver Zweig ist."
4280
#: bzrlib/builtins.py:6491
4281
msgid "Branch is active. Use --force to remove it."
4282
msgstr "Zweig ist aktiv. Benutzen Sie --force, um ihn zu entfernen."
4284
#: bzrlib/builtins.py:6495
4062
4285
msgid "Plaintext diff output."
4065
#: bzrlib/builtins.py:6409
4288
#: bzrlib/builtins.py:6496
4066
4289
msgid "Temporarily set aside some changes from the current tree."
4069
#: bzrlib/builtins.py:6411
4292
#: bzrlib/builtins.py:6498
4071
4294
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4072
4295
"ie. out of the way, until a later time when you can bring them back from\n"
4127
#: bzrlib/builtins.py:6450
4350
#: bzrlib/builtins.py:6537
4128
4351
msgid "Shelve all changes."
4131
#: bzrlib/builtins.py:6452
4354
#: bzrlib/builtins.py:6539
4132
4355
msgid "Method to use for writing diffs."
4135
#: bzrlib/builtins.py:6452
4358
#: bzrlib/builtins.py:6539
4139
#: bzrlib/builtins.py:6456
4362
#: bzrlib/builtins.py:6543
4140
4363
msgid "List shelved changes."
4143
#: bzrlib/builtins.py:6458
4366
#: bzrlib/builtins.py:6545
4144
4367
msgid "Destroy removed changes instead of shelving them."
4147
#: bzrlib/builtins.py:6487
4370
#: bzrlib/builtins.py:6574
4148
4371
msgid "No shelved changes."
4151
#: bzrlib/builtins.py:6498
4374
#: bzrlib/builtins.py:6585
4152
4375
msgid "Restore shelved changes."
4155
#: bzrlib/builtins.py:6500
4378
#: bzrlib/builtins.py:6587
4157
4380
"By default, the most recently shelved changes are restored. However if you\n"
4158
4381
"specify a shelf by id those changes will be restored instead. This works\n"
4159
4382
"best when the changes don't depend on each other."
4162
#: bzrlib/builtins.py:6509
4385
#: bzrlib/builtins.py:6596
4163
4386
msgid "The action to perform."
4387
msgstr "Die auszuführende Aktion."
4166
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4389
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4170
#: bzrlib/builtins.py:6511
4393
#: bzrlib/builtins.py:6598
4171
4394
msgid "Apply changes and remove from the shelf."
4174
#: bzrlib/builtins.py:6512
4397
#: bzrlib/builtins.py:6599
4175
4398
msgid "Show changes, but do not apply or remove them."
4399
msgstr "Änderungen anzeigen, aber nicht anwenden oder entfernen."
4178
#: bzrlib/builtins.py:6513
4401
#: bzrlib/builtins.py:6600
4180
4403
"Instead of unshelving the changes, show the diff that would result from "
4184
#: bzrlib/builtins.py:6515
4407
#: bzrlib/builtins.py:6602
4185
4408
msgid "Delete changes without applying them."
4409
msgstr "Änderungen löschen ohne diese anzuwenden."
4188
#: bzrlib/builtins.py:6516
4411
#: bzrlib/builtins.py:6603
4189
4412
msgid "Apply changes but don't delete them."
4413
msgstr "Änderungen anwenden, aber diese nicht löschen."
4192
#: bzrlib/builtins.py:6531
4415
#: bzrlib/builtins.py:6618
4193
4416
msgid "Remove unwanted files from working tree."
4196
#: bzrlib/builtins.py:6533
4419
#: bzrlib/builtins.py:6620
4198
4421
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4199
4422
"files are never deleted."
4202
#: bzrlib/builtins.py:6536
4425
#: bzrlib/builtins.py:6623
4204
4427
"Another class is 'detritus', which includes files emitted by bzr during\n"
4205
4428
"normal operations and selftests. (The value of these files decreases with\n"
4209
#: bzrlib/builtins.py:6540
4432
#: bzrlib/builtins.py:6627
4211
4434
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4212
4435
"flags are respected, and may be combined."
4215
#: bzrlib/builtins.py:6543
4438
#: bzrlib/builtins.py:6630
4216
4439
msgid "To check what clean-tree will do, use --dry-run."
4440
msgstr "Um zu prüfen, was clean-tree tun wird, --dry-run benutzen."
4219
#: bzrlib/builtins.py:6546
4442
#: bzrlib/builtins.py:6633
4220
4443
msgid "Delete all ignored files."
4444
msgstr "Alle ignorierten Dateien löschen."
4223
#: bzrlib/builtins.py:6547
4446
#: bzrlib/builtins.py:6634
4225
4448
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4228
#: bzrlib/builtins.py:6550
4451
#: bzrlib/builtins.py:6637
4229
4452
msgid "Delete files unknown to bzr (default)."
4453
msgstr "Dateien löschen, die bzr nicht bekannt sind (Vorgabe)."
4232
#: bzrlib/builtins.py:6551
4455
#: bzrlib/builtins.py:6638
4233
4456
msgid "Show files to delete instead of deleting them."
4457
msgstr "Dateien zum Löschen anzeigen, anstelle diese zu löschen."
4236
#: bzrlib/builtins.py:6553
4459
#: bzrlib/builtins.py:6640
4237
4460
msgid "Do not prompt before deleting."
4461
msgstr "Vor dem Löschen nicht nachfragen."
4240
4463
#: bzrlib/bundle/__init__.py:59
4241
4464
msgid "A directory cannot be a bundle"
5128
#: bzrlib/errors.py:799
5382
#: bzrlib/errors.py:818
5129
5383
msgid "Revision is not compatible with %(repo_format)s"
5384
msgstr "Die Revision ist inkompatibel zu %(repo_format)s"
5132
#: bzrlib/errors.py:809
5386
#: bzrlib/errors.py:828
5133
5387
msgid "%(context_info)s%(path)s is already versioned."
5388
msgstr "%(context_info)s%(path)s ist bereits versioniert."
5136
#: bzrlib/errors.py:830
5390
#: bzrlib/errors.py:849
5137
5391
msgid "%(context_info)s%(path)s is not versioned."
5392
msgstr "%(context_info)s%(path)s ist nicht versioniert."
5140
#: bzrlib/errors.py:851
5394
#: bzrlib/errors.py:870
5141
5395
msgid "Path(s) are not versioned: %(paths_as_string)s"
5396
msgstr "Pfad(e) ist/sind nicht versioniert: %(paths_as_string)s"
5144
#: bzrlib/errors.py:862
5398
#: bzrlib/errors.py:881
5145
5399
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5400
msgstr "Pfad(e) existiert/existieren nicht: %(paths_as_string)s%(extra)s"
5148
#: bzrlib/errors.py:881
5402
#: bzrlib/errors.py:900
5149
5403
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5152
#: bzrlib/errors.py:889
5406
#: bzrlib/errors.py:908
5154
5408
"Filename %(filename)r is not valid in your current filesystem encoding "
5155
5409
"%(fs_encoding)s"
5158
#: bzrlib/errors.py:900
5412
#: bzrlib/errors.py:919
5159
5413
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5162
#: bzrlib/errors.py:918
5416
#: bzrlib/errors.py:937
5163
5417
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5166
#: bzrlib/errors.py:957
5420
#: bzrlib/errors.py:976
5167
5421
msgid "Cannot lock %(lock)s: %(why)s"
5170
#: bzrlib/errors.py:967
5424
#: bzrlib/errors.py:986
5172
5426
"A transaction related operation was attempted after the transaction finished."
5175
#: bzrlib/errors.py:994
5429
#: bzrlib/errors.py:1013
5176
5430
msgid "Cannot lock: transport is read only: %(transport)s"
5179
#: bzrlib/errors.py:1002
5433
#: bzrlib/errors.py:1021
5180
5434
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5183
#: bzrlib/errors.py:1013
5437
#: bzrlib/errors.py:1032
5185
5439
"Lock was broken while still open: %(lock)s - check storage consistency!"
5188
#: bzrlib/errors.py:1024
5442
#: bzrlib/errors.py:1043
5190
5444
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5191
5445
"%(holder)r, wanted to break %(target)r"
5194
#: bzrlib/errors.py:1036
5448
#: bzrlib/errors.py:1055
5196
5450
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5197
5451
"Use 'bzr break-lock' to clear it"
5200
#: bzrlib/errors.py:1049
5454
#: bzrlib/errors.py:1068
5201
5455
msgid "Lock not held: %(lock)s"
5204
#: bzrlib/errors.py:1078
5458
#: bzrlib/errors.py:1097
5205
5459
msgid "No changes to commit"
5208
#: bzrlib/errors.py:1083
5462
#: bzrlib/errors.py:1102
5210
5464
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5213
#: bzrlib/errors.py:1093
5467
#: bzrlib/errors.py:1112
5215
5469
"Excluding paths during commit is not supported by repository at "
5216
5470
"%(repository)r."
5219
#: bzrlib/errors.py:1102
5473
#: bzrlib/errors.py:1121
5221
5475
"The specified commit message contains characters unsupported by the current "
5225
#: bzrlib/errors.py:1108
5479
#: bzrlib/errors.py:1127
5226
5480
msgid "Upgrade URL cannot work with readonly URLs."
5229
#: bzrlib/errors.py:1113
5483
#: bzrlib/errors.py:1132
5230
5484
msgid "The branch format %(format)s is already at the most recent format."
5233
#: bzrlib/errors.py:1136
5487
#: bzrlib/errors.py:1155
5234
5488
msgid "Option --change does not accept revision ranges"
5489
msgstr "Die Option --change akzeptiert keine Revisionsbereiche"
5237
#: bzrlib/errors.py:1141
5491
#: bzrlib/errors.py:1160
5238
5492
msgid "No namespace registered for string: %(spec)r"
5241
#: bzrlib/errors.py:1160
5495
#: bzrlib/errors.py:1179
5243
5497
"Requested revision: '%(spec)s' does not exist in branch: "
5244
5498
"%(branch_url)s%(extra)s"
5500
"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: "
5501
"%(branch_url)s%(extra)s"
5247
#: bzrlib/errors.py:1174
5503
#: bzrlib/errors.py:1193
5249
5505
"Operation denied because it would change the main history, which is not "
5250
5506
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5253
#: bzrlib/errors.py:1185
5509
#: bzrlib/errors.py:1204
5255
5511
"These branches have diverged. Use the missing command to see how.\n"
5256
5512
"Use the merge command to reconcile them."
5259
#: bzrlib/errors.py:1205
5515
#: bzrlib/errors.py:1224
5261
5517
"Branches have no common ancestor, and no merge base revision was specified."
5264
#: bzrlib/errors.py:1211
5520
#: bzrlib/errors.py:1230
5266
5522
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5269
#: bzrlib/errors.py:1217
5525
#: bzrlib/errors.py:1236
5270
5526
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5273
#: bzrlib/errors.py:1226
5529
#: bzrlib/errors.py:1245
5275
5531
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5278
#: bzrlib/errors.py:1235
5534
#: bzrlib/errors.py:1254
5279
5535
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5282
#: bzrlib/errors.py:1244
5538
#: bzrlib/errors.py:1263
5283
5539
msgid "Branch %(branch)s has no commits."
5286
#: bzrlib/errors.py:1262
5542
#: bzrlib/errors.py:1281
5288
5544
"Bound branch %(branch)s is out of date with master branch "
5289
5545
"%(master)s.%(extra_help)s"
5292
#: bzrlib/errors.py:1274
5548
#: bzrlib/errors.py:1293
5294
5550
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5295
5551
"bound to %(remote)s."
5298
#: bzrlib/errors.py:1286
5554
#: bzrlib/errors.py:1305
5299
5555
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5302
#: bzrlib/errors.py:1295
5558
#: bzrlib/errors.py:1314
5304
5560
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5308
#: bzrlib/errors.py:1307
5564
#: bzrlib/errors.py:1326
5309
5565
msgid "Error in processing weave: %(msg)s"
5312
#: bzrlib/errors.py:1316
5568
#: bzrlib/errors.py:1335
5313
5569
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5570
msgstr "Revision {%(revision_id)s} ist bereits in %(weave)s vorhanden"
5316
#: bzrlib/errors.py:1327
5572
#: bzrlib/errors.py:1346
5317
5573
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5574
msgstr "Revision {%(revision_id)s} ist nicht in %(weave)s vorhanden"
5320
#: bzrlib/errors.py:1337
5576
#: bzrlib/errors.py:1356
5321
5577
msgid "Weave invariant violated: %(what)s"
5324
#: bzrlib/errors.py:1346
5580
#: bzrlib/errors.py:1365
5325
5581
msgid "Parents are mismatched between two revisions. %(msg)s"
5328
#: bzrlib/errors.py:1368
5584
#: bzrlib/errors.py:1387
5330
5586
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5334
#: bzrlib/errors.py:1380
5590
#: bzrlib/errors.py:1399
5335
5591
msgid "Versioned file error"
5592
msgstr "Fehler bei versionierter Datei"
5338
#: bzrlib/errors.py:1385
5594
#: bzrlib/errors.py:1404
5339
5595
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5596
msgstr "Revision {%(revision_id)s} ist nicht in »%(file_id)s« vorhanden."
5342
#: bzrlib/errors.py:1395
5598
#: bzrlib/errors.py:1414
5343
5599
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5600
msgstr "Revision {%(revision_id)s} ist bereits in »%(file_id)s« vorhanden."
5346
#: bzrlib/errors.py:1405
5602
#: bzrlib/errors.py:1424
5347
5603
msgid "Text did not match its checksum: %(msg)s"
5604
msgstr "Der Text entsprach nicht seiner Prüfsumme: %(msg)s"
5350
#: bzrlib/errors.py:1531
5606
#: bzrlib/errors.py:1550
5351
5607
msgid "Export format %(format)r not supported"
5608
msgstr "Exportformat %(format)r wird nicht unterstützt"
5354
#: bzrlib/errors.py:1540
5610
#: bzrlib/errors.py:1559
5355
5611
msgid "Transport error: %(msg)s %(orig_error)s"
5612
msgstr "Übertragungsfehler: %(msg)s %(orig_error)s"
5358
#: bzrlib/errors.py:1566
5614
#: bzrlib/errors.py:1585
5359
5615
msgid "Generic bzr smart protocol error: %(details)s"
5616
msgstr "Allgemeiner bzr-Smart-Protokoll-Fehler: %(details)s"
5362
#: bzrlib/errors.py:1574
5618
#: bzrlib/errors.py:1593
5363
5619
msgid "Received bad protocol version marker: %(marker)r"
5366
#: bzrlib/errors.py:1606
5622
#: bzrlib/errors.py:1625
5367
5623
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5370
#: bzrlib/errors.py:1611
5626
#: bzrlib/errors.py:1630
5371
5627
msgid "Connection error: %(msg)s %(orig_error)s"
5628
msgstr "Verbindungsfehler: %(msg)s %(orig_error)s"
5374
#: bzrlib/errors.py:1616
5630
#: bzrlib/errors.py:1635
5375
5631
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5632
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5378
#: bzrlib/errors.py:1637
5634
#: bzrlib/errors.py:1656
5379
5635
msgid "Connection closed: %(msg)s %(orig_error)s"
5636
msgstr "Verbindung geschlossen: %(msg)s %(orig_error)s"
5382
#: bzrlib/errors.py:1642
5638
#: bzrlib/errors.py:1661
5383
5639
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5640
msgstr "Verbindung abgelaufen: %(msg)s%(orig_error)s"
5386
#: bzrlib/errors.py:1647
5642
#: bzrlib/errors.py:1666
5387
5643
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5390
#: bzrlib/errors.py:1657
5646
#: bzrlib/errors.py:1676
5391
5647
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5394
#: bzrlib/errors.py:1672
5648
msgstr "Ungültige HTTP-Antwort für %(path)s: %(msg)s%(orig_error)s"
5650
#: bzrlib/errors.py:1691
5651
msgid "Certificate error: %(error)s"
5652
msgstr "Zertifikatsfehler: %(error)s"
5654
#: bzrlib/errors.py:1699
5395
5655
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5656
msgstr "Ungültiger HTTP-Bereich %(range)r für %(path)s: %(msg)s"
5398
#: bzrlib/errors.py:1686
5658
#: bzrlib/errors.py:1713
5399
5659
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5660
msgstr "»HTTP MIME Boundary« für %(path)s fehlt: %(msg)sy"
5402
#: bzrlib/errors.py:1694
5662
#: bzrlib/errors.py:1721
5403
5663
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5664
msgstr "Ungültiger HTTP-Content-type »%(ctype)s« für %(path)s: %(msg)s"
5406
#: bzrlib/errors.py:1703
5666
#: bzrlib/errors.py:1730
5407
5667
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5668
msgstr "%(source)s wird%(permanently)s umgeleitet nach %(target)s"
5410
#: bzrlib/errors.py:1717
5670
#: bzrlib/errors.py:1744
5411
5671
msgid "Too many redirections"
5672
msgstr "Zu viele Umleitungen"
5414
#: bzrlib/errors.py:1722
5674
#: bzrlib/errors.py:1749
5415
5675
msgid "Working tree has conflicts."
5418
#: bzrlib/errors.py:1726
5678
#: bzrlib/errors.py:1753
5419
5679
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5680
msgstr "Konfigurationsdatei %(filename)s ist nicht UTF-8-kodiert\n"
5422
#: bzrlib/errors.py:1735
5682
#: bzrlib/errors.py:1762
5424
5684
"Error(s) parsing config file %(filename)s:\n"
5428
#: bzrlib/errors.py:1746
5429
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5688
#: bzrlib/errors.py:1772
5690
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5691
"See ``bzr help %(name)s``"
5432
#: bzrlib/errors.py:1754
5694
#: bzrlib/errors.py:1782
5433
5695
msgid "%(username)r does not seem to contain a reasonable email address"
5696
msgstr "%(username)r scheint keine vernünftige E-Mail-Adresse zu haben"
5436
#: bzrlib/errors.py:1763
5698
#: bzrlib/errors.py:1791
5437
5699
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5440
#: bzrlib/errors.py:1771
5702
#: bzrlib/errors.py:1799
5441
5703
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5444
#: bzrlib/errors.py:1779
5706
#: bzrlib/errors.py:1807
5445
5707
msgid "Unable to import library \"%(library)s\": %(error)s"
5708
msgstr "Importieren der Bibliothek »%(library)s« nicht möglich: %(error)s"
5448
#: bzrlib/errors.py:1787
5710
#: bzrlib/errors.py:1815
5449
5711
msgid "python-gpgme is not installed, it is needed to verify signatures"
5452
#: bzrlib/errors.py:1795
5714
#: bzrlib/errors.py:1823
5454
5716
"The working tree for %(basedir)s has changed since the last commit, but "
5455
5717
"weave merge requires that it be unchanged"
5458
#: bzrlib/errors.py:1805
5720
#: bzrlib/errors.py:1833
5460
5722
"Can't reprocess and show base, because reprocessing obscures the "
5461
5723
"relationship of conflicting lines to the base"
5464
#: bzrlib/errors.py:1811
5726
#: bzrlib/errors.py:1839
5465
5727
msgid "Cycle in graph %(graph)r"
5468
#: bzrlib/errors.py:1839
5730
#: bzrlib/errors.py:1867
5469
5731
msgid "File %(filename)s is not conflicted."
5472
#: bzrlib/errors.py:1861
5734
#: bzrlib/errors.py:1889
5473
5735
msgid "No bundle was found in \"%(filename)s\"."
5476
#: bzrlib/errors.py:1870
5738
#: bzrlib/errors.py:1898
5477
5739
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5480
#: bzrlib/errors.py:1880
5742
#: bzrlib/errors.py:1908
5481
5743
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5744
msgstr "Im Zweig %(base)s fehlt Revision %(text_revision)s von %(file_id)s"
5484
#: bzrlib/errors.py:1893
5746
#: bzrlib/errors.py:1921
5485
5747
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5488
#: bzrlib/errors.py:1903
5750
#: bzrlib/errors.py:1931
5489
5751
msgid "Key %(key)s is already present in map"
5492
#: bzrlib/errors.py:1908
5754
#: bzrlib/errors.py:1936
5493
5755
msgid "The prefix %(prefix)s is in the help search path twice."
5496
#: bzrlib/errors.py:1918
5758
#: bzrlib/errors.py:1946
5498
5760
"No final name for trans_id %(trans_id)r\n"
5499
5761
"file-id: %(file_id)r\n"
5500
5762
"root trans-id: %(root_trans_id)r\n"
5503
#: bzrlib/errors.py:1950
5765
#: bzrlib/errors.py:1978
5504
5766
msgid "Attempt to reuse a transform that has already been applied."
5507
#: bzrlib/errors.py:1955
5769
#: bzrlib/errors.py:1983
5508
5770
msgid "Moving the root directory is not supported at this time"
5511
#: bzrlib/errors.py:1960
5773
#: bzrlib/errors.py:1988
5512
5774
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5775
msgstr "Umbenennen von %(from_path)s in %(to_path)s gescheitert: %(why)s"
5515
#: bzrlib/errors.py:1971
5777
#: bzrlib/errors.py:1999
5517
5779
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5520
#: bzrlib/errors.py:2007
5782
#: bzrlib/errors.py:2035
5522
5784
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5525
#: bzrlib/errors.py:2037
5787
#: bzrlib/errors.py:2065
5526
5788
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5529
#: bzrlib/errors.py:2045
5791
#: bzrlib/errors.py:2073
5530
5792
msgid "Nothing to merge."
5533
#: bzrlib/errors.py:2050
5795
#: bzrlib/errors.py:2078
5534
5796
msgid "Format %(format)s cannot be initialised by this version of bzr."
5798
"Das Format %(format)s kann von dieser Bazaar-Version nicht initialisiert "
5537
#: bzrlib/errors.py:2059
5801
#: bzrlib/errors.py:2087
5539
5803
"Cannot convert from format %(from_format)s to format %(format)s. "
5543
#: bzrlib/errors.py:2071
5807
#: bzrlib/errors.py:2099
5544
5808
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5547
#: bzrlib/errors.py:2079
5811
#: bzrlib/errors.py:2107
5548
5812
msgid "%(exe_name)s could not be found on this machine"
5813
msgstr "%(exe_name)s konnte nicht auf diesem Rechner gefunden werden"
5551
#: bzrlib/errors.py:2087
5815
#: bzrlib/errors.py:2115
5552
5816
msgid "Diff is not installed on this machine: %(msg)s"
5817
msgstr "Diff ist auf diesem Rechner nicht installiert: %(msg)s"
5555
#: bzrlib/errors.py:2095
5819
#: bzrlib/errors.py:2123
5556
5820
msgid "Diff3 is not installed on this machine."
5821
msgstr "Diff3 ist auf diesem Rechner nicht installiert."
5559
#: bzrlib/errors.py:2101
5823
#: bzrlib/errors.py:2129
5560
5824
msgid "The content being inserted is already present."
5825
msgstr "Der gerade eingefügte Inhalt ist bereits vorhanden."
5563
#: bzrlib/errors.py:2106
5827
#: bzrlib/errors.py:2134
5565
5829
"This tree contains left-over files from a failed operation.\n"
5566
5830
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5583
5847
" keep, and delete it when you are done."
5586
#: bzrlib/errors.py:2138
5850
#: bzrlib/errors.py:2166
5588
5852
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5589
5853
"examine %(pending_deletion)s to see if it contains any files you wish to "
5590
5854
"keep, and delete it when you are done."
5593
#: bzrlib/errors.py:2148
5857
#: bzrlib/errors.py:2176
5594
5858
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5597
#: bzrlib/errors.py:2162
5861
#: bzrlib/errors.py:2190
5599
5863
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5865
"Im öffentlichen Zweig »%(public_location)s« fehlt Revision »%(revstring)s«."
5602
#: bzrlib/errors.py:2175
5867
#: bzrlib/errors.py:2203
5603
5868
msgid "Error in merge modified format"
5606
#: bzrlib/errors.py:2180
5871
#: bzrlib/errors.py:2208
5607
5872
msgid "Format error in conflict listings"
5610
#: bzrlib/errors.py:2184
5875
#: bzrlib/errors.py:2212
5612
5877
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5613
5878
"Error: %(description)s"
5616
#: bzrlib/errors.py:2195
5881
#: bzrlib/errors.py:2223
5618
5883
"An error has been detected in the repository %(repo_path)s.\n"
5619
5884
"Please run bzr reconcile on this repository."
5622
#: bzrlib/errors.py:2206
5887
#: bzrlib/errors.py:2234
5624
5889
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5625
5890
"reason: %(reason)s"
5628
#: bzrlib/errors.py:2219
5893
#: bzrlib/errors.py:2247
5630
5895
"An inconsistent delta was supplied: %(delta)r\n"
5631
5896
"reason: %(reason)s"
5634
#: bzrlib/errors.py:2231
5899
#: bzrlib/errors.py:2259
5635
5900
msgid "To use this feature you must upgrade your branch at %(path)s."
5638
#: bzrlib/errors.py:2240
5903
#: bzrlib/errors.py:2268
5639
5904
msgid "To use this feature you must upgrade your repository at %(path)s."
5642
#: bzrlib/errors.py:2245
5907
#: bzrlib/errors.py:2273
5644
5909
"To use this feature you must upgrade your branch at %(path)s to a format "
5645
5910
"which supports rich roots."
5648
#: bzrlib/errors.py:2251
5913
#: bzrlib/errors.py:2279
5649
5914
msgid "Cannot perform local-only commits on unbound branches."
5652
#: bzrlib/errors.py:2256
5917
#: bzrlib/errors.py:2284
5653
5918
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5656
#: bzrlib/errors.py:2277
5921
#: bzrlib/errors.py:2305
5657
5922
msgid "Ghost tags not supported by format %(format)r."
5660
#: bzrlib/errors.py:2285
5925
#: bzrlib/errors.py:2313
5661
5926
msgid "File is binary but should be text."
5927
msgstr "Die Datei ist binär, sollte aber Text sein."
5664
#: bzrlib/errors.py:2290
5929
#: bzrlib/errors.py:2318
5665
5930
msgid "The path %(path)s is not permitted on this platform"
5931
msgstr "Der Pfad %(path)s ist auf dieser Plattform nicht erlaubt"
5668
#: bzrlib/errors.py:2299
5933
#: bzrlib/errors.py:2327
5670
5935
"Testament did not match expected value.\n"
5671
5936
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5672
5937
" {%(measured)s}"
5675
#: bzrlib/errors.py:2311
5940
#: bzrlib/errors.py:2339
5676
5941
msgid "Not a bzr revision-bundle: %(text)r"
5679
#: bzrlib/errors.py:2320
5944
#: bzrlib/errors.py:2348
5680
5945
msgid "Bad bzr revision-bundle: %(text)r"
5683
#: bzrlib/errors.py:2329
5948
#: bzrlib/errors.py:2357
5684
5949
msgid "Malformed bzr revision-bundle header: %(text)r"
5687
#: bzrlib/errors.py:2334
5952
#: bzrlib/errors.py:2362
5688
5953
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5691
#: bzrlib/errors.py:2339
5956
#: bzrlib/errors.py:2367
5692
5957
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5695
#: bzrlib/errors.py:2344
5960
#: bzrlib/errors.py:2372
5696
5961
msgid "End of line marker was not \\n in bzr revision-bundle"
5699
#: bzrlib/errors.py:2354
5964
#: bzrlib/errors.py:2382
5700
5965
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5703
#: bzrlib/errors.py:2364
5968
#: bzrlib/errors.py:2392
5704
5969
msgid "Root class for inventory serialization errors"
5707
#: bzrlib/errors.py:2368
5972
#: bzrlib/errors.py:2396
5709
5974
"The inventory was not in the expected format:\n"
5713
#: bzrlib/errors.py:2377
5978
#: bzrlib/errors.py:2405
5714
5979
msgid "This operation requires rich root data storage"
5717
#: bzrlib/errors.py:2390
5982
#: bzrlib/errors.py:2418
5718
5983
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5721
#: bzrlib/errors.py:2399
5986
#: bzrlib/errors.py:2427
5723
5988
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5727
#: bzrlib/errors.py:2406
5992
#: bzrlib/errors.py:2434
5729
5994
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5730
5995
"ghost at {%(ghost_revision_id)s}"
5733
#: bzrlib/errors.py:2416
5998
#: bzrlib/errors.py:2444
5734
5999
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6000
msgstr "Geister-Revision {%(revision_id)s} kann hier nicht benutzt werden."
5737
#: bzrlib/errors.py:2467
6002
#: bzrlib/errors.py:2495
5739
6004
"A merge directive must provide either a bundle or a public branch location."
5742
#: bzrlib/errors.py:2474
6007
#: bzrlib/errors.py:2502
5743
6008
msgid "Bad merge directive payload %(start)r"
5746
#: bzrlib/errors.py:2484
6011
#: bzrlib/errors.py:2512
5747
6012
msgid "Preview patch does not match requested changes."
5750
#: bzrlib/errors.py:2490
6015
#: bzrlib/errors.py:2518
5751
6016
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5754
#: bzrlib/errors.py:2500
6019
#: bzrlib/errors.py:2528
5756
6021
"Your branch does not have all of the revisions required in order to merge "
5757
6022
"this merge directive and the target location specified in the merge "
5758
6023
"directive is not a branch: %(location)s."
5761
#: bzrlib/errors.py:2512
6026
#: bzrlib/errors.py:2540
5762
6027
msgid "Unsupported entry kind %(kind)s"
5765
#: bzrlib/errors.py:2520
6030
#: bzrlib/errors.py:2548
5766
6031
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5769
#: bzrlib/errors.py:2530
6034
#: bzrlib/errors.py:2558
5770
6035
msgid "Subsume target %(other_tree)s needs to be upgraded."
5773
#: bzrlib/errors.py:2549
6038
#: bzrlib/errors.py:2577
5774
6039
msgid "No such tag: %(tag_name)s"
5777
#: bzrlib/errors.py:2557
6042
#: bzrlib/errors.py:2585
5778
6043
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5781
#: bzrlib/errors.py:2566
6046
#: bzrlib/errors.py:2594
5782
6047
msgid "Tag %(tag_name)s already exists."
5785
#: bzrlib/errors.py:2574
6050
#: bzrlib/errors.py:2602
5787
6052
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5788
6053
"bugs\" for more information on this feature."
5791
#: bzrlib/errors.py:2584
6056
#: bzrlib/errors.py:2612
5793
6058
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5796
#: bzrlib/errors.py:2594
6061
#: bzrlib/errors.py:2622
5798
6063
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5801
#: bzrlib/errors.py:2604
6066
#: bzrlib/errors.py:2632
5802
6067
msgid "Invalid line in bugs property: '%(line)s'"
5805
#: bzrlib/errors.py:2612
6070
#: bzrlib/errors.py:2640
5806
6071
msgid "Invalid bug status: '%(status)s'"
5809
#: bzrlib/errors.py:2620
6074
#: bzrlib/errors.py:2648
5810
6075
msgid "Could not understand response from smart server: %(response_tuple)r"
5813
#: bzrlib/errors.py:2659
6078
#: bzrlib/errors.py:2687
5814
6079
msgid "Server sent an unexpected error: %(error_tuple)r"
6080
msgstr "Der Server meldete einen unerwarteten Fehler: %(error_tuple)r"
5817
#: bzrlib/errors.py:2678
6082
#: bzrlib/errors.py:2706
5818
6083
msgid "Unrecognised container format: %(container_format)r"
5821
#: bzrlib/errors.py:2686
6086
#: bzrlib/errors.py:2714
5822
6087
msgid "Unexpected end of container stream"
5825
#: bzrlib/errors.py:2691
6090
#: bzrlib/errors.py:2719
5826
6091
msgid "Unknown record type: %(record_type)r"
5829
#: bzrlib/errors.py:2699
6094
#: bzrlib/errors.py:2727
5830
6095
msgid "Invalid record: %(reason)s"
5833
#: bzrlib/errors.py:2707
6098
#: bzrlib/errors.py:2735
5834
6099
msgid "Container has data after end marker: %(excess)r"
5837
#: bzrlib/errors.py:2715
6102
#: bzrlib/errors.py:2743
5838
6103
msgid "Container has multiple records with the same name: %(name)s"
5841
#: bzrlib/errors.py:2728
6106
#: bzrlib/errors.py:2756
5842
6107
msgid "Corrupt or incompatible data stream: %(reason)s"
6108
msgstr "Fehlerhafter oder inkompatibler Datenstrom: %(reason)s"
5845
#: bzrlib/errors.py:2736
6110
#: bzrlib/errors.py:2764
5846
6111
msgid "SMTP error: %(error)s"
6112
msgstr "SMTP-Fehler: %(error)s"
5849
#: bzrlib/errors.py:2744
6114
#: bzrlib/errors.py:2772
5850
6115
msgid "No message supplied."
5853
#: bzrlib/errors.py:2749
6118
#: bzrlib/errors.py:2777
5854
6119
msgid "No mail-to address (--mail-to) or output (-o) specified."
5857
#: bzrlib/errors.py:2754
5858
msgid "Unknown mail client: %(mail_client)s"
5861
#: bzrlib/errors.py:2762
6122
#: bzrlib/errors.py:2782
5863
6124
"Unable to find mail client with the following names: "
5864
6125
"%(mail_command_list_string)s"
5867
#: bzrlib/errors.py:2772
6128
#: bzrlib/errors.py:2792
5868
6129
msgid "SMTP connection to %(host)s refused"
6130
msgstr "SMTP-Verbindung zu %(host)s wurde abgelehnt"
5871
#: bzrlib/errors.py:2781
6132
#: bzrlib/errors.py:2801
5872
6133
msgid "Please specify smtp_server. No server at default %(host)s."
5875
#: bzrlib/errors.py:2795
6136
#: bzrlib/errors.py:2815
5877
6138
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5881
#: bzrlib/errors.py:2807
6142
#: bzrlib/errors.py:2827
5882
6143
msgid "'%(display_url)s' is already a branch."
6144
msgstr "»%(display_url)s« ist bereits ein Zweig."
5885
#: bzrlib/errors.py:2812
6146
#: bzrlib/errors.py:2832
5886
6147
msgid "'%(display_url)s' is already a tree."
5889
#: bzrlib/errors.py:2817
6150
#: bzrlib/errors.py:2837
5890
6151
msgid "'%(display_url)s' is already a checkout."
5893
#: bzrlib/errors.py:2822
6154
#: bzrlib/errors.py:2842
5894
6155
msgid "'%(display_url)s' is already a lightweight checkout."
5897
#: bzrlib/errors.py:2827
6158
#: bzrlib/errors.py:2847
5898
6159
msgid "'%(display_url)s' is already using a shared repository."
5901
#: bzrlib/errors.py:2832
6162
#: bzrlib/errors.py:2852
5902
6163
msgid "'%(display_url)s' is already standalone."
5905
#: bzrlib/errors.py:2837
6166
#: bzrlib/errors.py:2857
5906
6167
msgid "Shared repository '%(display_url)s' already creates working trees."
5909
#: bzrlib/errors.py:2843
6170
#: bzrlib/errors.py:2863
5911
6172
"Shared repository '%(display_url)s' already doesn't create working trees."
5914
#: bzrlib/errors.py:2849
6175
#: bzrlib/errors.py:2869
5915
6176
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5918
#: bzrlib/errors.py:2854
6179
#: bzrlib/errors.py:2874
5919
6180
msgid "No location could be found to bind to at %(display_url)s."
5922
#: bzrlib/errors.py:2859
6183
#: bzrlib/errors.py:2879
5924
6185
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5925
6186
"status).%(more)s"
5928
#: bzrlib/errors.py:2878
6189
#: bzrlib/errors.py:2898
5930
6191
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5931
6192
"list).%(more)s"
5934
#: bzrlib/errors.py:2884
6195
#: bzrlib/errors.py:2904
5935
6196
msgid "Variable {%(name)s} is not available."
6197
msgstr "Variable {%(name)s} steht nicht zur Verfügung."
5938
#: bzrlib/errors.py:2892
6199
#: bzrlib/errors.py:2912
5939
6200
msgid "No template specified."
5942
#: bzrlib/errors.py:2897
6203
#: bzrlib/errors.py:2917
5943
6204
msgid "Unable to create symlink %(path_str)son this platform"
5946
#: bzrlib/errors.py:2912
6207
#: bzrlib/errors.py:2932
5948
6209
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5949
6210
"\"original\", \"local\"."
6212
"Ungültiges Zeitzonenformat »%(timezone)s«, die Optionen sind »utc«, "
6213
"»original« und »local«."
5952
#: bzrlib/errors.py:2946
6215
#: bzrlib/errors.py:2966
5954
6217
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5957
#: bzrlib/errors.py:2958
6220
#: bzrlib/errors.py:2978
5958
6221
msgid "The \"%(config_id)s\" configuration does not exist."
6222
msgstr "Die Konfiguration »%(config_id)s« existiert nicht."
5961
#: bzrlib/errors.py:2966
6224
#: bzrlib/errors.py:2986
5962
6225
msgid "The \"%(option_name)s\" configuration option does not exist."
6226
msgstr "Die Konfigurationsoption »%(option_name)s« existiert nicht."
5965
#: bzrlib/errors.py:2974
6228
#: bzrlib/errors.py:2994
5966
6229
msgid "The alias \"%(alias_name)s\" does not exist."
6230
msgstr "Der Alias »%(alias_name)s« existiert nicht."
5969
#: bzrlib/errors.py:2988
6232
#: bzrlib/errors.py:3008
5970
6233
msgid "\"%(alias_name)s\" is not a valid location alias."
5973
#: bzrlib/errors.py:2996
6236
#: bzrlib/errors.py:3016
5974
6237
msgid "No %(alias_name)s location assigned."
5977
#: bzrlib/errors.py:3004
6240
#: bzrlib/errors.py:3024
5978
6241
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5981
#: bzrlib/errors.py:3014
6244
#: bzrlib/errors.py:3034
5982
6245
msgid "Unknown rules detected: %(unknowns_str)s."
6246
msgstr "Unbekannte Regeln festgestellt: %(unknowns_str)s."
5985
#: bzrlib/errors.py:3025
6248
#: bzrlib/errors.py:3045
5986
6249
msgid "Tip change rejected: %(msg)s"
5989
#: bzrlib/errors.py:3033
6252
#: bzrlib/errors.py:3053
5990
6253
msgid "Shelf corrupt."
5993
#: bzrlib/errors.py:3038
6256
#: bzrlib/errors.py:3058
5994
6257
msgid "Corruption while decompressing repository file%(orig_error)s"
5997
#: bzrlib/errors.py:3050
6260
#: bzrlib/errors.py:3070
5998
6261
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6001
#: bzrlib/errors.py:3058
6264
#: bzrlib/errors.py:3078
6002
6265
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6005
#: bzrlib/errors.py:3066
6268
#: bzrlib/errors.py:3086
6007
6270
"An attempt to access a url outside the server jail was made: '%(url)s'."
6010
#: bzrlib/errors.py:3074
6273
#: bzrlib/errors.py:3094
6011
6274
msgid "The user aborted the operation."
6275
msgstr "Der Vorgang wurde vom Benutzer abgebrochen."
6014
#: bzrlib/errors.py:3079
6277
#: bzrlib/errors.py:3099
6015
6278
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6018
#: bzrlib/errors.py:3089
6281
#: bzrlib/errors.py:3109
6019
6282
msgid "No such view: %(view_name)s."
6022
#: bzrlib/errors.py:3099
6285
#: bzrlib/errors.py:3119
6024
6287
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6025
6288
"to a later format."
6028
#: bzrlib/errors.py:3108
6291
#: bzrlib/errors.py:3128
6030
6293
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6033
#: bzrlib/errors.py:3175
6296
#: bzrlib/errors.py:3195
6034
6297
msgid "%(bzrdir)r does not support co-located branches."
6037
#: bzrlib/errors.py:3181
6300
#: bzrlib/errors.py:3201
6039
6302
"Unable to determine your name.\n"
6040
6303
"Please, set your name with the 'whoami' command.\n"
6041
6304
"E.g. bzr whoami \"Your Name <name@example.com>\""
6044
#: bzrlib/errors.py:3190
6307
#: bzrlib/errors.py:3210
6045
6308
msgid "Invalid pattern(s) found. %(msg)s"
6309
msgstr "Ungültige(s) Muster gefunden. %(msg)s"
6048
#: bzrlib/errors.py:3198
6311
#: bzrlib/errors.py:3218
6050
6313
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6051
6314
"unbind` to fix."
6054
#: bzrlib/errors.py:3209
6317
#: bzrlib/errors.py:3229
6055
6318
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6058
#: bzrlib/errors.py:3218
6321
#: bzrlib/errors.py:3238
6059
6322
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6062
#: bzrlib/errors.py:3227
6325
#: bzrlib/errors.py:3247
6064
6327
"No compatible object available for operations from %(source)r to %(target)r."
6067
#: bzrlib/errors.py:3237
6330
#: bzrlib/errors.py:3257
6069
6332
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6070
6333
"%(arguments)s."
6073
#: bzrlib/errors.py:3247
6336
#: bzrlib/errors.py:3267
6075
6338
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6076
6339
"format %(format)r"
6079
#: bzrlib/errors.py:3259
6342
#: bzrlib/errors.py:3279
6081
6344
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6347
"Die fehlende Funktion %(feature)s wird weder von dieser Bazaar-Version noch "
6348
"von irgendeiner Erweiterung unterstützt."
6085
#: bzrlib/errors.py:3272
6350
#: bzrlib/errors.py:3292
6086
6351
msgid "Binary files section encountered."
6352
msgstr "Auf einen Abschnitt für Binärdateien gestoßen."
6089
#: bzrlib/errors.py:3280
6354
#: bzrlib/errors.py:3300
6091
6356
"Malformed patch header. %(desc)s\n"
6095
#: bzrlib/errors.py:3289
6360
#: bzrlib/errors.py:3309
6097
6362
"Malformed hunk header. %(desc)s\n"
6101
#: bzrlib/errors.py:3298
6366
#: bzrlib/errors.py:3318
6103
6368
"Malformed line. %(desc)s\n"
6371
"Ungültige Zeile. %(desc)s\n"
6107
#: bzrlib/errors.py:3308
6374
#: bzrlib/errors.py:3328
6109
6376
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6110
6377
"but patch says it should be \"%(patch_line)s\""
6113
#: bzrlib/errors.py:3319
6380
#: bzrlib/errors.py:3339
6114
6381
msgid "The feature %(feature)s has already been registered."
6513
6786
" otherwise error."
6516
#: bzrlib/plugins/launchpad/__init__.py:99
6789
#: bzrlib/plugins/launchpad/cmds.py:62
6519
6792
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6520
6793
" --project fooproject"
6796
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6797
" --project fooproject"
6523
#: bzrlib/plugins/launchpad/__init__.py:106
6799
#: bzrlib/plugins/launchpad/cmds.py:69
6524
6800
msgid "Launchpad project short name to associate with the branch."
6801
msgstr "Launchpad-Projekt-Kurzname, dem der Zweig zugeordnet wird."
6527
#: bzrlib/plugins/launchpad/__init__.py:113
6803
#: bzrlib/plugins/launchpad/cmds.py:76
6529
6805
"Short name for the branch; by default taken from the last component of the "
6533
#: bzrlib/plugins/launchpad/__init__.py:117
6809
#: bzrlib/plugins/launchpad/cmds.py:80
6534
6810
msgid "One-sentence description of the branch."
6811
msgstr "Beschreibung des Zweiges in einem Satz."
6537
#: bzrlib/plugins/launchpad/__init__.py:120
6813
#: bzrlib/plugins/launchpad/cmds.py:83
6538
6814
msgid "Longer description of the purpose or contents of the branch."
6815
msgstr "Längere Beschreibung für den Zweck oder die Inhalte des Zweiges."
6541
#: bzrlib/plugins/launchpad/__init__.py:123
6817
#: bzrlib/plugins/launchpad/cmds.py:86
6542
6818
msgid "Branch author's email address, if not yourself."
6819
msgstr "E-Mail-Adresse des Autors des Zweigs, wenn Sie es nicht selbst sind."
6545
#: bzrlib/plugins/launchpad/__init__.py:126
6821
#: bzrlib/plugins/launchpad/cmds.py:89
6546
6822
msgid "The bug this branch fixes."
6823
msgstr "Der Fehler, den dieser Zweig behebt."
6549
#: bzrlib/plugins/launchpad/__init__.py:129
6825
#: bzrlib/plugins/launchpad/cmds.py:92
6550
6826
msgid "Prepare the request but don't actually send it."
6827
msgstr "Die Anfrage vorbereiten, aber nicht absenden."
6553
#: bzrlib/plugins/launchpad/__init__.py:151
6829
#: bzrlib/plugins/launchpad/cmds.py:114
6555
6831
"register-branch requires a public branch url - see bzr help register-branch."
6558
#: bzrlib/plugins/launchpad/__init__.py:159
6834
#: bzrlib/plugins/launchpad/cmds.py:122
6559
6835
msgid "--product is deprecated; please use --project."
6836
msgstr "--product ist veraltet; bitte --project benutzen."
6562
#: bzrlib/plugins/launchpad/__init__.py:191
6838
#: bzrlib/plugins/launchpad/cmds.py:152
6563
6839
msgid "Open a Launchpad branch page in your web browser."
6840
msgstr "Eine Launchpad-Zweig-Seite in Ihrem Web-Browser öffnen."
6566
#: bzrlib/plugins/launchpad/__init__.py:196
6842
#: bzrlib/plugins/launchpad/cmds.py:157
6567
6843
msgid "Do not actually open the browser. Just say the URL we would use."
6570
#: bzrlib/plugins/launchpad/__init__.py:231
6846
#: bzrlib/plugins/launchpad/cmds.py:192
6571
6847
#, python-format
6572
6848
msgid "Opening %s in web browser"
6849
msgstr "%s wird im Web-Browser geöffnet"
6575
#: bzrlib/plugins/launchpad/__init__.py:241
6851
#: bzrlib/plugins/launchpad/cmds.py:200
6576
6852
msgid "Show or set the Launchpad user ID."
6853
msgstr "Den Launchpad-Benutzernamen anzeigen oder festlegen."
6579
#: bzrlib/plugins/launchpad/__init__.py:243
6855
#: bzrlib/plugins/launchpad/cmds.py:202
6581
6857
"When communicating with Launchpad, some commands need to know your\n"
6582
6858
"Launchpad user ID. This command can be used to set or show the\n"
6583
6859
"user ID that Bazaar will use for such communication."
6586
#: bzrlib/plugins/launchpad/__init__.py:247
6862
#: bzrlib/plugins/launchpad/cmds.py:206
6589
6865
" Show the Launchpad ID of the current user::"
6592
#: bzrlib/plugins/launchpad/__init__.py:250
6868
#: bzrlib/plugins/launchpad/cmds.py:209
6593
6869
msgid " bzr launchpad-login"
6870
msgstr " bzr launchpad-login"
6596
#: bzrlib/plugins/launchpad/__init__.py:252
6872
#: bzrlib/plugins/launchpad/cmds.py:211
6597
6873
msgid " Set the Launchpad ID of the current user to 'bob'::"
6600
#: bzrlib/plugins/launchpad/__init__.py:254
6876
#: bzrlib/plugins/launchpad/cmds.py:213
6601
6877
msgid " bzr launchpad-login bob"
6878
msgstr " bzr launchpad-login bob"
6604
#: bzrlib/plugins/launchpad/__init__.py:261
6880
#: bzrlib/plugins/launchpad/cmds.py:220
6605
6881
msgid "Don't check that the user name is valid."
6882
msgstr "Den Benutzernamen nicht auf Gültigkeit prüfen."
6608
#: bzrlib/plugins/launchpad/__init__.py:276
6609
#: bzrlib/plugins/launchpad/__init__.py:287
6884
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6610
6885
msgid "Launchpad user ID exists and has SSH keys.\n"
6886
msgstr "Launchpad-Benutzername existiert und hat SSH-Schlüssel.\n"
6613
#: bzrlib/plugins/launchpad/__init__.py:279
6888
#: bzrlib/plugins/launchpad/cmds.py:238
6614
6889
msgid "No Launchpad user ID configured.\n"
6890
msgstr "Kein Launchpad-Benutzername konfiguriert.\n"
6617
#: bzrlib/plugins/launchpad/__init__.py:290
6892
#: bzrlib/plugins/launchpad/cmds.py:249
6618
6893
#, python-format
6619
6894
msgid "Launchpad user ID set to '%s'.\n"
6895
msgstr "Launchpad-Benutzername auf »%s« festgelegt.\n"
6622
#: bzrlib/plugins/launchpad/__init__.py:298
6897
#: bzrlib/plugins/launchpad/cmds.py:255
6623
6898
msgid "Ask Launchpad to mirror a branch now."
6899
msgstr "Launchpad jetzt darum bitten, einen Zweig zu spiegeln."
6626
#: bzrlib/plugins/launchpad/__init__.py:318
6901
#: bzrlib/plugins/launchpad/cmds.py:272
6627
6902
msgid "Propose merging a branch on Launchpad."
6630
#: bzrlib/plugins/launchpad/__init__.py:320
6905
#: bzrlib/plugins/launchpad/cmds.py:274
6632
6907
"This will open your usual editor to provide the initial comment. When it\n"
6633
6908
"has created the proposal, it will open it in your default web browser."
6636
#: bzrlib/plugins/launchpad/__init__.py:323
6911
#: bzrlib/plugins/launchpad/cmds.py:277
6638
6913
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6639
6914
"is not supplied, the remembered submit branch will be used. If no submit\n"
6640
6915
"branch is remembered, the development focus will be used."
6643
#: bzrlib/plugins/launchpad/__init__.py:327
6918
#: bzrlib/plugins/launchpad/cmds.py:281
6645
6920
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6646
6921
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6779
#: bzrlib/plugins/launchpad/lp_propose.py:149
7054
#: bzrlib/plugins/launchpad/lp_propose.py:150
6780
7055
#, python-format
6781
7056
msgid "There is already a branch merge proposal: %s"
6784
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7059
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6785
7060
msgid "pb parameter to convert() is deprecated"
6788
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7063
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6789
7064
msgid "starting upgrade from format 4 to 5"
6792
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7067
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6793
7068
msgid "note: upgrade may be faster if all store files are ungzipped first"
6796
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7071
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6797
7072
msgid "converting revision"
7073
msgstr "Revision umwandeln"
6800
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7075
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6801
7076
msgid "upgraded to weaves:"
6804
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7079
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6805
7080
#, python-format
6806
7081
msgid "%6d revisions and inventories"
6809
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7084
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6810
7085
#, python-format
6811
7086
msgid "%6d revisions not present"
7087
msgstr "%6d Revisionen nicht vorhanden"
6814
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7089
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6815
7090
#, python-format
6816
7091
msgid "%6d texts"
6819
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7094
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6820
7095
msgid "writing weave"
6823
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6824
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7098
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7099
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6825
7100
msgid "inventory"
6828
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7103
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6829
7104
msgid "write revision"
7105
msgstr "Revision schreiben"
6832
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7107
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6833
7108
msgid "loading revision"
7109
msgstr "Revision laden"
6836
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7111
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6837
7112
#, python-format
6838
7113
msgid "revision {%s} not present in branch; will be converted as a ghost"
6841
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7116
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6842
7117
msgid "starting upgrade from format 5 to 6"
6845
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7120
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6846
7121
#, python-format
6847
7122
msgid "adding prefixes to %s"
6850
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7125
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6851
7126
msgid "starting upgrade from format 6 to metadir"
6854
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7129
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6855
7130
msgid "Removing ancestry.weave"
6858
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7133
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6859
7134
msgid "Finding branch files"
7135
msgstr "Dateien des Zweigs finden"
6862
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7137
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6863
7138
msgid "Upgrading repository"
6866
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7141
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6867
7142
msgid "Upgrading branch"
6870
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7145
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6871
7146
msgid "No working tree."
6874
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7149
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6875
7150
msgid "Upgrading working tree"
6878
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7153
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6879
7154
#, python-format
6880
7155
msgid "Make %s lock"
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7158
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6884
7159
#, python-format
6885
7160
msgid "Moving %s"
7161
msgstr "%s wird verschoben"
6888
7163
#: bzrlib/push.py:56
6889
7164
msgid "Created new branch."
7165
msgstr "Neuer Zweig wurde erstellt."
6892
#: bzrlib/push.py:98
7167
#: bzrlib/push.py:97
6893
7168
#, python-format
6895
7170
"Target directory %s already contains a .bzr directory, but it is not valid."
9923
10263
"to sign newly committed revisions, even if the branch requires signatures."
9926
#: en/help_topics/configuration.txt:462
10266
#: en/help_topics/configuration.txt:474
9928
10268
"dirstate.fdatasync\n"
9929
10269
"~~~~~~~~~~~~~~~~~~"
9932
#: en/help_topics/configuration.txt:465
10272
#: en/help_topics/configuration.txt:477
9934
10274
"If true (default), working tree metadata changes are flushed through the\n"
9935
10275
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9936
10276
"should not be lost if the machine crashes. See also repository.fdatasync."
9939
#: en/help_topics/configuration.txt:469
10279
#: en/help_topics/configuration.txt:481
9941
10281
"gpg_signing_key\n"
9942
10282
"~~~~~~~~~~~~~~~"
9945
#: en/help_topics/configuration.txt:472
10285
#: en/help_topics/configuration.txt:484
9947
10287
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9948
10288
"address, key fingerprint or full key ID. When unset or when set to\n"
9949
10289
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9952
#: en/help_topics/configuration.txt:476
10292
#: en/help_topics/configuration.txt:488
9958
#: en/help_topics/configuration.txt:479
10298
#: en/help_topics/configuration.txt:491
9960
10300
"Only useful in ``locations.conf``. Defines whether or not the\n"
9961
10301
"configuration for this section applies to subdirectories:"
9964
#: en/help_topics/configuration.txt:482
10304
#: en/help_topics/configuration.txt:494
9967
10307
" (default) This section applies to subdirectories as well."
9970
#: en/help_topics/configuration.txt:485
10310
#: en/help_topics/configuration.txt:497
9973
10313
" This section only applies to the branch at this directory and not\n"
9974
10314
" branches below it."
9977
#: en/help_topics/configuration.txt:489
10317
#: en/help_topics/configuration.txt:501
9979
10319
"gpg_signing_command\n"
9980
10320
"~~~~~~~~~~~~~~~~~~~"
9983
#: en/help_topics/configuration.txt:492
10323
#: en/help_topics/configuration.txt:504
9985
10325
"(Default: \"gpg\"). Which program should be used to sign and check "
9986
10326
"revisions.\n"
9987
10327
"For example::"
9990
#: en/help_topics/configuration.txt:495
10330
#: en/help_topics/configuration.txt:507
9991
10331
msgid " gpg_signing_command = /usr/bin/gnpg"
9994
#: en/help_topics/configuration.txt:497
10334
#: en/help_topics/configuration.txt:509
9996
10336
"The specified command must accept the options \"--clearsign\" and \"-u "
10000
#: en/help_topics/configuration.txt:499
10340
#: en/help_topics/configuration.txt:511
10002
10342
"bzr_remote_path\n"
10003
10343
"~~~~~~~~~~~~~~~"
10006
#: en/help_topics/configuration.txt:502
10346
#: en/help_topics/configuration.txt:514
10008
10348
"(Default: \"bzr\"). The path to the command that should be used to run the "
10010
10350
"server for bzr. This value may only be specified in locations.conf, because:"
10013
#: en/help_topics/configuration.txt:505
10353
#: en/help_topics/configuration.txt:517
10015
10355
"- it's needed before branch.conf is accessible\n"
10016
10356
"- allowing remote branch.conf files to specify commands would be a security\n"
10020
#: en/help_topics/configuration.txt:509
10360
#: en/help_topics/configuration.txt:521
10021
10361
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10024
#: en/help_topics/configuration.txt:511
10364
#: en/help_topics/configuration.txt:523
10026
10366
"smtp_server\n"
10027
10367
"~~~~~~~~~~~"
10030
#: en/help_topics/configuration.txt:514
10370
#: en/help_topics/configuration.txt:526
10032
10372
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10033
10373
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10036
#: en/help_topics/configuration.txt:517
10376
#: en/help_topics/configuration.txt:529
10038
10378
"smtp_username, smtp_password\n"
10039
10379
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10042
#: en/help_topics/configuration.txt:520
10382
#: en/help_topics/configuration.txt:532
10044
10384
"User and password to authenticate to the SMTP server. If smtp_username\n"
10045
10385
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
11935
12323
"set of command names."
11938
#: en/help_topics/hooks.txt:212
12326
#: en/help_topics/hooks.txt:201
12332
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12333
msgid "Introduced in: 2.6"
12336
#: en/help_topics/hooks.txt:206
12337
msgid "Called after executing a command. Called with the command object."
12340
#: en/help_topics/hooks.txt:208
12346
#: en/help_topics/hooks.txt:213
12347
msgid "Called prior to executing a command. Called with the command object."
12350
#: en/help_topics/hooks.txt:215
11940
12352
"_ConfigHooks\n"
11941
12353
"------------"
11944
#: en/help_topics/hooks.txt:215
12356
#: en/help_topics/hooks.txt:218
11950
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11951
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11952
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11953
#: en/help_topics/hooks.txt:427
12362
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12363
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12364
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12365
#: en/help_topics/hooks.txt:446
11954
12366
msgid "Introduced in: 2.4"
12367
msgstr "Eingeführt in: 2.4"
11957
#: en/help_topics/hooks.txt:220
12369
#: en/help_topics/hooks.txt:223
11959
12371
"Invoked when a config option is read. The signature is (stack, name,\n"
11963
#: en/help_topics/hooks.txt:223
12375
#: en/help_topics/hooks.txt:226
11969
#: en/help_topics/hooks.txt:228
12381
#: en/help_topics/hooks.txt:231
11970
12382
msgid "Invoked when a config store is loaded. The signature is (store)."
11973
#: en/help_topics/hooks.txt:230
12385
#: en/help_topics/hooks.txt:233
11979
#: en/help_topics/hooks.txt:235
12391
#: en/help_topics/hooks.txt:238
11981
12393
"Invoked when a config option is removed. The signature is (stack,\n"
11985
#: en/help_topics/hooks.txt:238
12397
#: en/help_topics/hooks.txt:241
11991
#: en/help_topics/hooks.txt:243
12403
#: en/help_topics/hooks.txt:246
11992
12404
msgid "Invoked when a config store is saved. The signature is (store)."
11995
#: en/help_topics/hooks.txt:245
12407
#: en/help_topics/hooks.txt:248
12001
#: en/help_topics/hooks.txt:250
12413
#: en/help_topics/hooks.txt:253
12003
12415
"Invoked when a config option is set. The signature is (stack, name,\n"
12007
#: en/help_topics/hooks.txt:253
12419
#: en/help_topics/hooks.txt:256
12009
12421
"ControlDirHooks\n"
12010
12422
"---------------"
12013
#: en/help_topics/hooks.txt:256
12425
#: en/help_topics/hooks.txt:259
12015
12427
"post_repo_init\n"
12016
12428
"~~~~~~~~~~~~~~"
12019
#: en/help_topics/hooks.txt:261
12431
#: en/help_topics/hooks.txt:264
12021
12433
"Invoked after a repository has been initialized. post_repo_init is\n"
12022
12434
"called with a bzrlib.controldir.RepoInitHookParams."
12025
#: en/help_topics/hooks.txt:264
12437
#: en/help_topics/hooks.txt:267
12031
#: en/help_topics/hooks.txt:267
12443
#: en/help_topics/hooks.txt:270
12032
12444
msgid "Introduced in: 1.14"
12445
msgstr "Eingeführt in: 1.14"
12035
#: en/help_topics/hooks.txt:269
12447
#: en/help_topics/hooks.txt:272
12037
12449
"Invoked before attempting to open a ControlDir with the transport that\n"
12038
12450
"the open will use."
12041
#: en/help_topics/hooks.txt:272
12453
#: en/help_topics/hooks.txt:275
12043
12455
"InfoHooks\n"
12047
#: en/help_topics/hooks.txt:275
12459
#: en/help_topics/hooks.txt:278
12049
12461
"repository\n"
12053
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12054
#: en/help_topics/hooks.txt:505
12465
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12466
#: en/help_topics/hooks.txt:524
12055
12467
msgid "Introduced in: 1.15"
12468
msgstr "Eingeführt in: 1.15"
12058
#: en/help_topics/hooks.txt:280
12470
#: en/help_topics/hooks.txt:283
12060
12472
"Invoked when displaying the statistics for a repository. repository is\n"
12061
12473
"called with a statistics dictionary as returned by the repository and\n"
12062
12474
"a file-like object to write to."
12065
#: en/help_topics/hooks.txt:284
12477
#: en/help_topics/hooks.txt:287
12067
12479
"LockHooks\n"
12071
#: en/help_topics/hooks.txt:287
12483
#: en/help_topics/hooks.txt:290
12073
12485
"lock_acquired\n"
12074
12486
"~~~~~~~~~~~~~"
12077
#: en/help_topics/hooks.txt:292
12489
#: en/help_topics/hooks.txt:295
12079
12491
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12082
#: en/help_topics/hooks.txt:294
12494
#: en/help_topics/hooks.txt:297
12084
12496
"lock_broken\n"
12085
12497
"~~~~~~~~~~~"
12088
#: en/help_topics/hooks.txt:299
12500
#: en/help_topics/hooks.txt:302
12089
12501
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12092
#: en/help_topics/hooks.txt:301
12504
#: en/help_topics/hooks.txt:304
12094
12506
"lock_released\n"
12095
12507
"~~~~~~~~~~~~~"
12098
#: en/help_topics/hooks.txt:306
12510
#: en/help_topics/hooks.txt:309
12100
12512
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12103
#: en/help_topics/hooks.txt:308
12515
#: en/help_topics/hooks.txt:311
12105
12517
"MergeHooks\n"
12109
#: en/help_topics/hooks.txt:311
12521
#: en/help_topics/hooks.txt:314
12111
12523
"merge_file_content\n"
12112
12524
"~~~~~~~~~~~~~~~~~~"
12115
#: en/help_topics/hooks.txt:314
12527
#: en/help_topics/hooks.txt:317
12116
12528
msgid "Introduced in: 2.1"
12119
#: en/help_topics/hooks.txt:316
12531
#: en/help_topics/hooks.txt:319
12121
12533
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12122
12534
"object when starting a merge. Should return either None or a subclass\n"