##// END OF EJS Templates
merge with i18n
Matt Mackall -
r14998:a5d449fc merge stable
parent child Browse files
Show More
@@ -104,7 +104,7 b' msgid ""'
104 msgstr ""
104 msgstr ""
105 "Project-Id-Version: Mercurial\n"
105 "Project-Id-Version: Mercurial\n"
106 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
106 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
107 "POT-Creation-Date: 2011-06-29 21:47+0900\n"
107 "POT-Creation-Date: 2011-07-31 22:58+0900\n"
108 "PO-Revision-Date: 2009-11-16 21:24+0100\n"
108 "PO-Revision-Date: 2009-11-16 21:24+0100\n"
109 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
109 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
110 "Language-Team: Japanese\n"
110 "Language-Team: Japanese\n"
@@ -1042,6 +1042,16 b' msgid ""'
1042 msgstr ""
1042 msgstr ""
1043
1043
1044 msgid ""
1044 msgid ""
1045 "Note that on some systems, terminfo mode may cause problems when using\n"
1046 "color with the pager extension and less -R. less with the -R option\n"
1047 "will only display ECMA-48 color codes, and terminfo mode may sometimes\n"
1048 "emit codes that less doesn't understand. You can work around this by\n"
1049 "either using ansi mode (or auto mode), or by using less -r (which will\n"
1050 "pass through all terminal control codes, not just color control\n"
1051 "codes)."
1052 msgstr ""
1053
1054 msgid ""
1045 "Because there are only eight standard colors, this module allows you\n"
1055 "Because there are only eight standard colors, this module allows you\n"
1046 "to define color names for other color slots which might be available\n"
1056 "to define color names for other color slots which might be available\n"
1047 "for your terminal type, assuming terminfo mode. For instance::"
1057 "for your terminal type, assuming terminfo mode. For instance::"
@@ -1062,18 +1072,22 b' msgid ""'
1062 msgstr ""
1072 msgstr ""
1063
1073
1064 msgid ""
1074 msgid ""
1065 "The color extension will try to detect whether to use terminfo, ANSI\n"
1075 "By default, the color extension will use ANSI mode (or win32 mode on\n"
1066 "codes or Win32 console APIs, unless it is made explicit; e.g.::"
1076 "Windows) if it detects a terminal. To override auto mode (to enable\n"
1067 msgstr ""
1077 "terminfo mode, for example), set the following configuration option::"
1068
1078 msgstr ""
1079
1080 #, fuzzy
1069 msgid ""
1081 msgid ""
1070 " [color]\n"
1082 " [color]\n"
1071 " mode = ansi"
1083 " mode = terminfo"
1072 msgstr ""
1084 msgstr ""
1085 " [collections]\n"
1086 " /foo = /foo"
1073
1087
1074 msgid ""
1088 msgid ""
1075 "Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n"
1089 "Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n"
1076 "disable color."
1090 "disable color.\n"
1077 msgstr ""
1091 msgstr ""
1078
1092
1079 msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n"
1093 msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n"
@@ -5757,6 +5771,10 b' msgstr "--base \xe3\x81\xa8 --detach \xe3\x81\xaf\xe5\x90\x8c\xe6\x99\x82\xe3\x81\xab\xe3\x81\xaf\xe6\x8c\x87\xe5\xae\x9a\xe5\x87\xba\xe6\x9d\xa5\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
5757 msgid "nothing to rebase\n"
5771 msgid "nothing to rebase\n"
5758 msgstr "リベースの必要はありません\n"
5772 msgstr "リベースの必要はありません\n"
5759
5773
5774 #, fuzzy
5775 msgid "cannot collapse multiple named branches"
5776 msgstr "ファイル名 '%s' のデコードに失敗"
5777
5760 msgid "rebasing"
5778 msgid "rebasing"
5761 msgstr "リベース実施中"
5779 msgstr "リベース実施中"
5762
5780
@@ -6915,8 +6933,8 b' msgstr "\xe3\x83\x87\xe3\x82\xa3\xe3\x83\xac\xe3\x82\xaf\xe3\x83\x88\xe3\x83\xaa"'
6915 msgid "change working directory"
6933 msgid "change working directory"
6916 msgstr "作業領域の変更"
6934 msgstr "作業領域の変更"
6917
6935
6918 msgid "do not prompt, assume 'yes' for any required answers"
6936 msgid "do not prompt, automatically pick the first choice for all prompts"
6919 msgstr "問い合わせをせず、 確認事項は全て 'yes' とみなす"
6937 msgstr "問い合わせ無しで、 最初の選択肢を自動的に選択"
6920
6938
6921 msgid "suppress output"
6939 msgid "suppress output"
6922 msgstr "出力を抑止"
6940 msgstr "出力を抑止"
@@ -10076,15 +10094,19 b' msgstr ""'
10076
10094
10077 msgid ""
10095 msgid ""
10078 " With no revision specified, revert the specified files or directories\n"
10096 " With no revision specified, revert the specified files or directories\n"
10079 " to the state they had in the first parent of the working directory.\n"
10097 " to the contents they had in the parent of the working directory.\n"
10080 " This restores the contents of files to an unmodified\n"
10098 " This restores the contents of files to an unmodified\n"
10081 " state and unschedules adds, removes, copies, and renames."
10099 " state and unschedules adds, removes, copies, and renames. If the\n"
10100 " working directory has two parents, you must explicitly specify a\n"
10101 " revision."
10082 msgstr ""
10102 msgstr ""
10083 " リビジョン指定が無い場合は、 \n"
10103 " リビジョン指定が無い場合は、 \n"
10084 " 指定されたファイル/ディレクトリを、\n"
10104 " 指定されたファイル/ディレクトリを、\n"
10085 " 作業領域の第1親リビジョン時点の内容へと復旧します。\n"
10105 " 作業領域の親リビジョン時点の内容へと復旧します。\n"
10086 " 本コマンドは対象ファイルに対して、 状態を「改変無し」とし、\n"
10106 " 本コマンドは対象ファイルに対して、 状態を「改変無し」とし、\n"
10087 " add/remove/copy/rename の実施予定を取り消します。"
10107 " add/remove/copy/rename の実施予定を取り消します。\n"
10108 " 作業領域が複数の親リビジョンを持つ場合、\n"
10109 " いずれかのリビジョンを明示的に指定して下さい。"
10088
10110
10089 msgid ""
10111 msgid ""
10090 " Using the -r/--rev or -d/--date options, revert the given files or\n"
10112 " Using the -r/--rev or -d/--date options, revert the given files or\n"
@@ -10109,6 +10131,14 b' msgstr ""'
10109 msgid "you can't specify a revision and a date"
10131 msgid "you can't specify a revision and a date"
10110 msgstr "リビジョンと日時は同時には指定出来ません"
10132 msgstr "リビジョンと日時は同時には指定出来ません"
10111
10133
10134 msgid "uncommitted merge with no revision specified"
10135 msgstr "マージが未コミットですが、対象リビジョンが明示されていません"
10136
10137 msgid "use \"hg update\" or see \"hg help revert\""
10138 msgstr ""
10139 "リビジョンを明示して \"hg update\" するか、\"hg help revert\" を参照して下さ"
10140 "い"
10141
10112 msgid "no files or directories specified"
10142 msgid "no files or directories specified"
10113 msgstr "ファイル/ディレクトリ指定がありません"
10143 msgstr "ファイル/ディレクトリ指定がありません"
10114
10144
@@ -11196,8 +11226,8 b' msgid "repository \'%s\' is not local"'
11196 msgstr "リポジトリ '%s' はローカルリポジトリではありません"
11226 msgstr "リポジトリ '%s' はローカルリポジトリではありません"
11197
11227
11198 #, python-format
11228 #, python-format
11199 msgid "no repository found in %r (.hg not found)"
11229 msgid "no repository found in '%s' (.hg not found)"
11200 msgstr "%r 配下にはリポジトリがありません (.hg が見つかりません)"
11230 msgstr "'%s' 配下にはリポジトリがありません (.hg が見つかりません)"
11201
11231
11202 msgid "warning: --repository ignored\n"
11232 msgid "warning: --repository ignored\n"
11203 msgstr "警告: --repository 指定を無視します\n"
11233 msgstr "警告: --repository 指定を無視します\n"
@@ -11384,7 +11414,7 b' msgstr "\xe9\x96\xa2\xe6\x95\xb0\xe3\x81\xa7\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93: %s"'
11384
11414
11385 msgid ""
11415 msgid ""
11386 "``binary()``\n"
11416 "``binary()``\n"
11387 " File that appears to be binary (contails NUL bytes)."
11417 " File that appears to be binary (contains NUL bytes)."
11388 msgstr ""
11418 msgstr ""
11389 "``binary()``\n"
11419 "``binary()``\n"
11390 " バイナリと思われるファイル (NUL バイトを含むファイル)"
11420 " バイナリと思われるファイル (NUL バイトを含むファイル)"
@@ -12366,9 +12396,8 b' msgid ""'
12366 "merges."
12396 "merges."
12367 msgstr ""
12397 msgstr ""
12368
12398
12369 #, fuzzy
12370 msgid "Example ``~/.hgrc``::"
12399 msgid "Example ``~/.hgrc``::"
12371 msgstr "記述例::"
12400 msgstr ""
12372
12401
12373 msgid ""
12402 msgid ""
12374 " [merge-tools]\n"
12403 " [merge-tools]\n"
@@ -13724,11 +13753,17 b' msgid ""'
13724 " HGPLAIN is enabled. Currently the only value supported is \"i18n\",\n"
13753 " HGPLAIN is enabled. Currently the only value supported is \"i18n\",\n"
13725 " which preserves internationalization in plain mode."
13754 " which preserves internationalization in plain mode."
13726 msgstr ""
13755 msgstr ""
13756 " HGPLAIN による設定無効化の際でも、\n"
13757 " 維持する機能をカンマ区切りで列挙します。\n"
13758 " 現在利用可能な機能名は \"i18n\" のみで、\n"
13759 " 国際化関連機能が維持されます。"
13727
13760
13728 msgid ""
13761 msgid ""
13729 " Setting HGPLAINEXCEPT to anything (even an empty string) will\n"
13762 " Setting HGPLAINEXCEPT to anything (even an empty string) will\n"
13730 " enable plain mode."
13763 " enable plain mode."
13731 msgstr ""
13764 msgstr ""
13765 " HGPLAINEXCEPT に何らかの設定 (空設定でも可) をした場合、\n"
13766 " 設定無効化が機能します。"
13732
13767
13733 msgid ""
13768 msgid ""
13734 "HGUSER\n"
13769 "HGUSER\n"
@@ -13939,10 +13974,9 b' msgstr ""'
13939 msgid "Some sample queries:"
13974 msgid "Some sample queries:"
13940 msgstr ""
13975 msgstr ""
13941
13976
13942 #, fuzzy
13943 msgid ""
13977 msgid ""
13944 "- Show status of files that appear to be binary in the working directory::"
13978 "- Show status of files that appear to be binary in the working directory::"
13945 msgstr "作業領域のファイル操作状況の表示"
13979 msgstr ""
13946
13980
13947 msgid " hg status -A \"set:binary()\""
13981 msgid " hg status -A \"set:binary()\""
13948 msgstr ""
13982 msgstr ""
@@ -13971,7 +14005,7 b' msgstr ""'
13971 msgid " hg revert \"set:copied() and binary() and size('>1M')\""
14005 msgid " hg revert \"set:copied() and binary() and size('>1M')\""
13972 msgstr ""
14006 msgstr ""
13973
14007
13974 msgid "- Remove files listed in files.lst that contain the letter a or b::"
14008 msgid "- Remove files listed in foo.lst that contain the letter a or b::"
13975 msgstr ""
14009 msgstr ""
13976
14010
13977 msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
14011 msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
@@ -13994,7 +14028,6 b' msgstr ""'
13994 " 直接の親リビジョンは祖先であり、 祖先(=直接の親リビジョン含む)の\n"
14028 " 直接の親リビジョンは祖先であり、 祖先(=直接の親リビジョン含む)の\n"
13995 " 親リビジョンも祖先となります。 'Descendant' も参照のこと。"
14029 " 親リビジョンも祖先となります。 'Descendant' も参照のこと。"
13996
14030
13997 #, fuzzy
13998 msgid ""
14031 msgid ""
13999 "Bookmark\n"
14032 "Bookmark\n"
14000 " Bookmarks are pointers to certain commits that move when\n"
14033 " Bookmarks are pointers to certain commits that move when\n"
@@ -14003,12 +14036,6 b' msgid ""'
14003 " ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n"
14036 " ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n"
14004 " when you make a commit."
14037 " when you make a commit."
14005 msgstr ""
14038 msgstr ""
14006 " ブックマーク (bookmark) は、 コミット操作に追従して移動する、\n"
14007 " リビジョン特定用の情報です。\n"
14008 " ブックマークのリポジトリ間伝播は、 自動的には行われません。\n"
14009 " ブックマークに対しては、 改名/複製/削除が可能です。\n"
14010 " :hg:`merge` や :hg:`update` へのリビジョン指定において、\n"
14011 " ブックマークを使用することが可能です。"
14012
14039
14013 msgid ""
14040 msgid ""
14014 " Bookmarks can be renamed, copied and deleted. Bookmarks are local,\n"
14041 " Bookmarks can be renamed, copied and deleted. Bookmarks are local,\n"
@@ -17431,11 +17458,10 b' msgstr ""'
17431 " 階層があればそれを取り除きます。\n"
17458 " 階層があればそれを取り除きます。\n"
17432 " 例) \"foo\" および \"foo/bar\" は \"foo\""
17459 " 例) \"foo\" および \"foo/bar\" は \"foo\""
17433
17460
17434 #, fuzzy
17435 msgid ""
17461 msgid ""
17436 ":tabindent: Any text. Returns the text, with every line except the\n"
17462 ":tabindent: Any text. Returns the text, with every line except the\n"
17437 " first starting with a tab character."
17463 " first starting with a tab character."
17438 msgstr ":tabindent: 文字列。 タブ文字以外で始まる行をタブ文字で字下げします。"
17464 msgstr ":tabindent: 文字列。 最初の行以外をタブ文字で字下げします。"
17439
17465
17440 msgid ""
17466 msgid ""
17441 ":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
17467 ":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
@@ -17444,9 +17470,8 b' msgstr ""'
17444 ":urlescape: 文字列。 全ての「特殊」文字を変換します。\n"
17470 ":urlescape: 文字列。 全ての「特殊」文字を変換します。\n"
17445 " 例えば \"foo bar\" は \"foo%20bar\" となります。"
17471 " 例えば \"foo bar\" は \"foo%20bar\" となります。"
17446
17472
17447 #, fuzzy
17448 msgid ":user: Any text. Returns the user portion of an email address."
17473 msgid ":user: Any text. Returns the user portion of an email address."
17449 msgstr ":user: 文字列。 メールアドレスのユーザ名部分を取り出します。\n"
17474 msgstr ":user: 文字列。 メールアドレスのユーザ名部分を取り出します。"
17450
17475
17451 msgid ":author: String. The unmodified author of the changeset."
17476 msgid ":author: String. The unmodified author of the changeset."
17452 msgstr ":author: 文字列。 リビジョンの作者名(記録情報そのまま)。"
17477 msgstr ":author: 文字列。 リビジョンの作者名(記録情報そのまま)。"
@@ -17464,11 +17489,10 b' msgstr ""'
17464 ":branches: 文字列列挙。 リビジョンの属するブランチ名。\n"
17489 ":branches: 文字列列挙。 リビジョンの属するブランチ名。\n"
17465 " 所属ブランチが default の場合は空。"
17490 " 所属ブランチが default の場合は空。"
17466
17491
17467 #, fuzzy
17468 msgid ""
17492 msgid ""
17469 ":bookmarks: List of strings. Any bookmarks associated with the\n"
17493 ":bookmarks: List of strings. Any bookmarks associated with the\n"
17470 " changeset."
17494 " changeset."
17471 msgstr ":tags: 文字列列挙。 当該リビジョンに付与されたタグの一覧。"
17495 msgstr ":tags: 文字列列挙。 当該リビジョンに付与されたブックマークの一覧。"
17472
17496
17473 msgid ":children: List of strings. The children of the changeset."
17497 msgid ":children: List of strings. The children of the changeset."
17474 msgstr ":children: 文字列列挙。 リビジョンの子供。"
17498 msgstr ":children: 文字列列挙。 リビジョンの子供。"
@@ -17934,3 +17958,6 b' msgstr "\xe9\x80\xa3\xe6\x90\xba\xe5\x85\x88\xe3\x81\xa7\xe3\x81\xae\xe5\xa4\x89\xe6\x9b\xb4\xe3\x81\xae\xe6\xa4\x9c\xe7\xb4\xa2"'
17934
17958
17935 msgid "push failed:"
17959 msgid "push failed:"
17936 msgstr "履歴反映に失敗:"
17960 msgstr "履歴反映に失敗:"
17961
17962 #~ msgid "do not prompt, assume 'yes' for any required answers"
17963 #~ msgstr "問い合わせをせず、 確認事項は全て 'yes' とみなす"
@@ -13,8 +13,8 b' msgid ""'
13 msgstr ""
13 msgstr ""
14 "Project-Id-Version: Mercurial\n"
14 "Project-Id-Version: Mercurial\n"
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
16 "POT-Creation-Date: 2011-06-29 09:21+0200\n"
16 "POT-Creation-Date: 2011-07-29 20:08+0200\n"
17 "PO-Revision-Date: 2011-06-29 09:24+0200\n"
17 "PO-Revision-Date: 2011-07-30 09:39+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"
@@ -961,6 +961,22 b' msgstr ""'
961 "det tysta."
961 "det tysta."
962
962
963 msgid ""
963 msgid ""
964 "Note that on some systems, terminfo mode may cause problems when using\n"
965 "color with the pager extension and less -R. less with the -R option\n"
966 "will only display ECMA-48 color codes, and terminfo mode may sometimes\n"
967 "emit codes that less doesn't understand. You can work around this by\n"
968 "either using ansi mode (or auto mode), or by using less -r (which will\n"
969 "pass through all terminal control codes, not just color control\n"
970 "codes)."
971 msgstr ""
972 "Notera att på vissa system kan terminfo-läget orsaka problem när color-\n"
973 "och pager-utökningarna används med less -R. less med flaggan -R kommer bara\n"
974 "att visa ECMA-48-färgkoder, och terminfo kan sända koder som less inte\n"
975 "förstår. Du kan gå runt detta genom att endera använda ansi-läge (eller\n"
976 "auto-läge), eller att använda less -r (som skickar vidare alla\n"
977 "terminalkoder, inte bara färgkoder)."
978
979 msgid ""
964 "Because there are only eight standard colors, this module allows you\n"
980 "Because there are only eight standard colors, this module allows you\n"
965 "to define color names for other color slots which might be available\n"
981 "to define color names for other color slots which might be available\n"
966 "for your terminal type, assuming terminfo mode. For instance::"
982 "for your terminal type, assuming terminfo mode. For instance::"
@@ -993,25 +1009,28 b' msgstr ""'
993 "bakgrunden till den färgen."
1009 "bakgrunden till den färgen."
994
1010
995 msgid ""
1011 msgid ""
996 "The color extension will try to detect whether to use terminfo, ANSI\n"
1012 "By default, the color extension will use ANSI mode (or win32 mode on\n"
997 "codes or Win32 console APIs, unless it is made explicit; e.g.::"
1013 "Windows) if it detects a terminal. To override auto mode (to enable\n"
998 msgstr ""
1014 "terminfo mode, for example), set the following configuration option::"
999 "Utökningen color försöker att upptäcka om terminfo, ANSI-koder eller\n"
1015 msgstr ""
1000 "APIer för konsolen i Win32 om det inte anges explicit::"
1016 "Som standard kommer color-utökningen att använda ANSI-läge (eller\n"
1017 "win32-läge i Windows) om en terminal upptäcks. För att upphäva auto-läge\n"
1018 "(för att exempelvis aktivera terminfo-läge), sätt följande\n"
1019 "konfigurationsflagga::"
1001
1020
1002 msgid ""
1021 msgid ""
1003 " [color]\n"
1022 " [color]\n"
1004 " mode = ansi"
1023 " mode = terminfo"
1005 msgstr ""
1024 msgstr ""
1006 " [color]\n"
1025 " [color]\n"
1007 " mode = ansi"
1026 " mode = terminfo"
1008
1027
1009 msgid ""
1028 msgid ""
1010 "Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n"
1029 "Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n"
1011 "disable color."
1030 "disable color.\n"
1012 msgstr ""
1031 msgstr ""
1013 "Ett värde skilt från 'ansi', 'win32', 'terminfo' eller 'auto' stänger av\n"
1032 "Ett värde skilt från 'ansi', 'win32', 'terminfo' eller 'auto' stänger av\n"
1014 "färg."
1033 "färg.\n"
1015
1034
1016 msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n"
1035 msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n"
1017 msgstr "ingen terminfo-post för setab/setaf: återgår till ECMA-48-färger\n"
1036 msgstr "ingen terminfo-post för setab/setaf: återgår till ECMA-48-färger\n"
@@ -5380,6 +5399,9 b' msgstr "kan inte ange en bas med detach"'
5380 msgid "nothing to rebase\n"
5399 msgid "nothing to rebase\n"
5381 msgstr ""
5400 msgstr ""
5382
5401
5402 msgid "cannot collapse multiple named branches"
5403 msgstr "kan inte kollapsa flera namngivna grenar"
5404
5383 msgid "rebasing"
5405 msgid "rebasing"
5384 msgstr ""
5406 msgstr ""
5385
5407
@@ -6352,13 +6374,13 b' msgid "date: %s\\n"'
6352 msgstr "datum: %s\n"
6374 msgstr "datum: %s\n"
6353
6375
6354 msgid "files+:"
6376 msgid "files+:"
6355 msgstr ""
6377 msgstr "filer+:"
6356
6378
6357 msgid "files-:"
6379 msgid "files-:"
6358 msgstr ""
6380 msgstr "filer-:"
6359
6381
6360 msgid "files:"
6382 msgid "files:"
6361 msgstr ""
6383 msgstr "filer:"
6362
6384
6363 #, python-format
6385 #, python-format
6364 msgid "files: %s\n"
6386 msgid "files: %s\n"
@@ -6413,7 +6435,7 b' msgstr ""'
6413
6435
6414 #, python-format
6436 #, python-format
6415 msgid "HG: user: %s"
6437 msgid "HG: user: %s"
6416 msgstr ""
6438 msgstr "HG: användare: %s"
6417
6439
6418 msgid "HG: branch merge"
6440 msgid "HG: branch merge"
6419 msgstr ""
6441 msgstr ""
@@ -6428,21 +6450,21 b' msgstr ""'
6428
6450
6429 #, python-format
6451 #, python-format
6430 msgid "HG: added %s"
6452 msgid "HG: added %s"
6431 msgstr ""
6453 msgstr "HG: lade till %s"
6432
6454
6433 #, python-format
6455 #, python-format
6434 msgid "HG: changed %s"
6456 msgid "HG: changed %s"
6435 msgstr ""
6457 msgstr "HG: ändrade %s"
6436
6458
6437 #, python-format
6459 #, python-format
6438 msgid "HG: removed %s"
6460 msgid "HG: removed %s"
6439 msgstr ""
6461 msgstr "HG: raderade %s"
6440
6462
6441 msgid "HG: no files changed"
6463 msgid "HG: no files changed"
6442 msgstr ""
6464 msgstr "HG: inga ändrade filer"
6443
6465
6444 msgid "empty commit message"
6466 msgid "empty commit message"
6445 msgstr ""
6467 msgstr "tomt arkiveringsmeddelande"
6446
6468
6447 msgid "repository root directory or name of overlay bundle file"
6469 msgid "repository root directory or name of overlay bundle file"
6448 msgstr "arkivrotkatalog eller namn på påläggsbuntfil"
6470 msgstr "arkivrotkatalog eller namn på påläggsbuntfil"
@@ -6453,8 +6475,8 b' msgstr ""'
6453 msgid "change working directory"
6475 msgid "change working directory"
6454 msgstr "ändra arbetskatalog"
6476 msgstr "ändra arbetskatalog"
6455
6477
6456 msgid "do not prompt, assume 'yes' for any required answers"
6478 msgid "do not prompt, automatically pick the first choice for all prompts"
6457 msgstr "fråga inte, anta att svaret är 'ja' på alla frågor"
6479 msgstr "fråga inte, välj automatiskt det första valet för alla frågor"
6458
6480
6459 msgid "suppress output"
6481 msgid "suppress output"
6460 msgstr "förhindra utmatning"
6482 msgstr "förhindra utmatning"
@@ -9525,14 +9547,17 b' msgstr ""'
9525
9547
9526 msgid ""
9548 msgid ""
9527 " With no revision specified, revert the specified files or directories\n"
9549 " With no revision specified, revert the specified files or directories\n"
9528 " to the state they had in the first parent of the working directory.\n"
9550 " to the contents they had in the parent of the working directory.\n"
9529 " This restores the contents of files to an unmodified\n"
9551 " This restores the contents of files to an unmodified\n"
9530 " state and unschedules adds, removes, copies, and renames."
9552 " state and unschedules adds, removes, copies, and renames. If the\n"
9553 " working directory has two parents, you must explicitly specify a\n"
9554 " revision."
9531 msgstr ""
9555 msgstr ""
9532 " Om ingen revision anges, så återställs de givna filerna eller\n"
9556 " Om ingen revision anges, så återställs de givna filerna eller\n"
9533 " katalogerna till läget de hade i arbetskatalogens första förälder. Det\n"
9557 " katalogerna till innehållet de hade i arbetskatalogens första förälder.\n"
9534 " sätter filer i ett omodifierad läge och avbeställer adderingar,\n"
9558 " Det sätter filer i ett omodifierad läge och avbeställer adderingar,\n"
9535 " raderingar, kopior och namnbyten."
9559 " raderingar, kopior och namnbyten. Om arbetskatalogen har två föräldrar,\n"
9560 " så måste du ange en revision."
9536
9561
9537 msgid ""
9562 msgid ""
9538 " Using the -r/--rev or -d/--date options, revert the given files or\n"
9563 " Using the -r/--rev or -d/--date options, revert the given files or\n"
@@ -9558,6 +9583,12 b' msgstr ""'
9558 msgid "you can't specify a revision and a date"
9583 msgid "you can't specify a revision and a date"
9559 msgstr "du kan inte specificera en revision och ett datum"
9584 msgstr "du kan inte specificera en revision och ett datum"
9560
9585
9586 msgid "uncommitted merge with no revision specified"
9587 msgstr "oarkiverad sammanfogning utan angiven revision"
9588
9589 msgid "use \"hg update\" or see \"hg help revert\""
9590 msgstr "använd \"hg update\" eller se \"hg help revert\""
9591
9561 msgid "no files or directories specified"
9592 msgid "no files or directories specified"
9562 msgstr "inga filer eller kataloger angivna"
9593 msgstr "inga filer eller kataloger angivna"
9563
9594
@@ -10625,11 +10656,11 b' msgstr ""'
10625
10656
10626 #, python-format
10657 #, python-format
10627 msgid "repository '%s' is not local"
10658 msgid "repository '%s' is not local"
10628 msgstr ""
10659 msgstr "arkivet '%s' är inte lokalt"
10629
10660
10630 #, python-format
10661 #, python-format
10631 msgid "no repository found in %r (.hg not found)"
10662 msgid "no repository found in '%s' (.hg not found)"
10632 msgstr "inget arkiv hittades i %r (.hg hittades inte)"
10663 msgstr "inget arkiv hittades i '%s' (.hg hittades inte)"
10633
10664
10634 msgid "warning: --repository ignored\n"
10665 msgid "warning: --repository ignored\n"
10635 msgstr "varning: --repository ignorerades\n"
10666 msgstr "varning: --repository ignorerades\n"
@@ -10792,7 +10823,7 b' msgstr "inte en funktion: %s"'
10792
10823
10793 msgid ""
10824 msgid ""
10794 "``binary()``\n"
10825 "``binary()``\n"
10795 " File that appears to be binary (contails NUL bytes)."
10826 " File that appears to be binary (contains NUL bytes)."
10796 msgstr ""
10827 msgstr ""
10797
10828
10798 #. i18n: "binary" is a keyword
10829 #. i18n: "binary" is a keyword
@@ -13270,7 +13301,7 b' msgstr ""'
13270 msgid " hg revert \"set:copied() and binary() and size('>1M')\""
13301 msgid " hg revert \"set:copied() and binary() and size('>1M')\""
13271 msgstr ""
13302 msgstr ""
13272
13303
13273 msgid "- Remove files listed in files.lst that contain the letter a or b::"
13304 msgid "- Remove files listed in foo.lst that contain the letter a or b::"
13274 msgstr ""
13305 msgstr ""
13275
13306
13276 msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
13307 msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
@@ -16106,7 +16137,7 b' msgstr "kan inte negera det"'
16106 msgid "not a symbol"
16137 msgid "not a symbol"
16107 msgstr "inte en symbol"
16138 msgstr "inte en symbol"
16108
16139
16109 #, fuzzy, python-format
16140 #, python-format
16110 msgid "invalid number of arguments: %s"
16141 msgid "invalid number of arguments: %s"
16111 msgstr "felaktigt antal argument: %s"
16142 msgstr "felaktigt antal argument: %s"
16112
16143
@@ -16242,7 +16273,7 b' msgid ""'
16242 "hostfingerprints or web.cacerts config setting)\n"
16273 "hostfingerprints or web.cacerts config setting)\n"
16243 msgstr ""
16274 msgstr ""
16244 "varning: %s-certificatet med fingeravtrycket %s overifierad (kontrollera "
16275 "varning: %s-certificatet med fingeravtrycket %s overifierad (kontrollera "
16245 "hostfingerprints inställningen web.cacerts)\n"
16276 "inställningen för hostfingerprints eller web.cacerts)\n"
16246
16277
16247 #, python-format
16278 #, python-format
16248 msgid "host fingerprint for %s can't be verified (Python too old)"
16279 msgid "host fingerprint for %s can't be verified (Python too old)"
@@ -16254,7 +16285,7 b' msgstr "varning: certificatet f\xc3\xb6r %s kan inte verifieras (f\xc3\xb6r gammal Python)\\n"'
16254
16285
16255 #, python-format
16286 #, python-format
16256 msgid "'%s' does not appear to be an hg repository"
16287 msgid "'%s' does not appear to be an hg repository"
16257 msgstr ""
16288 msgstr "'%s' verkar inte vara ett hg-arkiv"
16258
16289
16259 msgid "cannot lock static-http repository"
16290 msgid "cannot lock static-http repository"
16260 msgstr ""
16291 msgstr ""
@@ -16401,6 +16432,209 b' msgstr ""'
16401 msgid ".hg/cache/tags is corrupt, rebuilding it\n"
16432 msgid ".hg/cache/tags is corrupt, rebuilding it\n"
16402 msgstr ".hg/cache/tags är korrupt, bygger om den\n"
16433 msgstr ".hg/cache/tags är korrupt, bygger om den\n"
16403
16434
16435 msgid ""
16436 ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
16437 " every line except the last."
16438 msgstr ""
16439
16440 msgid ""
16441 ":age: Date. Returns a human-readable date/time difference between the\n"
16442 " given date/time and the current date/time."
16443 msgstr ""
16444
16445 msgid ""
16446 ":basename: Any text. Treats the text as a path, and returns the last\n"
16447 " component of the path after splitting by the path separator\n"
16448 " (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
16449 " \"baz\" and \"foo/bar//\" becomes \"bar\"."
16450 msgstr ""
16451
16452 msgid ""
16453 ":date: Date. Returns a date in a Unix date format, including the\n"
16454 " timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
16455 msgstr ""
16456
16457 msgid ""
16458 ":domain: Any text. Finds the first string that looks like an email\n"
16459 " address, and extracts just the domain component. Example: ``User\n"
16460 " <user@example.com>`` becomes ``example.com``."
16461 msgstr ""
16462
16463 msgid ""
16464 ":email: Any text. Extracts the first string that looks like an email\n"
16465 " address. Example: ``User <user@example.com>`` becomes\n"
16466 " ``user@example.com``."
16467 msgstr ""
16468
16469 msgid ""
16470 ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
16471 " and \">\" with XML entities."
16472 msgstr ""
16473
16474 msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
16475 msgstr ""
16476
16477 msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
16478 msgstr ""
16479
16480 msgid ":firstline: Any text. Returns the first line of text."
16481 msgstr ""
16482
16483 msgid ""
16484 ":hex: Any text. Convert a binary Mercurial node identifier into\n"
16485 " its long hexadecimal representation."
16486 msgstr ""
16487
16488 msgid ""
16489 ":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
16490 " 25200\" (Unix timestamp, timezone offset)."
16491 msgstr ""
16492
16493 msgid ""
16494 ":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
16495 " +0200\"."
16496 msgstr ""
16497
16498 msgid ""
16499 ":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
16500 " seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
16501 " filter."
16502 msgstr ""
16503
16504 msgid ":localdate: Date. Converts a date to local date."
16505 msgstr ""
16506
16507 msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
16508 msgstr ""
16509
16510 msgid ""
16511 ":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
16512 " XML entities."
16513 msgstr ""
16514
16515 msgid ":person: Any text. Returns the text before an email address."
16516 msgstr ""
16517
16518 msgid ""
16519 ":rfc3339date: Date. Returns a date using the Internet date format\n"
16520 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
16521 msgstr ""
16522
16523 msgid ""
16524 ":rfc822date: Date. Returns a date using the same format used in email\n"
16525 " headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
16526 msgstr ""
16527
16528 msgid ""
16529 ":short: Changeset hash. Returns the short form of a changeset hash,\n"
16530 " i.e. a 12 hexadecimal digit string."
16531 msgstr ""
16532
16533 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
16534 msgstr ""
16535
16536 msgid ""
16537 ":stringify: Any type. Turns the value into text by converting values into\n"
16538 " text and concatenating them."
16539 msgstr ""
16540
16541 msgid ":strip: Any text. Strips all leading and trailing whitespace."
16542 msgstr ""
16543
16544 msgid ""
16545 ":stripdir: Treat the text as path and strip a directory level, if\n"
16546 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
16547 msgstr ""
16548
16549 msgid ""
16550 ":tabindent: Any text. Returns the text, with every line except the\n"
16551 " first starting with a tab character."
16552 msgstr ""
16553
16554 msgid ""
16555 ":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
16556 " \"foo bar\" becomes \"foo%20bar\"."
16557 msgstr ""
16558
16559 msgid ":user: Any text. Returns the user portion of an email address."
16560 msgstr ""
16561
16562 msgid ":author: String. The unmodified author of the changeset."
16563 msgstr ""
16564
16565 msgid ""
16566 ":branch: String. The name of the branch on which the changeset was\n"
16567 " committed."
16568 msgstr ""
16569
16570 msgid ""
16571 ":branches: List of strings. The name of the branch on which the\n"
16572 " changeset was committed. Will be empty if the branch name was\n"
16573 " default."
16574 msgstr ""
16575
16576 msgid ""
16577 ":bookmarks: List of strings. Any bookmarks associated with the\n"
16578 " changeset."
16579 msgstr ""
16580
16581 msgid ":children: List of strings. The children of the changeset."
16582 msgstr ""
16583
16584 msgid ":date: Date information. The date when the changeset was committed."
16585 msgstr ""
16586
16587 msgid ":desc: String. The text of the changeset description."
16588 msgstr ""
16589
16590 msgid ""
16591 ":diffstat: String. Statistics of changes with the following format:\n"
16592 " \"modified files: +added/-removed lines\""
16593 msgstr ""
16594
16595 msgid ":file_adds: List of strings. Files added by this changeset."
16596 msgstr ""
16597
16598 msgid ""
16599 ":file_copies: List of strings. Files copied in this changeset with\n"
16600 " their sources."
16601 msgstr ""
16602
16603 msgid ""
16604 ":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
16605 " only if the --copied switch is set."
16606 msgstr ""
16607
16608 msgid ":file_dels: List of strings. Files removed by this changeset."
16609 msgstr ""
16610
16611 msgid ":file_mods: List of strings. Files modified by this changeset."
16612 msgstr ""
16613
16614 msgid ""
16615 ":files: List of strings. All files modified, added, or removed by this\n"
16616 " changeset."
16617 msgstr ""
16618
16619 msgid ""
16620 ":latesttag: String. Most recent global tag in the ancestors of this\n"
16621 " changeset."
16622 msgstr ""
16623
16624 msgid ":latesttagdistance: Integer. Longest path to the latest tag."
16625 msgstr ""
16626
16627 msgid ""
16628 ":node: String. The changeset identification hash, as a 40 hexadecimal\n"
16629 " digit string."
16630 msgstr ""
16631
16632 msgid ":rev: Integer. The repository-local changeset revision number."
16633 msgstr ""
16634
16635 msgid ":tags: List of strings. Any tags associated with the changeset."
16636 msgstr ""
16637
16404 #, python-format
16638 #, python-format
16405 msgid "unknown method '%s'"
16639 msgid "unknown method '%s'"
16406 msgstr "okänd metod '%s'"
16640 msgstr "okänd metod '%s'"
General Comments 0
You need to be logged in to leave comments. Login now