Show More
@@ -15,7 +15,7 b' msgid ""' | |||
|
15 | 15 | msgstr "" |
|
16 | 16 | "Project-Id-Version: Mercurial\n" |
|
17 | 17 | "Report-Msgid-Bugs-To: \n" |
|
18 |
"POT-Creation-Date: 2009-0 |
|
|
18 | "POT-Creation-Date: 2009-03-09 23:19+0100\n" | |
|
19 | 19 | "PO-Revision-Date: 2009-02-22 22:05+0100\n" |
|
20 | 20 | "Last-Translator: <mg@daimi.au.dk>\n" |
|
21 | 21 | "Language-Team: Danish\n" |
@@ -241,7 +241,7 b' msgstr ""' | |||
|
241 | 241 | msgid "rename a given bookmark" |
|
242 | 242 | msgstr "" |
|
243 | 243 | |
|
244 |
msgid "hg bookmarks [-d] [-m NAME] [-r |
|
|
244 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" | |
|
245 | 245 | msgstr "" |
|
246 | 246 | |
|
247 | 247 | msgid "" |
@@ -712,6 +712,7 b' msgid ""' | |||
|
712 | 712 | " - Monotone [mtn]\n" |
|
713 | 713 | " - GNU Arch [gnuarch]\n" |
|
714 | 714 | " - Bazaar [bzr]\n" |
|
715 | " - Perforce [p4]\n" | |
|
715 | 716 | "\n" |
|
716 | 717 | " Accepted destination formats [identifiers]:\n" |
|
717 | 718 | " - Mercurial [hg]\n" |
@@ -778,8 +779,9 b' msgid ""' | |||
|
778 | 779 | " ignore integrity errors when reading. Use it to fix Mercurial\n" |
|
779 | 780 | " repositories with missing revlogs, by converting from and to\n" |
|
780 | 781 | " Mercurial.\n" |
|
781 |
" --config convert.hg.saverev= |
|
|
782 | " allow target to preserve source revision ID\n" | |
|
782 | " --config convert.hg.saverev=False (boolean)\n" | |
|
783 | " store original revision ID in changeset (forces target IDs to " | |
|
784 | "change)\n" | |
|
783 | 785 | " --config convert.hg.startrev=0 (hg revision identifier)\n" |
|
784 | 786 | " convert start revision and its descendants\n" |
|
785 | 787 | "\n" |
@@ -856,6 +858,23 b' msgid ""' | |||
|
856 | 858 | " --config convert.svn.startrev=0 (svn revision number)\n" |
|
857 | 859 | " specify start Subversion revision.\n" |
|
858 | 860 | "\n" |
|
861 | " Perforce Source\n" | |
|
862 | " ---------------\n" | |
|
863 | "\n" | |
|
864 | " The Perforce (P4) importer can be given a p4 depot path or a client\n" | |
|
865 | " specification as source. It will convert all files in the source to\n" | |
|
866 | " a flat Mercurial repository, ignoring labels, branches and " | |
|
867 | "integrations.\n" | |
|
868 | " Note that when a depot path is given you then usually should specify a\n" | |
|
869 | " target directory, because otherwise the target may be named ...-hg.\n" | |
|
870 | "\n" | |
|
871 | " It is possible to limit the amount of source history to be converted\n" | |
|
872 | " by specifying an initial Perforce revision.\n" | |
|
873 | "\n" | |
|
874 | " --config convert.p4.startrev=0 (perforce changelist number)\n" | |
|
875 | " specify initial Perforce revision.\n" | |
|
876 | "\n" | |
|
877 | "\n" | |
|
859 | 878 | " Mercurial Destination\n" |
|
860 | 879 | " ---------------------\n" |
|
861 | 880 | "\n" |
@@ -1203,6 +1222,14 b' msgstr ""' | |||
|
1203 | 1222 | msgid "copying file in renamed dir from '%s' to '%s'" |
|
1204 | 1223 | msgstr "" |
|
1205 | 1224 | |
|
1225 | #, fuzzy | |
|
1226 | msgid "reading p4 views\n" | |
|
1227 | msgstr "rydder op %s\n" | |
|
1228 | ||
|
1229 | #, fuzzy | |
|
1230 | msgid "collecting p4 changelists\n" | |
|
1231 | msgstr "opretter Γ¦ndringer\n" | |
|
1232 | ||
|
1206 | 1233 | msgid "Subversion python bindings could not be loaded" |
|
1207 | 1234 | msgstr "" |
|
1208 | 1235 | |
@@ -3666,7 +3693,7 b' msgid ""' | |||
|
3666 | 3693 | "each patchbomb message in a pager or sending the messages directly,\n" |
|
3667 | 3694 | "it will create a UNIX mailbox file with the patch emails. This\n" |
|
3668 | 3695 | "mailbox file can be previewed with any mail user agent which supports\n" |
|
3669 |
"UNIX mbox files, |
|
|
3696 | "UNIX mbox files, e.g. with mutt:\n" | |
|
3670 | 3697 | "\n" |
|
3671 | 3698 | " % mutt -R -f mbox\n" |
|
3672 | 3699 | "\n" |
@@ -3784,7 +3811,7 b' msgstr ""' | |||
|
3784 | 3811 | msgid "send patches as inline attachments" |
|
3785 | 3812 | msgstr "" |
|
3786 | 3813 | |
|
3787 | msgid "email addresses of blind copy recipients" | |
|
3814 | msgid "email addresses of blind carbon copy recipients" | |
|
3788 | 3815 | msgstr "" |
|
3789 | 3816 | |
|
3790 | 3817 | msgid "email addresses of copy recipients" |
@@ -4805,6 +4832,7 b' msgstr ""' | |||
|
4805 | 4832 | msgid "file %s not tracked!" |
|
4806 | 4833 | msgstr "" |
|
4807 | 4834 | |
|
4835 | #, fuzzy | |
|
4808 | 4836 | msgid "" |
|
4809 | 4837 | "add the specified files on the next commit\n" |
|
4810 | 4838 | "\n" |
@@ -4813,7 +4841,7 b' msgid ""' | |||
|
4813 | 4841 | " The files will be added to the repository at the next commit. To\n" |
|
4814 | 4842 | " undo an add before that, see hg revert.\n" |
|
4815 | 4843 | "\n" |
|
4816 |
" If no names are given, add all files |
|
|
4844 | " If no names are given, add all files to the repository.\n" | |
|
4817 | 4845 | " " |
|
4818 | 4846 | msgstr "" |
|
4819 | 4847 | "tilføj de angivne filer ved næste commit\n" |
@@ -4923,7 +4951,7 b' msgid ""' | |||
|
4923 | 4951 | " The --merge option remembers the parent of the working directory\n" |
|
4924 | 4952 | " before starting the backout, then merges the new head with that\n" |
|
4925 | 4953 | " changeset afterwards. This saves you from doing the merge by\n" |
|
4926 |
" hand. The result of this merge is not committed, as |
|
|
4954 | " hand. The result of this merge is not committed, as with a normal\n" | |
|
4927 | 4955 | " merge.\n" |
|
4928 | 4956 | "\n" |
|
4929 | 4957 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
@@ -4991,8 +5019,7 b' msgid ""' | |||
|
4991 | 5019 | "exit\n" |
|
4992 | 5020 | " status is 0 the revision is marked as good, 125 - skipped, 127 (command " |
|
4993 | 5021 | "not\n" |
|
4994 |
" found) - bisection will be aborted |
|
|
4995 | "will\n" | |
|
5022 | " found) - bisection will be aborted; any other status bigger than 0 will\n" | |
|
4996 | 5023 | " mark revision as bad.\n" |
|
4997 | 5024 | " " |
|
4998 | 5025 | msgstr "" |
@@ -5077,7 +5104,7 b' msgid ""' | |||
|
5077 | 5104 | "create a changegroup file\n" |
|
5078 | 5105 | "\n" |
|
5079 | 5106 | " Generate a compressed changegroup file collecting changesets not\n" |
|
5080 |
" |
|
|
5107 | " known to be in another repository.\n" | |
|
5081 | 5108 | "\n" |
|
5082 | 5109 | " If no destination repository is specified the destination is\n" |
|
5083 | 5110 | " assumed to have all the nodes specified by one or more --base\n" |
@@ -5176,7 +5203,7 b' msgid ""' | |||
|
5176 | 5203 | " file names or -I/-X filters.\n" |
|
5177 | 5204 | "\n" |
|
5178 | 5205 | " If no commit message is specified, the configured editor is started to\n" |
|
5179 |
" |
|
|
5206 | " prompt you for a message.\n" | |
|
5180 | 5207 | "\n" |
|
5181 | 5208 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
5182 | 5209 | " " |
@@ -5194,13 +5221,13 b' msgid ""' | |||
|
5194 | 5221 | "\n" |
|
5195 | 5222 | " Mark dest as having copies of source files. If dest is a\n" |
|
5196 | 5223 | " directory, copies are put in that directory. If dest is a file,\n" |
|
5197 | " there can only be one source.\n" | |
|
5224 | " the source must be a single file.\n" | |
|
5198 | 5225 | "\n" |
|
5199 | 5226 | " By default, this command copies the contents of files as they\n" |
|
5200 | 5227 | " stand in the working directory. If invoked with --after, the\n" |
|
5201 | 5228 | " operation is recorded, but no copying is performed.\n" |
|
5202 | 5229 | "\n" |
|
5203 |
" This command takes effect |
|
|
5230 | " This command takes effect with the next commit. To undo a copy\n" | |
|
5204 | 5231 | " before that, see hg revert.\n" |
|
5205 | 5232 | " " |
|
5206 | 5233 | msgstr "" |
@@ -5397,7 +5424,7 b' msgid ""' | |||
|
5397 | 5424 | " probably with undesirable results.\n" |
|
5398 | 5425 | "\n" |
|
5399 | 5426 | " Use the --git option to generate diffs in the git extended diff\n" |
|
5400 |
" format. |
|
|
5427 | " format. For more information, read hg help diffs.\n" | |
|
5401 | 5428 | " " |
|
5402 | 5429 | msgstr "" |
|
5403 | 5430 | |
@@ -5722,8 +5749,8 b' msgid ""' | |||
|
5722 | 5749 | " files and full commit message is shown.\n" |
|
5723 | 5750 | "\n" |
|
5724 | 5751 | " NOTE: log -p may generate unexpected diff output for merge\n" |
|
5725 |
" changesets, as it will compare the merge changeset against |
|
|
5726 |
" first parent |
|
|
5752 | " changesets, as it will only compare the merge changeset against\n" | |
|
5753 | " its first parent. Also, the files: list will only reflect files\n" | |
|
5727 | 5754 | " that are different from BOTH parents.\n" |
|
5728 | 5755 | "\n" |
|
5729 | 5756 | " " |
@@ -5965,10 +5992,10 b' msgid ""' | |||
|
5965 | 5992 | " a file, there can only be one source.\n" |
|
5966 | 5993 | "\n" |
|
5967 | 5994 | " By default, this command copies the contents of files as they\n" |
|
5968 |
" st |
|
|
5995 | " exist in the working directory. If invoked with --after, the\n" | |
|
5969 | 5996 | " operation is recorded, but no copying is performed.\n" |
|
5970 | 5997 | "\n" |
|
5971 |
" This command takes effect |
|
|
5998 | " This command takes effect at the next commit. To undo a rename\n" | |
|
5972 | 5999 | " before that, see hg revert.\n" |
|
5973 | 6000 | " " |
|
5974 | 6001 | msgstr "" |
@@ -6285,7 +6312,7 b' msgstr "Mercurial Distributed SCM (versi' | |||
|
6285 | 6312 | |
|
6286 | 6313 | msgid "" |
|
6287 | 6314 | "\n" |
|
6288 |
"Copyright (C) 2005-200 |
|
|
6315 | "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n" | |
|
6289 | 6316 | "This is free software; see the source for copying conditions. There is NO\n" |
|
6290 | 6317 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
6291 | 6318 | msgstr "" |
@@ -7216,6 +7243,7 b' msgstr ""' | |||
|
7216 | 7243 | msgid "Date Formats" |
|
7217 | 7244 | msgstr "Datoformater" |
|
7218 | 7245 | |
|
7246 | #, fuzzy | |
|
7219 | 7247 | msgid "" |
|
7220 | 7248 | "\n" |
|
7221 | 7249 | " Some commands allow the user to specify a date, e.g.:\n" |
@@ -7249,9 +7277,9 b' msgid ""' | |||
|
7249 | 7277 | "\n" |
|
7250 | 7278 | " The log command also accepts date ranges:\n" |
|
7251 | 7279 | "\n" |
|
7252 |
" \"<{date}\" - |
|
|
7253 | " \">{date}\" - on or after a given date\n" | |
|
7254 | " \"{date} to {date}\" - a date range, inclusive\n" | |
|
7280 | " \"<{datetime}\" - at or before a given date/time\n" | |
|
7281 | " \">{datetime}\" - on or after a given date/time\n" | |
|
7282 | " \"{datetime} to {datetime}\" - a date range, inclusive\n" | |
|
7255 | 7283 | " \"-{days}\" - within a given number of days of today\n" |
|
7256 | 7284 | " " |
|
7257 | 7285 | msgstr "" |
@@ -7306,16 +7334,16 b' msgid ""' | |||
|
7306 | 7334 | "\n" |
|
7307 | 7335 | " Alternate pattern notations must be specified explicitly.\n" |
|
7308 | 7336 | "\n" |
|
7309 |
" To use a plain path name without any pattern matching, start |
|
|
7310 |
" |
|
|
7311 |
" the |
|
|
7312 | "\n" | |
|
7313 |
" To use an extended glob, start a name with \"glob:\". |
|
|
7314 |
" rooted at the current directory; a glob such as \"*.c\" will |
|
|
7315 |
" files |
|
|
7337 | " To use a plain path name without any pattern matching, start it\n" | |
|
7338 | " with \"path:\". These path names must completely match starting at\n" | |
|
7339 | " the current repository root.\n" | |
|
7340 | "\n" | |
|
7341 | " To use an extended glob, start a name with \"glob:\". Globs are\n" | |
|
7342 | " rooted at the current directory; a glob such as \"*.c\" will only\n" | |
|
7343 | " match files in the current directory ending with \".c\".\n" | |
|
7316 | 7344 | "\n" |
|
7317 | 7345 | " The supported glob syntax extensions are \"**\" to match any string\n" |
|
7318 |
" across path separators |
|
|
7346 | " across path separators and \"{a,b}\" to mean \"a or b\".\n" | |
|
7319 | 7347 | "\n" |
|
7320 | 7348 | " To use a Perl/Python regular expression, start a name with \"re:\".\n" |
|
7321 | 7349 | " Regexp pattern matching is anchored at the root of the repository.\n" |
@@ -7330,11 +7358,11 b' msgid ""' | |||
|
7330 | 7358 | "\n" |
|
7331 | 7359 | " glob:*.c any name ending in \".c\" in the current directory\n" |
|
7332 | 7360 | " *.c any name ending in \".c\" in the current directory\n" |
|
7333 |
" **.c any name ending in \".c\" in |
|
|
7334 |
" |
|
|
7361 | " **.c any name ending in \".c\" in any subdirectory of the\n" | |
|
7362 | " current directory including itself.\n" | |
|
7335 | 7363 | " foo/*.c any name ending in \".c\" in the directory foo\n" |
|
7336 |
" foo/**.c any name ending in \".c\" in |
|
|
7337 |
" |
|
|
7364 | " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" | |
|
7365 | " including itself.\n" | |
|
7338 | 7366 | "\n" |
|
7339 | 7367 | " Regexp examples:\n" |
|
7340 | 7368 | "\n" |
@@ -7350,11 +7378,13 b' msgid ""' | |||
|
7350 | 7378 | "\n" |
|
7351 | 7379 | "HG::\n" |
|
7352 | 7380 | " Path to the 'hg' executable, automatically passed when running hooks,\n" |
|
7353 |
" extensions or external tools. If unset or empty, |
|
|
7354 | " 'hg' (with com/exe/bat/cmd extension on Windows) is searched.\n" | |
|
7381 | " extensions or external tools. If unset or empty, this is the hg\n" | |
|
7382 | " executable's name if it's frozen, or an executable named 'hg'\n" | |
|
7383 | " (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
|
7384 | " Windows) is searched.\n" | |
|
7355 | 7385 | "\n" |
|
7356 | 7386 | "HGEDITOR::\n" |
|
7357 |
" This is the name of the editor to |
|
|
7387 | " This is the name of the editor to run when committing. See EDITOR.\n" | |
|
7358 | 7388 | "\n" |
|
7359 | 7389 | " (deprecated, use .hgrc)\n" |
|
7360 | 7390 | "\n" |
@@ -7366,8 +7396,8 b' msgid ""' | |||
|
7366 | 7396 | "\n" |
|
7367 | 7397 | "HGENCODINGMODE::\n" |
|
7368 | 7398 | " This sets Mercurial's behavior for handling unknown characters\n" |
|
7369 |
" while transcoding user input |
|
|
7370 |
" causes Mercurial to abort if it can't |
|
|
7399 | " while transcoding user input. The default is \"strict\", which\n" | |
|
7400 | " causes Mercurial to abort if it can't map a character. Other\n" | |
|
7371 | 7401 | " settings include \"replace\", which replaces unknown characters, and\n" |
|
7372 | 7402 | " \"ignore\", which drops them. This setting can be overridden with\n" |
|
7373 | 7403 | " the --encodingmode command-line option.\n" |
@@ -7380,26 +7410,32 b' msgid ""' | |||
|
7380 | 7410 | " (deprecated, use .hgrc)\n" |
|
7381 | 7411 | "\n" |
|
7382 | 7412 | "HGRCPATH::\n" |
|
7383 |
" A list of files or directories to search for hgrc files. |
|
|
7384 |
" separator is \":\" on Unix, \";\" on Windows. |
|
|
7385 |
" platform default search path is used. |
|
|
7386 | " current repository is read.\n" | |
|
7387 | "\n" | |
|
7388 | " For each element in path, if a directory, all entries in directory\n" | |
|
7389 | " ending with \".rc\" are added to path. Else, element itself is\n" | |
|
7390 | " added to path.\n" | |
|
7413 | " A list of files or directories to search for hgrc files. Item\n" | |
|
7414 | " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" | |
|
7415 | " platform default search path is used. If empty, only the .hg/hgrc\n" | |
|
7416 | " from the current repository is read.\n" | |
|
7417 | "\n" | |
|
7418 | " For each element in HGRCPATH:\n" | |
|
7419 | " * if it's a directory, all directories ending with .rc are added\n" | |
|
7420 | " * otherwise, the directory itself will be added\n" | |
|
7391 | 7421 | "\n" |
|
7392 | 7422 | "HGUSER::\n" |
|
7393 |
" This is the string used |
|
|
7423 | " This is the string used as the author of a commit. If not set,\n" | |
|
7424 | " available values will be considered in this order:\n" | |
|
7425 | "\n" | |
|
7426 | " * HGUSER (deprecated)\n" | |
|
7427 | " * hgrc files from the HGRCPATH\n" | |
|
7428 | " * EMAIL\n" | |
|
7429 | " * interactive prompt\n" | |
|
7430 | " * LOGNAME (with '@hostname' appended)\n" | |
|
7394 | 7431 | "\n" |
|
7395 | 7432 | " (deprecated, use .hgrc)\n" |
|
7396 | 7433 | "\n" |
|
7397 | 7434 | "EMAIL::\n" |
|
7398 |
" |
|
|
7435 | " May be used as the author of a commit; see HGUSER.\n" | |
|
7399 | 7436 | "\n" |
|
7400 | 7437 | "LOGNAME::\n" |
|
7401 | " If neither HGUSER nor EMAIL is set, LOGNAME will be used (with\n" | |
|
7402 | " '@hostname' appended) as the author value for a commit.\n" | |
|
7438 | " May be used as the author of a commit; see HGUSER.\n" | |
|
7403 | 7439 | "\n" |
|
7404 | 7440 | "VISUAL::\n" |
|
7405 | 7441 | " This is the name of the editor to use when committing. See EDITOR.\n" |
@@ -7414,7 +7450,7 b' msgid ""' | |||
|
7414 | 7450 | "\n" |
|
7415 | 7451 | "PYTHONPATH::\n" |
|
7416 | 7452 | " This is used by Python to find imported modules and may need to be set\n" |
|
7417 | " appropriately if Mercurial is not installed system-wide.\n" | |
|
7453 | " appropriately if this Mercurial is not installed system-wide.\n" | |
|
7418 | 7454 | " " |
|
7419 | 7455 | msgstr "" |
|
7420 | 7456 | |
@@ -7423,12 +7459,14 b' msgstr "Angivning af en enkelt revision"' | |||
|
7423 | 7459 | |
|
7424 | 7460 | msgid "" |
|
7425 | 7461 | "\n" |
|
7426 |
" Mercurial |
|
|
7462 | " Mercurial supports several ways to specify individual\n" | |
|
7427 | 7463 | " revisions.\n" |
|
7428 | 7464 | "\n" |
|
7429 | 7465 | " A plain integer is treated as a revision number. Negative\n" |
|
7430 |
" integers are treated as offsets from the tip, with |
|
|
7431 | " tip.\n" | |
|
7466 | " integers are treated as toplogical offsets from the tip, with\n" | |
|
7467 | " -1 denoting the tip. As such, negative numbers are only useful\n" | |
|
7468 | " if you've memorized your local tree numbers and want to save\n" | |
|
7469 | " typing a single digit. This editor suggests copy and paste.\n" | |
|
7432 | 7470 | "\n" |
|
7433 | 7471 | " A 40-digit hexadecimal string is treated as a unique revision\n" |
|
7434 | 7472 | " identifier.\n" |
@@ -7436,7 +7474,7 b' msgid ""' | |||
|
7436 | 7474 | " A hexadecimal string less than 40 characters long is treated as a\n" |
|
7437 | 7475 | " unique revision identifier, and referred to as a short-form\n" |
|
7438 | 7476 | " identifier. A short-form identifier is only valid if it is the\n" |
|
7439 | " prefix of one full-length identifier.\n" | |
|
7477 | " prefix of exactly one full-length identifier.\n" | |
|
7440 | 7478 | "\n" |
|
7441 | 7479 | " Any other string is treated as a tag name, which is a symbolic\n" |
|
7442 | 7480 | " name associated with a revision identifier. Tag names may not\n" |
@@ -7461,8 +7499,8 b' msgstr "Angivning af flere revisioner"' | |||
|
7461 | 7499 | msgid "" |
|
7462 | 7500 | "\n" |
|
7463 | 7501 | " When Mercurial accepts more than one revision, they may be\n" |
|
7464 |
" specified individually, or provided as a continuous |
|
|
7465 | " separated by the \":\" character.\n" | |
|
7502 | " specified individually, or provided as a topologically continuous\n" | |
|
7503 | " range, separated by the \":\" character.\n" | |
|
7466 | 7504 | "\n" |
|
7467 | 7505 | " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" |
|
7468 | 7506 | " are revision identifiers. Both BEGIN and END are optional. If\n" |
@@ -7474,7 +7512,7 b' msgid ""' | |||
|
7474 | 7512 | " order.\n" |
|
7475 | 7513 | "\n" |
|
7476 | 7514 | " A range acts as a closed interval. This means that a range of 3:5\n" |
|
7477 |
" gives 3, 4 and 5. Similarly, a range of |
|
|
7515 | " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" | |
|
7478 | 7516 | " " |
|
7479 | 7517 | msgstr "" |
|
7480 | 7518 | |
@@ -7490,14 +7528,14 b' msgid ""' | |||
|
7490 | 7528 | " While this standard format is often enough, it does not encode the\n" |
|
7491 | 7529 | " following information:\n" |
|
7492 | 7530 | "\n" |
|
7493 | " - executable status\n" | |
|
7531 | " - executable status and other permission bits\n" | |
|
7494 | 7532 | " - copy or rename information\n" |
|
7495 | 7533 | " - changes in binary files\n" |
|
7496 | 7534 | " - creation or deletion of empty files\n" |
|
7497 | 7535 | "\n" |
|
7498 | 7536 | " Mercurial also supports the extended diff format from the git VCS\n" |
|
7499 | 7537 | " which addresses these limitations. The git diff format is not\n" |
|
7500 |
" produced by default because |
|
|
7538 | " produced by default because a few widespread tools still do not\n" | |
|
7501 | 7539 | " understand this format.\n" |
|
7502 | 7540 | "\n" |
|
7503 | 7541 | " This means that when generating diffs from a Mercurial repository\n" |
@@ -7526,7 +7564,7 b' msgid ""' | |||
|
7526 | 7564 | "style).\n" |
|
7527 | 7565 | "\n" |
|
7528 | 7566 | " You can customize output for any \"log-like\" command: log, outgoing,\n" |
|
7529 |
" incoming, tip, parents, heads and glog |
|
|
7567 | " incoming, tip, parents, heads and glog.\n" | |
|
7530 | 7568 | "\n" |
|
7531 | 7569 | " Three styles are packaged with Mercurial: default (the style used\n" |
|
7532 | 7570 | " when no explicit preference is passed), compact and changelog. Usage:\n" |
@@ -7563,7 +7601,7 b' msgid ""' | |||
|
7563 | 7601 | " want to use a date in your output, you can use a filter to process it.\n" |
|
7564 | 7602 | " Filters are functions which return a string based on the input " |
|
7565 | 7603 | "variable.\n" |
|
7566 |
" You can also use a chain of filters to get the |
|
|
7604 | " You can also use a chain of filters to get the desired output:\n" | |
|
7567 | 7605 | "\n" |
|
7568 | 7606 | " $ hg tip --template \"{date|isodate}\\n\"\n" |
|
7569 | 7607 | " 2008-08-21 18:22 +0000\n" |
@@ -7572,15 +7610,21 b' msgid ""' | |||
|
7572 | 7610 | "\n" |
|
7573 | 7611 | " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" |
|
7574 | 7612 | " every line except the last.\n" |
|
7575 |
" - age: Date. Returns a human-readable |
|
|
7613 | " - age: Date. Returns a human-readable date/time difference between\n" | |
|
7614 | " the given date/time and the current date/time.\n" | |
|
7576 | 7615 | " - basename: Any text. Treats the text as a path, and returns the\n" |
|
7577 | " basename. For example, \"foo/bar/baz\" becomes \"baz\".\n" | |
|
7578 | " - date: Date. Returns a date in a Unix date command format, including\n" | |
|
7616 | " last component of the path after splitting by the path\n" | |
|
7617 | " separator (ignoring trailing seprators). For example,\n" | |
|
7618 | " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" | |
|
7619 | "\".\n" | |
|
7620 | " - date: Date. Returns a date in a Unix date format, including\n" | |
|
7579 | 7621 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" |
|
7580 | 7622 | " - domain: Any text. Finds the first string that looks like an email\n" |
|
7581 | 7623 | " address, and extracts just the domain component.\n" |
|
7624 | " Example: 'User <user@example.com>' becomes 'example.com'.\n" | |
|
7582 | 7625 | " - email: Any text. Extracts the first string that looks like an email\n" |
|
7583 | " address.\n" | |
|
7626 | " address. Example: 'User <user@example.com>' becomes\n" | |
|
7627 | " 'user@example.com'.\n" | |
|
7584 | 7628 | " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" |
|
7585 | 7629 | " \"<\" and \">\" with XML entities.\n" |
|
7586 | 7630 | " - fill68: Any text. Wraps the text to fit in 68 columns.\n" |
@@ -7596,7 +7640,7 b' msgid ""' | |||
|
7596 | 7640 | " in email headers.\n" |
|
7597 | 7641 | " - short: Changeset hash. Returns the short form of a changeset hash,\n" |
|
7598 | 7642 | " i.e. a 12-byte hexadecimal string.\n" |
|
7599 |
" - shortdate: Date. Returns a date like \"2006-09- |
|
|
7643 | " - shortdate: Date. Returns a date like \"2006-09-18\".\n" | |
|
7600 | 7644 | " - strip: Any text. Strips all leading and trailing whitespace.\n" |
|
7601 | 7645 | " - tabindent: Any text. Returns the text, with every line except the\n" |
|
7602 | 7646 | " first starting with a tab character.\n" |
@@ -7623,7 +7667,7 b' msgid ""' | |||
|
7623 | 7667 | " 'hg incoming --bundle').\n" |
|
7624 | 7668 | "\n" |
|
7625 | 7669 | " An optional identifier after # indicates a particular branch, tag,\n" |
|
7626 |
" or changeset to |
|
|
7670 | " or changeset to use from the remote repository.\n" | |
|
7627 | 7671 | "\n" |
|
7628 | 7672 | " Some features, such as pushing to http:// and https:// URLs are\n" |
|
7629 | 7673 | " only possible if the feature is explicitly enabled on the\n" |
@@ -7655,13 +7699,14 b' msgid ""' | |||
|
7655 | 7699 | " You can then use the alias for any command that uses a url (for example\n" |
|
7656 | 7700 | " 'hg pull alias1' would pull from the 'alias1' path).\n" |
|
7657 | 7701 | "\n" |
|
7658 |
" Two path aliases are |
|
|
7702 | " Two path aliases are special because they are used as defaults\n" | |
|
7659 | 7703 | " when you do not provide the url to a command:\n" |
|
7660 | 7704 | "\n" |
|
7661 | 7705 | " default:\n" |
|
7662 | 7706 | " When you create a repository with hg clone, the clone command saves\n" |
|
7663 |
" the location of the source repository as the |
|
|
7664 |
" then used when you omit |
|
|
7707 | " the location of the source repository as the new repository's\n" | |
|
7708 | " 'default' path. This is then used when you omit path from push-\n" | |
|
7709 | " and pull-like commands (including in and out).\n" | |
|
7665 | 7710 | "\n" |
|
7666 | 7711 | " default-push:\n" |
|
7667 | 7712 | " The push command will look for a path named 'default-push', and\n" |
@@ -7707,6 +7752,11 b' msgstr "%d filer %s"' | |||
|
7707 | 7752 | msgid "use 'hg resolve' to retry unresolved file merges\n" |
|
7708 | 7753 | msgstr "" |
|
7709 | 7754 | |
|
7755 | msgid "" | |
|
7756 | "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " | |
|
7757 | "abandon\n" | |
|
7758 | msgstr "" | |
|
7759 | ||
|
7710 | 7760 | msgid "(branch merge, don't forget to commit)\n" |
|
7711 | 7761 | msgstr "" |
|
7712 | 7762 | |
@@ -8775,6 +8825,10 b' msgstr "tjekker filer\\n"' | |||
|
8775 | 8825 | msgid "cannot decode filename '%s'" |
|
8776 | 8826 | msgstr "kan ikke dekode filnavn '%s'" |
|
8777 | 8827 | |
|
8828 | #, python-format | |
|
8829 | msgid "broken revlog! (%s)" | |
|
8830 | msgstr "" | |
|
8831 | ||
|
8778 | 8832 | msgid "missing revlog!" |
|
8779 | 8833 | msgstr "manglende revlog!" |
|
8780 | 8834 |
General Comments 0
You need to be logged in to leave comments.
Login now