##// END OF EJS Templates
i18n: fix all remaining uses of % inside _()
Matt Mackall -
r16231:ce292f13 stable
parent child Browse files
Show More
@@ -135,7 +135,7 b' def churn(ui, repo, *pats, **opts):'
135 except ValueError:
135 except ValueError:
136 l = l.strip()
136 l = l.strip()
137 if l:
137 if l:
138 ui.warn(_("skipping malformed alias: %s\n" % l))
138 ui.warn(_("skipping malformed alias: %s\n") % l)
139 continue
139 continue
140
140
141 rate = countrate(ui, repo, amap, *pats, **opts).items()
141 rate = countrate(ui, repo, amap, *pats, **opts).items()
@@ -113,7 +113,7 b' class monotone_source(converter_source, '
113
113
114 stream = self.mtnreadfp.read(1)
114 stream = self.mtnreadfp.read(1)
115 if stream not in 'mewptl':
115 if stream not in 'mewptl':
116 raise util.Abort(_('bad mtn packet - bad stream type %s' % stream))
116 raise util.Abort(_('bad mtn packet - bad stream type %s') % stream)
117
117
118 read = self.mtnreadfp.read(1)
118 read = self.mtnreadfp.read(1)
119 if read != ':':
119 if read != ':':
@@ -309,7 +309,7 b' def _converttags(ui, revmap, data):'
309 newdata.append('%s %s\n' % (node.hex(revmap[newid]),
309 newdata.append('%s %s\n' % (node.hex(revmap[newid]),
310 name))
310 name))
311 except KeyError:
311 except KeyError:
312 ui.warn(_('no mapping for id %s\n' % id))
312 ui.warn(_('no mapping for id %s\n') % id)
313 continue
313 continue
314 return ''.join(newdata)
314 return ''.join(newdata)
315
315
@@ -157,7 +157,7 b' def remove_largefiles(ui, repo, *pats, *'
157 # If this is being called by addremove, notify the user that we
157 # If this is being called by addremove, notify the user that we
158 # are removing the file.
158 # are removing the file.
159 if getattr(repo, "_isaddremove", False):
159 if getattr(repo, "_isaddremove", False):
160 ui.status(_('removing %s\n' % f))
160 ui.status(_('removing %s\n') % f)
161 if os.path.exists(repo.wjoin(f)):
161 if os.path.exists(repo.wjoin(f)):
162 util.unlinkpath(repo.wjoin(f))
162 util.unlinkpath(repo.wjoin(f))
163 lfdirstate.remove(f)
163 lfdirstate.remove(f)
@@ -673,7 +673,7 b' def override_pull(orig, ui, repo, source'
673 for head in newheads:
673 for head in newheads:
674 (cached, missing) = lfcommands.cachelfiles(ui, repo, head)
674 (cached, missing) = lfcommands.cachelfiles(ui, repo, head)
675 numcached += len(cached)
675 numcached += len(cached)
676 ui.status(_("%d largefiles cached\n" % numcached))
676 ui.status(_("%d largefiles cached\n") % numcached)
677 return result
677 return result
678
678
679 def override_rebase(orig, ui, repo, **opts):
679 def override_rebase(orig, ui, repo, **opts):
@@ -1192,7 +1192,8 b' class queue(object):'
1192 root = self.series[start]
1192 root = self.series[start]
1193 target = patchheader(self.join(root), self.plainmode).parent
1193 target = patchheader(self.join(root), self.plainmode).parent
1194 if not target:
1194 if not target:
1195 raise util.Abort(_("%s does not have a parent recorded" % root))
1195 raise util.Abort(
1196 _("%s does not have a parent recorded") % root)
1196 if not repo[target] == repo['.']:
1197 if not repo[target] == repo['.']:
1197 hg.update(repo, target)
1198 hg.update(repo, target)
1198
1199
@@ -2904,7 +2904,7 b' def heads(ui, repo, *branchrevs, **opts)'
2904 headless = ', '.join(b for b in branches - haveheads)
2904 headless = ', '.join(b for b in branches - haveheads)
2905 msg = _('no open branch heads found on branches %s')
2905 msg = _('no open branch heads found on branches %s')
2906 if opts.get('rev'):
2906 if opts.get('rev'):
2907 msg += _(' (started at %s)' % opts['rev'])
2907 msg += _(' (started at %s)') % opts['rev']
2908 ui.warn((msg + '\n') % headless)
2908 ui.warn((msg + '\n') % headless)
2909
2909
2910 if not heads:
2910 if not heads:
@@ -2997,7 +2997,7 b' def help_(ui, name=None, unknowncmd=Fals'
2997 msg = _('use "hg help" for the full list of commands '
2997 msg = _('use "hg help" for the full list of commands '
2998 'or "hg -v" for details')
2998 'or "hg -v" for details')
2999 elif name and not full:
2999 elif name and not full:
3000 msg = _('use "hg help %s" to show the full help text' % name)
3000 msg = _('use "hg help %s" to show the full help text') % name
3001 elif aliases:
3001 elif aliases:
3002 msg = _('use "hg -v help%s" to show builtin aliases and '
3002 msg = _('use "hg -v help%s" to show builtin aliases and '
3003 'global options') % (name and " " + name or "")
3003 'global options') % (name and " " + name or "")
@@ -209,9 +209,6 b''
209 > if os.path.exists(self.wjoin(lfutil.standin(lfile))):
209 > if os.path.exists(self.wjoin(lfutil.standin(lfile))):
210 warning: line over 80 characters
210 warning: line over 80 characters
211 hgext/mq.py:0:
211 hgext/mq.py:0:
212 > raise util.Abort(_("%s does not have a parent recorded" % root))
213 warning: line over 80 characters
214 hgext/mq.py:0:
215 > raise util.Abort(_("cannot push --exact with applied patches"))
212 > raise util.Abort(_("cannot push --exact with applied patches"))
216 warning: line over 80 characters
213 warning: line over 80 characters
217 hgext/mq.py:0:
214 hgext/mq.py:0:
General Comments 0
You need to be logged in to leave comments. Login now