merge with stable

contrib/check-code.py

@@ -207,8 +207,8 b' pypats = ['
     (r'\s<>\s', '<> operator is not available in Python 3+, use !='),
     (r'^\s*\t', "don't use tabs"),
     (r'\S;\s*\n', "semicolon"),
-    (r'[^_]_\("[^"]+"\s*%', "don't use % inside _()"),
-    (r"[^_]_\('[^']+'\s*%", "don't use % inside _()"),
+    (r'[^_]_\((?:"[^"]+"[ \t\n+]*)+%', "don't use % inside _()"),
+    (r"[^_]_\((?:'[^']+'[ \t\n+]*)+%", "don't use % inside _()"),
     (r'(\w|\)),\w', "missing whitespace after ,"),
     (r'(\w|\))[+/*\-<>]\w', "missing whitespace in expression"),
     (r'^\s+(\w|\.)+=\w[^,()\n]*$', "missing whitespace in assignment"),

hgext/eol.py

@@ -344,7 +344,7 b' def reposetup(ui, repo):'
                     continue
                 if inconsistenteol(data):
                     raise util.Abort(_("inconsistent newline style "
-                                       "in %s\n" % f))
+                                       "in %s\n") % f)
             return super(eolrepo, self).commitctx(ctx, error)
     repo.__class__ = eolrepo
     repo._hgcleardirstate()

hgext/largefiles/lfcommands.py

@@ -303,14 +303,14 b' def _converttags(ui, revmap, data):'
         try:
             id, name = line.split(' ', 1)
         except ValueError:
-            ui.warn(_('skipping incorrectly formatted tag %s\n'
-                % line))
+            ui.warn(_('skipping incorrectly formatted tag %s\n')
+                % line)
             continue
         try:
             newid = node.bin(id)
         except TypeError:
-            ui.warn(_('skipping incorrectly formatted id %s\n'
-                % id))
+            ui.warn(_('skipping incorrectly formatted id %s\n')
+                % id)
             continue
         try:
             newdata.append('%s %s\n' % (node.hex(revmap[newid]),

i18n/ja.po

@@ -149,8 +149,8 b' msgid ""'
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2014-02-23 17:05+0900\n"
-"PO-Revision-Date: 2014-02-23 17:58+0900\n"
+"POT-Creation-Date: 2014-03-31 19:44+0900\n"
+"PO-Revision-Date: 2014-03-31 20:11+0900\n"
 "Last-Translator: Japanese translation team <[e-mail]>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -1934,16 +1934,18 b' msgstr ""'
 
 msgid ""
 "    The ``include`` directive causes a file, or all files under a\n"
-"    directory, to be included in the destination repository, and the\n"
-"    exclusion of all other files and directories not explicitly\n"
-"    included. The ``exclude`` directive causes files or directories to\n"
+"    directory, to be included in the destination repository. The default\n"
+"    if there are no ``include`` statements is to include everything.\n"
+"    If there are any ``include`` statements, nothing else is included.\n"
+"    The ``exclude`` directive causes files or directories to\n"
 "    be omitted. The ``rename`` directive renames a file or directory if\n"
 "    it is converted. To rename from a subdirectory into the root of\n"
 "    the repository, use ``.`` as the path to rename to."
 msgstr ""
 "    ファイルやディレクトリが ``include`` 指定に合致した場合、\n"
-"    当該ファイルや、 ディレクトリ配下のファイルは、 変換対象になりますが、\n"
-"    それ以外のファイルは、 明示的に ``include`` 指定に合致しない限り、\n"
+"    当該ファイルや、 ディレクトリ配下のファイルは、 変換対象になります。\n"
+"    ``include`` 指定がない場合、 全ファイルが変換対象です。\n"
+"    ``include`` 指定がある場合、 指定パターンに合致するファイル以外は、\n"
 "    変換対象から除外されます。 ファイルやディレクトリが ``exclude``\n"
 "    指定に合致した場合、 それらは変換対象から除外されます。\n"
 "    変換対象ファイルが ``rename`` 指定に合致する場合、 ファイル名や、\n"
@@ -8624,7 +8626,7 b' msgid "hg record [OPTION]... [FILE]..."'
 msgstr "hg record [OPTION]... [FILE]..."
 
 msgid "interactively select changes to commit"
-msgstr "コミットする内容を対話的に選択します"
+msgstr "コミット内容の対話的な選択"
 
 msgid ""
 "    If a list of files is omitted, all changes reported by :hg:`status`\n"
@@ -13676,7 +13678,7 b' msgid " public < draft < secret"'
 msgstr "        public < draft < secret"
 
 msgid ""
-"    Return 0 on success, 1 if no phases were changed or some could not\n"
+"    Returns 0 on success, 1 if no phases were changed or some could not\n"
 "    be changed.\n"
 "    "
 msgstr ""
@@ -23590,6 +23592,9 b' msgstr "\xe4\xb8\x80\xe8\xa6\xa7\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab(%s)\xe3\x81\x8c\xe8\xaa\xad\xe3\x81\xbf\xe8\xbe\xbc\xe3\x82\x81\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "diff context lines count must be an integer, not %r"
 msgstr "差分コンテキストでの行数指定が不正です: %r"
 
+msgid "unsupported merge state record:"
+msgstr "未サポートなマージ状態が記録されています:"
+
 #, python-format
 msgid "warning: cannot merge flags for %s\n"
 msgstr "警告: ファイル %s の属性設定はマージできません\n"
@@ -24836,6 +24841,15 b' msgstr ""'
 "``tag([name])``\n"
 "    指定タグ対象リビジョン、 またはタグ付け対象の全リビジョン群。"
 
+msgid ""
+"    If `name` starts with `re:`, the remainder of the name is treated as\n"
+"    a regular expression. To match a tag that actually starts with `re:`,\n"
+"    use the prefix `literal:`."
+msgstr ""
+"    `name` が `re:` で始まる場合、 残りは正規表現として扱われます。\n"
+"    タグ名そのものが `re:` で始まる場合は、 名前を `literal:`\n"
+"    付きで指定してください。"
+
 #. i18n: "tag" is a keyword
 msgid "tag takes one or no arguments"
 msgstr "tagged の引数は最大1つです"
@@ -25235,12 +25249,15 b' msgstr "svn \xe3\x81\xb8\xe3\x81\xae\xe5\xa4\x89\xe6\x9b\xb4\xe3\x82\xb3\xe3\x83\x9f\xe3\x83\x83\xe3\x83\x88\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
 msgid "not removing repo %s because it has changes.\n"
 msgstr "変更が含まれているため、 リポジトリ %s は削除されません\n"
 
-msgid "cannot retrieve git version"
-msgstr "git のバージョン情報が取得できません"
+msgid "cannot retrieve git version\n"
+msgstr "git のバージョン情報が取得できません\n"
 
 msgid "git subrepo requires at least 1.6.0 or later"
 msgstr "サブリポジトリ利用には 1.6.0 以降の git が必要です"
 
+msgid "git subrepo requires at least 1.6.0 or later\n"
+msgstr "サブリポジトリ利用には 1.6.0 以降の git が必要です\n"
+
 #, python-format
 msgid "revision %s does not exist in subrepo %s\n"
 msgstr "リビジョン %s はサブリポジトリ %s には存在しません\n"

i18n/pt_BR.po

@@ -1844,17 +1844,20 b' msgstr ""'
 
 msgid ""
 "    The ``include`` directive causes a file, or all files under a\n"
-"    directory, to be included in the destination repository, and the\n"
-"    exclusion of all other files and directories not explicitly\n"
-"    included. The ``exclude`` directive causes files or directories to\n"
+"    directory, to be included in the destination repository. The default\n"
+"    if there are no ``include`` statements is to include everything.\n"
+"    If there are any ``include`` statements, nothing else is included.\n"
+"    The ``exclude`` directive causes files or directories to\n"
 "    be omitted. The ``rename`` directive renames a file or directory if\n"
 "    it is converted. To rename from a subdirectory into the root of\n"
 "    the repository, use ``.`` as the path to rename to."
 msgstr ""
 "    A diretiva ``include`` faz com que um arquivo, ou todos os arquivos\n"
-"    em um diretório, sejam incluídos no repositório de destino, e\n"
-"    exclui todos os outros arquivos e diretórios não incluídos\n"
-"    explicitamente. A diretiva ``exclude`` faz com que os arquivos e\n"
+"    em um diretório, sejam incluídos no repositório de destino.\n"
+"    Sem diretivas ``include``, por padrão todos os arquivos são\n"
+"    incluídos. Se houver qualquer diretiva ``include``, nada\n"
+"    mais será incluído.\n"
+"    A diretiva ``exclude`` faz com que os arquivos e\n"
 "    diretórios sejam omitidos. A diretiva ``rename`` renomeia um\n"
 "    arquivo ou diretório que for convertido. Para renomear de um\n"
 "    subdiretório para o raiz do repositório, use ``.`` como caminho\n"
@@ -13923,7 +13926,7 b' msgid " public < draft < secret"'
 msgstr "        pública < rascunho < secreta"
 
 msgid ""
-"    Return 0 on success, 1 if no phases were changed or some could not\n"
+"    Returns 0 on success, 1 if no phases were changed or some could not\n"
 "    be changed.\n"
 "    "
 msgstr ""
@@ -24099,6 +24102,9 b' msgstr "incapaz de ler lista de arquivos'
 msgid "diff context lines count must be an integer, not %r"
 msgstr "o número de linhas de contexto de diff deve ser um inteiro, e não %r"
 
+msgid "unsupported merge state record:"
+msgstr "registro de estado de mesclagem não suportado:"
+
 #, python-format
 msgid "warning: cannot merge flags for %s\n"
 msgstr "aviso: não é possível mesclar flags para %s\n"
@@ -25353,6 +25359,15 b' msgstr ""'
 "    especificada por nome; caso contrário, todas as revisões\n"
 "    etiquetadas."
 
+msgid ""
+"    If `name` starts with `re:`, the remainder of the name is treated as\n"
+"    a regular expression. To match a tag that actually starts with `re:`,\n"
+"    use the prefix `literal:`."
+msgstr ""
+"    Se `nome` começar com `re:`, o restante do nome é tratado como\n"
+"    uma expressão regular. Para combinar com uma etiqueta que comece\n"
+"    com `re:` literalmente, use o prefixo `literal:`."
+
 #. i18n: "tag" is a keyword
 msgid "tag takes one or no arguments"
 msgstr "tag recebe um ou nenhum argumento"
@@ -25761,12 +25776,15 b' msgstr "falha ao consolidar mudan\xc3\xa7as do svn"'
 msgid "not removing repo %s because it has changes.\n"
 msgstr "repositório %s não removido por possuir mudanças.\n"
 
-msgid "cannot retrieve git version"
-msgstr "não é possível obter a versão do git"
+msgid "cannot retrieve git version\n"
+msgstr "não é possível obter a versão do git\n"
 
 msgid "git subrepo requires at least 1.6.0 or later"
 msgstr "sub-repositórios do git exigem a versão 1.6.0 ou posterior"
 
+msgid "git subrepo requires at least 1.6.0 or later\n"
+msgstr "sub-repositórios do git exigem a versão 1.6.0 ou posterior\n"
+
 #, python-format
 msgid "revision %s does not exist in subrepo %s\n"
 msgstr "a revisão %s não existe no sub-repositório %s\n"

mercurial/commands.py

@@ -755,8 +755,8 b' def bisect(ui, repo, rev=None, extra=Non'
         if not changesets:
             extendnode = extendbisectrange(nodes, good)
             if extendnode is not None:
-                ui.write(_("Extending search to changeset %d:%s\n"
-                         % (extendnode.rev(), extendnode)))
+                ui.write(_("Extending search to changeset %d:%s\n")
+                         % (extendnode.rev(), extendnode))
                 state['current'] = [extendnode.node()]
                 hbisect.save_state(repo, state)
                 if noupdate:

mercurial/hg.py

@@ -451,7 +451,7 b' def clone(ui, peeropts, source, dest=Non'
                         if bn == 'default':
                             status = _("updating to bookmark @\n")
                         else:
-                            status = _("updating to bookmark @ on branch %s\n"
+                            status = (_("updating to bookmark @ on branch %s\n")
                                        % bn)
                     except KeyError:
                         try:

mercurial/merge.py

@@ -78,8 +78,8 b' class mergestate(object):'
                 bits = record.split("\0")
                 self._state[bits[0]] = bits[1:]
             elif not rtype.islower():
-                raise util.Abort(_('unsupported merge state record:'
-                                   % rtype))
+                raise util.Abort(_('unsupported merge state record: %s')
+                                   % rtype)
         self._dirty = False
 
     def _readrecords(self):

mercurial/patch.py

@@ -711,7 +711,7 b' class patchfile(object):'
         if self.exists and self.create:
             if self.copysource:
                 self.ui.warn(_("cannot create %s: destination already "
-                               "exists\n" % self.fname))
+                               "exists\n") % self.fname)
             else:
                 self.ui.warn(_("file %s already exists\n") % self.fname)
             self.rej.append(h)

mercurial/subrepo.py

@@ -321,8 +321,8 b' def _sanitize(ui, path):'
         for f in names:
             if f.lower() == 'hgrc':
                 ui.warn(
-                    _("warning: removing potentially hostile .hg/hgrc in '%s'"
-                      % path))
+                    _("warning: removing potentially hostile .hg/hgrc in '%s'")
+                      % path)
                 os.unlink(os.path.join(dirname, f))
     os.walk(path, v, None)
 
@@ -1011,7 +1011,7 b' class svnsubrepo(abstractsubrepo):'
     def remove(self):
         if self.dirty():
             self._ui.warn(_('not removing repo %s because '
-                            'it has changes.\n' % self._path))
+                            'it has changes.\n') % self._path)
             return
         self._ui.note(_('removing subrepo %s\n') % self._path)