Mercurial > hg
changeset 9762:a33c710a463e
i18n-da: synchronized
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 24 Oct 2009 00:44:57 +0200 |
| parents | 647f8c857810 |
| children | e06c940d554d |
| files | i18n/da.po |
| diffstat | 1 files changed, 603 insertions(+), 1036 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Tue Oct 20 15:26:22 2009 -0200 +++ b/i18n/da.po Sat Oct 24 00:44:57 2009 +0200 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-09-29 00:26+0200\n" -"PO-Revision-Date: 2009-09-29 00:41+0200\n" +"POT-Creation-Date: 2009-10-24 00:19+0200\n" +"PO-Revision-Date: 2009-10-24 00:37+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -52,6 +52,502 @@ "\n" msgid "" +"Some commands allow the user to specify a date, e.g.:\n" +"\n" +"- backout, commit, import, tag: Specify the commit date.\n" +"- log, revert, update: Select revision(s) by date.\n" +"\n" +"Many date formats are valid. Here are some examples::\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" +" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" +" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" +" \"Dec 6\" (midnight)\n" +" \"13:18\" (today assumed)\n" +" \"3:39\" (3:39AM assumed)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (Dec 6 2006)\n" +"\n" +"Lastly, there is Mercurial's internal format::\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +"This is the internal representation format for dates. unixtime is the\n" +"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" +"the offset of the local timezone, in seconds west of UTC (negative if\n" +"the timezone is east of UTC).\n" +"\n" +"The log command also accepts date ranges::\n" +"\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 "" +"Nogle kommandoer tillader brugeren at specificere en dato, f.eks.:\n" +"\n" +"- backout, commit, import, tag: specificer commit-datoen.\n" +"- log, revert, update: vælg revisioner efter dato.\n" +"\n" +"Der er mange gyldige datoformater. Her er nogle eksempler::\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n" +" \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n" +" \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n" +" \"Dec 6\" (midnat)\n" +" \"13:18\" (antager dags dato)\n" +" \"3:39\"\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (6. dec. 2006)\n" +"\n" +"Endelig er der Mercurials interne format::\n" +"\n" +" \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n" +"\n" +"Dette er den interne repræsentation af datoer. unixtime er\n" +"antallet af sekunder siden begyndelsen af epoken (1970-01-01 00:00\n" +"UTC). offset er den lokale tidszone, angivet i antal sekunder vest\n" +"for UTC (negativ hvis tidszonen er øst for UTC).\n" +"\n" +"Kommandoen log accepterer også datointervaller::\n" +"\n" +" \"<{date}\" - på eller før den angivne dato/tidspunkt\n" +" \">{date}\" - på eller efter den angivne dato/tidspunkt\n" +" \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n" +" \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n" + +msgid "" +"Mercurial's default format for showing changes between two versions of\n" +"a file is compatible with the unified format of GNU diff, which can be\n" +"used by GNU patch and many other standard tools.\n" +"\n" +"While this standard format is often enough, it does not encode the\n" +"following information:\n" +"\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 produced\n" +"by default because a few widespread tools still do not understand this\n" +"format.\n" +"\n" +"This means that when generating diffs from a Mercurial repository\n" +"(e.g. with \"hg export\"), you should be careful about things like file\n" +"copies and renames or other things mentioned above, because when\n" +"applying a standard diff to a different repository, this extra\n" +"information is lost. Mercurial's internal operations (like push and\n" +"pull) are not affected by this, because they use an internal binary\n" +"format for communicating changes.\n" +"\n" +"To make Mercurial produce the git extended diff format, use the --git\n" +"option available for many commands, or set 'git = True' in the [diff]\n" +"section of your hgrc. You do not need to set this option when\n" +"importing diffs in this format or using them in the mq extension.\n" +msgstr "" + +msgid "" +"HG\n" +" Path to the 'hg' executable, automatically passed when running\n" +" hooks, extensions or external tools. If unset or empty, this is\n" +" the hg executable's name if it's frozen, or an executable named\n" +" 'hg' (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 run when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGENCODING\n" +" This overrides the default locale setting detected by Mercurial.\n" +" This setting is used to convert data including usernames,\n" +" changeset descriptions, tag names, and branches. This setting can\n" +" be overridden with the --encoding command-line option.\n" +"\n" +"HGENCODINGMODE\n" +" This sets Mercurial's behavior for handling unknown characters\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" +"\n" +"HGMERGE\n" +" An executable to use for resolving merge conflicts. The program\n" +" will be executed with three arguments: local file, remote file,\n" +" ancestor file.\n" +"\n" +" (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 the .hg/hgrc\n" +" from the current repository is read.\n" +"\n" +" For each element in HGRCPATH:\n" +"\n" +" - if it's a directory, all files ending with .rc are added\n" +" - otherwise, the file itself will be added\n" +"\n" +"HGUSER\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" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"LOGNAME\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" +"\n" +"EDITOR\n" +" Sometimes Mercurial needs to open a text file in an editor for a\n" +" user to modify, for example when writing commit messages. The\n" +" editor it uses is determined by looking at the environment\n" +" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" +" non-empty one is chosen. If all of them are empty, the editor\n" +" defaults to 'vi'.\n" +"\n" +"PYTHONPATH\n" +" This is used by Python to find imported modules and may need to be\n" +" set appropriately if this Mercurial is not installed system-wide.\n" +msgstr "" + +msgid "" +"Mercurial has the ability to add new features through the use of\n" +"extensions. Extensions may add new commands, add options to\n" +"existing commands, change the default behavior of commands, or\n" +"implement hooks.\n" +"\n" +"Extensions are not loaded by default for a variety of reasons:\n" +"they can increase startup overhead; they may be meant for advanced\n" +"usage only; they may provide potentially dangerous abilities (such\n" +"as letting you destroy or modify history); they might not be ready\n" +"for prime time; or they may alter some usual behaviors of stock\n" +"Mercurial. It is thus up to the user to activate extensions as\n" +"needed.\n" +"\n" +"To enable the \"foo\" extension, either shipped with Mercurial or in\n" +"the Python search path, create an entry for it in your hgrc, like\n" +"this::\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +"You may also specify the full path to an extension::\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +"To explicitly disable an extension enabled in an hgrc of broader\n" +"scope, prepend its path with !::\n" +"\n" +" [extensions]\n" +" # disabling extension bar residing in /path/to/extension/bar.py\n" +" hgext.bar = !/path/to/extension/bar.py\n" +" # ditto, but no path was supplied for extension baz\n" +" hgext.baz = !\n" +msgstr "" + +msgid "" +"When Mercurial accepts more than one revision, they may be specified\n" +"individually, or provided as a topologically continuous range,\n" +"separated by the \":\" character.\n" +"\n" +"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" +"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" +"specified, it defaults to revision number 0. If END is not specified,\n" +"it defaults to the tip. The range \":\" thus means \"all revisions\".\n" +"\n" +"If BEGIN is greater than END, revisions are treated in reverse 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 9:6 gives 9, 8, 7, and 6.\n" +msgstr "" + +msgid "" +"Mercurial accepts several notations for identifying one or more files\n" +"at a time.\n" +"\n" +"By default, Mercurial treats filenames as shell-style extended glob\n" +"patterns.\n" +"\n" +"Alternate pattern notations must be specified explicitly.\n" +"\n" +"To use a plain path name without any pattern matching, start it with\n" +"\"path:\". These path names must completely match starting at the\n" +"current repository root.\n" +"\n" +"To use an extended glob, start a name with \"glob:\". Globs are rooted\n" +"at the current directory; a glob such as \"``*.c``\" will only match\n" +"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" +"\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" +"\n" +"Plain examples::\n" +"\n" +" path:foo/bar a name bar in a directory named foo in the root\n" +" of the repository\n" +" path:path:name a file or directory named \"path:name\"\n" +"\n" +"Glob examples::\n" +"\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 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 any subdirectory of foo\n" +" including itself.\n" +"\n" +"Regexp examples::\n" +"\n" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr "" + +msgid "" +"Mercurial supports several ways to specify individual revisions.\n" +"\n" +"A plain integer is treated as a revision number. Negative integers are\n" +"treated as sequential offsets from the tip, with -1 denoting the tip,\n" +"-2 denoting the revision prior to the tip, and so forth.\n" +"\n" +"A 40-digit hexadecimal string is treated as a unique revision\n" +"identifier.\n" +"\n" +"A hexadecimal string less than 40 characters long is treated as a\n" +"unique revision identifier and is referred to as a short-form\n" +"identifier. A short-form identifier is only valid if it is the prefix\n" +"of exactly one full-length identifier.\n" +"\n" +"Any other string is treated as a tag or branch name. A tag name is a\n" +"symbolic name associated with a revision identifier. A branch name\n" +"denotes the tipmost revision of that branch. Tag and branch names must\n" +"not contain the \":\" character.\n" +"\n" +"The reserved name \"tip\" is a special tag that always identifies the\n" +"most recent revision.\n" +"\n" +"The reserved name \"null\" indicates the null revision. This is the\n" +"revision of an empty repository, and the parent of revision 0.\n" +"\n" +"The reserved name \".\" indicates the working directory parent. If no\n" +"working directory is checked out, it is equivalent to null. If an\n" +"uncommitted merge is in progress, \".\" is the revision of the first\n" +"parent.\n" +msgstr "" + +msgid "" +"Mercurial allows you to customize output of commands through\n" +"templates. You can either pass in a template from the command\n" +"line, via the --template option, or select an existing\n" +"template-style (--style).\n" +"\n" +"You can customize output for any \"log-like\" command: log,\n" +"outgoing, 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.\n" +"Usage::\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +"A template is a piece of text, with markup to invoke variable\n" +"expansion::\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +"Strings in curly braces are called keywords. The availability of\n" +"keywords depends on the exact context of the templater. These\n" +"keywords are usually available for templating a log-like command:\n" +"\n" +":author: String. The unmodified author of the changeset.\n" +":branches: String. The name of the branch on which the changeset\n" +" was committed. Will be empty if the branch name was\n" +" default.\n" +":date: Date information. The date when the changeset was\n" +" committed.\n" +":desc: String. The text of the changeset description.\n" +":diffstat: String. Statistics of changes with the following\n" +" format: \"modified files: +added/-removed lines\"\n" +":files: List of strings. All files modified, added, or removed\n" +" by this changeset.\n" +":file_adds: List of strings. Files added by this changeset.\n" +":file_mods: List of strings. Files modified by this changeset.\n" +":file_dels: List of strings. Files removed by this changeset.\n" +":node: String. The changeset identification hash, as a\n" +" 40-character hexadecimal string.\n" +":parents: List of strings. The parents of the changeset.\n" +":rev: Integer. The repository-local changeset revision\n" +" number.\n" +":tags: List of strings. Any tags associated with the\n" +" changeset.\n" +":latesttag: String. Most recent global tag in the ancestors of this\n" +" changeset.\n" +":latesttagdistance: Integer. Longest path to the latest tag.\n" +"\n" +"The \"date\" keyword does not produce human-readable output. If you\n" +"want to use a date in your output, you can use a filter to process\n" +"it. Filters are functions which return a string based on the input\n" +"variable. You can also use a chain of filters to get the desired\n" +"output::\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +"List of filters:\n" +"\n" +":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" +" every line except the last.\n" +":age: Date. Returns a human-readable date/time difference\n" +" between the given date/time and the current\n" +" date/time.\n" +":basename: Any text. Treats the text as a path, and returns the\n" +" last component of the path after splitting by the\n" +" path separator (ignoring trailing separators). For\n" +" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" +" becomes \"bar\".\n" +":stripdir: Treat the text as path and strip a directory level,\n" +" if possible. For example, \"foo\" and \"foo/bar\" becomes\n" +" \"foo\".\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\n" +" email address, and extracts just the domain\n" +" component. Example: 'User <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\n" +" becomes '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" +":fill76: Any text. Wraps the text to fit in 76 columns.\n" +":firstline: Any text. Returns the first line of text.\n" +":nonempty: Any text. Returns '(none)' if the string is empty.\n" +":hgdate: Date. Returns the date as a pair of numbers:\n" +" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" +":isodate: Date. Returns the date in ISO 8601 format:\n" +" \"2009-08-18 13:00 +0200\".\n" +":isodatesec: Date. Returns the date in ISO 8601 format, including\n" +" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" +" rfc3339date filter.\n" +":localdate: Date. Converts a date to local date.\n" +":obfuscate: Any text. Returns the input text rendered as a\n" +" sequence of XML entities.\n" +":person: Any text. Returns the text before an email address.\n" +":rfc822date: Date. Returns a date using the same format used in\n" +" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" +":rfc3339date: Date. Returns a date using the Internet date format\n" +" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" +":short: Changeset hash. Returns the short form of a changeset\n" +" hash, i.e. a 12-byte hexadecimal string.\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\n" +" the first starting with a tab character.\n" +":urlescape: Any text. Escapes all \"special\" characters. For\n" +" example, \"foo bar\" becomes \"foo%20bar\".\n" +":user: Any text. Returns the user portion of an email\n" +" address.\n" +msgstr "" + +msgid "" +"Valid URLs are of the form::\n" +"\n" +" local/filesystem/path[#revision]\n" +" file://local/filesystem/path[#revision]\n" +" http://[user[:pass]@]host[:port]/[path][#revision]\n" +" https://[user[:pass]@]host[:port]/[path][#revision]\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" +"\n" +"Paths in the local filesystem can either point to Mercurial\n" +"repositories or to bundle files (as created by 'hg bundle' or 'hg\n" +"incoming --bundle').\n" +"\n" +"An optional identifier after # indicates a particular branch, tag, or\n" +"changeset to use from the remote repository. See also 'hg help\n" +"revisions'.\n" +"\n" +"Some features, such as pushing to http:// and https:// URLs are only\n" +"possible if the feature is explicitly enabled on the remote Mercurial\n" +"server.\n" +"\n" +"Some notes about using SSH with Mercurial:\n" +"\n" +"- SSH requires an accessible shell account on the destination machine\n" +" and a copy of hg in the remote path or specified with as remotecmd.\n" +"- path is relative to the remote user's home directory by default. Use\n" +" an extra slash at the start of a path to specify an absolute path::\n" +"\n" +" ssh://example.com//tmp/repository\n" +"\n" +"- Mercurial doesn't use its own compression via SSH; the right thing\n" +" to do is to configure it in your ~/.ssh/config, e.g.::\n" +"\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +"\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" +" with the --ssh command line option.\n" +"\n" +"These URLs can all be stored in your hgrc with path aliases under the\n" +"[paths] section like so::\n" +"\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +"You can then use the alias for any command that uses a URL (for\n" +"example 'hg pull alias1' would pull from the 'alias1' path).\n" +"\n" +"Two path aliases are special because they are used as defaults when\n" +"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 new repository's\n" +" 'default' path. This is then used when you omit path from push- and\n" +" pull-like commands (including incoming and outgoing).\n" +"\n" +"default-push:\n" +" The push command will look for a path named 'default-push', and\n" +" prefer it over 'default' if both are defined.\n" +msgstr "" + +msgid "" "hooks for controlling repository access\n" "\n" "This hook makes it possible to allow or deny write access to portions\n" @@ -100,38 +596,14 @@ msgstr "" #, python-format -msgid "acl: %s not enabled\n" -msgstr "acl: %s er ikke slået til\n" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "acl: %s slået til, %d optegnelser for bruger %s\n" - -#, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" msgstr "" "konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "acl: ændringer har kilde \"%s\" - springer over\n" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "acl: bruger %s nægtet adgang til %s\n" - -#, python-format msgid "acl: access denied for changeset %s" msgstr "acl: adgang nægtet til ændring %s" -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "acl: bruger %s ikke tilladt på %s\n" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "acl: tillader ændring %s\n" - msgid "" "track a line of development with movable markers\n" "\n" @@ -521,10 +993,6 @@ " bruges .hgchurn i arbejdskatalogets rod, hvis denne findes.\n" " " -#, python-format -msgid "assuming %i character terminal\n" -msgstr "antager %i-tegn terminal\n" - msgid "count rate for the specified revision or range" msgstr "lav statistik for de specificerede revisioner" @@ -598,8 +1066,8 @@ msgid "when to colorize (always, auto, or never)" msgstr "hvornår der skal farvelægges (altid, automatisk eller aldrig)" -msgid "don't colorize output" -msgstr "farvelæg ikke output" +msgid "don't colorize output (DEPRECATED)" +msgstr "farvelæg ikke output (FORÆLDET)" #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" @@ -735,23 +1203,8 @@ " converted, and that any directory reorganization in the CVS\n" " sandbox is ignored.\n" "\n" -" Because CVS does not have changesets, it is necessary to collect\n" -" individual commits to CVS and merge them into changesets. CVS\n" -" source uses its internal changeset merging code by default but can\n" -" be configured to call the external 'cvsps' program by setting::\n" -"\n" -" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" -"\n" -" This option is deprecated and will be removed in Mercurial 1.4.\n" -"\n" " The options shown are the defaults.\n" "\n" -" Internal cvsps is selected by setting ::\n" -"\n" -" --config convert.cvsps=builtin\n" -"\n" -" and has a few more configurable options:\n" -"\n" " --config convert.cvsps.cache=True (boolean)\n" " Set to False to disable remote log caching, for testing and\n" " debugging purposes.\n" @@ -771,9 +1224,10 @@ " add the most recent revision on the branch indicated in the\n" " regex as the second parent of the changeset.\n" "\n" -" The hgext/convert/cvsps wrapper script allows the builtin\n" +" An additional \"debugcvsps\" Mercurial command allows the builtin\n" " changeset merging code to be run without doing a conversion. Its\n" -" parameters and output are similar to that of cvsps 2.1.\n" +" parameters and output are similar to that of cvsps 2.1. Please see\n" +" the command help for more details.\n" "\n" " Subversion Source\n" " -----------------\n" @@ -936,10 +1390,6 @@ msgstr "kan ikke finde påkrævet værktøj \"%s\"" #, python-format -msgid "running: %s\n" -msgstr "kører: %s\n" - -#, python-format msgid "%s error:\n" msgstr "%s fejl:\n" @@ -1017,19 +1467,9 @@ msgid "--sourcesort is not supported by this data source" msgstr "--sourcesort er ikke supporteret at denne datakilde" -msgid "" -"warning: support for external cvsps is deprecated and will be removed in " -"Mercurial 1.4\n" -msgstr "" -"advarsel: support for ekstern cvsps er forældet og vil blive fjernet i " -"Mercurial 1.4\n" - -#, python-format -msgid "revision %s is not a patchset number or date" -msgstr "" - -msgid "using builtin cvsps\n" -msgstr "bruger indbygget cvsps\n" +#, python-format +msgid "revision %s is not a patchset number" +msgstr "" #, python-format msgid "connecting to %s\n" @@ -1075,10 +1515,6 @@ msgid "running %s\n" msgstr "kører %s\n" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "præfiks=%r katalog=%r rod=%r\n" - msgid "RCS file must be followed by working file" msgstr "RCS-fil skal efterfølges af en arbejdsfil" @@ -1092,10 +1528,6 @@ msgstr "revision skal efterfølges af datolinje" #, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "fandt syntetisk revision i %s: %r\n" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "skriver cvs log-mellemlager %s\n" @@ -1128,10 +1560,6 @@ msgid "Python ElementTree module is not available" msgstr "Python ElementTree modulet er ikke tilstede" -#, python-format -msgid "cleaning up %s\n" -msgstr "rydder op %s\n" - msgid "internal calling inconsistency" msgstr "intern kaldeinkonsistens" @@ -1166,22 +1594,6 @@ msgstr "" #, python-format -msgid "applying revision %s...\n" -msgstr "anvender revision %s...\n" - -#, python-format -msgid "computing changeset between %s and %s...\n" -msgstr "beregner ændringer mellem %s og %s...\n" - -#, python-format -msgid "obtaining revision %s...\n" -msgstr "henter revision %s...\n" - -#, python-format -msgid "analyzing revision %s...\n" -msgstr "analyserer revision %s...\n" - -#, python-format msgid "could not parse cat-log of %s" msgstr "kan ikke parse cat-log af %s" @@ -1193,12 +1605,6 @@ msgid "initializing destination %s repository\n" msgstr "initialiserer mål %s depot\n" -msgid "run hg sink pre-conversion action\n" -msgstr "" - -msgid "run hg sink post-conversion action\n" -msgstr "" - #, python-format msgid "pulling from %s into %s\n" msgstr "hiver fra %s ind i %s\n" @@ -1217,12 +1623,6 @@ msgid "ignoring: %s\n" msgstr "ignorerer: %s\n" -msgid "run hg source pre-conversion action\n" -msgstr "" - -msgid "run hg source post-conversion action\n" -msgstr "" - #, python-format msgid "%s does not look like a monotone repo" msgstr "%s ser ikke ud som et monotone depot" @@ -1237,6 +1637,9 @@ msgid "collecting p4 changelists\n" msgstr "samler p4 changelists\n" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "Subversion python bindingerne kunne ikke indlæses" @@ -1287,69 +1690,22 @@ msgstr "ingen mærkater fundet ved revision %d\n" #, python-format -msgid "ignoring foreign branch %r\n" -msgstr "ignorerer fremmed gren %r\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "%s blev ikke fundet op til revision %d" #, python-format -msgid "branch renamed from %s to %s at %d\n" -msgstr "gren omdøbt fra %s til %s ved %d\n" - -#, python-format -msgid "reparent to %s\n" -msgstr "" - -#, python-format -msgid "copied to %s from %s@%s\n" -msgstr "kopieret til %s fra %s@%s\n" - -#, python-format -msgid "gone from %s\n" -msgstr "væk fra %s\n" - -#, python-format -msgid "entry %s\n" -msgstr "" - -#, python-format -msgid "unknown path in revision %d: %s\n" -msgstr "ukendt sti i revision %d: %s\n" - -#, python-format -msgid "mark %s came from %s:%d\n" -msgstr "" - -#, python-format -msgid "parsing revision %d (%d changes)\n" -msgstr "parser revision %d (%d ændringer)\n" - -#, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "fandt forælder til gren %s ved %d: %s\n" -msgid "no copyfrom path, don't know what to do.\n" -msgstr "" - #, python-format msgid "fetching revision log for \"%s\" from %d to %d\n" msgstr "henter revisionslog for \"%s\" fra %d til %d\n" #, python-format -msgid "revision %d has no entries\n" -msgstr "revision %d har ikke nogen indgange\n" - -#, python-format msgid "svn: branch has no revision %s" msgstr "svn: gren har ikke nogen revision %s" #, python-format -msgid "%r is not under %r, ignoring\n" -msgstr "%r ikke under %r, ignorerer\n" - -#, python-format msgid "initializing svn repo %r\n" msgstr "initialiserer svn depot %r\n" @@ -1414,14 +1770,6 @@ msgid "cannot specify --rev and --change at the same time" msgstr "kan ikke angive --rev og --change på samme tid" -#, python-format -msgid "running %r in %s\n" -msgstr "kører %r i %s\n" - -#, python-format -msgid "file changed while diffing. Overwriting: %s (src: %s)\n" -msgstr "" - msgid "cleaning up temp directory\n" msgstr "rydder midlertidigt katalog op\n" @@ -1741,12 +2089,6 @@ msgid "email.from must be defined when sending by email" msgstr "email.from skal være defineret ved afsendelse af email" -msgid "cia: no user specified" -msgstr "cia: ingen bruger angivet" - -msgid "cia: no project specified" -msgstr "cia: intet project angivet" - msgid "" "browse the repository in a graphical way\n" "\n" @@ -1923,9 +2265,6 @@ msgid "(found dead inotify server socket; removing it)\n" msgstr "(fandt død inotify server sokkel; fjerner den)\n" -msgid "(starting inotify server)\n" -msgstr "(starter inotify server)\n" - #, python-format msgid "could not start inotify server: %s\n" msgstr "kunne ikke starte inotify server: %s\n" @@ -1934,9 +2273,6 @@ msgid "could not talk to new inotify server: %s\n" msgstr "kunne ikke snakke med ny inotify server: %s\n" -msgid "(inotify server not running)\n" -msgstr "(inotify server kører ikke)\n" - #, python-format msgid "failed to contact inotify server: %s\n" msgstr "kontakt med inotify server miskykkedes: %s\n" @@ -2214,14 +2550,6 @@ "\tkeywords expanded\n" msgstr "" -#, python-format -msgid "" -"\n" -"removing temporary repository %s\n" -msgstr "" -"\n" -"fjerner midlertidigt depot %s\n" - msgid "" "expand keywords in the working directory\n" "\n" @@ -2244,15 +2572,13 @@ " See \"hg help keyword\" on how to construct patterns both for\n" " inclusion and exclusion of files.\n" "\n" -" Use -u/--untracked to list untracked files as well.\n" -"\n" -" With -a/--all and -v/--verbose the codes used to show the status\n" +" With -A/--all and -v/--verbose the codes used to show the status\n" " of files are::\n" "\n" " K = keyword expansion candidate\n" -" k = keyword expansion candidate (untracked)\n" +" k = keyword expansion candidate (not tracked)\n" " I = ignored\n" -" i = ignored (untracked)\n" +" i = ignored (not tracked)\n" " " msgstr "" @@ -2284,8 +2610,14 @@ msgid "show files excluded from expansion" msgstr "vis filer ekskluderet fra ekspansion" -msgid "additionally show untracked files" -msgstr "vis også ikke-fulgte filer" +msgid "only show unknown (not tracked) files" +msgstr "vis kun ukendte (ikke-fulgte) filer" + +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "vis keyword status for alle filer (FORÆLDET)" + +msgid "only show untracked files (DEPRECATED)" +msgstr "vis kun ikke-fulgte filer (FORÆLDET)" msgid "hg kwfiles [OPTION]... [FILE]..." msgstr "hg kwfiles [TILVALG]... [FIL]..." @@ -2356,10 +2688,6 @@ msgstr "" #, python-format -msgid "active guards: %s\n" -msgstr "" - -#, python-format msgid "guard %r too short" msgstr "" @@ -3288,8 +3616,8 @@ msgid "queue name to pop" msgstr "" -msgid "forget any local changes" -msgstr "glem eventuelle lokale ændringer" +msgid "forget any local changes to patched files" +msgstr "glem eventuelle lokale ændringer i de rettede filer" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" msgstr "hg qpop [-a] [-n NAVN] [-f] [RETTELSE | INDEKS]" @@ -3445,6 +3773,7 @@ " sources = serve # notify if source of incoming changes in this " "list\n" " # (serve == ssh or http, push, pull, bundle)\n" +" merge = False # send notification for merges (default True)\n" " [email]\n" " from = user@host.com # email address to send as if none given\n" " [web]\n" @@ -3493,12 +3822,8 @@ msgstr "" #, python-format -msgid "notify: no subscribers to repository %s\n" -msgstr "notify: ingen abonnementer til depot %s\n" - -#, python-format -msgid "notify: changes have source \"%s\" - skipping\n" -msgstr "notify: ændringer har kilde \"%s\" - springer over\n" +msgid "notify: suppressing notification for merge %d:%s\n" +msgstr "" msgid "" "browse command output with an external pager\n" @@ -3858,9 +4183,6 @@ "http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" -msgid "first revision, do not change ancestor\n" -msgstr "" - msgid "" "move changeset (and descendants) to a different branch\n" "\n" @@ -3904,60 +4226,17 @@ msgid "%d revisions have been skipped\n" msgstr "sprang %d revisioner over\n" -msgid " set parents\n" -msgstr "" - -#, python-format -msgid "rebasing %d:%s\n" -msgstr "" - -#, python-format -msgid " future parents are %d and %d\n" -msgstr "" - -#, python-format -msgid " update to %d:%s\n" -msgstr " opdater til %d:%s\n" - -msgid " already in target\n" -msgstr "" - -#, python-format -msgid " merge against %d:%s\n" -msgstr "" - msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr "" -msgid "resuming interrupted rebase\n" -msgstr "" - #, python-format msgid "no changes, revision %d skipped\n" msgstr "" #, python-format -msgid "next revision set to %s\n" -msgstr "" - -#, python-format msgid "cannot use revision %d as base, result would have 3 parents" msgstr "" -#, python-format -msgid "revision %d is an mq patch (%s), finalize it.\n" -msgstr "" - -#, python-format -msgid "import mq patch %d (%s)\n" -msgstr "" - -msgid "rebase status stored\n" -msgstr "" - -msgid "rebase status resumed\n" -msgstr "" - msgid "no rebase in progress" msgstr "" @@ -3970,28 +4249,15 @@ msgid "cannot rebase onto an applied mq patch" msgstr "" -msgid "cannot rebase an ancestor" -msgstr "" - -msgid "cannot rebase a descendant" -msgstr "" - -msgid "already working on current\n" -msgstr "" - -msgid "already working on the current branch\n" -msgstr "" - -#, python-format -msgid "rebase onto %d starting from %d\n" -msgstr "" +msgid "source is ancestor of destination" +msgstr "kilden er forfader til destination" + +msgid "source is descendant of destination" +msgstr "kilden nedstammer fra destinationen" msgid "unable to collapse, there is more than one external parent" msgstr "" -msgid "--update and --rebase are not compatible, ignoring the update flag\n" -msgstr "" - msgid "rebase working directory to branch head" msgstr "" @@ -4004,13 +4270,13 @@ msgid "rebase onto a given revision" msgstr "" -msgid "collapse the rebased revisions" -msgstr "" - -msgid "keep original revisions" -msgstr "" - -msgid "keep original branches" +msgid "collapse the rebased changesets" +msgstr "" + +msgid "keep original changesets" +msgstr "behold de originale ændringer" + +msgid "keep original branch names" msgstr "" msgid "continue an interrupted rebase" @@ -4125,20 +4391,9 @@ msgid "no changes to record\n" msgstr "" -#, python-format -msgid "backup %r as %r\n" -msgstr "sikkerhedskopier %r som %r\n" - -msgid "applying patch\n" -msgstr "tilføjer rettelse\n" - msgid "patch failed to apply" msgstr "rettelse kunne ikke tilføjes" -#, python-format -msgid "restoring %r to %r\n" -msgstr "gendanner %r som %r\n" - msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [TILVALG]... [FIL]..." @@ -4351,10 +4606,6 @@ msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "" -#, python-format -msgid "[win32mbcs] activated with encoding: %s\n" -msgstr "" - msgid "" "perform automatic newline conversion\n" "\n" @@ -4959,10 +5210,6 @@ msgstr "inkompatible argumenter" #, python-format -msgid "cannot find executable: %s" -msgstr "kan ikke finde program: %s" - -#, python-format msgid "failed to execute %s" msgstr "kunne ikke køre %s" @@ -5816,14 +6063,6 @@ msgid "no diffs found" msgstr "fandt ingen ændringer" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" -"meddelse:\n" -"%s\n" - msgid "not a Mercurial patch" msgstr "ikke en Mercurial patch" @@ -6483,6 +6722,52 @@ " " msgid "" +"summarize working directory state\n" +"\n" +" This generates a brief summary of the working directory state,\n" +" including parents, branch, commit status, and available updates.\n" +" " +msgstr "" + +#, python-format +msgid "parent: %d:%s %s\n" +msgstr "forælder: %d:%s %s\n" + +#, python-format +msgid "branch: %s\n" +msgstr "gren: %s\n" + +msgid "modified added removed deleted unknown ignored unresolved" +msgstr "" + +msgid " (merge)" +msgstr " (sammenføj)" + +msgid " (new branch)" +msgstr " (ny gren)" + +msgid " (clean)" +msgstr " (ren)" + +msgid " (new branch head)" +msgstr "" + +#, python-format +msgid "commit: %s\n" +msgstr "deponer: %s\n" + +msgid "update: (current)\n" +msgstr "" + +#, python-format +msgid "update: %d new changesets (update)\n" +msgstr "" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "" + +msgid "" "add one or more tags for the current or given revision\n" "\n" " Name a particular revision using <name>.\n" @@ -6672,8 +6957,8 @@ "gives INGEN GARANTI; ikke engang for SALGBARHED eller EGNETHED FOR\n" "NOGET BESTEMT FORMÅL.\n" -msgid "repository root directory or symbolic path name" -msgstr "depotrodfolder eller symbolsk stinavn" +msgid "repository root directory or name of overlay bundle file" +msgstr "" msgid "change working directory" msgstr "skift arbejdskatalog" @@ -7323,36 +7608,6 @@ msgid "branch name not in UTF-8!" msgstr "grennavn er ikke i UTF-8!" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr " søger efter kopier tilbage til revision %d\n" - -#, python-format -msgid "" -" unmatched files in local:\n" -" %s\n" -msgstr "" - -#, python-format -msgid "" -" unmatched files in other:\n" -" %s\n" -msgstr "" - -msgid " all copies found (* = to merge, ! = divergent):\n" -msgstr "" - -msgid " checking for directory renames\n" -msgstr " undersøger katalogomdøbninger\n" - -#, python-format -msgid " dir %s -> %s\n" -msgstr " katalog %s -> %s\n" - -#, python-format -msgid " file %s -> %s\n" -msgstr " fil %s -> %s\n" - msgid "working directory state appears damaged!" msgstr "arbejdskatalogtilstand virker beskadiget!" @@ -7399,6 +7654,10 @@ msgstr "afbrudt: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" @@ -7407,10 +7666,6 @@ " %s\n" #, python-format -msgid "hg: %s\n" -msgstr "hg: %s\n" - -#, python-format msgid "timed out waiting for lock held by %s" msgstr "tiden løb ud ved vent på lås holdt af %s" @@ -7508,10 +7763,6 @@ msgstr "alias '%s' oversætter til tvetydig kommando '%s'\n" #, python-format -msgid "alias '%s' shadows command\n" -msgstr "alias '%s' skygger for en kommando\n" - -#, python-format msgid "malformed --config option: %s" msgstr "misdannet --config tilvalg: %s" @@ -7579,10 +7830,6 @@ msgstr "værktøj %s kræver et GUI\n" #, python-format -msgid "picked tool '%s' for %s (binary %s symlink %s)\n" -msgstr "valgte værktøj '%s' til %s (binær %s symbolsk link %s)\n" - -#, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" @@ -7603,13 +7850,6 @@ msgstr "sammenføjer %s\n" #, python-format -msgid "my %s other %s ancestor %s\n" -msgstr "min %s anden %s forfar %s\n" - -msgid " premerge successful\n" -msgstr "præ-sammenføjning succesfuld\n" - -#, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" @@ -7633,555 +7873,33 @@ msgid "unknown bisect kind %s" msgstr "" -msgid "" -"\n" -" Mercurial has the ability to add new features through the use of\n" -" extensions. Extensions may add new commands, add options to\n" -" existing commands, change the default behavior of commands, or\n" -" implement hooks.\n" -"\n" -" Extensions are not loaded by default for a variety of reasons:\n" -" they can increase startup overhead; they may be meant for advanced\n" -" usage only; they may provide potentially dangerous abilities (such\n" -" as letting you destroy or modify history); they might not be ready\n" -" for prime time; or they may alter some usual behaviors of stock\n" -" Mercurial. It is thus up to the user to activate extensions as\n" -" needed.\n" -"\n" -" To enable the \"foo\" extension, either shipped with Mercurial or in\n" -" the Python search path, create an entry for it in your hgrc, like\n" -" this::\n" -"\n" -" [extensions]\n" -" foo =\n" -"\n" -" You may also specify the full path to an extension::\n" -"\n" -" [extensions]\n" -" myfeature = ~/.hgext/myfeature.py\n" -"\n" -" To explicitly disable an extension enabled in an hgrc of broader\n" -" scope, prepend its path with !::\n" -"\n" -" [extensions]\n" -" # disabling extension bar residing in /path/to/extension/bar.py\n" -" hgext.bar = !/path/to/extension/bar.py\n" -" # ditto, but no path was supplied for extension baz\n" -" hgext.baz = !\n" -" " -msgstr "" - msgid "disabled extensions:" msgstr "deaktiverede udvidelser:" msgid "Date Formats" msgstr "Datoformater" -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\n" -"\n" -" - backout, commit, import, tag: Specify the commit date.\n" -" - log, revert, update: Select revision(s) by date.\n" -"\n" -" Many date formats are valid. Here are some examples::\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" -" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" -" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" -" \"Dec 6\" (midnight)\n" -" \"13:18\" (today assumed)\n" -" \"3:39\" (3:39AM assumed)\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" -" \"2006-12-6 13:18\"\n" -" \"2006-12-6\"\n" -" \"12-6\"\n" -" \"12/6\"\n" -" \"12/6/6\" (Dec 6 2006)\n" -"\n" -" Lastly, there is Mercurial's internal format::\n" -"\n" -" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" -"\n" -" This is the internal representation format for dates. unixtime is\n" -" the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" -" offset is the offset of the local timezone, in seconds west of UTC\n" -" (negative if the timezone is east of UTC).\n" -"\n" -" The log command also accepts date ranges::\n" -"\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 "" -"\n" -" Nogle kommandoer tillader brugeren at specificere en dato, f.eks.:\n" -"\n" -" - backout, commit, import, tag: specificer commit-datoen.\n" -" - log, revert, update: vælg revisioner efter dato.\n" -"\n" -" Der er mange gyldige datoformater. Her er nogle eksempler::\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n" -" \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n" -" \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n" -" \"Dec 6\" (midnat)\n" -" \"13:18\" (antager dags dato)\n" -" \"3:39\"\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" -" \"2006-12-6 13:18\"\n" -" \"2006-12-6\"\n" -" \"12-6\"\n" -" \"12/6\"\n" -" \"12/6/6\" (6. dec. 2006)\n" -"\n" -" Endelig er der Mercurials interne format::\n" -"\n" -" \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n" -"\n" -" Dette er den interne repræsentation af datoer. unixtime er\n" -" antallet af sekunder siden begyndelsen af epoken (1970-01-01 00:00\n" -" UTC). offset er den lokale tidszone, angivet i antal sekunder vest\n" -" for UTC (negativ hvis tidszonen er øst for UTC).\n" -"\n" -" Kommandoen log accepterer også datointervaller::\n" -"\n" -" \"<{date}\" - på eller før den angivne dato/tidspunkt\n" -" \">{date}\" - på eller efter den angivne dato/tidspunkt\n" -" \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n" -" \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n" -" " - msgid "File Name Patterns" msgstr "Mønstre for filnavne" -msgid "" -"\n" -" Mercurial accepts several notations for identifying one or more\n" -" files at a time.\n" -"\n" -" By default, Mercurial treats filenames as shell-style extended\n" -" glob patterns.\n" -"\n" -" Alternate pattern notations must be specified explicitly.\n" -"\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\n" -" only match files in the current directory ending with \".c\".\n" -"\n" -" The supported glob syntax extensions are \"``**``\" to match any\n" -" string 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" -"\n" -" Plain examples::\n" -"\n" -" path:foo/bar a name bar in a directory named foo in the root\n" -" of the repository\n" -" path:path:name a file or directory named \"path:name\"\n" -"\n" -" Glob examples::\n" -"\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 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 any subdirectory of foo\n" -" including itself.\n" -"\n" -" Regexp examples::\n" -"\n" -" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" -"\n" -" " -msgstr "" - msgid "Environment Variables" msgstr "Miljøvariable" -msgid "" -"\n" -"HG\n" -" Path to the 'hg' executable, automatically passed when running\n" -" hooks, extensions or external tools. If unset or empty, this is\n" -" the hg executable's name if it's frozen, or an executable named\n" -" 'hg' (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 run when committing. See EDITOR.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" -"HGENCODING\n" -" This overrides the default locale setting detected by Mercurial.\n" -" This setting is used to convert data including usernames,\n" -" changeset descriptions, tag names, and branches. This setting can\n" -" be overridden with the --encoding command-line option.\n" -"\n" -"HGENCODINGMODE\n" -" This sets Mercurial's behavior for handling unknown characters\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" -"\n" -"HGMERGE\n" -" An executable to use for resolving merge conflicts. The program\n" -" will be executed with three arguments: local file, remote file,\n" -" ancestor file.\n" -"\n" -" (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 the .hg/hgrc\n" -" from the current repository is read.\n" -"\n" -" For each element in HGRCPATH:\n" -"\n" -" - if it's a directory, all files ending with .rc are added\n" -" - otherwise, the file itself will be added\n" -"\n" -"HGUSER\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" -" May be used as the author of a commit; see HGUSER.\n" -"\n" -"LOGNAME\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" -"\n" -"EDITOR\n" -" Sometimes Mercurial needs to open a text file in an editor for a\n" -" user to modify, for example when writing commit messages. The\n" -" editor it uses is determined by looking at the environment\n" -" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" -" non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'.\n" -"\n" -"PYTHONPATH\n" -" This is used by Python to find imported modules and may need to be\n" -" set appropriately if this Mercurial is not installed system-wide.\n" -" " -msgstr "" - msgid "Specifying Single Revisions" msgstr "Angivning af en enkelt revision" -msgid "" -"\n" -" Mercurial supports several ways to specify individual revisions.\n" -"\n" -" A plain integer is treated as a revision number. Negative integers\n" -" are treated as sequential offsets from the tip, with -1 denoting\n" -" the tip, -2 denoting the revision prior to the tip, and so forth.\n" -"\n" -" A 40-digit hexadecimal string is treated as a unique revision\n" -" identifier.\n" -"\n" -" A hexadecimal string less than 40 characters long is treated as a\n" -" unique revision identifier and is referred to as a short-form\n" -" identifier. A short-form identifier is only valid if it is the\n" -" prefix of exactly one full-length identifier.\n" -"\n" -" Any other string is treated as a tag or branch name. A tag name is\n" -" a symbolic name associated with a revision identifier. A branch\n" -" name denotes the tipmost revision of that branch. Tag and branch\n" -" names must not contain the \":\" character.\n" -"\n" -" The reserved name \"tip\" is a special tag that always identifies\n" -" the most recent revision.\n" -"\n" -" The reserved name \"null\" indicates the null revision. This is the\n" -" revision of an empty repository, and the parent of revision 0.\n" -"\n" -" The reserved name \".\" indicates the working directory parent. If\n" -" no working directory is checked out, it is equivalent to null. If\n" -" an uncommitted merge is in progress, \".\" is the revision of the\n" -" first parent.\n" -" " -msgstr "" - msgid "Specifying Multiple Revisions" msgstr "Angivning af flere revisioner" -msgid "" -"\n" -" When Mercurial accepts more than one revision, they may be\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" -" BEGIN is not specified, it defaults to revision number 0. If END\n" -" is not specified, it defaults to the tip. The range \":\" thus means\n" -" \"all revisions\".\n" -"\n" -" If BEGIN is greater than END, revisions are treated in reverse\n" -" 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 9:6 gives 9, 8, 7, and 6.\n" -" " -msgstr "" - msgid "Diff Formats" msgstr "" -msgid "" -"\n" -" Mercurial's default format for showing changes between two\n" -" versions of a file is compatible with the unified format of GNU\n" -" diff, which can be used by GNU patch and many other standard\n" -" tools.\n" -"\n" -" While this standard format is often enough, it does not encode the\n" -" following information:\n" -"\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 a few widespread tools still do not\n" -" understand this format.\n" -"\n" -" This means that when generating diffs from a Mercurial repository\n" -" (e.g. with \"hg export\"), you should be careful about things like\n" -" file copies and renames or other things mentioned above, because\n" -" when applying a standard diff to a different repository, this\n" -" extra information is lost. Mercurial's internal operations (like\n" -" push and pull) are not affected by this, because they use an\n" -" internal binary format for communicating changes.\n" -"\n" -" To make Mercurial produce the git extended diff format, use the\n" -" --git option available for many commands, or set 'git = True' in\n" -" the [diff] section of your hgrc. You do not need to set this\n" -" option when importing diffs in this format or using them in the mq\n" -" extension.\n" -" " -msgstr "" - msgid "Template Usage" msgstr "Brug af skabeloner" -msgid "" -"\n" -" Mercurial allows you to customize output of commands through\n" -" templates. You can either pass in a template from the command\n" -" line, via the --template option, or select an existing\n" -" template-style (--style).\n" -"\n" -" You can customize output for any \"log-like\" command: log,\n" -" outgoing, 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.\n" -" Usage::\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" -" A template is a piece of text, with markup to invoke variable\n" -" expansion::\n" -"\n" -" $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" -" Strings in curly braces are called keywords. The availability of\n" -" keywords depends on the exact context of the templater. These\n" -" keywords are usually available for templating a log-like command:\n" -"\n" -" :author: String. The unmodified author of the changeset.\n" -" :branches: String. The name of the branch on which the changeset\n" -" was committed. Will be empty if the branch name was\n" -" default.\n" -" :date: Date information. The date when the changeset was\n" -" committed.\n" -" :desc: String. The text of the changeset description.\n" -" :diffstat: String. Statistics of changes with the following\n" -" format: \"modified files: +added/-removed lines\"\n" -" :files: List of strings. All files modified, added, or removed\n" -" by this changeset.\n" -" :file_adds: List of strings. Files added by this changeset.\n" -" :file_mods: List of strings. Files modified by this changeset.\n" -" :file_dels: List of strings. Files removed by this changeset.\n" -" :node: String. The changeset identification hash, as a\n" -" 40-character hexadecimal string.\n" -" :parents: List of strings. The parents of the changeset.\n" -" :rev: Integer. The repository-local changeset revision\n" -" number.\n" -" :tags: List of strings. Any tags associated with the\n" -" changeset.\n" -"\n" -" The \"date\" keyword does not produce human-readable output. If you\n" -" want to use a date in your output, you can use a filter to process\n" -" it. Filters are functions which return a string based on the input\n" -" variable. You can also use a chain of filters to get the desired\n" -" output::\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -" List of filters:\n" -"\n" -" :addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" -" every line except the last.\n" -" :age: Date. Returns a human-readable date/time difference\n" -" between the given date/time and the current\n" -" date/time.\n" -" :basename: Any text. Treats the text as a path, and returns the\n" -" last component of the path after splitting by the\n" -" path separator (ignoring trailing separators). For\n" -" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//" -"\"\n" -" becomes \"bar\".\n" -" :stripdir: Treat the text as path and strip a directory level,\n" -" if possible. For example, \"foo\" and \"foo/bar\" becomes\n" -" \"foo\".\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\n" -" email address, and extracts just the domain\n" -" component. Example: 'User <user@example.com>' becomes\n" -" 'example.com'.\n" -" :email: Any text. Extracts the first string that looks like\n" -" an email address. Example: 'User <user@example.com>'\n" -" becomes '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" -" :fill76: Any text. Wraps the text to fit in 76 columns.\n" -" :firstline: Any text. Returns the first line of text.\n" -" :nonempty: Any text. Returns '(none)' if the string is empty.\n" -" :hgdate: Date. Returns the date as a pair of numbers:\n" -" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" -" :isodate: Date. Returns the date in ISO 8601 format:\n" -" \"2009-08-18 13:00 +0200\".\n" -" :isodatesec: Date. Returns the date in ISO 8601 format, including\n" -" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" -" rfc3339date filter.\n" -" :localdate: Date. Converts a date to local date.\n" -" :obfuscate: Any text. Returns the input text rendered as a\n" -" sequence of XML entities.\n" -" :person: Any text. Returns the text before an email address.\n" -" :rfc822date: Date. Returns a date using the same format used in\n" -" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" -" :rfc3339date: Date. Returns a date using the Internet date format\n" -" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" -" :short: Changeset hash. Returns the short form of a changeset\n" -" hash, i.e. a 12-byte hexadecimal string.\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\n" -" the first starting with a tab character.\n" -" :urlescape: Any text. Escapes all \"special\" characters. For\n" -" example, \"foo bar\" becomes \"foo%20bar\".\n" -" :user: Any text. Returns the user portion of an email\n" -" address.\n" -" " -msgstr "" - msgid "URL Paths" msgstr "URL-stier" -msgid "" -"\n" -" Valid URLs are of the form::\n" -"\n" -" local/filesystem/path[#revision]\n" -" file://local/filesystem/path[#revision]\n" -" http://[user[:pass]@]host[:port]/[path][#revision]\n" -" https://[user[:pass]@]host[:port]/[path][#revision]\n" -" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" -"\n" -" Paths in the local filesystem can either point to Mercurial\n" -" repositories or to bundle files (as created by 'hg bundle' or 'hg\n" -" incoming --bundle').\n" -"\n" -" An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository. See also 'hg help\n" -" revisions'.\n" -"\n" -" Some features, such as pushing to http:// and https:// URLs are\n" -" only possible if the feature is explicitly enabled on the remote\n" -" Mercurial server.\n" -"\n" -" Some notes about using SSH with Mercurial:\n" -"\n" -" - SSH requires an accessible shell account on the destination\n" -" machine and a copy of hg in the remote path or specified with as\n" -" remotecmd.\n" -" - path is relative to the remote user's home directory by default.\n" -" Use an extra slash at the start of a path to specify an absolute\n" -" path::\n" -"\n" -" ssh://example.com//tmp/repository\n" -"\n" -" - Mercurial doesn't use its own compression via SSH; the right\n" -" thing to do is to configure it in your ~/.ssh/config, e.g.::\n" -"\n" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\n" -"\n" -" Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" -" or with the --ssh command line option.\n" -"\n" -" These URLs can all be stored in your hgrc with path aliases under\n" -" the [paths] section like so::\n" -"\n" -" [paths]\n" -" alias1 = URL1\n" -" alias2 = URL2\n" -" ...\n" -"\n" -" You can then use the alias for any command that uses a URL (for\n" -" example 'hg pull alias1' would pull from the 'alias1' path).\n" -"\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\n" -" saves the location of the source repository as the new\n" -" repository's 'default' path. This is then used when you omit\n" -" path from push- and pull-like commands (including incoming and\n" -" outgoing).\n" -"\n" -" default-push:\n" -" The push command will look for a path named 'default-push', and\n" -" prefer it over 'default' if both are defined.\n" -" " -msgstr "" - msgid "Using additional features" msgstr "Brug af yderligere funktioner" @@ -8214,31 +7932,20 @@ msgid "clone from remote to remote not supported" msgstr "kloning fra fjerndepot til fjerndepot er ikke understøttet" -msgid "updated" -msgstr "opdateret" - -msgid "merged" -msgstr "sammenføjet" - -msgid "removed" -msgstr "fjernet" - -msgid "unresolved" -msgstr "uløst" - -#, python-format -msgid "%d files %s" -msgstr "%d filer %s" +#, python-format +msgid "" +"%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgstr "" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "brug 'hg resolve' for at prøve at sammenføje uløste filer igen\n" msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " "abandon\n" msgstr "" -"brug 'hg resolve' for at prøve at sammenføje uløste filer igen eller 'hg up " -"--clean' for at opgive\n" +"brug 'hg resolve' for at prøve at sammenføje uløste filer igen eller 'hg up -" +"C' for at opgive\n" msgid "(branch merge, don't forget to commit)\n" msgstr "(grensammenføjning, glem ikke at deponere)\n" @@ -8312,32 +8019,12 @@ msgid "unsupported URL component: \"%s\"" msgstr "ikke-understøttet URL-komponent: \"%s\"" -#, python-format -msgid "using %s\n" -msgstr "bruger %s\n" - -#, python-format -msgid "capabilities: %s\n" -msgstr "kapaciteter: %s\n" - msgid "operation not supported over http" msgstr "operationen understøttes ikke over http" -#, python-format -msgid "sending %s command\n" -msgstr "sender %s kommando\n" - -#, python-format -msgid "sending %s bytes\n" -msgstr "sender %s bytes\n" - msgid "authorization failed" msgstr "autorisation fejlede" -#, python-format -msgid "http error while sending %s command\n" -msgstr "http-fejl mens %s kommandoen blev sendt\n" - msgid "http error, possibly caused by proxy setting" msgstr "http-fejl, skyldes muligvis proxy-indstillinger" @@ -8346,10 +8033,6 @@ msgstr "den rigtige URL er %s\n" #, python-format -msgid "requested URL: '%s'\n" -msgstr "forespurgt URL: '%s'\n" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "'%s' ser ikke ud til at være et hg depot" @@ -8422,10 +8105,6 @@ msgid "unknown revision '%s'" msgstr "ukendt revision '%s'" -#, python-format -msgid "filtering %s through %s\n" -msgstr "filtrerer %s gennem %s\n" - msgid "journal already exists - run hg recover" msgstr "journalen eksisterer allerede -- kør hg recover" @@ -8458,14 +8137,6 @@ msgid "working directory of %s" msgstr "arbejdskatalog for %s" -#, python-format -msgid " %s: searching for copy revision for %s\n" -msgstr "" - -#, python-format -msgid " %s: copy %s:%s\n" -msgstr "" - msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" @@ -8531,41 +8202,6 @@ msgid "searching for changes\n" msgstr "leder efter ændringer\n" -#, python-format -msgid "examining %s:%s\n" -msgstr "undersøger %s:%s\n" - -msgid "branch already found\n" -msgstr "gren er allerede fundet\n" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "fandt ukomplet gren %s:%s\n" - -#, python-format -msgid "found new changeset %s\n" -msgstr "fandt ny ændring %s\n" - -#, python-format -msgid "request %d: %s\n" -msgstr "forespørgsel %d: %s\n" - -#, python-format -msgid "received %s:%s\n" -msgstr "modtog %s:%s\n" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "indskrænker %d:%d %s\n" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "fandt ny forgreningsændring %s\n" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "indskrænker forgreningssøgning til %s:%s\n" - msgid "already have changeset " msgstr "har allerede ændringen " @@ -8575,16 +8211,6 @@ msgid "repository is unrelated" msgstr "depotet er urelateret" -msgid "found new changesets starting at " -msgstr "fandt nye ændringer startende ved " - -#, python-format -msgid "%d total queries\n" -msgstr "%d forespørgsler i alt\n" - -msgid "common changesets up to " -msgstr "fælles ændringer op til " - msgid "requesting all changes\n" msgstr "anmoder om alle ændringer\n" @@ -8610,17 +8236,10 @@ msgid "%d changesets found\n" msgstr "fandt %d ændringer\n" -msgid "list of changesets:\n" -msgstr "liste af ændringer:\n" - #, python-format msgid "empty or missing revlog for %s" msgstr "tom eller manglende revlog for %s" -#, python-format -msgid "add changeset %s\n" -msgstr "tilføj ændring %s\n" - msgid "adding changesets\n" msgstr "tilføjer ændringer\n" @@ -8633,10 +8252,6 @@ msgid "adding file changes\n" msgstr "tilføjer filændringer\n" -#, python-format -msgid "adding %s revisions\n" -msgstr "tilføjer %s ændringer\n" - msgid "received file revlog group is empty" msgstr "" @@ -8648,9 +8263,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "tilføjede %d ændringer med %d ændringer i %d filer%s\n" -msgid "updating the branch cache\n" -msgstr "" - msgid "Unexpected response from remote server:" msgstr "Uventet svar fra fjernserver:" @@ -8671,10 +8283,6 @@ msgstr "%d filer at overføre, %s data\n" #, python-format -msgid "adding %s (%s)\n" -msgstr "tilføjer %s (%s)\n" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "overførte %s i %.1f sekunder (%s/sek)\n" @@ -8755,14 +8363,6 @@ msgstr "løser manifester\n" #, python-format -msgid " overwrite %s partial %s\n" -msgstr "" - -#, python-format -msgid " ancestor %s local %s remote %s\n" -msgstr "" - -#, python-format msgid "" " local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" @@ -8784,10 +8384,6 @@ msgstr "" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "bevarer %s til løsning af %s\n" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "opdatering kunne ikke fjerne %s: %s!\n" @@ -8838,13 +8434,6 @@ msgstr "kan ikke oprette %s: ikke i stand til at oprette biblioteket" #, python-format -msgid "found patch at byte %d\n" -msgstr "" - -msgid "patch generated by hg export\n" -msgstr "rettelse genereret af hg export\n" - -#, python-format msgid "unable to find '%s' for patching\n" msgstr "kan ikke finde '%s' til retning\n" @@ -8915,10 +8504,6 @@ msgstr "Linieendelse %s understøttes ikke" #, python-format -msgid "no valid hunks found; trying with %r instead\n" -msgstr "" - -#, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "%d filer ændret, %d indsættelser(+), %d sletninger(-)\n" @@ -8931,13 +8516,6 @@ msgstr "dræbt af signal %d" #, python-format -msgid "stopped by signal %d" -msgstr "stoppet af signal %d" - -msgid "invalid exit code" -msgstr "ugyldig returkode" - -#, python-format msgid "saving bundle to %s\n" msgstr "gemmer bundt i %s\n" @@ -9008,12 +8586,12 @@ msgid "could not create remote repo" msgstr "kunne ikke oprette fjerndepot" +msgid "no suitable response from remote hg" +msgstr "intet brugbart svar fra fjernsystemets hg" + msgid "remote: " msgstr "fjernsystem: " -msgid "no suitable response from remote hg" -msgstr "intet brugbart svar fra fjernsystemets hg" - #, python-format msgid "push refused: %s" msgstr "skub afvist: %s" @@ -9031,17 +8609,6 @@ msgid "invalid entry in fncache, line %s" msgstr "" -msgid "scanning\n" -msgstr "skanner\n" - -#, python-format -msgid "%d files, %d bytes to transfer\n" -msgstr "%d filer, skal overføre %d byte\n" - -#, python-format -msgid "sending %s (%d bytes)\n" -msgstr "sender %s (%d byte)\n" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -9185,10 +8752,6 @@ msgstr "http godkendelse: bruger %s, kodeord %s\n" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "" - -#, python-format msgid "command '%s' failed: %s" msgstr "kommandoen '%s' fejlede: %s" @@ -9386,6 +8949,10 @@ msgstr "udpakker %s" #, python-format +msgid "warning: copy source of '%s' not in parents of %s" +msgstr "" + +#, python-format msgid "empty or missing copy source revlog %s:%s" msgstr ""