Translations by Ielton Ferreira Carneiro Pinto
Ielton Ferreira Carneiro Pinto has submitted the following strings to this translation. Contributions are visually coded: currently used translations, unreviewed suggestions, rejected suggestions.
| 1746. |
BZR_PDB
~~~~~~~
|
|
| 2012-01-28 |
BZR_PDB
~~~~~~~
|
|
| 1749. |
BZR_REMOTE_PATH
~~~~~~~~~~~~~~~
|
|
| 2012-01-28 |
BZR_REMOTE_PATH
~~~~~~~~~~~~~~~
|
|
| 1752. |
BZR_EDITOR
~~~~~~~~~~
|
|
| 2012-01-28 |
BZR_EDITOR
~~~~~~~~~~
|
|
| 1754. |
BZR_LOG
~~~~~~~
|
|
| 2012-01-28 |
BZR_LOG
~~~~~~~
|
|
| 1758. |
BZR_PLUGIN_PATH
~~~~~~~~~~~~~~~
|
|
| 2012-01-28 |
BZR_PLUGIN_PATH
~~~~~~~~~~~~~~~
|
|
| 1772. |
BZR_PLUGIN_PATH='/path/to/my/other/plugins'
|
|
| 2012-01-28 |
BZR_PLUGIN_PATH='/path/to/my/other/plugins'
|
|
| 1779. |
BZR_DISABLE_PLUGINS
~~~~~~~~~~~~~~~~~~~
|
|
| 2012-01-28 |
BZR_DISABLE_PLUGINS
~~~~~~~~~~~~~~~~~~~
|
|
| 1784. |
BZR_PLUGINS_AT
~~~~~~~~~~~~~~
|
|
| 2012-01-28 |
BZR_PLUGINS_AT
~~~~~~~~~~~~~~
|
|
| 1788. |
Example:
~~~~~~~~
|
|
| 2012-01-28 |
Exemplo:
~~~~~~~~
|
|
| 1790. |
BZRPATH
~~~~~~~
|
|
| 2012-01-28 |
BZRPATH
~~~~~~~
|
|
| 1794. |
http_proxy=http://proxy.example.com:3128/
https_proxy=http://proxy.example.com:3128/
|
|
| 2012-01-28 |
http_proxy=http://proxy.example.com:3128/
https_proxy=http://proxy.example.com:3128/
|
|
| 1795. |
Configuration files
-------------------
|
|
| 2012-01-28 |
Arquivos de configuração
-------------------
|
|
| 1796. |
Location
~~~~~~~~
|
|
| 2012-01-28 |
Localização
~~~~~~~~
|
|
| 1805. |
Comments
^^^^^^^^
|
|
| 2012-01-28 |
Comentários
^^^^^^^^
|
|
| 1809. |
[DEFAULT]
|
|
| 2012-01-28 |
[DEFAULT]
|
|
| 2012-01-28 |
[PADRÃO]
|
|
| 1812. |
[http://mybranches.isp.com/~jdoe/branchdir]
[/home/jdoe/branches/]
|
|
| 2012-01-28 |
[http://mybranches.isp.com/~jdoe/branchdir]
[/home/jdoe/branches/]
|
|
| 1815. |
email = John Doe <jdoe@isp.com>
gpg_signing_key = Amy Pond <amy@example.com>
|
|
| 2012-01-28 |
email = John Doe <jdoe@isp.com>
gpg_signing_key = Amy Pond <amy@example.com>
|
|
| 1844. |
[DEFAULT]
email = John Doe <jdoe@isp.com>
editor = /usr/bin/vim
create_signatures = when-required
|
|
| 2012-01-28 |
[DEFAULT]
email = John Doe <jdoe@isp.com>
editor = /usr/bin/vim
create_signatures = when-required
|
|
| 1847. |
[/home/jdoe/branches/nethack]
email = Nethack Admin <nethack@nethack.com>
|
|
| 2012-01-28 |
[/home/jdoe/branches/nethack]
email = Nethack Admin <nethack@nethack.com>
|
|
| 1848. |
[http://hypothetical.site.com/branches/devel-branch]
create_signatures = always
|
|
| 2012-01-28 |
[http://hypothetical.site.com/branches/devel-branch]
create_signatures = always
|
|
| 1858. |
email
~~~~~
|
|
| 2012-01-28 |
email
~~~~~
|
|
| 1861. |
editor
~~~~~~
|
|
| 2012-01-28 |
editor
~~~~~~
|
|
| 1888. |
bzr_remote_path
~~~~~~~~~~~~~~~
|
|
| 2012-01-28 |
bzr_remote_path
~~~~~~~~~~~~~~~
|
|
| 1892. |
smtp_server
~~~~~~~~~~~
|
|
| 2012-01-28 |
smtp_server
~~~~~~~~~~~
|
|
| 1894. |
smtp_username, smtp_password
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
| 2012-01-28 |
smtp_username, smtp_password
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
| 1898. |
mail_client
~~~~~~~~~~~
|
|
| 2012-01-28 |
mail_client
~~~~~~~~~~~
|
|
| 1906. |
submit_branch
~~~~~~~~~~~~~
|
|
| 2012-01-28 |
submit_branch
~~~~~~~~~~~~~
|
|
| 1908. |
public_branch
~~~~~~~~~~~~~
|
|
| 2012-01-28 |
public_branch
~~~~~~~~~~~~~
|
|
| 1923. |
parent_location
~~~~~~~~~~~~~~~
|
|
| 2012-01-28 |
parent_location
~~~~~~~~~~~~~~~
|
|
| 1925. |
push_location
~~~~~~~~~~~~~
|
|
| 2012-01-28 |
push_location
~~~~~~~~~~~~~
|
|
| 1927. |
push_strict
~~~~~~~~~~~
|
|
| 2012-01-28 |
push_strict
~~~~~~~~~~~
|
|
| 1929. |
dpush_strict
~~~~~~~~~~~~
|
|
| 2012-01-28 |
dpush_strict
~~~~~~~~~~~~
|
|
| 2025. |
$ bzr init
$ bzr mkdir white
$ bzr mkdir black
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ bzr mv white black
$ bzr commit -m "THIS"
$ bzr mv ../other/black ../other/white
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other
|
|
| 2012-01-28 |
$ bzr init
$ bzr mkdir white
$ bzr mkdir black
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ bzr mv white black
$ bzr commit -m "THIS"
$ bzr mv ../other/black ../other/white
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other
|
|
| 2030. |
This happens when one side has added files to a directory, and the other side
has changed the directory into a file or symlink. For example::
|
|
| 2012-01-25 |
Isso acontece quando um lado adicionou arquivos para um diretório, e o outro lado
foi alterado o diretório em arquivo ou link simbólico. Por exemplo::
|
|
| 2031. |
$ bzr init
$ bzr mkdir foo
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ rmdir foo
$ touch foo
$ bzr commit -m "THIS"
$ bzr mkdir ../other/foo/bar
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other
|
|
| 2012-01-25 |
$ bzr init
$ bzr mkdir foo
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ rmdir foo
$ touch foo
$ bzr commit -m "THIS"
$ bzr mkdir ../other/foo/bar
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other
|
|
| 2032. |
To resolve that kind of conflict, you have to decide what name should be
retained for the file, directory or symlink involved.
|
|
| 2012-01-25 |
Para resolver esse tipo de conflito, você tem que decidir o nome deve ser
mantido para o arquivo, diretório, ou link simbólico envolvidos.
|
|
| 2033. |
* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and
``bzr add foo``,
* ``--action=take-other`` will issue ``bzr rm --force foo`` and
``bzr mv foo.new foo``,
* ``--action=done`` will just mark the conflict as resolved.
|
|
| 2012-01-25 |
* ``--action=take-this`` emitirá ``bzr rm --force foo.new`` e
``bzr add foo``,
* ``--action=take-other`` emitirá ``bzr rm --force foo`` e
``bzr mv foo.new foo``,
* ``--action=done`` apenas marcara o conflito como resolvido.
|
|
| 2039. |
To generalize, there are two content formats supported by Bazaar:
|
|
| 2012-01-25 |
Para generalizar, existem dois formatos de conteúdo suportados pelo Bazaar:
|
|
| 2040. |
* a canonical format - how files are stored internally
* a convenience format - how files are created in a working tree.
|
|
| 2012-01-25 |
* Um formato canonical - como os arquivos são armazenados internamente.
* Um formato conveniente - como os arquivos são criados em uma árvore de diretório.
|
|
| 2109. |
Introduced in: 2.2
|
|
| 2012-01-25 |
Introduzido em: 2.2
|
|
| 2112. |
Introduced in: 1.8
|
|
| 2012-01-25 |
Introduzido em: 1.8
|
|
| 2117. |
Introduced in: 1.4
|
|
| 2012-01-25 |
Introduzido em: 1.4
|
|
| 2119. |
post_commit
~~~~~~~~~~~
|
|
| 2012-01-28 |
post_commit
~~~~~~~~~~~
|
|
| 2120. |
Introduced in: 0.15
|
|
| 2012-01-25 |
Introduzido em: 0.15
|
|
| 2122. |
post_pull
~~~~~~~~~
|
|
| 2012-01-28 |
post_pull
~~~~~~~~~
|
|
| 2124. |
post_push
~~~~~~~~~
|
|
| 2012-01-28 |
post_push
~~~~~~~~~
|
|
| 2126. |
post_switch
~~~~~~~~~~~
|
|
| 2012-01-28 |
post_switch
~~~~~~~~~~~
|
|
| 2128. |
post_uncommit
~~~~~~~~~~~~~
|
|
| 2012-01-28 |
post_uncommit
~~~~~~~~~~~~~
|
|
| 2131. |
Introduced in: 1.6
|
|
| 2012-01-25 |
Introduzido em: 1.6
|
|
