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

stable i18n: add contexts for 'Commit'

Changeset d75166b2d43c

Parent 44b859a4e798

by Wagner Bruna

Changes to 5 files · Browse files at d75166b2d43c Showing diff from parent 44b859a4e798 Diff from another changeset...

 
225
226
227
228
 
229
230
231
 
225
226
227
 
228
229
230
231
@@ -225,7 +225,7 @@
  finished = False   self.msgTextEdit.setEnabled(True)   self.backoutBtn.setEnabled(True) - self.backoutBtn.setText(_('Commit')) + self.backoutBtn.setText(_('Commit', 'action button'))   self.backoutBtn.clicked.disconnect(self.backout)   self.backoutBtn.clicked.connect(self.commit)   self.checkResolve()
 
176
177
178
179
 
180
181
182
 
618
619
620
621
 
622
623
624
625
626
627
 
628
629
630
 
923
924
925
926
 
927
928
929
 
176
177
178
 
179
180
181
182
 
618
619
620
 
621
622
623
624
625
626
 
627
628
629
630
 
923
924
925
 
926
927
928
929
@@ -176,7 +176,7 @@
  self.msghistory = []   self.repo = repo = self.stwidget.repo   self.runner = cmdui.Runner(not embedded, self) - self.runner.setTitle(_('Commit')) + self.runner.setTitle(_('Commit', 'window title'))   self.runner.output.connect(self.output)   self.runner.progress.connect(self.progress)   self.runner.makeLogVisible.connect(self.makeLogVisible) @@ -618,13 +618,13 @@
  self.commitButtonEnable.emit(False)   self.runner.run(*commandlines)   self.stopAction.setEnabled(True) - self.progress.emit(*cmdui.startProgress(_('Commit'), '')) + self.progress.emit(*cmdui.startProgress(_('Commit', 'start progress'), ''))     def stop(self):   self.runner.cancel()     def commandFinished(self, ret): - self.progress.emit(*cmdui.stopProgress(_('Commit'))) + self.progress.emit(*cmdui.stopProgress(_('Commit', 'stop progress')))   self.stopAction.setEnabled(False)   self.commitButtonEnable.emit(True)   self.repo.decrementBusyCount() @@ -923,7 +923,7 @@
  bb.button(BB.Discard).setDefault(False)   bb.button(BB.Ok).setDefault(True)   self.commitButton = bb.button(BB.Ok) - self.commitButton.setText(_('Commit')) + self.commitButton.setText(_('Commit', 'action button'))   self.bb = bb     layout.addWidget(self.bb)
 
119
120
121
122
 
123
124
125
 
119
120
121
 
122
123
124
125
@@ -119,7 +119,7 @@
  def commandFinished(self, ret):   self.repo.decrementBusyCount()   self.showMessage.emit(_('Changes have been moved, you must now commit')) - self.compressbtn.setText(_('Commit')) + self.compressbtn.setText(_('Commit', 'action button'))   self.compressbtn.clicked.disconnect(self.compress)   self.compressbtn.clicked.connect(self.commit)  
 
230
231
232
233
 
234
235
236
 
230
231
232
 
233
234
235
236
@@ -230,7 +230,7 @@
  pats, opts = {}, {}   cw = CommitWidget(pats, opts, self.repo.root, True, self)   - b = QPushButton(_('Commit')) + b = QPushButton(_('Commit', 'action button'))   b.setAutoDefault(True)   f = b.font()   f.setWeight(QFont.Bold)
 
363
364
365
366
 
367
368
369
 
363
364
365
 
366
367
368
369
@@ -363,7 +363,7 @@
  'extension, rebase equates to pull --rebase. Default: none')),   )),   -({'name': 'commit', 'label': _('Commit'), 'icon': 'menucommit'}, ( +({'name': 'commit', 'label': _('Commit', 'config item'), 'icon': 'menucommit'}, (   _fi(_('Username'), 'ui.username', genEditCombo,   _('Name associated with commits. The common format is<br>'   '"Full Name &lt;email@example.com&gt;"')),