Show More
This diff has been collapsed as it changes many lines, (4195 lines changed) Show them Hide them | |||||
@@ -1,20 +1,20 b'' | |||||
1 | # Swedish translation for Mercurial |
|
1 | # Swedish translation for Mercurial | |
2 | # Svensk översättning för Mercurial |
|
2 | # Svensk översättning för Mercurial | |
3 | # Copyright (C) 2009-2010 Matt Mackall and others |
|
3 | # Copyright (C) 2009-2010 Matt Mackall and others | |
4 |
# |
|
4 | # | |
5 | # Translation dictionary: |
|
5 | # Translation dictionary: | |
6 |
# |
|
6 | # | |
7 | # changeset ändring |
|
7 | # changeset ändring | |
8 | # commit arkivera |
|
8 | # commit arkivera | |
9 | # merge sammanfoga |
|
9 | # merge sammanfoga | |
10 | # tag märke |
|
10 | # tag märke | |
11 |
# |
|
11 | # | |
12 | msgid "" |
|
12 | 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: 2010-0 |
|
16 | "POT-Creation-Date: 2010-06-21 20:17+0200\n" | |
17 |
"PO-Revision-Date: 2010-0 |
|
17 | "PO-Revision-Date: 2010-06-22 09:42+0200\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" | |
@@ -42,8 +42,9 b' msgid "hooks for controlling repository ' | |||||
42 | msgstr "" |
|
42 | msgstr "" | |
43 |
|
43 | |||
44 | msgid "" |
|
44 | msgid "" | |
45 |
"This hook makes it possible to allow or deny write access to |
|
45 | "This hook makes it possible to allow or deny write access to given\n" | |
46 |
"of a repository when receiving incoming changesets |
|
46 | "branches and paths of a repository when receiving incoming changesets\n" | |
|
47 | "via pretxnchangegroup and pretxncommit." | |||
47 | msgstr "" |
|
48 | msgstr "" | |
48 |
|
49 | |||
49 | msgid "" |
|
50 | msgid "" | |
@@ -54,58 +55,218 b' msgstr ""' | |||||
54 |
|
55 | |||
55 | msgid "" |
|
56 | msgid "" | |
56 | "The acl hook is best used along with a restricted shell like hgsh,\n" |
|
57 | "The acl hook is best used along with a restricted shell like hgsh,\n" | |
57 | "preventing authenticating users from doing anything other than\n" |
|
58 | "preventing authenticating users from doing anything other than pushing\n" | |
58 |
" |
|
59 | "or pulling. The hook is not safe to use if users have interactive\n" | |
59 |
" |
|
60 | "shell access, as they can then disable the hook. Nor is it safe if\n" | |
60 |
" |
|
61 | "remote users share an account, because then there is no way to\n" | |
61 |
" |
|
62 | "distinguish them." | |
62 | msgstr "" |
|
63 | msgstr "" | |
63 |
|
64 | |||
64 | msgid "To use this hook, configure the acl extension in your hgrc like this::" |
|
65 | msgid "The order in which access checks are performed is:" | |
65 | msgstr "" |
|
66 | msgstr "" | |
66 |
|
67 | |||
67 | msgid "" |
|
68 | msgid "" | |
68 | " [extensions]\n" |
|
69 | "1) Deny list for branches (section ``acl.deny.branches``)\n" | |
69 | " acl =" |
|
70 | "2) Allow list for branches (section ``acl.allow.branches``)\n" | |
70 | msgstr "" |
|
71 | "3) Deny list for paths (section ``acl.deny``)\n" | |
71 |
|
72 | "4) Allow list for paths (section ``acl.allow``)" | ||
72 |
msg |
|
73 | msgstr "" | |
73 | " [hooks]\n" |
|
74 | ||
|
75 | msgid "The allow and deny sections take key-value pairs." | |||
|
76 | msgstr "" | |||
|
77 | ||||
|
78 | msgid "" | |||
|
79 | "Branch-based Access Control\n" | |||
|
80 | "---------------------------" | |||
|
81 | msgstr "" | |||
|
82 | ||||
|
83 | msgid "" | |||
|
84 | "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" | |||
|
85 | "have branch-based access control. Keys in these sections can be\n" | |||
|
86 | "either:" | |||
|
87 | msgstr "" | |||
|
88 | ||||
|
89 | msgid "" | |||
|
90 | "- a branch name, or\n" | |||
|
91 | "- an asterisk, to match any branch;" | |||
|
92 | msgstr "" | |||
|
93 | ||||
|
94 | msgid "The corresponding values can be either:" | |||
|
95 | msgstr "" | |||
|
96 | ||||
|
97 | msgid "" | |||
|
98 | "- a comma-separated list containing users and groups, or\n" | |||
|
99 | "- an asterisk, to match anyone;" | |||
|
100 | msgstr "" | |||
|
101 | ||||
|
102 | msgid "" | |||
|
103 | "Path-based Access Control\n" | |||
|
104 | "-------------------------" | |||
|
105 | msgstr "" | |||
|
106 | ||||
|
107 | msgid "" | |||
|
108 | "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" | |||
|
109 | "access control. Keys in these sections accept a subtree pattern (with\n" | |||
|
110 | "a glob syntax by default). The corresponding values follow the same\n" | |||
|
111 | "syntax as the other sections above." | |||
|
112 | msgstr "" | |||
|
113 | ||||
|
114 | msgid "" | |||
|
115 | "Groups\n" | |||
|
116 | "------" | |||
|
117 | msgstr "" | |||
|
118 | ||||
|
119 | msgid "" | |||
|
120 | "Group names must be prefixed with an ``@`` symbol. Specifying a group\n" | |||
|
121 | "name has the same effect as specifying all the users in that group." | |||
|
122 | msgstr "" | |||
|
123 | ||||
|
124 | msgid "" | |||
|
125 | "You can define group members in the ``acl.groups`` section.\n" | |||
|
126 | "If a group name is not defined there, and Mercurial is running under\n" | |||
|
127 | "a Unix-like system, the list of users will be taken from the OS.\n" | |||
|
128 | "Otherwise, an exception will be raised." | |||
|
129 | msgstr "" | |||
|
130 | ||||
|
131 | msgid "" | |||
|
132 | "Example Configuration\n" | |||
|
133 | "---------------------" | |||
|
134 | msgstr "" | |||
|
135 | ||||
|
136 | msgid "::" | |||
|
137 | msgstr "::" | |||
|
138 | ||||
|
139 | msgid " [hooks]" | |||
|
140 | msgstr "" | |||
|
141 | ||||
|
142 | msgid "" | |||
|
143 | " # Use this if you want to check access restrictions at commit time\n" | |||
|
144 | " pretxncommit.acl = python:hgext.acl.hook" | |||
|
145 | msgstr "" | |||
|
146 | ||||
|
147 | msgid "" | |||
|
148 | " # Use this if you want to check access restrictions for pull, push,\n" | |||
|
149 | " # bundle and serve.\n" | |||
74 | " pretxnchangegroup.acl = python:hgext.acl.hook" |
|
150 | " pretxnchangegroup.acl = python:hgext.acl.hook" | |
75 | msgstr "" |
|
151 | msgstr "" | |
76 |
|
152 | |||
77 | msgid "" |
|
153 | msgid "" | |
78 | " [acl]\n" |
|
154 | " [acl]\n" | |
79 |
" # |
|
155 | " # Allow or deny access for incoming changes only if their source is\n" | |
80 | " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" |
|
156 | " # listed here, let them pass otherwise. Source is \"serve\" for all\n" | |
|
157 | " # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n" | |||
|
158 | " # related commands are run locally.\n" | |||
|
159 | " # Default: serve\n" | |||
81 | " sources = serve" |
|
160 | " sources = serve" | |
82 | msgstr "" |
|
161 | msgstr "" | |
83 |
|
162 | |||
84 | msgid "" |
|
163 | msgid " [acl.deny.branches]" | |
85 | "The allow and deny sections take a subtree pattern as key (with a glob\n" |
|
164 | msgstr "" | |
86 | "syntax by default), and a comma separated list of users as the\n" |
|
165 | ||
87 | "corresponding value. The deny list is checked before the allow list\n" |
|
166 | msgid "" | |
88 | "is. ::" |
|
167 | " # Everyone is denied to the frozen branch:\n" | |
|
168 | " frozen-branch = *" | |||
|
169 | msgstr "" | |||
|
170 | ||||
|
171 | msgid "" | |||
|
172 | " # A bad user is denied on all branches:\n" | |||
|
173 | " * = bad-user" | |||
|
174 | msgstr "" | |||
|
175 | ||||
|
176 | msgid " [acl.allow.branches]" | |||
|
177 | msgstr "" | |||
|
178 | ||||
|
179 | msgid "" | |||
|
180 | " # A few users are allowed on branch-a:\n" | |||
|
181 | " branch-a = user-1, user-2, user-3" | |||
|
182 | msgstr "" | |||
|
183 | ||||
|
184 | msgid "" | |||
|
185 | " # Only one user is allowed on branch-b:\n" | |||
|
186 | " branch-b = user-1" | |||
|
187 | msgstr "" | |||
|
188 | ||||
|
189 | msgid "" | |||
|
190 | " # The super user is allowed on any branch:\n" | |||
|
191 | " * = super-user" | |||
|
192 | msgstr "" | |||
|
193 | ||||
|
194 | msgid "" | |||
|
195 | " # Everyone is allowed on branch-for-tests:\n" | |||
|
196 | " branch-for-tests = *" | |||
|
197 | msgstr "" | |||
|
198 | ||||
|
199 | msgid "" | |||
|
200 | " [acl.deny]\n" | |||
|
201 | " # This list is checked first. If a match is found, acl.allow is not\n" | |||
|
202 | " # checked. All users are granted access if acl.deny is not present.\n" | |||
|
203 | " # Format for both lists: glob pattern = user, ..., @group, ..." | |||
|
204 | msgstr "" | |||
|
205 | ||||
|
206 | msgid "" | |||
|
207 | " # To match everyone, use an asterisk for the user:\n" | |||
|
208 | " # my/glob/pattern = *" | |||
|
209 | msgstr "" | |||
|
210 | ||||
|
211 | msgid "" | |||
|
212 | " # user6 will not have write access to any file:\n" | |||
|
213 | " ** = user6" | |||
|
214 | msgstr "" | |||
|
215 | ||||
|
216 | msgid "" | |||
|
217 | " # Group \"hg-denied\" will not have write access to any file:\n" | |||
|
218 | " ** = @hg-denied" | |||
|
219 | msgstr "" | |||
|
220 | ||||
|
221 | msgid "" | |||
|
222 | " # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n" | |||
|
223 | " # everyone being able to change all other files. See below.\n" | |||
|
224 | " src/main/resources/DONT-TOUCH-THIS.txt = *" | |||
89 | msgstr "" |
|
225 | msgstr "" | |
90 |
|
226 | |||
91 | msgid "" |
|
227 | msgid "" | |
92 | " [acl.allow]\n" |
|
228 | " [acl.allow]\n" | |
93 |
" # |
|
229 | " # if acl.allow is not present, all users are allowed by default\n" | |
94 |
" # |
|
230 | " # empty acl.allow = no users allowed" | |
95 | " docs/** = doc_writer\n" |
|
231 | msgstr "" | |
96 | " .hgtags = release_engineer" |
|
232 | ||
97 |
msg |
|
233 | msgid "" | |
98 |
|
234 | " # User \"doc_writer\" has write access to any file under the \"docs\"\n" | ||
99 | msgid "" |
|
235 | " # folder:\n" | |
100 | " [acl.deny]\n" |
|
236 | " docs/** = doc_writer" | |
101 | " # If acl.deny is not present, no users are refused by default.\n" |
|
237 | msgstr "" | |
102 | " # An empty acl.deny section means all users allowed.\n" |
|
238 | ||
103 | " glob pattern = user4, user5\n" |
|
239 | msgid "" | |
104 | " ** = user6\n" |
|
240 | " # User \"jack\" and group \"designers\" have write access to any file\n" | |
105 | msgstr "" |
|
241 | " # under the \"images\" folder:\n" | |
106 |
|
242 | " images/** = jack, @designers" | ||
107 | #, python-format |
|
243 | msgstr "" | |
108 | msgid "config error - hook type \"%s\" cannot stop incoming changesets" |
|
244 | ||
|
245 | msgid "" | |||
|
246 | " # Everyone (except for \"user6\" - see acl.deny above) will have write\n" | |||
|
247 | " # access to any file under the \"resources\" folder (except for 1\n" | |||
|
248 | " # file. See acl.deny):\n" | |||
|
249 | " src/main/resources/** = *" | |||
|
250 | msgstr "" | |||
|
251 | ||||
|
252 | msgid " .hgtags = release_engineer" | |||
|
253 | msgstr "" | |||
|
254 | ||||
|
255 | #, python-format | |||
|
256 | msgid "group '%s' is undefined" | |||
|
257 | msgstr "" | |||
|
258 | ||||
|
259 | #, python-format | |||
|
260 | msgid "" | |||
|
261 | "config error - hook type \"%s\" cannot stop incoming changesets nor commits" | |||
|
262 | msgstr "" | |||
|
263 | ||||
|
264 | #, python-format | |||
|
265 | msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")" | |||
|
266 | msgstr "" | |||
|
267 | ||||
|
268 | #, python-format | |||
|
269 | msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")" | |||
109 | msgstr "" |
|
270 | msgstr "" | |
110 |
|
271 | |||
111 | #, python-format |
|
272 | #, python-format | |
@@ -123,8 +284,8 b' msgid ""' | |||||
123 | msgstr "" |
|
284 | msgstr "" | |
124 |
|
285 | |||
125 | msgid "" |
|
286 | msgid "" | |
126 |
"It is possible to use bookmark names in every revision lookup (e.g. |
|
287 | "It is possible to use bookmark names in every revision lookup (e.g.\n" | |
127 |
" |
|
288 | ":hg:`merge`, :hg:`update`)." | |
128 | msgstr "" |
|
289 | msgstr "" | |
129 |
|
290 | |||
130 | msgid "" |
|
291 | msgid "" | |
@@ -148,12 +309,12 b' msgstr ""' | |||||
148 | msgid "" |
|
309 | msgid "" | |
149 | " Bookmarks are pointers to certain commits that move when\n" |
|
310 | " Bookmarks are pointers to certain commits that move when\n" | |
150 | " committing. Bookmarks are local. They can be renamed, copied and\n" |
|
311 | " committing. Bookmarks are local. They can be renamed, copied and\n" | |
151 |
" deleted. It is possible to use bookmark names in |
|
312 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" | |
152 |
" |
|
313 | " :hg:`update` to merge and update respectively to a given bookmark." | |
153 | msgstr "" |
|
314 | msgstr "" | |
154 |
|
315 | |||
155 | msgid "" |
|
316 | msgid "" | |
156 |
" You can use |
|
317 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" | |
157 | " directory's parent revision with the given name. If you specify\n" |
|
318 | " directory's parent revision with the given name. If you specify\n" | |
158 | " a revision using -r REV (where REV may be an existing bookmark),\n" |
|
319 | " a revision using -r REV (where REV may be an existing bookmark),\n" | |
159 | " the bookmark is assigned to that revision.\n" |
|
320 | " the bookmark is assigned to that revision.\n" | |
@@ -181,15 +342,59 b' msgstr ""' | |||||
181 | msgid "no bookmarks set\n" |
|
342 | msgid "no bookmarks set\n" | |
182 | msgstr "inga bokmärken satta\n" |
|
343 | msgstr "inga bokmärken satta\n" | |
183 |
|
344 | |||
|
345 | #, python-format | |||
|
346 | msgid "updating bookmark %s\n" | |||
|
347 | msgstr "uppdaterar bokmärket %s\n" | |||
|
348 | ||||
|
349 | #, python-format | |||
|
350 | msgid "not updating divergent bookmark %s\n" | |||
|
351 | msgstr "" | |||
|
352 | ||||
|
353 | #, python-format | |||
|
354 | msgid "failed to update bookmark %s!\n" | |||
|
355 | msgstr "misslyckades att uppdatera bokmärket %s!\n" | |||
|
356 | ||||
|
357 | #, python-format | |||
|
358 | msgid "remote bookmark %s not found!" | |||
|
359 | msgstr "" | |||
|
360 | ||||
|
361 | #, python-format | |||
|
362 | msgid "importing bookmark %s\n" | |||
|
363 | msgstr "importerar bokmärket %s\n" | |||
|
364 | ||||
|
365 | #, python-format | |||
|
366 | msgid "exporting bookmark %s\n" | |||
|
367 | msgstr "exporterar bokmärket %s\n" | |||
|
368 | ||||
|
369 | #, python-format | |||
|
370 | msgid "deleting remote bookmark %s\n" | |||
|
371 | msgstr "raderar fjärrbokmärket %s\n" | |||
|
372 | ||||
|
373 | #, python-format | |||
|
374 | msgid "updating bookmark %s failed!\n" | |||
|
375 | msgstr "uppdatering av bokmärket %s misslyckades!\n" | |||
|
376 | ||||
|
377 | msgid "bookmark to import" | |||
|
378 | msgstr "bokmärke att importera" | |||
|
379 | ||||
|
380 | msgid "bookmark to export" | |||
|
381 | msgstr "bokmärke att exportera" | |||
|
382 | ||||
184 | msgid "force" |
|
383 | msgid "force" | |
185 | msgstr "tvinga" |
|
384 | msgstr "tvinga" | |
186 |
|
385 | |||
|
386 | msgid "REV" | |||
|
387 | msgstr "REV" | |||
|
388 | ||||
187 | msgid "revision" |
|
389 | msgid "revision" | |
188 | msgstr "revision" |
|
390 | msgstr "revision" | |
189 |
|
391 | |||
190 | msgid "delete a given bookmark" |
|
392 | msgid "delete a given bookmark" | |
191 | msgstr "" |
|
393 | msgstr "" | |
192 |
|
394 | |||
|
395 | msgid "NAME" | |||
|
396 | msgstr "NAMN" | |||
|
397 | ||||
193 | msgid "rename a given bookmark" |
|
398 | msgid "rename a given bookmark" | |
194 | msgstr "" |
|
399 | msgstr "" | |
195 |
|
400 | |||
@@ -541,7 +746,7 b' msgid ""' | |||||
541 | " by providing a file using the following format::" |
|
746 | " by providing a file using the following format::" | |
542 | msgstr "" |
|
747 | msgstr "" | |
543 |
|
748 | |||
544 | msgid " <alias email> <actual email>" |
|
749 | msgid " <alias email> = <actual email>" | |
545 | msgstr "" |
|
750 | msgstr "" | |
546 |
|
751 | |||
547 | msgid "" |
|
752 | msgid "" | |
@@ -553,12 +758,21 b' msgstr ""' | |||||
553 | msgid "count rate for the specified revision or range" |
|
758 | msgid "count rate for the specified revision or range" | |
554 | msgstr "" |
|
759 | msgstr "" | |
555 |
|
760 | |||
|
761 | msgid "DATE" | |||
|
762 | msgstr "DATUM" | |||
|
763 | ||||
556 | msgid "count rate for revisions matching date spec" |
|
764 | msgid "count rate for revisions matching date spec" | |
557 | msgstr "" |
|
765 | msgstr "" | |
558 |
|
766 | |||
|
767 | msgid "TEMPLATE" | |||
|
768 | msgstr "MALL" | |||
|
769 | ||||
559 | msgid "template to group changesets" |
|
770 | msgid "template to group changesets" | |
560 | msgstr "" |
|
771 | msgstr "" | |
561 |
|
772 | |||
|
773 | msgid "FORMAT" | |||
|
774 | msgstr "FORMAT" | |||
|
775 | ||||
562 | msgid "strftime-compatible format for grouping by date" |
|
776 | msgid "strftime-compatible format for grouping by date" | |
563 | msgstr "" |
|
777 | msgstr "" | |
564 |
|
778 | |||
@@ -571,6 +785,9 b' msgstr ""' | |||||
571 | msgid "display added/removed lines separately" |
|
785 | msgid "display added/removed lines separately" | |
572 | msgstr "visa tillagda/raderade rader separat" |
|
786 | msgstr "visa tillagda/raderade rader separat" | |
573 |
|
787 | |||
|
788 | msgid "FILE" | |||
|
789 | msgstr "FIL" | |||
|
790 | ||||
574 | msgid "file with email aliases" |
|
791 | msgid "file with email aliases" | |
575 | msgstr "" |
|
792 | msgstr "" | |
576 |
|
793 | |||
@@ -581,7 +798,8 b' msgid "colorize output from some command' | |||||
581 | msgstr "färglägg utmatning från vissa kommandon" |
|
798 | msgstr "färglägg utmatning från vissa kommandon" | |
582 |
|
799 | |||
583 | msgid "" |
|
800 | msgid "" | |
584 |
"This extension modifies the status and resolve commands to add color to |
|
801 | "This extension modifies the status and resolve commands to add color to " | |
|
802 | "their\n" | |||
585 | "output to reflect file status, the qseries command to add color to reflect\n" |
|
803 | "output to reflect file status, the qseries command to add color to reflect\n" | |
586 | "patch status (applied, unapplied, missing), and to diff-related\n" |
|
804 | "patch status (applied, unapplied, missing), and to diff-related\n" | |
587 | "commands to highlight additions, removals, diff headers, and trailing\n" |
|
805 | "commands to highlight additions, removals, diff headers, and trailing\n" | |
@@ -700,6 +918,9 b' msgstr "win32console hittades inte, inst' | |||||
700 | msgid "when to colorize (always, auto, or never)" |
|
918 | msgid "when to colorize (always, auto, or never)" | |
701 | msgstr "när färgläggning ska ske (always, auto eller never)" |
|
919 | msgstr "när färgläggning ska ske (always, auto eller never)" | |
702 |
|
920 | |||
|
921 | msgid "TYPE" | |||
|
922 | msgstr "TYP" | |||
|
923 | ||||
703 | msgid "import revisions from foreign VCS repositories into Mercurial" |
|
924 | msgid "import revisions from foreign VCS repositories into Mercurial" | |
704 | msgstr "" |
|
925 | msgstr "" | |
705 |
|
926 | |||
@@ -1078,7 +1299,16 b' msgstr ""' | |||||
1078 | msgid "hg debugcvsps [OPTION]... [PATH]..." |
|
1299 | msgid "hg debugcvsps [OPTION]... [PATH]..." | |
1079 | msgstr "" |
|
1300 | msgstr "" | |
1080 |
|
1301 | |||
1081 | msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n" |
|
1302 | #, python-format | |
|
1303 | msgid "%s does not look like a Bazaar repository" | |||
|
1304 | msgstr "%s verkar inte vara ett Bazaar-arkiv" | |||
|
1305 | ||||
|
1306 | msgid "Bazaar modules could not be loaded" | |||
|
1307 | msgstr "Bazaar-moduler kunde inte laddas" | |||
|
1308 | ||||
|
1309 | msgid "" | |||
|
1310 | "warning: lightweight checkouts may cause conversion failures, try with a " | |||
|
1311 | "regular branch instead.\n" | |||
1082 | msgstr "" |
|
1312 | msgstr "" | |
1083 |
|
1313 | |||
1084 | msgid "bzr source type could not be determined\n" |
|
1314 | msgid "bzr source type could not be determined\n" | |
@@ -1126,11 +1356,20 b' msgstr "%s: ogiltig typ f\xc3\xb6r destinationsarkiv"' | |||||
1126 |
|
1356 | |||
1127 | #, python-format |
|
1357 | #, python-format | |
1128 | msgid "convert: %s\n" |
|
1358 | msgid "convert: %s\n" | |
1129 | msgstr "" |
|
1359 | msgstr "convert: %s\n" | |
1130 |
|
1360 | |||
1131 | #, python-format |
|
1361 | #, python-format | |
1132 | msgid "%s: unknown repository type" |
|
1362 | msgid "%s: unknown repository type" | |
1133 | msgstr "" |
|
1363 | msgstr "%s: okänd arkivtyp" | |
|
1364 | ||||
|
1365 | msgid "retrieving file" | |||
|
1366 | msgstr "hämtar fil" | |||
|
1367 | ||||
|
1368 | msgid "revisions" | |||
|
1369 | msgstr "revisioner" | |||
|
1370 | ||||
|
1371 | msgid "scanning" | |||
|
1372 | msgstr "skannar" | |||
1134 |
|
1373 | |||
1135 | #, python-format |
|
1374 | #, python-format | |
1136 | msgid "unknown sort mode: %s" |
|
1375 | msgid "unknown sort mode: %s" | |
@@ -1164,17 +1403,20 b' msgid "spliced in %s as parents of %s\\n"' | |||||
1164 | msgstr "" |
|
1403 | msgstr "" | |
1165 |
|
1404 | |||
1166 | msgid "scanning source...\n" |
|
1405 | msgid "scanning source...\n" | |
1167 | msgstr "" |
|
1406 | msgstr "skannar källa...\n" | |
1168 |
|
1407 | |||
1169 | msgid "sorting...\n" |
|
1408 | msgid "sorting...\n" | |
1170 | msgstr "" |
|
1409 | msgstr "sorterar...\n" | |
1171 |
|
1410 | |||
1172 | msgid "converting...\n" |
|
1411 | msgid "converting...\n" | |
1173 | msgstr "" |
|
1412 | msgstr "konverterar...\n" | |
1174 |
|
1413 | |||
1175 | #, python-format |
|
1414 | #, python-format | |
1176 | msgid "source: %s\n" |
|
1415 | msgid "source: %s\n" | |
1177 | msgstr "" |
|
1416 | msgstr "källa: %s\n" | |
|
1417 | ||||
|
1418 | msgid "converting" | |||
|
1419 | msgstr "konverterar" | |||
1178 |
|
1420 | |||
1179 | #, python-format |
|
1421 | #, python-format | |
1180 | msgid "assuming destination %s\n" |
|
1422 | msgid "assuming destination %s\n" | |
@@ -1187,6 +1429,10 b' msgid "--sourcesort is not supported by ' | |||||
1187 | msgstr "" |
|
1429 | msgstr "" | |
1188 |
|
1430 | |||
1189 | #, python-format |
|
1431 | #, python-format | |
|
1432 | msgid "%s does not look like a CVS checkout" | |||
|
1433 | msgstr "%s verkar inte vara en CVS-uthämtning" | |||
|
1434 | ||||
|
1435 | #, python-format | |||
1190 | msgid "revision %s is not a patchset number" |
|
1436 | msgid "revision %s is not a patchset number" | |
1191 | msgstr "" |
|
1437 | msgstr "" | |
1192 |
|
1438 | |||
@@ -1198,7 +1444,8 b' msgid "CVS pserver authentication failed' | |||||
1198 | msgstr "" |
|
1444 | msgstr "" | |
1199 |
|
1445 | |||
1200 | #, python-format |
|
1446 | #, python-format | |
1201 | msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" |
|
1447 | msgid "" | |
|
1448 | "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" | |||
1202 | msgstr "" |
|
1449 | msgstr "" | |
1203 |
|
1450 | |||
1204 | #, python-format |
|
1451 | #, python-format | |
@@ -1219,6 +1466,9 b' msgstr ""' | |||||
1219 | msgid "collecting CVS rlog\n" |
|
1466 | msgid "collecting CVS rlog\n" | |
1220 | msgstr "" |
|
1467 | msgstr "" | |
1221 |
|
1468 | |||
|
1469 | msgid "not a CVS sandbox" | |||
|
1470 | msgstr "inte en CVS-sandlåda" | |||
|
1471 | ||||
1222 | #, python-format |
|
1472 | #, python-format | |
1223 | msgid "reading cvs log cache %s\n" |
|
1473 | msgid "reading cvs log cache %s\n" | |
1224 | msgstr "" |
|
1474 | msgstr "" | |
@@ -1247,6 +1497,9 b' msgstr ""' | |||||
1247 | msgid "revision must be followed by date line" |
|
1497 | msgid "revision must be followed by date line" | |
1248 | msgstr "" |
|
1498 | msgstr "" | |
1249 |
|
1499 | |||
|
1500 | msgid "log cache overlaps with new log entries, re-run without cache." | |||
|
1501 | msgstr "loggcache överlappar med nya loggningar, kör igen utan cache." | |||
|
1502 | ||||
1250 | #, python-format |
|
1503 | #, python-format | |
1251 | msgid "writing cvs log cache %s\n" |
|
1504 | msgid "writing cvs log cache %s\n" | |
1252 | msgstr "" |
|
1505 | msgstr "" | |
@@ -1272,6 +1525,10 b' msgid "%d changeset entries\\n"' | |||||
1272 | msgstr "" |
|
1525 | msgstr "" | |
1273 |
|
1526 | |||
1274 | #, python-format |
|
1527 | #, python-format | |
|
1528 | msgid "%s does not look like a darcs repository" | |||
|
1529 | msgstr "%s verkar inte vara ett darcs-arkiv" | |||
|
1530 | ||||
|
1531 | #, python-format | |||
1275 | msgid "darcs version 2.1 or newer needed (found %r)" |
|
1532 | msgid "darcs version 2.1 or newer needed (found %r)" | |
1276 | msgstr "" |
|
1533 | msgstr "" | |
1277 |
|
1534 | |||
@@ -1296,18 +1553,38 b' msgid "source repository doesn\'t support' | |||||
1296 | msgstr "" |
|
1553 | msgstr "" | |
1297 |
|
1554 | |||
1298 | #, python-format |
|
1555 | #, python-format | |
1299 |
msgid "%s does not look like a G |
|
1556 | msgid "%s does not look like a Git repository" | |
1300 | msgstr "" |
|
1557 | msgstr "%s verkar inte vara ett Git-arkiv" | |
|
1558 | ||||
|
1559 | msgid "cannot retrieve git heads" | |||
|
1560 | msgstr "kan inte hämta git-huvuden" | |||
|
1561 | ||||
|
1562 | #, python-format | |||
|
1563 | msgid "cannot read %r object at %s" | |||
|
1564 | msgstr "kan inte läsa %r-objekt som %s" | |||
|
1565 | ||||
|
1566 | #, python-format | |||
|
1567 | msgid "cannot read changes in %s" | |||
|
1568 | msgstr "kan inte läsa ändringar i %s" | |||
|
1569 | ||||
|
1570 | #, python-format | |||
|
1571 | msgid "cannot read tags from %s" | |||
|
1572 | msgstr "kan inte läsa märken från %s" | |||
|
1573 | ||||
|
1574 | #, python-format | |||
|
1575 | msgid "%s does not look like a GNU Arch repository" | |||
|
1576 | msgstr "%s verkar inte vara ett GNU Arch-arkiv" | |||
1301 |
|
1577 | |||
1302 | msgid "cannot find a GNU Arch tool" |
|
1578 | msgid "cannot find a GNU Arch tool" | |
1303 | msgstr "" |
|
1579 | msgstr "kan inte hitta ett GNU Arch-verktyg" | |
1304 |
|
1580 | |||
1305 | #, python-format |
|
1581 | #, python-format | |
1306 | msgid "analyzing tree version %s...\n" |
|
1582 | msgid "analyzing tree version %s...\n" | |
1307 | msgstr "" |
|
1583 | msgstr "analyserar trädversion %s...\n" | |
1308 |
|
1584 | |||
1309 | #, python-format |
|
1585 | #, python-format | |
1310 | msgid "tree analysis stopped because it points to an unregistered archive %s...\n" |
|
1586 | msgid "" | |
|
1587 | "tree analysis stopped because it points to an unregistered archive %s...\n" | |||
1311 | msgstr "" |
|
1588 | msgstr "" | |
1312 |
|
1589 | |||
1313 | #, python-format |
|
1590 | #, python-format | |
@@ -1315,14 +1592,18 b' msgid "could not parse cat-log of %s"' | |||||
1315 | msgstr "" |
|
1592 | msgstr "" | |
1316 |
|
1593 | |||
1317 | #, python-format |
|
1594 | #, python-format | |
1318 | msgid "%s is not a local Mercurial repo" |
|
1595 | msgid "%s is not a local Mercurial repository" | |
1319 | msgstr "" |
|
1596 | msgstr "%s är inte ett lokalt Mercurial-arkiv" | |
1320 |
|
1597 | |||
1321 | #, python-format |
|
1598 | #, python-format | |
1322 | msgid "initializing destination %s repository\n" |
|
1599 | msgid "initializing destination %s repository\n" | |
1323 | msgstr "" |
|
1600 | msgstr "" | |
1324 |
|
1601 | |||
1325 | #, python-format |
|
1602 | #, python-format | |
|
1603 | msgid "could not create hg repository %s as sink" | |||
|
1604 | msgstr "kunde inte skapa hg-arkiv %s för lagring" | |||
|
1605 | ||||
|
1606 | #, python-format | |||
1326 | msgid "pulling from %s into %s\n" |
|
1607 | msgid "pulling from %s into %s\n" | |
1327 | msgstr "" |
|
1608 | msgstr "" | |
1328 |
|
1609 | |||
@@ -1341,13 +1622,17 b' msgid "ignoring: %s\\n"' | |||||
1341 | msgstr "" |
|
1622 | msgstr "" | |
1342 |
|
1623 | |||
1343 | #, python-format |
|
1624 | #, python-format | |
1344 | msgid "%s does not look like a monotone repo" |
|
1625 | msgid "%s does not look like a monotone repository" | |
1345 | msgstr "" |
|
1626 | msgstr "%s verkar inte vara ett monotone-arkiv" | |
1346 |
|
1627 | |||
1347 | #, python-format |
|
1628 | #, python-format | |
1348 | msgid "copying file in renamed directory from '%s' to '%s'" |
|
1629 | msgid "copying file in renamed directory from '%s' to '%s'" | |
1349 | msgstr "" |
|
1630 | msgstr "" | |
1350 |
|
1631 | |||
|
1632 | #, python-format | |||
|
1633 | msgid "%s does not look like a P4 repository" | |||
|
1634 | msgstr "%s verkar inte vara ett P4-arkiv" | |||
|
1635 | ||||
1351 | msgid "reading p4 views\n" |
|
1636 | msgid "reading p4 views\n" | |
1352 | msgstr "" |
|
1637 | msgstr "" | |
1353 |
|
1638 | |||
@@ -1357,8 +1642,14 b' msgstr ""' | |||||
1357 | msgid "Mercurial failed to run itself, check hg executable is in PATH" |
|
1642 | msgid "Mercurial failed to run itself, check hg executable is in PATH" | |
1358 | msgstr "" |
|
1643 | msgstr "" | |
1359 |
|
1644 | |||
1360 | msgid "svn: cannot probe remote repository, assume it could be a subversion repository. Use --source-type if you know better.\n" |
|
1645 | msgid "" | |
1361 | msgstr "" |
|
1646 | "svn: cannot probe remote repository, assume it could be a subversion " | |
|
1647 | "repository. Use --source-type if you know better.\n" | |||
|
1648 | msgstr "" | |||
|
1649 | ||||
|
1650 | #, python-format | |||
|
1651 | msgid "%s does not look like a Subversion repository" | |||
|
1652 | msgstr "%s verkar inte vara ett Subversion-arkiv" | |||
1362 |
|
1653 | |||
1363 | msgid "Subversion python bindings could not be loaded" |
|
1654 | msgid "Subversion python bindings could not be loaded" | |
1364 | msgstr "" |
|
1655 | msgstr "" | |
@@ -1406,13 +1697,12 b' msgid "svn: no revision found after star' | |||||
1406 | msgstr "" |
|
1697 | msgstr "" | |
1407 |
|
1698 | |||
1408 | #, python-format |
|
1699 | #, python-format | |
1409 | msgid "no tags found at revision %d\n" |
|
|||
1410 | msgstr "" |
|
|||
1411 |
|
||||
1412 | #, python-format |
|
|||
1413 | msgid "%s not found up to revision %d" |
|
1700 | msgid "%s not found up to revision %d" | |
1414 | msgstr "" |
|
1701 | msgstr "" | |
1415 |
|
1702 | |||
|
1703 | msgid "scanning paths" | |||
|
1704 | msgstr "skannar sökvägar" | |||
|
1705 | ||||
1416 | #, python-format |
|
1706 | #, python-format | |
1417 | msgid "found parent of branch %s at %d: %s\n" |
|
1707 | msgid "found parent of branch %s at %d: %s\n" | |
1418 | msgstr "" |
|
1708 | msgstr "" | |
@@ -1426,12 +1716,12 b' msgid "svn: branch has no revision %s"' | |||||
1426 | msgstr "" |
|
1716 | msgstr "" | |
1427 |
|
1717 | |||
1428 | #, python-format |
|
1718 | #, python-format | |
1429 | msgid "initializing svn repo %r\n" |
|
1719 | msgid "initializing svn repository %r\n" | |
1430 | msgstr "" |
|
1720 | msgstr "initialiserar svn-arkivet %r\n" | |
1431 |
|
1721 | |||
1432 | #, python-format |
|
1722 | #, python-format | |
1433 | msgid "initializing svn wc %r\n" |
|
1723 | msgid "initializing svn working copy %r\n" | |
1434 | msgstr "" |
|
1724 | msgstr "initialiserar svn-arbetskopia %r\n" | |
1435 |
|
1725 | |||
1436 | msgid "unexpected svn output:\n" |
|
1726 | msgid "unexpected svn output:\n" | |
1437 | msgstr "" |
|
1727 | msgstr "" | |
@@ -1442,6 +1732,116 b' msgstr ""' | |||||
1442 | msgid "XXX TAGS NOT IMPLEMENTED YET\n" |
|
1732 | msgid "XXX TAGS NOT IMPLEMENTED YET\n" | |
1443 | msgstr "" |
|
1733 | msgstr "" | |
1444 |
|
1734 | |||
|
1735 | msgid "automatically manage newlines in repository files" | |||
|
1736 | msgstr "" | |||
|
1737 | ||||
|
1738 | msgid "" | |||
|
1739 | "This extension allows you to manage the type of line endings (CRLF or\n" | |||
|
1740 | "LF) that are used in the repository and in the local working\n" | |||
|
1741 | "directory. That way you can get CRLF line endings on Windows and LF on\n" | |||
|
1742 | "Unix/Mac, thereby letting everybody use their OS native line endings." | |||
|
1743 | msgstr "" | |||
|
1744 | ||||
|
1745 | msgid "" | |||
|
1746 | "The extension reads its configuration from a versioned ``.hgeol``\n" | |||
|
1747 | "configuration file every time you run an ``hg`` command. The\n" | |||
|
1748 | "``.hgeol`` file use the same syntax as all other Mercurial\n" | |||
|
1749 | "configuration files. It uses two sections, ``[patterns]`` and\n" | |||
|
1750 | "``[repository]``." | |||
|
1751 | msgstr "" | |||
|
1752 | ||||
|
1753 | msgid "" | |||
|
1754 | "The ``[patterns]`` section specifies the line endings used in the\n" | |||
|
1755 | "working directory. The format is specified by a file pattern. The\n" | |||
|
1756 | "first match is used, so put more specific patterns first. The\n" | |||
|
1757 | "available line endings are ``LF``, ``CRLF``, and ``BIN``." | |||
|
1758 | msgstr "" | |||
|
1759 | ||||
|
1760 | msgid "" | |||
|
1761 | "Files with the declared format of ``CRLF`` or ``LF`` are always\n" | |||
|
1762 | "checked out in that format and files declared to be binary (``BIN``)\n" | |||
|
1763 | "are left unchanged. Additionally, ``native`` is an alias for the\n" | |||
|
1764 | "platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" | |||
|
1765 | "and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" | |||
|
1766 | "endings) is Mercurial's default behaviour; it is only needed if you\n" | |||
|
1767 | "need to override a later, more general pattern." | |||
|
1768 | msgstr "" | |||
|
1769 | ||||
|
1770 | msgid "" | |||
|
1771 | "The optional ``[repository]`` section specifies the line endings to\n" | |||
|
1772 | "use for files stored in the repository. It has a single setting,\n" | |||
|
1773 | "``native``, which determines the storage line endings for files\n" | |||
|
1774 | "declared as ``native`` in the ``[patterns]`` section. It can be set to\n" | |||
|
1775 | "``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n" | |||
|
1776 | "that on Windows, files configured as ``native`` (``CRLF`` by default)\n" | |||
|
1777 | "will be converted to ``LF`` when stored in the repository. Files\n" | |||
|
1778 | "declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n" | |||
|
1779 | "are always stored as-is in the repository." | |||
|
1780 | msgstr "" | |||
|
1781 | ||||
|
1782 | msgid "Example versioned ``.hgeol`` file::" | |||
|
1783 | msgstr "" | |||
|
1784 | ||||
|
1785 | msgid "" | |||
|
1786 | " [patterns]\n" | |||
|
1787 | " **.py = native\n" | |||
|
1788 | " **.vcproj = CRLF\n" | |||
|
1789 | " **.txt = native\n" | |||
|
1790 | " Makefile = LF\n" | |||
|
1791 | " **.jpg = BIN" | |||
|
1792 | msgstr "" | |||
|
1793 | ||||
|
1794 | msgid "" | |||
|
1795 | " [repository]\n" | |||
|
1796 | " native = LF" | |||
|
1797 | msgstr "" | |||
|
1798 | ||||
|
1799 | msgid "" | |||
|
1800 | "The extension uses an optional ``[eol]`` section in your hgrc file\n" | |||
|
1801 | "(not the ``.hgeol`` file) for settings that control the overall\n" | |||
|
1802 | "behavior. There are two settings:" | |||
|
1803 | msgstr "" | |||
|
1804 | ||||
|
1805 | msgid "" | |||
|
1806 | "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" | |||
|
1807 | " ``CRLF`` override the default interpretation of ``native`` for\n" | |||
|
1808 | " checkout. This can be used with :hg:`archive` on Unix, say, to\n" | |||
|
1809 | " generate an archive where files have line endings for Windows." | |||
|
1810 | msgstr "" | |||
|
1811 | ||||
|
1812 | msgid "" | |||
|
1813 | "- ``eol.only-consistent`` (default True) can be set to False to make\n" | |||
|
1814 | " the extension convert files with inconsistent EOLs. Inconsistent\n" | |||
|
1815 | " means that there is both ``CRLF`` and ``LF`` present in the file.\n" | |||
|
1816 | " Such files are normally not touched under the assumption that they\n" | |||
|
1817 | " have mixed EOLs on purpose." | |||
|
1818 | msgstr "" | |||
|
1819 | ||||
|
1820 | msgid "" | |||
|
1821 | "See :hg:`help patterns` for more information about the glob patterns\n" | |||
|
1822 | "used.\n" | |||
|
1823 | msgstr "" | |||
|
1824 | "Se :hg:`help patterns` för mer information om de använda glob-mönstren.\n" | |||
|
1825 | ||||
|
1826 | #, python-format | |||
|
1827 | msgid "%s should not have CRLF line endings" | |||
|
1828 | msgstr "" | |||
|
1829 | ||||
|
1830 | #, python-format | |||
|
1831 | msgid "%s should not have LF line endings" | |||
|
1832 | msgstr "" | |||
|
1833 | ||||
|
1834 | msgid "the eol extension is incompatible with the win32text extension" | |||
|
1835 | msgstr "eol-utökningen är inkompativel med win32text-utökningen" | |||
|
1836 | ||||
|
1837 | #, python-format | |||
|
1838 | msgid "ignoring unknown EOL style '%s' from %s\n" | |||
|
1839 | msgstr "" | |||
|
1840 | ||||
|
1841 | #, python-format | |||
|
1842 | msgid "inconsistent newline style in %s\n" | |||
|
1843 | msgstr "" | |||
|
1844 | ||||
1445 | msgid "command to allow external programs to compare revisions" |
|
1845 | msgid "command to allow external programs to compare revisions" | |
1446 | msgstr "" |
|
1846 | msgstr "" | |
1447 |
|
1847 | |||
@@ -1455,7 +1855,7 b' msgstr ""' | |||||
1455 |
|
1855 | |||
1456 | msgid "" |
|
1856 | msgid "" | |
1457 | "The extdiff extension also allows to configure new diff commands, so\n" |
|
1857 | "The extdiff extension also allows to configure new diff commands, so\n" | |
1458 |
"you do not need to type |
|
1858 | "you do not need to type :hg:`extdiff -p kdiff3` always. ::" | |
1459 | msgstr "" |
|
1859 | msgstr "" | |
1460 |
|
1860 | |||
1461 | msgid "" |
|
1861 | msgid "" | |
@@ -1485,11 +1885,36 b' msgid ""' | |||||
1485 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" |
|
1885 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" | |
1486 | msgstr "" |
|
1886 | msgstr "" | |
1487 |
|
1887 | |||
1488 | msgid "" |
|
1888 | msgid "Tool arguments can include variables that are expanded at runtime::" | |
1489 | "You can use -I/-X and list of file or directory names like normal \"hg\n" |
|
1889 | msgstr "" | |
1490 | "diff\" command. The extdiff extension makes snapshots of only needed\n" |
|
1890 | ||
1491 | "files, so running the external diff program will actually be pretty\n" |
|
1891 | msgid "" | |
1492 | "fast (at least faster than having to compare the entire tree).\n" |
|
1892 | " $parent1, $plabel1 - filename, descriptive label of first parent\n" | |
|
1893 | " $child, $clabel - filename, descriptive label of child revision\n" | |||
|
1894 | " $parent2, $plabel2 - filename, descriptive label of second parent\n" | |||
|
1895 | " $parent is an alias for $parent1." | |||
|
1896 | msgstr "" | |||
|
1897 | ||||
|
1898 | msgid "" | |||
|
1899 | "The extdiff extension will look in your [diff-tools] and [merge-tools]\n" | |||
|
1900 | "sections for diff tool arguments, when none are specified in [extdiff]." | |||
|
1901 | msgstr "" | |||
|
1902 | ||||
|
1903 | msgid "" | |||
|
1904 | " [extdiff]\n" | |||
|
1905 | " kdiff3 =" | |||
|
1906 | msgstr "" | |||
|
1907 | ||||
|
1908 | msgid "" | |||
|
1909 | " [diff-tools]\n" | |||
|
1910 | " kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child" | |||
|
1911 | msgstr "" | |||
|
1912 | ||||
|
1913 | msgid "" | |||
|
1914 | "You can use -I/-X and list of file or directory names like normal\n" | |||
|
1915 | ":hg:`diff` command. The extdiff extension makes snapshots of only\n" | |||
|
1916 | "needed files, so running the external diff program will actually be\n" | |||
|
1917 | "pretty fast (at least faster than having to compare the entire tree).\n" | |||
1493 | msgstr "" |
|
1918 | msgstr "" | |
1494 |
|
1919 | |||
1495 | #, python-format |
|
1920 | #, python-format | |
@@ -1530,9 +1955,15 b' msgid ""' | |||||
1530 | " to its parent." |
|
1955 | " to its parent." | |
1531 | msgstr "" |
|
1956 | msgstr "" | |
1532 |
|
1957 | |||
|
1958 | msgid "CMD" | |||
|
1959 | msgstr "" | |||
|
1960 | ||||
1533 | msgid "comparison program to run" |
|
1961 | msgid "comparison program to run" | |
1534 | msgstr "" |
|
1962 | msgstr "" | |
1535 |
|
1963 | |||
|
1964 | msgid "OPT" | |||
|
1965 | msgstr "" | |||
|
1966 | ||||
1536 | msgid "pass option to comparison program" |
|
1967 | msgid "pass option to comparison program" | |
1537 | msgstr "" |
|
1968 | msgstr "" | |
1538 |
|
1969 | |||
@@ -1582,11 +2013,14 b' msgid ""' | |||||
1582 | msgstr "" |
|
2013 | msgstr "" | |
1583 |
|
2014 | |||
1584 | msgid "" |
|
2015 | msgid "" | |
1585 |
" See |
|
2016 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" | |
1586 | " " |
|
2017 | " " | |
1587 | msgstr "" |
|
2018 | msgstr "" | |
1588 |
|
2019 | " Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n" | ||
1589 | msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" |
|
2020 | " " | |
|
2021 | ||||
|
2022 | msgid "" | |||
|
2023 | "working dir not at branch tip (use \"hg update\" to check out branch tip)" | |||
1590 | msgstr "" |
|
2024 | msgstr "" | |
1591 |
|
2025 | |||
1592 | msgid "outstanding uncommitted merge" |
|
2026 | msgid "outstanding uncommitted merge" | |
@@ -1598,18 +2032,23 b' msgstr ""' | |||||
1598 | msgid "working directory is missing some files" |
|
2032 | msgid "working directory is missing some files" | |
1599 | msgstr "" |
|
2033 | msgstr "" | |
1600 |
|
2034 | |||
1601 | msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" |
|
2035 | msgid "" | |
|
2036 | "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" | |||
1602 | msgstr "" |
|
2037 | msgstr "" | |
1603 |
|
2038 | |||
1604 | #, python-format |
|
2039 | #, python-format | |
1605 | msgid "pulling from %s\n" |
|
2040 | msgid "pulling from %s\n" | |
1606 | msgstr "drar från %s\n" |
|
2041 | msgstr "drar från %s\n" | |
1607 |
|
2042 | |||
1608 | msgid "Other repository doesn't support revision lookup, so a rev cannot be specified." |
|
2043 | msgid "" | |
1609 | msgstr "" |
|
2044 | "Other repository doesn't support revision lookup, so a rev cannot be " | |
1610 |
|
2045 | "specified." | ||
1611 | #, python-format |
|
2046 | msgstr "" | |
1612 | msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" |
|
2047 | ||
|
2048 | #, python-format | |||
|
2049 | msgid "" | |||
|
2050 | "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" | |||
|
2051 | "\" to merge them)\n" | |||
1613 | msgstr "" |
|
2052 | msgstr "" | |
1614 |
|
2053 | |||
1615 | #, python-format |
|
2054 | #, python-format | |
@@ -1689,7 +2128,9 b' msgstr "Signerar %d:%s\\n"' | |||||
1689 | msgid "Error while signing" |
|
2128 | msgid "Error while signing" | |
1690 | msgstr "" |
|
2129 | msgstr "" | |
1691 |
|
2130 | |||
1692 | msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" |
|
2131 | msgid "" | |
|
2132 | "working copy of .hgsigs is changed (please commit .hgsigs manually or use --" | |||
|
2133 | "force)" | |||
1693 | msgstr "" |
|
2134 | msgstr "" | |
1694 |
|
2135 | |||
1695 | msgid "unknown signature version" |
|
2136 | msgid "unknown signature version" | |
@@ -1704,9 +2145,15 b' msgstr ""' | |||||
1704 | msgid "do not commit the sigfile after signing" |
|
2145 | msgid "do not commit the sigfile after signing" | |
1705 | msgstr "" |
|
2146 | msgstr "" | |
1706 |
|
2147 | |||
|
2148 | msgid "ID" | |||
|
2149 | msgstr "" | |||
|
2150 | ||||
1707 | msgid "the key id to sign with" |
|
2151 | msgid "the key id to sign with" | |
1708 | msgstr "" |
|
2152 | msgstr "" | |
1709 |
|
2153 | |||
|
2154 | msgid "TEXT" | |||
|
2155 | msgstr "TEXT" | |||
|
2156 | ||||
1710 | msgid "commit message" |
|
2157 | msgid "commit message" | |
1711 | msgstr "" |
|
2158 | msgstr "" | |
1712 |
|
2159 | |||
@@ -1763,6 +2210,9 b' msgstr "inga \xc3\xa4ndringar hittades\\n"' | |||||
1763 | msgid "show the revision DAG" |
|
2210 | msgid "show the revision DAG" | |
1764 | msgstr "visa revisionsdiagram" |
|
2211 | msgstr "visa revisionsdiagram" | |
1765 |
|
2212 | |||
|
2213 | msgid "NUM" | |||
|
2214 | msgstr "" | |||
|
2215 | ||||
1766 | msgid "limit number of changes displayed" |
|
2216 | msgid "limit number of changes displayed" | |
1767 | msgstr "begränsa antalet visade ändringar" |
|
2217 | msgstr "begränsa antalet visade ändringar" | |
1768 |
|
2218 | |||
@@ -1848,7 +2298,7 b' msgid ""' | |||||
1848 | msgstr "" |
|
2298 | msgstr "" | |
1849 |
|
2299 | |||
1850 | msgid "" |
|
2300 | msgid "" | |
1851 |
"The |
|
2301 | "The :hg:`view` command will launch the hgk Tcl script. For this command\n" | |
1852 | "to work, hgk must be in your search path. Alternately, you can specify\n" |
|
2302 | "to work, hgk must be in your search path. Alternately, you can specify\n" | |
1853 | "the path to hgk in your .hgrc file::" |
|
2303 | "the path to hgk in your .hgrc file::" | |
1854 | msgstr "" |
|
2304 | msgstr "" | |
@@ -2117,7 +2567,9 b' msgstr ""' | |||||
2117 | msgid "cannot start: socket is already bound" |
|
2567 | msgid "cannot start: socket is already bound" | |
2118 | msgstr "" |
|
2568 | msgstr "" | |
2119 |
|
2569 | |||
2120 | msgid "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/inotify.sock already exists" |
|
2570 | msgid "" | |
|
2571 | "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" | |||
|
2572 | "inotify.sock already exists" | |||
2121 | msgstr "" |
|
2573 | msgstr "" | |
2122 |
|
2574 | |||
2123 | #, python-format |
|
2575 | #, python-format | |
@@ -2149,7 +2601,8 b' msgstr ""' | |||||
2149 | msgid "" |
|
2601 | msgid "" | |
2150 | " [interhg]\n" |
|
2602 | " [interhg]\n" | |
2151 | " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" |
|
2603 | " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" | |
2152 |
" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>! |
|
2604 | " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" | |
|
2605 | "i\n" | |||
2153 | " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" |
|
2606 | " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" | |
2154 | msgstr "" |
|
2607 | msgstr "" | |
2155 |
|
2608 | |||
@@ -2176,8 +2629,8 b' msgid ""' | |||||
2176 | msgstr "" |
|
2629 | msgstr "" | |
2177 |
|
2630 | |||
2178 | msgid "" |
|
2631 | msgid "" | |
2179 |
"Configuration is done in the [keyword] and [keywordmaps] |
|
2632 | "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" | |
2180 | "hgrc files." |
|
2633 | "sections of hgrc files." | |
2181 | msgstr "" |
|
2634 | msgstr "" | |
2182 |
|
2635 | |||
2183 | msgid "Example::" |
|
2636 | msgid "Example::" | |
@@ -2191,43 +2644,46 b' msgid ""' | |||||
2191 | msgstr "" |
|
2644 | msgstr "" | |
2192 |
|
2645 | |||
2193 | msgid "" |
|
2646 | msgid "" | |
|
2647 | " [keywordset]\n" | |||
|
2648 | " # prefer svn- over cvs-like default keywordmaps\n" | |||
|
2649 | " svn = True" | |||
|
2650 | msgstr "" | |||
|
2651 | ||||
|
2652 | msgid "" | |||
2194 | "NOTE: the more specific you are in your filename patterns the less you\n" |
|
2653 | "NOTE: the more specific you are in your filename patterns the less you\n" | |
2195 | "lose speed in huge repositories." |
|
2654 | "lose speed in huge repositories." | |
2196 | msgstr "" |
|
2655 | msgstr "" | |
2197 |
|
2656 | |||
2198 | msgid "" |
|
2657 | msgid "" | |
2199 | "For [keywordmaps] template mapping and expansion demonstration and\n" |
|
2658 | "For [keywordmaps] template mapping and expansion demonstration and\n" | |
2200 |
"control run |
|
2659 | "control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n" | |
2201 | "available templates and filters." |
|
2660 | "available templates and filters." | |
2202 | msgstr "" |
|
2661 | msgstr "" | |
2203 |
|
2662 | |||
2204 | msgid "" |
|
2663 | msgid "Three additional date template filters are provided::" | |
2205 | "An additional date template filter {date|utcdate} is provided. It\n" |
|
2664 | msgstr "" | |
2206 | "returns a date like \"2006/09/18 15:13:13\"." |
|
2665 | ||
2207 |
msg |
|
2666 | msgid "" | |
2208 |
|
2667 | " utcdate \"2006/09/18 15:13:13\"\n" | ||
2209 | msgid "" |
|
2668 | " svnutcdate \"2006-09-18 15:13:13Z\"\n" | |
2210 | "The default template mappings (view with \"hg kwdemo -d\") can be\n" |
|
2669 | " svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" | |
2211 | "replaced with customized keywords and templates. Again, run \"hg\n" |
|
2670 | msgstr "" | |
2212 | "kwdemo\" to control the results of your config changes." |
|
2671 | ||
2213 |
msg |
|
2672 | msgid "" | |
2214 |
|
2673 | "The default template mappings (view with :hg:`kwdemo -d`) can be\n" | ||
2215 | msgid "" |
|
2674 | "replaced with customized keywords and templates. Again, run\n" | |
2216 | "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" |
|
2675 | ":hg:`kwdemo` to control the results of your config changes." | |
|
2676 | msgstr "" | |||
|
2677 | ||||
|
2678 | msgid "" | |||
|
2679 | "Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n" | |||
2217 | "the risk of inadvertently storing expanded keywords in the change\n" |
|
2680 | "the risk of inadvertently storing expanded keywords in the change\n" | |
2218 | "history." |
|
2681 | "history." | |
2219 | msgstr "" |
|
2682 | msgstr "" | |
2220 |
|
2683 | |||
2221 | msgid "" |
|
2684 | msgid "" | |
2222 | "To force expansion after enabling it, or a configuration change, run\n" |
|
2685 | "To force expansion after enabling it, or a configuration change, run\n" | |
2223 |
" |
|
2686 | ":hg:`kwexpand`." | |
2224 | msgstr "" |
|
|||
2225 |
|
||||
2226 | msgid "" |
|
|||
2227 | "Also, when committing with the record extension or using mq's qrecord,\n" |
|
|||
2228 | "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" |
|
|||
2229 | "the files in question to update keyword expansions after all changes\n" |
|
|||
2230 | "have been checked in." |
|
|||
2231 | msgstr "" |
|
2687 | msgstr "" | |
2232 |
|
2688 | |||
2233 | msgid "" |
|
2689 | msgid "" | |
@@ -2267,9 +2723,11 b' msgid " Use -d/--default to disable c' | |||||
2267 | msgstr "" |
|
2723 | msgstr "" | |
2268 |
|
2724 | |||
2269 | msgid "" |
|
2725 | msgid "" | |
2270 |
" See |
|
2726 | " See :hg:`help templates` for information on templates and filters.\n" | |
2271 | " " |
|
2727 | " " | |
2272 | msgstr "" |
|
2728 | msgstr "" | |
|
2729 | " Se :hg:`help templates` för information om mallar och filter.\n" | |||
|
2730 | " " | |||
2273 |
|
2731 | |||
2274 | #, python-format |
|
2732 | #, python-format | |
2275 | msgid "creating temporary repository at %s\n" |
|
2733 | msgid "creating temporary repository at %s\n" | |
@@ -2339,7 +2797,7 b' msgid ""' | |||||
2339 | msgstr "" |
|
2797 | msgstr "" | |
2340 |
|
2798 | |||
2341 | msgid "" |
|
2799 | msgid "" | |
2342 |
" See |
|
2800 | " See :hg:`help keyword` on how to construct patterns both for\n" | |
2343 | " inclusion and exclusion of files." |
|
2801 | " inclusion and exclusion of files." | |
2344 | msgstr "" |
|
2802 | msgstr "" | |
2345 |
|
2803 | |||
@@ -2361,7 +2819,7 b' msgstr ""' | |||||
2361 |
|
2819 | |||
2362 | msgid "" |
|
2820 | msgid "" | |
2363 | " Run before changing/disabling active keywords or if you experience\n" |
|
2821 | " Run before changing/disabling active keywords or if you experience\n" | |
2364 |
" problems with |
|
2822 | " problems with :hg:`import` or :hg:`merge`." | |
2365 | msgstr "" |
|
2823 | msgstr "" | |
2366 |
|
2824 | |||
2367 | msgid "" |
|
2825 | msgid "" | |
@@ -2410,7 +2868,7 b' msgid ""' | |||||
2410 | "directory. Applied patches are both patch files and changesets." |
|
2868 | "directory. Applied patches are both patch files and changesets." | |
2411 | msgstr "" |
|
2869 | msgstr "" | |
2412 |
|
2870 | |||
2413 |
msgid "Common tasks (use |
|
2871 | msgid "Common tasks (use :hg:`help command` for more details)::" | |
2414 | msgstr "" |
|
2872 | msgstr "" | |
2415 |
|
2873 | |||
2416 | msgid "" |
|
2874 | msgid "" | |
@@ -2444,7 +2902,12 b' msgid ""' | |||||
2444 | "If set to 'keep', mq will obey the [diff] section configuration while\n" |
|
2902 | "If set to 'keep', mq will obey the [diff] section configuration while\n" | |
2445 | "preserving existing git patches upon qrefresh. If set to 'yes' or\n" |
|
2903 | "preserving existing git patches upon qrefresh. If set to 'yes' or\n" | |
2446 | "'no', mq will override the [diff] section and always generate git or\n" |
|
2904 | "'no', mq will override the [diff] section and always generate git or\n" | |
2447 |
"regular patches, possibly losing data in the second case. |
|
2905 | "regular patches, possibly losing data in the second case." | |
|
2906 | msgstr "" | |||
|
2907 | ||||
|
2908 | msgid "" | |||
|
2909 | "You will by default be managing a patch queue named \"patches\". You can\n" | |||
|
2910 | "create other, independent patch queues with the :hg:`qqueue` command.\n" | |||
2448 | msgstr "" |
|
2911 | msgstr "" | |
2449 |
|
2912 | |||
2450 | #, python-format |
|
2913 | #, python-format | |
@@ -2635,6 +3098,10 b' msgstr ""' | |||||
2635 | msgid "patch series already fully applied\n" |
|
3098 | msgid "patch series already fully applied\n" | |
2636 | msgstr "" |
|
3099 | msgstr "" | |
2637 |
|
3100 | |||
|
3101 | #, python-format | |||
|
3102 | msgid "patch '%s' not found" | |||
|
3103 | msgstr "patchen '%s' hittades inte" | |||
|
3104 | ||||
2638 | msgid "cleaning up working directory..." |
|
3105 | msgid "cleaning up working directory..." | |
2639 | msgstr "" |
|
3106 | msgstr "" | |
2640 |
|
3107 | |||
@@ -2680,7 +3147,9 b' msgstr ""' | |||||
2680 | msgid "cannot refresh a revision with children" |
|
3147 | msgid "cannot refresh a revision with children" | |
2681 | msgstr "" |
|
3148 | msgstr "" | |
2682 |
|
3149 | |||
2683 | msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" |
|
3150 | msgid "" | |
|
3151 | "refresh interrupted while patch was popped! (revert --all, qpush to " | |||
|
3152 | "recover)\n" | |||
2684 | msgstr "" |
|
3153 | msgstr "" | |
2685 |
|
3154 | |||
2686 | msgid "patch queue directory already exists" |
|
3155 | msgid "patch queue directory already exists" | |
@@ -2778,13 +3247,14 b' msgid "remove patches from queue"' | |||||
2778 | msgstr "" |
|
3247 | msgstr "" | |
2779 |
|
3248 | |||
2780 | msgid "" |
|
3249 | msgid "" | |
2781 |
" The patches must not be applied, and at least one patch is required. |
|
3250 | " The patches must not be applied, and at least one patch is required. " | |
|
3251 | "With\n" | |||
2782 | " -k/--keep, the patch files are preserved in the patch directory." |
|
3252 | " -k/--keep, the patch files are preserved in the patch directory." | |
2783 | msgstr "" |
|
3253 | msgstr "" | |
2784 |
|
3254 | |||
2785 | msgid "" |
|
3255 | msgid "" | |
2786 | " To stop managing a patch and move it into permanent history,\n" |
|
3256 | " To stop managing a patch and move it into permanent history,\n" | |
2787 | " use the qfinish command." |
|
3257 | " use the :hg:`qfinish` command." | |
2788 | msgstr "" |
|
3258 | msgstr "" | |
2789 |
|
3259 | |||
2790 | msgid "print the patches already applied" |
|
3260 | msgid "print the patches already applied" | |
@@ -2852,7 +3322,7 b' msgstr ""' | |||||
2852 |
|
3322 | |||
2853 | msgid "" |
|
3323 | msgid "" | |
2854 | " This command is deprecated. Without -c, it's implied by other relevant\n" |
|
3324 | " This command is deprecated. Without -c, it's implied by other relevant\n" | |
2855 |
" commands. With -c, use |
|
3325 | " commands. With -c, use :hg:`init --mq` instead." | |
2856 | msgstr "" |
|
3326 | msgstr "" | |
2857 |
|
3327 | |||
2858 | msgid "clone main and patch repository at same time" |
|
3328 | msgid "clone main and patch repository at same time" | |
@@ -2873,7 +3343,7 b' msgstr ""' | |||||
2873 |
|
3343 | |||
2874 | msgid "" |
|
3344 | msgid "" | |
2875 | " The patch directory must be a nested Mercurial repository, as\n" |
|
3345 | " The patch directory must be a nested Mercurial repository, as\n" | |
2876 | " would be created by init --mq.\n" |
|
3346 | " would be created by :hg:`init --mq`.\n" | |
2877 | " " |
|
3347 | " " | |
2878 | msgstr "" |
|
3348 | msgstr "" | |
2879 |
|
3349 | |||
@@ -2895,8 +3365,9 b' msgstr ""' | |||||
2895 | msgid "commit changes in the queue repository (DEPRECATED)" |
|
3365 | msgid "commit changes in the queue repository (DEPRECATED)" | |
2896 | msgstr "arkivera ändringar i köarkivet (FÖRÅLDRAD)" |
|
3366 | msgstr "arkivera ändringar i köarkivet (FÖRÅLDRAD)" | |
2897 |
|
3367 | |||
2898 |
msgid " This command is deprecated; use |
|
3368 | msgid " This command is deprecated; use :hg:`commit --mq` instead." | |
2899 | msgstr " Detta är ett föråldrat kommando; använd hg commit --mq istället." |
|
3369 | msgstr "" | |
|
3370 | " Detta är ett föråldrat kommando; använd :hg:`commit --mq` istället." | |||
2900 |
|
3371 | |||
2901 | msgid "print the entire series file" |
|
3372 | msgid "print the entire series file" | |
2902 | msgstr "" |
|
3373 | msgstr "" | |
@@ -2978,9 +3449,9 b' msgid ""' | |||||
2978 | msgstr "" |
|
3449 | msgstr "" | |
2979 |
|
3450 | |||
2980 | msgid "" |
|
3451 | msgid "" | |
2981 |
" Use |
|
3452 | " Use :hg:`diff` if you only want to see the changes made since the\n" | |
2982 |
" last qrefresh, or |
|
3453 | " last qrefresh, or :hg:`export qtip` if you want to see changes\n" | |
2983 | " by the current patch without including changes made since the\n" |
|
3454 | " made by the current patch without including changes made since the\n" | |
2984 | " qrefresh.\n" |
|
3455 | " qrefresh.\n" | |
2985 | " " |
|
3456 | " " | |
2986 | msgstr "" |
|
3457 | msgstr "" | |
@@ -3029,8 +3500,9 b' msgstr ""' | |||||
3029 | msgid "" |
|
3500 | msgid "" | |
3030 | " Guards control whether a patch can be pushed. A patch with no\n" |
|
3501 | " Guards control whether a patch can be pushed. A patch with no\n" | |
3031 | " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" |
|
3502 | " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" | |
3032 | " pushed only if the qselect command has activated it. A patch with\n" |
|
3503 | " pushed only if the :hg:`qselect` command has activated it. A patch with\n" | |
3033 |
" a negative guard (\"-foo\") is never pushed if the qselect |
|
3504 | " a negative guard (\"-foo\") is never pushed if the :hg:`qselect` " | |
|
3505 | "command\n" | |||
3034 | " has activated it." |
|
3506 | " has activated it." | |
3035 | msgstr "" |
|
3507 | msgstr "" | |
3036 |
|
3508 | |||
@@ -3132,13 +3604,36 b' msgstr ""' | |||||
3132 | msgid "copy %s to %s\n" |
|
3604 | msgid "copy %s to %s\n" | |
3133 | msgstr "" |
|
3605 | msgstr "" | |
3134 |
|
3606 | |||
3135 |
msgid "strip a |
|
3607 | msgid "strip a changeset and all its descendants from the repository" | |
3136 | msgstr "" |
|
3608 | msgstr "" | |
3137 |
|
3609 | |||
3138 | msgid "" |
|
3610 | msgid "" | |
3139 | " If one of the working directory's parent revisions is stripped, the\n" |
|
3611 | " The strip command removes all changesets whose local revision\n" | |
3140 | " working directory will be updated to the parent of the stripped\n" |
|
3612 | " number is greater than or equal to REV, and then restores any\n" | |
3141 | " revision.\n" |
|
3613 | " changesets that are not descendants of REV. If the working\n" | |
|
3614 | " directory has uncommitted changes, the operation is aborted unless\n" | |||
|
3615 | " the --force flag is supplied." | |||
|
3616 | msgstr "" | |||
|
3617 | ||||
|
3618 | msgid "" | |||
|
3619 | " If a parent of the working directory is stripped, then the working\n" | |||
|
3620 | " directory will automatically be updated to the most recent\n" | |||
|
3621 | " available ancestor of the stripped parent after the operation\n" | |||
|
3622 | " completes." | |||
|
3623 | msgstr "" | |||
|
3624 | ||||
|
3625 | msgid "" | |||
|
3626 | " Any stripped changesets are stored in ``.hg/strip-backup`` as a\n" | |||
|
3627 | " bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n" | |||
|
3628 | " be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n" | |||
|
3629 | " where BUNDLE is the bundle file created by the strip. Note that\n" | |||
|
3630 | " the local revision numbers will in general be different after the\n" | |||
|
3631 | " restore." | |||
|
3632 | msgstr "" | |||
|
3633 | ||||
|
3634 | msgid "" | |||
|
3635 | " Use the --nobackup option to discard the backup bundle once the\n" | |||
|
3636 | " operation completes.\n" | |||
3142 | " " |
|
3637 | " " | |
3143 | msgstr "" |
|
3638 | msgstr "" | |
3144 |
|
3639 | |||
@@ -3146,7 +3641,7 b' msgid "set or print guarded patches to p' | |||||
3146 | msgstr "" |
|
3641 | msgstr "" | |
3147 |
|
3642 | |||
3148 | msgid "" |
|
3643 | msgid "" | |
3149 | " Use the qguard command to set or print guards on patch, then use\n" |
|
3644 | " Use the :hg:`qguard` command to set or print guards on patch, then use\n" | |
3150 | " qselect to tell mq which guards to use. A patch will be pushed if\n" |
|
3645 | " qselect to tell mq which guards to use. A patch will be pushed if\n" | |
3151 | " it has no guards or any positive guards match the currently\n" |
|
3646 | " it has no guards or any positive guards match the currently\n" | |
3152 | " selected guard, but will not be pushed if any negative guards\n" |
|
3647 | " selected guard, but will not be pushed if any negative guards\n" | |
@@ -3244,6 +3739,58 b' msgstr ""' | |||||
3244 | msgid "no revisions specified" |
|
3739 | msgid "no revisions specified" | |
3245 | msgstr "" |
|
3740 | msgstr "" | |
3246 |
|
3741 | |||
|
3742 | msgid "manage multiple patch queues" | |||
|
3743 | msgstr "" | |||
|
3744 | ||||
|
3745 | msgid "" | |||
|
3746 | " Supports switching between different patch queues, as well as creating\n" | |||
|
3747 | " new patch queues and deleting existing ones." | |||
|
3748 | msgstr "" | |||
|
3749 | ||||
|
3750 | msgid "" | |||
|
3751 | " Omitting a queue name or specifying -l/--list will show you the " | |||
|
3752 | "registered\n" | |||
|
3753 | " queues - by default the \"normal\" patches queue is registered. The " | |||
|
3754 | "currently\n" | |||
|
3755 | " active queue will be marked with \"(active)\"." | |||
|
3756 | msgstr "" | |||
|
3757 | ||||
|
3758 | msgid "" | |||
|
3759 | " To create a new queue, use -c/--create. The queue is automatically made\n" | |||
|
3760 | " active, except in the case where there are applied patches from the\n" | |||
|
3761 | " currently active queue in the repository. Then the queue will only be\n" | |||
|
3762 | " created and switching will fail." | |||
|
3763 | msgstr "" | |||
|
3764 | ||||
|
3765 | msgid "" | |||
|
3766 | " To delete an existing queue, use --delete. You cannot delete the " | |||
|
3767 | "currently\n" | |||
|
3768 | " active queue.\n" | |||
|
3769 | " " | |||
|
3770 | msgstr "" | |||
|
3771 | ||||
|
3772 | msgid "patches applied - cannot set new queue active" | |||
|
3773 | msgstr "" | |||
|
3774 | ||||
|
3775 | msgid " (active)\n" | |||
|
3776 | msgstr " (aktiv)\n" | |||
|
3777 | ||||
|
3778 | msgid "invalid queue name, may not contain the characters \":\\/.\"" | |||
|
3779 | msgstr "" | |||
|
3780 | ||||
|
3781 | #, python-format | |||
|
3782 | msgid "queue \"%s\" already exists" | |||
|
3783 | msgstr "kön \"%s\" finns redan" | |||
|
3784 | ||||
|
3785 | msgid "cannot delete queue that does not exist" | |||
|
3786 | msgstr "" | |||
|
3787 | ||||
|
3788 | msgid "cannot delete currently active queue" | |||
|
3789 | msgstr "" | |||
|
3790 | ||||
|
3791 | msgid "use --create to create a new queue" | |||
|
3792 | msgstr "" | |||
|
3793 | ||||
3247 | msgid "cannot commit over an applied mq patch" |
|
3794 | msgid "cannot commit over an applied mq patch" | |
3248 | msgstr "" |
|
3795 | msgstr "" | |
3249 |
|
3796 | |||
@@ -3267,6 +3814,20 b' msgstr "bara ett lokalt k\xc3\xb6arkiv kan initialiseras"' | |||||
3267 | msgid "There is no Mercurial repository here (.hg not found)" |
|
3814 | msgid "There is no Mercurial repository here (.hg not found)" | |
3268 | msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" |
|
3815 | msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" | |
3269 |
|
3816 | |||
|
3817 | msgid "no queue repository" | |||
|
3818 | msgstr "inget köarkiv" | |||
|
3819 | ||||
|
3820 | #, python-format | |||
|
3821 | msgid "%d applied" | |||
|
3822 | msgstr "%d applicerade" | |||
|
3823 | ||||
|
3824 | #, python-format | |||
|
3825 | msgid "%d unapplied" | |||
|
3826 | msgstr "%d oapplicerade" | |||
|
3827 | ||||
|
3828 | msgid "mq: (empty queue)\n" | |||
|
3829 | msgstr "mq: (tom kö)\n" | |||
|
3830 | ||||
3270 | msgid "operate on patch repository" |
|
3831 | msgid "operate on patch repository" | |
3271 | msgstr "arbeta med patcharkiv" |
|
3832 | msgstr "arbeta med patcharkiv" | |
3272 |
|
3833 | |||
@@ -3288,6 +3849,9 b' msgstr ""' | |||||
3288 | msgid "use uncompressed transfer (fast over LAN)" |
|
3849 | msgid "use uncompressed transfer (fast over LAN)" | |
3289 | msgstr "använd okomprimerad överföring (snabbt över LAN)" |
|
3850 | msgstr "använd okomprimerad överföring (snabbt över LAN)" | |
3290 |
|
3851 | |||
|
3852 | msgid "REPO" | |||
|
3853 | msgstr "" | |||
|
3854 | ||||
3291 | msgid "location of source patch repository" |
|
3855 | msgid "location of source patch repository" | |
3292 | msgstr "" |
|
3856 | msgstr "" | |
3293 |
|
3857 | |||
@@ -3369,23 +3933,26 b' msgstr "importera icke arkiverade \xc3\xa4ndringar (F\xc3\x96RLEGAD)"' | |||||
3369 | msgid "add \"From: <current user>\" to patch" |
|
3933 | msgid "add \"From: <current user>\" to patch" | |
3370 | msgstr "" |
|
3934 | msgstr "" | |
3371 |
|
3935 | |||
3372 | msgid "add \"From: <given user>\" to patch" |
|
3936 | msgid "USER" | |
|
3937 | msgstr "" | |||
|
3938 | ||||
|
3939 | msgid "add \"From: <USER>\" to patch" | |||
3373 | msgstr "" |
|
3940 | msgstr "" | |
3374 |
|
3941 | |||
3375 | msgid "add \"Date: <current date>\" to patch" |
|
3942 | msgid "add \"Date: <current date>\" to patch" | |
3376 | msgstr "" |
|
3943 | msgstr "" | |
3377 |
|
3944 | |||
3378 |
msgid "add \"Date: < |
|
3945 | msgid "add \"Date: <DATE>\" to patch" | |
3379 | msgstr "" |
|
3946 | msgstr "" | |
3380 |
|
3947 | |||
3381 |
msgid "hg qnew [-e] [-m TEXT] [-l FILE] |
|
3948 | msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." | |
3382 | msgstr "" |
|
3949 | msgstr "hg qnew [-e] [-m TEXT] [-l FIL] PATCH [FIL]..." | |
3383 |
|
3950 | |||
3384 | msgid "hg qnext [-s]" |
|
3951 | msgid "hg qnext [-s]" | |
3385 | msgstr "" |
|
3952 | msgstr "hg qnext [-s]" | |
3386 |
|
3953 | |||
3387 | msgid "hg qprev [-s]" |
|
3954 | msgid "hg qprev [-s]" | |
3388 | msgstr "" |
|
3955 | msgstr "hg qprev [-s]" | |
3389 |
|
3956 | |||
3390 | msgid "pop all patches" |
|
3957 | msgid "pop all patches" | |
3391 | msgstr "" |
|
3958 | msgstr "" | |
@@ -3414,8 +3981,11 b' msgstr ""' | |||||
3414 | msgid "merge queue name (DEPRECATED)" |
|
3981 | msgid "merge queue name (DEPRECATED)" | |
3415 | msgstr "" |
|
3982 | msgstr "" | |
3416 |
|
3983 | |||
3417 | msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" |
|
3984 | msgid "reorder patch series and apply only the patch" | |
3418 | msgstr "" |
|
3985 | msgstr "omordna patchserien och applicera bara patchen" | |
|
3986 | ||||
|
3987 | msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" | |||
|
3988 | msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAMN] [--move] [PATCH | INDEX]" | |||
3419 |
|
3989 | |||
3420 | msgid "refresh only files already in the patch and specified files" |
|
3990 | msgid "refresh only files already in the patch and specified files" | |
3421 | msgstr "" |
|
3991 | msgstr "" | |
@@ -3483,17 +4053,25 b' msgstr ""' | |||||
3483 | msgid "hg qseries [-ms]" |
|
4053 | msgid "hg qseries [-ms]" | |
3484 | msgstr "" |
|
4054 | msgstr "" | |
3485 |
|
4055 | |||
3486 | msgid "force removal with local changes" |
|
4056 | msgid "" | |
3487 | msgstr "" |
|
4057 | "force removal of changesets even if the working directory has uncommitted " | |
3488 |
|
4058 | "changes" | ||
3489 | msgid "bundle unrelated changesets" |
|
4059 | msgstr "" | |
3490 | msgstr "" |
|
4060 | "tvinga borttagning av ändringar även om arbetskatalogen har oarkiverade " | |
|
4061 | "ändringar" | |||
|
4062 | ||||
|
4063 | msgid "" | |||
|
4064 | "bundle only changesets with local revision number greater than REV which are " | |||
|
4065 | "not descendants of REV (DEPRECATED)" | |||
|
4066 | msgstr "" | |||
|
4067 | "bunta bara ändringar med lokala revisionsnummer större än REV som inte är " | |||
|
4068 | "ättling till REV (FÖRLEGAD)" | |||
3491 |
|
4069 | |||
3492 | msgid "no backups" |
|
4070 | msgid "no backups" | |
3493 | msgstr "" |
|
4071 | msgstr "" | |
3494 |
|
4072 | |||
3495 |
msgid "hg strip [-f] [- |
|
4073 | msgid "hg strip [-f] [-n] REV" | |
3496 | msgstr "" |
|
4074 | msgstr "hg strip [-f] [-n] REV" | |
3497 |
|
4075 | |||
3498 | msgid "hg qtop [-s]" |
|
4076 | msgid "hg qtop [-s]" | |
3499 | msgstr "" |
|
4077 | msgstr "" | |
@@ -3510,6 +4088,18 b' msgstr ""' | |||||
3510 | msgid "hg qfinish [-a] [REV]..." |
|
4088 | msgid "hg qfinish [-a] [REV]..." | |
3511 | msgstr "" |
|
4089 | msgstr "" | |
3512 |
|
4090 | |||
|
4091 | msgid "list all available queues" | |||
|
4092 | msgstr "visa alla tillgängliga köer" | |||
|
4093 | ||||
|
4094 | msgid "create new queue" | |||
|
4095 | msgstr "skapa ny kö" | |||
|
4096 | ||||
|
4097 | msgid "delete reference to queue" | |||
|
4098 | msgstr "" | |||
|
4099 | ||||
|
4100 | msgid "[OPTION] [QUEUE]" | |||
|
4101 | msgstr "[FLAGGA] [KÖ]" | |||
|
4102 | ||||
3513 | msgid "hooks for sending email notifications at commit/push time" |
|
4103 | msgid "hooks for sending email notifications at commit/push time" | |
3514 | msgstr "" |
|
4104 | msgstr "" | |
3515 |
|
4105 | |||
@@ -3561,7 +4151,8 b' msgid ""' | |||||
3561 | " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" |
|
4151 | " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" | |
3562 | " maxsubject = 67 # truncate subject line longer than this\n" |
|
4152 | " maxsubject = 67 # truncate subject line longer than this\n" | |
3563 | " diffstat = True # add a diffstat before the diff content\n" |
|
4153 | " diffstat = True # add a diffstat before the diff content\n" | |
3564 |
" sources = serve # notify if source of incoming changes in this |
|
4154 | " sources = serve # notify if source of incoming changes in this " | |
|
4155 | "list\n" | |||
3565 | " # (serve == ssh or http, push, pull, bundle)\n" |
|
4156 | " # (serve == ssh or http, push, pull, bundle)\n" | |
3566 | " merge = False # send notification for merges (default True)\n" |
|
4157 | " merge = False # send notification for merges (default True)\n" | |
3567 | " [email]\n" |
|
4158 | " [email]\n" | |
@@ -3576,9 +4167,6 b' msgid ""' | |||||
3576 | "handier for you." |
|
4167 | "handier for you." | |
3577 | msgstr "" |
|
4168 | msgstr "" | |
3578 |
|
4169 | |||
3579 | msgid "::" |
|
|||
3580 | msgstr "" |
|
|||
3581 |
|
||||
3582 | msgid "" |
|
4170 | msgid "" | |
3583 | " [usersubs]\n" |
|
4171 | " [usersubs]\n" | |
3584 | " # key is subscriber email, value is \",\"-separated list of glob patterns\n" |
|
4172 | " # key is subscriber email, value is \",\"-separated list of glob patterns\n" | |
@@ -3678,8 +4266,8 b' msgid "If pager.attend is present, pager' | |||||
3678 | msgstr "" |
|
4266 | msgstr "" | |
3679 |
|
4267 | |||
3680 | msgid "" |
|
4268 | msgid "" | |
3681 |
"To ignore global commands like |
|
4269 | "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" | |
3682 | "specify them in the global .hgrc\n" |
|
4270 | "to specify them in the global .hgrc\n" | |
3683 | msgstr "" |
|
4271 | msgstr "" | |
3684 |
|
4272 | |||
3685 | msgid "interpret suffixes to refer to ancestor revisions" |
|
4273 | msgid "interpret suffixes to refer to ancestor revisions" | |
@@ -3725,7 +4313,7 b' msgstr ""' | |||||
3725 | msgid "" |
|
4313 | msgid "" | |
3726 | "- The changeset description.\n" |
|
4314 | "- The changeset description.\n" | |
3727 | "- [Optional] The result of running diffstat on the patch.\n" |
|
4315 | "- [Optional] The result of running diffstat on the patch.\n" | |
3728 |
"- The patch itself, as generated by |
|
4316 | "- The patch itself, as generated by :hg:`export`." | |
3729 | msgstr "" |
|
4317 | msgstr "" | |
3730 |
|
4318 | |||
3731 | msgid "" |
|
4319 | msgid "" | |
@@ -3750,7 +4338,8 b' msgid ""' | |||||
3750 | " from = My Name <my@email>\n" |
|
4338 | " from = My Name <my@email>\n" | |
3751 | " to = recipient1, recipient2, ...\n" |
|
4339 | " to = recipient1, recipient2, ...\n" | |
3752 | " cc = cc1, cc2, ...\n" |
|
4340 | " cc = cc1, cc2, ...\n" | |
3753 | " bcc = bcc1, bcc2, ..." |
|
4341 | " bcc = bcc1, bcc2, ...\n" | |
|
4342 | " reply-to = address1, address2, ..." | |||
3754 | msgstr "" |
|
4343 | msgstr "" | |
3755 |
|
4344 | |||
3756 | msgid "" |
|
4345 | msgid "" | |
@@ -3759,13 +4348,13 b' msgid ""' | |||||
3759 | msgstr "" |
|
4348 | msgstr "" | |
3760 |
|
4349 | |||
3761 | msgid "" |
|
4350 | msgid "" | |
3762 |
"Then you can use the |
|
4351 | "Then you can use the :hg:`email` command to mail a series of\n" | |
3763 | "as a patchbomb." |
|
4352 | "changesets as a patchbomb." | |
3764 | msgstr "" |
|
4353 | msgstr "" | |
3765 |
|
4354 | |||
3766 | msgid "" |
|
4355 | msgid "" | |
3767 | "To avoid sending patches prematurely, it is a good idea to first run\n" |
|
4356 | "To avoid sending patches prematurely, it is a good idea to first run\n" | |
3768 |
"the |
|
4357 | "the :hg:`email` command with the \"-n\" option (test only). You will be\n" | |
3769 | "prompted for an email recipient address, a subject and an introductory\n" |
|
4358 | "prompted for an email recipient address, a subject and an introductory\n" | |
3770 | "message describing the patches of your patchbomb. Then when all is\n" |
|
4359 | "message describing the patches of your patchbomb. Then when all is\n" | |
3771 | "done, patchbomb messages are displayed. If the PAGER environment\n" |
|
4360 | "done, patchbomb messages are displayed. If the PAGER environment\n" | |
@@ -3821,9 +4410,9 b' msgid "send changesets by email"' | |||||
3821 | msgstr "" |
|
4410 | msgstr "" | |
3822 |
|
4411 | |||
3823 | msgid "" |
|
4412 | msgid "" | |
3824 |
" By default, diffs are sent in the format generated by |
|
4413 | " By default, diffs are sent in the format generated by\n" | |
3825 |
" one per message. The series starts with a \"[PATCH 0 |
|
4414 | " :hg:`export`, one per message. The series starts with a \"[PATCH 0\n" | |
3826 | " introduction, which describes the series as a whole." |
|
4415 | " of N]\" introduction, which describes the series as a whole." | |
3827 | msgstr "" |
|
4416 | msgstr "" | |
3828 |
|
4417 | |||
3829 | msgid "" |
|
4418 | msgid "" | |
@@ -3833,7 +4422,7 b' msgid ""' | |||||
3833 | " description. Next, (optionally) if the diffstat program is\n" |
|
4422 | " description. Next, (optionally) if the diffstat program is\n" | |
3834 | " installed and -d/--diffstat is used, the result of running\n" |
|
4423 | " installed and -d/--diffstat is used, the result of running\n" | |
3835 | " diffstat on the patch. Finally, the patch itself, as generated by\n" |
|
4424 | " diffstat on the patch. Finally, the patch itself, as generated by\n" | |
3836 |
" |
|
4425 | " :hg:`export`." | |
3837 | msgstr "" |
|
4426 | msgstr "" | |
3838 |
|
4427 | |||
3839 | msgid "" |
|
4428 | msgid "" | |
@@ -3872,7 +4461,8 b' msgstr ""' | |||||
3872 | msgid "" |
|
4461 | msgid "" | |
3873 | " hg email -b # send bundle of all patches not in default\n" |
|
4462 | " hg email -b # send bundle of all patches not in default\n" | |
3874 | " hg email -b DEST # send bundle of all patches not in DEST\n" |
|
4463 | " hg email -b DEST # send bundle of all patches not in DEST\n" | |
3875 |
" hg email -b -r 3000 # bundle of all ancestors of 3000 not in |
|
4464 | " hg email -b -r 3000 # bundle of all ancestors of 3000 not in " | |
|
4465 | "default\n" | |||
3876 | " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" |
|
4466 | " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" | |
3877 | msgstr "" |
|
4467 | msgstr "" | |
3878 |
|
4468 | |||
@@ -3945,6 +4535,9 b' msgstr ""' | |||||
3945 | msgid "write messages to mbox file instead of sending them" |
|
4535 | msgid "write messages to mbox file instead of sending them" | |
3946 | msgstr "" |
|
4536 | msgstr "" | |
3947 |
|
4537 | |||
|
4538 | msgid "email addresses replies should be sent to" | |||
|
4539 | msgstr "emailadresser som svar ska skickas till" | |||
|
4540 | ||||
3948 | msgid "subject of first message (intro or single patch)" |
|
4541 | msgid "subject of first message (intro or single patch)" | |
3949 | msgstr "" |
|
4542 | msgstr "" | |
3950 |
|
4543 | |||
@@ -4032,7 +4625,7 b' msgid " This means that purge will de' | |||||
4032 | msgstr "" |
|
4625 | msgstr "" | |
4033 |
|
4626 | |||
4034 | msgid "" |
|
4627 | msgid "" | |
4035 |
" - Unknown files: files marked with \"?\" by |
|
4628 | " - Unknown files: files marked with \"?\" by :hg:`status`\n" | |
4036 | " - Empty directories: in fact Mercurial ignores directories unless\n" |
|
4629 | " - Empty directories: in fact Mercurial ignores directories unless\n" | |
4037 | " they contain files under source control management" |
|
4630 | " they contain files under source control management" | |
4038 | msgstr "" |
|
4631 | msgstr "" | |
@@ -4043,7 +4636,7 b' msgstr ""' | |||||
4043 | msgid "" |
|
4636 | msgid "" | |
4044 | " - Modified and unmodified tracked files\n" |
|
4637 | " - Modified and unmodified tracked files\n" | |
4045 | " - Ignored files (unless --all is specified)\n" |
|
4638 | " - Ignored files (unless --all is specified)\n" | |
4046 |
" - New files added to the repository (with |
|
4639 | " - New files added to the repository (with :hg:`add`)" | |
4047 | msgstr "" |
|
4640 | msgstr "" | |
4048 |
|
4641 | |||
4049 | msgid "" |
|
4642 | msgid "" | |
@@ -4109,11 +4702,18 b' msgstr ""' | |||||
4109 | msgid "" |
|
4702 | msgid "" | |
4110 | " Rebase uses repeated merging to graft changesets from one part of\n" |
|
4703 | " Rebase uses repeated merging to graft changesets from one part of\n" | |
4111 | " history (the source) onto another (the destination). This can be\n" |
|
4704 | " history (the source) onto another (the destination). This can be\n" | |
4112 | " useful for linearizing local changes relative to a master\n" |
|
4705 | " useful for linearizing *local* changes relative to a master\n" | |
4113 | " development tree." |
|
4706 | " development tree." | |
4114 | msgstr "" |
|
4707 | msgstr "" | |
4115 |
|
4708 | |||
4116 | msgid "" |
|
4709 | msgid "" | |
|
4710 | " You should not rebase changesets that have already been shared\n" | |||
|
4711 | " with others. Doing so will force everybody else to perform the\n" | |||
|
4712 | " same rebase or they will end up with duplicated changesets after\n" | |||
|
4713 | " pulling in your rebased changesets." | |||
|
4714 | msgstr "" | |||
|
4715 | ||||
|
4716 | msgid "" | |||
4117 | " If you don't specify a destination changeset (``-d/--dest``),\n" |
|
4717 | " If you don't specify a destination changeset (``-d/--dest``),\n" | |
4118 | " rebase uses the tipmost head of the current named branch as the\n" |
|
4718 | " rebase uses the tipmost head of the current named branch as the\n" | |
4119 | " destination. (The destination changeset is not modified by\n" |
|
4719 | " destination. (The destination changeset is not modified by\n" | |
@@ -4153,7 +4753,11 b' msgstr ""' | |||||
4153 |
|
4753 | |||
4154 | msgid "" |
|
4754 | msgid "" | |
4155 | " If a rebase is interrupted to manually resolve a merge, it can be\n" |
|
4755 | " If a rebase is interrupted to manually resolve a merge, it can be\n" | |
4156 |
" continued with --continue/-c or aborted with --abort/-a. |
|
4756 | " continued with --continue/-c or aborted with --abort/-a." | |
|
4757 | msgstr "" | |||
|
4758 | ||||
|
4759 | msgid "" | |||
|
4760 | " Returns 0 on success, 1 if nothing to rebase.\n" | |||
4157 | " " |
|
4761 | " " | |
4158 | msgstr "" |
|
4762 | msgstr "" | |
4159 |
|
4763 | |||
@@ -4214,7 +4818,7 b' msgstr ""' | |||||
4214 | msgid "no rebase in progress" |
|
4818 | msgid "no rebase in progress" | |
4215 | msgstr "" |
|
4819 | msgstr "" | |
4216 |
|
4820 | |||
4217 |
msgid "warning: new changesets detected on target branch, |
|
4821 | msgid "warning: new changesets detected on target branch, can't abort\n" | |
4218 | msgstr "" |
|
4822 | msgstr "" | |
4219 |
|
4823 | |||
4220 | msgid "rebase aborted\n" |
|
4824 | msgid "rebase aborted\n" | |
@@ -4235,7 +4839,9 b' msgstr ""' | |||||
4235 | msgid "rebase from the specified changeset" |
|
4839 | msgid "rebase from the specified changeset" | |
4236 | msgstr "" |
|
4840 | msgstr "" | |
4237 |
|
4841 | |||
4238 | msgid "rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)" |
|
4842 | msgid "" | |
|
4843 | "rebase from the base of the specified changeset (up to greatest common " | |||
|
4844 | "ancestor of base and dest)" | |||
4239 | msgstr "" |
|
4845 | msgstr "" | |
4240 |
|
4846 | |||
4241 | msgid "rebase onto the specified changeset" |
|
4847 | msgid "rebase onto the specified changeset" | |
@@ -4304,9 +4910,6 b' msgstr ""' | |||||
4304 | msgid "&?" |
|
4910 | msgid "&?" | |
4305 | msgstr "" |
|
4911 | msgstr "" | |
4306 |
|
4912 | |||
4307 | msgid "y - record this change" |
|
|||
4308 | msgstr "" |
|
|||
4309 |
|
||||
4310 | msgid "user quit" |
|
4913 | msgid "user quit" | |
4311 | msgstr "" |
|
4914 | msgstr "" | |
4312 |
|
4915 | |||
@@ -4329,12 +4932,14 b' msgid "interactively select changes to c' | |||||
4329 | msgstr "" |
|
4932 | msgstr "" | |
4330 |
|
4933 | |||
4331 | msgid "" |
|
4934 | msgid "" | |
4332 |
" If a list of files is omitted, all changes reported by |
|
4935 | " If a list of files is omitted, all changes reported by :hg:`status`\n" | |
4333 | " will be candidates for recording." |
|
4936 | " will be candidates for recording." | |
4334 | msgstr "" |
|
4937 | msgstr "" | |
4335 |
|
4938 | " Om filer inte anges, kommer alla ändringar som :hg:`status`\n" | ||
4336 | msgid " See 'hg help dates' for a list of formats valid for -d/--date." |
|
4939 | " rapporterar att arkiveras." | |
4337 | msgstr "" |
|
4940 | ||
|
4941 | msgid " See :hg:`help dates` for a list of formats valid for -d/--date." | |||
|
4942 | msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." | |||
4338 |
|
4943 | |||
4339 | msgid "" |
|
4944 | msgid "" | |
4340 | " You will be prompted for whether to record changes to each\n" |
|
4945 | " You will be prompted for whether to record changes to each\n" | |
@@ -4362,12 +4967,18 b' msgstr ""' | |||||
4362 | msgid " ? - display help" |
|
4967 | msgid " ? - display help" | |
4363 | msgstr "" |
|
4968 | msgstr "" | |
4364 |
|
4969 | |||
|
4970 | msgid " This command is not available when committing a merge." | |||
|
4971 | msgstr "" | |||
|
4972 | ||||
4365 | msgid "'mq' extension not loaded" |
|
4973 | msgid "'mq' extension not loaded" | |
4366 | msgstr "" |
|
4974 | msgstr "" | |
4367 |
|
4975 | |||
4368 | msgid "running non-interactively, use commit instead" |
|
4976 | msgid "running non-interactively, use commit instead" | |
4369 | msgstr "" |
|
4977 | msgstr "" | |
4370 |
|
4978 | |||
|
4979 | msgid "cannot partially commit a merge (use hg commit instead)" | |||
|
4980 | msgstr "" | |||
|
4981 | ||||
4371 | msgid "no changes to record\n" |
|
4982 | msgid "no changes to record\n" | |
4372 | msgstr "" |
|
4983 | msgstr "" | |
4373 |
|
4984 | |||
@@ -4429,6 +5040,16 b' msgid "relinking %s to %s\\n"' | |||||
4429 | msgstr "" |
|
5040 | msgstr "" | |
4430 |
|
5041 | |||
4431 | #, python-format |
|
5042 | #, python-format | |
|
5043 | msgid "tip has %d files, estimated total number of files: %s\n" | |||
|
5044 | msgstr "" | |||
|
5045 | ||||
|
5046 | msgid "collecting" | |||
|
5047 | msgstr "samlar in" | |||
|
5048 | ||||
|
5049 | msgid "files" | |||
|
5050 | msgstr "filer" | |||
|
5051 | ||||
|
5052 | #, python-format | |||
4432 | msgid "collected %d candidate storage files\n" |
|
5053 | msgid "collected %d candidate storage files\n" | |
4433 | msgstr "" |
|
5054 | msgstr "" | |
4434 |
|
5055 | |||
@@ -4439,13 +5060,16 b' msgstr ""' | |||||
4439 | msgid "not linkable: %s\n" |
|
5060 | msgid "not linkable: %s\n" | |
4440 | msgstr "inte länkbar: %s\n" |
|
5061 | msgstr "inte länkbar: %s\n" | |
4441 |
|
5062 | |||
|
5063 | msgid " files" | |||
|
5064 | msgstr " filer" | |||
|
5065 | ||||
|
5066 | msgid "pruning" | |||
|
5067 | msgstr "putsar" | |||
|
5068 | ||||
4442 | #, python-format |
|
5069 | #, python-format | |
4443 | msgid "pruned down to %d probably relinkable files\n" |
|
5070 | msgid "pruned down to %d probably relinkable files\n" | |
4444 | msgstr "" |
|
5071 | msgstr "" | |
4445 |
|
5072 | |||
4446 | msgid " files" |
|
|||
4447 | msgstr "" |
|
|||
4448 |
|
||||
4449 | msgid "relinking" |
|
5073 | msgid "relinking" | |
4450 | msgstr "länkar om" |
|
5074 | msgstr "länkar om" | |
4451 |
|
5075 | |||
@@ -4649,7 +5273,7 b' msgid ""' | |||||
4649 | msgstr "" |
|
5273 | msgstr "" | |
4650 |
|
5274 | |||
4651 | msgid "" |
|
5275 | msgid "" | |
4652 |
" |
|
5276 | " :hg:`transplant --branch REVISION --all` will rebase the selected\n" | |
4653 | " branch (up to the named revision) onto your current working\n" |
|
5277 | " branch (up to the named revision) onto your current working\n" | |
4654 | " directory." |
|
5278 | " directory." | |
4655 | msgstr "" |
|
5279 | msgstr "" | |
@@ -4662,14 +5286,14 b' msgid ""' | |||||
4662 | msgstr "" |
|
5286 | msgstr "" | |
4663 |
|
5287 | |||
4664 | msgid "" |
|
5288 | msgid "" | |
4665 |
" If no merges or revisions are provided, |
|
5289 | " If no merges or revisions are provided, :hg:`transplant` will\n" | |
4666 | " an interactive changeset browser." |
|
5290 | " start an interactive changeset browser." | |
4667 | msgstr "" |
|
5291 | msgstr "" | |
4668 |
|
5292 | |||
4669 | msgid "" |
|
5293 | msgid "" | |
4670 | " If a changeset application fails, you can fix the merge by hand\n" |
|
5294 | " If a changeset application fails, you can fix the merge by hand\n" | |
4671 |
" and then resume where you left off by calling |
|
5295 | " and then resume where you left off by calling :hg:`transplant\n" | |
4672 | " --continue/-c.\n" |
|
5296 | " --continue/-c`.\n" | |
4673 | " " |
|
5297 | " " | |
4674 | msgstr "" |
|
5298 | msgstr "" | |
4675 |
|
5299 | |||
@@ -4694,8 +5318,11 b' msgstr ""' | |||||
4694 | msgid "outstanding local changes" |
|
5318 | msgid "outstanding local changes" | |
4695 | msgstr "" |
|
5319 | msgstr "" | |
4696 |
|
5320 | |||
4697 |
msgid "pull patches from REPO |
|
5321 | msgid "pull patches from REPO" | |
4698 | msgstr "" |
|
5322 | msgstr "" | |
|
5323 | ||||
|
5324 | msgid "BRANCH" | |||
|
5325 | msgstr "GREN" | |||
4699 |
|
5326 | |||
4700 | msgid "pull patches from branch BRANCH" |
|
5327 | msgid "pull patches from branch BRANCH" | |
4701 | msgstr "" |
|
5328 | msgstr "" | |
@@ -4715,10 +5342,10 b' msgstr ""' | |||||
4715 | msgid "continue last transplant session after repair" |
|
5342 | msgid "continue last transplant session after repair" | |
4716 | msgstr "" |
|
5343 | msgstr "" | |
4717 |
|
5344 | |||
4718 |
msgid "filter changesets through |
|
5345 | msgid "filter changesets through command" | |
4719 | msgstr "" |
|
5346 | msgstr "" | |
4720 |
|
5347 | |||
4721 |
msgid "hg transplant [-s REPO |
|
5348 | msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." | |
4722 | msgstr "" |
|
5349 | msgstr "" | |
4723 |
|
5350 | |||
4724 | msgid "allow the use of MBCS paths with problematic encodings" |
|
5351 | msgid "allow the use of MBCS paths with problematic encodings" | |
@@ -4781,6 +5408,18 b' msgstr ""' | |||||
4781 | msgid "perform automatic newline conversion" |
|
5408 | msgid "perform automatic newline conversion" | |
4782 | msgstr "" |
|
5409 | msgstr "" | |
4783 |
|
5410 | |||
|
5411 | msgid "" | |||
|
5412 | " Deprecation: The win32text extension requires each user to configure\n" | |||
|
5413 | " the extension again and again for each clone since the configuration\n" | |||
|
5414 | " is not copied when cloning." | |||
|
5415 | msgstr "" | |||
|
5416 | ||||
|
5417 | msgid "" | |||
|
5418 | " We have therefore made the ``eol`` as an alternative. The ``eol``\n" | |||
|
5419 | " uses a version controlled file for its configuration and each clone\n" | |||
|
5420 | " will therefore use the right settings from the start." | |||
|
5421 | msgstr "" | |||
|
5422 | ||||
4784 | msgid "To perform automatic newline conversion, use::" |
|
5423 | msgid "To perform automatic newline conversion, use::" | |
4785 | msgstr "" |
|
5424 | msgstr "" | |
4786 |
|
5425 | |||
@@ -4798,7 +5437,8 b' msgid ""' | |||||
4798 | " # or ** = macdecode:" |
|
5437 | " # or ** = macdecode:" | |
4799 | msgstr "" |
|
5438 | msgstr "" | |
4800 |
|
5439 | |||
4801 | msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" |
|
5440 | msgid "" | |
|
5441 | "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" | |||
4802 | msgstr "" |
|
5442 | msgstr "" | |
4803 |
|
5443 | |||
4804 | msgid "" |
|
5444 | msgid "" | |
@@ -4880,7 +5520,8 b' msgid ""' | |||||
4880 | " $ hg serve" |
|
5520 | " $ hg serve" | |
4881 | msgstr "" |
|
5521 | msgstr "" | |
4882 |
|
5522 | |||
4883 | msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::" |
|
5523 | msgid "" | |
|
5524 | "You can discover zeroconf enabled repositories by running \"hg paths\"::" | |||
4884 | msgstr "" |
|
5525 | msgstr "" | |
4885 |
|
5526 | |||
4886 | msgid "" |
|
5527 | msgid "" | |
@@ -4958,9 +5599,6 b' msgstr ""' | |||||
4958 | msgid "invalid format spec '%%%s' in output filename" |
|
5599 | msgid "invalid format spec '%%%s' in output filename" | |
4959 | msgstr "" |
|
5600 | msgstr "" | |
4960 |
|
5601 | |||
4961 | msgid "searching" |
|
|||
4962 | msgstr "söker" |
|
|||
4963 |
|
||||
4964 | #, python-format |
|
5602 | #, python-format | |
4965 | msgid "adding %s\n" |
|
5603 | msgid "adding %s\n" | |
4966 | msgstr "" |
|
5604 | msgstr "" | |
@@ -4990,6 +5628,14 b' msgid "%s: not overwriting - file exists' | |||||
4990 | msgstr "" |
|
5628 | msgstr "" | |
4991 |
|
5629 | |||
4992 | #, python-format |
|
5630 | #, python-format | |
|
5631 | msgid "%s: not recording move - %s does not exist\n" | |||
|
5632 | msgstr "%s: sparar inte flytt - %s existerar inte\n" | |||
|
5633 | ||||
|
5634 | #, python-format | |||
|
5635 | msgid "%s: not recording copy - %s does not exist\n" | |||
|
5636 | msgstr "%s: sparar inte flytt - %s existerar inte\n" | |||
|
5637 | ||||
|
5638 | #, python-format | |||
4993 | msgid "%s: deleted in working copy\n" |
|
5639 | msgid "%s: deleted in working copy\n" | |
4994 | msgstr "" |
|
5640 | msgstr "" | |
4995 |
|
5641 | |||
@@ -5154,10 +5800,10 b' msgstr " Schemal\xc3\xa4gg filer att versionshanteras och l\xc3\xa4ggas till i arkivet."' | |||||
5154 |
|
5800 | |||
5155 | msgid "" |
|
5801 | msgid "" | |
5156 | " The files will be added to the repository at the next commit. To\n" |
|
5802 | " The files will be added to the repository at the next commit. To\n" | |
5157 |
" undo an add before that, see |
|
5803 | " undo an add before that, see :hg:`forget`." | |
5158 | msgstr "" |
|
5804 | msgstr "" | |
5159 | " Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n" |
|
5805 | " Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n" | |
5160 |
" ångra en addering innan dess, se |
|
5806 | " ångra en addering innan dess, se :hg:`forget`." | |
5161 |
|
5807 | |||
5162 | msgid " If no names are given, add all files to the repository." |
|
5808 | msgid " If no names are given, add all files to the repository." | |
5163 | msgstr " Om inga namn anges, läggs alla filer till i arkivet." |
|
5809 | msgstr " Om inga namn anges, läggs alla filer till i arkivet." | |
@@ -5167,11 +5813,10 b' msgstr " .. container:: verbose"' | |||||
5167 |
|
5813 | |||
5168 | msgid "" |
|
5814 | msgid "" | |
5169 | " An example showing how new (unknown) files are added\n" |
|
5815 | " An example showing how new (unknown) files are added\n" | |
5170 |
" automatically by |
|
5816 | " automatically by :hg:`add`::" | |
5171 | msgstr "" |
|
5817 | msgstr "" | |
5172 | " An example showing how new (unknown) files are added\n" |
|
|||
5173 | " Ett exempel som visar hur nya (okända) filer läggs\n" |
|
5818 | " Ett exempel som visar hur nya (okända) filer läggs\n" | |
5174 |
" till automatiskt av |
|
5819 | " till automatiskt av :hg:`add`::" | |
5175 |
|
5820 | |||
5176 | msgid "" |
|
5821 | msgid "" | |
5177 | " $ ls\n" |
|
5822 | " $ ls\n" | |
@@ -5200,7 +5845,8 b' msgstr "l\xc3\xa4gg till alla nya nya filer, radera alla saknade filer"' | |||||
5200 | msgid "" |
|
5845 | msgid "" | |
5201 | " Add all new files and remove all missing files from the\n" |
|
5846 | " Add all new files and remove all missing files from the\n" | |
5202 | " repository." |
|
5847 | " repository." | |
5203 | msgstr " Lägg till alla nya filer och radera alla saknade filer från arkivet." |
|
5848 | msgstr "" | |
|
5849 | " Lägg till alla nya filer och radera alla saknade filer från arkivet." | |||
5204 |
|
5850 | |||
5205 | msgid "" |
|
5851 | msgid "" | |
5206 | " New files are ignored if they match any of the patterns in\n" |
|
5852 | " New files are ignored if they match any of the patterns in\n" | |
@@ -5217,15 +5863,20 b' msgid ""' | |||||
5217 | " every added file and records those similar enough as renames. This\n" |
|
5863 | " every added file and records those similar enough as renames. This\n" | |
5218 | " option takes a percentage between 0 (disabled) and 100 (files must\n" |
|
5864 | " option takes a percentage between 0 (disabled) and 100 (files must\n" | |
5219 | " be identical) as its parameter. Detecting renamed files this way\n" |
|
5865 | " be identical) as its parameter. Detecting renamed files this way\n" | |
5220 |
" can be expensive. |
|
5866 | " can be expensive." | |
5221 | " " |
|
|||
5222 | msgstr "" |
|
5867 | msgstr "" | |
5223 | " Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n" |
|
5868 | " Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n" | |
5224 | " parameter större än 0, kommer varje borttagen fil att jämföras med\n" |
|
5869 | " parameter större än 0, kommer varje borttagen fil att jämföras med\n" | |
5225 | " varje tillagd fil och lagrar de som är tillräckligt lika som ett\n" |
|
5870 | " varje tillagd fil och lagrar de som är tillräckligt lika som ett\n" | |
5226 | " namnbyte. Flaggan tar ett procentvärde mellan 0 (deaktiverad) och 100\n" |
|
5871 | " namnbyte. Flaggan tar ett procentvärde mellan 0 (deaktiverad) och 100\n" | |
5227 | " (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n" |
|
5872 | " (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n" | |
5228 |
" på det här sättet kan ta lång tid. |
|
5873 | " på det här sättet kan ta lång tid." | |
|
5874 | ||||
|
5875 | msgid "" | |||
|
5876 | " Returns 0 if all files are successfully added.\n" | |||
|
5877 | " " | |||
|
5878 | msgstr "" | |||
|
5879 | " Returnerar 0 om alla filer kunde läggas till.\n" | |||
5229 | " " |
|
5880 | " " | |
5230 |
|
5881 | |||
5231 | msgid "similarity must be a number" |
|
5882 | msgid "similarity must be a number" | |
@@ -5253,12 +5904,17 b' msgid ""' | |||||
5253 | " Without the -a/--text option, annotate will avoid processing files\n" |
|
5904 | " Without the -a/--text option, annotate will avoid processing files\n" | |
5254 | " it detects as binary. With -a, annotate will annotate the file\n" |
|
5905 | " it detects as binary. With -a, annotate will annotate the file\n" | |
5255 | " anyway, although the results will probably be neither useful\n" |
|
5906 | " anyway, although the results will probably be neither useful\n" | |
5256 |
" nor desirable. |
|
5907 | " nor desirable." | |
5257 | " " |
|
|||
5258 | msgstr "" |
|
5908 | msgstr "" | |
5259 | " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n" |
|
5909 | " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n" | |
5260 | " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n" |
|
5910 | " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n" | |
5261 |
" om resultatet antagligen inte kommer att vara användbart. |
|
5911 | " om resultatet antagligen inte kommer att vara användbart." | |
|
5912 | ||||
|
5913 | msgid "" | |||
|
5914 | " Returns 0 on success.\n" | |||
|
5915 | " " | |||
|
5916 | msgstr "" | |||
|
5917 | " Returnerar 0 om kommandot lyckades.\n" | |||
5262 | " " |
|
5918 | " " | |
5263 |
|
5919 | |||
5264 | msgid "at least one filename or pattern is required" |
|
5920 | msgid "at least one filename or pattern is required" | |
@@ -5269,7 +5925,7 b' msgstr ""' | |||||
5269 |
|
5925 | |||
5270 | #, python-format |
|
5926 | #, python-format | |
5271 | msgid "%s: binary file\n" |
|
5927 | msgid "%s: binary file\n" | |
5272 | msgstr "" |
|
5928 | msgstr "%s: binär fil\n" | |
5273 |
|
5929 | |||
5274 | msgid "create an unversioned archive of a repository revision" |
|
5930 | msgid "create an unversioned archive of a repository revision" | |
5275 | msgstr "skapa ett icke versionshanterat arkiv från en arkivrevision" |
|
5931 | msgstr "skapa ett icke versionshanterat arkiv från en arkivrevision" | |
@@ -5308,22 +5964,20 b' msgstr ""' | |||||
5308 |
|
5964 | |||
5309 | msgid "" |
|
5965 | msgid "" | |
5310 | " The exact name of the destination archive or directory is given\n" |
|
5966 | " The exact name of the destination archive or directory is given\n" | |
5311 |
" using a format string; see |
|
5967 | " using a format string; see :hg:`help export` for details." | |
5312 | msgstr "" |
|
5968 | msgstr "" | |
5313 | " Det exakta namnet på destinationsarkivet eller -katalogen anges med en\n" |
|
5969 | " Det exakta namnet på destinationsarkivet eller -katalogen anges med en\n" | |
5314 |
" formatsträng; se |
|
5970 | " formatsträng; se :hg:`help export` för detaljer." | |
5315 |
|
5971 | |||
5316 | msgid "" |
|
5972 | msgid "" | |
5317 | " Each member added to an archive file has a directory prefix\n" |
|
5973 | " Each member added to an archive file has a directory prefix\n" | |
5318 | " prepended. Use -p/--prefix to specify a format string for the\n" |
|
5974 | " prepended. Use -p/--prefix to specify a format string for the\n" | |
5319 | " prefix. The default is the basename of the archive, with suffixes\n" |
|
5975 | " prefix. The default is the basename of the archive, with suffixes\n" | |
5320 |
" removed. |
|
5976 | " removed." | |
5321 | " " |
|
|||
5322 | msgstr "" |
|
5977 | msgstr "" | |
5323 | " Varje fil som läggs till en arkivfil har ett katalogprefix. Använd\n" |
|
5978 | " Varje fil som läggs till en arkivfil har ett katalogprefix. Använd\n" | |
5324 | " -p/--prefix för att specificera en formatsträn för prefixet. Som\n" |
|
5979 | " -p/--prefix för att specificera en formatsträn för prefixet. Som\n" | |
5325 |
" standard används basnamnet för arkivet, med suffix borttagna. |
|
5980 | " standard används basnamnet för arkivet, med suffix borttagna." | |
5326 | " " |
|
|||
5327 |
|
5981 | |||
5328 | msgid "no working directory: please specify a revision" |
|
5982 | msgid "no working directory: please specify a revision" | |
5329 | msgstr "ingen arbetskatalog: specificera en revision" |
|
5983 | msgstr "ingen arbetskatalog: specificera en revision" | |
@@ -5434,15 +6088,13 b' msgid ""' | |||||
5434 | " Its exit status will be used to mark revisions as good or bad:\n" |
|
6088 | " Its exit status will be used to mark revisions as good or bad:\n" | |
5435 | " status 0 means good, 125 means to skip the revision, 127\n" |
|
6089 | " status 0 means good, 125 means to skip the revision, 127\n" | |
5436 | " (command not found) will abort the bisection, and any other\n" |
|
6090 | " (command not found) will abort the bisection, and any other\n" | |
5437 |
" non-zero exit status means the revision is bad. |
|
6091 | " non-zero exit status means the revision is bad." | |
5438 | " " |
|
|||
5439 | msgstr "" |
|
6092 | msgstr "" | |
5440 | " Om du tillhandahåller ett kommando, kommer det att användas för\n" |
|
6093 | " Om du tillhandahåller ett kommando, kommer det att användas för\n" | |
5441 | " automatisk genomsökning. Dess returkod kommer att användas för att ange\n" |
|
6094 | " automatisk genomsökning. Dess returkod kommer att användas för att ange\n" | |
5442 | " revisioner som bra eller dåliga: kod 0 betyder bra, 125 betyder att\n" |
|
6095 | " revisioner som bra eller dåliga: kod 0 betyder bra, 125 betyder att\n" | |
5443 | " revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n" |
|
6096 | " revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n" | |
5444 |
" genomsökningen, och alla andra värden betyder att revisionen är dålig. |
|
6097 | " genomsökningen, och alla andra värden betyder att revisionen är dålig." | |
5445 | " " |
|
|||
5446 |
|
6098 | |||
5447 | msgid "The first good revision is:\n" |
|
6099 | msgid "The first good revision is:\n" | |
5448 | msgstr "Den första bra revisionen är:\n" |
|
6100 | msgstr "Den första bra revisionen är:\n" | |
@@ -5451,10 +6103,12 b' msgid "The first bad revision is:\\n"' | |||||
5451 | msgstr "Den första dåliga revisionen är:\n" |
|
6103 | msgstr "Den första dåliga revisionen är:\n" | |
5452 |
|
6104 | |||
5453 | msgid "Due to skipped revisions, the first good revision could be any of:\n" |
|
6105 | msgid "Due to skipped revisions, the first good revision could be any of:\n" | |
5454 | msgstr "Tack vare skippade revisioner, är den första bra revisionen någon av:\n" |
|
6106 | msgstr "" | |
|
6107 | "Tack vare skippade revisioner, är den första bra revisionen någon av:\n" | |||
5455 |
|
6108 | |||
5456 | msgid "Due to skipped revisions, the first bad revision could be any of:\n" |
|
6109 | msgid "Due to skipped revisions, the first bad revision could be any of:\n" | |
5457 | msgstr "Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n" |
|
6110 | msgstr "" | |
|
6111 | "Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n" | |||
5458 |
|
6112 | |||
5459 | msgid "cannot bisect (no known good revisions)" |
|
6113 | msgid "cannot bisect (no known good revisions)" | |
5460 | msgstr "kan inte genomsöka (inga kända bra revisioner)" |
|
6114 | msgstr "kan inte genomsöka (inga kända bra revisioner)" | |
@@ -5517,20 +6171,20 b' msgstr ""' | |||||
5517 | " grenbyte." |
|
6171 | " grenbyte." | |
5518 |
|
6172 | |||
5519 | msgid "" |
|
6173 | msgid "" | |
5520 |
" Use the command |
|
6174 | " Use the command :hg:`update` to switch to an existing branch. Use\n" | |
5521 |
" |
|
6175 | " :hg:`commit --close-branch` to mark this branch as closed." | |
5522 | " " |
|
6176 | msgstr "" | |
5523 | msgstr "" |
|
6177 | " Använd kommandot :hg:`update` för att byta till en existerande gren.\n" | |
5524 | " Använd kommandot 'hg update' för att byta till en existerande gren.\n" |
|
6178 | " Använd :hg:`commit --close-branch` för att markera grenen som stängd." | |
5525 | " Använd 'hg commit --close-branch' för att markera grenen som stängd.\n" |
|
|||
5526 | " " |
|
|||
5527 |
|
6179 | |||
5528 | #, python-format |
|
6180 | #, python-format | |
5529 | msgid "reset working directory to branch %s\n" |
|
6181 | msgid "reset working directory to branch %s\n" | |
5530 | msgstr "återställ arbetskatalogen till grenen %s\n" |
|
6182 | msgstr "återställ arbetskatalogen till grenen %s\n" | |
5531 |
|
6183 | |||
5532 | msgid "a branch of the same name already exists (use 'hg update' to switch to it)" |
|
6184 | msgid "" | |
5533 | msgstr "en gren med samma namn finns redan (kör 'hg update' för att byta till den)" |
|
6185 | "a branch of the same name already exists (use 'hg update' to switch to it)" | |
|
6186 | msgstr "" | |||
|
6187 | "en gren med samma namn finns redan (kör 'hg update' för att byta till den)" | |||
5534 |
|
6188 | |||
5535 | #, python-format |
|
6189 | #, python-format | |
5536 | msgid "marked working directory as branch %s\n" |
|
6190 | msgid "marked working directory as branch %s\n" | |
@@ -5542,11 +6196,11 b' msgstr "visa namngivna grenar i arkivet"' | |||||
5542 | msgid "" |
|
6196 | msgid "" | |
5543 | " List the repository's named branches, indicating which ones are\n" |
|
6197 | " List the repository's named branches, indicating which ones are\n" | |
5544 | " inactive. If -c/--closed is specified, also list branches which have\n" |
|
6198 | " inactive. If -c/--closed is specified, also list branches which have\n" | |
5545 |
" been marked closed (see |
|
6199 | " been marked closed (see :hg:`commit --close-branch`)." | |
5546 | msgstr "" |
|
6200 | msgstr "" | |
5547 | " Visa alla namngivna grenar i arkivet, och indikera vilka som är\n" |
|
6201 | " Visa alla namngivna grenar i arkivet, och indikera vilka som är\n" | |
5548 | " inaktiva. Om -c/--closed anges, visas också grenar som har markerats\n" |
|
6202 | " inaktiva. Om -c/--closed anges, visas också grenar som har markerats\n" | |
5549 |
" som stängda (se |
|
6203 | " som stängda (se :hg:`commit --close-branch`)." | |
5550 |
|
6204 | |||
5551 | msgid "" |
|
6205 | msgid "" | |
5552 | " If -a/--active is specified, only show active branches. A branch\n" |
|
6206 | " If -a/--active is specified, only show active branches. A branch\n" | |
@@ -5555,11 +6209,15 b' msgstr ""' | |||||
5555 | " Om -a/--acive anges, visas bara aktiva grenar. En gren anses aktiv om\n" |
|
6209 | " Om -a/--acive anges, visas bara aktiva grenar. En gren anses aktiv om\n" | |
5556 | " den innehåller arkivhuvuden." |
|
6210 | " den innehåller arkivhuvuden." | |
5557 |
|
6211 | |||
5558 | msgid "" |
|
6212 | msgid " Use the command :hg:`update` to switch to an existing branch." | |
5559 | " Use the command 'hg update' to switch to an existing branch.\n" |
|
6213 | msgstr "" | |
5560 | " " |
|
6214 | " Använd kommandot :hg:`update` för att byta till en existerande gren." | |
5561 | msgstr "" |
|
6215 | ||
5562 | " Använd kommandot 'hg update' för att byta till en existerande gren.\n" |
|
6216 | msgid "" | |
|
6217 | " Returns 0.\n" | |||
|
6218 | " " | |||
|
6219 | msgstr "" | |||
|
6220 | " Returnerar 0.\n" | |||
5563 | " " |
|
6221 | " " | |
5564 |
|
6222 | |||
5565 | msgid " (closed)" |
|
6223 | msgid " (closed)" | |
@@ -5610,11 +6268,16 b' msgstr ""' | |||||
5610 |
|
6268 | |||
5611 | msgid "" |
|
6269 | msgid "" | |
5612 | " Applying bundles preserves all changeset contents including\n" |
|
6270 | " Applying bundles preserves all changeset contents including\n" | |
5613 |
" permissions, copy/rename information, and revision history. |
|
6271 | " permissions, copy/rename information, and revision history." | |
5614 | " " |
|
6272 | msgstr "" | |
5615 | msgstr "" |
|
6273 | " Applicering av buntar bevarar allt ändringsinnehåll inklusive\n" | |
5616 | " Applicering av buntar bevarar all ändringsinnehåll inklusive\n" |
|
6274 | " tillstånd, information om kopior/namnbyte, och revisionshistorik." | |
5617 | " tillstånd, information om kopior/namnbyte, och revisionshistorik.\n" |
|
6275 | ||
|
6276 | msgid "" | |||
|
6277 | " Returns 0 on success, 1 if no changes found.\n" | |||
|
6278 | " " | |||
|
6279 | msgstr "" | |||
|
6280 | " Returnerar 0 om kommandot lyckades, 1 om inga ändringar hittades.\n" | |||
5618 | " " |
|
6281 | " " | |
5619 |
|
6282 | |||
5620 | msgid "--base is incompatible with specifying a destination" |
|
6283 | msgid "--base is incompatible with specifying a destination" | |
@@ -5647,394 +6310,44 b' msgstr ""' | |||||
5647 | msgid "" |
|
6310 | msgid "" | |
5648 | " :``%s``: basename of file being printed\n" |
|
6311 | " :``%s``: basename of file being printed\n" | |
5649 | " :``%d``: dirname of file being printed, or '.' if in repository root\n" |
|
6312 | " :``%d``: dirname of file being printed, or '.' if in repository root\n" | |
5650 |
" :``%p``: root-relative path name of file being printed |
|
6313 | " :``%p``: root-relative path name of file being printed" | |
5651 | " " |
|
|||
5652 | msgstr "" |
|
6314 | msgstr "" | |
5653 | " :``%s``: basnamn på den visade filen\n" |
|
6315 | " :``%s``: basnamn på den visade filen\n" | |
5654 | " :``%d``: katalognamn på den visade filen, eller '.' om i arkivroten\n" |
|
6316 | " :``%d``: katalognamn på den visade filen, eller '.' om i arkivroten\n" | |
5655 |
" :``%p``: rotrelativ sökvägsnamn för den visade filen |
|
6317 | " :``%p``: rotrelativ sökvägsnamn för den visade filen" | |
5656 | " " |
|
6318 | ||
5657 |
|
||||
5658 | #, fuzzy |
|
|||
5659 | msgid "make a copy of an existing repository" |
|
6319 | msgid "make a copy of an existing repository" | |
5660 | msgstr "" |
|
6320 | msgstr "gör en kopia av ett existerande arkiv" | |
5661 | "gör en kopia av ett existerande arkiv\n" |
|
6321 | ||
5662 | "\n" |
|
|||
5663 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
5664 | "\n" |
|
|||
5665 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
5666 | " källan att användas.\n" |
|
|||
5667 | "\n" |
|
|||
5668 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
5669 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
5670 | "\n" |
|
|||
5671 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
5672 | "\n" |
|
|||
5673 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
5674 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
5675 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
5676 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
5677 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
5678 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
5679 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
5680 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
5681 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
5682 | " att finnas i destinationen.\n" |
|
|||
5683 | "\n" |
|
|||
5684 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
5685 | " --pull, även för lokala arkiv.\n" |
|
|||
5686 | "\n" |
|
|||
5687 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
5688 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
5689 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
5690 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
5691 | " för att undvika användning av hårda länkar.\n" |
|
|||
5692 | "\n" |
|
|||
5693 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
5694 | " hårdlänkade, med ::\n" |
|
|||
5695 | "\n" |
|
|||
5696 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
5697 | "\n" |
|
|||
5698 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
5699 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
5700 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
5701 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
5702 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
5703 | " under katalogen .hg, som mq.\n" |
|
|||
5704 | "\n" |
|
|||
5705 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
5706 | " revisionen från den här listan:\n" |
|
|||
5707 | "\n" |
|
|||
5708 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
5709 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
5710 | " arbetskatalog\n" |
|
|||
5711 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
5712 | " huvudet på den grenen)\n" |
|
|||
5713 | " d) ändringen angiven med -r\n" |
|
|||
5714 | " e) det högsta huvudet angivet med -b\n" |
|
|||
5715 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
5716 | " g) det högsta huvudet på default-grenen\n" |
|
|||
5717 | " h) tip\n" |
|
|||
5718 | " " |
|
|||
5719 |
|
||||
5720 | #, fuzzy |
|
|||
5721 | msgid " Create a copy of an existing repository in a new directory." |
|
6322 | msgid " Create a copy of an existing repository in a new directory." | |
5722 | msgstr "" |
|
6323 | msgstr " Skapa en kopia av ett existerande arkiv i en ny katalog." | |
5723 | "gör en kopia av ett existerande arkiv\n" |
|
6324 | ||
5724 | "\n" |
|
|||
5725 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
5726 | "\n" |
|
|||
5727 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
5728 | " källan att användas.\n" |
|
|||
5729 | "\n" |
|
|||
5730 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
5731 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
5732 | "\n" |
|
|||
5733 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
5734 | "\n" |
|
|||
5735 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
5736 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
5737 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
5738 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
5739 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
5740 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
5741 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
5742 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
5743 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
5744 | " att finnas i destinationen.\n" |
|
|||
5745 | "\n" |
|
|||
5746 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
5747 | " --pull, även för lokala arkiv.\n" |
|
|||
5748 | "\n" |
|
|||
5749 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
5750 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
5751 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
5752 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
5753 | " för att undvika användning av hårda länkar.\n" |
|
|||
5754 | "\n" |
|
|||
5755 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
5756 | " hårdlänkade, med ::\n" |
|
|||
5757 | "\n" |
|
|||
5758 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
5759 | "\n" |
|
|||
5760 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
5761 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
5762 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
5763 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
5764 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
5765 | " under katalogen .hg, som mq.\n" |
|
|||
5766 | "\n" |
|
|||
5767 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
5768 | " revisionen från den här listan:\n" |
|
|||
5769 | "\n" |
|
|||
5770 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
5771 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
5772 | " arbetskatalog\n" |
|
|||
5773 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
5774 | " huvudet på den grenen)\n" |
|
|||
5775 | " d) ändringen angiven med -r\n" |
|
|||
5776 | " e) det högsta huvudet angivet med -b\n" |
|
|||
5777 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
5778 | " g) det högsta huvudet på default-grenen\n" |
|
|||
5779 | " h) tip\n" |
|
|||
5780 | " " |
|
|||
5781 |
|
||||
5782 | #, fuzzy |
|
|||
5783 | msgid "" |
|
6325 | msgid "" | |
5784 | " If no destination directory name is specified, it defaults to the\n" |
|
6326 | " If no destination directory name is specified, it defaults to the\n" | |
5785 | " basename of the source." |
|
6327 | " basename of the source." | |
5786 | msgstr "" |
|
6328 | msgstr "" | |
5787 | "gör en kopia av ett existerande arkiv\n" |
|
|||
5788 | "\n" |
|
|||
5789 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
5790 | "\n" |
|
|||
5791 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
6329 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" | |
5792 |
" källan att användas. |
|
6330 | " källan att användas." | |
5793 | "\n" |
|
6331 | ||
5794 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
5795 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
5796 | "\n" |
|
|||
5797 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
5798 | "\n" |
|
|||
5799 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
5800 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
5801 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
5802 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
5803 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
5804 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
5805 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
5806 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
5807 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
5808 | " att finnas i destinationen.\n" |
|
|||
5809 | "\n" |
|
|||
5810 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
5811 | " --pull, även för lokala arkiv.\n" |
|
|||
5812 | "\n" |
|
|||
5813 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
5814 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
5815 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
5816 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
5817 | " för att undvika användning av hårda länkar.\n" |
|
|||
5818 | "\n" |
|
|||
5819 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
5820 | " hårdlänkade, med ::\n" |
|
|||
5821 | "\n" |
|
|||
5822 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
5823 | "\n" |
|
|||
5824 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
5825 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
5826 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
5827 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
5828 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
5829 | " under katalogen .hg, som mq.\n" |
|
|||
5830 | "\n" |
|
|||
5831 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
5832 | " revisionen från den här listan:\n" |
|
|||
5833 | "\n" |
|
|||
5834 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
5835 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
5836 | " arbetskatalog\n" |
|
|||
5837 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
5838 | " huvudet på den grenen)\n" |
|
|||
5839 | " d) ändringen angiven med -r\n" |
|
|||
5840 | " e) det högsta huvudet angivet med -b\n" |
|
|||
5841 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
5842 | " g) det högsta huvudet på default-grenen\n" |
|
|||
5843 | " h) tip\n" |
|
|||
5844 | " " |
|
|||
5845 |
|
||||
5846 | #, fuzzy |
|
|||
5847 | msgid "" |
|
6332 | msgid "" | |
5848 | " The location of the source is added to the new repository's\n" |
|
6333 | " The location of the source is added to the new repository's\n" | |
5849 | " .hg/hgrc file, as the default to be used for future pulls." |
|
6334 | " .hg/hgrc file, as the default to be used for future pulls." | |
5850 | msgstr "" |
|
6335 | msgstr "" | |
5851 | "gör en kopia av ett existerande arkiv\n" |
|
|||
5852 | "\n" |
|
|||
5853 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
5854 | "\n" |
|
|||
5855 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
5856 | " källan att användas.\n" |
|
|||
5857 | "\n" |
|
|||
5858 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
6336 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" | |
5859 |
" som standardplats att användas för framtida dragningar. |
|
6337 | " som standardplats att användas för framtida dragningar." | |
5860 | "\n" |
|
6338 | ||
5861 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
6339 | msgid " See :hg:`help urls` for valid source format details." | |
5862 | "\n" |
|
6340 | msgstr " Se :hg:`help urls` för detaljer om giltiga källformat." | |
5863 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
6341 | ||
5864 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
5865 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
5866 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
5867 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
5868 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
5869 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
5870 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
5871 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
5872 | " att finnas i destinationen.\n" |
|
|||
5873 | "\n" |
|
|||
5874 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
5875 | " --pull, även för lokala arkiv.\n" |
|
|||
5876 | "\n" |
|
|||
5877 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
5878 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
5879 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
5880 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
5881 | " för att undvika användning av hårda länkar.\n" |
|
|||
5882 | "\n" |
|
|||
5883 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
5884 | " hårdlänkade, med ::\n" |
|
|||
5885 | "\n" |
|
|||
5886 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
5887 | "\n" |
|
|||
5888 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
5889 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
5890 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
5891 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
5892 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
5893 | " under katalogen .hg, som mq.\n" |
|
|||
5894 | "\n" |
|
|||
5895 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
5896 | " revisionen från den här listan:\n" |
|
|||
5897 | "\n" |
|
|||
5898 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
5899 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
5900 | " arbetskatalog\n" |
|
|||
5901 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
5902 | " huvudet på den grenen)\n" |
|
|||
5903 | " d) ändringen angiven med -r\n" |
|
|||
5904 | " e) det högsta huvudet angivet med -b\n" |
|
|||
5905 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
5906 | " g) det högsta huvudet på default-grenen\n" |
|
|||
5907 | " h) tip\n" |
|
|||
5908 | " " |
|
|||
5909 |
|
||||
5910 | #, fuzzy |
|
|||
5911 | msgid " See 'hg help urls' for valid source format details." |
|
|||
5912 | msgstr "" |
|
|||
5913 | "gör en kopia av ett existerande arkiv\n" |
|
|||
5914 | "\n" |
|
|||
5915 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
5916 | "\n" |
|
|||
5917 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
5918 | " källan att användas.\n" |
|
|||
5919 | "\n" |
|
|||
5920 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
5921 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
5922 | "\n" |
|
|||
5923 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
5924 | "\n" |
|
|||
5925 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
5926 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
5927 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
5928 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
5929 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
5930 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
5931 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
5932 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
5933 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
5934 | " att finnas i destinationen.\n" |
|
|||
5935 | "\n" |
|
|||
5936 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
5937 | " --pull, även för lokala arkiv.\n" |
|
|||
5938 | "\n" |
|
|||
5939 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
5940 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
5941 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
5942 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
5943 | " för att undvika användning av hårda länkar.\n" |
|
|||
5944 | "\n" |
|
|||
5945 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
5946 | " hårdlänkade, med ::\n" |
|
|||
5947 | "\n" |
|
|||
5948 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
5949 | "\n" |
|
|||
5950 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
5951 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
5952 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
5953 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
5954 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
5955 | " under katalogen .hg, som mq.\n" |
|
|||
5956 | "\n" |
|
|||
5957 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
5958 | " revisionen från den här listan:\n" |
|
|||
5959 | "\n" |
|
|||
5960 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
5961 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
5962 | " arbetskatalog\n" |
|
|||
5963 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
5964 | " huvudet på den grenen)\n" |
|
|||
5965 | " d) ändringen angiven med -r\n" |
|
|||
5966 | " e) det högsta huvudet angivet med -b\n" |
|
|||
5967 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
5968 | " g) det högsta huvudet på default-grenen\n" |
|
|||
5969 | " h) tip\n" |
|
|||
5970 | " " |
|
|||
5971 |
|
||||
5972 | #, fuzzy |
|
|||
5973 | msgid "" |
|
6342 | msgid "" | |
5974 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" |
|
6343 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" | |
5975 | " .hg/hgrc and working directory will be created on the remote side.\n" |
|
6344 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
5976 |
" Please see |
|
6345 | " Please see :hg:`help urls` for important details about ``ssh://`` URLs." | |
5977 | msgstr "" |
|
6346 | msgstr "" | |
5978 | "gör en kopia av ett existerande arkiv\n" |
|
|||
5979 | "\n" |
|
|||
5980 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
5981 | "\n" |
|
|||
5982 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
5983 | " källan att användas.\n" |
|
|||
5984 | "\n" |
|
|||
5985 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
5986 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
5987 | "\n" |
|
|||
5988 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
5989 | "\n" |
|
|||
5990 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
6347 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" | |
5991 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
6348 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" | |
5992 |
" Se |
|
6349 | " Se :hg:`help urls` för viktiga detaljer om ``ssh://``-URLer." | |
5993 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
6350 | ||
5994 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
5995 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
5996 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
5997 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
5998 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
5999 | " att finnas i destinationen.\n" |
|
|||
6000 | "\n" |
|
|||
6001 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
6002 | " --pull, även för lokala arkiv.\n" |
|
|||
6003 | "\n" |
|
|||
6004 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
6005 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
6006 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
6007 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
6008 | " för att undvika användning av hårda länkar.\n" |
|
|||
6009 | "\n" |
|
|||
6010 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
6011 | " hårdlänkade, med ::\n" |
|
|||
6012 | "\n" |
|
|||
6013 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
6014 | "\n" |
|
|||
6015 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
6016 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
6017 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
6018 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
6019 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
6020 | " under katalogen .hg, som mq.\n" |
|
|||
6021 | "\n" |
|
|||
6022 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
6023 | " revisionen från den här listan:\n" |
|
|||
6024 | "\n" |
|
|||
6025 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
6026 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
6027 | " arbetskatalog\n" |
|
|||
6028 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
6029 | " huvudet på den grenen)\n" |
|
|||
6030 | " d) ändringen angiven med -r\n" |
|
|||
6031 | " e) det högsta huvudet angivet med -b\n" |
|
|||
6032 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
6033 | " g) det högsta huvudet på default-grenen\n" |
|
|||
6034 | " h) tip\n" |
|
|||
6035 | " " |
|
|||
6036 |
|
||||
6037 | #, fuzzy |
|
|||
6038 | msgid "" |
|
6351 | msgid "" | |
6039 | " A set of changesets (tags, or branch names) to pull may be specified\n" |
|
6352 | " A set of changesets (tags, or branch names) to pull may be specified\n" | |
6040 | " by listing each changeset (tag, or branch name) with -r/--rev.\n" |
|
6353 | " by listing each changeset (tag, or branch name) with -r/--rev.\n" | |
@@ -6045,130 +6358,21 b' msgid ""' | |||||
6045 | " No subsequent changesets (including subsequent tags) will be present\n" |
|
6358 | " No subsequent changesets (including subsequent tags) will be present\n" | |
6046 | " in the destination." |
|
6359 | " in the destination." | |
6047 | msgstr "" |
|
6360 | msgstr "" | |
6048 | "gör en kopia av ett existerande arkiv\n" |
|
|||
6049 | "\n" |
|
|||
6050 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
6051 | "\n" |
|
|||
6052 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
6053 | " källan att användas.\n" |
|
|||
6054 | "\n" |
|
|||
6055 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
6056 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
6057 | "\n" |
|
|||
6058 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
6059 | "\n" |
|
|||
6060 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
6061 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
6062 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
6063 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
6361 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" | |
6064 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
6362 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" | |
6065 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
6363 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" | |
6066 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
6364 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" | |
6067 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
6365 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" | |
6068 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
6366 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" | |
6069 |
" att finnas i destinationen. |
|
6367 | " att finnas i destinationen." | |
6070 | "\n" |
|
6368 | ||
6071 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
6072 | " --pull, även för lokala arkiv.\n" |
|
|||
6073 | "\n" |
|
|||
6074 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
6075 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
6076 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
6077 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
6078 | " för att undvika användning av hårda länkar.\n" |
|
|||
6079 | "\n" |
|
|||
6080 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
6081 | " hårdlänkade, med ::\n" |
|
|||
6082 | "\n" |
|
|||
6083 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
6084 | "\n" |
|
|||
6085 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
6086 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
6087 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
6088 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
6089 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
6090 | " under katalogen .hg, som mq.\n" |
|
|||
6091 | "\n" |
|
|||
6092 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
6093 | " revisionen från den här listan:\n" |
|
|||
6094 | "\n" |
|
|||
6095 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
6096 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
6097 | " arbetskatalog\n" |
|
|||
6098 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
6099 | " huvudet på den grenen)\n" |
|
|||
6100 | " d) ändringen angiven med -r\n" |
|
|||
6101 | " e) det högsta huvudet angivet med -b\n" |
|
|||
6102 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
6103 | " g) det högsta huvudet på default-grenen\n" |
|
|||
6104 | " h) tip\n" |
|
|||
6105 | " " |
|
|||
6106 |
|
||||
6107 | #, fuzzy |
|
|||
6108 | msgid "" |
|
6369 | msgid "" | |
6109 | " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" |
|
6370 | " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" | |
6110 | " local source repositories." |
|
6371 | " local source repositories." | |
6111 | msgstr "" |
|
6372 | msgstr "" | |
6112 | "gör en kopia av ett existerande arkiv\n" |
|
|||
6113 | "\n" |
|
|||
6114 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
6115 | "\n" |
|
|||
6116 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
6117 | " källan att användas.\n" |
|
|||
6118 | "\n" |
|
|||
6119 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
6120 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
6121 | "\n" |
|
|||
6122 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
6123 | "\n" |
|
|||
6124 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
6125 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
6126 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
6127 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
6128 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
6129 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
6130 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
6131 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
6132 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
6133 | " att finnas i destinationen.\n" |
|
|||
6134 | "\n" |
|
|||
6135 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
6373 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" | |
6136 |
" --pull, även för lokala arkiv. |
|
6374 | " --pull, även för lokala arkiv." | |
6137 | "\n" |
|
6375 | ||
6138 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
6139 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
6140 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
6141 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
6142 | " för att undvika användning av hårda länkar.\n" |
|
|||
6143 | "\n" |
|
|||
6144 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
6145 | " hårdlänkade, med ::\n" |
|
|||
6146 | "\n" |
|
|||
6147 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
6148 | "\n" |
|
|||
6149 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
6150 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
6151 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
6152 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
6153 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
6154 | " under katalogen .hg, som mq.\n" |
|
|||
6155 | "\n" |
|
|||
6156 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
6157 | " revisionen från den här listan:\n" |
|
|||
6158 | "\n" |
|
|||
6159 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
6160 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
6161 | " arbetskatalog\n" |
|
|||
6162 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
6163 | " huvudet på den grenen)\n" |
|
|||
6164 | " d) ändringen angiven med -r\n" |
|
|||
6165 | " e) det högsta huvudet angivet med -b\n" |
|
|||
6166 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
6167 | " g) det högsta huvudet på default-grenen\n" |
|
|||
6168 | " h) tip\n" |
|
|||
6169 | " " |
|
|||
6170 |
|
||||
6171 | #, fuzzy |
|
|||
6172 | msgid "" |
|
6376 | msgid "" | |
6173 | " For efficiency, hardlinks are used for cloning whenever the source\n" |
|
6377 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
6174 | " and destination are on the same filesystem (note this applies only\n" |
|
6378 | " and destination are on the same filesystem (note this applies only\n" | |
@@ -6177,192 +6381,22 b' msgid ""' | |||||
6177 | " do not report errors. In these cases, use the --pull option to\n" |
|
6381 | " do not report errors. In these cases, use the --pull option to\n" | |
6178 | " avoid hardlinking." |
|
6382 | " avoid hardlinking." | |
6179 | msgstr "" |
|
6383 | msgstr "" | |
6180 | "gör en kopia av ett existerande arkiv\n" |
|
|||
6181 | "\n" |
|
|||
6182 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
6183 | "\n" |
|
|||
6184 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
6185 | " källan att användas.\n" |
|
|||
6186 | "\n" |
|
|||
6187 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
6188 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
6189 | "\n" |
|
|||
6190 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
6191 | "\n" |
|
|||
6192 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
6193 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
6194 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
6195 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
6196 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
6197 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
6198 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
6199 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
6200 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
6201 | " att finnas i destinationen.\n" |
|
|||
6202 | "\n" |
|
|||
6203 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
6204 | " --pull, även för lokala arkiv.\n" |
|
|||
6205 | "\n" |
|
|||
6206 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
6384 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" | |
6207 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
6385 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" | |
6208 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
6386 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" | |
6209 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
6387 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" | |
6210 |
" för att undvika användning av hårda länkar. |
|
6388 | " för att undvika användning av hårda länkar." | |
6211 | "\n" |
|
6389 | ||
6212 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
6213 | " hårdlänkade, med ::\n" |
|
|||
6214 | "\n" |
|
|||
6215 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
6216 | "\n" |
|
|||
6217 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
6218 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
6219 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
6220 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
6221 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
6222 | " under katalogen .hg, som mq.\n" |
|
|||
6223 | "\n" |
|
|||
6224 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
6225 | " revisionen från den här listan:\n" |
|
|||
6226 | "\n" |
|
|||
6227 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
6228 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
6229 | " arbetskatalog\n" |
|
|||
6230 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
6231 | " huvudet på den grenen)\n" |
|
|||
6232 | " d) ändringen angiven med -r\n" |
|
|||
6233 | " e) det högsta huvudet angivet med -b\n" |
|
|||
6234 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
6235 | " g) det högsta huvudet på default-grenen\n" |
|
|||
6236 | " h) tip\n" |
|
|||
6237 | " " |
|
|||
6238 |
|
||||
6239 | #, fuzzy |
|
|||
6240 | msgid "" |
|
6390 | msgid "" | |
6241 | " In some cases, you can clone repositories and the working directory\n" |
|
6391 | " In some cases, you can clone repositories and the working directory\n" | |
6242 | " using full hardlinks with ::" |
|
6392 | " using full hardlinks with ::" | |
6243 | msgstr "" |
|
6393 | msgstr "" | |
6244 | "gör en kopia av ett existerande arkiv\n" |
|
|||
6245 | "\n" |
|
|||
6246 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
6247 | "\n" |
|
|||
6248 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
6249 | " källan att användas.\n" |
|
|||
6250 | "\n" |
|
|||
6251 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
6252 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
6253 | "\n" |
|
|||
6254 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
6255 | "\n" |
|
|||
6256 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
6257 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
6258 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
6259 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
6260 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
6261 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
6262 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
6263 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
6264 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
6265 | " att finnas i destinationen.\n" |
|
|||
6266 | "\n" |
|
|||
6267 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
6268 | " --pull, även för lokala arkiv.\n" |
|
|||
6269 | "\n" |
|
|||
6270 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
6271 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
6272 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
6273 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
6274 | " för att undvika användning av hårda länkar.\n" |
|
|||
6275 | "\n" |
|
|||
6276 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
6394 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" | |
6277 |
" hårdlänkade, med :: |
|
6395 | " hårdlänkade, med ::" | |
6278 | "\n" |
|
6396 | ||
6279 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
6280 | "\n" |
|
|||
6281 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
6282 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
6283 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
6284 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
6285 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
6286 | " under katalogen .hg, som mq.\n" |
|
|||
6287 | "\n" |
|
|||
6288 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
6289 | " revisionen från den här listan:\n" |
|
|||
6290 | "\n" |
|
|||
6291 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
6292 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
6293 | " arbetskatalog\n" |
|
|||
6294 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
6295 | " huvudet på den grenen)\n" |
|
|||
6296 | " d) ändringen angiven med -r\n" |
|
|||
6297 | " e) det högsta huvudet angivet med -b\n" |
|
|||
6298 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
6299 | " g) det högsta huvudet på default-grenen\n" |
|
|||
6300 | " h) tip\n" |
|
|||
6301 | " " |
|
|||
6302 |
|
||||
6303 | #, fuzzy |
|
|||
6304 | msgid " $ cp -al REPO REPOCLONE" |
|
6397 | msgid " $ cp -al REPO REPOCLONE" | |
6305 | msgstr "" |
|
6398 | msgstr " $ cp -al ARKIV ARKIVKLON" | |
6306 | "gör en kopia av ett existerande arkiv\n" |
|
6399 | ||
6307 | "\n" |
|
|||
6308 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
6309 | "\n" |
|
|||
6310 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
6311 | " källan att användas.\n" |
|
|||
6312 | "\n" |
|
|||
6313 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
6314 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
6315 | "\n" |
|
|||
6316 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
6317 | "\n" |
|
|||
6318 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
6319 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
6320 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
6321 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
6322 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
6323 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
6324 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
6325 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
6326 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
6327 | " att finnas i destinationen.\n" |
|
|||
6328 | "\n" |
|
|||
6329 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
6330 | " --pull, även för lokala arkiv.\n" |
|
|||
6331 | "\n" |
|
|||
6332 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
6333 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
6334 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
6335 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
6336 | " för att undvika användning av hårda länkar.\n" |
|
|||
6337 | "\n" |
|
|||
6338 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
6339 | " hårdlänkade, med ::\n" |
|
|||
6340 | "\n" |
|
|||
6341 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
6342 | "\n" |
|
|||
6343 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
6344 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
6345 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
6346 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
6347 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
6348 | " under katalogen .hg, som mq.\n" |
|
|||
6349 | "\n" |
|
|||
6350 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
6351 | " revisionen från den här listan:\n" |
|
|||
6352 | "\n" |
|
|||
6353 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
6354 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
6355 | " arbetskatalog\n" |
|
|||
6356 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
6357 | " huvudet på den grenen)\n" |
|
|||
6358 | " d) ändringen angiven med -r\n" |
|
|||
6359 | " e) det högsta huvudet angivet med -b\n" |
|
|||
6360 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
6361 | " g) det högsta huvudet på default-grenen\n" |
|
|||
6362 | " h) tip\n" |
|
|||
6363 | " " |
|
|||
6364 |
|
||||
6365 | #, fuzzy |
|
|||
6366 | msgid "" |
|
6400 | msgid "" | |
6367 | " This is the fastest way to clone, but it is not always safe. The\n" |
|
6401 | " This is the fastest way to clone, but it is not always safe. The\n" | |
6368 | " operation is not atomic (making sure REPO is not modified during\n" |
|
6402 | " operation is not atomic (making sure REPO is not modified during\n" | |
@@ -6371,130 +6405,20 b' msgid ""' | |||||
6371 | " this is not compatible with certain extensions that place their\n" |
|
6405 | " this is not compatible with certain extensions that place their\n" | |
6372 | " metadata under the .hg directory, such as mq." |
|
6406 | " metadata under the .hg directory, such as mq." | |
6373 | msgstr "" |
|
6407 | msgstr "" | |
6374 | "gör en kopia av ett existerande arkiv\n" |
|
|||
6375 | "\n" |
|
|||
6376 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
6377 | "\n" |
|
|||
6378 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
6379 | " källan att användas.\n" |
|
|||
6380 | "\n" |
|
|||
6381 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
6382 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
6383 | "\n" |
|
|||
6384 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
6385 | "\n" |
|
|||
6386 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
6387 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
6388 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
6389 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
6390 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
6391 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
6392 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
6393 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
6394 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
6395 | " att finnas i destinationen.\n" |
|
|||
6396 | "\n" |
|
|||
6397 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
6398 | " --pull, även för lokala arkiv.\n" |
|
|||
6399 | "\n" |
|
|||
6400 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
6401 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
6402 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
6403 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
6404 | " för att undvika användning av hårda länkar.\n" |
|
|||
6405 | "\n" |
|
|||
6406 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
6407 | " hårdlänkade, med ::\n" |
|
|||
6408 | "\n" |
|
|||
6409 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
6410 | "\n" |
|
|||
6411 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
6408 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" | |
6412 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
6409 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" | |
6413 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
6410 | " operationen är upp till dig) och du måste se till att din editor bryter\n" | |
6414 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
6411 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" | |
6415 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
6412 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" | |
6416 |
" under katalogen .hg, som mq. |
|
6413 | " under katalogen .hg, som mq." | |
6417 | "\n" |
|
6414 | ||
6418 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
6419 | " revisionen från den här listan:\n" |
|
|||
6420 | "\n" |
|
|||
6421 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
6422 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
6423 | " arbetskatalog\n" |
|
|||
6424 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
6425 | " huvudet på den grenen)\n" |
|
|||
6426 | " d) ändringen angiven med -r\n" |
|
|||
6427 | " e) det högsta huvudet angivet med -b\n" |
|
|||
6428 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
6429 | " g) det högsta huvudet på default-grenen\n" |
|
|||
6430 | " h) tip\n" |
|
|||
6431 | " " |
|
|||
6432 |
|
||||
6433 | #, fuzzy |
|
|||
6434 | msgid "" |
|
6415 | msgid "" | |
6435 | " Mercurial will update the working directory to the first applicable\n" |
|
6416 | " Mercurial will update the working directory to the first applicable\n" | |
6436 | " revision from this list:" |
|
6417 | " revision from this list:" | |
6437 | msgstr "" |
|
6418 | msgstr "" | |
6438 | "gör en kopia av ett existerande arkiv\n" |
|
|||
6439 | "\n" |
|
|||
6440 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
6441 | "\n" |
|
|||
6442 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
6443 | " källan att användas.\n" |
|
|||
6444 | "\n" |
|
|||
6445 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
6446 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
6447 | "\n" |
|
|||
6448 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
6449 | "\n" |
|
|||
6450 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
6451 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
6452 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
6453 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
6454 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
6455 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
6456 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
6457 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
6458 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
6459 | " att finnas i destinationen.\n" |
|
|||
6460 | "\n" |
|
|||
6461 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
6462 | " --pull, även för lokala arkiv.\n" |
|
|||
6463 | "\n" |
|
|||
6464 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
6465 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
6466 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
6467 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
6468 | " för att undvika användning av hårda länkar.\n" |
|
|||
6469 | "\n" |
|
|||
6470 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
6471 | " hårdlänkade, med ::\n" |
|
|||
6472 | "\n" |
|
|||
6473 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
6474 | "\n" |
|
|||
6475 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
6476 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
6477 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
6478 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
6479 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
6480 | " under katalogen .hg, som mq.\n" |
|
|||
6481 | "\n" |
|
|||
6482 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
6419 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" | |
6483 |
" revisionen från den här listan: |
|
6420 | " revisionen från den här listan:" | |
6484 | "\n" |
|
6421 | ||
6485 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
|||
6486 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
|||
6487 | " arbetskatalog\n" |
|
|||
6488 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" |
|
|||
6489 | " huvudet på den grenen)\n" |
|
|||
6490 | " d) ändringen angiven med -r\n" |
|
|||
6491 | " e) det högsta huvudet angivet med -b\n" |
|
|||
6492 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
|||
6493 | " g) det högsta huvudet på default-grenen\n" |
|
|||
6494 | " h) tip\n" |
|
|||
6495 | " " |
|
|||
6496 |
|
||||
6497 | #, fuzzy |
|
|||
6498 | msgid "" |
|
6422 | msgid "" | |
6499 | " a) null if -U or the source repository has no changesets\n" |
|
6423 | " a) null if -U or the source repository has no changesets\n" | |
6500 | " b) if -u . and the source repository is local, the first parent of\n" |
|
6424 | " b) if -u . and the source repository is local, the first parent of\n" | |
@@ -6505,56 +6429,8 b' msgid ""' | |||||
6505 | " e) the tipmost head specified with -b\n" |
|
6429 | " e) the tipmost head specified with -b\n" | |
6506 | " f) the tipmost head specified with the url#branch source syntax\n" |
|
6430 | " f) the tipmost head specified with the url#branch source syntax\n" | |
6507 | " g) the tipmost head of the default branch\n" |
|
6431 | " g) the tipmost head of the default branch\n" | |
6508 |
" h) tip |
|
6432 | " h) tip" | |
6509 | " " |
|
6433 | msgstr "" | |
6510 | msgstr "" |
|
|||
6511 | "gör en kopia av ett existerande arkiv\n" |
|
|||
6512 | "\n" |
|
|||
6513 | " Skapa en kopia av ett existerande arkiv i en ny katalog.\n" |
|
|||
6514 | "\n" |
|
|||
6515 | " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" |
|
|||
6516 | " källan att användas.\n" |
|
|||
6517 | "\n" |
|
|||
6518 | " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
|
|||
6519 | " som standardplats att användas för framtida dragningar.\n" |
|
|||
6520 | "\n" |
|
|||
6521 | " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
|||
6522 | "\n" |
|
|||
6523 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
|||
6524 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
|||
6525 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
|||
6526 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
|||
6527 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
|||
6528 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
|||
6529 | " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
|||
6530 | " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" |
|
|||
6531 | " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" |
|
|||
6532 | " att finnas i destinationen.\n" |
|
|||
6533 | "\n" |
|
|||
6534 | " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
|||
6535 | " --pull, även för lokala arkiv.\n" |
|
|||
6536 | "\n" |
|
|||
6537 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
|||
6538 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
|||
6539 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" |
|
|||
6540 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
|||
6541 | " för att undvika användning av hårda länkar.\n" |
|
|||
6542 | "\n" |
|
|||
6543 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" |
|
|||
6544 | " hårdlänkade, med ::\n" |
|
|||
6545 | "\n" |
|
|||
6546 | " $ cp -al ARKIV ARKIVKLON\n" |
|
|||
6547 | "\n" |
|
|||
6548 | " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" |
|
|||
6549 | " Operationen är inte atomisk (att ARKIV inte modifieras under\n" |
|
|||
6550 | " operationen är upp till dig) och du måste se till att din editor bryter\n" |
|
|||
6551 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
|||
6552 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
|||
6553 | " under katalogen .hg, som mq.\n" |
|
|||
6554 | "\n" |
|
|||
6555 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" |
|
|||
6556 | " revisionen från den här listan:\n" |
|
|||
6557 | "\n" |
|
|||
6558 | " a) null med -U eller källarkivet inte har några ändringar\n" |
|
6434 | " a) null med -U eller källarkivet inte har några ändringar\n" | |
6559 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" |
|
6435 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" | |
6560 | " arbetskatalog\n" |
|
6436 | " arbetskatalog\n" | |
@@ -6564,8 +6440,7 b' msgstr ""' | |||||
6564 | " e) det högsta huvudet angivet med -b\n" |
|
6440 | " e) det högsta huvudet angivet med -b\n" | |
6565 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" |
|
6441 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" | |
6566 | " g) det högsta huvudet på default-grenen\n" |
|
6442 | " g) det högsta huvudet på default-grenen\n" | |
6567 |
" h) tip |
|
6443 | " h) tip" | |
6568 | " " |
|
|||
6569 |
|
6444 | |||
6570 | msgid "cannot specify both --noupdate and --updaterev" |
|
6445 | msgid "cannot specify both --noupdate and --updaterev" | |
6571 | msgstr "kan inte ange både --noupdate och --updaterev" |
|
6446 | msgstr "kan inte ange både --noupdate och --updaterev" | |
@@ -6575,18 +6450,18 b' msgstr "arkivera de angivna filerna eller alla \xc3\xa4ndringar"' | |||||
6575 |
|
6450 | |||
6576 | msgid "" |
|
6451 | msgid "" | |
6577 | " Commit changes to the given files into the repository. Unlike a\n" |
|
6452 | " Commit changes to the given files into the repository. Unlike a\n" | |
6578 |
" centralized RCS, this operation is a local operation. See |
|
6453 | " centralized RCS, this operation is a local operation. See\n" | |
6579 | " for a way to actively distribute your changes." |
|
6454 | " :hg:`push` for a way to actively distribute your changes." | |
6580 | msgstr "" |
|
6455 | msgstr "" | |
6581 | " Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n" |
|
6456 | " Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n" | |
6582 |
" från ett centralicerat RCS, är detta en lokal operation. Se |
|
6457 | " från ett centralicerat RCS, är detta en lokal operation. Se :hg:`push`\n" | |
6583 | " för ett sätt att aktivt distribuera dina ändringar." |
|
6458 | " för ett sätt att aktivt distribuera dina ändringar." | |
6584 |
|
6459 | |||
6585 | msgid "" |
|
6460 | msgid "" | |
6586 |
" If a list of files is omitted, all changes reported by |
|
6461 | " If a list of files is omitted, all changes reported by :hg:`status`\n" | |
6587 | " will be committed." |
|
6462 | " will be committed." | |
6588 | msgstr "" |
|
6463 | msgstr "" | |
6589 |
" Om filer inte anges, kommer alla ändringar som |
|
6464 | " Om filer inte anges, kommer alla ändringar som :hg:`status`\n" | |
6590 | " rapporterar att arkiveras." |
|
6465 | " rapporterar att arkiveras." | |
6591 |
|
6466 | |||
6592 | msgid "" |
|
6467 | msgid "" | |
@@ -6603,6 +6478,16 b' msgstr ""' | |||||
6603 | " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n" |
|
6478 | " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n" | |
6604 | " att startas och fråga om meddelandet." |
|
6479 | " att startas och fråga om meddelandet." | |
6605 |
|
6480 | |||
|
6481 | msgid "" | |||
|
6482 | " Returns 0 on success, 1 if nothing changed.\n" | |||
|
6483 | " " | |||
|
6484 | msgstr "" | |||
|
6485 | " Returnerar 0 om kommandot lyckades, 1 om ingenting ändrades.\n" | |||
|
6486 | " " | |||
|
6487 | ||||
|
6488 | msgid "can only close branch heads" | |||
|
6489 | msgstr "kan bara stänga grenhuvuden" | |||
|
6490 | ||||
6606 | msgid "nothing changed\n" |
|
6491 | msgid "nothing changed\n" | |
6607 | msgstr "inget ändrat\n" |
|
6492 | msgstr "inget ändrat\n" | |
6608 |
|
6493 | |||
@@ -6610,6 +6495,10 b' msgid "created new head\\n"' | |||||
6610 | msgstr "skapade ett nytt huvud\n" |
|
6495 | msgstr "skapade ett nytt huvud\n" | |
6611 |
|
6496 | |||
6612 | #, python-format |
|
6497 | #, python-format | |
|
6498 | msgid "reopening closed branch head %d\n" | |||
|
6499 | msgstr "återöppnar det stängda grenhuvudet %d\n" | |||
|
6500 | ||||
|
6501 | #, python-format | |||
6613 | msgid "committed changeset %d:%s\n" |
|
6502 | msgid "committed changeset %d:%s\n" | |
6614 | msgstr "arkiverade ändringen %d:%s\n" |
|
6503 | msgstr "arkiverade ändringen %d:%s\n" | |
6615 |
|
6504 | |||
@@ -6636,11 +6525,17 b' msgstr ""' | |||||
6636 |
|
6525 | |||
6637 | msgid "" |
|
6526 | msgid "" | |
6638 | " This command takes effect with the next commit. To undo a copy\n" |
|
6527 | " This command takes effect with the next commit. To undo a copy\n" | |
6639 |
" before that, see |
|
6528 | " before that, see :hg:`revert`." | |
6640 | " " |
|
6529 | msgstr "" | |
6641 | msgstr "" |
|
6530 | " Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" | |
6642 | " Kommandot slår igenom vid nästa arkivering. För att ångra en\n" |
|
6531 | " namnbyte innan det, se :hg:`revert`." | |
6643 | " kopiering innan dess, se hg revert.\n" |
|
6532 | " " | |
|
6533 | ||||
|
6534 | msgid "" | |||
|
6535 | " Returns 0 on success, 1 if errors are encountered.\n" | |||
|
6536 | " " | |||
|
6537 | msgstr "" | |||
|
6538 | " Returnerar 0 om kommandot lyckades, 1 om fel uppstod.\n" | |||
6644 | " " |
|
6539 | " " | |
6645 |
|
6540 | |||
6646 | msgid "find the ancestor revision of two revisions in a given index" |
|
6541 | msgid "find the ancestor revision of two revisions in a given index" | |
@@ -6649,9 +6544,73 b' msgstr "hitta f\xc3\xb6reg\xc3\xa5ende revision av tv\xc3\xa5 revisioner i ett givet index"' | |||||
6649 | msgid "either two or three arguments required" |
|
6544 | msgid "either two or three arguments required" | |
6650 | msgstr "endera två eller tre argument krävs" |
|
6545 | msgstr "endera två eller tre argument krävs" | |
6651 |
|
6546 | |||
|
6547 | msgid "builds a repo with a given dag from scratch in the current empty repo" | |||
|
6548 | msgstr "" | |||
|
6549 | ||||
|
6550 | msgid " Elements:" | |||
|
6551 | msgstr "" | |||
|
6552 | ||||
|
6553 | msgid "" | |||
|
6554 | " - \"+n\" is a linear run of n nodes based on the current default " | |||
|
6555 | "parent\n" | |||
|
6556 | " - \".\" is a single node based on the current default parent\n" | |||
|
6557 | " - \"$\" resets the default parent to null (implied at the start);\n" | |||
|
6558 | " otherwise the default parent is always the last node created\n" | |||
|
6559 | " - \"<p\" sets the default parent to the backref p\n" | |||
|
6560 | " - \"*p\" is a fork at parent p, which is a backref\n" | |||
|
6561 | " - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n" | |||
|
6562 | " - \"/p2\" is a merge of the preceding node and p2\n" | |||
|
6563 | " - \":tag\" defines a local tag for the preceding node\n" | |||
|
6564 | " - \"@branch\" sets the named branch for subsequent nodes\n" | |||
|
6565 | " - \"!command\" runs the command using your shell\n" | |||
|
6566 | " - \"!!my command\\n\" is like \"!\", but to the end of the line\n" | |||
|
6567 | " - \"#...\\n\" is a comment up to the end of the line" | |||
|
6568 | msgstr "" | |||
|
6569 | ||||
|
6570 | msgid " Whitespace between the above elements is ignored." | |||
|
6571 | msgstr "" | |||
|
6572 | ||||
|
6573 | msgid " A backref is either" | |||
|
6574 | msgstr "" | |||
|
6575 | ||||
|
6576 | msgid "" | |||
|
6577 | " - a number n, which references the node curr-n, where curr is the " | |||
|
6578 | "current\n" | |||
|
6579 | " node, or\n" | |||
|
6580 | " - the name of a local tag you placed earlier using \":tag\", or\n" | |||
|
6581 | " - empty to denote the default parent." | |||
|
6582 | msgstr "" | |||
|
6583 | ||||
|
6584 | msgid "" | |||
|
6585 | " All string valued-elements are either strictly alphanumeric, or must\n" | |||
|
6586 | " be enclosed in double quotes (\"...\"), with \"\" as escape character." | |||
|
6587 | msgstr "" | |||
|
6588 | ||||
|
6589 | msgid "" | |||
|
6590 | " Note that the --overwritten-file and --appended-file options imply the\n" | |||
|
6591 | " use of \"HGMERGE=internal:local\" during DAG buildup.\n" | |||
|
6592 | " " | |||
|
6593 | msgstr "" | |||
|
6594 | ||||
|
6595 | msgid "need at least one of -m, -a, -o, -n" | |||
|
6596 | msgstr "" | |||
|
6597 | ||||
|
6598 | msgid "repository is not empty" | |||
|
6599 | msgstr "arkivet är inte tomt" | |||
|
6600 | ||||
|
6601 | #, python-format | |||
|
6602 | msgid "%s command %s" | |||
|
6603 | msgstr "" | |||
|
6604 | ||||
|
6605 | msgid "list all available commands and options" | |||
|
6606 | msgstr "visa alla tillgängliga kommandon och alternativ" | |||
|
6607 | ||||
6652 | msgid "returns the completion list associated with the given command" |
|
6608 | msgid "returns the completion list associated with the given command" | |
6653 | msgstr "returnerar kompletteringslistan associerad med det givna kommandot" |
|
6609 | msgstr "returnerar kompletteringslistan associerad med det givna kommandot" | |
6654 |
|
6610 | |||
|
6611 | msgid "show information detected about current filesystem" | |||
|
6612 | msgstr "visa information om det aktuella filsystemet" | |||
|
6613 | ||||
6655 | msgid "rebuild the dirstate as it would look like for the given revision" |
|
6614 | msgid "rebuild the dirstate as it would look like for the given revision" | |
6656 | msgstr "bygg om katalogstatusen som den skulle se ut för den givna revisionen" |
|
6615 | msgstr "bygg om katalogstatusen som den skulle se ut för den givna revisionen" | |
6657 |
|
6616 | |||
@@ -6699,23 +6658,39 b' msgstr ""' | |||||
6699 |
|
6658 | |||
6700 | msgid "" |
|
6659 | msgid "" | |
6701 | " With --debug, the source (filename and line number) is printed\n" |
|
6660 | " With --debug, the source (filename and line number) is printed\n" | |
6702 |
" for each config item. |
|
6661 | " for each config item." | |
6703 | " " |
|
|||
6704 | msgstr "" |
|
6662 | msgstr "" | |
6705 | " Med --debug, visas källan (filnamn och radnummer) för varje\n" |
|
6663 | " Med --debug, visas källan (filnamn och radnummer) för varje\n" | |
6706 |
" alternativ. |
|
6664 | " alternativ." | |
6707 | " " |
|
6665 | ||
|
6666 | #, python-format | |||
|
6667 | msgid "read config from: %s\n" | |||
|
6668 | msgstr "läs konfiguration från: %s\n" | |||
6708 |
|
6669 | |||
6709 | msgid "only one config item permitted" |
|
6670 | msgid "only one config item permitted" | |
6710 | msgstr "bara ett konfigurationsalternativ tillåts" |
|
6671 | msgstr "bara ett konfigurationsalternativ tillåts" | |
6711 |
|
6672 | |||
|
6673 | msgid "access the pushkey key/value protocol" | |||
|
6674 | msgstr "" | |||
|
6675 | ||||
|
6676 | msgid " With two args, list the keys in the given namespace." | |||
|
6677 | msgstr "" | |||
|
6678 | ||||
|
6679 | msgid "" | |||
|
6680 | " With five args, set a key to new if it currently is set to old.\n" | |||
|
6681 | " Reports success or failure.\n" | |||
|
6682 | " " | |||
|
6683 | msgstr "" | |||
|
6684 | ||||
|
6685 | msgid "parse and apply a revision specification" | |||
|
6686 | msgstr "" | |||
|
6687 | ||||
6712 | msgid "manually set the parents of the current working directory" |
|
6688 | msgid "manually set the parents of the current working directory" | |
6713 | msgstr "" |
|
6689 | msgstr "" | |
6714 |
|
6690 | |||
6715 | msgid "" |
|
6691 | msgid "" | |
6716 | " This is useful for writing repository conversion tools, but should\n" |
|
6692 | " This is useful for writing repository conversion tools, but should\n" | |
6717 |
" be used with care. |
|
6693 | " be used with care." | |
6718 | " " |
|
|||
6719 | msgstr "" |
|
6694 | msgstr "" | |
6720 |
|
6695 | |||
6721 | msgid "show the contents of the current dirstate" |
|
6696 | msgid "show the contents of the current dirstate" | |
@@ -6725,6 +6700,22 b' msgstr ""' | |||||
6725 | msgid "copy: %s -> %s\n" |
|
6700 | msgid "copy: %s -> %s\n" | |
6726 | msgstr "" |
|
6701 | msgstr "" | |
6727 |
|
6702 | |||
|
6703 | msgid "format the changelog or an index DAG as a concise textual description" | |||
|
6704 | msgstr "" | |||
|
6705 | ||||
|
6706 | msgid "" | |||
|
6707 | " If you pass a revlog index, the revlog's DAG is emitted. If you list\n" | |||
|
6708 | " revision numbers, they get labelled in the output as rN." | |||
|
6709 | msgstr "" | |||
|
6710 | ||||
|
6711 | msgid "" | |||
|
6712 | " Otherwise, the changelog DAG of the current repo is emitted.\n" | |||
|
6713 | " " | |||
|
6714 | msgstr "" | |||
|
6715 | ||||
|
6716 | msgid "need repo for changelog dag" | |||
|
6717 | msgstr "" | |||
|
6718 | ||||
6728 | msgid "dump the contents of a data file revision" |
|
6719 | msgid "dump the contents of a data file revision" | |
6729 | msgstr "" |
|
6720 | msgstr "" | |
6730 |
|
6721 | |||
@@ -6742,7 +6733,7 b' msgid "dump an index DAG as a graphviz d' | |||||
6742 | msgstr "" |
|
6733 | msgstr "" | |
6743 |
|
6734 | |||
6744 | msgid "test Mercurial installation" |
|
6735 | msgid "test Mercurial installation" | |
6745 | msgstr "" |
|
6736 | msgstr "testa Mercurial-installation" | |
6746 |
|
6737 | |||
6747 | #, python-format |
|
6738 | #, python-format | |
6748 | msgid "Checking encoding (%s)...\n" |
|
6739 | msgid "Checking encoding (%s)...\n" | |
@@ -6778,10 +6769,14 b' msgstr ""' | |||||
6778 | msgid " patch test failed!\n" |
|
6769 | msgid " patch test failed!\n" | |
6779 | msgstr "" |
|
6770 | msgstr "" | |
6780 |
|
6771 | |||
6781 | msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" |
|
6772 | msgid "" | |
6782 | msgstr "" |
|
6773 | " (Current patch tool may be incompatible with patch, or misconfigured. " | |
6783 |
|
6774 | "Please check your .hgrc file)\n" | ||
6784 | msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" |
|
6775 | msgstr "" | |
|
6776 | ||||
|
6777 | msgid "" | |||
|
6778 | " Internal patcher failure, please report this error to http://mercurial." | |||
|
6779 | "selenic.com/bts/\n" | |||
6785 | msgstr "" |
|
6780 | msgstr "" | |
6786 |
|
6781 | |||
6787 | msgid "Checking commit editor...\n" |
|
6782 | msgid "Checking commit editor...\n" | |
@@ -6860,12 +6855,10 b' msgstr ""' | |||||
6860 |
|
6855 | |||
6861 | msgid "" |
|
6856 | msgid "" | |
6862 | " Use the -g/--git option to generate diffs in the git extended diff\n" |
|
6857 | " Use the -g/--git option to generate diffs in the git extended diff\n" | |
6863 |
" format. For more information, read |
|
6858 | " format. For more information, read :hg:`help diffs`." | |
6864 | " " |
|
|||
6865 | msgstr "" |
|
6859 | msgstr "" | |
6866 | " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n" |
|
6860 | " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n" | |
6867 |
" mer information, läs |
|
6861 | " mer information, läs :hg:`help diffs`." | |
6868 | " " |
|
|||
6869 |
|
6862 | |||
6870 | msgid "dump the header and diffs for one or more changesets" |
|
6863 | msgid "dump the header and diffs for one or more changesets" | |
6871 | msgstr "dumpa rubrik och diff för en eller fler ändringar" |
|
6864 | msgstr "dumpa rubrik och diff för en eller fler ändringar" | |
@@ -6928,19 +6921,17 b' msgstr ""' | |||||
6928 |
|
6921 | |||
6929 | msgid "" |
|
6922 | msgid "" | |
6930 | " Use the -g/--git option to generate diffs in the git extended diff\n" |
|
6923 | " Use the -g/--git option to generate diffs in the git extended diff\n" | |
6931 |
" format. See |
|
6924 | " format. See :hg:`help diffs` for more information." | |
6932 | msgstr "" |
|
6925 | msgstr "" | |
6933 | " Använd flaggan -g/--git för att generera diffar i gits utökade format.\n" |
|
6926 | " Använd flaggan -g/--git för att generera diffar i gits utökade format.\n" | |
6934 |
" Se |
|
6927 | " Se :hg:`help diffs` för mer information." | |
6935 |
|
6928 | |||
6936 | msgid "" |
|
6929 | msgid "" | |
6937 | " With the --switch-parent option, the diff will be against the\n" |
|
6930 | " With the --switch-parent option, the diff will be against the\n" | |
6938 |
" second parent. It can be useful to review a merge. |
|
6931 | " second parent. It can be useful to review a merge." | |
6939 | " " |
|
|||
6940 | msgstr "" |
|
6932 | msgstr "" | |
6941 | " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n" |
|
6933 | " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n" | |
6942 |
" föräldern. Det kan vara användbart för att granska en sammanfogning. |
|
6934 | " föräldern. Det kan vara användbart för att granska en sammanfogning." | |
6943 | " " |
|
|||
6944 |
|
6935 | |||
6945 | msgid "export requires at least one changeset" |
|
6936 | msgid "export requires at least one changeset" | |
6946 | msgstr "" |
|
6937 | msgstr "" | |
@@ -6969,12 +6960,8 b' msgstr ""' | |||||
6969 | " Detta tar bara bort filer från den nuvarande grenen, inte från hela\n" |
|
6960 | " Detta tar bara bort filer från den nuvarande grenen, inte från hela\n" | |
6970 | " projekthistoriken, och det raderar dem inte från arbetskatalogen." |
|
6961 | " projekthistoriken, och det raderar dem inte från arbetskatalogen." | |
6971 |
|
6962 | |||
6972 | msgid "" |
|
6963 | msgid " To undo a forget before the next commit, see :hg:`add`." | |
6973 | " To undo a forget before the next commit, see hg add.\n" |
|
6964 | msgstr " För att ångra en forget innan nästa arkivering, se :hg:`add`." | |
6974 | " " |
|
|||
6975 | msgstr "" |
|
|||
6976 | " För att ångra en forget innan nästa arkivering, se hg add.\n" |
|
|||
6977 | " " |
|
|||
6978 |
|
6965 | |||
6979 | msgid "no files specified" |
|
6966 | msgid "no files specified" | |
6980 | msgstr "" |
|
6967 | msgstr "" | |
@@ -7004,14 +6991,19 b' msgid ""' | |||||
7004 | " file in which it finds a match. To get it to print every revision\n" |
|
6991 | " file in which it finds a match. To get it to print every revision\n" | |
7005 | " that contains a change in match status (\"-\" for a match that\n" |
|
6992 | " that contains a change in match status (\"-\" for a match that\n" | |
7006 | " becomes a non-match, or \"+\" for a non-match that becomes a match),\n" |
|
6993 | " becomes a non-match, or \"+\" for a non-match that becomes a match),\n" | |
7007 |
" use the --all flag. |
|
6994 | " use the --all flag." | |
7008 | " " |
|
|||
7009 | msgstr "" |
|
6995 | msgstr "" | |
7010 | " Som standard visar grep bara utmatningen från den första revisionen\n" |
|
6996 | " Som standard visar grep bara utmatningen från den första revisionen\n" | |
7011 | " av en matchande fil. För att visa varje revision som innehåller en\n" |
|
6997 | " av en matchande fil. För att visa varje revision som innehåller en\n" | |
7012 | " ändring i träffstatus (\"-\" för en träff som blir en icke-träff,\n" |
|
6998 | " ändring i träffstatus (\"-\" för en träff som blir en icke-träff,\n" | |
7013 | " eller \"+\" för en icke-träff som blir en träff), använd flaggan\n" |
|
6999 | " eller \"+\" för en icke-träff som blir en träff), använd flaggan\n" | |
7014 |
" --all. |
|
7000 | " --all." | |
|
7001 | ||||
|
7002 | msgid "" | |||
|
7003 | " Returns 0 if a match is found, 1 otherwise.\n" | |||
|
7004 | " " | |||
|
7005 | msgstr "" | |||
|
7006 | " Returnerar 0 om en träff hittas, 1 annars.\n" | |||
7015 | " " |
|
7007 | " " | |
7016 |
|
7008 | |||
7017 | #, python-format |
|
7009 | #, python-format | |
@@ -7044,10 +7036,10 b' msgstr ""' | |||||
7044 |
|
7036 | |||
7045 | msgid "" |
|
7037 | msgid "" | |
7046 | " If -c/--closed is specified, also show branch heads marked closed\n" |
|
7038 | " If -c/--closed is specified, also show branch heads marked closed\n" | |
7047 |
" (see |
|
7039 | " (see :hg:`commit --close-branch`)." | |
7048 | msgstr "" |
|
7040 | msgstr "" | |
7049 | " Om -c/--closed anges, visas också grenvhuvuden som markerats som\n" |
|
7041 | " Om -c/--closed anges, visas också grenvhuvuden som markerats som\n" | |
7050 |
" stängda (se |
|
7042 | " stängda (se :hg:`commit --close-branch`)." | |
7051 |
|
7043 | |||
7052 | msgid "" |
|
7044 | msgid "" | |
7053 | " If STARTREV is specified, only those heads that are descendants of\n" |
|
7045 | " If STARTREV is specified, only those heads that are descendants of\n" | |
@@ -7057,12 +7049,18 b' msgstr ""' | |||||
7057 | " anfader." |
|
7049 | " anfader." | |
7058 |
|
7050 | |||
7059 | msgid "" |
|
7051 | msgid "" | |
7060 |
" If -t/--topo is specified, named branch mechanics will be ignored and |
|
7052 | " If -t/--topo is specified, named branch mechanics will be ignored and " | |
7061 | " changesets without children will be shown.\n" |
|
7053 | "only\n" | |
7062 | " " |
|
7054 | " changesets without children will be shown." | |
7063 | msgstr "" |
|
7055 | msgstr "" | |
7064 | " Om -t/--topo anges, ignoreras all logik för namngivna grenar och bara\n" |
|
7056 | " Om -t/--topo anges, ignoreras all logik för namngivna grenar och bara\n" | |
7065 |
" ändringar utan barn kommer att visas. |
|
7057 | " ändringar utan barn kommer att visas." | |
|
7058 | ||||
|
7059 | msgid "" | |||
|
7060 | " Returns 0 if matching heads are found, 1 if not.\n" | |||
|
7061 | " " | |||
|
7062 | msgstr "" | |||
|
7063 | " Returnerar 0 om matchande huvuden hittas, 1 annars.\n" | |||
7066 | " " |
|
7064 | " " | |
7067 |
|
7065 | |||
7068 | #, python-format |
|
7066 | #, python-format | |
@@ -7076,7 +7074,8 b' msgstr " (b\xc3\xb6rjade som %s)"' | |||||
7076 | msgid "show help for a given topic or a help overview" |
|
7074 | msgid "show help for a given topic or a help overview" | |
7077 | msgstr "visa hjälp för ett givet ämne eller en hjälpöversikt" |
|
7075 | msgstr "visa hjälp för ett givet ämne eller en hjälpöversikt" | |
7078 |
|
7076 | |||
7079 | msgid " With no arguments, print a list of commands with short help messages." |
|
7077 | msgid "" | |
|
7078 | " With no arguments, print a list of commands with short help messages." | |||
7080 | msgstr " Utan argument visas en kommandolista med korta hjälpmeddelanden." |
|
7079 | msgstr " Utan argument visas en kommandolista med korta hjälpmeddelanden." | |
7081 |
|
7080 | |||
7082 | msgid "" |
|
7081 | msgid "" | |
@@ -7086,6 +7085,13 b' msgstr ""' | |||||
7086 | " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n" |
|
7085 | " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n" | |
7087 | " " |
|
7086 | " " | |
7088 |
|
7087 | |||
|
7088 | msgid "" | |||
|
7089 | " Returns 0 if successful.\n" | |||
|
7090 | " " | |||
|
7091 | msgstr "" | |||
|
7092 | " Returnerar 0 om kommandot lyckades.\n" | |||
|
7093 | " " | |||
|
7094 | ||||
7089 | msgid "global options:" |
|
7095 | msgid "global options:" | |
7090 | msgstr "globala flaggor:" |
|
7096 | msgstr "globala flaggor:" | |
7091 |
|
7097 | |||
@@ -7093,7 +7099,8 b' msgid "use \\"hg help\\" for the full list' | |||||
7093 | msgstr "använd \"hg help\" för den fulla kommandolistan" |
|
7099 | msgstr "använd \"hg help\" för den fulla kommandolistan" | |
7094 |
|
7100 | |||
7095 | msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" |
|
7101 | msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" | |
7096 | msgstr "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" |
|
7102 | msgstr "" | |
|
7103 | "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" | |||
7097 |
|
7104 | |||
7098 | #, python-format |
|
7105 | #, python-format | |
7099 | msgid "use \"hg -v help%s\" to show aliases and global options" |
|
7106 | msgid "use \"hg -v help%s\" to show aliases and global options" | |
@@ -7147,7 +7154,8 b' msgid "%s extension - %s"' | |||||
7147 | msgstr "%s-utökning - %s" |
|
7154 | msgstr "%s-utökning - %s" | |
7148 |
|
7155 | |||
7149 | msgid "use \"hg help extensions\" for information on enabling extensions\n" |
|
7156 | msgid "use \"hg help extensions\" for information on enabling extensions\n" | |
7150 | msgstr "använd \"hg help extensions\" för information om aktivering av utökningar\n" |
|
7157 | msgstr "" | |
|
7158 | "använd \"hg help extensions\" för information om aktivering av utökningar\n" | |||
7151 |
|
7159 | |||
7152 | #, python-format |
|
7160 | #, python-format | |
7153 | msgid "'%s' is provided by the following extension:" |
|
7161 | msgid "'%s' is provided by the following extension:" | |
@@ -7162,11 +7170,19 b' msgstr "grundl\xc3\xa4ggande kommandon:"' | |||||
7162 | msgid "enabled extensions:" |
|
7170 | msgid "enabled extensions:" | |
7163 | msgstr "aktiverade utökningar:" |
|
7171 | msgstr "aktiverade utökningar:" | |
7164 |
|
7172 | |||
|
7173 | msgid "VALUE" | |||
|
7174 | msgstr "VÄRDE" | |||
|
7175 | ||||
7165 | msgid "DEPRECATED" |
|
7176 | msgid "DEPRECATED" | |
7166 | msgstr "FÖRLEGAD" |
|
7177 | msgstr "FÖRLEGAD" | |
7167 |
|
7178 | |||
7168 | msgid "" |
|
7179 | msgid "" | |
7169 | "\n" |
|
7180 | "\n" | |
|
7181 | "[+] marked option can be specified multiple times" | |||
|
7182 | msgstr "" | |||
|
7183 | ||||
|
7184 | msgid "" | |||
|
7185 | "\n" | |||
7170 | "additional help topics:" |
|
7186 | "additional help topics:" | |
7171 | msgstr "" |
|
7187 | msgstr "" | |
7172 | "\n" |
|
7188 | "\n" | |
@@ -7193,14 +7209,12 b' msgid ""' | |||||
7193 | " This summary identifies the repository state using one or two\n" |
|
7209 | " This summary identifies the repository state using one or two\n" | |
7194 | " parent hash identifiers, followed by a \"+\" if there are\n" |
|
7210 | " parent hash identifiers, followed by a \"+\" if there are\n" | |
7195 | " uncommitted changes in the working directory, a list of tags for\n" |
|
7211 | " uncommitted changes in the working directory, a list of tags for\n" | |
7196 |
" this revision and a branch name for non-default branches. |
|
7212 | " this revision and a branch name for non-default branches." | |
7197 | " " |
|
|||
7198 | msgstr "" |
|
7213 | msgstr "" | |
7199 | " Sammanfattningen identifierar arkivstatusen med en eller två\n" |
|
7214 | " Sammanfattningen identifierar arkivstatusen med en eller två\n" | |
7200 | " föräldrars hash-identifierare, följt av ett \"+\" om det finns\n" |
|
7215 | " föräldrars hash-identifierare, följt av ett \"+\" om det finns\n" | |
7201 | " oarkiverade ändringar i arbetskatalogen, en lista av märken för den\n" |
|
7216 | " oarkiverade ändringar i arbetskatalogen, en lista av märken för den\n" | |
7202 |
" här revisionen och ett grennamn för grenar som inte är default. |
|
7217 | " här revisionen och ett grennamn för grenar som inte är default." | |
7203 | " " |
|
|||
7204 |
|
7218 | |||
7205 | msgid "import an ordered set of patches" |
|
7219 | msgid "import an ordered set of patches" | |
7206 | msgstr "" |
|
7220 | msgstr "" | |
@@ -7225,7 +7239,7 b' msgid ""' | |||||
7225 | msgstr "" |
|
7239 | msgstr "" | |
7226 |
|
7240 | |||
7227 | msgid "" |
|
7241 | msgid "" | |
7228 |
" If the imported patch was generated by |
|
7242 | " If the imported patch was generated by :hg:`export`, user and\n" | |
7229 | " description from patch override values from message headers and\n" |
|
7243 | " description from patch override values from message headers and\n" | |
7230 | " body. Values given on command line with -m/--message and -u/--user\n" |
|
7244 | " body. Values given on command line with -m/--message and -u/--user\n" | |
7231 | " override these." |
|
7245 | " override these." | |
@@ -7247,8 +7261,7 b' msgstr ""' | |||||
7247 | msgid "" |
|
7261 | msgid "" | |
7248 | " To read a patch from standard input, use \"-\" as the patch name. If\n" |
|
7262 | " To read a patch from standard input, use \"-\" as the patch name. If\n" | |
7249 | " a URL is specified, the patch will be downloaded from it.\n" |
|
7263 | " a URL is specified, the patch will be downloaded from it.\n" | |
7250 |
" See |
|
7264 | " See :hg:`help dates` for a list of formats valid for -d/--date." | |
7251 | " " |
|
|||
7252 | msgstr "" |
|
7265 | msgstr "" | |
7253 |
|
7266 | |||
7254 | msgid "to working directory" |
|
7267 | msgid "to working directory" | |
@@ -7289,11 +7302,14 b' msgstr ""' | |||||
7289 | " För fjärrarkiv, använd --bundle för att slippa ladda ner\n" |
|
7302 | " För fjärrarkiv, använd --bundle för att slippa ladda ner\n" | |
7290 | " ändringarna två gånger om incoming följs av pull." |
|
7303 | " ändringarna två gånger om incoming följs av pull." | |
7291 |
|
7304 | |||
7292 | msgid "" |
|
7305 | msgid " See pull for valid source format details." | |
7293 | " See pull for valid source format details.\n" |
|
7306 | msgstr "" | |
7294 | " " |
|
7307 | ||
7295 |
msg |
|
7308 | msgid "" | |
7296 | " Se pull för detaljer om giltiga källformat.\n" |
|
7309 | " Returns 0 if there are incoming changes, 1 otherwise.\n" | |
|
7310 | " " | |||
|
7311 | msgstr "" | |||
|
7312 | " Returnerar 0 om det finns inkommande ändringar, 1 annars.\n" | |||
7297 | " " |
|
7313 | " " | |
7298 |
|
7314 | |||
7299 | msgid "create a new repository in the given directory" |
|
7315 | msgid "create a new repository in the given directory" | |
@@ -7311,12 +7327,10 b' msgstr " Om ingen katalog anges, anv\xc3\xa4nds den nuvarande katalogen."' | |||||
7311 |
|
7327 | |||
7312 | msgid "" |
|
7328 | msgid "" | |
7313 | " It is possible to specify an ``ssh://`` URL as the destination.\n" |
|
7329 | " It is possible to specify an ``ssh://`` URL as the destination.\n" | |
7314 |
" See |
|
7330 | " See :hg:`help urls` for more information." | |
7315 | " " |
|
|||
7316 | msgstr "" |
|
7331 | msgstr "" | |
7317 | " Det är möjligt att specificera en URL med ``ssh://`` som destination.\n" |
|
7332 | " Det är möjligt att specificera en URL med ``ssh://`` som destination.\n" | |
7318 |
" Se |
|
7333 | " Se :hg:`help urls` för mer informatio" | |
7319 | " " |
|
|||
7320 |
|
7334 | |||
7321 | msgid "locate files matching specific patterns" |
|
7335 | msgid "locate files matching specific patterns" | |
7322 | msgstr "hitta filer som matchar givna mönster" |
|
7336 | msgstr "hitta filer som matchar givna mönster" | |
@@ -7348,14 +7362,12 b' msgid ""' | |||||
7348 | " If you want to feed the output of this command into the \"xargs\"\n" |
|
7362 | " If you want to feed the output of this command into the \"xargs\"\n" | |
7349 | " command, use the -0 option to both this command and \"xargs\". This\n" |
|
7363 | " command, use the -0 option to both this command and \"xargs\". This\n" | |
7350 | " will avoid the problem of \"xargs\" treating single filenames that\n" |
|
7364 | " will avoid the problem of \"xargs\" treating single filenames that\n" | |
7351 |
" contain whitespace as multiple filenames. |
|
7365 | " contain whitespace as multiple filenames." | |
7352 | " " |
|
|||
7353 | msgstr "" |
|
7366 | msgstr "" | |
7354 | " Om du vill skicka utmatningen från detta kommando till kommandot\n" |
|
7367 | " Om du vill skicka utmatningen från detta kommando till kommandot\n" | |
7355 |
" \"xargs\", använd flaggan - |
|
7368 | " \"xargs\", använd flaggan -0 till både detta kommando och \"xargs\".\n" | |
7356 | " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n" |
|
7369 | " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n" | |
7357 |
" innehåller blanktecken som multipla filnamn |
|
7370 | " innehåller blanktecken som multipla filnamn" | |
7358 | " " |
|
|||
7359 |
|
7371 | |||
7360 | msgid "show revision history of entire repository or files" |
|
7372 | msgid "show revision history of entire repository or files" | |
7361 | msgstr "visa revisionshistorik för hela arkivet eller filer" |
|
7373 | msgstr "visa revisionshistorik för hela arkivet eller filer" | |
@@ -7383,11 +7395,13 b' msgstr ""' | |||||
7383 | msgid "" |
|
7395 | msgid "" | |
7384 | " If no revision range is specified, the default is tip:0 unless\n" |
|
7396 | " If no revision range is specified, the default is tip:0 unless\n" | |
7385 | " --follow is set, in which case the working directory parent is\n" |
|
7397 | " --follow is set, in which case the working directory parent is\n" | |
7386 | " used as the starting revision." |
|
7398 | " used as the starting revision. You can specify a revision set for\n" | |
|
7399 | " log, see :hg:`help revsets` for more information." | |||
7387 | msgstr "" |
|
7400 | msgstr "" | |
7388 | " Om ingen revisionsserie specificeras, används tip:0 som standard om\n" |
|
7401 | " Om ingen revisionsserie specificeras, används tip:0 som standard om\n" | |
7389 | " inte --follow är satt, då arbetskatalogens förälder används som första\n" |
|
7402 | " inte --follow är satt, då arbetskatalogens förälder används som första\n" | |
7390 | " revision." |
|
7403 | " revision. Du kan ange ett revisionsset för log, se :hg:`help revsets`\n" | |
|
7404 | " för mer information." | |||
7391 |
|
7405 | |||
7392 | msgid "" |
|
7406 | msgid "" | |
7393 | " By default this command prints revision number and changeset id,\n" |
|
7407 | " By default this command prints revision number and changeset id,\n" | |
@@ -7404,14 +7418,12 b' msgid ""' | |||||
7404 | " NOTE: log -p/--patch may generate unexpected diff output for merge\n" |
|
7418 | " NOTE: log -p/--patch may generate unexpected diff output for merge\n" | |
7405 | " changesets, as it will only compare the merge changeset against\n" |
|
7419 | " changesets, as it will only compare the merge changeset against\n" | |
7406 | " its first parent. Also, only files different from BOTH parents\n" |
|
7420 | " its first parent. Also, only files different from BOTH parents\n" | |
7407 |
" will appear in files:. |
|
7421 | " will appear in files:." | |
7408 | " " |
|
|||
7409 | msgstr "" |
|
7422 | msgstr "" | |
7410 | " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n" |
|
7423 | " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n" | |
7411 | " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n" |
|
7424 | " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n" | |
7412 | " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n" |
|
7425 | " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n" | |
7413 |
" föräldrarna att visas i filer:. |
|
7426 | " föräldrarna att visas i filer:." | |
7414 | " " |
|
|||
7415 |
|
7427 | |||
7416 | msgid "output the current or given revision of the project manifest" |
|
7428 | msgid "output the current or given revision of the project manifest" | |
7417 | msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet" |
|
7429 | msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet" | |
@@ -7427,12 +7439,10 b' msgstr ""' | |||||
7427 |
|
7439 | |||
7428 | msgid "" |
|
7440 | msgid "" | |
7429 | " With -v, print file permissions, symlink and executable bits.\n" |
|
7441 | " With -v, print file permissions, symlink and executable bits.\n" | |
7430 |
" With --debug, print file revision hashes. |
|
7442 | " With --debug, print file revision hashes." | |
7431 | " " |
|
|||
7432 | msgstr "" |
|
7443 | msgstr "" | |
7433 | " Med -v visas filtillstånd, symlänkar och exekverbarhetsbitar.\n" |
|
7444 | " Med -v visas filtillstånd, symlänkar och exekverbarhetsbitar.\n" | |
7434 |
" Med --debug visas filrevisionhashar. |
|
7445 | " Med --debug visas filrevisionhashar." | |
7435 | " " |
|
|||
7436 |
|
7446 | |||
7437 | msgid "merge working directory with another revision" |
|
7447 | msgid "merge working directory with another revision" | |
7438 | msgstr "sammanfoga arbetskatalogen med en annan revision" |
|
7448 | msgstr "sammanfoga arbetskatalogen med en annan revision" | |
@@ -7459,28 +7469,34 b' msgid ""' | |||||
7459 | " If no revision is specified, the working directory's parent is a\n" |
|
7469 | " If no revision is specified, the working directory's parent is a\n" | |
7460 | " head revision, and the current branch contains exactly one other\n" |
|
7470 | " head revision, and the current branch contains exactly one other\n" | |
7461 | " head, the other head is merged with by default. Otherwise, an\n" |
|
7471 | " head, the other head is merged with by default. Otherwise, an\n" | |
7462 |
" explicit revision with which to merge with must be provided. |
|
7472 | " explicit revision with which to merge with must be provided." | |
7463 | " " |
|
|||
7464 | msgstr "" |
|
7473 | msgstr "" | |
7465 | " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n" |
|
7474 | " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n" | |
7466 | " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n" |
|
7475 | " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n" | |
7467 | " det andra huvudet som standard. Om inte, måste en explicit revision\n" |
|
7476 | " det andra huvudet som standard. Om inte, måste en explicit revision\n" | |
7468 |
" anges. |
|
7477 | " anges." | |
7469 | " " |
|
7478 | ||
7470 |
|
7479 | msgid "" | ||
7471 | #, python-format |
|
7480 | " Returns 0 on success, 1 if there are unresolved files.\n" | |
7472 | msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" |
|
7481 | " " | |
7473 | msgstr "avbryter: grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n" |
|
7482 | msgstr "" | |
7474 |
|
7483 | " Returnerar 0 om kommandot lyckades, 1 om det finns olösta filer.\n" | ||
7475 | msgid "(run 'hg heads .' to see heads)\n" |
|
7484 | " " | |
7476 | msgstr "(kör 'hg heads .' för att se huvuden)\n" |
|
7485 | ||
7477 |
|
7486 | #, python-format | ||
7478 | #, python-format |
|
7487 | msgid "" | |
7479 |
|
|
7488 | "branch '%s' has %d heads - please merge with an explicit rev\n" | |
7480 | msgstr "avbryter: grenen '%s' har ett huvud - sammanfoga med en specifik rev\n" |
|
7489 | "(run 'hg heads .' to see heads)" | |
7481 |
|
7490 | msgstr "" | ||
7482 | msgid "(run 'hg heads' to see all heads)\n" |
|
7491 | "grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n" | |
7483 |
|
|
7492 | "(kör 'hg heads .' för att se huvuden)" | |
|
7493 | ||||
|
7494 | #, python-format | |||
|
7495 | msgid "" | |||
|
7496 | "branch '%s' has one head - please merge with an explicit rev\n" | |||
|
7497 | "(run 'hg heads' to see all heads)" | |||
|
7498 | msgstr "grenen '%s' har ett huvud - sammanfoga med en specifik rev\n" | |||
|
7499 | "(kör 'hg heads .' för att se alla huvuden)" | |||
7484 |
|
7500 | |||
7485 | msgid "there is nothing to merge" |
|
7501 | msgid "there is nothing to merge" | |
7486 | msgstr "det finns inget att sammanfoga" |
|
7502 | msgstr "det finns inget att sammanfoga" | |
@@ -7489,8 +7505,12 b' msgstr "det finns inget att sammanfoga"' | |||||
7489 | msgid "%s - use \"hg update\" instead" |
|
7505 | msgid "%s - use \"hg update\" instead" | |
7490 | msgstr "%s - använd \"hg update\" istället" |
|
7506 | msgstr "%s - använd \"hg update\" istället" | |
7491 |
|
7507 | |||
7492 | msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev" |
|
7508 | msgid "" | |
7493 | msgstr "arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller sammanfoga med en speficik rev" |
|
7509 | "working dir not at a head rev - use \"hg update\" or merge with an explicit " | |
|
7510 | "rev" | |||
|
7511 | msgstr "" | |||
|
7512 | "arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller " | |||
|
7513 | "sammanfoga med en speficik rev" | |||
7494 |
|
7514 | |||
7495 | msgid "show changesets not found in the destination" |
|
7515 | msgid "show changesets not found in the destination" | |
7496 | msgstr "visa ändringar som inte hittas i destinationen" |
|
7516 | msgstr "visa ändringar som inte hittas i destinationen" | |
@@ -7504,11 +7524,14 b' msgstr ""' | |||||
7504 | " eller den vanliga push-platsen. Detta är de ändringar som skulle\n" |
|
7524 | " eller den vanliga push-platsen. Detta är de ändringar som skulle\n" | |
7505 | " tryckas om push genomfördes." |
|
7525 | " tryckas om push genomfördes." | |
7506 |
|
7526 | |||
7507 | msgid "" |
|
7527 | msgid " See pull for details of valid destination formats." | |
7508 |
" S |
|
7528 | msgstr " Se pull för information om giltiga destinationsformat." | |
7509 | " " |
|
7529 | ||
7510 |
msg |
|
7530 | msgid "" | |
7511 | " Se pull för information om giltiga destinationsformat.\n" |
|
7531 | " Returns 0 if there are outgoing changes, 1 otherwise.\n" | |
|
7532 | " " | |||
|
7533 | msgstr "" | |||
|
7534 | " Returnerar 0 om det finns utgående ändringar, 1 annars.\n" | |||
7512 | " " |
|
7535 | " " | |
7513 |
|
7536 | |||
7514 | msgid "show the parents of the working directory or revision" |
|
7537 | msgid "show the parents of the working directory or revision" | |
@@ -7519,14 +7542,12 b' msgid ""' | |||||
7519 | " given via -r/--rev, the parent of that revision will be printed.\n" |
|
7542 | " given via -r/--rev, the parent of that revision will be printed.\n" | |
7520 | " If a file argument is given, the revision in which the file was\n" |
|
7543 | " If a file argument is given, the revision in which the file was\n" | |
7521 | " last changed (before the working directory revision or the\n" |
|
7544 | " last changed (before the working directory revision or the\n" | |
7522 |
" argument to --rev if given) is printed. |
|
7545 | " argument to --rev if given) is printed." | |
7523 | " " |
|
|||
7524 | msgstr "" |
|
7546 | msgstr "" | |
7525 | " Visa revisioner för arbetskatalogens föräldrar. Om en revision anges\n" |
|
7547 | " Visa revisioner för arbetskatalogens föräldrar. Om en revision anges\n" | |
7526 | " via -r/--rev, kommer den revisionens föräldrar att visas. Om en fil\n" |
|
7548 | " via -r/--rev, kommer den revisionens föräldrar att visas. Om en fil\n" | |
7527 | " anges, kommer revisionen då den filen sist ändrades (innan\n" |
|
7549 | " anges, kommer revisionen då den filen sist ändrades (innan\n" | |
7528 |
" arbetskatalogens revision eller innan --rev om angiven) att visas. |
|
7550 | " arbetskatalogens revision eller innan --rev om angiven) att visas." | |
7529 | " " |
|
|||
7530 |
|
7551 | |||
7531 | msgid "can only specify an explicit filename" |
|
7552 | msgid "can only specify an explicit filename" | |
7532 | msgstr "kan bara specificera ett explicit filnamn" |
|
7553 | msgstr "kan bara specificera ett explicit filnamn" | |
@@ -7546,27 +7567,31 b' msgstr ""' | |||||
7546 | " definitionen för alla tillgängliga namn." |
|
7567 | " definitionen för alla tillgängliga namn." | |
7547 |
|
7568 | |||
7548 | msgid "" |
|
7569 | msgid "" | |
7549 |
" Path names are defined in the [paths] section of |
|
7570 | " Path names are defined in the [paths] section of\n" | |
7550 | " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too." |
|
7571 | " ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n" | |
7551 | msgstr "" |
|
7572 | " repository, ``.hg/hgrc`` is used, too." | |
7552 | " Sökvägar definieras i sektionen [paths] i /etc/mercurial/hgrc och\n" |
|
7573 | msgstr "" | |
7553 | " $HOME/.hgrc. Om det körs i ett arkiv, så används .hg/hgrc också." |
|
7574 | " Sökvägar definieras i sektionen [paths] i ``/etc/mercurial/hgrc`` och\n" | |
7554 |
|
7575 | " ``$HOME/.hgrc``. Om det körs i ett arkiv, så används ``.hg/hgrc`` också." | ||
7555 | msgid "" |
|
7576 | ||
7556 | " The names 'default' and 'default-push' have a special meaning.\n" |
|
7577 | msgid "" | |
7557 | " They are the locations used when pulling and pushing respectively\n" |
|
7578 | " The path names ``default`` and ``default-push`` have a special\n" | |
7558 | " unless a location is specified. When cloning a repository, the\n" |
|
7579 | " meaning. When performing a push or pull operation, they are used\n" | |
7559 | " clone source is written as 'default' in .hg/hgrc." |
|
7580 | " as fallbacks if no location is specified on the command-line.\n" | |
7560 | msgstr "" |
|
7581 | " When ``default-push`` is set, it will be used for push and\n" | |
7561 | " Namnen 'default' och 'default-push' har en särskild innebörd. De är\n" |
|
7582 | " ``default`` will be used for pull; otherwise ``default`` is used\n" | |
7562 | " platserna som används vid push eller pull om ingen plats anges. När\n" |
|
7583 | " as the fallback for both. When cloning a repository, the clone\n" | |
7563 | " ett arkiv klonas, skrivs klonkällan som 'default' i .hg/hgrc." |
|
7584 | " source is written as ``default`` in ``.hg/hgrc``. Note that\n" | |
7564 |
|
7585 | " ``default`` and ``default-push`` apply to all inbound (e.g.\n" | ||
7565 | msgid "" |
|
7586 | " :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n" | |
7566 | " See 'hg help urls' for more information.\n" |
|
7587 | " :hg:`bundle`) operations." | |
7567 | " " |
|
7588 | msgstr "" | |
7568 | msgstr "" |
|
7589 | ||
7569 | " Se 'hg help urls' för mer information.\n" |
|
7590 | msgid "" | |
|
7591 | " See :hg:`help urls` for more information.\n" | |||
|
7592 | " " | |||
|
7593 | msgstr "" | |||
|
7594 | " Se :hg:`help urls` för mer information.\n" | |||
7570 | " " |
|
7595 | " " | |
7571 |
|
7596 | |||
7572 | msgid "not found!\n" |
|
7597 | msgid "not found!\n" | |
@@ -7576,7 +7601,8 b' msgid "not updating, since new heads add' | |||||
7576 | msgstr "uppdaterar inte, eftersom nya huvuden läggs till\n" |
|
7601 | msgstr "uppdaterar inte, eftersom nya huvuden läggs till\n" | |
7577 |
|
7602 | |||
7578 | msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" |
|
7603 | msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" | |
7579 | msgstr "(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n" |
|
7604 | msgstr "" | |
|
7605 | "(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n" | |||
7580 |
|
7606 | |||
7581 | msgid "(run 'hg update' to get a working copy)\n" |
|
7607 | msgid "(run 'hg update' to get a working copy)\n" | |
7582 | msgstr "(kör 'hg update' för att få en arbetskopia)\n" |
|
7608 | msgstr "(kör 'hg update' för att få en arbetskopia)\n" | |
@@ -7599,65 +7625,84 b' msgstr ""' | |||||
7599 | " arbetskatalogen." |
|
7625 | " arbetskatalogen." | |
7600 |
|
7626 | |||
7601 | msgid "" |
|
7627 | msgid "" | |
7602 |
" Use |
|
7628 | " Use :hg:`incoming` if you want to see what would have been added\n" | |
7603 |
" pull at the time you issued this command. If you then decide |
|
7629 | " by a pull at the time you issued this command. If you then decide\n" | |
7604 |
" ad |
|
7630 | " to add those changes to the repository, you should use :hg:`pull\n" | |
7605 |
" where X is the last changeset listed by |
|
7631 | " -r X` where ``X`` is the last changeset listed by :hg:`incoming`." | |
7606 | msgstr "" |
|
7632 | msgstr "" | |
7607 |
" Använd |
|
7633 | " Använd :hg:`incoming` om du vill se vad som skulle ha lagts till av en\n" | |
7608 | " dragning vid det tillfället du kör kommandot. Om du bestämmer dig för\n" |
|
7634 | " dragning vid det tillfället du kör kommandot. Om du bestämmer dig för\n" | |
7609 |
" att lägga till de ändringarna i arkivet, använd pull -r X där |
|
7635 | " att lägga till de ändringarna i arkivet, använd :hg:`pull -r X` där\n" | |
7610 |
" sista ändringen |
|
7636 | " ``X`` är den sista ändringen visad av :hg:`incoming`." | |
7611 |
|
7637 | |||
7612 | msgid "" |
|
7638 | msgid "" | |
7613 | " If SOURCE is omitted, the 'default' path will be used.\n" |
|
7639 | " If SOURCE is omitted, the 'default' path will be used.\n" | |
7614 |
" See |
|
7640 | " See :hg:`help urls` for more information." | |
7615 | " " |
|
|||
7616 | msgstr "" |
|
7641 | msgstr "" | |
7617 | " Om KÄLLA inte är angivet, används 'default'-sökvägen.\n" |
|
7642 | " Om KÄLLA inte är angivet, används 'default'-sökvägen.\n" | |
7618 |
" |
|
7643 | " Se :hg:`help urls` för mer information." | |
|
7644 | ||||
|
7645 | msgid "" | |||
|
7646 | " Returns 0 on success, 1 if an update had unresolved files.\n" | |||
|
7647 | " " | |||
|
7648 | msgstr "" | |||
|
7649 | " Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n" | |||
|
7650 | " filer.\n" | |||
7619 | " " |
|
7651 | " " | |
7620 |
|
7652 | |||
7621 | msgid "push changes to the specified destination" |
|
7653 | msgid "push changes to the specified destination" | |
7622 | msgstr "tryck ändringar till den specificerade destinationen" |
|
7654 | msgstr "tryck ändringar till den specificerade destinationen" | |
7623 |
|
7655 | |||
7624 | msgid " Push changes from the local repository to the specified destination." |
|
7656 | msgid "" | |
7625 | msgstr " Trycker ändringar från det lokala arkivet till angiven destination." |
|
7657 | " Push changesets from the local repository to the specified\n" | |
7626 |
|
7658 | " destination." | ||
7627 |
msg |
|
7659 | msgstr "" | |
7628 | " This is the symmetrical operation for pull. It moves changes from\n" |
|
7660 | " Trycker ändringar från det lokala arkivet till angiven destination." | |
7629 | " the current repository to a different one. If the destination is\n" |
|
7661 | ||
7630 | " local this is identical to a pull in that directory from the\n" |
|
7662 | msgid "" | |
7631 | " current one." |
|
7663 | " This operation is symmetrical to pull: it is identical to a pull\n" | |
7632 | msgstr "" |
|
7664 | " in the destination repository from the current one." | |
7633 | " Detta är en symmetriska operationen för pull. Den flyttar ändringar\n" |
|
7665 | msgstr "" | |
7634 | " från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n" |
|
7666 | ||
7635 | " är detta identiskt med en dragning i den katalogen från den nuvarande." |
|
7667 | msgid "" | |
7636 |
|
7668 | " By default, push will not allow creation of new heads at the\n" | ||
7637 | msgid "" |
|
7669 | " destination, since multiple heads would make it unclear which head\n" | |
7638 | " By default, push will refuse to run if it detects the result would\n" |
|
7670 | " to use. In this situation, it is recommended to pull and merge\n" | |
7639 | " increase the number of remote heads. This generally indicates the\n" |
|
7671 | " before pushing." | |
7640 | " user forgot to pull and merge before pushing." |
|
7672 | msgstr "" | |
7641 | msgstr "" |
|
7673 | ||
7642 | " Som standard vägrar push att utföra något om det upptäcks att antalet\n" |
|
7674 | msgid "" | |
7643 | " huvuden i destinationen ökar. Det brukar generellt sett indikera att\n" |
|
7675 | " Use --new-branch if you want to allow push to create a new named\n" | |
7644 | " användaren glömt att dra och sammanfoga innan tryckning." |
|
7676 | " branch that is not present at the destination. This allows you to\n" | |
7645 |
|
7677 | " only create a new branch without forcing other changes." | ||
7646 |
msg |
|
7678 | msgstr "" | |
7647 | " If -r/--rev is used, the named revision and all its ancestors will\n" |
|
7679 | ||
7648 | " be pushed to the remote repository." |
|
7680 | msgid "" | |
|
7681 | " Use -f/--force to override the default behavior and push all\n" | |||
|
7682 | " changesets on all branches." | |||
|
7683 | msgstr "" | |||
|
7684 | ||||
|
7685 | msgid "" | |||
|
7686 | " If -r/--rev is used, the specified revision and all its ancestors\n" | |||
|
7687 | " will be pushed to the remote repository." | |||
7649 | msgstr "" |
|
7688 | msgstr "" | |
7650 | " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n" |
|
7689 | " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n" | |
7651 | " tryckas till det andra arkivet." |
|
7690 | " tryckas till det andra arkivet." | |
7652 |
|
7691 | |||
7653 | msgid "" |
|
7692 | msgid "" | |
7654 |
" Please see |
|
7693 | " Please see :hg:`help urls` for important details about ``ssh://``\n" | |
7655 |
" URLs. If DESTINATION is omitted, a default path will be used. |
|
7694 | " URLs. If DESTINATION is omitted, a default path will be used." | |
7656 | " " |
|
7695 | msgstr "" | |
7657 | msgstr "" |
|
7696 | " Se :hg:`help urls` för viktiga detaljer om URL:er med ``ssh://``. Om\n" | |
7658 | " Se 'hg help urls' för viktiga detaljer om URL:er med ``ssh://``. Om\n" |
|
|||
7659 | " DESTINATION inte är angivet, används standardsökvägen." |
|
7697 | " DESTINATION inte är angivet, används standardsökvägen." | |
7660 |
|
7698 | |||
|
7699 | msgid "" | |||
|
7700 | " Returns 0 if push was successful, 1 if nothing to push.\n" | |||
|
7701 | " " | |||
|
7702 | msgstr "" | |||
|
7703 | " Returnerar 0 om tryckning lyckates, 1 om inget fanns att trycka.\n" | |||
|
7704 | " " | |||
|
7705 | ||||
7661 | #, python-format |
|
7706 | #, python-format | |
7662 | msgid "pushing to %s\n" |
|
7707 | msgid "pushing to %s\n" | |
7663 | msgstr "trycker till %s\n" |
|
7708 | msgstr "trycker till %s\n" | |
@@ -7671,13 +7716,17 b' msgstr " \xc3\x85terst\xc3\xa4ll fr\xc3\xa5n en avbruten commit eller pull."' | |||||
7671 | msgid "" |
|
7716 | msgid "" | |
7672 | " This command tries to fix the repository status after an\n" |
|
7717 | " This command tries to fix the repository status after an\n" | |
7673 | " interrupted operation. It should only be necessary when Mercurial\n" |
|
7718 | " interrupted operation. It should only be necessary when Mercurial\n" | |
7674 |
" suggests it. |
|
7719 | " suggests it." | |
7675 | " " |
|
|||
7676 | msgstr "" |
|
7720 | msgstr "" | |
7677 | " Kommandot försöker att fixa arkivstatusen efter en avbruten operation.\n" |
|
7721 | " Kommandot försöker att fixa arkivstatusen efter en avbruten operation.\n" | |
7678 | " Det bör bara användas när Mercurial föreslår det.\n" |
|
7722 | " Det bör bara användas när Mercurial föreslår det.\n" | |
7679 | " " |
|
7723 | " " | |
7680 |
|
7724 | |||
|
7725 | msgid "" | |||
|
7726 | " Returns 0 if successful, 1 if nothing to recover or verify fails.\n" | |||
|
7727 | " " | |||
|
7728 | msgstr "" | |||
|
7729 | ||||
7681 | msgid "remove the specified files on the next commit" |
|
7730 | msgid "remove the specified files on the next commit" | |
7682 | msgstr "ta bort de specificerade filerna vid nästa arkivering" |
|
7731 | msgstr "ta bort de specificerade filerna vid nästa arkivering" | |
7683 |
|
7732 | |||
@@ -7693,21 +7742,21 b' msgid ""' | |||||
7693 | msgstr "" |
|
7742 | msgstr "" | |
7694 | " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n" |
|
7743 | " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n" | |
7695 | " projektets historik. -A/--after kan användas för att bara ta bort filer\n" |
|
7744 | " projektets historik. -A/--after kan användas för att bara ta bort filer\n" | |
7696 |
" som redan raderats, -f/--force kan användas för att tvinga radering, |
|
7745 | " som redan raderats, -f/--force kan användas för att tvinga radering,\n" | |
7697 | " -Af kan ta bort filer från nästa revision utan att radera dem från\n" |
|
7746 | " och -Af kan ta bort filer från nästa revision utan att radera dem från\n" | |
7698 | " arbetskopian." |
|
7747 | " arbetskopian." | |
7699 |
|
7748 | |||
7700 | msgid "" |
|
7749 | msgid "" | |
7701 | " The following table details the behavior of remove for different\n" |
|
7750 | " The following table details the behavior of remove for different\n" | |
7702 | " file states (columns) and option combinations (rows). The file\n" |
|
7751 | " file states (columns) and option combinations (rows). The file\n" | |
7703 | " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" |
|
7752 | " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" | |
7704 |
" reported by |
|
7753 | " reported by :hg:`status`). The actions are Warn, Remove (from\n" | |
7705 | " and Delete (from disk)::" |
|
7754 | " branch) and Delete (from disk)::" | |
7706 | msgstr "" |
|
7755 | msgstr "" | |
7707 | " Följande tabell visar hur remove uppför sig för olika filstatus\n" |
|
7756 | " Följande tabell visar hur remove uppför sig för olika filstatus\n" | |
7708 | " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n" |
|
7757 | " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n" | |
7709 |
" Modifierad [M] och Saknad [!] (som rapporteras av |
|
7758 | " Modifierad [M] och Saknad [!] (som rapporteras av :hg:`status`).\n" | |
7710 | " är Varna, Radera (från gren) och Ta bort (från disk)::" |
|
7759 | " Aktionerna är Varna, Radera (från gren) och Ta bort (från disk)::" | |
7711 |
|
7760 | |||
7712 | msgid "" |
|
7761 | msgid "" | |
7713 | " A C M !\n" |
|
7762 | " A C M !\n" | |
@@ -7724,11 +7773,17 b' msgstr ""' | |||||
7724 |
|
7773 | |||
7725 | msgid "" |
|
7774 | msgid "" | |
7726 | " This command schedules the files to be removed at the next commit.\n" |
|
7775 | " This command schedules the files to be removed at the next commit.\n" | |
7727 |
" To undo a remove before that, see |
|
7776 | " To undo a remove before that, see :hg:`revert`." | |
7728 | " " |
|
|||
7729 | msgstr "" |
|
7777 | msgstr "" | |
7730 | " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n" |
|
7778 | " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n" | |
7731 |
" att ångra en remove innan dess, se |
|
7779 | " att ångra en remove innan dess, se :hg:`revert` .\n" | |
|
7780 | " " | |||
|
7781 | ||||
|
7782 | msgid "" | |||
|
7783 | " Returns 0 on success, 1 if any warnings encountered.\n" | |||
|
7784 | " " | |||
|
7785 | msgstr "" | |||
|
7786 | " Returnerar 0 om kommandot lyckades, 1 om varningar träffades på.\n" | |||
7732 | " " |
|
7787 | " " | |
7733 |
|
7788 | |||
7734 | #, python-format |
|
7789 | #, python-format | |
@@ -7762,11 +7817,10 b' msgstr ""' | |||||
7762 |
|
7817 | |||
7763 | msgid "" |
|
7818 | msgid "" | |
7764 | " This command takes effect at the next commit. To undo a rename\n" |
|
7819 | " This command takes effect at the next commit. To undo a rename\n" | |
7765 |
" before that, see |
|
7820 | " before that, see :hg:`revert`." | |
7766 | " " |
|
|||
7767 | msgstr "" |
|
7821 | msgstr "" | |
7768 | " Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" |
|
7822 | " Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" | |
7769 |
" namnbyte innan det, se |
|
7823 | " namnbyte innan det, se :hg:`revert`.\n" | |
7770 | " " |
|
7824 | " " | |
7771 |
|
7825 | |||
7772 | msgid "various operations to help finish a merge" |
|
7826 | msgid "various operations to help finish a merge" | |
@@ -7816,12 +7870,17 b' msgstr ""' | |||||
7816 | msgid "" |
|
7870 | msgid "" | |
7817 | " Note that Mercurial will not let you commit files with unresolved merge\n" |
|
7871 | " Note that Mercurial will not let you commit files with unresolved merge\n" | |
7818 | " conflicts. You must use ``hg resolve -m ...`` before you can commit\n" |
|
7872 | " conflicts. You must use ``hg resolve -m ...`` before you can commit\n" | |
7819 |
" after a conflicting merge. |
|
7873 | " after a conflicting merge." | |
7820 | " " |
|
|||
7821 | msgstr "" |
|
7874 | msgstr "" | |
7822 | " Notera att Mercurial inte låter dig arkivera filer med olösta\n" |
|
7875 | " Notera att Mercurial inte låter dig arkivera filer med olösta\n" | |
7823 | " konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n" |
|
7876 | " konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n" | |
7824 |
" innan du kan arkivera efter en sammanfogning med konflikter |
|
7877 | " innan du kan arkivera efter en sammanfogning med konflikter" | |
|
7878 | ||||
|
7879 | msgid "" | |||
|
7880 | " Returns 0 on success, 1 if any files fail a resolve attempt.\n" | |||
|
7881 | " " | |||
|
7882 | msgstr "" | |||
|
7883 | " Returnerar 0 om kommandot lyckates, 1 om någon fil inte kunde lösas.\n" | |||
7825 | " " |
|
7884 | " " | |
7826 |
|
7885 | |||
7827 | msgid "too many options specified" |
|
7886 | msgid "too many options specified" | |
@@ -7831,7 +7890,9 b' msgid "can\'t specify --all and patterns"' | |||||
7831 | msgstr "kan inte specificera --all och mönster" |
|
7890 | msgstr "kan inte specificera --all och mönster" | |
7832 |
|
7891 | |||
7833 | msgid "no files or directories specified; use --all to remerge all files" |
|
7892 | msgid "no files or directories specified; use --all to remerge all files" | |
7834 | msgstr "inga filer eller kataloger specificerade; använd --all för att återsammanfoga alla filer" |
|
7893 | msgstr "" | |
|
7894 | "inga filer eller kataloger specificerade; använd --all för att " | |||
|
7895 | "återsammanfoga alla filer" | |||
7835 |
|
7896 | |||
7836 | msgid "restore individual files or directories to an earlier state" |
|
7897 | msgid "restore individual files or directories to an earlier state" | |
7837 | msgstr "återställ filer eller kataloger till ett tidigare tillstånd" |
|
7898 | msgstr "återställ filer eller kataloger till ett tidigare tillstånd" | |
@@ -7860,12 +7921,12 b' msgstr ""' | |||||
7860 | msgid "" |
|
7921 | msgid "" | |
7861 | " Using the -r/--rev option, revert the given files or directories\n" |
|
7922 | " Using the -r/--rev option, revert the given files or directories\n" | |
7862 | " to their contents as of a specific revision. This can be helpful\n" |
|
7923 | " to their contents as of a specific revision. This can be helpful\n" | |
7863 |
" to \"roll back\" some or all of an earlier change. See |
|
7924 | " to \"roll back\" some or all of an earlier change. See :hg:`help\n" | |
7864 |
" dates |
|
7925 | " dates` for a list of formats valid for -d/--date." | |
7865 | msgstr "" |
|
7926 | msgstr "" | |
7866 | " Med flaggan -r/--rev, återställs de givna filerna eller katalogerna\n" |
|
7927 | " Med flaggan -r/--rev, återställs de givna filerna eller katalogerna\n" | |
7867 | " till innehållet i den specifika revisionen. Detta kan användas för\n" |
|
7928 | " till innehållet i den specifika revisionen. Detta kan användas för\n" | |
7868 |
" att ångra delar av eller hela tidigare ändringar. Se |
|
7929 | " att ångra delar av eller hela tidigare ändringar. Se :hg:`help dates`\n" | |
7869 | " för en lista med giltiga format för -d/--date." |
|
7930 | " för en lista med giltiga format för -d/--date." | |
7870 |
|
7931 | |||
7871 | msgid "" |
|
7932 | msgid "" | |
@@ -7896,18 +7957,18 b' msgstr ""' | |||||
7896 |
|
7957 | |||
7897 | msgid "" |
|
7958 | msgid "" | |
7898 | " Modified files are saved with a .orig suffix before reverting.\n" |
|
7959 | " Modified files are saved with a .orig suffix before reverting.\n" | |
7899 |
" To disable these backups, use --no-backup. |
|
7960 | " To disable these backups, use --no-backup." | |
7900 | " " |
|
|||
7901 | msgstr "" |
|
7961 | msgstr "" | |
7902 | " Modifierade filer sparas med suffixet .orig innan återställning.\n" |
|
7962 | " Modifierade filer sparas med suffixet .orig innan återställning.\n" | |
7903 |
" För att deaktivera dessa säkerhetskopior, använd --no-backup. |
|
7963 | " För att deaktivera dessa säkerhetskopior, använd --no-backup." | |
7904 | " " |
|
|||
7905 |
|
7964 | |||
7906 | msgid "you can't specify a revision and a date" |
|
7965 | msgid "you can't specify a revision and a date" | |
7907 | msgstr "du kan inte specificera en revision och ett datum" |
|
7966 | msgstr "du kan inte specificera en revision och ett datum" | |
7908 |
|
7967 | |||
7909 | msgid "no files or directories specified; use --all to revert the whole repo" |
|
7968 | msgid "no files or directories specified; use --all to revert the whole repo" | |
7910 | msgstr "inga filer eller kataloger angivna; använd --all för att återställa hela arkivet" |
|
7969 | msgstr "" | |
|
7970 | "inga filer eller kataloger angivna; använd --all för att återställa hela " | |||
|
7971 | "arkivet" | |||
7911 |
|
7972 | |||
7912 | #, python-format |
|
7973 | #, python-format | |
7913 | msgid "forgetting %s\n" |
|
7974 | msgid "forgetting %s\n" | |
@@ -7979,32 +8040,45 b' msgid ""' | |||||
7979 | " back locally is ineffective (someone else may already have pulled\n" |
|
8040 | " back locally is ineffective (someone else may already have pulled\n" | |
7980 | " the changes). Furthermore, a race is possible with readers of the\n" |
|
8041 | " the changes). Furthermore, a race is possible with readers of the\n" | |
7981 | " repository; for example an in-progress pull from the repository\n" |
|
8042 | " repository; for example an in-progress pull from the repository\n" | |
7982 |
" may fail if a rollback is performed. |
|
8043 | " may fail if a rollback is performed." | |
7983 | " " |
|
|||
7984 | msgstr "" |
|
8044 | msgstr "" | |
7985 | " Detta kommando är inte tänkt att användas i offentliga arkiv. När\n" |
|
8045 | " Detta kommando är inte tänkt att användas i offentliga arkiv. När\n" | |
7986 | " ändringar är tillgängliga att dras av andra användare, så är en\n" |
|
8046 | " ändringar är tillgängliga att dras av andra användare, så är en\n" | |
7987 | " lokal återgång ineffektivt (någon annan kan redan ha dragit\n" |
|
8047 | " lokal återgång ineffektivt (någon annan kan redan ha dragit\n" | |
7988 | " ändringarna). Dessutom finns möjligheten till timingproblem; som\n" |
|
8048 | " ändringarna). Dessutom finns möjligheten till timingproblem; som\n" | |
7989 | " ett exempel kan en pågående dragning misslyckas om en återgång\n" |
|
8049 | " ett exempel kan en pågående dragning misslyckas om en återgång\n" | |
7990 |
" utförs. |
|
8050 | " utförs." | |
|
8051 | ||||
|
8052 | msgid "" | |||
|
8053 | " Returns 0 on success, 1 if no rollback data is available.\n" | |||
|
8054 | " " | |||
|
8055 | msgstr "" | |||
|
8056 | " Returnerar 0 om kommandot lyckades, 1 om ingen återgångsdata finns.\n" | |||
7991 | " " |
|
8057 | " " | |
7992 |
|
8058 | |||
7993 | msgid "print the root (top) of the current working directory" |
|
8059 | msgid "print the root (top) of the current working directory" | |
7994 | msgstr "visa roten för den aktuella arbetskatalogen" |
|
8060 | msgstr "visa roten för den aktuella arbetskatalogen" | |
7995 |
|
8061 | |||
7996 | msgid "" |
|
8062 | msgid " Print the root directory of the current repository." | |
7997 | " Print the root directory of the current repository.\n" |
|
8063 | msgstr " Visa rotkatalogen för det aktuella arkivet." | |
7998 | " " |
|
|||
7999 | msgstr "" |
|
|||
8000 | " Visa rotkatalogen för det aktuella arkivet.\n" |
|
|||
8001 | " " |
|
|||
8002 |
|
8064 | |||
8003 | msgid "start stand-alone webserver" |
|
8065 | msgid "start stand-alone webserver" | |
8004 | msgstr "starta fristående webbserver" |
|
8066 | msgstr "starta fristående webbserver" | |
8005 |
|
8067 | |||
8006 | msgid " Start a local HTTP repository browser and pull server." |
|
8068 | msgid "" | |
8007 | msgstr " Startar en lokal HTTP-arkivbläddrare och pull-server." |
|
8069 | " Start a local HTTP repository browser and pull server. You can use\n" | |
|
8070 | " this for ad-hoc sharing and browing of repositories. It is\n" | |||
|
8071 | " recommended to use a real web server to serve a repository for\n" | |||
|
8072 | " longer periods of time." | |||
|
8073 | msgstr "" | |||
|
8074 | ||||
|
8075 | msgid "" | |||
|
8076 | " Please note that the server does not implement access control.\n" | |||
|
8077 | " This means that, by default, anybody can read from the server and\n" | |||
|
8078 | " nobody can write to it by default. Set the ``web.allow_push``\n" | |||
|
8079 | " option to ``*`` to allow everybody to push to the server. You\n" | |||
|
8080 | " should use a real web server if you need to authenticate users." | |||
|
8081 | msgstr "" | |||
8008 |
|
8082 | |||
8009 | msgid "" |
|
8083 | msgid "" | |
8010 | " By default, the server logs accesses to stdout and errors to\n" |
|
8084 | " By default, the server logs accesses to stdout and errors to\n" | |
@@ -8018,12 +8092,10 b' msgstr ""' | |||||
8018 | msgid "" |
|
8092 | msgid "" | |
8019 | " To have the server choose a free port number to listen on, specify\n" |
|
8093 | " To have the server choose a free port number to listen on, specify\n" | |
8020 | " a port number of 0; in this case, the server will print the port\n" |
|
8094 | " a port number of 0; in this case, the server will print the port\n" | |
8021 |
" number it uses. |
|
8095 | " number it uses." | |
8022 | " " |
|
|||
8023 | msgstr "" |
|
8096 | msgstr "" | |
8024 | " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" |
|
8097 | " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" | |
8025 |
" som portnummer; då visar servern det portnummer som används. |
|
8098 | " som portnummer; då visar servern det portnummer som används." | |
8026 | " " |
|
|||
8027 |
|
8099 | |||
8028 | #, python-format |
|
8100 | #, python-format | |
8029 | msgid "listening at http://%s%s/%s (bound to %s:%d)\n" |
|
8101 | msgid "listening at http://%s%s/%s (bound to %s:%d)\n" | |
@@ -8086,8 +8158,7 b' msgid ""' | |||||
8086 | " ! = missing (deleted by non-hg command, but still tracked)\n" |
|
8158 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
8087 | " ? = not tracked\n" |
|
8159 | " ? = not tracked\n" | |
8088 | " I = ignored\n" |
|
8160 | " I = ignored\n" | |
8089 |
" = origin of the previous file listed as A (added) |
|
8161 | " = origin of the previous file listed as A (added)" | |
8090 | " " |
|
|||
8091 | msgstr "" |
|
8162 | msgstr "" | |
8092 | " M = modifierad\n" |
|
8163 | " M = modifierad\n" | |
8093 | " A = adderad\n" |
|
8164 | " A = adderad\n" | |
@@ -8096,8 +8167,7 b' msgstr ""' | |||||
8096 | " ! = saknad (borttagen av icke-hg-kommando, men fortfarande spårad)\n" |
|
8167 | " ! = saknad (borttagen av icke-hg-kommando, men fortfarande spårad)\n" | |
8097 | " ? = inte spårad\n" |
|
8168 | " ? = inte spårad\n" | |
8098 | " I = ignorerad\n" |
|
8169 | " I = ignorerad\n" | |
8099 |
" = källa för den tidigare filen listad som A (adderad) |
|
8170 | " = källa för den tidigare filen listad som A (adderad)" | |
8100 | " " |
|
|||
8101 |
|
8171 | |||
8102 | msgid "summarize working directory state" |
|
8172 | msgid "summarize working directory state" | |
8103 | msgstr "sammanfatta arbetskatalogens tillstånd" |
|
8173 | msgstr "sammanfatta arbetskatalogens tillstånd" | |
@@ -8111,12 +8181,10 b' msgstr ""' | |||||
8111 |
|
8181 | |||
8112 | msgid "" |
|
8182 | msgid "" | |
8113 | " With the --remote option, this will check the default paths for\n" |
|
8183 | " With the --remote option, this will check the default paths for\n" | |
8114 |
" incoming and outgoing changes. This can be time-consuming. |
|
8184 | " incoming and outgoing changes. This can be time-consuming." | |
8115 | " " |
|
|||
8116 | msgstr "" |
|
8185 | msgstr "" | |
8117 | " Med flaggan --remote kommer också standardsökvägarna att sökas igenom\n" |
|
8186 | " Med flaggan --remote kommer också standardsökvägarna att sökas igenom\n" | |
8118 |
" för att hitta inkommande och utgående ändringar. Detta kan ta lång tid. |
|
8187 | " för att hitta inkommande och utgående ändringar. Detta kan ta lång tid." | |
8119 | " " |
|
|||
8120 |
|
8188 | |||
8121 | #, python-format |
|
8189 | #, python-format | |
8122 | msgid "parent: %d:%s " |
|
8190 | msgid "parent: %d:%s " | |
@@ -8145,6 +8213,14 b' msgid "%d removed"' | |||||
8145 | msgstr "%d borttagen" |
|
8213 | msgstr "%d borttagen" | |
8146 |
|
8214 | |||
8147 | #, python-format |
|
8215 | #, python-format | |
|
8216 | msgid "%d renamed" | |||
|
8217 | msgstr "%d omdöpta" | |||
|
8218 | ||||
|
8219 | #, python-format | |||
|
8220 | msgid "%d copied" | |||
|
8221 | msgstr "%d kopierade" | |||
|
8222 | ||||
|
8223 | #, python-format | |||
8148 | msgid "%d deleted" |
|
8224 | msgid "%d deleted" | |
8149 | msgstr "%d raderad" |
|
8225 | msgstr "%d raderad" | |
8150 |
|
8226 | |||
@@ -8160,12 +8236,19 b' msgstr "%d ignorerad"' | |||||
8160 | msgid "%d unresolved" |
|
8236 | msgid "%d unresolved" | |
8161 | msgstr "%d olöst" |
|
8237 | msgstr "%d olöst" | |
8162 |
|
8238 | |||
|
8239 | #, python-format | |||
|
8240 | msgid "%d subrepos" | |||
|
8241 | msgstr "" | |||
|
8242 | ||||
8163 | msgid " (merge)" |
|
8243 | msgid " (merge)" | |
8164 | msgstr " (sammanfogning)" |
|
8244 | msgstr " (sammanfogning)" | |
8165 |
|
8245 | |||
8166 | msgid " (new branch)" |
|
8246 | msgid " (new branch)" | |
8167 | msgstr " (ny gren)" |
|
8247 | msgstr " (ny gren)" | |
8168 |
|
8248 | |||
|
8249 | msgid " (head closed)" | |||
|
8250 | msgstr " (huvudet stängt)" | |||
|
8251 | ||||
8169 | msgid " (clean)" |
|
8252 | msgid " (clean)" | |
8170 | msgstr " (ren)" |
|
8253 | msgstr " (ren)" | |
8171 |
|
8254 | |||
@@ -8236,6 +8319,11 b' msgstr ""' | |||||
8236 | " samma sätt som andra projektfiler och kan ändras för hand vid behov.\n" |
|
8319 | " samma sätt som andra projektfiler och kan ändras för hand vid behov.\n" | |
8237 | " Filen '.hg/localtags' används för lokala märken (ej delad i arkiv)." |
|
8320 | " Filen '.hg/localtags' används för lokala märken (ej delad i arkiv)." | |
8238 |
|
8321 | |||
|
8322 | msgid "" | |||
|
8323 | " Since tag names have priority over branch names during revision\n" | |||
|
8324 | " lookup, using an existing branch name as a tag name is discouraged." | |||
|
8325 | msgstr "" | |||
|
8326 | ||||
8239 | msgid "tag names must be unique" |
|
8327 | msgid "tag names must be unique" | |
8240 | msgstr "märkesnamn måste vara unika" |
|
8328 | msgstr "märkesnamn måste vara unika" | |
8241 |
|
8329 | |||
@@ -8263,12 +8351,10 b' msgstr "lista arkivm\xc3\xa4rken"' | |||||
8263 |
|
8351 | |||
8264 | msgid "" |
|
8352 | msgid "" | |
8265 | " This lists both regular and local tags. When the -v/--verbose\n" |
|
8353 | " This lists both regular and local tags. When the -v/--verbose\n" | |
8266 |
" switch is used, a third column \"local\" is printed for local tags. |
|
8354 | " switch is used, a third column \"local\" is printed for local tags." | |
8267 | " " |
|
|||
8268 | msgstr "" |
|
8355 | msgstr "" | |
8269 | " Listar både vanliga och lokala märken. När flaggan -v/--verbose\n" |
|
8356 | " Listar både vanliga och lokala märken. När flaggan -v/--verbose\n" | |
8270 |
" används, visas en tredje kolumn med namnet \"local\" för lokala märken. |
|
8357 | " används, visas en tredje kolumn med namnet \"local\" för lokala märken." | |
8271 | " " |
|
|||
8272 |
|
8358 | |||
8273 | msgid "show the tip revision" |
|
8359 | msgid "show the tip revision" | |
8274 | msgstr "visa topprevisionen" |
|
8360 | msgstr "visa topprevisionen" | |
@@ -8285,25 +8371,29 b' msgid ""' | |||||
8285 | " If you have just made a commit, that commit will be the tip. If\n" |
|
8371 | " If you have just made a commit, that commit will be the tip. If\n" | |
8286 | " you have just pulled changes from another repository, the tip of\n" |
|
8372 | " you have just pulled changes from another repository, the tip of\n" | |
8287 | " that repository becomes the current tip. The \"tip\" tag is special\n" |
|
8373 | " that repository becomes the current tip. The \"tip\" tag is special\n" | |
8288 |
" and cannot be renamed or assigned to a different changeset. |
|
8374 | " and cannot be renamed or assigned to a different changeset." | |
8289 | " " |
|
|||
8290 | msgstr "" |
|
8375 | msgstr "" | |
8291 | " Om du precis har gjort en arkivering, kommer den att vara toppen. Om\n" |
|
8376 | " Om du precis har gjort en arkivering, kommer den att vara toppen. Om\n" | |
8292 | " du har dragit ändringar från ett annat arkiv, så blir toppen för det\n" |
|
8377 | " du har dragit ändringar från ett annat arkiv, så blir toppen för det\n" | |
8293 | " arkivet den aktuella toppen. Märket \"tip\" är speciellt och kan inte\n" |
|
8378 | " arkivet den aktuella toppen. Märket \"tip\" är speciellt och kan inte\n" | |
8294 |
" döpas om eller tilldelas en annan ändring. |
|
8379 | " döpas om eller tilldelas en annan ändring." | |
8295 | " " |
|
|||
8296 |
|
8380 | |||
8297 | msgid "apply one or more changegroup files" |
|
8381 | msgid "apply one or more changegroup files" | |
8298 | msgstr "applicera en eller flera filer med ändringar" |
|
8382 | msgstr "applicera en eller flera filer med ändringar" | |
8299 |
|
8383 | |||
8300 | msgid "" |
|
8384 | msgid "" | |
8301 | " Apply one or more compressed changegroup files generated by the\n" |
|
8385 | " Apply one or more compressed changegroup files generated by the\n" | |
8302 |
" bundle command. |
|
8386 | " bundle command." | |
8303 | " " |
|
|||
8304 | msgstr "" |
|
8387 | msgstr "" | |
8305 | " Applicera en eller flera komprimerade filer med ändringar genererade\n" |
|
8388 | " Applicera en eller flera komprimerade filer med ändringar genererade\n" | |
8306 |
" av bundle-kommandot. |
|
8389 | " av bundle-kommandot." | |
|
8390 | ||||
|
8391 | msgid "" | |||
|
8392 | " Returns 0 on success, 1 if an update has unresolved files.\n" | |||
|
8393 | " " | |||
|
8394 | msgstr "" | |||
|
8395 | " Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n" | |||
|
8396 | " filer.\n" | |||
8307 | " " |
|
8397 | " " | |
8308 |
|
8398 | |||
8309 | msgid "update working directory (or switch revisions)" |
|
8399 | msgid "update working directory (or switch revisions)" | |
@@ -8363,16 +8453,18 b' msgstr ""' | |||||
8363 | " arbetskatalogen uppdateras till den begärda ändringen." |
|
8453 | " arbetskatalogen uppdateras till den begärda ändringen." | |
8364 |
|
8454 | |||
8365 | msgid "" |
|
8455 | msgid "" | |
8366 |
" Use null as the changeset to remove the working directory (like |
|
8456 | " Use null as the changeset to remove the working directory (like\n" | |
8367 |
" clone -U |
|
8457 | " :hg:`clone -U`)." | |
8368 | msgstr "" |
|
8458 | msgstr "" | |
8369 |
" Använd null som ändring för att radera arbetskatalogen (som |
|
8459 | " Använd null som ändring för att radera arbetskatalogen (som :hg:`clone\n" | |
8370 |
" -U |
|
8460 | " -U`)." | |
8371 |
|
8461 | |||
8372 | msgid " If you want to update just one file to an older changeset, use 'hg revert'." |
|
8462 | msgid "" | |
8373 | msgstr "" |
|
8463 | " If you want to update just one file to an older changeset, use :hg:" | |
8374 | " Om du vill uppdatera bara en fil till en äldre ändring, använd 'hg\n" |
|
8464 | "`revert`." | |
8375 | " revert'." |
|
8465 | msgstr "" | |
|
8466 | " Om du vill uppdatera bara en fil till en äldre ändring, använd :hg:" | |||
|
8467 | "`revert`." | |||
8376 |
|
8468 | |||
8377 | msgid "cannot specify both -c/--check and -C/--clean" |
|
8469 | msgid "cannot specify both -c/--check and -C/--clean" | |
8378 | msgstr "" |
|
8470 | msgstr "" | |
@@ -8390,13 +8482,11 b' msgid ""' | |||||
8390 | " This will perform an extensive check of the repository's\n" |
|
8482 | " This will perform an extensive check of the repository's\n" | |
8391 | " integrity, validating the hashes and checksums of each entry in\n" |
|
8483 | " integrity, validating the hashes and checksums of each entry in\n" | |
8392 | " the changelog, manifest, and tracked files, as well as the\n" |
|
8484 | " the changelog, manifest, and tracked files, as well as the\n" | |
8393 |
" integrity of their crosslinks and indices. |
|
8485 | " integrity of their crosslinks and indices." | |
8394 | " " |
|
|||
8395 | msgstr "" |
|
8486 | msgstr "" | |
8396 | " Detta genomför en omfattande kontroll av arkivets integritet, validerar\n" |
|
8487 | " Detta genomför en omfattande kontroll av arkivets integritet, validerar\n" | |
8397 | " hash- och checksummor för varje notering i ändringsloggen, manifestet,\n" |
|
8488 | " hash- och checksummor för varje notering i ändringsloggen, manifestet,\n" | |
8398 |
" och spårade filer, såväl som integriteten av korslänkar och indexar. |
|
8489 | " och spårade filer, såväl som integriteten av korslänkar och indexar." | |
8399 | " " |
|
|||
8400 |
|
8490 | |||
8401 | msgid "output version and copyright information" |
|
8491 | msgid "output version and copyright information" | |
8402 | msgstr "visa version och copyright-information" |
|
8492 | msgstr "visa version och copyright-information" | |
@@ -8419,6 +8509,9 b' msgstr ""' | |||||
8419 | msgid "repository root directory or name of overlay bundle file" |
|
8509 | msgid "repository root directory or name of overlay bundle file" | |
8420 | msgstr "arkivrotkatalog eller namn på påläggsbuntfil" |
|
8510 | msgstr "arkivrotkatalog eller namn på påläggsbuntfil" | |
8421 |
|
8511 | |||
|
8512 | msgid "DIR" | |||
|
8513 | msgstr "" | |||
|
8514 | ||||
8422 | msgid "change working directory" |
|
8515 | msgid "change working directory" | |
8423 | msgstr "ändra arbetskatalog" |
|
8516 | msgstr "ändra arbetskatalog" | |
8424 |
|
8517 | |||
@@ -8434,6 +8527,9 b' msgstr "aktivera ytterligare utmatning"' | |||||
8434 | msgid "set/override config option (use 'section.name=value')" |
|
8527 | msgid "set/override config option (use 'section.name=value')" | |
8435 | msgstr "sätt/upphäv konfigurationsflagga (använd 'sektion.namn=värde')" |
|
8528 | msgstr "sätt/upphäv konfigurationsflagga (använd 'sektion.namn=värde')" | |
8436 |
|
8529 | |||
|
8530 | msgid "CONFIG" | |||
|
8531 | msgstr "" | |||
|
8532 | ||||
8437 | msgid "enable debugging output" |
|
8533 | msgid "enable debugging output" | |
8438 | msgstr "aktivera debugutmatning" |
|
8534 | msgstr "aktivera debugutmatning" | |
8439 |
|
8535 | |||
@@ -8443,6 +8539,12 b' msgstr "starta debugger"' | |||||
8443 | msgid "set the charset encoding" |
|
8539 | msgid "set the charset encoding" | |
8444 | msgstr "sätt teckenkodning" |
|
8540 | msgstr "sätt teckenkodning" | |
8445 |
|
8541 | |||
|
8542 | msgid "ENCODE" | |||
|
8543 | msgstr "" | |||
|
8544 | ||||
|
8545 | msgid "MODE" | |||
|
8546 | msgstr "" | |||
|
8547 | ||||
8446 | msgid "set the charset encoding mode" |
|
8548 | msgid "set the charset encoding mode" | |
8447 | msgstr "sätt teckenkodningsläge" |
|
8549 | msgstr "sätt teckenkodningsläge" | |
8448 |
|
8550 | |||
@@ -8470,17 +8572,20 b' msgstr "specificera ssh-kommando att anv\xc3\xa4nda"' | |||||
8470 | msgid "specify hg command to run on the remote side" |
|
8572 | msgid "specify hg command to run on the remote side" | |
8471 | msgstr "specificera hg-kommando att köra på andra sidan" |
|
8573 | msgstr "specificera hg-kommando att köra på andra sidan" | |
8472 |
|
8574 | |||
|
8575 | msgid "PATTERN" | |||
|
8576 | msgstr "" | |||
|
8577 | ||||
8473 | msgid "include names matching the given patterns" |
|
8578 | msgid "include names matching the given patterns" | |
8474 | msgstr "inkludera namn som matchar de givna mönstren" |
|
8579 | msgstr "inkludera namn som matchar de givna mönstren" | |
8475 |
|
8580 | |||
8476 | msgid "exclude names matching the given patterns" |
|
8581 | msgid "exclude names matching the given patterns" | |
8477 | msgstr "exkludera namn som matchar de givna mönstren" |
|
8582 | msgstr "exkludera namn som matchar de givna mönstren" | |
8478 |
|
8583 | |||
8479 |
msgid "use |
|
8584 | msgid "use text as commit message" | |
8480 |
msgstr "använd |
|
8585 | msgstr "använd text som arkiveringsmeddelande" | |
8481 |
|
8586 | |||
8482 |
msgid "read commit message from |
|
8587 | msgid "read commit message from file" | |
8483 |
msgstr "läs arkiveringsmeddelandet från |
|
8588 | msgstr "läs arkiveringsmeddelandet från fil" | |
8484 |
|
8589 | |||
8485 | msgid "record datecode as commit date" |
|
8590 | msgid "record datecode as commit date" | |
8486 | msgstr "lagra datumkod som arkiveringsdatum" |
|
8591 | msgstr "lagra datumkod som arkiveringsdatum" | |
@@ -8488,6 +8593,9 b' msgstr "lagra datumkod som arkiveringsda' | |||||
8488 | msgid "record the specified user as committer" |
|
8593 | msgid "record the specified user as committer" | |
8489 | msgstr "lagra den specificerade användaren som arkiverare" |
|
8594 | msgstr "lagra den specificerade användaren som arkiverare" | |
8490 |
|
8595 | |||
|
8596 | msgid "STYLE" | |||
|
8597 | msgstr "STIL" | |||
|
8598 | ||||
8491 | msgid "display using template map file" |
|
8599 | msgid "display using template map file" | |
8492 | msgstr "visa med mallfil" |
|
8600 | msgstr "visa med mallfil" | |
8493 |
|
8601 | |||
@@ -8497,6 +8605,9 b' msgstr "visa med mall"' | |||||
8497 | msgid "do not show merges" |
|
8605 | msgid "do not show merges" | |
8498 | msgstr "visa inte sammanfogningar" |
|
8606 | msgstr "visa inte sammanfogningar" | |
8499 |
|
8607 | |||
|
8608 | msgid "output diffstat-style summary of changes" | |||
|
8609 | msgstr "visa sammanfattning av ändringar i diffstat-stil" | |||
|
8610 | ||||
8500 | msgid "treat all files as text" |
|
8611 | msgid "treat all files as text" | |
8501 | msgstr "behandla alla filer som text" |
|
8612 | msgstr "behandla alla filer som text" | |
8502 |
|
8613 | |||
@@ -8521,8 +8632,8 b' msgstr "ignorera \xc3\xa4ndringar vars rader \xc3\xa4r tomma"' | |||||
8521 | msgid "number of lines of context to show" |
|
8632 | msgid "number of lines of context to show" | |
8522 | msgstr "antal sammanhangsrader att visa" |
|
8633 | msgstr "antal sammanhangsrader att visa" | |
8523 |
|
8634 | |||
8524 | msgid "output diffstat-style summary of changes" |
|
8635 | msgid "SIMILARITY" | |
8525 | msgstr "visa sammanfattning av ändringar i diffstat-stil" |
|
8636 | msgstr "" | |
8526 |
|
8637 | |||
8527 | msgid "guess renamed files by similarity (0<=s<=100)" |
|
8638 | msgid "guess renamed files by similarity (0<=s<=100)" | |
8528 | msgstr "gissa omdöpta filer efter likhet (0<=s<=100)" |
|
8639 | msgstr "gissa omdöpta filer efter likhet (0<=s<=100)" | |
@@ -8563,6 +8674,9 b' msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n' | |||||
8563 | msgid "do not pass files through decoders" |
|
8674 | msgid "do not pass files through decoders" | |
8564 | msgstr "passera inte filer genom dekoders" |
|
8675 | msgstr "passera inte filer genom dekoders" | |
8565 |
|
8676 | |||
|
8677 | msgid "PREFIX" | |||
|
8678 | msgstr "" | |||
|
8679 | ||||
8566 | msgid "directory prefix for files in archive" |
|
8680 | msgid "directory prefix for files in archive" | |
8567 | msgstr "katalogprefix för filer i arkiv" |
|
8681 | msgstr "katalogprefix för filer i arkiv" | |
8568 |
|
8682 | |||
@@ -8692,6 +8806,21 b' msgstr "[FLAGGA]... [K\xc3\x84LLA]... DEST"' | |||||
8692 | msgid "[INDEX] REV1 REV2" |
|
8806 | msgid "[INDEX] REV1 REV2" | |
8693 | msgstr "[INDEX] REV1 REV2" |
|
8807 | msgstr "[INDEX] REV1 REV2" | |
8694 |
|
8808 | |||
|
8809 | msgid "add single file mergeable changes" | |||
|
8810 | msgstr "" | |||
|
8811 | ||||
|
8812 | msgid "add single file all revs append to" | |||
|
8813 | msgstr "" | |||
|
8814 | ||||
|
8815 | msgid "add single file all revs overwrite" | |||
|
8816 | msgstr "" | |||
|
8817 | ||||
|
8818 | msgid "add new file at each rev" | |||
|
8819 | msgstr "" | |||
|
8820 | ||||
|
8821 | msgid "[OPTION]... TEXT" | |||
|
8822 | msgstr "[FLAGGA]... TEXT" | |||
|
8823 | ||||
8695 | msgid "[COMMAND]" |
|
8824 | msgid "[COMMAND]" | |
8696 | msgstr "[KOMMANDO]" |
|
8825 | msgstr "[KOMMANDO]" | |
8697 |
|
8826 | |||
@@ -8701,6 +8830,21 b' msgstr "visa kommandoflaggor"' | |||||
8701 | msgid "[-o] CMD" |
|
8830 | msgid "[-o] CMD" | |
8702 | msgstr "[-o] KMD" |
|
8831 | msgstr "[-o] KMD" | |
8703 |
|
8832 | |||
|
8833 | msgid "use tags as labels" | |||
|
8834 | msgstr "" | |||
|
8835 | ||||
|
8836 | msgid "annotate with branch names" | |||
|
8837 | msgstr "" | |||
|
8838 | ||||
|
8839 | msgid "use dots for runs" | |||
|
8840 | msgstr "" | |||
|
8841 | ||||
|
8842 | msgid "separate elements by spaces" | |||
|
8843 | msgstr "" | |||
|
8844 | ||||
|
8845 | msgid "[OPTION]... [FILE [REV]...]" | |||
|
8846 | msgstr "[FLAGGA]... [FIL] [REV]...]" | |||
|
8847 | ||||
8704 | msgid "try extended date formats" |
|
8848 | msgid "try extended date formats" | |
8705 | msgstr "pröva utökade datumformat" |
|
8849 | msgstr "pröva utökade datumformat" | |
8706 |
|
8850 | |||
@@ -8713,8 +8857,8 b' msgstr "FIL REV"' | |||||
8713 | msgid "[PATH]" |
|
8857 | msgid "[PATH]" | |
8714 | msgstr "[SÖKVÄG]" |
|
8858 | msgstr "[SÖKVÄG]" | |
8715 |
|
8859 | |||
8716 | msgid "FILE" |
|
8860 | msgid "REPO NAMESPACE [KEY OLD NEW]" | |
8717 |
msgstr " |
|
8861 | msgstr "" | |
8718 |
|
8862 | |||
8719 | msgid "revision to rebuild to" |
|
8863 | msgid "revision to rebuild to" | |
8720 | msgstr "revision att bygga om till" |
|
8864 | msgstr "revision att bygga om till" | |
@@ -8759,7 +8903,8 b' msgid "print all revisions that match"' | |||||
8759 | msgstr "visa alla revisioner som matchar" |
|
8903 | msgstr "visa alla revisioner som matchar" | |
8760 |
|
8904 | |||
8761 | msgid "follow changeset history, or file history across copies and renames" |
|
8905 | msgid "follow changeset history, or file history across copies and renames" | |
8762 | msgstr "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" |
|
8906 | msgstr "" | |
|
8907 | "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" | |||
8763 |
|
8908 | |||
8764 | msgid "ignore case when matching" |
|
8909 | msgid "ignore case when matching" | |
8765 | msgstr "ignorera versaler/gemener vid matchning" |
|
8910 | msgstr "ignorera versaler/gemener vid matchning" | |
@@ -8770,8 +8915,8 b' msgstr "visa bara filnamn och revisioner' | |||||
8770 | msgid "print matching line numbers" |
|
8915 | msgid "print matching line numbers" | |
8771 | msgstr "visa matchande radnummer" |
|
8916 | msgstr "visa matchande radnummer" | |
8772 |
|
8917 | |||
8773 |
msgid "search |
|
8918 | msgid "only search files changed within revision range" | |
8774 | msgstr "sök i ett givet revisionsområde" |
|
8919 | msgstr "sök filer enbart inom ett givet revisionsområde" | |
8775 |
|
8920 | |||
8776 | msgid "[OPTION]... PATTERN [FILE]..." |
|
8921 | msgid "[OPTION]... PATTERN [FILE]..." | |
8777 | msgstr "[FLAGGA]... MÖNSTER [FIL]..." |
|
8922 | msgstr "[FLAGGA]... MÖNSTER [FIL]..." | |
@@ -8788,8 +8933,8 b' msgstr "visa bara aktiva grenhuvuden [F\xc3\x96RLEGAD]"' | |||||
8788 | msgid "show normal and closed branch heads" |
|
8933 | msgid "show normal and closed branch heads" | |
8789 | msgstr "visa normala och stängda grenhuvuden" |
|
8934 | msgstr "visa normala och stängda grenhuvuden" | |
8790 |
|
8935 | |||
8791 |
msgid "[-ac] [-r |
|
8936 | msgid "[-ac] [-r REV] [REV]..." | |
8792 |
msgstr "[-ac] [-r |
|
8937 | msgstr "[-ac] [-r REV] [REV]..." | |
8793 |
|
8938 | |||
8794 | msgid "[TOPIC]" |
|
8939 | msgid "[TOPIC]" | |
8795 | msgstr "[ÄMNE]" |
|
8940 | msgstr "[ÄMNE]" | |
@@ -8812,8 +8957,13 b' msgstr "visa m\xc3\xa4rken"' | |||||
8812 | msgid "[-nibt] [-r REV] [SOURCE]" |
|
8957 | msgid "[-nibt] [-r REV] [SOURCE]" | |
8813 | msgstr "[-nibt] [-r REV] [KÄLLA]" |
|
8958 | msgstr "[-nibt] [-r REV] [KÄLLA]" | |
8814 |
|
8959 | |||
8815 | msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" |
|
8960 | msgid "" | |
8816 | msgstr "" |
|
8961 | "directory strip option for patch. This has the same meaning as the " | |
|
8962 | "corresponding patch option" | |||
|
8963 | msgstr "" | |||
|
8964 | ||||
|
8965 | msgid "PATH" | |||
|
8966 | msgstr "SÖKVÄG" | |||
8817 |
|
8967 | |||
8818 | msgid "base path" |
|
8968 | msgid "base path" | |
8819 | msgstr "grundsökväg" |
|
8969 | msgstr "grundsökväg" | |
@@ -8875,8 +9025,8 b' msgstr "visa revisioner som matchar datu' | |||||
8875 | msgid "show copied files" |
|
9025 | msgid "show copied files" | |
8876 | msgstr "visa kopierade filer" |
|
9026 | msgstr "visa kopierade filer" | |
8877 |
|
9027 | |||
8878 |
msgid "do case-insensitive search for a |
|
9028 | msgid "do case-insensitive search for a given text" | |
8879 |
msgstr "gör versalokänslig sökning efter |
|
9029 | msgstr "gör versalokänslig sökning efter en given text" | |
8880 |
|
9030 | |||
8881 | msgid "include revisions where files were removed" |
|
9031 | msgid "include revisions where files were removed" | |
8882 | msgstr "inkludera revisioner där filer togs bort" |
|
9032 | msgstr "inkludera revisioner där filer togs bort" | |
@@ -8887,8 +9037,11 b' msgstr "visa bara sammanfogningar"' | |||||
8887 | msgid "revisions committed by user" |
|
9037 | msgid "revisions committed by user" | |
8888 | msgstr "revisioner arkiverade av användare" |
|
9038 | msgstr "revisioner arkiverade av användare" | |
8889 |
|
9039 | |||
8890 | msgid "show only changesets within the given named branch" |
|
9040 | msgid "show only changesets within the given named branch (DEPRECATED)" | |
8891 |
msgstr "visa bara ändringar i den namngiv |
|
9041 | msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)" | |
|
9042 | ||||
|
9043 | msgid "show changesets within the given named branch" | |||
|
9044 | msgstr "visa ändringar i den namngivna grenen" | |||
8892 |
|
9045 | |||
8893 | msgid "do not display revision or any of its ancestors" |
|
9046 | msgid "do not display revision or any of its ancestors" | |
8894 | msgstr "visa inte revision eller någon av dess föräldrar" |
|
9047 | msgstr "visa inte revision eller någon av dess föräldrar" | |
@@ -8944,6 +9097,9 b' msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [K\xc3\x84LLA]"' | |||||
8944 | msgid "force push" |
|
9097 | msgid "force push" | |
8945 | msgstr "tvinga tryckning" |
|
9098 | msgstr "tvinga tryckning" | |
8946 |
|
9099 | |||
|
9100 | msgid "allow pushing a new branch" | |||
|
9101 | msgstr "" | |||
|
9102 | ||||
8947 | msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" |
|
9103 | msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" | |
8948 | msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]" |
|
9104 | msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]" | |
8949 |
|
9105 | |||
@@ -8995,9 +9151,15 b' msgstr "namn p\xc3\xa5 \xc3\xa5tkomstlogg att skriva till"' | |||||
8995 | msgid "name of error log file to write to" |
|
9151 | msgid "name of error log file to write to" | |
8996 | msgstr "namn på fellogg att skriva till" |
|
9152 | msgstr "namn på fellogg att skriva till" | |
8997 |
|
9153 | |||
|
9154 | msgid "PORT" | |||
|
9155 | msgstr "PORT" | |||
|
9156 | ||||
8998 | msgid "port to listen on (default: 8000)" |
|
9157 | msgid "port to listen on (default: 8000)" | |
8999 | msgstr "port att lyssna på (standard: 8000)" |
|
9158 | msgstr "port att lyssna på (standard: 8000)" | |
9000 |
|
9159 | |||
|
9160 | msgid "ADDR" | |||
|
9161 | msgstr "" | |||
|
9162 | ||||
9001 | msgid "address to listen on (default: all interfaces)" |
|
9163 | msgid "address to listen on (default: all interfaces)" | |
9002 | msgstr "adress att lyssna på (standard alla gränssnitt)" |
|
9164 | msgstr "adress att lyssna på (standard alla gränssnitt)" | |
9003 |
|
9165 | |||
@@ -9007,9 +9169,12 b' msgstr "s\xc3\xb6kv\xc3\xa4gsprefix att dela ut fr\xc3\xa5n (standard: serverrot)"' | |||||
9007 | msgid "name to show in web pages (default: working directory)" |
|
9169 | msgid "name to show in web pages (default: working directory)" | |
9008 | msgstr "namn att visa i webbsidor (standard: arbetskatalogen)" |
|
9170 | msgstr "namn att visa i webbsidor (standard: arbetskatalogen)" | |
9009 |
|
9171 | |||
9010 |
msgid "name of the web |
|
9172 | msgid "name of the hgweb config file (serve more than one repository)" | |
9011 | msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)" |
|
9173 | msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)" | |
9012 |
|
9174 | |||
|
9175 | msgid "name of the hgweb config file (DEPRECATED)" | |||
|
9176 | msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)" | |||
|
9177 | ||||
9013 | msgid "for remote clients" |
|
9178 | msgid "for remote clients" | |
9014 | msgstr "för fjärrklienter" |
|
9179 | msgstr "för fjärrklienter" | |
9015 |
|
9180 | |||
@@ -9079,6 +9244,9 b' msgstr "revision att m\xc3\xa4rka"' | |||||
9079 | msgid "remove a tag" |
|
9244 | msgid "remove a tag" | |
9080 | msgstr "ta bort ett märke" |
|
9245 | msgstr "ta bort ett märke" | |
9081 |
|
9246 | |||
|
9247 | msgid "use <text> as commit message" | |||
|
9248 | msgstr "använd <text> som arkiveringsmeddelande" | |||
|
9249 | ||||
9082 | msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." |
|
9250 | msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." | |
9083 | msgstr "[-f] [-l] [-m TEXT] [-d DATUM] [-u ANVÄNDARE] [-r REV] NAMN..." |
|
9251 | msgstr "[-f] [-l] [-m TEXT] [-d DATUM] [-u ANVÄNDARE] [-r REV] NAMN..." | |
9084 |
|
9252 | |||
@@ -9086,7 +9254,7 b' msgid "[-p] [-g]"' | |||||
9086 | msgstr "[-p] [-g]" |
|
9254 | msgstr "[-p] [-g]" | |
9087 |
|
9255 | |||
9088 | msgid "update to new branch head if changesets were unbundled" |
|
9256 | msgid "update to new branch head if changesets were unbundled" | |
9089 |
msgstr "uppdatera till nytt grenhuvud om ändringr |
|
9257 | msgstr "uppdatera till nytt grenhuvud om ändringar packades upp" | |
9090 |
|
9258 | |||
9091 | msgid "[-u] FILE..." |
|
9259 | msgid "[-u] FILE..." | |
9092 | msgstr "[-u] FIL..." |
|
9260 | msgstr "[-u] FIL..." | |
@@ -9101,11 +9269,7 b' msgid "[-c] [-C] [-d DATE] [[-r] REV]"' | |||||
9101 | msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" |
|
9269 | msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" | |
9102 |
|
9270 | |||
9103 | #, python-format |
|
9271 | #, python-format | |
9104 |
msgid "c |
|
9272 | msgid "cannot include %s (%s)" | |
9105 | msgstr "" |
|
|||
9106 |
|
||||
9107 | #, python-format |
|
|||
9108 | msgid "config error at %s:%d: '%s'" |
|
|||
9109 | msgstr "" |
|
9273 | msgstr "" | |
9110 |
|
9274 | |||
9111 | msgid "not found in manifest" |
|
9275 | msgid "not found in manifest" | |
@@ -9114,6 +9278,50 b' msgstr ""' | |||||
9114 | msgid "branch name not in UTF-8!" |
|
9278 | msgid "branch name not in UTF-8!" | |
9115 | msgstr "" |
|
9279 | msgstr "" | |
9116 |
|
9280 | |||
|
9281 | #, python-format | |||
|
9282 | msgid "%s does not exist!\n" | |||
|
9283 | msgstr "" | |||
|
9284 | ||||
|
9285 | #, python-format | |||
|
9286 | msgid "" | |||
|
9287 | "%s: up to %d MB of RAM may be required to manage this file\n" | |||
|
9288 | "(use 'hg revert %s' to cancel the pending addition)\n" | |||
|
9289 | msgstr "" | |||
|
9290 | "%s: upp till %d MB RAM kan behövas för att hantera denna fil\n" | |||
|
9291 | "(använd 'hg revert %s' för att ångra den väntande additionen)\n" | |||
|
9292 | ||||
|
9293 | #, python-format | |||
|
9294 | msgid "%s not added: only files and symlinks supported currently\n" | |||
|
9295 | msgstr "" | |||
|
9296 | ||||
|
9297 | #, python-format | |||
|
9298 | msgid "%s already tracked!\n" | |||
|
9299 | msgstr "" | |||
|
9300 | ||||
|
9301 | #, python-format | |||
|
9302 | msgid "%s not added!\n" | |||
|
9303 | msgstr "" | |||
|
9304 | ||||
|
9305 | #, python-format | |||
|
9306 | msgid "%s still exists!\n" | |||
|
9307 | msgstr "" | |||
|
9308 | ||||
|
9309 | #, python-format | |||
|
9310 | msgid "%s not tracked!\n" | |||
|
9311 | msgstr "" | |||
|
9312 | ||||
|
9313 | #, python-format | |||
|
9314 | msgid "%s not removed!\n" | |||
|
9315 | msgstr "" | |||
|
9316 | ||||
|
9317 | #, python-format | |||
|
9318 | msgid "copy failed: %s is not a file or a symbolic link\n" | |||
|
9319 | msgstr "" | |||
|
9320 | ||||
|
9321 | #, python-format | |||
|
9322 | msgid "invalid event type in dag: %s" | |||
|
9323 | msgstr "" | |||
|
9324 | ||||
9117 | msgid "working directory state appears damaged!" |
|
9325 | msgid "working directory state appears damaged!" | |
9118 | msgstr "" |
|
9326 | msgstr "" | |
9119 |
|
9327 | |||
@@ -9130,6 +9338,10 b' msgid "file %r in dirstate clashes with ' | |||||
9130 | msgstr "" |
|
9338 | msgstr "" | |
9131 |
|
9339 | |||
9132 | #, python-format |
|
9340 | #, python-format | |
|
9341 | msgid "setting %r to other parent only allowed in merges" | |||
|
9342 | msgstr "" | |||
|
9343 | ||||
|
9344 | #, python-format | |||
9133 | msgid "not in dirstate: %s\n" |
|
9345 | msgid "not in dirstate: %s\n" | |
9134 | msgstr "" |
|
9346 | msgstr "" | |
9135 |
|
9347 | |||
@@ -9155,12 +9367,57 b' msgstr ""' | |||||
9155 | msgid "unsupported file type (type is %s)" |
|
9367 | msgid "unsupported file type (type is %s)" | |
9156 | msgstr "" |
|
9368 | msgstr "" | |
9157 |
|
9369 | |||
|
9370 | msgid "searching for changes\n" | |||
|
9371 | msgstr "söker efter ändringar\n" | |||
|
9372 | ||||
|
9373 | msgid "queries" | |||
|
9374 | msgstr "frågor" | |||
|
9375 | ||||
|
9376 | msgid "searching" | |||
|
9377 | msgstr "" | |||
|
9378 | ||||
|
9379 | msgid "already have changeset " | |||
|
9380 | msgstr "har redan ändringen " | |||
|
9381 | ||||
|
9382 | msgid "warning: repository is unrelated\n" | |||
|
9383 | msgstr "varning: arkivet är obesälktat\n" | |||
|
9384 | ||||
|
9385 | msgid "repository is unrelated" | |||
|
9386 | msgstr "arkivet är obesläktat" | |||
|
9387 | ||||
|
9388 | #, python-format | |||
|
9389 | msgid "abort: push creates new remote heads on branch '%s'!\n" | |||
|
9390 | msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n" | |||
|
9391 | ||||
|
9392 | msgid "abort: push creates new remote heads!\n" | |||
|
9393 | msgstr "avbryter: push skapar nya fjärrhuvuden!\n" | |||
|
9394 | ||||
|
9395 | msgid "(you should pull and merge or use push -f to force)\n" | |||
|
9396 | msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n" | |||
|
9397 | ||||
|
9398 | msgid "(did you forget to merge? use push -f to force)\n" | |||
|
9399 | msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" | |||
|
9400 | ||||
|
9401 | #, python-format | |||
|
9402 | msgid "abort: push creates new remote branches: %s!\n" | |||
|
9403 | msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" | |||
|
9404 | ||||
|
9405 | msgid "(use 'hg push --new-branch' to create new remote branches)\n" | |||
|
9406 | msgstr "(använd 'hg push --new-branch' för att skapa nya fjärrgrenar)\n" | |||
|
9407 | ||||
|
9408 | msgid "note: unsynced remote changes!\n" | |||
|
9409 | msgstr "notera: osynkade fjärrändringar!\n" | |||
|
9410 | ||||
9158 | #, python-format |
|
9411 | #, python-format | |
9159 | msgid "abort: %s\n" |
|
9412 | msgid "abort: %s\n" | |
9160 | msgstr "avbryter: %s\n" |
|
9413 | msgstr "avbryter: %s\n" | |
9161 |
|
9414 | |||
9162 | #, python-format |
|
9415 | #, python-format | |
9163 | msgid "hg: %s\n" |
|
9416 | msgid "hg: parse error at %s: %s\n" | |
|
9417 | msgstr "" | |||
|
9418 | ||||
|
9419 | #, python-format | |||
|
9420 | msgid "hg: parse error: %s\n" | |||
9164 | msgstr "" |
|
9421 | msgstr "" | |
9165 |
|
9422 | |||
9166 | #, python-format |
|
9423 | #, python-format | |
@@ -9190,6 +9447,10 b' msgid "hg %s: %s\\n"' | |||||
9190 | msgstr "" |
|
9447 | msgstr "" | |
9191 |
|
9448 | |||
9192 | #, python-format |
|
9449 | #, python-format | |
|
9450 | msgid "hg: %s\n" | |||
|
9451 | msgstr "" | |||
|
9452 | ||||
|
9453 | #, python-format | |||
9193 | msgid "abort: %s!\n" |
|
9454 | msgid "abort: %s!\n" | |
9194 | msgstr "" |
|
9455 | msgstr "" | |
9195 |
|
9456 | |||
@@ -9207,10 +9468,6 b' msgstr ""' | |||||
9207 | msgid "hg: unknown command '%s'\n" |
|
9468 | msgid "hg: unknown command '%s'\n" | |
9208 | msgstr "" |
|
9469 | msgstr "" | |
9209 |
|
9470 | |||
9210 | #, python-format |
|
|||
9211 | msgid "abort: could not import module %s!\n" |
|
|||
9212 | msgstr "" |
|
|||
9213 |
|
||||
9214 | msgid "(did you forget to compile extensions?)\n" |
|
9471 | msgid "(did you forget to compile extensions?)\n" | |
9215 | msgstr "" |
|
9472 | msgstr "" | |
9216 |
|
9473 | |||
@@ -9245,6 +9502,10 b' msgid "** or mercurial@selenic.com\\n"' | |||||
9245 | msgstr "" |
|
9502 | msgstr "" | |
9246 |
|
9503 | |||
9247 | #, python-format |
|
9504 | #, python-format | |
|
9505 | msgid "** Python %s\n" | |||
|
9506 | msgstr "" | |||
|
9507 | ||||
|
9508 | #, python-format | |||
9248 | msgid "** Mercurial Distributed SCM (version %s)\n" |
|
9509 | msgid "** Mercurial Distributed SCM (version %s)\n" | |
9249 | msgstr "" |
|
9510 | msgstr "" | |
9250 |
|
9511 | |||
@@ -9278,7 +9539,9 b' msgstr ""' | |||||
9278 | msgid "Option --cwd may not be abbreviated!" |
|
9539 | msgid "Option --cwd may not be abbreviated!" | |
9279 | msgstr "" |
|
9540 | msgstr "" | |
9280 |
|
9541 | |||
9281 | msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!" |
|
9542 | msgid "" | |
|
9543 | "Option -R has to be separated from other options (e.g. not -qR) and --" | |||
|
9544 | "repository may only be abbreviated as --repo!" | |||
9282 | msgstr "" |
|
9545 | msgstr "" | |
9283 |
|
9546 | |||
9284 | #, python-format |
|
9547 | #, python-format | |
@@ -9296,7 +9559,9 b' msgstr ""' | |||||
9296 | msgid "unrecognized profiling format '%s' - Ignored\n" |
|
9559 | msgid "unrecognized profiling format '%s' - Ignored\n" | |
9297 | msgstr "" |
|
9560 | msgstr "" | |
9298 |
|
9561 | |||
9299 | msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" |
|
9562 | msgid "" | |
|
9563 | "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" | |||
|
9564 | "misc/lsprof/" | |||
9300 | msgstr "" |
|
9565 | msgstr "" | |
9301 |
|
9566 | |||
9302 | #, python-format |
|
9567 | #, python-format | |
@@ -9344,9 +9609,11 b' msgid "merging %s\\n"' | |||||
9344 | msgstr "" |
|
9609 | msgstr "" | |
9345 |
|
9610 | |||
9346 | #, python-format |
|
9611 | #, python-format | |
9347 | msgid "" |
|
9612 | msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" | |
9348 | " output file %s appears unchanged\n" |
|
9613 | msgstr "" | |
9349 | "was merge successful (yn)?" |
|
9614 | ||
|
9615 | #, python-format | |||
|
9616 | msgid "was merge of '%s' successful (yn)?" | |||
9350 | msgstr "" |
|
9617 | msgstr "" | |
9351 |
|
9618 | |||
9352 | msgid "&No" |
|
9619 | msgid "&No" | |
@@ -9356,6 +9623,12 b' msgid "&Yes"' | |||||
9356 | msgstr "" |
|
9623 | msgstr "" | |
9357 |
|
9624 | |||
9358 | #, python-format |
|
9625 | #, python-format | |
|
9626 | msgid "" | |||
|
9627 | " output file %s appears unchanged\n" | |||
|
9628 | "was merge successful (yn)?" | |||
|
9629 | msgstr "" | |||
|
9630 | ||||
|
9631 | #, python-format | |||
9359 | msgid "merging %s failed!\n" |
|
9632 | msgid "merging %s failed!\n" | |
9360 | msgstr "" |
|
9633 | msgstr "" | |
9361 |
|
9634 | |||
@@ -9388,6 +9661,9 b' msgstr "Ange En Revision"' | |||||
9388 | msgid "Specifying Multiple Revisions" |
|
9661 | msgid "Specifying Multiple Revisions" | |
9389 | msgstr "Ange Flera Revisioner" |
|
9662 | msgstr "Ange Flera Revisioner" | |
9390 |
|
9663 | |||
|
9664 | msgid "Specifying Revision Sets" | |||
|
9665 | msgstr "Ange Revisionsset" | |||
|
9666 | ||||
9391 | msgid "Diff Formats" |
|
9667 | msgid "Diff Formats" | |
9392 | msgstr "Diff-format" |
|
9668 | msgstr "Diff-format" | |
9393 |
|
9669 | |||
@@ -9400,6 +9676,12 b' msgstr "URL-s\xc3\xb6kv\xc3\xa4gar"' | |||||
9400 | msgid "Using additional features" |
|
9676 | msgid "Using additional features" | |
9401 | msgstr "Använda ytterligare funktioner" |
|
9677 | msgstr "Använda ytterligare funktioner" | |
9402 |
|
9678 | |||
|
9679 | msgid "Configuring hgweb" | |||
|
9680 | msgstr "" | |||
|
9681 | ||||
|
9682 | msgid "Glossary" | |||
|
9683 | msgstr "" | |||
|
9684 | ||||
9403 | msgid "" |
|
9685 | msgid "" | |
9404 | "Mercurial reads configuration data from several files, if they exist.\n" |
|
9686 | "Mercurial reads configuration data from several files, if they exist.\n" | |
9405 | "Below we list the most specific file first." |
|
9687 | "Below we list the most specific file first." | |
@@ -9413,21 +9695,27 b' msgstr "Under Windows l\xc3\xa4ses dessa konfigurationsfiler:"' | |||||
9413 | msgid "" |
|
9695 | msgid "" | |
9414 | "- ``<repo>\\.hg\\hgrc``\n" |
|
9696 | "- ``<repo>\\.hg\\hgrc``\n" | |
9415 | "- ``%USERPROFILE%\\.hgrc``\n" |
|
9697 | "- ``%USERPROFILE%\\.hgrc``\n" | |
9416 |
"- ``%USERPROFILE%\\ |
|
9698 | "- ``%USERPROFILE%\\mercurial.ini``\n" | |
9417 | "- ``%HOME%\\.hgrc``\n" |
|
9699 | "- ``%HOME%\\.hgrc``\n" | |
9418 |
"- ``%HOME%\\ |
|
9700 | "- ``%HOME%\\mercurial.ini``\n" | |
9419 |
"- ``C:\\ |
|
9701 | "- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial." | |
9420 | "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" |
|
9702 | "ini found)\n" | |
9421 | "- ``<install-dir>\\Mercurial.ini``" |
|
9703 | "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial." | |
|
9704 | "ini found)\n" | |||
|
9705 | "- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n" | |||
|
9706 | "- ``<hg.exe-dir>\\mercurial.ini``" | |||
9422 | msgstr "" |
|
9707 | msgstr "" | |
9423 | "- ``<arkiv>\\.hg\\hgrc``\n" |
|
9708 | "- ``<arkiv>\\.hg\\hgrc``\n" | |
9424 | "- ``%USERPROFILE%\\.hgrc``\n" |
|
9709 | "- ``%USERPROFILE%\\.hgrc``\n" | |
9425 |
"- ``%USERPROFILE%\\ |
|
9710 | "- ``%USERPROFILE%\\mercurial.ini``\n" | |
9426 | "- ``%HOME%\\.hgrc``\n" |
|
9711 | "- ``%HOME%\\.hgrc``\n" | |
9427 |
"- ``%HOME%\\ |
|
9712 | "- ``%HOME%\\mercurial.ini``\n" | |
9428 |
"- ``C:\\ |
|
9713 | "- ``C:\\mercurial\\mercurial.ini`` (om inte registernyckel eller hgrc.d\\ " | |
9429 | "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" |
|
9714 | "eller mercurial.ini hittas)\n" | |
9430 | "- ``<installationskatalog>\\Mercurial.ini``" |
|
9715 | "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (om inte hgrc.d\\ eller " | |
|
9716 | "mercurial.ini hittas)\n" | |||
|
9717 | "- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (om inte mercurial.ini hittas)\n" | |||
|
9718 | "- ``<hg.exe-dir>\\mercurial.ini``" | |||
9431 |
|
9719 | |||
9432 | msgid "On Unix, these files are read:" |
|
9720 | msgid "On Unix, these files are read:" | |
9433 | msgstr "Under Unix läses dessa filer:" |
|
9721 | msgstr "Under Unix läses dessa filer:" | |
@@ -9448,6 +9736,27 b' msgstr ""' | |||||
9448 | "- ``<installationsrot>/etc/mercurial/hgrc.d/*.rc``" |
|
9736 | "- ``<installationsrot>/etc/mercurial/hgrc.d/*.rc``" | |
9449 |
|
9737 | |||
9450 | msgid "" |
|
9738 | msgid "" | |
|
9739 | "If there is a per-repository configuration file which is not owned by\n" | |||
|
9740 | "the active user, Mercurial will warn you that the file is skipped::" | |||
|
9741 | msgstr "" | |||
|
9742 | ||||
|
9743 | msgid "" | |||
|
9744 | " not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" | |||
|
9745 | msgstr "" | |||
|
9746 | ||||
|
9747 | msgid "" | |||
|
9748 | "If this bothers you, the warning can be silenced (the file would still\n" | |||
|
9749 | "be ignored) or trust can be established. Use one of the following\n" | |||
|
9750 | "settings, the syntax is explained below:" | |||
|
9751 | msgstr "" | |||
|
9752 | ||||
|
9753 | msgid "" | |||
|
9754 | "- ``ui.report_untrusted = False``\n" | |||
|
9755 | "- ``trusted.users = USER``\n" | |||
|
9756 | "- ``trusted.groups = GROUP``" | |||
|
9757 | msgstr "" | |||
|
9758 | ||||
|
9759 | msgid "" | |||
9451 | "The configuration files for Mercurial use a simple ini-file format. A\n" |
|
9760 | "The configuration files for Mercurial use a simple ini-file format. A\n" | |
9452 | "configuration file consists of sections, led by a ``[section]`` header\n" |
|
9761 | "configuration file consists of sections, led by a ``[section]`` header\n" | |
9453 | "and followed by ``name = value`` entries::" |
|
9762 | "and followed by ``name = value`` entries::" | |
@@ -9466,7 +9775,7 b' msgstr ""' | |||||
9466 | " verbose = True" |
|
9775 | " verbose = True" | |
9467 |
|
9776 | |||
9468 | msgid "" |
|
9777 | msgid "" | |
9469 |
"Th |
|
9778 | "The above entries will be referred to as ``ui.username`` and\n" | |
9470 | "``ui.verbose``, respectively. Please see the hgrc man page for a full\n" |
|
9779 | "``ui.verbose``, respectively. Please see the hgrc man page for a full\n" | |
9471 | "description of the possible configuration values:" |
|
9780 | "description of the possible configuration values:" | |
9472 | msgstr "" |
|
9781 | msgstr "" | |
@@ -9581,7 +9890,7 b' msgstr ""' | |||||
9581 |
|
9890 | |||
9582 | msgid "" |
|
9891 | msgid "" | |
9583 | "This means that when generating diffs from a Mercurial repository\n" |
|
9892 | "This means that when generating diffs from a Mercurial repository\n" | |
9584 |
"(e.g. with |
|
9893 | "(e.g. with :hg:`export`), you should be careful about things like file\n" | |
9585 | "copies and renames or other things mentioned above, because when\n" |
|
9894 | "copies and renames or other things mentioned above, because when\n" | |
9586 | "applying a standard diff to a different repository, this extra\n" |
|
9895 | "applying a standard diff to a different repository, this extra\n" | |
9587 | "information is lost. Mercurial's internal operations (like push and\n" |
|
9896 | "information is lost. Mercurial's internal operations (like push and\n" | |
@@ -9763,6 +10072,586 b' msgid ""' | |||||
9763 | msgstr "" |
|
10072 | msgstr "" | |
9764 |
|
10073 | |||
9765 | msgid "" |
|
10074 | msgid "" | |
|
10075 | "Ancestor\n" | |||
|
10076 | " Any changeset that can be reached by an unbroken chain of parent\n" | |||
|
10077 | " changesets from a given changeset. More precisely, the ancestors\n" | |||
|
10078 | " of a changeset can be defined by two properties: a parent of a\n" | |||
|
10079 | " changeset is an ancestor, and a parent of an ancestor is an\n" | |||
|
10080 | " ancestor. See also: 'Descendant'." | |||
|
10081 | msgstr "" | |||
|
10082 | ||||
|
10083 | msgid "" | |||
|
10084 | "Branch\n" | |||
|
10085 | " (Noun) A child changeset that has been created from a parent that\n" | |||
|
10086 | " is not a head. These are known as topological branches, see\n" | |||
|
10087 | " 'Branch, topological'.If a topological branch is named, it becomes\n" | |||
|
10088 | " a named branch. If a topological branch is not named, it becomes\n" | |||
|
10089 | " an anonymous branch. See 'Branch, anonymous' and 'Branch, named'." | |||
|
10090 | msgstr "" | |||
|
10091 | ||||
|
10092 | msgid "" | |||
|
10093 | " Branches may be created when changes are pulled from or pushed to\n" | |||
|
10094 | " a remote repository, since new heads may be created by these\n" | |||
|
10095 | " operations. Note that the term branch can also be used informally\n" | |||
|
10096 | " to describe a development process in which certain development is\n" | |||
|
10097 | " done independently of other development.This is sometimes done\n" | |||
|
10098 | " explicitly with a named branch, but it can also be done locally,\n" | |||
|
10099 | " using bookmarks or clones and anonymous branches." | |||
|
10100 | msgstr "" | |||
|
10101 | ||||
|
10102 | msgid " Example: \"The experimental branch\"." | |||
|
10103 | msgstr "" | |||
|
10104 | ||||
|
10105 | msgid "" | |||
|
10106 | " (Verb) The action of creating a child changeset which results in\n" | |||
|
10107 | " its parent having more than one child." | |||
|
10108 | msgstr "" | |||
|
10109 | ||||
|
10110 | msgid " Example: \"I'm going to branch at X\"." | |||
|
10111 | msgstr "" | |||
|
10112 | ||||
|
10113 | msgid "" | |||
|
10114 | "Branch, anonymous\n" | |||
|
10115 | " Every time a new child changeset is created from a parent that is not\n" | |||
|
10116 | " a head and the name of the branch is not changed, a new anonymous\n" | |||
|
10117 | " branch is created." | |||
|
10118 | msgstr "" | |||
|
10119 | ||||
|
10120 | msgid "" | |||
|
10121 | "Branch, closed\n" | |||
|
10122 | " A named branch whose branch heads have all been closed." | |||
|
10123 | msgstr "" | |||
|
10124 | ||||
|
10125 | msgid "" | |||
|
10126 | "Branch, default\n" | |||
|
10127 | " The branch assigned to a changeset when no name has previously been\n" | |||
|
10128 | " assigned." | |||
|
10129 | msgstr "" | |||
|
10130 | ||||
|
10131 | msgid "" | |||
|
10132 | "Branch head\n" | |||
|
10133 | " See 'Head, branch'." | |||
|
10134 | msgstr "" | |||
|
10135 | ||||
|
10136 | msgid "" | |||
|
10137 | "Branch, named\n" | |||
|
10138 | " A collection of changesets which have the same branch name. By\n" | |||
|
10139 | " default, children of a changeset in a named branch belong to the\n" | |||
|
10140 | " same named branch. A child can be explicitly assigned to a\n" | |||
|
10141 | " different branch. See :hg:`help branch`, :hg:`help branches` and\n" | |||
|
10142 | " :hg:`commit --close-branch` for more information on managing\n" | |||
|
10143 | " branches." | |||
|
10144 | msgstr "" | |||
|
10145 | ||||
|
10146 | msgid "" | |||
|
10147 | " Named branches can be thought of as a kind of namespace, dividing\n" | |||
|
10148 | " the collection of changesets that comprise the repository into a\n" | |||
|
10149 | " collection of disjoint subsets. A named branch is not necessarily\n" | |||
|
10150 | " a topological branch. If a new named branch is created from the\n" | |||
|
10151 | " head of another named branch, or the default branch, but no\n" | |||
|
10152 | " further changesets are added to that previous branch, then the new\n" | |||
|
10153 | " named branch will be a branch in name only." | |||
|
10154 | msgstr "" | |||
|
10155 | ||||
|
10156 | msgid "" | |||
|
10157 | "Branch tip\n" | |||
|
10158 | " See 'Tip, branch'." | |||
|
10159 | msgstr "" | |||
|
10160 | ||||
|
10161 | msgid "" | |||
|
10162 | "Branch, topological\n" | |||
|
10163 | " Every time a new child changeset is created from a parent that is\n" | |||
|
10164 | " not a head, a new topological branch is created. If a topological\n" | |||
|
10165 | " branch is named, it becomes a named branch. If a topological\n" | |||
|
10166 | " branch is not named, it becomes an anonymous branch of the\n" | |||
|
10167 | " current, possibly default, branch." | |||
|
10168 | msgstr "" | |||
|
10169 | ||||
|
10170 | msgid "" | |||
|
10171 | "Changelog\n" | |||
|
10172 | " A record of the changesets in the order in which they were added\n" | |||
|
10173 | " to the repository. This includes details such as changeset id,\n" | |||
|
10174 | " author, commit message, date, and list of changed files." | |||
|
10175 | msgstr "" | |||
|
10176 | ||||
|
10177 | msgid "" | |||
|
10178 | "Changeset\n" | |||
|
10179 | " A snapshot of the state of the repository used to record a change." | |||
|
10180 | msgstr "" | |||
|
10181 | ||||
|
10182 | msgid "" | |||
|
10183 | "Changeset, child\n" | |||
|
10184 | " The converse of parent changeset: if P is a parent of C, then C is\n" | |||
|
10185 | " a child of P. There is no limit to the number of children that a\n" | |||
|
10186 | " changeset may have." | |||
|
10187 | msgstr "" | |||
|
10188 | ||||
|
10189 | msgid "" | |||
|
10190 | "Changeset id\n" | |||
|
10191 | " A SHA-1 hash that uniquely identifies a changeset. It may be\n" | |||
|
10192 | " represented as either a \"long\" 40-byte hexadecimal string, or a\n" | |||
|
10193 | " \"short\" 12-byte hexadecimal string." | |||
|
10194 | msgstr "" | |||
|
10195 | ||||
|
10196 | msgid "" | |||
|
10197 | "Changeset, merge\n" | |||
|
10198 | " A changeset with two parents. This occurs when a merge is\n" | |||
|
10199 | " committed." | |||
|
10200 | msgstr "" | |||
|
10201 | ||||
|
10202 | msgid "" | |||
|
10203 | "Changeset, parent\n" | |||
|
10204 | " A revision upon which a child changeset is based. Specifically, a\n" | |||
|
10205 | " parent changeset of a changeset C is a changeset whose node\n" | |||
|
10206 | " immediately precedes C in the DAG. Changesets have at most two\n" | |||
|
10207 | " parents." | |||
|
10208 | msgstr "" | |||
|
10209 | ||||
|
10210 | msgid "" | |||
|
10211 | "Checkout\n" | |||
|
10212 | " (Noun) The working directory being updated to a specific\n" | |||
|
10213 | " revision. This use should probably be avoided where possible, as\n" | |||
|
10214 | " changeset is much more appropriate than checkout in this context." | |||
|
10215 | msgstr "" | |||
|
10216 | ||||
|
10217 | msgid " Example: \"I'm using checkout X.\"" | |||
|
10218 | msgstr "" | |||
|
10219 | ||||
|
10220 | msgid "" | |||
|
10221 | " (Verb) Updating the working directory to a specific changeset. See\n" | |||
|
10222 | " :hg:`help update`." | |||
|
10223 | msgstr "" | |||
|
10224 | ||||
|
10225 | msgid " Example: \"I'm going to check out changeset X.\"" | |||
|
10226 | msgstr "" | |||
|
10227 | ||||
|
10228 | msgid "" | |||
|
10229 | "Child changeset\n" | |||
|
10230 | " See 'Changeset, child'." | |||
|
10231 | msgstr "" | |||
|
10232 | ||||
|
10233 | msgid "" | |||
|
10234 | "Close changeset\n" | |||
|
10235 | " See 'Changeset, close'." | |||
|
10236 | msgstr "" | |||
|
10237 | ||||
|
10238 | msgid "" | |||
|
10239 | "Closed branch\n" | |||
|
10240 | " See 'Branch, closed'." | |||
|
10241 | msgstr "" | |||
|
10242 | ||||
|
10243 | msgid "" | |||
|
10244 | "Clone\n" | |||
|
10245 | " (Noun) An entire or partial copy of a repository. The partial\n" | |||
|
10246 | " clone must be in the form of a revision and its ancestors." | |||
|
10247 | msgstr "" | |||
|
10248 | ||||
|
10249 | msgid " Example: \"Is your clone up to date?\"." | |||
|
10250 | msgstr "" | |||
|
10251 | ||||
|
10252 | msgid " (Verb) The process of creating a clone, using :hg:`clone`." | |||
|
10253 | msgstr "" | |||
|
10254 | ||||
|
10255 | msgid " Example: \"I'm going to clone the repository\"." | |||
|
10256 | msgstr "" | |||
|
10257 | ||||
|
10258 | msgid "" | |||
|
10259 | "Closed branch head\n" | |||
|
10260 | " See 'Head, closed branch'." | |||
|
10261 | msgstr "" | |||
|
10262 | ||||
|
10263 | msgid "" | |||
|
10264 | "Commit\n" | |||
|
10265 | " (Noun) A synonym for changeset." | |||
|
10266 | msgstr "" | |||
|
10267 | ||||
|
10268 | msgid " Example: \"Is the bug fixed in your recent commit?\"" | |||
|
10269 | msgstr "" | |||
|
10270 | ||||
|
10271 | msgid "" | |||
|
10272 | " (Verb) The act of recording changes to a repository. When files\n" | |||
|
10273 | " are committed in a working directory, Mercurial finds the\n" | |||
|
10274 | " differences between the committed files and their parent\n" | |||
|
10275 | " changeset, creating a new changeset in the repository." | |||
|
10276 | msgstr "" | |||
|
10277 | ||||
|
10278 | msgid " Example: \"You should commit those changes now.\"" | |||
|
10279 | msgstr "" | |||
|
10280 | ||||
|
10281 | msgid "" | |||
|
10282 | "Cset\n" | |||
|
10283 | " A common abbreviation of the term changeset." | |||
|
10284 | msgstr "" | |||
|
10285 | ||||
|
10286 | msgid "" | |||
|
10287 | "DAG\n" | |||
|
10288 | " The repository of changesets of a distributed version control\n" | |||
|
10289 | " system (DVCS) can be described as a directed acyclic graph (DAG),\n" | |||
|
10290 | " consisting of nodes and edges, where nodes correspond to\n" | |||
|
10291 | " changesets and edges imply a parent -> child relation. This graph\n" | |||
|
10292 | " can be visualized by graphical tools such as :hg:`glog`\n" | |||
|
10293 | " (graphlog). In mercurial, the DAG is limited by the requirement\n" | |||
|
10294 | " for children to have at most two parents." | |||
|
10295 | msgstr "" | |||
|
10296 | ||||
|
10297 | msgid "" | |||
|
10298 | "Default branch\n" | |||
|
10299 | " See 'Branch, default'." | |||
|
10300 | msgstr "" | |||
|
10301 | ||||
|
10302 | msgid "" | |||
|
10303 | "Descendant\n" | |||
|
10304 | " Any changeset that can be reached by a chain of child changesets\n" | |||
|
10305 | " from a given changeset. More precisely, the descendants of a\n" | |||
|
10306 | " changeset can be defined by two properties: the child of a\n" | |||
|
10307 | " changeset is a descendant, and the child of a descendant is a\n" | |||
|
10308 | " descendant. See also: 'Ancestor'." | |||
|
10309 | msgstr "" | |||
|
10310 | ||||
|
10311 | msgid "" | |||
|
10312 | "Diff\n" | |||
|
10313 | " (Noun) The difference between the contents and attributes of files\n" | |||
|
10314 | " in two changesets or a changeset and the current working\n" | |||
|
10315 | " directory. The difference is usually represented in a standard\n" | |||
|
10316 | " form called a \"diff\" or \"patch\". The \"git diff\" format is used\n" | |||
|
10317 | " when the changes include copies, renames, or changes to file\n" | |||
|
10318 | " attributes, none of which can be represented/handled by classic\n" | |||
|
10319 | " \"diff\" and \"patch\"." | |||
|
10320 | msgstr "" | |||
|
10321 | ||||
|
10322 | msgid " Example: \"Did you see my correction in the diff?\"" | |||
|
10323 | msgstr "" | |||
|
10324 | ||||
|
10325 | msgid "" | |||
|
10326 | " (Verb) Diffing two changesets is the action of creating a diff or\n" | |||
|
10327 | " patch." | |||
|
10328 | msgstr "" | |||
|
10329 | ||||
|
10330 | msgid "" | |||
|
10331 | " Example: \"If you diff with changeset X, you will see what I mean.\"" | |||
|
10332 | msgstr "" | |||
|
10333 | ||||
|
10334 | msgid "" | |||
|
10335 | "Directory, working\n" | |||
|
10336 | " The working directory represents the state of the files tracked by\n" | |||
|
10337 | " Mercurial, that will be recorded in the next commit. The working\n" | |||
|
10338 | " directory initially corresponds to the snapshot at an existing\n" | |||
|
10339 | " changeset, known as the parent of the working directory. See\n" | |||
|
10340 | " 'Parents, working directory'. The state may be modified by changes\n" | |||
|
10341 | " to the files introduced manually or by a merge. The repository\n" | |||
|
10342 | " metadata exists in the .hg directory inside the working directory." | |||
|
10343 | msgstr "" | |||
|
10344 | ||||
|
10345 | msgid "" | |||
|
10346 | "Graph\n" | |||
|
10347 | " See DAG and :hg:`help graphlog`." | |||
|
10348 | msgstr "" | |||
|
10349 | ||||
|
10350 | msgid "" | |||
|
10351 | "Head\n" | |||
|
10352 | " The term 'head' may be used to refer to both a branch head or a\n" | |||
|
10353 | " repository head, depending on the context. See 'Head, branch' and\n" | |||
|
10354 | " 'Head, repository' for specific definitions." | |||
|
10355 | msgstr "" | |||
|
10356 | ||||
|
10357 | msgid "" | |||
|
10358 | " Heads are where development generally takes place and are the\n" | |||
|
10359 | " usual targets for update and merge operations." | |||
|
10360 | msgstr "" | |||
|
10361 | ||||
|
10362 | msgid "" | |||
|
10363 | "Head, branch\n" | |||
|
10364 | " A changeset with no descendants on the same named branch." | |||
|
10365 | msgstr "" | |||
|
10366 | ||||
|
10367 | msgid "" | |||
|
10368 | "Head, closed branch\n" | |||
|
10369 | " A changeset that marks a head as no longer interesting. The closed\n" | |||
|
10370 | " head is no longer listed by :hg:`heads`. A branch is considered\n" | |||
|
10371 | " closed when all its heads are closed and consequently is not\n" | |||
|
10372 | " listed by :hg:`branches`." | |||
|
10373 | msgstr "" | |||
|
10374 | ||||
|
10375 | msgid "" | |||
|
10376 | "Head, repository\n" | |||
|
10377 | " A topological head which has not been closed." | |||
|
10378 | msgstr "" | |||
|
10379 | ||||
|
10380 | msgid "" | |||
|
10381 | "Head, topological\n" | |||
|
10382 | " A changeset with no children in the repository." | |||
|
10383 | msgstr "" | |||
|
10384 | ||||
|
10385 | msgid "" | |||
|
10386 | "History, immutable\n" | |||
|
10387 | " Once committed, changesets cannot be altered. Extensions which\n" | |||
|
10388 | " appear to change history actually create new changesets that\n" | |||
|
10389 | " replace existing ones, and then destroy the old changesets. Doing\n" | |||
|
10390 | " so in public repositories can result in old changesets being\n" | |||
|
10391 | " reintroduced to the repository." | |||
|
10392 | msgstr "" | |||
|
10393 | ||||
|
10394 | msgid "" | |||
|
10395 | "History, rewriting\n" | |||
|
10396 | " The changesets in a repository are immutable. However, extensions\n" | |||
|
10397 | " to Mercurial can be used to alter the repository, usually in such\n" | |||
|
10398 | " a way as to preserve changeset contents." | |||
|
10399 | msgstr "" | |||
|
10400 | ||||
|
10401 | msgid "" | |||
|
10402 | "Immutable history\n" | |||
|
10403 | " See 'History, immutable'." | |||
|
10404 | msgstr "" | |||
|
10405 | ||||
|
10406 | msgid "" | |||
|
10407 | "Merge changeset\n" | |||
|
10408 | " See 'Changeset, merge'." | |||
|
10409 | msgstr "" | |||
|
10410 | ||||
|
10411 | msgid "" | |||
|
10412 | "Manifest\n" | |||
|
10413 | " Each changeset has a manifest, which is the list of files that are\n" | |||
|
10414 | " tracked by the changeset." | |||
|
10415 | msgstr "" | |||
|
10416 | ||||
|
10417 | msgid "" | |||
|
10418 | "Merge\n" | |||
|
10419 | " Used to bring together divergent branches of work. When you update\n" | |||
|
10420 | " to a changeset and then merge another changeset, you bring the\n" | |||
|
10421 | " history of the latter changeset into your working directory. Once\n" | |||
|
10422 | " conflicts are resolved (and marked), this merge may be committed\n" | |||
|
10423 | " as a merge changeset, bringing two branches together in the DAG." | |||
|
10424 | msgstr "" | |||
|
10425 | ||||
|
10426 | msgid "" | |||
|
10427 | "Named branch\n" | |||
|
10428 | " See 'Branch, named'." | |||
|
10429 | msgstr "" | |||
|
10430 | ||||
|
10431 | msgid "" | |||
|
10432 | "Null changeset\n" | |||
|
10433 | " The empty changeset. It is the parent state of newly-initialized\n" | |||
|
10434 | " repositories and repositories with no checked out revision. It is\n" | |||
|
10435 | " thus the parent of root changesets and the effective ancestor when\n" | |||
|
10436 | " merging unrelated changesets. Can be specified by the alias 'null'\n" | |||
|
10437 | " or by the changeset ID '000000000000'." | |||
|
10438 | msgstr "" | |||
|
10439 | ||||
|
10440 | msgid "" | |||
|
10441 | "Parent\n" | |||
|
10442 | " See 'Changeset, parent'." | |||
|
10443 | msgstr "" | |||
|
10444 | ||||
|
10445 | msgid "" | |||
|
10446 | "Parent changeset\n" | |||
|
10447 | " See 'Changeset, parent'." | |||
|
10448 | msgstr "" | |||
|
10449 | ||||
|
10450 | msgid "" | |||
|
10451 | "Parent, working directory\n" | |||
|
10452 | " The working directory parent reflects a virtual revision which is\n" | |||
|
10453 | " the child of the changeset (or two changesets with an uncommitted\n" | |||
|
10454 | " merge) shown by :hg:`parents`. This is changed with\n" | |||
|
10455 | " :hg:`update`. Other commands to see the working directory parent\n" | |||
|
10456 | " are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"." | |||
|
10457 | msgstr "" | |||
|
10458 | ||||
|
10459 | msgid "" | |||
|
10460 | "Patch\n" | |||
|
10461 | " (Noun) The product of a diff operation." | |||
|
10462 | msgstr "" | |||
|
10463 | ||||
|
10464 | msgid " Example: \"I've sent you my patch.\"" | |||
|
10465 | msgstr "" | |||
|
10466 | ||||
|
10467 | msgid "" | |||
|
10468 | " (Verb) The process of using a patch file to transform one\n" | |||
|
10469 | " changeset into another." | |||
|
10470 | msgstr "" | |||
|
10471 | ||||
|
10472 | msgid " Example: \"You will need to patch that revision.\"" | |||
|
10473 | msgstr "" | |||
|
10474 | ||||
|
10475 | msgid "" | |||
|
10476 | "Pull\n" | |||
|
10477 | " An operation in which changesets in a remote repository which are\n" | |||
|
10478 | " not in the local repository are brought into the local\n" | |||
|
10479 | " repository. Note that this operation without special arguments\n" | |||
|
10480 | " only updates the repository, it does not update the files in the\n" | |||
|
10481 | " working directory. See :hg:`help pull`." | |||
|
10482 | msgstr "" | |||
|
10483 | ||||
|
10484 | msgid "" | |||
|
10485 | "Push\n" | |||
|
10486 | " An operation in which changesets in a local repository which are\n" | |||
|
10487 | " not in a remote repository are sent to the remote repository. Note\n" | |||
|
10488 | " that this operation only adds changesets which have been committed\n" | |||
|
10489 | " locally to the remote repository. Uncommitted changes are not\n" | |||
|
10490 | " sent. See :hg:`help push`." | |||
|
10491 | msgstr "" | |||
|
10492 | ||||
|
10493 | msgid "" | |||
|
10494 | "Repository\n" | |||
|
10495 | " The metadata describing all recorded states of a collection of\n" | |||
|
10496 | " files. Each recorded state is represented by a changeset. A\n" | |||
|
10497 | " repository is usually (but not always) found in the ``.hg``\n" | |||
|
10498 | " subdirectory of a working directory. Any recorded state can be\n" | |||
|
10499 | " recreated by \"updating\" a working directory to a specific\n" | |||
|
10500 | " changeset." | |||
|
10501 | msgstr "" | |||
|
10502 | ||||
|
10503 | msgid "" | |||
|
10504 | "Repository head\n" | |||
|
10505 | " See 'Head, repository'." | |||
|
10506 | msgstr "" | |||
|
10507 | ||||
|
10508 | msgid "" | |||
|
10509 | "Revision\n" | |||
|
10510 | " A state of the repository at some point in time. Earlier revisions\n" | |||
|
10511 | " can be updated to by using :hg:`update`. See also 'Revision\n" | |||
|
10512 | " number'; See also 'Changeset'." | |||
|
10513 | msgstr "" | |||
|
10514 | ||||
|
10515 | msgid "" | |||
|
10516 | "Revision number\n" | |||
|
10517 | " This integer uniquely identifies a changeset in a specific\n" | |||
|
10518 | " repository. It represents the order in which changesets were added\n" | |||
|
10519 | " to a repository, starting with revision number 0. Note that the\n" | |||
|
10520 | " revision number may be different in each clone of a repository. To\n" | |||
|
10521 | " identify changesets uniquely between different clones, see\n" | |||
|
10522 | " 'Changeset id'." | |||
|
10523 | msgstr "" | |||
|
10524 | ||||
|
10525 | msgid "" | |||
|
10526 | "Revlog\n" | |||
|
10527 | " History storage mechanism used by Mercurial. It is a form of delta\n" | |||
|
10528 | " encoding, with occasional full revision of data followed by delta\n" | |||
|
10529 | " of each successive revision. It includes data and an index\n" | |||
|
10530 | " pointing to the data." | |||
|
10531 | msgstr "" | |||
|
10532 | ||||
|
10533 | msgid "" | |||
|
10534 | "Rewriting history\n" | |||
|
10535 | " See 'History, rewriting'." | |||
|
10536 | msgstr "" | |||
|
10537 | ||||
|
10538 | msgid "" | |||
|
10539 | "Root\n" | |||
|
10540 | " A changeset that has only the null changeset as its parent. Most\n" | |||
|
10541 | " repositories have only a single root changeset." | |||
|
10542 | msgstr "" | |||
|
10543 | ||||
|
10544 | msgid "" | |||
|
10545 | "Tip\n" | |||
|
10546 | " The changeset with the highest revision number. It is the changeset\n" | |||
|
10547 | " most recently added in a repository." | |||
|
10548 | msgstr "" | |||
|
10549 | ||||
|
10550 | msgid "" | |||
|
10551 | "Tip, branch\n" | |||
|
10552 | " The head of a given branch with the highest revision number. When\n" | |||
|
10553 | " a branch name is used as a revision identifier, it refers to the\n" | |||
|
10554 | " branch tip. See also 'Branch, head'. Note that because revision\n" | |||
|
10555 | " numbers may be different in different repository clones, the\n" | |||
|
10556 | " branch tip may be different in different cloned repositories." | |||
|
10557 | msgstr "" | |||
|
10558 | ||||
|
10559 | msgid "" | |||
|
10560 | "Update\n" | |||
|
10561 | " (Noun) Another synonym of changeset." | |||
|
10562 | msgstr "" | |||
|
10563 | ||||
|
10564 | msgid " Example: \"I've pushed an update\"." | |||
|
10565 | msgstr "" | |||
|
10566 | ||||
|
10567 | msgid "" | |||
|
10568 | " (Verb) This term is usually used to describe updating the state of\n" | |||
|
10569 | " the working directory to that of a specific changeset. See\n" | |||
|
10570 | " :hg:`help update`." | |||
|
10571 | msgstr "" | |||
|
10572 | ||||
|
10573 | msgid " Example: \"You should update\"." | |||
|
10574 | msgstr "" | |||
|
10575 | ||||
|
10576 | msgid "" | |||
|
10577 | "Working directory\n" | |||
|
10578 | " See 'Directory, working'." | |||
|
10579 | msgstr "" | |||
|
10580 | ||||
|
10581 | msgid "" | |||
|
10582 | "Working directory parent\n" | |||
|
10583 | " See 'Parent, working directory'.\n" | |||
|
10584 | msgstr "" | |||
|
10585 | ||||
|
10586 | msgid "" | |||
|
10587 | "Mercurial's internal web server, hgweb, can serve either a single\n" | |||
|
10588 | "repository, or a collection of them. In the latter case, a special\n" | |||
|
10589 | "configuration file can be used to specify the repository paths to use\n" | |||
|
10590 | "and global web configuration options." | |||
|
10591 | msgstr "" | |||
|
10592 | ||||
|
10593 | msgid "" | |||
|
10594 | "This file uses the same syntax as hgrc configuration files, but only\n" | |||
|
10595 | "the following sections are recognized:" | |||
|
10596 | msgstr "" | |||
|
10597 | ||||
|
10598 | msgid "" | |||
|
10599 | " - web\n" | |||
|
10600 | " - paths\n" | |||
|
10601 | " - collections" | |||
|
10602 | msgstr "" | |||
|
10603 | ||||
|
10604 | msgid "" | |||
|
10605 | "The ``web`` section can specify all the settings described in the web\n" | |||
|
10606 | "section of the hgrc documentation." | |||
|
10607 | msgstr "" | |||
|
10608 | ||||
|
10609 | msgid "" | |||
|
10610 | "The ``paths`` section provides mappings of physical repository\n" | |||
|
10611 | "paths to virtual ones. For instance::" | |||
|
10612 | msgstr "" | |||
|
10613 | ||||
|
10614 | msgid "" | |||
|
10615 | " [paths]\n" | |||
|
10616 | " projects/a = /foo/bar\n" | |||
|
10617 | " projects/b = /baz/quux\n" | |||
|
10618 | " web/root = /real/root/*\n" | |||
|
10619 | " / = /real/root2/*\n" | |||
|
10620 | " virtual/root2 = /real/root2/**" | |||
|
10621 | msgstr "" | |||
|
10622 | ||||
|
10623 | msgid "" | |||
|
10624 | "- The first two entries make two repositories in different directories\n" | |||
|
10625 | " appear under the same directory in the web interface\n" | |||
|
10626 | "- The third entry maps every Mercurial repository found in '/real/root'\n" | |||
|
10627 | " into 'web/root'. This format is preferred over the [collections] one,\n" | |||
|
10628 | " since using absolute paths as configuration keys is not supported on " | |||
|
10629 | "every\n" | |||
|
10630 | " platform (especially on Windows).\n" | |||
|
10631 | "- The fourth entry is a special case mapping all repositories in\n" | |||
|
10632 | " '/real/root2' in the root of the virtual directory.\n" | |||
|
10633 | "- The fifth entry recursively finds all repositories under the real\n" | |||
|
10634 | " root, and maps their relative paths under the virtual root." | |||
|
10635 | msgstr "" | |||
|
10636 | ||||
|
10637 | msgid "" | |||
|
10638 | "The ``collections`` section provides mappings of trees of physical\n" | |||
|
10639 | "repositories paths to virtual ones, though the paths syntax is generally\n" | |||
|
10640 | "preferred. For instance::" | |||
|
10641 | msgstr "" | |||
|
10642 | ||||
|
10643 | msgid "" | |||
|
10644 | " [collections]\n" | |||
|
10645 | " /foo = /foo" | |||
|
10646 | msgstr "" | |||
|
10647 | ||||
|
10648 | msgid "" | |||
|
10649 | "Here, the left side will be stripped off all repositories found in the\n" | |||
|
10650 | "right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n" | |||
|
10651 | "``bar`` and ``quux/baz`` respectively.\n" | |||
|
10652 | msgstr "" | |||
|
10653 | ||||
|
10654 | msgid "" | |||
9766 | "When Mercurial accepts more than one revision, they may be specified\n" |
|
10655 | "When Mercurial accepts more than one revision, they may be specified\n" | |
9767 | "individually, or provided as a topologically continuous range,\n" |
|
10656 | "individually, or provided as a topologically continuous range,\n" | |
9768 | "separated by the \":\" character." |
|
10657 | "separated by the \":\" character." | |
@@ -9866,8 +10755,10 b' msgstr ""' | |||||
9866 | msgid "Regexp examples::" |
|
10755 | msgid "Regexp examples::" | |
9867 | msgstr "Regexp-exempel::" |
|
10756 | msgstr "Regexp-exempel::" | |
9868 |
|
10757 | |||
9869 | msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" |
|
10758 | msgid "" | |
9870 | msgstr " re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n" |
|
10759 | " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" | |
|
10760 | msgstr "" | |||
|
10761 | " re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n" | |||
9871 |
|
10762 | |||
9872 | msgid "Mercurial supports several ways to specify individual revisions." |
|
10763 | msgid "Mercurial supports several ways to specify individual revisions." | |
9873 | msgstr "Mercurial stöder flera sött att ange individuella revisioner." |
|
10764 | msgstr "Mercurial stöder flera sött att ange individuella revisioner." | |
@@ -9935,6 +10826,266 b' msgstr ""' | |||||
9935 | "sammanfogning pågår, så är \".\" den första förälderns revision.\n" |
|
10826 | "sammanfogning pågår, så är \".\" den första förälderns revision.\n" | |
9936 |
|
10827 | |||
9937 | msgid "" |
|
10828 | msgid "" | |
|
10829 | "Mercurial supports a functional language for selecting a set of\n" | |||
|
10830 | "revisions." | |||
|
10831 | msgstr "Mercurial stöder flera sött att ange individuella revisioner." | |||
|
10832 | ||||
|
10833 | msgid "" | |||
|
10834 | "The language supports a number of predicates which are joined by infix\n" | |||
|
10835 | "operators. Parenthesis can be used for grouping." | |||
|
10836 | msgstr "" | |||
|
10837 | ||||
|
10838 | msgid "" | |||
|
10839 | "Identifiers such as branch names must be quoted with single or double\n" | |||
|
10840 | "quotes if they contain characters outside of ``[a-zA-Z0-9]`` or if\n" | |||
|
10841 | "they match one of the predefined predicates. Special characters can be\n" | |||
|
10842 | "used in the identifiers by quoting them, e.g., ``\\n`` is interpreted\n" | |||
|
10843 | "as a newline." | |||
|
10844 | msgstr "" | |||
|
10845 | ||||
|
10846 | msgid "There is a single prefix operator:" | |||
|
10847 | msgstr "" | |||
|
10848 | ||||
|
10849 | msgid "" | |||
|
10850 | "``not x``\n" | |||
|
10851 | " Changesets not in x. Short form is ``! x``." | |||
|
10852 | msgstr "" | |||
|
10853 | ||||
|
10854 | msgid "These are the supported infix operators:" | |||
|
10855 | msgstr "" | |||
|
10856 | ||||
|
10857 | msgid "" | |||
|
10858 | "``x::y``\n" | |||
|
10859 | " A DAG range, meaning all changesets that are descendants of x and\n" | |||
|
10860 | " ancestors of y, including x and y themselves. If the first endpoint\n" | |||
|
10861 | " is left out, this is equivalent to ``ancestors(y)``, if the second\n" | |||
|
10862 | " is left out it is equivalent to ``descendents(x)``." | |||
|
10863 | msgstr "" | |||
|
10864 | ||||
|
10865 | msgid " An alternative syntax is ``x..y``." | |||
|
10866 | msgstr "" | |||
|
10867 | ||||
|
10868 | msgid "" | |||
|
10869 | "``x:y``\n" | |||
|
10870 | " All changesets with revision numbers between x and y, both\n" | |||
|
10871 | " inclusive. Either endpoint can be left out, they default to 0 and\n" | |||
|
10872 | " tip." | |||
|
10873 | msgstr "" | |||
|
10874 | ||||
|
10875 | msgid "" | |||
|
10876 | "``x and y``\n" | |||
|
10877 | " The intersection of changesets in x and y. Short form is ``x & y``." | |||
|
10878 | msgstr "" | |||
|
10879 | ||||
|
10880 | msgid "" | |||
|
10881 | "``x or y``\n" | |||
|
10882 | " The union of changesets in x and y. There are two alternative short\n" | |||
|
10883 | " forms: ``x | y`` and ``x + y``." | |||
|
10884 | msgstr "" | |||
|
10885 | ||||
|
10886 | msgid "" | |||
|
10887 | "``x - y``\n" | |||
|
10888 | " Changesets in x but not in y." | |||
|
10889 | msgstr "" | |||
|
10890 | ||||
|
10891 | msgid "The following predicates are supported:" | |||
|
10892 | msgstr "" | |||
|
10893 | ||||
|
10894 | msgid "" | |||
|
10895 | "``adds(pattern)``\n" | |||
|
10896 | " Changesets that add a file matching pattern." | |||
|
10897 | msgstr "" | |||
|
10898 | ||||
|
10899 | msgid "" | |||
|
10900 | "``all()``\n" | |||
|
10901 | " All changesets, the same as ``0:tip``." | |||
|
10902 | msgstr "" | |||
|
10903 | ||||
|
10904 | msgid "" | |||
|
10905 | "``ancestor(single, single)``\n" | |||
|
10906 | " Greatest common ancestor of the two changesets." | |||
|
10907 | msgstr "" | |||
|
10908 | ||||
|
10909 | msgid "" | |||
|
10910 | "``ancestors(set)``\n" | |||
|
10911 | " Changesets that are ancestors of a changeset in set." | |||
|
10912 | msgstr "" | |||
|
10913 | ||||
|
10914 | msgid "" | |||
|
10915 | "``author(string)``\n" | |||
|
10916 | " Alias for ``user(string)``." | |||
|
10917 | msgstr "" | |||
|
10918 | ||||
|
10919 | msgid "" | |||
|
10920 | "``branch(set)``\n" | |||
|
10921 | " The branch names are found for changesets in set, and the result is\n" | |||
|
10922 | " all changesets belonging to one those branches." | |||
|
10923 | msgstr "" | |||
|
10924 | ||||
|
10925 | msgid "" | |||
|
10926 | "``children(set)``\n" | |||
|
10927 | " Child changesets of changesets in set." | |||
|
10928 | msgstr "" | |||
|
10929 | ||||
|
10930 | msgid "" | |||
|
10931 | "``closed()``\n" | |||
|
10932 | " Changeset is closed." | |||
|
10933 | msgstr "" | |||
|
10934 | ||||
|
10935 | msgid "" | |||
|
10936 | "``contains(pattern)``\n" | |||
|
10937 | " Revision contains pattern." | |||
|
10938 | msgstr "" | |||
|
10939 | ||||
|
10940 | msgid "" | |||
|
10941 | "``date(interval)``\n" | |||
|
10942 | " Changesets within the interval, see :hg:`help dates`." | |||
|
10943 | msgstr "" | |||
|
10944 | ||||
|
10945 | msgid "" | |||
|
10946 | "``descendants(set)``\n" | |||
|
10947 | " Changesets which are decendants of changesets in set." | |||
|
10948 | msgstr "" | |||
|
10949 | ||||
|
10950 | msgid "" | |||
|
10951 | "``file(pattern)``\n" | |||
|
10952 | " Changesets which manually affected files matching pattern." | |||
|
10953 | msgstr "" | |||
|
10954 | ||||
|
10955 | msgid "" | |||
|
10956 | "``follow()``\n" | |||
|
10957 | " An alias for ``::.`` (ancestors of the working copy's first parent)." | |||
|
10958 | msgstr "" | |||
|
10959 | ||||
|
10960 | msgid "" | |||
|
10961 | "``grep(regex)``\n" | |||
|
10962 | " Like ``keyword(string)`` but accepts a regex." | |||
|
10963 | msgstr "" | |||
|
10964 | ||||
|
10965 | msgid "" | |||
|
10966 | "``head()``\n" | |||
|
10967 | " Changeset is a head." | |||
|
10968 | msgstr "" | |||
|
10969 | ||||
|
10970 | msgid "" | |||
|
10971 | "``heads(set)``\n" | |||
|
10972 | " Members of set with no children in set." | |||
|
10973 | msgstr "" | |||
|
10974 | ||||
|
10975 | msgid "" | |||
|
10976 | "``keyword(string)``\n" | |||
|
10977 | " Search commit message, user name, and names of changed files for\n" | |||
|
10978 | " string." | |||
|
10979 | msgstr "" | |||
|
10980 | ||||
|
10981 | msgid "" | |||
|
10982 | "``limit(set, n)``\n" | |||
|
10983 | " First n members of set." | |||
|
10984 | msgstr "" | |||
|
10985 | ||||
|
10986 | msgid "" | |||
|
10987 | "``max(set)``\n" | |||
|
10988 | " Changeset with highest revision number in set." | |||
|
10989 | msgstr "" | |||
|
10990 | ||||
|
10991 | msgid "" | |||
|
10992 | "``merge()``\n" | |||
|
10993 | " Changeset is a merge changeset." | |||
|
10994 | msgstr "" | |||
|
10995 | ||||
|
10996 | msgid "" | |||
|
10997 | "``modifies(pattern)``\n" | |||
|
10998 | " Changesets which modify files matching pattern." | |||
|
10999 | msgstr "" | |||
|
11000 | ||||
|
11001 | msgid "" | |||
|
11002 | "``outgoing([path])``\n" | |||
|
11003 | " Changesets missing in path." | |||
|
11004 | msgstr "" | |||
|
11005 | ||||
|
11006 | msgid "" | |||
|
11007 | "``p1(set)``\n" | |||
|
11008 | " First parent of changesets in set." | |||
|
11009 | msgstr "" | |||
|
11010 | ||||
|
11011 | msgid "" | |||
|
11012 | "``p2(set)``\n" | |||
|
11013 | " Second parent of changesets in set." | |||
|
11014 | msgstr "" | |||
|
11015 | ||||
|
11016 | msgid "" | |||
|
11017 | "``parents(set)``\n" | |||
|
11018 | " The set of all parents for all changesets in set." | |||
|
11019 | msgstr "" | |||
|
11020 | ||||
|
11021 | msgid "" | |||
|
11022 | "``removes(pattern)``\n" | |||
|
11023 | " Changesets which remove files matching pattern." | |||
|
11024 | msgstr "" | |||
|
11025 | ||||
|
11026 | msgid "" | |||
|
11027 | "``reverse(set)``\n" | |||
|
11028 | " Reverse order of set." | |||
|
11029 | msgstr "" | |||
|
11030 | ||||
|
11031 | msgid "" | |||
|
11032 | "``roots(set)``\n" | |||
|
11033 | " Changesets with no parent changeset in set." | |||
|
11034 | msgstr "" | |||
|
11035 | ||||
|
11036 | msgid "" | |||
|
11037 | "``sort(set[, [-]key...])``\n" | |||
|
11038 | " Sort set by keys. The default sort order is ascending, specify a key\n" | |||
|
11039 | " as ``-key`` to sort in descending order." | |||
|
11040 | msgstr "" | |||
|
11041 | ||||
|
11042 | msgid " The keys can be:" | |||
|
11043 | msgstr "" | |||
|
11044 | ||||
|
11045 | msgid "" | |||
|
11046 | " - ``rev`` for the revision number,\n" | |||
|
11047 | " - ``branch`` for the branch name,\n" | |||
|
11048 | " - ``desc`` for the commit message (description),\n" | |||
|
11049 | " - ``user`` for user name (``author`` can be used as an alias),\n" | |||
|
11050 | " - ``date`` for the commit date" | |||
|
11051 | msgstr "" | |||
|
11052 | ||||
|
11053 | msgid "" | |||
|
11054 | "``tagged()``\n" | |||
|
11055 | " Changeset is tagged." | |||
|
11056 | msgstr "" | |||
|
11057 | ||||
|
11058 | msgid "" | |||
|
11059 | "``user(string)``\n" | |||
|
11060 | " User name is string." | |||
|
11061 | msgstr "" | |||
|
11062 | ||||
|
11063 | msgid "Command line equivalents for :hg:`log`::" | |||
|
11064 | msgstr "" | |||
|
11065 | ||||
|
11066 | msgid "" | |||
|
11067 | " -f -> ::.\n" | |||
|
11068 | " -d x -> date(x)\n" | |||
|
11069 | " -k x -> keyword(x)\n" | |||
|
11070 | " -m -> merge()\n" | |||
|
11071 | " -u x -> user(x)\n" | |||
|
11072 | " -b x -> branch(x)\n" | |||
|
11073 | " -P x -> !::x\n" | |||
|
11074 | " -l x -> limit(expr, x)" | |||
|
11075 | msgstr "" | |||
|
11076 | ||||
|
11077 | msgid "Some sample queries::" | |||
|
11078 | msgstr "" | |||
|
11079 | ||||
|
11080 | msgid "" | |||
|
11081 | " hg log -r 'branch(default)'\n" | |||
|
11082 | " hg log -r 'branch(default) and 1.5:: and not merge()'\n" | |||
|
11083 | " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" | |||
|
11084 | " hg log -r 'sort(date(\"May 2008\"), user)'\n" | |||
|
11085 | " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" | |||
|
11086 | msgstr "" | |||
|
11087 | ||||
|
11088 | msgid "" | |||
9938 | "Mercurial allows you to customize output of commands through\n" |
|
11089 | "Mercurial allows you to customize output of commands through\n" | |
9939 | "templates. You can either pass in a template from the command\n" |
|
11090 | "templates. You can either pass in a template from the command\n" | |
9940 | "line, via the --template option, or select an existing\n" |
|
11091 | "line, via the --template option, or select an existing\n" | |
@@ -9947,8 +11098,9 b' msgid ""' | |||||
9947 | msgstr "" |
|
11098 | msgstr "" | |
9948 |
|
11099 | |||
9949 | msgid "" |
|
11100 | msgid "" | |
9950 |
" |
|
11101 | "Four styles are packaged with Mercurial: default (the style used\n" | |
9951 |
"when no explicit preference is passed), compact |
|
11102 | "when no explicit preference is passed), compact, changelog,\n" | |
|
11103 | "and xml.\n" | |||
9952 | "Usage::" |
|
11104 | "Usage::" | |
9953 | msgstr "" |
|
11105 | msgstr "" | |
9954 |
|
11106 | |||
@@ -10183,14 +11335,14 b' msgstr ""' | |||||
10183 |
|
11335 | |||
10184 | msgid "" |
|
11336 | msgid "" | |
10185 | "Paths in the local filesystem can either point to Mercurial\n" |
|
11337 | "Paths in the local filesystem can either point to Mercurial\n" | |
10186 |
"repositories or to bundle files (as created by |
|
11338 | "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" | |
10187 |
"incoming --bundle |
|
11339 | "incoming --bundle`)." | |
10188 | msgstr "" |
|
11340 | msgstr "" | |
10189 |
|
11341 | |||
10190 | msgid "" |
|
11342 | msgid "" | |
10191 | "An optional identifier after # indicates a particular branch, tag, or\n" |
|
11343 | "An optional identifier after # indicates a particular branch, tag, or\n" | |
10192 |
"changeset to use from the remote repository. See also |
|
11344 | "changeset to use from the remote repository. See also :hg:`help\n" | |
10193 |
"revisions |
|
11345 | "revisions`." | |
10194 | msgstr "" |
|
11346 | msgstr "" | |
10195 |
|
11347 | |||
10196 | msgid "" |
|
11348 | msgid "" | |
@@ -10243,7 +11395,7 b' msgstr ""' | |||||
10243 |
|
11395 | |||
10244 | msgid "" |
|
11396 | msgid "" | |
10245 | "You can then use the alias for any command that uses a URL (for\n" |
|
11397 | "You can then use the alias for any command that uses a URL (for\n" | |
10246 |
"example |
|
11398 | "example :hg:`pull alias1` will be treated as :hg:`pull URL1`)." | |
10247 | msgstr "" |
|
11399 | msgstr "" | |
10248 |
|
11400 | |||
10249 | msgid "" |
|
11401 | msgid "" | |
@@ -10265,9 +11417,16 b' msgid ""' | |||||
10265 | " prefer it over 'default' if both are defined.\n" |
|
11417 | " prefer it over 'default' if both are defined.\n" | |
10266 | msgstr "" |
|
11418 | msgstr "" | |
10267 |
|
11419 | |||
|
11420 | msgid "remote branch lookup not supported" | |||
|
11421 | msgstr "" | |||
|
11422 | ||||
10268 | msgid "dirstate branch not accessible" |
|
11423 | msgid "dirstate branch not accessible" | |
10269 | msgstr "dirstate-grenen inte åtkomlig" |
|
11424 | msgstr "dirstate-grenen inte åtkomlig" | |
10270 |
|
11425 | |||
|
11426 | #, python-format | |||
|
11427 | msgid "unknown branch '%s'" | |||
|
11428 | msgstr "okänd gren '%s'" | |||
|
11429 | ||||
10271 | msgid "can only share local repositories" |
|
11430 | msgid "can only share local repositories" | |
10272 | msgstr "kan bara dela lokala arkiv" |
|
11431 | msgstr "kan bara dela lokala arkiv" | |
10273 |
|
11432 | |||
@@ -10289,8 +11448,12 b' msgstr "destinationen \'%s\' finns redan"' | |||||
10289 | msgid "destination '%s' is not empty" |
|
11448 | msgid "destination '%s' is not empty" | |
10290 | msgstr "destinationen '%s är inte tom" |
|
11449 | msgstr "destinationen '%s är inte tom" | |
10291 |
|
11450 | |||
10292 | msgid "src repository does not support revision lookup and so doesn't support clone by revision" |
|
11451 | msgid "" | |
10293 | msgstr "källarkivet stödjer inte revisionsuppslag, och stödjer därför inte kloning av angivna revisioner" |
|
11452 | "src repository does not support revision lookup and so doesn't support clone " | |
|
11453 | "by revision" | |||
|
11454 | msgstr "" | |||
|
11455 | "källarkivet stödjer inte revisionsuppslag, och stödjer därför inte kloning " | |||
|
11456 | "av angivna revisioner" | |||
10294 |
|
11457 | |||
10295 | msgid "clone from remote to remote not supported" |
|
11458 | msgid "clone from remote to remote not supported" | |
10296 | msgstr "kloning från fjärr till fjärr stödjs inte" |
|
11459 | msgstr "kloning från fjärr till fjärr stödjs inte" | |
@@ -10300,13 +11463,18 b' msgid "updating to branch %s\\n"' | |||||
10300 | msgstr "uppdaterar till grenen %s\n" |
|
11463 | msgstr "uppdaterar till grenen %s\n" | |
10301 |
|
11464 | |||
10302 | #, python-format |
|
11465 | #, python-format | |
10303 | msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" |
|
11466 | msgid "" | |
10304 |
|
|
11467 | "%d files updated, %d files merged, %d files removed, %d files unresolved\n" | |
|
11468 | msgstr "" | |||
|
11469 | "%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer " | |||
|
11470 | "olösta\n" | |||
10305 |
|
11471 | |||
10306 | msgid "use 'hg resolve' to retry unresolved file merges\n" |
|
11472 | msgid "use 'hg resolve' to retry unresolved file merges\n" | |
10307 | msgstr "" |
|
11473 | msgstr "" | |
10308 |
|
11474 | |||
10309 | msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n" |
|
11475 | msgid "" | |
|
11476 | "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " | |||
|
11477 | "abandon\n" | |||
10310 | msgstr "" |
|
11478 | msgstr "" | |
10311 |
|
11479 | |||
10312 | msgid "(branch merge, don't forget to commit)\n" |
|
11480 | msgid "(branch merge, don't forget to commit)\n" | |
@@ -10473,6 +11641,10 b' msgstr ""' | |||||
10473 | msgid "%r cannot be used in a tag name" |
|
11641 | msgid "%r cannot be used in a tag name" | |
10474 | msgstr "" |
|
11642 | msgstr "" | |
10475 |
|
11643 | |||
|
11644 | #, python-format | |||
|
11645 | msgid "warning: tag %s conflicts with existing branch name\n" | |||
|
11646 | msgstr "" | |||
|
11647 | ||||
10476 | msgid "working copy of .hgtags is changed (please commit .hgtags manually)" |
|
11648 | msgid "working copy of .hgtags is changed (please commit .hgtags manually)" | |
10477 | msgstr "" |
|
11649 | msgstr "" | |
10478 |
|
11650 | |||
@@ -10550,89 +11722,15 b' msgstr ""' | |||||
10550 | msgid "trouble committing %s!\n" |
|
11722 | msgid "trouble committing %s!\n" | |
10551 | msgstr "" |
|
11723 | msgstr "" | |
10552 |
|
11724 | |||
10553 | #, python-format |
|
|||
10554 | msgid "%s does not exist!\n" |
|
|||
10555 | msgstr "" |
|
|||
10556 |
|
||||
10557 | #, python-format |
|
|||
10558 | msgid "" |
|
|||
10559 | "%s: up to %d MB of RAM may be required to manage this file\n" |
|
|||
10560 | "(use 'hg revert %s' to cancel the pending addition)\n" |
|
|||
10561 | msgstr "" |
|
|||
10562 | "%s: upp till %d MB RAM kan behövas för att hantera denna fil\n" |
|
|||
10563 | "(använd 'hg revert %s' för att ångra den väntande additionen)\n" |
|
|||
10564 |
|
||||
10565 | #, python-format |
|
|||
10566 | msgid "%s not added: only files and symlinks supported currently\n" |
|
|||
10567 | msgstr "" |
|
|||
10568 |
|
||||
10569 | #, python-format |
|
|||
10570 | msgid "%s already tracked!\n" |
|
|||
10571 | msgstr "" |
|
|||
10572 |
|
||||
10573 | #, python-format |
|
|||
10574 | msgid "%s not added!\n" |
|
|||
10575 | msgstr "" |
|
|||
10576 |
|
||||
10577 | #, python-format |
|
|||
10578 | msgid "%s still exists!\n" |
|
|||
10579 | msgstr "" |
|
|||
10580 |
|
||||
10581 | #, python-format |
|
|||
10582 | msgid "%s not tracked!\n" |
|
|||
10583 | msgstr "" |
|
|||
10584 |
|
||||
10585 | #, python-format |
|
|||
10586 | msgid "%s not removed!\n" |
|
|||
10587 | msgstr "" |
|
|||
10588 |
|
||||
10589 | #, python-format |
|
|||
10590 | msgid "copy failed: %s is not a file or a symbolic link\n" |
|
|||
10591 | msgstr "" |
|
|||
10592 |
|
||||
10593 | msgid "searching for changes\n" |
|
|||
10594 | msgstr "söker efter ändringar\n" |
|
|||
10595 |
|
||||
10596 | msgid "queries" |
|
|||
10597 | msgstr "frågor" |
|
|||
10598 |
|
||||
10599 | msgid "already have changeset " |
|
|||
10600 | msgstr "har redan ändringen " |
|
|||
10601 |
|
||||
10602 | msgid "warning: repository is unrelated\n" |
|
|||
10603 | msgstr "varning: arkivet är obesälktat\n" |
|
|||
10604 |
|
||||
10605 | msgid "repository is unrelated" |
|
|||
10606 | msgstr "arkivet är obesläktat" |
|
|||
10607 |
|
||||
10608 | msgid "requesting all changes\n" |
|
11725 | msgid "requesting all changes\n" | |
10609 | msgstr "efterfrågar alla ändringar\n" |
|
11726 | msgstr "efterfrågar alla ändringar\n" | |
10610 |
|
11727 | |||
10611 | msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset." |
|
11728 | msgid "" | |
10612 | msgstr "Deldragningar kan inte göras eftersom det andra arkivet inte stödjer changegroupsubset." |
|
11729 | "Partial pull cannot be done because other repository doesn't support " | |
10613 |
|
11730 | "changegroupsubset." | ||
10614 | #, python-format |
|
11731 | msgstr "" | |
10615 | msgid "abort: push creates new remote heads on branch '%s'!\n" |
|
11732 | "Deldragningar kan inte göras eftersom det andra arkivet inte stödjer " | |
10616 | msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n" |
|
11733 | "changegroupsubset." | |
10617 |
|
||||
10618 | msgid "abort: push creates new remote heads!\n" |
|
|||
10619 | msgstr "avbryter: push skapar nya fjärrhuvuden!\n" |
|
|||
10620 |
|
||||
10621 | msgid "(you should pull and merge or use push -f to force)\n" |
|
|||
10622 | msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n" |
|
|||
10623 |
|
||||
10624 | msgid "(did you forget to merge? use push -f to force)\n" |
|
|||
10625 | msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" |
|
|||
10626 |
|
||||
10627 | #, python-format |
|
|||
10628 | msgid "abort: push creates new remote branches: %s!\n" |
|
|||
10629 | msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" |
|
|||
10630 |
|
||||
10631 | msgid "(use 'hg push -f' to force)\n" |
|
|||
10632 | msgstr "använd 'hg push -f' för att tvinga)\n" |
|
|||
10633 |
|
||||
10634 | msgid "note: unsynced remote changes!\n" |
|
|||
10635 | msgstr "notera: osynkade fjärrändringar!\n" |
|
|||
10636 |
|
11734 | |||
10637 | #, python-format |
|
11735 | #, python-format | |
10638 | msgid "%d changesets found\n" |
|
11736 | msgid "%d changesets found\n" | |
@@ -10675,9 +11773,6 b' msgstr "l\xc3\xa4gger till fil\xc3\xa4ndringar\\n"' | |||||
10675 | msgid "received file revlog group is empty" |
|
11773 | msgid "received file revlog group is empty" | |
10676 | msgstr "mottagen revlog-grupp för filer är tom" |
|
11774 | msgstr "mottagen revlog-grupp för filer är tom" | |
10677 |
|
11775 | |||
10678 | msgid "files" |
|
|||
10679 | msgstr "filer" |
|
|||
10680 |
|
||||
10681 | #, python-format |
|
11776 | #, python-format | |
10682 | msgid "missing file data for %s:%s - run hg verify" |
|
11777 | msgid "missing file data for %s:%s - run hg verify" | |
10683 | msgstr "fildata för %s:%s saknas - kör hg verify" |
|
11778 | msgstr "fildata för %s:%s saknas - kör hg verify" | |
@@ -10762,7 +11857,9 b' msgid "diff context lines count must be ' | |||||
10762 | msgstr "" |
|
11857 | msgstr "" | |
10763 |
|
11858 | |||
10764 | #, python-format |
|
11859 | #, python-format | |
10765 | msgid "untracked file in working directory differs from file in requested revision: '%s'" |
|
11860 | msgid "" | |
|
11861 | "untracked file in working directory differs from file in requested revision: " | |||
|
11862 | "'%s'" | |||
10766 | msgstr "" |
|
11863 | msgstr "" | |
10767 |
|
11864 | |||
10768 | #, python-format |
|
11865 | #, python-format | |
@@ -10828,7 +11925,7 b' msgstr ""' | |||||
10828 | msgid "branch %s not found" |
|
11925 | msgid "branch %s not found" | |
10829 | msgstr "" |
|
11926 | msgstr "" | |
10830 |
|
11927 | |||
10831 | msgid "can't merge with ancestor" |
|
11928 | msgid "merging with a working directory ancestor has no effect" | |
10832 | msgstr "" |
|
11929 | msgstr "" | |
10833 |
|
11930 | |||
10834 | msgid "nothing to merge (use 'hg update' or check 'hg heads')" |
|
11931 | msgid "nothing to merge (use 'hg update' or check 'hg heads')" | |
@@ -10837,7 +11934,9 b' msgstr ""' | |||||
10837 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" |
|
11934 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" | |
10838 | msgstr "" |
|
11935 | msgstr "" | |
10839 |
|
11936 | |||
10840 | msgid "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)" |
|
11937 | msgid "" | |
|
11938 | "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " | |||
|
11939 | "changes)" | |||
10841 | msgstr "" |
|
11940 | msgstr "" | |
10842 |
|
11941 | |||
10843 | msgid "crosses branches (use 'hg merge' or use 'hg update -c')" |
|
11942 | msgid "crosses branches (use 'hg merge' or use 'hg update -c')" | |
@@ -10899,7 +11998,7 b' msgid "binary patch is %d bytes, not %d"' | |||||
10899 | msgstr "" |
|
11998 | msgstr "" | |
10900 |
|
11999 | |||
10901 | #, python-format |
|
12000 | #, python-format | |
10902 | msgid "unable to strip away %d dirs from %s" |
|
12001 | msgid "unable to strip away %d of %d dirs from %s" | |
10903 | msgstr "" |
|
12002 | msgstr "" | |
10904 |
|
12003 | |||
10905 | msgid "undefined source and destination files" |
|
12004 | msgid "undefined source and destination files" | |
@@ -10943,7 +12042,7 b' msgid "killed by signal %d"' | |||||
10943 | msgstr "" |
|
12042 | msgstr "" | |
10944 |
|
12043 | |||
10945 | #, python-format |
|
12044 | #, python-format | |
10946 |
msgid "sav |
|
12045 | msgid "saved backup bundle to %s\n" | |
10947 | msgstr "" |
|
12046 | msgstr "" | |
10948 |
|
12047 | |||
10949 | msgid "adding branch\n" |
|
12048 | msgid "adding branch\n" | |
@@ -10999,6 +12098,114 b' msgstr ""' | |||||
10999 | msgid "consistency error adding group" |
|
12098 | msgid "consistency error adding group" | |
11000 | msgstr "" |
|
12099 | msgstr "" | |
11001 |
|
12100 | |||
|
12101 | msgid "unterminated string" | |||
|
12102 | msgstr "" | |||
|
12103 | ||||
|
12104 | msgid "syntax error" | |||
|
12105 | msgstr "" | |||
|
12106 | ||||
|
12107 | msgid "missing argument" | |||
|
12108 | msgstr "" | |||
|
12109 | ||||
|
12110 | msgid "can't negate that" | |||
|
12111 | msgstr "" | |||
|
12112 | ||||
|
12113 | #, python-format | |||
|
12114 | msgid "can't use %s here" | |||
|
12115 | msgstr "" | |||
|
12116 | ||||
|
12117 | msgid "can't use a list in this context" | |||
|
12118 | msgstr "" | |||
|
12119 | ||||
|
12120 | #, python-format | |||
|
12121 | msgid "not a function: %s" | |||
|
12122 | msgstr "" | |||
|
12123 | ||||
|
12124 | msgid "limit wants two arguments" | |||
|
12125 | msgstr "" | |||
|
12126 | ||||
|
12127 | msgid "limit wants a number" | |||
|
12128 | msgstr "" | |||
|
12129 | ||||
|
12130 | msgid "limit expects a number" | |||
|
12131 | msgstr "" | |||
|
12132 | ||||
|
12133 | msgid "ancestor wants two arguments" | |||
|
12134 | msgstr "" | |||
|
12135 | ||||
|
12136 | msgid "ancestor arguments must be single revisions" | |||
|
12137 | msgstr "" | |||
|
12138 | ||||
|
12139 | msgid "follow takes no arguments" | |||
|
12140 | msgstr "" | |||
|
12141 | ||||
|
12142 | msgid "date wants a string" | |||
|
12143 | msgstr "" | |||
|
12144 | ||||
|
12145 | msgid "keyword wants a string" | |||
|
12146 | msgstr "" | |||
|
12147 | ||||
|
12148 | msgid "grep wants a string" | |||
|
12149 | msgstr "" | |||
|
12150 | ||||
|
12151 | msgid "author wants a string" | |||
|
12152 | msgstr "" | |||
|
12153 | ||||
|
12154 | msgid "file wants a pattern" | |||
|
12155 | msgstr "" | |||
|
12156 | ||||
|
12157 | msgid "contains wants a pattern" | |||
|
12158 | msgstr "" | |||
|
12159 | ||||
|
12160 | msgid "modifies wants a pattern" | |||
|
12161 | msgstr "" | |||
|
12162 | ||||
|
12163 | msgid "adds wants a pattern" | |||
|
12164 | msgstr "" | |||
|
12165 | ||||
|
12166 | msgid "removes wants a pattern" | |||
|
12167 | msgstr "" | |||
|
12168 | ||||
|
12169 | msgid "merge takes no arguments" | |||
|
12170 | msgstr "" | |||
|
12171 | ||||
|
12172 | msgid "closed takes no arguments" | |||
|
12173 | msgstr "" | |||
|
12174 | ||||
|
12175 | msgid "head takes no arguments" | |||
|
12176 | msgstr "" | |||
|
12177 | ||||
|
12178 | msgid "sort wants one or two arguments" | |||
|
12179 | msgstr "" | |||
|
12180 | ||||
|
12181 | msgid "sort spec must be a string" | |||
|
12182 | msgstr "" | |||
|
12183 | ||||
|
12184 | #, python-format | |||
|
12185 | msgid "unknown sort key %r" | |||
|
12186 | msgstr "" | |||
|
12187 | ||||
|
12188 | msgid "all takes no arguments" | |||
|
12189 | msgstr "" | |||
|
12190 | ||||
|
12191 | msgid "outgoing wants a repository path" | |||
|
12192 | msgstr "" | |||
|
12193 | ||||
|
12194 | msgid "tagged takes no arguments" | |||
|
12195 | msgstr "" | |||
|
12196 | ||||
|
12197 | msgid "not a symbol" | |||
|
12198 | msgstr "inte en symbol" | |||
|
12199 | ||||
|
12200 | msgid "empty query" | |||
|
12201 | msgstr "" | |||
|
12202 | ||||
|
12203 | msgid "searching for exact renames" | |||
|
12204 | msgstr "" | |||
|
12205 | ||||
|
12206 | msgid "searching for similar files" | |||
|
12207 | msgstr "söker efter liknande filer" | |||
|
12208 | ||||
11002 | #, python-format |
|
12209 | #, python-format | |
11003 | msgid "%s looks like a binary file." |
|
12210 | msgid "%s looks like a binary file." | |
11004 | msgstr "" |
|
12211 | msgstr "" | |
@@ -11081,8 +12288,8 b' msgid "pulling subrepo %s from %s\\n"' | |||||
11081 | msgstr "drar subarkivet %s från %s\n" |
|
12288 | msgstr "drar subarkivet %s från %s\n" | |
11082 |
|
12289 | |||
11083 | #, python-format |
|
12290 | #, python-format | |
11084 | msgid "pushing subrepo %s\n" |
|
12291 | msgid "pushing subrepo %s to %s\n" | |
11085 | msgstr "" |
|
12292 | msgstr "trycker subarkivet %s från %s\n" | |
11086 |
|
12293 | |||
11087 | msgid "cannot commit svn externals" |
|
12294 | msgid "cannot commit svn externals" | |
11088 | msgstr "" |
|
12295 | msgstr "" |
General Comments 0
You need to be logged in to leave comments.
Login now