[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone: ea3d571673b994ff3e3a976239
|
From: |
code |
|
Subject: |
[Monotone-commits-diffs] net.venge.monotone: ea3d571673b994ff3e3a9762398ef8bc116fc8f6 |
|
Date: |
Fri, 18 Feb 2011 23:14:54 +0100 (CET) |
revision: ea3d571673b994ff3e3a9762398ef8bc116fc8f6
date: 2011-02-18T22:14:30
author: address@hidden
branch: net.venge.monotone
changelog:
merge of '83895a03d72455e0ab10da131e9d266c2368dfa8'
and 'de9e9908e92ada4e180ba3a46be6437325d2c5f1'
manifest:
format_version "1"
new_manifest [894b642e8d445150ce84a8cd947399fbb8225515]
old_revision [83895a03d72455e0ab10da131e9d266c2368dfa8]
rename "contrib/ciabot_monotone_hookversion.lua"
to "extra/mtn-hooks/monotone-ciabot.lua"
rename "contrib/ciabot_monotone_hookversion.py"
to "extra/mtn-hooks/monotone-ciabot.py"
add_dir "test/extra/ciabot"
add_dir "test/extra/ciabot/scripts"
add_file "test/extra/ciabot/__driver__.lua"
content [557ea25238e1e71804affaf8b05ddad9d9db1150]
add_file "test/extra/ciabot/ciabot.conf"
content [1c6d2fd5cf620165f9dbeab9e7c740755234e0d6]
add_file "test/extra/ciabot/monotone-ciabot.expected"
content [4d42ce557d78c5db72b8ae26e8a33278359832b2]
add_file "test/extra/ciabot/scripts/run-monotone-ciabot"
content [8a130b05df865ac293e8bd78433d6a59f8953a97]
patch "Makefile.am"
from [6f6130deff36a5e0458b9eeedfc7bcf5c86d8827]
to [76876b1be2336cc1f70ad906309e148e5d67ff7d]
patch "extra/mtn-hooks/monotone-ciabot.lua"
from [5d3f67c5f8bd79c0ac81e245861e1e44ec4d0a5b]
to [2c740631a022b622ddc3f0944d6a5f46e6efbd56]
patch "extra/mtn-hooks/monotone-ciabot.py"
from [f4173182b915944867217f4263e9eee812d2f85b]
to [cdbe8ebfec575ae31b8dd62ce3ee8108edc19ab4]
set "test/extra/ciabot/scripts/run-monotone-ciabot"
attr "mtn:execute"
value "true"
old_revision [de9e9908e92ada4e180ba3a46be6437325d2c5f1]
patch "po/de.po"
from [379bad17a79f6bde4809eeead52c83a7b16014c1]
to [89e65d58c42bd34b3bfbdbc451073024b8c29871]
patch "po/pt.po"
from [c61bef8eab6fda3f13d69ca6513f732e55811019]
to [b14b09a3b9d602f0378dcd0d83ffd9b330101f50]
============================================================
--- Makefile.am 6f6130deff36a5e0458b9eeedfc7bcf5c86d8827
+++ Makefile.am 76876b1be2336cc1f70ad906309e148e5d67ff7d
@@ -355,6 +355,7 @@ EXTRA_DIST = \
innosetup/monotone.bmp innosetup/dlls.sh \
\
src/std_hooks.lua \
+ test/common \
test/func test/func-testsuite.lua \
test/tester test/tester-testsuite.lua \
$(wildcard $(srcdir)/test/unit/*.cc) \
============================================================
--- contrib/ciabot_monotone_hookversion.py f4173182b915944867217f4263e9eee812d2f85b
+++ extra/mtn-hooks/monotone-ciabot.py cdbe8ebfec575ae31b8dd62ce3ee8108edc19ab4
@@ -20,7 +20,9 @@
# configuration directory (whatever is returned by get_confdir()).
# That configuration file follows basic-io syntax, the comments in
# the config class is the best documentation for now.
-# -- include ciabot_monotone_hookversion.lua in the server's monotonerc
+# -- include monotone-ciabot.lua in the server's monotonerc
+# -- add a variable 'ciabot_python_script in the server's monotonerc,
+# that points to this script.
import sys
import re
@@ -207,7 +209,7 @@ def send_change_for(rid, branch, author,
message_tmpl = """<message>
<generator>
<name>Monotone CIA Bot client python script</name>
- <version>0.9</version>
+ <version>1.0</version>
</generator>
<source>
<project>%(project)s</project>
============================================================
--- contrib/ciabot_monotone_hookversion.lua 5d3f67c5f8bd79c0ac81e245861e1e44ec4d0a5b
+++ extra/mtn-hooks/monotone-ciabot.lua 2c740631a022b622ddc3f0944d6a5f46e6efbd56
@@ -20,7 +20,7 @@ do
-- Configure with the path to the
-- corresponding python script
if not ciabot_python_script then
- print "Please configure by defining 'ciabot_python_script' with the path to the python script ciabot_monotone_hookversion.py"
+ print "Please configure by defining 'ciabot_python_script' with the path to the python script monotone_ciabot.py"
return "continue",nil
end
============================================================
--- /dev/null
+++ test/extra/ciabot/__driver__.lua 557ea25238e1e71804affaf8b05ddad9d9db1150
@@ -0,0 +1,52 @@
+skip_if(not existsonpath("python"))
+
+includecommon("netsync.lua")
+
+mtn_setup()
+netsync.setup()
+append("netsync.lua", "\n\
+\n\
+includedirpattern(get_confdir() .. \"/hooks.d\",\"*.conf\")\n\
+includedirpattern(get_confdir() .. \"/hooks.d\",\"*.lua\")\n\
+")
+
+mkdir("hooks.d")
+mkdir("scripts")
+check(copy(srcdir.."/../extra/mtn-hooks/monotone-ciabot.lua",
+ "hooks.d/monotone-ciabot.lua"))
+check(copy(srcdir.."/../extra/mtn-hooks/monotone-ciabot.py",
+ "scripts/monotone-ciabot.py"))
+
+-- To make life easier, we run monotone-ciabot.py via the script
+-- run-monotone-ciabot, which makes sure the output ends up in a
+-- known file.
+check(get("scripts/run-monotone-ciabot"))
+
+-- Get+write the ciabot configuration
+check(get("ciabot.conf"))
+writefile("hooks.d/monotone-ciabot.conf",
+ "ciabot_python_script = \"" .. test.root .. "/scripts/run-monotone-ciabot\"\n")
+
+-- A file with expected result
+check(get("monotone-ciabot.expected"))
+
+-- Serve test2.db
+srv = netsync.start(2)
+
+-- Add some revisions to push
+addfile("test1", "foo")
+addfile("test2", "bar")
+commit()
+writefile("test2", "foobar")
+commit()
+
+-- Do the transfer
+srv:push("testbranch",1)
+
+srv:stop()
+
+check(exists("monotone-ciabot.err"))
+check(fsize("monotone-ciabot.err") == 0)
+check(exists("monotone-ciabot.out"))
+check(samefile("monotone-ciabot.out",
+ "monotone-ciabot.expected"))
============================================================
--- /dev/null
+++ test/extra/ciabot/ciabot.conf 1c6d2fd5cf620165f9dbeab9e7c740755234e0d6
@@ -0,0 +1,5 @@
+delivery "debug"
+url "http://test.net/commit/%(revision)s"
+
+pattern "testbranch"
+projectid "test"
============================================================
--- /dev/null
+++ test/extra/ciabot/monotone-ciabot.expected 4d42ce557d78c5db72b8ae26e8a33278359832b2
@@ -0,0 +1,19 @@
+<message>
+ <generator>
+ <name>Monotone CIA Bot client python script</name>
+ <version>1.0</version>
+ </generator>
+ <source>
+ <project>test</project>
+ <branch>testbranch</branch>
+ </source>
+ <body>
+ <commit>
+ <revision>425f7d00baffb1f43a12b60f106b2293d5dddd7c</revision>
+ <author>address@hidden</author>
+ <files><file action="">test2</file></files>
+ <log>blah-blah</log>
+ <url>http://test.net/commit/425f7d00baffb1f43a12b60f106b2293d5dddd7c</url>
+ </commit>
+ </body>
+</message>
============================================================
--- /dev/null
+++ test/extra/ciabot/scripts/run-monotone-ciabot 8a130b05df865ac293e8bd78433d6a59f8953a97
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+"`dirname $0`"/monotone-ciabot.py "$@" \
+ > monotone-ciabot.out \
+ 2> monotone-ciabot.err
============================================================
--- po/de.po 379bad17a79f6bde4809eeead52c83a7b16014c1
+++ po/de.po 89e65d58c42bd34b3bfbdbc451073024b8c29871
@@ -407,6 +407,10 @@ msgstr ""
"please send this error message, the output of '%s version --full',\n"
"and a description of what you were doing to <%s>."
msgstr ""
+"Fataler Fehler: %s\n"
+"Dies ist ganz bestimmt ein Fehler in monotone.\n"
+"Bitte senden Sie diese Nachricht, die Ausgabe von '%s version --full',\n"
+"sowie eine Beschreibung Ihrer Tätigkeit an <%s>."
#: src/ui.cc:671
#, c-format
@@ -419,6 +423,13 @@ msgstr ""
"database you were using, so please preserve it in case it can\n"
"help in finding the bug."
msgstr ""
+"Fataler Fehler: %s\n"
+"Dies ist ganz bestimmt ein Fehler in monotone.\n"
+"Bitte senden Sie diese Nachricht, die Ausgabe von '%s version --full',\n"
+"sowie eine Beschreibung Ihrer Tätigkeit an <%s>.\n"
+"Dieser Fehler scheint durch etwas in der Datenbank ausgelöst worden\n"
+"zu sein, die Sie gerade benutzen. Bitte sichern Sie diese daher für\n"
+"den Fall, dass sie für das Finden des Fehlers nützlich wird."
#: src/ui.cc:713
msgid "error: memory exhausted"
@@ -692,7 +703,7 @@ msgid "monotone \\- a distributed versio
#: src/cmd.cc:914
msgid "monotone \\- a distributed version control system"
-msgstr ""
+msgstr "monotone \\- ein verteiltes Versionskontrollsystem"
#: src/cmd.cc:915
msgid "Synopsis"
@@ -753,7 +764,7 @@ msgid "Bugs"
#: src/cmd.cc:944
msgid "Bugs"
-msgstr ""
+msgstr "Fehler"
#: src/cmd.cc:945
#, c-format
@@ -762,7 +773,7 @@ msgid "Authors"
#: src/cmd.cc:948
msgid "Authors"
-msgstr ""
+msgstr "Autoren"
#: src/cmd.cc:949
msgid ""
@@ -770,6 +781,10 @@ msgstr ""
"and has since then received numerous contributions from many individuals. A "
"complete list of authors can be found in AUTHORS."
msgstr ""
+"monotone wurde ursprünglich von Graydon Hoare <address@hidden> im Jahr "
+"2003 geschrieben und hat seitdem eine Vielzahl von Beiträgen von vielen "
+"verschiedenen Individuen erhalten. Eine komplette Liste der Autoren kann in "
+"AUTHORS eingesehen werden."
#: src/cmd.cc:954
msgid ""
@@ -781,7 +796,7 @@ msgid "Copyright"
#: src/cmd.cc:957
msgid "Copyright"
-msgstr ""
+msgstr "Copyright"
#: src/cmd.cc:958
#, c-format
@@ -789,6 +804,8 @@ msgstr ""
"monotone and this man page is Copyright (c) 2003 \\- %s by the monotone "
"development team."
msgstr ""
+"monotone und diese Handbuchseite sind urheberrechtlich geschützt (C) 2003 \\- %"
+"s durch das monotone Entwicklerteam."
#: src/cmd.cc:970
#, c-format
@@ -870,7 +887,8 @@ msgid "would receive %d revisions, %d ce
#: src/cmd_netsync.cc:293
#, c-format
msgid "would receive %d revisions, %d certs, and at least %d keys\n"
-msgstr "würde %d Revisionen, %d Zertifikate und mindestens %d Schlüssel erhalten\n"
+msgstr ""
+"würde %d Revisionen, %d Zertifikate und mindestens %d Schlüssel erhalten\n"
#: src/cmd_netsync.cc:300
#, c-format
@@ -2437,6 +2455,7 @@ msgstr "Zeigt die derzeitigen Unterschie
msgid "Shows current differences"
msgstr "Zeigt die derzeitigen Unterschiede"
+#
#: src/cmd_diff_log.cc:418
msgid ""
"Compares the current tree with the files in the repository and prints the "
@@ -2500,6 +2519,7 @@ msgstr "Gibt die ausgewählte Historie v
msgid "Prints selected history in forward or reverse order"
msgstr "Gibt die ausgewählte Historie vorwärts oder rückwärts aus"
+#
#: src/cmd_diff_log.cc:979
msgid ""
"This command prints selected history in forward or reverse order, filtering "
@@ -4657,12 +4677,12 @@ msgid ""
#: src/database.cc:4850
#, c-format
msgid ""
-"existing (possibly stale) journal file '%s' has same stem as new database "
-"'%s'\n"
+"existing (possibly stale) journal file '%s' has same stem as new database '%"
+"s'\n"
"cancelling database creation"
msgstr ""
-"Existierende Journal-Datei '%s' hat denselben Stamm wie die neue Datenbank "
-"'%s'\n"
+"Existierende Journal-Datei '%s' hat denselben Stamm wie die neue Datenbank '%"
+"s'\n"
"Datenbankerstellung abgebrochen"
#: src/database.cc:5012
@@ -4889,8 +4909,8 @@ msgid ""
#: src/ssh_agent.cc:376
#, c-format
msgid ""
-"ssh_agent: get_keys: not all or too many packet bytes consumed, location "
-"(%u), length (%i)"
+"ssh_agent: get_keys: not all or too many packet bytes consumed, location (%"
+"u), length (%i)"
msgstr ""
"ssh_agent: get_keys: nicht alle oder zu viele Paket-Bytes verarbeitet, "
"location (%u), length (%i)"
@@ -4914,8 +4934,8 @@ msgid ""
#: src/ssh_agent.cc:472
#, c-format
msgid ""
-"ssh_agent: sign_data: not all or too many packet bytes consumed, location "
-"(%u), length (%i)"
+"ssh_agent: sign_data: not all or too many packet bytes consumed, location (%"
+"u), length (%i)"
msgstr ""
"ssh_agent: sign_data: nicht alle oder zu viele Paket-Bytes verarbeitet, "
"location (%u), length (%i)"
@@ -5036,8 +5056,8 @@ msgstr ""
#, c-format
msgid "malformed key_packet: invalid private key data for '%s': %s"
msgstr ""
-"falsch gebildetes Schlüssel-Paket: ungültige private Schlüsseldaten für "
-"'%s': %s"
+"falsch gebildetes Schlüssel-Paket: ungültige private Schlüsseldaten für '%"
+"s': %s"
#: src/key_packet.cc:149
#, c-format
@@ -5896,8 +5916,8 @@ msgstr ""
"code %d)\n"
"%s"
msgstr ""
-"Protokoll-Version stimmt nicht überein: benötige Version zwischen '%d' und "
-"'%d', bekam '%d' (netcmd code %d)\n"
+"Protokoll-Version stimmt nicht überein: benötige Version zwischen '%d' und '%"
+"d', bekam '%d' (netcmd code %d)\n"
"%s"
#: src/netcmd.cc:146
@@ -6060,8 +6080,8 @@ msgstr ""
#, c-format
msgid "restriction includes deletion of '%s' but excludes deletion of '%s'"
msgstr ""
-"Die Beschränkung schlieÃt das Löschen von '%s' ein, jedoch das Löschen von "
-"'%s' aus."
+"Die Beschränkung schlieÃt das Löschen von '%s' ein, jedoch das Löschen von '%"
+"s' aus."
#: src/roster.cc:2488
#, c-format
@@ -6721,8 +6741,8 @@ msgstr ""
"check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d "
"heights; %d branches"
msgstr ""
-"Ãberprüfung beendet: %d Dateien; %d Kataloge; %d Revisionen; %d Schlüssel; "
-"%d Zertifikate; %d Höhenangaben; %d Zweige"
+"Ãberprüfung beendet: %d Dateien; %d Kataloge; %d Revisionen; %d Schlüssel; %"
+"d Zertifikate; %d Höhenangaben; %d Zweige"
#: src/database_check.cc:1206
#, c-format
@@ -6848,8 +6868,8 @@ msgstr ""
#, c-format
msgid "selector '%s' is invalid, it contains an unknown escape sequence '%s%s'"
msgstr ""
-"Selektor '%s' ist ungültig, er beinhaltet eine unbekannte Escapesequenz '%s"
-"%s'"
+"Selektor '%s' ist ungültig, er beinhaltet eine unbekannte Escapesequenz '%s%"
+"s'"
#: src/selectors.cc:770
#, c-format
============================================================
--- po/pt.po c61bef8eab6fda3f13d69ca6513f732e55811019
+++ po/pt.po b14b09a3b9d602f0378dcd0d83ffd9b330101f50
@@ -2,20 +2,22 @@
# Copyright (C) 2003 - 2011 The monotone development team <http://www.monotone.ca>
# This file is distributed under the same license as the monotone package.
# Please see po/README.<lang> for individual copyrights.
-#
+#
+# Américo Monteiro <address@hidden>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: monotone\n"
"Report-Msgid-Bugs-To: https://code.monotone.ca/p/monotone/issues/\n"
"POT-Creation-Date: 2011-02-18 01:10+0100\n"
-"PO-Revision-Date: 2011-02-18 00:18+0000\n"
-"Last-Translator: tommyd <address@hidden>\n"
-"Language-Team: LANGUAGE <address@hidden>\n"
+"PO-Revision-Date: 2011-02-18 01:36+0000\n"
+"Last-Translator: Américo Monteiro <address@hidden>\n"
+"Language-Team: Portuguese <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pt\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Lokalize 1.0\n"
#: src/sanity.cc:252
#, c-format
@@ -405,6 +407,10 @@ msgstr ""
"please send this error message, the output of '%s version --full',\n"
"and a description of what you were doing to <%s>."
msgstr ""
+"fatal: %s\n"
+"isto é certamente um bug no monotone.\n"
+"por favor envie esta mensagem de erro, o resultado de '%s version --full',\n"
+"e uma descrição do que você estava a fazer para <%s>."
#: src/ui.cc:671
#, c-format
@@ -417,6 +423,13 @@ msgstr ""
"database you were using, so please preserve it in case it can\n"
"help in finding the bug."
msgstr ""
+"fatal: %s\n"
+"isto é certamente um bug no monotone.\n"
+"por favor envie esta mensagem de erro, o resultado de '%s version --full',\n"
+"e uma descrição do que você estava a fazer para <%s>. "
+"Este erro parece ter sido provocado por algo na base de dados que você\n"
+"está a usar, portanto por favor preserve-a no caso de ela poder ajudar\n"
+"a descobrir o bug."
#: src/ui.cc:713
msgid "error: memory exhausted"
@@ -689,7 +702,7 @@ msgid "monotone \\- a distributed versio
#: src/cmd.cc:914
msgid "monotone \\- a distributed version control system"
-msgstr ""
+msgstr "monotone \\- um sistema de controle de versão distribuÃdo"
#: src/cmd.cc:915
msgid "Synopsis"
@@ -751,7 +764,7 @@ msgid "Bugs"
#: src/cmd.cc:944
msgid "Bugs"
-msgstr ""
+msgstr "Bugs"
#: src/cmd.cc:945
#, c-format
@@ -760,7 +773,7 @@ msgid "Authors"
#: src/cmd.cc:948
msgid "Authors"
-msgstr ""
+msgstr "Autores"
#: src/cmd.cc:949
msgid ""
@@ -768,6 +781,9 @@ msgstr ""
" 2003 and has since then received numerous contributions from many "
"individuals. A complete list of authors can be found in AUTHORS."
msgstr ""
+"O monotone foi escrito originalmente por Graydon Hoare <address@hidden> "
+"em 2003 e desde isso tem recebido numerosas contribuições de muitos "
+"indivÃduos. Uma lista completa dos autores pode ser encontrada em AUTORES."
#: src/cmd.cc:954
msgid ""
@@ -780,7 +796,7 @@ msgid "Copyright"
#: src/cmd.cc:957
msgid "Copyright"
-msgstr ""
+msgstr "Copyright"
#: src/cmd.cc:958
#, c-format
@@ -788,6 +804,8 @@ msgstr ""
"monotone and this man page is Copyright (c) 2003 \\- %s by the monotone "
"development team."
msgstr ""
+"o monotone e o seu manual tem Copyright (c) 2003 \\- %s pela equipa de "
+"desenvolvimento do monotone."
#: src/cmd.cc:970
#, c-format
@@ -828,6 +846,9 @@ msgstr ""
"we can't verify the server key, because we have no record of\n"
"what it should be."
msgstr ""
+"Nenhuma base de dados fornecida; a assumir a base de dados '%s'. Isto\n"
+"significa que não podemos verificar a chave do servidor, porque não\n"
+"temos nenhum registo do que deverá ser."
#: src/cmd_netsync.cc:212
msgid "COMMAND [ARGS]"
@@ -1040,7 +1061,7 @@ msgid "Lists certificates attached to a
#: src/cmd_list.cc:101
msgid "Lists certificates attached to a revision"
-msgstr ""
+msgstr "Lista os certificados anexados a uma revisão"
#: src/cmd_list.cc:129 src/cmd_list.cc:1050
#, c-format
@@ -1149,16 +1170,16 @@ msgid "%s (in %s)"
#: src/cmd_list.cc:659
#, c-format
msgid "%s (in %s)"
-msgstr ""
+msgstr "%s (em %s)"
#: src/cmd_list.cc:663
#, c-format
msgid "no known valid workspaces"
-msgstr ""
+msgstr "nenhum espaço de trabalho válido conhecido"
#: src/cmd_list.cc:667
msgid "Lists known workspaces of a specified database"
-msgstr ""
+msgstr "Lista os espaços de trabalho conhecidos de uma base de dados especificada"
#: src/cmd_list.cc:677
msgid "Lists managed databases and their known workspaces"
@@ -1174,7 +1195,7 @@ msgid "could not query default database
#: src/cmd_list.cc:688 src/database.cc:5055
#, c-format
msgid "could not query default database glob"
-msgstr ""
+msgstr "incapaz de consultar o glob da base de dados predefinida"
#: src/cmd_list.cc:735
#, c-format
@@ -1184,7 +1205,7 @@ msgid "%s (in %s):"
#: src/cmd_list.cc:739
#, c-format
msgid "%s (in %s):"
-msgstr ""
+msgstr "%s (em %s):"
#: src/cmd_list.cc:746
msgid "Lists workspace files that belong to the current branch"
@@ -1193,10 +1214,12 @@ msgstr ""
#: src/cmd_list.cc:805
msgid "Lists workspace files that are unknown in the current branch"
msgstr ""
+"Lista os ficheiros do espaço de trabalho que são desconhecidos no branch "
+"actual"
#: src/cmd_list.cc:817
msgid "Lists workspace files that are ignored in the current branch"
-msgstr ""
+msgstr "Lista os ficheiros do espaço de trabalho que estão ignorados no branch actual"
#: src/cmd_list.cc:829
msgid "Lists files that belong to the branch but are not in the workspace"
@@ -1438,7 +1461,7 @@ msgid "REV (pass|fail|true|false|yes|no|
#: src/cmd_key_cert.cc:376
msgid "REV (pass|fail|true|false|yes|no|1|0)"
-msgstr ""
+msgstr "REV (pass|fail|true|false|yes|no|1|0)"
#: src/cmd_key_cert.cc:377
msgid "Notes the results of running a test on a revision"
@@ -1795,14 +1818,14 @@ msgid "0 conflicts"
#: src/cmd_merging.cc:1042
#, c-format
msgid "0 conflicts"
-msgstr ""
+msgstr "0 conflitos"
#: src/cmd_merging.cc:1077
#, c-format
msgid "%d conflict with supported resolutions."
msgid_plural "%d conflicts with supported resolutions."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d conflito com resolução suportada."
+msgstr[1] "%d conflitos com resoluções suportadas."
#: src/cmd_merging.cc:1082 src/cmd_conflicts.cc:160 src/cmd_conflicts.cc:173
#, c-format
@@ -1876,7 +1899,7 @@ msgid "stored in '%s'"
#: src/cmd_merging.cc:1202
#, c-format
msgid "stored in '%s'"
-msgstr ""
+msgstr "armazenado em '%s'"
#: src/cmd_merging.cc:1205
msgid "LEFT_REVID LEFT_FILENAME RIGHT_REVID RIGHT_FILENAME"
@@ -1897,7 +1920,7 @@ msgid "[PATH...]"
#: src/cmd_merging.cc:1263
msgid "[PATH...]"
-msgstr ""
+msgstr "[PATH...]"
#: src/cmd_merging.cc:1264
msgid "Applies changes made at arbitrary places in history"
@@ -2465,7 +2488,7 @@ msgid "Lists the selected revision histo
#: src/cmd_diff_log.cc:992
msgid "Lists the selected revision history"
-msgstr ""
+msgstr "Lista o histórico da revisão seleccionada"
#: src/cmd_ws_commit.cc:179
#, c-format
@@ -2615,7 +2638,7 @@ msgid "PATH..."
#: src/cmd_ws_commit.cc:547
msgid "PATH..."
-msgstr ""
+msgstr "PATH..."
#: src/cmd_ws_commit.cc:548
msgid "Reverses a mistaken 'drop'"
@@ -3323,7 +3346,7 @@ msgid "PARENT_FILEID LEFT_FILEID RIGHT_F
#: src/cmd_files.cc:58
msgid "PARENT_FILEID LEFT_FILEID RIGHT_FILEID"
-msgstr ""
+msgstr "PARENT_FILEID LEFT_FILEID RIGHT_FILEID"
#: src/cmd_files.cc:59
msgid "Merges 3 files and outputs the result"
@@ -3557,7 +3580,7 @@ msgid "'%s' is not a supported conflict
#: src/cmd_conflicts.cc:200
#, c-format
msgid "'%s' is not a supported conflict resolution for %s"
-msgstr ""
+msgstr "'%s' não é uma resolução de conflito suportada para %s"
#: src/cmd_conflicts.cc:250 src/cmd_conflicts.cc:255
#, c-format
@@ -3579,12 +3602,12 @@ msgid "interactive merge result saved in
#: src/cmd_conflicts.cc:401
#, c-format
msgid "interactive merge result saved in '%s'"
-msgstr ""
+msgstr "resultados da fusão interactiva guardados em '%s'"
#: src/cmd_conflicts.cc:404
#, c-format
msgid "interactive merge failed."
-msgstr ""
+msgstr "fusão interactiva falhada."
#: src/cmd_conflicts.cc:428
#, c-format
@@ -3619,7 +3642,7 @@ msgid "Set the resolution for the first
#: src/cmd_conflicts.cc:476
msgid "Set the resolution for the first unresolved single-file conflict."
-msgstr ""
+msgstr "Define a resolução para o primeiro conflito de ficheiro único por resolver."
#: src/cmd_conflicts.cc:490
msgid "Set the left resolution for the first unresolved two-file conflict"
@@ -3756,6 +3779,8 @@ msgstr ""
#, c-format
msgid "could not unregister workspace from old database '%s'"
msgstr ""
+"incapaz de remover o registo do espaço de trabalho da antiga base de dados "
+"'%s'"
#: src/work.cc:733
#, c-format
@@ -4598,7 +4623,7 @@ msgid "using default database '%s'"
#: src/database.cc:5037
#, c-format
msgid "using default database '%s'"
-msgstr ""
+msgstr "a usar a base de dados predefinida '%s'"
#: src/database.cc:5047
#, c-format
@@ -5240,12 +5265,12 @@ msgid " include pattern %s"
#: src/netsync.cc:113
#, c-format
msgid " include pattern %s"
-msgstr ""
+msgstr " padrão de inclusão %s"
#: src/netsync.cc:114
#, c-format
msgid " exclude pattern %s"
-msgstr ""
+msgstr " padrão de exclusão %s"
#: src/netsync.cc:163
#, c-format
@@ -5333,7 +5358,7 @@ msgid "a non-empty hostname is expected
#: src/network/connection_info.cc:284
#, c-format
msgid "a non-empty hostname is expected for the 'mtn' uri scheme"
-msgstr ""
+msgstr "é esperado um nome de máquina não-vazio para o esquema de url 'mtn'"
#: src/network/connection_info.cc:346
#, c-format
@@ -7693,6 +7718,8 @@ msgstr ""
"automatically update the workspace, if it was at a head and the command"
" creates a new head"
msgstr ""
+"actualiza o espaço de trabalho automaticamente, se estava à cabeça e o "
+"comando cria uma nova cabeça"
#: src/options_list.hh:225
msgid "address:port to listen on (default :4691)"
@@ -8473,3 +8500,4 @@ msgstr "Carregue em enter quando o sub-p
#: src/std_hooks.lua:58
msgid "Press enter when the subprocess has completed"
msgstr "Carregue em enter quando o sub-processo estiver completo"
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone: ea3d571673b994ff3e3a9762398ef8bc116fc8f6,
code <=