diff --git a/i18n/da.po b/i18n/da.po --- a/i18n/da.po +++ b/i18n/da.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-22 22:02+0100\n" +"POT-Creation-Date: 2009-03-09 23:19+0100\n" "PO-Revision-Date: 2009-02-22 22:05+0100\n" "Last-Translator: \n" "Language-Team: Danish\n" @@ -241,7 +241,7 @@ msgstr "" msgid "rename a given bookmark" msgstr "" -msgid "hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]" +msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" msgstr "" msgid "" @@ -712,6 +712,7 @@ msgid "" " - Monotone [mtn]\n" " - GNU Arch [gnuarch]\n" " - Bazaar [bzr]\n" +" - Perforce [p4]\n" "\n" " Accepted destination formats [identifiers]:\n" " - Mercurial [hg]\n" @@ -778,8 +779,9 @@ msgid "" " ignore integrity errors when reading. Use it to fix Mercurial\n" " repositories with missing revlogs, by converting from and to\n" " Mercurial.\n" -" --config convert.hg.saverev=True (boolean)\n" -" allow target to preserve source revision ID\n" +" --config convert.hg.saverev=False (boolean)\n" +" store original revision ID in changeset (forces target IDs to " +"change)\n" " --config convert.hg.startrev=0 (hg revision identifier)\n" " convert start revision and its descendants\n" "\n" @@ -856,6 +858,23 @@ msgid "" " --config convert.svn.startrev=0 (svn revision number)\n" " specify start Subversion revision.\n" "\n" +" Perforce Source\n" +" ---------------\n" +"\n" +" The Perforce (P4) importer can be given a p4 depot path or a client\n" +" specification as source. It will convert all files in the source to\n" +" a flat Mercurial repository, ignoring labels, branches and " +"integrations.\n" +" Note that when a depot path is given you then usually should specify a\n" +" target directory, because otherwise the target may be named ...-hg.\n" +"\n" +" It is possible to limit the amount of source history to be converted\n" +" by specifying an initial Perforce revision.\n" +"\n" +" --config convert.p4.startrev=0 (perforce changelist number)\n" +" specify initial Perforce revision.\n" +"\n" +"\n" " Mercurial Destination\n" " ---------------------\n" "\n" @@ -1203,6 +1222,14 @@ msgstr "" msgid "copying file in renamed dir from '%s' to '%s'" msgstr "" +#, fuzzy +msgid "reading p4 views\n" +msgstr "rydder op %s\n" + +#, fuzzy +msgid "collecting p4 changelists\n" +msgstr "opretter ændringer\n" + msgid "Subversion python bindings could not be loaded" msgstr "" @@ -3666,7 +3693,7 @@ msgid "" "each patchbomb message in a pager or sending the messages directly,\n" "it will create a UNIX mailbox file with the patch emails. This\n" "mailbox file can be previewed with any mail user agent which supports\n" -"UNIX mbox files, i.e. with mutt:\n" +"UNIX mbox files, e.g. with mutt:\n" "\n" " % mutt -R -f mbox\n" "\n" @@ -3784,7 +3811,7 @@ msgstr "" msgid "send patches as inline attachments" msgstr "" -msgid "email addresses of blind copy recipients" +msgid "email addresses of blind carbon copy recipients" msgstr "" msgid "email addresses of copy recipients" @@ -4805,6 +4832,7 @@ msgstr "" msgid "file %s not tracked!" msgstr "" +#, fuzzy msgid "" "add the specified files on the next commit\n" "\n" @@ -4813,7 +4841,7 @@ msgid "" " The files will be added to the repository at the next commit. To\n" " undo an add before that, see hg revert.\n" "\n" -" If no names are given, add all files in the repository.\n" +" If no names are given, add all files to the repository.\n" " " msgstr "" "tilføj de angivne filer ved næste commit\n" @@ -4923,7 +4951,7 @@ msgid "" " The --merge option remembers the parent of the working directory\n" " before starting the backout, then merges the new head with that\n" " changeset afterwards. This saves you from doing the merge by\n" -" hand. The result of this merge is not committed, as for a normal\n" +" hand. The result of this merge is not committed, as with a normal\n" " merge.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" @@ -4991,8 +5019,7 @@ msgid "" "exit\n" " status is 0 the revision is marked as good, 125 - skipped, 127 (command " "not\n" -" found) - bisection will be aborted and any other status bigger than 0 " -"will\n" +" found) - bisection will be aborted; any other status bigger than 0 will\n" " mark revision as bad.\n" " " msgstr "" @@ -5077,7 +5104,7 @@ msgid "" "create a changegroup file\n" "\n" " Generate a compressed changegroup file collecting changesets not\n" -" found in the other repository.\n" +" known to be in another repository.\n" "\n" " If no destination repository is specified the destination is\n" " assumed to have all the nodes specified by one or more --base\n" @@ -5176,7 +5203,7 @@ msgid "" " file names or -I/-X filters.\n" "\n" " If no commit message is specified, the configured editor is started to\n" -" enter a message.\n" +" prompt you for a message.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " @@ -5194,13 +5221,13 @@ msgid "" "\n" " Mark dest as having copies of source files. If dest is a\n" " directory, copies are put in that directory. If dest is a file,\n" -" there can only be one source.\n" +" the source must be a single file.\n" "\n" " By default, this command copies the contents of files as they\n" " stand in the working directory. If invoked with --after, the\n" " operation is recorded, but no copying is performed.\n" "\n" -" This command takes effect in the next commit. To undo a copy\n" +" This command takes effect with the next commit. To undo a copy\n" " before that, see hg revert.\n" " " msgstr "" @@ -5397,7 +5424,7 @@ msgid "" " probably with undesirable results.\n" "\n" " Use the --git option to generate diffs in the git extended diff\n" -" format. Read the diffs help topic for more information.\n" +" format. For more information, read hg help diffs.\n" " " msgstr "" @@ -5722,8 +5749,8 @@ msgid "" " files and full commit message is shown.\n" "\n" " NOTE: log -p may generate unexpected diff output for merge\n" -" changesets, as it will compare the merge changeset against its\n" -" first parent only. Also, the files: list will only reflect files\n" +" changesets, as it will only compare the merge changeset against\n" +" its first parent. Also, the files: list will only reflect files\n" " that are different from BOTH parents.\n" "\n" " " @@ -5965,10 +5992,10 @@ msgid "" " a file, there can only be one source.\n" "\n" " By default, this command copies the contents of files as they\n" -" stand in the working directory. If invoked with --after, the\n" +" exist in the working directory. If invoked with --after, the\n" " operation is recorded, but no copying is performed.\n" "\n" -" This command takes effect in the next commit. To undo a rename\n" +" This command takes effect at the next commit. To undo a rename\n" " before that, see hg revert.\n" " " msgstr "" @@ -6285,7 +6312,7 @@ msgstr "Mercurial Distributed SCM (versi msgid "" "\n" -"Copyright (C) 2005-2008 Matt Mackall and others\n" +"Copyright (C) 2005-2009 Matt Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" @@ -7216,6 +7243,7 @@ msgstr "" msgid "Date Formats" msgstr "Datoformater" +#, fuzzy msgid "" "\n" " Some commands allow the user to specify a date, e.g.:\n" @@ -7249,9 +7277,9 @@ msgid "" "\n" " The log command also accepts date ranges:\n" "\n" -" \"<{date}\" - on or before a given date\n" -" \">{date}\" - on or after a given date\n" -" \"{date} to {date}\" - a date range, inclusive\n" +" \"<{datetime}\" - at or before a given date/time\n" +" \">{datetime}\" - on or after a given date/time\n" +" \"{datetime} to {datetime}\" - a date range, inclusive\n" " \"-{days}\" - within a given number of days of today\n" " " msgstr "" @@ -7306,16 +7334,16 @@ msgid "" "\n" " Alternate pattern notations must be specified explicitly.\n" "\n" -" To use a plain path name without any pattern matching, start a\n" -" name with \"path:\". These path names must match completely, from\n" -" the root of the current repository.\n" -"\n" -" To use an extended glob, start a name with \"glob:\". Globs are\n" -" rooted at the current directory; a glob such as \"*.c\" will match\n" -" files ending in \".c\" in the current directory only.\n" +" To use a plain path name without any pattern matching, start it\n" +" with \"path:\". These path names must completely match starting at\n" +" the current repository root.\n" +"\n" +" To use an extended glob, start a name with \"glob:\". Globs are\n" +" rooted at the current directory; a glob such as \"*.c\" will only\n" +" match files in the current directory ending with \".c\".\n" "\n" " The supported glob syntax extensions are \"**\" to match any string\n" -" across path separators, and \"{a,b}\" to mean \"a or b\".\n" +" across path separators and \"{a,b}\" to mean \"a or b\".\n" "\n" " To use a Perl/Python regular expression, start a name with \"re:\".\n" " Regexp pattern matching is anchored at the root of the repository.\n" @@ -7330,11 +7358,11 @@ msgid "" "\n" " glob:*.c any name ending in \".c\" in the current directory\n" " *.c any name ending in \".c\" in the current directory\n" -" **.c any name ending in \".c\" in the current directory, or\n" -" any subdirectory\n" +" **.c any name ending in \".c\" in any subdirectory of the\n" +" current directory including itself.\n" " foo/*.c any name ending in \".c\" in the directory foo\n" -" foo/**.c any name ending in \".c\" in the directory foo, or any\n" -" subdirectory\n" +" foo/**.c any name ending in \".c\" in any subdirectory of foo\n" +" including itself.\n" "\n" " Regexp examples:\n" "\n" @@ -7350,11 +7378,13 @@ msgid "" "\n" "HG::\n" " Path to the 'hg' executable, automatically passed when running hooks,\n" -" extensions or external tools. If unset or empty, an executable named\n" -" 'hg' (with com/exe/bat/cmd extension on Windows) is searched.\n" +" extensions or external tools. If unset or empty, this is the hg\n" +" executable's name if it's frozen, or an executable named 'hg'\n" +" (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" +" Windows) is searched.\n" "\n" "HGEDITOR::\n" -" This is the name of the editor to use when committing. See EDITOR.\n" +" This is the name of the editor to run when committing. See EDITOR.\n" "\n" " (deprecated, use .hgrc)\n" "\n" @@ -7366,8 +7396,8 @@ msgid "" "\n" "HGENCODINGMODE::\n" " This sets Mercurial's behavior for handling unknown characters\n" -" while transcoding user inputs. The default is \"strict\", which\n" -" causes Mercurial to abort if it can't translate a character. Other\n" +" while transcoding user input. The default is \"strict\", which\n" +" causes Mercurial to abort if it can't map a character. Other\n" " settings include \"replace\", which replaces unknown characters, and\n" " \"ignore\", which drops them. This setting can be overridden with\n" " the --encodingmode command-line option.\n" @@ -7380,26 +7410,32 @@ msgid "" " (deprecated, use .hgrc)\n" "\n" "HGRCPATH::\n" -" A list of files or directories to search for hgrc files. Item\n" -" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" -" platform default search path is used. If empty, only .hg/hgrc of\n" -" current repository is read.\n" -"\n" -" For each element in path, if a directory, all entries in directory\n" -" ending with \".rc\" are added to path. Else, element itself is\n" -" added to path.\n" +" A list of files or directories to search for hgrc files. Item\n" +" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" +" platform default search path is used. If empty, only the .hg/hgrc\n" +" from the current repository is read.\n" +"\n" +" For each element in HGRCPATH:\n" +" * if it's a directory, all directories ending with .rc are added\n" +" * otherwise, the directory itself will be added\n" "\n" "HGUSER::\n" -" This is the string used for the author of a commit.\n" +" This is the string used as the author of a commit. If not set,\n" +" available values will be considered in this order:\n" +"\n" +" * HGUSER (deprecated)\n" +" * hgrc files from the HGRCPATH\n" +" * EMAIL\n" +" * interactive prompt\n" +" * LOGNAME (with '@hostname' appended)\n" "\n" " (deprecated, use .hgrc)\n" "\n" "EMAIL::\n" -" If HGUSER is not set, this will be used as the author for a commit.\n" +" May be used as the author of a commit; see HGUSER.\n" "\n" "LOGNAME::\n" -" If neither HGUSER nor EMAIL is set, LOGNAME will be used (with\n" -" '@hostname' appended) as the author value for a commit.\n" +" May be used as the author of a commit; see HGUSER.\n" "\n" "VISUAL::\n" " This is the name of the editor to use when committing. See EDITOR.\n" @@ -7414,7 +7450,7 @@ msgid "" "\n" "PYTHONPATH::\n" " This is used by Python to find imported modules and may need to be set\n" -" appropriately if Mercurial is not installed system-wide.\n" +" appropriately if this Mercurial is not installed system-wide.\n" " " msgstr "" @@ -7423,12 +7459,14 @@ msgstr "Angivning af en enkelt revision" msgid "" "\n" -" Mercurial accepts several notations for identifying individual\n" +" Mercurial supports several ways to specify individual\n" " revisions.\n" "\n" " A plain integer is treated as a revision number. Negative\n" -" integers are treated as offsets from the tip, with -1 denoting the\n" -" tip.\n" +" integers are treated as toplogical offsets from the tip, with\n" +" -1 denoting the tip. As such, negative numbers are only useful\n" +" if you've memorized your local tree numbers and want to save\n" +" typing a single digit. This editor suggests copy and paste.\n" "\n" " A 40-digit hexadecimal string is treated as a unique revision\n" " identifier.\n" @@ -7436,7 +7474,7 @@ msgid "" " A hexadecimal string less than 40 characters long is treated as a\n" " unique revision identifier, and referred to as a short-form\n" " identifier. A short-form identifier is only valid if it is the\n" -" prefix of one full-length identifier.\n" +" prefix of exactly one full-length identifier.\n" "\n" " Any other string is treated as a tag name, which is a symbolic\n" " name associated with a revision identifier. Tag names may not\n" @@ -7461,8 +7499,8 @@ msgstr "Angivning af flere revisioner" msgid "" "\n" " When Mercurial accepts more than one revision, they may be\n" -" specified individually, or provided as a continuous range,\n" -" separated by the \":\" character.\n" +" specified individually, or provided as a topologically continuous\n" +" range, separated by the \":\" character.\n" "\n" " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" " are revision identifiers. Both BEGIN and END are optional. If\n" @@ -7474,7 +7512,7 @@ msgid "" " order.\n" "\n" " A range acts as a closed interval. This means that a range of 3:5\n" -" gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.\n" +" gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" " " msgstr "" @@ -7490,14 +7528,14 @@ msgid "" " While this standard format is often enough, it does not encode the\n" " following information:\n" "\n" -" - executable status\n" +" - executable status and other permission bits\n" " - copy or rename information\n" " - changes in binary files\n" " - creation or deletion of empty files\n" "\n" " Mercurial also supports the extended diff format from the git VCS\n" " which addresses these limitations. The git diff format is not\n" -" produced by default because there are very few tools which\n" +" produced by default because a few widespread tools still do not\n" " understand this format.\n" "\n" " This means that when generating diffs from a Mercurial repository\n" @@ -7526,7 +7564,7 @@ msgid "" "style).\n" "\n" " You can customize output for any \"log-like\" command: log, outgoing,\n" -" incoming, tip, parents, heads and glog are all template-enabled.\n" +" incoming, tip, parents, heads and glog.\n" "\n" " Three styles are packaged with Mercurial: default (the style used\n" " when no explicit preference is passed), compact and changelog. Usage:\n" @@ -7563,7 +7601,7 @@ msgid "" " want to use a date in your output, you can use a filter to process it.\n" " Filters are functions which return a string based on the input " "variable.\n" -" You can also use a chain of filters to get the wanted output:\n" +" You can also use a chain of filters to get the desired output:\n" "\n" " $ hg tip --template \"{date|isodate}\\n\"\n" " 2008-08-21 18:22 +0000\n" @@ -7572,15 +7610,21 @@ msgid "" "\n" " - addbreaks: Any text. Add an XHTML \"
\" tag before the end of\n" " every line except the last.\n" -" - age: Date. Returns a human-readable age for the given date.\n" +" - age: Date. Returns a human-readable date/time difference between\n" +" the given date/time and the current date/time.\n" " - basename: Any text. Treats the text as a path, and returns the\n" -" basename. For example, \"foo/bar/baz\" becomes \"baz\".\n" -" - date: Date. Returns a date in a Unix date command format, including\n" +" last component of the path after splitting by the path\n" +" separator (ignoring trailing seprators). For example,\n" +" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" +"\".\n" +" - date: Date. Returns a date in a Unix date format, including\n" " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" " - domain: Any text. Finds the first string that looks like an email\n" " address, and extracts just the domain component.\n" +" Example: 'User ' becomes 'example.com'.\n" " - email: Any text. Extracts the first string that looks like an email\n" -" address.\n" +" address. Example: 'User ' becomes\n" +" 'user@example.com'.\n" " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" " \"<\" and \">\" with XML entities.\n" " - fill68: Any text. Wraps the text to fit in 68 columns.\n" @@ -7596,7 +7640,7 @@ msgid "" " in email headers.\n" " - short: Changeset hash. Returns the short form of a changeset hash,\n" " i.e. a 12-byte hexadecimal string.\n" -" - shortdate: Date. Returns a date like \"2006-09-04\".\n" +" - shortdate: Date. Returns a date like \"2006-09-18\".\n" " - strip: Any text. Strips all leading and trailing whitespace.\n" " - tabindent: Any text. Returns the text, with every line except the\n" " first starting with a tab character.\n" @@ -7623,7 +7667,7 @@ msgid "" " 'hg incoming --bundle').\n" "\n" " An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to deal with in the remote repository.\n" +" or changeset to use from the remote repository.\n" "\n" " Some features, such as pushing to http:// and https:// URLs are\n" " only possible if the feature is explicitly enabled on the\n" @@ -7655,13 +7699,14 @@ msgid "" " You can then use the alias for any command that uses a url (for example\n" " 'hg pull alias1' would pull from the 'alias1' path).\n" "\n" -" Two path aliases are more important because they are used as defaults\n" +" Two path aliases are special because they are used as defaults\n" " when you do not provide the url to a command:\n" "\n" " default:\n" " When you create a repository with hg clone, the clone command saves\n" -" the location of the source repository as the 'default' path. This is\n" -" then used when you omit a path from the push and pull commands.\n" +" the location of the source repository as the new repository's\n" +" 'default' path. This is then used when you omit path from push-\n" +" and pull-like commands (including in and out).\n" "\n" " default-push:\n" " The push command will look for a path named 'default-push', and\n" @@ -7707,6 +7752,11 @@ msgstr "%d filer %s" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "" +msgid "" +"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " +"abandon\n" +msgstr "" + msgid "(branch merge, don't forget to commit)\n" msgstr "" @@ -8775,6 +8825,10 @@ msgstr "tjekker filer\n" msgid "cannot decode filename '%s'" msgstr "kan ikke dekode filnavn '%s'" +#, python-format +msgid "broken revlog! (%s)" +msgstr "" + msgid "missing revlog!" msgstr "manglende revlog!"