We are currently indexing your data, so search results may be incomplete until we finish.
stable i18n: pull more recent translations
Changeset 91132aba5fc0…
Parent 21ef4a609bf8…
by
Changes to 29 files · Browse files at 91132aba5fc0 Showing diff from parent 21ef4a609bf8 Diff from another changeset...
-
i18n/tortoisehg/ca.po
-
i18n/tortoisehg/cs.po
-
i18n/tortoisehg/da.po
-
i18n/tortoisehg/de.po
-
i18n/tortoisehg/en_AU.po
-
i18n/tortoisehg/en_GB.po
-
i18n/tortoisehg/es.po
-
i18n/tortoisehg/et.po
-
i18n/tortoisehg/fa.po
-
i18n/tortoisehg/fr.po
-
i18n/tortoisehg/he.po
-
i18n/tortoisehg/hr.po
-
i18n/tortoisehg/hu.po
-
i18n/tortoisehg/it.po
-
i18n/tortoisehg/ja.po
-
i18n/tortoisehg/ko.po
-
i18n/tortoisehg/nb.po
-
i18n/tortoisehg/nl.po
-
i18n/tortoisehg/nn.po
-
i18n/tortoisehg/oc.po
-
i18n/tortoisehg/pl.po
-
i18n/tortoisehg/pt.po
-
i18n/tortoisehg/pt_BR.po
-
i18n/tortoisehg/ru.po
-
i18n/tortoisehg/sv.po
-
i18n/tortoisehg/tr.po
-
i18n/tortoisehg/uk.po
-
i18n/tortoisehg/zh_CN.po
-
i18n/tortoisehg/zh_TW.po
|
|
|
@@ -7,15 +7,15 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-02-28 02:58-0300\n"
+"POT-Creation-Date: 2011-03-01 13:49-0300\n"
"PO-Revision-Date: 2009-10-18 09:21+0000\n"
"Last-Translator: peso <peer.sommerlund@gmail.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-01 04:44+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-03-01 19:42+0000\n"
+"X-Generator: Launchpad (build 12460)\n"
#: TortoiseHgOverlayServer.py:50
msgid "TortoiseHg Overlay Icon Server"
@@ -25,7 +25,7 @@msgid "Exit"
msgstr "Sortir"
-#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:286
+#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:287
#: tortoisehg/hgtk/gdialog.py:505
msgid "About"
msgstr ""
@@ -121,7 +121,7 @@
#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/bookmark.py:73
#: tortoisehg/hgqt/csinfo.py:105 tortoisehg/hgqt/csinfo.py:106
-#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:555
+#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:573
#: tortoisehg/hgqt/tag.py:74 tortoisehg/hgtk/bookmark.py:83
#: tortoisehg/hgtk/csinfo.py:211 tortoisehg/hgtk/csinfo.py:212
#: tortoisehg/hgtk/cslist.py:142 tortoisehg/hgtk/tagadd.py:66
@@ -194,9 +194,9 @@#: tortoisehg/hgqt/archive.py:112 tortoisehg/hgqt/commit.py:516
#: tortoisehg/hgqt/commit.py:523 tortoisehg/hgqt/commit.py:550
#: tortoisehg/hgqt/commit.py:563 tortoisehg/hgqt/compress.py:150
-#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:165
-#: tortoisehg/hgqt/merge.py:358 tortoisehg/hgqt/merge.py:391
-#: tortoisehg/hgqt/merge.py:450 tortoisehg/hgqt/rebase.py:214
+#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:169
+#: tortoisehg/hgqt/merge.py:363 tortoisehg/hgqt/merge.py:396
+#: tortoisehg/hgqt/merge.py:460 tortoisehg/hgqt/rebase.py:214
#: tortoisehg/hgqt/rebase.py:235 tortoisehg/hgqt/rename.py:104
#: tortoisehg/hgqt/repotreeitem.py:283 tortoisehg/hgqt/resolve.py:317
#: tortoisehg/hgqt/settings.py:653 tortoisehg/hgqt/settings.py:751
@@ -286,10 +286,10 @@msgid "Backed out changeset: "
msgstr "Grup de canvis retirat: "
-#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:84
-#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:308
+#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:91
+#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:313
#: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:169
-#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:135
+#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:132
#: tortoisehg/hgqt/tag.py:78 tortoisehg/hgtk/hgemail.py:64
msgid "Options"
msgstr ""
@@ -302,8 +302,8 @@msgid "Commit backout before merging with current working parent"
msgstr ""
-#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:325
-#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:898
+#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:330
+#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:895
#: tortoisehg/hgqt/update.py:97
msgid "Automatically resolve merge conflicts where possible"
msgstr ""
@@ -312,8 +312,8 @@msgid "&Backout"
msgstr ""
-#: tortoisehg/hgqt/backout.py:115 tortoisehg/hgqt/clone.py:148
-#: tortoisehg/hgqt/cmdui.py:732 tortoisehg/hgqt/thgimport.py:117
+#: tortoisehg/hgqt/backout.py:115 tortoisehg/hgqt/clone.py:155
+#: tortoisehg/hgqt/cmdui.py:737 tortoisehg/hgqt/thgimport.py:117
#: tortoisehg/hgqt/thgstrip.py:110 tortoisehg/hgqt/update.py:129
msgid "Detail"
msgstr ""
@@ -335,7 +335,7 @@
#: tortoisehg/hgqt/backout.py:213 tortoisehg/hgqt/commit.py:181
#: tortoisehg/hgqt/commit.py:917 tortoisehg/hgqt/compress.py:122
-#: tortoisehg/hgqt/repowidget.py:160 tortoisehg/hgqt/repowidget.py:234
+#: tortoisehg/hgqt/repowidget.py:161 tortoisehg/hgqt/repowidget.py:235
#: tortoisehg/hgqt/settings.py:367 tortoisehg/hgtk/commit.py:654
#: tortoisehg/hgtk/commit.py:951 tortoisehg/hgtk/commit.py:1015
#: tortoisehg/hgtk/commit.py:1264 tortoisehg/hgtk/gdialog.py:485
@@ -366,7 +366,7 @@msgstr ""
#: tortoisehg/hgqt/bisect.py:38 tortoisehg/hgqt/bisect.py:48
-#: tortoisehg/hgqt/repowidget.py:100 tortoisehg/hgtk/history.py:1880
+#: tortoisehg/hgqt/repowidget.py:101 tortoisehg/hgtk/history.py:1880
msgid "Accept"
msgstr ""
@@ -562,12 +562,12 @@msgstr ""
#: tortoisehg/hgqt/chunks.py:431 tortoisehg/hgqt/status.py:128
-#: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475
+msgctxt "files"
msgid "All"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/qscilib.py:194
-#: tortoisehg/hgqt/status.py:132
+#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/status.py:132
+msgctxt "files"
msgid "None"
msgstr ""
@@ -586,83 +586,83 @@msgid "Destination:"
msgstr ""
-#: tortoisehg/hgqt/clone.py:106 tortoisehg/hgtk/clone.py:127
+#: tortoisehg/hgqt/clone.py:113 tortoisehg/hgtk/clone.py:127
msgid "Clone to revision:"
msgstr ""
-#: tortoisehg/hgqt/clone.py:109 tortoisehg/hgtk/clone.py:141
+#: tortoisehg/hgqt/clone.py:116 tortoisehg/hgtk/clone.py:141
msgid "Do not update the new working directory"
msgstr ""
-#: tortoisehg/hgqt/clone.py:110 tortoisehg/hgtk/clone.py:142
+#: tortoisehg/hgqt/clone.py:117 tortoisehg/hgtk/clone.py:142
msgid "Use pull protocol to copy metadata"
msgstr ""
-#: tortoisehg/hgqt/clone.py:111 tortoisehg/hgtk/clone.py:143
+#: tortoisehg/hgqt/clone.py:118 tortoisehg/hgtk/clone.py:143
msgid "Use uncompressed transfer"
msgstr ""
-#: tortoisehg/hgqt/clone.py:112
+#: tortoisehg/hgqt/clone.py:119
msgid "Include patch queue"
msgstr ""
-#: tortoisehg/hgqt/clone.py:118 tortoisehg/hgtk/clone.py:149
+#: tortoisehg/hgqt/clone.py:125 tortoisehg/hgtk/clone.py:149
#: tortoisehg/hgtk/history.py:467 tortoisehg/hgtk/synch.py:179
msgid "Use proxy server"
msgstr ""
-#: tortoisehg/hgqt/clone.py:124 tortoisehg/hgqt/sync.py:1371
+#: tortoisehg/hgqt/clone.py:131 tortoisehg/hgqt/sync.py:1368
#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:201
msgid "Remote command:"
msgstr ""
-#: tortoisehg/hgqt/clone.py:127
+#: tortoisehg/hgqt/clone.py:134
msgid "Start revision:"
msgstr ""
-#: tortoisehg/hgqt/clone.py:145
+#: tortoisehg/hgqt/clone.py:152
msgid "&Clone"
msgstr ""
-#: tortoisehg/hgqt/clone.py:158
+#: tortoisehg/hgqt/clone.py:165
#, python-format
msgid "Clone - %s"
msgstr ""
-#: tortoisehg/hgqt/clone.py:218 tortoisehg/hgqt/clone.py:245
-#: tortoisehg/hgqt/clone.py:252 tortoisehg/hgtk/clone.py:37
+#: tortoisehg/hgqt/clone.py:225 tortoisehg/hgqt/clone.py:252
+#: tortoisehg/hgqt/clone.py:259 tortoisehg/hgtk/clone.py:37
msgid "TortoiseHg Clone"
msgstr "TortoiseHg: Clonar"
-#: tortoisehg/hgqt/clone.py:219
+#: tortoisehg/hgqt/clone.py:226
msgid "Error creating destination folder"
msgstr ""
-#: tortoisehg/hgqt/clone.py:220
+#: tortoisehg/hgqt/clone.py:227
msgid "Please specify a different path."
msgstr ""
-#: tortoisehg/hgqt/clone.py:246 tortoisehg/hgtk/clone.py:288
+#: tortoisehg/hgqt/clone.py:253 tortoisehg/hgtk/clone.py:288
msgid "Source path is empty"
msgstr ""
-#: tortoisehg/hgqt/clone.py:247
+#: tortoisehg/hgqt/clone.py:254
msgid "Please enter a valid source path."
msgstr ""
-#: tortoisehg/hgqt/clone.py:253 tortoisehg/hgtk/clone.py:294
+#: tortoisehg/hgqt/clone.py:260 tortoisehg/hgtk/clone.py:294
msgid "Source and destination are the same"
msgstr ""
-#: tortoisehg/hgqt/clone.py:254
+#: tortoisehg/hgqt/clone.py:261
msgid "Please specify different paths."
msgstr ""
-#: tortoisehg/hgqt/clone.py:315
+#: tortoisehg/hgqt/clone.py:322
msgid "Select source repository"
msgstr ""
-#: tortoisehg/hgqt/clone.py:323
+#: tortoisehg/hgqt/clone.py:330
msgid "Select destination repository"
msgstr ""
@@ -696,7 +696,7 @@msgid "Terminated"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:718
+#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:736
#: tortoisehg/hgtk/p4pending.py:101
msgid "Finished"
msgstr ""
@@ -719,24 +719,24 @@msgid "no matches found: %s"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:741
+#: tortoisehg/hgqt/cmdui.py:746
msgid "TortoiseHg Command Dialog"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:761 tortoisehg/hgqt/merge.py:65
+#: tortoisehg/hgqt/cmdui.py:766 tortoisehg/hgqt/merge.py:65
#: tortoisehg/hgqt/rebase.py:236 tortoisehg/hgqt/resolve.py:318
#: tortoisehg/hgqt/settings.py:650 tortoisehg/hgtk/commit.py:323
#: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
msgid "Confirm Exit"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:761
+#: tortoisehg/hgqt/cmdui.py:766
msgid ""
"Mercurial command is still running.\n"
"Are you sure you want to terminate?"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:805
+#: tortoisehg/hgqt/cmdui.py:810
msgid "TortoiseHg"
msgstr ""
@@ -904,16 +904,16 @@msgstr ""
#: tortoisehg/hgqt/commit.py:773 tortoisehg/hgqt/commit.py:796
-#: tortoisehg/hgqt/commit.py:819 tortoisehg/hgqt/sync.py:840
-#: tortoisehg/hgqt/sync.py:938 tortoisehg/hgqt/sync.py:1008
-#: tortoisehg/hgqt/sync.py:1163
+#: tortoisehg/hgqt/commit.py:819 tortoisehg/hgqt/sync.py:837
+#: tortoisehg/hgqt/sync.py:935 tortoisehg/hgqt/sync.py:1005
+#: tortoisehg/hgqt/sync.py:1160
msgid "Iniparse must be installed."
msgstr ""
#: tortoisehg/hgqt/commit.py:788 tortoisehg/hgqt/commit.py:811
#: tortoisehg/hgqt/commit.py:834 tortoisehg/hgqt/settings.py:948
-#: tortoisehg/hgqt/sync.py:850 tortoisehg/hgqt/sync.py:949
-#: tortoisehg/hgqt/sync.py:1026 tortoisehg/hgqt/sync.py:1201
+#: tortoisehg/hgqt/sync.py:847 tortoisehg/hgqt/sync.py:946
+#: tortoisehg/hgqt/sync.py:1023 tortoisehg/hgqt/sync.py:1198
#: tortoisehg/hgtk/thgconfig.py:1654
msgid "Unable to write configuration file"
msgstr ""
@@ -946,7 +946,7 @@msgid "Compress"
msgstr ""
-#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:259
+#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:264
#: tortoisehg/hgqt/rebase.py:104
msgid "Checking..."
msgstr ""
@@ -974,20 +974,20 @@msgid "Compress is complete, old history untouched"
msgstr ""
-#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:357
-#: tortoisehg/hgqt/merge.py:390 tortoisehg/hgqt/merge.py:449
+#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:362
+#: tortoisehg/hgqt/merge.py:395 tortoisehg/hgqt/merge.py:459
#: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:751
#: tortoisehg/hgqt/update.py:219 tortoisehg/hgtk/thgconfig.py:775
#: tortoisehg/hgtk/update.py:233
msgid "&Discard"
msgstr ""
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:461
#: tortoisehg/hgqt/rebase.py:215
msgid "Confirm Discard"
msgstr ""
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:461
#: tortoisehg/hgqt/rebase.py:215
msgid "Discard outstanding changes in working directory?"
msgstr ""
@@ -1069,11 +1069,11 @@msgid "Output Log"
msgstr ""
-#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:290
+#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:291
msgid "Back"
msgstr ""
-#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:293
+#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:294
msgid "Forward"
msgstr ""
@@ -1179,86 +1179,86 @@msgid "Open shelve tool"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:500
+#: tortoisehg/hgqt/fileview.py:504
msgid "File or diffs not displayed: "
msgstr ""
-#: tortoisehg/hgqt/fileview.py:514 tortoisehg/hgtk/chunks.py:73
+#: tortoisehg/hgqt/fileview.py:518 tortoisehg/hgtk/chunks.py:73
msgid "File is larger than the specified max size.\n"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:519 tortoisehg/hgtk/chunks.py:85
+#: tortoisehg/hgqt/fileview.py:523 tortoisehg/hgtk/chunks.py:85
msgid "File is binary.\n"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:548 tortoisehg/hgqt/fileview.py:653
+#: tortoisehg/hgqt/fileview.py:552 tortoisehg/hgqt/fileview.py:657
#, python-format
msgid "exec mode has been <font color='red'>%s</font>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:549 tortoisehg/hgqt/fileview.py:649
+#: tortoisehg/hgqt/fileview.py:553 tortoisehg/hgqt/fileview.py:653
msgid "set"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:549 tortoisehg/hgqt/fileview.py:651
+#: tortoisehg/hgqt/fileview.py:553 tortoisehg/hgqt/fileview.py:655
msgid "unset"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:552 tortoisehg/hgqt/fileview.py:563
+#: tortoisehg/hgqt/fileview.py:556 tortoisehg/hgqt/fileview.py:567
msgid " <i>(is a symlink)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:581
+#: tortoisehg/hgqt/fileview.py:585
msgid "Not a Mercurial subrepo, not previewable"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:589
+#: tortoisehg/hgqt/fileview.py:593
msgid "File Status:"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:593
+#: tortoisehg/hgqt/fileview.py:597
msgid "New subrepository"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:595
+#: tortoisehg/hgqt/fileview.py:599
msgid "Revision has changed from:"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:600 tortoisehg/hgqt/hgemail_ui.py:244
+#: tortoisehg/hgqt/fileview.py:604 tortoisehg/hgqt/hgemail_ui.py:244
#: tortoisehg/hgtk/hgemail.py:76
msgid "To:"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:606
+#: tortoisehg/hgqt/fileview.py:610
msgid " <i>(is a dirty sub-repository)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:608
+#: tortoisehg/hgqt/fileview.py:612
msgid "open"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:610
+#: tortoisehg/hgqt/fileview.py:614
#, python-format
msgid "Error previewing subrepo: %s"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:623
+#: tortoisehg/hgqt/fileview.py:627
msgid " <i>(was deleted)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:625
+#: tortoisehg/hgqt/fileview.py:629
msgid " <i>(was added, now missing)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:635
+#: tortoisehg/hgqt/fileview.py:639
msgid " <i>(is unversioned)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:659 tortoisehg/hgqt/fileview.py:669
+#: tortoisehg/hgqt/fileview.py:663 tortoisehg/hgqt/fileview.py:673
msgid " <i>(was added)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:664
+#: tortoisehg/hgqt/fileview.py:668
#, python-format
msgid " <i>(renamed from %s)</i>"
msgstr ""
@@ -1274,7 +1274,7 @@msgstr ""
#: tortoisehg/hgqt/grep.py:49 tortoisehg/hgqt/qscilib.py:301
-#: tortoisehg/hgqt/qscilib.py:324 tortoisehg/hgqt/repowidget.py:172
+#: tortoisehg/hgqt/qscilib.py:324 tortoisehg/hgqt/repowidget.py:173
#: tortoisehg/hgtk/datamine.py:310
msgid "Search"
msgstr ""
@@ -1829,76 +1829,76 @@msgid "&Exit"
msgstr ""
-#: tortoisehg/hgqt/merge.py:220 tortoisehg/hgqt/revpanel.py:156
+#: tortoisehg/hgqt/merge.py:225 tortoisehg/hgqt/revpanel.py:156
#: tortoisehg/hgtk/merge.py:73
msgid "Not a head revision!"
msgstr ""
-#: tortoisehg/hgqt/merge.py:227
+#: tortoisehg/hgqt/merge.py:232
msgid "Merge from (other revision)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgtk/merge.py:47
+#: tortoisehg/hgqt/merge.py:240 tortoisehg/hgtk/merge.py:47
#: tortoisehg/hgtk/merge.py:60
msgid "Unable to merge"
msgstr ""
-#: tortoisehg/hgqt/merge.py:236
+#: tortoisehg/hgqt/merge.py:241
msgid "Merge revision not specified or not found"
msgstr ""
-#: tortoisehg/hgqt/merge.py:241
+#: tortoisehg/hgqt/merge.py:246
msgid "Merge to (working directory)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:250
+#: tortoisehg/hgqt/merge.py:255
msgid "Working directory status"
msgstr ""
-#: tortoisehg/hgqt/merge.py:266
+#: tortoisehg/hgqt/merge.py:271
msgid "<a href=\"view\">View changes...</a>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:272
+#: tortoisehg/hgqt/merge.py:277
msgid ""
"The workding directory is already <b>merged</b>. <a "
"href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "
"existing merge."
msgstr ""
-#: tortoisehg/hgqt/merge.py:281
+#: tortoisehg/hgqt/merge.py:286
msgid ""
"Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "
"href=\"shelve\"><b>shelve</b></a> to patch, or <a "
"href=\"discard\"><b>discard</b></a> changes."
msgstr ""
-#: tortoisehg/hgqt/merge.py:294
+#: tortoisehg/hgqt/merge.py:299
msgid "Or use:"
msgstr ""
-#: tortoisehg/hgqt/merge.py:297
+#: tortoisehg/hgqt/merge.py:302
msgid "Force a merge with outstanding changes (-f/--force)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:318 tortoisehg/hgtk/merge.py:118
+#: tortoisehg/hgqt/merge.py:323 tortoisehg/hgtk/merge.py:118
msgid "Discard all changes from merge target (other) revision"
msgstr ""
-#: tortoisehg/hgqt/merge.py:338 tortoisehg/hgqt/update.py:223
+#: tortoisehg/hgqt/merge.py:343 tortoisehg/hgqt/update.py:223
#: tortoisehg/hgtk/update.py:237
msgid "&Merge"
msgstr ""
-#: tortoisehg/hgqt/merge.py:342
+#: tortoisehg/hgqt/merge.py:347
msgid "Merge another revision to the working directory"
msgstr ""
-#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgtk/merge.py:215
+#: tortoisehg/hgqt/merge.py:364 tortoisehg/hgtk/merge.py:215
msgid "Confirm Discard Changes"
msgstr ""
-#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:216
+#: tortoisehg/hgqt/merge.py:365 tortoisehg/hgtk/merge.py:216
#, python-format
msgid ""
"The changes from revision %s and all unmerged parents will be discarded.\n"
@@ -1906,121 +1906,121 @@"Are you sure this is what you want to do?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:370
+#: tortoisehg/hgqt/merge.py:375
msgid "Merging..."
msgstr ""
-#: tortoisehg/hgqt/merge.py:371
+#: tortoisehg/hgqt/merge.py:376
msgid "All conflicting files will be marked unresolved."
msgstr ""
-#: tortoisehg/hgqt/merge.py:388
+#: tortoisehg/hgqt/merge.py:393
msgid "Cancel merge and discard changes?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:389
+#: tortoisehg/hgqt/merge.py:394
msgid "Discard unfinished local changes and restart merge?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:392
+#: tortoisehg/hgqt/merge.py:397
msgid "Confirm Clean Up"
msgstr ""
-#: tortoisehg/hgqt/merge.py:395
+#: tortoisehg/hgqt/merge.py:400
msgid "Canceling merge...\n"
msgstr ""
-#: tortoisehg/hgqt/merge.py:396
+#: tortoisehg/hgqt/merge.py:401
msgid "(Please close any running merge tool)\n"
msgstr ""
-#: tortoisehg/hgqt/merge.py:416
+#: tortoisehg/hgqt/merge.py:421
msgid "Merge failed"
msgstr ""
-#: tortoisehg/hgqt/merge.py:416
+#: tortoisehg/hgqt/merge.py:421
msgid "Returning to first page"
msgstr ""
-#: tortoisehg/hgqt/merge.py:467
+#: tortoisehg/hgqt/merge.py:477
msgid "Rename Patch"
msgstr ""
-#: tortoisehg/hgqt/merge.py:468
+#: tortoisehg/hgqt/merge.py:478
msgid "Input a new patch name:"
msgstr ""
-#: tortoisehg/hgqt/merge.py:476
+#: tortoisehg/hgqt/merge.py:486
#, python-format
msgid ""
"The patch <b>%(old)s</b> is renamed to <b>%(new)s</b>. <a "
"href=\"rename:%(new)s\"><b>Rename</b></a> again?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:523
+#: tortoisehg/hgqt/merge.py:541
msgid "<b>Uncommitted local changes are detected</b>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:528 tortoisehg/hgtk/recovery.py:52
+#: tortoisehg/hgqt/merge.py:546 tortoisehg/hgtk/recovery.py:52
msgid "Clean"
msgstr ""
-#: tortoisehg/hgqt/merge.py:557 tortoisehg/hgtk/commit.py:237
+#: tortoisehg/hgqt/merge.py:575 tortoisehg/hgtk/commit.py:237
#: tortoisehg/hgtk/history.py:66 tortoisehg/hgtk/history.py:481
#: tortoisehg/hgtk/history.py:1223
msgid "Parents"
msgstr ""
-#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:514
+#: tortoisehg/hgqt/merge.py:579 tortoisehg/hgqt/repomodel.py:514
#: tortoisehg/hgqt/repomodel.py:516 tortoisehg/hgqt/shelve.py:24
#: tortoisehg/hgqt/thgimport.py:87
msgid "Working Directory"
msgstr ""
-#: tortoisehg/hgqt/merge.py:599
+#: tortoisehg/hgqt/merge.py:617
msgid "Working Directory (merged)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:608
+#: tortoisehg/hgqt/merge.py:626
msgid "Commit message"
msgstr ""
-#: tortoisehg/hgqt/merge.py:615 tortoisehg/hgtk/commit.py:823
+#: tortoisehg/hgqt/merge.py:633 tortoisehg/hgtk/commit.py:823
msgid "Merge "
msgstr ""
-#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:231
+#: tortoisehg/hgqt/merge.py:656 tortoisehg/hgqt/workbench.py:231
msgid "&Commit"
msgstr ""
-#: tortoisehg/hgqt/merge.py:644 tortoisehg/hgqt/qscilib.py:174
+#: tortoisehg/hgqt/merge.py:662 tortoisehg/hgqt/qscilib.py:174
#: tortoisehg/hgtk/merge.py:137
msgid "Undo"
msgstr ""
-#: tortoisehg/hgqt/merge.py:654
+#: tortoisehg/hgqt/merge.py:672
msgid "Commit merged files"
msgstr ""
-#: tortoisehg/hgqt/merge.py:658
+#: tortoisehg/hgqt/merge.py:676
msgid "Committing..."
msgstr ""
-#: tortoisehg/hgqt/merge.py:659
+#: tortoisehg/hgqt/merge.py:677
msgid "Please wait while committing merged files."
msgstr ""
-#: tortoisehg/hgqt/merge.py:674
+#: tortoisehg/hgqt/merge.py:692
msgid ""
"There were <b>merge conflicts</b> that must be <a "
"href=\"resolve\"><b>resolved</b></a>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:679
+#: tortoisehg/hgqt/merge.py:697
msgid "No merge conflicts, ready to commit"
msgstr ""
-#: tortoisehg/hgqt/merge.py:731
+#: tortoisehg/hgqt/merge.py:749
msgid "Merge changeset"
msgstr ""
@@ -2153,11 +2153,11 @@msgid "Pending Perforce Changelists - %s"
msgstr ""
-#: tortoisehg/hgqt/p4pending.py:94
+#: tortoisehg/hgqt/p4pending.py:96
msgid "Submitting p4 changelist..."
msgstr ""
-#: tortoisehg/hgqt/p4pending.py:106
+#: tortoisehg/hgqt/p4pending.py:108
msgid "Reverting p4 changelist..."
msgstr ""
@@ -2497,7 +2497,7 @@#: tortoisehg/hgqt/qqueue.py:305
#, python-format
msgid ""
-"<p>This will also erase de patchfiles on disk!</p><p>Do you really want to "
+"<p>This will also erase the patchfiles on disk!</p><p>Do you really want to "
"purge patch queue '%s' ?</p>"
msgstr ""
@@ -2555,6 +2555,11 @@msgid "Wrap"
msgstr ""
+#: tortoisehg/hgqt/qscilib.py:194
+msgctxt "wrap mode"
+msgid "None"
+msgstr ""
+
#: tortoisehg/hgqt/qscilib.py:195
msgid "Word"
msgstr ""
@@ -2628,7 +2633,7 @@msgid "Checkmark files to remove"
msgstr ""
-#: tortoisehg/hgqt/quickop.py:22 tortoisehg/hgqt/sync.py:453
+#: tortoisehg/hgqt/quickop.py:22 tortoisehg/hgqt/sync.py:450
#: tortoisehg/hgqt/webconf_ui.py:80 tortoisehg/hgtk/bookmark.py:50
#: tortoisehg/hgtk/quickop.py:22 tortoisehg/hgtk/tagadd.py:40
msgid "Remove"
@@ -2935,7 +2940,7 @@msgid "Clone Repository"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:451
+#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:448
#: tortoisehg/hgqt/workbench.py:279
msgid "Explore"
msgstr ""
@@ -2944,7 +2949,7 @@msgid "Open the repository in Windows Explorer"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:452
+#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:449
#: tortoisehg/hgqt/workbench.py:282
msgid "Terminal"
msgstr ""
@@ -2989,7 +2994,7 @@msgstr ""
#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:362
-#: tortoisehg/hgqt/sync.py:198 tortoisehg/hgqt/webconf.py:266
+#: tortoisehg/hgqt/sync.py:195 tortoisehg/hgqt/webconf.py:266
msgid "Path"
msgstr ""
@@ -3001,7 +3006,7 @@msgid "Failed to add repository"
msgstr ""
-#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:581
+#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:582
#, python-format
msgid "%s is not a valid repository"
msgstr ""
@@ -3016,96 +3021,96 @@msgid "Can't find revision '%s'"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:102
+#: tortoisehg/hgqt/repowidget.py:103
msgid "Pull incoming changesets into your repository"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:105 tortoisehg/hgtk/history.py:1886
+#: tortoisehg/hgqt/repowidget.py:106 tortoisehg/hgtk/history.py:1886
msgid "Reject"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:106
+#: tortoisehg/hgqt/repowidget.py:107
msgid "Reject incoming changesets"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:156
+#: tortoisehg/hgqt/repowidget.py:157
msgid "Revision details"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:164 tortoisehg/hgtk/gdialog.py:495
+#: tortoisehg/hgqt/repowidget.py:165 tortoisehg/hgtk/gdialog.py:495
#: tortoisehg/hgtk/thgconfig.py:170 tortoisehg/util/menuthg.py:52
msgid "Synchronize"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:168
+#: tortoisehg/hgqt/repowidget.py:169
msgid "Manifest"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:177 tortoisehg/hgtk/commit.py:227
+#: tortoisehg/hgqt/repowidget.py:178 tortoisehg/hgtk/commit.py:227
#: tortoisehg/hgtk/commit.py:309 tortoisehg/hgtk/history.py:258
#: tortoisehg/hgtk/history.py:368 tortoisehg/hgtk/thgimport.py:111
msgid "Patch Queue"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:185 tortoisehg/hgtk/history.py:266
+#: tortoisehg/hgqt/repowidget.py:186 tortoisehg/hgtk/history.py:266
#: tortoisehg/hgtk/history.py:385
msgid "Patch Branch"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:198
+#: tortoisehg/hgqt/repowidget.py:199
#, python-format
msgid "%s <incoming>"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:482
+#: tortoisehg/hgqt/repowidget.py:483
#, python-format
msgid "%s - verify repository"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:489
+#: tortoisehg/hgqt/repowidget.py:490
#, python-format
msgid "%s - recover repository"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:505
+#: tortoisehg/hgqt/repowidget.py:506
msgid "No transaction available"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:506
+#: tortoisehg/hgqt/repowidget.py:507
msgid "There is no rollback transaction available"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:509 tortoisehg/hgtk/commit.py:1035
+#: tortoisehg/hgqt/repowidget.py:510 tortoisehg/hgtk/commit.py:1035
msgid "Undo last commit?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:510
+#: tortoisehg/hgqt/repowidget.py:511
#, python-format
msgid "Undo most recent commit (%d), preserving file changes?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:514
+#: tortoisehg/hgqt/repowidget.py:515
msgid "Undo last transaction?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:515
+#: tortoisehg/hgqt/repowidget.py:516
#, python-format
msgid "Rollback to revision %d (undo %s)?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:521
+#: tortoisehg/hgqt/repowidget.py:522
msgid "Repository Error"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:522
+#: tortoisehg/hgqt/repowidget.py:523
msgid "Unable to determine working copy revision\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:526
+#: tortoisehg/hgqt/repowidget.py:527
msgid "Remove current working revision?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:527
+#: tortoisehg/hgqt/repowidget.py:528
#, python-format
msgid ""
"Your current working revision (%d) will be removed by this rollback, leaving "
@@ -3113,193 +3118,201 @@" Continue?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:741
+#: tortoisehg/hgqt/repowidget.py:641
+msgid "Repository stripped, incoming preview cleared"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:646
+msgid "Repository stripped, revision set cleared"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:758
msgid "Commit tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:745
+#: tortoisehg/hgqt/repowidget.py:762
msgid "Sync tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:749
+#: tortoisehg/hgqt/repowidget.py:766
msgid "MQ tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:753
+#: tortoisehg/hgqt/repowidget.py:770
msgid "Search tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:756
+#: tortoisehg/hgqt/repowidget.py:773
msgid "Repository command still running"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:910 tortoisehg/util/menuthg.py:58
+#: tortoisehg/hgqt/repowidget.py:927 tortoisehg/util/menuthg.py:58
msgid "Update..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:913 tortoisehg/hgqt/repowidget.py:1123
+#: tortoisehg/hgqt/repowidget.py:930 tortoisehg/hgqt/repowidget.py:1140
msgid "Visual diff..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:915
+#: tortoisehg/hgqt/repowidget.py:932
msgid "Diff to local..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:917
+#: tortoisehg/hgqt/repowidget.py:934
msgid "Browse at rev..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:920
+#: tortoisehg/hgqt/repowidget.py:937
msgid "Merge with local..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:923
+#: tortoisehg/hgqt/repowidget.py:940
msgid "Tag..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:925
+#: tortoisehg/hgqt/repowidget.py:942
msgid "Bookmark..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:928 tortoisehg/hgtk/history.py:1290
+#: tortoisehg/hgqt/repowidget.py:945 tortoisehg/hgtk/history.py:1290
msgid "Backout..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:932 tortoisehg/hgtk/history.py:1293
+#: tortoisehg/hgqt/repowidget.py:949 tortoisehg/hgtk/history.py:1293
msgid "Export"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:933
+#: tortoisehg/hgqt/repowidget.py:950
msgid "Export patch"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:935
+#: tortoisehg/hgqt/repowidget.py:952
msgid "Email patch..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:937
+#: tortoisehg/hgqt/repowidget.py:954
msgid "Archive..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:939 tortoisehg/hgqt/wctxactions.py:46
+#: tortoisehg/hgqt/repowidget.py:956 tortoisehg/hgqt/wctxactions.py:46
msgid "Copy patch"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:943
+#: tortoisehg/hgqt/repowidget.py:960
msgid "Copy hash"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:947
+#: tortoisehg/hgqt/repowidget.py:964
msgid "Transplant to local"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:951
+#: tortoisehg/hgqt/repowidget.py:968
msgid "Modify history"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:952 tortoisehg/hgqt/repowidget.py:1084
+#: tortoisehg/hgqt/repowidget.py:969 tortoisehg/hgqt/repowidget.py:1101
msgid "QGoto"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:954
+#: tortoisehg/hgqt/repowidget.py:971
msgid "Import to MQ"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:956
+#: tortoisehg/hgqt/repowidget.py:973
msgid "Finish patch"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:959
+#: tortoisehg/hgqt/repowidget.py:976
msgid "Rebase..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:962
+#: tortoisehg/hgqt/repowidget.py:979
msgid "Strip..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:965
+#: tortoisehg/hgqt/repowidget.py:982
msgid "Post to Review Board..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1020
+#: tortoisehg/hgqt/repowidget.py:1037
msgid "Unable to compress history"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1021
+#: tortoisehg/hgqt/repowidget.py:1038
msgid "Selected changeset pair not related"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1029
+#: tortoisehg/hgqt/repowidget.py:1046
msgid "Visual Diff..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1030 tortoisehg/hgqt/repowidget.py:1105
+#: tortoisehg/hgqt/repowidget.py:1047 tortoisehg/hgqt/repowidget.py:1122
msgid "Export Selected"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1031 tortoisehg/hgqt/repowidget.py:1106
+#: tortoisehg/hgqt/repowidget.py:1048 tortoisehg/hgqt/repowidget.py:1123
msgid "Email Selected..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1032
+#: tortoisehg/hgqt/repowidget.py:1049
msgid "Export DAG Range"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1033
+#: tortoisehg/hgqt/repowidget.py:1050
msgid "Email DAG Range..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1034
+#: tortoisehg/hgqt/repowidget.py:1051
msgid "Bisect - Good, Bad..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1035
+#: tortoisehg/hgqt/repowidget.py:1052
msgid "Bisect - Bad, Good..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1036
+#: tortoisehg/hgqt/repowidget.py:1053
msgid "Compress History..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1044
+#: tortoisehg/hgqt/repowidget.py:1061
msgid "Post Pair to Review Board..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1063
+#: tortoisehg/hgqt/repowidget.py:1080
msgid ""
"<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "
"them.<br><br>Continue?</p>"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1085
+#: tortoisehg/hgqt/repowidget.py:1102
msgid "QPush --move"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1086
+#: tortoisehg/hgqt/repowidget.py:1103
msgid "Fold patches..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1087
+#: tortoisehg/hgqt/repowidget.py:1104
msgid "Delete patches..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1088
+#: tortoisehg/hgqt/repowidget.py:1105
msgid "Reorder patches..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1114
+#: tortoisehg/hgqt/repowidget.py:1131
msgid "Post Selected to Review Board..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1122
+#: tortoisehg/hgqt/repowidget.py:1139
msgid "Pull to here..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1289
+#: tortoisehg/hgqt/repowidget.py:1306
msgid "Unable to start"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1290
+#: tortoisehg/hgqt/repowidget.py:1307
msgid "Previous command is still running"
msgstr ""
@@ -4516,7 +4529,7 @@"equates to pull --rebase. Default: none"
msgstr ""
-#: tortoisehg/hgqt/settings.py:368 tortoisehg/hgqt/sync.py:1116
+#: tortoisehg/hgqt/settings.py:368 tortoisehg/hgqt/sync.py:1113
#: tortoisehg/hgtk/thgconfig.py:90
msgid "Username"
msgstr ""
@@ -4637,7 +4650,7 @@msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
-#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgqt/sync.py:187
+#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgqt/sync.py:184
#: tortoisehg/hgtk/thgconfig.py:195 tortoisehg/hgtk/thgconfig.py:368
msgid "Port"
msgstr ""
@@ -4745,7 +4758,7 @@msgstr ""
#: tortoisehg/hgqt/settings.py:453 tortoisehg/hgqt/settings.py:553
-#: tortoisehg/hgqt/sync.py:1124 tortoisehg/hgtk/thgconfig.py:234
+#: tortoisehg/hgqt/sync.py:1121 tortoisehg/hgtk/thgconfig.py:234
#: tortoisehg/hgtk/thgconfig.py:370
msgid "Password"
msgstr ""
@@ -5199,7 +5212,7 @@msgstr ""
#: tortoisehg/hgqt/shelve.py:112 tortoisehg/hgqt/shelve.py:163
-msgid "Deleted selected chunks"
+msgid "Delete selected chunks"
msgstr ""
#: tortoisehg/hgqt/shelve.py:116
@@ -5427,257 +5440,257 @@msgid "%s is a dirty subrepo"
msgstr ""
-#: tortoisehg/hgqt/sync.py:87
+#: tortoisehg/hgqt/sync.py:84
msgid "TortoiseHg Sync"
msgstr ""
+#: tortoisehg/hgqt/sync.py:102
+msgid "Preview incoming changesets from remote repository"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:105
-msgid "Preview incoming changesets from remote repository"
+msgid "Pull incoming changesets from remote repository"
msgstr ""
#: tortoisehg/hgqt/sync.py:108
-msgid "Pull incoming changesets from remote repository"
+msgid "Filter outgoing changesets to remote repository"
msgstr ""
#: tortoisehg/hgqt/sync.py:111
-msgid "Filter outgoing changesets to remote repository"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:114
msgid "Push outgoing changesets to remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:116
+#: tortoisehg/hgqt/sync.py:113
msgid "Email outgoing changesets for remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:121
+#: tortoisehg/hgqt/sync.py:118
msgid "Manage pending perforce changelists"
msgstr ""
-#: tortoisehg/hgqt/sync.py:128
+#: tortoisehg/hgqt/sync.py:125
msgid "Stop current operation"
msgstr ""
-#: tortoisehg/hgqt/sync.py:142 tortoisehg/hgqt/update.py:68
+#: tortoisehg/hgqt/sync.py:139 tortoisehg/hgqt/update.py:68
#: tortoisehg/hgtk/update.py:78
msgid "Target:"
msgstr ""
-#: tortoisehg/hgqt/sync.py:154
+#: tortoisehg/hgqt/sync.py:151
msgid "<b>Remote Repository:</b>"
msgstr ""
-#: tortoisehg/hgqt/sync.py:173
+#: tortoisehg/hgqt/sync.py:170
msgid "Manage HTTPS connection security and user authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:177
+#: tortoisehg/hgqt/sync.py:174
msgid "Hostname"
msgstr ""
-#: tortoisehg/hgqt/sync.py:203
+#: tortoisehg/hgqt/sync.py:200
msgid "Save current URL under an alias"
msgstr ""
-#: tortoisehg/hgqt/sync.py:217
+#: tortoisehg/hgqt/sync.py:214
msgid "Paths in Repository Settings:"
msgstr ""
-#: tortoisehg/hgqt/sync.py:232
+#: tortoisehg/hgqt/sync.py:229
msgid "Related Paths:"
msgstr ""
+#: tortoisehg/hgqt/sync.py:261
+#, python-format
+msgid "Preview incoming changesets from %s"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:262
+#, python-format
+msgid "Pull incoming changesets from %s"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:263
+#, python-format
+msgid "Filter outgoing changesets to %s"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:264
#, python-format
-msgid "Preview incoming changesets from %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:265
-#, python-format
-msgid "Pull incoming changesets from %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:266
-#, python-format
-msgid "Filter outgoing changesets to %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:267
-#, python-format
msgid "Push outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:274
+#: tortoisehg/hgqt/sync.py:271
#, python-format
msgid "rev: %d (%s)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:279 tortoisehg/hgtk/commit.py:792
+#: tortoisehg/hgqt/sync.py:276 tortoisehg/hgtk/commit.py:792
msgid "branch: "
msgstr ""
-#: tortoisehg/hgqt/sync.py:285
+#: tortoisehg/hgqt/sync.py:282
msgid "bookmark: "
msgstr ""
-#: tortoisehg/hgqt/sync.py:335 tortoisehg/hgtk/synch.py:157
+#: tortoisehg/hgqt/sync.py:332 tortoisehg/hgtk/synch.py:157
msgid "Post Pull: "
msgstr ""
-#: tortoisehg/hgqt/sync.py:479
+#: tortoisehg/hgqt/sync.py:476
msgid "Repository not local"
msgstr ""
-#: tortoisehg/hgqt/sync.py:480
+#: tortoisehg/hgqt/sync.py:477
msgid "A terminal shell cannot be opened for remote"
msgstr ""
-#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:681
+#: tortoisehg/hgqt/sync.py:488 tortoisehg/hgqt/workbench.py:686
msgid "No shell configured"
msgstr ""
-#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:682
+#: tortoisehg/hgqt/sync.py:489 tortoisehg/hgqt/workbench.py:687
msgid "A terminal shell must be configured"
msgstr ""
-#: tortoisehg/hgqt/sync.py:494 tortoisehg/hgqt/sync.py:1235
+#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/sync.py:1232
msgid "Confirm path delete"
msgstr ""
-#: tortoisehg/hgqt/sync.py:495 tortoisehg/hgqt/sync.py:1236
+#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/sync.py:1233
#, python-format
msgid "Delete %s from your repo configuration file?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:573
+#: tortoisehg/hgqt/sync.py:570
msgid "No URL selected"
msgstr ""
-#: tortoisehg/hgqt/sync.py:574
+#: tortoisehg/hgqt/sync.py:571
msgid "An URL must be selected for this operation."
msgstr ""
-#: tortoisehg/hgqt/sync.py:589
+#: tortoisehg/hgqt/sync.py:586
msgid "Redundant authentication info"
msgstr ""
-#: tortoisehg/hgqt/sync.py:590
+#: tortoisehg/hgqt/sync.py:587
msgid ""
"You have authentication info configured for this host and inside this URL. "
"Remove authentication info from this URL?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:609 tortoisehg/hgqt/sync.py:615
-#: tortoisehg/hgqt/sync.py:621 tortoisehg/hgqt/sync.py:627
-#: tortoisehg/hgqt/sync.py:634
+#: tortoisehg/hgqt/sync.py:606 tortoisehg/hgqt/sync.py:612
+#: tortoisehg/hgqt/sync.py:618 tortoisehg/hgqt/sync.py:624
+#: tortoisehg/hgqt/sync.py:631
msgid "sync command already running"
msgstr ""
-#: tortoisehg/hgqt/sync.py:651
+#: tortoisehg/hgqt/sync.py:648
#, python-format
msgid "Getting incoming changesets from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:656 tortoisehg/hgqt/sync.py:674
+#: tortoisehg/hgqt/sync.py:653 tortoisehg/hgqt/sync.py:671
#, python-format
msgid "Found incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:659 tortoisehg/hgqt/sync.py:676
+#: tortoisehg/hgqt/sync.py:656 tortoisehg/hgqt/sync.py:673
#, python-format
msgid "No incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:661 tortoisehg/hgqt/sync.py:678
+#: tortoisehg/hgqt/sync.py:658 tortoisehg/hgqt/sync.py:675
#, python-format
msgid "Incoming from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:687
+#: tortoisehg/hgqt/sync.py:684
#, python-format
msgid "Pull from %s completed"
msgstr ""
-#: tortoisehg/hgqt/sync.py:689
+#: tortoisehg/hgqt/sync.py:686
#, python-format
msgid "Pull from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:699 tortoisehg/hgqt/update.py:304
+#: tortoisehg/hgqt/sync.py:696 tortoisehg/hgqt/update.py:304
msgid "Merge caused file conflicts"
msgstr ""
-#: tortoisehg/hgqt/sync.py:700 tortoisehg/hgqt/update.py:305
+#: tortoisehg/hgqt/sync.py:697 tortoisehg/hgqt/update.py:305
msgid "File conflicts need to be resolved"
msgstr ""
-#: tortoisehg/hgqt/sync.py:706
+#: tortoisehg/hgqt/sync.py:703
#, python-format
msgid "Pulling from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:720
+#: tortoisehg/hgqt/sync.py:717
#, python-format
msgid "Finding outgoing changesets to %s..."
msgstr ""
+#: tortoisehg/hgqt/sync.py:723
+#, python-format
+msgid "%d outgoing changesets to %s"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:726
#, python-format
-msgid "%d outgoing changesets to %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:729
-#, python-format
msgid "No outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:731
+#: tortoisehg/hgqt/sync.py:728
#, python-format
msgid "Outgoing to %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:756 tortoisehg/hgtk/history.py:584
+#: tortoisehg/hgqt/sync.py:753 tortoisehg/hgtk/history.py:584
#, python-format
msgid "%s (submitted)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:758 tortoisehg/hgtk/history.py:586
+#: tortoisehg/hgqt/sync.py:755 tortoisehg/hgtk/history.py:586
#: tortoisehg/hgtk/history.py:592
#, python-format
msgid "%s (pending)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:763 tortoisehg/hgtk/history.py:595
+#: tortoisehg/hgqt/sync.py:760 tortoisehg/hgtk/history.py:595
msgid "Unable to parse p4pending output"
msgstr ""
-#: tortoisehg/hgqt/sync.py:765 tortoisehg/hgtk/history.py:597
+#: tortoisehg/hgqt/sync.py:762 tortoisehg/hgtk/history.py:597
#, python-format
msgid "%d pending changelists found"
msgstr ""
-#: tortoisehg/hgqt/sync.py:767 tortoisehg/hgtk/history.py:599
+#: tortoisehg/hgqt/sync.py:764 tortoisehg/hgtk/history.py:599
msgid "No pending Perforce changelists"
msgstr ""
-#: tortoisehg/hgqt/sync.py:769 tortoisehg/hgtk/history.py:601
+#: tortoisehg/hgqt/sync.py:766 tortoisehg/hgtk/history.py:601
msgid "Aborted p4pending"
msgstr ""
-#: tortoisehg/hgqt/sync.py:771 tortoisehg/hgtk/history.py:603
+#: tortoisehg/hgqt/sync.py:768 tortoisehg/hgtk/history.py:603
msgid "Unable to determine pending changesets"
msgstr ""
-#: tortoisehg/hgqt/sync.py:781
+#: tortoisehg/hgqt/sync.py:778
msgid "Perforce pending..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:787 tortoisehg/hgtk/history.py:2633
+#: tortoisehg/hgqt/sync.py:784 tortoisehg/hgtk/history.py:2633
msgid "Confirm Push to remote Repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:788 tortoisehg/hgtk/history.py:2634
+#: tortoisehg/hgqt/sync.py:785 tortoisehg/hgtk/history.py:2634
#, python-format
msgid ""
"Push to remote repository\n"
@@ -5685,159 +5698,159 @@"?"
msgstr ""
+#: tortoisehg/hgqt/sync.py:788
+#, python-format
+msgid "Push to %s aborted"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:791
#, python-format
-msgid "Push to %s aborted"
+msgid "Pushing to %s..."
msgstr ""
#: tortoisehg/hgqt/sync.py:794
#, python-format
-msgid "Pushing to %s..."
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:797
-#, python-format
msgid "Push to %s completed"
msgstr ""
-#: tortoisehg/hgqt/sync.py:799
+#: tortoisehg/hgqt/sync.py:796
#, python-format
msgid "Push to %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:811
+#: tortoisehg/hgqt/sync.py:808
msgid "Determining outgoing changesets to email..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:815 tortoisehg/hgtk/history.py:2026
+#: tortoisehg/hgqt/sync.py:812 tortoisehg/hgtk/history.py:2026
#, python-format
msgid "%d outgoing changesets"
msgstr ""
-#: tortoisehg/hgqt/sync.py:825 tortoisehg/hgtk/history.py:2030
+#: tortoisehg/hgqt/sync.py:822 tortoisehg/hgtk/history.py:2030
msgid "No outgoing changesets"
msgstr ""
-#: tortoisehg/hgqt/sync.py:827
+#: tortoisehg/hgqt/sync.py:824
#, python-format
msgid "Outgoing aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:839
+#: tortoisehg/hgqt/sync.py:836
msgid "Unable to remove URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:861
+#: tortoisehg/hgqt/sync.py:858
msgid "Post Pull Behavior"
msgstr ""
+#: tortoisehg/hgqt/sync.py:862
+msgid "Select post-pull operation for this repository"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:865
-msgid "Select post-pull operation for this repository"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:868
msgid "None - simply pull changesets"
msgstr ""
-#: tortoisehg/hgqt/sync.py:869
+#: tortoisehg/hgqt/sync.py:866
msgid "Update - pull, then try to update"
msgstr ""
-#: tortoisehg/hgqt/sync.py:875
+#: tortoisehg/hgqt/sync.py:872
msgid "Fetch - use fetch (auto merge pulled changes)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:877
+#: tortoisehg/hgqt/sync.py:874
msgid "Fetch - use fetch extension (fetch is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:884
+#: tortoisehg/hgqt/sync.py:881
msgid "Rebase - rebase local commits above pulled changes"
msgstr ""
-#: tortoisehg/hgqt/sync.py:886
+#: tortoisehg/hgqt/sync.py:883
msgid "Rebase - use rebase extension (rebase is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:904
+#: tortoisehg/hgqt/sync.py:901
msgid "<a href=\"config\">Launch settings tool...</a>"
msgstr ""
-#: tortoisehg/hgqt/sync.py:937
+#: tortoisehg/hgqt/sync.py:934
msgid "Unable to save post pull operation"
msgstr ""
-#: tortoisehg/hgqt/sync.py:961
+#: tortoisehg/hgqt/sync.py:958
msgid "Save Path"
msgstr ""
-#: tortoisehg/hgqt/sync.py:971 tortoisehg/hgqt/sync.py:1279
+#: tortoisehg/hgqt/sync.py:968 tortoisehg/hgqt/sync.py:1276
#: tortoisehg/hgtk/thgconfig.py:371 tortoisehg/hgtk/thgconfig.py:954
msgid "Alias"
msgstr ""
-#: tortoisehg/hgqt/sync.py:974 tortoisehg/hgqt/sync.py:1279
+#: tortoisehg/hgqt/sync.py:971 tortoisehg/hgqt/sync.py:1276
#: tortoisehg/hgtk/thgconfig.py:368
msgid "URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:983
+#: tortoisehg/hgqt/sync.py:980
msgid "Remove authentication data from URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:985
+#: tortoisehg/hgqt/sync.py:982
msgid ""
"User authentication data should be associated with the hostname using the "
"security dialog."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1007
+#: tortoisehg/hgqt/sync.py:1004
msgid "Unable to save an URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1018
+#: tortoisehg/hgqt/sync.py:1015
msgid "Confirm URL replace"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1019
+#: tortoisehg/hgqt/sync.py:1016
#, python-format
msgid "%s already exists, replace URL?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1047
+#: tortoisehg/hgqt/sync.py:1044
msgid "Security: "
msgstr ""
-#: tortoisehg/hgqt/sync.py:1062
+#: tortoisehg/hgqt/sync.py:1059
#, python-format
msgid "<b>Host:</b> %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1064
+#: tortoisehg/hgqt/sync.py:1061
msgid "Secure HTTPS Connection"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1071
+#: tortoisehg/hgqt/sync.py:1068
msgid "Verify with Certificate Authority certificates (best)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1073
+#: tortoisehg/hgqt/sync.py:1070
msgid "Verify with stored host fingerprint (good)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1075
+#: tortoisehg/hgqt/sync.py:1072
msgid "No host validation, but still encrypted (bad)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1086
+#: tortoisehg/hgqt/sync.py:1083
msgid "Query"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1105
+#: tortoisehg/hgqt/sync.py:1102
msgid "User Authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1112
+#: tortoisehg/hgqt/sync.py:1109
msgid ""
"Optional. Username to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
@@ -5845,64 +5858,64 @@"foo.username = $USER."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1121
+#: tortoisehg/hgqt/sync.py:1118
msgid ""
"Optional. Password to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
"it."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1128
+#: tortoisehg/hgqt/sync.py:1125
msgid ""
"Mercurial keyring extension is enabled. Passwords will be stored in a "
"platform-native secure method."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1134
+#: tortoisehg/hgqt/sync.py:1131
msgid ""
"Optional. PEM encoded client certificate key file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1136
+#: tortoisehg/hgqt/sync.py:1133
msgid "User Certificate Key File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1140
+#: tortoisehg/hgqt/sync.py:1137
msgid ""
"Optional. PEM encoded client certificate chain file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1142
+#: tortoisehg/hgqt/sync.py:1139
msgid "User Certificate Chain File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1162
+#: tortoisehg/hgqt/sync.py:1159
msgid "Unable to save authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1333
+#: tortoisehg/hgqt/sync.py:1330
msgid "Unable to create a config file"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1334
+#: tortoisehg/hgqt/sync.py:1331
msgid "Insufficient access rights."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1351
+#: tortoisehg/hgqt/sync.py:1348
msgid "Allow push of a new branch (--new-branch)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1355
+#: tortoisehg/hgqt/sync.py:1352
msgid "Force push or pull (override safety checks, --force)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1360
+#: tortoisehg/hgqt/sync.py:1357
msgid "Recurse into subrepositories (--subrepos)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1365
+#: tortoisehg/hgqt/sync.py:1362
msgid "Temporarily disable configured HTTP proxy"
msgstr ""
@@ -6032,21 +6045,21 @@msgid "Select patches"
msgstr ""
-#: tortoisehg/hgqt/thgimport.py:185
+#: tortoisehg/hgqt/thgimport.py:186
msgid "Select Directory containing patches"
msgstr ""
-#: tortoisehg/hgqt/thgimport.py:206 tortoisehg/hgtk/thgimport.py:281
+#: tortoisehg/hgqt/thgimport.py:209 tortoisehg/hgtk/thgimport.py:281
#, python-format
msgid "%s patches"
msgstr ""
-#: tortoisehg/hgqt/thgimport.py:209
+#: tortoisehg/hgqt/thgimport.py:212
#, python-format
msgid "%s will be imported to "
msgstr ""
-#: tortoisehg/hgqt/thgimport.py:212 tortoisehg/hgtk/thgimport.py:287
+#: tortoisehg/hgqt/thgimport.py:215 tortoisehg/hgtk/thgimport.py:287
msgid "Nothing to import"
msgstr ""
@@ -6583,7 +6596,7 @@msgid "Save"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:37 tortoisehg/hgqt/workbench.py:403
+#: tortoisehg/hgqt/workbench.py:37 tortoisehg/hgqt/workbench.py:404
msgid "TortoiseHg Workbench"
msgstr ""
@@ -6755,73 +6768,77 @@msgid "Bisect..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:298
+#: tortoisehg/hgqt/workbench.py:286
+msgid "Help"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:299
msgid "Filter Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:301
+#: tortoisehg/hgqt/workbench.py:302
msgid "Filter graph with revision sets or branches"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:303
+#: tortoisehg/hgqt/workbench.py:304
msgid "Workbench Toolbars"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:310 tortoisehg/hgtk/history.py:438
+#: tortoisehg/hgqt/workbench.py:311 tortoisehg/hgtk/history.py:438
#: tortoisehg/hgtk/history.py:1861 tortoisehg/hgtk/synch.py:57
msgid "Incoming"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:311
+#: tortoisehg/hgqt/workbench.py:312
msgid "Check for incoming changes from default pull target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:313 tortoisehg/hgtk/history.py:440
+#: tortoisehg/hgqt/workbench.py:314 tortoisehg/hgtk/history.py:440
#: tortoisehg/hgtk/history.py:1991
msgid "Pull"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:314
+#: tortoisehg/hgqt/workbench.py:315
msgid "Pull incoming changes from default pull target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:316 tortoisehg/hgtk/history.py:442
+#: tortoisehg/hgqt/workbench.py:317 tortoisehg/hgtk/history.py:442
#: tortoisehg/hgtk/history.py:2034 tortoisehg/hgtk/synch.py:68
msgid "Outgoing"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:317
+#: tortoisehg/hgqt/workbench.py:318
msgid "Detect outgoing changes to default push target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:319 tortoisehg/hgtk/history.py:444
+#: tortoisehg/hgqt/workbench.py:320 tortoisehg/hgtk/history.py:444
#: tortoisehg/hgtk/history.py:2074 tortoisehg/hgtk/synch.py:73
msgid "Push"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:320
+#: tortoisehg/hgqt/workbench.py:321
msgid "Push outgoing changes to default push target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:405
+#: tortoisehg/hgqt/workbench.py:406
#, python-format
msgid "%s - TortoiseHg Workbench - %s"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:408
+#: tortoisehg/hgqt/workbench.py:409
#, python-format
msgid "%s - TortoiseHg Workbench"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:559
+#: tortoisehg/hgqt/workbench.py:560
msgid "Select repository directory to open"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:580
+#: tortoisehg/hgqt/workbench.py:581
msgid "Failed to open repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:703
+#: tortoisehg/hgqt/workbench.py:708
#, python-format
msgid "Hg file log viewer [%s] - %s"
msgstr ""
@@ -8213,6 +8230,11 @@msgid "Move Down"
msgstr ""
+#: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475
+msgctxt "changesets"
+msgid "All"
+msgstr ""
+
#: tortoisehg/hgtk/history.py:58 tortoisehg/hgtk/history.py:477
msgid "Tagged"
msgstr ""
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
@@ -1,21 +1,22 @@ # Japanese translation for tortoisehg
# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
# This file is distributed under the same license as the tortoisehg package.
+#
# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-02-28 02:58-0300\n"
-"PO-Revision-Date: 2011-02-28 22:00+0000\n"
-"Last-Translator: Yuki Kodama <Unknown>\n"
+"POT-Creation-Date: 2011-03-01 13:49-0300\n"
+"PO-Revision-Date: 2011-03-01 08:08+0000\n"
+"Last-Translator: Yuya Nishihara <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-01 04:46+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-03-01 19:43+0000\n"
+"X-Generator: Launchpad (build 12460)\n"
#: TortoiseHgOverlayServer.py:50
msgid "TortoiseHg Overlay Icon Server"
@@ -25,7 +26,7 @@msgid "Exit"
msgstr "終了"
-#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:286
+#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:287
#: tortoisehg/hgtk/gdialog.py:505
msgid "About"
msgstr "バージョン情報"
@@ -44,24 +45,24 @@
#: tortoisehg/hgqt/about.py:84
msgid "&License"
-msgstr ""
+msgstr "ライセンス(&L)"
#: tortoisehg/hgqt/about.py:90 tortoisehg/hgqt/archive.py:106
#: tortoisehg/hgqt/hgemail_ui.py:272 tortoisehg/hgqt/hginit.py:58
#: tortoisehg/hgqt/license.py:45 tortoisehg/hgqt/postreview_ui.py:178
#: tortoisehg/hgqt/rename.py:99
msgid "&Close"
-msgstr ""
+msgstr "閉じる(&C)"
#: tortoisehg/hgqt/about.py:109
#, python-format
msgid "version %s"
-msgstr ""
+msgstr "バージョン %s"
#: tortoisehg/hgqt/about.py:110
#, python-format
msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
-msgstr ""
+msgstr "Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
#: tortoisehg/hgqt/about.py:189 tortoisehg/hgtk/about.py:70
msgid "A new version of TortoiseHg is ready for download!"
@@ -121,7 +122,7 @@
#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/bookmark.py:73
#: tortoisehg/hgqt/csinfo.py:105 tortoisehg/hgqt/csinfo.py:106
-#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:555
+#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:573
#: tortoisehg/hgqt/tag.py:74 tortoisehg/hgtk/bookmark.py:83
#: tortoisehg/hgtk/csinfo.py:211 tortoisehg/hgtk/csinfo.py:212
#: tortoisehg/hgtk/cslist.py:142 tortoisehg/hgtk/tagadd.py:66
@@ -177,7 +178,7 @@#: tortoisehg/hgqt/archive.py:82 tortoisehg/hgqt/hginit.py:67
#: tortoisehg/hgqt/rename.py:78
msgid "Hg command:"
-msgstr ""
+msgstr "Hg コマンド:"
#: tortoisehg/hgqt/archive.py:86 tortoisehg/hgqt/rename.py:83
msgid "Always show output"
@@ -185,18 +186,18 @@
#: tortoisehg/hgqt/archive.py:104
msgid "&Archive"
-msgstr ""
+msgstr "アーカイブ(&A)"
#: tortoisehg/hgqt/archive.py:109 tortoisehg/hgqt/rename.py:101
msgid "&Detail"
-msgstr ""
+msgstr "詳細(&D)"
#: tortoisehg/hgqt/archive.py:112 tortoisehg/hgqt/commit.py:516
#: tortoisehg/hgqt/commit.py:523 tortoisehg/hgqt/commit.py:550
#: tortoisehg/hgqt/commit.py:563 tortoisehg/hgqt/compress.py:150
-#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:165
-#: tortoisehg/hgqt/merge.py:358 tortoisehg/hgqt/merge.py:391
-#: tortoisehg/hgqt/merge.py:450 tortoisehg/hgqt/rebase.py:214
+#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:169
+#: tortoisehg/hgqt/merge.py:363 tortoisehg/hgqt/merge.py:396
+#: tortoisehg/hgqt/merge.py:460 tortoisehg/hgqt/rebase.py:214
#: tortoisehg/hgqt/rebase.py:235 tortoisehg/hgqt/rename.py:104
#: tortoisehg/hgqt/repotreeitem.py:283 tortoisehg/hgqt/resolve.py:317
#: tortoisehg/hgqt/settings.py:653 tortoisehg/hgqt/settings.py:751
@@ -289,10 +290,10 @@msgid "Backed out changeset: "
msgstr "バックアウトしたチェンジセット: "
-#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:84
-#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:308
+#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:91
+#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:313
#: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:169
-#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:135
+#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:132
#: tortoisehg/hgqt/tag.py:78 tortoisehg/hgtk/hgemail.py:64
msgid "Options"
msgstr "オプション"
@@ -305,21 +306,21 @@msgid "Commit backout before merging with current working parent"
msgstr ""
-#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:325
-#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:898
+#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:330
+#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:895
#: tortoisehg/hgqt/update.py:97
msgid "Automatically resolve merge conflicts where possible"
-msgstr ""
+msgstr "マージ衝突をできるだけ自動で解決"
#: tortoisehg/hgqt/backout.py:112
msgid "&Backout"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:115 tortoisehg/hgqt/clone.py:148
-#: tortoisehg/hgqt/cmdui.py:732 tortoisehg/hgqt/thgimport.py:117
+msgstr "バックアウト(&B)"
+
+#: tortoisehg/hgqt/backout.py:115 tortoisehg/hgqt/clone.py:155
+#: tortoisehg/hgqt/cmdui.py:737 tortoisehg/hgqt/thgimport.py:117
#: tortoisehg/hgqt/thgstrip.py:110 tortoisehg/hgqt/update.py:129
msgid "Detail"
-msgstr ""
+msgstr "詳細"
#: tortoisehg/hgqt/backout.py:127
#, python-format
@@ -338,7 +339,7 @@
#: tortoisehg/hgqt/backout.py:213 tortoisehg/hgqt/commit.py:181
#: tortoisehg/hgqt/commit.py:917 tortoisehg/hgqt/compress.py:122
-#: tortoisehg/hgqt/repowidget.py:160 tortoisehg/hgqt/repowidget.py:234
+#: tortoisehg/hgqt/repowidget.py:161 tortoisehg/hgqt/repowidget.py:235
#: tortoisehg/hgqt/settings.py:367 tortoisehg/hgtk/commit.py:654
#: tortoisehg/hgtk/commit.py:951 tortoisehg/hgtk/commit.py:1015
#: tortoisehg/hgtk/commit.py:1264 tortoisehg/hgtk/gdialog.py:485
@@ -366,16 +367,16 @@
#: tortoisehg/hgqt/bisect.py:34
msgid "Known good revision:"
-msgstr ""
+msgstr "既知の正常なリビジョン:"
#: tortoisehg/hgqt/bisect.py:38 tortoisehg/hgqt/bisect.py:48
-#: tortoisehg/hgqt/repowidget.py:100 tortoisehg/hgtk/history.py:1880
+#: tortoisehg/hgqt/repowidget.py:101 tortoisehg/hgtk/history.py:1880
msgid "Accept"
msgstr "取り込む"
#: tortoisehg/hgqt/bisect.py:43
msgid "Known bad revision:"
-msgstr ""
+msgstr "既知の問題リビジョン:"
#: tortoisehg/hgqt/bisect.py:59
msgid "Revision is Good"
@@ -405,7 +406,7 @@
#: tortoisehg/hgqt/bisect.py:93 tortoisehg/hgqt/grep.py:65
msgid "Revision"
-msgstr ""
+msgstr "リビジョン"
#: tortoisehg/hgqt/bisect.py:94
msgid "Test this revision and report findings. (good/bad/skip)"
@@ -431,7 +432,7 @@#: tortoisehg/hgqt/bookmark.py:80 tortoisehg/hgqt/tag.py:113
#: tortoisehg/hgqt/wctxactions.py:53 tortoisehg/hgqt/wctxactions.py:59
msgid "&Add"
-msgstr ""
+msgstr "追加(&A)"
#: tortoisehg/hgqt/bookmark.py:83
msgid "&Rename"
@@ -439,7 +440,7 @@
#: tortoisehg/hgqt/bookmark.py:86 tortoisehg/hgqt/tag.py:116
msgid "&Remove"
-msgstr ""
+msgstr "削除(&R)"
#: tortoisehg/hgqt/bookmark.py:109 tortoisehg/hgtk/bookmark.py:37
#, python-format
@@ -494,7 +495,7 @@
#: tortoisehg/hgqt/bugreport.py:38
msgid "Quit"
-msgstr ""
+msgstr "終了"
#: tortoisehg/hgqt/bugreport.py:42 tortoisehg/hgtk/bugreport.py:25
msgid "TortoiseHg Bug Report"
@@ -565,12 +566,12 @@msgstr ""
#: tortoisehg/hgqt/chunks.py:431 tortoisehg/hgqt/status.py:128
-#: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475
+msgctxt "files"
msgid "All"
-msgstr "全て"
-
-#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/qscilib.py:194
-#: tortoisehg/hgqt/status.py:132
+msgstr ""
+
+#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/status.py:132
+msgctxt "files"
msgid "None"
msgstr ""
@@ -589,83 +590,83 @@msgid "Destination:"
msgstr "作成先:"
-#: tortoisehg/hgqt/clone.py:106 tortoisehg/hgtk/clone.py:127
+#: tortoisehg/hgqt/clone.py:113 tortoisehg/hgtk/clone.py:127
msgid "Clone to revision:"
msgstr "このリビジョンまでクローン:"
-#: tortoisehg/hgqt/clone.py:109 tortoisehg/hgtk/clone.py:141
+#: tortoisehg/hgqt/clone.py:116 tortoisehg/hgtk/clone.py:141
msgid "Do not update the new working directory"
msgstr "作業ディレクトリを更新しない"
-#: tortoisehg/hgqt/clone.py:110 tortoisehg/hgtk/clone.py:142
+#: tortoisehg/hgqt/clone.py:117 tortoisehg/hgtk/clone.py:142
msgid "Use pull protocol to copy metadata"
msgstr "メタデータのコピーにプル操作のプロトコルを使用する"
-#: tortoisehg/hgqt/clone.py:111 tortoisehg/hgtk/clone.py:143
+#: tortoisehg/hgqt/clone.py:118 tortoisehg/hgtk/clone.py:143
msgid "Use uncompressed transfer"
msgstr "無圧縮でデータを転送する"
-#: tortoisehg/hgqt/clone.py:112
+#: tortoisehg/hgqt/clone.py:119
msgid "Include patch queue"
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:118 tortoisehg/hgtk/clone.py:149
+msgstr "パッチキューも含む"
+
+#: tortoisehg/hgqt/clone.py:125 tortoisehg/hgtk/clone.py:149
#: tortoisehg/hgtk/history.py:467 tortoisehg/hgtk/synch.py:179
msgid "Use proxy server"
msgstr "プロキシサーバを使用する"
-#: tortoisehg/hgqt/clone.py:124 tortoisehg/hgqt/sync.py:1371
+#: tortoisehg/hgqt/clone.py:131 tortoisehg/hgqt/sync.py:1368
#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:201
msgid "Remote command:"
msgstr "リモートコマンド:"
-#: tortoisehg/hgqt/clone.py:127
+#: tortoisehg/hgqt/clone.py:134
msgid "Start revision:"
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:145
+msgstr "指定リビジョンから:"
+
+#: tortoisehg/hgqt/clone.py:152
msgid "&Clone"
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:158
+msgstr "クローン(&C)"
+
+#: tortoisehg/hgqt/clone.py:165
#, python-format
msgid "Clone - %s"
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:218 tortoisehg/hgqt/clone.py:245
-#: tortoisehg/hgqt/clone.py:252 tortoisehg/hgtk/clone.py:37
+msgstr "クローン - %s"
+
+#: tortoisehg/hgqt/clone.py:225 tortoisehg/hgqt/clone.py:252
+#: tortoisehg/hgqt/clone.py:259 tortoisehg/hgtk/clone.py:37
msgid "TortoiseHg Clone"
msgstr "TortoiseHg クローンツール"
-#: tortoisehg/hgqt/clone.py:219
+#: tortoisehg/hgqt/clone.py:226
msgid "Error creating destination folder"
msgstr ""
-#: tortoisehg/hgqt/clone.py:220
+#: tortoisehg/hgqt/clone.py:227
msgid "Please specify a different path."
msgstr ""
-#: tortoisehg/hgqt/clone.py:246 tortoisehg/hgtk/clone.py:288
+#: tortoisehg/hgqt/clone.py:253 tortoisehg/hgtk/clone.py:288
msgid "Source path is empty"
msgstr "クローン元のパスが入力されていません"
-#: tortoisehg/hgqt/clone.py:247
+#: tortoisehg/hgqt/clone.py:254
msgid "Please enter a valid source path."
msgstr ""
-#: tortoisehg/hgqt/clone.py:253 tortoisehg/hgtk/clone.py:294
+#: tortoisehg/hgqt/clone.py:260 tortoisehg/hgtk/clone.py:294
msgid "Source and destination are the same"
msgstr "クローン元とクローン先が同一です"
-#: tortoisehg/hgqt/clone.py:254
+#: tortoisehg/hgqt/clone.py:261
msgid "Please specify different paths."
msgstr ""
-#: tortoisehg/hgqt/clone.py:315
+#: tortoisehg/hgqt/clone.py:322
msgid "Select source repository"
msgstr ""
-#: tortoisehg/hgqt/clone.py:323
+#: tortoisehg/hgqt/clone.py:330
msgid "Select destination repository"
msgstr ""
@@ -699,7 +700,7 @@msgid "Terminated"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:718
+#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:736
#: tortoisehg/hgtk/p4pending.py:101
msgid "Finished"
msgstr "完了"
@@ -722,24 +723,24 @@msgid "no matches found: %s"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:741
+#: tortoisehg/hgqt/cmdui.py:746
msgid "TortoiseHg Command Dialog"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:761 tortoisehg/hgqt/merge.py:65
+#: tortoisehg/hgqt/cmdui.py:766 tortoisehg/hgqt/merge.py:65
#: tortoisehg/hgqt/rebase.py:236 tortoisehg/hgqt/resolve.py:318
#: tortoisehg/hgqt/settings.py:650 tortoisehg/hgtk/commit.py:323
#: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
msgid "Confirm Exit"
msgstr "終了"
-#: tortoisehg/hgqt/cmdui.py:761
+#: tortoisehg/hgqt/cmdui.py:766
msgid ""
"Mercurial command is still running.\n"
"Are you sure you want to terminate?"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:805
+#: tortoisehg/hgqt/cmdui.py:810
msgid "TortoiseHg"
msgstr ""
@@ -907,16 +908,16 @@msgstr ""
#: tortoisehg/hgqt/commit.py:773 tortoisehg/hgqt/commit.py:796
-#: tortoisehg/hgqt/commit.py:819 tortoisehg/hgqt/sync.py:840
-#: tortoisehg/hgqt/sync.py:938 tortoisehg/hgqt/sync.py:1008
-#: tortoisehg/hgqt/sync.py:1163
+#: tortoisehg/hgqt/commit.py:819 tortoisehg/hgqt/sync.py:837
+#: tortoisehg/hgqt/sync.py:935 tortoisehg/hgqt/sync.py:1005
+#: tortoisehg/hgqt/sync.py:1160
msgid "Iniparse must be installed."
msgstr ""
#: tortoisehg/hgqt/commit.py:788 tortoisehg/hgqt/commit.py:811
#: tortoisehg/hgqt/commit.py:834 tortoisehg/hgqt/settings.py:948
-#: tortoisehg/hgqt/sync.py:850 tortoisehg/hgqt/sync.py:949
-#: tortoisehg/hgqt/sync.py:1026 tortoisehg/hgqt/sync.py:1201
+#: tortoisehg/hgqt/sync.py:847 tortoisehg/hgqt/sync.py:946
+#: tortoisehg/hgqt/sync.py:1023 tortoisehg/hgqt/sync.py:1198
#: tortoisehg/hgtk/thgconfig.py:1654
msgid "Unable to write configuration file"
msgstr "設定ファイルに書き込めません"
@@ -949,7 +950,7 @@msgid "Compress"
msgstr ""
-#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:259
+#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:264
#: tortoisehg/hgqt/rebase.py:104
msgid "Checking..."
msgstr ""
@@ -977,20 +978,20 @@msgid "Compress is complete, old history untouched"
msgstr ""
-#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:357
-#: tortoisehg/hgqt/merge.py:390 tortoisehg/hgqt/merge.py:449
+#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:362
+#: tortoisehg/hgqt/merge.py:395 tortoisehg/hgqt/merge.py:459
#: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:751
#: tortoisehg/hgqt/update.py:219 tortoisehg/hgtk/thgconfig.py:775
#: tortoisehg/hgtk/update.py:233
msgid "&Discard"
msgstr "破棄(&D)"
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:461
#: tortoisehg/hgqt/rebase.py:215
msgid "Confirm Discard"
msgstr ""
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:461
#: tortoisehg/hgqt/rebase.py:215
msgid "Discard outstanding changes in working directory?"
msgstr ""
@@ -1070,15 +1071,15 @@
#: tortoisehg/hgqt/docklog.py:23
msgid "Output Log"
-msgstr ""
-
-#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:290
+msgstr "コマンドログ"
+
+#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:291
msgid "Back"
-msgstr ""
-
-#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:293
+msgstr "戻る"
+
+#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:294
msgid "Forward"
-msgstr ""
+msgstr "進む"
#: tortoisehg/hgqt/filelistview.py:206 tortoisehg/hgqt/manifestdialog.py:284
#, python-format
@@ -1103,7 +1104,7 @@
#: tortoisehg/hgqt/filelistview.py:231 tortoisehg/hgqt/manifestdialog.py:196
msgid "File history"
-msgstr ""
+msgstr "ファイルの変更履歴"
#: tortoisehg/hgqt/filelistview.py:232 tortoisehg/hgqt/manifestdialog.py:197
msgid "Show the history of the selected file"
@@ -1111,7 +1112,7 @@
#: tortoisehg/hgqt/filelistview.py:233 tortoisehg/hgqt/manifestdialog.py:198
msgid "Compare file revisions"
-msgstr ""
+msgstr "ファイルのリビジョンを比較"
#: tortoisehg/hgqt/filelistview.py:234 tortoisehg/hgqt/manifestdialog.py:199
msgid "Compare revisions of the selected file"
@@ -1128,7 +1129,7 @@
#: tortoisehg/hgqt/filelistview.py:237 tortoisehg/hgqt/manifestdialog.py:202
msgid "Visual Diff to Local"
-msgstr ""
+msgstr "ローカルとの GUI 差分表示"
#: tortoisehg/hgqt/filelistview.py:238 tortoisehg/hgqt/manifestdialog.py:203
msgid "View changes to current in external diff tool"
@@ -1136,7 +1137,7 @@
#: tortoisehg/hgqt/filelistview.py:240 tortoisehg/hgqt/manifestdialog.py:205
msgid "View at Revision"
-msgstr ""
+msgstr "エディタで表示"
#: tortoisehg/hgqt/filelistview.py:241 tortoisehg/hgqt/manifestdialog.py:206
msgid "View file as it appeared at this revision"
@@ -1144,7 +1145,7 @@
#: tortoisehg/hgqt/filelistview.py:242 tortoisehg/hgqt/manifestdialog.py:207
msgid "Edit Local"
-msgstr ""
+msgstr "ローカルファイルをエディタで開く"
#: tortoisehg/hgqt/filelistview.py:243 tortoisehg/hgqt/manifestdialog.py:208
msgid "Edit current file in working copy"
@@ -1152,7 +1153,7 @@
#: tortoisehg/hgqt/filelistview.py:244 tortoisehg/hgqt/manifestdialog.py:209
msgid "Revert to Revision"
-msgstr ""
+msgstr "このリビジョンへ復旧"
#: tortoisehg/hgqt/filelistview.py:245 tortoisehg/hgqt/manifestdialog.py:210
msgid "Revert file(s) to contents at this revision"
@@ -1182,86 +1183,86 @@msgid "Open shelve tool"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:500
+#: tortoisehg/hgqt/fileview.py:504
msgid "File or diffs not displayed: "
msgstr ""
-#: tortoisehg/hgqt/fileview.py:514 tortoisehg/hgtk/chunks.py:73
+#: tortoisehg/hgqt/fileview.py:518 tortoisehg/hgtk/chunks.py:73
msgid "File is larger than the specified max size.\n"
msgstr "設定されている最大ファイルサイズを超えています。\n"
-#: tortoisehg/hgqt/fileview.py:519 tortoisehg/hgtk/chunks.py:85
+#: tortoisehg/hgqt/fileview.py:523 tortoisehg/hgtk/chunks.py:85
msgid "File is binary.\n"
msgstr "ファイルはバイナリです。\n"
-#: tortoisehg/hgqt/fileview.py:548 tortoisehg/hgqt/fileview.py:653
+#: tortoisehg/hgqt/fileview.py:552 tortoisehg/hgqt/fileview.py:657
#, python-format
msgid "exec mode has been <font color='red'>%s</font>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:549 tortoisehg/hgqt/fileview.py:649
+#: tortoisehg/hgqt/fileview.py:553 tortoisehg/hgqt/fileview.py:653
msgid "set"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:549 tortoisehg/hgqt/fileview.py:651
+#: tortoisehg/hgqt/fileview.py:553 tortoisehg/hgqt/fileview.py:655
msgid "unset"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:552 tortoisehg/hgqt/fileview.py:563
+#: tortoisehg/hgqt/fileview.py:556 tortoisehg/hgqt/fileview.py:567
msgid " <i>(is a symlink)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:581
+#: tortoisehg/hgqt/fileview.py:585
msgid "Not a Mercurial subrepo, not previewable"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:589
+#: tortoisehg/hgqt/fileview.py:593
msgid "File Status:"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:593
+#: tortoisehg/hgqt/fileview.py:597
msgid "New subrepository"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:595
+#: tortoisehg/hgqt/fileview.py:599
msgid "Revision has changed from:"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:600 tortoisehg/hgqt/hgemail_ui.py:244
+#: tortoisehg/hgqt/fileview.py:604 tortoisehg/hgqt/hgemail_ui.py:244
#: tortoisehg/hgtk/hgemail.py:76
msgid "To:"
msgstr "To:"
-#: tortoisehg/hgqt/fileview.py:606
+#: tortoisehg/hgqt/fileview.py:610
msgid " <i>(is a dirty sub-repository)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:608
+#: tortoisehg/hgqt/fileview.py:612
msgid "open"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:610
+#: tortoisehg/hgqt/fileview.py:614
#, python-format
msgid "Error previewing subrepo: %s"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:623
+#: tortoisehg/hgqt/fileview.py:627
msgid " <i>(was deleted)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:625
+#: tortoisehg/hgqt/fileview.py:629
msgid " <i>(was added, now missing)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:635
+#: tortoisehg/hgqt/fileview.py:639
msgid " <i>(is unversioned)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:659 tortoisehg/hgqt/fileview.py:669
+#: tortoisehg/hgqt/fileview.py:663 tortoisehg/hgqt/fileview.py:673
msgid " <i>(was added)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:664
+#: tortoisehg/hgqt/fileview.py:668
#, python-format
msgid " <i>(renamed from %s)</i>"
msgstr ""
@@ -1277,7 +1278,7 @@msgstr "大文字小文字を区別しない"
#: tortoisehg/hgqt/grep.py:49 tortoisehg/hgqt/qscilib.py:301
-#: tortoisehg/hgqt/qscilib.py:324 tortoisehg/hgqt/repowidget.py:172
+#: tortoisehg/hgqt/qscilib.py:324 tortoisehg/hgqt/repowidget.py:173
#: tortoisehg/hgtk/datamine.py:310
msgid "Search"
msgstr "検索"
@@ -1291,11 +1292,11 @@
#: tortoisehg/hgqt/grep.py:64
msgid "Working Copy"
-msgstr ""
+msgstr "作業コピー"
#: tortoisehg/hgqt/grep.py:66
msgid "All History"
-msgstr ""
+msgstr "全履歴"
#: tortoisehg/hgqt/grep.py:67
msgid "Report only the first match per file"
@@ -1638,7 +1639,7 @@
#: tortoisehg/hgqt/hgemail_ui.py:267 tortoisehg/hgqt/postreview_ui.py:173
msgid "Changesets"
-msgstr ""
+msgstr "チェンジセット"
#: tortoisehg/hgqt/hgemail_ui.py:268 tortoisehg/hgqt/wctxactions.py:47
#: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
@@ -1648,15 +1649,15 @@
#: tortoisehg/hgqt/hgemail_ui.py:269
msgid "Preview"
-msgstr ""
+msgstr "プレビュー"
#: tortoisehg/hgqt/hgemail_ui.py:270 tortoisehg/hgqt/postreview_ui.py:174
msgid "&Settings"
-msgstr ""
+msgstr "設定(&S)"
#: tortoisehg/hgqt/hgemail_ui.py:271
msgid "Send &Email"
-msgstr ""
+msgstr "メール送信(&E)"
#: tortoisehg/hgqt/hgignore.py:36 tortoisehg/hgtk/hgignore.py:34
#, python-format
@@ -1665,11 +1666,11 @@
#: tortoisehg/hgqt/hgignore.py:46
msgid "Glob"
-msgstr ""
+msgstr "グロブ"
#: tortoisehg/hgqt/hgignore.py:46
msgid "Regexp"
-msgstr ""
+msgstr "正規表現"
#: tortoisehg/hgqt/hgignore.py:53 tortoisehg/hgqt/qqueue.py:91
#: tortoisehg/hgqt/quickop.py:19 tortoisehg/hgqt/webconf.py:246
@@ -1727,7 +1728,7 @@
#: tortoisehg/hgqt/hginit.py:47
msgid "Make repo compatible with Mercurial <1.7"
-msgstr ""
+msgstr "Mercurial 1.7 互換のリポジトリを作成"
#: tortoisehg/hgqt/hginit.py:49
msgid "Show in Workbench after init"
@@ -1740,7 +1741,7 @@#: tortoisehg/hgqt/hginit.py:85 tortoisehg/hgqt/hginit.py:147
#: tortoisehg/hgqt/hginit.py:211 tortoisehg/hgqt/hginit.py:217
msgid "Init"
-msgstr ""
+msgstr "リポジトリを作成"
#: tortoisehg/hgqt/hginit.py:128 tortoisehg/hgqt/hginit.py:160
#: tortoisehg/hgqt/hginit.py:174 tortoisehg/hgqt/hginit.py:184
@@ -1801,7 +1802,7 @@
#: tortoisehg/hgqt/license.py:29
msgid "License"
-msgstr ""
+msgstr "ライセンス"
#: tortoisehg/hgqt/logcolumns.py:22
msgid "Workbench Log Columns"
@@ -1841,78 +1842,78 @@
#: tortoisehg/hgqt/merge.py:63 tortoisehg/hgqt/rebase.py:234
msgid "&Exit"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:220 tortoisehg/hgqt/revpanel.py:156
+msgstr "終了(&E)"
+
+#: tortoisehg/hgqt/merge.py:225 tortoisehg/hgqt/revpanel.py:156
#: tortoisehg/hgtk/merge.py:73
msgid "Not a head revision!"
msgstr "HEAD リビジョンではありません！"
-#: tortoisehg/hgqt/merge.py:227
+#: tortoisehg/hgqt/merge.py:232
msgid "Merge from (other revision)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgtk/merge.py:47
+#: tortoisehg/hgqt/merge.py:240 tortoisehg/hgtk/merge.py:47
#: tortoisehg/hgtk/merge.py:60
msgid "Unable to merge"
msgstr "マージできませんでした"
-#: tortoisehg/hgqt/merge.py:236
+#: tortoisehg/hgqt/merge.py:241
msgid "Merge revision not specified or not found"
msgstr ""
-#: tortoisehg/hgqt/merge.py:241
+#: tortoisehg/hgqt/merge.py:246
msgid "Merge to (working directory)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:250
+#: tortoisehg/hgqt/merge.py:255
msgid "Working directory status"
msgstr ""
-#: tortoisehg/hgqt/merge.py:266
+#: tortoisehg/hgqt/merge.py:271
msgid "<a href=\"view\">View changes...</a>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:272
+#: tortoisehg/hgqt/merge.py:277
msgid ""
"The workding directory is already <b>merged</b>. <a "
"href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "
"existing merge."
msgstr ""
-#: tortoisehg/hgqt/merge.py:281
+#: tortoisehg/hgqt/merge.py:286
msgid ""
"Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "
"href=\"shelve\"><b>shelve</b></a> to patch, or <a "
"href=\"discard\"><b>discard</b></a> changes."
msgstr ""
-#: tortoisehg/hgqt/merge.py:294
+#: tortoisehg/hgqt/merge.py:299
msgid "Or use:"
msgstr ""
-#: tortoisehg/hgqt/merge.py:297
+#: tortoisehg/hgqt/merge.py:302
msgid "Force a merge with outstanding changes (-f/--force)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:318 tortoisehg/hgtk/merge.py:118
+#: tortoisehg/hgqt/merge.py:323 tortoisehg/hgtk/merge.py:118
msgid "Discard all changes from merge target (other) revision"
msgstr "全ての変更点をマージ対象(other)のリビジョンから破棄する"
-#: tortoisehg/hgqt/merge.py:338 tortoisehg/hgqt/update.py:223
+#: tortoisehg/hgqt/merge.py:343 tortoisehg/hgqt/update.py:223
#: tortoisehg/hgtk/update.py:237
msgid "&Merge"
msgstr "マージ(&M)"
-#: tortoisehg/hgqt/merge.py:342
+#: tortoisehg/hgqt/merge.py:347
msgid "Merge another revision to the working directory"
msgstr ""
-#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgtk/merge.py:215
+#: tortoisehg/hgqt/merge.py:364 tortoisehg/hgtk/merge.py:215
msgid "Confirm Discard Changes"
msgstr ""
-#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:216
+#: tortoisehg/hgqt/merge.py:365 tortoisehg/hgtk/merge.py:216
#, python-format
msgid ""
"The changes from revision %s and all unmerged parents will be discarded.\n"
@@ -1920,121 +1921,121 @@"Are you sure this is what you want to do?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:370
+#: tortoisehg/hgqt/merge.py:375
msgid "Merging..."
msgstr ""
-#: tortoisehg/hgqt/merge.py:371
+#: tortoisehg/hgqt/merge.py:376
msgid "All conflicting files will be marked unresolved."
msgstr ""
-#: tortoisehg/hgqt/merge.py:388
+#: tortoisehg/hgqt/merge.py:393
msgid "Cancel merge and discard changes?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:389
+#: tortoisehg/hgqt/merge.py:394
msgid "Discard unfinished local changes and restart merge?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:392
+#: tortoisehg/hgqt/merge.py:397
msgid "Confirm Clean Up"
msgstr ""
-#: tortoisehg/hgqt/merge.py:395
+#: tortoisehg/hgqt/merge.py:400
msgid "Canceling merge...\n"
msgstr ""
-#: tortoisehg/hgqt/merge.py:396
+#: tortoisehg/hgqt/merge.py:401
msgid "(Please close any running merge tool)\n"
msgstr ""
-#: tortoisehg/hgqt/merge.py:416
+#: tortoisehg/hgqt/merge.py:421
msgid "Merge failed"
msgstr ""
-#: tortoisehg/hgqt/merge.py:416
+#: tortoisehg/hgqt/merge.py:421
msgid "Returning to first page"
msgstr ""
-#: tortoisehg/hgqt/merge.py:467
+#: tortoisehg/hgqt/merge.py:477
msgid "Rename Patch"
msgstr ""
-#: tortoisehg/hgqt/merge.py:468
+#: tortoisehg/hgqt/merge.py:478
msgid "Input a new patch name:"
msgstr ""
-#: tortoisehg/hgqt/merge.py:476
+#: tortoisehg/hgqt/merge.py:486
#, python-format
msgid ""
"The patch <b>%(old)s</b> is renamed to <b>%(new)s</b>. <a "
"href=\"rename:%(new)s\"><b>Rename</b></a> again?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:523
+#: tortoisehg/hgqt/merge.py:541
msgid "<b>Uncommitted local changes are detected</b>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:528 tortoisehg/hgtk/recovery.py:52
+#: tortoisehg/hgqt/merge.py:546 tortoisehg/hgtk/recovery.py:52
msgid "Clean"
msgstr "クリーン"
-#: tortoisehg/hgqt/merge.py:557 tortoisehg/hgtk/commit.py:237
+#: tortoisehg/hgqt/merge.py:575 tortoisehg/hgtk/commit.py:237
#: tortoisehg/hgtk/history.py:66 tortoisehg/hgtk/history.py:481
#: tortoisehg/hgtk/history.py:1223
msgid "Parents"
msgstr "親リビジョン"
-#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:514
+#: tortoisehg/hgqt/merge.py:579 tortoisehg/hgqt/repomodel.py:514
#: tortoisehg/hgqt/repomodel.py:516 tortoisehg/hgqt/shelve.py:24
#: tortoisehg/hgqt/thgimport.py:87
msgid "Working Directory"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:599
+msgstr "作業ディレクトリ"
+
+#: tortoisehg/hgqt/merge.py:617
msgid "Working Directory (merged)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:608
+#: tortoisehg/hgqt/merge.py:626
msgid "Commit message"
msgstr ""
-#: tortoisehg/hgqt/merge.py:615 tortoisehg/hgtk/commit.py:823
+#: tortoisehg/hgqt/merge.py:633 tortoisehg/hgtk/commit.py:823
msgid "Merge "
msgstr "マージ "
-#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:231
+#: tortoisehg/hgqt/merge.py:656 tortoisehg/hgqt/workbench.py:231
msgid "&Commit"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:644 tortoisehg/hgqt/qscilib.py:174
+msgstr "コミット(&C)"
+
+#: tortoisehg/hgqt/merge.py:662 tortoisehg/hgqt/qscilib.py:174
#: tortoisehg/hgtk/merge.py:137
msgid "Undo"
msgstr "取り消し"
-#: tortoisehg/hgqt/merge.py:654
+#: tortoisehg/hgqt/merge.py:672
msgid "Commit merged files"
msgstr ""
-#: tortoisehg/hgqt/merge.py:658
+#: tortoisehg/hgqt/merge.py:676
msgid "Committing..."
msgstr ""
-#: tortoisehg/hgqt/merge.py:659
+#: tortoisehg/hgqt/merge.py:677
msgid "Please wait while committing merged files."
msgstr ""
-#: tortoisehg/hgqt/merge.py:674
+#: tortoisehg/hgqt/merge.py:692
msgid ""
"There were <b>merge conflicts</b> that must be <a "
"href=\"resolve\"><b>resolved</b></a>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:679
+#: tortoisehg/hgqt/merge.py:697
msgid "No merge conflicts, ready to commit"
msgstr ""
-#: tortoisehg/hgqt/merge.py:731
+#: tortoisehg/hgqt/merge.py:749
msgid "Merge changeset"
msgstr ""
@@ -2072,7 +2073,7 @@
#: tortoisehg/hgqt/mq.py:159
msgid "Manage queues"
-msgstr ""
+msgstr "キューを管理"
#: tortoisehg/hgqt/mq.py:162 tortoisehg/hgqt/mq.py:680
#: tortoisehg/hgtk/commit.py:661
@@ -2167,11 +2168,11 @@msgid "Pending Perforce Changelists - %s"
msgstr "保留中の Perforce 変更リスト - %s"
-#: tortoisehg/hgqt/p4pending.py:94
+#: tortoisehg/hgqt/p4pending.py:96
msgid "Submitting p4 changelist..."
msgstr ""
-#: tortoisehg/hgqt/p4pending.py:106
+#: tortoisehg/hgqt/p4pending.py:108
msgid "Reverting p4 changelist..."
msgstr ""
@@ -2440,11 +2441,11 @@
#: tortoisehg/hgqt/qqueue.py:49 tortoisehg/hgqt/qreorder.py:41
msgid "Repository:"
-msgstr ""
+msgstr "リポジトリ:"
#: tortoisehg/hgqt/qqueue.py:68
msgid "Patch queues:"
-msgstr ""
+msgstr "パッチキュー:"
#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:703
#: tortoisehg/hgtk/thgconfig.py:680
@@ -2471,7 +2472,7 @@
#: tortoisehg/hgqt/qqueue.py:107
msgid "Patches:"
-msgstr ""
+msgstr "パッチ:"
#: tortoisehg/hgqt/qqueue.py:116
msgid "QQueue"
@@ -2511,7 +2512,7 @@#: tortoisehg/hgqt/qqueue.py:305
#, python-format
msgid ""
-"<p>This will also erase de patchfiles on disk!</p><p>Do you really want to "
+"<p>This will also erase the patchfiles on disk!</p><p>Do you really want to "
"purge patch queue '%s' ?</p>"
msgstr ""
@@ -2547,28 +2548,33 @@
#: tortoisehg/hgqt/qscilib.py:176
msgid "Redo"
-msgstr ""
+msgstr "やり直し"
#: tortoisehg/hgqt/qscilib.py:179
msgid "Cut"
-msgstr ""
+msgstr "切り取り"
#: tortoisehg/hgqt/qscilib.py:181 tortoisehg/hgqt/rename.py:159
msgid "Copy"
-msgstr ""
+msgstr "コピー"
#: tortoisehg/hgqt/qscilib.py:184
msgid "Paste"
-msgstr ""
+msgstr "貼り付け"
#: tortoisehg/hgqt/qscilib.py:189
msgid "Select All"
-msgstr ""
+msgstr "すべて選択"
#: tortoisehg/hgqt/qscilib.py:193
msgid "Wrap"
msgstr ""
+#: tortoisehg/hgqt/qscilib.py:194
+msgctxt "wrap mode"
+msgid "None"
+msgstr ""
+
#: tortoisehg/hgqt/qscilib.py:195
msgid "Word"
msgstr ""
@@ -2642,7 +2648,7 @@msgid "Checkmark files to remove"
msgstr ""
-#: tortoisehg/hgqt/quickop.py:22 tortoisehg/hgqt/sync.py:453
+#: tortoisehg/hgqt/quickop.py:22 tortoisehg/hgqt/sync.py:450
#: tortoisehg/hgqt/webconf_ui.py:80 tortoisehg/hgtk/bookmark.py:50
#: tortoisehg/hgtk/quickop.py:22 tortoisehg/hgtk/tagadd.py:40
msgid "Remove"
@@ -2864,7 +2870,7 @@
#: tortoisehg/hgqt/repofilter.py:92
msgid "filter"
-msgstr ""
+msgstr "フィルター"
#: tortoisehg/hgqt/repofilter.py:94
msgid "Toggle filtering of non-matched changesets"
@@ -2898,7 +2904,7 @@
#: tortoisehg/hgqt/reporegistry.py:90 tortoisehg/hgqt/webconf_ui.py:76
msgid "Open"
-msgstr ""
+msgstr "開く"
#: tortoisehg/hgqt/reporegistry.py:91
msgid "Open the repository in a new tab"
@@ -2906,7 +2912,7 @@
#: tortoisehg/hgqt/reporegistry.py:92
msgid "Open All"
-msgstr ""
+msgstr "すべて開く"
#: tortoisehg/hgqt/reporegistry.py:93
msgid "Open all repositories in new tabs"
@@ -2914,7 +2920,7 @@
#: tortoisehg/hgqt/reporegistry.py:94 tortoisehg/hgqt/reporegistry.py:161
msgid "New Group"
-msgstr ""
+msgstr "グループを追加"
#: tortoisehg/hgqt/reporegistry.py:95
msgid "Create a new group"
@@ -2926,7 +2932,7 @@
#: tortoisehg/hgqt/reporegistry.py:98
msgid "Settings..."
-msgstr ""
+msgstr "設定..."
#: tortoisehg/hgqt/reporegistry.py:99
msgid "View the repository's settings"
@@ -2947,21 +2953,21 @@
#: tortoisehg/hgqt/reporegistry.py:105
msgid "Clone Repository"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:451
+msgstr "リポジトリをクローン"
+
+#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:448
#: tortoisehg/hgqt/workbench.py:279
msgid "Explore"
-msgstr ""
+msgstr "エクスプローラ"
#: tortoisehg/hgqt/reporegistry.py:107
msgid "Open the repository in Windows Explorer"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:452
+#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:449
#: tortoisehg/hgqt/workbench.py:282
msgid "Terminal"
-msgstr ""
+msgstr "ターミナル"
#: tortoisehg/hgqt/reporegistry.py:109
msgid "Open a shell terminal in repository root"
@@ -2969,7 +2975,7 @@
#: tortoisehg/hgqt/reporegistry.py:110
msgid "Add repository..."
-msgstr ""
+msgstr "リポジトリを追加..."
#: tortoisehg/hgqt/reporegistry.py:111
msgid "Add a repository to this group"
@@ -2977,7 +2983,7 @@
#: tortoisehg/hgqt/reporegistry.py:221
msgid "Repository Registry"
-msgstr ""
+msgstr "リポジトリ一覧"
#: tortoisehg/hgqt/repotreeitem.py:228
#, python-format
@@ -2986,7 +2992,7 @@
#: tortoisehg/hgqt/repotreeitem.py:282 tortoisehg/hgqt/wctxactions.py:300
msgid "&Delete"
-msgstr ""
+msgstr "削除(&D)"
#: tortoisehg/hgqt/repotreeitem.py:285 tortoisehg/hgtk/thgmq.py:372
#: tortoisehg/hgtk/thgmq.py:376 tortoisehg/hgtk/thgshelve.py:224
@@ -3003,19 +3009,19 @@msgstr ""
#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:362
-#: tortoisehg/hgqt/sync.py:198 tortoisehg/hgqt/webconf.py:266
+#: tortoisehg/hgqt/sync.py:195 tortoisehg/hgqt/webconf.py:266
msgid "Path"
msgstr ""
#: tortoisehg/hgqt/repotreemodel.py:207
msgid "Select repository directory to add"
-msgstr ""
+msgstr "ディレクトリを選択してリポジトリを追加"
#: tortoisehg/hgqt/repotreemodel.py:220
msgid "Failed to add repository"
msgstr ""
-#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:581
+#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:582
#, python-format
msgid "%s is not a valid repository"
msgstr ""
@@ -3030,96 +3036,96 @@msgid "Can't find revision '%s'"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:102
+#: tortoisehg/hgqt/repowidget.py:103
msgid "Pull incoming changesets into your repository"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:105 tortoisehg/hgtk/history.py:1886
+#: tortoisehg/hgqt/repowidget.py:106 tortoisehg/hgtk/history.py:1886
msgid "Reject"
msgstr "破棄する"
-#: tortoisehg/hgqt/repowidget.py:106
+#: tortoisehg/hgqt/repowidget.py:107
msgid "Reject incoming changesets"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:156
+#: tortoisehg/hgqt/repowidget.py:157
msgid "Revision details"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:164 tortoisehg/hgtk/gdialog.py:495
+#: tortoisehg/hgqt/repowidget.py:165 tortoisehg/hgtk/gdialog.py:495
#: tortoisehg/hgtk/thgconfig.py:170 tortoisehg/util/menuthg.py:52
msgid "Synchronize"
msgstr "同期ツール"
-#: tortoisehg/hgqt/repowidget.py:168
+#: tortoisehg/hgqt/repowidget.py:169
msgid "Manifest"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:177 tortoisehg/hgtk/commit.py:227
+msgstr "マニフェスト"
+
+#: tortoisehg/hgqt/repowidget.py:178 tortoisehg/hgtk/commit.py:227
#: tortoisehg/hgtk/commit.py:309 tortoisehg/hgtk/history.py:258
#: tortoisehg/hgtk/history.py:368 tortoisehg/hgtk/thgimport.py:111
msgid "Patch Queue"
msgstr "MQ"
-#: tortoisehg/hgqt/repowidget.py:185 tortoisehg/hgtk/history.py:266
+#: tortoisehg/hgqt/repowidget.py:186 tortoisehg/hgtk/history.py:266
#: tortoisehg/hgtk/history.py:385
msgid "Patch Branch"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:198
+#: tortoisehg/hgqt/repowidget.py:199
#, python-format
msgid "%s <incoming>"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:482
+#: tortoisehg/hgqt/repowidget.py:483
#, python-format
msgid "%s - verify repository"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:489
+#: tortoisehg/hgqt/repowidget.py:490
#, python-format
msgid "%s - recover repository"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:505
+#: tortoisehg/hgqt/repowidget.py:506
msgid "No transaction available"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:506
+#: tortoisehg/hgqt/repowidget.py:507
msgid "There is no rollback transaction available"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:509 tortoisehg/hgtk/commit.py:1035
+#: tortoisehg/hgqt/repowidget.py:510 tortoisehg/hgtk/commit.py:1035
msgid "Undo last commit?"
msgstr "直前のコミットを取り消しますか？"
-#: tortoisehg/hgqt/repowidget.py:510
+#: tortoisehg/hgqt/repowidget.py:511
#, python-format
msgid "Undo most recent commit (%d), preserving file changes?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:514
+#: tortoisehg/hgqt/repowidget.py:515
msgid "Undo last transaction?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:515
+#: tortoisehg/hgqt/repowidget.py:516
#, python-format
msgid "Rollback to revision %d (undo %s)?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:521
+#: tortoisehg/hgqt/repowidget.py:522
msgid "Repository Error"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:522
+#: tortoisehg/hgqt/repowidget.py:523
msgid "Unable to determine working copy revision\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:526
+#: tortoisehg/hgqt/repowidget.py:527
msgid "Remove current working revision?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:527
+#: tortoisehg/hgqt/repowidget.py:528
#, python-format
msgid ""
"Your current working revision (%d) will be removed by this rollback, leaving "
@@ -3127,193 +3133,201 @@" Continue?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:741
+#: tortoisehg/hgqt/repowidget.py:641
+msgid "Repository stripped, incoming preview cleared"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:646
+msgid "Repository stripped, revision set cleared"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:758
msgid "Commit tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:745
+#: tortoisehg/hgqt/repowidget.py:762
msgid "Sync tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:749
+#: tortoisehg/hgqt/repowidget.py:766
msgid "MQ tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:753
+#: tortoisehg/hgqt/repowidget.py:770
msgid "Search tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:756
+#: tortoisehg/hgqt/repowidget.py:773
msgid "Repository command still running"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:910 tortoisehg/util/menuthg.py:58
+#: tortoisehg/hgqt/repowidget.py:927 tortoisehg/util/menuthg.py:58
msgid "Update..."
msgstr "特定のリビジョンへ更新..."
-#: tortoisehg/hgqt/repowidget.py:913 tortoisehg/hgqt/repowidget.py:1123
+#: tortoisehg/hgqt/repowidget.py:930 tortoisehg/hgqt/repowidget.py:1140
msgid "Visual diff..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:915
+msgstr "GUI 差分表示..."
+
+#: tortoisehg/hgqt/repowidget.py:932
msgid "Diff to local..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:917
+msgstr "ローカルとの差分..."
+
+#: tortoisehg/hgqt/repowidget.py:934
msgid "Browse at rev..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:920
+msgstr "このリビジョンのファイルを閲覧"
+
+#: tortoisehg/hgqt/repowidget.py:937
msgid "Merge with local..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:923
+msgstr "ローカルとマージ..."
+
+#: tortoisehg/hgqt/repowidget.py:940
msgid "Tag..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:925
+msgstr "タグ..."
+
+#: tortoisehg/hgqt/repowidget.py:942
msgid "Bookmark..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:928 tortoisehg/hgtk/history.py:1290
+msgstr "ブックマーク..."
+
+#: tortoisehg/hgqt/repowidget.py:945 tortoisehg/hgtk/history.py:1290
msgid "Backout..."
msgstr "バックアウト..."
-#: tortoisehg/hgqt/repowidget.py:932 tortoisehg/hgtk/history.py:1293
+#: tortoisehg/hgqt/repowidget.py:949 tortoisehg/hgtk/history.py:1293
msgid "Export"
msgstr "エクスポート"
-#: tortoisehg/hgqt/repowidget.py:933
+#: tortoisehg/hgqt/repowidget.py:950
msgid "Export patch"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:935
+msgstr "パッチをエクスポート"
+
+#: tortoisehg/hgqt/repowidget.py:952
msgid "Email patch..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:937
+msgstr "パッチをメール送信..."
+
+#: tortoisehg/hgqt/repowidget.py:954
msgid "Archive..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:939 tortoisehg/hgqt/wctxactions.py:46
+msgstr "アーカイブ..."
+
+#: tortoisehg/hgqt/repowidget.py:956 tortoisehg/hgqt/wctxactions.py:46
msgid "Copy patch"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:943
+msgstr "パッチをコピー"
+
+#: tortoisehg/hgqt/repowidget.py:960
msgid "Copy hash"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:947
+msgstr "ハッシュをコピー"
+
+#: tortoisehg/hgqt/repowidget.py:964
msgid "Transplant to local"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:951
+#: tortoisehg/hgqt/repowidget.py:968
msgid "Modify history"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:952 tortoisehg/hgqt/repowidget.py:1084
+msgstr "履歴を修正"
+
+#: tortoisehg/hgqt/repowidget.py:969 tortoisehg/hgqt/repowidget.py:1101
msgid "QGoto"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:954
+#: tortoisehg/hgqt/repowidget.py:971
msgid "Import to MQ"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:956
+msgstr "MQ へインポート"
+
+#: tortoisehg/hgqt/repowidget.py:973
msgid "Finish patch"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:959
+msgstr "パッチを通常リビジョン化"
+
+#: tortoisehg/hgqt/repowidget.py:976
msgid "Rebase..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:962
+msgstr "リベース..."
+
+#: tortoisehg/hgqt/repowidget.py:979
msgid "Strip..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:965
+#: tortoisehg/hgqt/repowidget.py:982
msgid "Post to Review Board..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1020
+#: tortoisehg/hgqt/repowidget.py:1037
msgid "Unable to compress history"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1021
+#: tortoisehg/hgqt/repowidget.py:1038
msgid "Selected changeset pair not related"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1029
+#: tortoisehg/hgqt/repowidget.py:1046
msgid "Visual Diff..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1030 tortoisehg/hgqt/repowidget.py:1105
+msgstr "GUI 差分表示..."
+
+#: tortoisehg/hgqt/repowidget.py:1047 tortoisehg/hgqt/repowidget.py:1122
msgid "Export Selected"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1031 tortoisehg/hgqt/repowidget.py:1106
+msgstr "選択範囲をエクスポート"
+
+#: tortoisehg/hgqt/repowidget.py:1048 tortoisehg/hgqt/repowidget.py:1123
msgid "Email Selected..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1032
+msgstr "選択範囲をメール送信..."
+
+#: tortoisehg/hgqt/repowidget.py:1049
msgid "Export DAG Range"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1033
+msgstr "DAG 範囲をエクスポート"
+
+#: tortoisehg/hgqt/repowidget.py:1050
msgid "Email DAG Range..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1034
+msgstr "DAG 範囲をメール送信..."
+
+#: tortoisehg/hgqt/repowidget.py:1051
msgid "Bisect - Good, Bad..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1035
+#: tortoisehg/hgqt/repowidget.py:1052
msgid "Bisect - Bad, Good..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1036
+#: tortoisehg/hgqt/repowidget.py:1053
msgid "Compress History..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1044
+#: tortoisehg/hgqt/repowidget.py:1061
msgid "Post Pair to Review Board..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1063
+#: tortoisehg/hgqt/repowidget.py:1080
msgid ""
"<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "
"them.<br><br>Continue?</p>"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1085
+#: tortoisehg/hgqt/repowidget.py:1102
msgid "QPush --move"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1086
+#: tortoisehg/hgqt/repowidget.py:1103
msgid "Fold patches..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1087
+#: tortoisehg/hgqt/repowidget.py:1104
msgid "Delete patches..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1088
+msgstr "パッチを削除..."
+
+#: tortoisehg/hgqt/repowidget.py:1105
msgid "Reorder patches..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1114
+msgstr "パッチの順序を変更..."
+
+#: tortoisehg/hgqt/repowidget.py:1131
msgid "Post Selected to Review Board..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1122
+#: tortoisehg/hgqt/repowidget.py:1139
msgid "Pull to here..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1289
+#: tortoisehg/hgqt/repowidget.py:1306
msgid "Unable to start"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1290
+#: tortoisehg/hgqt/repowidget.py:1307
msgid "Previous command is still running"
msgstr ""
@@ -4268,11 +4282,11 @@
#: tortoisehg/hgqt/serve.py:40
msgid "Log"
-msgstr ""
+msgstr "ログ"
#: tortoisehg/hgqt/serve.py:47
msgid "Repositories"
-msgstr ""
+msgstr "リポジトリ"
#: tortoisehg/hgqt/serve.py:68
#, python-format
@@ -4281,7 +4295,7 @@
#: tortoisehg/hgqt/serve.py:70
msgid "Stopped"
-msgstr ""
+msgstr "停止"
#: tortoisehg/hgqt/serve_ui.py:83 tortoisehg/hgtk/gdialog.py:491
#: tortoisehg/hgtk/history.py:288
@@ -4290,11 +4304,11 @@
#: tortoisehg/hgqt/serve_ui.py:84
msgid "Port:"
-msgstr ""
+msgstr "ポート:"
#: tortoisehg/hgqt/serve_ui.py:85
msgid "Status:"
-msgstr ""
+msgstr "状態:"
#: tortoisehg/hgqt/serve_ui.py:86 tortoisehg/hgtk/serve.py:61
msgid "Start"
@@ -4311,7 +4325,7 @@
#: tortoisehg/hgqt/settings.py:264 tortoisehg/hgtk/thgconfig.py:43
msgid "UI Language"
-msgstr ""
+msgstr "UI 言語"
#: tortoisehg/hgqt/settings.py:266 tortoisehg/hgtk/thgconfig.py:44
msgid "Specify your preferred user interface language (restart needed)"
@@ -4461,7 +4475,7 @@
#: tortoisehg/hgqt/settings.py:325 tortoisehg/util/menuthg.py:46
msgid "Workbench"
-msgstr ""
+msgstr "ワークベンチ"
#: tortoisehg/hgqt/settings.py:326 tortoisehg/hgtk/thgconfig.py:130
msgid "Author Coloring"
@@ -4553,7 +4567,7 @@"操作は正常にプルが完了するとすぐに実行されます。update は \"pull --update\"、フェッチは fetch 拡張機能、rebase は "
"\"pull --rebase\" と見なします。デフォルトでは特に指定がありません。"
-#: tortoisehg/hgqt/settings.py:368 tortoisehg/hgqt/sync.py:1116
+#: tortoisehg/hgqt/settings.py:368 tortoisehg/hgqt/sync.py:1113
#: tortoisehg/hgtk/thgconfig.py:90
msgid "Username"
msgstr "ユーザ名"
@@ -4674,7 +4688,7 @@msgid "Comma separated list of archive formats allowed for downloading"
msgstr "ダンロード可能なアーカイブ形式をカンマ区切りで指定。"
-#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgqt/sync.py:187
+#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgqt/sync.py:184
#: tortoisehg/hgtk/thgconfig.py:195 tortoisehg/hgtk/thgconfig.py:368
msgid "Port"
msgstr "ポート番号"
@@ -4788,7 +4802,7 @@msgstr "任意。プロキシサーバの認証に必要なユーザ名。"
#: tortoisehg/hgqt/settings.py:453 tortoisehg/hgqt/settings.py:553
-#: tortoisehg/hgqt/sync.py:1124 tortoisehg/hgtk/thgconfig.py:234
+#: tortoisehg/hgqt/sync.py:1121 tortoisehg/hgtk/thgconfig.py:234
#: tortoisehg/hgtk/thgconfig.py:370
msgid "Password"
msgstr "パスワード"
@@ -4973,11 +4987,11 @@
#: tortoisehg/hgqt/settings.py:526
msgid "Fonts"
-msgstr ""
+msgstr "フォント"
#: tortoisehg/hgqt/settings.py:527
msgid "Message Font"
-msgstr ""
+msgstr "メッセージフォント"
#: tortoisehg/hgqt/settings.py:528
msgid "Font used to display commit messages. Default: monospace 10"
@@ -4985,7 +4999,7 @@
#: tortoisehg/hgqt/settings.py:530
msgid "Diff Font"
-msgstr ""
+msgstr "差分フォント"
#: tortoisehg/hgqt/settings.py:531
msgid "Font used to display text differences. Default: monospace 10"
@@ -4993,7 +5007,7 @@
#: tortoisehg/hgqt/settings.py:533
msgid "List Font"
-msgstr ""
+msgstr "一覧フォント"
#: tortoisehg/hgqt/settings.py:534
msgid "Font used to display file lists. Default: sans 9"
@@ -5001,7 +5015,7 @@
#: tortoisehg/hgqt/settings.py:536
msgid "ChangeLog Font"
-msgstr ""
+msgstr "チェンジログフォント"
#: tortoisehg/hgqt/settings.py:537
msgid "Font used to display changelog data. Default: monospace 10"
@@ -5009,7 +5023,7 @@
#: tortoisehg/hgqt/settings.py:539
msgid "Output Font"
-msgstr ""
+msgstr "コマンド出力フォント"
#: tortoisehg/hgqt/settings.py:540
msgid "Font used to display output messages. Default: sans 8"
@@ -5018,7 +5032,7 @@#: tortoisehg/hgqt/settings.py:544 tortoisehg/hgqt/settings.py:957
#: tortoisehg/hgtk/thgconfig.py:318
msgid "Extensions"
-msgstr ""
+msgstr "エクステンション"
#: tortoisehg/hgqt/settings.py:548
msgid "Server"
@@ -5249,7 +5263,7 @@msgstr ""
#: tortoisehg/hgqt/shelve.py:112 tortoisehg/hgqt/shelve.py:163
-msgid "Deleted selected chunks"
+msgid "Delete selected chunks"
msgstr ""
#: tortoisehg/hgqt/shelve.py:116
@@ -5477,257 +5491,257 @@msgid "%s is a dirty subrepo"
msgstr ""
-#: tortoisehg/hgqt/sync.py:87
+#: tortoisehg/hgqt/sync.py:84
msgid "TortoiseHg Sync"
msgstr ""
+#: tortoisehg/hgqt/sync.py:102
+msgid "Preview incoming changesets from remote repository"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:105
-msgid "Preview incoming changesets from remote repository"
+msgid "Pull incoming changesets from remote repository"
msgstr ""
#: tortoisehg/hgqt/sync.py:108
-msgid "Pull incoming changesets from remote repository"
+msgid "Filter outgoing changesets to remote repository"
msgstr ""
#: tortoisehg/hgqt/sync.py:111
-msgid "Filter outgoing changesets to remote repository"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:114
msgid "Push outgoing changesets to remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:116
+#: tortoisehg/hgqt/sync.py:113
msgid "Email outgoing changesets for remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:121
+#: tortoisehg/hgqt/sync.py:118
msgid "Manage pending perforce changelists"
msgstr ""
-#: tortoisehg/hgqt/sync.py:128
+#: tortoisehg/hgqt/sync.py:125
msgid "Stop current operation"
msgstr ""
-#: tortoisehg/hgqt/sync.py:142 tortoisehg/hgqt/update.py:68
+#: tortoisehg/hgqt/sync.py:139 tortoisehg/hgqt/update.py:68
#: tortoisehg/hgtk/update.py:78
msgid "Target:"
msgstr "対象:"
-#: tortoisehg/hgqt/sync.py:154
+#: tortoisehg/hgqt/sync.py:151
msgid "<b>Remote Repository:</b>"
msgstr ""
-#: tortoisehg/hgqt/sync.py:173
+#: tortoisehg/hgqt/sync.py:170
msgid "Manage HTTPS connection security and user authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:177
+#: tortoisehg/hgqt/sync.py:174
msgid "Hostname"
msgstr ""
-#: tortoisehg/hgqt/sync.py:203
+#: tortoisehg/hgqt/sync.py:200
msgid "Save current URL under an alias"
msgstr ""
-#: tortoisehg/hgqt/sync.py:217
+#: tortoisehg/hgqt/sync.py:214
msgid "Paths in Repository Settings:"
msgstr ""
-#: tortoisehg/hgqt/sync.py:232
+#: tortoisehg/hgqt/sync.py:229
msgid "Related Paths:"
msgstr ""
+#: tortoisehg/hgqt/sync.py:261
+#, python-format
+msgid "Preview incoming changesets from %s"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:262
+#, python-format
+msgid "Pull incoming changesets from %s"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:263
+#, python-format
+msgid "Filter outgoing changesets to %s"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:264
#, python-format
-msgid "Preview incoming changesets from %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:265
-#, python-format
-msgid "Pull incoming changesets from %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:266
-#, python-format
-msgid "Filter outgoing changesets to %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:267
-#, python-format
msgid "Push outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:274
+#: tortoisehg/hgqt/sync.py:271
#, python-format
msgid "rev: %d (%s)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:279 tortoisehg/hgtk/commit.py:792
+#: tortoisehg/hgqt/sync.py:276 tortoisehg/hgtk/commit.py:792
msgid "branch: "
msgstr "ブランチ: "
-#: tortoisehg/hgqt/sync.py:285
+#: tortoisehg/hgqt/sync.py:282
msgid "bookmark: "
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:335 tortoisehg/hgtk/synch.py:157
+msgstr "ブックマーク: "
+
+#: tortoisehg/hgqt/sync.py:332 tortoisehg/hgtk/synch.py:157
msgid "Post Pull: "
msgstr "プル後の処理: "
-#: tortoisehg/hgqt/sync.py:479
+#: tortoisehg/hgqt/sync.py:476
msgid "Repository not local"
msgstr ""
-#: tortoisehg/hgqt/sync.py:480
+#: tortoisehg/hgqt/sync.py:477
msgid "A terminal shell cannot be opened for remote"
msgstr ""
-#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:681
+#: tortoisehg/hgqt/sync.py:488 tortoisehg/hgqt/workbench.py:686
msgid "No shell configured"
msgstr ""
-#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:682
+#: tortoisehg/hgqt/sync.py:489 tortoisehg/hgqt/workbench.py:687
msgid "A terminal shell must be configured"
msgstr ""
-#: tortoisehg/hgqt/sync.py:494 tortoisehg/hgqt/sync.py:1235
+#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/sync.py:1232
msgid "Confirm path delete"
msgstr ""
-#: tortoisehg/hgqt/sync.py:495 tortoisehg/hgqt/sync.py:1236
+#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/sync.py:1233
#, python-format
msgid "Delete %s from your repo configuration file?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:573
+#: tortoisehg/hgqt/sync.py:570
msgid "No URL selected"
msgstr ""
-#: tortoisehg/hgqt/sync.py:574
+#: tortoisehg/hgqt/sync.py:571
msgid "An URL must be selected for this operation."
msgstr ""
-#: tortoisehg/hgqt/sync.py:589
+#: tortoisehg/hgqt/sync.py:586
msgid "Redundant authentication info"
msgstr ""
-#: tortoisehg/hgqt/sync.py:590
+#: tortoisehg/hgqt/sync.py:587
msgid ""
"You have authentication info configured for this host and inside this URL. "
"Remove authentication info from this URL?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:609 tortoisehg/hgqt/sync.py:615
-#: tortoisehg/hgqt/sync.py:621 tortoisehg/hgqt/sync.py:627
-#: tortoisehg/hgqt/sync.py:634
+#: tortoisehg/hgqt/sync.py:606 tortoisehg/hgqt/sync.py:612
+#: tortoisehg/hgqt/sync.py:618 tortoisehg/hgqt/sync.py:624
+#: tortoisehg/hgqt/sync.py:631
msgid "sync command already running"
msgstr ""
-#: tortoisehg/hgqt/sync.py:651
+#: tortoisehg/hgqt/sync.py:648
#, python-format
msgid "Getting incoming changesets from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:656 tortoisehg/hgqt/sync.py:674
+#: tortoisehg/hgqt/sync.py:653 tortoisehg/hgqt/sync.py:671
#, python-format
msgid "Found incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:659 tortoisehg/hgqt/sync.py:676
+#: tortoisehg/hgqt/sync.py:656 tortoisehg/hgqt/sync.py:673
#, python-format
msgid "No incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:661 tortoisehg/hgqt/sync.py:678
+#: tortoisehg/hgqt/sync.py:658 tortoisehg/hgqt/sync.py:675
#, python-format
msgid "Incoming from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:687
+#: tortoisehg/hgqt/sync.py:684
#, python-format
msgid "Pull from %s completed"
msgstr ""
-#: tortoisehg/hgqt/sync.py:689
+#: tortoisehg/hgqt/sync.py:686
#, python-format
msgid "Pull from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:699 tortoisehg/hgqt/update.py:304
+#: tortoisehg/hgqt/sync.py:696 tortoisehg/hgqt/update.py:304
msgid "Merge caused file conflicts"
msgstr ""
-#: tortoisehg/hgqt/sync.py:700 tortoisehg/hgqt/update.py:305
+#: tortoisehg/hgqt/sync.py:697 tortoisehg/hgqt/update.py:305
msgid "File conflicts need to be resolved"
msgstr ""
-#: tortoisehg/hgqt/sync.py:706
+#: tortoisehg/hgqt/sync.py:703
#, python-format
msgid "Pulling from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:720
+#: tortoisehg/hgqt/sync.py:717
#, python-format
msgid "Finding outgoing changesets to %s..."
msgstr ""
+#: tortoisehg/hgqt/sync.py:723
+#, python-format
+msgid "%d outgoing changesets to %s"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:726
#, python-format
-msgid "%d outgoing changesets to %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:729
-#, python-format
msgid "No outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:731
+#: tortoisehg/hgqt/sync.py:728
#, python-format
msgid "Outgoing to %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:756 tortoisehg/hgtk/history.py:584
+#: tortoisehg/hgqt/sync.py:753 tortoisehg/hgtk/history.py:584
#, python-format
msgid "%s (submitted)"
msgstr "%s (送信完了)"
-#: tortoisehg/hgqt/sync.py:758 tortoisehg/hgtk/history.py:586
+#: tortoisehg/hgqt/sync.py:755 tortoisehg/hgtk/history.py:586
#: tortoisehg/hgtk/history.py:592
#, python-format
msgid "%s (pending)"
msgstr "%s (保留中)"
-#: tortoisehg/hgqt/sync.py:763 tortoisehg/hgtk/history.py:595
+#: tortoisehg/hgqt/sync.py:760 tortoisehg/hgtk/history.py:595
msgid "Unable to parse p4pending output"
msgstr "p4pendingの出力結果を解析できませんでした"
-#: tortoisehg/hgqt/sync.py:765 tortoisehg/hgtk/history.py:597
+#: tortoisehg/hgqt/sync.py:762 tortoisehg/hgtk/history.py:597
#, python-format
msgid "%d pending changelists found"
msgstr "%d 個の保留中の変更リストが見つかりました"
-#: tortoisehg/hgqt/sync.py:767 tortoisehg/hgtk/history.py:599
+#: tortoisehg/hgqt/sync.py:764 tortoisehg/hgtk/history.py:599
msgid "No pending Perforce changelists"
msgstr "保留中の Perforce 変更リストはありません"
-#: tortoisehg/hgqt/sync.py:769 tortoisehg/hgtk/history.py:601
+#: tortoisehg/hgqt/sync.py:766 tortoisehg/hgtk/history.py:601
msgid "Aborted p4pending"
msgstr "p4pending 中断"
-#: tortoisehg/hgqt/sync.py:771 tortoisehg/hgtk/history.py:603
+#: tortoisehg/hgqt/sync.py:768 tortoisehg/hgtk/history.py:603
msgid "Unable to determine pending changesets"
msgstr "保留中の変更リストを決定できません"
-#: tortoisehg/hgqt/sync.py:781
+#: tortoisehg/hgqt/sync.py:778
msgid "Perforce pending..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:787 tortoisehg/hgtk/history.py:2633
+#: tortoisehg/hgqt/sync.py:784 tortoisehg/hgtk/history.py:2633
msgid "Confirm Push to remote Repository"
msgstr "プッシュの確認"
-#: tortoisehg/hgqt/sync.py:788 tortoisehg/hgtk/history.py:2634
+#: tortoisehg/hgqt/sync.py:785 tortoisehg/hgtk/history.py:2634
#, python-format
msgid ""
"Push to remote repository\n"
@@ -5737,159 +5751,159 @@"リモートリポジトリへプッシュしてもよろしいですか？\n"
"%s"
+#: tortoisehg/hgqt/sync.py:788
+#, python-format
+msgid "Push to %s aborted"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:791
#, python-format
-msgid "Push to %s aborted"
+msgid "Pushing to %s..."
msgstr ""
#: tortoisehg/hgqt/sync.py:794
#, python-format
-msgid "Pushing to %s..."
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:797
-#, python-format
msgid "Push to %s completed"
msgstr ""
-#: tortoisehg/hgqt/sync.py:799
+#: tortoisehg/hgqt/sync.py:796
#, python-format
msgid "Push to %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:811
+#: tortoisehg/hgqt/sync.py:808
msgid "Determining outgoing changesets to email..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:815 tortoisehg/hgtk/history.py:2026
+#: tortoisehg/hgqt/sync.py:812 tortoisehg/hgtk/history.py:2026
#, python-format
msgid "%d outgoing changesets"
msgstr "%d 件の送信チェンジセット"
-#: tortoisehg/hgqt/sync.py:825 tortoisehg/hgtk/history.py:2030
+#: tortoisehg/hgqt/sync.py:822 tortoisehg/hgtk/history.py:2030
msgid "No outgoing changesets"
msgstr "送信チェンジセットがありません"
-#: tortoisehg/hgqt/sync.py:827
+#: tortoisehg/hgqt/sync.py:824
#, python-format
msgid "Outgoing aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:839
+#: tortoisehg/hgqt/sync.py:836
msgid "Unable to remove URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:861
+#: tortoisehg/hgqt/sync.py:858
msgid "Post Pull Behavior"
msgstr ""
+#: tortoisehg/hgqt/sync.py:862
+msgid "Select post-pull operation for this repository"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:865
-msgid "Select post-pull operation for this repository"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:868
msgid "None - simply pull changesets"
msgstr ""
-#: tortoisehg/hgqt/sync.py:869
+#: tortoisehg/hgqt/sync.py:866
msgid "Update - pull, then try to update"
msgstr ""
-#: tortoisehg/hgqt/sync.py:875
+#: tortoisehg/hgqt/sync.py:872
msgid "Fetch - use fetch (auto merge pulled changes)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:877
+#: tortoisehg/hgqt/sync.py:874
msgid "Fetch - use fetch extension (fetch is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:884
+#: tortoisehg/hgqt/sync.py:881
msgid "Rebase - rebase local commits above pulled changes"
msgstr ""
-#: tortoisehg/hgqt/sync.py:886
+#: tortoisehg/hgqt/sync.py:883
msgid "Rebase - use rebase extension (rebase is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:904
+#: tortoisehg/hgqt/sync.py:901
msgid "<a href=\"config\">Launch settings tool...</a>"
msgstr ""
-#: tortoisehg/hgqt/sync.py:937
+#: tortoisehg/hgqt/sync.py:934
msgid "Unable to save post pull operation"
msgstr ""
-#: tortoisehg/hgqt/sync.py:961
+#: tortoisehg/hgqt/sync.py:958
msgid "Save Path"
msgstr ""
-#: tortoisehg/hgqt/sync.py:971 tortoisehg/hgqt/sync.py:1279
+#: tortoisehg/hgqt/sync.py:968 tortoisehg/hgqt/sync.py:1276
#: tortoisehg/hgtk/thgconfig.py:371 tortoisehg/hgtk/thgconfig.py:954
msgid "Alias"
msgstr "エイリアス"
-#: tortoisehg/hgqt/sync.py:974 tortoisehg/hgqt/sync.py:1279
+#: tortoisehg/hgqt/sync.py:971 tortoisehg/hgqt/sync.py:1276
#: tortoisehg/hgtk/thgconfig.py:368
msgid "URL"
msgstr "URL"
-#: tortoisehg/hgqt/sync.py:983
+#: tortoisehg/hgqt/sync.py:980
msgid "Remove authentication data from URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:985
+#: tortoisehg/hgqt/sync.py:982
msgid ""
"User authentication data should be associated with the hostname using the "
"security dialog."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1007
+#: tortoisehg/hgqt/sync.py:1004
msgid "Unable to save an URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1018
+#: tortoisehg/hgqt/sync.py:1015
msgid "Confirm URL replace"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1019
+#: tortoisehg/hgqt/sync.py:1016
#, python-format
msgid "%s already exists, replace URL?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1047
+#: tortoisehg/hgqt/sync.py:1044
msgid "Security: "
msgstr ""
-#: tortoisehg/hgqt/sync.py:1062
+#: tortoisehg/hgqt/sync.py:1059
#, python-format
msgid "<b>Host:</b> %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1064
+#: tortoisehg/hgqt/sync.py:1061
msgid "Secure HTTPS Connection"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1071
+#: tortoisehg/hgqt/sync.py:1068
msgid "Verify with Certificate Authority certificates (best)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1073
+#: tortoisehg/hgqt/sync.py:1070
msgid "Verify with stored host fingerprint (good)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1075
+#: tortoisehg/hgqt/sync.py:1072
msgid "No host validation, but still encrypted (bad)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1086
+#: tortoisehg/hgqt/sync.py:1083
msgid "Query"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1105
+#: tortoisehg/hgqt/sync.py:1102
msgid "User Authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1112
+#: tortoisehg/hgqt/sync.py:1109
msgid ""
"Optional. Username to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
@@ -5897,64 +5911,64 @@"foo.username = $USER."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1121
+#: tortoisehg/hgqt/sync.py:1118
msgid ""
"Optional. Password to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
"it."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1128
+#: tortoisehg/hgqt/sync.py:1125
msgid ""
"Mercurial keyring extension is enabled. Passwords will be stored in a "
"platform-native secure method."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1134
+#: tortoisehg/hgqt/sync.py:1131
msgid ""
"Optional. PEM encoded client certificate key file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1136
+#: tortoisehg/hgqt/sync.py:1133
msgid "User Certificate Key File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1140
+#: tortoisehg/hgqt/sync.py:1137
msgid ""
"Optional. PEM encoded client certificate chain file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1142
+#: tortoisehg/hgqt/sync.py:1139
msgid "User Certificate Chain File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1162
+#: tortoisehg/hgqt/sync.py:1159
msgid "Unable to save authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1333
+#: tortoisehg/hgqt/sync.py:1330
msgid "Unable to create a config file"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1334
+#: tortoisehg/hgqt/sync.py:1331
msgid "Insufficient access rights."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1351
+#: tortoisehg/hgqt/sync.py:1348
msgid "Allow push of a new branch (--new-branch)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1355
+#: tortoisehg/hgqt/sync.py:1352
msgid "Force push or pull (override safety checks, --force)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1360
+#: tortoisehg/hgqt/sync.py:1357
msgid "Recurse into subrepositories (--subrepos)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1365
+#: tortoisehg/hgqt/sync.py:1362
msgid "Temporarily disable configured HTTP proxy"
msgstr ""
@@ -6084,21 +6098,21 @@msgid "Select patches"
msgstr ""
-#: tortoisehg/hgqt/thgimport.py:185
+#: tortoisehg/hgqt/thgimport.py:186
msgid "Select Directory containing patches"
msgstr ""
-#: tortoisehg/hgqt/thgimport.py:206 tortoisehg/hgtk/thgimport.py:281
+#: tortoisehg/hgqt/thgimport.py:209 tortoisehg/hgtk/thgimport.py:281
#, python-format
msgid "%s patches"
msgstr "%s パッチ"
-#: tortoisehg/hgqt/thgimport.py:209
+#: tortoisehg/hgqt/thgimport.py:212
#, python-format
msgid "%s will be imported to "
msgstr ""
-#: tortoisehg/hgqt/thgimport.py:212 tortoisehg/hgtk/thgimport.py:287
+#: tortoisehg/hgqt/thgimport.py:215 tortoisehg/hgtk/thgimport.py:287
msgid "Nothing to import"
msgstr "インポートするパッチがありません"
@@ -6298,7 +6312,7 @@
#: tortoisehg/hgqt/update.py:126
msgid "&Update"
-msgstr ""
+msgstr "更新(&U)"
#: tortoisehg/hgqt/update.py:143 tortoisehg/hgtk/update.py:27
#, python-format
@@ -6447,7 +6461,7 @@
#: tortoisehg/hgqt/wctxactions.py:45
msgid "&Visual Diff"
-msgstr ""
+msgstr "GUI 差分表示(&V)"
#: tortoisehg/hgqt/wctxactions.py:48 tortoisehg/hgtk/status.py:1244
msgid "View missing"
@@ -6632,95 +6646,95 @@
#: tortoisehg/hgqt/webconf_ui.py:75
msgid "Config File:"
-msgstr ""
+msgstr "設定ファイル:"
#: tortoisehg/hgqt/webconf_ui.py:77
msgid "Save"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:37 tortoisehg/hgqt/workbench.py:403
+msgstr "保存"
+
+#: tortoisehg/hgqt/workbench.py:37 tortoisehg/hgqt/workbench.py:404
msgid "TortoiseHg Workbench"
msgstr ""
#: tortoisehg/hgqt/workbench.py:62
msgid "New Repository..."
-msgstr ""
+msgstr "リポジトリを作成..."
#: tortoisehg/hgqt/workbench.py:64 tortoisehg/hgqt/workbench.py:183
msgid "Clone Repository..."
-msgstr ""
+msgstr "リポジトリをクローン..."
#: tortoisehg/hgqt/workbench.py:66
msgid "Open Repository..."
-msgstr ""
+msgstr "リポジトリを開く..."
#: tortoisehg/hgqt/workbench.py:98
msgid "&File"
-msgstr ""
+msgstr "ファイル(&F)"
#: tortoisehg/hgqt/workbench.py:99
msgid "&View"
-msgstr ""
+msgstr "表示(&V)"
#: tortoisehg/hgqt/workbench.py:100
msgid "&Repository"
-msgstr ""
+msgstr "リポジトリ(&R)"
#: tortoisehg/hgqt/workbench.py:101
msgid "&Help"
-msgstr ""
+msgstr "ヘルプ(&H)"
#: tortoisehg/hgqt/workbench.py:103
msgid "Edit Toolbar"
-msgstr ""
+msgstr "編集ツールバー"
#: tortoisehg/hgqt/workbench.py:105
msgid "Dock Toolbar"
-msgstr ""
+msgstr "ドックツールバー"
#: tortoisehg/hgqt/workbench.py:107
msgid "Sync Toolbar"
-msgstr ""
+msgstr "同期ツールバー"
#: tortoisehg/hgqt/workbench.py:109
msgid "Task Toolbar"
-msgstr ""
+msgstr "タスクツールバー"
#: tortoisehg/hgqt/workbench.py:176
msgid "&Open Repository..."
-msgstr ""
+msgstr "リポジトリを開く(&O)..."
#: tortoisehg/hgqt/workbench.py:178
msgid "&Close Repository"
-msgstr ""
+msgstr "リポジトリを閉じる(&C)"
#: tortoisehg/hgqt/workbench.py:181
msgid "&New Repository..."
-msgstr ""
+msgstr "リポジトリを作成(&N)..."
#: tortoisehg/hgqt/workbench.py:187
msgid "&Settings..."
-msgstr ""
+msgstr "設定(&S)..."
#: tortoisehg/hgqt/workbench.py:190
msgid "E&xit"
-msgstr ""
+msgstr "終了(&X)"
#: tortoisehg/hgqt/workbench.py:193
msgid "Show Repository Registry"
-msgstr ""
+msgstr "リポジトリ一覧を表示"
#: tortoisehg/hgqt/workbench.py:200
msgid "Show Paths"
-msgstr ""
+msgstr "パスを表示"
#: tortoisehg/hgqt/workbench.py:204
msgid "Show Output &Log"
-msgstr ""
+msgstr "コマンドログを表示(&L)"
#: tortoisehg/hgqt/workbench.py:211
msgid "Choose Log Columns..."
-msgstr ""
+msgstr "ログの列表示を選択..."
#: tortoisehg/hgqt/workbench.py:214
msgid "Save Open Repositories On Exit"
@@ -6728,27 +6742,27 @@
#: tortoisehg/hgqt/workbench.py:230
msgid "Revision &Details"
-msgstr ""
+msgstr "リビジョンの詳細(&D)"
#: tortoisehg/hgqt/workbench.py:232
msgid "S&ynchronize"
-msgstr ""
+msgstr "同期(&Y)"
#: tortoisehg/hgqt/workbench.py:233
msgid "&Manifest"
-msgstr ""
+msgstr "マニフェスト(&M)"
#: tortoisehg/hgqt/workbench.py:234
msgid "&Search"
-msgstr ""
+msgstr "検索(&S)"
#: tortoisehg/hgqt/workbench.py:236
msgid "Patch &Queue"
-msgstr ""
+msgstr "パッチキュー(&Q)"
#: tortoisehg/hgqt/workbench.py:238
msgid "&Patch Branch"
-msgstr ""
+msgstr "パッチブランチ(&P)"
#: tortoisehg/hgqt/workbench.py:241 tortoisehg/hgtk/status.py:1320
msgid "&Refresh"
@@ -6756,7 +6770,7 @@
#: tortoisehg/hgqt/workbench.py:244
msgid "Refresh current repository"
-msgstr ""
+msgstr "現在のリポジトリを再読み込み"
#: tortoisehg/hgqt/workbench.py:245
msgid "Refresh &Task Tab"
@@ -6810,73 +6824,77 @@msgid "Bisect..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:298
+#: tortoisehg/hgqt/workbench.py:286
+msgid "Help"
+msgstr "ヘルプ"
+
+#: tortoisehg/hgqt/workbench.py:299
msgid "Filter Toolbar"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:301
+msgstr "フィルターツールバー"
+
+#: tortoisehg/hgqt/workbench.py:302
msgid "Filter graph with revision sets or branches"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:303
+#: tortoisehg/hgqt/workbench.py:304
msgid "Workbench Toolbars"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:310 tortoisehg/hgtk/history.py:438
+#: tortoisehg/hgqt/workbench.py:311 tortoisehg/hgtk/history.py:438
#: tortoisehg/hgtk/history.py:1861 tortoisehg/hgtk/synch.py:57
msgid "Incoming"
msgstr "受信"
-#: tortoisehg/hgqt/workbench.py:311
+#: tortoisehg/hgqt/workbench.py:312
msgid "Check for incoming changes from default pull target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:313 tortoisehg/hgtk/history.py:440
+#: tortoisehg/hgqt/workbench.py:314 tortoisehg/hgtk/history.py:440
#: tortoisehg/hgtk/history.py:1991
msgid "Pull"
msgstr "プル"
-#: tortoisehg/hgqt/workbench.py:314
+#: tortoisehg/hgqt/workbench.py:315
msgid "Pull incoming changes from default pull target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:316 tortoisehg/hgtk/history.py:442
+#: tortoisehg/hgqt/workbench.py:317 tortoisehg/hgtk/history.py:442
#: tortoisehg/hgtk/history.py:2034 tortoisehg/hgtk/synch.py:68
msgid "Outgoing"
msgstr "送信"
-#: tortoisehg/hgqt/workbench.py:317
+#: tortoisehg/hgqt/workbench.py:318
msgid "Detect outgoing changes to default push target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:319 tortoisehg/hgtk/history.py:444
+#: tortoisehg/hgqt/workbench.py:320 tortoisehg/hgtk/history.py:444
#: tortoisehg/hgtk/history.py:2074 tortoisehg/hgtk/synch.py:73
msgid "Push"
msgstr "プッシュ"
-#: tortoisehg/hgqt/workbench.py:320
+#: tortoisehg/hgqt/workbench.py:321
msgid "Push outgoing changes to default push target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:405
+#: tortoisehg/hgqt/workbench.py:406
#, python-format
msgid "%s - TortoiseHg Workbench - %s"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:408
+#: tortoisehg/hgqt/workbench.py:409
#, python-format
msgid "%s - TortoiseHg Workbench"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:559
+#: tortoisehg/hgqt/workbench.py:560
msgid "Select repository directory to open"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:580
+msgstr "ディレクトリを選択してリポジトリを開く"
+
+#: tortoisehg/hgqt/workbench.py:581
msgid "Failed to open repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:703
+#: tortoisehg/hgqt/workbench.py:708
#, python-format
msgid "Hg file log viewer [%s] - %s"
msgstr ""
@@ -8308,6 +8326,11 @@msgid "Move Down"
msgstr "下に移動"
+#: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475
+msgctxt "changesets"
+msgid "All"
+msgstr ""
+
#: tortoisehg/hgtk/history.py:58 tortoisehg/hgtk/history.py:477
msgid "Tagged"
msgstr "タグ"
@@ -12269,6 +12292,9 @@#~ msgid "Pull to here"
#~ msgstr "ここにプル"
+#~ msgid "All"
+#~ msgstr "全て"
+
#~ msgid "Transp_lant to local"
#~ msgstr "ローカルに移植(_L)"
@@ -12371,3 +12397,6 @@
#~ msgid "Finish committing and pushing"
#~ msgstr "コミット＆プッシュ完了"
+
+#~ msgid "Rollback/Undo"
+#~ msgstr "ロールバック・元に戻す"
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
Add a tag
Loading...