#
#
# patch "ChangeLog"
#  from [967f5dbf383db67bae23eb8b165b2920a04ec7f8]
#    to [71490a8d338050189501e1c8e857e75e558e4121]
#
# patch "po/fr.po"
#  from [5c2874b740dde07404c45a1501b5f6652b8d75a0]
#    to [a1888409772122e138c8c977e014e887e74f9dc2]
#
# patch "po/sv.po"
#  from [827661f47302ef571540784a549fed767d853cd7]
#    to [26eccddd5aeaee1260d1ab6f77c9aa5cd9daa38f]
#
============================================================
--- ChangeLog	967f5dbf383db67bae23eb8b165b2920a04ec7f8
+++ ChangeLog	71490a8d338050189501e1c8e857e75e558e4121
@@ -1,3 +1,8 @@
+2006-03-24  Richard Levitte  <address@hidden>
+
+	* po/sv.po: Corrected all the fuzzy translations
+	* po/fr.po: Added some missing translations.
+
 2006-03-24  Matthew Gregan  <address@hidden>

 	* database.cc (database::load): Analyze database after load.
============================================================
--- po/fr.po	5c2874b740dde07404c45a1501b5f6652b8d75a0
+++ po/fr.po	a1888409772122e138c8c977e014e887e74f9dc2
@@ -243,8 +243,8 @@
 msgstr ""
 "Project-Id-Version: monotone 0.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-12 13:05+0100\n"
-"PO-Revision-Date: 2006-03-10 12:08+0100\n"
+"POT-Creation-Date: 2006-03-24 13:27+0100\n"
+"PO-Revision-Date: 2006-03-24 13:47+0100\n"
 "Last-Translator: Benoît Dejean <address@hidden>\n"
 "Language-Team: Benoît Dejean <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -252,108 +252,108 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"

-#: ../app_state.cc:110
+#: app_state.cc:118
 #, c-format
 msgid "workspace required but not found%s%s"
 msgstr "espace de travail requis mais pas trouvé%s%s"

-#: ../app_state.cc:118
+#: app_state.cc:126
 #, c-format
 msgid "invalid directory ''"
 msgstr "dossier pas valable «»"

-#: ../app_state.cc:126
+#: app_state.cc:134
 #, c-format
 msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
 msgstr "le dossier administratif « %s » existe déjà dans « %s »\n"

-#: ../app_state.cc:165 ../app_state.cc:180
+#: app_state.cc:173 app_state.cc:188
 #, c-format
 msgid "unknown path '%s'\n"
 msgstr "chemin inconnu « %s »\n"

-#: ../app_state.cc:341
+#: app_state.cc:349
 #, c-format
 msgid "search root '%s' does not exist"
 msgstr "le racine de l'espace de travail « %s » n'existe pas"

-#: ../app_state.cc:342
+#: app_state.cc:350
 #, c-format
 msgid "search root '%s' is not a directory\n"
 msgstr "le racine de l'espace de travail « %s » n'est pas un dossier\n"

-#: ../app_state.cc:377
+#: app_state.cc:385
 #, c-format
 msgid "failed to parse date string '%s': %s"
 msgstr "échou de comprendre la date « %s » : %s"

-#: ../app_state.cc:391
+#: app_state.cc:399
 #, c-format
 msgid "negative depth not allowed\n"
 msgstr "profondeur négative interdite\n"

-#: ../app_state.cc:399
+#: app_state.cc:407
 #, c-format
 msgid "negative or zero last not allowed\n"
 msgstr "« last » négative ou zéro interdite\n"

-#: ../app_state.cc:407
+#: app_state.cc:415
 #, c-format
 msgid "negative or zero next not allowed\n"
 msgstr "« next » négative ou zéro interdite\n"

-#: ../app_state.cc:536
+#: app_state.cc:544
 #, c-format
 msgid "Failed to read options file %s"
 msgstr "La lecture du fichier d'options « %s » a échouée"

-#: ../app_state.cc:553
+#: app_state.cc:561
 #, c-format
 msgid "Failed to write options file %s"
 msgstr "L'écriture du fichier d'options « %s » a échouée"

-#: ../basic_io.cc:27
+#: basic_io.cc:27
 #, c-format
 msgid "error in %s:%d:%d:E: %s"
 msgstr "erreur dans %s:%d:%d:E : %s"

-#: ../cert.cc:58
+#: cert.cc:58
 #, c-format
 msgid "ignoring bad signature by '%s' on '%s'\n"
 msgstr "ignore mauvaise signature fait par « %s » sur « %s »\n"

-#: ../cert.cc:66
+#: cert.cc:66
 #, c-format
 msgid "ignoring unknown signature by '%s' on '%s'\n"
 msgstr "ignore signature inconnue fait par « %s » sur « %s »\n"

-#: ../cert.cc:129
+#: cert.cc:129
 #, c-format
 msgid "trust function disliked %d signers of %s cert on manifest %s\n"
 msgstr ""
 "function de confiance n'aimait pas %d signataires du certif %s dans le "
 "manifeste %s\n"

-#: ../cert.cc:182
+#: cert.cc:182
 #, c-format
 msgid "trust function disliked %d signers of %s cert on revision %s\n"
 msgstr ""
 "function de confiance n'aimait pas %d signataires du certif %s dans la "
 "révision %s\n"

-#: ../cert.cc:271
+#: cert.cc:271
 #, c-format
 msgid "calculated cert hash '%s' does not match '%s'"
 msgstr ""
 "la somme de contrôle calculée pour le certif, « %s », ne correspond pas à « %"
 "s »"

-#: ../cert.cc:347 ../keys.cc:532
+#: cert.cc:347 keys.cc:532
 #, c-format
 msgid "no key pair '%s' found in key store '%s'"
 msgstr "aucune paire de clefs « %s » dans l'entrepôt de clefs « %s »"

-#: ../cert.cc:424
+#: cert.cc:424
 #, c-format
 msgid ""
 "you have no private key to make signatures with\n"
@@ -362,7 +362,7 @@
 "vous n'avez pas de clef privé pour établir des signatures,\n"
 "vous avez sans doute besoin de faire « genkey <votre email> »"

-#: ../cert.cc:427
+#: cert.cc:427
 #, c-format
 msgid ""
 "you have multiple private keys\n"
@@ -372,21 +372,21 @@
 "choisissez-en une à utiliser pour vos signatures en ajoutant « -"
 "k<nomdeclef> » à votre commande"

-#: ../cert.cc:444
+#: cert.cc:444
 #, c-format
 msgid "no branch found for empty revision, please provide a branch name"
 msgstr ""
 "aucune branche trouvée pour la révision vide, veuillez donne le nom d'une "
 "branche"

-#: ../cert.cc:453
+#: cert.cc:453
 #, c-format
 msgid "no branch certs found for revision %s, please provide a branch name"
 msgstr ""
 "aucun certif de branche trouvé pour la révision %s, veuillez donne le nom "
 "d'une branche"

-#: ../cert.cc:457
+#: cert.cc:457
 #, c-format
 msgid ""
 "multiple branch certs found for revision %s, please provide a branch name"
@@ -394,40 +394,40 @@
 "multiples certifs de branche trouvés pour la révision %s, veuillez donne le "
 "nom d'une branche"

-#: ../commands.cc:162
+#: commands.cc:164
 #, c-format
 msgid "command '%s' has multiple ambiguous expansions:\n"
 msgstr "la commande « %s » a plusieurs expansions ambigües : \n"

-#: ../commands.cc:205
+#: commands.cc:207
 msgid "commands:"
 msgstr "commandes :"

-#: ../commands.cc:256
+#: commands.cc:264
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "commande inconnue « %s »\n"

-#: ../commands.cc:303
+#: commands.cc:324
 #, c-format
 msgid "pid file '%s' already exists"
 msgstr "le fichier pid « %s » existe déjà"

-#: ../commands.cc:327 ../commands.cc:1336 ../commands.cc:1406
-#: ../commands.cc:1842 ../commands.cc:2688 ../commands.cc:3309
-#: ../commands.cc:3544 ../commands.cc:3583 ../commands.cc:3928
+#: commands.cc:348 commands.cc:1357 commands.cc:1427 commands.cc:1863
+#: commands.cc:2709 commands.cc:3361 commands.cc:3596 commands.cc:3635
+#: commands.cc:3980
 msgid "informative"
 msgstr "information"

-#: ../commands.cc:327
+#: commands.cc:348
 msgid "command [ARGS...]"
 msgstr "commande [ARGUMENTS...]"

-#: ../commands.cc:327
+#: commands.cc:348
 msgid "display command help"
 msgstr "afficher l'aide de la commande"

-#: ../commands.cc:406
+#: commands.cc:427
 msgid ""
 "Enter a description of this change.\n"
 "Lines beginning with `MT:' are removed automatically.\n"
@@ -435,16 +435,16 @@
 "Saisissez une description pour cette modification.\n"
 "Les lignes débutant par « MT: » sont supprimées automatiquement.\n"

-#: ../commands.cc:413
+#: commands.cc:434
 #, c-format
 msgid "edit of log message failed"
 msgstr "l'édition du message du journal a échouée"

-#: ../commands.cc:422
+#: commands.cc:443
 msgid "note: "
 msgstr "note : "

-#: ../commands.cc:423
+#: commands.cc:444
 #, c-format
 msgid ""
 "branch '%s' has multiple heads\n"
@@ -453,59 +453,59 @@
 "la branche « %s » a plusieurs heads\n"
 "vous devriez peut-être lancer « %s merge »"

-#: ../commands.cc:484 ../commands.cc:760 ../commands.cc:1424
-#: ../commands.cc:1508 ../commands.cc:2738 ../commands.cc:2766
-#: ../commands.cc:2769 ../commands.cc:2905 ../commands.cc:3566
+#: commands.cc:505 commands.cc:781 commands.cc:1445 commands.cc:1529
+#: commands.cc:2759 commands.cc:2787 commands.cc:2790 commands.cc:2926
+#: commands.cc:3618
 #, c-format
 msgid "no such revision '%s'"
 msgstr "aucune révision « %s »"

-#: ../commands.cc:491
+#: commands.cc:512
 #, c-format
 msgid "expanding selection '%s'\n"
 msgstr "expansion de la sélection « %s »\n"

-#: ../commands.cc:499
+#: commands.cc:520
 #, c-format
 msgid "no match for selection '%s'"
 msgstr "aucune correspondance pour la sélection « %s »"

-#: ../commands.cc:505
+#: commands.cc:526
 #, c-format
 msgid "expanded to '%s'\n"
 msgstr "expansion à « %s »\n"

-#: ../commands.cc:522
+#: commands.cc:543
 #, c-format
 msgid "selection '%s' has multiple ambiguous expansions: \n"
 msgstr "la sélection « %s » a plusieurs expansions ambigües : \n"

-#: ../commands.cc:540
+#: commands.cc:561
 #, c-format
 msgid "non-hex digits in id"
 msgstr "chiffre non-héxadécimal dans l'id"

-#: ../commands.cc:549
+#: commands.cc:570
 #, c-format
 msgid "partial id '%s' does not have an expansion"
 msgstr "l'identité partielle « %s » n'a pas d'expansions"

-#: ../commands.cc:552
+#: commands.cc:573
 #, c-format
 msgid "partial id '%s' has multiple ambiguous expansions:\n"
 msgstr "l'identité partielle « %s » a plusieurs expansions ambigües : \n"

-#: ../commands.cc:559
+#: commands.cc:580
 #, c-format
 msgid "expanded partial id '%s' to '%s'\n"
 msgstr "expansion de l'identité partielle « %s » à « %s »\n"

-#: ../commands.cc:586 ../netsync.cc:1727
+#: commands.cc:607 netsync.cc:1749
 #, c-format
 msgid "no public key '%s' found in database"
 msgstr "aucune clef publique « %s » dans la base de données"

-#: ../commands.cc:596
+#: commands.cc:617
 #, c-format
 msgid ""
 "Key   : %s\n"
@@ -518,86 +518,86 @@
 "Nom       : %s\n"
 "Valeur    : %s\n"

-#: ../commands.cc:630
+#: commands.cc:651
 msgid "ok"
 msgstr "0K"

-#: ../commands.cc:633
+#: commands.cc:654
 msgid "bad"
 msgstr "mauvais"

-#: ../commands.cc:636
+#: commands.cc:657
 msgid "unknown"
 msgstr "inconnu"

-#: ../commands.cc:723
+#: commands.cc:744
 #, c-format
 msgid "(*) - only in %s/"
 msgstr "(*) - uniquement dans %s/"

-#: ../commands.cc:746
+#: commands.cc:767
 #, c-format
 msgid "no keys found\n"
 msgstr "aucune clef trouvée\n"

-#: ../commands.cc:748
+#: commands.cc:769
 #, c-format
 msgid "no keys found matching '%s'\n"
 msgstr "aucune clef correspondant à « %s »\n"

-#: ../commands.cc:766
+#: commands.cc:787
 #, c-format
 msgid "revision %s already has children. We cannot kill it."
 msgstr "la révision %s a déjà des descendants. Impossible de la tuer."

-#: ../commands.cc:906 ../commands.cc:930 ../commands.cc:967 ../commands.cc:988
-#: ../commands.cc:1024
+#: commands.cc:927 commands.cc:951 commands.cc:988 commands.cc:1009
+#: commands.cc:1045
 msgid "key and cert"
 msgstr "clef et certif"

-#: ../commands.cc:906 ../commands.cc:930 ../commands.cc:967
+#: commands.cc:927 commands.cc:951 commands.cc:988
 msgid "KEYID"
 msgstr "IDCLEF"

-#: ../commands.cc:906
+#: commands.cc:927
 msgid "generate an RSA key-pair"
 msgstr "générer une paire de clefs RSA"

-#: ../commands.cc:921
+#: commands.cc:942
 #, c-format
 msgid "key '%s' already exists"
 msgstr "la clef « %s » existe déjà"

-#: ../commands.cc:924
+#: commands.cc:945
 #, c-format
 msgid "generating key-pair '%s'"
 msgstr "génératio de la paire de clef « %s »"

-#: ../commands.cc:926
+#: commands.cc:947
 #, c-format
 msgid "storing key-pair '%s' in %s/"
 msgstr "sauvegarde la paire de clefs « %s » dans « %s »"

-#: ../commands.cc:930
+#: commands.cc:951
 msgid "drop a public and private key"
 msgstr "supprimer une clef publique et privée"

-#: ../commands.cc:944
+#: commands.cc:965
 #, c-format
 msgid "dropping public key '%s' from database\n"
 msgstr "suppression de la clef publique « %s » de la base de données\n"

-#: ../commands.cc:954
+#: commands.cc:975
 #, c-format
 msgid "dropping key pair '%s' from keystore\n"
 msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n"

-#: ../commands.cc:961
+#: commands.cc:982
 #, c-format
 msgid "public or private key '%s' does not exist in keystore or database"
 msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données"

-#: ../commands.cc:963
+#: commands.cc:984
 #, c-format
 msgid ""
 "public or private key '%s' does not exist in keystore, and no database was "
@@ -606,33 +606,33 @@
 "la clef publique ou privée « %s » n'existe pas dans l'entrepôt de clefs, et "
 "aucune base de données n'était précisée"

-#: ../commands.cc:968
+#: commands.cc:989
 msgid "change passphrase of a private RSA key"
 msgstr "changer la phrase de passe pour une clef RSA privée"

-#: ../commands.cc:978
+#: commands.cc:999
 #, c-format
 msgid "key '%s' does not exist in the keystore"
 msgstr "la clef « %s » n'existe pas dans l'entrepôt de clefs"

-#: ../commands.cc:985
+#: commands.cc:1006
 #, c-format
 msgid "passphrase changed\n"
 msgstr "la phrase de passe à changée\n"

-#: ../commands.cc:988
+#: commands.cc:1009
 msgid "REVISION CERTNAME [CERTVAL]"
 msgstr "RÉVISION NOM_DE_CERTIF [VALEUR_DE_CERTIF]"

-#: ../commands.cc:989
+#: commands.cc:1010
 msgid "create a cert for a revision"
 msgstr "créer un certif pour une révision"

-#: ../commands.cc:1024
+#: commands.cc:1045
 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
 msgstr "RÉVISION NOM VALEUR SIGNATAIRE1 [SIGNATAIRE2 [...]]"

-#: ../commands.cc:1025
+#: commands.cc:1046
 msgid ""
 "test whether a hypothetical cert would be trusted\n"
 "by current settings"
@@ -640,7 +640,7 @@
 "test s'il est possible d'avoir confiance en un certif hypothétique\n"
 "avec les paramètres actuels"

-#: ../commands.cc:1058
+#: commands.cc:1079
 #, c-format
 msgid ""
 "if a cert on: %s\n"
@@ -655,101 +655,100 @@
 "était signé par : %s\n"
 "il serait : %s\n"

-#: ../commands.cc:1067
+#: commands.cc:1088
 msgid "trusted"
 msgstr "fiable"

-#: ../commands.cc:1067
+#: commands.cc:1088
 msgid "UNtrusted"
 msgstr "NON-fiable"

-#: ../commands.cc:1070 ../commands.cc:1083 ../commands.cc:1096
-#: ../commands.cc:1113 ../commands.cc:1164
+#: commands.cc:1091 commands.cc:1104 commands.cc:1117 commands.cc:1134
+#: commands.cc:1185
 msgid "review"
 msgstr "examination"

-#: ../commands.cc:1070
+#: commands.cc:1091
 msgid "REVISION TAGNAME"
 msgstr "RÉVISION ÉTIQUETTE"

-#: ../commands.cc:1071
+#: commands.cc:1092
 #, fuzzy
 msgid "put a symbolic tag cert on a revision"
 msgstr "mettre une certif-étiquette symbolique sur une révision"

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

-#: ../commands.cc:1084
+#: commands.cc:1105
 msgid "note the results of running a test on a revision"
 msgstr "note le résultat d'un test sur une révision"

-#: ../commands.cc:1096 ../commands.cc:1113
+#: commands.cc:1117 commands.cc:1134
 msgid "REVISION"
 msgstr "RÉVISION"

-#: ../commands.cc:1097
+#: commands.cc:1118
 msgid "approve of a particular revision"
 msgstr "approuver une révision particulière"

-#: ../commands.cc:1108
+#: commands.cc:1129
 #, c-format
 msgid "need --branch argument for approval"
 msgstr "il faut un argument --branch pour approuver"

-#: ../commands.cc:1114
+#: commands.cc:1135
 msgid "disapprove of a particular revision"
 msgstr "désapprouver une révision en particulier"

-#: ../commands.cc:1127
+#: commands.cc:1148
 #, c-format
 msgid "revision '%s' has %d changesets, cannot invert\n"
 msgstr "la révision %s a %d ensembles de changement, je ne peux pas invertir\n"

-#: ../commands.cc:1131
+#: commands.cc:1152
 #, c-format
 msgid "need --branch argument for disapproval"
 msgstr "il faut un argument --branch pour désapprouver"

-#: ../commands.cc:1164
+#: commands.cc:1185
 msgid "REVISION [COMMENT]"
 msgstr "RÉVISION [COMMENTAIRE]"

-#: ../commands.cc:1165
+#: commands.cc:1186
 msgid "comment on a particular revision"
 msgstr "commenter une révision en particulier"

-#: ../commands.cc:1175
+#: commands.cc:1196
 #, c-format
 msgid "edit comment failed"
 msgstr "l'édition du commentaire a échouée"

-#: ../commands.cc:1178
+#: commands.cc:1199
 #, c-format
 msgid "empty comment"
 msgstr "commentaire vide"

-#: ../commands.cc:1191 ../commands.cc:1220 ../commands.cc:1245
-#: ../commands.cc:1270 ../commands.cc:2189 ../commands.cc:2307
-#: ../commands.cc:2841 ../commands.cc:3357
+#: commands.cc:1212 commands.cc:1241 commands.cc:1266 commands.cc:1291
+#: commands.cc:2210 commands.cc:2328 commands.cc:2862 commands.cc:3409
 msgid "workspace"
 msgstr "espace de travail"

-#: ../commands.cc:1191 ../commands.cc:1220 ../commands.cc:1336
-#: ../commands.cc:2307 ../commands.cc:2688 ../commands.cc:3357
+#: commands.cc:1212 commands.cc:1241 commands.cc:1357 commands.cc:2328
+#: commands.cc:2709 commands.cc:3409
 msgid "[PATH]..."
 msgstr "[CHEMIN]..."

-#: ../commands.cc:1192
+#: commands.cc:1213
 msgid "add files to workspace"
 msgstr "ajouter des fichiers à l'espace de travail"

-#: ../commands.cc:1221
+#: commands.cc:1242
 msgid "drop files from workspace"
 msgstr "supprimer des fichiers de l'espace de travail"

-#: ../commands.cc:1246
+#: commands.cc:1267
 msgid ""
 "SRC DEST\n"
 "SRC1 [SRC2 [...]] DEST_DIR"
@@ -757,15 +756,15 @@
 "SOURCE DESTINATION\n"
 "SOURCE1 [SOURCE2 [...]] DOSSIER_DESTINATION"

-#: ../commands.cc:1248
+#: commands.cc:1269
 msgid "rename entries in the workspace"
 msgstr "renommer des entrées dans l'espace de travail"

-#: ../commands.cc:1270
+#: commands.cc:1291
 msgid "NEW_ROOT PUT_OLD"
 msgstr "RACINE_NOUVELLE PLACE_ANCIENNE"

-#: ../commands.cc:1271
+#: commands.cc:1292
 msgid ""
 "rename the root directory\n"
 "after this command, the directory that currently has the name NEW_ROOT\n"
@@ -779,83 +778,78 @@
 "deviendra le dossier appelé PLACE_ANCIENNE.\n"
 "Il est fortement recommandé d'employer --execute."

-#. fload and fmerge are simple commands for debugging the line
-#. merger.
-#: ../commands.cc:1290 ../commands.cc:1303 ../commands.cc:1383
-#: ../commands.cc:3464 ../commands.cc:3909
+#: commands.cc:1311 commands.cc:1324 commands.cc:1404 commands.cc:3516
+#: commands.cc:3961
 msgid "debug"
 msgstr "débogue"

-#: ../commands.cc:1290
+#: commands.cc:1311
 msgid "load file contents into db"
 msgstr "charger le contenu du fichier dans la base de données"

-#: ../commands.cc:1303
+#: commands.cc:1324
 msgid "<parent> <left> <right>"
 msgstr "<parent> <gauche> <droite>"

-#: ../commands.cc:1304
+#: commands.cc:1325
 msgid "merge 3 files and output result"
 msgstr "fusionne 3 fichiers et affiche le résultat"

-#: ../commands.cc:1314
+#: commands.cc:1335
 #, c-format
 msgid "ancestor file id does not exist"
 msgstr "l'id du fichier de l'ancêtre n'existe pas"

-#: ../commands.cc:1317
+#: commands.cc:1338
 #, c-format
 msgid "left file id does not exist"
 msgstr "l'id du fichier gauche n'existe pas"

-#: ../commands.cc:1320
+#: commands.cc:1341
 #, c-format
 msgid "right file id does not exist"
 msgstr "l'id du fichier droit n'existe pas"

-#: ../commands.cc:1331
+#: commands.cc:1352
 #, c-format
 msgid "merge failed"
 msgstr "la fusion a échouée"

-#: ../commands.cc:1336
+#: commands.cc:1357
 msgid "show status of workspace"
 msgstr "afficher l'état de l'espace de travail"

-#: ../commands.cc:1383
+#: commands.cc:1404
 msgid "[PATH]"
 msgstr "[CHEMIN]"

-#: ../commands.cc:1384
+#: commands.cc:1405
 msgid "calculate identity of PATH or stdin"
 msgstr "calculer l'identité du CHEMIN ou de l'entrée standard"

-#: ../commands.cc:1407
+#: commands.cc:1428
 msgid "FILENAME"
 msgstr "FICHIER"

-#: ../commands.cc:1408
+#: commands.cc:1429
 msgid "write file from database to stdout"
 msgstr "écrire un fichier de la base de donnée sur la sortie standard"

-#: ../commands.cc:1436 ../commands.cc:1438 ../commands.cc:3575
+#: commands.cc:1457 commands.cc:1459 commands.cc:3627
 #, c-format
 msgid "no file '%s' found in revision '%s'\n"
 msgstr "aucun fichier « %s » dans la révision « %s »\n"

-#. should merge support --message, --message-file?  It seems somewhat weird,
-#. since a single 'merge' command may perform arbitrarily many actual merges.
-#: ../commands.cc:1450 ../commands.cc:1579 ../commands.cc:3042
-#: ../commands.cc:3095 ../commands.cc:3106 ../commands.cc:3256
-#: ../commands.cc:3264 ../commands.cc:3818
+#: commands.cc:1471 commands.cc:1600 commands.cc:3094 commands.cc:3147
+#: commands.cc:3158 commands.cc:3308 commands.cc:3316 commands.cc:3870
 msgid "tree"
 msgstr "arborescence"

-#: ../commands.cc:1450
+#: commands.cc:1471
 msgid "[DIRECTORY]\n"
 msgstr "[DOSSIER]\n"

-#: ../commands.cc:1451
+#: commands.cc:1472
 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"
@@ -869,79 +863,76 @@
 "Si aucun nom de dossier n'est fourni, le nom de la branche sera utilisé\n"
 "comme nom de dossier"

-#. no checkout dir specified, use branch name for dir
-#. use branch head revision
-#: ../commands.cc:1470 ../commands.cc:1489
+#: commands.cc:1491 commands.cc:1510
 #, c-format
 msgid "need --branch argument for branch-based checkout"
 msgstr "il faut un argument --branch pour récupérer basé sur une branche"

-#: ../commands.cc:1483
+#: commands.cc:1504
 #, c-format
 msgid "checkout directory '%s' already exists"
 msgstr "le fichier « %s » existe déjà"

-#: ../commands.cc:1492
+#: commands.cc:1513
 #, fuzzy, c-format
 msgid "branch '%s' is empty"
 msgstr "la branche « %s » est vide\n"

-#: ../commands.cc:1495
+#: commands.cc:1516
 #, fuzzy, c-format
 msgid "branch %s has multiple heads:"
 msgstr "la branche %s a plusieurs entrées"

-#: ../commands.cc:1498
+#: commands.cc:1519
 #, fuzzy, c-format
 msgid "choose one with '%s checkout -r<id>'"
 msgstr "choisissez en un avec « %s update -r<id> »\n"

-#: ../commands.cc:1499
+#: commands.cc:1520
 #, c-format
 msgid "branch %s has multiple heads"
 msgstr "la branche %s a plusieurs entrées"

-#: ../commands.cc:1526
+#: commands.cc:1547
 #, c-format
 msgid "revision %s is not a member of branch %s\n"
 msgstr "la révision %s n'est pas membre de la branche %s\n"

-#: ../commands.cc:1560
+#: commands.cc:1581
 #, c-format
 msgid "no file %s found in database for %s"
 msgstr "aucun fichier « %s » trouvé dans la base de données pour %s"

-#: ../commands.cc:1579
+#: commands.cc:1600
 msgid "show unmerged head revisions of branch"
 msgstr "affiche les entrées non fusionné de la branche"

-#: ../commands.cc:1587 ../commands.cc:3051
+#: commands.cc:1608 commands.cc:3103
 #, c-format
 msgid "please specify a branch, with --branch=BRANCH"
 msgstr "veuillez préciser une branche avec --branch=BRANCHE"

-#: ../commands.cc:1592 ../commands.cc:3055 ../commands.cc:3144
-#: ../commands.cc:3147
+#: commands.cc:1613 commands.cc:3107 commands.cc:3196 commands.cc:3199
 #, c-format
 msgid "branch '%s' is empty\n"
 msgstr "la branche « %s » est vide\n"

-#: ../commands.cc:1594
+#: commands.cc:1615
 #, c-format
 msgid "branch '%s' is currently merged:\n"
 msgstr "la branche « %s » est actuellement fusionnée :\n"

-#: ../commands.cc:1596
+#: commands.cc:1617
 #, c-format
 msgid "branch '%s' is currently unmerged:\n"
 msgstr "la branche « %s » n'est actuellement pas fusionnée :\n"

-#: ../commands.cc:1635
+#: commands.cc:1656
 #, c-format
 msgid "no epoch for branch %s\n"
 msgstr "la branche %s n'a pas d'époque\n"

-#: ../commands.cc:1843
+#: commands.cc:1864
 msgid ""
 "certs ID\n"
 "keys [PATTERN]\n"
@@ -967,7 +958,7 @@
 "missing\n"
 "changed"

-#: ../commands.cc:1854
+#: commands.cc:1875
 msgid ""
 "show database objects, or the current workspace manifest, or known,\n"
 "unknown, intentionally ignored, missing, or changed state files"
@@ -976,132 +967,131 @@
 "travail actuel, ou des fichiers connus, inconnus, intentionnellement\n"
 "ignorés, manquants ou changés"

-#: ../commands.cc:1892 ../commands.cc:1920 ../commands.cc:1938
+#: commands.cc:1913 commands.cc:1941 commands.cc:1959
 msgid "packet i/o"
 msgstr "e/s de paquets"

-#: ../commands.cc:1892 ../commands.cc:1920
+#: commands.cc:1913 commands.cc:1941
 msgid "ID"
 msgstr "ID"

-#: ../commands.cc:1892
+#: commands.cc:1913
 msgid "write public key packet to stdout"
 msgstr "écrire un pacquet pour un clef publique sur la sortie standard"

-#: ../commands.cc:1914
+#: commands.cc:1935
 #, c-format
 msgid "public key '%s' does not exist"
 msgstr "la clef publique « %s » n'existe pas"

-#: ../commands.cc:1920
+#: commands.cc:1941
 msgid "write private key packet to stdout"
 msgstr "écrire un pacquet pour un clef privée sur la sortie standard"

-#: ../commands.cc:1928
+#: commands.cc:1949
 #, c-format
 msgid "public and private key '%s' do not exist in keystore"
 msgstr ""
 "la clef publique ou privée « %s » n'existe pas dans l'entrepôt de clefs"

-#: ../commands.cc:1939
+#: commands.cc:1960
 msgid "read packets from files or stdin"
 msgstr "lecture des paquets depuis des fichiers ou l'entrée standard"

-#: ../commands.cc:1947
+#: commands.cc:1968
 #, c-format
 msgid "no packets found on stdin"
 msgstr "aucun paquet trouvé sur l'entrée standard"

-#: ../commands.cc:1958
+#: commands.cc:1979
 #, c-format
 msgid "no packets found in given file"
 msgid_plural "no packets found in given files"
 msgstr[0] "aucun paquet trouvé dans le fichier spécifié"
 msgstr[1] "aucun paquet trouvé dans les fichiers spécifiés"

-#: ../commands.cc:1962
+#: commands.cc:1983
 #, c-format
 msgid "read %d packet"
 msgid_plural "read %d packets"
 msgstr[0] "lu %d paquet"
 msgstr[1] "lu %d paquets"

-#: ../commands.cc:1991
+#: commands.cc:2012
 #, c-format
 msgid "setting default server to %s\n"
 msgstr "mettant l'adresse par défaut du serveur à %s\n"

-#: ../commands.cc:1997
+#: commands.cc:2018
 #, c-format
 msgid "no hostname given"
 msgstr "aucun nom d'hôte fourni"

-#: ../commands.cc:1999
+#: commands.cc:2020
 #, c-format
 msgid "no server given and no default server set"
 msgstr "aucun serveur donné et aucun serveur établi comme défaut"

-#: ../commands.cc:2017
+#: commands.cc:2038
 #, c-format
 msgid "setting default branch include pattern to '%s'\n"
 msgstr "établi le motif de branche à inclure par défaut à « %s »\n"

-#: ../commands.cc:2023
+#: commands.cc:2044
 #, c-format
 msgid "setting default branch exclude pattern to '%s'\n"
 msgstr "établi le motif de branche à exclure par défaut à « %s »\n"

-#: ../commands.cc:2029
+#: commands.cc:2050
 #, c-format
 msgid "no branch pattern given"
 msgstr "aucun motif de branche fourni"

-#: ../commands.cc:2031
+#: commands.cc:2052
 #, c-format
 msgid "no branch pattern given and no default pattern set"
 msgstr "aucun motif de branche donné et aucun motif établi comme défaut"

-#: ../commands.cc:2047 ../commands.cc:2062 ../commands.cc:2076
-#: ../commands.cc:2091
+#: commands.cc:2068 commands.cc:2083 commands.cc:2097 commands.cc:2112
 msgid "network"
 msgstr "réseau"

-#: ../commands.cc:2047 ../commands.cc:2062 ../commands.cc:2076
+#: commands.cc:2068 commands.cc:2083 commands.cc:2097
 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
 msgstr "[ADRESSE[:PORT] [MOTIF]]"

-#: ../commands.cc:2048
+#: commands.cc:2069
 msgid "push branches matching PATTERN to netsync server at ADDRESS"
 msgstr ""
 "envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE"

-#: ../commands.cc:2063
+#: commands.cc:2084
 msgid "pull branches matching PATTERN from netsync server at ADDRESS"
 msgstr ""
 "récupère les branches correspondant au MOTIF du serveur netsync à ADRESSE"

-#: ../commands.cc:2070
+#: commands.cc:2091
 #, c-format
 msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
 msgstr ""
 "récupération anonyme; utilisez -kNOMCLEF si vous avez besoin d'une "
 "authentification\n"

-#: ../commands.cc:2077
+#: commands.cc:2098
 msgid "sync branches matching PATTERN with netsync server at ADDRESS"
 msgstr ""
 "synchronise les branches correspondant au MOTIF au serveur netsync à ADRESSE"

-#: ../commands.cc:2091
+#: commands.cc:2112
 msgid "PATTERN ..."
 msgstr "CHEMIN ..."

-#: ../commands.cc:2092
+#: commands.cc:2113
 msgid "serve the branches specified by PATTERNs to connecting clients"
 msgstr ""
 "servir les branches spécifiées par les MOTIFs aux clients qui se connectent"

-#: ../commands.cc:2105
+#: commands.cc:2126
 #, c-format
 msgid ""
 "need permission to store persistent passphrase (see hook persist_phrase_ok())"
@@ -1109,11 +1099,11 @@
 "il faut vôtre permission pour garder la phrase de passe de façon persistante "
 "(voyez la procédure automatique persiste_phrase_ok())"

-#: ../commands.cc:2117
+#: commands.cc:2138
 msgid "database"
 msgstr "base de données"

-#: ../commands.cc:2118
+#: commands.cc:2139
 msgid ""
 "init\n"
 "info\n"
@@ -1145,16 +1135,16 @@
 "rosterify\n"
 "set_epoch BRANCHE ÉPOQUE\n"

-#: ../commands.cc:2132
+#: commands.cc:2153
 msgid "manipulate database state"
 msgstr "manipule l'état de la base de données"

-#: ../commands.cc:2179
+#: commands.cc:2200
 #, c-format
 msgid "The epoch must be %s characters"
-msgstr ""
+msgstr "l'époque doit être de %s caractères"

-#: ../commands.cc:2189
+#: commands.cc:2210
 msgid ""
 "set PATH ATTR VALUE\n"
 "get PATH [ATTR]\n"
@@ -1164,40 +1154,40 @@
 "get CHEMIN [ATTR]\n"
 "drop CHEMIN [ATTR]"

-#: ../commands.cc:2190
+#: commands.cc:2211
 msgid "set, get or drop file attributes"
 msgstr "établis, obtiens ou supprime des attributs de fichiers"

-#: ../commands.cc:2206
+#: commands.cc:2227
 #, c-format
 msgid "Unknown path '%s'"
 msgstr "Chemin inconnu « %s »"

-#: ../commands.cc:2235
+#: commands.cc:2256
 #, c-format
 msgid "Path '%s' does not have attribute '%s'\n"
 msgstr "Le chemin « %s » n'a pas d'attribut « %s »\n"

-#: ../commands.cc:2289
+#: commands.cc:2310
 #, c-format
 msgid "--message and --message-file are mutually exclusive"
 msgstr "--message et --message-file sont mutuellement exclusifs"

-#: ../commands.cc:2308
+#: commands.cc:2329
 msgid "commit workspace to database"
 msgstr "confie un espace de travail à la base de données"

-#: ../commands.cc:2326
+#: commands.cc:2347
 #, c-format
 msgid "no changes to commit\n"
 msgstr "aucun changement à confier\n"

-#: ../commands.cc:2340
+#: commands.cc:2361
 #, fuzzy, c-format
 msgid "beginning commit on branch '%s'\n"
 msgstr "commence à confier sur la branche « %s »\n"

-#: ../commands.cc:2349
+#: commands.cc:2370
 #, c-format
 msgid ""
 "MT/log is non-empty and log message was specified on command line\n"
@@ -1209,32 +1199,32 @@
 "veuillez déplacé ou supprimer MT/log,\n"
 "ou supprimer --message/--message-file de la linge de commande"

-#: ../commands.cc:2361
+#: commands.cc:2382
 #, fuzzy, c-format
 msgid "empty log message; commit canceled"
 msgstr "message du journal vide; confidence arrêtée"

-#: ../commands.cc:2380
+#: commands.cc:2401
 #, c-format
 msgid "log message rejected: %s\n"
 msgstr "entrée du journal rejetée: %s\n"

-#: ../commands.cc:2388
+#: commands.cc:2409
 #, c-format
 msgid "revision %s already in database\n"
 msgstr "la révision %s est déjà dans la base de données\n"

-#: ../commands.cc:2426 ../commands.cc:2443 ../commands.cc:2462
+#: commands.cc:2447 commands.cc:2464 commands.cc:2483
 #, c-format
 msgid "file '%s' modified during commit, aborting"
 msgstr "le fichier « %s » a été modifié pendant le commit, interruption"

-#: ../commands.cc:2488
+#: commands.cc:2509
 #, fuzzy, c-format
 msgid "committed revision %s\n"
 msgstr "révision %s confié\n"

-#: ../commands.cc:2494
+#: commands.cc:2515
 #, c-format
 msgid ""
 "note: this revision creates divergence\n"
@@ -1243,7 +1233,7 @@
 "note: cette révision a créé une divergence\n"
 "note: peut-être (ou peut-être pas) voullez-vous exécuter « %s merge »"

-#: ../commands.cc:2689
+#: commands.cc:2710
 msgid ""
 "show current diffs on stdout.\n"
 "If one revision is given, the diff between the workspace and\n"
@@ -1256,7 +1246,7 @@
 "différence entre eux est affichée.  Si aucun format n'est précisé,\n"
 "le format « unified » est employé par défaut."

-#: ../commands.cc:2705
+#: commands.cc:2726
 #, c-format
 msgid ""
 "--diff-args requires --external\n"
@@ -1265,16 +1255,16 @@
 "--diff-args requiet --external\n"
 "essayez d'ajouter --external ou de retirer --diff-args ?"

-#: ../commands.cc:2747
+#: commands.cc:2768
 #, c-format
 msgid "current revision has no ancestor"
 msgstr "la révision actuelle n'existe pas"

-#: ../commands.cc:2810
+#: commands.cc:2831
 msgid "no changes"
 msgstr "aucun changement"

-#: ../commands.cc:2842
+#: commands.cc:2863
 msgid ""
 "update workspace.\n"
 "This command modifies your workspace to be based off of a\n"
@@ -1289,13 +1279,13 @@
 "cette révision.  Sinon, met à jour basé sur la révision d'entré de\n"
 "la branche actuelle."

-#: ../commands.cc:2880
+#: commands.cc:2901
 #, c-format
 msgid "this workspace is a new project; cannot update"
 msgstr ""
 "cet espace de travail est un nouveau projet, impossible de mettre à jour"

-#: ../commands.cc:2887
+#: commands.cc:2908
 #, c-format
 msgid ""
 "your request matches no descendents of the current revision\n"
@@ -1306,195 +1296,210 @@
 "actuelle.  Elle ne correspond même pas à la révision actuelle.\n"
 "Peut-être voulez-vous employer --revision=<révision d'une autre branche>?"

-#: ../commands.cc:2892
+#: commands.cc:2913
 #, fuzzy, c-format
 msgid "multiple update candidates:"
 msgstr "plusieurs candidats pour la mise à jour :\n"

-#: ../commands.cc:2896
+#: commands.cc:2917
 #, fuzzy, c-format
 msgid "choose one with '%s update -r<id>'"
 msgstr "choisissez en un avec « %s update -r<id> »\n"

-#: ../commands.cc:2897
+#: commands.cc:2918
 #, fuzzy, c-format
 msgid "multiple update candidates remain after selection"
 msgstr "il reste plusieurs candidats possible après la selection"

-#: ../commands.cc:2912
+#: commands.cc:2933
 #, c-format
 msgid "already up to date at %s\n"
 msgstr "déjà à jour en %s\n"

-#: ../commands.cc:2920
+#: commands.cc:2941
 #, c-format
 msgid "selected update target %s\n"
 msgstr "sélection de la cible %s pour la mise à jour\n"

-#: ../commands.cc:2932
-#, c-format
+#: commands.cc:2971
+#, fuzzy, c-format
 msgid ""
-"revision %s is not a member of branch %s\n"
-"try again with explicit --branch\n"
+"revision %s is a member of multiple branches:\n"
+"%s\n"
+"\n"
+"try again with explicit --branch"
 msgstr ""
 "la révision %s n'est pas membre de la branche %s\n"
 "éssayez de nouveau avec un --branch explicit\n"

-#: ../commands.cc:3032
+#: commands.cc:2977
+#, fuzzy, c-format
+msgid ""
+"revision %s is a member of\n"
+"%s, updating workspace branch"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: commands.cc:2983
+#, fuzzy, c-format
+msgid ""
+"revision %s is a member of no branches,\n"
+"using branch %s for workspace"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: commands.cc:3084
 #, c-format
 msgid "updated to base revision %s\n"
 msgstr "mise à jour vers la révision de base %s\n"

-#: ../commands.cc:3042
+#: commands.cc:3094
 msgid "merge unmerged heads of branch"
 msgstr "fusionne les entrées de la branche non fusionnées"

-#: ../commands.cc:3058
+#: commands.cc:3110
 #, fuzzy, c-format
 msgid "branch '%s' is already merged\n"
 msgstr "la branche « %s » est fusionnée\n"

-#: ../commands.cc:3066
+#: commands.cc:3118
 #, c-format
 msgid "starting with revision 1 / %d\n"
 msgstr "en commencent avec la révision 1 / %d\n"

-#: ../commands.cc:3070
+#: commands.cc:3122
 #, c-format
 msgid "merging with revision %d / %d\n"
 msgstr "fusionnent avec la révision %d / %d\n"

-#. Somewhat redundant, but consistent with output of plain "merge" command.
-#: ../commands.cc:3071 ../commands.cc:3072 ../commands.cc:3154
-#: ../commands.cc:3287 ../commands.cc:3288
+#: commands.cc:3123 commands.cc:3124 commands.cc:3206 commands.cc:3339
+#: commands.cc:3340
 #, c-format
 msgid "[source] %s\n"
 msgstr "[source] %s\n"

-#: ../commands.cc:3089 ../commands.cc:3252 ../commands.cc:3306
+#: commands.cc:3141 commands.cc:3304 commands.cc:3358
 #, c-format
 msgid "[merged] %s\n"
 msgstr "[fusionné] %s\n"

-#: ../commands.cc:3092
+#: commands.cc:3144
 #, c-format
 msgid "note: your workspaces have not been updated\n"
 msgstr "note: vos espaces de travail ne sont pas à jour\n"

-#: ../commands.cc:3095
+#: commands.cc:3147
 msgid "SOURCE-BRANCH DEST-BRANCH"
 msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION"

-#: ../commands.cc:3096
+#: commands.cc:3148
 msgid "merge from one branch to another asymmetrically"
 msgstr "fusionnez d'une branche à une autre asymétriquement"

-#: ../commands.cc:3106
+#: commands.cc:3158
 msgid "SOURCE-BRANCH DEST-BRANCH DIR"
 msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION DOSSIER"

-#: ../commands.cc:3107
+#: commands.cc:3159
 msgid "merge one branch into a subdirectory in another branch"
 msgstr "fusionnez une branche dans un sous-dossier d'une autre branche"

-#: ../commands.cc:3145 ../commands.cc:3148
+#: commands.cc:3197 commands.cc:3200
 #, c-format
 msgid "branch '%s' is not merged\n"
 msgstr "la branche « %s » n'est pas fusionnée\n"

-#: ../commands.cc:3153
+#: commands.cc:3205
 #, c-format
 msgid "propagating %s -> %s\n"
 msgstr "propage %s -> %s\n"

-#: ../commands.cc:3155
+#: commands.cc:3207
 #, c-format
 msgid "[target] %s\n"
 msgstr "[cible] %s\n"

-#: ../commands.cc:3160
+#: commands.cc:3212
 #, c-format
 msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
 msgstr "la branche « %s » est à jour par rapport à la branche « %s »\n"

-#: ../commands.cc:3162
+#: commands.cc:3214
 #, c-format
 msgid "no action taken\n"
 msgstr "rien n'est fait\n"

-#: ../commands.cc:3166
+#: commands.cc:3218
 #, c-format
 msgid "no merge necessary; putting %s in branch '%s'\n"
 msgstr "fusion pas nécessaire; met %s dans la branch « %s »\n"

-#: ../commands.cc:3202
+#: commands.cc:3254
 #, c-format
 msgid "Path %s not found in destination tree."
 msgstr "Chemin %s pas trouvé dans l'arborescence de destination"

-#: ../commands.cc:3256
+#: commands.cc:3308
 msgid "refresh the inodeprint cache"
 msgstr "rafraîchir le cache d'inodeprint"

-#: ../commands.cc:3265
+#: commands.cc:3317
 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
 msgstr "RÉVISION-GAUCHE RÉVISION-DROITE BRANCHE-DESTINATION"

-#: ../commands.cc:3266
+#: commands.cc:3318
 msgid "merge two explicitly given revisions, placing result in given branch"
 msgstr ""
 "fusionne deux révisions données explicitement et met le résultat dans la "
 "branche donnée"

-#: ../commands.cc:3280
+#: commands.cc:3332
 #, c-format
 msgid "%s and %s are the same revision, aborting"
 msgstr "%s et %s sont la même révision, j'abandonne"

-#: ../commands.cc:3282 ../commands.cc:3284
+#: commands.cc:3334 commands.cc:3336
 #, c-format
 msgid "%s is already an ancestor of %s"
 msgstr "%s est déjà un ancêtre de %s"

-#: ../commands.cc:3309
+#: commands.cc:3361
 msgid "(revision|file|key) PARTIAL-ID"
 msgstr "(revision|file|key) ID-PARTIELLE"

-#: ../commands.cc:3310
+#: commands.cc:3362
 msgid "complete partial id"
 msgstr "remplis une identité partielle"

-#: ../commands.cc:3319
+#: commands.cc:3371
 #, c-format
 msgid "non-hex digits in partial id"
 msgstr "chiffres non-héxadécimaux dans l'id partielle"

-#: ../commands.cc:3358
+#: commands.cc:3410
 msgid "revert file(s), dir(s) or entire workspace (\".\")"
 msgstr ""
 "retourne les fichiers, dossiers ou l'espace de travail en entier (\".\") à "
 "la révision de base"

-#: ../commands.cc:3435
+#: commands.cc:3487
 #, c-format
 msgid "reverting %s"
 msgstr "retourne %s à la révision de base"

-#: ../commands.cc:3439
+#: commands.cc:3491
 #, c-format
 msgid "no file version %s found in database for %s"
 msgstr "aucune version de fichier « %s » trouvé dans la base de données %s"

-#: ../commands.cc:3452
+#: commands.cc:3504
 #, c-format
 msgid "recreating %s/"
 msgstr "re-crée %s/"

-#: ../commands.cc:3464
+#: commands.cc:3516
 msgid "RCSFILE..."
 msgstr "FICHIER_RCS..."

-#: ../commands.cc:3465
+#: commands.cc:3517
 msgid ""
 "parse versions in RCS files\n"
 "this command doesn't reconstruct or import revisions.you probably want "
@@ -1504,36 +1509,36 @@
 "cette command ne reconstruit ou n'importe pas des révisions.  Vous voulez\n"
 "probablement cvs_import"

-#: ../commands.cc:3481
+#: commands.cc:3533
 msgid "rcs"
 msgstr "rcs"

-#: ../commands.cc:3481
+#: commands.cc:3533
 msgid "CVSROOT"
 msgstr "CVSROOT"

-#: ../commands.cc:3481
+#: commands.cc:3533
 msgid "import all versions in CVS repository"
 msgstr "importer toutes les versions d'un dépôt CVS"

-#: ../commands.cc:3544
+#: commands.cc:3596
 msgid "PATH"
 msgstr "CHEMIN"

-#: ../commands.cc:3545
+#: commands.cc:3597
 msgid "print annotated copy of the file from REVISION"
 msgstr "affiche une copie annotée du fichier venant de RÉVISION"

-#: ../commands.cc:3565
+#: commands.cc:3617
 #, c-format
 msgid "no revision for file '%s' in database"
 msgstr "aucune révision pour le fichier « %s » dans la base de données"

-#: ../commands.cc:3583
+#: commands.cc:3635
 msgid "[FILE] ..."
 msgstr "[FICHIER] ..."

-#: ../commands.cc:3584
+#: commands.cc:3636
 msgid ""
 "print history in reverse order (filtering by 'FILE'). If one or more\n"
 "revisions are given, use them as a starting point."
@@ -1541,36 +1546,36 @@
 "Affiche l'histoire en sens inverse (filtré avec « FILE »).  Si une\n"
 "révision ou plus sont données, emploie-les comme débuts."

-#: ../commands.cc:3632
+#: commands.cc:3684
 #, c-format
 msgid "Unknown file '%s' for log command"
 msgstr "Fichier « %s » inconnu donnée à la commande log"

-#: ../commands.cc:3650
+#: commands.cc:3702
 #, c-format
 msgid "only one of --last/--next allowed"
 msgstr "seul un de --last et --next est permit"

-#: ../commands.cc:3818
+#: commands.cc:3870
 msgid "[DIRECTORY]"
 msgstr "[DOSSIER]"

-#: ../commands.cc:3818
+#: commands.cc:3870
 msgid "setup a new workspace directory, default to current"
 msgstr ""
 "prépare un dossier pour une nouvelle copie de travail, emploie le dossier "
 "actuel comme défaut"

-#: ../commands.cc:3824
+#: commands.cc:3876
 #, c-format
 msgid "need --branch argument for setup"
 msgstr "setup a besoin d'un argument pour --branch"

-#: ../commands.cc:3838
+#: commands.cc:3890
 msgid "automation"
 msgstr "automatisation"

-#: ../commands.cc:3839
+#: commands.cc:3891
 #, fuzzy
 msgid ""
 "interface_version\n"
@@ -1619,161 +1624,159 @@
 "get_revision [ID_RÉV]\n"
 "keys\n"

-#: ../commands.cc:3863
+#: commands.cc:3915
 msgid "automation interface"
 msgstr "interface d'automatisation"

-#: ../commands.cc:3877 ../commands.cc:3893
+#: commands.cc:3929 commands.cc:3945
 msgid "vars"
 msgstr "variables"

-#: ../commands.cc:3877
+#: commands.cc:3929
 msgid "DOMAIN NAME VALUE"
 msgstr "DOMAINE NOM VALEUR"

-#: ../commands.cc:3878
+#: commands.cc:3930
 msgid "set the database variable NAME to VALUE, in domain DOMAIN"
 msgstr ""
 "établir la variable NOM de la base de données dans le domaine DOMAINE avec "
 "la valeur VALEUR"

-#: ../commands.cc:3893
+#: commands.cc:3945
 msgid "DOMAIN NAME"
 msgstr "DOMAINE NOM VALEUR"

-#: ../commands.cc:3894
+#: commands.cc:3946
 msgid "remove the database variable NAME in domain DOMAIN"
 msgstr ""
 "supprimer la variable NOM de la base de données dans le domaine DOMAINE"

-#: ../commands.cc:3905
+#: commands.cc:3957
 #, c-format
 msgid "no var with name %s in domain %s"
 msgstr "aucune variable nommée %s dans le domaine %s"

-#: ../commands.cc:3909
+#: commands.cc:3961
 msgid "REVID"
 msgstr "ID_RÉVISION"

-#: ../commands.cc:3910
+#: commands.cc:3962
 msgid "dump the roster associated with the given REVID"
 msgstr "décharge la list associée avec l'ID_RÉV donnée"

-#: ../commands.cc:3928
+#: commands.cc:3980
 msgid "REV REV"
 msgstr "RÉV RÉV"

-#: ../commands.cc:3928
+#: commands.cc:3980
 msgid ""
 "Show what conflicts would need to be resolved to merge the given revisions."
 msgstr ""
 "Montre quels conflits auraient besoin d'être résolus l'ors d'une fusion des "
 "révisions données."

-#: ../commands.cc:3937 ../commands.cc:3939
+#: commands.cc:3989 commands.cc:3991
 #, c-format
 msgid "%s in an ancestor of %s; no merge is needed."
 msgstr "%s est un ancêtre de %s; aucune fusion est nécessaire"

-#: ../commands.cc:3953
+#: commands.cc:4005
 #, c-format
 msgid "There are %s node_name_conflicts."
 msgstr "Il y a %s node_name_conflicts."

-#: ../commands.cc:3954
+#: commands.cc:4006
 #, c-format
 msgid "There are %s file_content_conflicts."
 msgstr "Il y a %s file_content_conflicts."

-#: ../commands.cc:3955
+#: commands.cc:4007
 #, c-format
 msgid "There are %s node_attr_conflicts."
 msgstr "Il y a %s node_attr_conflicts."

-#: ../commands.cc:3956
+#: commands.cc:4008
 #, c-format
 msgid "There are %s orphaned_node_conflicts."
 msgstr "Il y a %s orphaned_node_conflicts."

-#: ../commands.cc:3957
+#: commands.cc:4009
 #, c-format
 msgid "There are %s rename_target_conflicts."
 msgstr "Il y a %s rename_target_conflicts."

-#: ../commands.cc:3958
+#: commands.cc:4010
 #, c-format
 msgid "There are %s directory_loop_conflicts."
 msgstr "Il y a %s directory_loop_conflicts."

-#: ../database_check.cc:125
+#: database_check.cc:125
 msgid "files"
 msgstr "fichiers"

-#: ../database_check.cc:154
+#: database_check.cc:154
 msgid "rosters"
 msgstr "listes"

-#: ../database_check.cc:221
+#: database_check.cc:221
 msgid "markings"
 msgstr "marquages"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../database_check.cc:319 ../database_check.cc:507 ../netsync.cc:2760
-#: ../rcs_import.cc:1226
+#: database_check.cc:319 database_check.cc:507 netsync.cc:2782
+#: rcs_import.cc:1226
 msgid "revisions"
 msgstr "révisions"

-#: ../database_check.cc:418
+#: database_check.cc:418
 msgid "ancestry"
 msgstr "ancêtre"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../database_check.cc:451 ../netsync.cc:2764
+#: database_check.cc:451 netsync.cc:2786
 msgid "keys"
 msgstr "clefs"

-#: ../database_check.cc:477
+#: database_check.cc:477
 msgid "certs"
 msgstr "certifs"

-#: ../database_check.cc:543
+#: database_check.cc:543
 #, c-format
 msgid "file %s missing (%d manifest references)\n"
 msgstr "fichier %s manquant (%d références du manifeste)\n"

-#: ../database_check.cc:550
+#: database_check.cc:550
 #, c-format
 msgid "file %s unreferenced\n"
 msgstr "fichier %s non-référencé\n"

-#: ../database_check.cc:571
+#: database_check.cc:571
 #, c-format
 msgid "roster %s unreferenced\n"
 msgstr "liste %s non-référencé\n"

-#: ../database_check.cc:577
+#: database_check.cc:577
 #, c-format
 msgid "roster %s incomplete (%d missing files)\n"
 msgstr "liste %s incomplet (%d fichiers manquants)\n"

-#: ../database_check.cc:584
+#: database_check.cc:584
 #, c-format
 msgid "roster %s incomplete (%d missing revisions)\n"
 msgstr "liste %s incomplet (%d révisions manquantes)\n"

-#: ../database_check.cc:591
+#: database_check.cc:591
 #, c-format
 msgid "roster %s is not parseable (perhaps with unnormalized paths?)\n"
 msgstr ""
 "liste %s n'est pas analysable (peut-être y-a-t'il des chemins non "
 "normalisé?)\n"

-#: ../database_check.cc:598
+#: database_check.cc:598
 #, c-format
 msgid "roster %s is not in normalized form\n"
 msgstr "la liste %s n'est pas en forme normalisé\n"

-#: ../database_check.cc:623
+#: database_check.cc:623
 #, c-format
 msgid ""
 "revision %s missing (%d revision references; %d cert references; %d parent "
@@ -1782,38 +1785,38 @@
 "révision %s manquante (%d révisions référencées; %d certifs référencés; %d "
 "parents référencés; %d enfants référencés; %d listes référencées)\n"

-#: ../database_check.cc:631
+#: database_check.cc:631
 #, c-format
 msgid "revision %s incomplete (%d missing manifests)\n"
 msgstr "révision %s incomplète (%d manifestes manquants)\n"

-#: ../database_check.cc:638
+#: database_check.cc:638
 #, c-format
 msgid "revision %s incomplete (%d missing revisions)\n"
 msgstr "révision %s incomplète (%d révisions manquantes)\n"

-#: ../database_check.cc:645
+#: database_check.cc:645
 #, c-format
 msgid "revision %s incomplete (missing roster link)\n"
 msgstr "révision %s incomplète (le lien à la liste manque)\n"

-#: ../database_check.cc:651
+#: database_check.cc:651
 #, c-format
 msgid "revision %s incomplete (missing roster)\n"
 msgstr "révision %s incomplète (la liste manque)\n"

-#: ../database_check.cc:657
+#: database_check.cc:657
 #, c-format
 msgid "revision %s mismatched roster and manifest\n"
 msgstr ""
 "la liste et la manifeste de la révision %s ne s'entre-correspondent pas\n"

-#: ../database_check.cc:663
+#: database_check.cc:663
 #, c-format
 msgid "revision %s incomplete (incomplete roster)\n"
 msgstr "révision %s incomplète (liste incomplète)\n"

-#: ../database_check.cc:669
+#: database_check.cc:669
 #, c-format
 msgid ""
 "revision %s mismatched parents (%d ancestry parents; %d revision refs)\n"
@@ -1821,189 +1824,189 @@
 "révision %s a des parents non-correspondents (%d parents; %d révision "
 "référencées)\n"

-#: ../database_check.cc:678
+#: database_check.cc:678
 #, c-format
 msgid "revision %s mismatched children (%d ancestry children; %d parents)\n"
 msgstr ""
 "révision %s a des enfants non-correspondents (%d enfants; %d parents)\n"

-#: ../database_check.cc:690
+#: database_check.cc:690
 #, c-format
 msgid "revision %s has bad history (%s)\n"
 msgstr "la révision %s a une mauvaise histoire (%s)\n"

-#: ../database_check.cc:697
+#: database_check.cc:697
 #, c-format
 msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n"
 msgstr ""
 "la révision %s n'est pas analysable (peut-être a-t'elle des chemins non "
 "normalisé?)\n"

-#: ../database_check.cc:704
+#: database_check.cc:704
 #, c-format
 msgid "revision %s is not in normalized form\n"
 msgstr "la révision %s n'est pas en forme normalisé\n"

-#: ../database_check.cc:728
+#: database_check.cc:728
 #, c-format
 msgid "key %s missing (signed %d certs)\n"
 msgstr "la clef %s manque (elle a signé %d certifs)\n"

-#: ../database_check.cc:761
+#: database_check.cc:761
 #, c-format
 msgid "revision %s unchecked signature in %s cert from missing key %s\n"
 msgstr ""
 "la révision %s a une signature non contrôlable dans le certif %s, faite avec "
 "une clef qui manque %s\n"

-#: ../database_check.cc:769
+#: database_check.cc:769
 #, c-format
 msgid "revision %s bad signature in %s cert from key %s\n"
 msgstr ""
 "la révision %s a une mauvaise signature dans le certif %s, faite avec la "
 "clef %s\n"

-#: ../database_check.cc:784
+#: database_check.cc:784
 #, c-format
 msgid "revision %s missing %s cert\n"
 msgstr "la révision %s manque le certif %s\n"

-#: ../database_check.cc:793
+#: database_check.cc:793
 #, c-format
 msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n"
 msgstr ""
 "révision %s a des certifs non-correspondents (%d auteurs %d dates %d entrées "
 "de journal)\n"

-#: ../database_check.cc:874
+#: database_check.cc:874
 #, c-format
 msgid "%d missing files\n"
 msgstr "%d fichiers manquants\n"

-#: ../database_check.cc:876
+#: database_check.cc:876
 #, c-format
 msgid "%d unreferenced files\n"
 msgstr "%d fichiers non-référencés\n"

-#: ../database_check.cc:879
+#: database_check.cc:879
 #, c-format
 msgid "%d unreferenced rosters\n"
 msgstr "%d listes non-référencés\n"

-#: ../database_check.cc:881
+#: database_check.cc:881
 #, c-format
 msgid "%d incomplete rosters\n"
 msgstr "%d listes incomplets\n"

-#: ../database_check.cc:883
+#: database_check.cc:883
 #, c-format
 msgid "%d rosters not parseable (perhaps with invalid paths)\n"
 msgstr ""
 "%d listes non analysable (peut-être ont-ils des chemins pas valable?)\n"

-#: ../database_check.cc:886
+#: database_check.cc:886
 #, c-format
 msgid "%d rosters not in normalized form\n"
 msgstr "%d listes pas en forme normalisé\n"

-#: ../database_check.cc:889
+#: database_check.cc:889
 #, c-format
 msgid "%d missing revisions\n"
 msgstr "%d révisions manquantes\n"

-#: ../database_check.cc:891
+#: database_check.cc:891
 #, c-format
 msgid "%d incomplete revisions\n"
 msgstr "%d revisions incomplètes\n"

-#: ../database_check.cc:893
+#: database_check.cc:893
 #, c-format
 msgid "%d mismatched parents\n"
 msgstr "%d parents non correspondents\n"

-#: ../database_check.cc:895
+#: database_check.cc:895
 #, c-format
 msgid "%d mismatched children\n"
 msgstr "%d enfants non correspondents\n"

-#: ../database_check.cc:897
+#: database_check.cc:897
 #, c-format
 msgid "%d revisions with bad history\n"
 msgstr "%d révisions avec une mauvaise histoire\n"

-#: ../database_check.cc:899
+#: database_check.cc:899
 #, c-format
 msgid "%d revisions not parseable (perhaps with invalid paths)\n"
 msgstr ""
 "%d révisions non analysable (peut-être ont-ils des chemins pas valable?)\n"

-#: ../database_check.cc:902
+#: database_check.cc:902
 #, c-format
 msgid "%d revisions not in normalized form\n"
 msgstr "%d révisions non normalisés\n"

-#: ../database_check.cc:906
+#: database_check.cc:906
 #, c-format
 msgid "%d unreferenced roster links\n"
 msgstr "%d liens à liste non-référencés\n"

-#: ../database_check.cc:909
+#: database_check.cc:909
 #, c-format
 msgid "%d missing rosters\n"
 msgstr "%d listes manquantes\n"

-#: ../database_check.cc:913
+#: database_check.cc:913
 #, c-format
 msgid "%d missing keys\n"
 msgstr "%d clefs manquantes\n"

-#: ../database_check.cc:916
+#: database_check.cc:916
 #, c-format
 msgid "%d missing certs\n"
 msgstr "%d certifs manquants\n"

-#: ../database_check.cc:918
+#: database_check.cc:918
 #, c-format
 msgid "%d mismatched certs\n"
 msgstr "%d certifs non correspondaets\n"

-#: ../database_check.cc:920
+#: database_check.cc:920
 #, c-format
 msgid "%d unchecked signatures due to missing keys\n"
 msgstr "%d signature non contrôlées à cause de clefs manquantes\n"

-#: ../database_check.cc:922
+#: database_check.cc:922
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"

-#: ../database_check.cc:948
+#: database_check.cc:948
 #, c-format
 msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs\n"
 msgstr ""
 "contrôle fini: %d fichiers; %d listes; %d révisions; %d clefs; %d certifs\n"

-#: ../database_check.cc:954
+#: database_check.cc:954
 #, c-format
 msgid "total problems detected: %d (%d serious)\n"
 msgstr "problèmes total détectés: %d (%d sérieux)\n"

-#: ../database_check.cc:956
+#: database_check.cc:956
 #, c-format
 msgid "serious problems detected"
 msgstr "problèmes sérieux détectés"

-#: ../database_check.cc:958
+#: database_check.cc:958
 #, c-format
 msgid "minor problems detected\n"
 msgstr "problèmes mineurs détectés\n"

-#: ../database_check.cc:960
+#: database_check.cc:960
 #, c-format
 msgid "database is good\n"
 msgstr "la base de données est bonne\n"

-#: ../database.cc:141
+#: database.cc:141
 #, c-format
 msgid ""
 "layout of database %s doesn't match this version of monotone\n"
@@ -2018,7 +2021,7 @@
 "(cette opération est irréversible; vous voudrez probablement prendre une "
 "copie d'abord)"

-#: ../database.cc:165
+#: database.cc:165
 #, c-format
 msgid ""
 "database %s contains revisions but no rosters\n"
@@ -2037,7 +2040,7 @@
 "  récupérez de nouveau dans une base de données fraiche.\n"
 "désolé pour l'inconvenience."

-#: ../database.cc:184
+#: database.cc:184
 #, c-format
 msgid ""
 "database %s contains manifests but no revisions\n"
@@ -2049,19 +2052,19 @@
 "niveau\n"
 "veuillez lire lest détails dans README.changesets"

-#: ../database.cc:220
+#: database.cc:220
 #, c-format
 msgid "unable to probe database version in file %s"
 msgstr "le sondage de la version de la base de données dans « %s » a échouée"

-#: ../database.cc:227
+#: database.cc:227
 #, c-format
 msgid "database %s is not an sqlite version 3 file, try dump and reload"
 msgstr ""
 "la base de données %s n'est pas un fichier sqlite version 3, essayer dump "
 "puis reload"

-#: ../database.cc:254
+#: database.cc:256 schema_migration.cc:187
 msgid ""
 "make sure database and containing directory are writeable\n"
 "and you have not run out of disk space"
@@ -2069,22 +2072,21 @@
 "assurez-vous que la base de données et le dossier la contenant sont\n"
 "accessibles en écriture et que vous disposez encore d'espace disque"

-#. kind of string surgery to avoid ~duplicate strings
-#: ../database.cc:260
+#: database.cc:262 schema_migration.cc:192
 #, c-format
 msgid ""
-"sqlite error: %d: %s\n"
+"sqlite error: %s\n"
 "%s"
 msgstr ""
-"erreur sqlite : %d : %s\n"
+"erreur sqlite : %s\n"
 "%s"

-#: ../database.cc:306
+#: database.cc:308
 #, c-format
 msgid "could not initialize database: %s: already exists"
 msgstr "impossible d'initialiser la base de données : %s : elle existe déjà"

-#: ../database.cc:311
+#: database.cc:313
 #, c-format
 msgid ""
 "existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -2092,13 +2094,13 @@
 "cancelling database creation"
 msgstr ""

-#: ../database.cc:454
+#: database.cc:456
 #, c-format
 msgid "cannot create %s; it already exists"
 msgstr "impossible de créer %s car ceci existe déjà"

-#: ../database.cc:514
-#, c-format
+#: database.cc:520
+#, fuzzy, c-format
 msgid ""
 "schema version    : %s\n"
 "counts:\n"
@@ -2118,6 +2120,9 @@
 "  cached ancestry : %u\n"
 "  certs           : %u\n"
 "  total           : %u\n"
+"database:\n"
+"  page size       : %u\n"
+"  cache size      : %u\n"
 msgstr ""
 "version du schéma    : %s\n"
 "comptes:\n"
@@ -2138,73 +2143,73 @@
 "  certifs            : %u\n"
 "  total              : %u\n"

-#: ../database.cc:569
+#: database.cc:580
 #, c-format
 msgid "database schema version: %s"
 msgstr "version du schéma de la base de données : %s"

-#: ../database.cc:646
+#: database.cc:657
 #, c-format
 msgid "multiple statements in query: %s\n"
 msgstr "plusieurs instructions dans la requête: %s\n"

-#: ../database.cc:652
+#: database.cc:663
 #, c-format
 msgid "wanted %d columns got %d in query: %s\n"
 msgstr "voulais %d colonnes, reçu %d dans la requête: %s\n"

-#: ../database.cc:711
+#: database.cc:722
 #, c-format
 msgid "null result in query: %s\n"
 msgstr "la requête donnait aucun résultat: %s\n"

-#: ../database.cc:729
+#: database.cc:740
 #, c-format
 msgid "wanted %d rows got %s in query: %s\n"
 msgstr "voulais %d rangs, reçu %s dans la requête: %s\n"

-#: ../database.cc:1728
+#: database.cc:1760
 #, c-format
 msgid "another key with name '%s' already exists"
 msgstr "une autre clef nommée « %s » existe déjà"

-#: ../database.cc:2784
+#: database.cc:2816
 #, c-format
 msgid "no database specified"
 msgstr "aucune base de données n'a été spécifiée"

-#: ../database.cc:2792
+#: database.cc:2824
 #, c-format
 msgid "database %s does not exist"
 msgstr "la base de données %s n'existe pas"

-#: ../database.cc:2793
+#: database.cc:2825
 #, c-format
 msgid "%s is a directory, not a database"
 msgstr "%s est un dossier, pas une base de données"

-#: ../database.cc:2818
+#: database.cc:2850
 #, c-format
 msgid "could not open database '%s': %s"
 msgstr "impossible d'ouvrir la base de données « %s » : %s"

-#: ../diff_patch.cc:588
+#: diff_patch.cc:590
 #, c-format
 msgid "file '%s' does not exist in workspace"
 msgstr "le fichier « %s » n'existe pas dans l'espace de travail"

-#: ../diff_patch.cc:589
+#: diff_patch.cc:591
 #, c-format
 msgid "'%s' in workspace is a directory, not a file"
 msgstr "« %s » est un dossier, pas un fichier"

-#: ../diff_patch.cc:593
+#: diff_patch.cc:595
 #, c-format
 msgid "file %s in workspace has id %s, wanted %s"
 msgstr ""
 "le fichier « %s » dans l'espace de travail a l'identité %s, je voulais %s"

-#: ../diff_patch.cc:714
+#: diff_patch.cc:716
 #, c-format
 msgid ""
 "help required for 3-way merge\n"
@@ -2219,12 +2224,12 @@
 "[  droite] %s\n"
 "[fusionné] %s\n"

-#: ../file_io.cc:116
+#: file_io.cc:116
 #, c-format
 msgid "expected file '%s', but it is a directory."
 msgstr "le fichier « %s » ne peut être lu; c'est un dossier"

-#: ../file_io.cc:186 ../file_io.cc:193
+#: file_io.cc:186 file_io.cc:193
 #, c-format
 msgid ""
 "could not create directory '%s'\n"
@@ -2233,7 +2238,7 @@
 "impossible de créer le dossier « %s »\n"
 "car c'est un fichier"

-#: ../file_io.cc:188
+#: file_io.cc:188
 #, c-format
 msgid ""
 "could not create directory '%s'\n"
@@ -2242,17 +2247,17 @@
 "impossible de créer le dossier « %s »\n"
 "%s"

-#: ../file_io.cc:192
+#: file_io.cc:192
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossible de créer le dossier « %s »"

-#: ../file_io.cc:205
+#: file_io.cc:205
 #, c-format
 msgid "failed to create directory '%s' for '%s'"
 msgstr "impossible de créer le dossier « %s » pour « %s »"

-#: ../file_io.cc:219
+#: file_io.cc:219
 #, c-format
 msgid ""
 "could not remove '%s'\n"
@@ -2261,438 +2266,438 @@
 "impossible de supprimer « %s »\n"
 "%s"

-#: ../file_io.cc:229
+#: file_io.cc:229
 #, c-format
 msgid "file to delete '%s' does not exist"
 msgstr "le fichier à supprimer « %s » n'existe pas"

-#: ../file_io.cc:230
+#: file_io.cc:230
 #, c-format
 msgid "file to delete, '%s', is not a file but a directory"
 msgstr "le fichier à supprimer « %s » n'est pas un fichier, c'est un dossier"

-#: ../file_io.cc:238
+#: file_io.cc:238
 #, c-format
 msgid "directory to delete '%s' does not exist"
 msgstr "le dossier à supprimer « %s » n'existe pas"

-#: ../file_io.cc:239
+#: file_io.cc:239
 #, c-format
 msgid "directory to delete, '%s', is not a directory but a file"
 msgstr "le dossier à supprimer « %s » n'est pas un dossier, c'est un fichier"

-#: ../file_io.cc:246
+#: file_io.cc:246
 #, c-format
 msgid "object to delete, '%s', does not exist"
 msgstr "l'objet à supprimer « %s » n'existe pas"

-#: ../file_io.cc:254
+#: file_io.cc:254
 #, c-format
 msgid "directory to delete, '%s', does not exist"
 msgstr "le dossier à supprimer « %s » n'existe pas"

-#: ../file_io.cc:255
+#: file_io.cc:255
 #, c-format
 msgid "directory to delete, '%s', is a file"
 msgstr "le dossier à supprimer « %s » est un fichier"

-#: ../file_io.cc:264
+#: file_io.cc:264
 #, c-format
 msgid "rename source file '%s' does not exist"
 msgstr "le chemin à renommer « %s » n'existe pas"

-#: ../file_io.cc:265
+#: file_io.cc:265
 #, c-format
 msgid "rename source file '%s' is a directory -- bug in monotone?"
 msgstr ""
 "le fichier à renommer « %s » est un dossier -- cerait-ce un bogue dans "
 "monotone?"

-#: ../file_io.cc:268 ../file_io.cc:281
+#: file_io.cc:268 file_io.cc:281
 #, c-format
 msgid "rename target '%s' already exists"
 msgstr "le nouveau nom « %s » existe déjà"

-#: ../file_io.cc:277
+#: file_io.cc:277
 #, c-format
 msgid "rename source dir '%s' does not exist"
 msgstr "le dossier à renommer « %s » n'existe pas"

-#: ../file_io.cc:278
+#: file_io.cc:278
 #, c-format
 msgid "rename source dir '%s' is a file -- bug in monotone?"
 msgstr ""
 "le dossier à renommer « %s » est un fichier -- cerait-ce un bogue dans "
 "monotone?"

-#: ../file_io.cc:292
+#: file_io.cc:292
 #, c-format
 msgid "rename source path '%s' does not exist"
 msgstr "le chemin à renommer « %s » n'existe pas"

-#: ../file_io.cc:307
+#: file_io.cc:307
 #, c-format
 msgid "file %s does not exist"
 msgstr "le fichier %s n'existe pas"

-#: ../file_io.cc:308
+#: file_io.cc:308
 #, c-format
 msgid "file %s cannot be read as data; it is a directory"
 msgstr "le fichier %s ne peut être lu; c'est un dossier"

-#: ../file_io.cc:312
+#: file_io.cc:312
 #, c-format
 msgid "cannot open file %s for reading"
 msgstr "impossible d'ouvrir le fichier %s pour le lire"

-#: ../file_io.cc:381
+#: file_io.cc:381
 #, c-format
 msgid "Cannot read standard input multiple times"
 msgstr "Impossible de lire l'entrée standard plusieurs fois"

-#: ../file_io.cc:412
+#: file_io.cc:412
 #, c-format
 msgid "file '%s' cannot be overwritten as data; it is a directory"
 msgstr "le fichier %s ne peut être re-écrit avec des données; c'est un dossier"

-#: ../file_io.cc:420
+#: file_io.cc:420
 #, c-format
 msgid "cannot open file %s for writing"
 msgstr "impossible d'ouvrir le fichier %s pour l'écrire"

-#: ../file_io.cc:530
+#: file_io.cc:530
 #, c-format
 msgid "caught runtime error %s constructing file path for %s\n"
 msgstr ""
 "attrape une erreur %s en cours d'exécution au milieu de la construction du "
 "cheming de fichier pour %s\n"

-#: ../file_io.cc:569
+#: file_io.cc:569
 #, c-format
 msgid "no such file or directory: '%s'"
 msgstr "aucun fichier ou dossier de ce type : « %s »"

-#: ../keys.cc:77
+#: keys.cc:77
 #, c-format
 msgid "got empty passphrase from get_passphrase() hook"
 msgstr "la phrase de passe obtenue depuis get_passphrase() est vide"

-#: ../keys.cc:93
+#: keys.cc:93
 #, c-format
 msgid "empty passphrase not allowed"
 msgstr "la phrase de passe ne doit pas être vide"

-#: ../keys.cc:100
+#: keys.cc:100
 #, c-format
 msgid "confirm passphrase for key ID [%s]: "
 msgstr "confirmez la phrase de passe pour la clef d'ID [%s] :"

-#: ../keys.cc:105
+#: keys.cc:105
 #, c-format
 msgid "empty passphrases not allowed, try again\n"
 msgstr "la phrase de passe ne doit pas être vide, essayez de nouveau\n"

-#: ../keys.cc:106 ../keys.cc:113
+#: keys.cc:106 keys.cc:113
 #, c-format
 msgid "too many failed passphrases\n"
 msgstr "trop de phrases de passe incorrectes\n"

-#: ../keys.cc:112
+#: keys.cc:112
 #, c-format
 msgid "passphrases do not match, try again\n"
 msgstr "les phrases de passe ne correspondent pas, essayez à nouveau\n"

-#: ../keys.cc:119
+#: keys.cc:119
 #, c-format
 msgid "no passphrase given"
 msgstr "aucune phrase de passe fournie"

-#: ../keys.cc:542
+#: keys.cc:542
 #, c-format
 msgid "passphrase for '%s' is incorrect"
 msgstr "la phrase de passe pour « %s » est incorrecte"

-#: ../lua.cc:539 ../lua.cc:568 ../lua.cc:583
+#: lua.cc:539 lua.cc:568 lua.cc:583
 #, c-format
 msgid "%s called with an invalid parameter"
 msgstr "%s a été appelé avec un paramètre invalide"

-#: ../lua.cc:586
+#: lua.cc:586
 #, c-format
 msgid "Directory '%s' does not exists"
 msgstr "le dossier « %s » n'existe pas"

-#: ../lua.cc:587 ../rcs_import.cc:1217 ../work.cc:420
+#: lua.cc:587 rcs_import.cc:1217 work.cc:420
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "« %s » n'est pas un dossier"

-#: ../lua.cc:606 ../lua.cc:908
+#: lua.cc:606 lua.cc:908
 #, c-format
 msgid "lua error while loading rcfile '%s'"
 msgstr "erreur lua lors du chargement de « %s »"

-#: ../lua.cc:705
+#: lua.cc:705
 #, c-format
 msgid "bad input to parse_basic_io"
 msgstr "mauvaise entrée à parse_basic_io"

-#: ../lua.cc:920
+#: lua.cc:920
 #, c-format
 msgid "lua error while loading '%s'"
 msgstr "erreur lua lors du chargement de « %s »"

-#: ../lua.cc:925
+#: lua.cc:925
 #, c-format
 msgid "rcfile '%s' does not exist"
 msgstr "le fichier rc « %s » n'existe pas"

-#: ../main.cc:325
+#: main.cc:325
 msgid "interrupted"
 msgstr "interrompu"

-#: ../main.cc:329
+#: main.cc:329
 msgid "terminated by signal"
 msgstr "terminé par un signal"

-#: ../merkle_tree.cc:276
+#: merkle_tree.cc:276
 #, c-format
 msgid "node level is %d, exceeds maximum %d"
 msgstr "niveau de noeud est %d, ce qui dépasse la limite %d"

-#: ../merkle_tree.cc:311
+#: merkle_tree.cc:311
 #, c-format
 msgid "mismatched node hash value %s, expected %s"
 msgstr "la somme de contrôle %s ne correspond pas à la valeur attendue %s"

-#: ../monotone.cc:51
+#: monotone.cc:51
 msgid "select branch cert for operation"
 msgstr "choisi certif de branch pour l'opération"

-#: ../monotone.cc:52
+#: monotone.cc:52
 msgid "select revision id for operation"
 msgstr "choisi révision pour l'opération"

-#: ../monotone.cc:53
+#: monotone.cc:53
 msgid "set commit changelog message"
 msgstr "établissez le message du journal"

-#: ../monotone.cc:54
+#: monotone.cc:54
 msgid "set filename containing commit changelog message"
 msgstr ""
 "'etablissez le nom du fichier qui contient l'entrée du journal pour confier"

-#: ../monotone.cc:55
+#: monotone.cc:55
 msgid "override date/time for commit"
 msgstr "supplante la date/l'heure pour confier"

-#: ../monotone.cc:56
+#: monotone.cc:56
 msgid "override author for commit"
 msgstr "supplante l'auteur pour confier"

-#: ../monotone.cc:57
+#: monotone.cc:57
 msgid "limit the number of levels of directories to descend"
 msgstr "limite le niveau de dossier à descendre"

-#: ../monotone.cc:58
+#: monotone.cc:58
 msgid "limit log output to the last number of entries"
 msgstr "limiter l'affichage du journal au dernier nombre d'entrées spécifié"

-#: ../monotone.cc:59
+#: monotone.cc:59
 msgid "limit log output to the next number of entries"
 msgstr "limiter l'affichage du journal au prochain nombre d'entrées spécifié"

-#: ../monotone.cc:60
+#: monotone.cc:60
 msgid "record process id of server"
 msgstr "enregistrer l'identifiant du processus serveur"

-#: ../monotone.cc:61
+#: monotone.cc:61
 msgid "print a brief version of the normal output"
 msgstr "affiche la version courte de l'affichage normale"

-#: ../monotone.cc:62
+#: monotone.cc:62
 msgid "print diffs along with logs"
 msgstr "affiche la différnce en affichant le journal"

-#: ../monotone.cc:63
+#: monotone.cc:63
 msgid "exclude merges when printing logs"
 msgstr "exclus les fusions en affichant le journal"

-#: ../monotone.cc:64
+#: monotone.cc:64
 msgid "use the current arguments as the future default"
 msgstr "emploie les arguments actuels comme défauts futurs"

-#: ../monotone.cc:65
+#: monotone.cc:65
 msgid "leave out anything described by its argument"
 msgstr "exclus tout ce qui est décrit par l'argument"

-#: ../monotone.cc:66
+#: monotone.cc:66
 msgid "use unified diff format"
 msgstr "utiliser le format diff unifié"

-#: ../monotone.cc:67
+#: monotone.cc:67
 msgid "use context diff format"
 msgstr "utiliser le format diff contextuel"

-#: ../monotone.cc:68
+#: monotone.cc:68
 msgid "use external diff hook for generating diffs"
 msgstr ""
 "emploie la procédure automatique de « diff » externe pour créer les "
 "différences"

-#: ../monotone.cc:69
+#: monotone.cc:69
 msgid "argument to pass external diff hook"
 msgstr "argument a passer la procédure automatique de « diff » externe"

-#: ../monotone.cc:70
+#: monotone.cc:70
 msgid "use least common ancestor as ancestor for merge"
 msgstr "emploi le plus petit ancêtre commun comme ancêtre pour la fusion"

-#: ../monotone.cc:71
+#: monotone.cc:71
 msgid "perform the associated file operation"
 msgstr "accomplis les opérations sur les fichiers associés"

-#: ../monotone.cc:72
+#: monotone.cc:72
 msgid "address:port to listen on (default :4691)"
 msgstr "écouteur sur adresse:port (défaut :4691)"

-#: ../monotone.cc:73
+#: monotone.cc:73
 msgid "perform the operations for files missing from workspace"
 msgstr ""
 "accomplis les opérations sur les fichiers qui manquent dans l'espace de "
 "travail"

-#: ../monotone.cc:74
+#: monotone.cc:74
 msgid "perform the operations for unknown files from workspace"
 msgstr ""
 "accomplis les opérations sur les fichiers inconnus dans l'espace de travail"

-#: ../monotone.cc:75
+#: monotone.cc:75
 msgid "push the specified key even if it hasn't signed anything"
 msgstr "envoie la clef donnée même si rien n'est signé avec elle"

-#: ../monotone.cc:76
+#: monotone.cc:76
 msgid "when rosterifying, drop attrs entries with the given key"
 msgstr ""
 "tout en créent des listes, élimine les attributs signé par la clef donnée"

-#: ../monotone.cc:77
+#: monotone.cc:77
 msgid "exclude files when printing logs"
 msgstr "n'affiche pas les fichiers en affichant le journal"

-#: ../monotone.cc:78
+#: monotone.cc:78
 msgid "also operate on the contents of any listed directories"
 msgstr ""

-#: ../monotone.cc:87
+#: monotone.cc:87
 msgid "print debug log to stderr while running"
 msgstr "affiche le journal à déboguer sur la sortie d'erreur standard"

-#: ../monotone.cc:88
+#: monotone.cc:88
 msgid "file to dump debugging log to, on failure"
 msgstr "ficher dans lequel verser le journal à déboguer, en cas d'erreur"

-#: ../monotone.cc:89
+#: monotone.cc:89
 msgid "file to write the log to"
 msgstr "fichier où écrire le journal"

-#: ../monotone.cc:90
+#: monotone.cc:90
 msgid "suppress log and progress messages"
 msgstr "n'affiche pas le journal ou les messages de progrès"

-#: ../monotone.cc:91
+#: monotone.cc:91
 msgid "display help message"
 msgstr "afficher le message d'aide"

-#: ../monotone.cc:92
+#: monotone.cc:92
 msgid "print version number, then exit"
 msgstr "afficher le numéro de version, puis quitte"

-#: ../monotone.cc:93
+#: monotone.cc:93
 msgid "print detailed version number, then exit"
 msgstr "afficher le numéro de version détaillée, puis quitte"

-#: ../monotone.cc:94
+#: monotone.cc:94
 msgid "insert command line arguments taken from the given file"
 msgstr "fourre les arguments pris du fichier donné dans la linge de commande"

-#: ../monotone.cc:95
+#: monotone.cc:95
 msgid "set ticker style (count|dot|none)"
 msgstr "établis le style d'affichage de progrès (count|dot|none)"

-#: ../monotone.cc:96
+#: monotone.cc:96
 msgid "do not load standard lua hooks"
 msgstr "ne pas charger les hooks standards lua"

-#: ../monotone.cc:97
+#: monotone.cc:97
 msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files"
 msgstr ""
 "ne pas charger les fichiers lua ~/.monotone/monotonerc ou MT/monotonerc"

-#: ../monotone.cc:98
+#: monotone.cc:98
 msgid "load extra rc file"
 msgstr "charger un fichier rc supplémentaire"

-#: ../monotone.cc:99
+#: monotone.cc:99
 msgid "set key for signatures"
 msgstr "paramétrer la clef pour les signatures"

-#: ../monotone.cc:100
+#: monotone.cc:100
 msgid "set name of database"
 msgstr "paramétrer le nom de la base de données"

-#: ../monotone.cc:101
+#: monotone.cc:101
 msgid "limit search for workspace to specified root"
 msgstr "limite la recherche d'un espace de travail à la racine donnée"

 # **** Richard stopped here ****
-#: ../monotone.cc:102
+#: monotone.cc:102
 msgid "verbose completion output"
 msgstr "affiche plus d'information à la fin de l'exécution"

-#: ../monotone.cc:103
+#: monotone.cc:103
 msgid "set location of key store"
 msgstr "paramétrer l'emplacement de l'entrepôt de données"

-#: ../monotone.cc:104
+#: monotone.cc:104
 msgid "set location of configuration directory"
 msgstr "paramétrer l'emplacement du dossier de configuration"

-#: ../monotone.cc:208
+#: monotone.cc:208
 #, c-format
 msgid "problem parsing arguments from file %s: %s"
 msgstr "erreur lors de l'analyse d'arguments venant du fichier %s : %s"

-#: ../monotone.cc:217
+#: monotone.cc:217
 #, c-format
 msgid "weird error when stuffing arguments read from %s: %s\n"
 msgstr "erreur bizarre en employent des arguments lu de %s: %s\n"

-#: ../monotone.cc:299
+#: monotone.cc:299
 msgid "[OPTION...] command [ARGS...]\n"
 msgstr "[OPTION...] commande [ARGUMENTS...]\n"

-#: ../monotone.cc:551
+#: monotone.cc:551
 #, c-format
 msgid "syntax error near the \"%s\" option: %s"
 msgstr "erreur de syntaxe près de l'option « %s » : %s"

-#: ../monotone.cc:590
+#: monotone.cc:593
 #, c-format
 msgid "monotone %s doesn't use the option %s"
 msgstr "monotone %s n'utilise pas l'option %s"

-#: ../monotone.cc:625
+#: monotone.cc:628
 #, c-format
 msgid "Options specific to '%s %s':"
 msgstr "Options spécifiques à « %s %s » :"

-#: ../mt_version.cc:23
+#: mt_version.cc:23
 #, c-format
 msgid "%s (base revision: %s)"
 msgstr "%s (révision de base : %s)"

-#: ../mt_version.cc:34
+#: mt_version.cc:34
 #, c-format
 msgid ""
 "Running on: %s\n"
@@ -2701,17 +2706,17 @@
 "En cours d'exécution sur : %s\n"
 "Changements depuis la révision de base : %s\n"

-#: ../netcmd.cc:40
+#: netcmd.cc:40
 #, c-format
 msgid "unknown item type 0x%x for '%s'"
 msgstr "type d'élément inconnu 0x%x pour « %s »"

-#: ../netcmd.cc:112
+#: netcmd.cc:112
 #, c-format
 msgid "unknown netcmd code 0x%x"
 msgstr "code de commande netcmd inconnu 0x%x"

-#: ../netcmd.cc:117
+#: netcmd.cc:117
 #, c-format
 msgid ""
 "protocol version mismatch: wanted '%d' got '%d'\n"
@@ -2720,20 +2725,20 @@
 "discordance de versions de protocol: voulais « %d », reçu « %d »\n"
 "%s"

-#: ../netcmd.cc:122
+#: netcmd.cc:122
 msgid "the remote side has a newer, incompatible version of monotone"
 msgstr "l'autre côté emploi une nouvelle version incompatible de monotone"

-#: ../netcmd.cc:123
+#: netcmd.cc:123
 msgid "the remote side has an older, incompatible version of monotone"
 msgstr "l'autre côté emploi une ancienne version incompatible de monotone"

-#: ../netcmd.cc:133
+#: netcmd.cc:133
 #, c-format
 msgid "oversized payload of '%d' bytes"
 msgstr "charge utile surdimensionnée de '%d' octets"

-#: ../netcmd.cc:162
+#: netcmd.cc:162
 #, c-format
 msgid ""
 "bad HMAC checksum (got %s, wanted %s)\n"
@@ -2742,84 +2747,78 @@
 "mauvaise somme de contrôle HMAC (reçu %s, attendu %s)\n"
 "ceci suggère que les données ont été corrompues pendant le transit\n"

-#: ../netcmd.cc:257 ../netcmd.cc:303
+#: netcmd.cc:257 netcmd.cc:303
 #, c-format
 msgid "unknown role specifier %d"
 msgstr "rôle donné %d est inconnu"

-#: ../netio.hh:38 ../netio.hh:56
+#: netio.hh:38 netio.hh:56
 #, c-format
 msgid "need %d bytes to decode %s at %d, only have %d"
 msgstr ""
 "%d octets sont nécessaire pour décoder %s à %d, seulement %d sont disponibles"

-#: ../netio.hh:84 ../netio.hh:119
+#: netio.hh:84 netio.hh:119
 #, c-format
 msgid "uleb128 decode for '%s' into %d-byte datum overflowed"
 msgstr "décodage uleb128 de « %s » en donnée de %d octets a débordé"

-#: ../netio.hh:139
+#: netio.hh:139
 #, c-format
 msgid "ran out of bytes reading uleb128 value for '%s' at pos %d"
 msgstr ""
 "pas assez d'octets en lisant la valeur uleb128 pour « %s », à la position %d"

-#: ../netio.hh:275
+#: netio.hh:275
 #, c-format
 msgid "decoding variable length string of %d bytes for '%s', maximum is %d"
 msgstr "décodage d'une linge de %d octets pour « %s » quand le maximum est %d"

-#: ../netio.hh:330
+#: netio.hh:330
 #, c-format
 msgid "expected %s to end at %d, have %d bytes"
 msgstr "je m'attendai à ce que %s finisse à %d, et j'ai %d octets"

-#: ../netsync.cc:245
+#: netsync.cc:245
 #, c-format
 msgid "check of '%s' failed"
 msgstr "la vérification de « %s » a échouée"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:691
+#: netsync.cc:708
 msgid "bytes in"
 msgstr "octets ⇩"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:693
+#: netsync.cc:710
 msgid "bytes out"
 msgstr "octets ⇧"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:697
+#: netsync.cc:714
 msgid "certs in"
 msgstr "certs ⇩"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:699 ../netsync.cc:712
+#: netsync.cc:716 netsync.cc:729
 msgid "revs in"
 msgstr "révs ⇩"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:704
+#: netsync.cc:721
 msgid "certs out"
 msgstr "certs ⇧"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:706 ../netsync.cc:714
+#: netsync.cc:723 netsync.cc:731
 msgid "revs out"
 msgstr "révs ⇧"

-#: ../netsync.cc:815
+#: netsync.cc:837
 #, c-format
 msgid "underflow on count of %s items to receive"
 msgstr "trop peux d'objets %s à recevoir"

-#: ../netsync.cc:1161
+#: netsync.cc:1183
 #, c-format
 msgid "received network error: %s"
 msgstr "erreur de réception réseau : %s"

-#: ../netsync.cc:1193
+#: netsync.cc:1215
 #, c-format
 msgid ""
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -2842,12 +2841,12 @@
 "j'attendais %s\n"
 "« %s unset %s %s » pour passer outre cette verification\n"

-#: ../netsync.cc:1203
+#: netsync.cc:1225
 #, c-format
 msgid "server key changed"
 msgstr "la clef du serveur a changée"

-#: ../netsync.cc:1208
+#: netsync.cc:1230
 #, c-format
 msgid ""
 "first time connecting to server %s\n"
@@ -2858,48 +2857,48 @@
 "Je considère qu'il s'agit vraiment de lui, mais vous devriez peut-être\n"
 "re-vérifier l'empreinte de leur clef : %s\n"

-#: ../netsync.cc:1215
+#: netsync.cc:1237
 #, c-format
 msgid "saving public key for %s to database\n"
 msgstr "sauvegarde la clef publique « %s » dans la base de données\n"

-#: ../netsync.cc:1303
+#: netsync.cc:1325
 #, c-format
 msgid "rejected attempt at anonymous connection for write\n"
 msgstr "essai de connexion anonyme pour écrire rejeté\n"

-#: ../netsync.cc:1310
+#: netsync.cc:1332
 #, c-format
 msgid "rejected attempt at anonymous connection while running as sink\n"
 msgstr "essai de connexion anonyme en étant un puit rejeté\n"

-#: ../netsync.cc:1325 ../netsync.cc:1422
+#: netsync.cc:1347 netsync.cc:1444
 #, c-format
 msgid "not serving branch '%s'"
 msgstr "la branche « %s » n'est pas servie"

-#: ../netsync.cc:1330
+#: netsync.cc:1352
 #, c-format
 msgid "anonymous access to branch '%s' denied by server"
 msgstr "accès anonyme à la branche « %s » refusé par le serveur"

-#: ../netsync.cc:1337
+#: netsync.cc:1359
 #, c-format
 msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
 msgstr ""
 "permission de lecture anonyme accordée pour « %s » en excluant « %s »\n"

-#: ../netsync.cc:1369
+#: netsync.cc:1391
 #, c-format
 msgid "detected replay attack in auth netcmd\n"
 msgstr "détecté une attaque de repasse dans la phase auth de netcmd\n"

-#: ../netsync.cc:1391
+#: netsync.cc:1413
 #, c-format
 msgid "remote public key hash '%s' is unknown\n"
 msgstr "la somme de contrôle « %s » d'une clef publique reçu est inconnue\n"

-#: ../netsync.cc:1408
+#: netsync.cc:1430
 #, c-format
 msgid ""
 "denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -2908,7 +2907,7 @@
 "permission de lecture refusée à « %s » pour « %s » en excluant « %s » et en "
 "étant un puit pure\n"

-#: ../netsync.cc:1428
+#: netsync.cc:1450
 #, c-format
 msgid ""
 "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
@@ -2916,20 +2915,18 @@
 "permission de lecture refusée à « %s » pour « %s » en excluant « %s » à "
 "cause de la branche « %s »\n"

-#: ../netsync.cc:1431
+#: netsync.cc:1453
 #, c-format
 msgid "access to branch '%s' denied by server"
 msgstr "accès à la branche « %s » refusé par le serveur"

-#. If we're source_and_sink_role, continue even with no branches readable
-#. eg. serve --db=empty.db
-#: ../netsync.cc:1441
+#: netsync.cc:1463
 #, c-format
 msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
 msgstr ""
 "permission de lecture accordée à « %s » pour « %s » en excluant « %s »\n"

-#: ../netsync.cc:1450
+#: netsync.cc:1472
 #, c-format
 msgid ""
 "denied '%s' write permission for '%s' excluding '%s' while running as pure "
@@ -2938,245 +2935,236 @@
 "permission d'écrire refusée à « %s » pour « %s » en excluant « %s » en étant "
 "un source pure\n"

-#: ../netsync.cc:1458
+#: netsync.cc:1480
 #, c-format
 msgid "denied '%s' write permission for '%s' excluding '%s'\n"
 msgstr "permission d'écrire refusée à « %s » pour « %s » en excluant « %s »\n"

-#: ../netsync.cc:1464
+#: netsync.cc:1486
 #, c-format
 msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
 msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n"

-#: ../netsync.cc:1504
+#: netsync.cc:1526
 #, c-format
 msgid "bad client signature\n"
 msgstr "signature du client invalide\n"

-#: ../netsync.cc:1520
+#: netsync.cc:1542
 #, c-format
 msgid "Unexpected 'refine' command on non-refined item type\n"
 msgstr "Commande « refine » inattenue pour type d'objet non raffiné\n"

-#: ../netsync.cc:1617
+#: netsync.cc:1639
 #, c-format
 msgid "unknown bye phase %d received"
 msgstr "phase d'adieu %d inconnue reçue"

-#: ../netsync.cc:1632
+#: netsync.cc:1654
 #, c-format
 msgid "Unexpected 'done' command on non-refined item type\n"
 msgstr "Commande « done » inattenue pour type d'objet non raffiné\n"

-#: ../netsync.cc:1712
+#: netsync.cc:1734
 #, c-format
 msgid "epoch with hash '%s' does not exist in our database"
 msgstr ""
 "l'époque avec la somme de contrôle « %s » n'existe pas dans notre base de "
 "données"

-#: ../netsync.cc:1741
+#: netsync.cc:1763
 #, c-format
 msgid "revision '%s' does not exist in our database"
 msgstr "la révision « %s » n'existe pas dans notre base de données"

-#: ../netsync.cc:1755
+#: netsync.cc:1777
 #, c-format
 msgid "file '%s' does not exist in our database"
 msgstr "le fichier « %s » n'existe pas dans notre base de données"

-#: ../netsync.cc:1769
+#: netsync.cc:1791
 #, c-format
 msgid "cert '%s' does not exist in our database"
 msgstr "le certif « %s » n'existe pas dans notre base de données"

-#. It is safe to call 'error' here, because if we get here,
-#. then the current netcmd packet cannot possibly have
-#. written anything to the database.
-#: ../netsync.cc:1821
+#: netsync.cc:1843
 #, c-format
 msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
 msgstr ""
 "Discordance d'époque sur la branche %s. Le serveur a « %s », le client a « %"
 "s »."

-#: ../netsync.cc:1842
+#: netsync.cc:1864
 #, c-format
 msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
 msgstr ""
 "le contrôle de la somme de contrôle échoué pour la clef publique « %s » (%"
 "s); voulais « %s », reçu « %s »"

-#: ../netsync.cc:1859
+#: netsync.cc:1881
 #, c-format
 msgid "hash check failed for revision cert '%s'"
 msgstr ""
 "contrôle de la somme de contrôle échoué pour le certif de révision « %s »"

-#: ../netsync.cc:1934
+#: netsync.cc:1956
 #, c-format
 msgid "Received warning from usher: %s"
 msgstr "Alerte reçu de usher : %s"

-#: ../netsync.cc:2021 ../netsync.cc:2052
+#: netsync.cc:2043 netsync.cc:2074
 msgid "source and sink"
 msgstr "source et puit"

-#: ../netsync.cc:2022 ../netsync.cc:2053
+#: netsync.cc:2044 netsync.cc:2075
 msgid "source"
 msgstr "source"

-#: ../netsync.cc:2022 ../netsync.cc:2053
+#: netsync.cc:2044 netsync.cc:2075
 msgid "sink"
 msgstr "puit"

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

-#: ../netsync.cc:2219 ../netsync.cc:2276
+#: netsync.cc:2241 netsync.cc:2298
 #, c-format
 msgid "protocol error while processing peer %s: '%s'\n"
 msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n"

-#: ../netsync.cc:2225
+#: netsync.cc:2247
 #, c-format
 msgid "error: %s\n"
 msgstr "erreur : %s\n"

-#. FIXME: split into labels and convert to ace here.
-#: ../netsync.cc:2255
+#: netsync.cc:2277
 #, c-format
 msgid "connecting to %s\n"
 msgstr "connexion à %s\n"

-#: ../netsync.cc:2291
+#: netsync.cc:2313
 #, c-format
 msgid "timed out waiting for I/O with peer %s, disconnecting\n"
 msgstr "temps mort en attendant E/S du pair %s, déconnexion\n"

-#: ../netsync.cc:2306
+#: netsync.cc:2328
 #, c-format
 msgid "got OOB data from peer %s, disconnecting\n"
 msgstr "reçu des données hors-bande du pair %s, déconnexion\n"

-#. We failed during processing. This should only happen in
-#. client voice when we have a decode exception, or received an
-#. error from our server (which is translated to a decode
-#. exception). We call these cases E() errors.
-#: ../netsync.cc:2321
+#: netsync.cc:2343
 #, c-format
 msgid "processing failure while talking to peer %s, disconnecting\n"
 msgstr ""

-#: ../netsync.cc:2338
+#: netsync.cc:2360
 #, c-format
 msgid "successful exchange with %s\n"
 msgstr "échange réussi avec %s\n"

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

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

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

-#: ../netsync.cc:2410
+#: netsync.cc:2432
 #, c-format
 msgid "accepted new client connection from %s : %s\n"
 msgstr "nouvelle connexion d'un client acceptée de %s : %s\n"

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

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

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

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

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

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

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

-#: ../netsync.cc:2525
+#: netsync.cc:2547
 #, c-format
 msgid "peer %s processing finished, disconnecting\n"
 msgstr "traitement du pair %s terminé, déconnexion\n"

-#: ../netsync.cc:2547
+#: netsync.cc:2569
 #, c-format
 msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
 msgstr "le fd %d (pair %s) est inactif depuis trop longtemps, déconnexion\n"

-#: ../netsync.cc:2615
+#: netsync.cc:2637
 #, c-format
 msgid "beginning service on %s : %s\n"
 msgstr "début du service sur %s : %s\n"

-#: ../netsync.cc:2616
+#: netsync.cc:2638
 msgid "<all interfaces>"
 msgstr "<toutes les interfaces>"

-#: ../netsync.cc:2630
+#: netsync.cc:2652
 #, c-format
 msgid "session limit %d reached, some connections will be refused\n"
-msgstr ""
+msgstr "limite de sessions %d atteinte, certaines connections seront refusées\n"

-#: ../netsync.cc:2685
+#: netsync.cc:2707
 #, c-format
 msgid "got OOB from peer %s, disconnecting\n"
 msgstr "reçu des données hors-bande du pair %s, déconnexion\n"

-#: ../netsync.cc:2754
+#: netsync.cc:2776
 #, c-format
 msgid "finding items to synchronize:\n"
 msgstr "recherche d'éléments à synchroniser :\n"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:2762
+#: netsync.cc:2784
 msgid "certificates"
 msgstr "certificats"

-#: ../netsync.cc:2871
+#: netsync.cc:2893
 #, c-format
 msgid "Cannot find key '%s'"
 msgstr "Impossible de trouver la clef « %s »"

-#: ../netsync.cc:2911
+#: netsync.cc:2933
 #, c-format
 msgid ""
 "include branch pattern contains a quote character:\n"
@@ -3185,7 +3173,7 @@
 "le motif des branches à inclure contient un caractère de citation :\n"
 "%s\n"

-#: ../netsync.cc:2917
+#: netsync.cc:2939
 #, c-format
 msgid ""
 "exclude branch pattern contains a quote character:\n"
@@ -3194,110 +3182,110 @@
 "le motif des branches à exclure contient un caractère de citation :\n"
 "%s\n"

-#: ../netsync.cc:2940 ../netsync.cc:2944
+#: netsync.cc:2962 netsync.cc:2966
 #, c-format
 msgid "network error: %s"
 msgstr "erreur réseau : %s"

-#: ../packet.cc:94
+#: packet.cc:94
 #, c-format
 msgid "file preimage '%s' missing in db"
 msgstr ""

-#: ../packet.cc:95
+#: packet.cc:95
 #, c-format
 msgid "dropping delta '%s' -> '%s'"
 msgstr "supprime le delta « %s » -> « %s »"

-#: ../packet.cc:109
+#: packet.cc:109
 #, c-format
 msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
 msgstr ""
 "fichier reconstruit du delta « %s » -> « %s » a une identité incorrected « %"
 "s »\n"

-#: ../packet.cc:138
+#: packet.cc:138
 #, c-format
 msgid "missing prerequisite revision '%s'\n"
 msgstr "la révision préalable « %s » manque\n"

-#: ../packet.cc:139 ../packet.cc:150 ../packet.cc:166 ../packet.cc:174
+#: packet.cc:139 packet.cc:150 packet.cc:166 packet.cc:174
 #, c-format
 msgid "dropping revision '%s'\n"
 msgstr "supprime la révision « %s »\n"

-#: ../packet.cc:149
+#: packet.cc:149
 #, c-format
 msgid "missing prerequisite file '%s'\n"
 msgstr "le fichier préalable « %s » manque\n"

-#: ../packet.cc:164
+#: packet.cc:164
 #, c-format
 msgid "missing prerequisite file pre-delta '%s'\n"
 msgstr ""

-#: ../packet.cc:172
+#: packet.cc:172
 #, c-format
 msgid "missing prerequisite file post-delta '%s'\n"
 msgstr ""

-#: ../packet.cc:200
+#: packet.cc:200
 #, c-format
 msgid "cert revision '%s' does not exist in db\n"
 msgstr "la révision de certif « %s » n'existe pas dans la base de données\n"

-#: ../packet.cc:202
+#: packet.cc:202
 #, c-format
 msgid "dropping cert\n"
 msgstr "élimine le certif\n"

-#: ../packet.cc:225
+#: packet.cc:225
 #, c-format
 msgid "key '%s' is not equal to key '%s' in database\n"
 msgstr ""
 "la clef « %s » n'est pas égale à la clef « %s » dans la base de données\n"

-#: ../packet.cc:349
+#: packet.cc:349
 #, c-format
 msgid "malformed packet"
 msgstr "paquet malformé"

-#: ../packet.cc:449
+#: packet.cc:449
 #, c-format
 msgid "unknown packet type: '%s'"
 msgstr "type de paquet inconnu : « %s »"

-#: ../rcs_file.cc:343
+#: rcs_file.cc:343
 #, c-format
 msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n"
 msgstr ""

-#: ../rcs_file.cc:362
+#: rcs_file.cc:362
 #, c-format
 msgid "parse failure %d:%d: expecting word '%s'\n"
 msgstr ""

-#: ../rcs_file.cc:377
+#: rcs_file.cc:377
 #, c-format
 msgid "parse failure %d:%d: expecting word\n"
 msgstr ""

-#: ../rcs_import.cc:703
+#: rcs_import.cc:703
 #, c-format
 msgid "parsing RCS file %s\n"
 msgstr "analyse du fichier RCS %s\n"

-#: ../rcs_import.cc:706
+#: rcs_import.cc:706
 #, c-format
 msgid "parsed RCS file %s OK\n"
 msgstr "analyse du fichier RCS %s OK\n"

-#: ../rcs_import.cc:895
+#: rcs_import.cc:895
 #, c-format
 msgid "error reading RCS file %s: %s\n"
 msgstr "erreur lors de la lecture du fichier RCS %s : %s\n"

-#: ../rcs_import.cc:1192
+#: rcs_import.cc:1192
 #, c-format
 msgid ""
 "%s appears to be a CVS repository root directory\n"
@@ -3307,101 +3295,85 @@
 "essaie d'importer un module à la place, en employent « cvs_import %s/<nomo "
 "module>"

-#: ../rcs_import.cc:1204
+#: rcs_import.cc:1204
 #, c-format
 msgid "need base --branch argument for importing"
 msgstr "il faut un argument --branch come base pour importer"

-#: ../rcs_import.cc:1216
+#: rcs_import.cc:1216
 #, c-format
 msgid "path %s does not exist"
 msgstr "le chemin %s n'existe pas"

-#: ../rcs_import.cc:1251
+#: rcs_import.cc:1251
 msgid "tags"
 msgstr "étiquettes"

-#. This kluge exists because in the 0.24-era monotone databases, several
-#. bad merges still existed in which one side of the merge is an ancestor
-#. of the other side of the merge. In other words, graphs which look like
-#. this:
-#.
-#. a ----------------------> e
-#. \                       /
-#. \---> b -> c -> d ----/
-#.
-#. Such merges confuse the roster-building algorithm, because they should
-#. never have occurred in the first place: a was not a head at the time
-#. of the merge, e should simply have been considered an extension of d.
-#.
-#. So... we drop the a->e edges entirely.
-#.
-#. Note: this kluge drops edges which are a struct superset of those
-#. dropped by a previous kluge ("3-ancestor") so we have removed that
-#. code.
-#: ../revision.cc:700
+#: revision.cc:700
 #, c-format
 msgid "scanning for bogus merge edges\n"
 msgstr "cherche des fusions bogguées\n"

-#: ../revision.cc:742
+#: revision.cc:742
 #, c-format
 msgid "optimizing out redundant edge %d -> %d\n"
 msgstr ""

-#: ../revision.cc:751
+#: revision.cc:751
 #, c-format
 msgid "failed to eliminate edge %d -> %d\n"
 msgstr ""

-#: ../revision.cc:762
+#: revision.cc:762
 #, c-format
 msgid "rebuilding %d nodes\n"
 msgstr "reconstruis %d noeuds\n"

-#: ../revision.cc:967
+#: revision.cc:967
 #, c-format
 msgid "Path %s added to child roster multiple times\n"
 msgstr ""

-#: ../revision.cc:980
+#: revision.cc:980
 #, c-format
 msgid "Directory for path %s cannot be added, as there is a file in the way\n"
 msgstr ""
+"Le dossier pour le chemin %s ne peut pas être ajoutée, car il y a un fichier\n"
+"qui bloque\n"

-#: ../revision.cc:991
+#: revision.cc:991
 #, c-format
 msgid "Path %s cannot be added, as there is a directory in the way\n"
 msgstr "Le chemin %s ne peut être ajouté, un dossier fait obstacle\n"

-#: ../revision.cc:994
+#: revision.cc:994
 #, c-format
 msgid "Path %s added twice with differing content\n"
-msgstr ""
+msgstr "Le chemin %s a été ajouté deux fois avec des contenus différents\n"

-#: ../revision.cc:1264
+#: revision.cc:1264
 #, c-format
 msgid ""
-"unknown attribute %s on path %s\n"
-"please contact %s so we can work out the right way to migrate this"
+"unknown attribute '%s' on path '%s'\n"
+"please contact %s so we can work out the right way to migrate this\n"
+"(if you just want it to go away, see the switch --drop-attr, but\n"
+"seriously, if you'd like to keep it, we're happy to figure out how)"
 msgstr ""
-"attribut %s inconnu pour le chemin %s\n"
-"veuillez contacter %s pour négocier la meilleure façon pour migrer"

-#: ../revision.cc:1373
+#: revision.cc:1375
 #, c-format
 msgid "converting existing revision graph to new roster-style revisions\n"
 msgstr ""
 "convertis graphe de révisions présent à des nouvelles révision en style "
 "liste\n"

-#: ../revision.cc:1427
+#: revision.cc:1429
 #, c-format
 msgid "rebuilding revision graph from manifest certs\n"
 msgstr ""
 "reconstruit le graphe des révisions à partir des certifs de manifeste\n"

-#: ../revision.cc:1530
+#: revision.cc:1532
 #, c-format
 msgid ""
 "encountered a revision with unknown format, version '%s'\n"
@@ -3412,166 +3384,148 @@
 "je ne comprend que le format version « 1 »\n"
 "il faut une version monotone plus nouvelle pour complèter cette opération"

-#: ../sanity.cc:116
+#: sanity.cc:116
 #, c-format
 msgid "fatal: formatter failed on %s:%d: %s"
 msgstr "fatal : le formatteur a échoué à %s:%d : %s"

-#: ../sanity.cc:190
+#: sanity.cc:190
 msgid "misuse: "
 msgstr "mauvais usage : "

-#: ../sanity.cc:202
+#: sanity.cc:202
 msgid "error: "
 msgstr "erreur :"

-#: ../sanity.cc:210
+#: sanity.cc:210
 #, c-format
 msgid "%s:%d: invariant '%s' violated"
 msgstr ""

-#: ../sanity.cc:223
+#: sanity.cc:223
 #, c-format
 msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
 msgstr ""

-#: ../sanity.cc:244
+#: sanity.cc:244
 #, c-format
 msgid "Current work set: %i items\n"
 msgstr "Ensemble de travail actuel: %i objets\n"

-#: ../schema_migration.cc:181
+#: schema_migration.cc:228
 #, c-format
-msgid "failure extracting schema from sqlite_master"
-msgstr "extraction de schéma de sqlite_master échoué"
-
-#: ../schema_migration.cc:217
-#, c-format
 msgid "calculating necessary migration steps"
 msgstr "calcule les étapes à passer pour migrer"

-#: ../schema_migration.cc:227
+#: schema_migration.cc:238
 #, c-format
 msgid "error at transaction BEGIN statement"
 msgstr ""

-#: ../schema_migration.cc:228
+#: schema_migration.cc:239
 #, c-format
 msgid "migrating data"
 msgstr "migration des données"

-#: ../schema_migration.cc:254
+#: schema_migration.cc:265
 #, c-format
 msgid "migration step failed: %s"
 msgstr "l'étape de migration a échoué : %s"

-#: ../schema_migration.cc:268
+#: schema_migration.cc:279
 #, c-format
 msgid "mismatched result of migration, got %s, wanted %s"
 msgstr "discordance de résultats de la migration, reçu %s, voulais %s"

-#: ../schema_migration.cc:271
+#: schema_migration.cc:282
 #, c-format
 msgid "committing changes to database"
 msgstr "confie les changements à la base de données"

-#: ../schema_migration.cc:273
+#: schema_migration.cc:284
 #, c-format
 msgid "failure on COMMIT"
 msgstr "COMMIT échoué"

-#: ../schema_migration.cc:275
+#: schema_migration.cc:286
 #, c-format
 msgid "optimizing database"
 msgstr "optimisation de la base de données"

-#: ../schema_migration.cc:277
+#: schema_migration.cc:288
 #, c-format
 msgid "error vacuuming after migration"
 msgstr ""

-#: ../schema_migration.cc:280
+#: schema_migration.cc:291
 #, c-format
 msgid "error running analyze after migration"
 msgstr "erreur en analysant après la migration"

-#: ../schema_migration.cc:287
+#: schema_migration.cc:298
 #, c-format
 msgid "database schema %s is unknown; cannot perform migration"
 msgstr ""
 "le schéma de la base de données %s est inconnu; impossible d'effectuer la "
 "migration"

-#. We really want 'db migrate' on an up-to-date schema to be a no-op
-#. (no vacuum or anything, even), so that automated scripts can fire
-#. one off optimistically and not have to worry about getting their
-#. administrators to do it by hand.
-#: ../schema_migration.cc:292
+#: schema_migration.cc:303
 #, c-format
 msgid "no migration performed; database schema already up-to-date at %s\n"
 msgstr ""
 "aucune migration n'a été effectuée; le schéma de la base de données est déjà "
 "à jour en %s\n"

-#: ../schema_migration.cc:842
+#: schema_migration.cc:853
 #, c-format
 msgid "public and private keys for %s don't match"
 msgstr "la clef publique ou privée « %s » ne correspondent pas l'une a l'autre"

-#: ../schema_migration.cc:845
+#: schema_migration.cc:856
 #, c-format
 msgid "moving key '%s' from database to %s"
 msgstr "déplace la clef « %s » de la base de données à %s"

-#: ../std_hooks.lua:28
+#: std_hooks.lua:28
 msgid "Press enter when the subprocess has completed"
 msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé"

-#: ../transforms.cc:510
+#: transforms.cc:510
 #, c-format
 msgid "failed to convert string from %s to %s: '%s'"
 msgstr "impossible de convertir la chaîne de %s en %s : « %s »"

-#: ../transforms.cc:741 ../transforms.cc:755
+#: transforms.cc:741 transforms.cc:755
 #, c-format
 msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
 msgstr "conversion de %d octets d'UTF-8 en IDNA ACE: %s"

-#. xgettext: gibibytes (2^30 bytes)
-#: ../ui.cc:108
+#: ui.cc:108
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Gi"

-#. xgettext: mebibytes (2^20 bytes)
-#: ../ui.cc:114
+#: ui.cc:114
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f Mi"

-#. xgettext: kibibytes (2^10 bytes)
-#: ../ui.cc:120
+#: ui.cc:120
 #, c-format
 msgid "%.1f k"
 msgstr "%.1f Ki"

-#. We know that we're going to eventually have 'total' displayed
-#. twice on screen, plus a slash. So we should pad out this field
-#. to that eventual size to avoid spurious re-issuing of the
-#. tick titles as we expand to the goal.
-#. xgettext: bytes
-#: ../ui.cc:137 ../ui.cc:139
+#: ui.cc:137 ui.cc:139
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"

-#. xgettext: bytes
-#: ../ui.cc:146
+#: ui.cc:146
 #, c-format
 msgid "%d"
 msgstr "%d"

-#: ../ui.cc:369
+#: ui.cc:369
 #, c-format
 msgid ""
 "fatal: %s\n"
@@ -3584,216 +3538,233 @@
 "veuillez envoyer un ce message, ce que « monotone --full-version » affiche\n"
 "et une description de ce que vous vouliez faire à %s.\n"

-#: ../ui.cc:422
+#: ui.cc:422
 msgid "monotone: "
 msgstr "monotone: "

-#: ../update.cc:65
+#: update.cc:65
 #, c-format
 msgid "failed to decode boolean testresult cert value '%s'\n"
 msgstr ""
 "ne pouvais pas décoder la valeur booléenne « %s » du certif testresult\n"

-#: ../update.cc:159
+#: update.cc:159
 #, c-format
 msgid "cannot determine branch for update"
 msgstr "impossible de déterminer la branche pour la mise à jour"

-#: ../vocab.cc:68
+#: vocab.cc:68
 #, c-format
 msgid "hex encoded ID '%s' size != %d"
 msgstr ""

-#: ../vocab.cc:72
+#: vocab.cc:72
 #, c-format
 msgid "bad character '%c' in id name '%s'"
 msgstr "caractère invalide « %c » dans le nom de l'id « %s »"

-#: ../vocab.cc:85
+#: vocab.cc:85
 #, c-format
 msgid "bad character '%c' in ace string '%s'"
 msgstr "caractère invalude « %c » dans la chaîne ace « %s »"

-#: ../vocab.cc:99
+#: vocab.cc:99
 #, c-format
 msgid "bad character '%c' in cert name '%s'"
 msgstr "caractère invalide « %c » dans le nom du certif « %s »"

-#: ../vocab.cc:112
+#: vocab.cc:112
 #, c-format
 msgid "bad character '%c' in key name '%s'"
 msgstr "caractère invalide « %c » dans le nom de la clef « %s »"

-#: ../vocab.cc:130
+#: vocab.cc:130
 #, c-format
 msgid "Invalid key length of %d bytes"
 msgstr "Longueur de clef invalide de %d octets"

-#: ../vocab.cc:148
+#: vocab.cc:148
 #, c-format
 msgid "Invalid hmac length of %d bytes"
 msgstr "Longueur hmac invalide de %d octets"

-#: ../work.cc:118
+#: work.cc:118
 #, c-format
 msgid "skipping ignorable file %s"
 msgstr "omission du fichier %s qui peut être ignoré"

-#: ../work.cc:127
+#: work.cc:127
 #, c-format
 msgid "skipping %s, already accounted for in workspace"
 msgstr "omission de %s qui existe déjà dans l'espace de travail"

-#: ../work.cc:131
+#: work.cc:131
 #, c-format
 msgid "adding %s to workspace manifest"
 msgstr "ajouter %s au manifeste de l'espace de travail"

-#: ../work.cc:221
+#: work.cc:221
 #, c-format
 msgid "skipping %s, not currently tracked"
 msgstr ""

-#: ../work.cc:231
+#: work.cc:231
 #, c-format
 msgid "cannot remove %s/, it is not empty"
 msgstr "impossible de supprimer %s/, il n'est pas vide"

-#: ../work.cc:242
+#: work.cc:242
 #, c-format
 msgid "dropping %s from workspace manifest"
 msgstr "supprimer %s du manifeste de l'espace de travail"

-#: ../work.cc:305
+#: work.cc:305
 #, c-format
 msgid "destination dir %s/ does not exist in current revision"
 msgstr "le dossier de destination %s/ n'existe pas dans la révision actuelle"

-#: ../work.cc:308
+#: work.cc:308
 #, c-format
 msgid "destination %s is an existing file in current revision"
 msgstr "la destination %s est un fichier qui existe dans la révision actuelle"

-#: ../work.cc:318
+#: work.cc:318
 #, c-format
 msgid "empty path %s is not allowed"
 msgstr "le chemin vide %s n'est pas permit"

-#: ../work.cc:332
+#: work.cc:332
 #, c-format
 msgid "%s does not exist in current revision"
 msgstr "%s n'existe pas dans la révision actuelle"

-#: ../work.cc:335
+#: work.cc:335
 #, c-format
 msgid "destination %s already exists in current revision"
 msgstr "la destination %s existe déjà dans la révision actuelle"

-#: ../work.cc:344
+#: work.cc:344
 #, c-format
 msgid "renaming %s to %s in workspace manifest"
 msgstr "renomme %s à %s dans le manifeste de l'espace de travail"

-#: ../work.cc:369
+#: work.cc:369
 #, c-format
 msgid "%s doesn't exist in workspace, skipping"
 msgstr "omission de %s qui n'existe pas dans la copie de travail"

-#: ../work.cc:373
+#: work.cc:373
 #, c-format
 msgid "destination %s already exists in workspace, skipping"
 msgstr "omission de %s qui existe déjà dans la copie de travail"

-#: ../work.cc:400
+#: work.cc:400
 #, c-format
 msgid "proposed new root directory '%s' is not versioned or does not exist"
 msgstr ""

-#: ../work.cc:402
+#: work.cc:402
 #, c-format
 msgid "proposed new root directory '%s' is not a directory"
 msgstr "la nouvelle racine proposé « %s » n'est pas un dossier"

-#: ../work.cc:407
+#: work.cc:407
 #, c-format
 msgid "proposed new root directory '%s' contains illegal path %s"
 msgstr "la nouvelle racine proposé « %s » contient le chemin illégal %s"

-#: ../work.cc:417
+#: work.cc:417
 #, c-format
 msgid "directory '%s' is not versioned or does not exist"
 msgstr "le dossier « %s » n'est pas versioné ou n'existe pas"

-#: ../work.cc:423
+#: work.cc:423
 #, c-format
 msgid "'%s' is in the way"
 msgstr "« %s » fait obstacle"

-#: ../work.cc:520
+#: work.cc:520
 #, c-format
 msgid "workspace is corrupt: %s does not exist"
 msgstr "l'espace de travail est corrompu : %s n'existe pas"

-#: ../work.cc:521
+#: work.cc:521
 #, c-format
 msgid "workspace is corrupt: %s is a directory"
 msgstr "l'espace de travail est corrompue : %s est un dossier"

-#: ../work.cc:531
+#: work.cc:531
 #, c-format
 msgid "Problem with workspace: %s is unreadable"
 msgstr "Problème avec l'espace de travail: %s n'est pas lisible"

-#: ../work.cc:557
+#: work.cc:557
 #, c-format
 msgid "base revision %s does not exist in database\n"
 msgstr "la révision de base %s n'existe pas dans la base de données\n"

-#: ../work.cc:894
+#: work.cc:894
 #, c-format
 msgid "dropping %s"
 msgstr "supprime %s"

-#: ../work.cc:905 ../work.cc:916
+#: work.cc:905 work.cc:916
 #, c-format
 msgid "path %s already exists"
 msgstr "le chemin %s existe déjà"

-#: ../work.cc:938 ../work.cc:965
+#: work.cc:938 work.cc:965
 #, fuzzy, c-format
 msgid "adding %s"
 msgstr "ajout de « %s »"

-#: ../work.cc:954
+#: work.cc:954
 #, c-format
 msgid "path '%s' already exists, cannot create"
 msgstr "le chemin « %s » existe déjà, ne peux pas le créer"

-#: ../work.cc:961
+#: work.cc:961
 #, fuzzy, c-format
 msgid "renaming %s to %s"
 msgstr "renommage de « %s » en « %s »"

-#: ../work.cc:996
+#: work.cc:996
 #, c-format
 msgid "file '%s' does not exist"
 msgstr "le fichier « %s » n'existe pas"

-#: ../work.cc:997
+#: work.cc:997
 #, c-format
 msgid "file '%s' is a directory"
 msgstr "le fichier « %s » est un dossier"

-#: ../work.cc:1002
+#: work.cc:1002
 #, c-format
 msgid "content of file '%s' has changed, not overwriting"
 msgstr "le contenu du fichier « %s » a changé, il ne sera pas écrasé"

-#: ../work.cc:1003
+#: work.cc:1003
 #, c-format
 msgid "updating %s to %s"
 msgstr "mise à jour de %s en %s"

+#~ msgid ""
+#~ "sqlite error: %d: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "erreur sqlite : %d : %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "unknown attribute %s on path %s\n"
+#~ "please contact %s so we can work out the right way to migrate this"
+#~ msgstr ""
+#~ "attribut %s inconnu pour le chemin %s\n"
+#~ "veuillez contacter %s pour négocier la meilleure façon pour migrer"
+
+#~ msgid "failure extracting schema from sqlite_master"
+#~ msgstr "extraction de schéma de sqlite_master échoué"
+
 #~ msgid "OLDID NEWID"
 #~ msgstr "ANCIENID NOUVELID"

@@ -4250,12 +4221,5 @@
 #~ msgid "Running on: %s"
 #~ msgstr "Fonctionne sur : %s"

-#~ msgid ""
-#~ "sqlite error: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "erreur sqlite : %s\n"
-#~ "%s"
-
 #~ msgid "network error: %s\n"
 #~ msgstr "erreur réseau : %s\n"
============================================================
--- po/sv.po	827661f47302ef571540784a549fed767d853cd7
+++ po/sv.po	26eccddd5aeaee1260d1ab6f77c9aa5cd9daa38f
@@ -145,8 +145,8 @@
 msgstr ""
 "Project-Id-Version: monotone 0.26pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-16 05:56+0100\n"
-"PO-Revision-Date: 2006-03-16 05:56+0100\n"
+"POT-Creation-Date: 2006-03-24 13:27+0100\n"
+"PO-Revision-Date: 2006-03-24 13:48+0100\n"
 "Last-Translator: Joel Rosdahl <address@hidden>\n"
 "Language-Team: Richard Levitte <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -284,40 +284,40 @@
 "multiple branch certs found for revision %s, please provide a branch name"
 msgstr "flera grencert funna för revision %s, var god ange en gren"

-#: commands.cc:163
+#: commands.cc:164
 #, c-format
 msgid "command '%s' has multiple ambiguous expansions:\n"
 msgstr "kommandot '%s' har mer än en betydelse:\n"

-#: commands.cc:206
+#: commands.cc:207
 msgid "commands:"
 msgstr "kommandon:"

-#: commands.cc:263
+#: commands.cc:264
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "okänt kommando '%s'\n"

-#: commands.cc:323
+#: commands.cc:324
 #, c-format
 msgid "pid file '%s' already exists"
 msgstr "pid-filen '%s' finns redan"

-#: commands.cc:347 commands.cc:1356 commands.cc:1426 commands.cc:1862
-#: commands.cc:2708 commands.cc:3329 commands.cc:3564 commands.cc:3603
-#: commands.cc:3948
+#: commands.cc:348 commands.cc:1357 commands.cc:1427 commands.cc:1863
+#: commands.cc:2709 commands.cc:3361 commands.cc:3596 commands.cc:3635
+#: commands.cc:3980
 msgid "informative"
 msgstr "informativ"

-#: commands.cc:347
+#: commands.cc:348
 msgid "command [ARGS...]"
 msgstr "kommandon [ARGUMENT...]"

-#: commands.cc:347
+#: commands.cc:348
 msgid "display command help"
 msgstr "skriv ut hjälptext"

-#: commands.cc:426
+#: commands.cc:427
 msgid ""
 "Enter a description of this change.\n"
 "Lines beginning with `MT:' are removed automatically.\n"
@@ -325,16 +325,16 @@
 "Mata in en beskrivning av denna ändring.\n"
 "Rader som börjar med 'MT:' kommer att tas bort automatiskt.\n"

-#: commands.cc:433
+#: commands.cc:434
 #, c-format
 msgid "edit of log message failed"
 msgstr "redigering av loggmeddelandet misslyckades"

-#: commands.cc:442
+#: commands.cc:443
 msgid "note: "
 msgstr "obs: "

-#: commands.cc:443
+#: commands.cc:444
 #, c-format
 msgid ""
 "branch '%s' has multiple heads\n"
@@ -343,59 +343,59 @@
 "grenen '%s' har mer än ett löv\n"
 "du kanske borde överväga '%s merge'"

-#: commands.cc:504 commands.cc:780 commands.cc:1444 commands.cc:1528
-#: commands.cc:2758 commands.cc:2786 commands.cc:2789 commands.cc:2925
-#: commands.cc:3586
+#: commands.cc:505 commands.cc:781 commands.cc:1445 commands.cc:1529
+#: commands.cc:2759 commands.cc:2787 commands.cc:2790 commands.cc:2926
+#: commands.cc:3618
 #, c-format
 msgid "no such revision '%s'"
 msgstr "det finns ingen revision med identiteten '%s'"

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

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

-#: commands.cc:525
+#: commands.cc:526
 #, c-format
 msgid "expanded to '%s'\n"
 msgstr "expanderar till '%s'\n"

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

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

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

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

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

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

-#: commands.cc:616
+#: commands.cc:617
 #, c-format
 msgid ""
 "Key   : %s\n"
@@ -408,87 +408,87 @@
 "Namn     : %s\n"
 "Värde    : %s\n"

-#: commands.cc:650
+#: commands.cc:651
 msgid "ok"
 msgstr "ok"

-#: commands.cc:653
+#: commands.cc:654
 msgid "bad"
 msgstr "felaktig"

-#: commands.cc:656
+#: commands.cc:657
 msgid "unknown"
 msgstr "okänd"

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

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

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

-#: commands.cc:786
+#: commands.cc:787
 #, 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:926 commands.cc:950 commands.cc:987 commands.cc:1008
-#: commands.cc:1044
+#: commands.cc:927 commands.cc:951 commands.cc:988 commands.cc:1009
+#: commands.cc:1045
 msgid "key and cert"
 msgstr "nyckel och cert"

-#: commands.cc:926 commands.cc:950 commands.cc:987
+#: commands.cc:927 commands.cc:951 commands.cc:988
 msgid "KEYID"
 msgstr "NYCKELID"

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

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

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

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

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

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

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

-#: commands.cc:981
+#: commands.cc:982
 #, 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:983
+#: commands.cc:984
 #, c-format
 msgid ""
 "public or private key '%s' does not exist in keystore, and no database was "
@@ -497,33 +497,33 @@
 "den publika eller privata nyckeln '%s' finns inte i nyckellager och ingen "
 "databas angavs"

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

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

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

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

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

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

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

-#: commands.cc:1078
+#: commands.cc:1079
 #, c-format
 msgid ""
 "if a cert on: %s\n"
@@ -546,99 +546,99 @@
 "signerades av: %s\n"
 "skulle det vara: %s\n"

-#: commands.cc:1087
+#: commands.cc:1088
 msgid "trusted"
 msgstr "pålitligt"

-#: commands.cc:1087
+#: commands.cc:1088
 msgid "UNtrusted"
 msgstr "Opålitligt"

-#: commands.cc:1090 commands.cc:1103 commands.cc:1116 commands.cc:1133
-#: commands.cc:1184
+#: commands.cc:1091 commands.cc:1104 commands.cc:1117 commands.cc:1134
+#: commands.cc:1185
 msgid "review"
 msgstr "granskning"

-#: commands.cc:1090
+#: commands.cc:1091
 msgid "REVISION TAGNAME"
 msgstr "REVISION TAGNAMN"

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

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

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

-#: commands.cc:1116 commands.cc:1133
+#: commands.cc:1117 commands.cc:1134
 msgid "REVISION"
 msgstr "REVISION"

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

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

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

-#: commands.cc:1147
+#: commands.cc:1148
 #, 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:1151
+#: commands.cc:1152
 #, c-format
 msgid "need --branch argument for disapproval"
 msgstr "för underkännande behöver en gren anges med --branch"

-#: commands.cc:1184
+#: commands.cc:1185
 msgid "REVISION [COMMENT]"
 msgstr "REVISION [KOMMENTAR]"

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

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

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

-#: commands.cc:1211 commands.cc:1240 commands.cc:1265 commands.cc:1290
-#: commands.cc:2209 commands.cc:2327 commands.cc:2861 commands.cc:3377
+#: commands.cc:1212 commands.cc:1241 commands.cc:1266 commands.cc:1291
+#: commands.cc:2210 commands.cc:2328 commands.cc:2862 commands.cc:3409
 msgid "workspace"
 msgstr "arbetskopia"

-#: commands.cc:1211 commands.cc:1240 commands.cc:1356 commands.cc:2327
-#: commands.cc:2708 commands.cc:3377
+#: commands.cc:1212 commands.cc:1241 commands.cc:1357 commands.cc:2328
+#: commands.cc:2709 commands.cc:3409
 msgid "[PATH]..."
 msgstr "[SÖKVÄG]..."

-#: commands.cc:1212
+#: commands.cc:1213
 msgid "add files to workspace"
 msgstr "lägg till filer i arbetskopian"

-#: commands.cc:1241
+#: commands.cc:1242
 msgid "drop files from workspace"
 msgstr "överge filer i arbetskopian"

-#: commands.cc:1266
+#: commands.cc:1267
 msgid ""
 "SRC DEST\n"
 "SRC1 [SRC2 [...]] DEST_DIR"
@@ -646,15 +646,15 @@
 "KÄLLA MÅL\n"
 "KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG"

-#: commands.cc:1268
+#: commands.cc:1269
 msgid "rename entries in the workspace"
 msgstr "byt namn på filer i arbetskopian"

-#: commands.cc:1290
+#: commands.cc:1291
 msgid "NEW_ROOT PUT_OLD"
 msgstr "NY_ROT PLACERA_GAMLA"

-#: commands.cc:1291
+#: commands.cc:1292
 msgid ""
 "rename the root directory\n"
 "after this command, the directory that currently has the name NEW_ROOT\n"
@@ -668,78 +668,78 @@
 "PLACERA_GAMLA.\n"
 "Det rekommenderas varmt att använda --execute."

-#: commands.cc:1310 commands.cc:1323 commands.cc:1403 commands.cc:3484
-#: commands.cc:3929
+#: commands.cc:1311 commands.cc:1324 commands.cc:1404 commands.cc:3516
+#: commands.cc:3961
 msgid "debug"
 msgstr "felsökning"

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

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

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

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

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

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

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

-#: commands.cc:1356
+#: commands.cc:1357
 msgid "show status of workspace"
 msgstr "visa arbetskopians status"

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

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

-#: commands.cc:1427
+#: commands.cc:1428
 msgid "FILENAME"
 msgstr "FILNAMN"

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

-#: commands.cc:1456 commands.cc:1458 commands.cc:3595
+#: commands.cc:1457 commands.cc:1459 commands.cc:3627
 #, c-format
 msgid "no file '%s' found in revision '%s'\n"
 msgstr "filen '%s' finns inte i revisionen '%s'\n"

-#: commands.cc:1470 commands.cc:1599 commands.cc:3062 commands.cc:3115
-#: commands.cc:3126 commands.cc:3276 commands.cc:3284 commands.cc:3838
+#: commands.cc:1471 commands.cc:1600 commands.cc:3094 commands.cc:3147
+#: commands.cc:3158 commands.cc:3308 commands.cc:3316 commands.cc:3870
 msgid "tree"
 msgstr "träd"

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

-#: commands.cc:1471
+#: commands.cc:1472
 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"
@@ -751,76 +751,76 @@
 "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:1490 commands.cc:1509
+#: commands.cc:1491 commands.cc:1510
 #, 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:1503
+#: commands.cc:1504
 #, c-format
 msgid "checkout directory '%s' already exists"
 msgstr "arbetskatalogen '%s' finns redan"

-#: commands.cc:1512
+#: commands.cc:1513
 #, c-format
 msgid "branch '%s' is empty"
 msgstr "grenen '%s' är tom"

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

-#: commands.cc:1518
+#: commands.cc:1519
 #, c-format
 msgid "choose one with '%s checkout -r<id>'"
 msgstr "välj en med '%s update -r<id>'"

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

-#: commands.cc:1546
+#: commands.cc:1547
 #, 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:1580
+#: commands.cc:1581
 #, c-format
 msgid "no file %s found in database for %s"
 msgstr "det finns ingen fil %s för %s i databasen"

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

-#: commands.cc:1607 commands.cc:3071
+#: commands.cc:1608 commands.cc:3103
 #, c-format
 msgid "please specify a branch, with --branch=BRANCH"
 msgstr "var god ange en gren med --branch=GREN"

-#: commands.cc:1612 commands.cc:3075 commands.cc:3164 commands.cc:3167
+#: commands.cc:1613 commands.cc:3107 commands.cc:3196 commands.cc:3199
 #, c-format
 msgid "branch '%s' is empty\n"
 msgstr "grenen '%s' är tom\n"

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

-#: commands.cc:1616
+#: commands.cc:1617
 #, 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:1655
+#: commands.cc:1656
 #, c-format
 msgid "no epoch for branch %s\n"
 msgstr "ingen epok i grenen %s\n"

-#: commands.cc:1863
+#: commands.cc:1864
 msgid ""
 "certs ID\n"
 "keys [PATTERN]\n"
@@ -846,7 +846,7 @@
 "missing\n"
 "changed"

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

-#: commands.cc:1912 commands.cc:1940 commands.cc:1958
+#: commands.cc:1913 commands.cc:1941 commands.cc:1959
 msgid "packet i/o"
 msgstr "paket-I/O"

-#: commands.cc:1912 commands.cc:1940
+#: commands.cc:1913 commands.cc:1941
 msgid "ID"
 msgstr "ID"

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

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

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

-#: commands.cc:1948
+#: commands.cc:1949
 #, 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:1959
+#: commands.cc:1960
 msgid "read packets from files or stdin"
 msgstr "läs paket från filer eller stdin"

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

-#: commands.cc:1978
+#: commands.cc:1979
 #, 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:1982
+#: commands.cc:1983
 #, 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:2011
+#: commands.cc:2012
 #, c-format
 msgid "setting default server to %s\n"
 msgstr "sätter standardserver till %s\n"

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

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

-#: commands.cc:2037
+#: commands.cc:2038
 #, 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:2043
+#: commands.cc:2044
 #, 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:2049
+#: commands.cc:2050
 #, c-format
 msgid "no branch pattern given"
 msgstr "inget grenmönster angivet"

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

-#: commands.cc:2067 commands.cc:2082 commands.cc:2096 commands.cc:2111
+#: commands.cc:2068 commands.cc:2083 commands.cc:2097 commands.cc:2112
 msgid "network"
 msgstr "nätverk"

-#: commands.cc:2067 commands.cc:2082 commands.cc:2096
+#: commands.cc:2068 commands.cc:2083 commands.cc:2097
 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
 msgstr "[ADRESS[:PORTNUMMER] [MÖNSTER]]"

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

-#: commands.cc:2083
+#: commands.cc:2084
 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:2090
+#: commands.cc:2091
 #, 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:2097
+#: commands.cc:2098
 msgid "sync branches matching PATTERN with netsync server at ADDRESS"
 msgstr "synkronisera grenar som matchar MÖNSTER till netsync-server på ADRESS"

-#: commands.cc:2111
+#: commands.cc:2112
 msgid "PATTERN ..."
 msgstr "MÖNSTER ..."

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

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

-#: commands.cc:2137
+#: commands.cc:2138
 msgid "database"
 msgstr "databas"

-#: commands.cc:2138
+#: commands.cc:2139
 msgid ""
 "init\n"
 "info\n"
@@ -1015,16 +1015,16 @@
 "rosterify\n"
 "set_epoch GREN EPOK\n"

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

-#: commands.cc:2199
+#: commands.cc:2200
 #, c-format
 msgid "The epoch must be %s characters"
 msgstr "Epoken måste innehålla %s tecken"

-#: commands.cc:2209
+#: commands.cc:2210
 msgid ""
 "set PATH ATTR VALUE\n"
 "get PATH [ATTR]\n"
@@ -1034,40 +1034,40 @@
 "get SÖKVÄG [ATTR]\n"
 "drop SÖKVÄG [ATTR]"

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

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

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

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

-#: commands.cc:2328
+#: commands.cc:2329
 msgid "commit workspace to database"
 msgstr "arkivera arbetskopian i databasen"

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

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

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

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

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

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

-#: commands.cc:2446 commands.cc:2463 commands.cc:2482
+#: commands.cc:2447 commands.cc:2464 commands.cc:2483
 #, c-format
 msgid "file '%s' modified during commit, aborting"
 msgstr "filen '%s' ändrades under arkivering, avbryter"

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

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

-#: commands.cc:2709
+#: commands.cc:2710
 msgid ""
 "show current diffs on stdout.\n"
 "If one revision is given, the diff between the workspace and\n"
@@ -1124,7 +1124,7 @@
 "revisionen. Om två revisioner anges visas skillnaden mellan dem. Om\n"
 "inget format anges används unified."

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

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

-#: commands.cc:2830
+#: commands.cc:2831
 msgid "no changes"
 msgstr "inga ändringar"

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

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

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

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

-#: commands.cc:2916
+#: commands.cc:2917
 #, c-format
 msgid "choose one with '%s update -r<id>'"
 msgstr "välj en med '%s update -r<id>'"

-#: commands.cc:2917
+#: commands.cc:2918
 #, c-format
 msgid "multiple update candidates remain after selection"
 msgstr "mer än en kandidat är kvar efter urval"

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

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

-#: commands.cc:2952
+#: commands.cc:2971
 #, c-format
 msgid ""
-"revision %s is not a member of branch %s\n"
-"try again with explicit --branch\n"
+"revision %s is a member of multiple branches:\n"
+"%s\n"
+"\n"
+"try again with explicit --branch"
 msgstr ""
-"revisionen %s är inte i grenen %s\n"
-"försök igen med en explicit --branch\n"
+"revisionen %s är med i multiplagrenar:\n"
+"%s\n"
+"\n"
+"försök igen med en explicit --branch"

-#: commands.cc:3052
+#: commands.cc:2977
 #, c-format
+msgid ""
+"revision %s is a member of\n"
+"%s, updating workspace branch"
+msgstr ""
+"revisionen %s är med i grenen\n"
+"%s, uppdaterar arbetskopians grenangivelse"
+
+#: commands.cc:2983
+#, c-format
+msgid ""
+"revision %s is a member of no branches,\n"
+"using branch %s for workspace"
+msgstr ""
+"revisionen %s är inte med i någon gren,\n"
+"använder grenen %s till arbetskopian"
+
+#: commands.cc:3084
+#, c-format
 msgid "updated to base revision %s\n"
 msgstr "uppdaterad till revisionen %s\n"

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

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

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

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

-#: commands.cc:3091 commands.cc:3092 commands.cc:3174 commands.cc:3307
-#: commands.cc:3308
+#: commands.cc:3123 commands.cc:3124 commands.cc:3206 commands.cc:3339
+#: commands.cc:3340
 #, c-format
 msgid "[source] %s\n"
 msgstr "[källa]      %s\n"

-#: commands.cc:3109 commands.cc:3272 commands.cc:3326
+#: commands.cc:3141 commands.cc:3304 commands.cc:3358
 #, c-format
 msgid "[merged] %s\n"
 msgstr "[ihopslagen] %s\n"

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

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

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

-#: commands.cc:3126
+#: commands.cc:3158
 msgid "SOURCE-BRANCH DEST-BRANCH DIR"
 msgstr "KÄLLGREN MÅLGREN KATALOG"

-#: commands.cc:3127
+#: commands.cc:3159
 msgid "merge one branch into a subdirectory in another branch"
 msgstr "slå ihop en gren till en underkatalog i en annan gren"

-#: commands.cc:3165 commands.cc:3168
+#: commands.cc:3197 commands.cc:3200
 #, c-format
 msgid "branch '%s' is not merged\n"
 msgstr "löven i grenen '%s' är inte ihopslagna\n"

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

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

-#: commands.cc:3180
+#: commands.cc:3212
 #, 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:3182
+#: commands.cc:3214
 #, c-format
 msgid "no action taken\n"
 msgstr "inget utfördes\n"

-#: commands.cc:3186
+#: commands.cc:3218
 #, 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:3222
+#: commands.cc:3254
 #, c-format
 msgid "Path %s not found in destination tree."
 msgstr "Sökvägen %s finns inte i målträdet."

-#: commands.cc:3276
+#: commands.cc:3308
 msgid "refresh the inodeprint cache"
 msgstr "uppdatera inodeprint-cachen"

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

-#: commands.cc:3286
+#: commands.cc:3318
 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:3300
+#: commands.cc:3332
 #, c-format
 msgid "%s and %s are the same revision, aborting"
 msgstr "%s och %s är samma revision, avbryter"

-#: commands.cc:3302 commands.cc:3304
+#: commands.cc:3334 commands.cc:3336
 #, c-format
 msgid "%s is already an ancestor of %s"
 msgstr "%s är redan förfader till %s"

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

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

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

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

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

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

-#: commands.cc:3472
+#: commands.cc:3504
 #, c-format
 msgid "recreating %s/"
 msgstr "återställer %s/"

-#: commands.cc:3484
+#: commands.cc:3516
 msgid "RCSFILE..."
 msgstr "RCSFIL..."

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

-#: commands.cc:3501
+#: commands.cc:3533
 msgid "rcs"
 msgstr "rcs"

-#: commands.cc:3501
+#: commands.cc:3533
 msgid "CVSROOT"
 msgstr "CVSROOT"

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

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

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

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

-#: commands.cc:3603
+#: commands.cc:3635
 msgid "[FILE] ..."
 msgstr "[FIL] ..."

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

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

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

-#: commands.cc:3838
+#: commands.cc:3870
 msgid "[DIRECTORY]"
 msgstr "[KATALOG]"

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

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

-#: commands.cc:3858
+#: commands.cc:3890
 msgid "automation"
 msgstr "automatisering"

-#: commands.cc:3859
+#: commands.cc:3891
 msgid ""
 "interface_version\n"
 "heads [BRANCH]\n"
@@ -1483,84 +1505,84 @@
 "packet_for_fdelta GAMMAL_FIL NY_FIL\n"
 "keys\n"

-#: commands.cc:3883
+#: commands.cc:3915
 msgid "automation interface"
 msgstr "automatiseringsgränssnitt"

-#: commands.cc:3897 commands.cc:3913
+#: commands.cc:3929 commands.cc:3945
 msgid "vars"
 msgstr "variabler"

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

-#: commands.cc:3898
+#: commands.cc:3930
 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:3913
+#: commands.cc:3945
 msgid "DOMAIN NAME"
 msgstr "DOMÄN NAMN"

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

-#: commands.cc:3925
+#: commands.cc:3957
 #, 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:3929
+#: commands.cc:3961
 msgid "REVID"
 msgstr "REVID"

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

-#: commands.cc:3948
+#: commands.cc:3980
 msgid "REV REV"
 msgstr "REV REV"

-#: commands.cc:3948
+#: commands.cc:3980
 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:3957 commands.cc:3959
+#: commands.cc:3989 commands.cc:3991
 #, 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:3973
+#: commands.cc:4005
 #, c-format
 msgid "There are %s node_name_conflicts."
 msgstr "Det finns %s node_name-konflikter."

-#: commands.cc:3974
+#: commands.cc:4006
 #, c-format
 msgid "There are %s file_content_conflicts."
 msgstr "Det finns %s file_content-konflikter."

-#: commands.cc:3975
+#: commands.cc:4007
 #, c-format
 msgid "There are %s node_attr_conflicts."
 msgstr "Det finns %s node_attr-konflikter."

-#: commands.cc:3976
+#: commands.cc:4008
 #, c-format
 msgid "There are %s orphaned_node_conflicts."
 msgstr "Det finns %s orphaned_node-konflikter."

-#: commands.cc:3977
+#: commands.cc:4009
 #, c-format
 msgid "There are %s rename_target_conflicts."
 msgstr "Det finns %s rename_target-konflikter."

-#: commands.cc:3978
+#: commands.cc:4010
 #, c-format
 msgid "There are %s directory_loop_conflicts."
 msgstr "Det finns %s directory_loop-konflikter."
@@ -1577,7 +1599,7 @@
 msgid "markings"
 msgstr "markeringar"

-#: database_check.cc:319 database_check.cc:507 netsync.cc:2765
+#: database_check.cc:319 database_check.cc:507 netsync.cc:2782
 #: rcs_import.cc:1226
 msgid "revisions"
 msgstr "revisioner"
@@ -1586,7 +1608,7 @@
 msgid "ancestry"
 msgstr "föräldraskap"

-#: database_check.cc:451 netsync.cc:2769
+#: database_check.cc:451 netsync.cc:2786
 msgid "keys"
 msgstr "nycklar"

@@ -1911,7 +1933,7 @@
 "databasen %s är inte skapad med SQLite version 3; testa att dumpa och ladda "
 "på nytt"

-#: database.cc:254
+#: database.cc:256 schema_migration.cc:187
 msgid ""
 "make sure database and containing directory are writeable\n"
 "and you have not run out of disk space"
@@ -1920,21 +1942,21 @@
 "i\n"
 "samt att det finns tillräckligt med ledigt utrymme på disken"

-#: database.cc:260
+#: database.cc:262 schema_migration.cc:192
 #, c-format
 msgid ""
-"sqlite error: %d: %s\n"
+"sqlite error: %s\n"
 "%s"
 msgstr ""
-"sqlite-fel: %d: %s\n"
+"sqlite-fel: %s\n"
 "%s"

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

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

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

-#: database.cc:517
+#: database.cc:520
 #, c-format
 msgid ""
 "schema version    : %s\n"
@@ -1971,6 +1993,9 @@
 "  cached ancestry : %u\n"
 "  certs           : %u\n"
 "  total           : %u\n"
+"database:\n"
+"  page size       : %u\n"
+"  cache size      : %u\n"
 msgstr ""
 "schemaversion         : %s\n"
 "antal:\n"
@@ -1990,53 +2015,56 @@
 "  cachat föräldraskap : %u\n"
 "  cert                : %u\n"
 "  total               : %u\n"
+"database:\n"
+"  sidstorlek          : %u\n"
+"  cachestorlek        : %u\n"

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

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

-#: database.cc:655
+#: database.cc:663
 #, 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:714
+#: database.cc:722
 #, c-format
 msgid "null result in query: %s\n"
 msgstr "inget resultat med databasfråga: %s\n"

-#: database.cc:732
+#: database.cc:740
 #, 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:1731
+#: database.cc:1760
 #, c-format
 msgid "another key with name '%s' already exists"
 msgstr "det finns redan en annan nyckel med namnet '%s'"

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

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

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

-#: database.cc:2821
+#: database.cc:2850
 #, c-format
 msgid "could not open database '%s': %s"
 msgstr "kunde inte öppna databasen '%s': %s"
@@ -2621,41 +2649,41 @@
 msgid "check of '%s' failed"
 msgstr "kontroll av '%s' misslyckades"

-#: netsync.cc:691
+#: netsync.cc:708
 msgid "bytes in"
 msgstr "byte in"

-#: netsync.cc:693
+#: netsync.cc:710
 msgid "bytes out"
 msgstr "byte ut"

-#: netsync.cc:697
+#: netsync.cc:714
 msgid "certs in"
 msgstr "cert in"

-#: netsync.cc:699 netsync.cc:712
+#: netsync.cc:716 netsync.cc:729
 msgid "revs in"
 msgstr "rev in"

-#: netsync.cc:704
+#: netsync.cc:721
 msgid "certs out"
 msgstr "cert ut"

-#: netsync.cc:706 netsync.cc:714
+#: netsync.cc:723 netsync.cc:731
 msgid "revs out"
 msgstr "rev ut"

-#: netsync.cc:820
+#: netsync.cc:837
 #, c-format
 msgid "underflow on count of %s items to receive"
 msgstr "underflöde vid räkning av %s enheter att ta emot"

-#: netsync.cc:1166
+#: netsync.cc:1183
 #, c-format
 msgid "received network error: %s"
 msgstr "nätverksfel: %s"

-#: netsync.cc:1198
+#: netsync.cc:1215
 #, c-format
 msgid ""
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -2676,12 +2704,12 @@
 "jag väntade mig %s\n"
 "'%s unset %s %s' åsidosätter denna kontroll\n"

-#: netsync.cc:1208
+#: netsync.cc:1225
 #, c-format
 msgid "server key changed"
 msgstr "serverns nyckel ändrad"

-#: netsync.cc:1213
+#: netsync.cc:1230
 #, c-format
 msgid ""
 "first time connecting to server %s\n"
@@ -2692,48 +2720,48 @@
 "jag antar att det är rätt server, men du kan tänkas vilja dubbelkolla\n"
 "deras nyckels fingeravtryck: %s\n"

-#: netsync.cc:1220
+#: netsync.cc:1237
 #, c-format
 msgid "saving public key for %s to database\n"
 msgstr "sparar publik nyckel för %s i databasen\n"

-#: netsync.cc:1308
+#: netsync.cc:1325
 #, c-format
 msgid "rejected attempt at anonymous connection for write\n"
 msgstr "nekade försök att ansluta anonymt för skrivning\n"

-#: netsync.cc:1315
+#: netsync.cc:1332
 #, c-format
 msgid "rejected attempt at anonymous connection while running as sink\n"
 msgstr "nekade försök att ansluta anonymt under körning som \"sink\"\n"

-#: netsync.cc:1330 netsync.cc:1427
+#: netsync.cc:1347 netsync.cc:1444
 #, c-format
 msgid "not serving branch '%s'"
 msgstr "serverar ej grenen %s"

-#: netsync.cc:1335
+#: netsync.cc:1352
 #, c-format
 msgid "anonymous access to branch '%s' denied by server"
 msgstr "anonym åtkomst av grenen '%s' nekades av servern"

-#: netsync.cc:1342
+#: netsync.cc:1359
 #, c-format
 msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
 msgstr "tillät anonym läsning av alla grenar som matchar '%s' och inte '%s'\n"

-#: netsync.cc:1374
+#: netsync.cc:1391
 #, c-format
 msgid "detected replay attack in auth netcmd\n"
 msgstr "upptäckte \"replay\"-attack i auth netcmd\n"

-#: netsync.cc:1396
+#: netsync.cc:1413
 #, c-format
 msgid "remote public key hash '%s' is unknown\n"
 msgstr ""
 "publik nyckel med kontrollsumman '%s' som kommer från andra sidan är okänd\n"

-#: netsync.cc:1413
+#: netsync.cc:1430
 #, c-format
 msgid ""
 "denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -2742,7 +2770,7 @@
 "nekade läsning för '%s' av alla grenar som matchar '%s' och inte '%s' under "
 "körning som \"pure sink\"\n"

-#: netsync.cc:1433
+#: netsync.cc:1450
 #, c-format
 msgid ""
 "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
@@ -2750,18 +2778,18 @@
 "nekade läsning för '%s' av alla grenar som matchar '%s' och inte '%s' på "
 "grund av grenen '%s'\n"

-#: netsync.cc:1436
+#: netsync.cc:1453
 #, c-format
 msgid "access to branch '%s' denied by server"
 msgstr "Ã¥tkomst till grenen '%s' nekades av servern"

-#: netsync.cc:1446
+#: netsync.cc:1463
 #, c-format
 msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
 msgstr ""
 "tillät läsning för '%s' av alla grenar som matchar '%s' och inte '%s'\n"

-#: netsync.cc:1455
+#: netsync.cc:1472
 #, c-format
 msgid ""
 "denied '%s' write permission for '%s' excluding '%s' while running as pure "
@@ -2770,165 +2798,165 @@
 "nekade skrivning för '%s' av alla grenar som matchar '%s' och inte '%s' "
 "under körning som \"pure source\"\n"

-#: netsync.cc:1463
+#: netsync.cc:1480
 #, c-format
 msgid "denied '%s' write permission for '%s' excluding '%s'\n"
 msgstr ""
 "nekade skrivning för '%s' av alla grenar som matchar '%s' och inte '%s'\n"

-#: netsync.cc:1469
+#: netsync.cc:1486
 #, c-format
 msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
 msgstr ""
 "tillät skrivning för '%s' av alla grenar som matchar '%s' och inte '%s'\n"

-#: netsync.cc:1509
+#: netsync.cc:1526
 #, c-format
 msgid "bad client signature\n"
 msgstr "felaktig signatur från klienten\n"

-#: netsync.cc:1525
+#: netsync.cc:1542
 #, c-format
 msgid "Unexpected 'refine' command on non-refined item type\n"
 msgstr "Oväntat kommando \"refine\" på icke-raffinerad typ\n"

-#: netsync.cc:1622
+#: netsync.cc:1639
 #, c-format
 msgid "unknown bye phase %d received"
 msgstr "okänd hejdå-fas %d mottagen"

-#: netsync.cc:1637
+#: netsync.cc:1654
 #, c-format
 msgid "Unexpected 'done' command on non-refined item type\n"
 msgstr "Oväntat kommando \"done\" på icke-raffinerad typ\n"

-#: netsync.cc:1717
+#: netsync.cc:1734
 #, c-format
 msgid "epoch with hash '%s' does not exist in our database"
 msgstr "epoken med kontrollsumman '%s' finns inte i databasen"

-#: netsync.cc:1746
+#: netsync.cc:1763
 #, c-format
 msgid "revision '%s' does not exist in our database"
 msgstr "revisionen '%s' finns inte i databasen"

-#: netsync.cc:1760
+#: netsync.cc:1777
 #, c-format
 msgid "file '%s' does not exist in our database"
 msgstr "filen '%s' finns inte i databasen"

-#: netsync.cc:1774
+#: netsync.cc:1791
 #, c-format
 msgid "cert '%s' does not exist in our database"
 msgstr "certet '%s' finns inte i databasen"

-#: netsync.cc:1826
+#: netsync.cc:1843
 #, c-format
 msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
 msgstr ""
 "I grenen %s har servern epok '%s' medan klienten har '%s'; dessa stämmer "
 "inte överens."

-#: netsync.cc:1847
+#: netsync.cc:1864
 #, c-format
 msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
 msgstr ""
 "kontrollsummering misslyckades för den publika nyckeln '%s' (%s); ville ha '%"
 "s' men fick '%s'"

-#: netsync.cc:1864
+#: netsync.cc:1881
 #, c-format
 msgid "hash check failed for revision cert '%s'"
 msgstr "kontrollsummering misslyckades för revisionscertet '%s'"

-#: netsync.cc:1939
+#: netsync.cc:1956
 #, c-format
 msgid "Received warning from usher: %s"
 msgstr "Fick varning från usher: %s"

-#: netsync.cc:2026 netsync.cc:2057
+#: netsync.cc:2043 netsync.cc:2074
 msgid "source and sink"
 msgstr "källa och mottagare"

-#: netsync.cc:2027 netsync.cc:2058
+#: netsync.cc:2044 netsync.cc:2075
 msgid "source"
 msgstr "källa"

-#: netsync.cc:2027 netsync.cc:2058
+#: netsync.cc:2044 netsync.cc:2075
 msgid "sink"
 msgstr "mottagare"

-#: netsync.cc:2212
+#: netsync.cc:2229
 #, c-format
 msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
 msgstr "indatabuffert för %s är överfull\n"

-#: netsync.cc:2224 netsync.cc:2281
+#: netsync.cc:2241 netsync.cc:2298
 #, c-format
 msgid "protocol error while processing peer %s: '%s'\n"
 msgstr "protokollfel vid behandling av %s: '%s'\n"

-#: netsync.cc:2230
+#: netsync.cc:2247
 #, c-format
 msgid "error: %s\n"
 msgstr "fel: %s\n"

-#: netsync.cc:2260
+#: netsync.cc:2277
 #, c-format
 msgid "connecting to %s\n"
 msgstr "ansluter till %s\n"

-#: netsync.cc:2296
+#: netsync.cc:2313
 #, c-format
 msgid "timed out waiting for I/O with peer %s, disconnecting\n"
 msgstr "att vänta på I/O från %s tog för lång tid, kopplar ifrån\n"

-#: netsync.cc:2311
+#: netsync.cc:2328
 #, c-format
 msgid "got OOB data from peer %s, disconnecting\n"
 msgstr "fick OOB-data från %s, kopplar ifrån\n"

-#: netsync.cc:2326
+#: netsync.cc:2343
 #, c-format
 msgid "processing failure while talking to peer %s, disconnecting\n"
 msgstr "tar hand om misslyckande i samtal med %s, kopplar ifrån\n"

-#: netsync.cc:2343
+#: netsync.cc:2360
 #, c-format
 msgid "successful exchange with %s\n"
 msgstr "lyckat utbyte med %s\n"

-#: netsync.cc:2349
+#: netsync.cc:2366
 #, c-format
 msgid "peer %s disconnected after we informed them of error\n"
 msgstr "%s kopplade ifrån efter att vi informerade den om ett fel\n"

-#: netsync.cc:2354
+#: netsync.cc:2371
 #, c-format
 msgid "I/O failure while talking to peer %s, disconnecting\n"
 msgstr "I/O-fel i samtal med %s, kopplar ifrån\n"

-#: netsync.cc:2383
+#: netsync.cc:2400
 #, c-format
 msgid "protocol error while processing peer %s: '%s', marking as bad\n"
 msgstr "protokollfel i samtal med %s: '%s', markerar det som felaktigt\n"

-#: netsync.cc:2415
+#: netsync.cc:2432
 #, c-format
 msgid "accepted new client connection from %s : %s\n"
 msgstr "tar emot ny klientanslutning från %s: %s\n"

-#: netsync.cc:2449
+#: netsync.cc:2466
 #, c-format
 msgid "protocol error while processing peer %s: '%s', disconnecting\n"
 msgstr "protokollfel i samtal med %s: '%s', kopplar ifrån\n"

-#: netsync.cc:2460
+#: netsync.cc:2477
 #, c-format
 msgid "peer %s read failed in working state (error)\n"
 msgstr "läsning från %s fallerade i tillståndet \"working\" (fel)\n"

-#: netsync.cc:2465
+#: netsync.cc:2482
 #, c-format
 msgid ""
 "peer %s read failed in shutdown state (possibly client misreported error)\n"
@@ -2936,17 +2964,17 @@
 "läsning från %s fallerade i tillståndet \"shutdown\" (klienten kan felaktigt "
 "ha rapporterat ett fel)\n"

-#: netsync.cc:2471
+#: netsync.cc:2488
 #, c-format
 msgid "peer %s read failed in confirmed state (success)\n"
 msgstr "läsning från %s fallerade i tillståndet \"confirmed\" (framgång)\n"

-#: netsync.cc:2492
+#: netsync.cc:2509
 #, c-format
 msgid "peer %s write failed in working state (error)\n"
 msgstr "skrivning till %s fallerade i tillståndet \"working\" (fel)\n"

-#: netsync.cc:2497
+#: netsync.cc:2514
 #, c-format
 msgid ""
 "peer %s write failed in shutdown state (possibly client misreported error)\n"
@@ -2954,57 +2982,57 @@
 "skrivning till %s fallerade i tillståndet \"shutdown\" (klienten kan "
 "felaktigt ha rapporterat ett fel)\n"

-#: netsync.cc:2503
+#: netsync.cc:2520
 #, c-format
 msgid "peer %s write failed in confirmed state (success)\n"
 msgstr "skrivning till %s fallerade i tillståndet \"confirmed\" (framgång)\n"

-#: netsync.cc:2530
+#: netsync.cc:2547
 #, c-format
 msgid "peer %s processing finished, disconnecting\n"
 msgstr "behandling av %s slutförd, kopplar ifrån\n"

-#: netsync.cc:2552
+#: netsync.cc:2569
 #, c-format
 msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
 msgstr "fd %d (%s) har varit inaktiv för länge, kopplar ifrån\n"

-#: netsync.cc:2620
+#: netsync.cc:2637
 #, c-format
 msgid "beginning service on %s : %s\n"
 msgstr "startar tjänst på %s : %s\n"

-#: netsync.cc:2621
+#: netsync.cc:2638
 msgid "<all interfaces>"
 msgstr "<alla gränssnitt>"

-#: netsync.cc:2635
+#: netsync.cc:2652
 #, c-format
 msgid "session limit %d reached, some connections will be refused\n"
 msgstr ""
 "gränsen för antalet sessioner, %d, är nådd, en del uppkopplingar kommer att "
 "nekas\n"

-#: netsync.cc:2690
+#: netsync.cc:2707
 #, c-format
 msgid "got OOB from peer %s, disconnecting\n"
 msgstr "fick OOB-data från %s, kopplar ifrån\n"

-#: netsync.cc:2759
+#: netsync.cc:2776
 #, c-format
 msgid "finding items to synchronize:\n"
 msgstr "letar efter saker att synkronisera:\n"

-#: netsync.cc:2767
+#: netsync.cc:2784
 msgid "certificates"
 msgstr "certifikat"

-#: netsync.cc:2876
+#: netsync.cc:2893
 #, c-format
 msgid "Cannot find key '%s'"
 msgstr "Kan inte hitta nyckeln '%s'"

-#: netsync.cc:2916
+#: netsync.cc:2933
 #, c-format
 msgid ""
 "include branch pattern contains a quote character:\n"
@@ -3013,7 +3041,7 @@
 "grenmönstret givet med --include innehåller ett citattecken:\n"
 "%s\n"

-#: netsync.cc:2922
+#: netsync.cc:2939
 #, c-format
 msgid ""
 "exclude branch pattern contains a quote character:\n"
@@ -3022,7 +3050,7 @@
 "grenmönstret givet med --exclude innehåller ett citattecken:\n"
 "%s\n"

-#: netsync.cc:2945 netsync.cc:2949
+#: netsync.cc:2962 netsync.cc:2966
 #, c-format
 msgid "network error: %s"
 msgstr "nätverksfel: %s"
@@ -3249,78 +3277,73 @@
 msgid "Current work set: %i items\n"
 msgstr "Nuvarande arbetsmängd: %i delar\n"

-#: schema_migration.cc:181
+#: schema_migration.cc:228
 #, c-format
-msgid "failure extracting schema from sqlite_master"
-msgstr "kunde inte extrahera schemat ur sqlite_master"
-
-#: 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:227
+#: schema_migration.cc:238
 #, c-format
 msgid "error at transaction BEGIN statement"
 msgstr "fel vid transaktionens början (kommandot BEGIN)"

-#: schema_migration.cc:228
+#: schema_migration.cc:239
 #, c-format
 msgid "migrating data"
 msgstr "migrerar data"

-#: schema_migration.cc:254
+#: schema_migration.cc:265
 #, c-format
 msgid "migration step failed: %s"
 msgstr "migreringssteg misslyckades: %s"

-#: schema_migration.cc:268
+#: schema_migration.cc:279
 #, 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:271
+#: schema_migration.cc:282
 #, c-format
 msgid "committing changes to database"
 msgstr "arkiverar ändringar i databasen"

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

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

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

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

-#: schema_migration.cc:287
+#: schema_migration.cc:298
 #, 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:292
+#: schema_migration.cc:303
 #, 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:842
+#: schema_migration.cc:853
 #, 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:845
+#: schema_migration.cc:856
 #, c-format
 msgid "moving key '%s' from database to %s"
 msgstr "flyttar nyckeln '%s' från databasen till %s"
@@ -3589,6 +3612,9 @@
 msgid "updating %s to %s"
 msgstr "uppdaterar %s till %s"

+#~ msgid "failure extracting schema from sqlite_master"
+#~ msgstr "kunde inte extrahera schemat ur sqlite_master"
+
 #~ msgid ""
 #~ "unknown attribute %s on path %s\n"
 #~ "please contact %s so we can work out the right way to migrate this"