248 |
247 |
249 msgid "" |
248 msgid "" |
250 "Bugzilla integration\n" |
249 "Bugzilla integration\n" |
251 "\n" |
250 "\n" |
252 "This hook extension adds comments on bugs in Bugzilla when changesets\n" |
251 "This hook extension adds comments on bugs in Bugzilla when changesets\n" |
253 "that refer to bugs by Bugzilla ID are seen. The hook does not change bug\n" |
252 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n" |
254 "status.\n" |
253 "bug status.\n" |
255 "\n" |
254 "\n" |
256 "The hook updates the Bugzilla database directly. Only Bugzilla " |
255 "The hook updates the Bugzilla database directly. Only Bugzilla\n" |
257 "installations\n" |
256 "installations using MySQL are supported.\n" |
258 "using MySQL are supported.\n" |
257 "\n" |
259 "\n" |
258 "The hook relies on a Bugzilla script to send bug change notification\n" |
260 "The hook relies on a Bugzilla script to send bug change notification " |
259 "emails. That script changes between Bugzilla versions; the\n" |
261 "emails.\n" |
260 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n" |
262 "That script changes between Bugzilla versions; the 'processmail' script " |
261 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" |
263 "used\n" |
262 "be run by Mercurial as the user pushing the change; you will need to\n" |
264 "prior to 2.18 is replaced in 2.18 and subsequent versions by\n" |
263 "ensure the Bugzilla install file permissions are set appropriately.\n" |
265 "'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " |
|
266 "user\n" |
|
267 "pushing the change; you will need to ensure the Bugzilla install file\n" |
|
268 "permissions are set appropriately.\n" |
|
269 "\n" |
264 "\n" |
270 "Configuring the extension:\n" |
265 "Configuring the extension:\n" |
271 "\n" |
266 "\n" |
272 " [bugzilla]\n" |
267 " [bugzilla]\n" |
273 " host Hostname of the MySQL server holding the Bugzilla database.\n" |
268 "\n" |
|
269 " host Hostname of the MySQL server holding the Bugzilla\n" |
|
270 " database.\n" |
274 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" |
271 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" |
275 " user Username to use to access MySQL server. Default 'bugs'.\n" |
272 " user Username to use to access MySQL server. Default 'bugs'.\n" |
276 " password Password to use to access MySQL server.\n" |
273 " password Password to use to access MySQL server.\n" |
277 " timeout Database connection timeout (seconds). Default 5.\n" |
274 " timeout Database connection timeout (seconds). Default 5.\n" |
278 " version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 " |
275 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n" |
279 "and\n" |
276 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" |
280 " later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" |
277 " and '2.16' for versions prior to 2.18.\n" |
281 " versions prior to 2.18.\n" |
|
282 " bzuser Fallback Bugzilla user name to record comments with, if\n" |
278 " bzuser Fallback Bugzilla user name to record comments with, if\n" |
283 " changeset committer cannot be found as a Bugzilla user.\n" |
279 " changeset committer cannot be found as a Bugzilla user.\n" |
284 " bzdir Bugzilla install directory. Used by default notify.\n" |
280 " bzdir Bugzilla install directory. Used by default notify.\n" |
285 " Default '/var/www/html/bugzilla'.\n" |
281 " Default '/var/www/html/bugzilla'.\n" |
286 " notify The command to run to get Bugzilla to send bug change\n" |
282 " notify The command to run to get Bugzilla to send bug change\n" |
287 " notification emails. Substitutes from a map with 3 keys,\n" |
283 " notification emails. Substitutes from a map with 3\n" |
288 " 'bzdir', 'id' (bug id) and 'user' (committer bugzilla " |
284 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" |
289 "email).\n" |
285 " bugzilla email). Default depends on version; from 2.18\n" |
290 " Default depends on version; from 2.18 it is\n" |
286 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" |
291 " \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %" |
287 " %(id)s %(user)s\".\n" |
292 "(user)s\".\n" |
288 " regexp Regular expression to match bug IDs in changeset commit\n" |
293 " regexp Regular expression to match bug IDs in changeset commit " |
289 " message. Must contain one \"()\" group. The default\n" |
294 "message.\n" |
290 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" |
295 " Must contain one \"()\" group. The default expression " |
291 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" |
296 "matches\n" |
292 " variations thereof. Matching is case insensitive.\n" |
297 " 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" |
|
298 " 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations " |
|
299 "thereof.\n" |
|
300 " Matching is case insensitive.\n" |
|
301 " style The style file to use when formatting comments.\n" |
293 " style The style file to use when formatting comments.\n" |
302 " template Template to use when formatting comments. Overrides\n" |
294 " template Template to use when formatting comments. Overrides\n" |
303 " style if specified. In addition to the usual Mercurial\n" |
295 " style if specified. In addition to the usual Mercurial\n" |
304 " keywords, the extension specifies:\n" |
296 " keywords, the extension specifies:\n" |
305 " {bug} The Bugzilla bug ID.\n" |
297 " {bug} The Bugzilla bug ID.\n" |
306 " {root} The full pathname of the Mercurial " |
298 " {root} The full pathname of the Mercurial\n" |
307 "repository.\n" |
299 " repository.\n" |
308 " {webroot} Stripped pathname of the Mercurial " |
300 " {webroot} Stripped pathname of the Mercurial\n" |
309 "repository.\n" |
301 " repository.\n" |
310 " {hgweb} Base URL for browsing Mercurial " |
302 " {hgweb} Base URL for browsing Mercurial\n" |
311 "repositories.\n" |
303 " repositories.\n" |
312 " Default 'changeset {node|short} in repo {root} refers '\n" |
304 " Default 'changeset {node|short} in repo {root} refers '\n" |
313 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" |
305 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" |
314 " strip The number of slashes to strip from the front of {root}\n" |
306 " strip The number of slashes to strip from the front of {root}\n" |
315 " to produce {webroot}. Default 0.\n" |
307 " to produce {webroot}. Default 0.\n" |
316 " usermap Path of file containing Mercurial committer ID to Bugzilla " |
308 " usermap Path of file containing Mercurial committer ID to\n" |
317 "user\n" |
309 " Bugzilla user ID mappings. If specified, the file\n" |
318 " ID mappings. If specified, the file should contain one " |
310 " should contain one mapping per line,\n" |
319 "mapping\n" |
311 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n" |
320 " per line, \"committer\"=\"Bugzilla user\". See also the\n" |
312 " section.\n" |
321 " [usermap] section.\n" |
|
322 "\n" |
313 "\n" |
323 " [usermap]\n" |
314 " [usermap]\n" |
324 " Any entries in this section specify mappings of Mercurial committer ID\n" |
315 " Any entries in this section specify mappings of Mercurial\n" |
325 " to Bugzilla user ID. See also [bugzilla].usermap.\n" |
316 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" |
326 " \"committer\"=\"Bugzilla user\"\n" |
317 " \"committer\"=\"Bugzilla user\"\n" |
327 "\n" |
318 "\n" |
328 " [web]\n" |
319 " [web]\n" |
329 " baseurl Base URL for browsing Mercurial repositories. Reference from\n" |
320 " baseurl Base URL for browsing Mercurial repositories. Reference\n" |
330 " templates as {hgweb}.\n" |
321 " from templates as {hgweb}.\n" |
331 "\n" |
322 "\n" |
332 "Activating the extension:\n" |
323 "Activating the extension:\n" |
333 "\n" |
324 "\n" |
334 " [extensions]\n" |
325 " [extensions]\n" |
335 " hgext.bugzilla =\n" |
326 " hgext.bugzilla =\n" |
623 msgstr "hg churn [-d DATO] [-r REVISIONER] [--aliases FIL] [--progress] [FIL]" |
621 msgstr "hg churn [-d DATO] [-r REVISIONER] [--aliases FIL] [--progress] [FIL]" |
624 |
622 |
625 msgid "" |
623 msgid "" |
626 "add color output to status, qseries, and diff-related commands\n" |
624 "add color output to status, qseries, and diff-related commands\n" |
627 "\n" |
625 "\n" |
628 "This extension modifies the status command to add color to its output to\n" |
626 "This extension modifies the status command to add color to its output\n" |
629 "reflect file status, the qseries command to add color to reflect patch " |
627 "to reflect file status, the qseries command to add color to reflect\n" |
630 "status\n" |
628 "patch status (applied, unapplied, missing), and to diff-related\n" |
631 "(applied, unapplied, missing), and to diff-related commands to highlight\n" |
629 "commands to highlight additions, removals, diff headers, and trailing\n" |
632 "additions, removals, diff headers, and trailing whitespace.\n" |
630 "whitespace.\n" |
633 "\n" |
631 "\n" |
634 "Other effects in addition to color, like bold and underlined text, are also\n" |
632 "Other effects in addition to color, like bold and underlined text, are\n" |
635 "available. Effects are rendered with the ECMA-48 SGR control function (aka\n" |
633 "also available. Effects are rendered with the ECMA-48 SGR control\n" |
636 "ANSI escape codes). This module also provides the render_text function,\n" |
634 "function (aka ANSI escape codes). This module also provides the\n" |
637 "which can be used to add effects to any text.\n" |
635 "render_text function, which can be used to add effects to any text.\n" |
638 "\n" |
636 "\n" |
639 "To enable this extension, add this to your .hgrc file:\n" |
637 "To enable this extension, add this to your .hgrc file:\n" |
640 "[extensions]\n" |
638 "[extensions]\n" |
641 "color =\n" |
639 "color =\n" |
642 "\n" |
640 "\n" |
718 "\n" |
716 "\n" |
719 " Accepted destination formats [identifiers]:\n" |
717 " Accepted destination formats [identifiers]:\n" |
720 " - Mercurial [hg]\n" |
718 " - Mercurial [hg]\n" |
721 " - Subversion [svn] (history on branches is not preserved)\n" |
719 " - Subversion [svn] (history on branches is not preserved)\n" |
722 "\n" |
720 "\n" |
723 " If no revision is given, all revisions will be converted. Otherwise,\n" |
721 " If no revision is given, all revisions will be converted.\n" |
724 " convert will only import up to the named revision (given in a format\n" |
722 " Otherwise, convert will only import up to the named revision\n" |
725 " understood by the source).\n" |
723 " (given in a format understood by the source).\n" |
726 "\n" |
724 "\n" |
727 " If no destination directory name is specified, it defaults to the\n" |
725 " If no destination directory name is specified, it defaults to the\n" |
728 " basename of the source with '-hg' appended. If the destination\n" |
726 " basename of the source with '-hg' appended. If the destination\n" |
729 " repository doesn't exist, it will be created.\n" |
727 " repository doesn't exist, it will be created.\n" |
730 "\n" |
728 "\n" |
731 " If <REVMAP> isn't given, it will be put in a default location\n" |
729 " If <REVMAP> isn't given, it will be put in a default location\n" |
732 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n" |
730 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" |
733 " file that maps each source commit ID to the destination ID for\n" |
731 " that maps each source commit ID to the destination ID for that\n" |
734 " that revision, like so:\n" |
732 " revision, like so:\n" |
735 " <source ID> <destination ID>\n" |
733 " <source ID> <destination ID>\n" |
736 "\n" |
734 "\n" |
737 " If the file doesn't exist, it's automatically created. It's updated\n" |
735 " If the file doesn't exist, it's automatically created. It's\n" |
738 " on each commit copied, so convert-repo can be interrupted and can\n" |
736 " updated on each commit copied, so convert-repo can be interrupted\n" |
739 " be run repeatedly to copy new commits.\n" |
737 " and can be run repeatedly to copy new commits.\n" |
740 "\n" |
738 "\n" |
741 " The [username mapping] file is a simple text file that maps each source\n" |
739 " The [username mapping] file is a simple text file that maps each\n" |
742 " commit author to a destination commit author. It is handy for source " |
740 " source commit author to a destination commit author. It is handy\n" |
743 "SCMs\n" |
741 " for source SCMs that use unix logins to identify authors (eg:\n" |
744 " that use unix logins to identify authors (eg: CVS). One line per author\n" |
742 " CVS). One line per author mapping and the line format is:\n" |
745 " mapping and the line format is:\n" |
|
746 " srcauthor=whatever string you want\n" |
743 " srcauthor=whatever string you want\n" |
747 "\n" |
744 "\n" |
748 " The filemap is a file that allows filtering and remapping of files\n" |
745 " The filemap is a file that allows filtering and remapping of files\n" |
749 " and directories. Comment lines start with '#'. Each line can\n" |
746 " and directories. Comment lines start with '#'. Each line can\n" |
750 " contain one of the following directives:\n" |
747 " contain one of the following directives:\n" |
751 "\n" |
748 "\n" |
752 " include path/to/file\n" |
749 " include path/to/file\n" |
753 "\n" |
750 "\n" |
754 " exclude path/to/file\n" |
751 " exclude path/to/file\n" |
757 "\n" |
754 "\n" |
758 " The 'include' directive causes a file, or all files under a\n" |
755 " The 'include' directive causes a file, or all files under a\n" |
759 " directory, to be included in the destination repository, and the\n" |
756 " directory, to be included in the destination repository, and the\n" |
760 " exclusion of all other files and dirs not explicitely included.\n" |
757 " exclusion of all other files and dirs not explicitely included.\n" |
761 " The 'exclude' directive causes files or directories to be omitted.\n" |
758 " The 'exclude' directive causes files or directories to be omitted.\n" |
762 " The 'rename' directive renames a file or directory. To rename from a\n" |
759 " The 'rename' directive renames a file or directory. To rename from\n" |
763 " subdirectory into the root of the repository, use '.' as the path to\n" |
760 " a subdirectory into the root of the repository, use '.' as the\n" |
764 " rename to.\n" |
761 " path to rename to.\n" |
765 "\n" |
762 "\n" |
766 " The splicemap is a file that allows insertion of synthetic\n" |
763 " The splicemap is a file that allows insertion of synthetic\n" |
767 " history, letting you specify the parents of a revision. This is\n" |
764 " history, letting you specify the parents of a revision. This is\n" |
768 " useful if you want to e.g. give a Subversion merge two parents, or\n" |
765 " useful if you want to e.g. give a Subversion merge two parents, or\n" |
769 " graft two disconnected series of history together. Each entry\n" |
766 " graft two disconnected series of history together. Each entry\n" |
770 " contains a key, followed by a space, followed by one or two\n" |
767 " contains a key, followed by a space, followed by one or two\n" |
771 " values, separated by spaces. The key is the revision ID in the\n" |
768 " comma-separated values. The key is the revision ID in the source\n" |
772 " source revision control system whose parents should be modified\n" |
769 " revision control system whose parents should be modified (same\n" |
773 " (same format as a key in .hg/shamap). The values are the revision\n" |
770 " format as a key in .hg/shamap). The values are the revision IDs\n" |
774 " IDs (in either the source or destination revision control system)\n" |
771 " (in either the source or destination revision control system) that\n" |
775 " that should be used as the new parents for that node.\n" |
772 " should be used as the new parents for that node.\n" |
776 "\n" |
773 "\n" |
777 " Mercurial Source\n" |
774 " Mercurial Source\n" |
778 " -----------------\n" |
775 " -----------------\n" |
779 "\n" |
776 "\n" |
780 " --config convert.hg.ignoreerrors=False (boolean)\n" |
777 " --config convert.hg.ignoreerrors=False (boolean)\n" |
781 " ignore integrity errors when reading. Use it to fix Mercurial\n" |
778 " ignore integrity errors when reading. Use it to fix Mercurial\n" |
782 " repositories with missing revlogs, by converting from and to\n" |
779 " repositories with missing revlogs, by converting from and to\n" |
783 " Mercurial.\n" |
780 " Mercurial.\n" |
784 " --config convert.hg.saverev=False (boolean)\n" |
781 " --config convert.hg.saverev=False (boolean)\n" |
785 " store original revision ID in changeset (forces target IDs to " |
782 " store original revision ID in changeset (forces target IDs to\n" |
786 "change)\n" |
783 " change)\n" |
787 " --config convert.hg.startrev=0 (hg revision identifier)\n" |
784 " --config convert.hg.startrev=0 (hg revision identifier)\n" |
788 " convert start revision and its descendants\n" |
785 " convert start revision and its descendants\n" |
789 "\n" |
786 "\n" |
790 " CVS Source\n" |
787 " CVS Source\n" |
791 " ----------\n" |
788 " ----------\n" |
792 "\n" |
789 "\n" |
793 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" |
790 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" |
794 " to indicate the starting point of what will be converted. Direct\n" |
791 " to indicate the starting point of what will be converted. Direct\n" |
795 " access to the repository files is not needed, unless of course\n" |
792 " access to the repository files is not needed, unless of course the\n" |
796 " the repository is :local:. The conversion uses the top level\n" |
793 " repository is :local:. The conversion uses the top level directory\n" |
797 " directory in the sandbox to find the CVS repository, and then uses\n" |
794 " in the sandbox to find the CVS repository, and then uses CVS rlog\n" |
798 " CVS rlog commands to find files to convert. This means that unless\n" |
795 " commands to find files to convert. This means that unless a\n" |
799 " a filemap is given, all files under the starting directory will be\n" |
796 " filemap is given, all files under the starting directory will be\n" |
800 " converted, and that any directory reorganisation in the CVS\n" |
797 " converted, and that any directory reorganisation in the CVS\n" |
801 " sandbox is ignored.\n" |
798 " sandbox is ignored.\n" |
802 "\n" |
799 "\n" |
803 " Because CVS does not have changesets, it is necessary to collect\n" |
800 " Because CVS does not have changesets, it is necessary to collect\n" |
804 " individual commits to CVS and merge them into changesets. CVS\n" |
801 " individual commits to CVS and merge them into changesets. CVS\n" |
811 "\n" |
808 "\n" |
812 " Internal cvsps is selected by setting\n" |
809 " Internal cvsps is selected by setting\n" |
813 " --config convert.cvsps=builtin\n" |
810 " --config convert.cvsps=builtin\n" |
814 " and has a few more configurable options:\n" |
811 " and has a few more configurable options:\n" |
815 " --config convert.cvsps.fuzz=60 (integer)\n" |
812 " --config convert.cvsps.fuzz=60 (integer)\n" |
816 " Specify the maximum time (in seconds) that is allowed between\n" |
813 " Specify the maximum time (in seconds) that is allowed\n" |
817 " commits with identical user and log message in a single\n" |
814 " between commits with identical user and log message in a\n" |
818 " changeset. When very large files were checked in as part\n" |
815 " single changeset. When very large files were checked in as\n" |
819 " of a changeset then the default may not be long enough.\n" |
816 " part of a changeset then the default may not be long\n" |
|
817 " enough.\n" |
820 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" |
818 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" |
821 " Specify a regular expression to which commit log messages are\n" |
819 " Specify a regular expression to which commit log messages\n" |
822 " matched. If a match occurs, then the conversion process will\n" |
820 " are matched. If a match occurs, then the conversion\n" |
823 " insert a dummy revision merging the branch on which this log\n" |
821 " process will insert a dummy revision merging the branch on\n" |
824 " message occurs to the branch indicated in the regex.\n" |
822 " which this log message occurs to the branch indicated in\n" |
|
823 " the regex.\n" |
825 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" |
824 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" |
826 " Specify a regular expression to which commit log messages are\n" |
825 " Specify a regular expression to which commit log messages\n" |
827 " matched. If a match occurs, then the conversion process will\n" |
826 " are matched. If a match occurs, then the conversion\n" |
828 " add the most recent revision on the branch indicated in the\n" |
827 " process will add the most recent revision on the branch\n" |
829 " regex as the second parent of the changeset.\n" |
828 " indicated in the regex as the second parent of the\n" |
830 "\n" |
829 " changeset.\n" |
831 " The hgext/convert/cvsps wrapper script allows the builtin changeset\n" |
830 "\n" |
832 " merging code to be run without doing a conversion. Its parameters and\n" |
831 " The hgext/convert/cvsps wrapper script allows the builtin\n" |
833 " output are similar to that of cvsps 2.1.\n" |
832 " changeset merging code to be run without doing a conversion. Its\n" |
|
833 " parameters and output are similar to that of cvsps 2.1.\n" |
834 "\n" |
834 "\n" |
835 " Subversion Source\n" |
835 " Subversion Source\n" |
836 " -----------------\n" |
836 " -----------------\n" |
837 "\n" |
837 "\n" |
838 " Subversion source detects classical trunk/branches/tags layouts.\n" |
838 " Subversion source detects classical trunk/branches/tags layouts.\n" |
839 " By default, the supplied \"svn://repo/path/\" source URL is\n" |
839 " By default, the supplied \"svn://repo/path/\" source URL is\n" |
840 " converted as a single branch. If \"svn://repo/path/trunk\" exists\n" |
840 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" |
841 " it replaces the default branch. If \"svn://repo/path/branches\"\n" |
841 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n" |
842 " exists, its subdirectories are listed as possible branches. If\n" |
842 " its subdirectories are listed as possible branches. If\n" |
843 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" |
843 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" |
844 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" |
844 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" |
845 " can be overriden with following options. Set them to paths\n" |
845 " can be overriden with following options. Set them to paths\n" |
846 " relative to the source URL, or leave them blank to disable\n" |
846 " relative to the source URL, or leave them blank to disable\n" |
847 " autodetection.\n" |
847 " autodetection.\n" |
1459 |
1468 |
1460 msgid "" |
1469 msgid "" |
1461 "use external program to diff repository (or selected files)\n" |
1470 "use external program to diff repository (or selected files)\n" |
1462 "\n" |
1471 "\n" |
1463 " Show differences between revisions for the specified files, using\n" |
1472 " Show differences between revisions for the specified files, using\n" |
1464 " an external program. The default program used is diff, with\n" |
1473 " an external program. The default program used is diff, with\n" |
1465 " default options \"-Npru\".\n" |
1474 " default options \"-Npru\".\n" |
1466 "\n" |
1475 "\n" |
1467 " To select a different program, use the -p option. The program\n" |
1476 " To select a different program, use the -p option. The program will\n" |
1468 " will be passed the names of two directories to compare. To pass\n" |
1477 " be passed the names of two directories to compare. To pass\n" |
1469 " additional options to the program, use the -o option. These will\n" |
1478 " additional options to the program, use the -o option. These will\n" |
1470 " be passed before the names of the directories to compare.\n" |
1479 " be passed before the names of the directories to compare.\n" |
1471 "\n" |
1480 "\n" |
1472 " When two revision arguments are given, then changes are\n" |
1481 " When two revision arguments are given, then changes are shown\n" |
1473 " shown between those revisions. If only one revision is\n" |
1482 " between those revisions. If only one revision is specified then\n" |
1474 " specified then that revision is compared to the working\n" |
1483 " that revision is compared to the working directory, and, when no\n" |
1475 " directory, and, when no revisions are specified, the\n" |
1484 " revisions are specified, the working directory files are compared\n" |
1476 " working directory files are compared to its parent." |
1485 " to its parent." |
1477 msgstr "" |
1486 msgstr "" |
1478 |
1487 |
1479 msgid "comparison program to run" |
1488 msgid "comparison program to run" |
1480 msgstr "" |
1489 msgstr "" |
1481 |
1490 |
1502 "pull changes from a remote repository, merge new changes if needed.\n" |
1511 "pull changes from a remote repository, merge new changes if needed.\n" |
1503 "\n" |
1512 "\n" |
1504 " This finds all changes from the repository at the specified path\n" |
1513 " This finds all changes from the repository at the specified path\n" |
1505 " or URL and adds them to the local repository.\n" |
1514 " or URL and adds them to the local repository.\n" |
1506 "\n" |
1515 "\n" |
1507 " If the pulled changes add a new branch head, the head is automatically\n" |
1516 " If the pulled changes add a new branch head, the head is\n" |
1508 " merged, and the result of the merge is committed. Otherwise, the\n" |
1517 " automatically merged, and the result of the merge is committed.\n" |
1509 " working directory is updated to include the new changes.\n" |
1518 " Otherwise, the working directory is updated to include the new\n" |
|
1519 " changes.\n" |
1510 "\n" |
1520 "\n" |
1511 " When a merge occurs, the newly pulled changes are assumed to be\n" |
1521 " When a merge occurs, the newly pulled changes are assumed to be\n" |
1512 " \"authoritative\". The head of the new changes is used as the first\n" |
1522 " \"authoritative\". The head of the new changes is used as the first\n" |
1513 " parent, with local changes as the second. To switch the merge\n" |
1523 " parent, with local changes as the second. To switch the merge\n" |
1514 " order, use --switch-parent.\n" |
1524 " order, use --switch-parent.\n" |
1515 "\n" |
1525 "\n" |
1516 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
1526 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
1517 " " |
1527 " " |
1518 msgstr "" |
1528 msgstr "" |
1860 |
1870 |
1861 msgid "" |
1871 msgid "" |
1862 "browsing the repository in a graphical way\n" |
1872 "browsing the repository in a graphical way\n" |
1863 "\n" |
1873 "\n" |
1864 "The hgk extension allows browsing the history of a repository in a\n" |
1874 "The hgk extension allows browsing the history of a repository in a\n" |
1865 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n" |
1875 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" |
1866 "not distributed with Mercurial.)\n" |
1876 "distributed with Mercurial.)\n" |
1867 "\n" |
1877 "\n" |
1868 "hgk consists of two parts: a Tcl script that does the displaying and\n" |
1878 "hgk consists of two parts: a Tcl script that does the displaying and\n" |
1869 "querying of information, and an extension to mercurial named hgk.py,\n" |
1879 "querying of information, and an extension to mercurial named hgk.py,\n" |
1870 "which provides hooks for hgk to get information. hgk can be found in\n" |
1880 "which provides hooks for hgk to get information. hgk can be found in\n" |
1871 "the contrib directory, and hgk.py can be found in the hgext directory.\n" |
1881 "the contrib directory, and hgk.py can be found in the hgext directory.\n" |
1872 "\n" |
1882 "\n" |
1873 "To load the hgext.py extension, add it to your .hgrc file (you have\n" |
1883 "To load the hgext.py extension, add it to your .hgrc file (you have to\n" |
1874 "to use your global $HOME/.hgrc file, not one in a repository). You\n" |
1884 "use your global $HOME/.hgrc file, not one in a repository). You can\n" |
1875 "can specify an absolute path:\n" |
1885 "specify an absolute path:\n" |
1876 "\n" |
1886 "\n" |
1877 " [extensions]\n" |
1887 " [extensions]\n" |
1878 " hgk=/usr/local/lib/hgk.py\n" |
1888 " hgk=/usr/local/lib/hgk.py\n" |
1879 "\n" |
1889 "\n" |
1880 "Mercurial can also scan the default python library path for a file\n" |
1890 "Mercurial can also scan the default python library path for a file\n" |
2200 "For [keywordmaps] template mapping and expansion demonstration and\n" |
2210 "For [keywordmaps] template mapping and expansion demonstration and\n" |
2201 "control run \"hg kwdemo\".\n" |
2211 "control run \"hg kwdemo\".\n" |
2202 "\n" |
2212 "\n" |
2203 "An additional date template filter {date|utcdate} is provided.\n" |
2213 "An additional date template filter {date|utcdate} is provided.\n" |
2204 "\n" |
2214 "\n" |
2205 "The default template mappings (view with \"hg kwdemo -d\") can be replaced\n" |
2215 "The default template mappings (view with \"hg kwdemo -d\") can be\n" |
2206 "with customized keywords and templates.\n" |
2216 "replaced with customized keywords and templates. Again, run \"hg\n" |
2207 "Again, run \"hg kwdemo\" to control the results of your config changes.\n" |
2217 "kwdemo\" to control the results of your config changes.\n" |
2208 "\n" |
2218 "\n" |
2209 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" |
2219 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" |
2210 "the risk of inadvertedly storing expanded keywords in the change history.\n" |
2220 "the risk of inadvertedly storing expanded keywords in the change\n" |
|
2221 "history.\n" |
2211 "\n" |
2222 "\n" |
2212 "To force expansion after enabling it, or a configuration change, run\n" |
2223 "To force expansion after enabling it, or a configuration change, run\n" |
2213 "\"hg kwexpand\".\n" |
2224 "\"hg kwexpand\".\n" |
2214 "\n" |
2225 "\n" |
2215 "Also, when committing with the record extension or using mq's qrecord, be " |
2226 "Also, when committing with the record extension or using mq's qrecord,\n" |
2216 "aware\n" |
2227 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" |
2217 "that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" |
2228 "the files in question to update keyword expansions after all changes\n" |
2218 "question to update keyword expansions after all changes have been checked " |
2229 "have been checked in.\n" |
2219 "in.\n" |
|
2220 "\n" |
2230 "\n" |
2221 "Expansions spanning more than one line and incremental expansions,\n" |
2231 "Expansions spanning more than one line and incremental expansions,\n" |
2222 "like CVS' $Log$, are not supported. A keyword template map\n" |
2232 "like CVS' $Log$, are not supported. A keyword template map\n" |
2223 "\"Log = {desc}\" expands to the first line of the changeset description.\n" |
2233 "\"Log = {desc}\" expands to the first line of the changeset description.\n" |
2224 msgstr "" |
2234 msgstr "" |
2850 msgstr "udskriver rettelserne som ikke er anvendt endnu" |
2862 msgstr "udskriver rettelserne som ikke er anvendt endnu" |
2851 |
2863 |
2852 msgid "" |
2864 msgid "" |
2853 "import a patch\n" |
2865 "import a patch\n" |
2854 "\n" |
2866 "\n" |
2855 " The patch is inserted into the series after the last applied patch.\n" |
2867 " The patch is inserted into the series after the last applied\n" |
2856 " If no patches have been applied, qimport prepends the patch\n" |
2868 " patch. If no patches have been applied, qimport prepends the patch\n" |
2857 " to the series.\n" |
2869 " to the series.\n" |
2858 "\n" |
2870 "\n" |
2859 " The patch will have the same name as its source file unless you\n" |
2871 " The patch will have the same name as its source file unless you\n" |
2860 " give it a new one with --name.\n" |
2872 " give it a new one with --name.\n" |
2861 "\n" |
2873 "\n" |
2862 " You can register an existing patch inside the patch directory\n" |
2874 " You can register an existing patch inside the patch directory with\n" |
2863 " with the --existing flag.\n" |
2875 " the --existing flag.\n" |
2864 "\n" |
2876 "\n" |
2865 " With --force, an existing patch of the same name will be overwritten.\n" |
2877 " With --force, an existing patch of the same name will be\n" |
|
2878 " overwritten.\n" |
2866 "\n" |
2879 "\n" |
2867 " An existing changeset may be placed under mq control with --rev\n" |
2880 " An existing changeset may be placed under mq control with --rev\n" |
2868 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" |
2881 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" |
2869 " With --git, patches imported with --rev will use the git diff\n" |
2882 " With --git, patches imported with --rev will use the git diff\n" |
2870 " format. See the diffs help topic for information on why this is\n" |
2883 " format. See the diffs help topic for information on why this is\n" |
2871 " important for preserving rename/copy information and permission " |
2884 " important for preserving rename/copy information and permission\n" |
2872 "changes.\n" |
2885 " changes.\n" |
2873 " " |
2886 " " |
2874 msgstr "" |
2887 msgstr "" |
2875 |
2888 |
2876 msgid "" |
2889 msgid "" |
2877 "init a new queue repository\n" |
2890 "init a new queue repository\n" |
2878 "\n" |
2891 "\n" |
2879 " The queue repository is unversioned by default. If -c is\n" |
2892 " The queue repository is unversioned by default. If -c is\n" |
2880 " specified, qinit will create a separate nested repository\n" |
2893 " specified, qinit will create a separate nested repository for\n" |
2881 " for patches (qinit -c may also be run later to convert\n" |
2894 " patches (qinit -c may also be run later to convert an unversioned\n" |
2882 " an unversioned patch repository into a versioned one).\n" |
2895 " patch repository into a versioned one). You can use qcommit to\n" |
2883 " You can use qcommit to commit changes to this queue repository." |
2896 " commit changes to this queue repository." |
2884 msgstr "" |
2897 msgstr "" |
2885 |
2898 |
2886 msgid "" |
2899 msgid "" |
2887 "clone main and patch repository at same time\n" |
2900 "clone main and patch repository at same time\n" |
2888 "\n" |
2901 "\n" |
2889 " If source is local, destination will have no patches applied. If\n" |
2902 " If source is local, destination will have no patches applied. If\n" |
2890 " source is remote, this command can not check if patches are\n" |
2903 " source is remote, this command can not check if patches are\n" |
2891 " applied in source, so cannot guarantee that patches are not\n" |
2904 " applied in source, so cannot guarantee that patches are not\n" |
2892 " applied in destination. If you clone remote repository, be sure\n" |
2905 " applied in destination. If you clone remote repository, be sure\n" |
2893 " before that it has no patches applied.\n" |
2906 " before that it has no patches applied.\n" |
2894 "\n" |
2907 "\n" |
2895 " Source patch repository is looked for in <src>/.hg/patches by\n" |
2908 " Source patch repository is looked for in <src>/.hg/patches by\n" |
2896 " default. Use -p <url> to change.\n" |
2909 " default. Use -p <url> to change.\n" |
2897 "\n" |
2910 "\n" |
2898 " The patch directory must be a nested mercurial repository, as\n" |
2911 " The patch directory must be a nested mercurial repository, as\n" |
2899 " would be created by qinit -c.\n" |
2912 " would be created by qinit -c.\n" |
2900 " " |
2913 " " |
2901 msgstr "" |
2914 msgstr "" |
2937 msgstr "kun én rettelse er anvendt\n" |
2950 msgstr "kun én rettelse er anvendt\n" |
2938 |
2951 |
2939 msgid "" |
2952 msgid "" |
2940 "create a new patch\n" |
2953 "create a new patch\n" |
2941 "\n" |
2954 "\n" |
2942 " qnew creates a new patch on top of the currently-applied patch (if " |
2955 " qnew creates a new patch on top of the currently-applied patch (if\n" |
2943 "any).\n" |
2956 " any). It will refuse to run if there are any outstanding changes\n" |
2944 " It will refuse to run if there are any outstanding changes unless -f is\n" |
2957 " unless -f is specified, in which case the patch will be\n" |
2945 " specified, in which case the patch will be initialized with them. You\n" |
2958 " initialized with them. You may also use -I, -X, and/or a list of\n" |
2946 " may also use -I, -X, and/or a list of files after the patch name to add\n" |
2959 " files after the patch name to add only changes to matching files\n" |
2947 " only changes to matching files to the new patch, leaving the rest as\n" |
2960 " to the new patch, leaving the rest as uncommitted modifications.\n" |
2948 " uncommitted modifications.\n" |
|
2949 "\n" |
2961 "\n" |
2950 " -u and -d can be used to set the (given) user and date, respectively.\n" |
2962 " -u and -d can be used to set the (given) user and date, respectively.\n" |
2951 " -U and -D set user to current user and date to current date.\n" |
2963 " -U and -D set user to current user and date to current date.\n" |
2952 "\n" |
2964 "\n" |
2953 " -e, -m or -l set the patch header as well as the commit message. If " |
2965 " -e, -m or -l set the patch header as well as the commit message.\n" |
2954 "none\n" |
2966 " If none is specified, the header is empty and the commit message\n" |
2955 " is specified, the header is empty and the commit message is '[mq]: " |
2967 " is '[mq]: PATCH'.\n" |
2956 "PATCH'.\n" |
|
2957 "\n" |
2968 "\n" |
2958 " Use the --git option to keep the patch in the git extended diff\n" |
2969 " Use the --git option to keep the patch in the git extended diff\n" |
2959 " format. Read the diffs help topic for more information on why this\n" |
2970 " format. Read the diffs help topic for more information on why this\n" |
2960 " is important for preserving permission changes and copy/rename\n" |
2971 " is important for preserving permission changes and copy/rename\n" |
2961 " information.\n" |
2972 " information.\n" |
2963 msgstr "" |
2974 msgstr "" |
2964 |
2975 |
2965 msgid "" |
2976 msgid "" |
2966 "update the current patch\n" |
2977 "update the current patch\n" |
2967 "\n" |
2978 "\n" |
2968 " If any file patterns are provided, the refreshed patch will contain " |
2979 " If any file patterns are provided, the refreshed patch will\n" |
2969 "only\n" |
2980 " contain only the modifications that match those patterns; the\n" |
2970 " the modifications that match those patterns; the remaining " |
2981 " remaining modifications will remain in the working directory.\n" |
2971 "modifications\n" |
2982 "\n" |
2972 " will remain in the working directory.\n" |
2983 " If --short is specified, files currently included in the patch\n" |
2973 "\n" |
2984 " will be refreshed just like matched files and remain in the patch.\n" |
2974 " If --short is specified, files currently included in the patch will\n" |
2985 "\n" |
2975 " be refreshed just like matched files and remain in the patch.\n" |
2986 " hg add/remove/copy/rename work as usual, though you might want to\n" |
2976 "\n" |
2987 " use git-style patches (--git or [diff] git=1) to track copies and\n" |
2977 " hg add/remove/copy/rename work as usual, though you might want to use\n" |
2988 " renames. See the diffs help topic for more information on the git\n" |
2978 " git-style patches (--git or [diff] git=1) to track copies and renames.\n" |
2989 " diff format.\n" |
2979 " See the diffs help topic for more information on the git diff format.\n" |
|
2980 " " |
2990 " " |
2981 msgstr "" |
2991 msgstr "" |
2982 |
2992 |
2983 msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" |
2993 msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" |
2984 msgstr "" |
2994 msgstr "" |
2985 |
2995 |
2986 msgid "" |
2996 msgid "" |
2987 "diff of the current patch and subsequent modifications\n" |
2997 "diff of the current patch and subsequent modifications\n" |
2988 "\n" |
2998 "\n" |
2989 " Shows a diff which includes the current patch as well as any changes " |
2999 " Shows a diff which includes the current patch as well as any\n" |
2990 "which\n" |
3000 " changes which have been made in the working directory since the\n" |
2991 " have been made in the working directory since the last refresh (thus\n" |
3001 " last refresh (thus showing what the current patch would become\n" |
2992 " showing what the current patch would become after a qrefresh).\n" |
3002 " after a qrefresh).\n" |
2993 "\n" |
3003 "\n" |
2994 " Use 'hg diff' if you only want to see the changes made since the last\n" |
3004 " Use 'hg diff' if you only want to see the changes made since the\n" |
2995 " qrefresh, or 'hg export qtip' if you want to see changes made by the\n" |
3005 " last qrefresh, or 'hg export qtip' if you want to see changes made\n" |
2996 " current patch without including changes made since the qrefresh.\n" |
3006 " by the current patch without including changes made since the\n" |
|
3007 " qrefresh.\n" |
2997 " " |
3008 " " |
2998 msgstr "" |
3009 msgstr "" |
2999 |
3010 |
3000 msgid "" |
3011 msgid "" |
3001 "fold the named patches into the current patch\n" |
3012 "fold the named patches into the current patch\n" |
3002 "\n" |
3013 "\n" |
3003 " Patches must not yet be applied. Each patch will be successively\n" |
3014 " Patches must not yet be applied. Each patch will be successively\n" |
3004 " applied to the current patch in the order given. If all the\n" |
3015 " applied to the current patch in the order given. If all the\n" |
3005 " patches apply successfully, the current patch will be refreshed\n" |
3016 " patches apply successfully, the current patch will be refreshed\n" |
3006 " with the new cumulative patch, and the folded patches will\n" |
3017 " with the new cumulative patch, and the folded patches will be\n" |
3007 " be deleted. With -k/--keep, the folded patch files will not\n" |
3018 " deleted. With -k/--keep, the folded patch files will not be\n" |
3008 " be removed afterwards.\n" |
3019 " removed afterwards.\n" |
3009 "\n" |
3020 "\n" |
3010 " The header for each folded patch will be concatenated with\n" |
3021 " The header for each folded patch will be concatenated with the\n" |
3011 " the current patch header, separated by a line of '* * *'." |
3022 " current patch header, separated by a line of '* * *'." |
3012 msgstr "" |
3023 msgstr "" |
3013 |
3024 |
3014 msgid "qfold requires at least one patch name" |
3025 msgid "qfold requires at least one patch name" |
3015 msgstr "" |
3026 msgstr "" |
3016 |
3027 |
3125 msgstr "" |
3136 msgstr "" |
3126 |
3137 |
3127 msgid "" |
3138 msgid "" |
3128 "strip a revision and all its descendants from the repository\n" |
3139 "strip a revision and all its descendants from the repository\n" |
3129 "\n" |
3140 "\n" |
3130 " If one of the working dir's parent revisions is stripped, the working\n" |
3141 " If one of the working dir's parent revisions is stripped, the\n" |
3131 " directory will be updated to the parent of the stripped revision.\n" |
3142 " working directory will be updated to the parent of the stripped\n" |
|
3143 " revision.\n" |
3132 " " |
3144 " " |
3133 msgstr "" |
3145 msgstr "" |
3134 |
3146 |
3135 msgid "" |
3147 msgid "" |
3136 "set or print guarded patches to push\n" |
3148 "set or print guarded patches to push\n" |
3137 "\n" |
3149 "\n" |
3138 " Use the qguard command to set or print guards on patch, then use\n" |
3150 " Use the qguard command to set or print guards on patch, then use\n" |
3139 " qselect to tell mq which guards to use. A patch will be pushed if it\n" |
3151 " qselect to tell mq which guards to use. A patch will be pushed if\n" |
3140 " has no guards or any positive guards match the currently selected " |
3152 " it has no guards or any positive guards match the currently\n" |
3141 "guard,\n" |
3153 " selected guard, but will not be pushed if any negative guards\n" |
3142 " but will not be pushed if any negative guards match the current guard.\n" |
3154 " match the current guard. For example:\n" |
3143 " For example:\n" |
|
3144 "\n" |
3155 "\n" |
3145 " qguard foo.patch -stable (negative guard)\n" |
3156 " qguard foo.patch -stable (negative guard)\n" |
3146 " qguard bar.patch +stable (positive guard)\n" |
3157 " qguard bar.patch +stable (positive guard)\n" |
3147 " qselect stable\n" |
3158 " qselect stable\n" |
3148 "\n" |
3159 "\n" |
3149 " This activates the \"stable\" guard. mq will skip foo.patch (because\n" |
3160 " This activates the \"stable\" guard. mq will skip foo.patch (because\n" |
3150 " it has a negative match) but push bar.patch (because it\n" |
3161 " it has a negative match) but push bar.patch (because it has a\n" |
3151 " has a positive match).\n" |
3162 " positive match).\n" |
3152 "\n" |
3163 "\n" |
3153 " With no arguments, prints the currently active guards.\n" |
3164 " With no arguments, prints the currently active guards.\n" |
3154 " With one argument, sets the active guard.\n" |
3165 " With one argument, sets the active guard.\n" |
3155 "\n" |
3166 "\n" |
3156 " Use -n/--none to deactivate guards (no other arguments needed).\n" |
3167 " Use -n/--none to deactivate guards (no other arguments needed).\n" |
3157 " When no guards are active, patches with positive guards are skipped\n" |
3168 " When no guards are active, patches with positive guards are\n" |
3158 " and patches with negative guards are pushed.\n" |
3169 " skipped and patches with negative guards are pushed.\n" |
3159 "\n" |
3170 "\n" |
3160 " qselect can change the guards on applied patches. It does not pop\n" |
3171 " qselect can change the guards on applied patches. It does not pop\n" |
3161 " guarded patches by default. Use --pop to pop back to the last applied\n" |
3172 " guarded patches by default. Use --pop to pop back to the last\n" |
3162 " patch that is not guarded. Use --reapply (which implies --pop) to push\n" |
3173 " applied patch that is not guarded. Use --reapply (which implies\n" |
3163 " back to the current patch afterwards, but skip guarded patches.\n" |
3174 " --pop) to push back to the current patch afterwards, but skip\n" |
3164 "\n" |
3175 " guarded patches.\n" |
3165 " Use -s/--series to print a list of all guards in the series file (no\n" |
3176 "\n" |
3166 " other arguments needed). Use -v for more information." |
3177 " Use -s/--series to print a list of all guards in the series file\n" |
|
3178 " (no other arguments needed). Use -v for more information." |
3167 msgstr "" |
3179 msgstr "" |
3168 |
3180 |
3169 msgid "guards deactivated\n" |
3181 msgid "guards deactivated\n" |
3170 msgstr "" |
3182 msgstr "" |
3171 |
3183 |
3591 "To set the pager that should be used, set the application variable:\n" |
3604 "To set the pager that should be used, set the application variable:\n" |
3592 "\n" |
3605 "\n" |
3593 " [pager]\n" |
3606 " [pager]\n" |
3594 " pager = LESS='FSRX' less\n" |
3607 " pager = LESS='FSRX' less\n" |
3595 "\n" |
3608 "\n" |
3596 "If no pager is set, the pager extensions uses the environment\n" |
3609 "If no pager is set, the pager extensions uses the environment variable\n" |
3597 "variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n" |
3610 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" |
3598 "is used.\n" |
3611 "\n" |
3599 "\n" |
3612 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" |
3600 "If you notice \"BROKEN PIPE\" error messages, you can disable them\n" |
3613 "setting:\n" |
3601 "by setting:\n" |
|
3602 "\n" |
3614 "\n" |
3603 " [pager]\n" |
3615 " [pager]\n" |
3604 " quiet = True\n" |
3616 " quiet = True\n" |
3605 "\n" |
3617 "\n" |
3606 "You can disable the pager for certain commands by adding them to the\n" |
3618 "You can disable the pager for certain commands by adding them to the\n" |
3607 "pager.ignore list:\n" |
3619 "pager.ignore list:\n" |
3608 "\n" |
3620 "\n" |
3609 " [pager]\n" |
3621 " [pager]\n" |
3610 " ignore = version, help, update\n" |
3622 " ignore = version, help, update\n" |
3611 "\n" |
3623 "\n" |
3612 "You can also enable the pager only for certain commands using pager.attend:\n" |
3624 "You can also enable the pager only for certain commands using\n" |
|
3625 "pager.attend:\n" |
3613 "\n" |
3626 "\n" |
3614 " [pager]\n" |
3627 " [pager]\n" |
3615 " attend = log\n" |
3628 " attend = log\n" |
3616 "\n" |
3629 "\n" |
3617 "If pager.attend is present, pager.ignore will be ignored.\n" |
3630 "If pager.attend is present, pager.ignore will be ignored.\n" |
3618 "\n" |
3631 "\n" |
3619 "To ignore global commands like \"hg version\" or \"hg help\", you have to " |
3632 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n" |
3620 "specify\n" |
3633 "specify them in the global .hgrc\n" |
3621 "them in the global .hgrc\n" |
|
3622 msgstr "" |
3634 msgstr "" |
3623 |
3635 |
3624 msgid "" |
3636 msgid "" |
3625 "use suffixes to refer to ancestor revisions\n" |
3637 "use suffixes to refer to ancestor revisions\n" |
3626 "\n" |
3638 "\n" |
3627 "This extension allows you to use git-style suffixes to refer to\n" |
3639 "This extension allows you to use git-style suffixes to refer to the\n" |
3628 "the ancestors of a specific revision.\n" |
3640 "ancestors of a specific revision.\n" |
3629 "\n" |
3641 "\n" |
3630 "For example, if you can refer to a revision as \"foo\", then:\n" |
3642 "For example, if you can refer to a revision as \"foo\", then:\n" |
3631 "\n" |
3643 "\n" |
3632 "- foo^N = Nth parent of foo:\n" |
3644 "- foo^N = Nth parent of foo:\n" |
3633 " foo^0 = foo\n" |
3645 " foo^0 = foo\n" |
3642 msgstr "" |
3654 msgstr "" |
3643 |
3655 |
3644 msgid "" |
3656 msgid "" |
3645 "sending Mercurial changesets as a series of patch emails\n" |
3657 "sending Mercurial changesets as a series of patch emails\n" |
3646 "\n" |
3658 "\n" |
3647 "The series is started off with a \"[PATCH 0 of N]\" introduction,\n" |
3659 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" |
3648 "which describes the series as a whole.\n" |
3660 "describes the series as a whole.\n" |
3649 "\n" |
3661 "\n" |
3650 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
3662 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" |
3651 "the first line of the changeset description as the subject text.\n" |
3663 "first line of the changeset description as the subject text. The\n" |
3652 "The message contains two or three body parts:\n" |
3664 "message contains two or three body parts:\n" |
3653 "\n" |
3665 "\n" |
3654 " The remainder of the changeset description.\n" |
3666 " The remainder of the changeset description.\n" |
3655 "\n" |
3667 "\n" |
3656 " [Optional] The result of running diffstat on the patch.\n" |
3668 " [Optional] The result of running diffstat on the patch.\n" |
3657 "\n" |
3669 "\n" |
3658 " The patch itself, as generated by \"hg export\".\n" |
3670 " The patch itself, as generated by \"hg export\".\n" |
3659 "\n" |
3671 "\n" |
3660 "Each message refers to all of its predecessors using the In-Reply-To\n" |
3672 "Each message refers to all of its predecessors using the In-Reply-To\n" |
3661 "and References headers, so they will show up as a sequence in\n" |
3673 "and References headers, so they will show up as a sequence in threaded\n" |
3662 "threaded mail and news readers, and in mail archives.\n" |
3674 "mail and news readers, and in mail archives.\n" |
3663 "\n" |
3675 "\n" |
3664 "For each changeset, you will be prompted with a diffstat summary and\n" |
3676 "For each changeset, you will be prompted with a diffstat summary and\n" |
3665 "the changeset summary, so you can be sure you are sending the right " |
3677 "the changeset summary, so you can be sure you are sending the right\n" |
3666 "changes.\n" |
3678 "changes.\n" |
3667 "\n" |
3679 "\n" |
3668 "To enable this extension:\n" |
3680 "To enable this extension:\n" |
3669 "\n" |
3681 "\n" |
3670 " [extensions]\n" |
3682 " [extensions]\n" |
3671 " hgext.patchbomb =\n" |
3683 " hgext.patchbomb =\n" |
3672 "\n" |
3684 "\n" |
3673 "To configure other defaults, add a section like this to your hgrc file:\n" |
3685 "To configure other defaults, add a section like this to your hgrc\n" |
|
3686 "file:\n" |
3674 "\n" |
3687 "\n" |
3675 " [email]\n" |
3688 " [email]\n" |
3676 " from = My Name <my@email>\n" |
3689 " from = My Name <my@email>\n" |
3677 " to = recipient1, recipient2, ...\n" |
3690 " to = recipient1, recipient2, ...\n" |
3678 " cc = cc1, cc2, ...\n" |
3691 " cc = cc1, cc2, ...\n" |
3680 "\n" |
3693 "\n" |
3681 "Then you can use the \"hg email\" command to mail a series of changesets\n" |
3694 "Then you can use the \"hg email\" command to mail a series of changesets\n" |
3682 "as a patchbomb.\n" |
3695 "as a patchbomb.\n" |
3683 "\n" |
3696 "\n" |
3684 "To avoid sending patches prematurely, it is a good idea to first run\n" |
3697 "To avoid sending patches prematurely, it is a good idea to first run\n" |
3685 "the \"email\" command with the \"-n\" option (test only). You will be\n" |
3698 "the \"email\" command with the \"-n\" option (test only). You will be\n" |
3686 "prompted for an email recipient address, a subject an an introductory\n" |
3699 "prompted for an email recipient address, a subject an an introductory\n" |
3687 "message describing the patches of your patchbomb. Then when all is\n" |
3700 "message describing the patches of your patchbomb. Then when all is\n" |
3688 "done, patchbomb messages are displayed. If PAGER environment variable\n" |
3701 "done, patchbomb messages are displayed. If PAGER environment variable\n" |
3689 "is set, your pager will be fired up once for each patchbomb message, so\n" |
3702 "is set, your pager will be fired up once for each patchbomb message,\n" |
3690 "you can verify everything is alright.\n" |
3703 "so you can verify everything is alright.\n" |
3691 "\n" |
3704 "\n" |
3692 "The \"-m\" (mbox) option is also very useful. Instead of previewing\n" |
3705 "The \"-m\" (mbox) option is also very useful. Instead of previewing each\n" |
3693 "each patchbomb message in a pager or sending the messages directly,\n" |
3706 "patchbomb message in a pager or sending the messages directly, it will\n" |
3694 "it will create a UNIX mailbox file with the patch emails. This\n" |
3707 "create a UNIX mailbox file with the patch emails. This mailbox file\n" |
3695 "mailbox file can be previewed with any mail user agent which supports\n" |
3708 "can be previewed with any mail user agent which supports UNIX mbox\n" |
3696 "UNIX mbox files, e.g. with mutt:\n" |
3709 "files, e.g. with mutt:\n" |
3697 "\n" |
3710 "\n" |
3698 " % mutt -R -f mbox\n" |
3711 " % mutt -R -f mbox\n" |
3699 "\n" |
3712 "\n" |
3700 "When you are previewing the patchbomb messages, you can use `formail'\n" |
3713 "When you are previewing the patchbomb messages, you can use `formail'\n" |
3701 "(a utility that is commonly installed as part of the procmail package),\n" |
3714 "(a utility that is commonly installed as part of the procmail\n" |
3702 "to send each message out:\n" |
3715 "package), to send each message out:\n" |
3703 "\n" |
3716 "\n" |
3704 " % formail -s sendmail -bm -t < mbox\n" |
3717 " % formail -s sendmail -bm -t < mbox\n" |
3705 "\n" |
3718 "\n" |
3706 "That should be all. Now your patchbomb is on its way out.\n" |
3719 "That should be all. Now your patchbomb is on its way out.\n" |
3707 "\n" |
3720 "\n" |
3708 "You can also either configure the method option in the email section\n" |
3721 "You can also either configure the method option in the email section\n" |
3709 "to be a sendmail compatable mailer or fill out the [smtp] section so\n" |
3722 "to be a sendmail compatable mailer or fill out the [smtp] section so\n" |
3710 "that the patchbomb extension can automatically send patchbombs directly\n" |
3723 "that the patchbomb extension can automatically send patchbombs\n" |
3711 "from the commandline. See the [email] and [smtp] sections in hgrc(5)\n" |
3724 "directly from the commandline. See the [email] and [smtp] sections in\n" |
3712 "for details." |
3725 "hgrc(5) for details." |
3713 msgstr "" |
3726 msgstr "" |
3714 |
3727 |
3715 msgid "Please enter a valid value.\n" |
3728 msgid "Please enter a valid value.\n" |
3716 msgstr "" |
3729 msgstr "" |
3717 |
3730 |
3723 |
3736 |
3724 msgid "" |
3737 msgid "" |
3725 "send changesets by email\n" |
3738 "send changesets by email\n" |
3726 "\n" |
3739 "\n" |
3727 " By default, diffs are sent in the format generated by hg export,\n" |
3740 " By default, diffs are sent in the format generated by hg export,\n" |
3728 " one per message. The series starts with a \"[PATCH 0 of N]\"\n" |
3741 " one per message. The series starts with a \"[PATCH 0 of N]\"\n" |
3729 " introduction, which describes the series as a whole.\n" |
3742 " introduction, which describes the series as a whole.\n" |
3730 "\n" |
3743 "\n" |
3731 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
3744 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
3732 " the first line of the changeset description as the subject text.\n" |
3745 " the first line of the changeset description as the subject text.\n" |
3733 " The message contains two or three body parts. First, the rest of\n" |
3746 " The message contains two or three body parts. First, the rest of\n" |
3734 " the changeset description. Next, (optionally) if the diffstat\n" |
3747 " the changeset description. Next, (optionally) if the diffstat\n" |
3735 " program is installed, the result of running diffstat on the patch.\n" |
3748 " program is installed, the result of running diffstat on the patch.\n" |
3736 " Finally, the patch itself, as generated by \"hg export\".\n" |
3749 " Finally, the patch itself, as generated by \"hg export\".\n" |
3737 "\n" |
3750 "\n" |
3738 " With --outgoing, emails will be generated for patches not\n" |
3751 " With --outgoing, emails will be generated for patches not found in\n" |
3739 " found in the destination repository (or only those which are\n" |
3752 " the destination repository (or only those which are ancestors of\n" |
3740 " ancestors of the specified revisions if any are provided)\n" |
3753 " the specified revisions if any are provided)\n" |
3741 "\n" |
3754 "\n" |
3742 " With --bundle, changesets are selected as for --outgoing,\n" |
3755 " With --bundle, changesets are selected as for --outgoing, but a\n" |
3743 " but a single email containing a binary Mercurial bundle as an\n" |
3756 " single email containing a binary Mercurial bundle as an attachment\n" |
3744 " attachment will be sent.\n" |
3757 " will be sent.\n" |
3745 "\n" |
3758 "\n" |
3746 " Examples:\n" |
3759 " Examples:\n" |
3747 "\n" |
3760 "\n" |
3748 " hg email -r 3000 # send patch 3000 only\n" |
3761 " hg email -r 3000 # send patch 3000 only\n" |
3749 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
3762 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
3866 msgstr "" |
3882 msgstr "" |
3867 |
3883 |
3868 msgid "" |
3884 msgid "" |
3869 "removes files not tracked by Mercurial\n" |
3885 "removes files not tracked by Mercurial\n" |
3870 "\n" |
3886 "\n" |
3871 " Delete files not known to Mercurial. This is useful to test local and\n" |
3887 " Delete files not known to Mercurial. This is useful to test local\n" |
3872 " uncommitted changes in an otherwise-clean source tree.\n" |
3888 " and uncommitted changes in an otherwise-clean source tree.\n" |
3873 "\n" |
3889 "\n" |
3874 " This means that purge will delete:\n" |
3890 " This means that purge will delete:\n" |
3875 " - Unknown files: files marked with \"?\" by \"hg status\"\n" |
3891 " - Unknown files: files marked with \"?\" by \"hg status\"\n" |
3876 " - Empty directories: in fact Mercurial ignores directories unless they\n" |
3892 " - Empty directories: in fact Mercurial ignores directories unless\n" |
3877 " contain files under source control managment\n" |
3893 " they contain files under source control managment\n" |
3878 " But it will leave untouched:\n" |
3894 " But it will leave untouched:\n" |
3879 " - Modified and unmodified tracked files\n" |
3895 " - Modified and unmodified tracked files\n" |
3880 " - Ignored files (unless --all is specified)\n" |
3896 " - Ignored files (unless --all is specified)\n" |
3881 " - New files added to the repository (with \"hg add\")\n" |
3897 " - New files added to the repository (with \"hg add\")\n" |
3882 "\n" |
3898 "\n" |
3883 " If directories are given on the command line, only files in these\n" |
3899 " If directories are given on the command line, only files in these\n" |
3884 " directories are considered.\n" |
3900 " directories are considered.\n" |
3885 "\n" |
3901 "\n" |
3886 " Be careful with purge, as you could irreversibly delete some files you\n" |
3902 " Be careful with purge, as you could irreversibly delete some files\n" |
3887 " forgot to add to the repository. If you only want to print the list of\n" |
3903 " you forgot to add to the repository. If you only want to print the\n" |
3888 " files that this program would delete, use the --print option.\n" |
3904 " list of files that this program would delete, use the --print\n" |
|
3905 " option.\n" |
3889 " " |
3906 " " |
3890 msgstr "" |
3907 msgstr "" |
3891 |
3908 |
3892 #, python-format |
3909 #, python-format |
3893 msgid "%s cannot be removed" |
3910 msgid "%s cannot be removed" |
4423 " specified, log messages will have a comment appended of the form:\n" |
4445 " specified, log messages will have a comment appended of the form:\n" |
4424 "\n" |
4446 "\n" |
4425 " (transplanted from CHANGESETHASH)\n" |
4447 " (transplanted from CHANGESETHASH)\n" |
4426 "\n" |
4448 "\n" |
4427 " You can rewrite the changelog message with the --filter option.\n" |
4449 " You can rewrite the changelog message with the --filter option.\n" |
4428 " Its argument will be invoked with the current changelog message\n" |
4450 " Its argument will be invoked with the current changelog message as\n" |
4429 " as $1 and the patch as $2.\n" |
4451 " $1 and the patch as $2.\n" |
4430 "\n" |
4452 "\n" |
4431 " If --source is specified, selects changesets from the named\n" |
4453 " If --source is specified, selects changesets from the named\n" |
4432 " repository. If --branch is specified, selects changesets from the\n" |
4454 " repository. If --branch is specified, selects changesets from the\n" |
4433 " branch holding the named revision, up to that revision. If --all\n" |
4455 " branch holding the named revision, up to that revision. If --all\n" |
4434 " is specified, all changesets on the branch will be transplanted,\n" |
4456 " is specified, all changesets on the branch will be transplanted,\n" |
4435 " otherwise you will be prompted to select the changesets you want.\n" |
4457 " otherwise you will be prompted to select the changesets you want.\n" |
4436 "\n" |
4458 "\n" |
4437 " hg transplant --branch REVISION --all will rebase the selected branch\n" |
4459 " hg transplant --branch REVISION --all will rebase the selected\n" |
4438 " (up to the named revision) onto your current working directory.\n" |
4460 " branch (up to the named revision) onto your current working\n" |
4439 "\n" |
4461 " directory.\n" |
4440 " You can optionally mark selected transplanted changesets as\n" |
4462 "\n" |
4441 " merge changesets. You will not be prompted to transplant any\n" |
4463 " You can optionally mark selected transplanted changesets as merge\n" |
4442 " ancestors of a merged transplant, and you can merge descendants\n" |
4464 " changesets. You will not be prompted to transplant any ancestors\n" |
4443 " of them normally instead of transplanting them.\n" |
4465 " of a merged transplant, and you can merge descendants of them\n" |
|
4466 " normally instead of transplanting them.\n" |
4444 "\n" |
4467 "\n" |
4445 " If no merges or revisions are provided, hg transplant will start\n" |
4468 " If no merges or revisions are provided, hg transplant will start\n" |
4446 " an interactive changeset browser.\n" |
4469 " an interactive changeset browser.\n" |
4447 "\n" |
4470 "\n" |
4448 " If a changeset application fails, you can fix the merge by hand and\n" |
4471 " If a changeset application fails, you can fix the merge by hand\n" |
4449 " then resume where you left off by calling hg transplant --continue.\n" |
4472 " and then resume where you left off by calling hg transplant\n" |
|
4473 " --continue.\n" |
4450 " " |
4474 " " |
4451 msgstr "" |
4475 msgstr "" |
4452 |
4476 |
4453 msgid "--continue is incompatible with branch, all or merge" |
4477 msgid "--continue is incompatible with branch, all or merge" |
4454 msgstr "" |
4478 msgstr "" |
4500 msgstr "" |
4524 msgstr "" |
4501 |
4525 |
4502 msgid "" |
4526 msgid "" |
4503 "allow to use MBCS path with problematic encoding.\n" |
4527 "allow to use MBCS path with problematic encoding.\n" |
4504 "\n" |
4528 "\n" |
4505 "Some MBCS encodings are not good for some path operations\n" |
4529 "Some MBCS encodings are not good for some path operations (i.e.\n" |
4506 "(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n" |
4530 "splitting path, case conversion, etc.) with its encoded bytes. We call\n" |
4507 "We call such a encoding (i.e. shift_jis and big5) as \"problematic\n" |
4531 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" |
4508 "encoding\". This extension can be used to fix the issue with those\n" |
4532 "This extension can be used to fix the issue with those encodings by\n" |
4509 "encodings by wrapping some functions to convert to unicode string\n" |
4533 "wrapping some functions to convert to unicode string before path\n" |
4510 "before path operation.\n" |
4534 "operation.\n" |
4511 "\n" |
4535 "\n" |
4512 "This extension is usefull for:\n" |
4536 "This extension is usefull for:\n" |
4513 " * Japanese Windows users using shift_jis encoding.\n" |
4537 " * Japanese Windows users using shift_jis encoding.\n" |
4514 " * Chinese Windows users using big5 encoding.\n" |
4538 " * Chinese Windows users using big5 encoding.\n" |
4515 " * All users who use a repository with one of problematic encodings\n" |
4539 " * All users who use a repository with one of problematic encodings on\n" |
4516 " on case-insensitive file system.\n" |
4540 " case-insensitive file system.\n" |
4517 "\n" |
4541 "\n" |
4518 "This extension is not needed for:\n" |
4542 "This extension is not needed for:\n" |
4519 " * Any user who use only ascii chars in path.\n" |
4543 " * Any user who use only ascii chars in path.\n" |
4520 " * Any user who do not use any of problematic encodings.\n" |
4544 " * Any user who do not use any of problematic encodings.\n" |
4521 "\n" |
4545 "\n" |
4522 "Note that there are some limitations on using this extension:\n" |
4546 "Note that there are some limitations on using this extension:\n" |
4523 " * You should use single encoding in one repository.\n" |
4547 " * You should use single encoding in one repository.\n" |
4524 " * You should set same encoding for the repository by locale or HGENCODING.\n" |
4548 " * You should set same encoding for the repository by locale or\n" |
|
4549 " HGENCODING.\n" |
4525 "\n" |
4550 "\n" |
4526 "To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" |
4551 "To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" |
4527 "\n" |
4552 "\n" |
4528 " [extensions]\n" |
4553 " [extensions]\n" |
4529 " hgext.win32mbcs =\n" |
4554 " hgext.win32mbcs =\n" |
4530 "\n" |
4555 "\n" |
4531 "Path encoding conversion are done between unicode and util._encoding\n" |
4556 "Path encoding conversion are done between unicode and\n" |
4532 "which is decided by mercurial from current locale setting or HGENCODING.\n" |
4557 "encoding.encoding which is decided by mercurial from current locale\n" |
|
4558 "setting or HGENCODING.\n" |
4533 "\n" |
4559 "\n" |
4534 msgstr "" |
4560 msgstr "" |
4535 |
4561 |
4536 #, python-format |
4562 #, python-format |
4537 msgid "[win32mbcs] filename conversion fail with %s encoding\n" |
4563 msgid "[win32mbcs] filename conversion fail with %s encoding\n" |
4918 "create unversioned archive of a repository revision\n" |
4948 "create unversioned archive of a repository revision\n" |
4919 "\n" |
4949 "\n" |
4920 " By default, the revision used is the parent of the working\n" |
4950 " By default, the revision used is the parent of the working\n" |
4921 " directory; use \"-r\" to specify a different revision.\n" |
4951 " directory; use \"-r\" to specify a different revision.\n" |
4922 "\n" |
4952 "\n" |
4923 " To specify the type of archive to create, use \"-t\". Valid\n" |
4953 " To specify the type of archive to create, use \"-t\". Valid types\n" |
4924 " types are:\n" |
4954 " are:\n" |
4925 "\n" |
4955 "\n" |
4926 " \"files\" (default): a directory full of files\n" |
4956 " \"files\" (default): a directory full of files\n" |
4927 " \"tar\": tar archive, uncompressed\n" |
4957 " \"tar\": tar archive, uncompressed\n" |
4928 " \"tbz2\": tar archive, compressed using bzip2\n" |
4958 " \"tbz2\": tar archive, compressed using bzip2\n" |
4929 " \"tgz\": tar archive, compressed using gzip\n" |
4959 " \"tgz\": tar archive, compressed using gzip\n" |
4930 " \"uzip\": zip archive, uncompressed\n" |
4960 " \"uzip\": zip archive, uncompressed\n" |
4931 " \"zip\": zip archive, compressed using deflate\n" |
4961 " \"zip\": zip archive, compressed using deflate\n" |
4932 "\n" |
4962 "\n" |
4933 " The exact name of the destination archive or directory is given\n" |
4963 " The exact name of the destination archive or directory is given\n" |
4934 " using a format string; see \"hg help export\" for details.\n" |
4964 " using a format string; see 'hg help export' for details.\n" |
4935 "\n" |
4965 "\n" |
4936 " Each member added to an archive file has a directory prefix\n" |
4966 " Each member added to an archive file has a directory prefix\n" |
4937 " prepended. Use \"-p\" to specify a format string for the prefix.\n" |
4967 " prepended. Use \"-p\" to specify a format string for the prefix. The\n" |
4938 " The default is the basename of the archive, with suffixes removed.\n" |
4968 " default is the basename of the archive, with suffixes removed.\n" |
4939 " " |
4969 " " |
4940 msgstr "" |
4970 msgstr "" |
4941 |
4971 |
4942 msgid "no working directory: please specify a revision" |
4972 msgid "no working directory: please specify a revision" |
4943 msgstr "" |
4973 msgstr "" |
5027 msgstr "" |
5056 msgstr "" |
5028 |
5057 |
5029 msgid "" |
5058 msgid "" |
5030 "subdivision search of changesets\n" |
5059 "subdivision search of changesets\n" |
5031 "\n" |
5060 "\n" |
5032 " This command helps to find changesets which introduce problems.\n" |
5061 " This command helps to find changesets which introduce problems. To\n" |
5033 " To use, mark the earliest changeset you know exhibits the problem\n" |
5062 " use, mark the earliest changeset you know exhibits the problem as\n" |
5034 " as bad, then mark the latest changeset which is free from the\n" |
5063 " bad, then mark the latest changeset which is free from the problem\n" |
5035 " problem as good. Bisect will update your working directory to a\n" |
5064 " as good. Bisect will update your working directory to a revision\n" |
5036 " revision for testing (unless the --noupdate option is specified).\n" |
5065 " for testing (unless the --noupdate option is specified). Once you\n" |
5037 " Once you have performed tests, mark the working directory as bad\n" |
5066 " have performed tests, mark the working directory as bad or good\n" |
5038 " or good and bisect will either update to another candidate changeset\n" |
5067 " and bisect will either update to another candidate changeset or\n" |
5039 " or announce that it has found the bad revision.\n" |
5068 " announce that it has found the bad revision.\n" |
5040 "\n" |
5069 "\n" |
5041 " As a shortcut, you can also use the revision argument to mark a\n" |
5070 " As a shortcut, you can also use the revision argument to mark a\n" |
5042 " revision as good or bad without checking it out first.\n" |
5071 " revision as good or bad without checking it out first.\n" |
5043 "\n" |
5072 "\n" |
5044 " If you supply a command it will be used for automatic bisection. Its " |
5073 " If you supply a command it will be used for automatic bisection.\n" |
5045 "exit\n" |
5074 " Its exit status will be used as flag to mark revision as bad or\n" |
5046 " status will be used as flag to mark revision as bad or good. In case " |
5075 " good. In case exit status is 0 the revision is marked as good, 125\n" |
5047 "exit\n" |
5076 " - skipped, 127 (command not found) - bisection will be aborted;\n" |
5048 " status is 0 the revision is marked as good, 125 - skipped, 127 (command " |
5077 " any other status bigger than 0 will mark revision as bad.\n" |
5049 "not\n" |
|
5050 " found) - bisection will be aborted; any other status bigger than 0 will\n" |
|
5051 " mark revision as bad.\n" |
|
5052 " " |
5078 " " |
5053 msgstr "" |
5079 msgstr "" |
5054 |
5080 |
5055 #, python-format |
5081 #, python-format |
5056 msgid "The first %s revision is:\n" |
5082 msgid "The first %s revision is:\n" |
5181 " If no destination directory name is specified, it defaults to the\n" |
5209 " If no destination directory name is specified, it defaults to the\n" |
5182 " basename of the source.\n" |
5210 " basename of the source.\n" |
5183 "\n" |
5211 "\n" |
5184 " The location of the source is added to the new repository's\n" |
5212 " The location of the source is added to the new repository's\n" |
5185 " .hg/hgrc file, as the default to be used for future pulls.\n" |
5213 " .hg/hgrc file, as the default to be used for future pulls.\n" |
|
5214 "\n" |
|
5215 " If you use the -r option to clone up to a specific revision, no\n" |
|
5216 " subsequent revisions (including subsequent tags) will be present\n" |
|
5217 " in the cloned repository. This option implies --pull, even on\n" |
|
5218 " local repositories.\n" |
|
5219 "\n" |
|
5220 " By default, clone will check out the head of the 'default' branch.\n" |
|
5221 " If the -U option is used, the new clone will contain only a\n" |
|
5222 " repository (.hg) and no working copy (the working copy parent is\n" |
|
5223 " the null revision).\n" |
|
5224 "\n" |
|
5225 " See 'hg help urls' for valid source format details.\n" |
|
5226 "\n" |
|
5227 " It is possible to specify an ssh:// URL as the destination, but no\n" |
|
5228 " .hg/hgrc and working directory will be created on the remote side.\n" |
|
5229 " Look at the help text for URLs for important details about ssh://\n" |
|
5230 " URLs.\n" |
5186 "\n" |
5231 "\n" |
5187 " For efficiency, hardlinks are used for cloning whenever the source\n" |
5232 " For efficiency, hardlinks are used for cloning whenever the source\n" |
5188 " and destination are on the same filesystem (note this applies only\n" |
5233 " and destination are on the same filesystem (note this applies only\n" |
5189 " to the repository data, not to the checked out files). Some\n" |
5234 " to the repository data, not to the checked out files). Some\n" |
5190 " filesystems, such as AFS, implement hardlinking incorrectly, but\n" |
5235 " filesystems, such as AFS, implement hardlinking incorrectly, but\n" |
5194 " In some cases, you can clone repositories and checked out files\n" |
5239 " In some cases, you can clone repositories and checked out files\n" |
5195 " using full hardlinks with\n" |
5240 " using full hardlinks with\n" |
5196 "\n" |
5241 "\n" |
5197 " $ cp -al REPO REPOCLONE\n" |
5242 " $ cp -al REPO REPOCLONE\n" |
5198 "\n" |
5243 "\n" |
5199 " This is the fastest way to clone, but it is not always safe. The\n" |
5244 " This is the fastest way to clone, but it is not always safe. The\n" |
5200 " operation is not atomic (making sure REPO is not modified during\n" |
5245 " operation is not atomic (making sure REPO is not modified during\n" |
5201 " the operation is up to you) and you have to make sure your editor\n" |
5246 " the operation is up to you) and you have to make sure your editor\n" |
5202 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" |
5247 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" |
5203 " this is not compatible with certain extensions that place their\n" |
5248 " this is not compatible with certain extensions that place their\n" |
5204 " metadata under the .hg directory, such as mq.\n" |
5249 " metadata under the .hg directory, such as mq.\n" |
5205 "\n" |
5250 "\n" |
5206 " If you use the -r option to clone up to a specific revision, no\n" |
|
5207 " subsequent revisions will be present in the cloned repository.\n" |
|
5208 " This option implies --pull, even on local repositories.\n" |
|
5209 "\n" |
|
5210 " If the -U option is used, the new clone will contain only a repository\n" |
|
5211 " (.hg) and no working copy (the working copy parent is the null " |
|
5212 "revision).\n" |
|
5213 "\n" |
|
5214 " See 'hg help urls' for valid source format details.\n" |
|
5215 "\n" |
|
5216 " It is possible to specify an ssh:// URL as the destination, but no\n" |
|
5217 " .hg/hgrc and working directory will be created on the remote side.\n" |
|
5218 " Look at the help text for urls for important details about ssh:// URLs.\n" |
|
5219 " " |
5251 " " |
5220 msgstr "" |
5252 msgstr "" |
5221 "lav en kopi af et eksisterende arkiv\n" |
5253 "lav en kopi af et eksisterende arkiv\n" |
5222 "\n" |
5254 "\n" |
5223 " Lav en kopi af et eksisterende arkiv i en ny mappe.\n" |
5255 " Lav en kopi af et eksisterende arkiv i en ny mappe.\n" |
5225 " Hvis der ikke angivet et navn til destinationen, så bruges\n" |
5257 " Hvis der ikke angivet et navn til destinationen, så bruges\n" |
5226 " grundnavnet for kilden.\n" |
5258 " grundnavnet for kilden.\n" |
5227 "\n" |
5259 "\n" |
5228 " Placeringen af kilden tilføjes til det nye arkivs .hg/hgrc fil som\n" |
5260 " Placeringen af kilden tilføjes til det nye arkivs .hg/hgrc fil som\n" |
5229 " den nye standard for fremtidige kald til 'hg pull'.\n" |
5261 " den nye standard for fremtidige kald til 'hg pull'.\n" |
|
5262 "\n" |
|
5263 " Hvis du bruger -r tilvalget for at klone op til en specifik\n" |
|
5264 " revision, så vil ingen efterfølgende revisioner (inklusiv\n" |
|
5265 " efterfølgende mærkater) findes i det klonede arkiv. Denne\n" |
|
5266 " valgmulighed medfører --pull, selv ved lokale arkiver.\n" |
|
5267 "\n" |
|
5268 " Som udgangspunkt vil clone hente hovedet af 'default' grenen. Hvis\n" |
|
5269 " -U tilvalget bruges vil den nye klon kun indeholde et arkiv (.hg)\n" |
|
5270 " og intet arbejdskatalog (arbejdskatalogets forældre er sat til nul\n" |
|
5271 " revisionen).\n" |
|
5272 "\n" |
|
5273 " Se 'hg help urls' for detaljer om gyldige formatter for kilden.\n" |
|
5274 "\n" |
|
5275 " Det er muligt at specificere en ssh:// URL som destination, men\n" |
|
5276 " der vil ikke bliver oprettet nogen .hg/hgrc fil eller noget\n" |
|
5277 " arbejdskatalog på den anden side. Se hjælpeteksten for URLer for\n" |
|
5278 " vigtige detaljer om ssh:// URLer.\n" |
5230 "\n" |
5279 "\n" |
5231 " Af effektivitetsgrunde bruges hårde lænker ved kloning når kilden\n" |
5280 " Af effektivitetsgrunde bruges hårde lænker ved kloning når kilden\n" |
5232 " og destinationen er på det samme filsystem (bemærk at dette kun\n" |
5281 " og destinationen er på det samme filsystem (bemærk at dette kun\n" |
5233 " gælder for arkivdata og ikke for de udhentede filer). Nogle\n" |
5282 " gælder for arkivdata og ikke for de udhentede filer). Nogle\n" |
5234 " filsystemer, såsom AFS, implementerer ikke hårde lænker korrekt,\n" |
5283 " filsystemer, såsom AFS, implementerer ikke hårde lænker korrekt,\n" |
5245 " for at din tekstbehandler bryder hårde lænker (Emacs og de fleste\n" |
5294 " for at din tekstbehandler bryder hårde lænker (Emacs og de fleste\n" |
5246 " Linux Kernel værktøjer gør det). Dette er desuden ikke kompatibelt\n" |
5295 " Linux Kernel værktøjer gør det). Dette er desuden ikke kompatibelt\n" |
5247 " med visse udvidelser som placerer deres metadata under .hg mappen,\n" |
5296 " med visse udvidelser som placerer deres metadata under .hg mappen,\n" |
5248 " såsom mq.\n" |
5297 " såsom mq.\n" |
5249 "\n" |
5298 "\n" |
5250 " Hvis du bruger -r tilvalget for at klone op til en specifik\n" |
|
5251 " revision, så vil ingen efterfølgende revisioner findes i det\n" |
|
5252 " klonede arkiv. Denne valgmulighed medfører --pull, selv ved lokale\n" |
|
5253 " arkiver.\n" |
|
5254 "\n" |
|
5255 " Hvis -U tilvalget bruges vil den nye klon kun indeholde et arkiv\n" |
|
5256 " (.hg) og intet arbejdskatalog (arbejdskatalogets forældre er sat\n" |
|
5257 " til nul revisionen).\n" |
|
5258 "\n" |
|
5259 " Se 'hg help urls' for detaljer om gyldige formatter for kilden.\n" |
|
5260 "\n" |
|
5261 " Det er muligt at specificere en ssh:// URL som destination, men\n" |
|
5262 " der vil ikke bliver oprettet nogen .hg/hgrc fil eller noget\n" |
|
5263 " arbejdskatalog på den anden side. Se hjælpeteksten for URLer for\n" |
|
5264 " vigtige detaljer om ssh:// URLer.\n" |
|
5265 " " |
5299 " " |
5266 |
5300 |
5267 msgid "" |
5301 msgid "" |
5268 "commit the specified files or all outstanding changes\n" |
5302 "commit the specified files or all outstanding changes\n" |
5269 "\n" |
5303 "\n" |
5270 " Commit changes to the given files into the repository.\n" |
5304 " Commit changes to the given files into the repository. Unlike a\n" |
|
5305 " centralized RCS, this operation is a local operation. See hg push\n" |
|
5306 " for means to actively distribute your changes.\n" |
5271 "\n" |
5307 "\n" |
5272 " If a list of files is omitted, all changes reported by \"hg status\"\n" |
5308 " If a list of files is omitted, all changes reported by \"hg status\"\n" |
5273 " will be committed.\n" |
5309 " will be committed.\n" |
5274 "\n" |
5310 "\n" |
5275 " If you are committing the result of a merge, do not provide any\n" |
5311 " If you are committing the result of a merge, do not provide any\n" |
5276 " file names or -I/-X filters.\n" |
5312 " file names or -I/-X filters.\n" |
5277 "\n" |
5313 "\n" |
5278 " If no commit message is specified, the configured editor is started to\n" |
5314 " If no commit message is specified, the configured editor is\n" |
5279 " prompt you for a message.\n" |
5315 " started to prompt you for a message.\n" |
5280 "\n" |
5316 "\n" |
5281 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
5317 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
5282 " " |
5318 " " |
5283 msgstr "" |
5319 msgstr "" |
5284 "arkiver de specificerede filer eller alle udestående ændringer\n" |
5320 "arkiver de specificerede filer eller alle udestående ændringer\n" |
5285 "\n" |
5321 "\n" |
5286 " Arkiver ændringer i de angivne filer ind i arkivet.\n" |
5322 " Arkiver ændringer i de angivne filer ind i arkivet. Dette er en\n" |
|
5323 " lokal operation, i modsætning til et centraliseret RCS. Se hg push\n" |
|
5324 " for en måde til aktivt distribuere dine ændringer.\n" |
5287 "\n" |
5325 "\n" |
5288 " Hvis en liste af filer udelades vil alle ændringer rapporteret af\n" |
5326 " Hvis en liste af filer udelades vil alle ændringer rapporteret af\n" |
5289 " \"hg status\" blive arkiveret.\n" |
5327 " \"hg status\" blive arkiveret.\n" |
5290 "\n" |
5328 "\n" |
5291 " Hvis du arkiverer resultatet af en sammenføjning, undlad da at\n" |
5329 " Hvis du arkiverer resultatet af en sammenføjning, undlad da at\n" |
5784 " text/x-patch to be used). From and Subject headers of email\n" |
5825 " text/x-patch to be used). From and Subject headers of email\n" |
5785 " message are used as default committer and commit message. All\n" |
5826 " message are used as default committer and commit message. All\n" |
5786 " text/plain body parts before first diff are added to commit\n" |
5827 " text/plain body parts before first diff are added to commit\n" |
5787 " message.\n" |
5828 " message.\n" |
5788 "\n" |
5829 "\n" |
5789 " If the imported patch was generated by hg export, user and description\n" |
5830 " If the imported patch was generated by hg export, user and\n" |
5790 " from patch override values from message headers and body. Values\n" |
5831 " description from patch override values from message headers and\n" |
5791 " given on command line with -m and -u override these.\n" |
5832 " body. Values given on command line with -m and -u override these.\n" |
5792 "\n" |
5833 "\n" |
5793 " If --exact is specified, import will set the working directory\n" |
5834 " If --exact is specified, import will set the working directory to\n" |
5794 " to the parent of each patch before applying it, and will abort\n" |
5835 " the parent of each patch before applying it, and will abort if the\n" |
5795 " if the resulting changeset has a different ID than the one\n" |
5836 " resulting changeset has a different ID than the one recorded in\n" |
5796 " recorded in the patch. This may happen due to character set\n" |
5837 " the patch. This may happen due to character set problems or other\n" |
5797 " problems or other deficiencies in the text patch format.\n" |
5838 " deficiencies in the text patch format.\n" |
5798 "\n" |
5839 "\n" |
5799 " With --similarity, hg will attempt to discover renames and copies\n" |
5840 " With --similarity, hg will attempt to discover renames and copies\n" |
5800 " in the patch in the same way as 'addremove'.\n" |
5841 " in the patch in the same way as 'addremove'.\n" |
5801 "\n" |
5842 "\n" |
5802 " To read a patch from standard input, use patch name \"-\".\n" |
5843 " To read a patch from standard input, use patch name \"-\". See 'hg\n" |
5803 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
5844 " help dates' for a list of formats valid for -d/--date.\n" |
5804 " " |
5845 " " |
5805 msgstr "" |
5846 msgstr "" |
5806 |
5847 |
5807 msgid "applying patch from stdin\n" |
5848 msgid "applying patch from stdin\n" |
5808 msgstr "" |
5849 msgstr "" |
5922 |
5963 |
5923 msgid "" |
5964 msgid "" |
5924 "output the current or given revision of the project manifest\n" |
5965 "output the current or given revision of the project manifest\n" |
5925 "\n" |
5966 "\n" |
5926 " Print a list of version controlled files for the given revision.\n" |
5967 " Print a list of version controlled files for the given revision.\n" |
5927 " If no revision is given, the parent of the working directory is used,\n" |
5968 " If no revision is given, the first parent of the working directory\n" |
5928 " or tip if no revision is checked out.\n" |
5969 " is used, or tip if no revision is checked out.\n" |
5929 "\n" |
5970 "\n" |
5930 " The manifest is the list of files being version controlled. If no " |
5971 " With -v flag, print file permissions, symlink and executable bits.\n" |
5931 "revision\n" |
5972 " With --debug flag, print file revision hashes.\n" |
5932 " is given then the first parent of the working directory is used.\n" |
|
5933 "\n" |
|
5934 " With -v flag, print file permissions, symlink and executable bits. With\n" |
|
5935 " --debug flag, print file revision hashes.\n" |
|
5936 " " |
5973 " " |
5937 msgstr "" |
5974 msgstr "" |
5938 |
5975 |
5939 msgid "" |
5976 msgid "" |
5940 "merge working directory with another revision\n" |
5977 "merge working directory with another revision\n" |
5941 "\n" |
5978 "\n" |
5942 " Merge the contents of the current working directory and the\n" |
5979 " The contents of the current working directory is updated with all\n" |
5943 " requested revision. Files that changed between either parent are\n" |
5980 " changes made in the requested revision since the last common\n" |
5944 " marked as changed for the next commit and a commit must be\n" |
5981 " predecessor revision.\n" |
5945 " performed before any further updates are allowed.\n" |
5982 "\n" |
|
5983 " Files that changed between either parent are marked as changed for\n" |
|
5984 " the next commit and a commit must be performed before any further\n" |
|
5985 " updates are allowed. The next commit has two parents.\n" |
5946 "\n" |
5986 "\n" |
5947 " If no revision is specified, the working directory's parent is a\n" |
5987 " If no revision is specified, the working directory's parent is a\n" |
5948 " head revision, and the current branch contains exactly one other head,\n" |
5988 " head revision, and the current branch contains exactly one other\n" |
5949 " the other head is merged with by default. Otherwise, an explicit\n" |
5989 " head, the other head is merged with by default. Otherwise, an\n" |
5950 " revision to merge with must be provided.\n" |
5990 " explicit revision to merge with must be provided.\n" |
5951 " " |
5991 " " |
5952 msgstr "" |
5992 msgstr "" |
5953 "sammenføj arbejdskataloget med en anden revision\n" |
5993 "sammenføj arbejdskataloget med en anden revision\n" |
5954 "\n" |
5994 "\n" |
5955 " Sammenføj indholdet af det nuværende arbejdskataloget og den\n" |
5995 " Indholdet af det nuværende arbejdskatalog opdateres med alle\n" |
5956 " ønskede revision. Filer som ændrede sig i forhold til en af\n" |
5996 " ændringer lavet i den ønskede revision siden den sidste fælles\n" |
5957 " forældrene bliver markeret som ændret med hensyn til næste\n" |
5997 " foregående revision.\n" |
5958 " arkivering, og arkiveringen skal laves før yderligere opdateringer\n" |
5998 "\n" |
5959 " er tilladt.\n" |
5999 " Filer som ændrede sig i forhold til en af forældrene bliver\n" |
|
6000 " markeret som ændret med hensyn til næste arkivering, og\n" |
|
6001 " arkiveringen skal laves før yderligere opdateringer er tilladt.\n" |
|
6002 " Den næste arkiverede ændring får to forældre.\n" |
5960 "\n" |
6003 "\n" |
5961 " Hvis ingen revision angives og arbejdskatalogets forældre er en\n" |
6004 " Hvis ingen revision angives og arbejdskatalogets forældre er en\n" |
5962 " hovedrevision og den nuværende gren indeholder præcis et andet\n" |
6005 " hovedrevision og den nuværende gren indeholder præcis et andet\n" |
5963 " hoved, så sammenføjes der med dette hoved som standard. Ellers\n" |
6006 " hoved, så sammenføjes der med dette hoved som standard. Ellers\n" |
5964 " skal en eksplicit revision angives.\n" |
6007 " skal en eksplicit revision angives.\n" |
6048 msgstr "(kør 'hg update' for at få en arbejdskopi)\n" |
6090 msgstr "(kør 'hg update' for at få en arbejdskopi)\n" |
6049 |
6091 |
6050 msgid "" |
6092 msgid "" |
6051 "pull changes from the specified source\n" |
6093 "pull changes from the specified source\n" |
6052 "\n" |
6094 "\n" |
6053 " Pull changes from a remote repository to a local one.\n" |
6095 " Pull changes from a remote repository to the local one.\n" |
6054 "\n" |
6096 "\n" |
6055 " This finds all changes from the repository at the specified path\n" |
6097 " This finds all changes from the repository at the specified path\n" |
6056 " or URL and adds them to the local repository. By default, this\n" |
6098 " or URL and adds them to the local repository. By default, this\n" |
6057 " does not update the copy of the project in the working directory.\n" |
6099 " does not update the copy of the project in the working directory.\n" |
6058 "\n" |
6100 "\n" |
|
6101 " Use hg incoming if you want to see what will be added by the next\n" |
|
6102 " pull without actually adding the changes to the repository.\n" |
|
6103 "\n" |
6059 " If SOURCE is omitted, the 'default' path will be used.\n" |
6104 " If SOURCE is omitted, the 'default' path will be used.\n" |
6060 " See 'hg help urls' for more information.\n" |
6105 " See 'hg help urls' for more information.\n" |
6061 " " |
6106 " " |
6062 msgstr "" |
6107 msgstr "" |
6063 "hent ændringer fra den angivne kilde\n" |
6108 "hent ændringer fra den angivne kilde\n" |
6064 "\n" |
6109 "\n" |
6065 " Hiver ændringer fra et fjert arkiv til et lokalt.\n" |
6110 " Hiver ændringer fra et fjert arkiv til det lokale.\n" |
6066 "\n" |
6111 "\n" |
6067 " Dette finder alle ændringer fra arkivet på den specificerede sti\n" |
6112 " Dette finder alle ændringer fra arkivet på den specificerede sti\n" |
6068 " eller URL og tilføjer dem til det lokale arkiv. Som standard\n" |
6113 " eller URL og tilføjer dem til det lokale arkiv. Som standard\n" |
6069 " opdateres arbejdskataloget ikke.\n" |
6114 " opdateres arbejdskataloget ikke.\n" |
6070 "\n" |
6115 "\n" |
|
6116 " Brug hg incoming hvis du vil se hvad der vil blive tilføjet til\n" |
|
6117 " arkivet ved næste pull, men uden rent faktisk at tilføje\n" |
|
6118 " ændringerne til arkivet.\n" |
|
6119 "\n" |
6071 " Hvis KILDE udelades, så bruges 'default' stien.\n" |
6120 " Hvis KILDE udelades, så bruges 'default' stien.\n" |
6072 " Se 'hg help urls' for mere information.\n" |
6121 " Se 'hg help urls' for mere information.\n" |
6073 " " |
6122 " " |
6074 |
6123 |
6075 msgid "" |
6124 msgid "" |
6080 msgid "" |
6129 msgid "" |
6081 "push changes to the specified destination\n" |
6130 "push changes to the specified destination\n" |
6082 "\n" |
6131 "\n" |
6083 " Push changes from the local repository to the given destination.\n" |
6132 " Push changes from the local repository to the given destination.\n" |
6084 "\n" |
6133 "\n" |
6085 " This is the symmetrical operation for pull. It helps to move\n" |
6134 " This is the symmetrical operation for pull. It moves changes from\n" |
6086 " changes from the current repository to a different one. If the\n" |
6135 " the current repository to a different one. If the destination is\n" |
6087 " destination is local this is identical to a pull in that directory\n" |
6136 " local this is identical to a pull in that directory from the\n" |
6088 " from the current one.\n" |
6137 " current one.\n" |
6089 "\n" |
6138 "\n" |
6090 " By default, push will refuse to run if it detects the result would\n" |
6139 " By default, push will refuse to run if it detects the result would\n" |
6091 " increase the number of remote heads. This generally indicates the\n" |
6140 " increase the number of remote heads. This generally indicates the\n" |
6092 " the client has forgotten to pull and merge before pushing.\n" |
6141 " the client has forgotten to pull and merge before pushing.\n" |
6093 "\n" |
6142 "\n" |
6094 " If -r is used, the named changeset and all its ancestors will be pushed\n" |
6143 " If -r is used, the named revision and all its ancestors will be\n" |
6095 " to the remote repository.\n" |
6144 " pushed to the remote repository.\n" |
6096 "\n" |
6145 "\n" |
6097 " Look at the help text for urls for important details about ssh:// URLs.\n" |
6146 " Look at the help text for URLs for important details about ssh://\n" |
6098 " If DESTINATION is omitted, a default path will be used.\n" |
6147 " URLs. If DESTINATION is omitted, a default path will be used.\n" |
6099 " See 'hg help urls' for more information.\n" |
6148 " See 'hg help urls' for more information.\n" |
6100 " " |
6149 " " |
6101 msgstr "" |
6150 msgstr "" |
6102 "skub ændringer til den angivne destination\n" |
6151 "skub ændringer til den angivne destination\n" |
6103 "\n" |
6152 "\n" |
6104 " Skubber ændringer fra det lokale arkiv til den givne destination.\n" |
6153 " Skubber ændringer fra det lokale arkiv til den givne destination.\n" |
6105 "\n" |
6154 "\n" |
6106 " Dette er den symmetriske operation for pull. Den hjælper med at\n" |
6155 " Dette er den symmetriske operation for pull. Den flytter ændringer\n" |
6107 " flytte ændringer fra det nuværende arkiv til et andet et. Hvis\n" |
6156 " fra det nuværende arkiv til et andet. Hvis destinationen er lokal,\n" |
6108 " destinationen er lokal, så er dette identisk til et pull i\n" |
6157 " så er dette identisk til et pull i destinationen af det nuværende\n" |
6109 " destinationen af det nuværende arkiv.\n" |
6158 " arkiv.\n" |
6110 "\n" |
6159 "\n" |
6111 " Som standard vil push nægte af køre hvis den detekterer at den vil\n" |
6160 " Som standard vil push nægte af køre hvis den detekterer at den vil\n" |
6112 " øge antallet af hoveder i destinationen. Dette indikerer normalt\n" |
6161 " øge antallet af hoveder i destinationen. Dette indikerer normalt\n" |
6113 " at klienten har glemt at henge og sammenføje ændringerne før\n" |
6162 " at klienten har glemt at henge og sammenføje ændringerne før\n" |
6114 " skubningen.\n" |
6163 " skubningen.\n" |
6115 "\n" |
6164 "\n" |
6116 " Hvis -r bruges, så vil den navngivne ændring og alle dets forfædre\n" |
6165 " Hvis -r bruges, så vil den navngivne revision og alle dets\n" |
6117 " bliver skubbet til det andet arkiv.\n" |
6166 " forfædre bliver skubbet til det andet arkiv.\n" |
6118 "\n" |
6167 "\n" |
6119 " Se hjælpeteksten for URL'er for vigtige detaljer om ssh:// URL'er.\n" |
6168 " Se hjælpeteksten for URL'er for vigtige detaljer om ssh:// URL'er.\n" |
6120 " Hvis DESTINATION udelades vil en standard sti blive brugt.\n" |
6169 " Hvis DESTINATION udelades vil en standard sti blive brugt.\n" |
6121 " Se 'hg help urls' for mere information.\n" |
6170 " Se 'hg help urls' for mere information.\n" |
6122 " " |
6171 " " |
6145 msgid "" |
6194 msgid "" |
6146 "roll back an interrupted transaction\n" |
6195 "roll back an interrupted transaction\n" |
6147 "\n" |
6196 "\n" |
6148 " Recover from an interrupted commit or pull.\n" |
6197 " Recover from an interrupted commit or pull.\n" |
6149 "\n" |
6198 "\n" |
6150 " This command tries to fix the repository status after an interrupted\n" |
6199 " This command tries to fix the repository status after an\n" |
6151 " operation. It should only be necessary when Mercurial suggests it.\n" |
6200 " interrupted operation. It should only be necessary when Mercurial\n" |
|
6201 " suggests it.\n" |
6152 " " |
6202 " " |
6153 msgstr "" |
6203 msgstr "" |
6154 |
6204 |
6155 msgid "" |
6205 msgid "" |
6156 "remove the specified files on the next commit\n" |
6206 "remove the specified files on the next commit\n" |
6157 "\n" |
6207 "\n" |
6158 " Schedule the indicated files for removal from the repository.\n" |
6208 " Schedule the indicated files for removal from the repository.\n" |
6159 "\n" |
6209 "\n" |
6160 " This only removes files from the current branch, not from the entire\n" |
6210 " This only removes files from the current branch, not from the\n" |
6161 " project history. -A can be used to remove only files that have already\n" |
6211 " entire project history. -A can be used to remove only files that\n" |
6162 " been deleted, -f can be used to force deletion, and -Af can be used\n" |
6212 " have already been deleted, -f can be used to force deletion, and\n" |
6163 " to remove files from the next revision without deleting them.\n" |
6213 " -Af can be used to remove files from the next revision without\n" |
6164 "\n" |
6214 " deleting them.\n" |
6165 " The following table details the behavior of remove for different file\n" |
6215 "\n" |
6166 " states (columns) and option combinations (rows). The file states are\n" |
6216 " The following table details the behavior of remove for different\n" |
6167 " Added, Clean, Modified and Missing (as reported by hg status). The\n" |
6217 " file states (columns) and option combinations (rows). The file\n" |
6168 " actions are Warn, Remove (from branch) and Delete (from disk).\n" |
6218 " states are Added, Clean, Modified and Missing (as reported by hg\n" |
|
6219 " status). The actions are Warn, Remove (from branch) and Delete\n" |
|
6220 " (from disk).\n" |
6169 "\n" |
6221 "\n" |
6170 " A C M !\n" |
6222 " A C M !\n" |
6171 " none W RD W R\n" |
6223 " none W RD W R\n" |
6172 " -f R RD RD R\n" |
6224 " -f R RD RD R\n" |
6173 " -A W W W R\n" |
6225 " -A W W W R\n" |
6273 " This restores the contents of the affected files to an unmodified\n" |
6330 " This restores the contents of the affected files to an unmodified\n" |
6274 " state and unschedules adds, removes, copies, and renames. If the\n" |
6331 " state and unschedules adds, removes, copies, and renames. If the\n" |
6275 " working directory has two parents, you must explicitly specify the\n" |
6332 " working directory has two parents, you must explicitly specify the\n" |
6276 " revision to revert to.\n" |
6333 " revision to revert to.\n" |
6277 "\n" |
6334 "\n" |
6278 " Using the -r option, revert the given files or directories to their\n" |
6335 " Using the -r option, revert the given files or directories to\n" |
6279 " contents as of a specific revision. This can be helpful to \"roll\n" |
6336 " their contents as of a specific revision. This can be helpful to\n" |
6280 " back\" some or all of an earlier change.\n" |
6337 " \"roll back\" some or all of an earlier change. See 'hg help dates'\n" |
6281 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
6338 " for a list of formats valid for -d/--date.\n" |
6282 "\n" |
6339 "\n" |
6283 " Revert modifies the working directory. It does not commit any\n" |
6340 " Revert modifies the working directory. It does not commit any\n" |
6284 " changes, or change the parent of the working directory. If you\n" |
6341 " changes, or change the parent of the working directory. If you\n" |
6285 " revert to a revision other than the parent of the working\n" |
6342 " revert to a revision other than the parent of the working\n" |
6286 " directory, the reverted files will thus appear modified\n" |
6343 " directory, the reverted files will thus appear modified\n" |
6287 " afterwards.\n" |
6344 " afterwards.\n" |
6288 "\n" |
6345 "\n" |
6289 " If a file has been deleted, it is restored. If the executable\n" |
6346 " If a file has been deleted, it is restored. If the executable mode\n" |
6290 " mode of a file was changed, it is reset.\n" |
6347 " of a file was changed, it is reset.\n" |
6291 "\n" |
6348 "\n" |
6292 " If names are given, all files matching the names are reverted.\n" |
6349 " If names are given, all files matching the names are reverted.\n" |
6293 " If no arguments are given, no files are reverted.\n" |
6350 " If no arguments are given, no files are reverted.\n" |
6294 "\n" |
6351 "\n" |
6295 " Modified files are saved with a .orig suffix before reverting.\n" |
6352 " Modified files are saved with a .orig suffix before reverting.\n" |
6537 msgstr "" |
6594 msgstr "" |
6538 |
6595 |
6539 msgid "" |
6596 msgid "" |
6540 "update working directory\n" |
6597 "update working directory\n" |
6541 "\n" |
6598 "\n" |
6542 " Update the repository's working directory to the specified revision,\n" |
6599 " Update the repository's working directory to the specified\n" |
6543 " or the tip of the current branch if none is specified. Use null as\n" |
6600 " revision, or the tip of the current branch if none is specified.\n" |
6544 " the revision to remove the working copy (like 'hg clone -U').\n" |
6601 " Use null as the revision to remove the working copy (like 'hg\n" |
|
6602 " clone -U').\n" |
6545 "\n" |
6603 "\n" |
6546 " When the working dir contains no uncommitted changes, it will be\n" |
6604 " When the working dir contains no uncommitted changes, it will be\n" |
6547 " replaced by the state of the requested revision from the repo. When\n" |
6605 " replaced by the state of the requested revision from the repo.\n" |
6548 " the requested revision is on a different branch, the working dir\n" |
6606 " When the requested revision is on a different branch, the working\n" |
6549 " will additionally be switched to that branch.\n" |
6607 " dir will additionally be switched to that branch.\n" |
6550 "\n" |
6608 "\n" |
6551 " When there are uncommitted changes, use option -C to discard them,\n" |
6609 " When there are uncommitted changes, use option -C to discard them,\n" |
6552 " forcibly replacing the state of the working dir with the requested\n" |
6610 " forcibly replacing the state of the working dir with the requested\n" |
6553 " revision.\n" |
6611 " revision.\n" |
6554 "\n" |
6612 "\n" |
6555 " When there are uncommitted changes and option -C is not used, and\n" |
6613 " When there are uncommitted changes and option -C is not used, and\n" |
6556 " the parent revision and requested revision are on the same branch,\n" |
6614 " the parent revision and requested revision are on the same branch,\n" |
6557 " and one of them is an ancestor of the other, then the new working\n" |
6615 " and one of them is an ancestor of the other, then the new working\n" |
6558 " directory will contain the requested revision merged with the\n" |
6616 " directory will contain the requested revision merged with the\n" |
6559 " uncommitted changes. Otherwise, the update will fail with a\n" |
6617 " uncommitted changes. Otherwise, the update will fail with a\n" |
6560 " suggestion to use 'merge' or 'update -C' instead.\n" |
6618 " suggestion to use 'merge' or 'update -C' instead.\n" |
6561 "\n" |
6619 "\n" |
6562 " If you want to update just one file to an older revision, use revert.\n" |
6620 " If you want to update just one file to an older revision, use\n" |
|
6621 " revert.\n" |
6563 "\n" |
6622 "\n" |
6564 " See 'hg help dates' for a list of formats valid for --date.\n" |
6623 " See 'hg help dates' for a list of formats valid for --date.\n" |
6565 " " |
6624 " " |
6566 msgstr "" |
6625 msgstr "" |
6567 "opdater arbejdskataloget\n" |
6626 "opdater arbejdskataloget\n" |
7740 "\n" |
7802 "\n" |
7741 "VISUAL::\n" |
7803 "VISUAL::\n" |
7742 " This is the name of the editor to use when committing. See EDITOR.\n" |
7804 " This is the name of the editor to use when committing. See EDITOR.\n" |
7743 "\n" |
7805 "\n" |
7744 "EDITOR::\n" |
7806 "EDITOR::\n" |
7745 " Sometimes Mercurial needs to open a text file in an editor\n" |
7807 " Sometimes Mercurial needs to open a text file in an editor for a\n" |
7746 " for a user to modify, for example when writing commit messages.\n" |
7808 " user to modify, for example when writing commit messages. The\n" |
7747 " The editor it uses is determined by looking at the environment\n" |
7809 " editor it uses is determined by looking at the environment\n" |
7748 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" |
7810 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" |
7749 " non-empty one is chosen. If all of them are empty, the editor\n" |
7811 " non-empty one is chosen. If all of them are empty, the editor\n" |
7750 " defaults to 'vi'.\n" |
7812 " defaults to 'vi'.\n" |
7751 "\n" |
7813 "\n" |
7752 "PYTHONPATH::\n" |
7814 "PYTHONPATH::\n" |
7753 " This is used by Python to find imported modules and may need to be set\n" |
7815 " This is used by Python to find imported modules and may need to be\n" |
7754 " appropriately if this Mercurial is not installed system-wide.\n" |
7816 " set appropriately if this Mercurial is not installed system-wide.\n" |
7755 " " |
7817 " " |
7756 msgstr "" |
7818 msgstr "" |
7757 |
7819 |
7758 msgid "Specifying Single Revisions" |
7820 msgid "Specifying Single Revisions" |
7759 msgstr "Angivning af en enkelt revision" |
7821 msgstr "Angivning af en enkelt revision" |
7760 |
7822 |
7761 msgid "" |
7823 msgid "" |
7762 "\n" |
7824 "\n" |
7763 " Mercurial supports several ways to specify individual\n" |
7825 " Mercurial supports several ways to specify individual revisions.\n" |
7764 " revisions.\n" |
7826 "\n" |
7765 "\n" |
7827 " A plain integer is treated as a revision number. Negative integers\n" |
7766 " A plain integer is treated as a revision number. Negative\n" |
7828 " are treated as topological offsets from the tip, with -1 denoting\n" |
7767 " integers are treated as toplogical offsets from the tip, with\n" |
7829 " the tip. As such, negative numbers are only useful if you've\n" |
7768 " -1 denoting the tip. As such, negative numbers are only useful\n" |
7830 " memorized your local tree numbers and want to save typing a single\n" |
7769 " if you've memorized your local tree numbers and want to save\n" |
7831 " digit. This editor suggests copy and paste.\n" |
7770 " typing a single digit. This editor suggests copy and paste.\n" |
|
7771 "\n" |
7832 "\n" |
7772 " A 40-digit hexadecimal string is treated as a unique revision\n" |
7833 " A 40-digit hexadecimal string is treated as a unique revision\n" |
7773 " identifier.\n" |
7834 " identifier.\n" |
7774 "\n" |
7835 "\n" |
7775 " A hexadecimal string less than 40 characters long is treated as a\n" |
7836 " A hexadecimal string less than 40 characters long is treated as a\n" |
7840 " understand this format.\n" |
7902 " understand this format.\n" |
7841 "\n" |
7903 "\n" |
7842 " This means that when generating diffs from a Mercurial repository\n" |
7904 " This means that when generating diffs from a Mercurial repository\n" |
7843 " (e.g. with \"hg export\"), you should be careful about things like\n" |
7905 " (e.g. with \"hg export\"), you should be careful about things like\n" |
7844 " file copies and renames or other things mentioned above, because\n" |
7906 " file copies and renames or other things mentioned above, because\n" |
7845 " when applying a standard diff to a different repository, this extra\n" |
7907 " when applying a standard diff to a different repository, this\n" |
7846 " information is lost. Mercurial's internal operations (like push and\n" |
7908 " extra information is lost. Mercurial's internal operations (like\n" |
7847 " pull) are not affected by this, because they use an internal binary\n" |
7909 " push and pull) are not affected by this, because they use an\n" |
7848 " format for communicating changes.\n" |
7910 " internal binary format for communicating changes.\n" |
7849 "\n" |
7911 "\n" |
7850 " To make Mercurial produce the git extended diff format, use the\n" |
7912 " To make Mercurial produce the git extended diff format, use the\n" |
7851 " --git option available for many commands, or set 'git = True' in the\n" |
7913 " --git option available for many commands, or set 'git = True' in\n" |
7852 " [diff] section of your hgrc. You do not need to set this option when\n" |
7914 " the [diff] section of your hgrc. You do not need to set this\n" |
7853 " importing diffs in this format or using them in the mq extension.\n" |
7915 " option when importing diffs in this format or using them in the mq\n" |
|
7916 " extension.\n" |
7854 " " |
7917 " " |
7855 msgstr "" |
7918 msgstr "" |
7856 |
7919 |
7857 msgid "Template Usage" |
7920 msgid "Template Usage" |
7858 msgstr "" |
7921 msgstr "" |
7859 |
7922 |
7860 msgid "" |
7923 msgid "" |
7861 "\n" |
7924 "\n" |
7862 " Mercurial allows you to customize output of commands through\n" |
7925 " Mercurial allows you to customize output of commands through\n" |
7863 " templates. You can either pass in a template from the command line,\n" |
7926 " templates. You can either pass in a template from the command\n" |
7864 " via the --template option, or select an existing template-style (--" |
7927 " line, via the --template option, or select an existing\n" |
7865 "style).\n" |
7928 " template-style (--style).\n" |
7866 "\n" |
7929 "\n" |
7867 " You can customize output for any \"log-like\" command: log, outgoing,\n" |
7930 " You can customize output for any \"log-like\" command: log,\n" |
7868 " incoming, tip, parents, heads and glog.\n" |
7931 " outgoing, incoming, tip, parents, heads and glog.\n" |
7869 "\n" |
7932 "\n" |
7870 " Three styles are packaged with Mercurial: default (the style used\n" |
7933 " Three styles are packaged with Mercurial: default (the style used\n" |
7871 " when no explicit preference is passed), compact and changelog. Usage:\n" |
7934 " when no explicit preference is passed), compact and changelog.\n" |
|
7935 " Usage:\n" |
7872 "\n" |
7936 "\n" |
7873 " $ hg log -r1 --style changelog\n" |
7937 " $ hg log -r1 --style changelog\n" |
7874 "\n" |
7938 "\n" |
7875 " A template is a piece of text, with markup to invoke variable " |
7939 " A template is a piece of text, with markup to invoke variable\n" |
7876 "expansion:\n" |
7940 " expansion:\n" |
7877 "\n" |
7941 "\n" |
7878 " $ hg log -r1 --template \"{node}\\n\"\n" |
7942 " $ hg log -r1 --template \"{node}\\n\"\n" |
7879 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" |
7943 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" |
7880 "\n" |
7944 "\n" |
7881 " Strings in curly braces are called keywords. The availability of\n" |
7945 " Strings in curly braces are called keywords. The availability of\n" |
7882 " keywords depends on the exact context of the templater. These keywords\n" |
7946 " keywords depends on the exact context of the templater. These\n" |
7883 " are usually available for templating a log-like command:\n" |
7947 " keywords are usually available for templating a log-like command:\n" |
7884 "\n" |
7948 "\n" |
7885 " - author: String. The unmodified author of the changeset.\n" |
7949 " - author: String. The unmodified author of the changeset.\n" |
7886 " - branches: String. The name of the branch on which the changeset\n" |
7950 " - branches: String. The name of the branch on which the changeset\n" |
7887 " was committed. Will be empty if the branch name was default.\n" |
7951 " was committed. Will be empty if the branch name was default.\n" |
7888 " - date: Date information. The date when the changeset was committed.\n" |
7952 " - date: Date information. The date when the changeset was committed.\n" |
7889 " - desc: String. The text of the changeset description.\n" |
7953 " - desc: String. The text of the changeset description.\n" |
|
7954 " - diffstat: String. Statistics of changes with the following\n" |
|
7955 " format: \"modified files: +added/-removed lines\"\n" |
7890 " - files: List of strings. All files modified, added, or removed by\n" |
7956 " - files: List of strings. All files modified, added, or removed by\n" |
7891 " this changeset.\n" |
7957 " this changeset.\n" |
7892 " - file_adds: List of strings. Files added by this changeset.\n" |
7958 " - file_adds: List of strings. Files added by this changeset.\n" |
7893 " - file_mods: List of strings. Files modified by this changeset.\n" |
7959 " - file_mods: List of strings. Files modified by this changeset.\n" |
7894 " - file_dels: List of strings. Files removed by this changeset.\n" |
7960 " - file_dels: List of strings. Files removed by this changeset.\n" |
7895 " - node: String. The changeset identification hash, as a 40-character\n" |
7961 " - node: String. The changeset identification hash, as a\n" |
7896 " hexadecimal string.\n" |
7962 " 40-character hexadecimal string.\n" |
7897 " - parents: List of strings. The parents of the changeset.\n" |
7963 " - parents: List of strings. The parents of the changeset.\n" |
7898 " - rev: Integer. The repository-local changeset revision number.\n" |
7964 " - rev: Integer. The repository-local changeset revision number.\n" |
7899 " - tags: List of strings. Any tags associated with the changeset.\n" |
7965 " - tags: List of strings. Any tags associated with the changeset.\n" |
7900 "\n" |
7966 "\n" |
7901 " The \"date\" keyword does not produce human-readable output. If you\n" |
7967 " The \"date\" keyword does not produce human-readable output. If you\n" |
7902 " want to use a date in your output, you can use a filter to process it.\n" |
7968 " want to use a date in your output, you can use a filter to process\n" |
7903 " Filters are functions which return a string based on the input " |
7969 " it. Filters are functions which return a string based on the input\n" |
7904 "variable.\n" |
7970 " variable. You can also use a chain of filters to get the desired\n" |
7905 " You can also use a chain of filters to get the desired output:\n" |
7971 " output:\n" |
7906 "\n" |
7972 "\n" |
7907 " $ hg tip --template \"{date|isodate}\\n\"\n" |
7973 " $ hg tip --template \"{date|isodate}\\n\"\n" |
7908 " 2008-08-21 18:22 +0000\n" |
7974 " 2008-08-21 18:22 +0000\n" |
7909 "\n" |
7975 "\n" |
7910 " List of filters:\n" |
7976 " List of filters:\n" |
7918 " separator (ignoring trailing seprators). For example,\n" |
7984 " separator (ignoring trailing seprators). For example,\n" |
7919 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" |
7985 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" |
7920 "\".\n" |
7986 "\".\n" |
7921 " - date: Date. Returns a date in a Unix date format, including\n" |
7987 " - date: Date. Returns a date in a Unix date format, including\n" |
7922 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" |
7988 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" |
7923 " - domain: Any text. Finds the first string that looks like an email\n" |
7989 " - domain: Any text. Finds the first string that looks like an\n" |
7924 " address, and extracts just the domain component.\n" |
7990 " email address, and extracts just the domain component.\n" |
7925 " Example: 'User <user@example.com>' becomes 'example.com'.\n" |
7991 " Example: 'User <user@example.com>' becomes 'example.com'.\n" |
7926 " - email: Any text. Extracts the first string that looks like an email\n" |
7992 " - email: Any text. Extracts the first string that looks like an\n" |
7927 " address. Example: 'User <user@example.com>' becomes\n" |
7993 " email address. Example: 'User <user@example.com>' becomes\n" |
7928 " 'user@example.com'.\n" |
7994 " 'user@example.com'.\n" |
7929 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" |
7995 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" |
7930 " \"<\" and \">\" with XML entities.\n" |
7996 " \"<\" and \">\" with XML entities.\n" |
7931 " - fill68: Any text. Wraps the text to fit in 68 columns.\n" |
7997 " - fill68: Any text. Wraps the text to fit in 68 columns.\n" |
7932 " - fill76: Any text. Wraps the text to fit in 76 columns.\n" |
7998 " - fill76: Any text. Wraps the text to fit in 76 columns.\n" |
7933 " - firstline: Any text. Returns the first line of text.\n" |
7999 " - firstline: Any text. Returns the first line of text.\n" |
7934 " - hgdate: Date. Returns the date as a pair of numbers:\n" |
8000 " - hgdate: Date. Returns the date as a pair of numbers:\n" |
7935 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" |
8001 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" |
7936 " - isodate: Date. Returns the date in ISO 8601 format.\n" |
8002 " - isodate: Date. Returns the date in ISO 8601 format.\n" |
7937 " - obfuscate: Any text. Returns the input text rendered as a sequence\n" |
8003 " - obfuscate: Any text. Returns the input text rendered as a\n" |
7938 " of XML entities.\n" |
8004 " sequence of XML entities.\n" |
7939 " - person: Any text. Returns the text before an email address.\n" |
8005 " - person: Any text. Returns the text before an email address.\n" |
7940 " - rfc822date: Date. Returns a date using the same format used\n" |
8006 " - rfc822date: Date. Returns a date using the same format used\n" |
7941 " in email headers.\n" |
8007 " in email headers.\n" |
7942 " - short: Changeset hash. Returns the short form of a changeset hash,\n" |
8008 " - short: Changeset hash. Returns the short form of a changeset\n" |
7943 " i.e. a 12-byte hexadecimal string.\n" |
8009 " hash, i.e. a 12-byte hexadecimal string.\n" |
7944 " - shortdate: Date. Returns a date like \"2006-09-18\".\n" |
8010 " - shortdate: Date. Returns a date like \"2006-09-18\".\n" |
7945 " - strip: Any text. Strips all leading and trailing whitespace.\n" |
8011 " - strip: Any text. Strips all leading and trailing whitespace.\n" |
7946 " - tabindent: Any text. Returns the text, with every line except the\n" |
8012 " - tabindent: Any text. Returns the text, with every line except\n" |
7947 " first starting with a tab character.\n" |
8013 " the first starting with a tab character.\n" |
7948 " - urlescape: Any text. Escapes all \"special\" characters. For example,\n" |
8014 " - urlescape: Any text. Escapes all \"special\" characters. For\n" |
7949 " \"foo bar\" becomes \"foo%20bar\".\n" |
8015 " example, \"foo bar\" becomes \"foo%20bar\".\n" |
7950 " - user: Any text. Returns the user portion of an email address.\n" |
8016 " - user: Any text. Returns the user portion of an email address.\n" |
7951 " " |
8017 " " |
7952 msgstr "" |
8018 msgstr "" |
7953 |
8019 |
7954 msgid "Url Paths" |
8020 msgid "URL Paths" |
7955 msgstr "URL-stier" |
8021 msgstr "URL-stier" |
7956 |
8022 |
7957 msgid "" |
8023 msgid "" |
7958 "\n" |
8024 "\n" |
7959 " Valid URLs are of the form:\n" |
8025 " Valid URLs are of the form:\n" |
7969 "\n" |
8035 "\n" |
7970 " An optional identifier after # indicates a particular branch, tag,\n" |
8036 " An optional identifier after # indicates a particular branch, tag,\n" |
7971 " or changeset to use from the remote repository.\n" |
8037 " or changeset to use from the remote repository.\n" |
7972 "\n" |
8038 "\n" |
7973 " Some features, such as pushing to http:// and https:// URLs are\n" |
8039 " Some features, such as pushing to http:// and https:// URLs are\n" |
7974 " only possible if the feature is explicitly enabled on the\n" |
8040 " only possible if the feature is explicitly enabled on the remote\n" |
7975 " remote Mercurial server.\n" |
8041 " Mercurial server.\n" |
7976 "\n" |
8042 "\n" |
7977 " Some notes about using SSH with Mercurial:\n" |
8043 " Some notes about using SSH with Mercurial:\n" |
7978 " - SSH requires an accessible shell account on the destination machine\n" |
8044 " - SSH requires an accessible shell account on the destination\n" |
7979 " and a copy of hg in the remote path or specified with as remotecmd.\n" |
8045 " machine and a copy of hg in the remote path or specified with as\n" |
|
8046 " remotecmd.\n" |
7980 " - path is relative to the remote user's home directory by default.\n" |
8047 " - path is relative to the remote user's home directory by default.\n" |
7981 " Use an extra slash at the start of a path to specify an absolute " |
8048 " Use an extra slash at the start of a path to specify an absolute " |
7982 "path:\n" |
8049 "path:\n" |
7983 " ssh://example.com//tmp/repository\n" |
8050 " ssh://example.com//tmp/repository\n" |
7984 " - Mercurial doesn't use its own compression via SSH; the right thing\n" |
8051 " - Mercurial doesn't use its own compression via SSH; the right\n" |
7985 " to do is to configure it in your ~/.ssh/config, e.g.:\n" |
8052 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n" |
7986 " Host *.mylocalnetwork.example.com\n" |
8053 " Host *.mylocalnetwork.example.com\n" |
7987 " Compression no\n" |
8054 " Compression no\n" |
7988 " Host *\n" |
8055 " Host *\n" |
7989 " Compression yes\n" |
8056 " Compression yes\n" |
7990 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" |
8057 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" |
7991 " with the --ssh command line option.\n" |
8058 " or with the --ssh command line option.\n" |
7992 "\n" |
8059 "\n" |
7993 " These urls can all be stored in your hgrc with path aliases under the\n" |
8060 " These URLs can all be stored in your hgrc with path aliases under\n" |
7994 " [paths] section like so:\n" |
8061 " the [paths] section like so:\n" |
7995 " [paths]\n" |
8062 " [paths]\n" |
7996 " alias1 = URL1\n" |
8063 " alias1 = URL1\n" |
7997 " alias2 = URL2\n" |
8064 " alias2 = URL2\n" |
7998 " ...\n" |
8065 " ...\n" |
7999 "\n" |
8066 "\n" |
8000 " You can then use the alias for any command that uses a url (for example\n" |
8067 " You can then use the alias for any command that uses a URL (for\n" |
8001 " 'hg pull alias1' would pull from the 'alias1' path).\n" |
8068 " example 'hg pull alias1' would pull from the 'alias1' path).\n" |
8002 "\n" |
8069 "\n" |
8003 " Two path aliases are special because they are used as defaults\n" |
8070 " Two path aliases are special because they are used as defaults\n" |
8004 " when you do not provide the url to a command:\n" |
8071 " when you do not provide the URL to a command:\n" |
8005 "\n" |
8072 "\n" |
8006 " default:\n" |
8073 " default:\n" |
8007 " When you create a repository with hg clone, the clone command saves\n" |
8074 " When you create a repository with hg clone, the clone command\n" |
8008 " the location of the source repository as the new repository's\n" |
8075 " saves the location of the source repository as the new\n" |
8009 " 'default' path. This is then used when you omit path from push-\n" |
8076 " repository's 'default' path. This is then used when you omit\n" |
8010 " and pull-like commands (including in and out).\n" |
8077 " path from push- and pull-like commands (including incoming and\n" |
|
8078 " outgoing).\n" |
8011 "\n" |
8079 "\n" |
8012 " default-push:\n" |
8080 " default-push:\n" |
8013 " The push command will look for a path named 'default-push', and\n" |
8081 " The push command will look for a path named 'default-push', and\n" |
8014 " prefer it over 'default' if both are defined.\n" |
8082 " prefer it over 'default' if both are defined.\n" |
8015 " " |
8083 " " |
8955 msgstr "stien %r følger symbolsk link %r" |
9034 msgstr "stien %r følger symbolsk link %r" |
8956 |
9035 |
8957 msgid "Hardlinks not supported" |
9036 msgid "Hardlinks not supported" |
8958 msgstr "Hardlinks er ikke supporteret" |
9037 msgstr "Hardlinks er ikke supporteret" |
8959 |
9038 |
|
9039 #, python-format |
|
9040 msgid "could not symlink to %r: %s" |
|
9041 msgstr "kunne ikke lave et symbolsk link til %r: %s" |
|
9042 |
|
9043 #, python-format |
|
9044 msgid "invalid date: %r " |
|
9045 msgstr "ugyldig dato: %r " |
|
9046 |
|
9047 #, python-format |
|
9048 msgid "date exceeds 32 bits: %d" |
|
9049 msgstr "dato overskrider 32 bit: %d" |
|
9050 |
|
9051 #, python-format |
|
9052 msgid "impossible time zone offset: %d" |
|
9053 msgstr "umuligt tidszone: %d" |
|
9054 |
|
9055 #, python-format |
|
9056 msgid "invalid day spec: %s" |
|
9057 msgstr "" |
|
9058 |
|
9059 #, python-format |
|
9060 msgid "%.0f GB" |
|
9061 msgstr "%.0f GB" |
|
9062 |
|
9063 #, python-format |
|
9064 msgid "%.1f GB" |
|
9065 msgstr "%.1f GB" |
|
9066 |
|
9067 #, python-format |
|
9068 msgid "%.2f GB" |
|
9069 msgstr "%.2f GB" |
|
9070 |
|
9071 #, python-format |
|
9072 msgid "%.0f MB" |
|
9073 msgstr "%.0f MB" |
|
9074 |
|
9075 #, python-format |
|
9076 msgid "%.1f MB" |
|
9077 msgstr "%.1f MB" |
|
9078 |
|
9079 #, python-format |
|
9080 msgid "%.2f MB" |
|
9081 msgstr "%.2f MB" |
|
9082 |
|
9083 #, python-format |
|
9084 msgid "%.0f KB" |
|
9085 msgstr "%.0f KB" |
|
9086 |
|
9087 #, python-format |
|
9088 msgid "%.1f KB" |
|
9089 msgstr "%.1f KB" |
|
9090 |
|
9091 #, python-format |
|
9092 msgid "%.2f KB" |
|
9093 msgstr "%.2f KB" |
|
9094 |
|
9095 #, python-format |
|
9096 msgid "%.0f bytes" |
|
9097 msgstr "%.0f byte" |
|
9098 |
|
9099 msgid "cannot verify bundle or remote repos" |
|
9100 msgstr "" |
|
9101 |
|
9102 msgid "interrupted" |
|
9103 msgstr "afbrudt" |
|
9104 |
|
9105 #, python-format |
|
9106 msgid "empty or missing %s" |
|
9107 msgstr "tom eller mangler %s" |
|
9108 |
|
9109 #, python-format |
|
9110 msgid "data length off by %d bytes" |
|
9111 msgstr "" |
|
9112 |
|
9113 #, python-format |
|
9114 msgid "index contains %d extra bytes" |
|
9115 msgstr "indekset indeholder %d ekstra bytes" |
|
9116 |
|
9117 #, python-format |
|
9118 msgid "warning: `%s' uses revlog format 1" |
|
9119 msgstr "advarsel: '%s' bruger revlog format 1" |
|
9120 |
|
9121 #, python-format |
|
9122 msgid "warning: `%s' uses revlog format 0" |
|
9123 msgstr "advarsel: '%s' bruger revlog format 0" |
|
9124 |
|
9125 #, python-format |
|
9126 msgid "rev %d points to nonexistent changeset %d" |
|
9127 msgstr "" |
|
9128 |
|
9129 #, python-format |
|
9130 msgid "rev %d points to unexpected changeset %d" |
|
9131 msgstr "" |
|
9132 |
|
9133 #, python-format |
|
9134 msgid " (expected %s)" |
|
9135 msgstr " (forventede %s)" |
|
9136 |
|
9137 #, python-format |
|
9138 msgid "unknown parent 1 %s of %s" |
|
9139 msgstr "ukendt forældre 1 %s til %s" |
|
9140 |
|
9141 #, python-format |
|
9142 msgid "unknown parent 2 %s of %s" |
|
9143 msgstr "ukendt forældre 2 %s til %s" |
|
9144 |
|
9145 #, python-format |
|
9146 msgid "checking parents of %s" |
|
9147 msgstr "tjekkre forældrene til %s" |
|
9148 |
|
9149 #, python-format |
|
9150 msgid "duplicate revision %d (%d)" |
|
9151 msgstr "duplikeret revision %d (%d)" |
|
9152 |
|
9153 #, python-format |
|
9154 msgid "repository uses revlog format %d\n" |
|
9155 msgstr "arkivet bruger revlog format %d\n" |
|
9156 |
|
9157 msgid "checking changesets\n" |
|
9158 msgstr "tjekker ændringer\n" |
|
9159 |
|
9160 #, python-format |
|
9161 msgid "unpacking changeset %s" |
|
9162 msgstr "udpakker ændring %s" |
|
9163 |
|
9164 msgid "checking manifests\n" |
|
9165 msgstr "" |
|
9166 |
|
9167 msgid "file without name in manifest" |
|
9168 msgstr "" |
|
9169 |
|
9170 #, python-format |
|
9171 msgid "reading manifest delta %s" |
|
9172 msgstr "" |
|
9173 |
|
9174 msgid "crosschecking files in changesets and manifests\n" |
|
9175 msgstr "" |
|
9176 |
|
9177 #, python-format |
|
9178 msgid "changeset refers to unknown manifest %s" |
|
9179 msgstr "" |
|
9180 |
|
9181 msgid "in changeset but not in manifest" |
|
9182 msgstr "" |
|
9183 |
|
9184 msgid "in manifest but not in changeset" |
|
9185 msgstr "" |
|
9186 |
|
9187 msgid "checking files\n" |
|
9188 msgstr "tjekker filer\n" |
|
9189 |
|
9190 #, python-format |
|
9191 msgid "cannot decode filename '%s'" |
|
9192 msgstr "kan ikke dekode filnavn '%s'" |
|
9193 |
|
9194 #, python-format |
|
9195 msgid "broken revlog! (%s)" |
|
9196 msgstr "" |
|
9197 |
|
9198 msgid "missing revlog!" |
|
9199 msgstr "manglende revlog!" |
|
9200 |
|
9201 #, python-format |
|
9202 msgid "%s not in manifests" |
|
9203 msgstr "" |
|
9204 |
|
9205 #, python-format |
|
9206 msgid "unpacked size is %s, %s expected" |
|
9207 msgstr "udpakket størrelse er %s, forventede %s" |
|
9208 |
|
9209 #, python-format |
|
9210 msgid "unpacking %s" |
|
9211 msgstr "udpakker %s" |
|
9212 |
|
9213 #, python-format |
|
9214 msgid "empty or missing copy source revlog %s:%s" |
|
9215 msgstr "" |
|
9216 |
|
9217 #, python-format |
|
9218 msgid "warning: %s@%s: copy source revision is nullid %s:%s" |
|
9219 msgstr "" |
|
9220 |
|
9221 #, python-format |
|
9222 msgid "checking rename of %s" |
|
9223 msgstr "tjekker omdøbning af %s" |
|
9224 |
|
9225 #, python-format |
|
9226 msgid "%s in manifests not found" |
|
9227 msgstr "" |
|
9228 |
|
9229 #, python-format |
|
9230 msgid "warning: orphan revlog '%s'" |
|
9231 msgstr "advarsel: forældreløs revlog '%s'" |
|
9232 |
|
9233 #, python-format |
|
9234 msgid "%d files, %d changesets, %d total revisions\n" |
|
9235 msgstr "%d filer, %d ændringer, ialt %d revisioner\n" |
|
9236 |
|
9237 #, python-format |
|
9238 msgid "%d warnings encountered!\n" |
|
9239 msgstr "mødte %d advarsler!\n" |
|
9240 |
|
9241 #, python-format |
|
9242 msgid "%d integrity errors encountered!\n" |
|
9243 msgstr "fandt %d integritetsfejl!\n" |
|
9244 |
|
9245 #, python-format |
|
9246 msgid "(first damaged changeset appears to be %d)\n" |
|
9247 msgstr "(første beskadigede ændring er tilsyneladende %d)\n" |
|
9248 |
8960 msgid "user name not available - set USERNAME environment variable" |
9249 msgid "user name not available - set USERNAME environment variable" |
8961 msgstr "der er ikke noget brugernavn - sæt USERNAME miljøvariabel" |
9250 msgstr "der er ikke noget brugernavn - sæt USERNAME miljøvariabel" |
8962 |
|
8963 #, python-format |
|
8964 msgid "exited with status %d" |
|
8965 msgstr "afsluttede med status %d" |
|
8966 |
|
8967 #, python-format |
|
8968 msgid "killed by signal %d" |
|
8969 msgstr "dræbt af signal %d" |
|
8970 |
|
8971 #, python-format |
|
8972 msgid "stopped by signal %d" |
|
8973 msgstr "stoppet af signal %d" |
|
8974 |
|
8975 msgid "invalid exit code" |
|
8976 msgstr "ugyldig returkode" |
|
8977 |
|
8978 #, python-format |
|
8979 msgid "could not symlink to %r: %s" |
|
8980 msgstr "kunne ikke lave et symbolsk link til %r: %s" |
|
8981 |
|
8982 #, python-format |
|
8983 msgid "invalid date: %r " |
|
8984 msgstr "ugyldig dato: %r " |
|
8985 |
|
8986 #, python-format |
|
8987 msgid "date exceeds 32 bits: %d" |
|
8988 msgstr "dato overskrider 32 bit: %d" |
|
8989 |
|
8990 #, python-format |
|
8991 msgid "impossible time zone offset: %d" |
|
8992 msgstr "umuligt tidszone: %d" |
|
8993 |
|
8994 #, python-format |
|
8995 msgid "invalid day spec: %s" |
|
8996 msgstr "" |
|
8997 |
|
8998 #, python-format |
|
8999 msgid "%.0f GB" |
|
9000 msgstr "%.0f GB" |
|
9001 |
|
9002 #, python-format |
|
9003 msgid "%.1f GB" |
|
9004 msgstr "%.1f GB" |
|
9005 |
|
9006 #, python-format |
|
9007 msgid "%.2f GB" |
|
9008 msgstr "%.2f GB" |
|
9009 |
|
9010 #, python-format |
|
9011 msgid "%.0f MB" |
|
9012 msgstr "%.0f MB" |
|
9013 |
|
9014 #, python-format |
|
9015 msgid "%.1f MB" |
|
9016 msgstr "%.1f MB" |
|
9017 |
|
9018 #, python-format |
|
9019 msgid "%.2f MB" |
|
9020 msgstr "%.2f MB" |
|
9021 |
|
9022 #, python-format |
|
9023 msgid "%.0f KB" |
|
9024 msgstr "%.0f KB" |
|
9025 |
|
9026 #, python-format |
|
9027 msgid "%.1f KB" |
|
9028 msgstr "%.1f KB" |
|
9029 |
|
9030 #, python-format |
|
9031 msgid "%.2f KB" |
|
9032 msgstr "%.2f KB" |
|
9033 |
|
9034 #, python-format |
|
9035 msgid "%.0f bytes" |
|
9036 msgstr "%.0f byte" |
|
9037 |
|
9038 msgid "cannot verify bundle or remote repos" |
|
9039 msgstr "" |
|
9040 |
|
9041 msgid "interrupted" |
|
9042 msgstr "afbrudt" |
|
9043 |
|
9044 #, python-format |
|
9045 msgid "empty or missing %s" |
|
9046 msgstr "tom eller mangler %s" |
|
9047 |
|
9048 #, python-format |
|
9049 msgid "data length off by %d bytes" |
|
9050 msgstr "" |
|
9051 |
|
9052 #, python-format |
|
9053 msgid "index contains %d extra bytes" |
|
9054 msgstr "indekset indeholder %d ekstra bytes" |
|
9055 |
|
9056 #, python-format |
|
9057 msgid "warning: `%s' uses revlog format 1" |
|
9058 msgstr "advarsel: '%s' bruger revlog format 1" |
|
9059 |
|
9060 #, python-format |
|
9061 msgid "warning: `%s' uses revlog format 0" |
|
9062 msgstr "advarsel: '%s' bruger revlog format 0" |
|
9063 |
|
9064 #, python-format |
|
9065 msgid "rev %d point to %s changeset %d" |
|
9066 msgstr "" |
|
9067 |
|
9068 #, python-format |
|
9069 msgid " (expected %s)" |
|
9070 msgstr " (forventede %s)" |
|
9071 |
|
9072 #, python-format |
|
9073 msgid "unknown parent 1 %s of %s" |
|
9074 msgstr "ukendt forældre 1 %s til %s" |
|
9075 |
|
9076 #, python-format |
|
9077 msgid "unknown parent 2 %s of %s" |
|
9078 msgstr "ukendt forældre 2 %s til %s" |
|
9079 |
|
9080 #, python-format |
|
9081 msgid "checking parents of %s" |
|
9082 msgstr "tjekkre forældrene til %s" |
|
9083 |
|
9084 #, python-format |
|
9085 msgid "duplicate revision %d (%d)" |
|
9086 msgstr "duplikeret revision %d (%d)" |
|
9087 |
|
9088 #, python-format |
|
9089 msgid "repository uses revlog format %d\n" |
|
9090 msgstr "arkivet bruger revlog format %d\n" |
|
9091 |
|
9092 msgid "checking changesets\n" |
|
9093 msgstr "tjekker ændringer\n" |
|
9094 |
|
9095 #, python-format |
|
9096 msgid "unpacking changeset %s" |
|
9097 msgstr "udpakker ændring %s" |
|
9098 |
|
9099 msgid "checking manifests\n" |
|
9100 msgstr "" |
|
9101 |
|
9102 msgid "file without name in manifest" |
|
9103 msgstr "" |
|
9104 |
|
9105 #, python-format |
|
9106 msgid "reading manifest delta %s" |
|
9107 msgstr "" |
|
9108 |
|
9109 msgid "crosschecking files in changesets and manifests\n" |
|
9110 msgstr "" |
|
9111 |
|
9112 #, python-format |
|
9113 msgid "changeset refers to unknown manifest %s" |
|
9114 msgstr "" |
|
9115 |
|
9116 msgid "in changeset but not in manifest" |
|
9117 msgstr "" |
|
9118 |
|
9119 msgid "in manifest but not in changeset" |
|
9120 msgstr "" |
|
9121 |
|
9122 msgid "checking files\n" |
|
9123 msgstr "tjekker filer\n" |
|
9124 |
|
9125 #, python-format |
|
9126 msgid "cannot decode filename '%s'" |
|
9127 msgstr "kan ikke dekode filnavn '%s'" |
|
9128 |
|
9129 #, python-format |
|
9130 msgid "broken revlog! (%s)" |
|
9131 msgstr "" |
|
9132 |
|
9133 msgid "missing revlog!" |
|
9134 msgstr "manglende revlog!" |
|
9135 |
|
9136 #, python-format |
|
9137 msgid "%s not in manifests" |
|
9138 msgstr "" |
|
9139 |
|
9140 #, python-format |
|
9141 msgid "unpacked size is %s, %s expected" |
|
9142 msgstr "udpakket størrelse er %s, forventede %s" |
|
9143 |
|
9144 #, python-format |
|
9145 msgid "unpacking %s" |
|
9146 msgstr "udpakker %s" |
|
9147 |
|
9148 #, python-format |
|
9149 msgid "empty or missing copy source revlog %s:%s" |
|
9150 msgstr "" |
|
9151 |
|
9152 #, python-format |
|
9153 msgid "warning: %s@%s: copy source revision is nullid %s:%s" |
|
9154 msgstr "" |
|
9155 |
|
9156 #, python-format |
|
9157 msgid "checking rename of %s" |
|
9158 msgstr "tjekker omdøbning af %s" |
|
9159 |
|
9160 #, python-format |
|
9161 msgid "%s in manifests not found" |
|
9162 msgstr "" |
|
9163 |
|
9164 #, python-format |
|
9165 msgid "warning: orphan revlog '%s'" |
|
9166 msgstr "advarsel: forældreløs revlog '%s'" |
|
9167 |
|
9168 #, python-format |
|
9169 msgid "%d files, %d changesets, %d total revisions\n" |
|
9170 msgstr "%d filer, %d ændringer, ialt %d revisioner\n" |
|
9171 |
|
9172 #, python-format |
|
9173 msgid "%d warnings encountered!\n" |
|
9174 msgstr "mødte %d advarsler!\n" |
|
9175 |
|
9176 #, python-format |
|
9177 msgid "%d integrity errors encountered!\n" |
|
9178 msgstr "fandt %d integritetsfejl!\n" |
|
9179 |
|
9180 #, python-format |
|
9181 msgid "(first damaged changeset appears to be %d)\n" |
|
9182 msgstr "(første beskadigede ændring er tilsyneladende %d)\n" |
|