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-11- |
|
16 | "POT-Creation-Date: 2009-11-22 19:02+0100\n" | |
17 |
"PO-Revision-Date: 2009-11- |
|
17 | "PO-Revision-Date: 2009-11-22 19:12+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" | |
@@ -92,37 +92,37 b' msgid ""' | |||||
92 | "- backout, commit, import, tag: Specify the commit date.\n" |
|
92 | "- backout, commit, import, tag: Specify the commit date.\n" | |
93 | "- log, revert, update: Select revision(s) by date.\n" |
|
93 | "- log, revert, update: Select revision(s) by date.\n" | |
94 | "\n" |
|
94 | "\n" | |
95 |
"Many date formats are valid. Here are some examples: |
|
95 | "Many date formats are valid. Here are some examples:\n" | |
96 | "\n" |
|
96 | "\n" | |
97 |
" |
|
97 | "- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)\n" | |
98 |
" |
|
98 | "- ``Dec 6 13:18 -0600`` (year assumed, time offset provided)\n" | |
99 |
" |
|
99 | "- ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000)\n" | |
100 |
" |
|
100 | "- ``Dec 6`` (midnight)\n" | |
101 |
" |
|
101 | "- ``13:18`` (today assumed)\n" | |
102 |
" |
|
102 | "- ``3:39`` (3:39AM assumed)\n" | |
103 |
" |
|
103 | "- ``3:39pm`` (15:39)\n" | |
104 |
" |
|
104 | "- ``2006-12-06 13:18:29`` (ISO 8601 format)\n" | |
105 |
" |
|
105 | "- ``2006-12-6 13:18``\n" | |
106 |
" |
|
106 | "- ``2006-12-6``\n" | |
107 |
" |
|
107 | "- ``12-6``\n" | |
108 |
" |
|
108 | "- ``12/6``\n" | |
109 |
" |
|
109 | "- ``12/6/6`` (Dec 6 2006)\n" | |
110 | "\n" |
|
110 | "\n" | |
111 |
"Lastly, there is Mercurial's internal format: |
|
111 | "Lastly, there is Mercurial's internal format:\n" | |
112 | "\n" |
|
112 | "\n" | |
113 |
" |
|
113 | "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)\n" | |
114 | "\n" |
|
114 | "\n" | |
115 | "This is the internal representation format for dates. unixtime is the\n" |
|
115 | "This is the internal representation format for dates. unixtime is the\n" | |
116 | "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" |
|
116 | "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" | |
117 | "the offset of the local timezone, in seconds west of UTC (negative if\n" |
|
117 | "the offset of the local timezone, in seconds west of UTC (negative if\n" | |
118 | "the timezone is east of UTC).\n" |
|
118 | "the timezone is east of UTC).\n" | |
119 | "\n" |
|
119 | "\n" | |
120 |
"The log command also accepts date ranges: |
|
120 | "The log command also accepts date ranges:\n" | |
121 | "\n" |
|
121 | "\n" | |
122 |
" |
|
122 | "- ``<{datetime}`` - at or before a given date/time\n" | |
123 |
" |
|
123 | "- ``>{datetime}`` - on or after a given date/time\n" | |
124 |
" |
|
124 | "- ``{datetime} to {datetime}`` - a date range, inclusive\n" | |
125 |
" |
|
125 | "- ``-{days}`` - within a given number of days of today\n" | |
126 | msgstr "" |
|
126 | msgstr "" | |
127 |
|
127 | |||
128 | msgid "" |
|
128 | msgid "" | |
@@ -1599,6 +1599,11 b' msgstr ""' | |||||
1599 | msgid "Mercurial failed to run itself, check hg executable is in PATH" |
|
1599 | msgid "Mercurial failed to run itself, check hg executable is in PATH" | |
1600 | msgstr "" |
|
1600 | msgstr "" | |
1601 |
|
1601 | |||
|
1602 | msgid "" | |||
|
1603 | "svn: cannot probe remote repository, assume it could be a subversion " | |||
|
1604 | "repository. Use --source-type if you know better.\n" | |||
|
1605 | msgstr "" | |||
|
1606 | ||||
1602 | msgid "Subversion python bindings could not be loaded" |
|
1607 | msgid "Subversion python bindings could not be loaded" | |
1603 | msgstr "" |
|
1608 | msgstr "" | |
1604 |
|
1609 | |||
@@ -3118,7 +3123,8 b' msgid ""' | |||||
3118 | " With arguments, set guards for the named patch.\n" |
|
3123 | " With arguments, set guards for the named patch.\n" | |
3119 | " NOTE: Specifying negative guards now requires '--'.\n" |
|
3124 | " NOTE: Specifying negative guards now requires '--'.\n" | |
3120 | "\n" |
|
3125 | "\n" | |
3121 | " To set guards on another patch:\n" |
|
3126 | " To set guards on another patch::\n" | |
|
3127 | "\n" | |||
3122 | " hg qguard -- other.patch +2.6.17 -stable\n" |
|
3128 | " hg qguard -- other.patch +2.6.17 -stable\n" | |
3123 | " " |
|
3129 | " " | |
3124 | msgstr "" |
|
3130 | msgstr "" | |
@@ -3213,7 +3219,7 b' msgid ""' | |||||
3213 | " qselect to tell mq which guards to use. A patch will be pushed if\n" |
|
3219 | " qselect to tell mq which guards to use. A patch will be pushed if\n" | |
3214 | " it has no guards or any positive guards match the currently\n" |
|
3220 | " it has no guards or any positive guards match the currently\n" | |
3215 | " selected guard, but will not be pushed if any negative guards\n" |
|
3221 | " selected guard, but will not be pushed if any negative guards\n" | |
3216 | " match the current guard. For example:\n" |
|
3222 | " match the current guard. For example::\n" | |
3217 | "\n" |
|
3223 | "\n" | |
3218 | " qguard foo.patch -stable (negative guard)\n" |
|
3224 | " qguard foo.patch -stable (negative guard)\n" | |
3219 | " qguard bar.patch +stable (positive guard)\n" |
|
3225 | " qguard bar.patch +stable (positive guard)\n" | |
@@ -3663,10 +3669,13 b' msgid ""' | |||||
3663 | " ignore = version, help, update\n" |
|
3669 | " ignore = version, help, update\n" | |
3664 | "\n" |
|
3670 | "\n" | |
3665 | "You can also enable the pager only for certain commands using\n" |
|
3671 | "You can also enable the pager only for certain commands using\n" | |
3666 | "pager.attend::\n" |
|
3672 | "pager.attend. Below is the default list of commands to be paged::\n" | |
3667 | "\n" |
|
3673 | "\n" | |
3668 | " [pager]\n" |
|
3674 | " [pager]\n" | |
3669 | " attend = log\n" |
|
3675 | " attend = annotate, cat, diff, export, glog, log, qdiff\n" | |
|
3676 | "\n" | |||
|
3677 | "Setting pager.attend to an empty value will cause all commands to be\n" | |||
|
3678 | "paged.\n" | |||
3670 | "\n" |
|
3679 | "\n" | |
3671 | "If pager.attend is present, pager.ignore will be ignored.\n" |
|
3680 | "If pager.attend is present, pager.ignore will be ignored.\n" | |
3672 | "\n" |
|
3681 | "\n" | |
@@ -4161,9 +4170,6 b' msgstr ""' | |||||
4161 | msgid " and " |
|
4170 | msgid " and " | |
4162 | msgstr "" |
|
4171 | msgstr "" | |
4163 |
|
4172 | |||
4164 | msgid "y" |
|
|||
4165 | msgstr "" |
|
|||
4166 |
|
||||
4167 | #, python-format |
|
4173 | #, python-format | |
4168 | msgid "record this change to %r?" |
|
4174 | msgid "record this change to %r?" | |
4169 | msgstr "" |
|
4175 | msgstr "" | |
@@ -4222,32 +4228,27 b' msgstr ""' | |||||
4222 | msgid "" |
|
4228 | msgid "" | |
4223 | "recreate hardlinks between two repositories\n" |
|
4229 | "recreate hardlinks between two repositories\n" | |
4224 | "\n" |
|
4230 | "\n" | |
4225 |
" When repositories are cloned locally, their data files will be |
|
4231 | " When repositories are cloned locally, their data files will be\n" | |
4226 | "hardlinked\n" |
|
4232 | " hardlinked so that they only use the space of a single repository.\n" | |
4227 | " so that they only use the space of a single repository.\n" |
|
4233 | "\n" | |
4228 | "\n" |
|
4234 | " Unfortunately, subsequent pulls into either repository will break\n" | |
4229 | " Unfortunately, subsequent pulls into either repository will break " |
|
4235 | " hardlinks for any files touched by the new changesets, even if\n" | |
4230 | "hardlinks\n" |
|
4236 | " both repositories end up pulling the same changes.\n" | |
4231 | " for any files touched by the new changesets, even if both repositories " |
|
4237 | "\n" | |
4232 | "end\n" |
|
4238 | " Similarly, passing --rev to \"hg clone\" will fail to use any\n" | |
4233 | " up pulling the same changes.\n" |
|
4239 | " hardlinks, falling back to a complete copy of the source\n" | |
4234 | "\n" |
|
4240 | " repository.\n" | |
4235 | " Similarly, passing --rev to \"hg clone\" will fail to use\n" |
|
4241 | "\n" | |
4236 | " any hardlinks, falling back to a complete copy of the source " |
|
4242 | " This command lets you recreate those hardlinks and reclaim that\n" | |
4237 | "repository.\n" |
|
4243 | " wasted space.\n" | |
4238 | "\n" |
|
4244 | "\n" | |
4239 | " This command lets you recreate those hardlinks and reclaim that wasted\n" |
|
4245 | " This repository will be relinked to share space with ORIGIN, which\n" | |
4240 | " space.\n" |
|
4246 | " must be on the same local disk. If ORIGIN is omitted, looks for\n" | |
4241 | "\n" |
|
4247 | " \"default-relink\", then \"default\", in [paths].\n" | |
4242 | " This repository will be relinked to share space with ORIGIN, which must " |
|
4248 | "\n" | |
4243 | "be\n" |
|
4249 | " Do not attempt any read operations on this repository while the\n" | |
4244 | " on the same local disk. If ORIGIN is omitted, looks for \"default-relink" |
|
4250 | " command is running. (Both repositories will be locked against\n" | |
4245 | "\",\n" |
|
4251 | " writes.)\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 | " " | |
4252 | msgstr "" |
|
4253 | msgstr "" | |
4253 |
|
4254 | |||
@@ -4914,14 +4915,14 b' msgid ""' | |||||
4914 | " directory; use -r/--rev to specify a different revision.\n" |
|
4915 | " directory; use -r/--rev to specify a different revision.\n" | |
4915 | "\n" |
|
4916 | "\n" | |
4916 | " To specify the type of archive to create, use -t/--type. Valid\n" |
|
4917 | " To specify the type of archive to create, use -t/--type. Valid\n" | |
4917 |
" types are: |
|
4918 | " types are:\n" | |
4918 | "\n" |
|
4919 | "\n" | |
4919 |
" |
|
4920 | " :``files``: a directory full of files (default)\n" | |
4920 |
" |
|
4921 | " :``tar``: tar archive, uncompressed\n" | |
4921 |
" |
|
4922 | " :``tbz2``: tar archive, compressed using bzip2\n" | |
4922 |
" |
|
4923 | " :``tgz``: tar archive, compressed using gzip\n" | |
4923 |
" |
|
4924 | " :``uzip``: zip archive, uncompressed\n" | |
4924 |
" |
|
4925 | " :``zip``: zip archive, compressed using deflate\n" | |
4925 | "\n" |
|
4926 | "\n" | |
4926 | " The exact name of the destination archive or directory is given\n" |
|
4927 | " The exact name of the destination archive or directory is given\n" | |
4927 | " using a format string; see 'hg help export' for details.\n" |
|
4928 | " using a format string; see 'hg help export' for details.\n" | |
@@ -5146,11 +5147,11 b' msgid ""' | |||||
5146 | "\n" |
|
5147 | "\n" | |
5147 | " Output may be to a file, in which case the name of the file is\n" |
|
5148 | " Output may be to a file, in which case the name of the file is\n" | |
5148 | " given using a format string. The formatting rules are the same as\n" |
|
5149 | " given using a format string. The formatting rules are the same as\n" | |
5149 |
" for the export command, with the following additions: |
|
5150 | " for the export command, with the following additions:\n" | |
5150 | "\n" |
|
5151 | "\n" | |
5151 |
" |
|
5152 | " :``%s``: basename of file being printed\n" | |
5152 |
" |
|
5153 | " :``%d``: dirname of file being printed, or '.' if in repository root\n" | |
5153 |
" |
|
5154 | " :``%p``: root-relative path name of file being printed\n" | |
5154 | " " |
|
5155 | " " | |
5155 | msgstr "" |
|
5156 | msgstr "" | |
5156 |
|
5157 | |||
@@ -5176,9 +5177,9 b' msgid ""' | |||||
5176 | " will be the null changeset). Otherwise, clone will initially check\n" |
|
5177 | " will be the null changeset). Otherwise, clone will initially check\n" | |
5177 | " out (in order of precedence):\n" |
|
5178 | " out (in order of precedence):\n" | |
5178 | "\n" |
|
5179 | "\n" | |
5179 |
" |
|
5180 | " a) the changeset, tag or branch specified with -u/--updaterev\n" | |
5180 |
" |
|
5181 | " b) the changeset, tag or branch given with the first -r/--rev\n" | |
5181 |
" |
|
5182 | " c) the head of the default branch\n" | |
5182 | "\n" |
|
5183 | "\n" | |
5183 | " Use 'hg clone -u . src dst' to checkout the source repository's\n" |
|
5184 | " Use 'hg clone -u . src dst' to checkout the source repository's\n" | |
5184 | " parent changeset (applicable for local source repositories only).\n" |
|
5185 | " parent changeset (applicable for local source repositories only).\n" | |
@@ -5187,8 +5188,8 b' msgid ""' | |||||
5187 | " by listing each changeset (tag, or branch name) with -r/--rev.\n" |
|
5188 | " 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 | " 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 | " of the changesets of the source repository. Only the set of changesets\n" | |
5190 |
" defined by all -r/--rev options (including their |
|
5191 | " defined by all -r/--rev options (including all their ancestors)\n" | |
5191 |
" |
|
5192 | " will be pulled into the destination repository.\n" | |
5192 | " No subsequent changesets (including subsequent tags) will be present\n" |
|
5193 | " No subsequent changesets (including subsequent tags) will be present\n" | |
5193 | " in the destination.\n" |
|
5194 | " in the destination.\n" | |
5194 | "\n" |
|
5195 | "\n" | |
@@ -5236,9 +5237,9 b' msgstr ""' | |||||
5236 | " förälder kommer att vara null-ändringen). Annars kommer klonen initialt\n" |
|
5237 | " förälder kommer att vara null-ändringen). Annars kommer klonen initialt\n" | |
5237 | " att hämta ut (i prioritetsordning):\n" |
|
5238 | " att hämta ut (i prioritetsordning):\n" | |
5238 | "\n" |
|
5239 | "\n" | |
5239 |
" |
|
5240 | " a) ändringen, taggen eller grenen specificerad med -u/--updaterev\n" | |
5240 |
" |
|
5241 | " b) ändringen, taggen eller grenen given med den första -r/--rev\n" | |
5241 |
" |
|
5242 | " c) huvudet på grenen 'default'\n" | |
5242 | "\n" |
|
5243 | "\n" | |
5243 | " Använd 'hg clone -u . källa dst' för att hämta ut källkodsarkivets\n" |
|
5244 | " 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 | " föräldraänrding (gäller bara för lokala arkiv).\n" | |
@@ -5247,9 +5248,9 b' msgstr ""' | |||||
5247 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
5248 | " 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 | " 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 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" | |
5250 |
" -r/--rev ( |
|
5251 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" | |
5251 |
" |
|
5252 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" | |
5252 |
" |
|
5253 | " att finnas i destinationen.\n" | |
5253 | "\n" |
|
5254 | "\n" | |
5254 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
5255 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" | |
5255 | " --pull, även för lokala arkiv.\n" |
|
5256 | " --pull, även för lokala arkiv.\n" | |
@@ -5574,16 +5575,16 b' msgid ""' | |||||
5574 | " first parent only.\n" |
|
5575 | " first parent only.\n" | |
5575 | "\n" |
|
5576 | "\n" | |
5576 | " Output may be to a file, in which case the name of the file is\n" |
|
5577 | " Output may be to a file, in which case the name of the file is\n" | |
5577 |
" given using a format string. The formatting rules are as follows: |
|
5578 | " given using a format string. The formatting rules are as follows:\n" | |
5578 | "\n" |
|
5579 | "\n" | |
5579 |
" |
|
5580 | " :``%%``: literal \"%\" character\n" | |
5580 |
" |
|
5581 | " :``%H``: changeset hash (40 bytes of hexadecimal)\n" | |
5581 |
" |
|
5582 | " :``%N``: number of patches being generated\n" | |
5582 |
" |
|
5583 | " :``%R``: changeset revision number\n" | |
5583 |
" |
|
5584 | " :``%b``: basename of the exporting repository\n" | |
5584 |
" |
|
5585 | " :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n" | |
5585 |
" |
|
5586 | " :``%n``: zero-padded sequence number, starting at 1\n" | |
5586 |
" |
|
5587 | " :``%r``: zero-padded changeset revision number\n" | |
5587 | "\n" |
|
5588 | "\n" | |
5588 | " Without the -a/--text option, export will avoid generating diffs\n" |
|
5589 | " Without the -a/--text option, export will avoid generating diffs\n" | |
5589 | " of files it detects as binary. With -a, export will generate a\n" |
|
5590 | " of files it detects as binary. With -a, export will generate a\n" | |
@@ -5610,14 +5611,14 b' msgstr ""' | |||||
5610 | " Utmatning kan vara till en fil, och då anges namnet på filen med en\n" |
|
5611 | " Utmatning kan vara till en fil, och då anges namnet på filen med en\n" | |
5611 | " formatsträng. Formateringsreglerna är som följer::\n" |
|
5612 | " formatsträng. Formateringsreglerna är som följer::\n" | |
5612 | "\n" |
|
5613 | "\n" | |
5613 |
" |
|
5614 | " :``%%``: ett \"%\"-tecken\n" | |
5614 |
" |
|
5615 | " :``%H``: ändringshash (40 hexadecimala bytes)\n" | |
5615 |
" |
|
5616 | " :``%N``: antal genererade patchar\n" | |
5616 |
" |
|
5617 | " :``%R``: ändringens revisionsnummer\n" | |
5617 |
" |
|
5618 | " :``%b``: basnamn för det exporterande arkivet\n" | |
5618 |
" |
|
5619 | " :``%h``: kort ändringshash (12 hexadecimala bytes)\n" | |
5619 |
" |
|
5620 | " :``%n``: nollpaddat sekvensnummer, börjar med 1\n" | |
5620 |
" |
|
5621 | " :``%r``: nollpaddat ändringsrevisionsnummer\n" | |
5621 | "\n" |
|
5622 | "\n" | |
5622 | " Utan flaggan -a/--text, kommer export att undvika skapandet av diffar\n" |
|
5623 | " Utan flaggan -a/--text, kommer export att undvika skapandet av diffar\n" | |
5623 | " av filer som upptäcks vara binära. Med -a, kommer filen att exporteras\n" |
|
5624 | " av filer som upptäcks vara binära. Med -a, kommer filen att exporteras\n" | |
@@ -5791,9 +5792,6 b' msgstr "flaggor:\\n"' | |||||
5791 | msgid "no commands defined\n" |
|
5792 | msgid "no commands defined\n" | |
5792 | msgstr "" |
|
5793 | msgstr "" | |
5793 |
|
5794 | |||
5794 | msgid "enabled extensions:" |
|
|||
5795 | msgstr "aktiverade utökningar:" |
|
|||
5796 |
|
||||
5797 | msgid "no help text available" |
|
5795 | msgid "no help text available" | |
5798 | msgstr "" |
|
5796 | msgstr "" | |
5799 |
|
5797 | |||
@@ -5813,6 +5811,9 b' msgstr ""' | |||||
5813 | "grundläggande kommandon:\n" |
|
5811 | "grundläggande kommandon:\n" | |
5814 | "\n" |
|
5812 | "\n" | |
5815 |
|
5813 | |||
|
5814 | msgid "enabled extensions:" | |||
|
5815 | msgstr "aktiverade utökningar:" | |||
|
5816 | ||||
5816 | msgid "DEPRECATED" |
|
5817 | msgid "DEPRECATED" | |
5817 | msgstr "FÖRLEGAD" |
|
5818 | msgstr "FÖRLEGAD" | |
5818 |
|
5819 | |||
@@ -6417,13 +6418,13 b' msgid ""' | |||||
6417 | " Transactions are used to encapsulate the effects of all commands\n" |
|
6418 | " Transactions are used to encapsulate the effects of all commands\n" | |
6418 | " that create new changesets or propagate existing changesets into a\n" |
|
6419 | " that create new changesets or propagate existing changesets into a\n" | |
6419 | " repository. For example, the following commands are transactional,\n" |
|
6420 | " repository. For example, the following commands are transactional,\n" | |
6420 |
" and their effects can be rolled back: |
|
6421 | " and their effects can be rolled back:\n" | |
6421 | "\n" |
|
6422 | "\n" | |
6422 |
" |
|
6423 | " - commit\n" | |
6423 |
" |
|
6424 | " - import\n" | |
6424 |
" |
|
6425 | " - pull\n" | |
6425 |
" |
|
6426 | " - push (with this repository as destination)\n" | |
6426 |
" |
|
6427 | " - unbundle\n" | |
6427 | "\n" |
|
6428 | "\n" | |
6428 | " This command is not intended for use on public repositories. Once\n" |
|
6429 | " This command is not intended for use on public repositories. Once\n" | |
6429 | " changes are visible for pull by other users, rolling a transaction\n" |
|
6430 | " changes are visible for pull by other users, rolling a transaction\n" | |
@@ -6720,13 +6721,13 b' msgid ""' | |||||
6720 | " The following rules apply when the working directory contains\n" |
|
6721 | " The following rules apply when the working directory contains\n" | |
6721 | " uncommitted changes:\n" |
|
6722 | " uncommitted changes:\n" | |
6722 | "\n" |
|
6723 | "\n" | |
6723 |
" 1. If neither -c/--check nor -C/--clean is specified, |
|
6724 | " 1. If neither -c/--check nor -C/--clean is specified, and if\n" | |
6724 | " changes are merged into the requested changeset, and the merged " |
|
6725 | " the requested changeset is an ancestor or descendant of\n" | |
6725 | "result\n" |
|
6726 | " the working directory's parent, the uncommitted changes\n" | |
6726 | " is left uncommitted. Updating and merging will occur only if the\n" |
|
6727 | " are merged into the requested changeset and the merged\n" | |
6727 | " requested changeset is an ancestor or descendant of the parent\n" |
|
6728 | " result is left uncommitted. If the requested changeset is\n" | |
6728 | " changeset. Otherwise, the update is aborted and the uncommitted " |
|
6729 | " not an ancestor or descendant (that is, it is on another\n" | |
6729 | "changes\n" |
|
6730 | " branch), the update is aborted and the uncommitted changes\n" | |
6730 | " are preserved.\n" |
|
6731 | " are preserved.\n" | |
6731 | "\n" |
|
6732 | "\n" | |
6732 | " 2. With the -c/--check option, the update is aborted and the\n" |
|
6733 | " 2. With the -c/--check option, the update is aborted and the\n" | |
@@ -6755,12 +6756,13 b' msgstr ""' | |||||
6755 | " Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" |
|
6756 | " Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" | |
6756 | " ändringar:\n" |
|
6757 | " ändringar:\n" | |
6757 | "\n" |
|
6758 | "\n" | |
6758 |
" 1. Om varken -c/--check eller -C/--clean specificeras, |
|
6759 | " 1. Om varken -c/--check eller -C/--clean specificeras, och om den\n" | |
6759 | " oarkiverade ändringar att sammanfogas med den begärda ändringen,\n" |
|
6760 | " begärda ändringen är en anfader eller ättling till arbetskatalogens\n" | |
6760 | " och det sammanfogade resultatet lämnas oarkiverat. Uppdatering och\n" |
|
6761 | " förälder, kommer oarkiverade ändringar att sammanfogas med den\n" | |
6761 | " sammanfogning kommer bara att göras om den begärda ändringen är en\n" |
|
6762 | " begärda ändringen och det sammanfogade resultatet lämnas oarkiverat.\n" | |
6762 | " anfader eller ättling till föräldraändringen. Om inte, avbryts\n" |
|
6763 | " Om den begärda ändringen inte är en anfader eller ättling (dvs är i\n" | |
6763 |
" uppdateringen och de oarkiverade ändringarna |
|
6764 | " en annan gren), avbryts uppdateringen och de oarkiverade ändringarna\n" | |
|
6765 | " bevaras.\n" | |||
6764 | "\n" |
|
6766 | "\n" | |
6765 | " 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" |
|
6767 | " 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" | |
6766 | " ändringarna lämnas.\n" |
|
6768 | " ändringarna lämnas.\n" | |
@@ -7049,8 +7051,8 b' msgstr "klonen kommer bara att ha arkive' | |||||
7049 | msgid "revision, tag or branch to check out" |
|
7051 | msgid "revision, tag or branch to check out" | |
7050 | msgstr "revision, märke eller gren att hämta ut" |
|
7052 | msgstr "revision, märke eller gren att hämta ut" | |
7051 |
|
7053 | |||
7052 | msgid "a changeset you would like to have after cloning" |
|
7054 | msgid "clone only the specified revisions and ancestors" | |
7053 | msgstr "en ändring du skulle vilja ha efter kloning" |
|
7055 | msgstr "klona bara specificerade revisioner och anfäder" | |
7054 |
|
7056 | |||
7055 | msgid "[OPTION]... SOURCE [DEST]" |
|
7057 | msgid "[OPTION]... SOURCE [DEST]" | |
7056 | msgstr "[FLAGGA]... KÄLLA [DEST]" |
|
7058 | msgstr "[FLAGGA]... KÄLLA [DEST]" | |
@@ -7616,6 +7618,16 b' msgid "no definition for alias \'%s\'\\n"' | |||||
7616 | msgstr "" |
|
7618 | msgstr "" | |
7617 |
|
7619 | |||
7618 | #, python-format |
|
7620 | #, python-format | |
|
7621 | msgid "" | |||
|
7622 | "alias for: hg %s\n" | |||
|
7623 | "\n" | |||
|
7624 | "%s" | |||
|
7625 | msgstr "" | |||
|
7626 | "alias för: hg %s\n" | |||
|
7627 | "\n" | |||
|
7628 | "%s" | |||
|
7629 | ||||
|
7630 | #, python-format | |||
7619 | msgid "alias '%s' resolves to unknown command '%s'\n" |
|
7631 | msgid "alias '%s' resolves to unknown command '%s'\n" | |
7620 | msgstr "" |
|
7632 | msgstr "" | |
7621 |
|
7633 | |||
@@ -7624,7 +7636,7 b' msgid "alias \'%s\' resolves to ambiguous ' | |||||
7624 | msgstr "" |
|
7636 | msgstr "" | |
7625 |
|
7637 | |||
7626 | #, python-format |
|
7638 | #, python-format | |
7627 | msgid "malformed --config option: %s" |
|
7639 | msgid "malformed --config option: %r (use --config section.name=value)" | |
7628 | msgstr "" |
|
7640 | msgstr "" | |
7629 |
|
7641 | |||
7630 | #, python-format |
|
7642 | #, python-format | |
@@ -7834,6 +7846,12 b' msgstr ""' | |||||
7834 | msgid "%s hook is invalid (\"%s\" not in a module)" |
|
7846 | msgid "%s hook is invalid (\"%s\" not in a module)" | |
7835 | msgstr "" |
|
7847 | msgstr "" | |
7836 |
|
7848 | |||
|
7849 | msgid "exception from first failed import attempt:\n" | |||
|
7850 | msgstr "" | |||
|
7851 | ||||
|
7852 | msgid "exception from second failed import attempt:\n" | |||
|
7853 | msgstr "" | |||
|
7854 | ||||
7837 | #, python-format |
|
7855 | #, python-format | |
7838 | msgid "%s hook is invalid (import of \"%s\" failed)" |
|
7856 | msgid "%s hook is invalid (import of \"%s\" failed)" | |
7839 | msgstr "" |
|
7857 | msgstr "" |
General Comments 0
You need to be logged in to leave comments.
Login now