Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 08c7f36f9162…

Parents ac209ee3dc80…

Parents 0042c2064ad1…

by Steve Borho

Changes to 2 files · Browse files at 08c7f36f9162 Showing diff from parent ac209ee3dc80 0042c2064ad1 Diff from another changeset...

Change 1 of 2 Show Entire File i18n/​tortoisehg/​fr.po Stacked
 
8
9
10
11
 
12
13
14
15
16
17
18
 
19
20
21
 
6654
6655
6656
6657
 
6658
6659
6660
 
8
9
10
 
11
12
13
14
15
16
17
 
18
19
20
21
 
6654
6655
6656
 
6657
6658
6659
6660
@@ -8,14 +8,14 @@
 "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"  "POT-Creation-Date: 2011-05-26 13:34-0300\n" -"PO-Revision-Date: 2011-06-01 07:06+0000\n" +"PO-Revision-Date: 2011-06-03 19:25+0000\n"  "Last-Translator: André Sintzoff <Unknown>\n"  "Language-Team: French <fr@li.org>\n"  "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n"  "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2011-06-02 01:02+0000\n" +"X-Launchpad-Export-Date: 2011-06-03 19:52+0000\n"  "X-Generator: Launchpad (build 13144)\n"  "X-Poedit-Country: FRANCE\n"  "X-Poedit-Language: French\n" @@ -6654,7 +6654,7 @@
   #: tortoisehg/hgqt/thgimport.py:22  msgid "Patch files (*.diff *.patch)" -msgstr "Fichiers patch (*.diff, *.patch)" +msgstr "Fichiers patch (*.diff *.patch)"    #: tortoisehg/hgqt/thgimport.py:23  msgid "All files (*)"
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
642
643
644
 
645
646
647
648
649
650
651
 
1008
1009
1010
1011
1012
 
 
 
 
 
1013
1014
1015
 
642
643
644
645
646
647
648
 
649
650
651
 
1008
1009
1010
 
 
1011
1012
1013
1014
1015
1016
1017
1018
@@ -642,10 +642,10 @@
  commandlines.append(cmd)     repo.incrementBusyCount() + self.progress.emit(*cmdui.startProgress(_('Commit', 'start progress'), ''))   self.commitButtonEnable.emit(False)   self.runner.run(*commandlines)   self.stopAction.setEnabled(True) - self.progress.emit(*cmdui.startProgress(_('Commit', 'start progress'), ''))     def stop(self):   self.runner.cancel() @@ -1008,8 +1008,11 @@
  def postcommit(self):   repo = self.commit.stwidget.repo   if repo.ui.configbool('tortoisehg', 'closeci'): - self.reject() - return + if self.commit.canExit(): + self.reject() + else: + self.commit.stwidget.refthread.wait() + QTimer.singleShot(0, self.reject)     def accept(self):   self.commit.commit()