# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1409607813 -7200
# Node ID 5dc91146f35369949ea56b40172308158b59063a
# Parent  e284de138f00676f33a0d8a390dd79fafcf5087d# Parent  737b2bea97f898ed098b523d1674a486ce2e24f0
merge with i18n

diff -r e284de138f00 -r 5dc91146f353 i18n/ja.po
--- a/i18n/ja.po	Sat Aug 30 20:06:24 2014 +0200
+++ b/i18n/ja.po	Mon Sep 01 23:43:33 2014 +0200
@@ -149,8 +149,8 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2014-08-01 17:00+0900\n"
-"PO-Revision-Date: 2014-08-01 17:24+0900\n"
+"POT-Creation-Date: 2014-08-30 21:28+0900\n"
+"PO-Revision-Date: 2014-08-31 20:40+0900\n"
 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -9923,6 +9923,13 @@
 msgid "not a Mercurial patch"
 msgstr "Mercurial 向けのパッチではありません"
 
+msgid ""
+"warning: import the patch as a normal revision\n"
+"(use --exact to import the patch as a merge)\n"
+msgstr ""
+"警告: パッチを通常リビジョンとして取り込みます\n"
+"(マージ実施パッチを取り込む場合は --exact を指定してください)\n"
+
 msgid "patch is damaged or loses information"
 msgstr "パッチには破損または情報の欠落があります"
 
@@ -12068,6 +12075,10 @@
 msgid "    With no arguments, displays the list of obsolescence markers."
 msgstr "    引数指定が無い場合、 廃止マーカを一覧表示します。"
 
+#, python-format
+msgid "bad obsmarker input: %s"
+msgstr "不正な obsmarker 指定: %s"
+
 msgid "complete an entire path"
 msgstr "パス全体を補完"
 
@@ -12680,6 +12691,10 @@
 msgstr "リビジョン %s を無視 (%s に移植済み)\n"
 
 #, python-format
+msgid "skipping already grafted revision %s (%s also has unknown origin %s)\n"
+msgstr "移植済みリビジョン %s を無視 (%s も未知のリビジョン %s 由来)\n"
+
+#, python-format
 msgid "skipping already grafted revision %s (%s also has origin %d)\n"
 msgstr "移植済みリビジョン %s を無視 (%s も同じリビジョン %d 由来)\n"
 
@@ -15207,6 +15222,9 @@
 msgid "and %s others"
 msgstr "その他 %s 個"
 
+msgid "remote has heads that are not known locally\n"
+msgstr "連携先には新規ヘッドが存在します\n"
+
 #, python-format
 msgid "remote has heads that are not known locally: %s\n"
 msgstr "連携先には新規ヘッドが存在します: %s\n"
@@ -15697,7 +15715,7 @@
 "    File that is modified according to status."
 msgstr ""
 "``modified()``\n"
-"    変更ステータスを持つファイル (※ 訳注: 未コミット時点でのみ判定可能)"
+"    変更ステータスを持つファイル (※ 訳注: 第1親との比較)"
 
 #. i18n: "modified" is a keyword
 msgid "modified takes no arguments"
@@ -15708,7 +15726,7 @@
 "    File that is added according to status."
 msgstr ""
 "``added()``\n"
-"    追加ステータスを持つファイル (※ 訳注: 未コミット時点でのみ判定可能)"
+"    追加ステータスを持つファイル (※ 訳注: 第1親との比較)"
 
 #. i18n: "added" is a keyword
 msgid "added takes no arguments"
@@ -15719,7 +15737,7 @@
 "    File that is removed according to status."
 msgstr ""
 "``removed()``\n"
-"    登録除外ステータスを持つファイル (※ 訳注: 未コミット時点でのみ判定可能)"
+"    登録除外ステータスを持つファイル (※ 訳注: 第1親との比較)"
 
 #. i18n: "removed" is a keyword
 msgid "removed takes no arguments"
@@ -15730,7 +15748,7 @@
 "    File that is deleted according to status."
 msgstr ""
 "``deleted()``\n"
-"    不在ステータスを持つファイル (※ 訳注: 未コミット時点でのみ判定可能)"
+"    不在ステータスを持つファイル (※ 訳注: 作業領域でのみ有効)"
 
 #. i18n: "deleted" is a keyword
 msgid "deleted takes no arguments"
@@ -15744,7 +15762,7 @@
 "``unknown()``\n"
 "    未知ステータスを持つファイル。\n"
 "    本述語が指定された時のみ、\n"
-"    未知ファイルが Mercurial の取り扱い対象になります。"
+"    作業領域中の未知ファイルが Mercurial の取り扱い対象になります。"
 
 #. i18n: "unknown" is a keyword
 msgid "unknown takes no arguments"
@@ -15758,7 +15776,7 @@
 "``ignored()``\n"
 "    無視ステータスを持つファイル。\n"
 "    本述語が指定された時のみ、\n"
-"    無視対象ファイルが Mercurial の取り扱い対象になります。"
+"    作業領域中の無視対象ファイルが Mercurial の取り扱い対象になります。"
 
 #. i18n: "ignored" is a keyword
 msgid "ignored takes no arguments"
@@ -15769,7 +15787,7 @@
 "    File that is clean according to status."
 msgstr ""
 "``clean()``\n"
-"    変更無しステータスを持つファイル (※ 訳注: 未コミット時点でのみ判定可能)"
+"    変更無しステータスを持つファイル (※ 訳注: 第1親との比較)"
 
 #. i18n: "clean" is a keyword
 msgid "clean takes no arguments"
@@ -23181,6 +23199,9 @@
 msgid "- label(label, expr)"
 msgstr "- label(label, expr)"
 
+msgid "- pad(text, width[, fillchar, right])"
+msgstr "- pad(text, width[, fillchar, right])"
+
 msgid "- revset(query[, formatargs])"
 msgstr "- revset(query[, formatargs])"
 
@@ -24071,6 +24092,10 @@
 "parsing obsolete marker: metadata is too short, %d bytes expected, got %d"
 msgstr "廃止情報解析: メタデータの想定サイズ %d に対して %d しかありません"
 
+#, python-format
+msgid "in-marker cycle with %s"
+msgstr ""
+
 msgid "bad obsolescence marker detected: invalid successors nullid"
 msgstr "不正な廃止情報を検出: 後継としての null 指定は不正です"
 
diff -r e284de138f00 -r 5dc91146f353 i18n/pt_BR.po
--- a/i18n/pt_BR.po	Sat Aug 30 20:06:24 2014 +0200
+++ b/i18n/pt_BR.po	Mon Sep 01 23:43:33 2014 +0200
@@ -10052,6 +10052,13 @@
 msgid "not a Mercurial patch"
 msgstr "não é um patch do Mercurial"
 
+msgid ""
+"warning: import the patch as a normal revision\n"
+"(use --exact to import the patch as a merge)\n"
+msgstr ""
+"aviso: importando o patch como revisão normal\n"
+"(use --exact para importar o patch como uma mesclagem)\n"
+
 msgid "patch is damaged or loses information"
 msgstr "o patch está danificado ou perde informação"
 
@@ -11090,14 +11097,14 @@
 
 msgid ""
 "    Creating or updating to a bookmark causes it to be marked as 'active'.\n"
-"    Active bookmarks are indicated with a '*'.\n"
-"    When a commit is made, an active bookmark will advance to the new commit.\n"
+"    The active bookmark is indicated with a '*'.\n"
+"    When a commit is made, the active bookmark will advance to the new commit.\n"
 "    A plain :hg:`update` will also advance an active bookmark, if possible.\n"
 "    Updating away from a bookmark will cause it to be deactivated."
 msgstr ""
 "    Criar ou atualizar para um marcador faz com que ele seja 'ativado'.\n"
-"    Marcadores ativos são indicados com um '*'.\n"
-"    Quando é feita uma consolidação, um marcador ativo avançará para\n"
+"    O marcador ativo é indicado com um '*'.\n"
+"    Quando é feita uma consolidação, o marcador ativo avançará para\n"
 "    a nova revisão.\n"
 "    Um :hg:`update` sem opções também avançará um marcador ativo,\n"
 "    se possível.\n"
@@ -12261,6 +12268,10 @@
 msgid "    With no arguments, displays the list of obsolescence markers."
 msgstr "    Sem parâmetros, mostra a lista de marcações de obsolescência."
 
+#, python-format
+msgid "bad obsmarker input: %s"
+msgstr "entrada obsmarker ruim: %s"
+
 msgid "complete an entire path"
 msgstr "completa um caminho completo"
 
@@ -12898,6 +12909,11 @@
 msgstr "omitindo revisão %s (já enxertada em %s)\n"
 
 #, python-format
+msgid "skipping already grafted revision %s (%s also has unknown origin %s)\n"
+msgstr ""
+"omitindo revisão %s já enxertada (%s também tem origem desconhecida %s)\n"
+
+#, python-format
 msgid "skipping already grafted revision %s (%s also has origin %d)\n"
 msgstr "omitindo revisão %s já enxertada (%s também tem como origem %d)\n"
 
@@ -15515,6 +15531,9 @@
 msgid "and %s others"
 msgstr "e %s outras"
 
+msgid "remote has heads that are not known locally\n"
+msgstr "o repositório remoto possui cabeças que não são conhecidas localmente\n"
+
 #, python-format
 msgid "remote has heads that are not known locally: %s\n"
 msgstr ""
@@ -23693,6 +23712,9 @@
 msgid "- label(label, expr)"
 msgstr "- label(label, expr)"
 
+msgid "- pad(text, width[, fillchar, right])"
+msgstr "- pad(texto, largura[, preenchimento, direita])"
+
 msgid "- revset(query[, formatargs])"
 msgstr "- revset(consulta[, formato])"
 
@@ -24603,6 +24625,10 @@
 "decodificando marcações de obsolescência: metadados são curtos demais, %d "
 "bytes esperados, %d obtidos"
 
+#, python-format
+msgid "in-marker cycle with %s"
+msgstr "ciclo nos marcadores com %s"
+
 msgid "bad obsolescence marker detected: invalid successors nullid"
 msgstr ""
 "marcação de obsolescência inválida detectada: sucessores nullid inválidos"