Changeset de42a7a21031…
Parent fa59983b8bf0…
by
Changes to 7 files · Browse files at de42a7a21031 Showing diff from parent fa59983b8bf0 Diff from another changeset...
|
|
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-10-27 13:01+0000\n"
-"PO-Revision-Date: 2009-10-27 20:04+0000\n"
-"Last-Translator: MixCool <lars.thoms@mixcool.de>\n"
+"POT-Creation-Date: 2009-11-16 15:27+0000\n"
+"PO-Revision-Date: 2009-11-16 17:17+0000\n"
+"Last-Translator: Helge <bla200@gmx.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-10-28 01:56+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 05:22+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: thgtaskbar.py:38
@@ -23,11 +23,11 @@
#: thgtaskbar.py:115
msgid "Options..."
-msgstr ""
+msgstr "Optionen ..."
#: thgtaskbar.py:117
msgid "Exit"
-msgstr ""
+msgstr "Beenden"
#: tortoisehg\hgtk\about.py:62
msgid "Several icons are courtesy of the TortoiseSVN project"
@@ -53,11 +53,11 @@
#: tortoisehg\hgtk\archive.py:37
msgid "Archive"
-msgstr ""
+msgstr "Archiv"
#: tortoisehg\hgtk\archive.py:46
msgid "Archive - %s"
-msgstr ""
+msgstr "Archiv - %s"
#: tortoisehg\hgtk\archive.py:71
msgid "Archive revision:"
@@ -70,11 +70,11 @@
#: tortoisehg\hgtk\archive.py:80 tortoisehg\hgtk\clone.py:103
msgid "Destination path:"
-msgstr ""
+msgstr "Ziel Pfad"
#: tortoisehg\hgtk\archive.py:83
msgid "Directory of files"
-msgstr ""
+msgstr "Daten Pfad"
#: tortoisehg\hgtk\archive.py:85
msgid "Archive types:"
@@ -82,7 +82,7 @@
#: tortoisehg\hgtk\archive.py:91
msgid "Uncompressed tar archive"
-msgstr ""
+msgstr "Unkomprimiertes tar Archiv"
#: tortoisehg\hgtk\archive.py:92
msgid "Tar archive compressed using bzip2"
@@ -94,7 +94,7 @@
#: tortoisehg\hgtk\archive.py:94
msgid "Uncompressed zip archive"
-msgstr ""
+msgstr "Unkomprimiertes zip Archiv"
#: tortoisehg\hgtk\archive.py:95
msgid "Zip archive compressed using deflate"
@@ -102,47 +102,47 @@
#: tortoisehg\hgtk\archive.py:113 tortoisehg\hgtk\backout.py:114
#: tortoisehg\hgtk\clone.py:165 tortoisehg\hgtk\merge.py:142
-#: tortoisehg\hgtk\quickop.py:182 tortoisehg\hgtk\thgstrip.py:168
-#: tortoisehg\hgtk\update.py:123
+#: tortoisehg\hgtk\quickop.py:182 tortoisehg\hgtk\thgstrip.py:182
+#: tortoisehg\hgtk\update.py:122
msgid "Abort"
-msgstr ""
+msgstr "Abbrechen"
#: tortoisehg\hgtk\archive.py:127 tortoisehg\hgtk\backout.py:141
#: tortoisehg\hgtk\clone.py:188 tortoisehg\hgtk\merge.py:162
-#: tortoisehg\hgtk\quickop.py:197 tortoisehg\hgtk\thgstrip.py:293
-#: tortoisehg\hgtk\update.py:138
+#: tortoisehg\hgtk\quickop.py:197 tortoisehg\hgtk\thgstrip.py:307
+#: tortoisehg\hgtk\update.py:137
msgid "Confirm Abort"
-msgstr ""
+msgstr "Abbrechen bestätigen"
#: tortoisehg\hgtk\archive.py:128 tortoisehg\hgtk\backout.py:142
#: tortoisehg\hgtk\clone.py:189 tortoisehg\hgtk\merge.py:163
-#: tortoisehg\hgtk\quickop.py:198 tortoisehg\hgtk\thgstrip.py:294
-#: tortoisehg\hgtk\update.py:139
+#: tortoisehg\hgtk\quickop.py:198 tortoisehg\hgtk\thgstrip.py:308
+#: tortoisehg\hgtk\update.py:138
msgid "Do you want to abort?"
-msgstr ""
+msgstr "Möchten Sie abbrechen?"
#: tortoisehg\hgtk\archive.py:138 tortoisehg\hgtk\backout.py:153
#: tortoisehg\hgtk\clone.py:199 tortoisehg\hgtk\merge.py:183
-#: tortoisehg\hgtk\quickop.py:207 tortoisehg\hgtk\thgstrip.py:304
-#: tortoisehg\hgtk\update.py:149
+#: tortoisehg\hgtk\quickop.py:207 tortoisehg\hgtk\thgstrip.py:318
+#: tortoisehg\hgtk\update.py:148
msgid "unexpected response id: %s"
msgstr ""
#: tortoisehg\hgtk\archive.py:194
msgid "Tar archives"
-msgstr ""
+msgstr "Tar Archive"
#: tortoisehg\hgtk\archive.py:197
msgid "Bzip2 tar archives"
-msgstr ""
+msgstr "Bzip2 tar Archive"
#: tortoisehg\hgtk\archive.py:200
msgid "Gzip tar archives"
-msgstr ""
+msgstr "Gzip tar Archive"
#: tortoisehg\hgtk\archive.py:206
msgid "Compressed zip archives"
-msgstr ""
+msgstr "Komprimierte zip Archive"
#: tortoisehg\hgtk\archive.py:218 tortoisehg\hgtk\clone.py:104
#: tortoisehg\hgtk\hginit.py:77
@@ -151,21 +151,21 @@
#: tortoisehg\hgtk\archive.py:224
msgid "Select Destination File"
-msgstr ""
+msgstr "Zieldatei auswählen"
#: tortoisehg\hgtk\archive.py:226
msgid "All Files (*.*)"
-msgstr ""
+msgstr "Alle Dateien (*.*)"
#: tortoisehg\hgtk\archive.py:238 tortoisehg\hgtk\backout.py:181
#: tortoisehg\hgtk\clone.py:223 tortoisehg\hgtk\merge.py:198
-#: tortoisehg\hgtk\quickop.py:219 tortoisehg\hgtk\thgstrip.py:336
-#: tortoisehg\hgtk\update.py:161
+#: tortoisehg\hgtk\quickop.py:219 tortoisehg\hgtk\thgstrip.py:350
+#: tortoisehg\hgtk\update.py:160
msgid "unknown mode name: %s"
-msgstr ""
+msgstr "unbekannter Modus Name: %s"
#: tortoisehg\hgtk\archive.py:254 tortoisehg\hgtk\archive.py:260
-#: tortoisehg\hgtk\gtklib.py:243 tortoisehg\hgtk\thgconfig.py:481
+#: tortoisehg\hgtk\gtklib.py:245 tortoisehg\hgtk\thgconfig.py:481
#: tortoisehg\hgtk\thgconfig.py:831
msgid "Confirm Overwrite"
msgstr "Überschreiben bestätigen"
@@ -176,6 +176,9 @@"\n"
"Do you want to overwrite it?"
msgstr ""
+"Das Ziel \"%s\" existier bereits!\n"
+"\n"
+"Wollen sie es überschreiben?"
#: tortoisehg\hgtk\archive.py:261
msgid ""
@@ -186,15 +189,15 @@
#: tortoisehg\hgtk\archive.py:280
msgid "Archived successfully"
-msgstr ""
+msgstr "Erfolgreich Archiviert"
#: tortoisehg\hgtk\archive.py:282
msgid "Canceled archiving"
-msgstr ""
+msgstr "Archivierung abgebrochen"
#: tortoisehg\hgtk\archive.py:284
msgid "Failed to archive"
-msgstr ""
+msgstr "Archivierung fehlgeschlagen"
#: tortoisehg\hgtk\backout.py:29
msgid "Backout changeset - %s"
@@ -232,7 +235,7 @@msgid "Merge with old dirstate parent after backout"
msgstr ""
-#: tortoisehg\hgtk\backout.py:163 tortoisehg\hgtk\commit.py:437
+#: tortoisehg\hgtk\backout.py:163 tortoisehg\hgtk\commit.py:438
msgid "Confirm Discard Message"
msgstr "meldung verwerfen bestätigen"
@@ -279,95 +282,95 @@msgid "%s changeset "
msgstr ""
-#: tortoisehg\hgtk\changeset.py:142 tortoisehg\hgtk\changeset.py:168
+#: tortoisehg\hgtk\changeset.py:142 tortoisehg\hgtk\changeset.py:170
msgid "[All Files]"
msgstr "[Alle Dateien]"
-#: tortoisehg\hgtk\changeset.py:203
+#: tortoisehg\hgtk\changeset.py:205
msgid "unknown hunk type: %s"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:271
+#: tortoisehg\hgtk\changeset.py:281
msgid " %s is larger than the specified max diff size"
msgstr " %s ist grösser als die maximal konfigurierte Vergleich-Grösse"
-#: tortoisehg\hgtk\changeset.py:280
+#: tortoisehg\hgtk\changeset.py:290
msgid "Repository Error: %s, refresh suggested"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:327
+#: tortoisehg\hgtk\changeset.py:337
msgid "[no hunks to display]"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:388 tortoisehg\hgtk\status.py:1505
+#: tortoisehg\hgtk\changeset.py:398 tortoisehg\hgtk\status.py:1505
msgid "_Visual Diff"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:389
+#: tortoisehg\hgtk\changeset.py:399
msgid "Diff to _local"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:391
+#: tortoisehg\hgtk\changeset.py:401
msgid "_View at Revision"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:392
+#: tortoisehg\hgtk\changeset.py:402
msgid "_Save at Revision..."
msgstr ""
-#: tortoisehg\hgtk\changeset.py:396
+#: tortoisehg\hgtk\changeset.py:406
msgid "_File History"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:397
+#: tortoisehg\hgtk\changeset.py:407
msgid "_Annotate File"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:400
+#: tortoisehg\hgtk\changeset.py:410
msgid "_Revert File Contents"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:485
+#: tortoisehg\hgtk\changeset.py:498
msgid "Changeset:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:487 tortoisehg\hgtk\update.py:103
+#: tortoisehg\hgtk\changeset.py:500 tortoisehg\hgtk\update.py:102
msgid "Parent:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:489
+#: tortoisehg\hgtk\changeset.py:502
msgid "Child:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:491
+#: tortoisehg\hgtk\changeset.py:504
msgid "Patch:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:618
+#: tortoisehg\hgtk\changeset.py:638
msgid "Stat"
msgstr "Stat"
-#: tortoisehg\hgtk\changeset.py:620 tortoisehg\hgtk\hgignore.py:128
+#: tortoisehg\hgtk\changeset.py:640 tortoisehg\hgtk\hgignore.py:128
msgid "Files"
msgstr "Dateien"
-#: tortoisehg\hgtk\changeset.py:635
+#: tortoisehg\hgtk\changeset.py:655
msgid "Diff to second Parent"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:758
+#: tortoisehg\hgtk\changeset.py:778
msgid "Save file to"
msgstr "Datein speichern unter"
-#: tortoisehg\hgtk\changeset.py:832
+#: tortoisehg\hgtk\changeset.py:852
msgid "Confirm revert file to old revision"
msgstr "Zurücksetzen bestätigen"
-#: tortoisehg\hgtk\changeset.py:833
+#: tortoisehg\hgtk\changeset.py:853
msgid "Revert %s to contents at revision %d?"
msgstr "Inhalt von %s zurücksetzen auf Revision %d?"
-#: tortoisehg\hgtk\changeset.py:845 tortoisehg\hgtk\synch.py:672
+#: tortoisehg\hgtk\changeset.py:865 tortoisehg\hgtk\synch.py:668
msgid "Toggle _Wordwrap"
msgstr "_Zeilenumbruch ein-/ausschalten"
@@ -407,7 +410,7 @@msgid "Use uncompressed transfer"
msgstr ""
-#: tortoisehg\hgtk\clone.py:137 tortoisehg\hgtk\history.py:233
+#: tortoisehg\hgtk\clone.py:137 tortoisehg\hgtk\history.py:231
#: tortoisehg\hgtk\synch.py:184
msgid "Use proxy server"
msgstr ""
@@ -480,7 +483,7 @@msgid " - commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:183 tortoisehg\hgtk\history.py:175
+#: tortoisehg\hgtk\commit.py:183 tortoisehg\hgtk\history.py:169
msgid "_View"
msgstr ""
@@ -488,13 +491,13 @@msgid "Advanced"
msgstr ""
-#: tortoisehg\hgtk\commit.py:186 tortoisehg\hgtk\history.py:691
-#: tortoisehg\hgtk\history.py:1014
+#: tortoisehg\hgtk\commit.py:186 tortoisehg\hgtk\history.py:670
+#: tortoisehg\hgtk\history.py:1001
msgid "Parents"
msgstr ""
#: tortoisehg\hgtk\commit.py:189 tortoisehg\hgtk\hgignore.py:138
-#: tortoisehg\hgtk\history.py:188
+#: tortoisehg\hgtk\history.py:182
msgid "Refresh"
msgstr "Aktualisieren"
@@ -503,7 +506,7 @@msgstr ""
#: tortoisehg\hgtk\commit.py:191 tortoisehg\hgtk\commit.py:237
-#: tortoisehg\hgtk\commit.py:598
+#: tortoisehg\hgtk\commit.py:599
msgid "_Commit"
msgstr "Ü_bernehmen"
@@ -542,7 +545,7 @@msgid "undo recent commit"
msgstr "letzte übernahme rückgängig machen"
-#: tortoisehg\hgtk\commit.py:238 tortoisehg\hgtk\commit.py:482
+#: tortoisehg\hgtk\commit.py:238 tortoisehg\hgtk\commit.py:483
msgid "commit"
msgstr "übernehmen"
@@ -555,153 +558,153 @@msgid "Save commit message at exit?"
msgstr "Versionsmeldung beim Verlassen speichern?"
-#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:967
-#: tortoisehg\hgtk\commit.py:971 tortoisehg\hgtk\history.py:81
-#: tortoisehg\hgtk\history.py:1419 tortoisehg\hgtk\status.py:1270
+#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:968
+#: tortoisehg\hgtk\commit.py:972 tortoisehg\hgtk\history.py:81
+#: tortoisehg\hgtk\history.py:1394 tortoisehg\hgtk\status.py:1270
#: tortoisehg\hgtk\status.py:1289 tortoisehg\hgtk\status.py:1582
#: tortoisehg\hgtk\thgconfig.py:715 tortoisehg\hgtk\thgmq.py:328
-#: tortoisehg\hgtk\update.py:231
+#: tortoisehg\hgtk\update.py:230
msgid "&Cancel"
msgstr ""
-#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:967
-#: tortoisehg\hgtk\commit.py:971 tortoisehg\hgtk\status.py:1582
+#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:968
+#: tortoisehg\hgtk\commit.py:972 tortoisehg\hgtk\status.py:1582
#: tortoisehg\hgtk\thgconfig.py:714 tortoisehg\hgtk\thgmq.py:327
msgid "&Yes"
msgstr ""
-#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:967
-#: tortoisehg\hgtk\commit.py:971 tortoisehg\hgtk\thgstrip.py:362
+#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:968
+#: tortoisehg\hgtk\commit.py:972 tortoisehg\hgtk\thgstrip.py:377
msgid "&No"
msgstr ""
-#: tortoisehg\hgtk\commit.py:294
+#: tortoisehg\hgtk\commit.py:295
msgid "Committer:"
msgstr ""
-#: tortoisehg\hgtk\commit.py:308
+#: tortoisehg\hgtk\commit.py:309
msgid "Auto-includes:"
msgstr ""
-#: tortoisehg\hgtk\commit.py:311
+#: tortoisehg\hgtk\commit.py:312
msgid "Push after commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:345
+#: tortoisehg\hgtk\commit.py:346
msgid "Recent commit messages..."
msgstr ""
-#: tortoisehg\hgtk\commit.py:382
+#: tortoisehg\hgtk\commit.py:383
msgid "Parent: %(rev)s"
msgstr ""
-#: tortoisehg\hgtk\commit.py:391
+#: tortoisehg\hgtk\commit.py:392
msgid "not at head revision"
msgstr ""
-#: tortoisehg\hgtk\commit.py:413 tortoisehg\hgtk\status.py:480
+#: tortoisehg\hgtk\commit.py:414 tortoisehg\hgtk\status.py:480
msgid "Patch Preview"
msgstr ""
-#: tortoisehg\hgtk\commit.py:415 tortoisehg\hgtk\status.py:484
+#: tortoisehg\hgtk\commit.py:416 tortoisehg\hgtk\status.py:484
msgid "Commit Preview"
msgstr ""
-#: tortoisehg\hgtk\commit.py:438
+#: tortoisehg\hgtk\commit.py:439
msgid "Discard current commit message?"
msgstr "Aktuelle Versionsmeldung verwerfen?"
-#: tortoisehg\hgtk\commit.py:481 tortoisehg\hgtk\commit.py:743
-#: tortoisehg\hgtk\commit.py:793 tortoisehg\hgtk\gdialog.py:472
+#: tortoisehg\hgtk\commit.py:482 tortoisehg\hgtk\commit.py:744
+#: tortoisehg\hgtk\commit.py:794 tortoisehg\hgtk\gdialog.py:473
#: tortoisehg\hgtk\merge.py:94 tortoisehg\hgtk\thgconfig.py:600
msgid "Commit"
msgstr "Übernehmen"
-#: tortoisehg\hgtk\commit.py:485
+#: tortoisehg\hgtk\commit.py:486
msgid "QNew"
msgstr "QNew"
-#: tortoisehg\hgtk\commit.py:486
+#: tortoisehg\hgtk\commit.py:487
msgid "create new MQ patch"
msgstr ""
-#: tortoisehg\hgtk\commit.py:488
+#: tortoisehg\hgtk\commit.py:489
msgid "QRefresh"
msgstr "QRefresh"
-#: tortoisehg\hgtk\commit.py:489
+#: tortoisehg\hgtk\commit.py:490
msgid "refresh top MQ patch"
msgstr ""
-#: tortoisehg\hgtk\commit.py:491
+#: tortoisehg\hgtk\commit.py:492
msgid "_Commit (+1 head)"
msgstr ""
-#: tortoisehg\hgtk\commit.py:491
+#: tortoisehg\hgtk\commit.py:492
msgid "_Commit (-1 head)"
msgstr ""
-#: tortoisehg\hgtk\commit.py:496
+#: tortoisehg\hgtk\commit.py:497
msgid "parent is not a head, commit to add a new head"
msgstr ""
-#: tortoisehg\hgtk\commit.py:501
+#: tortoisehg\hgtk\commit.py:502
msgid "commit to merge one head"
msgstr ""
-#: tortoisehg\hgtk\commit.py:504
+#: tortoisehg\hgtk\commit.py:505
msgid "no parent is a head, commit to add a new head"
msgstr ""
-#: tortoisehg\hgtk\commit.py:608
+#: tortoisehg\hgtk\commit.py:609
msgid "new branch: "
msgstr "neuer Zweig: "
-#: tortoisehg\hgtk\commit.py:610
+#: tortoisehg\hgtk\commit.py:611
msgid "close branch: "
msgstr "Zweig schliessen: "
-#: tortoisehg\hgtk\commit.py:612
+#: tortoisehg\hgtk\commit.py:613
msgid "branch: "
msgstr "Zweig: "
-#: tortoisehg\hgtk\commit.py:631
+#: tortoisehg\hgtk\commit.py:632
msgid "Merge "
msgstr ""
-#: tortoisehg\hgtk\commit.py:667
+#: tortoisehg\hgtk\commit.py:668
msgid "Patch Contents"
msgstr ""
-#: tortoisehg\hgtk\commit.py:725 tortoisehg\hgtk\commit.py:878
+#: tortoisehg\hgtk\commit.py:726 tortoisehg\hgtk\commit.py:879
msgid "Nothing Commited"
msgstr "Nichts übernommen"
-#: tortoisehg\hgtk\commit.py:726
+#: tortoisehg\hgtk\commit.py:727
msgid "No committable files selected"
msgstr "Keine gewählte Datei kann übernommen werden"
-#: tortoisehg\hgtk\commit.py:744
+#: tortoisehg\hgtk\commit.py:745
msgid "Unable to create "
msgstr "Nicht erstellbar: "
-#: tortoisehg\hgtk\commit.py:794
+#: tortoisehg\hgtk\commit.py:795
msgid "Unable to apply patch"
msgstr "Konnte Patch nicht anwenden"
-#: tortoisehg\hgtk\commit.py:823
+#: tortoisehg\hgtk\commit.py:824
msgid "Confirm Undo Commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:824
+#: tortoisehg\hgtk\commit.py:825
msgid "Undo last commit"
msgstr "Letzte Übernahme rückgängig machen"
-#: tortoisehg\hgtk\commit.py:830 tortoisehg\hgtk\commit.py:845
+#: tortoisehg\hgtk\commit.py:831 tortoisehg\hgtk\commit.py:846
msgid "Undo Commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:831
+#: tortoisehg\hgtk\commit.py:832
msgid ""
"Unable to undo!\n"
"\n"
@@ -711,36 +714,36 @@"\n"
"Die Revision an der Spitze weicht von der letzten übernahme ab."
-#: tortoisehg\hgtk\commit.py:846
+#: tortoisehg\hgtk\commit.py:847
msgid "Errors during rollback!"
msgstr "Fehler während des Rollbacks!"
-#: tortoisehg\hgtk\commit.py:859
+#: tortoisehg\hgtk\commit.py:860
msgid "Confirm Add/Remove"
msgstr "Bestätige Hinzufügen/Entfernen"
-#: tortoisehg\hgtk\commit.py:860
+#: tortoisehg\hgtk\commit.py:861
msgid "Add/Remove the following files?"
msgstr "Die folgenden Dateien Hinzufügen/Entfernen?"
-#: tortoisehg\hgtk\commit.py:879 tortoisehg\hgtk\tagadd.py:167
+#: tortoisehg\hgtk\commit.py:880 tortoisehg\hgtk\tagadd.py:167
msgid "Please enter commit message"
msgstr "Bitte eine Versionsmeldung eingeben"
-#: tortoisehg\hgtk\commit.py:887
+#: tortoisehg\hgtk\commit.py:888
msgid "Error"
msgstr "Fehler"
-#: tortoisehg\hgtk\commit.py:888
+#: tortoisehg\hgtk\commit.py:889
msgid "Message format configuration error"
msgstr "Falsch konfiguriertes Meldungsformat"
-#: tortoisehg\hgtk\commit.py:897 tortoisehg\hgtk\commit.py:905
-#: tortoisehg\hgtk\commit.py:917
+#: tortoisehg\hgtk\commit.py:898 tortoisehg\hgtk\commit.py:906
+#: tortoisehg\hgtk\commit.py:918
msgid "Confirm Commit"
msgstr "Übernahme bestätigen"
-#: tortoisehg\hgtk\commit.py:898
+#: tortoisehg\hgtk\commit.py:899
msgid ""
"The summary line length of %i is greater than %i.\n"
"\n"
@@ -750,7 +753,7 @@"\n"
"Die Formatvorgabe ignorieren und mit Übernahme fortfahren?"
-#: tortoisehg\hgtk\commit.py:906
+#: tortoisehg\hgtk\commit.py:907
msgid ""
"The summary line is not followed by a blank line.\n"
"\n"
@@ -760,7 +763,7 @@"\n"
"Die Formatvorgabe ignorieren und mit Übernahme fortfahren?"
-#: tortoisehg\hgtk\commit.py:918
+#: tortoisehg\hgtk\commit.py:919
msgid ""
"The following lines are over the %i-character limit: %s.\n"
"\n"
@@ -770,11 +773,11 @@"\n"
"Die Formatvorgabe ignorieren und mit Übernahme fortfahren?"
-#: tortoisehg\hgtk\commit.py:930
+#: tortoisehg\hgtk\commit.py:931
msgid "Commit: Invalid username"
msgstr "Übernahme: Ungültiger Benutzername"
-#: tortoisehg\hgtk\commit.py:931
+#: tortoisehg\hgtk\commit.py:932
msgid ""
"Your username has not been configured.\n"
"\n"
@@ -784,11 +787,11 @@"\n"
"Bitte konfigurieren Sie den Benutzernamen und versuchen Sie es erneut."
-#: tortoisehg\hgtk\commit.py:964
+#: tortoisehg\hgtk\commit.py:965
msgid "Confirm Override Branch"
msgstr "Überschreiben bestätigen"
-#: tortoisehg\hgtk\commit.py:965
+#: tortoisehg\hgtk\commit.py:966
msgid ""
"A branch named \"%s\" already exists,\n"
"override?"
@@ -796,43 +799,43 @@"Ein Zweig mit dem Namen \"%s\" existiert bereits.\n"
"Ü̈berschreiben?"
-#: tortoisehg\hgtk\commit.py:969
+#: tortoisehg\hgtk\commit.py:970
msgid "Confirm New Branch"
msgstr "Neuen Zweig bestätigen"
-#: tortoisehg\hgtk\commit.py:970
+#: tortoisehg\hgtk\commit.py:971
msgid "Create new named branch \"%s\"?"
msgstr "Neuen Zweig \"%s\" erstellen?"
-#: tortoisehg\hgtk\commit.py:1045
+#: tortoisehg\hgtk\commit.py:1046
msgid "Paste _Filenames"
msgstr "_Dateinamen einfügen"
-#: tortoisehg\hgtk\commit.py:1046
+#: tortoisehg\hgtk\commit.py:1047
msgid "App_ly Format"
msgstr "_Format anwenden"
-#: tortoisehg\hgtk\commit.py:1047
+#: tortoisehg\hgtk\commit.py:1048
msgid "C_onfigure Format"
msgstr "Format K_onfigureiren"
-#: tortoisehg\hgtk\commit.py:1073
+#: tortoisehg\hgtk\commit.py:1074
msgid "Info Required"
msgstr ""
-#: tortoisehg\hgtk\commit.py:1074
+#: tortoisehg\hgtk\commit.py:1075
msgid "Message format needs to be configured"
msgstr "Das Meldungsformat muss konfiguriert werden"
-#: tortoisehg\hgtk\commit.py:1086 tortoisehg\hgtk\commit.py:1091
+#: tortoisehg\hgtk\commit.py:1087 tortoisehg\hgtk\commit.py:1092
msgid "Warning"
msgstr "Warnung"
-#: tortoisehg\hgtk\commit.py:1087
+#: tortoisehg\hgtk\commit.py:1088
msgid "The summary line length of %i is greater than %i"
msgstr "Die Länge der Zusammenfassungszeile von %i ist größer als %i"
-#: tortoisehg\hgtk\commit.py:1092
+#: tortoisehg\hgtk\commit.py:1093
msgid "The summary line is not followed by a blank line"
msgstr "Der Zusammenfassungszeile folgt keine Leerzeile"
@@ -844,36 +847,36 @@msgid "must be specified 'type' in style"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:191 tortoisehg\hgtk\csinfo.py:192
+#: tortoisehg\hgtk\csinfo.py:197 tortoisehg\hgtk\csinfo.py:198
#: tortoisehg\hgtk\tagadd.py:65
msgid "Revision:"
msgstr "Revision:"
-#: tortoisehg\hgtk\csinfo.py:192
+#: tortoisehg\hgtk\csinfo.py:198
msgid "Summary:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:193
+#: tortoisehg\hgtk\csinfo.py:199
msgid "Age:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:193
+#: tortoisehg\hgtk\csinfo.py:199
msgid "User:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:193 tortoisehg\hgtk\csinfo.py:194
+#: tortoisehg\hgtk\csinfo.py:199 tortoisehg\hgtk\csinfo.py:200
msgid "Date:"
msgstr "Datum:"
-#: tortoisehg\hgtk\csinfo.py:194 tortoisehg\hgtk\csinfo.py:195
+#: tortoisehg\hgtk\csinfo.py:200 tortoisehg\hgtk\csinfo.py:201
msgid "Branch:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:195 tortoisehg\hgtk\csinfo.py:196
+#: tortoisehg\hgtk\csinfo.py:201 tortoisehg\hgtk\csinfo.py:202
msgid "Tags:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:196
+#: tortoisehg\hgtk\csinfo.py:202
msgid "Transplant:"
msgstr ""
@@ -899,7 +902,7 @@msgid "Open new search tab"
msgstr "neuen Suchreiter öffnen"
-#: tortoisehg\hgtk\datamine.py:73 tortoisehg\hgtk\thgconfig.py:1112
+#: tortoisehg\hgtk\datamine.py:73 tortoisehg\hgtk\thgconfig.py:1117
msgid "Invalid path"
msgstr "Ungültiger Pfad"
@@ -911,9 +914,9 @@msgid "Filename"
msgstr "Dateiname"
-#: tortoisehg\hgtk\datamine.py:131 tortoisehg\hgtk\datamine.py:634
-#: tortoisehg\hgtk\history.py:336 tortoisehg\hgtk\history.py:1057
-#: tortoisehg\hgtk\logview\treeview.py:444 tortoisehg\hgtk\thgconfig.py:194
+#: tortoisehg\hgtk\datamine.py:131 tortoisehg\hgtk\datamine.py:639
+#: tortoisehg\hgtk\history.py:315 tortoisehg\hgtk\history.py:1042
+#: tortoisehg\hgtk\logview\treeview.py:443 tortoisehg\hgtk\thgconfig.py:194
#: tortoisehg\hgtk\thgconfig.py:277
msgid "User"
msgstr "Benutzer"
@@ -950,31 +953,31 @@msgid "Unable to annotate"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:301
+#: tortoisehg\hgtk\datamine.py:306
msgid "Search"
msgstr "Suche"
-#: tortoisehg\hgtk\datamine.py:302 tortoisehg\hgtk\hgignore.py:61
+#: tortoisehg\hgtk\datamine.py:307 tortoisehg\hgtk\hgignore.py:61
msgid "Regexp:"
msgstr "Regulärer Ausdruck:"
-#: tortoisehg\hgtk\datamine.py:304
+#: tortoisehg\hgtk\datamine.py:309
msgid "Includes:"
msgstr "Enthält:"
-#: tortoisehg\hgtk\datamine.py:306
+#: tortoisehg\hgtk\datamine.py:311
msgid "Excludes:"
msgstr "Ohne:"
-#: tortoisehg\hgtk\datamine.py:309
+#: tortoisehg\hgtk\datamine.py:314
msgid "Start this search"
msgstr "Starte diese Suche"
-#: tortoisehg\hgtk\datamine.py:310
+#: tortoisehg\hgtk\datamine.py:315
msgid "Regular expression search pattern"
msgstr "Suchmuster (Regulärer Ausdruck)"
-#: tortoisehg\hgtk\datamine.py:311
+#: tortoisehg\hgtk\datamine.py:316
msgid ""
"Comma separated list of inclusion patterns. By default, the entire "
"repository is searched."
@@ -982,7 +985,7 @@"Kommagetrente Liste mit einschliessenden Mustern. Ohne Eingabe wird das "
"ganze Projektarchiv durchsucht."
-#: tortoisehg\hgtk\datamine.py:314
+#: tortoisehg\hgtk\datamine.py:319
msgid ""
"Comma separated list of exclusion patterns. Exclusion patterns are applied "
"after inclusion patterns."
@@ -990,80 +993,81 @@"Kommagetrennte Liste mit ausschliessenden Mustern. Diese Muster werden nach "
"den Einschliessenden angewendet."
-#: tortoisehg\hgtk\datamine.py:320
+#: tortoisehg\hgtk\datamine.py:325
msgid "Follow copies and renames"
msgstr "Kopien und Umbenennungen folgen"
-#: tortoisehg\hgtk\datamine.py:321
+#: tortoisehg\hgtk\datamine.py:326
msgid "Ignore case"
msgstr "Groß/Kleinschreibung ignorieren"
-#: tortoisehg\hgtk\datamine.py:322
+#: tortoisehg\hgtk\datamine.py:327
msgid "Show line numbers"
msgstr "Zeilennummern anzeigen"
-#: tortoisehg\hgtk\datamine.py:323
+#: tortoisehg\hgtk\datamine.py:328
msgid "Show all matching revisions"
msgstr "Alle passenden Revisionen anzeigen"
-#: tortoisehg\hgtk\datamine.py:355 tortoisehg\hgtk\datamine.py:632
-#: tortoisehg\hgtk\logview\treeview.py:395
+#: tortoisehg\hgtk\datamine.py:360 tortoisehg\hgtk\datamine.py:637
+#: tortoisehg\hgtk\logview\treeview.py:394
msgid "Rev"
msgstr "Rev"
-#: tortoisehg\hgtk\datamine.py:356 tortoisehg\hgtk\datamine.py:633
+#: tortoisehg\hgtk\datamine.py:361 tortoisehg\hgtk\datamine.py:638
msgid "File"
msgstr "Datei"
-#: tortoisehg\hgtk\datamine.py:357
+#: tortoisehg\hgtk\datamine.py:362
msgid "Matches"
msgstr "Treffer"
-#: tortoisehg\hgtk\datamine.py:379
+#: tortoisehg\hgtk\datamine.py:384
msgid "Search %d"
msgstr "Suche %d"
-#: tortoisehg\hgtk\datamine.py:422
+#: tortoisehg\hgtk\datamine.py:427
msgid "No regular expression given"
msgstr "Kein regulärer Ausdruck"
-#: tortoisehg\hgtk\datamine.py:423
+#: tortoisehg\hgtk\datamine.py:428
msgid "You must provide a search expression"
msgstr "Sie müssen einen Suchausdruck angeben"
-#: tortoisehg\hgtk\datamine.py:429
+#: tortoisehg\hgtk\datamine.py:434
msgid "Invalid regular expression"
msgstr "Ungültiger regulärer Ausdruck"
-#: tortoisehg\hgtk\datamine.py:430 tortoisehg\hgtk\thgshelve.py:210
+#: tortoisehg\hgtk\datamine.py:435 tortoisehg\hgtk\thgshelve.py:210
msgid "Error: %s"
msgstr "Fehler: %s"
-#: tortoisehg\hgtk\datamine.py:452 tortoisehg\hgtk\history.py:1339
+#: tortoisehg\hgtk\datamine.py:457 tortoisehg\hgtk\datamine.py:756
+#: tortoisehg\hgtk\history.py:1320
msgid "Abort: %s"
msgstr "Abgebrochen: %s"
-#: tortoisehg\hgtk\datamine.py:464
+#: tortoisehg\hgtk\datamine.py:469
msgid "Search \"%s\""
msgstr "Suche \"%s\""
-#: tortoisehg\hgtk\datamine.py:579
+#: tortoisehg\hgtk\datamine.py:584
msgid "File is unrevisioned"
msgstr "Datei wird nicht verwaltet"
-#: tortoisehg\hgtk\datamine.py:580
+#: tortoisehg\hgtk\datamine.py:585
msgid "Unable to annotate "
msgstr "Annotieren nicht möglich: "
-#: tortoisehg\hgtk\datamine.py:631
+#: tortoisehg\hgtk\datamine.py:636
msgid "Line"
msgstr "Zeile"
-#: tortoisehg\hgtk\datamine.py:635 tortoisehg\hgtk\guess.py:158
+#: tortoisehg\hgtk\datamine.py:640 tortoisehg\hgtk\guess.py:158
msgid "Source"
msgstr "Quelle"
-#: tortoisehg\hgtk\datamine.py:693
+#: tortoisehg\hgtk\datamine.py:698
msgid "Loading history..."
msgstr ""
@@ -1071,74 +1075,73 @@msgid "TortoiseHg Prompt"
msgstr "TortoiseHG"
-#: tortoisehg\hgtk\gdialog.py:469
+#: tortoisehg\hgtk\gdialog.py:470
msgid "_Tools"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:470 tortoisehg\hgtk\thgconfig.py:603
+#: tortoisehg\hgtk\gdialog.py:471 tortoisehg\hgtk\thgconfig.py:603
msgid "Changelog"
msgstr "Änderungsprotokoll"
-#: tortoisehg\hgtk\gdialog.py:474
+#: tortoisehg\hgtk\gdialog.py:475
msgid "Datamine"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:476
+#: tortoisehg\hgtk\gdialog.py:477
msgid "Recovery"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:478
+#: tortoisehg\hgtk\gdialog.py:479
msgid "Serve"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:480 tortoisehg\hgtk\synch.py:89
+#: tortoisehg\hgtk\gdialog.py:481 tortoisehg\hgtk\synch.py:89
#: tortoisehg\hgtk\thgshelve.py:71 tortoisehg\hgtk\thgshelve.py:139
#: tortoisehg\hgtk\thgshelve.py:145 tortoisehg\hgtk\thgshelve.py:153
msgid "Shelve"
msgstr "Zwischenlagern"
-#: tortoisehg\hgtk\gdialog.py:482 tortoisehg\hgtk\history.py:114
-#: tortoisehg\util\menuthg.py:71
+#: tortoisehg\hgtk\gdialog.py:483 tortoisehg\util\menuthg.py:71
msgid "Synchronize"
msgstr "Synchronisieren"
-#: tortoisehg\hgtk\gdialog.py:484
+#: tortoisehg\hgtk\gdialog.py:485
msgid "Settings"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:487
+#: tortoisehg\hgtk\gdialog.py:488
msgid "_Help"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:488
+#: tortoisehg\hgtk\gdialog.py:489
msgid "Contents"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:490 tortoisehg\hgtk\taskbarui.py:31
+#: tortoisehg\hgtk\gdialog.py:491 tortoisehg\hgtk\taskbarui.py:31
msgid "About"
msgstr "Über"
-#: tortoisehg\hgtk\gdialog.py:587
+#: tortoisehg\hgtk\gdialog.py:592
msgid " Aborted"
msgstr " Abgebrochen"
-#: tortoisehg\hgtk\gdialog.py:598
+#: tortoisehg\hgtk\gdialog.py:603
msgid " Messages and Errors"
msgstr " Meldungen und Fehler"
-#: tortoisehg\hgtk\gdialog.py:641
+#: tortoisehg\hgtk\gdialog.py:646
msgid "making snapshot of %d files from rev %s\n"
msgstr "erstelle Momentaufnahmen von %d Dateien ab Revision %s\n"
-#: tortoisehg\hgtk\gdialog.py:676
+#: tortoisehg\hgtk\gdialog.py:681
msgid "edit failed"
msgstr "Bearbeitung fehlgeschlagen"
-#: tortoisehg\hgtk\gdialog.py:684 tortoisehg\hgtk\thgconfig.py:686
+#: tortoisehg\hgtk\gdialog.py:689 tortoisehg\hgtk\thgconfig.py:686
msgid "No visual editor configured"
msgstr "kein grafischer Editor konfiguriert"
-#: tortoisehg\hgtk\gdialog.py:685 tortoisehg\hgtk\thgconfig.py:687
+#: tortoisehg\hgtk\gdialog.py:690 tortoisehg\hgtk\thgconfig.py:687
msgid "Please configure a visual editor."
msgstr "Bitte konfigurieren Sie einen grafischen Editor"
@@ -1155,6 +1158,10 @@msgstr ""
#: tortoisehg\hgtk\gorev.py:58
+msgid "Ambiguous Revision"
+msgstr ""
+
+#: tortoisehg\hgtk\gorev.py:62
msgid "Invalid Revision"
msgstr ""
@@ -1166,7 +1173,7 @@msgid "All files"
msgstr "Alle Dateien"
-#: tortoisehg\hgtk\gtklib.py:244
+#: tortoisehg\hgtk\gtklib.py:246
msgid ""
"The file \"%s\" already exists!\n"
"\n"
@@ -1176,11 +1183,11 @@"\n"
"Soll sie überschreiben werden?"
-#: tortoisehg\hgtk\gtklib.py:255
+#: tortoisehg\hgtk\gtklib.py:257
msgid "Select Folder"
msgstr "Ordner auswählen"
-#: tortoisehg\hgtk\gtklib.py:642
+#: tortoisehg\hgtk\gtklib.py:644
msgid ""
"Select language for spell checking.\n"
"\n"
@@ -1191,11 +1198,11 @@"examples: en, en_GB, en_US"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:648
+#: tortoisehg\hgtk\gtklib.py:650
msgid "Lang \"%s\" can not be set.\n"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:661 tortoisehg\hgtk\thgconfig.py:591
+#: tortoisehg\hgtk\gtklib.py:663 tortoisehg\hgtk\thgconfig.py:591
msgid "Spell Check Language"
msgstr ""
@@ -1515,7 +1522,7 @@msgid "Create a new repository"
msgstr "Neues Projektarchiv erstellen"
-#: tortoisehg\hgtk\hginit.py:30
+#: tortoisehg\hgtk\hginit.py:29
msgid "Create"
msgstr "Erstellen"
@@ -1610,48 +1617,48 @@msgid "abort: %s!\n"
msgstr "abgebrochen: %s!\n"
-#: tortoisehg\hgtk\hgtk.py:256 tortoisehg\hgtk\hgtk.py:404
+#: tortoisehg\hgtk\hgtk.py:248 tortoisehg\hgtk\hgtk.py:396
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Kein Mercurial Projektverzeichnis hier. (.hg nicht gefunden)"
-#: tortoisehg\hgtk\hgtk.py:266
+#: tortoisehg\hgtk\hgtk.py:258
msgid "invalid arguments"
msgstr "ungültige Argumente"
-#: tortoisehg\hgtk\hgtk.py:344
+#: tortoisehg\hgtk\hgtk.py:336
msgid "Rename error"
msgstr "Fehler beim Umbenennen"
-#: tortoisehg\hgtk\hgtk.py:345
+#: tortoisehg\hgtk\hgtk.py:337
msgid "rename takes one or two path arguments"
msgstr "rename brauht ein oder zwei Argumente"
-#: tortoisehg\hgtk\hgtk.py:455
+#: tortoisehg\hgtk\hgtk.py:447
msgid "global options:"
msgstr "globale Optionen:"
-#: tortoisehg\hgtk\hgtk.py:457
+#: tortoisehg\hgtk\hgtk.py:449
msgid "use \"hgtk help\" for the full list of commands"
msgstr "benutzen Sie \"hgtk help\" für eine vollständige Liste der Befehle"
-#: tortoisehg\hgtk\hgtk.py:461
+#: tortoisehg\hgtk\hgtk.py:453
msgid ""
"use \"hgtk help\" for the full list of commands or \"hgtk -v\" for details"
msgstr ""
"benutzen Sie \"hgtk help\" für eine vollständige Liste der Befehle oder "
"\"hgtk -v\" für Details"
-#: tortoisehg\hgtk\hgtk.py:464
+#: tortoisehg\hgtk\hgtk.py:456
msgid "use \"hgtk -v help%s\" to show aliases and global options"
msgstr ""
"benutzen Sie \"hgtk -v help%s\" um Aliases und globale Optionen anzuzeigen"
-#: tortoisehg\hgtk\hgtk.py:467
+#: tortoisehg\hgtk\hgtk.py:459
msgid "use \"hgtk -v help %s\" to show global options"
msgstr ""
"bentutzen Sie \"hgtk -v help %s\" um die globalen Optionen anzuzeigen"
-#: tortoisehg\hgtk\hgtk.py:479 tortoisehg\hgtk\hgtk.py:581
+#: tortoisehg\hgtk\hgtk.py:471 tortoisehg\hgtk\hgtk.py:573
msgid ""
"list of commands:\n"
"\n"
@@ -1659,7 +1666,7 @@"Befehlsliste:\n"
"\n"
-#: tortoisehg\hgtk\hgtk.py:487
+#: tortoisehg\hgtk\hgtk.py:479
msgid ""
"\n"
"aliases: %s\n"
@@ -1667,24 +1674,24 @@"\n"
"Aliase: %s\n"
-#: tortoisehg\hgtk\hgtk.py:492 tortoisehg\hgtk\hgtk.py:518
-#: tortoisehg\hgtk\hgtk.py:550
+#: tortoisehg\hgtk\hgtk.py:484 tortoisehg\hgtk\hgtk.py:510
+#: tortoisehg\hgtk\hgtk.py:542
msgid "(No help text available)"
msgstr "(kein Hilfetext verfügbar)"
-#: tortoisehg\hgtk\hgtk.py:500
+#: tortoisehg\hgtk\hgtk.py:492
msgid "options:\n"
msgstr "Optionen:\n"
-#: tortoisehg\hgtk\hgtk.py:523
+#: tortoisehg\hgtk\hgtk.py:515
msgid "no commands defined\n"
msgstr "keine Befehle definiert\n"
-#: tortoisehg\hgtk\hgtk.py:574
+#: tortoisehg\hgtk\hgtk.py:566
msgid "Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
msgstr "Hgtk - TortoiseHg's grafischen Werkzeuge für Mercurial (Hg)\n"
-#: tortoisehg\hgtk\hgtk.py:579
+#: tortoisehg\hgtk\hgtk.py:571
msgid ""
"basic commands:\n"
"\n"
@@ -1692,223 +1699,223 @@"Grundlegende Befehle:\n"
"\n"
-#: tortoisehg\hgtk\hgtk.py:595
+#: tortoisehg\hgtk\hgtk.py:587
msgid " (default: %s)"
msgstr " (Standard: %s)"
-#: tortoisehg\hgtk\hgtk.py:608
+#: tortoisehg\hgtk\hgtk.py:600
msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
msgstr "TortoiseHg Dialoge (Version %s). Mercurial (Verision %s)\n"
-#: tortoisehg\hgtk\hgtk.py:642
+#: tortoisehg\hgtk\hgtk.py:634
msgid "repository root directory or symbolic path name"
msgstr "Wurzel des Archivs oder symbolischer Pfadname"
-#: tortoisehg\hgtk\hgtk.py:643
+#: tortoisehg\hgtk\hgtk.py:635
msgid "enable additional output"
msgstr "Ausgabe weiterer Informationen"
-#: tortoisehg\hgtk\hgtk.py:644
+#: tortoisehg\hgtk\hgtk.py:636
msgid "suppress output"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:645
+#: tortoisehg\hgtk\hgtk.py:637
msgid "display help and exit"
msgstr "Gibt Hilfe aus und beendet sich"
-#: tortoisehg\hgtk\hgtk.py:646
+#: tortoisehg\hgtk\hgtk.py:638
msgid "start debugger"
msgstr "Startet den Debugger"
-#: tortoisehg\hgtk\hgtk.py:647
+#: tortoisehg\hgtk\hgtk.py:639
msgid "do not fork GUI process"
msgstr "für Dialoge keinen neuen Prozess starten"
-#: tortoisehg\hgtk\hgtk.py:648
+#: tortoisehg\hgtk\hgtk.py:640
msgid "always fork GUI process"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:649
+#: tortoisehg\hgtk\hgtk.py:641
msgid "read file list from file"
msgstr "Dateiliste aus Datei lesen"
-#: tortoisehg\hgtk\hgtk.py:653
+#: tortoisehg\hgtk\hgtk.py:645
msgid "hgtk about"
msgstr "hgtk about"
-#: tortoisehg\hgtk\hgtk.py:654
+#: tortoisehg\hgtk\hgtk.py:646
msgid "hgtk add [FILE]..."
msgstr "hgtk add [Datei]..."
-#: tortoisehg\hgtk\hgtk.py:655
+#: tortoisehg\hgtk\hgtk.py:647
msgid "hgtk clone SOURCE [DEST]"
msgstr "hgtk clone QUELLE [ZIEL]"
-#: tortoisehg\hgtk\hgtk.py:657
+#: tortoisehg\hgtk\hgtk.py:649
msgid "record user as committer"
msgstr "Protokolliert den angegebenen Nutzer als Versionsersteller"
-#: tortoisehg\hgtk\hgtk.py:658
+#: tortoisehg\hgtk\hgtk.py:650
msgid "record datecode as commit date"
msgstr "Protokolliert Datumscode als Versionsdatum"
-#: tortoisehg\hgtk\hgtk.py:659
+#: tortoisehg\hgtk\hgtk.py:651
msgid "hgtk commit [OPTIONS] [FILE]..."
msgstr "hgtk commit [OPTIONEN] [DATEI]..."
-#: tortoisehg\hgtk\hgtk.py:660
+#: tortoisehg\hgtk\hgtk.py:652
msgid "hgtk datamine"
msgstr "hgtk datamine"
-#: tortoisehg\hgtk\hgtk.py:661
+#: tortoisehg\hgtk\hgtk.py:653
msgid "hgtk hgignore [FILE]"
msgstr "hgtk hgignore [DATEI]"
-#: tortoisehg\hgtk\hgtk.py:662
+#: tortoisehg\hgtk\hgtk.py:654
msgid "hgtk init [DEST]"
msgstr "hgtk init [ZIEL]"
-#: tortoisehg\hgtk\hgtk.py:664
+#: tortoisehg\hgtk\hgtk.py:656
msgid "limit number of changes displayed"
msgstr "Begrenzt die Anzahl der angezeigten Änderungen"
-#: tortoisehg\hgtk\hgtk.py:665
+#: tortoisehg\hgtk\hgtk.py:657
msgid "hgtk log [OPTIONS] [FILE]"
msgstr "hgtk log [OPTIONEN] [DATEI]"
-#: tortoisehg\hgtk\hgtk.py:667
+#: tortoisehg\hgtk\hgtk.py:659
msgid "revision to merge with"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:668
+#: tortoisehg\hgtk\hgtk.py:660
msgid "hgtk merge"
msgstr "hgtk merge"
-#: tortoisehg\hgtk\hgtk.py:669
+#: tortoisehg\hgtk\hgtk.py:661
msgid "hgtk recovery"
msgstr "hgtk recovery"
-#: tortoisehg\hgtk\hgtk.py:670
+#: tortoisehg\hgtk\hgtk.py:662
msgid "hgtk shelve"
msgstr "hgtk shelve"
-#: tortoisehg\hgtk\hgtk.py:671
+#: tortoisehg\hgtk\hgtk.py:663
msgid "hgtk synch"
msgstr "hgtk synch"
-#: tortoisehg\hgtk\hgtk.py:673
+#: tortoisehg\hgtk\hgtk.py:665
msgid "revisions to compare"
msgstr "Revisionen zum Vergleichen"
-#: tortoisehg\hgtk\hgtk.py:674
+#: tortoisehg\hgtk\hgtk.py:666
msgid "hgtk status [FILE]..."
msgstr "hgtk status [DATEI]..."
-#: tortoisehg\hgtk\hgtk.py:676 tortoisehg\hgtk\hgtk.py:679
+#: tortoisehg\hgtk\hgtk.py:668 tortoisehg\hgtk\hgtk.py:671
msgid "field to give initial focus"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:677
+#: tortoisehg\hgtk\hgtk.py:669
msgid "hgtk userconfig"
msgstr "hgtk userconfig"
-#: tortoisehg\hgtk\hgtk.py:680
+#: tortoisehg\hgtk\hgtk.py:672
msgid "hgtk repoconfig"
msgstr "hgtk repoconfig"
-#: tortoisehg\hgtk\hgtk.py:681
+#: tortoisehg\hgtk\hgtk.py:673
msgid "hgtk guess"
msgstr "hgtk guess"
-#: tortoisehg\hgtk\hgtk.py:682
+#: tortoisehg\hgtk\hgtk.py:674
msgid "hgtk remove [FILE]..."
msgstr "hgtk remove [DATEI]..."
-#: tortoisehg\hgtk\hgtk.py:683
+#: tortoisehg\hgtk\hgtk.py:675
msgid "hgtk rename SOURCE [DEST]"
msgstr "hgtk rename QUELLE [ZIEL]"
-#: tortoisehg\hgtk\hgtk.py:684
+#: tortoisehg\hgtk\hgtk.py:676
msgid "hgtk revert [FILE]..."
msgstr "hgtk revert [DATEI]..."
-#: tortoisehg\hgtk\hgtk.py:685
+#: tortoisehg\hgtk\hgtk.py:677
msgid "hgtk forget [FILE]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:688
+#: tortoisehg\hgtk\hgtk.py:680
msgid "name of the webdir config file"
msgstr "Name der webdir-Konfigurationsdatei"
-#: tortoisehg\hgtk\hgtk.py:689
+#: tortoisehg\hgtk\hgtk.py:681
msgid "hgtk serve [OPTION]..."
msgstr "hgtk serve [OPTION]..."
-#: tortoisehg\hgtk\hgtk.py:691
+#: tortoisehg\hgtk\hgtk.py:683
msgid "wait until the second ticks over"
msgstr "wartet bis die Sekunde wechselt"
-#: tortoisehg\hgtk\hgtk.py:692
+#: tortoisehg\hgtk\hgtk.py:684
msgid "notify the shell for paths given"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:693
+#: tortoisehg\hgtk\hgtk.py:685
msgid "remove the status cache"
msgstr "Statuscache entfernen"
-#: tortoisehg\hgtk\hgtk.py:694
+#: tortoisehg\hgtk\hgtk.py:686
msgid "show the contents of the status cache (no update)"
msgstr "Inhalt vom Statuscache anzeigen (nicht aktualisieren)"
-#: tortoisehg\hgtk\hgtk.py:696
+#: tortoisehg\hgtk\hgtk.py:688
msgid "udpate all repos in current dir"
msgstr "Alle Projektverzeichnisse im akutellen Verzeichnis aktualisieren"
-#: tortoisehg\hgtk\hgtk.py:697
+#: tortoisehg\hgtk\hgtk.py:689
msgid "hgtk thgstatus [OPTION]"
msgstr "hgtk thgstatus [OPTION]"
-#: tortoisehg\hgtk\hgtk.py:699 tortoisehg\hgtk\hgtk.py:715
+#: tortoisehg\hgtk\hgtk.py:691 tortoisehg\hgtk\hgtk.py:707
msgid "revision to update"
msgstr "Aktualisieren auf Revision"
-#: tortoisehg\hgtk\hgtk.py:702
+#: tortoisehg\hgtk\hgtk.py:694
msgid "changeset to view in diff tool"
msgstr "Änderungssatz, der mit dem Vergleichswerkzeug angezeigt wird"
-#: tortoisehg\hgtk\hgtk.py:703
+#: tortoisehg\hgtk\hgtk.py:695
msgid "revisions to view in diff tool"
msgstr "Revisionen, die mit dem Vergleichswerkzeug angezeigt werden"
-#: tortoisehg\hgtk\hgtk.py:704
+#: tortoisehg\hgtk\hgtk.py:696
msgid "bundle file to preview"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:705
+#: tortoisehg\hgtk\hgtk.py:697
msgid "directly use raw extdiff command"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:706
+#: tortoisehg\hgtk\hgtk.py:698
msgid "launch visual diff tool"
msgstr "Visuelles Vergleichswerkzeug starten"
-#: tortoisehg\hgtk\hgtk.py:708
+#: tortoisehg\hgtk\hgtk.py:700
msgid "print license"
msgstr "Lizenz anzeigen"
-#: tortoisehg\hgtk\hgtk.py:709
+#: tortoisehg\hgtk\hgtk.py:701
msgid "hgtk version [OPTION]"
msgstr "hgtk version [OPTION]"
-#: tortoisehg\hgtk\hgtk.py:711
+#: tortoisehg\hgtk\hgtk.py:703
msgid "show the command options"
msgstr "Zeigt alle Optionen des Befehls"
-#: tortoisehg\hgtk\hgtk.py:712
+#: tortoisehg\hgtk\hgtk.py:704
msgid "[-o] CMD"
msgstr "[-o] BEF"
-#: tortoisehg\hgtk\hgtk.py:713
+#: tortoisehg\hgtk\hgtk.py:705
msgid "hgtk help [COMMAND]"
msgstr "hgtk help [BEFEHL]"
@@ -1963,543 +1970,539 @@msgid "Reload revision history"
msgstr "Revisionshistorie neu laden"
-#: tortoisehg\hgtk\history.py:116
-msgid "Launch synchronize tool"
-msgstr "Synchronisierungsdialog starten"
-
-#: tortoisehg\hgtk\history.py:121 tortoisehg\hgtk\history.py:170
+#: tortoisehg\hgtk\history.py:115 tortoisehg\hgtk\history.py:164
msgid "Patch Queue"
msgstr ""
-#: tortoisehg\hgtk\history.py:123
+#: tortoisehg\hgtk\history.py:117
msgid "Show/Hide Patch Queue"
msgstr ""
-#: tortoisehg\hgtk\history.py:166
+#: tortoisehg\hgtk\history.py:160
msgid "Sync Bar"
msgstr ""
-#: tortoisehg\hgtk\history.py:176
+#: tortoisehg\hgtk\history.py:170
msgid "Load more Revisions"
msgstr ""
+#: tortoisehg\hgtk\history.py:172
+msgid "Load all Revisions"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:175
+msgid "Toolbar"
+msgstr ""
+
#: tortoisehg\hgtk\history.py:178
-msgid "Load all Revisions"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:181
-msgid "Toolbar"
+msgid "Filter Bar"
msgstr ""
#: tortoisehg\hgtk\history.py:184
-msgid "Filter Bar"
+msgid "Reset Marks"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:187
+msgid "Choose Details..."
msgstr ""
#: tortoisehg\hgtk\history.py:190
-msgid "Reset Marks"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:193
-msgid "Choose Details..."
+msgid "Compact Graph"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:192
+msgid "Color by Branch"
msgstr ""
#: tortoisehg\hgtk\history.py:195
-msgid "Compact Graph"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:197
-msgid "Color by Branch"
+msgid "Ignore Max Diff Size"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:199
+msgid "_Navigate"
msgstr ""
#: tortoisehg\hgtk\history.py:200
-msgid "Ignore Max Diff Size"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:204
-msgid "_Navigate"
+msgid "Tip"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:202
+msgid "Working Parent"
msgstr ""
#: tortoisehg\hgtk\history.py:205
-msgid "Tip"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:206
-msgid "Working Parent"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:208
msgid "Revision..."
msgstr ""
-#: tortoisehg\hgtk\history.py:211
+#: tortoisehg\hgtk\history.py:209
msgid "_Synchronize"
msgstr ""
-#: tortoisehg\hgtk\history.py:212 tortoisehg\hgtk\synch.py:63
+#: tortoisehg\hgtk\history.py:210 tortoisehg\hgtk\synch.py:63
msgid "Incoming"
msgstr "Eingehend"
-#: tortoisehg\hgtk\history.py:214
+#: tortoisehg\hgtk\history.py:212
msgid "Pull"
msgstr ""
-#: tortoisehg\hgtk\history.py:216 tortoisehg\hgtk\synch.py:74
+#: tortoisehg\hgtk\history.py:214 tortoisehg\hgtk\synch.py:74
msgid "Outgoing"
msgstr "Ausgehend"
-#: tortoisehg\hgtk\history.py:218 tortoisehg\hgtk\synch.py:79
+#: tortoisehg\hgtk\history.py:216 tortoisehg\hgtk\synch.py:79
msgid "Push"
msgstr "Hochladen"
-#: tortoisehg\hgtk\history.py:220
+#: tortoisehg\hgtk\history.py:218
msgid "Email..."
msgstr ""
-#: tortoisehg\hgtk\history.py:223
+#: tortoisehg\hgtk\history.py:221
msgid "Add Bundle..."
msgstr ""
-#: tortoisehg\hgtk\history.py:226
+#: tortoisehg\hgtk\history.py:224
msgid "Accept Bundle"
msgstr ""
-#: tortoisehg\hgtk\history.py:229
+#: tortoisehg\hgtk\history.py:227
msgid "Reject Bundle"
msgstr ""
-#: tortoisehg\hgtk\history.py:235
+#: tortoisehg\hgtk\history.py:233
msgid "Force push"
msgstr ""
-#: tortoisehg\hgtk\history.py:325 tortoisehg\hgtk\logview\treeview.py:381
+#: tortoisehg\hgtk\history.py:304 tortoisehg\hgtk\logview\treeview.py:380
msgid "Graph"
msgstr "Graph"
-#: tortoisehg\hgtk\history.py:332
+#: tortoisehg\hgtk\history.py:311
msgid "Revision Number"
msgstr ""
-#: tortoisehg\hgtk\history.py:333
+#: tortoisehg\hgtk\history.py:312
msgid "Changeset ID"
msgstr ""
-#: tortoisehg\hgtk\history.py:334
+#: tortoisehg\hgtk\history.py:313
msgid "Branch Name"
msgstr ""
-#: tortoisehg\hgtk\history.py:335 tortoisehg\hgtk\logview\treeview.py:433
+#: tortoisehg\hgtk\history.py:314 tortoisehg\hgtk\logview\treeview.py:432
#: tortoisehg\hgtk\thgmq.py:187
msgid "Summary"
msgstr "Zusammenfassung"
-#: tortoisehg\hgtk\history.py:337 tortoisehg\hgtk\logview\treeview.py:455
+#: tortoisehg\hgtk\history.py:316 tortoisehg\hgtk\logview\treeview.py:454
msgid "Local Date"
msgstr "lokales Datum"
-#: tortoisehg\hgtk\history.py:338
+#: tortoisehg\hgtk\history.py:317
msgid "UTC Date"
msgstr ""
-#: tortoisehg\hgtk\history.py:339 tortoisehg\hgtk\logview\treeview.py:479
+#: tortoisehg\hgtk\history.py:318 tortoisehg\hgtk\logview\treeview.py:478
msgid "Age"
msgstr ""
-#: tortoisehg\hgtk\history.py:340 tortoisehg\hgtk\logview\treeview.py:491
+#: tortoisehg\hgtk\history.py:319 tortoisehg\hgtk\logview\treeview.py:490
msgid "Tags"
msgstr ""
-#: tortoisehg\hgtk\history.py:389
+#: tortoisehg\hgtk\history.py:368
msgid "Invalid revision range"
msgstr "Ungültiger Revisionsbereich"
-#: tortoisehg\hgtk\history.py:401
+#: tortoisehg\hgtk\history.py:380
msgid "Invalid date specification"
msgstr "ungültige Datumsangabe"
-#: tortoisehg\hgtk\history.py:641
+#: tortoisehg\hgtk\history.py:620
msgid "Filter"
msgstr ""
-#: tortoisehg\hgtk\history.py:646
+#: tortoisehg\hgtk\history.py:625
msgid "%s branch"
msgstr ""
+#: tortoisehg\hgtk\history.py:626
+msgid "Branch '%s'"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:632
+msgid "file history: "
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:636
+msgid "custom filter"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:644
+msgid "merges"
+msgstr ""
+
#: tortoisehg\hgtk\history.py:647
-msgid "Branch '%s'"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:653
-msgid "file history: "
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:657
-msgid "custom filter"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:665
-msgid "merges"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:668
msgid "only Merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:670
+#: tortoisehg\hgtk\history.py:649
msgid "revision ancestry"
msgstr ""
-#: tortoisehg\hgtk\history.py:675
+#: tortoisehg\hgtk\history.py:654
msgid "Ancestry of %s"
msgstr ""
-#: tortoisehg\hgtk\history.py:677
+#: tortoisehg\hgtk\history.py:656
msgid "tagged revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:685
+#: tortoisehg\hgtk\history.py:664
msgid "Tagged Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:687
+#: tortoisehg\hgtk\history.py:666
msgid "working parents"
msgstr ""
-#: tortoisehg\hgtk\history.py:693
+#: tortoisehg\hgtk\history.py:672
msgid "heads"
msgstr ""
-#: tortoisehg\hgtk\history.py:697 tortoisehg\hgtk\history.py:1018
+#: tortoisehg\hgtk\history.py:676 tortoisehg\hgtk\history.py:1005
msgid "Heads"
msgstr ""
-#: tortoisehg\hgtk\history.py:699
+#: tortoisehg\hgtk\history.py:678
msgid "no Merges"
msgstr ""
+#: tortoisehg\hgtk\history.py:696
+msgid "Visualize Change"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:697
+msgid "Di_splay Change"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:698
+msgid "Diff to local"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:700
+msgid "_Copy hash"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:704
+msgid "Pull to here"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:711
+msgid "Push to here"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:713
+msgid "_Update..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:714 tortoisehg\hgtk\history.py:799
+msgid "_Merge with..."
+msgstr ""
+
#: tortoisehg\hgtk\history.py:717
-msgid "Visualize Change"
+msgid "_Export Patch..."
msgstr ""
#: tortoisehg\hgtk\history.py:718
-msgid "Di_splay Change"
+msgid "E_mail Patch..."
msgstr ""
#: tortoisehg\hgtk\history.py:719
-msgid "Diff to local"
+msgid "_Bundle rev:tip..."
msgstr ""
#: tortoisehg\hgtk\history.py:721
-msgid "_Copy hash"
+msgid "Add/Remove _Tag..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:722
+msgid "Backout Revision..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:724 tortoisehg\hgtk\status.py:1510
+msgid "_Revert"
msgstr ""
#: tortoisehg\hgtk\history.py:725
-msgid "Pull to here"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:732
-msgid "Push to here"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:734
-msgid "_Update..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:735 tortoisehg\hgtk\history.py:819
-msgid "_Merge with..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:738
-msgid "_Export Patch..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:739
-msgid "E_mail Patch..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:740
-msgid "_Bundle rev:tip..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:742
-msgid "Add/Remove _Tag..."
+msgid "_Archive..."
msgstr ""
#: tortoisehg\hgtk\history.py:743
-msgid "Backout Revision..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:745 tortoisehg\hgtk\status.py:1510
-msgid "_Revert"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:746
-msgid "_Archive..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:764
msgid "Transp_lant to local"
msgstr ""
-#: tortoisehg\hgtk\history.py:769
+#: tortoisehg\hgtk\history.py:748
msgid "qimport"
msgstr ""
-#: tortoisehg\hgtk\history.py:770
+#: tortoisehg\hgtk\history.py:749
msgid "Strip Revision..."
msgstr ""
-#: tortoisehg\hgtk\history.py:802
+#: tortoisehg\hgtk\history.py:782
msgid "_Diff with selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:803
+#: tortoisehg\hgtk\history.py:783
msgid "Visual Diff with selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:812
+#: tortoisehg\hgtk\history.py:792
msgid "Email from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:814
+#: tortoisehg\hgtk\history.py:794
msgid "Bundle from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:816
+#: tortoisehg\hgtk\history.py:796
msgid "Export Patches from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:835
+#: tortoisehg\hgtk\history.py:815
msgid "Transplant Revision range to local"
msgstr ""
-#: tortoisehg\hgtk\history.py:840
+#: tortoisehg\hgtk\history.py:820
msgid "Rebase on top of selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:845
+#: tortoisehg\hgtk\history.py:825
msgid "qimport from here to selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:876
+#: tortoisehg\hgtk\history.py:829
+msgid "Select common ancestor revision"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:860
msgid "Load more"
msgstr ""
-#: tortoisehg\hgtk\history.py:876
+#: tortoisehg\hgtk\history.py:860
msgid "load more revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:879
+#: tortoisehg\hgtk\history.py:863
msgid "Load all"
msgstr ""
-#: tortoisehg\hgtk\history.py:879
+#: tortoisehg\hgtk\history.py:863
msgid "load all revisions"
msgstr ""
+#: tortoisehg\hgtk\history.py:905
+msgid "Download and view incoming changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:907
+msgid "Accept changes from Bundle preview"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:909
+msgid "Reject changes from Bundle preview"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:911
+msgid "Pull incoming changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:914
+msgid "Determine and mark outgoing changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:916
+msgid "Push outgoing changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:918
+msgid "Email outgoing changesets"
+msgstr ""
+
#: tortoisehg\hgtk\history.py:921
-msgid "Download and view incoming changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:923
-msgid "Accept changes from Bundle preview"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:925
-msgid "Reject changes from Bundle preview"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:927
-msgid "Pull incoming changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:930
-msgid "Determine and mark outgoing changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:932
-msgid "Push outgoing changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:934
-msgid "Email outgoing changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:937
msgid "Stop current transaction"
msgstr ""
-#: tortoisehg\hgtk\history.py:960
+#: tortoisehg\hgtk\history.py:946
msgid "After Pull:"
msgstr ""
-#: tortoisehg\hgtk\history.py:961 tortoisehg\hgtk\synch.py:155
+#: tortoisehg\hgtk\history.py:947 tortoisehg\hgtk\synch.py:155
msgid "Nothing"
msgstr "Nichts"
-#: tortoisehg\hgtk\history.py:961 tortoisehg\hgtk\synch.py:155
-#: tortoisehg\hgtk\update.py:45
+#: tortoisehg\hgtk\history.py:947 tortoisehg\hgtk\synch.py:155
+#: tortoisehg\hgtk\update.py:44
msgid "Update"
msgstr "Aktualisieren"
-#: tortoisehg\hgtk\history.py:964 tortoisehg\hgtk\synch.py:158
+#: tortoisehg\hgtk\history.py:950 tortoisehg\hgtk\synch.py:158
msgid "Fetch"
msgstr "Abrufen"
-#: tortoisehg\hgtk\history.py:966 tortoisehg\hgtk\synch.py:160
+#: tortoisehg\hgtk\history.py:952 tortoisehg\hgtk\synch.py:160
msgid "Rebase"
msgstr "Rebase"
-#: tortoisehg\hgtk\history.py:984
+#: tortoisehg\hgtk\history.py:971
msgid "Configure aliases and after pull behavior"
msgstr ""
-#: tortoisehg\hgtk\history.py:1000
+#: tortoisehg\hgtk\history.py:987
msgid "All"
msgstr ""
-#: tortoisehg\hgtk\history.py:1005
+#: tortoisehg\hgtk\history.py:992
msgid "Tagged"
msgstr ""
+#: tortoisehg\hgtk\history.py:996
+msgid "Ancestry"
+msgstr ""
+
#: tortoisehg\hgtk\history.py:1009
-msgid "Ancestry"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1022
msgid "Merges"
msgstr ""
+#: tortoisehg\hgtk\history.py:1013
+msgid "Hide Merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1020
+msgid "Branch Filter"
+msgstr ""
+
#: tortoisehg\hgtk\history.py:1026
-msgid "Hide Merges"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1033
-msgid "Branch Filter"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1040
msgid "Branches..."
msgstr ""
-#: tortoisehg\hgtk\history.py:1050
+#: tortoisehg\hgtk\history.py:1036
msgid "Custom Filter"
msgstr "Benutzerdefinierter Filter"
-#: tortoisehg\hgtk\history.py:1056
+#: tortoisehg\hgtk\history.py:1041
msgid "File Patterns"
msgstr ""
-#: tortoisehg\hgtk\history.py:1056
+#: tortoisehg\hgtk\history.py:1041
msgid "Rev Range"
msgstr "Revisionsbereich"
-#: tortoisehg\hgtk\history.py:1057
+#: tortoisehg\hgtk\history.py:1042
msgid "Date"
msgstr ""
-#: tortoisehg\hgtk\history.py:1057
+#: tortoisehg\hgtk\history.py:1042
msgid "Keywords"
msgstr ""
-#: tortoisehg\hgtk\history.py:1189 tortoisehg\hgtk\history.py:1303
-#: tortoisehg\hgtk\history.py:1325 tortoisehg\hgtk\history.py:1391
-#: tortoisehg\hgtk\history.py:1776
+#: tortoisehg\hgtk\history.py:1174 tortoisehg\hgtk\history.py:1284
+#: tortoisehg\hgtk\history.py:1306 tortoisehg\hgtk\history.py:1368
+#: tortoisehg\hgtk\history.py:1746
msgid "No remote path specified"
msgstr ""
-#: tortoisehg\hgtk\history.py:1190 tortoisehg\hgtk\history.py:1304
-#: tortoisehg\hgtk\history.py:1326 tortoisehg\hgtk\history.py:1392
-#: tortoisehg\hgtk\history.py:1777
+#: tortoisehg\hgtk\history.py:1175 tortoisehg\hgtk\history.py:1285
+#: tortoisehg\hgtk\history.py:1307 tortoisehg\hgtk\history.py:1369
+#: tortoisehg\hgtk\history.py:1747
msgid "Please enter or select a remote path"
msgstr ""
-#: tortoisehg\hgtk\history.py:1227
+#: tortoisehg\hgtk\history.py:1208
msgid "Accept incoming previewed changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1228
+#: tortoisehg\hgtk\history.py:1209
msgid "Accept"
msgstr ""
-#: tortoisehg\hgtk\history.py:1233
+#: tortoisehg\hgtk\history.py:1214
msgid "Reject incoming previewed changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1234
+#: tortoisehg\hgtk\history.py:1215
msgid "Reject"
msgstr ""
-#: tortoisehg\hgtk\history.py:1275
+#: tortoisehg\hgtk\history.py:1256
msgid "Bundle Preview"
msgstr ""
-#: tortoisehg\hgtk\history.py:1280
+#: tortoisehg\hgtk\history.py:1261
msgid "Open Bundle"
msgstr ""
-#: tortoisehg\hgtk\history.py:1355
+#: tortoisehg\hgtk\history.py:1336
msgid "%d outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1374 tortoisehg\hgtk\synch.py:495
+#: tortoisehg\hgtk\history.py:1355 tortoisehg\hgtk\synch.py:495
msgid "No repository selected"
msgstr "Kein Projektarchiv ausgewählt"
-#: tortoisehg\hgtk\history.py:1375 tortoisehg\hgtk\synch.py:496
+#: tortoisehg\hgtk\history.py:1356 tortoisehg\hgtk\synch.py:496
msgid "Select a peer repository to compare with"
msgstr ""
"Wählen Sie ein anderes Projektverzeichnis, mit den Verglichen werden kann"
-#: tortoisehg\hgtk\history.py:1402
+#: tortoisehg\hgtk\history.py:1377
msgid "Confirm Forced Push to Remote Repository"
msgstr ""
-#: tortoisehg\hgtk\history.py:1403
+#: tortoisehg\hgtk\history.py:1378
msgid ""
"Forced push to remote repository\n"
"%s\n"
"(creating new heads in remote if needed)?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1405 tortoisehg\hgtk\history.py:1415
+#: tortoisehg\hgtk\history.py:1380 tortoisehg\hgtk\history.py:1390
msgid "Forced &Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:1407
+#: tortoisehg\hgtk\history.py:1382
msgid "Confirm Push to remote Repository"
msgstr ""
-#: tortoisehg\hgtk\history.py:1408
+#: tortoisehg\hgtk\history.py:1383
msgid ""
"Push to remote repository\n"
"%s\n"
"?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1409
+#: tortoisehg\hgtk\history.py:1384
msgid "&Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:1412
+#: tortoisehg\hgtk\history.py:1387
msgid "Confirm Forced Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:1413
+#: tortoisehg\hgtk\history.py:1388
msgid ""
"Forced push to repository\n"
"%s\n"
"(creating new heads if needed)?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1423
-msgid "Invalid Remote Repository"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1592
+#: tortoisehg\hgtk\history.py:1562
msgid "Confirm Revert All Files"
msgstr ""
-#: tortoisehg\hgtk\history.py:1593
+#: tortoisehg\hgtk\history.py:1563
msgid ""
"Revert all files to revision %d?\n"
"This will overwrite your local changes"
@@ -2507,43 +2510,43 @@"Alle Dateien auf die Revision %d zurücksetzen?\n"
"Dies wird Ihre lokalen Änderungen überschreiben."
-#: tortoisehg\hgtk\history.py:1644
+#: tortoisehg\hgtk\history.py:1614
msgid "Save patches to"
msgstr ""
-#: tortoisehg\hgtk\history.py:1667 tortoisehg\hgtk\history.py:1836
+#: tortoisehg\hgtk\history.py:1637 tortoisehg\hgtk\history.py:1809
msgid "Write bundle to"
msgstr "Schreibe Bündel in"
-#: tortoisehg\hgtk\history.py:1703
+#: tortoisehg\hgtk\history.py:1673
msgid "Confirm Rebase Revision"
msgstr ""
-#: tortoisehg\hgtk\history.py:1704
+#: tortoisehg\hgtk\history.py:1674
msgid "Rebase revision %d on top of %d?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1815 tortoisehg\hgtk\status.py:1194
+#: tortoisehg\hgtk\history.py:1788 tortoisehg\hgtk\status.py:1194
msgid "Save patch to"
msgstr "Sichere Patch in"
-#: tortoisehg\hgtk\logview\treeview.py:256
+#: tortoisehg\hgtk\logview\treeview.py:255
msgid "%(count)d of %(total)d Revisions"
msgstr ""
-#: tortoisehg\hgtk\logview\treeview.py:363
+#: tortoisehg\hgtk\logview\treeview.py:362
msgid "Repository is empty"
msgstr ""
-#: tortoisehg\hgtk\logview\treeview.py:408
+#: tortoisehg\hgtk\logview\treeview.py:407
msgid "ID"
msgstr "ID"
-#: tortoisehg\hgtk\logview\treeview.py:420
+#: tortoisehg\hgtk\logview\treeview.py:419
msgid "Branch"
msgstr "Zweig"
-#: tortoisehg\hgtk\logview\treeview.py:467
+#: tortoisehg\hgtk\logview\treeview.py:466
msgid "Universal Date"
msgstr "Universelles Datum"
@@ -2594,36 +2597,36 @@"Do you want to exit?"
msgstr ""
-#: tortoisehg\hgtk\merge.py:226
+#: tortoisehg\hgtk\merge.py:227
msgid "Merged successfully"
msgstr ""
-#: tortoisehg\hgtk\merge.py:228
+#: tortoisehg\hgtk\merge.py:229
msgid "Canceled merging"
msgstr ""
-#: tortoisehg\hgtk\merge.py:230
+#: tortoisehg\hgtk\merge.py:231
msgid "Failed to merge"
msgstr ""
-#: tortoisehg\hgtk\merge.py:266
+#: tortoisehg\hgtk\merge.py:262
msgid "Confirm undo merge"
msgstr "Rückgängig bestätigen"
-#: tortoisehg\hgtk\merge.py:267
+#: tortoisehg\hgtk\merge.py:263
msgid "Clean checkout of original revision?"
msgstr ""
"aktualisieren auf originale Revision und lokale Änderungen verwerfen?"
+#: tortoisehg\hgtk\merge.py:273
+msgid "Undo successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:275
+msgid "Canceled undo"
+msgstr ""
+
#: tortoisehg\hgtk\merge.py:277
-msgid "Undo successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:279
-msgid "Canceled undo"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:281
msgid "Failed to undo"
msgstr ""
@@ -2797,15 +2800,15 @@msgid "Please try again after the previous command is completed"
msgstr "Bitte nochmals drücken nachdem der letzte Befehl beendet ist"
-#: tortoisehg\hgtk\recovery.py:220 tortoisehg\hgtk\synch.py:632
+#: tortoisehg\hgtk\recovery.py:220 tortoisehg\hgtk\synch.py:628
msgid "[command interrupted]"
msgstr "[Befehl unterbrochen]"
-#: tortoisehg\hgtk\rename.py:31
+#: tortoisehg\hgtk\rename.py:38
msgid "Rename "
msgstr ""
-#: tortoisehg\hgtk\rename.py:64 tortoisehg\hgtk\rename.py:71
+#: tortoisehg\hgtk\rename.py:76 tortoisehg\hgtk\rename.py:83
msgid "rename error"
msgstr "Fehler beim umbenennen"
@@ -3284,7 +3287,7 @@msgid "&Refresh"
msgstr ""
-#: tortoisehg\hgtk\statusbar.py:44
+#: tortoisehg\hgtk\statusbar.py:45
msgid "Running"
msgstr "Läuft"
@@ -4382,15 +4385,15 @@msgid "History"
msgstr "Historie"
-#: tortoisehg\hgtk\thgconfig.py:1059
+#: tortoisehg\hgtk\thgconfig.py:1061
msgid "# Generated by tortoisehg-config\n"
msgstr "# Erstellt durch tortoisehg-config\n"
-#: tortoisehg\hgtk\thgconfig.py:1113
+#: tortoisehg\hgtk\thgconfig.py:1118
msgid "Skipped saving path with no alias"
msgstr "Pfad ohne Alias nicht gespeichert"
-#: tortoisehg\hgtk\thgconfig.py:1141
+#: tortoisehg\hgtk\thgconfig.py:1146
msgid "Unable to write configuration file"
msgstr "Konnte Konfiguraitonsdatei nicht schreiben"
@@ -4560,176 +4563,176 @@msgid "Strip:"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:79
+#: tortoisehg\hgtk\thgstrip.py:93
msgid "Preview:"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:98
+#: tortoisehg\hgtk\thgstrip.py:112
msgid "Show all"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:101
+#: tortoisehg\hgtk\thgstrip.py:115
msgid "Use compact view"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:117
+#: tortoisehg\hgtk\thgstrip.py:131
msgid "Options:"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:121
+#: tortoisehg\hgtk\thgstrip.py:135
msgid "Discard local changes, no backup (-f/--force)"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:152
+#: tortoisehg\hgtk\thgstrip.py:166
msgid "Backup all (default)"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:153
+#: tortoisehg\hgtk\thgstrip.py:167
msgid "Backup unrelated changesets (-b/--backup)"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:155
+#: tortoisehg\hgtk\thgstrip.py:169
msgid "No backup (-n/--nobackup)"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:182
+#: tortoisehg\hgtk\thgstrip.py:196
msgid "Unknown revision!"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:184
+#: tortoisehg\hgtk\thgstrip.py:198
msgid "<span weight=\"bold\">%s changesets</span> will be stripped"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:190
+#: tortoisehg\hgtk\thgstrip.py:204
msgid "No changesets to display"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:194
+#: tortoisehg\hgtk\thgstrip.py:208
msgid "Displaying all changesets"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:196
+#: tortoisehg\hgtk\thgstrip.py:210
msgid "Displaying %(count)d of %(total)d changesets"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:359
+#: tortoisehg\hgtk\thgstrip.py:374
msgid "Confirm Strip"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:360
+#: tortoisehg\hgtk\thgstrip.py:375
msgid ""
"Detected uncommitted local changes.\n"
"Do you want to discard them and continue?"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:362
+#: tortoisehg\hgtk\thgstrip.py:377
msgid "&Yes (--force)"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:380
+#: tortoisehg\hgtk\thgstrip.py:395
msgid "Stripped successfully"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:383
+#: tortoisehg\hgtk\thgstrip.py:398
msgid "Canceled stripping"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:385
+#: tortoisehg\hgtk\thgstrip.py:400
msgid "Failed to strip"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:404
+#: tortoisehg\hgtk\thgstrip.py:419
msgid "Saved at: %s"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:408
+#: tortoisehg\hgtk\thgstrip.py:423
msgid "Open..."
msgstr ""
-#: tortoisehg\hgtk\update.py:42
+#: tortoisehg\hgtk\update.py:41
msgid "Update - %s"
msgstr "Aktualisieren - %s"
-#: tortoisehg\hgtk\update.py:58
+#: tortoisehg\hgtk\update.py:57
msgid "Update to:"
msgstr "Aktualisiere zu:"
-#: tortoisehg\hgtk\update.py:61
+#: tortoisehg\hgtk\update.py:60
msgid "Discard local changes, no backup (-C/--clean)"
msgstr ""
-#: tortoisehg\hgtk\update.py:91
+#: tortoisehg\hgtk\update.py:90
msgid "Target:"
msgstr ""
-#: tortoisehg\hgtk\update.py:99
+#: tortoisehg\hgtk\update.py:98
msgid "Parent 1:"
msgstr ""
-#: tortoisehg\hgtk\update.py:101
+#: tortoisehg\hgtk\update.py:100
msgid "Parent 2:"
msgstr ""
-#: tortoisehg\hgtk\update.py:181
+#: tortoisehg\hgtk\update.py:180
msgid "(same as parent)"
msgstr ""
-#: tortoisehg\hgtk\update.py:187
+#: tortoisehg\hgtk\update.py:186
msgid "unknown revision!"
msgstr ""
-#: tortoisehg\hgtk\update.py:223
+#: tortoisehg\hgtk\update.py:222
msgid ""
"Detected uncommitted local changes in working tree.\n"
"Please select to continue:\n"
"\n"
msgstr ""
+#: tortoisehg\hgtk\update.py:224
+msgid "&Discard"
+msgstr ""
+
#: tortoisehg\hgtk\update.py:225
-msgid "&Discard"
+msgid "Discard - discard local changes, no backup"
msgstr ""
#: tortoisehg\hgtk\update.py:226
-msgid "Discard - discard local changes, no backup"
+msgid "&Shelve"
msgstr ""
#: tortoisehg\hgtk\update.py:227
-msgid "&Shelve"
+msgid "Shelve - launch Shelve tool and continue"
msgstr ""
#: tortoisehg\hgtk\update.py:228
-msgid "Shelve - launch Shelve tool and continue"
+msgid "&Merge"
msgstr ""
#: tortoisehg\hgtk\update.py:229
-msgid "&Merge"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:230
msgid "Merge - allow to merge with local changes"
msgstr ""
-#: tortoisehg\hgtk\update.py:243
+#: tortoisehg\hgtk\update.py:242
msgid "Confirm Update"
msgstr ""
-#: tortoisehg\hgtk\update.py:267
+#: tortoisehg\hgtk\update.py:268
msgid "[canceled by user]\n"
msgstr ""
-#: tortoisehg\hgtk\update.py:272
+#: tortoisehg\hgtk\update.py:273
msgid "invalid dialog result: %s"
msgstr ""
-#: tortoisehg\hgtk\update.py:281
+#: tortoisehg\hgtk\update.py:282
msgid "Updated successfully"
msgstr ""
-#: tortoisehg\hgtk\update.py:283
+#: tortoisehg\hgtk\update.py:284
msgid "Canceled updating"
msgstr ""
-#: tortoisehg\hgtk\update.py:285
+#: tortoisehg\hgtk\update.py:286
msgid "Failed to update"
msgstr ""
@@ -5237,6 +5240,9 @@#~ msgid "_commit"
#~ msgstr "Ü_bernehmen"
+#~ msgid "Launch synchronize tool"
+#~ msgstr "Synchronisierungsdialog starten"
+
#~ msgid "_merge with"
#~ msgstr "_zusammenführen"
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
Loading...