Commits

Steve Borho committed 0482281 Merge

Merge with stable

  • Participants
  • Parent commits 0011dd0, 682a679

Comments (0)

Files changed (14)

 b54c477c7bf5a6c7f6ff268dab812224ba9bda96 2.5.1
 980b9c4d8d2034b6c09570d7e2e56aa7a578e121 2.6
 745a7357ab0c522d4e10689407aa8fdf6cc7a0fc 2.6.1
+0be1e673a70f724f3b20b7c6781f6a2e8d58dcf2 2.6.2

File i18n/tortoisehg/ja.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-25 08:56-0200\n"
-"PO-Revision-Date: 2012-12-01 12:57+0000\n"
-"Last-Translator: Yuya Nishihara <Unknown>\n"
+"PO-Revision-Date: 2012-12-12 09:20+0000\n"
+"Last-Translator: shirou <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:41+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-13 04:55+0000\n"
+"X-Generator: Launchpad (build 16361)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 
 #: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/filectxactions.py:79
 msgid "Revert file(s) to contents at this revision"
-msgstr "このリビジョンの内容にファイルを戻す"
+msgstr "このリビジョンの内容にファイルを復旧する"
 
 #: tortoisehg/hgqt/chunks.py:188
 msgid "Patch failed to apply"
 
 #: tortoisehg/hgqt/chunks.py:237
 msgid "Completely remove file from patch?"
-msgstr ""
+msgstr "パッチから完全にファイルを削除しますか?"
 
 #: tortoisehg/hgqt/chunks.py:239
 msgid "Revert all file changes?"
-msgstr ""
+msgstr "すべてのファイルの変更を復旧しますか?"
 
 #: tortoisehg/hgqt/chunks.py:240
 msgid "No chunks remain"
 
 #: tortoisehg/hgqt/commit.py:771
 msgid "Default username is not configured"
-msgstr ""
+msgstr "デフォルトのユーザー名が設定されていません"
 
 #: tortoisehg/hgqt/commit.py:772
 msgid ""
 
 #: tortoisehg/hgqt/commit.py:777
 msgid "&Configure"
-msgstr ""
+msgstr "設定(&C)"
 
 #: tortoisehg/hgqt/commit.py:787
 msgid "Message Translation Failure"
 
 #: tortoisehg/hgqt/csinfo.py:111
 msgid "Graft:"
-msgstr "複製:"
+msgstr "移植 (graft):"
 
 #: tortoisehg/hgqt/csinfo.py:112
 msgid "Transplant:"
 
 #: tortoisehg/hgqt/customtools.py:46
 msgid "Select a GUI location to edit:"
-msgstr ""
+msgstr "編集する場所を選択して下さい:"
 
 #: tortoisehg/hgqt/customtools.py:49
 msgid "Select the toolbar or menu to change"
-msgstr ""
+msgstr "編集する場所をツールバーかメニューかを選んで下さい"
 
 #: tortoisehg/hgqt/customtools.py:70
 msgid "Tools shown on selected location"
-msgstr ""
+msgstr "選択した場所に表示するツール"
 
 #: tortoisehg/hgqt/customtools.py:80
 msgid "Delete from list"
-msgstr ""
+msgstr "リストから削除"
 
 #: tortoisehg/hgqt/customtools.py:88
 msgid "Add to list"
-msgstr ""
+msgstr "リストに追加"
 
 #: tortoisehg/hgqt/customtools.py:90
 msgid "Add separator"
-msgstr ""
+msgstr "区切りを追加"
 
 #: tortoisehg/hgqt/customtools.py:100
 msgid "List of all tools"
-msgstr ""
+msgstr "全てのツール"
 
 #: tortoisehg/hgqt/customtools.py:102
 msgid "New Tool ..."
-msgstr ""
+msgstr "ツール追加..."
 
 #: tortoisehg/hgqt/customtools.py:104
 msgid "Edit Tool ..."
-msgstr ""
+msgstr "ツール編集..."
 
 #: tortoisehg/hgqt/customtools.py:106
 msgid "Delete Tool"
-msgstr ""
+msgstr "ツール削除..."
 
 #: tortoisehg/hgqt/customtools.py:393
 msgid "Configure Custom Tool"
-msgstr ""
+msgstr "カスタムツール設定"
 
 #: tortoisehg/hgqt/customtools.py:406
 msgid "Tool name"
-msgstr ""
+msgstr "ツール名"
 
 #: tortoisehg/hgqt/customtools.py:407
 msgid "The tool name. It cannot contain spaces."
-msgstr ""
+msgstr "ツール名。空白が含まれていてはいけません"
 
 #: tortoisehg/hgqt/customtools.py:409
 msgid "Command"
-msgstr ""
+msgstr "コマンド"
 
 #: tortoisehg/hgqt/customtools.py:410
 msgid ""
 "You can use {ROOT} as an alias of the current repository root and\n"
 "{REV} as an alias of the selected revision."
 msgstr ""
+"実行されるコマンドです。\n"
+"mercurialのコマンドを実行する場合、 (\"hg.exe\"ではなく) \"hg\" を使って下さい。\n"
+"{ROOT}を現在のリポジトリルートとして、{REV}を選択したリビジョンの変数として使えます。"
 
 #: tortoisehg/hgqt/customtools.py:415
 msgid "Tool label"
-msgstr ""
+msgstr "ラベル"
 
 #: tortoisehg/hgqt/customtools.py:417
 msgid ""
 "If no label is set, the tool name will be used as the tool label.\n"
 "If no tooltip is set, the label will be used as the tooltip as well."
 msgstr ""
+"repowidgetのコンテキストメニューに表示されるラベルです。\n"
+"ラベルが設定されていない場合、ツール名がラベルとして使われます。\n"
+"tooltipが設定されていない場合、このラベルはtooltipとしても使われます。"
 
 #: tortoisehg/hgqt/customtools.py:421
 msgid "Tooltip"
-msgstr ""
+msgstr "Tooltip"
 
 #: tortoisehg/hgqt/customtools.py:423
 msgid ""
 "This is only shown when the tool button is shown on\n"
 "the workbench toolbar."
 msgstr ""
+"ツールボタンの上に表示されるtooltipです。\n"
+"これはworkbenchツールバーにあるツールボタンでのみ表示されます。"
 
 #: tortoisehg/hgqt/customtools.py:426
 msgid "Icon"
-msgstr ""
+msgstr "アイコン"
 
 #: tortoisehg/hgqt/customtools.py:428
 msgid ""
 "You can also set this value to the absolute path to\n"
 "any icon on your file system."
 msgstr ""
+"ツールのアイコンです。\n"
+"正しいTortoiseHgのアイコン名を指定することで、TortoiseHg内蔵のアイコンを使えます (例: "
+"clone、add、remove、sync、thg-logo、hg-update等)。\n"
+"また、ファイルシステム上の絶対パスを入力することで好きなアイコンを表示できます。"
 
 #: tortoisehg/hgqt/customtools.py:437
 msgid "On repowidget, show for"
-msgstr ""
+msgstr "repowidgetでの表示"
 
 #: tortoisehg/hgqt/customtools.py:438
 msgid ""
 
 #: tortoisehg/hgqt/customtools.py:443
 msgid "Show Output Log"
-msgstr ""
+msgstr "出力ログの表示"
 
 #: tortoisehg/hgqt/customtools.py:444
 msgid ""
 "When enabled, automatically show the Output Log when the command is run.\n"
 "Default: False."
-msgstr ""
+msgstr "有効の場合、コマンド実行時に出力ログが自動で表示されます。初期設定は無効です。"
 
 #: tortoisehg/hgqt/customtools.py:449
 msgid "OK"
 
 #: tortoisehg/hgqt/customtools.py:509
 msgid "Missing information"
-msgstr ""
+msgstr "情報が足りません"
 
 #: tortoisehg/hgqt/customtools.py:516
 msgid "You must set a tool name."
-msgstr ""
+msgstr "ツール名を設定して下さい。"
 
 #: tortoisehg/hgqt/customtools.py:518
 msgid "The tool name cannot have any spaces in it."
-msgstr ""
+msgstr "ツール名には空白を含めないで下さい。"
 
 #: tortoisehg/hgqt/customtools.py:520
 msgid "You must set a command to run."
-msgstr ""
+msgstr "実行するコマンドを設定して下さい。"
 
 #: tortoisehg/hgqt/docklog.py:413
 msgid "failed to run command\n"
 
 #: tortoisehg/hgqt/filectxactions.py:59
 msgid "Folder history"
-msgstr ""
+msgstr "フォルダー履歴"
 
 #: tortoisehg/hgqt/filectxactions.py:61
 msgid "Compare file revisions"
 
 #: tortoisehg/hgqt/filectxactions.py:84
 msgid "Explore folder"
-msgstr ""
+msgstr "フォルダをExploreで表示"
 
 #: tortoisehg/hgqt/filectxactions.py:85
 msgid "Open the selected folder in the system file manager"
-msgstr ""
+msgstr "選択したフォルダをシステムのファイルマネージャーで表示します"
 
 #: tortoisehg/hgqt/filectxactions.py:87
 msgid "Open terminal here"
-msgstr ""
+msgstr "ここで端末を開く"
 
 #: tortoisehg/hgqt/filectxactions.py:88
 msgid "Open a shell terminal in the selected folder"
-msgstr ""
+msgstr "選択したフォルダーで端末を開きます。"
 
 #: tortoisehg/hgqt/filectxactions.py:194
 msgid "Cannot display visual diff"
 
 #: tortoisehg/hgqt/filectxactions.py:316 tortoisehg/hgqt/wctxactions.py:239
 msgid "The selected subrepository does not exist on the working directory"
-msgstr ""
+msgstr "作業領域には選択したサブリポジトリがありません"
 
 #: tortoisehg/hgqt/filedata.py:40
 msgid "File or diffs not displayed: "
 "\t%s\n"
 "\n"
 msgstr ""
+"[警告] 無効なサブリポジトリのリビジョンID:\n"
+"\t%s\n"
+"\n"
 
 #: tortoisehg/hgqt/filedata.py:197
 msgid "Subrepo created and set to initial revision."
 
 #: tortoisehg/hgqt/filedialogs.py:271 tortoisehg/hgqt/filedialogs.py:300
 msgid "You must select two revisions to diff"
-msgstr ""
+msgstr "差分を見るには2つのリビジョンを選択して下さい。"
 
 #: tortoisehg/hgqt/filedialogs.py:428
 msgid "File Differences Log Columns"
 
 #: tortoisehg/hgqt/graft.py:39
 msgid "Interrupted graft operation found"
-msgstr ""
+msgstr "移植が中断されています。"
 
 #: tortoisehg/hgqt/graft.py:40
 msgid ""
 "You cannot perform a different graft operation unless you abort the "
 "interrupted graft operation first."
 msgstr ""
+"移植の実行が中断されています。\n"
+"\n"
+"この移植の実行を中止するまで新しい移植を実行できません。"
 
 #: tortoisehg/hgqt/graft.py:44
 msgid "Continue or abort interrupted graft operation?"
-msgstr ""
+msgstr "中断された移植を再開しますか?中止しますか?"
 
 #: tortoisehg/hgqt/graft.py:63
 #, python-format
 
 #: tortoisehg/hgqt/graft.py:80
 msgid "To graft destination"
-msgstr ""
+msgstr "移植先"
 
 #: tortoisehg/hgqt/graft.py:106
 msgid "Graft"
-msgstr ""
+msgstr "移植 (graft)"
 
 #: tortoisehg/hgqt/graft.py:109 tortoisehg/hgqt/graft.py:309
 #: tortoisehg/hgqt/rebase.py:101 tortoisehg/hgqt/rebase.py:274
 #: tortoisehg/hgqt/graft.py:126
 #, python-format
 msgid "Graft - %s"
-msgstr ""
+msgstr "移植 (graft) - %s"
 
 #: tortoisehg/hgqt/graft.py:131
 msgid "Graft changeset"
-msgstr ""
+msgstr "移植元リビジョン"
 
 #: tortoisehg/hgqt/graft.py:133
 #, python-format
 "Before graft, you must <a href=\"commit\"><b>commit</b></a> or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 msgstr ""
+"移植の前に変更を<a href=\"commit\"><b>コミット</b></a> するか <a "
+"href=\"discard\"><b>破棄</b></a>してください。"
 
 #: tortoisehg/hgqt/graft.py:167
 msgid "You may continue or start the graft"
-msgstr ""
+msgstr "移植を開始できます"
 
 #: tortoisehg/hgqt/graft.py:213
 msgid "Graft is complete"
-msgstr ""
+msgstr "移植を完了しました"
 
 #: tortoisehg/hgqt/graft.py:215
 msgid "Graft aborted"
-msgstr ""
+msgstr "移植が中止されました"
 
 #: tortoisehg/hgqt/graft.py:217
 msgid "Graft failed"
-msgstr ""
+msgstr "移植が失敗しました"
 
 #: tortoisehg/hgqt/graft.py:230
 msgid ""
 "Graft generated merge <b>conflicts</b> that must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
-msgstr ""
+msgstr "移植で<b>マージ衝突</b>しました。<a href=\"resolve\"><b>解消してください</b></a>。"
 
 #: tortoisehg/hgqt/graft.py:236
 msgid "You may continue the graft"
-msgstr ""
+msgstr "移植できます"
 
 #: tortoisehg/hgqt/graft.py:289
 msgid "Exiting with an unfinished graft is not recommended."
-msgstr ""
+msgstr "完了していない移植があるまま終了するのは望ましくありません。"
 
 #: tortoisehg/hgqt/graft.py:290
 msgid "Consider aborting the graft first."
-msgstr ""
+msgstr "まず移植を中止してみて下さい。"
 
 #: tortoisehg/hgqt/graft.py:291 tortoisehg/hgqt/merge.py:106
 #: tortoisehg/hgqt/rebase.py:260
 
 #: tortoisehg/hgqt/graft.py:306
 msgid "Graft already in progress"
-msgstr ""
+msgstr "移植はすでに実行中です"
 
 #: tortoisehg/hgqt/graft.py:307
 msgid "Resuming graft already in progress"
-msgstr ""
+msgstr "移植の再開はすでに実行中です"
 
 #: tortoisehg/hgqt/graft.py:310
 msgid "You must provide revisions to graft"
-msgstr ""
+msgstr "移植にはリビジョンを指定する必要があります"
 
 #: tortoisehg/hgqt/grep.py:42
 msgid "### regular expression search pattern ###"
 
 #: tortoisehg/hgqt/guess.py:200
 msgid "There are no files that may have been renamed"
-msgstr ""
+msgstr "名前が変更されたファイルはおそらくありません"
 
 #: tortoisehg/hgqt/guess.py:242
 msgid "Multiple sources chosen"
 
 #: tortoisehg/hgqt/hgemail.py:495
 msgid "use only one form to specify the revision"
-msgstr ""
+msgstr "このリビジョンを指定するにはフォームを一つだけ使って下さい。"
 
 #: tortoisehg/hgqt/hgemail.py:505
 msgid "Failed to open Email dialog"
 "\n"
 "To cancel the merge you can update to one of the merge parent revisions."
 msgstr ""
+"マージを完了するには作業領域でコミットが必要です。\n"
+"\n"
+"マージの親リビジョンのうちのどれかに更新すると、マージをキャンセルできます。"
 
 #: tortoisehg/hgqt/merge.py:126
 msgid "Prepare to merge"
 
 #: tortoisehg/hgqt/p4pending.py:108
 msgid "Reverting p4 changelist..."
-msgstr "p4チェンジリストを元に戻しています..."
+msgstr "p4チェンジリスト復旧しています..."
 
 #: tortoisehg/hgqt/pathedit.py:23
 msgid "Edit Repository URL"
 
 #: tortoisehg/hgqt/quickop.py:22
 msgid "Checkmark files to revert"
-msgstr "元に戻すファイルをチェック"
+msgstr "復旧するファイルをチェック"
 
 #: tortoisehg/hgqt/quickop.py:22
 msgid "Revert"
-msgstr "元に戻す"
+msgstr "復旧"
 
 #: tortoisehg/hgqt/quickop.py:23
 msgid "Checkmark files to remove"
 #: tortoisehg/hgqt/repomodel.py:51
 msgctxt "column header"
 msgid "Latest tags"
-msgstr ""
+msgstr "直近のタグ"
 
 #: tortoisehg/hgqt/repomodel.py:52
 msgctxt "column header"
 
 #: tortoisehg/hgqt/repowidget.py:1271
 msgid "Graft to local..."
-msgstr "ローカルへ移植..."
+msgstr "ローカルへ移植 (graft)..."
 
 #: tortoisehg/hgqt/repowidget.py:1275
 msgid "Modify history"
 
 #: tortoisehg/hgqt/revert.py:22 tortoisehg/hgqt/revert.py:26
 msgid "Cannot revert to working directory"
-msgstr "作業領域に戻せません"
+msgstr "作業領域に復旧できません"
 
 #: tortoisehg/hgqt/revert.py:23
 msgid "Reverting to the working directory revision does not make sense"
-msgstr "作業領域のリビジョンへ戻す意味はありません"
+msgstr "作業領域のリビジョンへ復旧する意味はありません"
 
 #: tortoisehg/hgqt/revert.py:29
 #, python-format
 msgid "Revert - %s"
-msgstr "取り消し - %s"
+msgstr "復旧 - %s"
 
 #: tortoisehg/hgqt/revert.py:40
 #, python-format
 msgid "<b>Revert %s to its contents at revision %d?</b>"
-msgstr "<b>%sをリビジョン%dの内容にしますか?</b>"
+msgstr "<b>%sをリビジョン%dの内容に復旧しますか?</b>"
 
 #: tortoisehg/hgqt/revert.py:44
 #, python-format
 msgid "<b>Revert %d files to their contents at revision %d?</b>"
-msgstr "<b>%d つのファイルをリビジョン %d の内容にしますか?</b>"
+msgstr "<b>%d つのファイルをリビジョン %d の内容に復旧しますか?</b>"
 
 #: tortoisehg/hgqt/revert.py:50
 msgid "Revert all files to this revision"
-msgstr "すべてのファイルを取り消して、このリビジョンに戻す"
+msgstr "すべてのファイルの変更を取り消して、このリビジョンに復旧する"
 
 #: tortoisehg/hgqt/revert.py:65 tortoisehg/hgqt/wctxactions.py:279
 #: tortoisehg/hgqt/wctxactions.py:289
 msgid "Confirm Revert"
-msgstr "元に戻す"
+msgstr "復旧の確認"
 
 #: tortoisehg/hgqt/revert.py:66
 msgid ""
 "modified state.<br><br>Are you sure you want to use revert?<br><br>(use "
 "update to checkout another revision)"
 msgstr ""
-"すべてのファイルを元に戻すと変更は破棄され、影響があるファイルは変更状態のままになります。<br><br>本当に元に戻しますか?<br><br>(別のリビ"
-"ジョンをチェックアウトするには「更新」を使ってください)"
+"すべてのファイルを復旧すると変更は破棄され、影響があるファイルは変更状態のままになります。<br><br>本当に復旧しますか?<br><br>(別のリビジ"
+"ョンをチェックアウトするには「更新」を使ってください)"
 
 #: tortoisehg/hgqt/revpanel.py:22
 msgid "Changeset:"
 
 #: tortoisehg/hgqt/run.py:1096
 msgid "revisions to graft"
-msgstr ""
+msgstr "移植するリビジョン"
 
 #: tortoisehg/hgqt/run.py:1097
 msgid "thg graft [-r] REV..."
-msgstr ""
+msgstr "thg graft [-r] REV..."
 
 #: tortoisehg/hgqt/run.py:1099
 msgid "ignore case during search"
 "immediately, without user interaction. Commands are \"add remove revert "
 "forget\". Default: None (leave blank)"
 msgstr ""
-"ユーザーの操作抜きですぐに実行して欲しいシェルのコマンドです。空白で区\n"
-"切られたリストで入力してください。コマンドは \"add remove revert forget\" です。 デフォルトは なし(空白のまま)です"
+"ユーザーの操作抜きですぐに実行して欲しいシェルのコマンドです。空白で区切られたリストで入力してください。コマンドは \"add remove "
+"revert forget\" です。 デフォルトは なし(空白のまま)です"
 
 #: tortoisehg/hgqt/settings.py:569
 msgid "Tab Width"
 #: tortoisehg/hgqt/settings.py:631
 msgid "Task Toolbar Order"
 msgstr ""
+"タスクツールバーの\r\n"
+"順番"
 
 #: tortoisehg/hgqt/settings.py:632
 msgid ""
 
 #: tortoisehg/hgqt/settings.py:718
 msgid "New Commit Phase"
-msgstr ""
+msgstr "コミットの初期フェーズ"
 
 #: tortoisehg/hgqt/settings.py:720
 msgid "The phase of new commits. Default: draft"
-msgstr ""
+msgstr "新しいコミットの初期フェーズです。デフォルトではdraftです。"
 
 #: tortoisehg/hgqt/settings.py:721
 msgid "Secret MQ Patches"
 
 #: tortoisehg/hgqt/settings.py:761
 msgid "<b>Web Server:</b>"
-msgstr ""
+msgstr "<b>Webサーバー:</b>"
 
 #: tortoisehg/hgqt/settings.py:763
 msgid ""
 
 #: tortoisehg/hgqt/settings.py:925 tortoisehg/hgqt/settings.py:1569
 msgid "Tools"
-msgstr ""
+msgstr "カスタムツール"
 
 #: tortoisehg/hgqt/settings.py:928
 msgid "Issue Tracking"
 
 #: tortoisehg/hgqt/wctxactions.py:266
 msgid "Revert files to local or other parent?"
-msgstr "ファイルをローカルまたは他の親リビジョンの状態にしますか?"
+msgstr "ファイルをローカルまたは他の親リビジョンの状態に復旧しますか?"
 
 #: tortoisehg/hgqt/wctxactions.py:267
 msgid "&Local"
 
 #: tortoisehg/hgqt/wctxactions.py:280
 msgid "Revert local file changes?"
-msgstr "ローカルのファイル変更を元に戻しますか?"
+msgstr "ローカルのファイル変更を復旧しますか?"
 
 #: tortoisehg/hgqt/wctxactions.py:281
 msgid "&Revert with backup"
-msgstr "変更をバックアップして戻す (&R)"
+msgstr "変更をバックアップして復旧する (&R)"
 
 #: tortoisehg/hgqt/wctxactions.py:281
 msgid "&Discard changes"
 
 #: tortoisehg/hgqt/wctxactions.py:290
 msgid "Revert the following files?"
-msgstr "ファイルを元に戻しますか?"
+msgstr "これらのファイルを復旧しますか?"
 
 #: tortoisehg/hgqt/wctxactions.py:291
 msgid "&Revert"
-msgstr ""
+msgstr "復旧 (&Revert)"
 
 #: tortoisehg/hgqt/wctxactions.py:356
 msgid "Confirm Delete Unversioned"
 
 #: tortoisehg/util/bugtraq.py:89
 msgid "This error will not be shown again until you restart the workbench"
-msgstr ""
+msgstr "このエラーはワークベンチを再起動するまで再表示されません。"
 
 #: tortoisehg/util/bugtraq.py:112
 msgid "Error getting commit message information from Issue Tracker plugin"
 
 #: tortoisehg/util/bugtraq.py:148
 msgid "Cannot open Plugin Options dialog"
-msgstr ""
+msgstr "プラグインオプションダイアログを開けません"
 
 #: tortoisehg/util/hglib.py:298
 msgid "inotify is not supported on this platform"
 
 #: tortoisehg/util/menuthg.py:34
 msgid "Revert Files..."
-msgstr "元に戻す..."
+msgstr "ファイルの復旧(revert)..."
 
 #: tortoisehg/util/menuthg.py:35
 msgid "Revert file changes"

File i18n/tortoisehg/nl.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-25 08:56-0200\n"
-"PO-Revision-Date: 2012-11-09 21:11+0000\n"
-"Last-Translator: EvP <erik@evpwebdesign.nl>\n"
+"PO-Revision-Date: 2012-12-15 20:19+0000\n"
+"Last-Translator: Johan Samyn <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:45+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-16 04:58+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 
 #: tortoisehg/hgqt/settings.py:883 tortoisehg/hgqt/settings.py:893
 msgid "Ignore White Space"
-msgstr "Witruimte Negeren"
+msgstr "Negeer witruimte"
 
 #: tortoisehg/hgqt/settings.py:884
 msgid "Ignore white space when comparing lines in diff views. Default: False"
 
 #: tortoisehg/hgqt/settings.py:886 tortoisehg/hgqt/settings.py:896
 msgid "Ignore WS Amount"
-msgstr "Aantal Witruimte Negeren"
+msgstr "Negeer lengte van witruimte"
 
 #: tortoisehg/hgqt/settings.py:887
 msgid ""
 "Ignore changes in the amount of white space in diff views. Default: False"
 msgstr ""
-"Negeer wijzigingen in de grootte van witruimte in vergelijkingen. Standaard "
-": False"
+"Negeer wijzigingen in de lengte van witruimte in vergelijkingen. Standaard : "
+"False"
 
 #: tortoisehg/hgqt/settings.py:889 tortoisehg/hgqt/settings.py:899
 msgid "Ignore Blank Lines"
-msgstr "Blano Regels Negeren"
+msgstr "Negeer lege regels"
 
 #: tortoisehg/hgqt/settings.py:890
 msgid ""
 "Ignore changes whose lines are all blank in diff views. Default: False"
 msgstr ""
-"Begeer wijzigingen met enkel blanko regels in vergelijkingen. Standaard : "
-"False"
+"Negeer wijzigingen met enkel lege regels in vergelijkingen. Standaard : False"
 
 #: tortoisehg/hgqt/settings.py:892
 msgid "<b>Annotate:</b>"
 "Ignore changes in the amount of white space in the annotate view. Default: "
 "False"
 msgstr ""
-"Negeer wijzigingen in de grootte van witruimte in annotate. Standaard : False"
+"Negeer wijzigingen in de lengte van witruimte in annotate. Standaard : False"
 
 #: tortoisehg/hgqt/settings.py:900
 msgid ""
 "Ignore changes whose lines are all blank in the annotate view. Default: False"
 msgstr ""
-"Negeer wijzigingen met enkel blanko regels in annotate. Standaard : False"
+"Negeer wijzigingen met enkel lege regels in annotate. Standaard : False"
 
 #: tortoisehg/hgqt/settings.py:904
 msgid "Fonts"

File i18n/tortoisehg/ru.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: Andrei Polushin <polushin@gmail.com>\n"
 "POT-Creation-Date: 2012-11-25 08:56-0200\n"
-"PO-Revision-Date: 2012-07-03 14:34+0000\n"
-"Last-Translator: Stanislav V. Kroter <krotersv@gmail.com>\n"
+"PO-Revision-Date: 2012-12-11 08:45+0000\n"
+"Last-Translator: Andrey Sergunov <sw-info@ya.ru>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:49+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-12 04:44+0000\n"
+"X-Generator: Launchpad (build 16361)\n"
 "Language: ru\n"
 "X-Poedit-Language: Russian\n"
 
 
 #: tortoisehg/hgqt/chunks.py:237
 msgid "Completely remove file from patch?"
-msgstr ""
+msgstr "Полностью удалить файл из патча"
 
 #: tortoisehg/hgqt/chunks.py:239
 msgid "Revert all file changes?"
 
 #: tortoisehg/hgqt/customtools.py:80
 msgid "Delete from list"
-msgstr ""
+msgstr "Удалить из списка"
 
 #: tortoisehg/hgqt/customtools.py:88
 msgid "Add to list"
-msgstr ""
+msgstr "Добавить в список"
 
 #: tortoisehg/hgqt/customtools.py:90
 msgid "Add separator"
-msgstr ""
+msgstr "Добавить разделитель"
 
 #: tortoisehg/hgqt/customtools.py:100
 msgid "List of all tools"
 
 #: tortoisehg/hgqt/customtools.py:409
 msgid "Command"
-msgstr ""
+msgstr "Команда"
 
 #: tortoisehg/hgqt/customtools.py:410
 msgid ""
 "You can use {ROOT} as an alias of the current repository root and\n"
 "{REV} as an alias of the selected revision."
 msgstr ""
+"Команда, которая будет выполнена.\n"
+"Для выполнения команды mercurial используйте \"hg\" (а не \"hg.exe\") как "
+"исполняемую команду.\n"
+"Вы можете использовать {ROOT} как имя корня текущего репозитория и\n"
+" {REV} как имя выбранной ревизии."
 
 #: tortoisehg/hgqt/customtools.py:415
 msgid "Tool label"
 
 #: tortoisehg/hgqt/filectxactions.py:59
 msgid "Folder history"
-msgstr ""
+msgstr "История папки"
 
 #: tortoisehg/hgqt/filectxactions.py:61
 msgid "Compare file revisions"
 
 #: tortoisehg/hgqt/filectxactions.py:84
 msgid "Explore folder"
-msgstr ""
+msgstr "Обзор папки"
 
 #: tortoisehg/hgqt/filectxactions.py:85
 msgid "Open the selected folder in the system file manager"
-msgstr ""
+msgstr "Открыть выбранную папку в файловом менеджере"
 
 #: tortoisehg/hgqt/filectxactions.py:87
 msgid "Open terminal here"
 
 #: tortoisehg/hgqt/filectxactions.py:194
 msgid "Cannot display visual diff"
-msgstr ""
+msgstr "Не могу отобразить визуальное различие"
 
 #: tortoisehg/hgqt/filectxactions.py:195
 msgid "Visual diffs are not supported for unapplied patches"
-msgstr ""
+msgstr "Визуальные различия не поддреживаются для непримененных патчей"
 
 #: tortoisehg/hgqt/filectxactions.py:271
 #, python-format
 
 #: tortoisehg/hgqt/filedata.py:65 tortoisehg/hgqt/filedata.py:128
 msgid "File may be binary (maximum line length exceeded)"
-msgstr ""
+msgstr "Файл может быть бинарным (превышена максимальная длина строки)"
 
 #: tortoisehg/hgqt/filedata.py:74 tortoisehg/hgqt/filedata.py:395
 #, python-format
 
 #: tortoisehg/hgqt/filedata.py:117
 msgid "Diff not displayed: "
-msgstr ""
+msgstr "Различия не отображены: "
 
 #: tortoisehg/hgqt/filedata.py:177
 #, python-format
 
 #: tortoisehg/hgqt/filedialogs.py:138
 msgid "Too many rows selected for menu"
-msgstr ""
+msgstr "Слишком много строк выбрано для меню"
 
 #: tortoisehg/hgqt/filedialogs.py:184 tortoisehg/hgqt/workbench.py:346
 msgid "Back"
 
 #: tortoisehg/hgqt/filedialogs.py:217
 msgid "Diff selected file revisions..."
-msgstr ""
+msgstr "Различия для выбранных ревизий файла..."
 
 #: tortoisehg/hgqt/filedialogs.py:224
 msgid "Diff changeset to parent..."
 
 #: tortoisehg/hgqt/filedialogs.py:271 tortoisehg/hgqt/filedialogs.py:300
 msgid "You must select two revisions to diff"
-msgstr ""
+msgstr "Вы должны выбрать две ревизии для сравнения"
 
 #: tortoisehg/hgqt/filedialogs.py:428
 msgid "File Differences Log Columns"
 
 #: tortoisehg/hgqt/fileview.py:765
 msgid "Show Author"
-msgstr ""
+msgstr "Показать автора"
 
 #: tortoisehg/hgqt/fileview.py:766
 msgid "Show Date"
-msgstr ""
+msgstr "Показать дату"
 
 #: tortoisehg/hgqt/fileview.py:767
 msgid "Show Revision"
-msgstr ""
+msgstr "Показать ревизию"
 
 #: tortoisehg/hgqt/graft.py:39
 msgid "Interrupted graft operation found"
 
 #: tortoisehg/hgqt/hgemail_ui.py:276
 msgid "send patches as part of the email body"
-msgstr ""
+msgstr "отослать заплатки по электронной почте"
 
 #: tortoisehg/hgqt/hgemail_ui.py:277
 msgid "body"
 
 #: tortoisehg/hgqt/matching.py:221
 msgid "<b>Unknown revision!</b>"
-msgstr ""
+msgstr "<b>Неизвестная ревизия!</b>"
 
 #: tortoisehg/hgqt/matching.py:223
 msgid "<b>Parse Error!</b>"
 
 #: tortoisehg/hgqt/qscilib.py:249
 msgid "TAB inserts"
-msgstr ""
+msgstr "Вставить табуляцию"
 
 #: tortoisehg/hgqt/qscilib.py:250
 msgid "Auto"
 
 #: tortoisehg/hgqt/qscilib.py:251
 msgid "TAB"
-msgstr ""
+msgstr "табуляция"
 
 #: tortoisehg/hgqt/qscilib.py:252
 msgid "Spaces"
 
 #: tortoisehg/hgqt/qscilib.py:423
 msgid "Prev"
-msgstr ""
+msgstr "Пред."
 
 #: tortoisehg/hgqt/qscilib.py:428
 msgid "Next"
-msgstr ""
+msgstr "След."
 
 #: tortoisehg/hgqt/qscilib.py:645
 msgid "Unable to read/write config file"
 
 #: tortoisehg/hgqt/qtlib.py:1118
 msgid "Unable to translate input to local encoding."
-msgstr ""
+msgstr "Невозможно транслировать ввод в локальную кодировку"
 
 #: tortoisehg/hgqt/quickbar.py:30
 msgid "Goto"
 #: tortoisehg/hgqt/repomodel.py:51
 msgctxt "column header"
 msgid "Latest tags"
-msgstr ""
+msgstr "Последние теги"
 
 #: tortoisehg/hgqt/repomodel.py:52
 msgctxt "column header"
 
 #: tortoisehg/hgqt/repowidget.py:2026
 msgid "The selected command is empty"
-msgstr ""
+msgstr "Выбранная команда пуста"
 
 #: tortoisehg/hgqt/repowidget.py:2055
 msgid "Failed to execute custom command"
-msgstr ""
+msgstr "Ошибка выполнения заданной команды"
 
 #: tortoisehg/hgqt/repowidget.py:2056
 #, python-format
 "Please check that the command path is valid and that it is a valid "
 "application"
 msgstr ""
+"Возвращено следующее сообщение об ошибке:\n"
+"\n"
+"\"%s\"\n"
+"\n"
+"Проверьте, что это правильное приложение и путь к нему"
 
 #: tortoisehg/hgqt/repowidget.py:2064
 msgid "Unable to start"
 "Specify the number of spaces that tabs expand to in various TortoiseHg "
 "windows. Default: 8"
 msgstr ""
+"Укажите число пробелов для замены табуляции в различных окнах TortoiseHg. По-"
+"умолчанию: 8"
 
 #: tortoisehg/hgqt/settings.py:573
 msgid "Force Repo Tab"
 
 #: tortoisehg/hgqt/settings.py:676
 msgid "Activate Bookmarks"
-msgstr ""
+msgstr "Включить закладки"
 
 #: tortoisehg/hgqt/settings.py:678
 msgid ""
 
 #: tortoisehg/hgqt/settings.py:761
 msgid "<b>Web Server:</b>"
-msgstr ""
+msgstr "<b>Web сервер:</b>"
 
 #: tortoisehg/hgqt/settings.py:763
 msgid ""
 #: tortoisehg/hgqt/sync.py:1400
 #, python-format
 msgid "Invalid port number: %s"
-msgstr ""
+msgstr "Неверный номер порта: %s"
 
 #: tortoisehg/hgqt/sync.py:1416
 msgid "Security: "
 
 #: tortoisehg/hgqt/update.py:200
 msgid "remove working directory"
-msgstr ""
+msgstr "Переместить рабочую директорию"
 
 #: tortoisehg/hgqt/update.py:207
 msgid "(same as parent)"
 
 #: tortoisehg/hgqt/update.py:242 tortoisehg/hgqt/update.py:254
 msgid "Activate bookmark?"
-msgstr ""
+msgstr "Установить закладку?"
 
 #: tortoisehg/hgqt/update.py:243
 #, python-format
 
 #: tortoisehg/hgqt/update.py:267
 msgid "Deactivate current bookmark?"
-msgstr ""
+msgstr "Убрать текущую закладку"
 
 #: tortoisehg/hgqt/update.py:268
 #, python-format
 msgid "Do you really want to deactivate the <i>%s</i> bookmark?"
-msgstr ""
+msgstr "Вы действительно хотите убрать <i>%s</i> закладку?"
 
 #: tortoisehg/hgqt/update.py:319
 msgid ""
 
 #: tortoisehg/hgqt/workbench.py:1021
 msgid "README not configured"
-msgstr ""
+msgstr "README не указан"
 
 #: tortoisehg/hgqt/workbench.py:1022
 msgid ""
 "'<i>readme</i>' key to the '<i>tortoisehg</i>' section, and set it to the "
 "filename or URL of your repository's README file."
 msgstr ""
+"README файл не указан для текущего репозитория.<p>Укажите README файл для "
+"репозитория, для этого откройти файл настроек репозитория, добавьте ключ "
+"'<i>readme</i>' в раздел '<i>tortoisehg</i>' и установите имя файла или URL "
+"к README файлу вашего репозитория."
 
 #: tortoisehg/hgqt/workbench.py:1253
 #, python-format
 
 #: tortoisehg/util/bugtraq.py:133
 msgid "Error executing \"commit finished\" trigger"
-msgstr ""
+msgstr "Ошибка выполнения триггера \"commit finished\""
 
 #: tortoisehg/util/bugtraq.py:148
 msgid "Cannot open Plugin Options dialog"

File tortoisehg/hgqt/chunks.py

 # of the GNU General Public License, incorporated herein by reference.
 
 import cStringIO
-import os
+import os, re
 
 from mercurial import hg, util, patch, commands, cmdutil
 from mercurial import match as matchmod, ui as uimod
         except (patch.PatchError, EnvironmentError), err:
             ok = False
             self.showMessage.emit(hglib.tounicode(str(err)))
+        rejfilere = re.compile(r'\b%s\.rej\b' % re.escape(wfile))
         for line in ui.popbuffer().splitlines():
-            if line.endswith(wfile + '.rej'):
+            if rejfilere.search(line):
                 if qtlib.QuestionMsgBox(_('Manually resolve rejected chunks?'),
                                         hglib.tounicode(line) + u'<br><br>' +
                                         _('Edit patched file and rejects?'),

File tortoisehg/hgqt/clone.py

         rev = hglib.fromunicode(self.rev_text.text().trimmed())
         startrev = hglib.fromunicode(self.startrev_text.text().trimmed())
         if self.qclone_chk.isChecked():
+            cmdline = ['qclone']
             qclonedir = hglib.fromunicode(self.qclone_txt.text().trimmed())
-            if qclonedir == '':
-                qclonedir = '.hg\patches'
-                self.qclone_txt.setText(qclonedir)
-            cmdline = ['qclone']
-            if not qclonedir in ['.hg\patches', '.hg/patches', '']:
+            if qclonedir:
                 cmdline += ['--patches', qclonedir]
         else:
             cmdline = ['clone']
     def onBrowseQclone(self):
         FD = QFileDialog
         caption = _("Select patch folder")
-        upath = FD.getExistingDirectory(self, caption, \
-            self.qclone_txt.text(), QFileDialog.ShowDirsOnly)
+        upatchroot = os.path.join(unicode(self.src_combo.currentText()), '.hg')
+        upath = FD.getExistingDirectory(self, caption, upatchroot,
+                                        QFileDialog.ShowDirsOnly)
         if upath:
-            path = hglib.fromunicode(upath).replace('/', os.sep)
-            src = hglib.fromunicode(self.src_combo.currentText())
-            if not path.startswith(src):
-                qtlib.ErrorMsgBox('TortoiseHg QClone',
-                    _('The selected patch folder is not'
-                      ' under the source repository.'),
-                    '<p>src = %s</p><p>path = %s</p>' % (src, path))
-                return
-            path = path.replace(src + os.sep, '')
-            self.qclone_txt.setText(QDir.toNativeSeparators(hglib.tounicode(path)))
+            self.qclone_txt.setText(QDir.toNativeSeparators(upath))
             self.qclone_txt.setFocus()
         self.composeCommand()
 

File tortoisehg/hgqt/cmdui.py

         self.idle = True
 
     def setcounts(self, cur, max):
-        self.pbar.setMaximum(max)
-        self.pbar.setValue(cur)
+        # cur and max may exceed INT_MAX, which confuses QProgressBar
+        assert max != 0
+        self.pbar.setMaximum(100)
+        self.pbar.setValue(int(cur * 100 / max))
 
     def unknown(self):
         self.pbar.setMinimum(0)

File tortoisehg/hgqt/commit.py

         self.currentProgress = _('Rollback', 'start progress')
         self.progress.emit(*cmdui.startProgress(self.currentProgress, ''))
         self.commitButtonEnable.emit(False)
-        self.runner.run(['rollback'])
+        self.runner.run(['rollback', '--repository', self.repo.root])
         self.stopAction.setEnabled(True)
 
     def updateRecentMessages(self):

File tortoisehg/hgqt/customtools.py

             'To execute a mercurial command use "hg" (rather than "hg.exe") '
             'as the executable command.\n'
             'You can use {ROOT} as an alias of the current repository root and\n'
-            '{REV} as an alias of the selected revision.'))
+            '{REV} / {REVID} as an alias of the selected revision number / '
+            'hexadecimal identifier respectively.'))
         self.label = self._addConfigItem(vbox, _('Tool label'),
             QLineEdit(label),
             _('The tool label, which is what will be shown '

File tortoisehg/hgqt/hginit.py

         self.compose_command()
 
         # dialog settings
-        self.setWindowTitle(_('Init'))
+        self.setWindowTitle(_('New Repository'))
         self.setWindowIcon(qtlib.geticon('hg-init'))
         self.setWindowFlags(
                 self.windowFlags() & ~Qt.WindowContextHelpButtonHint)

File tortoisehg/hgqt/rejects.py

         self.editor.loadSettings(s, 'rejects/editor')
         self.rejectbrowser.loadSettings(s, 'rejects/rejbrowse')
 
-        f = QFile(path)
+        f = QFile(hglib.tounicode(path))
         if not f.open(QIODevice.ReadOnly):
             qtlib.ErrorMsgBox(_('Unable to merge rejects'),
                               _("Can't read this file (maybe deleted)"))
                 acceptresolution = True
 
         if acceptresolution:
-            f = QFile(self.path)
+            f = QFile(hglib.tounicode(self.path))
             f.open(QIODevice.WriteOnly)
             self.editor.write(f)
             self.saveSettings()

File tortoisehg/hgqt/rename.py

             cmdline = ['rename']
         cmdline += ['-R', self.repo.root]
         cmdline.append('-vf')
-        if self.isCaseFoldingOnWin():
-            cmdline.append('-A')
         cmdline.append(src)
         cmdline.append(dest)
         return cmdline
                     defaultbutton=QMessageBox.No)
             if not res:
                 return
+        if self.isCaseFoldingOnWin() and self.copy_chk.isChecked():
+            qtlib.ErrorMsgBox(self.errTitle,
+                _('Cannot do a pure casefolding copy on Windows'))
+            return
 
         cmdline = self.compose_command(src, dest)
         self.show_command(cmdline)
-        if self.isCaseFoldingOnWin():
-            # We do the rename ourselves if it's a pure casefolding
-            # action on Windows. Because there is no way to make Hg
-            # do 'hg mv foo Foo' correctly there.
-            if self.copy_chk.isChecked():
-                qtlib.ErrorMsgBox(self.errTitle,
-                        _('Cannot do a pure casefolding copy on Windows'))
-                return
-            else:
-                try:
-                    targetdir = os.path.dirname(fulldest)
-                    if not os.path.isdir(targetdir):
-                        os.makedirs(targetdir)
-                    os.rename(fullsrc, fulldest)
-                except (OSError, IOError), inst:
-                    if self.copy_chk.isChecked():
-                        txt = _('The following error was caught while copying:')
-                    else:
-                        txt = _('The following error was caught while renaming:')
-                    qtlib.ErrorMsgBox(self.errTitle, txt,
-                            hglib.tounicode(str(inst)))
-                    return
         self.cmd.run(cmdline)
 
     def detail_clicked(self):

File tortoisehg/hgqt/serve.ui

    </rect>
   </property>
   <property name="windowTitle">
-   <string>Serve</string>
+   <string>Web Server</string>
   </property>
   <layout class="QVBoxLayout" name="dialog_layout" stretch="0,1">
    <item>

File tortoisehg/hgqt/workbench.py

                   enabled='repoopen', menu='view', shortcut='Ctrl+/',
                   tooltip=_('Go to a specific revision'))
 
-        newaction(_("Web Server..."), self.serve, enabled='repoopen',
+        newaction(_("Start Web Server"), self.serve, enabled='repoopen',
                   menu='repository')
         newseparator(menu='repository')
         newaction(_("Shelve..."), self._repofwd('shelve'), icon='shelve',