Show More
This diff has been collapsed as it changes many lines, (1245 lines changed) Show them Hide them | |||
@@ -1,6 +1,6 b'' | |||
|
1 | 1 | # Swedish translation for Mercurial |
|
2 | 2 | # Svensk översättning för Mercurial |
|
3 |
# Copyright (C) 2009-201 |
|
|
3 | # Copyright (C) 2009-2011 Matt Mackall and others | |
|
4 | 4 | # |
|
5 | 5 | # Translation dictionary: |
|
6 | 6 | # |
@@ -13,8 +13,8 b' msgid ""' | |||
|
13 | 13 | msgstr "" |
|
14 | 14 | "Project-Id-Version: Mercurial\n" |
|
15 | 15 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
16 |
"POT-Creation-Date: 201 |
|
|
17 |
"PO-Revision-Date: 201 |
|
|
16 | "POT-Creation-Date: 2011-02-26 09:27+0100\n" | |
|
17 | "PO-Revision-Date: 2011-02-26 16:39+0100\n" | |
|
18 | 18 | "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" |
|
19 | 19 | "Language-Team: Swedish\n" |
|
20 | 20 | "Language: Swedish\n" |
@@ -42,8 +42,8 b' msgstr ""' | |||
|
42 | 42 | "Den här sektioner innehåller hjälp för utökningar som levereras med " |
|
43 | 43 | "Mercurial. Hjälp för andra utälningar är tillgängliga i hjälpsystemet." |
|
44 | 44 | |
|
45 |
msgid " |
|
|
46 |
msgstr " |
|
|
45 | msgid "Options:" | |
|
46 | msgstr "Flaggor:" | |
|
47 | 47 | |
|
48 | 48 | #, python-format |
|
49 | 49 | msgid " aliases: %s" |
@@ -292,174 +292,6 b' msgstr ""' | |||
|
292 | 292 | msgid "acl: access denied for changeset %s" |
|
293 | 293 | msgstr "" |
|
294 | 294 | |
|
295 | msgid "track a line of development with movable markers" | |
|
296 | msgstr "" | |
|
297 | ||
|
298 | msgid "" | |
|
299 | "Bookmarks are local movable markers to changesets. Every bookmark\n" | |
|
300 | "points to a changeset identified by its hash. If you commit a\n" | |
|
301 | "changeset that is based on a changeset that has a bookmark on it, the\n" | |
|
302 | "bookmark shifts to the new changeset." | |
|
303 | msgstr "" | |
|
304 | ||
|
305 | msgid "" | |
|
306 | "It is possible to use bookmark names in every revision lookup (e.g.\n" | |
|
307 | ":hg:`merge`, :hg:`update`)." | |
|
308 | msgstr "" | |
|
309 | ||
|
310 | msgid "" | |
|
311 | "By default, when several bookmarks point to the same changeset, they\n" | |
|
312 | "will all move forward together. It is possible to obtain a more\n" | |
|
313 | "git-like experience by adding the following configuration option to\n" | |
|
314 | "your configuration file::" | |
|
315 | msgstr "" | |
|
316 | ||
|
317 | msgid "" | |
|
318 | " [bookmarks]\n" | |
|
319 | " track.current = True" | |
|
320 | msgstr "" | |
|
321 | ||
|
322 | msgid "" | |
|
323 | "This will cause Mercurial to track the bookmark that you are currently\n" | |
|
324 | "using, and only update it. This is similar to git's approach to\n" | |
|
325 | "branching.\n" | |
|
326 | msgstr "" | |
|
327 | ||
|
328 | msgid "" | |
|
329 | " Bookmarks are pointers to certain commits that move when\n" | |
|
330 | " committing. Bookmarks are local. They can be renamed, copied and\n" | |
|
331 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" | |
|
332 | " :hg:`update` to merge and update respectively to a given bookmark." | |
|
333 | msgstr "" | |
|
334 | ||
|
335 | msgid "" | |
|
336 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" | |
|
337 | " directory's parent revision with the given name. If you specify\n" | |
|
338 | " a revision using -r REV (where REV may be an existing bookmark),\n" | |
|
339 | " the bookmark is assigned to that revision." | |
|
340 | msgstr "" | |
|
341 | ||
|
342 | msgid "" | |
|
343 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" | |
|
344 | " push` and :hg:`help pull`). This requires the bookmark extension to be\n" | |
|
345 | " enabled for both the local and remote repositories.\n" | |
|
346 | " " | |
|
347 | msgstr "" | |
|
348 | ||
|
349 | msgid "a bookmark of this name does not exist" | |
|
350 | msgstr "" | |
|
351 | ||
|
352 | msgid "a bookmark of the same name already exists" | |
|
353 | msgstr "" | |
|
354 | ||
|
355 | msgid "new bookmark name required" | |
|
356 | msgstr "" | |
|
357 | ||
|
358 | msgid "bookmark name required" | |
|
359 | msgstr "" | |
|
360 | ||
|
361 | msgid "bookmark name cannot contain newlines" | |
|
362 | msgstr "" | |
|
363 | ||
|
364 | msgid "bookmark names cannot consist entirely of whitespace" | |
|
365 | msgstr "bokmärksnamn kan inte bestå enbart av blanktecken" | |
|
366 | ||
|
367 | msgid "a bookmark cannot have the name of an existing branch" | |
|
368 | msgstr "" | |
|
369 | ||
|
370 | msgid "no bookmarks set\n" | |
|
371 | msgstr "inga bokmärken satta\n" | |
|
372 | ||
|
373 | #, python-format | |
|
374 | msgid "updating bookmark %s\n" | |
|
375 | msgstr "uppdaterar bokmärket %s\n" | |
|
376 | ||
|
377 | #, python-format | |
|
378 | msgid "not updating divergent bookmark %s\n" | |
|
379 | msgstr "" | |
|
380 | ||
|
381 | #, python-format | |
|
382 | msgid "updating bookmark %s failed!\n" | |
|
383 | msgstr "uppdatering av bokmärket %s misslyckades!\n" | |
|
384 | ||
|
385 | #, python-format | |
|
386 | msgid "remote bookmark %s not found!" | |
|
387 | msgstr "" | |
|
388 | ||
|
389 | #, python-format | |
|
390 | msgid "importing bookmark %s\n" | |
|
391 | msgstr "importerar bokmärket %s\n" | |
|
392 | ||
|
393 | #, python-format | |
|
394 | msgid "exporting bookmark %s\n" | |
|
395 | msgstr "exporterar bokmärket %s\n" | |
|
396 | ||
|
397 | #, python-format | |
|
398 | msgid "deleting remote bookmark %s\n" | |
|
399 | msgstr "raderar fjärrbokmärket %s\n" | |
|
400 | ||
|
401 | #, python-format | |
|
402 | msgid "bookmark %s does not exist on the local or remote repository!\n" | |
|
403 | msgstr "bokmärket %s existerar inte i lokal- eller fjärrarkiv!\n" | |
|
404 | ||
|
405 | msgid "searching for changed bookmarks\n" | |
|
406 | msgstr "söker efter ändrade bokmärken\n" | |
|
407 | ||
|
408 | msgid "no changed bookmarks found\n" | |
|
409 | msgstr "inga ändrade bokmärken hittades\n" | |
|
410 | ||
|
411 | #, python-format | |
|
412 | msgid "comparing with %s\n" | |
|
413 | msgstr "jämför med %s\n" | |
|
414 | ||
|
415 | msgid "bookmark to import" | |
|
416 | msgstr "bokmärke att importera" | |
|
417 | ||
|
418 | msgid "BOOKMARK" | |
|
419 | msgstr "BOKMÄRKE" | |
|
420 | ||
|
421 | msgid "bookmark to export" | |
|
422 | msgstr "bokmärke att exportera" | |
|
423 | ||
|
424 | msgid "compare bookmark" | |
|
425 | msgstr "jämför bokmärke" | |
|
426 | ||
|
427 | msgid "" | |
|
428 | "``bookmark([name])``\n" | |
|
429 | " The named bookmark or all bookmarks." | |
|
430 | msgstr "" | |
|
431 | "``bookmark([namn])``\n" | |
|
432 | " Det angivna bokmärket eller alla bokmärken." | |
|
433 | ||
|
434 | #. i18n: "bookmark" is a keyword | |
|
435 | msgid "bookmark takes one or no arguments" | |
|
436 | msgstr "bookmark tar ett eller inga argument" | |
|
437 | ||
|
438 | #. i18n: "bookmark" is a keyword | |
|
439 | msgid "the argument to bookmark must be a string" | |
|
440 | msgstr "argumentet till bookmark måste vara en sträng" | |
|
441 | ||
|
442 | msgid "force" | |
|
443 | msgstr "tvinga" | |
|
444 | ||
|
445 | msgid "REV" | |
|
446 | msgstr "REV" | |
|
447 | ||
|
448 | msgid "revision" | |
|
449 | msgstr "revision" | |
|
450 | ||
|
451 | msgid "delete a given bookmark" | |
|
452 | msgstr "" | |
|
453 | ||
|
454 | msgid "NAME" | |
|
455 | msgstr "NAMN" | |
|
456 | ||
|
457 | msgid "rename a given bookmark" | |
|
458 | msgstr "" | |
|
459 | ||
|
460 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" | |
|
461 | msgstr "" | |
|
462 | ||
|
463 | 295 | msgid "hooks for integrating with the Bugzilla bug tracker" |
|
464 | 296 | msgstr "" |
|
465 | 297 | |
@@ -744,6 +576,9 b' msgid ""' | |||
|
744 | 576 | " " |
|
745 | 577 | msgstr "" |
|
746 | 578 | |
|
579 | msgid "REV" | |
|
580 | msgstr "REV" | |
|
581 | ||
|
747 | 582 | msgid "show children of the specified revision" |
|
748 | 583 | msgstr "" |
|
749 | 584 | |
@@ -1066,10 +901,10 b' msgid ""' | |||
|
1066 | 901 | msgstr "" |
|
1067 | 902 | |
|
1068 | 903 | msgid "" |
|
1069 |
" If |
|
|
1070 |
" (<dest>/.hg/shamap by default). The |
|
|
1071 |
" that maps each source commit ID to the destination ID |
|
|
1072 | " revision, like so::" | |
|
904 | " If ``REVMAP`` isn't given, it will be put in a default location\n" | |
|
905 | " (``<dest>/.hg/shamap`` by default). The ``REVMAP`` is a simple\n" | |
|
906 | " text file that maps each source commit ID to the destination ID\n" | |
|
907 | " for that revision, like so::" | |
|
1073 | 908 | msgstr "" |
|
1074 | 909 | |
|
1075 | 910 | msgid " <source ID> <destination ID>" |
@@ -1177,15 +1012,25 b' msgstr ""' | |||
|
1177 | 1012 | " '''''''''''''''" |
|
1178 | 1013 | |
|
1179 | 1014 | msgid "" |
|
1180 | " --config convert.hg.ignoreerrors=False (boolean)\n" | |
|
1181 | " ignore integrity errors when reading. Use it to fix Mercurial\n" | |
|
1182 | " repositories with missing revlogs, by converting from and to\n" | |
|
1183 | " Mercurial.\n" | |
|
1184 | " --config convert.hg.saverev=False (boolean)\n" | |
|
1185 | " store original revision ID in changeset (forces target IDs to\n" | |
|
1186 | " change)\n" | |
|
1187 | " --config convert.hg.startrev=0 (hg revision identifier)\n" | |
|
1188 | " convert start revision and its descendants" | |
|
1015 | " The Mercurial source recognizes the following configuration\n" | |
|
1016 | " options, which you can set on the command line with ``--config``:" | |
|
1017 | msgstr "" | |
|
1018 | ||
|
1019 | msgid "" | |
|
1020 | " :convert.hg.ignoreerrors: ignore integrity errors when reading.\n" | |
|
1021 | " Use it to fix Mercurial repositories with missing revlogs, by\n" | |
|
1022 | " converting from and to Mercurial. Default is False." | |
|
1023 | msgstr "" | |
|
1024 | ||
|
1025 | msgid "" | |
|
1026 | " :convert.hg.saverev: store original revision ID in changeset\n" | |
|
1027 | " (forces target IDs to change). It takes and boolean argument\n" | |
|
1028 | " and defaults to False." | |
|
1029 | msgstr "" | |
|
1030 | ||
|
1031 | msgid "" | |
|
1032 | " :convert.hg.startrev: convert start revision and its descendants.\n" | |
|
1033 | " It takes a hg revision identifier and defaults to 0." | |
|
1189 | 1034 | msgstr "" |
|
1190 | 1035 | |
|
1191 | 1036 | msgid "" |
@@ -1199,45 +1044,59 b' msgid ""' | |||
|
1199 | 1044 | " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" |
|
1200 | 1045 | " to indicate the starting point of what will be converted. Direct\n" |
|
1201 | 1046 | " access to the repository files is not needed, unless of course the\n" |
|
1202 |
" repository is :local:. The conversion uses the top level |
|
|
1203 |
" in the sandbox to find the CVS repository, and then uses |
|
|
1204 |
" commands to find files to convert. This means that unless |
|
|
1205 | " filemap is given, all files under the starting directory will be\n" | |
|
1047 | " repository is ``:local:``. The conversion uses the top level\n" | |
|
1048 | " directory in the sandbox to find the CVS repository, and then uses\n" | |
|
1049 | " CVS rlog commands to find files to convert. This means that unless\n" | |
|
1050 | " a filemap is given, all files under the starting directory will be\n" | |
|
1206 | 1051 | " converted, and that any directory reorganization in the CVS\n" |
|
1207 | 1052 | " sandbox is ignored." |
|
1208 | 1053 | msgstr "" |
|
1209 | 1054 | |
|
1210 | msgid " The options shown are the defaults." | |
|
1211 | msgstr "" | |
|
1212 | ||
|
1213 | msgid "" | |
|
1214 | " --config convert.cvsps.cache=True (boolean)\n" | |
|
1215 | " Set to False to disable remote log caching, for testing and\n" | |
|
1216 | " debugging purposes.\n" | |
|
1217 | " --config convert.cvsps.fuzz=60 (integer)\n" | |
|
1218 | " Specify the maximum time (in seconds) that is allowed between\n" | |
|
1219 | " commits with identical user and log message in a single\n" | |
|
1220 | " changeset. When very large files were checked in as part of a\n" | |
|
1221 | " changeset then the default may not be long enough.\n" | |
|
1222 | " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" | |
|
1223 | " Specify a regular expression to which commit log messages are\n" | |
|
1224 | " matched. If a match occurs, then the conversion process will\n" | |
|
1225 | " insert a dummy revision merging the branch on which this log\n" | |
|
1226 | " message occurs to the branch indicated in the regex.\n" | |
|
1227 | " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" | |
|
1228 | " Specify a regular expression to which commit log messages are\n" | |
|
1229 | " matched. If a match occurs, then the conversion process will\n" | |
|
1230 | " add the most recent revision on the branch indicated in the\n" | |
|
1231 | " regex as the second parent of the changeset.\n" | |
|
1232 | " --config hook.cvslog\n" | |
|
1233 | " Specify a Python function to be called at the end of gathering\n" | |
|
1234 | " the CVS log. The function is passed a list with the log entries,\n" | |
|
1235 | " and can modify the entries in-place, or add or delete them.\n" | |
|
1236 | " --config hook.cvschangesets\n" | |
|
1237 | " Specify a Python function to be called after the changesets\n" | |
|
1238 | " are calculated from the the CVS log. The function is passed\n" | |
|
1239 | " a list with the changeset entries, and can modify the changesets\n" | |
|
1240 | " in-place, or add or delete them." | |
|
1055 | msgid " The following options can be used with ``--config``:" | |
|
1056 | msgstr "" | |
|
1057 | ||
|
1058 | msgid "" | |
|
1059 | " :convert.cvsps.cache: Set to False to disable remote log caching,\n" | |
|
1060 | " for testing and debugging purposes. Default is True." | |
|
1061 | msgstr "" | |
|
1062 | ||
|
1063 | msgid "" | |
|
1064 | " :convert.cvsps.fuzz: Specify the maximum time (in seconds) that is\n" | |
|
1065 | " allowed between commits with identical user and log message in\n" | |
|
1066 | " a single changeset. When very large files were checked in as\n" | |
|
1067 | " part of a changeset then the default may not be long enough.\n" | |
|
1068 | " The default is 60." | |
|
1069 | msgstr "" | |
|
1070 | ||
|
1071 | msgid "" | |
|
1072 | " :convert.cvsps.mergeto: Specify a regular expression to which\n" | |
|
1073 | " commit log messages are matched. If a match occurs, then the\n" | |
|
1074 | " conversion process will insert a dummy revision merging the\n" | |
|
1075 | " branch on which this log message occurs to the branch\n" | |
|
1076 | " indicated in the regex. Default is ``{{mergetobranch\n" | |
|
1077 | " ([-\\w]+)}}``" | |
|
1078 | msgstr "" | |
|
1079 | ||
|
1080 | msgid "" | |
|
1081 | " :convert.cvsps.mergefrom: Specify a regular expression to which\n" | |
|
1082 | " commit log messages are matched. If a match occurs, then the\n" | |
|
1083 | " conversion process will add the most recent revision on the\n" | |
|
1084 | " branch indicated in the regex as the second parent of the\n" | |
|
1085 | " changeset. Default is ``{{mergefrombranch ([-\\w]+)}}``" | |
|
1086 | msgstr "" | |
|
1087 | ||
|
1088 | msgid "" | |
|
1089 | " :hook.cvslog: Specify a Python function to be called at the end of\n" | |
|
1090 | " gathering the CVS log. The function is passed a list with the\n" | |
|
1091 | " log entries, and can modify the entries in-place, or add or\n" | |
|
1092 | " delete them." | |
|
1093 | msgstr "" | |
|
1094 | ||
|
1095 | msgid "" | |
|
1096 | " :hook.cvschangesets: Specify a Python function to be called after\n" | |
|
1097 | " the changesets are calculated from the the CVS log. The\n" | |
|
1098 | " function is passed a list with the changeset entries, and can\n" | |
|
1099 | " modify the changesets in-place, or add or delete them." | |
|
1241 | 1100 | msgstr "" |
|
1242 | 1101 | |
|
1243 | 1102 | msgid "" |
@@ -1256,24 +1115,33 b' msgstr ""' | |||
|
1256 | 1115 | |
|
1257 | 1116 | msgid "" |
|
1258 | 1117 | " Subversion source detects classical trunk/branches/tags layouts.\n" |
|
1259 |
" By default, the supplied |
|
|
1260 |
" converted as a single branch. If |
|
|
1261 |
" replaces the default branch. If |
|
|
1262 | " its subdirectories are listed as possible branches. If\n" | |
|
1263 |
" |
|
|
1264 |
" converted branches. Default |
|
|
1265 | " can be overridden with following options. Set them to paths\n" | |
|
1118 | " By default, the supplied ``svn://repo/path/`` source URL is\n" | |
|
1119 | " converted as a single branch. If ``svn://repo/path/trunk`` exists\n" | |
|
1120 | " it replaces the default branch. If ``svn://repo/path/branches``\n" | |
|
1121 | " exists, its subdirectories are listed as possible branches. If\n" | |
|
1122 | " ``svn://repo/path/tags`` exists, it is looked for tags referencing\n" | |
|
1123 | " converted branches. Default ``trunk``, ``branches`` and ``tags``\n" | |
|
1124 | " values can be overridden with following options. Set them to paths\n" | |
|
1266 | 1125 | " relative to the source URL, or leave them blank to disable auto\n" |
|
1267 | 1126 | " detection." |
|
1268 | 1127 | msgstr "" |
|
1269 | 1128 | |
|
1270 | msgid "" | |
|
1271 | " --config convert.svn.branches=branches (directory name)\n" | |
|
1272 | " specify the directory containing branches\n" | |
|
1273 | " --config convert.svn.tags=tags (directory name)\n" | |
|
1274 |
" |
|
|
1275 | " --config convert.svn.trunk=trunk (directory name)\n" | |
|
1276 | " specify the name of the trunk branch" | |
|
1129 | msgid " The following options can be set with ``--config``:" | |
|
1130 | msgstr "" | |
|
1131 | ||
|
1132 | msgid "" | |
|
1133 | " :convert.svn.branches: specify the directory containing branches.\n" | |
|
1134 | " The defaults is ``branches``." | |
|
1135 | msgstr "" | |
|
1136 | ||
|
1137 | msgid "" | |
|
1138 | " :convert.svn.tags: specify the directory containing tags. The\n" | |
|
1139 | " default is ``tags``." | |
|
1140 | msgstr "" | |
|
1141 | ||
|
1142 | msgid "" | |
|
1143 | " :convert.svn.trunk: specify the name of the trunk branch The\n" | |
|
1144 | " defauls is ``trunk``." | |
|
1277 | 1145 | msgstr "" |
|
1278 | 1146 | |
|
1279 | 1147 | msgid "" |
@@ -1283,8 +1151,8 b' msgid ""' | |||
|
1283 | 1151 | msgstr "" |
|
1284 | 1152 | |
|
1285 | 1153 | msgid "" |
|
1286 |
" |
|
|
1287 | " specify start Subversion revision." | |
|
1154 | " :convert.svn.startrev: specify start Subversion revision number.\n" | |
|
1155 | " The default is 0." | |
|
1288 | 1156 | msgstr "" |
|
1289 | 1157 | |
|
1290 | 1158 | msgid "" |
@@ -1300,17 +1168,17 b' msgid ""' | |||
|
1300 | 1168 | " source to a flat Mercurial repository, ignoring labels, branches\n" |
|
1301 | 1169 | " and integrations. Note that when a depot path is given you then\n" |
|
1302 | 1170 | " usually should specify a target directory, because otherwise the\n" |
|
1303 | " target may be named ...-hg." | |
|
1171 | " target may be named ``...-hg``." | |
|
1304 | 1172 | msgstr "" |
|
1305 | 1173 | |
|
1306 | 1174 | msgid "" |
|
1307 | 1175 | " It is possible to limit the amount of source history to be\n" |
|
1308 |
" converted by specifying an initial Perforce revision |
|
|
1309 | msgstr "" | |
|
1310 | ||
|
1311 | msgid "" | |
|
1312 | " --config convert.p4.startrev=0 (perforce changelist number)\n" | |
|
1313 | " specify initial Perforce revision." | |
|
1176 | " converted by specifying an initial Perforce revision:" | |
|
1177 | msgstr "" | |
|
1178 | ||
|
1179 | msgid "" | |
|
1180 | " :convert.p4.startrev: specify initial Perforce revision (a\n" | |
|
1181 | " Perforce changelist number)." | |
|
1314 | 1182 | msgstr "" |
|
1315 | 1183 | |
|
1316 | 1184 | msgid "" |
@@ -1320,16 +1188,23 b' msgstr ""' | |||
|
1320 | 1188 | " Mercurial-destination\n" |
|
1321 | 1189 | " '''''''''''''''''''''" |
|
1322 | 1190 | |
|
1323 | msgid "" | |
|
1324 | " --config convert.hg.clonebranches=False (boolean)\n" | |
|
1325 | " dispatch source branches in separate clones.\n" | |
|
1326 | " --config convert.hg.tagsbranch=default (branch name)\n" | |
|
1327 | " tag revisions branch name\n" | |
|
1328 | " --config convert.hg.usebranchnames=True (boolean)\n" | |
|
1329 | " preserve branch names" | |
|
1330 | msgstr "" | |
|
1331 | ||
|
1332 | msgid " " | |
|
1191 | msgid " The following options are supported:" | |
|
1192 | msgstr "" | |
|
1193 | ||
|
1194 | msgid "" | |
|
1195 | " :convert.hg.clonebranches: dispatch source branches in separate\n" | |
|
1196 | " clones. The default is False." | |
|
1197 | msgstr "" | |
|
1198 | ||
|
1199 | msgid "" | |
|
1200 | " :convert.hg.tagsbranch: branch name for tag revisions, defaults to\n" | |
|
1201 | " ``default``." | |
|
1202 | msgstr "" | |
|
1203 | ||
|
1204 | msgid "" | |
|
1205 | " :convert.hg.usebranchnames: preserve branch names. The default is\n" | |
|
1206 | " True.\n" | |
|
1207 | " " | |
|
1333 | 1208 | msgstr "" |
|
1334 | 1209 | |
|
1335 | 1210 | msgid "create changeset information from CVS" |
@@ -1477,6 +1352,10 b' msgid "convert: %s\\n"' | |||
|
1477 | 1352 | msgstr "convert: %s\n" |
|
1478 | 1353 | |
|
1479 | 1354 | #, python-format |
|
1355 | msgid "%s\n" | |
|
1356 | msgstr "%s\n" | |
|
1357 | ||
|
1358 | #, python-format | |
|
1480 | 1359 | msgid "%s: unknown repository type" |
|
1481 | 1360 | msgstr "%s: okänd arkivtyp" |
|
1482 | 1361 | |
@@ -1784,7 +1663,7 b' msgstr ""' | |||
|
1784 | 1663 | msgid "%s does not look like a Subversion repository" |
|
1785 | 1664 | msgstr "%s verkar inte vara ett Subversion-arkiv" |
|
1786 | 1665 | |
|
1787 |
msgid "Subversion python bindings |
|
|
1666 | msgid "Could not load Subversion python bindings" | |
|
1788 | 1667 | msgstr "" |
|
1789 | 1668 | |
|
1790 | 1669 | #, python-format |
@@ -1877,7 +1756,7 b' msgstr ""' | |||
|
1877 | 1756 | |
|
1878 | 1757 | msgid "" |
|
1879 | 1758 | "The extension reads its configuration from a versioned ``.hgeol``\n" |
|
1880 |
"configuration file |
|
|
1759 | "configuration file found in the root of the working copy. The\n" | |
|
1881 | 1760 | "``.hgeol`` file use the same syntax as all other Mercurial\n" |
|
1882 | 1761 | "configuration files. It uses two sections, ``[patterns]`` and\n" |
|
1883 | 1762 | "``[repository]``." |
@@ -1959,6 +1838,13 b' msgid ""' | |||
|
1959 | 1838 | msgstr "" |
|
1960 | 1839 | |
|
1961 | 1840 | msgid "" |
|
1841 | "The extension provides ``cleverencode:`` and ``cleverdecode:`` filters\n" | |
|
1842 | "like the deprecated win32text extension does. This means that you can\n" | |
|
1843 | "disable win32text and enable eol and your filters will still work. You\n" | |
|
1844 | "only need to these filters until you have prepared a ``.hgeol`` file." | |
|
1845 | msgstr "" | |
|
1846 | ||
|
1847 | msgid "" | |
|
1962 | 1848 | "The ``win32text.forbid*`` hooks provided by the win32text extension\n" |
|
1963 | 1849 | "have been unified into a single hook named ``eol.hook``. The hook will\n" |
|
1964 | 1850 | "lookup the expected line endings from the ``.hgeol`` file, which means\n" |
@@ -2119,6 +2005,9 b' msgstr ""' | |||
|
2119 | 2005 | msgid "pass option to comparison program" |
|
2120 | 2006 | msgstr "" |
|
2121 | 2007 | |
|
2008 | msgid "revision" | |
|
2009 | msgstr "revision" | |
|
2010 | ||
|
2122 | 2011 | msgid "change made by revision" |
|
2123 | 2012 | msgstr "ändring gjord av revision" |
|
2124 | 2013 | |
@@ -2847,9 +2736,8 b' msgid ""' | |||
|
2847 | 2736 | msgstr "" |
|
2848 | 2737 | |
|
2849 | 2738 | msgid "" |
|
2850 |
"Before changing/disabling active keywords, run :hg:`kwshrink` |
|
|
2851 |
"t |
|
|
2852 | "history." | |
|
2739 | "Before changing/disabling active keywords, you must run :hg:`kwshrink`\n" | |
|
2740 | "to avoid storing expanded keywords in the change history." | |
|
2853 | 2741 | msgstr "" |
|
2854 | 2742 | |
|
2855 | 2743 | msgid "" |
@@ -2912,12 +2800,20 b' msgstr ""' | |||
|
2912 | 2800 | msgid "\textending current template maps\n" |
|
2913 | 2801 | msgstr "" |
|
2914 | 2802 | |
|
2915 |
msgid "\toverriding default |
|
|
2803 | msgid "\toverriding default svn keywordset\n" | |
|
2804 | msgstr "" | |
|
2805 | ||
|
2806 | msgid "\toverriding default cvs keywordset\n" | |
|
2916 | 2807 | msgstr "" |
|
2917 | 2808 | |
|
2918 | 2809 | msgid "" |
|
2919 | 2810 | "\n" |
|
2920 |
"\tconfiguration using default keyword |
|
|
2811 | "\tconfiguration using default svn keywordset\n" | |
|
2812 | msgstr "" | |
|
2813 | ||
|
2814 | msgid "" | |
|
2815 | "\n" | |
|
2816 | "\tconfiguration using default cvs keywordset\n" | |
|
2921 | 2817 | msgstr "" |
|
2922 | 2818 | |
|
2923 | 2819 | msgid "\tdisabling current template maps\n" |
@@ -2988,9 +2884,7 b' msgstr ""' | |||
|
2988 | 2884 | msgid "revert expanded keywords in the working directory" |
|
2989 | 2885 | msgstr "" |
|
2990 | 2886 | |
|
2991 | msgid "" | |
|
2992 | " Run before changing/disabling active keywords or if you experience\n" | |
|
2993 | " problems with :hg:`import` or :hg:`merge`." | |
|
2887 | msgid " Must be run before changing/disabling active keywords." | |
|
2994 | 2888 | msgstr "" |
|
2995 | 2889 | |
|
2996 | 2890 | msgid "" |
@@ -3026,48 +2920,65 b' msgid "hg kwshrink [OPTION]... [FILE]...' | |||
|
3026 | 2920 | msgstr "" |
|
3027 | 2921 | |
|
3028 | 2922 | msgid "manage a stack of patches" |
|
3029 | msgstr "" | |
|
2923 | msgstr "hantera en uppsättning patchar" | |
|
3030 | 2924 | |
|
3031 | 2925 | msgid "" |
|
3032 | 2926 | "This extension lets you work with a stack of patches in a Mercurial\n" |
|
3033 | 2927 | "repository. It manages two stacks of patches - all known patches, and\n" |
|
3034 | 2928 | "applied patches (subset of known patches)." |
|
3035 | 2929 | msgstr "" |
|
2930 | "Denna utökning låter dej arbeta med en uppsättning patchar inuti ett\n" | |
|
2931 | "Mercurial-arkiv. Den hantera två uppsättningar med patchar - alla kända\n" | |
|
2932 | "patchar, och applicerade patchar (delmängd av kända patchar)." | |
|
3036 | 2933 | |
|
3037 | 2934 | msgid "" |
|
3038 | 2935 | "Known patches are represented as patch files in the .hg/patches\n" |
|
3039 | 2936 | "directory. Applied patches are both patch files and changesets." |
|
3040 | 2937 | msgstr "" |
|
2938 | "Kända patchar representeras av patchfiler i katalogen .hg/patches.\n" | |
|
2939 | "Applicerade patchar är både patchfiler och ändringar." | |
|
3041 | 2940 | |
|
3042 | 2941 | msgid "Common tasks (use :hg:`help command` for more details)::" |
|
3043 | msgstr "" | |
|
2942 | msgstr "Vanliga kommandon (använd :hg:`help command` för mer detaljer):" | |
|
3044 | 2943 | |
|
3045 | 2944 | msgid "" |
|
3046 | 2945 | " create new patch qnew\n" |
|
3047 | 2946 | " import existing patch qimport" |
|
3048 | 2947 | msgstr "" |
|
2948 | " skapa ny patch qnew\n" | |
|
2949 | " importera existerande patch qimport" | |
|
3049 | 2950 | |
|
3050 | 2951 | msgid "" |
|
3051 | 2952 | " print patch series qseries\n" |
|
3052 | 2953 | " print applied patches qapplied" |
|
3053 | 2954 | msgstr "" |
|
2955 | " skriv ut patchserie qseries\n" | |
|
2956 | " skriv ut applicerade patchar qapplied" | |
|
3054 | 2957 | |
|
3055 | 2958 | msgid "" |
|
3056 | 2959 | " add known patch to applied stack qpush\n" |
|
3057 | 2960 | " remove patch from applied stack qpop\n" |
|
3058 | 2961 | " refresh contents of top applied patch qrefresh" |
|
3059 | 2962 | msgstr "" |
|
2963 | " applicera en redan känd patch qpush\n" | |
|
2964 | " ta port en applicerad patch qpop\n" | |
|
2965 | " uppdatera innehållet i senaste patchen qrefresh" | |
|
3060 | 2966 | |
|
3061 | 2967 | msgid "" |
|
3062 | 2968 | "By default, mq will automatically use git patches when required to\n" |
|
3063 | 2969 | "avoid losing file mode changes, copy records, binary files or empty\n" |
|
3064 | 2970 | "files creations or deletions. This behaviour can be configured with::" |
|
3065 | 2971 | msgstr "" |
|
2972 | "Som standard kommer mq automagiskt att använda git-patchar när det behövs\n" | |
|
2973 | "för att inte förlora ändring av filläge, kopieringar, binära filer eller\n" | |
|
2974 | "skapande/raderande av tomma filer. Detta beteende kan konfigureras med::" | |
|
3066 | 2975 | |
|
3067 | 2976 | msgid "" |
|
3068 | 2977 | " [mq]\n" |
|
3069 | 2978 | " git = auto/keep/yes/no" |
|
3070 | 2979 | msgstr "" |
|
2980 | " [mq]\n" | |
|
2981 | " git = auto/keep/yes/no" | |
|
3071 | 2982 | |
|
3072 | 2983 | msgid "" |
|
3073 | 2984 | "If set to 'keep', mq will obey the [diff] section configuration while\n" |
@@ -3075,22 +2986,29 b' msgid ""' | |||
|
3075 | 2986 | "'no', mq will override the [diff] section and always generate git or\n" |
|
3076 | 2987 | "regular patches, possibly losing data in the second case." |
|
3077 | 2988 | msgstr "" |
|
2989 | "Om satt till 'keep' så kommer mq att lyda sektionen [diff] i\n" | |
|
2990 | "konfigurationen medans existerande git-patchas bevaras vid qrefresh. Om\n" | |
|
2991 | "satt till 'yes' eller 'no', kommer mq att ignorera sektionen [diff] och\n" | |
|
2992 | "alltid generera git- eller vanliga patchar, även om data kan tappas i det\n" | |
|
2993 | "andra fallet." | |
|
3078 | 2994 | |
|
3079 | 2995 | msgid "" |
|
3080 | 2996 | "You will by default be managing a patch queue named \"patches\". You can\n" |
|
3081 | 2997 | "create other, independent patch queues with the :hg:`qqueue` command.\n" |
|
3082 | 2998 | msgstr "" |
|
2999 | "Du kommer som standard att handera en patchkö vid namn \"patches\". Du\n" | |
|
3000 | "kan skapa en ny, oberoende patchkö med kommandot :hg:`qqueue`.\n" | |
|
3083 | 3001 | |
|
3084 | 3002 | #, python-format |
|
3085 | 3003 | msgid "mq.git option can be auto/keep/yes/no got %s" |
|
3086 | msgstr "" | |
|
3004 | msgstr "mq.git kan vara auto/keep/yes/no men läste %s" | |
|
3087 | 3005 | |
|
3088 | 3006 | #, python-format |
|
3089 | 3007 | msgid "%s appears more than once in %s" |
|
3090 | msgstr "" | |
|
3008 | msgstr "%s finns mer än en gång i %s" | |
|
3091 | 3009 | |
|
3092 | 3010 | msgid "guard cannot be an empty string" |
|
3093 | msgstr "" | |
|
3011 | msgstr "guard kan inte vara en tom sträng" | |
|
3094 | 3012 | |
|
3095 | 3013 | #, python-format |
|
3096 | 3014 | msgid "guard %r starts with invalid character: %r" |
@@ -3212,6 +3130,10 b' msgstr ""' | |||
|
3212 | 3130 | msgid "working directory revision is not qtip" |
|
3213 | 3131 | msgstr "" |
|
3214 | 3132 | |
|
3133 | #, python-format | |
|
3134 | msgid "uncommitted changes in subrepository %s" | |
|
3135 | msgstr "oarkiverade ändringar i underarkivet %s" | |
|
3136 | ||
|
3215 | 3137 | msgid "local changes found, refresh first" |
|
3216 | 3138 | msgstr "" |
|
3217 | 3139 | |
@@ -3256,14 +3178,14 b' msgid "no patches in series\\n"' | |||
|
3256 | 3178 | msgstr "" |
|
3257 | 3179 | |
|
3258 | 3180 | #, python-format |
|
3181 | msgid "qpush: %s is already at the top\n" | |
|
3182 | msgstr "qpush: %s är redan på toppen\n" | |
|
3183 | ||
|
3184 | #, python-format | |
|
3259 | 3185 | msgid "cannot push to a previous patch: %s" |
|
3260 | 3186 | msgstr "" |
|
3261 | 3187 | |
|
3262 | 3188 | #, python-format |
|
3263 | msgid "qpush: %s is already at the top\n" | |
|
3264 | msgstr "" | |
|
3265 | ||
|
3266 | #, python-format | |
|
3267 | 3189 | msgid "guarded by %r" |
|
3268 | 3190 | msgstr "" |
|
3269 | 3191 | |
@@ -3280,6 +3202,16 b' msgstr ""' | |||
|
3280 | 3202 | msgid "patch series already fully applied\n" |
|
3281 | 3203 | msgstr "" |
|
3282 | 3204 | |
|
3205 | msgid "cannot use --exact and --move together" | |
|
3206 | msgstr "kan inte använda --exact och --move tillsammans" | |
|
3207 | ||
|
3208 | msgid "cannot push --exact with applied patches" | |
|
3209 | msgstr "kan inte trycka --exakt med applicerade patchar" | |
|
3210 | ||
|
3211 | #, python-format | |
|
3212 | msgid "%s does not have a parent recorded" | |
|
3213 | msgstr "%s har inte en angiven förälder" | |
|
3214 | ||
|
3283 | 3215 | msgid "please specify the patch to move" |
|
3284 | 3216 | msgstr "ange patchen som ska flyttas" |
|
3285 | 3217 | |
@@ -3328,18 +3260,6 b' msgstr ""' | |||
|
3328 | 3260 | msgid "cannot refresh a revision with children" |
|
3329 | 3261 | msgstr "" |
|
3330 | 3262 | |
|
3331 | #, python-format | |
|
3332 | msgid "warning: not refreshing %s\n" | |
|
3333 | msgstr "varning: uppdaterar inte %s\n" | |
|
3334 | ||
|
3335 | #, python-format | |
|
3336 | msgid "warning: not adding %s\n" | |
|
3337 | msgstr "varning: lägger inte till %s\n" | |
|
3338 | ||
|
3339 | #, python-format | |
|
3340 | msgid "warning: not removing %s\n" | |
|
3341 | msgstr "varning: tar inte bort %s\n" | |
|
3342 | ||
|
3343 | 3263 | msgid "" |
|
3344 | 3264 | "refresh interrupted while patch was popped! (revert --all, qpush to " |
|
3345 | 3265 | "recover)\n" |
@@ -3459,22 +3379,22 b' msgid ""' | |||
|
3459 | 3379 | msgstr "" |
|
3460 | 3380 | |
|
3461 | 3381 | msgid "print the patches already applied" |
|
3462 | msgstr "" | |
|
3382 | msgstr "skriv ut redan applicerade patchar" | |
|
3463 | 3383 | |
|
3464 | 3384 | msgid " Returns 0 on success." |
|
3465 | 3385 | msgstr " Returnerar 0 om kommandot lyckades." |
|
3466 | 3386 | |
|
3467 | 3387 | msgid "only one patch applied\n" |
|
3468 | msgstr "" | |
|
3388 | msgstr "bara en patch applicerad\n" | |
|
3469 | 3389 | |
|
3470 | 3390 | msgid "print the patches not yet applied" |
|
3471 | msgstr "" | |
|
3391 | msgstr "skriv ut oapplicerade patchar" | |
|
3472 | 3392 | |
|
3473 | 3393 | msgid "all patches applied\n" |
|
3474 | msgstr "" | |
|
3394 | msgstr "alla patchar applicerade\n" | |
|
3475 | 3395 | |
|
3476 | 3396 | msgid "import a patch" |
|
3477 | msgstr "" | |
|
3397 | msgstr "importera en patch" | |
|
3478 | 3398 | |
|
3479 | 3399 | msgid "" |
|
3480 | 3400 | " The patch is inserted into the series after the last applied\n" |
@@ -4014,7 +3934,7 b' msgid " (active)\\n"' | |||
|
4014 | 3934 | msgstr " (aktiv)\n" |
|
4015 | 3935 | |
|
4016 | 3936 | msgid "invalid queue name, may not contain the characters \":\\/.\"" |
|
4017 | msgstr "" | |
|
3937 | msgstr "ogiltigt könamn, kan inte innehålla tecknen \":\\/.\"" | |
|
4018 | 3938 | |
|
4019 | 3939 | #, python-format |
|
4020 | 3940 | msgid "queue \"%s\" already exists" |
@@ -4046,7 +3966,7 b' msgid "Tag %s overrides mq patch of the ' | |||
|
4046 | 3966 | msgstr "" |
|
4047 | 3967 | |
|
4048 | 3968 | msgid "cannot import over an applied patch" |
|
4049 | msgstr "" | |
|
3969 | msgstr "kan inte importera över en applicerad patch" | |
|
4050 | 3970 | |
|
4051 | 3971 | msgid "only a local queue repository may be initialized" |
|
4052 | 3972 | msgstr "bara ett lokalt köarkiv kan initialiseras" |
@@ -4072,19 +3992,19 b' msgid "operate on patch repository"' | |||
|
4072 | 3992 | msgstr "arbeta med patcharkiv" |
|
4073 | 3993 | |
|
4074 | 3994 | msgid "print first line of patch header" |
|
4075 | msgstr "" | |
|
3995 | msgstr "skriv ut första raden i patchheadern" | |
|
4076 | 3996 | |
|
4077 | 3997 | msgid "show only the last patch" |
|
4078 | 3998 | msgstr "visa bara den sista patchen" |
|
4079 | 3999 | |
|
4080 | 4000 | msgid "hg qapplied [-1] [-s] [PATCH]" |
|
4081 | msgstr "" | |
|
4001 | msgstr "hg qapplied [-1] [-s] [PATCH]" | |
|
4082 | 4002 | |
|
4083 | 4003 | msgid "use pull protocol to copy metadata" |
|
4084 | 4004 | msgstr "använd pull-protokollet för att kopiera metadata" |
|
4085 | 4005 | |
|
4086 | 4006 | msgid "do not update the new working directories" |
|
4087 | msgstr "" | |
|
4007 | msgstr "uppdatera inte de nya arbetskatalogerna" | |
|
4088 | 4008 | |
|
4089 | 4009 | msgid "use uncompressed transfer (fast over LAN)" |
|
4090 | 4010 | msgstr "använd okomprimerad överföring (snabbt över LAN)" |
@@ -4120,7 +4040,7 b' msgid "keep folded patch files"' | |||
|
4120 | 4040 | msgstr "" |
|
4121 | 4041 | |
|
4122 | 4042 | msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." |
|
4123 | msgstr "" | |
|
4043 | msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FIL] PATCH..." | |
|
4124 | 4044 | |
|
4125 | 4045 | msgid "overwrite any local changes" |
|
4126 | 4046 | msgstr "" |
@@ -4138,11 +4058,14 b' msgid "hg qguard [-l] [-n] [PATCH] [-- [' | |||
|
4138 | 4058 | msgstr "" |
|
4139 | 4059 | |
|
4140 | 4060 | msgid "hg qheader [PATCH]" |
|
4141 | msgstr "" | |
|
4061 | msgstr "hg qheader [PATCH]" | |
|
4142 | 4062 | |
|
4143 | 4063 | msgid "import file in patch directory" |
|
4144 | 4064 | msgstr "" |
|
4145 | 4065 | |
|
4066 | msgid "NAME" | |
|
4067 | msgstr "NAMN" | |
|
4068 | ||
|
4146 | 4069 | msgid "name of patch file" |
|
4147 | 4070 | msgstr "" |
|
4148 | 4071 | |
@@ -4159,13 +4082,13 b' msgid "qpush after importing"' | |||
|
4159 | 4082 | msgstr "" |
|
4160 | 4083 | |
|
4161 | 4084 | msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." |
|
4162 | msgstr "" | |
|
4085 | msgstr "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... FIL..." | |
|
4163 | 4086 | |
|
4164 | 4087 | msgid "create queue repository" |
|
4165 | 4088 | msgstr "" |
|
4166 | 4089 | |
|
4167 | 4090 | msgid "hg qinit [-c]" |
|
4168 | msgstr "" | |
|
4091 | msgstr "hg qinit [-c]" | |
|
4169 | 4092 | |
|
4170 | 4093 | msgid "import uncommitted changes (DEPRECATED)" |
|
4171 | 4094 | msgstr "importera icke arkiverade ändringar (FÖRLEGAD)" |
@@ -4209,6 +4132,9 b' msgstr "hg qpop [-a] [-f] [PATCH | INDEX' | |||
|
4209 | 4132 | msgid "apply on top of local changes" |
|
4210 | 4133 | msgstr "" |
|
4211 | 4134 | |
|
4135 | msgid "apply the target patch to its recorded parent" | |
|
4136 | msgstr "applicera patchen på dess angivna förälder" | |
|
4137 | ||
|
4212 | 4138 | msgid "list patch name in commit text" |
|
4213 | 4139 | msgstr "" |
|
4214 | 4140 | |
@@ -4569,35 +4495,48 b' msgid ""' | |||
|
4569 | 4495 | msgstr "" |
|
4570 | 4496 | |
|
4571 | 4497 | msgid "command to send changesets as (a series of) patch emails" |
|
4572 | msgstr "" | |
|
4498 | msgstr "kommando för att sända ändringar som (en uppsättning) mail" | |
|
4573 | 4499 | |
|
4574 | 4500 | msgid "" |
|
4575 | 4501 | "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" |
|
4576 | 4502 | "describes the series as a whole." |
|
4577 | 4503 | msgstr "" |
|
4504 | "Serien startas med en \"[PATCH 0 of N]\"-introduktion, som beskriver\n" | |
|
4505 | "innehållet i serien." | |
|
4578 | 4506 | |
|
4579 | 4507 | msgid "" |
|
4580 | 4508 | "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" |
|
4581 | 4509 | "first line of the changeset description as the subject text. The\n" |
|
4582 | 4510 | "message contains two or three body parts:" |
|
4583 | 4511 | msgstr "" |
|
4512 | "Varje patchmail har en ämnesraden \"[PATCH M of N] ...\", där den första\n" | |
|
4513 | "raden i ändringsbeskrivningen används som ämnestext. Meddelandet innehåller\n" | |
|
4514 | "två eller tre delar:" | |
|
4584 | 4515 | |
|
4585 | 4516 | msgid "" |
|
4586 | 4517 | "- The changeset description.\n" |
|
4587 | 4518 | "- [Optional] The result of running diffstat on the patch.\n" |
|
4588 | 4519 | "- The patch itself, as generated by :hg:`export`." |
|
4589 | 4520 | msgstr "" |
|
4521 | "- Ändringsbeskrivningen.\n" | |
|
4522 | "- [Valfritt] Resultatet av diffstat på patchen.\n" | |
|
4523 | "- Patchen, som genererad av :hg:`export`." | |
|
4590 | 4524 | |
|
4591 | 4525 | msgid "" |
|
4592 | 4526 | "Each message refers to the first in the series using the In-Reply-To\n" |
|
4593 | 4527 | "and References headers, so they will show up as a sequence in threaded\n" |
|
4594 | 4528 | "mail and news readers, and in mail archives." |
|
4595 | 4529 | msgstr "" |
|
4530 | "Varje meddelande refererar till den första i serien med hjälp av\n" | |
|
4531 | "In-Reply-To och References, så de kommer att visas upp som en sekvens i\n" | |
|
4532 | "trådade mail- och news-läsare, och i mailarkiv." | |
|
4596 | 4533 | |
|
4597 | 4534 | msgid "" |
|
4598 | 4535 | "To configure other defaults, add a section like this to your hgrc\n" |
|
4599 | 4536 | "file::" |
|
4600 | 4537 | msgstr "" |
|
4538 | "För att konfigurera andra inställningar, lägg till en sådan här sektion\n" | |
|
4539 | "till din hgrc-fil::" | |
|
4601 | 4540 | |
|
4602 | 4541 | msgid "" |
|
4603 | 4542 | " [email]\n" |
@@ -4607,16 +4546,26 b' msgid ""' | |||
|
4607 | 4546 | " bcc = bcc1, bcc2, ...\n" |
|
4608 | 4547 | " reply-to = address1, address2, ..." |
|
4609 | 4548 | msgstr "" |
|
4549 | " [email]\n" | |
|
4550 | " from = Mitt Namn <min@email>\n" | |
|
4551 | " to = mottagare1, mottagare2, ...\n" | |
|
4552 | " cc = cc1, cc2, ...\n" | |
|
4553 | " bcc = bcc1, bcc2, ...\n" | |
|
4554 | " reply-to = adress1, adress2, ..." | |
|
4610 | 4555 | |
|
4611 | 4556 | msgid "" |
|
4612 | 4557 | "Use ``[patchbomb]`` as configuration section name if you need to\n" |
|
4613 | 4558 | "override global ``[email]`` address settings." |
|
4614 | 4559 | msgstr "" |
|
4560 | "Använd ``[patchbomb]`` som namn på konfigurationssektionen om du behöver\n" | |
|
4561 | "ändra globala adressinställningar i ``[email]``." | |
|
4615 | 4562 | |
|
4616 | 4563 | msgid "" |
|
4617 | 4564 | "Then you can use the :hg:`email` command to mail a series of\n" |
|
4618 | 4565 | "changesets as a patchbomb." |
|
4619 | 4566 | msgstr "" |
|
4567 | "Därefter kan du använda kommandot :hg:`email` för att maila en serie\n" | |
|
4568 | "ändringar som en patchbomb." | |
|
4620 | 4569 | |
|
4621 | 4570 | msgid "" |
|
4622 | 4571 | "You can also either configure the method option in the email section\n" |
@@ -4625,6 +4574,10 b' msgid ""' | |||
|
4625 | 4574 | "directly from the commandline. See the [email] and [smtp] sections in\n" |
|
4626 | 4575 | "hgrc(5) for details.\n" |
|
4627 | 4576 | msgstr "" |
|
4577 | "Du kan också endera konfigurera alternativet method i email-sektionen att\n" | |
|
4578 | "vara en sendmail-kompatibel sändare eller fylla i sektionen [smtp] så att\n" | |
|
4579 | "patchbomb-utäkningen automatiskt kan skicka patchbomber från kommandoraden.\n" | |
|
4580 | "Se sektionerna [email] och [smtp] i hgrc(5) för detaljer.\n" | |
|
4628 | 4581 | |
|
4629 | 4582 | #, python-format |
|
4630 | 4583 | msgid "%s Please enter a valid value" |
@@ -4634,13 +4587,16 b' msgid "Please enter a valid value.\\n"' | |||
|
4634 | 4587 | msgstr "Ange ett giltigt värde.\n" |
|
4635 | 4588 | |
|
4636 | 4589 | msgid "send changesets by email" |
|
4637 | msgstr "" | |
|
4590 | msgstr "sänd ändringar via email" | |
|
4638 | 4591 | |
|
4639 | 4592 | msgid "" |
|
4640 | 4593 | " By default, diffs are sent in the format generated by\n" |
|
4641 | 4594 | " :hg:`export`, one per message. The series starts with a \"[PATCH 0\n" |
|
4642 | 4595 | " of N]\" introduction, which describes the series as a whole." |
|
4643 | 4596 | msgstr "" |
|
4597 | " Som standard skickas diffar i samma format som :hg:`export` genererar,\n" | |
|
4598 | " ett per meddelande. Serien börjar med en introduktion med rubriken\n" | |
|
4599 | " \"[PATCH 0 of N]\", som beskriver serien i helhet." | |
|
4644 | 4600 | |
|
4645 | 4601 | msgid "" |
|
4646 | 4602 | " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
@@ -4648,14 +4604,20 b' msgid ""' | |||
|
4648 | 4604 | " The message contains two or three parts. First, the changeset\n" |
|
4649 | 4605 | " description." |
|
4650 | 4606 | msgstr "" |
|
4607 | " Varje patchmail har en ämnesrad med texten \"[PATCH M of N] ...\", och\n" | |
|
4608 | " använder den första raden i ändringsbeskrivningen som ämnestext.\n" | |
|
4609 | " Meddelandet innehåller två eller tre delar. Först, beskrivningen av\n" | |
|
4610 | " ändringen." | |
|
4651 | 4611 | |
|
4652 | 4612 | msgid "" |
|
4653 | 4613 | " With the -d/--diffstat option, if the diffstat program is\n" |
|
4654 | 4614 | " installed, the result of running diffstat on the patch is inserted." |
|
4655 | 4615 | msgstr "" |
|
4616 | " Med flaggan -d/--diffstat, om programmet diffstat är installerat,\n" | |
|
4617 | " läggs resultatet av att köra diffstat på patchen in." | |
|
4656 | 4618 | |
|
4657 | 4619 | msgid " Finally, the patch itself, as generated by :hg:`export`." |
|
4658 | msgstr "" | |
|
4620 | msgstr " Till slut, patchen, som genererad av :hg:`export`." | |
|
4659 | 4621 | |
|
4660 | 4622 | msgid "" |
|
4661 | 4623 | " With the -d/--diffstat or -c/--confirm options, you will be presented\n" |
@@ -4700,6 +4662,13 b' msgid ""' | |||
|
4700 | 4662 | msgstr "" |
|
4701 | 4663 | |
|
4702 | 4664 | msgid "" |
|
4665 | " In case email sending fails, you will find a backup of your series\n" | |
|
4666 | " introductory message in ``.hg/last-email.txt``." | |
|
4667 | msgstr "" | |
|
4668 | " Om sändning av mailet misslyckas, kommer du att hitta en backup av\n" | |
|
4669 | " introduktionsmeddelandet i ``.hg/last-email.txt``." | |
|
4670 | ||
|
4671 | msgid "" | |
|
4703 | 4672 | " hg email -r 3000 # send patch 3000 only\n" |
|
4704 | 4673 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
|
4705 | 4674 | " hg email -r 3000:3005 # send patches 3000 through 3005\n" |
@@ -4736,6 +4705,10 b' msgid ""' | |||
|
4736 | 4705 | " " |
|
4737 | 4706 | msgstr "" |
|
4738 | 4707 | |
|
4708 | #, python-format | |
|
4709 | msgid "comparing with %s\n" | |
|
4710 | msgstr "jämför med %s\n" | |
|
4711 | ||
|
4739 | 4712 | msgid "no changes found\n" |
|
4740 | 4713 | msgstr "inga ändringar hittades\n" |
|
4741 | 4714 | |
@@ -4805,7 +4778,7 b' msgid "email addresses of copy recipient' | |||
|
4805 | 4778 | msgstr "" |
|
4806 | 4779 | |
|
4807 | 4780 | msgid "ask for confirmation before sending" |
|
4808 | msgstr "" | |
|
4781 | msgstr "bekräfta innan sändning" | |
|
4809 | 4782 | |
|
4810 | 4783 | msgid "add diffstat output to messages" |
|
4811 | 4784 | msgstr "" |
@@ -4865,7 +4838,7 b' msgid "send an introduction email for a ' | |||
|
4865 | 4838 | msgstr "" |
|
4866 | 4839 | |
|
4867 | 4840 | msgid "hg email [OPTION]... [DEST]..." |
|
4868 | msgstr "" | |
|
4841 | msgstr "hg email [FLAGGA]... [DEST]..." | |
|
4869 | 4842 | |
|
4870 | 4843 | msgid "show progress bars for some actions" |
|
4871 | 4844 | msgstr "" |
@@ -4884,7 +4857,7 b' msgid ""' | |||
|
4884 | 4857 | " [progress]\n" |
|
4885 | 4858 | " delay = 3 # number of seconds (float) before showing the progress bar\n" |
|
4886 | 4859 | " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" |
|
4887 | " format = topic bar number # format of the progress bar\n" | |
|
4860 | " format = topic bar number estimate # format of the progress bar\n" | |
|
4888 | 4861 | " width = <none> # if set, the maximum width of the progress information\n" |
|
4889 | 4862 | " # (that is, min(width, term width) will be used)\n" |
|
4890 | 4863 | " clear-complete = True # clear the progress bar after it's done\n" |
@@ -4894,11 +4867,42 b' msgid ""' | |||
|
4894 | 4867 | msgstr "" |
|
4895 | 4868 | |
|
4896 | 4869 | msgid "" |
|
4897 |
"Valid entries for the format field are topic, bar, number, unit, |
|
|
4898 |
"item. item defaults to the last 20 characters of the |
|
|
4899 |
"can be changed by adding either ``-<num>`` which would |
|
|
4900 |
"num characters, or ``+<num>`` for the first num |
|
|
4901 | msgstr "" | |
|
4870 | "Valid entries for the format field are topic, bar, number, unit,\n" | |
|
4871 | "estimate, and item. item defaults to the last 20 characters of the\n" | |
|
4872 | "item, but this can be changed by adding either ``-<num>`` which would\n" | |
|
4873 | "take the last num characters, or ``+<num>`` for the first num\n" | |
|
4874 | "characters.\n" | |
|
4875 | msgstr "" | |
|
4876 | ||
|
4877 | #. i18n: format XX seconds as "XXs" | |
|
4878 | #, python-format | |
|
4879 | msgid "%02ds" | |
|
4880 | msgstr "%02ds" | |
|
4881 | ||
|
4882 | #. i18n: format X minutes and YY seconds as "XmYYs" | |
|
4883 | #, python-format | |
|
4884 | msgid "%dm%02ds" | |
|
4885 | msgstr "%dm%02ds" | |
|
4886 | ||
|
4887 | #. i18n: format X hours and YY minutes as "XhYYm" | |
|
4888 | #, python-format | |
|
4889 | msgid "%dh%02dm" | |
|
4890 | msgstr "%dt%02dm" | |
|
4891 | ||
|
4892 | #. i18n: format X days and YY hours as "XdYYh" | |
|
4893 | #, python-format | |
|
4894 | msgid "%dd%02dh" | |
|
4895 | msgstr "%dd%02dt" | |
|
4896 | ||
|
4897 | #. i18n: format X weeks and YY days as "XwYYd" | |
|
4898 | #, python-format | |
|
4899 | msgid "%dw%02dd" | |
|
4900 | msgstr "%dv%02dd" | |
|
4901 | ||
|
4902 | #. i18n: format X years and YY weeks as "XyYYw" | |
|
4903 | #, python-format | |
|
4904 | msgid "%dy%02dw" | |
|
4905 | msgstr "%då%02dv" | |
|
4902 | 4906 | |
|
4903 | 4907 | msgid "command to delete untracked files from the working directory" |
|
4904 | 4908 | msgstr "" |
@@ -5269,8 +5273,9 b' msgstr ""' | |||
|
5269 | 5273 | msgid "running non-interactively, use commit instead" |
|
5270 | 5274 | msgstr "" |
|
5271 | 5275 | |
|
5272 | msgid "cannot partially commit a merge (use hg commit instead)" | |
|
5273 | msgstr "" | |
|
5276 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" | |
|
5277 | msgstr "" | |
|
5278 | "kan inte delvis arkivera en sammanfogning (använd \"hg commit\" istället)" | |
|
5274 | 5279 | |
|
5275 | 5280 | msgid "no changes to record\n" |
|
5276 | 5281 | msgstr "" |
@@ -5677,7 +5682,7 b' msgstr ""' | |||
|
5677 | 5682 | msgid "" |
|
5678 | 5683 | "- You should use single encoding in one repository.\n" |
|
5679 | 5684 | "- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n" |
|
5680 |
"- win32mbcs is not compatible with fixutf8 exten |
|
|
5685 | "- win32mbcs is not compatible with fixutf8 extension." | |
|
5681 | 5686 | msgstr "" |
|
5682 | 5687 | |
|
5683 | 5688 | msgid "" |
@@ -5840,6 +5845,19 b' msgstr ""' | |||
|
5840 | 5845 | msgid "unknown archive type '%s'" |
|
5841 | 5846 | msgstr "" |
|
5842 | 5847 | |
|
5848 | msgid "archiving" | |
|
5849 | msgstr "arkiverar" | |
|
5850 | ||
|
5851 | #, python-format | |
|
5852 | msgid "bookmark '%s' contains illegal character" | |
|
5853 | msgstr "bokmärket '%s' innehåller ogiltiga tecken" | |
|
5854 | ||
|
5855 | msgid "searching for changed bookmarks\n" | |
|
5856 | msgstr "söker efter ändrade bokmärken\n" | |
|
5857 | ||
|
5858 | msgid "no changed bookmarks found\n" | |
|
5859 | msgstr "inga ändrade bokmärken hittades\n" | |
|
5860 | ||
|
5843 | 5861 | msgid "invalid changegroup" |
|
5844 | 5862 | msgstr "" |
|
5845 | 5863 | |
@@ -5854,8 +5872,13 b' msgid "cannot create new bundle reposito' | |||
|
5854 | 5872 | msgstr "" |
|
5855 | 5873 | |
|
5856 | 5874 | #, python-format |
|
5857 |
msgid " |
|
|
5858 | msgstr "" | |
|
5875 | msgid "stream ended unexpectedly (got %d bytes, expected %d)" | |
|
5876 | msgstr "strömmen slutade abrupt (fick %d bytes av förväntade %d)" | |
|
5877 | ||
|
5878 | # python-format | |
|
5879 | #, python-format | |
|
5880 | msgid "invalid chunk length %d" | |
|
5881 | msgstr "ogiltig styckelängd %d" | |
|
5859 | 5882 | |
|
5860 | 5883 | #, python-format |
|
5861 | 5884 | msgid "%s: not a Mercurial bundle" |
@@ -5981,6 +6004,10 b' msgid "branch: %s\\n"' | |||
|
5981 | 6004 | msgstr "gren: %s\n" |
|
5982 | 6005 | |
|
5983 | 6006 | #, python-format |
|
6007 | msgid "bookmark: %s\n" | |
|
6008 | msgstr "bokmärke: %s\n" | |
|
6009 | ||
|
6010 | #, python-format | |
|
5984 | 6011 | msgid "tag: %s\n" |
|
5985 | 6012 | msgstr "märke: %s\n" |
|
5986 | 6013 | |
@@ -6154,12 +6181,12 b' msgstr ""' | |||
|
6154 | 6181 | |
|
6155 | 6182 | msgid "" |
|
6156 | 6183 | " New files are ignored if they match any of the patterns in\n" |
|
6157 | " .hgignore. As with add, these changes take effect at the next\n" | |
|
6184 | " ``.hgignore``. As with add, these changes take effect at the next\n" | |
|
6158 | 6185 | " commit." |
|
6159 | 6186 | msgstr "" |
|
6160 | 6187 | " Nya filer ignoreras om de överrensstämmer något av mönstren i\n" |
|
6161 |
" .hgignore. Precis som med add, kommer ändringarna att träda i kraft |
|
|
6162 | " nästa arkivering." | |
|
6188 | " ``.hgignore``. Precis som med add, kommer ändringarna att träda i kraft\n" | |
|
6189 | " vid nästa arkivering." | |
|
6163 | 6190 | |
|
6164 | 6191 | msgid "" |
|
6165 | 6192 | " Use the -s/--similarity option to detect renamed files. With a\n" |
@@ -6285,50 +6312,41 b' msgid "reverse effect of earlier changes' | |||
|
6285 | 6312 | msgstr "omvänd effekten från en tidigare ändring" |
|
6286 | 6313 | |
|
6287 | 6314 | msgid "" |
|
6288 | " The backout command merges the reverse effect of the reverted\n" | |
|
6289 |
" c |
|
|
6290 | msgstr "" | |
|
6291 | " Kommandot backout sammanfogar den omvända effekven av den återkallade\n" | |
|
6292 | " ändringen i arbetskatalogen." | |
|
6293 | ||
|
6294 | msgid "" | |
|
6295 | " With the --merge option, it first commits the reverted changes\n" | |
|
6296 | " as a new changeset. This new changeset is a child of the reverted\n" | |
|
6297 | " changeset.\n" | |
|
6298 | " The --merge option remembers the parent of the working directory\n" | |
|
6299 | " before starting the backout, then merges the new head with that\n" | |
|
6300 | " changeset afterwards.\n" | |
|
6301 | " This will result in an explicit merge in the history." | |
|
6302 |
msg |
|
|
6303 | " Med flaggan --merge arkiveras först de återkallade ändringarna som en\n" | |
|
6304 | " ny ändring. Denna ny ändring är en ättling till den återkallade\n" | |
|
6305 | " ändringen.\n" | |
|
6306 | " Flaggan --merge kommer ihåg arbetskatalogens förälder innan\n" | |
|
6307 | " återkallningen påbörjas, och sammanfogar sedan det nya huvudet med den\n" | |
|
6308 | " ändringen efteråt.\n" | |
|
6309 | " Detta resulterar i en explicit sammanfogning i historiken" | |
|
6310 | ||
|
6311 | msgid "" | |
|
6312 | " If you backout a changeset other than the original parent of the\n" | |
|
6313 | " working directory, the result of this merge is not committed,\n" | |
|
6314 | " as with a normal merge. Otherwise, no merge is needed and the\n" | |
|
6315 | " commit is automatic." | |
|
6316 | msgstr "" | |
|
6317 | " Om du tar tillbaka en annan ändring än originalföräldern till\n" | |
|
6318 | " arbetskatalogen, så arkiveras inte resultatet av sammanfogningen, som\n" | |
|
6319 | " vid en normal sammanfogning. Annars behövs ingen sammanfogning, och\n" | |
|
6320 | " arkiveringen är automatisk." | |
|
6321 | ||
|
6322 | msgid "" | |
|
6323 | " Note that the default behavior (without --merge) has changed in\n" | |
|
6324 | " version 1.7. To restore the previous default behavior, use\n" | |
|
6325 | " :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" | |
|
6326 | " the ongoing merge." | |
|
6327 | msgstr "" | |
|
6328 | " Notera att standardförfarandet (utan --merge) har ändrats i version\n" | |
|
6329 | " 1.7. För att återställa det gamla standardförfarandet, använd :hg:`\n" | |
|
6330 | " backout --merge` och sedan :hg:`update --clean .` för att bli av med\n" | |
|
6331 | " den pågående sammanfogningen." | |
|
6315 | " Prepare a new changeset with the effect of REV undone in the\n" | |
|
6316 | " current working directory." | |
|
6317 | msgstr "" | |
|
6318 | " Förbered en ny ändring där effekterna av REV ogörs i arbetskatalogen." | |
|
6319 | ||
|
6320 | msgid "" | |
|
6321 | " If REV is the parent of the working directory, then this new changeset\n" | |
|
6322 | " is committed automatically. Otherwise, hg needs to merge the\n" | |
|
6323 | " changes and the merged result is left uncommitted." | |
|
6324 | msgstr "" | |
|
6325 | " Om REV är förälder till arbetskatalogen, så arkiveras denna ändring\n" | |
|
6326 | " automatiskt. Annars krävs att hg sammanfogar ändringarna och det\n" | |
|
6327 | " sammanfogade resultatet lämnas oarkiverat." | |
|
6328 | ||
|
6329 | msgid "" | |
|
6330 | " By default, the pending changeset will have one parent,\n" | |
|
6331 | " maintaining a linear history. With --merge, the pending changeset\n" | |
|
6332 | " will instead have two parents: the old parent of the working\n" | |
|
6333 | " directory and a new child of REV that simply undoes REV." | |
|
6334 | msgstr "" | |
|
6335 | " Som standard kommer ändringen att ha en förälder, för att bibehålla en\n" | |
|
6336 | " linjär historik. Med --merge kommer ändringen istället att ha två\n" | |
|
6337 | " föräldrar: den gamla föräldern från arbetskatalogen och ett nytt barn\n" | |
|
6338 | " av REV som helt enkelt ogör REV." | |
|
6339 | ||
|
6340 | msgid "" | |
|
6341 | " Before version 1.7, the behavior without --merge was equivalent to\n" | |
|
6342 | " specifying --merge followed by :hg:`update --clean .` to cancel\n" | |
|
6343 | " the merge and leave the child of REV as a head to be merged\n" | |
|
6344 | " separately." | |
|
6345 | msgstr "" | |
|
6346 | " Innan version 1.7, så var beteendet utan --merge ekvivalent med att\n" | |
|
6347 | " specificera --merge följt av :hg:`update --clean .` för att ångra\n" | |
|
6348 | " sammanfogningen och lämna barnet till REV som ett huvud att\n" | |
|
6349 | " sammanfogas separat." | |
|
6332 | 6350 | |
|
6333 | 6351 | msgid "please specify just one revision" |
|
6334 | 6352 | msgstr "specificera bara en revision" |
@@ -6449,6 +6467,69 b' msgstr "\xc3\x84ndring %d:%s: %s\\n"' | |||
|
6449 | 6467 | msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" |
|
6450 | 6468 | msgstr "Testar ändring %d:%s (%d ändringar kvar, ~%d test)\n" |
|
6451 | 6469 | |
|
6470 | msgid "track a line of development with movable markers" | |
|
6471 | msgstr "spåra viss utveckling med flyttbara markörer" | |
|
6472 | ||
|
6473 | msgid "" | |
|
6474 | " Bookmarks are pointers to certain commits that move when\n" | |
|
6475 | " committing. Bookmarks are local. They can be renamed, copied and\n" | |
|
6476 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" | |
|
6477 | " :hg:`update` to merge and update respectively to a given bookmark." | |
|
6478 | msgstr "" | |
|
6479 | " Bokmärken är pekare till utvalda arkiveringar som flyttar vid\n" | |
|
6480 | " arkivering. Bokmärken är lokala. De kan döpas om, kopieras och\n" | |
|
6481 | " raderas. Det är möjligt att använda bokmärkesnamn i :hg:`merge` och\n" | |
|
6482 | " :hg:`update` för att sammanfoga och uppdatera till ett visst bokmärke." | |
|
6483 | ||
|
6484 | msgid "" | |
|
6485 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" | |
|
6486 | " directory's parent revision with the given name. If you specify\n" | |
|
6487 | " a revision using -r REV (where REV may be an existing bookmark),\n" | |
|
6488 | " the bookmark is assigned to that revision." | |
|
6489 | msgstr "" | |
|
6490 | " Du kan använda :hg:`bookmark NAMN` för att sätta ett bokmärke på\n" | |
|
6491 | " arbetskatalogens föräldrarevision med det angivna namnet. Om du anger\n" | |
|
6492 | " en revision med -r REV (där REV kan vara ett existerande bokmärke), så\n" | |
|
6493 | " tilldelas bokmärket till den revisionen." | |
|
6494 | ||
|
6495 | msgid "" | |
|
6496 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" | |
|
6497 | " push` and :hg:`help pull`). This requires both the local and remote\n" | |
|
6498 | " repositories to support bookmarks. For versions prior to 1.8, this " | |
|
6499 | "means\n" | |
|
6500 | " the bookmarks extension must be enabled.\n" | |
|
6501 | " " | |
|
6502 | msgstr "" | |
|
6503 | " Bokmärken kan tryckas och dras mellan arkiv (se :hg:`help push` och\n" | |
|
6504 | " :hg:`help pull`). Detta kräver att både det lokala och fjärrarkivet\n" | |
|
6505 | " stödjer bokmärken. För versioner innan 1.8, så betyder det att\n" | |
|
6506 | " bookmarks-utökningen måste vara aktiverad.\n" | |
|
6507 | " " | |
|
6508 | ||
|
6509 | msgid "a bookmark of this name does not exist" | |
|
6510 | msgstr "ett bokmärke med det namnet existerar inte" | |
|
6511 | ||
|
6512 | msgid "a bookmark of the same name already exists" | |
|
6513 | msgstr "ett bokmärke med det namnet existerar redan" | |
|
6514 | ||
|
6515 | msgid "new bookmark name required" | |
|
6516 | msgstr "nytt bokmärkesnamn krävs" | |
|
6517 | ||
|
6518 | msgid "bookmark name required" | |
|
6519 | msgstr "bokmärkesnamn krävs" | |
|
6520 | ||
|
6521 | msgid "bookmark name cannot contain newlines" | |
|
6522 | msgstr "bokmärkesnamn kan inte innehålla radbrytningar" | |
|
6523 | ||
|
6524 | msgid "bookmark names cannot consist entirely of whitespace" | |
|
6525 | msgstr "bokmärkesnamn kan inte bara bestå av blanktecken" | |
|
6526 | ||
|
6527 | msgid "a bookmark cannot have the name of an existing branch" | |
|
6528 | msgstr "ett bokmärket kan inte ha samma namn som en existerande gren" | |
|
6529 | ||
|
6530 | msgid "no bookmarks set\n" | |
|
6531 | msgstr "inget bokmärke satt\n" | |
|
6532 | ||
|
6452 | 6533 | msgid "set or show the current branch name" |
|
6453 | 6534 | msgstr "sätt eller visa det aktuella grennamnet" |
|
6454 | 6535 | |
@@ -6642,21 +6723,21 b' msgstr ""' | |||
|
6642 | 6723 | |
|
6643 | 6724 | msgid "" |
|
6644 | 6725 | " The location of the source is added to the new repository's\n" |
|
6645 | " .hg/hgrc file, as the default to be used for future pulls." | |
|
6646 | msgstr "" | |
|
6647 |
" Källans plats kommer att läggas till i det nya arkivets |
|
|
6648 | " som standardplats att användas för framtida dragningar." | |
|
6726 | " ``.hg/hgrc`` file, as the default to be used for future pulls." | |
|
6727 | msgstr "" | |
|
6728 | " Källans plats kommer att läggas till i det nya arkivets\n" | |
|
6729 | " ``.hg/hgrc``-fil som standardplats att användas för framtida dragningar." | |
|
6649 | 6730 | |
|
6650 | 6731 | msgid " See :hg:`help urls` for valid source format details." |
|
6651 | 6732 | msgstr " Se :hg:`help urls` för detaljer om giltiga källformat." |
|
6652 | 6733 | |
|
6653 | 6734 | msgid "" |
|
6654 | 6735 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" |
|
6655 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
6736 | " ``.hg/hgrc`` and working directory will be created on the remote side.\n" | |
|
6656 | 6737 | " Please see :hg:`help urls` for important details about ``ssh://`` URLs." |
|
6657 | 6738 | msgstr "" |
|
6658 | 6739 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
6659 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" | |
|
6740 | " ingen ``.hg/hgrc`` och arbetskatalog skapas på fjärrsidan.\n" | |
|
6660 | 6741 | " Se :hg:`help urls` för viktiga detaljer om ``ssh://``-URLer." |
|
6661 | 6742 | |
|
6662 | 6743 | msgid "" |
@@ -6761,11 +6842,11 b' msgstr "arkivera de angivna filerna eller alla \xc3\xa4ndringar"' | |||
|
6761 | 6842 | |
|
6762 | 6843 | msgid "" |
|
6763 | 6844 | " Commit changes to the given files into the repository. Unlike a\n" |
|
6764 |
" centralized |
|
|
6845 | " centralized SCM, this operation is a local operation. See\n" | |
|
6765 | 6846 | " :hg:`push` for a way to actively distribute your changes." |
|
6766 | 6847 | msgstr "" |
|
6767 | 6848 | " Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n" |
|
6768 |
" från ett centralicerat |
|
|
6849 | " från ett centralicerat SCM, är detta en lokal operation. Se :hg:`push`\n" | |
|
6769 | 6850 | " för ett sätt att aktivt distribuera dina ändringar." |
|
6770 | 6851 | |
|
6771 | 6852 | msgid "" |
@@ -7040,9 +7121,19 b' msgstr ""' | |||
|
7040 | 7121 | msgid "parse and display a date" |
|
7041 | 7122 | msgstr "" |
|
7042 | 7123 | |
|
7124 | msgid "display the combined ignore pattern" | |
|
7125 | msgstr "visa det sammansatta ignoreringsmönstret" | |
|
7126 | ||
|
7127 | msgid "no ignore patterns found" | |
|
7128 | msgstr "inget ignoreringsmönster hittades" | |
|
7129 | ||
|
7043 | 7130 | msgid "dump the contents of an index file" |
|
7044 | 7131 | msgstr "" |
|
7045 | 7132 | |
|
7133 | #, python-format | |
|
7134 | msgid "unknown format %d" | |
|
7135 | msgstr "okänt format %d" | |
|
7136 | ||
|
7046 | 7137 | msgid "dump an index DAG as a graphviz dot file" |
|
7047 | 7138 | msgstr "" |
|
7048 | 7139 | |
@@ -7421,8 +7512,9 b' msgstr ""' | |||
|
7421 | 7512 | "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" |
|
7422 | 7513 | |
|
7423 | 7514 | #, python-format |
|
7424 | msgid "use \"hg -v help%s\" to show aliases and global options" | |
|
7425 | msgstr "använd \"hg -v help%s\" för att visa alias och globala flaggor" | |
|
7515 | msgid "use \"hg -v help%s\" to show builtin aliases and global options" | |
|
7516 | msgstr "" | |
|
7517 | "använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor" | |
|
7426 | 7518 | |
|
7427 | 7519 | #, python-format |
|
7428 | 7520 | msgid "use \"hg -v help %s\" to show global options" |
@@ -7544,6 +7636,9 b' msgstr ""' | |||
|
7544 | 7636 | " oarkiverade ändringar i arbetskatalogen, en lista av märken för den\n" |
|
7545 | 7637 | " här revisionen och ett grennamn för grenar som inte är default." |
|
7546 | 7638 | |
|
7639 | msgid "can't query remote revision number, branch, tags, or bookmarks" | |
|
7640 | msgstr "kan inte efterfråga revisionsnummer, gren, märken eller bokmärken" | |
|
7641 | ||
|
7547 | 7642 | msgid "import an ordered set of patches" |
|
7548 | 7643 | msgstr "" |
|
7549 | 7644 | |
@@ -7643,6 +7738,9 b' msgstr ""' | |||
|
7643 | 7738 | msgid "cannot combine --bundle and --subrepos" |
|
7644 | 7739 | msgstr "" |
|
7645 | 7740 | |
|
7741 | msgid "remote doesn't support bookmarks\n" | |
|
7742 | msgstr "fjärrserver stödjer inte bokmärken\n" | |
|
7743 | ||
|
7646 | 7744 | msgid "create a new repository in the given directory" |
|
7647 | 7745 | msgstr "skapa ett nytt arkiv i den angivna katalogen" |
|
7648 | 7746 | |
@@ -8002,6 +8100,10 b' msgstr ""' | |||
|
8002 | 8100 | " filer.\n" |
|
8003 | 8101 | " " |
|
8004 | 8102 | |
|
8103 | #, python-format | |
|
8104 | msgid "remote bookmark %s not found!" | |
|
8105 | msgstr "fjärrbokmärket %s hittades inte!" | |
|
8106 | ||
|
8005 | 8107 | msgid "" |
|
8006 | 8108 | "other repository doesn't support revision lookup, so a rev cannot be " |
|
8007 | 8109 | "specified." |
@@ -8009,6 +8111,10 b' msgstr ""' | |||
|
8009 | 8111 | "det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " |
|
8010 | 8112 | "anges." |
|
8011 | 8113 | |
|
8114 | #, python-format | |
|
8115 | msgid "importing bookmark %s\n" | |
|
8116 | msgstr "importerar bokmärket %s\n" | |
|
8117 | ||
|
8012 | 8118 | msgid "push changes to the specified destination" |
|
8013 | 8119 | msgstr "tryck ändringar till den specificerade destinationen" |
|
8014 | 8120 | |
@@ -8077,6 +8183,22 b' msgstr ""' | |||
|
8077 | 8183 | msgid "pushing to %s\n" |
|
8078 | 8184 | msgstr "trycker till %s\n" |
|
8079 | 8185 | |
|
8186 | #, python-format | |
|
8187 | msgid "exporting bookmark %s\n" | |
|
8188 | msgstr "exporterar bokmärket %s\n" | |
|
8189 | ||
|
8190 | #, python-format | |
|
8191 | msgid "deleting remote bookmark %s\n" | |
|
8192 | msgstr "raderar fjärrbokmärket %s\n" | |
|
8193 | ||
|
8194 | #, python-format | |
|
8195 | msgid "bookmark %s does not exist on the local or remote repository!\n" | |
|
8196 | msgstr "bokmärket %s existerar inte i lokal- eller fjärrarkiv!\n" | |
|
8197 | ||
|
8198 | #, python-format | |
|
8199 | msgid "updating bookmark %s failed!\n" | |
|
8200 | msgstr "uppdatering av bokmärket %s misslyckades!\n" | |
|
8201 | ||
|
8080 | 8202 | msgid "roll back an interrupted transaction" |
|
8081 | 8203 | msgstr "ångra en avbruten transaktion" |
|
8082 | 8204 | |
@@ -8344,6 +8466,9 b' msgstr ""' | |||
|
8344 | 8466 | msgid "you can't specify a revision and a date" |
|
8345 | 8467 | msgstr "du kan inte specificera en revision och ett datum" |
|
8346 | 8468 | |
|
8469 | msgid "uncommitted merge - use \"hg update\", see \"hg help revert\"" | |
|
8470 | msgstr "oarkiverad sammanfogning - använd \"hg update\", se \"hg help revert\"" | |
|
8471 | ||
|
8347 | 8472 | msgid "no files or directories specified; use --all to revert the whole repo" |
|
8348 | 8473 | msgstr "" |
|
8349 | 8474 | "inga filer eller kataloger angivna; använd --all för att återställa hela " |
@@ -8671,6 +8796,14 b' msgid "%d outgoing"' | |||
|
8671 | 8796 | msgstr "%d utgående" |
|
8672 | 8797 | |
|
8673 | 8798 | #, python-format |
|
8799 | msgid "%d incoming bookmarks" | |
|
8800 | msgstr "%d inkommande bokmärken" | |
|
8801 | ||
|
8802 | #, python-format | |
|
8803 | msgid "%d outgoing bookmarks" | |
|
8804 | msgstr "%d utgående bokmärken" | |
|
8805 | ||
|
8806 | #, python-format | |
|
8674 | 8807 | msgid "remote: %s\n" |
|
8675 | 8808 | msgstr "fjärran: %s\n" |
|
8676 | 8809 | |
@@ -8919,11 +9052,11 b' msgid "(see http://mercurial.selenic.com' | |||
|
8919 | 9052 | msgstr "(se http://mercurial.selenic.com för mer information)" |
|
8920 | 9053 | |
|
8921 | 9054 | msgid "" |
|
8922 |
"Copyright (C) 2005-201 |
|
|
9055 | "Copyright (C) 2005-2011 Matt Mackall and others\n" | |
|
8923 | 9056 | "This is free software; see the source for copying conditions. There is NO\n" |
|
8924 | 9057 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
8925 | 9058 | msgstr "" |
|
8926 |
"Copyright (C) 2005-201 |
|
|
9059 | "Copyright (C) 2005-2011 Matt Mackall och andra\n" | |
|
8927 | 9060 | "Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n" |
|
8928 | 9061 | "garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n" |
|
8929 | 9062 | |
@@ -8993,6 +9126,10 b' msgstr "specificera ssh-kommando att anv\xc3\xa4nda"' | |||
|
8993 | 9126 | msgid "specify hg command to run on the remote side" |
|
8994 | 9127 | msgstr "specificera hg-kommando att köra på andra sidan" |
|
8995 | 9128 | |
|
9129 | msgid "do not verify server certificate (ignoring web.cacerts config)" | |
|
9130 | msgstr "" | |
|
9131 | "verifiera inte servercertifikatet (ignorerar web.cacerts-konfiguration)" | |
|
9132 | ||
|
8996 | 9133 | msgid "PATTERN" |
|
8997 | 9134 | msgstr "MÖNSTER" |
|
8998 | 9135 | |
@@ -9149,6 +9286,18 b' msgstr "uppdatera inte till m\xc3\xa5let"' | |||
|
9149 | 9286 | msgid "[-gbsr] [-U] [-c CMD] [REV]" |
|
9150 | 9287 | msgstr "[-gbsr] [-U] [-c KMD] [REV]" |
|
9151 | 9288 | |
|
9289 | msgid "force" | |
|
9290 | msgstr "tvinga" | |
|
9291 | ||
|
9292 | msgid "delete a given bookmark" | |
|
9293 | msgstr "ta bort angivet bokmärke" | |
|
9294 | ||
|
9295 | msgid "rename a given bookmark" | |
|
9296 | msgstr "döp om angivet bokmärke" | |
|
9297 | ||
|
9298 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" | |
|
9299 | msgstr "hg bookmarks [-f] [-d] [-m NAMN] [-r REV] [NAMN]" | |
|
9300 | ||
|
9152 | 9301 | msgid "set branch name even if it shadows an existing branch" |
|
9153 | 9302 | msgstr "sätt grennamnet även om det döljer en existerande gren" |
|
9154 | 9303 | |
@@ -9387,8 +9536,11 b' msgstr "visa grenar"' | |||
|
9387 | 9536 | msgid "show tags" |
|
9388 | 9537 | msgstr "visa märken" |
|
9389 | 9538 | |
|
9390 | msgid "[-nibt] [-r REV] [SOURCE]" | |
|
9391 | msgstr "[-nibt] [-r REV] [KÄLLA]" | |
|
9539 | msgid "show bookmarks" | |
|
9540 | msgstr "visa bokmärken" | |
|
9541 | ||
|
9542 | msgid "[-nibtB] [-r REV] [SOURCE]" | |
|
9543 | msgstr "[-nibtB] [-r REV] [KÄLLA]" | |
|
9392 | 9544 | |
|
9393 | 9545 | msgid "" |
|
9394 | 9546 | "directory strip option for patch. This has the same meaning as the " |
@@ -9428,6 +9580,9 b' msgstr "fil att lagra buntarna i"' | |||
|
9428 | 9580 | msgid "a remote changeset intended to be added" |
|
9429 | 9581 | msgstr "en fjärrändring som avses att läggas till" |
|
9430 | 9582 | |
|
9583 | msgid "compare bookmarks" | |
|
9584 | msgstr "jämför bokmärken" | |
|
9585 | ||
|
9431 | 9586 | msgid "a specific branch you would like to pull" |
|
9432 | 9587 | msgstr "en specifik gren som du vill dra" |
|
9433 | 9588 | |
@@ -9524,12 +9679,21 b' msgstr "uppdatera till nytt grenhuvud om \xc3\xa4ndringar drogs"' | |||
|
9524 | 9679 | msgid "run even when remote repository is unrelated" |
|
9525 | 9680 | msgstr "kör även när fjärrarkivet är orelaterat" |
|
9526 | 9681 | |
|
9682 | msgid "BOOKMARK" | |
|
9683 | msgstr "BOKMÄRKE" | |
|
9684 | ||
|
9685 | msgid "bookmark to pull" | |
|
9686 | msgstr "bokmärke att dra" | |
|
9687 | ||
|
9527 | 9688 | msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" |
|
9528 | 9689 | msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]" |
|
9529 | 9690 | |
|
9530 | 9691 | msgid "force push" |
|
9531 | 9692 | msgstr "tvinga tryckning" |
|
9532 | 9693 | |
|
9694 | msgid "bookmark to push" | |
|
9695 | msgstr "bokmärke att trycka" | |
|
9696 | ||
|
9533 | 9697 | msgid "allow pushing a new branch" |
|
9534 | 9698 | msgstr "tillåt att trycka en ny gren" |
|
9535 | 9699 | |
@@ -9972,6 +10136,11 b' msgstr ""' | |||
|
9972 | 10136 | |
|
9973 | 10137 | #, python-format |
|
9974 | 10138 | msgid "" |
|
10139 | "No argument found for substitution of %i variable in alias '%s' definition." | |
|
10140 | msgstr "" | |
|
10141 | ||
|
10142 | #, python-format | |
|
10143 | msgid "" | |
|
9975 | 10144 | "error in definition for alias '%s': %s may only be given on the command " |
|
9976 | 10145 | "line\n" |
|
9977 | 10146 | msgstr "" |
@@ -10039,6 +10208,10 b' msgid "*** failed to import extension %s' | |||
|
10039 | 10208 | msgstr "" |
|
10040 | 10209 | |
|
10041 | 10210 | #, python-format |
|
10211 | msgid "warning: error finding commands in %s\n" | |
|
10212 | msgstr "varning: kunde inte hitta kommandon i %s\n" | |
|
10213 | ||
|
10214 | #, python-format | |
|
10042 | 10215 | msgid "couldn't find merge tool %s\n" |
|
10043 | 10216 | msgstr "" |
|
10044 | 10217 | |
@@ -11473,6 +11646,13 b' msgstr ""' | |||
|
11473 | 11646 | "För att använda reguljära uttryck från Perl/Python, börja ett namn med\n" |
|
11474 | 11647 | "``re:``. Regexp-mönstermatchning har sin början i arkivroten." |
|
11475 | 11648 | |
|
11649 | msgid "" | |
|
11650 | "To read name patterns from a file, use ``listfile:`` or ``listfile0:``.\n" | |
|
11651 | "The latter expects null delimited patterns while the former expects line\n" | |
|
11652 | "feeds. Each string read from the file is itself treated as a file\n" | |
|
11653 | "pattern." | |
|
11654 | msgstr "" | |
|
11655 | ||
|
11476 | 11656 | msgid "Plain examples::" |
|
11477 | 11657 | msgstr "Råa exempel::" |
|
11478 | 11658 | |
@@ -11507,10 +11687,17 b' msgstr ""' | |||
|
11507 | 11687 | msgid "Regexp examples::" |
|
11508 | 11688 | msgstr "Regexp-exempel::" |
|
11509 | 11689 | |
|
11510 | msgid "" | |
|
11511 | " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" | |
|
11512 | msgstr "" | |
|
11513 | " re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n" | |
|
11690 | msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository" | |
|
11691 | msgstr "" | |
|
11692 | " re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet" | |
|
11693 | ||
|
11694 | msgid "File examples::" | |
|
11695 | msgstr "Filexempel::" | |
|
11696 | ||
|
11697 | msgid "" | |
|
11698 | " listfile:list.txt read list from list.txt with one file pattern per line\n" | |
|
11699 | " listfile0:list.txt read list from list.txt with null byte delimiters\n" | |
|
11700 | msgstr "" | |
|
11514 | 11701 | |
|
11515 | 11702 | msgid "Mercurial supports several ways to specify individual revisions." |
|
11516 | 11703 | msgstr "Mercurial stöder flera sätt att ange individuella revisioner." |
@@ -11828,7 +12015,10 b' msgid ""' | |||
|
11828 | 12015 | ":commit: commit creates a consistent snapshot of the state of the\n" |
|
11829 | 12016 | " entire project and its subrepositories. It does this by first\n" |
|
11830 | 12017 | " attempting to commit all modified subrepositories, then recording\n" |
|
11831 |
" their state and finally committing it in the parent |
|
|
12018 | " their state and finally committing it in the parent\n" | |
|
12019 | " repository. Mercurial can be made to abort if any subrepository\n" | |
|
12020 | " content is modified by setting \"ui.commitsubrepos=no\" in a\n" | |
|
12021 | " configuration file (see :hg:`help config`)." | |
|
11832 | 12022 | msgstr "" |
|
11833 | 12023 | |
|
11834 | 12024 | msgid "" |
@@ -11936,8 +12126,9 b' msgid ":author: String. The unmodified a' | |||
|
11936 | 12126 | msgstr "" |
|
11937 | 12127 | |
|
11938 | 12128 | msgid "" |
|
11939 |
":branches: |
|
|
11940 |
" committed. Will be empty if the branch name was |
|
|
12129 | ":branches: List of strings. The name of the branch on which the\n" | |
|
12130 | " changeset was committed. Will be empty if the branch name was\n" | |
|
12131 | " default." | |
|
11941 | 12132 | msgstr "" |
|
11942 | 12133 | |
|
11943 | 12134 | msgid ":children: List of strings. The children of the changeset." |
@@ -12152,7 +12343,7 b' msgid ""' | |||
|
12152 | 12343 | " file://local/filesystem/path[#revision]\n" |
|
12153 | 12344 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
12154 | 12345 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
12155 |
" ssh://[user |
|
|
12346 | " ssh://[user@]host[:port]/[path][#revision]" | |
|
12156 | 12347 | msgstr "" |
|
12157 | 12348 | |
|
12158 | 12349 | msgid "" |
@@ -12308,6 +12499,10 b' msgid "(branch merge, don\'t forget to co' | |||
|
12308 | 12499 | msgstr "" |
|
12309 | 12500 | |
|
12310 | 12501 | #, python-format |
|
12502 | msgid "config file %s not found!" | |
|
12503 | msgstr "konfigurationsfilen %s hittades inte!" | |
|
12504 | ||
|
12505 | #, python-format | |
|
12311 | 12506 | msgid "error reading %s/.hg/hgrc: %s\n" |
|
12312 | 12507 | msgstr "" |
|
12313 | 12508 | |
@@ -12454,6 +12649,10 b' msgid ".hg/sharedpath points to nonexist' | |||
|
12454 | 12649 | msgstr "" |
|
12455 | 12650 | |
|
12456 | 12651 | #, python-format |
|
12652 | msgid "warning: ignoring unknown working parent %s!\n" | |
|
12653 | msgstr "" | |
|
12654 | ||
|
12655 | #, python-format | |
|
12457 | 12656 | msgid "%r cannot be used in a tag name" |
|
12458 | 12657 | msgstr "" |
|
12459 | 12658 | |
@@ -12482,12 +12681,12 b' msgid "no interrupted transaction availa' | |||
|
12482 | 12681 | msgstr "" |
|
12483 | 12682 | |
|
12484 | 12683 | #, python-format |
|
12485 |
msgid "r |
|
|
12486 |
msgstr " |
|
|
12487 | ||
|
12488 | #, python-format | |
|
12489 |
msgid "r |
|
|
12490 |
msgstr " |
|
|
12684 | msgid "repository tip rolled back to revision %s (undo %s: %s)\n" | |
|
12685 | msgstr "arkivtopp tillbakadragen till revision %s (ångra %s: %s)\n" | |
|
12686 | ||
|
12687 | #, python-format | |
|
12688 | msgid "repository tip rolled back to revision %s (undo %s)\n" | |
|
12689 | msgstr "arkivtopp tillbakadragen till revision %s (ångra %s)\n" | |
|
12491 | 12690 | |
|
12492 | 12691 | msgid "rolling back unknown transaction\n" |
|
12493 | 12692 | msgstr "återkallar okänd transaktion\n" |
@@ -12496,6 +12695,14 b' msgstr "\xc3\xa5terkallar ok\xc3\xa4nd transaktion\\n"' | |||
|
12496 | 12695 | msgid "Named branch could not be reset, current branch still is: %s\n" |
|
12497 | 12696 | msgstr "" |
|
12498 | 12697 | |
|
12698 | #, python-format | |
|
12699 | msgid "working directory now based on revisions %d and %d\n" | |
|
12700 | msgstr "arbetskatalogen är nu baserad på revisionerna %d och %d\n" | |
|
12701 | ||
|
12702 | #, python-format | |
|
12703 | msgid "working directory now based on revision %d\n" | |
|
12704 | msgstr "arbetskatalogen är nu baserad på revision %d\n" | |
|
12705 | ||
|
12499 | 12706 | msgid "no rollback information available\n" |
|
12500 | 12707 | msgstr "" |
|
12501 | 12708 | |
@@ -12517,10 +12724,15 b' msgstr "varning: kan inte hitta anfader f\xc3\xb6r \'%s\', kopierad fr\xc3\xa5n \'%s\'!\\n"' | |||
|
12517 | 12724 | |
|
12518 | 12725 | msgid "cannot partially commit a merge (do not specify files or patterns)" |
|
12519 | 12726 | msgstr "" |
|
12727 | "kan inte delvis arkivera en sammanfogning (ange inte filer eller mönster" | |
|
12520 | 12728 | |
|
12521 | 12729 | msgid "can't commit subrepos without .hgsub" |
|
12522 | 12730 | msgstr "kan inte arkivera underarkiv utan .hgsub" |
|
12523 | 12731 | |
|
12732 | #, python-format | |
|
12733 | msgid "uncommitted changes in subrepo %s" | |
|
12734 | msgstr "oarkiverade ändringar i underarkivet %s" | |
|
12735 | ||
|
12524 | 12736 | msgid "file not found!" |
|
12525 | 12737 | msgstr "filen hittades inte!" |
|
12526 | 12738 | |
@@ -12556,37 +12768,39 b' msgstr ""' | |||
|
12556 | 12768 | "changegroupsubset." |
|
12557 | 12769 | |
|
12558 | 12770 | #, python-format |
|
12771 | msgid "updating bookmark %s\n" | |
|
12772 | msgstr "uppdaterar bokmärket %s\n" | |
|
12773 | ||
|
12774 | #, python-format | |
|
12775 | msgid "not updating divergent bookmark %s\n" | |
|
12776 | msgstr "uppdaterar inte divergent bokmärke %s\n" | |
|
12777 | ||
|
12778 | #, python-format | |
|
12559 | 12779 | msgid "%d changesets found\n" |
|
12560 | 12780 | msgstr "%d ändringar hittades\n" |
|
12561 | 12781 | |
|
12562 |
msgid "bundling |
|
|
12563 |
msgstr "buntar |
|
|
12782 | msgid "bundling" | |
|
12783 | msgstr "buntar" | |
|
12784 | ||
|
12785 | msgid "manifests" | |
|
12786 | msgstr "manifest" | |
|
12787 | ||
|
12788 | #, python-format | |
|
12789 | msgid "empty or missing revlog for %s" | |
|
12790 | msgstr "tom eller ingen revlog för %s" | |
|
12791 | ||
|
12792 | msgid "adding changesets\n" | |
|
12793 | msgstr "lägger till ändringar\n" | |
|
12564 | 12794 | |
|
12565 | 12795 | msgid "chunks" |
|
12566 | 12796 | msgstr "stycken" |
|
12567 | 12797 | |
|
12568 | msgid "bundling manifests" | |
|
12569 | msgstr "buntar manifest" | |
|
12570 | ||
|
12571 | #, python-format | |
|
12572 | msgid "empty or missing revlog for %s" | |
|
12573 | msgstr "tom eller saknad revlog för %s" | |
|
12574 | ||
|
12575 | msgid "bundling files" | |
|
12576 | msgstr "buntar filer" | |
|
12577 | ||
|
12578 | msgid "adding changesets\n" | |
|
12579 | msgstr "lägger till ändringar\n" | |
|
12580 | ||
|
12581 | 12798 | msgid "received changelog group is empty" |
|
12582 | 12799 | msgstr "mottagen ändringsgrupp är tom" |
|
12583 | 12800 | |
|
12584 | 12801 | msgid "adding manifests\n" |
|
12585 | 12802 | msgstr "lägger till manifest\n" |
|
12586 | 12803 | |
|
12587 | msgid "manifests" | |
|
12588 | msgstr "manifest" | |
|
12589 | ||
|
12590 | 12804 | msgid "adding file changes\n" |
|
12591 | 12805 | msgstr "lägger till filändringar\n" |
|
12592 | 12806 | |
@@ -12628,6 +12842,12 b' msgstr "%d filer att \xc3\xb6verf\xc3\xb6ra, %s med data\\n"' | |||
|
12628 | 12842 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
12629 | 12843 | msgstr "överförde %s på %.1f sekunder (%s/sek)\n" |
|
12630 | 12844 | |
|
12845 | msgid "can't use TLS: Python SSL support not installed" | |
|
12846 | msgstr "kan inte använda TLS: Pythons SSL-stöd är inte installerat" | |
|
12847 | ||
|
12848 | msgid "(using smtps)\n" | |
|
12849 | msgstr "(använder smtps)\n" | |
|
12850 | ||
|
12631 | 12851 | msgid "smtp.host not configured - cannot send mail" |
|
12632 | 12852 | msgstr "smtp.host är inte konfigurerad - kan inte sända mail" |
|
12633 | 12853 | |
@@ -12635,11 +12855,8 b' msgstr "smtp.host \xc3\xa4r inte konfigurerad - kan inte s\xc3\xa4nda mail"' | |||
|
12635 | 12855 | msgid "sending mail: smtp host %s, port %s\n" |
|
12636 | 12856 | msgstr "sänder mail: smtp-server %s, port %s\n" |
|
12637 | 12857 | |
|
12638 | msgid "can't use TLS: Python SSL support not installed" | |
|
12639 | msgstr "kan inte använda TLS: Pythons SSL-stöd är inte installerat" | |
|
12640 | ||
|
12641 | msgid "(using tls)\n" | |
|
12642 | msgstr "(använder tls)\n" | |
|
12858 | msgid "(using starttls)\n" | |
|
12859 | msgstr "(använder starttls)\n" | |
|
12643 | 12860 | |
|
12644 | 12861 | #, python-format |
|
12645 | 12862 | msgid "(authenticating to mail server as %s)\n" |
@@ -12680,6 +12897,10 b' msgid "invalid pattern"' | |||
|
12680 | 12897 | msgstr "ogiltigt mönster" |
|
12681 | 12898 | |
|
12682 | 12899 | #, python-format |
|
12900 | msgid "unable to read file list (%s)" | |
|
12901 | msgstr "kan inte läsa fillistan (%s)" | |
|
12902 | ||
|
12903 | #, python-format | |
|
12683 | 12904 | msgid "diff context lines count must be an integer, not %r" |
|
12684 | 12905 | msgstr "" |
|
12685 | 12906 | |
@@ -12764,6 +12985,10 b' msgstr ""' | |||
|
12764 | 12985 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" |
|
12765 | 12986 | msgstr "" |
|
12766 | 12987 | |
|
12988 | #, python-format | |
|
12989 | msgid "outstanding uncommitted changes in subrepository '%s'" | |
|
12990 | msgstr "kvarvarande oarkiverade ändringar i underarkivet '%s'" | |
|
12991 | ||
|
12767 | 12992 | msgid "crosses branches (merge branches or use --clean to discard changes)" |
|
12768 | 12993 | msgstr "" |
|
12769 | 12994 | |
@@ -12777,7 +13002,7 b' msgid "Caution:"' | |||
|
12777 | 13002 | msgstr "" |
|
12778 | 13003 | |
|
12779 | 13004 | msgid "!Danger!" |
|
12780 | msgstr "" | |
|
13005 | msgstr "!Fara!" | |
|
12781 | 13006 | |
|
12782 | 13007 | msgid "Error:" |
|
12783 | 13008 | msgstr "Fel:" |
@@ -13006,18 +13231,19 b' msgid "rev expects a number"' | |||
|
13006 | 13231 | msgstr "rev förväntar sig ett nummer" |
|
13007 | 13232 | |
|
13008 | 13233 | msgid "" |
|
13009 | "``p1(set)``\n" | |
|
13010 | " First parent of changesets in set." | |
|
13011 | msgstr "" | |
|
13012 | ||
|
13013 | msgid "" | |
|
13014 | "``p2(set)``\n" | |
|
13015 | " Second parent of changesets in set." | |
|
13016 | msgstr "" | |
|
13017 | ||
|
13018 | msgid "" | |
|
13019 | "``parents(set)``\n" | |
|
13020 |
" The set of all parents for all changesets in set |
|
|
13234 | "``p1([set])``\n" | |
|
13235 | " First parent of changesets in set, or the working directory." | |
|
13236 | msgstr "" | |
|
13237 | ||
|
13238 | msgid "" | |
|
13239 | "``p2([set])``\n" | |
|
13240 | " Second parent of changesets in set, or the working directory." | |
|
13241 | msgstr "" | |
|
13242 | ||
|
13243 | msgid "" | |
|
13244 | "``parents([set])``\n" | |
|
13245 | " The set of all parents for all changesets in set, or the working " | |
|
13246 | "directory." | |
|
13021 | 13247 | msgstr "" |
|
13022 | 13248 | |
|
13023 | 13249 | msgid "" |
@@ -13289,6 +13515,21 b' msgstr "tag tar ett eller inga argument"' | |||
|
13289 | 13515 | msgid "the argument to tag must be a string" |
|
13290 | 13516 | msgstr "argumentet till tag måste vara en sträng" |
|
13291 | 13517 | |
|
13518 | msgid "" | |
|
13519 | "``bookmark([name])``\n" | |
|
13520 | " The named bookmark or all bookmarks." | |
|
13521 | msgstr "" | |
|
13522 | "``bookmark([namn])``\n" | |
|
13523 | " Det angivna bokmärket eller alla bokmärken." | |
|
13524 | ||
|
13525 | #. i18n: "bookmark" is a keyword | |
|
13526 | msgid "bookmark takes one or no arguments" | |
|
13527 | msgstr "bookmark tar ett eller inga argument" | |
|
13528 | ||
|
13529 | #. i18n: "bookmark" is a keyword | |
|
13530 | msgid "the argument to bookmark must be a string" | |
|
13531 | msgstr "argumentet till bookmark måste vara en sträng" | |
|
13532 | ||
|
13292 | 13533 | msgid "can't negate that" |
|
13293 | 13534 | msgstr "kan inte negera det" |
|
13294 | 13535 | |
@@ -13318,6 +13559,9 b' msgstr ""' | |||
|
13318 | 13559 | msgid "couldn't parse location %s" |
|
13319 | 13560 | msgstr "" |
|
13320 | 13561 | |
|
13562 | msgid "password in URL not supported" | |
|
13563 | msgstr "lösenord i URL stödjs inte" | |
|
13564 | ||
|
13321 | 13565 | msgid "could not create remote repo" |
|
13322 | 13566 | msgstr "" |
|
13323 | 13567 | |
@@ -13385,6 +13629,18 b' msgid ""' | |||
|
13385 | 13629 | msgstr "" |
|
13386 | 13630 | |
|
13387 | 13631 | #, python-format |
|
13632 | msgid "" | |
|
13633 | " subrepository sources for %s differ\n" | |
|
13634 | "use (l)ocal source (%s) or (r)emote source (%s)?\n" | |
|
13635 | msgstr "" | |
|
13636 | ||
|
13637 | #, python-format | |
|
13638 | msgid "" | |
|
13639 | " subrepository sources for %s differ (in checked out version)\n" | |
|
13640 | "use (l)ocal source (%s) or (r)emote source (%s)?\n" | |
|
13641 | msgstr "" | |
|
13642 | ||
|
13643 | #, python-format | |
|
13388 | 13644 | msgid "default path for subrepository %s not found" |
|
13389 | 13645 | msgstr "" |
|
13390 | 13646 | |
@@ -13393,6 +13649,10 b' msgid "unknown subrepo type %s"' | |||
|
13393 | 13649 | msgstr "" |
|
13394 | 13650 | |
|
13395 | 13651 | #, python-format |
|
13652 | msgid "archiving (%s)" | |
|
13653 | msgstr "arkiverar (%s)" | |
|
13654 | ||
|
13655 | #, python-format | |
|
13396 | 13656 | msgid "warning: error \"%s\" in subrepository \"%s\"\n" |
|
13397 | 13657 | msgstr "" |
|
13398 | 13658 | |
@@ -13402,11 +13662,11 b' msgstr ""' | |||
|
13402 | 13662 | |
|
13403 | 13663 | #, python-format |
|
13404 | 13664 | msgid "pulling subrepo %s from %s\n" |
|
13405 |
msgstr "drar |
|
|
13665 | msgstr "drar underarkivet %s från %s\n" | |
|
13406 | 13666 | |
|
13407 | 13667 | #, python-format |
|
13408 | 13668 | msgid "pushing subrepo %s to %s\n" |
|
13409 |
msgstr "trycker |
|
|
13669 | msgstr "trycker underarkivet %s till %s\n" | |
|
13410 | 13670 | |
|
13411 | 13671 | msgid "cannot commit svn externals" |
|
13412 | 13672 | msgstr "" |
@@ -13416,6 +13676,41 b' msgid "not removing repo %s because it h' | |||
|
13416 | 13676 | msgstr "raderar inte arkivet %s eftersom den har ändringar.\n" |
|
13417 | 13677 | |
|
13418 | 13678 | #, python-format |
|
13679 | msgid "cloning subrepo %s\n" | |
|
13680 | msgstr "klonar underarkivet %s\n" | |
|
13681 | ||
|
13682 | #, python-format | |
|
13683 | msgid "pulling subrepo %s\n" | |
|
13684 | msgstr "drar underarkivet %s\n" | |
|
13685 | ||
|
13686 | #, python-format | |
|
13687 | msgid "revision %s does not exist in subrepo %s\n" | |
|
13688 | msgstr "revisionen %s existerar inte i underarkivet %s\n" | |
|
13689 | ||
|
13690 | #, python-format | |
|
13691 | msgid "checking out detached HEAD in subrepo %s\n" | |
|
13692 | msgstr "hämtar ut löst HEAD i underarkivet %s\n" | |
|
13693 | ||
|
13694 | msgid "check out a git branch if you intend to make changes\n" | |
|
13695 | msgstr "hämta ut en git-gren om du tänker göra ändringer\n" | |
|
13696 | ||
|
13697 | #, python-format | |
|
13698 | msgid "unrelated git branch checked out in subrepo %s\n" | |
|
13699 | msgstr "obesläktar git-gren hämtar i underarkivet %s\n" | |
|
13700 | ||
|
13701 | #, python-format | |
|
13702 | msgid "pushing branch %s of subrepo %s\n" | |
|
13703 | msgstr "trycker grenen %s från underarkivet %s\n" | |
|
13704 | ||
|
13705 | #, python-format | |
|
13706 | msgid "" | |
|
13707 | "no branch checked out in subrepo %s\n" | |
|
13708 | "cannot push revision %s" | |
|
13709 | msgstr "" | |
|
13710 | "ingen gren uthämtar i underarkivet %s\n" | |
|
13711 | "kan inte trycka revison %s" | |
|
13712 | ||
|
13713 | #, python-format | |
|
13419 | 13714 | msgid "%s, line %s: %s\n" |
|
13420 | 13715 | msgstr "" |
|
13421 | 13716 | |
@@ -13426,25 +13721,39 b' msgstr ""' | |||
|
13426 | 13721 | msgid "node '%s' is not well formed" |
|
13427 | 13722 | msgstr "" |
|
13428 | 13723 | |
|
13429 |
msgid ".hg/ |
|
|
13430 |
msgstr ".hg/ |
|
|
13724 | msgid ".hg/cache/tags is corrupt, rebuilding it\n" | |
|
13725 | msgstr ".hg/cache/tags är korrupt, bygger om den\n" | |
|
13726 | ||
|
13727 | #, python-format | |
|
13728 | msgid "unknown method '%s'" | |
|
13729 | msgstr "okänd metod '%s'" | |
|
13730 | ||
|
13731 | msgid "expected a symbol" | |
|
13732 | msgstr "förväntade en symbol" | |
|
13733 | ||
|
13734 | #, python-format | |
|
13735 | msgid "unknown function '%s'" | |
|
13736 | msgstr "okänd funktion '%s'" | |
|
13737 | ||
|
13738 | msgid "expected template specifier" | |
|
13739 | msgstr "förväntade mallspecifikation" | |
|
13740 | ||
|
13741 | #, python-format | |
|
13742 | msgid "filter %s expects one argument" | |
|
13743 | msgstr "filtret %s kräver ett argument" | |
|
13431 | 13744 | |
|
13432 | 13745 | msgid "unmatched quotes" |
|
13433 | 13746 | msgstr "" |
|
13434 | 13747 | |
|
13435 | 13748 | #, python-format |
|
13436 | msgid "error expanding '%s%%%s'" | |
|
13437 | msgstr "" | |
|
13438 | ||
|
13439 | #, python-format | |
|
13440 | msgid "unknown filter '%s'" | |
|
13441 | msgstr "" | |
|
13442 | ||
|
13443 | #, python-format | |
|
13444 | 13749 | msgid "style not found: %s" |
|
13445 | 13750 | msgstr "" |
|
13446 | 13751 | |
|
13447 | 13752 | #, python-format |
|
13753 | msgid "\"%s\" not in template map" | |
|
13754 | msgstr "\"%s\" finns inte i mallistan" | |
|
13755 | ||
|
13756 | #, python-format | |
|
13448 | 13757 | msgid "template file %s: %s" |
|
13449 | 13758 | msgstr "" |
|
13450 | 13759 | |
@@ -13510,6 +13819,10 b' msgstr ""' | |||
|
13510 | 13819 | msgid "edit failed" |
|
13511 | 13820 | msgstr "" |
|
13512 | 13821 | |
|
13822 | #, python-format | |
|
13823 | msgid "ignoring invalid [auth] key '%s'\n" | |
|
13824 | msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n" | |
|
13825 | ||
|
13513 | 13826 | msgid "http authorization required" |
|
13514 | 13827 | msgstr "http-autenticiering krävs" |
|
13515 | 13828 | |
@@ -13531,9 +13844,8 b' msgstr "anv\xc3\xa4ndare:"' | |||
|
13531 | 13844 | msgid "http auth: user %s, password %s\n" |
|
13532 | 13845 | msgstr "http-auth: användare %s, lösenord %s\n" |
|
13533 | 13846 | |
|
13534 | #, python-format | |
|
13535 | msgid "ignoring invalid [auth] key '%s'\n" | |
|
13536 | msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n" | |
|
13847 | msgid "kb" | |
|
13848 | msgstr "kb" | |
|
13537 | 13849 | |
|
13538 | 13850 | msgid "certificate checking requires Python 2.6" |
|
13539 | 13851 | msgstr "certifikatkontroll kräver Python 2.6" |
@@ -13545,25 +13857,48 b' msgstr "inget certifikat mottaget"' | |||
|
13545 | 13857 | msgid "certificate is for %s" |
|
13546 | 13858 | msgstr "certifikat är för %s" |
|
13547 | 13859 | |
|
13548 | msgid "no commonName found in certificate" | |
|
13549 | msgstr "inget commonName hittades i certifikat" | |
|
13550 | ||
|
13551 | #, python-format | |
|
13552 | msgid "%s certificate error: %s" | |
|
13553 | msgstr "%s certifikatfel: %s" | |
|
13860 | msgid "IDN in certificate not supported" | |
|
13861 | msgstr "IDN i certifikat stöds inte" | |
|
13862 | ||
|
13863 | msgid "no commonName or subjectAltName found in certificate" | |
|
13864 | msgstr "inget commonName eller subjectAltName hittades i certifikat" | |
|
13865 | ||
|
13866 | #, python-format | |
|
13867 | msgid "%s certificate error: %s (use --insecure to connect insecurely)" | |
|
13868 | msgstr "%s-certifikatfel: %s (använd --insecure för att ansluta osäkert)" | |
|
13869 | ||
|
13870 | #, python-format | |
|
13871 | msgid "invalid certificate for %s with fingerprint %s" | |
|
13872 | msgstr "ogiltigt certifikat för %s med fingeravtrycket %s" | |
|
13873 | ||
|
13874 | #, python-format | |
|
13875 | msgid "" | |
|
13876 | "warning: %s certificate with fingerprint %s not verified (check " | |
|
13877 | "hostfingerprints or web.cacerts config setting)\n" | |
|
13878 | msgstr "" | |
|
13879 | "varning: %s-certificatet med fingeravtrycket %s overifierad (kontrollera " | |
|
13880 | "hostfingerprints inställningen web.cacerts)\n" | |
|
13881 | ||
|
13882 | #, python-format | |
|
13883 | msgid "no certificate for %s with configured hostfingerprint" | |
|
13884 | msgstr "inget certifikat för %s med konfigurerat fingeravtryck" | |
|
13554 | 13885 | |
|
13555 | 13886 | #, python-format |
|
13556 | 13887 | msgid "" |
|
13557 | 13888 | "warning: %s certificate not verified (check web.cacerts config setting)\n" |
|
13558 | 13889 | msgstr "" |
|
13559 | "varning: %s-certificatet overifierad (kontrollera inställningen " | |
|
13560 |
" |
|
|
13890 | "varning: %s-certificatet overifierad (kontrollera inställningen web." | |
|
13891 | "cacerts)\n" | |
|
13561 | 13892 | |
|
13562 | 13893 | #, python-format |
|
13563 | 13894 | msgid "command '%s' failed: %s" |
|
13564 | 13895 | msgstr "kommandot '%s' misslyckades: %s" |
|
13565 | 13896 | |
|
13566 | 13897 | #, python-format |
|
13898 | msgid "path ends in directory separator: %s" | |
|
13899 | msgstr "sökvägen slutar med en katalogseparator: %s" | |
|
13900 | ||
|
13901 | #, python-format | |
|
13567 | 13902 | msgid "path contains illegal component: %s" |
|
13568 | 13903 | msgstr "" |
|
13569 | 13904 | |
@@ -13575,9 +13910,6 b' msgstr ""' | |||
|
13575 | 13910 | msgid "path %r traverses symbolic link %r" |
|
13576 | 13911 | msgstr "" |
|
13577 | 13912 | |
|
13578 | msgid "Hardlinks not supported" | |
|
13579 | msgstr "" | |
|
13580 | ||
|
13581 | 13913 | #, python-format |
|
13582 | 13914 | msgid "could not symlink to %r: %s" |
|
13583 | 13915 | msgstr "" |
@@ -13820,17 +14152,14 b' msgstr "%d integritetsfel p\xc3\xa5tr\xc3\xa4ffades!\\n"' | |||
|
13820 | 14152 | msgid "(first damaged changeset appears to be %d)\n" |
|
13821 | 14153 | msgstr "(första skadade ändringen verkar vara %d)\n" |
|
13822 | 14154 | |
|
13823 | msgid "user name not available - set USERNAME environment variable" | |
|
13824 | msgstr "användarnamnet är inte tillgängligt - sätt miljövariabeln USERNAME" | |
|
13825 | ||
|
13826 | 14155 | msgid "look up remote revision" |
|
13827 | 14156 | msgstr "söker fjärrevision" |
|
13828 | 14157 | |
|
14158 | msgid "push failed (unexpected response):" | |
|
14159 | msgstr "tryckning misslyckades (oväntat svar):" | |
|
14160 | ||
|
13829 | 14161 | msgid "look up remote changes" |
|
13830 | 14162 | msgstr "söker fjärrändringar" |
|
13831 | 14163 | |
|
13832 | 14164 | msgid "push failed:" |
|
13833 | 14165 | msgstr "tryckning misslyckades:" |
|
13834 | ||
|
13835 | msgid "push failed (unexpected response):" | |
|
13836 | msgstr "tryckning misslyckades (oväntat svar):" |
General Comments 0
You need to be logged in to leave comments.
Login now