Mercurial > hg
comparison i18n/sv.po @ 12832:64f5ae917020 stable
synchronized with 3d6ba8c2b1b8
author | Jens Bäckman <jens.backman@gmail.com> |
---|---|
date | Thu, 21 Oct 2010 16:57:17 +0200 |
parents | 5491c9644388 |
children | b6fd8157515b |
comparison
equal
deleted
inserted
replaced
12798:3d6ba8c2b1b8 | 12832:64f5ae917020 |
---|---|
11 # | 11 # |
12 msgid "" | 12 msgid "" |
13 msgstr "" | 13 msgstr "" |
14 "Project-Id-Version: Mercurial\n" | 14 "Project-Id-Version: Mercurial\n" |
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | 15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
16 "POT-Creation-Date: 2010-08-01 22:36+0200\n" | 16 "POT-Creation-Date: 2010-10-21 15:40+0200\n" |
17 "PO-Revision-Date: 2010-08-01 22:42+0200\n" | 17 "PO-Revision-Date: 2010-10-21 16:56+0200\n" |
18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" | 18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" |
19 "Language-Team: Swedish\n" | 19 "Language-Team: Swedish\n" |
20 "Language: Swedish\n" | 20 "Language: Swedish\n" |
21 "MIME-Version: 1.0\n" | 21 "MIME-Version: 1.0\n" |
22 "Content-Type: text/plain; charset=utf-8\n" | 22 "Content-Type: text/plain; charset=utf-8\n" |
30 msgstr "Flaggor" | 30 msgstr "Flaggor" |
31 | 31 |
32 msgid "Commands" | 32 msgid "Commands" |
33 msgstr "Kommandon" | 33 msgstr "Kommandon" |
34 | 34 |
35 msgid " options:" | 35 msgid "Extensions" |
36 msgstr " flaggor:" | 36 msgstr "Utökningar" |
37 | |
38 msgid "" | |
39 "This section contains help for extensions that is distributed together with " | |
40 "Mercurial. Help for other extensions is available in the help system." | |
41 msgstr "" | |
42 "Den här sektioner innehåller hjälp för utökningar som levereras med " | |
43 "Mercurial. Hjälp för andra utälningar är tillgängliga i hjälpsystemet." | |
44 | |
45 msgid "options:" | |
46 msgstr "flaggor:" | |
37 | 47 |
38 #, python-format | 48 #, python-format |
39 msgid " aliases: %s" | 49 msgid " aliases: %s" |
40 msgstr " alias: %s" | 50 msgstr " alias: %s" |
41 | 51 |
76 msgid "The allow and deny sections take key-value pairs." | 86 msgid "The allow and deny sections take key-value pairs." |
77 msgstr "" | 87 msgstr "" |
78 | 88 |
79 msgid "" | 89 msgid "" |
80 "Branch-based Access Control\n" | 90 "Branch-based Access Control\n" |
81 "---------------------------" | 91 "..........................." |
82 msgstr "" | 92 msgstr "" |
93 "Grenbaserad Åtkomstkontroll\n" | |
94 "..........................." | |
83 | 95 |
84 msgid "" | 96 msgid "" |
85 "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" | 97 "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" |
86 "have branch-based access control. Keys in these sections can be\n" | 98 "have branch-based access control. Keys in these sections can be\n" |
87 "either:" | 99 "either:" |
100 "- an asterisk, to match anyone;" | 112 "- an asterisk, to match anyone;" |
101 msgstr "" | 113 msgstr "" |
102 | 114 |
103 msgid "" | 115 msgid "" |
104 "Path-based Access Control\n" | 116 "Path-based Access Control\n" |
105 "-------------------------" | 117 "........................." |
106 msgstr "" | 118 msgstr "" |
119 "Sökvägsbaserad Åtkomstkontroll\n" | |
120 ".............................." | |
107 | 121 |
108 msgid "" | 122 msgid "" |
109 "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" | 123 "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" |
110 "access control. Keys in these sections accept a subtree pattern (with\n" | 124 "access control. Keys in these sections accept a subtree pattern (with\n" |
111 "a glob syntax by default). The corresponding values follow the same\n" | 125 "a glob syntax by default). The corresponding values follow the same\n" |
112 "syntax as the other sections above." | 126 "syntax as the other sections above." |
113 msgstr "" | 127 msgstr "" |
114 | 128 |
115 msgid "" | 129 msgid "" |
116 "Groups\n" | 130 "Groups\n" |
117 "------" | 131 "......" |
118 msgstr "" | 132 msgstr "" |
133 "Grupper\n" | |
134 "......." | |
119 | 135 |
120 msgid "" | 136 msgid "" |
121 "Group names must be prefixed with an ``@`` symbol. Specifying a group\n" | 137 "Group names must be prefixed with an ``@`` symbol. Specifying a group\n" |
122 "name has the same effect as specifying all the users in that group." | 138 "name has the same effect as specifying all the users in that group." |
123 msgstr "" | 139 msgstr "" |
129 "Otherwise, an exception will be raised." | 145 "Otherwise, an exception will be raised." |
130 msgstr "" | 146 msgstr "" |
131 | 147 |
132 msgid "" | 148 msgid "" |
133 "Example Configuration\n" | 149 "Example Configuration\n" |
134 "---------------------" | 150 "....................." |
135 msgstr "" | 151 msgstr "" |
152 "Exempelkonfiguration\n" | |
153 "...................." | |
136 | 154 |
137 msgid "::" | 155 msgid "::" |
138 msgstr "::" | 156 msgstr "::" |
139 | 157 |
140 msgid " [hooks]" | 158 msgid " [hooks]" |
291 | 309 |
292 msgid "" | 310 msgid "" |
293 "By default, when several bookmarks point to the same changeset, they\n" | 311 "By default, when several bookmarks point to the same changeset, they\n" |
294 "will all move forward together. It is possible to obtain a more\n" | 312 "will all move forward together. It is possible to obtain a more\n" |
295 "git-like experience by adding the following configuration option to\n" | 313 "git-like experience by adding the following configuration option to\n" |
296 "your .hgrc::" | 314 "your configuration file::" |
297 msgstr "" | 315 msgstr "" |
298 | 316 |
299 msgid "" | 317 msgid "" |
300 " [bookmarks]\n" | 318 " [bookmarks]\n" |
301 " track.current = True" | 319 " track.current = True" |
316 | 334 |
317 msgid "" | 335 msgid "" |
318 " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" | 336 " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" |
319 " directory's parent revision with the given name. If you specify\n" | 337 " directory's parent revision with the given name. If you specify\n" |
320 " a revision using -r REV (where REV may be an existing bookmark),\n" | 338 " a revision using -r REV (where REV may be an existing bookmark),\n" |
321 " the bookmark is assigned to that revision.\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" | |
322 " " | 346 " " |
323 msgstr "" | 347 msgstr "" |
324 | 348 |
325 msgid "a bookmark of this name does not exist" | 349 msgid "a bookmark of this name does not exist" |
326 msgstr "" | 350 msgstr "" |
372 | 396 |
373 #, python-format | 397 #, python-format |
374 msgid "deleting remote bookmark %s\n" | 398 msgid "deleting remote bookmark %s\n" |
375 msgstr "raderar fjärrbokmärket %s\n" | 399 msgstr "raderar fjärrbokmärket %s\n" |
376 | 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 | |
377 msgid "searching for changes\n" | 405 msgid "searching for changes\n" |
378 msgstr "söker efter ändringar\n" | 406 msgstr "söker efter ändringar\n" |
379 | 407 |
380 msgid "no changes found\n" | 408 msgid "no changes found\n" |
381 msgstr "inga ändringar hittades\n" | 409 msgstr "inga ändringar hittades\n" |
385 msgstr "jämför med %s\n" | 413 msgstr "jämför med %s\n" |
386 | 414 |
387 msgid "bookmark to import" | 415 msgid "bookmark to import" |
388 msgstr "bokmärke att importera" | 416 msgstr "bokmärke att importera" |
389 | 417 |
418 msgid "BOOKMARK" | |
419 msgstr "BOKMÄRKE" | |
420 | |
390 msgid "bookmark to export" | 421 msgid "bookmark to export" |
391 msgstr "bokmärke att exportera" | 422 msgstr "bokmärke att exportera" |
392 | 423 |
393 msgid "compare bookmark" | 424 msgid "compare bookmark" |
394 msgstr "jämför bokmärke" | 425 msgstr "jämför bokmärke" |
426 | |
427 msgid "bookmark takes one or no arguments" | |
428 msgstr "bookmark tar ett eller inga argument" | |
429 | |
430 msgid "the argument to bookmark must be a string" | |
431 msgstr "argumentet till bookmark måste vara en sträng" | |
432 | |
433 msgid "" | |
434 "\n" | |
435 "Added by the bookmarks extension:" | |
436 msgstr "" | |
437 "\n" | |
438 "Tillagda av bookmarks-utökningen:" | |
439 | |
440 msgid "" | |
441 "``bookmark([name])``\n" | |
442 " The named bookmark or all bookmarks.\n" | |
443 msgstr "" | |
444 "``bookmark([namn])``\n" | |
445 " Det angivna bokmärket eller alla bokmärken.\n" | |
395 | 446 |
396 msgid "force" | 447 msgid "force" |
397 msgstr "tvinga" | 448 msgstr "tvinga" |
398 | 449 |
399 msgid "REV" | 450 msgid "REV" |
766 " Such a file may be specified with the --aliases option, otherwise\n" | 817 " Such a file may be specified with the --aliases option, otherwise\n" |
767 " a .hgchurn file will be looked for in the working directory root.\n" | 818 " a .hgchurn file will be looked for in the working directory root.\n" |
768 " " | 819 " " |
769 msgstr "" | 820 msgstr "" |
770 | 821 |
822 #, python-format | |
823 msgid "skipping malformed alias: %s\n" | |
824 msgstr "hoppar över defekt alias: %s\n" | |
825 | |
771 msgid "count rate for the specified revision or range" | 826 msgid "count rate for the specified revision or range" |
772 msgstr "" | 827 msgstr "" |
773 | 828 |
774 msgid "DATE" | 829 msgid "DATE" |
775 msgstr "DATUM" | 830 msgstr "DATUM" |
833 "Andra effekter förutom färg, såsom fet och understryken text, är också\n" | 888 "Andra effekter förutom färg, såsom fet och understryken text, är också\n" |
834 "tillgänglig. Effekter renderas med kontrollfunktionerna ECMA-48 SGR\n" | 889 "tillgänglig. Effekter renderas med kontrollfunktionerna ECMA-48 SGR\n" |
835 "(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n" | 890 "(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n" |
836 "render_text, som kan användas för att lägga till effekter på valfri text." | 891 "render_text, som kan användas för att lägga till effekter på valfri text." |
837 | 892 |
838 msgid "Default effects may be overridden from the .hgrc file::" | 893 msgid "Default effects may be overridden from your configuration file::" |
839 msgstr "Standardeffekter kan ersättas från .hgrc-filen::" | 894 msgstr "Standardeffekter kan ersättas från din konfiturationsfil::" |
840 | 895 |
841 msgid "" | 896 msgid "" |
842 " [color]\n" | 897 " [color]\n" |
843 " status.modified = blue bold underline red_background\n" | 898 " status.modified = blue bold underline red_background\n" |
844 " status.added = green bold\n" | 899 " status.added = green bold\n" |
903 | 958 |
904 msgid " bookmarks.current = green" | 959 msgid " bookmarks.current = green" |
905 msgstr " bookmarks.current = green" | 960 msgstr " bookmarks.current = green" |
906 | 961 |
907 msgid "" | 962 msgid "" |
963 " branches.active = none\n" | |
964 " branches.closed = black bold\n" | |
965 " branches.current = green\n" | |
966 " branches.inactive = none" | |
967 msgstr "" | |
968 " branches.active = none\n" | |
969 " branches.closed = black bold\n" | |
970 " branches.current = green\n" | |
971 " branches.inactive = none" | |
972 | |
973 msgid "" | |
908 "The color extension will try to detect whether to use ANSI codes or\n" | 974 "The color extension will try to detect whether to use ANSI codes or\n" |
909 "Win32 console APIs, unless it is made explicit::" | 975 "Win32 console APIs, unless it is made explicit::" |
910 msgstr "" | 976 msgstr "" |
911 "Utökningen color försöker att upptäcka om ANSI-koder eller APIer för\n" | 977 "Utökningen color försöker att upptäcka om ANSI-koder eller APIer för\n" |
912 "konsolen i Win32 om det inte anges explicit::" | 978 "konsolen i Win32 om det inte anges explicit::" |
926 msgstr "ignorerar okänd färg/effekt %r (konfigurerad i color.%s)\n" | 992 msgstr "ignorerar okänd färg/effekt %r (konfigurerad i color.%s)\n" |
927 | 993 |
928 msgid "win32console not found, please install pywin32\n" | 994 msgid "win32console not found, please install pywin32\n" |
929 msgstr "win32console hittades inte, installera pywin32\n" | 995 msgstr "win32console hittades inte, installera pywin32\n" |
930 | 996 |
931 msgid "when to colorize (always, auto, or never)" | 997 msgid "when to colorize (boolean, always, auto, or never)" |
932 msgstr "när färgläggning ska ske (always, auto eller never)" | 998 msgstr "när färgläggning ska ske (boolean, always, auto eller never)" |
933 | 999 |
934 msgid "TYPE" | 1000 msgid "TYPE" |
935 msgstr "TYP" | 1001 msgstr "TYP" |
936 | 1002 |
937 msgid "import revisions from foreign VCS repositories into Mercurial" | 1003 msgid "import revisions from foreign VCS repositories into Mercurial" |
969 " (given in a format understood by the source)." | 1035 " (given in a format understood by the source)." |
970 msgstr "" | 1036 msgstr "" |
971 | 1037 |
972 msgid "" | 1038 msgid "" |
973 " If no destination directory name is specified, it defaults to the\n" | 1039 " If no destination directory name is specified, it defaults to the\n" |
974 " basename of the source with '-hg' appended. If the destination\n" | 1040 " basename of the source with ``-hg`` appended. If the destination\n" |
975 " repository doesn't exist, it will be created." | 1041 " repository doesn't exist, it will be created." |
976 msgstr "" | 1042 msgstr "" |
1043 " Om ingen destinationskatalog anges, kommer basnamnet för källan med\n" | |
1044 " ``-hg`` tillagd. Om destinationsarkivet inte existerar, så kommer det\n" | |
1045 " att skapas." | |
977 | 1046 |
978 msgid "" | 1047 msgid "" |
979 " By default, all sources except Mercurial will use --branchsort.\n" | 1048 " By default, all sources except Mercurial will use --branchsort.\n" |
980 " Mercurial uses --sourcesort to preserve original revision numbers\n" | 1049 " Mercurial uses --sourcesort to preserve original revision numbers\n" |
981 " order. Sort modes have the following effects:" | 1050 " order. Sort modes have the following effects:" |
1009 msgid " <source ID> <destination ID>" | 1078 msgid " <source ID> <destination ID>" |
1010 msgstr "" | 1079 msgstr "" |
1011 | 1080 |
1012 msgid "" | 1081 msgid "" |
1013 " If the file doesn't exist, it's automatically created. It's\n" | 1082 " If the file doesn't exist, it's automatically created. It's\n" |
1014 " updated on each commit copied, so convert-repo can be interrupted\n" | 1083 " updated on each commit copied, so :hg:`convert` can be interrupted\n" |
1015 " and can be run repeatedly to copy new commits." | 1084 " and can be run repeatedly to copy new commits." |
1016 msgstr "" | 1085 msgstr "" |
1017 | 1086 |
1018 msgid "" | 1087 msgid "" |
1019 " The [username mapping] file is a simple text file that maps each\n" | 1088 " The authormap is a simple text file that maps each source commit\n" |
1020 " source commit author to a destination commit author. It is handy\n" | 1089 " author to a destination commit author. It is handy for source SCMs\n" |
1021 " for source SCMs that use unix logins to identify authors (eg:\n" | 1090 " that use unix logins to identify authors (eg: CVS). One line per\n" |
1022 " CVS). One line per author mapping and the line format is:\n" | 1091 " author mapping and the line format is::" |
1023 " srcauthor=whatever string you want" | 1092 msgstr "" |
1093 | |
1094 msgid " source author = destination author" | |
1095 msgstr "" | |
1096 | |
1097 msgid " Empty lines and lines starting with a ``#`` are ignored." | |
1024 msgstr "" | 1098 msgstr "" |
1025 | 1099 |
1026 msgid "" | 1100 msgid "" |
1027 " The filemap is a file that allows filtering and remapping of files\n" | 1101 " The filemap is a file that allows filtering and remapping of files\n" |
1028 " and directories. Each line can contain one of the following\n" | 1102 " and directories. Each line can contain one of the following\n" |
1037 | 1111 |
1038 msgid " rename path/to/source path/to/destination" | 1112 msgid " rename path/to/source path/to/destination" |
1039 msgstr " rename sökväg/till/källa sökväg/till/destination" | 1113 msgstr " rename sökväg/till/källa sökväg/till/destination" |
1040 | 1114 |
1041 msgid "" | 1115 msgid "" |
1042 " Comment lines start with '#'. A specificed path matches if it\n" | 1116 " Comment lines start with ``#``. A specified path matches if it\n" |
1043 " equals the full relative name of a file or one of its parent\n" | 1117 " equals the full relative name of a file or one of its parent\n" |
1044 " directories. The 'include' or 'exclude' directive with the longest\n" | 1118 " directories. The ``include`` or ``exclude`` directive with the\n" |
1045 " matching path applies, so line order does not matter." | 1119 " longest matching path applies, so line order does not matter." |
1046 msgstr "" | 1120 msgstr "" |
1047 | 1121 |
1048 msgid "" | 1122 msgid "" |
1049 " The 'include' directive causes a file, or all files under a\n" | 1123 " The ``include`` directive causes a file, or all files under a\n" |
1050 " directory, to be included in the destination repository, and the\n" | 1124 " directory, to be included in the destination repository, and the\n" |
1051 " exclusion of all other files and directories not explicitly\n" | 1125 " exclusion of all other files and directories not explicitly\n" |
1052 " included. The 'exclude' directive causes files or directories to\n" | 1126 " included. The ``exclude`` directive causes files or directories to\n" |
1053 " be omitted. The 'rename' directive renames a file or directory if\n" | 1127 " be omitted. The ``rename`` directive renames a file or directory if\n" |
1054 " is converted. To rename from a subdirectory into the root of the\n" | 1128 " it is converted. To rename from a subdirectory into the root of\n" |
1055 " repository, use '.' as the path to rename to." | 1129 " the repository, use ``.`` as the path to rename to." |
1056 msgstr "" | 1130 msgstr "" |
1057 | 1131 |
1058 msgid "" | 1132 msgid "" |
1059 " The splicemap is a file that allows insertion of synthetic\n" | 1133 " The splicemap is a file that allows insertion of synthetic\n" |
1060 " history, letting you specify the parents of a revision. This is\n" | 1134 " history, letting you specify the parents of a revision. This is\n" |
1061 " useful if you want to e.g. give a Subversion merge two parents, or\n" | 1135 " useful if you want to e.g. give a Subversion merge two parents, or\n" |
1062 " graft two disconnected series of history together. Each entry\n" | 1136 " graft two disconnected series of history together. Each entry\n" |
1063 " contains a key, followed by a space, followed by one or two\n" | 1137 " contains a key, followed by a space, followed by one or two\n" |
1064 " comma-separated values. The key is the revision ID in the source\n" | 1138 " comma-separated values::" |
1139 msgstr "" | |
1140 | |
1141 msgid " key parent1, parent2" | |
1142 msgstr "" | |
1143 | |
1144 msgid "" | |
1145 " The key is the revision ID in the source\n" | |
1065 " revision control system whose parents should be modified (same\n" | 1146 " revision control system whose parents should be modified (same\n" |
1066 " format as a key in .hg/shamap). The values are the revision IDs\n" | 1147 " format as a key in .hg/shamap). The values are the revision IDs\n" |
1067 " (in either the source or destination revision control system) that\n" | 1148 " (in either the source or destination revision control system) that\n" |
1068 " should be used as the new parents for that node. For example, if\n" | 1149 " should be used as the new parents for that node. For example, if\n" |
1069 " you have merged \"release-1.0\" into \"trunk\", then you should\n" | 1150 " you have merged \"release-1.0\" into \"trunk\", then you should\n" |
1075 " The branchmap is a file that allows you to rename a branch when it is\n" | 1156 " The branchmap is a file that allows you to rename a branch when it is\n" |
1076 " being brought in from whatever external repository. When used in\n" | 1157 " being brought in from whatever external repository. When used in\n" |
1077 " conjunction with a splicemap, it allows for a powerful combination\n" | 1158 " conjunction with a splicemap, it allows for a powerful combination\n" |
1078 " to help fix even the most badly mismanaged repositories and turn them\n" | 1159 " to help fix even the most badly mismanaged repositories and turn them\n" |
1079 " into nicely structured Mercurial repositories. The branchmap contains\n" | 1160 " into nicely structured Mercurial repositories. The branchmap contains\n" |
1080 " lines of the form \"original_branch_name new_branch_name\".\n" | 1161 " lines of the form::" |
1081 " \"original_branch_name\" is the name of the branch in the source\n" | 1162 msgstr "" |
1082 " repository, and \"new_branch_name\" is the name of the branch is the\n" | 1163 |
1083 " destination repository. This can be used to (for instance) move code\n" | 1164 msgid " original_branch_name new_branch_name" |
1084 " in one repository from \"default\" to a named branch." | 1165 msgstr "" |
1166 | |
1167 msgid "" | |
1168 " where \"original_branch_name\" is the name of the branch in the\n" | |
1169 " source repository, and \"new_branch_name\" is the name of the branch\n" | |
1170 " is the destination repository. No whitespace is allowed in the\n" | |
1171 " branch names. This can be used to (for instance) move code in one\n" | |
1172 " repository from \"default\" to a named branch." | |
1085 msgstr "" | 1173 msgstr "" |
1086 | 1174 |
1087 msgid "" | 1175 msgid "" |
1088 " Mercurial Source\n" | 1176 " Mercurial Source\n" |
1089 " ----------------" | 1177 " ''''''''''''''''" |
1090 msgstr "" | 1178 msgstr "" |
1179 " Mercurial-källa\n" | |
1180 " '''''''''''''''" | |
1091 | 1181 |
1092 msgid "" | 1182 msgid "" |
1093 " --config convert.hg.ignoreerrors=False (boolean)\n" | 1183 " --config convert.hg.ignoreerrors=False (boolean)\n" |
1094 " ignore integrity errors when reading. Use it to fix Mercurial\n" | 1184 " ignore integrity errors when reading. Use it to fix Mercurial\n" |
1095 " repositories with missing revlogs, by converting from and to\n" | 1185 " repositories with missing revlogs, by converting from and to\n" |
1101 " convert start revision and its descendants" | 1191 " convert start revision and its descendants" |
1102 msgstr "" | 1192 msgstr "" |
1103 | 1193 |
1104 msgid "" | 1194 msgid "" |
1105 " CVS Source\n" | 1195 " CVS Source\n" |
1106 " ----------" | 1196 " ''''''''''" |
1107 msgstr "" | 1197 msgstr "" |
1198 " CVS-källa\n" | |
1199 " '''''''''" | |
1108 | 1200 |
1109 msgid "" | 1201 msgid "" |
1110 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" | 1202 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" |
1111 " to indicate the starting point of what will be converted. Direct\n" | 1203 " to indicate the starting point of what will be converted. Direct\n" |
1112 " access to the repository files is not needed, unless of course the\n" | 1204 " access to the repository files is not needed, unless of course the\n" |
1158 " the command help for more details." | 1250 " the command help for more details." |
1159 msgstr "" | 1251 msgstr "" |
1160 | 1252 |
1161 msgid "" | 1253 msgid "" |
1162 " Subversion Source\n" | 1254 " Subversion Source\n" |
1163 " -----------------" | 1255 " '''''''''''''''''" |
1164 msgstr "" | 1256 msgstr "" |
1257 " Subversion-källa\n" | |
1258 " ''''''''''''''''" | |
1165 | 1259 |
1166 msgid "" | 1260 msgid "" |
1167 " Subversion source detects classical trunk/branches/tags layouts.\n" | 1261 " Subversion source detects classical trunk/branches/tags layouts.\n" |
1168 " By default, the supplied \"svn://repo/path/\" source URL is\n" | 1262 " By default, the supplied \"svn://repo/path/\" source URL is\n" |
1169 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" | 1263 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" |
1196 " specify start Subversion revision." | 1290 " specify start Subversion revision." |
1197 msgstr "" | 1291 msgstr "" |
1198 | 1292 |
1199 msgid "" | 1293 msgid "" |
1200 " Perforce Source\n" | 1294 " Perforce Source\n" |
1201 " ---------------" | 1295 " '''''''''''''''" |
1202 msgstr "" | 1296 msgstr "" |
1297 " Perforce-källa\n" | |
1298 " ''''''''''''''" | |
1203 | 1299 |
1204 msgid "" | 1300 msgid "" |
1205 " The Perforce (P4) importer can be given a p4 depot path or a\n" | 1301 " The Perforce (P4) importer can be given a p4 depot path or a\n" |
1206 " client specification as source. It will convert all files in the\n" | 1302 " client specification as source. It will convert all files in the\n" |
1207 " source to a flat Mercurial repository, ignoring labels, branches\n" | 1303 " source to a flat Mercurial repository, ignoring labels, branches\n" |
1220 " specify initial Perforce revision." | 1316 " specify initial Perforce revision." |
1221 msgstr "" | 1317 msgstr "" |
1222 | 1318 |
1223 msgid "" | 1319 msgid "" |
1224 " Mercurial Destination\n" | 1320 " Mercurial Destination\n" |
1225 " ---------------------" | 1321 " '''''''''''''''''''''" |
1226 msgstr "" | 1322 msgstr "" |
1323 " Mercurial-destination\n" | |
1324 " '''''''''''''''''''''" | |
1227 | 1325 |
1228 msgid "" | 1326 msgid "" |
1229 " --config convert.hg.clonebranches=False (boolean)\n" | 1327 " --config convert.hg.clonebranches=False (boolean)\n" |
1230 " dispatch source branches in separate clones.\n" | 1328 " dispatch source branches in separate clones.\n" |
1231 " --config convert.hg.tagsbranch=default (branch name)\n" | 1329 " --config convert.hg.tagsbranch=default (branch name)\n" |
1251 " named directory) in the CVS repository, and converts the log to a\n" | 1349 " named directory) in the CVS repository, and converts the log to a\n" |
1252 " series of changesets based on matching commit log entries and\n" | 1350 " series of changesets based on matching commit log entries and\n" |
1253 " dates." | 1351 " dates." |
1254 msgstr "" | 1352 msgstr "" |
1255 | 1353 |
1256 msgid "username mapping filename" | 1354 msgid "username mapping filename (DEPRECATED, use --authormap instead)" |
1355 msgstr "" | |
1356 | |
1357 msgid "source repository type" | |
1257 msgstr "" | 1358 msgstr "" |
1258 | 1359 |
1259 msgid "destination repository type" | 1360 msgid "destination repository type" |
1260 msgstr "" | 1361 msgstr "" |
1261 | 1362 |
1363 msgid "import up to target revision REV" | |
1364 msgstr "" | |
1365 | |
1366 msgid "remap usernames using this file" | |
1367 msgstr "" | |
1368 | |
1262 msgid "remap file names using contents of file" | 1369 msgid "remap file names using contents of file" |
1263 msgstr "" | |
1264 | |
1265 msgid "import up to target revision REV" | |
1266 msgstr "" | |
1267 | |
1268 msgid "source repository type" | |
1269 msgstr "" | 1370 msgstr "" |
1270 | 1371 |
1271 msgid "splice synthesized history into place" | 1372 msgid "splice synthesized history into place" |
1272 msgstr "" | 1373 msgstr "" |
1273 | 1374 |
1380 | 1481 |
1381 #, python-format | 1482 #, python-format |
1382 msgid "%s: unknown repository type" | 1483 msgid "%s: unknown repository type" |
1383 msgstr "%s: okänd arkivtyp" | 1484 msgstr "%s: okänd arkivtyp" |
1384 | 1485 |
1385 msgid "retrieving file" | 1486 msgid "getting files" |
1386 msgstr "hämtar fil" | 1487 msgstr "hämtar filer" |
1387 | 1488 |
1388 msgid "revisions" | 1489 msgid "revisions" |
1389 msgstr "revisioner" | 1490 msgstr "revisioner" |
1390 | 1491 |
1391 msgid "scanning" | 1492 msgid "scanning" |
1553 msgstr "" | 1654 msgstr "" |
1554 | 1655 |
1555 msgid "Python ElementTree module is not available" | 1656 msgid "Python ElementTree module is not available" |
1556 msgstr "" | 1657 msgstr "" |
1557 | 1658 |
1659 #, python-format | |
1660 msgid "%s repository format is unsupported, please upgrade" | |
1661 msgstr "" | |
1662 | |
1663 msgid "failed to detect repository format!" | |
1664 msgstr "" | |
1665 | |
1558 msgid "internal calling inconsistency" | 1666 msgid "internal calling inconsistency" |
1559 msgstr "" | 1667 msgstr "" |
1560 | 1668 |
1561 msgid "errors in filemap" | 1669 msgid "errors in filemap" |
1562 msgstr "" | 1670 msgstr "" |
1563 | 1671 |
1564 #, python-format | 1672 #, python-format |
1673 msgid "%s:%d: path to %s is missing\n" | |
1674 msgstr "" | |
1675 | |
1676 #, python-format | |
1565 msgid "%s:%d: %r already in %s list\n" | 1677 msgid "%s:%d: %r already in %s list\n" |
1678 msgstr "" | |
1679 | |
1680 #, python-format | |
1681 msgid "%s:%d: superfluous / in %s %r\n" | |
1566 msgstr "" | 1682 msgstr "" |
1567 | 1683 |
1568 #, python-format | 1684 #, python-format |
1569 msgid "%s:%d: unknown directive %r\n" | 1685 msgid "%s:%d: unknown directive %r\n" |
1570 msgstr "" | 1686 msgstr "" |
1747 msgstr "" | 1863 msgstr "" |
1748 | 1864 |
1749 msgid "unable to cope with svn output" | 1865 msgid "unable to cope with svn output" |
1750 msgstr "" | 1866 msgstr "" |
1751 | 1867 |
1752 msgid "XXX TAGS NOT IMPLEMENTED YET\n" | 1868 msgid "writing Subversion tags is not yet implemented\n" |
1753 msgstr "" | 1869 msgstr "" |
1754 | 1870 |
1755 msgid "automatically manage newlines in repository files" | 1871 msgid "automatically manage newlines in repository files" |
1756 msgstr "" | 1872 msgstr "" |
1757 | 1873 |
1972 " between those revisions. If only one revision is specified then\n" | 2088 " between those revisions. If only one revision is specified then\n" |
1973 " that revision is compared to the working directory, and, when no\n" | 2089 " that revision is compared to the working directory, and, when no\n" |
1974 " revisions are specified, the working directory files are compared\n" | 2090 " revisions are specified, the working directory files are compared\n" |
1975 " to its parent." | 2091 " to its parent." |
1976 msgstr "" | 2092 msgstr "" |
2093 " När två revisionsargument ges, kommer ändringar mellan revisionerna\n" | |
2094 " att visas. Om bara en revision anges så jämförs den revisionen med\n" | |
2095 " arbetskatalogen, och, när ingen revision anges, jämförs arbetskatalogen\n" | |
2096 " med dess förälder." | |
1977 | 2097 |
1978 msgid "CMD" | 2098 msgid "CMD" |
1979 msgstr "" | 2099 msgstr "KMD" |
1980 | 2100 |
1981 msgid "comparison program to run" | 2101 msgid "comparison program to run" |
1982 msgstr "" | 2102 msgstr "" |
1983 | 2103 |
1984 msgid "OPT" | 2104 msgid "OPT" |
2030 " \"authoritative\". The head of the new changes is used as the first\n" | 2150 " \"authoritative\". The head of the new changes is used as the first\n" |
2031 " parent, with local changes as the second. To switch the merge\n" | 2151 " parent, with local changes as the second. To switch the merge\n" |
2032 " order, use --switch-parent." | 2152 " order, use --switch-parent." |
2033 msgstr "" | 2153 msgstr "" |
2034 | 2154 |
2155 msgid " See :hg:`help dates` for a list of formats valid for -d/--date." | |
2156 msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." | |
2157 | |
2158 msgid "" | |
2159 " Returns 0 on success.\n" | |
2160 " " | |
2161 msgstr "" | |
2162 " Returnerar 0 om kommandot lyckades.\n" | |
2163 " " | |
2164 | |
2165 msgid "" | |
2166 "working dir not at branch tip (use \"hg update\" to check out branch tip)" | |
2167 msgstr "" | |
2168 "arbetskatalogen är inte på grentoppen (använd \"hg update\" för att hämta ut " | |
2169 "grentoppen)" | |
2170 | |
2171 msgid "outstanding uncommitted merge" | |
2172 msgstr "kvarvarande oarkiverad sammanfogning" | |
2173 | |
2174 msgid "outstanding uncommitted changes" | |
2175 msgstr "kvarvarande oarkiverade ändringar" | |
2176 | |
2177 msgid "working directory is missing some files" | |
2178 msgstr "arbetskatalogen saknar några filer" | |
2179 | |
2180 msgid "" | |
2181 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" | |
2182 msgstr "" | |
2183 "flera huvuden i denna gren (använd \"hg heads .\" och \"hg merge\" för att " | |
2184 "sammanfoga)" | |
2185 | |
2186 #, python-format | |
2187 msgid "pulling from %s\n" | |
2188 msgstr "drar från %s\n" | |
2189 | |
2190 msgid "" | |
2191 "Other repository doesn't support revision lookup, so a rev cannot be " | |
2192 "specified." | |
2193 msgstr "" | |
2194 "Det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " | |
2195 "anges." | |
2196 | |
2197 #, python-format | |
2198 msgid "" | |
2199 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" | |
2200 "\" to merge them)\n" | |
2201 msgstr "" | |
2202 "sammanfogar inte med %d andra nya grenhuvuden (använd \"hg heads .\" och " | |
2203 "\"hg merge\" för att sammanfoga dem)\n" | |
2204 | |
2205 #, python-format | |
2206 msgid "updating to %d:%s\n" | |
2207 msgstr "uppdaterar till %d:%s\n" | |
2208 | |
2209 #, python-format | |
2210 msgid "merging with %d:%s\n" | |
2211 msgstr "sammanfogar med %d:%s\n" | |
2212 | |
2213 #, python-format | |
2214 msgid "new changeset %d:%s merges remote changes with local\n" | |
2215 msgstr "nya ändringen %d:%s sammanfogar fjärrändringar med lokala\n" | |
2216 | |
2217 msgid "a specific revision you would like to pull" | |
2218 msgstr "en specifik revision som du vill dra" | |
2219 | |
2220 msgid "edit commit message" | |
2221 msgstr "redigera arkiveringsmeddelande" | |
2222 | |
2223 msgid "edit commit message (DEPRECATED)" | |
2224 msgstr "redigera arkiveringsmeddelande (FÖRÅLDRAD)" | |
2225 | |
2226 msgid "switch parents when merging" | |
2227 msgstr "byt föräldrar vid sammanfogning" | |
2228 | |
2229 msgid "hg fetch [SOURCE]" | |
2230 msgstr "hg fetch [KÄLLA]" | |
2231 | |
2232 msgid "commands to sign and verify changesets" | |
2233 msgstr "kommandon för att signera och verifiera ändringar" | |
2234 | |
2235 msgid "error while verifying signature" | |
2236 msgstr "fel vid verifiering av signatur" | |
2237 | |
2238 #, python-format | |
2239 msgid "%s Bad signature from \"%s\"\n" | |
2240 msgstr "%s Dålig signatur från \"%s\"\n" | |
2241 | |
2242 #, python-format | |
2243 msgid "%s Note: Signature has expired (signed by: \"%s\")\n" | |
2244 msgstr "%s Notera: Signaturen har gått ut (signerad av: \"%s\")\n" | |
2245 | |
2246 #, python-format | |
2247 msgid "%s Note: This key has expired (signed by: \"%s\")\n" | |
2248 msgstr "%s Notera: Den här nyckenl har gått ut (signerad av: \"%s\")\n" | |
2249 | |
2250 msgid "list signed changesets" | |
2251 msgstr "visa signerade ändringar" | |
2252 | |
2253 #, python-format | |
2254 msgid "%s:%d node does not exist\n" | |
2255 msgstr "%s:%d noden existerar inte\n" | |
2256 | |
2257 msgid "verify all the signatures there may be for a particular revision" | |
2258 msgstr "verifiera alla signaturerna som finns för en viss revision" | |
2259 | |
2260 #, python-format | |
2261 msgid "No valid signature for %s\n" | |
2262 msgstr "Ingen giltig signatur för %s\n" | |
2263 | |
2264 msgid "add a signature for the current or given revision" | |
2265 msgstr "lägg till en signatur för den aktuella eller angivna revisionen" | |
2266 | |
2267 msgid "" | |
2268 " If no revision is given, the parent of the working directory is used,\n" | |
2269 " or tip if no revision is checked out." | |
2270 msgstr "" | |
2271 " Om ingen revision anges, så används arbetskatalogens föräldern, eller\n" | |
2272 " toppen om ingen revision är uthämtad." | |
2273 | |
2035 msgid "" | 2274 msgid "" |
2036 " See :hg:`help dates` for a list of formats valid for -d/--date.\n" | 2275 " See :hg:`help dates` for a list of formats valid for -d/--date.\n" |
2037 " " | 2276 " " |
2038 msgstr "" | 2277 msgstr "" |
2039 " Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n" | 2278 " Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n" |
2040 " " | 2279 " " |
2041 | 2280 |
2042 msgid "" | |
2043 "working dir not at branch tip (use \"hg update\" to check out branch tip)" | |
2044 msgstr "" | |
2045 | |
2046 msgid "outstanding uncommitted merge" | |
2047 msgstr "" | |
2048 | |
2049 msgid "outstanding uncommitted changes" | |
2050 msgstr "" | |
2051 | |
2052 msgid "working directory is missing some files" | |
2053 msgstr "" | |
2054 | |
2055 msgid "" | |
2056 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" | |
2057 msgstr "" | |
2058 | |
2059 #, python-format | |
2060 msgid "pulling from %s\n" | |
2061 msgstr "drar från %s\n" | |
2062 | |
2063 msgid "" | |
2064 "Other repository doesn't support revision lookup, so a rev cannot be " | |
2065 "specified." | |
2066 msgstr "" | |
2067 | |
2068 #, python-format | |
2069 msgid "" | |
2070 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" | |
2071 "\" to merge them)\n" | |
2072 msgstr "" | |
2073 | |
2074 #, python-format | |
2075 msgid "updating to %d:%s\n" | |
2076 msgstr "" | |
2077 | |
2078 #, python-format | |
2079 msgid "merging with %d:%s\n" | |
2080 msgstr "" | |
2081 | |
2082 #, python-format | |
2083 msgid "new changeset %d:%s merges remote changes with local\n" | |
2084 msgstr "" | |
2085 | |
2086 msgid "a specific revision you would like to pull" | |
2087 msgstr "" | |
2088 | |
2089 msgid "edit commit message" | |
2090 msgstr "" | |
2091 | |
2092 msgid "edit commit message (DEPRECATED)" | |
2093 msgstr "" | |
2094 | |
2095 msgid "switch parents when merging" | |
2096 msgstr "" | |
2097 | |
2098 msgid "hg fetch [SOURCE]" | |
2099 msgstr "" | |
2100 | |
2101 msgid "commands to sign and verify changesets" | |
2102 msgstr "" | |
2103 | |
2104 msgid "error while verifying signature" | |
2105 msgstr "" | |
2106 | |
2107 #, python-format | |
2108 msgid "%s Bad signature from \"%s\"\n" | |
2109 msgstr "" | |
2110 | |
2111 #, python-format | |
2112 msgid "%s Note: Signature has expired (signed by: \"%s\")\n" | |
2113 msgstr "" | |
2114 | |
2115 #, python-format | |
2116 msgid "%s Note: This key has expired (signed by: \"%s\")\n" | |
2117 msgstr "" | |
2118 | |
2119 msgid "list signed changesets" | |
2120 msgstr "" | |
2121 | |
2122 #, python-format | |
2123 msgid "%s:%d node does not exist\n" | |
2124 msgstr "" | |
2125 | |
2126 msgid "verify all the signatures there may be for a particular revision" | |
2127 msgstr "" | |
2128 | |
2129 #, python-format | |
2130 msgid "No valid signature for %s\n" | |
2131 msgstr "" | |
2132 | |
2133 msgid "add a signature for the current or given revision" | |
2134 msgstr "" | |
2135 | |
2136 msgid "" | |
2137 " If no revision is given, the parent of the working directory is used,\n" | |
2138 " or tip if no revision is checked out." | |
2139 msgstr "" | |
2140 | |
2141 msgid "uncommitted merge - please provide a specific revision" | 2281 msgid "uncommitted merge - please provide a specific revision" |
2142 msgstr "" | 2282 msgstr "" |
2143 | 2283 |
2144 #, python-format | 2284 #, python-format |
2145 msgid "Signing %d:%s\n" | 2285 msgid "Signing %d:%s\n" |
2146 msgstr "Signerar %d:%s\n" | 2286 msgstr "Signerar %d:%s\n" |
2147 | 2287 |
2148 msgid "Error while signing" | 2288 msgid "error while signing" |
2149 msgstr "" | 2289 msgstr "" |
2150 | 2290 |
2151 msgid "" | 2291 msgid "" |
2152 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --" | 2292 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --" |
2153 "force)" | 2293 "force)" |
2311 msgstr "" | 2451 msgstr "" |
2312 | 2452 |
2313 msgid "" | 2453 msgid "" |
2314 "The :hg:`view` command will launch the hgk Tcl script. For this command\n" | 2454 "The :hg:`view` command will launch the hgk Tcl script. For this command\n" |
2315 "to work, hgk must be in your search path. Alternately, you can specify\n" | 2455 "to work, hgk must be in your search path. Alternately, you can specify\n" |
2316 "the path to hgk in your .hgrc file::" | 2456 "the path to hgk in your configuration file::" |
2317 msgstr "" | 2457 msgstr "" |
2318 | 2458 |
2319 msgid "" | 2459 msgid "" |
2320 " [hgk]\n" | 2460 " [hgk]\n" |
2321 " path=/location/of/hgk" | 2461 " path=/location/of/hgk" |
2640 "change history. The mechanism can be regarded as a convenience for the\n" | 2780 "change history. The mechanism can be regarded as a convenience for the\n" |
2641 "current user or for archive distribution." | 2781 "current user or for archive distribution." |
2642 msgstr "" | 2782 msgstr "" |
2643 | 2783 |
2644 msgid "" | 2784 msgid "" |
2785 "Keywords expand to the changeset data pertaining to the latest change\n" | |
2786 "relative to the working directory parent of each file." | |
2787 msgstr "" | |
2788 | |
2789 msgid "" | |
2645 "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" | 2790 "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" |
2646 "sections of hgrc files." | 2791 "sections of hgrc files." |
2647 msgstr "" | 2792 msgstr "" |
2648 | 2793 |
2649 msgid "Example::" | 2794 msgid "Example::" |
2661 " # prefer svn- over cvs-like default keywordmaps\n" | 2806 " # prefer svn- over cvs-like default keywordmaps\n" |
2662 " svn = True" | 2807 " svn = True" |
2663 msgstr "" | 2808 msgstr "" |
2664 | 2809 |
2665 msgid "" | 2810 msgid "" |
2666 "NOTE: the more specific you are in your filename patterns the less you\n" | 2811 ".. note::\n" |
2667 "lose speed in huge repositories." | 2812 " The more specific you are in your filename patterns the less you\n" |
2813 " lose speed in huge repositories." | |
2668 msgstr "" | 2814 msgstr "" |
2669 | 2815 |
2670 msgid "" | 2816 msgid "" |
2671 "For [keywordmaps] template mapping and expansion demonstration and\n" | 2817 "For [keywordmaps] template mapping and expansion demonstration and\n" |
2672 "control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n" | 2818 "control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n" |
3246 | 3392 |
3247 #, python-format | 3393 #, python-format |
3248 msgid "patch %s does not exist" | 3394 msgid "patch %s does not exist" |
3249 msgstr "" | 3395 msgstr "" |
3250 | 3396 |
3397 #, python-format | |
3398 msgid "renaming %s to %s\n" | |
3399 msgstr "döper om %s till %s\n" | |
3400 | |
3251 msgid "need --name to import a patch from -" | 3401 msgid "need --name to import a patch from -" |
3252 msgstr "" | 3402 msgstr "" |
3253 | 3403 |
3254 #, python-format | 3404 #, python-format |
3255 msgid "unable to read file %s" | 3405 msgid "unable to read file %s" |
3273 " use the :hg:`qfinish` command." | 3423 " use the :hg:`qfinish` command." |
3274 msgstr "" | 3424 msgstr "" |
3275 | 3425 |
3276 msgid "print the patches already applied" | 3426 msgid "print the patches already applied" |
3277 msgstr "" | 3427 msgstr "" |
3428 | |
3429 msgid " Returns 0 on success." | |
3430 msgstr " Returnerar 0 om kommandot lyckades." | |
3278 | 3431 |
3279 msgid "only one patch applied\n" | 3432 msgid "only one patch applied\n" |
3280 msgstr "" | 3433 msgstr "" |
3281 | 3434 |
3282 msgid "print the patches not yet applied" | 3435 msgid "print the patches not yet applied" |
3319 msgstr "" | 3472 msgstr "" |
3320 | 3473 |
3321 msgid "" | 3474 msgid "" |
3322 " To import a patch from standard input, pass - as the patch file.\n" | 3475 " To import a patch from standard input, pass - as the patch file.\n" |
3323 " When importing from standard input, a patch name must be specified\n" | 3476 " When importing from standard input, a patch name must be specified\n" |
3324 " using the --name flag.\n" | 3477 " using the --name flag." |
3478 msgstr "" | |
3479 | |
3480 msgid " To import an existing patch while renaming it::" | |
3481 msgstr "" | |
3482 | |
3483 msgid " hg qimport -e existing-patch -n new-name" | |
3484 msgstr "" | |
3485 | |
3486 msgid "" | |
3487 " Returns 0 if import succeeded.\n" | |
3325 " " | 3488 " " |
3326 msgstr "" | 3489 msgstr "" |
3490 " Returnerar 0 om importeringen lyckades.\n" | |
3491 " " | |
3327 | 3492 |
3328 msgid "init a new queue repository (DEPRECATED)" | 3493 msgid "init a new queue repository (DEPRECATED)" |
3329 msgstr "" | 3494 msgstr "" |
3330 | 3495 |
3331 msgid "" | 3496 msgid "" |
3357 " default. Use -p <url> to change." | 3522 " default. Use -p <url> to change." |
3358 msgstr "" | 3523 msgstr "" |
3359 | 3524 |
3360 msgid "" | 3525 msgid "" |
3361 " The patch directory must be a nested Mercurial repository, as\n" | 3526 " The patch directory must be a nested Mercurial repository, as\n" |
3362 " would be created by :hg:`init --mq`.\n" | 3527 " would be created by :hg:`init --mq`." |
3528 msgstr "" | |
3529 | |
3530 msgid "" | |
3531 " Return 0 on success.\n" | |
3363 " " | 3532 " " |
3364 msgstr "" | 3533 msgstr "" |
3534 " Returnerar 0 om kommandot lyckades.\n" | |
3535 " " | |
3365 | 3536 |
3366 msgid "versioned patch repository not found (see init --mq)" | 3537 msgid "versioned patch repository not found (see init --mq)" |
3367 msgstr "versionshanterat patcharkiv hittades inte (se init --mq)" | 3538 msgstr "versionshanterat patcharkiv hittades inte (se init --mq)" |
3368 | 3539 |
3369 msgid "cloning main repository\n" | 3540 msgid "cloning main repository\n" |
3423 | 3594 |
3424 msgid "" | 3595 msgid "" |
3425 " Use the -g/--git option to keep the patch in the git extended diff\n" | 3596 " Use the -g/--git option to keep the patch in the git extended diff\n" |
3426 " format. Read the diffs help topic for more information on why this\n" | 3597 " format. Read the diffs help topic for more information on why this\n" |
3427 " is important for preserving permission changes and copy/rename\n" | 3598 " is important for preserving permission changes and copy/rename\n" |
3428 " information.\n" | 3599 " information." |
3600 msgstr "" | |
3601 | |
3602 msgid "" | |
3603 " Returns 0 on successful creation of a new patch.\n" | |
3429 " " | 3604 " " |
3430 msgstr "" | 3605 msgstr "" |
3606 " Returnerar 0 om en patch skapades.\n" | |
3607 " " | |
3431 | 3608 |
3432 msgid "update the current patch" | 3609 msgid "update the current patch" |
3433 msgstr "" | 3610 msgstr "uppdatera den nuvarande patchen" |
3434 | 3611 |
3435 msgid "" | 3612 msgid "" |
3436 " If any file patterns are provided, the refreshed patch will\n" | 3613 " If any file patterns are provided, the refreshed patch will\n" |
3437 " contain only the modifications that match those patterns; the\n" | 3614 " contain only the modifications that match those patterns; the\n" |
3438 " remaining modifications will remain in the working directory." | 3615 " remaining modifications will remain in the working directory." |
3442 " If -s/--short is specified, files currently included in the patch\n" | 3619 " If -s/--short is specified, files currently included in the patch\n" |
3443 " will be refreshed just like matched files and remain in the patch." | 3620 " will be refreshed just like matched files and remain in the patch." |
3444 msgstr "" | 3621 msgstr "" |
3445 | 3622 |
3446 msgid "" | 3623 msgid "" |
3624 " If -e/--edit is specified, Mercurial will start your configured editor " | |
3625 "for\n" | |
3626 " you to enter a message. In case qrefresh fails, you will find a backup " | |
3627 "of\n" | |
3628 " your message in ``.hg/last-message.txt``." | |
3629 msgstr "" | |
3630 | |
3631 msgid "" | |
3447 " hg add/remove/copy/rename work as usual, though you might want to\n" | 3632 " hg add/remove/copy/rename work as usual, though you might want to\n" |
3448 " use git-style patches (-g/--git or [diff] git=1) to track copies\n" | 3633 " use git-style patches (-g/--git or [diff] git=1) to track copies\n" |
3449 " and renames. See the diffs help topic for more information on the\n" | 3634 " and renames. See the diffs help topic for more information on the\n" |
3450 " git diff format.\n" | 3635 " git diff format." |
3451 " " | |
3452 msgstr "" | 3636 msgstr "" |
3453 | 3637 |
3454 msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" | 3638 msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" |
3455 msgstr "" | 3639 msgstr "" |
3456 | 3640 |
3466 | 3650 |
3467 msgid "" | 3651 msgid "" |
3468 " Use :hg:`diff` if you only want to see the changes made since the\n" | 3652 " Use :hg:`diff` if you only want to see the changes made since the\n" |
3469 " last qrefresh, or :hg:`export qtip` if you want to see changes\n" | 3653 " last qrefresh, or :hg:`export qtip` if you want to see changes\n" |
3470 " made by the current patch without including changes made since the\n" | 3654 " made by the current patch without including changes made since the\n" |
3471 " qrefresh.\n" | 3655 " qrefresh." |
3472 " " | |
3473 msgstr "" | 3656 msgstr "" |
3474 | 3657 |
3475 msgid "fold the named patches into the current patch" | 3658 msgid "fold the named patches into the current patch" |
3476 msgstr "" | 3659 msgstr "" |
3477 | 3660 |
3484 " removed afterwards." | 3667 " removed afterwards." |
3485 msgstr "" | 3668 msgstr "" |
3486 | 3669 |
3487 msgid "" | 3670 msgid "" |
3488 " The header for each folded patch will be concatenated with the\n" | 3671 " The header for each folded patch will be concatenated with the\n" |
3489 " current patch header, separated by a line of '* * *'." | 3672 " current patch header, separated by a line of ``* * *``." |
3490 msgstr "" | 3673 msgstr "" |
3491 | 3674 |
3492 msgid "qfold requires at least one patch name" | 3675 msgid "qfold requires at least one patch name" |
3493 msgstr "" | 3676 msgstr "" |
3494 | 3677 |
3495 msgid "No patches applied" | 3678 #, python-format |
3496 msgstr "" | 3679 msgid "Skipping already folded patch %s\n" |
3497 | 3680 msgstr "Hoppar över redan hopvikta patchen %s\n" |
3498 #, python-format | |
3499 msgid "Skipping already folded patch %s" | |
3500 msgstr "" | |
3501 | 3681 |
3502 #, python-format | 3682 #, python-format |
3503 msgid "qfold cannot fold already applied patch %s" | 3683 msgid "qfold cannot fold already applied patch %s" |
3504 msgstr "" | 3684 msgstr "" |
3505 | 3685 |
3506 #, python-format | 3686 #, python-format |
3507 msgid "Error folding patch %s" | 3687 msgid "error folding patch %s" |
3508 msgstr "" | 3688 msgstr "" |
3509 | 3689 |
3510 msgid "push or pop patches until named patch is at top of stack" | 3690 msgid "push or pop patches until named patch is at top of stack" |
3511 msgstr "" | 3691 msgstr "" |
3512 | 3692 |
3522 " has activated it." | 3702 " has activated it." |
3523 msgstr "" | 3703 msgstr "" |
3524 | 3704 |
3525 msgid "" | 3705 msgid "" |
3526 " With no arguments, print the currently active guards.\n" | 3706 " With no arguments, print the currently active guards.\n" |
3527 " With arguments, set guards for the named patch.\n" | 3707 " With arguments, set guards for the named patch." |
3528 " NOTE: Specifying negative guards now requires '--'." | 3708 msgstr "" |
3709 | |
3710 msgid "" | |
3711 " .. note::\n" | |
3712 " Specifying negative guards now requires '--'." | |
3529 msgstr "" | 3713 msgstr "" |
3530 | 3714 |
3531 msgid " To set guards on another patch::" | 3715 msgid " To set guards on another patch::" |
3532 msgstr "" | 3716 msgstr "" |
3533 | 3717 |
3534 msgid "" | 3718 msgid " hg qguard other.patch -- +2.6.17 -stable" |
3535 " hg qguard other.patch -- +2.6.17 -stable\n" | 3719 msgstr "" |
3720 | |
3721 msgid "cannot mix -l/--list with options or arguments" | |
3722 msgstr "" | |
3723 | |
3724 msgid "no patch to work with" | |
3725 msgstr "" | |
3726 | |
3727 #, python-format | |
3728 msgid "no patch named %s" | |
3729 msgstr "" | |
3730 | |
3731 msgid "print the header of the topmost or specified patch" | |
3732 msgstr "" | |
3733 | |
3734 msgid "push the next patch onto the stack" | |
3735 msgstr "" | |
3736 | |
3737 msgid "" | |
3738 " When -f/--force is applied, all local changes in patched files\n" | |
3739 " will be lost." | |
3740 msgstr "" | |
3741 | |
3742 msgid "" | |
3743 " Return 0 on succces.\n" | |
3536 " " | 3744 " " |
3537 msgstr "" | 3745 msgstr "" |
3538 | 3746 " Returnerar 0 om kommandot lyckades.\n" |
3539 msgid "cannot mix -l/--list with options or arguments" | |
3540 msgstr "" | |
3541 | |
3542 msgid "no patch to work with" | |
3543 msgstr "" | |
3544 | |
3545 #, python-format | |
3546 msgid "no patch named %s" | |
3547 msgstr "" | |
3548 | |
3549 msgid "print the header of the topmost or specified patch" | |
3550 msgstr "" | |
3551 | |
3552 msgid "push the next patch onto the stack" | |
3553 msgstr "" | |
3554 | |
3555 msgid "" | |
3556 " When -f/--force is applied, all local changes in patched files\n" | |
3557 " will be lost.\n" | |
3558 " " | 3747 " " |
3559 msgstr "" | |
3560 | 3748 |
3561 msgid "no saved queues found, please use -n\n" | 3749 msgid "no saved queues found, please use -n\n" |
3562 msgstr "" | 3750 msgstr "" |
3563 | 3751 |
3564 #, python-format | 3752 #, python-format |
3569 msgstr "" | 3757 msgstr "" |
3570 | 3758 |
3571 msgid "" | 3759 msgid "" |
3572 " By default, pops off the top of the patch stack. If given a patch\n" | 3760 " By default, pops off the top of the patch stack. If given a patch\n" |
3573 " name, keeps popping off patches until the named patch is at the\n" | 3761 " name, keeps popping off patches until the named patch is at the\n" |
3574 " top of the stack.\n" | 3762 " top of the stack." |
3575 " " | |
3576 msgstr "" | 3763 msgstr "" |
3577 | 3764 |
3578 #, python-format | 3765 #, python-format |
3579 msgid "using patch queue: %s\n" | 3766 msgid "using patch queue: %s\n" |
3580 msgstr "" | 3767 msgstr "" |
3593 | 3780 |
3594 #, python-format | 3781 #, python-format |
3595 msgid "A patch named %s already exists in the series file" | 3782 msgid "A patch named %s already exists in the series file" |
3596 msgstr "" | 3783 msgstr "" |
3597 | 3784 |
3598 #, python-format | |
3599 msgid "renaming %s to %s\n" | |
3600 msgstr "döper om %s till %s\n" | |
3601 | |
3602 msgid "restore the queue state saved by a revision (DEPRECATED)" | 3785 msgid "restore the queue state saved by a revision (DEPRECATED)" |
3603 msgstr "" | 3786 msgstr "" |
3604 | 3787 |
3605 msgid " This command is deprecated, use rebase --mq instead." | 3788 msgid " This command is deprecated, use :hg:`rebase` instead." |
3606 msgstr "" | 3789 msgstr " Detta är ett förlegat kommando; använd :hg:`rebase` istället." |
3607 | 3790 |
3608 msgid "save current queue state (DEPRECATED)" | 3791 msgid "save current queue state (DEPRECATED)" |
3609 msgstr "" | 3792 msgstr "" |
3610 | 3793 |
3611 #, python-format | 3794 #, python-format |
3618 | 3801 |
3619 #, python-format | 3802 #, python-format |
3620 msgid "copy %s to %s\n" | 3803 msgid "copy %s to %s\n" |
3621 msgstr "" | 3804 msgstr "" |
3622 | 3805 |
3623 msgid "strip a changeset and all its descendants from the repository" | 3806 msgid "strip changesets and all their descendants from the repository" |
3624 msgstr "" | 3807 msgstr "" |
3625 | 3808 |
3626 msgid "" | 3809 msgid "" |
3627 " The strip command removes all changesets whose local revision\n" | 3810 " The strip command removes the specified changesets and all their\n" |
3628 " number is greater than or equal to REV, and then restores any\n" | 3811 " descendants. If the working directory has uncommitted changes,\n" |
3629 " changesets that are not descendants of REV. If the working\n" | 3812 " the operation is aborted unless the --force flag is supplied." |
3630 " directory has uncommitted changes, the operation is aborted unless\n" | |
3631 " the --force flag is supplied." | |
3632 msgstr "" | 3813 msgstr "" |
3633 | 3814 |
3634 msgid "" | 3815 msgid "" |
3635 " If a parent of the working directory is stripped, then the working\n" | 3816 " If a parent of the working directory is stripped, then the working\n" |
3636 " directory will automatically be updated to the most recent\n" | 3817 " directory will automatically be updated to the most recent\n" |
3646 " the local revision numbers will in general be different after the\n" | 3827 " the local revision numbers will in general be different after the\n" |
3647 " restore." | 3828 " restore." |
3648 msgstr "" | 3829 msgstr "" |
3649 | 3830 |
3650 msgid "" | 3831 msgid "" |
3651 " Use the --nobackup option to discard the backup bundle once the\n" | 3832 " Use the --no-backup option to discard the backup bundle once the\n" |
3652 " operation completes.\n" | 3833 " operation completes." |
3653 " " | 3834 msgstr "" |
3654 msgstr "" | 3835 |
3836 msgid "empty revision set" | |
3837 msgstr "tomt revisionsset" | |
3655 | 3838 |
3656 msgid "set or print guarded patches to push" | 3839 msgid "set or print guarded patches to push" |
3657 msgstr "" | 3840 msgstr "" |
3658 | 3841 |
3659 msgid "" | 3842 msgid "" |
3746 msgstr "" | 3929 msgstr "" |
3747 | 3930 |
3748 msgid "" | 3931 msgid "" |
3749 " This can be especially useful if your changes have been applied to\n" | 3932 " This can be especially useful if your changes have been applied to\n" |
3750 " an upstream repository, or if you are about to push your changes\n" | 3933 " an upstream repository, or if you are about to push your changes\n" |
3751 " to upstream.\n" | 3934 " to upstream." |
3752 " " | |
3753 msgstr "" | 3935 msgstr "" |
3754 | 3936 |
3755 msgid "no revisions specified" | 3937 msgid "no revisions specified" |
3756 msgstr "" | 3938 msgstr "" |
3757 | 3939 |
3779 msgstr "" | 3961 msgstr "" |
3780 | 3962 |
3781 msgid "" | 3963 msgid "" |
3782 " To delete an existing queue, use --delete. You cannot delete the " | 3964 " To delete an existing queue, use --delete. You cannot delete the " |
3783 "currently\n" | 3965 "currently\n" |
3784 " active queue.\n" | 3966 " active queue." |
3785 " " | |
3786 msgstr "" | 3967 msgstr "" |
3787 | 3968 |
3788 msgid "patches applied - cannot set new queue active" | 3969 msgid "patches applied - cannot set new queue active" |
3970 msgstr "" | |
3971 | |
3972 msgid "cannot delete queue that does not exist" | |
3973 msgstr "" | |
3974 | |
3975 msgid "cannot delete currently active queue" | |
3789 msgstr "" | 3976 msgstr "" |
3790 | 3977 |
3791 msgid " (active)\n" | 3978 msgid " (active)\n" |
3792 msgstr " (aktiv)\n" | 3979 msgstr " (aktiv)\n" |
3793 | 3980 |
3796 | 3983 |
3797 #, python-format | 3984 #, python-format |
3798 msgid "queue \"%s\" already exists" | 3985 msgid "queue \"%s\" already exists" |
3799 msgstr "kön \"%s\" finns redan" | 3986 msgstr "kön \"%s\" finns redan" |
3800 | 3987 |
3801 msgid "cannot delete queue that does not exist" | 3988 #, python-format |
3802 msgstr "" | 3989 msgid "can't rename \"%s\" to its current name" |
3803 | 3990 msgstr "" |
3804 msgid "cannot delete currently active queue" | 3991 |
3992 #, python-format | |
3993 msgid "non-queue directory \"%s\" already exists" | |
3805 msgstr "" | 3994 msgstr "" |
3806 | 3995 |
3807 msgid "use --create to create a new queue" | 3996 msgid "use --create to create a new queue" |
3808 msgstr "" | 3997 msgstr "" |
3809 | 3998 |
3825 msgstr "" | 4014 msgstr "" |
3826 | 4015 |
3827 msgid "only a local queue repository may be initialized" | 4016 msgid "only a local queue repository may be initialized" |
3828 msgstr "bara ett lokalt köarkiv kan initialiseras" | 4017 msgstr "bara ett lokalt köarkiv kan initialiseras" |
3829 | 4018 |
3830 msgid "There is no Mercurial repository here (.hg not found)" | 4019 msgid "there is no Mercurial repository here (.hg not found)" |
3831 msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" | 4020 msgstr "det finns inget Mercurial-arkiv här (.hg hittades inte)" |
3832 | 4021 |
3833 msgid "no queue repository" | 4022 msgid "no queue repository" |
3834 msgstr "inget köarkiv" | 4023 msgstr "inget köarkiv" |
3835 | 4024 |
3836 #, python-format | 4025 #, python-format |
3884 msgstr "" | 4073 msgstr "" |
3885 | 4074 |
3886 msgid "stop managing a revision (DEPRECATED)" | 4075 msgid "stop managing a revision (DEPRECATED)" |
3887 msgstr "" | 4076 msgstr "" |
3888 | 4077 |
3889 msgid "hg qdelete [-k] [-r REV]... [PATCH]..." | 4078 msgid "hg qdelete [-k] [PATCH]..." |
3890 msgstr "" | 4079 msgstr "hg qdelete [-k] [PATCH]..." |
3891 | 4080 |
3892 msgid "edit patch header" | 4081 msgid "edit patch header" |
3893 msgstr "" | 4082 msgstr "" |
3894 | 4083 |
3895 msgid "keep folded patch files" | 4084 msgid "keep folded patch files" |
3977 msgstr "" | 4166 msgstr "" |
3978 | 4167 |
3979 msgid "forget any local changes to patched files" | 4168 msgid "forget any local changes to patched files" |
3980 msgstr "" | 4169 msgstr "" |
3981 | 4170 |
3982 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" | 4171 msgid "hg qpop [-a] [-f] [PATCH | INDEX]" |
3983 msgstr "" | 4172 msgstr "hg qpop [-a] [-f] [PATCH | INDEX]" |
3984 | 4173 |
3985 msgid "apply if the patch has rejects" | 4174 msgid "apply on top of local changes" |
3986 msgstr "" | 4175 msgstr "" |
3987 | 4176 |
3988 msgid "list patch name in commit text" | 4177 msgid "list patch name in commit text" |
3989 msgstr "" | 4178 msgstr "" |
3990 | 4179 |
3998 msgstr "" | 4187 msgstr "" |
3999 | 4188 |
4000 msgid "reorder patch series and apply only the patch" | 4189 msgid "reorder patch series and apply only the patch" |
4001 msgstr "omordna patchserien och applicera bara patchen" | 4190 msgstr "omordna patchserien och applicera bara patchen" |
4002 | 4191 |
4003 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" | 4192 msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" |
4004 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAMN] [--move] [PATCH | INDEX]" | 4193 msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" |
4005 | 4194 |
4006 msgid "refresh only files already in the patch and specified files" | 4195 msgid "refresh only files already in the patch and specified files" |
4007 msgstr "" | 4196 msgstr "" |
4008 | 4197 |
4009 msgid "add/update author field in patch with current user" | 4198 msgid "add/update author field in patch with current user" |
4082 msgstr "" | 4271 msgstr "" |
4083 "bunta bara ändringar med lokala revisionsnummer större än REV som inte är " | 4272 "bunta bara ändringar med lokala revisionsnummer större än REV som inte är " |
4084 "ättling till REV (FÖRLEGAD)" | 4273 "ättling till REV (FÖRLEGAD)" |
4085 | 4274 |
4086 msgid "no backups" | 4275 msgid "no backups" |
4087 msgstr "" | 4276 msgstr "inga säkerhetskopior" |
4088 | 4277 |
4089 msgid "hg strip [-f] [-n] REV" | 4278 msgid "no backups (DEPRECATED)" |
4090 msgstr "hg strip [-f] [-n] REV" | 4279 msgstr "inga säkerhetskopior (FÖRÅLDRAD)" |
4280 | |
4281 msgid "do not modify working copy during strip" | |
4282 msgstr "modifiera inte arbetskopian vid strippning" | |
4283 | |
4284 msgid "hg strip [-k] [-f] [-n] REV..." | |
4285 msgstr "hg strip [-k] [-f] [-n] REV..." | |
4091 | 4286 |
4092 msgid "hg qtop [-s]" | 4287 msgid "hg qtop [-s]" |
4093 msgstr "" | 4288 msgstr "hg qtop [-s]" |
4094 | 4289 |
4095 msgid "show only the first patch" | 4290 msgid "show only the first patch" |
4096 msgstr "visa bara den första patchen" | 4291 msgstr "visa bara den första patchen" |
4097 | 4292 |
4098 msgid "hg qunapplied [-1] [-s] [PATCH]" | 4293 msgid "hg qunapplied [-1] [-s] [PATCH]" |
4099 msgstr "" | 4294 msgstr "hg qunapplied [-1] [-s] [PATCH]" |
4100 | 4295 |
4101 msgid "finish all applied changesets" | 4296 msgid "finish all applied changesets" |
4102 msgstr "" | 4297 msgstr "" |
4103 | 4298 |
4104 msgid "hg qfinish [-a] [REV]..." | 4299 msgid "hg qfinish [-a] [REV]..." |
4105 msgstr "" | 4300 msgstr "hg qfinish [-a] [REV]..." |
4106 | 4301 |
4107 msgid "list all available queues" | 4302 msgid "list all available queues" |
4108 msgstr "visa alla tillgängliga köer" | 4303 msgstr "visa alla tillgängliga köer" |
4109 | 4304 |
4110 msgid "create new queue" | 4305 msgid "create new queue" |
4111 msgstr "skapa ny kö" | 4306 msgstr "skapa ny kö" |
4112 | 4307 |
4308 msgid "rename active queue" | |
4309 msgstr "döp om aktiv kö" | |
4310 | |
4113 msgid "delete reference to queue" | 4311 msgid "delete reference to queue" |
4312 msgstr "" | |
4313 | |
4314 msgid "delete queue, and remove patch dir" | |
4114 msgstr "" | 4315 msgstr "" |
4115 | 4316 |
4116 msgid "[OPTION] [QUEUE]" | 4317 msgid "[OPTION] [QUEUE]" |
4117 msgstr "[FLAGGA] [KÖ]" | 4318 msgstr "[FLAGGA] [KÖ]" |
4118 | 4319 |
4242 "If no pager is set, the pager extensions uses the environment variable\n" | 4443 "If no pager is set, the pager extensions uses the environment variable\n" |
4243 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used." | 4444 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used." |
4244 msgstr "" | 4445 msgstr "" |
4245 | 4446 |
4246 msgid "" | 4447 msgid "" |
4448 "By default, the pager is only executed if a command has output. To\n" | |
4449 "force the pager to run even if a command prints nothing, set::" | |
4450 msgstr "" | |
4451 "Som standard körs bara pagineraren om ett kommando visar något. För att\n" | |
4452 "tvinga pagineraren att köra även om ett kommando inte visar något, sätt::" | |
4453 | |
4454 msgid "" | |
4455 " [pager]\n" | |
4456 " force = True" | |
4457 msgstr "" | |
4458 " [pager]\n" | |
4459 " force = True" | |
4460 | |
4461 msgid "" | |
4247 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" | 4462 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" |
4248 "setting::" | 4463 "setting::" |
4249 msgstr "" | 4464 msgstr "" |
4465 "Om du får felmeddelanden om \"BROKEN PIPE\", så kan du deaktivera dem\n" | |
4466 "genom att sätta::" | |
4250 | 4467 |
4251 msgid "" | 4468 msgid "" |
4252 " [pager]\n" | 4469 " [pager]\n" |
4253 " quiet = True" | 4470 " quiet = True" |
4254 msgstr "" | 4471 msgstr "" |
4472 " [pager]\n" | |
4473 " quiet = True" | |
4255 | 4474 |
4256 msgid "" | 4475 msgid "" |
4257 "You can disable the pager for certain commands by adding them to the\n" | 4476 "You can disable the pager for certain commands by adding them to the\n" |
4258 "pager.ignore list::" | 4477 "pager.ignore list::" |
4259 msgstr "" | 4478 msgstr "" |
4281 msgid "If pager.attend is present, pager.ignore will be ignored." | 4500 msgid "If pager.attend is present, pager.ignore will be ignored." |
4282 msgstr "" | 4501 msgstr "" |
4283 | 4502 |
4284 msgid "" | 4503 msgid "" |
4285 "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" | 4504 "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" |
4286 "to specify them in the global .hgrc\n" | 4505 "to specify them in your user configuration file." |
4287 msgstr "" | 4506 msgstr "" |
4507 "För att ignorera globala kommandon som :hg:`version` eller :hg:`help`, så\n" | |
4508 "måste du ange dem i din användarkonfigurationsfil." | |
4509 | |
4510 msgid "" | |
4511 "The --pager=... option can also be used to control when the pager is\n" | |
4512 "used. Use a boolean value like yes, no, on, off, or use auto for\n" | |
4513 "normal behavior.\n" | |
4514 msgstr "" | |
4515 "Flaggan --pager=... kan också användas för att kontrollera när pagineraren\n" | |
4516 "används. Använd ett booleskt värde som yes, no, on off, eller använd auto\n" | |
4517 "för normalt uppförande.\n" | |
4518 | |
4519 msgid "when to paginate (boolean, always, auto, or never)" | |
4520 msgstr "när paginering ska ske (boolean, always, auto eller never)" | |
4288 | 4521 |
4289 msgid "interpret suffixes to refer to ancestor revisions" | 4522 msgid "interpret suffixes to refer to ancestor revisions" |
4290 msgstr "" | 4523 msgstr "" |
4291 | 4524 |
4292 msgid "" | 4525 msgid "" |
4334 | 4567 |
4335 msgid "" | 4568 msgid "" |
4336 "Each message refers to the first in the series using the In-Reply-To\n" | 4569 "Each message refers to the first in the series using the In-Reply-To\n" |
4337 "and References headers, so they will show up as a sequence in threaded\n" | 4570 "and References headers, so they will show up as a sequence in threaded\n" |
4338 "mail and news readers, and in mail archives." | 4571 "mail and news readers, and in mail archives." |
4339 msgstr "" | |
4340 | |
4341 msgid "" | |
4342 "With the -d/--diffstat option, you will be prompted for each changeset\n" | |
4343 "with a diffstat summary and the changeset summary, so you can be sure\n" | |
4344 "you are sending the right changes." | |
4345 msgstr "" | 4572 msgstr "" |
4346 | 4573 |
4347 msgid "" | 4574 msgid "" |
4348 "To configure other defaults, add a section like this to your hgrc\n" | 4575 "To configure other defaults, add a section like this to your hgrc\n" |
4349 "file::" | 4576 "file::" |
4367 "Then you can use the :hg:`email` command to mail a series of\n" | 4594 "Then you can use the :hg:`email` command to mail a series of\n" |
4368 "changesets as a patchbomb." | 4595 "changesets as a patchbomb." |
4369 msgstr "" | 4596 msgstr "" |
4370 | 4597 |
4371 msgid "" | 4598 msgid "" |
4372 "To avoid sending patches prematurely, it is a good idea to first run\n" | |
4373 "the :hg:`email` command with the \"-n\" option (test only). You will be\n" | |
4374 "prompted for an email recipient address, a subject and an introductory\n" | |
4375 "message describing the patches of your patchbomb. Then when all is\n" | |
4376 "done, patchbomb messages are displayed. If the PAGER environment\n" | |
4377 "variable is set, your pager will be fired up once for each patchbomb\n" | |
4378 "message, so you can verify everything is alright." | |
4379 msgstr "" | |
4380 | |
4381 msgid "" | |
4382 "The -m/--mbox option is also very useful. Instead of previewing each\n" | |
4383 "patchbomb message in a pager or sending the messages directly, it will\n" | |
4384 "create a UNIX mailbox file with the patch emails. This mailbox file\n" | |
4385 "can be previewed with any mail user agent which supports UNIX mbox\n" | |
4386 "files, e.g. with mutt::" | |
4387 msgstr "" | |
4388 | |
4389 msgid " % mutt -R -f mbox" | |
4390 msgstr "" | |
4391 | |
4392 msgid "" | |
4393 "When you are previewing the patchbomb messages, you can use ``formail``\n" | |
4394 "(a utility that is commonly installed as part of the procmail\n" | |
4395 "package), to send each message out::" | |
4396 msgstr "" | |
4397 | |
4398 msgid " % formail -s sendmail -bm -t < mbox" | |
4399 msgstr "" | |
4400 | |
4401 msgid "That should be all. Now your patchbomb is on its way out." | |
4402 msgstr "" | |
4403 | |
4404 msgid "" | |
4405 "You can also either configure the method option in the email section\n" | 4599 "You can also either configure the method option in the email section\n" |
4406 "to be a sendmail compatible mailer or fill out the [smtp] section so\n" | 4600 "to be a sendmail compatible mailer or fill out the [smtp] section so\n" |
4407 "that the patchbomb extension can automatically send patchbombs\n" | 4601 "that the patchbomb extension can automatically send patchbombs\n" |
4408 "directly from the commandline. See the [email] and [smtp] sections in\n" | 4602 "directly from the commandline. See the [email] and [smtp] sections in\n" |
4409 "hgrc(5) for details.\n" | 4603 "hgrc(5) for details.\n" |
4414 msgstr "%s Ange ett giltigt värde" | 4608 msgstr "%s Ange ett giltigt värde" |
4415 | 4609 |
4416 msgid "Please enter a valid value.\n" | 4610 msgid "Please enter a valid value.\n" |
4417 msgstr "Ange ett giltigt värde.\n" | 4611 msgstr "Ange ett giltigt värde.\n" |
4418 | 4612 |
4419 msgid "does the diffstat above look okay?" | |
4420 msgstr "ser diffstaten ovanför okej ut?" | |
4421 | |
4422 msgid "diffstat rejected" | |
4423 msgstr "diffstat avvisad" | |
4424 | |
4425 msgid "send changesets by email" | 4613 msgid "send changesets by email" |
4426 msgstr "" | 4614 msgstr "" |
4427 | 4615 |
4428 msgid "" | 4616 msgid "" |
4429 " By default, diffs are sent in the format generated by\n" | 4617 " By default, diffs are sent in the format generated by\n" |
4433 | 4621 |
4434 msgid "" | 4622 msgid "" |
4435 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" | 4623 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
4436 " the first line of the changeset description as the subject text.\n" | 4624 " the first line of the changeset description as the subject text.\n" |
4437 " The message contains two or three parts. First, the changeset\n" | 4625 " The message contains two or three parts. First, the changeset\n" |
4438 " description. Next, (optionally) if the diffstat program is\n" | 4626 " description." |
4439 " installed and -d/--diffstat is used, the result of running\n" | 4627 msgstr "" |
4440 " diffstat on the patch. Finally, the patch itself, as generated by\n" | 4628 |
4441 " :hg:`export`." | 4629 msgid "" |
4630 " With the -d/--diffstat option, if the diffstat program is\n" | |
4631 " installed, the result of running diffstat on the patch is inserted." | |
4632 msgstr "" | |
4633 | |
4634 msgid " Finally, the patch itself, as generated by :hg:`export`." | |
4635 msgstr "" | |
4636 | |
4637 msgid "" | |
4638 " With the -d/--diffstat or -c/--confirm options, you will be presented\n" | |
4639 " with a final summary of all messages and asked for confirmation before\n" | |
4640 " the messages are sent." | |
4442 msgstr "" | 4641 msgstr "" |
4443 | 4642 |
4444 msgid "" | 4643 msgid "" |
4445 " By default the patch is included as text in the email body for\n" | 4644 " By default the patch is included as text in the email body for\n" |
4446 " easy reviewing. Using the -a/--attach option will instead create\n" | 4645 " easy reviewing. Using the -a/--attach option will instead create\n" |
4456 | 4655 |
4457 msgid "" | 4656 msgid "" |
4458 " With -b/--bundle, changesets are selected as for --outgoing, but a\n" | 4657 " With -b/--bundle, changesets are selected as for --outgoing, but a\n" |
4459 " single email containing a binary Mercurial bundle as an attachment\n" | 4658 " single email containing a binary Mercurial bundle as an attachment\n" |
4460 " will be sent." | 4659 " will be sent." |
4660 msgstr "" | |
4661 | |
4662 msgid "" | |
4663 " With -m/--mbox, instead of previewing each patchbomb message in a\n" | |
4664 " pager or sending the messages directly, it will create a UNIX\n" | |
4665 " mailbox file with the patch emails. This mailbox file can be\n" | |
4666 " previewed with any mail user agent which supports UNIX mbox\n" | |
4667 " files." | |
4668 msgstr "" | |
4669 | |
4670 msgid "" | |
4671 " With -n/--test, all steps will run, but mail will not be sent.\n" | |
4672 " You will be prompted for an email recipient address, a subject and\n" | |
4673 " an introductory message describing the patches of your patchbomb.\n" | |
4674 " Then when all is done, patchbomb messages are displayed. If the\n" | |
4675 " PAGER environment variable is set, your pager will be fired up once\n" | |
4676 " for each patchbomb message, so you can verify everything is alright." | |
4461 msgstr "" | 4677 msgstr "" |
4462 | 4678 |
4463 msgid "" | 4679 msgid "" |
4464 " hg email -r 3000 # send patch 3000 only\n" | 4680 " hg email -r 3000 # send patch 3000 only\n" |
4465 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" | 4681 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
4481 "default\n" | 4697 "default\n" |
4482 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" | 4698 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" |
4483 msgstr "" | 4699 msgstr "" |
4484 | 4700 |
4485 msgid "" | 4701 msgid "" |
4702 " hg email -o -m mbox && # generate an mbox file...\n" | |
4703 " mutt -R -f mbox # ... and view it with mutt\n" | |
4704 " hg email -o -m mbox && # generate an mbox file ...\n" | |
4705 " formail -s sendmail \\ # ... and use formail to send from the " | |
4706 "mbox\n" | |
4707 " -bm -t < mbox # ... using sendmail" | |
4708 msgstr "" | |
4709 | |
4710 msgid "" | |
4486 " Before using this command, you will need to enable email in your\n" | 4711 " Before using this command, you will need to enable email in your\n" |
4487 " hgrc. See the [email] section in hgrc(5) for details.\n" | 4712 " hgrc. See the [email] section in hgrc(5) for details.\n" |
4488 " " | 4713 " " |
4489 msgstr "" | 4714 msgstr "" |
4490 | 4715 |
4507 | 4732 |
4508 #, python-format | 4733 #, python-format |
4509 msgid "This patch series consists of %d patches." | 4734 msgid "This patch series consists of %d patches." |
4510 msgstr "" | 4735 msgstr "" |
4511 | 4736 |
4512 msgid "Final summary:\n" | 4737 msgid "" |
4738 "\n" | |
4739 "Final summary:" | |
4740 msgstr "" | |
4741 | |
4742 msgid "are you sure you want to send (yn)?" | |
4743 msgstr "" | |
4744 | |
4745 msgid "&No" | |
4746 msgstr "" | |
4747 | |
4748 msgid "&Yes" | |
4749 msgstr "" | |
4750 | |
4751 msgid "patchbomb canceled" | |
4513 msgstr "" | 4752 msgstr "" |
4514 | 4753 |
4515 msgid "Displaying " | 4754 msgid "Displaying " |
4516 msgstr "" | 4755 msgstr "Visar " |
4517 | 4756 |
4518 msgid "Writing " | 4757 msgid "Writing " |
4519 msgstr "" | 4758 msgstr "Skriver " |
4759 | |
4760 msgid "writing" | |
4761 msgstr "skriver" | |
4520 | 4762 |
4521 msgid "Sending " | 4763 msgid "Sending " |
4522 msgstr "" | 4764 msgstr "Sänder " |
4765 | |
4766 msgid "sending" | |
4767 msgstr "sänder" | |
4523 | 4768 |
4524 msgid "send patches as attachments" | 4769 msgid "send patches as attachments" |
4525 msgstr "" | 4770 msgstr "" |
4526 | 4771 |
4527 msgid "send patches as inline attachments" | 4772 msgid "send patches as inline attachments" |
4529 | 4774 |
4530 msgid "email addresses of blind carbon copy recipients" | 4775 msgid "email addresses of blind carbon copy recipients" |
4531 msgstr "" | 4776 msgstr "" |
4532 | 4777 |
4533 msgid "email addresses of copy recipients" | 4778 msgid "email addresses of copy recipients" |
4779 msgstr "" | |
4780 | |
4781 msgid "ask for confirmation before sending" | |
4534 msgstr "" | 4782 msgstr "" |
4535 | 4783 |
4536 msgid "add diffstat output to messages" | 4784 msgid "add diffstat output to messages" |
4537 msgstr "" | 4785 msgstr "" |
4538 | 4786 |
4802 msgstr "" | 5050 msgstr "" |
4803 | 5051 |
4804 msgid "cannot use both keepbranches and extrafn" | 5052 msgid "cannot use both keepbranches and extrafn" |
4805 msgstr "" | 5053 msgstr "" |
4806 | 5054 |
5055 msgid "rebasing" | |
5056 msgstr "" | |
5057 | |
5058 msgid "changesets" | |
5059 msgstr "ändringar" | |
5060 | |
4807 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" | 5061 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" |
4808 msgstr "fixa olösta konflikter med hg resolve, kör sedan hg rebase --continue" | 5062 msgstr "fixa olösta konflikter med hg resolve, kör sedan hg rebase --continue" |
4809 | 5063 |
4810 #, python-format | 5064 #, python-format |
4811 msgid "no changes, revision %d skipped\n" | 5065 msgid "no changes, revision %d skipped\n" |
4951 " If a list of files is omitted, all changes reported by :hg:`status`\n" | 5205 " If a list of files is omitted, all changes reported by :hg:`status`\n" |
4952 " will be candidates for recording." | 5206 " will be candidates for recording." |
4953 msgstr "" | 5207 msgstr "" |
4954 " Om filer inte anges, kommer alla ändringar som :hg:`status`\n" | 5208 " Om filer inte anges, kommer alla ändringar som :hg:`status`\n" |
4955 " rapporterar att arkiveras." | 5209 " rapporterar att arkiveras." |
4956 | |
4957 msgid " See :hg:`help dates` for a list of formats valid for -d/--date." | |
4958 msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." | |
4959 | 5210 |
4960 msgid "" | 5211 msgid "" |
4961 " You will be prompted for whether to record changes to each\n" | 5212 " You will be prompted for whether to record changes to each\n" |
4962 " modified file, and for files with multiple changes, for each\n" | 5213 " modified file, and for files with multiple changes, for each\n" |
4963 " change to use. For each query, the following responses are\n" | 5214 " change to use. For each query, the following responses are\n" |
4996 msgstr "" | 5247 msgstr "" |
4997 | 5248 |
4998 msgid "no changes to record\n" | 5249 msgid "no changes to record\n" |
4999 msgstr "" | 5250 msgstr "" |
5000 | 5251 |
5001 msgid "patch failed to apply" | |
5002 msgstr "" | |
5003 | |
5004 msgid "hg record [OPTION]... [FILE]..." | 5252 msgid "hg record [OPTION]... [FILE]..." |
5005 msgstr "" | 5253 msgstr "" |
5006 | 5254 |
5007 msgid "hg qrecord [OPTION]... PATCH [FILE]..." | 5255 msgid "hg qrecord [OPTION]... PATCH [FILE]..." |
5008 msgstr "" | 5256 msgstr "" |
5073 msgstr "" | 5321 msgstr "" |
5074 | 5322 |
5075 #, python-format | 5323 #, python-format |
5076 msgid "not linkable: %s\n" | 5324 msgid "not linkable: %s\n" |
5077 msgstr "inte länkbar: %s\n" | 5325 msgstr "inte länkbar: %s\n" |
5078 | |
5079 msgid " files" | |
5080 msgstr " filer" | |
5081 | 5326 |
5082 msgid "pruning" | 5327 msgid "pruning" |
5083 msgstr "putsar" | 5328 msgstr "putsar" |
5084 | 5329 |
5085 #, python-format | 5330 #, python-format |
5160 " Initialize a new repository and working directory that shares its\n" | 5405 " Initialize a new repository and working directory that shares its\n" |
5161 " history with another repository." | 5406 " history with another repository." |
5162 msgstr "" | 5407 msgstr "" |
5163 | 5408 |
5164 msgid "" | 5409 msgid "" |
5165 " NOTE: using rollback or extensions that destroy/modify history\n" | 5410 " .. note::\n" |
5166 " (mq, rebase, etc.) can cause considerable confusion with shared\n" | 5411 " using rollback or extensions that destroy/modify history (mq,\n" |
5167 " clones. In particular, if two shared clones are both updated to\n" | 5412 " rebase, etc.) can cause considerable confusion with shared\n" |
5168 " the same changeset, and one of them destroys that changeset with\n" | 5413 " clones. In particular, if two shared clones are both updated to\n" |
5169 " rollback, the other clone will suddenly stop working: all\n" | 5414 " the same changeset, and one of them destroys that changeset\n" |
5170 " operations will fail with \"abort: working directory has unknown\n" | 5415 " with rollback, the other clone will suddenly stop working: all\n" |
5171 " parent\". The only known workaround is to use debugsetparents on\n" | 5416 " operations will fail with \"abort: working directory has unknown\n" |
5172 " the broken clone to reset it to a changeset that still exists\n" | 5417 " parent\". The only known workaround is to use debugsetparents on\n" |
5173 " (e.g. tip).\n" | 5418 " the broken clone to reset it to a changeset that still exists\n" |
5419 " (e.g. tip).\n" | |
5174 " " | 5420 " " |
5175 msgstr "" | 5421 msgstr "" |
5176 | 5422 |
5177 msgid "do not create a working copy" | 5423 msgid "do not create a working copy" |
5178 msgstr "" | 5424 msgstr "" |
5219 | 5465 |
5220 #, python-format | 5466 #, python-format |
5221 msgid "%s: empty changeset" | 5467 msgid "%s: empty changeset" |
5222 msgstr "" | 5468 msgstr "" |
5223 | 5469 |
5224 msgid "Fix up the merge and run hg transplant --continue" | 5470 msgid "fix up the merge and run hg transplant --continue" |
5225 msgstr "" | 5471 msgstr "" |
5226 | 5472 |
5227 #, python-format | 5473 #, python-format |
5228 msgid "%s transplanted as %s\n" | 5474 msgid "%s transplanted as %s\n" |
5229 msgstr "" | 5475 msgstr "" |
5332 msgstr "" | 5578 msgstr "" |
5333 | 5579 |
5334 msgid "outstanding local changes" | 5580 msgid "outstanding local changes" |
5335 msgstr "" | 5581 msgstr "" |
5336 | 5582 |
5583 msgid "" | |
5584 "\n" | |
5585 "Added by the transplant extension:" | |
5586 msgstr "" | |
5587 "\n" | |
5588 "Tillagda av transplant-utökningen:" | |
5589 | |
5590 msgid "" | |
5591 "``transplanted(set)``\n" | |
5592 " Transplanted changesets in set.\n" | |
5593 msgstr "" | |
5594 | |
5595 msgid "Specifying Revision Sets" | |
5596 msgstr "Ange Revisionsset" | |
5597 | |
5337 msgid "pull patches from REPO" | 5598 msgid "pull patches from REPO" |
5338 msgstr "" | 5599 msgstr "" |
5339 | 5600 |
5340 msgid "BRANCH" | 5601 msgid "BRANCH" |
5341 msgstr "GREN" | 5602 msgstr "GREN" |
5564 | 5825 |
5565 #, python-format | 5826 #, python-format |
5566 msgid "integrity check failed on %s:%d" | 5827 msgid "integrity check failed on %s:%d" |
5567 msgstr "" | 5828 msgstr "" |
5568 | 5829 |
5569 #, python-format | |
5570 msgid "%s: not a Mercurial bundle file" | |
5571 msgstr "" | |
5572 | |
5573 #, python-format | |
5574 msgid "%s: unknown bundle version" | |
5575 msgstr "" | |
5576 | |
5577 #, python-format | |
5578 msgid "%s: unknown bundle compression type" | |
5579 msgstr "" | |
5580 | |
5581 msgid "cannot create new bundle repository" | 5830 msgid "cannot create new bundle repository" |
5582 msgstr "" | 5831 msgstr "" |
5583 | 5832 |
5584 #, python-format | 5833 #, python-format |
5585 msgid "premature EOF reading chunk (got %d bytes, expected %d)" | 5834 msgid "premature EOF reading chunk (got %d bytes, expected %d)" |
5586 msgstr "" | 5835 msgstr "" |
5836 | |
5837 #, python-format | |
5838 msgid "%s: not a Mercurial bundle" | |
5839 msgstr "%s: inte en Mercurial-buntfil" | |
5840 | |
5841 #, python-format | |
5842 msgid "%s: unknown bundle version %s" | |
5843 msgstr "%s: okänd buntversion %s" | |
5587 | 5844 |
5588 msgid "empty username" | 5845 msgid "empty username" |
5589 msgstr "tomt användarnamn" | 5846 msgstr "tomt användarnamn" |
5590 | 5847 |
5591 #, python-format | 5848 #, python-format |
5607 msgstr "" | 5864 msgstr "" |
5608 | 5865 |
5609 msgid "limit must be positive" | 5866 msgid "limit must be positive" |
5610 msgstr "" | 5867 msgstr "" |
5611 | 5868 |
5612 msgid "too many revisions specified" | |
5613 msgstr "för många revisioner angivna" | |
5614 | |
5615 #, python-format | 5869 #, python-format |
5616 msgid "invalid format spec '%%%s' in output filename" | 5870 msgid "invalid format spec '%%%s' in output filename" |
5617 msgstr "" | 5871 msgstr "" |
5618 | 5872 |
5619 #, python-format | 5873 #, python-format |
5764 #, python-format | 6018 #, python-format |
5765 msgid "cannot follow nonexistent file: \"%s\"" | 6019 msgid "cannot follow nonexistent file: \"%s\"" |
5766 msgstr "" | 6020 msgstr "" |
5767 | 6021 |
5768 msgid "can only follow copies/renames for explicit filenames" | 6022 msgid "can only follow copies/renames for explicit filenames" |
6023 msgstr "" | |
6024 | |
6025 #, python-format | |
6026 msgid "skipping missing subrepository: %s\n" | |
5769 msgstr "" | 6027 msgstr "" |
5770 | 6028 |
5771 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." | 6029 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." |
5772 msgstr "" | 6030 msgstr "" |
5773 | 6031 |
5926 msgstr "" | 6184 msgstr "" |
5927 " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n" | 6185 " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n" |
5928 " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n" | 6186 " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n" |
5929 " om resultatet antagligen inte kommer att vara användbart." | 6187 " om resultatet antagligen inte kommer att vara användbart." |
5930 | 6188 |
5931 msgid "" | |
5932 " Returns 0 on success.\n" | |
5933 " " | |
5934 msgstr "" | |
5935 " Returnerar 0 om kommandot lyckades.\n" | |
5936 " " | |
5937 | |
5938 msgid "at least one filename or pattern is required" | 6189 msgid "at least one filename or pattern is required" |
5939 msgstr "" | 6190 msgstr "" |
5940 | 6191 |
5941 msgid "at least one of -n/-c is required for -l" | 6192 msgid "at least one of -n/-c is required for -l" |
5942 msgstr "" | 6193 msgstr "" |
6008 | 6259 |
6009 msgid "reverse effect of earlier changeset" | 6260 msgid "reverse effect of earlier changeset" |
6010 msgstr "omvänd effekten från en tidigare ändring" | 6261 msgstr "omvänd effekten från en tidigare ändring" |
6011 | 6262 |
6012 msgid "" | 6263 msgid "" |
6013 " Commit the backed out changes as a new changeset. The new\n" | 6264 " The backout command merges the reverse effect of the reverted\n" |
6014 " changeset is a child of the backed out changeset." | 6265 " changeset into the working directory." |
6015 msgstr "" | 6266 msgstr "" |
6016 " Arkivera de återkallade ändringarna som en ny ändring. Den nya\n" | 6267 " Kommandot backout sammanfogar den omvända effekven av den återkallade\n" |
6017 " ändringen är ett barn till den återkallade ändringen." | 6268 " ändringen i arbetskatalogen." |
6018 | 6269 |
6019 msgid "" | 6270 msgid "" |
6020 " If you backout a changeset other than the tip, a new head is\n" | 6271 " With the --merge option, it first commits the reverted changes\n" |
6021 " created. This head will be the new tip and you should merge this\n" | 6272 " as a new changeset. This new changeset is a child of the reverted\n" |
6022 " backout changeset with another head." | 6273 " changeset.\n" |
6023 msgstr "" | |
6024 " Om du återkallar en annan ändring än toppen, skapas ett nytt huvud.\n" | |
6025 " Detta huvud kommer att vara en nya toppen och du bör sammanfoga den med\n" | |
6026 " ett annat huvud." | |
6027 | |
6028 msgid "" | |
6029 " The --merge option remembers the parent of the working directory\n" | 6274 " The --merge option remembers the parent of the working directory\n" |
6030 " before starting the backout, then merges the new head with that\n" | 6275 " before starting the backout, then merges the new head with that\n" |
6031 " changeset afterwards. This saves you from doing the merge by hand.\n" | 6276 " changeset afterwards.\n" |
6032 " The result of this merge is not committed, as with a normal merge." | 6277 " This will result in an explicit merge in the history." |
6033 msgstr "" | 6278 msgstr "" |
6279 " Med flaggan --merge arkiveras först de återkallade ändringarna som en\n" | |
6280 " ny ändring. Denna ny ändring är en ättling till den återkallade\n" | |
6281 " ändringen.\n" | |
6034 " Flaggan --merge kommer ihåg arbetskatalogens förälder innan\n" | 6282 " Flaggan --merge kommer ihåg arbetskatalogens förälder innan\n" |
6035 " återkallningen påbörjas, och sammanfogar sedan det nya huvudet med den\n" | 6283 " återkallningen påbörjas, och sammanfogar sedan det nya huvudet med den\n" |
6036 " ändringen efteråt. Detta gör att du inte behöver göra sammanfogningen\n" | 6284 " ändringen efteråt.\n" |
6037 " manuellt. Resultatet av sammanfogningen arkiveras inte, precis som en\n" | 6285 " Detta resulterar i en explicit sammanfogning i historiken" |
6038 " vanlig sammanfogning." | 6286 |
6287 msgid "" | |
6288 " If you backout a changeset other than the original parent of the\n" | |
6289 " working directory, the result of this merge is not committed,\n" | |
6290 " as with a normal merge. Otherwise, no merge is needed and the\n" | |
6291 " commit is automatic." | |
6292 msgstr "" | |
6293 " Om du tar tillbaka en annan ändring än originalföräldern till\n" | |
6294 " arbetskatalogen, så arkiveras inte resultatet av sammanfogningen, som\n" | |
6295 " vid en normal sammanfogning. Annars behövs ingen sammanfogning, och\n" | |
6296 " arkiveringen är automatisk." | |
6297 | |
6298 msgid "" | |
6299 " Note that the default behavior (without --merge) has changed in\n" | |
6300 " version 1.7. To restore the previous default behavior, use\n" | |
6301 " :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" | |
6302 " the ongoing merge." | |
6303 msgstr "" | |
6304 " Notera att standardförfarandet (utan --merge) har ändrats i version\n" | |
6305 " 1.7. För att återställa det gamla standardförfarandet, använd :hg:`\n" | |
6306 " backout --merge` och sedan :hg:`update --clean .` för att bli av med\n" | |
6307 " den pågående sammanfogningen." | |
6039 | 6308 |
6040 msgid "please specify just one revision" | 6309 msgid "please specify just one revision" |
6041 msgstr "specificera bara en revision" | 6310 msgstr "specificera bara en revision" |
6042 | 6311 |
6043 msgid "please specify a revision to backout" | 6312 msgid "please specify a revision to backout" |
6064 msgstr "ändringen %s återkallar ändringen %s\n" | 6333 msgstr "ändringen %s återkallar ändringen %s\n" |
6065 | 6334 |
6066 #, python-format | 6335 #, python-format |
6067 msgid "merging with changeset %s\n" | 6336 msgid "merging with changeset %s\n" |
6068 msgstr "sammanfogar med ändring %s\n" | 6337 msgstr "sammanfogar med ändring %s\n" |
6069 | |
6070 msgid "the backout changeset is a new head - do not forget to merge\n" | |
6071 msgstr "återkallningsändringen är ett nytt huvud - glöm inte att sammanfoga\n" | |
6072 | |
6073 msgid "(use \"backout --merge\" if you want to auto-merge)\n" | |
6074 msgstr "(använd \"backout --merge\" om du vill auto-sammanfoga)\n" | |
6075 | 6338 |
6076 msgid "subdivision search of changesets" | 6339 msgid "subdivision search of changesets" |
6077 msgstr "genomsökning av ändringar med halveringsmetoden" | 6340 msgstr "genomsökning av ändringar med halveringsmetoden" |
6078 | 6341 |
6079 msgid "" | 6342 msgid "" |
6117 msgid "The first good revision is:\n" | 6380 msgid "The first good revision is:\n" |
6118 msgstr "Den första bra revisionen är:\n" | 6381 msgstr "Den första bra revisionen är:\n" |
6119 | 6382 |
6120 msgid "The first bad revision is:\n" | 6383 msgid "The first bad revision is:\n" |
6121 msgstr "Den första dåliga revisionen är:\n" | 6384 msgstr "Den första dåliga revisionen är:\n" |
6385 | |
6386 #, python-format | |
6387 msgid "" | |
6388 "Not all ancestors of this changeset have been checked.\n" | |
6389 "To check the other ancestors, start from the common ancestor, %s.\n" | |
6390 msgstr "" | |
6122 | 6391 |
6123 msgid "Due to skipped revisions, the first good revision could be any of:\n" | 6392 msgid "Due to skipped revisions, the first good revision could be any of:\n" |
6124 msgstr "" | 6393 msgstr "" |
6125 "Tack vare skippade revisioner, är den första bra revisionen någon av:\n" | 6394 "Tack vare skippade revisioner, är den första bra revisionen någon av:\n" |
6126 | 6395 |
6488 msgstr "" | 6757 msgstr "" |
6489 " Om du arkiverar resultatet av en sammanfogning, ange inga filnamn\n" | 6758 " Om du arkiverar resultatet av en sammanfogning, ange inga filnamn\n" |
6490 " eller flaggorna -I/-X." | 6759 " eller flaggorna -I/-X." |
6491 | 6760 |
6492 msgid "" | 6761 msgid "" |
6493 " If no commit message is specified, the configured editor is\n" | 6762 " If no commit message is specified, Mercurial starts your\n" |
6494 " started to prompt you for a message." | 6763 " configured editor where you can enter a message. In case your\n" |
6495 msgstr "" | 6764 " commit fails, you will find a backup of your message in\n" |
6496 " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n" | 6765 " ``.hg/last-message.txt``." |
6497 " att startas och fråga om meddelandet." | 6766 msgstr "" |
6767 " Om inget arkiveringsmeddelande anges, startar Mercurial din\n" | |
6768 " konfigurerade editor där du kan skriva ett meddelande. Om din\n" | |
6769 " arkivering misslyckas, kommer du att hitta en säkerhetskopia av ditt\n" | |
6770 " meddelande i ``.hg/last-message.txt``." | |
6498 | 6771 |
6499 msgid "" | 6772 msgid "" |
6500 " Returns 0 on success, 1 if nothing changed.\n" | 6773 " Returns 0 on success, 1 if nothing changed.\n" |
6501 " " | 6774 " " |
6502 msgstr "" | 6775 msgstr "" |
6598 " - empty to denote the default parent." | 6871 " - empty to denote the default parent." |
6599 msgstr "" | 6872 msgstr "" |
6600 | 6873 |
6601 msgid "" | 6874 msgid "" |
6602 " All string valued-elements are either strictly alphanumeric, or must\n" | 6875 " All string valued-elements are either strictly alphanumeric, or must\n" |
6603 " be enclosed in double quotes (\"...\"), with \"\" as escape character." | 6876 " be enclosed in double quotes (\"...\"), with \"\\\" as escape character." |
6604 msgstr "" | 6877 msgstr "" |
6605 | 6878 |
6606 msgid "" | 6879 msgid "" |
6607 " Note that the --overwritten-file and --appended-file options imply the\n" | 6880 " Note that the --overwritten-file and --appended-file options imply the\n" |
6608 " use of \"HGMERGE=internal:local\" during DAG buildup.\n" | 6881 " use of \"HGMERGE=internal:local\" during DAG buildup.\n" |
6757 msgstr "" | 7030 msgstr "" |
6758 | 7031 |
6759 msgid " (check that your locale is properly set)\n" | 7032 msgid " (check that your locale is properly set)\n" |
6760 msgstr "" | 7033 msgstr "" |
6761 | 7034 |
6762 msgid "Checking extensions...\n" | 7035 #, python-format |
7036 msgid "Checking installed modules (%s)...\n" | |
6763 msgstr "" | 7037 msgstr "" |
6764 | 7038 |
6765 msgid " One or more extensions could not be found" | 7039 msgid " One or more extensions could not be found" |
6766 msgstr "" | 7040 msgstr "" |
6767 | 7041 |
6786 msgid " patch test failed!\n" | 7060 msgid " patch test failed!\n" |
6787 msgstr "" | 7061 msgstr "" |
6788 | 7062 |
6789 msgid "" | 7063 msgid "" |
6790 " (Current patch tool may be incompatible with patch, or misconfigured. " | 7064 " (Current patch tool may be incompatible with patch, or misconfigured. " |
6791 "Please check your .hgrc file)\n" | 7065 "Please check your configuration file)\n" |
6792 msgstr "" | 7066 msgstr "" |
6793 | 7067 |
6794 msgid "" | 7068 msgid "" |
6795 " Internal patcher failure, please report this error to http://mercurial." | 7069 " Internal patcher failure, please report this error to http://mercurial." |
6796 "selenic.com/bts/\n" | 7070 "selenic.com/bts/\n" |
6800 msgstr "" | 7074 msgstr "" |
6801 | 7075 |
6802 msgid " No commit editor set and can't find vi in PATH\n" | 7076 msgid " No commit editor set and can't find vi in PATH\n" |
6803 msgstr "" | 7077 msgstr "" |
6804 | 7078 |
6805 msgid " (specify a commit editor in your .hgrc file)\n" | 7079 msgid " (specify a commit editor in your configuration file)\n" |
6806 msgstr "" | 7080 msgstr "" |
6807 | 7081 |
6808 #, python-format | 7082 #, python-format |
6809 msgid " Can't find editor '%s' in PATH\n" | 7083 msgid " Can't find editor '%s' in PATH\n" |
6810 msgstr "" | 7084 msgstr "" |
6811 | 7085 |
6812 msgid "Checking username...\n" | 7086 msgid "Checking username...\n" |
6813 msgstr "" | 7087 msgstr "" |
6814 | 7088 |
6815 msgid " (specify a username in your .hgrc file)\n" | 7089 msgid " (specify a username in your configuration file)\n" |
6816 msgstr "" | 7090 msgstr "" |
6817 | 7091 |
6818 msgid "No problems detected\n" | 7092 msgid "No problems detected\n" |
6819 msgstr "" | 7093 msgstr "" |
6820 | 7094 |
6844 | 7118 |
6845 msgid " Differences between files are shown using the unified diff format." | 7119 msgid " Differences between files are shown using the unified diff format." |
6846 msgstr " Skillnaderna mellan filerna visas i unified diff-format." | 7120 msgstr " Skillnaderna mellan filerna visas i unified diff-format." |
6847 | 7121 |
6848 msgid "" | 7122 msgid "" |
6849 " NOTE: diff may generate unexpected results for merges, as it will\n" | 7123 " .. note::\n" |
6850 " default to comparing against the working directory's first parent\n" | 7124 " diff may generate unexpected results for merges, as it will\n" |
6851 " changeset if no revisions are specified." | 7125 " default to comparing against the working directory's first\n" |
6852 msgstr "" | 7126 " parent changeset if no revisions are specified." |
6853 " NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n" | 7127 msgstr "" |
6854 " eftersom den som standard kommer att jämföra mot arbetskatalogens\n" | 7128 " .. note::\n" |
6855 " tidigare ändring om ingen revision anges." | 7129 " diff kan generera oväntade resultat för sammanfogningar eftersom\n" |
7130 " den som standard kommer att jämföra mot arbetskatalogens tidigare\n" | |
7131 " ändring om ingen revision anges." | |
6856 | 7132 |
6857 msgid "" | 7133 msgid "" |
6858 " Alternatively you can specify -c/--change with a revision to see\n" | 7134 " Alternatively you can specify -c/--change with a revision to see\n" |
6859 " the changes in that changeset relative to its first parent." | 7135 " the changes in that changeset relative to its first parent." |
6860 msgstr "" | 7136 msgstr "" |
6891 " Informationen som visas i ändringsheadern är: författare, datum,\n" | 7167 " Informationen som visas i ändringsheadern är: författare, datum,\n" |
6892 " grenens namn (om inte default), ändringens hash, föräldrar och\n" | 7168 " grenens namn (om inte default), ändringens hash, föräldrar och\n" |
6893 " arkiveringskommentar." | 7169 " arkiveringskommentar." |
6894 | 7170 |
6895 msgid "" | 7171 msgid "" |
6896 " NOTE: export may generate unexpected diff output for merge\n" | 7172 " .. note::\n" |
6897 " changesets, as it will compare the merge changeset against its\n" | 7173 " export may generate unexpected diff output for merge\n" |
6898 " first parent only." | 7174 " changesets, as it will compare the merge changeset against its\n" |
6899 msgstr "" | 7175 " first parent only." |
6900 " NOTERA: export kan generera oväntade resultat för sammanfogningar,\n" | 7176 msgstr "" |
6901 " eftersom den som standard bara kommer att jämföra mot den första\n" | 7177 " .. note::\n" |
6902 " föräldern." | 7178 " export kan generera oväntade resultat för sammanfogningar, eftersom\n" |
7179 " den som standard bara kommer att jämföra mot den första föräldern." | |
6903 | 7180 |
6904 msgid "" | 7181 msgid "" |
6905 " Output may be to a file, in which case the name of the file is\n" | 7182 " Output may be to a file, in which case the name of the file is\n" |
6906 " given using a format string. The formatting rules are as follows:" | 7183 " given using a format string. The formatting rules are as follows:" |
6907 msgstr "" | 7184 msgstr "" |
6908 " Utmatning kan vara till en fil, och då anges namnet på filen med en\n" | 7185 " Utmatning kan vara till en fil, och då anges namnet på filen med en\n" |
6909 " formatsträng. Formateringsreglerna är som följer::" | 7186 " formatsträng. Formateringsreglerna är som följer::" |
6910 | 7187 |
6911 msgid "" | 7188 msgid "" |
6912 " :``%%``: literal \"%\" character\n" | 7189 " :``%%``: literal \"%\" character\n" |
6913 " :``%H``: changeset hash (40 bytes of hexadecimal)\n" | 7190 " :``%H``: changeset hash (40 hexadecimal digits)\n" |
6914 " :``%N``: number of patches being generated\n" | 7191 " :``%N``: number of patches being generated\n" |
6915 " :``%R``: changeset revision number\n" | 7192 " :``%R``: changeset revision number\n" |
6916 " :``%b``: basename of the exporting repository\n" | 7193 " :``%b``: basename of the exporting repository\n" |
6917 " :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n" | 7194 " :``%h``: short-form changeset hash (12 hexadecimal digits)\n" |
6918 " :``%n``: zero-padded sequence number, starting at 1\n" | 7195 " :``%n``: zero-padded sequence number, starting at 1\n" |
6919 " :``%r``: zero-padded changeset revision number" | 7196 " :``%r``: zero-padded changeset revision number" |
6920 msgstr "" | 7197 msgstr "" |
6921 " :``%%``: ett \"%\"-tecken\n" | 7198 " :``%%``: ett \"%\"-tecken\n" |
6922 " :``%H``: ändringshash (40 hexadecimala bytes)\n" | 7199 " :``%H``: ändringshash (40 hexadecimala siffror)\n" |
6923 " :``%N``: antal genererade patchar\n" | 7200 " :``%N``: antal genererade patchar\n" |
6924 " :``%R``: ändringens revisionsnummer\n" | 7201 " :``%R``: ändringens revisionsnummer\n" |
6925 " :``%b``: basnamn för det exporterande arkivet\n" | 7202 " :``%b``: basnamn för det exporterande arkivet\n" |
6926 " :``%h``: kort ändringshash (12 hexadecimala bytes)\n" | 7203 " :``%h``: kort ändringshash (12 hexadecimala siffror)\n" |
6927 " :``%n``: nollpaddat sekvensnummer, börjar med 1\n" | 7204 " :``%n``: nollpaddat sekvensnummer, börjar med 1\n" |
6928 " :``%r``: nollpaddat ändringsrevisionsnummer" | 7205 " :``%r``: nollpaddat ändringsrevisionsnummer" |
6929 | 7206 |
6930 msgid "" | 7207 msgid "" |
6931 " Without the -a/--text option, export will avoid generating diffs\n" | 7208 " Without the -a/--text option, export will avoid generating diffs\n" |
7138 "\n" | 7415 "\n" |
7139 "alias: %s\n" | 7416 "alias: %s\n" |
7140 | 7417 |
7141 msgid "(no help text available)" | 7418 msgid "(no help text available)" |
7142 msgstr "(ingen hjälptext tillgänglig)" | 7419 msgstr "(ingen hjälptext tillgänglig)" |
7420 | |
7421 #, python-format | |
7422 msgid "shell alias for::" | |
7423 msgstr "skal-alias för::" | |
7424 | |
7425 #, python-format | |
7426 msgid " %s" | |
7427 msgstr " %s" | |
7143 | 7428 |
7144 #, python-format | 7429 #, python-format |
7145 msgid "alias for: hg %s" | 7430 msgid "alias for: hg %s" |
7146 msgstr "alias för: hg %s" | 7431 msgstr "alias för: hg %s" |
7147 | 7432 |
7329 " " | 7614 " " |
7330 msgstr "" | 7615 msgstr "" |
7331 " Returnerar 0 om det finns inkommande ändringar, 1 annars.\n" | 7616 " Returnerar 0 om det finns inkommande ändringar, 1 annars.\n" |
7332 " " | 7617 " " |
7333 | 7618 |
7619 msgid "cannot combine --bundle and --subrepos" | |
7620 msgstr "" | |
7621 | |
7334 msgid "create a new repository in the given directory" | 7622 msgid "create a new repository in the given directory" |
7335 msgstr "skapa ett nytt arkiv i den angivna katalogen" | 7623 msgstr "skapa ett nytt arkiv i den angivna katalogen" |
7336 | 7624 |
7337 msgid "" | 7625 msgid "" |
7338 " Initialize a new repository in the given directory. If the given\n" | 7626 " Initialize a new repository in the given directory. If the given\n" |
7432 " märken, icke-triviala föräldrar, användare, datum och tid, samt ett\n" | 7720 " märken, icke-triviala föräldrar, användare, datum och tid, samt ett\n" |
7433 " sammandrag för varje arkivering. När flaggan -v/--verbose används,\n" | 7721 " sammandrag för varje arkivering. När flaggan -v/--verbose används,\n" |
7434 " visas listan med ändrade filer och fullständigt arkiveringsmeddelande." | 7722 " visas listan med ändrade filer och fullständigt arkiveringsmeddelande." |
7435 | 7723 |
7436 msgid "" | 7724 msgid "" |
7437 " NOTE: log -p/--patch may generate unexpected diff output for merge\n" | 7725 " .. note::\n" |
7438 " changesets, as it will only compare the merge changeset against\n" | 7726 " log -p/--patch may generate unexpected diff output for merge\n" |
7439 " its first parent. Also, only files different from BOTH parents\n" | 7727 " changesets, as it will only compare the merge changeset against\n" |
7440 " will appear in files:." | 7728 " its first parent. Also, only files different from BOTH parents\n" |
7441 msgstr "" | 7729 " will appear in files:." |
7442 " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n" | 7730 msgstr "" |
7443 " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n" | 7731 " .. note::\n" |
7444 " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n" | 7732 " log -p/--patch kan generera oväntad diff-utmatning för\n" |
7445 " föräldrarna att visas i filer:." | 7733 " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot\n" |
7734 " den första förälder. Dessutom kommer bara filer som skiljer sig från\n" | |
7735 " BÅDA föräldrarna att visas i filer:." | |
7446 | 7736 |
7447 msgid "output the current or given revision of the project manifest" | 7737 msgid "output the current or given revision of the project manifest" |
7448 msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet" | 7738 msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet" |
7449 | 7739 |
7450 msgid "" | 7740 msgid "" |
7483 " nästa arkivering och en arkivering måste utföras innan några andra\n" | 7773 " nästa arkivering och en arkivering måste utföras innan några andra\n" |
7484 " arkivuppdateringar tillåts. Nästa arkivering kommer att ha två\n" | 7774 " arkivuppdateringar tillåts. Nästa arkivering kommer att ha två\n" |
7485 " föräldrar." | 7775 " föräldrar." |
7486 | 7776 |
7487 msgid "" | 7777 msgid "" |
7778 " ``--tool`` can be used to specify the merge tool used for file\n" | |
7779 " merges. It overrides the HGMERGE environment variable and your\n" | |
7780 " configuration files." | |
7781 msgstr "" | |
7782 " ``--tool`` kan användas för att ange sammanfogningsverktyg att\n" | |
7783 " använda för filsammanfogningar. Det har högre prioritet än\n" | |
7784 " miljövariabeln HGMERGE och dina konfigurationsfiler." | |
7785 | |
7786 msgid "" | |
7488 " If no revision is specified, the working directory's parent is a\n" | 7787 " If no revision is specified, the working directory's parent is a\n" |
7489 " head revision, and the current branch contains exactly one other\n" | 7788 " head revision, and the current branch contains exactly one other\n" |
7490 " head, the other head is merged with by default. Otherwise, an\n" | 7789 " head, the other head is merged with by default. Otherwise, an\n" |
7491 " explicit revision with which to merge with must be provided." | 7790 " explicit revision with which to merge with must be provided." |
7492 msgstr "" | 7791 msgstr "" |
7493 " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n" | 7792 " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n" |
7494 " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n" | 7793 " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n" |
7495 " det andra huvudet som standard. Om inte, måste en explicit revision\n" | 7794 " det andra huvudet som standard. Om inte, måste en explicit revision\n" |
7496 " anges." | 7795 " anges." |
7796 | |
7797 msgid " :hg:`resolve` must be used to resolve unresolved files." | |
7798 msgstr " :hg:`resolve` måste användas för att lösa olästa filer." | |
7497 | 7799 |
7498 msgid "" | 7800 msgid "" |
7499 " To undo an uncommitted merge, use :hg:`update --clean .` which\n" | 7801 " To undo an uncommitted merge, use :hg:`update --clean .` which\n" |
7500 " will check out a clean copy of the original merge parent, losing\n" | 7802 " will check out a clean copy of the original merge parent, losing\n" |
7501 " all changes." | 7803 " all changes." |
7594 msgstr "" | 7896 msgstr "" |
7595 " Visa definitioner för sökvägen NAME. Om inget namn anges, visas\n" | 7897 " Visa definitioner för sökvägen NAME. Om inget namn anges, visas\n" |
7596 " definitionen för alla tillgängliga namn." | 7898 " definitionen för alla tillgängliga namn." |
7597 | 7899 |
7598 msgid "" | 7900 msgid "" |
7599 " Path names are defined in the [paths] section of\n" | 7901 " Path names are defined in the [paths] section of your\n" |
7600 " ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n" | 7902 " configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n" |
7601 " repository, ``.hg/hgrc`` is used, too." | 7903 " repository, ``.hg/hgrc`` is used, too." |
7602 msgstr "" | 7904 msgstr "" |
7603 " Sökvägar definieras i sektionen [paths] i ``/etc/mercurial/hgrc`` och\n" | 7905 " Sökvägar definieras i sektionen [paths] i din konfigurationsfil och i\n" |
7604 " ``$HOME/.hgrc``. Om det körs i ett arkiv, så används ``.hg/hgrc`` också." | 7906 " ``/etc/mercurial/hgrc``. Om det körs i ett arkiv, så används\n" |
7907 " ``.hg/hgrc`` också." | |
7605 | 7908 |
7606 msgid "" | 7909 msgid "" |
7607 " The path names ``default`` and ``default-push`` have a special\n" | 7910 " The path names ``default`` and ``default-push`` have a special\n" |
7608 " meaning. When performing a push or pull operation, they are used\n" | 7911 " meaning. When performing a push or pull operation, they are used\n" |
7609 " as fallbacks if no location is specified on the command-line.\n" | 7912 " as fallbacks if no location is specified on the command-line.\n" |
7673 msgstr "" | 7976 msgstr "" |
7674 " Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n" | 7977 " Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n" |
7675 " filer.\n" | 7978 " filer.\n" |
7676 " " | 7979 " " |
7677 | 7980 |
7981 msgid "" | |
7982 "other repository doesn't support revision lookup, so a rev cannot be " | |
7983 "specified." | |
7984 msgstr "" | |
7985 "det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " | |
7986 "anges." | |
7987 | |
7678 msgid "push changes to the specified destination" | 7988 msgid "push changes to the specified destination" |
7679 msgstr "tryck ändringar till den specificerade destinationen" | 7989 msgstr "tryck ändringar till den specificerade destinationen" |
7680 | 7990 |
7681 msgid "" | 7991 msgid "" |
7682 " Push changesets from the local repository to the specified\n" | 7992 " Push changesets from the local repository to the specified\n" |
7828 #, python-format | 8138 #, python-format |
7829 msgid "not removing %s: file is untracked\n" | 8139 msgid "not removing %s: file is untracked\n" |
7830 msgstr "raderar inte %s: filen är inte hanterad\n" | 8140 msgstr "raderar inte %s: filen är inte hanterad\n" |
7831 | 8141 |
7832 #, python-format | 8142 #, python-format |
7833 msgid "not removing %s: file %s (use -f to force removal)\n" | 8143 msgid "not removing %s: file still exists (use -f to force removal)\n" |
7834 msgstr "raderar inte %s: filen %s (använd -f för att tvinga)\n" | 8144 msgstr "raderar inte %s: filen finns fortfarande (använd -f för att tvinga)\n" |
7835 | 8145 |
7836 msgid "still exists" | 8146 #, python-format |
7837 msgstr "existerar fortfarande" | 8147 msgid "not removing %s: file is modified (use -f to force removal)\n" |
7838 | 8148 msgstr "raderar inte %s: filen är ändrad (använd -f för att tvinga)\n" |
7839 msgid "is modified" | 8149 |
7840 msgstr "är modifierad" | 8150 #, python-format |
7841 | 8151 msgid "" |
7842 msgid "has been marked for add" | 8152 "not removing %s: file has been marked for add (use -f to force removal)\n" |
7843 msgstr "har markerats för addering" | 8153 msgstr "raderar inte %s: filen har lags till (använd -f för att tvinga)\n" |
7844 | 8154 |
7845 msgid "rename files; equivalent of copy + remove" | 8155 msgid "rename files; equivalent of copy + remove" |
7846 msgstr "döp om filer; likvärdig med kopiering + radering" | 8156 msgstr "döp om filer; likvärdig med kopiering + radering" |
7847 | 8157 |
7848 msgid "" | 8158 msgid "" |
7860 msgstr "" | 8170 msgstr "" |
7861 " Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" | 8171 " Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" |
7862 " namnbyte innan det, se :hg:`revert`.\n" | 8172 " namnbyte innan det, se :hg:`revert`.\n" |
7863 " " | 8173 " " |
7864 | 8174 |
7865 msgid "various operations to help finish a merge" | 8175 msgid "redo merges or set/view the merge status of files" |
7866 msgstr "diverse operationer för att slutföra sammanfogningar" | 8176 msgstr "" |
7867 | 8177 |
7868 msgid "" | 8178 msgid "" |
7869 " This command includes several actions that are often useful while\n" | 8179 " Merges with unresolved conflicts are often the result of\n" |
7870 " performing a merge, after running ``merge`` but before running\n" | 8180 " non-interactive merging using the ``internal:merge`` configuration\n" |
7871 " ``commit``. (It is only meaningful if your working directory has\n" | 8181 " setting, or a command-line merge tool like ``diff3``. The resolve\n" |
7872 " two parents.) It is most relevant for merges with unresolved\n" | 8182 " command is used to manage the files involved in a merge, after\n" |
7873 " conflicts, which are typically a result of non-interactive merging with\n" | 8183 " :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n" |
7874 " ``internal:merge`` or a command-line merge tool like ``diff3``." | 8184 " working directory must have two parents)." |
7875 msgstr "" | 8185 msgstr "" |
7876 " Det här kommandot inkludera flera handlingar som ofta är nyttiga när\n" | 8186 |
7877 " en sammanfogning utförs, efter att ``merge`` körts men innan\n" | 8187 msgid " The resolve command can be used in the following ways:" |
7878 " ``commit``. (Det är bara nyttigt om din arbetskatalog har två\n" | 8188 msgstr "" |
7879 " föräldrar.) Det är mest relevant för sammanfogningar med olösta\n" | 8189 |
7880 " konflikter, som är vanliga resultat av icke-interaktiv sammanfogning\n" | 8190 msgid "" |
7881 " med ``internal:merge`` eller ett kommandoradsverktyg som ``diff3``." | 8191 " - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified\n" |
7882 | 8192 " files, discarding any previous merge attempts. Re-merging is not\n" |
7883 msgid " The available actions are:" | 8193 " performed for files already marked as resolved. Use ``--all/-a``\n" |
7884 msgstr " Tillgängliga handlingar är:" | 8194 " to selects all unresolved files. ``--tool`` can be used to specify\n" |
7885 | 8195 " the merge tool used for the given files. It overrides the HGMERGE\n" |
7886 msgid "" | 8196 " environment variable and your configuration files." |
7887 " 1) list files that were merged with conflicts (U, for unresolved)\n" | 8197 msgstr "" |
7888 " and without conflicts (R, for resolved): ``hg resolve -l``\n" | 8198 |
7889 " (this is like ``status`` for merges)\n" | 8199 msgid "" |
7890 " 2) record that you have resolved conflicts in certain files:\n" | 8200 " - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n" |
7891 " ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n" | 8201 " (e.g. after having manually fixed-up the files). The default is\n" |
7892 " 3) forget that you have resolved conflicts in certain files:\n" | 8202 " to mark all unresolved files." |
7893 " ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n" | 8203 msgstr "" |
7894 " 4) discard your current attempt(s) at resolving conflicts and\n" | 8204 |
7895 " restart the merge from scratch: ``hg resolve file...``\n" | 8205 msgid "" |
7896 " (or ``-a`` for all unresolved files)" | 8206 " - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n" |
7897 msgstr "" | 8207 " default is to mark all resolved files." |
7898 " 1) visa filer som är sammanfogade med konflikter (U för olösta) och\n" | 8208 msgstr "" |
7899 " utan konflikter (R för lösta): ``hg resolve -l`` (detta är som\n" | 8209 |
7900 " ``status`` för sammanfogningar)\n" | 8210 msgid "" |
7901 " 2) lagra att du har löst konflikter i vissa filer:\n" | 8211 " - :hg:`resolve -l`: list files which had or still have conflicts.\n" |
7902 " ``hg resolve -m [fil ...]`` (standard: markera alla olösta filer)\n" | 8212 " In the printed list, ``U`` = unresolved and ``R`` = resolved." |
7903 " 3) glöm att du har löst konflikter i vissa filer\n" | 8213 msgstr "" |
7904 " ``hg resolve -u [fil ...]`` (standard: avmarkera alla lösta filer)\n" | 8214 |
7905 " 4) kasta bort ditt nuvarande försök att lösa konflikter och starta\n" | 8215 msgid "" |
7906 " sammanfogningen från noll: ``hg resolve fil...`` (eller ``-a``\n" | 8216 " Note that Mercurial will not let you commit files with unresolved\n" |
7907 " för alla olösta filer)" | 8217 " merge conflicts. You must use :hg:`resolve -m ...` before you can\n" |
7908 | 8218 " commit after a conflicting merge." |
7909 msgid "" | |
7910 " Note that Mercurial will not let you commit files with unresolved merge\n" | |
7911 " conflicts. You must use ``hg resolve -m ...`` before you can commit\n" | |
7912 " after a conflicting merge." | |
7913 msgstr "" | 8219 msgstr "" |
7914 " Notera att Mercurial inte låter dig arkivera filer med olösta\n" | 8220 " Notera att Mercurial inte låter dig arkivera filer med olösta\n" |
7915 " konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n" | 8221 " konflikter från sammanfogningar. Du måste använda :hg:`resolve -m ...`\n" |
7916 " innan du kan arkivera efter en sammanfogning med konflikter" | 8222 " innan du kan arkivera efter en sammanfogning med konflikter." |
7917 | 8223 |
7918 msgid "" | 8224 msgid "" |
7919 " Returns 0 on success, 1 if any files fail a resolve attempt.\n" | 8225 " Returns 0 on success, 1 if any files fail a resolve attempt.\n" |
7920 " " | 8226 " " |
7921 msgstr "" | 8227 msgstr "" |
7935 | 8241 |
7936 msgid "restore individual files or directories to an earlier state" | 8242 msgid "restore individual files or directories to an earlier state" |
7937 msgstr "återställ filer eller kataloger till ett tidigare tillstånd" | 8243 msgstr "återställ filer eller kataloger till ett tidigare tillstånd" |
7938 | 8244 |
7939 msgid "" | 8245 msgid "" |
7940 " NOTE: This command is most likely not what you are looking for. revert\n" | 8246 " .. note::\n" |
7941 " will partially overwrite content in the working directory without " | 8247 " This command is most likely not what you are looking for.\n" |
7942 "changing\n" | 8248 " Revert will partially overwrite content in the working\n" |
7943 " the working directory parents. Use :hg:`update -r rev` to check out " | 8249 " directory without changing the working directory parents. Use\n" |
7944 "earlier\n" | 8250 " :hg:`update -r rev` to check out earlier revisions, or\n" |
7945 " revisions, or :hg:`update --clean .` to undo a merge which has added\n" | 8251 " :hg:`update --clean .` to undo a merge which has added another\n" |
7946 " another parent." | 8252 " parent." |
7947 msgstr "" | 8253 msgstr "" |
7948 " NOTERA: Det här kommandot är troligtvis inte det du letar efter.\n" | 8254 " .. note::\n" |
7949 " revert kommer att delvis skriva över innehåll i arbetskatalogen utan\n" | 8255 " Det här kommandot är troligtvis inte det du letar efter. Revert\n" |
7950 " att ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för\n" | 8256 " kommer att delvis skriva över innehåll i arbetskatalogen utan att\n" |
7951 " att hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n" | 8257 " ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för att\n" |
7952 " ångra en sammanfogning som har lagt till fler föräldrar." | 8258 " hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n" |
8259 " ångra en sammanfogning som har lagt till fler föräldrar." | |
7953 | 8260 |
7954 msgid "" | 8261 msgid "" |
7955 " With no revision specified, revert the named files or directories\n" | 8262 " With no revision specified, revert the named files or directories\n" |
7956 " to the contents they had in the parent of the working directory.\n" | 8263 " to the contents they had in the parent of the working directory.\n" |
7957 " This restores the contents of the affected files to an unmodified\n" | 8264 " This restores the contents of the affected files to an unmodified\n" |
8151 " number it uses." | 8458 " number it uses." |
8152 msgstr "" | 8459 msgstr "" |
8153 " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" | 8460 " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" |
8154 " som portnummer; då visar servern det portnummer som används." | 8461 " som portnummer; då visar servern det portnummer som används." |
8155 | 8462 |
8463 msgid "There is no Mercurial repository here (.hg not found)" | |
8464 msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" | |
8465 | |
8156 #, python-format | 8466 #, python-format |
8157 msgid "listening at http://%s%s/%s (bound to %s:%d)\n" | 8467 msgid "listening at http://%s%s/%s (bound to %s:%d)\n" |
8158 msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n" | 8468 msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n" |
8159 | 8469 |
8160 msgid "show changed files in the working directory" | 8470 msgid "show changed files in the working directory" |
8180 msgstr "" | 8490 msgstr "" |
8181 " Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n" | 8491 " Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n" |
8182 " inte bes om explicit med -u/--unknown eller -i/--ignored." | 8492 " inte bes om explicit med -u/--unknown eller -i/--ignored." |
8183 | 8493 |
8184 msgid "" | 8494 msgid "" |
8185 " NOTE: status may appear to disagree with diff if permissions have\n" | 8495 " .. note::\n" |
8186 " changed or a merge has occurred. The standard diff format does not\n" | 8496 " status may appear to disagree with diff if permissions have\n" |
8187 " report permission changes and diff only reports changes relative\n" | 8497 " changed or a merge has occurred. The standard diff format does\n" |
8188 " to one merge parent." | 8498 " not report permission changes and diff only reports changes\n" |
8189 msgstr "" | 8499 " relative to one merge parent." |
8190 " NOTERA: status kan verka osams med diff om tillstånd har ändrat eller\n" | 8500 msgstr "" |
8191 " en sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n" | 8501 " .. note::\n" |
8192 " inte förändringar av tillstånd och diff rapporterar bara ändringar\n" | 8502 " status kan verka osams med diff om tillstånd har ändrat eller en\n" |
8193 " relativt till en förälder vid sammanfogningar." | 8503 " sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n" |
8504 " inte förändringar av tillstånd och diff rapporterar bara ändringar\n" | |
8505 " relativt till en förälder vid sammanfogningar." | |
8194 | 8506 |
8195 msgid "" | 8507 msgid "" |
8196 " If one revision is given, it is used as the base revision.\n" | 8508 " If one revision is given, it is used as the base revision.\n" |
8197 " If two revisions are given, the differences between them are\n" | 8509 " If two revisions are given, the differences between them are\n" |
8198 " shown. The --change option can also be used as a shortcut to list\n" | 8510 " shown. The --change option can also be used as a shortcut to list\n" |
8458 msgid "update working directory (or switch revisions)" | 8770 msgid "update working directory (or switch revisions)" |
8459 msgstr "uppdatera arbetskatalogen (eller växla mellan revisioner)" | 8771 msgstr "uppdatera arbetskatalogen (eller växla mellan revisioner)" |
8460 | 8772 |
8461 msgid "" | 8773 msgid "" |
8462 " Update the repository's working directory to the specified\n" | 8774 " Update the repository's working directory to the specified\n" |
8775 " changeset. If no changeset is specified, update to the tip of the\n" | |
8776 " current named branch." | |
8777 msgstr "" | |
8778 " Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n" | |
8779 " ändring anes, så uppdateras till toppen på den nuvarande namngivna\n" | |
8780 " grenen." | |
8781 | |
8782 msgid "" | |
8783 " If the changeset is not a descendant of the working directory's\n" | |
8784 " parent, the update is aborted. With the -c/--check option, the\n" | |
8785 " working directory is checked for uncommitted changes; if none are\n" | |
8786 " found, the working directory is updated to the specified\n" | |
8463 " changeset." | 8787 " changeset." |
8464 msgstr " Uppdatera arkivets arbetskatalog till den specificerade ändringen." | 8788 msgstr "" |
8465 | |
8466 msgid "" | |
8467 " If no changeset is specified, attempt to update to the tip of the\n" | |
8468 " current branch. If this changeset is a descendant of the working\n" | |
8469 " directory's parent, update to it, otherwise abort." | |
8470 msgstr "" | |
8471 " Om ingen ändring anges, kommer ett försök att göras för att hämta ut\n" | |
8472 " toppen på den nuvarande grenen. Om ändringen är en ättling till\n" | |
8473 " arbetskatalogens föräldrar, uppdatera till det, annars avbryt." | |
8474 | 8789 |
8475 msgid "" | 8790 msgid "" |
8476 " The following rules apply when the working directory contains\n" | 8791 " The following rules apply when the working directory contains\n" |
8477 " uncommitted changes:" | 8792 " uncommitted changes:" |
8478 msgstr "" | 8793 msgstr "" |
8513 | 8828 |
8514 msgid "" | 8829 msgid "" |
8515 " Use null as the changeset to remove the working directory (like\n" | 8830 " Use null as the changeset to remove the working directory (like\n" |
8516 " :hg:`clone -U`)." | 8831 " :hg:`clone -U`)." |
8517 msgstr "" | 8832 msgstr "" |
8518 " Använd null som ändring för att radera arbetskatalogen (som :hg:`clone\n" | 8833 " Använd null som ändring för att radera arbetskatalogen (som\n" |
8519 " -U`)." | 8834 " :hg:`clone -U`)." |
8520 | 8835 |
8521 msgid "" | 8836 msgid "" |
8522 " If you want to update just one file to an older changeset, use :hg:" | 8837 " If you want to update just one file to an older changeset, use\n" |
8523 "`revert`." | 8838 " :hg:`revert`." |
8524 msgstr "" | 8839 msgstr "" |
8525 " Om du vill uppdatera bara en fil till en äldre ändring, använd :hg:" | 8840 " Om du vill uppdatera bara en fil till en äldre ändring, använd\n" |
8526 "`revert`." | 8841 " :hg:`revert`." |
8527 | 8842 |
8528 msgid "cannot specify both -c/--check and -C/--clean" | 8843 msgid "cannot specify both -c/--check and -C/--clean" |
8529 msgstr "" | 8844 msgstr "" |
8530 | 8845 |
8531 msgid "uncommitted local changes" | 8846 msgid "uncommitted local changes" |
8695 msgstr "" | 9010 msgstr "" |
8696 | 9011 |
8697 msgid "guess renamed files by similarity (0<=s<=100)" | 9012 msgid "guess renamed files by similarity (0<=s<=100)" |
8698 msgstr "gissa omdöpta filer efter likhet (0<=s<=100)" | 9013 msgstr "gissa omdöpta filer efter likhet (0<=s<=100)" |
8699 | 9014 |
9015 msgid "recurse into subrepositories" | |
9016 msgstr "gå in i underarkiv" | |
9017 | |
8700 msgid "[OPTION]... [FILE]..." | 9018 msgid "[OPTION]... [FILE]..." |
8701 msgstr "[FLAGGA]... [FIL]..." | 9019 msgstr "[FLAGGA]... [FIL]..." |
8702 | 9020 |
8703 msgid "annotate the specified revision" | 9021 msgid "annotate the specified revision" |
8704 msgstr "annotera den specificerade revisionen" | 9022 msgstr "annotera den specificerade revisionen" |
8978 msgstr "sök filer enbart inom ett givet revisionsområde" | 9296 msgstr "sök filer enbart inom ett givet revisionsområde" |
8979 | 9297 |
8980 msgid "[OPTION]... PATTERN [FILE]..." | 9298 msgid "[OPTION]... PATTERN [FILE]..." |
8981 msgstr "[FLAGGA]... MÖNSTER [FIL]..." | 9299 msgstr "[FLAGGA]... MÖNSTER [FIL]..." |
8982 | 9300 |
8983 msgid "show only heads which are descendants of REV" | 9301 msgid "show only heads which are descendants of STARTREV" |
8984 msgstr "visa bara huvuden som har REV som anfader" | 9302 msgstr "visa bara huvuden som är ättlingar till STARTREV" |
9303 | |
9304 msgid "STARTREV" | |
9305 msgstr "STARTREV" | |
8985 | 9306 |
8986 msgid "show topological heads only" | 9307 msgid "show topological heads only" |
8987 msgstr "visa bara topologiska huvuden" | 9308 msgstr "visa bara topologiska huvuden" |
8988 | 9309 |
8989 msgid "show active branchheads only [DEPRECATED]" | 9310 msgid "show active branchheads only (DEPRECATED)" |
8990 msgstr "visa bara aktiva grenhuvuden [FÖRLEGAD]" | 9311 msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)" |
8991 | 9312 |
8992 msgid "show normal and closed branch heads" | 9313 msgid "show normal and closed branch heads" |
8993 msgstr "visa normala och stängda grenhuvuden" | 9314 msgstr "visa normala och stängda grenhuvuden" |
8994 | 9315 |
8995 msgid "[-ac] [-r REV] [REV]..." | 9316 msgid "[-ac] [-r STARTREV] [REV]..." |
8996 msgstr "[-ac] [-r REV] [REV]..." | 9317 msgstr "[-ac] [-r STARTREV] [REV]..." |
8997 | 9318 |
8998 msgid "[TOPIC]" | 9319 msgid "[TOPIC]" |
8999 msgstr "[ÄMNE]" | 9320 msgstr "[ÄMNE]" |
9000 | 9321 |
9001 msgid "identify the specified revision" | 9322 msgid "identify the specified revision" |
9115 msgstr "[-r REV]" | 9436 msgstr "[-r REV]" |
9116 | 9437 |
9117 msgid "force a merge with outstanding changes" | 9438 msgid "force a merge with outstanding changes" |
9118 msgstr "tvinga en sammanfogning med utestående ändringar" | 9439 msgstr "tvinga en sammanfogning med utestående ändringar" |
9119 | 9440 |
9441 msgid "specify merge tool" | |
9442 msgstr "ange sammanfogningsverktyg" | |
9443 | |
9120 msgid "revision to merge" | 9444 msgid "revision to merge" |
9121 msgstr "revision att sammanfoga" | 9445 msgstr "revision att sammanfoga" |
9122 | 9446 |
9123 msgid "review revisions to merge (no merge is performed)" | 9447 msgid "review revisions to merge (no merge is performed)" |
9124 msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)" | 9448 msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)" |
9179 | 9503 |
9180 msgid "list state of files needing merge" | 9504 msgid "list state of files needing merge" |
9181 msgstr "visa status för filer som behöver sammanfogas" | 9505 msgstr "visa status för filer som behöver sammanfogas" |
9182 | 9506 |
9183 msgid "mark files as resolved" | 9507 msgid "mark files as resolved" |
9184 msgstr "markera filen som löst" | 9508 msgstr "markera filer som lösta" |
9185 | 9509 |
9186 msgid "unmark files as resolved" | 9510 msgid "mark files as unresolved" |
9187 msgstr "avmarkera filen som löst" | 9511 msgstr "markera filer som olösta" |
9188 | 9512 |
9189 msgid "hide status prefix" | 9513 msgid "hide status prefix" |
9190 msgstr "göm statusprefix" | 9514 msgstr "göm statusprefix" |
9191 | 9515 |
9192 msgid "revert all changes when no arguments given" | 9516 msgid "revert all changes when no arguments given" |
9226 msgstr "sökvägsprefix att dela ut från (standard: serverrot)" | 9550 msgstr "sökvägsprefix att dela ut från (standard: serverrot)" |
9227 | 9551 |
9228 msgid "name to show in web pages (default: working directory)" | 9552 msgid "name to show in web pages (default: working directory)" |
9229 msgstr "namn att visa i webbsidor (standard: arbetskatalogen)" | 9553 msgstr "namn att visa i webbsidor (standard: arbetskatalogen)" |
9230 | 9554 |
9231 msgid "name of the hgweb config file (serve more than one repository)" | 9555 msgid "name of the hgweb config file (see \"hg help hgweb\")" |
9232 msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)" | 9556 msgstr "namn på webdir-konfigurationsfil (se \"hg help hgweb\")" |
9233 | 9557 |
9234 msgid "name of the hgweb config file (DEPRECATED)" | 9558 msgid "name of the hgweb config file (DEPRECATED)" |
9235 msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)" | 9559 msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)" |
9236 | 9560 |
9237 msgid "for remote clients" | 9561 msgid "for remote clients" |
9319 msgstr "[-u] FIL..." | 9643 msgstr "[-u] FIL..." |
9320 | 9644 |
9321 msgid "discard uncommitted changes (no backup)" | 9645 msgid "discard uncommitted changes (no backup)" |
9322 msgstr "kassera oarkiverade ändringar (ingen backup)" | 9646 msgstr "kassera oarkiverade ändringar (ingen backup)" |
9323 | 9647 |
9324 msgid "check for uncommitted changes" | 9648 msgid "update across branches if no uncommitted changes" |
9325 msgstr "leta efter icke arkiverade ändringar" | 9649 msgstr "" |
9326 | 9650 |
9327 msgid "[-c] [-C] [-d DATE] [[-r] REV]" | 9651 msgid "[-c] [-C] [-d DATE] [[-r] REV]" |
9328 msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" | 9652 msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" |
9329 | 9653 |
9330 #, python-format | 9654 #, python-format |
9332 msgstr "" | 9656 msgstr "" |
9333 | 9657 |
9334 msgid "not found in manifest" | 9658 msgid "not found in manifest" |
9335 msgstr "" | 9659 msgstr "" |
9336 | 9660 |
9661 #, python-format | |
9662 msgid "no such file in rev %s" | |
9663 msgstr "" | |
9664 | |
9337 msgid "branch name not in UTF-8!" | 9665 msgid "branch name not in UTF-8!" |
9338 msgstr "" | 9666 msgstr "" |
9339 | 9667 |
9340 #, python-format | 9668 #, python-format |
9341 msgid "%s does not exist!\n" | 9669 msgid "%s does not exist!\n" |
9376 #, python-format | 9704 #, python-format |
9377 msgid "copy failed: %s is not a file or a symbolic link\n" | 9705 msgid "copy failed: %s is not a file or a symbolic link\n" |
9378 msgstr "" | 9706 msgstr "" |
9379 | 9707 |
9380 #, python-format | 9708 #, python-format |
9709 msgid "invalid character in dag description: %s..." | |
9710 msgstr "" | |
9711 | |
9712 #, python-format | |
9713 msgid "expected id %i, got %i" | |
9714 msgstr "" | |
9715 | |
9716 #, python-format | |
9717 msgid "parent id %i is larger than current id %i" | |
9718 msgstr "" | |
9719 | |
9720 #, python-format | |
9381 msgid "invalid event type in dag: %s" | 9721 msgid "invalid event type in dag: %s" |
9382 msgstr "" | 9722 msgstr "" |
9383 | 9723 |
9384 msgid "working directory state appears damaged!" | 9724 msgid "working directory state appears damaged!" |
9385 msgstr "" | 9725 msgstr "" |
9440 | 9780 |
9441 msgid "repository is unrelated" | 9781 msgid "repository is unrelated" |
9442 msgstr "arkivet är obesläktat" | 9782 msgstr "arkivet är obesläktat" |
9443 | 9783 |
9444 #, python-format | 9784 #, python-format |
9445 msgid "abort: push creates new remote heads on branch '%s'!\n" | 9785 msgid "push creates new remote branches: %s!" |
9446 msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n" | 9786 msgstr "push skapar nya fjärrhuvuden: %s!" |
9447 | 9787 |
9448 msgid "abort: push creates new remote heads!\n" | 9788 msgid "use 'hg push --new-branch' to create new remote branches" |
9449 msgstr "avbryter: push skapar nya fjärrhuvuden!\n" | 9789 msgstr "använd 'hg push --new-branch' för att skapa nya fjärrgrenar" |
9450 | 9790 |
9451 msgid "(you should pull and merge or use push -f to force)\n" | 9791 #, python-format |
9452 msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n" | 9792 msgid "push creates new remote heads on branch '%s'!" |
9453 | 9793 msgstr "push skapar nya fjärrhuvuden på grenen '%s'!" |
9454 msgid "(did you forget to merge? use push -f to force)\n" | 9794 |
9455 msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" | 9795 msgid "push creates new remote heads!" |
9456 | 9796 msgstr "push skapar nya fjärrhuvuden!" |
9457 #, python-format | 9797 |
9458 msgid "abort: push creates new remote branches: %s!\n" | 9798 msgid "you should pull and merge or use push -f to force" |
9459 msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" | 9799 msgstr "du kan dra och sammanfoga eller använda push -f för att tvinga" |
9460 | 9800 |
9461 msgid "(use 'hg push --new-branch' to create new remote branches)\n" | 9801 msgid "did you forget to merge? use push -f to force" |
9462 msgstr "(använd 'hg push --new-branch' för att skapa nya fjärrgrenar)\n" | 9802 msgstr "glömde du att sammanfoga? använd push -f för att tvinga" |
9463 | 9803 |
9464 msgid "note: unsynced remote changes!\n" | 9804 msgid "note: unsynced remote changes!\n" |
9465 msgstr "notera: osynkade fjärrändringar!\n" | 9805 msgstr "notera: osynkade fjärrändringar!\n" |
9466 | 9806 |
9467 #, python-format | 9807 #, python-format |
9474 | 9814 |
9475 #, python-format | 9815 #, python-format |
9476 msgid "hg: parse error: %s\n" | 9816 msgid "hg: parse error: %s\n" |
9477 msgstr "" | 9817 msgstr "" |
9478 | 9818 |
9819 msgid "entering debugger - type c to continue starting hg or h for help\n" | |
9820 msgstr "" | |
9821 | |
9479 #, python-format | 9822 #, python-format |
9480 msgid "" | 9823 msgid "" |
9481 "hg: command '%s' is ambiguous:\n" | 9824 "hg: command '%s' is ambiguous:\n" |
9482 " %s\n" | 9825 " %s\n" |
9483 msgstr "" | 9826 msgstr "" |
9522 | 9865 |
9523 #, python-format | 9866 #, python-format |
9524 msgid "hg: unknown command '%s'\n" | 9867 msgid "hg: unknown command '%s'\n" |
9525 msgstr "" | 9868 msgstr "" |
9526 | 9869 |
9870 #, python-format | |
9871 msgid "(%s)\n" | |
9872 msgstr "" | |
9873 | |
9527 msgid "(did you forget to compile extensions?)\n" | 9874 msgid "(did you forget to compile extensions?)\n" |
9528 msgstr "" | 9875 msgstr "" |
9529 | 9876 |
9530 msgid "(is your Python install correct?)\n" | 9877 msgid "(is your Python install correct?)\n" |
9531 msgstr "" | 9878 msgstr "" |
9572 #, python-format | 9919 #, python-format |
9573 msgid "no definition for alias '%s'\n" | 9920 msgid "no definition for alias '%s'\n" |
9574 msgstr "" | 9921 msgstr "" |
9575 | 9922 |
9576 #, python-format | 9923 #, python-format |
9924 msgid "" | |
9925 "error in definition for alias '%s': %s may only be given on the command " | |
9926 "line\n" | |
9927 msgstr "" | |
9928 | |
9929 #, python-format | |
9577 msgid "alias '%s' resolves to unknown command '%s'\n" | 9930 msgid "alias '%s' resolves to unknown command '%s'\n" |
9578 msgstr "" | 9931 msgstr "" |
9579 | 9932 |
9580 #, python-format | 9933 #, python-format |
9581 msgid "alias '%s' resolves to ambiguous command '%s'\n" | 9934 msgid "alias '%s' resolves to ambiguous command '%s'\n" |
9591 | 9944 |
9592 #, python-format | 9945 #, python-format |
9593 msgid "extension '%s' overrides commands: %s\n" | 9946 msgid "extension '%s' overrides commands: %s\n" |
9594 msgstr "utökningen '%s' tar över dessa kommandon: %s\n" | 9947 msgstr "utökningen '%s' tar över dessa kommandon: %s\n" |
9595 | 9948 |
9596 msgid "Option --config may not be abbreviated!" | 9949 msgid "option --config may not be abbreviated!" |
9597 msgstr "" | 9950 msgstr "" |
9598 | 9951 |
9599 msgid "Option --cwd may not be abbreviated!" | 9952 msgid "option --cwd may not be abbreviated!" |
9600 msgstr "" | 9953 msgstr "" |
9601 | 9954 |
9602 msgid "" | 9955 msgid "" |
9603 "Option -R has to be separated from other options (e.g. not -qR) and --" | 9956 "Option -R has to be separated from other options (e.g. not -qR) and --" |
9604 "repository may only be abbreviated as --repo!" | 9957 "repository may only be abbreviated as --repo!" |
9677 | 10030 |
9678 #, python-format | 10031 #, python-format |
9679 msgid "was merge of '%s' successful (yn)?" | 10032 msgid "was merge of '%s' successful (yn)?" |
9680 msgstr "" | 10033 msgstr "" |
9681 | 10034 |
9682 msgid "&No" | |
9683 msgstr "" | |
9684 | |
9685 msgid "&Yes" | |
9686 msgstr "" | |
9687 | |
9688 #, python-format | 10035 #, python-format |
9689 msgid "" | 10036 msgid "" |
9690 " output file %s appears unchanged\n" | 10037 " output file %s appears unchanged\n" |
9691 "was merge successful (yn)?" | 10038 "was merge successful (yn)?" |
9692 msgstr "" | 10039 msgstr "" |
9693 | 10040 |
9694 #, python-format | 10041 #, python-format |
9695 msgid "merging %s failed!\n" | 10042 msgid "merging %s failed!\n" |
9696 msgstr "" | 10043 msgstr "" |
9697 | 10044 |
9698 #, python-format | 10045 msgid "starting revisions are not directly related" |
9699 msgid "Inconsistent state, %s:%s is good and bad" | 10046 msgstr "" |
10047 | |
10048 #, python-format | |
10049 msgid "inconsistent state, %s:%s is good and bad" | |
9700 msgstr "" | 10050 msgstr "" |
9701 | 10051 |
9702 #, python-format | 10052 #, python-format |
9703 msgid "unknown bisect kind %s" | 10053 msgid "unknown bisect kind %s" |
9704 msgstr "" | 10054 msgstr "" |
9722 msgstr "Ange En Revision" | 10072 msgstr "Ange En Revision" |
9723 | 10073 |
9724 msgid "Specifying Multiple Revisions" | 10074 msgid "Specifying Multiple Revisions" |
9725 msgstr "Ange Flera Revisioner" | 10075 msgstr "Ange Flera Revisioner" |
9726 | 10076 |
9727 msgid "Specifying Revision Sets" | |
9728 msgstr "Ange Revisionsset" | |
9729 | |
9730 msgid "Diff Formats" | 10077 msgid "Diff Formats" |
9731 msgstr "Diff-format" | 10078 msgstr "Diff-format" |
10079 | |
10080 msgid "Merge Tools" | |
10081 msgstr "Sammanfogningsverktyg" | |
9732 | 10082 |
9733 msgid "Template Usage" | 10083 msgid "Template Usage" |
9734 msgstr "Användning Av Mallar" | 10084 msgstr "Användning Av Mallar" |
9735 | 10085 |
9736 msgid "URL Paths" | 10086 msgid "URL Paths" |
9973 msgstr "" | 10323 msgstr "" |
9974 | 10324 |
9975 msgid "" | 10325 msgid "" |
9976 "To make Mercurial produce the git extended diff format, use the --git\n" | 10326 "To make Mercurial produce the git extended diff format, use the --git\n" |
9977 "option available for many commands, or set 'git = True' in the [diff]\n" | 10327 "option available for many commands, or set 'git = True' in the [diff]\n" |
9978 "section of your hgrc. You do not need to set this option when\n" | 10328 "section of your configuration file. You do not need to set this option\n" |
9979 "importing diffs in this format or using them in the mq extension.\n" | 10329 "when importing diffs in this format or using them in the mq extension.\n" |
9980 msgstr "" | 10330 msgstr "" |
9981 | 10331 |
9982 msgid "" | 10332 msgid "" |
9983 "HG\n" | 10333 "HG\n" |
9984 " Path to the 'hg' executable, automatically passed when running\n" | 10334 " Path to the 'hg' executable, automatically passed when running\n" |
9999 " This is the name of the editor to run when committing. See EDITOR." | 10349 " This is the name of the editor to run when committing. See EDITOR." |
10000 msgstr "" | 10350 msgstr "" |
10001 "HGEDITOR\n" | 10351 "HGEDITOR\n" |
10002 " Detta är namnet på editorn som ska köras vid arkivering. Se EDITOR." | 10352 " Detta är namnet på editorn som ska köras vid arkivering. Se EDITOR." |
10003 | 10353 |
10004 msgid " (deprecated, use .hgrc)" | 10354 msgid " (deprecated, use configuration file)" |
10005 msgstr " (föråldrad, använd .hgrc)" | 10355 msgstr " (föråldrad, använd konfigurationsfilen)" |
10006 | 10356 |
10007 msgid "" | 10357 msgid "" |
10008 "HGENCODING\n" | 10358 "HGENCODING\n" |
10009 " This overrides the default locale setting detected by Mercurial.\n" | 10359 " This overrides the default locale setting detected by Mercurial.\n" |
10010 " This setting is used to convert data including usernames,\n" | 10360 " This setting is used to convert data including usernames,\n" |
10029 " ancestor file." | 10379 " ancestor file." |
10030 msgstr "" | 10380 msgstr "" |
10031 | 10381 |
10032 msgid "" | 10382 msgid "" |
10033 "HGRCPATH\n" | 10383 "HGRCPATH\n" |
10034 " A list of files or directories to search for hgrc files. Item\n" | 10384 " A list of files or directories to search for configuration\n" |
10035 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" | 10385 " files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n" |
10036 " platform default search path is used. If empty, only the .hg/hgrc\n" | 10386 " is not set, platform default search path is used. If empty, only\n" |
10037 " from the current repository is read." | 10387 " the .hg/hgrc from the current repository is read." |
10038 msgstr "" | 10388 msgstr "" |
10039 | 10389 |
10040 msgid " For each element in HGRCPATH:" | 10390 msgid " For each element in HGRCPATH:" |
10041 msgstr "" | 10391 msgstr "" |
10042 | 10392 |
10045 " - otherwise, the file itself will be added" | 10395 " - otherwise, the file itself will be added" |
10046 msgstr "" | 10396 msgstr "" |
10047 | 10397 |
10048 msgid "" | 10398 msgid "" |
10049 "HGPLAIN\n" | 10399 "HGPLAIN\n" |
10050 " When set, this disables any options in .hgrc that might change\n" | 10400 " When set, this disables any configuration settings that might\n" |
10051 " Mercurial's default output. This includes encoding, defaults,\n" | 10401 " change Mercurial's default output. This includes encoding,\n" |
10052 " verbose mode, debug mode, quiet mode, tracebacks, and\n" | 10402 " defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n" |
10053 " localization. This can be useful when scripting against Mercurial\n" | 10403 " localization. This can be useful when scripting against Mercurial\n" |
10054 " in the face of existing user configuration." | 10404 " in the face of existing user configuration." |
10055 msgstr "" | 10405 msgstr "" |
10056 | 10406 |
10057 msgid "" | 10407 msgid "" |
10065 " available values will be considered in this order:" | 10415 " available values will be considered in this order:" |
10066 msgstr "" | 10416 msgstr "" |
10067 | 10417 |
10068 msgid "" | 10418 msgid "" |
10069 " - HGUSER (deprecated)\n" | 10419 " - HGUSER (deprecated)\n" |
10070 " - hgrc files from the HGRCPATH\n" | 10420 " - configuration files from the HGRCPATH\n" |
10071 " - EMAIL\n" | 10421 " - EMAIL\n" |
10072 " - interactive prompt\n" | 10422 " - interactive prompt\n" |
10073 " - LOGNAME (with ``@hostname`` appended)" | 10423 " - LOGNAME (with ``@hostname`` appended)" |
10074 msgstr "" | 10424 msgstr "" |
10075 | 10425 |
10130 "förstöra eller modifiera historik); de kanske inte är redo för fullskalig\n" | 10480 "förstöra eller modifiera historik); de kanske inte är redo för fullskalig\n" |
10131 "användning än; eller de kan förändra beteendet för Mercurial. Det är därför\n" | 10481 "användning än; eller de kan förändra beteendet för Mercurial. Det är därför\n" |
10132 "upp till användaren att aktiverade utökningar om de behövs." | 10482 "upp till användaren att aktiverade utökningar om de behövs." |
10133 | 10483 |
10134 msgid "" | 10484 msgid "" |
10135 "To enable the \"foo\" extension, either shipped with Mercurial or in\n" | 10485 "To enable the \"foo\" extension, either shipped with Mercurial or in the\n" |
10136 "the Python search path, create an entry for it in your hgrc, like\n" | 10486 "Python search path, create an entry for it in your configuration file,\n" |
10137 "this::" | 10487 "like this::" |
10138 msgstr "" | 10488 msgstr "" |
10139 "För att aktivera utökningen \"foo\", som endera levereras med Mercurial\n" | 10489 "För att aktivera utökningen \"foo\", som endera levereras med Mercurial\n" |
10140 "eller finns i Pythons sökväg, skapa en post för den i din hgrc, så här::" | 10490 "eller finns i Pythons sökväg, skapa en post för den i din\n" |
10491 "konfigurationsfil, så här::" | |
10141 | 10492 |
10142 msgid "" | 10493 msgid "" |
10143 " [extensions]\n" | 10494 " [extensions]\n" |
10144 " foo =" | 10495 " foo =" |
10145 msgstr "" | 10496 msgstr "" |
10155 msgstr "" | 10506 msgstr "" |
10156 " [extensions]\n" | 10507 " [extensions]\n" |
10157 " minfunktion = ~/.hgext/minfunktion.py" | 10508 " minfunktion = ~/.hgext/minfunktion.py" |
10158 | 10509 |
10159 msgid "" | 10510 msgid "" |
10160 "To explicitly disable an extension enabled in an hgrc of broader\n" | 10511 "To explicitly disable an extension enabled in a configuration file of\n" |
10161 "scope, prepend its path with !::" | 10512 "broader scope, prepend its path with !::" |
10162 msgstr "" | 10513 msgstr "" |
10163 "För att explicit deaktivera en utökning som aktiverats i en hgrc med större\n" | 10514 "För att explicit deaktivera en utökning som aktiverats i en\n" |
10164 "omfång, börja dess sökväg med !::" | 10515 "konfigurationsfil med större omfång, börja dess sökväg med !::" |
10165 | 10516 |
10166 msgid "" | 10517 msgid "" |
10167 " [extensions]\n" | 10518 " [extensions]\n" |
10168 " # disabling extension bar residing in /path/to/extension/bar.py\n" | 10519 " # disabling extension bar residing in /path/to/extension/bar.py\n" |
10169 " bar = !/path/to/extension/bar.py\n" | 10520 " bar = !/path/to/extension/bar.py\n" |
10197 msgid "" | 10548 msgid "" |
10198 " Branches may be created when changes are pulled from or pushed to\n" | 10549 " Branches may be created when changes are pulled from or pushed to\n" |
10199 " a remote repository, since new heads may be created by these\n" | 10550 " a remote repository, since new heads may be created by these\n" |
10200 " operations. Note that the term branch can also be used informally\n" | 10551 " operations. Note that the term branch can also be used informally\n" |
10201 " to describe a development process in which certain development is\n" | 10552 " to describe a development process in which certain development is\n" |
10202 " done independently of other development.This is sometimes done\n" | 10553 " done independently of other development. This is sometimes done\n" |
10203 " explicitly with a named branch, but it can also be done locally,\n" | 10554 " explicitly with a named branch, but it can also be done locally,\n" |
10204 " using bookmarks or clones and anonymous branches." | 10555 " using bookmarks or clones and anonymous branches." |
10205 msgstr "" | 10556 msgstr "" |
10206 | 10557 |
10207 msgid " Example: \"The experimental branch\"." | 10558 msgid " Example: \"The experimental branch\"." |
10234 msgstr "" | 10585 msgstr "" |
10235 | 10586 |
10236 msgid "" | 10587 msgid "" |
10237 "Branch head\n" | 10588 "Branch head\n" |
10238 " See 'Head, branch'." | 10589 " See 'Head, branch'." |
10590 msgstr "" | |
10591 | |
10592 msgid "" | |
10593 "Branch, inactive\n" | |
10594 " If a named branch has no topological heads, it is considered to be\n" | |
10595 " inactive. As an example, a feature branch becomes inactive when it\n" | |
10596 " is merged into the default branch. The :hg:`branches` command\n" | |
10597 " shows inactive branches by default, though they can be hidden with\n" | |
10598 " :hg:`branches --active`." | |
10599 msgstr "" | |
10600 | |
10601 msgid "" | |
10602 " NOTE: this concept is deprecated because it is too implicit.\n" | |
10603 " Branches should now be explicitly closed using :hg:`commit\n" | |
10604 " --close-branch` when they are no longer needed." | |
10239 msgstr "" | 10605 msgstr "" |
10240 | 10606 |
10241 msgid "" | 10607 msgid "" |
10242 "Branch, named\n" | 10608 "Branch, named\n" |
10243 " A collection of changesets which have the same branch name. By\n" | 10609 " A collection of changesets which have the same branch name. By\n" |
10292 msgstr "" | 10658 msgstr "" |
10293 | 10659 |
10294 msgid "" | 10660 msgid "" |
10295 "Changeset id\n" | 10661 "Changeset id\n" |
10296 " A SHA-1 hash that uniquely identifies a changeset. It may be\n" | 10662 " A SHA-1 hash that uniquely identifies a changeset. It may be\n" |
10297 " represented as either a \"long\" 40-byte hexadecimal string, or a\n" | 10663 " represented as either a \"long\" 40 hexadecimal digit string, or a\n" |
10298 " \"short\" 12-byte hexadecimal string." | 10664 " \"short\" 12 hexadecimal digit string." |
10299 msgstr "" | 10665 msgstr "" |
10300 | 10666 |
10301 msgid "" | 10667 msgid "" |
10302 "Changeset, merge\n" | 10668 "Changeset, merge\n" |
10303 " A changeset with two parents. This occurs when a merge is\n" | 10669 " A changeset with two parents. This occurs when a merge is\n" |
10794 msgstr "" | 11160 msgstr "" |
10795 "Här kommer den vänstra sidan att strippas från alla arkiv som hittas i den\n" | 11161 "Här kommer den vänstra sidan att strippas från alla arkiv som hittas i den\n" |
10796 "högra sidan. Det innebär att ``/foo/bar`` och ``foo/quux/baz`` kommer att\n" | 11162 "högra sidan. Det innebär att ``/foo/bar`` och ``foo/quux/baz`` kommer att\n" |
10797 "visas som ``bar``och ``quux/baz``.\n" | 11163 "visas som ``bar``och ``quux/baz``.\n" |
10798 | 11164 |
11165 msgid "To merge files Mercurial uses merge tools." | |
11166 msgstr "" | |
11167 | |
11168 msgid "" | |
11169 "A merge tool combines two different versions of a file into a merged\n" | |
11170 "file. Merge tools are given the two files and the greatest common\n" | |
11171 "ancestor of the two file versions, so they can determine the changes\n" | |
11172 "made on both branches." | |
11173 msgstr "" | |
11174 | |
11175 msgid "The merge tools are used both for :hg:`resolve` and :hg:`merge`." | |
11176 msgstr "" | |
11177 | |
11178 msgid "" | |
11179 "Usually, the merge tool tries to automatically, by combining all the\n" | |
11180 "non-overlapping changes that occurred separately in the two different\n" | |
11181 "evolutions of the same initial base file. Furthermore, some\n" | |
11182 "interactive merge programs make it easier to manually resolve\n" | |
11183 "conflicting merges, either in a graphical way, or by inserting some\n" | |
11184 "conflict markers. Mercurial does not include any interactive merge\n" | |
11185 "programs but relies on external tools for that. External merge tools\n" | |
11186 "and their properties and usage is configured in merge-tools section -\n" | |
11187 "see hgrc(5)." | |
11188 msgstr "" | |
11189 | |
11190 msgid "" | |
11191 "There are a some internal merge tools which can be used. The internal\n" | |
11192 "merge tools are:" | |
11193 msgstr "" | |
11194 | |
11195 msgid "" | |
11196 "``internal:merge``\n" | |
11197 " Uses the internal non-interactive merge tool for merging files." | |
11198 msgstr "" | |
11199 | |
11200 msgid "" | |
11201 "``internal:fail``\n" | |
11202 " Rather than attempting to merge files that were modified on both\n" | |
11203 " branches, it marks these files as unresolved. Then the resolve\n" | |
11204 " command must be used to mark files resolved." | |
11205 msgstr "" | |
11206 | |
11207 msgid "" | |
11208 "``internal:local``\n" | |
11209 " Uses the local version of files as the merged version." | |
11210 msgstr "" | |
11211 | |
11212 msgid "" | |
11213 "``internal:other``\n" | |
11214 " Uses the remote version of files as the merged version." | |
11215 msgstr "" | |
11216 | |
11217 msgid "" | |
11218 "``internal:prompt``\n" | |
11219 " Asks the user which of the local or the other version to keep as\n" | |
11220 " the merged version." | |
11221 msgstr "" | |
11222 | |
11223 msgid "" | |
11224 "``internal:dump``\n" | |
11225 " Creates three versions of the files to merge, containing the\n" | |
11226 " contents of local, other and base. These files can then be used to\n" | |
11227 " perform a merge manually. If the file merged is name ``a.txt``,\n" | |
11228 " these files will accordingly be named ``a.txt.local``,\n" | |
11229 " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" | |
11230 " same directory as the file to merge." | |
11231 msgstr "" | |
11232 | |
11233 msgid "How Mercurial decides which merge program to use" | |
11234 msgstr "" | |
11235 | |
11236 msgid "" | |
11237 "1. If the ``HGMERGE`` environment variable is present, it is used. If\n" | |
11238 " specified it must be either an executable path or the name of an\n" | |
11239 " application in your executable search path." | |
11240 msgstr "" | |
11241 | |
11242 msgid "" | |
11243 "2. If the filename of the file to be merged matches any of the\n" | |
11244 " patterns in the merge-patterns configuration section, then the\n" | |
11245 " corresponding merge tool is used, unless the file to be merged is a\n" | |
11246 " symlink. Here binary capabilities of the merge tool are not\n" | |
11247 " considered." | |
11248 msgstr "" | |
11249 | |
11250 msgid "3. If ui.merge is set, it is used." | |
11251 msgstr "" | |
11252 | |
11253 msgid "" | |
11254 "4. If any merge tools are present in the merge-tools configuration\n" | |
11255 " section, and any of the tools can be found on the system, the\n" | |
11256 " priority settings are used to determine which one to use. Binary,\n" | |
11257 " symlink and GUI capabilities do also have to match." | |
11258 msgstr "" | |
11259 | |
11260 msgid "5. If a program named ``hgmerge`` exists on the system, it is used." | |
11261 msgstr "" | |
11262 | |
11263 msgid "" | |
11264 "6. If the file to be merged is not binary and is not a symlink, then\n" | |
11265 " ``internal:merge`` is used." | |
11266 msgstr "" | |
11267 | |
11268 msgid "7. The merge fails." | |
11269 msgstr "" | |
11270 | |
11271 msgid "" | |
11272 ".. note::\n" | |
11273 " After selecting a merge program, Mercurial will by default attempt\n" | |
11274 " to merge the files using a simple merge algorithm first, to see if\n" | |
11275 " they can be merged without conflicts. Only if there are conflicting\n" | |
11276 " changes Mercurial will actually execute the merge program. Whether\n" | |
11277 " to use the simple merge algorithm first can be controlled be the\n" | |
11278 " premerge setting of the merge tool, which is enabled by default\n" | |
11279 " unless the file is binary or symlink." | |
11280 msgstr "" | |
11281 | |
11282 msgid "" | |
11283 "See the merge-tools and ui sections of hgrc(5) for details on\n" | |
11284 "configuration of merge tools.\n" | |
11285 msgstr "" | |
11286 | |
10799 msgid "" | 11287 msgid "" |
10800 "When Mercurial accepts more than one revision, they may be specified\n" | 11288 "When Mercurial accepts more than one revision, they may be specified\n" |
10801 "individually, or provided as a topologically continuous range,\n" | 11289 "individually, or provided as a topologically continuous range,\n" |
10802 "separated by the \":\" character." | 11290 "separated by the \":\" character." |
10803 msgstr "" | 11291 msgstr "" |
10982 | 11470 |
10983 msgid "" | 11471 msgid "" |
10984 "Identifiers such as branch names must be quoted with single or double\n" | 11472 "Identifiers such as branch names must be quoted with single or double\n" |
10985 "quotes if they contain characters outside of\n" | 11473 "quotes if they contain characters outside of\n" |
10986 "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" | 11474 "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" |
10987 "predicates. Special characters can be used in quoted identifiers by\n" | 11475 "predicates." |
10988 "escaping them, e.g., ``\\n`` is interpreted as a newline." | 11476 msgstr "" |
11477 | |
11478 msgid "" | |
11479 "Special characters can be used in quoted identifiers by escaping them,\n" | |
11480 "e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" | |
11481 "interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." | |
10989 msgstr "" | 11482 msgstr "" |
10990 | 11483 |
10991 msgid "There is a single prefix operator:" | 11484 msgid "There is a single prefix operator:" |
10992 msgstr "" | 11485 msgstr "" |
10993 | 11486 |
11061 " Alias for ``user(string)``." | 11554 " Alias for ``user(string)``." |
11062 msgstr "" | 11555 msgstr "" |
11063 | 11556 |
11064 msgid "" | 11557 msgid "" |
11065 "``branch(set)``\n" | 11558 "``branch(set)``\n" |
11066 " The branch names are found for changesets in set, and the result is\n" | 11559 " All changesets belonging to the branches of changesets in set." |
11067 " all changesets belonging to one those branches." | |
11068 msgstr "" | 11560 msgstr "" |
11069 | 11561 |
11070 msgid "" | 11562 msgid "" |
11071 "``children(set)``\n" | 11563 "``children(set)``\n" |
11072 " Child changesets of changesets in set." | 11564 " Child changesets of changesets in set." |
11087 " Changesets within the interval, see :hg:`help dates`." | 11579 " Changesets within the interval, see :hg:`help dates`." |
11088 msgstr "" | 11580 msgstr "" |
11089 | 11581 |
11090 msgid "" | 11582 msgid "" |
11091 "``descendants(set)``\n" | 11583 "``descendants(set)``\n" |
11092 " Changesets which are decendants of changesets in set." | 11584 " Changesets which are descendants of changesets in set." |
11093 msgstr "" | 11585 msgstr "" |
11094 | 11586 |
11095 msgid "" | 11587 msgid "" |
11096 "``file(pattern)``\n" | 11588 "``file(pattern)``\n" |
11097 " Changesets which manually affected files matching pattern." | 11589 " Changesets affecting files matched by pattern." |
11098 msgstr "" | 11590 msgstr "" |
11099 | 11591 |
11100 msgid "" | 11592 msgid "" |
11101 "``follow()``\n" | 11593 "``follow()``\n" |
11102 " An alias for ``::.`` (ancestors of the working copy's first parent)." | 11594 " An alias for ``::.`` (ancestors of the working copy's first parent)." |
11103 msgstr "" | 11595 msgstr "" |
11104 | 11596 |
11105 msgid "" | 11597 msgid "" |
11106 "``grep(regex)``\n" | 11598 "``grep(regex)``\n" |
11107 " Like ``keyword(string)`` but accepts a regex." | 11599 " Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" |
11600 " to ensure special escape characters are handled correctly." | |
11108 msgstr "" | 11601 msgstr "" |
11109 | 11602 |
11110 msgid "" | 11603 msgid "" |
11111 "``head()``\n" | 11604 "``head()``\n" |
11112 " Changeset is a head." | 11605 " Changeset is a named branch head." |
11113 msgstr "" | 11606 msgstr "" |
11114 | 11607 |
11115 msgid "" | 11608 msgid "" |
11116 "``heads(set)``\n" | 11609 "``heads(set)``\n" |
11117 " Members of set with no children in set." | 11610 " Members of set with no children in set." |
11611 msgstr "" | |
11612 | |
11613 msgid "" | |
11614 "``id(string)``\n" | |
11615 " Revision non-ambiguously specified by the given hex string prefix" | |
11118 msgstr "" | 11616 msgstr "" |
11119 | 11617 |
11120 msgid "" | 11618 msgid "" |
11121 "``keyword(string)``\n" | 11619 "``keyword(string)``\n" |
11122 " Search commit message, user name, and names of changed files for\n" | 11620 " Search commit message, user name, and names of changed files for\n" |
11132 "``max(set)``\n" | 11630 "``max(set)``\n" |
11133 " Changeset with highest revision number in set." | 11631 " Changeset with highest revision number in set." |
11134 msgstr "" | 11632 msgstr "" |
11135 | 11633 |
11136 msgid "" | 11634 msgid "" |
11635 "``min(set)``\n" | |
11636 " Changeset with lowest revision number in set." | |
11637 msgstr "" | |
11638 | |
11639 msgid "" | |
11137 "``merge()``\n" | 11640 "``merge()``\n" |
11138 " Changeset is a merge changeset." | 11641 " Changeset is a merge changeset." |
11139 msgstr "" | 11642 msgstr "" |
11140 | 11643 |
11141 msgid "" | 11644 msgid "" |
11142 "``modifies(pattern)``\n" | 11645 "``modifies(pattern)``\n" |
11143 " Changesets which modify files matching pattern." | 11646 " Changesets modifying files matched by pattern." |
11144 msgstr "" | 11647 msgstr "" |
11145 | 11648 |
11146 msgid "" | 11649 msgid "" |
11147 "``outgoing([path])``\n" | 11650 "``outgoing([path])``\n" |
11148 " Changesets missing in path." | 11651 " Changesets not found in the specified destination repository, or the\n" |
11652 " default push location." | |
11149 msgstr "" | 11653 msgstr "" |
11150 | 11654 |
11151 msgid "" | 11655 msgid "" |
11152 "``p1(set)``\n" | 11656 "``p1(set)``\n" |
11153 " First parent of changesets in set." | 11657 " First parent of changesets in set." |
11162 "``parents(set)``\n" | 11666 "``parents(set)``\n" |
11163 " The set of all parents for all changesets in set." | 11667 " The set of all parents for all changesets in set." |
11164 msgstr "" | 11668 msgstr "" |
11165 | 11669 |
11166 msgid "" | 11670 msgid "" |
11671 "``present(set)``\n" | |
11672 " An empty set, if any revision in set isn't found; otherwise,\n" | |
11673 " all revisions in set." | |
11674 msgstr "" | |
11675 | |
11676 msgid "" | |
11167 "``removes(pattern)``\n" | 11677 "``removes(pattern)``\n" |
11168 " Changesets which remove files matching pattern." | 11678 " Changesets which remove files matching pattern." |
11679 msgstr "" | |
11680 | |
11681 msgid "" | |
11682 "``rev(number)``\n" | |
11683 " Revision with the given numeric identifier." | |
11169 msgstr "" | 11684 msgstr "" |
11170 | 11685 |
11171 msgid "" | 11686 msgid "" |
11172 "``reverse(set)``\n" | 11687 "``reverse(set)``\n" |
11173 " Reverse order of set." | 11688 " Reverse order of set." |
11194 " - ``user`` for user name (``author`` can be used as an alias),\n" | 11709 " - ``user`` for user name (``author`` can be used as an alias),\n" |
11195 " - ``date`` for the commit date" | 11710 " - ``date`` for the commit date" |
11196 msgstr "" | 11711 msgstr "" |
11197 | 11712 |
11198 msgid "" | 11713 msgid "" |
11199 "``tagged()``\n" | 11714 "``tag(name)``\n" |
11200 " Changeset is tagged." | 11715 " The specified tag by name, or all tagged revisions if no name is given." |
11201 msgstr "" | 11716 msgstr "" |
11202 | 11717 |
11203 msgid "" | 11718 msgid "" |
11204 "``user(string)``\n" | 11719 "``user(string)``\n" |
11205 " User name is string." | 11720 " User name is string." |
11217 " -b x -> branch(x)\n" | 11732 " -b x -> branch(x)\n" |
11218 " -P x -> !::x\n" | 11733 " -P x -> !::x\n" |
11219 " -l x -> limit(expr, x)" | 11734 " -l x -> limit(expr, x)" |
11220 msgstr "" | 11735 msgstr "" |
11221 | 11736 |
11222 msgid "Some sample queries::" | 11737 msgid "Some sample queries:" |
11223 msgstr "" | 11738 msgstr "" |
11224 | 11739 |
11225 msgid "" | 11740 msgid "- Changesets on the default branch::" |
11226 " hg log -r 'branch(default)'\n" | 11741 msgstr "- Ändringar på default-grenen::" |
11227 " hg log -r 'branch(default) and 1.5:: and not merge()'\n" | 11742 |
11228 " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" | 11743 msgid " hg log -r 'branch(default)'" |
11229 " hg log -r 'sort(date(\"May 2008\"), user)'\n" | 11744 msgstr " hg log -r 'branch(default)'" |
11230 " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" | 11745 |
11746 msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" | |
11747 msgstr "" | |
11748 | |
11749 msgid " hg log -r 'branch(default) and 1.5:: and not merge()'" | |
11750 msgstr "" | |
11751 | |
11752 msgid "- Open branch heads::" | |
11753 msgstr "- Öppna grenhuvuden::" | |
11754 | |
11755 msgid " hg log -r 'head() and not closed()'" | |
11756 msgstr "" | |
11757 | |
11758 msgid "" | |
11759 "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" | |
11760 " ``hgext/*``::" | |
11761 msgstr "" | |
11762 | |
11763 msgid " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" | |
11764 msgstr "" | |
11765 | |
11766 msgid "- Changesets in committed May 2008, sorted by user::" | |
11767 msgstr "" | |
11768 | |
11769 msgid " hg log -r 'sort(date(\"May 2008\"), user)'" | |
11770 msgstr "" | |
11771 | |
11772 msgid "" | |
11773 "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" | |
11774 " release::" | |
11775 msgstr "" | |
11776 | |
11777 msgid "" | |
11778 " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged" | |
11779 "())'\n" | |
11231 msgstr "" | 11780 msgstr "" |
11232 | 11781 |
11233 msgid "" | 11782 msgid "" |
11234 "Mercurial allows you to customize output of commands through\n" | 11783 "Mercurial allows you to customize output of commands through\n" |
11235 "templates. You can either pass in a template from the command\n" | 11784 "templates. You can either pass in a template from the command\n" |
11274 msgid "" | 11823 msgid "" |
11275 ":branches: String. The name of the branch on which the changeset was\n" | 11824 ":branches: String. The name of the branch on which the changeset was\n" |
11276 " committed. Will be empty if the branch name was default." | 11825 " committed. Will be empty if the branch name was default." |
11277 msgstr "" | 11826 msgstr "" |
11278 | 11827 |
11828 msgid ":children: List of strings. The children of the changeset." | |
11829 msgstr "" | |
11830 | |
11279 msgid ":date: Date information. The date when the changeset was committed." | 11831 msgid ":date: Date information. The date when the changeset was committed." |
11280 msgstr "" | 11832 msgstr "" |
11281 | 11833 |
11282 msgid ":desc: String. The text of the changeset description." | 11834 msgid ":desc: String. The text of the changeset description." |
11283 msgstr "" | 11835 msgstr "" |
11310 | 11862 |
11311 msgid ":file_dels: List of strings. Files removed by this changeset." | 11863 msgid ":file_dels: List of strings. Files removed by this changeset." |
11312 msgstr "" | 11864 msgstr "" |
11313 | 11865 |
11314 msgid "" | 11866 msgid "" |
11315 ":node: String. The changeset identification hash, as a 40-character\n" | 11867 ":node: String. The changeset identification hash, as a 40 hexadecimal\n" |
11316 " hexadecimal string." | 11868 " digit string." |
11317 msgstr "" | 11869 msgstr "" |
11318 | 11870 |
11319 msgid ":parents: List of strings. The parents of the changeset." | 11871 msgid ":parents: List of strings. The parents of the changeset." |
11320 msgstr "" | 11872 msgstr "" |
11321 | 11873 |
11392 msgid "" | 11944 msgid "" |
11393 ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n" | 11945 ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n" |
11394 " and \">\" with XML entities." | 11946 " and \">\" with XML entities." |
11395 msgstr "" | 11947 msgstr "" |
11396 | 11948 |
11949 msgid "" | |
11950 ":hex: Any text. Convert a binary Mercurial node identifier into\n" | |
11951 " its long hexadecimal representation." | |
11952 msgstr "" | |
11953 | |
11397 msgid ":fill68: Any text. Wraps the text to fit in 68 columns." | 11954 msgid ":fill68: Any text. Wraps the text to fit in 68 columns." |
11398 msgstr "" | 11955 msgstr "" |
11399 | 11956 |
11400 msgid ":fill76: Any text. Wraps the text to fit in 76 columns." | 11957 msgid ":fill76: Any text. Wraps the text to fit in 76 columns." |
11401 msgstr "" | 11958 msgstr "" |
11443 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." | 12000 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." |
11444 msgstr "" | 12001 msgstr "" |
11445 | 12002 |
11446 msgid "" | 12003 msgid "" |
11447 ":short: Changeset hash. Returns the short form of a changeset hash,\n" | 12004 ":short: Changeset hash. Returns the short form of a changeset hash,\n" |
11448 " i.e. a 12-byte hexadecimal string." | 12005 " i.e. a 12 hexadecimal digit string." |
11449 msgstr "" | 12006 msgstr "" |
11450 | 12007 |
11451 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." | 12008 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." |
12009 msgstr "" | |
12010 | |
12011 msgid "" | |
12012 ":stringify: Any type. Turns the value into text by converting values into\n" | |
12013 " text and concatenating them." | |
11452 msgstr "" | 12014 msgstr "" |
11453 | 12015 |
11454 msgid ":strip: Any text. Strips all leading and trailing whitespace." | 12016 msgid ":strip: Any text. Strips all leading and trailing whitespace." |
11455 msgstr "" | 12017 msgstr "" |
11456 | 12018 |
11494 "Some features, such as pushing to http:// and https:// URLs are only\n" | 12056 "Some features, such as pushing to http:// and https:// URLs are only\n" |
11495 "possible if the feature is explicitly enabled on the remote Mercurial\n" | 12057 "possible if the feature is explicitly enabled on the remote Mercurial\n" |
11496 "server." | 12058 "server." |
11497 msgstr "" | 12059 msgstr "" |
11498 | 12060 |
12061 msgid "" | |
12062 "Note that the security of HTTPS URLs depends on proper configuration of\n" | |
12063 "web.cacerts." | |
12064 msgstr "" | |
12065 | |
11499 msgid "Some notes about using SSH with Mercurial:" | 12066 msgid "Some notes about using SSH with Mercurial:" |
11500 msgstr "" | 12067 msgstr "" |
11501 | 12068 |
11502 msgid "" | 12069 msgid "" |
11503 "- SSH requires an accessible shell account on the destination machine\n" | 12070 "- SSH requires an accessible shell account on the destination machine\n" |
11520 " Host *\n" | 12087 " Host *\n" |
11521 " Compression yes" | 12088 " Compression yes" |
11522 msgstr "" | 12089 msgstr "" |
11523 | 12090 |
11524 msgid "" | 12091 msgid "" |
11525 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" | 12092 " Alternatively specify \"ssh -C\" as your ssh command in your\n" |
11526 " with the --ssh command line option." | 12093 " configuration file or with the --ssh command line option." |
11527 msgstr "" | 12094 msgstr "" |
11528 | 12095 |
11529 msgid "" | 12096 msgid "" |
11530 "These URLs can all be stored in your hgrc with path aliases under the\n" | 12097 "These URLs can all be stored in your configuration file with path\n" |
11531 "[paths] section like so::" | 12098 "aliases under the [paths] section like so::" |
11532 msgstr "" | 12099 msgstr "" |
11533 | 12100 |
11534 msgid "" | 12101 msgid "" |
11535 " [paths]\n" | 12102 " [paths]\n" |
11536 " alias1 = URL1\n" | 12103 " alias1 = URL1\n" |
11616 | 12183 |
11617 msgid "use 'hg resolve' to retry unresolved file merges\n" | 12184 msgid "use 'hg resolve' to retry unresolved file merges\n" |
11618 msgstr "" | 12185 msgstr "" |
11619 | 12186 |
11620 msgid "" | 12187 msgid "" |
11621 "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " | 12188 "use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to " |
11622 "abandon\n" | 12189 "abandon\n" |
11623 msgstr "" | 12190 msgstr "" |
11624 | 12191 |
11625 msgid "(branch merge, don't forget to commit)\n" | 12192 msgid "(branch merge, don't forget to commit)\n" |
11626 msgstr "" | 12193 msgstr "" |
11627 | 12194 |
11628 #, python-format | 12195 #, python-format |
11629 msgid "error reading %s/.hg/hgrc: %s\n" | 12196 msgid "error reading %s/.hg/hgrc: %s\n" |
12197 msgstr "" | |
12198 | |
12199 #, python-format | |
12200 msgid "error accessing repository at %s\n" | |
11630 msgstr "" | 12201 msgstr "" |
11631 | 12202 |
11632 msgid "SSL support is unavailable" | 12203 msgid "SSL support is unavailable" |
11633 msgstr "" | 12204 msgstr "" |
11634 | 12205 |
11731 | 12302 |
11732 #, python-format | 12303 #, python-format |
11733 msgid "'%s' uses newer protocol %s" | 12304 msgid "'%s' uses newer protocol %s" |
11734 msgstr "" | 12305 msgstr "" |
11735 | 12306 |
11736 msgid "look up remote revision" | 12307 #, python-format |
11737 msgstr "" | 12308 msgid "push failed: %s" |
11738 | 12309 msgstr "tryckning misslyckades: %s" |
11739 msgid "unexpected response:" | 12310 |
11740 msgstr "" | 12311 msgid "Python support for SSL and HTTPS is not installed" |
11741 | 12312 msgstr "" |
11742 msgid "look up remote changes" | 12313 |
11743 msgstr "" | 12314 msgid "cannot create new http repository" |
11744 | 12315 msgstr "" |
11745 msgid "push failed (unexpected response):" | 12316 |
12317 #, python-format | |
12318 msgid "ignoring invalid syntax '%s'" | |
12319 msgstr "" | |
12320 | |
12321 #, python-format | |
12322 msgid "skipping unreadable ignore file '%s': %s\n" | |
12323 msgstr "" | |
12324 | |
12325 #, python-format | |
12326 msgid "repository %s not found" | |
12327 msgstr "" | |
12328 | |
12329 #, python-format | |
12330 msgid "repository %s already exists" | |
12331 msgstr "" | |
12332 | |
12333 #, python-format | |
12334 msgid "requirement '%s' not supported" | |
12335 msgstr "" | |
12336 | |
12337 #, python-format | |
12338 msgid ".hg/sharedpath points to nonexistent directory %s" | |
12339 msgstr "" | |
12340 | |
12341 #, python-format | |
12342 msgid "%r cannot be used in a tag name" | |
12343 msgstr "" | |
12344 | |
12345 #, python-format | |
12346 msgid "warning: tag %s conflicts with existing branch name\n" | |
12347 msgstr "" | |
12348 | |
12349 msgid "working copy of .hgtags is changed (please commit .hgtags manually)" | |
12350 msgstr "" | |
12351 | |
12352 #, python-format | |
12353 msgid "working directory has unknown parent '%s'!" | |
12354 msgstr "" | |
12355 | |
12356 #, python-format | |
12357 msgid "unknown revision '%s'" | |
12358 msgstr "" | |
12359 | |
12360 msgid "abandoned transaction found - run hg recover" | |
12361 msgstr "" | |
12362 | |
12363 msgid "rolling back interrupted transaction\n" | |
12364 msgstr "" | |
12365 | |
12366 msgid "no interrupted transaction available\n" | |
12367 msgstr "" | |
12368 | |
12369 #, python-format | |
12370 msgid "rolling back to revision %s (undo %s: %s)\n" | |
12371 msgstr "återgår till revisionen %s (ångra %s: %s)\n" | |
12372 | |
12373 #, python-format | |
12374 msgid "rolling back to revision %s (undo %s)\n" | |
12375 msgstr "återgår till revisionen %s (ångra %s)\n" | |
12376 | |
12377 msgid "rolling back unknown transaction\n" | |
12378 msgstr "återkallar okänd transaktion\n" | |
12379 | |
12380 #, python-format | |
12381 msgid "Named branch could not be reset, current branch still is: %s\n" | |
12382 msgstr "" | |
12383 | |
12384 msgid "no rollback information available\n" | |
12385 msgstr "" | |
12386 | |
12387 #, python-format | |
12388 msgid "waiting for lock on %s held by %r\n" | |
12389 msgstr "" | |
12390 | |
12391 #, python-format | |
12392 msgid "repository %s" | |
12393 msgstr "" | |
12394 | |
12395 #, python-format | |
12396 msgid "working directory of %s" | |
12397 msgstr "" | |
12398 | |
12399 msgid "cannot partially commit a merge (do not specify files or patterns)" | |
12400 msgstr "" | |
12401 | |
12402 msgid "can't commit subrepos without .hgsub" | |
12403 msgstr "kan inte arkivera underarkiv utan .hgsub" | |
12404 | |
12405 msgid "file not found!" | |
12406 msgstr "filen hittades inte!" | |
12407 | |
12408 msgid "no match under directory!" | |
12409 msgstr "" | |
12410 | |
12411 msgid "file not tracked!" | |
12412 msgstr "filen spåras inte!" | |
12413 | |
12414 msgid "unresolved merge conflicts (see hg resolve)" | |
12415 msgstr "" | |
12416 | |
12417 #, python-format | |
12418 msgid "committing subrepository %s\n" | |
12419 msgstr "" | |
12420 | |
12421 #, python-format | |
12422 msgid "note: commit message saved in %s\n" | |
12423 msgstr "" | |
12424 | |
12425 #, python-format | |
12426 msgid "trouble committing %s!\n" | |
12427 msgstr "" | |
12428 | |
12429 msgid "requesting all changes\n" | |
12430 msgstr "efterfrågar alla ändringar\n" | |
12431 | |
12432 msgid "" | |
12433 "partial pull cannot be done because other repository doesn't support " | |
12434 "changegroupsubset." | |
12435 msgstr "" | |
12436 "deldragningar kan inte göras eftersom det andra arkivet inte stödjer " | |
12437 "changegroupsubset." | |
12438 | |
12439 #, python-format | |
12440 msgid "%d changesets found\n" | |
12441 msgstr "%d ändringar hittades\n" | |
12442 | |
12443 msgid "bundling changes" | |
12444 msgstr "buntar ändringar" | |
12445 | |
12446 msgid "chunks" | |
12447 msgstr "stycken" | |
12448 | |
12449 msgid "bundling manifests" | |
12450 msgstr "buntar manifest" | |
12451 | |
12452 #, python-format | |
12453 msgid "empty or missing revlog for %s" | |
12454 msgstr "tom eller saknad revlog för %s" | |
12455 | |
12456 msgid "bundling files" | |
12457 msgstr "buntar filer" | |
12458 | |
12459 msgid "adding changesets\n" | |
12460 msgstr "lägger till ändringar\n" | |
12461 | |
12462 msgid "received changelog group is empty" | |
12463 msgstr "mottagen ändringsgrupp är tom" | |
12464 | |
12465 msgid "adding manifests\n" | |
12466 msgstr "lägger till manifest\n" | |
12467 | |
12468 msgid "manifests" | |
12469 msgstr "manifest" | |
12470 | |
12471 msgid "adding file changes\n" | |
12472 msgstr "lägger till filändringar\n" | |
12473 | |
12474 msgid "received file revlog group is empty" | |
12475 msgstr "mottagen revlog-grupp för filer är tom" | |
12476 | |
12477 #, python-format | |
12478 msgid "missing file data for %s:%s - run hg verify" | |
12479 msgstr "fildata för %s:%s saknas - kör hg verify" | |
12480 | |
12481 #, python-format | |
12482 msgid " (%+d heads)" | |
12483 msgstr " (%+d huvuden)" | |
12484 | |
12485 #, python-format | |
12486 msgid "added %d changesets with %d changes to %d files%s\n" | |
12487 msgstr "lade till %d ändringar med %d modifikationer i %d filer%s\n" | |
12488 | |
12489 msgid "Unexpected response from remote server:" | |
12490 msgstr "" | |
12491 | |
12492 msgid "operation forbidden by server" | |
12493 msgstr "" | |
12494 | |
12495 msgid "locking the remote repository failed" | |
12496 msgstr "" | |
12497 | |
12498 msgid "the server sent an unknown error code" | |
12499 msgstr "" | |
12500 | |
12501 msgid "streaming all changes\n" | |
12502 msgstr "strömmar alla ändringar\n" | |
12503 | |
12504 #, python-format | |
12505 msgid "%d files to transfer, %s of data\n" | |
12506 msgstr "%d filer att överföra, %s med data\n" | |
12507 | |
12508 #, python-format | |
12509 msgid "transferred %s in %.1f seconds (%s/sec)\n" | |
12510 msgstr "överförde %s på %.1f sekunder (%s/sek)\n" | |
12511 | |
12512 msgid "smtp.host not configured - cannot send mail" | |
12513 msgstr "smtp.host är inte konfigurerad - kan inte sända mail" | |
12514 | |
12515 #, python-format | |
12516 msgid "sending mail: smtp host %s, port %s\n" | |
12517 msgstr "sänder mail: smtp-server %s, port %s\n" | |
12518 | |
12519 msgid "can't use TLS: Python SSL support not installed" | |
12520 msgstr "kan inte använda TLS: Pythons SSL-stöd är inte installerat" | |
12521 | |
12522 msgid "(using tls)\n" | |
12523 msgstr "(använder tls)\n" | |
12524 | |
12525 #, python-format | |
12526 msgid "(authenticating to mail server as %s)\n" | |
12527 msgstr "(autenticerar mot mailserver som %s)\n" | |
12528 | |
12529 #, python-format | |
12530 msgid "sending mail: %s\n" | |
12531 msgstr "sänder mail: %s\n" | |
12532 | |
12533 msgid "smtp specified as email transport, but no smtp host configured" | |
12534 msgstr "smtp angiven som emailtransport, men ingen smtp-server konfigurerad" | |
12535 | |
12536 #, python-format | |
12537 msgid "%r specified as email transport, but not in PATH" | |
12538 msgstr "%r angiven som emailtransport, men inte i PATH" | |
12539 | |
12540 #, python-format | |
12541 msgid "ignoring invalid sendcharset: %s\n" | |
12542 msgstr "ignorerar ogiltig sendcharset: %s\n" | |
12543 | |
12544 #, python-format | |
12545 msgid "invalid email address: %s" | |
12546 msgstr "ogiltig emailadress: %s" | |
12547 | |
12548 #, python-format | |
12549 msgid "invalid local address: %s" | |
12550 msgstr "ogiltig lokal adress: %s" | |
12551 | |
12552 #, python-format | |
12553 msgid "failed to remove %s from manifest" | |
12554 msgstr "" | |
12555 | |
12556 #, python-format | |
12557 msgid "invalid pattern (%s): %s" | |
12558 msgstr "ogiltigt mönster (%s): %s" | |
12559 | |
12560 msgid "invalid pattern" | |
12561 msgstr "ogiltigt mönster" | |
12562 | |
12563 #, python-format | |
12564 msgid "diff context lines count must be an integer, not %r" | |
12565 msgstr "" | |
12566 | |
12567 #, python-format | |
12568 msgid "" | |
12569 "untracked file in working directory differs from file in requested revision: " | |
12570 "'%s'" | |
12571 msgstr "" | |
12572 | |
12573 #, python-format | |
12574 msgid "case-folding collision between %s and %s" | |
12575 msgstr "" | |
12576 | |
12577 #, python-format | |
12578 msgid "" | |
12579 " conflicting flags for %s\n" | |
12580 "(n)one, e(x)ec or sym(l)ink?" | |
12581 msgstr "" | |
12582 | |
12583 msgid "&None" | |
12584 msgstr "" | |
12585 | |
12586 msgid "E&xec" | |
12587 msgstr "" | |
12588 | |
12589 msgid "Sym&link" | |
12590 msgstr "" | |
12591 | |
12592 msgid "resolving manifests\n" | |
12593 msgstr "" | |
12594 | |
12595 #, python-format | |
12596 msgid "" | |
12597 " local changed %s which remote deleted\n" | |
12598 "use (c)hanged version or (d)elete?" | |
12599 msgstr "" | |
12600 | |
12601 msgid "&Changed" | |
12602 msgstr "" | |
12603 | |
12604 msgid "&Delete" | |
12605 msgstr "" | |
12606 | |
12607 #, python-format | |
12608 msgid "" | |
12609 "remote changed %s which local deleted\n" | |
12610 "use (c)hanged version or leave (d)eleted?" | |
12611 msgstr "" | |
12612 | |
12613 msgid "&Deleted" | |
12614 msgstr "" | |
12615 | |
12616 msgid "updating" | |
12617 msgstr "uppdaterar" | |
12618 | |
12619 #, python-format | |
12620 msgid "update failed to remove %s: %s!\n" | |
12621 msgstr "update kunde inte ta bort %s: %s!\n" | |
12622 | |
12623 #, python-format | |
12624 msgid "getting %s\n" | |
12625 msgstr "hämtar %s\n" | |
12626 | |
12627 #, python-format | |
12628 msgid "getting %s to %s\n" | |
12629 msgstr "hämtar %s till %s\n" | |
12630 | |
12631 #, python-format | |
12632 msgid "note: possible conflict - %s was renamed multiple times to:\n" | |
12633 msgstr "notera: möjlig konflikt - %s döptes om flera gånger till:\n" | |
12634 | |
12635 #, python-format | |
12636 msgid "branch %s not found" | |
12637 msgstr "grenen %s hittades inte" | |
12638 | |
12639 msgid "merging with a working directory ancestor has no effect" | |
12640 msgstr "" | |
12641 | |
12642 msgid "nothing to merge (use 'hg update' or check 'hg heads')" | |
12643 msgstr "" | |
12644 | |
12645 msgid "outstanding uncommitted changes (use 'hg status' to list changes)" | |
12646 msgstr "" | |
12647 | |
12648 msgid "crosses branches (merge branches or use --clean to discard changes)" | |
12649 msgstr "" | |
12650 | |
12651 msgid "crosses branches (merge branches or use --check to force update)" | |
12652 msgstr "" | |
12653 | |
12654 msgid "Attention:" | |
12655 msgstr "" | |
12656 | |
12657 msgid "Caution:" | |
12658 msgstr "" | |
12659 | |
12660 msgid "!Danger!" | |
12661 msgstr "" | |
12662 | |
12663 msgid "Error:" | |
12664 msgstr "Fel:" | |
12665 | |
12666 msgid "Hint:" | |
12667 msgstr "" | |
12668 | |
12669 msgid "Important:" | |
12670 msgstr "Viktigt:" | |
12671 | |
12672 msgid "Note:" | |
12673 msgstr "Notera:" | |
12674 | |
12675 msgid "Tip:" | |
12676 msgstr "Tips:" | |
12677 | |
12678 msgid "Warning!" | |
12679 msgstr "Varning!" | |
12680 | |
12681 #, python-format | |
12682 msgid "cannot create %s: destination already exists" | |
12683 msgstr "" | |
12684 | |
12685 #, python-format | |
12686 msgid "cannot create %s: unable to create destination directory" | |
12687 msgstr "" | |
12688 | |
12689 #, python-format | |
12690 msgid "unable to find '%s' for patching\n" | |
12691 msgstr "" | |
12692 | |
12693 #, python-format | |
12694 msgid "patching file %s\n" | |
12695 msgstr "" | |
12696 | |
12697 #, python-format | |
12698 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" | |
12699 msgstr "" | |
12700 | |
12701 #, python-format | |
12702 msgid "bad hunk #%d %s (%d %d %d %d)" | |
12703 msgstr "" | |
12704 | |
12705 #, python-format | |
12706 msgid "file %s already exists\n" | |
12707 msgstr "" | |
12708 | |
12709 #, python-format | |
12710 msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n" | |
12711 msgstr "Stycke #%d lyckades vid %d med luddigheten %d (offset %d rader).\n" | |
12712 | |
12713 #, python-format | |
12714 msgid "Hunk #%d succeeded at %d (offset %d lines).\n" | |
12715 msgstr "Stycke #%d lyckades vid %d (offset %d rader).\n" | |
12716 | |
12717 #, python-format | |
12718 msgid "Hunk #%d FAILED at %d\n" | |
12719 msgstr "" | |
12720 | |
12721 #, python-format | |
12722 msgid "bad hunk #%d" | |
12723 msgstr "" | |
12724 | |
12725 #, python-format | |
12726 msgid "bad hunk #%d old text line %d" | |
12727 msgstr "" | |
12728 | |
12729 msgid "could not extract binary patch" | |
12730 msgstr "" | |
12731 | |
12732 #, python-format | |
12733 msgid "binary patch is %d bytes, not %d" | |
12734 msgstr "" | |
12735 | |
12736 #, python-format | |
12737 msgid "unable to strip away %d of %d dirs from %s" | |
12738 msgstr "" | |
12739 | |
12740 msgid "undefined source and destination files" | |
12741 msgstr "" | |
12742 | |
12743 #, python-format | |
12744 msgid "malformed patch %s %s" | |
12745 msgstr "" | |
12746 | |
12747 #, python-format | |
12748 msgid "unsupported parser state: %s" | |
12749 msgstr "" | |
12750 | |
12751 #, python-format | |
12752 msgid "patch command failed: %s" | |
12753 msgstr "" | |
12754 | |
12755 #, python-format | |
12756 msgid "unsupported line endings type: %s" | |
12757 msgstr "" | |
12758 | |
12759 msgid "patch failed to apply" | |
12760 msgstr "" | |
12761 | |
12762 #, python-format | |
12763 msgid " %d files changed, %d insertions(+), %d deletions(-)\n" | |
12764 msgstr "" | |
12765 | |
12766 #, python-format | |
12767 msgid "exited with status %d" | |
12768 msgstr "" | |
12769 | |
12770 #, python-format | |
12771 msgid "killed by signal %d" | |
12772 msgstr "" | |
12773 | |
12774 #, python-format | |
12775 msgid "saved backup bundle to %s\n" | |
12776 msgstr "" | |
12777 | |
12778 msgid "adding branch\n" | |
12779 msgstr "" | |
12780 | |
12781 #, python-format | |
12782 msgid "strip failed, full bundle stored in '%s'\n" | |
12783 msgstr "avlägsning misslyckades, hela bunten lagrad i '%s'\n" | |
12784 | |
12785 #, python-format | |
12786 msgid "strip failed, partial bundle stored in '%s'\n" | |
12787 msgstr "avlägsning misslyckades, partiell bunt lagrad i '%s'\n" | |
12788 | |
12789 #, python-format | |
12790 msgid "cannot %s; remote repository does not support the %r capability" | |
12791 msgstr "" | |
12792 | |
12793 #, python-format | |
12794 msgid "unknown compression type %r" | |
12795 msgstr "" | |
12796 | |
12797 msgid "index entry flags need RevlogNG" | |
12798 msgstr "indexflaggor kräver RevlogNG" | |
12799 | |
12800 #, python-format | |
12801 msgid "index %s unknown flags %#04x for format v0" | |
12802 msgstr "" | |
12803 | |
12804 #, python-format | |
12805 msgid "index %s unknown flags %#04x for revlogng" | |
12806 msgstr "" | |
12807 | |
12808 #, python-format | |
12809 msgid "index %s unknown format %d" | |
12810 msgstr "" | |
12811 | |
12812 #, python-format | |
12813 msgid "index %s is corrupted" | |
12814 msgstr "" | |
12815 | |
12816 msgid "no node" | |
12817 msgstr "" | |
12818 | |
12819 msgid "ambiguous identifier" | |
12820 msgstr "" | |
12821 | |
12822 msgid "no match found" | |
12823 msgstr "" | |
12824 | |
12825 #, python-format | |
12826 msgid "incompatible revision flag %x" | |
12827 msgstr "" | |
12828 | |
12829 #, python-format | |
12830 msgid "%s not found in the transaction" | |
12831 msgstr "" | |
12832 | |
12833 msgid "consistency error in delta" | |
12834 msgstr "" | |
12835 | |
12836 msgid "unknown base" | |
12837 msgstr "" | |
12838 | |
12839 msgid "unterminated string" | |
12840 msgstr "" | |
12841 | |
12842 msgid "syntax error" | |
12843 msgstr "" | |
12844 | |
12845 msgid "missing argument" | |
12846 msgstr "" | |
12847 | |
12848 #, python-format | |
12849 msgid "can't use %s here" | |
12850 msgstr "kan inte använda %s här" | |
12851 | |
12852 msgid "can't use a list in this context" | |
12853 msgstr "kan inte använda en lista i detta sammanhang" | |
12854 | |
12855 #, python-format | |
12856 msgid "not a function: %s" | |
12857 msgstr "inte en funktion: %s" | |
12858 | |
12859 msgid "id requires one argument" | |
12860 msgstr "id kräver ett argument" | |
12861 | |
12862 msgid "id requires a string" | |
12863 msgstr "id kräver en sträng" | |
12864 | |
12865 msgid "rev requires one argument" | |
12866 msgstr "rev kräver ett argument" | |
12867 | |
12868 msgid "rev requires a number" | |
12869 msgstr "rev kräver ett nummer" | |
12870 | |
12871 msgid "rev expects a number" | |
12872 msgstr "rev förväntar sig ett nummer" | |
12873 | |
12874 msgid "limit requires two arguments" | |
12875 msgstr "limit kräver två argument" | |
12876 | |
12877 msgid "limit requires a number" | |
12878 msgstr "limit kräver ett nummer" | |
12879 | |
12880 msgid "limit expects a number" | |
12881 msgstr "limit förväntar sig ett nummer" | |
12882 | |
12883 msgid "ancestor requires two arguments" | |
12884 msgstr "ancestor kräver två argument" | |
12885 | |
12886 msgid "ancestor arguments must be single revisions" | |
12887 msgstr "argument till ancestor måste vara singelrevisioner" | |
12888 | |
12889 msgid "follow takes no arguments" | |
12890 msgstr "follow tar inga argument" | |
12891 | |
12892 msgid "date requires a string" | |
12893 msgstr "date kräver en sträng" | |
12894 | |
12895 msgid "keyword requires a string" | |
12896 msgstr "keyword kräver en sträng" | |
12897 | |
12898 msgid "grep requires a string" | |
12899 msgstr "grep kräver en sträng" | |
12900 | |
12901 #, python-format | |
12902 msgid "invalid match pattern: %s" | |
12903 msgstr "ogiltigt träffmönster: %s" | |
12904 | |
12905 msgid "author requires a string" | |
12906 msgstr "author kräver en sträng" | |
12907 | |
12908 msgid "file requires a pattern" | |
12909 msgstr "file kräver ett mönster" | |
12910 | |
12911 msgid "contains requires a pattern" | |
12912 msgstr "contains kräver ett mönster" | |
12913 | |
12914 msgid "modifies requires a pattern" | |
12915 msgstr "modifies kräver ett mönster" | |
12916 | |
12917 msgid "adds requires a pattern" | |
12918 msgstr "adds kräver ett mönster" | |
12919 | |
12920 msgid "removes requires a pattern" | |
12921 msgstr "removes kräver ett mänster" | |
12922 | |
12923 msgid "merge takes no arguments" | |
12924 msgstr "merge tar inga argument" | |
12925 | |
12926 msgid "closed takes no arguments" | |
12927 msgstr "closed tar inga argument" | |
12928 | |
12929 msgid "head takes no arguments" | |
12930 msgstr "head tar inga argument" | |
12931 | |
12932 msgid "sort requires one or two arguments" | |
12933 msgstr "sort kräver ett eller två argument" | |
12934 | |
12935 msgid "sort spec must be a string" | |
12936 msgstr "sort-spec måste vara en sträng" | |
12937 | |
12938 #, python-format | |
12939 msgid "unknown sort key %r" | |
12940 msgstr "okänd sorteringsnyckel %r" | |
12941 | |
12942 msgid "all takes no arguments" | |
12943 msgstr "all tar inga argument" | |
12944 | |
12945 msgid "outgoing requires a repository path" | |
12946 msgstr "outgoing kräver en arkivsökväg" | |
12947 | |
12948 msgid "tag takes one or no arguments" | |
12949 msgstr "tag tar ett eller inga argument" | |
12950 | |
12951 msgid "the argument to tag must be a string" | |
12952 msgstr "argumentet till tag måste vara en sträng" | |
12953 | |
12954 msgid "can't negate that" | |
12955 msgstr "kan inte negera det" | |
12956 | |
12957 msgid "not a symbol" | |
12958 msgstr "inte en symbol" | |
12959 | |
12960 msgid "empty query" | |
12961 msgstr "tom fråga" | |
12962 | |
12963 msgid "searching for exact renames" | |
12964 msgstr "söker efter exakta namnbyten" | |
12965 | |
12966 msgid "searching for similar files" | |
12967 msgstr "söker efter liknande filer" | |
12968 | |
12969 #, python-format | |
12970 msgid "%s looks like a binary file." | |
12971 msgstr "%s verkar vara en binärfil." | |
12972 | |
12973 msgid "can only specify two labels." | |
12974 msgstr "" | |
12975 | |
12976 msgid "warning: conflicts during merge.\n" | |
12977 msgstr "" | |
12978 | |
12979 #, python-format | |
12980 msgid "couldn't parse location %s" | |
12981 msgstr "" | |
12982 | |
12983 msgid "could not create remote repo" | |
12984 msgstr "" | |
12985 | |
12986 msgid "no suitable response from remote hg" | |
11746 msgstr "" | 12987 msgstr "" |
11747 | 12988 |
11748 msgid "remote: " | 12989 msgid "remote: " |
11749 msgstr "fjärr: " | 12990 msgstr "fjärr: " |
11750 | 12991 |
11751 #, python-format | 12992 msgid "unexpected response:" |
11752 msgid "push failed: %s" | 12993 msgstr "oväntat svar:" |
11753 msgstr "" | |
11754 | |
11755 msgid "Python support for SSL and HTTPS is not installed" | |
11756 msgstr "" | |
11757 | |
11758 msgid "cannot create new http repository" | |
11759 msgstr "" | |
11760 | |
11761 #, python-format | |
11762 msgid "ignoring invalid syntax '%s'" | |
11763 msgstr "" | |
11764 | |
11765 #, python-format | |
11766 msgid "skipping unreadable ignore file '%s': %s\n" | |
11767 msgstr "" | |
11768 | |
11769 #, python-format | |
11770 msgid "repository %s not found" | |
11771 msgstr "" | |
11772 | |
11773 #, python-format | |
11774 msgid "repository %s already exists" | |
11775 msgstr "" | |
11776 | |
11777 #, python-format | |
11778 msgid "requirement '%s' not supported" | |
11779 msgstr "" | |
11780 | |
11781 #, python-format | |
11782 msgid ".hg/sharedpath points to nonexistent directory %s" | |
11783 msgstr "" | |
11784 | |
11785 #, python-format | |
11786 msgid "%r cannot be used in a tag name" | |
11787 msgstr "" | |
11788 | |
11789 #, python-format | |
11790 msgid "warning: tag %s conflicts with existing branch name\n" | |
11791 msgstr "" | |
11792 | |
11793 msgid "working copy of .hgtags is changed (please commit .hgtags manually)" | |
11794 msgstr "" | |
11795 | |
11796 #, python-format | |
11797 msgid "working directory has unknown parent '%s'!" | |
11798 msgstr "" | |
11799 | |
11800 #, python-format | |
11801 msgid "unknown revision '%s'" | |
11802 msgstr "" | |
11803 | |
11804 msgid "abandoned transaction found - run hg recover" | |
11805 msgstr "" | |
11806 | |
11807 msgid "rolling back interrupted transaction\n" | |
11808 msgstr "" | |
11809 | |
11810 msgid "no interrupted transaction available\n" | |
11811 msgstr "" | |
11812 | |
11813 #, python-format | |
11814 msgid "rolling back to revision %s (undo %s: %s)\n" | |
11815 msgstr "återgår till revisionen %s (ångra %s: %s)\n" | |
11816 | |
11817 #, python-format | |
11818 msgid "rolling back to revision %s (undo %s)\n" | |
11819 msgstr "återgår till revisionen %s (ångra %s)\n" | |
11820 | |
11821 msgid "rolling back unknown transaction\n" | |
11822 msgstr "återkallar okänd transaktion\n" | |
11823 | |
11824 #, python-format | |
11825 msgid "Named branch could not be reset, current branch still is: %s\n" | |
11826 msgstr "" | |
11827 | |
11828 msgid "no rollback information available\n" | |
11829 msgstr "" | |
11830 | |
11831 #, python-format | |
11832 msgid "waiting for lock on %s held by %r\n" | |
11833 msgstr "" | |
11834 | |
11835 #, python-format | |
11836 msgid "repository %s" | |
11837 msgstr "" | |
11838 | |
11839 #, python-format | |
11840 msgid "working directory of %s" | |
11841 msgstr "" | |
11842 | |
11843 msgid "cannot partially commit a merge (do not specify files or patterns)" | |
11844 msgstr "" | |
11845 | |
11846 msgid "can't commit subrepos without .hgsub" | |
11847 msgstr "kan inte arkivera underarkiv utan .hgsub" | |
11848 | |
11849 msgid "file not found!" | |
11850 msgstr "filen hittades inte!" | |
11851 | |
11852 msgid "no match under directory!" | |
11853 msgstr "" | |
11854 | |
11855 msgid "file not tracked!" | |
11856 msgstr "filen spåras inte!" | |
11857 | |
11858 msgid "unresolved merge conflicts (see hg resolve)" | |
11859 msgstr "" | |
11860 | |
11861 #, python-format | |
11862 msgid "committing subrepository %s\n" | |
11863 msgstr "" | |
11864 | |
11865 #, python-format | |
11866 msgid "note: commit message saved in %s\n" | |
11867 msgstr "" | |
11868 | |
11869 #, python-format | |
11870 msgid "trouble committing %s!\n" | |
11871 msgstr "" | |
11872 | |
11873 msgid "requesting all changes\n" | |
11874 msgstr "efterfrågar alla ändringar\n" | |
11875 | |
11876 msgid "" | |
11877 "Partial pull cannot be done because other repository doesn't support " | |
11878 "changegroupsubset." | |
11879 msgstr "" | |
11880 "Deldragningar kan inte göras eftersom det andra arkivet inte stödjer " | |
11881 "changegroupsubset." | |
11882 | |
11883 #, python-format | |
11884 msgid "%d changesets found\n" | |
11885 msgstr "%d ändringar hittades\n" | |
11886 | |
11887 msgid "bundling changes" | |
11888 msgstr "buntar ändringar" | |
11889 | |
11890 msgid "chunks" | |
11891 msgstr "stycken" | |
11892 | |
11893 msgid "bundling manifests" | |
11894 msgstr "buntar manifest" | |
11895 | |
11896 #, python-format | |
11897 msgid "empty or missing revlog for %s" | |
11898 msgstr "tom eller saknad revlog för %s" | |
11899 | |
11900 msgid "bundling files" | |
11901 msgstr "buntar filer" | |
11902 | |
11903 msgid "adding changesets\n" | |
11904 msgstr "lägger till ändringar\n" | |
11905 | |
11906 msgid "changesets" | |
11907 msgstr "ändringar" | |
11908 | |
11909 msgid "received changelog group is empty" | |
11910 msgstr "mottagen ändringsgrupp är tom" | |
11911 | |
11912 msgid "adding manifests\n" | |
11913 msgstr "lägger till manifest\n" | |
11914 | |
11915 msgid "manifests" | |
11916 msgstr "manifest" | |
11917 | |
11918 msgid "adding file changes\n" | |
11919 msgstr "lägger till filändringar\n" | |
11920 | |
11921 msgid "received file revlog group is empty" | |
11922 msgstr "mottagen revlog-grupp för filer är tom" | |
11923 | |
11924 #, python-format | |
11925 msgid "missing file data for %s:%s - run hg verify" | |
11926 msgstr "fildata för %s:%s saknas - kör hg verify" | |
11927 | |
11928 #, python-format | |
11929 msgid " (%+d heads)" | |
11930 msgstr " (%+d huvuden)" | |
11931 | |
11932 #, python-format | |
11933 msgid "added %d changesets with %d changes to %d files%s\n" | |
11934 msgstr "lade till %d ändringar med %d modifikationer i %d filer%s\n" | |
11935 | |
11936 msgid "Unexpected response from remote server:" | |
11937 msgstr "" | |
11938 | |
11939 msgid "operation forbidden by server" | |
11940 msgstr "" | |
11941 | |
11942 msgid "locking the remote repository failed" | |
11943 msgstr "" | |
11944 | |
11945 msgid "the server sent an unknown error code" | |
11946 msgstr "" | |
11947 | |
11948 msgid "streaming all changes\n" | |
11949 msgstr "strömmar alla ändringar\n" | |
11950 | |
11951 #, python-format | |
11952 msgid "%d files to transfer, %s of data\n" | |
11953 msgstr "%d filer att överföra, %s med data\n" | |
11954 | |
11955 #, python-format | |
11956 msgid "transferred %s in %.1f seconds (%s/sec)\n" | |
11957 msgstr "överförde %s på %.1f sekunder (%s/sek)\n" | |
11958 | |
11959 msgid "no [smtp]host in hgrc - cannot send mail" | |
11960 msgstr "ingen [smtp]server i hgrc - kan inte sända mail" | |
11961 | |
11962 #, python-format | |
11963 msgid "sending mail: smtp host %s, port %s\n" | |
11964 msgstr "sänder mail: smtp-server %s, port %s\n" | |
11965 | |
11966 msgid "can't use TLS: Python SSL support not installed" | |
11967 msgstr "kan inte använda TLS: Pythons SSL-stöd är inte installerat" | |
11968 | |
11969 msgid "(using tls)\n" | |
11970 msgstr "(använder tls)\n" | |
11971 | |
11972 #, python-format | |
11973 msgid "(authenticating to mail server as %s)\n" | |
11974 msgstr "(autenticerar mot mailserver som %s)\n" | |
11975 | |
11976 #, python-format | |
11977 msgid "sending mail: %s\n" | |
11978 msgstr "sänder mail: %s\n" | |
11979 | |
11980 msgid "smtp specified as email transport, but no smtp host configured" | |
11981 msgstr "smtp angiven som emailtransport, men ingen smtp-server konfigurerad" | |
11982 | |
11983 #, python-format | |
11984 msgid "%r specified as email transport, but not in PATH" | |
11985 msgstr "%r angiven som emailtransport, men inte i PATH" | |
11986 | |
11987 #, python-format | |
11988 msgid "ignoring invalid sendcharset: %s\n" | |
11989 msgstr "ignorerar ogiltig sendcharset: %s\n" | |
11990 | |
11991 #, python-format | |
11992 msgid "invalid email address: %s" | |
11993 msgstr "ogiltig emailadress: %s" | |
11994 | |
11995 #, python-format | |
11996 msgid "invalid local address: %s" | |
11997 msgstr "ogiltig lokal adress: %s" | |
11998 | |
11999 #, python-format | |
12000 msgid "failed to remove %s from manifest" | |
12001 msgstr "" | |
12002 | |
12003 #, python-format | |
12004 msgid "diff context lines count must be an integer, not %r" | |
12005 msgstr "" | |
12006 | |
12007 #, python-format | |
12008 msgid "" | |
12009 "untracked file in working directory differs from file in requested revision: " | |
12010 "'%s'" | |
12011 msgstr "" | |
12012 | |
12013 #, python-format | |
12014 msgid "case-folding collision between %s and %s" | |
12015 msgstr "" | |
12016 | |
12017 #, python-format | |
12018 msgid "" | |
12019 " conflicting flags for %s\n" | |
12020 "(n)one, e(x)ec or sym(l)ink?" | |
12021 msgstr "" | |
12022 | |
12023 msgid "&None" | |
12024 msgstr "" | |
12025 | |
12026 msgid "E&xec" | |
12027 msgstr "" | |
12028 | |
12029 msgid "Sym&link" | |
12030 msgstr "" | |
12031 | |
12032 msgid "resolving manifests\n" | |
12033 msgstr "" | |
12034 | |
12035 #, python-format | |
12036 msgid "" | |
12037 " local changed %s which remote deleted\n" | |
12038 "use (c)hanged version or (d)elete?" | |
12039 msgstr "" | |
12040 | |
12041 msgid "&Changed" | |
12042 msgstr "" | |
12043 | |
12044 msgid "&Delete" | |
12045 msgstr "" | |
12046 | |
12047 #, python-format | |
12048 msgid "" | |
12049 "remote changed %s which local deleted\n" | |
12050 "use (c)hanged version or leave (d)eleted?" | |
12051 msgstr "" | |
12052 | |
12053 msgid "&Deleted" | |
12054 msgstr "" | |
12055 | |
12056 msgid "updating" | |
12057 msgstr "uppdaterar" | |
12058 | |
12059 #, python-format | |
12060 msgid "update failed to remove %s: %s!\n" | |
12061 msgstr "" | |
12062 | |
12063 #, python-format | |
12064 msgid "getting %s\n" | |
12065 msgstr "" | |
12066 | |
12067 #, python-format | |
12068 msgid "getting %s to %s\n" | |
12069 msgstr "" | |
12070 | |
12071 #, python-format | |
12072 msgid "warning: detected divergent renames of %s to:\n" | |
12073 msgstr "" | |
12074 | |
12075 #, python-format | |
12076 msgid "branch %s not found" | |
12077 msgstr "" | |
12078 | |
12079 msgid "merging with a working directory ancestor has no effect" | |
12080 msgstr "" | |
12081 | |
12082 msgid "nothing to merge (use 'hg update' or check 'hg heads')" | |
12083 msgstr "" | |
12084 | |
12085 msgid "outstanding uncommitted changes (use 'hg status' to list changes)" | |
12086 msgstr "" | |
12087 | |
12088 msgid "" | |
12089 "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " | |
12090 "changes)" | |
12091 msgstr "" | |
12092 | |
12093 msgid "crosses branches (use 'hg merge' or use 'hg update -c')" | |
12094 msgstr "" | |
12095 | |
12096 #, python-format | |
12097 msgid "cannot create %s: destination already exists" | |
12098 msgstr "" | |
12099 | |
12100 #, python-format | |
12101 msgid "cannot create %s: unable to create destination directory" | |
12102 msgstr "" | |
12103 | |
12104 #, python-format | |
12105 msgid "unable to find '%s' for patching\n" | |
12106 msgstr "" | |
12107 | |
12108 #, python-format | |
12109 msgid "patching file %s\n" | |
12110 msgstr "" | |
12111 | |
12112 #, python-format | |
12113 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" | |
12114 msgstr "" | |
12115 | |
12116 #, python-format | |
12117 msgid "bad hunk #%d %s (%d %d %d %d)" | |
12118 msgstr "" | |
12119 | |
12120 #, python-format | |
12121 msgid "file %s already exists\n" | |
12122 msgstr "" | |
12123 | |
12124 #, python-format | |
12125 msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n" | |
12126 msgstr "Stycke #%d lyckades vid %d med luddigheten %d (offset %d rader).\n" | |
12127 | |
12128 #, python-format | |
12129 msgid "Hunk #%d succeeded at %d (offset %d lines).\n" | |
12130 msgstr "Stycke #%d lyckades vid %d (offset %d rader).\n" | |
12131 | |
12132 #, python-format | |
12133 msgid "Hunk #%d FAILED at %d\n" | |
12134 msgstr "" | |
12135 | |
12136 #, python-format | |
12137 msgid "bad hunk #%d" | |
12138 msgstr "" | |
12139 | |
12140 #, python-format | |
12141 msgid "bad hunk #%d old text line %d" | |
12142 msgstr "" | |
12143 | |
12144 msgid "could not extract binary patch" | |
12145 msgstr "" | |
12146 | |
12147 #, python-format | |
12148 msgid "binary patch is %d bytes, not %d" | |
12149 msgstr "" | |
12150 | |
12151 #, python-format | |
12152 msgid "unable to strip away %d of %d dirs from %s" | |
12153 msgstr "" | |
12154 | |
12155 msgid "undefined source and destination files" | |
12156 msgstr "" | |
12157 | |
12158 #, python-format | |
12159 msgid "malformed patch %s %s" | |
12160 msgstr "" | |
12161 | |
12162 #, python-format | |
12163 msgid "unsupported parser state: %s" | |
12164 msgstr "" | |
12165 | |
12166 #, python-format | |
12167 msgid "patch command failed: %s" | |
12168 msgstr "" | |
12169 | |
12170 #, python-format | |
12171 msgid "Unsupported line endings type: %s" | |
12172 msgstr "" | |
12173 | |
12174 msgid "" | |
12175 "internal patcher failed\n" | |
12176 "please report details to http://mercurial.selenic.com/bts/\n" | |
12177 "or mercurial@selenic.com\n" | |
12178 msgstr "" | |
12179 "den interna patcharen misslyckades\n" | |
12180 "rapportera detaljer till http://mercurial.selenic.com/bts/\n" | |
12181 "eller mercurial@selenic.com\n" | |
12182 | |
12183 #, python-format | |
12184 msgid " %d files changed, %d insertions(+), %d deletions(-)\n" | |
12185 msgstr "" | |
12186 | |
12187 #, python-format | |
12188 msgid "exited with status %d" | |
12189 msgstr "" | |
12190 | |
12191 #, python-format | |
12192 msgid "killed by signal %d" | |
12193 msgstr "" | |
12194 | |
12195 #, python-format | |
12196 msgid "saved backup bundle to %s\n" | |
12197 msgstr "" | |
12198 | |
12199 msgid "adding branch\n" | |
12200 msgstr "" | |
12201 | |
12202 #, python-format | |
12203 msgid "strip failed, full bundle stored in '%s'\n" | |
12204 msgstr "avlägsning misslyckades, hela bunten lagrad i '%s'\n" | |
12205 | |
12206 #, python-format | |
12207 msgid "strip failed, partial bundle stored in '%s'\n" | |
12208 msgstr "avlägsning misslyckades, partiell bunt lagrad i '%s'\n" | |
12209 | |
12210 #, python-format | |
12211 msgid "cannot %s; remote repository does not support the %r capability" | |
12212 msgstr "" | |
12213 | |
12214 #, python-format | |
12215 msgid "unknown compression type %r" | |
12216 msgstr "" | |
12217 | |
12218 msgid "index entry flags need RevlogNG" | |
12219 msgstr "indexflaggor kräver RevlogNG" | |
12220 | |
12221 #, python-format | |
12222 msgid "index %s unknown flags %#04x for format v0" | |
12223 msgstr "" | |
12224 | |
12225 #, python-format | |
12226 msgid "index %s unknown flags %#04x for revlogng" | |
12227 msgstr "" | |
12228 | |
12229 #, python-format | |
12230 msgid "index %s unknown format %d" | |
12231 msgstr "" | |
12232 | |
12233 #, python-format | |
12234 msgid "index %s is corrupted" | |
12235 msgstr "" | |
12236 | |
12237 msgid "no node" | |
12238 msgstr "" | |
12239 | |
12240 msgid "ambiguous identifier" | |
12241 msgstr "" | |
12242 | |
12243 msgid "no match found" | |
12244 msgstr "" | |
12245 | |
12246 #, python-format | |
12247 msgid "incompatible revision flag %x" | |
12248 msgstr "" | |
12249 | |
12250 #, python-format | |
12251 msgid "%s not found in the transaction" | |
12252 msgstr "" | |
12253 | |
12254 msgid "unknown base" | |
12255 msgstr "" | |
12256 | |
12257 msgid "consistency error adding group" | |
12258 msgstr "" | |
12259 | |
12260 msgid "unterminated string" | |
12261 msgstr "" | |
12262 | |
12263 msgid "syntax error" | |
12264 msgstr "" | |
12265 | |
12266 msgid "missing argument" | |
12267 msgstr "" | |
12268 | |
12269 #, python-format | |
12270 msgid "can't use %s here" | |
12271 msgstr "kan inte använda %s här" | |
12272 | |
12273 msgid "can't use a list in this context" | |
12274 msgstr "kan inte använda en lista i detta sammanhang" | |
12275 | |
12276 #, python-format | |
12277 msgid "not a function: %s" | |
12278 msgstr "inte en funktion: %s" | |
12279 | |
12280 msgid "limit wants two arguments" | |
12281 msgstr "limit vill ha två argument" | |
12282 | |
12283 msgid "limit wants a number" | |
12284 msgstr "limit vill ha ett nummer" | |
12285 | |
12286 msgid "limit expects a number" | |
12287 msgstr "limit förväntar sig ett nummer" | |
12288 | |
12289 msgid "ancestor wants two arguments" | |
12290 msgstr "ancestor vill ha två argument" | |
12291 | |
12292 msgid "ancestor arguments must be single revisions" | |
12293 msgstr "argument till ancestor måste vara singelrevisioner" | |
12294 | |
12295 msgid "follow takes no arguments" | |
12296 msgstr "follow tar inga argument" | |
12297 | |
12298 msgid "date wants a string" | |
12299 msgstr "date vill ha en sträng" | |
12300 | |
12301 msgid "keyword wants a string" | |
12302 msgstr "keyword vill ha en sträng" | |
12303 | |
12304 msgid "grep wants a string" | |
12305 msgstr "grep vill ha en sträng" | |
12306 | |
12307 msgid "author wants a string" | |
12308 msgstr "author vill ha ett mönster" | |
12309 | |
12310 msgid "file wants a pattern" | |
12311 msgstr "file vill ha ett mönster" | |
12312 | |
12313 msgid "contains wants a pattern" | |
12314 msgstr "contains vill ha ett mönster" | |
12315 | |
12316 msgid "modifies wants a pattern" | |
12317 msgstr "modifies vill ha ett mönster" | |
12318 | |
12319 msgid "adds wants a pattern" | |
12320 msgstr "adds vill ha ett mönster" | |
12321 | |
12322 msgid "removes wants a pattern" | |
12323 msgstr "removes vill ha ett mänster" | |
12324 | |
12325 msgid "merge takes no arguments" | |
12326 msgstr "merge tar inga argument" | |
12327 | |
12328 msgid "closed takes no arguments" | |
12329 msgstr "closed tar inga argument" | |
12330 | |
12331 msgid "head takes no arguments" | |
12332 msgstr "head tar inga argument" | |
12333 | |
12334 msgid "sort wants one or two arguments" | |
12335 msgstr "sort vill ha ett eller två argument" | |
12336 | |
12337 msgid "sort spec must be a string" | |
12338 msgstr "sort-spec måste vara en sträng" | |
12339 | |
12340 #, python-format | |
12341 msgid "unknown sort key %r" | |
12342 msgstr "okänd sorteringsnyckel %r" | |
12343 | |
12344 msgid "all takes no arguments" | |
12345 msgstr "all tar inga argument" | |
12346 | |
12347 msgid "outgoing wants a repository path" | |
12348 msgstr "outgoing vill ha en arkivsökväg" | |
12349 | |
12350 msgid "tagged takes no arguments" | |
12351 msgstr "tagged tar inga argument" | |
12352 | |
12353 msgid "can't negate that" | |
12354 msgstr "kan inte negera det" | |
12355 | |
12356 msgid "not a symbol" | |
12357 msgstr "inte en symbol" | |
12358 | |
12359 msgid "empty query" | |
12360 msgstr "" | |
12361 | |
12362 msgid "searching for exact renames" | |
12363 msgstr "" | |
12364 | |
12365 msgid "searching for similar files" | |
12366 msgstr "söker efter liknande filer" | |
12367 | |
12368 #, python-format | |
12369 msgid "%s looks like a binary file." | |
12370 msgstr "" | |
12371 | |
12372 msgid "can only specify two labels." | |
12373 msgstr "" | |
12374 | |
12375 msgid "warning: conflicts during merge.\n" | |
12376 msgstr "" | |
12377 | |
12378 #, python-format | |
12379 msgid "couldn't parse location %s" | |
12380 msgstr "" | |
12381 | |
12382 msgid "could not create remote repo" | |
12383 msgstr "" | |
12384 | |
12385 msgid "no suitable response from remote hg" | |
12386 msgstr "" | |
12387 | 12994 |
12388 #, python-format | 12995 #, python-format |
12389 msgid "push refused: %s" | 12996 msgid "push refused: %s" |
12390 msgstr "" | 12997 msgstr "" |
12391 | 12998 |
12392 msgid "unsynced changes" | |
12393 msgstr "" | |
12394 | |
12395 #, python-format | 12999 #, python-format |
12396 msgid "'%s' does not appear to be an hg repository" | 13000 msgid "'%s' does not appear to be an hg repository" |
12397 msgstr "" | 13001 msgstr "" |
12398 | 13002 |
12399 msgid "cannot lock static-http repository" | 13003 msgid "cannot lock static-http repository" |
12409 #, python-format | 13013 #, python-format |
12410 msgid "subrepo spec file %s not found" | 13014 msgid "subrepo spec file %s not found" |
12411 msgstr "" | 13015 msgstr "" |
12412 | 13016 |
12413 msgid "missing ] in subrepo source" | 13017 msgid "missing ] in subrepo source" |
13018 msgstr "" | |
13019 | |
13020 #, python-format | |
13021 msgid "bad subrepository pattern in %s: %s" | |
12414 msgstr "" | 13022 msgstr "" |
12415 | 13023 |
12416 #, python-format | 13024 #, python-format |
12417 msgid "" | 13025 msgid "" |
12418 " subrepository sources for %s differ\n" | 13026 " subrepository sources for %s differ\n" |
12433 " remote changed subrepository %s which local removed\n" | 13041 " remote changed subrepository %s which local removed\n" |
12434 "use (c)hanged version or (d)elete?" | 13042 "use (c)hanged version or (d)elete?" |
12435 msgstr "" | 13043 msgstr "" |
12436 | 13044 |
12437 #, python-format | 13045 #, python-format |
13046 msgid "default path for subrepository %s not found" | |
13047 msgstr "" | |
13048 | |
13049 #, python-format | |
12438 msgid "unknown subrepo type %s" | 13050 msgid "unknown subrepo type %s" |
13051 msgstr "" | |
13052 | |
13053 #, python-format | |
13054 msgid "warning: error \"%s\" in subrepository \"%s\"\n" | |
12439 msgstr "" | 13055 msgstr "" |
12440 | 13056 |
12441 #, python-format | 13057 #, python-format |
12442 msgid "removing subrepo %s\n" | 13058 msgid "removing subrepo %s\n" |
12443 msgstr "" | 13059 msgstr "" |
12466 | 13082 |
12467 #, python-format | 13083 #, python-format |
12468 msgid "node '%s' is not well formed" | 13084 msgid "node '%s' is not well formed" |
12469 msgstr "" | 13085 msgstr "" |
12470 | 13086 |
13087 msgid ".hg/tags.cache is corrupt, rebuilding it\n" | |
13088 msgstr ".hg/tags.cache är korrupt, bygger om den\n" | |
13089 | |
12471 msgid "unmatched quotes" | 13090 msgid "unmatched quotes" |
12472 msgstr "" | 13091 msgstr "" |
12473 | 13092 |
12474 #, python-format | 13093 #, python-format |
12475 msgid "error expanding '%s%%%s'" | 13094 msgid "error expanding '%s%%%s'" |
12510 #, python-format | 13129 #, python-format |
12511 msgid "Ignored: %s\n" | 13130 msgid "Ignored: %s\n" |
12512 msgstr "" | 13131 msgstr "" |
12513 | 13132 |
12514 #, python-format | 13133 #, python-format |
13134 msgid "(deprecated '%%' in path %s=%s from %s)\n" | |
13135 msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n" | |
13136 | |
13137 #, python-format | |
12515 msgid "ignoring untrusted configuration option %s.%s = %s\n" | 13138 msgid "ignoring untrusted configuration option %s.%s = %s\n" |
12516 msgstr "" | 13139 msgstr "" |
12517 | 13140 |
12518 #, python-format | 13141 #, python-format |
12519 msgid "%s.%s not a boolean ('%s')" | 13142 msgid "%s.%s not a boolean ('%s')" |
12531 | 13154 |
12532 #, python-format | 13155 #, python-format |
12533 msgid "username %s contains a newline\n" | 13156 msgid "username %s contains a newline\n" |
12534 msgstr "" | 13157 msgstr "" |
12535 | 13158 |
12536 #, python-format | |
12537 msgid "(deprecated '%%' in path %s=%s from %s)\n" | |
12538 msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n" | |
12539 | |
12540 msgid "response expected" | 13159 msgid "response expected" |
12541 msgstr "" | 13160 msgstr "" |
12542 | 13161 |
12543 msgid "unrecognized response\n" | 13162 msgid "unrecognized response\n" |
12544 msgstr "" | 13163 msgstr "" |
12575 msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n" | 13194 msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n" |
12576 | 13195 |
12577 msgid "certificate checking requires Python 2.6" | 13196 msgid "certificate checking requires Python 2.6" |
12578 msgstr "certifikatkontroll kräver Python 2.6" | 13197 msgstr "certifikatkontroll kräver Python 2.6" |
12579 | 13198 |
12580 msgid "server identity verification succeeded\n" | 13199 msgid "no certificate received" |
12581 msgstr "verifiering av serveridentitet lyckades\n" | 13200 msgstr "inget certifikat mottaget" |
13201 | |
13202 #, python-format | |
13203 msgid "certificate is for %s" | |
13204 msgstr "certifikat är för %s" | |
13205 | |
13206 msgid "no commonName found in certificate" | |
13207 msgstr "inget commonName hittades i certifikat" | |
13208 | |
13209 #, python-format | |
13210 msgid "%s certificate error: %s" | |
13211 msgstr "%s certifikatfel: %s" | |
12582 | 13212 |
12583 #, python-format | 13213 #, python-format |
12584 msgid "command '%s' failed: %s" | 13214 msgid "command '%s' failed: %s" |
12585 msgstr "" | 13215 msgstr "kommandot '%s' misslyckades: %s" |
12586 | 13216 |
12587 #, python-format | 13217 #, python-format |
12588 msgid "path contains illegal component: %s" | 13218 msgid "path contains illegal component: %s" |
12589 msgstr "" | 13219 msgstr "" |
12590 | 13220 |
12602 #, python-format | 13232 #, python-format |
12603 msgid "could not symlink to %r: %s" | 13233 msgid "could not symlink to %r: %s" |
12604 msgstr "" | 13234 msgstr "" |
12605 | 13235 |
12606 #, python-format | 13236 #, python-format |
12607 msgid "invalid date: %r " | 13237 msgid "invalid date: %r" |
12608 msgstr "" | 13238 msgstr "ogiltigt datum: %r" |
12609 | 13239 |
12610 #, python-format | 13240 #, python-format |
12611 msgid "date exceeds 32 bits: %d" | 13241 msgid "date exceeds 32 bits: %d" |
12612 msgstr "" | 13242 msgstr "" |
12613 | 13243 |
12655 msgid "%.2f KB" | 13285 msgid "%.2f KB" |
12656 msgstr "" | 13286 msgstr "" |
12657 | 13287 |
12658 #, python-format | 13288 #, python-format |
12659 msgid "%.0f bytes" | 13289 msgid "%.0f bytes" |
13290 msgstr "" | |
13291 | |
13292 #, python-format | |
13293 msgid "no port number associated with service '%s'" | |
12660 msgstr "" | 13294 msgstr "" |
12661 | 13295 |
12662 msgid "cannot verify bundle or remote repos" | 13296 msgid "cannot verify bundle or remote repos" |
12663 msgstr "" | 13297 msgstr "" |
12664 | 13298 |
12721 msgstr "arkivet använder revlog-format %d\n" | 13355 msgstr "arkivet använder revlog-format %d\n" |
12722 | 13356 |
12723 msgid "checking changesets\n" | 13357 msgid "checking changesets\n" |
12724 msgstr "kontrollerar ändringar\n" | 13358 msgstr "kontrollerar ändringar\n" |
12725 | 13359 |
13360 msgid "checking" | |
13361 msgstr "kontrollerar" | |
13362 | |
12726 #, python-format | 13363 #, python-format |
12727 msgid "unpacking changeset %s" | 13364 msgid "unpacking changeset %s" |
12728 msgstr "packar upp ändringen %s" | 13365 msgstr "packar upp ändringen %s" |
12729 | 13366 |
12730 msgid "checking manifests\n" | 13367 msgid "checking manifests\n" |
12762 | 13399 |
12763 #, python-format | 13400 #, python-format |
12764 msgid "cannot decode filename '%s'" | 13401 msgid "cannot decode filename '%s'" |
12765 msgstr "kan inte avkoda filnamnet '%s'" | 13402 msgstr "kan inte avkoda filnamnet '%s'" |
12766 | 13403 |
12767 msgid "checking" | |
12768 msgstr "kontrollerar" | |
12769 | |
12770 #, python-format | 13404 #, python-format |
12771 msgid "broken revlog! (%s)" | 13405 msgid "broken revlog! (%s)" |
12772 msgstr "skadad revlog! (%s)" | 13406 msgstr "skadad revlog! (%s)" |
12773 | 13407 |
12774 msgid "missing revlog!" | 13408 msgid "missing revlog!" |
12826 msgid "(first damaged changeset appears to be %d)\n" | 13460 msgid "(first damaged changeset appears to be %d)\n" |
12827 msgstr "(första skadade ändringen verkar vara %d)\n" | 13461 msgstr "(första skadade ändringen verkar vara %d)\n" |
12828 | 13462 |
12829 msgid "user name not available - set USERNAME environment variable" | 13463 msgid "user name not available - set USERNAME environment variable" |
12830 msgstr "användarnamnet är inte tillgängligt - sätt miljövariabeln USERNAME" | 13464 msgstr "användarnamnet är inte tillgängligt - sätt miljövariabeln USERNAME" |
13465 | |
13466 msgid "look up remote revision" | |
13467 msgstr "söker fjärrevision" | |
13468 | |
13469 msgid "look up remote changes" | |
13470 msgstr "söker fjärrändringar" | |
13471 | |
13472 msgid "push failed:" | |
13473 msgstr "tryckning misslyckades:" | |
13474 | |
13475 msgid "push failed (unexpected response):" | |
13476 msgstr "tryckning misslyckades (oväntat svar):" |