D27313.id79852.diff
No OneTemporary
Actions

Size

274 KB

Referenced Files

None

Subscribers

None

D27313.id79852.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	Index: pt_BR.ISO8859-1/articles/committers-guide/article.xml
	===================================================================
	--- pt_BR.ISO8859-1/articles/committers-guide/article.xml
	+++ pt_BR.ISO8859-1/articles/committers-guide/article.xml
	@@ -9,7 +9,7 @@

	<author><orgname>Projeto de Documentação do FreeBSD</orgname></author>

	- <copyright><year>1999</year> <year>2000</year> <year>2001</year> <year>2002</year> <year>2003</year> <year>2004</year> <year>2005</year> <year>2006</year> <year>2007</year> <year>2008</year> <year>2009</year> <year>2010</year> <year>2011</year> <year>2012</year> <year>2013</year> <year>2014</year> <year>2015</year> <year>2016</year> <year>2017</year> <year>2018</year> <year>2019</year> <holder>Projeto de Documentação do FreeBSD</holder></copyright>
	+ <copyright><year>1999</year> <year>2000</year> <year>2001</year> <year>2002</year> <year>2003</year> <year>2004</year> <year>2005</year> <year>2006</year> <year>2007</year> <year>2008</year> <year>2009</year> <year>2010</year> <year>2011</year> <year>2012</year> <year>2013</year> <year>2014</year> <year>2015</year> <year>2016</year> <year>2017</year> <year>2018</year> <year>2019</year> <year>2020</year> <holder>Projeto de Documentação do FreeBSD</holder></copyright>

	<legalnotice xml:id="trademarks" role="trademarks">
	<para>FreeBSD is a registered trademark of the FreeBSD Foundation.</para>
	@@ -1498,6 +1498,8 @@
	</tbody>
	</tgroup>
	</informaltable>
	+
	+ <para>Os novos committers devem ter como objetivo realizar commits o suficiente para que seu mentor se sinta confortável em liberá-los da mentoria no primeiro ano. Se eles ainda estiverem sob orientação, o corpo gerencial apropriado (core, doceng ou portmgr) deve tentar garantir que não haja barreiras que impeçam a conclusão. Se o committer não for capaz de satisfazer seu mentor de prontidão por um ano e meio, seu commit bit pode ser convertido para membro do projeto.</para>
	</sect2>
	</sect1>

	@@ -1933,17 +1935,9 @@
	</varlistentry>

	<varlistentry>
	- <term>Bruce Evans <email>bde@FreeBSD.org</email></term>
	+ <term>Glen Barber <email>gjb@FreeBSD.org</email>, Konstantin Belousov <email>kib@FreeBSD.org</email>, Bryan Drewery <email>bdrewery@FreeBSD.org</email>, Marc Fonvieille <email>blackend@FreeBSD.org</email>, Xin Li <email>delphij@FreeBSD.org</email>, Colin Percival <email>cperciva@FreeBSD.org</email> Hiroki Sato <email>hrs@FreeBSD.org</email>, Gleb Smirnoff <email>glebius@FreeBSD.org</email></term>

	<listitem>
	- <para>Bruce é o Style Police-Meister. Quando você fizer um commit que poderia ter sido feito melhor, Bruce estará lá para lhe contar. Seja grato que alguém está. Bruce também é muito conhecedor dos vários padrões aplicáveis ao FreeBSD.</para>
	- </listitem>
	- </varlistentry>
	-
	- <varlistentry>
	- <term>Glen Barber <email>gjb@FreeBSD.org</email>, Konstantin Belousov <email>kib@FreeBSD.org</email>, Bryan Drewery <email>bdrewery@FreeBSD.org</email>, Marc Fonvieille <email>blackend@FreeBSD.org</email>, Xin Li <email>delphij@FreeBSD.org</email>, Hiroki Sato <email>hrs@FreeBSD.org</email>, Gleb Smirnoff <email>glebius@FreeBSD.org</email>, Marius Strobl <email>marius@FreeBSD.org</email></term>
	-
	- <listitem>
	<para>Estes são os membros da Equipe de Engenharia de Release <email>re@FreeBSD.org</email>. Essa equipe é responsável por definir os prazos de lançamento e por controlar o processo de release. Durante o congelamento de código, os engenheiros de release têm autoridade final sobre todas as alterações no sistema para qualquer branch que esteja com status de release pendente. Se há algo que você deseja mesclar do FreeBSD-CURRENT para o FreeBSD-STABLE (quaisquer valores que eles possam ter em um dado momento), estas são as pessoas com quem conversar sobre isso.</para>
	</listitem>
	</varlistentry>
	@@ -2013,7 +2007,7 @@

	<para>Teste com um simples comando remoto: <command>ssh freefall.FreeBSD.org ls /usr</command>.</para>

	- <para>Para obter mais informações, consulte <package>security/openssh</package>, <citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ssh-add</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ssh-agent</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry>, e <citerefentry><refentrytitle>scp</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
	+ <para>Para obter mais informações, consulte <package>security/openssh-portable</package>, <citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ssh-add</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ssh-agent</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry>, e <citerefentry><refentrytitle>scp</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>

	<para>Para obter informações sobre como adicionar, alterar ou remover chaves <citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, consulte <uri xlink:href="https://wiki.freebsd.org/clusteradm/ssh-keys">este artigo</uri>.</para>
	</sect1>
	Index: pt_BR.ISO8859-1/articles/committers-guide/pt_BR.po
	===================================================================
	--- pt_BR.ISO8859-1/articles/committers-guide/pt_BR.po
	+++ pt_BR.ISO8859-1/articles/committers-guide/pt_BR.po
	@@ -7,8 +7,8 @@
	msgid ""
	msgstr ""
	"Project-Id-Version: PACKAGE VERSION\n"
	-"POT-Creation-Date: 2020-07-26 12:03-0300\n"
	-"PO-Revision-Date: 2020-07-26 14:57+0000\n"
	+"POT-Creation-Date: 2020-11-22 11:23-0300\n"
	+"PO-Revision-Date: 2020-11-22 13:50+0000\n"
	"Last-Translator: Danilo G. Baio <dbaio@FreeBSD.org>\n"
	"Language-Team: Portuguese (Brazil) <https://translate-dev.freebsd.org/"
	"projects/freebsd-doc/articles_committers-guide/pt_BR/>\n"
	@@ -17,7 +17,7 @@
	"Content-Type: text/plain; charset=UTF-8\n"
	"Content-Transfer-Encoding: 8bit\n"
	"Plural-Forms: nplurals=2; plural=(n != 1);\n"
	-"X-Generator: Weblate 4.1.1\n"
	+"X-Generator: Weblate 4.3.2\n"

	#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
	msgctxt "_"
	@@ -26,7 +26,7 @@
	"André Franciosi, andre@franciosi.org, 2018\n"
	"Edson Brandi, ebrandi@FreeBSD.org, 2018\n"
	"Silvio Ap Silva, contato@kanazuchi.com, 2018\n"
	-"Danilo G. Baio, dbaio@FreeBSD.org, 2018"
	+"Danilo G. Baio, dbaio@FreeBSD.org, 2018-2020"

	#. (itstool) path: info/title
	#: article.translate.xml:8
	@@ -46,22 +46,24 @@
	"<year>2007</year> <year>2008</year> <year>2009</year> <year>2010</year> "
	"<year>2011</year> <year>2012</year> <year>2013</year> <year>2014</year> "
	"<year>2015</year> <year>2016</year> <year>2017</year> <year>2018</year> "
	-"<year>2019</year> <holder>The FreeBSD Documentation Project</holder>"
	+"<year>2019</year> <year>2020</year> <holder>The FreeBSD Documentation "
	+"Project</holder>"
	msgstr ""
	"<year>1999</year> <year>2000</year> <year>2001</year> <year>2002</year> "
	"<year>2003</year> <year>2004</year> <year>2005</year> <year>2006</year> "
	"<year>2007</year> <year>2008</year> <year>2009</year> <year>2010</year> "
	"<year>2011</year> <year>2012</year> <year>2013</year> <year>2014</year> "
	"<year>2015</year> <year>2016</year> <year>2017</year> <year>2018</year> "
	-"<year>2019</year> <holder>Projeto de Documentação do FreeBSD</holder>"
	+"<year>2019</year> <year>2020</year> <holder>Projeto de Documentação do "
	+"FreeBSD</holder>"

	#. (itstool) path: legalnotice/para
	-#: article.translate.xml:40
	+#: article.translate.xml:41
	msgid "FreeBSD is a registered trademark of the FreeBSD Foundation."
	msgstr "FreeBSD is a registered trademark of the FreeBSD Foundation."

	#. (itstool) path: legalnotice/para
	-#: article.translate.xml:42
	+#: article.translate.xml:43
	msgid ""
	"Coverity is a registered trademark; Coverity Extend, Coverity Prevent and "
	"Coverity Prevent SQS are trademarks of Coverity, Inc."
	@@ -70,7 +72,7 @@
	"Coverity Prevent SQS are trademarks of Coverity, Inc."

	#. (itstool) path: legalnotice/para
	-#: article.translate.xml:45
	+#: article.translate.xml:46
	msgid ""
	"IBM, AIX, OS/2, PowerPC, PS/2, S/390, and ThinkPad are trademarks of "
	"International Business Machines Corporation in the United States, other "
	@@ -81,7 +83,7 @@
	"countries, or both."

	#. (itstool) path: legalnotice/para
	-#: article.translate.xml:49
	+#: article.translate.xml:50
	msgid ""
	"Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, "
	"and Xeon are trademarks or registered trademarks of Intel Corporation or its "
	@@ -92,7 +94,7 @@
	"subsidiaries in the United States and other countries."

	#. (itstool) path: legalnotice/para
	-#: article.translate.xml:53
	+#: article.translate.xml:54
	msgid ""
	"SPARC, SPARC64, and UltraSPARC are trademarks of SPARC International, Inc in "
	"the United States and other countries. SPARC International, Inc owns all of "
	@@ -105,7 +107,7 @@
	"these trademarks by its members."

	#. (itstool) path: legalnotice/para
	-#: article.translate.xml:58
	+#: article.translate.xml:59
	msgid ""
	"Many of the designations used by manufacturers and sellers to distinguish "
	"their products are claimed as trademarks. Where those designations appear in "
	@@ -121,16 +123,16 @@

	#. (itstool) path: info/pubdate
	#. (itstool) path: info/releaseinfo
	-#: article.translate.xml:66 article.translate.xml:68
	+#: article.translate.xml:67 article.translate.xml:69
	msgid ""
	-"$FreeBSD: head/en_US.ISO8859-1/articles/committers-guide/article.xml 54315 "
	-"2020-07-07 10:11:37Z brueffer $"
	+"$FreeBSD: head/en_US.ISO8859-1/articles/committers-guide/article.xml 54676 "
	+"2020-11-07 14:49:16Z 0mp $"
	msgstr ""
	-"$FreeBSD: head/en_US.ISO8859-1/articles/committers-guide/article.xml 54315 "
	-"2020-07-07 10:11:37Z brueffer $"
	+"$FreeBSD: head/en_US.ISO8859-1/articles/committers-guide/article.xml 54676 "
	+"2020-11-07 14:49:16Z 0mp $"

	#. (itstool) path: abstract/para
	-#: article.translate.xml:71
	+#: article.translate.xml:72
	msgid ""
	"This document provides information for the FreeBSD committer community. All "
	"new committers should read this document before they start, and existing "
	@@ -142,7 +144,7 @@
	"de tempos em tempos."

	#. (itstool) path: abstract/para
	-#: article.translate.xml:76
	+#: article.translate.xml:77
	msgid ""
	"Almost all FreeBSD developers have commit rights to one or more "
	"repositories. However, a few developers do not, and some of the information "
	@@ -158,7 +160,7 @@
	"informações."

	#. (itstool) path: abstract/para
	-#: article.translate.xml:83
	+#: article.translate.xml:84
	msgid ""
	"This document may also be of interest to members of the FreeBSD community "
	"who want to learn more about how the project works."
	@@ -167,17 +169,17 @@
	"FreeBSD que querem aprender mais sobre como o projeto funciona."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:90
	+#: article.translate.xml:91
	msgid "Administrative Details"
	msgstr "Detalhes Administrativos"

	#. (itstool) path: row/entry
	-#: article.translate.xml:98
	+#: article.translate.xml:99
	msgid "<emphasis>Login Methods</emphasis>"
	msgstr "<emphasis>Métodos de login</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:99
	+#: article.translate.xml:100
	msgid ""
	"<citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></"
	"citerefentry>, protocol 2 only"
	@@ -186,22 +188,22 @@
	"citerefentry>,_apenas no protocolo 2"

	#. (itstool) path: row/entry
	-#: article.translate.xml:103
	+#: article.translate.xml:104
	msgid "<emphasis>Main Shell Host</emphasis>"
	msgstr "<emphasis>Servidor Principal de Shell</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:104
	+#: article.translate.xml:105
	msgid "<systemitem class=\"fqdomainname\">freefall.FreeBSD.org</systemitem>"
	msgstr "<systemitem class=\"fqdomainname\">freefall.FreeBSD.org</systemitem>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:108
	+#: article.translate.xml:109
	msgid "<emphasis>SMTP Host</emphasis>"
	msgstr "<emphasis>Servidor SMTP</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:109
	+#: article.translate.xml:110
	msgid ""
	"<literal><systemitem class=\"fqdomainname\">smtp.FreeBSD.org</"
	"systemitem>:587</literal> (see also <xref linkend=\"smtp-setup\"/>)."
	@@ -210,12 +212,12 @@
	"systemitem>:587</literal> (veja também <xref linkend=\"smtp-setup\"/>)."

	#. (itstool) path: row/entry
	-#: article.translate.xml:115
	+#: article.translate.xml:116
	msgid "<emphasis><literal>src/</literal> Subversion Root</emphasis>"
	msgstr "<emphasis>Raiz do Subversion para o <literal>src/</literal></emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:117
	+#: article.translate.xml:118
	msgid ""
	"<literal>svn+ssh://</literal><systemitem class=\"fqdomainname\">repo.FreeBSD."
	"org</systemitem><filename>/base</filename> (see also <xref linkend=\"svn-"
	@@ -226,12 +228,12 @@
	"getting-started-base-layout\"/>)."

	#. (itstool) path: row/entry
	-#: article.translate.xml:122
	+#: article.translate.xml:123
	msgid "<emphasis><literal>doc/</literal> Subversion Root</emphasis>"
	msgstr "<emphasis>Raiz do Subversion para o <literal>doc/</literal></emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:124
	+#: article.translate.xml:125
	msgid ""
	"<literal>svn+ssh://</literal><systemitem class=\"fqdomainname\">repo.FreeBSD."
	"org</systemitem><filename>/doc</filename> (see also <xref linkend=\"svn-"
	@@ -242,13 +244,13 @@
	"getting-started-doc-layout\"/>)."

	#. (itstool) path: row/entry
	-#: article.translate.xml:129
	+#: article.translate.xml:130
	msgid "<emphasis><literal>ports/</literal> Subversion Root</emphasis>"
	msgstr ""
	"<emphasis>Raiz do Subversion para o <literal>ports/</literal></emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:132
	+#: article.translate.xml:133
	msgid ""
	"<literal>svn+ssh://</literal><systemitem class=\"fqdomainname\">repo.FreeBSD."
	"org</systemitem><filename>/ports</filename> (see also <xref linkend=\"svn-"
	@@ -259,12 +261,12 @@
	"getting-started-ports-layout\"/>)."

	#. (itstool) path: row/entry
	-#: article.translate.xml:137
	+#: article.translate.xml:138
	msgid "<emphasis>Internal Mailing Lists</emphasis>"
	msgstr "<emphasis>Listas de Discussão Internas</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:138
	+#: article.translate.xml:139
	msgid ""
	"developers (technically called all-developers), doc-developers, doc-"
	"committers, ports-developers, ports-committers, src-developers, src-"
	@@ -285,12 +287,12 @@
	"cluster <systemitem class=\"fqdomainname\">FreeBSD.org</systemitem>.)"

	#. (itstool) path: row/entry
	-#: article.translate.xml:153
	+#: article.translate.xml:154
	msgid "<emphasis>Core Team monthly reports</emphasis>"
	msgstr "<emphasis>Relatórios mensais do Core Team</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:155
	+#: article.translate.xml:156
	msgid ""
	"<filename>/home/core/public/monthly-reports</filename> on the <systemitem "
	"class=\"fqdomainname\">FreeBSD.org</systemitem> cluster."
	@@ -300,12 +302,12 @@
	"systemitem>."

	#. (itstool) path: row/entry
	-#: article.translate.xml:161
	+#: article.translate.xml:162
	msgid "<emphasis>Ports Management Team monthly reports</emphasis>"
	msgstr "<emphasis>Relatórios mensais da Equipe de Gestão do Ports</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:163
	+#: article.translate.xml:164
	msgid ""
	"<filename>/home/portmgr/public/monthly-reports</filename> on the <systemitem "
	"class=\"fqdomainname\">FreeBSD.org</systemitem> cluster."
	@@ -315,13 +317,13 @@
	"systemitem>."

	#. (itstool) path: row/entry
	-#: article.translate.xml:169
	+#: article.translate.xml:170
	msgid "<emphasis>Noteworthy <literal>src/</literal> SVN Branches</emphasis>"
	msgstr ""
	"<emphasis>Branchs SVN do <literal>src/</literal> dignas de atenção</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:171
	+#: article.translate.xml:172
	msgid ""
	"<literal>stable/</literal><replaceable>n</replaceable> (<replaceable>n</"
	"replaceable>-STABLE), <literal>head</literal> (-CURRENT)"
	@@ -330,7 +332,7 @@
	"replaceable>-STABLE), <literal>head</literal> (-CURRENT)"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:180
	+#: article.translate.xml:181
	msgid ""
	"<citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></"
	"citerefentry> is required to connect to the project hosts. For more "
	@@ -341,12 +343,12 @@
	"mais informações, veja <xref linkend=\"ssh.guide\"/>."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:183
	+#: article.translate.xml:184
	msgid "Useful links:"
	msgstr "Links Úteis:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:187
	+#: article.translate.xml:188
	msgid ""
	"<link xlink:href=\"@@URL_RELPREFIX@@/internal/\">FreeBSD Project Internal "
	"Pages</link>"
	@@ -355,7 +357,7 @@
	"FreeBSD</link>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:192
	+#: article.translate.xml:193
	msgid ""
	"<link xlink:href=\"@@URL_RELPREFIX@@/internal/machines.html\">FreeBSD "
	"Project Hosts</link>"
	@@ -364,7 +366,7 @@
	"Projeto FreeBSD</link>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:197
	+#: article.translate.xml:198
	msgid ""
	"<link xlink:href=\"@@URL_RELPREFIX@@/administration.html\">FreeBSD Project "
	"Administrative Groups</link>"
	@@ -373,12 +375,12 @@
	"Administrativos do Projeto FreeBSD</link>"

	#. (itstool) path: sect1/title
	-#: article.translate.xml:204
	+#: article.translate.xml:205
	msgid "Open<acronym>PGP</acronym> Keys for FreeBSD"
	msgstr "Chaves Open<acronym>PGP</acronym> para o FreeBSD"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:206
	+#: article.translate.xml:207
	msgid ""
	"Cryptographic keys conforming to the Open<acronym>PGP</acronym> "
	"(<emphasis>Pretty Good Privacy</emphasis>) standard are used by the FreeBSD "
	@@ -401,12 +403,12 @@
	"maiores informações."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:219
	+#: article.translate.xml:220
	msgid "Creating a Key"
	msgstr "Criando uma chave"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:221
	+#: article.translate.xml:222
	msgid ""
	"Existing keys can be used, but should be checked with <filename>doc/head/"
	"share/pgpkeys/checkkey.sh</filename> first. In this case, make sure the key "
	@@ -417,7 +419,7 @@
	"caso, certifique-se que a chave contenha um ID de usuário FreeBSD."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:226
	+#: article.translate.xml:227
	msgid ""
	"For those who do not yet have an Open<acronym>PGP</acronym> key, or need a "
	"new key to meet FreeBSD security requirements, here we show how to generate "
	@@ -428,7 +430,7 @@
	"seção iremos mostrar como gerar uma."

	#. (itstool) path: step/para
	-#: article.translate.xml:234
	+#: article.translate.xml:235
	msgid ""
	"Install <filename role=\"package\">security/gnupg</filename>. Enter these "
	"lines in <filename>~/.gnupg/gpg.conf</filename> to set minimum acceptable "
	@@ -439,7 +441,7 @@
	"mínimos aceitáveis:"

	#. (itstool) path: step/programlisting
	-#: article.translate.xml:239
	+#: article.translate.xml:240
	#, no-wrap
	msgid ""
	"fixed-list-mode\n"
	@@ -463,12 +465,12 @@
	"cert-digest-algo SHA512"

	#. (itstool) path: step/para
	-#: article.translate.xml:251
	+#: article.translate.xml:252
	msgid "Generate a key:"
	msgstr "Gere uma chave:"

	#. (itstool) path: step/screen
	-#: article.translate.xml:253
	+#: article.translate.xml:254
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>gpg --full-gen-key</userinput>\n"
	@@ -544,7 +546,7 @@
	"You need a Passphrase to protect your secret key."

	#. (itstool) path: callout/para
	-#: article.translate.xml:291
	+#: article.translate.xml:292
	msgid ""
	"2048-bit keys with a three-year expiration provide adequate protection at "
	"present (2013-12). <link xlink:href=\"http://danielpocock.com/rsa-key-"
	@@ -555,7 +557,7 @@
	"com/rsa-key-sizes-2048-or-4096-bits\"/> descreve a situação em mais detalhes."

	#. (itstool) path: callout/para
	-#: article.translate.xml:297
	+#: article.translate.xml:298
	msgid ""
	"A three year key lifespan is short enough to obsolete keys weakened by "
	"advancing computer power, but long enough to reduce key management problems."
	@@ -565,7 +567,7 @@
	"mas é tempo suficiente para reduzir os principais problemas de gerenciamento."

	#. (itstool) path: callout/para
	-#: article.translate.xml:304
	+#: article.translate.xml:305
	msgid ""
	"Use your real name here, preferably matching that shown on government-issued "
	"<acronym>ID</acronym> to make it easier for others to verify your identity. "
	@@ -579,7 +581,7 @@
	"você na seção <literal>Comment</literal>."

	#. (itstool) path: step/para
	-#: article.translate.xml:312
	+#: article.translate.xml:313
	msgid ""
	"After the email address is entered, a passphrase is requested. Methods of "
	"creating a secure passphrase are contentious. Rather than suggest a single "
	@@ -598,7 +600,7 @@
	"\"http://en.wikipedia.org/wiki/Passphrase\"/>."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:322
	+#: article.translate.xml:323
	msgid ""
	"Protect the private key and passphrase. If either the private key or "
	"passphrase may have been compromised or disclosed, immediately notify "
	@@ -609,19 +611,19 @@
	" <email>accounts@FreeBSD.org</email> e revogue a chave."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:327
	+#: article.translate.xml:328
	msgid "Committing the new key is shown in <xref linkend=\"commit-steps\"/>."
	msgstr ""
	"O processo para commit da nova chave é mostrado em <xref linkend=\"commit-"
	"steps\"/>."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:333
	+#: article.translate.xml:334
	msgid "Kerberos and LDAP web Password for FreeBSD Cluster"
	msgstr "Kerberos e LDAP Web Password para o cluster do FreeBSD"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:335
	+#: article.translate.xml:336
	msgid ""
	"The FreeBSD cluster requires a Kerberos password to access certain services. "
	"The Kerberos password also serves as the LDAP web password, since LDAP is "
	@@ -634,17 +636,17 @@
	"exigem isso incluem:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:343
	+#: article.translate.xml:344
	msgid "<link xlink:href=\"https://bugs.freebsd.org/bugzilla\">Bugzilla</link>"
	msgstr "<link xlink:href=\"https://bugs.freebsd.org/bugzilla\">Bugzilla</link>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:346
	+#: article.translate.xml:347
	msgid "<link xlink:href=\"https://ci.freebsd.org\">Jenkins</link>"
	msgstr "<link xlink:href=\"https://ci.freebsd.org\">Jenkins</link>"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:350
	+#: article.translate.xml:351
	msgid ""
	"To create a new Kerberos account in the FreeBSD cluster, or to reset a "
	"Kerberos password for an existing account using a random password generator:"
	@@ -654,19 +656,19 @@
	"de senha aleatória:"

	#. (itstool) path: sect1/screen
	-#: article.translate.xml:354
	+#: article.translate.xml:355
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>ssh kpasswd.freebsd.org</userinput>"
	msgstr "<prompt>%</prompt> <userinput>ssh kpasswd.freebsd.org</userinput>"

	#. (itstool) path: note/para
	-#: article.translate.xml:357
	+#: article.translate.xml:358
	msgid "This must be done from a machine outside of the FreeBSD.org cluster."
	msgstr ""
	"Isto deve ser feito a partir de uma máquina fora do cluster do FreeBSD.org."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:361
	+#: article.translate.xml:362
	msgid ""
	"A Kerberos password can also be set manually by logging into <systemitem "
	"class=\"fqdomainname\">freefall.FreeBSD.org</systemitem> and running:"
	@@ -676,13 +678,13 @@
	"systemitem> e execute:"

	#. (itstool) path: sect1/screen
	-#: article.translate.xml:365
	+#: article.translate.xml:366
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>kpasswd</userinput>"
	msgstr "<prompt>%</prompt> <userinput>kpasswd</userinput>"

	#. (itstool) path: note/para
	-#: article.translate.xml:368
	+#: article.translate.xml:369
	msgid ""
	"Unless the Kerberos-authenticated services of the FreeBSD.org cluster have "
	"been used previously, <errorname>Client unknown</errorname> will be shown. "
	@@ -696,12 +698,12 @@
	"inicializar a conta Kerberos."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:379
	+#: article.translate.xml:380
	msgid "Commit Bit Types"
	msgstr "Tipos de Commit Bits"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:381
	+#: article.translate.xml:382
	msgid ""
	"The FreeBSD repository has a number of components which, when combined, "
	"support the basic operating system source, documentation, third party "
	@@ -727,67 +729,67 @@
	"área por algum período de tempo."

	#. (itstool) path: row/entry
	-#: article.translate.xml:398
	+#: article.translate.xml:399
	msgid "<emphasis>Committer Type</emphasis>"
	msgstr "<emphasis>Tipo de Committer</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:399
	+#: article.translate.xml:400
	msgid "<emphasis>Responsible</emphasis>"
	msgstr "<emphasis>Responsável</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:400
	+#: article.translate.xml:401
	msgid "<emphasis>Tree Components</emphasis>"
	msgstr "<emphasis>Componentes da Árvore</emphasis>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:404
	+#: article.translate.xml:405
	msgid "src"
	msgstr "src"

	#. (itstool) path: row/entry
	-#: article.translate.xml:405
	+#: article.translate.xml:406
	msgid "core@"
	msgstr "core@"

	#. (itstool) path: row/entry
	-#: article.translate.xml:406
	+#: article.translate.xml:407
	msgid "src/, doc/ subject to appropriate review"
	msgstr "src/, doc/ sujeito a revisão apropriada"

	#. (itstool) path: row/entry
	-#: article.translate.xml:410
	+#: article.translate.xml:411
	msgid "doc"
	msgstr "doc"

	#. (itstool) path: row/entry
	-#: article.translate.xml:411
	+#: article.translate.xml:412
	msgid "doceng@"
	msgstr "doceng@"

	#. (itstool) path: row/entry
	-#: article.translate.xml:412
	+#: article.translate.xml:413
	msgid "doc/, ports/, src/ documentation"
	msgstr "doc/, ports/, src/ documentação"

	#. (itstool) path: row/entry
	-#: article.translate.xml:416
	+#: article.translate.xml:417
	msgid "ports"
	msgstr "ports"

	#. (itstool) path: row/entry
	-#: article.translate.xml:417
	+#: article.translate.xml:418
	msgid "portmgr@"
	msgstr "portmgr@"

	#. (itstool) path: row/entry
	-#: article.translate.xml:418
	+#: article.translate.xml:419
	msgid "ports/"
	msgstr "ports/"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:424
	+#: article.translate.xml:425
	msgid ""
	"Commit bits allocated prior to the development of the notion of areas of "
	"authority may be appropriate for use in many parts of the tree. However, "
	@@ -809,7 +811,7 @@
	"as outras pessoas trabalhando na árvore."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:434
	+#: article.translate.xml:435
	msgid ""
	"Committers are encouraged to seek review for their work as part of the "
	"normal development process, regardless of the area of the tree where the "
	@@ -820,12 +822,12 @@
	"o trabalho está ocorrendo."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:439
	+#: article.translate.xml:440
	msgid "Policy for Committer Activity in Other Trees"
	msgstr "Política para atividade de Committers em outras árvores"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:443
	+#: article.translate.xml:444
	msgid ""
	"All committers may modify <filename>base/head/share/misc/committers-*.dot</"
	"filename>, <filename>base/head/usr.bin/calendar/calendars/calendar.freebsd</"
	@@ -837,7 +839,7 @@
	"filename>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:451
	+#: article.translate.xml:452
	msgid ""
	"doc committers may commit documentation changes to <filename>src</filename> "
	"files, such as man pages, READMEs, fortune databases, calendar files, and "
	@@ -851,7 +853,7 @@
	"seguro."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:460
	+#: article.translate.xml:461
	msgid ""
	"Any committer may make changes to any other tree with an \"Approved by\" "
	"from a non-mentored committer with the appropriate bit."
	@@ -861,7 +863,7 @@
	"bit apropriado."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:466
	+#: article.translate.xml:467
	msgid ""
	"Committers can acquire an additional bit by the usual process of finding a "
	"mentor who will propose them to core, doceng, or portmgr, as appropriate. "
	@@ -876,7 +878,7 @@
	"<quote>Approved by</quote> por um período."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:475
	+#: article.translate.xml:476
	msgid ""
	"\"Approved by\" is only acceptable from non-mentored src committers -- "
	"mentored committers can provide a \"Reviewed by\" but not an \"Approved by\"."
	@@ -886,12 +888,12 @@
	"não um \"Approved by\"."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:484
	+#: article.translate.xml:485
	msgid "Subversion Primer"
	msgstr "Subversion Primer"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:486
	+#: article.translate.xml:487
	msgid ""
	"New committers are assumed to already be familiar with the basic operation "
	"of Subversion. If not, start by reading the <link xlink:href=\"http://"
	@@ -902,12 +904,12 @@
	"svnbook.red-bean.com/\">Subversion Book</link>."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:492
	+#: article.translate.xml:493
	msgid "Introduction"
	msgstr "Introdução"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:494
	+#: article.translate.xml:495
	msgid ""
	"The FreeBSD source repository switched from <acronym>CVS</acronym> to "
	"Subversion on May 31st, 2008. The first real <acronym>SVN</acronym> commit "
	@@ -918,7 +920,7 @@
	"<acronym>SVN</acronym> é o <emphasis>r179447</emphasis>."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:499
	+#: article.translate.xml:500
	msgid ""
	"The FreeBSD <literal>doc/www</literal> repository switched from "
	"<acronym>CVS</acronym> to Subversion on May 19th, 2012. The first real "
	@@ -929,7 +931,7 @@
	"commit real no <acronym>SVN</acronym> foi o <emphasis>r38821</emphasis>."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:504
	+#: article.translate.xml:505
	msgid ""
	"The FreeBSD <literal>ports</literal> repository switched from <acronym>CVS</"
	"acronym> to Subversion on July 14th, 2012. The first real <acronym>SVN</"
	@@ -941,7 +943,7 @@
	"emphasis>."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:509
	+#: article.translate.xml:510
	msgid ""
	"Subversion can be installed from the FreeBSD Ports Collection by issuing "
	"these commands:"
	@@ -950,18 +952,18 @@
	"executando o comando:"

	#. (itstool) path: sect2/screen
	-#: article.translate.xml:512
	+#: article.translate.xml:513
	#, no-wrap
	msgid "<prompt>#</prompt> <userinput>pkg install subversion</userinput>"
	msgstr "<prompt>#</prompt> <userinput>pkg install subversion</userinput>"

	#. (itstool) path: sect2/title
	-#: article.translate.xml:517
	+#: article.translate.xml:518
	msgid "Getting Started"
	msgstr "Primeiros Passos"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:519
	+#: article.translate.xml:520
	msgid ""
	"There are a few ways to obtain a working copy of the tree from Subversion. "
	"This section will explain them."
	@@ -970,12 +972,12 @@
	"Subversion. Esta seção irá explicá-las."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:523
	+#: article.translate.xml:524
	msgid "Direct Checkout"
	msgstr "Checkout direto"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:525
	+#: article.translate.xml:526
	msgid ""
	"The first is to check out directly from the main repository. For the "
	"<literal>src</literal> tree, use:"
	@@ -984,35 +986,35 @@
	"árvore <literal>src</literal>, use:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:529 article.translate.xml:750
	+#: article.translate.xml:530 article.translate.xml:751
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn checkout svn+ssh://repo.freebsd.org/base/head /usr/src</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn checkout svn+ssh://repo.freebsd.org/base/head /usr/src</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:531
	+#: article.translate.xml:532
	msgid "For the <literal>doc</literal> tree, use:"
	msgstr "Para a árvore <literal>doc</literal>, use:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:533
	+#: article.translate.xml:534
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn checkout svn+ssh://repo.freebsd.org/doc/head /usr/doc</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn checkout svn+ssh://repo.freebsd.org/doc/head /usr/doc</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:535
	+#: article.translate.xml:536
	msgid "For the <literal>ports</literal> tree, use:"
	msgstr "Para a árvore da coleção de <literal>ports</literal>, use:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:537
	+#: article.translate.xml:538
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn checkout svn+ssh://repo.freebsd.org/ports/head /usr/ports</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn checkout svn+ssh://repo.freebsd.org/ports/head /usr/ports</userinput>"

	#. (itstool) path: note/para
	-#: article.translate.xml:540
	+#: article.translate.xml:541
	msgid ""
	"Though the remaining examples in this document are written with the workflow "
	"of working with the <literal>src</literal> tree in mind, the underlying "
	@@ -1027,7 +1029,7 @@
	"às operações do Subversion estão listados em <xref linkend=\"ports\"/>."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:550
	+#: article.translate.xml:551
	msgid ""
	"The above command will check out a <literal>CURRENT</literal> source tree as "
	"<filename><replaceable>/usr/src/</replaceable></filename>, which can be any "
	@@ -1043,7 +1045,7 @@
	"mas ela poderá ser renomeada com segurança."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:558
	+#: article.translate.xml:559
	msgid ""
	"<literal>svn+ssh</literal> means the <acronym>SVN</acronym> protocol "
	"tunnelled over <acronym>SSH</acronym>. The name of the server is "
	@@ -1058,7 +1060,7 @@
	"repositório."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:565
	+#: article.translate.xml:566
	msgid ""
	"If your FreeBSD login name is different from the login name used on the "
	"local machine, either include it in the <acronym>URL</acronym> (for example "
	@@ -1071,7 +1073,7 @@
	"uma entrada no arquivo <filename>~/.ssh/config</filename> no formato:"

	#. (itstool) path: sect3/programlisting
	-#: article.translate.xml:572
	+#: article.translate.xml:573
	#, no-wrap
	msgid ""
	"Host repo.freebsd.org\n"
	@@ -1081,7 +1083,7 @@
	"\tUser jarjar"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:575
	+#: article.translate.xml:576
	msgid ""
	"This is the simplest method, but it is hard to tell just yet how much load "
	"it will place on the repository."
	@@ -1090,7 +1092,7 @@
	"colocar no repositório."

	#. (itstool) path: note/para
	-#: article.translate.xml:579
	+#: article.translate.xml:580
	msgid ""
	"The <command>svn diff</command> does not require access to the server as "
	"<acronym>SVN</acronym> stores a reference copy of every file in the working "
	@@ -1103,12 +1105,12 @@
	"do Subversion são muito grandes em tamanho."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:588
	+#: article.translate.xml:589
	msgid "<literal>RELENG_*</literal> Branches and General Layout"
	msgstr "Branches <literal>RELENG_*</literal> e Layout Geral"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:591
	+#: article.translate.xml:592
	msgid ""
	"In <literal>svn+ssh://repo.freebsd.org/base</literal>, <emphasis>base</"
	"emphasis> refers to the source tree. Similarly, <emphasis>ports</emphasis> "
	@@ -1122,7 +1124,7 @@
	"controles de acesso e email de commit."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:598
	+#: article.translate.xml:599
	msgid ""
	"For the base repository, HEAD refers to the -CURRENT tree. For example, "
	"<filename>head/bin/ls</filename> is what would go into <filename>/usr/src/"
	@@ -1133,7 +1135,7 @@
	"bin/ls</filename> em uma release. Alguns locais importantes são:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:605
	+#: article.translate.xml:606
	msgid ""
	"<emphasis>/head/</emphasis> which corresponds to <literal>HEAD</literal>, "
	"also known as <literal>-CURRENT</literal>."
	@@ -1142,7 +1144,7 @@
	"também conhecido como <literal>-CURRENT</literal>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:611
	+#: article.translate.xml:612
	msgid ""
	"<emphasis>/stable/<replaceable>n</replaceable></emphasis> which corresponds "
	"to <literal>RELENG_<replaceable>n</replaceable></literal>."
	@@ -1151,7 +1153,7 @@
	"<literal>RELENG_<replaceable>n</replaceable></literal>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:617
	+#: article.translate.xml:618
	msgid ""
	"<emphasis>/releng/<replaceable>n.n</replaceable></emphasis> which "
	"corresponds to <literal>RELENG_<replaceable>n_n</replaceable></literal>."
	@@ -1160,7 +1162,7 @@
	"a <literal>RELENG_<replaceable>n_n</replaceable></literal>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:623
	+#: article.translate.xml:624
	msgid ""
	"<emphasis>/release/<replaceable>n.n.n</replaceable></emphasis> which "
	"corresponds to <literal>RELENG_<replaceable>n_n_n</replaceable>_RELEASE</"
	@@ -1171,7 +1173,7 @@
	"literal>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:629
	+#: article.translate.xml:630
	msgid ""
	"<emphasis>/vendor*</emphasis> is the vendor branch import work area. This "
	"directory itself does not contain branches, however its subdirectories do. "
	@@ -1184,7 +1186,7 @@
	"emphasis>, <emphasis>releng</emphasis> e <emphasis>release</emphasis>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:638
	+#: article.translate.xml:639
	msgid ""
	"<emphasis>/projects</emphasis> and <emphasis>/user</emphasis> feature a "
	"branch work area. As above, the <emphasis>/user</emphasis> directory does "
	@@ -1195,12 +1197,12 @@
	"contém branches em si."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:648
	+#: article.translate.xml:649
	msgid "FreeBSD Documentation Project Branches and Layout"
	msgstr "Branches e Layout do Projeto de Documentação do FreeBSD"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:651
	+#: article.translate.xml:652
	msgid ""
	"In <literal>svn+ssh://repo.freebsd.org/doc</literal>, <emphasis>doc</"
	"emphasis> refers to the repository root of the source tree."
	@@ -1209,7 +1211,7 @@
	"emphasis> refere-se à raiz do repositório da árvore de código fonte."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:655
	+#: article.translate.xml:656
	msgid ""
	"In general, most FreeBSD Documentation Project work will be done within the "
	"<filename>head/</filename> branch of the documentation source tree."
	@@ -1219,7 +1221,7 @@
	"arquivos fontes da documentação."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:659
	+#: article.translate.xml:660
	msgid ""
	"FreeBSD documentation is written and/or translated to various languages, "
	"each in a separate directory in the <filename>head/</filename> branch."
	@@ -1228,7 +1230,7 @@
	"um em um diretório separado no branch <filename>head/</filename>."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:664
	+#: article.translate.xml:665
	msgid ""
	"Each translation set contains several subdirectories for the various parts "
	"of the FreeBSD Documentation Project. A few noteworthy directories are:"
	@@ -1237,7 +1239,7 @@
	"do Projeto de Documentação do FreeBSD. Alguns diretórios notáveis são:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:670
	+#: article.translate.xml:671
	msgid ""
	"<emphasis>/articles/</emphasis> contains the source code for articles "
	"written by various FreeBSD contributors."
	@@ -1246,7 +1248,7 @@
	"por vários colaboradores do FreeBSD."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:676
	+#: article.translate.xml:677
	msgid ""
	"<emphasis>/books/</emphasis> contains the source code for the different "
	"books, such as the FreeBSD Handbook."
	@@ -1255,7 +1257,7 @@
	"livros, como o Handbook do FreeBSD."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:682
	+#: article.translate.xml:683
	msgid ""
	"<emphasis>/htdocs/</emphasis> contains the source code for the FreeBSD "
	"website."
	@@ -1263,12 +1265,12 @@
	"<emphasis>/htdocs/</emphasis> contém o código-fonte do website do FreeBSD."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:689
	+#: article.translate.xml:690
	msgid "FreeBSD Ports Tree Branches and Layout"
	msgstr "Branches e Layout da Árvore de Ports do FreeBSD"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:691
	+#: article.translate.xml:692
	msgid ""
	"In <literal>svn+ssh://repo.freebsd.org/ports</literal>, <emphasis>ports</"
	"emphasis> refers to the repository root of the ports tree."
	@@ -1277,7 +1279,7 @@
	"emphasis> refere-se à raiz do repositório da árvore de ports."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:695
	+#: article.translate.xml:696
	msgid ""
	"In general, most FreeBSD port work will be done within the <filename>head/</"
	"filename> branch of the ports tree which is the actual ports tree used to "
	@@ -1289,7 +1291,7 @@
	"importantes são:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:702
	+#: article.translate.xml:703
	msgid ""
	"<emphasis>/branches/RELENG_<replaceable>n_n_n</replaceable></emphasis> which "
	"corresponds to <literal>RELENG_<replaceable>n_n_n</replaceable></literal> is "
	@@ -1300,7 +1302,7 @@
	"usado para mesclar atualizações de segurança em preparação para uma release."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:710
	+#: article.translate.xml:711
	msgid ""
	"<emphasis>/tags/RELEASE_<replaceable>n_n_n</replaceable></emphasis> which "
	"corresponds to <literal>RELEASE_<replaceable>n_n_n</replaceable></literal> "
	@@ -1311,7 +1313,7 @@
	"representa uma tag de release da árvore de ports."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:717
	+#: article.translate.xml:718
	msgid ""
	"<emphasis>/tags/RELEASE_<replaceable>n</replaceable>_EOL</emphasis> "
	"represents the end of life tag of a specific FreeBSD branch."
	@@ -1320,12 +1322,12 @@
	"representa o tag de end of life de um branch específico do FreeBSD."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:726
	+#: article.translate.xml:727
	msgid "Daily Use"
	msgstr "Uso diário"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:728
	+#: article.translate.xml:729
	msgid ""
	"This section will explain how to perform common day-to-day operations with "
	"Subversion."
	@@ -1334,12 +1336,12 @@
	"Subversion."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:732
	+#: article.translate.xml:733
	msgid "Help"
	msgstr "Ajuda"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:734
	+#: article.translate.xml:735
	msgid ""
	"<acronym>SVN</acronym> has built in help documentation. It can be accessed "
	"by typing:"
	@@ -1348,13 +1350,13 @@
	"pode ser acessada digitando:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:737
	+#: article.translate.xml:738
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn help</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn help</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:739
	+#: article.translate.xml:740
	msgid ""
	"Additional information can be found in the <link xlink:href=\"http://svnbook."
	"red-bean.com/\">Subversion Book</link>."
	@@ -1363,19 +1365,19 @@
	"svnbook.red-bean.com/\">Subversion Book</link>."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:745
	+#: article.translate.xml:746
	msgid "Checkout"
	msgstr "Checkout"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:747
	+#: article.translate.xml:748
	msgid "As seen earlier, to check out the FreeBSD head branch:"
	msgstr ""
	"Como visto anteriormente, para fazer o checkout da branch principal (head) "
	"do FreeBSD:"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:752
	+#: article.translate.xml:753
	msgid ""
	"At some point, more than just <literal>HEAD</literal> will probably be "
	"useful, for instance when merging changes to stable/7. Therefore, it may be "
	@@ -1388,18 +1390,18 @@
	"completa (um check-out completo seria muito doloroso)."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:758
	+#: article.translate.xml:759
	msgid "To do this, first check out the root of the repository:"
	msgstr "Para fazer isso, primeiro confira a raiz do repositório:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:761
	+#: article.translate.xml:762
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn checkout --depth=immediates svn+ssh://repo.freebsd.org/base</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn checkout --depth=immediates svn+ssh://repo.freebsd.org/base</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:763
	+#: article.translate.xml:764
	msgid ""
	"This will give <literal>base</literal> with all the files it contains (at "
	"the time of writing, just <filename>ROADMAP.txt</filename>) and empty "
	@@ -1412,7 +1414,7 @@
	"literal>, <literal>vendor</literal> e assim por diante."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:769
	+#: article.translate.xml:770
	msgid ""
	"Expanding the working copy is possible. Just change the depth of the various "
	"subdirectories:"
	@@ -1421,7 +1423,7 @@
	"vários subdiretórios:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:772
	+#: article.translate.xml:773
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn up --set-depth=infinity base/head</userinput>\n"
	@@ -1431,7 +1433,7 @@
	"<prompt>%</prompt> <userinput>svn up --set-depth=immediates base/release base/releng base/stable</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:775
	+#: article.translate.xml:776
	msgid ""
	"The above command will pull down a full copy of <literal>head</literal>, "
	"plus empty copies of every <literal>release</literal> tag, every "
	@@ -1443,7 +1445,7 @@
	"literal>."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:781
	+#: article.translate.xml:782
	msgid ""
	"If at a later date merging to <literal>7-STABLE</literal> is required, "
	"expand the working copy:"
	@@ -1452,13 +1454,13 @@
	"com a <literal>7-STABLE</literal>, expanda a cópia de trabalho:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:785
	+#: article.translate.xml:786
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn up --set-depth=infinity base/stable/7</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn up --set-depth=infinity base/stable/7</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:787
	+#: article.translate.xml:788
	msgid ""
	"Subtrees do not have to be expanded completely. For instance, expanding only "
	"<literal>stable/7/sys</literal> and then later expand the rest of "
	@@ -1469,7 +1471,7 @@
	"do <literal>stable/7</literal>:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:792
	+#: article.translate.xml:793
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn up --set-depth=infinity base/stable/7/sys</userinput>\n"
	@@ -1479,7 +1481,7 @@
	"<prompt>%</prompt> <userinput>svn up --set-depth=infinity base/stable/7</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:795
	+#: article.translate.xml:796
	msgid ""
	"Updating the tree with <command>svn update</command> will only update what "
	"was previously asked for (in this case, <literal>head</literal> and "
	@@ -1490,12 +1492,12 @@
	"<literal>stable/7</literal>), ele não irá puxar a árvore inteira."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:803
	+#: article.translate.xml:804
	msgid "Anonymous Checkout"
	msgstr "Checkout Anonimo"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:805
	+#: article.translate.xml:806
	msgid ""
	"It is possible to anonymously check out the FreeBSD repository with "
	"Subversion. This will give access to a read-only tree that can be updated, "
	@@ -1507,13 +1509,13 @@
	"um commit. Para fazer isso, use:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:810
	+#: article.translate.xml:811
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn co https://svn.FreeBSD.org/base/head /usr/src</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn co https://svn.FreeBSD.org/base/head /usr/src</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:812
	+#: article.translate.xml:813
	msgid ""
	"More details on using Subversion this way can be found in <link xlink:href="
	"\"@@URL_RELPREFIX@@/doc/en_US.ISO8859-1/books/handbook/svn.html\">Using "
	@@ -1524,12 +1526,12 @@
	"\">Usando o Subversion</link>."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:818
	+#: article.translate.xml:819
	msgid "Updating the Tree"
	msgstr "Atualizando a Árvore"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:820
	+#: article.translate.xml:821
	msgid ""
	"To update a working copy to either the latest revision, or a specific "
	"revision:"
	@@ -1538,7 +1540,7 @@
	"revisão específica:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:823
	+#: article.translate.xml:824
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn update</userinput>\n"
	@@ -1548,40 +1550,40 @@
	"<prompt>%</prompt> <userinput>svn update -<replaceable>r12345</replaceable></userinput>"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:828
	+#: article.translate.xml:829
	msgid "Status"
	msgstr "Status"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:830
	+#: article.translate.xml:831
	msgid "To view the local changes that have been made to the working copy:"
	msgstr "Para ver as alterações locais que foram feitas na cópia de trabalho:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:833
	+#: article.translate.xml:834
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn status</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn status</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:835
	+#: article.translate.xml:836
	msgid "To show local changes and files that are out-of-date do:"
	msgstr ""
	"Para mostrar alterações locais e arquivos que estão desatualizados, execute:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:838
	+#: article.translate.xml:839
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn status --show-updates</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn status --show-updates</userinput>"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:842
	+#: article.translate.xml:843
	msgid "Editing and Committing"
	msgstr "Editando e efetuando o commit"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:844
	+#: article.translate.xml:845
	msgid ""
	"<acronym>SVN</acronym> does not need to be told in advance about file "
	"editing."
	@@ -1590,20 +1592,20 @@
	"edição de arquivos."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:847
	+#: article.translate.xml:848
	msgid "To commit all changes in the current directory and all subdirectories:"
	msgstr ""
	"Para efetuar o commit de todas as alterações no diretório atual e em todos "
	"os seus subdiretórios:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:850
	+#: article.translate.xml:851
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn commit</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn commit</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:852
	+#: article.translate.xml:853
	msgid ""
	"To commit all changes in, for example, <filename><replaceable>lib/libfetch/</"
	"replaceable></filename> and <filename><replaceable>usr/bin/fetch/</"
	@@ -1615,13 +1617,13 @@
	"operação, execute:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:858
	+#: article.translate.xml:859
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn commit <replaceable>lib/libfetch</replaceable> <replaceable>usr/bin/fetch</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn commit <replaceable>lib/libfetch</replaceable> <replaceable>usr/bin/fetch</replaceable></userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:860
	+#: article.translate.xml:861
	msgid ""
	"There is also a commit wrapper for the ports tree to handle the properties "
	"and sanity checking the changes:"
	@@ -1630,18 +1632,18 @@
	"propriedades e para verificar a sanidade das mudanças:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:864
	+#: article.translate.xml:865
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>/usr/ports/Tools/scripts/psvn commit</userinput>"
	msgstr "<prompt>%</prompt> <userinput>/usr/ports/Tools/scripts/psvn commit</userinput>"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:868
	+#: article.translate.xml:869
	msgid "Adding and Removing Files"
	msgstr "Adicionando e Removendo Arquivos"

	#. (itstool) path: note/para
	-#: article.translate.xml:871
	+#: article.translate.xml:872
	msgid ""
	"Before adding files, get a copy of <link xlink:href=\"https://people.FreeBSD."
	"org/~peter/auto-props.txt\">auto-props.txt</link> (there is also a <link "
	@@ -1665,7 +1667,7 @@
	"primeira vez, até mesmo algo tão simples quanto <command>svn help</command>."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:883
	+#: article.translate.xml:884
	msgid ""
	"Files are added to a <acronym>SVN</acronym> repository with <command>svn "
	"add</command>. To add a file named <emphasis>foo</emphasis>, edit it, then:"
	@@ -1675,13 +1677,13 @@
	"emphasis>, edite-o e depois execute:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:888
	+#: article.translate.xml:889
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn add <replaceable>foo</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn add <replaceable>foo</replaceable></userinput>"

	#. (itstool) path: note/para
	-#: article.translate.xml:891
	+#: article.translate.xml:892
	msgid ""
	"Most new source files should include a <literal>$FreeBSD$</literal> string "
	"near the start of the file. On commit, <command>svn</command> will expand "
	@@ -1698,18 +1700,18 @@
	"modificados podem ser enviados sem a string <literal>$FreeBSD$</literal>."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:901
	+#: article.translate.xml:902
	msgid "Files can be removed with <command>svn remove</command>:"
	msgstr "Os arquivos podem ser removidos com <command>svn remove</command>:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:904
	+#: article.translate.xml:905
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn remove <replaceable>foo</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn remove <replaceable>foo</replaceable></userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:906
	+#: article.translate.xml:907
	msgid ""
	"Subversion does not require deleting the file before using <command>svn rm</"
	"command>, and indeed complains if that happens."
	@@ -1718,12 +1720,12 @@
	"<command>svn rm</command> e, de fato, ele reclama se isso acontecer."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:910
	+#: article.translate.xml:911
	msgid "It is possible to add directories with <command>svn add</command>:"
	msgstr "É possível adicionar diretórios com <command>svn add</command>:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:913
	+#: article.translate.xml:914
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>mkdir <replaceable>bar</replaceable></userinput>\n"
	@@ -1733,7 +1735,7 @@
	"<prompt>%</prompt> <userinput>svn add <replaceable>bar</replaceable></userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:916
	+#: article.translate.xml:917
	msgid ""
	"Although <command>svn mkdir</command> makes this easier by combining the "
	"creation of the directory and the adding of it:"
	@@ -1742,13 +1744,13 @@
	"a criação do diretório e a adição dele:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:920
	+#: article.translate.xml:921
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn mkdir <replaceable>bar</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn mkdir <replaceable>bar</replaceable></userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:922
	+#: article.translate.xml:923
	msgid ""
	"Like files, directories are removed with <command>svn rm</command>. There is "
	"no separate command specifically for removing directories."
	@@ -1757,18 +1759,18 @@
	"Não existe um comando separado especificamente para remover diretórios."

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:926
	+#: article.translate.xml:927
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn rm <replaceable>bar</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn rm <replaceable>bar</replaceable></userinput>"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:930
	+#: article.translate.xml:931
	msgid "Copying and Moving Files"
	msgstr "Copiando e Movendo Arquivos"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:932
	+#: article.translate.xml:933
	msgid ""
	"This command creates a copy of <filename>foo.c</filename> named "
	"<filename>bar.c</filename>, with the new file also under version control and "
	@@ -1779,13 +1781,13 @@
	"e com o histórico completo de <filename>foo.c</filename>:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:937
	+#: article.translate.xml:938
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:939
	+#: article.translate.xml:940
	msgid ""
	"This is usually preferred to copying the file with <command>cp</command> and "
	"adding it to the repository with <command>svn add</command> because this way "
	@@ -1797,23 +1799,23 @@
	"história do original."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:944
	+#: article.translate.xml:945
	msgid "To move and rename a file:"
	msgstr "Para mover e renomear um arquivo:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:946
	+#: article.translate.xml:947
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn move <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn move <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:950
	+#: article.translate.xml:951
	msgid "Log and Annotate"
	msgstr "Logs e Anotações"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:952
	+#: article.translate.xml:953
	msgid ""
	"<command>svn log</command> shows revisions and commit messages, most recent "
	"first, for files or directories. When used on a directory, all revisions "
	@@ -1825,7 +1827,7 @@
	"diretório são mostradas."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:957
	+#: article.translate.xml:958
	msgid ""
	"<command>svn annotate</command>, or equally <command>svn praise</command> or "
	"<command>svn blame</command>, shows the most recent revision number and who "
	@@ -1836,12 +1838,12 @@
	"recente e quem fez o commit dessa revisão para cada linha de um arquivo."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:964
	+#: article.translate.xml:965
	msgid "Diffs"
	msgstr "Diffs"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:966
	+#: article.translate.xml:967
	msgid ""
	"<command>svn diff</command> displays changes to the working copy. Diffs "
	"generated by <acronym>SVN</acronym> are unified and include new files by "
	@@ -1852,7 +1854,7 @@
	"por padrão na saída do diff."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:971
	+#: article.translate.xml:972
	msgid ""
	"<command>svn diff</command> can show the changes between two revisions of "
	"the same file:"
	@@ -1861,13 +1863,13 @@
	"do mesmo arquivo:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:974
	+#: article.translate.xml:975
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn diff -r179453:179454 ROADMAP.txt</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn diff -r179453:179454 ROADMAP.txt</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:976
	+#: article.translate.xml:977
	msgid ""
	"It can also show all changes for a specific changeset. This command shows "
	"what changes were made to the current directory and all subdirectories in "
	@@ -1878,18 +1880,18 @@
	"todos os subdiretórios do changeset 179454:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:981
	+#: article.translate.xml:982
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn diff -c179454 .</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn diff -c179454 .</userinput>"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:985
	+#: article.translate.xml:986
	msgid "Reverting"
	msgstr "Revertendo"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:987
	+#: article.translate.xml:988
	msgid ""
	"Local changes (including additions and deletions) can be reverted using "
	"<command>svn revert</command>. It does not update out-of-date files, but "
	@@ -1900,12 +1902,12 @@
	"apenas os substitui por cópias originais da versão original."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:994
	+#: article.translate.xml:995
	msgid "Conflicts"
	msgstr "Conflitos"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:996
	+#: article.translate.xml:997
	msgid ""
	"If an <command>svn update</command> resulted in a merge conflict, Subversion "
	"will remember which files have conflicts and refuse to commit any changes to "
	@@ -1919,24 +1921,24 @@
	"não obsoleto, é:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1002
	+#: article.translate.xml:1003
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn resolved <replaceable>foo</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn resolved <replaceable>foo</replaceable></userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1004
	+#: article.translate.xml:1005
	msgid "However, the preferred procedure is:"
	msgstr "No entanto, o procedimento preferido é:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1006
	+#: article.translate.xml:1007
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn resolve --accept=working <replaceable>foo</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn resolve --accept=working <replaceable>foo</replaceable></userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1008
	+#: article.translate.xml:1009
	msgid ""
	"The two examples are equivalent. Possible values for <literal>--accept</"
	"literal> are:"
	@@ -1945,7 +1947,7 @@
	"accept</literal> são:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1013
	+#: article.translate.xml:1014
	msgid ""
	"<literal>working</literal>: use the version in your working directory (which "
	"one presumes has been edited to resolve the conflicts)."
	@@ -1954,7 +1956,7 @@
	"qual se presume que foi editada para resolver os conflitos)."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1019
	+#: article.translate.xml:1020
	msgid ""
	"<literal>base</literal>: use a pristine copy of the version you had before "
	"<command>svn update</command>, discarding your own changes, the conflicting "
	@@ -1966,7 +1968,7 @@
	"intervenientes também."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1026
	+#: article.translate.xml:1027
	msgid ""
	"<literal>mine-full</literal>: use what you had before <command>svn update</"
	"command>, including your own changes, but discarding the conflicting "
	@@ -1977,7 +1979,7 @@
	"mudanças conflitantes, e possivelmente outras mudanças intervenientes também."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1033
	+#: article.translate.xml:1034
	msgid ""
	"<literal>theirs-full</literal>: use the version that was retrieved when you "
	"did <command>svn update</command>, discarding your own changes."
	@@ -1986,17 +1988,17 @@
	"fez o <command>svn update</command>, descartando as suas próprias mudanças."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:1043
	+#: article.translate.xml:1044
	msgid "Advanced Use"
	msgstr "Uso Avançado"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:1046
	+#: article.translate.xml:1047
	msgid "Sparse Checkouts"
	msgstr "Checkouts dispersos"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1048
	+#: article.translate.xml:1049
	msgid ""
	"<acronym>SVN</acronym> allows <emphasis>sparse</emphasis>, or partial "
	"checkouts of a directory by adding <option>--depth</option> to a "
	@@ -2007,24 +2009,24 @@
	"<command>svn checkout</command>."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1053
	+#: article.translate.xml:1054
	msgid "Valid arguments to <option>--depth</option> are:"
	msgstr "Os argumentos válidos para <option>--depth</option> são:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1058
	+#: article.translate.xml:1059
	msgid ""
	"<literal>empty</literal>: the directory itself without any of its contents."
	msgstr "<literal>empty</literal>: o próprio diretório sem qualquer conteúdo."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1063
	+#: article.translate.xml:1064
	msgid "<literal>files</literal>: the directory and any files it contains."
	msgstr ""
	"<literal>files</literal>: o diretório e quaisquer arquivos nele contidos."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1068
	+#: article.translate.xml:1069
	msgid ""
	"<literal>immediates</literal>: the directory and any files and directories "
	"it contains, but none of the subdirectories' contents."
	@@ -2033,12 +2035,12 @@
	"contidos nele, mas nenhum dos conteúdos dos subdiretórios."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1074
	+#: article.translate.xml:1075
	msgid "<literal>infinity</literal>: anything."
	msgstr "<literal>infinity</literal>: qualquer coisa."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1078
	+#: article.translate.xml:1079
	msgid ""
	"The <literal>--depth</literal> option applies to many other commands, "
	"including <command>svn commit</command>, <command>svn revert</command>, and "
	@@ -2049,7 +2051,7 @@
	"<command>svn diff</command>."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1083
	+#: article.translate.xml:1084
	msgid ""
	"Since <literal>--depth</literal> is sticky, there is a <literal>--set-depth</"
	"literal> option for <command>svn update</command> that will change the "
	@@ -2062,7 +2064,7 @@
	"trabalho produzida pelo exemplo anterior:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1089
	+#: article.translate.xml:1090
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd <replaceable>~/freebsd</replaceable></userinput>\n"
	@@ -2072,7 +2074,7 @@
	"<prompt>%</prompt> <userinput>svn update --set-depth=immediates .</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1092
	+#: article.translate.xml:1093
	msgid ""
	"The above command will populate the working copy in <replaceable>~/freebsd</"
	"replaceable> with <filename>ROADMAP.txt</filename> and empty subdirectories, "
	@@ -2089,18 +2091,18 @@
	"totalmente:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1101
	+#: article.translate.xml:1102
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn update --set-depth=infinity <replaceable>head</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn update --set-depth=infinity <replaceable>head</replaceable></userinput>"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:1105
	+#: article.translate.xml:1106
	msgid "Direct Operation"
	msgstr "Operação Direta"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1107
	+#: article.translate.xml:1108
	msgid ""
	"Certain operations can be performed directly on the repository without "
	"touching the working copy. Specifically, this applies to any operation that "
	@@ -2111,24 +2113,24 @@
	"que não exija a edição de um arquivo, incluindo:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1114
	+#: article.translate.xml:1115
	msgid "<literal>log</literal>, <literal>diff</literal>"
	msgstr "<literal>log</literal>, <literal>diff</literal>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1119
	+#: article.translate.xml:1120
	msgid "<literal>mkdir</literal>"
	msgstr "<literal>mkdir</literal>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1123
	+#: article.translate.xml:1124
	msgid ""
	"<literal>remove</literal>, <literal>copy</literal>, <literal>rename</literal>"
	msgstr ""
	"<literal>remove</literal>, <literal>copy</literal>, <literal>rename</literal>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1128
	+#: article.translate.xml:1129
	msgid ""
	"<literal>propset</literal>, <literal>propedit</literal>, <literal>propdel</"
	"literal>"
	@@ -2137,12 +2139,12 @@
	"literal>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1134
	+#: article.translate.xml:1135
	msgid "<literal>merge</literal>"
	msgstr "<literal>merge</literal>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1138
	+#: article.translate.xml:1139
	msgid ""
	"Branching is very fast. This command would be used to branch "
	"<literal>RELENG_8</literal>:"
	@@ -2151,13 +2153,13 @@
	"a branch <literal>RELENG_8</literal>:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1141
	+#: article.translate.xml:1142
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/stable/8</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/stable/8</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1143
	+#: article.translate.xml:1144
	msgid ""
	"This is equivalent to these commands which take minutes and hours as opposed "
	"to seconds, depending on your network connection:"
	@@ -2166,7 +2168,7 @@
	"segundos, dependendo da sua conexão de rede:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1147
	+#: article.translate.xml:1148
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn checkout --depth=immediates svn+ssh://repo.freebsd.org/base</userinput>\n"
	@@ -2182,12 +2184,12 @@
	"<prompt>%</prompt> <userinput>svn commit stable/8</userinput>"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:1155
	+#: article.translate.xml:1156
	msgid "Merging with <acronym>SVN</acronym>"
	msgstr "Mesclando com <acronym>SVN</acronym>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1157
	+#: article.translate.xml:1158
	msgid ""
	"This section deals with merging code from one branch to another (typically, "
	"from head to a stable branch)."
	@@ -2196,7 +2198,7 @@
	"do head para um brach stable)."

	#. (itstool) path: note/para
	-#: article.translate.xml:1161
	+#: article.translate.xml:1162
	msgid ""
	"In all examples below, <literal>$FSVN</literal> refers to the location of "
	"the FreeBSD Subversion repository, <literal>svn+ssh://repo.freebsd.org/base/"
	@@ -2207,12 +2209,12 @@
	"freebsd.org/base </literal>."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1167
	+#: article.translate.xml:1168
	msgid "About Merge Tracking"
	msgstr "Sobre o acompanhamento de mesclagem"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1169
	+#: article.translate.xml:1170
	msgid ""
	"From the user's perspective, merge tracking information (or mergeinfo) is "
	"stored in a property called <literal>svn:mergeinfo</literal>, which is a "
	@@ -2231,7 +2233,7 @@
	"exceto aqueles que possuem o seu próprio <literal>svn:mergeinfo</literal>."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1179
	+#: article.translate.xml:1180
	msgid ""
	"It is <emphasis>not</emphasis> inherited. For instance, <filename>stable/6/"
	"contrib/openpam/</filename> does not implicitly inherit mergeinfo from "
	@@ -2249,7 +2251,7 @@
	"aplicam:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1192
	+#: article.translate.xml:1193
	msgid ""
	"If <filename>branch/foo/bar/</filename> does not already have a mergeinfo "
	"record, but a direct ancestor (for instance, <filename>branch/foo/</"
	@@ -2264,7 +2266,7 @@
	"mesclagem atual sejam registradas."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1204
	+#: article.translate.xml:1205
	msgid ""
	"Information about the current merge will <emphasis>not</emphasis> be "
	"propagated back up that ancestor."
	@@ -2273,7 +2275,7 @@
	"propagadas para o ancestral."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1210
	+#: article.translate.xml:1211
	msgid ""
	"If a direct descendant of <filename>branch/foo/bar/</filename> (for "
	"instance, <filename>branch/foo/bar/baz/</filename>) already has a mergeinfo "
	@@ -2284,7 +2286,7 @@
	"mergeinfo, as informações sobre a mesclagem atual serão propagadas para ele."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1218
	+#: article.translate.xml:1219
	msgid ""
	"If you consider the case where a revision changes several separate parts of "
	"the tree (for example, <filename>branch/foo/bar/</filename> and "
	@@ -2303,12 +2305,12 @@
	"quando na verdade não foi."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1231
	+#: article.translate.xml:1232
	msgid "Selecting the Source and Target Branch When Merging"
	msgstr "Selecionando a branch de origem e de destino ao mesclar"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1234
	+#: article.translate.xml:1235
	msgid ""
	"Merging to <literal>stable/</literal> branches should originate from "
	"<literal>head/</literal>. For example:"
	@@ -2317,7 +2319,7 @@
	"<literal>head/</literal>. Por exemplo:"

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1238
	+#: article.translate.xml:1239
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> svn merge -c <replaceable>r123456</replaceable> ^/head/ stable/<replaceable>11</replaceable>\n"
	@@ -2327,7 +2329,7 @@
	"<prompt>%</prompt> svn commit stable/<replaceable>11</replaceable>"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1241
	+#: article.translate.xml:1242
	msgid ""
	"Merges to <literal>releng/</literal> branches should always originate from "
	"the corresponding <literal>stable/</literal> branch. For example:"
	@@ -2336,7 +2338,7 @@
	"originar da branch <literal>stable/</literal> correspondente. Por exemplo:"

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1245
	+#: article.translate.xml:1246
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>11</replaceable> releng/<replaceable>11.0</replaceable>\n"
	@@ -2346,7 +2348,7 @@
	"<prompt>%</prompt> svn commit releng/<replaceable>11.0</replaceable>"

	#. (itstool) path: note/para
	-#: article.translate.xml:1249
	+#: article.translate.xml:1250
	msgid ""
	"Committers are only permitted to commit to the <literal>releng/</literal> "
	"branches during a release cycle after receiving approval from the Release "
	@@ -2360,7 +2362,7 @@
	"ou Aviso de Errata."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1257
	+#: article.translate.xml:1258
	msgid ""
	"All merges are merged to and committed from the root of the branch. All "
	"merges look like:"
	@@ -2369,7 +2371,7 @@
	"branch. Todas as mesclagens se parecem com:"

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1261
	+#: article.translate.xml:1262
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> svn merge -c <replaceable>r123456</replaceable> ^/head/ <replaceable>checkout</replaceable>\n"
	@@ -2379,7 +2381,7 @@
	"<prompt>%</prompt> svn commit <replaceable>checkout</replaceable>"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1264
	+#: article.translate.xml:1265
	msgid ""
	"Note that <replaceable>checkout</replaceable> must be a complete checkout of "
	"the branch to which the merge occurs."
	@@ -2388,18 +2390,18 @@
	"completa da branch na qual a mesclagem ocorre."

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1268
	+#: article.translate.xml:1269
	#, no-wrap
	msgid "<prompt>%</prompt> svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>10</replaceable> releng/<replaceable>10.0</replaceable>"
	msgstr "<prompt>%</prompt> svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>10</replaceable> releng/<replaceable>10.0</replaceable>"

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1272
	+#: article.translate.xml:1273
	msgid "Preparing the Merge Target"
	msgstr "Preparando o Alvo de Mesclagem (Merge Target)"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1274
	+#: article.translate.xml:1275
	msgid ""
	"Because of the mergeinfo propagation issues described earlier, it is very "
	"important to never merge changes into a sparse working copy. Always use a "
	@@ -2412,7 +2414,7 @@
	"Por exemplo, ao mesclar de HEAD para 7, use um checkout completo de stable/7:"

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1281
	+#: article.translate.xml:1282
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd stable/7</userinput>\n"
	@@ -2422,7 +2424,7 @@
	"<prompt>%</prompt> <userinput>svn up --set-depth=infinity</userinput>"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1284
	+#: article.translate.xml:1285
	msgid ""
	"The target directory must also be up-to-date and must not contain any "
	"uncommitted changes or stray files."
	@@ -2431,12 +2433,12 @@
	"alterações que ainda não foram enviadas por commit ou arquivos perdidos."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1289
	+#: article.translate.xml:1290
	msgid "Identifying Revisions"
	msgstr "Identificando Revisões"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1291
	+#: article.translate.xml:1292
	msgid ""
	"Identifying revisions to be merged is a must. If the target already has "
	"complete mergeinfo, ask <acronym>SVN</acronym> for a list:"
	@@ -2445,7 +2447,7 @@
	"mergeinfo completo, solicite uma lista para o <acronym>SVN</acronym>:"

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1295
	+#: article.translate.xml:1296
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd stable/6/contrib/openpam</userinput>\n"
	@@ -2455,7 +2457,7 @@
	"<prompt>%</prompt> <userinput>svn mergeinfo --show-revs=eligible $FSVN/head/contrib/openpam</userinput>"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1298
	+#: article.translate.xml:1299
	msgid ""
	"If the target does not have complete mergeinfo, check the log for the merge "
	"source."
	@@ -2464,47 +2466,47 @@
	"mesclagem."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1303
	+#: article.translate.xml:1304
	msgid "Merging"
	msgstr "Mesclando"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1305
	+#: article.translate.xml:1306
	msgid "Now, let us start merging!"
	msgstr "Agora vamos começar a mesclar!"

	#. (itstool) path: sect5/title
	-#: article.translate.xml:1308
	+#: article.translate.xml:1309
	msgid "The Principles"
	msgstr "Os princípios"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1310
	+#: article.translate.xml:1311
	msgid "For example, To merge:"
	msgstr "Por exemplo, para mesclar:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1314
	+#: article.translate.xml:1315
	msgid "revision <literal>$R</literal>"
	msgstr "revisão <literal>$R</literal>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1318
	+#: article.translate.xml:1319
	msgid "in directory $target in stable branch $B"
	msgstr "no diretório $target na branch stable $B"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1323
	+#: article.translate.xml:1324
	msgid "from directory $source in head"
	msgstr "a partir do diretório $source no head"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1327
	+#: article.translate.xml:1328
	msgid "$FSVN is <literal>svn+ssh://repo.freebsd.org/base</literal>"
	msgstr "$FSVN é o <literal>svn+ssh://repo.freebsd.org/base</literal>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1332
	+#: article.translate.xml:1333
	msgid ""
	"Assuming that revisions $P and $Q have already been merged, and that the "
	"current directory is an up-to-date working copy of stable/$B, the existing "
	@@ -2515,7 +2517,7 @@
	"existente será semelhante a:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1337
	+#: article.translate.xml:1338
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn propget svn:mergeinfo -R $target</userinput>\n"
	@@ -2525,30 +2527,30 @@
	"$target - /head/$source:$P,$Q"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1340
	+#: article.translate.xml:1341
	msgid "Merging is done like so:"
	msgstr "A mesclagem é feita assim:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1342
	+#: article.translate.xml:1343
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn merge -c$R $FSVN/head/$source $target</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn merge -c$R $FSVN/head/$source $target</userinput>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1344
	+#: article.translate.xml:1345
	msgid ""
	"Checking the results of this is possible with <command>svn diff</command>."
	msgstr ""
	"É possível verificar os resultados disso com um <command>svn diff</command>."

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1347
	+#: article.translate.xml:1348
	msgid "The svn:mergeinfo now looks like:"
	msgstr "O svn:mergeinfo agora se parece com:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1349
	+#: article.translate.xml:1350
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn propget svn:mergeinfo -R $target</userinput>\n"
	@@ -2558,7 +2560,7 @@
	"$target - head/$source:$P,$Q,$R"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1352
	+#: article.translate.xml:1353
	msgid ""
	"If the results are not exactly as shown, assistance may be required before "
	"committing as mistakes may have been made, or there may be something wrong "
	@@ -2570,12 +2572,12 @@
	"haver um bug no Subversion."

	#. (itstool) path: sect5/title
	-#: article.translate.xml:1360
	+#: article.translate.xml:1361
	msgid "Practical Example"
	msgstr "Exemplo Prático"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1362
	+#: article.translate.xml:1363
	msgid ""
	"As a practical example, consider this scenario. The changes to "
	"<filename>netmap.4</filename> in r238987 are to be merged from CURRENT to 9-"
	@@ -2595,18 +2597,18 @@
	"\"/>."

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1372
	+#: article.translate.xml:1373
	msgid "The first step is to inspect the existing mergeinfo."
	msgstr "O primeiro passo é inspecionar o mergeinfo existente."

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1375
	+#: article.translate.xml:1376
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn propget svn:mergeinfo -R stable/9/share/man/man4</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn propget svn:mergeinfo -R stable/9/share/man/man4</userinput>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1377
	+#: article.translate.xml:1378
	msgid ""
	"Take a quick note of how it looks before moving on to the next step; doing "
	"the actual merge:"
	@@ -2615,7 +2617,7 @@
	"passo; fazendo a mesclagem real:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1380
	+#: article.translate.xml:1381
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn merge -c r238987 svn+ssh://repo.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4</userinput>\n"
	@@ -2633,7 +2635,7 @@
	" U stable/9/share/man/man4"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1387
	+#: article.translate.xml:1388
	msgid ""
	"Check that the revision number of the merged revision has been added. Once "
	"this is verified, the only thing left is the actual commit."
	@@ -2642,23 +2644,23 @@
	"isso for verificado, a única coisa que resta é o commit em si."

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1391
	+#: article.translate.xml:1392
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn commit stable/9/share/man/man4</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn commit stable/9/share/man/man4</userinput>"

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1396
	+#: article.translate.xml:1397
	msgid "Precautions Before Committing"
	msgstr "Precauções antes de efetuar o commit"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1398
	+#: article.translate.xml:1399
	msgid "As always, build world (or appropriate parts of it)."
	msgstr "Como sempre, faça um build world (ou as partes apropriadas dele)."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1401
	+#: article.translate.xml:1402
	msgid ""
	"Check the changes with <command>svn diff</command> and <command>svn stat</"
	"command>. Make sure all the files that should have been added or deleted "
	@@ -2669,7 +2671,7 @@
	"adicionados ou excluídos foram de fato adicionados ou excluídos."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1406
	+#: article.translate.xml:1407
	msgid ""
	"Take a closer look at any property change (marked by a <literal>M</literal> "
	"in the second column of <command>svn stat</command>). Normally, no svn:"
	@@ -2682,17 +2684,17 @@
	"exceto o diretório (ou diretórios) de destino."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1412
	+#: article.translate.xml:1413
	msgid "If something looks fishy, ask for help."
	msgstr "Se algo parecer suspeito, peça ajuda."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1416
	+#: article.translate.xml:1417
	msgid "Committing"
	msgstr "Fazendo o commit"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1418
	+#: article.translate.xml:1419
	msgid ""
	"Make sure to commit a top level directory to have the mergeinfo included as "
	"well. Do not specify individual files on the command line. For more "
	@@ -2705,25 +2707,25 @@
	"seção relevante deste manual."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:1427
	+#: article.translate.xml:1428
	msgid "Vendor Imports with <acronym>SVN</acronym>"
	msgstr "Importações de fornecedores com <acronym>SVN</acronym>"

	#. (itstool) path: important/para
	-#: article.translate.xml:1430
	+#: article.translate.xml:1431
	msgid "Please read this entire section before starting a vendor import."
	msgstr ""
	"Por favor, leia toda esta seção antes de iniciar uma importação de "
	"fornecedores."

	#. (itstool) path: note/para
	-#: article.translate.xml:1435
	+#: article.translate.xml:1436
	msgid "Patches to vendor code fall into two categories:"
	msgstr ""
	"Os patches para o código do fornecedor se enquadram em duas categorias:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1440
	+#: article.translate.xml:1441
	msgid ""
	"Vendor patches: these are patches that have been issued by the vendor, or "
	"that have been extracted from the vendor's version control system, which "
	@@ -2734,7 +2736,7 @@
	"problemas que não podem esperar até a próxima versão do fornecedor."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1448
	+#: article.translate.xml:1449
	msgid ""
	"FreeBSD patches: these are patches that modify the vendor code to address "
	"FreeBSD-specific issues."
	@@ -2743,13 +2745,13 @@
	"resolver problemas específicos do FreeBSD."

	#. (itstool) path: note/para
	-#: article.translate.xml:1453
	+#: article.translate.xml:1454
	msgid "The nature of a patch dictates where it should be committed:"
	msgstr ""
	"A natureza de um patch determina para onde ele deve ser enviado por commit:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1458
	+#: article.translate.xml:1459
	msgid ""
	"Vendor patches must be committed to the vendor branch, and merged from there "
	"to head. If the patch addresses an issue in a new release that is currently "
	@@ -2767,17 +2769,17 @@
	"depois de confirmar o patch."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:1469
	+#: article.translate.xml:1470
	msgid "FreeBSD patches are committed directly to head."
	msgstr "Patches do FreeBSD são enviados diretamente para o head."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1476
	+#: article.translate.xml:1477
	msgid "Preparing the Tree"
	msgstr "Preparando a Árvore"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1478
	+#: article.translate.xml:1479
	msgid ""
	"If importing for the first time after the switch to Subversion, flattening "
	"and cleaning up the vendor tree is necessary, as well as bootstrapping the "
	@@ -2788,12 +2790,12 @@
	"histórico de mesclagem na árvore principal."

	#. (itstool) path: sect5/title
	-#: article.translate.xml:1484
	+#: article.translate.xml:1485
	msgid "Flattening"
	msgstr "Achatamento"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1486
	+#: article.translate.xml:1487
	msgid ""
	"During the conversion from <acronym>CVS</acronym> to Subversion, vendor "
	"branches were imported with the same layout as the main tree. This means "
	@@ -2809,12 +2811,12 @@
	"<filename>vendor/pf/dist</filename>."

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1494
	+#: article.translate.xml:1495
	msgid "To flatten the <literal>pf</literal> tree:"
	msgstr "Para achatar a árvore do <literal>pf</literal>:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1496
	+#: article.translate.xml:1497
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd <replaceable>vendor/pf/dist/contrib/pf</replaceable></userinput>\n"
	@@ -2832,7 +2834,7 @@
	"<prompt>%</prompt> <userinput>svn commit</userinput>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1503
	+#: article.translate.xml:1504
	msgid ""
	"The <literal>propdel</literal> bit is necessary because starting with 1.5, "
	"Subversion will automatically add <literal>svn:mergeinfo</literal> to any "
	@@ -2845,7 +2847,7 @@
	"árvore excluída, eles apenas atrapalham."

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1510
	+#: article.translate.xml:1511
	msgid ""
	"Tags may be flattened as well (3, 4, 3.5 etc.); the procedure is exactly the "
	"same, only changing <literal>dist</literal> to <literal>3.5</literal> or "
	@@ -2858,12 +2860,12 @@
	"commit </command> apenas no final do processo."

	#. (itstool) path: sect5/title
	-#: article.translate.xml:1518
	+#: article.translate.xml:1519
	msgid "Cleaning Up"
	msgstr "Limpando"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1520
	+#: article.translate.xml:1521
	msgid ""
	"The <literal>dist</literal> tree can be cleaned up as necessary. Disabling "
	"keyword expansion is recommended, as it makes no sense on unmodified vendor "
	@@ -2879,7 +2881,7 @@
	"versão original. Para fazer isso:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1528
	+#: article.translate.xml:1529
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn propdel svn:keywords -R .</userinput>\n"
	@@ -2889,12 +2891,12 @@
	"<prompt>%</prompt> <userinput>svn commit</userinput>"

	#. (itstool) path: sect5/title
	-#: article.translate.xml:1533
	+#: article.translate.xml:1534
	msgid "Bootstrapping Merge History"
	msgstr "Bootstrapping o historico de mesclagem"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1535
	+#: article.translate.xml:1536
	msgid ""
	"If importing for the first time after the switch to Subversion, bootstrap "
	"<literal>svn:mergeinfo</literal> on the target directory in the main tree to "
	@@ -2907,7 +2909,7 @@
	"relacionada à árvore do fornecedor, antes de importar novos fontes:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1541
	+#: article.translate.xml:1542
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd <replaceable>head/contrib/pf</replaceable></userinput>\n"
	@@ -2919,12 +2921,12 @@
	"<prompt>%</prompt> <userinput>svn commit</userinput>"

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1548
	+#: article.translate.xml:1549
	msgid "Importing New Sources"
	msgstr "Importando Novas Fontes"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1550
	+#: article.translate.xml:1551
	msgid ""
	"With two commits—one for the import itself and one for the tag—this step can "
	"optionally be repeated for every upstream release between the last import "
	@@ -2935,12 +2937,12 @@
	"última importação e a importação atual."

	#. (itstool) path: sect5/title
	-#: article.translate.xml:1556
	+#: article.translate.xml:1557
	msgid "Preparing the Vendor Sources"
	msgstr "Preparando os fontes do fornecedor"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1558
	+#: article.translate.xml:1559
	msgid ""
	"Subversion is able to store a full distribution in the vendor tree. So, "
	"import everything, but merge only what is required."
	@@ -2949,7 +2951,7 @@
	"fornecedor. Portanto, importe tudo, mas mescle apenas o que é necessário."

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1562
	+#: article.translate.xml:1563
	msgid ""
	"A <command>svn add</command> is required to add any files that were added "
	"since the last vendor import, and <command>svn rm</command> is required to "
	@@ -2965,7 +2967,7 @@
	"facilitar o processo."

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1570
	+#: article.translate.xml:1571
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd <replaceable>vendor/pf/dist</replaceable></userinput>\n"
	@@ -2979,7 +2981,7 @@
	"<prompt>%</prompt> <userinput>find . -type f \| cut -c 3- \| sort >../new</userinput>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1575
	+#: article.translate.xml:1576
	msgid ""
	"With these two files, <command>comm -23 ../old ../new</command> will list "
	"removed files (files only in <filename>old</filename>), while <command>comm "
	@@ -2992,12 +2994,12 @@
	"adicionados somente no <filename>new</filename>."

	#. (itstool) path: sect5/title
	-#: article.translate.xml:1584 article.translate.xml:1727
	+#: article.translate.xml:1585 article.translate.xml:1728
	msgid "Importing into the Vendor Tree"
	msgstr "Importando para a Árvore do Fornecedor"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1586
	+#: article.translate.xml:1587
	msgid ""
	"Now, the sources must be copied into <filename><replaceable>dist</"
	"replaceable></filename> and the <command>svn add</command> and <command>svn "
	@@ -3008,7 +3010,7 @@
	"<command>svn rm</command> são usados conforme necessário:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1592
	+#: article.translate.xml:1593
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd <replaceable>vendor/pf/pf-4.3</replaceable></userinput>\n"
	@@ -3024,7 +3026,7 @@
	"<prompt>%</prompt> <userinput>comm -13 ../old ../new \| xargs svn add --parents</userinput>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1598
	+#: article.translate.xml:1599
	msgid ""
	"If any directories were removed, they will have to be <command>svn rm</"
	"command>ed manually. Nothing will break if they are not, but they will "
	@@ -3035,7 +3037,7 @@
	"permanecerão na árvore."

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1603
	+#: article.translate.xml:1604
	msgid ""
	"Check properties on any new files. All text files should have <literal>svn:"
	"eol-style</literal> set to <literal>native</literal>. All binary files "
	@@ -3055,7 +3057,7 @@
	"qualquer arquivo da árvore."

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1613
	+#: article.translate.xml:1614
	msgid ""
	"Committing is now possible. However, it is good practice to make sure that "
	"everything is okay by using the <command>svn stat</command> and <command>svn "
	@@ -3066,12 +3068,12 @@
	"<command>svn diff</command>."

	#. (itstool) path: sect5/title
	-#: article.translate.xml:1620
	+#: article.translate.xml:1621
	msgid "Tagging"
	msgstr "Marcação (Tagging)"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1622
	+#: article.translate.xml:1623
	msgid ""
	"Once committed, vendor releases are tagged for future reference. The best "
	"and quickest way to do this is directly in the repository:"
	@@ -3081,13 +3083,13 @@
	"diretamente no repositório:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1626
	+#: article.translate.xml:1627
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn cp svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/4.3</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn cp svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/4.3</replaceable></userinput>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1628
	+#: article.translate.xml:1629
	msgid ""
	"Once that is complete, <command>svn up</command> the working copy of "
	"<filename><replaceable>vendor/pf</replaceable></filename> to get the new "
	@@ -3098,7 +3100,7 @@
	"filename> para obter a nova tag, embora isso raramente seja necessário."

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1634
	+#: article.translate.xml:1635
	msgid ""
	"If creating the tag in the working copy of the tree, <command>svn:mergeinfo</"
	"command> results must be removed:"
	@@ -3107,7 +3109,7 @@
	"<command>svn:mergeinfo</command> deverão ser removidos:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1638
	+#: article.translate.xml:1639
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd\t<replaceable>vendor/pf</replaceable></userinput>\n"
	@@ -3119,12 +3121,12 @@
	"<prompt>%</prompt> <userinput>svn propdel svn:mergeinfo -R 4.3</userinput>"

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1645
	+#: article.translate.xml:1646
	msgid "Merging to Head"
	msgstr "Mesclagem para o Head"

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1647
	+#: article.translate.xml:1648
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd <replaceable>head/contrib/pf</replaceable></userinput>\n"
	@@ -3136,7 +3138,7 @@
	"<prompt>%</prompt> <userinput>svn merge --accept=postpone svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> .</userinput>"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1651
	+#: article.translate.xml:1652
	msgid ""
	"The <literal>--accept=postpone</literal> tells Subversion not to complain "
	"about merge conflicts as they will be handled manually."
	@@ -3145,7 +3147,7 @@
	"sobre conflitos de mesclagem, pois eles serão manipulados manualmente."

	#. (itstool) path: tip/para
	-#: article.translate.xml:1656
	+#: article.translate.xml:1657
	msgid ""
	"The <command>cvs2svn</command> changeover occurred on June 3, 2008. When "
	"performing vendor merges for packages which were already present and "
	@@ -3167,7 +3169,7 @@
	"exemplo:"

	#. (itstool) path: tip/screen
	-#: article.translate.xml:1670
	+#: article.translate.xml:1671
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn checkout svn+ssh://repo.freebsd.org/base/head/contrib/<replaceable>sendmail</replaceable></userinput>\n"
	@@ -3179,12 +3181,12 @@
	"<prompt>%</prompt> <userinput>svn merge -c r<replaceable>261190</replaceable> '^/vendor/<replaceable>sendmail/dist</replaceable>' .</userinput>"

	#. (itstool) path: tip/para
	-#: article.translate.xml:1674
	+#: article.translate.xml:1675
	msgid "<literal>^</literal> is an alias for the repository path."
	msgstr "<literal>^</literal> é um alias para o caminho do repositório."

	#. (itstool) path: note/para
	-#: article.translate.xml:1679
	+#: article.translate.xml:1680
	msgid ""
	"If using the <application>Zsh</application> shell, the <literal>^</literal> "
	"must be escaped with <literal>\\</literal> or quoted."
	@@ -3193,12 +3195,12 @@
	"literal> deve ser escapado com <literal>\\</literal> ou entre aspas."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1684
	+#: article.translate.xml:1685
	msgid "It is necessary to resolve any merge conflicts."
	msgstr "É necessário resolver quaisquer conflitos de mesclagem."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1686
	+#: article.translate.xml:1687
	msgid ""
	"Make sure that any files that were added or removed in the vendor tree have "
	"been properly added or removed in the main tree. To check diffs against the "
	@@ -3209,13 +3211,13 @@
	"principal. Para verificar os diffs com relação ao branch do fornecedor:"

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1691
	+#: article.translate.xml:1692
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn diff --no-diff-deleted --old=svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> --new=.</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn diff --no-diff-deleted --old=svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> --new=.</userinput>"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1693
	+#: article.translate.xml:1694
	msgid ""
	"The <literal>--no-diff-deleted</literal> tells Subversion not to complain "
	"about files that are in the vendor tree but not in the main tree. Things "
	@@ -3228,7 +3230,7 @@
	"fornecedor, como os makefiles do fornecedor e os scripts de configuração."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1700
	+#: article.translate.xml:1701
	msgid ""
	"Using <acronym>CVS</acronym>, once a file was off the vendor branch, it was "
	"not able to be put back. With Subversion, there is no concept of on or off "
	@@ -3245,7 +3247,7 @@
	"mais fácil."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1709
	+#: article.translate.xml:1710
	msgid ""
	"If any changes are required for the world to build with the new sources, "
	"make them now, and keep testing until everything builds and runs perfectly."
	@@ -3255,12 +3257,12 @@
	"executado perfeitamente."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1715
	+#: article.translate.xml:1716
	msgid "Committing the Vendor Import"
	msgstr "Fazendo o commit da Importação de Fornecedores"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1717
	+#: article.translate.xml:1718
	msgid ""
	"Committing is now possible! Everything must be committed in one go. If done "
	"properly, the tree will move from a consistent state with old code, to a "
	@@ -3271,12 +3273,12 @@
	"código antigo para um estado consistente com o novo código."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1724
	+#: article.translate.xml:1725
	msgid "From Scratch"
	msgstr "A partir do zero"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1729
	+#: article.translate.xml:1730
	msgid ""
	"This section is an example of importing and tagging <application>byacc</"
	"application> into <filename>head</filename>."
	@@ -3285,12 +3287,12 @@
	"application> no <filename>head</filename>."

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1733
	+#: article.translate.xml:1734
	msgid "First, prepare the directory in <filename>vendor</filename>:"
	msgstr "Primeiro, prepare o diretório em <filename>vendor</filename>:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1736
	+#: article.translate.xml:1737
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn co --depth immediates <replaceable>$FSVN/vendor</replaceable></userinput>\n"
	@@ -3304,7 +3306,7 @@
	"<prompt>%</prompt> <userinput>svn mkdir <replaceable>byacc/dist</replaceable></userinput>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1741
	+#: article.translate.xml:1742
	msgid ""
	"Now, import the sources into the <filename>dist</filename> directory. Once "
	"the files are in place, <command>svn add</command> the new ones, then "
	@@ -3318,44 +3320,44 @@
	"diretamente o commit e as marcações de forma remota:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1748
	+#: article.translate.xml:1749
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn cp -m <replaceable>\"Tag byacc 20120115\"</replaceable> <replaceable>$FSVN/vendor/byacc/dist</replaceable> <replaceable>$FSVN/vendor/byacc/20120115</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn cp -m <replaceable>\"Tag byacc 20120115\"</replaceable> <replaceable>$FSVN/vendor/byacc/dist</replaceable> <replaceable>$FSVN/vendor/byacc/20120115</replaceable></userinput>"

	#. (itstool) path: sect5/title
	-#: article.translate.xml:1752
	+#: article.translate.xml:1753
	msgid "Merging to <literal>head</literal>"
	msgstr "Mesclando para o <literal>head</literal>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1754
	+#: article.translate.xml:1755
	msgid "Due to this being a new file, copy it for the merge:"
	msgstr "Devido a este ser um novo arquivo, copie-o para a mesclagem:"

	#. (itstool) path: sect5/screen
	-#: article.translate.xml:1757
	+#: article.translate.xml:1758
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn cp -m <replaceable>\"Import byacc to contrib\"</replaceable> <replaceable>$FSVN/vendor/byacc/dist</replaceable> <replaceable>$FSVN/head/contrib/byacc</replaceable></userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn cp -m <replaceable>\"Import byacc to contrib\"</replaceable> <replaceable>$FSVN/vendor/byacc/dist</replaceable> <replaceable>$FSVN/head/contrib/byacc</replaceable></userinput>"

	#. (itstool) path: sect5/para
	-#: article.translate.xml:1759
	+#: article.translate.xml:1760
	msgid "Working normally on newly imported sources is still possible."
	msgstr "Ainda é possível trabalhar normalmente nos fontes recém importados."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:1766
	+#: article.translate.xml:1767
	msgid "Reverting a Commit"
	msgstr "Revertendo um Commit"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1768
	+#: article.translate.xml:1769
	msgid "Reverting a commit to a previous version is fairly easy:"
	msgstr "A reversão de um commit para uma versão anterior é bem fácil:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1771
	+#: article.translate.xml:1772
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn merge -r179454:179453 ROADMAP.txt</userinput>\n"
	@@ -3365,7 +3367,7 @@
	"<prompt>%</prompt> <userinput>svn commit</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1774
	+#: article.translate.xml:1775
	msgid ""
	"Change number syntax, with negative meaning a reverse change, can also be "
	"used:"
	@@ -3374,7 +3376,7 @@
	"mudança, também pode ser usado:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1777
	+#: article.translate.xml:1778
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn merge -c -179454 ROADMAP.txt</userinput>\n"
	@@ -3384,18 +3386,18 @@
	"<prompt>%</prompt> <userinput>svn commit</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1780
	+#: article.translate.xml:1781
	msgid "This can also be done directly in the repository:"
	msgstr "Isso também pode ser feito diretamente no repositório:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1782
	+#: article.translate.xml:1783
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn merge -r179454:179453 svn+ssh://repo.freebsd.org/base/ROADMAP.txt</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn merge -r179454:179453 svn+ssh://repo.freebsd.org/base/ROADMAP.txt</userinput>"

	#. (itstool) path: note/para
	-#: article.translate.xml:1785
	+#: article.translate.xml:1786
	msgid ""
	"It is important to ensure that the mergeinfo is correct when reverting a "
	"file to permit <command>svn mergeinfo --eligible</command> to work as "
	@@ -3406,7 +3408,7 @@
	"como esperado."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1791
	+#: article.translate.xml:1792
	msgid ""
	"Reverting the deletion of a file is slightly different. Copying the version "
	"of the file that predates the deletion is required. For example, to restore "
	@@ -3417,7 +3419,7 @@
	"restaurar um arquivo que foi excluído na revisão N, restaure a versão N-1:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1796
	+#: article.translate.xml:1797
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn copy svn+ssh://repo.freebsd.org/base/ROADMAP.txt@179454</userinput>\n"
	@@ -3427,18 +3429,18 @@
	"<prompt>%</prompt> <userinput>svn commit</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1799
	+#: article.translate.xml:1800
	msgid "or, equally:"
	msgstr "ou, igualmente:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1801
	+#: article.translate.xml:1802
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn copy svn+ssh://repo.freebsd.org/base/ROADMAP.txt@179454 svn+ssh://repo.freebsd.org/base</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn copy svn+ssh://repo.freebsd.org/base/ROADMAP.txt@179454 svn+ssh://repo.freebsd.org/base</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1803
	+#: article.translate.xml:1804
	msgid ""
	"Do <emphasis>not</emphasis> simply recreate the file manually and "
	"<command>svn add</command> it—this will cause history to be lost."
	@@ -3448,12 +3450,12 @@
	"seja perdido."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:1809
	+#: article.translate.xml:1810
	msgid "Fixing Mistakes"
	msgstr "Corrigindo Erros"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1811
	+#: article.translate.xml:1812
	msgid ""
	"While we can do surgery in an emergency, do not plan on having mistakes "
	"fixed behind the scenes. Plan on mistakes remaining in the logs forever. Be "
	@@ -3466,14 +3468,14 @@
	"status</command> e do <command>svn diff</command> antes de enviar o commit."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1817
	+#: article.translate.xml:1818
	msgid ""
	"Mistakes will happen but, they can generally be fixed without disruption."
	msgstr ""
	"Erros acontecerão, mas eles geralmente podem ser corrigidos sem perturbar."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1821
	+#: article.translate.xml:1822
	msgid ""
	"Take a case of adding a file in the wrong location. The right thing to do is "
	"to <command>svn move</command> the file to the correct location and commit. "
	@@ -3486,7 +3488,7 @@
	"repositório, e os logs serão todos conectados corretamente."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1827
	+#: article.translate.xml:1828
	msgid ""
	"The wrong thing to do is to delete the file and then <command>svn add</"
	"command> an independent copy in the correct location. Instead of a couple of "
	@@ -3499,12 +3501,12 @@
	"inteira do arquivo. Isso é um desperdício."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:1835
	+#: article.translate.xml:1836
	msgid "Using a Subversion Mirror"
	msgstr "Usando um Espelho do Subversion"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1837
	+#: article.translate.xml:1838
	msgid ""
	"There is a serious disadvantage to this method: every time something is to "
	"be committed, a <command>svn relocate</command> to the main repository has "
	@@ -3522,12 +3524,12 @@
	"começar a usá-lo."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1848
	+#: article.translate.xml:1849
	msgid "Checkout from a Mirror"
	msgstr "Checkout a partir de um Mirror"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1850
	+#: article.translate.xml:1851
	msgid ""
	"Check out a working copy from a mirror by substituting the mirror's "
	"<acronym>URL</acronym> for <literal>svn+ssh://repo.freebsd.org/base</"
	@@ -3540,12 +3542,12 @@
	"o <command>svnsync</command>."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:1858
	+#: article.translate.xml:1859
	msgid "Setting up a <application>svnsync</application> Mirror"
	msgstr "Configurando um Mirror <application>svnsync</application>"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1861
	+#: article.translate.xml:1862
	msgid ""
	"Avoid setting up a <application>svnsync</application> mirror unless there is "
	"a very good reason for it. Most of the time a <command>git</command> mirror "
	@@ -3562,7 +3564,7 @@
	"quatro a dez vezes mais."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1870
	+#: article.translate.xml:1871
	msgid ""
	"One way to limit the time required is to grab a <link xlink:href=\"https://"
	"download.freebsd.org/ftp/development/subversion/\">seed file</link>. It is "
	@@ -3575,12 +3577,12 @@
	"tempo para baixar do que o svnsync."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1875
	+#: article.translate.xml:1876
	msgid "Extract the file and update it:"
	msgstr "Extraia o arquivo e o atualize:"

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1877
	+#: article.translate.xml:1878
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>tar xf svnmirror-base-r261170.tar.xz</userinput>\n"
	@@ -3590,7 +3592,7 @@
	"<prompt>%</prompt> <userinput>svnsync sync file:///home/svnmirror/base</userinput>"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1880
	+#: article.translate.xml:1881
	msgid ""
	"Now, set that up to run from <citerefentry><refentrytitle>cron</"
	"refentrytitle><manvolnum>8</manvolnum></citerefentry>, do checkouts locally, "
	@@ -3602,7 +3604,7 @@
	"para as máquinas locais com as quais conversar, etc."

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1884
	+#: article.translate.xml:1885
	msgid ""
	"The seed mirror is set to fetch from <literal>svn://svn.freebsd.org/base</"
	"literal>. The configuration for the mirror is stored in <literal>revprop 0</"
	@@ -3614,23 +3616,23 @@
	"configuração, tente:"

	#. (itstool) path: sect4/screen
	-#: article.translate.xml:1890
	+#: article.translate.xml:1891
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn proplist -v --revprop -r 0 file:///home/svnmirror/base</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn proplist -v --revprop -r 0 file:///home/svnmirror/base</userinput>"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:1892
	+#: article.translate.xml:1893
	msgid "Use <literal>svn propset</literal> to change things."
	msgstr "Use <literal>svn propset</literal> para mudar as coisas."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:1898
	+#: article.translate.xml:1899
	msgid "Committing High-<acronym>ASCII</acronym> Data"
	msgstr "Fazendo commit de dados High<acronym>ASCII</acronym>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1900
	+#: article.translate.xml:1901
	msgid ""
	"Files that have high-<acronym>ASCII</acronym> bits are considered binary "
	"files in <acronym>SVN</acronym>, so the pre-commit checks fail and indicate "
	@@ -3653,18 +3655,18 @@
	"<literal>fbsd:notbinary</literal> com o <literal>propset</literal>:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1912
	+#: article.translate.xml:1913
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn propset fbsd:notbinary yes foo.data</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn propset fbsd:notbinary yes foo.data</userinput>"

	#. (itstool) path: sect3/title
	-#: article.translate.xml:1916
	+#: article.translate.xml:1917
	msgid "Maintaining a Project Branch"
	msgstr "Mantendo um branch de projeto"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1918
	+#: article.translate.xml:1919
	msgid ""
	"A project branch is one that is synced to head (or another branch) is used "
	"to develop a project then commit it back to head. In <acronym>SVN</acronym>, "
	@@ -3687,7 +3689,7 @@
	"depois que a que está morta é excluída)."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1930
	+#: article.translate.xml:1931
	msgid ""
	"As per <link xlink:href=\"https://people.FreeBSD.org/~peter/svn_notes.txt"
	"\">https://people.FreeBSD.org/~peter/svn_notes.txt</link>, work that is "
	@@ -3709,23 +3711,23 @@
	"mais detalhes."

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1940
	+#: article.translate.xml:1941
	msgid "To create a project branch:"
	msgstr "Para criar um branch de projeto:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1942
	+#: article.translate.xml:1943
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/projects/spif</userinput>"
	msgstr "<prompt>%</prompt> <userinput>svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/projects/spif</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1944
	+#: article.translate.xml:1945
	msgid "To merge changes from HEAD back into the project branch:"
	msgstr "Para mesclar as alterações do HEAD de volta ao branch de projeto:"

	#. (itstool) path: sect3/screen
	-#: article.translate.xml:1947
	+#: article.translate.xml:1948
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd copy_of_spif</userinput>\n"
	@@ -3737,19 +3739,19 @@
	"<prompt>%</prompt> <userinput>svn commit</userinput>"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:1951
	+#: article.translate.xml:1952
	msgid "It is important to resolve any merge conflicts before committing."
	msgstr ""
	"É importante resolver quaisquer conflitos de mesclagem antes de fazer o "
	"commit."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:1963
	+#: article.translate.xml:1964
	msgid "Some Tips"
	msgstr "Algumas dicas"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:1965
	+#: article.translate.xml:1966
	msgid ""
	"In commit logs etc., <quote>rev 179872</quote> is spelled <quote>r179872</"
	"quote> as per convention."
	@@ -3758,7 +3760,7 @@
	"<quote>r179872</quote> conforme a convenção."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:1968
	+#: article.translate.xml:1969
	msgid ""
	"Speeding up svn is possible by adding these entries to <filename>~/.ssh/"
	"config</filename>:"
	@@ -3767,7 +3769,7 @@
	"config</filename>:"

	#. (itstool) path: sect2/screen
	-#: article.translate.xml:1971
	+#: article.translate.xml:1972
	#, no-wrap
	msgid ""
	"Host *\n"
	@@ -3781,18 +3783,18 @@
	"ControlPersist yes"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:1976
	+#: article.translate.xml:1977
	msgid "and then typing"
	msgstr "e depois digitando"

	#. (itstool) path: sect2/screen
	-#: article.translate.xml:1978
	+#: article.translate.xml:1979
	#, no-wrap
	msgid "<userinput>mkdir ~/.ssh/sockets</userinput>"
	msgstr "<userinput>mkdir ~/.ssh/sockets</userinput>"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:1980
	+#: article.translate.xml:1981
	msgid ""
	"Checking out a working copy with a stock Subversion client without FreeBSD-"
	"specific patches (<varname>OPTIONS_SET=FREEBSD_TEMPLATE</varname>) will mean "
	@@ -3807,7 +3809,7 @@
	"para expandi-las da seguinte forma:"

	#. (itstool) path: sect2/screen
	-#: article.translate.xml:1987
	+#: article.translate.xml:1988
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>svn propdel -R svn:keywords .</userinput>\n"
	@@ -3817,12 +3819,12 @@
	"<prompt>%</prompt> <userinput>svn revert -R .</userinput>"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:1990
	+#: article.translate.xml:1991
	msgid "This will wipe out uncommitted patches."
	msgstr "Isso eliminará os patches para os quais ainda não foi feito o commit."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:1992
	+#: article.translate.xml:1993
	msgid ""
	"It is possible to automatically fill the \"Sponsored by\" and \"MFC after\" "
	"commit log fields by setting \"freebsd-sponsored-by\" and \"freebsd-mfc-after"
	@@ -3835,7 +3837,7 @@
	"<filename>~/.subversion/config</filename>. Por exemplo:"

	#. (itstool) path: sect2/programlisting
	-#: article.translate.xml:1999
	+#: article.translate.xml:2000
	#, no-wrap
	msgid ""
	"freebsd-sponsored-by = The FreeBSD Foundation\n"
	@@ -3845,12 +3847,12 @@
	"freebsd-mfc-after = 2 weeks"

	#. (itstool) path: sect1/title
	-#: article.translate.xml:2005
	+#: article.translate.xml:2006
	msgid "Setup, Conventions, and Traditions"
	msgstr "Configuração, Convenções e Tradições"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2007
	+#: article.translate.xml:2008
	msgid ""
	"There are a number of things to do as a new developer. The first set of "
	"steps is specific to committers only. These steps must be done by a mentor "
	@@ -3861,12 +3863,12 @@
	"devem ser feitas por um mentor para aqueles que não são committers."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:2013
	+#: article.translate.xml:2014
	msgid "For New Committers"
	msgstr "Para novos committers"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:2015
	+#: article.translate.xml:2016
	msgid ""
	"Those who have been given commit rights to the FreeBSD repositories must "
	"follow these steps."
	@@ -3875,14 +3877,14 @@
	"devem seguir estes passos."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2020
	+#: article.translate.xml:2021
	msgid "Get mentor approval before committing each of these changes!"
	msgstr ""
	"Obtenha a aprovação do seu mentor antes de fazer o commit de cada uma dessas "
	"mudanças!"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2025
	+#: article.translate.xml:2026
	msgid ""
	"The <filename>.ent</filename> and <filename>.xml</filename> files mentioned "
	"below exist in the FreeBSD Documentation Project SVN repository at "
	@@ -3893,7 +3895,7 @@
	"FreeBSD em <literal>svn+ssh://repo.FreeBSD.org/doc/</literal>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2032
	+#: article.translate.xml:2033
	msgid ""
	"New files that do not have the <literal>FreeBSD=%H</literal> <command>svn:"
	"keywords</command> property will be rejected when attempting to commit them "
	@@ -3911,7 +3913,7 @@
	"txt</filename> mencionado lá."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2046
	+#: article.translate.xml:2047
	msgid ""
	"All <filename>src</filename> commits go to FreeBSD-CURRENT first before "
	"being merged to FreeBSD-STABLE. The FreeBSD-STABLE branch must maintain "
	@@ -3925,17 +3927,17 @@
	"que quebram essa compatibilidade."

	#. (itstool) path: procedure/title
	-#: article.translate.xml:2056
	+#: article.translate.xml:2057
	msgid "Steps for New Committers"
	msgstr "Etapas para os novos committers"

	#. (itstool) path: step/title
	-#: article.translate.xml:2059
	+#: article.translate.xml:2060
	msgid "Add an Author Entity"
	msgstr "Adicione uma entidade de autor"

	#. (itstool) path: step/para
	-#: article.translate.xml:2061
	+#: article.translate.xml:2062
	msgid ""
	"<filename>doc/head/share/xml/authors.ent</filename> — Add an author entity. "
	"Later steps depend on this entity, and missing this step will cause the "
	@@ -3949,12 +3951,12 @@
	"habilidades no controle de versão."

	#. (itstool) path: step/title
	-#: article.translate.xml:2070
	+#: article.translate.xml:2071
	msgid "Update the List of Developers and Contributors"
	msgstr "Atualize a lista de desenvolvedores e colaboradores"

	#. (itstool) path: step/para
	-#: article.translate.xml:2073
	+#: article.translate.xml:2074
	msgid ""
	"<filename>doc/head/en_US.ISO8859-1/articles/contributors/contrib.committers."
	"xml</filename> — Add an entry to the <quote>Developers</quote> section of "
	@@ -3969,7 +3971,7 @@
	"entradas são classificadas pelo sobrenome."

	#. (itstool) path: step/para
	-#: article.translate.xml:2079
	+#: article.translate.xml:2080
	msgid ""
	"<filename>doc/head/en_US.ISO8859-1/articles/contributors/contrib.additional."
	"xml</filename> — <emphasis>Remove</emphasis> the entry from the "
	@@ -3982,12 +3984,12 @@
	"primeiro nome."

	#. (itstool) path: step/title
	-#: article.translate.xml:2086
	+#: article.translate.xml:2087
	msgid "Add a News Item"
	msgstr "Adicione um item de notícias"

	#. (itstool) path: step/para
	-#: article.translate.xml:2088
	+#: article.translate.xml:2089
	msgid ""
	"<filename>doc/head/share/xml/news.xml</filename> — Add an entry. Look for "
	"the other entries that announce new committers and follow the format. Use "
	@@ -4000,12 +4002,12 @@
	"commit bit."

	#. (itstool) path: step/title
	-#: article.translate.xml:2096
	+#: article.translate.xml:2097
	msgid "Add a <acronym>PGP</acronym> Key"
	msgstr "Adicione uma chave <acronym>PGP</acronym>"

	#. (itstool) path: step/para
	-#: article.translate.xml:2098
	+#: article.translate.xml:2099
	msgid ""
	"<filename>doc/head/share/pgpkeys/pgpkeys.ent</filename> and <filename>doc/"
	"head/share/pgpkeys/pgpkeys-developers.xml</filename> - Add your "
	@@ -4018,7 +4020,7 @@
	"têm uma chave devem ver <xref linkend=\"pgpkeys-creating\"/>."

	#. (itstool) path: step/para
	-#: article.translate.xml:2105
	+#: article.translate.xml:2106
	msgid ""
	"Dag-Erling Smørgrav <email>des@FreeBSD.org</email> has written a shell "
	"script (<filename>doc/head/share/pgpkeys/addkey.sh</filename>) to make this "
	@@ -4032,7 +4034,7 @@
	"informações."

	#. (itstool) path: step/para
	-#: article.translate.xml:2110
	+#: article.translate.xml:2111
	msgid ""
	"Use <filename>doc/head/share/pgpkeys/checkkey.sh</filename> to verify that "
	"keys meet minimal best-practices standards."
	@@ -4041,7 +4043,7 @@
	"se as chaves atendem aos padrões mínimos das boas práticas recomendadas."

	#. (itstool) path: step/para
	-#: article.translate.xml:2115
	+#: article.translate.xml:2116
	msgid ""
	"After adding and checking a key, add both updated files to source control "
	"and then commit them. Entries in this file are sorted by last name."
	@@ -4051,7 +4053,7 @@
	"commit. As entradas neste arquivo são classificadas pelo sobrenome."

	#. (itstool) path: note/para
	-#: article.translate.xml:2120
	+#: article.translate.xml:2121
	msgid ""
	"It is very important to have a current <acronym>PGP</acronym>/"
	"Gnu<acronym>PG</acronym> key in the repository. The key may be required for "
	@@ -4072,12 +4074,12 @@
	"FreeBSD.org/doc/pgpkeyring.txt</link>."

	#. (itstool) path: step/title
	-#: article.translate.xml:2131
	+#: article.translate.xml:2132
	msgid "Update Mentor and Mentee Information"
	msgstr "Atualize as informações do Mentor e do Mentee"

	#. (itstool) path: step/para
	-#: article.translate.xml:2133
	+#: article.translate.xml:2134
	msgid ""
	"<filename>base/head/share/misc/committers-<replaceable>repository</"
	"replaceable>.dot</filename> — Add an entry to the current committers "
	@@ -4092,7 +4094,7 @@
	"privilégios de commit concedidos."

	#. (itstool) path: step/para
	-#: article.translate.xml:2140
	+#: article.translate.xml:2141
	msgid ""
	"Add an entry for each additional mentor/mentee relationship in the bottom "
	"section."
	@@ -4101,12 +4103,12 @@
	"seção inferior."

	#. (itstool) path: step/title
	-#: article.translate.xml:2145
	+#: article.translate.xml:2146
	msgid "Generate a <application>Kerberos</application> Password"
	msgstr "Gere uma senha do <application>Kerberos</application>"

	#. (itstool) path: step/para
	-#: article.translate.xml:2148
	+#: article.translate.xml:2149
	msgid ""
	"See <xref linkend=\"kerberos-ldap\"/> to generate or set a "
	"<application>Kerberos</application> for use with other FreeBSD services like "
	@@ -4117,12 +4119,12 @@
	"como o banco de dados de rastreamento de bugs."

	#. (itstool) path: step/title
	-#: article.translate.xml:2154
	+#: article.translate.xml:2155
	msgid "Optional: Enable Wiki Account"
	msgstr "Opcional: Ative a sua conta na Wiki"

	#. (itstool) path: step/para
	-#: article.translate.xml:2156
	+#: article.translate.xml:2157
	msgid ""
	"<link xlink:href=\"https://wiki.freebsd.org\">FreeBSD Wiki</link> Account — "
	"A wiki account allows sharing projects and ideas. Those who do not yet have "
	@@ -4139,12 +4141,12 @@
	"precisar de ajuda com sua conta no Wiki."

	#. (itstool) path: step/title
	-#: article.translate.xml:2166
	+#: article.translate.xml:2167
	msgid "Optional: Update Wiki Information"
	msgstr "Opcional: Atualize informações do Wiki"

	#. (itstool) path: step/para
	-#: article.translate.xml:2168
	+#: article.translate.xml:2169
	msgid ""
	"Wiki Information - After gaining access to the wiki, some people add entries "
	"to the <link xlink:href=\"https://wiki.freebsd.org/HowWeGotHere\">How We Got "
	@@ -4159,12 +4161,12 @@
	"wiki.freebsd.org/Community/Dogs\">Dogs of FreeBSD</link> páginas."

	#. (itstool) path: step/title
	-#: article.translate.xml:2176
	+#: article.translate.xml:2177
	msgid "Optional: Update Ports with Personal Information"
	msgstr "Opcional: Atualize o Ports com as suas Informações Pessoais"

	#. (itstool) path: step/para
	-#: article.translate.xml:2179
	+#: article.translate.xml:2180
	msgid ""
	"<filename>ports/astro/xearth/files/freebsd.committers.markers</filename> and "
	"<filename>src/usr.bin/calendar/calendars/calendar.freebsd</filename> - Some "
	@@ -4177,12 +4179,12 @@
	"onde estão localizadas ou a data de seu aniversário."

	#. (itstool) path: step/title
	-#: article.translate.xml:2188
	+#: article.translate.xml:2189
	msgid "Optional: Prevent Duplicate Mailings"
	msgstr "Opcional: Evite Correspondências Duplicadas"

	#. (itstool) path: step/para
	-#: article.translate.xml:2190
	+#: article.translate.xml:2191
	msgid ""
	"Subscribers to <link xlink:href=\"http://lists.FreeBSD.org/mailman/listinfo/"
	"svn-src-all\">svn-src-all</link>, <link xlink:href=\"http://lists.FreeBSD."
	@@ -4199,12 +4201,12 @@
	"receber cópias duplicadas de mensagens de commit e de followups."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:2199
	+#: article.translate.xml:2200
	msgid "For Everyone"
	msgstr "Para todos"

	#. (itstool) path: step/para
	-#: article.translate.xml:2203
	+#: article.translate.xml:2204
	msgid ""
	"Introduce yourself to the other developers, otherwise no one will have any "
	"idea who you are or what you are working on. The introduction need not be a "
	@@ -4221,7 +4223,7 @@
	"de discussão dos desenvolvedores do FreeBSD e você estará a caminho!"

	#. (itstool) path: step/para
	-#: article.translate.xml:2213
	+#: article.translate.xml:2214
	msgid ""
	"Log into <systemitem>freefall.FreeBSD.org</systemitem> and create a "
	"<filename>/var/forward/<replaceable>user</replaceable></filename> (where "
	@@ -4247,7 +4249,7 @@
	"então encaminhe suas mensagens ou salve-as em outro lugar."

	#. (itstool) path: note/para
	-#: article.translate.xml:2229
	+#: article.translate.xml:2230
	msgid ""
	"If your e-mail system uses SPF with strict rules, you should whitelist "
	"<systemitem class=\"fqdomainname\">mx2.FreeBSD.org</systemitem> from SPF "
	@@ -4258,7 +4260,7 @@
	"whitelist de verificações do SPF."

	#. (itstool) path: step/para
	-#: article.translate.xml:2234
	+#: article.translate.xml:2235
	msgid ""
	"Due to the severe load dealing with SPAM places on the central mail servers "
	"that do the mailing list processing, the front-end server does do some basic "
	@@ -4280,7 +4282,7 @@
	"class=\"fqdomainname\">freefall.FreeBSD.org</systemitem>."

	#. (itstool) path: note/para
	-#: article.translate.xml:2248
	+#: article.translate.xml:2249
	msgid ""
	"Those who are developers but not committers will not be subscribed to the "
	"committers or developers mailing lists. The subscriptions are derived from "
	@@ -4291,12 +4293,12 @@
	"são derivadas dos direitos de acesso."

	#. (itstool) path: sect3/title
	-#: article.translate.xml:2255
	+#: article.translate.xml:2256
	msgid "SMTP Access Setup"
	msgstr "Configuração de acesso SMTP"

	#. (itstool) path: sect3/para
	-#: article.translate.xml:2257
	+#: article.translate.xml:2258
	msgid ""
	"For those willing to send e-mail messages through the FreeBSD.org "
	"infrastructure, follow the instructions below:"
	@@ -4305,7 +4307,7 @@
	"infraestrutura do FreeBSD.org, siga as instruções abaixo:"

	#. (itstool) path: step/para
	-#: article.translate.xml:2263
	+#: article.translate.xml:2264
	msgid ""
	"Point your mail client at <literal><systemitem class=\"fqdomainname\">smtp."
	"FreeBSD.org</systemitem>:587</literal>."
	@@ -4314,12 +4316,12 @@
	"\">smtp.FreeBSD.org</systemitem>:587</literal>."

	#. (itstool) path: step/para
	-#: article.translate.xml:2267
	+#: article.translate.xml:2268
	msgid "Enable STARTTLS."
	msgstr "Habilite o STARTTLS."

	#. (itstool) path: step/para
	-#: article.translate.xml:2271
	+#: article.translate.xml:2272
	msgid ""
	"Ensure your <literal>From:</literal> address is set to "
	"<literal><replaceable>yourusername</replaceable>@FreeBSD.org</literal>."
	@@ -4328,7 +4330,7 @@
	"para <literal><replaceable>yourusername</replaceable>@FreeBSD.org</literal>."

	#. (itstool) path: step/para
	-#: article.translate.xml:2277
	+#: article.translate.xml:2278
	msgid ""
	"For authentication, you can use your FreeBSD Kerberos username and password "
	"(see <xref linkend=\"kerberos-ldap\"/>). The "
	@@ -4341,7 +4343,7 @@
	"o preferido, pois é válido apenas para autenticação dos recursos de correio."

	#. (itstool) path: note/para
	-#: article.translate.xml:2284
	+#: article.translate.xml:2285
	msgid ""
	"Do not include <literal>@FreeBSD.org</literal> when entering in your "
	"username."
	@@ -4349,12 +4351,12 @@
	"Não inclua <literal>@FreeBSD.org</literal> ao digitar seu nome de usuário."

	#. (itstool) path: note/title
	-#: article.translate.xml:2291
	+#: article.translate.xml:2292
	msgid "Additional Notes"
	msgstr "Notas Adicionais"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2295
	+#: article.translate.xml:2296
	msgid ""
	"Will only accept mail from <literal><replaceable>yourusername</"
	"replaceable>@FreeBSD.org</literal>. If you are authenticated as one user, "
	@@ -4365,7 +4367,7 @@
	"não terá permissão para enviar e-mails como outro."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2302
	+#: article.translate.xml:2303
	msgid ""
	"A header will be appended with the SASL username: (<literal>Authenticated "
	"sender: <replaceable>username</replaceable></literal>)."
	@@ -4375,7 +4377,7 @@
	"literal>)."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2307
	+#: article.translate.xml:2308
	msgid ""
	"Host has various rate limits in place to cut down on brute force attempts."
	msgstr ""
	@@ -4383,13 +4385,13 @@
	"bruta."

	#. (itstool) path: sect4/title
	-#: article.translate.xml:2314
	+#: article.translate.xml:2315
	msgid "Using a Local MTA to Forward Emails to the FreeBSD.org SMTP Service"
	msgstr ""
	"Usando um MTA Local para Encaminhar Emails para o Serviço SMTP do FreeBSD.org"

	#. (itstool) path: sect4/para
	-#: article.translate.xml:2317
	+#: article.translate.xml:2318
	msgid ""
	"It is also possible to use a local <acronym>MTA</acronym> to forward locally "
	"sent emails to the FreeBSD.org SMTP servers."
	@@ -4398,12 +4400,12 @@
	"emails enviados localmente para os servidores SMTP do FreeBSD.org."

	#. (itstool) path: example/title
	-#: article.translate.xml:2322
	+#: article.translate.xml:2323
	msgid "Using <application>Postfix</application>"
	msgstr "Usando o <application>Postfix</application>"

	#. (itstool) path: example/para
	-#: article.translate.xml:2324
	+#: article.translate.xml:2325
	msgid ""
	"To tell a local Postfix instance that anything from "
	"<literal><replaceable>yourusername</replaceable>@FreeBSD.org</literal> "
	@@ -4416,7 +4418,7 @@
	"<filename>main.cf</filename>:"

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2329
	+#: article.translate.xml:2330
	#, no-wrap
	msgid ""
	"sender_dependent_relayhost_maps = hash:/usr/local/etc/postfix/relayhost_maps\n"
	@@ -4432,7 +4434,7 @@
	"smtp_use_tls = yes"

	#. (itstool) path: example/para
	-#: article.translate.xml:2335
	+#: article.translate.xml:2336
	msgid ""
	"Create <filename>/usr/local/etc/postfix/relayhost_maps</filename> with the "
	"following content:"
	@@ -4441,13 +4443,13 @@
	"seguinte conteúdo:"

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2339
	+#: article.translate.xml:2340
	#, no-wrap
	msgid "<replaceable>yourusername</replaceable>@FreeBSD.org [smtp.freebsd.org]:587"
	msgstr "<replaceable>yourusername</replaceable>@FreeBSD.org [smtp.freebsd.org]:587"

	#. (itstool) path: example/para
	-#: article.translate.xml:2341
	+#: article.translate.xml:2342
	msgid ""
	"Create <filename>/usr/local/etc/postfix/sasl_passwd</filename> with the "
	"following content:"
	@@ -4456,13 +4458,13 @@
	"conteúdo:"

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2345
	+#: article.translate.xml:2346
	#, no-wrap
	msgid "[smtp.freebsd.org]:587 <replaceable>yourusername</replaceable>:<replaceable>yourpassword</replaceable>"
	msgstr "[smtp.freebsd.org]:587 <replaceable>yourusername</replaceable>:<replaceable>yourpassword</replaceable>"

	#. (itstool) path: example/para
	-#: article.translate.xml:2347
	+#: article.translate.xml:2348
	msgid ""
	"If the email server is used by other people, you may want to prevent them "
	"from sending e-mails from your address. To achieve this, add this to your "
	@@ -4473,7 +4475,7 @@
	"adicione estas entradas ao seu <filename>main.cf</filename>:"

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2352
	+#: article.translate.xml:2353
	#, no-wrap
	msgid ""
	"smtpd_sender_login_maps = hash:/usr/local/etc/postfix/sender_login_maps\n"
	@@ -4483,7 +4485,7 @@
	"smtpd_sender_restrictions = reject_known_sender_login_mismatch"

	#. (itstool) path: example/para
	-#: article.translate.xml:2355
	+#: article.translate.xml:2356
	msgid ""
	"Create <filename>/usr/local/etc/postfix/sender_login_maps</filename> with "
	"the following content:"
	@@ -4492,13 +4494,13 @@
	"seguinte conteúdo:"

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2359
	+#: article.translate.xml:2360
	#, no-wrap
	msgid "<replaceable>yourusername</replaceable>@FreeBSD.org <replaceable>yourlocalusername</replaceable>"
	msgstr "<replaceable>yourusername</replaceable>@FreeBSD.org <replaceable>yourlocalusername</replaceable>"

	#. (itstool) path: example/para
	-#: article.translate.xml:2361
	+#: article.translate.xml:2362
	msgid ""
	"Where <replaceable>yourlocalusername</replaceable> is the <acronym>SASL</"
	"acronym> username used to connect to the local instance of "
	@@ -4509,12 +4511,12 @@
	"application>."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:2371
	+#: article.translate.xml:2372
	msgid "Mentors"
	msgstr "Mentores"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:2373
	+#: article.translate.xml:2374
	msgid ""
	"All new developers have a mentor assigned to them for the first few months. "
	"A mentor is responsible for teaching the mentee the rules and conventions of "
	@@ -4529,7 +4531,7 @@
	"aprendiz durante este período inicial."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:2380
	+#: article.translate.xml:2381
	msgid ""
	"For committers: do not commit anything without first getting mentor "
	"approval. Document that approval with an <literal>Approved by:</literal> "
	@@ -4540,7 +4542,7 @@
	"literal> na mensagem de commit."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:2385
	+#: article.translate.xml:2386
	msgid ""
	"When the mentor decides that a mentee has learned the ropes and is ready to "
	"commit on their own, the mentor announces it with a commit to <filename>conf/"
	@@ -4553,42 +4555,60 @@
	"<filename>svnadmin</filename> de cada repositório:"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2396
	+#: article.translate.xml:2397
	msgid "<literal>src</literal>"
	msgstr "<literal>src</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2397
	+#: article.translate.xml:2398
	msgid "<filename>base/svnadmin/conf/mentors</filename>"
	msgstr "<filename>base/svnadmin/conf/mentors</filename>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2401
	+#: article.translate.xml:2402
	msgid "<literal>doc</literal>"
	msgstr "<literal>doc</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2402
	+#: article.translate.xml:2403
	msgid "<filename>doc/svnadmin/conf/mentors</filename>"
	msgstr "<filename>doc/svnadmin/conf/mentors</filename>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2406
	+#: article.translate.xml:2407
	msgid "<literal>ports</literal>"
	msgstr "<literal>ports</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2407
	+#: article.translate.xml:2408
	msgid "<filename>ports/svnadmin/conf/mentors</filename>"
	msgstr "<filename>ports/svnadmin/conf/mentors</filename>"

	+#. (itstool) path: sect2/para
	+#: article.translate.xml:2414
	+msgid ""
	+"New committers should aim to complete enough commits that their mentor is "
	+"comfortable releasing them from mentorship within the first year. If they "
	+"are still under mentorship, the appropriate management body (core, doceng, "
	+"or portmgr) should attempt to ensure that there are no barriers preventing "
	+"completion. If the committer is unable to satisfy their mentor of readiness "
	+"by a year and a half their commit bit may be converted to project membership."
	+msgstr ""
	+"Os novos committers devem ter como objetivo realizar commits o suficiente "
	+"para que seu mentor se sinta confortável em liberá-los da mentoria no "
	+"primeiro ano. Se eles ainda estiverem sob orientação, o corpo gerencial "
	+"apropriado (core, doceng ou portmgr) deve tentar garantir que não haja "
	+"barreiras que impeçam a conclusão. Se o committer não for capaz de "
	+"satisfazer seu mentor de prontidão por um ano e meio, seu commit bit pode "
	+"ser convertido para membro do projeto."
	+
	#. (itstool) path: sect1/title
	-#: article.translate.xml:2416
	+#: article.translate.xml:2426
	msgid "Pre-Commit Review"
	msgstr "Revisão pré-commit"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2418
	+#: article.translate.xml:2428
	msgid ""
	"Code review is one way to increase the quality of software. The following "
	"guidelines apply to commits to the <literal>head</literal> (-CURRENT) branch "
	@@ -4605,7 +4625,7 @@
	"geralmente se aplicam a commits que exigem revisão:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2427
	+#: article.translate.xml:2437
	msgid ""
	"All non-trivial changes should be reviewed before they are committed to the "
	"repository."
	@@ -4614,7 +4634,7 @@
	"cometidas no repositório."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2432
	+#: article.translate.xml:2442
	msgid ""
	"Reviews may be conducted by email, in <application>Bugzilla</application>, "
	"in <application>Phabricator</application>, or by another mechanism. Where "
	@@ -4625,7 +4645,7 @@
	"mecanismo. Sempre que possível, as revisões devem ser públicas."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2439
	+#: article.translate.xml:2449
	msgid ""
	"The developer responsible for a code change is also responsible for making "
	"all necessary review-related changes."
	@@ -4634,7 +4654,7 @@
	"por fazer todas as alterações necessárias relacionadas à revisão."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2445
	+#: article.translate.xml:2455
	msgid ""
	"Code review can be an iterative process, which continues until the patch is "
	"ready to be committed. Specifically, once a patch is sent out for review, it "
	@@ -4650,12 +4670,12 @@
	"o método de revisão."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2454
	+#: article.translate.xml:2464
	msgid "Timeouts are not a substitute for review."
	msgstr "Timeouts não são um substituto para revisão."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2458
	+#: article.translate.xml:2468
	msgid ""
	"Sometimes code reviews will take longer than you would hope for, especially "
	"for larger features. Accepted ways to speed up review times for your patches "
	@@ -4666,7 +4686,7 @@
	"de revisão dos seus patches são:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2464
	+#: article.translate.xml:2474
	msgid ""
	"Review other people's patches. If you help out, everybody will be more "
	"willing to do the same for you; goodwill is our currency."
	@@ -4675,7 +4695,7 @@
	"dispostos a fazer o mesmo por você; A boa vontade é a nossa moeda."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2470
	+#: article.translate.xml:2480
	msgid ""
	"Ping the patch. If it is urgent, provide reasons why it is important to you "
	"to get this patch landed and ping it every couple of days. If it is not "
	@@ -4688,7 +4708,7 @@
	"está pedindo um tempo valioso de outros desenvolvedores profissionais."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2479
	+#: article.translate.xml:2489
	msgid ""
	"Ask for help on mailing lists, IRC, etc. Others may be able to either help "
	"you directly, or suggest a reviewer."
	@@ -4697,7 +4717,7 @@
	"diretamente ou sugerir um revisor."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2485
	+#: article.translate.xml:2495
	msgid ""
	"Split your patch into multiple smaller patches that build on each other. The "
	"smaller your patch, the higher the probability that somebody will take a "
	@@ -4708,7 +4728,7 @@
	"rápida olhada nele."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2490
	+#: article.translate.xml:2500
	msgid ""
	"When making large changes, it is helpful to keep this in mind from the "
	"beginning of the effort as breaking large changes into smaller ones is often "
	@@ -4719,7 +4739,7 @@
	"depois que estão prontas."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2497
	+#: article.translate.xml:2507
	msgid ""
	"Developers should participate in code reviews as both reviewers and "
	"reviewees. If someone is kind enough to review your code, you should return "
	@@ -4737,7 +4757,7 @@
	"regularmente."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2505
	+#: article.translate.xml:2515
	msgid ""
	"In some cases, no subject-matter expert may be available. In those cases, a "
	"review by an experienced developer is sufficient when coupled with "
	@@ -4748,12 +4768,12 @@
	"quando associada a testes apropriados."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:2511
	+#: article.translate.xml:2521
	msgid "Commit Log Messages"
	msgstr "Mensagens de Log de Commit"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2513
	+#: article.translate.xml:2523
	msgid ""
	"This section contains some suggestions and traditions for how commit logs "
	"are formatted."
	@@ -4762,7 +4782,7 @@
	"são formatados."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2516
	+#: article.translate.xml:2526
	msgid ""
	"As well as including an informative message with each commit, some "
	"additional information may be needed."
	@@ -4771,7 +4791,7 @@
	"informações adicionais podem ser necessárias."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2519
	+#: article.translate.xml:2529
	msgid ""
	"This information consists of one or more lines containing the key word or "
	"phrase, a colon, tabs for formatting, and then the additional information."
	@@ -4781,17 +4801,17 @@
	"adicionais."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2523
	+#: article.translate.xml:2533
	msgid "The key words or phrases are:"
	msgstr "As palavras ou frases-chave são:"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2529
	+#: article.translate.xml:2539
	msgid "<literal>PR:</literal>"
	msgstr "<literal>PR:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2530
	+#: article.translate.xml:2540
	msgid ""
	"The problem report (if any) which is affected (typically, by being closed) "
	"by this commit. Multiple PRs may be specified on one line, separated by "
	@@ -4802,12 +4822,12 @@
	"separados por vírgulas ou espaços."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2537
	+#: article.translate.xml:2547
	msgid "<literal>Submitted by:</literal>"
	msgstr "<literal>Submitted by:</literal>"

	#. (itstool) path: entry/para
	-#: article.translate.xml:2539
	+#: article.translate.xml:2549
	msgid ""
	"The name and e-mail address of the person that submitted the fix; for "
	"developers, just the username on the FreeBSD cluster."
	@@ -4816,7 +4836,7 @@
	"desenvolvedores, apenas o nome de usuário no cluster do FreeBSD."

	#. (itstool) path: entry/para
	-#: article.translate.xml:2543
	+#: article.translate.xml:2553
	msgid ""
	"If the submitter is the maintainer of the port being committed, include "
	"\"(maintainer)\" after the email address."
	@@ -4825,7 +4845,7 @@
	"commit, inclua \"(maintainer)\" após o endereço de e-mail."

	#. (itstool) path: entry/para
	-#: article.translate.xml:2547
	+#: article.translate.xml:2557
	msgid ""
	"Avoid obfuscating the email address of the submitter as this adds additional "
	"work when searching logs."
	@@ -4834,12 +4854,12 @@
	"adicional ao pesquisar os registros."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2554
	+#: article.translate.xml:2564
	msgid "<literal>Reviewed by:</literal>"
	msgstr "<literal>Reviewed by:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2555
	+#: article.translate.xml:2565
	msgid ""
	"The name and e-mail address of the person or people that reviewed the "
	"change; for developers, just the username on the FreeBSD cluster. If a patch "
	@@ -4852,12 +4872,12 @@
	"revisão foi favorável, basta incluir o nome da lista."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2564
	+#: article.translate.xml:2574
	msgid "<literal>Approved by:</literal>"
	msgstr "<literal>Approved by:</literal>"

	#. (itstool) path: entry/para
	-#: article.translate.xml:2565
	+#: article.translate.xml:2575
	msgid ""
	"The name and e-mail address of the person or people that approved the "
	"change; for developers, just the username on the FreeBSD cluster. It is "
	@@ -4874,7 +4894,7 @@
	"aprovados pela equipe de engenharia de release."

	#. (itstool) path: entry/para
	-#: article.translate.xml:2574
	+#: article.translate.xml:2584
	msgid ""
	"While under mentorship, get mentor approval before the commit. Enter the "
	"mentor's username in this field, and note that they are a mentor:"
	@@ -4884,13 +4904,13 @@
	"de que ele é um mentor:"

	#. (itstool) path: entry/screen
	-#: article.translate.xml:2578
	+#: article.translate.xml:2588
	#, no-wrap
	msgid "Approved by: <userinput><replaceable>username-of-mentor</replaceable> <literal>(mentor)</literal></userinput>"
	msgstr "Approved by: <userinput><replaceable>username-of-mentor</replaceable> <literal>(mentor)</literal></userinput>"

	#. (itstool) path: entry/para
	-#: article.translate.xml:2580
	+#: article.translate.xml:2590
	msgid ""
	"If a team approved these commits then include the team name followed by the "
	"username of the approver in parentheses. For example:"
	@@ -4899,18 +4919,18 @@
	"de usuário do aprovador entre parênteses. Por exemplo:"

	#. (itstool) path: entry/screen
	-#: article.translate.xml:2584
	+#: article.translate.xml:2594
	#, no-wrap
	msgid "Approved by: <userinput><literal>re</literal> (<replaceable>username</replaceable>)</userinput>"
	msgstr "Approved by: <userinput><literal>re</literal> (<replaceable>username</replaceable>)</userinput>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2588
	+#: article.translate.xml:2598
	msgid "<literal>Obtained from:</literal>"
	msgstr "<literal>Obtained from:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2589
	+#: article.translate.xml:2599
	msgid ""
	"The name of the project (if any) from which the code was obtained. Do not "
	"use this line for the name of an individual person."
	@@ -4919,12 +4939,12 @@
	"linha para o nome de uma pessoa individual."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2595
	+#: article.translate.xml:2605
	msgid "<literal>Sponsored by:</literal>"
	msgstr "<literal>Sponsored by:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2596
	+#: article.translate.xml:2606
	msgid ""
	"Sponsoring organizations for this change, if any. Separate multiple "
	"organizations with commas. If only a portion of the work was sponsored, or "
	@@ -4947,12 +4967,12 @@
	"Outros autores não foram patrocinados ou optaram por não listar o patrocínio."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2611
	+#: article.translate.xml:2621
	msgid "<literal>MFC after:</literal>"
	msgstr "<literal>MFC after:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2612
	+#: article.translate.xml:2622
	msgid ""
	"To receive an e-mail reminder to <acronym>MFC</acronym> at a later date, "
	"specify the number of days, weeks, or months after which an <acronym>MFC</"
	@@ -4963,12 +4983,12 @@
	"um <acronym>MFC</acronym> está planejado."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2619
	+#: article.translate.xml:2629
	msgid "<literal>MFC to:</literal>"
	msgstr "<literal>MFC to:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2620
	+#: article.translate.xml:2630
	msgid ""
	"If the commit should be merged to a subset of stable branches, specify the "
	"branch names."
	@@ -4977,12 +4997,12 @@
	"especifique os nomes das branchs."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2625
	+#: article.translate.xml:2635
	msgid "<literal>MFC with:</literal>"
	msgstr "<literal>MFC with:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2626
	+#: article.translate.xml:2636
	msgid ""
	"If the commit should be merged together with a previous one in a single "
	"<acronym>MFC</acronym> commit (for example, where this commit corrects a bug "
	@@ -4993,12 +5013,12 @@
	"alteração anterior), especifique o número de revisão correspondente."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2634
	+#: article.translate.xml:2644
	msgid "<literal>Relnotes:</literal>"
	msgstr "<literal>Relnotes:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2635
	+#: article.translate.xml:2645
	msgid ""
	"If the change is a candidate for inclusion in the release notes for the next "
	"release from the branch, set to <literal>yes</literal>."
	@@ -5007,12 +5027,12 @@
	"versão da branch, defina como <literal>yes</literal>."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2641
	+#: article.translate.xml:2651
	msgid "<literal>Security:</literal>"
	msgstr "<literal>Security:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2642
	+#: article.translate.xml:2652
	msgid ""
	"If the change is related to a security vulnerability or security exposure, "
	"include one or more references or a description of the issue. If possible, "
	@@ -5023,12 +5043,12 @@
	"problema. Se possível, inclua um URL VuXML ou um ID CVE."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2649
	+#: article.translate.xml:2659
	msgid "<literal>Event:</literal>"
	msgstr "<literal>Evento:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2650
	+#: article.translate.xml:2660
	msgid ""
	"The description for the event where this commit was made. If this is a "
	"recurring event, add the year or even the month to it. For example, this "
	@@ -5047,12 +5067,12 @@
	"determinados recursos ou desenvolvedores que trabalham neles."

	#. (itstool) path: row/entry
	-#: article.translate.xml:2663
	+#: article.translate.xml:2673
	msgid "<literal>Differential Revision:</literal>"
	msgstr "<literal>Differential Revision:</literal>"

	#. (itstool) path: row/entry
	-#: article.translate.xml:2664
	+#: article.translate.xml:2674
	msgid ""
	"The full URL of the Phabricator review. This line <emphasis>must be the last "
	"line</emphasis>. For example: <literal>https://reviews.freebsd.org/D1708</"
	@@ -5063,12 +5083,12 @@
	"D1708</literal>."

	#. (itstool) path: example/title
	-#: article.translate.xml:2674
	+#: article.translate.xml:2684
	msgid "Commit Log for a Commit Based on a PR"
	msgstr "Commit Log para um commit baseado em um PR"

	#. (itstool) path: example/para
	-#: article.translate.xml:2676
	+#: article.translate.xml:2686
	msgid ""
	"The commit is based on a patch from a PR submitted by John Smith. The commit "
	"message <quote>PR</quote> and <quote>Submitted by</quote> fields are filled.."
	@@ -5078,7 +5098,7 @@
	"preenchidos."

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2680
	+#: article.translate.xml:2690
	#, no-wrap
	msgid ""
	"...\n"
	@@ -5092,12 +5112,12 @@
	"\t Submitted by:\t John Smith <John.Smith@example.com>"

	#. (itstool) path: example/title
	-#: article.translate.xml:2687
	+#: article.translate.xml:2697
	msgid "Commit Log for a Commit Needing Review"
	msgstr "Commit log de um commit que precisa de revisão"

	#. (itstool) path: example/para
	-#: article.translate.xml:2689
	+#: article.translate.xml:2699
	msgid ""
	"The virtual memory system is being changed. After posting patches to the "
	"appropriate mailing list (in this case, <literal>freebsd-arch</literal>) and "
	@@ -5108,7 +5128,7 @@
	"arch</literal>) e as mudanças foram aprovadas."

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2694
	+#: article.translate.xml:2704
	#, no-wrap
	msgid ""
	"...\n"
	@@ -5120,12 +5140,12 @@
	"\t Reviewed by: -arch"

	#. (itstool) path: example/title
	-#: article.translate.xml:2700
	+#: article.translate.xml:2710
	msgid "Commit Log for a Commit Needing Approval"
	msgstr "Commit log de um commit que precisa de aprovação"

	#. (itstool) path: example/para
	-#: article.translate.xml:2702
	+#: article.translate.xml:2712
	msgid ""
	"Commit a port, after working with the listed MAINTAINER, who said to go "
	"ahead and commit."
	@@ -5134,7 +5154,7 @@
	"frente e executar o commit."

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2706
	+#: article.translate.xml:2716
	#, no-wrap
	msgid ""
	"...\n"
	@@ -5146,7 +5166,7 @@
	"\t Approved by:\t <replaceable>abc</replaceable> (maintainer)"

	#. (itstool) path: example/para
	-#: article.translate.xml:2710
	+#: article.translate.xml:2720
	msgid ""
	"Where <replaceable>abc</replaceable> is the account name of the person who "
	"approved."
	@@ -5155,18 +5175,18 @@
	"aprovou."

	#. (itstool) path: example/title
	-#: article.translate.xml:2715
	+#: article.translate.xml:2725
	msgid "Commit Log for a Commit Bringing in Code from OpenBSD"
	msgstr "Commit log de um commit que importa código do OpenBSD"

	#. (itstool) path: example/para
	-#: article.translate.xml:2718
	+#: article.translate.xml:2728
	msgid "Committing some code based on work done in the OpenBSD project."
	msgstr ""
	"Efetuando o commit de códigos baseados no trabalho feito no projeto OpenBSD."

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2721
	+#: article.translate.xml:2731
	#, no-wrap
	msgid ""
	"...\n"
	@@ -5178,7 +5198,7 @@
	"\t Obtained from: OpenBSD"

	#. (itstool) path: example/title
	-#: article.translate.xml:2727
	+#: article.translate.xml:2737
	msgid ""
	"Commit Log for a Change to FreeBSD-CURRENT with a Planned Commit to FreeBSD-"
	"STABLE to Follow at a Later Date."
	@@ -5187,7 +5207,7 @@
	"o FreeBSD-STABLE para seguir em uma data posterior."

	#. (itstool) path: example/para
	-#: article.translate.xml:2730
	+#: article.translate.xml:2740
	msgid ""
	"Committing some code which will be merged from FreeBSD-CURRENT into the "
	"FreeBSD-STABLE branch after two weeks."
	@@ -5196,7 +5216,7 @@
	"branch do FreeBSD-STABLE após duas semanas."

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2734
	+#: article.translate.xml:2744
	#, no-wrap
	msgid ""
	"...\n"
	@@ -5208,7 +5228,7 @@
	"MFC after: <replaceable>2 weeks</replaceable>"

	#. (itstool) path: example/para
	-#: article.translate.xml:2738
	+#: article.translate.xml:2748
	msgid ""
	"Where <replaceable>2</replaceable> is the number of days, weeks, or months "
	"after which an <acronym>MFC</acronym> is planned. The <replaceable>weeks</"
	@@ -5223,12 +5243,12 @@
	"literal>, <literal>meses</literal>."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2746
	+#: article.translate.xml:2756
	msgid "It is often necessary to combine these."
	msgstr "Muitas vezes é necessário combinar isso."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2748
	+#: article.translate.xml:2758
	msgid ""
	"Consider the situation where a user has submitted a PR containing code from "
	"the NetBSD project. Looking at the PR, the developer sees it is not an area "
	@@ -5245,18 +5265,18 @@
	"testes adequados."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2756
	+#: article.translate.xml:2766
	msgid ""
	"The extra information to include in the commit would look something like"
	msgstr "A informação extra para incluir no commit seria algo como"

	#. (itstool) path: example/title
	-#: article.translate.xml:2760
	+#: article.translate.xml:2770
	msgid "Example Combined Commit Log"
	msgstr "Exemplo de log de commit combinado"

	#. (itstool) path: example/programlisting
	-#: article.translate.xml:2762
	+#: article.translate.xml:2772
	#, no-wrap
	msgid ""
	"PR: 54321\n"
	@@ -5274,12 +5294,12 @@
	"Relnotes: yes"

	#. (itstool) path: sect1/title
	-#: article.translate.xml:2772
	+#: article.translate.xml:2782
	msgid "Preferred License for New Files"
	msgstr "Licença preferida para novos arquivos"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2774
	+#: article.translate.xml:2784
	msgid ""
	"The FreeBSD Project's full license policy can be found at <link xlink:href="
	"\"@@URL_RELPREFIX@@/internal/software-license.html\">https://www.FreeBSD.org/"
	@@ -5295,7 +5315,7 @@
	"de código fonte."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2779
	+#: article.translate.xml:2789
	msgid ""
	"The FreeBSD Project suggests and uses this text as the preferred license "
	"scheme:"
	@@ -5304,7 +5324,7 @@
	"preferencial:"

	#. (itstool) path: sect1/programlisting
	-#: article.translate.xml:2782
	+#: article.translate.xml:2792
	#, no-wrap
	msgid ""
	"/*-\n"
	@@ -5366,7 +5386,7 @@
	" */"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2811
	+#: article.translate.xml:2821
	msgid ""
	"The FreeBSD project strongly discourages the so-called \"advertising clause"
	"\" in new code. Due to the large number of contributors to the FreeBSD "
	@@ -5383,7 +5403,7 @@
	"para o seu código."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2819
	+#: article.translate.xml:2829
	msgid ""
	"The FreeBSD project discourages completely new licenses and variations on "
	"the standard licenses. New licenses require the approval of the Core Team "
	@@ -5400,7 +5420,7 @@
	"consequências não intencionais de uma licença mal formulada."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2827
	+#: article.translate.xml:2837
	msgid ""
	"Project policy dictates that code under some non-BSD licenses must be placed "
	"only in specific sections of the repository, and in some cases, compilation "
	@@ -5417,7 +5437,7 @@
	"licenciado GPL, APSL, CDDL, etc, não deve ser compilado no GENERIC."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2835
	+#: article.translate.xml:2845
	msgid ""
	"Developers are reminded that in open source, getting \"open\" right is just "
	"as important as getting \"source\" right, as improper handling of "
	@@ -5431,12 +5451,12 @@
	"do Core Team."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:2843
	+#: article.translate.xml:2853
	msgid "Keeping Track of Licenses Granted to the FreeBSD Project"
	msgstr "Acompanhando as Licenças Concedidas ao Projeto FreeBSD"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2846
	+#: article.translate.xml:2856
	msgid ""
	"Various software or data exist in the repositories where the FreeBSD project "
	"has been granted a special licence to be able to use them. A case in point "
	@@ -5455,7 +5475,7 @@
	"usa."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2854
	+#: article.translate.xml:2864
	msgid ""
	"It is clearly sensible to keep a record of any such license grants. To that "
	"end, the Core Team <email>core@FreeBSD.org</email> has decided to keep an "
	@@ -5473,7 +5493,7 @@
	"org</email> incluindo:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2863
	+#: article.translate.xml:2873
	msgid ""
	"Contact details for people or organizations granting the special license."
	msgstr ""
	@@ -5481,7 +5501,7 @@
	"especial."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2868
	+#: article.translate.xml:2878
	msgid ""
	"What files, directories etc. in the repositories are covered by the license "
	"grant including the revision numbers where any specially licensed material "
	@@ -5492,7 +5512,7 @@
	"material especialmente licenciado tenha sido incorporado."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2874
	+#: article.translate.xml:2884
	msgid ""
	"The date the license comes into effect from. Unless otherwise agreed, this "
	"will be the date the license was issued by the authors of the software in "
	@@ -5502,12 +5522,12 @@
	"a data em que a licença foi emitida pelos autores do software em questão."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2880
	+#: article.translate.xml:2890
	msgid "The license text."
	msgstr "O texto da licença."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2884
	+#: article.translate.xml:2894
	msgid ""
	"A note of any restrictions, limitations or exceptions that apply "
	"specifically to FreeBSD's usage of the licensed material."
	@@ -5516,12 +5536,12 @@
	"especificamente ao uso do material licenciado pelo FreeBSD."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2890
	+#: article.translate.xml:2900
	msgid "Any other relevant information."
	msgstr "Qualquer outra informação relevante."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2894
	+#: article.translate.xml:2904
	msgid ""
	"Once the Core Team <email>core@FreeBSD.org</email> is satisfied that all the "
	"necessary details have been gathered and are correct, the secretary will "
	@@ -5536,7 +5556,7 @@
	"como nosso registro permanente da concessão da licença."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2900
	+#: article.translate.xml:2910
	msgid ""
	"The license archive should contain only details of license grants; this is "
	"not the place for any discussions around licensing or other subjects. Access "
	@@ -5550,12 +5570,12 @@
	"email>."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:2907
	+#: article.translate.xml:2917
	msgid "Developer Relations"
	msgstr "Relações entre os Desenvolvedores"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2909
	+#: article.translate.xml:2919
	msgid ""
	"When working directly on your own code or on code which is already well "
	"established as your responsibility, then there is probably little need to "
	@@ -5578,7 +5598,7 @@
	"<varname>MAINTAINER</varname> listado no <filename>Makefile</filename>."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2922
	+#: article.translate.xml:2932
	msgid ""
	"To determine if an area of the tree is maintained, check the MAINTAINERS "
	"file at the root of the tree. If nobody is listed, scan the revision history "
	@@ -5599,7 +5619,7 @@
	"indicar uma falta de interesse na área afetada, vá em frente e faça o commit."

	#. (itstool) path: important/para
	-#: article.translate.xml:2934
	+#: article.translate.xml:2944
	msgid ""
	"Avoid sending private emails to maintainers. Other people might be "
	"interested in the conversation, not just the final output."
	@@ -5608,7 +5628,7 @@
	"estar interessadas na conversa, não apenas no resultado final."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2939
	+#: article.translate.xml:2949
	msgid ""
	"If there is any doubt about a commit for any reason at all, have it reviewed "
	"before committing. Better to have it flamed then and there rather than when "
	@@ -5625,7 +5645,7 @@
	"um sistema de controle de versão, podemos sempre alterá-lo de volta."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2948
	+#: article.translate.xml:2958
	msgid ""
	"Do not impugn the intentions of others. If they see a different solution to "
	"a problem, or even a different problem, it is probably not because they are "
	@@ -5640,7 +5660,7 @@
	"basicamente porque eles têm uma visão diferente do mundo. Diferente é bom."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2956
	+#: article.translate.xml:2966
	msgid ""
	"Disagree honestly. Argue your position from its merits, be honest about any "
	"shortcomings it may have, and be open to seeing their solution, or even "
	@@ -5652,7 +5672,7 @@
	"aberta."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2961
	+#: article.translate.xml:2971
	msgid ""
	"Accept correction. We are all fallible. When you have made a mistake, "
	"apologize and get on with life. Do not beat up yourself, and certainly do "
	@@ -5665,7 +5685,7 @@
	"apenas conserte o problema e siga em frente."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2967
	+#: article.translate.xml:2977
	msgid ""
	"Ask for help. Seek out (and give) peer reviews. One of the ways open source "
	"software is supposed to excel is in the number of eyeballs applied to it; "
	@@ -5677,12 +5697,12 @@
	"código."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:2974
	+#: article.translate.xml:2984
	msgid "If in Doubt..."
	msgstr "Se em dúvida..."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2976
	+#: article.translate.xml:2986
	msgid ""
	"When unsure about something, whether it be a technical issue or a project "
	"convention be sure to ask. If you stay silent you will never make progress."
	@@ -5692,7 +5712,7 @@
	"silêncio, nunca fará progressos."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2980
	+#: article.translate.xml:2990
	msgid ""
	"If it relates to a technical issue ask on the public mailing lists. Avoid "
	"the temptation to email the individual person that knows the answer. This "
	@@ -5703,38 +5723,38 @@
	"resposta. Dessa forma, todos poderão aprender com a pergunta e a resposta."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:2985
	+#: article.translate.xml:2995
	msgid "For project specific or administrative questions ask, in order:"
	msgstr ""
	"Para perguntas específicas ou administrativas do projeto, pergunte na "
	"seguinte ordem:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2990
	+#: article.translate.xml:3000
	msgid "Your mentor or former mentor."
	msgstr "Seu mentor ou ex-mentor."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2994
	+#: article.translate.xml:3004
	msgid "An experienced committer on IRC, email, etc."
	msgstr "Um committer experiente no IRC, email, etc."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:2998
	+#: article.translate.xml:3008
	msgid "Any team with a \"hat\", as they can give you a definitive answer."
	msgstr ""
	"Qualquer equipe com um \"hat\" (chapéu), uma vez que eles podem lhe dar uma "
	"resposta definitiva."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3003
	+#: article.translate.xml:3013
	msgid "If still not sure, ask on FreeBSD developers mailing list."
	msgstr ""
	"Se ainda não tiver certeza, pergunte na lista de discussão dos "
	"desenvolvedores do FreeBSD."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3007
	+#: article.translate.xml:3017
	msgid ""
	"Once your question is answered, if no one pointed you to documentation that "
	"spelled out the answer to your question, document it, as others will have "
	@@ -5745,12 +5765,12 @@
	"outros terão a mesma pergunta no futuro."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:3013
	+#: article.translate.xml:3023
	msgid "Bugzilla"
	msgstr "Bugzilla"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3015
	+#: article.translate.xml:3025
	msgid ""
	"The FreeBSD Project utilizes <application>Bugzilla</application> for "
	"tracking bugs and change requests. Be sure that if you commit a fix or "
	@@ -5765,7 +5785,7 @@
	"fechar qualquer PR associado aos seus commits, se apropriado."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3022
	+#: article.translate.xml:3032
	msgid ""
	"Committers with non-<systemitem class=\"domainname\">FreeBSD.org</"
	"systemitem> Bugzilla accounts can have the old account merged with the "
	@@ -5778,12 +5798,12 @@
	"passos:"

	#. (itstool) path: step/para
	-#: article.translate.xml:3030
	+#: article.translate.xml:3040
	msgid "Log in using your old account."
	msgstr "Faça o login usando sua conta antiga."

	#. (itstool) path: step/para
	-#: article.translate.xml:3034
	+#: article.translate.xml:3044
	msgid ""
	"Open new bug. Choose <literal>Services</literal> as the Product, and "
	"<literal>Bug Tracker</literal> as the Component. In bug description list "
	@@ -5794,7 +5814,7 @@
	"liste as contas que você deseja mesclar."

	#. (itstool) path: step/para
	-#: article.translate.xml:3041
	+#: article.translate.xml:3051
	msgid ""
	"Log in using <systemitem class=\"domainname\">FreeBSD.org</systemitem> "
	"account and post comment to newly opened bug to confirm ownership. See <xref "
	@@ -5809,7 +5829,7 @@
	"\">FreeBSD.org</systemitem>."

	#. (itstool) path: step/para
	-#: article.translate.xml:3047
	+#: article.translate.xml:3057
	msgid ""
	"If there are more than two accounts to merge, post comments from each of "
	"them."
	@@ -5818,13 +5838,13 @@
	"delas."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3052
	+#: article.translate.xml:3062
	msgid "You can find out more about <application>Bugzilla</application> at:"
	msgstr ""
	"Você pode descobrir mais sobre o <application>Bugzilla</application> em:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3057
	+#: article.translate.xml:3067
	msgid ""
	"<link xlink:href=\"@@URL_RELPREFIX@@/doc/en_US.ISO8859-1/articles/pr-"
	"guidelines/index.html\">FreeBSD Problem Report Handling Guidelines</link>"
	@@ -5834,7 +5854,7 @@
	"link>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3062
	+#: article.translate.xml:3072
	msgid ""
	"<link xlink:href=\"@@URL_RELPREFIX@@/support.html\">https://www.FreeBSD.org/"
	"support.html</link>"
	@@ -5843,12 +5863,12 @@
	"support.html</link>"

	#. (itstool) path: sect1/title
	-#: article.translate.xml:3068
	+#: article.translate.xml:3078
	msgid "Phabricator"
	msgstr "Phabricator"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3070
	+#: article.translate.xml:3080
	msgid ""
	"The FreeBSD Project utilizes <link xlink:href=\"https://reviews.freebsd.org"
	"\">Phabricator</link> for code review requests. See the <link xlink:href="
	@@ -5861,7 +5881,7 @@
	"no wiki para detalhes."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3074
	+#: article.translate.xml:3084
	msgid ""
	"Committers with non-<systemitem class=\"domainname\">FreeBSD.org</"
	"systemitem> Phabricator accounts can have the old account renamed to the "
	@@ -5874,7 +5894,7 @@
	"passos:"

	#. (itstool) path: step/para
	-#: article.translate.xml:3082
	+#: article.translate.xml:3092
	msgid ""
	"Change your <application>Phabricator</application> account email to your "
	"<systemitem class=\"domainname\">FreeBSD.org</systemitem> email."
	@@ -5883,7 +5903,7 @@
	"email <systemitem class=\"domainname\">FreeBSD.org</systemitem>."

	#. (itstool) path: step/para
	-#: article.translate.xml:3087
	+#: article.translate.xml:3097
	msgid ""
	"Open new bug on our bug tracker using your <systemitem class=\"domainname"
	"\">FreeBSD.org</systemitem> account, see <xref linkend=\"bugzilla\"/> for "
	@@ -5904,7 +5924,7 @@
	"<replaceable>bob_example.com</replaceable>/</literal>"

	#. (itstool) path: important/para
	-#: article.translate.xml:3100
	+#: article.translate.xml:3110
	msgid ""
	"<application>Phabricator</application> accounts cannot be merged, please do "
	"not open a new account."
	@@ -5913,12 +5933,12 @@
	"por favor, não abra uma nova conta."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:3106
	+#: article.translate.xml:3116
	msgid "Who's Who"
	msgstr "Quem é quem"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3108
	+#: article.translate.xml:3118
	msgid ""
	"Besides the repository meisters, there are other FreeBSD project members and "
	"teams whom you will probably get to know in your role as a committer. "
	@@ -5929,12 +5949,12 @@
	"committer. Resumidamente, e de forma alguma inclusivamente, estes são:"

	#. (itstool) path: varlistentry/term
	-#: article.translate.xml:3115
	+#: article.translate.xml:3125
	msgid "Documentation Engineering Team <email>doceng@FreeBSD.org</email>"
	msgstr "Equipe de Engenharia de Documentação <email>doceng@FreeBSD.org</email>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3118
	+#: article.translate.xml:3128
	msgid ""
	"doceng is the group responsible for the documentation build infrastructure, "
	"approving new documentation committers, and ensuring that the FreeBSD "
	@@ -5964,42 +5984,24 @@
	"do Projeto de Documentação</link>."

	#. (itstool) path: varlistentry/term
	-#: article.translate.xml:3134
	-msgid "Bruce Evans <email>bde@FreeBSD.org</email>"
	-msgstr "Bruce Evans <email>bde@FreeBSD.org</email>"
	-
	-#. (itstool) path: listitem/para
	-#: article.translate.xml:3137
	+#: article.translate.xml:3144
	msgid ""
	-"Bruce is the Style Police-Meister. When you do a commit that could have been "
	-"done better, Bruce will be there to tell you. Be thankful that someone is. "
	-"Bruce is also very knowledgeable on the various standards applicable to "
	-"FreeBSD."
	-msgstr ""
	-"Bruce é o Style Police-Meister. Quando você fizer um commit que poderia ter "
	-"sido feito melhor, Bruce estará lá para lhe contar. Seja grato que alguém "
	-"está. Bruce também é muito conhecedor dos vários padrões aplicáveis ao "
	-"FreeBSD."
	-
	-#. (itstool) path: varlistentry/term
	-#: article.translate.xml:3146
	-msgid ""
	"Glen Barber <email>gjb@FreeBSD.org</email>, Konstantin Belousov "
	"<email>kib@FreeBSD.org</email>, Bryan Drewery <email>bdrewery@FreeBSD.org</"
	"email>, Marc Fonvieille <email>blackend@FreeBSD.org</email>, Xin Li "
	-"<email>delphij@FreeBSD.org</email>, Hiroki Sato <email>hrs@FreeBSD.org</"
	-"email>, Gleb Smirnoff <email>glebius@FreeBSD.org</email>, Marius Strobl "
	-"<email>marius@FreeBSD.org</email>"
	+"<email>delphij@FreeBSD.org</email>, Colin Percival <email>cperciva@FreeBSD."
	+"org</email> Hiroki Sato <email>hrs@FreeBSD.org</email>, Gleb Smirnoff "
	+"<email>glebius@FreeBSD.org</email>"
	msgstr ""
	"Glen Barber <email>gjb@FreeBSD.org</email>, Konstantin Belousov "
	"<email>kib@FreeBSD.org</email>, Bryan Drewery <email>bdrewery@FreeBSD.org</"
	"email>, Marc Fonvieille <email>blackend@FreeBSD.org</email>, Xin Li "
	-"<email>delphij@FreeBSD.org</email>, Hiroki Sato <email>hrs@FreeBSD.org</"
	-"email>, Gleb Smirnoff <email>glebius@FreeBSD.org</email>, Marius Strobl "
	-"<email>marius@FreeBSD.org</email>"
	+"<email>delphij@FreeBSD.org</email>, Colin Percival <email>cperciva@FreeBSD."
	+"org</email> Hiroki Sato <email>hrs@FreeBSD.org</email>, Gleb Smirnoff "
	+"<email>glebius@FreeBSD.org</email>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3149
	+#: article.translate.xml:3147
	msgid ""
	"These are the members of the Release Engineering Team <email>re@FreeBSD.org</"
	"email>. This team is responsible for setting release deadlines and "
	@@ -6019,12 +6021,12 @@
	"pessoas com quem conversar sobre isso."

	#. (itstool) path: varlistentry/term
	-#: article.translate.xml:3161
	+#: article.translate.xml:3159
	msgid "Gordon Tetlow <email>gordon@FreeBSD.org</email>"
	msgstr "Gordon Tetlow <email>gordon@FreeBSD.org</email>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3164
	+#: article.translate.xml:3162
	msgid ""
	"Gordon Tetlow is the <link xlink:href=\"@@URL_RELPREFIX@@/security/"
	"\">FreeBSD Security Officer</link> and oversees the Security Officer Team "
	@@ -6035,12 +6037,12 @@
	"<email>security-officer@FreeBSD.org</email>."

	#. (itstool) path: varlistentry/term
	-#: article.translate.xml:3172
	+#: article.translate.xml:3170
	msgid "Garrett Wollman <email>wollman@FreeBSD.org</email>"
	msgstr "Garrett Wollman <email>wollman@FreeBSD.org</email>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3175
	+#: article.translate.xml:3173
	msgid ""
	"If you need advice on obscure network internals or are not sure of some "
	"potential change to the networking subsystem you have in mind, Garrett is "
	@@ -6053,12 +6055,12 @@
	"conhecedor dos vários padrões aplicáveis ao FreeBSD."

	#. (itstool) path: varlistentry/term
	-#: article.translate.xml:3184
	+#: article.translate.xml:3182
	msgid "FreeBSD committer's mailing list"
	msgstr "Lista de discussão dos committers do FreeBSD"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3187
	+#: article.translate.xml:3185
	msgid ""
	"<link xlink:href=\"http://lists.FreeBSD.org/mailman/listinfo/svn-src-all"
	"\">svn-src-all</link>, <link xlink:href=\"http://lists.FreeBSD.org/mailman/"
	@@ -6079,12 +6081,12 @@
	"curtas e estiverem diretamente relacionadas a um commit."

	#. (itstool) path: varlistentry/term
	-#: article.translate.xml:3198
	+#: article.translate.xml:3196
	msgid "FreeBSD developers mailing list"
	msgstr "Lista de discussão dos desenvolvedores do FreeBSD"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3201
	+#: article.translate.xml:3199
	msgid ""
	"All committers are subscribed to -developers. This list was created to be a "
	"forum for the committers <quote>community</quote> issues. Examples are Core "
	@@ -6095,7 +6097,7 @@
	"committers. Exemplos são a eleição do Core Team, anúncios, etc."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3206
	+#: article.translate.xml:3204
	msgid ""
	"The FreeBSD developers mailing list is for the exclusive use of FreeBSD "
	"committers. To develop FreeBSD, committers must have the ability to openly "
	@@ -6111,7 +6113,7 @@
	"FreeBSD."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3213
	+#: article.translate.xml:3211
	msgid ""
	"All FreeBSD committers are expected not to not publish or forward messages "
	"from the FreeBSD developers mailing list outside the list membership without "
	@@ -6128,7 +6130,7 @@
	"resultar na revogação permanente dos privilégios de commit."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3222
	+#: article.translate.xml:3220
	msgid ""
	"This list is <emphasis>not</emphasis> intended as a place for code reviews "
	"or for any technical discussion. In fact using it as such hurts the FreeBSD "
	@@ -6152,12 +6154,12 @@
	"FreeBSD. Fazer isso pode diminuir muito os benefícios dessa lista."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:3239
	+#: article.translate.xml:3237
	msgid "SSH Quick-Start Guide"
	msgstr "Guia de início rápido do SSH"

	#. (itstool) path: step/para
	-#: article.translate.xml:3243
	+#: article.translate.xml:3241
	msgid ""
	"If you do not wish to type your password in every time you use "
	"<citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></"
	@@ -6184,7 +6186,7 @@
	"refentrytitle><manvolnum>1</manvolnum></citerefentry> para detalhes."

	#. (itstool) path: step/para
	-#: article.translate.xml:3255
	+#: article.translate.xml:3253
	msgid ""
	"Generate a key pair using <citerefentry><refentrytitle>ssh-keygen</"
	"refentrytitle><manvolnum>1</manvolnum></citerefentry>. The key pair will "
	@@ -6195,7 +6197,7 @@
	"colocado no diretório <filename>$HOME/.ssh/</filename>."

	#. (itstool) path: important/para
	-#: article.translate.xml:3261
	+#: article.translate.xml:3259
	msgid ""
	"Only <acronym>ECDSA</acronym>, <acronym>Ed25519</acronym> or <acronym>RSA</"
	"acronym> keys are supported."
	@@ -6204,7 +6206,7 @@
	"<acronym>RSA</acronym> são suportadas."

	#. (itstool) path: step/para
	-#: article.translate.xml:3268
	+#: article.translate.xml:3266
	msgid ""
	"Send your public key (<filename>$HOME/.ssh/id_ecdsa.pub</filename>, "
	"<filename>$HOME/.ssh/id_ed25519.pub</filename>, or <filename>$HOME/.ssh/"
	@@ -6220,7 +6222,7 @@
	"ssh-keys/</filename> na <systemitem>freefall</systemitem>."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3281
	+#: article.translate.xml:3279
	msgid ""
	"Now <citerefentry><refentrytitle>ssh-add</refentrytitle><manvolnum>1</"
	"manvolnum></citerefentry> can be used for authentication once per session. "
	@@ -6237,7 +6239,7 @@
	"add -d</command> para remover as chaves armazenadas no agente."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3287
	+#: article.translate.xml:3285
	msgid ""
	"Test with a simple remote command: <command>ssh freefall.FreeBSD.org ls /"
	"usr</command>."
	@@ -6246,9 +6248,9 @@
	"usr</command>."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3290
	+#: article.translate.xml:3288
	msgid ""
	-"For more information, see <package>security/openssh</package>, "
	+"For more information, see <package>security/openssh-portable</package>, "
	"<citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></"
	"citerefentry>, <citerefentry><refentrytitle>ssh-add</"
	"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
	@@ -6258,9 +6260,9 @@
	"<citerefentry><refentrytitle>scp</refentrytitle><manvolnum>1</manvolnum></"
	"citerefentry>."
	msgstr ""
	-"Para obter mais informações, consulte <package>security/openssh</package>, "
	-"<citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></"
	-"citerefentry>, <citerefentry><refentrytitle>ssh-add</"
	+"Para obter mais informações, consulte <package>security/openssh-portable</"
	+"package>, <citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</"
	+"manvolnum></citerefentry>, <citerefentry><refentrytitle>ssh-add</"
	"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
	"<citerefentry><refentrytitle>ssh-agent</refentrytitle><manvolnum>1</"
	"manvolnum></citerefentry>, <citerefentry><refentrytitle>ssh-keygen</"
	@@ -6269,7 +6271,7 @@
	"citerefentry>."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3295
	+#: article.translate.xml:3293
	msgid ""
	"For information on adding, changing, or removing "
	"<citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></"
	@@ -6282,7 +6284,7 @@
	"clusteradm/ssh-keys\">este artigo</uri>."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:3301
	+#: article.translate.xml:3299
	msgid ""
	"<trademark class=\"registered\">Coverity</trademark> Availability for "
	"FreeBSD Committers"
	@@ -6291,7 +6293,7 @@
	"os Committers do FreeBSD"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3303
	+#: article.translate.xml:3301
	msgid ""
	"All FreeBSD developers can obtain access to <application>Coverity</"
	"application> analysis results of all FreeBSD Project software. All who are "
	@@ -6307,7 +6309,7 @@
	"uri>."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3310
	+#: article.translate.xml:3308
	msgid ""
	"The FreeBSD wiki includes a mini-guide for developers who are interested in "
	"working with the <trademark class=\"registered\">Coverity</trademark> "
	@@ -6326,7 +6328,7 @@
	"para adicioná-lo à lista de acesso apropriada do Wiki."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3317
	+#: article.translate.xml:3315
	msgid ""
	"Finally, all FreeBSD developers who are going to use <trademark class="
	"\"registered\">Coverity</trademark> are always encouraged to ask for more "
	@@ -6339,12 +6341,12 @@
	"lista de discussão dos desenvolvedores do FreeBSD."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:3324
	+#: article.translate.xml:3322
	msgid "The FreeBSD Committers' Big List of Rules"
	msgstr "A Grande Lista de Regras dos Committers do FreeBSD"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3326
	+#: article.translate.xml:3324
	msgid ""
	"Everyone involved with the FreeBSD project is expected to abide by the "
	"<emphasis>Code of Conduct</emphasis> available from <link xlink:href="
	@@ -6363,24 +6365,24 @@
	"específico para os committers."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3337 article.translate.xml:3444
	+#: article.translate.xml:3335 article.translate.xml:3442
	msgid "Respect other committers."
	msgstr "Respeite outros committers."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3341 article.translate.xml:3490
	+#: article.translate.xml:3339 article.translate.xml:3488
	msgid "Respect other contributors."
	msgstr "Respeite os outros colaboradores."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3345 article.translate.xml:3510
	+#: article.translate.xml:3343 article.translate.xml:3508
	msgid "Discuss any significant change <emphasis>before</emphasis> committing."
	msgstr ""
	"Discuta qualquer mudança significativa <emphasis>antes de</emphasis> fazer o "
	"commit."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3350
	+#: article.translate.xml:3348
	msgid ""
	"Respect existing maintainers (if listed in the <varname>MAINTAINER</varname> "
	"field in <filename>Makefile</filename> or in <filename>MAINTAINER</filename> "
	@@ -6391,7 +6393,7 @@
	"<filename>MAINTAINER</filename> no diretório de nível superior)."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3358 article.translate.xml:3555
	+#: article.translate.xml:3356 article.translate.xml:3553
	msgid ""
	"Any disputed change must be backed out pending resolution of the dispute if "
	"requested by a maintainer. Security related changes may override a "
	@@ -6403,7 +6405,7 @@
	"critério do Oficial de Segurança."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3365
	+#: article.translate.xml:3363
	msgid ""
	"Changes go to FreeBSD-CURRENT before FreeBSD-STABLE unless specifically "
	"permitted by the release engineer or unless they are not applicable to "
	@@ -6422,12 +6424,12 @@
	"STABLE, conforme descrito para o mantenedor na regra #5."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3376 article.translate.xml:3615
	+#: article.translate.xml:3374 article.translate.xml:3613
	msgid "Do not fight in public with other committers; it looks bad."
	msgstr "Não brigue em público com outros committers; parece ruim."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3381
	+#: article.translate.xml:3379
	msgid ""
	"Respect all code freezes and read the <literal>committers</literal> and "
	"<literal>developers</literal> mailing lists in a timely manner so you know "
	@@ -6438,17 +6440,17 @@
	"para que você saiba quando um congelamento de código está em vigor."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3388 article.translate.xml:3664
	+#: article.translate.xml:3386 article.translate.xml:3662
	msgid "When in doubt on any procedure, ask first!"
	msgstr "Em caso de dúvida em qualquer procedimento, pergunte primeiro!"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3392 article.translate.xml:3679
	+#: article.translate.xml:3390 article.translate.xml:3677
	msgid "Test your changes before committing them."
	msgstr "Teste suas alterações antes de fazer o commit."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3396 article.translate.xml:3699
	+#: article.translate.xml:3394 article.translate.xml:3697
	msgid ""
	"Do not commit to contributed software without <emphasis>explicit</emphasis> "
	"approval from the respective maintainers."
	@@ -6457,7 +6459,7 @@
	"emphasis> dos respectivos mantenedores."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3402
	+#: article.translate.xml:3400
	msgid ""
	"As noted, breaking some of these rules can be grounds for suspension or, "
	"upon repeated offense, permanent removal of commit privileges. Individual "
	@@ -6508,7 +6510,7 @@
	"sentirem que a decisão original é a correta."

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3430
	+#: article.translate.xml:3428
	msgid ""
	"In all other aspects of project operation, core is a subset of committers "
	"and is bound by the <emphasis>same rules</emphasis>. Just because someone is "
	@@ -6526,12 +6528,12 @@
	"principal são todos committers em primeiro lugar e core em segundo."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:3440
	+#: article.translate.xml:3438
	msgid "Details"
	msgstr "Detalhes"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3446
	+#: article.translate.xml:3444
	msgid ""
	"This means that you need to treat other committers as the peer-group "
	"developers that they are. Despite our occasional attempts to prove the "
	@@ -6551,7 +6553,7 @@
	"públicos e em emails privados."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3457
	+#: article.translate.xml:3455
	msgid ""
	"Being able to work together long term is this project's greatest asset, one "
	"far more important than any set of changes to the code, and turning "
	@@ -6566,7 +6568,7 @@
	"pena por qualquer estiramento concebível da imaginação."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3464
	+#: article.translate.xml:3462
	msgid ""
	"To comply with this rule, do not send email when you are angry or otherwise "
	"behave in a manner which is likely to strike others as needlessly "
	@@ -6599,7 +6601,7 @@
	"voluntária pelos envolvidos na reclamação."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3483
	+#: article.translate.xml:3481
	msgid ""
	"All of this is never an option which the project's leadership enjoys in the "
	"slightest, but unity comes first. No amount of code or good advice is worth "
	@@ -6610,7 +6612,7 @@
	"conselhos vale a pena se trocar desta forma."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3492
	+#: article.translate.xml:3490
	msgid ""
	"You were not always a committer. At one time you were a contributor. "
	"Remember that at all times. Remember what it was like trying to get help and "
	@@ -6632,7 +6634,7 @@
	"se tornar um committer. Sempre se lembre disso."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3504
	+#: article.translate.xml:3502
	msgid ""
	"Consider the points raised under <xref linkend=\"respect\"/> and apply them "
	"also to contributors."
	@@ -6641,7 +6643,7 @@
	"também aos contribuidores."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3513
	+#: article.translate.xml:3511
	msgid ""
	"The repository is not where changes are initially submitted for correctness "
	"or argued over, that happens first in the mailing lists or by use of the "
	@@ -6669,17 +6671,17 @@
	"ter o código revisado por um ou mais committers."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3530
	+#: article.translate.xml:3528
	msgid "When in doubt, ask for review!"
	msgstr "Em caso de dúvida, peça por uma revisão!"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3534
	+#: article.translate.xml:3532
	msgid "Respect existing maintainers if listed."
	msgstr "Respeite os mantenedores existentes, se listados."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3536
	+#: article.translate.xml:3534
	msgid ""
	"Many parts of FreeBSD are not <quote>owned</quote> in the sense that any "
	"specific individual will jump up and yell if you commit a change to "
	@@ -6711,7 +6713,7 @@
	"está trabalhando recentemente ou predominantemente naquela área."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3560
	+#: article.translate.xml:3558
	msgid ""
	"This may be hard to swallow in times of conflict (when each side is "
	"convinced that they are in the right, of course) but a version control "
	@@ -6742,7 +6744,7 @@
	"da discussão do tópico para descobrirmos se ele era adequado ou não."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3580
	+#: article.translate.xml:3578
	msgid ""
	"Changes go to FreeBSD-CURRENT before FreeBSD-STABLE unless specifically "
	"permitted by the release engineer or unless they are not applicable to "
	@@ -6760,7 +6762,7 @@
	"FreeBSD-STABLE, conforme descrito na regra #5."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3589
	+#: article.translate.xml:3587
	msgid ""
	"This is another <quote>do not argue about it</quote> issue since it is the "
	"release engineer who is ultimately responsible (and gets beaten up) if a "
	@@ -6794,7 +6796,7 @@
	"erros / erros de digitação, etc.) Em outras palavras, aplique o bom senso."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3608
	+#: article.translate.xml:3606
	msgid ""
	"Changes to the security branches (for example, <literal>releng/9.3</"
	"literal>) must be approved by a member of the Security Officer Team "
	@@ -6807,7 +6809,7 @@
	"membro da Equipe de Engenharia de Release<email>re@FreeBSD.org</email>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3618
	+#: article.translate.xml:3616
	msgid ""
	"This project has a public image to uphold and that image is very important "
	"to all of us, especially if we are to continue to attract new members. There "
	@@ -6854,7 +6856,7 @@
	"tomada por este terceiro."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3648
	+#: article.translate.xml:3646
	msgid ""
	"Respect all code freezes and read the <literal>committers</literal> and "
	"<literal>developers</literal> mailing list on a timely basis so you know "
	@@ -6865,7 +6867,7 @@
	"saber quando um congelamento de código está em vigor."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3653
	+#: article.translate.xml:3651
	msgid ""
	"Committing unapproved changes during a code freeze is a really big mistake "
	"and committers are expected to keep up-to-date on what is going on before "
	@@ -6883,7 +6885,7 @@
	"Groenlândia."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3666
	+#: article.translate.xml:3664
	msgid ""
	"Many mistakes are made because someone is in a hurry and just assumes they "
	"know the right way of doing something. If you have not done it before, "
	@@ -6902,7 +6904,7 @@
	"contrário, você não seria um committer."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3681
	+#: article.translate.xml:3679
	msgid ""
	"This may sound obvious, but if it really were so obvious then we probably "
	"would not see so many cases of people clearly not doing this. If your "
	@@ -6931,7 +6933,7 @@
	"compartilhados apropriados serão disponibilizados."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3703
	+#: article.translate.xml:3701
	msgid ""
	"Contributed software is anything under the <filename>src/contrib</filename>, "
	"<filename>src/crypto</filename>, or <filename>src/sys/contrib</filename> "
	@@ -6942,7 +6944,7 @@
	"<filename>src/sys/contrib</filename>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3708
	+#: article.translate.xml:3706
	msgid ""
	"The trees mentioned above are for contributed software usually imported onto "
	"a vendor branch. Committing something there may cause unnecessary headaches "
	@@ -6958,7 +6960,7 @@
	"no FreeBSD, desde que tenha a permissão do mantenedor."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3716
	+#: article.translate.xml:3714
	msgid ""
	"Reasons for modifying upstream software range from wanting strict control "
	"over a tightly coupled dependency to lack of portability in the canonical "
	@@ -6977,7 +6979,7 @@
	"precisam ser verificados manualmente a cada importação."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3726
	+#: article.translate.xml:3724
	msgid ""
	"If a particular piece of software lacks a maintainer, you are encouraged to "
	"take up ownership. If you are unsure of the current maintainership email "
	@@ -6991,12 +6993,12 @@
	"design do FreeBSD</link> e pergunte."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:3735
	+#: article.translate.xml:3733
	msgid "Policy on Multiple Architectures"
	msgstr "Política sobre Várias Arquiteturas"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3737
	+#: article.translate.xml:3735
	msgid ""
	"FreeBSD has added several new architecture ports during recent release "
	"cycles and is truly no longer an <trademark>i386</trademark> centric "
	@@ -7010,7 +7012,7 @@
	"este mandato:"

	#. (itstool) path: blockquote/para
	-#: article.translate.xml:3744
	+#: article.translate.xml:3742
	msgid ""
	"Our 32-bit reference platform is i386, and our 64-bit reference platform is "
	"amd64. Major design work (including major API and ABI changes) must prove "
	@@ -7026,7 +7028,7 @@
	"na árvore de fontes."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3752
	+#: article.translate.xml:3750
	msgid ""
	"The i386 and amd64 platforms were chosen due to being more readily available "
	"to developers and as representatives of more diverse processor and system "
	@@ -7042,7 +7044,7 @@
	"software, etc."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3759
	+#: article.translate.xml:3757
	msgid ""
	"We will continue to re-evaluate this policy as cost and availability of the "
	"64-bit platforms change."
	@@ -7051,7 +7053,7 @@
	"das plataformas de 64 bits mudam."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3762
	+#: article.translate.xml:3760
	msgid ""
	"Developers should also be aware of our Tier Policy for the long term support "
	"of hardware architectures. The rules here are intended to provide guidance "
	@@ -7069,12 +7071,12 @@
	"processo de desenvolvimento."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:3773
	+#: article.translate.xml:3771
	msgid "Other Suggestions"
	msgstr "Outras Sugestões"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3775
	+#: article.translate.xml:3773
	msgid ""
	"When committing documentation changes, use a spell checker before "
	"committing. For all XML docs, verify that the formatting directives are "
	@@ -7087,7 +7089,7 @@
	"<package>textproc/igor</package>."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3781
	+#: article.translate.xml:3779
	msgid ""
	"For manual pages, run <package>sysutils/manck</package> and "
	"<package>textproc/igor</package> over the manual page to verify all of the "
	@@ -7100,7 +7102,7 @@
	"página man possui todos os <varname>MLINK</varname>s apropriados instalados."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3788
	+#: article.translate.xml:3786
	msgid ""
	"Do not mix style fixes with new functionality. A style fix is any change "
	"which does not modify the functionality of the code. Mixing the changes "
	@@ -7122,12 +7124,12 @@
	"sejam claramente rotuladas como tal na mensagem de commit."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:3801
	+#: article.translate.xml:3799
	msgid "Deprecating Features"
	msgstr "Recursos Obsoletos (Deprecated)"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3803
	+#: article.translate.xml:3801
	msgid ""
	"When it is necessary to remove functionality from software in the base "
	"system, follow these guidelines whenever possible:"
	@@ -7136,7 +7138,7 @@
	"básico, siga estas diretrizes sempre que possível:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3809
	+#: article.translate.xml:3807
	msgid ""
	"Mention is made in the manual page and possibly the release notes that the "
	"option, utility, or interface is deprecated. Use of the deprecated feature "
	@@ -7147,7 +7149,7 @@
	"obsoleto gera um aviso."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3816
	+#: article.translate.xml:3814
	msgid ""
	"The option, utility, or interface is preserved until the next major (point "
	"zero) release."
	@@ -7156,7 +7158,7 @@
	"principal (ponto zero)."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3821
	+#: article.translate.xml:3819
	msgid ""
	"The option, utility, or interface is removed and no longer documented. It is "
	"now obsolete. It is also generally a good idea to note its removal in the "
	@@ -7167,17 +7169,17 @@
	"sua remoção nas notas de release."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:3830
	+#: article.translate.xml:3828
	msgid "Privacy and Confidentiality"
	msgstr "Privacidade e Confidencialidade"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3834
	+#: article.translate.xml:3832
	msgid "Most FreeBSD business is done in public."
	msgstr "A maioria dos negócios do FreeBSD é feita em público."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3836
	+#: article.translate.xml:3834
	msgid ""
	"FreeBSD is an <emphasis>open</emphasis> project. Which means that not only "
	"can anyone use the source code, but that most of the development process is "
	@@ -7188,13 +7190,13 @@
	"desenvolvimento está aberto ao escrutínio público."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3843
	+#: article.translate.xml:3841
	msgid "Certain sensitive matters must remain private or held under embargo."
	msgstr ""
	"Certos assuntos delicados devem permanecer privados ou mantidos sob embargo."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3846
	+#: article.translate.xml:3844
	msgid ""
	"There unfortunately cannot be complete transparency. As a FreeBSD developer "
	"you will have a certain degree of privileged access to information. "
	@@ -7211,7 +7213,7 @@
	"porém, é uma questão de não liberar comunicações privadas."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3857
	+#: article.translate.xml:3855
	msgid ""
	"The Security Officer has sole control over the release of security "
	"advisories."
	@@ -7220,7 +7222,7 @@
	"de segurança."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3860
	+#: article.translate.xml:3858
	msgid ""
	"Where there are security problems that affect many different operating "
	"systems, FreeBSD frequently depends on early access to be able to prepare "
	@@ -7242,7 +7244,7 @@
	"relevante para preparar as correções de segurança."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3874
	+#: article.translate.xml:3872
	msgid ""
	"Communications with Core are kept confidential for as long as necessary."
	msgstr ""
	@@ -7250,7 +7252,7 @@
	"necessário."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3877
	+#: article.translate.xml:3875
	msgid ""
	"Communications to core will initially be treated as confidential. Eventually "
	"however, most of Core's business will be summarized into the monthly or "
	@@ -7266,7 +7268,7 @@
	"nos arquivos privados do Core."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3887
	+#: article.translate.xml:3885
	msgid ""
	"Non-disclosure Agreements may be required for access to certain commercially "
	"sensitive data."
	@@ -7275,7 +7277,7 @@
	"determinados dados comercialmente sensíveis."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3890
	+#: article.translate.xml:3888
	msgid ""
	"Access to certain commercially sensitive data may only be available under a "
	"Non-Disclosure Agreement. The FreeBSD Foundation legal staff must be "
	@@ -7286,12 +7288,12 @@
	"FreeBSD deve ser consultado antes de qualquer acordo vinculativo ser firmado."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3897
	+#: article.translate.xml:3895
	msgid "Private communications must not be made public without permission."
	msgstr "Comunicações privadas não devem ser tornadas públicas sem permissão."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3900
	+#: article.translate.xml:3898
	msgid ""
	"Beyond the specific requirements above there is a general expectation not to "
	"publish private communications between developers without the consent of all "
	@@ -7306,7 +7308,7 @@
	"possa ser acessado por outros que não os correspondentes originais."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3910
	+#: article.translate.xml:3908
	msgid ""
	"Communications on project-only or restricted access channels must be kept "
	"private."
	@@ -7315,7 +7317,7 @@
	"mantidas em sigilo."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3913
	+#: article.translate.xml:3911
	msgid ""
	"Similarly to personal communications, certain internal communications "
	"channels, including FreeBSD Committer only mailing lists and restricted "
	@@ -7328,12 +7330,12 @@
	"permissão é necessária para publicar material dessas fontes."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3922
	+#: article.translate.xml:3920
	msgid "Core may approve publication."
	msgstr "O Core pode aprovar a publicação."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:3924
	+#: article.translate.xml:3922
	msgid ""
	"Where it is impractical to obtain permission due to the number of "
	"correspondents or where permission to publish is unreasonably withheld, Core "
	@@ -7346,12 +7348,12 @@
	"publicação mais geral."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:3935
	+#: article.translate.xml:3933
	msgid "Support for Multiple Architectures"
	msgstr "Suporte para Várias Arquiteturas"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:3937
	+#: article.translate.xml:3935
	msgid ""
	"FreeBSD is a highly portable operating system intended to function on many "
	"different types of hardware architectures. Maintaining clean separation of "
	@@ -7379,12 +7381,12 @@
	"alvo</quote> do FreeBSD."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:3952
	+#: article.translate.xml:3950
	msgid "Statement of General Intent"
	msgstr "Declaração de Intenção Geral"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3954
	+#: article.translate.xml:3952
	msgid ""
	"The FreeBSD Project targets \"production quality commercial off-the-shelf "
	"(COTS) workstation, server, and high-end embedded systems\". By retaining a "
	@@ -7411,7 +7413,7 @@
	"de manutenção no mundo real associado ao suporte adicional à plataforma."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3968
	+#: article.translate.xml:3966
	msgid ""
	"The FreeBSD Project differentiates platform targets into four tiers. Each "
	"tier includes a list of guarantees consumers may rely on as well as "
	@@ -7434,12 +7436,12 @@
	"para diferentes camadas em ramificações stable concorrentes."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:3982
	+#: article.translate.xml:3980
	msgid "Platform Targets"
	msgstr "Plataformas Alvo"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3984
	+#: article.translate.xml:3982
	msgid ""
	"Support for a hardware platform consists of two components: kernel support "
	"and userland Application Binary Interfaces (ABIs). Kernel platform support "
	@@ -7466,7 +7468,7 @@
	"convenções de chamada para funções C."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:3998
	+#: article.translate.xml:3996
	msgid ""
	"A FreeBSD kernel also uses an ABI (sometimes referred to as the Kernel "
	"Binary Interface (KBI)) which includes the semantics and layouts of public "
	@@ -7479,7 +7481,7 @@
	"dentro do próprio kernel."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4004
	+#: article.translate.xml:4002
	msgid ""
	"A FreeBSD kernel may support multiple userland ABIs. For example, FreeBSD's "
	"amd64 kernel supports FreeBSD amd64 and i386 userland ABIs as well as Linux "
	@@ -7497,7 +7499,7 @@
	"etc."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4012
	+#: article.translate.xml:4010
	msgid ""
	"Tiers are defined for both kernels and userland ABIs. In the common case, a "
	"platform's kernel and FreeBSD ABIs are assigned to the same tier."
	@@ -7507,12 +7509,12 @@
	"atribuídas à mesma Tier."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:4018
	+#: article.translate.xml:4016
	msgid "Tier 1: Fully-Supported Architectures"
	msgstr "Tier 1: Arquiteturas Completamente Suportadas"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4020
	+#: article.translate.xml:4018
	msgid ""
	"Tier 1 platforms are the most mature FreeBSD platforms. They are supported "
	"by the security officer, release engineering, and port management teams. "
	@@ -7527,7 +7529,7 @@
	"incluindo ambientes de instalação e desenvolvimento."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4027
	+#: article.translate.xml:4025
	msgid ""
	"The FreeBSD Project provides the following guarantees to consumers of Tier 1 "
	"platforms:"
	@@ -7536,7 +7538,7 @@
	"plataformas de Tier 1:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4032
	+#: article.translate.xml:4030
	msgid ""
	"Official FreeBSD release images will be provided by the release engineering "
	"team."
	@@ -7545,7 +7547,7 @@
	"engenharia de release."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4036
	+#: article.translate.xml:4034
	msgid ""
	"Binary updates and source patches for Security Advisories and Errata Notices "
	"will be provided for supported releases."
	@@ -7554,7 +7556,7 @@
	"para os Avisos de Segurança e Avisos de Erro das versões suportadas."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4041
	+#: article.translate.xml:4039
	msgid ""
	"Source patches for Security Advisories will be provided for supported "
	"branches."
	@@ -7563,7 +7565,7 @@
	"branches suportadas."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4045
	+#: article.translate.xml:4043
	msgid ""
	"Binary updates and source patches for cross-platform Security Advisories "
	"will typically be provided at the time of the announcement."
	@@ -7572,7 +7574,7 @@
	"para os avisos de segurança multiplataforma no momento do anúncio."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4050
	+#: article.translate.xml:4048
	msgid ""
	"Changes to userland ABIs will generally include compatibility shims to "
	"ensure correct operation of binaries compiled against any stable branch "
	@@ -7588,7 +7590,7 @@
	"da mesma estará claramente documentada nas notas de versão."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4059
	+#: article.translate.xml:4057
	msgid ""
	"Changes to certain portions of the kernel ABI will include compatibility "
	"shims to ensure correct operation of kernel modules compiled against the "
	@@ -7601,7 +7603,7 @@
	"todas as partes da ABI do kernel estão protegidas."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4066
	+#: article.translate.xml:4064
	msgid ""
	"Official binary packages for third party software will be provided by the "
	"ports team. For embedded architectures, these packages may be cross-built "
	@@ -7612,7 +7614,7 @@
	"compilados de forma cruzada a partir de uma arquitetura diferente."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4072
	+#: article.translate.xml:4070
	msgid ""
	"Most relevant ports should either build or have the appropriate filters to "
	"prevent inappropriate ones from building."
	@@ -7621,7 +7623,7 @@
	"prevenir a compilação dos inadequados."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4077
	+#: article.translate.xml:4075
	msgid ""
	"New features which are not inherently platform-specific will be fully "
	"functional on all Tier 1 architectures."
	@@ -7630,7 +7632,7 @@
	"totalmente funcionais em todas as arquiteturas de Tier 1."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4082
	+#: article.translate.xml:4080
	msgid ""
	"Features and compatibility shims used by binaries compiled against older "
	"stable branches may be removed in newer major versions. Such removals will "
	@@ -7642,7 +7644,7 @@
	"documentadas nas notas de versão."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4088
	+#: article.translate.xml:4086
	msgid ""
	"Tier 1 platforms should be fully documented. Basic operations will be "
	"documented in the FreeBSD Handbook."
	@@ -7651,12 +7653,12 @@
	"básicas serão documentadas no Handbook do FreeBSD."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4092
	+#: article.translate.xml:4090
	msgid "Tier 1 platforms will be included in the source tree."
	msgstr "As plataformas de Tier 1 serão incluídas na árvore de código fonte."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4096
	+#: article.translate.xml:4094
	msgid ""
	"Tier 1 platforms should be self-hosting either via the in-tree toolchain or "
	"an external toolchain. If an external toolchain is required, official binary "
	@@ -7668,7 +7670,7 @@
	"binários oficiais para o toolchain externo."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4103
	+#: article.translate.xml:4101
	msgid ""
	"To maintain maturity of Tier 1 platforms, the FreeBSD Project will maintain "
	"the following resources to support development:"
	@@ -7677,7 +7679,7 @@
	"manterá os seguintes recursos para apoiar o desenvolvimento:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4109
	+#: article.translate.xml:4107
	msgid ""
	"Build and test automation support either in the FreeBSD.org cluster or some "
	"other location easily available for all developers. Embedded platforms may "
	@@ -7690,7 +7692,7 @@
	"disponível no cluster FreeBSD.org por hardware real."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4116 article.translate.xml:4215
	+#: article.translate.xml:4114 article.translate.xml:4213
	msgid ""
	"Inclusion in the <userinput>make universe</userinput> and <userinput>make "
	"tinderbox</userinput> targets."
	@@ -7699,7 +7701,7 @@
	"<userinput>make tinderbox</userinput>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4120
	+#: article.translate.xml:4118
	msgid ""
	"Dedicated hardware in one of the FreeBSD clusters for package building "
	"(either natively or via qemu-user)."
	@@ -7708,7 +7710,7 @@
	"(nativamente ou via qemu-user)."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4126
	+#: article.translate.xml:4124
	msgid ""
	"Collectively, developers are required to provide the following to maintain "
	"the Tier 1 status of a platform:"
	@@ -7717,7 +7719,7 @@
	"status de Tier 1 de uma plataforma:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4131
	+#: article.translate.xml:4129
	msgid ""
	"Changes to the source tree should not knowingly break the build of a Tier 1 "
	"platform."
	@@ -7726,7 +7728,7 @@
	"compilação de uma plataforma de Tier 1."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4135
	+#: article.translate.xml:4133
	msgid ""
	"Tier 1 architectures must have a mature, healthy ecosystem of users and "
	"active developers."
	@@ -7735,7 +7737,7 @@
	"usuários e desenvolvedores ativos."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4139
	+#: article.translate.xml:4137
	msgid ""
	"Developers should be able to build packages on commonly available, non-"
	"embedded Tier 1 systems. This can mean either native builds if non-embedded "
	@@ -7749,7 +7751,7 @@
	"alguma outra arquitetura de Tier 1."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4147
	+#: article.translate.xml:4145
	msgid ""
	"Changes cannot break the userland ABI. If an ABI change is required, ABI "
	"compatibility for existing binaries should be provided via use of symbol "
	@@ -7761,7 +7763,7 @@
	"bibliotecas compartilhadas."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4153
	+#: article.translate.xml:4151
	msgid ""
	"Changes merged to stable branches cannot break the protected portions of the "
	"kernel ABI. If a kernel ABI change is required, the change should be "
	@@ -7773,12 +7775,12 @@
	"módulos existentes do kernel."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:4162
	+#: article.translate.xml:4160
	msgid "Tier 2: Developmental and Niche Architectures"
	msgstr "Tier 2: Arquiteturas de Desenvolvimento e Nicho"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4164
	+#: article.translate.xml:4162
	msgid ""
	"Tier 2 platforms are functional, but less mature FreeBSD platforms. They are "
	"not supported by the security officer, release engineering, and port "
	@@ -7789,7 +7791,7 @@
	"release e gerenciamento de ports."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4168
	+#: article.translate.xml:4166
	msgid ""
	"Tier 2 platforms may be Tier 1 platform candidates that are still under "
	"active development. Architectures reaching end of life may also be moved "
	@@ -7805,7 +7807,7 @@
	"suportadas também podem ser de Tier 2."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4175
	+#: article.translate.xml:4173
	msgid ""
	"The FreeBSD Project provides the following guarantees to consumers of Tier 2 "
	"platforms:"
	@@ -7814,7 +7816,7 @@
	"plataformas de Tier 2:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4180
	+#: article.translate.xml:4178
	msgid ""
	"The ports infrastructure should include basic support for Tier 2 "
	"architectures sufficient to support building ports and packages. This "
	@@ -7827,7 +7829,7 @@
	"garantia de que ports arbitrários serão compiláveis ou funcionais."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4188
	+#: article.translate.xml:4186
	msgid ""
	"New features which are not inherently platform-specific should be feasible "
	"on all Tier 2 architectures if not implemented."
	@@ -7836,12 +7838,12 @@
	"viáveis em todas as arquiteturas de Tier 2 se não implementados."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4193
	+#: article.translate.xml:4191
	msgid "Tier 2 platforms will be included in the source tree."
	msgstr "As plataformas de Tier 2 serão incluídas na árvore de código fonte."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4197
	+#: article.translate.xml:4195
	msgid ""
	"Tier 2 platforms should be self-hosting either via the in-tree toolchain or "
	"an external toolchain. If an external toolchain is required, official binary "
	@@ -7853,7 +7855,7 @@
	"binários oficiais para o toolchain externo."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4203
	+#: article.translate.xml:4201
	msgid ""
	"Tier 2 platforms should provide functional kernels and userlands even if an "
	"official release distribution is not provided."
	@@ -7862,7 +7864,7 @@
	"funcionais, mesmo que uma release oficial não seja provida."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4209
	+#: article.translate.xml:4207
	msgid ""
	"To maintain maturity of Tier 2 platforms, the FreeBSD Project will maintain "
	"the following resources to support development:"
	@@ -7871,7 +7873,7 @@
	"manterá os seguintes recursos para apoiar o desenvolvimento:"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4220
	+#: article.translate.xml:4218
	msgid ""
	"Collectively, developers are required to provide the following to maintain "
	"the Tier 2 status of a platform:"
	@@ -7880,7 +7882,7 @@
	"status de Tier 2 de uma plataforma:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4225
	+#: article.translate.xml:4223
	msgid ""
	"Changes to the source tree should not knowingly break the build of a Tier 2 "
	"platform."
	@@ -7889,7 +7891,7 @@
	"compilação de uma plataforma de Tier 2."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4229
	+#: article.translate.xml:4227
	msgid ""
	"Tier 2 architectures must have an active ecosystem of users and developers."
	msgstr ""
	@@ -7897,7 +7899,7 @@
	"desenvolvedores."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4233
	+#: article.translate.xml:4231
	msgid ""
	"While changes are permitted to break the userland ABI, the ABI should not be "
	"broken gratuitously. Significant userland ABI changes should be restricted "
	@@ -7908,7 +7910,7 @@
	"devem ser restritas às versões principais."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4239
	+#: article.translate.xml:4237
	msgid ""
	"New features that are not yet implemented on Tier 2 architectures should "
	"provide a means of disabling them on those architectures."
	@@ -7917,12 +7919,12 @@
	"devem fornecer um meio de desativá-los nessas arquiteturas."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:4247
	+#: article.translate.xml:4245
	msgid "Tier 3: Experimental Architectures"
	msgstr "Tier 3: Arquiteturas Experimentais"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4249
	+#: article.translate.xml:4247
	msgid ""
	"Tier 3 platforms have at least partial FreeBSD support. They are "
	"<emphasis>not</emphasis> supported by the security officer, release "
	@@ -7933,7 +7935,7 @@
	"engenharia de release e de gerenciamento de ports."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4254
	+#: article.translate.xml:4252
	msgid ""
	"Tier 3 platforms are architectures in the early stages of development, for "
	"non-mainstream hardware platforms, or which are considered legacy systems "
	@@ -7947,7 +7949,7 @@
	"repositório separado em vez do repositório de código fonte principal."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4261
	+#: article.translate.xml:4259
	msgid ""
	"The FreeBSD Project provides no guarantees to consumers of Tier 3 platforms "
	"and is not committed to maintaining resources to support development. Tier 3 "
	@@ -7960,18 +7962,18 @@
	"nem quaisquer ABIs do kernel ou de usuário são consideradas estáveis."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:4269
	+#: article.translate.xml:4267
	msgid "Tier 4: Unsupported Architectures"
	msgstr "Tier 4: Arquiteturas Não Suportadas"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4271
	+#: article.translate.xml:4269
	msgid "Tier 4 platforms are not supported in any form by the project."
	msgstr ""
	"As plataformas Tier 4 não são suportadas de nenhuma forma pelo projeto."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4274
	+#: article.translate.xml:4272
	msgid ""
	"All systems not otherwise classified are Tier 4 systems. When a platform "
	"transitions to Tier 4, all support for the platform is removed from the "
	@@ -7985,12 +7987,12 @@
	"uma branch suportada pelo ports."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:4282
	+#: article.translate.xml:4280
	msgid "Policy on Changing the Tier of an Architecture"
	msgstr "Política para Alteração do Tier de uma Arquitetura"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:4284
	+#: article.translate.xml:4282
	msgid ""
	"Systems may only be moved from one tier to another by approval of the "
	"FreeBSD Core Team, which shall make that decision in collaboration with the "
	@@ -8005,27 +8007,27 @@
	"de suporte ausentes devem ser atendidas antes que a promoção seja concluída."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:4294
	+#: article.translate.xml:4292
	msgid "Ports Specific FAQ"
	msgstr "FAQ específico dos Ports"

	#. (itstool) path: qandadiv/title
	-#: article.translate.xml:4298
	+#: article.translate.xml:4296
	msgid "Adding a New Port"
	msgstr "Adicionando um Novo Port"

	#. (itstool) path: question/para
	-#: article.translate.xml:4302
	+#: article.translate.xml:4300
	msgid "How do I add a new port?"
	msgstr "Como eu adiciono um novo port?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4306
	+#: article.translate.xml:4304
	msgid "First, please read the section about repository copies."
	msgstr "Primeiro, por favor leia a seção sobre cópias do repositório."

	#. (itstool) path: answer/para
	-#: article.translate.xml:4309
	+#: article.translate.xml:4307
	msgid ""
	"The easiest way to add a new port is the <command>addport</command> script "
	"located in the <filename>ports/Tools/scripts</filename> directory. It adds a "
	@@ -8052,13 +8054,13 @@
	"<email>crees@FreeBSD.org</email>, o mantenedor atual."

	#. (itstool) path: question/para
	-#: article.translate.xml:4325
	+#: article.translate.xml:4323
	msgid "Any other things I need to know when I add a new port?"
	msgstr ""
	"Existe qualquer outra coisa que preciso saber quando adiciono um novo port?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4330
	+#: article.translate.xml:4328
	msgid ""
	"Check the port, preferably to make sure it compiles and packages correctly. "
	"This is the recommended sequence:"
	@@ -8067,7 +8069,7 @@
	"empacotado corretamente. Essa é a seqüência recomendada:"

	#. (itstool) path: answer/screen
	-#: article.translate.xml:4334
	+#: article.translate.xml:4332
	#, no-wrap
	msgid ""
	"<prompt>#</prompt> <userinput>make install</userinput>\n"
	@@ -8087,7 +8089,7 @@
	"<prompt>#</prompt> <userinput>make package</userinput>"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4342
	+#: article.translate.xml:4340
	msgid ""
	"The <link xlink:href=\"@@URL_RELPREFIX@@/doc/en_US.ISO8859-1/books/porters-"
	"handbook/index.html\">Porters Handbook</link> contains more detailed "
	@@ -8098,7 +8100,7 @@
	"detalhadas."

	#. (itstool) path: answer/para
	-#: article.translate.xml:4346
	+#: article.translate.xml:4344
	msgid ""
	"Use <citerefentry vendor=\"ports\"><refentrytitle>portlint</"
	"refentrytitle><manvolnum>1</manvolnum></citerefentry> to check the syntax of "
	@@ -8111,7 +8113,7 @@
	"mas certifique-se de ter corrigido os mais simples."

	#. (itstool) path: answer/para
	-#: article.translate.xml:4351
	+#: article.translate.xml:4349
	msgid ""
	"If the port came from a submitter who has not contributed to the Project "
	"before, add that person's name to the <link xlink:href=\"@@URL_RELPREFIX@@/"
	@@ -8124,7 +8126,7 @@
	"\">Colaboradores Adicionais</link> da Lista de Colaboradores do FreeBSD."

	#. (itstool) path: answer/para
	-#: article.translate.xml:4357
	+#: article.translate.xml:4355
	msgid ""
	"Close the PR if the port came in as a PR. To close a PR, change the state to "
	"<literal>Issue Resolved</literal> and the resolution as <literal>Fixed</"
	@@ -8135,17 +8137,17 @@
	"literal>."

	#. (itstool) path: qandadiv/title
	-#: article.translate.xml:4366
	+#: article.translate.xml:4364
	msgid "Removing an Existing Port"
	msgstr "Removendo um port existente"

	#. (itstool) path: question/para
	-#: article.translate.xml:4370
	+#: article.translate.xml:4368
	msgid "How do I remove an existing port?"
	msgstr "Como faço para remover um port existente?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4374
	+#: article.translate.xml:4372
	msgid ""
	"First, please read the section about repository copies. Before you remove "
	"the port, you have to verify there are no other ports depending on it."
	@@ -8154,19 +8156,19 @@
	"remover o port, você deve verificar se não há outros ports dependendo dele."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4380
	+#: article.translate.xml:4378
	msgid "Make sure there is no dependency on the port in the ports collection:"
	msgstr "Certifique-se de que não haja dependência do port na coleção de ports:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4385
	+#: article.translate.xml:4383
	msgid "The port's PKGNAME appears in exactly one line in a recent INDEX file."
	msgstr ""
	"O PKGNAME do port aparece exatamente em uma linha em um arquivo INDEX "
	"recente."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4390
	+#: article.translate.xml:4388
	msgid ""
	"No other ports contains any reference to the port's directory or PKGNAME in "
	"their Makefiles"
	@@ -8175,7 +8177,7 @@
	"PKGNAME em seus Makefiles"

	#. (itstool) path: tip/para
	-#: article.translate.xml:4395
	+#: article.translate.xml:4393
	msgid ""
	"When using <application>Git</application>, consider using <command>git grep</"
	"command>, it is much faster than <command>grep -r</command>."
	@@ -8184,19 +8186,19 @@
	"grep</command>, ele é muito mais rápido que o <command>grep -r</command>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4405
	+#: article.translate.xml:4403
	msgid "Then, remove the port:"
	msgstr "Em seguida, remova o port:"

	#. (itstool) path: step/para
	-#: article.translate.xml:4409
	+#: article.translate.xml:4407
	msgid ""
	"Remove the port's files and directory with <command>svn remove</command>."
	msgstr ""
	"Remova os arquivos e o diretório do port com <command>svn remove</command>."

	#. (itstool) path: step/para
	-#: article.translate.xml:4414
	+#: article.translate.xml:4412
	msgid ""
	"Remove the <varname>SUBDIR</varname> listing of the port in the parent "
	"directory <filename>Makefile</filename>."
	@@ -8205,12 +8207,12 @@
	"do <filename>Makefile</filename>."

	#. (itstool) path: step/para
	-#: article.translate.xml:4420 article.translate.xml:4673
	+#: article.translate.xml:4418 article.translate.xml:4671
	msgid "Add an entry to <filename>ports/MOVED</filename>."
	msgstr "Adicione uma entrada em <filename>ports/MOVED</filename>."

	#. (itstool) path: step/para
	-#: article.translate.xml:4425
	+#: article.translate.xml:4423
	msgid ""
	"Search for entries in <filename>ports/security/vuxml/vuln.xml</filename> and "
	"adjust them accordingly. In particular, check for previous packages with the "
	@@ -8221,12 +8223,12 @@
	"novo nome e qual versão poderia incluir o novo port."

	#. (itstool) path: step/para
	-#: article.translate.xml:4433
	+#: article.translate.xml:4431
	msgid "Remove the port from <filename>ports/LEGAL</filename> if it is there."
	msgstr "Remova o port de <filename>ports/LEGAL</filename> se ele estiver lá."

	#. (itstool) path: answer/para
	-#: article.translate.xml:4441
	+#: article.translate.xml:4439
	msgid ""
	"Alternatively, you can use the <command>rmport</command> script, from "
	"<filename>ports/Tools/scripts</filename>. This script was written by Vasil "
	@@ -8244,22 +8246,22 @@
	"atual."

	#. (itstool) path: qandadiv/title
	-#: article.translate.xml:4452
	+#: article.translate.xml:4450
	msgid "Re-adding a Deleted Port"
	msgstr "Adicionando Novamente um Port que foi Removido"

	#. (itstool) path: question/para
	-#: article.translate.xml:4456
	+#: article.translate.xml:4454
	msgid "How do I re-add a deleted port?"
	msgstr "Como faço para adicionar novamente um port que foi removido?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4460
	+#: article.translate.xml:4458
	msgid "This is essentially the reverse of deleting a port."
	msgstr "Isto é essencialmente o contrário de deletar um port."

	#. (itstool) path: important/para
	-#: article.translate.xml:4464
	+#: article.translate.xml:4462
	msgid ""
	"Do not use <command>svn add</command> to add the port. Follow these steps. "
	"If they are unclear, or are not working, ask for help, do not just "
	@@ -8270,7 +8272,7 @@
	"execute apenas o <command>svn add</command> para o port."

	#. (itstool) path: step/para
	-#: article.translate.xml:4472
	+#: article.translate.xml:4470
	msgid ""
	"Figure out when the port was removed. Use this <link xlink:href=\"https://"
	"people.FreeBSD.org/~crees/removed_ports/index.xml\">list</link>, or look for "
	@@ -8283,7 +8285,7 @@
	"e copie a última revisão viva do porto:"

	#. (itstool) path: step/screen
	-#: article.translate.xml:4478
	+#: article.translate.xml:4476
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput>\n"
	@@ -8293,7 +8295,7 @@
	"<prompt>%</prompt> <userinput>svn cp 'svn+ssh://repo.freebsd.org/ports/head/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@<replaceable>XXXXXX</replaceable>' <replaceable>portname</replaceable></userinput>"

	#. (itstool) path: step/para
	-#: article.translate.xml:4481
	+#: article.translate.xml:4479
	msgid ""
	"Pick the revision that is just before the removal. For example, if the "
	"revision where it was removed is <literal>269874</literal>, use "
	@@ -8304,7 +8306,7 @@
	"<literal>269873</literal>."

	#. (itstool) path: step/para
	-#: article.translate.xml:4486
	+#: article.translate.xml:4484
	msgid ""
	"It is also possible to specify a date. In that case, pick a date that is "
	"before the removal but after the last commit to the port."
	@@ -8313,7 +8315,7 @@
	"da remoção, mas depois do último commit para o port."

	#. (itstool) path: step/screen
	-#: article.translate.xml:4490
	+#: article.translate.xml:4488
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput>\n"
	@@ -8323,7 +8325,7 @@
	"<prompt>%</prompt> <userinput>svn cp 'svn+ssh://repo.freebsd.org/ports/head/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@{<replaceable>YYYY-MM-DD</replaceable>}' <replaceable>portname</replaceable></userinput>"

	#. (itstool) path: step/para
	-#: article.translate.xml:4495
	+#: article.translate.xml:4493
	msgid ""
	"Make the changes necessary to get the port working again. If it was deleted "
	"because the distfiles are no longer available, either volunteer to host the "
	@@ -8334,7 +8336,7 @@
	"para hospedar os distfiles ou encontre outra pessoa para fazê-lo."

	#. (itstool) path: step/para
	-#: article.translate.xml:4503
	+#: article.translate.xml:4501
	msgid ""
	"If some files have been added, or were removed during the resurrection "
	"process, use <command>svn add</command> or <command>svn remove</command> to "
	@@ -8346,7 +8348,7 @@
	"no commit."

	#. (itstool) path: step/para
	-#: article.translate.xml:4511
	+#: article.translate.xml:4509
	msgid ""
	"Restore the <varname>SUBDIR</varname> listing of the port in the parent "
	"directory <filename>Makefile</filename>, keeping the entries sorted."
	@@ -8355,26 +8357,26 @@
	"<filename>Makefile</filename>, mantendo as entradas ordenadas."

	#. (itstool) path: step/para
	-#: article.translate.xml:4518
	+#: article.translate.xml:4516
	msgid "Delete the port entry from <filename>ports/MOVED</filename>."
	msgstr "Exclua a entrada do port de <filename>ports/MOVED</filename>."

	#. (itstool) path: step/para
	-#: article.translate.xml:4523
	+#: article.translate.xml:4521
	msgid ""
	"If the port had an entry in <filename>ports/LEGAL</filename>, restore it."
	msgstr ""
	"Se o port tiver uma entrada em <filename>ports/LEGAL</filename>, a restaure."

	#. (itstool) path: step/para
	-#: article.translate.xml:4528
	+#: article.translate.xml:4526
	msgid "<command>svn commit</command> these changes, preferably in one step."
	msgstr ""
	"Execute o <command>svn commit</command> para estas mudanças, de preferência "
	"no primeiro passo."

	#. (itstool) path: tip/para
	-#: article.translate.xml:4534
	+#: article.translate.xml:4532
	msgid ""
	"The <command>addport</command> script mentioned in <xref linkend=\"ports-qa-"
	"adding\"/> now detects when the port to add has previously existed, and "
	@@ -8387,17 +8389,17 @@
	"<filename>ports/LEGAL</filename>."

	#. (itstool) path: qandadiv/title
	-#: article.translate.xml:4545
	+#: article.translate.xml:4543
	msgid "Repository Copies"
	msgstr "Cópias de Repositório"

	#. (itstool) path: question/para
	-#: article.translate.xml:4549
	+#: article.translate.xml:4547
	msgid "When do we need a repository copy?"
	msgstr "Quando precisamos de uma cópia do repositório?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4553
	+#: article.translate.xml:4551
	msgid ""
	"When you want to add a port that is related to any port that is already in "
	"the tree in a separate directory, you have to do a repository copy. Here "
	@@ -8414,7 +8416,7 @@
	"m/windowmaker*</filename> (versão somente inglesa e internacionalizada)."

	#. (itstool) path: answer/para
	-#: article.translate.xml:4562
	+#: article.translate.xml:4560
	msgid ""
	"Another example is when a port is moved from one subdirectory to another, or "
	"when the name of a directory must be changed because the authors renamed "
	@@ -8425,28 +8427,28 @@
	"seu software mesmo sendo um descendente de um port que já esta em uma árvore."

	#. (itstool) path: question/para
	-#: article.translate.xml:4572
	+#: article.translate.xml:4570
	msgid "What do I need to do?"
	msgstr "O que eu preciso fazer?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4576
	+#: article.translate.xml:4574
	msgid "With Subversion, a repo copy can be done by any committer:"
	msgstr ""
	"Com o Subversion, uma cópia do repo pode ser feita por qualquer committer:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4581
	+#: article.translate.xml:4579
	msgid "Doing a repo copy:"
	msgstr "Fazendo uma cópia do repo:"

	#. (itstool) path: step/para
	-#: article.translate.xml:4585
	+#: article.translate.xml:4583
	msgid "Verify that the target directory does not exist."
	msgstr "Verifique se o diretório de destino não existe."

	#. (itstool) path: step/para
	-#: article.translate.xml:4590
	+#: article.translate.xml:4588
	msgid ""
	"Use <command>svn up</command> to make certain the original files, "
	"directories, and checkout information is current."
	@@ -8455,7 +8457,7 @@
	"diretórios e informações de checkout sejam atuais."

	#. (itstool) path: step/para
	-#: article.translate.xml:4596
	+#: article.translate.xml:4594
	msgid ""
	"Use <command>svn move</command> or <command>svn copy</command> to do the "
	"repo copy."
	@@ -8464,7 +8466,7 @@
	"fazer a cópia do repo."

	#. (itstool) path: step/para
	-#: article.translate.xml:4602
	+#: article.translate.xml:4600
	msgid ""
	"Upgrade the copied port to the new version. Remember to add or change the "
	"<varname>PKGNAMEPREFIX</varname> or <varname>PKGNAMESUFFIX</varname> so "
	@@ -8493,7 +8495,7 @@
	"<varname>PKGNAMESUFFIX</varname> é suficiente."

	#. (itstool) path: step/para
	-#: article.translate.xml:4626
	+#: article.translate.xml:4624
	msgid ""
	"Add the new subdirectory to the <varname>SUBDIR</varname> listing in the "
	"parent directory <filename>Makefile</filename>. You can run <command>make "
	@@ -8504,7 +8506,7 @@
	"<command>make checksubdirs</command> no diretório pai para verificar isso."

	#. (itstool) path: step/para
	-#: article.translate.xml:4634
	+#: article.translate.xml:4632
	msgid ""
	"If the port changed categories, modify the <varname>CATEGORIES</varname> "
	"line of the port's <filename>Makefile</filename> accordingly"
	@@ -8513,7 +8515,7 @@
	"varname> do <filename>Makefile</filename> do port adequadamente"

	#. (itstool) path: step/para
	-#: article.translate.xml:4640
	+#: article.translate.xml:4638
	msgid ""
	"Add an entry to <filename>ports/MOVED</filename>, if you remove the original "
	"port."
	@@ -8522,17 +8524,17 @@
	"port original."

	#. (itstool) path: step/para
	-#: article.translate.xml:4646
	+#: article.translate.xml:4644
	msgid "Commit all changes on one commit."
	msgstr "Faça o commit de todas as alterações de uma única vez."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4652
	+#: article.translate.xml:4650
	msgid "When removing a port:"
	msgstr "Ao remover um port:"

	#. (itstool) path: step/para
	-#: article.translate.xml:4656
	+#: article.translate.xml:4654
	msgid ""
	"Perform a thorough check of the ports collection for any dependencies on the "
	"old port location/name, and update them. Running <command>grep</command> on "
	@@ -8548,12 +8550,12 @@
	"recomendado."

	#. (itstool) path: step/para
	-#: article.translate.xml:4668
	+#: article.translate.xml:4666
	msgid "Remove the old port and the old <varname>SUBDIR</varname> entry."
	msgstr "Remova o port antigo e a entrada <varname>SUBDIR</varname> antiga."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4680
	+#: article.translate.xml:4678
	msgid ""
	"After repo moves (<quote>rename</quote> operations where a port is copied "
	"and the old location is removed):"
	@@ -8562,7 +8564,7 @@
	"port é copiado e o local antigo é removido):"

	#. (itstool) path: step/para
	-#: article.translate.xml:4686
	+#: article.translate.xml:4684
	msgid ""
	"Follow the same steps that are outlined in the previous two entries, to "
	"activate the new location of the port and remove the old one."
	@@ -8571,17 +8573,17 @@
	"novo local do port e remover o antigo."

	#. (itstool) path: qandadiv/title
	-#: article.translate.xml:4699
	+#: article.translate.xml:4697
	msgid "Ports Freeze"
	msgstr "Freeze do Ports"

	#. (itstool) path: question/para
	-#: article.translate.xml:4703
	+#: article.translate.xml:4701
	msgid "What is a <quote>ports freeze</quote>?"
	msgstr "O que é um <quote>ports freeze</quote>?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4707
	+#: article.translate.xml:4705
	msgid ""
	"A <quote>ports freeze</quote> was a restricted state the ports tree was put "
	"in before a release. It was used to ensure a higher quality for the packages "
	@@ -8598,7 +8600,7 @@
	"pacotes para os releases são compilados a partir da branch trimestral stable."

	#. (itstool) path: answer/para
	-#: article.translate.xml:4716
	+#: article.translate.xml:4714
	msgid ""
	"For more information on how to merge commits to the quarterly branch, see "
	"<xref linkend=\"ports-qa-misc-request-mfh\"/>."
	@@ -8607,12 +8609,12 @@
	"consulte <xref linkend=\"ports-qa-misc-request-mfh\"/>."

	#. (itstool) path: qandadiv/title
	-#: article.translate.xml:4723
	+#: article.translate.xml:4721
	msgid "Quarterly Branches"
	msgstr "Branches Trimestrais"

	#. (itstool) path: question/para
	-#: article.translate.xml:4727
	+#: article.translate.xml:4725
	msgid ""
	"What is the procedure to request authorization for merging a commit to the "
	"quarterly branch?"
	@@ -8621,7 +8623,7 @@
	"branch trimestral?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4732
	+#: article.translate.xml:4730
	msgid ""
	"When doing the commit, add the branch name to the <literal>MFH:</literal> "
	"line, for example:"
	@@ -8630,13 +8632,13 @@
	"por exemplo:"

	#. (itstool) path: answer/programlisting
	-#: article.translate.xml:4735
	+#: article.translate.xml:4733
	#, no-wrap
	msgid "MFH:\t<replaceable>2014Q1</replaceable>"
	msgstr "MFH:\t<replaceable>2014Q1</replaceable>"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4737
	+#: article.translate.xml:4735
	msgid ""
	"It will automatically notify the Ports Security Team <email>ports-"
	"secteam@FreeBSD.org</email> and the Ports Management Team "
	@@ -8649,7 +8651,7 @@
	"ser aplicado e responder com o procedimento."

	#. (itstool) path: answer/para
	-#: article.translate.xml:4742
	+#: article.translate.xml:4740
	msgid ""
	"If the commit has already been made, send an email to the Ports Security "
	"Team <email>ports-secteam@FreeBSD.org</email> and the Ports Management Team "
	@@ -8662,7 +8664,7 @@
	"pequena descrição de por que o commit precisa ser aplicado."

	#. (itstool) path: tip/para
	-#: article.translate.xml:4748
	+#: article.translate.xml:4746
	msgid ""
	"If the MFH is covered by a blanket approval, please explain why with a "
	"couple of words on the <literal>MFH</literal> line, so that the reviewing "
	@@ -8673,7 +8675,7 @@
	"ignorar esse commit e economizar tempo. Por exemplo:"

	#. (itstool) path: tip/programlisting
	-#: article.translate.xml:4754
	+#: article.translate.xml:4752
	#, no-wrap
	msgid ""
	"MFH: <replaceable>2014Q1 (runtime fix)</replaceable>\n"
	@@ -8683,7 +8685,7 @@
	"MFH: <replaceable>2014Q1 (browser blanket)</replaceable>"

	#. (itstool) path: tip/para
	-#: article.translate.xml:4757
	+#: article.translate.xml:4755
	msgid ""
	"The list of blanket approvals is available in <xref linkend=\"ports-qa-"
	"blanket\"/>."
	@@ -8692,13 +8694,13 @@
	"blanket\"/>."

	#. (itstool) path: question/para
	-#: article.translate.xml:4765
	+#: article.translate.xml:4763
	msgid "Are there any changes that can be merged without asking for approval?"
	msgstr ""
	"Existe alguma alteração para a qual possa ser feito o commit sem aprovação?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4770
	+#: article.translate.xml:4768
	msgid ""
	"The following blanket approvals for merging to the quarterly branches are in "
	"effect:"
	@@ -8707,7 +8709,7 @@
	"em vigor:"

	#. (itstool) path: note/para
	-#: article.translate.xml:4774
	+#: article.translate.xml:4772
	msgid ""
	"This blanket approval also applies to direct commits for ports that have "
	"been removed from <literal>head</literal>."
	@@ -8716,14 +8718,14 @@
	"foram removidos do <literal>head</literal>."

	#. (itstool) path: important/para
	-#: article.translate.xml:4780
	+#: article.translate.xml:4778
	msgid ""
	"These fixes <emphasis>must</emphasis> be tested on the quarterly branch."
	msgstr ""
	"Estas correções <emphasis>devem</emphasis> ser testadas na branch trimestral."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4787
	+#: article.translate.xml:4785
	msgid ""
	"Fixes that do not result in a change in contents of the resulting package. "
	"For example:"
	@@ -8732,7 +8734,7 @@
	"resultante. Por exemplo:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4792
	+#: article.translate.xml:4790
	msgid ""
	"<filename>pkg-descr</filename>: <literal>WWW:</literal> URL updates "
	"(existing 404, moved or incorrect)"
	@@ -8741,7 +8743,7 @@
	"(existing 404, moved or incorrect)"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4800
	+#: article.translate.xml:4798
	msgid ""
	"Build, runtime or packaging fixes, if the quarterly branch version is "
	"currently broken."
	@@ -8750,7 +8752,7 @@
	"branch trimestral estiver atualmente quebrada."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4805
	+#: article.translate.xml:4803
	msgid ""
	"Missing dependencies (detected, linked against but not registered via "
	"<varname><replaceable>*</replaceable>_DEPENDS</varname>)."
	@@ -8759,7 +8761,7 @@
	"de <varname><replaceable>*</replaceable>_DEPENDS</varname>)."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4811
	+#: article.translate.xml:4809
	msgid ""
	"Fixing <link xlink:href=\"@@URL_RELPREFIX@@/doc/en_US.ISO8859-1/books/"
	"porters-handbook/uses-shebangfix.html\">shebangs</link>, stripping installed "
	@@ -8770,7 +8772,7 @@
	"bibliotecas e binários instalados e correções de plst."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4817
	+#: article.translate.xml:4815
	msgid ""
	"Backport of security and reliability fixes which only result in "
	"<varname>PORTREVISION</varname> bumps and no changes to enabled features. "
	@@ -8782,7 +8784,7 @@
	"de buffer."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4824
	+#: article.translate.xml:4822
	msgid ""
	"Minor version changes that do nothing but fix security or crash-related "
	"issues."
	@@ -8791,18 +8793,18 @@
	"problemas de segurança ou relacionados a falhas."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4829
	+#: article.translate.xml:4827
	msgid "Adding/fixing <varname>CONFLICTS</varname>."
	msgstr "Adição/Conserto de <varname>CONFLICTS</varname>."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:4834
	+#: article.translate.xml:4832
	msgid "Web Browsers, browser plugins, and their required dependencies."
	msgstr ""
	"Navegadores Web, plug-ins do navegador e suas dependências necessárias."

	#. (itstool) path: important/para
	-#: article.translate.xml:4840
	+#: article.translate.xml:4838
	msgid ""
	"Commits that are not covered by these blanket approvals always require "
	"explicit approval of either Ports Security Team <email>ports-secteam@FreeBSD."
	@@ -8814,12 +8816,12 @@
	"<email>portmgr@FreeBSD.org</email>."

	#. (itstool) path: question/para
	-#: article.translate.xml:4849
	+#: article.translate.xml:4847
	msgid "What is the procedure for merging commits to the quarterly branch?"
	msgstr "Qual é o procedimento para aplicar os commits à branch trimestral?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4854
	+#: article.translate.xml:4852
	msgid ""
	"A script is provided to automate merging a specific commit: <filename>ports/"
	"Tools/scripts/mfh</filename>. It is used as follows:"
	@@ -8828,7 +8830,7 @@
	"<filename>ports/Tools/scripts/mfh</filename>. É usado da seguinte forma:"

	#. (itstool) path: answer/screen
	-#: article.translate.xml:4858
	+#: article.translate.xml:4856
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>/usr/ports/Tools/scripts/mfh 380362</userinput>\n"
	@@ -8950,7 +8952,7 @@
	"Do you want to commit? (no = start a shell) [y/n]"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4917
	+#: article.translate.xml:4915
	msgid ""
	"At that point, the script will either open a shell for you to fix things, or "
	"open your text editor with the commit message all prepared and then commit "
	@@ -8961,7 +8963,7 @@
	"irá aplicar o commit."

	#. (itstool) path: answer/para
	-#: article.translate.xml:4922
	+#: article.translate.xml:4920
	msgid ""
	"The script assumes that you can connect to <literal>repo.FreeBSD.org</"
	"literal> with <application>SSH</application> directly, so if your local "
	@@ -8974,7 +8976,7 @@
	"precisa de algumas linhas em seu <filename>~/.ssh/config</filename>:"

	#. (itstool) path: answer/programlisting
	-#: article.translate.xml:4929
	+#: article.translate.xml:4927
	#, no-wrap
	msgid ""
	"Host *.freebsd.org\n"
	@@ -8984,7 +8986,7 @@
	" User <replaceable>freebsd-login</replaceable>"

	#. (itstool) path: tip/para
	-#: article.translate.xml:4933
	+#: article.translate.xml:4931
	msgid ""
	"The script is also able to merge more than one revision at a time. If there "
	"have been other updates to the port since the branch was created that have "
	@@ -9005,13 +9007,13 @@
	"sendo feito com o novo commit."

	#. (itstool) path: tip/screen
	-#: article.translate.xml:4945
	+#: article.translate.xml:4943
	#, no-wrap
	msgid "<prompt>%</prompt> <userinput>/usr/ports/Tools/scripts/mfh r407208 r407713 r407722 r408567 r408943 r410728</userinput>"
	msgstr "<prompt>%</prompt> <userinput>/usr/ports/Tools/scripts/mfh r407208 r407713 r407722 r408567 r408943 r410728</userinput>"

	#. (itstool) path: note/para
	-#: article.translate.xml:4949
	+#: article.translate.xml:4947
	msgid ""
	"The mfh script can also take an optional first argument, the branch where "
	"the merge is being done. Only the latest quarterly branch is supported, so "
	@@ -9024,7 +9026,7 @@
	"emitirá um aviso se a branch trimestral não for a mais recente:"

	#. (itstool) path: note/screen
	-#: article.translate.xml:4956
	+#: article.translate.xml:4954
	#, no-wrap
	msgid ""
	"<prompt>%</prompt> <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713</userinput>\n"
	@@ -9034,17 +9036,17 @@
	"/!\\ The latest branch is 2016Q2, do you really want to commit to 2016Q1? [y/n]"

	#. (itstool) path: qandadiv/title
	-#: article.translate.xml:4964
	+#: article.translate.xml:4962
	msgid "Creating a New Category"
	msgstr "Criando uma Nova Categoria"

	#. (itstool) path: question/para
	-#: article.translate.xml:4968
	+#: article.translate.xml:4966
	msgid "What is the procedure for creating a new category?"
	msgstr "Qual é o procedimento para criar uma nova categoria?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:4973
	+#: article.translate.xml:4971
	msgid ""
	"Please see <link xlink:href=\"@@URL_RELPREFIX@@/doc/en_US.ISO8859-1/books/"
	"porters-handbook/makefile-categories.html#proposing-categories\"> Proposing "
	@@ -9061,14 +9063,14 @@
	"deles aprová-lo ou não. Se eles fizerem isso, é sua responsabilidade:"

	#. (itstool) path: step/para
	-#: article.translate.xml:4982
	+#: article.translate.xml:4980
	msgid "Perform any needed moves. (This only applies to physical categories.)"
	msgstr ""
	"Executar todos os passos necessários. (Isso só se aplica a categorias "
	"físicas.)"

	#. (itstool) path: step/para
	-#: article.translate.xml:4987
	+#: article.translate.xml:4985
	msgid ""
	"Update the <varname>VALID_CATEGORIES</varname> definition in <filename>ports/"
	"Mk/bsd.port.mk</filename>."
	@@ -9077,17 +9079,17 @@
	"<filename>ports/Mk/bsd.port.mk</filename>."

	#. (itstool) path: step/para
	-#: article.translate.xml:4993
	+#: article.translate.xml:4991
	msgid "Assign the PR back to you."
	msgstr "Atribua o PR de volta para você."

	#. (itstool) path: question/para
	-#: article.translate.xml:5001
	+#: article.translate.xml:4999
	msgid "What do I need to do to implement a new physical category?"
	msgstr "O que preciso fazer para implementar uma nova categoria física?"

	#. (itstool) path: step/para
	-#: article.translate.xml:5008
	+#: article.translate.xml:5006
	msgid ""
	"Upgrade each moved port's <filename>Makefile</filename>. Do not connect the "
	"new category to the build yet."
	@@ -9096,12 +9098,12 @@
	"nova categoria ao build ainda."

	#. (itstool) path: step/para
	-#: article.translate.xml:5012
	+#: article.translate.xml:5010
	msgid "To do this, you will need to:"
	msgstr "Para fazer isso, você precisará:"

	#. (itstool) path: step/para
	-#: article.translate.xml:5016
	+#: article.translate.xml:5014
	msgid ""
	"Change the port's <varname>CATEGORIES</varname> (this was the point of the "
	"exercise, remember?) The new category is listed <emphasis>first</emphasis>. "
	@@ -9113,7 +9115,7 @@
	"correto."

	#. (itstool) path: step/para
	-#: article.translate.xml:5026
	+#: article.translate.xml:5024
	msgid ""
	"Run a <command>make describe</command>. Since the top-level <command>make "
	"index</command> that you will be running in a few steps is an iteration of "
	@@ -9127,7 +9129,7 @@
	"esse passo mais tarde."

	#. (itstool) path: step/para
	-#: article.translate.xml:5037
	+#: article.translate.xml:5035
	msgid ""
	"If you want to be really thorough, now might be a good time to run "
	"<citerefentry vendor=\"ports\"><refentrytitle>portlint</"
	@@ -9138,7 +9140,7 @@
	"refentrytitle><manvolnum>1</manvolnum></citerefentry>."

	#. (itstool) path: step/para
	-#: article.translate.xml:5045
	+#: article.translate.xml:5043
	msgid ""
	"Check that the <varname>PKGORIGIN</varname>s are correct. The ports system "
	"uses each port's <varname>CATEGORIES</varname> entry to create its "
	@@ -9160,7 +9162,7 @@
	"citerefentry> irão falhar."

	#. (itstool) path: step/para
	-#: article.translate.xml:5054
	+#: article.translate.xml:5052
	msgid ""
	"To do this, use the <filename>chkorigin.sh</filename> tool: <command>env "
	"PORTSDIR=<replaceable>/path/to/ports</replaceable> sh -e <replaceable>/path/"
	@@ -9180,7 +9182,7 @@
	"ports que você acabou de mudar!"

	#. (itstool) path: step/para
	-#: article.translate.xml:5069
	+#: article.translate.xml:5067
	msgid ""
	"On your own local system, test the proposed changes: first, comment out the "
	"<varname>SUBDIR</varname> entries in the old ports' categories' "
	@@ -9203,7 +9205,7 @@
	"entanto, é um passo necessário para evitar problemas para outras pessoas."

	#. (itstool) path: step/para
	-#: article.translate.xml:5086
	+#: article.translate.xml:5084
	msgid ""
	"Once this is done, you can commit the updated <filename>ports/Makefile</"
	"filename> to connect the new category to the build and also commit the "
	@@ -9215,17 +9217,17 @@
	"categoria ou categorias antigas."

	#. (itstool) path: step/para
	-#: article.translate.xml:5094
	+#: article.translate.xml:5092
	msgid "Add appropriate entries to <filename>ports/MOVED</filename>."
	msgstr "Adicione as entradas apropriadas no <filename>ports/MOVED</filename>."

	#. (itstool) path: step/para
	-#: article.translate.xml:5099
	+#: article.translate.xml:5097
	msgid "Update the documentation by modifying:"
	msgstr "Atualize a documentação modificando:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5103 article.translate.xml:5151
	+#: article.translate.xml:5101 article.translate.xml:5149
	msgid ""
	"the <link xlink:href=\"@@URL_RELPREFIX@@/doc/en_US.ISO8859-1/books/porters-"
	"handbook/makefile-categories.html#PORTING-CATEGORIES\">list of categories</"
	@@ -9236,7 +9238,7 @@
	"link> no FreeBSD Porter's Handbook"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5109
	+#: article.translate.xml:5107
	msgid ""
	"<filename>doc/en_US.ISO8859-1/htdocs/ports</filename>. Note that these are "
	"now displayed by sub-groups, as specified in <filename>doc/en_US.ISO8859-1/"
	@@ -9247,7 +9249,7 @@
	"en_US.ISO8859-1/htdocs/ports/categories.descriptions</filename>."

	#. (itstool) path: step/para
	-#: article.translate.xml:5116
	+#: article.translate.xml:5114
	msgid ""
	"(Note: these are in the docs, not the ports, repository). If you are not a "
	"docs committer, you will need to submit a PR for this."
	@@ -9256,7 +9258,7 @@
	"doc committer, você precisará enviar um PR para isso."

	#. (itstool) path: step/para
	-#: article.translate.xml:5122
	+#: article.translate.xml:5120
	msgid ""
	"Only once all the above have been done, and no one is any longer reporting "
	"problems with the new ports, should the old ports be deleted from their "
	@@ -9267,7 +9269,7 @@
	"excluídos de seus locais anteriores no repositório."

	#. (itstool) path: answer/para
	-#: article.translate.xml:5129
	+#: article.translate.xml:5127
	msgid ""
	"It is not necessary to manually update the <link xlink:href="
	"\"@@URL_RELPREFIX@@/ports/index.html\">ports web pages</link> to reflect the "
	@@ -9282,12 +9284,12 @@
	"o rebuild automático do <filename>INDEX</filename>."

	#. (itstool) path: question/para
	-#: article.translate.xml:5141
	+#: article.translate.xml:5139
	msgid "What do I need to do to implement a new virtual category?"
	msgstr "O que preciso fazer para implementar uma nova categoria virtual?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5146
	+#: article.translate.xml:5144
	msgid ""
	"This is much simpler than a physical category. Only a few modifications are "
	"needed:"
	@@ -9296,18 +9298,18 @@
	"modificações são necessárias:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5157
	+#: article.translate.xml:5155
	msgid "<filename>en_US.ISO8859-1/htdocs/ports/categories</filename>"
	msgstr "<filename>en_US.ISO8859-1/htdocs/ports/categories</filename>"

	#. (itstool) path: qandadiv/title
	#. (itstool) path: sect1/title
	-#: article.translate.xml:5165 article.translate.xml:5480
	+#: article.translate.xml:5163 article.translate.xml:5478
	msgid "Miscellaneous Questions"
	msgstr "Perguntas Diversas"

	#. (itstool) path: question/para
	-#: article.translate.xml:5169
	+#: article.translate.xml:5167
	msgid ""
	"Are there changes that can be committed without asking the maintainer for "
	"approval?"
	@@ -9316,14 +9318,14 @@
	"do mantenedor?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5174
	+#: article.translate.xml:5172
	msgid "Blanket approval for most ports applies to these types of fixes:"
	msgstr ""
	"A aprovação implícita para a maioria dos ports se aplica a estes tipos de "
	"correções:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5179
	+#: article.translate.xml:5177
	msgid ""
	"Most infrastructure changes to a port (that is, modernizing, but not "
	"changing the functionality). For example, the blanket covers converting to "
	@@ -9336,14 +9338,14 @@
	"compilação e alterações para novas sintaxes de sistema do ports."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5188
	+#: article.translate.xml:5186
	msgid "Trivial and <emphasis>tested</emphasis> build and runtime fixes."
	msgstr ""
	"Trivialidades e correções <emphasis>testadas</emphasis> de compilação e "
	"execução."

	#. (itstool) path: important/para
	-#: article.translate.xml:5194
	+#: article.translate.xml:5192
	msgid ""
	"Exceptions to this are anything maintained by the Ports Management Team "
	"<email>portmgr@FreeBSD.org</email>, or the Security Officer Team "
	@@ -9356,12 +9358,12 @@
	"commit não autorizado pode ser feito em ports mantidos por esses grupos."

	#. (itstool) path: question/para
	-#: article.translate.xml:5205
	+#: article.translate.xml:5203
	msgid "How do I know if my port is building correctly or not?"
	msgstr "Como sei se meu port está sendo compilado corretamente ou não?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5210
	+#: article.translate.xml:5208
	msgid ""
	"The packages are built multiple times each week. If a port fails, the "
	"maintainer will receive an email from <literal>pkg-fallout@FreeBSD.org</"
	@@ -9371,7 +9373,7 @@
	"mantenedor receberá um email de <literal>pkg-fallout@FreeBSD.org</literal>."

	#. (itstool) path: answer/para
	-#: article.translate.xml:5214
	+#: article.translate.xml:5212
	msgid ""
	"Reports for all the package builds (official, experimental, and non-"
	"regression) are aggregated at <link xlink:href=\"https://pkg-status.freebsd."
	@@ -9382,14 +9384,14 @@
	"freebsd.org/\">pkg-status.FreeBSD.org</link>."

	#. (itstool) path: question/para
	-#: article.translate.xml:5222
	+#: article.translate.xml:5220
	msgid ""
	"I added a new port. Do I need to add it to the <filename>INDEX</filename>?"
	msgstr ""
	"Eu adicionei um novo port. Preciso adicioná-lo ao <filename>INDEX</filename>?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5227
	+#: article.translate.xml:5225
	msgid ""
	"No. The file can either be generated by running <command>make index</"
	"command>, or a pre-generated version can be downloaded with <command>make "
	@@ -9400,12 +9402,12 @@
	"fetchindex</command>."

	#. (itstool) path: question/para
	-#: article.translate.xml:5236
	+#: article.translate.xml:5234
	msgid "Are there any other files I am not allowed to touch?"
	msgstr "Existem outros arquivos que não tenho permissão para tocar?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5241
	+#: article.translate.xml:5239
	msgid ""
	"Any file directly under <filename>ports/</filename>, or any file under a "
	"subdirectory that starts with an uppercase letter (<filename>Mk/</filename>, "
	@@ -9422,7 +9424,7 @@
	"nesses arquivos, a menos que você queira enfrentar a sua ira."

	#. (itstool) path: question/para
	-#: article.translate.xml:5254
	+#: article.translate.xml:5252
	msgid ""
	"What is the proper procedure for updating the checksum for a port distfile "
	"when the file changes without a version change?"
	@@ -9431,7 +9433,7 @@
	"um port quando o arquivo é alterado sem uma alteração de versão?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5260
	+#: article.translate.xml:5258
	msgid ""
	"When the checksum for a distribution file is updated due to the author "
	"updating the file without changing the port revision, the commit message "
	@@ -9452,7 +9454,7 @@
	"para descobrir por que o distfile foi alterado."

	#. (itstool) path: question/para
	-#: article.translate.xml:5276
	+#: article.translate.xml:5274
	msgid ""
	"How can an experimental test build of the ports tree (<emphasis>exp-run</"
	"emphasis>) be requested?"
	@@ -9461,7 +9463,7 @@
	"emphasis>) pode ser solicitada?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5281
	+#: article.translate.xml:5279
	msgid ""
	"An exp-run must be completed before patches with a significant ports impact "
	"are committed. The patch can be against the ports tree or the base system."
	@@ -9471,7 +9473,7 @@
	"ports ou o sistema base."

	#. (itstool) path: answer/para
	-#: article.translate.xml:5285
	+#: article.translate.xml:5283
	msgid ""
	"Full package builds will be done with the patches provided by the submitter, "
	"and the submitter is required to fix detected problems (<emphasis>fallout</"
	@@ -9482,7 +9484,7 @@
	"(<emphasis>fallout</emphasis>) antes de fazer o commit."

	#. (itstool) path: step/para
	-#: article.translate.xml:5292
	+#: article.translate.xml:5290
	msgid ""
	"Go to the <link xlink:href=\"https://bugs.freebsd.org/submit\">Bugzilla new "
	"<acronym>PR</acronym> page</link>."
	@@ -9491,18 +9493,18 @@
	"de <acronym>PR</acronym> do Bugzilla</link>."

	#. (itstool) path: step/para
	-#: article.translate.xml:5297
	+#: article.translate.xml:5295
	msgid "Select the product your patch is about."
	msgstr "Selecione o produto ao qual seu patch se aplica."

	#. (itstool) path: step/para
	-#: article.translate.xml:5301
	+#: article.translate.xml:5299
	msgid "Fill in the bug report as normal. Remember to attach the patch."
	msgstr ""
	"Preencha o relatório de erros normalmente. Lembre-se de anexar o patch."

	#. (itstool) path: step/para
	-#: article.translate.xml:5306
	+#: article.translate.xml:5304
	msgid ""
	"If at the top it says <quote>Show Advanced Fields</quote> click on it. It "
	"will now say <quote>Hide Advanced Fields</quote>. Many new fields will be "
	@@ -9515,7 +9517,7 @@
	"não precisa fazer nada."

	#. (itstool) path: step/para
	-#: article.translate.xml:5315
	+#: article.translate.xml:5313
	msgid ""
	"In the <quote>Flags</quote> section, set the <quote>exp-run</quote> one to "
	"<literal>?</literal>. As for all other fields, hovering the mouse over any "
	@@ -9526,12 +9528,12 @@
	"qualquer campo mostrará mais detalhes."

	#. (itstool) path: step/para
	-#: article.translate.xml:5322
	+#: article.translate.xml:5320
	msgid "Submit. Wait for the build to run."
	msgstr "Envie. Aguarde a build ser executada."

	#. (itstool) path: step/para
	-#: article.translate.xml:5326
	+#: article.translate.xml:5324
	msgid ""
	"Ports Management Team <email>portmgr@FreeBSD.org</email> will reply with a "
	"possible fallout."
	@@ -9540,12 +9542,12 @@
	"responderá com uma possível fallout."

	#. (itstool) path: step/para
	-#: article.translate.xml:5331
	+#: article.translate.xml:5329
	msgid "Depending on the fallout:"
	msgstr "Dependendo do fallout:"

	#. (itstool) path: step/para
	-#: article.translate.xml:5335
	+#: article.translate.xml:5333
	msgid ""
	"If there is no fallout, the procedure stops here, and the change can be "
	"committed, pending any other approval required."
	@@ -9555,7 +9557,7 @@
	"necessária."

	#. (itstool) path: step/para
	-#: article.translate.xml:5343
	+#: article.translate.xml:5341
	msgid ""
	"If there is fallout, it <emphasis>must</emphasis> be fixed, either by fixing "
	"the ports directly in the ports tree, or adding to the submitted patch."
	@@ -9565,7 +9567,7 @@
	"enviado."

	#. (itstool) path: step/para
	-#: article.translate.xml:5351
	+#: article.translate.xml:5349
	msgid ""
	"When this is done, go back to step 6 saying the fallout was fixed and wait "
	"for the exp-run to be run again. Repeat as long as there are broken ports."
	@@ -9575,12 +9577,12 @@
	"necessário enquanto houver ports quebrados."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:5368
	+#: article.translate.xml:5366
	msgid "Issues Specific to Developers Who Are Not Committers"
	msgstr "Problemas Específicos para Desenvolvedores Que Não São Committers"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:5371
	+#: article.translate.xml:5369
	msgid ""
	"A few people who have access to the FreeBSD machines do not have commit "
	"bits. Almost all of this document will apply to these developers as well "
	@@ -9593,17 +9595,17 @@
	"que os acompanham). Em particular, recomendamos que você leia:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5379
	+#: article.translate.xml:5377
	msgid "<link linkend=\"admin\">Administrative Details</link>"
	msgstr "<link linkend=\"admin\">Detalhes Administrativos</link>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5384
	+#: article.translate.xml:5382
	msgid "<link linkend=\"conventions-everyone\">Conventions</link>"
	msgstr "<link linkend=\"conventions-everyone\">Convenções</link>"

	#. (itstool) path: note/para
	-#: article.translate.xml:5387
	+#: article.translate.xml:5385
	msgid ""
	"Get your mentor to add you to the <quote>Additional Contributors</quote> "
	"(<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.additional.xml</"
	@@ -9614,19 +9616,19 @@
	"additional.xml</filename>), se você ainda não estiver listado há."

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5395
	+#: article.translate.xml:5393
	msgid "<link linkend=\"developer.relations\">Developer Relations</link>"
	msgstr ""
	"<link linkend=\"developer.relations\">Relações entre os Desenvolvedores</"
	"link>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5400
	+#: article.translate.xml:5398
	msgid "<link linkend=\"ssh.guide\">SSH Quick-Start Guide</link>"
	msgstr "<link linkend=\"ssh.guide\">Guia de início rápido do SSH</link>"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5405
	+#: article.translate.xml:5403
	msgid ""
	"<link linkend=\"rules\">The FreeBSD Committers' Big List of Rules</link>"
	msgstr ""
	@@ -9634,12 +9636,12 @@
	"link>"

	#. (itstool) path: sect1/title
	-#: article.translate.xml:5413
	+#: article.translate.xml:5411
	msgid "Information About Google Analytics"
	msgstr "Informações sobre o Google Analytics"

	#. (itstool) path: sect1/para
	-#: article.translate.xml:5415
	+#: article.translate.xml:5413
	msgid ""
	"As of December 12, 2012, Google Analytics was enabled on the FreeBSD Project "
	"website to collect anonymized usage statistics regarding usage of the site. "
	@@ -9652,12 +9654,12 @@
	"do FreeBSD, para identificar vários problemas no site do FreeBSD."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:5422
	+#: article.translate.xml:5420
	msgid "Google Analytics General Policy"
	msgstr "Política Geral do Google Analytics"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5424
	+#: article.translate.xml:5422
	msgid ""
	"The FreeBSD Project takes visitor privacy very seriously. As such, the "
	"FreeBSD Project website honors the <quote>Do Not Track</quote> header "
	@@ -9672,7 +9674,7 @@
	"privacy.html\">Política de Privacidade do FreeBSD</link>."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5432
	+#: article.translate.xml:5430
	msgid ""
	"Google Analytics access is <emphasis>not</emphasis> arbitrarily allowed — "
	"access must be requested, voted on by the Documentation Engineering Team "
	@@ -9683,7 +9685,7 @@
	"de Documentação <email>doceng@FreeBSD.org</email> e explicitamente concedido."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5436
	+#: article.translate.xml:5434
	msgid ""
	"Requests for Google Analytics data must include a specific purpose. For "
	"example, a valid reason for requesting access would be <quote>to see the "
	@@ -9697,7 +9699,7 @@
	"renderização da página sejam aceitáveis.</quote>"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5442
	+#: article.translate.xml:5440
	msgid ""
	"Conversely, <quote>to see what web browsers are most frequently used</quote> "
	"(without stating <emphasis>why</emphasis>) would be rejected."
	@@ -9706,7 +9708,7 @@
	"quote> (sem declarar <emphasis>por que</emphasis>) seria rejeitado."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5446
	+#: article.translate.xml:5444
	msgid ""
	"All requests must include the timeframe for which the data would be "
	"required. For example, it must be explicitly stated if the requested data "
	@@ -9719,7 +9721,7 @@
	"período de 3 semanas, ou se o pedido seria para acessar apenas uma vez."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5452
	+#: article.translate.xml:5450
	msgid ""
	"Any request for Google Analytics data without a clear, reasonable reason "
	"beneficial to the FreeBSD Project will be rejected."
	@@ -9728,38 +9730,38 @@
	"que beneficie o Projeto FreeBSD será rejeitado."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:5458
	+#: article.translate.xml:5456
	msgid "Data Available Through Google Analytics"
	msgstr "Dados disponíveis por meio do Google Analytics"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5460
	+#: article.translate.xml:5458
	msgid "A few examples of the types of Google Analytics data available include:"
	msgstr ""
	"Alguns exemplos dos tipos de dados do Google Analytics disponíveis incluem:"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5465
	+#: article.translate.xml:5463
	msgid "Commonly used web browsers"
	msgstr "Navegadores Web comumente usados"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5469
	+#: article.translate.xml:5467
	msgid "Page load times"
	msgstr "Tempos de carregamento de páginas"

	#. (itstool) path: listitem/para
	-#: article.translate.xml:5473
	+#: article.translate.xml:5471
	msgid "Site access by language"
	msgstr "Acesso ao site por idioma"

	#. (itstool) path: question/para
	-#: article.translate.xml:5485
	+#: article.translate.xml:5483
	msgid "How do I add a new file to a branch?"
	msgstr "Como adiciono um novo arquivo a uma branch?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5489
	+#: article.translate.xml:5487
	msgid ""
	"To add a file onto a branch, simply checkout or update to the branch you "
	"want to add to and then add the file using the add operation as you normally "
	@@ -9778,7 +9780,7 @@
	"primer\"> Subversion Primer</link> para detalhes sobre como executar um MFC."

	#. (itstool) path: question/para
	-#: article.translate.xml:5504
	+#: article.translate.xml:5502
	msgid ""
	"How do I access <systemitem class=\"fqdomainname\">people.FreeBSD.org</"
	"systemitem> to put up personal or project information?"
	@@ -9787,7 +9789,7 @@
	"systemitem> para colocar informações pessoais ou de projeto?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5509
	+#: article.translate.xml:5507
	msgid ""
	"<systemitem class=\"fqdomainname\">people.FreeBSD.org</systemitem> is the "
	"same as <systemitem class=\"fqdomainname\">freefall.FreeBSD.org</"
	@@ -9804,12 +9806,12 @@
	"\">https://people.FreeBSD.org/</uri>."

	#. (itstool) path: question/para
	-#: article.translate.xml:5519
	+#: article.translate.xml:5517
	msgid "Where are the mailing list archives stored?"
	msgstr "Onde estão armazenados os arquivos da lista de discussão?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5523
	+#: article.translate.xml:5521
	msgid ""
	"The mailing lists are archived under <filename>/local/mail</filename> on "
	"<systemitem class=\"fqdomainname\">freefall.FreeBSD.org</systemitem>."
	@@ -9818,7 +9820,7 @@
	"<systemitem class=\"fqdomainname\">freefall.FreeBSD.org</systemitem>."

	#. (itstool) path: question/para
	-#: article.translate.xml:5530
	+#: article.translate.xml:5528
	msgid ""
	"I would like to mentor a new committer. What process do I need to follow?"
	msgstr ""
	@@ -9826,7 +9828,7 @@
	"seguir?"

	#. (itstool) path: answer/para
	-#: article.translate.xml:5535
	+#: article.translate.xml:5533
	msgid ""
	"See the <link xlink:href=\"https://www.freebsd.org/internal/new-account.html"
	"\">New Account Creation Procedure</link> document on the internal pages."
	@@ -9836,17 +9838,17 @@
	"internas."

	#. (itstool) path: sect1/title
	-#: article.translate.xml:5544
	+#: article.translate.xml:5542
	msgid "Benefits and Perks for FreeBSD Committers"
	msgstr "Benefícios e vantagens para os Commiters do FreeBSD"

	#. (itstool) path: sect2/title
	-#: article.translate.xml:5547
	+#: article.translate.xml:5545
	msgid "Recognition"
	msgstr "Reconhecimento"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5549
	+#: article.translate.xml:5547
	msgid ""
	"Recognition as a competent software engineer is the longest lasting value. "
	"In addition, getting a chance to work with some of the best people that "
	@@ -9857,12 +9859,12 @@
	"pessoas que todos os engenheiros sonham em conhecer é um grande privilégio!"

	#. (itstool) path: sect2/title
	-#: article.translate.xml:5556
	+#: article.translate.xml:5554
	msgid "FreeBSD Mall"
	msgstr "FreeBSD Mall"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5558
	+#: article.translate.xml:5556
	msgid ""
	"FreeBSD committers can get a free 4-CD or DVD set at conferences from <link "
	"xlink:href=\"http://www.freebsdmall.com\">FreeBSD Mall, Inc.</link>."
	@@ -9872,12 +9874,12 @@
	"em conferências."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:5565
	+#: article.translate.xml:5563
	msgid "<acronym>IRC</acronym>"
	msgstr "<acronym>IRC</acronym>"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5567
	+#: article.translate.xml:5565
	msgid ""
	"In addition, developers may request a cloaked hostmask for their account on "
	"the Freenode IRC network in the form of <literal>freebsd/developer/</"
	@@ -9894,12 +9896,12 @@
	"com o nome da sua hostmask solicitada e nome da conta no NickServ."

	#. (itstool) path: sect2/title
	-#: article.translate.xml:5579
	+#: article.translate.xml:5577
	msgid "<systemitem class=\"domainname\">Gandi.net</systemitem>"
	msgstr "<systemitem class=\"domainname\">Gandi.net</systemitem>"

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5581
	+#: article.translate.xml:5579
	msgid ""
	"Gandi provides website hosting, cloud computing, domain registration, and "
	"X.509 certificate services."
	@@ -9908,7 +9910,7 @@
	"domínio e serviços de certificados X.509."

	#. (itstool) path: sect2/para
	-#: article.translate.xml:5584
	+#: article.translate.xml:5582
	msgid ""
	"Gandi offers an E-rate discount to all FreeBSD developers. Send mail to "
	"<email>non-profit@gandi.net</email> using your <literal>@freebsd.org</"

File Metadata

Mime Type: text/plain
Expires: Mon, Apr 20, 8:13 AM (12 h, 17 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 31827379
Default Alt Text: D27313.id79852.diff (274 KB)

D27313.id79852.diffNo OneTemporaryActions

D27313.id79852.diffView Options

File Metadata

Event Timeline

D27313.id79852.diff
No OneTemporary
Actions

D27313.id79852.diff
View Options