[Monotone-commits-diffs] net.venge.monotone: 024beb70aff3dac4e8b10c4628f58b3294fa2a4f

[code]

revision:            024beb70aff3dac4e8b10c4628f58b3294fa2a4f
date:                2011-01-10T00:54:19
author:              address@hidden
branch:              net.venge.monotone
changelog:
merge of '36d234fc9438e6b042f300cf3753305d0168bcb5'
     and 'd9da2976016ece4373f61b6d3bcc75a880dd7cb7'



manifest:
format_version "1"

new_manifest [f744782ac4ad9d5f3926438351039a46f7ee7abc]

old_revision [36d234fc9438e6b042f300cf3753305d0168bcb5]

patch "monotone.texi"
 from [445da1772f7c08f18167e63484cef6604aba0807]
   to [e7b83d69b71f7f4fe7f15936bd6bbd46d331b825]

old_revision [d9da2976016ece4373f61b6d3bcc75a880dd7cb7]

patch "po/pt.po"
 from [84122714c76210a89c85ab942336f0ee039aeabd]
   to [2e175dd6aebf10559748910a85e7888754277112]

patch "po/sv.po"
 from [bb39ba476f5d0e053d07773116b7869ed3841ea2]
   to [66e25c913d0ac84d429945643c9d2353881670f7]
============================================================
--- monotone.texi	445da1772f7c08f18167e63484cef6604aba0807
+++ monotone.texi	e7b83d69b71f7f4fe7f15936bd6bbd46d331b825
@@ -2686,7 +2686,6 @@ @chapter Advanced Uses
 * Reserved Certs::              Certificate names with special meanings.
 * Naming Conventions::          Choosing appropriate names for keys and branches.
 * File Attributes::             Marking files as executable, or other attributes.
-* Merging::                     Merging with external tools, handling binary files.
 * Migrating and Dumping::       Changing the underlying storage system.
 * Importing from CVS::          Building a monotone database from a CVS repository.
 * Exporting to GIT::            Building a git repository from a monotone database.
@@ -3220,6 +3219,16 @@ @section Merge Conflicts
 are not done; the @command{merge} command must be repeated, possibly
 with new conflicts and resolutions, to merge the remaining heads.
 
+For the special case of file content conflicts, a merge command
+invoked without @command{--resolve-conflicts} will attempt to start an
+external interactive merge tool; the user must then resolve the conflicts
+and terminate the merge tool, letting monotone continue with the
+merge. This process is repeated for each file content conflict. See
address@hidden Content Conflicts} below for more detail.
+
+For other conflicts, a merge command invoked without
address@hidden will fail.
+
 If @command{conflicts} supports resolving a particular conflict, that
 is the simplest way to resolve it. Otherwise, resolving the different
 types of conflicts is accomplished by checking out one of the
@@ -3227,49 +3236,62 @@ @section Merge Conflicts
 these changes as a new revision and then running the merge again using
 this new revision as one of the merge parents. This process can be
 repeated as necessary to get two revisions into a state where they
-will merge cleanly, or with a minimum of file content conflicts.
+will merge cleanly.
 
 The possible conflict resolutions are discussed with each conflict in
 the following sections.
 
 @subsection Conflict Types
 
-Monotone versions both files and directories explicitly and it tracks
-individual file and directory identity from birth to death so that
-name changes throughout the full life-cycle can be tracked exactly.
-Partly because of these qualities, monotone also notices several types
-of conflicts that other version control systems may not.
+Monotone versions files, directories, and file attributes explicitly,
+and it tracks individual file and directory identity from birth to
+death so that name changes throughout the full life-cycle can be
+tracked exactly.  Partly because of these qualities, monotone notices
+several types of conflicts that other version control systems may not.
 
 The two most common conflicts are described first, then all other
 possible conflicts.
 
 @subheading File Content Conflict
-
address@hidden Content Conflict}
 This type of conflict is generally the one encountered most commonly
 and represents conflicting changes made to lines of text within two
 versions of a single file.
 
-Monotone does not generally use CVS style conflict markers for content
-conflicts. Instead it makes the content of both conflicting files and
-the content of their common ancestor available for interactive use
-during the merge with your favorite merge tool. See the @code{merge3}
-hook for more information.
+When a merge command encounters changes in a file in both heads
+relative to the common ancestor, it first checks to see if the file
+has a @code{mtn:manual_merge} attribute with value @code{true}. If
+not, it uses an internal merge algorithm to detect whether the changes
+are to the same lines of the file. If they are not, monotone will use
+the result of the internal merge as the new file version.
 
-Alternatively, rather than using a merge tool it is possible to make
-further changes to one or both of the conflicting file versions so
-that they will merge cleanly. This can also be a very helpful strategy
-if the merge conflicts are due to sections of text in the file being
-moved from one location to another. Rather than struggling to merge
-such conflicting changes with a merge tool, similar rearrangements can
-be made to one of the conflicting files before redoing the merge.
address@hidden:manual_merge} is set @code{true} when a file is
address@hidden for all files for which the @code{binary_file} hook
+returns true; see @ref{attr_init_functions}.
 
-Finally, you can use your favorite merge tool asychronously with the
-merge, and specify the result file in the conflicts file, using the
address@hidden command (@pxref{Conflicts}):
+If @code{mtn:manual_merge} is present and @code{true}, or if the
+changes are to the same lines of the file, and neither
address@hidden nor @command{--non-interactive} was
+specified, the @ref{merge3} hook is called, with the content of both
+conflicting versions and their common ancestor.
+
+Alternatively, you can use your favorite merge tool asychronously with
+the merge, and specify the result file in the conflicts file, using
+the @ref{Conflicts} command:
 @smallexample
 mtn conflicts resolve_first user filename
 @end smallexample
+Then @command{--resolve-conflicts} is specified on the merge command
+line.
 
+Finally, rather than using a merge tool it is possible to commit
+changes to one or both of the conflicting file versions so that they
+will merge cleanly. This can also be a very helpful strategy if the
+merge conflicts are due to sections of text in the file being moved
+from one location to another. Rather than struggling to merge such
+conflicting changes with a merge tool, similar rearrangements can be
+made to one of the conflicting files before redoing the merge.
+
 @subheading Duplicate Name Conflict
 
 A duplicate name conflict occurs when two distinct files or
@@ -3305,17 +3327,19 @@ @subsubheading Same file
 directories.
 
 @subsubheading Same file
-For the first case, the conflict is resolved by dropping one file,
-using @command{conflicts} commands. The contents should be manually
-merged, in case they are slightly different. Typically, a user will
-have one of the files in their current workspace; the other can be
-retrieved via @command{automate get_file_of}; the revision id is shown
-in the merge error message.
+For the first case, the conflict is resolved by dropping one file. The
+contents should be manually merged, in case they are slightly
+different. Typically, a user will have one of the files in their
+current workspace; the other can be retrieved via @command{automate
+get_file_of}; the revision id is shown in the merge error message.
 
-The process for files can be confusing; here's a detailed example.
+This process can be confusing; here's a detailed example. We assume
+the @ref{Conflicts} commands are used to resolve this conflict, since
+that is supported.
 
-Suppose Beth and Abe each commit a new file @file{checkout.sh}. When
-Beth attempts to merge the two heads, she gets a message like:
+Suppose Beth and Abe each commit a new file @file{checkout.sh}, with
+similar contents. When Beth attempts to merge the two heads, she gets
+a message like:
 
 @smallexample
 @group
@@ -3376,7 +3400,7 @@ @subsubheading Different files
 @file{thermostat}. When Beth attempts to merge, she will get the same
 error message as in the first case. When she retrieves Abe's file, she
 will see that they should be different files. So she renames her file,
-merges, and updates:
+merges, and updates (again using @ref{Conflicts} commands):
 
 @smallexample
 @group
@@ -3389,17 +3413,19 @@ @subsubheading Different files
 @end group
 @end smallexample
 
-Now she has her file in @file{thermostat-honeywell}, and Abe's in
address@hidden
+Now she has her file contents in @file{thermostat-honeywell}, and
+Abe's in @file{thermostat-westinghouse}.
 
 @subsubheading Directories
 When two directories are given the same name, there are still the two
 basic approaches to resolving the conflict; drop or rename. However,
 if a directory is dropped, all the files in it must also be dropped.
 Therefore, it is almost always better to first rename one of the
-directories to a temporary name as the conflict resolution, and
-then deal with the files individually, renaming or merging and
-dropping each. Then finally drop the temporary directory.
+directories to a temporary name as the conflict resolution, and then
+deal with the files individually, renaming or merging and dropping
+each. Then finally drop the temporary directory. The
address@hidden commands do not support doing this; it must be
+done directly.
 
 @subheading Missing Root Conflict
 
@@ -4007,7 +4033,7 @@ @section Naming Conventions
 @end itemize
 
 @page
address@hidden    File Attributes, Merging, Naming Conventions, Advanced Uses
address@hidden    File Attributes, Migrating and Dumping, Naming Conventions, Advanced Uses
 @section File Attributes
 
 Monotone contains a support for storing @dfn{persistent attributes} on
@@ -4055,48 +4081,7 @@ @section File Attributes
 reserved for monotone's own use.
 
 @page
address@hidden    Merging, Migrating and Dumping, File Attributes, Advanced Uses
address@hidden Merging
-
-Monotone has two merging modes, controlled by the @code{manual_merge}
-attribute.
-By default all files are merged in automatic mode, unless the
address@hidden attribute for that file is present and
address@hidden
-In automatic mode files are merged without user intervention, using
-monotone's internal three-way merging algorithm.
-Only if there are conflicts or an ancestor is not available monotone
-switches to manual mode, essentially escalating the merging to the user.
-When working in manual mode, monotone invokes the @code{merge3} hook
-to start an user defined external merge tool.
-If the tool terminates without writing the merged file, monotone aborts the
-merging, reverting any changes made.
-By redefining the aforementioned hooks the user can not only choose a
-preferred merge tool, but even select different programs for different
-file types.  For example, gimp for .png files, OpenOffice.org for
-.doc, and so on.
-Starting with monotone 0.20, the @code{manual_merge} attribute is
-automatically set at add time for all ``binary'' files, i.e. all files
-for which the @code{binary_file} hook returns true.
-Currently, this means all files with extension gif, jpeg, png, bz2, gz
-and zip, plus files containing at least one of the following
-bytes:
-
address@hidden
address@hidden
-0x00 thru 0x06
-0x0E thru 0x1a
-0x1c thru 0x1f
address@hidden group
address@hidden smallexample
-
-The attribute could also be manually forced or removed using the
-appropriate monotone commands.
-Remember that monotone switches to manual merging even if only one of
-the files to be merged has the @code{manual_merge} attribute set.
-
address@hidden
address@hidden    Migrating and Dumping, Importing from CVS, Merging, Advanced Uses
address@hidden    Migrating and Dumping, Importing from CVS, File Attributes, Advanced Uses
 @section Migrating and Dumping
 
 While the state of your database is logically captured in terms of a
@@ -5136,6 +5121,8 @@ @section Tree
 have a branch with two heads, and you want to propagate one of them to
 another branch, again, you can use this command.
 
address@hidden Conflicts} can occur.
+
 @item mtn heads address@hidden
 This command lists the ``heads'' of @var{branchname} (defaults to the
 current workspace).
@@ -5360,7 +5347,7 @@ @subheading Single file conflict resolut
 
 @ftable @command
 @item interactive address@hidden
-The Lua @code{merge3} hook is called to allow the user to manually
+The Lua @ref{merge3} hook is called to allow the user to manually
 merge the left and right files, leaving the result in the specified file.
 
 @var{file} must be a bookkeeping path; under @file{_MTN}. If not
@@ -5755,8 +5742,7 @@ @section Workspace
 consider carefully whether there is any way to change your workflow to
 reduce your need for @command{pluck}ing.
 
-When running @command{pluck}, it is sometimes possible for
address@hidden Collisions} to occur.
address@hidden Conflicts} and @ref{Workspace Collisions} can occur.
 
 @item mtn rename [--bookkeep-only] @var{src} @var{dst}
 @itemx mtn rename [--bookkeep-only] @var{src1} @var{...} @var{dst/}
@@ -5838,8 +5824,7 @@ @section Workspace
 becomes the new default branch of the workspace (even if you also
 specify an explicit @option{--revision} argument).
 
-When running @command{update}, it is sometimes possible for
address@hidden Collisions} to occur.
address@hidden Conflicts} and @ref{Workspace Collisions} can occur.
 
 @end ftable
 
@@ -6300,7 +6285,7 @@ @section Informative
 @anchor{mtn list address@hidden mtn list databases
 @itemx mtn list dbs
 Show all @ref{Managed Databases} and the workspaces registered in
-them. See @ref{register_workspace}.
+them. See @ref{mtn register_workspace}.
 
 @item mtn list duplicates address@hidden
 @itemx mtn ls
@@ -6491,7 +6476,7 @@ @section Informative
 
 @item mtn show_conflicts @var{rev} @var{rev}
 This command shows what conflicts would need to be resolved in order to merge
-the given revisions.
+the given revisions; see @ref{Merge Conflicts}.
 
 Note that this does not show conflicts due to update commands, since
 in that case one revision is the workspace.
@@ -6602,7 +6587,7 @@ @section Variables
 the configured database for the workspace is a different from the
 current database.
 
address@hidden@item mtn register_workspace address@hidden
address@hidden address@hidden mtn register_workspace address@hidden
 
 Registers the given workspace (default the current workspace) in the
 current database, so that it will show up in the output of @ref{mtn
@@ -12286,15 +12271,29 @@ @subsection External Merge Tools
 than the temporary file names the merge tool will actually be working
 on.
 
-Returns a string, which should be the merger of the given texts.  The
-default definition of this hook delegates the actual merge to the
-result of @ref{get_preferred_merge3_command}.  The default definition
-of @ref{get_preferred_merge3_command} checks to see if the
+On success, @code{merge3} returns a string, which should be the
+contents resulting from merging the given texts.  If nil is returned,
+the merge command fails; this is how the user can abort a merge.
+
+The default definition of this hook
+delegates the actual merge to the result of
address@hidden  The default definition of
address@hidden checks to see if the
 @env{MTN_MERGE} environment variable, or the Lua variable
 @code{merger} are set to the name of a merge tool that it recognizes,
 and if not, then simply searches for whatever is installed on the
-local system.  For details, see the code in @ref{Default hooks}.
+local system.
 
+The default hook then invokes the merge tool, waits for it to return,
+and checks to see if @var{merged_path} was written. If not, it returns
+nil, and the merge command fails.
+
+For details, see the code in @ref{Default hooks}.
+
+By redefining this hook the user can choose a preferred merge tool, or
+select different merge tools for different file types.  For example,
+gimp for .png files, OpenOffice.org for .doc, and so on.
+
 @address@hidden get_preferred_merge3_command(@var{tbl})
 
 Returns the results of running an external merge on three strings.
@@ -12337,10 +12336,10 @@ @subsection Attribute Handling
 
 @subsection Attribute Handling
 
-Some files in a project are special; they may require different handling
-(such as binary or structured files that should always be manually
-merged -- see @ref{Merging}), or they may represent executable scripts
-or programs.
+Some files in a project are special; they may require different
+handling (such as binary or structured files that should always be
+manually merged -- see @ref{File Content Conflict}), or they may
+represent executable scripts or programs.
 
 Monotone allows each file (or directory) in a repository to carry
 arbitrary @ref{File Attributes}.  Persistent attributes are stored in
@@ -12389,7 +12388,7 @@ @subsection Attribute Handling
 @end group
 @end smallexample
 
address@hidden attr_init_functions address@hidden (@var{filename})
address@hidden@item attr_init_functions address@hidden (@var{filename})
 
 This is not a hook function, but a @emph{table} of hook
 functions. Each entry in the table @code{attr_init_functions}, at
============================================================
--- po/sv.po	bb39ba476f5d0e053d07773116b7869ed3841ea2
+++ po/sv.po	66e25c913d0ac84d429945643c9d2353881670f7
@@ -154,8 +154,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: monotone 0.26pre1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-11-27 16:55+0100\n"
-"PO-Revision-Date: 2010-12-03 09:16+0100\n"
+"POT-Creation-Date: 2011-01-09 22:49+0100\n"
+"PO-Revision-Date: 2011-01-09 22:51+0100\n"
 "Last-Translator: Joel Rosdahl <address@hidden>\n"
 "Language-Team: Richard Levitte <address@hidden>\n"
 "Language: \n"
@@ -322,7 +322,7 @@ msgstr "Katalogen '%s' finns inte"
 msgid "Directory '%s' does not exist"
 msgstr "Katalogen '%s' finns inte"
 
-#: lua.cc:594 cmd_othervcs.cc:61 work.cc:2134
+#: lua.cc:594 cmd_othervcs.cc:61 work.cc:2135
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "'%s' är inte en katalog"
@@ -429,7 +429,7 @@ msgstr "filen %s kan inte skrivas över 
 msgid "file '%s' cannot be overwritten as data; it is a directory"
 msgstr "filen %s kan inte skrivas över som data; den är en katalog"
 
-#: file_io.cc:426 work.cc:1816
+#: file_io.cc:426 work.cc:1817
 #, c-format
 msgid "no such file or directory: '%s'"
 msgstr "ingen sådan fil eller katalog: '%s'"
@@ -582,17 +582,17 @@ msgstr "C++-avbrott av okänd typ"
 msgid "C++ exception of unknown type"
 msgstr "C++-avbrott av okänd typ"
 
-#: ui.cc:833
+#: ui.cc:843
 #, c-format
 msgid "failed to open log file '%s'"
 msgstr "misslyckades med att öppna loggfilen %s"
 
-#: ui.cc:1105
+#: ui.cc:1115
 #, c-format
 msgid "Usage: %s [OPTION...] command [ARG...]"
 msgstr "Användning: %s [FLAGGOR...] kommando [ARGUMENT...]"
 
-#: ui.cc:1118
+#: ui.cc:1128
 #, c-format
 msgid "Options specific to '%s %s' (run '%s help' to see global options):"
 msgstr "Flaggor speciellt för '%s %s' ('%s help' visar de globala flaggorna):"
@@ -947,7 +947,7 @@ msgstr "--message och --message-file få
 msgid "--message and --message-file are mutually exclusive"
 msgstr "--message och --message-file får inte anges samtidigt"
 
-#: cmd_netsync.cc:68 cmd_netsync.cc:764
+#: cmd_netsync.cc:68 cmd_netsync.cc:766
 #, c-format
 msgid "cannot use --exclude in URL mode"
 msgstr "kan inte använda --exclude när en URL används"
@@ -964,7 +964,7 @@ msgstr "Öppnar en koppling till en serv
 msgid "Opens an 'automate stdio' connection to a remote server"
 msgstr "Öppnar en koppling till en server, typ 'automate stdio'"
 
-#: cmd_netsync.cc:122 cmd_netsync.cc:223
+#: cmd_netsync.cc:122 cmd_netsync.cc:224
 #, c-format
 msgid ""
 "No database given; assuming '%s' database. This means that we can't\n"
@@ -974,15 +974,15 @@ msgstr ""
 "inte kan kolla servernyckeln, eftersom vi inte har någon uppgift om\n"
 "vad den borde vara."
 
-#: cmd_netsync.cc:210
+#: cmd_netsync.cc:211
 msgid "COMMAND [ARGS]"
 msgstr "KOMMANDO [ARGUMENT]"
 
-#: cmd_netsync.cc:211
+#: cmd_netsync.cc:212
 msgid "Executes COMMAND on a remote server"
 msgstr "Kör KOMMANDO på servern i andra änden"
 
-#: cmd_netsync.cc:219 cmd_list.cc:988 cmd_packet.cc:73 cmd_packet.cc:134
+#: cmd_netsync.cc:220 cmd_list.cc:988 cmd_packet.cc:73 cmd_packet.cc:134
 #: cmd_packet.cc:254 cmd_key_cert.cc:81 cmd_key_cert.cc:186 cmd_merging.cc:384
 #: cmd_merging.cc:1141 cmd_merging.cc:1219 cmd_ws_commit.cc:1134
 #: cmd_ws_commit.cc:1342 cmd_ws_commit.cc:1456 cmd_ws_commit.cc:1478
@@ -998,41 +998,41 @@ msgstr "felaktigt antal givna argument"
 msgid "wrong argument count"
 msgstr "felaktigt antal givna argument"
 
-#: cmd_netsync.cc:276
+#: cmd_netsync.cc:278
 #, c-format
 msgid "received remote error code %d"
 msgstr "fick felkod %d från andra änden"
 
-#: cmd_netsync.cc:289
+#: cmd_netsync.cc:291
 #, c-format
 msgid "would receive %d revisions, %d certs, and at least %d keys\n"
 msgstr ""
 "skulle ha tagit emot %d revisioner, %d certifikat och minst %d nycklar\n"
 
-#: cmd_netsync.cc:296
+#: cmd_netsync.cc:298
 #, c-format
 msgid "would receive %d revisions, %d certs, and %d keys\n"
 msgstr "skulle ha tagit emot %d revisioner, %d certifikat och %d nycklar\n"
 
-#: cmd_netsync.cc:304
+#: cmd_netsync.cc:306
 #, c-format
 msgid "would send %d certs and %d keys\n"
 msgstr "skulle ha skickat %d certifikat och %d nycklar\n"
 
-#: cmd_netsync.cc:308
+#: cmd_netsync.cc:310
 #, c-format
 msgid "would send %d revisions\n"
 msgid_plural "would send %d revisions:\n"
 msgstr[0] "skulle ha skickat %d revisioner\n"
 msgstr[1] "skulle ha skickat %d revisioner:\n"
 
-#: cmd_netsync.cc:327
+#: cmd_netsync.cc:329
 #, c-format
 msgid "%9d in branch %s\n"
 msgstr "%9d i grenen %s\n"
 
-#: cmd_netsync.cc:537 cmd_netsync.cc:560 cmd_netsync.cc:586 cmd_netsync.cc:621
-#: cmd_netsync.cc:647 cmd_netsync.cc:687
+#: cmd_netsync.cc:539 cmd_netsync.cc:562 cmd_netsync.cc:588 cmd_netsync.cc:623
+#: cmd_netsync.cc:649 cmd_netsync.cc:689
 msgid ""
 "[URL]\n"
 "[ADDRESS[:PORTNUMBER] [PATTERN ...]]"
@@ -1040,11 +1040,11 @@ msgstr ""
 "[URL]\n"
 "[ADRESS[:PORTNUMMER] [MÖNSTER ...]]"
 
-#: cmd_netsync.cc:538 cmd_netsync.cc:561
+#: cmd_netsync.cc:540 cmd_netsync.cc:563
 msgid "Pushes branches to a netsync server"
 msgstr "Skickar grenar till en netsync-server"
 
-#: cmd_netsync.cc:539
+#: cmd_netsync.cc:541
 msgid ""
 "This will push all branches that match the pattern given in PATTERN to the "
 "netsync server at the address ADDRESS."
@@ -1052,11 +1052,11 @@ msgstr ""
 "Det här kommer att skicka alla grenar som matchar MÖNSTER till netsync-"
 "server på adressen ADRESS"
 
-#: cmd_netsync.cc:587 cmd_netsync.cc:622
+#: cmd_netsync.cc:589 cmd_netsync.cc:624
 msgid "Pulls branches from a netsync server"
 msgstr "Hämtar grenar från netsync-server"
 
-#: cmd_netsync.cc:588
+#: cmd_netsync.cc:590
 msgid ""
 "This pulls all branches that match the pattern given in PATTERN from the "
 "netsync server at the address ADDRESS."
@@ -1064,16 +1064,16 @@ msgstr ""
 "Det här hämtar alla grenar som matchar MÖNSTER till netsync-server på "
 "adressen ADRESS"
 
-#: cmd_netsync.cc:605 cmd_netsync.cc:842
+#: cmd_netsync.cc:607 cmd_netsync.cc:844
 #, c-format
 msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
 msgstr "hämtar anonymt; använd -kNYCKELNAMN om du behöver autentisera"
 
-#: cmd_netsync.cc:648 cmd_netsync.cc:688
+#: cmd_netsync.cc:650 cmd_netsync.cc:690
 msgid "Synchronizes branches with a netsync server"
 msgstr "Synkronisera grenar med en netsync-server"
 
-#: cmd_netsync.cc:649
+#: cmd_netsync.cc:651
 msgid ""
 "This synchronizes branches that match the pattern given in PATTERN with the "
 "netsync server at the address ADDRESS."
@@ -1081,7 +1081,7 @@ msgstr ""
 "Det här synkronisera grenar som matchar MÖNSTER med netsync-server på "
 "adressen ADRESS"
 
-#: cmd_netsync.cc:719
+#: cmd_netsync.cc:721
 msgid ""
 "URL [DIRECTORY]\n"
 "HOST[:PORTNUMBER] BRANCH [DIRECTORY]"
@@ -1089,11 +1089,11 @@ msgstr ""
 "URL [KATALOG]\n"
 "ADRESS[:PORTNUMMER] GREN [KATALOG]"
 
-#: cmd_netsync.cc:720
+#: cmd_netsync.cc:722
 msgid "Checks out a revision from a remote database into a directory"
 msgstr "Hämtar en revision från en databas på en annan dator till en katalog"
 
-#: cmd_netsync.cc:721
+#: cmd_netsync.cc:723
 msgid ""
 "If a revision is given, that's the one that will be checked out.  Otherwise, "
 "it will be the head of the branch supplied.  If no directory is given, the "
@@ -1103,63 +1103,63 @@ msgstr ""
 "kommer lövet i grenen (implicit eller angiven) att hämtas. Om ingen katalog "
 "anges kommer grenens namn att användas som katalognamn."
 
-#: cmd_netsync.cc:740
+#: cmd_netsync.cc:742
 #, c-format
 msgid "the --branch option is only valid with an URI to clone"
 msgstr "Flaggan --branch kan enbart användas tillsammans med en URL"
 
-#: cmd_netsync.cc:789
+#: cmd_netsync.cc:791
 #, c-format
 msgid "you must specify an unambiguous branch to clone"
 msgstr "du måste ange en unik gren att klona"
 
-#: cmd_netsync.cc:821
+#: cmd_netsync.cc:823
 #, c-format
 msgid "clone destination directory '%s' already exists"
 msgstr "klonarbetskatalogen '%s' finns redan"
 
-#: cmd_netsync.cc:828 cmd_ws_commit.cc:1842 cmd_ws_commit.cc:1931
+#: cmd_netsync.cc:830 cmd_ws_commit.cc:1842 cmd_ws_commit.cc:1931
 #, c-format
 msgid "bookkeeping directory already exists in '%s'"
 msgstr "det finns redan en administrativ katalog i '%s'"
 
-#: cmd_netsync.cc:862 cmd_merging.cc:535 cmd_merging.cc:636 cmd_merging.cc:641
+#: cmd_netsync.cc:864 cmd_merging.cc:535 cmd_merging.cc:636 cmd_merging.cc:641
 #: cmd_merging.cc:1471 cmd_ws_commit.cc:1030
 #, c-format
 msgid "branch '%s' is empty"
 msgstr "grenen '%s' är tom"
 
-#: cmd_netsync.cc:865 cmd_ws_commit.cc:1033 cmd_ws_commit.cc:1910
+#: cmd_netsync.cc:867 cmd_ws_commit.cc:1033 cmd_ws_commit.cc:1910
 #, c-format
 msgid "branch %s has multiple heads:"
 msgstr "grenen %s har flera löv:"
 
-#: cmd_netsync.cc:869
+#: cmd_netsync.cc:871
 #, c-format
 msgid "choose one with '%s clone -r<id> URL'"
 msgstr "välj ett med '%s clone -r<id> URL'"
 
-#: cmd_netsync.cc:870 cmd_ws_commit.cc:1039 cmd_ws_commit.cc:1916
+#: cmd_netsync.cc:872 cmd_ws_commit.cc:1039 cmd_ws_commit.cc:1916
 #, c-format
 msgid "branch %s has multiple heads"
 msgstr "grenen %s har flera löv"
 
-#: cmd_netsync.cc:881 cmd_ws_commit.cc:1054 cmd_ws_commit.cc:1896
+#: cmd_netsync.cc:883 cmd_ws_commit.cc:1054 cmd_ws_commit.cc:1896
 #, c-format
 msgid "revision %s is not a member of branch %s"
 msgstr "revisionen %s är inte med i grenen %s"
 
-#: cmd_netsync.cc:914
+#: cmd_netsync.cc:916
 #, c-format
 msgid "pid file '%s' already exists"
 msgstr "pid-filen '%s' finns redan"
 
-#: cmd_netsync.cc:916
+#: cmd_netsync.cc:918
 #, c-format
 msgid "failed to create pid file '%s'"
 msgstr "misslyckades med att skapa pid-filen %s"
 
-#: cmd_netsync.cc:939
+#: cmd_netsync.cc:941
 msgid "Serves the database to connecting clients"
 msgstr "Servera databasen till anslutande klienter"
 
@@ -1461,7 +1461,8 @@ msgid "public or private key '%s' does n
 #: cmd_key_cert.cc:160
 #, c-format
 msgid "public or private key '%s' does not exist in keystore or database"
-msgstr "den publika eller privata nyckeln '%s' finns inte i nyckellager eller databas"
+msgstr ""
+"den publika eller privata nyckeln '%s' finns inte i nyckellager eller databas"
 
 #: cmd_key_cert.cc:163
 #, c-format
@@ -1513,7 +1514,9 @@ msgid ""
 msgid ""
 "Creates a certificate with the given name and value on each revision that "
 "matches the given selector"
-msgstr "Skapar ett certifikat med givna namn och värde för verja revision som motsvarar den givna väljaren"
+msgstr ""
+"Skapar ett certifikat med givna namn och värde för verja revision som "
+"motsvarar den givna väljaren"
 
 #: cmd_key_cert.cc:300
 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
@@ -2249,7 +2252,9 @@ msgid ""
 msgid ""
 "Deletes all certs which are on the given revision(s) and have the given name "
 "and if a value is specified then also the given value."
-msgstr "Tar bort alla certifikat med givet namn och eventuellt givet värde från givna revisioner."
+msgstr ""
+"Tar bort alla certifikat med givet namn och eventuellt givet värde från "
+"givna revisioner."
 
 #: cmd_db.cc:319
 msgid "Does some sanity checks on the database"
@@ -3750,7 +3755,7 @@ msgstr "misslyckades med att tolka det b
 msgid "failed to decode boolean testresult cert value '%s'"
 msgstr "misslyckades med att tolka det booleska testresultatets värde '%s'"
 
-#: work.cc:134 work.cc:633 work.cc:710 work.cc:851 migrate_work.cc:66
+#: work.cc:134 work.cc:633 work.cc:711 work.cc:852 migrate_work.cc:66
 #, c-format
 msgid "workspace required but not found"
 msgstr "arbetskopia behövs men kunde inte hittas"
@@ -3824,12 +3829,12 @@ msgstr "Misslyckades med att skriva inst
 msgid "Failed to write options file %s: %s"
 msgstr "Misslyckades med att skriva inställningsfilen %s: %s"
 
-#: work.cc:727
+#: work.cc:728
 #, c-format
 msgid "'%s' is not a recognized workspace option"
 msgstr "'%s' är en okänd inställning i arbetskopians metadata"
 
-#: work.cc:1085
+#: work.cc:1086
 #, c-format
 msgid ""
 "cannot add %s, because %s is recorded as a file in the workspace manifest"
@@ -3837,12 +3842,12 @@ msgstr ""
 "kan inte lägga till %s eftersom %s redan är registrerad som en fil i "
 "arbetskopians manifest"
 
-#: work.cc:1091
+#: work.cc:1092
 #, c-format
 msgid "adding %s to workspace manifest"
 msgstr "lägger till %s i arbetskopians manifest"
 
-#: work.cc:1168
+#: work.cc:1169
 #, c-format
 msgid ""
 "Non-recursive add: Files in the directory '%s' will not be added "
@@ -3851,102 +3856,102 @@ msgstr ""
 "Icke-rekursiv addering: Filer i katalogen '%s' kommer inte att läggas till "
 "automatiskt"
 
-#: work.cc:1181
+#: work.cc:1182
 #, c-format
 msgid "skipping ignorable file %s"
 msgstr "hoppar över ignorerbar fil %s"
 
-#: work.cc:1188
+#: work.cc:1189
 #, c-format
 msgid "skipping %s, already accounted for in workspace"
 msgstr "hoppar över %s, den finns redan noterad i arbetskopian"
 
-#: work.cc:1344 merge_conflict.cc:2340 merge_conflict.cc:2405
+#: work.cc:1345 merge_conflict.cc:2340 merge_conflict.cc:2405
 #, c-format
 msgid "dropping %s"
 msgstr "slänger %s"
 
-#: work.cc:1355 work.cc:1366
+#: work.cc:1356 work.cc:1367
 #, c-format
 msgid "path %s already exists"
 msgstr "sökvägen %s finns redan"
 
-#: work.cc:1384 merge_conflict.cc:2345 merge_conflict.cc:2426
+#: work.cc:1385 merge_conflict.cc:2345 merge_conflict.cc:2426
 #, c-format
 msgid "renaming %s to %s"
 msgstr "byter namn på %s till %s"
 
-#: work.cc:1388
+#: work.cc:1389
 #, c-format
 msgid "adding %s"
 msgstr "lägger till %s"
 
-#: work.cc:1419
+#: work.cc:1420
 #, c-format
 msgid "file '%s' does not exist"
 msgstr "filen '%s' finns inte"
 
-#: work.cc:1420
+#: work.cc:1421
 #, c-format
 msgid "file '%s' is a directory"
 msgstr "filen '%s' är en katalog"
 
-#: work.cc:1424
+#: work.cc:1425
 #, c-format
 msgid "content of file '%s' has changed, not overwriting"
 msgstr "innehållet i filen '%s' har ändrats, skriver inte över"
 
-#: work.cc:1425
+#: work.cc:1426
 #, c-format
 msgid "updating %s"
 msgstr "uppdaterar %s"
 
-#: work.cc:1480
+#: work.cc:1481
 #, c-format
 msgid "cannot drop non-empty directory '%s'"
 msgstr "kan inte ta bort den icke-tomma katalogen '%s'"
 
-#: work.cc:1513
+#: work.cc:1514
 #, c-format
 msgid "attach node %d blocked by unversioned path '%s'"
 msgstr "bindning av nod %d blockerad av icke-noterad sökväg '%s'"
 
-#: work.cc:1532
+#: work.cc:1533
 #, c-format
 msgid "attach node %d blocked by blocked parent '%s'"
 msgstr "bindning av nod %d blockerad av icke-noterad sökväg '%s'"
 
-#: work.cc:1568
+#: work.cc:1569
 #, c-format
 msgid "%d workspace conflicts"
 msgstr "%d konflikter i arbetskopian"
 
-#: work.cc:1621
+#: work.cc:1622
 #, c-format
 msgid "moved conflicting path %s to %s"
 msgstr "flyttade vägen %s till %s på grund av konflikt"
 
-#: work.cc:1685
+#: work.cc:1686
 #, c-format
 msgid "missing directory '%s'"
 msgstr "saknar katalogen '%s'"
 
-#: work.cc:1690
+#: work.cc:1691
 #, c-format
 msgid "not a directory '%s'"
 msgstr "'%s' är inte en katalog"
 
-#: work.cc:1703
+#: work.cc:1704
 #, c-format
 msgid "missing file '%s'"
 msgstr "saknar filen '%s'"
 
-#: work.cc:1708
+#: work.cc:1709
 #, c-format
 msgid "not a file '%s'"
 msgstr "'%s' är inte en fil"
 
-#: work.cc:1725
+#: work.cc:1726
 #, c-format
 msgid ""
 "%d missing items; use '%s ls missing' to view\n"
@@ -3966,128 +3971,128 @@ msgstr ""
 " '%s drop --missing' eller\n"
 " '%s revert --missing'"
 
-#: work.cc:1883
+#: work.cc:1884
 #, c-format
 msgid "unable to drop the root directory"
 msgstr "kan inte ta bort rotkatalogen"
 
-#: work.cc:1886
+#: work.cc:1887
 #, c-format
 msgid "skipping %s, not currently tracked"
 msgstr "hoppar över %s, ej noterad i arbetskopian för närvarande"
 
-#: work.cc:1896
+#: work.cc:1897
 #, c-format
 msgid "cannot remove %s/, it is not empty"
 msgstr "kan inte ta bort %s/, den är inte tom"
 
-#: work.cc:1911
+#: work.cc:1912
 #, c-format
 msgid "directory %s not empty - it will be dropped but not deleted"
 msgstr ""
 "katalogen %s är inte tom - den kommer att slängas administrativt men inte "
 "fysiskt"
 
-#: work.cc:1922
+#: work.cc:1923
 #, c-format
 msgid "file %s changed - it will be dropped but not deleted"
 msgstr ""
 "filen %s är ändrad - den kommer att slängas administrativt men inte fysiskt"
 
-#: work.cc:1926
+#: work.cc:1927
 #, c-format
 msgid "dropping %s from workspace manifest"
 msgstr "tar bort %s från arbetskopians manifest"
 
-#: work.cc:1967 work.cc:2016
+#: work.cc:1968 work.cc:2017
 #, c-format
 msgid "cannot rename the workspace root (try '%s pivot_root' instead)"
 msgstr ""
 "kan inte byta namn på arbetskopians rot (försök med '%s pivot_root' istället)"
 
-#: work.cc:1970 work.cc:2019
+#: work.cc:1971 work.cc:2020
 #, c-format
 msgid "source file %s is not versioned"
 msgstr "källfilen %s är inte versionshanterad"
 
-#: work.cc:1975 work.cc:2041
+#: work.cc:1976 work.cc:2042
 #, c-format
 msgid "cannot move `%s' to a subdirectory of itself, `%s/%s'"
 msgstr "kan inte flytta `%s' to en underkatalog av sig själv `%s/%s'"
 
-#: work.cc:1977
+#: work.cc:1978
 #, c-format
 msgid "`%s' and `%s' are the same file"
 msgstr "`%s' och `%s' är samma fil"
 
-#: work.cc:1993
+#: work.cc:1994
 #, c-format
 msgid "destination path's parent directory %s/ doesn't exist"
 msgstr "målvägens föräldrakatalog %s/ finns inte"
 
-#: work.cc:2010
+#: work.cc:2011
 #, c-format
 msgid "destination %s/ is not a directory"
 msgstr "målet %s/ är inte en katalog"
 
-#: work.cc:2036
+#: work.cc:2037
 #, c-format
 msgid "destination %s already exists in the workspace manifest"
 msgstr "målet %s finns redan i arbetskopians manifest"
 
-#: work.cc:2059
+#: work.cc:2060
 #, c-format
 msgid "renaming %s to %s in workspace manifest"
 msgstr "byter namn från %s till %s i arbetskopians manifest"
 
-#: work.cc:2084
+#: work.cc:2085
 #, c-format
 msgid "%s doesn't exist in workspace, skipping"
 msgstr "hoppar över %s, den existerar inte i arbetskopian"
 
-#: work.cc:2088
+#: work.cc:2089
 #, c-format
 msgid "destination %s already exists in workspace, skipping filesystem rename"
 msgstr ""
 "byter inte namn till %s i filsystemet, för den finns redan noterad i "
 "arbetskopian"
 
-#: work.cc:2093
+#: work.cc:2094
 #, c-format
 msgid "%s doesn't exist in workspace and %s does, skipping filesystem rename"
 msgstr ""
 "%s finns inte i arbetskopian, men %s gör det, så namnbytet utförs inte i "
 "filsystemet"
 
-#: work.cc:2114
+#: work.cc:2115
 #, c-format
 msgid "proposed new root directory '%s' is not versioned or does not exist"
 msgstr ""
 "den föreslagna nya rotkatalogen '%s' är inte noterad i arbetskopian eller "
 "finns inte"
 
-#: work.cc:2117
+#: work.cc:2118
 #, c-format
 msgid "proposed new root directory '%s' is not a directory"
 msgstr "den föreslagna nya rotkatalogen '%s' är inte en katalog"
 
-#: work.cc:2120
+#: work.cc:2121
 #, c-format
 msgid "proposed new root directory '%s' contains illegal path %s"
 msgstr ""
 "den föreslagna nya rotkatalogen '%s' innehåller den otillåtna sökvägen %s"
 
-#: work.cc:2130
+#: work.cc:2131
 #, c-format
 msgid "directory '%s' is not versioned or does not exist"
 msgstr "katalogen '%s' är inte noterad i arbetskopian eller finns inte"
 
-#: work.cc:2138
+#: work.cc:2139
 #, c-format
 msgid "'%s' is in the way"
 msgstr "'%s' är i vägen"
 
-#: work.cc:2181
+#: work.cc:2182
 #, c-format
 msgid ""
 "workspace is locked\n"
@@ -4096,7 +4101,7 @@ msgstr ""
 "arbetskopian är låst\n"
 "du måste rensa och ta bort katalogen %s"
 
-#: work.cc:2200
+#: work.cc:2201
 #, c-format
 msgid ""
 "re-run this command with --move-conflicting-paths to move conflicting paths "
@@ -4105,7 +4110,7 @@ msgstr ""
 "gör om det här kommandot med --move-conflicting-paths för att flytta filer "
 "och kataloger som det blir konflikt med ur vägen."
 
-#: work.cc:2232
+#: work.cc:2233
 #, c-format
 msgid "moved some conflicting files into %s/%s"
 msgstr "flyttade några filer i konflikt till %s/%s"
@@ -4601,7 +4606,7 @@ msgstr "tillitsfunktionen ogillar %d sig
 msgid "trust function disliked %d signers of %s cert on revision %s"
 msgstr "tillitsfunktionen ogillar %d signerare av certet %s i revisionen %s"
 
-#: database.cc:4798
+#: database.cc:4798 database.cc:4933
 #, c-format
 msgid "no database specified"
 msgstr "ingen databas angiven"
@@ -4651,17 +4656,22 @@ msgstr "kunde inte fråga efter database
 msgid "could not query default database alias"
 msgstr "kunde inte fråga efter databasens standardalias"
 
-#: database.cc:5025
+#: database.cc:5016
+#, fuzzy, c-format
+msgid "using default database '%s'"
+msgstr "använder standarddatabasen '%s'"
+
+#: database.cc:5026
 #, c-format
 msgid "invalid database alias '%s': does not start with a colon"
 msgstr "ogiltigt databasalias '%s': startar inte med ett kolon"
 
-#: database.cc:5029
+#: database.cc:5030
 #, c-format
 msgid "invalid database alias '%s': must not be empty"
 msgstr "ogiltigt databasalias '%s': får inte vara tomt"
 
-#: database.cc:5042
+#: database.cc:5043
 #, c-format
 msgid "invalid database alias '%s': does contain invalid characters"
 msgstr "ogiltigt databasalias '%s': innehåller ogiltiga tecken"
@@ -5063,32 +5073,32 @@ msgstr "flyttar nyckeln '%s' från datab
 msgid "moving key '%s' from database to %s"
 msgstr "flyttar nyckeln '%s' från databasen till %s"
 
-#: migrate_schema.cc:1131
+#: migrate_schema.cc:1139
 #, c-format
 msgid "%s (usable)"
 msgstr "%s (användbar)"
 
-#: migrate_schema.cc:1133
+#: migrate_schema.cc:1141
 #, c-format
 msgid "%s (migration needed)"
 msgstr "%s (migrering behövs)"
 
-#: migrate_schema.cc:1135
+#: migrate_schema.cc:1143
 #, c-format
 msgid "%s (too new, cannot use)"
 msgstr "%s (för ny, kan inte användas)"
 
-#: migrate_schema.cc:1137
+#: migrate_schema.cc:1145
 #, c-format
 msgid "%s (not a monotone database)"
 msgstr "%s (är inte en monotonedatabas)"
 
-#: migrate_schema.cc:1139
+#: migrate_schema.cc:1147
 #, c-format
 msgid "%s (database has no tables!)"
 msgstr "(%s (databasen har inga tabeller!)"
 
-#: migrate_schema.cc:1152
+#: migrate_schema.cc:1160
 #, c-format
 msgid ""
 "cannot use the empty sqlite database %s\n"
@@ -5097,12 +5107,12 @@ msgstr ""
 "kan inte använda den tomma databasen %s\n"
 "(monotonedatabaser måste skapar med '%s db init')"
 
-#: migrate_schema.cc:1157
+#: migrate_schema.cc:1165
 #, c-format
 msgid "%s does not appear to be a monotone database\n"
 msgstr "%s ser inte ut som en monotonedatabase\n"
 
-#: migrate_schema.cc:1161
+#: migrate_schema.cc:1169
 #, c-format
 msgid ""
 "%s appears to be a monotone database, but this version of\n"
@@ -5113,7 +5123,7 @@ msgstr ""
 "känner inte igen dess schema.\n"
 "du behöver antagligen en nyare monotoneversion."
 
-#: migrate_schema.cc:1180
+#: migrate_schema.cc:1188
 #, c-format
 msgid ""
 "database %s is laid out according to an old schema\n"
@@ -5125,47 +5135,47 @@ msgstr ""
 "(detta går inte att ångra; du vill nog ta en säkerhetskopia av\n"
 "databasen först)"
 
-#: migrate_schema.cc:1210
+#: migrate_schema.cc:1218
 #, c-format
 msgid "calculating migration..."
 msgstr "beräknar antalet nödvändiga steg för migrering..."
 
-#: migrate_schema.cc:1225
+#: migrate_schema.cc:1233
 #, c-format
 msgid "no migration performed; database schema already up-to-date"
 msgstr "migreringen genomfördes inte; databasschemat redan uppdaterat"
 
-#: migrate_schema.cc:1240
+#: migrate_schema.cc:1248
 #, c-format
 msgid "migrating data..."
 msgstr "migrerar data..."
 
-#: migrate_schema.cc:1265
+#: migrate_schema.cc:1273
 #, c-format
 msgid "migrated to schema %s"
 msgstr "migrerad till schema %s"
 
-#: migrate_schema.cc:1268
+#: migrate_schema.cc:1276
 #, c-format
 msgid "committing changes to database"
 msgstr "arkiverar ändringar i databasen"
 
-#: migrate_schema.cc:1272
+#: migrate_schema.cc:1280
 #, c-format
 msgid "optimizing database"
 msgstr "optimerar databasen"
 
-#: migrate_schema.cc:1328
+#: migrate_schema.cc:1336
 #, c-format
 msgid "cannot test migration from unknown schema %s"
 msgstr "kan inte testa om migrering behövs, okänt schema %s"
 
-#: migrate_schema.cc:1331
+#: migrate_schema.cc:1339
 #, c-format
 msgid "schema %s is up to date"
 msgstr "redan uppdaterat till schema %s"
 
-#: migrate_schema.cc:1342
+#: migrate_schema.cc:1350
 #, c-format
 msgid "successful migration to schema %s"
 msgstr "migrering till schema %s lyckades"
@@ -7539,17 +7549,17 @@ msgstr ""
 "den nuvarande tidsstämpeln '%s' är utanför det användbara intervallet\n"
 "(din systemklocka kanske inte är korrekt inställd)"
 
-#: dates.cc:385 dates.cc:389
+#: dates.cc:383 dates.cc:387
 #, c-format
 msgid "date '%s' is out of range and cannot be formatted"
 msgstr "datumet '%s' utanför det möjliga området, kan inte formateras korrekt"
 
-#: dates.cc:427
+#: dates.cc:425
 #, c-format
 msgid "time format specification '%s' produces no output"
 msgstr "tidsformatspecifikationen '%s' ger inget vid utskrift"
 
-#: dates.cc:433
+#: dates.cc:431
 #, c-format
 msgid ""
 "date '%s' is too long when formatted using '%s' (the result must fit in %d "
@@ -7558,53 +7568,53 @@ msgstr ""
 "datumet '%s' blir för långt när den formateras med '%s' (resultatet måste "
 "hållas inom %d tecken)"
 
-#: dates.cc:494
+#: dates.cc:492
 #, c-format
 msgid "date '%s' is out of range and cannot be parsed"
 msgstr "datumet '%s' utanför det möjliga området, kan inte läsas korrekt"
 
-#: dates.cc:535 dates.cc:549 dates.cc:564 dates.cc:572 dates.cc:579
-#: dates.cc:591 dates.cc:603 dates.cc:612 dates.cc:646
+#: dates.cc:533 dates.cc:547 dates.cc:562 dates.cc:570 dates.cc:577
+#: dates.cc:589 dates.cc:601 dates.cc:610 dates.cc:644
 #, c-format
 msgid "unrecognized date (monotone only understands ISO 8601 format)"
 msgstr ""
 "datumet går inte att känna igen (monotone förstår bara datum med format "
 "enligt ISO 8601)"
 
-#: dates.cc:539
+#: dates.cc:537
 #, c-format
 msgid "seconds out of range"
 msgstr "ogiltigt sekundnummer"
 
-#: dates.cc:553
+#: dates.cc:551
 #, c-format
 msgid "minutes out of range"
 msgstr "ogiltigt minutnummer"
 
-#: dates.cc:568
+#: dates.cc:566
 #, c-format
 msgid "hour out of range"
 msgstr "ogiltigt timmenummer"
 
-#: dates.cc:594
+#: dates.cc:592
 #, c-format
 msgid "month out of range in '%s'"
 msgstr "ogiltigt månadsnummer i '%s'"
 
-#: dates.cc:619
+#: dates.cc:617
 #, c-format
 msgid "date too early (monotone only goes back to 0001-01-01T00:00:00)"
 msgstr ""
 "för tidigt datum (monotone kan inte hantera tidpunkter före "
 "0001-01-01T00:00:00)"
 
-#: dates.cc:621
+#: dates.cc:619
 #, c-format
 msgid "date too late (monotone only goes forward to year 292,278,993)"
 msgstr ""
 "för sent datum (monotone kan inte hantera tidpunkter efter år 292 278 993)"
 
-#: dates.cc:630
+#: dates.cc:628
 #, c-format
 msgid "day out of range for its month in '%s'"
 msgstr "det finns inte så många dagar i månaden given i '%s'"
============================================================
--- po/pt.po	84122714c76210a89c85ab942336f0ee039aeabd
+++ po/pt.po	2e175dd6aebf10559748910a85e7888754277112
@@ -1,13 +1,13 @@
 # Translation of monotone to Portuguese
 # This file is distributed under the same license as the monotone package.
 #
-# Américo Monteiro <address@hidden>, 2009, 2010.
+# Américo Monteiro <address@hidden>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: monotone 0.99\n"
 "Report-Msgid-Bugs-To: address@hidden"
 "POT-Creation-Date: 2010-10-28 00:42+0200\n"
-"PO-Revision-Date: 2010-10-19 19:56+0100\n"
+"PO-Revision-Date: 2011-01-09 01:43+0000\n"
 "Last-Translator: Américo Monteiro <address@hidden>\n"
 "Language-Team: Portuguese <address@hidden>\n"
 "Language: pt\n"
@@ -1149,9 +1149,9 @@ msgstr "incapaz de questionar localizaç
 msgstr "incapaz de questionar localizações da base de dados predefinida"
 
 #: cmd_list.cc:671
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring database '%s'"
-msgstr "A inicializar nova base de dados '%s'"
+msgstr "a ignorar a base de dados '%s'"
 
 #: cmd_list.cc:678
 #, c-format
@@ -3000,24 +3000,21 @@ msgstr "directório de importação '%s'
 msgstr "directório de importação '%s' é um ficheiro"
 
 #: cmd_ws_commit.cc:1978
-#, fuzzy
 msgid "Exports a revision from the database into a directory"
-msgstr "Faz o checkout a uma revisão da base de dados para um directório"
+msgstr "Exporta uma revisão da base de dados para um directório"
 
 #: cmd_ws_commit.cc:1979
-#, fuzzy
 msgid ""
 "If a revision is given, that's the one that will be exported.  Otherwise, it "
 "will be the head of the branch (given or implicit)."
 msgstr ""
-"Se for fornecida uma revisão, é a essa que será feita o checkout. Caso "
-"contrário, será o cabeçalho do branch (fornecido ou implícito). Se nenhum "
-"directório for fornecido, o nome do branch será usado como directório."
+"Se for fornecida uma revisão, é a essa que será exportada. Caso contrário, "
+"será o cabeçalho do branch (fornecido ou implícito)."
 
 #: cmd_ws_commit.cc:1991
-#, fuzzy, c-format
+#, c-format
 msgid "You can't export in the current directory"
-msgstr "Escreve a raiz do espaço de trabalho para o directório actual"
+msgstr "Você não pode exportar para o directório actual"
 
 #: cmd_ws_commit.cc:1999
 msgid "Migrates a workspace directory's metadata to the latest format"
@@ -3135,7 +3132,6 @@ msgstr "Reporta o estado actual da pesqu
 msgstr "Reporta o estado actual da pesquisa bi-secção"
 
 #: cmd_ws_commit.cc:2389
-#, fuzzy
 msgid ""
 "Lists the total number of revisions in the search set, the number of "
 "revisions that have been determined to be good or bad, the number of "
@@ -7298,14 +7294,14 @@ msgstr "fusão falhada devido a conflito
 msgstr "fusão falhada devido a conflitos não resolvidos"
 
 #: uri.cc:40
-#, fuzzy, c-format
+#, c-format
 msgid "unable to parse URI '%s'"
-msgstr "incapaz de analisar data '%s' com formato '%s'"
+msgstr "incapaz de analisar o URI '%s'"
 
 #: uri.cc:68
-#, fuzzy, c-format
+#, c-format
 msgid "unable to parse host of URI '%s'"
-msgstr "incapaz de analisar data '%s' com formato '%s'"
+msgstr "incapaz de analisar a máquina do URI '%s'"
 
 #: uri.cc:150 uri.cc:153 uri.cc:175 uri.cc:196
 #, c-format
@@ -7368,9 +7364,9 @@ msgstr ""
 "sequência UTF-8 inválida durante a correspondência de expressão regular"
 
 #: pcrewrap.cc:266
-#, fuzzy, c-format
+#, c-format
 msgid "pcre_exec returned %d"
-msgstr "pcre_match retornou %d"
+msgstr "pcre_exec retornou %d"
 
 #: rev_output.cc:61
 msgid "Revision: "