# HG changeset patch # User Fabian Kreutz # Date 1252908876 -10800 # Node ID a95e2833dda5430356cb8e05cee428e3e0718bb5 # Parent dbe2bdd5e48825151a8c73b59736c124d258ce91 i18n-de: redid latest translations Originally by Simon H., Tobias and myself. diff -r dbe2bdd5e488 -r a95e2833dda5 i18n/de.po --- a/i18n/de.po Tue Sep 08 19:46:20 2009 -0300 +++ b/i18n/de.po Mon Sep 14 09:14:36 2009 +0300 @@ -10,21 +10,22 @@ # changeset Änderungssatz # check out auschecken # commit Version -# commit (v) übertragen +# commit (v) übernehmen # deprecated veraltet # hook Aktion # merge zusammenführen # notation Schreibweise -# repository Projektarchiv +# repository (Projekt)archiv +# manage/track versionieren # -# Die Koordination der Übersetzung erfolgt auf http://bitbucket.org/tobidope/mercurial-german-translation +# Die Koordination der Übersetzung erfolgt auf https://bitbucket.org/FabianKreutz/hg-i18n-de/ msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-08 07:35+0200\n" +"POT-Creation-Date: 2009-09-14 08:57+0300\n" "PO-Revision-Date: 2009-04-22 08:04+0200\n" -"Last-Translator: Tobias Bell \n" +"Last-Translator: Fabian Kreutz \n" "Language-Team: German (Tobias Bell, Fabian Kreutz, Lutz Horn)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,8 +42,12 @@ msgid "COMMANDS" msgstr "BEFEHLE" -msgid " options:\n" -msgstr " Optionen:\n" +msgid "" +" options:\n" +"\n" +msgstr "" +" Optionen:\n" +"\n" #, python-format msgid "" @@ -52,6 +57,54 @@ " Aliase: %s\n" "\n" +msgid "" +"hooks for controlling repository access\n" +"\n" +"This hook makes it possible to allow or deny write access to portions\n" +"of a repository when receiving incoming changesets.\n" +"\n" +"The authorization is matched based on the local user name on the\n" +"system where the hook runs, and not the committer of the original\n" +"changeset (since the latter is merely informative).\n" +"\n" +"The acl hook is best used along with a restricted shell like hgsh,\n" +"preventing authenticating users from doing anything other than\n" +"pushing or pulling. The hook is not safe to use if users have\n" +"interactive shell access, as they can then disable the hook.\n" +"Nor is it safe if remote users share an account, because then there\n" +"is no way to distinguish them.\n" +"\n" +"To use this hook, configure the acl extension in your hgrc like this::\n" +"\n" +" [extensions]\n" +" hgext.acl =\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.acl = python:hgext.acl.hook\n" +"\n" +" [acl]\n" +" # Check whether the source of incoming changes is in this list\n" +" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" sources = serve\n" +"\n" +"The allow and deny sections take a subtree pattern as key (with a glob\n" +"syntax by default), and a comma separated list of users as the\n" +"corresponding value. The deny list is checked before the allow list\n" +"is. ::\n" +"\n" +" [acl.allow]\n" +" # If acl.allow is not present, all users are allowed by default.\n" +" # An empty acl.allow section means no users allowed.\n" +" docs/** = doc_writer\n" +" .hgtags = release_engineer\n" +"\n" +" [acl.deny]\n" +" # If acl.deny is not present, no users are refused by default.\n" +" # An empty acl.deny section means all users allowed.\n" +" glob pattern = user4, user5\n" +" ** = user6\n" +msgstr "" + #, python-format msgid "acl: %s not enabled\n" msgstr "acl: %s nicht aktiviert\n" @@ -87,54 +140,36 @@ msgstr "acl: Gestatte Version %s\n" msgid "" -"mercurial bookmarks\n" -"\n" -"Mercurial bookmarks are local moveable pointers to changesets. Every\n" -"bookmark points to a changeset identified by its hash. If you commit a\n" +"track a line of development with movable markers\n" +"\n" +"Bookmarks are local movable markers to changesets. Every bookmark\n" +"points to a changeset identified by its hash. If you commit a\n" "changeset that is based on a changeset that has a bookmark on it, the\n" -"bookmark is forwarded to the new changeset.\n" +"bookmark shifts to the new changeset.\n" "\n" "It is possible to use bookmark names in every revision lookup (e.g. hg\n" "merge, hg update).\n" "\n" -"The bookmark extension offers the possiblity to have a more git-like\n" -"experience by adding the following configuration option to your .hgrc:\n" -"\n" -"[bookmarks]\n" -"track.current = True\n" -"\n" -"This will cause bookmarks to track the bookmark that you are currently\n" -"on, and just updates it. This is similar to git's approach of\n" +"By default, when several bookmarks point to the same changeset, they\n" +"will all move forward together. It is possible to obtain a more\n" +"git-like experience by adding the following configuration option to\n" +"your .hgrc::\n" +"\n" +" [bookmarks]\n" +" track.current = True\n" +"\n" +"This will cause Mercurial to track the bookmark that you are currently\n" +"using, and only update it. This is similar to git's approach to\n" "branching.\n" msgstr "" -"Mercurial-Lesezeichen\n" -"\n" -"Mercurial-Lesezeichen sind lokale, bewegliche Zeiger auf Änderungssätze.\n" -"Jedes Lesezeichen bezeichnet einen Änderungssatz identifiziert durch seine\n" -"Prüfsumme. Wenn ein Änderungssatz, der auf einem anderen Änderungssatz mit\n" -"einem Lesezeichen basiert, übernommen wird, so wird das Lesezeichen auf den\n" -"neuen Satz verschoben.\n" -"\n" -"Ein Lesezeichenname kann für jede Form von Revisionssuche (z.B. hg merge,\n" -"hg update) verwendet werden.\n" -"\n" -"Durch diese Erweiterung ist eine eher git-ähnliche Arbeitsform möglich,\n" -"indem die folgende Konfigurationsoption in die .hgrc eingefügt wird:\n" -"\n" -"[bookmarks]\n" -"track.current = True\n" -"\n" -"Dadurch wird das Lesezeichen bei Aktualisierungen automatisch verschoben.\n" -"Dies entspricht gits Form von Verzweigungen (branching).\n" - -#, fuzzy -msgid "" -"mercurial bookmarks\n" + +msgid "" +"track a line of development with movable markers\n" "\n" " Bookmarks are pointers to certain commits that move when\n" -" commiting. Bookmarks are local. They can be renamed, copied and\n" +" committing. Bookmarks are local. They can be renamed, copied and\n" " deleted. It is possible to use bookmark names in 'hg merge' and\n" -" 'hg update' to update to a given bookmark.\n" +" 'hg update' to merge and update respectively to a given bookmark.\n" "\n" " You can use 'hg bookmark NAME' to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" @@ -142,7 +177,7 @@ " the bookmark is assigned to that revision.\n" " " msgstr "" -"Mercurial Lesezeichen\n" +"Folgt einem Entwicklungsstrang anhand einer beweglichen Markierung\n" "\n" " Lesezeichen sind Zeiger auf bestimmte Versionen, die mitwandern,\n" " wenn eine neuen Version erzeugt wird. Lesezeichen sind nur lokal.\n" @@ -150,7 +185,7 @@ " Lesezeichen bei 'hg merge' und 'hg update' zu nutzen, um auf das\n" " angegebene Lesezeichen zu aktualisieren.\n" "\n" -" Du kannst 'hg bookmark NAME' aufrufen, um ein Lesezeichen mit dem\n" +" Man kann 'hg bookmark NAME' aufrufen, um ein Lesezeichen mit dem\n" " angegeben Namen auf der aktuellen Spitze (tip) zu setzen. Bei Angabe " "einer\n" " Revision mit -r REV (REV kann ein vorhandenes Lesezeichen sein) wird " @@ -193,7 +228,7 @@ msgstr "" msgid "" -"Bugzilla integration\n" +"hooks for integrating with the Bugzilla bug tracker\n" "\n" "This hook extension adds comments on bugs in Bugzilla when changesets\n" "that refer to bugs by Bugzilla ID are seen. The hook does not change\n" @@ -209,65 +244,86 @@ "be run by Mercurial as the user pushing the change; you will need to\n" "ensure the Bugzilla install file permissions are set appropriately.\n" "\n" -"Configuring the extension:\n" -"\n" -" [bugzilla]\n" -"\n" -" host Hostname of the MySQL server holding the Bugzilla\n" -" database.\n" -" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" -" user Username to use to access MySQL server. Default 'bugs'.\n" -" password Password to use to access MySQL server.\n" -" timeout Database connection timeout (seconds). Default 5.\n" -" version Bugzilla version. Specify '3.0' for Bugzilla versions\n" -" 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" -" and '2.16' for versions prior to 2.18.\n" -" bzuser Fallback Bugzilla user name to record comments with, if\n" -" changeset committer cannot be found as a Bugzilla user.\n" -" bzdir Bugzilla install directory. Used by default notify.\n" -" Default '/var/www/html/bugzilla'.\n" -" notify The command to run to get Bugzilla to send bug change\n" -" notification emails. Substitutes from a map with 3\n" -" keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" -" bugzilla email). Default depends on version; from 2.18\n" -" it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" -" %(id)s %(user)s\".\n" -" regexp Regular expression to match bug IDs in changeset commit\n" -" message. Must contain one \"()\" group. The default\n" -" expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" -" number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" -" variations thereof. Matching is case insensitive.\n" -" style The style file to use when formatting comments.\n" -" template Template to use when formatting comments. Overrides\n" -" style if specified. In addition to the usual Mercurial\n" -" keywords, the extension specifies:\n" -" {bug} The Bugzilla bug ID.\n" -" {root} The full pathname of the Mercurial\n" -" repository.\n" -" {webroot} Stripped pathname of the Mercurial\n" -" repository.\n" -" {hgweb} Base URL for browsing Mercurial\n" -" repositories.\n" -" Default 'changeset {node|short} in repo {root} refers '\n" -" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" -" strip The number of slashes to strip from the front of {root}\n" -" to produce {webroot}. Default 0.\n" -" usermap Path of file containing Mercurial committer ID to\n" -" Bugzilla user ID mappings. If specified, the file\n" -" should contain one mapping per line,\n" -" \"committer\"=\"Bugzilla user\". See also the [usermap]\n" -" section.\n" -"\n" -" [usermap]\n" -" Any entries in this section specify mappings of Mercurial\n" -" committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" -" \"committer\"=\"Bugzilla user\"\n" -"\n" -" [web]\n" -" baseurl Base URL for browsing Mercurial repositories. Reference\n" -" from templates as {hgweb}.\n" -"\n" -"Activating the extension:\n" +"The extension is configured through three different configuration\n" +"sections. These keys are recognized in the [bugzilla] section:\n" +"\n" +"host\n" +" Hostname of the MySQL server holding the Bugzilla database.\n" +"\n" +"db\n" +" Name of the Bugzilla database in MySQL. Default 'bugs'.\n" +"\n" +"user\n" +" Username to use to access MySQL server. Default 'bugs'.\n" +"\n" +"password\n" +" Password to use to access MySQL server.\n" +"\n" +"timeout\n" +" Database connection timeout (seconds). Default 5.\n" +"\n" +"version\n" +" Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n" +" '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n" +" to 2.18.\n" +"\n" +"bzuser\n" +" Fallback Bugzilla user name to record comments with, if changeset\n" +" committer cannot be found as a Bugzilla user.\n" +"\n" +"bzdir\n" +" Bugzilla install directory. Used by default notify. Default\n" +" '/var/www/html/bugzilla'.\n" +"\n" +"notify\n" +" The command to run to get Bugzilla to send bug change notification\n" +" emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n" +" and 'user' (committer bugzilla email). Default depends on version;\n" +" from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" +" %(id)s %(user)s\".\n" +"\n" +"regexp\n" +" Regular expression to match bug IDs in changeset commit message.\n" +" Must contain one \"()\" group. The default expression matches 'Bug\n" +" 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n" +" 1234 and 5678' and variations thereof. Matching is case insensitive.\n" +"\n" +"style\n" +" The style file to use when formatting comments.\n" +"\n" +"template\n" +" Template to use when formatting comments. Overrides style if\n" +" specified. In addition to the usual Mercurial keywords, the\n" +" extension specifies::\n" +"\n" +" {bug} The Bugzilla bug ID.\n" +" {root} The full pathname of the Mercurial repository.\n" +" {webroot} Stripped pathname of the Mercurial repository.\n" +" {hgweb} Base URL for browsing Mercurial repositories.\n" +"\n" +" Default 'changeset {node|short} in repo {root} refers '\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" +"\n" +"strip\n" +" The number of slashes to strip from the front of {root} to produce\n" +" {webroot}. Default 0.\n" +"\n" +"usermap\n" +" Path of file containing Mercurial committer ID to Bugzilla user ID\n" +" mappings. If specified, the file should contain one mapping per\n" +" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n" +"\n" +"The [usermap] section is used to specify mappings of Mercurial\n" +"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" +"\"committer\"=\"Bugzilla user\"\n" +"\n" +"Finally, the [web] section supports one entry:\n" +"\n" +"baseurl\n" +" Base URL for browsing Mercurial repositories. Reference from\n" +" templates as {hgweb}.\n" +"\n" +"Activating the extension::\n" "\n" " [extensions]\n" " hgext.bugzilla =\n" @@ -280,7 +336,7 @@ "\n" "This example configuration is for a collection of Mercurial\n" "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" -"installation in /opt/bugzilla-3.2.\n" +"installation in /opt/bugzilla-3.2. ::\n" "\n" " [bugzilla]\n" " host=localhost\n" @@ -288,8 +344,9 @@ " version=3.0\n" " bzuser=unknown@domain.com\n" " bzdir=/opt/bugzilla-3.2\n" -" template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/" -"rev/{node|short}\\n\\n{desc}\\n\n" +" template=Changeset {node|short} in {root|basename}.\n" +" {hgweb}/{webroot}/rev/{node|short}\\n\n" +" {desc}\\n\n" " strip=5\n" "\n" " [web]\n" @@ -298,13 +355,127 @@ " [usermap]\n" " user@emaildomain.com=user.name@bugzilladomain.com\n" "\n" -"Commits add a comment to the Bugzilla bug record of the form:\n" +"Commits add a comment to the Bugzilla bug record of the form::\n" "\n" " Changeset 3b16791d6642 in repository-name.\n" " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" "\n" " Changeset commit comment. Bug 1234.\n" msgstr "" +"Bugzilla integration\n" +"\n" +"Diese Erweiterung (falls als Einhänge-Aktion aktiviert) überträgt Versions-\n" +"meldungen als Kommentare in Bugzilla, wenn sie eine Bugzilla ID enthalten.\n" +"Der Status des Bugs wird nicht verändert.\n" +"\n" +"Die Bugzilla-Datenbank wird direkt verändert, daher werden nur Instanzen " +"mit\n" +"MySQL als Datenspeicher unterstützt.\n" +"\n" +"Intern wird ein Bugzilla-Skript zum Senden von Hinweis-Emails verwendet.\n" +"Dies ist 'processmail' in Versionen vor 2.18 und 'config/sendbugmail.pl'\n" +"danach. Mercurial führt dies unter der User-ID des Überträgers aus, daher\n" +"müssen die Dateirechte dieses Skripts entsprechend gesetzt sein.\n" +"\n" +"Konfiguration der Erweiterung:\n" +"\n" +" [bugzilla]\n" +"\n" +" host Hostname des Servers auf dem die Bugzilla MySQL-DB läuft.\n" +" db Name der Bugzilla Datebank in MySQL. Standard: 'bugs'.\n" +" user Benutzername zum Zugriff auf den MySQL-Server. Standard: " +"'bugs'.\n" +" password Password zum Zugriff auf den MySQL-Server.\n" +" timeout Datenbank Verbindungs-Zeitgrenze (in Sekunden). Standard: 5.\n" +" version Bugzilla Version. '3.0' für Bugzilla Versionen nach und\n" +" inklusive 3.0, '2.18' für Versionen seit 2.18 und '2.16'\n" +" für Versionen davor.\n" +" bzuser Ausweich-Benutzername zum Setzen von Kommentaren, falls der\n" +" Überträger der Änderungen kein Benutzer in Bugzilla ist.\n" +" bzdir Bugzilla Installationsverzeichnis. Notwendig für die " +"Standard\n" +" 'notify'-Aktion; Standard: '/var/www/html/bugzilla'.\n" +" notify Das Kommando um Hinweisemails zu versenden. Die drei " +"Schlüssel\n" +" 'bzdir', 'id' (Bug ID) und 'user' (Überträger) werden " +"ersetzt.\n" +" Der Standard hängt von der Version ab. Ab 2.18 ist es\n" +" 'cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)" +"s'\n" +" regexp Der Reguläre Ausdruck, mit dem Bug IDs in der " +"Versionsmeldung\n" +" erkannt werden. Er muss mindestens eine '()' Gruppe " +"enthalten.\n" +" Der Standardwert erkennt: 'Bug 1234', 'Bug no. 1234', 'Bug\n" +" number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' und\n" +" Variationen. Groß- und Kleinschreibung wird ignoriert.\n" +" style Stil-Datei für das Formatieren der Kommentare.\n" +" template Vorlagetext für die Bugzilla Kommentare (anstelle der Stil-\n" +" Datei). Zusätzlich zu den Mercurial-Schlüsselworten gibt es::\n" +" {bug} Die Bugzilla Bug ID.\n" +" {root} Der volle Pfad des Mercurial Archivs.\n" +" {webroot} Angepasster Pfad des Mercurial Archivs.\n" +" {hgweb} Basis-URL für alle Mercurial Archive.\n" +" Standard:\n" +" 'Änderung {node|short} in Archiv {root} erwähnt Bug {bug}." +"\\n'\n" +" 'Details:\\n\\t{desc|tabindent}'\n" +" strip Anzahl der Schrägstriche, die vom Beginn von {root}\n" +" entfernt werden, um {webroot} zu erhalten. Standard: 0.\n" +" usermap Pfad zu einer Datei, die Mercurial Benutzern eine Bugzilla-\n" +" BenutzerID zuweist. Falls angegeben, sollte jede Zeile der " +"Form\n" +" 'Mercurial Benutzer'='Bugzilla Benutzer' entsprechen.\n" +" Siehe auch die [usermap] Sektion.\n" +"\n" +" [usermap]\n" +" Einträge in dieser Sektion weisen Mercurial Benutzern eine Bugzilla-\n" +" BenutzerID zu. Siehe auch Option [bugzilla].usermap.\n" +" 'Mercurial Benutzer'='Bugzilla Benutzer'\n" +"\n" +" [web]\n" +" baseurl Basis-URL für alle Mercurial Archive. Kann in Kommentar-" +"Vorlagen\n" +" als {hgweb} verwendet werden.\n" +"\n" +"Um diese Erweiterung zu aktivieren::\n" +"\n" +" [extensions]\n" +" hgext.bugzilla =\n" +"\n" +" [hooks]\n" +" # führt Einhängeaktion für jede Änderung aus, die hierher geholt oder\n" +" # geschoben wird\n" +" incoming.bugzilla = python:hgext.bugzilla.hook\n" +"\n" +"Beispielkonfiguration:\n" +"\n" +"Dieses Beispiel geht von einer lokalen Bugzilla 3.2 Installation im " +"Verzeichnis\n" +"/opt/bugzilla-3.2 und Mercurial Archiven in /var/local/hg/repos/ aus.\n" +"\n" +" [bugzilla]\n" +" host=localhost\n" +" password=XYZZY\n" +" version=3.0\n" +" bzuser=unknown@domain.com\n" +" bzdir=/opt/bugzilla-3.2\n" +" template=Änderung {node|short} in Archiv {root|basename}.\\n\n" +"{hgweb}/{webroot}/rev/{node|short}\\n\\n{desc}\\n\n" +" strip=5\n" +"\n" +" [web]\n" +" baseurl=http://dev.domain.com/hg\n" +"\n" +" [usermap]\n" +" user@emaildomain.com=user.name@bugzilladomain.com\n" +"\n" +"Eine neue Änderung führt dann zu einem solchen Bugzilla-Kommentar::\n" +"\n" +" Änderung 3b16791d6642 in Archiv MyProject.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" +"\n" +" Setze Zähler am Schleifenende zurück. Bug 1234.\n" #, python-format msgid "connecting to %s:%s as %s, password %s\n" @@ -312,72 +483,77 @@ #, python-format msgid "query: %s %s\n" -msgstr "" +msgstr "Anfrage: %s %s\n" #, python-format msgid "failed query: %s %s\n" -msgstr "" +msgstr "Fehlgeschlagene Anfrage: %s %s\n" msgid "unknown database schema" -msgstr "" +msgstr "Unbekanntes Datenbankschema" #, python-format msgid "bug %d already knows about changeset %s\n" -msgstr "" +msgstr "Fehler %d hat bereits einen Kommentar über Änderung %s\n" msgid "telling bugzilla to send mail:\n" -msgstr "" +msgstr "Sende Email durch Bugzilla:\n" #, python-format msgid " bug %s\n" -msgstr "" +msgstr " Fehler %s\n" #, python-format msgid "running notify command %s\n" -msgstr "" +msgstr "'notify' Kommando: %s\n" #, python-format msgid "bugzilla notify command %s" -msgstr "" +msgstr "Fehler beim 'notify' Kommando: %s" msgid "done\n" msgstr "erledigt\n" #, python-format msgid "looking up user %s\n" -msgstr "" +msgstr "Suche BenutzerID-Zuweisung für %s\n" #, python-format msgid "cannot find bugzilla user id for %s" -msgstr "" +msgstr "Kann keine Bugzilla BenutzerID für %s finden" #, python-format msgid "cannot find bugzilla user id for %s or %s" -msgstr "" +msgstr "Kann keine Bugzilla BenutzerID für %s oder %s finden" #, python-format msgid "bugzilla version %s not supported" -msgstr "" +msgstr "Bugzilla Version %s wird nicht unterstützt" msgid "" "changeset {node|short} in repo {root} refers to bug {bug}.\n" "details:\n" "\t{desc|tabindent}" msgstr "" +"Änderung {node|short} in Archiv {root} erwähnt Bug {bug}.\n" +"Details:\n" +"\t{desc|tabindent}" #, python-format msgid "python mysql support not available: %s" -msgstr "" +msgstr "Python MySQL Unterstützung nicht verfügbar: %s" #, python-format msgid "hook type %s does not pass a changeset id" -msgstr "" +msgstr "Typ %s für Einhängeaktionen übergibt keine Änderungs-ID" #, python-format msgid "database error: %s" -msgstr "" - -#, fuzzy +msgstr "Datenbankfehler: %s" + +msgid "command to display child changesets" +msgstr "Zum Anzeigen von Kindrevisionen" + msgid "" "show the children of the given or working directory revision\n" "\n" @@ -391,7 +567,8 @@ "Zeigt die Kinder der übergebenen Revision oder des Arbeitsverzeichnisses an\n" "\n" " Zeigt die Kinder der Revision des Arbeitsverzeichnisses an.\n" -" Wenn eine Revision durch --rev angegeben wird, werden die Kinder dieser\n" +" Wenn eine Revision durch -r/--rev angegeben wird, werden die Kinder " +"dieser\n" " Revision angezeigt. Wenn eine Datei als Argument angegeben wird, zeige " "die\n" " Revision an, in der die Datei zuletzt geändert wurde (nachfolgend der\n" @@ -405,7 +582,7 @@ msgid "hg children [-r REV] [FILE]" msgstr "hg children [-r REV] [DATEI]" -msgid "command to show certain statistics about revision history" +msgid "command to display statistics about repository history" msgstr "" #, python-format @@ -417,15 +594,19 @@ msgstr "" msgid "" -"graph count of revisions grouped by template\n" -"\n" -" Will graph count of changed lines or revisions grouped by template\n" -" or alternatively by date, if dateformat is used. In this case it\n" -" will override template.\n" -"\n" -" By default statistics are counted for number of changed lines.\n" -"\n" -" Examples:\n" +"histogram of changes to the repository\n" +"\n" +" This command will display a histogram representing the number\n" +" of changed lines or revisions, grouped according to the given\n" +" template. The default template will group changes by author.\n" +" The --dateformat option may be used to group the results by\n" +" date instead.\n" +"\n" +" Statistics are based on the number of changed lines, or\n" +" alternatively the number of matching revisions if the\n" +" --changesets option is specified.\n" +"\n" +" Examples::\n" "\n" " # display count of changed lines for every committer\n" " hg churn -t '{author|email}'\n" @@ -439,48 +620,84 @@ " # display count of lines changed in every year\n" " hg churn -f '%Y' -s\n" "\n" -" The map file format used to specify aliases is fairly simple:\n" -"\n" -" \n" -"\n" -" By default .hgchurn in the working directory root will be used, if\n" -" it exists. Use the --aliases option to override this.\n" -" " -msgstr "" +" It is possible to map alternate email addresses to a main address\n" +" by providing a file using the following format::\n" +"\n" +" \n" +"\n" +" Such a file may be specified with the --aliases option, otherwise\n" +" a .hgchurn file will be looked for in the working directory root.\n" +" " +msgstr "" +"Zeigt gruppierte Statistiken über Anzahl der Revisionen/Änderungen an\n" +"\n" +" Zählt Revisionen oder veränderte Zeilen anhand einer gegebenen " +"Gruppierung\n" +" und zeigt sie als Graph an. Gruppiert wird anhand von Vorlagen (siehe\n" +" 'hg help templating') oder Datum, falls ein Datumsformat angegeben ist.\n" +"\n" +" Standardmäßig werden die veränderten Zeilen gezählt.\n" +"\n" +" Beispiele::\n" +"\n" +" # Zeigt Anzahl der veränderten Zeilen pro Entwickler\n" +" hg churn -t '{author|email}'\n" +"\n" +" # Zeigt Aktivität im Tagesverlauf (Gruppiert nach Stunde)\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # Zeigt Aktivität pro Monat\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # Zeigt Anzahl der veränderten Zeilen über die Jahre\n" +" hg churn -f '%Y' -s\n" +"\n" +" Als Zuweisungsdatei für Alias-Emails zu echten Emails wird " +"standardmäßig\n" +" die .hgchurn Datei in der Archivwurzel verwendet. Die Option --aliases\n" +" verändert diese Vorgabe. Das Format ist recht einfach::\n" +"\n" +" \n" +"\n" +" Diese Erweiterung muss in der Datei .hgrc aktiviert werden:\n" +"\n" +" [extensions]\n" +" hgext.churn =\n" +" " #, python-format msgid "assuming %i character terminal\n" -msgstr "" +msgstr "Gehe von Terminalbreite %i aus\n" msgid "count rate for the specified revision or range" -msgstr "" +msgstr "Zählt nur in gegebener Revision oder Intervall" msgid "count rate for revisions matching date spec" msgstr "Zeigt Revisionen passend zur Datums-Spezifikation" msgid "template to group changesets" -msgstr "" +msgstr "Gruppierungsschlüssel (hg help templating)" msgid "strftime-compatible format for grouping by date" -msgstr "" +msgstr "Gruppierung nach Datum in strftime-kompatiblem Format" msgid "count rate by number of changesets" -msgstr "" +msgstr "Zählt Anzahl der Änderungssätze" msgid "sort by key (default: sort by count)" -msgstr "" +msgstr "Sortiere nach Gruppierungsschlüssel (Standard: nach Anzahl)" msgid "file with email aliases" -msgstr "" +msgstr "Datei mit Alias-Emails" msgid "show progress" -msgstr "" +msgstr "Zeigt Fortschritt an" msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" -msgstr "" - -msgid "" -"add color output to status, qseries, and diff-related commands\n" +msgstr "hg churn [-d DATUM] [-r REV] [--aliases DATEI] [--progress] [DATEI]" + +msgid "" +"colorize output from some commands\n" "\n" "This extension modifies the status command to add color to its output\n" "to reflect file status, the qseries command to add color to reflect\n" @@ -493,38 +710,80 @@ "function (aka ANSI escape codes). This module also provides the\n" "render_text function, which can be used to add effects to any text.\n" "\n" -"To enable this extension, add this to your .hgrc file:\n" -"[extensions]\n" -"color =\n" -"\n" -"Default effects may be overridden from the .hgrc file:\n" -"\n" -"[color]\n" -"status.modified = blue bold underline red_background\n" -"status.added = green bold\n" -"status.removed = red bold blue_background\n" -"status.deleted = cyan bold underline\n" -"status.unknown = magenta bold underline\n" -"status.ignored = black bold\n" -"\n" -"# 'none' turns off all effects\n" -"status.clean = none\n" -"status.copied = none\n" -"\n" -"qseries.applied = blue bold underline\n" -"qseries.unapplied = black bold\n" -"qseries.missing = red bold\n" -"\n" -"diff.diffline = bold\n" -"diff.extended = cyan bold\n" -"diff.file_a = red bold\n" -"diff.file_b = green bold\n" -"diff.hunk = magenta\n" -"diff.deleted = red\n" -"diff.inserted = green\n" -"diff.changed = white\n" -"diff.trailingwhitespace = bold red_background\n" -msgstr "" +"Default effects may be overridden from the .hgrc file::\n" +"\n" +" [color]\n" +" status.modified = blue bold underline red_background\n" +" status.added = green bold\n" +" status.removed = red bold blue_background\n" +" status.deleted = cyan bold underline\n" +" status.unknown = magenta bold underline\n" +" status.ignored = black bold\n" +"\n" +" # 'none' turns off all effects\n" +" status.clean = none\n" +" status.copied = none\n" +"\n" +" qseries.applied = blue bold underline\n" +" qseries.unapplied = black bold\n" +" qseries.missing = red bold\n" +"\n" +" diff.diffline = bold\n" +" diff.extended = cyan bold\n" +" diff.file_a = red bold\n" +" diff.file_b = green bold\n" +" diff.hunk = magenta\n" +" diff.deleted = red\n" +" diff.inserted = green\n" +" diff.changed = white\n" +" diff.trailingwhitespace = bold red_background\n" +msgstr "" +"Färbt die Ausgabe von status, qseries und diff-ähnlichen Kommandos\n" +"\n" +" Diese Erweiterung färbt die Ausgabe des Kommandos 'status' anhand des\n" +" Dateistatus, die Ausgabe von 'qseries' anhand des Patchstatus\n" +" (angewendet, nicht angewendet, fehlend) und die Ausgabe von\n" +" diff-ähnlichen Kommandos anhand der Änderung (hinzugefügte oder\n" +" entfernte Zeilen, Dateistatus und abschliessende Leerstellen) ein.\n" +"\n" +" Neben Farbänderungen sind auch andere Effekte wie Fettschreibung oder\n" +" Unterstreichung möglich. Die Effekte werden durch die ECMA-48 SGR\n" +" Funktionen (ANSI Escape Codes) realisiert. Die in diesem Module zu\n" +" findende Funktion 'render_text' kann auch von anderen Modulen verwendet\n" +" werden, um Texteffekte zu erzeugen.\n" +"\n" +" Diese Erweiterung muss in der Datei .hgrc aktiviert werden:\n" +"\n" +" [extensions]\n" +" color =\n" +"\n" +" Standardeffekte können durch die .hgrc Datei verändert werden::\n" +"\n" +" [color]\n" +" status.modified = blue bold underline red_background\n" +" status.added = green bold\n" +" status.removed = red bold blue_background\n" +" status.deleted = cyan bold underline\n" +" status.unknown = magenta bold underline\n" +" status.ignored = black bold\n" +"\n" +" # 'none' deaktiviert alle Effekte\n" +" status.clean = none\n" +" status.copied = none\n" +"\n" +" qseries.applied = blue bold underline\n" +" qseries.unapplied = black bold\n" +" qseries.missing = red bold\n" +" \n" +" diff.diffline = bold\n" +" diff.extended = cyan bold\n" +" diff.file_a = red bold\n" +" diff.file_b = green bold\n" +" diff.hunk = magenta\n" +" diff.deleted = red\n" +" diff.inserted = green\n" +" diff.changed = white\n" +" diff.trailingwhitespace = bold red_background\n" msgid "when to colorize (always, auto, or never)" msgstr "Wann soll eingefärbt werden (always, auto oder never)" @@ -532,13 +791,18 @@ msgid "don't colorize output" msgstr "Keine Färbung der Ausgabe" -msgid "converting foreign VCS repositories to Mercurial" +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "" + +msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" msgid "" "convert a foreign SCM repository to a Mercurial one.\n" "\n" " Accepted source formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - CVS [cvs]\n" " - Darcs [darcs]\n" @@ -550,6 +814,7 @@ " - Perforce [p4]\n" "\n" " Accepted destination formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" @@ -561,23 +826,28 @@ " basename of the source with '-hg' appended. If the destination\n" " repository doesn't exist, it will be created.\n" "\n" -" By default, all sources except Mercurial will use\n" -" --branchsort. Mercurial uses --sourcesort to preserve original\n" -" revision numbers order. Sort modes have the following effects:\n" -" --branchsort: convert from parent to child revision when\n" -" possible, which means branches are usually converted one after\n" -" the other. It generates more compact repositories.\n" -" --datesort: sort revisions by date. Converted repositories have\n" -" good-looking changelogs but are often an order of magnitude\n" -" larger than the same ones generated by --branchsort.\n" -" --sourcesort: try to preserve source revisions order, only\n" -" supported by Mercurial sources.\n" +" By default, all sources except Mercurial will use --branchsort.\n" +" Mercurial uses --sourcesort to preserve original revision numbers\n" +" order. Sort modes have the following effects:\n" +"\n" +" --branchsort convert from parent to child revision when possible,\n" +" which means branches are usually converted one after\n" +" the other. It generates more compact repositories.\n" +"\n" +" --datesort sort revisions by date. Converted repositories have\n" +" good-looking changelogs but are often an order of\n" +" magnitude larger than the same ones generated by\n" +" --branchsort.\n" +"\n" +" --sourcesort try to preserve source revisions order, only\n" +" supported by Mercurial sources.\n" "\n" " If isn't given, it will be put in a default location\n" " (/.hg/shamap by default). The is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so:\n" -" \n" +" revision, like so::\n" +"\n" +" \n" "\n" " If the file doesn't exist, it's automatically created. It's\n" " updated on each commit copied, so convert-repo can be interrupted\n" @@ -591,7 +861,7 @@ "\n" " The filemap is a file that allows filtering and remapping of files\n" " and directories. Comment lines start with '#'. Each line can\n" -" contain one of the following directives:\n" +" contain one of the following directives::\n" "\n" " include path/to/file\n" "\n" @@ -601,11 +871,11 @@ "\n" " The 'include' directive causes a file, or all files under a\n" " directory, to be included in the destination repository, and the\n" -" exclusion of all other files and directories not explicitly included.\n" -" The 'exclude' directive causes files or directories to be omitted.\n" -" The 'rename' directive renames a file or directory. To rename from\n" -" a subdirectory into the root of the repository, use '.' as the\n" -" path to rename to.\n" +" exclusion of all other files and directories not explicitly\n" +" included. The 'exclude' directive causes files or directories to\n" +" be omitted. The 'rename' directive renames a file or directory. To\n" +" rename from a subdirectory into the root of the repository, use\n" +" '.' as the path to rename to.\n" "\n" " The splicemap is a file that allows insertion of synthetic\n" " history, letting you specify the parents of a revision. This is\n" @@ -630,7 +900,7 @@ " in one repository from \"default\" to a named branch.\n" "\n" " Mercurial Source\n" -" -----------------\n" +" ----------------\n" "\n" " --config convert.hg.ignoreerrors=False (boolean)\n" " ignore integrity errors when reading. Use it to fix Mercurial\n" @@ -658,36 +928,38 @@ " Because CVS does not have changesets, it is necessary to collect\n" " individual commits to CVS and merge them into changesets. CVS\n" " source uses its internal changeset merging code by default but can\n" -" be configured to call the external 'cvsps' program by setting:\n" -" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" +" be configured to call the external 'cvsps' program by setting::\n" +"\n" +" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" +"\n" " This option is deprecated and will be removed in Mercurial 1.4.\n" "\n" " The options shown are the defaults.\n" "\n" -" Internal cvsps is selected by setting\n" -" --config convert.cvsps=builtin\n" +" Internal cvsps is selected by setting ::\n" +"\n" +" --config convert.cvsps=builtin\n" +"\n" " and has a few more configurable options:\n" -" --config convert.cvsps.cache=True (boolean)\n" -" Set to False to disable remote log caching, for testing and\n" -" debugging purposes.\n" -" --config convert.cvsps.fuzz=60 (integer)\n" -" Specify the maximum time (in seconds) that is allowed\n" -" between commits with identical user and log message in a\n" -" single changeset. When very large files were checked in as\n" -" part of a changeset then the default may not be long\n" -" enough.\n" -" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" -" Specify a regular expression to which commit log messages\n" -" are matched. If a match occurs, then the conversion\n" -" process will insert a dummy revision merging the branch on\n" -" which this log message occurs to the branch indicated in\n" -" the regex.\n" -" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" -" Specify a regular expression to which commit log messages\n" -" are matched. If a match occurs, then the conversion\n" -" process will add the most recent revision on the branch\n" -" indicated in the regex as the second parent of the\n" -" changeset.\n" +"\n" +" --config convert.cvsps.cache=True (boolean)\n" +" Set to False to disable remote log caching, for testing and\n" +" debugging purposes.\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed between\n" +" commits with identical user and log message in a single\n" +" changeset. When very large files were checked in as part of a\n" +" changeset then the default may not be long enough.\n" +" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" insert a dummy revision merging the branch on which this log\n" +" message occurs to the branch indicated in the regex.\n" +" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" add the most recent revision on the branch indicated in the\n" +" regex as the second parent of the changeset.\n" "\n" " The hgext/convert/cvsps wrapper script allows the builtin\n" " changeset merging code to be run without doing a conversion. Its\n" @@ -737,7 +1009,6 @@ " --config convert.p4.startrev=0 (perforce changelist number)\n" " specify initial Perforce revision.\n" "\n" -"\n" " Mercurial Destination\n" " ---------------------\n" "\n" @@ -863,10 +1134,6 @@ msgstr "" #, python-format -msgid "%s %s" -msgstr "" - -#, python-format msgid "syntax error in %s(%d): key/value pair expected" msgstr "" @@ -959,7 +1226,9 @@ msgid "CVS pserver authentication failed" msgstr "" -msgid "server sucks" +#, python-format +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" msgstr "" #, python-format @@ -1011,7 +1280,7 @@ #, python-format msgid "found synthetic revision in %s: %r\n" -msgstr "Synthetische Revision gefundein in %s: %r\n" +msgstr "Synthetische Revision gefunden in %s: %r\n" #, python-format msgid "writing cvs log cache %s\n" @@ -1037,6 +1306,10 @@ msgid "%d changeset entries\n" msgstr "" +#, python-format +msgid "darcs version 2.1 or newer needed (found %r)" +msgstr "" + msgid "Python ElementTree module is not available" msgstr "" @@ -1220,22 +1493,11 @@ #, python-format msgid "gone from %s\n" -msgstr "" - -#, python-format -msgid "found parent directory %s\n" -msgstr "" - -#, python-format -msgid "base, entry %s %s\n" -msgstr "" - -msgid "munge-o-matic\n" -msgstr "" - -#, python-format -msgid "info: %s %s %s %s\n" -msgstr "" +msgstr "entfernt aus %s\n" + +#, python-format +msgid "entry %s\n" +msgstr "Eintrag %s\n" #, python-format msgid "unknown path in revision %d: %s\n" @@ -1261,10 +1523,6 @@ msgstr "" #, python-format -msgid "skipping blacklisted revision %d\n" -msgstr "" - -#, python-format msgid "revision %d has no entries\n" msgstr "" @@ -1294,20 +1552,16 @@ msgstr "" msgid "" -"\n" -"The `extdiff' Mercurial extension allows you to use external programs\n" -"to compare revisions, or revision with working directory. The external diff\n" -"programs are called with a configurable set of options and two\n" +"command to allow external programs to compare revisions\n" +"\n" +"The extdiff Mercurial extension allows you to use external programs\n" +"to compare revisions, or revision with working directory. The external\n" +"diff programs are called with a configurable set of options and two\n" "non-option arguments: paths to directories containing snapshots of\n" "files to compare.\n" "\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.extdiff =\n" -"\n" -"The `extdiff' extension also allows to configure new diff commands, so\n" -"you do not need to type \"hg extdiff -p kdiff3\" always.\n" +"The extdiff extension also allows to configure new diff commands, so\n" +"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n" "\n" " [extdiff]\n" " # add new command that runs GNU diff(1) in 'context diff' mode\n" @@ -1323,14 +1577,13 @@ " meld =\n" "\n" " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" -" # (see http://www.vim.org/scripts/script.php?script_id=102)\n" -" # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " -"in\n" +" # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" +" # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" " # your .vimrc\n" " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" "\n" "You can use -I/-X and list of file or directory names like normal \"hg\n" -"diff\" command. The `extdiff' extension makes snapshots of only needed\n" +"diff\" command. The extdiff extension makes snapshots of only needed\n" "files, so running the external diff program will actually be pretty\n" "fast (at least faster than having to compare the entire tree).\n" msgstr "" @@ -1389,10 +1642,25 @@ msgstr "" #, python-format +msgid "" +"use %(path)s to diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files, using the\n" +" %(path)s program.\n" +"\n" +" When two revision arguments are given, then changes are shown between\n" +" those revisions. If only one revision is specified then that revision " +"is\n" +" compared to the working directory, and, when no revisions are " +"specified,\n" +" the working directory files are compared to its parent." +msgstr "" + +#, python-format msgid "hg %s [OPTION]... [FILE]..." msgstr "" -msgid "pulling, updating and merging in one command" +msgid "pull, update and merge in one command" msgstr "Hole, aktualisiere und führe zusammen in einem Befehl" msgid "" @@ -1486,10 +1754,6 @@ msgstr "Führe zusammen mit %d:%s\n" #, python-format -msgid "Automated merge with %s" -msgstr "Automatisierte Zusammenführung mit %s" - -#, python-format msgid "new changeset %d:%s merges remote changes with local\n" msgstr "" "Neuer Änderungssatz %d:%s führt entfernte Änderungen mit lokalen zusammen\n" @@ -1509,6 +1773,9 @@ msgid "hg fetch [SOURCE]" msgstr "hg fetch [QUELLE]" +msgid "commands to sign and verify changesets" +msgstr "Nutzt eine Programm um den Fehlerstatus zu bestimmen" + msgid "error while verifying signature" msgstr "" @@ -1559,10 +1826,6 @@ "force)" msgstr "" -#, python-format -msgid "Added signature for changeset %s" -msgstr "" - msgid "unknown signature version" msgstr "" @@ -1591,7 +1854,7 @@ msgstr "" msgid "" -"show revision graphs in terminal windows\n" +"command to view revision graphs from a shell\n" "\n" "This extension adds a --graph option to the incoming, outgoing and log\n" "commands. When this options is given, an ASCII representation of the\n" @@ -1636,40 +1899,40 @@ msgstr "" msgid "" -"CIA notification\n" -"\n" -"This is meant to be run as a changegroup or incoming hook.\n" -"To configure it, set the following options in your hgrc:\n" -"\n" -"[cia]\n" -"# your registered CIA user name\n" -"user = foo\n" -"# the name of the project in CIA\n" -"project = foo\n" -"# the module (subproject) (optional)\n" -"#module = foo\n" -"# Append a diffstat to the log message (optional)\n" -"#diffstat = False\n" -"# Template to use for log messages (optional)\n" -"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" -"# Style to use (optional)\n" -"#style = foo\n" -"# The URL of the CIA notification service (optional)\n" -"# You can use mailto: URLs to send by email, eg\n" -"# mailto:cia@cia.vc\n" -"# Make sure to set email.from if you do this.\n" -"#url = http://cia.vc/\n" -"# print message instead of sending it (optional)\n" -"#test = False\n" -"\n" -"[hooks]\n" -"# one of these:\n" -"changegroup.cia = python:hgcia.hook\n" -"#incoming.cia = python:hgcia.hook\n" -"\n" -"[web]\n" -"# If you want hyperlinks (optional)\n" -"baseurl = http://server/path/to/repo\n" +"hooks for integrating with the CIA.vc notification service\n" +"\n" +"This is meant to be run as a changegroup or incoming hook. To\n" +"configure it, set the following options in your hgrc::\n" +"\n" +" [cia]\n" +" # your registered CIA user name\n" +" user = foo\n" +" # the name of the project in CIA\n" +" project = foo\n" +" # the module (subproject) (optional)\n" +" #module = foo\n" +" # Append a diffstat to the log message (optional)\n" +" #diffstat = False\n" +" # Template to use for log messages (optional)\n" +" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" +" # Style to use (optional)\n" +" #style = foo\n" +" # The URL of the CIA notification service (optional)\n" +" # You can use mailto: URLs to send by email, eg\n" +" # mailto:cia@cia.vc\n" +" # Make sure to set email.from if you do this.\n" +" #url = http://cia.vc/\n" +" # print message instead of sending it (optional)\n" +" #test = False\n" +"\n" +" [hooks]\n" +" # one of these:\n" +" changegroup.cia = python:hgcia.hook\n" +" #incoming.cia = python:hgcia.hook\n" +"\n" +" [web]\n" +" # If you want hyperlinks (optional)\n" +" baseurl = http://server/path/to/repo\n" msgstr "" #, python-format @@ -1686,45 +1949,33 @@ msgstr "" msgid "" -"browsing the repository in a graphical way\n" +"browse the repository in a graphical way\n" "\n" "The hgk extension allows browsing the history of a repository in a\n" "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" "distributed with Mercurial.)\n" "\n" "hgk consists of two parts: a Tcl script that does the displaying and\n" -"querying of information, and an extension to mercurial named hgk.py,\n" +"querying of information, and an extension to Mercurial named hgk.py,\n" "which provides hooks for hgk to get information. hgk can be found in\n" -"the contrib directory, and hgk.py can be found in the hgext directory.\n" -"\n" -"To load the hgext.py extension, add it to your .hgrc file (you have to\n" -"use your global $HOME/.hgrc file, not one in a repository). You can\n" -"specify an absolute path:\n" -"\n" -" [extensions]\n" -" hgk=/usr/local/lib/hgk.py\n" -"\n" -"Mercurial can also scan the default python library path for a file\n" -"named 'hgk.py' if you set hgk empty:\n" -"\n" -" [extensions]\n" -" hgk=\n" +"the contrib directory, and the extension is shipped in the hgext\n" +"repository, and needs to be enabled.\n" "\n" "The hg view command will launch the hgk Tcl script. For this command\n" "to work, hgk must be in your search path. Alternately, you can specify\n" -"the path to hgk in your .hgrc file:\n" +"the path to hgk in your .hgrc file::\n" "\n" " [hgk]\n" " path=/location/of/hgk\n" "\n" "hgk can make use of the extdiff extension to visualize revisions.\n" -"Assuming you had already configured extdiff vdiff command, just add:\n" +"Assuming you had already configured extdiff vdiff command, just add::\n" "\n" " [hgk]\n" " vdiff=vdiff\n" "\n" "Revisions context menu will now display additional entries to fire\n" -"vdiff on hovered and selected revisions." +"vdiff on hovered and selected revisions.\n" msgstr "" msgid "diff trees from two commits" @@ -1784,7 +2035,7 @@ msgid "hg debug-config" msgstr "" -msgid "hg debug-merge-base node node" +msgid "hg debug-merge-base REV REV" msgstr "" msgid "ignored" @@ -1805,31 +2056,24 @@ msgid "max-count" msgstr "" -msgid "hg debug-rev-list [options] revs" -msgstr "" - -msgid "" -"syntax highlighting in hgweb, based on Pygments\n" +msgid "hg debug-rev-list [OPTION]... REV..." +msgstr "" + +msgid "" +"syntax highlighting for hgweb (requires Pygments)\n" "\n" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" "\n" -"To enable the extension add this to hgrc:\n" -"\n" -"[extensions]\n" -"hgext.highlight =\n" -"\n" -"There is a single configuration option:\n" -"\n" -"[web]\n" -"pygments_style =