#
#
# patch "ChangeLog"
#  from [ee9225dd82d90d9afab02a5bdd7ead4c0d202b7d]
#    to [33ad6ca37c2e201867f12fd90fc67fb4c1ed3b7e]
#
# patch "po/sv.po"
#  from [e065ecfd2c28c0ea89877c3c95ceeae23190b320]
#    to [5e84d545a2edb67844e6da55c94f9a7d8769e8d5]
#
============================================================
--- ChangeLog	ee9225dd82d90d9afab02a5bdd7ead4c0d202b7d
+++ ChangeLog	33ad6ca37c2e201867f12fd90fc67fb4c1ed3b7e
@@ -1,3 +1,7 @@
+2006-02-27  Richard Levitte  <address@hidden>
+
+	* po/sv.po: Updated translations.
+
 2006-02-26  Nathaniel Smith  <address@hidden>

 	* schema_migration.cc (migrate): Provide a little more feedback
============================================================
--- po/sv.po	e065ecfd2c28c0ea89877c3c95ceeae23190b320
+++ po/sv.po	5e84d545a2edb67844e6da55c94f9a7d8769e8d5
@@ -144,8 +144,8 @@
 msgstr ""
 "Project-Id-Version: monotone 0.26pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 17:26+0100\n"
-"PO-Revision-Date: 2006-02-20 17:28+0100\n"
+"POT-Creation-Date: 2006-02-27 08:26+0100\n"
+"PO-Revision-Date: 2006-02-27 08:48+0100\n"
 "Last-Translator: Joel Rosdahl <address@hidden>\n"
 "Language-Team: Richard Levitte <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -302,8 +302,9 @@
 msgid "pid file '%s' already exists"
 msgstr "pid-filen '%s' finns redan"

-#: commands.cc:325 commands.cc:1295 commands.cc:1365 commands.cc:1801
-#: commands.cc:2722 commands.cc:3267 commands.cc:3498 commands.cc:3537
+#: commands.cc:325 commands.cc:1333 commands.cc:1403 commands.cc:1832
+#: commands.cc:2753 commands.cc:3370 commands.cc:3605 commands.cc:3644
+#: commands.cc:3985
 msgid "informative"
 msgstr "informativ"

@@ -341,59 +342,59 @@
 "grenen '%s' har mer än ett löv\n"
 "kanske borde du överväga 'monotone merge'"

-#: commands.cc:481 commands.cc:737 commands.cc:1383 commands.cc:1460
-#: commands.cc:1888 commands.cc:2772 commands.cc:2800 commands.cc:2803
-#: commands.cc:2939 commands.cc:3520
+#: commands.cc:482 commands.cc:758 commands.cc:1421 commands.cc:1498
+#: commands.cc:1919 commands.cc:2803 commands.cc:2831 commands.cc:2834
+#: commands.cc:2970 commands.cc:3627
 #, c-format
 msgid "no such revision '%s'"
 msgstr "det finns ingen revision med identiteten '%s'"

-#: commands.cc:488
+#: commands.cc:489
 #, c-format
 msgid "expanding selection '%s'\n"
 msgstr "expanderar valet '%s'\n"

-#: commands.cc:496
+#: commands.cc:497
 #, c-format
 msgid "no match for selection '%s'"
 msgstr "det finns inget som matchar '%s'"

-#: commands.cc:499
+#: commands.cc:503
 #, c-format
-msgid "selection '%s' has multiple ambiguous expansions: \n"
-msgstr "valet '%s' har mer än en möjlig betydelse: \n"
+msgid "expanded to '%s'\n"
+msgstr "expanderar till '%s'\n"

-#: commands.cc:506
+#: commands.cc:520
 #, c-format
-msgid "expanded to '%s'\n"
-msgstr "expanderar till '%s'\n"
+msgid "selection '%s' has multiple ambiguous expansions: \n"
+msgstr "valet '%s' har mer än en möjlig betydelse: \n"

-#: commands.cc:517
+#: commands.cc:538
 #, c-format
 msgid "non-hex digits in id"
 msgstr "något tecken i identiteten är inte hexadecimalt"

-#: commands.cc:526
+#: commands.cc:547
 #, c-format
 msgid "partial id '%s' does not have an expansion"
 msgstr "den partiella identiteten '%s' matchar inte befintliga identiteter"

-#: commands.cc:529
+#: commands.cc:550
 #, c-format
 msgid "partial id '%s' has multiple ambiguous expansions:\n"
 msgstr "den partiella identiteten '%s' har mer än en uttydning:\n"

-#: commands.cc:536
+#: commands.cc:557
 #, c-format
 msgid "expanded partial id '%s' to '%s'\n"
 msgstr "expanderade partiell identitet '%s' till '%s'\n"

-#: commands.cc:563 netsync.cc:1722
+#: commands.cc:584 netsync.cc:1722
 #, c-format
 msgid "no public key '%s' found in database"
 msgstr "den publika nyckeln '%s' finns inte i databasen"

-#: commands.cc:573
+#: commands.cc:594
 #, c-format
 msgid ""
 "Key   : %s\n"
@@ -406,87 +407,87 @@
 "Namn     : %s\n"
 "Värde    : %s\n"

-#: commands.cc:607
+#: commands.cc:628
 msgid "ok"
 msgstr "ok"

-#: commands.cc:610
+#: commands.cc:631
 msgid "bad"
 msgstr "felaktig"

-#: commands.cc:613
+#: commands.cc:634
 msgid "unknown"
 msgstr "okänd"

-#: commands.cc:700
+#: commands.cc:721
 #, c-format
 msgid "(*) - only in %s/"
 msgstr "(*) - enbart i %s/"

-#: commands.cc:723
+#: commands.cc:744
 #, c-format
 msgid "no keys found\n"
 msgstr "hittade inga nycklar\n"

-#: commands.cc:725
+#: commands.cc:746
 #, c-format
 msgid "no keys found matching '%s'\n"
 msgstr "hittade inga nycklar som matchar '%s'\n"

-#: commands.cc:743
+#: commands.cc:764
 #, c-format
 msgid "revision %s already has children. We cannot kill it."
 msgstr "revisionen %s har barn. Vi kan inte ta bort den."

-#: commands.cc:883 commands.cc:907 commands.cc:944 commands.cc:965
-#: commands.cc:1001
+#: commands.cc:904 commands.cc:928 commands.cc:965 commands.cc:986
+#: commands.cc:1022
 msgid "key and cert"
 msgstr "nyckel och cert"

-#: commands.cc:883 commands.cc:907 commands.cc:944
+#: commands.cc:904 commands.cc:928 commands.cc:965
 msgid "KEYID"
 msgstr "NYCKELID"

-#: commands.cc:883
+#: commands.cc:904
 msgid "generate an RSA key-pair"
 msgstr "skapa ett RSA-nyckelpar"

-#: commands.cc:898
+#: commands.cc:919
 #, c-format
 msgid "key '%s' already exists"
 msgstr "nyckeln '%s' finns redan"

-#: commands.cc:901
+#: commands.cc:922
 #, c-format
 msgid "generating key-pair '%s'"
 msgstr "skapar nyckelparet '%s'"

-#: commands.cc:903
+#: commands.cc:924
 #, c-format
 msgid "storing key-pair '%s' in %s/"
 msgstr "lagrar nyckelparet '%s' i %s/"

-#: commands.cc:907
+#: commands.cc:928
 msgid "drop a public and private key"
 msgstr "släng publik och privat nyckel"

-#: commands.cc:921
+#: commands.cc:942
 #, c-format
 msgid "dropping public key '%s' from database\n"
 msgstr "tar bort den publika nyckeln '%s' ur databasen\n"

-#: commands.cc:931
+#: commands.cc:952
 #, c-format
 msgid "dropping key pair '%s' from keystore\n"
 msgstr "tar bort nyckelparet '%s' från nyckellagret\n"

-#: commands.cc:938
+#: commands.cc:959
 #, 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"

-#: commands.cc:940
+#: commands.cc:961
 #, c-format
 msgid ""
 "public or private key '%s' does not exist in keystore, and no database was "
@@ -495,33 +496,33 @@
 "den publika eller privata nyckeln '%s' finns inte i nyckellager och ingen "
 "databas angavs"

-#: commands.cc:945
+#: commands.cc:966
 msgid "change passphrase of a private RSA key"
 msgstr "ändra lösen till en privat RSA-nyckel"

-#: commands.cc:955
+#: commands.cc:976
 #, c-format
 msgid "key '%s' does not exist in the keystore"
 msgstr "nyckeln '%s' finns inte i nyckellagret"

-#: commands.cc:962
+#: commands.cc:983
 #, c-format
 msgid "passphrase changed\n"
 msgstr "lösen ändrat\n"

-#: commands.cc:965
+#: commands.cc:986
 msgid "REVISION CERTNAME [CERTVAL]"
 msgstr "REVISION CERTNAMN [CERTVÄRDE]"

-#: commands.cc:966
+#: commands.cc:987
 msgid "create a cert for a revision"
 msgstr "skapa ett cert för en revision"

-#: commands.cc:1001
+#: commands.cc:1022
 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
 msgstr "REVISION NAMN VÄRDE SIGNERARE1 [SIGNERARE2 [...]]"

-#: commands.cc:1002
+#: commands.cc:1023
 msgid ""
 "test whether a hypothetical cert would be trusted\n"
 "by current settings"
@@ -529,7 +530,7 @@
 "kontrollera ifall ett hypotetiskt cert skulle vara pålitligt\n"
 "enligt nuvarande inställningar"

-#: commands.cc:1035
+#: commands.cc:1056
 #, c-format
 msgid ""
 "if a cert on: %s\n"
@@ -544,101 +545,99 @@
 "signerades av: %s\n"
 "skulle det vara: %s\n"

-#: commands.cc:1044
+#: commands.cc:1065
 msgid "trusted"
 msgstr "pålitligt"

-#: commands.cc:1044
+#: commands.cc:1065
 msgid "UNtrusted"
 msgstr "Opålitligt"

-#: commands.cc:1047 commands.cc:1060 commands.cc:1073 commands.cc:1090
-#: commands.cc:1141
+#: commands.cc:1068 commands.cc:1081 commands.cc:1094 commands.cc:1111
+#: commands.cc:1162
 msgid "review"
 msgstr "granskning"

-#: commands.cc:1047
+#: commands.cc:1068
 msgid "REVISION TAGNAME"
 msgstr "REVISION TAGNAMN"

-#: commands.cc:1048
+#: commands.cc:1069
 msgid "put a symbolic tag cert on a revision version"
 msgstr "sätt ett symboliskt tagg-cert på en revision"

-#: commands.cc:1060
+#: commands.cc:1081
 msgid "ID (pass|fail|true|false|yes|no|1|0)"
 msgstr "ID (pass|fail|true|false|yes|no|1|0)"

-#: commands.cc:1061
+#: commands.cc:1082
 msgid "note the results of running a test on a revision"
 msgstr "notera ett testresultat för en revision"

-#: commands.cc:1073 commands.cc:1090
+#: commands.cc:1094 commands.cc:1111
 msgid "REVISION"
 msgstr "REVISION"

-#: commands.cc:1074
+#: commands.cc:1095
 msgid "approve of a particular revision"
 msgstr "godkänn en specifik revision"

-#: commands.cc:1085
+#: commands.cc:1106
 #, c-format
 msgid "need --branch argument for approval"
 msgstr "för godkännande behöver en gren anges med --branch"

-#: commands.cc:1091
+#: commands.cc:1112
 msgid "disapprove of a particular revision"
 msgstr "underkänn en specifik revision"

-#: commands.cc:1104
+#: commands.cc:1125
 #, c-format
 msgid "revision '%s' has %d changesets, cannot invert\n"
 msgstr "revisionen '%s' har %d föräldrar, kan inte invertera\n"

-#: commands.cc:1108
+#: commands.cc:1129
 #, c-format
 msgid "need --branch argument for disapproval"
 msgstr "för underkännande behöver en gren anges med --branch"

-#: commands.cc:1141
+#: commands.cc:1162
 msgid "REVISION [COMMENT]"
 msgstr "REVISION [KOMMENTAR]"

-#: commands.cc:1142
+#: commands.cc:1163
 msgid "comment on a particular revision"
 msgstr "kommentera en specifik revision"

-#: commands.cc:1152
+#: commands.cc:1173
 #, c-format
 msgid "edit comment failed"
 msgstr "misslyckades med att redigera kommentaren"

-#: commands.cc:1155
+#: commands.cc:1176
 #, c-format
 msgid "empty comment"
 msgstr "tom kommentar"

-#: commands.cc:1168 commands.cc:1196 commands.cc:1221 commands.cc:2224
-#: commands.cc:2342 commands.cc:2875 commands.cc:3315
+#: commands.cc:1189 commands.cc:1217 commands.cc:1242 commands.cc:1267
+#: commands.cc:2255 commands.cc:2373 commands.cc:2906 commands.cc:3418
 msgid "workspace"
 msgstr "arbetskopia"

-#: commands.cc:1168 commands.cc:1196 commands.cc:1295 commands.cc:2342
-#: commands.cc:2722 commands.cc:3315
+#: commands.cc:1189 commands.cc:1217 commands.cc:1333 commands.cc:2373
+#: commands.cc:2753 commands.cc:3418
 msgid "[PATH]..."
 msgstr "[SÖKVÄG]..."

-#: commands.cc:1169
-#, fuzzy
+#: commands.cc:1190
 msgid "add files to workspace"
 msgstr "lägg till filer i arbetskopian"

-#: commands.cc:1197
-#, fuzzy
+#: commands.cc:1218
 msgid "drop files from workspace"
 msgstr "överge filer i arbetskopian"

-#: commands.cc:1222
+#: commands.cc:1243
 msgid ""
 "SRC DEST\n"
 "SRC1 [SRC2 [...]] DEST_DIR"
@@ -646,84 +645,100 @@
 "KÄLLA MÅL\n"
 "KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG"

-#: commands.cc:1224
-#, fuzzy
+#: commands.cc:1245
 msgid "rename entries in the workspace"
 msgstr "byt namn på filer i arbetskopian"

-#: commands.cc:1249 commands.cc:1262 commands.cc:1342 commands.cc:3418
-#: commands.cc:3859
+#: commands.cc:1267
+msgid "NEW_ROOT PUT_OLD"
+msgstr "NY_ROT PLACERA_GAMLA"
+
+#: commands.cc:1268
+msgid ""
+"rename the root directory\n"
+"after this command, the directory that currently has the name NEW_ROOT\n"
+"will be the root directory, and the directory that is currently the root\n"
+"directory will have name PUT_OLD.\n"
+"Using --execute is strongly recommended."
+msgstr ""
+"Flytta på rotkatalogen\n"
+"när det här kommandot är klart har katalogen som just nu heter NY_ROT\n"
+"blivit rotkatalogen, och den nuvarande rotkatalogen blivit katalogen\n"
+"PLACERA_GAMLA.\n"
+"Det rekommenderas varmt att använda --execute."
+
+#: commands.cc:1287 commands.cc:1300 commands.cc:1380 commands.cc:3525
+#: commands.cc:3966
 msgid "debug"
 msgstr "felsökning"

-#: commands.cc:1249
+#: commands.cc:1287
 msgid "load file contents into db"
 msgstr "ladda in filinnehållet i databasen"

-#: commands.cc:1262
+#: commands.cc:1300
 msgid "<parent> <left> <right>"
 msgstr "<förälder> <vänster> <höger>"

-#: commands.cc:1263
+#: commands.cc:1301
 msgid "merge 3 files and output result"
 msgstr "slå ihop 3 filer och skriv ut resultatet"

-#: commands.cc:1273
+#: commands.cc:1311
 #, c-format
 msgid "ancestor file id does not exist"
 msgstr "förälderns filidentitet finns inte"

-#: commands.cc:1276
+#: commands.cc:1314
 #, c-format
 msgid "left file id does not exist"
 msgstr "vänster fils identitet finns inte"

-#: commands.cc:1279
+#: commands.cc:1317
 #, c-format
 msgid "right file id does not exist"
 msgstr "höger fils identitet finns inte"

-#: commands.cc:1290
+#: commands.cc:1328
 #, c-format
 msgid "merge failed"
 msgstr "ihopslagningen misslyckades"

-#: commands.cc:1295
-#, fuzzy
+#: commands.cc:1333
 msgid "show status of workspace"
 msgstr "visa arbetskopians status"

-#: commands.cc:1342
+#: commands.cc:1380
 msgid "[PATH]"
 msgstr "[SÖKVÄG]"

-#: commands.cc:1343
+#: commands.cc:1381
 msgid "calculate identity of PATH or stdin"
 msgstr "räkna ut identiteten för SÖKVÄG eller stdin"

-#: commands.cc:1366
+#: commands.cc:1404
 msgid "FILENAME"
 msgstr "FILNAMN"

-#: commands.cc:1367
+#: commands.cc:1405
 msgid "write file from database to stdout"
 msgstr "skriv ut angiven fil från databasen"

-#: commands.cc:1395 commands.cc:1397 commands.cc:3529
+#: commands.cc:1433 commands.cc:1435 commands.cc:3636
 #, c-format
 msgid "no file '%s' found in revision '%s'\n"
 msgstr "filen '%s' finns inte i revisionen '%s'\n"

-#: commands.cc:1409 commands.cc:1531 commands.cc:3076 commands.cc:3125
-#: commands.cc:3214 commands.cc:3222 commands.cc:3772
+#: commands.cc:1447 commands.cc:1569 commands.cc:3107 commands.cc:3156
+#: commands.cc:3167 commands.cc:3317 commands.cc:3325 commands.cc:3879
 msgid "tree"
 msgstr "träd"

-#: commands.cc:1409
+#: commands.cc:1447
 msgid "[DIRECTORY]\n"
 msgstr "[KATALOG]\n"

-#: commands.cc:1410
+#: commands.cc:1448
 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"
@@ -735,62 +750,62 @@
 "kommer lövet i grenen (implicit eller angiven) att hämtas. Om\n"
 "ingen katalog anges kommer grenens namn att användas som katalognamn."

-#: commands.cc:1429 commands.cc:1448
+#: commands.cc:1467 commands.cc:1486
 #, c-format
 msgid "need --branch argument for branch-based checkout"
 msgstr "--branch behövs för att kunna hämta en revision med given gren"

-#: commands.cc:1442
+#: commands.cc:1480
 #, c-format
 msgid "checkout directory '%s' already exists"
 msgstr "arbetskatalogen '%s' finns redan"

-#: commands.cc:1451 commands.cc:1544 commands.cc:3089 commands.cc:3159
-#: commands.cc:3162
+#: commands.cc:1489 commands.cc:1582 commands.cc:3120 commands.cc:3205
+#: commands.cc:3208
 #, c-format
 msgid "branch '%s' is empty\n"
 msgstr "grenen '%s' är tom\n"

-#: commands.cc:1452
+#: commands.cc:1490
 #, c-format
 msgid "branch %s has multiple heads"
 msgstr "grenen %s har flera löv"

-#: commands.cc:1478
+#: commands.cc:1516
 #, c-format
 msgid "revision %s is not a member of branch %s\n"
 msgstr "revisionen %s är inte med i grenen %s\n"

-#: commands.cc:1512
+#: commands.cc:1550
 #, c-format
 msgid "no file %s found in database for %s"
 msgstr "det finns ingen fil %s för %s i databasen"

-#: commands.cc:1531
+#: commands.cc:1569
 msgid "show unmerged head revisions of branch"
 msgstr "visa ej ihopslagna lövrevisioner i grenen"

-#: commands.cc:1539 commands.cc:3085
+#: commands.cc:1577 commands.cc:3116
 #, c-format
 msgid "please specify a branch, with --branch=BRANCH"
 msgstr "var god ange en gren med --branch=GREN"

-#: commands.cc:1546
+#: commands.cc:1584
 #, c-format
 msgid "branch '%s' is currently merged:\n"
 msgstr "grenen '%s' har för tillfället ett löv:\n"

-#: commands.cc:1548
+#: commands.cc:1586
 #, c-format
 msgid "branch '%s' is currently unmerged:\n"
 msgstr "grenen '%s' har för tillfället mer än ett löv:\n"

-#: commands.cc:1587
+#: commands.cc:1625
 #, c-format
 msgid "no epoch for branch %s\n"
 msgstr "ingen epok i grenen %s\n"

-#: commands.cc:1802
+#: commands.cc:1833
 msgid ""
 "certs ID\n"
 "keys [PATTERN]\n"
@@ -816,7 +831,7 @@
 "missing\n"
 "changed"

-#: commands.cc:1813
+#: commands.cc:1844
 msgid ""
 "show database objects, or the current workspace manifest, or known,\n"
 "unknown, intentionally ignored, missing, or changed state files"
@@ -824,151 +839,151 @@
 "visa databasobjekten, arbetskopians manifest, okända filer, kända\n"
 "filer, medvetet ignorerade filer, saknade filer eller ändrade filer"

-#: commands.cc:1851 commands.cc:1875 commands.cc:1894 commands.cc:1913
-#: commands.cc:1931 commands.cc:1959 commands.cc:1977
+#: commands.cc:1882 commands.cc:1906 commands.cc:1925 commands.cc:1944
+#: commands.cc:1962 commands.cc:1990 commands.cc:2008
 msgid "packet i/o"
 msgstr "paket-I/O"

-#: commands.cc:1851
+#: commands.cc:1882
 msgid "OLDID NEWID"
 msgstr "GAMMALT-ID NYTT-ID"

-#: commands.cc:1852
+#: commands.cc:1883
 msgid "write file delta packet to stdout"
 msgstr "skriv ut datapaket för fildelta till stdout"

-#: commands.cc:1866 commands.cc:1868 commands.cc:1907
+#: commands.cc:1897 commands.cc:1899 commands.cc:1938
 #, c-format
 msgid "no such file '%s'"
 msgstr "filen '%s' finns inte"

-#: commands.cc:1875 commands.cc:1894 commands.cc:1913 commands.cc:1931
-#: commands.cc:1959
+#: commands.cc:1906 commands.cc:1925 commands.cc:1944 commands.cc:1962
+#: commands.cc:1990
 msgid "ID"
 msgstr "ID"

-#: commands.cc:1875
+#: commands.cc:1906
 msgid "write revision data packet to stdout"
 msgstr "skriv ut datapaket för revision till stdout"

-#: commands.cc:1894
+#: commands.cc:1925
 msgid "write file data packet to stdout"
 msgstr "skriv ut datapaket för fil till stdout"

-#: commands.cc:1913
+#: commands.cc:1944
 msgid "write cert packets to stdout"
 msgstr "skriv ut datapaket för cert till stdout"

-#: commands.cc:1931
+#: commands.cc:1962
 msgid "write public key packet to stdout"
 msgstr "skriv it datapaket för publik nyckel till stdout"

-#: commands.cc:1953
+#: commands.cc:1984
 #, c-format
 msgid "public key '%s' does not exist"
 msgstr "den publika nyckeln '%s' finns inte"

-#: commands.cc:1959
+#: commands.cc:1990
 msgid "write private key packet to stdout"
 msgstr "skriv it datapaket för privat nyckel till stdout"

-#: commands.cc:1967
+#: commands.cc:1998
 #, c-format
 msgid "public and private key '%s' do not exist in keystore"
 msgstr "den publika och privata nyckeln '%s' finns inte i nyckellagret"

-#: commands.cc:1978
+#: commands.cc:2009
 msgid "read packets from files or stdin"
 msgstr "läs paket från filer eller stdin"

-#: commands.cc:1986
+#: commands.cc:2017
 #, c-format
 msgid "no packets found on stdin"
 msgstr "inga paket hittade i stdin"

-#: commands.cc:1997
+#: commands.cc:2028
 #, c-format
 msgid "no packets found in given file"
 msgid_plural "no packets found in given files"
 msgstr[0] "inga paket funna i den angivna filen"
 msgstr[1] "inga paket funna i de angivna filerna"

-#: commands.cc:2001
+#: commands.cc:2032
 #, c-format
 msgid "read %d packet"
 msgid_plural "read %d packets"
 msgstr[0] "läste %d paket"
 msgstr[1] "läste %d paket"

-#: commands.cc:2030
+#: commands.cc:2061
 #, c-format
 msgid "setting default server to %s\n"
 msgstr "sätter standardserver till %s\n"

-#: commands.cc:2036
+#: commands.cc:2067
 #, c-format
 msgid "no hostname given"
 msgstr "inget värdnamn angivet"

-#: commands.cc:2038
+#: commands.cc:2069
 #, c-format
 msgid "no server given and no default server set"
 msgstr "ingen server angiven och ingen standardserver är satt"

-#: commands.cc:2056
+#: commands.cc:2087
 #, c-format
 msgid "setting default branch include pattern to '%s'\n"
 msgstr "sätter standardmönstret för grenar att ta med till '%s'\n"

-#: commands.cc:2062
+#: commands.cc:2093
 #, c-format
 msgid "setting default branch exclude pattern to '%s'\n"
 msgstr "sätter standardmönstret för grenar att INTE ta med till '%s'\n"

-#: commands.cc:2068
+#: commands.cc:2099
 #, c-format
 msgid "no branch pattern given"
 msgstr "inget grenmönster angivet"

-#: commands.cc:2070
+#: commands.cc:2101
 #, c-format
 msgid "no branch pattern given and no default pattern set"
 msgstr "inget grenmönster angivet och inget standardmönster satt"

-#: commands.cc:2086 commands.cc:2101 commands.cc:2115 commands.cc:2130
+#: commands.cc:2117 commands.cc:2132 commands.cc:2146 commands.cc:2161
 msgid "network"
 msgstr "nätverk"

-#: commands.cc:2086 commands.cc:2101 commands.cc:2115
+#: commands.cc:2117 commands.cc:2132 commands.cc:2146
 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
 msgstr "[ADRESS[:PORTNUMMER] [MÖNSTER]]"

-#: commands.cc:2087
+#: commands.cc:2118
 msgid "push branches matching PATTERN to netsync server at ADDRESS"
 msgstr "skicka grenar som matchar MÖNSTER till netsync-server på ADRESS"

-#: commands.cc:2102
+#: commands.cc:2133
 msgid "pull branches matching PATTERN from netsync server at ADDRESS"
 msgstr "hämta grenar som matchar MÖNSTER till netsync-server på ADRESS"

-#: commands.cc:2109
+#: commands.cc:2140
 #, c-format
 msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
 msgstr "hämtar anonymt; använd -kNYCKELNAMN om du behöver autentisera\n"

-#: commands.cc:2116
+#: commands.cc:2147
 msgid "sync branches matching PATTERN with netsync server at ADDRESS"
 msgstr "synkronisera grenar som matchar MÖNSTER till netsync-server på ADRESS"

-#: commands.cc:2130
+#: commands.cc:2161
 msgid "PATTERN ..."
 msgstr "MÖNSTER ..."

-#: commands.cc:2131
+#: commands.cc:2162
 msgid "serve the branches specified by PATTERNs to connecting clients"
 msgstr "servera de grenar som matchar MÖNSTER till anslutande klienter"

-#: commands.cc:2144
+#: commands.cc:2175
 #, c-format
 msgid ""
 "need permission to store persistent passphrase (see hook persist_phrase_ok())"
@@ -976,11 +991,11 @@
 "behöver tillstånd att använda ett permanent lösenord (se lua-rutinen\n"
 "persist_phrase_ok())"

-#: commands.cc:2156
+#: commands.cc:2187
 msgid "database"
 msgstr "databas"

-#: commands.cc:2157
+#: commands.cc:2188
 msgid ""
 "init\n"
 "info\n"
@@ -1012,11 +1027,11 @@
 "rosterify\n"
 "set_epoch GREN EPOK\n"

-#: commands.cc:2171
+#: commands.cc:2202
 msgid "manipulate database state"
 msgstr "gör ändringar direkt i databasen"

-#: commands.cc:2224
+#: commands.cc:2255
 msgid ""
 "set PATH ATTR VALUE\n"
 "get PATH [ATTR]\n"
@@ -1026,41 +1041,40 @@
 "get SÖKVÄG [ATTR]\n"
 "drop SÖKVÄG [ATTR]"

-#: commands.cc:2225
+#: commands.cc:2256
 msgid "set, get or drop file attributes"
 msgstr "sätt, hämta eller ta bort attribut"

-#: commands.cc:2241
+#: commands.cc:2272
 #, c-format
 msgid "Unknown path '%s'"
 msgstr "Okänd sökväg '%s'"

-#: commands.cc:2270
+#: commands.cc:2301
 #, c-format
 msgid "Path '%s' does not have attribute '%s'\n"
 msgstr "Sökvägen '%s' har inget attribut '%s'\n"

-#: commands.cc:2324
+#: commands.cc:2355
 #, c-format
 msgid "--message and --message-file are mutually exclusive"
 msgstr "--message och --message-file får inte anges samtidigt"

-#: commands.cc:2343
-#, fuzzy
+#: commands.cc:2374
 msgid "commit workspace to database"
 msgstr "arkivera arbetskopian i databasen"

-#: commands.cc:2361
+#: commands.cc:2392
 #, c-format
 msgid "no changes to commit\n"
 msgstr "inga ändringar att arkivera\n"

-#: commands.cc:2375
+#: commands.cc:2406
 #, c-format
 msgid "beginning commit on branch '%s'\n"
 msgstr "börjar arkivering av ändringar i grenen '%s'\n"

-#: commands.cc:2384
+#: commands.cc:2415
 #, c-format
 msgid ""
 "MT/log is non-empty and log message was specified on command line\n"
@@ -1071,32 +1085,32 @@
 "kanske ta bort eller flytta på MT/log\n"
 "eller ta bort --message/--message-file från kommandoraden?"

-#: commands.cc:2396
+#: commands.cc:2427
 #, c-format
 msgid "empty log message; commit canceled"
 msgstr "tomt loggmeddelande; arkivering avbryts"

-#: commands.cc:2415
+#: commands.cc:2446
 #, c-format
 msgid "log message rejected: %s\n"
 msgstr "loggmeddelandet förkastas: %s\n"

-#: commands.cc:2423
+#: commands.cc:2454
 #, c-format
 msgid "revision %s already in database\n"
 msgstr "revisionen %s finns redan i databasen\n"

-#: commands.cc:2461 commands.cc:2478 commands.cc:2497
+#: commands.cc:2492 commands.cc:2509 commands.cc:2528
 #, c-format
 msgid "file '%s' modified during commit, aborting"
 msgstr "filen '%s' ändrades under arkivering, avbryter"

-#: commands.cc:2523
+#: commands.cc:2554
 #, c-format
 msgid "committed revision %s\n"
 msgstr "arkiverade revisionen %s\n"

-#: commands.cc:2529
+#: commands.cc:2560
 #, c-format
 msgid ""
 "note: this revision creates divergence\n"
@@ -1105,8 +1119,7 @@
 "obs: den här revisionen skapade divergens\n"
 "obs: du kan tänkas vilja (eller kanske inte) köra 'monotone merge'"

-#: commands.cc:2723
-#, fuzzy
+#: commands.cc:2754
 msgid ""
 "show current diffs on stdout.\n"
 "If one revision is given, the diff between the workspace and\n"
@@ -1114,11 +1127,11 @@
 "them is given.  If no format is specified, unified is used by default."
 msgstr ""
 "skriv ut skillnader till stdout.\n"
-"Om en revision anges visas skillnaden mellan arbetskatalogen och den\n"
+"Om en revision anges visas skillnaden mellan arbetskopian och den\n"
 "revisionen. Om två revisioner anges visas skillnaden mellan dem. Om\n"
 "inget format anges används unified."

-#: commands.cc:2739
+#: commands.cc:2770
 #, c-format
 msgid ""
 "--diff-args requires --external\n"
@@ -1127,17 +1140,16 @@
 "--diff-args kräver att även --external anges\n"
 "lägg till --external eller ta bort --diff-args?"

-#: commands.cc:2781
+#: commands.cc:2812
 #, c-format
 msgid "current revision has no ancestor"
 msgstr "denna revision har ingen förälder"

-#: commands.cc:2844
+#: commands.cc:2875
 msgid "no changes"
 msgstr "inga ändringar"

-#: commands.cc:2876
-#, fuzzy
+#: commands.cc:2907
 msgid ""
 "update workspace.\n"
 "This command modifies your workspace to be based off of a\n"
@@ -1151,12 +1163,12 @@
 "Om en revision har angivits så uppdateras arbetskopian till den,\n"
 "i annat fall uppdateras den till lövet i grenen."

-#: commands.cc:2914
-#, fuzzy, c-format
+#: commands.cc:2945
+#, c-format
 msgid "this workspace is a new project; cannot update"
 msgstr "denna arbetskatalog är ett nytt projekt; kan inte uppdatera"

-#: commands.cc:2921
+#: commands.cc:2952
 #, c-format
 msgid ""
 "your request matches no descendents of the current revision\n"
@@ -1167,32 +1179,32 @@
 "faktum är att den inte ens matchar nuvarande revision\n"
 "du kanske vill ange --revision=<revision i annan gren>"

-#: commands.cc:2926
+#: commands.cc:2957
 #, c-format
 msgid "multiple update candidates:\n"
 msgstr "mer än en uppdateringskandidat:\n"

-#: commands.cc:2930
+#: commands.cc:2961
 #, c-format
 msgid "choose one with 'monotone update -r<id>'\n"
 msgstr "välj en med 'monotone update -r<id>'\n"

-#: commands.cc:2931
+#: commands.cc:2962
 #, c-format
 msgid "multiple candidates remain after selection"
 msgstr "mer än en kandidat efter urval"

-#: commands.cc:2946
+#: commands.cc:2977
 #, c-format
 msgid "already up to date at %s\n"
 msgstr "redan uppdaterad till %s\n"

-#: commands.cc:2954
+#: commands.cc:2985
 #, c-format
 msgid "selected update target %s\n"
 msgstr "valt uppdateringsmål är %s\n"

-#: commands.cc:2966
+#: commands.cc:2997
 #, c-format
 msgid ""
 "revision %s is not a member of branch %s\n"
@@ -1201,140 +1213,157 @@
 "revisionen %s är inte i grenen %s\n"
 "försök igen med en explicit --branch\n"

-#: commands.cc:3066
+#: commands.cc:3097
 #, c-format
 msgid "updated to base revision %s\n"
 msgstr "uppdaterad till revisionen %s\n"

-#: commands.cc:3076
+#: commands.cc:3107
 msgid "merge unmerged heads of branch"
 msgstr "slå ihop ej ihopslagna löv i grenen"

-#: commands.cc:3090
+#: commands.cc:3121
 #, c-format
 msgid "branch '%s' is merged\n"
 msgstr "löven i grenen '%s' är ihopslagna\n"

-#: commands.cc:3096
+#: commands.cc:3127
 #, c-format
 msgid "starting with revision 1 / %d\n"
 msgstr "börjar med revision 1 av %d\n"

-#: commands.cc:3100
+#: commands.cc:3131
 #, c-format
 msgid "merging with revision %d / %d\n"
 msgstr "slår ihop med revision %d av %d\n"

-#: commands.cc:3101 commands.cc:3102 commands.cc:3169 commands.cc:3245
-#: commands.cc:3246
+#: commands.cc:3132 commands.cc:3133 commands.cc:3215 commands.cc:3348
+#: commands.cc:3349
 #, c-format
 msgid "[source] %s\n"
 msgstr "[källa]      %s\n"

-#: commands.cc:3119 commands.cc:3210 commands.cc:3264
+#: commands.cc:3150 commands.cc:3313 commands.cc:3367
 #, c-format
 msgid "[merged] %s\n"
 msgstr "[ihopslagen] %s\n"

-#: commands.cc:3122
-#, fuzzy, c-format
+#: commands.cc:3153
+#, c-format
 msgid "note: your workspaces have not been updated\n"
 msgstr "obs: dina arbetskopior har inte uppdaterats\n"

-#: commands.cc:3125
+#: commands.cc:3156
 msgid "SOURCE-BRANCH DEST-BRANCH"
 msgstr "KÄLLGREN MÅLGREN"

-#: commands.cc:3126
+#: commands.cc:3157
 msgid "merge from one branch to another asymmetrically"
 msgstr "slå ihop asymmetriskt från en gren till en annan"

-#: commands.cc:3160 commands.cc:3163
+#: commands.cc:3167
+msgid "SOURCE-BRANCH DEST-BRANCH DIR"
+msgstr "KÄLLGREN MÅLGREN KATALOG"
+
+#: commands.cc:3168
+msgid "merge one branch into a subdirectory in another branch"
+msgstr "slå ihop en gren till en underkatalog i en annan gren"
+
+#: commands.cc:3206 commands.cc:3209
 #, c-format
 msgid "branch '%s' is not merged\n"
 msgstr "löven i grenen '%s' är inte ihopslagna\n"

-#: commands.cc:3168
+#: commands.cc:3214
 #, c-format
 msgid "propagating %s -> %s\n"
 msgstr "propagerar %s -> %s\n"

-#: commands.cc:3170
+#: commands.cc:3216
 #, c-format
 msgid "[target] %s\n"
 msgstr "[mål]        %s\n"

-#: commands.cc:3175
+#: commands.cc:3221
 #, c-format
 msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
 msgstr "grenen '%s' är uppdaterad med avseende på grenen '%s'\n"

-#: commands.cc:3177
+#: commands.cc:3223
 #, c-format
 msgid "no action taken\n"
 msgstr "inget utfördes\n"

-#: commands.cc:3181
+#: commands.cc:3227
 #, c-format
 msgid "no merge necessary; putting %s in branch '%s'\n"
 msgstr "ingen ihopslagning behövs; sätter %s i grenen '%s'\n"

-#: commands.cc:3214
+#: commands.cc:3263
+#, c-format
+msgid "Path %s not found in destination tree."
+msgstr "Sökvägen %s finns inte i målträdet."
+
+#: commands.cc:3317
 msgid "refresh the inodeprint cache"
 msgstr "uppdatera inodeprint-cachen"

-#: commands.cc:3223
+#: commands.cc:3326
 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
 msgstr "VÄNSTERREVISION HÖGERREVISION MÅLGREN"

-#: commands.cc:3224
+#: commands.cc:3327
 msgid "merge two explicitly given revisions, placing result in given branch"
 msgstr ""
 "slå ihop två explicit angivna revisioner, placera resultatet i angiven gren"

-#: commands.cc:3238
+#: commands.cc:3341
 #, c-format
 msgid "%s and %s are the same revision, aborting"
 msgstr "%s och %s är samma revision, avbryter"

-#: commands.cc:3240 commands.cc:3242
+#: commands.cc:3343 commands.cc:3345
 #, c-format
 msgid "%s is already an ancestor of %s"
 msgstr "%s är redan förfader till %s"

-#: commands.cc:3267
+#: commands.cc:3370
 msgid "(revision|file|key) PARTIAL-ID"
 msgstr "(revision|file|key) PARTIAL-ID"

-#: commands.cc:3268
+#: commands.cc:3371
 msgid "complete partial id"
 msgstr "utöka den partiella identiteten"

-#: commands.cc:3277
+#: commands.cc:3380
 #, c-format
 msgid "non-hex digits in partial id"
 msgstr "något tecken i den partiella identiteten är inte hexadecimalt"

-#: commands.cc:3316
-#, fuzzy
+#: commands.cc:3419
 msgid "revert file(s), dir(s) or entire workspace (\".\")"
 msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")"

-#: commands.cc:3393
+#: commands.cc:3496
 #, c-format
 msgid "reverting %s"
 msgstr "återställer %s"

-#: commands.cc:3397
+#: commands.cc:3500
 #, c-format
 msgid "no file version %s found in database for %s"
 msgstr "filversionen %s finns inte i databasen för %s"

-#: commands.cc:3418
+#: commands.cc:3513
+#, c-format
+msgid "recreating %s/"
+msgstr "återställer %s/"
+
+#: commands.cc:3525
 msgid "RCSFILE..."
 msgstr "RCSFIL..."

-#: commands.cc:3419
+#: commands.cc:3526
 msgid ""
 "parse versions in RCS files\n"
 "this command doesn't reconstruct or import revisions.you probably want "
@@ -1344,36 +1373,36 @@
 "detta kommando importerar inte revisioner; du vill antagligen använda\n"
 "cvs_import"

-#: commands.cc:3435
+#: commands.cc:3542
 msgid "rcs"
 msgstr "rcs"

-#: commands.cc:3435
+#: commands.cc:3542
 msgid "CVSROOT"
 msgstr "CVSROOT"

-#: commands.cc:3435
+#: commands.cc:3542
 msgid "import all versions in CVS repository"
 msgstr "importera alla revisioner i ett CVS-arkiv"

-#: commands.cc:3498
+#: commands.cc:3605
 msgid "PATH"
 msgstr "SÖKVÄG"

-#: commands.cc:3499
+#: commands.cc:3606
 msgid "print annotated copy of the file from REVISION"
 msgstr "skriv ut filen ur REVISION med extra detaljer"

-#: commands.cc:3519
+#: commands.cc:3626
 #, c-format
 msgid "no revision for file '%s' in database"
 msgstr "filen '%s' har ingen revision i databasen"

-#: commands.cc:3537
+#: commands.cc:3644
 msgid "[FILE] ..."
 msgstr "[FIL] ..."

-#: commands.cc:3538
+#: commands.cc:3645
 msgid ""
 "print history in reverse order (filtering by 'FILE'). If one or more\n"
 "revisions are given, use them as a starting point."
@@ -1382,35 +1411,34 @@
 "arbetskatalogen om inga filer angivits. Om en eller flera revisioner\n"
 "har angivits används de som utgångspunkter."

-#: commands.cc:3586
+#: commands.cc:3693
 #, c-format
 msgid "Unknown file '%s' for log command"
 msgstr "Okänd fil '%s'"

-#: commands.cc:3604
+#: commands.cc:3711
 #, c-format
 msgid "only one of --last/--next allowed"
 msgstr "enbart en av --last eller --next tillåten"

-#: commands.cc:3772
+#: commands.cc:3879
 msgid "[DIRECTORY]"
 msgstr "[KATALOG]"

-#: commands.cc:3772
-#, fuzzy
+#: commands.cc:3879
 msgid "setup a new workspace directory, default to current"
 msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)"

-#: commands.cc:3778
+#: commands.cc:3885
 #, c-format
 msgid "need --branch argument for setup"
 msgstr "du måste ange en gren med --branch till kommandot \"setup\""

-#: commands.cc:3792
+#: commands.cc:3899
 msgid "automation"
 msgstr "automatisering"

-#: commands.cc:3793
+#: commands.cc:3900
 msgid ""
 "interface_version\n"
 "heads [BRANCH]\n"
@@ -1454,43 +1482,87 @@
 "get_revision [REVID]\n"
 "keys\n"

-#: commands.cc:3813
+#: commands.cc:3920
 msgid "automation interface"
 msgstr "automatiseringsgränssnitt"

-#: commands.cc:3827 commands.cc:3843
+#: commands.cc:3934 commands.cc:3950
 msgid "vars"
 msgstr "variabler"

-#: commands.cc:3827
+#: commands.cc:3934
 msgid "DOMAIN NAME VALUE"
 msgstr "DOMÄN NAMN VÄRDE"

-#: commands.cc:3828
+#: commands.cc:3935
 msgid "set the database variable NAME to VALUE, in domain DOMAIN"
 msgstr "sätt databasvariabeln NAMN till VÄRDE i domänen DOMÄN"

-#: commands.cc:3843
+#: commands.cc:3950
 msgid "DOMAIN NAME"
 msgstr "DOMÄN NAMN"

-#: commands.cc:3844
+#: commands.cc:3951
 msgid "remove the database variable NAME in domain DOMAIN"
 msgstr "ta bort databasvariabeln NAMN från domänen DOMÄN"

-#: commands.cc:3855
+#: commands.cc:3962
 #, c-format
 msgid "no var with name %s in domain %s"
 msgstr "det finns inga variabler med namnet %s i domänen %s"

-#: commands.cc:3859
+#: commands.cc:3966
 msgid "REVID"
 msgstr "REVID"

-#: commands.cc:3860
+#: commands.cc:3967
 msgid "dump the roster associated with the given REVID"
 msgstr "skriv ut den roster som hör ihop med angivet REVID"

+#: commands.cc:3985
+msgid "REV REV"
+msgstr "REV REV"
+
+#: commands.cc:3985
+msgid ""
+"Show what conflicts would need to be resolved to merge the given revisions."
+msgstr "Visa de konflikter som behöver lösas om de givna revisionerna slås ihop."
+
+#: commands.cc:3994 commands.cc:3996
+#, c-format
+msgid "%s in an ancestor of %s; no merge is needed."
+msgstr "%s är en förfader till %s; någon ihopslagning behövs inte."
+
+#: commands.cc:4010
+#, c-format
+msgid "There are %s node_name_conflicts."
+msgstr "Det finns %s node_name-konflikter."
+
+#: commands.cc:4011
+#, c-format
+msgid "There are %s file_content_conflicts."
+msgstr "Det finns %s file_content-konflikter."
+
+#: commands.cc:4012
+#, c-format
+msgid "There are %s node_attr_conflicts."
+msgstr "Det finns %s node_attr-konflikter."
+
+#: commands.cc:4013
+#, c-format
+msgid "There are %s orphaned_node_conflicts."
+msgstr "Det finns %s orphaned_node-konflikter."
+
+#: commands.cc:4014
+#, c-format
+msgid "There are %s rename_target_conflicts."
+msgstr "Det finns %s rename_target-konflikter."
+
+#: commands.cc:4015
+#, c-format
+msgid "There are %s directory_loop_conflicts."
+msgstr "Det finns %s directory_loop-konflikter."
+
 #: database_check.cc:125
 msgid "files"
 msgstr "filer"
@@ -1781,7 +1853,7 @@
 msgid "database is good\n"
 msgstr "databasen är i gott skick\n"

-#: database.cc:144
+#: database.cc:138
 #, c-format
 msgid ""
 "layout of database %s doesn't match this version of monotone\n"
@@ -1795,7 +1867,7 @@
 "(detta går inte att ångra; du vill nog ta en säkerhetskopia av databasen\n"
 "först)"

-#: database.cc:168
+#: database.cc:162
 #, c-format
 msgid ""
 "database %s contains revisions but no rosters\n"
@@ -1814,7 +1886,7 @@
 "  sedan databasen på nytt.\n"
 "ursäkta besväret."

-#: database.cc:187
+#: database.cc:181
 #, c-format
 msgid ""
 "database %s contains manifests but no revisions\n"
@@ -1825,19 +1897,19 @@
 "detta är en väldigt gammal databas; den behöver uppgraderas\n"
 "var god läs README.changesets för detaljer"

-#: database.cc:248
+#: database.cc:217
 #, c-format
 msgid "unable to probe database version in file %s"
 msgstr "kunde inte hitta någon databasversion i filen %s"

-#: database.cc:255
+#: database.cc:224
 #, c-format
 msgid "database %s is not an sqlite version 3 file, try dump and reload"
 msgstr ""
 "databasen %s är inte skapad med SQLite version 3; testa att dumpa och ladda "
 "på nytt"

-#: database.cc:282
+#: database.cc:251
 msgid ""
 "make sure database and containing directory are writeable\n"
 "and you have not run out of disk space"
@@ -1846,7 +1918,7 @@
 "i\n"
 "samt att det finns tillräckligt med ledigt utrymme på disken"

-#: database.cc:288
+#: database.cc:257
 #, c-format
 msgid ""
 "sqlite error: %d: %s\n"
@@ -1855,12 +1927,12 @@
 "sqlite-fel: %d: %s\n"
 "%s"

-#: database.cc:334
+#: database.cc:303
 #, c-format
 msgid "could not initialize database: %s: already exists"
 msgstr "kunde inte initiera databasen: %s: den finns redan"

-#: database.cc:339
+#: database.cc:308
 #, c-format
 msgid ""
 "existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -1871,12 +1943,12 @@
 "databasen '%s'\n"
 "avbryter skapandet av databasen"

-#: database.cc:461
+#: database.cc:451
 #, c-format
 msgid "cannot create %s; it already exists"
 msgstr "kan inte skapa %s; den finns redan"

-#: database.cc:521
+#: database.cc:511
 #, c-format
 msgid ""
 "schema version    : %s\n"
@@ -1917,68 +1989,68 @@
 "  cert                : %u\n"
 "  total               : %u\n"

-#: database.cc:575
+#: database.cc:566
 #, c-format
 msgid "database schema version: %s"
 msgstr "databasens schemaversion: %s"

-#: database.cc:652
+#: database.cc:643
 #, c-format
 msgid "multiple statements in query: %s\n"
 msgstr "multipla kommandon i databasfråga: %s\n"

-#: database.cc:658
+#: database.cc:649
 #, c-format
 msgid "wanted %d columns got %d in query: %s\n"
 msgstr "ville ha %d kolumner, fick %d i databasfråga: %s\n"

-#: database.cc:716
+#: database.cc:708
 #, c-format
 msgid "null result in query: %s\n"
 msgstr "inget resultat med databasfråga: %s\n"

-#: database.cc:734
+#: database.cc:726
 #, c-format
 msgid "wanted %d rows got %s in query: %s\n"
 msgstr "ville ha %d rader, fick %s i databasfråga: %s\n"

-#: database.cc:1781
+#: database.cc:1776
 #, c-format
 msgid "another key with name '%s' already exists"
 msgstr "det finns redan en annan nyckel med namnet '%s'"

-#: database.cc:2825
+#: database.cc:2809
 #, c-format
 msgid "no database specified"
 msgstr "ingen databas angiven"

-#: database.cc:2833
+#: database.cc:2817
 #, c-format
 msgid "database %s does not exist"
 msgstr "databasen %s finns inte"

-#: database.cc:2834
+#: database.cc:2818
 #, c-format
 msgid "%s is a directory, not a database"
 msgstr "%s är en katalog, inte en databas"

-#: database.cc:2859
+#: database.cc:2843
 #, c-format
 msgid "could not open database '%s': %s"
 msgstr "kunde inte öppna databasen '%s': %s"

 #: diff_patch.cc:588
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s' does not exist in workspace"
 msgstr "filen '%s' existerar inte i arbetskopian"

 #: diff_patch.cc:589
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' in workspace is a directory, not a file"
 msgstr "'%s' i arbetskopian är en katalog, inte en fil"

 #: diff_patch.cc:593
-#, fuzzy, c-format
+#, c-format
 msgid "file %s in workspace has id %s, wanted %s"
 msgstr "filen %s i arbetskopian har identiteten %s, %s eftersöktes"

@@ -2121,17 +2193,17 @@
 msgid "cannot open file %s for reading"
 msgstr "kan inte öppna filen %s för läsning"

-#: file_io.cc:379
+#: file_io.cc:381
 #, c-format
 msgid "Cannot read standard input multiple times"
 msgstr "Kan inte läsa från stdin mer än en gång"

-#: file_io.cc:410
+#: file_io.cc:412
 #, c-format
 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:418
+#: file_io.cc:420
 #, c-format
 msgid "cannot open file %s for writing"
 msgstr "kan inte öppna filen %s för skrivning"
@@ -2196,7 +2268,7 @@
 msgid "Directory '%s' does not exists"
 msgstr "Katalogen '%s' finns inte"

-#: lua.cc:587 rcs_import.cc:1217
+#: lua.cc:587 rcs_import.cc:1217 work.cc:385
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "'%s' är inte en katalog"
@@ -2288,8 +2360,8 @@
 msgstr "skriv ut skillnaden mellan denna och tidigare revision i loggen"

 #: monotone.cc:63
-msgid "include merges when printing logs"
-msgstr "ta med ihopslagningar i loggen"
+msgid "exclude merges when printing logs"
+msgstr "ta ej med ihopslagningar i loggen"

 #: monotone.cc:64
 msgid "use the current arguments as the future default"
@@ -2328,12 +2400,10 @@
 msgstr "adress:port att lyssna på (:4691 om inget anges)"

 #: monotone.cc:73
-#, fuzzy
 msgid "perform the operations for files missing from workspace"
 msgstr "genomför operationen på filer som saknas i arbetskatalogen"

 #: monotone.cc:74
-#, fuzzy
 msgid "perform the operations for unknown files from workspace"
 msgstr "genomför operationen på okända filer i arbetskatalogen"

@@ -2346,9 +2416,8 @@
 msgstr "släng attribut med den givna nyckeln vid konvertering till 'rosters'"

 #: monotone.cc:77
-#, fuzzy
 msgid "exclude files when printing logs"
-msgstr "ta med ihopslagningar i loggen"
+msgstr "ta ej med ihopslagningar i loggen"

 #: monotone.cc:86
 msgid "print debug log to stderr while running"
@@ -2407,9 +2476,8 @@
 msgstr "ange databasens filnamn"

 #: monotone.cc:100
-#, fuzzy
 msgid "limit search for workspace to specified root"
-msgstr "begränsa sökningen efter arbetskatalogen till denna katalog"
+msgstr "begränsa sökningen efter arbetskopian till denna katalog"

 #: monotone.cc:101
 msgid "verbose completion output"
@@ -2471,8 +2539,13 @@
 msgid "unknown item type 0x%x for '%s'"
 msgstr "okänd typ 0x%x för '%s'"

-#: netcmd.cc:92
+#: netcmd.cc:112
 #, c-format
+msgid "unknown netcmd code 0x%x"
+msgstr "okänd netcmd-kod 0x%x"
+
+#: netcmd.cc:117
+#, c-format
 msgid ""
 "protocol version mismatch: wanted '%d' got '%d'\n"
 "%s"
@@ -2480,27 +2553,22 @@
 "protokollversionen stämmer inte: ville ha '%d', fick '%d'\n"
 "%s"

-#: netcmd.cc:97
+#: netcmd.cc:122
 msgid "the remote side has a newer, incompatible version of monotone"
 msgstr ""
 "den monotone som används i andra änden är en nyare, inkompatibel version"

-#: netcmd.cc:98
+#: netcmd.cc:123
 msgid "the remote side has an older, incompatible version of monotone"
 msgstr ""
 "den monotone som används i andra änden är en äldre, inkompatibel version"

-#: netcmd.cc:118
+#: netcmd.cc:133
 #, c-format
-msgid "unknown netcmd code 0x%x"
-msgstr "okänd netcmd-kod 0x%x"
-
-#: netcmd.cc:129
-#, c-format
 msgid "oversized payload of '%d' bytes"
 msgstr "'%d' byte för mycket data"

-#: netcmd.cc:158
+#: netcmd.cc:162
 #, c-format
 msgid ""
 "bad HMAC checksum (got %s, wanted %s)\n"
@@ -2509,7 +2577,7 @@
 "felaktig HMAC-kontrollsumma (fick %s, ville ha %s)\n"
 "detta tyder på att data var korrupt under överföringen\n"

-#: netcmd.cc:253 netcmd.cc:299
+#: netcmd.cc:257 netcmd.cc:303
 #, c-format
 msgid "unknown role specifier %d"
 msgstr "okänd rollspecifikation %d"
@@ -3152,73 +3220,78 @@
 msgid "Current work set: %i items\n"
 msgstr "Nuvarande arbetsmängd: %i delar\n"

-#: schema_migration.cc:184
+#: schema_migration.cc:181
 #, c-format
 msgid "failure extracting schema from sqlite_master"
 msgstr "kunde inte extrahera schemat ur sqlite_master"

-#: schema_migration.cc:220
+#: schema_migration.cc:217
 #, c-format
 msgid "calculating necessary migration steps"
 msgstr "beräknar antalet nödvändiga steg för migrering"

-#: schema_migration.cc:230
+#: schema_migration.cc:227
 #, c-format
 msgid "error at transaction BEGIN statement"
 msgstr "fel vid transaktionens början (kommandot BEGIN)"

-#: schema_migration.cc:257
+#: schema_migration.cc:228
 #, c-format
+msgid "migrating data"
+msgstr "migrerar data"
+
+#: schema_migration.cc:254
+#, c-format
 msgid "migration step failed: %s"
 msgstr "migreringssteg misslyckades: %s"

-#: schema_migration.cc:271
+#: schema_migration.cc:268
 #, c-format
 msgid "mismatched result of migration, got %s, wanted %s"
 msgstr "resultatet av migreringen stämde inte, fick %s, ville ha %s"

-#: schema_migration.cc:274
+#: schema_migration.cc:271
 #, c-format
 msgid "committing changes to database"
 msgstr "arkiverar ändringar i databasen"

-#: schema_migration.cc:276
+#: schema_migration.cc:273
 #, c-format
 msgid "failure on COMMIT"
 msgstr "databaskommandot COMMIT misslyckades"

-#: schema_migration.cc:278
+#: schema_migration.cc:275
 #, c-format
 msgid "optimizing database"
 msgstr "optimerar databasen"

-#: schema_migration.cc:280
+#: schema_migration.cc:277
 #, c-format
 msgid "error vacuuming after migration"
 msgstr "fel vid dammsugning av databasen efter migreringen"

-#: schema_migration.cc:283
+#: schema_migration.cc:280
 #, c-format
 msgid "error running analyze after migration"
 msgstr "fel under analys efter migreringen"

-#: schema_migration.cc:290
+#: schema_migration.cc:287
 #, c-format
 msgid "database schema %s is unknown; cannot perform migration"
 msgstr "databasschemat %s är okänt; kan inte genomföra migreringen"

-#: schema_migration.cc:295
+#: schema_migration.cc:292
 #, c-format
 msgid "no migration performed; database schema already up-to-date at %s\n"
 msgstr ""
 "migreringen genomfördes inte; databasschemat redan uppdaterat till %s\n"

-#: schema_migration.cc:845
+#: schema_migration.cc:842
 #, c-format
 msgid "public and private keys for %s don't match"
 msgstr "publik och privat nyckel för %s stämmer inte överens"

-#: schema_migration.cc:848
+#: schema_migration.cc:845
 #, c-format
 msgid "moving key '%s' from database to %s"
 msgstr "flyttar nyckeln '%s' från databasen till %s"
@@ -3227,17 +3300,6 @@
 msgid "Press enter when the subprocess has completed"
 msgstr "Tryck [Retur] när underprocessen är klar"

-#: std_hooks.lua:211
-#, c-format
-msgid "Error running editor '%s' to enter log message\n"
-msgstr ""
-"Något gick fel när textredigeraren '%s' skulle användas för att skriva ett "
-"loggmeddelande\n"
-
-#: std_hooks.lua:496
-msgid "executing external 3-way merge command\n"
-msgstr "använder externt 3-vägs ihopslagningskommando\n"
-
 #: transforms.cc:477
 #, c-format
 msgid "failed to convert string from %s to %s: '%s'"
@@ -3336,12 +3398,12 @@
 msgstr "felaktig HMAC-längd, %d byte"

 #: work.cc:117
-#, fuzzy, c-format
+#, c-format
 msgid "skipping ignorable file %s"
 msgstr "hoppar över ignorerbar fil %s"

 #: work.cc:126
-#, fuzzy, c-format
+#, c-format
 msgid "skipping %s, already accounted for in workspace"
 msgstr "hoppar över %s, den finns redan noterad i arbetskopian"

@@ -3351,9 +3413,9 @@
 msgstr "lägger till %s i arbetskopians manifest"

 #: work.cc:203
-#, fuzzy, c-format
+#, c-format
 msgid "skipping %s, not currently tracked"
-msgstr "hoppar över %s, ej noterad i arbetskopian"
+msgstr "hoppar över %s, ej noterad i arbetskopian för närvarande"

 #: work.cc:211
 #, c-format
@@ -3361,7 +3423,7 @@
 msgstr "kan inte ta bort %s/, den är inte tom"

 #: work.cc:213
-#, fuzzy, c-format
+#, c-format
 msgid "dropping %s from workspace manifest"
 msgstr "tar bort %s från arbetskopians manifest"

@@ -3391,85 +3453,121 @@
 msgstr "målet %s finns redan i nuvarande revision"

 #: work.cc:309
-#, fuzzy, c-format
+#, c-format
 msgid "renaming %s to %s in workspace manifest"
 msgstr "byter namn från %s till %s i arbetskopians manifest"

 #: work.cc:334
-#, fuzzy, c-format
+#, c-format
 msgid "%s doesn't exist in workspace, skipping"
 msgstr "hoppar över %s, den existerar inte i arbetskopian"

 #: work.cc:338
-#, fuzzy, c-format
+#, c-format
 msgid "destination %s already exists in workspace, skipping"
 msgstr "hoppar över %s, den finns redan noterad i arbetskopian"

-#: work.cc:422
-#, fuzzy, c-format
+#: work.cc:365
+#, 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:367
+#, 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:372
+#, 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:382
+#, 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:388
+#, c-format
+msgid "'%s' is in the way"
+msgstr "'%s' är i vägen"
+
+#: work.cc:485
+#, c-format
 msgid "workspace is corrupt: %s does not exist"
 msgstr "arbetskopian är korrupt: %s finns inte"

-#: work.cc:423
-#, fuzzy, c-format
+#: work.cc:486
+#, c-format
 msgid "workspace is corrupt: %s is a directory"
 msgstr "arbetskopian är korrupt: %s är en katalog"

-#: work.cc:433
-#, fuzzy, c-format
+#: work.cc:496
+#, c-format
 msgid "Problem with workspace: %s is unreadable"
 msgstr "Problem med arbetskatalogen: %s är oläsbar"

-#: work.cc:459
+#: work.cc:522
 #, c-format
 msgid "base revision %s does not exist in database\n"
 msgstr "grundrevisionen %s finns inte i databasen\n"

-#: work.cc:771
-#, fuzzy, c-format
+#: work.cc:860
+#, c-format
 msgid "dropping %s"
-msgstr "slänger cert\n"
+msgstr "slänger %s"

-#: work.cc:782 work.cc:793
+#: work.cc:871 work.cc:882
 #, c-format
 msgid "path %s already exists"
 msgstr "sökvägen %s finns redan"

-#: work.cc:821 work.cc:853
+#: work.cc:904 work.cc:931
 #, c-format
-msgid "adding %s"
-msgstr "lägger till %s"
+msgid "adding '%s'"
+msgstr "lägger till '%s'"

-#: work.cc:837
+#: work.cc:920
 #, c-format
-msgid "renaming '%s' onto existing file: '%s'\n"
-msgstr "byter namn på '%s' till redan existerande fil: '%s'\n"
+msgid "path '%s' already exists, cannot create"
+msgstr "sökvägen '%s' finns redan, kan inte skapa den"

-#: work.cc:849
-#, fuzzy, c-format
-msgid "renaming %s to %s"
-msgstr "uppdaterar %s till %s"
+#: work.cc:927
+#, c-format
+msgid "renaming '%s' to '%s'"
+msgstr "byter namn på '%s' till '%s'"

-#: work.cc:865
+#: work.cc:962
 #, c-format
 msgid "file '%s' does not exist"
 msgstr "filen '%s' finns inte"

-#: work.cc:866
+#: work.cc:963
 #, c-format
 msgid "file '%s' is a directory"
 msgstr "filen '%s' är en katalog"

-#: work.cc:871
+#: work.cc:968
 #, c-format
 msgid "content of file '%s' has changed, not overwriting"
 msgstr "innehållet i filen '%s' har ändrats, skriver inte över"

-#: work.cc:872
+#: work.cc:969
 #, c-format
 msgid "updating %s to %s"
 msgstr "uppdaterar %s till %s"

+#~ msgid "Error running editor '%s' to enter log message\n"
+#~ msgstr ""
+#~ "Något gick fel när textredigeraren '%s' skulle användas för att skriva "
+#~ "ett loggmeddelande\n"
+
+#~ msgid "executing external 3-way merge command\n"
+#~ msgstr "använder externt 3-vägs ihopslagningskommando\n"
+
+#~ msgid "renaming '%s' onto existing file: '%s'\n"
+#~ msgstr "byter namn på '%s' till redan existerande fil: '%s'\n"
+
 #~ msgid ""
 #~ "wrote debugging log to %s\n"
 #~ "if reporting a bug, please include this file"