[Cvs-cvs] ccvs/doc/i18n/pt_BR cvs.texinfo glossary

[Fred Ulisses Maranhão]

CVSROOT:        /sources/cvs
Module name:    ccvs
Changes by:     Fred Ulisses Maranhão <fred_maranhao>  06/08/06 22:55:46

Modified files:
        doc/i18n/pt_BR : cvs.texinfo glossary 

Log message:
        translation of admin section incomplete. I will skip the rest of the 
        section. admins know english more than users.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/i18n/pt_BR/cvs.texinfo?cvsroot=cvs&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/i18n/pt_BR/glossary?cvsroot=cvs&r1=1.8&r2=1.9

Patches:
Index: cvs.texinfo
===================================================================
RCS file: /sources/cvs/ccvs/doc/i18n/pt_BR/cvs.texinfo,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- cvs.texinfo 3 Feb 2006 23:25:57 -0000       1.41
+++ cvs.texinfo 6 Aug 2006 22:55:46 -0000       1.42
@@ -6664,10 +6664,10 @@
 @c <en>copy the changes onto another branch.
 Mais tarde você pode mover as mudanças de um ramo para
 outro (ou para o tronco principal) com uma
address@hidden  Mesclar é primeiro rodar um @code{cvs
-update -j}, para mesclar as mudanças no seu diretório
-de trabalho.  Depois efetivar (commit) esta revisão, e
-finalmente fazer a efetiva destas mudanças de um ramo
address@hidden  A mesclagem baseia-se em primeiro rodar um
address@hidden update -j}, para mesclar as mudanças no seu diretório
+de trabalho.  Depois você pode efetivar (commit) esta revisão,
+fazendo efetivamente as mudanças de um ramo
 para outro.
 
 @menu
@@ -6721,14 +6721,14 @@
 @c <en>of the sources are in a state of flux and are not expected to be stable
 @c <en>for at least another month.  There is no way to make a
 @c <en>bugfix release based on the newest sources.
-Suponha que a release 1.0 de tc está pronta.  Você está
+Suponha que a release 1.0 de tc está pronta.  Você
 continua desenvolvendo tc, e planeja lançar a release
 1.1 em alguns meses.  Depois de um tempo seus
 consumidores começam a reclamar de um erro fatal.  Você
 baixa a release 1.0 (@pxref{Etiquetas}) e encontra o
 erro (que tem um conserto fácil).  Entretanto, a
 revisão atual dos fontes está num estado do fluxo de
-desenvolvimento que você não espera que estaja estável
+desenvolvimento que você não espera que esteja estável
 em pelo menos um mês.  Não tem jeito de lançar uma
 release baseada nos fontes mais novos.
 
@@ -6743,7 +6743,7 @@
 arquivos que integram a release 1.0 de tc.  Você pode
 então fazer modificações no ramo sem perturbar o tronco
 principal.  Quando as modificações terminarem você pode
-decidir se incorporam elas ao tronco ou deixa elas no ramo.
+decidir se incorpora elas ao tronco ou deixa elas no ramo.
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 @c <en>@node Creating a branch
@@ -6919,7 +6919,7 @@
 @c <en>copy will add new revisions on that branch, while
 @c <en>leaving the main trunk and other branches unaffected.
 Uma vez que você tenha uma cópia de trabalho referente
-a um dado, ela continua no ramo até que se diga o
+a um dado ramo, ela continua no ramo até que se diga o
 contrário.  Isto significa que mudanças inseridas a
 partir da cópia de trabalho vão adicionar novas
 revisões naquele ramo, enquanto que não afeta o tronco
@@ -7234,7 +7234,7 @@
 diretório de trabalho passando a opção @samp{-j
 @var{nome_do_ramo}} para o subcomando @code{update}.
 Com uma opção @samp{-j @var{nome_do_ramo}} ele mescla
-as mudançãs feitas entre o maior ancestral comum
+as mudanças feitas entre o maior ancestral comum
 (greatest common ancestor - GCA) do ramo e a revisão de
 destino (no caso mais simples abaixo, o GCA é o ponto
 onde o ramo bifurcou) e a nova revisão neste ramo na
@@ -7540,7 +7540,7 @@
 dinâmica (@samp{-j @var{branchname}}) para mesclar
 mudanças a partir de um ramo normalmente não vai
 remover arquivos que foram removidos do ramo, já que o
address@hidden não adiona etiquetas estáticas a revisões
address@hidden não adiciona etiquetas estáticas a revisões
 mortas.  A exceção a esta regra ocorre quando uma
 etiqueta estática foi colocada numa revisão morta
 manualmente.  Use a etiqueta do ramo para mesclar todas
@@ -12976,6 +12976,8 @@
 @c <en>@cindex Left-hand options
 @cindex Left-hand options
 
address@hidden <en>As @samp{cvs_options} disponíveis (as que são dadas à
address@hidden <en>esquerda do @samp{comando_cvs}) são:
 As @samp{cvs_options} disponíveis (as que são dadas à
 esquerda do @samp{comando_cvs}) são:
 
@@ -13278,6 +13280,18 @@
 @c <en>@cindex Right-hand options
 @cindex Right-hand options
 
address@hidden <en>Esta seção descreve as @samp{opções_de_comando} que
address@hidden <en>estão disponíveis em vários comandos do @sc{cvs}.
address@hidden <en>Estas opções são sempre fornecidas à esquerda do
address@hidden <en>@samp{comando_cvs}.  Nem todos os comandos
address@hidden <en>suportam todas estas opções; cada uma das opções é
address@hidden <en>suportada apenas pelos comandos nos quais ela faz
address@hidden <en>sentido. Entretanto, quando um comando tem uma destas
address@hidden <en>opções você pode quase sempre esperar o mesmo
address@hidden <en>comportamento da opção em outros comandos.  (Outras
address@hidden <en>opções de comando, que são listadas com os comandos
address@hidden <en>individualmente, podem ter comportamento diferente
address@hidden <en>entre um comando do @sc{cvs} e outro).
 Esta seção descreve as @samp{opções_de_comando} que
 estão disponíveis em vários comandos do @sc{cvs}.
 Estas opções são sempre fornecidas à esquerda do
@@ -13291,6 +13305,9 @@
 individualmente, podem ter comportamento diferente
 entre um comando do @sc{cvs} e outro).
 
address@hidden <en>@strong{Obs.: o comando @samp{history} é uma exceção;
address@hidden <en>ele suporta muitas opções que conflitam até mesmo com
address@hidden <en>essas opções padrão.}
 @strong{Obs.: o comando @samp{history} é uma exceção;
 ele suporta muitas opções que conflitam até mesmo com
 essas opções padrão.}
@@ -13813,11 +13830,11 @@
 
 @itemize @bullet
 @item
-Requires: repository, working directory.
+Precisa de: repositório, diretório de trabalho.
 @item
-Changes: repository.
+Altera: repositório.
 @item
-Synonym: rcs
+Synônimo: rcs
 @end itemize
 
 Esta é a interface do @sc{cvs} para agrupar
@@ -13876,10 +13893,10 @@
 @c <en>@sc{cvs} but exist for historical purposes.  Some even
 @c <en>make it impossible to use @sc{cvs} until you undo the
 @c <en>effect!
-Some of these options have questionable usefulness for
address@hidden but exist for historical purposes.  Some even
-make it impossible to use @sc{cvs} until you undo the
-effect!
+A utilidade para o @sc{cvs} de algumas destas opções é questionável,
+mas elas existem por questões históricas.  Algumas
+podem até mesmo impossibilitar o uso do @sc{cvs} até
+que você reverta seus efeitos!
 
 @table @code
 @c <en>@item address@hidden
@@ -13887,18 +13904,18 @@
 @c <en>access list of @var{oldfile} to the access list of the
 @c <en>@sc{rcs} file.
 @item address@hidden
-Might not work together with @sc{cvs}.  Append the
-access list of @var{oldfile} to the access list of the
address@hidden file.
+Pode não funcionar com o @sc{cvs}.  Acrescenta a lista
+de acesso de @var{oldfile} à lista de acesso do arquivo
address@hidden
 
 @c <en>@item address@hidden
 @c <en>Might not work together with @sc{cvs}.  Append the
 @c <en>login names appearing in the comma-separated list
 @c <en>@var{logins} to the access list of the @sc{rcs} file.
 @item address@hidden
-Might not work together with @sc{cvs}.  Append the
-login names appearing in the comma-separated list
address@hidden to the access list of the @sc{rcs} file.
+Pode não funcionar com o @sc{cvs}.  Acrescenta os nomes
+de login que aparecem na lista (com vírgulas como separadores)
address@hidden à lista de acesso do arquivo @sc{rcs}.
 
 @c <en>@item address@hidden
 @item address@hidden
@@ -13910,13 +13927,14 @@
 @c <en>version when using vendor branches (@pxref{Reverting
 @c <en>local changes}).
 @c <en>There can be no space between @samp{-b} and its argument.
-Set the default branch to @var{rev}.  In @sc{cvs}, you
-normally do not manipulate default branches; sticky
-tags (@pxref{Etiquetas adesivas}) are a better way to decide
-which branch you want to work on.  There is one reason
-to run @code{cvs admin -b}: to revert to the vendor's
-version when using vendor branches (@pxref{Desfazendo mudanças locais}).
-There can be no space between @samp{-b} and its argument.
+Torna @var{rev} o ramo padrão.  No @sc{cvs}, você
+normalmente não manipula ramos padrão; Etiquetas
+adesivas (@pxref{Etiquetas adesivas}) são uma forma
+melhor de decidir em que ramo você quer trabalhar.
+Existe uma razão para rodar o @code{cvs admin -b}: para
+voltar à versão do fornecedor quando se está usando
+ramos de fornecedor (@pxref{Desfazendo mudanças locais}).
+Não ponha espaços entre o @samp{-b} e o argumento.
 @c Hmm, we don't document the usage where rev is
 @c omitted.  Maybe that usage can/should be deprecated
 @c (and replaced with -bHEAD or something?) (so we can toss
@@ -13932,10 +13950,11 @@
 @c <en>leader is not used by current versions of @sc{cvs} or
 @c <en>@sc{rcs} 5.7.  Therefore, you can almost surely not
 @c <en>worry about it.  @xref{Keyword substitution}.
-Sets the comment leader to @var{string}.  The comment
-leader is not used by current versions of @sc{cvs} or
address@hidden 5.7.  Therefore, you can almost surely not
-worry about it.  @xref{Substituição de palavra-chave}.
+Ajusta o ???comment leader??? para @var{string}.  O ???comment
+leader??? não é usado pelas versões atuais do @sc{cvs}
+ou pelo @sc{rcs} 5.7.  Portanto é quase certo que você
+não precise se preocupar com isto.  @xref{Substituição
+de palavra-chave}.
 
 @c <en>@item address@hidden
 @item address@hidden
@@ -13944,11 +13963,11 @@
 @c <en>@var{logins} from the access list of the RCS file.  If
 @c <en>@var{logins} is omitted, erase the entire access list.
 @c <en>There can be no space between @samp{-e} and its argument.
-Might not work together with @sc{cvs}.  Erase the login
-names appearing in the comma-separated list
address@hidden from the access list of the RCS file.  If
address@hidden is omitted, erase the entire access list.
-There can be no space between @samp{-e} and its argument.
+Pode não funcionar com o @sc{cvs}.  Apaga os nomes de
+login que aparecem na lista (com vírgulas como separadores) 
address@hidden da lista de acesso do arquivo RCS.  Se
address@hidden é omitido, apaga a lista de acesso
+toda. Não ponha espaços entre o @samp{-e} e o argumento.
 
 @c <en>@item -I
 @item -I
@@ -13956,19 +13975,20 @@
 @c <en>terminal.  This option does not work with the
 @c <en>client/server @sc{cvs} and is likely to disappear in
 @c <en>a future release of @sc{cvs}.
-Run interactively, even if the standard input is not a
-terminal.  This option does not work with the
-client/server @sc{cvs} and is likely to disappear in
-a future release of @sc{cvs}.
+Roda interativamente, mesmo se a entrada padrão não é
+um terminal.  Esta opção não funciona com o @sc{cvs}
+cliente/servidor e vai desaparecer numa ???release??? futura
+do @sc{cvs}.
 
 @item -i
 @c <en>Useless with @sc{cvs}.  This creates and initializes a
 @c <en>new @sc{rcs} file, without depositing a revision.  With
 @c <en>@sc{cvs}, add files with the @code{cvs add} command
 @c <en>(@pxref{Adding files}).
-Useless with @sc{cvs}.  This creates and initializes a
-new @sc{rcs} file, without depositing a revision.  With
address@hidden, add files with the @code{cvs add} command
+Sem utilidade com o @sc{cvs}.  Esta opção cria e
+inicializa um novo arquivo @sc{rcs}, sem
+???depositing??? uma revisão.  No @sc{cvs}, adicione
+arquivos com o comando @code{cvs add}
 (@pxref{Adicionando arquivos}).
 
 @c <en>@item address@hidden
@@ -13978,11 +13998,11 @@
 @c <en>substitution}.  Giving an explicit @samp{-k} option to
 @c <en>@code{cvs update}, @code{cvs export}, or @code{cvs
 @c <en>checkout} overrides this default.
-Set the default keyword
-substitution to @var{subst}.
address@hidden de palavra-chave}.  Giving an explicit @samp{-k} option to
address@hidden update}, @code{cvs export}, or @code{cvs
-checkout} overrides this default.
+Configura a substituição de palavra-chave padrão para @var{subst}.
address@hidden de palavra-chave}.  Passar a opção
address@hidden explicitamente para @code{cvs update},
address@hidden export} ou @code{cvs checkout} sobrepõe esta
+configuração.
 
 @c <en>@item address@hidden
 @item address@hidden
@@ -13991,11 +14011,11 @@
 @c <en>@var{rev} is omitted, lock the latest revision on the
 @c <en>default branch.  There can be no space between
 @c <en>@samp{-l} and its argument.
-Lock the revision with number @var{rev}.  If a branch
-is given, lock the latest revision on that branch.  If
address@hidden is omitted, lock the latest revision on the
-default branch.  There can be no space between
address@hidden and its argument.
+Trava a revisão com o número @var{rev}.  Se um ramo é
+dado, trava a última revisão daquele ramo.  Se
address@hidden é omitido, trava a última revisão no ramo
+padrão.  Não ponha espaços entre o @samp{-l} e seu
+argumento.
 
 @c <en>This can be used in conjunction with the
 @c <en>@file{rcslock.pl} script in the @file{contrib}
@@ -14006,15 +14026,16 @@
 @c <en>in that directory for disclaimers about the unsupported
 @c <en>nature of contrib).  According to comments in that
 @c <en>file, locking must set to strict (which is the default).
-This can be used in conjunction with the
address@hidden script in the @file{contrib}
-directory of the @sc{cvs} source distribution to
-provide reserved checkouts (where only one user can be
-editing a given file at a time).  See the comments in
-that file for details (and see the @file{README} file
-in that directory for disclaimers about the unsupported
-nature of contrib).  According to comments in that
-file, locking must set to strict (which is the default).
+Isto pode ser usado juntamente com o script @file{rcslock.pl}
+no diretório @file{contrib} da distribuição dos fontes
+do @sc{cvs} para fornecer checkouts reservados (onde
+apenas um usuário pode editar um arquivo por vez).
+Veja os comentários naquele arquivo para detalhes (e
+veja o arquivo @file{README} naquele diretório para
+???disclaimers??? sobre a característica de ausência de
+suporte do contrib).  De acordo com comentários naquele
+arquivo, ???locking??? deve ser configurado para strict
+(que é o padrão).
 
 @c <en>@item -L
 @item -L
@@ -14022,39 +14043,39 @@
 @c <en>owner of an RCS file is not exempt from locking for
 @c <en>checkin.  For use with @sc{cvs}, strict locking must be
 @c <en>set; see the discussion under the @samp{-l} option above.
-Set locking to strict.  Strict locking means that the
-owner of an RCS file is not exempt from locking for
-checkin.  For use with @sc{cvs}, strict locking must be
-set; see the discussion under the @samp{-l} option above.
+Ajusta o ???locking??? para strict.  ???Strict locking???
+significa que o dono do arquivo RCS não é dispensado de
+travar para fazer ???checkin???.  Para usar com o
address@hidden, ???strict locking??? deve estar ligado; veja
+a discussão no texto da opção @samp{-l} acima.
 
 @c <en>@cindex Changing a log message
address@hidden Changing a log message
address@hidden Mudando uma mensagem de ???log???
 @c <en>@cindex Replacing a log message
address@hidden Replacing a log message
address@hidden Substituindo uma mensagem de ???log???
 @c <en>@cindex Correcting a log message
address@hidden Correcting a log message
 @c <en>@cindex Fixing a log message
address@hidden Fixing a log message
address@hidden Corrigindo uma mensagem de ???log???
 @c <en>@cindex Log message, correcting
address@hidden Log message, correcting
address@hidden Mensagem de ???log???, corrigindo
 @c <en>@item address@hidden:@var{msg}
 @item address@hidden:@var{msg}
 @c <en>Replace the log message of revision @var{rev} with
 @c <en>@var{msg}.
-Replace the log message of revision @var{rev} with
+Substituir a mensagem de ???log??? da revisão @var{rev} por
 @var{msg}.
 
 @c The rcs -M option, to suppress sending mail, has never been
 @c documented as a cvs admin option.
 
 @c <en>@item address@hidden:address@hidden
address@hidden address@hidden:address@hidden
address@hidden address@hidden:address@hidden
 @c <en>Act like @samp{-n}, except override any previous
 @c <en>assignment of @var{name}.  For use with magic branches,
 @c <en>see @ref{Magic branch numbers}.
-Act like @samp{-n}, except override any previous
-assignment of @var{name}.  For use with magic branches,
-see @ref{Números de ramos mágicos}.
+Age como @samp{-n}, exceto que ???override??? qualquer
+atribuição prévia de @var{nome}.  Para usar com ramos
+mágicos, veja em @ref{Números de ramos mágicos}.
 
 @c <en>@item address@hidden:address@hidden
 @item address@hidden:address@hidden
@@ -14462,12 +14483,23 @@
 Synonyms: co, get
 @end itemize
 
address@hidden <en>Create or update a working directory containing copies of the
address@hidden <en>source files specified by @var{modules}.  You must execute
address@hidden <en>@code{checkout} before using most of the other @sc{cvs}
address@hidden <en>commands, since most of them operate on your working
address@hidden <en>directory.
 Create or update a working directory containing copies of the
 source files specified by @var{modules}.  You must execute
 @code{checkout} before using most of the other @sc{cvs}
 commands, since most of them operate on your working
 directory.
 
address@hidden <en>The @var{modules} are either
address@hidden <en>symbolic names for some
address@hidden <en>collection of source directories and files, or paths to
address@hidden <en>directories or files in the repository.  The symbolic
address@hidden <en>names are defined in the @samp{modules} file.
address@hidden <en>@xref{modules}.
 The @var{modules} are either
 symbolic names for some
 collection of source directories and files, or paths to
@@ -14481,6 +14513,14 @@
 @c people to how CVS works.  The bit about unreserved
 @c checkouts is also misleading as it depends on how
 @c things are set up.
address@hidden <en>Depending on the modules you specify, @code{checkout} may
address@hidden <en>recursively create directories and populate them with
address@hidden <en>the appropriate source files.  You can then edit these
address@hidden <en>source files at any time (regardless of whether other
address@hidden <en>software developers are editing their own copies of the
address@hidden <en>sources); update them to include new changes applied by
address@hidden <en>others to the source repository; or commit your work as
address@hidden <en>a permanent change to the source repository.
 Depending on the modules you specify, @code{checkout} may
 recursively create directories and populate them with
 the appropriate source files.  You can then edit these
@@ -14490,6 +14530,16 @@
 others to the source repository; or commit your work as
 a permanent change to the source repository.
 
address@hidden <en>Note that @code{checkout} is used to create
address@hidden <en>directories.  The top-level directory created is always
address@hidden <en>added to the directory where @code{checkout} is
address@hidden <en>invoked, and usually has the same name as the specified
address@hidden <en>module.  In the case of a module alias, the created
address@hidden <en>sub-directory may have a different name, but you can be
address@hidden <en>sure that it will be a sub-directory, and that
address@hidden <en>@code{checkout} will show the relative path leading to
address@hidden <en>each file as it is extracted into your private work
address@hidden <en>area (unless you specify the @samp{-Q} global option).
 Note that @code{checkout} is used to create
 directories.  The top-level directory created is always
 added to the directory where @code{checkout} is
@@ -14514,6 +14564,20 @@
 (@pxref{Variáveis de ambiente}), or a watch is in
 effect for that file (@pxref{???Watches???}).
 
address@hidden <en>Note that running @code{checkout} on a directory that was 
already
address@hidden <en>built by a prior @code{checkout} is also permitted.
address@hidden <en>This is similar to specifying the @samp{-d} option
address@hidden <en>to the @code{update} command in the sense that new
address@hidden <en>directories that have been created in the repository
address@hidden <en>will appear in your work area.
address@hidden <en>However, @code{checkout} takes a module name whereas
address@hidden <en>@code{update} takes a directory name.  Also
address@hidden <en>to use @code{checkout} this way it must be run from the
address@hidden <en>top level directory (where you originally ran
address@hidden <en>@code{checkout} from), so before you run
address@hidden <en>@code{checkout} to update an existing directory, don't
address@hidden <en>forget to change your directory to the top level
address@hidden <en>directory.
 Note that running @code{checkout} on a directory that was already
 built by a prior @code{checkout} is also permitted.
 This is similar to specifying the @samp{-d} option
@@ -14529,16 +14593,22 @@
 forget to change your directory to the top level
 directory.
 
address@hidden <en>For the output produced by the @code{checkout} command
address@hidden <en>see @ref{update output}.
 For the output produced by the @code{checkout} command
 see @ref{update output}.
 
 @menu
address@hidden <en>* checkout options::            checkout options
 * checkout options::            checkout options
address@hidden <en>* checkout examples::           checkout examples
 * checkout examples::           checkout examples
 @end menu
 
 @c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
address@hidden <en>@node checkout options
 @node checkout options
address@hidden <en>@appendixsubsec checkout options
 @appendixsubsec checkout options
 
 @c <en>These standard options are supported by @code{checkout}
@@ -14565,6 +14635,10 @@
 @ref{Etiquetas adesivas}, for more information on sticky tags/dates.
 
 @item -f
address@hidden <en>Only useful with the @samp{-D @var{date}} or @samp{-r
address@hidden <en>@var{tag}} flags.  If no matching revision is found,
address@hidden <en>retrieve the most recent revision (instead of ignoring
address@hidden <en>the file).
 Only useful with the @samp{-D @var{date}} or @samp{-r
 @var{tag}} flags.  If no matching revision is found,
 retrieve the most recent revision (instead of ignoring
@@ -14588,9 +14662,13 @@
 more information on the @code{status} command.
 
 @item -l
address@hidden <en>Local; run only in current working directory.
 Local; run only in current working directory.
 
 @item -n
address@hidden <en>Do not run any checkout program (as specified
address@hidden <en>with the @samp{-o} option in the modules file;
address@hidden <en>@pxref{modules}).
 Do not run any checkout program (as specified
 with the @samp{-o} option in the modules file;
 @pxref{modules}).
@@ -14600,9 +14678,11 @@
 Prune empty directories.  See @ref{Movendo diretórios}.
 
 @item -p
address@hidden <en>Pipe files to the standard output.
 Pipe files to the standard output.
 
 @item -R
address@hidden <en>Checkout directories recursively.  This option is on by 
default.
 Checkout directories recursively.  This option is on by default.
 
 @c <en>@item -r @var{tag}
@@ -14613,6 +14693,8 @@
 See @ref{Etiquetas adesivas}, for more information on sticky tags/dates.
 @end table
 
address@hidden <en>In addition to those, you can use these special command
address@hidden <en>options with @code{checkout}:
 In addition to those, you can use these special command
 options with @code{checkout}:
 
@@ -14625,17 +14707,31 @@
 See @ref{Etiquetas adesivas}, for more information on sticky tags/dates.
 
 @item -c
address@hidden <en>Copy the module file, sorted, to the standard output,
address@hidden <en>instead of creating or modifying any files or
address@hidden <en>directories in your working directory.
 Copy the module file, sorted, to the standard output,
 instead of creating or modifying any files or
 directories in your working directory.
 
 @item -d @var{dir}
address@hidden <en>Create a directory called @var{dir} for the working
address@hidden <en>files, instead of using the module name.  In general,
address@hidden <en>using this flag is equivalent to using @samp{mkdir
address@hidden <en>@var{dir}; cd @var{dir}} followed by the checkout
address@hidden <en>command without the @samp{-d} flag.
 Create a directory called @var{dir} for the working
 files, instead of using the module name.  In general,
 using this flag is equivalent to using @samp{mkdir
 @var{dir}; cd @var{dir}} followed by the checkout
 command without the @samp{-d} flag.
 
address@hidden <en>There is an important exception, however.  It is very
address@hidden <en>convenient when checking out a single item to have the
address@hidden <en>output appear in a directory that doesn't contain empty
address@hidden <en>intermediate directories.  In this case @emph{only},
address@hidden <en>@sc{cvs} tries to ``shorten'' pathnames to avoid those empty
address@hidden <en>directories.
 There is an important exception, however.  It is very
 convenient when checking out a single item to have the
 output appear in a directory that doesn't contain empty
@@ -14643,6 +14739,14 @@
 @sc{cvs} tries to ``shorten'' pathnames to avoid those empty
 directories.
 
address@hidden <en>For example, given a module @samp{foo} that contains
address@hidden <en>the file @samp{bar.c}, the command @samp{cvs co -d dir
address@hidden <en>foo} will create directory @samp{dir} and place
address@hidden <en>@samp{bar.c} inside.  Similarly, given a module
address@hidden <en>@samp{bar} which has subdirectory @samp{baz} wherein
address@hidden <en>there is a file @samp{quux.c}, the command @samp{cvs co
address@hidden <en>-d dir bar/baz} will create directory @samp{dir} and
address@hidden <en>place @samp{quux.c} inside.
 For example, given a module @samp{foo} that contains
 the file @samp{bar.c}, the command @samp{cvs co -d dir
 foo} will create directory @samp{dir} and place
@@ -14652,6 +14756,12 @@
 -d dir bar/baz} will create directory @samp{dir} and
 place @samp{quux.c} inside.
 
address@hidden <en>Using the @samp{-N} flag will defeat this behavior.
address@hidden <en>Given the same module definitions above, @samp{cvs co
address@hidden <en>-N -d dir foo} will create directories @samp{dir/foo}
address@hidden <en>and place @samp{bar.c} inside, while @samp{cvs co -N -d
address@hidden <en>dir bar/baz} will create directories @samp{dir/bar/baz}
address@hidden <en>and place @samp{quux.c} inside.
 Using the @samp{-N} flag will defeat this behavior.
 Given the same module definitions above, @samp{cvs co
 -N -d dir foo} will create directories @samp{dir/foo}
@@ -14660,11 +14770,21 @@
 and place @samp{quux.c} inside.
 
 @item -j @var{tag}
address@hidden <en>With two @samp{-j} options, merge changes from the
address@hidden <en>revision specified with the first @samp{-j} option to
address@hidden <en>the revision specified with the second @samp{j} option,
address@hidden <en>into the working directory.
 With two @samp{-j} options, merge changes from the
 revision specified with the first @samp{-j} option to
 the revision specified with the second @samp{j} option,
 into the working directory.
 
address@hidden <en>With one @samp{-j} option, merge changes from the
address@hidden <en>ancestor revision to the revision specified with the
address@hidden <en>@samp{-j} option, into the working directory.  The
address@hidden <en>ancestor revision is the common ancestor of the
address@hidden <en>revision which the working directory is based on, and
address@hidden <en>the revision specified in the @samp{-j} option.
 With one @samp{-j} option, merge changes from the
 ancestor revision to the revision specified with the
 @samp{-j} option, into the working directory.  The
@@ -14672,6 +14792,12 @@
 revision which the working directory is based on, and
 the revision specified in the @samp{-j} option.
 
address@hidden <en>In addition, each -j option can contain an optional
address@hidden <en>date specification which, when used with branches, can
address@hidden <en>limit the chosen revision to one within a specific
address@hidden <en>date.  An optional date is specified by adding a colon
address@hidden <en>(:) to the tag:
address@hidden <en>@address@hidden:@var{Date_Specifier}}.
 In addition, each -j option can contain an optional
 date specification which, when used with branches, can
 limit the chosen revision to one within a specific
@@ -14683,6 +14809,11 @@
 @xref{Ramificando e mesclando}.
 
 @item -N
address@hidden <en>Only useful together with @samp{-d @var{dir}}.  With
address@hidden <en>this option, @sc{cvs} will not ``shorten'' module paths
address@hidden <en>in your working directory when you check out a single
address@hidden <en>module.  See the @samp{-d} flag for examples and a
address@hidden <en>discussion.
 Only useful together with @samp{-d @var{dir}}.  With
 this option, @sc{cvs} will not ``shorten'' module paths
 in your working directory when you check out a single
@@ -14690,6 +14821,10 @@
 discussion.
 
 @item -s
address@hidden <en>Like @samp{-c}, but include the status of all modules,
address@hidden <en>and sort it by the status string.  @xref{modules}, for
address@hidden <en>info about the @samp{-s} option that is used inside the
address@hidden <en>modules file to set the module status.
 Like @samp{-c}, but include the status of all modules,
 and sort it by the status string.  @xref{modules}, for
 info about the @samp{-s} option that is used inside the
@@ -14697,15 +14832,20 @@
 @end table
 
 @c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
address@hidden <en>@node checkout examples
 @node checkout examples
address@hidden <en>@appendixsubsec checkout examples
 @appendixsubsec checkout examples
 
address@hidden <en>Get a copy of the module @samp{tc}:
 Get a copy of the module @samp{tc}:
 
 @example
 $ cvs checkout tc
 @end example
 
address@hidden <en>Get a copy of the module @samp{tc} as it looked one day
address@hidden <en>ago:
 Get a copy of the module @samp{tc} as it looked one day
 ago:
 
@@ -14714,26 +14854,46 @@
 @end example
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address@hidden <en>@node commit
 @node commit
address@hidden <en>@appendixsec commit---Check files into the repository
 @appendixsec commit---Check files into the repository
address@hidden <en>@cindex commit (subcommand)
 @cindex commit (subcommand)
 
 @itemize @bullet
 @item
address@hidden <en>Synopsis: commit [-lnRf] [-m 'log_message' |
address@hidden <en>-F file] [-r revision] address@hidden
 Synopsis: commit [-lnRf] [-m 'log_message' |
 -F file] [-r revision] address@hidden
 @item
address@hidden <en>Requires: working directory, repository.
 Requires: working directory, repository.
 @item
address@hidden <en>Changes: repository.
 Changes: repository.
 @item
address@hidden <en>Synonym: ci
 Synonym: ci
 @end itemize
 
address@hidden <en>Use @code{commit} when you want to incorporate changes
address@hidden <en>from your working source files into the source
address@hidden <en>repository.
 Use @code{commit} when you want to incorporate changes
 from your working source files into the source
 repository.
 
address@hidden <en>If you don't specify particular files to commit, all of
address@hidden <en>the files in your working current directory are
address@hidden <en>examined.  @code{commit} is careful to change in the
address@hidden <en>repository only those files that you have really
address@hidden <en>changed.  By default (or if you explicitly specify the
address@hidden <en>@samp{-R} option), files in subdirectories are also
address@hidden <en>examined and committed if they have changed; you can
address@hidden <en>use the @samp{-l} option to limit @code{commit} to the
address@hidden <en>current directory only.
 If you don't specify particular files to commit, all of
 the files in your working current directory are
 examined.  @code{commit} is careful to change in the
@@ -14744,6 +14904,14 @@
 use the @samp{-l} option to limit @code{commit} to the
 current directory only.
 
address@hidden <en>@code{commit} verifies that the selected files are up
address@hidden <en>to date with the current revisions in the source
address@hidden <en>repository; it will notify you, and exit without
address@hidden <en>committing, if any of the specified files must be made
address@hidden <en>current first with @code{update} (@pxref{update}).
address@hidden <en>@code{commit} does not call the @code{update} command
address@hidden <en>for you, but rather leaves that for you to do when the
address@hidden <en>time is right.
 @code{commit} verifies that the selected files are up
 to date with the current revisions in the source
 repository; it will notify you, and exit without
@@ -14753,6 +14921,16 @@
 for you, but rather leaves that for you to do when the
 time is right.
 
address@hidden <en>When all is well, an editor is invoked to allow you to
address@hidden <en>enter a log message that will be written to one or more
address@hidden <en>logging programs (@pxref{modules}, and @pxref{loginfo})
address@hidden <en>and placed in the @sc{rcs} file inside the
address@hidden <en>repository.  This log message can be retrieved with the
address@hidden <en>@code{log} command; see @ref{log}.  You can specify the
address@hidden <en>log message on the command line with the @samp{-m
address@hidden <en>@var{message}} option, and thus avoid the editor invocation,
address@hidden <en>or use the @samp{-F @var{file}} option to specify
address@hidden <en>that the argument file contains the log message.
 When all is well, an editor is invoked to allow you to
 enter a log message that will be written to one or more
 logging programs (@pxref{modules}, and @pxref{loginfo})
@@ -14765,12 +14943,16 @@
 that the argument file contains the log message.
 
 @menu
address@hidden <en>* commit options::              commit options
 * commit options::              commit options
address@hidden <en>* commit examples::             commit examples
 * commit examples::             commit examples
 @end menu
 
 @c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
address@hidden <en>@node commit options
 @node commit options
address@hidden <en>@appendixsubsec commit options
 @appendixsubsec commit options
 
 @c <en>These standard options are supported by @code{commit}
@@ -14782,9 +14964,11 @@
 
 @table @code
 @item -l
address@hidden <en>Local; run only in current working directory.
 Local; run only in current working directory.
 
 @item -R
address@hidden <en>Commit directories recursively.  This is on by default.
 Commit directories recursively.  This is on by default.
 
 @c <en>@item -r @var{revision}
@@ -14802,10 +14986,14 @@
 @c FIXME: Need xref for branch case.
 @end table
 
address@hidden <en>@code{commit} also supports these options:
 @code{commit} also supports these options:
 
 @table @code
address@hidden <en>@item -F @var{file}
 @item -F @var{file}
address@hidden <en>Read the log message from @var{file}, instead
address@hidden <en>of invoking an editor.
 Read the log message from @var{file}, instead
 of invoking an editor.
 
@@ -14816,6 +15004,10 @@
 Note that this is not the standard behavior of
 the @samp{-f} option as defined in @ref{Opções comuns}.
 
address@hidden <en>Force @sc{cvs} to commit a new revision even if you haven't
address@hidden <en>made any changes to the file.  If the current revision
address@hidden <en>of @var{file} is 1.7, then the following two commands
address@hidden <en>are equivalent:
 Force @sc{cvs} to commit a new revision even if you haven't
 made any changes to the file.  If the current revision
 of @var{file} is 1.7, then the following two commands
@@ -14828,24 +15020,34 @@
 
 @c This is odd, but it's how CVS has worked for some
 @c time.
address@hidden <en>The @samp{-f} option disables recursion (i.e., it
address@hidden <en>implies @samp{-l}).  To force @sc{cvs} to commit a new
address@hidden <en>revision for all files in all subdirectories, you must
address@hidden <en>use @samp{-f -R}.
 The @samp{-f} option disables recursion (i.e., it
 implies @samp{-l}).  To force @sc{cvs} to commit a new
 revision for all files in all subdirectories, you must
 use @samp{-f -R}.
 
address@hidden <en>@item -m @var{message}
 @item -m @var{message}
address@hidden <en>Use @var{message} as the log message, instead of
address@hidden <en>invoking an editor.
 Use @var{message} as the log message, instead of
 invoking an editor.
 @end table
 
 @need 2000
 @c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
address@hidden <en>@node commit examples
 @node commit examples
address@hidden <en>@appendixsubsec commit examples
 @appendixsubsec commit examples
 
 @c FIXME: this material wants to be somewhere
 @c in "Branching and merging".
 
address@hidden <en>@appendixsubsubsec Committing to a branch
 @appendixsubsubsec Committing to a branch
 
 @c <en>You can commit to a branch revision (one that has an
@@ -14884,11 +15086,23 @@
 @end example
 
 @noindent
address@hidden <en>This works automatically since the @samp{-r} option is
address@hidden <en>sticky.
 This works automatically since the @samp{-r} option is
 sticky.
 
address@hidden <en>@appendixsubsubsec Creating the branch after editing
 @appendixsubsubsec Creating the branch after editing
 
address@hidden <en>Say you have been working on some extremely
address@hidden <en>experimental software, based on whatever revision you
address@hidden <en>happened to checkout last week.  If others in your
address@hidden <en>group would like to work on this software with you, but
address@hidden <en>without disturbing main-line development, you could
address@hidden <en>commit your change to a new branch.  Others can then
address@hidden <en>checkout your experimental stuff and utilize the full
address@hidden <en>benefit of @sc{cvs} conflict resolution.  The scenario might
address@hidden <en>look like:
 Say you have been working on some extremely
 experimental software, based on whatever revision you
 happened to checkout last week.  If others in your
@@ -14907,6 +15121,12 @@
 $ cvs commit
 @end example
 
address@hidden <en>The @code{update} command will make the @samp{-r
address@hidden <en>EXPR1} option sticky on all files.  Note that your
address@hidden <en>changes to the files will never be removed by the
address@hidden <en>@code{update} command.  The @code{commit} will
address@hidden <en>automatically commit to the correct branch, because the
address@hidden <en>@samp{-r} is sticky.  You could also do like this:
 The @code{update} command will make the @samp{-r
 EXPR1} option sticky on all files.  Note that your
 changes to the files will never be removed by the
@@ -14922,12 +15142,19 @@
 @end example
 
 @noindent
address@hidden <en>but then, only those files that were changed by you
address@hidden <en>will have the @samp{-r EXPR1} sticky flag.  If you hack
address@hidden <en>away, and commit without specifying the @samp{-r EXPR1}
address@hidden <en>flag, some files may accidentally end up on the main
address@hidden <en>trunk.
 but then, only those files that were changed by you
 will have the @samp{-r EXPR1} sticky flag.  If you hack
 away, and commit without specifying the @samp{-r EXPR1}
 flag, some files may accidentally end up on the main
 trunk.
 
address@hidden <en>To work with you on the experimental change, others
address@hidden <en>would simply do
 To work with you on the experimental change, others
 would simply do
 
@@ -14936,24 +15163,40 @@
 @end example
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address@hidden <en>@node diff
 @node diff
address@hidden <en>@appendixsec diff---Show differences between revisions
 @appendixsec diff---Show differences between revisions
address@hidden <en>@cindex diff (subcommand)
 @cindex diff (subcommand)
 
 @itemize @bullet
address@hidden <en>@item
address@hidden <en>Synopsis: diff [-lR] [-k kflag] [format_options] [[-r rev1 | 
-D date1] [-r rev2 |  -D date2]] address@hidden
 @item
 Synopsis: diff [-lR] [-k kflag] [format_options] [[-r rev1 | -D date1] [-r 
rev2 |  -D date2]] address@hidden
address@hidden <en>@item
address@hidden <en>Requires: working directory, repository.
 @item
 Requires: working directory, repository.
address@hidden <en>@item
address@hidden <en>Changes: nothing.
 @item
 Changes: nothing.
 @end itemize
 
address@hidden <en>The @code{diff} command is used to compare different
address@hidden <en>revisions of files.  The default action is to compare
address@hidden <en>your working files with the revisions they were based
address@hidden <en>on, and report any differences that are found.
 The @code{diff} command is used to compare different
 revisions of files.  The default action is to compare
 your working files with the revisions they were based
 on, and report any differences that are found.
 
address@hidden <en>If any file names are given, only those files are
address@hidden <en>compared.  If any directories are given, all files
address@hidden <en>under them will be compared.
 If any file names are given, only those files are
 compared.  If any directories are given, all files
 under them will be compared.

Index: glossary
===================================================================
RCS file: /sources/cvs/ccvs/doc/i18n/pt_BR/glossary,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- glossary    19 Feb 2006 22:51:03 -0000      1.8
+++ glossary    6 Aug 2006 22:55:46 -0000       1.9
@@ -23,9 +23,15 @@
   I think that 'efetivar' is good. But people don't like. And some
   people are using commitar (argh!)
 
+- default
+  'padrão'
+
 - default branch
   ramo padrão
 
+- disclaimer
+  ???
+
 - head revision
   'revisão no topo'.
   Other options, that I really not like, are 'revisão cabeça',
@@ -40,18 +46,27 @@
 - keyword expansion
   'expansão de palavra-chave'
 
+- keyword substitution
+  'substituição de palavra-chave'
+
 - line ending
   'terminação de linha'
 
 - lock
   'travar', 'trava'.
 
+- locking
+  ???
+
 - log (verb)
   'registrar'
 
 - log (noun)
   'registro'
 
+- magic branch
+  'ramo mágico'
+
 - marker
   'marcador'