by
Changes to 8 files · Browse files at 49587375273d Showing diff from parent 9db562946486 f09e44ba74ac Diff from another changeset...
|
@@ -1,45 +0,0 @@ - <?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-
- <Fragment>
- <ComponentGroup Id='DiffScripts' >
- <Component Id='diff_doc.js' Guid='CA3E8CB7-F19B-46F2-B289-5FB313CF05E9' Directory='DiffScriptsDir'>
- <File Id='diff_doc.js' Name='diff-doc.js' DiskId='1' Source='..\contrib\diff-scripts\diff-doc.js'/>
- </Component>
- <Component Id='diff_nb.vbs' Guid='8A92B9C6-5C40-4954-83E8-9CDA7E1740F9' Directory='DiffScriptsDir' >
- <File Id='diff_nb.vbs' Name='diff-nb.vbs' DiskId='1' Source='..\contrib\diff-scripts\diff-nb.vbs'/>
- </Component>
- <Component Id='diff_odt.vbs' Guid='CC666469-5892-413C-B167-4C94FA2F77C7' Directory='DiffScriptsDir' >
- <File Id='diff_odt.vbs' Name='diff-odt.vbs' DiskId='1' Source='..\contrib\diff-scripts\diff-odt.vbs'/>
- </Component>
- <Component Id='diff_ppt.js' Guid='1E5BFDD0-4DCB-45A8-ACAA-64B7F5A7E564' Directory='DiffScriptsDir' >
- <File Id='diff_ppt.js' Name='diff-ppt.js' DiskId='1' Source='..\contrib\diff-scripts\diff-ppt.js'/>
- </Component>
- <Component Id='diff_sxw.vbs' Guid='81745FB6-D498-40A9-AF4F-395696BB4433' Directory='DiffScriptsDir' >
- <File Id='diff_sxw.vbs' Name='diff-sxw.vbs' DiskId='1' Source='..\contrib\diff-scripts\diff-sxw.vbs'/>
- </Component>
- <Component Id='diff_xls.vbs' Guid='62CB5EAB-ACB6-4513-8A45-028B906A0E57' Directory='DiffScriptsDir' >
- <File Id='diff_xls.vbs' Name='diff-xls.vbs' DiskId='1' Source='..\contrib\diff-scripts\diff-xls.vbs'/>
- </Component>
- <Component Id='mergedoc.js' Guid='A6AAB6EB-6E58-454D-BB74-36F0A0017285' Directory='DiffScriptsDir' >
- <File Id='mergedoc.js' Name='merge-doc.js' DiskId='1' Source='..\contrib\diff-scripts\merge-doc.js'/>
- </Component>
- <Component Id='mergeods.vbs' Guid='0822A38C-F713-4DC3-A748-EB5B04D91FE3' Directory='DiffScriptsDir' >
- <File Id='mergeods.vbs' Name='merge-ods.vbs' DiskId='1' Source='..\contrib\diff-scripts\merge-ods.vbs'/>
- </Component>
- <Component Id='diffscriptREADME' Guid='C4B5E35C-415A-41A8-8E55-ACE1444DE747' Directory='DiffScriptsDir' >
- <File Id='diffscriptREADME' Name='Readme.txt' DiskId='1' Source='..\contrib\diff-scripts\Readme.txt'/>
- </Component>
- <Component Id='diffscriptSOURCE' Guid='F99F210A-A930-4262-B5AE-B5922C264876' Directory='DiffScriptsDir' >
- <File Id='diffscriptSOURCE' Name='SOURCE.txt' DiskId='1' Source='..\contrib\diff-scripts\SOURCE.txt'/>
- </Component>
- </ComponentGroup>
- </Fragment>
-
- <Fragment>
- <DirectoryRef Id="INSTALLDIR">
- <Directory Id='DiffScriptsDir' Name='diff-scripts'/>
- </DirectoryRef>
- </Fragment>
-
-</Wix>
|
@@ -8,13 +8,13 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: Peer Sommerlund <peer.sommerlund@gmail.com>\n"
"POT-Creation-Date: 2010-02-22 23:55+0000\n"
-"PO-Revision-Date: 2010-03-04 14:52+0000\n"
+"PO-Revision-Date: 2010-03-07 06:05+0000\n"
"Last-Translator: peso <peer.sommerlund@gmail.com>\n"
"Language-Team: Danish <da@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: 2010-03-05 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-08 05:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: thgtaskbar.py:36
@@ -5998,7 +5998,7 @@
#: tortoisehg\util\prej.py:143
msgid "patching file %s\n"
-msgstr ""
+msgstr "lapper filen %s\n"
#: tortoisehg\util\prej.py:190
msgid "%d out of %d hunk%s FAILED -- saving rejects to file %s\n"
@@ -6010,7 +6010,7 @@
#: tortoisehg\util\prej.py:235
msgid "file %s already exists\n"
-msgstr ""
+msgstr "fil %s findes allerede\n"
#: tortoisehg\util\prej.py:287
msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
@@ -6035,31 +6035,31 @@
#: tortoisehg\util\prej.py:550
msgid "could not extract binary patch"
-msgstr ""
+msgstr "kunne ikke udtrække binær lap"
#: tortoisehg\util\prej.py:566
msgid "binary patch is %d bytes, not %d"
-msgstr ""
+msgstr "binær lap er %d byte, ikke %d"
#: tortoisehg\util\prej.py:591
msgid "unable to strip away %d dirs from %s"
-msgstr ""
+msgstr "kan ikke fjerne %d kataloger fra %s"
#: tortoisehg\util\prej.py:613
msgid "unable to find %s or %s for patching"
-msgstr ""
+msgstr "kan ikke finde %s eller %s til lapning"
#: tortoisehg\util\prej.py:792
msgid "malformed patch %s %s"
-msgstr ""
+msgstr "misformet lap %s %s"
#: tortoisehg\util\prej.py:803
msgid "No valid hunks found"
-msgstr ""
+msgstr "Ingen gyldige stumper fundet"
#: tortoisehg\util\version.py:17
msgid "repository %s not found"
-msgstr ""
+msgstr "depot %s ikke fundet"
#~ msgid "Ignore filter for "
#~ msgstr "Ignorer filter for "
|
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... |
@@ -8,18 +8,18 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: Alil Adamov <diagiman@gmail.com>\n"
"POT-Creation-Date: 2010-02-22 23:55+0000\n"
-"PO-Revision-Date: 2010-02-27 08:13+0000\n"
+"PO-Revision-Date: 2010-03-05 14:05+0000\n"
"Last-Translator: Alil Adamov <diagiman@gmail.com>\n"
"Language-Team: Russian <ru@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: 2010-02-28 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-06 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: thgtaskbar.py:36
msgid "TortoiseHg Overlay Icon Server"
-msgstr "TortoiseHg Сервер Наложений Иконок"
+msgstr "TortoiseHg Сервер Наложений Значков"
#: thgtaskbar.py:117
msgid "Exit"
|
@@ -981,7 +981,7 @@
def undo_clicked(self, toolbutton, data=None):
response = gdialog.Confirm(_('Confirm Undo Commit'),
- [], self, _('Undo last commit')).run()
+ [], self, _('Undo last commit?')).run()
if response != gtk.RESPONSE_YES:
return
@@ -1169,7 +1169,10 @@ self.last_commit_id = self.get_tip_rev(True)
if self.notify_func:
self.notify_func(*self.notify_args)
- text = _('Finish committing')
+ if autopush:
+ text = _('Finish committing and pushing')
+ else:
+ text = _('Finish committing')
elif return_code is None:
text = _('Aborted committing')
else:
|
@@ -699,7 +699,8 @@ When the command terminates, the callback function is invoked
with its return code.
- cmdline: command line string.
+ cmdline: a list of command line arguments or its tuple/list.
+ All command line arguments must be string, not int or long.
callback: function invoked after the command terminates.
def callback(returncode, useraborted, ...)
@@ -716,10 +717,13 @@ # clear previous logs
self.clear_buffers()
- # thread start
- self.hgthread = hgthread.HgThread(cmdline[1:])
- self.hgthread.start()
- gobject.timeout_add(10, self.process_queue, callback, args, kargs)
+ # normalize 'cmdline' arguments
+ if isinstance(cmdline[0], basestring):
+ cmdline = (cmdline,)
+ self.cmdlist = list(cmdline)
+
+ # execute cmdline
+ self.execute_next(callback, args, kargs)
return True
@@ -801,6 +805,14 @@ else:
self.dlg.hide()
+ def execute_next(self, callback, args, kargs):
+ if not self.cmdlist:
+ return
+ cmdline = self.cmdlist.pop(0)
+ self.hgthread = hgthread.HgThread(cmdline[1:])
+ self.hgthread.start()
+ gobject.timeout_add(10, self.process_queue, callback, args, kargs)
+
def process_queue(self, callback, args, kargs):
# process queue
self.hgthread.process_dialogs()
@@ -827,9 +839,14 @@ self.hgthread = None
if len(self.get_err_buffer()) > 0:
self.show_log(True)
- def call_callback():
- callback(returncode, self.get_buffer(), *args, **kargs)
- gtklib.idle_add_single_call(call_callback)
+ if returncode == 0 and self.cmdlist:
+ def call_next():
+ self.execute_next(callback, args, kargs)
+ gtklib.idle_add_single_call(call_next)
+ else:
+ def call_callback():
+ callback(returncode, self.get_buffer(), *args, **kargs)
+ gtklib.idle_add_single_call(call_callback)
return False # Stop polling this function
else:
return True # Continue polling
|
Loading...