1. TortoiseHg
  2. TortoiseHg
  3. thg

Commits

Wagner Bruna  committed 329985e

i18n: pull latest fr, ja and ru translations from Launchpad

  • Participants
  • Parent commits 4f0fd2a
  • Branches stable

Comments (0)

Files changed (3)

File i18n/tortoisehg/fr.po

View file
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-06-27 10:11-0300\n"
-"PO-Revision-Date: 2012-06-30 20:36+0000\n"
+"PO-Revision-Date: 2012-07-03 14:58+0000\n"
 "Last-Translator: André Sintzoff <Unknown>\n"
 "Language-Team: French <fr@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-07-01 04:42+0000\n"
-"X-Generator: Launchpad (build 15520)\n"
+"X-Launchpad-Export-Date: 2012-07-04 04:41+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 
 
 #: tortoisehg/hgqt/wctxactions.py:53
 msgid "View missing"
-msgstr ""
+msgstr "Afficher les fichiers manquants"
 
 #: tortoisehg/hgqt/wctxactions.py:55
 msgid "&Revert..."

File i18n/tortoisehg/ja.po

View file
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-06-27 10:11-0300\n"
-"PO-Revision-Date: 2012-07-01 12:31+0000\n"
-"Last-Translator: Yuya Nishihara <Unknown>\n"
+"PO-Revision-Date: 2012-07-09 06:39+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-07-02 04:40+0000\n"
-"X-Generator: Launchpad (build 15520)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:37+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 msgid "Exit"
 msgstr "終了"
 
-#: tortoisehg/hgqt/about.py:31
+#: tortoisehg/hgqt/about.py:31 tortoisehg/hgtk/gdialog.py:505
 msgid "About"
 msgstr "バージョン情報"
 
 msgid "Copyright 2008-2012 Steve Borho and others"
 msgstr "Copyright 2008-2012 Steve Borho 他"
 
-#: tortoisehg/hgqt/about.py:61
+#: tortoisehg/hgqt/about.py:61 tortoisehg/hgtk/about.py:42
 msgid "Several icons are courtesy of the TortoiseSVN project"
 msgstr "一部のアイコンは TortoiseSVN からの提供です"
 
 msgstr "ライセンス(&L)"
 
 #: tortoisehg/hgqt/about.py:86 tortoisehg/hgqt/archive.py:108
-#: tortoisehg/hgqt/hgemail_ui.py:294 tortoisehg/hgqt/hginit.py:58
+#: tortoisehg/hgqt/hgemail_ui.py:273 tortoisehg/hgqt/hginit.py:58
 #: tortoisehg/hgqt/license.py:45 tortoisehg/hgqt/postreview_ui.py:179
 #: tortoisehg/hgqt/rename.py:105
 msgid "&Close"
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
 msgstr "Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
 
-#: tortoisehg/hgqt/about.py:156
+#: tortoisehg/hgqt/about.py:156 tortoisehg/hgtk/about.py:70
 msgid "A new version of TortoiseHg is ready for download!"
 msgstr "新しいバージョンがダウンロード可能です!"
 
-#: tortoisehg/hgqt/archive.py:20
+#: tortoisehg/hgqt/archive.py:20 tortoisehg/hgtk/archive.py:18
 msgid "= Working Directory Parent ="
 msgstr "= 作業ディレクトリの親リビジョン ="
 
 #: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/backout.py:420
 #: tortoisehg/hgqt/bookmark.py:50 tortoisehg/hgqt/csinfo.py:105
 #: tortoisehg/hgqt/csinfo.py:106 tortoisehg/hgqt/cslist.py:86
-#: tortoisehg/hgqt/merge.py:454 tortoisehg/hgqt/tag.py:49
+#: tortoisehg/hgqt/merge.py:447 tortoisehg/hgqt/tag.py:49
+#: tortoisehg/hgtk/bookmark.py:75 tortoisehg/hgtk/csinfo.py:211
+#: tortoisehg/hgtk/csinfo.py:212 tortoisehg/hgtk/cslist.py:142
+#: tortoisehg/hgtk/tagadd.py:66
 msgid "Revision:"
 msgstr "リビジョン:"
 
-#: tortoisehg/hgqt/archive.py:46
+#: tortoisehg/hgqt/archive.py:46 tortoisehg/hgtk/archive.py:62
 msgid "Only files modified/created in this revision"
 msgstr "このリビジョンで更新・作成されたファイルのみ"
 
 #: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:68
-#: tortoisehg/hgqt/sync.py:1700
+#: tortoisehg/hgqt/sync.py:1538
 msgid "Recurse into subrepositories"
 msgstr "サブリポジトリを含む"
 
 #: tortoisehg/hgqt/archive.py:54 tortoisehg/hgqt/hginit.py:34
+#: tortoisehg/hgtk/archive.py:72 tortoisehg/hgtk/clone.py:106
 msgid "Destination path:"
 msgstr "保存先:"
 
 #: tortoisehg/hgqt/archive.py:58 tortoisehg/hgqt/clone.py:58
 #: tortoisehg/hgqt/clone.py:69 tortoisehg/hgqt/clone.py:138
 #: tortoisehg/hgqt/hginit.py:37 tortoisehg/hgqt/rename.py:70
-#: tortoisehg/hgqt/rename.py:74 tortoisehg/hgqt/thgimport.py:54
+#: tortoisehg/hgqt/rename.py:74 tortoisehg/hgqt/thgimport.py:53
+#: tortoisehg/hgtk/archive.py:69 tortoisehg/hgtk/clone.py:70
+#: tortoisehg/hgtk/hginit.py:55 tortoisehg/hgtk/thgconfig.py:394
+#: tortoisehg/hgtk/thgimport.py:63
 msgid "Browse..."
 msgstr "選択..."
 
-#: tortoisehg/hgqt/archive.py:65
+#: tortoisehg/hgqt/archive.py:65 tortoisehg/hgtk/archive.py:77
 msgid "Archive types:"
 msgstr "アーカイブの種類:"
 
 #: tortoisehg/hgqt/archive.py:69 tortoisehg/hgqt/archive.py:240
+#: tortoisehg/hgtk/archive.py:75
 msgid "Directory of files"
 msgstr "ディレクトリにファイルとして保存"
 
-#: tortoisehg/hgqt/archive.py:70
+#: tortoisehg/hgqt/archive.py:70 tortoisehg/hgtk/archive.py:83
 msgid "Uncompressed tar archive"
 msgstr "無圧縮の tar アーカイブ"
 
-#: tortoisehg/hgqt/archive.py:71
+#: tortoisehg/hgqt/archive.py:71 tortoisehg/hgtk/archive.py:84
 msgid "Tar archive compressed using bzip2"
 msgstr "bzip2 を使用した tar アーカイブ"
 
-#: tortoisehg/hgqt/archive.py:72
+#: tortoisehg/hgqt/archive.py:72 tortoisehg/hgtk/archive.py:85
 msgid "Tar archive compressed using gzip"
 msgstr "gzip を使用した tar アーカイブ"
 
-#: tortoisehg/hgqt/archive.py:73
+#: tortoisehg/hgqt/archive.py:73 tortoisehg/hgtk/archive.py:86
 msgid "Uncompressed zip archive"
 msgstr "無圧縮の zip アーカイブ"
 
-#: tortoisehg/hgqt/archive.py:74
+#: tortoisehg/hgqt/archive.py:74 tortoisehg/hgtk/archive.py:87
 msgid "Zip archive compressed using deflate"
 msgstr "deflate で圧縮した zip アーカイブ"
 
 msgstr "詳細(&D)"
 
 #: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/backout.py:300
-#: tortoisehg/hgqt/commit.py:415 tortoisehg/hgqt/commit.py:423
-#: tortoisehg/hgqt/commit.py:754 tortoisehg/hgqt/commit.py:822
-#: tortoisehg/hgqt/commit.py:850 tortoisehg/hgqt/compress.py:152
-#: tortoisehg/hgqt/lfprompt.py:23 tortoisehg/hgqt/merge.py:105
-#: tortoisehg/hgqt/merge.py:241 tortoisehg/hgqt/merge.py:319
-#: tortoisehg/hgqt/quickop.py:185 tortoisehg/hgqt/rebase.py:240
-#: tortoisehg/hgqt/rebase.py:261 tortoisehg/hgqt/rename.py:110
-#: tortoisehg/hgqt/reporegistry.py:208 tortoisehg/hgqt/resolve.py:356
-#: tortoisehg/hgqt/settings.py:1110 tortoisehg/hgqt/settings.py:1228
-#: tortoisehg/hgqt/wctxactions.py:267 tortoisehg/hgqt/wctxactions.py:280
-#: tortoisehg/hgqt/wctxactions.py:349
+#: tortoisehg/hgqt/commit.py:377 tortoisehg/hgqt/commit.py:385
+#: tortoisehg/hgqt/commit.py:690 tortoisehg/hgqt/commit.py:753
+#: tortoisehg/hgqt/commit.py:782 tortoisehg/hgqt/compress.py:150
+#: tortoisehg/hgqt/lfprompt.py:23 tortoisehg/hgqt/lfprompt.py:35
+#: tortoisehg/hgqt/merge.py:100 tortoisehg/hgqt/merge.py:235
+#: tortoisehg/hgqt/merge.py:312 tortoisehg/hgqt/quickop.py:187
+#: tortoisehg/hgqt/rebase.py:237 tortoisehg/hgqt/rebase.py:258
+#: tortoisehg/hgqt/rename.py:110 tortoisehg/hgqt/reporegistry.py:208
+#: tortoisehg/hgqt/resolve.py:356 tortoisehg/hgqt/settings.py:932
+#: tortoisehg/hgqt/settings.py:1047 tortoisehg/hgqt/wctxactions.py:269
+#: tortoisehg/hgqt/wctxactions.py:282 tortoisehg/hgqt/wctxactions.py:371
+#: tortoisehg/hgtk/shellconf.py:28 tortoisehg/hgtk/thgshelve.py:163
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: tortoisehg/hgqt/archive.py:168
+#: tortoisehg/hgqt/archive.py:168 tortoisehg/hgtk/archive.py:29
 #, python-format
 msgid "Archive - %s"
 msgstr "アーカイブ - %s"
 
 #: tortoisehg/hgqt/archive.py:193 tortoisehg/hgqt/hginit.py:106
-#: tortoisehg/hgqt/rename.py:204
+#: tortoisehg/hgqt/rename.py:204 tortoisehg/hgtk/archive.py:195
+#: tortoisehg/hgtk/clone.py:107 tortoisehg/hgtk/hginit.py:95
 msgid "Select Destination Folder"
 msgstr "保存先フォルダの選択"
 
 msgid "Open File"
 msgstr "ファイルを開く"
 
-#: tortoisehg/hgqt/archive.py:227
+#: tortoisehg/hgqt/archive.py:227 tortoisehg/hgtk/archive.py:171
 msgid "Tar archives"
 msgstr "tar アーカイブ"
 
-#: tortoisehg/hgqt/archive.py:230
+#: tortoisehg/hgqt/archive.py:230 tortoisehg/hgtk/archive.py:174
 msgid "Bzip2 tar archives"
 msgstr "bzip2 圧縮の tar アーカイブ"
 
-#: tortoisehg/hgqt/archive.py:233
+#: tortoisehg/hgqt/archive.py:233 tortoisehg/hgtk/archive.py:177
 msgid "Gzip tar archives"
 msgstr "gzip 圧縮の tar アーカイブ"
 
 msgstr "保存先のファイル「%s」は既に存在します!"
 
 #: tortoisehg/hgqt/archive.py:319 tortoisehg/hgqt/archive.py:326
+#: tortoisehg/hgtk/archive.py:213 tortoisehg/hgtk/archive.py:219
+#: tortoisehg/hgtk/gtklib.py:594 tortoisehg/hgtk/thgconfig.py:574
+#: tortoisehg/hgtk/thgconfig.py:1077
 msgid "Confirm Overwrite"
 msgstr "上書きの確認"
 
 "\n"
 "上書きしますか?"
 
-#: tortoisehg/hgqt/archive.py:327
+#: tortoisehg/hgqt/archive.py:327 tortoisehg/hgtk/gtklib.py:595
 #, python-format
 msgid ""
 "The file \"%s\" already exists!\n"
 msgid "Backout to the second parent of the merge revision"
 msgstr "マージリビジョンの二番目の親を打ち消す"
 
-#: tortoisehg/hgqt/backout.py:203 tortoisehg/hgqt/merge.py:160
+#: tortoisehg/hgqt/backout.py:203 tortoisehg/hgqt/merge.py:154
 msgid "Working directory status"
 msgstr "作業ディレクトリの状態"
 
 #: tortoisehg/hgqt/backout.py:209 tortoisehg/hgqt/compress.py:69
-#: tortoisehg/hgqt/merge.py:168 tortoisehg/hgqt/rebase.py:113
+#: tortoisehg/hgqt/merge.py:162 tortoisehg/hgqt/rebase.py:113
 msgid "Checking..."
 msgstr "確認中..."
 
 "href=\"shelve\"><b>シェルフ</b></a> 、または変更を <a href=\"discard\"><b>破棄</b></a> "
 "する必要があります。"
 
-#: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/merge.py:221
-#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1221
+#: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/merge.py:215
+#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1082
 #: tortoisehg/hgqt/update.py:103
 msgid "Automatically resolve merge conflicts where possible"
 msgstr "マージ衝突をできるだけ自動で解決"
 
-#: tortoisehg/hgqt/backout.py:274 tortoisehg/hgqt/merge.py:291
+#: tortoisehg/hgqt/backout.py:274 tortoisehg/hgqt/merge.py:285
 msgid "<b>Uncommitted local changes are detected</b>"
 msgstr "<b>コミットしていない変更がローカルにあります</b>"
 
-#: tortoisehg/hgqt/backout.py:278
+#: tortoisehg/hgqt/backout.py:278 tortoisehg/hgtk/recovery.py:52
 msgid "Clean"
 msgstr "クリーン"
 
-#: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:151
-#: tortoisehg/hgqt/merge.py:240 tortoisehg/hgqt/merge.py:318
-#: tortoisehg/hgqt/rebase.py:239 tortoisehg/hgqt/settings.py:1228
-#: tortoisehg/hgqt/update.py:321
+#: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:149
+#: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:311
+#: tortoisehg/hgqt/rebase.py:236 tortoisehg/hgqt/settings.py:1047
+#: tortoisehg/hgqt/update.py:263 tortoisehg/hgtk/thgconfig.py:775
+#: tortoisehg/hgtk/update.py:233
 msgid "&Discard"
 msgstr "破棄(&D)"
 
-#: tortoisehg/hgqt/backout.py:301 tortoisehg/hgqt/compress.py:153
-#: tortoisehg/hgqt/merge.py:320 tortoisehg/hgqt/rebase.py:241
+#: tortoisehg/hgqt/backout.py:301 tortoisehg/hgqt/compress.py:151
+#: tortoisehg/hgqt/merge.py:313 tortoisehg/hgqt/rebase.py:238
 msgid "Confirm Discard"
 msgstr "破棄の確認"
 
-#: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:154
-#: tortoisehg/hgqt/merge.py:321 tortoisehg/hgqt/rebase.py:242
+#: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:152
+#: tortoisehg/hgqt/merge.py:314 tortoisehg/hgqt/rebase.py:239
 msgid "Discard outstanding changes to working directory?"
 msgstr "作業ディレクトリのコミットしていない変更を破棄しますか?"
 
 msgid "Backing out, then merging..."
 msgstr "打ち消し、マージしています..."
 
-#: tortoisehg/hgqt/backout.py:328 tortoisehg/hgqt/merge.py:349
+#: tortoisehg/hgqt/backout.py:328 tortoisehg/hgqt/merge.py:342
 msgid "All conflicting files will be marked unresolved."
 msgstr "衝突したファイルは全て未解決として記録されました。"
 
 "Automatically advance to next page when backout and merge are complete."
 msgstr "打ち消しとマージが成功すると、自動的に次のページヘと移動します"
 
-#: tortoisehg/hgqt/backout.py:372 tortoisehg/hgqt/merge.py:402
+#: tortoisehg/hgqt/backout.py:372 tortoisehg/hgqt/merge.py:395
 #, python-format
 msgid ""
 "%d files have <b>merge conflicts</b> that must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
 msgstr "%d つのファイルで <b>マージ衝突</b> - <a href=\"resolve\"><b>解決する</b></a>"
 
-#: tortoisehg/hgqt/backout.py:377 tortoisehg/hgqt/merge.py:412
+#: tortoisehg/hgqt/backout.py:377 tortoisehg/hgqt/merge.py:405
 msgid "No merge conflicts, ready to commit"
 msgstr "マージ衝突なし。コミット可能。"
 
 msgid "Commit backout and merge results"
 msgstr "バックアウト・マージ結果をコミット"
 
-#: tortoisehg/hgqt/backout.py:422 tortoisehg/hgqt/matching.py:100
-#: tortoisehg/hgqt/merge.py:456
+#: tortoisehg/hgqt/backout.py:422 tortoisehg/hgqt/merge.py:449
+#: tortoisehg/hgtk/commit.py:236 tortoisehg/hgtk/history.py:66
+#: tortoisehg/hgtk/history.py:481 tortoisehg/hgtk/history.py:1223
 msgid "Parents"
 msgstr "親リビジョン"
 
-#: tortoisehg/hgqt/backout.py:426 tortoisehg/hgqt/merge.py:460
-#: tortoisehg/hgqt/repomodel.py:639 tortoisehg/hgqt/repomodel.py:641
-#: tortoisehg/hgqt/shelve.py:24 tortoisehg/hgqt/thgimport.py:88
+#: tortoisehg/hgqt/backout.py:426 tortoisehg/hgqt/merge.py:453
+#: tortoisehg/hgqt/repomodel.py:593 tortoisehg/hgqt/repomodel.py:595
+#: tortoisehg/hgqt/shelve.py:24 tortoisehg/hgqt/thgimport.py:87
 msgid "Working Directory"
 msgstr "作業ディレクトリ"
 
-#: tortoisehg/hgqt/backout.py:466 tortoisehg/hgqt/merge.py:497
+#: tortoisehg/hgqt/backout.py:466 tortoisehg/hgqt/merge.py:490
 msgid "Working Directory (merged)"
 msgstr "作業ディレクトリ (マージ)"
 
-#: tortoisehg/hgqt/backout.py:474 tortoisehg/hgqt/merge.py:505
+#: tortoisehg/hgqt/backout.py:474 tortoisehg/hgqt/merge.py:498
 msgid "Commit message"
 msgstr "コミットメッセージ"
 
-#: tortoisehg/hgqt/backout.py:498 tortoisehg/hgqt/merge.py:531
+#: tortoisehg/hgqt/backout.py:498 tortoisehg/hgqt/merge.py:522
 msgid "Skip final confirmation page, close after commit."
 msgstr "最後の確認ページをスキップし、コミットの後にウィンドウを閉じます。"
 
 msgstr "打ち消したマージチェンジセット: "
 
 #: tortoisehg/hgqt/backout.py:511 tortoisehg/hgqt/backout.py:545
+#: tortoisehg/hgtk/backout.py:41
 msgid "Backed out changeset: "
 msgstr "バックアウトしたチェンジセット: "
 
-#: tortoisehg/hgqt/backout.py:514 tortoisehg/hgqt/commit.py:669
-#: tortoisehg/hgqt/mq.py:821
+#: tortoisehg/hgqt/backout.py:514 tortoisehg/hgqt/commit.py:605
+#: tortoisehg/hgqt/mq.py:822 tortoisehg/hgtk/backout.py:139
+#: tortoisehg/hgtk/commit.py:580
 msgid "Confirm Discard Message"
 msgstr "コミットログの破棄"
 
-#: tortoisehg/hgqt/backout.py:515
+#: tortoisehg/hgqt/backout.py:515 tortoisehg/hgtk/backout.py:140
 msgid "Discard current backout message?"
 msgstr "バックアウトメッセージを破棄してもよろしいですか?"
 
-#: tortoisehg/hgqt/backout.py:524
+#: tortoisehg/hgqt/backout.py:524 tortoisehg/hgtk/backout.py:82
 msgid "Use English backout message"
 msgstr "英語メッセージを使用する"
 
 msgid "Please wait while making backout."
 msgstr "打ち消しが終わるまでしばらくお待ち下さい"
 
-#: tortoisehg/hgqt/backout.py:594 tortoisehg/hgqt/merge.py:584
+#: tortoisehg/hgqt/backout.py:594 tortoisehg/hgqt/merge.py:573
 msgid "Committing..."
 msgstr "コミット中..."
 
-#: tortoisehg/hgqt/backout.py:595 tortoisehg/hgqt/merge.py:585
+#: tortoisehg/hgqt/backout.py:595 tortoisehg/hgqt/merge.py:574
 msgid "Please wait while committing merged files."
 msgstr "ファイルをマージしている間しばらくお待ち下さい。"
 
 #: tortoisehg/hgqt/backout.py:620 tortoisehg/hgqt/cmdui.py:313
-#: tortoisehg/hgqt/merge.py:620
+#: tortoisehg/hgqt/merge.py:602 tortoisehg/hgtk/p4pending.py:101
 msgid "Finished"
 msgstr "完了"
 
 msgstr "既知の正常なリビジョン:"
 
 #: tortoisehg/hgqt/bisect.py:38 tortoisehg/hgqt/bisect.py:48
-#: tortoisehg/hgqt/repowidget.py:456
+#: tortoisehg/hgqt/repowidget.py:434 tortoisehg/hgtk/history.py:1875
 msgid "Accept"
 msgstr "取り込む"
 
 msgid "Skip this Revision"
 msgstr "このリビジョンを飛ばします"
 
-#: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:140
-#: tortoisehg/hgqt/rebase.py:203
+#: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:138
+#: tortoisehg/hgqt/rebase.py:200 tortoisehg/hgtk/bugreport.py:48
+#: tortoisehg/hgtk/hgcmd.py:50 tortoisehg/hgtk/thgmq.py:142
 msgid "Close"
 msgstr "閉じる"
 
 msgstr "このリビジョンをテストし、発見したものを報告する(good/bad/skip)"
 
 #: tortoisehg/hgqt/bisect.py:114 tortoisehg/hgqt/bisect.py:135
-#: tortoisehg/hgqt/commit.py:869 tortoisehg/hgqt/commit.py:1186
-#: tortoisehg/hgqt/commit.py:1206 tortoisehg/hgqt/hgignore.py:260
+#: tortoisehg/hgqt/commit.py:799 tortoisehg/hgqt/commit.py:1110
+#: tortoisehg/hgqt/commit.py:1130 tortoisehg/hgqt/hgignore.py:257
 #: tortoisehg/hgqt/hginit.py:179 tortoisehg/hgqt/status.py:483
-#: tortoisehg/hgqt/wctxactions.py:185
+#: tortoisehg/hgqt/wctxactions.py:187
 #, python-format
 msgid "%s (hint: %s)"
 msgstr "%s (ヒント: %s)"
 
-#: tortoisehg/hgqt/bookmark.py:57
+#: tortoisehg/hgqt/bookmark.py:57 tortoisehg/hgtk/bookmark.py:66
 msgid "Bookmark:"
 msgstr "ブックマーク:"
 
-#: tortoisehg/hgqt/bookmark.py:62
+#: tortoisehg/hgqt/bookmark.py:62 tortoisehg/hgtk/bookmark.py:78
 msgid "New Name:"
 msgstr "新しいブックマーク名:"
 
-#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:822
+#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:753
 #: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:56
 #: tortoisehg/hgqt/wctxactions.py:62
 msgid "&Add"
 msgid "Re&name"
 msgstr "名前変更(&N)"
 
-#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:850
+#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:782
 #: tortoisehg/hgqt/tag.py:99
 msgid "&Remove"
 msgstr "削除(&R)"
 msgid "&Move"
 msgstr "移動(&M)"
 
-#: tortoisehg/hgqt/bookmark.py:92
+#: tortoisehg/hgqt/bookmark.py:92 tortoisehg/hgtk/bookmark.py:34
 #, python-format
 msgid "Bookmark - %s"
 msgstr "ブックマーク - %s"
 msgstr "ブックマーク「%s」を移動しました"
 
 #: tortoisehg/hgqt/bookmark.py:191 tortoisehg/hgqt/bookmark.py:209
+#: tortoisehg/hgtk/bookmark.py:287
 #, python-format
 msgid "Bookmark '%s' does not exist"
 msgstr "ブックマーク \"%s\" は存在しません"
 msgid "%s - branch operation"
 msgstr "%s - ブランチ作業"
 
-#: tortoisehg/hgqt/branchop.py:29
+#: tortoisehg/hgqt/branchop.py:29 tortoisehg/hgtk/commit.py:47
 msgid "Select branch of merge commit"
 msgstr "マージコミットのブランチを選択"
 
-#: tortoisehg/hgqt/branchop.py:41
+#: tortoisehg/hgqt/branchop.py:41 tortoisehg/hgtk/commit.py:76
 msgid "Changes take effect on next commit"
 msgstr "変更は次のコミットで反映されます"
 
-#: tortoisehg/hgqt/branchop.py:46
+#: tortoisehg/hgqt/branchop.py:46 tortoisehg/hgtk/commit.py:59
 msgid "No branch changes"
 msgstr "ブランチを変更しない"
 
-#: tortoisehg/hgqt/branchop.py:47
+#: tortoisehg/hgqt/branchop.py:47 tortoisehg/hgtk/commit.py:61
 msgid "Open a new named branch"
 msgstr "新しくブランチを開始する"
 
 msgid "Please report this bug to our <a href=\"%s\">bug tracker</a>"
 msgstr "バグを <a href=\"%s\">バグトラッカー</a> へ報告しましょう"
 
-#: tortoisehg/hgqt/bugreport.py:44 tortoisehg/hgqt/qscilib.py:187
+#: tortoisehg/hgqt/bugreport.py:44 tortoisehg/hgqt/qscilib.py:181
 #: tortoisehg/hgqt/rename.py:166
 msgid "Copy"
 msgstr "コピー"
 msgid "Quit"
 msgstr "終了"
 
-#: tortoisehg/hgqt/bugreport.py:48
+#: tortoisehg/hgqt/bugreport.py:48 tortoisehg/hgtk/bugreport.py:25
 msgid "TortoiseHg Bug Report"
 msgstr "TortoiseHgバグ報告"
 
-#: tortoisehg/hgqt/bugreport.py:95
+#: tortoisehg/hgqt/bugreport.py:95 tortoisehg/hgtk/bugreport.py:87
 msgid "Save error report to"
 msgstr "バグ報告の保存"
 
 "report</a>."
 msgstr "もしまだ問題があれば、<a href=\"#bugreport\">バグレポートを作成してください</a>"
 
-#: tortoisehg/hgqt/chunks.py:89
+#: tortoisehg/hgqt/chunks.py:89 tortoisehg/hgqt/grep.py:566
+#: tortoisehg/hgqt/manifestdialog.py:207 tortoisehg/hgqt/revdetails.py:230
+#: tortoisehg/util/menuthg.py:76
 msgid "Visual Diff"
 msgstr "GUI 差分の表示"
 
-#: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:215
+#: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:208
 #: tortoisehg/hgqt/revdetails.py:231
 msgid "View file changes in external diff tool"
 msgstr "外部差分ツールを使ってファイルの変更を見る"
 
-#: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:225
+#: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:218
 #: tortoisehg/hgqt/revdetails.py:239
 msgid "Edit Local"
 msgstr "ローカルファイルをエディタで開く"
 
-#: tortoisehg/hgqt/chunks.py:92 tortoisehg/hgqt/manifestdialog.py:226
-#: tortoisehg/hgqt/manifestdialog.py:228 tortoisehg/hgqt/revdetails.py:240
+#: tortoisehg/hgqt/chunks.py:92 tortoisehg/hgqt/manifestdialog.py:219
+#: tortoisehg/hgqt/manifestdialog.py:221 tortoisehg/hgqt/revdetails.py:240
 #: tortoisehg/hgqt/revdetails.py:242
 msgid "Edit current file in working copy"
 msgstr "作業コピーのファイルを編集"
 
-#: tortoisehg/hgqt/chunks.py:93 tortoisehg/hgqt/manifestdialog.py:229
+#: tortoisehg/hgqt/chunks.py:93 tortoisehg/hgqt/manifestdialog.py:222
 #: tortoisehg/hgqt/revdetails.py:246
 msgid "Revert to Revision"
 msgstr "このリビジョンへ復旧"
 
-#: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:230
+#: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:223
 #: tortoisehg/hgqt/revdetails.py:247
 msgid "Revert file(s) to contents at this revision"
 msgstr "このリビジョンの内容にファイルを戻す"
 msgid "Patch failed to apply"
 msgstr "パッチ適用失敗"
 
-#: tortoisehg/hgqt/chunks.py:201 tortoisehg/hgqt/mq.py:244
-#: tortoisehg/hgqt/mq.py:749
+#: tortoisehg/hgqt/chunks.py:201 tortoisehg/hgqt/mq.py:245
+#: tortoisehg/hgqt/mq.py:750
 msgid "Manually resolve rejected chunks?"
 msgstr "失敗箇所を手修正しますか?"
 
 msgstr "選択したチャンク: %d / %d"
 
 #: tortoisehg/hgqt/clone.py:61 tortoisehg/hgqt/rename.py:66
-#: tortoisehg/hgqt/thgimport.py:63
+#: tortoisehg/hgqt/thgimport.py:62 tortoisehg/hgtk/thgimport.py:82
 msgid "Source:"
 msgstr "ソース:"
 
 #: tortoisehg/hgqt/clone.py:72 tortoisehg/hgqt/rename.py:71
+#: tortoisehg/hgtk/hginit.py:58
 msgid "Destination:"
 msgstr "ターゲット:"
 
-#: tortoisehg/hgqt/clone.py:95 tortoisehg/hgqt/commit.py:117
-#: tortoisehg/hgqt/merge.py:208 tortoisehg/hgqt/mq.py:621
+#: tortoisehg/hgqt/clone.py:95 tortoisehg/hgqt/commit.py:114
+#: tortoisehg/hgqt/merge.py:202 tortoisehg/hgqt/mq.py:622
 #: tortoisehg/hgqt/postreview_ui.py:170 tortoisehg/hgqt/rebase.py:57
-#: tortoisehg/hgqt/sync.py:177 tortoisehg/hgqt/tag.py:64
+#: tortoisehg/hgqt/sync.py:162 tortoisehg/hgqt/tag.py:64
+#: tortoisehg/hgtk/hgemail.py:64
 msgid "Options"
 msgstr "オプション"
 
-#: tortoisehg/hgqt/clone.py:127
+#: tortoisehg/hgqt/clone.py:127 tortoisehg/hgtk/clone.py:127
 msgid "Clone to revision:"
 msgstr "このリビジョンまでクローン:"
 
-#: tortoisehg/hgqt/clone.py:130
+#: tortoisehg/hgqt/clone.py:130 tortoisehg/hgtk/clone.py:141
 msgid "Do not update the new working directory"
 msgstr "作業ディレクトリを更新しない"
 
-#: tortoisehg/hgqt/clone.py:131
+#: tortoisehg/hgqt/clone.py:131 tortoisehg/hgtk/clone.py:142
 msgid "Use pull protocol to copy metadata"
 msgstr "メタデータのコピーにプル操作のプロトコルを使用する"
 
-#: tortoisehg/hgqt/clone.py:132
+#: tortoisehg/hgqt/clone.py:132 tortoisehg/hgtk/clone.py:143
 msgid "Use uncompressed transfer"
 msgstr "無圧縮でデータを転送する"
 
 msgid "Include patch queue"
 msgstr "パッチキューも含む"
 
-#: tortoisehg/hgqt/clone.py:141
+#: tortoisehg/hgqt/clone.py:141 tortoisehg/hgtk/clone.py:149
+#: tortoisehg/hgtk/history.py:467 tortoisehg/hgtk/synch.py:179
 msgid "Use proxy server"
 msgstr "プロキシサーバーを使用する"
 
 msgid "Do not verify host certificate"
 msgstr "ホスト証明書を検証しない"
 
-#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1725
+#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1563
+#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202
 msgid "Remote command:"
 msgstr "リモートコマンド:"
 
 msgstr "クローン(&C)"
 
 #: tortoisehg/hgqt/clone.py:183 tortoisehg/hgqt/cmdui.py:764
-#: tortoisehg/hgqt/thgimport.py:119 tortoisehg/hgqt/thgstrip.py:112
+#: tortoisehg/hgqt/thgimport.py:118 tortoisehg/hgqt/thgstrip.py:112
 #: tortoisehg/hgqt/update.py:147
 msgid "Detail"
 msgstr "詳細"
 
 #: tortoisehg/hgqt/clone.py:324 tortoisehg/hgqt/clone.py:348
 #: tortoisehg/hgqt/clone.py:355 tortoisehg/hgqt/clone.py:380
+#: tortoisehg/hgtk/clone.py:37
 msgid "TortoiseHg Clone"
 msgstr "TortoiseHg クローンツール"
 
 msgid "Please specify a different path."
 msgstr "違うパスを指定してください"
 
-#: tortoisehg/hgqt/clone.py:349
+#: tortoisehg/hgqt/clone.py:349 tortoisehg/hgtk/clone.py:288
 msgid "Source path is empty"
 msgstr "クローン元のパスが入力されていません"
 
 msgid "Please enter a valid source path."
 msgstr "正しいクローン元のパスを入力してください"
 
-#: tortoisehg/hgqt/clone.py:356
+#: tortoisehg/hgqt/clone.py:356 tortoisehg/hgtk/clone.py:294
 msgid "Source and destination are the same"
 msgstr "クローン元とクローン先が同一です"
 
 msgid "error while running command\n"
 msgstr "コマンド実行中にエラーが起きました\n"
 
-#: tortoisehg/hgqt/cmdui.py:298
+#: tortoisehg/hgqt/cmdui.py:298 tortoisehg/hgtk/statusbar.py:39
 msgid "Running..."
 msgstr "実行中..."
 
 msgid "TortoiseHg Command Dialog"
 msgstr "TortoiseHg コマンドダイアログ"
 
-#: tortoisehg/hgqt/cmdui.py:793 tortoisehg/hgqt/merge.py:106
-#: tortoisehg/hgqt/rebase.py:262 tortoisehg/hgqt/resolve.py:357
-#: tortoisehg/hgqt/settings.py:1107
+#: tortoisehg/hgqt/cmdui.py:793 tortoisehg/hgqt/merge.py:101
+#: tortoisehg/hgqt/rebase.py:259 tortoisehg/hgqt/resolve.py:357
+#: tortoisehg/hgqt/settings.py:929 tortoisehg/hgtk/commit.py:322
+#: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
 msgid "Confirm Exit"
 msgstr "終了"
 
 msgid "TortoiseHg"
 msgstr "TortoiseHg"
 
-#: tortoisehg/hgqt/commit.py:76
+#: tortoisehg/hgqt/commit.py:73
 msgctxt "window title"
 msgid "Commit"
 msgstr "コミット"
 
-#: tortoisehg/hgqt/commit.py:98
+#: tortoisehg/hgqt/commit.py:95
 msgid "Commit Dialog Toolbar"
 msgstr "コミットダイアログツールバー"
 
-#: tortoisehg/hgqt/commit.py:102 tortoisehg/hgqt/commit.py:561
+#: tortoisehg/hgqt/commit.py:99 tortoisehg/hgqt/commit.py:519
 msgid "Branch: "
 msgstr "ブランチ: "
 
-#: tortoisehg/hgqt/commit.py:110
+#: tortoisehg/hgqt/commit.py:107
 msgid "Copy message"
 msgstr "メッセージをコピーする"
 
-#: tortoisehg/hgqt/commit.py:112
+#: tortoisehg/hgqt/commit.py:109
 msgid "Copy one of the recent commit messages"
 msgstr "最近のコミットメッセージをコピーする"
 
 msgid "Please wait..."
 msgstr "しばらくお待ち下さい…"
 
-#: tortoisehg/hgqt/commit.py:134
+#: tortoisehg/hgqt/commit.py:125
 #, python-format
 msgid "Failed to load issue tracker '%s': %s"
 msgstr "課題管理の読み込みに失敗しました '%s': %s"
 
-#: tortoisehg/hgqt/commit.py:137 tortoisehg/hgqt/commit.py:503
-#: tortoisehg/hgqt/settings.py:368
+#: tortoisehg/hgqt/commit.py:124 tortoisehg/hgqt/commit.py:462
+#: tortoisehg/hgqt/settings.py:303
 msgid "Issue Tracker"
 msgstr "課題管理"
 
 msgid "Show Issues..."
 msgstr "課題を表示..."
 
-#: tortoisehg/hgqt/commit.py:149 tortoisehg/hgqt/grep.py:53
-#: tortoisehg/hgqt/serve_ui.py:87
+#: tortoisehg/hgqt/commit.py:135 tortoisehg/hgqt/grep.py:53
+#: tortoisehg/hgqt/serve_ui.py:87 tortoisehg/hgtk/datamine.py:54
+#: tortoisehg/hgtk/hgcmd.py:46 tortoisehg/hgtk/history.py:448
+#: tortoisehg/hgtk/recovery.py:48 tortoisehg/hgtk/serve.py:65
+#: tortoisehg/hgtk/synch.py:53
 msgid "Stop"
 msgstr "中止"
 
-#: tortoisehg/hgqt/commit.py:269
+#: tortoisehg/hgqt/commit.py:237
 msgid "Commit changes"
 msgstr "変更をコミット"
 
-#: tortoisehg/hgqt/commit.py:269
+#: tortoisehg/hgqt/commit.py:237 tortoisehg/hgtk/commit.py:653
+#: tortoisehg/hgtk/commit.py:950 tortoisehg/hgtk/commit.py:1014
+#: tortoisehg/hgtk/commit.py:1263 tortoisehg/hgtk/gdialog.py:485
+#: tortoisehg/hgtk/history.py:279 tortoisehg/hgtk/merge.py:136
+#: tortoisehg/hgtk/thgconfig.py:89
 msgid "Commit"
 msgstr "コミット"
 
 msgid "Amend"
 msgstr "改変"
 
-#: tortoisehg/hgqt/commit.py:274
+#: tortoisehg/hgqt/commit.py:238
 msgid "Create a new patch"
 msgstr "パッチを作成"
 
-#: tortoisehg/hgqt/commit.py:274 tortoisehg/hgqt/mq.py:975
+#: tortoisehg/hgqt/commit.py:238 tortoisehg/hgqt/mq.py:976
+#: tortoisehg/hgtk/commit.py:657
 msgid "QNew"
 msgstr "パッチ作成"
 
-#: tortoisehg/hgqt/commit.py:275
+#: tortoisehg/hgqt/commit.py:239
 msgid "Refresh current patch"
 msgstr "現行のパッチを更新"
 
-#: tortoisehg/hgqt/commit.py:275 tortoisehg/hgqt/mq.py:604
-#: tortoisehg/hgqt/mq.py:984
+#: tortoisehg/hgqt/commit.py:239 tortoisehg/hgqt/mq.py:605
+#: tortoisehg/hgqt/mq.py:985 tortoisehg/hgtk/commit.py:660
 msgid "QRefresh"
 msgstr "パッチ更新"
 
-#: tortoisehg/hgqt/commit.py:408
+#: tortoisehg/hgqt/commit.py:370 tortoisehg/hgtk/commit.py:1185
 msgid "Confirm Branch Change"
 msgstr "ブランチ変更確認"
 
-#: tortoisehg/hgqt/commit.py:409
+#: tortoisehg/hgqt/commit.py:371
 #, python-format
 msgid "Named branch \"%s\" already exists, last used in revision %d\n"
 msgstr "名前付きブランチ「%s」は既に存在します (最終リビジョンは %d)\n"
 
-#: tortoisehg/hgqt/commit.py:413
+#: tortoisehg/hgqt/commit.py:375
 msgid "Restart &Branch"
 msgstr "ブランチを切り直し(&B)"
 
-#: tortoisehg/hgqt/commit.py:414 tortoisehg/hgqt/commit.py:422
+#: tortoisehg/hgqt/commit.py:376 tortoisehg/hgqt/commit.py:384
 msgid "&Commit to current branch"
 msgstr "現行のブランチへコミット(&C)"
 
-#: tortoisehg/hgqt/commit.py:417 tortoisehg/hgqt/sync.py:1073
+#: tortoisehg/hgqt/commit.py:379 tortoisehg/hgqt/sync.py:952
+#: tortoisehg/hgtk/commit.py:1194
 msgid "Confirm New Branch"
 msgstr "新規ブランチの作成"
 
-#: tortoisehg/hgqt/commit.py:418
+#: tortoisehg/hgqt/commit.py:380
 #, python-format
 msgid "Create new named branch \"%s\" with this commit?\n"
 msgstr "このコミットで「%s」という名前付きブランチを開始しますか?\n"
 
-#: tortoisehg/hgqt/commit.py:421
+#: tortoisehg/hgqt/commit.py:383
 msgid "Create &Branch"
 msgstr "ブランチ作成(&B)"
 
-#: tortoisehg/hgqt/commit.py:454
+#: tortoisehg/hgqt/commit.py:414
 msgctxt "start progress"
 msgid "MQ Action"
 msgstr "MQアクション"
 
-#: tortoisehg/hgqt/commit.py:563
+#: tortoisehg/hgqt/commit.py:521
 msgid "Close Branch: "
 msgstr "ブランチを閉じる: "
 
-#: tortoisehg/hgqt/commit.py:565
+#: tortoisehg/hgqt/commit.py:523
 msgid "New Branch: "
 msgstr "新規ブランチ: "
 
 msgid "<b>Selected Options:</b> %s"
 msgstr "<b>選択したオプション:</b> %s"
 
-#: tortoisehg/hgqt/commit.py:592 tortoisehg/hgqt/revpanel.py:24
-#: tortoisehg/hgqt/update.py:87
+#: tortoisehg/hgqt/commit.py:535 tortoisehg/hgqt/revpanel.py:24
+#: tortoisehg/hgqt/update.py:87 tortoisehg/hgtk/changeset.py:581
+#: tortoisehg/hgtk/update.py:90
 msgid "Parent:"
 msgstr "親リビジョン:"
 
-#: tortoisehg/hgqt/commit.py:593 tortoisehg/hgqt/pbranch.py:879
+#: tortoisehg/hgqt/commit.py:536 tortoisehg/hgqt/pbranch.py:878
 msgid "Patch name:"
 msgstr "パッチ名:"
 
 msgid "Close %s branch"
 msgstr "%s ブランチを閉鎖"
 
-#: tortoisehg/hgqt/commit.py:628
+#: tortoisehg/hgqt/commit.py:563
 #, python-format
 msgid "Rollback commit to revision %d"
 msgstr "リビジョン %d にコミットを巻き戻す"
 
-#: tortoisehg/hgqt/commit.py:637
+#: tortoisehg/hgqt/commit.py:572
 msgid "Confirm Undo"
 msgstr "元に戻す確認"
 
-#: tortoisehg/hgqt/commit.py:642
+#: tortoisehg/hgqt/commit.py:577
 msgctxt "start progress"
 msgid "Rollback"
 msgstr "巻き戻し"
 
-#: tortoisehg/hgqt/commit.py:670 tortoisehg/hgqt/mq.py:822
+#: tortoisehg/hgqt/commit.py:606 tortoisehg/hgqt/mq.py:823
+#: tortoisehg/hgtk/commit.py:581
 msgid "Discard current commit message?"
 msgstr "現在のコミットメッセージを破棄してもよろしいですか?"
 
-#: tortoisehg/hgqt/commit.py:750
+#: tortoisehg/hgqt/commit.py:686
 msgid "Message Translation Failure"
 msgstr "メッセージの翻訳失敗"
 
-#: tortoisehg/hgqt/commit.py:751
+#: tortoisehg/hgqt/commit.py:687
 msgid ""
 "Unable to translate message to local encoding\n"
 "Consider setting HGENCODING environment variable\n"
 "HGENCODING 環境変数を設定してみてください。\n"
 "変換できない文字を \"?\" へ置き換えますか?\n"
 
-#: tortoisehg/hgqt/commit.py:754
+#: tortoisehg/hgqt/commit.py:690
 msgid "&Replace"
 msgstr "置き換え(&R)"
 
-#: tortoisehg/hgqt/commit.py:762 tortoisehg/hgqt/commit.py:775
+#: tortoisehg/hgqt/commit.py:698 tortoisehg/hgqt/commit.py:711
+#: tortoisehg/hgtk/commit.py:934 tortoisehg/hgtk/commit.py:1078
+#: tortoisehg/hgtk/commit.py:1097
 msgid "Nothing Commited"
 msgstr "何もコミットされませんでした"
 
-#: tortoisehg/hgqt/commit.py:763
+#: tortoisehg/hgqt/commit.py:699 tortoisehg/hgtk/commit.py:1079
+#: tortoisehg/hgtk/tagadd.py:225
 msgid "Please enter commit message"
 msgstr "コミットメッセージを入力してください"
 
-#: tortoisehg/hgqt/commit.py:776
+#: tortoisehg/hgqt/commit.py:712
 msgid ""
 "No issue link was found in the commit message.  The commit message should "
 "contain an issue link.  Configure this in the 'Issue Tracking' section of "
 msgstr ""
 "コミットメッセージの中に課題へのリンクがありません。コミットメッセージに課題へのリンクが必要です。これは設定の'課題管理'から変更できます。"
 
-#: tortoisehg/hgqt/commit.py:804
+#: tortoisehg/hgqt/commit.py:735
 msgid "No files checked"
 msgstr "なにもファイルが選択されていません"
 
-#: tortoisehg/hgqt/commit.py:805
+#: tortoisehg/hgqt/commit.py:736
 msgid "No modified files checkmarked for commit"
 msgstr "変更されたファイルが選択されていません"
 
-#: tortoisehg/hgqt/commit.py:820 tortoisehg/hgqt/lfprompt.py:16
+#: tortoisehg/hgqt/commit.py:751 tortoisehg/hgqt/lfprompt.py:16
+#: tortoisehg/hgqt/lfprompt.py:28
 msgid "Confirm Add"
 msgstr "追加の確認"
 
-#: tortoisehg/hgqt/commit.py:821
+#: tortoisehg/hgqt/commit.py:752
 msgid "Add selected untracked files?"
 msgstr "選択した管理下にないファイルを追加しますか?"
 
-#: tortoisehg/hgqt/commit.py:848 tortoisehg/hgqt/quickop.py:180
+#: tortoisehg/hgqt/commit.py:780 tortoisehg/hgqt/quickop.py:182
 msgid "Confirm Remove"
 msgstr "削除の確認"
 
-#: tortoisehg/hgqt/commit.py:849
+#: tortoisehg/hgqt/commit.py:781
 msgid "Remove selected deleted files?"
 msgstr "削除されたファイルを登録除外しますか?"
 
-#: tortoisehg/hgqt/commit.py:903
+#: tortoisehg/hgqt/commit.py:825
 msgctxt "start progress"
 msgid "Commit"
 msgstr "コミット"
 
-#: tortoisehg/hgqt/commit.py:939
+#: tortoisehg/hgqt/commit.py:863
 #, python-format
 msgid "%s - commit options"
 msgstr "%s - コミットオプション"
 
-#: tortoisehg/hgqt/commit.py:946
+#: tortoisehg/hgqt/commit.py:870
 msgid "Set username:"
 msgstr "ユーザー名を設定:"
 
-#: tortoisehg/hgqt/commit.py:973 tortoisehg/hgqt/commit.py:1020
-#: tortoisehg/hgqt/commit.py:1043 tortoisehg/hgqt/commit.py:1059
+#: tortoisehg/hgqt/commit.py:897 tortoisehg/hgqt/commit.py:944
+#: tortoisehg/hgqt/commit.py:967 tortoisehg/hgqt/commit.py:983
 msgid "Save in Repo"
 msgstr "レポに保存"
 
-#: tortoisehg/hgqt/commit.py:978
+#: tortoisehg/hgqt/commit.py:902
 msgid "Save Global"
 msgstr "全体に保存"
 
-#: tortoisehg/hgqt/commit.py:990
+#: tortoisehg/hgqt/commit.py:914
 msgid "Set Date:"
 msgstr "日時を設定:"
 
-#: tortoisehg/hgqt/commit.py:994
+#: tortoisehg/hgqt/commit.py:918 tortoisehg/hgtk/history.py:1589
+#: tortoisehg/hgtk/synch.py:148 tortoisehg/hgtk/update.py:128
 msgid "Update"
 msgstr "更新"
 
-#: tortoisehg/hgqt/commit.py:1013
+#: tortoisehg/hgqt/commit.py:937
 msgid "Push After Commit:"
 msgstr "コミット後にプッシュ"
 
-#: tortoisehg/hgqt/commit.py:1036
+#: tortoisehg/hgqt/commit.py:960
 msgid "Auto Includes:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1061
+#: tortoisehg/hgqt/commit.py:985
 msgid "Recurse into subrepositories (--subrepos)"
 msgstr "サブリポジトリも巡回 (--subrepos)"
 
-#: tortoisehg/hgqt/commit.py:1090
+#: tortoisehg/hgqt/commit.py:1014
 msgid "Unable to save username"
 msgstr "ユーザー名を保存できません"
 
-#: tortoisehg/hgqt/commit.py:1091 tortoisehg/hgqt/commit.py:1114
-#: tortoisehg/hgqt/commit.py:1137 tortoisehg/hgqt/commit.py:1160
-#: tortoisehg/hgqt/sync.py:1163 tortoisehg/hgqt/sync.py:1261
-#: tortoisehg/hgqt/sync.py:1339 tortoisehg/hgqt/sync.py:1522
+#: tortoisehg/hgqt/commit.py:1015 tortoisehg/hgqt/commit.py:1038
+#: tortoisehg/hgqt/commit.py:1061 tortoisehg/hgqt/commit.py:1084
+#: tortoisehg/hgqt/sync.py:1024 tortoisehg/hgqt/sync.py:1122
+#: tortoisehg/hgqt/sync.py:1192 tortoisehg/hgqt/sync.py:1360
 msgid "Iniparse must be installed."
 msgstr "Iniparseをインストールしてください。"
 
-#: tortoisehg/hgqt/commit.py:1106 tortoisehg/hgqt/commit.py:1129
-#: tortoisehg/hgqt/commit.py:1152 tortoisehg/hgqt/commit.py:1175
-#: tortoisehg/hgqt/settings.py:1456 tortoisehg/hgqt/sync.py:1173
-#: tortoisehg/hgqt/sync.py:1272 tortoisehg/hgqt/sync.py:1362
-#: tortoisehg/hgqt/sync.py:1561
+#: tortoisehg/hgqt/commit.py:1030 tortoisehg/hgqt/commit.py:1053
+#: tortoisehg/hgqt/commit.py:1076 tortoisehg/hgqt/commit.py:1099
+#: tortoisehg/hgqt/settings.py:1271 tortoisehg/hgqt/sync.py:1034
+#: tortoisehg/hgqt/sync.py:1133 tortoisehg/hgqt/sync.py:1210
+#: tortoisehg/hgqt/sync.py:1399 tortoisehg/hgtk/thgconfig.py:1654
 msgid "Unable to write configuration file"
 msgstr "設定ファイルに書き込めません"
 
-#: tortoisehg/hgqt/commit.py:1113
+#: tortoisehg/hgqt/commit.py:1037
 msgid "Unable to save after commit push"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1136
+#: tortoisehg/hgqt/commit.py:1060
 msgid "Unable to save auto include list"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1159
+#: tortoisehg/hgqt/commit.py:1083
 msgid "Unable to save recurse in subrepos."
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1190
+#: tortoisehg/hgqt/commit.py:1114
 msgid "Invalid date format"
 msgstr "日付の形式が不正です"
 
-#: tortoisehg/hgqt/commit.py:1210
+#: tortoisehg/hgqt/commit.py:1134
 msgid "No username configured"
 msgstr "ユーザー名が設定されていません"
 
-#: tortoisehg/hgqt/commit.py:1281
+#: tortoisehg/hgqt/commit.py:1210
 #, python-format
 msgid "%s - commit"
 msgstr "%s - コミット"
 msgid "Compress - %s"
 msgstr "圧縮 - %s"
 
-#: tortoisehg/hgqt/compress.py:101
+#: tortoisehg/hgqt/compress.py:99
 msgid ""
 "Before compress, you must <a href=\"commit\"><b>commit</b></a> or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 "圧縮の前に、<a href=\"commit\"><b>コミット</b></a>か変更を<a "
 "href=\"discard\"><b>破棄</b></a>する必要があります"
 
-#: tortoisehg/hgqt/compress.py:106
+#: tortoisehg/hgqt/compress.py:104
 msgid "You may continue the compress"
 msgstr "圧縮できます"
 
-#: tortoisehg/hgqt/compress.py:123
+#: tortoisehg/hgqt/compress.py:121
 msgid "Changes have been moved, you must now commit"
 msgstr "変更が移動しました。今すぐコミットしてください"
 
-#: tortoisehg/hgqt/compress.py:124 tortoisehg/hgqt/pbranch.py:872
+#: tortoisehg/hgqt/commit.py:1192 tortoisehg/hgqt/compress.py:122
+#: tortoisehg/hgqt/pbranch.py:871 tortoisehg/hgqt/repowidget.py:342
 msgctxt "action button"
 msgid "Commit"
 msgstr "コミット"
 
-#: tortoisehg/hgqt/compress.py:139
+#: tortoisehg/hgqt/compress.py:137
 msgid "Compress is complete, old history untouched"
 msgstr "圧縮が完了しました。古い履歴はなにも変更ありません"
 
-#: tortoisehg/hgqt/csinfo.py:48
+#: tortoisehg/hgqt/csinfo.py:48 tortoisehg/hgtk/csinfo.py:49
 msgid "must be specified repository"
 msgstr "リポジトリの指定は必須です"
 
-#: tortoisehg/hgqt/csinfo.py:85
+#: tortoisehg/hgqt/csinfo.py:85 tortoisehg/hgtk/csinfo.py:86
 msgid "must be specified 'type' in style"
 msgstr "スタイルには 'type' が必須です"
 
 #: tortoisehg/hgqt/csinfo.py:106 tortoisehg/hgqt/postreview_ui.py:165
-#: tortoisehg/hgqt/qfold.py:86 tortoisehg/hgqt/qreorder.py:89
+#: tortoisehg/hgqt/qfold.py:85 tortoisehg/hgqt/qreorder.py:89
+#: tortoisehg/hgtk/csinfo.py:212
 msgid "Summary:"
 msgstr "要約:"
 
-#: tortoisehg/hgqt/csinfo.py:107 tortoisehg/hgqt/csinfo.py:114
+#: tortoisehg/hgqt/csinfo.py:107 tortoisehg/hgqt/csinfo.py:113
+#: tortoisehg/hgtk/csinfo.py:213 tortoisehg/hgtk/csinfo.py:218
 msgid "User:"
 msgstr "ユーザー:"
 
 #: tortoisehg/hgqt/csinfo.py:107 tortoisehg/hgqt/csinfo.py:108
+#: tortoisehg/hgtk/csinfo.py:213 tortoisehg/hgtk/csinfo.py:214
 msgid "Date:"
 msgstr "日付:"
 
-#: tortoisehg/hgqt/csinfo.py:107
+#: tortoisehg/hgqt/csinfo.py:107 tortoisehg/hgtk/csinfo.py:213
 msgid "Age:"
 msgstr "経過時間:"
 
 #: tortoisehg/hgqt/csinfo.py:108 tortoisehg/hgqt/csinfo.py:110
-#: tortoisehg/hgqt/sync.py:1731
+#: tortoisehg/hgqt/sync.py:1569 tortoisehg/hgtk/csinfo.py:214
+#: tortoisehg/hgtk/csinfo.py:215
 msgid "Branch:"
 msgstr "ブランチ:"
 
 msgstr "閉じる:"
 
 #: tortoisehg/hgqt/csinfo.py:110 tortoisehg/hgqt/csinfo.py:111
+#: tortoisehg/hgtk/csinfo.py:215 tortoisehg/hgtk/csinfo.py:216
 msgid "Tags:"
 msgstr "タグ:"
 
 msgid "Graft:"
 msgstr "複製:"
 
-#: tortoisehg/hgqt/csinfo.py:112
+#: tortoisehg/hgqt/csinfo.py:111 tortoisehg/hgtk/csinfo.py:216
 msgid "Transplant:"
 msgstr "移植元:"
 
-#: tortoisehg/hgqt/csinfo.py:113
+#: tortoisehg/hgqt/csinfo.py:112 tortoisehg/hgtk/csinfo.py:217
 msgid "Perforce:"
 msgstr "Perforce:"
 
-#: tortoisehg/hgqt/csinfo.py:113
+#: tortoisehg/hgqt/csinfo.py:112 tortoisehg/hgtk/csinfo.py:217
 msgid "Subversion:"
 msgstr "Subversion:"
 
-#: tortoisehg/hgqt/csinfo.py:114
+#: tortoisehg/hgqt/csinfo.py:113
 msgid "Converted From:"
 msgstr "変換元:"
 
 #: tortoisehg/hgqt/cslist.py:48 tortoisehg/hgqt/cslist.py:130
+#: tortoisehg/hgtk/cslist.py:384
 msgid "No items to display"
 msgstr "表示する項目がありません"
 
-#: tortoisehg/hgqt/cslist.py:49
+#: tortoisehg/hgqt/cslist.py:49 tortoisehg/hgtk/cslist.py:91
 msgid "Use compact view"
 msgstr "コンパクト表示"
 
 #: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/revpanel.py:21
-#: tortoisehg/hgqt/revpanel.py:28
+#: tortoisehg/hgqt/revpanel.py:28 tortoisehg/hgtk/changeset.py:585
+#: tortoisehg/hgtk/cslist.py:143
 msgid "Patch:"
 msgstr "パッチ:"
 
-#: tortoisehg/hgqt/cslist.py:133
+#: tortoisehg/hgqt/cslist.py:133 tortoisehg/hgtk/cslist.py:409
 #, python-format
 msgid "Displaying %(count)d of %(total)d items"
 msgstr "%(total)d 件中 %(count)d 件を表示中"
 msgid "File is binary"
 msgstr "バイナリファイル"
 
-#: tortoisehg/hgqt/filedata.py:59 tortoisehg/hgqt/filedata.py:366
+#: tortoisehg/hgqt/filedata.py:59 tortoisehg/hgqt/filedata.py:370
 #, python-format
 msgid " <i>(renamed from %s)</i>"
 msgstr " <i>(改名元: %s)</i>"
 
-#: tortoisehg/hgqt/filedata.py:61 tortoisehg/hgqt/filedata.py:361
-#: tortoisehg/hgqt/filedata.py:371
+#: tortoisehg/hgqt/filedata.py:61 tortoisehg/hgqt/filedata.py:365
+#: tortoisehg/hgqt/filedata.py:375
 msgid " <i>(was added)</i>"
 msgstr " <i>(追加)</i>"
 
 msgid "Revision has changed to:"
 msgstr "リビジョンは以下の変更:"
 
-#: tortoisehg/hgqt/filedata.py:197 tortoisehg/hgqt/hgemail_ui.py:264
+#: tortoisehg/hgqt/filedata.py:197 tortoisehg/hgqt/hgemail_ui.py:247
+#: tortoisehg/hgtk/hgemail.py:86
 msgid "From:"
 msgstr "From:"
 
 "pull the missing revisions from its source repository."
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:220 tortoisehg/hgqt/settings.py:606
+#: tortoisehg/hgqt/filedata.py:220 tortoisehg/hgqt/settings.py:526
 msgid "Initial revision"
 msgstr "初期リビジョン"
 
 msgid "File History Log Columns"
 msgstr ""
 
-#: tortoisehg/hgqt/filedialogs.py:166 tortoisehg/hgqt/workbench.py:389
+#: tortoisehg/hgqt/filedialogs.py:166 tortoisehg/hgqt/workbench.py:346
 msgid "Back"
 msgstr "戻る"
 
-#: tortoisehg/hgqt/filedialogs.py:168 tortoisehg/hgqt/workbench.py:392
+#: tortoisehg/hgqt/filedialogs.py:168 tortoisehg/hgqt/workbench.py:349
 msgid "Forward"
 msgstr "進む"
 
 msgstr "親リビジョンとの差分..."
 
 #: tortoisehg/hgqt/filedialogs.py:199 tortoisehg/hgqt/filedialogs.py:685
-#: tortoisehg/hgqt/repowidget.py:1227
+#: tortoisehg/hgqt/repowidget.py:1168
 msgid "Diff to local..."
 msgstr "ローカルとの差分..."
 
 msgid "### regular expression search pattern ###"
 msgstr "### 正規表現での検索パターン ###"
 
-#: tortoisehg/hgqt/grep.py:44 tortoisehg/hgqt/qscilib.py:405
+#: tortoisehg/hgqt/grep.py:44 tortoisehg/hgqt/qscilib.py:347
+#: tortoisehg/hgtk/datamine.py:311 tortoisehg/hgtk/hgignore.py:60
 msgid "Regexp:"
 msgstr "正規表現:"
 
-#: tortoisehg/hgqt/grep.py:47 tortoisehg/hgqt/qscilib.py:412
+#: tortoisehg/hgqt/grep.py:47 tortoisehg/hgqt/qscilib.py:354
+#: tortoisehg/hgtk/datamine.py:330
 msgid "Ignore case"
 msgstr "大文字小文字を区別しない"
 
-#: tortoisehg/hgqt/grep.py:48 tortoisehg/hgqt/qscilib.py:391
-#: tortoisehg/hgqt/qscilib.py:416
+#: tortoisehg/hgqt/grep.py:48 tortoisehg/hgqt/qscilib.py:333
+#: tortoisehg/hgqt/qscilib.py:358 tortoisehg/hgtk/datamine.py:310
 msgid "Search"
 msgstr "検索"
 
 msgid "Report only the first match per file"
 msgstr "ファイルごとにマッチした最初の行のみ表示"
 
-#: tortoisehg/hgqt/grep.py:67
+#: tortoisehg/hgqt/grep.py:67 tortoisehg/hgtk/datamine.py:329
 msgid "Follow copies and renames"
 msgstr "コピーと名前変更を追跡"
 
-#: tortoisehg/hgqt/grep.py:78
+#: tortoisehg/hgqt/grep.py:78 tortoisehg/hgtk/datamine.py:313
 msgid "Includes:"
 msgstr "次を含む:"
 
-#: tortoisehg/hgqt/grep.py:80
+#: tortoisehg/hgqt/grep.py:80 tortoisehg/hgtk/datamine.py:315
 msgid "Excludes:"
 msgstr "次を含まない:"
 
 msgid "grep: %s\n"
 msgstr "grep: %s\n"
 
-#: tortoisehg/hgqt/grep.py:361 tortoisehg/hgqt/revset.py:390
+#: tortoisehg/hgqt/grep.py:361 tortoisehg/hgqt/revset.py:387
 #, python-format
 msgid "%d matches found"
 msgstr "%d 件見つかりました"
 
-#: tortoisehg/hgqt/grep.py:363 tortoisehg/hgqt/revset.py:392
+#: tortoisehg/hgqt/grep.py:363 tortoisehg/hgqt/revset.py:389
 msgid "No matches found"
 msgstr "見つかりませんでした"
 
-#: tortoisehg/hgqt/grep.py:428 tortoisehg/hgqt/grep.py:441
-#: tortoisehg/hgqt/grep.py:481
+#: tortoisehg/hgqt/grep.py:426 tortoisehg/hgqt/grep.py:439
+#: tortoisehg/hgqt/grep.py:479
 msgid "Searching"
 msgstr "検索中"
 
-#: tortoisehg/hgqt/grep.py:428
+#: tortoisehg/hgqt/grep.py:426
 msgid "history"
 msgstr "履歴"
 
-#: tortoisehg/hgqt/grep.py:440
+#: tortoisehg/hgqt/grep.py:438
 msgid "Interrupted"
 msgstr "中断されました"
 
-#: tortoisehg/hgqt/grep.py:482
+#: tortoisehg/hgqt/grep.py:480
 msgid "files"
 msgstr "ファイル"
 
-#: tortoisehg/hgqt/grep.py:501
+#: tortoisehg/hgqt/grep.py:499
 #, python-format
 msgid "Skipping %s, unable to read"
 msgstr "読めないため、 %s をスキップします。"
 
-#: tortoisehg/hgqt/grep.py:566
+#: tortoisehg/hgqt/grep.py:564
 msgid "View file"
 msgstr "ファイルを見る"
 
-#: tortoisehg/hgqt/grep.py:567
+#: tortoisehg/hgqt/grep.py:565
 msgid "View Changeset"
 msgstr "チェンジセットを見る"
 
 msgid "Diff to parent"
 msgstr "親リビジョンとの差分"
 
-#: tortoisehg/hgqt/grep.py:569
+#: tortoisehg/hgqt/grep.py:567
 msgid "Annotate file"
 msgstr "情報表示"
 
-#: tortoisehg/hgqt/grep.py:723
+#: tortoisehg/hgqt/grep.py:721 tortoisehg/hgtk/datamine.py:364
+#: tortoisehg/hgtk/datamine.py:654
 msgid "File"
 msgstr "ファイル"
 
-#: tortoisehg/hgqt/grep.py:723
+#: tortoisehg/hgqt/grep.py:721 tortoisehg/hgtk/datamine.py:652
 msgid "Line"
 msgstr "行"
 
-#: tortoisehg/hgqt/grep.py:723
+#: tortoisehg/hgqt/grep.py:721 tortoisehg/hgtk/datamine.py:363
+#: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441
 msgid "Rev"
 msgstr "リビジョン"
 
-#: tortoisehg/hgqt/grep.py:723 tortoisehg/hgqt/settings.py:795
-#: tortoisehg/hgqt/settings.py:938 tortoisehg/hgqt/settings.py:1038
+#: tortoisehg/hgqt/grep.py:721 tortoisehg/hgqt/settings.py:679
+#: tortoisehg/hgqt/settings.py:803 tortoisehg/hgqt/settings.py:868
+#: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655
+#: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502
+#: tortoisehg/hgtk/history.py:695 tortoisehg/hgtk/logview/treeview.py:512
+#: tortoisehg/hgtk/thgconfig.py:232 tortoisehg/hgtk/thgconfig.py:370
 msgid "User"
 msgstr "ユーザー名"
 
-#: tortoisehg/hgqt/grep.py:724
+#: tortoisehg/hgqt/grep.py:722
 msgid "Match Text"
 msgstr "発見した文字"
 
-#: tortoisehg/hgqt/guess.py:35
+#: tortoisehg/hgqt/guess.py:35 tortoisehg/hgtk/guess.py:40
 #, python-format
 msgid "Detect Copies/Renames in %s"
 msgstr "コピーまたは名前変更の検出 - %s"
 msgid "Uncheck to consider all revisioned files for copy sources"
 msgstr ""
 
-#: tortoisehg/hgqt/guess.py:96
+#: tortoisehg/hgqt/guess.py:96 tortoisehg/hgtk/guess.py:108
 msgid "Find Renames"
 msgstr "名前変更を検索"
 
 "%s と %s の内容が同じです\n"
 "\n"
 
-#: tortoisehg/hgqt/guess.py:302
+#: tortoisehg/hgqt/guess.py:302 tortoisehg/hgtk/datamine.py:656
+#: tortoisehg/hgtk/guess.py:145
 msgid "Source"
 msgstr "元ファイル"
 
-#: tortoisehg/hgqt/guess.py:302
+#: tortoisehg/hgqt/guess.py:302 tortoisehg/hgtk/guess.py:152
 msgid "Dest"
 msgstr "変更後"
 
 msgid "% Match"
 msgstr "類似度(%)"
 
-#: tortoisehg/hgqt/hgemail.py:318
+#: tortoisehg/hgqt/hgemail.py:264
 msgid "Sending Email"
 msgstr "メール送信中"
 
-#: tortoisehg/hgqt/hgemail.py:519
+#: tortoisehg/hgqt/hgemail.py:465
 msgid "use only one form to specify the revision"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail.py:529
+#: tortoisehg/hgqt/hgemail.py:475
 msgid "Failed to open Email dialog"
 msgstr "Emailダイアログを開けません"
 
-#: tortoisehg/hgqt/hgemail_ui.py:261 tortoisehg/hgqt/settings.py:801
+#: tortoisehg/hgqt/hgemail_ui.py:244 tortoisehg/hgqt/settings.py:685
+#: tortoisehg/hgtk/synch.py:78 tortoisehg/hgtk/thgconfig.py:238
 msgid "Email"
 msgstr "メール送信"
 
-#: tortoisehg/hgqt/hgemail_ui.py:262
+#: tortoisehg/hgqt/hgemail_ui.py:245 tortoisehg/hgtk/hgemail.py:76
 msgid "To:"
 msgstr "To:"
 
-#: tortoisehg/hgqt/hgemail_ui.py:263
+#: tortoisehg/hgqt/hgemail_ui.py:246 tortoisehg/hgtk/hgemail.py:81
 msgid "Cc:"
 msgstr "Cc:"
 
-#: tortoisehg/hgqt/hgemail_ui.py:265
+#: tortoisehg/hgqt/hgemail_ui.py:248 tortoisehg/hgtk/hgemail.py:90
 msgid "In-Reply-To:"
 msgstr "In-Reply-To:"
 
-#: tortoisehg/hgqt/hgemail_ui.py:266
+#: tortoisehg/hgqt/hgemail_ui.py:249 tortoisehg/hgtk/hgemail.py:92
 msgid "Message identifier to reply to, for threading"
 msgstr "メーラのスレッド表示で使用されるメッセージID"
 
-#: tortoisehg/hgqt/hgemail_ui.py:267
+#: tortoisehg/hgqt/hgemail_ui.py:250
 msgid "Flag:"
 msgstr "フラグ:"
 
-#: tortoisehg/hgqt/hgemail_ui.py:268
+#: tortoisehg/hgqt/hgemail_ui.py:251 tortoisehg/hgtk/hgemail.py:101
 msgid ""
 "Hg patches (as generated by export command) are compatible with most patch "
 "programs.  They include a header which contains the most important changeset "
 "Mercurial パッチ(export "
 "コマンドで生成される)は多くのパッチプログラムとの互換性があります。それらは最も重要なチェンジセットのメタデータを含みます。"
 
-#: tortoisehg/hgqt/hgemail_ui.py:269
+#: tortoisehg/hgqt/hgemail_ui.py:252 tortoisehg/hgtk/hgemail.py:98
 msgid "Send changesets as Hg patches"
 msgstr "Mercurialのパッチとして送信"
 
-#: tortoisehg/hgqt/hgemail_ui.py:270
+#: tortoisehg/hgqt/hgemail_ui.py:253 tortoisehg/hgtk/hgemail.py:109
 msgid ""
 "Git patches can describe binary files, copies, and permission changes, but "
 "recipients may not be able to use them if they are not using git or "
 "git パッチはバイナリファイルに対する様々な変更を取り扱うことが可能な一方で、受け取り側が git または Mercurial "
 "を使用していない場合はそれを取り扱うことができません。"
 
-#: tortoisehg/hgqt/hgemail_ui.py:271
+#: tortoisehg/hgqt/hgemail_ui.py:254 tortoisehg/hgtk/hgemail.py:106
 msgid "Use extended (git) patch format"
 msgstr "git 拡張形式を使う"
 
-#: tortoisehg/hgqt/hgemail_ui.py:272
+#: tortoisehg/hgqt/hgemail_ui.py:255 tortoisehg/hgtk/hgemail.py:117
 msgid ""
 "Stripping Mercurial header removes username and parent information.  Only "
 "useful if recipient is not using Mercurial (and does not like to see the "
 "ユーザー名や親チェンジセット情報などの Mecurial のヘッダを取り除きます。受取人が Mercurial "
 "を使用していない場合やヘッダを見る必要がないときに便利です。"
 
-#: tortoisehg/hgqt/hgemail_ui.py:273
+#: tortoisehg/hgqt/hgemail_ui.py:256 tortoisehg/hgtk/hgemail.py:114
 msgid "Plain, do not prepend Hg header"
 msgstr "プレーンテキスト (Mercurial ヘッダなし)"
 
-#: tortoisehg/hgqt/hgemail_ui.py:274
+#: tortoisehg/hgqt/hgemail_ui.py:257 tortoisehg/hgtk/hgemail.py:126
 msgid ""
 "Bundles store complete changesets in binary form. Upstream users can pull "
 "from them. This is the safest way to send changes to recipient Mercurial "
 "バイナリ形式で完全なチェンジセットを格納します。上流ユーザはそれらをPullできます。この方法はMercurialユーザの受取人に最も安全に変更を送信する"
 "方法です。"
 
-#: tortoisehg/hgqt/hgemail_ui.py:275
+#: tortoisehg/hgqt/hgemail_ui.py:258 tortoisehg/hgtk/hgemail.py:122
 msgid "Send single binary bundle, not patches"
 msgstr "単一のバイナリファイル(パッチではない)"
 
 msgid "body"
 msgstr "本文"
 
-#: tortoisehg/hgqt/hgemail_ui.py:278
+#: tortoisehg/hgqt/hgemail_ui.py:259 tortoisehg/hgtk/hgemail.py:137
 msgid "send patches as attachments"
 msgstr "パッチを添付ファイルとして送信する"
 
-#: tortoisehg/hgqt/hgemail_ui.py:279
+#: tortoisehg/hgqt/hgemail_ui.py:260 tortoisehg/hgtk/hgemail.py:135
 msgid "attach"
 msgstr "添付"
 
-#: tortoisehg/hgqt/hgemail_ui.py:280
+#: tortoisehg/hgqt/hgemail_ui.py:261 tortoisehg/hgtk/hgemail.py:140
 msgid "send patches as inline attachments"
 msgstr "パッチを本文に埋め込んで送信"
 
-#: tortoisehg/hgqt/hgemail_ui.py:281
+#: tortoisehg/hgqt/hgemail_ui.py:262 tortoisehg/hgtk/hgemail.py:138
 msgid "inline"
 msgstr "本文埋め込み"
 
-#: tortoisehg/hgqt/hgemail_ui.py:282
+#: tortoisehg/hgqt/hgemail_ui.py:263 tortoisehg/hgtk/hgemail.py:143
 msgid "add diffstat output to messages"
 msgstr "statusコマンドの出力を本文にする"
 
-#: tortoisehg/hgqt/hgemail_ui.py:283
+#: tortoisehg/hgqt/hgemail_ui.py:264 tortoisehg/hgtk/hgemail.py:141
 msgid "diffstat"
 msgstr "差分情報"
 
-#: tortoisehg/hgqt/hgemail_ui.py:284
+#: tortoisehg/hgqt/hgemail_ui.py:265 tortoisehg/hgtk/hgemail.py:232
 msgid ""
 "Patch series description is sent in initial summary email with [PATCH 0 of "
 "N] subject.  It should describe the effects of the entire patch series.  "
 "というタイトルで最初に送信されます。そのため送信するパッチ全体を説明する内容である必要があります。バンドルを送信する場合はメールタイトルと本文になります。"
 "メッセージヘッダに挿入されるフラグはカンマ区切りのタグ名で指定します。"
 
-#: tortoisehg/hgqt/hgemail_ui.py:285
+#: tortoisehg/hgqt/hgemail_ui.py:266
 msgid "Write patch series (bundle) description"
 msgstr "一連のパッチ(バンドル)の説明を書く"
 
-#: tortoisehg/hgqt/hgemail_ui.py:286
+#: tortoisehg/hgqt/hgemail_ui.py:267 tortoisehg/hgtk/hgemail.py:151
 msgid "Subject:"
 msgstr "件名:"
 
-#: tortoisehg/hgqt/hgemail_ui.py:287 tortoisehg/hgqt/postreview_ui.py:174
+#: tortoisehg/hgqt/hgemail_ui.py:268 tortoisehg/hgqt/postreview_ui.py:174
 msgid "Changesets"
 msgstr "チェンジセット"
 
 msgid "Select &None"
 msgstr "選択解除(&N)"
 
-#: tortoisehg/hgqt/hgemail_ui.py:290 tortoisehg/hgqt/wctxactions.py:42
+#: tortoisehg/hgqt/hgemail_ui.py:269 tortoisehg/hgqt/wctxactions.py:42
 #: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
+#: tortoisehg/hgtk/status.py:1243
 msgid "Edit"
 msgstr "編集"
 
-#: tortoisehg/hgqt/hgemail_ui.py:291
+#: tortoisehg/hgqt/hgemail_ui.py:270
 msgid "Preview"
 msgstr "プレビュー"
 
-#: tortoisehg/hgqt/hgemail_ui.py:292 tortoisehg/hgqt/postreview_ui.py:175
+#: tortoisehg/hgqt/hgemail_ui.py:271 tortoisehg/hgqt/postreview_ui.py:175
 msgid "&Settings"
 msgstr "設定(&S)"
 
-#: tortoisehg/hgqt/hgemail_ui.py:293
+#: tortoisehg/hgqt/hgemail_ui.py:272
 msgid "Send &Email"
 msgstr "メール送信(&E)"
 
-#: tortoisehg/hgqt/hgignore.py:37
+#: tortoisehg/hgqt/hgignore.py:36 tortoisehg/hgtk/hgignore.py:34
 #, python-format
 msgid "Ignore filter - %s"
 msgstr "無視ファイルフィルタ - %s"
 
-#: tortoisehg/hgqt/hgignore.py:47
+#: tortoisehg/hgqt/hgignore.py:46
 msgid "Glob"
 msgstr "グロブ"
 
-#: tortoisehg/hgqt/hgignore.py:47
+#: tortoisehg/hgqt/hgignore.py:46
 msgid "Regexp"
 msgstr "正規表現"
 
-#: tortoisehg/hgqt/hgignore.py:54 tortoisehg/hgqt/qqueue.py:91
+#: tortoisehg/hgqt/hgignore.py:53 tortoisehg/hgqt/qqueue.py:91
 #: tortoisehg/hgqt/quickop.py:20 tortoisehg/hgqt/tag.py:186
 #: tortoisehg/hgqt/webconf.py:246 tortoisehg/hgqt/webconf_ui.py:78
+#: tortoisehg/hgtk/bookmark.py:45 tortoisehg/hgtk/hgignore.py:50
+#: tortoisehg/hgtk/hgignore.py:58 tortoisehg/hgtk/quickop.py:19
+#: tortoisehg/hgtk/tagadd.py:39
 msgid "Add"
 msgstr "追加"
 
-#: tortoisehg/hgqt/hgignore.py:73 tortoisehg/hgqt/resolve.py:128
-#: tortoisehg/hgqt/settings.py:1160
+#: tortoisehg/hgqt/hgignore.py:72 tortoisehg/hgqt/resolve.py:128
+#: tortoisehg/hgqt/settings.py:979 tortoisehg/hgtk/hgignore.py:77
+#: tortoisehg/hgtk/thgconfig.py:676
 msgid "Edit File"
 msgstr "ファイルを開く"
 
-#: tortoisehg/hgqt/hgignore.py:85
+#: tortoisehg/hgqt/hgignore.py:84
 msgid "<b>Ignore Filter</b>"
 msgstr "<b>無視ファイルフィルタ</b>"
 
-#: tortoisehg/hgqt/hgignore.py:92
+#: tortoisehg/hgqt/hgignore.py:91
 msgid "<b>Untracked Files</b>"
 msgstr "<b>未バージョン管理ファイル</b>"
 
-#: tortoisehg/hgqt/hgignore.py:106
+#: tortoisehg/hgqt/hgignore.py:105
 msgid "Backspace or Del to remove row(s)"
 msgstr "列を削除するにはBackspaceかDelキーを押してください"
 
-#: tortoisehg/hgqt/hgignore.py:150
+#: tortoisehg/hgqt/hgignore.py:149
 msgid "Add ignore filter..."
 msgstr "無視ファイルフィルタを追加..."
 
-#: tortoisehg/hgqt/hgignore.py:168
+#: tortoisehg/hgqt/hgignore.py:167
 msgid "selected files"
 msgstr "選択したファイル"
 
-#: tortoisehg/hgqt/hgignore.py:169
+#: tortoisehg/hgqt/hgignore.py:168
 msgid "Ignore "
 msgstr "無視 "
 
-#: tortoisehg/hgqt/hgignore.py:221
+#: tortoisehg/hgqt/hgignore.py:220 tortoisehg/hgtk/hgignore.py:197
 msgid "Invalid glob expression"
 msgstr "無効な glob です"
 
-#: tortoisehg/hgqt/hgignore.py:231
+#: tortoisehg/hgqt/hgignore.py:230 tortoisehg/hgtk/hgignore.py:213
 msgid "Invalid regexp expression"
 msgstr "無効な正規表現です"
 
-#: tortoisehg/hgqt/hgignore.py:256 tortoisehg/hgqt/hgignore.py:263
+#: tortoisehg/hgqt/hgignore.py:253 tortoisehg/hgqt/hgignore.py:260
 msgid "Unable to read repository status"
 msgstr "リポジトリの状態を読み込めません"
 
-#: tortoisehg/hgqt/hgignore.py:295
+#: tortoisehg/hgqt/hgignore.py:292
 msgid "New file created"
 msgstr "新しいファイルが作成されました"
 
-#: tortoisehg/hgqt/hgignore.py:296
+#: tortoisehg/hgqt/hgignore.py:293
 msgid ""
 "TortoiseHg has created a new .hgignore file.  Would you like to add this "
 "file to the source code control repository?"
 msgstr "TortoiseHgは新しく .hgignore ファイルを作成しました。このファイルをリポジトリ管理下に追加しますか?"
 
-#: tortoisehg/hgqt/hgignore.py:305
+#: tortoisehg/hgqt/hgignore.py:302 tortoisehg/hgtk/hgignore.py:261
 msgid "Unable to write .hgignore file"
 msgstr ".hgignoreファイルに書き込めません"
 
-#: tortoisehg/hgqt/hginit.py:45
+#: tortoisehg/hgqt/hginit.py:45 tortoisehg/hgtk/hginit.py:62
 msgid "Add special files (.hgignore, ...)"
 msgstr "特殊ファイルを追加する (.hgignoreなど)"
 
 msgid "Show in Workbench after init"
 msgstr "作成後にWorkbenchに追加する"
 
-#: tortoisehg/hgqt/hginit.py:56
+#: tortoisehg/hgqt/hginit.py:56 tortoisehg/hgtk/hginit.py:30
 msgid "Create"
 msgstr "作成"
 
 msgid "Error executing init"
 msgstr "作成でエラーが起きました"
 
-#: tortoisehg/hgqt/hginit.py:128
+#: tortoisehg/hgqt/hginit.py:128 tortoisehg/hgtk/hginit.py:106
 msgid "Destination path is empty"
 msgstr "リポジトリを作成する場所を指定してください"
 
-#: tortoisehg/hgqt/hginit.py:129
+#: tortoisehg/hgqt/hginit.py:129 tortoisehg/hgtk/hginit.py:107
 msgid "Please enter the directory path"
 msgstr "ディレクトリパスを入力してください"
 
 msgid "Cannot create folder %s"
 msgstr "%s というフォルダを作成できません"
 
-#: tortoisehg/hgqt/hginit.py:174
+#: tortoisehg/hgqt/hginit.py:174 tortoisehg/hgtk/hginit.py:121
 msgid "Unable to create new repository"
 msgstr "新しいリポジトリの作成に失敗しました"
 
 #: tortoisehg/hgqt/hginit.py:184 tortoisehg/hgqt/hginit.py:189
+#: tortoisehg/hgtk/hginit.py:125 tortoisehg/hgtk/hginit.py:130
 msgid "Error when creating repository"
 msgstr "リポジトリ作成中にエラーが発生しました"
 
 msgid "Add as &Largefiles"
 msgstr "大容量ファイルとして追加 (&L)"
 
-#: tortoisehg/hgqt/lfprompt.py:23
+#: tortoisehg/hgqt/lfprompt.py:23 tortoisehg/hgqt/lfprompt.py:35
 msgid "Add as &Normal Files"
 msgstr "通常ファイルとして追加 (&N)"
 
 msgid "Drag to change order"
 msgstr "順番を変えるにはドラッグしてください"
 
-#: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:595
-#: tortoisehg/hgqt/workbench.py:795 tortoisehg/util/menuthg.py:46
+#: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:520
+#: tortoisehg/hgqt/workbench.py:697 tortoisehg/util/menuthg.py:46
 msgid "Workbench"
 msgstr "ワークベンチ"
 
 msgid "Manifest %s@%s"
 msgstr "マニフェスト %s@%s"
 
-#: tortoisehg/hgqt/manifestdialog.py:196 tortoisehg/hgqt/status.py:103
+#: tortoisehg/hgqt/manifestdialog.py:190 tortoisehg/hgqt/status.py:103
 msgid "### filter text ###"
 msgstr "### 抽出する文字列 ###"
 
-#: tortoisehg/hgqt/manifestdialog.py:198 tortoisehg/hgqt/status.py:105
+#: tortoisehg/hgqt/manifestdialog.py:192 tortoisehg/hgqt/status.py:105
 msgid "Filter:"
 msgstr "フィルター:"
 
-#: tortoisehg/hgqt/manifestdialog.py:205 tortoisehg/hgqt/pbranch.py:657
+#: tortoisehg/hgqt/manifestdialog.py:198 tortoisehg/hgtk/thgmq.py:862
 msgid "Status"
 msgstr "状態"
 
-#: tortoisehg/hgqt/manifestdialog.py:210 tortoisehg/hgqt/revdetails.py:226
+#: tortoisehg/hgqt/manifestdialog.py:203 tortoisehg/hgqt/revdetails.py:226
 msgid "File history"
 msgstr "ファイルの変更履歴"
 
-#: tortoisehg/hgqt/manifestdialog.py:211 tortoisehg/hgqt/revdetails.py:227
+#: tortoisehg/hgqt/manifestdialog.py:204 tortoisehg/hgqt/revdetails.py:227
 msgid "Show the history of the selected file"
 msgstr "選択したファイルの履歴を表示する"
 
-#: tortoisehg/hgqt/manifestdialog.py:212 tortoisehg/hgqt/revdetails.py:228
+#: tortoisehg/hgqt/manifestdialog.py:205 tortoisehg/hgqt/revdetails.py:228
 msgid "Compare file revisions"
 msgstr "ファイルのリビジョンを比較"
 
-#: tortoisehg/hgqt/manifestdialog.py:213 tortoisehg/hgqt/revdetails.py:229
+#: tortoisehg/hgqt/manifestdialog.py:206 tortoisehg/hgqt/revdetails.py:229
 msgid "Compare revisions of the selected file"
 msgstr "選択したファイルのリビジョンを比較する"
 
 msgid "Diff to local"
 msgstr "ローカルとの差分"
 
-#: tortoisehg/hgqt/manifestdialog.py:217 tortoisehg/hgqt/revdetails.py:233
+#: tortoisehg/hgqt/manifestdialog.py:210 tortoisehg/hgqt/revdetails.py:233
 msgid "View changes to current in external diff tool"
 msgstr "外部差分ツールで現在のリビジョンに対する差分を表示する"
 
-#: tortoisehg/hgqt/manifestdialog.py:219 tortoisehg/hgqt/revdetails.py:235
+#: tortoisehg/hgqt/manifestdialog.py:212 tortoisehg/hgqt/revdetails.py:235
 msgid "View at Revision"
 msgstr "エディタで表示"
 
-#: tortoisehg/hgqt/manifestdialog.py:220 tortoisehg/hgqt/revdetails.py:236
+#: tortoisehg/hgqt/manifestdialog.py:213 tortoisehg/hgqt/revdetails.py:236
 msgid "View file as it appeared at this revision"
 msgstr ""
 
-#: tortoisehg/hgqt/manifestdialog.py:221
+#: tortoisehg/hgqt/manifestdialog.py:214
 msgid "Open at Revision"
 msgstr "このリビジョンで開く"
 
-#: tortoisehg/hgqt/manifestdialog.py:222
+#: tortoisehg/hgqt/manifestdialog.py:215
 msgid "Open file as it appeared at this revision"
 msgstr ""
 
-#: tortoisehg/hgqt/manifestdialog.py:223 tortoisehg/hgqt/revdetails.py:237
+#: tortoisehg/hgqt/manifestdialog.py:216 tortoisehg/hgqt/revdetails.py:237
 msgid "Save at Revision"
 msgstr "このリビジョンを保存"
 
-#: tortoisehg/hgqt/manifestdialog.py:224 tortoisehg/hgqt/revdetails.py:238
+#: tortoisehg/hgqt/manifestdialog.py:217 tortoisehg/hgqt/revdetails.py:238
 msgid "Save file as it appeared at this revision"
 msgstr ""
 
-#: tortoisehg/hgqt/manifestdialog.py:227 tortoisehg/hgqt/revdetails.py:241
+#: tortoisehg/hgqt/manifestdialog.py:220 tortoisehg/hgqt/revdetails.py:241
 msgid "Open Local"
 msgstr ""
 
-#: tortoisehg/hgqt/manifestdialog.py:232 tortoisehg/hgqt/revdetails.py:249
+#: tortoisehg/hgqt/manifestdialog.py:225 tortoisehg/hgqt/revdetails.py:249
 #: tortoisehg/hgqt/wctxactions.py:45
 msgid "Open subrepository"
 msgstr "サブリポジトリを開く"
 
-#: tortoisehg/hgqt/manifestdialog.py:233 tortoisehg/hgqt/revdetails.py:250
+#: tortoisehg/hgqt/manifestdialog.py:226 tortoisehg/hgqt/revdetails.py:250
 #: tortoisehg/hgqt/revdetails.py:253
 msgid "Open the selected subrepository"
 msgstr "選択したサブリポジトリを開く"
 
-#: tortoisehg/hgqt/manifestdialog.py:235 tortoisehg/hgqt/revdetails.py:252
+#: tortoisehg/hgqt/manifestdialog.py:228 tortoisehg/hgqt/revdetails.py:252
 #: tortoisehg/hgqt/wctxactions.py:47
 msgid "Explore subrepository"
 msgstr "サブリポジトリをエクスプローラで開く"
 
-#: tortoisehg/hgqt/manifestdialog.py:237
+#: tortoisehg/hgqt/manifestdialog.py:230
 msgid "Open the selected subrepository in a file browser"
 msgstr "ファイルブラウザで選択したサブリポジトリを開きます"
 
-#: tortoisehg/hgqt/manifestdialog.py:239 tortoisehg/hgqt/revdetails.py:255
+#: tortoisehg/hgqt/manifestdialog.py:232 tortoisehg/hgqt/revdetails.py:255
 #: tortoisehg/hgqt/wctxactions.py:49
 msgid "Open terminal in subrepository"
 msgstr "サブリポジトリをターミナルで開く"
 
-#: tortoisehg/hgqt/manifestdialog.py:241 tortoisehg/hgqt/revdetails.py:257
+#: tortoisehg/hgqt/manifestdialog.py:234 tortoisehg/hgqt/revdetails.py:257
 msgid "Open a shell terminal in the selected subrepository root"
 msgstr "選択したサブリポジトリのトップでシェルターミナルを開きます"
 
-#: tortoisehg/hgqt/manifestdialog.py:344 tortoisehg/hgqt/revdetails.py:394
+#: tortoisehg/hgqt/manifestdialog.py:343 tortoisehg/hgqt/revdetails.py:381
 #, python-format
 msgid "Hg file log viewer - %s"
 msgstr "Hg ファイルログビューアー - %s"
 
-#: tortoisehg/hgqt/manifestdialog.py:357 tortoisehg/hgqt/revdetails.py:408
-#: tortoisehg/hgqt/wctxactions.py:238
+#: tortoisehg/hgqt/manifestdialog.py:356 tortoisehg/hgqt/revdetails.py:395
+#: tortoisehg/hgqt/wctxactions.py:240
 msgid "Cannot open subrepository"
 msgstr "サブディレクトリを開けません"
 
-#: tortoisehg/hgqt/manifestdialog.py:358 tortoisehg/hgqt/revdetails.py:409
-#: tortoisehg/hgqt/wctxactions.py:239
+#: tortoisehg/hgqt/manifestdialog.py:357 tortoisehg/hgqt/revdetails.py:396
+#: tortoisehg/hgqt/wctxactions.py:241
 msgid "The selected subrepository does not exist on the working directory"
 msgstr ""
 
-#: tortoisehg/hgqt/manifestdialog.py:575
+#: tortoisehg/hgqt/manifestdialog.py:589
 msgid "Failed to open Manifest dialog"
 msgstr "マニフェストダイアログを開けませんでした"
 
 msgid "Summary (first description line)"
 msgstr "サマリー(コミットログの最初の行)"
 
-#: tortoisehg/hgqt/matching.py:88 tortoisehg/hgqt/settings.py:744
+#: tortoisehg/hgqt/settings.py:628 tortoisehg/hgtk/thgconfig.py:183
+#: tortoisehg/hgtk/thgconfig.py:745
 msgid "Description"
 msgstr "説明"
 
 msgid "Author"
 msgstr "作成者"
 
-#: tortoisehg/hgqt/matching.py:96
+#: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:499
 msgid "Date"
 msgstr "日付"
 
-#: tortoisehg/hgqt/matching.py:97
+#: tortoisehg/hgtk/hgignore.py:132
 msgid "Files"
 msgstr "ファイル"
 
 msgid "Subrepo states"
 msgstr "サブリポジトリの状態"
 
-#: tortoisehg/hgqt/matching.py:99 tortoisehg/hgqt/repofilter.py:221
+#: tortoisehg/hgqt/repofilter.py:211 tortoisehg/hgtk/history.py:487
+#: tortoisehg/hgtk/logview/treeview.py:478
 msgid "Branch"
 msgstr "ブランチ"
 
 msgid "Merge - %s"
 msgstr "マージ - %s"
 
-#: tortoisehg/hgqt/merge.py:101
+#: tortoisehg/hgqt/merge.py:96
 msgid "Do you want to exit?"
 msgstr "終了しますか?"
 
-#: tortoisehg/hgqt/merge.py:102
+#: tortoisehg/hgqt/merge.py:97
 msgid "To finish merging, you need to commit the working directory."
 msgstr "マージを完了するには、作業ディレクトリの内容をコミットしてください。"
 
-#: tortoisehg/hgqt/merge.py:104 tortoisehg/hgqt/rebase.py:260
+#: tortoisehg/hgqt/merge.py:99 tortoisehg/hgqt/rebase.py:257
 msgid "&Exit"
 msgstr "終了(&E)"
 
-#: tortoisehg/hgqt/merge.py:124
+#: tortoisehg/hgqt/merge.py:118
 msgid "Prepare to merge"
 msgstr "マージの準備"
 
-#: tortoisehg/hgqt/merge.py:125
+#: tortoisehg/hgqt/merge.py:119
 msgid "Verify merge targets and ensure your working directory is clean."
 msgstr "マージ対象を確認し、作業領域がクリーンな状態なことを確実にしてください"
 
-#: tortoisehg/hgqt/merge.py:134 tortoisehg/hgqt/repomodel.py:645
-#: tortoisehg/hgqt/revpanel.py:159
+#: tortoisehg/hgqt/merge.py:128 tortoisehg/hgqt/repomodel.py:599
+#: tortoisehg/hgqt/revpanel.py:159 tortoisehg/hgtk/merge.py:73
 msgid "Not a head revision!"
 msgstr "HEAD リビジョンではありません!"
 
-#: tortoisehg/hgqt/merge.py:141
+#: tortoisehg/hgqt/merge.py:135
 msgid "Merge from (other revision)"
 msgstr "マージ元 (他のリビジョン)"
 
-#: tortoisehg/hgqt/merge.py:148 tortoisehg/hgqt/merge.py:670
+#: tortoisehg/hgqt/merge.py:140 tortoisehg/hgqt/merge.py:652
+#: tortoisehg/hgtk/merge.py:47 tortoisehg/hgtk/merge.py:60
 msgid "Unable to merge"
 msgstr "マージできませんでした"
 
-#: tortoisehg/hgqt/merge.py:149 tortoisehg/hgqt/merge.py:671
+#: tortoisehg/hgqt/merge.py:141 tortoisehg/hgqt/merge.py:653
 msgid "Merge revision not specified or not found"
 msgstr "マージリビジョンが指定されていないか存在しません"
 
-#: tortoisehg/hgqt/merge.py:153
+#: tortoisehg/hgqt/merge.py:147
 msgid "Merge to (working directory)"
 msgstr "マージ先 (作業ディレクトリ)"
 
-#: tortoisehg/hgqt/merge.py:176
+#: tortoisehg/hgqt/merge.py:170
 msgid ""
 "The working directory is already <b>merged</b>. <a "
 "href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "
 "作業ディレクトリは既に<b>マージされています</b>。<a href=\"skip\"><b>続ける</b></a>かマージを<a "
 "href=\"discard\"><b>破棄</b></a>してください。"
 
-#: tortoisehg/hgqt/merge.py:185
+#: tortoisehg/hgqt/merge.py:179
 msgid ""
 "Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "
 "href=\"shelve\"><b>shelve</b></a> to patch, or <a "
 "href=\"shelve\"><b>シェルフ</b></a> するか、変更を <a href=\"discard\"><b>破棄</b></a> "
 "してください。"
 
-#: tortoisehg/hgqt/merge.py:197
+#: tortoisehg/hgqt/merge.py:191
 msgid "Or use:"
 msgstr "あるいは:"
 
-#: tortoisehg/hgqt/merge.py:200
+#: tortoisehg/hgqt/merge.py:194
 msgid "Force a merge with outstanding changes (-f/--force)"
 msgstr "作業領域中の未コミット変更ごとマージを実施(-f/--force)"
 
-#: tortoisehg/hgqt/merge.py:214
+#: tortoisehg/hgqt/merge.py:208 tortoisehg/hgtk/merge.py:118
 msgid "Discard all changes from merge target (other) revision"
 msgstr "全ての変更点をマージ対象(other)のリビジョンから破棄する"
 
-#: tortoisehg/hgqt/merge.py:242
+#: tortoisehg/hgqt/merge.py:236 tortoisehg/hgtk/merge.py:215
 msgid "Confirm Discard Changes"
 msgstr "本当に変更を破棄しますか"
 
-#: tortoisehg/hgqt/merge.py:243
+#: tortoisehg/hgqt/merge.py:237 tortoisehg/hgtk/merge.py:216
 #, python-format
 msgid ""
 "The changes from revision %s and all unmerged parents will be discarded.\n"
 "\n"
 "本当によろしいですか?"
 
-#: tortoisehg/hgqt/merge.py:296
+#: tortoisehg/hgqt/merge.py:290
 msgctxt "working dir state"
 msgid "Clean"
 msgstr "クリーン"
 
-#: tortoisehg/hgqt/merge.py:348
+#: tortoisehg/hgqt/merge.py:341
 msgid "Merging..."
 msgstr "マージ中..."
 
-#: tortoisehg/hgqt/merge.py:362
+#: tortoisehg/hgqt/merge.py:355
 msgid "Automatically advance to next page when merge is complete."
 msgstr "マージが完了したら自動的に次のページに進む"