Mercurial > hg
changeset 10543:dd3526162436 stable
merge with default
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 24 Feb 2010 18:35:05 +0100 |
| parents | fac67f0bfbb2 (diff) 989b2a5eaaba (current diff) |
| children | 2e1a9b811d13 |
| files | |
| diffstat | 11 files changed, 552 insertions(+), 198 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/hgcia.py Wed Feb 24 18:22:45 2010 +0100 +++ b/hgext/hgcia.py Wed Feb 24 18:35:05 2010 +0100 @@ -197,7 +197,10 @@ def sendrpc(self, msg): srv = xmlrpclib.Server(self.ciaurl) - srv.hub.deliver(msg) + res = srv.hub.deliver(msg) + if res is not True: + raise util.Abort(_('%s returned an error: %s') % + (self.ciaurl, res)) def sendemail(self, address, data): p = email.Parser.Parser()
--- a/hgext/progress.py Wed Feb 24 18:22:45 2010 +0100 +++ b/hgext/progress.py Wed Feb 24 18:35:05 2010 +0100 @@ -170,6 +170,10 @@ sharedprog = None def uisetup(ui): + # Apps that derive a class from ui.ui() can use + # setconfig('progress', 'disable', 'True') to disable this extension + if ui.configbool('progress', 'disable'): + return if ui.interactive() and not ui.debugflag and not ui.quiet: # we instantiate one globally shared progress bar to avoid # competing progress bars when multiple UI objects get created
--- a/i18n/da.po Wed Feb 24 18:22:45 2010 +0100 +++ b/i18n/da.po Wed Feb 24 18:35:05 2010 +0100 @@ -2396,7 +2396,7 @@ msgstr "rettelsen %s er tom\n" msgid "patch failed, rejects left in working dir\n" -msgstr "rettelse fejlede, afvisninger efter efterladt i arbejdskataloget\n" +msgstr "rettelse fejlede, afvisninger er efterladt i arbejdskataloget\n" msgid "fuzz found when applying patch, stopping\n" msgstr ""
--- a/i18n/ja.po Wed Feb 24 18:22:45 2010 +0100 +++ b/i18n/ja.po Wed Feb 24 18:35:05 2010 +0100 @@ -99,7 +99,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-01-30 00:17+0900\n" +"POT-Creation-Date: 2010-02-24 12:01+0900\n" "PO-Revision-Date: 2009-11-16 21:24+0100\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" @@ -247,6 +247,9 @@ msgid "a bookmark cannot have the name of an existing branch" msgstr "既存ブランチと同名のブックマークは作成できません" +msgid "no bookmarks set\n" +msgstr "" + msgid "force" msgstr "強制実施" @@ -1578,6 +1581,10 @@ msgid "uncommitted merge - please provide a specific revision" msgstr "マージが未コミットです - 対象リビジョンを指定してください" +#, python-format +msgid "Signing %d:%s\n" +msgstr "%d:%s への署名中\n" + msgid "Error while signing" msgstr "署名処理の失敗" @@ -1707,6 +1714,10 @@ msgstr "" #, python-format +msgid "%s returned an error: %s" +msgstr "%s からエラーが返却されました: %s" + +#, python-format msgid "hgcia: sending update to %s\n" msgstr "hgcia: %s に更新を送信しています\n" @@ -2226,6 +2237,9 @@ msgid "unhooked all commit hooks\n" msgstr "全ての commit フックを無効化\n" +msgid "hg keyword configuration and expansion example" +msgstr "" + msgid "" "\n" "\tkeywords expanded\n" @@ -2824,21 +2838,28 @@ " " msgid "" -"init a new queue repository\n" +"init a new queue repository (DEPRECATED)\n" "\n" " The queue repository is unversioned by default. If\n" " -c/--create-repo is specified, qinit will create a separate nested\n" " repository for patches (qinit -c may also be run later to convert\n" " an unversioned patch repository into a versioned one). You can use\n" -" qcommit to commit changes to this queue repository." -msgstr "" -"パッチ管理領域の初期化\n" +" qcommit to commit changes to this queue repository.\n" +"\n" +" This command is deprecated. Without -c, it's implied by other relevant\n" +" commands. With -c, use hg init -Q instead." +msgstr "" +"パッチ管理領域の初期化(非推奨)\n" "\n" " 特に指定が無い場合、パッチ管理領域は構成管理されません。\n" " -c/--create-repo が指定された場合、本コマンドはパッチ管理領域自体を\n" " Mercurial のリポジトリとして作成します(既存のパッチ管理領域を後から\n" " Mercurial リポジトリ化するのにも使用できます)。管理領域の変更内容は\n" -" qcommit によってコミットすることができます。" +" qcommit によってコミットすることができます。\n" +"\n" +" 本コマンドは推奨されません。-c 指定無しでの作成なら、他の関連コマンド\n" +" によって作成されます。-c 指定有りでの作成ならば、hg init -Q を使用\n" +" してください。" msgid "" "clone main and patch repository at same time\n" @@ -2886,8 +2907,14 @@ msgid "updating destination repository\n" msgstr "複製先の作業領域を更新中\n" -msgid "commit changes in the queue repository" -msgstr "パッチ管理領域の変更をコミット" +msgid "" +"commit changes in the queue repository (DEPRECATED)\n" +"\n" +" This command is deprecated; use hg -Q commit instead." +msgstr "" +"パッチ管理領域の変更をコミット(非推奨)\n" +"\n" +" 本コマンドは非推奨です。`hg -Q commit` を使用してください。" msgid "print the entire series file" msgstr "既知のパッチ一覧の表示" @@ -3069,7 +3096,7 @@ "\n" " To set guards on another patch::\n" "\n" -" hg qguard -- other.patch +2.6.17 -stable\n" +" hg qguard other.patch -- +2.6.17 -stable\n" " " msgstr "" "パッチのガード設定ないし表示\n" @@ -3086,7 +3113,7 @@ "\n" " 現行パッチ以外にガードを設定するには::\n" "\n" -" hg qguard -- 対象パッチ名 +2.6.17 -stable\n" +" hg qguard 対象パッチ名 -- +2.6.17 -stable\n" " " msgid "cannot mix -l/--list with options or arguments" @@ -3160,11 +3187,27 @@ msgid "A patch named %s already exists in the series file" msgstr "同名のパッチ %s が既に存在します" -msgid "restore the queue state saved by a revision" -msgstr "指定リビジョンによって保存されたパッチ管理状態の復旧" - -msgid "save current queue state" -msgstr "パッチ管理状態の保存" +#, python-format +msgid "renaming %s to %s\n" +msgstr "%s から %s に改名中\n" + +msgid "" +"restore the queue state saved by a revision (DEPRECATED)\n" +"\n" +" This command is deprecated, use rebase --mq instead." +msgstr "" +"指定リビジョンによって保存されたパッチ管理状態の復旧(非推奨)\n" +"\n" +" 本コマンドは非推奨です。--mq 指定によるリベースをしてください。" + +msgid "" +"save current queue state (DEPRECATED)\n" +"\n" +" This command is deprecated, use rebase --mq instead." +msgstr "" +"パッチ管理状態の保存(非推奨)\n" +"\n" +" 本コマンドは非推奨です。--mq 指定によるリベースをしてください。" #, python-format msgid "destination %s exists and is not a directory" @@ -3339,6 +3382,9 @@ msgid "cannot import over an applied patch" msgstr "パッチ適用中の import による取り込みはできません" +msgid "operate on patch repository" +msgstr "パッチ管理リポジトリへの操作" + msgid "print first line of patch header" msgstr "パッチヘッダの最初の行を表示" @@ -3399,8 +3445,8 @@ msgid "drop all guards" msgstr "全てのガード設定を破棄" -msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." -msgstr "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." +msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]" +msgstr "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]" msgid "hg qheader [PATCH]" msgstr "hg qheader [PATCH]" @@ -3432,8 +3478,8 @@ msgid "hg qinit [-c]" msgstr "hg qinit [-c]" -msgid "import uncommitted changes into patch" -msgstr "作業領域の変更内容のパッチへの取り込み" +msgid "import uncommitted changes (DEPRECATED)" +msgstr "作業領域の変更内容のパッチへの取り込み(非推奨)" msgid "add \"From: <current user>\" to patch" msgstr "\"From: <現ユーザ名>\" をパッチに追加" @@ -3459,8 +3505,8 @@ msgid "pop all patches" msgstr "全てのパッチの適用を解除" -msgid "queue name to pop" -msgstr "パッチ解除先のパッチ管理領域名" +msgid "queue name to pop (DEPRECATED)" +msgstr "パッチ解除先のパッチ管理領域名(非推奨)" msgid "forget any local changes to patched files" msgstr "パッチ対象ファイルに対する作業領域中の変更を破棄" @@ -3477,11 +3523,11 @@ msgid "apply all patches" msgstr "全てのパッチを適用" -msgid "merge from another queue" -msgstr "他のパッチ管理領域とのマージ" - -msgid "merge queue name" -msgstr "マージ対象のパッチ管理領域名" +msgid "merge from another queue (DEPRECATED)" +msgstr "他のパッチ管理領域とのマージ(非推奨)" + +msgid "merge queue name (DEPRECATED)" +msgstr "マージ対象のパッチ管理領域名(非推奨)" msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" @@ -4082,6 +4128,30 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "hg email [OPTION]... [DEST]...\"" +msgid "" +"show progress bars for some actions\n" +"\n" +"This extension uses the progress information logged by hg commands\n" +"to draw progress bars that are as informative as possible. Some progress\n" +"bars only offer indeterminate information, while others have a definite\n" +"end point.\n" +"\n" +"The following settings are available::\n" +"\n" +" [progress]\n" +" delay = 3 # number of seconds (float) before showing the progress bar\n" +" refresh = 0.1 # time in seconds between refreshes of the progress bar\n" +" format = topic bar number # format of the progress bar\n" +" width = <none> # if set, the maximum width of the progress information\n" +" # (that is, min(width, term width) will be used)\n" +" clear-complete = True # clear the progress bar after it's done\n" +"\n" +"Valid entries for the format field are topic, bar, number, unit, and\n" +"item. item defaults to the last 20 characters of the item, but this\n" +"can be changed by adding either ``-<num>`` which would take the last\n" +"num characters, or ``+<num>`` for the first num characters.\n" +msgstr "" + msgid "command to delete untracked files from the working directory" msgstr "作業領域中の未登録ファイルを削除するコマンド" @@ -4189,18 +4259,34 @@ msgid "cannot use collapse with continue or abort" msgstr "--collapse は --abort や --continue と併用できません" +msgid "cannot use detach with continue or abort" +msgstr "--detach は --abort や --continue と併用できません" + msgid "abort and continue do not allow specifying revisions" msgstr "--abort や --continue は、りビジョン指定と併用できません" msgid "cannot specify both a revision and a base" msgstr "--soruce と --base は併用できません" +msgid "detach requires a revision to be specified" +msgstr "--detach にはリビジョン指定が必要です" + +msgid "cannot specify a base with detach" +msgstr "--base と --detach は同時には指定出来ません" + msgid "nothing to rebase\n" msgstr "リベースの必要はありません\n" msgid "cannot use both keepbranches and extrafn" msgstr "--keepbranches と --extrafn は併用できません" +msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" +msgstr " 'hg resolve' で衝突解消してから 'hg rebase --continue' してください" + +#, python-format +msgid "no changes, revision %d skipped\n" +msgstr "変更がないので、リビジョン %d をスキップ\n" + msgid "rebase merging completed\n" msgstr "リベースのマージ処理が完了\n" @@ -4214,12 +4300,8 @@ msgid "%d revisions have been skipped\n" msgstr "%d 個のリビジョンをスキップ\n" -msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" -msgstr " 'hg resolve' で衝突解消してから 'hg rebase --continue' してください" - -#, python-format -msgid "no changes, revision %d skipped\n" -msgstr "変更がないので、リビジョン %d をスキップ\n" +msgid "unable to collapse, there is more than one external parent" +msgstr "複数の親との関係から、--collapse は指定できません" #, python-format msgid "cannot use revision %d as base, result would have 3 parents" @@ -4243,9 +4325,6 @@ msgid "source is descendant of destination" msgstr "移動元は移動先の子孫です" -msgid "unable to collapse, there is more than one external parent" -msgstr "複数の親との関係から、--collapse は指定できません" - msgid "rebase working directory to branch head" msgstr "作業領域をブランチヘッドにリベース" @@ -4267,6 +4346,9 @@ msgid "keep original branch names" msgstr "元ブランチ名を維持" +msgid "force detaching of source from its original branch" +msgstr "リベース元を元ブランチから強制的に移動" + msgid "continue an interrupted rebase" msgstr "中断されたリベースを再開" @@ -4274,11 +4356,11 @@ msgstr "中断されたリベースを中止" msgid "" -"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " -"| [-c] | [-a]" -msgstr "" -"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " -"| [-c] | [-a]" +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--" +"keepbranches] | [-c] | [-a]" +msgstr "" +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--" +"keepbranches] | [-c] | [-a]" msgid "commands to interactively select changes for commit/qrefresh" msgstr "commit または qrefresh 実行時に対話的な変更選択を行うコマンド" @@ -4598,9 +4680,29 @@ msgid "commit failed" msgstr "コミットに失敗" +msgid "" +"y: transplant this changeset\n" +"n: skip this changeset\n" +"m: merge at this changeset\n" +"p: show patch\n" +"c: commit selected changesets\n" +"q: cancel transplant\n" +"?: show this help\n" +msgstr "" +"y: このリビジョンを移植\n" +"n: このリビジョンは移植しない\n" +"m: このリビジョンでマージ\n" +"p: パッチを表示\n" +"c: 選択されたリビジョンをコミット\n" +"q: 移植の取り消し\n" +"?: ヘルプの表示\n" + msgid "apply changeset? [ynmpcq?]:" msgstr "チェンジセットを適用しますか? [ynmpcq?]:" +msgid "no such option\n" +msgstr "そのようなオプションはありません\n" + msgid "" "transplant changesets from another branch\n" "\n" @@ -4971,6 +5073,10 @@ msgid "username %s contains a newline" msgstr "ユーザ名 %s が改行を含んでいます" +#, python-format +msgid "the name '%s' is reserved" +msgstr "タグ名 '%s' はシステムで予約されています" + msgid "options --message and --logfile are mutually exclusive" msgstr "--message と --logfile は同時に指定できません" @@ -5058,6 +5164,9 @@ msgid "(consider using --after)\n" msgstr "( --after を使ってみては? )\n" +msgid "child process failed to start" +msgstr "子プロセスの生成に失敗" + #, python-format msgid "changeset: %d:%s\n" msgstr "チェンジセット: %d:%s\n" @@ -5187,6 +5296,20 @@ " undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" +"\n" +" .. container:: verbose\n" +"\n" +" An example showing how new (unknown) files are added\n" +" automatically by ``hg add``::\n" +"\n" +" $ ls\n" +" foo.c\n" +" $ hg status\n" +" ? foo.c\n" +" $ hg add\n" +" adding foo.c\n" +" $ hg status\n" +" A foo.c\n" " " msgstr "" "指定ファイルの追加登録予約\n" @@ -5198,6 +5321,20 @@ " ください。\n" "\n" " ファイル名指定が無い場合、作業領域中の全ファイルが対象となります。\n" +"\n" +" .. container:: verbose\n" +"\n" +" 以下の実行例は、``hg add`` 実行における(未知のファイルの)自動的な\n" +" 追加の例です::\n" +"\n" +" $ ls\n" +" foo.c\n" +" $ hg status\n" +" ? foo.c\n" +" $ hg add\n" +" foo.c を追加登録中\n" +" $ hg status\n" +" A foo.c\n" " " msgid "" @@ -5574,8 +5711,8 @@ " Generate a compressed changegroup file collecting changesets not\n" " known to be in another repository.\n" "\n" -" If no destination repository is specified the destination is\n" -" assumed to have all the nodes specified by one or more --base\n" +" If you omit the destination repository, then hg assumes the\n" +" destination will have all the nodes you specify with --base\n" " parameters. To create a bundle containing all changesets, use\n" " -a/--all (or --base null).\n" "\n" @@ -5675,7 +5812,9 @@ "\n" " a) the changeset, tag or branch specified with -u/--updaterev\n" " b) the changeset, tag or branch given with the first -r/--rev\n" -" c) the head of the default branch\n" +" c) the branch given with the first -b/--branch\n" +" d) the branch given with the url#branch source syntax\n" +" e) the head of the default branch\n" "\n" " Use 'hg clone -u . src dst' to checkout the source repository's\n" " parent changeset (applicable for local source repositories only).\n" @@ -5736,7 +5875,9 @@ "\n" " a) -u/--updaterev で指定されたリビジョン(タグやブランチ名も可)\n" " b) 最初の -r/--rev で指定されたリビジョン(タグやブランチ名も可)\n" -" c) 'default' ブランチのヘッドリビジョン\n" +" c) 最初の -b/--branch で指定されたブランチ\n" +" d) 複製元指定において url#branch 形式で指定されたブランチ\n" +" e) 'default' ブランチのヘッドリビジョン\n" "\n" " 複製元の作業領域における親リビジョンで、複製先リポジトリの作業領域を\n" " 更新するには、'hg clone -u . 複製元 複製先' と指定します\n" @@ -6067,6 +6208,9 @@ " revisions are specified, the working directory files are compared\n" " to its parent.\n" "\n" +" Alternatively you can specify -c/--change with a revision to see\n" +" the changes in that changeset relative to its first parent.\n" +"\n" " Without the -a/--text option, diff will avoid generating diffs of\n" " files it detects as binary. With -a, diff will generate a diff\n" " anyway, probably with undesirable results.\n" @@ -6089,6 +6233,9 @@ " され、リビジョンが1つも指定されない場合は、作業領域の内容と\n" " 親リビジョンとが比較されます。\n" "\n" +" 指定リビジョンと、その第1親との間の差分を見るには、-c/--change で\n" +" 対象リビジョンを指定する方法も使用できます。\n" +"\n" " -a/--text 指定が無い場合、バイナリと思しきファイルは処理対象から\n" " 除外されます。-a 指定が有る場合、結果に関わらず全てのファイルが\n" " 処理対象となります。\n" @@ -6102,8 +6249,9 @@ "\n" " Print the changeset header and diffs for one or more revisions.\n" "\n" -" The information shown in the changeset header is: author,\n" -" changeset hash, parent(s) and commit comment.\n" +" The information shown in the changeset header is: author, date,\n" +" branch name (if non-default), changeset hash, parent(s) and commit\n" +" comment.\n" "\n" " NOTE: export may generate unexpected diff output for merge\n" " changesets, as it will compare the merge changeset against its\n" @@ -6136,8 +6284,8 @@ "\n" " 1つ以上のリビジョンに対して、ヘッダ情報および変更内容を表示します。\n" "\n" -" ヘッダ情報表示に含まれるのは:\n" -" 作成者/ハッシュ値/親リビジョン/コミットログ\n" +" ヘッダ情報として表示される情報は:作成者/日付/\n" +" (default 以外の場合は)ブランチ名前/ハッシュ値/親リビジョン/コミットログ\n" "\n" " 備考: マージ実施リビジョンに対して、本コマンドが期待と異なる差分を\n" " 出力するのは、第1親との差分のみを出力するためです。\n" @@ -6243,68 +6391,56 @@ msgid "" "show current repository heads or show branch heads\n" "\n" -" With no arguments, show all repository head changesets.\n" +" With no arguments, show all repository branch heads.\n" "\n" " Repository \"heads\" are changesets with no child changesets. They are\n" " where development generally takes place and are the usual targets\n" -" for update and merge operations.\n" -"\n" -" If one or more REV is given, the \"branch heads\" will be shown for\n" -" the named branch associated with the specified changeset(s).\n" -"\n" -" Branch heads are changesets on a named branch with no descendants on\n" -" the same branch. A branch head could be a \"true\" (repository) head,\n" -" or it could be the last changeset on that branch before it was\n" -" merged into another branch, or it could be the last changeset on the\n" -" branch before a new branch was created. If none of the branch heads\n" -" are true heads, the branch is considered inactive.\n" +" for update and merge operations. Branch heads are changesets that have\n" +" no child changeset on the same branch.\n" +"\n" +" If one or more REVs are given, only branch heads on the branches\n" +" associated with the specified changesets are shown.\n" "\n" " If -c/--closed is specified, also show branch heads marked closed\n" " (see hg commit --close-branch).\n" "\n" " If STARTREV is specified, only those heads that are descendants of\n" " STARTREV will be displayed.\n" +"\n" +" If -t/--topo is specified, named branch mechanics will be ignored and " +"only\n" +" changesets without children will be shown.\n" " " msgstr "" "現時点でのリポジトリ(ないしブランチ)のヘッド表示\n" "\n" -" 引数指定が無い場合、リポジトリ中の全てのヘッドを表示します。\n" +" 引数指定が無い場合、リポジトリ中の全てのブランチヘッドを表示します。\n" "\n" " リポジトリの「ヘッド」とは、子リビジョンを持たないリビジョンの\n" " ことを指します。改変作業の実施や、update/merge コマンド実施の際には、\n" -" このリビジョンを対象とするのが一般的です。\n" -"\n" -" 1つ以上のリビジョンが指定された場合、本コマンドは指定リビジョンの属\n" -" する名前付きブランチの「ブランチヘッド」を表示します。\n" -"\n" -" 「ブランチヘッド」とは、自身が属する名前付きブランチ内に\n" -" 子リビジョンを持たないリビジョンのことを指します。\n" -" ブランチヘッドは「真のヘッド」である場合と、\n" -" 新たなブランチへの枝分かれや他のブランチへのマージ直前のリビジョンで\n" -" ある場合のいずれかです。\n" -" 真のヘッドを持たないブランチが非アクティブとみなされます。\n" +" このリビジョンを対象とするのが一般的です。「ブランチヘッド」とは、\n" +" 同じ名前付きブランチ内に子リビジョンを持たないリビジョンのことです。\n" +"\n" +" 1つ以上のリビジョンが指定された場合、本コマンドは指定リビジョンの\n" +" 属する名前付きブランチのブランチヘッドを表示します。\n" "\n" " -c/--closed 指定時には、閉鎖済みのブランチ\n" " ('hg commit' への --close-branch 指定で実施)も表示されます。\n" "\n" " 引数として開始リビジョンが指定された場合、\n" " 指定リビジョンの子孫となるヘッドのみが表示されます。\n" -" " - -msgid "you must specify a branch to use --closed" -msgstr "--closed 指定時にはブランチも指定してください" - -#, python-format -msgid "no open branch heads on branch %s\n" -msgstr "ブランチ %s にはオープンなヘッドがありません\n" - -#, python-format -msgid "no changes on branch %s containing %s are reachable from %s\n" -msgstr "ブランチ %s のリビジョンは(%s も含めて) %s から到達できません\n" - -#, python-format -msgid "no changes on branch %s are reachable from %s\n" -msgstr "ブランチ %s のリビジョンは %s から到達できません\n" +"\n" +" -t/--topo 指定時には、名前付きブランチに関する判定は無視され、\n" +" 単に子リビジョンを持たないリビジョンが表示されます。\n" +" " + +#, python-format +msgid "no open branch heads found on branches %s" +msgstr "ブランチ %s にはオープンなヘッドがありません" + +#, python-format +msgid " (started at %s)" +msgstr "(%s から開始)" msgid "" "show help for a given topic or a help overview\n" @@ -6356,6 +6492,14 @@ msgid "(no help text available)" msgstr "(ヘルプはありません)" +#, python-format +msgid "" +"\n" +"use \"hg -v help %s\" to show verbose help\n" +msgstr "" +"\n" +"\"hg -v help %s\" で詳細なヘルプが表示されます\n" + msgid "options:\n" msgstr "オプション:\n" @@ -6373,6 +6517,13 @@ "%s エクステンション - %s\n" "\n" +msgid "use \"hg help extensions\" for information on enabling extensions\n" +msgstr "\"hg help extensions\" で有効なエクステンションの情報が表示されます\n" + +#, python-format +msgid "'%s' is provided by the following extension:" +msgstr "以下のエクステンションにより '%s' が提供されています:" + msgid "Mercurial Distributed SCM\n" msgstr "Mercurial - 分散構成管理ツール\n" @@ -6496,11 +6647,8 @@ " -d/--date への指定に関しては、'hg help dates' を参照してください。\n" " " -msgid "applying patch from stdin\n" -msgstr "標準入力からのパッチを適用中\n" - -msgid "no diffs found" -msgstr "差分がありません" +msgid "to working directory" +msgstr "作業領域" msgid "not a Mercurial patch" msgstr "Mercurial 向けのパッチではありません" @@ -6508,6 +6656,16 @@ msgid "patch is damaged or loses information" msgstr "パッチには破損ないし情報の欠落があります" +msgid "applying patch from stdin\n" +msgstr "標準入力からのパッチを適用中\n" + +#, python-format +msgid "applied %s\n" +msgstr "%s に対して適用\n" + +msgid "no diffs found" +msgstr "差分がありません" + msgid "" "show new changesets found in source\n" "\n" @@ -6708,13 +6866,18 @@ " " #, python-format -msgid "branch '%s' has %d heads - please merge with an explicit rev" -msgstr "ブランチ '%s' にはヘッドが %d あります - マージ対象を明示してください" - -#, python-format -msgid "branch '%s' has one head - please merge with an explicit rev" -msgstr "" -"ブランチ '%s' にはヘッドが1しかありません - マージ対象を明示してください" +msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" +msgstr "中断: ブランチ '%s' には %d ヘッドあります - 対象を明示してください\n" + +msgid "(run 'hg heads .' to see heads)\n" +msgstr "(ヘッド一覧は 'hg heads' で表示されます)\n" + +#, python-format +msgid "abort: branch '%s' has one head - please merge with an explicit rev\n" +msgstr "中断: ブランチ '%s' は単一ヘッドです - 対象を明示してください\n" + +msgid "(run 'hg heads' to see all heads)\n" +msgstr "(ヘッド一覧は 'hg heads' で表示されます)\n" msgid "there is nothing to merge" msgstr "マージの必要がありません" @@ -6731,13 +6894,13 @@ "リビジョンを明示しての \"hg update\" ないしマージを実施してください。" msgid "" -"show changesets not found in destination\n" +"show changesets not found in the destination\n" "\n" " Show changesets not found in the specified destination repository\n" " or the default push location. These are the changesets that would\n" " be pushed if a push was requested.\n" "\n" -" See pull for valid destination format details.\n" +" See pull for details of valid destination formats.\n" " " msgstr "" "連携先リポジトリに含まれないチェンジセットの表示\n" @@ -6850,7 +7013,7 @@ msgid "" "push changes to the specified destination\n" "\n" -" Push changes from the local repository to the given destination.\n" +" Push changes from the local repository to the specified destination.\n" "\n" " This is the symmetrical operation for pull. It moves changes from\n" " the current repository to a different one. If the destination is\n" @@ -6870,7 +7033,7 @@ msgstr "" "指定リポジトリへの変更履歴の反映\n" "\n" -" 手元のリポジトリから連携先リポジトリに変更履歴を反映します。\n" +" 手元のリポジトリから指定の連携先リポジトリに変更履歴を反映します。\n" "\n" " これは 'hg pull' と対称的な操作です。現在のリポジトリから連携先へと\n" " 変更履歴を反映させることができます。連携先が同一ホスト上のリポジトリ\n" @@ -7077,8 +7240,8 @@ " to the contents they had in the parent of the working directory.\n" " This restores the contents of the affected files to an unmodified\n" " state and unschedules adds, removes, copies, and renames. If the\n" -" working directory has two parents, you must explicitly specify the\n" -" revision to revert to.\n" +" working directory has two parents, you must explicitly specify a\n" +" revision.\n" "\n" " Using the -r/--rev option, revert the given files or directories\n" " to their contents as of a specific revision. This can be helpful\n" @@ -7180,7 +7343,7 @@ " - commit\n" " - import\n" " - pull\n" -" - push (with this repository as destination)\n" +" - push (with this repository as the destination)\n" " - unbundle\n" "\n" " This command is not intended for use on public repositories. Once\n" @@ -7206,7 +7369,7 @@ " - commit\n" " - import\n" " - pull\n" -" - push (rollback 可能なのは反映先リポジトリ側)\n" +" - push (現リポジトリが、反映対象として指定された場合)\n" " - unbundle\n" "\n" " 本コマンドは、公開リポジトリでの実行を想定していません。他のユーザ\n" @@ -7466,10 +7629,6 @@ msgid "tag names must be unique" msgstr "タグ名が重複しています" -#, python-format -msgid "the name '%s' is reserved" -msgstr "タグ名 '%s' はシステムで予約されています" - msgid "--rev and --remove are incompatible" msgstr "--rev と --remove は同時に使用できません" @@ -7487,7 +7646,7 @@ #, python-format msgid "tag '%s' already exists (use -f to force)" -msgstr "タグ '%s' は存在します(強行する場合は -f を指定してください)" +msgstr "タグ '%s' は存在します(強制実行する場合は -f を指定してください)" msgid "" "list repository tags\n" @@ -7736,8 +7895,8 @@ msgid "treat all files as text" msgstr "全ファイルをテキストファイルと仮定" -msgid "don't include dates in diff headers" -msgstr "差分表示の際に日付情報を抑止" +msgid "omit dates from diff headers" +msgstr "差分表示の際に日付情報の表示を抑止" msgid "show which function each change is in" msgstr "差分表示の際に関数名情報を表示" @@ -7769,12 +7928,18 @@ msgid "annotate the specified revision" msgstr "当該リビジョン時点での由来情報を表示" -msgid "follow file copies and renames" -msgstr "複製／改名元ファイルの履歴も追跡" +msgid "follow copies and renames (DEPRECATED)" +msgstr "複製／改名元ファイルの履歴も追跡(非推奨)" + +msgid "don't follow copies and renames" +msgstr "複製／改名元ファイル履歴の追跡を抑止" msgid "list the author (long with -v)" msgstr "ユーザ名を表示(-v 指定時は詳細表示)" +msgid "list the filename" +msgstr "ファイル名を表示" + msgid "list the date (short with -q)" msgstr "日付を表示(-q 指定時は簡略表示)" @@ -7856,14 +8021,17 @@ msgid "[-ac]" msgstr "[-ac]" -msgid "run even when remote repository is unrelated" +msgid "run even when the destination is unrelated" msgstr "連携先が無関係なリポジトリでも実行" -msgid "a changeset up to which you would like to bundle" -msgstr "バンドルファイルに含める上限のリビジョン" - -msgid "a base changeset to specify instead of a destination" -msgstr "連携先指定の代わりとなる基底リビジョン" +msgid "a changeset intended to be added to the destination" +msgstr "バンドルに含めたいリビジョン" + +msgid "a specific branch you would like to bundle" +msgstr "バンドルに含めたいブランチ" + +msgid "a base changeset assumed to be available at the destination" +msgstr "連携先リポジトリに存在することを仮定するリビジョン" msgid "bundle all changesets in the repository" msgstr "リポジトリ中の全リビジョンをバンドルに含める" @@ -7886,14 +8054,17 @@ msgid "[OPTION]... FILE..." msgstr "[OPTION]... FILE..." -msgid "the clone will only contain a repository (no working copy)" -msgstr "管理領域のみの複製(作業領域の更新無し)" +msgid "the clone will include an empty working copy (only a repository)" +msgstr "作業領域の更新無し(管理領域のみの複製)" msgid "revision, tag or branch to check out" msgstr "作業領域更新用リビジョン(タグ名／ブランチ名)" -msgid "clone only the specified revisions and ancestors" -msgstr "指定リビジョンと、その祖先のみを複製" +msgid "include the specified changeset" +msgstr "複製対象に含めるリビジョン" + +msgid "clone only the specified branch" +msgstr "指定ブランチのみを複製" msgid "[OPTION]... SOURCE [DEST]" msgstr "[OPTION]... SOURCE [DEST]" @@ -7964,8 +8135,8 @@ msgid "revision to check" msgstr "確認対象リビジョン" -msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." -msgstr "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." +msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." +msgstr "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." msgid "diff against the second parent" msgstr "第2親との差分を使用" @@ -8003,8 +8174,11 @@ msgid "show only heads which are descendants of REV" msgstr "当該リビジョンの子孫となるヘッドのみを表示" -msgid "show only the active branch heads from open branches" -msgstr "アクティブなブランチのヘッドのみを表示" +msgid "show topological heads only" +msgstr "子を持たない全てのリビジョンを表示" + +msgid "show active branchheads only [DEPRECATED]" +msgstr "アクティブなブランチヘッドのみを表示 [非推奨]" msgid "show normal and closed branch heads" msgstr "閉鎖したヘッドも表示" @@ -8056,14 +8230,20 @@ msgid "[OPTION]... PATCH..." msgstr "[OPTION]... PATCH..." +msgid "run even if remote repository is unrelated" +msgstr "連携先が無関係なリポジトリでも実行" + msgid "show newest record first" msgstr "新しいリビジョンから先に表示" msgid "file to store the bundles into" msgstr "バンドルファイルの書き出し先" -msgid "a specific remote revision up to which you would like to pull" -msgstr "取り込み対象上限とする遠隔リビジョン" +msgid "a remote changeset intended to be added" +msgstr "取り込み対象リビジョン" + +msgid "a specific branch you would like to pull" +msgstr "取り込み対象ブランチ" msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" @@ -8071,7 +8251,7 @@ msgid "[-e CMD] [--remotecmd CMD] [DEST]" msgstr "[-e CMD] [--remotecmd CMD] [DEST]" -msgid "search the repository as it stood at REV" +msgid "search the repository as it is in REV" msgstr "当該リビジョン時点のファイル一覧から検索" msgid "end filenames with NUL, for use with xargs" @@ -8131,14 +8311,17 @@ msgid "[-P] [-f] [[-r] REV]" msgstr "[-P] [-f] [[-r] REV]" -msgid "a specific revision up to which you would like to push" -msgstr "反映対象とする上限のリビジョン" +msgid "a changeset intended to be included in the destination" +msgstr "反映対象とするリビジョン" + +msgid "a specific branch you would like to push" +msgstr "反映対象とするブランチ" msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" -msgid "show parents from the specified revision" -msgstr "当該リビジョンの親リビジョンを表示" +msgid "show parents of the specified revision" +msgstr "親リビジョンの表示対象" msgid "[-r REV] [FILE]" msgstr "[-r REV] [FILE]" @@ -8149,6 +8332,9 @@ msgid "update to new branch head if changesets were pulled" msgstr "新規取り込みの際には作業領域を新規のブランチヘッドで更新" +msgid "run even when remote repository is unrelated" +msgstr "連携先が無関係なリポジトリでも実行" + msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" @@ -8191,8 +8377,8 @@ msgid "tipmost revision matching date" msgstr "当該日時の最新リビジョンを使用" -msgid "revision to revert to" -msgstr "当該リビジョンの内容で復旧" +msgid "revert to the specified revision" +msgstr "当該リビジョン時点の内容で復旧" msgid "do not save backup copies of files" msgstr "取り消し実施前内容のバックアップを抑止" @@ -8890,6 +9076,16 @@ " - if it's a directory, all files ending with .rc are added\n" " - otherwise, the file itself will be added\n" "\n" +"HGPLAIN\n" +" When set, this disables any options in .hgrc that might change\n" +" Mercurial's default output. This includes encoding, defaults,\n" +" verbose mode, debug mode, quiet mode, tracebacks, and\n" +" localization. This can be useful when scripting against Mercurial\n" +" in the face of existing user configuration.\n" +"\n" +" Equivalent options set via command line flags or environment\n" +" variables are not overridden.\n" +"\n" "HGUSER\n" " This is the string used as the author of a commit. If not set,\n" " available values will be considered in this order:\n" @@ -8970,6 +9166,16 @@ " - ディレクトリなら、配下の \".rc\" で終わる名前のファイルを読み込む\n" " - ファイルなら、そのファイル自身を読み込む\n" "\n" +"HGPLAIN\n" +" この環境変数が設定された場合、Mercurial の表示設定を変更し得る\n" +" .hgrc 中の記述が全て無視されます。encoding や defaults の指定、\n" +" verbose モード、debug モード、quiet モード、tracebacks や各国語設定が\n" +" 対象となります。ユーザ設定を温存したままで、ツール等から Mercurial を\n" +" 使用する場合に有用です。\n" +"\n" +" コマンドラインや環境変数によって同等のオプションが明示的に指定された\n" +" 場合には、こららは無視されません。\n" +"\n" "HGUSER\n" " チェンジセット作成者としてコミット時に記録する名前の指定。\n" " 作成者名として採用される値の決定順序は以下の通りです:\n" @@ -9673,6 +9879,9 @@ " 'default' が定義されている場合でも、'default-push' が定義されていれば\n" " こちらが優先されます。\n" +msgid "dirstate branch not accessible" +msgstr "dirstate のブランチ情報にアクセスできません" + msgid "can only share local repositories" msgstr "共有可能なのはローカルリポジトリのみです" @@ -9992,6 +10201,12 @@ msgid "searching for changes\n" msgstr "変更点を探索中\n" +msgid "queries" +msgstr "問い合わせ" + +msgid "searching" +msgstr "検索中" + msgid "already have changeset " msgstr "既にチェンジセットがあります " @@ -10010,15 +10225,25 @@ msgstr "連携先の changegroupsubset 機能未対応により、部分取り込みできません。" #, python-format -msgid "abort: push creates new remote branch '%s'!\n" -msgstr "中断: 反映によって連携先に新しいブランチ '%s' が作成されます!\n" +msgid "abort: push creates new remote heads on branch '%s'!\n" +msgstr "中断: 連携先のブランチ '%s' に新しいヘッドが作成されます!\n" msgid "abort: push creates new remote heads!\n" -msgstr "中断: 反映によって連携先に新しいヘッドが作成されます!\n" +msgstr "中断: 連携先に新しいヘッドが作成されます!\n" msgid "(did you forget to merge? use push -f to force)\n" msgstr "(マージは済んでいますか? push -f で強制実行できます)\n" +msgid "(you should pull and merge or use push -f to force)\n" +msgstr "(pull と merge を実施するか、push -f で強制実行してください)\n" + +#, python-format +msgid "abort: push creates new remote branches: %s!\n" +msgstr "中断: 連携先に新しいブランチが作成されます: %s!\n" + +msgid "(use 'hg push -f' to force)\n" +msgstr "('hg push -f' で強制実行できます)\n" + msgid "note: unsynced remote changes!\n" msgstr "注意: 連携先での変更点が取り込まれていません!\n" @@ -10026,25 +10251,50 @@ msgid "%d changesets found\n" msgstr "%d 個のチェンジセット\n" +msgid "bundle changes" +msgstr "チェンジセットをバンドルに追加" + +msgid "chunks" +msgstr "チャンク" + +msgid "bundle manifests" +msgstr "マニフェストをバンドルに追加" + #, python-format msgid "empty or missing revlog for %s" msgstr "%s に対するリビジョンログが空ないし不在です" +msgid "bundle files" +msgstr "ファイルをバンドルに追加" + msgid "adding changesets\n" msgstr "チェンジセットを追加中\n" +msgid "changesets" +msgstr "チェンジセット" + msgid "received changelog group is empty" msgstr "受信した変更履歴は空です" msgid "adding manifests\n" msgstr "マニフェストを追加中\n" +msgid "manifests" +msgstr "マニフェスト" + msgid "adding file changes\n" msgstr "ファイルの変更を追加中\n" msgid "received file revlog group is empty" msgstr "ファイルのリビジョンログが空です" +msgid "files" +msgstr "ファイル" + +#, python-format +msgid "missing file data for %s:%s - run hg verify" +msgstr "%s:%s のファイルデータが不在です - hg verify を実施してください" + #, python-format msgid " (%+d heads)" msgstr "（%+d個のヘッド）" @@ -10247,12 +10497,12 @@ msgstr "ファイル %s は既に存在します\n" #, python-format -msgid "Hunk #%d succeeded at %d %s(offset %d line).\n" -msgstr "ハンク #%d の適用成功:%d 行目 %s 補正行数 %d\n" - -#, python-format -msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n" -msgstr "ハンク #%d の適用成功:%d 行目 %s 補正行数 %d\n" +msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n" +msgstr "ハンク #%d の適用成功:%d 行目、曖昧性 %d (位置補正 %d 行)\n" + +#, python-format +msgid "Hunk #%d succeeded at %d (offset %d lines).\n" +msgstr "ハンク #%d の適用成功:%d 行目 (位置補正 %d 行)\n" #, python-format msgid "Hunk #%d FAILED at %d\n" @@ -10323,6 +10573,9 @@ msgid "unknown compression type %r" msgstr "%r は未知の圧縮形式です" +msgid "index entry flags need RevlogNG" +msgstr "インデックスエントリフラグは RevlogNG 対応が必要です" + #, python-format msgid "index %s unknown flags %#04x for format v0" msgstr "インデックス %s: %#04x は未知のフラグです(フォーマット v0)" @@ -10572,6 +10825,12 @@ msgid "http auth: user %s, password %s\n" msgstr "HTTP 認証: ユーザ名 %s, パスワード %s\n" +msgid "certificate checking requires Python 2.6" +msgstr "証明書検証には Python 2.6 が必要です" + +msgid "server identity verification succeeded\n" +msgstr "サーバ証明書の検証に成功\n" + #, python-format msgid "command '%s' failed: %s" msgstr "コマンド '%s' 失敗: %s" @@ -10715,6 +10974,9 @@ msgid "checking changesets\n" msgstr "チェンジセットの確認中\n" +msgid "changelog" +msgstr "チェンジログ" + #, python-format msgid "unpacking changeset %s" msgstr "リビジョン %s の展開中" @@ -10736,6 +10998,9 @@ msgid "crosschecking files in changesets and manifests\n" msgstr "チェンジセットとマニフェストによるファイルのクロスチェック中\n" +msgid "crosscheck" +msgstr "クロスチェック" + #, python-format msgid "changeset refers to unknown manifest %s" msgstr "未知のマニフェスト %s が参照されています"
--- a/i18n/pt_BR.po Wed Feb 24 18:22:45 2010 +0100 +++ b/i18n/pt_BR.po Wed Feb 24 18:35:05 2010 +0100 @@ -266,6 +266,9 @@ msgid "a bookmark cannot have the name of an existing branch" msgstr "um marcador não pode ter o mesmo nome de um ramo existente" +msgid "no bookmarks set\n" +msgstr "nenhum marcador definido\n" + msgid "force" msgstr "forçar" @@ -825,8 +828,8 @@ "colore a saída de alguns comandos\n" "\n" "Essa extensão colore a saída dos comandos para realçar diversas\n" -"informações: nos comandos status e resolve, reflete os estados dos arquivos;\n" -"no comando qseries, reflete os estados dos patches (aplicado,\n" +"informações: nos comandos status e resolve, reflete os estados dos\n" +"arquivos; no comando qseries, reflete os estados dos patches (aplicado,\n" "não-aplicado, faltando); e para comandos relacionados com diff,\n" "destaca adições, remoções, cabeçalhos de diffs e espaços em branco\n" "no final das linhas.\n" @@ -1262,10 +1265,10 @@ " do log do CVS. Essa função recebe uma lista com as entradas do log,\n" " e pode modificar, adicionar ou remover entradas.\n" " --config hook.cvschangesets\n" -" Especifica uma função Python a ser chamada após os conjuntos de mudanças\n" -" serem calculados a partir do log do CVS. Essa função recebe uma lista\n" -" com as entradas do conjunto de mudanças, e pode modificar, adicionar ou\n" -" remover suas entradas.\n" +" Especifica uma função Python a ser chamada após os conjuntos de\n" +" mudanças serem calculados a partir do log do CVS. Essa função\n" +" recebe uma lista com as entradas do conjunto de mudanças, e pode\n" +" modificar, adicionar ou remover suas entradas.\n" "\n" " O comando \"debugcvsps\" do Mercurial permite que o código de mesclagem\n" " interno seja executado fora do processo de conversão. Seus\n" @@ -2126,6 +2129,10 @@ msgid "uncommitted merge - please provide a specific revision" msgstr "mesclagem não consolidada - por favor forneça uma revisão específica" +#, python-format +msgid "Signing %d:%s\n" +msgstr "Assinando %d: %s\n" + msgid "Error while signing" msgstr "Erro ao assinar" @@ -2293,6 +2300,10 @@ " baseurl = http://server/path/to/repo\n" #, python-format +msgid "%s returned an error: %s" +msgstr "%s devolveu um erro: %s" + +#, python-format msgid "hgcia: sending update to %s\n" msgstr "hgcia: enviando atualização para %s\n" @@ -2866,6 +2877,9 @@ msgid "unhooked all commit hooks\n" msgstr "removidos os registros de todos os ganchos de consolidação\n" +msgid "hg keyword configuration and expansion example" +msgstr "exemplo de configuração e expansão da extensão keyword" + msgid "" "\n" "\tkeywords expanded\n" @@ -3055,8 +3069,8 @@ "Se configurada como 'keep', a mq irá obedecer a seção [diff] do arquivo de\n" "configuração ao preservar patches git existentes em um comando qrefresh. Se\n" "configurada como 'yes' ou 'no', a mq irá sobrepor a seção [diff] e sempre\n" -"gerar patches git ou comuns, respectivamente, possivelmente perdendo dados no\n" -"segundo caso.\n" +"gerar patches git ou comuns, respectivamente, possivelmente perdendo dados\n" +"no segundo caso.\n" #, python-format msgid "mq.git option can be auto/keep/yes/no got %s" @@ -3551,7 +3565,7 @@ "\n" " This command is deprecated; use hg -Q commit instead." msgstr "" -"consolida mudanças no repositório da fila de patches (OBSOLETO) " +"consolida mudanças no repositório da fila de patches (OBSOLETO)\n" "\n" " Este comando é obsoleto; use hg -Q commit em seu lugar." @@ -3835,22 +3849,25 @@ msgid "A patch named %s already exists in the series file" msgstr "Um patch de nome %s já existe no arquivo series" +#, python-format +msgid "renaming %s to %s\n" +msgstr "renomeando %s para %s\n" + msgid "" "restore the queue state saved by a revision (DEPRECATED)\n" "\n" " This command is deprecated, use rebase --mq instead." msgstr "" -"restaura o estado da fila salvo por uma revisão (OBSOLETO) " -"\n" -" Este comando é obsoleto, use " +"restaura o estado da fila salvo por uma revisão (OBSOLETO)\n" +"\n" +" Este comando é obsoleto, use rebase --mq em seu lugar." msgid "" "save current queue state (DEPRECATED)\n" "\n" " This command is deprecated, use rebase --mq instead." msgstr "" -"salva o estado atual da fila (OBSOLETO) " -"\n" +"salva o estado atual da fila (OBSOLETO)\n" " Este comando é obsoleto, use rebase --mq em seu lugar." #, python-format @@ -4952,15 +4969,17 @@ "\n" " [progress]\n" " delay = 3 # número de segundos (float) antes que a barra seja mostrada\n" -" refresh = 0.1 # tempo em segundos entre atualizações da barra de progresso\n" +" refresh = 0.1 # tempo em segundos entre atualizações da\n" +" # barra de progresso\n" " format = topic bar number # formato da barra de progresso\n" -" width = <none> # se definido, será a largura máxima da informação de progresso\n" -" # (isto é, min(largura, largura do terminal) será usada)\n" +" width = <none> # se definido, será a largura máxima da informação de\n" +" # progresso (isto é, min(largura, largura do terminal)\n" +" # será usada)\n" " clear-complete = True # limpa a barra de progresso após terminar\n" "\n" "Entradas válidas para o campo format são topic (tópico), bar (barra),\n" -"number (número), unit (unidade) e item (item). item por padrão são os últimos\n" -"caracteres do item, mas isto pode ser modificado adicionando ou\n" +"number (número), unit (unidade) e item (item). item por padrão são os\n" +"últimos caracteres do item, mas isto pode ser modificado adicionando ou\n" "``-<num>``, que consideraria os últimos num caracteres, ou ``+<num>``\n" "para os primeiros num caracteres.\n" @@ -5200,8 +5219,8 @@ "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--" "keepbranches] | [-c] | [-a]" msgstr "" -"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep]" -" [--keepbranches] [-c] | [-a]" +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--" +"keepbranches] [-c] | [-a]" msgid "commands to interactively select changes for commit/qrefresh" msgstr "comandos para selecionar interativamente mudanças em um commit ou qrefresh" @@ -5599,9 +5618,29 @@ msgid "commit failed" msgstr "falha ao consolidar" +msgid "" +"y: transplant this changeset\n" +"n: skip this changeset\n" +"m: merge at this changeset\n" +"p: show patch\n" +"c: commit selected changesets\n" +"q: cancel transplant\n" +"?: show this help\n" +msgstr "" +"y: transplante esta revisão\n" +"n: pula esta revisão\n" +"m: mescal nesta revisão\n" +"p: mostra o patch\n" +"c: consolida revisões selecionadas\n" +"q: cancela o transplante\n" +"?: exibe esta ajuda\n" + msgid "apply changeset? [ynmpcq?]:" msgstr "aplicar revisão? [ynmpcq?]:" +msgid "no such option\n" +msgstr "não existe tal opção\n" + msgid "" "transplant changesets from another branch\n" "\n" @@ -7165,6 +7204,9 @@ " revisions are specified, the working directory files are compared\n" " to its parent.\n" "\n" +" Alternatively you can specify -c/--change with a revision to see\n" +" the changes in that changeset relative to its first parent.\n" +"\n" " Without the -a/--text option, diff will avoid generating diffs of\n" " files it detects as binary. With -a, diff will generate a diff\n" " anyway, probably with undesirable results.\n" @@ -7190,6 +7232,9 @@ " trabalho, e se não for especificada uma revisão, os arquivos do\n" " diretório de trabalho serão comparados com seu pai.\n" "\n" +" Alternativamente você pode especificar -c/--change com uma revisão\n" +" para ver as mudanças nessa revisão relativas a seu primeiro pai.\n" +"\n" " Sem a opção -a/--text, diff evitará gerar diffs de arquivos que\n" " detectar como binários. Com -a, diff irá gerar um diff de\n" " qualquer maneira, provavelmente com resultados não desejados.\n" @@ -7842,7 +7887,9 @@ #, python-format msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" -msgstr "abortado: o ramo '%s' tem %d cabeças - por favor mescle com uma revisão específica\n" +msgstr "" +"abortado: o ramo '%s' tem %d cabeças - por favor mescle com uma revisão " +"específica\n" msgid "(run 'hg heads .' to see heads)\n" msgstr "(execute 'hg heads .' para ver as cabeças)\n" @@ -8636,19 +8683,19 @@ #, python-format msgid "tag '%s' does not exist" -msgstr "etiqueta '%s' não existe" +msgstr "a etiqueta '%s' não existe" #, python-format msgid "tag '%s' is not a global tag" -msgstr "etiqueta '%s' não é uma etiqueta global" +msgstr "a etiqueta '%s' não é uma etiqueta global" #, python-format msgid "tag '%s' is not a local tag" -msgstr "etiqueta '%s' não é uma etiqueta local" +msgstr "a etiqueta '%s' não é uma etiqueta local" #, python-format msgid "tag '%s' already exists (use -f to force)" -msgstr "etiqueta '%s' já existe (use -f para forçar)" +msgstr "a etiqueta '%s' já existe (use -f para forçar)" msgid "" "list repository tags\n" @@ -9148,8 +9195,8 @@ msgid "revision to check" msgstr "revisão para verificar" -msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." -msgstr "[OPÇÃO]... [-r REV1 [-r REV2]] [ARQUIVO]..." +msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." +msgstr "[OPÇÃO]... ([-c REV] | [-r REV1 [-r REV2]]) [ARQUIVO]..." msgid "diff against the second parent" msgstr "faz o diff com o segundo pai" @@ -11269,6 +11316,12 @@ msgid "searching for changes\n" msgstr "procurando por mudanças\n" +msgid "queries" +msgstr "consultas" + +msgid "searching" +msgstr "procurando" + msgid "already have changeset " msgstr "já possui a revisão " @@ -11315,25 +11368,46 @@ msgid "%d changesets found\n" msgstr "%d revisões encontradas\n" +msgid "bundle changes" +msgstr "empacotando mudanças" + +msgid "chunks" +msgstr "trechos" + +msgid "bundle manifests" +msgstr "empacotando manifestos" + #, python-format msgid "empty or missing revlog for %s" msgstr "revlog vazio ou não encontrado para %s" +msgid "bundle files" +msgstr "empacotando arquivos" + msgid "adding changesets\n" msgstr "adicionando revisões\n" +msgid "changesets" +msgstr "revisões" + msgid "received changelog group is empty" msgstr "grupo de changelogs recebido é vazio" msgid "adding manifests\n" msgstr "adicionando manifestos\n" +msgid "manifests" +msgstr "manifestos" + msgid "adding file changes\n" msgstr "adicionando mudanças em arquivos\n" msgid "received file revlog group is empty" msgstr "grupo recebido de arquivos revlog vazio" +msgid "files" +msgstr "arquivos" + #, python-format msgid "missing file data for %s:%s - run hg verify" msgstr "faltando dados de arquivo para %s:%s - execute hg verify" @@ -11546,12 +11620,14 @@ msgstr "arquivo %s já existe\n" #, python-format -msgid "Hunk #%d succeeded at %d %s(offset %d line).\n" -msgstr "Trecho #%d aplicado com sucesso em %d %s(distância %d linha).\n" - -#, python-format -msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n" -msgstr "Trecho #%d aplicado com sucesso em %d %s(distância %d linhas).\n" +msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n" +msgstr "" +"Trecho #%d aplicado com sucesso em %d com indistinção %d (distância %d " +"linhas).\n" + +#, python-format +msgid "Hunk #%d succeeded at %d (offset %d lines).\n" +msgstr "Trecho #%d aplicado com sucesso em %d (distância %d linhas).\n" #, python-format msgid "Hunk #%d FAILED at %d\n" @@ -12023,6 +12099,9 @@ msgid "checking changesets\n" msgstr "checando revisões\n" +msgid "changelog" +msgstr "changelog" + #, python-format msgid "unpacking changeset %s" msgstr "desempacotando revisão %s" @@ -12044,6 +12123,9 @@ msgid "crosschecking files in changesets and manifests\n" msgstr "checagem cruzada de arquivos em revisões e no manifesto\n" +msgid "crosscheck" +msgstr "checagem cruzada" + #, python-format msgid "changeset refers to unknown manifest %s" msgstr "revisão se refere a manifesto desconhecido %s"
--- a/mercurial/commands.py Wed Feb 24 18:22:45 2010 +0100 +++ b/mercurial/commands.py Wed Feb 24 18:35:05 2010 +0100 @@ -3334,7 +3334,8 @@ _('do not prompt, assume \'yes\' for any required answers')), ('q', 'quiet', None, _('suppress output')), ('v', 'verbose', None, _('enable additional output')), - ('', 'config', [], _('set/override config option')), + ('', 'config', [], + _('set/override config option (use \'section.name=value\')')), ('', 'debug', None, _('enable debugging output')), ('', 'debugger', None, _('start debugger')), ('', 'encoding', encoding.encoding, _('set the charset encoding')),
--- a/mercurial/filemerge.py Wed Feb 24 18:22:45 2010 +0100 +++ b/mercurial/filemerge.py Wed Feb 24 18:35:05 2010 +0100 @@ -205,7 +205,7 @@ out, a = a, back # read input from backup, write to original replace = dict(local=a, base=b, other=c, output=out) args = re.sub("\$(local|base|other|output)", - lambda x: '"%s"' % replace[x.group()[1:]], args) + lambda x: '"%s"' % util.localpath(replace[x.group()[1:]]), args) r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env) if not r and _toolbool(ui, tool, "checkconflicts"):
--- a/mercurial/hgweb/protocol.py Wed Feb 24 18:22:45 2010 +0100 +++ b/mercurial/hgweb/protocol.py Wed Feb 24 18:35:05 2010 +0100 @@ -62,13 +62,9 @@ yield resp def between(repo, req): - if 'pairs' in req.form: - pairs = [map(bin, p.split("-")) - for p in req.form['pairs'][0].split(" ")] - resp = cStringIO.StringIO() - for b in repo.between(pairs): - resp.write(" ".join(map(hex, b)) + "\n") - resp = resp.getvalue() + pairs = [map(bin, p.split("-")) + for p in req.form['pairs'][0].split(" ")] + resp = ''.join(" ".join(map(hex, b)) + "\n" for b in repo.between(pairs)) req.respond(HTTP_OK, HGTYPE, length=len(resp)) yield resp
--- a/mercurial/url.py Wed Feb 24 18:22:45 2010 +0100 +++ b/mercurial/url.py Wed Feb 24 18:35:05 2010 +0100 @@ -140,6 +140,9 @@ # Read configuration config = dict() for key, val in self.ui.configitems('auth'): + if '.' not in key: + self.ui.warn(_("ignoring invalid [auth] key '%s'\n") % key) + continue group, setting = key.split('.', 1) gdict = config.setdefault(group, dict()) gdict[setting] = val
--- a/tests/test-extension.out Wed Feb 24 18:22:45 2010 +0100 +++ b/tests/test-extension.out Wed Feb 24 18:35:05 2010 +0100 @@ -56,7 +56,7 @@ -y --noninteractive do not prompt, assume 'yes' for any required answers -q --quiet suppress output -v --verbose enable additional output - --config set/override config option + --config set/override config option (use 'section.name=value') --debug enable debugging output --debugger start debugger --encoding set the charset encoding (default: ascii) @@ -82,7 +82,7 @@ -y --noninteractive do not prompt, assume 'yes' for any required answers -q --quiet suppress output -v --verbose enable additional output - --config set/override config option + --config set/override config option (use 'section.name=value') --debug enable debugging output --debugger start debugger --encoding set the charset encoding (default: ascii)
--- a/tests/test-help.out Wed Feb 24 18:22:45 2010 +0100 +++ b/tests/test-help.out Wed Feb 24 18:35:05 2010 +0100 @@ -220,7 +220,7 @@ -y --noninteractive do not prompt, assume 'yes' for any required answers -q --quiet suppress output -v --verbose enable additional output - --config set/override config option + --config set/override config option (use 'section.name=value') --debug enable debugging output --debugger start debugger --encoding set the charset encoding (default: ascii) @@ -288,7 +288,7 @@ -y --noninteractive do not prompt, assume 'yes' for any required answers -q --quiet suppress output -v --verbose enable additional output - --config set/override config option + --config set/override config option (use 'section.name=value') --debug enable debugging output --debugger start debugger --encoding set the charset encoding (default: ascii)