Show More
@@ -13,8 +13,8 b' msgid ""' | |||||
13 | msgstr "" |
|
13 | msgstr "" | |
14 | "Project-Id-Version: Mercurial\n" |
|
14 | "Project-Id-Version: Mercurial\n" | |
15 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
15 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
16 |
"POT-Creation-Date: 2009-1 |
|
16 | "POT-Creation-Date: 2009-11-10 20:01+0100\n" | |
17 |
"PO-Revision-Date: 2009-11- |
|
17 | "PO-Revision-Date: 2009-11-10 20:06+0100\n" | |
18 | "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" |
|
18 | "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" | |
19 | "Language-Team: Swedish\n" |
|
19 | "Language-Team: Swedish\n" | |
20 | "MIME-Version: 1.0\n" |
|
20 | "MIME-Version: 1.0\n" | |
@@ -25,11 +25,11 b' msgstr ""' | |||||
25 | msgid " (default: %s)" |
|
25 | msgid " (default: %s)" | |
26 | msgstr " (standard: %s)" |
|
26 | msgstr " (standard: %s)" | |
27 |
|
27 | |||
28 |
msgid "O |
|
28 | msgid "Options" | |
29 |
msgstr "F |
|
29 | msgstr "Flaggor" | |
30 |
|
30 | |||
31 | msgid "COMMANDS" |
|
31 | msgid "Commands" | |
32 | msgstr "KOMMANDON" |
|
32 | msgstr "Kommandon" | |
33 |
|
33 | |||
34 | msgid "" |
|
34 | msgid "" | |
35 | " options:\n" |
|
35 | " options:\n" | |
@@ -47,6 +47,46 b' msgstr ""' | |||||
47 | "\n" |
|
47 | "\n" | |
48 |
|
48 | |||
49 | msgid "" |
|
49 | msgid "" | |
|
50 | "Mercurial reads configuration data from several files, if they exist.\n" | |||
|
51 | "Below we list the most specific file first.\n" | |||
|
52 | "\n" | |||
|
53 | "On Windows, these configuration files are read:\n" | |||
|
54 | "\n" | |||
|
55 | "- ``<repo>\\.hg\\hgrc``\n" | |||
|
56 | "- ``%USERPROFILE%\\.hgrc``\n" | |||
|
57 | "- ``%USERPROFILE%\\Mercurial.ini``\n" | |||
|
58 | "- ``%HOME%\\.hgrc``\n" | |||
|
59 | "- ``%HOME%\\Mercurial.ini``\n" | |||
|
60 | "- ``C:\\Mercurial\\Mercurial.ini``\n" | |||
|
61 | "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" | |||
|
62 | "- ``<install-dir>\\Mercurial.ini``\n" | |||
|
63 | "\n" | |||
|
64 | "On Unix, these files are read:\n" | |||
|
65 | "\n" | |||
|
66 | "- ``<repo>/.hg/hgrc``\n" | |||
|
67 | "- ``$HOME/.hgrc``\n" | |||
|
68 | "- ``/etc/mercurial/hgrc``\n" | |||
|
69 | "- ``/etc/mercurial/hgrc.d/*.rc``\n" | |||
|
70 | "- ``<install-root>/etc/mercurial/hgrc``\n" | |||
|
71 | "- ``<install-root>/etc/mercurial/hgrc.d/*.rc``\n" | |||
|
72 | "\n" | |||
|
73 | "The configuration files for Mercurial use a simple ini-file format. A\n" | |||
|
74 | "configuration file consists of sections, led by a ``[section]`` header\n" | |||
|
75 | "and followed by ``name = value`` entries::\n" | |||
|
76 | "\n" | |||
|
77 | " [ui]\n" | |||
|
78 | " username = Firstname Lastname <firstname.lastname@example.net>\n" | |||
|
79 | " verbose = True\n" | |||
|
80 | "\n" | |||
|
81 | "This above entries will be referred to as ``ui.username`` and\n" | |||
|
82 | "``ui.verbose``, respectively. Please see the hgrc man page for a full\n" | |||
|
83 | "description of the possible configuration values:\n" | |||
|
84 | "\n" | |||
|
85 | "- on Unix-like systems: ``man hgrc``\n" | |||
|
86 | "- online: http://www.selenic.com/mercurial/hgrc.5.html\n" | |||
|
87 | msgstr "" | |||
|
88 | ||||
|
89 | msgid "" | |||
50 | "Some commands allow the user to specify a date, e.g.:\n" |
|
90 | "Some commands allow the user to specify a date, e.g.:\n" | |
51 | "\n" |
|
91 | "\n" | |
52 | "- backout, commit, import, tag: Specify the commit date.\n" |
|
92 | "- backout, commit, import, tag: Specify the commit date.\n" | |
@@ -170,7 +210,7 b' msgid ""' | |||||
170 | " - hgrc files from the HGRCPATH\n" |
|
210 | " - hgrc files from the HGRCPATH\n" | |
171 | " - EMAIL\n" |
|
211 | " - EMAIL\n" | |
172 | " - interactive prompt\n" |
|
212 | " - interactive prompt\n" | |
173 |
" - LOGNAME (with |
|
213 | " - LOGNAME (with ``@hostname`` appended)\n" | |
174 | "\n" |
|
214 | "\n" | |
175 | " (deprecated, use .hgrc)\n" |
|
215 | " (deprecated, use .hgrc)\n" | |
176 | "\n" |
|
216 | "\n" | |
@@ -402,11 +442,11 b' msgid ""' | |||||
402 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" |
|
442 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" | |
403 | ":domain: Any text. Finds the first string that looks like an\n" |
|
443 | ":domain: Any text. Finds the first string that looks like an\n" | |
404 | " email address, and extracts just the domain\n" |
|
444 | " email address, and extracts just the domain\n" | |
405 |
" component. Example: |
|
445 | " component. Example: ``User <user@example.com>`` becomes\n" | |
406 |
" |
|
446 | " ``example.com``.\n" | |
407 | ":email: Any text. Extracts the first string that looks like\n" |
|
447 | ":email: Any text. Extracts the first string that looks like\n" | |
408 |
" an email address. Example: |
|
448 | " an email address. Example: ``User <user@example.com>``\n" | |
409 |
" becomes |
|
449 | " becomes ``user@example.com``.\n" | |
410 | ":escape: Any text. Replaces the special XML/XHTML characters\n" |
|
450 | ":escape: Any text. Replaces the special XML/XHTML characters\n" | |
411 | " \"&\", \"<\" and \">\" with XML entities.\n" |
|
451 | " \"&\", \"<\" and \">\" with XML entities.\n" | |
412 | ":fill68: Any text. Wraps the text to fit in 68 columns.\n" |
|
452 | ":fill68: Any text. Wraps the text to fit in 68 columns.\n" | |
@@ -490,7 +530,7 b' msgid ""' | |||||
490 | " ...\n" |
|
530 | " ...\n" | |
491 | "\n" |
|
531 | "\n" | |
492 | "You can then use the alias for any command that uses a URL (for\n" |
|
532 | "You can then use the alias for any command that uses a URL (for\n" | |
493 |
"example 'hg pull alias1' w |
|
533 | "example 'hg pull alias1' will be treated as 'hg pull URL1').\n" | |
494 | "\n" |
|
534 | "\n" | |
495 | "Two path aliases are special because they are used as defaults when\n" |
|
535 | "Two path aliases are special because they are used as defaults when\n" | |
496 | "you do not provide the URL to a command:\n" |
|
536 | "you do not provide the URL to a command:\n" | |
@@ -927,6 +967,9 b' msgstr ""' | |||||
927 | msgid "sort by key (default: sort by count)" |
|
967 | msgid "sort by key (default: sort by count)" | |
928 | msgstr "" |
|
968 | msgstr "" | |
929 |
|
969 | |||
|
970 | msgid "display added/removed lines separately" | |||
|
971 | msgstr "visa tillagda/raderade rader separat" | |||
|
972 | ||||
930 | msgid "file with email aliases" |
|
973 | msgid "file with email aliases" | |
931 | msgstr "" |
|
974 | msgstr "" | |
932 |
|
975 | |||
@@ -1080,7 +1123,10 b' msgid ""' | |||||
1080 | " revision control system whose parents should be modified (same\n" |
|
1123 | " revision control system whose parents should be modified (same\n" | |
1081 | " format as a key in .hg/shamap). The values are the revision IDs\n" |
|
1124 | " format as a key in .hg/shamap). The values are the revision IDs\n" | |
1082 | " (in either the source or destination revision control system) that\n" |
|
1125 | " (in either the source or destination revision control system) that\n" | |
1083 | " should be used as the new parents for that node.\n" |
|
1126 | " should be used as the new parents for that node. For example, if\n" | |
|
1127 | " you have merged \"release-1.0\" into \"trunk\", then you should\n" | |||
|
1128 | " specify the revision on \"trunk\" as the first parent and the one on\n" | |||
|
1129 | " the \"release-1.0\" branch as the second.\n" | |||
1084 | "\n" |
|
1130 | "\n" | |
1085 | " The branchmap is a file that allows you to rename a branch when it is\n" |
|
1131 | " The branchmap is a file that allows you to rename a branch when it is\n" | |
1086 | " being brought in from whatever external repository. When used in\n" |
|
1132 | " being brought in from whatever external repository. When used in\n" | |
@@ -3714,17 +3760,17 b' msgid ""' | |||||
3714 | msgstr "" |
|
3760 | msgstr "" | |
3715 |
|
3761 | |||
3716 | #, python-format |
|
3762 | #, python-format | |
3717 | msgid "%sPlease enter a valid value" |
|
3763 | msgid "%s Please enter a valid value" | |
3718 | msgstr "" |
|
3764 | msgstr "%s Ange ett giltigt värde" | |
3719 |
|
3765 | |||
3720 | msgid "Please enter a valid value.\n" |
|
3766 | msgid "Please enter a valid value.\n" | |
3721 | msgstr "" |
|
3767 | msgstr "Ange ett giltigt värde.\n" | |
3722 |
|
3768 | |||
3723 |
msgid "does the diffstat above look okay? |
|
3769 | msgid "does the diffstat above look okay?" | |
3724 | msgstr "" |
|
3770 | msgstr "ser diffstaten ovanför okej ut?" | |
3725 |
|
3771 | |||
3726 | msgid "diffstat rejected" |
|
3772 | msgid "diffstat rejected" | |
3727 | msgstr "" |
|
3773 | msgstr "diffstat avvisad" | |
3728 |
|
3774 | |||
3729 | msgid "" |
|
3775 | msgid "" | |
3730 | "send changesets by email\n" |
|
3776 | "send changesets by email\n" | |
@@ -4170,6 +4216,73 b' msgstr ""' | |||||
4170 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." |
|
4216 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." | |
4171 | msgstr "" |
|
4217 | msgstr "" | |
4172 |
|
4218 | |||
|
4219 | msgid "recreates hardlinks between repository clones" | |||
|
4220 | msgstr "" | |||
|
4221 | ||||
|
4222 | msgid "" | |||
|
4223 | "recreate hardlinks between two repositories\n" | |||
|
4224 | "\n" | |||
|
4225 | " When repositories are cloned locally, their data files will be " | |||
|
4226 | "hardlinked\n" | |||
|
4227 | " so that they only use the space of a single repository.\n" | |||
|
4228 | "\n" | |||
|
4229 | " Unfortunately, subsequent pulls into either repository will break " | |||
|
4230 | "hardlinks\n" | |||
|
4231 | " for any files touched by the new changesets, even if both repositories " | |||
|
4232 | "end\n" | |||
|
4233 | " up pulling the same changes.\n" | |||
|
4234 | "\n" | |||
|
4235 | " Similarly, passing --rev to \"hg clone\" will fail to use\n" | |||
|
4236 | " any hardlinks, falling back to a complete copy of the source " | |||
|
4237 | "repository.\n" | |||
|
4238 | "\n" | |||
|
4239 | " This command lets you recreate those hardlinks and reclaim that wasted\n" | |||
|
4240 | " space.\n" | |||
|
4241 | "\n" | |||
|
4242 | " This repository will be relinked to share space with ORIGIN, which must " | |||
|
4243 | "be\n" | |||
|
4244 | " on the same local disk. If ORIGIN is omitted, looks for \"default-relink" | |||
|
4245 | "\",\n" | |||
|
4246 | " then \"default\", in [paths].\n" | |||
|
4247 | "\n" | |||
|
4248 | " Do not attempt any read operations on this repository while the command " | |||
|
4249 | "is\n" | |||
|
4250 | " running. (Both repositories will be locked against writes.)\n" | |||
|
4251 | " " | |||
|
4252 | msgstr "" | |||
|
4253 | ||||
|
4254 | #, python-format | |||
|
4255 | msgid "relinking %s to %s\n" | |||
|
4256 | msgstr "" | |||
|
4257 | ||||
|
4258 | #, python-format | |||
|
4259 | msgid "collected %d candidate storage files\n" | |||
|
4260 | msgstr "" | |||
|
4261 | ||||
|
4262 | msgid "source and destination are on different devices" | |||
|
4263 | msgstr "" | |||
|
4264 | ||||
|
4265 | #, python-format | |||
|
4266 | msgid "not linkable: %s\n" | |||
|
4267 | msgstr "inte länkbar: %s\n" | |||
|
4268 | ||||
|
4269 | #, python-format | |||
|
4270 | msgid "pruned down to %d probably relinkable files\n" | |||
|
4271 | msgstr "" | |||
|
4272 | ||||
|
4273 | msgid " files" | |||
|
4274 | msgstr "" | |||
|
4275 | ||||
|
4276 | msgid "relink" | |||
|
4277 | msgstr "" | |||
|
4278 | ||||
|
4279 | #, python-format | |||
|
4280 | msgid "relinked %d files (%d bytes reclaimed)\n" | |||
|
4281 | msgstr "" | |||
|
4282 | ||||
|
4283 | msgid "[ORIGIN]" | |||
|
4284 | msgstr "" | |||
|
4285 | ||||
4173 | msgid "share a common history between several working directories" |
|
4286 | msgid "share a common history between several working directories" | |
4174 | msgstr "" |
|
4287 | msgstr "" | |
4175 |
|
4288 | |||
@@ -4668,10 +4781,6 b' msgstr ""' | |||||
4668 | msgid "cannot follow nonexistent file: \"%s\"" |
|
4781 | msgid "cannot follow nonexistent file: \"%s\"" | |
4669 | msgstr "" |
|
4782 | msgstr "" | |
4670 |
|
4783 | |||
4671 | #, python-format |
|
|||
4672 | msgid "%s:%s copy source revision cannot be found!\n" |
|
|||
4673 | msgstr "" |
|
|||
4674 |
|
||||
4675 | msgid "can only follow copies/renames for explicit filenames" |
|
4784 | msgid "can only follow copies/renames for explicit filenames" | |
4676 | msgstr "" |
|
4785 | msgstr "" | |
4677 |
|
4786 | |||
@@ -5056,22 +5165,36 b' msgid ""' | |||||
5056 | " The location of the source is added to the new repository's\n" |
|
5165 | " The location of the source is added to the new repository's\n" | |
5057 | " .hg/hgrc file, as the default to be used for future pulls.\n" |
|
5166 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
5058 | "\n" |
|
5167 | "\n" | |
5059 | " If you use the -r/--rev option to clone up to a specific revision,\n" |
|
|||
5060 | " no subsequent revisions (including subsequent tags) will be\n" |
|
|||
5061 | " present in the cloned repository. This option implies --pull, even\n" |
|
|||
5062 | " on local repositories.\n" |
|
|||
5063 | "\n" |
|
|||
5064 | " By default, clone will check out the head of the 'default' branch.\n" |
|
|||
5065 | " If the -U/--noupdate option is used, the new clone will contain\n" |
|
|||
5066 | " only a repository (.hg) and no working copy (the working copy\n" |
|
|||
5067 | " parent is the null revision).\n" |
|
|||
5068 | "\n" |
|
|||
5069 | " See 'hg help urls' for valid source format details.\n" |
|
5168 | " See 'hg help urls' for valid source format details.\n" | |
5070 | "\n" |
|
5169 | "\n" | |
5071 | " It is possible to specify an ssh:// URL as the destination, but no\n" |
|
5170 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
5072 | " .hg/hgrc and working directory will be created on the remote side.\n" |
|
5171 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
5073 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" |
|
5172 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
5074 | "\n" |
|
5173 | "\n" | |
|
5174 | " If the -U/--noupdate option is specified, the new clone will contain\n" | |||
|
5175 | " only a repository (.hg) and no working copy (the working copy parent\n" | |||
|
5176 | " will be the null changeset). Otherwise, clone will initially check\n" | |||
|
5177 | " out (in order of precedence):\n" | |||
|
5178 | "\n" | |||
|
5179 | " a) the changeset, tag or branch specified with -u/--updaterev\n" | |||
|
5180 | " b) the changeset, tag or branch given with the first -r/--rev\n" | |||
|
5181 | " c) the head of the default branch\n" | |||
|
5182 | "\n" | |||
|
5183 | " Use 'hg clone -u . src dst' to checkout the source repository's\n" | |||
|
5184 | " parent changeset (applicable for local source repositories only).\n" | |||
|
5185 | "\n" | |||
|
5186 | " A set of changesets (tags, or branch names) to pull may be specified\n" | |||
|
5187 | " by listing each changeset (tag, or branch name) with -r/--rev.\n" | |||
|
5188 | " If -r/--rev is used, the cloned repository will contain only a subset\n" | |||
|
5189 | " of the changesets of the source repository. Only the set of changesets\n" | |||
|
5190 | " defined by all -r/--rev options (including their direct and indirect\n" | |||
|
5191 | " parent changesets) will be pulled into the destination repository.\n" | |||
|
5192 | " No subsequent changesets (including subsequent tags) will be present\n" | |||
|
5193 | " in the destination.\n" | |||
|
5194 | "\n" | |||
|
5195 | " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" | |||
|
5196 | " local source repositories.\n" | |||
|
5197 | "\n" | |||
5075 | " For efficiency, hardlinks are used for cloning whenever the source\n" |
|
5198 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
5076 | " and destination are on the same filesystem (note this applies only\n" |
|
5199 | " and destination are on the same filesystem (note this applies only\n" | |
5077 | " to the repository data, not to the checked out files). Some\n" |
|
5200 | " to the repository data, not to the checked out files). Some\n" | |
@@ -5102,18 +5225,35 b' msgstr ""' | |||||
5102 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
5225 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" | |
5103 | " som standardplats att användas för framtida dragningar.\n" |
|
5226 | " som standardplats att användas för framtida dragningar.\n" | |
5104 | "\n" |
|
5227 | "\n" | |
5105 | " Om du använder flaggan -r/--rev för att klona fram till en specifik\n" |
|
|||
5106 | " revision, kommer inga efterföljande revisioner (inklusive efterföljande\n" |
|
|||
5107 | " märken) att finnas i det klonade arkivet. Denna flagga använder\n" |
|
|||
5108 | " automatiskt --pull, även för lokala arkiv.\n" |
|
|||
5109 | "\n" |
|
|||
5110 | " Som standard kommer clone att hämta ut toppen i grenen 'default'. Om\n" |
|
|||
5111 | " flaggan -U/--noupdate används, kommer den nya klonen bara att innehålla\n" |
|
|||
5112 | " ett arkiv (.hg) och igen arbetskopia (arbetskopians förälder är\n" |
|
|||
5113 | " null-revisionen.\n" |
|
|||
5114 | "\n" |
|
|||
5115 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
5228 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" | |
5116 | "\n" |
|
5229 | "\n" | |
|
5230 | " Det är möjligt att specificera en ssh://-URL som destination, men ingen\n" | |||
|
5231 | " .hg/hgrc och arbetskatalog skapas på fjärrsidan. Se 'hg help urls' för\n" | |||
|
5232 | " viktiga detaljer om ssh://-URLer.\n" | |||
|
5233 | "\n" | |||
|
5234 | " Om alternativet -U/--noupdate är angivet, kommer den nya klonen bara\n" | |||
|
5235 | " att innehålla ett arkiv (.hg) och ingen arbetskopia (arbetskopians\n" | |||
|
5236 | " förälder kommer att vara null-ändringen). Annars kommer klonen initialt\n" | |||
|
5237 | " att hämta ut (i prioritetsordning):\n" | |||
|
5238 | "\n" | |||
|
5239 | " a) ändringen, taggen eller grenen specificerad med -u/--updaterev\n" | |||
|
5240 | " b) ändringen, taggen eller grenen given med den första -r/--rev\n" | |||
|
5241 | " c) huvudet på grenen 'default'\n" | |||
|
5242 | "\n" | |||
|
5243 | " Använd 'hg clone -u . källa dst' för att hämta ut källkodsarkivets\n" | |||
|
5244 | " föräldraänrding (gäller bara för lokala arkiv).\n" | |||
|
5245 | "\n" | |||
|
5246 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" | |||
|
5247 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" | |||
|
5248 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" | |||
|
5249 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" | |||
|
5250 | " -r/--rev (inklusive direkta och indirekta föräldrar) kommer att dras in\n" | |||
|
5251 | " i destinationsarkivet. Inga efterföljande ändringar (inklusive\n" | |||
|
5252 | " efterföljande märken) kommer att finnas i destinationen.\n" | |||
|
5253 | "\n" | |||
|
5254 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" | |||
|
5255 | " --pull, även för lokala arkiv.\n" | |||
|
5256 | "\n" | |||
5117 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
5257 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" | |
5118 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
5258 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" | |
5119 | " inte de uthämtade filerna). Vissa filsystem såsom AFS implementerar\n" |
|
5259 | " inte de uthämtade filerna). Vissa filsystem såsom AFS implementerar\n" | |
@@ -5133,6 +5273,9 b' msgstr ""' | |||||
5133 | " under katalogen .hg, som mq.\n" |
|
5273 | " under katalogen .hg, som mq.\n" | |
5134 | " " |
|
5274 | " " | |
5135 |
|
5275 | |||
|
5276 | msgid "cannot specify both --noupdate and --updaterev" | |||
|
5277 | msgstr "kan inte ange både --noupdate och --updaterev" | |||
|
5278 | ||||
5136 | msgid "" |
|
5279 | msgid "" | |
5137 | "commit the specified files or all outstanding changes\n" |
|
5280 | "commit the specified files or all outstanding changes\n" | |
5138 | "\n" |
|
5281 | "\n" | |
@@ -5670,6 +5813,9 b' msgstr ""' | |||||
5670 | "grundläggande kommandon:\n" |
|
5813 | "grundläggande kommandon:\n" | |
5671 | "\n" |
|
5814 | "\n" | |
5672 |
|
5815 | |||
|
5816 | msgid "DEPRECATED" | |||
|
5817 | msgstr "FÖRLEGAD" | |||
|
5818 | ||||
5673 | msgid "" |
|
5819 | msgid "" | |
5674 | "\n" |
|
5820 | "\n" | |
5675 | "additional help topics:\n" |
|
5821 | "additional help topics:\n" | |
@@ -5698,7 +5844,8 b' msgstr ""' | |||||
5698 | msgid "" |
|
5844 | msgid "" | |
5699 | "import an ordered set of patches\n" |
|
5845 | "import an ordered set of patches\n" | |
5700 | "\n" |
|
5846 | "\n" | |
5701 |
" Import a list of patches and commit them individually |
|
5847 | " Import a list of patches and commit them individually (unless\n" | |
|
5848 | " --no-commit is specified).\n" | |||
5702 | "\n" |
|
5849 | "\n" | |
5703 | " If there are outstanding changes in the working directory, import\n" |
|
5850 | " If there are outstanding changes in the working directory, import\n" | |
5704 | " will abort unless given the -f/--force flag.\n" |
|
5851 | " will abort unless given the -f/--force flag.\n" | |
@@ -6163,14 +6310,16 b' msgstr ""' | |||||
6163 | msgid "" |
|
6310 | msgid "" | |
6164 | "retry file merges from a merge or update\n" |
|
6311 | "retry file merges from a merge or update\n" | |
6165 | "\n" |
|
6312 | "\n" | |
6166 |
" This command |
|
6313 | " This command can cleanly retry unresolved file merges using file\n" | |
6167 |
" revisions preserved from the last update or merge. |
|
6314 | " revisions preserved from the last update or merge.\n" | |
6168 | " resolve all unresolved files, use the -a/--all switch.\n" |
|
|||
6169 | "\n" |
|
6315 | "\n" | |
6170 | " If a conflict is resolved manually, please note that the changes\n" |
|
6316 | " If a conflict is resolved manually, please note that the changes\n" | |
6171 | " will be overwritten if the merge is retried with resolve. The\n" |
|
6317 | " will be overwritten if the merge is retried with resolve. The\n" | |
6172 | " -m/--mark switch should be used to mark the file as resolved.\n" |
|
6318 | " -m/--mark switch should be used to mark the file as resolved.\n" | |
6173 | "\n" |
|
6319 | "\n" | |
|
6320 | " You can specify a set of files to operate on, or use the -a/-all\n" | |||
|
6321 | " switch to select all unresolved files.\n" | |||
|
6322 | "\n" | |||
6174 | " This command also allows listing resolved files and manually\n" |
|
6323 | " This command also allows listing resolved files and manually\n" | |
6175 | " indicating whether or not files are resolved. All files must be\n" |
|
6324 | " indicating whether or not files are resolved. All files must be\n" | |
6176 | " marked as resolved before a commit is permitted.\n" |
|
6325 | " marked as resolved before a commit is permitted.\n" | |
@@ -6562,58 +6711,68 b' msgid ""' | |||||
6562 | "update working directory\n" |
|
6711 | "update working directory\n" | |
6563 | "\n" |
|
6712 | "\n" | |
6564 | " Update the repository's working directory to the specified\n" |
|
6713 | " Update the repository's working directory to the specified\n" | |
6565 | " revision, or the tip of the current branch if none is specified.\n" |
|
6714 | " changeset.\n" | |
6566 | " Use null as the revision to remove the working copy (like 'hg\n" |
|
6715 | "\n" | |
|
6716 | " If no changeset is specified, attempt to update to the head of the\n" | |||
|
6717 | " current branch. If this head is a descendant of the working\n" | |||
|
6718 | " directory's parent, update to it, otherwise abort.\n" | |||
|
6719 | "\n" | |||
|
6720 | " The following rules apply when the working directory contains\n" | |||
|
6721 | " uncommitted changes:\n" | |||
|
6722 | "\n" | |||
|
6723 | " 1. If neither -c/--check nor -C/--clean is specified, uncommitted\n" | |||
|
6724 | " changes are merged into the requested changeset, and the merged " | |||
|
6725 | "result\n" | |||
|
6726 | " is left uncommitted. Updating and merging will occur only if the\n" | |||
|
6727 | " requested changeset is an ancestor or descendant of the parent\n" | |||
|
6728 | " changeset. Otherwise, the update is aborted and the uncommitted " | |||
|
6729 | "changes\n" | |||
|
6730 | " are preserved.\n" | |||
|
6731 | "\n" | |||
|
6732 | " 2. With the -c/--check option, the update is aborted and the\n" | |||
|
6733 | " uncommitted changes are preserved.\n" | |||
|
6734 | "\n" | |||
|
6735 | " 3. With the -C/--clean option, uncommitted changes are discarded and\n" | |||
|
6736 | " the working directory is updated to the requested changeset.\n" | |||
|
6737 | "\n" | |||
|
6738 | " Use null as the changeset to remove the working directory (like 'hg\n" | |||
6567 | " clone -U').\n" |
|
6739 | " clone -U').\n" | |
6568 | "\n" |
|
6740 | "\n" | |
6569 | " When the working directory contains no uncommitted changes, it\n" |
|
6741 | " If you want to update just one file to an older changeset, use 'hg " | |
6570 | " will be replaced by the state of the requested revision from the\n" |
|
6742 | "revert'.\n" | |
6571 | " repository. When the requested revision is on a different branch,\n" |
|
|||
6572 | " the working directory will additionally be switched to that\n" |
|
|||
6573 | " branch.\n" |
|
|||
6574 | "\n" |
|
|||
6575 | " When there are uncommitted changes, use option -C/--clean to\n" |
|
|||
6576 | " discard them, forcibly replacing the state of the working\n" |
|
|||
6577 | " directory with the requested revision. Alternately, use -c/--check\n" |
|
|||
6578 | " to abort.\n" |
|
|||
6579 | "\n" |
|
|||
6580 | " When there are uncommitted changes and option -C/--clean is not\n" |
|
|||
6581 | " used, and the parent revision and requested revision are on the\n" |
|
|||
6582 | " same branch, and one of them is an ancestor of the other, then the\n" |
|
|||
6583 | " new working directory will contain the requested revision merged\n" |
|
|||
6584 | " with the uncommitted changes. Otherwise, the update will fail with\n" |
|
|||
6585 | " a suggestion to use 'merge' or 'update -C' instead.\n" |
|
|||
6586 | "\n" |
|
|||
6587 | " If you want to update just one file to an older revision, use\n" |
|
|||
6588 | " revert.\n" |
|
|||
6589 | "\n" |
|
6743 | "\n" | |
6590 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
6744 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" | |
6591 | " " |
|
6745 | " " | |
6592 | msgstr "" |
|
6746 | msgstr "" | |
6593 | "uppdatera arbetskatalog\n" |
|
6747 | "uppdatera arbetskatalogen\n" | |
6594 | "\n" |
|
6748 | "\n" | |
6595 |
" Uppdatera arkivets arbetskatalog till den specificerade r |
|
6749 | " Uppdatera arkivets arbetskatalog till den specificerade ändringen.\n" | |
6596 | " eller toppen av den nuvarande grenen om ingen anges. Använd null som\n" |
|
6750 | "\n" | |
6597 | " revision för att ta bort arbetskopian (som 'hg clone -U').\n" |
|
6751 | " Om ingen ändring specificeras, kommer ett försök att göras för att\n" | |
6598 | "\n" |
|
6752 | " hämta ut huvudet på den nuvarande grenen. Om huvudet är en ättling till\n" | |
6599 | " När arbetskatalogen inte innehåller oarkiverade ändringar, ersätts\n" |
|
6753 | " den nuvarande grenen, uppdatera till det, annars avbryt.\n" | |
6600 | " den med tillståndet för den begärda revisionen från arkivet. När den\n" |
|
6754 | "\n" | |
6601 | " begärda revisionen är i en annan gren, kommer arbetskatalogen att växla\n" |
|
6755 | " Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" | |
6602 | " till den grenen.\n" |
|
6756 | " ändringar:\n" | |
6603 | "\n" |
|
6757 | "\n" | |
6604 | " När det finns oarkiverade ändringar, använd flaggan -C/--clean för att\n" |
|
6758 | " 1. Om varken -c/--check eller -C/--clean specificeras, kommer\n" | |
6605 | " kassera dem, och tvinga tillståndet i arbetskatalogen till den begärda\n" |
|
6759 | " oarkiverade ändringar att sammanfogas med den begärda ändringen,\n" | |
6606 | " revisionen. Alternativt, använd -c/--check för att avbryta.\n" |
|
6760 | " och det sammanfogade resultatet lämnas oarkiverat. Uppdatering och\n" | |
6607 | "\n" |
|
6761 | " sammanfogning kommer bara att göras om den begärda ändringen är en\n" | |
6608 | " När det finns oarkiverade ändringar och flaggan -C/--clean inte " |
|
6762 | " anfader eller ättling till föräldraändringen. Om inte, avbryts\n" | |
6609 | "används,\n" |
|
6763 | " uppdateringen och de oarkiverade ändringarna lämnas.\n" | |
6610 | " och föräldrarevisionen och den begärda revisionen är på samma gren, och\n" |
|
6764 | "\n" | |
6611 | " en av dem är en anfäder till den andre, kommer arbetskatalogen att\n" |
|
6765 | " 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" | |
6612 | " innehålla den begärda revisionen sammanfogad med de oarkiverade\n" |
|
6766 | " ändringarna lämnas.\n" | |
6613 | " ändringarna. Om inte, kommer uppdateringen att misslyckas med ett\n" |
|
6767 | "\n" | |
6614 | " förslag att använda 'merge' eller 'update -C' istället.\n" |
|
6768 | " 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras och\n" | |
6615 | "\n" |
|
6769 | " arbetskatalogen uppdateras till den begärda ändringen.\n" | |
6616 | " Om du vill uppdatera bara en fil till en äldre revision, använd revert.\n" |
|
6770 | "\n" | |
|
6771 | " Använd null som ändring för att radera arbetskatalogen (som 'hg clone\n" | |||
|
6772 | " -U').\n" | |||
|
6773 | "\n" | |||
|
6774 | " Om du vill uppdatera bara en fil till en äldre ändring, använd 'hg\n" | |||
|
6775 | " revert'.\n" | |||
6617 | "\n" |
|
6776 | "\n" | |
6618 | " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" |
|
6777 | " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" | |
6619 | " " |
|
6778 | " " | |
@@ -6680,8 +6839,8 b' msgstr "s\xc3\xa4tt teckenkodning"' | |||||
6680 | msgid "set the charset encoding mode" |
|
6839 | msgid "set the charset encoding mode" | |
6681 | msgstr "sätt teckenkodningsläge" |
|
6840 | msgstr "sätt teckenkodningsläge" | |
6682 |
|
6841 | |||
6683 | msgid "print traceback on exception" |
|
6842 | msgid "always print a traceback on exception" | |
6684 |
msgstr "visa bakåtspårning vid undanta |
|
6843 | msgstr "visa alltid bakåtspårning vid undantag" | |
6685 |
|
6844 | |||
6686 | msgid "time how long the command takes" |
|
6845 | msgid "time how long the command takes" | |
6687 | msgstr "ta tid på hud lång tid kommandot körs" |
|
6846 | msgstr "ta tid på hud lång tid kommandot körs" | |
@@ -6740,6 +6899,9 b' msgstr "inkludera inte datum i diff-rubr' | |||||
6740 | msgid "show which function each change is in" |
|
6899 | msgid "show which function each change is in" | |
6741 | msgstr "visa vilken funktion varje ändring är i" |
|
6900 | msgstr "visa vilken funktion varje ändring är i" | |
6742 |
|
6901 | |||
|
6902 | msgid "produce a diff that undoes the changes" | |||
|
6903 | msgstr "skapa en diff som ångrar ändringarna" | |||
|
6904 | ||||
6743 | msgid "ignore white space when comparing lines" |
|
6905 | msgid "ignore white space when comparing lines" | |
6744 | msgstr "ignorera blanktecken när rader jämförs" |
|
6906 | msgstr "ignorera blanktecken när rader jämförs" | |
6745 |
|
6907 | |||
@@ -6752,6 +6914,9 b' msgstr "ignorera \xc3\xa4ndringar vars rader \xc3\xa4r tomma"' | |||||
6752 | msgid "number of lines of context to show" |
|
6914 | msgid "number of lines of context to show" | |
6753 | msgstr "antal sammanhangsrader att visa" |
|
6915 | msgstr "antal sammanhangsrader att visa" | |
6754 |
|
6916 | |||
|
6917 | msgid "output diffstat-style summary of changes" | |||
|
6918 | msgstr "visa sammanfattning av ändringar i diffstat-stil" | |||
|
6919 | ||||
6755 | msgid "guess renamed files by similarity (0<=s<=100)" |
|
6920 | msgid "guess renamed files by similarity (0<=s<=100)" | |
6756 | msgstr "" |
|
6921 | msgstr "" | |
6757 |
|
6922 | |||
@@ -6881,6 +7046,9 b' msgstr "[FLAGGA]... FIL..."' | |||||
6881 | msgid "the clone will only contain a repository (no working copy)" |
|
7046 | msgid "the clone will only contain a repository (no working copy)" | |
6882 | msgstr "klonen kommer bara att ha arkivet (ingen arbetskopia)" |
|
7047 | msgstr "klonen kommer bara att ha arkivet (ingen arbetskopia)" | |
6883 |
|
7048 | |||
|
7049 | msgid "revision, tag or branch to check out" | |||
|
7050 | msgstr "revision, märke eller gren att hämta ut" | |||
|
7051 | ||||
6884 | msgid "a changeset you would like to have after cloning" |
|
7052 | msgid "a changeset you would like to have after cloning" | |
6885 | msgstr "en ändring du skulle vilja ha efter kloning" |
|
7053 | msgstr "en ändring du skulle vilja ha efter kloning" | |
6886 |
|
7054 | |||
@@ -7049,8 +7217,8 b' msgstr ""' | |||||
7049 | msgid "file to store the bundles into" |
|
7217 | msgid "file to store the bundles into" | |
7050 | msgstr "" |
|
7218 | msgstr "" | |
7051 |
|
7219 | |||
7052 | msgid "a specific revision up to which you would like to pull" |
|
7220 | msgid "a specific remote revision up to which you would like to pull" | |
7053 | msgstr "en specifik revision upp till vilken du vill dra" |
|
7221 | msgstr "en specifik fjärrrevision upp till vilken du vill dra" | |
7054 |
|
7222 | |||
7055 | msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" |
|
7223 | msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" | |
7056 | msgstr "" |
|
7224 | msgstr "" | |
@@ -7157,8 +7325,8 b' msgstr ""' | |||||
7157 | msgid "[OPTION]... SOURCE... DEST" |
|
7325 | msgid "[OPTION]... SOURCE... DEST" | |
7158 | msgstr "" |
|
7326 | msgstr "" | |
7159 |
|
7327 | |||
7160 |
msgid " |
|
7328 | msgid "select all unresolved files" | |
7161 | msgstr "" |
|
7329 | msgstr "välj alla olösta filer" | |
7162 |
|
7330 | |||
7163 | msgid "list state of files needing merge" |
|
7331 | msgid "list state of files needing merge" | |
7164 | msgstr "" |
|
7332 | msgstr "" | |
@@ -7169,6 +7337,9 b' msgstr ""' | |||||
7169 | msgid "unmark files as resolved" |
|
7337 | msgid "unmark files as resolved" | |
7170 | msgstr "" |
|
7338 | msgstr "" | |
7171 |
|
7339 | |||
|
7340 | msgid "hide status prefix" | |||
|
7341 | msgstr "göm statusprefix" | |||
|
7342 | ||||
7172 | msgid "revert all changes when no arguments given" |
|
7343 | msgid "revert all changes when no arguments given" | |
7173 | msgstr "" |
|
7344 | msgstr "" | |
7174 |
|
7345 | |||
@@ -7253,9 +7424,6 b' msgstr "visa bara ok\xc3\xa4nda (osp\xc3\xa5rade) filer"' | |||||
7253 | msgid "show only ignored files" |
|
7424 | msgid "show only ignored files" | |
7254 | msgstr "visa bara ignorerade filer" |
|
7425 | msgstr "visa bara ignorerade filer" | |
7255 |
|
7426 | |||
7256 | msgid "hide status prefix" |
|
|||
7257 | msgstr "göm statusprefix" |
|
|||
7258 |
|
||||
7259 | msgid "show source of copied files" |
|
7427 | msgid "show source of copied files" | |
7260 | msgstr "visa källan för kopierade filer" |
|
7428 | msgstr "visa källan för kopierade filer" | |
7261 |
|
7429 | |||
@@ -7286,14 +7454,14 b' msgstr ""' | |||||
7286 | msgid "[-u] FILE..." |
|
7454 | msgid "[-u] FILE..." | |
7287 | msgstr "" |
|
7455 | msgstr "" | |
7288 |
|
7456 | |||
7289 | msgid "overwrite locally modified files (no backup)" |
|
7457 | msgid "discard uncommitted changes (no backup)" | |
7290 |
msgstr " |
|
7458 | msgstr "kassera oarkiverade ändringar (ingen backup)" | |
7291 |
|
7459 | |||
7292 | msgid "check for uncommitted changes" |
|
7460 | msgid "check for uncommitted changes" | |
7293 | msgstr "leta efter icke arkiverade ändringar" |
|
7461 | msgstr "leta efter icke arkiverade ändringar" | |
7294 |
|
7462 | |||
7295 | msgid "[-C] [-d DATE] [[-r] REV]" |
|
7463 | msgid "[-c] [-C] [-d DATE] [[-r] REV]" | |
7296 | msgstr "[-C] [-d DATUM] [[-r] REV]" |
|
7464 | msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" | |
7297 |
|
7465 | |||
7298 | #, python-format |
|
7466 | #, python-format | |
7299 | msgid "config error at %s:%d: '%s'" |
|
7467 | msgid "config error at %s:%d: '%s'" | |
@@ -7565,6 +7733,9 b' msgstr ""' | |||||
7565 | msgid "disabled extensions:" |
|
7733 | msgid "disabled extensions:" | |
7566 | msgstr "" |
|
7734 | msgstr "" | |
7567 |
|
7735 | |||
|
7736 | msgid "Configuration Files" | |||
|
7737 | msgstr "" | |||
|
7738 | ||||
7568 | msgid "Date Formats" |
|
7739 | msgid "Date Formats" | |
7569 | msgstr "" |
|
7740 | msgstr "" | |
7570 |
|
7741 | |||
@@ -7724,8 +7895,16 b' msgid "real URL is %s\\n"' | |||||
7724 | msgstr "" |
|
7895 | msgstr "" | |
7725 |
|
7896 | |||
7726 | #, python-format |
|
7897 | #, python-format | |
7727 | msgid "'%s' does not appear to be an hg repository" |
|
7898 | msgid "" | |
7728 | msgstr "" |
|
7899 | "'%s' does not appear to be an hg repository:\n" | |
|
7900 | "---%%<--- (%s)\n" | |||
|
7901 | "%s\n" | |||
|
7902 | "---%%<---\n" | |||
|
7903 | msgstr "" | |||
|
7904 | "'%s' verkar inte vara ett hg-arkiv:\n" | |||
|
7905 | "---%%<--- (%s)\n" | |||
|
7906 | "%s\n" | |||
|
7907 | "---%%<---\n" | |||
7729 |
|
7908 | |||
7730 | #, python-format |
|
7909 | #, python-format | |
7731 | msgid "'%s' sent a broken Content-Type header (%s)" |
|
7910 | msgid "'%s' sent a broken Content-Type header (%s)" | |
@@ -7796,7 +7975,7 b' msgstr ""' | |||||
7796 | msgid "unknown revision '%s'" |
|
7975 | msgid "unknown revision '%s'" | |
7797 | msgstr "" |
|
7976 | msgstr "" | |
7798 |
|
7977 | |||
7799 | msgid "journal already exists - run hg recover" |
|
7978 | msgid "abandoned transaction found - run hg recover" | |
7800 | msgstr "" |
|
7979 | msgstr "" | |
7801 |
|
7980 | |||
7802 | msgid "rolling back interrupted transaction\n" |
|
7981 | msgid "rolling back interrupted transaction\n" | |
@@ -8101,13 +8280,12 b' msgstr ""' | |||||
8101 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" |
|
8280 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" | |
8102 | msgstr "" |
|
8281 | msgstr "" | |
8103 |
|
8282 | |||
8104 | msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" |
|
8283 | msgid "" | |
8105 | msgstr "" |
|
8284 | "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " | |
8106 |
|
8285 | "changes)" | ||
8107 | msgid "crosses branches (use 'hg merge' or 'hg update -C')" |
|
8286 | msgstr "" | |
8108 | msgstr "" |
|
8287 | ||
8109 |
|
8288 | msgid "crosses branches (use 'hg merge' or use 'hg update -c')" | ||
8110 | msgid "crosses named branches (use 'hg update -C' to discard changes)" |
|
|||
8111 | msgstr "" |
|
8289 | msgstr "" | |
8112 |
|
8290 | |||
8113 | #, python-format |
|
8291 | #, python-format | |
@@ -8284,6 +8462,10 b' msgstr ""' | |||||
8284 | msgid "unsynced changes" |
|
8462 | msgid "unsynced changes" | |
8285 | msgstr "" |
|
8463 | msgstr "" | |
8286 |
|
8464 | |||
|
8465 | #, python-format | |||
|
8466 | msgid "'%s' does not appear to be an hg repository" | |||
|
8467 | msgstr "" | |||
|
8468 | ||||
8287 | msgid "cannot lock static-http repository" |
|
8469 | msgid "cannot lock static-http repository" | |
8288 | msgstr "" |
|
8470 | msgstr "" | |
8289 |
|
8471 | |||
@@ -8396,7 +8578,7 b' msgstr ""' | |||||
8396 | msgid "No username found, using '%s' instead\n" |
|
8578 | msgid "No username found, using '%s' instead\n" | |
8397 | msgstr "" |
|
8579 | msgstr "" | |
8398 |
|
8580 | |||
8399 | msgid "Please specify a username." |
|
8581 | msgid "no username supplied (see \"hg help config\")" | |
8400 | msgstr "" |
|
8582 | msgstr "" | |
8401 |
|
8583 | |||
8402 | #, python-format |
|
8584 | #, python-format | |
@@ -8569,6 +8751,9 b' msgstr ""' | |||||
8569 | msgid "duplicate revision %d (%d)" |
|
8751 | msgid "duplicate revision %d (%d)" | |
8570 | msgstr "" |
|
8752 | msgstr "" | |
8571 |
|
8753 | |||
|
8754 | msgid "abandoned transaction found - run hg recover\n" | |||
|
8755 | msgstr "" | |||
|
8756 | ||||
8572 | #, python-format |
|
8757 | #, python-format | |
8573 | msgid "repository uses revlog format %d\n" |
|
8758 | msgid "repository uses revlog format %d\n" | |
8574 | msgstr "arkivet använder revlog-format %d\n" |
|
8759 | msgstr "arkivet använder revlog-format %d\n" |
General Comments 0
You need to be logged in to leave comments.
Login now