merge with i18n

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-11-01 17:00+0900\n"
-"PO-Revision-Date: 2014-11-01 17:57+0900\n"
+"POT-Creation-Date: 2014-11-29 14:13+0900\n"
+"PO-Revision-Date: 2014-11-29 14:23+0900\n"
 "Last-Translator: Japanese translation team <[e-mail]>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -12292,6 +12292,9 b' msgstr "\xe7\xae\xa1\xe7\x90\x86\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xae\xe6\x8e\x92\xe4\xbb\x96\xe3\x81\xae\xe8\xa7\xa3\xe6\x94\xbe (\xe5\x8d\xb1\xe9\x99\xba)"'
 msgid "free the working state lock (DANGEROUS)"
 msgstr "作業領域の排他の解放 (危険)"
 
+msgid "[OPTION]..."
+msgstr "[OPTION]..."
+
 msgid "show or modify state of locks"
 msgstr "排他状況の表示又は変更"
 
@@ -12508,9 +12511,6 b' msgstr "\xe8\xa8\x98\xe9\x8c\xb2\xe3\x81\x95\xe3\x82\x8c\xe3\x81\x9f mtime \xe6\x83\x85\xe5\xa0\xb1\xe3\x81\xae\xe8\xa1\xa8\xe7\xa4\xba\xe6\x8a\x91\xe6\xad\xa2"'
 msgid "sort by saved mtime"
 msgstr "記録された mtime 情報で整列"
 
-msgid "[OPTION]..."
-msgstr "[OPTION]..."
-
 msgid "show the contents of the current dirstate"
 msgstr "現時点の dirstate 内容の表示"
 
@@ -13857,8 +13857,8 b' msgstr "\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe7\xa2\xba\xe8\xaa\x8d(\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe5\x87\xa6\xe7\x90\x86\xe3\x81\xaf\xe6\x9c\xaa\xe5\xae\x9f\xe6\x96\xbd)"'
 msgid "[-P] [-f] [[-r] REV]"
 msgstr "[-P] [-f] [[-r] REV]"
 
-msgid "merge working directory with another revision"
-msgstr "作業領域の内容と他のリビジョンのマージ"
+msgid "merge another revision into working directory"
+msgstr "他リビジョンを作業領域にマージ"
 
 msgid ""
 "    The current working directory is updated with all changes made in\n"
@@ -19640,12 +19640,12 b' msgstr ""'
 
 msgid ""
 "``reportoldssl``\n"
-"    Warn if an SSL certificate is unable to be due to using Python\n"
+"    Warn if an SSL certificate is unable to be used due to using Python\n"
 "    2.5 or earlier. True or False. Default is True."
 msgstr ""
 "``reportoldssl``\n"
 "    Python 2.5 以前の使用により、 SSL 証明書の処理ができない場合の、\n"
-"    警告表示を指定する真偽値。 デフォルト値: True"
+"    警告表示の有無を指定する真偽値。 デフォルト値: True"
 
 msgid ""
 "``report_untrusted``\n"

i18n/pt_BR.po

@@ -12497,6 +12497,9 b' msgstr "libera o lock do store (PERIGOSO'
 msgid "free the working state lock (DANGEROUS)"
 msgstr "libera o lock do working state (PERIGOSO)"
 
+msgid "[OPTION]..."
+msgstr "[OPÇÃO]..."
+
 msgid "show or modify state of locks"
 msgstr "mostra ou modifica o estado dos locks"
 
@@ -12722,9 +12725,6 b' msgstr "n\xc3\xa3o exibe o mtime armazenado"'
 msgid "sort by saved mtime"
 msgstr "ordena por mtime armazenado"
 
-msgid "[OPTION]..."
-msgstr "[OPÇÃO]..."
-
 msgid "show the contents of the current dirstate"
 msgstr "mostra o conteúdo do dirstate atual"
 
@@ -14130,8 +14130,8 b' msgstr "avalia revis\xc3\xb5es a serem mescladas (a mesclagem n\xc3\xa3o \xc3\xa9 executada)"'
 msgid "[-P] [-f] [[-r] REV]"
 msgstr "[-P] [-f] [[-r] REV]"
 
-msgid "merge working directory with another revision"
-msgstr "mescla o diretório de trabalho com outra revisão"
+msgid "merge another revision into working directory"
+msgstr "mescla uma outra revisão com o diretório de trabalho"
 
 msgid ""
 "    The current working directory is updated with all changes made in\n"
@@ -20039,7 +20039,7 b' msgstr ""'
 
 msgid ""
 "``reportoldssl``\n"
-"    Warn if an SSL certificate is unable to be due to using Python\n"
+"    Warn if an SSL certificate is unable to be used due to using Python\n"
 "    2.5 or earlier. True or False. Default is True."
 msgstr ""
 "``reportoldssl``\n"