Mercurial > hg
changeset 9845:22dae78227f5
i18n-sv: synchronized with a40ec11795c3
| author | Jens Bäckman <jens.backman@gmail.com> |
|---|---|
| date | Tue, 10 Nov 2009 20:07:32 +0100 |
| parents | 02f8b5230de7 |
| children | b9ac91e7e6ac |
| files | i18n/sv.po |
| diffstat | 1 files changed, 304 insertions(+), 119 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/sv.po Mon Nov 09 19:46:08 2009 -0200 +++ b/i18n/sv.po Tue Nov 10 20:07:32 2009 +0100 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-10-25 12:38+0100\n" -"PO-Revision-Date: 2009-11-04 22:12+0100\n" +"POT-Creation-Date: 2009-11-10 20:01+0100\n" +"PO-Revision-Date: 2009-11-10 20:06+0100\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -25,11 +25,11 @@ msgid " (default: %s)" msgstr " (standard: %s)" -msgid "OPTIONS" -msgstr "FLAGGOR" - -msgid "COMMANDS" -msgstr "KOMMANDON" +msgid "Options" +msgstr "Flaggor" + +msgid "Commands" +msgstr "Kommandon" msgid "" " options:\n" @@ -47,6 +47,46 @@ "\n" msgid "" +"Mercurial reads configuration data from several files, if they exist.\n" +"Below we list the most specific file first.\n" +"\n" +"On Windows, these configuration files are read:\n" +"\n" +"- ``<repo>\\.hg\\hgrc``\n" +"- ``%USERPROFILE%\\.hgrc``\n" +"- ``%USERPROFILE%\\Mercurial.ini``\n" +"- ``%HOME%\\.hgrc``\n" +"- ``%HOME%\\Mercurial.ini``\n" +"- ``C:\\Mercurial\\Mercurial.ini``\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" +"- ``<install-dir>\\Mercurial.ini``\n" +"\n" +"On Unix, these files are read:\n" +"\n" +"- ``<repo>/.hg/hgrc``\n" +"- ``$HOME/.hgrc``\n" +"- ``/etc/mercurial/hgrc``\n" +"- ``/etc/mercurial/hgrc.d/*.rc``\n" +"- ``<install-root>/etc/mercurial/hgrc``\n" +"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``\n" +"\n" +"The configuration files for Mercurial use a simple ini-file format. A\n" +"configuration file consists of sections, led by a ``[section]`` header\n" +"and followed by ``name = value`` entries::\n" +"\n" +" [ui]\n" +" username = Firstname Lastname <firstname.lastname@example.net>\n" +" verbose = True\n" +"\n" +"This above entries will be referred to as ``ui.username`` and\n" +"``ui.verbose``, respectively. Please see the hgrc man page for a full\n" +"description of the possible configuration values:\n" +"\n" +"- on Unix-like systems: ``man hgrc``\n" +"- online: http://www.selenic.com/mercurial/hgrc.5.html\n" +msgstr "" + +msgid "" "Some commands allow the user to specify a date, e.g.:\n" "\n" "- backout, commit, import, tag: Specify the commit date.\n" @@ -170,7 +210,7 @@ " - hgrc files from the HGRCPATH\n" " - EMAIL\n" " - interactive prompt\n" -" - LOGNAME (with '@hostname' appended)\n" +" - LOGNAME (with ``@hostname`` appended)\n" "\n" " (deprecated, use .hgrc)\n" "\n" @@ -402,11 +442,11 @@ " 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" +" 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" +" 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" @@ -490,7 +530,7 @@ " ...\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" +"example 'hg pull alias1' will be treated as 'hg pull URL1').\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" @@ -927,6 +967,9 @@ msgid "sort by key (default: sort by count)" msgstr "" +msgid "display added/removed lines separately" +msgstr "visa tillagda/raderade rader separat" + msgid "file with email aliases" msgstr "" @@ -1080,7 +1123,10 @@ " revision control system whose parents should be modified (same\n" " format as a key in .hg/shamap). The values are the revision IDs\n" " (in either the source or destination revision control system) that\n" -" should be used as the new parents for that node.\n" +" should be used as the new parents for that node. For example, if\n" +" you have merged \"release-1.0\" into \"trunk\", then you should\n" +" specify the revision on \"trunk\" as the first parent and the one on\n" +" the \"release-1.0\" branch as the second.\n" "\n" " The branchmap is a file that allows you to rename a branch when it is\n" " being brought in from whatever external repository. When used in\n" @@ -3714,17 +3760,17 @@ msgstr "" #, python-format -msgid "%sPlease enter a valid value" -msgstr "" +msgid "%s Please enter a valid value" +msgstr "%s Ange ett giltigt värde" msgid "Please enter a valid value.\n" -msgstr "" - -msgid "does the diffstat above look okay? " -msgstr "" +msgstr "Ange ett giltigt värde.\n" + +msgid "does the diffstat above look okay?" +msgstr "ser diffstaten ovanför okej ut?" msgid "diffstat rejected" -msgstr "" +msgstr "diffstat avvisad" msgid "" "send changesets by email\n" @@ -4170,6 +4216,73 @@ msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "" +msgid "recreates hardlinks between repository clones" +msgstr "" + +msgid "" +"recreate hardlinks between two repositories\n" +"\n" +" When repositories are cloned locally, their data files will be " +"hardlinked\n" +" so that they only use the space of a single repository.\n" +"\n" +" Unfortunately, subsequent pulls into either repository will break " +"hardlinks\n" +" for any files touched by the new changesets, even if both repositories " +"end\n" +" up pulling the same changes.\n" +"\n" +" Similarly, passing --rev to \"hg clone\" will fail to use\n" +" any hardlinks, falling back to a complete copy of the source " +"repository.\n" +"\n" +" This command lets you recreate those hardlinks and reclaim that wasted\n" +" space.\n" +"\n" +" This repository will be relinked to share space with ORIGIN, which must " +"be\n" +" on the same local disk. If ORIGIN is omitted, looks for \"default-relink" +"\",\n" +" then \"default\", in [paths].\n" +"\n" +" Do not attempt any read operations on this repository while the command " +"is\n" +" running. (Both repositories will be locked against writes.)\n" +" " +msgstr "" + +#, python-format +msgid "relinking %s to %s\n" +msgstr "" + +#, python-format +msgid "collected %d candidate storage files\n" +msgstr "" + +msgid "source and destination are on different devices" +msgstr "" + +#, python-format +msgid "not linkable: %s\n" +msgstr "inte länkbar: %s\n" + +#, python-format +msgid "pruned down to %d probably relinkable files\n" +msgstr "" + +msgid " files" +msgstr "" + +msgid "relink" +msgstr "" + +#, python-format +msgid "relinked %d files (%d bytes reclaimed)\n" +msgstr "" + +msgid "[ORIGIN]" +msgstr "" + msgid "share a common history between several working directories" msgstr "" @@ -4668,10 +4781,6 @@ msgid "cannot follow nonexistent file: \"%s\"" msgstr "" -#, python-format -msgid "%s:%s copy source revision cannot be found!\n" -msgstr "" - msgid "can only follow copies/renames for explicit filenames" msgstr "" @@ -5056,22 +5165,36 @@ " The location of the source is added to the new repository's\n" " .hg/hgrc file, as the default to be used for future pulls.\n" "\n" -" If you use the -r/--rev option to clone up to a specific revision,\n" -" no subsequent revisions (including subsequent tags) will be\n" -" present in the cloned repository. This option implies --pull, even\n" -" on local repositories.\n" -"\n" -" By default, clone will check out the head of the 'default' branch.\n" -" If the -U/--noupdate option is used, the new clone will contain\n" -" only a repository (.hg) and no working copy (the working copy\n" -" parent is the null revision).\n" -"\n" " See 'hg help urls' for valid source format details.\n" "\n" " It is possible to specify an ssh:// URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" " Please see 'hg help urls' for important details about ssh:// URLs.\n" "\n" +" If the -U/--noupdate option is specified, the new clone will contain\n" +" only a repository (.hg) and no working copy (the working copy parent\n" +" will be the null changeset). Otherwise, clone will initially check\n" +" out (in order of precedence):\n" +"\n" +" a) the changeset, tag or branch specified with -u/--updaterev\n" +" b) the changeset, tag or branch given with the first -r/--rev\n" +" c) the head of the default branch\n" +"\n" +" Use 'hg clone -u . src dst' to checkout the source repository's\n" +" parent changeset (applicable for local source repositories only).\n" +"\n" +" A set of changesets (tags, or branch names) to pull may be specified\n" +" by listing each changeset (tag, or branch name) with -r/--rev.\n" +" If -r/--rev is used, the cloned repository will contain only a subset\n" +" of the changesets of the source repository. Only the set of changesets\n" +" defined by all -r/--rev options (including their direct and indirect\n" +" parent changesets) will be pulled into the destination repository.\n" +" No subsequent changesets (including subsequent tags) will be present\n" +" in the destination.\n" +"\n" +" Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" +" local source repositories.\n" +"\n" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" " to the repository data, not to the checked out files). Some\n" @@ -5102,18 +5225,35 @@ " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" " som standardplats att användas för framtida dragningar.\n" "\n" -" Om du använder flaggan -r/--rev för att klona fram till en specifik\n" -" revision, kommer inga efterföljande revisioner (inklusive efterföljande\n" -" märken) att finnas i det klonade arkivet. Denna flagga använder\n" -" automatiskt --pull, även för lokala arkiv.\n" -"\n" -" Som standard kommer clone att hämta ut toppen i grenen 'default'. Om\n" -" flaggan -U/--noupdate används, kommer den nya klonen bara att innehålla\n" -" ett arkiv (.hg) och igen arbetskopia (arbetskopians förälder är\n" -" null-revisionen.\n" -"\n" " Se 'hg help urls' för detaljer om giltiga källformat.\n" "\n" +" Det är möjligt att specificera en ssh://-URL som destination, men ingen\n" +" .hg/hgrc och arbetskatalog skapas på fjärrsidan. Se 'hg help urls' för\n" +" viktiga detaljer om ssh://-URLer.\n" +"\n" +" Om alternativet -U/--noupdate är angivet, kommer den nya klonen bara\n" +" att innehålla ett arkiv (.hg) och ingen arbetskopia (arbetskopians\n" +" förälder kommer att vara null-ändringen). Annars kommer klonen initialt\n" +" att hämta ut (i prioritetsordning):\n" +"\n" +" a) ändringen, taggen eller grenen specificerad med -u/--updaterev\n" +" b) ändringen, taggen eller grenen given med den första -r/--rev\n" +" c) huvudet på grenen 'default'\n" +"\n" +" Använd 'hg clone -u . källa dst' för att hämta ut källkodsarkivets\n" +" föräldraänrding (gäller bara för lokala arkiv).\n" +"\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" +" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" +" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" +" -r/--rev (inklusive direkta och indirekta föräldrar) kommer att dras in\n" +" i destinationsarkivet. Inga efterföljande ändringar (inklusive\n" +" efterföljande märken) kommer att finnas i destinationen.\n" +"\n" +" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" +" --pull, även för lokala arkiv.\n" +"\n" " Av effektivitestskäl används hårda länkar när källan och destinationen\n" " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" " inte de uthämtade filerna). Vissa filsystem såsom AFS implementerar\n" @@ -5133,6 +5273,9 @@ " under katalogen .hg, som mq.\n" " " +msgid "cannot specify both --noupdate and --updaterev" +msgstr "kan inte ange både --noupdate och --updaterev" + msgid "" "commit the specified files or all outstanding changes\n" "\n" @@ -5670,6 +5813,9 @@ "grundläggande kommandon:\n" "\n" +msgid "DEPRECATED" +msgstr "FÖRLEGAD" + msgid "" "\n" "additional help topics:\n" @@ -5698,7 +5844,8 @@ msgid "" "import an ordered set of patches\n" "\n" -" Import a list of patches and commit them individually.\n" +" Import a list of patches and commit them individually (unless\n" +" --no-commit is specified).\n" "\n" " If there are outstanding changes in the working directory, import\n" " will abort unless given the -f/--force flag.\n" @@ -6163,14 +6310,16 @@ msgid "" "retry file merges from a merge or update\n" "\n" -" This command will cleanly retry unresolved file merges using file\n" -" revisions preserved from the last update or merge. To attempt to\n" -" resolve all unresolved files, use the -a/--all switch.\n" +" This command can cleanly retry unresolved file merges using file\n" +" revisions preserved from the last update or merge.\n" "\n" " If a conflict is resolved manually, please note that the changes\n" " will be overwritten if the merge is retried with resolve. The\n" " -m/--mark switch should be used to mark the file as resolved.\n" "\n" +" You can specify a set of files to operate on, or use the -a/-all\n" +" switch to select all unresolved files.\n" +"\n" " This command also allows listing resolved files and manually\n" " indicating whether or not files are resolved. All files must be\n" " marked as resolved before a commit is permitted.\n" @@ -6562,58 +6711,68 @@ "update working directory\n" "\n" " Update the repository's working directory to the specified\n" -" revision, or the tip of the current branch if none is specified.\n" -" Use null as the revision to remove the working copy (like 'hg\n" +" changeset.\n" +"\n" +" If no changeset is specified, attempt to update to the head of the\n" +" current branch. If this head is a descendant of the working\n" +" directory's parent, update to it, otherwise abort.\n" +"\n" +" The following rules apply when the working directory contains\n" +" uncommitted changes:\n" +"\n" +" 1. If neither -c/--check nor -C/--clean is specified, uncommitted\n" +" changes are merged into the requested changeset, and the merged " +"result\n" +" is left uncommitted. Updating and merging will occur only if the\n" +" requested changeset is an ancestor or descendant of the parent\n" +" changeset. Otherwise, the update is aborted and the uncommitted " +"changes\n" +" are preserved.\n" +"\n" +" 2. With the -c/--check option, the update is aborted and the\n" +" uncommitted changes are preserved.\n" +"\n" +" 3. With the -C/--clean option, uncommitted changes are discarded and\n" +" the working directory is updated to the requested changeset.\n" +"\n" +" Use null as the changeset to remove the working directory (like 'hg\n" " clone -U').\n" "\n" -" When the working directory contains no uncommitted changes, it\n" -" will be replaced by the state of the requested revision from the\n" -" repository. When the requested revision is on a different branch,\n" -" the working directory will additionally be switched to that\n" -" branch.\n" -"\n" -" When there are uncommitted changes, use option -C/--clean to\n" -" discard them, forcibly replacing the state of the working\n" -" directory with the requested revision. Alternately, use -c/--check\n" -" to abort.\n" -"\n" -" When there are uncommitted changes and option -C/--clean is not\n" -" used, and the parent revision and requested revision are on the\n" -" same branch, and one of them is an ancestor of the other, then the\n" -" new working directory will contain the requested revision merged\n" -" with the uncommitted changes. Otherwise, the update will fail with\n" -" a suggestion to use 'merge' or 'update -C' instead.\n" -"\n" -" If you want to update just one file to an older revision, use\n" -" revert.\n" +" If you want to update just one file to an older changeset, use 'hg " +"revert'.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" -"uppdatera arbetskatalog\n" -"\n" -" Uppdatera arkivets arbetskatalog till den specificerade revisionen\n" -" eller toppen av den nuvarande grenen om ingen anges. Använd null som\n" -" revision för att ta bort arbetskopian (som 'hg clone -U').\n" -"\n" -" När arbetskatalogen inte innehåller oarkiverade ändringar, ersätts\n" -" den med tillståndet för den begärda revisionen från arkivet. När den\n" -" begärda revisionen är i en annan gren, kommer arbetskatalogen att växla\n" -" till den grenen.\n" -"\n" -" När det finns oarkiverade ändringar, använd flaggan -C/--clean för att\n" -" kassera dem, och tvinga tillståndet i arbetskatalogen till den begärda\n" -" revisionen. Alternativt, använd -c/--check för att avbryta.\n" -"\n" -" När det finns oarkiverade ändringar och flaggan -C/--clean inte " -"används,\n" -" och föräldrarevisionen och den begärda revisionen är på samma gren, och\n" -" en av dem är en anfäder till den andre, kommer arbetskatalogen att\n" -" innehålla den begärda revisionen sammanfogad med de oarkiverade\n" -" ändringarna. Om inte, kommer uppdateringen att misslyckas med ett\n" -" förslag att använda 'merge' eller 'update -C' istället.\n" -"\n" -" Om du vill uppdatera bara en fil till en äldre revision, använd revert.\n" +"uppdatera arbetskatalogen\n" +"\n" +" Uppdatera arkivets arbetskatalog till den specificerade ändringen.\n" +"\n" +" Om ingen ändring specificeras, kommer ett försök att göras för att\n" +" hämta ut huvudet på den nuvarande grenen. Om huvudet är en ättling till\n" +" den nuvarande grenen, uppdatera till det, annars avbryt.\n" +"\n" +" Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" +" ändringar:\n" +"\n" +" 1. Om varken -c/--check eller -C/--clean specificeras, kommer\n" +" oarkiverade ändringar att sammanfogas med den begärda ändringen,\n" +" och det sammanfogade resultatet lämnas oarkiverat. Uppdatering och\n" +" sammanfogning kommer bara att göras om den begärda ändringen är en\n" +" anfader eller ättling till föräldraändringen. Om inte, avbryts\n" +" uppdateringen och de oarkiverade ändringarna lämnas.\n" +"\n" +" 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" +" ändringarna lämnas.\n" +"\n" +" 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras och\n" +" arbetskatalogen uppdateras till den begärda ändringen.\n" +"\n" +" Använd null som ändring för att radera arbetskatalogen (som 'hg clone\n" +" -U').\n" +"\n" +" Om du vill uppdatera bara en fil till en äldre ändring, använd 'hg\n" +" revert'.\n" "\n" " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" " " @@ -6680,8 +6839,8 @@ msgid "set the charset encoding mode" msgstr "sätt teckenkodningsläge" -msgid "print traceback on exception" -msgstr "visa bakåtspårning vid undantak" +msgid "always print a traceback on exception" +msgstr "visa alltid bakåtspårning vid undantag" msgid "time how long the command takes" msgstr "ta tid på hud lång tid kommandot körs" @@ -6740,6 +6899,9 @@ msgid "show which function each change is in" msgstr "visa vilken funktion varje ändring är i" +msgid "produce a diff that undoes the changes" +msgstr "skapa en diff som ångrar ändringarna" + msgid "ignore white space when comparing lines" msgstr "ignorera blanktecken när rader jämförs" @@ -6752,6 +6914,9 @@ msgid "number of lines of context to show" msgstr "antal sammanhangsrader att visa" +msgid "output diffstat-style summary of changes" +msgstr "visa sammanfattning av ändringar i diffstat-stil" + msgid "guess renamed files by similarity (0<=s<=100)" msgstr "" @@ -6881,6 +7046,9 @@ msgid "the clone will only contain a repository (no working copy)" msgstr "klonen kommer bara att ha arkivet (ingen arbetskopia)" +msgid "revision, tag or branch to check out" +msgstr "revision, märke eller gren att hämta ut" + msgid "a changeset you would like to have after cloning" msgstr "en ändring du skulle vilja ha efter kloning" @@ -7049,8 +7217,8 @@ msgid "file to store the bundles into" msgstr "" -msgid "a specific revision up to which you would like to pull" -msgstr "en specifik revision upp till vilken du vill dra" +msgid "a specific remote revision up to which you would like to pull" +msgstr "en specifik fjärrrevision upp till vilken du vill dra" msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" msgstr "" @@ -7157,8 +7325,8 @@ msgid "[OPTION]... SOURCE... DEST" msgstr "" -msgid "remerge all unresolved files" -msgstr "" +msgid "select all unresolved files" +msgstr "välj alla olösta filer" msgid "list state of files needing merge" msgstr "" @@ -7169,6 +7337,9 @@ msgid "unmark files as resolved" msgstr "" +msgid "hide status prefix" +msgstr "göm statusprefix" + msgid "revert all changes when no arguments given" msgstr "" @@ -7253,9 +7424,6 @@ msgid "show only ignored files" msgstr "visa bara ignorerade filer" -msgid "hide status prefix" -msgstr "göm statusprefix" - msgid "show source of copied files" msgstr "visa källan för kopierade filer" @@ -7286,14 +7454,14 @@ msgid "[-u] FILE..." msgstr "" -msgid "overwrite locally modified files (no backup)" -msgstr "skriv över lokalt modifierade filer (ingen backup)" +msgid "discard uncommitted changes (no backup)" +msgstr "kassera oarkiverade ändringar (ingen backup)" msgid "check for uncommitted changes" msgstr "leta efter icke arkiverade ändringar" -msgid "[-C] [-d DATE] [[-r] REV]" -msgstr "[-C] [-d DATUM] [[-r] REV]" +msgid "[-c] [-C] [-d DATE] [[-r] REV]" +msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" #, python-format msgid "config error at %s:%d: '%s'" @@ -7565,6 +7733,9 @@ msgid "disabled extensions:" msgstr "" +msgid "Configuration Files" +msgstr "" + msgid "Date Formats" msgstr "" @@ -7724,8 +7895,16 @@ msgstr "" #, python-format -msgid "'%s' does not appear to be an hg repository" -msgstr "" +msgid "" +"'%s' does not appear to be an hg repository:\n" +"---%%<--- (%s)\n" +"%s\n" +"---%%<---\n" +msgstr "" +"'%s' verkar inte vara ett hg-arkiv:\n" +"---%%<--- (%s)\n" +"%s\n" +"---%%<---\n" #, python-format msgid "'%s' sent a broken Content-Type header (%s)" @@ -7796,7 +7975,7 @@ msgid "unknown revision '%s'" msgstr "" -msgid "journal already exists - run hg recover" +msgid "abandoned transaction found - run hg recover" msgstr "" msgid "rolling back interrupted transaction\n" @@ -8101,13 +8280,12 @@ msgid "outstanding uncommitted changes (use 'hg status' to list changes)" msgstr "" -msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" -msgstr "" - -msgid "crosses branches (use 'hg merge' or 'hg update -C')" -msgstr "" - -msgid "crosses named branches (use 'hg update -C' to discard changes)" +msgid "" +"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " +"changes)" +msgstr "" + +msgid "crosses branches (use 'hg merge' or use 'hg update -c')" msgstr "" #, python-format @@ -8284,6 +8462,10 @@ msgid "unsynced changes" msgstr "" +#, python-format +msgid "'%s' does not appear to be an hg repository" +msgstr "" + msgid "cannot lock static-http repository" msgstr "" @@ -8396,7 +8578,7 @@ msgid "No username found, using '%s' instead\n" msgstr "" -msgid "Please specify a username." +msgid "no username supplied (see \"hg help config\")" msgstr "" #, python-format @@ -8569,6 +8751,9 @@ msgid "duplicate revision %d (%d)" msgstr "" +msgid "abandoned transaction found - run hg recover\n" +msgstr "" + #, python-format msgid "repository uses revlog format %d\n" msgstr "arkivet använder revlog-format %d\n"