Mercurial > hg
changeset 23425:2b1ffaaab01f stable
merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 01 Dec 2014 18:51:10 -0600 |
| parents | 0f46f675fa39 (current diff) b97b2fbf525c (diff) |
| children | 19ebd2f88fc7 57d35d3c1cf1 |
| files | |
| diffstat | 2 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/ja.po Mon Dec 01 18:39:19 2014 -0600 +++ b/i18n/ja.po Mon Dec 01 18:51:10 2014 -0600 @@ -149,8 +149,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\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 <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -12292,6 +12292,9 @@ msgid "free the working state lock (DANGEROUS)" msgstr "作業領域の排他の解放 (危険)" +msgid "[OPTION]..." +msgstr "[OPTION]..." + msgid "show or modify state of locks" msgstr "排他状況の表示又は変更" @@ -12508,9 +12511,6 @@ 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 @@ 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 @@ 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"
--- a/i18n/pt_BR.po Mon Dec 01 18:39:19 2014 -0600 +++ b/i18n/pt_BR.po Mon Dec 01 18:51:10 2014 -0600 @@ -12497,6 +12497,9 @@ 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 @@ 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 @@ 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 @@ 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"