29
#: bzrlib/branch.py:3205
29
#: bzrlib/branch.py:3183
31
31
msgid "Pushed up to revision %d."
32
msgstr "In Revision %d hochgeladen."
34
#: bzrlib/branch.py:3207
34
#: bzrlib/branch.py:3185
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:3210
41
#: bzrlib/branch.py:3188
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:3212
45
#: bzrlib/branch.py:3190
46
46
msgid "No new revisions to push."
47
msgstr "Keine neuen Revisionen zum Hochladen."
49
#: bzrlib/branch.py:3232
49
#: bzrlib/branch.py:3210
50
50
msgid "checked branch {0} format {1}"
51
msgstr "überprüfter Zweig {0} Format {1}"
53
#: bzrlib/branch.py:3235
53
#: bzrlib/branch.py:3213
55
55
msgid "found error:%s"
56
56
msgstr "Fehler gefunden: %s"
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
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:218
63
#: bzrlib/builtins.py:130
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:303
68
#: bzrlib/builtins.py:215
69
69
msgid "Display status summary."
70
70
msgstr "Zeige Status-Zusammenfassung an."
72
#: bzrlib/builtins.py:305
72
#: bzrlib/builtins.py:217
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
77
"Dies zeigt versionierte und unbekannte Dateien an –\n"
78
"nach Zuständen gruppiert. Mögliche Zustände:"
77
"Zeigt versionierte und unbekannte Dateien an, Gruppiert nach Zustand.\n"
80
#: bzrlib/builtins.py:308
80
#: bzrlib/builtins.py:220
83
83
" Versioned in the working copy but not in the previous revision."
86
" In der Arbeitskopie versioniert, jedoch nicht in der vorherigen Revision."
88
#: bzrlib/builtins.py:311
86
#: bzrlib/builtins.py:223
91
89
" Versioned in the previous revision but removed or deleted\n"
92
90
" in the working copy."
95
" In der vorherigen Revision versioniert, jedoch entfernt oder aus der\n"
96
" Arbeitskopie gelöscht."
98
#: bzrlib/builtins.py:315
93
#: bzrlib/builtins.py:227
101
96
" Path of this file changed from the previous revision;\n"
103
98
" parent directory was renamed."
104
99
msgstr "umbenannt"
106
#: bzrlib/builtins.py:320
101
#: bzrlib/builtins.py:232
109
104
" Text has changed since the previous revision."
110
105
msgstr "verändert"
112
#: bzrlib/builtins.py:323
107
#: bzrlib/builtins.py:235
115
110
" File kind has been changed (e.g. from file to directory)."
117
"Dateiart wurde geändert\n"
118
" Dateiart hat sich geändert (z.B. von Datei zu Verzeichnis)"
120
#: bzrlib/builtins.py:326
113
#: bzrlib/builtins.py:238
123
116
" Not versioned and not matching an ignore pattern."
126
" Nicht versioniert und stimmt nicht mit einem Ignorierungsmuster überein."
128
#: bzrlib/builtins.py:329
119
#: bzrlib/builtins.py:241
130
121
"Additionally for directories, symlinks and files with a changed\n"
131
122
"executable bit, Bazaar indicates their type using a trailing\n"
132
123
"character: '/', '@' or '*' respectively. These decorations can be\n"
133
124
"disabled using the '--no-classify' option."
135
"Für Verzeichnisse, Symbolische Verweise sowie Dateien\n"
136
"mit veränderter Ausführungsberechtigung zeigt Bazaar\n"
137
"den Typ zusätzlich durch ein angehängtes Zeichen\n"
138
"»/«, »@« oder »*« an. Diese Kennzeichnung kann mit der Option\n"
139
"»--no-classify« unterbunden werden."
141
#: bzrlib/builtins.py:334
127
#: bzrlib/builtins.py:246
143
129
"To see ignored files use 'bzr ignored'. For details on the\n"
144
130
"changes to file texts, use 'bzr diff'."
146
"Mit »bzr ignored« werden ignorierte Dateien aufgelistet.\n"
147
"Änderungen an den Dateiinhalten werden mit »bzr diff« angezeigt."
149
#: bzrlib/builtins.py:337
133
#: bzrlib/builtins.py:249
151
135
"Note that --short or -S gives status flags for each item, similar\n"
152
136
"to Subversion's status command. To get output similar to svn -q,\n"
153
137
"use bzr status -SV."
155
"Beachten Sie, dass --short oder -S für jedes Element eine\n"
156
"Statusmarkierung anzeigt, ähnlich des Statusbefehls von\n"
157
"Subversion. Um eine mit svn -q vergleichbare Ausgabe zu\n"
158
"erhalten, verwenden Sie bzr status -SV."
160
#: bzrlib/builtins.py:341
140
#: bzrlib/builtins.py:253
162
142
"If no arguments are specified, the status of the entire working\n"
163
143
"directory is shown. Otherwise, only the status of the specified\n"
164
144
"files or directories is reported. If a directory is given, status\n"
165
145
"is reported for everything inside that directory."
167
"Wenn keine Argumente angegeben wurden, wird der Status des\n"
168
"gesamten Arbeitsverzeichnisses angezeigt, andernfalls nur der\n"
169
"Status der angegebenen Dateien und Verzeichnisse. Wenn ein\n"
170
"Verzeichnis angegeben wurde, wird der Status aller darin\n"
171
"enthaltenen Elemente aufgelistet."
173
#: bzrlib/builtins.py:346
148
#: bzrlib/builtins.py:258
175
150
"Before merges are committed, the pending merge tip revisions are\n"
176
151
"shown. To see all pending merge revisions, use the -v option.\n"
177
152
"To skip the display of pending merge information altogether, use\n"
178
153
"the no-pending option or specify a file/directory."
180
"Bevor Änderungen übertragen werden, wird für jede ausstehende\n"
181
"Zusammenführung die neueste Revision angezeigt. Mit der Option\n"
182
"-v werden alle ausstehenden Revisionen angezeigt. Um die\n"
183
"Informationen über ausstehende Zusammenführungen komplett\n"
184
"zu unterdrücken kann die Option no-pending verwendet oder\n"
185
"eine Datei oder ein Verzeichnis angegeben werden."
187
#: bzrlib/builtins.py:351
156
#: bzrlib/builtins.py:263
189
158
"To compare the working directory to a specific revision, pass a\n"
190
159
"single revision to the revision argument."
192
"Um das Arbeitsverzeichnis mit einer bestimmten Revision zu vergleichen,\n"
193
"geben Sie eine einzelne Revision mit dem Argument \"revision\" an."
195
#: bzrlib/builtins.py:354
162
#: bzrlib/builtins.py:266
197
164
"To see which files have changed in a specific revision, or between\n"
198
165
"two revisions, pass a revision range to the revision argument.\n"
199
166
"This will produce the same results as calling 'bzr diff --summarize'."
201
"Um zu sehen, welche Dateien in einer bestimmten Revision\n"
202
"oder zwischen zwei Revisionen verändert wurden,\n"
203
"geben Sie einen Revisionebereich mit dem Argument \"revision\" an.\n"
204
"Dies erzeugt das gleiche Ergebnis wie der Aufruf 'bzr diff --summarize'."
206
#: bzrlib/builtins.py:363
169
#: bzrlib/builtins.py:275
207
170
msgid "Use short status indicators."
208
msgstr "Kurze Zustandsanzeiger verwenden."
210
#: bzrlib/builtins.py:365
173
#: bzrlib/builtins.py:277
211
174
msgid "Only show versioned files."
212
msgstr "Nur versionierte Dateien anzeigen."
214
#: bzrlib/builtins.py:367
177
#: bzrlib/builtins.py:279
215
178
msgid "Don't show pending merges."
216
msgstr "Ausstehende Zusammenführungen nicht anzeigen."
218
#: bzrlib/builtins.py:370
181
#: bzrlib/builtins.py:282
219
182
msgid "Do not mark object type using indicator."
220
msgstr "Objekte nicht entsprechend ihres Typs kennzeichnen."
222
#: bzrlib/builtins.py:385
185
#: bzrlib/builtins.py:297
223
186
msgid "bzr status --revision takes exactly one or two revision specifiers"
225
"bzr status --revision benötigt exakt eine oder zwei "
226
"Revisionsspezifikation(en)."
228
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
189
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
229
190
msgid "You can only supply one of revision_id or --revision"
230
msgstr "Sie können nur revision_id oder --revision angeben"
232
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
193
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
233
194
msgid "You must supply either --revision or a revision_id"
234
msgstr "Sie müssen entweder --revision oder eine revision_id angeben"
236
#: bzrlib/builtins.py:439
197
#: bzrlib/builtins.py:351
238
199
msgid "Repository %r does not support access to raw revision texts"
239
msgstr "Quelle %r unterstützt keinen Zugriff auf reine Revisionstexte"
241
#: bzrlib/builtins.py:450
202
#: bzrlib/builtins.py:362
242
203
msgid "The repository {0} contains no revision {1}."
243
msgstr "Die Quelle {0} enthält keine neue Überarbeitung {1}."
245
#: bzrlib/builtins.py:457
206
#: bzrlib/builtins.py:369
246
207
msgid "You cannot specify a NULL revision."
247
msgstr "Sie können keine NULL-Revision angeben."
249
#: bzrlib/builtins.py:549
210
#: bzrlib/builtins.py:461
250
211
msgid "Remove the working tree from a given branch/checkout."
251
msgstr "Entfernt den Arbeitsbaum zu einer Branch/einem Checkout."
253
#: bzrlib/builtins.py:551
214
#: bzrlib/builtins.py:463
255
216
"Since a lightweight checkout is little more than a working tree\n"
256
217
"this will refuse to run against one."
259
#: bzrlib/builtins.py:554
220
#: bzrlib/builtins.py:466
260
221
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "Benutzen Sie »bzr checkout«, um den Arbeitsbaum neu aufzubauen."
263
#: bzrlib/builtins.py:560
224
#: bzrlib/builtins.py:472
265
226
"Remove the working tree even if it has uncommitted or shelved changes."
267
"Den Arbeitsbaum entfernen, auch wenn dieser nicht übertragene oder "
268
"zurückgestellte Änderungen enthält."
270
#: bzrlib/builtins.py:574
229
#: bzrlib/builtins.py:486
271
230
msgid "No working tree to remove"
272
msgstr "Keinen Arbeitsbaum zum Entfernen"
274
#: bzrlib/builtins.py:576
233
#: bzrlib/builtins.py:488
275
234
msgid "You cannot remove the working tree of a remote path"
276
msgstr "Sie können einen entfernten Arbeitsbaum nicht löschen"
278
#: bzrlib/builtins.py:585
237
#: bzrlib/builtins.py:497
279
238
msgid "You cannot remove the working tree from a lightweight checkout"
282
#: bzrlib/builtins.py:625
241
#: bzrlib/builtins.py:537
284
243
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
285
244
"instead. Use \"--force\" if you are sure you want to reset the working tree."
287
"Der Baum scheint nicht beschädigt zu sein. Wahrscheinlich möchten Sie "
288
"stattdessen \"bzr revert\" ausführen. Benutzen Sie \"--force\", wenn Sie den "
289
"Arbeitsbaum wirklich zurücksetzen möchten."
291
#: bzrlib/builtins.py:636
247
#: bzrlib/builtins.py:548
293
249
", the header appears corrupt, try passing -r -1 to set the state to the last "
296
", die Kopfzeilen scheinen beschädigt zu sein. Versuchen Sie -r -1 um den "
297
"Status der letzten Einreichung zu übernehmen."
299
#: bzrlib/builtins.py:640
253
#: bzrlib/builtins.py:552
300
254
msgid "failed to reset the tree state{0}"
301
msgstr "Baumstatus{0} konnte nicht zurückgesetzt werden"
303
#: bzrlib/builtins.py:644
257
#: bzrlib/builtins.py:556
304
258
msgid "Show current revision number."
305
msgstr "Aktuelle Revisionsnummer anzeigen."
307
#: bzrlib/builtins.py:646
261
#: bzrlib/builtins.py:558
308
262
msgid "This is equal to the number of revisions on this branch."
311
#: bzrlib/builtins.py:659
265
#: bzrlib/builtins.py:571
312
266
msgid "--tree and --revision can not be used together"
315
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
269
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
316
270
msgid "Tags can only be placed on a single revision, not on a range"
319
#: bzrlib/builtins.py:700
273
#: bzrlib/builtins.py:612
320
274
msgid "Show revno of working tree."
323
#: bzrlib/builtins.py:748
277
#: bzrlib/builtins.py:660
324
278
msgid "Add specified files or directories."
325
msgstr "Angegebene Dateien oder Verzeichnisse hinzufügen."
327
#: bzrlib/builtins.py:750
281
#: bzrlib/builtins.py:662
329
283
"In non-recursive mode, all the named items are added, regardless\n"
330
284
"of whether they were previously ignored. A warning is given if\n"
331
285
"any of the named files are already versioned."
334
#: bzrlib/builtins.py:754
288
#: bzrlib/builtins.py:666
336
290
"In recursive mode (the default), files are treated the same way\n"
337
291
"but the behaviour for directories is different. Directories that\n"
381
333
"into a subdirectory of this one."
384
#: bzrlib/builtins.py:784
336
#: bzrlib/builtins.py:696
386
338
"Any files matching patterns in the ignore list will not be added\n"
387
339
"unless they are explicitly mentioned."
389
"Alle Dateien, die auf Muster in der Ignorierliste zutreffen, werden\n"
390
"nicht hinzugefügt, außer Sie geben diese explizit an."
392
#: bzrlib/builtins.py:787
342
#: bzrlib/builtins.py:699
394
344
"In recursive mode, files larger than the configuration option \n"
395
345
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
399
#: bzrlib/builtins.py:794
349
#: bzrlib/builtins.py:706
400
350
msgid "Don't recursively add the contents of directories."
401
msgstr "Inhalte von Verzeichnissen nicht rekursiv hinzufügen."
403
#: bzrlib/builtins.py:800
353
#: bzrlib/builtins.py:712
404
354
msgid "Lookup file ids from this tree."
407
#: bzrlib/builtins.py:836
357
#: bzrlib/builtins.py:748
408
358
msgid "ignored {0} matching \"{1}\"\n"
409
msgstr "ignoriert {0} übereinstimmend \"{1}\"\n"
411
#: bzrlib/builtins.py:841
361
#: bzrlib/builtins.py:753
412
362
msgid "Create a new versioned directory."
413
msgstr "Ein neues versioniertes Verzeichnis erstellen."
415
#: bzrlib/builtins.py:843
365
#: bzrlib/builtins.py:755
416
366
msgid "This is equivalent to creating the directory and then adding it."
417
msgstr "Dies entspricht dem Anlegen und Hinzufügen des Ordners."
419
#: bzrlib/builtins.py:850
369
#: bzrlib/builtins.py:762
420
370
msgid "No error if existing, make parent directories as needed."
423
#: bzrlib/builtins.py:884
373
#: bzrlib/builtins.py:796
425
375
msgid "added %s\n"
426
msgstr "%s hinzugefügt\n"
428
#: bzrlib/builtins.py:926
378
#: bzrlib/builtins.py:838
430
380
msgid "invalid kind %r specified"
433
#: bzrlib/builtins.py:963
383
#: bzrlib/builtins.py:875
434
384
msgid "Move or rename a file."
435
msgstr "Eine Datei verschieben oder umbenennen."
437
#: bzrlib/builtins.py:965
387
#: bzrlib/builtins.py:877
438
388
msgid " bzr mv SOURCE... DESTINATION"
439
msgstr " bzr mv QUELLE... ZIEL"
441
#: bzrlib/builtins.py:967
391
#: bzrlib/builtins.py:879
443
393
"If the last argument is a versioned directory, all the other names\n"
444
394
"are moved into it. Otherwise, there must be exactly two arguments\n"
445
395
"and the file is changed to a new name."
448
#: bzrlib/builtins.py:971
398
#: bzrlib/builtins.py:883
450
400
"If OLDNAME does not exist on the filesystem but is versioned and\n"
451
401
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
454
404
"The same is valid when moving many SOURCE files to a DESTINATION."
457
#: bzrlib/builtins.py:977
407
#: bzrlib/builtins.py:889
458
408
msgid "Files cannot be moved between branches."
459
msgstr "Dateien können nicht zwischen Zweigen verschoben werden."
461
#: bzrlib/builtins.py:984
411
#: bzrlib/builtins.py:896
463
413
"Move only the bzr identifier of the file, because the file has already been "
466
"Verschiebe nur den bzr-Bezeichner der Datei, da diese bereits verschoben "
469
#: bzrlib/builtins.py:986
417
#: bzrlib/builtins.py:898
470
418
msgid "Automatically guess renames."
471
msgstr "Umbenennungen automatisch erraten"
473
#: bzrlib/builtins.py:987
421
#: bzrlib/builtins.py:899
474
422
msgid "Avoid making changes when guessing renames."
475
msgstr "Keine Änderungen durchführen, wenn Umbenennungen erraten werden."
477
#: bzrlib/builtins.py:996
425
#: bzrlib/builtins.py:908
478
426
msgid "--dry-run requires --auto."
479
msgstr "--dry-run erfordert --auto."
481
#: bzrlib/builtins.py:1000
429
#: bzrlib/builtins.py:912
482
430
msgid "missing file argument"
483
msgstr "Datei-Argument fehlt"
485
#: bzrlib/builtins.py:1004
433
#: bzrlib/builtins.py:916
486
434
msgid "can not move root of branch"
487
msgstr "Wurzel des Zweiges kann nicht verschoben werden"
489
#: bzrlib/builtins.py:1010
437
#: bzrlib/builtins.py:922
490
438
msgid "Only one path may be specified to --auto."
491
msgstr "Es kann nur ein Pfad mit --auto angegeben werden."
493
#: bzrlib/builtins.py:1013
441
#: bzrlib/builtins.py:925
494
442
msgid "--after cannot be specified with --auto."
495
msgstr "--after kann nicht mit --auto angegeben werden."
497
#: bzrlib/builtins.py:1050
445
#: bzrlib/builtins.py:962
498
446
msgid "to mv multiple files the destination must be a versioned directory"
500
"um mehrere Dateien zu verschieben, muss das Ziel ein versioniertes "
503
#: bzrlib/builtins.py:1102
449
#: bzrlib/builtins.py:1014
504
450
msgid "Turn this branch into a mirror of another branch."
505
msgstr "Diesen Zweig zu einer Spiegelung eines anderen Zweiges machen."
507
#: bzrlib/builtins.py:1104
453
#: bzrlib/builtins.py:1016
509
455
"By default, this command only works on branches that have not diverged.\n"
510
456
"Branches are considered diverged if the destination branch's most recent \n"
534
480
"value will only be saved if the remote location can be accessed."
537
#: bzrlib/builtins.py:1122
483
#: bzrlib/builtins.py:1034
539
485
"The --verbose option will display the revisions pulled using the log_format\n"
540
486
"configuration option. You can use a different format by overriding it with\n"
541
487
"-Olog_format=<other_format>."
544
#: bzrlib/builtins.py:1126
490
#: bzrlib/builtins.py:1038
546
492
"Note: The location can be specified either in the form of a branch,\n"
547
493
"or in the form of a path to a file containing a merge directive generated\n"
551
#: bzrlib/builtins.py:1134
497
#: bzrlib/builtins.py:1046
552
498
msgid "Show logs of pulled revisions."
555
#: bzrlib/builtins.py:1136
501
#: bzrlib/builtins.py:1048
557
503
"Branch to pull into, rather than the one containing the working directory."
560
#: bzrlib/builtins.py:1139
506
#: bzrlib/builtins.py:1051
562
508
"Perform a local pull in a bound branch. Local pulls are not applied to the "
566
#: bzrlib/builtins.py:1168
512
#: bzrlib/builtins.py:1080
567
513
msgid "Need working tree for --show-base."
568
msgstr "Ein Arbeitsbaum wird für --show-base benötigt."
570
#: bzrlib/builtins.py:1184
516
#: bzrlib/builtins.py:1096
571
517
msgid "No pull location known or specified."
574
#: bzrlib/builtins.py:1190
520
#: bzrlib/builtins.py:1102
576
522
msgid "Using saved parent location: %s\n"
579
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
525
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
580
526
msgid "Cannot use -r with merge directives or bundles"
583
#: bzrlib/builtins.py:1238
529
#: bzrlib/builtins.py:1150
584
530
msgid "Update a mirror of this branch."
585
msgstr "Eine Spiegelung dieses Zweiges aktualisieren."
587
#: bzrlib/builtins.py:1240
533
#: bzrlib/builtins.py:1152
589
535
"The target branch will not have its working tree populated because this\n"
590
536
"is both expensive, and is not supported on remote file systems."
593
#: bzrlib/builtins.py:1243
539
#: bzrlib/builtins.py:1155
595
541
"Some smart servers or protocols *may* put the working tree in place in\n"
598
"Einige intelligente Server oder Protokolle legen den Arbeitsbaum\n"
599
"*möglicherweise* in die Zukunft."
601
#: bzrlib/builtins.py:1246
545
#: bzrlib/builtins.py:1158
603
547
"This command only works on branches that have not diverged. Branches are\n"
604
548
"considered diverged if the destination branch's most recent commit is one\n"
605
549
"that has not been merged (directly or indirectly) by the source branch."
608
#: bzrlib/builtins.py:1250
552
#: bzrlib/builtins.py:1162
610
554
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
611
555
"the other branch completely, discarding its unmerged changes."
614
#: bzrlib/builtins.py:1253
558
#: bzrlib/builtins.py:1165
616
560
"If you want to ensure you have the different changes in the other branch,\n"
617
561
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
618
562
"After that you will be able to do a push without '--overwrite'."
621
#: bzrlib/builtins.py:1257
565
#: bzrlib/builtins.py:1169
623
567
"If there is no default push location set, the first push will set it (use\n"
624
568
"--no-remember to avoid setting it). After that, you can omit the\n"
626
570
"value will only be saved if the remote location can be accessed."
629
#: bzrlib/builtins.py:1262
573
#: bzrlib/builtins.py:1174
631
575
"The --verbose option will display the revisions pushed using the log_format\n"
632
576
"configuration option. You can use a different format by overriding it with\n"
633
577
"-Olog_format=<other_format>."
636
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
580
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
638
582
"Branch to push from, rather than the one containing the working directory."
641
#: bzrlib/builtins.py:1276
585
#: bzrlib/builtins.py:1188
643
587
"By default push will fail if the target directory exists, but does not "
644
588
"already have a control directory. This flag will allow push to proceed."
647
#: bzrlib/builtins.py:1281
591
#: bzrlib/builtins.py:1193
649
593
"Create a stacked branch that references the public location of the parent "
652
"Einen gestapelten Zweig anlegen, der auf den öffentlichen Pfad des "
653
"übergeordneten Zweigs referenziert."
655
#: bzrlib/builtins.py:1284
597
#: bzrlib/builtins.py:1196
657
599
"Create a stacked branch that refers to another branch for the commit "
658
600
"history. Only the work not present in the referenced branch is included in "
659
601
"the branch created."
662
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
604
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
664
606
"Refuse to push if there are uncommitted changes in the working tree, --no-"
665
607
"strict disables the check."
668
#: bzrlib/builtins.py:1292
610
#: bzrlib/builtins.py:1204
669
611
msgid "Don't populate the working tree, even for protocols that support it."
672
#: bzrlib/builtins.py:1336
614
#: bzrlib/builtins.py:1248
673
615
msgid "Could not determine branch to refer to."
676
#: bzrlib/builtins.py:1345
618
#: bzrlib/builtins.py:1257
679
621
"No push location known or specified. To push to the parent branch (at %s), "
680
622
"use 'bzr push :parent'."
683
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
625
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
684
626
msgid "No push location known or specified."
687
#: bzrlib/builtins.py:1355
629
#: bzrlib/builtins.py:1267
689
631
msgid "Using saved push location: %s"
692
#: bzrlib/builtins.py:1365
634
#: bzrlib/builtins.py:1277
693
635
msgid "Create a new branch that is a copy of an existing branch."
696
#: bzrlib/builtins.py:1367
638
#: bzrlib/builtins.py:1279
698
640
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
699
641
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
704
646
"create ./foo-bar."
707
#: bzrlib/builtins.py:1374
649
#: bzrlib/builtins.py:1286
709
651
"To retrieve the branch as of a particular revision, supply the --revision\n"
710
652
"parameter, as in \"branch foo/bar -r 5\"."
713
#: bzrlib/builtins.py:1377
655
#: bzrlib/builtins.py:1289
714
656
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
717
#: bzrlib/builtins.py:1387
659
#: bzrlib/builtins.py:1299
718
660
msgid "Create a branch without a working-tree."
721
#: bzrlib/builtins.py:1389
663
#: bzrlib/builtins.py:1301
722
664
msgid "Switch the checkout in the current directory to the new branch."
725
#: bzrlib/builtins.py:1392
667
#: bzrlib/builtins.py:1304
727
669
"Create a stacked branch referring to the source branch. The new branch will "
728
670
"depend on the availability of the source branch for all operations."
731
#: bzrlib/builtins.py:1396
673
#: bzrlib/builtins.py:1308
732
674
msgid "Do not use a shared repository, even if available."
735
#: bzrlib/builtins.py:1398
677
#: bzrlib/builtins.py:1310
737
679
"By default branch will fail if the target directory exists, but does not "
738
680
"already have a control directory. This flag will allow branch to proceed."
741
#: bzrlib/builtins.py:1403
683
#: bzrlib/builtins.py:1315
742
684
msgid "Bind new branch to from location."
745
#: bzrlib/builtins.py:1450
687
#: bzrlib/builtins.py:1362
747
689
msgid "Target directory \"%s\" already exists."
750
#: bzrlib/builtins.py:1462
692
#: bzrlib/builtins.py:1374
752
694
msgid "Parent of \"%s\" does not exist."
755
#: bzrlib/builtins.py:1481
697
#: bzrlib/builtins.py:1393
756
698
msgid "The branch {0} has no revision {1}."
759
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
701
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
761
703
msgid "Created new stacked branch referring to %s."
764
#: bzrlib/builtins.py:1500
706
#: bzrlib/builtins.py:1407
766
708
msgid "Branched %d revision."
767
709
msgid_plural "Branched %d revisions."
771
#: bzrlib/builtins.py:1505
713
#: bzrlib/builtins.py:1412
773
715
msgid "New branch bound to %s"
776
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
718
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
778
720
msgid "Switched to branch: %s"
779
msgstr "Zu Zweig gewechselt: %s"
781
#: bzrlib/builtins.py:1515
723
#: bzrlib/builtins.py:1422
782
724
msgid "List the branches available at the current location."
783
msgstr "Die verfügbaren Zweige an der aktuellen Stelle auflisten."
785
#: bzrlib/builtins.py:1517
727
#: bzrlib/builtins.py:1424
787
729
"This command will print the names of all the branches at the current\n"
790
"Dieser Befehl wird die Namen aller verfügbaren Zweige\n"
791
"an der aktuellen Stelle auflisten."
793
#: bzrlib/builtins.py:1524
733
#: bzrlib/builtins.py:1431
795
735
"Recursively scan for branches rather than just looking in the specified "
799
#: bzrlib/builtins.py:1554
739
#: bzrlib/builtins.py:1461
800
740
msgid "(default)"
803
#: bzrlib/builtins.py:1566
743
#: bzrlib/builtins.py:1473
804
744
msgid "Create a new checkout of an existing branch."
807
#: bzrlib/builtins.py:1568
747
#: bzrlib/builtins.py:1475
809
749
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
901
839
"out the old content of that file to a new location."
904
#: bzrlib/builtins.py:1694
842
#: bzrlib/builtins.py:1601
906
844
"The 'dir' argument, if given, must be the location of the root of a\n"
907
845
"working tree to update. By default, the working tree that contains the \n"
908
846
"current working directory is used."
911
#: bzrlib/builtins.py:1710
849
#: bzrlib/builtins.py:1617
912
850
msgid "bzr update --revision takes exactly one revision"
915
#: bzrlib/builtins.py:1718
853
#: bzrlib/builtins.py:1625
916
854
msgid "bzr update can only update a whole tree, not a file or subdirectory"
919
#: bzrlib/builtins.py:1749
857
#: bzrlib/builtins.py:1656
920
858
msgid "Tree is up to date at revision {0} of branch {1}"
923
#: bzrlib/builtins.py:1765
861
#: bzrlib/builtins.py:1672
926
864
"branch has no revision %s\n"
927
865
"bzr update --revision only works for a revision in the branch history"
930
#: bzrlib/builtins.py:1771
868
#: bzrlib/builtins.py:1678
931
869
msgid "Updated to revision {0} of branch {1}"
934
#: bzrlib/builtins.py:1775
872
#: bzrlib/builtins.py:1682
936
874
"Your local commits will now show as pending merges with 'bzr status', and "
937
875
"can be committed with 'bzr commit'."
940
#: bzrlib/builtins.py:1784
878
#: bzrlib/builtins.py:1691
941
879
msgid "Show information about a working tree, branch or repository."
944
#: bzrlib/builtins.py:1786
882
#: bzrlib/builtins.py:1693
946
884
"This command will show all known locations and formats associated to the\n"
947
885
"tree, branch or repository."
950
#: bzrlib/builtins.py:1789
888
#: bzrlib/builtins.py:1696
952
890
"In verbose mode, statistical information is included with each report.\n"
953
891
"To see extended statistic information, use a verbosity level of 2 or\n"
954
892
"higher by specifying the verbose option multiple times, e.g. -vv."
957
#: bzrlib/builtins.py:1793
895
#: bzrlib/builtins.py:1700
958
896
msgid "Branches and working trees will also report any missing revisions."
961
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
962
#: bzrlib/builtins.py:6442
899
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
900
#: bzrlib/builtins.py:6389
963
901
msgid ":Examples:"
966
#: bzrlib/builtins.py:1797
904
#: bzrlib/builtins.py:1704
967
905
msgid " Display information on the format and related locations:"
970
#: bzrlib/builtins.py:1799
908
#: bzrlib/builtins.py:1706
971
909
msgid " bzr info"
974
#: bzrlib/builtins.py:1801
912
#: bzrlib/builtins.py:1708
976
914
" Display the above together with extended format information and\n"
977
915
" basic statistics (like the number of files in the working tree and\n"
978
916
" number of revisions in the branch and repository):"
981
#: bzrlib/builtins.py:1805
919
#: bzrlib/builtins.py:1712
982
920
msgid " bzr info -v"
983
msgstr " bzr info -v"
985
#: bzrlib/builtins.py:1807
923
#: bzrlib/builtins.py:1714
986
924
msgid " Display the above together with number of committers to the branch:"
989
#: bzrlib/builtins.py:1809
927
#: bzrlib/builtins.py:1716
990
928
msgid " bzr info -vv"
991
msgstr " bzr info -vv"
993
#: bzrlib/builtins.py:1828
931
#: bzrlib/builtins.py:1735
994
932
msgid "Remove files or directories."
995
msgstr "Dateien oder Verzeichnisse entfernen."
997
#: bzrlib/builtins.py:1830
935
#: bzrlib/builtins.py:1737
999
937
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1000
938
"delete them if they can easily be recovered using revert otherwise they\n"
1003
941
"Bazaar but missing in your tree and stop tracking them for you."
1006
#: bzrlib/builtins.py:1838
944
#: bzrlib/builtins.py:1745
1007
945
msgid "Only remove files that have never been committed."
1010
#: bzrlib/builtins.py:1840
948
#: bzrlib/builtins.py:1747
1011
949
msgid "The file deletion mode to be used."
1012
msgstr "Der Datei-Löschmodus, der verwendet wird."
1014
#: bzrlib/builtins.py:1841
952
#: bzrlib/builtins.py:1748
1015
953
msgid "Deletion Strategy"
1016
msgstr "Lösch-Strategie"
1018
#: bzrlib/builtins.py:1842
956
#: bzrlib/builtins.py:1749
1019
957
msgid "Backup changed files (default)."
1020
msgstr "Geänderte Dateien sichern (Vorgabe)."
1022
#: bzrlib/builtins.py:1843
960
#: bzrlib/builtins.py:1750
1023
961
msgid "Delete from bzr but leave the working copy."
1026
#: bzrlib/builtins.py:1844
964
#: bzrlib/builtins.py:1751
1027
965
msgid "Don't backup changed files."
1028
msgstr "Geänderte Dateien nicht sichern."
1030
#: bzrlib/builtins.py:1845
968
#: bzrlib/builtins.py:1752
1032
970
"Delete all the specified files, even if they can not be recovered and even "
1033
971
"if they are non-empty directories. (deprecated, use no-backup)"
1036
#: bzrlib/builtins.py:1854
974
#: bzrlib/builtins.py:1761
1037
975
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1040
#: bzrlib/builtins.py:1871
978
#: bzrlib/builtins.py:1778
1041
979
msgid "No matching files."
1042
msgstr "Keine zutreffenden Dateien."
1044
#: bzrlib/builtins.py:1932
982
#: bzrlib/builtins.py:1839
1045
983
msgid "Reconcile bzr metadata in a branch."
1048
#: bzrlib/builtins.py:1934
986
#: bzrlib/builtins.py:1841
1050
988
"This can correct data mismatches that may have been caused by\n"
1051
989
"previous ghost operations or bzr upgrades. You should only\n"
1266
1199
" 0 - no change"
1270
" 2 - Nicht darstellbare Änderungen\n"
1272
" 0 - Keine Änderungen"
1274
#: bzrlib/builtins.py:2220
1202
#: bzrlib/builtins.py:2127
1277
1205
" Shows the difference in the working tree versus the last commit::"
1280
#: bzrlib/builtins.py:2223
1208
#: bzrlib/builtins.py:2130
1281
1209
msgid " bzr diff"
1284
#: bzrlib/builtins.py:2225
1212
#: bzrlib/builtins.py:2132
1285
1213
msgid " Difference between the working tree and revision 1::"
1288
#: bzrlib/builtins.py:2227
1216
#: bzrlib/builtins.py:2134
1289
1217
msgid " bzr diff -r1"
1290
msgstr " bzr diff -r1"
1292
#: bzrlib/builtins.py:2229
1220
#: bzrlib/builtins.py:2136
1293
1221
msgid " Difference between revision 3 and revision 1::"
1296
#: bzrlib/builtins.py:2231
1224
#: bzrlib/builtins.py:2138
1297
1225
msgid " bzr diff -r1..3"
1298
msgstr " bzr diff -r1..3"
1300
#: bzrlib/builtins.py:2233
1228
#: bzrlib/builtins.py:2140
1301
1229
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1304
#: bzrlib/builtins.py:2235
1232
#: bzrlib/builtins.py:2142
1305
1233
msgid " bzr diff -r1..3 xxx"
1306
msgstr " bzr diff -r1..3 xxx"
1308
#: bzrlib/builtins.py:2237
1236
#: bzrlib/builtins.py:2144
1309
1237
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1312
#: bzrlib/builtins.py:2239
1240
#: bzrlib/builtins.py:2146
1313
1241
msgid " bzr diff -c2"
1314
msgstr " bzr diff -c2"
1316
#: bzrlib/builtins.py:2241
1244
#: bzrlib/builtins.py:2148
1318
1246
" To see the changes introduced by revision X::\n"
1320
1248
" bzr diff -cX"
1323
#: bzrlib/builtins.py:2245
1251
#: bzrlib/builtins.py:2152
1325
1253
" Note that in the case of a merge, the -c option shows the changes\n"
1326
1254
" compared to the left hand parent. To see the changes against\n"
1327
1255
" another parent, use::"
1330
#: bzrlib/builtins.py:2249
1258
#: bzrlib/builtins.py:2156
1331
1259
msgid " bzr diff -r<chosen_parent>..X"
1334
#: bzrlib/builtins.py:2251
1262
#: bzrlib/builtins.py:2158
1336
1264
" The changes between the current revision and the previous revision\n"
1337
1265
" (equivalent to -c-1 and -r-2..-1)"
1340
#: bzrlib/builtins.py:2254
1268
#: bzrlib/builtins.py:2161
1341
1269
msgid " bzr diff -r-2.."
1342
msgstr " bzr diff -r-2.."
1344
#: bzrlib/builtins.py:2256
1272
#: bzrlib/builtins.py:2163
1345
1273
msgid " Show just the differences for file NEWS::"
1348
#: bzrlib/builtins.py:2258
1276
#: bzrlib/builtins.py:2165
1349
1277
msgid " bzr diff NEWS"
1352
#: bzrlib/builtins.py:2260
1280
#: bzrlib/builtins.py:2167
1353
1281
msgid " Show the differences in working tree xxx for file NEWS::"
1356
#: bzrlib/builtins.py:2262
1284
#: bzrlib/builtins.py:2169
1357
1285
msgid " bzr diff xxx/NEWS"
1360
#: bzrlib/builtins.py:2264
1288
#: bzrlib/builtins.py:2171
1361
1289
msgid " Show the differences from branch xxx to this working tree:"
1364
#: bzrlib/builtins.py:2266
1292
#: bzrlib/builtins.py:2173
1365
1293
msgid " bzr diff --old xxx"
1366
msgstr " bzr diff --old xxx"
1368
#: bzrlib/builtins.py:2268
1296
#: bzrlib/builtins.py:2175
1369
1297
msgid " Show the differences between two branches for file NEWS::"
1372
#: bzrlib/builtins.py:2270
1300
#: bzrlib/builtins.py:2177
1373
1301
msgid " bzr diff --old xxx --new yyy NEWS"
1376
#: bzrlib/builtins.py:2272
1304
#: bzrlib/builtins.py:2179
1377
1305
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1380
#: bzrlib/builtins.py:2274
1308
#: bzrlib/builtins.py:2181
1382
1310
" bzr diff --prefix old/:new/\n"
1386
1314
" bzr diff --using /usr/bin/diff --diff-options -wu"
1389
#: bzrlib/builtins.py:2284
1317
#: bzrlib/builtins.py:2191
1390
1318
msgid "Pass these options to the external diff program."
1391
msgstr "Diese Optionen an das externe Programm diff übergeben."
1393
#: bzrlib/builtins.py:2287
1321
#: bzrlib/builtins.py:2194
1395
1323
"Set prefixes added to old and new filenames, as two values separated by a "
1396
1324
"colon. (eg \"old/:new/\")."
1399
#: bzrlib/builtins.py:2290
1327
#: bzrlib/builtins.py:2197
1400
1328
msgid "Branch/tree to compare from."
1403
#: bzrlib/builtins.py:2294
1331
#: bzrlib/builtins.py:2201
1404
1332
msgid "Branch/tree to compare to."
1407
#: bzrlib/builtins.py:2300
1335
#: bzrlib/builtins.py:2207
1408
1336
msgid "Use this command to compare files."
1409
msgstr "Diesen Befehl zum Vergleichen von Dateien benutzen."
1411
#: bzrlib/builtins.py:2305
1339
#: bzrlib/builtins.py:2212
1412
1340
msgid "Diff format to use."
1413
msgstr "Diff-Format, das benutzt werden soll."
1415
#: bzrlib/builtins.py:2307
1343
#: bzrlib/builtins.py:2214
1416
1344
msgid "Diff format"
1417
msgstr "Diff-Format"
1419
#: bzrlib/builtins.py:2329
1347
#: bzrlib/builtins.py:2236
1420
1348
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1423
#: bzrlib/builtins.py:2333
1351
#: bzrlib/builtins.py:2240
1424
1352
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1427
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1428
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1355
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1356
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1429
1357
msgid "{0} and {1} are mutually exclusive"
1430
msgstr "{0} und {1} schließen sich gegenseitig aus"
1432
#: bzrlib/builtins.py:2358
1360
#: bzrlib/builtins.py:2265
1434
1362
"List files deleted in the working tree.\n"
1438
#: bzrlib/builtins.py:2436
1366
#: bzrlib/builtins.py:2343
1439
1367
msgid "Show the tree root directory."
1442
#: bzrlib/builtins.py:2438
1370
#: bzrlib/builtins.py:2345
1444
1372
"The root is the nearest enclosing directory with a .bzr control\n"
1448
#: bzrlib/builtins.py:2453
1376
#: bzrlib/builtins.py:2360
1449
1377
msgid "The limit argument must be an integer."
1452
#: bzrlib/builtins.py:2461
1380
#: bzrlib/builtins.py:2368
1453
1381
msgid "The levels argument must be an integer."
1456
#: bzrlib/builtins.py:2466
1384
#: bzrlib/builtins.py:2373
1457
1385
msgid "Show historical log for a branch or subset of a branch."
1460
#: bzrlib/builtins.py:2468
1388
#: bzrlib/builtins.py:2375
1462
1390
"log is bzr's default tool for exploring the history of a branch.\n"
1463
1391
"The branch to use is taken from the first parameter. If no parameters\n"
1579
1507
" a nested merge revision and the log will be truncated accordingly."
1582
#: bzrlib/builtins.py:2542
1510
#: bzrlib/builtins.py:2449
1583
1511
msgid ":Path filtering:"
1584
msgstr ":Pfad-Filtern:"
1586
#: bzrlib/builtins.py:2544
1514
#: bzrlib/builtins.py:2451
1588
1516
" If parameters are given and the first one is not a branch, the log\n"
1589
1517
" will be filtered to show only those revisions that changed the\n"
1590
1518
" nominated files or directories."
1593
#: bzrlib/builtins.py:2548
1521
#: bzrlib/builtins.py:2455
1595
1523
" Filenames are interpreted within their historical context. To log a\n"
1596
1524
" deleted file, specify a revision range so that the file existed at\n"
1597
1525
" the end or start of the range."
1600
#: bzrlib/builtins.py:2552
1528
#: bzrlib/builtins.py:2459
1602
1530
" Historical context is also important when interpreting pathnames of\n"
1603
1531
" renamed files/directories. Consider the following example:"
1606
#: bzrlib/builtins.py:2555
1534
#: bzrlib/builtins.py:2462
1608
1536
" * revision 1: add tutorial.txt\n"
1609
1537
" * revision 2: modify tutorial.txt\n"
1610
1538
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1613
#: bzrlib/builtins.py:2559
1541
#: bzrlib/builtins.py:2466
1614
1542
msgid " In this case:"
1615
msgstr " In diesem Fall:"
1617
#: bzrlib/builtins.py:2561
1545
#: bzrlib/builtins.py:2468
1618
1546
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1621
#: bzrlib/builtins.py:2563
1549
#: bzrlib/builtins.py:2470
1623
1551
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1626
#: bzrlib/builtins.py:2565
1554
#: bzrlib/builtins.py:2472
1628
1556
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1629
1557
" the original file in revision 2."
1632
#: bzrlib/builtins.py:2568
1560
#: bzrlib/builtins.py:2475
1634
1562
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1635
1563
" was no file called guide.txt in revision 2."
1638
#: bzrlib/builtins.py:2571
1566
#: bzrlib/builtins.py:2478
1640
1568
" Renames are always followed by log. By design, there is no need to\n"
1641
1569
" explicitly ask for this (and no way to stop logging a file back\n"
1642
1570
" until it was last renamed)."
1645
#: bzrlib/builtins.py:2575
1573
#: bzrlib/builtins.py:2482
1646
1574
msgid ":Other filtering:"
1647
msgstr ":Anderes Filtern:"
1649
#: bzrlib/builtins.py:2577
1577
#: bzrlib/builtins.py:2484
1651
1579
" The --match option can be used for finding revisions that match a\n"
1652
1580
" regular expression in a commit message, committer, author or bug.\n"
1718
1646
" trading disk space for faster speed."
1721
#: bzrlib/builtins.py:2624
1649
#: bzrlib/builtins.py:2531
1722
1650
msgid "Show from oldest to newest."
1725
#: bzrlib/builtins.py:2627
1653
#: bzrlib/builtins.py:2534
1726
1654
msgid "Show files changed in each revision."
1729
#: bzrlib/builtins.py:2633
1657
#: bzrlib/builtins.py:2540
1730
1658
msgid "Show just the specified revision. See also \"help revisionspec\"."
1733
#: bzrlib/builtins.py:2637
1661
#: bzrlib/builtins.py:2544
1734
1662
msgid "What names to list as authors - first, all or committer."
1737
#: bzrlib/builtins.py:2638
1665
#: bzrlib/builtins.py:2545
1738
1666
msgid "Authors"
1741
#: bzrlib/builtins.py:2643
1669
#: bzrlib/builtins.py:2550
1742
1670
msgid "Number of levels to display - 0 for all, 1 for flat."
1745
#: bzrlib/builtins.py:2653
1673
#: bzrlib/builtins.py:2560
1746
1674
msgid "Limit the output to the first N revisions."
1749
#: bzrlib/builtins.py:2658
1677
#: bzrlib/builtins.py:2565
1750
1678
msgid "Show changes made in each revision as a patch."
1753
#: bzrlib/builtins.py:2660
1681
#: bzrlib/builtins.py:2567
1754
1682
msgid "Show merged revisions like --levels 0 does."
1757
#: bzrlib/builtins.py:2664
1685
#: bzrlib/builtins.py:2571
1758
1686
msgid "Do not report commits with more than one parent."
1761
#: bzrlib/builtins.py:2666
1689
#: bzrlib/builtins.py:2573
1763
1691
"Display only the revisions that are not part of both ancestries (require -"
1767
#: bzrlib/builtins.py:2670
1695
#: bzrlib/builtins.py:2577
1768
1696
msgid "Show digital signature validity."
1771
#: bzrlib/builtins.py:2673
1699
#: bzrlib/builtins.py:2580
1772
1700
msgid "Show revisions whose properties match this expression."
1775
#: bzrlib/builtins.py:2677
1703
#: bzrlib/builtins.py:2584
1776
1704
msgid "Show revisions whose message matches this expression."
1779
#: bzrlib/builtins.py:2681
1707
#: bzrlib/builtins.py:2588
1780
1708
msgid "Show revisions whose committer matches this expression."
1783
#: bzrlib/builtins.py:2685
1711
#: bzrlib/builtins.py:2592
1784
1712
msgid "Show revisions whose authors match this expression."
1787
#: bzrlib/builtins.py:2689
1715
#: bzrlib/builtins.py:2596
1788
1716
msgid "Show revisions whose bugs match this expression."
1791
#: bzrlib/builtins.py:2743
1719
#: bzrlib/builtins.py:2650
1792
1720
msgid "--exclude-common-ancestry requires -r with two revisions"
1795
#: bzrlib/builtins.py:2771
1723
#: bzrlib/builtins.py:2678
1796
1724
#, python-format
1797
1725
msgid "Path unknown at end or start of revision range: %s"
1800
#: bzrlib/builtins.py:2888
1728
#: bzrlib/builtins.py:2795
1801
1729
#, python-format
1802
1730
msgid "bzr %s doesn't accept two revisions in different branches."
1805
#: bzrlib/builtins.py:2904
1733
#: bzrlib/builtins.py:2811
1806
1734
#, python-format
1807
1735
msgid "bzr %s --revision takes one or two values."
1810
#: bzrlib/builtins.py:2949
1738
#: bzrlib/builtins.py:2856
1812
1740
"List files in a tree.\n"
1816
#: bzrlib/builtins.py:2958
1744
#: bzrlib/builtins.py:2865
1817
1745
msgid "Recurse into subdirectories."
1820
#: bzrlib/builtins.py:2960
1748
#: bzrlib/builtins.py:2867
1821
1749
msgid "Print paths relative to the root of the branch."
1824
#: bzrlib/builtins.py:2962
1752
#: bzrlib/builtins.py:2869
1825
1753
msgid "Print unknown files."
1826
msgstr "Unbekannte Dateien ausgeben."
1828
#: bzrlib/builtins.py:2963
1756
#: bzrlib/builtins.py:2870
1829
1757
msgid "Print versioned files."
1830
msgstr "Versionierte Dateien ausgeben."
1832
#: bzrlib/builtins.py:2966
1760
#: bzrlib/builtins.py:2873
1833
1761
msgid "Print ignored files."
1834
msgstr "Ignorierte Dateien ausgeben."
1836
#: bzrlib/builtins.py:2968
1764
#: bzrlib/builtins.py:2875
1837
1765
msgid "List entries of a particular kind: file, directory, symlink."
1840
#: bzrlib/builtins.py:2981
1768
#: bzrlib/builtins.py:2888
1841
1769
msgid "invalid kind specified"
1844
#: bzrlib/builtins.py:2984
1772
#: bzrlib/builtins.py:2891
1845
1773
msgid "Cannot set both --verbose and --null"
1848
#: bzrlib/builtins.py:2993
1776
#: bzrlib/builtins.py:2900
1849
1777
msgid "cannot specify both --from-root and PATH"
1852
#: bzrlib/builtins.py:3080
1780
#: bzrlib/builtins.py:2987
1853
1781
msgid "Ignore specified files or patterns."
1856
#: bzrlib/builtins.py:3082
1784
#: bzrlib/builtins.py:2989
1857
1785
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1860
#: bzrlib/builtins.py:3084
1788
#: bzrlib/builtins.py:2991
1862
1790
"If a .bzrignore file does not exist, the ignore command\n"
1863
1791
"will create one and add the specified files or patterns to the newly\n"
1904
1832
" the shell on Unix."
1907
#: bzrlib/builtins.py:3113
1835
#: bzrlib/builtins.py:3020
1909
1837
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1910
1838
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1913
#: bzrlib/builtins.py:3116
1841
#: bzrlib/builtins.py:3023
1916
1844
" Ignore the top level Makefile::"
1919
#: bzrlib/builtins.py:3119
1847
#: bzrlib/builtins.py:3026
1920
1848
msgid " bzr ignore ./Makefile"
1923
#: bzrlib/builtins.py:3121
1851
#: bzrlib/builtins.py:3028
1924
1852
msgid " Ignore .class files in all directories...::"
1927
#: bzrlib/builtins.py:3123
1855
#: bzrlib/builtins.py:3030
1928
1856
msgid " bzr ignore \"*.class\""
1931
#: bzrlib/builtins.py:3125
1859
#: bzrlib/builtins.py:3032
1932
1860
msgid " ...but do not ignore \"special.class\"::"
1935
#: bzrlib/builtins.py:3127
1863
#: bzrlib/builtins.py:3034
1936
1864
msgid " bzr ignore \"!special.class\""
1939
#: bzrlib/builtins.py:3129
1867
#: bzrlib/builtins.py:3036
1940
1868
msgid " Ignore files whose name begins with the \"#\" character::"
1943
#: bzrlib/builtins.py:3131
1871
#: bzrlib/builtins.py:3038
1944
1872
msgid " bzr ignore \"RE:^#\""
1945
msgstr " bzr ignore \"RE:^#\""
1947
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1875
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1948
1876
msgid " Ignore .o files under the lib directory::"
1951
#: bzrlib/builtins.py:3135
1879
#: bzrlib/builtins.py:3042
1952
1880
msgid " bzr ignore \"lib/**/*.o\""
1953
msgstr " bzr ignore \"lib/**/*.o\""
1955
#: bzrlib/builtins.py:3139
1883
#: bzrlib/builtins.py:3046
1956
1884
msgid " bzr ignore \"RE:lib/.*\\.o\""
1957
msgstr " bzr ignore \"RE:lib/.*\\.o\""
1959
#: bzrlib/builtins.py:3141
1887
#: bzrlib/builtins.py:3048
1960
1888
msgid " Ignore everything but the \"debian\" toplevel directory::"
1963
#: bzrlib/builtins.py:3143
1891
#: bzrlib/builtins.py:3050
1965
1893
" bzr ignore \"RE:(?!debian/).*\"\n"
2004
#: bzrlib/builtins.py:3209
1932
#: bzrlib/builtins.py:3116
2005
1933
msgid "List ignored files and the patterns that matched them."
2008
#: bzrlib/builtins.py:3211
1936
#: bzrlib/builtins.py:3118
2010
1938
"List all the ignored files and the ignore pattern that caused the file to\n"
2014
#: bzrlib/builtins.py:3214
1942
#: bzrlib/builtins.py:3121
2015
1943
msgid "Alternatively, to list just the files::"
2016
msgstr "Alternativ, um nur die Dateien aufzulisten:"
2018
#: bzrlib/builtins.py:3216
1946
#: bzrlib/builtins.py:3123
2019
1947
msgid " bzr ls --ignored"
2020
msgstr " bzr ls --ignored"
2022
#: bzrlib/builtins.py:3250
1950
#: bzrlib/builtins.py:3157
2023
1951
#, python-format
2024
1952
msgid "not a valid revision-number: %r"
2025
msgstr "Keine gültige Revisionsnummer: %r"
2027
#: bzrlib/builtins.py:3257
1955
#: bzrlib/builtins.py:3164
2029
1957
"Export current or past revision to a destination directory or archive."
2032
#: bzrlib/builtins.py:3259
1960
#: bzrlib/builtins.py:3166
2033
1961
msgid "If no revision is specified this exports the last committed revision."
2036
#: bzrlib/builtins.py:3261
1964
#: bzrlib/builtins.py:3168
2038
1966
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2039
1967
"given, try to find the format with the extension. If no extension\n"
2040
1968
"is found exports to a directory (equivalent to --format=dir)."
2043
#: bzrlib/builtins.py:3265
1971
#: bzrlib/builtins.py:3172
2045
1973
"If root is supplied, it will be used as the root directory inside\n"
2046
1974
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2047
1975
"to the exported filename. The root option has no effect for 'dir' format."
2050
#: bzrlib/builtins.py:3269
1978
#: bzrlib/builtins.py:3176
2052
1980
"If branch is omitted then the branch containing the current working\n"
2053
1981
"directory will be used."
2056
#: bzrlib/builtins.py:3272
1984
#: bzrlib/builtins.py:3179
2058
1986
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2061
#: bzrlib/builtins.py:3274
1989
#: bzrlib/builtins.py:3181
2063
1991
" ================= =========================\n"
2064
1992
" Supported formats Autodetected by extension\n"
2071
1999
" ================= ========================="
2074
#: bzrlib/builtins.py:3288
2002
#: bzrlib/builtins.py:3195
2075
2003
msgid "Type of file to export to."
2076
msgstr "Art der Datei, in die exportiert wird."
2078
#: bzrlib/builtins.py:3291
2006
#: bzrlib/builtins.py:3198
2079
2007
msgid "Apply content filters to export the convenient form."
2082
#: bzrlib/builtins.py:3295
2010
#: bzrlib/builtins.py:3202
2083
2011
msgid "Name of the root directory inside the exported file."
2086
#: bzrlib/builtins.py:3297
2014
#: bzrlib/builtins.py:3204
2088
2016
"Set modification time of files to that of the last revision in which it was "
2092
#: bzrlib/builtins.py:3300
2020
#: bzrlib/builtins.py:3207
2094
2022
"Export the working tree contents rather than that of the last revision."
2097
#: bzrlib/builtins.py:3319
2025
#: bzrlib/builtins.py:3226
2098
2026
msgid "--uncommitted requires a working tree"
2101
#: bzrlib/builtins.py:3328
2029
#: bzrlib/builtins.py:3235
2102
2030
#, python-format
2103
2031
msgid "Unsupported export format: %s"
2104
msgstr "Nicht unterstütztes Export-Format: %s"
2106
#: bzrlib/builtins.py:3332
2034
#: bzrlib/builtins.py:3239
2108
2036
"Write the contents of a file as of a given revision to standard output."
2111
#: bzrlib/builtins.py:3334
2039
#: bzrlib/builtins.py:3241
2112
2040
msgid "If no revision is nominated, the last revision is used."
2114
"Wenn keine Revision bestimmt wurde, wird die neueste Revision benutzt."
2116
#: bzrlib/builtins.py:3336
2043
#: bzrlib/builtins.py:3243
2118
2045
"Note: Take care to redirect standard output when using this command on a\n"
2122
#: bzrlib/builtins.py:3342
2049
#: bzrlib/builtins.py:3249
2123
2050
msgid "The path name in the old tree."
2126
#: bzrlib/builtins.py:3343
2053
#: bzrlib/builtins.py:3250
2127
2054
msgid "Apply content filters to display the convenience form."
2130
#: bzrlib/builtins.py:3354
2057
#: bzrlib/builtins.py:3261
2131
2058
msgid "bzr cat --revision takes exactly one revision specifier"
2134
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2061
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2135
2062
msgid "{0!r} is not present in revision {1}"
2136
msgstr "{0!r} ist in Revision {1} nicht vorhanden"
2138
#: bzrlib/builtins.py:3414
2065
#: bzrlib/builtins.py:3321
2139
2066
msgid "Commit changes into a new revision."
2142
#: bzrlib/builtins.py:3416
2069
#: bzrlib/builtins.py:3323
2144
2071
"An explanatory message needs to be given for each commit. This is\n"
2145
2072
"often done by using the --message option (getting the message from the\n"
2228
2155
" one or more bugs. See ``bzr help bugs`` for details."
2231
#: bzrlib/builtins.py:3474
2158
#: bzrlib/builtins.py:3381
2232
2159
msgid "Do not consider changes made to a given path."
2235
#: bzrlib/builtins.py:3477
2162
#: bzrlib/builtins.py:3384
2236
2163
msgid "Description of the new revision."
2237
msgstr "Beschreibung der neuen Revision."
2239
#: bzrlib/builtins.py:3480
2166
#: bzrlib/builtins.py:3387
2240
2167
msgid "Commit even if nothing has changed."
2243
#: bzrlib/builtins.py:3484
2170
#: bzrlib/builtins.py:3391
2244
2171
msgid "Take commit message from this file."
2247
#: bzrlib/builtins.py:3486
2174
#: bzrlib/builtins.py:3393
2248
2175
msgid "Refuse to commit if there are unknown files in the working tree."
2251
#: bzrlib/builtins.py:3489
2178
#: bzrlib/builtins.py:3396
2253
2180
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2254
2181
"08:00:00 +0100'."
2257
#: bzrlib/builtins.py:3492
2184
#: bzrlib/builtins.py:3399
2258
2185
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2261
#: bzrlib/builtins.py:3495
2188
#: bzrlib/builtins.py:3402
2262
2189
msgid "Set the author's name, if it's different from the committer."
2265
#: bzrlib/builtins.py:3498
2192
#: bzrlib/builtins.py:3405
2267
2194
"Perform a local commit in a bound branch. Local commits are not pushed to "
2268
2195
"the master branch until a normal commit is performed."
2271
#: bzrlib/builtins.py:3504
2198
#: bzrlib/builtins.py:3411
2273
2200
"When no message is supplied, show the diff along with the status summary in "
2274
2201
"the message editor."
2277
#: bzrlib/builtins.py:3507
2204
#: bzrlib/builtins.py:3414
2279
2206
"When committing to a foreign version control system do not push data that "
2280
2207
"can not be natively represented."
2283
#: bzrlib/builtins.py:3525
2210
#: bzrlib/builtins.py:3432
2284
2211
#, python-format
2286
2213
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2296
2223
"Commit refused."
2299
#: bzrlib/builtins.py:3543
2226
#: bzrlib/builtins.py:3450
2300
2227
#, python-format
2301
2228
msgid "Unrecognized bug %s. Commit refused."
2304
#: bzrlib/builtins.py:3546
2231
#: bzrlib/builtins.py:3453
2305
2232
#, python-format
2308
2235
"Commit refused."
2311
#: bzrlib/builtins.py:3570
2238
#: bzrlib/builtins.py:3477
2312
2239
msgid "Could not parse --commit-time: "
2315
#: bzrlib/builtins.py:3610
2242
#: bzrlib/builtins.py:3517
2316
2243
msgid "please specify either --message or --file"
2317
msgstr "Bitte geben Sie entweder --message oder --file an"
2319
#: bzrlib/builtins.py:3639
2246
#: bzrlib/builtins.py:3546
2320
2247
msgid "please specify a commit message with either --message or --file"
2323
#: bzrlib/builtins.py:3642
2250
#: bzrlib/builtins.py:3549
2325
2252
"Empty commit message specified. Please specify a commit message with either -"
2326
2253
"-message or --file or leave a blank message with --message \"\"."
2329
#: bzrlib/builtins.py:3662
2256
#: bzrlib/builtins.py:3569
2331
2258
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2332
2259
"-unchanged to force an empty commit."
2335
#: bzrlib/builtins.py:3666
2262
#: bzrlib/builtins.py:3573
2337
2264
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2338
2265
"resolve FILE\" to resolve."
2341
#: bzrlib/builtins.py:3670
2268
#: bzrlib/builtins.py:3577
2342
2269
msgid "Commit refused because there are unknown files in the working tree."
2345
#: bzrlib/builtins.py:3673
2272
#: bzrlib/builtins.py:3580
2348
2275
"To commit to master branch, run update and then commit.\n"
2349
2276
"You can also pass --local to commit to continue working disconnected."
2352
#: bzrlib/builtins.py:3681
2279
#: bzrlib/builtins.py:3588
2354
2281
"Validate working tree structure, branch consistency and repository history."
2357
#: bzrlib/builtins.py:3683
2284
#: bzrlib/builtins.py:3590
2359
2286
"This command checks various invariants about branch and repository storage\n"
2360
2287
"to detect data corruption or bzr bugs."
2363
#: bzrlib/builtins.py:3686
2290
#: bzrlib/builtins.py:3593
2365
2292
"The working tree and branch checks will only give output if a problem is\n"
2366
2293
"detected. The output fields of the repository check are:"
2369
#: bzrlib/builtins.py:3689
2296
#: bzrlib/builtins.py:3596
2372
2299
" This is just the number of revisions checked. It doesn't\n"
2373
2300
" indicate a problem."
2376
#: bzrlib/builtins.py:3693
2303
#: bzrlib/builtins.py:3600
2378
2305
"versionedfiles\n"
2379
2306
" This is just the number of versionedfiles checked. It\n"
2380
2307
" doesn't indicate a problem."
2383
#: bzrlib/builtins.py:3697
2310
#: bzrlib/builtins.py:3604
2385
2312
"unreferenced ancestors\n"
2386
2313
" Texts that are ancestors of other texts, but\n"
2492
#: bzrlib/builtins.py:3779
2419
#: bzrlib/builtins.py:3686
2494
2421
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2495
2422
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2498
#: bzrlib/builtins.py:3787
2425
#: bzrlib/builtins.py:3694
2499
2426
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2502
#: bzrlib/builtins.py:3791
2429
#: bzrlib/builtins.py:3698
2503
2430
msgid "Branch format"
2504
msgstr "Format des Zweiges"
2506
#: bzrlib/builtins.py:3793
2433
#: bzrlib/builtins.py:3700
2507
2434
msgid "Remove the backup.bzr directory if successful."
2510
#: bzrlib/builtins.py:3795
2437
#: bzrlib/builtins.py:3702
2511
2438
msgid "Show what would be done, but don't actually do anything."
2512
msgstr "Nur zeigen, was getan werden würde, aber nichts wirklich machen."
2514
#: bzrlib/builtins.py:3810
2441
#: bzrlib/builtins.py:3717
2515
2442
msgid "Show or set bzr user id."
2518
#: bzrlib/builtins.py:3812
2445
#: bzrlib/builtins.py:3719
2521
2448
" Show the email of the current user::"
2524
" Die E-Mail-Adresse des aktuellen Benutzers zeigen::"
2526
#: bzrlib/builtins.py:3815
2451
#: bzrlib/builtins.py:3722
2527
2452
msgid " bzr whoami --email"
2528
msgstr " bzr whoami --email"
2530
#: bzrlib/builtins.py:3817
2455
#: bzrlib/builtins.py:3724
2531
2456
msgid " Set the current user::"
2532
msgstr " Aktuellen Benutzer festlegen::"
2534
#: bzrlib/builtins.py:3819
2459
#: bzrlib/builtins.py:3726
2535
2460
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2536
msgstr " bzr whoami \"Frank Chu <ich@beispiel.de>\""
2538
#: bzrlib/builtins.py:3823
2463
#: bzrlib/builtins.py:3730
2539
2464
msgid "Display email address only."
2540
msgstr "Nur die E-Mail-Adresse anzeigen."
2542
#: bzrlib/builtins.py:3825
2467
#: bzrlib/builtins.py:3732
2543
2468
msgid "Set identity for the current branch instead of globally."
2546
#: bzrlib/builtins.py:3851
2471
#: bzrlib/builtins.py:3758
2547
2472
msgid "--email can only be used to display existing identity"
2550
#: bzrlib/builtins.py:3873
2475
#: bzrlib/builtins.py:3780
2551
2476
msgid "Print or set the branch nickname."
2554
#: bzrlib/builtins.py:3875
2479
#: bzrlib/builtins.py:3782
2556
2481
"If unset, the tree root directory name is used as the nickname.\n"
2557
2482
"To print the current nickname, execute with no argument."
2560
#: bzrlib/builtins.py:3878
2485
#: bzrlib/builtins.py:3785
2562
2487
"Bound branches use the nickname of its master branch unless it is set\n"
2566
#: bzrlib/builtins.py:3898
2491
#: bzrlib/builtins.py:3805
2567
2492
msgid "Set/unset and display aliases."
2570
#: bzrlib/builtins.py:3900
2495
#: bzrlib/builtins.py:3807
2573
2498
" Show the current aliases::"
2576
" Die aktuellen Aliase zeigen::"
2578
#: bzrlib/builtins.py:3903
2501
#: bzrlib/builtins.py:3810
2579
2502
msgid " bzr alias"
2582
#: bzrlib/builtins.py:3905
2505
#: bzrlib/builtins.py:3812
2583
2506
msgid " Show the alias specified for 'll'::"
2586
#: bzrlib/builtins.py:3907
2509
#: bzrlib/builtins.py:3814
2587
2510
msgid " bzr alias ll"
2588
msgstr " bzr alias ll"
2590
#: bzrlib/builtins.py:3909
2513
#: bzrlib/builtins.py:3816
2591
2514
msgid " Set an alias for 'll'::"
2594
#: bzrlib/builtins.py:3911
2517
#: bzrlib/builtins.py:3818
2595
2518
msgid " bzr alias ll=\"log --line -r-10..-1\""
2596
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2598
#: bzrlib/builtins.py:3913
2521
#: bzrlib/builtins.py:3820
2599
2522
msgid " To remove an alias for 'll'::"
2602
#: bzrlib/builtins.py:3915
2525
#: bzrlib/builtins.py:3822
2603
2526
msgid " bzr alias --remove ll"
2604
msgstr " bzr alias --remove ll"
2606
#: bzrlib/builtins.py:3920
2529
#: bzrlib/builtins.py:3827
2607
2530
msgid "Remove the alias."
2608
msgstr "Den Alias entfernen."
2610
#: bzrlib/builtins.py:3938
2533
#: bzrlib/builtins.py:3845
2611
2534
msgid "bzr alias --remove expects an alias to remove."
2612
msgstr "bzr alias --remove erwartet einen Alias zum Entfernen."
2614
#: bzrlib/builtins.py:4119
2537
#: bzrlib/builtins.py:4026
2616
2539
"subunit not available. subunit needs to be installed to use --subunit."
2619
#: bzrlib/builtins.py:4136
2542
#: bzrlib/builtins.py:4043
2621
2544
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2624
#: bzrlib/builtins.py:4183
2547
#: bzrlib/builtins.py:4090
2625
2548
msgid "Show version of bzr."
2626
msgstr "Version von bzr anzeigen."
2628
#: bzrlib/builtins.py:4187
2551
#: bzrlib/builtins.py:4094
2629
2552
msgid "Print just the version number."
2630
msgstr "Nur die Versionsnummer ausgeben."
2632
#: bzrlib/builtins.py:4206
2555
#: bzrlib/builtins.py:4113
2633
2556
msgid "It sure does!\n"
2636
#: bzrlib/builtins.py:4230
2559
#: bzrlib/builtins.py:4137
2637
2560
#, python-format
2638
2561
msgid "merge base is revision %s\n"
2641
#: bzrlib/builtins.py:4234
2564
#: bzrlib/builtins.py:4141
2642
2565
msgid "Perform a three-way merge."
2645
#: bzrlib/builtins.py:4236
2568
#: bzrlib/builtins.py:4143
2647
2570
"The source of the merge can be specified either in the form of a branch,\n"
2648
2571
"or in the form of a path to a file containing a merge directive generated\n"
2718
2641
"merge revision which has more than two parents."
2721
#: bzrlib/builtins.py:4283
2644
#: bzrlib/builtins.py:4190
2723
2646
"If one would like to merge changes from the working tree of the other\n"
2724
2647
"branch without merging any committed revisions, the --uncommitted option\n"
2725
2648
"can be given."
2728
#: bzrlib/builtins.py:4287
2651
#: bzrlib/builtins.py:4194
2730
2653
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2731
2654
"you to apply each diff hunk and file change, similar to \"shelve\"."
2734
#: bzrlib/builtins.py:4290
2657
#: bzrlib/builtins.py:4197
2737
2660
" To merge all new revisions from bzr.dev::"
2740
#: bzrlib/builtins.py:4293
2663
#: bzrlib/builtins.py:4200
2741
2664
msgid " bzr merge ../bzr.dev"
2742
msgstr " bzr merge ../bzr.dev"
2744
#: bzrlib/builtins.py:4295
2667
#: bzrlib/builtins.py:4202
2745
2668
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2748
#: bzrlib/builtins.py:4297
2671
#: bzrlib/builtins.py:4204
2749
2672
msgid " bzr merge -r 82 ../bzr.dev"
2750
msgstr " bzr merge -r 82 ../bzr.dev"
2752
#: bzrlib/builtins.py:4299
2675
#: bzrlib/builtins.py:4206
2753
2676
msgid " To merge the changes introduced by 82, without previous changes::"
2756
#: bzrlib/builtins.py:4301
2679
#: bzrlib/builtins.py:4208
2757
2680
msgid " bzr merge -r 81..82 ../bzr.dev"
2758
msgstr " bzr merge -r 81..82 ../bzr.dev"
2760
#: bzrlib/builtins.py:4303
2683
#: bzrlib/builtins.py:4210
2761
2684
msgid " To apply a merge directive contained in /tmp/merge::"
2764
#: bzrlib/builtins.py:4305
2687
#: bzrlib/builtins.py:4212
2765
2688
msgid " bzr merge /tmp/merge"
2766
msgstr " bzr merge /tmp/merge"
2768
#: bzrlib/builtins.py:4307
2691
#: bzrlib/builtins.py:4214
2770
2693
" To create a merge revision with three parents from two branches\n"
2771
2694
" feature1a and feature1b:"
2774
#: bzrlib/builtins.py:4310
2697
#: bzrlib/builtins.py:4217
2776
2699
" bzr merge ../feature1a\n"
2777
2700
" bzr merge ../feature1b --force\n"
2778
2701
" bzr commit -m 'revision with three parents'"
2781
#: bzrlib/builtins.py:4322
2704
#: bzrlib/builtins.py:4229
2782
2705
msgid "Merge even if the destination tree has uncommitted changes."
2785
#: bzrlib/builtins.py:4328
2708
#: bzrlib/builtins.py:4235
2787
2710
"Apply uncommitted changes from a working copy, instead of branch changes."
2790
#: bzrlib/builtins.py:4330
2713
#: bzrlib/builtins.py:4237
2792
2715
"If the destination is already completely merged into the source, pull from "
2793
2716
"the source rather than merging. When this happens, you do not need to "
2794
2717
"commit the result."
2797
#: bzrlib/builtins.py:4335
2720
#: bzrlib/builtins.py:4242
2799
2722
"Branch to merge into, rather than the one containing the working directory."
2802
#: bzrlib/builtins.py:4337
2725
#: bzrlib/builtins.py:4244
2803
2726
msgid "Instead of merging, show a diff of the merge."
2806
#: bzrlib/builtins.py:4339
2729
#: bzrlib/builtins.py:4246
2807
2730
msgid "Select changes interactively."
2808
msgstr "Änderungen interaktiv auswählen."
2810
#: bzrlib/builtins.py:4361
2733
#: bzrlib/builtins.py:4268
2812
2735
"Merging into empty branches not currently supported, "
2813
2736
"https://bugs.launchpad.net/bzr/+bug/308562"
2816
#: bzrlib/builtins.py:4388
2739
#: bzrlib/builtins.py:4295
2817
2740
msgid "Cannot use --uncommitted with bundles or merge directives."
2820
#: bzrlib/builtins.py:4399
2743
#: bzrlib/builtins.py:4306
2821
2744
msgid "Cannot use --uncommitted and --revision at the same time."
2824
#: bzrlib/builtins.py:4419
2747
#: bzrlib/builtins.py:4326
2825
2748
msgid "merger: "
2828
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2751
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2829
2752
msgid "Nothing to do."
2830
msgstr "Nichts zu tun."
2832
#: bzrlib/builtins.py:4425
2755
#: bzrlib/builtins.py:4332
2833
2756
msgid "Cannot pull individual files"
2836
#: bzrlib/builtins.py:4433
2759
#: bzrlib/builtins.py:4340
2837
2760
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2840
#: bzrlib/builtins.py:4491
2763
#: bzrlib/builtins.py:4398
2841
2764
#, python-format
2842
2765
msgid "Show-base is not supported for this merge type. %s"
2845
#: bzrlib/builtins.py:4500
2768
#: bzrlib/builtins.py:4407
2846
2769
#, python-format
2847
2770
msgid "Conflict reduction is not supported for merge type %s."
2850
#: bzrlib/builtins.py:4504
2773
#: bzrlib/builtins.py:4411
2851
2774
msgid "Cannot do conflict reduction and show base."
2854
#: bzrlib/builtins.py:4615
2777
#: bzrlib/builtins.py:4522
2855
2778
msgid "No location specified or remembered"
2858
#: bzrlib/builtins.py:4617
2781
#: bzrlib/builtins.py:4524
2859
2782
msgid "{0} remembered {1} location {2}"
2862
#: bzrlib/builtins.py:4623
2785
#: bzrlib/builtins.py:4530
2863
2786
msgid "Redo a merge."
2866
#: bzrlib/builtins.py:4625
2789
#: bzrlib/builtins.py:4532
2868
2791
"Use this if you want to try a different merge technique while resolving\n"
2869
2792
"conflicts. Some merge techniques are better than others, and remerge\n"
2870
2793
"lets you try different ones on different files."
2873
#: bzrlib/builtins.py:4629
2796
#: bzrlib/builtins.py:4536
2875
2798
"The options for remerge have the same meaning and defaults as the ones for\n"
2876
2799
"merge. The difference is that remerge can (only) be run when there is a\n"
2877
2800
"pending merge, and it lets you specify particular files."
2880
#: bzrlib/builtins.py:4633
2803
#: bzrlib/builtins.py:4540
2883
2806
" Re-do the merge of all conflicted files, and show the base text in\n"
2884
2807
" conflict regions, in addition to the usual THIS and OTHER texts::"
2887
#: bzrlib/builtins.py:4637
2810
#: bzrlib/builtins.py:4544
2888
2811
msgid " bzr remerge --show-base"
2889
msgstr " bzr remerge --show-base"
2891
#: bzrlib/builtins.py:4639
2814
#: bzrlib/builtins.py:4546
2893
2816
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2894
2817
" additional processing to reduce the size of conflict regions::"
2897
#: bzrlib/builtins.py:4642
2820
#: bzrlib/builtins.py:4549
2898
2821
msgid " bzr remerge --merge-type weave --reprocess foobar"
2901
#: bzrlib/builtins.py:4649
2824
#: bzrlib/builtins.py:4556
2902
2825
msgid "Show base revision text in conflicts."
2905
#: bzrlib/builtins.py:4661
2828
#: bzrlib/builtins.py:4568
2907
2830
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2911
#: bzrlib/builtins.py:4717
2834
#: bzrlib/builtins.py:4624
2912
2835
msgid "Revert files to a previous revision."
2915
#: bzrlib/builtins.py:4719
2838
#: bzrlib/builtins.py:4626
2917
2840
"Giving a list of files will revert only those files. Otherwise, all files\n"
2918
2841
"will be reverted. If the revision is not specified with '--revision', the\n"
2919
2842
"last committed revision is used."
2922
#: bzrlib/builtins.py:4723
2845
#: bzrlib/builtins.py:4630
2924
2847
"To remove only some changes, without reverting to a prior version, use\n"
2925
2848
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3016
2937
" 0 - no missing revisions"
3019
#: bzrlib/builtins.py:4847
2940
#: bzrlib/builtins.py:4754
3021
2942
" Determine the missing revisions between this and the branch at the\n"
3022
2943
" remembered pull location::"
3025
#: bzrlib/builtins.py:4850
2946
#: bzrlib/builtins.py:4757
3026
2947
msgid " bzr missing"
3027
msgstr " bzr missing"
3029
#: bzrlib/builtins.py:4852
2950
#: bzrlib/builtins.py:4759
3030
2951
msgid " Determine the missing revisions between this and another branch::"
3033
#: bzrlib/builtins.py:4854
2954
#: bzrlib/builtins.py:4761
3034
2955
msgid " bzr missing http://server/branch"
3037
#: bzrlib/builtins.py:4856
2958
#: bzrlib/builtins.py:4763
3039
2960
" Determine the missing revisions up to a specific revision on the other\n"
3043
#: bzrlib/builtins.py:4859
2964
#: bzrlib/builtins.py:4766
3044
2965
msgid " bzr missing -r ..-10"
3045
msgstr " bzr missing -r ..-10"
3047
#: bzrlib/builtins.py:4861
2968
#: bzrlib/builtins.py:4768
3049
2970
" Determine the missing revisions up to a specific revision on this\n"
3053
#: bzrlib/builtins.py:4864
2974
#: bzrlib/builtins.py:4771
3054
2975
msgid " bzr missing --my-revision ..-10"
3055
msgstr " bzr missing --my-revision ..-10"
3057
#: bzrlib/builtins.py:4871
2978
#: bzrlib/builtins.py:4778
3058
2979
msgid "Reverse the order of revisions."
3061
#: bzrlib/builtins.py:4873
2982
#: bzrlib/builtins.py:4780
3062
2983
msgid "Display changes in the local branch only."
3063
msgstr "Nur Änderungen im lokalen Zweig anzeigen."
3065
#: bzrlib/builtins.py:4874
2986
#: bzrlib/builtins.py:4781
3066
2987
msgid "Same as --mine-only."
3067
msgstr "Dasselbe wie --mine-only."
3069
#: bzrlib/builtins.py:4876
2990
#: bzrlib/builtins.py:4783
3070
2991
msgid "Display changes in the remote branch only."
3071
msgstr "Nur Änderungen im entfernten Zweig anzeigen."
3073
#: bzrlib/builtins.py:4877
2994
#: bzrlib/builtins.py:4784
3074
2995
msgid "Same as --theirs-only."
3075
msgstr "Dasselbe wie --theirs-only."
3077
#: bzrlib/builtins.py:4882
2998
#: bzrlib/builtins.py:4789
3079
3000
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3083
#: bzrlib/builtins.py:4886
3004
#: bzrlib/builtins.py:4793
3085
3006
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3089
#: bzrlib/builtins.py:4889
3010
#: bzrlib/builtins.py:4796
3090
3011
msgid "Show all revisions in addition to the mainline ones."
3093
#: bzrlib/builtins.py:4943
3014
#: bzrlib/builtins.py:4850
3094
3015
msgid "No peer location known or specified."
3097
#: bzrlib/builtins.py:4947
3018
#: bzrlib/builtins.py:4854
3098
3019
msgid "Using saved parent location: {0}\n"
3101
#: bzrlib/builtins.py:4980
3022
#: bzrlib/builtins.py:4887
3102
3023
#, python-format
3103
3024
msgid "You have %d extra revision:\n"
3104
3025
msgid_plural "You have %d extra revisions:\n"
3105
msgstr[0] "Sie haben %d zusätzliche Revision:\n"
3106
msgstr[1] "Sie haben %d zusätzliche Revisionen:\n"
3108
#: bzrlib/builtins.py:4996
3029
#: bzrlib/builtins.py:4903
3109
3030
#, python-format
3110
3031
msgid "You are missing %d revision:\n"
3111
3032
msgid_plural "You are missing %d revisions:\n"
3112
msgstr[0] "Ihnen fehlt %d Revision:\n"
3113
msgstr[1] "Ihnen fehlen %d Revisionen:\n"
3115
#: bzrlib/builtins.py:5008
3036
#: bzrlib/builtins.py:4915
3116
3037
msgid "This branch has no new revisions.\n"
3117
msgstr "Dieser Zweig hat keine neuen Revisionen.\n"
3119
#: bzrlib/builtins.py:5011
3040
#: bzrlib/builtins.py:4918
3120
3041
msgid "Other branch has no new revisions.\n"
3121
msgstr "Anderer Zweig hat keine neuen Revisionen.\n"
3123
#: bzrlib/builtins.py:5016
3044
#: bzrlib/builtins.py:4923
3124
3045
msgid "Branches are up to date.\n"
3125
msgstr "Zweige sind aktuell.\n"
3127
#: bzrlib/builtins.py:5027
3048
#: bzrlib/builtins.py:4934
3128
3049
msgid "Compress the data within a repository."
3131
#: bzrlib/builtins.py:5029
3052
#: bzrlib/builtins.py:4936
3133
3054
"This operation compresses the data within a bazaar repository. As\n"
3134
3055
"bazaar supports automatic packing of repository, this operation is\n"
3135
3056
"normally not required to be done manually."
3138
#: bzrlib/builtins.py:5033
3059
#: bzrlib/builtins.py:4940
3140
3061
"During the pack operation, bazaar takes a backup of existing repository\n"
3141
3062
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3187
3108
"plugins using the Python programming language."
3190
#: bzrlib/builtins.py:5091
3111
#: bzrlib/builtins.py:4998
3191
3112
msgid "Show testament (signing-form) of a revision."
3194
#: bzrlib/builtins.py:5094
3115
#: bzrlib/builtins.py:5001
3195
3116
msgid "Produce long-format testament."
3198
#: bzrlib/builtins.py:5096
3119
#: bzrlib/builtins.py:5003
3199
3120
msgid "Produce a strict-format testament."
3202
#: bzrlib/builtins.py:5122
3123
#: bzrlib/builtins.py:5029
3203
3124
msgid "Show the origin of each line in a file."
3204
msgstr "Ursprung jeder Zeile in einer Datei anzeigen."
3206
#: bzrlib/builtins.py:5124
3127
#: bzrlib/builtins.py:5031
3208
3129
"This prints out the given file with an annotation on the left side\n"
3209
3130
"indicating which revision, author and date introduced the change."
3212
#: bzrlib/builtins.py:5127
3133
#: bzrlib/builtins.py:5034
3214
3135
"If the origin is the same for a run of consecutive lines, it is\n"
3215
3136
"shown only at the top, unless the --all option is given."
3218
#: bzrlib/builtins.py:5135
3139
#: bzrlib/builtins.py:5042
3219
3140
msgid "Show annotations on all lines."
3222
#: bzrlib/builtins.py:5136
3143
#: bzrlib/builtins.py:5043
3223
3144
msgid "Show commit date in annotations."
3226
#: bzrlib/builtins.py:5223
3147
#: bzrlib/builtins.py:5130
3227
3148
msgid "Cannot sign a range of non-revision-history revisions"
3230
#: bzrlib/builtins.py:5235
3151
#: bzrlib/builtins.py:5142
3231
3152
msgid "Please supply either one revision, or a range."
3232
msgstr "Bitte geben Sie entweder eine Revision oder einen Bereich an."
3234
#: bzrlib/builtins.py:5239
3155
#: bzrlib/builtins.py:5146
3236
3157
"Convert the current branch into a checkout of the supplied branch.\n"
3237
3158
"If no branch is supplied, rebind to the last bound location."
3240
#: bzrlib/builtins.py:5242
3161
#: bzrlib/builtins.py:5149
3242
3163
"Once converted into a checkout, commits must succeed on the master branch\n"
3243
3164
"before they will be applied to the local branch."
3246
#: bzrlib/builtins.py:5245
3167
#: bzrlib/builtins.py:5152
3248
3169
"Bound branches use the nickname of its master branch unless it is set\n"
3249
3170
"locally, in which case binding will update the local nickname to be\n"
3250
3171
"that of the master."
3253
#: bzrlib/builtins.py:5260
3174
#: bzrlib/builtins.py:5167
3254
3175
msgid "No location supplied. This format does not remember old locations."
3257
#: bzrlib/builtins.py:5265
3178
#: bzrlib/builtins.py:5172
3258
3179
msgid "Branch is already bound"
3261
#: bzrlib/builtins.py:5267
3182
#: bzrlib/builtins.py:5174
3262
3183
msgid "No location supplied and no previous location known"
3265
#: bzrlib/builtins.py:5273
3186
#: bzrlib/builtins.py:5180
3266
3187
msgid "These branches have diverged. Try merging, and then bind again."
3269
#: bzrlib/builtins.py:5280
3190
#: bzrlib/builtins.py:5187
3270
3191
msgid "Convert the current checkout into a regular branch."
3273
#: bzrlib/builtins.py:5282
3194
#: bzrlib/builtins.py:5189
3275
3196
"After unbinding, the local branch is considered independent and subsequent\n"
3276
3197
"commits will be local only."
3279
#: bzrlib/builtins.py:5293
3200
#: bzrlib/builtins.py:5200
3280
3201
msgid "Local branch is not bound"
3283
#: bzrlib/builtins.py:5297
3204
#: bzrlib/builtins.py:5204
3284
3205
msgid "Remove the last committed revision."
3287
#: bzrlib/builtins.py:5299
3208
#: bzrlib/builtins.py:5206
3289
3210
"--verbose will print out what is being removed.\n"
3290
3211
"--dry-run will go through all the motions, but not actually\n"
3291
3212
"remove anything."
3294
#: bzrlib/builtins.py:5303
3215
#: bzrlib/builtins.py:5210
3296
3217
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3297
3218
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3298
3219
"branch at revision 15."
3301
#: bzrlib/builtins.py:5307
3222
#: bzrlib/builtins.py:5214
3303
3224
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3304
3225
"it may make is to restore any pending merges that were present before\n"
3308
#: bzrlib/builtins.py:5318
3229
#: bzrlib/builtins.py:5225
3309
3230
msgid "Don't actually make changes."
3310
msgstr "Keine Änderungen durchführen."
3312
#: bzrlib/builtins.py:5319
3233
#: bzrlib/builtins.py:5226
3313
3234
msgid "Say yes to all questions."
3314
msgstr "Alle Fragen mit Ja beantworten."
3316
#: bzrlib/builtins.py:5321
3237
#: bzrlib/builtins.py:5228
3317
3238
msgid "Keep tags that point to removed revisions."
3320
#: bzrlib/builtins.py:5323
3241
#: bzrlib/builtins.py:5230
3321
3242
msgid "Only remove the commits from the local branch when in a checkout."
3324
#: bzrlib/builtins.py:5372
3245
#: bzrlib/builtins.py:5279
3325
3246
msgid "No revisions to uncommit.\n"
3328
#: bzrlib/builtins.py:5387
3249
#: bzrlib/builtins.py:5294
3329
3250
msgid "Dry-run, pretending to remove the above revisions.\n"
3331
"Testlauf, es wird so getan, als ob die obigen Revisionen entfernt würden.\n"
3333
#: bzrlib/builtins.py:5390
3253
#: bzrlib/builtins.py:5297
3334
3254
msgid "The above revision(s) will be removed.\n"
3335
msgstr "Oben stehende Revision(en) wird/werden entfernt.\n"
3337
#: bzrlib/builtins.py:5394
3257
#: bzrlib/builtins.py:5301
3338
3258
msgid "Uncommit these revisions"
3341
#: bzrlib/builtins.py:5397
3261
#: bzrlib/builtins.py:5304
3342
3262
msgid "Canceled\n"
3343
msgstr "Abgebrochen\n"
3345
#: bzrlib/builtins.py:5404
3265
#: bzrlib/builtins.py:5311
3346
3266
#, python-format
3348
3268
"You can restore the old tip by running:\n"
3349
3269
" bzr pull . -r revid:%s\n"
3352
#: bzrlib/builtins.py:5409
3272
#: bzrlib/builtins.py:5316
3353
3273
msgid "Break a dead lock."
3356
#: bzrlib/builtins.py:5411
3276
#: bzrlib/builtins.py:5318
3358
3278
"This command breaks a lock on a repository, branch, working directory or\n"
3362
#: bzrlib/builtins.py:5414
3282
#: bzrlib/builtins.py:5321
3364
3284
"CAUTION: Locks should only be broken when you are sure that the process\n"
3365
3285
"holding the lock has been stopped."
3368
#: bzrlib/builtins.py:5417
3288
#: bzrlib/builtins.py:5324
3370
3290
"You can get information on what locks are open via the 'bzr info\n"
3371
3291
"[location]' command."
3374
#: bzrlib/builtins.py:5420
3294
#: bzrlib/builtins.py:5327
3377
3297
" bzr break-lock\n"
3427
3347
"uncontrolled write access to your file system."
3430
#: bzrlib/builtins.py:5496
3350
#: bzrlib/builtins.py:5403
3431
3351
msgid "Override the default idle client timeout (5min)."
3434
#: bzrlib/builtins.py:5546
3354
#: bzrlib/builtins.py:5453
3435
3355
msgid "Combine a tree into its containing tree."
3438
#: bzrlib/builtins.py:5548
3358
#: bzrlib/builtins.py:5455
3439
3359
msgid "This command requires the target tree to be in a rich-root format."
3442
#: bzrlib/builtins.py:5550
3362
#: bzrlib/builtins.py:5457
3444
3364
"The TREE argument should be an independent tree, inside another tree, but\n"
3445
3365
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3446
3366
"running \"bzr branch\" with the target inside a tree.)"
3449
#: bzrlib/builtins.py:5554
3369
#: bzrlib/builtins.py:5461
3451
3371
"The result is a combined tree, with the subtree no longer an independent\n"
3452
3372
"part. This is marked as a merge of the subtree into the containing tree,\n"
3453
3373
"and all history is preserved."
3456
#: bzrlib/builtins.py:5572
3376
#: bzrlib/builtins.py:5479
3457
3377
#, python-format
3459
3379
"Can't join trees because %s doesn't support rich root data.\n"
3460
3380
"You can use bzr upgrade on the repository."
3463
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3383
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3464
3384
msgid "Cannot join {0}. {1}"
3467
#: bzrlib/builtins.py:5592
3387
#: bzrlib/builtins.py:5499
3468
3388
msgid "Split a subdirectory of a tree into a separate tree."
3471
#: bzrlib/builtins.py:5594
3391
#: bzrlib/builtins.py:5501
3473
3393
"This command will produce a target tree in a format that supports\n"
3474
3394
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3475
3395
"converted into earlier formats like 'dirstate-tags'."
3478
#: bzrlib/builtins.py:5598
3398
#: bzrlib/builtins.py:5505
3480
3400
"The TREE argument should be a subdirectory of a working tree. That\n"
3481
3401
"subdirectory will be converted into an independent tree, with its own\n"
3482
3402
"branch. Commits in the top-level tree will not apply to the new subtree."
3485
#: bzrlib/builtins.py:5678
3405
#: bzrlib/builtins.py:5585
3486
3406
msgid "No submit branch specified or known"
3489
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3409
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3490
3410
msgid "No public branch specified or known"
3493
#: bzrlib/builtins.py:5691
3413
#: bzrlib/builtins.py:5598
3494
3414
msgid "bzr merge-directive takes at most two one revision identifiers"
3497
#: bzrlib/builtins.py:5700
3417
#: bzrlib/builtins.py:5607
3498
3418
msgid "No revisions to bundle."
3501
#: bzrlib/builtins.py:5719
3421
#: bzrlib/builtins.py:5626
3502
3422
msgid "Mail or create a merge-directive for submitting changes."
3505
#: bzrlib/builtins.py:5721
3425
#: bzrlib/builtins.py:5628
3506
3426
msgid "A merge directive provides many things needed for requesting merges:"
3509
#: bzrlib/builtins.py:5723
3429
#: bzrlib/builtins.py:5630
3510
3430
msgid "* A machine-readable description of the merge to perform"
3513
#: bzrlib/builtins.py:5725
3433
#: bzrlib/builtins.py:5632
3514
3434
msgid "* An optional patch that is a preview of the changes requested"
3516
"* Ein optionaler Patch, der eine Vorschau der gewünschten Änderungen "
3519
#: bzrlib/builtins.py:5727
3437
#: bzrlib/builtins.py:5634
3521
3439
"* An optional bundle of revision data, so that the changes can be applied\n"
3522
3440
" directly from the merge directive, without retrieving data from a\n"
3526
#: bzrlib/builtins.py:5731
3444
#: bzrlib/builtins.py:5638
3528
3446
"`bzr send` creates a compact data set that, when applied using bzr\n"
3529
3447
"merge, has the same effect as merging from the source branch. "
3532
#: bzrlib/builtins.py:5734
3450
#: bzrlib/builtins.py:5641
3534
3452
"By default the merge directive is self-contained and can be applied to any\n"
3535
3453
"branch containing submit_branch in its ancestory without needing access to\n"
3536
3454
"the source branch."
3539
#: bzrlib/builtins.py:5738
3457
#: bzrlib/builtins.py:5645
3541
3459
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3542
3460
"revisions, but only a structured request to merge from the\n"
3628
3546
"set them, and use `bzr info` to display them."
3631
#: bzrlib/builtins.py:5813
3549
#: bzrlib/builtins.py:5720
3632
3550
msgid "Write merge directive to this file or directory; use - for stdout."
3635
#: bzrlib/builtins.py:5817
3553
#: bzrlib/builtins.py:5724
3637
3555
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3638
3556
"strict disables the check."
3641
#: bzrlib/builtins.py:5819
3559
#: bzrlib/builtins.py:5726
3642
3560
msgid "Mail the request to this address."
3643
msgstr "Die Anfrage an diese Adresse schicken."
3645
#: bzrlib/builtins.py:5823
3563
#: bzrlib/builtins.py:5730
3646
3564
msgid "Body for the email."
3647
msgstr "Inhalt der E-Mail."
3649
#: bzrlib/builtins.py:5876
3567
#: bzrlib/builtins.py:5783
3650
3568
msgid "Do not include a bundle in the merge directive."
3653
#: bzrlib/builtins.py:5877
3571
#: bzrlib/builtins.py:5784
3654
3572
msgid "Do not include a preview patch in the merge directive."
3657
#: bzrlib/builtins.py:5880
3575
#: bzrlib/builtins.py:5787
3658
3576
msgid "Remember submit and public branch."
3661
#: bzrlib/builtins.py:5882
3579
#: bzrlib/builtins.py:5789
3663
3581
"Branch to generate the submission from, rather than the one containing the "
3664
3582
"working directory."
3667
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3585
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3671
#: bzrlib/builtins.py:5893
3589
#: bzrlib/builtins.py:5800
3672
3590
msgid "Use the specified output format."
3673
msgstr "Das angegebene Ausgabeformat benutzen."
3675
#: bzrlib/builtins.py:5915
3593
#: bzrlib/builtins.py:5822
3676
3594
msgid "Create, remove or modify a tag naming a revision."
3679
#: bzrlib/builtins.py:5917
3597
#: bzrlib/builtins.py:5824
3681
3599
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3682
3600
"(--revision) option can be given -rtag:X, where X is any previously\n"
3686
#: bzrlib/builtins.py:5921
3604
#: bzrlib/builtins.py:5828
3688
3606
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3689
3607
"along when you branch, push, pull or merge."
3692
#: bzrlib/builtins.py:5924
3610
#: bzrlib/builtins.py:5831
3694
3612
"It is an error to give a tag name that already exists unless you pass\n"
3695
3613
"--force, in which case the tag is moved to point to the new revision."
3698
#: bzrlib/builtins.py:5927
3616
#: bzrlib/builtins.py:5834
3700
3618
"To rename a tag (change the name but keep it on the same revsion), run "
3702
3620
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3705
#: bzrlib/builtins.py:5930
3623
#: bzrlib/builtins.py:5837
3707
3625
"If no tag name is specified it will be determined through the \n"
3708
3626
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3713
#: bzrlib/builtins.py:5940
3631
#: bzrlib/builtins.py:5847
3714
3632
msgid "Delete this tag rather than placing it."
3717
#: bzrlib/builtins.py:5943
3635
#: bzrlib/builtins.py:5850
3718
3636
msgid "Branch in which to place the tag."
3721
#: bzrlib/builtins.py:5945
3639
#: bzrlib/builtins.py:5852
3722
3640
msgid "Replace existing tags."
3725
#: bzrlib/builtins.py:5960
3643
#: bzrlib/builtins.py:5867
3726
3644
msgid "No tag specified to delete."
3729
#: bzrlib/builtins.py:5962
3647
#: bzrlib/builtins.py:5869
3730
3648
#, python-format
3731
3649
msgid "Deleted tag %s."
3734
#: bzrlib/builtins.py:5976
3652
#: bzrlib/builtins.py:5883
3735
3653
msgid "Please specify a tag name."
3738
#: bzrlib/builtins.py:5984
3656
#: bzrlib/builtins.py:5891
3739
3657
#, python-format
3740
3658
msgid "Tag %s already exists for that revision."
3743
#: bzrlib/builtins.py:5988
3661
#: bzrlib/builtins.py:5895
3744
3662
#, python-format
3745
3663
msgid "Created tag %s."
3748
#: bzrlib/builtins.py:5990
3666
#: bzrlib/builtins.py:5897
3749
3667
#, python-format
3750
3668
msgid "Updated tag %s."
3753
#: bzrlib/builtins.py:5994
3671
#: bzrlib/builtins.py:5901
3754
3672
msgid "List tags."
3757
#: bzrlib/builtins.py:5996
3675
#: bzrlib/builtins.py:5903
3759
3677
"This command shows a table of tag names and the revisions they reference."
3762
#: bzrlib/builtins.py:6002
3680
#: bzrlib/builtins.py:5909
3763
3681
msgid "Branch whose tags should be displayed."
3766
#: bzrlib/builtins.py:6004
3684
#: bzrlib/builtins.py:5911
3767
3685
msgid "Sort tags by different criteria."
3770
#: bzrlib/builtins.py:6004
3688
#: bzrlib/builtins.py:5911
3771
3689
msgid "Sorting"
3774
#: bzrlib/builtins.py:6073
3692
#: bzrlib/builtins.py:5980
3775
3693
msgid "Reconfigure the type of a bzr directory."
3778
#: bzrlib/builtins.py:6075
3696
#: bzrlib/builtins.py:5982
3779
3697
msgid "A target configuration must be specified."
3780
msgstr "Es muss eine Zielkonfiguration angegeben werden."
3782
#: bzrlib/builtins.py:6077
3700
#: bzrlib/builtins.py:5984
3784
3702
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3785
3703
"The order of preference is\n"
3790
3708
"If none of these is available, --bind-to must be specified."
3793
#: bzrlib/builtins.py:6091
3711
#: bzrlib/builtins.py:5998
3794
3712
msgid "Tree type"
3797
#: bzrlib/builtins.py:6092
3715
#: bzrlib/builtins.py:5999
3798
3716
msgid "The relation between branch and tree."
3801
#: bzrlib/builtins.py:6094
3719
#: bzrlib/builtins.py:6001
3802
3720
msgid "Reconfigure to be an unbound branch with no working tree."
3805
#: bzrlib/builtins.py:6095
3723
#: bzrlib/builtins.py:6002
3806
3724
msgid "Reconfigure to be an unbound branch with a working tree."
3809
#: bzrlib/builtins.py:6096
3727
#: bzrlib/builtins.py:6003
3810
3728
msgid "Reconfigure to be a bound branch with a working tree."
3813
#: bzrlib/builtins.py:6097
3731
#: bzrlib/builtins.py:6004
3814
3732
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3817
#: bzrlib/builtins.py:6102
3735
#: bzrlib/builtins.py:6009
3818
3736
msgid "Repository type"
3821
#: bzrlib/builtins.py:6103
3739
#: bzrlib/builtins.py:6010
3822
3740
msgid "Location fo the repository."
3825
#: bzrlib/builtins.py:6105
3743
#: bzrlib/builtins.py:6012
3827
3745
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3830
#: bzrlib/builtins.py:6107
3748
#: bzrlib/builtins.py:6014
3831
3749
msgid "Reconfigure to use a shared repository."
3834
#: bzrlib/builtins.py:6111
3752
#: bzrlib/builtins.py:6018
3835
3753
msgid "Trees in Repository"
3838
#: bzrlib/builtins.py:6112
3756
#: bzrlib/builtins.py:6019
3839
3757
msgid "Whether new branches in the repository have trees."
3842
#: bzrlib/builtins.py:6114
3760
#: bzrlib/builtins.py:6021
3844
3762
"Reconfigure repository to create working trees on branches by default."
3847
#: bzrlib/builtins.py:6116
3765
#: bzrlib/builtins.py:6023
3849
3767
"Reconfigure repository to not create working trees on branches by default."
3852
#: bzrlib/builtins.py:6119
3770
#: bzrlib/builtins.py:6026
3853
3771
msgid "Branch to bind checkout to."
3856
#: bzrlib/builtins.py:6121
3774
#: bzrlib/builtins.py:6028
3857
3775
msgid "Perform reconfiguration even if local changes will be lost."
3860
#: bzrlib/builtins.py:6124
3778
#: bzrlib/builtins.py:6031
3861
3779
msgid "Reconfigure a branch to be stacked on another branch."
3864
#: bzrlib/builtins.py:6128
3782
#: bzrlib/builtins.py:6035
3866
3784
"Reconfigure a branch to be unstacked. This may require copying substantial "
3867
3785
"data into it."
3870
#: bzrlib/builtins.py:6138
3788
#: bzrlib/builtins.py:6045
3871
3789
msgid "Can't use both --stacked-on and --unstacked"
3873
"Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
3875
#: bzrlib/builtins.py:6152
3792
#: bzrlib/builtins.py:6059
3876
3793
msgid "No target configuration specified"
3877
msgstr "Keine Zielkonfiguration angegeben"
3879
#: bzrlib/builtins.py:6187
3796
#: bzrlib/builtins.py:6094
3880
3797
msgid "Set the branch of a checkout and update."
3883
#: bzrlib/builtins.py:6189
3800
#: bzrlib/builtins.py:6096
3885
3802
"For lightweight checkouts, this changes the branch being referenced.\n"
3886
3803
"For heavyweight checkouts, this checks that there are no local commits\n"
3959
3876
"want to switch back to your view after that."
3962
#: bzrlib/builtins.py:6281
3879
#: bzrlib/builtins.py:6228
3965
3882
" To define the current view::"
3968
#: bzrlib/builtins.py:6284
3885
#: bzrlib/builtins.py:6231
3969
3886
msgid " bzr view file1 dir1 ..."
3972
#: bzrlib/builtins.py:6286
3889
#: bzrlib/builtins.py:6233
3973
3890
msgid " To list the current view::"
3976
#: bzrlib/builtins.py:6288
3893
#: bzrlib/builtins.py:6235
3977
3894
msgid " bzr view"
3980
#: bzrlib/builtins.py:6290
3897
#: bzrlib/builtins.py:6237
3981
3898
msgid " To delete the current view::"
3984
#: bzrlib/builtins.py:6292
3901
#: bzrlib/builtins.py:6239
3985
3902
msgid " bzr view --delete"
3986
msgstr " bzr view --delete"
3988
#: bzrlib/builtins.py:6294
3905
#: bzrlib/builtins.py:6241
3989
3906
msgid " To disable the current view without deleting it::"
3992
#: bzrlib/builtins.py:6296
3909
#: bzrlib/builtins.py:6243
3993
3910
msgid " bzr view --switch off"
3994
msgstr " bzr view --switch off"
3996
#: bzrlib/builtins.py:6298
3913
#: bzrlib/builtins.py:6245
3997
3914
msgid " To define a named view and switch to it::"
4000
#: bzrlib/builtins.py:6300
3917
#: bzrlib/builtins.py:6247
4001
3918
msgid " bzr view --name view-name file1 dir1 ..."
4004
#: bzrlib/builtins.py:6302
3921
#: bzrlib/builtins.py:6249
4005
3922
msgid " To list a named view::"
4008
#: bzrlib/builtins.py:6304
3925
#: bzrlib/builtins.py:6251
4009
3926
msgid " bzr view --name view-name"
4012
#: bzrlib/builtins.py:6306
3929
#: bzrlib/builtins.py:6253
4013
3930
msgid " To delete a named view::"
4016
#: bzrlib/builtins.py:6308
3933
#: bzrlib/builtins.py:6255
4017
3934
msgid " bzr view --name view-name --delete"
4020
#: bzrlib/builtins.py:6310
3937
#: bzrlib/builtins.py:6257
4021
3938
msgid " To switch to a named view::"
4024
#: bzrlib/builtins.py:6312
3941
#: bzrlib/builtins.py:6259
4025
3942
msgid " bzr view --switch view-name"
4028
#: bzrlib/builtins.py:6314
3945
#: bzrlib/builtins.py:6261
4029
3946
msgid " To list all views defined::"
4032
#: bzrlib/builtins.py:6316
3949
#: bzrlib/builtins.py:6263
4033
3950
msgid " bzr view --all"
4034
msgstr " bzr view --all"
4036
#: bzrlib/builtins.py:6318
3953
#: bzrlib/builtins.py:6265
4037
3954
msgid " To delete all views::"
4040
#: bzrlib/builtins.py:6320
3957
#: bzrlib/builtins.py:6267
4041
3958
msgid " bzr view --delete --all"
4042
msgstr " bzr view --delete --all"
4044
#: bzrlib/builtins.py:6327
3961
#: bzrlib/builtins.py:6274
4045
3962
msgid "Apply list or delete action to all views."
4048
#: bzrlib/builtins.py:6330
3965
#: bzrlib/builtins.py:6277
4049
3966
msgid "Delete the view."
4052
#: bzrlib/builtins.py:6333
3969
#: bzrlib/builtins.py:6280
4053
3970
msgid "Name of the view to define, list or delete."
4056
#: bzrlib/builtins.py:6337
3973
#: bzrlib/builtins.py:6284
4057
3974
msgid "Name of the view to switch to."
4060
#: bzrlib/builtins.py:6356
3977
#: bzrlib/builtins.py:6303
4061
3978
msgid "Both --delete and a file list specified"
4064
#: bzrlib/builtins.py:6359
3981
#: bzrlib/builtins.py:6306
4065
3982
msgid "Both --delete and --switch specified"
4068
#: bzrlib/builtins.py:6362
3985
#: bzrlib/builtins.py:6309
4069
3986
msgid "Deleted all views.\n"
4072
#: bzrlib/builtins.py:6364
3989
#: bzrlib/builtins.py:6311
4073
3990
msgid "No current view to delete"
4076
#: bzrlib/builtins.py:6367
3993
#: bzrlib/builtins.py:6314
4077
3994
#, python-format
4078
3995
msgid "Deleted '%s' view.\n"
4081
#: bzrlib/builtins.py:6371
3998
#: bzrlib/builtins.py:6318
4082
3999
msgid "Both --switch and a file list specified"
4085
#: bzrlib/builtins.py:6374
4002
#: bzrlib/builtins.py:6321
4086
4003
msgid "Both --switch and --all specified"
4089
#: bzrlib/builtins.py:6377
4006
#: bzrlib/builtins.py:6324
4090
4007
msgid "No current view to disable"
4093
#: bzrlib/builtins.py:6379
4010
#: bzrlib/builtins.py:6326
4094
4011
#, python-format
4095
4012
msgid "Disabled '%s' view.\n"
4098
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4015
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4099
4016
msgid "Using '{0}' view: {1}\n"
4102
#: bzrlib/builtins.py:6386
4019
#: bzrlib/builtins.py:6333
4103
4020
msgid "Views defined:\n"
4106
#: bzrlib/builtins.py:6395
4023
#: bzrlib/builtins.py:6342
4107
4024
msgid "No views defined.\n"
4110
#: bzrlib/builtins.py:6402
4027
#: bzrlib/builtins.py:6349
4111
4028
msgid "Cannot change the 'off' pseudo view"
4114
#: bzrlib/builtins.py:6410
4031
#: bzrlib/builtins.py:6357
4115
4032
msgid "No current view.\n"
4118
#: bzrlib/builtins.py:6413
4035
#: bzrlib/builtins.py:6360
4119
4036
msgid "'{0}' view is: {1}\n"
4122
#: bzrlib/builtins.py:6433
4039
#: bzrlib/builtins.py:6380
4123
4040
msgid " <no hooks installed>\n"
4126
#: bzrlib/builtins.py:6437
4043
#: bzrlib/builtins.py:6384
4127
4044
msgid "Remove a branch."
4128
msgstr "Einen Zweig entfernen."
4130
#: bzrlib/builtins.py:6439
4047
#: bzrlib/builtins.py:6386
4132
4049
"This will remove the branch from the specified location but \n"
4133
4050
"will keep any working tree or repository in place."
4136
#: bzrlib/builtins.py:6444
4053
#: bzrlib/builtins.py:6391
4137
4054
msgid " Remove the branch at repo/trunk::"
4140
#: bzrlib/builtins.py:6446
4057
#: bzrlib/builtins.py:6393
4141
4058
msgid " bzr remove-branch repo/trunk"
4142
msgstr " bzr remove-branch repo/trunk"
4144
#: bzrlib/builtins.py:6461
4061
#: bzrlib/builtins.py:6408
4145
4062
msgid "Plaintext diff output."
4148
#: bzrlib/builtins.py:6462
4065
#: bzrlib/builtins.py:6409
4149
4066
msgid "Temporarily set aside some changes from the current tree."
4152
#: bzrlib/builtins.py:6464
4069
#: bzrlib/builtins.py:6411
4154
4071
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4155
4072
"ie. out of the way, until a later time when you can bring them back from\n"
4210
#: bzrlib/builtins.py:6503
4127
#: bzrlib/builtins.py:6450
4211
4128
msgid "Shelve all changes."
4214
#: bzrlib/builtins.py:6505
4131
#: bzrlib/builtins.py:6452
4215
4132
msgid "Method to use for writing diffs."
4218
#: bzrlib/builtins.py:6505
4135
#: bzrlib/builtins.py:6452
4222
#: bzrlib/builtins.py:6509
4139
#: bzrlib/builtins.py:6456
4223
4140
msgid "List shelved changes."
4226
#: bzrlib/builtins.py:6511
4143
#: bzrlib/builtins.py:6458
4227
4144
msgid "Destroy removed changes instead of shelving them."
4230
#: bzrlib/builtins.py:6540
4147
#: bzrlib/builtins.py:6487
4231
4148
msgid "No shelved changes."
4234
#: bzrlib/builtins.py:6551
4151
#: bzrlib/builtins.py:6498
4235
4152
msgid "Restore shelved changes."
4238
#: bzrlib/builtins.py:6553
4155
#: bzrlib/builtins.py:6500
4240
4157
"By default, the most recently shelved changes are restored. However if you\n"
4241
4158
"specify a shelf by id those changes will be restored instead. This works\n"
4242
4159
"best when the changes don't depend on each other."
4245
#: bzrlib/builtins.py:6562
4162
#: bzrlib/builtins.py:6509
4246
4163
msgid "The action to perform."
4247
msgstr "Die auszuführende Aktion."
4249
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4166
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4253
#: bzrlib/builtins.py:6564
4170
#: bzrlib/builtins.py:6511
4254
4171
msgid "Apply changes and remove from the shelf."
4257
#: bzrlib/builtins.py:6565
4174
#: bzrlib/builtins.py:6512
4258
4175
msgid "Show changes, but do not apply or remove them."
4259
msgstr "Änderungen anzeigen, aber nicht anwenden oder entfernen."
4261
#: bzrlib/builtins.py:6566
4178
#: bzrlib/builtins.py:6513
4263
4180
"Instead of unshelving the changes, show the diff that would result from "
4267
#: bzrlib/builtins.py:6568
4184
#: bzrlib/builtins.py:6515
4268
4185
msgid "Delete changes without applying them."
4269
msgstr "Änderungen löschen ohne diese anzuwenden."
4271
#: bzrlib/builtins.py:6569
4188
#: bzrlib/builtins.py:6516
4272
4189
msgid "Apply changes but don't delete them."
4273
msgstr "Änderungen anwenden, aber diese nicht löschen."
4275
#: bzrlib/builtins.py:6584
4192
#: bzrlib/builtins.py:6531
4276
4193
msgid "Remove unwanted files from working tree."
4279
#: bzrlib/builtins.py:6586
4196
#: bzrlib/builtins.py:6533
4281
4198
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4282
4199
"files are never deleted."
4285
#: bzrlib/builtins.py:6589
4202
#: bzrlib/builtins.py:6536
4287
4204
"Another class is 'detritus', which includes files emitted by bzr during\n"
4288
4205
"normal operations and selftests. (The value of these files decreases with\n"
4292
#: bzrlib/builtins.py:6593
4209
#: bzrlib/builtins.py:6540
4294
4211
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4295
4212
"flags are respected, and may be combined."
4298
#: bzrlib/builtins.py:6596
4215
#: bzrlib/builtins.py:6543
4299
4216
msgid "To check what clean-tree will do, use --dry-run."
4300
msgstr "Um zu prüfen, was clean-tree tun wird, --dry-run benutzen."
4302
#: bzrlib/builtins.py:6599
4219
#: bzrlib/builtins.py:6546
4303
4220
msgid "Delete all ignored files."
4304
msgstr "Alle ignorierten Dateien löschen."
4306
#: bzrlib/builtins.py:6600
4223
#: bzrlib/builtins.py:6547
4308
4225
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4311
#: bzrlib/builtins.py:6603
4228
#: bzrlib/builtins.py:6550
4312
4229
msgid "Delete files unknown to bzr (default)."
4313
msgstr "Dateien löschen, die bzr nicht bekannt sind (Vorgabe)."
4315
#: bzrlib/builtins.py:6604
4232
#: bzrlib/builtins.py:6551
4316
4233
msgid "Show files to delete instead of deleting them."
4317
msgstr "Dateien zum Löschen anzeigen, anstelle diese zu löschen."
4319
#: bzrlib/builtins.py:6606
4236
#: bzrlib/builtins.py:6553
4320
4237
msgid "Do not prompt before deleting."
4321
msgstr "Vor dem Löschen nicht nachfragen."
4323
4240
#: bzrlib/bundle/__init__.py:59
4324
4241
msgid "A directory cannot be a bundle"
4645
4560
msgid "bzr version-info --revision takes exactly one revision specifier"
4648
#: bzrlib/commands.py:229
4563
#: bzrlib/commands.py:228
4649
4564
#, python-format
4650
4565
msgid "unknown command \"%s\""
4651
msgstr "Unbekannter Befehl »%s«"
4653
#: bzrlib/commands.py:476
4568
#: bzrlib/commands.py:475
4654
4569
msgid "No help for this command."
4655
msgstr "Keine Hilfe zu diesem Befehl verfügbar."
4657
#: bzrlib/commands.py:489
4572
#: bzrlib/commands.py:488
4658
4573
#, python-format
4659
4574
msgid ":Purpose: %s\n"
4660
msgstr ":Zweck: %s\n"
4662
#: bzrlib/commands.py:491
4577
#: bzrlib/commands.py:490
4663
4578
#, python-format
4671
#: bzrlib/commands.py:493
4584
#: bzrlib/commands.py:492
4672
4585
#, python-format
4673
4586
msgid ":Usage: %s\n"
4674
msgstr ":Aufruf: %s\n"
4676
#: bzrlib/commands.py:512
4589
#: bzrlib/commands.py:511
4677
4590
#, python-format
4678
4591
msgid ":Options:%s"
4679
msgstr ":Optionen: %s"
4681
#: bzrlib/commands.py:523
4594
#: bzrlib/commands.py:522
4682
4595
#, python-format
4684
4597
":Description:\n"
4692
#: bzrlib/commands.py:533
4602
#: bzrlib/commands.py:532
4693
4603
#, python-format
4695
4605
"See bzr help %s for more details and examples.\n"
4699
#: bzrlib/commands.py:538
4609
#: bzrlib/commands.py:537
4700
4610
msgid ":Aliases: "
4703
#: bzrlib/commands.py:542
4613
#: bzrlib/commands.py:541
4704
4614
#, python-format
4705
4615
msgid ":From: plugin \"%s\"\n"
4706
msgstr ":Von: Erweiterung »%s«\n"
4708
#: bzrlib/commands.py:554
4618
#: bzrlib/commands.py:553
4709
4619
msgid ":doc:`{0} <{1}-help>`"
4712
#: bzrlib/commands.py:558
4622
#: bzrlib/commands.py:557
4713
4623
#, python-format
4714
4624
msgid ":See also: %s"
4715
msgstr ":Siehe auch: %s"
4717
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4627
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4718
4628
msgid "Only ASCII permitted in option names"
4721
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4631
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4722
4632
msgid "command {0!r} needs one or more {1}"
4725
#: bzrlib/commands.py:858
4635
#: bzrlib/commands.py:857
4726
4636
msgid "command {0!r} requires argument {1}"
4729
#: bzrlib/commands.py:865
4639
#: bzrlib/commands.py:864
4730
4640
msgid "extra argument to command {0}: {1}"
4733
#: bzrlib/commands.py:962
4643
#: bzrlib/commands.py:961
4734
4644
#, python-format
4735
4645
msgid "Profile data written to \"%s\"."
4738
4648
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4740
msgstr "Hinzugefügt"
4742
4652
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4743
4653
msgid "modified"
4746
4656
#: bzrlib/commit.py:131
4747
4657
#, python-format
5128
#: bzrlib/errors.py:799
5129
msgid "Revision is not compatible with %(repo_format)s"
5231
5132
#: bzrlib/errors.py:809
5232
msgid "Revision is not compatible with %(repo_format)s"
5233
msgstr "Die Revision ist inkompatibel zu %(repo_format)s"
5235
#: bzrlib/errors.py:819
5236
5133
msgid "%(context_info)s%(path)s is already versioned."
5237
msgstr "%(context_info)s%(path)s ist bereits versioniert."
5239
#: bzrlib/errors.py:840
5136
#: bzrlib/errors.py:830
5240
5137
msgid "%(context_info)s%(path)s is not versioned."
5241
msgstr "%(context_info)s%(path)s ist nicht versioniert."
5243
#: bzrlib/errors.py:861
5140
#: bzrlib/errors.py:851
5244
5141
msgid "Path(s) are not versioned: %(paths_as_string)s"
5245
msgstr "Pfad(e) ist/sind nicht versioniert: %(paths_as_string)s"
5247
#: bzrlib/errors.py:872
5144
#: bzrlib/errors.py:862
5248
5145
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5249
msgstr "Pfad(e) existiert/existieren nicht: %(paths_as_string)s%(extra)s"
5251
#: bzrlib/errors.py:891
5148
#: bzrlib/errors.py:881
5252
5149
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5255
#: bzrlib/errors.py:899
5152
#: bzrlib/errors.py:889
5257
5154
"Filename %(filename)r is not valid in your current filesystem encoding "
5258
5155
"%(fs_encoding)s"
5261
#: bzrlib/errors.py:910
5158
#: bzrlib/errors.py:900
5262
5159
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5265
#: bzrlib/errors.py:928
5162
#: bzrlib/errors.py:918
5266
5163
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5166
#: bzrlib/errors.py:957
5167
msgid "Cannot lock %(lock)s: %(why)s"
5269
5170
#: bzrlib/errors.py:967
5270
msgid "Cannot lock %(lock)s: %(why)s"
5273
#: bzrlib/errors.py:977
5275
5172
"A transaction related operation was attempted after the transaction finished."
5278
#: bzrlib/errors.py:1004
5175
#: bzrlib/errors.py:994
5279
5176
msgid "Cannot lock: transport is read only: %(transport)s"
5282
#: bzrlib/errors.py:1012
5179
#: bzrlib/errors.py:1002
5283
5180
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5286
#: bzrlib/errors.py:1023
5183
#: bzrlib/errors.py:1013
5288
5185
"Lock was broken while still open: %(lock)s - check storage consistency!"
5291
#: bzrlib/errors.py:1034
5188
#: bzrlib/errors.py:1024
5293
5190
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5294
5191
"%(holder)r, wanted to break %(target)r"
5297
#: bzrlib/errors.py:1046
5194
#: bzrlib/errors.py:1036
5299
5196
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5300
5197
"Use 'bzr break-lock' to clear it"
5303
#: bzrlib/errors.py:1059
5200
#: bzrlib/errors.py:1049
5304
5201
msgid "Lock not held: %(lock)s"
5307
#: bzrlib/errors.py:1088
5204
#: bzrlib/errors.py:1078
5308
5205
msgid "No changes to commit"
5208
#: bzrlib/errors.py:1083
5210
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5311
5213
#: bzrlib/errors.py:1093
5313
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5316
#: bzrlib/errors.py:1103
5318
5215
"Excluding paths during commit is not supported by repository at "
5319
5216
"%(repository)r."
5322
#: bzrlib/errors.py:1112
5219
#: bzrlib/errors.py:1102
5324
5221
"The specified commit message contains characters unsupported by the current "
5328
#: bzrlib/errors.py:1118
5225
#: bzrlib/errors.py:1108
5329
5226
msgid "Upgrade URL cannot work with readonly URLs."
5332
#: bzrlib/errors.py:1123
5229
#: bzrlib/errors.py:1113
5333
5230
msgid "The branch format %(format)s is already at the most recent format."
5336
#: bzrlib/errors.py:1146
5233
#: bzrlib/errors.py:1136
5337
5234
msgid "Option --change does not accept revision ranges"
5338
msgstr "Die Option --change akzeptiert keine Revisionsbereiche"
5340
#: bzrlib/errors.py:1151
5237
#: bzrlib/errors.py:1141
5341
5238
msgid "No namespace registered for string: %(spec)r"
5344
#: bzrlib/errors.py:1170
5241
#: bzrlib/errors.py:1160
5346
5243
"Requested revision: '%(spec)s' does not exist in branch: "
5347
5244
"%(branch_url)s%(extra)s"
5349
"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: "
5350
"%(branch_url)s%(extra)s"
5352
#: bzrlib/errors.py:1184
5247
#: bzrlib/errors.py:1174
5354
5249
"Operation denied because it would change the main history, which is not "
5355
5250
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5358
#: bzrlib/errors.py:1195
5253
#: bzrlib/errors.py:1185
5360
5255
"These branches have diverged. Use the missing command to see how.\n"
5361
5256
"Use the merge command to reconcile them."
5364
#: bzrlib/errors.py:1215
5259
#: bzrlib/errors.py:1205
5366
5261
"Branches have no common ancestor, and no merge base revision was specified."
5369
#: bzrlib/errors.py:1221
5264
#: bzrlib/errors.py:1211
5371
5266
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5374
#: bzrlib/errors.py:1227
5269
#: bzrlib/errors.py:1217
5375
5270
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5378
#: bzrlib/errors.py:1236
5273
#: bzrlib/errors.py:1226
5380
5275
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5383
#: bzrlib/errors.py:1245
5278
#: bzrlib/errors.py:1235
5384
5279
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5387
#: bzrlib/errors.py:1254
5282
#: bzrlib/errors.py:1244
5388
5283
msgid "Branch %(branch)s has no commits."
5391
#: bzrlib/errors.py:1272
5286
#: bzrlib/errors.py:1262
5393
5288
"Bound branch %(branch)s is out of date with master branch "
5394
5289
"%(master)s.%(extra_help)s"
5397
#: bzrlib/errors.py:1284
5292
#: bzrlib/errors.py:1274
5399
5294
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5400
5295
"bound to %(remote)s."
5403
#: bzrlib/errors.py:1296
5298
#: bzrlib/errors.py:1286
5404
5299
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5407
#: bzrlib/errors.py:1305
5302
#: bzrlib/errors.py:1295
5409
5304
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5413
#: bzrlib/errors.py:1317
5308
#: bzrlib/errors.py:1307
5414
5309
msgid "Error in processing weave: %(msg)s"
5417
#: bzrlib/errors.py:1326
5312
#: bzrlib/errors.py:1316
5418
5313
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5419
msgstr "Revision {%(revision_id)s} ist bereits in %(weave)s vorhanden"
5316
#: bzrlib/errors.py:1327
5317
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5421
5320
#: bzrlib/errors.py:1337
5422
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5423
msgstr "Revision {%(revision_id)s} ist nicht in %(weave)s vorhanden"
5425
#: bzrlib/errors.py:1347
5426
5321
msgid "Weave invariant violated: %(what)s"
5429
#: bzrlib/errors.py:1356
5324
#: bzrlib/errors.py:1346
5430
5325
msgid "Parents are mismatched between two revisions. %(msg)s"
5433
#: bzrlib/errors.py:1378
5328
#: bzrlib/errors.py:1368
5435
5330
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5439
#: bzrlib/errors.py:1390
5334
#: bzrlib/errors.py:1380
5440
5335
msgid "Versioned file error"
5441
msgstr "Fehler bei versionierter Datei"
5338
#: bzrlib/errors.py:1385
5339
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5443
5342
#: bzrlib/errors.py:1395
5444
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5445
msgstr "Revision {%(revision_id)s} ist nicht in »%(file_id)s« vorhanden."
5343
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5447
5346
#: bzrlib/errors.py:1405
5448
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5449
msgstr "Revision {%(revision_id)s} ist bereits in »%(file_id)s« vorhanden."
5451
#: bzrlib/errors.py:1415
5452
5347
msgid "Text did not match its checksum: %(msg)s"
5453
msgstr "Der Text entsprach nicht seiner Prüfsumme: %(msg)s"
5455
#: bzrlib/errors.py:1541
5350
#: bzrlib/errors.py:1531
5456
5351
msgid "Export format %(format)r not supported"
5457
msgstr "Exportformat %(format)r wird nicht unterstützt"
5459
#: bzrlib/errors.py:1550
5354
#: bzrlib/errors.py:1540
5460
5355
msgid "Transport error: %(msg)s %(orig_error)s"
5461
msgstr "Übertragungsfehler: %(msg)s %(orig_error)s"
5463
#: bzrlib/errors.py:1576
5358
#: bzrlib/errors.py:1566
5464
5359
msgid "Generic bzr smart protocol error: %(details)s"
5465
msgstr "Allgemeiner bzr-Smart-Protokoll-Fehler: %(details)s"
5467
#: bzrlib/errors.py:1584
5362
#: bzrlib/errors.py:1574
5468
5363
msgid "Received bad protocol version marker: %(marker)r"
5471
#: bzrlib/errors.py:1616
5366
#: bzrlib/errors.py:1606
5472
5367
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5475
#: bzrlib/errors.py:1621
5370
#: bzrlib/errors.py:1611
5476
5371
msgid "Connection error: %(msg)s %(orig_error)s"
5477
msgstr "Verbindungsfehler: %(msg)s %(orig_error)s"
5479
#: bzrlib/errors.py:1626
5374
#: bzrlib/errors.py:1616
5480
5375
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5481
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5483
#: bzrlib/errors.py:1647
5378
#: bzrlib/errors.py:1637
5484
5379
msgid "Connection closed: %(msg)s %(orig_error)s"
5485
msgstr "Verbindung geschlossen: %(msg)s %(orig_error)s"
5487
#: bzrlib/errors.py:1652
5382
#: bzrlib/errors.py:1642
5488
5383
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5489
msgstr "Verbindung abgelaufen: %(msg)s%(orig_error)s"
5386
#: bzrlib/errors.py:1647
5387
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5491
5390
#: bzrlib/errors.py:1657
5492
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5495
#: bzrlib/errors.py:1667
5496
5391
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5497
msgstr "Ungültige HTTP-Antwort für %(path)s: %(msg)s%(orig_error)s"
5499
#: bzrlib/errors.py:1682
5500
msgid "Certificate error: %(error)s"
5501
msgstr "Zertifikatsfehler: %(error)s"
5503
#: bzrlib/errors.py:1690
5394
#: bzrlib/errors.py:1672
5504
5395
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5505
msgstr "Ungültiger HTTP-Bereich %(range)r für %(path)s: %(msg)s"
5507
#: bzrlib/errors.py:1704
5398
#: bzrlib/errors.py:1686
5508
5399
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5509
msgstr "»HTTP MIME Boundary« für %(path)s fehlt: %(msg)sy"
5511
#: bzrlib/errors.py:1712
5402
#: bzrlib/errors.py:1694
5512
5403
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5513
msgstr "Ungültiger HTTP-Content-type »%(ctype)s« für %(path)s: %(msg)s"
5515
#: bzrlib/errors.py:1721
5406
#: bzrlib/errors.py:1703
5516
5407
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5517
msgstr "%(source)s wird%(permanently)s umgeleitet nach %(target)s"
5519
#: bzrlib/errors.py:1735
5410
#: bzrlib/errors.py:1717
5520
5411
msgid "Too many redirections"
5521
msgstr "Zu viele Umleitungen"
5523
#: bzrlib/errors.py:1740
5414
#: bzrlib/errors.py:1722
5524
5415
msgid "Working tree has conflicts."
5527
#: bzrlib/errors.py:1744
5418
#: bzrlib/errors.py:1726
5528
5419
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5529
msgstr "Konfigurationsdatei %(filename)s ist nicht UTF-8-kodiert\n"
5531
#: bzrlib/errors.py:1753
5422
#: bzrlib/errors.py:1735
5533
5424
"Error(s) parsing config file %(filename)s:\n"
5428
#: bzrlib/errors.py:1746
5429
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5432
#: bzrlib/errors.py:1754
5433
msgid "%(username)r does not seem to contain a reasonable email address"
5537
5436
#: bzrlib/errors.py:1763
5539
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5540
"See ``bzr help %(name)s``"
5543
#: bzrlib/errors.py:1773
5544
msgid "%(username)r does not seem to contain a reasonable email address"
5545
msgstr "%(username)r scheint keine vernünftige E-Mail-Adresse zu haben"
5547
#: bzrlib/errors.py:1782
5548
5437
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5551
#: bzrlib/errors.py:1790
5440
#: bzrlib/errors.py:1771
5552
5441
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5555
#: bzrlib/errors.py:1798
5444
#: bzrlib/errors.py:1779
5556
5445
msgid "Unable to import library \"%(library)s\": %(error)s"
5557
msgstr "Importieren der Bibliothek »%(library)s« nicht möglich: %(error)s"
5559
#: bzrlib/errors.py:1806
5448
#: bzrlib/errors.py:1787
5560
5449
msgid "python-gpgme is not installed, it is needed to verify signatures"
5563
#: bzrlib/errors.py:1814
5452
#: bzrlib/errors.py:1795
5565
5454
"The working tree for %(basedir)s has changed since the last commit, but "
5566
5455
"weave merge requires that it be unchanged"
5569
#: bzrlib/errors.py:1824
5458
#: bzrlib/errors.py:1805
5571
5460
"Can't reprocess and show base, because reprocessing obscures the "
5572
5461
"relationship of conflicting lines to the base"
5575
#: bzrlib/errors.py:1830
5464
#: bzrlib/errors.py:1811
5576
5465
msgid "Cycle in graph %(graph)r"
5579
#: bzrlib/errors.py:1858
5468
#: bzrlib/errors.py:1839
5580
5469
msgid "File %(filename)s is not conflicted."
5583
#: bzrlib/errors.py:1880
5472
#: bzrlib/errors.py:1861
5584
5473
msgid "No bundle was found in \"%(filename)s\"."
5587
#: bzrlib/errors.py:1889
5476
#: bzrlib/errors.py:1870
5588
5477
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5591
#: bzrlib/errors.py:1899
5480
#: bzrlib/errors.py:1880
5592
5481
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5593
msgstr "Im Zweig %(base)s fehlt Revision %(text_revision)s von %(file_id)s"
5595
#: bzrlib/errors.py:1912
5484
#: bzrlib/errors.py:1893
5596
5485
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5599
#: bzrlib/errors.py:1922
5488
#: bzrlib/errors.py:1903
5600
5489
msgid "Key %(key)s is already present in map"
5603
#: bzrlib/errors.py:1927
5492
#: bzrlib/errors.py:1908
5604
5493
msgid "The prefix %(prefix)s is in the help search path twice."
5607
#: bzrlib/errors.py:1937
5496
#: bzrlib/errors.py:1918
5609
5498
"No final name for trans_id %(trans_id)r\n"
5610
5499
"file-id: %(file_id)r\n"
5611
5500
"root trans-id: %(root_trans_id)r\n"
5614
#: bzrlib/errors.py:1969
5503
#: bzrlib/errors.py:1950
5615
5504
msgid "Attempt to reuse a transform that has already been applied."
5618
#: bzrlib/errors.py:1974
5507
#: bzrlib/errors.py:1955
5619
5508
msgid "Moving the root directory is not supported at this time"
5622
#: bzrlib/errors.py:1979
5511
#: bzrlib/errors.py:1960
5623
5512
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5624
msgstr "Umbenennen von %(from_path)s in %(to_path)s gescheitert: %(why)s"
5626
#: bzrlib/errors.py:1990
5515
#: bzrlib/errors.py:1971
5628
5517
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5631
#: bzrlib/errors.py:2026
5520
#: bzrlib/errors.py:2007
5633
5522
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5636
#: bzrlib/errors.py:2056
5525
#: bzrlib/errors.py:2037
5637
5526
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5640
#: bzrlib/errors.py:2064
5529
#: bzrlib/errors.py:2045
5641
5530
msgid "Nothing to merge."
5644
#: bzrlib/errors.py:2069
5533
#: bzrlib/errors.py:2050
5645
5534
msgid "Format %(format)s cannot be initialised by this version of bzr."
5647
"Das Format %(format)s kann von dieser Bazaar-Version nicht initialisiert "
5650
#: bzrlib/errors.py:2078
5537
#: bzrlib/errors.py:2059
5652
5539
"Cannot convert from format %(from_format)s to format %(format)s. "
5656
#: bzrlib/errors.py:2090
5543
#: bzrlib/errors.py:2071
5657
5544
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5660
#: bzrlib/errors.py:2098
5547
#: bzrlib/errors.py:2079
5661
5548
msgid "%(exe_name)s could not be found on this machine"
5662
msgstr "%(exe_name)s konnte nicht auf diesem Rechner gefunden werden"
5664
#: bzrlib/errors.py:2106
5551
#: bzrlib/errors.py:2087
5665
5552
msgid "Diff is not installed on this machine: %(msg)s"
5666
msgstr "Diff ist auf diesem Rechner nicht installiert: %(msg)s"
5668
#: bzrlib/errors.py:2114
5555
#: bzrlib/errors.py:2095
5669
5556
msgid "Diff3 is not installed on this machine."
5670
msgstr "Diff3 ist auf diesem Rechner nicht installiert."
5672
#: bzrlib/errors.py:2120
5559
#: bzrlib/errors.py:2101
5673
5560
msgid "The content being inserted is already present."
5674
msgstr "Der gerade eingefügte Inhalt ist bereits vorhanden."
5676
#: bzrlib/errors.py:2125
5563
#: bzrlib/errors.py:2106
5678
5565
"This tree contains left-over files from a failed operation.\n"
5679
5566
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5696
5583
" keep, and delete it when you are done."
5699
#: bzrlib/errors.py:2157
5586
#: bzrlib/errors.py:2138
5701
5588
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5702
5589
"examine %(pending_deletion)s to see if it contains any files you wish to "
5703
5590
"keep, and delete it when you are done."
5706
#: bzrlib/errors.py:2167
5593
#: bzrlib/errors.py:2148
5707
5594
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5710
#: bzrlib/errors.py:2181
5597
#: bzrlib/errors.py:2162
5712
5599
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5714
"Im öffentlichen Zweig »%(public_location)s« fehlt Revision »%(revstring)s«."
5716
#: bzrlib/errors.py:2194
5602
#: bzrlib/errors.py:2175
5717
5603
msgid "Error in merge modified format"
5720
#: bzrlib/errors.py:2199
5606
#: bzrlib/errors.py:2180
5721
5607
msgid "Format error in conflict listings"
5724
#: bzrlib/errors.py:2203
5610
#: bzrlib/errors.py:2184
5726
5612
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5727
5613
"Error: %(description)s"
5730
#: bzrlib/errors.py:2214
5616
#: bzrlib/errors.py:2195
5732
5618
"An error has been detected in the repository %(repo_path)s.\n"
5733
5619
"Please run bzr reconcile on this repository."
5736
#: bzrlib/errors.py:2225
5622
#: bzrlib/errors.py:2206
5738
5624
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5739
5625
"reason: %(reason)s"
5742
#: bzrlib/errors.py:2238
5628
#: bzrlib/errors.py:2219
5744
5630
"An inconsistent delta was supplied: %(delta)r\n"
5745
5631
"reason: %(reason)s"
5748
#: bzrlib/errors.py:2250
5634
#: bzrlib/errors.py:2231
5749
5635
msgid "To use this feature you must upgrade your branch at %(path)s."
5752
#: bzrlib/errors.py:2259
5638
#: bzrlib/errors.py:2240
5753
5639
msgid "To use this feature you must upgrade your repository at %(path)s."
5756
#: bzrlib/errors.py:2264
5642
#: bzrlib/errors.py:2245
5758
5644
"To use this feature you must upgrade your branch at %(path)s to a format "
5759
5645
"which supports rich roots."
5762
#: bzrlib/errors.py:2270
5648
#: bzrlib/errors.py:2251
5763
5649
msgid "Cannot perform local-only commits on unbound branches."
5766
#: bzrlib/errors.py:2275
5652
#: bzrlib/errors.py:2256
5767
5653
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5770
#: bzrlib/errors.py:2296
5656
#: bzrlib/errors.py:2277
5771
5657
msgid "Ghost tags not supported by format %(format)r."
5774
#: bzrlib/errors.py:2304
5660
#: bzrlib/errors.py:2285
5775
5661
msgid "File is binary but should be text."
5776
msgstr "Die Datei ist binär, sollte aber Text sein."
5778
#: bzrlib/errors.py:2309
5664
#: bzrlib/errors.py:2290
5779
5665
msgid "The path %(path)s is not permitted on this platform"
5780
msgstr "Der Pfad %(path)s ist auf dieser Plattform nicht erlaubt"
5782
#: bzrlib/errors.py:2318
5668
#: bzrlib/errors.py:2299
5784
5670
"Testament did not match expected value.\n"
5785
5671
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5786
5672
" {%(measured)s}"
5789
#: bzrlib/errors.py:2330
5675
#: bzrlib/errors.py:2311
5790
5676
msgid "Not a bzr revision-bundle: %(text)r"
5793
#: bzrlib/errors.py:2339
5679
#: bzrlib/errors.py:2320
5794
5680
msgid "Bad bzr revision-bundle: %(text)r"
5797
#: bzrlib/errors.py:2348
5683
#: bzrlib/errors.py:2329
5798
5684
msgid "Malformed bzr revision-bundle header: %(text)r"
5801
#: bzrlib/errors.py:2353
5687
#: bzrlib/errors.py:2334
5802
5688
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5805
#: bzrlib/errors.py:2358
5691
#: bzrlib/errors.py:2339
5806
5692
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5809
#: bzrlib/errors.py:2363
5695
#: bzrlib/errors.py:2344
5810
5696
msgid "End of line marker was not \\n in bzr revision-bundle"
5813
#: bzrlib/errors.py:2373
5699
#: bzrlib/errors.py:2354
5814
5700
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5817
#: bzrlib/errors.py:2383
5703
#: bzrlib/errors.py:2364
5818
5704
msgid "Root class for inventory serialization errors"
5821
#: bzrlib/errors.py:2387
5707
#: bzrlib/errors.py:2368
5823
5709
"The inventory was not in the expected format:\n"
5827
#: bzrlib/errors.py:2396
5713
#: bzrlib/errors.py:2377
5828
5714
msgid "This operation requires rich root data storage"
5831
#: bzrlib/errors.py:2409
5717
#: bzrlib/errors.py:2390
5832
5718
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5835
#: bzrlib/errors.py:2418
5721
#: bzrlib/errors.py:2399
5837
5723
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5841
#: bzrlib/errors.py:2425
5727
#: bzrlib/errors.py:2406
5843
5729
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5844
5730
"ghost at {%(ghost_revision_id)s}"
5847
#: bzrlib/errors.py:2435
5733
#: bzrlib/errors.py:2416
5848
5734
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5849
msgstr "Geister-Revision {%(revision_id)s} kann hier nicht benutzt werden."
5851
#: bzrlib/errors.py:2486
5737
#: bzrlib/errors.py:2467
5853
5739
"A merge directive must provide either a bundle or a public branch location."
5856
#: bzrlib/errors.py:2493
5742
#: bzrlib/errors.py:2474
5857
5743
msgid "Bad merge directive payload %(start)r"
5860
#: bzrlib/errors.py:2503
5746
#: bzrlib/errors.py:2484
5861
5747
msgid "Preview patch does not match requested changes."
5864
#: bzrlib/errors.py:2509
5750
#: bzrlib/errors.py:2490
5865
5751
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5868
#: bzrlib/errors.py:2519
5754
#: bzrlib/errors.py:2500
5870
5756
"Your branch does not have all of the revisions required in order to merge "
5871
5757
"this merge directive and the target location specified in the merge "
5872
5758
"directive is not a branch: %(location)s."
5875
#: bzrlib/errors.py:2531
5761
#: bzrlib/errors.py:2512
5876
5762
msgid "Unsupported entry kind %(kind)s"
5879
#: bzrlib/errors.py:2539
5765
#: bzrlib/errors.py:2520
5880
5766
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5769
#: bzrlib/errors.py:2530
5770
msgid "Subsume target %(other_tree)s needs to be upgraded."
5883
5773
#: bzrlib/errors.py:2549
5884
msgid "Subsume target %(other_tree)s needs to be upgraded."
5887
#: bzrlib/errors.py:2568
5888
5774
msgid "No such tag: %(tag_name)s"
5891
#: bzrlib/errors.py:2576
5777
#: bzrlib/errors.py:2557
5892
5778
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5895
#: bzrlib/errors.py:2585
5781
#: bzrlib/errors.py:2566
5896
5782
msgid "Tag %(tag_name)s already exists."
5899
#: bzrlib/errors.py:2593
5785
#: bzrlib/errors.py:2574
5901
5787
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5902
5788
"bugs\" for more information on this feature."
5905
#: bzrlib/errors.py:2603
5791
#: bzrlib/errors.py:2584
5907
5793
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5910
#: bzrlib/errors.py:2613
5796
#: bzrlib/errors.py:2594
5912
5798
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5915
#: bzrlib/errors.py:2623
5801
#: bzrlib/errors.py:2604
5916
5802
msgid "Invalid line in bugs property: '%(line)s'"
5919
#: bzrlib/errors.py:2631
5805
#: bzrlib/errors.py:2612
5920
5806
msgid "Invalid bug status: '%(status)s'"
5923
#: bzrlib/errors.py:2639
5809
#: bzrlib/errors.py:2620
5924
5810
msgid "Could not understand response from smart server: %(response_tuple)r"
5813
#: bzrlib/errors.py:2659
5814
msgid "Server sent an unexpected error: %(error_tuple)r"
5927
5817
#: bzrlib/errors.py:2678
5928
msgid "Server sent an unexpected error: %(error_tuple)r"
5929
msgstr "Der Server meldete einen unerwarteten Fehler: %(error_tuple)r"
5931
#: bzrlib/errors.py:2697
5932
5818
msgid "Unrecognised container format: %(container_format)r"
5935
#: bzrlib/errors.py:2705
5821
#: bzrlib/errors.py:2686
5936
5822
msgid "Unexpected end of container stream"
5939
#: bzrlib/errors.py:2710
5825
#: bzrlib/errors.py:2691
5940
5826
msgid "Unknown record type: %(record_type)r"
5943
#: bzrlib/errors.py:2718
5829
#: bzrlib/errors.py:2699
5944
5830
msgid "Invalid record: %(reason)s"
5947
#: bzrlib/errors.py:2726
5833
#: bzrlib/errors.py:2707
5948
5834
msgid "Container has data after end marker: %(excess)r"
5951
#: bzrlib/errors.py:2734
5837
#: bzrlib/errors.py:2715
5952
5838
msgid "Container has multiple records with the same name: %(name)s"
5955
#: bzrlib/errors.py:2747
5841
#: bzrlib/errors.py:2728
5956
5842
msgid "Corrupt or incompatible data stream: %(reason)s"
5957
msgstr "Fehlerhafter oder inkompatibler Datenstrom: %(reason)s"
5959
#: bzrlib/errors.py:2755
5845
#: bzrlib/errors.py:2736
5960
5846
msgid "SMTP error: %(error)s"
5961
msgstr "SMTP-Fehler: %(error)s"
5963
#: bzrlib/errors.py:2763
5849
#: bzrlib/errors.py:2744
5964
5850
msgid "No message supplied."
5967
#: bzrlib/errors.py:2768
5853
#: bzrlib/errors.py:2749
5968
5854
msgid "No mail-to address (--mail-to) or output (-o) specified."
5971
#: bzrlib/errors.py:2773
5857
#: bzrlib/errors.py:2754
5972
5858
msgid "Unknown mail client: %(mail_client)s"
5975
#: bzrlib/errors.py:2781
5861
#: bzrlib/errors.py:2762
5977
5863
"Unable to find mail client with the following names: "
5978
5864
"%(mail_command_list_string)s"
5981
#: bzrlib/errors.py:2791
5867
#: bzrlib/errors.py:2772
5982
5868
msgid "SMTP connection to %(host)s refused"
5983
msgstr "SMTP-Verbindung zu %(host)s wurde abgelehnt"
5985
#: bzrlib/errors.py:2800
5871
#: bzrlib/errors.py:2781
5986
5872
msgid "Please specify smtp_server. No server at default %(host)s."
5989
#: bzrlib/errors.py:2814
5875
#: bzrlib/errors.py:2795
5991
5877
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5995
#: bzrlib/errors.py:2826
5881
#: bzrlib/errors.py:2807
5996
5882
msgid "'%(display_url)s' is already a branch."
5997
msgstr "»%(display_url)s« ist bereits ein Zweig."
5999
#: bzrlib/errors.py:2831
5885
#: bzrlib/errors.py:2812
6000
5886
msgid "'%(display_url)s' is already a tree."
6003
#: bzrlib/errors.py:2836
5889
#: bzrlib/errors.py:2817
6004
5890
msgid "'%(display_url)s' is already a checkout."
6007
#: bzrlib/errors.py:2841
5893
#: bzrlib/errors.py:2822
6008
5894
msgid "'%(display_url)s' is already a lightweight checkout."
6011
#: bzrlib/errors.py:2846
5897
#: bzrlib/errors.py:2827
6012
5898
msgid "'%(display_url)s' is already using a shared repository."
6015
#: bzrlib/errors.py:2851
5901
#: bzrlib/errors.py:2832
6016
5902
msgid "'%(display_url)s' is already standalone."
6019
#: bzrlib/errors.py:2856
5905
#: bzrlib/errors.py:2837
6020
5906
msgid "Shared repository '%(display_url)s' already creates working trees."
6023
#: bzrlib/errors.py:2862
5909
#: bzrlib/errors.py:2843
6025
5911
"Shared repository '%(display_url)s' already doesn't create working trees."
6028
#: bzrlib/errors.py:2868
5914
#: bzrlib/errors.py:2849
6029
5915
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6032
#: bzrlib/errors.py:2873
5918
#: bzrlib/errors.py:2854
6033
5919
msgid "No location could be found to bind to at %(display_url)s."
6036
#: bzrlib/errors.py:2878
5922
#: bzrlib/errors.py:2859
6038
5924
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6039
5925
"status).%(more)s"
6042
#: bzrlib/errors.py:2897
5928
#: bzrlib/errors.py:2878
6044
5930
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6045
5931
"list).%(more)s"
6048
#: bzrlib/errors.py:2903
5934
#: bzrlib/errors.py:2884
6049
5935
msgid "Variable {%(name)s} is not available."
6050
msgstr "Variable {%(name)s} steht nicht zur Verfügung."
6052
#: bzrlib/errors.py:2911
5938
#: bzrlib/errors.py:2892
6053
5939
msgid "No template specified."
6056
#: bzrlib/errors.py:2916
5942
#: bzrlib/errors.py:2897
6057
5943
msgid "Unable to create symlink %(path_str)son this platform"
6060
#: bzrlib/errors.py:2931
5946
#: bzrlib/errors.py:2912
6062
5948
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6063
5949
"\"original\", \"local\"."
6065
"Ungültiges Zeitzonenformat »%(timezone)s«, die Optionen sind »utc«, "
6066
"»original« und »local«."
6068
#: bzrlib/errors.py:2965
5952
#: bzrlib/errors.py:2946
6070
5954
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6073
#: bzrlib/errors.py:2977
5957
#: bzrlib/errors.py:2958
6074
5958
msgid "The \"%(config_id)s\" configuration does not exist."
6075
msgstr "Die Konfiguration »%(config_id)s« existiert nicht."
6077
#: bzrlib/errors.py:2985
5961
#: bzrlib/errors.py:2966
6078
5962
msgid "The \"%(option_name)s\" configuration option does not exist."
6079
msgstr "Die Konfigurationsoption »%(option_name)s« existiert nicht."
6081
#: bzrlib/errors.py:2993
5965
#: bzrlib/errors.py:2974
6082
5966
msgid "The alias \"%(alias_name)s\" does not exist."
6083
msgstr "Der Alias »%(alias_name)s« existiert nicht."
6085
#: bzrlib/errors.py:3007
5969
#: bzrlib/errors.py:2988
6086
5970
msgid "\"%(alias_name)s\" is not a valid location alias."
6089
#: bzrlib/errors.py:3015
5973
#: bzrlib/errors.py:2996
6090
5974
msgid "No %(alias_name)s location assigned."
6093
#: bzrlib/errors.py:3023
5977
#: bzrlib/errors.py:3004
6094
5978
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6097
#: bzrlib/errors.py:3033
5981
#: bzrlib/errors.py:3014
6098
5982
msgid "Unknown rules detected: %(unknowns_str)s."
6099
msgstr "Unbekannte Regeln festgestellt: %(unknowns_str)s."
6101
#: bzrlib/errors.py:3044
5985
#: bzrlib/errors.py:3025
6102
5986
msgid "Tip change rejected: %(msg)s"
6105
#: bzrlib/errors.py:3052
5989
#: bzrlib/errors.py:3033
6106
5990
msgid "Shelf corrupt."
6109
#: bzrlib/errors.py:3057
5993
#: bzrlib/errors.py:3038
6110
5994
msgid "Corruption while decompressing repository file%(orig_error)s"
6113
#: bzrlib/errors.py:3069
5997
#: bzrlib/errors.py:3050
6114
5998
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6117
#: bzrlib/errors.py:3077
6001
#: bzrlib/errors.py:3058
6118
6002
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6121
#: bzrlib/errors.py:3085
6005
#: bzrlib/errors.py:3066
6123
6007
"An attempt to access a url outside the server jail was made: '%(url)s'."
6126
#: bzrlib/errors.py:3093
6010
#: bzrlib/errors.py:3074
6127
6011
msgid "The user aborted the operation."
6128
msgstr "Der Vorgang wurde vom Benutzer abgebrochen."
6130
#: bzrlib/errors.py:3098
6014
#: bzrlib/errors.py:3079
6131
6015
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6134
#: bzrlib/errors.py:3108
6018
#: bzrlib/errors.py:3089
6135
6019
msgid "No such view: %(view_name)s."
6138
#: bzrlib/errors.py:3118
6022
#: bzrlib/errors.py:3099
6140
6024
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6141
6025
"to a later format."
6144
#: bzrlib/errors.py:3127
6028
#: bzrlib/errors.py:3108
6146
6030
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6149
#: bzrlib/errors.py:3194
6033
#: bzrlib/errors.py:3175
6150
6034
msgid "%(bzrdir)r does not support co-located branches."
6153
#: bzrlib/errors.py:3200
6037
#: bzrlib/errors.py:3181
6155
6039
"Unable to determine your name.\n"
6156
6040
"Please, set your name with the 'whoami' command.\n"
6157
6041
"E.g. bzr whoami \"Your Name <name@example.com>\""
6160
#: bzrlib/errors.py:3209
6044
#: bzrlib/errors.py:3190
6161
6045
msgid "Invalid pattern(s) found. %(msg)s"
6162
msgstr "Ungültige(s) Muster gefunden. %(msg)s"
6164
#: bzrlib/errors.py:3217
6048
#: bzrlib/errors.py:3198
6166
6050
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6167
6051
"unbind` to fix."
6170
#: bzrlib/errors.py:3228
6054
#: bzrlib/errors.py:3209
6171
6055
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6174
#: bzrlib/errors.py:3237
6058
#: bzrlib/errors.py:3218
6175
6059
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6178
#: bzrlib/errors.py:3246
6062
#: bzrlib/errors.py:3227
6180
6064
"No compatible object available for operations from %(source)r to %(target)r."
6183
#: bzrlib/errors.py:3256
6067
#: bzrlib/errors.py:3237
6185
6069
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6186
6070
"%(arguments)s."
6189
#: bzrlib/errors.py:3266
6073
#: bzrlib/errors.py:3247
6191
6075
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6192
6076
"format %(format)r"
6195
#: bzrlib/errors.py:3278
6079
#: bzrlib/errors.py:3259
6197
6081
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6200
"Die fehlende Funktion %(feature)s wird weder von dieser Bazaar-Version noch "
6201
"von irgendeiner Erweiterung unterstützt."
6203
#: bzrlib/errors.py:3291
6085
#: bzrlib/errors.py:3272
6204
6086
msgid "Binary files section encountered."
6205
msgstr "Auf einen Abschnitt für Binärdateien gestoßen."
6207
#: bzrlib/errors.py:3299
6089
#: bzrlib/errors.py:3280
6209
6091
"Malformed patch header. %(desc)s\n"
6213
#: bzrlib/errors.py:3308
6095
#: bzrlib/errors.py:3289
6215
6097
"Malformed hunk header. %(desc)s\n"
6219
#: bzrlib/errors.py:3317
6101
#: bzrlib/errors.py:3298
6221
6103
"Malformed line. %(desc)s\n"
6224
"Ungültige Zeile. %(desc)s\n"
6227
#: bzrlib/errors.py:3327
6107
#: bzrlib/errors.py:3308
6229
6109
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6230
6110
"but patch says it should be \"%(patch_line)s\""
6233
#: bzrlib/errors.py:3338
6113
#: bzrlib/errors.py:3319
6234
6114
msgid "The feature %(feature)s has already been registered."