18 # |
18 # |
19 # Die Übersetzung der Handbuchseiten hat zwei Ziele: |
19 # Die Übersetzung der Handbuchseiten hat zwei Ziele: |
20 # a) Die ohnehin komplexen Zusammenhänge der Funktion von Mercurial für |
20 # a) Die ohnehin komplexen Zusammenhänge der Funktion von Mercurial für |
21 # Benutzer, die im Englischen wenig versiert sind, verständlicher zu |
21 # Benutzer, die im Englischen wenig versiert sind, verständlicher zu |
22 # erklären. |
22 # erklären. |
23 # b) Basisbegriffe auf Deutsch zu schaffen, damit nicht jeder in |
23 # b) Basisbegriffe auf Deutsch zu schaffen, damit nicht jeder in |
24 # der Kommunikation eigene erfinden oder eine D-E-Mischung nutzen muss. |
24 # der Kommunikation eigene erfinden oder eine D-E-Mischung nutzen muss. |
25 # |
25 # |
26 # Für a) ist es wichtig, dass eine gute, erklärende Übersetzung mit deutscher |
26 # Für a) ist es wichtig, dass eine gute, erklärende Übersetzung mit deutscher |
27 # Grammatik verwendet wird und keine direkte Wort-für-Wort Übersetzung, die |
27 # Grammatik verwendet wird und keine direkte Wort-für-Wort Übersetzung, die |
28 # auch ein Programm hinkriegt. Eine Übersetzung nur zum Zwecke der Füllung |
28 # auch ein Programm hinkriegt. Eine Übersetzung nur zum Zwecke der Füllung |
101 # |
101 # |
102 msgid "" |
102 msgid "" |
103 msgstr "" |
103 msgstr "" |
104 "Project-Id-Version: Mercurial\n" |
104 "Project-Id-Version: Mercurial\n" |
105 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
105 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
106 "POT-Creation-Date: 2012-01-21 14:20+0200\n" |
106 "POT-Creation-Date: 2012-06-14 13:38+0200\n" |
107 "PO-Revision-Date: 2010-12-24 15:09+0100\n" |
107 "PO-Revision-Date: 2012-06-15 19:13+0100\n" |
108 "Last-Translator: Fabian Kreutz <fabian.kreutz@qvantel.com>\n" |
108 "Last-Translator: Martin Schröder <martinschroeder@vcp-sh.de>\n" |
109 "Language-Team: \n" |
109 "Language-Team: \n" |
110 "Language: de\n" |
110 "Language: de\n" |
111 "MIME-Version: 1.0\n" |
111 "MIME-Version: 1.0\n" |
112 "Content-Type: text/plain; charset=UTF-8\n" |
112 "Content-Type: text/plain; charset=UTF-8\n" |
113 "Content-Transfer-Encoding: 8bit\n" |
113 "Content-Transfer-Encoding: 8bit\n" |
114 "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
114 "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
|
115 "X-Poedit-Bookmarks: 308,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" |
|
116 "X-Poedit-Basepath: /home/moi/Development/mercurial/hg-i18n\n" |
115 |
117 |
116 #, python-format |
118 #, python-format |
117 msgid " (default: %s)" |
119 msgid " (default: %s)" |
118 msgstr " (Standard: %s)" |
120 msgstr " (Standard: %s)" |
119 |
121 |
437 " # Benutzer \"jack\" und die Gruppe \"designer\" haben Schreibzugriff auf\n" |
439 " # Benutzer \"jack\" und die Gruppe \"designer\" haben Schreibzugriff auf\n" |
438 " # jede Datei innerhalb des \"bilder\"-Verzeichnisses:\n" |
440 " # jede Datei innerhalb des \"bilder\"-Verzeichnisses:\n" |
439 " bilder/** = jack, @designer" |
441 " bilder/** = jack, @designer" |
440 |
442 |
441 msgid "" |
443 msgid "" |
442 " # Everyone (except for \"user6\" - see acl.deny above) will have write\n" |
444 " # Everyone (except for \"user6\" and \"@hg-denied\" - see acl.deny above)\n" |
443 " # access to any file under the \"resources\" folder (except for 1\n" |
445 " # will have write access to any file under the \"resources\" folder\n" |
444 " # file. See acl.deny):\n" |
446 " # (except for 1 file. See acl.deny):\n" |
445 " src/main/resources/** = *" |
447 " src/main/resources/** = *" |
446 msgstr "" |
448 msgstr "" |
447 " # Jeder (ausgenommen \"benutzer6\", siehe acl.deny oben) wird Schreib-\n" |
449 " # Jeder (ausgenommen \"benutzer6\", siehe acl.deny oben) wird Schreib-\n" |
448 " # zugriff auf jede Datei innerhalb des \"ressourcen\"-Verzeichnisses\n" |
450 " # zugriff auf jede Datei innerhalb des \"ressources\"-Verzeichnisses\n" |
449 " # erhalten (ausgenommen eine Datei; siehe acl.deny):\n" |
451 " # erhalten (ausgenommen eine Datei; siehe acl.deny):\n" |
450 " src/main/ressourcen/** = *" |
452 " src/main/resources/** = *" |
451 |
453 |
452 msgid " .hgtags = release_engineer" |
454 msgid " .hgtags = release_engineer" |
453 msgstr " .hgtags = release_engineer" |
455 msgstr " .hgtags = release_engineer" |
454 |
456 |
455 #, python-format |
457 #, python-format |
528 "must be run on the host with the Bugzilla install, and requires\n" |
532 "must be run on the host with the Bugzilla install, and requires\n" |
529 "permission to read Bugzilla configuration details and the necessary\n" |
533 "permission to read Bugzilla configuration details and the necessary\n" |
530 "MySQL user and password to have full access rights to the Bugzilla\n" |
534 "MySQL user and password to have full access rights to the Bugzilla\n" |
531 "database. For these reasons this access mode is now considered\n" |
535 "database. For these reasons this access mode is now considered\n" |
532 "deprecated, and will not be updated for new Bugzilla versions going\n" |
536 "deprecated, and will not be updated for new Bugzilla versions going\n" |
533 "forward." |
537 "forward. Only adding comments is supported in this access mode." |
534 msgstr "" |
538 msgstr "" |
535 "Direktes Schreiben in die Datenbank führt leicht zu Problemen bei Schema-\n" |
539 "Direktes Schreiben in die Datenbank führt leicht zu Problemen bei Schema-\n" |
536 "veränderungen. Ausserdem wird ein externes Bugzilla Script benötigt, um\n" |
540 "veränderungen und benötigt ein externes Bugzilla Script, um\n" |
537 "Benachrichtigungsemails zu versenden. Dieses Script wird mit den Rechten " |
541 "Benachrichtigungsemails zu versenden. Dieses Script wird mit den Rechten " |
538 "des\n" |
542 "des\n" |
539 "Mercurial-Benutzers ausgeführt, benötigt eine lokale Bugzilla-Installation\n" |
543 "Mercurial-Benutzers ausgeführt, benötigt eine lokale Bugzilla-Installation\n" |
540 "sowie Leserechte an der Bugzilla Konfigurationsdatei und MySQL Benutzername\n" |
544 "sowie Leserechte an der Bugzilla-Konfigurationsdatei und MySQL-Benutzername\n" |
541 "und Passwort, um vollen Zugriff auf die Bugzilla Datenbank zu haben. Aus\n" |
545 "und -Passwort, um vollen Zugriff auf die Bugzilla Datenbank zu haben. Aus\n" |
542 "diesen Gründen wird diese Zugriffsmethode als veraltet angesehen und nicht\n" |
546 "diesen Gründen wird diese Zugriffsmethode als veraltet angesehen und nicht\n" |
543 "mehr für zukünftigen Bugzillaversionen angepasst." |
547 "mehr für zukünftigen Bugzillaversionen angepasst. In diesem Zugriffsmodus " |
|
548 "ist\n" |
|
549 "nur das Hinzufügen von Kommentaren erlaubt." |
544 |
550 |
545 msgid "" |
551 msgid "" |
546 "Access via XMLRPC needs a Bugzilla username and password to be specified\n" |
552 "Access via XMLRPC needs a Bugzilla username and password to be specified\n" |
547 "in the configuration. Comments are added under that username. Since the\n" |
553 "in the configuration. Comments are added under that username. Since the\n" |
548 "configuration must be readable by all Mercurial users, it is recommended\n" |
554 "configuration must be readable by all Mercurial users, it is recommended\n" |
549 "that the rights of that user are restricted in Bugzilla to the minimum\n" |
555 "that the rights of that user are restricted in Bugzilla to the minimum\n" |
550 "necessary to add comments." |
556 "necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and " |
|
557 "later." |
551 msgstr "" |
558 msgstr "" |
552 "Zugriff über XMLRPC benötigt einen Bugzilla-Benutzernamen und -Passwort in\n" |
559 "Zugriff über XMLRPC benötigt einen Bugzilla-Benutzernamen und -Passwort in\n" |
553 "der Konfigurationsdatei. Kommentare werden unter diesem Benutzer eingefügt.\n" |
560 "der Konfigurationsdatei. Kommentare werden unter diesem Benutzer eingefügt.\n" |
554 "Da es notwendig ist, dass alle Mercurial-Benutzer Zugriff auf diese Datei\n" |
561 "Da es notwendig ist, dass alle Mercurial-Benutzer Lesezugriff auf diese " |
555 "haben, ist es empfohlen dieses Benutzerkonto in Bugzilla mit minimalen\n" |
562 "Datei\n" |
556 "Rechten (um Kommentare einzufügen) auszustatten." |
563 "haben, ist es empfohlen dieses Benutzerkonto in Bugzilla mit den minimal\n" |
|
564 "nötigen Rechten um Kommentare einzufügen auszustatten.\n" |
|
565 "Bugs als gelöst zu markieren benötigt Bugzilla 4.0 oder neuer." |
557 |
566 |
558 msgid "" |
567 msgid "" |
559 "Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n" |
568 "Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n" |
560 "email to the Bugzilla email interface to submit comments to bugs.\n" |
569 "email to the Bugzilla email interface to submit comments to bugs.\n" |
561 "The From: address in the email is set to the email address of the Mercurial\n" |
570 "The From: address in the email is set to the email address of the Mercurial\n" |
562 "user, so the comment appears to come from the Mercurial user. In the event\n" |
571 "user, so the comment appears to come from the Mercurial user. In the event\n" |
563 "that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n" |
572 "that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n" |
564 "user, the email associated with the Bugzilla username used to log into\n" |
573 "user, the email associated with the Bugzilla username used to log into\n" |
565 "Bugzilla is used instead as the source of the comment." |
574 "Bugzilla is used instead as the source of the comment. Marking bugs fixed\n" |
|
575 "works on all supported Bugzilla versions." |
566 msgstr "" |
576 msgstr "" |
567 "Zugriff über XMLRPC/Email verwendet XMLRPC für Anfragen an Bugzilla, aber\n" |
577 "Zugriff über XMLRPC/Email verwendet XMLRPC für Anfragen an Bugzilla, aber\n" |
568 "sendet Emails an die Email-Schnittstelle um Kommentare einzufügen. Die\n" |
578 "sendet Emails an die Email-Schnittstelle um Kommentare einzufügen. Die\n" |
569 "Adresse im 'Absender:' Feld wird auf die Emailadresse des Mercurial-" |
579 "Adresse im 'Absender:'-Feld wird auf die Emailadresse des Mercurial-" |
570 "Benutzers\n" |
580 "Benutzers\n" |
571 "gesetzt, so dass Bugzilla den Autor richtig setzt. Falls Bugzilla den so\n" |
581 "gesetzt, sodass der Kommentar als vom Mercurial-Benutzer kommend erkannt\n" |
572 "empfangenen Benutzer nicht kennt, wird der Benutzer für den XMLRPC-Zugriff\n" |
582 "wird. Falls Bugzilla die Email-Adresse des Mercurial-Benutzers nicht als " |
573 "als Autor verwendet." |
583 "Bugzilla-\n" |
|
584 "Benutzer erkennt, wird alternativ die Email mit dem Bugzilla-Benutzernamen \n" |
|
585 "verknüpft, der zum Anmelden in Bugzilla verwendet wird, und als Quelle des\n" |
|
586 "Kommentars verwendet. Bugs als gelöst zu markieren funktioniert in allen\n" |
|
587 "Bugzilla-Versionen." |
574 |
588 |
575 msgid "Configuration items common to all access modes:" |
589 msgid "Configuration items common to all access modes:" |
576 msgstr "Konfigurationseinträge für alle Zugriffsmethoden:" |
590 msgstr "Konfigurationseinträge für alle Zugriffsmethoden:" |
577 |
591 |
578 msgid "" |
592 msgid "" |
597 " :``2.18``: MySQL Zugriff, Bugzilla 2.18 bis ausschliesslich 3.0.\n" |
611 " :``2.18``: MySQL Zugriff, Bugzilla 2.18 bis ausschliesslich 3.0.\n" |
598 " :``2.16``: MySQL Zugriff, Bugzilla 2.16 bis ausschliesslich 2.18." |
612 " :``2.16``: MySQL Zugriff, Bugzilla 2.16 bis ausschliesslich 2.18." |
599 |
613 |
600 msgid "" |
614 msgid "" |
601 "bugzilla.regexp\n" |
615 "bugzilla.regexp\n" |
602 " Regular expression to match bug IDs in changeset commit message.\n" |
616 " Regular expression to match bug IDs for update in changeset commit " |
603 " Must contain one \"()\" group. The default expression matches ``Bug\n" |
617 "message.\n" |
604 " 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n" |
618 " It must contain one \"()\" named group ``<ids>`` containing the bug\n" |
605 " ``Bug 1234 and 5678`` and variations thereof. Matching is case\n" |
619 " IDs separated by non-digit characters. It may also contain\n" |
606 " insensitive." |
620 " a named group ``<hours>`` with a floating-point number giving the\n" |
607 msgstr "" |
621 " hours worked on the bug. If no named groups are present, the first\n" |
608 "bugzilla.regexp\n" |
622 " \"()\" group is assumed to contain the bug IDs, and work time is not\n" |
609 " Der Reguläre Ausdruck, mit dem Ticket-IDs in der Versionsmeldung erkannt\n" |
623 " updated. The default expression matches ``Bug 1234``, ``Bug no. 1234``,\n" |
610 " werden. Er muss eine \"()\"-Gruppe enthalten. Der Standardwert erkennt:\n" |
624 " ``Bug number 1234``, ``Bugs 1234,5678``, ``Bug 1234 and 5678`` and\n" |
611 " 'Bug 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678',\n" |
625 " variations thereof, followed by an hours number prefixed by ``h`` or\n" |
612 " 'Bug 1234 and 5678' und Variationen. Großschreibung wird ignoriert." |
626 " ``hours``, e.g. ``hours 1.5``. Matching is case insensitive." |
|
627 msgstr "" |
|
628 |
|
629 msgid "" |
|
630 "bugzilla.fixregexp\n" |
|
631 " Regular expression to match bug IDs for marking fixed in changeset\n" |
|
632 " commit message. This must contain a \"()\" named group ``<ids>` " |
|
633 "containing\n" |
|
634 " the bug IDs separated by non-digit characters. It may also contain\n" |
|
635 " a named group ``<hours>`` with a floating-point number giving the\n" |
|
636 " hours worked on the bug. If no named groups are present, the first\n" |
|
637 " \"()\" group is assumed to contain the bug IDs, and work time is not\n" |
|
638 " updated. The default expression matches ``Fixes 1234``, ``Fixes bug " |
|
639 "1234``,\n" |
|
640 " ``Fixes bugs 1234,5678``, ``Fixes 1234 and 5678`` and\n" |
|
641 " variations thereof, followed by an hours number prefixed by ``h`` or\n" |
|
642 " ``hours``, e.g. ``hours 1.5``. Matching is case insensitive." |
|
643 msgstr "" |
|
644 |
|
645 msgid "" |
|
646 "bugzilla.fixstatus\n" |
|
647 " The status to set a bug to when marking fixed. Default ``RESOLVED``." |
|
648 msgstr "" |
|
649 |
|
650 msgid "" |
|
651 "bugzilla.fixresolution\n" |
|
652 " The resolution to set a bug to when marking fixed. Default ``FIXED``." |
|
653 msgstr "" |
613 |
654 |
614 msgid "" |
655 msgid "" |
615 "bugzilla.style\n" |
656 "bugzilla.style\n" |
616 " The style file to use when formatting comments." |
657 " The style file to use when formatting comments." |
617 msgstr "" |
658 msgstr "" |
1029 |
1074 |
1030 #, python-format |
1075 #, python-format |
1031 msgid "cannot find bugzilla user id for %s or %s" |
1076 msgid "cannot find bugzilla user id for %s or %s" |
1032 msgstr "Kann keine Bugzilla Benutzer-ID für %s oder %s finden" |
1077 msgstr "Kann keine Bugzilla Benutzer-ID für %s oder %s finden" |
1033 |
1078 |
|
1079 msgid "Bugzilla/MySQL cannot update bug state\n" |
|
1080 msgstr "" |
|
1081 |
|
1082 msgid "Bugzilla/XMLRPC needs Bugzilla 4.0 or later to mark bugs fixed\n" |
|
1083 msgstr "" |
|
1084 |
1034 msgid "configuration 'bzemail' missing" |
1085 msgid "configuration 'bzemail' missing" |
1035 msgstr "Konfiguration für 'bzemail' fehlt" |
1086 msgstr "Konfiguration für 'bzemail' fehlt" |
1036 |
1087 |
1037 #, python-format |
1088 #, python-format |
1038 msgid "default bugzilla user %s email not found" |
1089 msgid "default bugzilla user %s email not found" |
1039 msgstr "Standard Bugzilla-Benutzer %s Email nicht gefunden" |
1090 msgstr "Standard Bugzilla-Benutzer %s Email nicht gefunden" |
1040 |
1091 |
1041 #, python-format |
1092 #, python-format |
1042 msgid "bugzilla version %s not supported" |
1093 msgid "bugzilla version %s not supported" |
1043 msgstr "Bugzilla-Version %s wird nicht unterstützt" |
1094 msgstr "Bugzilla-Version %s wird nicht unterstützt" |
|
1095 |
|
1096 #, python-format |
|
1097 msgid "%s: invalid hours\n" |
|
1098 msgstr "%s: Ungültige Stunden\n" |
1044 |
1099 |
1045 msgid "" |
1100 msgid "" |
1046 "changeset {node|short} in repo {root} refers to bug {bug}.\n" |
1101 "changeset {node|short} in repo {root} refers to bug {bug}.\n" |
1047 "details:\n" |
1102 "details:\n" |
1048 "\t{desc|tabindent}" |
1103 "\t{desc|tabindent}" |
2873 msgid "" |
2963 msgid "" |
2874 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" |
2964 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" |
2875 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" |
2965 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" |
2876 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" |
2966 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" |
2877 " # your .vimrc\n" |
2967 " # your .vimrc\n" |
2878 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" |
2968 " vimdiff = gvim -f \"+next\" \\\n" |
2879 msgstr "" |
2969 " \"+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))\"" |
2880 " # Fügt Kommando \"vimdiff\" hinzu, welches gvimdiff mit dem DirDiff " |
2970 msgstr "" |
|
2971 " # Fügt Kommando \"vimdiff\" hinzu, welches gvimdiff mit dem DirDiff-" |
2881 "Plugin\n" |
2972 "Plugin\n" |
2882 " # ausführt. (http://www.vim.org/scripts/script.php?script_id=102).\n" |
2973 " # ausführt. (http://www.vim.org/scripts/script.php?script_id=102).\n" |
2883 " # Die .vimrc sollte dazu \"let g:DirDiffDynamicDiffText = 1\" enthalten.\n" |
2974 " # Die .vimrc sollte dazu \"let g:DirDiffDynamicDiffText = 1\" enthalten.\n" |
2884 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" |
2975 " vimdiff = gvim -f \"+next\" \\\n" |
|
2976 " \"+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))\"" |
2885 |
2977 |
2886 msgid "Tool arguments can include variables that are expanded at runtime::" |
2978 msgid "Tool arguments can include variables that are expanded at runtime::" |
2887 msgstr "" |
2979 msgstr "" |
2888 "Die Argumente der Werkzeuge können Variablen enthalten, die zur Laufzeit\n" |
2980 "Die Argumente der Werkzeuge können Variablen enthalten, die zur Laufzeit\n" |
2889 "ersetzt werden::" |
2981 "ersetzt werden::" |
3022 |
3114 |
3023 #, python-format |
3115 #, python-format |
3024 msgid "hg %s [OPTION]... [FILE]..." |
3116 msgid "hg %s [OPTION]... [FILE]..." |
3025 msgstr "hg %s [OPTION]... [DATEI]..." |
3117 msgstr "hg %s [OPTION]... [DATEI]..." |
3026 |
3118 |
3027 msgid "pull, update and merge in one command" |
3119 msgid "http authentication with factotum" |
3028 msgstr "" |
3120 msgstr "" |
3029 "Abrufen, Aktualisieren und Zusammenführen in einem Befehl zusammengefasst" |
3121 |
|
3122 msgid "" |
|
3123 "This extension allows the factotum(4) facility on Plan 9 from Bell Labs\n" |
|
3124 "platforms to provide authentication information for HTTP access. " |
|
3125 "Configuration\n" |
|
3126 "entries specified in the auth section as well as authentication information\n" |
|
3127 "provided in the repository URL are fully supported. If no prefix is " |
|
3128 "specified,\n" |
|
3129 "a value of \"*\" will be assumed." |
|
3130 msgstr "" |
|
3131 |
|
3132 msgid "By default, keys are specified as::" |
|
3133 msgstr "" |
|
3134 |
|
3135 msgid "" |
|
3136 " proto=pass service=hg prefix=<prefix> user=<username> !password=<password>" |
|
3137 msgstr "" |
|
3138 |
|
3139 msgid "" |
|
3140 "If the factotum extension is unable to read the required key, one will be\n" |
|
3141 "requested interactively." |
|
3142 msgstr "" |
|
3143 |
|
3144 msgid "" |
|
3145 "A configuration section is available to customize runtime behavior. By\n" |
|
3146 "default, these entries are::" |
|
3147 msgstr "" |
|
3148 |
|
3149 msgid "" |
|
3150 " [factotum]\n" |
|
3151 " executable = /bin/auth/factotum\n" |
|
3152 " mountpoint = /mnt/factotum\n" |
|
3153 " service = hg" |
|
3154 msgstr "" |
|
3155 |
|
3156 msgid "" |
|
3157 "The executable entry defines the full path to the factotum binary. The\n" |
|
3158 "mountpoint entry defines the path to the factotum file service. Lastly, the\n" |
|
3159 "service entry controls the service name used when reading keys." |
|
3160 msgstr "" |
|
3161 |
|
3162 msgid "factotum not interactive" |
|
3163 msgstr "" |
|
3164 |
|
3165 msgid "factotum not responding" |
|
3166 msgstr "" |
|
3167 |
|
3168 msgid "pull, update and merge in one command (DEPRECATED)" |
|
3169 msgstr "" |
|
3170 "Abrufen, Aktualisieren und Zusammenführen in einem Befehl zusammengefasst " |
|
3171 "(VERALTET)" |
3030 |
3172 |
3031 msgid "pull changes from a remote repository, merge new changes if needed." |
3173 msgid "pull changes from a remote repository, merge new changes if needed." |
3032 msgstr "" |
3174 msgstr "" |
3033 "Ruft Änderungen aus einem entfernten Projektarchiv ab und führt sie, falls " |
3175 "Ruft Änderungen aus einem entfernten Projektarchiv ab und führt sie, falls " |
3034 "nötig, zusammen." |
3176 "nötig, zusammen." |
3050 " dieser Kopf automatisch zusammengeführt und das Resultat als neue\n" |
3192 " dieser Kopf automatisch zusammengeführt und das Resultat als neue\n" |
3051 " Revision übernommen. Andernfalls wird das Arbeitsverzeichnis mit den\n" |
3193 " Revision übernommen. Andernfalls wird das Arbeitsverzeichnis mit den\n" |
3052 " neue Änderungen aktualisiert." |
3194 " neue Änderungen aktualisiert." |
3053 |
3195 |
3054 msgid "" |
3196 msgid "" |
3055 " When a merge occurs, the newly pulled changes are assumed to be\n" |
3197 " When a merge is needed, the working directory is first updated to\n" |
3056 " \"authoritative\". The head of the new changes is used as the first\n" |
3198 " the newly pulled changes. Local changes are then merged into the\n" |
3057 " parent, with local changes as the second. To switch the merge\n" |
3199 " pulled changes. To switch the merge order, use --switch-parent." |
3058 " order, use --switch-parent." |
3200 msgstr "" |
3059 msgstr "" |
3201 " Wenn eine Zusammenführung benötigt wird, wird zunächst das\n" |
3060 " Sollte eine Zusammenführung ausgelöst werden, gelten die neu geholten\n" |
3202 " Arbeitsverzeichnis auf die neuen Änderungen aktualisiert.\n" |
3061 " Änderungen als \"führend\"· Der Kopf der neuen Änderungen wird als\n" |
3203 " Lokale Änderungen werden dann mit den heruntergeladenen\n" |
3062 " erste Vorgängerversion genutzt, die lokalen Änderungen darauffolgend.\n" |
3204 " zusammengeführt. Um die Reihenfolge zu ändern, benutzen Sie\n" |
3063 " Um die Reihenfolge der Zusammenführung zu ändern kann --switch-parent\n" |
3205 " --switch-parent." |
3064 " genutzt werden." |
|
3065 |
3206 |
3066 msgid " See :hg:`help dates` for a list of formats valid for -d/--date." |
3207 msgid " See :hg:`help dates` for a list of formats valid for -d/--date." |
3067 msgstr "" |
3208 msgstr "" |
3068 " Siehe :hg:`help dates` für eine Liste gültiger Formate für -d/--date." |
3209 " Siehe :hg:`help dates` für eine Liste gültiger Formate für -d/--date." |
3069 |
3210 |
3259 |
3400 |
3260 #, python-format |
3401 #, python-format |
3261 msgid "-G/--graph option is incompatible with --%s" |
3402 msgid "-G/--graph option is incompatible with --%s" |
3262 msgstr "Option -G/--graph ist inkompatibel zu --%s" |
3403 msgstr "Option -G/--graph ist inkompatibel zu --%s" |
3263 |
3404 |
3264 msgid "-G/--graph option is incompatible with --follow with file argument" |
3405 #, python-format |
3265 msgstr "Option -G/--graph ist inkompatibel zu --follow mit Dateiparameter" |
3406 msgid "cannot follow file not in parent revision: \"%s\"" |
3266 |
3407 msgstr "Kann in Vorgängerrevision fehlender Datei nicht folgen: \"%s\"" |
3267 msgid "NUM" |
3408 |
3268 msgstr "NUM" |
3409 #, python-format |
3269 |
3410 msgid "cannot follow nonexistent file: \"%s\"" |
3270 msgid "limit number of changes displayed" |
3411 msgstr "Kann fehlender Datei nicht folgen: \"%s\"" |
3271 msgstr "Begrenzt die Anzahl der angezeigten Änderungen" |
3412 |
3272 |
3413 msgid "can only follow copies/renames for explicit filenames" |
3273 msgid "show patch" |
3414 msgstr "" |
3274 msgstr "Patch anzeigen" |
3415 "Kopien/Umbenennungen können nur zu expliziten Dateinamen verfolgt werden" |
|
3416 |
|
3417 msgid "follow changeset history, or file history across copies and renames" |
|
3418 msgstr "" |
|
3419 "Folgt der Versionshistorie oder Dateihistorie über Kopien und Umbenennungen " |
|
3420 "hinweg" |
|
3421 |
|
3422 msgid "only follow the first parent of merge changesets (DEPRECATED)" |
|
3423 msgstr "Folgt nur dem ersten Vorgänger von Zusammenführungen (VERALTET)" |
|
3424 |
|
3425 msgid "show revisions matching date spec" |
|
3426 msgstr "Zeigt Revisionen passend zur Datums-Spezifikation" |
|
3427 |
|
3428 msgid "show copied files" |
|
3429 msgstr "Zeigt kopierte Dateien" |
|
3430 |
|
3431 msgid "do case-insensitive search for a given text" |
|
3432 msgstr "Sucht ein Stichwort unabhängig von Groß- und Kleinschreibung" |
3275 |
3433 |
3276 msgid "show the specified revision or range" |
3434 msgid "show the specified revision or range" |
3277 msgstr "Zeigt die angegebene Revision oder den Bereich" |
3435 msgstr "Zeigt die angegebene Revision oder den Bereich" |
3278 |
3436 |
3279 msgid "hg glog [OPTION]... [FILE]" |
3437 msgid "include revisions where files were removed" |
3280 msgstr "hg glog [OPTION]... [DATEI]" |
3438 msgstr "Revisionen einschließen, in denen Dateien entfernt wurden" |
|
3439 |
|
3440 msgid "show only merges (DEPRECATED)" |
|
3441 msgstr "Zeigt nur Zusammenführungen (VERALTET)" |
|
3442 |
|
3443 msgid "USER" |
|
3444 msgstr "BENUTZER" |
|
3445 |
|
3446 msgid "revisions committed by user" |
|
3447 msgstr "Revisionen vom Nutzer" |
|
3448 |
|
3449 msgid "show only changesets within the given named branch (DEPRECATED)" |
|
3450 msgstr "Zeigt nur Änderungssätze innerhalb des angegebenen Zweigs (VERALTET)" |
|
3451 |
|
3452 msgid "BRANCH" |
|
3453 msgstr "" |
|
3454 |
|
3455 msgid "show changesets within the given named branch" |
|
3456 msgstr "Zeigt nur Änderungssätze innerhalb des angegebenen Zweigs" |
|
3457 |
|
3458 msgid "do not display revision or any of its ancestors" |
|
3459 msgstr "Gibt weder diese Revision noch ihre Vorgänger aus" |
|
3460 |
|
3461 msgid "show hidden changesets (DEPRECATED)" |
|
3462 msgstr "Zeigt versteckte Änderungssätze (VERALTET)" |
|
3463 |
|
3464 msgid "[OPTION]... [FILE]" |
|
3465 msgstr "[OPTION]... [DATEI]" |
3281 |
3466 |
3282 msgid "show revision history alongside an ASCII revision graph" |
3467 msgid "show revision history alongside an ASCII revision graph" |
3283 msgstr "Zeigt die Revisionshistorie zusammen mit einem ASCII Revisionsgraphen" |
3468 msgstr "Zeigt die Revisionshistorie zusammen mit einem ASCII Revisionsgraphen" |
3284 |
3469 |
3285 msgid "" |
3470 msgid "" |
4370 |
4561 |
4371 #, python-format |
4562 #, python-format |
4372 msgid "largefile %s missing from store (needs to be uploaded)" |
4563 msgid "largefile %s missing from store (needs to be uploaded)" |
4373 msgstr "Binärriese %s fehlt im Lager (muss hochgeladen werden)" |
4564 msgstr "Binärriese %s fehlt im Lager (muss hochgeladen werden)" |
4374 |
4565 |
|
4566 #, python-format |
|
4567 msgid "%d additional largefiles cached\n" |
|
4568 msgstr "%d zusätzliche Binärriesen in den Zwischenspeicher geladen\n" |
|
4569 |
|
4570 #, python-format |
|
4571 msgid "%d largefiles failed to download\n" |
|
4572 msgstr "%d Binärriesen konnten nicht heruntergeladen werden\n" |
|
4573 |
4375 msgid "getting changed largefiles\n" |
4574 msgid "getting changed largefiles\n" |
4376 msgstr "Lade veränderte Binärriesen herunter\n" |
4575 msgstr "Lade veränderte Binärriesen herunter\n" |
4377 |
4576 |
4378 #, python-format |
4577 #, python-format |
4379 msgid "%d largefiles updated, %d removed\n" |
4578 msgid "%d largefiles updated, %d removed\n" |
4380 msgstr "%d Binärriesen verändert, %d entfernt\n" |
4579 msgstr "%d Binärriesen verändert, %d entfernt\n" |
|
4580 |
|
4581 #, python-format |
|
4582 msgid "largefile %s is not in cache and could not be downloaded" |
|
4583 msgstr "" |
|
4584 "Binärriese %s fehlt im Zwischenspeicher und konnte nicht heruntergeladen " |
|
4585 "werden" |
4381 |
4586 |
4382 msgid "minimum size (MB) for files to be converted as largefiles" |
4587 msgid "minimum size (MB) for files to be converted as largefiles" |
4383 msgstr "" |
4588 msgstr "" |
4384 "Minimale Dateigröße in MB von Dateien, die in Binärriesen konvertiert werden" |
4589 "Minimale Dateigröße in MB von Dateien, die in Binärriesen konvertiert werden" |
4385 |
4590 |
4705 "beibehalten werden. Wenn 'yes' oder 'no' angegeben ist, wird mq die\n" |
4926 "beibehalten werden. Wenn 'yes' oder 'no' angegeben ist, wird mq die\n" |
4706 "Einstellung aus [diff] überschreiben und immer Patches im git- oder im\n" |
4927 "Einstellung aus [diff] überschreiben und immer Patches im git- oder im\n" |
4707 "normal Format erzeugen, wobei bei letzterem ein Datenverlust möglich ist." |
4928 "normal Format erzeugen, wobei bei letzterem ein Datenverlust möglich ist." |
4708 |
4929 |
4709 msgid "" |
4930 msgid "" |
|
4931 "It may be desirable for mq changesets to be kept in the secret phase (see\n" |
|
4932 ":hg:`help phases`), which can be enabled with the following setting::" |
|
4933 msgstr "" |
|
4934 |
|
4935 msgid "" |
|
4936 " [mq]\n" |
|
4937 " secret = True" |
|
4938 msgstr "" |
|
4939 " [mq]\n" |
|
4940 " secret = True" |
|
4941 |
|
4942 msgid "" |
4710 "You will by default be managing a patch queue named \"patches\". You can\n" |
4943 "You will by default be managing a patch queue named \"patches\". You can\n" |
4711 "create other, independent patch queues with the :hg:`qqueue` command.\n" |
4944 "create other, independent patch queues with the :hg:`qqueue` command." |
4712 msgstr "" |
4945 msgstr "" |
4713 "Sie werden standardmäßig einen Patch-Reihe namens \"patches\" verwalten. " |
4946 "Sie werden standardmäßig einen Patch-Reihe namens \"patches\" verwalten. " |
4714 "Sie\n" |
4947 "Sie\n" |
4715 "können andere, unabhängige Warteschlangen mit :hg:`qqueue` erzeugen.\n" |
4948 "können andere, unabhängige Warteschlangen mit :hg:`qqueue` erzeugen." |
|
4949 |
|
4950 msgid "" |
|
4951 "If the working directory contains uncommitted files, qpush, qpop and\n" |
|
4952 "qgoto abort immediately. If -f/--force is used, the changes are\n" |
|
4953 "discarded. Setting::" |
|
4954 msgstr "" |
|
4955 |
|
4956 msgid "" |
|
4957 " [mq]\n" |
|
4958 " keepchanges = True" |
|
4959 msgstr "" |
|
4960 |
|
4961 msgid "" |
|
4962 "make them behave as if --keep-changes were passed, and non-conflicting\n" |
|
4963 "local changes will be tolerated and preserved. If incompatible options\n" |
|
4964 "such as -f/--force or --exact are passed, this setting is ignored.\n" |
|
4965 msgstr "" |
4716 |
4966 |
4717 msgid "print first line of patch header" |
4967 msgid "print first line of patch header" |
4718 msgstr "Gibt die erste Zeile eines Patch-Kopfes aus" |
4968 msgstr "Gibt die erste Zeile eines Patch-Kopfes aus" |
4719 |
4969 |
4720 #, python-format |
4970 #, python-format |
5396 msgstr "Gibt den Namen des aktuellen Patches aus" |
5666 msgstr "Gibt den Namen des aktuellen Patches aus" |
5397 |
5667 |
5398 msgid "hg qnext [-s]" |
5668 msgid "hg qnext [-s]" |
5399 msgstr "hg qnext [-s]" |
5669 msgstr "hg qnext [-s]" |
5400 |
5670 |
5401 msgid "print the name of the next patch" |
5671 msgid "print the name of the next pushable patch" |
5402 msgstr "Gibt den Namen des nächsten Patches aus" |
5672 msgstr "Gibt den Namen des nächsten übertragbaren Patches aus" |
5403 |
5673 |
5404 msgid "hg qprev [-s]" |
5674 msgid "hg qprev [-s]" |
5405 msgstr "hg qprev [-s]" |
5675 msgstr "hg qprev [-s]" |
5406 |
5676 |
5407 msgid "print the name of the previous patch" |
5677 msgid "print the name of the preceding applied patch" |
5408 msgstr "Gibt den Name des vorherigen Patches aus" |
5678 msgstr "Gibt den Namen des letzten angewendeten Patches aus" |
5409 |
5679 |
5410 msgid "import uncommitted changes (DEPRECATED)" |
5680 msgid "import uncommitted changes (DEPRECATED)" |
5411 msgstr "Importiere ungespeicherte Änderungen (VERALTET)" |
5681 msgstr "Importiere ungespeicherte Änderungen (VERALTET)" |
5412 |
5682 |
5413 msgid "add \"From: <current user>\" to patch" |
5683 msgid "add \"From: <current user>\" to patch" |
5414 msgstr "Fügt \"From: <aktueller Benutzer>\" zum Patch hinzu" |
5684 msgstr "Fügt \"From: <aktueller Benutzer>\" zum Patch hinzu" |
5415 |
|
5416 msgid "USER" |
|
5417 msgstr "BENUTZER" |
|
5418 |
5685 |
5419 msgid "add \"From: <USER>\" to patch" |
5686 msgid "add \"From: <USER>\" to patch" |
5420 msgstr "Fügt \"From: <BENUTZER>\" zum Patch hinzu" |
5687 msgstr "Fügt \"From: <BENUTZER>\" zum Patch hinzu" |
5421 |
5688 |
5422 msgid "add \"Date: <current date>\" to patch" |
5689 msgid "add \"Date: <current date>\" to patch" |
5780 |
6053 |
5781 msgid "pop the current patch off the stack" |
6054 msgid "pop the current patch off the stack" |
5782 msgstr "Holt den aktuellen Patch vom Stapel herunter" |
6055 msgstr "Holt den aktuellen Patch vom Stapel herunter" |
5783 |
6056 |
5784 msgid "" |
6057 msgid "" |
5785 " By default, pops off the top of the patch stack. If given a patch\n" |
6058 " Without argument, pops off the top of the patch stack. If given a\n" |
5786 " name, keeps popping off patches until the named patch is at the\n" |
6059 " patch name, keeps popping off patches until the named patch is at\n" |
5787 " top of the stack." |
6060 " the top of the stack." |
5788 msgstr "" |
6061 msgstr "" |
5789 " Standardmäßig wird der oberste Patch vom Stapel genommen. Wenn ein\n" |
6062 " Ohne Argumente wird der oberste Patch vom Stapel genommen. Wenn ein\n" |
5790 " Patchname angegeben ist, wird solange vom Stapel heruntergenommen, bis\n" |
6063 " Patch-Name angegeben ist, wird solange vom Stapel heruntergenommen, bis\n" |
5791 " der angegebene Patch der oberste ist." |
6064 " der angegebene Patch der oberste ist." |
|
6065 |
|
6066 msgid "" |
|
6067 " By default, abort if the working directory contains uncommitted\n" |
|
6068 " changes. With --keep-changes, abort only if the uncommitted files\n" |
|
6069 " overlap with patched files. With -f/--force, backup and discard\n" |
|
6070 " changes made to such files." |
|
6071 msgstr "" |
5792 |
6072 |
5793 #, python-format |
6073 #, python-format |
5794 msgid "using patch queue: %s\n" |
6074 msgid "using patch queue: %s\n" |
5795 msgstr "Benutzer Patch-Reihe: %s\n" |
6075 msgstr "Benutzer Patch-Reihe: %s\n" |
5796 |
6076 |
5877 msgstr "Keine Sicherheitskopien" |
6157 msgstr "Keine Sicherheitskopien" |
5878 |
6158 |
5879 msgid "no backups (DEPRECATED)" |
6159 msgid "no backups (DEPRECATED)" |
5880 msgstr "Keine Sicherheitskopien (VERALTET)" |
6160 msgstr "Keine Sicherheitskopien (VERALTET)" |
5881 |
6161 |
|
6162 msgid "ignored (DEPRECATED)" |
|
6163 msgstr "ignorieren (VERALTET)" |
|
6164 |
5882 msgid "do not modify working copy during strip" |
6165 msgid "do not modify working copy during strip" |
5883 msgstr "ändern Sie nicht die Working Copy während des strip Vorgangs" |
6166 msgstr "ändern Sie nicht die Working Copy während des strip Vorgangs" |
5884 |
6167 |
5885 msgid "hg strip [-k] [-f] [-n] REV..." |
6168 #, fuzzy |
5886 msgstr "hg strip [-k] [-f] [-n] REV..." |
6169 msgid "remove revs only reachable from given bookmark" |
|
6170 msgstr "" |
|
6171 "Entfernt Revisionen, die nur vom angegebenen Lesezeichen aus erreichbar sind" |
|
6172 |
|
6173 msgid "hg strip [-k] [-f] [-n] [-B bookmark] REV..." |
|
6174 msgstr "hg strip [-k] [-f] [-n] [-B Lesezeichen] REV..." |
5887 |
6175 |
5888 msgid "strip changesets and all their descendants from the repository" |
6176 msgid "strip changesets and all their descendants from the repository" |
5889 msgstr "Entfernt Änderungssätze und alle Nachfahren aus dem Projektarchiv" |
6177 msgstr "Entfernt Änderungssätze und alle Nachfahren aus dem Projektarchiv" |
5890 |
6178 |
5891 msgid "" |
6179 msgid "" |
6270 "wannimmer Änderungssätze übertragen werden. Dies kann von der über-\n" |
6566 "wannimmer Änderungssätze übertragen werden. Dies kann von der über-\n" |
6271 "tragenden oder der empfangenden Seite aus geschehen." |
6567 "tragenden oder der empfangenden Seite aus geschehen." |
6272 |
6568 |
6273 msgid "" |
6569 msgid "" |
6274 "First, enable the extension as explained in :hg:`help extensions`, and\n" |
6570 "First, enable the extension as explained in :hg:`help extensions`, and\n" |
6275 "register the hook you want to run. ``incoming`` and ``outgoing`` hooks\n" |
6571 "register the hook you want to run. ``incoming`` and ``changegroup`` hooks\n" |
6276 "are run by the changesets receiver while the ``outgoing`` one is for\n" |
6572 "are run by the changesets receiver while the ``outgoing`` one is for\n" |
6277 "the sender::" |
6573 "the sender::" |
6278 msgstr "" |
6574 msgstr "" |
6279 "Zunächst muss die Erweiterung (wie in :hg:`help extensions` beschrieben)\n" |
6575 "Zunächst muss die Erweiterung aktiviert werden \n" |
6280 "aktiviert werden und dann als Hook registriert werden. Für den Empfänger\n" |
6576 "(wie in :hg:`help extensions` beschrieben) und dann \n" |
6281 "sind dies die ``incoming`` und ``outgoing`` Hooks, für den Sender der\n" |
6577 "als Hook registriert werden.Die ``incoming``- und ``changegroup``-Hooks " |
6282 "``outgoing`` Hook::" |
6578 "werden\n" |
|
6579 "vom Änderungssatz-Empfänger ausgeführt, der\n" |
|
6580 "``outgoing``-Hook ist für den Sender::" |
6283 |
6581 |
6284 msgid "" |
6582 msgid "" |
6285 " [hooks]\n" |
6583 " [hooks]\n" |
6286 " # one email for each incoming changeset\n" |
6584 " # one email for each incoming changeset\n" |
6287 " incoming.notify = python:hgext.notify.hook\n" |
6585 " incoming.notify = python:hgext.notify.hook\n" |
6872 |
7158 |
6873 msgid "" |
7159 msgid "" |
6874 " By default the patch is included as text in the email body for\n" |
7160 " By default the patch is included as text in the email body for\n" |
6875 " easy reviewing. Using the -a/--attach option will instead create\n" |
7161 " easy reviewing. Using the -a/--attach option will instead create\n" |
6876 " an attachment for the patch. With -i/--inline an inline attachment\n" |
7162 " an attachment for the patch. With -i/--inline an inline attachment\n" |
6877 " will be created." |
7163 " will be created. You can include a patch both as text in the email\n" |
6878 msgstr "" |
7164 " body and as a regular or an inline attachment by combining the\n" |
6879 " Standardmäßig ist der Patch direkt im Text der Email enthalten. Mit dem\n" |
7165 " -a/--attach or -i/--inline with the --body option." |
6880 " Schalter -a/--attach wird er in einen Anhang verlegt. Der Schalter\n" |
7166 msgstr "" |
6881 " -i/--inline erzeugt einen inline-Anhang." |
7167 " Standardmäßig ist der Patch direkt im Text der Email enthalten,\n" |
|
7168 " damit er leicht überprüft werden kann. Mit dem Schalter\n" |
|
7169 " -a/--attach stattdessen ein Anhang für den Patch erzeugt.\n" |
|
7170 " Der Schalter -i/--inline erzeugt einen Inline-Anhang. Ein Patch\n" |
|
7171 " kann sowohl als Nachrichtentext als auch als normaler oder \n" |
|
7172 " Inline-Anhang eingebunden werden, indem die Schalter\n" |
|
7173 " -a/--attach und -i/--inline mit dem --body - Schalter\n" |
|
7174 " kombiniert werden." |
6882 |
7175 |
6883 msgid "" |
7176 msgid "" |
6884 " With -o/--outgoing, emails will be generated for patches not found\n" |
7177 " With -o/--outgoing, emails will be generated for patches not found\n" |
6885 " in the destination repository (or only those which are ancestors\n" |
7178 " in the destination repository (or only those which are ancestors\n" |
6886 " of the specified revisions if any are provided)" |
7179 " of the specified revisions if any are provided)" |
7558 |
7856 |
7559 #, python-format |
7857 #, python-format |
7560 msgid "%d hunks, %d lines changed\n" |
7858 msgid "%d hunks, %d lines changed\n" |
7561 msgstr "%d Hunks, %d Zeilen geändert\n" |
7859 msgstr "%d Hunks, %d Zeilen geändert\n" |
7562 |
7860 |
7563 msgid "[Ynsfdaq?]" |
7861 #, fuzzy |
|
7862 msgid "[Ynesfdaq?]" |
7564 msgstr "[Jnsdfab?]" |
7863 msgstr "[Jnsdfab?]" |
7565 |
7864 |
7566 msgid "&Yes, record this change" |
7865 msgid "&Yes, record this change" |
7567 msgstr "&Ja - übernimmt diese Änderung" |
7866 msgstr "&Ja - übernimmt diese Änderung" |
7568 |
7867 |
7569 msgid "&No, skip this change" |
7868 msgid "&No, skip this change" |
7570 msgstr "&Nein, überspringt diese Änderung" |
7869 msgstr "&Nein, überspringt diese Änderung" |
7571 |
7870 |
|
7871 msgid "&Edit the change manually" |
|
7872 msgstr "Änderung manuell &bearbeiten" |
|
7873 |
7572 msgid "&Skip remaining changes to this file" |
7874 msgid "&Skip remaining changes to this file" |
7573 msgstr "Über&springe die restlichen Änderungen an dieser Datei" |
7875 msgstr "Über&springe die restlichen Änderungen an dieser Datei" |
7574 |
7876 |
7575 msgid "Record remaining changes to this &file" |
7877 msgid "Record remaining changes to this &file" |
7576 msgstr "Zeichne die restlichen Änderungen an dieser &Datei auf" |
7878 msgstr "Zeichne die restlichen Änderungen an dieser &Datei auf" |
8522 |
8863 |
8523 msgid "revision matching date not found" |
8864 msgid "revision matching date not found" |
8524 msgstr "Keine zum Datum passende Revision gefunden" |
8865 msgstr "Keine zum Datum passende Revision gefunden" |
8525 |
8866 |
8526 #, python-format |
8867 #, python-format |
8527 msgid "cannot follow nonexistent file: \"%s\"" |
|
8528 msgstr "Kann fehlender Datei nicht folgen: \"%s\"" |
|
8529 |
|
8530 msgid "can only follow copies/renames for explicit filenames" |
|
8531 msgstr "" |
|
8532 "Kopien/Umbenennungen können nur zu expliziten Dateinamen verfolgt werden" |
|
8533 |
|
8534 #, python-format |
|
8535 msgid "adding %s\n" |
8868 msgid "adding %s\n" |
8536 msgstr "Füge %s hinzu\n" |
8869 msgstr "Füge %s hinzu\n" |
8537 |
8870 |
8538 #, python-format |
8871 #, python-format |
8539 msgid "skipping missing subrepository: %s\n" |
8872 msgid "skipping missing subrepository: %s\n" |
8540 msgstr "Überspringe fehlendes Unterarchiv: %s\n" |
8873 msgstr "Überspringe fehlendes Unterarchiv: %s\n" |
8541 |
8874 |
|
8875 #, python-format |
|
8876 msgid "amending changeset %s\n" |
|
8877 msgstr "Berichtigt Änderungssatz %s\n" |
|
8878 |
|
8879 #, python-format |
|
8880 msgid "copying changeset %s to %s\n" |
|
8881 msgstr "Kopiert Änderungssatz %s nach %s\n" |
|
8882 |
|
8883 #, python-format |
|
8884 msgid "stripping intermediate changeset %s\n" |
|
8885 msgstr "Entfernt intermediären Änderungssatz %s\n" |
|
8886 |
|
8887 #, python-format |
|
8888 msgid "stripping amended changeset %s\n" |
|
8889 msgstr "Entfernt berichtigten Änderungssatz %s\n" |
|
8890 |
8542 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." |
8891 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." |
8543 msgstr "" |
8892 msgstr "" |
8544 "HG: Bitte gib eine Versions-Meldung ein. Zeilen beginnend mit 'HG:' werden" |
8893 "HG: Bitte gib eine Versions-Meldung ein. Zeilen beginnend mit 'HG:' werden" |
8545 |
8894 |
8546 msgid "HG: Leave message empty to abort commit." |
8895 msgid "HG: Leave message empty to abort commit." |
8794 " parameter greater than 0, this compares every removed file with\n" |
9165 " parameter greater than 0, this compares every removed file with\n" |
8795 " every added file and records those similar enough as renames. This\n" |
9166 " every added file and records those similar enough as renames. This\n" |
8796 " option takes a percentage between 0 (disabled) and 100 (files must\n" |
9167 " option takes a percentage between 0 (disabled) and 100 (files must\n" |
8797 " be identical) as its parameter. Detecting renamed files this way\n" |
9168 " be identical) as its parameter. Detecting renamed files this way\n" |
8798 " can be expensive. After using this option, :hg:`status -C` can be\n" |
9169 " can be expensive. After using this option, :hg:`status -C` can be\n" |
8799 " used to check which files were identified as moved or renamed." |
9170 " used to check which files were identified as moved or renamed.\n" |
8800 msgstr "" |
9171 " If this option is not specified, only renames of identical files\n" |
8801 " Nutze die Option -s/--similarity um umbenannte Dateien zu entdecken.\n" |
9172 " are detected." |
|
9173 msgstr "" |
|
9174 " Nutze die Option -s/--similarity, um umbenannte Dateien zu entdecken.\n" |
8802 " Mit einem Parameter größer 0 wird jede gelöschte Datei mit jeder\n" |
9175 " Mit einem Parameter größer 0 wird jede gelöschte Datei mit jeder\n" |
8803 " hinzugefügten verglichen und bei genügender Ähnlichkeit als Umbenennung\n" |
9176 " hinzugefügten verglichen und bei genügender Ähnlichkeit als Umbenennung\n" |
8804 " markiert. Diese Option erwartet eine Prozentangabe zwischen 0\n" |
9177 " markiert. Diese Option erwartet eine Prozentangabe zwischen 0\n" |
8805 " (deaktiviert) und 100 (Dateien müssen identisch sein) als Parameter.\n" |
9178 " (deaktiviert) und 100 (Dateien müssen identisch sein) als Parameter.\n" |
8806 " Umbenennungen auf diese Weise zu erkennen, kann aufwändig sein." |
9179 " Umbenennungen auf diese Weise zu erkennen, kann aufwändig sein.\n" |
|
9180 " Nachdem Benutzung dieser Option kann :hg:`status -C` verwendet\n" |
|
9181 " werden, um zu überprüfen, welche Dateien als verschoben oder\n" |
|
9182 " umbenannt erkannt wurden. Wenn diese Option nicht angegeben\n" |
|
9183 " ist, werden nur Umbenennungen identischer Dateien erkannt." |
8807 |
9184 |
8808 msgid "similarity must be a number" |
9185 msgid "similarity must be a number" |
8809 msgstr "similarity muss eine Zahl sein" |
9186 msgstr "similarity muss eine Zahl sein" |
8810 |
9187 |
8811 msgid "similarity must be between 0 and 100" |
9188 msgid "similarity must be between 0 and 100" |
9103 " bringen (es sei denn, die Option -U/--noupdate ist angegeben). Nachdem\n" |
9476 " bringen (es sei denn, die Option -U/--noupdate ist angegeben). Nachdem\n" |
9104 " der Test ausgeführt wurde, muss diese Revision als gut oder schlecht\n" |
9477 " der Test ausgeführt wurde, muss diese Revision als gut oder schlecht\n" |
9105 " markiert werden. Bisect wird dann zur nächsten Revision wechseln oder\n" |
9478 " markiert werden. Bisect wird dann zur nächsten Revision wechseln oder\n" |
9106 " das Ziel (die erste schlechte Revision) melden." |
9479 " das Ziel (die erste schlechte Revision) melden." |
9107 |
9480 |
|
9481 #, fuzzy |
9108 msgid "" |
9482 msgid "" |
9109 " If you supply a command, it will be used for automatic bisection.\n" |
9483 " If you supply a command, it will be used for automatic bisection.\n" |
9110 " Its exit status will be used to mark revisions as good or bad:\n" |
9484 " The environment variable HG_NODE will contain the ID of the\n" |
9111 " status 0 means good, 125 means to skip the revision, 127\n" |
9485 " changeset being tested. The exit status of the command will be\n" |
9112 " (command not found) will abort the bisection, and any other\n" |
9486 " used to mark revisions as good or bad: status 0 means good, 125\n" |
9113 " non-zero exit status means the revision is bad." |
9487 " means to skip the revision, 127 (command not found) will abort the\n" |
9114 msgstr "" |
9488 " bisection, and any other non-zero exit status means the revision\n" |
9115 " Die Markierung kann automatisch durch einem Testprogramm stattfinden.\n" |
9489 " is bad." |
9116 " Ein Rückgabewert von 0 bedeutet dabei Erfolg, 125 Überspringen, 127\n" |
9490 msgstr "" |
9117 " (Kommando nicht gefunden) Abbruch und jeder andere positive Wert Fehler." |
9491 " Wenn ein Kommando angegen wurde, wird es für eine automatische\n" |
|
9492 " Bisektion verwendet. Die Umgebungsvariable HG_NODE wird die ID\n" |
|
9493 " des gerade getesteten Änderungssatz enthalten. Der Exit-Status des\n" |
|
9494 " Kommandos wird verwendet, um Revisionen als gut oder schlecht zu\n" |
|
9495 " markieren: 0 bedeutet gut, 125 bedeutet überspringen, 127\n" |
|
9496 " (Kommando nicht gefunden) bedeutet Abbruch der Bisektion und\n" |
|
9497 " jeder andere von Null verschiedene Exit-Status bedeutet, dass die\n" |
|
9498 " Revision schlecht ist." |
9118 |
9499 |
9119 msgid " Some examples:" |
9500 msgid " Some examples:" |
9120 msgstr " Einige Beispiele:" |
9501 msgstr " Einige Beispiele:" |
9121 |
9502 |
9122 msgid "" |
9503 msgid "" |
9257 msgstr "Löscht ein gegebenes Lesezeichen" |
9652 msgstr "Löscht ein gegebenes Lesezeichen" |
9258 |
9653 |
9259 msgid "rename a given bookmark" |
9654 msgid "rename a given bookmark" |
9260 msgstr "Benennt ein gegebenes Lesezeichen um" |
9655 msgstr "Benennt ein gegebenes Lesezeichen um" |
9261 |
9656 |
9262 msgid "do not mark a new bookmark active" |
9657 msgid "mark a bookmark inactive" |
9263 msgstr "" |
9658 msgstr "" |
9264 |
9659 |
9265 msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]" |
9660 msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]" |
9266 msgstr "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]" |
9661 msgstr "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]" |
9267 |
9662 |
9268 msgid "track a line of development with movable markers" |
9663 msgid "track a line of development with movable markers" |
9269 msgstr "Folgt einem Entwicklungsstrang mit einer beweglichen Markierung" |
9664 msgstr "Folgt einem Entwicklungsstrang mit einer beweglichen Markierung" |
9270 |
9665 |
9271 #, fuzzy |
|
9272 msgid "" |
9666 msgid "" |
9273 " Bookmarks are pointers to certain commits that move when committing.\n" |
9667 " Bookmarks are pointers to certain commits that move when committing.\n" |
9274 " Bookmarks are local. They can be renamed, copied and deleted. It is\n" |
9668 " Bookmarks are local. They can be renamed, copied and deleted. It is\n" |
9275 " possible to use :hg:`merge NAME` to merge from a given bookmark, and\n" |
9669 " possible to use :hg:`merge NAME` to merge from a given bookmark, and\n" |
9276 " :hg:`update NAME` to update to a given bookmark." |
9670 " :hg:`update NAME` to update to a given bookmark." |
9296 msgid "" |
9690 msgid "" |
9297 " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" |
9691 " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" |
9298 " push` and :hg:`help pull`). This requires both the local and remote\n" |
9692 " push` and :hg:`help pull`). This requires both the local and remote\n" |
9299 " repositories to support bookmarks. For versions prior to 1.8, this " |
9693 " repositories to support bookmarks. For versions prior to 1.8, this " |
9300 "means\n" |
9694 "means\n" |
9301 " the bookmarks extension must be enabled.\n" |
9695 " the bookmarks extension must be enabled." |
9302 " " |
9696 msgstr "" |
9303 msgstr "" |
9697 " Lesezeichen können zwischen Mercurial Archiven ausgetauscht werden\n" |
9304 " Lesezeichen können zwischen Mercurial Archiven ausgetauscht werden.\n" |
|
9305 " (siehe :hg:`help push` bzw. :hg:`help pull`). Beide Archive müssen " |
9698 " (siehe :hg:`help push` bzw. :hg:`help pull`). Beide Archive müssen " |
9306 "dafür\n" |
9699 "dafür\n" |
9307 " Lesezeichen unterstützen. Bis Mercurial version 1.8 muss hierfür die\n" |
9700 " Lesezeichen unterstützen. Bis Mercurial version 1.8 muss hierfür die\n" |
9308 " Lesezeichenerweiterung (bookmarks extension) angeschaltet werden.\n" |
9701 " Lesezeichenerweiterung (bookmarks extension) eingeschaltet werden." |
|
9702 |
|
9703 msgid "" |
|
9704 " With -i/--inactive, the new bookmark will not be made the active\n" |
|
9705 " bookmark. If -r/--rev is given, the new bookmark will not be made\n" |
|
9706 " active even if -i/--inactive is not given. If no NAME is given, the\n" |
|
9707 " current active bookmark will be marked inactive.\n" |
9309 " " |
9708 " " |
|
9709 msgstr "" |
9310 |
9710 |
9311 msgid "bookmark name required" |
9711 msgid "bookmark name required" |
9312 msgstr "Ein Name für das Lesezeichen muss übergeben werden" |
9712 msgstr "Ein Name für das Lesezeichen muss übergeben werden" |
9313 |
9713 |
9314 #, python-format |
9714 #, python-format |
9791 " commit fails, you will find a backup of your message in\n" |
10195 " commit fails, you will find a backup of your message in\n" |
9792 " ``.hg/last-message.txt``." |
10196 " ``.hg/last-message.txt``." |
9793 msgstr "" |
10197 msgstr "" |
9794 |
10198 |
9795 msgid "" |
10199 msgid "" |
|
10200 " The --amend flag can be used to amend the parent of the\n" |
|
10201 " working directory with a new commit that contains the changes\n" |
|
10202 " in the parent in addition to those currently reported by :hg:`status`,\n" |
|
10203 " if there are any. The old commit is stored in a backup bundle in\n" |
|
10204 " ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`\n" |
|
10205 " on how to restore it)." |
|
10206 msgstr "" |
|
10207 |
|
10208 msgid "" |
|
10209 " Message, user and date are taken from the amended commit unless\n" |
|
10210 " specified. When a message isn't specified on the command line,\n" |
|
10211 " the editor will open with the message of the amended commit." |
|
10212 msgstr "" |
|
10213 |
|
10214 msgid "" |
|
10215 " It is not possible to amend public changesets (see :hg:`help phases`)\n" |
|
10216 " or changesets that have children." |
|
10217 msgstr "" |
|
10218 |
|
10219 msgid "" |
9796 " Returns 0 on success, 1 if nothing changed.\n" |
10220 " Returns 0 on success, 1 if nothing changed.\n" |
9797 " " |
10221 " " |
9798 msgstr "" |
10222 msgstr "" |
9799 " Gibt 0 bei Erfolg zurück, wenn nichts geändert wurde.\n" |
10223 " Gibt 0 bei Erfolg zurück, wenn nichts geändert wurde.\n" |
9800 " " |
10224 " " |
9801 |
10225 |
9802 msgid "can only close branch heads" |
10226 msgid "can only close branch heads" |
9803 msgstr "Kann nur eindeutige Kopfrevisionen von Zweigen schliessen" |
10227 msgstr "Kann nur eindeutige Kopfrevisionen von Zweigen schliessen" |
9804 |
10228 |
9805 #, python-format |
10229 msgid "cannot amend recursively" |
9806 msgid "nothing changed (%d missing files, see 'hg status')\n" |
10230 msgstr "Es kann nicht rekursiv berichtigt werden" |
9807 msgstr "" |
10231 |
|
10232 msgid "cannot amend public changesets" |
|
10233 msgstr "Öffentliche Änderungssätze können nicht berichtigt werden" |
|
10234 |
|
10235 msgid "cannot amend merge changesets" |
|
10236 msgstr "Zusammenführungen können nicht berichtigt werden" |
|
10237 |
|
10238 msgid "cannot amend while merging" |
|
10239 msgstr "Beim Zusammenführen kann nicht berichtigt werden" |
|
10240 |
|
10241 msgid "cannot amend changeset with children" |
|
10242 msgstr "Kann keine Änderungssätze mit Nachfolgern berichtigen" |
9808 |
10243 |
9809 msgid "nothing changed\n" |
10244 msgid "nothing changed\n" |
9810 msgstr "Keine Änderung\n" |
10245 msgstr "Keine Änderung\n" |
|
10246 |
|
10247 #, python-format |
|
10248 msgid "nothing changed (%d missing files, see 'hg status')\n" |
|
10249 msgstr "" |
9811 |
10250 |
9812 msgid "created new head\n" |
10251 msgid "created new head\n" |
9813 msgstr "neuer Kopf erzeugt\n" |
10252 msgstr "neuer Kopf erzeugt\n" |
9814 |
10253 |
9815 #, python-format |
10254 #, python-format |
10804 " " |
11274 " " |
10805 msgstr "" |
11275 msgstr "" |
10806 " Gibt 0 bei Erfolg zurück.\n" |
11276 " Gibt 0 bei Erfolg zurück.\n" |
10807 " " |
11277 " " |
10808 |
11278 |
10809 msgid "VALUE" |
11279 #, python-format |
10810 msgstr "WERT" |
|
10811 |
|
10812 msgid "DEPRECATED" |
|
10813 msgstr "VERALTET" |
|
10814 |
|
10815 msgid "" |
11280 msgid "" |
10816 "\n" |
11281 "\n" |
10817 "[+] marked option can be specified multiple times\n" |
11282 "aliases: %s\n" |
10818 msgstr "" |
11283 msgstr "" |
10819 "\n" |
11284 "\n" |
10820 "Mit [+] markierte Optionen können mehrfach angegeben werden\n" |
11285 "Aliase: %s\n" |
|
11286 |
|
11287 msgid "(no help text available)" |
|
11288 msgstr "(keine Hilfe verfügbar)" |
|
11289 |
|
11290 #, python-format |
|
11291 msgid "shell alias for::" |
|
11292 msgstr "" |
|
11293 |
|
11294 #, python-format |
|
11295 msgid " %s" |
|
11296 msgstr " %s" |
|
11297 |
|
11298 #, python-format |
|
11299 msgid "alias for: hg %s" |
|
11300 msgstr "Alias für: hg %s" |
|
11301 |
|
11302 #, python-format |
|
11303 msgid "%s" |
|
11304 msgstr "" |
|
11305 |
|
11306 #, python-format |
|
11307 msgid "use \"hg help -e %s\" to show help for the %s extension" |
|
11308 msgstr "" |
|
11309 "Benutzen Sie \"hg -v help %s\" um Hilfe für die Erweitung %s anzuzeigen" |
|
11310 |
|
11311 msgid "options:" |
|
11312 msgstr "Optionen:" |
10821 |
11313 |
10822 msgid "global options:" |
11314 msgid "global options:" |
10823 msgstr "Globale Optionen:" |
11315 msgstr "Globale Optionen:" |
10824 |
11316 |
|
11317 #, python-format |
|
11318 msgid "" |
|
11319 "\n" |
|
11320 "use \"hg help %s\" to show the full help text\n" |
|
11321 msgstr "" |
|
11322 "\n" |
|
11323 "Nutze \"hg help %s\" um den vollen Hilfetext anzuzeigen\n" |
|
11324 |
|
11325 #, python-format |
|
11326 msgid "" |
|
11327 "\n" |
|
11328 "use \"hg -v help %s\" to show more info\n" |
|
11329 msgstr "" |
|
11330 "\n" |
|
11331 "Nutze \"hg -v help %s\" um mehr Informationen anzuzeigen\n" |
|
11332 |
|
11333 msgid "basic commands:" |
|
11334 msgstr "Grundlegende Befehle:" |
|
11335 |
|
11336 msgid "list of commands:" |
|
11337 msgstr "Liste der Befehle:" |
|
11338 |
|
11339 msgid "no commands defined\n" |
|
11340 msgstr "keine Befehle definiert\n" |
|
11341 |
|
11342 msgid "enabled extensions:" |
|
11343 msgstr "Aktive Erweiterungen:" |
|
11344 |
|
11345 msgid "" |
|
11346 "\n" |
|
11347 "additional help topics:" |
|
11348 msgstr "" |
|
11349 "\n" |
|
11350 "Zusätzliche Hilfethemen:" |
|
11351 |
10825 msgid "use \"hg help\" for the full list of commands" |
11352 msgid "use \"hg help\" for the full list of commands" |
10826 msgstr "Nutze \"hg help\" für eine Liste aller Befehle" |
11353 msgstr "Nutze \"hg help\" für eine Liste aller Befehle" |
10827 |
11354 |
10828 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" |
11355 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" |
10829 msgstr "" |
11356 msgstr "" |
10836 #, python-format |
11363 #, python-format |
10837 msgid "use \"hg -v help%s\" to show builtin aliases and global options" |
11364 msgid "use \"hg -v help%s\" to show builtin aliases and global options" |
10838 msgstr "Nutze \"hg -v help%s\" um Aliase und globale Optionen anzuzeigen" |
11365 msgstr "Nutze \"hg -v help%s\" um Aliase und globale Optionen anzuzeigen" |
10839 |
11366 |
10840 #, python-format |
11367 #, python-format |
10841 msgid "use \"hg -v help %s\" to show more info" |
|
10842 msgstr "Nutze \"hg -v help %s\" um mehr Informationen anzuzeigen" |
|
10843 |
|
10844 #, python-format |
|
10845 msgid "" |
|
10846 "\n" |
|
10847 "aliases: %s\n" |
|
10848 msgstr "" |
|
10849 "\n" |
|
10850 "Aliase: %s\n" |
|
10851 |
|
10852 msgid "(no help text available)" |
|
10853 msgstr "(keine Hilfe verfügbar)" |
|
10854 |
|
10855 #, python-format |
|
10856 msgid "shell alias for::" |
|
10857 msgstr "" |
|
10858 |
|
10859 #, python-format |
|
10860 msgid " %s" |
|
10861 msgstr " %s" |
|
10862 |
|
10863 #, python-format |
|
10864 msgid "alias for: hg %s" |
|
10865 msgstr "Alias für: hg %s" |
|
10866 |
|
10867 #, python-format |
|
10868 msgid "%s" |
|
10869 msgstr "" |
|
10870 |
|
10871 #, python-format |
|
10872 msgid "use \"hg help -e %s\" to show help for the %s extension" |
|
10873 msgstr "" |
|
10874 "Benutzen Sie \"hg -v help %s\" um Hilfe für die Erweitung %s anzuzeigen" |
|
10875 |
|
10876 #, python-format |
|
10877 msgid "" |
|
10878 "\n" |
|
10879 "use \"hg help %s\" to show the full help text\n" |
|
10880 msgstr "" |
|
10881 "\n" |
|
10882 "Nutze \"hg help %s\" um den vollen Hilfetext anzuzeigen\n" |
|
10883 |
|
10884 #, python-format |
|
10885 msgid "" |
|
10886 "\n" |
|
10887 "use \"hg -v help %s\" to show more info\n" |
|
10888 msgstr "" |
|
10889 "\n" |
|
10890 "Nutze \"hg -v help %s\" um mehr Informationen anzuzeigen\n" |
|
10891 |
|
10892 msgid "basic commands:" |
|
10893 msgstr "Grundlegende Befehle:" |
|
10894 |
|
10895 msgid "list of commands:" |
|
10896 msgstr "Liste der Befehle:" |
|
10897 |
|
10898 msgid "no commands defined\n" |
|
10899 msgstr "keine Befehle definiert\n" |
|
10900 |
|
10901 msgid "enabled extensions:" |
|
10902 msgstr "Aktive Erweiterungen:" |
|
10903 |
|
10904 msgid "" |
|
10905 "\n" |
|
10906 "additional help topics:" |
|
10907 msgstr "" |
|
10908 "\n" |
|
10909 "Zusätzliche Hilfethemen:" |
|
10910 |
|
10911 #, python-format |
|
10912 msgid "" |
11368 msgid "" |
10913 "\n" |
11369 "\n" |
10914 "use \"hg help -c %s\" to see help for the %s command\n" |
11370 "use \"hg help -c %s\" to see help for the %s command\n" |
10915 msgstr "" |
11371 msgstr "" |
10916 "\n" |
11372 "\n" |
11299 " sollte die Option \"-0\" (Null) in beiden Befehle angegeben werden.\n" |
11761 " sollte die Option \"-0\" (Null) in beiden Befehle angegeben werden.\n" |
11300 " Dadurch werden die Dateinamen mit einem Null-Byte getrennt, was " |
11762 " Dadurch werden die Dateinamen mit einem Null-Byte getrennt, was " |
11301 "Probleme\n" |
11763 "Probleme\n" |
11302 " mit Leerzeichen in Dateinamen vermeidet." |
11764 " mit Leerzeichen in Dateinamen vermeidet." |
11303 |
11765 |
11304 msgid "only follow the first parent of merge changesets (DEPRECATED)" |
|
11305 msgstr "Folgt nur dem ersten Vorgänger von Zusammenführungen (VERALTET)" |
|
11306 |
|
11307 msgid "show revisions matching date spec" |
|
11308 msgstr "Zeigt Revisionen passend zur Datums-Spezifikation" |
|
11309 |
|
11310 msgid "show copied files" |
|
11311 msgstr "Zeigt kopierte Dateien" |
|
11312 |
|
11313 msgid "do case-insensitive search for a given text" |
|
11314 msgstr "Sucht ein Stichwort unabhängig von Groß- und Kleinschreibung" |
|
11315 |
|
11316 msgid "include revisions where files were removed" |
|
11317 msgstr "Revisionen einschließen, in denen Dateien entfernt wurden" |
|
11318 |
|
11319 msgid "show only merges (DEPRECATED)" |
|
11320 msgstr "Zeigt nur Zusammenführungen (VERALTET)" |
|
11321 |
|
11322 msgid "revisions committed by user" |
|
11323 msgstr "Revisionen vom Nutzer" |
|
11324 |
|
11325 msgid "show only changesets within the given named branch (DEPRECATED)" |
|
11326 msgstr "Zeigt nur Änderungssätze innerhalb des angegebenen Zweigs (VERALTET)" |
|
11327 |
|
11328 msgid "show changesets within the given named branch" |
|
11329 msgstr "Zeigt nur Änderungssätze innerhalb des angegebenen Zweigs" |
|
11330 |
|
11331 msgid "do not display revision or any of its ancestors" |
|
11332 msgstr "Gibt weder diese Revision noch ihre Vorgänger aus" |
|
11333 |
|
11334 msgid "show hidden changesets (DEPRECATED)" |
|
11335 msgstr "Zeigt versteckte Änderungssätze (VERALTET)" |
|
11336 |
|
11337 msgid "[OPTION]... [FILE]" |
|
11338 msgstr "[OPTION]... [DATEI]" |
|
11339 |
|
11340 msgid "show revision history of entire repository or files" |
11766 msgid "show revision history of entire repository or files" |
11341 msgstr "Zeigt die Revisionshistorie des Archivs oder von Dateien an" |
11767 msgstr "Zeigt die Revisionshistorie des Archivs oder von Dateien an" |
11342 |
11768 |
11343 msgid "" |
11769 msgid "" |
11344 " Print the revision history of the specified files or the entire\n" |
11770 " Print the revision history of the specified files or the entire\n" |
11578 " " |
12012 " " |
11579 msgstr "" |
12013 msgstr "" |
11580 " Gibt 0 bei Erfolg zurück, 1 wenn ungelöste Konflikte auftraten.\n" |
12014 " Gibt 0 bei Erfolg zurück, 1 wenn ungelöste Konflikte auftraten.\n" |
11581 " " |
12015 " " |
11582 |
12016 |
|
12017 msgid "" |
|
12018 "multiple matching bookmarks to merge - please merge with an explicit rev or " |
|
12019 "bookmark" |
|
12020 msgstr "" |
|
12021 "Mehrere passende Lesezeichen zum Zusammenführen gefunden. Bitte wählen Sie " |
|
12022 "eine explizite Revision oder ein Lesezeichen" |
|
12023 |
|
12024 msgid "run 'hg heads' to see all heads" |
|
12025 msgstr "'hg heads' zeigt alle Köpfe" |
|
12026 |
|
12027 msgid "" |
|
12028 "no matching bookmark to merge - please merge with an explicit rev or bookmark" |
|
12029 msgstr "" |
|
12030 "Kein passendes Lesezeichen zum Zusammenführen gefunden. Bitte wählen Sie " |
|
12031 "eine explizite Revision oder ein Lesezeichen" |
|
12032 |
11583 #, python-format |
12033 #, python-format |
11584 msgid "branch '%s' has %d heads - please merge with an explicit rev" |
12034 msgid "branch '%s' has %d heads - please merge with an explicit rev" |
11585 msgstr "Zweig '%s' hat %d Köpfe - Bitte wähle eine explizite Revision" |
12035 msgstr "Zweig '%s' hat %d Köpfe - Bitte wähle eine explizite Revision" |
11586 |
12036 |
11587 msgid "run 'hg heads .' to see heads" |
12037 msgid "run 'hg heads .' to see heads" |
11588 msgstr "'hg heads .' zeigt Köpfe" |
12038 msgstr "'hg heads .' zeigt Köpfe" |
11589 |
12039 |
|
12040 msgid "heads are bookmarked - please merge with an explicit rev" |
|
12041 msgstr "" |
|
12042 "Es existieren Lesezeichen für die Köpfe. Bitte geben Sie explizit eine " |
|
12043 "Revision an" |
|
12044 |
11590 #, python-format |
12045 #, python-format |
11591 msgid "branch '%s' has one head - please merge with an explicit rev" |
12046 msgid "branch '%s' has one head - please merge with an explicit rev" |
11592 msgstr "Zweig '%s' hat einen Kopf - Bitte wähle eine explizite Revision" |
12047 msgstr "Zweig '%s' hat einen Kopf - Bitte wähle eine explizite Revision" |
11593 |
12048 |
11594 msgid "run 'hg heads' to see all heads" |
|
11595 msgstr "'hg heads' zeigt alle Köpfe" |
|
11596 |
|
11597 msgid "nothing to merge" |
12049 msgid "nothing to merge" |
11598 msgstr "Es gibt nichts zum Zusammenführen" |
12050 msgstr "Es gibt nichts zum Zusammenführen" |
11599 |
12051 |
11600 msgid "use 'hg update' instead" |
12052 msgid "use 'hg update' instead" |
11601 msgstr "Nutze stattdessen 'hg update'" |
12053 msgstr "Nutze stattdessen 'hg update'" |
11602 |
12054 |
11603 msgid "working directory not at a head revision" |
12055 msgid "working directory not at a head revision" |
11604 msgstr "Arbeitsverzeichnis ist nicht auf Stand der Kopfversion" |
12056 msgstr "Arbeitsverzeichnis ist nicht auf Stand der Kopfversion" |
11605 |
12057 |
11606 msgid "use 'hg update' or merge with an explicit revision" |
12058 msgid "use 'hg update' or merge with an explicit revision" |
11607 msgstr "" |
12059 msgstr "Verwende 'hg update' oder führe mit einer expliziten Revision zusammen" |
11608 "Verwende 'hg update' oder führe mit einer expliziten Revision zusammen" |
|
11609 |
12060 |
11610 msgid "a changeset intended to be included in the destination" |
12061 msgid "a changeset intended to be included in the destination" |
11611 msgstr "Ein Änderungssatz, den das Ziel einschliessen soll" |
12062 msgstr "Ein Änderungssatz, den das Ziel einschliessen soll" |
11612 |
12063 |
11613 msgid "a specific branch you would like to push" |
12064 msgid "a specific branch you would like to push" |
13004 msgstr "Aktualisiert das Arbeitsverzeichnis (oder wechselt die Version)" |
13433 msgstr "Aktualisiert das Arbeitsverzeichnis (oder wechselt die Version)" |
13005 |
13434 |
13006 msgid "" |
13435 msgid "" |
13007 " Update the repository's working directory to the specified\n" |
13436 " Update the repository's working directory to the specified\n" |
13008 " changeset. If no changeset is specified, update to the tip of the\n" |
13437 " changeset. If no changeset is specified, update to the tip of the\n" |
13009 " current named branch and move the current bookmark." |
13438 " current named branch and move the current bookmark (see :hg:`help\n" |
13010 msgstr "" |
13439 " bookmarks`)." |
13011 " Hebt das Arbeitsverzeichnis auf die angegebene Revision an. Ohne\n" |
13440 msgstr "" |
13012 " Angabe einer Revision wird der Spitze des aktuellen Zweigs gewählt\n" |
13441 " Aktualisiert das Arbeitsverzeichnis auf den angegebenen Änderungssatz.\n" |
13013 " und ggf. das aktuelle Lesezeichen verschoben." |
13442 " Ohne Angabe eines Änderungssatzes wird auf die Spitze des aktuellen\n" |
13014 |
13443 " Zweigs aktualisiert und das aktuelle Lesezeichen verschoben. (siehe\n" |
13015 msgid "" |
13444 " :hg:`help bookmarks`)." |
13016 " If the changeset is not a descendant of the working directory's\n" |
13445 |
13017 " parent, the update is aborted. With the -c/--check option, the\n" |
13446 msgid "" |
13018 " working directory is checked for uncommitted changes; if none are\n" |
13447 " If the changeset is not a descendant or ancestor of the working\n" |
13019 " found, the working directory is updated to the specified\n" |
13448 " directory's parent, the update is aborted. With the -c/--check\n" |
|
13449 " option, the working directory is checked for uncommitted changes; if\n" |
|
13450 " none are found, the working directory is updated to the specified\n" |
13020 " changeset." |
13451 " changeset." |
13021 msgstr "" |
13452 msgstr "" |
13022 |
13453 |
13023 msgid "" |
13454 msgid "" |
13024 " Update sets the working directory's parent revison to the specified\n" |
13455 " Update sets the working directory's parent revison to the specified\n" |
13369 "Datenübergabe unterbrochen\n" |
13808 "Datenübergabe unterbrochen\n" |
13370 |
13809 |
13371 msgid "abort: out of memory\n" |
13810 msgid "abort: out of memory\n" |
13372 msgstr "Abbruch: Unzureichender Arbeitsspeicher\n" |
13811 msgstr "Abbruch: Unzureichender Arbeitsspeicher\n" |
13373 |
13812 |
|
13813 msgid "the extension author." |
|
13814 msgstr "Der Autor der Erweiterung" |
|
13815 |
|
13816 #, python-format |
|
13817 msgid "" |
|
13818 "** Unknown exception encountered with possibly-broken third-party extension " |
|
13819 "%s\n" |
|
13820 "** which supports versions %s of Mercurial.\n" |
|
13821 "** Please disable %s and try your action again.\n" |
|
13822 "** If that fixes the bug please report it to %s\n" |
|
13823 msgstr "" |
|
13824 |
13374 msgid "** unknown exception encountered, please report by visiting\n" |
13825 msgid "** unknown exception encountered, please report by visiting\n" |
13375 msgstr "** Unbekannter Fehler - bitte melden auf:\n" |
13826 msgstr "** Unbekannter Fehler - bitte melden auf:\n" |
13376 |
13827 |
13377 msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" |
13828 msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" |
13378 msgstr "** http://mercurial.selenic.com/wiki/BugTracker\n" |
13829 msgstr "** http://mercurial.selenic.com/wiki/BugTracker\n" |
13379 |
13830 |
13380 #, python-format |
13831 #, python-format |
13381 msgid "** Python %s\n" |
13832 msgid "** Python %s\n" |
13382 msgstr "" |
13833 msgstr "" |
13383 |
13834 |
13482 |
13947 |
13483 #, python-format |
13948 #, python-format |
13484 msgid "tool %s requires a GUI\n" |
13949 msgid "tool %s requires a GUI\n" |
13485 msgstr "" |
13950 msgstr "" |
13486 |
13951 |
|
13952 msgid "" |
|
13953 "``internal:prompt``\n" |
|
13954 "Asks the user which of the local or the other version to keep as\n" |
|
13955 " the merged version." |
|
13956 msgstr "" |
|
13957 |
13487 #, python-format |
13958 #, python-format |
13488 msgid "" |
13959 msgid "" |
13489 " no tool found to merge %s\n" |
13960 " no tool found to merge %s\n" |
13490 "keep (l)ocal or take (o)ther?" |
13961 "keep (l)ocal or take (o)ther?" |
13491 msgstr "" |
13962 msgstr "" |
13492 |
13963 |
|
13964 msgid "" |
|
13965 "``internal:local``\n" |
|
13966 "Uses the local version of files as the merged version." |
|
13967 msgstr "" |
|
13968 |
|
13969 msgid "" |
|
13970 "``internal:other``\n" |
|
13971 "Uses the other version of files as the merged version." |
|
13972 msgstr "" |
|
13973 |
|
13974 msgid "" |
|
13975 "``internal:fail``\n" |
|
13976 "Rather than attempting to merge files that were modified on both\n" |
|
13977 " branches, it marks them as unresolved. The resolve command must be\n" |
|
13978 " used to resolve these conflicts." |
|
13979 msgstr "" |
|
13980 |
13493 #, python-format |
13981 #, python-format |
13494 msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" |
13982 msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" |
|
13983 msgstr "" |
|
13984 |
|
13985 msgid "" |
|
13986 "``internal:merge``\n" |
|
13987 "Uses the internal non-interactive simple merge algorithm for merging\n" |
|
13988 " files. It will fail if there are any conflicts and leave markers in\n" |
|
13989 " the partially merged file." |
|
13990 msgstr "" |
|
13991 |
|
13992 #, python-format |
|
13993 msgid "merging %s incomplete! (edit conflicts, then use 'hg resolve --mark')\n" |
|
13994 msgstr "" |
|
13995 |
|
13996 msgid "" |
|
13997 "``internal:dump``\n" |
|
13998 "Creates three versions of the files to merge, containing the\n" |
|
13999 " contents of local, other and base. These files can then be used to\n" |
|
14000 " perform a merge manually. If the file to be merged is named\n" |
|
14001 " ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" |
|
14002 " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" |
|
14003 " same directory as ``a.txt``." |
|
14004 msgstr "" |
|
14005 |
|
14006 #, python-format |
|
14007 msgid "merging %s failed!\n" |
13495 msgstr "" |
14008 msgstr "" |
13496 |
14009 |
13497 #, python-format |
14010 #, python-format |
13498 msgid "was merge of '%s' successful (yn)?" |
14011 msgid "was merge of '%s' successful (yn)?" |
13499 msgstr "" |
14012 msgstr "" |
13500 |
14013 |
13501 #, python-format |
14014 #, python-format |
13502 msgid "" |
14015 msgid "" |
13503 " output file %s appears unchanged\n" |
14016 " output file %s appears unchanged\n" |
13504 "was merge successful (yn)?" |
14017 "was merge successful (yn)?" |
13505 msgstr "" |
|
13506 |
|
13507 #, python-format |
|
13508 msgid "merging %s incomplete! (edit conflicts, then use 'hg resolve --mark')\n" |
|
13509 msgstr "" |
|
13510 |
|
13511 #, python-format |
|
13512 msgid "merging %s failed!\n" |
|
13513 msgstr "" |
14018 msgstr "" |
13514 |
14019 |
13515 msgid "unterminated string" |
14020 msgid "unterminated string" |
13516 msgstr "nicht abgeschlossene Zeichenkette" |
14021 msgstr "nicht abgeschlossene Zeichenkette" |
13517 |
14022 |
13851 "alphabetical order, later ones overriding earlier ones. Where multiple\n" |
14387 "alphabetical order, later ones overriding earlier ones. Where multiple\n" |
13852 "paths are given below, settings from earlier paths override later\n" |
14388 "paths are given below, settings from earlier paths override later\n" |
13853 "ones." |
14389 "ones." |
13854 msgstr "" |
14390 msgstr "" |
13855 |
14391 |
13856 msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``" |
14392 msgid "| (All) ``<repo>/.hg/hgrc``" |
13857 msgstr "" |
14393 msgstr "" |
13858 |
14394 |
13859 msgid "" |
14395 msgid "" |
13860 " Per-repository configuration options that only apply in a\n" |
14396 " Per-repository configuration options that only apply in a\n" |
13861 " particular repository. This file is not version-controlled, and\n" |
14397 " particular repository. This file is not version-controlled, and\n" |
13862 " will not get transferred during a \"clone\" operation. Options in\n" |
14398 " will not get transferred during a \"clone\" operation. Options in\n" |
13863 " this file override options in all other configuration files. On\n" |
14399 " this file override options in all other configuration files. On\n" |
13864 " Unix, most of this file will be ignored if it doesn't belong to a\n" |
14400 " Plan 9 and Unix, most of this file will be ignored if it doesn't\n" |
13865 " trusted user or to a trusted group. See the documentation for the\n" |
14401 " belong to a trusted user or to a trusted group. See the documentation\n" |
13866 " ``[trusted]`` section below for more details." |
14402 " for the ``[trusted]`` section below for more details." |
13867 msgstr "" |
14403 msgstr "" |
13868 |
14404 |
13869 msgid "" |
14405 msgid "" |
|
14406 "| (Plan 9) ``$home/lib/hgrc``\n" |
13870 "| (Unix) ``$HOME/.hgrc``\n" |
14407 "| (Unix) ``$HOME/.hgrc``\n" |
13871 "| (Windows) ``%USERPROFILE%\\.hgrc``\n" |
14408 "| (Windows) ``%USERPROFILE%\\.hgrc``\n" |
13872 "| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n" |
14409 "| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n" |
13873 "| (Windows) ``%HOME%\\.hgrc``\n" |
14410 "| (Windows) ``%HOME%\\.hgrc``\n" |
13874 "| (Windows) ``%HOME%\\Mercurial.ini``" |
14411 "| (Windows) ``%HOME%\\Mercurial.ini``" |
14131 "which will make ``hg purge`` delete all unknown files in the\n" |
14672 "which will make ``hg purge`` delete all unknown files in the\n" |
14132 "repository in the same manner as the purge extension." |
14673 "repository in the same manner as the purge extension." |
14133 msgstr "" |
14674 msgstr "" |
14134 |
14675 |
14135 msgid "" |
14676 msgid "" |
14136 "Shell aliases are executed in an environment where ``$HG`` expand to\n" |
14677 "Positional arguments like ``$1``, ``$2``, etc. in the alias definition\n" |
|
14678 "expand to the command arguments. Unmatched arguments are\n" |
|
14679 "removed. ``$0`` expands to the alias name and ``$@`` expands to all\n" |
|
14680 "arguments separated by a space. These expansions happen before the\n" |
|
14681 "command is passed to the shell." |
|
14682 msgstr "" |
|
14683 |
|
14684 msgid "" |
|
14685 "Shell aliases are executed in an environment where ``$HG`` expands to\n" |
14137 "the path of the Mercurial that was used to execute the alias. This is\n" |
14686 "the path of the Mercurial that was used to execute the alias. This is\n" |
14138 "useful when you want to call further Mercurial commands in a shell\n" |
14687 "useful when you want to call further Mercurial commands in a shell\n" |
14139 "alias, as was done above for the purge alias. In addition,\n" |
14688 "alias, as was done above for the purge alias. In addition,\n" |
14140 "``$HG_ARGS`` expand to the arguments given to Mercurial. In the ``hg\n" |
14689 "``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg\n" |
14141 "echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``." |
14690 "echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``." |
14142 msgstr "" |
14691 msgstr "" |
14143 |
14692 |
14144 msgid "" |
14693 msgid "" |
14145 ".. note:: Some global configuration options such as ``-R`` are\n" |
14694 ".. note:: Some global configuration options such as ``-R`` are\n" |
14584 " option ensures that the on-disk format of newly created\n" |
15106 " option ensures that the on-disk format of newly created\n" |
14585 " repositories will be compatible with Mercurial before version 1.7." |
15107 " repositories will be compatible with Mercurial before version 1.7." |
14586 msgstr "" |
15108 msgstr "" |
14587 |
15109 |
14588 msgid "" |
15110 msgid "" |
14589 "``merge-patterns``\n" |
15111 "``graph``\n" |
14590 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
15112 "\"\"\"\"\"\"\"\"\"" |
14591 msgstr "" |
15113 msgstr "" |
14592 |
15114 |
14593 msgid "" |
15115 msgid "" |
14594 "This section specifies merge tools to associate with particular file\n" |
15116 "Web graph view configuration. This section let you change graph\n" |
14595 "patterns. Tools matched here will take precedence over the default\n" |
15117 "elements display properties by branches, for instance to make the\n" |
14596 "merge tool. Patterns are globs by default, rooted at the repository\n" |
15118 "``default`` branch stand out." |
14597 "root." |
15119 msgstr "" |
14598 msgstr "" |
15120 |
14599 |
15121 msgid " <branch>.<argument> = <value>" |
14600 msgid "" |
15122 msgstr "" |
14601 " [merge-patterns]\n" |
15123 |
14602 " **.c = kdiff3\n" |
15124 msgid "" |
14603 " **.jpg = myimgmerge" |
15125 "where ``<branch>`` is the name of the branch being\n" |
14604 msgstr "" |
15126 "customized. Example::" |
14605 |
15127 msgstr "" |
14606 msgid "" |
15128 |
14607 "``merge-tools``\n" |
15129 msgid "" |
14608 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
15130 " [graph]\n" |
14609 msgstr "" |
15131 " # 2px width\n" |
14610 |
15132 " default.width = 2\n" |
14611 msgid "" |
15133 " # red color\n" |
14612 "This section configures external merge tools to use for file-level\n" |
15134 " default.color = FF0000" |
14613 "merges." |
15135 msgstr "" |
14614 msgstr "" |
15136 |
14615 |
15137 msgid "" |
14616 msgid "Example ``~/.hgrc``::" |
15138 "``width``\n" |
14617 msgstr "Beispiel ``.hgrc``-Datei::" |
15139 " Set branch edges width in pixels." |
14618 |
15140 msgstr "" |
14619 msgid "" |
15141 |
14620 " [merge-tools]\n" |
15142 msgid "" |
14621 " # Override stock tool location\n" |
15143 "``color``\n" |
14622 " kdiff3.executable = ~/bin/kdiff3\n" |
15144 " Set branch edges color in hexadecimal RGB notation." |
14623 " # Specify command line\n" |
15145 msgstr "" |
14624 " kdiff3.args = $base $local $other -o $output\n" |
15146 |
14625 " # Give higher priority\n" |
15147 msgid "" |
14626 " kdiff3.priority = 1" |
|
14627 msgstr "" |
|
14628 |
|
14629 msgid "" |
|
14630 " # Define new tool\n" |
|
14631 " myHtmlTool.args = -m $local $other $base $output\n" |
|
14632 " myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n" |
|
14633 " myHtmlTool.priority = 1" |
|
14634 msgstr "" |
|
14635 |
|
14636 msgid "" |
|
14637 "``priority``\n" |
|
14638 " The priority in which to evaluate this tool.\n" |
|
14639 " Default: 0." |
|
14640 msgstr "" |
|
14641 |
|
14642 msgid "" |
|
14643 "``executable``\n" |
|
14644 " Either just the name of the executable or its pathname. On Windows,\n" |
|
14645 " the path can use environment variables with ${ProgramFiles} syntax.\n" |
|
14646 " Default: the tool name." |
|
14647 msgstr "" |
|
14648 |
|
14649 msgid "" |
|
14650 "``args``\n" |
|
14651 " The arguments to pass to the tool executable. You can refer to the\n" |
|
14652 " files being merged as well as the output file through these\n" |
|
14653 " variables: ``$base``, ``$local``, ``$other``, ``$output``.\n" |
|
14654 " Default: ``$local $base $other``" |
|
14655 msgstr "" |
|
14656 |
|
14657 msgid "" |
|
14658 "``premerge``\n" |
|
14659 " Attempt to run internal non-interactive 3-way merge tool before\n" |
|
14660 " launching external tool. Options are ``true``, ``false``, or ``keep``\n" |
|
14661 " to leave markers in the file if the premerge fails.\n" |
|
14662 " Default: True" |
|
14663 msgstr "" |
|
14664 |
|
14665 msgid "" |
|
14666 "``binary``\n" |
|
14667 " This tool can merge binary files. Defaults to False, unless tool\n" |
|
14668 " was selected by file pattern match." |
|
14669 msgstr "" |
|
14670 |
|
14671 msgid "" |
|
14672 "``symlink``\n" |
|
14673 " This tool can merge symlinks. Defaults to False, even if tool was\n" |
|
14674 " selected by file pattern match." |
|
14675 msgstr "" |
|
14676 |
|
14677 msgid "" |
|
14678 "``check``\n" |
|
14679 " A list of merge success-checking options:" |
|
14680 msgstr "" |
|
14681 |
|
14682 msgid "" |
|
14683 " ``changed``\n" |
|
14684 " Ask whether merge was successful when the merged file shows no changes.\n" |
|
14685 " ``conflicts``\n" |
|
14686 " Check whether there are conflicts even though the tool reported " |
|
14687 "success.\n" |
|
14688 " ``prompt``\n" |
|
14689 " Always prompt for merge success, regardless of success reported by tool." |
|
14690 msgstr "" |
|
14691 |
|
14692 msgid "" |
|
14693 "``checkchanged``\n" |
|
14694 " True is equivalent to ``check = changed``.\n" |
|
14695 " Default: False" |
|
14696 msgstr "" |
|
14697 |
|
14698 msgid "" |
|
14699 "``checkconflicts``\n" |
|
14700 " True is equivalent to ``check = conflicts``.\n" |
|
14701 " Default: False" |
|
14702 msgstr "" |
|
14703 |
|
14704 msgid "" |
|
14705 "``fixeol``\n" |
|
14706 " Attempt to fix up EOL changes caused by the merge tool.\n" |
|
14707 " Default: False" |
|
14708 msgstr "" |
|
14709 |
|
14710 msgid "" |
|
14711 "``gui``\n" |
|
14712 " This tool requires a graphical interface to run. Default: False" |
|
14713 msgstr "" |
|
14714 |
|
14715 msgid "" |
|
14716 "``regkey``\n" |
|
14717 " Windows registry key which describes install location of this\n" |
|
14718 " tool. Mercurial will search for this key first under\n" |
|
14719 " ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n" |
|
14720 " Default: None" |
|
14721 msgstr "" |
|
14722 |
|
14723 msgid "" |
|
14724 "``regkeyalt``\n" |
|
14725 " An alternate Windows registry key to try if the first key is not\n" |
|
14726 " found. The alternate key uses the same ``regname`` and ``regappend``\n" |
|
14727 " semantics of the primary key. The most common use for this key\n" |
|
14728 " is to search for 32bit applications on 64bit operating systems.\n" |
|
14729 " Default: None" |
|
14730 msgstr "" |
|
14731 |
|
14732 msgid "" |
|
14733 "``regname``\n" |
|
14734 " Name of value to read from specified registry key. Defaults to the\n" |
|
14735 " unnamed (default) value." |
|
14736 msgstr "" |
|
14737 |
|
14738 msgid "" |
|
14739 "``regappend``\n" |
|
14740 " String to append to the value read from the registry, typically\n" |
|
14741 " the executable name of the tool.\n" |
|
14742 " Default: None" |
|
14743 msgstr "" |
|
14744 |
|
14745 msgid "" |
|
14746 "\n" |
|
14747 "``hooks``\n" |
15148 "``hooks``\n" |
14748 "\"\"\"\"\"\"\"\"\"" |
15149 "\"\"\"\"\"\"\"\"\"" |
14749 msgstr "" |
15150 msgstr "" |
14750 |
15151 |
14751 msgid "" |
15152 msgid "" |
15020 " Optional. Always use the proxy, even for localhost and any entries\n" |
15448 " Optional. Always use the proxy, even for localhost and any entries\n" |
15021 " in ``http_proxy.no``. True or False. Default: False." |
15449 " in ``http_proxy.no``. True or False. Default: False." |
15022 msgstr "" |
15450 msgstr "" |
15023 |
15451 |
15024 msgid "" |
15452 msgid "" |
15025 "``smtp``\n" |
15453 "``merge-patterns``\n" |
15026 "\"\"\"\"\"\"\"\"" |
15454 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
15027 msgstr "" |
15455 msgstr "" |
15028 |
15456 |
15029 msgid "Configuration for extensions that need to send email messages." |
15457 msgid "" |
15030 msgstr "" |
15458 "This section specifies merge tools to associate with particular file\n" |
15031 |
15459 "patterns. Tools matched here will take precedence over the default\n" |
15032 msgid "" |
15460 "merge tool. Patterns are globs by default, rooted at the repository\n" |
15033 "``host``\n" |
15461 "root." |
15034 " Host name of mail server, e.g. \"mail.example.com\"." |
15462 msgstr "" |
15035 msgstr "" |
15463 |
15036 |
15464 msgid "" |
15037 msgid "" |
15465 " [merge-patterns]\n" |
15038 "``port``\n" |
15466 " **.c = kdiff3\n" |
15039 " Optional. Port to connect to on mail server. Default: 25." |
15467 " **.jpg = myimgmerge" |
15040 msgstr "" |
15468 msgstr "" |
15041 |
15469 |
15042 msgid "" |
15470 msgid "" |
15043 "``tls``\n" |
15471 "``merge-tools``\n" |
15044 " Optional. Method to enable TLS when connecting to mail server: " |
15472 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
15045 "starttls,\n" |
15473 msgstr "" |
15046 " smtps or none. Default: none." |
15474 |
15047 msgstr "" |
15475 msgid "" |
15048 |
15476 "This section configures external merge tools to use for file-level\n" |
15049 msgid "" |
15477 "merges." |
15050 "``username``\n" |
15478 msgstr "" |
15051 " Optional. User name for authenticating with the SMTP server.\n" |
15479 |
15052 " Default: none." |
15480 msgid "Example ``~/.hgrc``::" |
15053 msgstr "" |
15481 msgstr "Beispiel ``.hgrc``-Datei::" |
15054 |
15482 |
15055 msgid "" |
15483 msgid "" |
15056 "``password``\n" |
15484 " [merge-tools]\n" |
15057 " Optional. Password for authenticating with the SMTP server. If not\n" |
15485 " # Override stock tool location\n" |
15058 " specified, interactive sessions will prompt the user for a\n" |
15486 " kdiff3.executable = ~/bin/kdiff3\n" |
15059 " password; non-interactive sessions will fail. Default: none." |
15487 " # Specify command line\n" |
15060 msgstr "" |
15488 " kdiff3.args = $base $local $other -o $output\n" |
15061 |
15489 " # Give higher priority\n" |
15062 msgid "" |
15490 " kdiff3.priority = 1" |
15063 "``local_hostname``\n" |
15491 msgstr "" |
15064 " Optional. It's the hostname that the sender can use to identify\n" |
15492 |
15065 " itself to the MTA." |
15493 msgid "" |
|
15494 " # Define new tool\n" |
|
15495 " myHtmlTool.args = -m $local $other $base $output\n" |
|
15496 " myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n" |
|
15497 " myHtmlTool.priority = 1" |
|
15498 msgstr "" |
|
15499 |
|
15500 msgid "" |
|
15501 "``priority``\n" |
|
15502 " The priority in which to evaluate this tool.\n" |
|
15503 " Default: 0." |
|
15504 msgstr "" |
|
15505 |
|
15506 msgid "" |
|
15507 "``executable``\n" |
|
15508 " Either just the name of the executable or its pathname. On Windows,\n" |
|
15509 " the path can use environment variables with ${ProgramFiles} syntax.\n" |
|
15510 " Default: the tool name." |
|
15511 msgstr "" |
|
15512 |
|
15513 msgid "" |
|
15514 "``args``\n" |
|
15515 " The arguments to pass to the tool executable. You can refer to the\n" |
|
15516 " files being merged as well as the output file through these\n" |
|
15517 " variables: ``$base``, ``$local``, ``$other``, ``$output``.\n" |
|
15518 " Default: ``$local $base $other``" |
|
15519 msgstr "" |
|
15520 |
|
15521 msgid "" |
|
15522 "``premerge``\n" |
|
15523 " Attempt to run internal non-interactive 3-way merge tool before\n" |
|
15524 " launching external tool. Options are ``true``, ``false``, or ``keep``\n" |
|
15525 " to leave markers in the file if the premerge fails.\n" |
|
15526 " Default: True" |
|
15527 msgstr "" |
|
15528 |
|
15529 msgid "" |
|
15530 "``binary``\n" |
|
15531 " This tool can merge binary files. Defaults to False, unless tool\n" |
|
15532 " was selected by file pattern match." |
|
15533 msgstr "" |
|
15534 |
|
15535 msgid "" |
|
15536 "``symlink``\n" |
|
15537 " This tool can merge symlinks. Defaults to False, even if tool was\n" |
|
15538 " selected by file pattern match." |
|
15539 msgstr "" |
|
15540 |
|
15541 msgid "" |
|
15542 "``check``\n" |
|
15543 " A list of merge success-checking options:" |
|
15544 msgstr "" |
|
15545 |
|
15546 msgid "" |
|
15547 " ``changed``\n" |
|
15548 " Ask whether merge was successful when the merged file shows no changes.\n" |
|
15549 " ``conflicts``\n" |
|
15550 " Check whether there are conflicts even though the tool reported " |
|
15551 "success.\n" |
|
15552 " ``prompt``\n" |
|
15553 " Always prompt for merge success, regardless of success reported by tool." |
|
15554 msgstr "" |
|
15555 |
|
15556 msgid "" |
|
15557 "``checkchanged``\n" |
|
15558 " True is equivalent to ``check = changed``.\n" |
|
15559 " Default: False" |
|
15560 msgstr "" |
|
15561 |
|
15562 msgid "" |
|
15563 "``checkconflicts``\n" |
|
15564 " True is equivalent to ``check = conflicts``.\n" |
|
15565 " Default: False" |
|
15566 msgstr "" |
|
15567 |
|
15568 msgid "" |
|
15569 "``fixeol``\n" |
|
15570 " Attempt to fix up EOL changes caused by the merge tool.\n" |
|
15571 " Default: False" |
|
15572 msgstr "" |
|
15573 |
|
15574 msgid "" |
|
15575 "``gui``\n" |
|
15576 " This tool requires a graphical interface to run. Default: False" |
|
15577 msgstr "" |
|
15578 |
|
15579 msgid "" |
|
15580 "``regkey``\n" |
|
15581 " Windows registry key which describes install location of this\n" |
|
15582 " tool. Mercurial will search for this key first under\n" |
|
15583 " ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n" |
|
15584 " Default: None" |
|
15585 msgstr "" |
|
15586 |
|
15587 msgid "" |
|
15588 "``regkeyalt``\n" |
|
15589 " An alternate Windows registry key to try if the first key is not\n" |
|
15590 " found. The alternate key uses the same ``regname`` and ``regappend``\n" |
|
15591 " semantics of the primary key. The most common use for this key\n" |
|
15592 " is to search for 32bit applications on 64bit operating systems.\n" |
|
15593 " Default: None" |
|
15594 msgstr "" |
|
15595 |
|
15596 msgid "" |
|
15597 "``regname``\n" |
|
15598 " Name of value to read from specified registry key. Defaults to the\n" |
|
15599 " unnamed (default) value." |
|
15600 msgstr "" |
|
15601 |
|
15602 msgid "" |
|
15603 "``regappend``\n" |
|
15604 " String to append to the value read from the registry, typically\n" |
|
15605 " the executable name of the tool.\n" |
|
15606 " Default: None" |
15066 msgstr "" |
15607 msgstr "" |
15067 |
15608 |
15068 msgid "" |
15609 msgid "" |
15069 "\n" |
15610 "\n" |
15070 "``patch``\n" |
15611 "``patch``\n" |
15114 " Optional. Directory or URL to use when pushing if no destination\n" |
15655 " Optional. Directory or URL to use when pushing if no destination\n" |
15115 " is specified." |
15656 " is specified." |
15116 msgstr "" |
15657 msgstr "" |
15117 |
15658 |
15118 msgid "" |
15659 msgid "" |
15119 "\n" |
15660 "``phases``\n" |
|
15661 "\"\"\"\"\"\"\"\"\"\"" |
|
15662 msgstr "" |
|
15663 |
|
15664 msgid "" |
|
15665 "Specifies default handling of phases. See :hg:`help phases` for more\n" |
|
15666 "information about working with phases." |
|
15667 msgstr "" |
|
15668 |
|
15669 msgid "" |
|
15670 "``publish``\n" |
|
15671 " Controls draft phase behavior when working as a server. When true,\n" |
|
15672 " pushed changesets are set to public in both client and server and\n" |
|
15673 " pulled or cloned changesets are set to public in the client.\n" |
|
15674 " Default: True" |
|
15675 msgstr "" |
|
15676 |
|
15677 msgid "" |
|
15678 "``new-commit``\n" |
|
15679 " Phase of newly-created commits.\n" |
|
15680 " Default: draft" |
|
15681 msgstr "" |
|
15682 |
|
15683 msgid "" |
15120 "``profiling``\n" |
15684 "``profiling``\n" |
15121 "\"\"\"\"\"\"\"\"\"\"\"\"\"" |
15685 "\"\"\"\"\"\"\"\"\"\"\"\"\"" |
15122 msgstr "" |
15686 msgstr "" |
15123 |
15687 |
15124 msgid "" |
15688 msgid "" |
15125 "Specifies profiling format and file output. In this section\n" |
15689 "Specifies profiling type, format, and file output. Two profilers are\n" |
15126 "description, 'profiling data' stands for the raw data collected\n" |
15690 "supported: an instrumenting profiler (named ``ls``), and a sampling\n" |
15127 "during profiling, while 'profiling report' stands for a statistical\n" |
15691 "profiler (named ``stat``)." |
15128 "text report generated from the profiling data. The profiling is done\n" |
15692 msgstr "" |
15129 "using lsprof." |
15693 |
|
15694 msgid "" |
|
15695 "In this section description, 'profiling data' stands for the raw data\n" |
|
15696 "collected during profiling, while 'profiling report' stands for a\n" |
|
15697 "statistical text report generated from the profiling data. The\n" |
|
15698 "profiling is done using lsprof." |
|
15699 msgstr "" |
|
15700 |
|
15701 msgid "" |
|
15702 "``type``\n" |
|
15703 " The type of profiler to use.\n" |
|
15704 " Default: ls." |
|
15705 msgstr "" |
|
15706 |
|
15707 msgid "" |
|
15708 " ``ls``\n" |
|
15709 " Use Python's built-in instrumenting profiler. This profiler\n" |
|
15710 " works on all platforms, but each line number it reports is the\n" |
|
15711 " first line of a function. This restriction makes it difficult to\n" |
|
15712 " identify the expensive parts of a non-trivial function.\n" |
|
15713 " ``stat``\n" |
|
15714 " Use a third-party statistical profiler, statprof. This profiler\n" |
|
15715 " currently runs only on Unix systems, and is most useful for\n" |
|
15716 " profiling commands that run for longer than about 0.1 seconds." |
15130 msgstr "" |
15717 msgstr "" |
15131 |
15718 |
15132 msgid "" |
15719 msgid "" |
15133 "``format``\n" |
15720 "``format``\n" |
15134 " Profiling format.\n" |
15721 " Profiling format. Specific to the ``ls`` instrumenting profiler.\n" |
15135 " Default: text." |
15722 " Default: text." |
15136 msgstr "" |
15723 msgstr "" |
15137 |
15724 |
15138 msgid "" |
15725 msgid "" |
15139 " ``text``\n" |
15726 " ``text``\n" |
15182 " the write lock while determining what data to transfer.\n" |
15775 " the write lock while determining what data to transfer.\n" |
15183 " Default is True." |
15776 " Default is True." |
15184 msgstr "" |
15777 msgstr "" |
15185 |
15778 |
15186 msgid "" |
15779 msgid "" |
|
15780 "``preferuncompressed``\n" |
|
15781 " When set, clients will try to use the uncompressed streaming\n" |
|
15782 " protocol. Default is False." |
|
15783 msgstr "" |
|
15784 |
|
15785 msgid "" |
15187 "``validate``\n" |
15786 "``validate``\n" |
15188 " Whether to validate the completeness of pushed changesets by\n" |
15787 " Whether to validate the completeness of pushed changesets by\n" |
15189 " checking that all new file revisions specified in manifests are\n" |
15788 " checking that all new file revisions specified in manifests are\n" |
15190 " present. Default is False." |
15789 " present. Default is False." |
15191 msgstr "" |
15790 msgstr "" |
15192 |
15791 |
15193 msgid "" |
15792 msgid "" |
|
15793 "``smtp``\n" |
|
15794 "\"\"\"\"\"\"\"\"" |
|
15795 msgstr "" |
|
15796 |
|
15797 msgid "Configuration for extensions that need to send email messages." |
|
15798 msgstr "" |
|
15799 |
|
15800 msgid "" |
|
15801 "``host``\n" |
|
15802 " Host name of mail server, e.g. \"mail.example.com\"." |
|
15803 msgstr "" |
|
15804 |
|
15805 msgid "" |
|
15806 "``port``\n" |
|
15807 " Optional. Port to connect to on mail server. Default: 25." |
|
15808 msgstr "" |
|
15809 |
|
15810 msgid "" |
|
15811 "``tls``\n" |
|
15812 " Optional. Method to enable TLS when connecting to mail server: " |
|
15813 "starttls,\n" |
|
15814 " smtps or none. Default: none." |
|
15815 msgstr "" |
|
15816 |
|
15817 msgid "" |
|
15818 "``username``\n" |
|
15819 " Optional. User name for authenticating with the SMTP server.\n" |
|
15820 " Default: none." |
|
15821 msgstr "" |
|
15822 |
|
15823 msgid "" |
|
15824 "``password``\n" |
|
15825 " Optional. Password for authenticating with the SMTP server. If not\n" |
|
15826 " specified, interactive sessions will prompt the user for a\n" |
|
15827 " password; non-interactive sessions will fail. Default: none." |
|
15828 msgstr "" |
|
15829 |
|
15830 msgid "" |
|
15831 "``local_hostname``\n" |
|
15832 " Optional. It's the hostname that the sender can use to identify\n" |
|
15833 " itself to the MTA." |
|
15834 msgstr "" |
|
15835 |
|
15836 msgid "" |
|
15837 "\n" |
15194 "``subpaths``\n" |
15838 "``subpaths``\n" |
15195 "\"\"\"\"\"\"\"\"\"\"\"\"" |
15839 "\"\"\"\"\"\"\"\"\"\"\"\"" |
15196 msgstr "" |
15840 msgstr "" |
15197 |
15841 |
15198 msgid "Defines subrepositories source locations rewriting rules of the form::" |
15842 msgid "" |
|
15843 "Subrepository source URLs can go stale if a remote server changes name\n" |
|
15844 "or becomes temporarily unavailable. This section lets you define\n" |
|
15845 "rewrite rules of the form::" |
15199 msgstr "" |
15846 msgstr "" |
15200 |
15847 |
15201 msgid " <pattern> = <replacement>" |
15848 msgid " <pattern> = <replacement>" |
15202 msgstr "" |
15849 msgstr "" |
15203 |
15850 |
15204 msgid "" |
15851 msgid "" |
15205 "Where ``pattern`` is a regular expression matching the source and\n" |
15852 "where ``pattern`` is a regular expression matching a subrepository\n" |
15206 "``replacement`` is the replacement string used to rewrite it. Groups\n" |
15853 "source URL and ``replacement`` is the replacement string used to\n" |
15207 "can be matched in ``pattern`` and referenced in ``replacements``. For\n" |
15854 "rewrite it. Groups can be matched in ``pattern`` and referenced in\n" |
15208 "instance::" |
15855 "``replacements``. For instance::" |
15209 msgstr "" |
15856 msgstr "" |
15210 |
15857 |
15211 msgid " http://server/(.*)-hg/ = http://hg.server/\\1/" |
15858 msgid " http://server/(.*)-hg/ = http://hg.server/\\1/" |
15212 msgstr "" |
15859 msgstr "" |
15213 |
15860 |
15214 msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``." |
15861 msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``." |
15215 msgstr "" |
15862 msgstr "" |
15216 |
15863 |
15217 msgid "All patterns are applied in definition order." |
15864 msgid "" |
|
15865 "Relative subrepository paths are first made absolute, and the the\n" |
|
15866 "rewrite rules are then applied on the full (absolute) path. The rules\n" |
|
15867 "are applied in definition order." |
15218 msgstr "" |
15868 msgstr "" |
15219 |
15869 |
15220 msgid "" |
15870 msgid "" |
15221 "``trusted``\n" |
15871 "``trusted``\n" |
15222 "\"\"\"\"\"\"\"\"\"\"\"" |
15872 "\"\"\"\"\"\"\"\"\"\"\"" |
15541 "``cacerts``\n" |
16197 "``cacerts``\n" |
15542 " Path to file containing a list of PEM encoded certificate\n" |
16198 " Path to file containing a list of PEM encoded certificate\n" |
15543 " authority certificates. Environment variables and ``~user``\n" |
16199 " authority certificates. Environment variables and ``~user``\n" |
15544 " constructs are expanded in the filename. If specified on the\n" |
16200 " constructs are expanded in the filename. If specified on the\n" |
15545 " client, then it will verify the identity of remote HTTPS servers\n" |
16201 " client, then it will verify the identity of remote HTTPS servers\n" |
15546 " with these certificates. The form must be as follows::" |
16202 " with these certificates." |
|
16203 msgstr "" |
|
16204 |
|
16205 msgid "" |
|
16206 " This feature is only supported when using Python 2.6 or later. If you " |
|
16207 "wish\n" |
|
16208 " to use it with earlier versions of Python, install the backported\n" |
|
16209 " version of the ssl library that is available from\n" |
|
16210 " ``http://pypi.python.org``." |
|
16211 msgstr "" |
|
16212 |
|
16213 msgid "" |
|
16214 " To disable SSL verification temporarily, specify ``--insecure`` from\n" |
|
16215 " command line." |
|
16216 msgstr "" |
|
16217 |
|
16218 msgid "" |
|
16219 " You can use OpenSSL's CA certificate file if your platform has\n" |
|
16220 " one. On most Linux systems this will be\n" |
|
16221 " ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to\n" |
|
16222 " generate this file manually. The form must be as follows::" |
15547 msgstr "" |
16223 msgstr "" |
15548 |
16224 |
15549 msgid "" |
16225 msgid "" |
15550 " -----BEGIN CERTIFICATE-----\n" |
16226 " -----BEGIN CERTIFICATE-----\n" |
15551 " ... (certificate in base64 PEM encoding) ...\n" |
16227 " ... (certificate in base64 PEM encoding) ...\n" |
15554 " ... (certificate in base64 PEM encoding) ...\n" |
16230 " ... (certificate in base64 PEM encoding) ...\n" |
15555 " -----END CERTIFICATE-----" |
16231 " -----END CERTIFICATE-----" |
15556 msgstr "" |
16232 msgstr "" |
15557 |
16233 |
15558 msgid "" |
16234 msgid "" |
15559 " This feature is only supported when using Python 2.6 or later. If you " |
|
15560 "wish\n" |
|
15561 " to use it with earlier versions of Python, install the backported\n" |
|
15562 " version of the ssl library that is available from\n" |
|
15563 " ``http://pypi.python.org``." |
|
15564 msgstr "" |
|
15565 |
|
15566 msgid "" |
|
15567 " You can use OpenSSL's CA certificate file if your platform has one.\n" |
|
15568 " On most Linux systems this will be ``/etc/ssl/certs/ca-certificates." |
|
15569 "crt``.\n" |
|
15570 " Otherwise you will have to generate this file manually." |
|
15571 msgstr "" |
|
15572 |
|
15573 msgid "" |
|
15574 " To disable SSL verification temporarily, specify ``--insecure`` from\n" |
|
15575 " command line." |
|
15576 msgstr "" |
|
15577 |
|
15578 msgid "" |
|
15579 "``cache``\n" |
16235 "``cache``\n" |
15580 " Whether to support caching in hgweb. Defaults to True." |
16236 " Whether to support caching in hgweb. Defaults to True." |
|
16237 msgstr "" |
|
16238 |
|
16239 msgid "" |
|
16240 "``collapse``\n" |
|
16241 " With ``descend`` enabled, repositories in subdirectories are shown at\n" |
|
16242 " a single level alongside repositories in the current path. With\n" |
|
16243 " ``collapse`` also enabled, repositories residing at a deeper level than\n" |
|
16244 " the current path are grouped behind navigable directory entries that\n" |
|
16245 " lead to the locations of these repositories. In effect, this setting\n" |
|
16246 " collapses each collection of repositories found within a subdirectory\n" |
|
16247 " into a single entry for that subdirectory. Default is False." |
15581 msgstr "" |
16248 msgstr "" |
15582 |
16249 |
15583 msgid "" |
16250 msgid "" |
15584 "``contact``\n" |
16251 "``contact``\n" |
15585 " Name or email address of the person in charge of the repository.\n" |
16252 " Name or email address of the person in charge of the repository.\n" |
17104 msgid "" |
17808 msgid "" |
17105 "There are some internal merge tools which can be used. The internal\n" |
17809 "There are some internal merge tools which can be used. The internal\n" |
17106 "merge tools are:" |
17810 "merge tools are:" |
17107 msgstr "" |
17811 msgstr "" |
17108 |
17812 |
17109 msgid "" |
17813 msgid ".. internaltoolsmarker" |
17110 "``internal:merge``\n" |
|
17111 " Uses the internal non-interactive simple merge algorithm for merging\n" |
|
17112 " files. It will fail if there are any conflicts and leave markers in\n" |
|
17113 " the partially merged file." |
|
17114 msgstr "" |
|
17115 |
|
17116 msgid "" |
|
17117 "``internal:fail``\n" |
|
17118 " Rather than attempting to merge files that were modified on both\n" |
|
17119 " branches, it marks them as unresolved. The resolve command must be\n" |
|
17120 " used to resolve these conflicts." |
|
17121 msgstr "" |
|
17122 |
|
17123 msgid "" |
|
17124 "``internal:local``\n" |
|
17125 " Uses the local version of files as the merged version." |
|
17126 msgstr "" |
|
17127 |
|
17128 msgid "" |
|
17129 "``internal:other``\n" |
|
17130 " Uses the other version of files as the merged version." |
|
17131 msgstr "" |
|
17132 |
|
17133 msgid "" |
|
17134 "``internal:prompt``\n" |
|
17135 " Asks the user which of the local or the other version to keep as\n" |
|
17136 " the merged version." |
|
17137 msgstr "" |
|
17138 |
|
17139 msgid "" |
|
17140 "``internal:dump``\n" |
|
17141 " Creates three versions of the files to merge, containing the\n" |
|
17142 " contents of local, other and base. These files can then be used to\n" |
|
17143 " perform a merge manually. If the file to be merged is named\n" |
|
17144 " ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" |
|
17145 " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" |
|
17146 " same directory as ``a.txt``." |
|
17147 msgstr "" |
17814 msgstr "" |
17148 |
17815 |
17149 msgid "" |
17816 msgid "" |
17150 "Internal tools are always available and do not require a GUI but will by " |
17817 "Internal tools are always available and do not require a GUI but will by " |
17151 "default\n" |
17818 "default\n" |
17370 msgstr "" |
18043 msgstr "" |
17371 |
18044 |
17372 msgid "See also :hg:`help filesets`.\n" |
18045 msgid "See also :hg:`help filesets`.\n" |
17373 msgstr "" |
18046 msgstr "" |
17374 |
18047 |
|
18048 msgid "" |
|
18049 "What are phases?\n" |
|
18050 "----------------" |
|
18051 msgstr "" |
|
18052 |
|
18053 msgid "" |
|
18054 "Phases are a system for tracking which changesets have been or should\n" |
|
18055 "be shared. This helps prevent common mistakes when modifying history\n" |
|
18056 "(for instance, with the mq or rebase extensions)." |
|
18057 msgstr "" |
|
18058 |
|
18059 msgid "Each changeset in a repository is in one of the following phases:" |
|
18060 msgstr "" |
|
18061 "Jeder Änderungssatz in einem Projektarchiv ist in einer der folgenden Phasen:" |
|
18062 |
|
18063 msgid "" |
|
18064 " - public : changeset is visible on a public server\n" |
|
18065 " - draft : changeset is not yet published\n" |
|
18066 " - secret : changeset should not be pushed, pulled, or cloned" |
|
18067 msgstr "" |
|
18068 |
|
18069 msgid "" |
|
18070 "These phases are ordered (public < draft < secret) and no changeset\n" |
|
18071 "can be in a lower phase than its ancestors. For instance, if a\n" |
|
18072 "changeset is public, all its ancestors are also public. Lastly,\n" |
|
18073 "changeset phases should only be changed towards the public phase." |
|
18074 msgstr "" |
|
18075 |
|
18076 msgid "" |
|
18077 "How are phases managed?\n" |
|
18078 "-----------------------" |
|
18079 msgstr "" |
|
18080 "Wie werden Phasen verwaltet?\n" |
|
18081 "--------------------------" |
|
18082 |
|
18083 msgid "" |
|
18084 "For the most part, phases should work transparently. By default, a\n" |
|
18085 "changeset is created in the draft phase and is moved into the public\n" |
|
18086 "phase when it is pushed to another repository." |
|
18087 msgstr "" |
|
18088 |
|
18089 msgid "" |
|
18090 "Once changesets become public, extensions like mq and rebase will\n" |
|
18091 "refuse to operate on them to prevent creating duplicate changesets.\n" |
|
18092 "Phases can also be manually manipulated with the :hg:`phase` command\n" |
|
18093 "if needed. See :hg:`help -v phase` for examples." |
|
18094 msgstr "" |
|
18095 |
|
18096 msgid "" |
|
18097 "Phases and servers\n" |
|
18098 "------------------" |
|
18099 msgstr "" |
|
18100 "Phasen und Server\n" |
|
18101 "--------------------------" |
|
18102 |
|
18103 msgid "Normally, all servers are ``publishing`` by default. This means::" |
|
18104 msgstr "" |
|
18105 |
|
18106 msgid "" |
|
18107 " - all draft changesets that are pulled or cloned appear in phase\n" |
|
18108 " public on the client" |
|
18109 msgstr "" |
|
18110 |
|
18111 msgid "" |
|
18112 " - all draft changesets that are pushed appear as public on both\n" |
|
18113 " client and server" |
|
18114 msgstr "" |
|
18115 |
|
18116 msgid " - secret changesets are neither pushed, pulled, or cloned" |
|
18117 msgstr "" |
|
18118 |
|
18119 msgid "" |
|
18120 ".. note::\n" |
|
18121 " Pulling a draft changeset from a publishing server does not mark it\n" |
|
18122 " as public on the server side due to the read-only nature of pull." |
|
18123 msgstr "" |
|
18124 |
|
18125 msgid "" |
|
18126 "Sometimes it may be desirable to push and pull changesets in the draft\n" |
|
18127 "phase to share unfinished work. This can be done by setting a\n" |
|
18128 "repository to disable publishing in its configuration file::" |
|
18129 msgstr "" |
|
18130 |
|
18131 msgid "" |
|
18132 " [phases]\n" |
|
18133 " publish = False" |
|
18134 msgstr "" |
|
18135 " [phases]\n" |
|
18136 " publish = False" |
|
18137 |
|
18138 msgid "See :hg:`help config` for more information on config files." |
|
18139 msgstr "" |
|
18140 "Siehe :hg:`help config` für weitere Informationen über Konfigurationsdateien." |
|
18141 |
|
18142 msgid "" |
|
18143 ".. note::\n" |
|
18144 " Servers running older versions of Mercurial are treated as\n" |
|
18145 " publishing." |
|
18146 msgstr "" |
|
18147 |
|
18148 msgid "" |
|
18149 "Examples\n" |
|
18150 "--------" |
|
18151 msgstr "" |
|
18152 "Beispiele\n" |
|
18153 "----------" |
|
18154 |
|
18155 msgid " - list changesets in draft or secret phase::" |
|
18156 msgstr "" |
|
18157 |
|
18158 msgid " hg log -r \"not public()\"" |
|
18159 msgstr " hg log -r \"not public()\"" |
|
18160 |
|
18161 msgid " - change all secret changesets to draft::" |
|
18162 msgstr "" |
|
18163 |
|
18164 msgid " hg phase --draft \"secret()\"" |
|
18165 msgstr "" |
|
18166 |
|
18167 msgid "" |
|
18168 " - forcibly move the current changeset and descendants from public to draft::" |
|
18169 msgstr "" |
|
18170 |
|
18171 msgid " hg phase --force --draft ." |
|
18172 msgstr "" |
|
18173 |
|
18174 msgid " - show a list of changeset revision and phase::" |
|
18175 msgstr "" |
|
18176 |
|
18177 msgid " hg log --template \"{rev} {phase}\\n\"" |
|
18178 msgstr "" |
|
18179 |
|
18180 #, fuzzy |
|
18181 msgid " - resynchronize draft changesets relative to a remote repository::" |
|
18182 msgstr "" |
|
18183 " - Änderungssätze in der Entwurfsphase (draft) erneut bezüglich eines " |
|
18184 "entfernten Projektarchivs synchronisieren::" |
|
18185 |
|
18186 msgid " hg phase -fd 'outgoing(URL)' " |
|
18187 msgstr "" |
|
18188 |
|
18189 msgid "" |
|
18190 "See :hg:`help phase` for more information on manually manipulating phases.\n" |
|
18191 msgstr "" |
|
18192 "Siehe :hg:`help phase` für mehr Informationen über die manuelle Manipulation " |
|
18193 "von Phasen.\n" |
|
18194 |
17375 msgid "Mercurial supports several ways to specify individual revisions." |
18195 msgid "Mercurial supports several ways to specify individual revisions." |
17376 msgstr "Mercurial unterstützt mehrere Arten individuelle Revisionen anzugeben." |
18196 msgstr "Mercurial unterstützt mehrere Arten individuelle Revisionen anzugeben." |
17377 |
18197 |
17378 msgid "" |
18198 msgid "" |
17379 "A plain integer is treated as a revision number. Negative integers are\n" |
18199 "A plain integer is treated as a revision number. Negative integers are\n" |
17399 "Bezeichner einer Revision angesehen und wird Kurzform-Bezeichner\n" |
18219 "Bezeichner einer Revision angesehen und wird Kurzform-Bezeichner\n" |
17400 "genannt. Ein Kurzform-Bezeichner ist nur gültig, wenn er ein Präfix\n" |
18220 "genannt. Ein Kurzform-Bezeichner ist nur gültig, wenn er ein Präfix\n" |
17401 "der Langform genau einer Revisions-ID ist." |
18221 "der Langform genau einer Revisions-ID ist." |
17402 |
18222 |
17403 msgid "" |
18223 msgid "" |
17404 "Any other string is treated as a tag or branch name. A tag name is a\n" |
18224 "Any other string is treated as a bookmark, tag, or branch name. A\n" |
17405 "symbolic name associated with a revision identifier. A branch name\n" |
18225 "bookmark is a movable pointer to a revision. A tag is a permanent name\n" |
17406 "denotes the tipmost revision of that branch. Tag and branch names must\n" |
18226 "associated with a revision. A branch name denotes the tipmost revision\n" |
17407 "not contain the \":\" character." |
18227 "of that branch. Bookmark, tag, and branch names must not contain the \":\"\n" |
17408 msgstr "" |
18228 "character." |
17409 "Jede andere Zeichenfolge wird als Name eines Tags oder Zweiges behandelt.\n" |
18229 msgstr "" |
17410 "Ein Tag ist ein symbolischer Name für eine Revisions-ID. Ein Zweigname\n" |
18230 "Jede andere Zeichenfolge wird als Lesezeichen, oder Name eines Etiketts\n" |
17411 "bezeichnet hier die jüngste Kopfrevision des Zweigs. Tags und Zweignamen\n" |
18231 "oder Zweiges behandelt. Ein Lesezeichen ist ein beweglicher Zeiger auf eine\n" |
17412 "dürfen das Zeichen \":\" nicht enthalten." |
18232 "Revision. Ein Etikett ist ein permanenter Name für eine Revision.\n" |
17413 |
18233 "Ein Zweigname bezeichnet hier die jüngste Kopfrevision des Zweigs.\n" |
17414 msgid "" |
18234 "Lesezeichen, Etiketten und Zweignamen dürfen das Zeichen \":\" nicht " |
17415 "The reserved name \"tip\" is a special tag that always identifies the\n" |
18235 "enthalten." |
17416 "most recent revision." |
18236 |
17417 msgstr "" |
18237 msgid "The reserved name \"tip\" always identifies the most recent revision." |
17418 "Der reservierte Name \"tip\" ist ein spezielles Tag, welches immer auf\n" |
18238 msgstr "Der reservierte Name \"tip\" identifiziert immer die neueste Revision." |
17419 "die jüngste Revision verweist." |
|
17420 |
18239 |
17421 msgid "" |
18240 msgid "" |
17422 "The reserved name \"null\" indicates the null revision. This is the\n" |
18241 "The reserved name \"null\" indicates the null revision. This is the\n" |
17423 "revision of an empty repository, and the parent of revision 0." |
18242 "revision of an empty repository, and the parent of revision 0." |
17424 msgstr "" |
18243 msgstr "" |
17450 "Die Sprache unterstützt eine Reihe von Prädikaten, die über Infix-\n" |
18269 "Die Sprache unterstützt eine Reihe von Prädikaten, die über Infix-\n" |
17451 "Operatoren miteinander verbunden werden. Klammern können zur\n" |
18270 "Operatoren miteinander verbunden werden. Klammern können zur\n" |
17452 "Gruppierung verwendet werden." |
18271 "Gruppierung verwendet werden." |
17453 |
18272 |
17454 msgid "" |
18273 msgid "" |
17455 "Identifiers such as branch names must be quoted with single or double\n" |
18274 "Identifiers such as branch names may need quoting with single or\n" |
17456 "quotes if they contain characters outside of\n" |
18275 "double quotes if they contain characters like ``-`` or if they match\n" |
17457 "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" |
18276 "one of the predefined predicates." |
17458 "predicates." |
|
17459 msgstr "" |
18277 msgstr "" |
17460 "Bezeichner wie Zweignamen müssen mit einfachen oder doppelten\n" |
18278 "Bezeichner wie Zweignamen müssen mit einfachen oder doppelten\n" |
17461 "Anführungszeichen umgeben werden, wenn sie Zeichen außerhalb von\n" |
18279 "Anführungszeichen umgeben werden, wenn sie Zeichen wie ``-``\n" |
17462 "``[._a-zA-Z0-9\\x80-\\xff]`` oder wenn sie einem der vordefinierten\n" |
18280 "enthalten oder wenn sie einem der vordefinierten Prädikateņ\n" |
17463 "Prädikate entsprechen. Sonderzeichen können in Bezeichnern mit\n" |
18281 "entsprechen." |
17464 "Anführungszeichen verwendet werden, indem sie \\-maskiert werden, z.B.\n" |
|
17465 "wird ``\\n`` als Zeilenumbruch interpretiert." |
|
17466 |
18282 |
17467 msgid "" |
18283 msgid "" |
17468 "``not x``\n" |
18284 "``not x``\n" |
17469 " Changesets not in x. Short form is ``! x``." |
18285 " Changesets not in x. Short form is ``! x``." |
17470 msgstr "" |
18286 msgstr "" |
17664 msgstr "" |
18480 msgstr "" |
17665 "1. Verschachtelte Archivaktualisierungen. Sie können überall im\n" |
18481 "1. Verschachtelte Archivaktualisierungen. Sie können überall im\n" |
17666 " übergeordneten Arbeitsverzeichnis auftauchen." |
18482 " übergeordneten Arbeitsverzeichnis auftauchen." |
17667 |
18483 |
17668 msgid "" |
18484 msgid "" |
17669 "2. Nested repository references. They are defined in ``.hgsub`` and\n" |
18485 "2. Nested repository references. They are defined in ``.hgsub``, which\n" |
|
18486 " should be placed in the root of working directory, and\n" |
17670 " tell where the subrepository checkouts come from. Mercurial\n" |
18487 " tell where the subrepository checkouts come from. Mercurial\n" |
17671 " subrepositories are referenced like:" |
18488 " subrepositories are referenced like:" |
17672 msgstr "" |
18489 msgstr "" |
17673 "2. Verschachtelte Archivreferenzen. Sie werden in ``.hgsub`` definiert\n" |
18490 "2. Verschachtelte Archivreferenzen. Sie werden in ``.hgsub`` definiert, " |
17674 " und geben an, wo Archivaktualisierungen herkommen.\n" |
18491 "was in der Wurzel des Arbeitsverzeichnisses abgelegt werden sollte,\n" |
|
18492 " und geben an, wo Aktualisierungen für Unterarchive herkommen.\n" |
17675 " Mercurial-Unterarchive werden wie folgt angegeben:" |
18493 " Mercurial-Unterarchive werden wie folgt angegeben:" |
17676 |
18494 |
17677 msgid " path/to/nested = https://example.com/nested/repo/path" |
18495 msgid " path/to/nested = https://example.com/nested/repo/path" |
17678 msgstr "" |
18496 msgstr "" |
17679 |
18497 |
18415 msgid "cannot partially commit a merge (do not specify files or patterns)" |
19226 msgid "cannot partially commit a merge (do not specify files or patterns)" |
18416 msgstr "" |
19227 msgstr "" |
18417 "Das Zusammenführen kann nicht teilweise gespeichert werden (gib keine " |
19228 "Das Zusammenführen kann nicht teilweise gespeichert werden (gib keine " |
18418 "Dateien oder Muster an)" |
19229 "Dateien oder Muster an)" |
18419 |
19230 |
|
19231 #, python-format |
|
19232 msgid "commit with new subrepo %s excluded" |
|
19233 msgstr "Ohne neues Unterarchiv %s übernehmen" |
|
19234 |
|
19235 msgid "use --subrepos for recursive commit" |
|
19236 msgstr "" |
|
19237 |
18420 msgid "can't commit subrepos without .hgsub" |
19238 msgid "can't commit subrepos without .hgsub" |
18421 msgstr "Kann Unterarchiv nicht ohne .hgsub speichern" |
19239 msgstr "Kann Unterarchiv nicht ohne .hgsub speichern" |
18422 |
19240 |
18423 msgid "use --subrepos for recursive commit" |
|
18424 msgstr "" |
|
18425 |
|
18426 msgid "file not found!" |
19241 msgid "file not found!" |
18427 msgstr "Datei nicht gefunden!" |
19242 msgstr "Datei nicht gefunden!" |
18428 |
19243 |
18429 msgid "no match under directory!" |
19244 msgid "no match under directory!" |
18430 msgstr "Kein Treffer unterhalb des Verzeichnisses!" |
19245 msgstr "Kein Treffer unterhalb des Verzeichnisses!" |
18431 |
19246 |
18432 msgid "file not tracked!" |
19247 msgid "file not tracked!" |
18433 msgstr "Datei wird nicht versioniert!" |
19248 msgstr "Datei wird nicht versioniert!" |
18434 |
19249 |
|
19250 msgid "cannot commit merge with missing files" |
|
19251 msgstr "" |
|
19252 "Zusammenführung kann aufgrund fehlender Dateien nicht übernommen werden" |
|
19253 |
18435 msgid "unresolved merge conflicts (see hg help resolve)" |
19254 msgid "unresolved merge conflicts (see hg help resolve)" |
18436 msgstr "Ungelöste Konflikte beim Zusammenführen (siehe hg help resolve)" |
19255 msgstr "Ungelöste Konflikte beim Zusammenführen (siehe hg help resolve)" |
18437 |
19256 |
18438 #, python-format |
19257 #, python-format |
18439 msgid "committing subrepository %s\n" |
19258 msgid "committing subrepository %s\n" |
18788 # Würde schon im Original mit "... ON text line" mehr Sinn ergeben. Kann mir auch nach einem Blick in die Sourcen nicht vorstellen, was diese Meldung genau aussagen soll. |
19614 # Würde schon im Original mit "... ON text line" mehr Sinn ergeben. Kann mir auch nach einem Blick in die Sourcen nicht vorstellen, was diese Meldung genau aussagen soll. |
18789 #, python-format |
19615 #, python-format |
18790 msgid "bad hunk #%d old text line %d" |
19616 msgid "bad hunk #%d old text line %d" |
18791 msgstr "Fehlerhaftes Teilstück #%d, alte Textzeile %d" |
19617 msgstr "Fehlerhaftes Teilstück #%d, alte Textzeile %d" |
18792 |
19618 |
18793 msgid "could not extract binary patch" |
19619 #, python-format |
18794 msgstr "Konnte Binärpatch nicht extrahieren" |
19620 msgid "could not extract \"%s\" binary data" |
18795 |
19621 msgstr "Konnte binäre Daten \"%s\" nicht extrahieren" |
18796 #, python-format |
19622 |
18797 msgid "binary patch is %d bytes, not %d" |
19623 #, python-format |
18798 msgstr "Binärpatch ist %d Bytes groß, nicht %d" |
19624 msgid "could not decode \"%s\" binary patch: %s" |
|
19625 msgstr "Konnte binären Patch \"%s\" nicht dekodieren: %s" |
|
19626 |
|
19627 #, python-format |
|
19628 msgid "\"%s\" length is %d bytes, should be %d" |
|
19629 msgstr "Länge von\"%s\" ist %d bytes, sollte aber %d sein" |
18799 |
19630 |
18800 #, python-format |
19631 #, python-format |
18801 msgid "unable to strip away %d of %d dirs from %s" |
19632 msgid "unable to strip away %d of %d dirs from %s" |
18802 msgstr "Konnte %d von %d Verzeichnissen nicht aus %s entfernen" |
19633 msgstr "Konnte %d von %d Verzeichnissen nicht aus %s entfernen" |
18803 |
19634 |
18804 msgid "undefined source and destination files" |
19635 msgid "undefined source and destination files" |
18805 msgstr "undefinierte Quell- und Zieldateien" |
19636 msgstr "undefinierte Quell- und Zieldateien" |
18806 |
19637 |
18807 #, python-format |
19638 #, python-format |
|
19639 msgid "failed to synchronize metadata for \"%s\"" |
|
19640 msgstr "" |
|
19641 |
|
19642 #, python-format |
18808 msgid "cannot create %s: destination already exists" |
19643 msgid "cannot create %s: destination already exists" |
18809 msgstr "Kann %s nicht anlegen: Zielverzeichnis existiert bereits" |
19644 msgstr "Kann %s nicht anlegen: Zielverzeichnis existiert bereits" |
18810 |
19645 |
18811 #, python-format |
19646 #, python-format |
18812 msgid "unsupported parser state: %s" |
19647 msgid "unsupported parser state: %s" |
18971 " - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip\n" |
19813 " - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip\n" |
18972 " - ``goods``, ``bads`` : csets topologicaly good/bad\n" |
19814 " - ``goods``, ``bads`` : csets topologicaly good/bad\n" |
18973 " - ``range`` : csets taking part in the bisection\n" |
19815 " - ``range`` : csets taking part in the bisection\n" |
18974 " - ``pruned`` : csets that are goods, bads or skipped\n" |
19816 " - ``pruned`` : csets that are goods, bads or skipped\n" |
18975 " - ``untested`` : csets whose fate is yet unknown\n" |
19817 " - ``untested`` : csets whose fate is yet unknown\n" |
18976 " - ``ignored`` : csets ignored due to DAG topology" |
19818 " - ``ignored`` : csets ignored due to DAG topology\n" |
|
19819 " - ``current`` : the cset currently being bisected" |
18977 msgstr "" |
19820 msgstr "" |
18978 |
19821 |
18979 msgid "bisect requires a string" |
19822 msgid "bisect requires a string" |
18980 msgstr "bisect erwartet eine Zeichenkette" |
19823 msgstr "bisect erwartet eine Zeichenkette" |
18981 |
19824 |
18982 msgid "" |
19825 msgid "" |
18983 "``bookmark([name])``\n" |
19826 "``bookmark([name])``\n" |
18984 " The named bookmark or all bookmarks." |
19827 " The named bookmark or all bookmarks." |
|
19828 msgstr "" |
|
19829 |
|
19830 msgid "" |
|
19831 " If `name` starts with `re:`, the remainder of the name is treated as\n" |
|
19832 " a regular expression. To match a bookmark that actually starts with `re:" |
|
19833 "`,\n" |
|
19834 " use the prefix `literal:`." |
18985 msgstr "" |
19835 msgstr "" |
18986 |
19836 |
18987 #. i18n: "bookmark" is a keyword |
19837 #. i18n: "bookmark" is a keyword |
18988 msgid "bookmark takes one or no arguments" |
19838 msgid "bookmark takes one or no arguments" |
18989 msgstr "bookmark verlangt ein oder zwei Argumente" |
19839 msgstr "bookmark verlangt ein oder zwei Argumente" |
18990 |
19840 |
18991 #. i18n: "bookmark" is a keyword |
19841 #. i18n: "bookmark" is a keyword |
18992 msgid "the argument to bookmark must be a string" |
19842 msgid "the argument to bookmark must be a string" |
18993 msgstr "'bookmark' erwartet eine Zeichenkette als Parameter" |
19843 msgstr "'bookmark' erwartet eine Zeichenkette als Parameter" |
|
19844 |
|
19845 #, python-format |
|
19846 msgid "no bookmarks exist that match '%s'" |
|
19847 msgstr "" |
18994 |
19848 |
18995 msgid "" |
19849 msgid "" |
18996 "``branch(string or set)``\n" |
19850 "``branch(string or set)``\n" |
18997 " All changesets belonging to the given branch or the branches of the " |
19851 " All changesets belonging to the given branch or the branches of the " |
18998 "given\n" |
19852 "given\n" |
19067 |
19928 |
19068 msgid "draft takes no arguments" |
19929 msgid "draft takes no arguments" |
19069 msgstr "draft erwartet keine Argumente" |
19930 msgstr "draft erwartet keine Argumente" |
19070 |
19931 |
19071 msgid "" |
19932 msgid "" |
|
19933 "``extra(label, [value])``\n" |
|
19934 " Changesets with the given label in the extra metadata, with the given\n" |
|
19935 " optional value." |
|
19936 msgstr "" |
|
19937 |
|
19938 msgid "" |
|
19939 " If `value` starts with `re:`, the remainder of the value is treated as\n" |
|
19940 " a regular expression. To match a value that actually starts with `re:`,\n" |
|
19941 " use the prefix `literal:`." |
|
19942 msgstr "" |
|
19943 |
|
19944 msgid "extra takes at least 1 and at most 2 arguments" |
|
19945 msgstr "extra erwartet mindestens eins und höchstens zwei Argumente" |
|
19946 |
|
19947 msgid "first argument to extra must be a string" |
|
19948 msgstr "Erstes Argument für extra muss eine Zeichenkette sein" |
|
19949 |
|
19950 msgid "second argument to extra must be a string" |
|
19951 msgstr "Zweites Argument für extra muss eine Zeichenkette sein" |
|
19952 |
|
19953 msgid "" |
19072 "``filelog(pattern)``\n" |
19954 "``filelog(pattern)``\n" |
19073 " Changesets connected to the specified filelog." |
19955 " Changesets connected to the specified filelog." |
19074 msgstr "" |
19956 msgstr "" |
19075 "``filelog(muster)``\n" |
19957 "``filelog(muster)``\n" |
19076 " Änderungssätze, die das gegebene filelog betreffen." |
19958 " Änderungssätze, die das gegebene filelog betreffen." |
19318 "``present(liste)``\n" |
20214 "``present(liste)``\n" |
19319 " Die gegebene Liste, wenn alle Revisionen darin gefunden wurden. Wenn\n" |
20215 " Die gegebene Liste, wenn alle Revisionen darin gefunden wurden. Wenn\n" |
19320 " ein Eintrag nicht gefunden wird, die leere Menge." |
20216 " ein Eintrag nicht gefunden wird, die leere Menge." |
19321 |
20217 |
19322 msgid "" |
20218 msgid "" |
|
20219 " If any of specified revisions is not present in the local repository,\n" |
|
20220 " the query is normally aborted. But this predicate allows the query\n" |
|
20221 " to continue even in such cases." |
|
20222 msgstr "" |
|
20223 |
|
20224 msgid "" |
19323 "``public()``\n" |
20225 "``public()``\n" |
19324 " Changeset in public phase." |
20226 " Changeset in public phase." |
19325 msgstr "" |
20227 msgstr "" |
19326 |
20228 |
19327 msgid "public takes no arguments" |
20229 msgid "public takes no arguments" |
19328 msgstr "public erwartet keine Argumente" |
20230 msgstr "public erwartet keine Argumente" |
19329 |
20231 |
19330 msgid "" |
20232 msgid "" |
19331 "``remote([id], [path])``\n" |
20233 "``remote([id [,path]])``\n" |
19332 " Local revision that corresponds to the given identifier in a\n" |
20234 " Local revision that corresponds to the given identifier in a\n" |
19333 " remote repository, if present. Here, the '.' identifier is a\n" |
20235 " remote repository, if present. Here, the '.' identifier is a\n" |
19334 " synonym for the current local branch." |
20236 " synonym for the current local branch." |
19335 msgstr "" |
20237 msgstr "" |
19336 |
20238 |
19337 #. i18n: "remote" is a keyword |
20239 #. i18n: "remote" is a keyword |
19338 msgid "outgoing takes one or two arguments" |
20240 msgid "remote takes one, two or no arguments" |
19339 msgstr "'outgoing' erwartet ein oder zwei Argumente" |
20241 msgstr "remote erwartet ein, zwei oder keine Argumente" |
19340 |
20242 |
19341 #. i18n: "remote" is a keyword |
20243 #. i18n: "remote" is a keyword |
19342 msgid "remote requires a string id" |
20244 msgid "remote requires a string id" |
19343 msgstr "remote erwartet eine Zeichenkette (ID)" |
20245 msgstr "remote erwartet eine Zeichenkette (ID)" |
19344 |
20246 |
19373 #. i18n: "rev" is a keyword |
20275 #. i18n: "rev" is a keyword |
19374 msgid "rev expects a number" |
20276 msgid "rev expects a number" |
19375 msgstr "'rev' erwartet eine Zahl" |
20277 msgstr "'rev' erwartet eine Zahl" |
19376 |
20278 |
19377 msgid "" |
20279 msgid "" |
|
20280 "``matching(revision [, field])``\n" |
|
20281 " Changesets in which a given set of fields match the set of fields in " |
|
20282 "the\n" |
|
20283 " selected revision or set." |
|
20284 msgstr "" |
|
20285 |
|
20286 msgid "" |
|
20287 " To match more than one field pass the list of fields to match separated\n" |
|
20288 " by spaces (e.g. ``author description``)." |
|
20289 msgstr "" |
|
20290 |
|
20291 msgid "" |
|
20292 " Valid fields are most regular revision fields and some special fields." |
|
20293 msgstr "" |
|
20294 |
|
20295 msgid "" |
|
20296 " Regular revision fields are ``description``, ``author``, ``branch``,\n" |
|
20297 " ``date``, ``files``, ``phase``, ``parents``, ``substate`` and ``user``.\n" |
|
20298 " Note that ``author`` and ``user`` are synonyms." |
|
20299 msgstr "" |
|
20300 |
|
20301 msgid "" |
|
20302 " Special fields are ``summary`` and ``metadata``:\n" |
|
20303 " ``summary`` matches the first line of the description.\n" |
|
20304 " ``metadata`` is equivalent to matching ``description user date``\n" |
|
20305 " (i.e. it matches the main metadata fields)." |
|
20306 msgstr "" |
|
20307 |
|
20308 msgid "" |
|
20309 " ``metadata`` is the default field which is used when no fields are\n" |
|
20310 " specified. You can match more than one field at a time." |
|
20311 msgstr "" |
|
20312 |
|
20313 msgid "matching takes 1 or 2 arguments" |
|
20314 msgstr "matching erwartet 1 oder 2 Argumente" |
|
20315 |
|
20316 msgid "matching requires a string as its second argument" |
|
20317 msgstr "matching erwartet eine Zeichenkette als sein zweites Argument" |
|
20318 |
|
20319 #, python-format |
|
20320 msgid "unexpected field name passed to matching: %s" |
|
20321 msgstr "Unerwarteter Feldname wurde an matching übergeben: %s" |
|
20322 |
|
20323 msgid "" |
19378 "``reverse(set)``\n" |
20324 "``reverse(set)``\n" |
19379 " Reverse order of set." |
20325 " Reverse order of set." |
19380 msgstr "" |
20326 msgstr "" |
19381 "``reverse(set)``\n" |
20327 "``reverse(set)``\n" |
19382 " Kehrt die Liste um." |
20328 " Kehrt die Liste um." |
19383 |
20329 |
19384 msgid "" |
20330 msgid "" |
19385 "``roots(set)``\n" |
20331 "``roots(set)``\n" |
19386 " Changesets with no parent changeset in set." |
20332 " Changesets in set with no parent changeset in set." |
19387 msgstr "" |
20333 msgstr "" |
19388 "``roots(menge)``\n" |
20334 "``roots(Menge)``\n" |
19389 " Änderungssätze, die keine Eltern in der Menge haben." |
20335 " Änderungssätze in der Menge, die keine Vorgänger in der Menge haben." |
19390 |
20336 |
19391 msgid "" |
20337 msgid "" |
19392 "``secret()``\n" |
20338 "``secret()``\n" |
19393 " Changeset in secret phase." |
20339 " Changeset in secret phase." |
19394 msgstr "" |
20340 msgstr "" |
19443 |
20393 |
19444 #. i18n: "tag" is a keyword |
20394 #. i18n: "tag" is a keyword |
19445 msgid "the argument to tag must be a string" |
20395 msgid "the argument to tag must be a string" |
19446 msgstr "'tag' erwartet eine Zeichenkette" |
20396 msgstr "'tag' erwartet eine Zeichenkette" |
19447 |
20397 |
|
20398 #, python-format |
|
20399 msgid "no tags exist that match '%s'" |
|
20400 msgstr "Es existiert kein Etikett, dass auf '%s' passt" |
|
20401 |
19448 msgid "" |
20402 msgid "" |
19449 "``user(string)``\n" |
20403 "``user(string)``\n" |
19450 " User name contains string. The match is case-insensitive." |
20404 " User name contains string. The match is case-insensitive." |
19451 msgstr "" |
20405 msgstr "" |
19452 "``user(zeichenkette)``\n" |
20406 "``user(zeichenkette)``\n" |
19453 " Der Benutzername enthält die Zeichenkette. Großschreibung wird ignoriert." |
20407 " Der Benutzername enthält die Zeichenkette. Großschreibung wird ignoriert." |
19454 |
20408 |
|
20409 msgid "" |
|
20410 " If `string` starts with `re:`, the remainder of the string is treated " |
|
20411 "as\n" |
|
20412 " a regular expression. To match a user that actually contains `re:`, use\n" |
|
20413 " the prefix `literal:`." |
|
20414 msgstr "" |
|
20415 |
19455 msgid "can't negate that" |
20416 msgid "can't negate that" |
19456 msgstr "kann dies nicht negieren" |
20417 msgstr "kann dies nicht negieren" |
19457 |
20418 |
19458 msgid "not a symbol" |
20419 msgid "not a symbol" |
19459 msgstr "kein Symbol" |
20420 msgstr "kein Symbol" |
19460 |
20421 |
19461 #, python-format |
20422 #, python-format |
|
20423 msgid "infinite expansion of revset alias \"%s\" detected" |
|
20424 msgstr "" |
|
20425 |
|
20426 #, python-format |
19462 msgid "invalid number of arguments: %s" |
20427 msgid "invalid number of arguments: %s" |
19463 msgstr "ungültige Parameteranzahl: %s" |
20428 msgstr "ungültige Parameteranzahl: %s" |
19464 |
20429 |
19465 msgid "empty query" |
20430 msgid "empty query" |
19466 msgstr "Leere Anfrage" |
20431 msgstr "Leere Anfrage" |
19467 |
20432 |
19468 #, python-format |
20433 #, python-format |
|
20434 msgid "no changes found (ignored %d secret changesets)\n" |
|
20435 msgstr "" |
|
20436 "Keine Änderungen gefunden (%d geheime Änderungssätze wurden ignoriert)\n" |
|
20437 |
|
20438 #, python-format |
19469 msgid "ui.portablefilenames value is invalid ('%s')" |
20439 msgid "ui.portablefilenames value is invalid ('%s')" |
19470 msgstr "" |
20440 msgstr "" |
19471 |
20441 |
19472 #, python-format |
20442 #, python-format |
19473 msgid "possible case-folding collision for %s" |
20443 msgid "possible case-folding collision for %s" |
19733 #, python-format |
20713 #, python-format |
19734 msgid "pushing subrepo %s to %s\n" |
20714 msgid "pushing subrepo %s to %s\n" |
19735 msgstr "Übertrage Unterarchiv %s zu %s\n" |
20715 msgstr "Übertrage Unterarchiv %s zu %s\n" |
19736 |
20716 |
19737 #, python-format |
20717 #, python-format |
|
20718 msgid "reverting subrepo %s\n" |
|
20719 msgstr "Zurücksetzen von Unterarchiv %s\n" |
|
20720 |
|
20721 #, python-format |
19738 msgid "'svn' executable not found for subrepo '%s'" |
20722 msgid "'svn' executable not found for subrepo '%s'" |
19739 msgstr "" |
20723 msgstr "" |
19740 |
20724 |
19741 msgid "cannot retrieve svn tool version" |
20725 msgid "cannot retrieve svn tool version" |
19742 msgstr "Kann svn-Version nicht herausfinden" |
20726 msgstr "Kann svn-Version nicht herausfinden" |
19743 |
20727 |
19744 msgid "cannot commit svn externals" |
20728 msgid "cannot commit svn externals" |
19745 msgstr "Kann SVN-Externals nicht speichern" |
20729 msgstr "Kann SVN-Externals nicht speichern" |
|
20730 |
|
20731 msgid "cannot commit missing svn entries" |
|
20732 msgstr "Kann fehlende SVN-Einträge nicht übernehmen" |
|
20733 |
|
20734 msgid "failed to commit svn changes" |
|
20735 msgstr "Übernahme von SVN-Änderungen fehlgeschlagen" |
19746 |
20736 |
19747 #, python-format |
20737 #, python-format |
19748 msgid "not removing repo %s because it has changes.\n" |
20738 msgid "not removing repo %s because it has changes.\n" |
19749 msgstr "Entferne Projektarchiv %s nicht, da es Änderungen enthält.\n" |
20739 msgstr "Entferne Projektarchiv %s nicht, da es Änderungen enthält.\n" |
19750 |
20740 |
19904 " XML entities." |
20894 " XML entities." |
19905 msgstr "" |
20895 msgstr "" |
19906 ":obfuscate: Beliebiger Text. Gibt den Text als Folge von XML-Entitäten\n" |
20896 ":obfuscate: Beliebiger Text. Gibt den Text als Folge von XML-Entitäten\n" |
19907 " zurück." |
20897 " zurück." |
19908 |
20898 |
19909 msgid ":person: Any text. Returns the text before an email address." |
20899 msgid "" |
19910 msgstr "" |
20900 ":person: Any text. Returns the name before an email address,\n" |
19911 ":person: Beliebiger Text. Gibt den Text vor einer E-Mail-Adresse zurück." |
20901 " interpreting it as per RFC 5322." |
|
20902 msgstr "" |
|
20903 ":person: Beliebiger Text. Gibt den Text vor einer E-Mail-Adresse\n" |
|
20904 " zurück, interpretiert als RFC 5322." |
|
20905 |
|
20906 msgid "" |
|
20907 " >>> person('foo@bar')\n" |
|
20908 " 'foo'\n" |
|
20909 " >>> person('Foo Bar <foo@bar>')\n" |
|
20910 " 'Foo Bar'\n" |
|
20911 " >>> person('\"Foo Bar\" <foo@bar>')\n" |
|
20912 " 'Foo Bar'\n" |
|
20913 " >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n" |
|
20914 " 'Foo \"buz\" Bar'\n" |
|
20915 " >>> # The following are invalid, but do exist in real-life\n" |
|
20916 " ...\n" |
|
20917 " >>> person('Foo \"buz\" Bar <foo@bar>')\n" |
|
20918 " 'Foo \"buz\" Bar'\n" |
|
20919 " >>> person('\"Foo Bar <foo@bar>')\n" |
|
20920 " 'Foo Bar'" |
|
20921 msgstr "" |
19912 |
20922 |
19913 msgid "" |
20923 msgid "" |
19914 ":rfc3339date: Date. Returns a date using the Internet date format\n" |
20924 ":rfc3339date: Date. Returns a date using the Internet date format\n" |
19915 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." |
20925 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." |
19916 msgstr "" |
20926 msgstr "" |
20494 msgid "look up remote changes" |
21508 msgid "look up remote changes" |
20495 msgstr "entfernte Änderungen abrufen" |
21509 msgstr "entfernte Änderungen abrufen" |
20496 |
21510 |
20497 msgid "push failed:" |
21511 msgid "push failed:" |
20498 msgstr "Übertragen fehlgeschlagen: %s" |
21512 msgstr "Übertragen fehlgeschlagen: %s" |
|
21513 |
|
21514 #~ msgid "The hook does not change bug status." |
|
21515 #~ msgstr "Diese Erweiterung ändert den Status des Bugzilla-Tickets nicht." |
|
21516 |
|
21517 #~ msgid "" |
|
21518 #~ "bugzilla.regexp\n" |
|
21519 #~ " Regular expression to match bug IDs in changeset commit message.\n" |
|
21520 #~ " Must contain one \"()\" group. The default expression matches ``Bug\n" |
|
21521 #~ " 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n" |
|
21522 #~ " ``Bug 1234 and 5678`` and variations thereof. Matching is case\n" |
|
21523 #~ " insensitive." |
|
21524 #~ msgstr "" |
|
21525 #~ "bugzilla.regexp\n" |
|
21526 #~ " Der Reguläre Ausdruck, mit dem Ticket-IDs in der Versionsmeldung " |
|
21527 #~ "erkannt\n" |
|
21528 #~ " werden. Er muss eine \"()\"-Gruppe enthalten. Der Standardwert " |
|
21529 #~ "erkennt:\n" |
|
21530 #~ " 'Bug 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678',\n" |
|
21531 #~ " 'Bug 1234 and 5678' und Variationen. Großschreibung wird ignoriert." |
|
21532 |
|
21533 #~ msgid "%s is not a valid revision in current branch" |
|
21534 #~ msgstr "%s ist keine gültige Revision im aktuellen Zweig" |
|
21535 |
|
21536 #~ msgid "-G/--graph option is incompatible with --follow with file argument" |
|
21537 #~ msgstr "Option -G/--graph ist inkompatibel zu --follow mit Dateiparameter" |
|
21538 |
|
21539 #~ msgid "hg glog [OPTION]... [FILE]" |
|
21540 #~ msgstr "hg glog [OPTION]... [DATEI]" |
|
21541 |
|
21542 #~ msgid "import a patch" |
|
21543 #~ msgstr "Importiert einen Patch" |
|
21544 |
|
21545 #~ msgid "" |
|
21546 #~ " When -f/--force is applied, all local changes in patched files\n" |
|
21547 #~ " will be lost." |
|
21548 #~ msgstr "" |
|
21549 #~ " Wenn -f/--force angegeben ist, werden alle lokalen Änderungen in den\n" |
|
21550 #~ " vom Patch betroffenen Dateien verlorengehen." |
|
21551 |
|
21552 #~ msgid "" |
|
21553 #~ "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" |
|
21554 #~ "setting::" |
|
21555 #~ msgstr "" |
|
21556 #~ "Wenn Sie \"BROKEN PIPE\"-Fehlermeldungen erhalten, können Sie diese über\n" |
|
21557 #~ "die folgende Einstellung deaktivieren::" |
|
21558 |
|
21559 #~ msgid "use \"hg -v help %s\" to show more info" |
|
21560 #~ msgstr "Nutze \"hg -v help %s\" um mehr Informationen anzuzeigen" |
|
21561 |
|
21562 #~ msgid "follow takes no arguments" |
|
21563 #~ msgstr "follow erwartet keine Argumente" |
|
21564 |
|
21565 #~ msgid "outgoing takes one or two arguments" |
|
21566 #~ msgstr "'outgoing' erwartet ein oder zwei Argumente" |