# HG changeset patch # User Matt Mackall # Date 1343151400 18000 # Node ID ffc49100151b68c0bcd061b900d9993e9e1a0d7d # Parent 57a47190e96cf4e0959e9d43a74f858ca79b9da1# Parent 848a1c1e51cd7d4475c372cb7461c8f9a24a8401 merge with i18n diff -r 57a47190e96c -r ffc49100151b i18n/sv.po --- a/i18n/sv.po Mon Jul 23 15:40:19 2012 -0700 +++ b/i18n/sv.po Tue Jul 24 12:36:40 2012 -0500 @@ -4,17 +4,20 @@ # # Translation dictionary: # +# amend förändra # changeset ändring # commit arkivera +# graft ympa # merge sammanfoga +# strip avlägsna # tag märke # msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-30 16:25+0100\n" -"PO-Revision-Date: 2012-01-30 16:27+0100\n" +"POT-Creation-Date: 2012-07-23 20:26+0200\n" +"PO-Revision-Date: 2012-07-23 20:38+0200\n" "Last-Translator: Jens Bäckman \n" "Language-Team: Swedish\n" "Language: Swedish\n" @@ -113,6 +116,11 @@ msgstr "" msgid "" +"You can add the \"!\" prefix to a user or group name to invert the sense\n" +"of the match." +msgstr "" + +msgid "" "Path-based Access Control\n" "........................." msgstr "" @@ -262,15 +270,73 @@ msgstr "" msgid "" -" # Everyone (except for \"user6\" - see acl.deny above) will have write\n" -" # access to any file under the \"resources\" folder (except for 1\n" -" # file. See acl.deny):\n" +" # Everyone (except for \"user6\" and \"@hg-denied\" - see acl.deny above)\n" +" # will have write access to any file under the \"resources\" folder\n" +" # (except for 1 file. See acl.deny):\n" " src/main/resources/** = *" msgstr "" msgid " .hgtags = release_engineer" msgstr "" +msgid "" +"Examples using the \"!\" prefix\n" +"............................." +msgstr "" + +msgid "" +"Suppose there's a branch that only a given user (or group) should be able " +"to\n" +"push to, and you don't want to restrict access to any other branch that may\n" +"be created." +msgstr "" + +msgid "" +"The \"!\" prefix allows you to prevent anyone except a given user or group " +"to\n" +"push changesets in a given branch or path." +msgstr "" + +msgid "" +"In the examples below, we will:\n" +"1) Deny access to branch \"ring\" to anyone but user \"gollum\"\n" +"2) Deny access to branch \"lake\" to anyone but members of the group \"hobbit" +"\"\n" +"3) Deny access to a file to anyone but user \"gollum\"" +msgstr "" + +msgid "" +" [acl.allow.branches]\n" +" # Empty" +msgstr "" + +msgid "" +" # 1) only 'gollum' can commit to branch 'ring';\n" +" # 'gollum' and anyone else can still commit to any other branch.\n" +" ring = !gollum" +msgstr "" + +msgid "" +" # 2) only members of the group 'hobbit' can commit to branch 'lake';\n" +" # 'hobbit' members and anyone else can still commit to any other branch.\n" +" lake = !@hobbit" +msgstr "" + +msgid " # You can also deny access based on file paths:" +msgstr "" + +msgid "" +" [acl.allow]\n" +" # Empty" +msgstr "" + +msgid "" +" [acl.deny]\n" +" # 3) only 'gollum' can change the file below;\n" +" # 'gollum' and anyone else can still change any other file.\n" +" /misty/mountains/cave/ring = !gollum" +msgstr "" + #, python-format msgid "group '%s' is undefined" msgstr "" @@ -305,7 +371,9 @@ "the Mercurial template mechanism." msgstr "" -msgid "The hook does not change bug status." +msgid "" +"The bug references can optionally include an update for Bugzilla of the\n" +"hours spent working on the bug. Bugs can also be marked fixed." msgstr "" msgid "Three basic modes of access to Bugzilla are provided:" @@ -334,7 +402,7 @@ "MySQL user and password to have full access rights to the Bugzilla\n" "database. For these reasons this access mode is now considered\n" "deprecated, and will not be updated for new Bugzilla versions going\n" -"forward." +"forward. Only adding comments is supported in this access mode." msgstr "" msgid "" @@ -342,7 +410,8 @@ "in the configuration. Comments are added under that username. Since the\n" "configuration must be readable by all Mercurial users, it is recommended\n" "that the rights of that user are restricted in Bugzilla to the minimum\n" -"necessary to add comments." +"necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and " +"later." msgstr "" msgid "" @@ -352,7 +421,8 @@ "user, so the comment appears to come from the Mercurial user. In the event\n" "that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n" "user, the email associated with the Bugzilla username used to log into\n" -"Bugzilla is used instead as the source of the comment." +"Bugzilla is used instead as the source of the comment. Marking bugs fixed\n" +"works on all supported Bugzilla versions." msgstr "" msgid "Configuration items common to all access modes:" @@ -375,11 +445,43 @@ msgid "" "bugzilla.regexp\n" -" Regular expression to match bug IDs in changeset commit message.\n" -" Must contain one \"()\" group. The default expression matches ``Bug\n" -" 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n" -" ``Bug 1234 and 5678`` and variations thereof. Matching is case\n" -" insensitive." +" Regular expression to match bug IDs for update in changeset commit " +"message.\n" +" It must contain one \"()\" named group ```` containing the bug\n" +" IDs separated by non-digit characters. It may also contain\n" +" a named group ```` with a floating-point number giving the\n" +" hours worked on the bug. If no named groups are present, the first\n" +" \"()\" group is assumed to contain the bug IDs, and work time is not\n" +" updated. The default expression matches ``Bug 1234``, ``Bug no. 1234``,\n" +" ``Bug number 1234``, ``Bugs 1234,5678``, ``Bug 1234 and 5678`` and\n" +" variations thereof, followed by an hours number prefixed by ``h`` or\n" +" ``hours``, e.g. ``hours 1.5``. Matching is case insensitive." +msgstr "" + +msgid "" +"bugzilla.fixregexp\n" +" Regular expression to match bug IDs for marking fixed in changeset\n" +" commit message. This must contain a \"()\" named group ``` " +"containing\n" +" the bug IDs separated by non-digit characters. It may also contain\n" +" a named group ```` with a floating-point number giving the\n" +" hours worked on the bug. If no named groups are present, the first\n" +" \"()\" group is assumed to contain the bug IDs, and work time is not\n" +" updated. The default expression matches ``Fixes 1234``, ``Fixes bug " +"1234``,\n" +" ``Fixes bugs 1234,5678``, ``Fixes 1234 and 5678`` and\n" +" variations thereof, followed by an hours number prefixed by ``h`` or\n" +" ``hours``, e.g. ``hours 1.5``. Matching is case insensitive." +msgstr "" + +msgid "" +"bugzilla.fixstatus\n" +" The status to set a bug to when marking fixed. Default ``RESOLVED``." +msgstr "" + +msgid "" +"bugzilla.fixresolution\n" +" The resolution to set a bug to when marking fixed. Default ``FIXED``." msgstr "" msgid "" @@ -651,6 +753,10 @@ msgstr "" #, python-format +msgid "bug %d does not exist\n" +msgstr "bugg %d existerar inte\n" + +#, python-format msgid "bug %d already knows about changeset %s\n" msgstr "" @@ -684,6 +790,12 @@ msgid "cannot find bugzilla user id for %s or %s" msgstr "" +msgid "Bugzilla/MySQL cannot update bug state\n" +msgstr "" + +msgid "Bugzilla/XMLRPC needs Bugzilla 4.0 or later to mark bugs fixed\n" +msgstr "" + msgid "configuration 'bzemail' missing" msgstr "'bzemail' inte konfigurerad" @@ -695,6 +807,10 @@ msgid "bugzilla version %s not supported" msgstr "bugzilla version %s stöds inte" +#, python-format +msgid "%s: invalid hours\n" +msgstr "%s: ogiltiga timmar\n" + msgid "" "changeset {node|short} in repo {root} refers to bug {bug}.\n" "details:\n" @@ -709,8 +825,15 @@ msgid "Bugzilla error: %s" msgstr "Bugzilla-fel: %s" -msgid "command to display child changesets" -msgstr "" +msgid "command to display child changesets (DEPRECATED)" +msgstr "kommando för att visa barnändringar (FÖRLEGAD)" + +msgid "" +"This extension is deprecated. You should use :hg:`log -r\n" +"\"children(REV)\"` instead.\n" +msgstr "" +"Detta är en förlegad utökning. Du kan avända :hg:`log -r\n" +"\"children(REV)\"` instead.\n" msgid "show the children of the given or working directory revision" msgstr "" @@ -737,7 +860,7 @@ msgstr "" #, python-format -msgid "Revision %d is a merge, ignoring...\n" +msgid "revision %d is a merge, ignoring...\n" msgstr "" msgid "analyzing" @@ -1547,8 +1670,8 @@ msgstr "" #, python-format -msgid "%s is not a valid revision in current branch" -msgstr "" +msgid "%s is not a valid revision" +msgstr "%s är inte en giltig revision" #, python-format msgid "%s is not available in %s anymore" @@ -1575,6 +1698,10 @@ msgstr "" #, python-format +msgid "syntax error in %s(%d): child parent1[,parent2] expected" +msgstr "" + +#, python-format msgid "%s: invalid source repository type" msgstr "%s: ogiltig typ för källarkiv" @@ -1604,6 +1731,14 @@ msgstr "skannar" #, python-format +msgid "splice map revision %s is not being converted, ignoring\n" +msgstr "" + +#, python-format +msgid "unknown splice map parent: %s" +msgstr "" + +#, python-format msgid "unknown sort mode: %s" msgstr "" @@ -1615,11 +1750,11 @@ msgstr "" #, python-format -msgid "Writing author map file %s\n" -msgstr "" - -#, python-format -msgid "Ignoring bad line in author map file %s: %s\n" +msgid "writing author map file %s\n" +msgstr "" + +#, python-format +msgid "ignoring bad line in author map file %s: %s\n" msgstr "" #, python-format @@ -1864,6 +1999,12 @@ msgstr "uppdaterar bokmärken\n" #, python-format +msgid "" +"revision %s not found in destination repository (lookups with " +"clonebranches=true are not implemented)" +msgstr "" + +#, python-format msgid "%s is not a valid start revision" msgstr "" @@ -1924,6 +2065,9 @@ msgid "collecting p4 changelists\n" msgstr "" +msgid "debugsvnlog could not load Subversion python bindings" +msgstr "" + msgid "Mercurial failed to run itself, check hg executable is in PATH" msgstr "" @@ -1940,7 +2084,7 @@ msgid "%s does not look like a Subversion repository" msgstr "%s verkar inte vara ett Subversion-arkiv" -msgid "Could not load Subversion python bindings" +msgid "could not load Subversion python bindings" msgstr "" #, python-format @@ -2025,6 +2169,12 @@ msgid "writing Subversion tags is not yet implemented\n" msgstr "" +#, python-format +msgid "" +"splice map revision %s not found in subversion child map (revision lookups " +"are not implemented)" +msgstr "" + msgid "automatically manage newlines in repository files" msgstr "" @@ -2211,7 +2361,8 @@ " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" " # your .vimrc\n" -" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" +" vimdiff = gvim -f \"+next\" \\\n" +" \"+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))\"" msgstr "" msgid "Tool arguments can include variables that are expanded at runtime::" @@ -2324,7 +2475,56 @@ msgid "hg %s [OPTION]... [FILE]..." msgstr "" -msgid "pull, update and merge in one command" +msgid "http authentication with factotum" +msgstr "" + +msgid "" +"This extension allows the factotum(4) facility on Plan 9 from Bell Labs\n" +"platforms to provide authentication information for HTTP access. " +"Configuration\n" +"entries specified in the auth section as well as authentication information\n" +"provided in the repository URL are fully supported. If no prefix is " +"specified,\n" +"a value of \"*\" will be assumed." +msgstr "" + +msgid "By default, keys are specified as::" +msgstr "" + +msgid "" +" proto=pass service=hg prefix= user= !password=" +msgstr "" + +msgid "" +"If the factotum extension is unable to read the required key, one will be\n" +"requested interactively." +msgstr "" + +msgid "" +"A configuration section is available to customize runtime behavior. By\n" +"default, these entries are::" +msgstr "" + +msgid "" +" [factotum]\n" +" executable = /bin/auth/factotum\n" +" mountpoint = /mnt/factotum\n" +" service = hg" +msgstr "" + +msgid "" +"The executable entry defines the full path to the factotum binary. The\n" +"mountpoint entry defines the path to the factotum file service. Lastly, the\n" +"service entry controls the service name used when reading keys." +msgstr "" + +msgid "factotum not interactive" +msgstr "" + +msgid "factotum not responding" +msgstr "" + +msgid "pull, update and merge in one command (DEPRECATED)" msgstr "" msgid "pull changes from a remote repository, merge new changes if needed." @@ -2343,10 +2543,9 @@ msgstr "" msgid "" -" When a merge occurs, the newly pulled changes are assumed to be\n" -" \"authoritative\". The head of the new changes is used as the first\n" -" parent, with local changes as the second. To switch the merge\n" -" order, use --switch-parent." +" When a merge is needed, the working directory is first updated to\n" +" the newly pulled changes. Local changes are then merged into the\n" +" pulled changes. To switch the merge order, use --switch-parent." msgstr "" msgid " See :hg:`help dates` for a list of formats valid for -d/--date." @@ -2385,10 +2584,10 @@ msgstr "drar från %s\n" msgid "" -"Other repository doesn't support revision lookup, so a rev cannot be " +"other repository doesn't support revision lookup, so a rev cannot be " "specified." msgstr "" -"Det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " +"det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " "anges." #, python-format @@ -2454,15 +2653,15 @@ msgid "%s:%d node does not exist\n" msgstr "%s:%d noden existerar inte\n" -msgid "hg sigcheck REVISION" -msgstr "hg sigcheck REVISION" +msgid "hg sigcheck REV" +msgstr "hg sigcheck REV" msgid "verify all the signatures there may be for a particular revision" msgstr "verifiera alla signaturerna som finns för en viss revision" #, python-format -msgid "No valid signature for %s\n" -msgstr "Ingen giltig signatur för %s\n" +msgid "no valid signature for %s\n" +msgstr "ingen giltig signatur för %s\n" msgid "make the signature local" msgstr "gör signaturen lokal" @@ -2485,8 +2684,8 @@ msgid "commit message" msgstr "arkiveringsmeddelande" -msgid "hg sign [OPTION]... [REVISION]..." -msgstr "hg sign [FLAGGA]... [REVISION]..." +msgid "hg sign [OPTION]... [REV]..." +msgstr "hg sign [FLAGGA]... [REV]..." msgid "add a signature for the current or given revision" msgstr "lägg till en signatur för den aktuella eller angivna revisionen" @@ -2509,8 +2708,8 @@ msgstr "oarkiverad sammanfogning - ange en specifik revision" #, python-format -msgid "Signing %d:%s\n" -msgstr "Signerar %d:%s\n" +msgid "signing %d:%s\n" +msgstr "signerar %d:%s\n" msgid "error while signing" msgstr "fel vid signering" @@ -2537,27 +2736,54 @@ "outgoing och log. När flaggan anges, visas också en ASCII-version av\n" "revisionsgrafen.\n" -#, python-format -msgid "-G/--graph option is incompatible with --%s" -msgstr "flaggan -G/--graph är inkompatibel med --%s" - -msgid "-G/--graph option is incompatible with --follow with file argument" -msgstr "flaggan -G/--graph är inkompatibel med --follow med filargument" - -msgid "NUM" -msgstr "NUM" - -msgid "limit number of changes displayed" -msgstr "begränsa antalet visade ändringar" - -msgid "show patch" -msgstr "visa patch" +msgid "follow changeset history, or file history across copies and renames" +msgstr "" +"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" + +msgid "only follow the first parent of merge changesets (DEPRECATED)" +msgstr "följ bara den första föräldern vid sammanfogningar (FÖRLEGAD)" + +msgid "show revisions matching date spec" +msgstr "visa revisioner som matchar datumspecen" + +msgid "show copied files" +msgstr "visa kopierade filer" + +msgid "do case-insensitive search for a given text" +msgstr "gör versalokänslig sökning efter en given text" msgid "show the specified revision or range" msgstr "visa den specifika revisionen eller serien" -msgid "hg glog [OPTION]... [FILE]" -msgstr "hg glog [FLAGGA]... [FIL]" +msgid "include revisions where files were removed" +msgstr "inkludera revisioner där filer togs bort" + +msgid "show only merges (DEPRECATED)" +msgstr "visa bara sammanfogningar (FÖRLEGAD)" + +msgid "USER" +msgstr "ANVÄNDARE" + +msgid "revisions committed by user" +msgstr "revisioner arkiverade av användare" + +msgid "show only changesets within the given named branch (DEPRECATED)" +msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)" + +msgid "BRANCH" +msgstr "GREN" + +msgid "show changesets within the given named branch" +msgstr "visa ändringar i den namngivna grenen" + +msgid "do not display revision or any of its ancestors" +msgstr "visa inte revision eller någon av dess föräldrar" + +msgid "show hidden changesets (DEPRECATED)" +msgstr "visa dolda ändringar (FÖRLEGAD)" + +msgid "[OPTION]... [FILE]" +msgstr "[FLAGGA]... [FIL]" msgid "show revision history alongside an ASCII revision graph" msgstr "visa revisionshistorik vid sidan av en ASCII-revisionsgraf" @@ -2577,9 +2803,6 @@ " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n" " " -msgid "show the revision DAG" -msgstr "visa revisionsdiagram" - msgid "hooks for integrating with the CIA.vc notification service" msgstr "" @@ -2707,6 +2930,12 @@ msgid "start interactive history viewer" msgstr "" +msgid "NUM" +msgstr "NUM" + +msgid "limit number of changes displayed" +msgstr "begränsa antalet visade ändringar" + msgid "hg view [-l LIMIT] [REVRANGE]" msgstr "" @@ -2763,23 +2992,322 @@ msgstr "" msgid "syntax highlighting for hgweb (requires Pygments)" -msgstr "" +msgstr "syntaxfärgning för hgweb (kräver Pygments)" msgid "" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/" msgstr "" +"Den beror på syntaxfärgningsbiblioteket Pygments:\n" +"http://pygments.org/" msgid "There is a single configuration option::" -msgstr "" +msgstr "Det finns ett enda konfigurationsalternativ::" msgid "" " [web]\n" " pygments_style =