#
#
# patch "po/pt_BR.po"
#  from [b98294d75261f3db2f50dde44379b9997f089ac1]
#    to [5a3a39f8673a62b0f47c203373fd53d36481d041]
#
============================================================
--- po/pt_BR.po	b98294d75261f3db2f50dde44379b9997f089ac1
+++ po/pt_BR.po	5a3a39f8673a62b0f47c203373fd53d36481d041
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Monotone 0.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-18 09:41-0200\n"
-"PO-Revision-Date: 2006-01-18 13:45-0200\n"
+"POT-Creation-Date: 2006-01-24 09:22-0200\n"
+"PO-Revision-Date: 2006-01-24 13:45-0200\n"
 "Last-Translator: Alex Sandro Queiroz e Silva <address@hidden>\n"
 "Language-Team: Alex Sandro Queiroz e Silva <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -105,7 +105,7 @@
 msgid "calculated cert hash '%s' does not match '%s'"
 msgstr "hash '%s' calculado do certificado não combina com '%s'"

-#: cert.cc:347 keys.cc:531
+#: cert.cc:347 keys.cc:532
 #, c-format
 msgid "no key pair '%s' found in key store '%s'"
 msgstr "nenhum par de chaves '%s' encontrado na coleção '%s'"
@@ -170,8 +170,8 @@
 msgid "pid file '%s' already exists"
 msgstr "arquivo pid '%s' já existe"

-#: commands.cc:324 commands.cc:1287 commands.cc:1357 commands.cc:1732
-#: commands.cc:2641 commands.cc:3183 commands.cc:3414 commands.cc:3455
+#: commands.cc:324 commands.cc:1294 commands.cc:1364 commands.cc:1739
+#: commands.cc:2648 commands.cc:3209 commands.cc:3440 commands.cc:3479
 msgid "informative"
 msgstr "informativo"

@@ -209,9 +209,9 @@
 "ramo '%s' tem múltiplas frentes\n"
 "considere usar 'monotone merge'"

-#: commands.cc:480 commands.cc:736 commands.cc:1375 commands.cc:1450
-#: commands.cc:1816 commands.cc:2691 commands.cc:2719 commands.cc:2722
-#: commands.cc:2856 commands.cc:3438
+#: commands.cc:480 commands.cc:736 commands.cc:1382 commands.cc:1457
+#: commands.cc:1823 commands.cc:2698 commands.cc:2726 commands.cc:2729
+#: commands.cc:2865 commands.cc:3462
 #, c-format
 msgid "no such revision '%s'"
 msgstr "versão '%s' não existe"
@@ -256,7 +256,7 @@
 msgid "expanded partial id '%s' to '%s'\n"
 msgstr "id parcial '%s' expandido para '%s'\n"

-#: commands.cc:562 netsync.cc:1708
+#: commands.cc:562 netsync.cc:1709
 #, c-format
 msgid "no public key '%s' found in database"
 msgstr "chave pública '%s' não encontrada no banco de dados"
@@ -486,13 +486,13 @@
 msgid "empty comment"
 msgstr "comentário vazio"

-#: commands.cc:1167 commands.cc:1195 commands.cc:1220 commands.cc:1334
-#: commands.cc:2152 commands.cc:2271 commands.cc:2794 commands.cc:3231
+#: commands.cc:1167 commands.cc:1195 commands.cc:1220 commands.cc:1341
+#: commands.cc:2159 commands.cc:2278 commands.cc:2801 commands.cc:3257
 msgid "working copy"
 msgstr "cópia de trabalho"

-#: commands.cc:1167 commands.cc:1195 commands.cc:1287 commands.cc:2271
-#: commands.cc:2641 commands.cc:3231
+#: commands.cc:1167 commands.cc:1195 commands.cc:1294 commands.cc:2278
+#: commands.cc:2648 commands.cc:3257
 msgid "[PATH]..."
 msgstr "[CAMINHO]..."

@@ -504,85 +504,87 @@
 msgid "drop files from working copy"
 msgstr "remove arquivos da cópia de trabalho"

-#: commands.cc:1220
-msgid "SRC DST"
-msgstr "ORIGEM DESTINO"
+#: commands.cc:1221
+msgid ""
+"SRC DEST\n"
+"SRC1 [SRC2 [...]] DEST_DIR"
+msgstr ""

-#: commands.cc:1221
+#: commands.cc:1223
 msgid "rename entries in the working copy"
 msgstr "renomeia entradas na cópia de trabalho"

-#: commands.cc:1241 commands.cc:1254 commands.cc:3334 commands.cc:3748
+#: commands.cc:1248 commands.cc:1261 commands.cc:3360 commands.cc:3777
 msgid "debug"
 msgstr "depuração"

-#: commands.cc:1241
+#: commands.cc:1248
 msgid "load file contents into db"
 msgstr "carrega o conteúdo do arquivo no banco de dados"

-#: commands.cc:1254
+#: commands.cc:1261
 msgid "<parent> <left> <right>"
 msgstr "<pai> <esquerda> <direita>"

-#: commands.cc:1255
+#: commands.cc:1262
 msgid "merge 3 files and output result"
 msgstr "combina 3 arquivos e retorna resultado"

-#: commands.cc:1265
+#: commands.cc:1272
 #, c-format
 msgid "ancestor file id does not exist"
 msgstr "id do arquivo ancestral não existe"

-#: commands.cc:1268
+#: commands.cc:1275
 #, c-format
 msgid "left file id does not exist"
 msgstr "id do arquivo esquerdo não existe"

-#: commands.cc:1271
+#: commands.cc:1278
 #, c-format
 msgid "right file id does not exist"
 msgstr "id do arquivo direito não existe"

-#: commands.cc:1282
+#: commands.cc:1289
 #, c-format
 msgid "merge failed"
 msgstr "combinação falhou"

-#: commands.cc:1287
+#: commands.cc:1294
 msgid "show status of working copy"
 msgstr "mostra status da cópia de trabalho"

-#: commands.cc:1334
+#: commands.cc:1341
 msgid "[PATH]"
 msgstr "[CAMINHO]"

-#: commands.cc:1335
+#: commands.cc:1342
 msgid "calculate identity of PATH or stdin"
 msgstr "calcula identidade do CAMINHO ou stdin"

-#: commands.cc:1358
+#: commands.cc:1365
 msgid "FILENAME"
 msgstr "ARQUIVO"

-#: commands.cc:1359
+#: commands.cc:1366
 msgid "write file from database to stdout"
 msgstr "escreve arquivo do banco de dados em stdout"

-#: commands.cc:1387 commands.cc:1389 commands.cc:3447
+#: commands.cc:1394 commands.cc:1396 commands.cc:3471
 #, c-format
 msgid "no file '%s' found in revision '%s'\n"
 msgstr "nenhum arquivo '%s' encontrado na versão '%s'\n"

-#: commands.cc:1401 commands.cc:1520 commands.cc:2993 commands.cc:3042
-#: commands.cc:3131 commands.cc:3138 commands.cc:3666
+#: commands.cc:1408 commands.cc:1527 commands.cc:3019 commands.cc:3068
+#: commands.cc:3157 commands.cc:3164 commands.cc:3690
 msgid "tree"
 msgstr "árvore"

-#: commands.cc:1401
+#: commands.cc:1408
 msgid "[DIRECTORY]\n"
 msgstr "[DIRETÓRIO]\n"

-#: commands.cc:1402
+#: commands.cc:1409
 msgid ""
 "check out a revision from database into directory.\n"
 "If a revision is given, that's the one that will be checked out.\n"
@@ -590,62 +592,62 @@
 "If no directory is given, the branch name will be used as directory"
 msgstr ""

-#: commands.cc:1419 commands.cc:1438
+#: commands.cc:1426 commands.cc:1445
 #, c-format
 msgid "need --branch argument for branch-based checkout"
 msgstr ""

-#: commands.cc:1432
+#: commands.cc:1439
 #, c-format
 msgid "checkout directory '%s' already exists"
 msgstr ""

-#: commands.cc:1441 commands.cc:1533 commands.cc:3006 commands.cc:3076
-#: commands.cc:3079
+#: commands.cc:1448 commands.cc:1540 commands.cc:3032 commands.cc:3102
+#: commands.cc:3105
 #, c-format
 msgid "branch '%s' is empty\n"
 msgstr "ramo '%s' está vazio\n"

-#: commands.cc:1442
+#: commands.cc:1449
 #, c-format
 msgid "branch %s has multiple heads"
 msgstr "ramo %s tem frentes múltiplas"

-#: commands.cc:1468
+#: commands.cc:1475
 #, c-format
 msgid "revision %s is not a member of branch %s\n"
 msgstr "versão %s não é um membro do ramo %s\n"

-#: commands.cc:1502
+#: commands.cc:1509
 #, c-format
 msgid "no file %s found in database for %s"
 msgstr "nenhum arquivo %s encontrado no banco de dados para %s"

-#: commands.cc:1520
+#: commands.cc:1527
 msgid "show unmerged head revisions of branch"
 msgstr "mostra frentes não combinadas do ramo"

-#: commands.cc:1528 commands.cc:3002
+#: commands.cc:1535 commands.cc:3028
 #, c-format
 msgid "please specify a branch, with --branch=BRANCH"
 msgstr "por favor especifique um ramo com --branch=RAMO"

-#: commands.cc:1535
+#: commands.cc:1542
 #, c-format
 msgid "branch '%s' is currently merged:\n"
 msgstr "ramo '%s' está atualmente combinado:\n"

-#: commands.cc:1537
+#: commands.cc:1544
 #, c-format
 msgid "branch '%s' is currently unmerged:\n"
 msgstr "ramo '%s' não está combinado atualmente:\n"

-#: commands.cc:1576
+#: commands.cc:1583
 #, c-format
 msgid "no epoch for branch %s\n"
 msgstr ""

-#: commands.cc:1733
+#: commands.cc:1740
 msgid ""
 "certs ID\n"
 "keys [PATTERN]\n"
@@ -669,160 +671,160 @@
 "ignored\n"
 "missing"

-#: commands.cc:1743
+#: commands.cc:1750
 msgid ""
 "show database objects, or the current working copy manifest,\n"
 "or unknown, intentionally ignored, or missing state files"
 msgstr ""

-#: commands.cc:1779 commands.cc:1803 commands.cc:1822 commands.cc:1841
-#: commands.cc:1859 commands.cc:1887 commands.cc:1905
+#: commands.cc:1786 commands.cc:1810 commands.cc:1829 commands.cc:1848
+#: commands.cc:1866 commands.cc:1894 commands.cc:1912
 msgid "packet i/o"
 msgstr "E/S de pacotes"

-#: commands.cc:1779
+#: commands.cc:1786
 msgid "OLDID NEWID"
 msgstr "VELHO-ID NOVO-ID"

-#: commands.cc:1780
+#: commands.cc:1787
 msgid "write file delta packet to stdout"
 msgstr "escreve pacote de delta de arquivo em stdout"

-#: commands.cc:1794 commands.cc:1796 commands.cc:1835
+#: commands.cc:1801 commands.cc:1803 commands.cc:1842
 #, c-format
 msgid "no such file '%s'"
 msgstr "não há arquivo '%s'"

-#: commands.cc:1803 commands.cc:1822 commands.cc:1841 commands.cc:1859
-#: commands.cc:1887
+#: commands.cc:1810 commands.cc:1829 commands.cc:1848 commands.cc:1866
+#: commands.cc:1894
 msgid "ID"
 msgstr "ID"

-#: commands.cc:1803
+#: commands.cc:1810
 msgid "write revision data packet to stdout"
 msgstr "escreve pacote de dados da versão em stdout"

-#: commands.cc:1822
+#: commands.cc:1829
 msgid "write file data packet to stdout"
 msgstr "escreve pacote de dados do arquivo em stdout"

-#: commands.cc:1841
+#: commands.cc:1848
 msgid "write cert packets to stdout"
 msgstr "escreve pacotes de certificado em stdout"

-#: commands.cc:1859
+#: commands.cc:1866
 msgid "write public key packet to stdout"
 msgstr "escreve pacote de chave pública em stdout"

-#: commands.cc:1881
+#: commands.cc:1888
 #, c-format
 msgid "public key '%s' does not exist"
 msgstr "chave pública '%s' não existe"

-#: commands.cc:1887
+#: commands.cc:1894
 msgid "write private key packet to stdout"
 msgstr "escreve pacote de chave privada em stdout"

-#: commands.cc:1895
+#: commands.cc:1902
 #, c-format
 msgid "public and private key '%s' do not exist in keystore"
 msgstr "chaves pública e privada '%s' não existem na coleção"

-#: commands.cc:1906
+#: commands.cc:1913
 msgid "read packets from files or stdin"
 msgstr "lê pacotes de arquivos ou de stdin"

-#: commands.cc:1914
+#: commands.cc:1921
 #, c-format
 msgid "no packets found on stdin"
 msgstr "nenhum pacote encontrado em stdin"

-#: commands.cc:1925
+#: commands.cc:1932
 #, c-format
 msgid "no packets found in given file"
 msgid_plural "no packets found in given files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "nenhum pacote encontrado no arquivo dado"
+msgstr[1] "nenhum pacote encontrado nos arquivos dados"

-#: commands.cc:1929
+#: commands.cc:1936
 #, c-format
 msgid "read %d packet"
 msgid_plural "read %d packets"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "lido %d pacote"
+msgstr[1] "lidos %d pacotes"

-#: commands.cc:1958
+#: commands.cc:1965
 #, c-format
 msgid "setting default server to %s\n"
 msgstr "configurando servidor padrão para %s\n"

-#: commands.cc:1964
+#: commands.cc:1971
 #, c-format
 msgid "no hostname given"
 msgstr "nenhum nome de host dado"

-#: commands.cc:1966
+#: commands.cc:1973
 #, c-format
 msgid "no server given and no default server set"
 msgstr "nenhum servidor dado e nenhum servidor padrão configurado"

-#: commands.cc:1984
+#: commands.cc:1991
 #, c-format
 msgid "setting default branch include pattern to '%s'\n"
 msgstr "configurando padrão de inclusão de ramos para '%s'\n"

-#: commands.cc:1990
+#: commands.cc:1997
 #, c-format
 msgid "setting default branch exclude pattern to '%s'\n"
 msgstr "configurando padrão de exclusão de ramos para '%s'\n"

-#: commands.cc:1996
+#: commands.cc:2003
 #, c-format
 msgid "no branch pattern given"
 msgstr "nenhum padrão de ramos dado"

-#: commands.cc:1998
+#: commands.cc:2005
 #, c-format
 msgid "no branch pattern given and no default pattern set"
 msgstr "nenhum padrão de ramo dado e nenhum configurado"

-#: commands.cc:2014 commands.cc:2029 commands.cc:2043 commands.cc:2058
+#: commands.cc:2021 commands.cc:2036 commands.cc:2050 commands.cc:2065
 msgid "network"
 msgstr "rede"

-#: commands.cc:2014 commands.cc:2029 commands.cc:2043
+#: commands.cc:2021 commands.cc:2036 commands.cc:2050
 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
 msgstr "[ENDEREÇO[:PORTA] [PADRÃO]]"

-#: commands.cc:2015
+#: commands.cc:2022
 msgid "push branches matching PATTERN to netsync server at ADDRESS"
 msgstr "envia ramos que combinam com PADRÃO para servidor netsync em ENDEREÇO"

-#: commands.cc:2030
+#: commands.cc:2037
 msgid "pull branches matching PATTERN from netsync server at ADDRESS"
 msgstr "recebe ramos que combinam com PADRÃO do servidor netsync em ENDEREÇO"

-#: commands.cc:2037
+#: commands.cc:2044
 #, c-format
 msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
 msgstr ""
 "recebendo dados anonimamente; user -kNOMEDACHAVE se for necessária "
 "autenticação\n"

-#: commands.cc:2044
+#: commands.cc:2051
 msgid "sync branches matching PATTERN with netsync server at ADDRESS"
 msgstr ""
 "sincroniza ramos que combinam com PADRÃO com o servidor netsync em ENDEREÇO"

-#: commands.cc:2058
+#: commands.cc:2065
 msgid "PATTERN ..."
 msgstr "PADRÂO..."

-#: commands.cc:2059
+#: commands.cc:2066
 msgid "serve the branches specified by PATTERNs to connecting clients"
 msgstr "serve os ramos especificados por PADRÂO para clientes"

-#: commands.cc:2072
+#: commands.cc:2079
 #, c-format
 msgid ""
 "need permission to store persistent passphrase (see hook persist_phrase_ok())"
@@ -830,11 +832,11 @@
 "é necessária permissão para salvar frase-passe persistentemente (veja gancho "
 "persist_phrase_ok())"

-#: commands.cc:2084
+#: commands.cc:2091
 msgid "database"
 msgstr "banco de dados"

-#: commands.cc:2085
+#: commands.cc:2092
 msgid ""
 "init\n"
 "info\n"
@@ -866,11 +868,11 @@
 "rosterify\n"
 "set_epoch RAMO ERA\n"

-#: commands.cc:2099
+#: commands.cc:2106
 msgid "manipulate database state"
 msgstr "manipula estado do bando de dados"

-#: commands.cc:2152
+#: commands.cc:2159
 msgid ""
 "set PATH ATTR VALUE\n"
 "get PATH [ATTR]\n"
@@ -880,40 +882,40 @@
 "get CAMINHO [ATRIBUTO]\n"
 "drop CAMINHO [ATRIBUTO]"

-#: commands.cc:2153
+#: commands.cc:2160
 msgid "set, get or drop file attributes"
 msgstr "configura, lê ou descarta atributos de arquivos"

-#: commands.cc:2169
+#: commands.cc:2176
 #, c-format
 msgid "Unknown path '%s'"
 msgstr "caminho desconhecido '%s'"

-#: commands.cc:2198
+#: commands.cc:2205
 #, c-format
 msgid "Path '%s' does not have attribute '%s'\n"
 msgstr "caminho '%s' não tem atributo '%s'\n"

-#: commands.cc:2252
+#: commands.cc:2259
 #, c-format
 msgid "--message and --message-file are mutually exclusive"
 msgstr "--message e --message-file são mutuamente exclusivos"

-#: commands.cc:2272
+#: commands.cc:2279
 msgid "commit working copy to database"
-msgstr ""
+msgstr "grava mudanças da cópia de trabalho no banco de dados"

-#: commands.cc:2290
+#: commands.cc:2297
 #, c-format
 msgid "no changes to commit\n"
-msgstr ""
+msgstr "nenhuma mudança para gravar\n"

-#: commands.cc:2304
+#: commands.cc:2311
 #, c-format
 msgid "beginning commit on branch '%s'\n"
-msgstr ""
+msgstr "iniciando gravação do ramo '%s'\n"

-#: commands.cc:2313
+#: commands.cc:2320
 #, c-format
 msgid ""
 "MT/log is non-empty and log message was specified on command line\n"
@@ -925,27 +927,27 @@
 "considere mover ou apagar MT/log,\n"
 "ou remova --message/--message-from-file da linha de comando"

-#: commands.cc:2325
+#: commands.cc:2332
 #, c-format
 msgid "empty log message; commit canceled"
-msgstr ""
+msgstr "mensagem de registro vazia, gravação cancelada"

-#: commands.cc:2342
+#: commands.cc:2349
 #, c-format
 msgid "revision %s already in database\n"
 msgstr "versão %s já está no banco de dados\n"

-#: commands.cc:2380 commands.cc:2397 commands.cc:2416
+#: commands.cc:2387 commands.cc:2404 commands.cc:2423
 #, c-format
 msgid "file '%s' modified during commit, aborting"
-msgstr ""
+msgstr "arquivo '%s' modificado durante gravação, abortando"

-#: commands.cc:2442
+#: commands.cc:2449
 #, c-format
 msgid "committed revision %s\n"
-msgstr ""
+msgstr "versão %s gravada\n"

-#: commands.cc:2448
+#: commands.cc:2455
 #, c-format
 msgid ""
 "note: this revision creates divergence\n"
@@ -954,7 +956,7 @@
 "nota: esta versão causa divergência\n"
 "nota: talvez você queira executar 'monotone merge'"

-#: commands.cc:2642
+#: commands.cc:2649
 msgid ""
 "show current diffs on stdout.\n"
 "If one revision is given, the diff between the working directory and\n"
@@ -962,7 +964,7 @@
 "them is given.  If no format is specified, unified is used by default."
 msgstr ""

-#: commands.cc:2658
+#: commands.cc:2665
 #, c-format
 msgid ""
 "--diff-args requires --external\n"
@@ -971,31 +973,30 @@
 "--diff-args requer --external\n"
 "adicione --external ou remova --diff-args"

-#: commands.cc:2700
+#: commands.cc:2707
 #, c-format
 msgid "current revision has no ancestor"
 msgstr "versão atual não tem ancestral"

-#: commands.cc:2763
+#: commands.cc:2770
 msgid "no changes"
 msgstr "sem mudanças"

-#: commands.cc:2795
+#: commands.cc:2802
 msgid ""
 "update working copy.\n"
-"If a revision is given, base the update on that revision.  If not,\n"
-"base the update on the head of the branch (given or implicit)."
+"This command modifies your working copy to be based off of a\n"
+"different revision, preserving uncommitted changes as it does so.\n"
+"If a revision is given, update the working copy to that revision.\n"
+"If not, update the working copy to the head of the branch."
 msgstr ""
-"atualiza a cópia de trabalho.\n"
-"Se uma versão é dada, baseia a atualização nesta versão. Se não,\n"
-"baseia a atualização na frente do ramo (dado ou implícito)."

-#: commands.cc:2831
+#: commands.cc:2840
 #, c-format
 msgid "this working directory is a new project; cannot update"
 msgstr "esta cópia de trabalho é um novo projeto; impossível atualizar"

-#: commands.cc:2838
+#: commands.cc:2847
 #, c-format
 msgid ""
 "your request matches no descendents of the current revision\n"
@@ -1003,32 +1004,32 @@
 "maybe you want --revision=<rev on other branch>"
 msgstr ""

-#: commands.cc:2843
+#: commands.cc:2852
 #, c-format
 msgid "multiple update candidates:\n"
 msgstr "múltiplos candidatos para atualização:\n"

-#: commands.cc:2847
+#: commands.cc:2856
 #, c-format
 msgid "choose one with 'monotone update -r<id>'\n"
 msgstr "escolha um com 'monotone update -r<id>'\n"

-#: commands.cc:2848
+#: commands.cc:2857
 #, c-format
 msgid "multiple candidates remain after selection"
 msgstr "ainda há múltiplos candidatos após seleção"

-#: commands.cc:2863
+#: commands.cc:2872
 #, c-format
 msgid "already up to date at %s\n"
 msgstr "já atualizado em %s\n"

-#: commands.cc:2871
+#: commands.cc:2880
 #, c-format
 msgid "selected update target %s\n"
 msgstr "selecionado alvo %s para atualização\n"

-#: commands.cc:2883
+#: commands.cc:2892
 #, c-format
 msgid ""
 "revision %s is not a member of branch %s\n"
@@ -1037,146 +1038,140 @@
 "versão %s não é um membro do ramo %s\n"
 "tente de novo com --branch\n"

-#: commands.cc:2906
+#: commands.cc:3009
 #, c-format
-msgid "Update target is not a descendent of working copy base revision\n"
-msgstr ""
-"Alvo para atualização não é um descendente da versão-base da cópia de "
-"trabalho\n"
-
-#: commands.cc:2983
-#, c-format
 msgid "updated to base revision %s\n"
 msgstr "atualizado para versão-base %s\n"

-#: commands.cc:2993
+#: commands.cc:3019
 msgid "merge unmerged heads of branch"
 msgstr "combina diferentes frentes do ramo"

-#: commands.cc:3007
+#: commands.cc:3033
 #, c-format
 msgid "branch '%s' is merged\n"
 msgstr "ramo '%s' está combinado\n"

-#: commands.cc:3013
+#: commands.cc:3039
 #, c-format
 msgid "starting with revision 1 / %d\n"
 msgstr "iniciando com versão 1 / %d\n"

-#: commands.cc:3017
+#: commands.cc:3043
 #, c-format
 msgid "merging with revision %d / %d\n"
 msgstr "combinando com versão %d / %d\n"

-#: commands.cc:3018 commands.cc:3019 commands.cc:3086 commands.cc:3161
-#: commands.cc:3162
+#: commands.cc:3044 commands.cc:3045 commands.cc:3112 commands.cc:3187
+#: commands.cc:3188
 #, c-format
 msgid "[source] %s\n"
 msgstr "[fonte] %s\n"

-#: commands.cc:3036 commands.cc:3127 commands.cc:3180
+#: commands.cc:3062 commands.cc:3153 commands.cc:3206
 #, c-format
 msgid "[merged] %s\n"
 msgstr "[combinado] %s\n"

-#: commands.cc:3039
+#: commands.cc:3065
 #, c-format
 msgid "note: your working copies have not been updated\n"
 msgstr "nota: suas cópias de trabalho não foram atualizadas\n"

-#: commands.cc:3042
+#: commands.cc:3068
 msgid "SOURCE-BRANCH DEST-BRANCH"
 msgstr "RAMO-FONTE RAMO-DESTINO"

-#: commands.cc:3043
+#: commands.cc:3069
 msgid "merge from one branch to another asymmetrically"
 msgstr "combina dois ramos de forma assimétrica"

-#: commands.cc:3077 commands.cc:3080
+#: commands.cc:3103 commands.cc:3106
 #, c-format
 msgid "branch '%s' is not merged\n"
 msgstr "ramo '%s' não está combinado\n"

-#: commands.cc:3085
+#: commands.cc:3111
 #, c-format
 msgid "propagating %s -> %s\n"
 msgstr "propagando %s -> %s\n"

-#: commands.cc:3087
+#: commands.cc:3113
 #, c-format
 msgid "[target] %s\n"
 msgstr "[alvo] %s\n"

-#: commands.cc:3092
+#: commands.cc:3118
 #, c-format
 msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
 msgstr "ramo '%s' está atualizado em relação ao ramo '%s'\n"

-#: commands.cc:3094
+#: commands.cc:3120
 #, c-format
 msgid "no action taken\n"
 msgstr "nenhuma ação tomada\n"

-#: commands.cc:3098
+#: commands.cc:3124
 #, c-format
 msgid "no merge necessary; putting %s in branch '%s'\n"
 msgstr "não há necessidade de combinação; colocando %s no ramo '%s'\n"

-#: commands.cc:3131
+#: commands.cc:3157
 msgid "refresh the inodeprint cache"
 msgstr "atualiza o cache de inodeprint"

-#: commands.cc:3139
+#: commands.cc:3165
 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
 msgstr "VERSÃO-ESQUERDA VERSÃO-DIREITA RAMO-DESTINO"

-#: commands.cc:3140
+#: commands.cc:3166
 msgid "merge two explicitly given revisions, placing result in given branch"
 msgstr ""
 "combina duas versões dadas explicitamente colocando o resuldado no ramo dado"

-#: commands.cc:3154
+#: commands.cc:3180
 #, c-format
 msgid "%s and %s are the same revision, aborting"
 msgstr "%s e %s são a mesma versão, abortando"

-#: commands.cc:3156 commands.cc:3158
+#: commands.cc:3182 commands.cc:3184
 #, c-format
 msgid "%s is already an ancestor of %s"
 msgstr "%s já é um ancestral de %s"

-#: commands.cc:3183
+#: commands.cc:3209
 msgid "(revision|file|key) PARTIAL-ID"
 msgstr "(revision|file|key) ID-PARCIAL"

-#: commands.cc:3184
+#: commands.cc:3210
 msgid "complete partial id"
 msgstr "id parcial completo"

-#: commands.cc:3193
+#: commands.cc:3219
 #, c-format
 msgid "non-hex digits in partial id"
 msgstr "dígitos não-hexadecimais no id parcial"

-#: commands.cc:3232
+#: commands.cc:3258
 msgid "revert file(s), dir(s) or entire working copy (\".\")"
-msgstr "reverte arquivo(s), diretório(s) ou a cópia de trabalho inteira (\".\")"
+msgstr ""
+"reverte arquivo(s), diretório(s) ou a cópia de trabalho inteira (\".\")"

-#: commands.cc:3309
+#: commands.cc:3335
 #, c-format
 msgid "reverting %s"
 msgstr "revertendo %s"

-#: commands.cc:3313
+#: commands.cc:3339
 #, c-format
 msgid "no file version %s found in database for %s"
 msgstr "nenhuma versão %s do arquivo achada no banco de dados para %s"

-#: commands.cc:3334
+#: commands.cc:3360
 msgid "RCSFILE..."
 msgstr "ARQUIVO-RCS"

-#: commands.cc:3335
+#: commands.cc:3361
 msgid ""
 "parse versions in RCS files\n"
 "this command doesn't reconstruct or import revisions.you probably want "
@@ -1186,36 +1181,36 @@
 "este comando não reconstrui ou importa versões. Você provavelmente quer "
 "cvs_import"

-#: commands.cc:3351
+#: commands.cc:3377
 msgid "rcs"
 msgstr "rcs"

-#: commands.cc:3351
+#: commands.cc:3377
 msgid "CVSROOT"
 msgstr "CVSROOT"

-#: commands.cc:3351
+#: commands.cc:3377
 msgid "import all versions in CVS repository"
 msgstr "importa todas as versões do repositório CVS"

-#: commands.cc:3414
+#: commands.cc:3440
 msgid "PATH"
 msgstr "CAMINHO"

-#: commands.cc:3415
+#: commands.cc:3441
 msgid "print annotated copy of the file from REVISION"
 msgstr "imprime cópia anotada do arquivo da VERSÃO"

-#: commands.cc:3437
+#: commands.cc:3461
 #, c-format
 msgid "no revision for file '%s' in database"
 msgstr "nenhuma versão '%s' do arquivo em banco de dados"

-#: commands.cc:3455
+#: commands.cc:3479
 msgid "[FILE] ..."
 msgstr "[ARQUIVO] ..."

-#: commands.cc:3456
+#: commands.cc:3480
 msgid ""
 "print history in reverse order (filtering by 'FILE'). If one or more\n"
 "revisions are given, use them as a starting point."
@@ -1223,29 +1218,25 @@
 "imprime histórico em ordem inversa (filtrado por 'ARQUIVO'). Se uma ou\n"
 "mais versões forem dadas, usa-as como ponto de partida."

-#: commands.cc:3503
+#: commands.cc:3527
 #, c-format
 msgid "Unknown file '%s' for log command"
 msgstr "Arquivo '%s' desconhecido para comando log"

-#: commands.cc:3666
-msgid "DIRECTORY"
-msgstr "DIRETÓRIO"
+#: commands.cc:3690
+msgid "setup a new working copy directory, default to current"
+msgstr "configura um novo diretório de cópia de trabalho, o padrão é o atual"

-#: commands.cc:3666
-msgid "setup a new working copy directory"
-msgstr "configura um novo diretório de cópia de trabalho"
-
-#: commands.cc:3672
+#: commands.cc:3696
 #, c-format
 msgid "need --branch argument for setup"
 msgstr "argumento --branch é necessário para configuração"

-#: commands.cc:3681
+#: commands.cc:3710
 msgid "automation"
 msgstr "automação"

-#: commands.cc:3682
+#: commands.cc:3711
 msgid ""
 "interface_version\n"
 "heads [BRANCH]\n"
@@ -1289,41 +1280,41 @@
 "get_revision [VERSÃO]\n"
 "keys\n"

-#: commands.cc:3702
+#: commands.cc:3731
 msgid "automation interface"
 msgstr "interface de automação"

-#: commands.cc:3716 commands.cc:3732
+#: commands.cc:3745 commands.cc:3761
 msgid "vars"
 msgstr "variáveis"

-#: commands.cc:3716
+#: commands.cc:3745
 msgid "DOMAIN NAME VALUE"
 msgstr "DOMÍNIO NOME VALOR"

-#: commands.cc:3717
+#: commands.cc:3746
 msgid "set the database variable NAME to VALUE, in domain DOMAIN"
 msgstr ""
 "configura a variável do banco de dados NOME para VALOR, no domínio DOMÍNIO"

-#: commands.cc:3732
+#: commands.cc:3761
 msgid "DOMAIN NAME"
 msgstr "DOMÍNIO NOME"

-#: commands.cc:3733
+#: commands.cc:3762
 msgid "remove the database variable NAME in domain DOMAIN"
 msgstr "remove a variável do banco de dados NOME no domínio DOMAIN"

-#: commands.cc:3744
+#: commands.cc:3773
 #, c-format
 msgid "no var with name %s in domain %s"
 msgstr "nenhuma variável com nome %s no domínio %s"

-#: commands.cc:3748
+#: commands.cc:3777
 msgid "REVID"
 msgstr "VERSÂO"

-#: commands.cc:3749
+#: commands.cc:3778
 msgid "dump the roster associated with the given REVID"
 msgstr "exibe conteúdo do roster associado com VERSÃO"

@@ -1339,7 +1330,7 @@
 msgid "markings"
 msgstr "marcas"

-#: database_check.cc:319 database_check.cc:507 netsync.cc:2693
+#: database_check.cc:319 database_check.cc:507 netsync.cc:2706
 #: rcs_import.cc:1226
 msgid "revisions"
 msgstr "versões"
@@ -1348,11 +1339,11 @@
 msgid "ancestry"
 msgstr "descendência"

-#: database_check.cc:451 netsync.cc:2697
+#: database_check.cc:451 netsync.cc:2710
 msgid "keys"
 msgstr "chaves"

-#: database_check.cc:477 netsync.cc:2695
+#: database_check.cc:477 netsync.cc:2708
 msgid "certs"
 msgstr "certificados"

@@ -1369,27 +1360,27 @@
 #: database_check.cc:571
 #, c-format
 msgid "roster %s unreferenced\n"
-msgstr ""
+msgstr "inventório %s não referenciado\n"

 #: database_check.cc:577
 #, c-format
 msgid "roster %s incomplete (%d missing files)\n"
-msgstr ""
+msgstr "inventório %s está incompleto (%d arquivos faltando)\n"

 #: database_check.cc:584
 #, c-format
 msgid "roster %s incomplete (%d missing revisions)\n"
-msgstr ""
+msgstr "inventório %s está incompleto (%d versões faltando)\n"

 #: database_check.cc:591
 #, c-format
 msgid "roster %s is not parseable (perhaps with unnormalized paths?)\n"
-msgstr ""
+msgstr "inventório %s está ilegível (talvez com caminhos não normalizados?)\n"

 #: database_check.cc:598
 #, c-format
 msgid "roster %s is not in normalized form\n"
-msgstr ""
+msgstr "inventório %s não está normalizado\n"

 #: database_check.cc:623
 #, c-format
@@ -1604,7 +1595,7 @@
 msgid "database is good\n"
 msgstr ""

-#: database.cc:89
+#: database.cc:134
 #, c-format
 msgid ""
 "layout of database %s doesn't match this version of monotone\n"
@@ -1613,7 +1604,7 @@
 "(this is irreversible; you may want to make a backup copy first)"
 msgstr ""

-#: database.cc:108
+#: database.cc:158
 #, c-format
 msgid ""
 "database %s contains revisions but no rosters\n"
@@ -1625,33 +1616,43 @@
 "sorry about the inconvenience."
 msgstr ""

-#: database.cc:173
+#: database.cc:177
 #, c-format
+msgid ""
+"database %s contains manifests but no revisions\n"
+"this is a very old database; it needs to be upgraded\n"
+"please see README.changesets for details"
+msgstr ""
+
+#: database.cc:238
+#, c-format
 msgid "unable to probe database version in file %s"
 msgstr ""

-#: database.cc:180
+#: database.cc:245
 #, c-format
 msgid "database %s is not an sqlite version 3 file, try dump and reload"
 msgstr ""

-#: database.cc:207
-msgid "make sure database and containing directory are writeable"
+#: database.cc:272
+msgid ""
+"make sure database and containing directory are writeable\n"
+"and you have not run out of disk space"
 msgstr ""

-#: database.cc:212
+#: database.cc:278
 #, c-format
 msgid ""
 "sqlite error: %d: %s\n"
 "%s"
 msgstr ""

-#: database.cc:250
+#: database.cc:324
 #, c-format
 msgid "could not initialize database: %s: already exists"
 msgstr ""

-#: database.cc:255
+#: database.cc:329
 #, c-format
 msgid ""
 "existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -1659,12 +1660,12 @@
 "cancelling database creation"
 msgstr ""

-#: database.cc:377
+#: database.cc:451
 #, c-format
 msgid "cannot create %s; it already exists"
 msgstr ""

-#: database.cc:441
+#: database.cc:515
 #, c-format
 msgid ""
 "schema version    : %s\n"
@@ -1687,52 +1688,52 @@
 "  total           : %u\n"
 msgstr ""

-#: database.cc:495
+#: database.cc:569
 #, c-format
 msgid "database schema version: %s"
 msgstr ""

-#: database.cc:581
+#: database.cc:646
 #, c-format
 msgid "multiple statements in query: %s\n"
 msgstr ""

-#: database.cc:587
+#: database.cc:652
 #, c-format
 msgid "wanted %d columns got %d in query: %s\n"
 msgstr ""

-#: database.cc:626
+#: database.cc:710
 #, c-format
 msgid "null result in query: %s\n"
 msgstr ""

-#: database.cc:644
+#: database.cc:728
 #, c-format
 msgid "wanted %d rows got %s in query: %s\n"
 msgstr ""

-#: database.cc:1684
+#: database.cc:1775
 #, c-format
 msgid "another key with name '%s' already exists"
 msgstr ""

-#: database.cc:2732
+#: database.cc:2819
 #, c-format
 msgid "no database specified"
 msgstr ""

-#: database.cc:2740
+#: database.cc:2827
 #, c-format
 msgid "database %s does not exist"
 msgstr ""

-#: database.cc:2741
+#: database.cc:2828
 #, c-format
 msgid "%s is a directory, not a database"
 msgstr ""

-#: database.cc:2766
+#: database.cc:2853
 #, c-format
 msgid "could not open database '%s': %s"
 msgstr ""
@@ -1903,42 +1904,42 @@
 msgid "no such file or directory: '%s'"
 msgstr ""

-#: keys.cc:76
+#: keys.cc:77
 #, c-format
 msgid "got empty passphrase from get_passphrase() hook"
 msgstr ""

-#: keys.cc:92
+#: keys.cc:93
 #, c-format
 msgid "empty passphrase not allowed"
 msgstr ""

-#: keys.cc:99
+#: keys.cc:100
 #, c-format
 msgid "confirm passphrase for key ID [%s]: "
 msgstr ""

-#: keys.cc:104
+#: keys.cc:105
 #, c-format
 msgid "empty passphrases not allowed, try again\n"
 msgstr ""

-#: keys.cc:105 keys.cc:112
+#: keys.cc:106 keys.cc:113
 #, c-format
 msgid "too many failed passphrases\n"
 msgstr ""

-#: keys.cc:111
+#: keys.cc:112
 #, c-format
 msgid "passphrases do not match, try again\n"
 msgstr ""

-#: keys.cc:118
+#: keys.cc:119
 #, c-format
 msgid "no passphrase given"
 msgstr ""

-#: keys.cc:541
+#: keys.cc:542
 #, c-format
 msgid "passphrase for '%s' is incorrect"
 msgstr ""
@@ -2212,27 +2213,37 @@

 #: netcmd.cc:92
 #, c-format
-msgid "protocol version mismatch: wanted '%d' got '%d'"
+msgid ""
+"protocol version mismatch: wanted '%d' got '%d'\n"
+"%s"
 msgstr ""

-#: netcmd.cc:114
+#: netcmd.cc:97
+msgid "the remote side has a newer, incompatible version of monotone"
+msgstr ""
+
+#: netcmd.cc:98
+msgid "the remote side has an older, incompatible version of monotone"
+msgstr ""
+
+#: netcmd.cc:118
 #, c-format
 msgid "unknown netcmd code 0x%x"
 msgstr ""

-#: netcmd.cc:125
+#: netcmd.cc:129
 #, c-format
 msgid "oversized payload of '%d' bytes"
 msgstr ""

-#: netcmd.cc:154
+#: netcmd.cc:158
 #, c-format
 msgid ""
 "bad HMAC checksum (got %s, wanted %s)\n"
 "this suggests data was corrupted in transit\n"
 msgstr ""

-#: netcmd.cc:249 netcmd.cc:295
+#: netcmd.cc:253 netcmd.cc:299
 #, c-format
 msgid "unknown role specifier %d"
 msgstr ""
@@ -2262,46 +2273,46 @@
 msgid "expected %s to end at %d, have %d bytes"
 msgstr ""

-#: netsync.cc:243
+#: netsync.cc:244
 #, c-format
 msgid "check of '%s' failed"
 msgstr ""

-#: netsync.cc:689
+#: netsync.cc:690
 msgid "bytes in"
 msgstr ""

-#: netsync.cc:691
+#: netsync.cc:692
 msgid "bytes out"
 msgstr ""

-#: netsync.cc:695
+#: netsync.cc:696
 msgid "certs in"
 msgstr ""

-#: netsync.cc:697 netsync.cc:710
+#: netsync.cc:698 netsync.cc:711
 msgid "revs in"
 msgstr ""

-#: netsync.cc:702
+#: netsync.cc:703
 msgid "certs out"
 msgstr ""

-#: netsync.cc:704 netsync.cc:712
+#: netsync.cc:705 netsync.cc:713
 msgid "revs out"
 msgstr ""

-#: netsync.cc:811
+#: netsync.cc:812
 #, c-format
 msgid "underflow on count of %s items to receive"
 msgstr ""

-#: netsync.cc:1157
+#: netsync.cc:1158
 #, c-format
 msgid "received network error: %s"
 msgstr ""

-#: netsync.cc:1189
+#: netsync.cc:1190
 #, c-format
 msgid ""
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -2314,12 +2325,12 @@
 "'monotone unset %s %s' overrides this check\n"
 msgstr ""

-#: netsync.cc:1199
+#: netsync.cc:1200
 #, c-format
 msgid "server key changed"
 msgstr ""

-#: netsync.cc:1204
+#: netsync.cc:1205
 #, c-format
 msgid ""
 "first time connecting to server %s\n"
@@ -2327,286 +2338,286 @@
 "their key's fingerprint: %s\n"
 msgstr ""

-#: netsync.cc:1211
+#: netsync.cc:1212
 #, c-format
 msgid "saving public key for %s to database\n"
 msgstr ""

-#: netsync.cc:1299
+#: netsync.cc:1300
 #, c-format
 msgid "rejected attempt at anonymous connection for write\n"
 msgstr ""

-#: netsync.cc:1306
+#: netsync.cc:1307
 #, c-format
 msgid "rejected attempt at anonymous connection while running as sink\n"
 msgstr ""

-#: netsync.cc:1323
+#: netsync.cc:1324
 #, c-format
 msgid "anonymous access to branch '%s' denied by server"
 msgstr ""

-#: netsync.cc:1328
+#: netsync.cc:1329
 #, c-format
 msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
 msgstr ""

-#: netsync.cc:1360
+#: netsync.cc:1361
 #, c-format
 msgid "detected replay attack in auth netcmd\n"
 msgstr ""

-#: netsync.cc:1382
+#: netsync.cc:1383
 #, c-format
 msgid "remote public key hash '%s' is unknown\n"
 msgstr ""

-#: netsync.cc:1399
+#: netsync.cc:1400
 #, c-format
 msgid ""
 "denied '%s' read permission for '%s' excluding '%s' while running as pure "
 "sink\n"
 msgstr ""

-#: netsync.cc:1415
+#: netsync.cc:1416
 #, c-format
 msgid ""
 "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
 msgstr ""

-#: netsync.cc:1417
+#: netsync.cc:1418
 #, c-format
 msgid "access to branch '%s' denied by server"
 msgstr ""

-#: netsync.cc:1425
+#: netsync.cc:1426
 #, c-format
 msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
 msgstr ""

-#: netsync.cc:1434
+#: netsync.cc:1435
 #, c-format
 msgid ""
 "denied '%s' write permission for '%s' excluding '%s' while running as pure "
 "source\n"
 msgstr ""

-#: netsync.cc:1442
+#: netsync.cc:1443
 #, c-format
 msgid "denied '%s' write permission for '%s' excluding '%s'\n"
 msgstr ""

-#: netsync.cc:1448
+#: netsync.cc:1449
 #, c-format
 msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
 msgstr ""

-#: netsync.cc:1488
+#: netsync.cc:1489
 #, c-format
 msgid "bad client signature\n"
 msgstr ""

-#: netsync.cc:1504
+#: netsync.cc:1505
 #, c-format
 msgid "Unexpected 'refine' command on non-refined item type\n"
 msgstr ""

-#: netsync.cc:1601
+#: netsync.cc:1602
 #, c-format
 msgid "unknown bye phase %d received"
 msgstr ""

-#: netsync.cc:1613
+#: netsync.cc:1614
 #, c-format
 msgid "Unexpected 'done' command on non-refined item type\n"
 msgstr ""

-#: netsync.cc:1693
+#: netsync.cc:1694
 #, c-format
 msgid "epoch with hash '%s' does not exist in our database"
 msgstr ""

-#: netsync.cc:1722
+#: netsync.cc:1723
 #, c-format
 msgid "revision '%s' does not exist in our database"
 msgstr ""

-#: netsync.cc:1736
+#: netsync.cc:1737
 #, c-format
 msgid "file '%s' does not exist in our database"
 msgstr ""

-#: netsync.cc:1750
+#: netsync.cc:1751
 #, c-format
 msgid "cert '%s' does not exist in our database"
 msgstr ""

-#: netsync.cc:1802
+#: netsync.cc:1803
 #, c-format
 msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
 msgstr ""

-#: netsync.cc:1823
+#: netsync.cc:1824
 #, c-format
 msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
 msgstr ""

-#: netsync.cc:1840
+#: netsync.cc:1841
 #, c-format
 msgid "hash check failed for revision cert '%s'"
 msgstr ""

-#: netsync.cc:1915
+#: netsync.cc:1916
 #, c-format
 msgid "Received warning from usher: %s"
 msgstr ""

-#: netsync.cc:2002 netsync.cc:2033
+#: netsync.cc:2003 netsync.cc:2034
 msgid "source and sink"
 msgstr ""

-#: netsync.cc:2003 netsync.cc:2034
+#: netsync.cc:2004 netsync.cc:2035
 msgid "source"
 msgstr ""

-#: netsync.cc:2003 netsync.cc:2034
+#: netsync.cc:2004 netsync.cc:2035
 msgid "sink"
 msgstr ""

-#: netsync.cc:2188
+#: netsync.cc:2189
 #, c-format
 msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
 msgstr ""

-#: netsync.cc:2200 netsync.cc:2251
+#: netsync.cc:2201 netsync.cc:2258
 #, c-format
 msgid "protocol error while processing peer %s: '%s'\n"
 msgstr ""

-#: netsync.cc:2206
+#: netsync.cc:2207
 #, c-format
 msgid "error: %s\n"
 msgstr ""

-#: netsync.cc:2236
+#: netsync.cc:2237
 #, c-format
 msgid "connecting to %s\n"
 msgstr ""

-#: netsync.cc:2266
+#: netsync.cc:2273
 #, c-format
 msgid "timed out waiting for I/O with peer %s, disconnecting\n"
 msgstr ""

-#: netsync.cc:2281
+#: netsync.cc:2288
 #, c-format
 msgid "got OOB data from peer %s, disconnecting\n"
 msgstr ""

-#: netsync.cc:2296
+#: netsync.cc:2303
 #, c-format
 msgid "processing failure while talking to peer %s, disconnecting\n"
 msgstr ""

-#: netsync.cc:2313
+#: netsync.cc:2320
 #, c-format
 msgid "successful exchange with %s\n"
 msgstr ""

-#: netsync.cc:2319
+#: netsync.cc:2326
 #, c-format
 msgid "peer %s disconnected after we informed them of error\n"
 msgstr ""

-#: netsync.cc:2324
+#: netsync.cc:2331
 #, c-format
 msgid "I/O failure while talking to peer %s, disconnecting\n"
 msgstr ""

-#: netsync.cc:2353
+#: netsync.cc:2360
 #, c-format
 msgid "protocol error while processing peer %s: '%s', marking as bad\n"
 msgstr ""

-#: netsync.cc:2385
+#: netsync.cc:2392
 #, c-format
 msgid "accepted new client connection from %s : %s\n"
 msgstr ""

-#: netsync.cc:2413
+#: netsync.cc:2426
 #, c-format
 msgid "protocol error while processing peer %s: '%s', disconnecting\n"
 msgstr ""

-#: netsync.cc:2424
+#: netsync.cc:2437
 #, c-format
 msgid "peer %s read failed in working state (error)\n"
 msgstr ""

-#: netsync.cc:2429
+#: netsync.cc:2442
 #, c-format
 msgid ""
 "peer %s read failed in shutdown state (possibly client misreported error)\n"
 msgstr ""

-#: netsync.cc:2435
+#: netsync.cc:2448
 #, c-format
 msgid "peer %s read failed in confirmed state (success)\n"
 msgstr ""

-#: netsync.cc:2456
+#: netsync.cc:2469
 #, c-format
 msgid "peer %s write failed in working state (error)\n"
 msgstr ""

-#: netsync.cc:2461
+#: netsync.cc:2474
 #, c-format
 msgid ""
 "peer %s write failed in shutdown state (possibly client misreported error)\n"
 msgstr ""

-#: netsync.cc:2467
+#: netsync.cc:2480
 #, c-format
 msgid "peer %s write failed in confirmed state (success)\n"
 msgstr ""

-#: netsync.cc:2494
+#: netsync.cc:2507
 #, c-format
 msgid "peer %s processing finished, disconnecting\n"
 msgstr ""

-#: netsync.cc:2516
+#: netsync.cc:2529
 #, c-format
 msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
 msgstr ""

-#: netsync.cc:2562
+#: netsync.cc:2575
 #, c-format
 msgid "beginning service on %s : %s\n"
 msgstr ""

-#: netsync.cc:2577
+#: netsync.cc:2590
 #, c-format
 msgid "session limit %d reached, some connections will be refused\n"
 msgstr ""

-#: netsync.cc:2632
+#: netsync.cc:2645
 #, c-format
 msgid "got OOB from peer %s, disconnecting\n"
 msgstr ""

-#: netsync.cc:2687
+#: netsync.cc:2700
 #, c-format
 msgid "finding items to synchronize:\n"
 msgstr ""

-#: netsync.cc:2804
+#: netsync.cc:2817
 #, c-format
 msgid "Cannot find key '%s'"
 msgstr ""

-#: netsync.cc:2861 netsync.cc:2865
+#: netsync.cc:2874 netsync.cc:2878
 #, c-format
 msgid "network error: %s"
 msgstr ""
@@ -2774,12 +2785,12 @@
 "please contact %s so we can work out the right way to migrate this"
 msgstr ""

-#: revision.cc:1371
+#: revision.cc:1373
 #, c-format
 msgid "converting existing revision graph to new roster-style revisions\n"
 msgstr ""

-#: revision.cc:1423
+#: revision.cc:1427
 #, c-format
 msgid "rebuilding revision graph from manifest certs\n"
 msgstr ""
@@ -2877,40 +2888,41 @@
 #: schema_migration.cc:290
 #, c-format
 msgid "database schema %s is unknown; cannot perform migration"
-msgstr ""
+msgstr "esquema do banco de dados %s desconhecido; impossível migrar"

 #: schema_migration.cc:295
 #, c-format
 msgid "no migration performed; database schema already up-to-date at %s\n"
 msgstr ""
+"migração não executada, esquema do banco de dados já atualizado com %s\n"

 #: schema_migration.cc:845
 #, c-format
 msgid "public and private keys for %s don't match"
-msgstr ""
+msgstr "chaves pública e privada de %s não combinam"

 #: schema_migration.cc:848
 #, c-format
 msgid "moving key '%s' from database to %s"
-msgstr ""
+msgstr "movendo chave '%s' do banco de dados para %s"

 #: std_hooks.lua:28
 msgid "Press enter when the subprocess has completed"
-msgstr ""
+msgstr "Por favor pressione <Enter> quando o subprocesso terminar"

 #: std_hooks.lua:211
 #, c-format
 msgid "Error running editor '%s' to enter log message\n"
-msgstr ""
+msgstr "Erro executando editor '%s' para entrada de mensagem de registro\n"

 #: std_hooks.lua:501
 msgid "executing external 3-way merge command\n"
-msgstr ""
+msgstr "executando comando externo para combinação de 3 arquivos\n"

 #: transforms.cc:477
 #, c-format
 msgid "failed to convert string from %s to %s: '%s'"
-msgstr ""
+msgstr "erro convertendo cadeia de %s para %s: '%s'"

 #: transforms.cc:624 transforms.cc:638
 #, c-format
@@ -2920,27 +2932,27 @@
 #: ui.cc:107
 #, c-format
 msgid "%.1f G"
-msgstr ""
+msgstr "%.1f G"

 #: ui.cc:113
 #, c-format
 msgid "%.1f M"
-msgstr ""
+msgstr "%.1f M"

 #: ui.cc:119
 #, c-format
 msgid "%.1f k"
-msgstr ""
+msgstr "%.1f k"

 #: ui.cc:136 ui.cc:138
 #, c-format
 msgid "%d/%d"
-msgstr ""
+msgstr "%d/%d"

 #: ui.cc:145
 #, c-format
 msgid "%d"
-msgstr ""
+msgstr "%d"

 #: ui.cc:368
 #, c-format
@@ -2950,10 +2962,14 @@
 "please send this error message, the output of 'monotone --full-version',\n"
 "and a description of what you were doing to %s.\n"
 msgstr ""
+"fatal: %s\n"
+"isto é quase certamente um defeito em monotone.\n"
+"por favor envie esta mensagem de erro, a saída de 'monotone --full-version',\n"
+"e uma descrição do que você estava fazendo para %s.\n"

 #: ui.cc:411
 msgid "monotone: "
-msgstr ""
+msgstr "monotone: "

 #: update.cc:65
 #, c-format
@@ -2963,7 +2979,7 @@
 #: update.cc:159
 #, c-format
 msgid "cannot determine branch for update"
-msgstr ""
+msgstr "impossível determinar ramo para atualização"

 #: vocab.cc:68
 #, c-format
@@ -2973,7 +2989,7 @@
 #: vocab.cc:72
 #, c-format
 msgid "bad character '%c' in id name '%s'"
-msgstr ""
+msgstr "caractere inválido '%c' no nome do id '%s'"

 #: vocab.cc:85
 #, c-format
@@ -2983,237 +2999,140 @@
 #: vocab.cc:99
 #, c-format
 msgid "bad character '%c' in cert name '%s'"
-msgstr ""
+msgstr "caractere inválido '%c' no nome do certificado '%s'"

 #: vocab.cc:112
 #, c-format
 msgid "bad character '%c' in key name '%s'"
-msgstr ""
+msgstr "caractere inválido '%c' no nome da chave '%s'"

 #: vocab.cc:130
 #, c-format
 msgid "Invalid key length of %d bytes"
-msgstr ""
+msgstr "Chave com tamanho inválido de %d bytes"

 #: vocab.cc:148
 #, c-format
 msgid "Invalid hmac length of %d bytes"
-msgstr ""
+msgstr "HMAC com tamanho inválido de %d bytes"

 #: work.cc:117
 #, c-format
 msgid "skipping ignorable file %s\n"
-msgstr ""
+msgstr "pulando arquivo ignorável %s\n"

 #: work.cc:125
 #, c-format
 msgid "skipping %s, already accounted for in working copy\n"
-msgstr ""
+msgstr "pulando %s, já encontrado na cópia de trabalho\n"

 #: work.cc:129
 #, c-format
 msgid "adding %s to working copy add set\n"
-msgstr ""
+msgstr "adicionando %s ao conjunto de adições da cópia de trabalho\n"

 #: work.cc:202
 #, c-format
 msgid "skipping %s, not currently tracked\n"
-msgstr ""
+msgstr "pulando %s, não é versionado atualmente\n"

 #: work.cc:210
 #, c-format
 msgid "cannot remove %s/, it is not empty"
-msgstr ""
+msgstr "impossível remover %s/, não está vazio"

 #: work.cc:212
 #, c-format
 msgid "adding %s to working copy delete set\n"
-msgstr ""
+msgstr "adicionando %s ao conjunto de remoções da cópia de trabalho\n"

-#: work.cc:255
+#: work.cc:269
 #, c-format
-msgid "%s does not exist in current revision\n"
-msgstr ""
+msgid "destination dir %s/ does not exist in current revision"
+msgstr "diretório de destino %s/ não existe na versão atual"

-#: work.cc:258
+#: work.cc:272
 #, c-format
-msgid "%s already exists in current revision\n"
-msgstr ""
+msgid "destination %s is an existing file in current revision"
+msgstr "destino %s é um arquivo existente na versão atual"

-#: work.cc:262
+#: work.cc:282
 #, c-format
-msgid "adding %s -> %s to working copy rename set\n"
-msgstr ""
+msgid "empty path %s is not allowed"
+msgstr "caminho vazio %s não permitido"

-#: work.cc:349
+#: work.cc:296
 #, c-format
+msgid "%s does not exist in current revision"
+msgstr "%s não existe na versão atual"
+
+#: work.cc:299
+#, c-format
+msgid "destination %s already exists in current revision"
+msgstr "destino %s já existe na versão atual"
+
+#: work.cc:308
+#, c-format
+msgid "adding %s -> %s to working copy rename set"
+msgstr "adicionando %s -> %s ao conjunto de renomeações da cópia de trabalho"
+
+#: work.cc:333
+#, c-format
+msgid "%s doesn't exist in working copy, skipping"
+msgstr "%s não existe na cópia de trabalho, pulando"
+
+#: work.cc:337
+#, c-format
+msgid "destination %s already exists in working copy, skipping"
+msgstr "destino %s já existe na cópia de trabalho, pulando"
+
+#: work.cc:421
+#, c-format
 msgid "working copy is corrupt: %s does not exist"
-msgstr ""
+msgstr "cópia de trabalho está corrompida: %s não existe"

-#: work.cc:350
+#: work.cc:422
 #, c-format
 msgid "working copy is corrupt: %s is a directory"
-msgstr ""
+msgstr "cópia de trabalho está corrompida: %s é um diretório"

-#: work.cc:360
+#: work.cc:432
 #, c-format
 msgid "Problem with working directory: %s is unreadable"
-msgstr ""
+msgstr "Problema com diretório de trabalho: %s é ilegível"

-#: work.cc:386
+#: work.cc:458
 #, c-format
 msgid "base revision %s does not exist in database\n"
-msgstr ""
+msgstr "versão-base %s não existe no banco de dados\n"

-#: work.cc:703 work.cc:714
+#: work.cc:775 work.cc:786
 #, c-format
 msgid "path %s already exists"
 msgstr "caminho '%s' já existe"

-#: work.cc:757
+#: work.cc:829
 #, c-format
 msgid "renaming '%s' onto existing file: '%s'\n"
-msgstr ""
+msgstr "renomeando '%s' para arquivo existente: '%s'\n"

-#: work.cc:776
+#: work.cc:848
 #, c-format
 msgid "file '%s' does not exist"
 msgstr "arquivo '%s' não existe"

-#: work.cc:777
+#: work.cc:849
 #, c-format
 msgid "file '%s' is a directory"
 msgstr "arquivo '%s' é um diretório"

-#: work.cc:782
+#: work.cc:854
 #, c-format
 msgid "content of file '%s' has changed, not overwriting"
-msgstr ""
+msgstr "conteúdo do arquivo '%s' mudou, arquivo não será sobrescrito"

-#: work.cc:783
+#: work.cc:855
 #, c-format
 msgid "updating %s to %s"
 msgstr "atualizando %s para %s"

-#~ msgid "initializing from directory %s\n"
-#~ msgstr "inicializando do diretório %s\n"
-
-#~ msgid "branch name is '%s'\n"
-#~ msgstr "nome do ramo é '%s'\n"
-
-#~ msgid "setting dump path to %s\n"
-#~ msgstr "configurando caminho de dump para %s\n"
-
-#~ msgid "creating working copy in %s\n"
-#~ msgstr "criando cópia de trabalho em %s\n"
-
-#~ msgid "'%s' ignored by restricted path set\n"
-#~ msgstr "'%s' ignorado pelo conjunto de caminhos restritos\n"
-
-#~ msgid "'%s' added to restricted path set\n"
-#~ msgstr "'%s' adicionado ao conjunto de caminhos restritos\n"
-
-#~ msgid "'%s' ignored by excluded path set\n"
-#~ msgstr "'%s' ignorado pelo conjunto de caminhos excluídos\n"
-
-#~ msgid "'%s' added to excluded path set\n"
-#~ msgstr "'%s' adicionado ao conjunto de caminhos excluídos\n"
-
-#~ msgid "checking excluded path set for '%s'\n"
-#~ msgstr "verificando conjunto de caminhos excluídos para '%s'\n"
-
-#~ msgid "path '%s' found in excluded path set; '%s' excluded\n"
-#~ msgstr ""
-#~ "caminho '%s' achado em conjunto de caminhos excluídos; '%s' excluído\n"
-
-#~ msgid "checking restricted path set for '%s'\n"
-#~ msgstr "verificando conjunto de caminhos restritos para '%s'\n"
-
-#~ msgid "path '%s' found in restricted path set; '%s' included\n"
-#~ msgstr ""
-#~ "caminho '%s' achado em conjunto de caminhos restritos; '%s' incluído\n"
-
-#~ msgid "set search root to %s\n"
-#~ msgstr "raiz de procura configurada para %s\n"
-
-#~ msgid "cert ok\n"
-#~ msgstr "certificado ok\n"
-
-#~ msgid "cert: signable text %s\n"
-#~ msgstr "certificado: texto assinável %s\n"
-
-#~ msgid "no private key '%s' found in key store or get_priv_key hook"
-#~ msgstr ""
-#~ "nenhuma chave privada '%s' achada no registro ou função get_priv_key"
-
-#~ msgid "concatenating %d and %d deltas\n"
-#~ msgstr "concatenando deltas %d e %d\n"
-
-#~ msgid "processing delta on %s\n"
-#~ msgstr "processando delta sobre %s\n"
-
-#~ msgid "delta on %s in first changeset renamed to %s\n"
-#~ msgstr "delta sobre %s no primeiro changeset renomeado para %s\n"
-
-#~ msgid "discarding delta [%s]->[%s] for deleted file '%s'\n"
-#~ msgstr "descartando delta [%s]->[%s] para arquivo removido '%s'\n"
-
-#~ msgid "fusing deltas on %s : %s -> %s and %s -> %s\n"
-#~ msgstr "combinando deltas sobre %s : %s -> %s e %s -> %s\n"
-
-#~ msgid "delta on %s in second changeset copied forward\n"
-#~ msgstr "delta sobre %s no segundo changeset copiado adiante\n"
-
-#~ msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'"
-#~ msgstr "incapaz de resolver conflito de arquivo '%s' -> '%s' vs. '%s'"
-
-#~ msgid "conflict detected, resolved in A's favour\n"
-#~ msgstr "conflito detectado, resolvido em favor de A\n"
-
-#~ msgid "conflict detected, resolved in B's favour\n"
-#~ msgstr "conflito detectado, resolvido em favor de B\n"
-
-#~ msgid "skipping delta '%s'->'%s' on deleted file '%s'\n"
-#~ msgstr "ignorando delta '%s'->'%s' sobre arquivo removido '%s'\n"
-
-#~ msgid "skipping neutral delta on '%s' : %s -> %s\n"
-#~ msgstr "ignorando delta neutro sobre '%s' : %s -> %s\n"
-
-#~ msgid "inverting change set\n"
-#~ msgstr "invertendo changeset\n"
-
-#~ msgid "converted 'delete %s' to 'add as %s' in inverse\n"
-#~ msgstr "convertido 'remover %s' para 'adicionar como %s' em inverso\n"
-
-#~ msgid "converted add %s to delete in inverse\n"
-#~ msgstr "convertido adicionar %s para remover em inverso\n"
-
-#~ msgid "expanding command '%s'\n"
-#~ msgstr "expandindo comando '%s'\n"
-
-#~ msgid "expanded command to '%s'\n"
-#~ msgstr "comando expandido para '%s'\n"
-
-#~ msgid "executing command '%s'\n"
-#~ msgstr "executando comando '%s'\n"
-
-#~ msgid "found %d %s branch certs on revision %s\n"
-#~ msgstr "foram encontrados %d %s certificados de ramo sobre versão %s\n"
-
-#~ msgid "writing file %s to %s\n"
-#~ msgstr "escrevendo arquivo %s em %s\n"
-
-#~ msgid "checking roster %s\n"
-#~ msgstr "verificando roster %s\n"
-
-#~ msgid "error parsing roster %s: %s"
-#~ msgstr "erro lendo roster %s: %s"
-
-#~ msgid "wrote debugging log to %s"
-#~ msgstr "registro de depuração escrito em %s"
-
-#~ msgid "read cset from %s\n"
-#~ msgstr "modificações lidas de %s\n"
-
-#~ msgid "executing SQL '%s'"
-#~ msgstr "executando comando SQL '%s'"