# HG changeset patch # User Jens Bäckman # Date 1271695202 -7200 # Node ID af4fe14a6f7dfe4d85f27f91a400fe6451a6778b # Parent e3396b218e1040daf2585f0da7ca57ca9fc05761 i18n-sv: syncronized with e3396b218e10 diff -r e3396b218e10 -r af4fe14a6f7d i18n/sv.po --- a/i18n/sv.po Wed Apr 14 11:59:53 2010 +0530 +++ b/i18n/sv.po Mon Apr 19 18:40:02 2010 +0200 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-28 19:48+0200\n" -"PO-Revision-Date: 2010-03-28 20:26+0100\n" +"POT-Creation-Date: 2010-04-19 18:26+0200\n" +"PO-Revision-Date: 2010-04-19 18:39+0100\n" "Last-Translator: Jens Bäckman \n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -1020,6 +1020,9 @@ msgid "%d bytes missing from remote file" msgstr "" +msgid "malformed response from CVS" +msgstr "förvrängt svar från CVS" + #, python-format msgid "cvs server: %s\n" msgstr "" @@ -2624,9 +2627,8 @@ "create a new patch\n" "\n" " qnew creates a new patch on top of the currently-applied patch (if\n" -" any). It will refuse to run if there are any outstanding changes\n" -" unless -f/--force is specified, in which case the patch will be\n" -" initialized with them. You may also use -I/--include,\n" +" any). The patch will be initialized with any outstanding changes\n" +" in the working directory. You may also use -I/--include,\n" " -X/--exclude, and/or a list of files after the patch name to add\n" " only changes to matching files to the new patch, leaving the rest\n" " as uncommitted modifications.\n" @@ -3584,6 +3586,8 @@ " # (that is, min(width, term width) will be used)\n" " clear-complete = True # clear the progress bar after it's done\n" " disable = False # if true, don't show a progress bar\n" +" assume-tty = False # if true, ALWAYS show a progress bar, unless\n" +" # disable is given\n" "\n" "Valid entries for the format field are topic, bar, number, unit, and\n" "item. item defaults to the last 20 characters of the item, but this\n" @@ -4017,6 +4021,7 @@ " bb = https://bitbucket.org/\n" " bb+ssh = ssh://hg@bitbucket.org/\n" " gcode = https://{1}.googlecode.com/hg/\n" +" kiln = https://{1}.kilnhg.com/Repo/\n" "\n" "You can override a predefined scheme by defining a new scheme with the\n" "same name.\n" @@ -4026,7 +4031,7 @@ msgstr "" msgid "" -"create a new shared repository (experimental)\n" +"create a new shared repository\n" "\n" " Initialize a new repository and working directory that shares its\n" " history with another repository.\n" @@ -6227,6 +6232,11 @@ " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" "\n" +" The names 'default' and 'default-push' have a special meaning.\n" +" They are the locations used when pulling and pushing respectively\n" +" unless a location is specified. When cloning a repository, the\n" +" clone source is written as 'default' in .hg/hgrc.\n" +"\n" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -6238,6 +6248,10 @@ " Sökvägar definieras i sektionen [paths] i /etc/mercurial/hgrc och\n" " $HOME/.hgrc. Om det körs i ett arkiv, så används .hg/hgrc också.\n" "\n" +" Namnen 'default' och 'default-push' har en särskild innebörd. De är\n" +" platserna som används vid push eller pull om ingen plats anges. När\n" +" ett arkiv klonas, skrivs klonkällan som 'default' i .hg/hgrc.\n" +"\n" " Se 'hg help urls' för mer information.\n" " " @@ -9140,13 +9154,12 @@ msgid "abort: push creates new remote heads!\n" msgstr "avbryter: push skapar nya fjärrhuvuden!\n" +msgid "(you should pull and merge or use push -f to force)\n" +msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n" + msgid "(did you forget to merge? use push -f to force)\n" msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" -msgid "(you should pull and merge or use push -f to force)\n" -msgstr "" -"(du kan dra och sammanfoga eller eller använda push -f för att tvinga)\n" - #, python-format msgid "abort: push creates new remote branches: %s!\n" msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n"