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 717bc5021644…

Parents 64477b91ff38…

Parents 2d8ce8d8171c…

by Steve Borho

Changes to 34 files · Browse files at 717bc5021644 Showing diff from parent 64477b91ff38 2d8ce8d8171c Diff from another changeset...

Change 1 of 1 Show Entire File i18n/​msgfmt.py Stacked
 
166
167
168
169
 
170
171
172
 
166
167
168
 
169
170
171
172
@@ -166,7 +166,7 @@
  # Now we are in a msgid section, output previous section   elif l.startswith('msgid') and not l.startswith('msgid_plural'):   if section == STR: - add(msgid, msgstr, fuzzy) + self.add(msgid, msgstr, fuzzy)   section = ID   l = l[5:]   msgid = msgstr = ''
Show Entire File i18n/​tortoisehg/​ca.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​cs.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​da.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_AU.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_GB.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​es.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​et.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fa.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​he.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hu.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​it.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ja.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ko.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nb.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nn.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​oc.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ru.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sv.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​tr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​uk.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_CN.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_TW.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
40
41
42
43
 
44
45
46
 
40
41
42
 
43
44
45
46
@@ -40,7 +40,7 @@
  hbox.setMargin(2)   le = QLineEdit()   if hasattr(le, 'setPlaceholderText'): # Qt >= 4.7 - le.setPlaceholderText('### regular expression search pattern ###') + le.setPlaceholderText(_('### regular expression search pattern ###'))   else:   lbl = QLabel(_('Regexp:'))   lbl.setBuddy(le)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
95
96
97
98
 
99
100
101
 
95
96
97
 
98
99
100
101
@@ -95,7 +95,7 @@
  tb.clicked.connect(self.refreshWctx)   le = QLineEdit()   if hasattr(le, 'setPlaceholderText'): # Qt >= 4.7 - le.setPlaceholderText('### filter text ###') + le.setPlaceholderText(_('### filter text ###'))   else:   lbl = QLabel(_('Filter:'))   hbox.addWidget(lbl)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
1135
1136
1137
1138
 
1139
1140
1141
 
1135
1136
1137
 
1138
1139
1140
1141
@@ -1135,7 +1135,7 @@
  self.fprintradio.toggled.connect(self.fprintentry.setEnabled)   self.fprintentry.setEnabled(False)   if hasattr(le, 'setPlaceholderText'): # Qt >= 4.7 - le.setPlaceholderText('### host certificate fingerprint ###') + le.setPlaceholderText(_('### host certificate fingerprint ###'))   hbox.addWidget(le)   try:   import ssl # Python 2.6 or backport for 2.5