#
#
# patch "po/de.po"
# from [c549f00735c025acc4f150da29fee52c1f8cc379]
# to [0e0e85de1ad2caab31d184de0affe47dec413a6c]
#
# patch "po/fr.po"
# from [fbbb1b3475474f17e4293775d3c83282603bbe42]
# to [29845319eebe7b7e8add8a19ef41ea9773a53467]
#
# patch "po/it.po"
# from [fd5373c57e02ae419eff69fc3ccddd9010a93167]
# to [34f197c5aebed81c45c64a413582066a15b50717]
#
# patch "po/ja.po"
# from [4fd53c6e28c82080558367050d653e55452cbd5f]
# to [8f094a686a4c59a86202b127f910d0f6efbb0572]
#
# patch "po/pt_BR.po"
# from [a415e5684da84f68e42fe4e0d83883785f5eafb0]
# to [93faea1bf7b31258690772da4f60a49982c5b81c]
#
# patch "po/sv.po"
# from [ff4a43e6a4c159add684ef3247cc597eee603d19]
# to [931ea57daac9e163c978aca94246b8015e03dda3]
#
============================================================
--- po/de.po c549f00735c025acc4f150da29fee52c1f8cc379
+++ po/de.po 0e0e85de1ad2caab31d184de0affe47dec413a6c
@@ -29,7 +29,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-13 10:22-0500\n"
+"POT-Creation-Date: 2006-10-08 23:14+0200\n"
"PO-Revision-Date: 2006-10-08 23:23+0100\n"
"Last-Translator: Thomas Keller
\n"
"Language-Team: Deutsch \n"
@@ -86,132 +86,165 @@ msgid "illegal argument to --automate-st
#: app_state.cc:388
#, c-format
msgid "illegal argument to --automate-stdio-size: cannot be zero or negative"
-msgstr ""
-"ungültiges Argument für --automate-stdio-size: kann nicht Null oder negativ "
-"sein"
+msgstr "ungültiges Argument für --automate-stdio-size: kann nicht Null oder negativ sein"
-#: automate.cc:64
+#: automate.cc:65
msgid "[BRANCH]"
msgstr "[ZWEIG]"
-#: automate.cc:88 automate.cc:135 automate.cc:1206
+#: automate.cc:89
+#: automate.cc:136
+#: automate.cc:1207
msgid "REV1 [REV2 [REV3 [...]]]"
msgstr "REV1 [REV2 [REV3 [...]]]"
-#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
-#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452
-#: automate.cc:1216 cmd_list.cc:661
+#: automate.cc:99
+#: automate.cc:146
+#: automate.cc:190
+#: automate.cc:331
+#: automate.cc:366
+#: automate.cc:370
+#: automate.cc:429
+#: automate.cc:453
+#: automate.cc:1217
+#: cmd_list.cc:661
#, c-format
msgid "No such revision %s"
msgstr "Revision %s nicht gefunden"
-#: automate.cc:183 automate.cc:324
+#: automate.cc:184
+#: automate.cc:325
msgid "[REV1 [REV2 [REV3 [...]]]]"
msgstr "REV1 [REV2 [REV3 [...]]]"
-#: automate.cc:215
+#: automate.cc:216
msgid "FILE"
msgstr "DATEI"
-#: automate.cc:235
+#: automate.cc:236
#, c-format
msgid "file %s is unknown to the current workspace"
msgstr "Datei %s existiert nicht im Arbeitsbereich"
-#: automate.cc:356
+#: automate.cc:357
msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
msgstr "NEUE_REV [ALTE_REV1 [ALTE_REV2 [...]]]"
-#: automate.cc:423 automate.cc:447 cmd_list.cc:651
+#: automate.cc:424
+#: automate.cc:448
+#: cmd_list.cc:651
msgid "REV"
msgstr "REV"
-#: automate.cc:524
+#: automate.cc:525
msgid "SELECTOR"
msgstr "SELEKTOR"
-#: automate.cc:893 automate.cc:1023
+#: automate.cc:894
+#: automate.cc:1024
msgid "[REVID]"
msgstr "[REVISIONS_ID]"
-#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588
-#: automate.cc:1593
+#: automate.cc:923
+#: automate.cc:1046
+#: automate.cc:1530
+#: automate.cc:1589
+#: automate.cc:1594
#, c-format
msgid "no revision %s found in database"
msgstr "Revision %s nicht in Datenbank gefunden"
-#: automate.cc:1066 automate.cc:1145
+#: automate.cc:1067
+#: automate.cc:1146
msgid "FILEID"
msgstr "DATEI_ID"
-#: automate.cc:1073
+#: automate.cc:1074
#, c-format
msgid "no file version %s found in database"
msgstr "Dateiversion %s nicht in Datenbank gefunden"
-#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845
+#: automate.cc:1093
+#: automate.cc:1119
+#: cmd_merging.cc:845
msgid "REVID"
msgstr "REVISIONS_ID"
-#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186
-#: cmd_db.cc:35 cmd_diff_log.cc:385 cmd_diff_log.cc:416 cmd_diff_log.cc:418
-#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677
-#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:461 commands.cc:388
+#: automate.cc:1104
+#: automate.cc:1130
+#: automate.cc:1185
+#: automate.cc:1187
+#: cmd_db.cc:35
+#: cmd_diff_log.cc:385
+#: cmd_diff_log.cc:416
+#: cmd_diff_log.cc:418
+#: cmd_files.cc:138
+#: cmd_files.cc:200
+#: cmd_merging.cc:125
+#: cmd_merging.cc:677
+#: cmd_merging.cc:692
+#: cmd_merging.cc:695
+#: cmd_ws_commit.cc:461
+#: commands.cc:388
#, c-format
msgid "no such revision '%s'"
msgstr "Revision nicht gefunden: '%s'"
-#: automate.cc:1156
+#: automate.cc:1157
#, c-format
msgid "no such file '%s'"
msgstr "Datei nicht gefunden: '%s'"
-#: automate.cc:1172
+#: automate.cc:1173
msgid "OLD_FILE NEW_FILE"
msgstr "ALTE_DATEI NEUE_DATEI"
-#: automate.cc:1317
+#: automate.cc:1318
msgid "[BRANCH_PATTERN]"
msgstr "[ZWEIG_MUSTER]"
-#: automate.cc:1413
+#: automate.cc:1414
msgid "KEYID PASSPHRASE"
msgstr "SCHLÃSSEL_ID PASSWORT"
-#: automate.cc:1431 cmd_key_cert.cc:41
+#: automate.cc:1432
+#: cmd_key_cert.cc:41
#, c-format
msgid "key '%s' already exists"
msgstr "Schlüssel '%s' existiert bereits"
-#: automate.cc:1434 cmd_key_cert.cc:44
+#: automate.cc:1435
+#: cmd_key_cert.cc:44
#, c-format
msgid "generating key-pair '%s'"
msgstr "erzeuge Schlüsselpaar '%s'"
-#: automate.cc:1436 cmd_key_cert.cc:46
+#: automate.cc:1437
+#: cmd_key_cert.cc:46
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "speichere Schlüsselpaar '%s' in %s/"
-#: automate.cc:1472
+#: automate.cc:1473
msgid "OPTION"
msgstr "OPTION"
-#: automate.cc:1495
+#: automate.cc:1496
#, c-format
msgid "'%s' is not a recognized workspace option"
msgstr "'%s' ist keine bekannte Option eines Arbeitsbereichs"
-#: automate.cc:1518
+#: automate.cc:1519
msgid "REV FILE"
msgstr "REVISION DATEI"
-#: automate.cc:1535 automate.cc:1599
+#: automate.cc:1536
+#: automate.cc:1600
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "Datei %s existiert nicht in der Revision %s"
-#: automate.cc:1578
+#: automate.cc:1579
msgid "REV1 FILE REV2"
msgstr "REV1 DATEI REV2"
@@ -233,23 +266,20 @@ msgid "trust function disliked %d signer
#: cert.cc:157
#, c-format
msgid "trust function disliked %d signers of %s cert on manifest %s"
-msgstr ""
-"Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Manifest %s "
-"ab"
+msgstr "Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Manifest %s ab"
#: cert.cc:214
#, c-format
msgid "trust function disliked %d signers of %s cert on revision %s"
-msgstr ""
-"Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Revision %s "
-"ab"
+msgstr "Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Revision %s ab"
#: cert.cc:303
#, c-format
msgid "calculated cert hash '%s' does not match '%s'"
msgstr "berechnete Zertifikatsprüfsumme '%s' stimmt nicht mit '%s' überein"
-#: cert.cc:387 keys.cc:560
+#: cert.cc:387
+#: keys.cc:560
#, c-format
msgid "no key pair '%s' found in key store '%s'"
msgstr "kein Schlüsselpaar '%s' in Schlüsselbund '%s' gefunden"
@@ -270,50 +300,38 @@ msgstr ""
"pick one to use for signatures by adding '-k' to your command"
msgstr ""
"Sie haben mehrere geheime Schlüssel.\n"
-"Um einen davon für die Erstellung von Signaturen auszuwählen, fügen Sie '-"
-"k' Ihrem Befehl hinzu."
+"Um einen davon für die Erstellung von Signaturen auszuwählen, fügen Sie '-k' Ihrem Befehl hinzu."
#: cert.cc:485
#, c-format
msgid "no branch found for empty revision, please provide a branch name"
-msgstr ""
-"kein Zweig für leere Revision gefunden, bitte geben Sie einen Zweignamen an"
+msgstr "kein Zweig für leere Revision gefunden, bitte geben Sie einen Zweignamen an"
#: cert.cc:494
#, c-format
msgid "no branch certs found for revision %s, please provide a branch name"
-msgstr ""
-"keine Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen "
-"Zweignamen an"
+msgstr "keine Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen Zweignamen an"
#: cert.cc:498
#, c-format
-msgid ""
-"multiple branch certs found for revision %s, please provide a branch name"
-msgstr ""
-"mehrere Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen "
-"Zweignamen an"
+msgid "multiple branch certs found for revision %s, please provide a branch name"
+msgstr "mehrere Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen Zweignamen an"
-#: cmd_automate.cc:157 cmd_automate.cc:226
+#: cmd_automate.cc:206
#, c-format
-msgid "Bad input to automate stdio"
-msgstr "Falsche Eingabe für 'automate stdio'"
-
-#: cmd_automate.cc:176
-#, c-format
msgid "read from client failed with error code: %d"
msgstr "Lesen vom Client schlug fehl, Fehlercode: %d"
-#: cmd_automate.cc:177
-#, fuzzy, c-format
-msgid "Bad input to automate stdio (unexpected EOF)"
+#: cmd_automate.cc:249
+#, c-format
+msgid "Bad input to automate stdio"
msgstr "Falsche Eingabe für 'automate stdio'"
-#: cmd_automate.cc:459
+#: cmd_automate.cc:303
msgid "automation"
msgstr "Automatisierung"
-#: cmd_automate.cc:460
+#: cmd_automate.cc:304
msgid "automation interface"
msgstr "Schnittstelle für die Automatisierung"
@@ -369,7 +387,8 @@ msgstr "Der Zeitraum muss %s Zeichen sei
msgid "The epoch must be %s characters"
msgstr "Der Zeitraum muss %s Zeichen sein"
-#: cmd_db.cc:122 cmd_db.cc:138
+#: cmd_db.cc:122
+#: cmd_db.cc:138
msgid "vars"
msgstr "Variablen"
@@ -394,8 +413,14 @@ msgstr "keine Variable mit dem Namen %s
msgid "no var with name %s in domain %s"
msgstr "keine Variable mit dem Namen %s in der Domäne %s"
-#: cmd_db.cc:155 cmd_diff_log.cc:331 cmd_diff_log.cc:541 cmd_files.cc:114
-#: cmd_files.cc:181 cmd_list.cc:457 cmd_merging.cc:614 cmd_ws_commit.cc:355
+#: cmd_db.cc:155
+#: cmd_diff_log.cc:331
+#: cmd_diff_log.cc:541
+#: cmd_files.cc:114
+#: cmd_files.cc:181
+#: cmd_list.cc:457
+#: cmd_merging.cc:614
+#: cmd_ws_commit.cc:355
#: commands.cc:252
msgid "informative"
msgstr "Informativ"
@@ -413,8 +438,12 @@ msgstr "nicht-hexadezimale Zeichen in Te
msgid "non-hex digits in partial id"
msgstr "nicht-hexadezimale Zeichen in Teil-ID"
-#: cmd_diff_log.cc:331 cmd_ws_commit.cc:66 cmd_ws_commit.cc:242
-#: cmd_ws_commit.cc:276 cmd_ws_commit.cc:355 cmd_ws_commit.cc:661
+#: cmd_diff_log.cc:331
+#: cmd_ws_commit.cc:66
+#: cmd_ws_commit.cc:242
+#: cmd_ws_commit.cc:276
+#: cmd_ws_commit.cc:355
+#: cmd_ws_commit.cc:661
msgid "[PATH]..."
msgstr "[PFAD]..."
@@ -467,8 +496,12 @@ msgstr "'--last' und '--next' sind nur e
msgid "only one of --last/--next allowed"
msgstr "'--last' und '--next' sind nur einmal erlaubt"
-#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:157
-#: cmd_merging.cc:845 cmd_othervcs.cc:15
+#: cmd_files.cc:28
+#: cmd_files.cc:41
+#: cmd_files.cc:78
+#: cmd_files.cc:157
+#: cmd_merging.cc:845
+#: cmd_othervcs.cc:15
msgid "debug"
msgstr "Debugging"
@@ -510,8 +543,7 @@ msgid "diff 2 files and output result"
#: cmd_files.cc:79
msgid "diff 2 files and output result"
-msgstr ""
-"bestimmt den Unterschied zwischen zwei Dateien und gibt das Ergebnis aus"
+msgstr "bestimmt den Unterschied zwischen zwei Dateien und gibt das Ergebnis aus"
#: cmd_files.cc:96
#, c-format
@@ -562,7 +594,8 @@ msgstr "schreibt Dateiinhalte aus der Da
msgid "write file from database to stdout"
msgstr "schreibt Dateiinhalte aus der Datenbank zur Standardausgabe"
-#: cmd_files.cc:212 cmd_files.cc:214
+#: cmd_files.cc:212
+#: cmd_files.cc:214
#, c-format
msgid "no file '%s' found in revision '%s'"
msgstr "keine Datei '%s' in Revision '%s' gefunden"
@@ -592,12 +625,17 @@ msgstr "Alias für %s"
msgid "Alias for %s"
msgstr "Alias für %s"
-#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90
-#: cmd_key_cert.cc:111 cmd_key_cert.cc:147
+#: cmd_key_cert.cc:26
+#: cmd_key_cert.cc:51
+#: cmd_key_cert.cc:90
+#: cmd_key_cert.cc:111
+#: cmd_key_cert.cc:147
msgid "key and cert"
msgstr "Schlüssel und Zertifikat"
-#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90
+#: cmd_key_cert.cc:26
+#: cmd_key_cert.cc:51
+#: cmd_key_cert.cc:90
msgid "KEYID"
msgstr "Schlüssel-ID"
@@ -622,18 +660,12 @@ msgid "public or private key '%s' does n
#: cmd_key_cert.cc:82
#, c-format
msgid "public or private key '%s' does not exist in keystore or database"
-msgstr ""
-"öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund "
-"oder der Datenbank"
+msgstr "öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund oder der Datenbank"
#: cmd_key_cert.cc:85
#, c-format
-msgid ""
-"public or private key '%s' does not exist in keystore, and no database was "
-"specified"
-msgstr ""
-"öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund, "
-"und es wurde keine Datenbank angegeben."
+msgid "public or private key '%s' does not exist in keystore, and no database was specified"
+msgstr "öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund, und es wurde keine Datenbank angegeben."
#: cmd_key_cert.cc:91
msgid "change passphrase of a private RSA key"
@@ -692,8 +724,11 @@ msgstr "NICHT vertrauensvoll"
msgid "UNtrusted"
msgstr "NICHT vertrauensvoll"
-#: cmd_key_cert.cc:195 cmd_key_cert.cc:208 cmd_key_cert.cc:221
-#: cmd_key_cert.cc:237 cmd_ws_commit.cc:189
+#: cmd_key_cert.cc:195
+#: cmd_key_cert.cc:208
+#: cmd_key_cert.cc:221
+#: cmd_key_cert.cc:237
+#: cmd_ws_commit.cc:189
msgid "review"
msgstr "Ãberprüfung"
@@ -713,7 +748,8 @@ msgstr "beachten Sie die Ergebnisse "
msgid "note the results of running a test on a revision"
msgstr "beachten Sie die Ergebnisse "
-#: cmd_key_cert.cc:221 cmd_ws_commit.cc:189
+#: cmd_key_cert.cc:221
+#: cmd_ws_commit.cc:189
msgid "REVISION"
msgstr "REVISION"
@@ -744,7 +780,8 @@ msgstr "leerer Kommentar"
msgid "empty comment"
msgstr "leerer Kommentar"
-#: cmd_list.cc:64 cmd_list.cc:675
+#: cmd_list.cc:64
+#: cmd_list.cc:675
#, c-format
msgid "no public key '%s' found in database"
msgstr "Der öffentliche Schlüssel '%s' wurde nicht in der Datenbank gefunden."
@@ -831,9 +868,15 @@ msgstr ""
"Arbeitsbereichs oder bekannte, unbekannte, absichtlich \n"
"ignorierte, fehlende oder geänderte Dateien"
-#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:66
-#: cmd_ws_commit.cc:242 cmd_ws_commit.cc:276 cmd_ws_commit.cc:311
-#: cmd_ws_commit.cc:336 cmd_ws_commit.cc:561 cmd_ws_commit.cc:661
+#: cmd_merging.cc:73
+#: cmd_merging.cc:655
+#: cmd_ws_commit.cc:66
+#: cmd_ws_commit.cc:242
+#: cmd_ws_commit.cc:276
+#: cmd_ws_commit.cc:311
+#: cmd_ws_commit.cc:336
+#: cmd_ws_commit.cc:561
+#: cmd_ws_commit.cc:661
msgid "workspace"
msgstr "Arbeitsbereich"
@@ -846,11 +889,9 @@ msgstr ""
"If not, update the workspace to the head of the branch."
msgstr ""
"Aktualisiere Arbeitsbereich.\n"
-"Dieses Kommando verändert Ihren Arbeitsbereich, sodass dieser auf einer "
-"anderen Revision basiert.\n"
+"Dieses Kommando verändert Ihren Arbeitsbereich, sodass dieser auf einer anderen Revision basiert.\n"
"Noch nicht eingepflegte Ãnderungen bleiben dabei erhalten.\n"
-"Wenn eine Revision angegeben wurde, erfolgt die Aktualisierung zu dieser "
-"Revision.\n"
+"Wenn eine Revision angegeben wurde, erfolgt die Aktualisierung zu dieser Revision.\n"
"Wenn nicht, dient der Kopf des Zweiges als Grundlage für die Aktualisierung."
#: cmd_merging.cc:95
@@ -949,14 +990,21 @@ msgstr "[rechts] %s"
msgid "[right] %s"
msgstr "[rechts] %s"
-#: cmd_merging.cc:313 cmd_merging.cc:584
+#: cmd_merging.cc:313
+#: cmd_merging.cc:584
#, c-format
msgid "[merged] %s"
msgstr "[vereinigt] %s"
-#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588
-#: cmd_merging.cc:821 cmd_ws_commit.cc:421 cmd_ws_commit.cc:907
-#: cmd_ws_commit.cc:930 cmd_ws_commit.cc:944
+#: cmd_merging.cc:320
+#: cmd_merging.cc:419
+#: cmd_merging.cc:430
+#: cmd_merging.cc:588
+#: cmd_merging.cc:821
+#: cmd_ws_commit.cc:421
+#: cmd_ws_commit.cc:907
+#: cmd_ws_commit.cc:930
+#: cmd_ws_commit.cc:944
msgid "tree"
msgstr "Baum"
@@ -964,12 +1012,16 @@ msgstr "führe nicht-vereinigte Köpfe d
msgid "merge unmerged heads of branch"
msgstr "führe nicht-vereinigte Köpfe des Zweiges zusammen"
-#: cmd_merging.cc:330 cmd_merging.cc:829
+#: cmd_merging.cc:330
+#: cmd_merging.cc:829
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "bitte geben Sie einen Zweig mit '--branch=ZWEIG' an"
-#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834
+#: cmd_merging.cc:335
+#: cmd_merging.cc:469
+#: cmd_merging.cc:472
+#: cmd_merging.cc:834
#: cmd_ws_commit.cc:445
#, c-format
msgid "branch '%s' is empty"
@@ -987,7 +1039,8 @@ msgstr[1] "%d Köpfe auf Zweig '%s'"
msgstr[0] "%d Kopf auf Zweig '%s'"
msgstr[1] "%d Köpfe auf Zweig '%s'"
-#: cmd_merging.cc:363 cmd_merging.cc:408
+#: cmd_merging.cc:363
+#: cmd_merging.cc:408
#, c-format
msgid "merge %d / %d:"
msgstr "vereinige %d / %d"
@@ -995,8 +1048,7 @@ msgid "calculating best pair of heads to
#: cmd_merging.cc:364
#, c-format
msgid "calculating best pair of heads to merge next"
-msgstr ""
-"bestimme bestmögliches Paar von Köpfen, welche als nächste vereinigt werden"
+msgstr "bestimme bestmögliches Paar von Köpfen, welche als nächste vereinigt werden"
#: cmd_merging.cc:416
#, c-format
@@ -1009,9 +1061,7 @@ msgid "merge from one branch to another
#: cmd_merging.cc:420
msgid "merge from one branch to another asymmetrically"
-msgstr ""
-"asymmetrisches Vereinigen zweier Zweige, wobei lediglich Ãnderungen im Quell-"
-"Zweig auf den Ziel-Zweig überführt werden und nicht umgekehrt"
+msgstr "asymmetrisches Vereinigen zweier Zweige, wobei lediglich Ãnderungen im Quell-Zweig auf den Ziel-Zweig überführt werden und nicht umgekehrt"
#: cmd_merging.cc:430
msgid "SOURCE-BRANCH DEST-BRANCH DIR"
@@ -1019,11 +1069,10 @@ msgid "merge one branch into a subdirect
#: cmd_merging.cc:431
msgid "merge one branch into a subdirectory in another branch"
-msgstr ""
-"schiebe die Dateien und Verzeichnisse eines Zweig in ein Unterverzeichnis "
-"eines anderen Zweiges"
+msgstr "schiebe die Dateien und Verzeichnisse eines Zweig in ein Unterverzeichnis eines anderen Zweiges"
-#: cmd_merging.cc:470 cmd_merging.cc:473
+#: cmd_merging.cc:470
+#: cmd_merging.cc:473
#, c-format
msgid "branch '%s' is not merged"
msgstr "Zweig '%s' ist nicht vereinigt"
@@ -1069,16 +1118,15 @@ msgid "merge two explicitly given revisi
#: cmd_merging.cc:590
msgid "merge two explicitly given revisions, placing result in given branch"
-msgstr ""
-"vereinigt zwei gegebene Revisionen und erzeugt eine neue Revision im "
-"gegebenen Zweig"
+msgstr "vereinigt zwei gegebene Revisionen und erzeugt eine neue Revision im gegebenen Zweig"
#: cmd_merging.cc:605
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s und %s sind dieselben Revisionen, breche ab"
-#: cmd_merging.cc:607 cmd_merging.cc:609
+#: cmd_merging.cc:607
+#: cmd_merging.cc:609
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s ist bereits ein Vorfahre von %s"
@@ -1088,13 +1136,11 @@ msgstr "REVISION REVISION"
msgstr "REVISION REVISION"
#: cmd_merging.cc:615
-msgid ""
-"Show what conflicts would need to be resolved to merge the given revisions."
-msgstr ""
-"Zeige, welche Konflikte beim Vereinigen der gegebenen Revisionen behoben "
-"werden müssten."
+msgid "Show what conflicts would need to be resolved to merge the given revisions."
+msgstr "Zeige, welche Konflikte beim Vereinigen der gegebenen Revisionen behoben werden müssten."
-#: cmd_merging.cc:625 cmd_merging.cc:627
+#: cmd_merging.cc:625
+#: cmd_merging.cc:627
#, c-format
msgid "%s is an ancestor of %s; no merge is needed."
msgstr "%s ist ein Vorgänger von %s; kein Vereinigen notwendig."
@@ -1172,8 +1218,7 @@ msgstr ""
" %s pluck -r PARENT -r %s"
msgstr ""
"Revision %s ist eine Vereinigung\n"
-"Um die Ãnderungen relativ auf eine der Elternrevisionen anzuwenden, benutzen "
-"Sie:\n"
+"Um die Ãnderungen relativ auf eine der Elternrevisionen anzuwenden, benutzen Sie:\n"
" %s pluck -r ELTERNREVISION -r %s"
#: cmd_merging.cc:702
@@ -1229,7 +1274,8 @@ msgstr "kein Server angegeben und kein S
msgid "no server given and no default server set"
msgstr "kein Server angegeben und kein Standardserver gesetzt"
-#: cmd_netsync.cc:78 cmd_netsync.cc:98
+#: cmd_netsync.cc:78
+#: cmd_netsync.cc:98
#, c-format
msgid "no branch pattern given"
msgstr "kein Zweigmuster gegeben"
@@ -1249,11 +1295,16 @@ msgstr "kein Zweigmuster gegeben und kei
msgid "no branch pattern given and no default pattern set"
msgstr "kein Zweigmuster gegeben und kein Standardmuster gesetzt"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144 cmd_netsync.cc:188
+#: cmd_netsync.cc:116
+#: cmd_netsync.cc:129
+#: cmd_netsync.cc:144
+#: cmd_netsync.cc:188
msgid "network"
msgstr "Netzwerk"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144
+#: cmd_netsync.cc:116
+#: cmd_netsync.cc:129
+#: cmd_netsync.cc:144
msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
msgstr "[ADRESSE[:PORTNUMMER] [MUSTER]]"
@@ -1268,14 +1319,11 @@ msgid "doing anonymous pull; use -kKEYNA
#: cmd_netsync.cc:138
#, c-format
msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
-msgstr ""
-"hole Daten anonym; benutzen Sie -kSCHLÃSSELNAME, falls eine "
-"Authentifizierung benötigt wird"
+msgstr "hole Daten anonym; benutzen Sie -kSCHLÃSSELNAME, falls eine Authentifizierung benötigt wird"
#: cmd_netsync.cc:145
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
-msgstr ""
-"synchronisiere Zweige, die auf MUSTER passen, mit netsync-Server auf ADRESSE"
+msgstr "synchronisiere Zweige, die auf MUSTER passen, mit netsync-Server auf ADRESSE"
#: cmd_netsync.cc:164
#, c-format
@@ -1297,19 +1345,13 @@ msgstr "bediene Anfragen für Zweige, di
#: cmd_netsync.cc:205
#, c-format
-msgid ""
-"need permission to store persistent passphrase (see hook persist_phrase_ok())"
-msgstr ""
-"benötige Berechtigung, um Passwort persistent zu speichern (siehe Hook "
-"persist_phrase_ok())"
+msgid "need permission to store persistent passphrase (see hook persist_phrase_ok())"
+msgstr "benötige Berechtigung, um Passwort persistent zu speichern (siehe Hook persist_phrase_ok())"
#: cmd_netsync.cc:211
#, c-format
-msgid ""
-"The --no-transport-auth option is only permitted in combination with --stdio"
-msgstr ""
-"Die Option '--no-transport-auth' ist nur in Verbindung mit der Option '--"
-"stdio' erlaubt."
+msgid "The --no-transport-auth option is only permitted in combination with --stdio"
+msgstr "Die Option '--no-transport-auth' ist nur in Verbindung mit der Option '--stdio' erlaubt."
#: cmd_othervcs.cc:15
msgid "RCSFILE..."
@@ -1318,12 +1360,10 @@ msgid ""
#: cmd_othervcs.cc:16
msgid ""
"parse versions in RCS files\n"
-"this command doesn't reconstruct or import revisions.you probably want "
-"cvs_import"
+"this command doesn't reconstruct or import revisions.you probably want cvs_import"
msgstr ""
"Analysiert Versionen in RCS-Dateien\n"
-"Durch dieses Kommando werden keine Revision rekonstruiert oder importiert. "
-"Sie möchten eventuell 'cvs_import' ausführen."
+"Durch dieses Kommando werden keine Revision rekonstruiert oder importiert. Sie möchten eventuell 'cvs_import' ausführen."
#: cmd_othervcs.cc:32
msgid "rcs"
@@ -1337,11 +1377,14 @@ msgstr "importierte alle Versionen des C
msgid "import all versions in CVS repository"
msgstr "importierte alle Versionen des CVS-Depots"
-#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69
+#: cmd_packet.cc:21
+#: cmd_packet.cc:50
+#: cmd_packet.cc:69
msgid "packet i/o"
msgstr "Paket-I/O"
-#: cmd_packet.cc:21 cmd_packet.cc:50
+#: cmd_packet.cc:21
+#: cmd_packet.cc:50
msgid "ID"
msgstr "ID"
@@ -1361,8 +1404,7 @@ msgid "public and private key '%s' do no
#: cmd_packet.cc:59
#, c-format
msgid "public and private key '%s' do not exist in keystore"
-msgstr ""
-"öffentlicher und geheimer Schlüssel '%s' existieren nicht im Schlüsselbund"
+msgstr "öffentlicher und geheimer Schlüssel '%s' existieren nicht im Schlüsselbund"
#: cmd_packet.cc:70
msgid "read packets from files or stdin"
@@ -1402,20 +1444,17 @@ msgid "revert file(s), dir(s) or entire
#: cmd_ws_commit.cc:67
msgid "revert file(s), dir(s) or entire workspace (\".\")"
-msgstr ""
-"setzt Dateien, Verzeichnisse oder den gesamten Arbeitsbereich ('.') zurück"
+msgstr "setzt Dateien, Verzeichnisse oder den gesamten Arbeitsbereich ('.') zurück"
#: cmd_ws_commit.cc:75
#, c-format
msgid "you must pass at least one path to 'revert' (perhaps '.')"
-msgstr ""
-"Sie müssen mindestens einen Pfad an 'revert' übergeben (vielleicht '.')."
+msgstr "Sie müssen mindestens einen Pfad an 'revert' übergeben (vielleicht '.')."
#: cmd_ws_commit.cc:95
#, c-format
msgid "no missing files to revert"
-msgstr ""
-"Es existieren keine fehlenden Dateien, die zurückgesetzt werden könnten."
+msgstr "Es existieren keine fehlenden Dateien, die zurückgesetzt werden könnten."
#: cmd_ws_commit.cc:150
#, c-format
@@ -1517,7 +1556,8 @@ msgstr ""
" umbenannt: %s nach\n"
" %s"
-#: cmd_ws_commit.cc:409 cmd_ws_commit.cc:413
+#: cmd_ws_commit.cc:409
+#: cmd_ws_commit.cc:413
#, c-format
msgid " added %s"
msgstr " hinzugefügt: %s"
@@ -1527,7 +1567,9 @@ msgstr " verändert: %s"
msgid " patched %s"
msgstr " verändert: %s"
-#: cmd_ws_commit.cc:421 cmd_ws_commit.cc:907 cmd_ws_commit.cc:930
+#: cmd_ws_commit.cc:421
+#: cmd_ws_commit.cc:907
+#: cmd_ws_commit.cc:930
msgid "[DIRECTORY]"
msgstr "[VERZEICHNIS]"
@@ -1539,18 +1581,14 @@ msgstr ""
"If no directory is given, the branch name will be used as directory"
msgstr ""
"Checkt eine Revision aus der Datenbank in ein Verzeichnis aus.\n"
-"Wenn eine Revision angegeben wird, ist diese die einzige, die ausgecheckt "
-"wird.\n"
+"Wenn eine Revision angegeben wird, ist diese die einzige, die ausgecheckt wird.\n"
"Andernfalls wird der Kopf des Zweiges (gegeben oder implizit) ausgecheckt.\n"
-"Wenn kein Verzeichnis angegeben wird, wird der Zweigname als Verzeichnisname "
-"verwendet."
+"Wenn kein Verzeichnis angegeben wird, wird der Zweigname als Verzeichnisname verwendet."
#: cmd_ws_commit.cc:440
#, c-format
msgid "use --revision or --branch to specify what to checkout"
-msgstr ""
-"Nutzen Sie --revision oder --branch um festzulegen, was ausgecheckt werden "
-"soll."
+msgstr "Nutzen Sie --revision oder --branch um festzulegen, was ausgecheckt werden soll."
#: cmd_ws_commit.cc:448
#, c-format
@@ -1642,11 +1680,9 @@ msgstr ""
"perhaps move or delete _MTN/log,\n"
"or remove --message/--message-file from the command line?"
msgstr ""
-"_MTN/log ist nicht leer und ein Kommentar wurde über die Kommandozeile "
-"spezifiziert.\n"
+"_MTN/log ist nicht leer und ein Kommentar wurde über die Kommandozeile spezifiziert.\n"
"Verschieben oder löschen Sie _MTN/log oder\n"
-"entfernen Sie das '--message'-/'--message-file'-Argument aus der "
-"Kommandozeile."
+"entfernen Sie das '--message'-/'--message-file'-Argument aus der Kommandozeile."
#: cmd_ws_commit.cc:737
#, c-format
@@ -1663,7 +1699,8 @@ msgstr "Revision %s ist bereits in der D
msgid "revision %s already in database"
msgstr "Revision %s ist bereits in der Datenbank"
-#: cmd_ws_commit.cc:806 cmd_ws_commit.cc:836
+#: cmd_ws_commit.cc:806
+#: cmd_ws_commit.cc:836
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "Datei '%s' wurde während des Einpflegens geändert, breche ab"
@@ -1689,9 +1726,7 @@ msgid "setup a new workspace directory,
#: cmd_ws_commit.cc:908
msgid "setup a new workspace directory, default to current"
-msgstr ""
-"Setzt einen neuen Arbeitsbereich auf (standardmäÃig im derzeitigen "
-"Verzeichnis)"
+msgstr "Setzt einen neuen Arbeitsbereich auf (standardmäÃig im derzeitigen Verzeichnis)"
#: cmd_ws_commit.cc:914
#, c-format
@@ -1699,18 +1734,15 @@ msgstr "benötige '--branch'-Argument fÃ
msgstr "benötige '--branch'-Argument für das aufsetzen"
#: cmd_ws_commit.cc:931
-msgid ""
-"migrate a workspace directory's metadata to the latest format; defaults to "
-"the current workspace"
-msgstr ""
-"Migriert die Metadaten eines Arbeitsbereichs auf das neueste Format; "
-"standardmäÃig wird der aktuelle Arbeitsbereich genutzt"
+msgid "migrate a workspace directory's metadata to the latest format; defaults to the current workspace"
+msgstr "Migriert die Metadaten eines Arbeitsbereichs auf das neueste Format; standardmäÃig wird der aktuelle Arbeitsbereich genutzt"
#: cmd_ws_commit.cc:944
msgid "refresh the inodeprint cache"
msgstr "aktualisiere den 'inodeprint'-Cache"
-#: commands.cc:131 commands.cc:233
+#: commands.cc:131
+#: commands.cc:233
#, c-format
msgid "unknown command '%s'"
msgstr "unbekanntes Kommando '%s'"
@@ -1787,7 +1819,9 @@ msgstr "Kennzeichen"
msgid "markings"
msgstr "Kennzeichen"
-#: database_check.cc:298 netsync.cc:2967 rcs_import.cc:1244
+#: database_check.cc:298
+#: netsync.cc:2967
+#: rcs_import.cc:1244
msgid "revisions"
msgstr "Revisionen"
@@ -1795,7 +1829,8 @@ msgstr "Vorfahren"
msgid "ancestry"
msgstr "Vorfahren"
-#: database_check.cc:426 netsync.cc:2971
+#: database_check.cc:426
+#: netsync.cc:2971
msgid "keys"
msgstr "Schlüssel"
@@ -1830,12 +1865,8 @@ msgstr "Katalog %s unvollständig (%d fe
#: database_check.cc:553
#, c-format
-msgid ""
-"revision %s missing (%d revision references; %d cert references; %d parent "
-"references; %d child references; %d roster references)"
-msgstr ""
-"Revision %s fehlt (%d Revisions-Referenzen; %d Zertifikats-Referenzen; %d "
-"Eltern-Referenzen; %d Kind-Referenzen; %d Katalog-Referenzen)"
+msgid "revision %s missing (%d revision references; %d cert references; %d parent references; %d child references; %d roster references)"
+msgstr "Revision %s fehlt (%d Revisions-Referenzen; %d Zertifikats-Referenzen; %d Eltern-Referenzen; %d Kind-Referenzen; %d Katalog-Referenzen)"
#: database_check.cc:561
#, c-format
@@ -1865,15 +1896,12 @@ msgid "revision %s mismatched parents (%
#: database_check.cc:593
#, c-format
msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)"
-msgstr ""
-"Revision %s hat falsch zugeordnete Eltern (%d abstammende Eltern; %d "
-"Revisions-Referenzen)"
+msgstr "Revision %s hat falsch zugeordnete Eltern (%d abstammende Eltern; %d Revisions-Referenzen)"
#: database_check.cc:602
#, c-format
msgid "revision %s mismatched children (%d ancestry children; %d parents)"
-msgstr ""
-"Revision %s hat falsch zugeordnete Kinder (%d abstammende Kinder; %d Eltern)"
+msgstr "Revision %s hat falsch zugeordnete Kinder (%d abstammende Kinder; %d Eltern)"
#: database_check.cc:614
#, c-format
@@ -1883,9 +1911,7 @@ msgid "revision %s is not parseable (per
#: database_check.cc:621
#, c-format
msgid "revision %s is not parseable (perhaps with unnormalized paths?)"
-msgstr ""
-"Revision %s ist nicht analysierbar (eventuell mit nicht-normalisierten "
-"Pfaden?)"
+msgstr "Revision %s ist nicht analysierbar (eventuell mit nicht-normalisierten Pfaden?)"
#: database_check.cc:628
#, c-format
@@ -1900,8 +1926,7 @@ msgid "revision %s unchecked signature i
#: database_check.cc:685
#, c-format
msgid "revision %s unchecked signature in %s cert from missing key %s"
-msgstr ""
-"Revision %s ungeprüfte Signatur in %s Zertifikat von fehlendem Schlüssel %s"
+msgstr "Revision %s ungeprüfte Signatur in %s Zertifikat von fehlendem Schlüssel %s"
#: database_check.cc:693
#, c-format
@@ -1916,9 +1941,7 @@ msgid "revision %s mismatched certs (%d
#: database_check.cc:717
#, c-format
msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)"
-msgstr ""
-"Revision %s falsch zugeordnete Zertifikate (%d Autoren %d Daten %d Log-"
-"Einträge)"
+msgstr "Revision %s falsch zugeordnete Zertifikate (%d Autoren %d Daten %d Log-Einträge)"
#: database_check.cc:797
#, c-format
@@ -2008,9 +2031,7 @@ msgid "check complete: %d files; %d rost
#: database_check.cc:861
#, c-format
msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs"
-msgstr ""
-"Ãberprüfung beendet: %d Dateien; %d Kataloge; %d Revisionen; %d Schlüssel; %"
-"d Zertifikate"
+msgstr "Ãberprüfung beendet: %d Dateien; %d Kataloge; %d Revisionen; %d Schlüssel; %d Zertifikate"
#: database_check.cc:867
#, c-format
@@ -2043,8 +2064,7 @@ msgstr ""
"Schema der Datenbank %s passt nicht zu dieser Version von monotone\n"
"Erwarte Schema %s, existierendes Schema %s\n"
"Versuchen Sie '%s db migrate' um das Schema zu erneuern\n"
-"(Dieser Vorgang ist nicht umkehrbar; Sie sollten vorher eine Sicherung "
-"machen.)"
+"(Dieser Vorgang ist nicht umkehrbar; Sie sollten vorher eine Sicherung machen.)"
#: database.cc:172
#, c-format
@@ -2090,8 +2110,7 @@ msgstr ""
msgstr ""
"Datenbank %s beinhaltet Revisionen, jedoch keine Kataloge.\n"
"Wahrscheinlich hat ein Upgrade den Katalog-Cache gelöscht.\n"
-"Führen Sie '%s db regenerate_rosters' aus, um diese Datenbank wieder zu "
-"benutzen."
+"Führen Sie '%s db regenerate_rosters' aus, um diese Datenbank wieder zu benutzen."
#: database.cc:256
#, c-format
@@ -2101,20 +2120,19 @@ msgid "database %s is not an sqlite vers
#: database.cc:263
#, c-format
msgid "database %s is not an sqlite version 3 file, try dump and reload"
-msgstr ""
-"Datenbank %s ist keine SQLite-Version-3-Datei, versuchen Sie ein Export und "
-"anschlieÃenden Import"
+msgstr "Datenbank %s ist keine SQLite-Version-3-Datei, versuchen Sie ein Export und anschlieÃenden Import"
-#: database.cc:292 schema_migration.cc:201
+#: database.cc:292
+#: schema_migration.cc:201
msgid ""
"make sure database and containing directory are writeable\n"
"and you have not run out of disk space"
msgstr ""
-"Stellen Sie sicher, dass die Datenbank und das umgebende Verzeichnis "
-"schreibbar sind\n"
+"Stellen Sie sicher, dass die Datenbank und das umgebende Verzeichnis schreibbar sind\n"
"und das noch genügend Speicherplatz verfügbar ist."
-#: database.cc:298 schema_migration.cc:206
+#: database.cc:298
+#: schema_migration.cc:206
#, c-format
msgid ""
"sqlite error: %s\n"
@@ -2131,12 +2149,10 @@ msgid ""
#: database.cc:348
#, c-format
msgid ""
-"existing (possibly stale) journal file '%s' has same stem as new database '%"
-"s'\n"
+"existing (possibly stale) journal file '%s' has same stem as new database '%s'\n"
"cancelling database creation"
msgstr ""
-"Existierende Journal-Datei '%s' hat denselben Stamm wie die neue Datenbank '%"
-"s'\n"
+"Existierende Journal-Datei '%s' hat denselben Stamm wie die neue Datenbank '%s'\n"
"Datenbankerstellung abgebrochen"
#: database.cc:498
@@ -2273,7 +2289,8 @@ msgstr ""
"[ rechts] %s\n"
"[vereinigt] %s"
-#: file_io.cc:176 file_io.cc:183
+#: file_io.cc:176
+#: file_io.cc:183
#, c-format
msgid ""
"could not create directory '%s'\n"
@@ -2328,8 +2345,7 @@ msgid "directory to delete, '%s', is not
#: file_io.cc:229
#, c-format
msgid "directory to delete, '%s', is not a directory but a file"
-msgstr ""
-"das zu löschende Verzeichnis '%s' ist kein Verzeichnis, sondern eine Datei"
+msgstr "das zu löschende Verzeichnis '%s' ist kein Verzeichnis, sondern eine Datei"
#: file_io.cc:236
#, c-format
@@ -2354,10 +2370,10 @@ msgid "rename source file '%s' is a dire
#: file_io.cc:255
#, c-format
msgid "rename source file '%s' is a directory -- bug in monotone?"
-msgstr ""
-"Quelldatei für Umbenennung '%s ist ein Verzeichnis -- Fehler in monotone?"
+msgstr "Quelldatei für Umbenennung '%s ist ein Verzeichnis -- Fehler in monotone?"
-#: file_io.cc:258 file_io.cc:271
+#: file_io.cc:258
+#: file_io.cc:271
#, c-format
msgid "rename target '%s' already exists"
msgstr "Zieldatei für Umbenennung '%s' existiert bereits"
@@ -2370,8 +2386,7 @@ msgid "rename source dir '%s' is a file
#: file_io.cc:268
#, c-format
msgid "rename source dir '%s' is a file -- bug in monotone?"
-msgstr ""
-"Quellverzeichnis für Umbenennung '%s ist eine Datei -- Fehler in monotone?"
+msgstr "Quellverzeichnis für Umbenennung '%s ist eine Datei -- Fehler in monotone?"
#: file_io.cc:282
#, c-format
@@ -2401,8 +2416,7 @@ msgid "file '%s' cannot be overwritten a
#: file_io.cc:372
#, c-format
msgid "file '%s' cannot be overwritten as data; it is a directory"
-msgstr ""
-"Datei %s kann nicht mit Daten überschrieben werden; sie ist ein Verzeichnis"
+msgstr "Datei %s kann nicht mit Daten überschrieben werden; sie ist ein Verzeichnis"
#: file_io.cc:380
#, c-format
@@ -2439,7 +2453,8 @@ msgstr "leere Passwörter sind nicht erl
msgid "empty passphrases not allowed, try again"
msgstr "leere Passwörter sind nicht erlaubt, versuchen Sie es noch einmal"
-#: keys.cc:131 keys.cc:138
+#: keys.cc:131
+#: keys.cc:138
#, c-format
msgid "too many failed passphrases"
msgstr "Passwort zu oft falsch eingegeben"
@@ -2459,7 +2474,8 @@ msgstr "Passwort für '%s' ist nicht kor
msgid "passphrase for '%s' is incorrect"
msgstr "Passwort für '%s' ist nicht korrekt"
-#: lua.cc:462 lua.cc:476
+#: lua.cc:462
+#: lua.cc:476
#, c-format
msgid "%s called with an invalid parameter"
msgstr "%s wurde mit einem ungültigen Parameter aufgerufen"
@@ -2469,7 +2485,9 @@ msgstr "Das Verzeichnis '%s' existiert n
msgid "Directory '%s' does not exist"
msgstr "Das Verzeichnis '%s' existiert nicht"
-#: lua.cc:480 rcs_import.cc:1235 work.cc:1316
+#: lua.cc:480
+#: rcs_import.cc:1235
+#: work.cc:1316
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' ist kein Verzeichnis"
@@ -2482,8 +2500,7 @@ msgid "resolve non-content conflicts and
#: merge.cc:60
#, c-format
msgid "resolve non-content conflicts and then try again."
-msgstr ""
-"Lösen Sie Konflikte nicht-inhaltlicher Natur auf und versuchen Sie es erneut."
+msgstr "Lösen Sie Konflikte nicht-inhaltlicher Natur auf und versuchen Sie es erneut."
#: merge.cc:124
#, c-format
@@ -2500,17 +2517,17 @@ msgstr "falsch zugeordneter Knoten-Hashw
msgid "mismatched node hash value %s, expected %s"
msgstr "falsch zugeordneter Knoten-Hashwert %s, %s erwartet"
-#: monotone.cc:154
+#: monotone.cc:153
#, c-format
msgid "Invalid escape in --xargs file"
msgstr "ungültiges Escape-Zeichen in --xargs-Datei"
-#: monotone.cc:686
+#: monotone.cc:683
#, c-format
msgid "Usage: %s [OPTION...] command [ARG...]"
msgstr "Aufruf: %s [OPTION...] Kommando [ARGUMENTE...]"
-#: monotone.cc:694
+#: monotone.cc:691
#, c-format
msgid "Options specific to '%s %s':"
msgstr "Spezifische Optionen für '%s %s':"
@@ -2558,13 +2575,11 @@ msgid "the remote side has a newer, inco
#: netcmd.cc:125
msgid "the remote side has a newer, incompatible version of monotone"
-msgstr ""
-"der entfernte Rechner benutzt eine neuere, inkompatible Version von monotone"
+msgstr "der entfernte Rechner benutzt eine neuere, inkompatible Version von monotone"
#: netcmd.cc:126
msgid "the remote side has an older, incompatible version of monotone"
-msgstr ""
-"der entfernte Rechner benutzt eine ältere, inkompatible Version von monotone"
+msgstr "der entfernte Rechner benutzt eine ältere, inkompatible Version von monotone"
#: netcmd.cc:136
#, c-format
@@ -2580,17 +2595,20 @@ msgstr ""
"Falsche HMAC-Prüfsumme (bekam %s, benötigte %s).\n"
"Das bedeutet, das Daten bei der Ãbertragung beschädigt wurden."
-#: netcmd.cc:272 netcmd.cc:318
+#: netcmd.cc:272
+#: netcmd.cc:318
#, c-format
msgid "unknown role specifier %d"
msgstr "unbekannter Rollenspezifikation %d"
-#: netio.hh:41 netio.hh:59
+#: netio.hh:41
+#: netio.hh:59
#, c-format
msgid "need %d bytes to decode %s at %d, only have %d"
msgstr "benötige %d Bytes zum Dekodieren von %s auf %d, habe nur %d"
-#: netio.hh:87 netio.hh:122
+#: netio.hh:87
+#: netio.hh:122
#, c-format
msgid "uleb128 decode for '%s' into %d-byte datum overflowed"
msgstr "uelb128 Dekodierung für '%s' in %d-Byte Datum ist übergelaufen"
@@ -2598,14 +2616,12 @@ msgid "ran out of bytes reading uleb128
#: netio.hh:142
#, c-format
msgid "ran out of bytes reading uleb128 value for '%s' at pos %d"
-msgstr ""
-"nicht genügend Bytes zum Lesen vom uelb128 Wert von '%s' an Position %d"
+msgstr "nicht genügend Bytes zum Lesen vom uelb128 Wert von '%s' an Position %d"
#: netio.hh:278
#, c-format
msgid "decoding variable length string of %d bytes for '%s', maximum is %d"
-msgstr ""
-"dekodiere Zeichenkette variabler Länge von %d Bytes für '%s', Maximum ist %d"
+msgstr "dekodiere Zeichenkette variabler Länge von %d Bytes für '%s', Maximum ist %d"
#: netio.hh:333
#, c-format
@@ -2629,7 +2645,8 @@ msgstr "Zertifikate rein"
msgid "certs in"
msgstr "Zertifikate rein"
-#: netsync.cc:732 netsync.cc:745
+#: netsync.cc:732
+#: netsync.cc:745
msgid "revs in"
msgstr "Revisionen rein"
@@ -2637,7 +2654,8 @@ msgstr "Zertifikate raus"
msgid "certs out"
msgstr "Zertifikate raus"
-#: netsync.cc:739 netsync.cc:747
+#: netsync.cc:739
+#: netsync.cc:747
msgid "revs out"
msgstr "Revisionen raus"
@@ -2667,8 +2685,7 @@ msgstr ""
"@ WARNUNG: SERVERIDENTIFIKATION HAT SICH GEÃNDERT @\n"
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
"ES IST MÃGLICH DAS JEMAND ETWAS BÃSES MACHT\n"
-"Es ist auch möglich, dass sich einfach nur der Server-Schlüssel geändert "
-"hat.\n"
+"Es ist auch möglich, dass sich einfach nur der Server-Schlüssel geändert hat.\n"
"Der entfernte Rechner hat den Schlüssel %s gesendet,\n"
"ich habe %s erwartet\n"
"'%s unset %s %s' übergeht diese Prüfung."
@@ -2704,7 +2721,8 @@ msgstr "verweigerte anonyme Verbindung i
msgid "rejected attempt at anonymous connection while running as sink"
msgstr "verweigerte anonyme Verbindung im Datensenke-Modus"
-#: netsync.cc:1372 netsync.cc:1496
+#: netsync.cc:1372
+#: netsync.cc:1496
#, c-format
msgid "not serving branch '%s'"
msgstr "bediene Anfrage für Zweig '%s' nicht"
@@ -2736,17 +2754,12 @@ msgstr "Prüfsumme '%s' des entfernten Ã
#: netsync.cc:1484
#, c-format
-msgid ""
-"denied '%s' read permission for '%s' excluding '%s' while running as pure "
-"sink"
-msgstr ""
-"verweigere '%s' Leseberechtigung für '%s' auÃer '%s' im reinen Datensenke-"
-"Modus"
+msgid "denied '%s' read permission for '%s' excluding '%s' while running as pure sink"
+msgstr "verweigere '%s' Leseberechtigung für '%s' auÃer '%s' im reinen Datensenke-Modus"
#: netsync.cc:1501
#, c-format
-msgid ""
-"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
+msgid "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
msgstr "verweigerte '%s' Leseberechtigung für '%s' auÃer '%s' wegen Zweig '%s'"
#: netsync.cc:1511
@@ -2756,12 +2769,8 @@ msgstr "erlaube '%s' Leseberechtigung fÃ
#: netsync.cc:1521
#, c-format
-msgid ""
-"denied '%s' write permission for '%s' excluding '%s' while running as pure "
-"source"
-msgstr ""
-"verweigere '%s' Schreibberechtigung für '%s' auÃer '%s' im reinen Datensenke-"
-"Modus"
+msgid "denied '%s' write permission for '%s' excluding '%s' while running as pure source"
+msgstr "verweigere '%s' Schreibberechtigung für '%s' auÃer '%s' im reinen Datensenke-Modus"
#: netsync.cc:1528
#, c-format
@@ -2801,15 +2810,12 @@ msgid "Mismatched epoch on branch %s. Se
#: netsync.cc:1857
#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
-msgstr ""
-"Falsch zugeordneter Zeitraum in Zweig %s. Server hat '%s', Client hat '%s'."
+msgstr "Falsch zugeordneter Zeitraum in Zweig %s. Server hat '%s', Client hat '%s'."
#: netsync.cc:1875
#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
-msgstr ""
-"Prüfsummen-Check für öffentlichen Schlüssel '%s' (%s) fehlgeschlagen; "
-"benötigte '%s', bekam '%s'"
+msgstr "Prüfsummen-Check für öffentlichen Schlüssel '%s' (%s) fehlgeschlagen; benötigte '%s', bekam '%s'"
#: netsync.cc:1889
#, c-format
@@ -2821,15 +2827,18 @@ msgstr "Erhielt Warnung von 'usher': %s"
msgid "Received warning from usher: %s"
msgstr "Erhielt Warnung von 'usher': %s"
-#: netsync.cc:2038 netsync.cc:2069
+#: netsync.cc:2038
+#: netsync.cc:2069
msgid "source and sink"
msgstr "Datenquelle und -senke"
-#: netsync.cc:2039 netsync.cc:2070
+#: netsync.cc:2039
+#: netsync.cc:2070
msgid "source"
msgstr "Datenquelle"
-#: netsync.cc:2039 netsync.cc:2070
+#: netsync.cc:2039
+#: netsync.cc:2070
msgid "sink"
msgstr "Datensenke"
@@ -2838,7 +2847,8 @@ msgstr "Eingabepuffer für Peer %s ist n
msgid "input buffer for peer %s is overfull after netcmd dispatch"
msgstr "Eingabepuffer für Peer %s ist nach netcmd-Absendung übervoll."
-#: netsync.cc:2238 netsync.cc:2337
+#: netsync.cc:2238
+#: netsync.cc:2337
#, c-format
msgid "protocol error while processing peer %s: '%s'"
msgstr "Protokoll-Fehler während der Bearbeitung von Peer %s: '%s'"
@@ -2856,14 +2866,12 @@ msgid "timed out waiting for I/O with pe
#: netsync.cc:2352
#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting"
-msgstr ""
-"Zeitüberschreitung während Warten auf E/A mit Peer %s, trenne Verbindung."
+msgstr "Zeitüberschreitung während Warten auf E/A mit Peer %s, trenne Verbindung."
#: netsync.cc:2375
#, c-format
msgid "processing failure while talking to peer %s, disconnecting"
-msgstr ""
-"Bearbeitungsfehler während Kommunikation mit Peer %s, trenne Verbindung"
+msgstr "Bearbeitungsfehler während Kommunikation mit Peer %s, trenne Verbindung"
#: netsync.cc:2392
#, c-format
@@ -2873,9 +2881,7 @@ msgid "peer %s disconnected after we inf
#: netsync.cc:2398
#, c-format
msgid "peer %s disconnected after we informed them of error"
-msgstr ""
-"Peer %s hat Verbindung getrennt, nachdem wir ihn vom Fehler unterrichtet "
-"haben"
+msgstr "Peer %s hat Verbindung getrennt, nachdem wir ihn vom Fehler unterrichtet haben"
#: netsync.cc:2403
#, c-format
@@ -2885,9 +2891,7 @@ msgid "protocol error while processing p
#: netsync.cc:2469
#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad"
-msgstr ""
-"Protokoll-Fehler während Bearbeitung des Peers %s: '%s', als ungültig "
-"markiert"
+msgstr "Protokoll-Fehler während Bearbeitung des Peers %s: '%s', als ungültig markiert"
#: netsync.cc:2501
#, c-format
@@ -2897,9 +2901,7 @@ msgid "protocol error while processing p
#: netsync.cc:2538
#, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting"
-msgstr ""
-"Protokoll-Fehler während der Bearbeitung des Peers %s: '%s', trenne "
-"Verbindung"
+msgstr "Protokoll-Fehler während der Bearbeitung des Peers %s: '%s', trenne Verbindung"
#: netsync.cc:2549
#, c-format
@@ -2908,11 +2910,8 @@ msgstr "Peer %s konnte nicht im 'working
#: netsync.cc:2554
#, c-format
-msgid ""
-"peer %s read failed in shutdown state (possibly client misreported error)"
-msgstr ""
-"Peer %s konnte nicht im 'shutdown state' gelesen werden (evtl. vom Client "
-"falsch berichteter Fehler)"
+msgid "peer %s read failed in shutdown state (possibly client misreported error)"
+msgstr "Peer %s konnte nicht im 'shutdown state' gelesen werden (evtl. vom Client falsch berichteter Fehler)"
#: netsync.cc:2560
#, c-format
@@ -2926,11 +2925,8 @@ msgstr "Peer %s konnte nicht im 'working
#: netsync.cc:2586
#, c-format
-msgid ""
-"peer %s write failed in shutdown state (possibly client misreported error)"
-msgstr ""
-"Peer %s konnte nicht im 'shutdown state' geschrieben werden (evtl. vom "
-"Client falsch berichteter Fehler)"
+msgid "peer %s write failed in shutdown state (possibly client misreported error)"
+msgstr "Peer %s konnte nicht im 'shutdown state' geschrieben werden (evtl. vom Client falsch berichteter Fehler)"
#: netsync.cc:2592
#, c-format
@@ -2959,9 +2955,7 @@ msgid "session limit %d reached, some co
#: netsync.cc:2724
#, c-format
msgid "session limit %d reached, some connections will be refused"
-msgstr ""
-"Maximale Anzahl an Sitzungen %d erreicht; einige Verbindungen werden "
-"abgelehnt werden."
+msgstr "Maximale Anzahl an Sitzungen %d erreicht; einige Verbindungen werden abgelehnt werden."
#: netsync.cc:2789
#, c-format
@@ -3010,7 +3004,8 @@ msgstr ""
"Das 'exclude branch'-Muster beinhaltet ein Quotierungszeichen:\n"
"%s"
-#: netsync.cc:3163 netsync.cc:3167
+#: netsync.cc:3163
+#: netsync.cc:3167
#, c-format
msgid "network error: %s"
msgstr "Netzwerk-Fehler: %s"
@@ -3033,8 +3028,7 @@ msgid "suppress warning, verbose, inform
#: options_list.hh:6
msgid "suppress warning, verbose, informational and progress messages"
-msgstr ""
-"unterdrücke Warnungen, wortreiche, informelle und Fortschrittsmeldungen"
+msgstr "unterdrücke Warnungen, wortreiche, informelle und Fortschrittsmeldungen"
#: options_list.hh:7
msgid "display help message"
@@ -3046,8 +3040,7 @@ msgid "print detailed version number, th
#: options_list.hh:9
msgid "print detailed version number, then exit"
-msgstr ""
-"zeige detailierte Versionsinformationen an und beende dann das Programm"
+msgstr "zeige detailierte Versionsinformationen an und beende dann das Programm"
#: options_list.hh:10
msgid "insert command line arguments taken from the given file"
@@ -3079,8 +3072,7 @@ msgid "limit search for workspace to spe
#: options_list.hh:17
msgid "limit search for workspace to specified root"
-msgstr ""
-"beschränke Suche nach der Arbeitsumgebung auf angegebene Verzeichniswurzel"
+msgstr "beschränke Suche nach der Arbeitsumgebung auf angegebene Verzeichniswurzel"
#: options_list.hh:18
msgid "verbose completion output"
@@ -3132,9 +3124,7 @@ msgid "when rosterifying, drop attrs ent
#: options_list.hh:31
msgid "when rosterifying, drop attrs entries with the given key"
-msgstr ""
-"entferne 'attrs'-Einträge mit dem gegebenen Schlüssel während der "
-"Katalogisierung"
+msgstr "entferne 'attrs'-Einträge mit dem gegebenen Schlüssel während der Katalogisierung"
#: options_list.hh:32
msgid "leave out anything described by its argument"
@@ -3170,9 +3160,7 @@ msgid "set filename containing commit ch
#: options_list.hh:40
msgid "set filename containing commit changelog message"
-msgstr ""
-"setze Dateinamen der Datei, die die Nachricht für die Ãnderungshistorie "
-"beinhaltet"
+msgstr "setze Dateinamen der Datei, die die Nachricht für die Ãnderungshistorie beinhaltet"
#: options_list.hh:41
msgid "limit log output to the next number of entries"
@@ -3237,7 +3225,10 @@ msgstr "fehlende vorausgesetzte Revision
msgid "missing prerequisite revision '%s'"
msgstr "fehlende vorausgesetzte Revision '%s'"
-#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175
+#: packet.cc:140
+#: packet.cc:151
+#: packet.cc:167
+#: packet.cc:175
#, c-format
msgid "dropping revision '%s'"
msgstr "entferne Revision '%s'"
@@ -3270,8 +3261,7 @@ msgid "key '%s' is not equal to key '%s'
#: packet.cc:226
#, c-format
msgid "key '%s' is not equal to key '%s' in database"
-msgstr ""
-"Schlüssel '%s' stimmt nicht mit dem Schlüssel '%s' in der Datenbank überein"
+msgstr "Schlüssel '%s' stimmt nicht mit dem Schlüssel '%s' in der Datenbank überein"
#: packet.cc:350
#, c-format
@@ -3320,8 +3310,7 @@ msgstr ""
"try importing a module instead, with 'cvs_import %s/"
msgstr ""
"%s scheint das Wurzelverzeichnis eines CVS-Repositories zu sein\n"
-"versuchen Sie stattdessen, ein Modul zu importieren, mit 'cvs_import %s/"
-""
+"versuchen Sie stattdessen, ein Modul zu importieren, mit 'cvs_import %s/"
#: rcs_import.cc:1222
#, c-format
@@ -3365,15 +3354,12 @@ msgid "Directory for path %s cannot be a
#: revision.cc:1145
#, c-format
msgid "Directory for path %s cannot be added, as there is a file in the way"
-msgstr ""
-"Verzeichnis für Pfad %s kann nicht hinzugefügt werden, da eine Datei im Weg "
-"ist."
+msgstr "Verzeichnis für Pfad %s kann nicht hinzugefügt werden, da eine Datei im Weg ist."
#: revision.cc:1156
#, c-format
msgid "Path %s cannot be added, as there is a directory in the way"
-msgstr ""
-"Der Pfad %s kann nicht hinzugefügt werden, da ein Verzeichnis im Weg ist"
+msgstr "Der Pfad %s kann nicht hinzugefügt werden, da ein Verzeichnis im Weg ist"
#: revision.cc:1159
#, c-format
@@ -3389,19 +3375,14 @@ msgstr ""
"seriously, if you'd like to keep it, we're happy to figure out how)"
msgstr ""
"unbekanntes Attribut '%s' an Pfad '%s'\n"
-"bitte kontaktieren Sie %s, damit wir herausfinden können, wie dies migriert "
-"werden kann\n"
-"(wenn Ihnen das Attribut nicht wichtig ist, können Sie es über --drop-attr "
-"entfernen,\n"
-"nichtsdestotrotz würden wir gerne darüber Bescheid wissen, um es dennoch "
-"migrierbar zu machen)"
+"bitte kontaktieren Sie %s, damit wir herausfinden können, wie dies migriert werden kann\n"
+"(wenn Ihnen das Attribut nicht wichtig ist, können Sie es über --drop-attr entfernen,\n"
+"nichtsdestotrotz würden wir gerne darüber Bescheid wissen, um es dennoch migrierbar zu machen)"
#: revision.cc:1559
#, c-format
msgid "converting existing revision graph to new roster-style revisions"
-msgstr ""
-"konvertiere existierenden Revisions-Graph für neue, katalogbasierte "
-"Revisionen"
+msgstr "konvertiere existierenden Revisions-Graph für neue, katalogbasierte Revisionen"
#: revision.cc:1614
#, c-format
@@ -3431,8 +3412,7 @@ msgstr ""
msgstr ""
"Ich bin auf eine Revision mit einem mir unbekannten Format gestoÃen ('%s').\n"
"Ich kann lediglich das Format der Version '1' verstehen.\n"
-"Eine neuere Version von monotone wird benötigt, um diese Operation "
-"durchzuführen."
+"Eine neuere Version von monotone wird benötigt, um diese Operation durchzuführen."
#: sanity.cc:148
#, c-format
@@ -3541,8 +3521,7 @@ msgid "no migration performed; database
#: schema_migration.cc:357
#, c-format
msgid "no migration performed; database schema already up-to-date at %s"
-msgstr ""
-"keine Migration durchgeführt; Datenbankschema ist bereits aktualisiert auf %s"
+msgstr "keine Migration durchgeführt; Datenbankschema ist bereits aktualisiert auf %s"
#: schema_migration.cc:916
#, c-format
@@ -3659,7 +3638,9 @@ msgstr "Ungültige 'hmac'-Länge von %d
msgid "Invalid hmac length of %d bytes"
msgstr "Ungültige 'hmac'-Länge von %d Bytes"
-#: work.cc:88 work_migration.cc:180 work_migration.cc:200
+#: work.cc:88
+#: work_migration.cc:180
+#: work_migration.cc:200
#, c-format
msgid "workspace is corrupt: reading %s: %s"
msgstr "Arbeitsbereich ist beschädigt: lese %s: %s"
@@ -3701,23 +3682,22 @@ msgstr "füge %s dem Arbeitsbereich-Mani
#: work.cc:565
#, c-format
-msgid ""
-"cannot add %s, because %s is recorded as a file in the workspace manifest"
-msgstr ""
-"Kann %s nicht hinzufügen, da %s als Datei im Arbeitsbereich-Manifest "
-"aufgenommen wurde."
+msgid "cannot add %s, because %s is recorded as a file in the workspace manifest"
+msgstr "Kann %s nicht hinzufügen, da %s als Datei im Arbeitsbereich-Manifest aufgenommen wurde."
#: work.cc:680
#, c-format
msgid "dropping %s"
msgstr "entferne %s"
-#: work.cc:691 work.cc:702
+#: work.cc:691
+#: work.cc:702
#, c-format
msgid "path %s already exists"
msgstr "Pfad %s existiert bereits"
-#: work.cc:724 work.cc:751
+#: work.cc:724
+#: work.cc:751
#, c-format
msgid "adding %s"
msgstr "füge %s hinzu"
@@ -3745,8 +3725,7 @@ msgid "content of file '%s' has changed,
#: work.cc:788
#, c-format
msgid "content of file '%s' has changed, not overwriting"
-msgstr ""
-"Inhalt der Datei '%s' hat sich geändert, Datei wird nicht überschrieben"
+msgstr "Inhalt der Datei '%s' hat sich geändert, Datei wird nicht überschrieben"
#: work.cc:789
#, c-format
@@ -3846,9 +3825,7 @@ msgid "proposed new root directory '%s'
#: work.cc:1296
#, c-format
msgid "proposed new root directory '%s' is not versioned or does not exist"
-msgstr ""
-"das neu vorgeschlagene Wurzelverzeichnis '%s' ist nicht unter "
-"Versionkontrolle oder existiert nicht"
+msgstr "das neu vorgeschlagene Wurzelverzeichnis '%s' ist nicht unter Versionkontrolle oder existiert nicht"
#: work.cc:1298
#, c-format
@@ -3858,15 +3835,12 @@ msgid "proposed new root directory '%s'
#: work.cc:1303
#, c-format
msgid "proposed new root directory '%s' contains illegal path %s"
-msgstr ""
-"das neu vorgeschlagene Wurzelverzeichnis '%s' beinhaltet den ungültigen Pfad "
-"%s"
+msgstr "das neu vorgeschlagene Wurzelverzeichnis '%s' beinhaltet den ungültigen Pfad %s"
#: work.cc:1313
#, c-format
msgid "directory '%s' is not versioned or does not exist"
-msgstr ""
-"das Verzeichnis '%s' ist nicht unter Versionskontrolle oder existiert nicht"
+msgstr "das Verzeichnis '%s' ist nicht unter Versionskontrolle oder existiert nicht"
#: work.cc:1319
#, c-format
@@ -3881,9 +3855,7 @@ msgid "_MTN/format should not exist in a
#: work_migration.cc:71
#, c-format
msgid "_MTN/format should not exist in a format 1 workspace; corrected"
-msgstr ""
-"_MTN/format sollte nicht in einem Arbeitsbereich des Formats 1 existieren; "
-"korrigiert"
+msgstr "_MTN/format sollte nicht in einem Arbeitsbereich des Formats 1 existieren; korrigiert"
#: work_migration.cc:108
#, c-format
@@ -3919,7 +3891,8 @@ msgstr ""
"Nachdem dies durchgeführt wurde, können Sie diesen Arbeitsbereich\n"
"nicht mehr mit Versionen von monotone nutzen, die älter als %s sind."
-#: work_migration.cc:127 work_migration.cc:255
+#: work_migration.cc:127
+#: work_migration.cc:255
#, c-format
msgid ""
"this version of monotone only understands workspace metadata\n"
@@ -3945,87 +3918,63 @@ msgid "workspace is corrupt: %s exists b
#: work_migration.cc:208
#, c-format
msgid "workspace is corrupt: %s exists but is not a regular file"
-msgstr ""
-"Arbeitsbereich ist beschädigt: %s existiert, ist aber keine reguläre Datei"
+msgstr "Arbeitsbereich ist beschädigt: %s existiert, ist aber keine reguläre Datei"
#: work_migration.cc:247
#, c-format
msgid "this workspace is in the current format, no migration is necessary."
-msgstr ""
-"Der Arbeitsbereich hat bereits das neueste Format, keine Migration notwendig."
+msgstr "Der Arbeitsbereich hat bereits das neueste Format, keine Migration notwendig."
#~ msgid "[DIRECTORY]\n"
#~ msgstr "[VERZEICHNIS]\n"
-
#~ msgid "%s:\n"
#~ msgstr "%s:\n"
-
#~ msgid "%s"
#~ msgstr "%s"
-
#~ msgid "%s: %s"
#~ msgstr "%s: %s"
-
#~ msgid "roster %s is not parseable (perhaps with unnormalized paths?)"
#~ msgstr ""
#~ "Katalog %s nicht analysierbar (evtl. mit nicht-normalisierten Pfaden?)"
-
#~ msgid "roster %s is not in normalized form"
#~ msgstr "Katalog %s ist nicht normalisiert"
-
#~ msgid "revision %s incomplete (missing roster link)"
#~ msgstr "Revision %s unvollständig (fehlende Verknüpfung zu Katalog)"
-
#~ msgid "%d rosters not parseable (perhaps with invalid paths)"
#~ msgstr "%d Kataloge nicht analysierbar (evtl. mit ungültigem Pfad)"
-
#~ msgid "%d rosters not in normalized form"
#~ msgstr "%d Kataloge in nicht normalisierter Form"
-
#~ msgid "%d unreferenced roster links"
#~ msgstr "%d nicht referenzierte Katalogverknüpfungen"
-
#~ msgid "option %s doesn't exist"
#~ msgstr "Option %s existiert nicht"
-
#~ msgid "Problem with workspace: %s is unreadable"
#~ msgstr "Problem mit Arbeitsbereich: %s ist nicht lesbar"
-
#~ msgid "problem parsing arguments from file %s: %s"
#~ msgstr "Problem beim Parsen der Argumente der Datei %s: %s"
-
#~ msgid "weird error when stuffing arguments read from %s: %s\n"
#~ msgstr ""
#~ "seltsamer Fehler beim Zusammenpacken der gelesen Argumente von %s: %s\n"
-
#~ msgid "need --branch argument for branch-based checkout"
#~ msgstr "benötige '--branch'-Argument für zweig-basiertes auschecken"
-
#~ msgid "interrupted"
#~ msgstr "unterbrochen"
-
#~ msgid "terminated by signal"
#~ msgstr "beendet durch Signal"
-
#~ msgid ""
#~ "another name for --no-show-encloser (for compatibility with GNU diff)"
#~ msgstr ""
#~ "anderer Name für '--no-show-encloser' (für Kompatibilität mit GNU diff)"
-
#~ msgid "syntax error near the \"%s\" option: %s"
#~ msgstr "Syntaxfehler in der der Option \"%s\": %s"
-
#~ msgid "%s %s doesn't use the option %s"
#~ msgstr "%s %s benutzt die Option %s nicht"
-
#~ msgid "bad input to parse_basic_io"
#~ msgstr "Falsche Eingabe für parse_basic_io"
-
#~ msgid "starting with revision 1 / %d"
#~ msgstr "starte mit Revision 1 / %d"
-
#~ msgid "merging with revision %d / %d"
#~ msgstr "führe zusammen mit Revision %d / %d"
-
#~ msgid "access to branch '%s' denied by server"
#~ msgstr "Zugriff auf Zweig '%s' vom Server verweigert"
+
============================================================
--- po/fr.po fbbb1b3475474f17e4293775d3c83282603bbe42
+++ po/fr.po 29845319eebe7b7e8add8a19ef41ea9773a53467
@@ -242,8 +242,8 @@ msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: monotone 0.28\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-13 10:22-0500\n"
+"Report-Msgid-Bugs-To: address@hidden"
+"POT-Creation-Date: 2006-09-25 22:39+0200\n"
"PO-Revision-Date: 2006-09-22 23:40+0200\n"
"Last-Translator: Benoît Dejean \n"
"Language-Team: Benoît Dejean \n"
@@ -252,225 +252,640 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: app_state.cc:151
+#: ../app_state.cc:151
#, c-format
msgid "workspace required but not found%s%s"
msgstr "espace de travail requis mais pas trouvé%s%s"
-#: app_state.cc:159
+#: ../app_state.cc:159
#, c-format
msgid "invalid directory ''"
msgstr "dossier pas valable «»"
-#: app_state.cc:167
+#: ../app_state.cc:167
#, c-format
msgid "monotone bookkeeping directory '%s' already exists in '%s'"
msgstr "le dossier administratif de monotone « %s » existe déjà dans « %s »"
-#: app_state.cc:245
+#: ../app_state.cc:245
#, c-format
msgid "search root '%s' does not exist"
msgstr "le racine de l'espace de travail « %s » n'existe pas"
-#: app_state.cc:246
-#, fuzzy, c-format
-msgid "search root '%s' is not a directory"
+#: ../app_state.cc:246
+#, 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:280
+#: ../app_state.cc:280
#, c-format
msgid "failed to parse date string '%s': %s"
msgstr "échou de comprendre la date « %s » : %s"
-#: app_state.cc:295
-#, fuzzy, c-format
-msgid "negative depth not allowed"
+#: ../app_state.cc:295
+#, c-format
+msgid "negative depth not allowed\n"
msgstr "profondeur négative interdite\n"
-#: app_state.cc:303
-#, fuzzy, c-format
-msgid "illegal argument to --last: cannot be zero or negative"
+#: ../app_state.cc:303
+#, c-format
+msgid "illegal argument to --last: cannot be zero or negative\n"
msgstr "argument illégal à --last : il ne doit pas être nul ou négatif\n"
-#: app_state.cc:311
-#, fuzzy, c-format
-msgid "illegal argument to --next: cannot be zero or negative"
+#: ../app_state.cc:311
+#, c-format
+msgid "illegal argument to --next: cannot be zero or negative\n"
msgstr "argument illégal à --next : il ne pas être nul ou négatif\n"
-#: app_state.cc:388
-#, fuzzy, c-format
-msgid "illegal argument to --automate-stdio-size: cannot be zero or negative"
+#: ../app_state.cc:388
+#, c-format
+msgid "illegal argument to --automate-stdio-size: cannot be zero or negative\n"
msgstr ""
"argument illégal à --automate-stdio-size : il ne doit pas être nul ou "
"négatif\n"
-#: automate.cc:64
+#. Name: heads
+#. Arguments:
+#. 1: branch name (optional, default branch is used if non-existant)
+#. Added in: 0.0
+#. Purpose: Prints the heads of the given branch.
+#. Output format: A list of revision ids, in hexadecimal, each followed by a
+#. newline. Revision ids are printed in alphabetically sorted order.
+#. Error conditions: If the branch does not exist, prints nothing. (There are
+#. no heads.)
+#: ../automate.cc:65
msgid "[BRANCH]"
msgstr "[BRANCHE]"
-#: automate.cc:88 automate.cc:135 automate.cc:1206
+#. Name: ancestors
+#. Arguments:
+#. 1 or more: revision ids
+#. Added in: 0.2
+#. Purpose: Prints the ancestors (exclusive) of the given revisions
+#. Output format: A list of revision ids, in hexadecimal, each followed by a
+#. newline. Revision ids are printed in alphabetically sorted order.
+#. Error conditions: If any of the revisions do not exist, prints nothing to
+#. stdout, prints an error message to stderr, and exits with status 1.
+#. Name: descendents
+#. Arguments:
+#. 1 or more: revision ids
+#. Added in: 0.1
+#. Purpose: Prints the descendents (exclusive) of the given revisions
+#. Output format: A list of revision ids, in hexadecimal, each followed by a
+#. newline. Revision ids are printed in alphabetically sorted order.
+#. Error conditions: If any of the revisions do not exist, prints nothing to
+#. stdout, prints an error message to stderr, and exits with status 1.
+#. Name: common_ancestors
+#. Arguments:
+#. 1 or more revision ids
+#. Added in: 2.1
+#. Purpose: Prints all revisions which are ancestors of all of the
+#. revisions given as arguments.
+#. Output format: A list of revision ids, in hexadecimal, each
+#. followed by a newline. Revisions are printed in alphabetically
+#. sorted order.
+#. Error conditions: If any of the revisions do not exist, prints
+#. nothing to stdout, prints an error message to stderr, and exits
+#. with status 1.
+#: ../automate.cc:89 ../automate.cc:136 ../automate.cc:1202
msgid "REV1 [REV2 [REV3 [...]]]"
msgstr "RÃV1 [RÃV2 [RÃV3 [...]]]"
-#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
-#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452
-#: automate.cc:1216 cmd_list.cc:661
+#: ../automate.cc:99 ../automate.cc:146 ../automate.cc:190 ../automate.cc:331
+#: ../automate.cc:366 ../automate.cc:370 ../automate.cc:429 ../automate.cc:453
+#: ../automate.cc:1212 ../cmd_list.cc:661
#, c-format
msgid "No such revision %s"
msgstr "Aucune révision « %s »"
-#: automate.cc:183 automate.cc:324
+#. Name: erase_ancestors
+#. Arguments:
+#. 0 or more: revision ids
+#. Added in: 0.1
+#. Purpose: Prints all arguments, except those that are an ancestor of some
+#. other argument. One way to think about this is that it prints the
+#. minimal elements of the given set, under the ordering imposed by the
+#. "child of" relation. Another way to think of it is if the arguments were
+#. a branch, then we print the heads of that branch.
+#. Output format: A list of revision ids, in hexadecimal, each followed by a
+#. newline. Revision ids are printed in alphabetically sorted order.
+#. Error conditions: If any of the revisions do not exist, prints nothing to
+#. stdout, prints an error message to stderr, and exits with status 1.
+#. Name: toposort
+#. Arguments:
+#. 0 or more: revision ids
+#. Added in: 0.1
+#. Purpose: Prints all arguments, topologically sorted. I.e., if A is an
+#. ancestor of B, then A will appear before B in the output list.
+#. Output format: A list of revision ids, in hexadecimal, each followed by a
+#. newline. Revisions are printed in topologically sorted order.
+#. Error conditions: If any of the revisions do not exist, prints nothing to
+#. stdout, prints an error message to stderr, and exits with status 1.
+#: ../automate.cc:184 ../automate.cc:325
msgid "[REV1 [REV2 [REV3 [...]]]]"
msgstr "[RÃV1 [RÃV2 [RÃV3 [...]]]]"
-#: automate.cc:215
+#. Name: attributes
+#. Arguments:
+#. 1: file name
+#. Added in: 1.0
+#. Purpose: Prints all attributes for a file
+#. Output format: basic_io formatted output, each attribute has its own stanza:
+#.
+#. 'format_version'
+#. used in case this format ever needs to change.
+#. format: ('format_version', the string "1" currently)
+#. occurs: exactly once
+#. 'attr'
+#. represents an attribute entry
+#. format: ('attr', name, value), ('state', [unchanged|changed|added|dropped])
+#. occurs: zero or more times
+#.
+#. Error conditions: If the file name has no attributes, prints only the
+#. format version, if the file is unknown, escalates
+#: ../automate.cc:216
msgid "FILE"
msgstr "FICHIER"
-#: automate.cc:235
+#: ../automate.cc:236
#, c-format
msgid "file %s is unknown to the current workspace"
msgstr "le fichier « %s » est inconnu dans l'espace de travail"
-#: automate.cc:356
+#. Name: ancestry_difference
+#. Arguments:
+#. 1: a revision id
+#. 0 or more further arguments: also revision ids
+#. Added in: 0.1
+#. Purpose: Prints all ancestors of the first revision A, that are not also
+#. ancestors of the other revision ids, the "Bs". For purposes of this
+#. command, "ancestor" is an inclusive term; that is, A is an ancestor of
+#. one of the Bs, it will not be printed, but otherwise, it will be; and
+#. none of the Bs will ever be printed. If A is a new revision, and Bs are
+#. revisions that you have processed before, then this command tells you
+#. which revisions are new since then.
+#. Output format: A list of revision ids, in hexadecimal, each followed by a
+#. newline. Revisions are printed in topologically sorted order.
+#. Error conditions: If any of the revisions do not exist, prints nothing to
+#. stdout, prints an error message to stderr, and exits with status 1.
+#: ../automate.cc:357
msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
msgstr "NOUVELLE_RÃV [ANCIENNE_RÃV1 [ANCIENNE_RÃV2 [...]]]"
-#: automate.cc:423 automate.cc:447 cmd_list.cc:651
+#. Name: parents
+#. Arguments:
+#. 1: a revision id
+#. Added in: 0.2
+#. Purpose: Prints the immediate ancestors of the given revision, i.e., the
+#. parents.
+#. Output format: A list of revision ids, in hexadecimal, each followed by a
+#. newline. Revision ids are printed in alphabetically sorted order.
+#. Error conditions: If the revision does not exist, prints nothing to stdout,
+#. prints an error message to stderr, and exits with status 1.
+#. Name: children
+#. Arguments:
+#. 1: a revision id
+#. Added in: 0.2
+#. Purpose: Prints the immediate descendents of the given revision, i.e., the
+#. children.
+#. Output format: A list of revision ids, in hexadecimal, each followed by a
+#. newline. Revision ids are printed in alphabetically sorted order.
+#. Error conditions: If the revision does not exist, prints nothing to stdout,
+#. prints an error message to stderr, and exits with status 1.
+#. Name: certs
+#. Arguments:
+#. 1: a revision id
+#. Added in: 1.0
+#. Purpose: Prints all certificates associated with the given revision
+#. ID. Each certificate is contained in a basic IO stanza. For each
+#. certificate, the following values are provided:
+#.
+#. 'key' : a string indicating the key used to sign this certificate.
+#. 'signature': a string indicating the status of the signature.
+#. Possible values of this string are:
+#. 'ok' : the signature is correct
+#. 'bad' : the signature is invalid
+#. 'unknown' : signature was made with an unknown key
+#. 'name' : the name of this certificate
+#. 'value' : the value of this certificate
+#. 'trust' : is this certificate trusted by the defined trust metric
+#. Possible values of this string are:
+#. 'trusted' : this certificate is trusted
+#. 'untrusted' : this certificate is not trusted
+#.
+#. Output format: All stanzas are formatted by basic_io. Stanzas are
+#. seperated by a blank line. Values will be escaped, '\' -> '\\' and
+#. '"' -> '\"'.
+#.
+#. Error conditions: If a certificate is signed with an unknown public
+#. key, a warning message is printed to stderr. If the revision
+#. specified is unknown or invalid prints an error message to stderr
+#. and exits with status 1.
+#: ../automate.cc:424 ../automate.cc:448 ../cmd_list.cc:651
msgid "REV"
msgstr "RÃV"
-#: automate.cc:524
+#. Name: select
+#. Arguments:
+#. 1: selector
+#. Added in: 0.2
+#. Purpose: Prints all the revisions that match the given selector.
+#. Output format: A list of revision ids, in hexadecimal, each followed by a
+#. newline. Revision ids are printed in alphabetically sorted order.
+#. Error conditions: None.
+#: ../automate.cc:525
msgid "SELECTOR"
msgstr "SÃLECTEUR"
-#: automate.cc:893 automate.cc:1023
+#. Name: get_revision
+#. Arguments:
+#. 1: a revision id (optional, determined from the workspace if
+#. non-existant)
+#. Added in: 1.0
+#. Purpose: Prints change information for the specified revision id.
+#. There are several changes that are described; each of these is
+#. described by a different basic_io stanza. The first string pair
+#. of each stanza indicates the type of change represented.
+#.
+#. All stanzas are formatted by basic_io. Stanzas are separated
+#. by a blank line. Values will be escaped, '\' to '\\' and
+#. '"' to '\"'.
+#.
+#. Possible values of this first value are along with an ordered list of
+#. basic_io formatted stanzas that will be provided are:
+#.
+#. 'format_version'
+#. used in case this format ever needs to change.
+#. format: ('format_version', the string "1")
+#. occurs: exactly once
+#. 'new_manifest'
+#. represents the new manifest associated with the revision.
+#. format: ('new_manifest', manifest id)
+#. occurs: exactly one
+#. 'old_revision'
+#. represents a parent revision.
+#. format: ('old_revision', revision id)
+#. occurs: either one or two times
+#. 'delete
+#. represents a file or directory that was deleted.
+#. format: ('delete', path)
+#. occurs: zero or more times
+#. 'rename'
+#. represents a file or directory that was renamed.
+#. format: ('rename, old filename), ('to', new filename)
+#. occurs: zero or more times
+#. 'add_dir'
+#. represents a directory that was added.
+#. format: ('add_dir, path)
+#. occurs: zero or more times
+#. 'add_file'
+#. represents a file that was added.
+#. format: ('add_file', path), ('content', file id)
+#. occurs: zero or more times
+#. 'patch'
+#. represents a file that was modified.
+#. format: ('patch', filename), ('from', file id), ('to', file id)
+#. occurs: zero or more times
+#. 'clear'
+#. represents an attr that was removed.
+#. format: ('clear', filename), ('attr', attr name)
+#. occurs: zero or more times
+#. 'set'
+#. represents an attr whose value was changed.
+#. format: ('set', filename), ('attr', attr name), ('value', attr value)
+#. occurs: zero or more times
+#.
+#. These stanzas will always occur in the order listed here; stanzas of
+#. the same type will be sorted by the filename they refer to.
+#. Error conditions: If the revision specified is unknown or invalid
+#. prints an error message to stderr and exits with status 1.
+#. Name: get_manifest_of
+#. Arguments:
+#. 1: a revision id (optional, determined from the workspace if not given)
+#. Added in: 2.0
+#. Purpose: Prints the contents of the manifest associated with the
+#. given revision ID.
+#.
+#. Output format:
+#. There is one basic_io stanza for each file or directory in the
+#. manifest.
+#.
+#. All stanzas are formatted by basic_io. Stanzas are separated
+#. by a blank line. Values will be escaped, '\' to '\\' and
+#. '"' to '\"'.
+#.
+#. Possible values of this first value are along with an ordered list of
+#. basic_io formatted stanzas that will be provided are:
+#.
+#. 'format_version'
+#. used in case this format ever needs to change.
+#. format: ('format_version', the string "1")
+#. occurs: exactly once
+#. 'dir':
+#. represents a directory. The path "" (the empty string) is used
+#. to represent the root of the tree.
+#. format: ('dir', pathname)
+#. occurs: one or more times
+#. 'file':
+#. represents a file.
+#. format: ('file', pathname), ('content', file id)
+#. occurs: zero or more times
+#.
+#. In addition, 'dir' and 'file' stanzas may have attr information
+#. included. These are appended to the stanza below the basic
+#. dir/file information, with one line describing each attr. These
+#. lines take the form ('attr', attr name, attr value).
+#.
+#. Stanzas are sorted by the path string.
+#.
+#. Error conditions: If the revision ID specified is unknown or
+#. invalid prints an error message to stderr and exits with status 1.
+#: ../automate.cc:889 ../automate.cc:1019
msgid "[REVID]"
msgstr "[ID_RÃV]"
-#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588
-#: automate.cc:1593
+#: ../automate.cc:918 ../automate.cc:1041 ../automate.cc:1525
+#: ../automate.cc:1584 ../automate.cc:1589
#, c-format
msgid "no revision %s found in database"
msgstr "la révision « %s » n'existe pas dans la base de données"
-#: automate.cc:1066 automate.cc:1145
+#. Name: get_file
+#. Arguments:
+#. 1: a file id
+#. Added in: 1.0
+#. Purpose: Prints the contents of the specified file.
+#.
+#. Output format: The file contents are output without modification.
+#.
+#. Error conditions: If the file id specified is unknown or invalid prints
+#. an error message to stderr and exits with status 1.
+#. Name: packet_for_fdata
+#. Arguments:
+#. 1: a file id
+#. Added in: 2.0
+#. Purpose: Prints the file data in packet format
+#.
+#. Output format: file data in "monotone read" compatible packet format
+#.
+#. Error conditions: If the file id specified is unknown or invalid
+#. prints an error message to stderr and exits with status 1.
+#: ../automate.cc:1062 ../automate.cc:1141
msgid "FILEID"
msgstr "ID_FICHIER"
-#: automate.cc:1073
+#: ../automate.cc:1069
#, c-format
msgid "no file version %s found in database"
msgstr "aucune version du fichier « %s » trouvé dans la base de données"
-#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845
+#. Name: packet_for_rdata
+#. Arguments:
+#. 1: a revision id
+#. Added in: 2.0
+#. Purpose: Prints the revision data in packet format
+#.
+#. Output format: revision data in "monotone read" compatible packet
+#. format
+#.
+#. Error conditions: If the revision id specified is unknown or
+#. invalid prints an error message to stderr and exits with status 1.
+#. Name: packets_for_certs
+#. Arguments:
+#. 1: a revision id
+#. Added in: 2.0
+#. Purpose: Prints the certs associated with a revision in packet format
+#.
+#. Output format: certs in "monotone read" compatible packet format
+#.
+#. Error conditions: If the revision id specified is unknown or
+#. invalid prints an error message to stderr and exits with status 1.
+#: ../automate.cc:1088 ../automate.cc:1114 ../cmd_merging.cc:845
msgid "REVID"
msgstr "ID_RÃVISION"
-#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186
-#: cmd_db.cc:35 cmd_diff_log.cc:385 cmd_diff_log.cc:416 cmd_diff_log.cc:418
-#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677
-#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:461 commands.cc:388
+#: ../automate.cc:1099 ../automate.cc:1125 ../automate.cc:1180
+#: ../automate.cc:1182 ../cmd_db.cc:35 ../cmd_diff_log.cc:385
+#: ../cmd_diff_log.cc:416 ../cmd_diff_log.cc:418 ../cmd_files.cc:138
+#: ../cmd_files.cc:200 ../cmd_merging.cc:125 ../cmd_merging.cc:677
+#: ../cmd_merging.cc:692 ../cmd_merging.cc:695 ../cmd_ws_commit.cc:461
+#: ../commands.cc:388
#, c-format
msgid "no such revision '%s'"
msgstr "aucune révision « %s »"
-#: automate.cc:1156
+#: ../automate.cc:1152
#, c-format
msgid "no such file '%s'"
msgstr "aucun fichier « %s »"
-#: automate.cc:1172
+#. Name: packet_for_fdelta
+#. Arguments:
+#. 1: a file id
+#. 2: a file id
+#. Added in: 2.0
+#. Purpose: Prints the file delta in packet format
+#.
+#. Output format: file delta in "monotone read" compatible packet format
+#.
+#. Error conditions: If any of the file ids specified are unknown or
+#. invalid prints an error message to stderr and exits with status 1.
+#: ../automate.cc:1168
msgid "OLD_FILE NEW_FILE"
msgstr "ANCIEN_FICHIER NOUVEL_FICHIER"
-#: automate.cc:1317
+#. Name: tags
+#. Arguments:
+#. A branch pattern (optional).
+#. Added in: 2.2
+#. Purpose:
+#. If a branch pattern is given, prints all tags that are attached to
+#. revisions on branches matched by the pattern; otherwise prints all tags
+#. of the revision graph.
+#.
+#. If a branch name is ignored by means of the lua hook 'ignore_branch',
+#. it is neither printed, nor can it be matched by a pattern.
+#. Output format:
+#. There is one basic_io stanza for each tag.
+#.
+#. All stanzas are formatted by basic_io. Stanzas are separated
+#. by a blank line. Values will be escaped, '\' to '\\' and
+#. '"' to '\"'.
+#.
+#. Each stanza has exactly the following four entries:
+#.
+#. 'tag'
+#. the value of the tag cert, i.e. the name of the tag
+#. 'revision'
+#. the hexadecimal id of the revision the tag is attached to
+#. 'signer'
+#. the name of the key used to sign the tag cert
+#. 'branches'
+#. a (possibly empty) list of all branches the tagged revision is on
+#.
+#. Stanzas are printed in arbitrary order.
+#. Error conditions:
+#. A run-time exception is thrown for illegal patterns.
+#: ../automate.cc:1313
msgid "[BRANCH_PATTERN]"
msgstr "[MOTIF_DE_BRANCHE]"
-#: automate.cc:1413
+#. Name: genkey
+#. Arguments:
+#. 1: the key ID
+#. 2: the key passphrase
+#. Added in: 3.1
+#. Purpose: Generates a key with the given ID and passphrase
+#.
+#. Output format: a basic_io stanza for the new key, as for ls keys
+#.
+#. Sample output:
+#. name "address@hidden"
+#. public_hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
+#. private_hash [7f76dae3f91bb48f80f1871856d9d519770b7f8a]
+#. public_location "database" "keystore"
+#. private_location "keystore"
+#.
+#. Error conditions: If the passphrase is empty or the key already exists,
+#. prints an error message to stderr and exits with status 1.
+#: ../automate.cc:1409
msgid "KEYID PASSPHRASE"
msgstr "ID_CLEF PHRASE_DE_PASSE"
-#: automate.cc:1431 cmd_key_cert.cc:41
+#: ../automate.cc:1427 ../cmd_key_cert.cc:41
#, c-format
msgid "key '%s' already exists"
msgstr "la clef « %s » existe déjà "
-#: automate.cc:1434 cmd_key_cert.cc:44
+#: ../automate.cc:1430 ../cmd_key_cert.cc:44
#, c-format
msgid "generating key-pair '%s'"
msgstr "génération de la paire de clef « %s »"
-#: automate.cc:1436 cmd_key_cert.cc:46
+#: ../automate.cc:1432 ../cmd_key_cert.cc:46
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "enregistrement de la paire de clefs « %s » dans %s/"
-#: automate.cc:1472
+#. Name: get_option
+#. Arguments:
+#. 1: an options name
+#. Added in: 3.1
+#. Purpose: Show the value of the named option in _MTN/options
+#.
+#. Output format: A string
+#.
+#. Sample output (for 'mtn automate get_option branch:
+#. net.venge.monotone
+#.
+#: ../automate.cc:1468
msgid "OPTION"
msgstr "OPTION"
-#: automate.cc:1495
+#: ../automate.cc:1491
#, c-format
msgid "'%s' is not a recognized workspace option"
msgstr "« %s » n'est pas une option reconnue pour l'espace de travail"
-#: automate.cc:1518
+#. Name: get_content_changed
+#. Arguments:
+#. 1: a revision ID
+#. 2: a file name
+#. Added in: 3.2
+#. Purpose: Returns a list of revision IDs in which the content
+#. was most recently changed, relative to the revision ID specified
+#. in argument 1. This equates to a content mark following
+#. the *-merge algorithm.
+#.
+#. Output format: Zero or more basic_io stanzas, each specifying a
+#. revision ID for which a content mark is set.
+#.
+#. Each stanza has exactly one entry:
+#.
+#. 'content_mark'
+#. the hexadecimal id of the revision the content mark is attached to
+#. Sample output (for 'mtn automate get_content_changed 3bccff99d08421df72519b61a4dded16d1139c33 ChangeLog):
+#. content_mark [276264b0b3f1e70fc1835a700e6e61bdbe4c3f2f]
+#.
+#: ../automate.cc:1514
msgid "REV FILE"
msgstr "RÃV FICHIER"
-#: automate.cc:1535 automate.cc:1599
+#: ../automate.cc:1531 ../automate.cc:1595
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "le fichier « %s » est inconnu pour la révision %s"
-#: automate.cc:1578
+#. Name: get_corresponding_path
+#. Arguments:
+#. 1: a source revision ID
+#. 2: a file name (in the source revision)
+#. 3: a target revision ID
+#. Added in: 3.2
+#. Purpose: Given a the file name in the source revision, a filename
+#. will if possible be returned naming the file in the target revision.
+#. This allows the same file to be matched between revisions, accounting
+#. for renames and other changes.
+#.
+#. Output format: Zero or one basic_io stanzas. Zero stanzas will be
+#. output if the file does not exist within the target revision; this is
+#. not considered an error.
+#. If the file does exist in the target revision, a single stanza with the
+#. following details is output.
+#.
+#. The stanza has exactly one entry:
+#.
+#. 'file'
+#. the file name corresponding to "file name" (arg 2) in the target revision
+#.
+#. Sample output (for automate get_corresponding_path 91f25c8ee830b11b52dd356c925161848d4274d0 foo2 dae0d8e3f944c82a9688bcd6af99f5b837b41968; see automate_get_corresponding_path test)
+#. file "foo"
+#: ../automate.cc:1574
msgid "REV1 FILE REV2"
msgstr "RÃV1 FICHIER RÃV2"
-#: basic_io.cc:33
+#: ../basic_io.cc:33
#, fuzzy, c-format
msgid "parsing a %s at %d:%d:E: %s"
msgstr "erreur dans %s:%d:%d:EÂ : %s"
-#: cert.cc:83
+#: ../cert.cc:83
#, fuzzy, c-format
msgid "ignoring bad signature by '%s' on '%s'"
msgstr "ignore mauvaise signature fait par « %s » sur « %s »\n"
-#: cert.cc:91
+#: ../cert.cc:91
#, fuzzy, c-format
msgid "ignoring unknown signature by '%s' on '%s'"
msgstr "ignore signature inconnue fait par « %s » sur « %s »\n"
-#: cert.cc:157
+#: ../cert.cc:157
#, fuzzy, c-format
msgid "trust function disliked %d signers of %s cert on manifest %s"
msgstr ""
"function de confiance n'aimait pas %d signataires du certif %s dans le "
"manifeste %s\n"
-#: cert.cc:214
+#: ../cert.cc:214
#, fuzzy, c-format
msgid "trust function disliked %d signers of %s cert on revision %s"
msgstr ""
"function de confiance n'aimait pas %d signataires du certif %s dans la "
"révision %s\n"
-#: cert.cc:303
+#: ../cert.cc:303
#, 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:387 keys.cc:560
+#: ../cert.cc:387 ../keys.cc:560
#, 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:465
+#: ../cert.cc:465
#, c-format
msgid ""
"you have no private key to make signatures with\n"
@@ -479,7 +894,7 @@ msgstr ""
"vous n'avez pas de clef privé pour établir des signatures,\n"
"vous avez sans doute besoin de faire « genkey  »"
-#: cert.cc:468
+#: ../cert.cc:468
#, c-format
msgid ""
"you have multiple private keys\n"
@@ -489,21 +904,21 @@ msgstr ""
"choisissez-en une à utiliser pour vos signatures en ajoutant « -"
"k » à votre commande"
-#: cert.cc:485
+#: ../cert.cc:485
#, 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:494
+#: ../cert.cc:494
#, 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:498
+#: ../cert.cc:498
#, c-format
msgid ""
"multiple branch certs found for revision %s, please provide a branch name"
@@ -511,39 +926,34 @@ msgstr ""
"multiples certifs de branche trouvés pour la révision %s, veuillez donne le "
"nom d'une branche"
-#: cmd_automate.cc:157 cmd_automate.cc:226
+#: ../cmd_automate.cc:206
#, c-format
-msgid "Bad input to automate stdio"
-msgstr "mauvaise donnée en entrée à parse_basic_io"
-
-#: cmd_automate.cc:176
-#, c-format
msgid "read from client failed with error code: %d"
msgstr "la lecture depuis le client a échoué avec le code d'erreur : %d"
-#: cmd_automate.cc:177
-#, fuzzy, c-format
-msgid "Bad input to automate stdio (unexpected EOF)"
+#: ../cmd_automate.cc:249
+#, c-format
+msgid "Bad input to automate stdio"
msgstr "mauvaise donnée en entrée à parse_basic_io"
-#: cmd_automate.cc:459
+#: ../cmd_automate.cc:303
msgid "automation"
msgstr "automatisation"
-#: cmd_automate.cc:460
+#: ../cmd_automate.cc:304
msgid "automation interface"
msgstr "interface d'automatisation"
-#: cmd_db.cc:41
+#: ../cmd_db.cc:41
#, 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."
-#: cmd_db.cc:46
+#: ../cmd_db.cc:46
msgid "database"
msgstr "base de données"
-#: cmd_db.cc:47
+#: ../cmd_db.cc:47
#, fuzzy
msgid ""
"init\n"
@@ -577,68 +987,69 @@ msgstr ""
"rosterify\n"
"set_epoch BRANCHE ÃPOQUE\n"
-#: cmd_db.cc:62
+#: ../cmd_db.cc:62
msgid "manipulate database state"
msgstr "manipule l'état de la base de données"
-#: cmd_db.cc:111
+#: ../cmd_db.cc:111
#, c-format
msgid "The epoch must be %s characters"
msgstr "L'époque doit faire %s caractères"
-#: cmd_db.cc:122 cmd_db.cc:138
+#: ../cmd_db.cc:122 ../cmd_db.cc:138
msgid "vars"
msgstr "variables"
-#: cmd_db.cc:122
+#: ../cmd_db.cc:122
msgid "DOMAIN NAME VALUE"
msgstr "DOMAINE NOM VALEUR"
-#: cmd_db.cc:123
+#: ../cmd_db.cc:123
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"
-#: cmd_db.cc:138
+#: ../cmd_db.cc:138
msgid "DOMAIN NAME"
msgstr "DOMAINE NOM VALEUR"
-#: cmd_db.cc:139
+#: ../cmd_db.cc:139
msgid "remove the database variable NAME in domain DOMAIN"
msgstr ""
"supprimer la variable NOM de la base de données dans le domaine DOMAINE"
-#: cmd_db.cc:151
+#: ../cmd_db.cc:151
#, c-format
msgid "no var with name %s in domain %s"
msgstr "aucune variable nommée %s dans le domaine %s"
-#: cmd_db.cc:155 cmd_diff_log.cc:331 cmd_diff_log.cc:541 cmd_files.cc:114
-#: cmd_files.cc:181 cmd_list.cc:457 cmd_merging.cc:614 cmd_ws_commit.cc:355
-#: commands.cc:252
+#. //////////////////////////////////////////////////////////////////////
+#: ../cmd_db.cc:155 ../cmd_diff_log.cc:331 ../cmd_diff_log.cc:541
+#: ../cmd_files.cc:114 ../cmd_files.cc:181 ../cmd_list.cc:457
+#: ../cmd_merging.cc:614 ../cmd_ws_commit.cc:355 ../commands.cc:252
msgid "informative"
msgstr "information"
-#: cmd_db.cc:155
+#: ../cmd_db.cc:155
msgid "(revision|file|key) PARTIAL-ID"
msgstr "(révision|fichier|clef) ID-PARTIELLE"
-#: cmd_db.cc:156
+#: ../cmd_db.cc:156
msgid "complete partial id"
msgstr "remplis une identité partielle"
-#: cmd_db.cc:165
+#: ../cmd_db.cc:165
#, c-format
msgid "non-hex digits in partial id"
msgstr "chiffres non-héxadécimaux dans l'id partielle"
-#: cmd_diff_log.cc:331 cmd_ws_commit.cc:66 cmd_ws_commit.cc:242
-#: cmd_ws_commit.cc:276 cmd_ws_commit.cc:355 cmd_ws_commit.cc:661
+#: ../cmd_diff_log.cc:331 ../cmd_ws_commit.cc:66 ../cmd_ws_commit.cc:242
+#: ../cmd_ws_commit.cc:276 ../cmd_ws_commit.cc:355 ../cmd_ws_commit.cc:661
msgid "[PATH]..."
msgstr "[CHEMIN]..."
-#: cmd_diff_log.cc:332
+#: ../cmd_diff_log.cc:332
#, fuzzy
msgid ""
"show current diffs on stdout.\n"
@@ -652,7 +1063,7 @@ msgstr ""
"différence entre eux est affichée. Si aucun format n'est précisé,\n"
"le format « unified » est employé par défaut."
-#: cmd_diff_log.cc:345
+#: ../cmd_diff_log.cc:345
#, c-format
msgid ""
"--diff-args requires --external\n"
@@ -661,15 +1072,15 @@ msgstr ""
"--diff-args requiet --external\n"
"essayez d'ajouter --external ou de retirer --diff-args ?"
-#: cmd_diff_log.cc:477
+#: ../cmd_diff_log.cc:477
msgid "no changes"
msgstr "aucun changement"
-#: cmd_diff_log.cc:541
+#: ../cmd_diff_log.cc:541
msgid "[FILE] ..."
msgstr "[FICHIER] ..."
-#: cmd_diff_log.cc:542
+#: ../cmd_diff_log.cc:542
#, fuzzy
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
@@ -678,169 +1089,171 @@ msgstr ""
"Affiche l'histoire en sens inverse (filtré avec « FILE »). Si une\n"
"révision ou plus sont données, emploie-les comme débuts."
-#: cmd_diff_log.cc:604
+#: ../cmd_diff_log.cc:604
#, c-format
msgid "only one of --last/--next allowed"
msgstr "seul un de --last et --next est permis"
-#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:157
-#: cmd_merging.cc:845 cmd_othervcs.cc:15
+#. fload, fmerge, and fdiff are simple commands for debugging the line
+#. merger.
+#: ../cmd_files.cc:28 ../cmd_files.cc:41 ../cmd_files.cc:78
+#: ../cmd_files.cc:157 ../cmd_merging.cc:845 ../cmd_othervcs.cc:15
msgid "debug"
msgstr "débogue"
-#: cmd_files.cc:28
+#: ../cmd_files.cc:28
msgid "load file contents into db"
msgstr "charger le contenu du fichier dans la base de données"
-#: cmd_files.cc:41
+#: ../cmd_files.cc:41
msgid " "
msgstr " "
-#: cmd_files.cc:42
+#: ../cmd_files.cc:42
msgid "merge 3 files and output result"
msgstr "fusionne 3 fichiers et affiche le résultat"
-#: cmd_files.cc:56
+#: ../cmd_files.cc:56
#, c-format
msgid "ancestor file id does not exist"
msgstr "l'id du fichier de l'ancêtre n'existe pas"
-#: cmd_files.cc:59
+#: ../cmd_files.cc:59
#, c-format
msgid "left file id does not exist"
msgstr "l'id du fichier gauche n'existe pas"
-#: cmd_files.cc:62
+#: ../cmd_files.cc:62
#, c-format
msgid "right file id does not exist"
msgstr "l'id du fichier droit n'existe pas"
-#: cmd_files.cc:73
+#: ../cmd_files.cc:73
#, c-format
msgid "merge failed"
msgstr "la fusion a échouée"
-#: cmd_files.cc:78
+#: ../cmd_files.cc:78
msgid "SRCNAME DESTNAME SRCID DESTID"
msgstr "NOMSRC NOMDEST IDSRC IDDEST"
-#: cmd_files.cc:79
+#: ../cmd_files.cc:79
#, fuzzy
msgid "diff 2 files and output result"
msgstr "fusionne 3 fichiers et affiche le résultat"
-#: cmd_files.cc:96
+#: ../cmd_files.cc:96
#, c-format
msgid "source file id does not exist"
msgstr "l'id du fichier source n'existe pas"
-#: cmd_files.cc:99
+#: ../cmd_files.cc:99
#, c-format
msgid "destination file id does not exist"
msgstr "l'id du fichier de destination n'existe pas"
-#: cmd_files.cc:114
+#: ../cmd_files.cc:114
msgid "PATH"
msgstr "CHEMIN"
-#: cmd_files.cc:115
+#: ../cmd_files.cc:115
msgid "print annotated copy of the file from REVISION"
msgstr "affiche une copie annotée du fichier venant de RÃVISION"
-#: cmd_files.cc:136
+#: ../cmd_files.cc:136
#, c-format
msgid "no revision for file '%s' in database"
msgstr "aucune révision pour le fichier « %s » dans la base de données"
-#: cmd_files.cc:147
+#: ../cmd_files.cc:147
#, c-format
msgid "no such file '%s' in revision '%s'"
msgstr "aucun fichier « %s » dans la révision « %s »"
-#: cmd_files.cc:150
+#: ../cmd_files.cc:150
#, c-format
msgid "'%s' in revision '%s' is not a file"
msgstr "« %s » dans la révision « %s » n'est pas un fichier"
-#: cmd_files.cc:157
+#: ../cmd_files.cc:157
msgid "[PATH]"
msgstr "[CHEMIN]"
-#: cmd_files.cc:158
+#: ../cmd_files.cc:158
msgid "calculate identity of PATH or stdin"
msgstr "calculer l'identité du CHEMIN ou de l'entrée standard"
-#: cmd_files.cc:182
+#: ../cmd_files.cc:182
msgid "FILENAME"
msgstr "FICHIER"
-#: cmd_files.cc:183
+#: ../cmd_files.cc:183
msgid "write file from database to stdout"
msgstr "écrire un fichier de la base de donnée sur la sortie standard"
-#: cmd_files.cc:212 cmd_files.cc:214
+#: ../cmd_files.cc:212 ../cmd_files.cc:214
#, c-format
msgid "no file '%s' found in revision '%s'"
msgstr "aucun fichier « %s » dans la révision « %s »"
-#: cmd.hh:108
+#: ../cmd.hh:102
#, c-format
msgid "non-hex digits in id"
msgstr "chiffre non-héxadécimal dans l'id"
-#: cmd.hh:117
+#: ../cmd.hh:111
#, c-format
msgid "partial id '%s' does not have an expansion"
msgstr "l'identité partielle « %s » n'a pas d'expansions"
-#: cmd.hh:121
-#, fuzzy, c-format
-msgid "partial id '%s' has multiple ambiguous expansions:"
+#: ../cmd.hh:115
+#, c-format
+msgid "partial id '%s' has multiple ambiguous expansions:\n"
msgstr "l'identité partielle « %s » a plusieurs expansions ambiguës : \n"
-#: cmd.hh:129
+#: ../cmd.hh:123
#, c-format
msgid "expanded partial id '%s' to '%s'"
msgstr "développement de l'identité partielle « %s » de « %s »"
-#: cmd.hh:212
+#: ../cmd.hh:206
#, c-format
msgid "Alias for %s"
msgstr "Synonyme pour %s"
-#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90
-#: cmd_key_cert.cc:111 cmd_key_cert.cc:147
+#: ../cmd_key_cert.cc:26 ../cmd_key_cert.cc:51 ../cmd_key_cert.cc:90
+#: ../cmd_key_cert.cc:111 ../cmd_key_cert.cc:147
msgid "key and cert"
msgstr "clef et certif"
-#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90
+#: ../cmd_key_cert.cc:26 ../cmd_key_cert.cc:51 ../cmd_key_cert.cc:90
msgid "KEYID"
msgstr "IDCLEF"
-#: cmd_key_cert.cc:26
+#: ../cmd_key_cert.cc:26
msgid "generate an RSA key-pair"
msgstr "générer une paire de clefs RSA"
-#: cmd_key_cert.cc:51
+#: ../cmd_key_cert.cc:51
msgid "drop a public and private key"
msgstr "supprimer une clef publique et privée"
-#: cmd_key_cert.cc:65
+#: ../cmd_key_cert.cc:65
#, c-format
msgid "dropping public key '%s' from database"
msgstr "suppression de la clef publique « %s » de la base de données"
-#: cmd_key_cert.cc:75
+#: ../cmd_key_cert.cc:75
#, c-format
msgid "dropping key pair '%s' from keystore"
msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs"
-#: cmd_key_cert.cc:82
+#: ../cmd_key_cert.cc:82
#, 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"
-#: cmd_key_cert.cc:85
+#: ../cmd_key_cert.cc:85
#, c-format
msgid ""
"public or private key '%s' does not exist in keystore, and no database was "
@@ -849,33 +1262,33 @@ msgstr ""
"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"
-#: cmd_key_cert.cc:91
+#: ../cmd_key_cert.cc:91
msgid "change passphrase of a private RSA key"
msgstr "changer la phrase de passe pour une clef RSA privée"
-#: cmd_key_cert.cc:101
+#: ../cmd_key_cert.cc:101
#, c-format
msgid "key '%s' does not exist in the keystore"
msgstr "la clef « %s » n'existe pas dans l'entrepôt de clefs"
-#: cmd_key_cert.cc:108
+#: ../cmd_key_cert.cc:108
#, c-format
msgid "passphrase changed"
msgstr "la phrase de passe a été changée"
-#: cmd_key_cert.cc:111
+#: ../cmd_key_cert.cc:111
msgid "REVISION CERTNAME [CERTVAL]"
msgstr "RÃVISION NOM_DE_CERTIF [VALEUR_DE_CERTIF]"
-#: cmd_key_cert.cc:112
+#: ../cmd_key_cert.cc:112
msgid "create a cert for a revision"
msgstr "créer un certif pour une révision"
-#: cmd_key_cert.cc:148
+#: ../cmd_key_cert.cc:148
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr "RÃVISION NOM VALEUR SIGNATAIRE1 [SIGNATAIRE2 [...]]"
-#: cmd_key_cert.cc:149
+#: ../cmd_key_cert.cc:149
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
@@ -883,14 +1296,14 @@ msgstr ""
"test s'il est possible d'avoir confiance en un certif hypothétique\n"
"avec les paramètres actuels"
-#: cmd_key_cert.cc:182
-#, fuzzy, c-format
+#: ../cmd_key_cert.cc:182
+#, c-format
msgid ""
"if a cert on: %s\n"
"with key: %s\n"
"and value: %s\n"
"was signed by: %s\n"
-"it would be: %s"
+"it would be: %s\n"
msgstr ""
"si un certif sur : %s\n"
"avec la clef : %s\n"
@@ -898,72 +1311,72 @@ msgstr ""
"était signé par : %s\n"
"il serait : %s\n"
-#: cmd_key_cert.cc:191
+#: ../cmd_key_cert.cc:191
msgid "trusted"
msgstr "fiable"
-#: cmd_key_cert.cc:191
+#: ../cmd_key_cert.cc:191
msgid "UNtrusted"
msgstr "NON-fiable"
-#: cmd_key_cert.cc:195 cmd_key_cert.cc:208 cmd_key_cert.cc:221
-#: cmd_key_cert.cc:237 cmd_ws_commit.cc:189
+#: ../cmd_key_cert.cc:194 ../cmd_key_cert.cc:207 ../cmd_key_cert.cc:220
+#: ../cmd_key_cert.cc:236 ../cmd_ws_commit.cc:189
msgid "review"
msgstr "examination"
-#: cmd_key_cert.cc:195
+#: ../cmd_key_cert.cc:194
msgid "REVISION TAGNAME"
msgstr "RÃVISION ÃTIQUETTE"
-#: cmd_key_cert.cc:196
+#: ../cmd_key_cert.cc:195
msgid "put a symbolic tag cert on a revision"
msgstr "mettre une certif-étiquette symbolique sur une révision"
-#: cmd_key_cert.cc:208
+#: ../cmd_key_cert.cc:207
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr "ID (pass|fail|true|false|yes|no|1|0)"
-#: cmd_key_cert.cc:209
+#: ../cmd_key_cert.cc:208
msgid "note the results of running a test on a revision"
msgstr "note le résultat d'un test sur une révision"
-#: cmd_key_cert.cc:221 cmd_ws_commit.cc:189
+#: ../cmd_key_cert.cc:220 ../cmd_ws_commit.cc:189
msgid "REVISION"
msgstr "RÃVISION"
-#: cmd_key_cert.cc:222
+#: ../cmd_key_cert.cc:221
msgid "approve of a particular revision"
msgstr "approuver une révision particulière"
-#: cmd_key_cert.cc:233
+#: ../cmd_key_cert.cc:232
#, c-format
msgid "need --branch argument for approval"
msgstr "il faut un argument --branch pour approuver"
-#: cmd_key_cert.cc:237
+#: ../cmd_key_cert.cc:236
msgid "REVISION [COMMENT]"
msgstr "RÃVISION [COMMENTAIRE]"
-#: cmd_key_cert.cc:238
+#: ../cmd_key_cert.cc:237
msgid "comment on a particular revision"
msgstr "commenter une révision en particulier"
-#: cmd_key_cert.cc:250
+#: ../cmd_key_cert.cc:249
#, c-format
msgid "edit comment failed"
msgstr "l'édition du commentaire a échoué"
-#: cmd_key_cert.cc:255
+#: ../cmd_key_cert.cc:254
#, c-format
msgid "empty comment"
msgstr "commentaire vide"
-#: cmd_list.cc:64 cmd_list.cc:675
+#: ../cmd_list.cc:64 ../cmd_list.cc:675
#, c-format
msgid "no public key '%s' found in database"
msgstr "aucune clef publique « %s » dans la base de données"
-#: cmd_list.cc:74
+#: ../cmd_list.cc:74
#, c-format
msgid ""
"Key : %s\n"
@@ -976,39 +1389,39 @@ msgstr ""
"Nom : %s\n"
"Valeur : %s\n"
-#: cmd_list.cc:108
+#: ../cmd_list.cc:108
msgid "ok"
msgstr "0K"
-#: cmd_list.cc:111
+#: ../cmd_list.cc:111
msgid "bad"
msgstr "mauvais"
-#: cmd_list.cc:114
+#: ../cmd_list.cc:114
msgid "unknown"
msgstr "inconnu"
-#: cmd_list.cc:202
+#: ../cmd_list.cc:202
#, c-format
msgid "(*) - only in %s/"
msgstr "(*) - uniquement dans %s/"
-#: cmd_list.cc:226
+#: ../cmd_list.cc:226
#, c-format
msgid "no keys found"
msgstr "aucune clef trouvée"
-#: cmd_list.cc:228
+#: ../cmd_list.cc:228
#, c-format
msgid "no keys found matching '%s'"
msgstr "aucune clef correspondant à « %s »"
-#: cmd_list.cc:275
+#: ../cmd_list.cc:275
#, c-format
msgid "no epoch for branch %s"
msgstr "la branche %s n'a pas d'époque"
-#: cmd_list.cc:458
+#: ../cmd_list.cc:458
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -1034,7 +1447,7 @@ msgstr ""
"missing\n"
"changed"
-#: cmd_list.cc:469
+#: ../cmd_list.cc:469
#, fuzzy
msgid ""
"show database objects, or the current workspace manifest, \n"
@@ -1045,13 +1458,13 @@ msgstr ""
"travail actuel, ou des fichiers connus, inconnus, intentionnellement\n"
"ignorés, manquants ou changés"
-#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:66
-#: cmd_ws_commit.cc:242 cmd_ws_commit.cc:276 cmd_ws_commit.cc:311
-#: cmd_ws_commit.cc:336 cmd_ws_commit.cc:561 cmd_ws_commit.cc:661
+#: ../cmd_merging.cc:73 ../cmd_merging.cc:655 ../cmd_ws_commit.cc:66
+#: ../cmd_ws_commit.cc:242 ../cmd_ws_commit.cc:276 ../cmd_ws_commit.cc:311
+#: ../cmd_ws_commit.cc:336 ../cmd_ws_commit.cc:561 ../cmd_ws_commit.cc:661
msgid "workspace"
msgstr "espace de travail"
-#: cmd_merging.cc:74
+#: ../cmd_merging.cc:74
msgid ""
"update workspace.\n"
"This command modifies your workspace to be based off of a\n"
@@ -1066,18 +1479,18 @@ msgstr ""
"cette révision. Sinon, met à jour basé sur la révision d'entré de\n"
"la branche actuelle."
-#: cmd_merging.cc:95
+#: ../cmd_merging.cc:95
#, c-format
msgid "this workspace is a new project; cannot update"
msgstr ""
"cet espace de travail est un nouveau projet, impossible de mettre à jour"
-#: cmd_merging.cc:102
+#: ../cmd_merging.cc:102
#, c-format
msgid "updating along branch '%s'"
msgstr "mise à jour selon la branche « %s »"
-#: cmd_merging.cc:106
+#: ../cmd_merging.cc:106
#, fuzzy, c-format
msgid ""
"your request matches no descendents of the current revision\n"
@@ -1088,37 +1501,37 @@ msgstr ""
"actuelle. Elle ne correspond même pas à la révision actuelle.\n"
"Peut-être voulez-vous employer --revision=?"
-#: cmd_merging.cc:112
+#: ../cmd_merging.cc:112
#, c-format
msgid "multiple update candidates:"
msgstr "plusieurs candidats pour la mise à jour :"
-#: cmd_merging.cc:116
+#: ../cmd_merging.cc:116
#, c-format
msgid "choose one with '%s update -r'"
msgstr "choisissez en un avec « %s update -r »"
-#: cmd_merging.cc:117
+#: ../cmd_merging.cc:117
#, c-format
msgid "multiple update candidates remain after selection"
msgstr "il reste plusieurs candidats possible après la sélection"
-#: cmd_merging.cc:136
+#: ../cmd_merging.cc:136
#, c-format
msgid "already up to date at %s"
msgstr "déjà à jour en %s"
-#: cmd_merging.cc:144
+#: ../cmd_merging.cc:144
#, c-format
msgid "selected update target %s"
msgstr "sélection de la cible %s pour la mise à jour"
-#: cmd_merging.cc:171
+#: ../cmd_merging.cc:171
#, c-format
msgid "target revision is not in current branch"
msgstr "la révision cible n'est pas dans la branche actuelle"
-#: cmd_merging.cc:179
+#: ../cmd_merging.cc:179
#, fuzzy, c-format
msgid ""
"target revision is in multiple branches:%s\n"
@@ -1128,218 +1541,223 @@ msgstr ""
"la révision %s n'est pas membre de la branche %s\n"
"éssayez de nouveau avec un --branch explicit\n"
-#: cmd_merging.cc:187
+#: ../cmd_merging.cc:187
#, fuzzy, c-format
msgid "switching to branch %s"
msgstr "commence à confier sur la branche « %s »\n"
-#: cmd_merging.cc:192
+#: ../cmd_merging.cc:192
#, c-format
msgid ""
"target revision not in any branch\n"
"next commit will use branch %s"
msgstr ""
-#: cmd_merging.cc:262
+#: ../cmd_merging.cc:262
#, c-format
msgid "switched branch; next commit will use branch %s"
msgstr "changement de branche; le prochain commit utilisera la branche %s"
-#: cmd_merging.cc:263
+#: ../cmd_merging.cc:263
#, c-format
msgid "updated to base revision %s"
msgstr "mise à jour vers la révision de base %s"
-#: cmd_merging.cc:301
+#. Now it's time for the real work.
+#: ../cmd_merging.cc:301
#, c-format
msgid "[left] %s"
msgstr "[gauche] %s"
-#: cmd_merging.cc:302
+#: ../cmd_merging.cc:302
#, c-format
msgid "[right] %s"
msgstr "[droite] %s"
-#: cmd_merging.cc:313 cmd_merging.cc:584
+#: ../cmd_merging.cc:313 ../cmd_merging.cc:584
#, c-format
msgid "[merged] %s"
msgstr "[fusionné] %s"
-#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588
-#: cmd_merging.cc:821 cmd_ws_commit.cc:421 cmd_ws_commit.cc:907
-#: cmd_ws_commit.cc:930 cmd_ws_commit.cc:944
+#. should merge support --message, --message-file? It seems somewhat weird,
+#. since a single 'merge' command may perform arbitrarily many actual merges.
+#. (Possibility: append the --message/--message-file text to the synthetic
+#. log message constructed in merge_two().)
+#: ../cmd_merging.cc:320 ../cmd_merging.cc:419 ../cmd_merging.cc:430
+#: ../cmd_merging.cc:588 ../cmd_merging.cc:821 ../cmd_ws_commit.cc:421
+#: ../cmd_ws_commit.cc:901 ../cmd_ws_commit.cc:924 ../cmd_ws_commit.cc:938
msgid "tree"
msgstr "arborescence"
-#: cmd_merging.cc:320
+#: ../cmd_merging.cc:320
msgid "merge unmerged heads of branch"
msgstr "fusionne les entrées de la branche non fusionnées"
-#: cmd_merging.cc:330 cmd_merging.cc:829
+#: ../cmd_merging.cc:330 ../cmd_merging.cc:829
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "veuillez préciser une branche avec --branch=BRANCHE"
-#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834
-#: cmd_ws_commit.cc:445
+#: ../cmd_merging.cc:335 ../cmd_merging.cc:469 ../cmd_merging.cc:472
+#: ../cmd_merging.cc:834 ../cmd_ws_commit.cc:445
#, c-format
msgid "branch '%s' is empty"
msgstr "la branche « %s » est vide"
-#: cmd_merging.cc:338
+#: ../cmd_merging.cc:338
#, c-format
msgid "branch '%s' is already merged"
msgstr "la branche « %s » est déjà fusionnée"
-#: cmd_merging.cc:342
+#: ../cmd_merging.cc:342
#, c-format
msgid "%d head on branch '%s'"
msgid_plural "%d heads on branch '%s'"
msgstr[0] "il y %d entrée dans la branche « %s »"
msgstr[1] "il y a %d entrées dans la branche « %s »"
-#: cmd_merging.cc:363 cmd_merging.cc:408
+#: ../cmd_merging.cc:363 ../cmd_merging.cc:408
#, c-format
msgid "merge %d / %d:"
msgstr "fusionné %d / %d :"
-#: cmd_merging.cc:364
+#: ../cmd_merging.cc:364
#, c-format
msgid "calculating best pair of heads to merge next"
msgstr ""
-#: cmd_merging.cc:416
+#: ../cmd_merging.cc:416
#, c-format
msgid "note: your workspaces have not been updated"
msgstr "note: vos espaces de travail n'ont pas été mis à jour"
-#: cmd_merging.cc:419
+#: ../cmd_merging.cc:419
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION"
-#: cmd_merging.cc:420
+#: ../cmd_merging.cc:420
msgid "merge from one branch to another asymmetrically"
msgstr "fusion d'une branche à une autre asymétriquement"
-#: cmd_merging.cc:430
+#: ../cmd_merging.cc:430
msgid "SOURCE-BRANCH DEST-BRANCH DIR"
msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION DOSSIER"
-#: cmd_merging.cc:431
+#: ../cmd_merging.cc:431
msgid "merge one branch into a subdirectory in another branch"
msgstr "fusionnez une branche dans un sous-dossier d'une autre branche"
-#: cmd_merging.cc:470 cmd_merging.cc:473
+#: ../cmd_merging.cc:470 ../cmd_merging.cc:473
#, c-format
msgid "branch '%s' is not merged"
msgstr "la branche « %s » n'est pas fusionnée"
-#: cmd_merging.cc:478
+#: ../cmd_merging.cc:478
#, c-format
msgid "propagating %s -> %s"
msgstr "propage %s -> %s"
-#: cmd_merging.cc:479
+#: ../cmd_merging.cc:479
#, c-format
msgid "[source] %s"
msgstr "[source] %s"
-#: cmd_merging.cc:480
+#: ../cmd_merging.cc:480
#, c-format
msgid "[target] %s"
msgstr "[cible] %s"
-#: cmd_merging.cc:485
+#: ../cmd_merging.cc:485
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'"
msgstr "la branche « %s » est à jour par rapport à la branche « %s »"
-#: cmd_merging.cc:487
+#: ../cmd_merging.cc:487
#, c-format
msgid "no action taken"
msgstr "rien n'a été fait"
-#: cmd_merging.cc:491
+#: ../cmd_merging.cc:491
#, c-format
msgid "no merge necessary; putting %s in branch '%s'"
msgstr "fusion non nécessaire; met %s dans la branche « %s »"
-#: cmd_merging.cc:529
+#: ../cmd_merging.cc:529
#, c-format
msgid "Path %s not found in destination tree."
msgstr "Chemin %s pas trouvé dans l'arborescence de destination."
-#: cmd_merging.cc:589
+#: ../cmd_merging.cc:589
msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
msgstr "RÃVISION-GAUCHE RÃVISION-DROITE BRANCHE-DESTINATION"
-#: cmd_merging.cc:590
+#: ../cmd_merging.cc:590
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"
-#: cmd_merging.cc:605
+#: ../cmd_merging.cc:605
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s et %s sont la même révision, j'abandonne"
-#: cmd_merging.cc:607 cmd_merging.cc:609
+#: ../cmd_merging.cc:607 ../cmd_merging.cc:609
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s est déjà un ancêtre de %s"
-#: cmd_merging.cc:614
+#: ../cmd_merging.cc:614
msgid "REV REV"
msgstr "RÃV RÃV"
-#: cmd_merging.cc:615
+#: ../cmd_merging.cc:615
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."
-#: cmd_merging.cc:625 cmd_merging.cc:627
+#: ../cmd_merging.cc:625 ../cmd_merging.cc:627
#, c-format
msgid "%s is an ancestor of %s; no merge is needed."
msgstr "%s est un ancêtre de %s; aucune fusion n'est nécessaire."
-#: cmd_merging.cc:641
+#: ../cmd_merging.cc:641
#, c-format
msgid "There are %s node_name_conflicts."
msgstr "Il y a %s node_name_conflicts."
-#: cmd_merging.cc:643
+#: ../cmd_merging.cc:643
#, c-format
msgid "There are %s file_content_conflicts."
msgstr "Il y a %s file_content_conflicts."
-#: cmd_merging.cc:645
+#: ../cmd_merging.cc:645
#, c-format
msgid "There are %s node_attr_conflicts."
msgstr "Il y a %s node_attr_conflicts."
-#: cmd_merging.cc:647
+#: ../cmd_merging.cc:647
#, c-format
msgid "There are %s orphaned_node_conflicts."
msgstr "Il y a %s orphaned_node_conflicts."
-#: cmd_merging.cc:649
+#: ../cmd_merging.cc:649
#, c-format
msgid "There are %s rename_target_conflicts."
msgstr "Il y a %s rename_target_conflicts."
-#: cmd_merging.cc:651
+#: ../cmd_merging.cc:651
#, c-format
msgid "There are %s directory_loop_conflicts."
msgstr "Il y a %s directory_loop_conflicts."
-#: cmd_merging.cc:655
+#: ../cmd_merging.cc:655
msgid "[-r FROM] -r TO [PATH...]"
msgstr "[-r DEPUIS] -r VERS [CHEMIN...]"
-#: cmd_merging.cc:656
+#: ../cmd_merging.cc:656
msgid ""
"Apply changes made at arbitrary places in history to current workspace.\n"
"This command takes changes made at any point in history, and\n"
@@ -1355,7 +1773,7 @@ msgstr ""
"first revision to the second."
msgstr ""
-#: cmd_merging.cc:681
+#: ../cmd_merging.cc:681
#, c-format
msgid ""
"revision %s is a merge\n"
@@ -1366,129 +1784,130 @@ msgstr ""
"pour appliquer les changements relatifs à un de ces parents, utiliser :\n"
" %s pluck -r PARENT -r %s"
-#: cmd_merging.cc:702
+#: ../cmd_merging.cc:702
#, c-format
msgid "no changes to apply"
msgstr "aucun changement à appliquer"
-#: cmd_merging.cc:759
+#: ../cmd_merging.cc:759
#, c-format
msgid "no changes to be applied"
msgstr "aucun changement à appliquer"
-#: cmd_merging.cc:786
+#: ../cmd_merging.cc:786
#, c-format
msgid "no changes were applied"
msgstr "aucun changement n'ont été appliqués"
-#: cmd_merging.cc:789
+#: ../cmd_merging.cc:789
#, c-format
msgid "applied changes to workspace"
msgstr "les changements ont été appliqués l'espace de travail"
-#: cmd_merging.cc:821
+#: ../cmd_merging.cc:821
msgid "show unmerged head revisions of branch"
msgstr "affiche les entrées non fusionné de la branche"
-#: cmd_merging.cc:836
+#: ../cmd_merging.cc:836
#, c-format
msgid "branch '%s' is currently merged:"
msgstr "la branche « %s » est actuellement fusionnée :"
-#: cmd_merging.cc:838
+#: ../cmd_merging.cc:838
#, c-format
msgid "branch '%s' is currently unmerged:"
msgstr "la branche « %s » n'est actuellement pas fusionnée :"
-#: cmd_merging.cc:846
+#: ../cmd_merging.cc:846
msgid "dump the roster associated with the given REVID"
msgstr "décharge la list associée avec l'ID_RÃV donnée"
-#: cmd_netsync.cc:42
+#: ../cmd_netsync.cc:40
#, c-format
msgid "setting default server to %s"
msgstr "paramétrage de l'adresse par défaut du serveur à %s"
-#: cmd_netsync.cc:48
+#: ../cmd_netsync.cc:46
#, c-format
msgid "no hostname given"
msgstr "aucun nom d'hôte fourni"
-#: cmd_netsync.cc:50
+#: ../cmd_netsync.cc:48
#, c-format
msgid "no server given and no default server set"
msgstr "aucun serveur donné et aucun serveur établi comme défaut"
-#: cmd_netsync.cc:78 cmd_netsync.cc:98
+#: ../cmd_netsync.cc:59 ../cmd_netsync.cc:79
#, c-format
msgid "no branch pattern given"
msgstr "aucun motif de branche fourni"
-#: cmd_netsync.cc:86
+#: ../cmd_netsync.cc:67
#, fuzzy, c-format
msgid "setting default branch include pattern to '%s'"
msgstr "établi le motif de branche à inclure par défaut à « %s »\n"
-#: cmd_netsync.cc:92
+#: ../cmd_netsync.cc:73
#, c-format
msgid "setting default branch exclude pattern to '%s'"
msgstr "paramétrage du motif de branche à exclure par défaut à « %s »"
-#: cmd_netsync.cc:100
+#: ../cmd_netsync.cc:81
#, 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"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144 cmd_netsync.cc:188
+#: ../cmd_netsync.cc:97 ../cmd_netsync.cc:112 ../cmd_netsync.cc:126
+#: ../cmd_netsync.cc:173
msgid "network"
msgstr "réseau"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144
+#: ../cmd_netsync.cc:97 ../cmd_netsync.cc:112 ../cmd_netsync.cc:126
msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
msgstr "[ADRESSE[:PORT] [MOTIF]]"
-#: cmd_netsync.cc:117
+#: ../cmd_netsync.cc:98
msgid "push branches matching PATTERN to netsync server at ADDRESS"
msgstr ""
"envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE"
-#: cmd_netsync.cc:130
+#: ../cmd_netsync.cc:113
msgid "pull branches matching PATTERN from netsync server at ADDRESS"
msgstr ""
"récupère les branches correspondant au MOTIF du serveur netsync à ADRESSE"
-#: cmd_netsync.cc:138
+#: ../cmd_netsync.cc:120
#, fuzzy, c-format
msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
msgstr ""
"récupération anonyme; utilisez -kNOMCLEF si vous avez besoin d'une "
"authentification\n"
-#: cmd_netsync.cc:145
+#: ../cmd_netsync.cc:127
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
msgstr ""
"synchronise les branches correspondant au MOTIF au serveur netsync à ADRESSE"
-#: cmd_netsync.cc:164
+#: ../cmd_netsync.cc:149
#, c-format
msgid "pid file '%s' already exists"
msgstr "le fichier pid « %s » existe déjà "
-#: cmd_netsync.cc:166
+#: ../cmd_netsync.cc:151
#, c-format
msgid "failed to create pid file '%s'"
msgstr "impossible de créer le fichier pid « %s »"
-#: cmd_netsync.cc:188
+#: ../cmd_netsync.cc:173
msgid "PATTERN ..."
msgstr "CHEMIN ..."
-#: cmd_netsync.cc:189
+#: ../cmd_netsync.cc:174
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"
-#: cmd_netsync.cc:205
+#: ../cmd_netsync.cc:190
#, c-format
msgid ""
"need permission to store persistent passphrase (see hook persist_phrase_ok())"
@@ -1496,18 +1915,18 @@ msgstr ""
"il faut vôtre permission pour garder la phrase de passe de façon persistante "
"(voyez la procédure automatique persiste_phrase_ok())"
-#: cmd_netsync.cc:211
+#: ../cmd_netsync.cc:196
#, c-format
msgid ""
"The --no-transport-auth option is only permitted in combination with --stdio"
msgstr ""
"L'option --no-transport-auth n'est permise qu'en combinaison avec --stdio"
-#: cmd_othervcs.cc:15
+#: ../cmd_othervcs.cc:15
msgid "RCSFILE..."
msgstr "FICHIER_RCS..."
-#: cmd_othervcs.cc:16
+#: ../cmd_othervcs.cc:16
msgid ""
"parse versions in RCS files\n"
"this command doesn't reconstruct or import revisions.you probably want "
@@ -1517,69 +1936,69 @@ msgstr ""
"cette commande ne reconstruit ou n'importe pas des révisions. Vous voulez\n"
"probablement cvs_import"
-#: cmd_othervcs.cc:32
+#: ../cmd_othervcs.cc:32
msgid "rcs"
msgstr "rcs"
-#: cmd_othervcs.cc:32
+#: ../cmd_othervcs.cc:32
msgid "CVSROOT"
msgstr "CVSROOT"
-#: cmd_othervcs.cc:33
+#: ../cmd_othervcs.cc:33
msgid "import all versions in CVS repository"
msgstr "importer toutes les versions d'un dépôt CVS"
-#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69
+#: ../cmd_packet.cc:21 ../cmd_packet.cc:50 ../cmd_packet.cc:69
msgid "packet i/o"
msgstr "e/s de paquets"
-#: cmd_packet.cc:21 cmd_packet.cc:50
+#: ../cmd_packet.cc:21 ../cmd_packet.cc:50
msgid "ID"
msgstr "ID"
-#: cmd_packet.cc:22
+#: ../cmd_packet.cc:22
msgid "write public key packet to stdout"
msgstr "écrire un pacquet pour un clef publique sur la sortie standard"
-#: cmd_packet.cc:44
+#: ../cmd_packet.cc:44
#, c-format
msgid "public key '%s' does not exist"
msgstr "la clef publique « %s » n'existe pas"
-#: cmd_packet.cc:51
+#: ../cmd_packet.cc:51
msgid "write private key packet to stdout"
msgstr "écrire un pacquet pour un clef privée sur la sortie standard"
-#: cmd_packet.cc:59
+#: ../cmd_packet.cc:59
#, 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"
-#: cmd_packet.cc:70
+#: ../cmd_packet.cc:70
msgid "read packets from files or stdin"
msgstr "lecture des paquets depuis des fichiers ou l'entrée standard"
-#: cmd_packet.cc:78
+#: ../cmd_packet.cc:78
#, c-format
msgid "no packets found on stdin"
msgstr "aucun paquet trouvé sur l'entrée standard"
-#: cmd_packet.cc:90
+#: ../cmd_packet.cc:90
#, 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"
-#: cmd_packet.cc:94
+#: ../cmd_packet.cc:94
#, c-format
msgid "read %d packet"
msgid_plural "read %d packets"
msgstr[0] "lu %d paquet"
msgstr[1] "lu %d paquets"
-#: cmd_ws_commit.cc:45
+#: ../cmd_ws_commit.cc:45
#, fuzzy
msgid ""
"Enter a description of this change.\n"
@@ -1588,65 +2007,65 @@ msgstr ""
"Saisissez une description pour cette modification.\n"
"Les lignes débutant par « MTN: » sont supprimées automatiquement.\n"
-#: cmd_ws_commit.cc:62
+#: ../cmd_ws_commit.cc:62
#, c-format
msgid "edit of log message failed"
msgstr "l'édition du message du journal a échoué"
-#: cmd_ws_commit.cc:67
+#: ../cmd_ws_commit.cc:67
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"
-#: cmd_ws_commit.cc:75
+#: ../cmd_ws_commit.cc:75
#, c-format
msgid "you must pass at least one path to 'revert' (perhaps '.')"
msgstr "vous devez fournir au moins un chemin à « revert » (peut-être « . » ?)"
-#: cmd_ws_commit.cc:95
+#: ../cmd_ws_commit.cc:95
#, c-format
msgid "no missing files to revert"
msgstr "aucun fichier manquant à rétablir"
-#: cmd_ws_commit.cc:150
+#: ../cmd_ws_commit.cc:150
#, c-format
msgid "reverting %s"
msgstr "retourne %s à la révision de base"
-#: cmd_ws_commit.cc:154
+#: ../cmd_ws_commit.cc:154
#, 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"
-#: cmd_ws_commit.cc:167
+#: ../cmd_ws_commit.cc:167
#, c-format
msgid "recreating %s/"
msgstr "re-crée %s/"
-#: cmd_ws_commit.cc:190
+#: ../cmd_ws_commit.cc:190
msgid "disapprove of a particular revision"
msgstr "désapprouver une révision en particulier"
-#: cmd_ws_commit.cc:203
-#, fuzzy, c-format
-msgid "revision %s has %d changesets, cannot invert"
+#: ../cmd_ws_commit.cc:203
+#, 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"
-#: cmd_ws_commit.cc:207
+#: ../cmd_ws_commit.cc:207
#, c-format
msgid "need --branch argument for disapproval"
msgstr "il faut un argument --branch pour désapprouver"
-#: cmd_ws_commit.cc:243
+#: ../cmd_ws_commit.cc:243
msgid "add files to workspace"
msgstr "ajouter des fichiers à l'espace de travail"
-#: cmd_ws_commit.cc:277
+#: ../cmd_ws_commit.cc:277
msgid "drop files from workspace"
msgstr "supprimer des fichiers de l'espace de travail"
-#: cmd_ws_commit.cc:312
+#: ../cmd_ws_commit.cc:312
msgid ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
@@ -1654,15 +2073,15 @@ msgstr ""
"SOURCE DESTINATION\n"
"SOURCE1 [SOURCE2 [...]] DOSSIER_DESTINATION"
-#: cmd_ws_commit.cc:314
+#: ../cmd_ws_commit.cc:314
msgid "rename entries in the workspace"
msgstr "renommer des entrées dans l'espace de travail"
-#: cmd_ws_commit.cc:336
+#: ../cmd_ws_commit.cc:336
msgid "NEW_ROOT PUT_OLD"
msgstr "RACINE_NOUVELLE PLACE_ANCIENNE"
-#: cmd_ws_commit.cc:337
+#: ../cmd_ws_commit.cc:337
msgid ""
"rename the root directory\n"
"after this command, the directory that currently has the name NEW_ROOT\n"
@@ -1676,31 +2095,38 @@ msgstr ""
"deviendra le dossier appelé PLACE_ANCIENNE.\n"
"Il est fortement recommandé d'employer --execute."
-#: cmd_ws_commit.cc:355
+#: ../cmd_ws_commit.cc:355
msgid "show status of workspace"
msgstr "afficher l'état de l'espace de travail"
-#: cmd_ws_commit.cc:384
+#. We intentionally do not collapse the final \n into the format
+#. strings here, for consistency with newline conventions used by most
+#. other format strings.
+#: ../cmd_ws_commit.cc:384
#, c-format
msgid "Current branch: %s"
msgstr "Branche actuelle : %s"
-#: cmd_ws_commit.cc:390
+#. A colon at the end of this string looked nicer, but it made
+#. double-click copying from terminals annoying.
+#: ../cmd_ws_commit.cc:390
#, c-format
msgid "Changes against parent %s"
msgstr "Changement par rapport au parent %s"
-#: cmd_ws_commit.cc:395
+#: ../cmd_ws_commit.cc:395
#, c-format
msgid " no changes"
-msgstr " aucun changement"
+msgstr ""
+" aucun changement"
-#: cmd_ws_commit.cc:399
+#: ../cmd_ws_commit.cc:399
#, c-format
msgid " dropped %s"
-msgstr " supprime %s"
+msgstr ""
+" supprime %s"
-#: cmd_ws_commit.cc:404
+#: ../cmd_ws_commit.cc:404
#, c-format
msgid ""
" renamed %s\n"
@@ -1709,21 +2135,23 @@ msgstr ""
" renomme %s\n"
" en %s"
-#: cmd_ws_commit.cc:409 cmd_ws_commit.cc:413
+#: ../cmd_ws_commit.cc:409 ../cmd_ws_commit.cc:413
#, c-format
msgid " added %s"
-msgstr " ajoute %s"
+msgstr ""
+" ajoute %s"
-#: cmd_ws_commit.cc:417
+#: ../cmd_ws_commit.cc:417
#, c-format
msgid " patched %s"
-msgstr " modifie %s"
+msgstr ""
+" modifie %s"
-#: cmd_ws_commit.cc:421 cmd_ws_commit.cc:907 cmd_ws_commit.cc:930
-msgid "[DIRECTORY]"
-msgstr "[DOSSIER]"
+#: ../cmd_ws_commit.cc:421
+msgid "[DIRECTORY]\n"
+msgstr "[DOSSIER]\n"
-#: cmd_ws_commit.cc:422
+#: ../cmd_ws_commit.cc:422
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"
@@ -1737,47 +2165,47 @@ msgstr ""
"Si aucun nom de dossier n'est fourni, le nom de la branche sera utilisé\n"
"comme nom de dossier"
-#: cmd_ws_commit.cc:440
+#: ../cmd_ws_commit.cc:440
#, c-format
msgid "use --revision or --branch to specify what to checkout"
msgstr "utiliser --revision ou --branch pour préciser quoi récupérer"
-#: cmd_ws_commit.cc:448
+#: ../cmd_ws_commit.cc:448
#, c-format
msgid "branch %s has multiple heads:"
msgstr "la branche %s a plusieurs entrées :"
-#: cmd_ws_commit.cc:451
+#: ../cmd_ws_commit.cc:451
#, fuzzy, c-format
msgid "choose one with '%s checkout -r'"
msgstr "choisissez en un avec « %s update -r »\n"
-#: cmd_ws_commit.cc:452
+#: ../cmd_ws_commit.cc:452
#, c-format
msgid "branch %s has multiple heads"
msgstr "la branche %s a plusieurs entrées"
-#: cmd_ws_commit.cc:479
+#: ../cmd_ws_commit.cc:479
#, c-format
msgid "revision %s is not a member of branch %s"
msgstr "la révision %s n'est pas membre de la branche %s"
-#: cmd_ws_commit.cc:496
+#: ../cmd_ws_commit.cc:496
#, c-format
msgid "you must specify a destination directory"
msgstr "vous devez préciser un dossier de destination"
-#: cmd_ws_commit.cc:509
+#: ../cmd_ws_commit.cc:509
#, fuzzy, c-format
msgid "checkout directory '%s' already exists"
msgstr "le fichier « %s » existe déjà "
-#: cmd_ws_commit.cc:543
+#: ../cmd_ws_commit.cc:543
#, c-format
msgid "no file %s found in database for %s"
msgstr "aucun fichier « %s » trouvé dans la base de données pour %s"
-#: cmd_ws_commit.cc:561
+#: ../cmd_ws_commit.cc:561
msgid ""
"set PATH ATTR VALUE\n"
"get PATH [ATTR]\n"
@@ -1787,45 +2215,45 @@ msgstr ""
"get CHEMIN [ATTR]\n"
"drop CHEMIN [ATTR]"
-#: cmd_ws_commit.cc:562
+#: ../cmd_ws_commit.cc:562
msgid "set, get or drop file attributes"
msgstr "établis, obtiens ou supprime des attributs de fichiers"
-#: cmd_ws_commit.cc:579
+#: ../cmd_ws_commit.cc:579
#, c-format
msgid "Unknown path '%s'"
msgstr "Chemin inconnu « %s »"
-#: cmd_ws_commit.cc:608
-#, fuzzy, c-format
-msgid "Path '%s' does not have attribute '%s'"
+#: ../cmd_ws_commit.cc:608
+#, c-format
+msgid "Path '%s' does not have attribute '%s'\n"
msgstr "Le chemin « %s » n'a pas d'attribut « %s »\n"
-#: cmd_ws_commit.cc:638
+#: ../cmd_ws_commit.cc:638
#, c-format
msgid "No attributes for '%s'"
msgstr "Pas d'attributs pour « %s »"
-#: cmd_ws_commit.cc:649
+#: ../cmd_ws_commit.cc:649
#, c-format
msgid "No attribute '%s' on path '%s'"
msgstr "Pas d'attribut « %s » pour le chemin « %s »"
-#: cmd_ws_commit.cc:662
+#: ../cmd_ws_commit.cc:662
msgid "commit workspace to database"
msgstr "confie un espace de travail à la base de données"
-#: cmd_ws_commit.cc:693
+#: ../cmd_ws_commit.cc:693
#, c-format
msgid "no changes to commit"
msgstr "aucun changement à confier"
-#: cmd_ws_commit.cc:713
+#: ../cmd_ws_commit.cc:707
#, fuzzy, c-format
msgid "beginning commit on branch '%s'"
msgstr "commence à confier sur la branche « %s »\n"
-#: cmd_ws_commit.cc:722
+#: ../cmd_ws_commit.cc:716
#, fuzzy, c-format
msgid ""
"_MTN/log is non-empty and log message was specified on command line\n"
@@ -1837,37 +2265,37 @@ msgstr ""
"veuillez déplacé ou supprimer MT/log,\n"
"ou supprimer --message/--message-file de la linge de commande"
-#: cmd_ws_commit.cc:737
+#: ../cmd_ws_commit.cc:731
#, fuzzy, c-format
msgid "empty log message; commit canceled"
msgstr "message du journal vide; confidence arrêtée"
-#: cmd_ws_commit.cc:759
+#: ../cmd_ws_commit.cc:753
#, c-format
msgid "log message rejected by hook: %s"
msgstr "entrée du journal rejetée par le hook : %s"
-#: cmd_ws_commit.cc:767
+#: ../cmd_ws_commit.cc:761
#, c-format
msgid "revision %s already in database"
msgstr "la révision %s est déjà dans la base de données"
-#: cmd_ws_commit.cc:806 cmd_ws_commit.cc:836
+#: ../cmd_ws_commit.cc:800 ../cmd_ws_commit.cc:830
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "le fichier « %s » a été modifié pendant le commit, interruption"
-#: cmd_ws_commit.cc:818
+#: ../cmd_ws_commit.cc:812
#, fuzzy, c-format
msgid "Your database is missing version %s of file '%s'"
msgstr "le sondage de la version de la base de données dans « %s » a échouée"
-#: cmd_ws_commit.cc:868
+#: ../cmd_ws_commit.cc:862
#, c-format
msgid "committed revision %s"
msgstr "révision %s commitée"
-#: cmd_ws_commit.cc:874
+#: ../cmd_ws_commit.cc:868
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1876,74 +2304,79 @@ msgstr ""
"note: cette révision a créé une divergence\n"
"note: peut-être (ou peut-être pas) voulez-vous exécuter « %s merge » ?"
-#: cmd_ws_commit.cc:908
+#: ../cmd_ws_commit.cc:901 ../cmd_ws_commit.cc:924
+msgid "[DIRECTORY]"
+msgstr "[DOSSIER]"
+
+#: ../cmd_ws_commit.cc:902
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"
-#: cmd_ws_commit.cc:914
+#: ../cmd_ws_commit.cc:908
#, c-format
msgid "need --branch argument for setup"
msgstr "setup a besoin d'un argument pour --branch"
-#: cmd_ws_commit.cc:931
+#: ../cmd_ws_commit.cc:925
msgid ""
"migrate a workspace directory's metadata to the latest format; defaults to "
"the current workspace"
msgstr ""
-#: cmd_ws_commit.cc:944
+#: ../cmd_ws_commit.cc:938
msgid "refresh the inodeprint cache"
msgstr "rafraîchir le cache d'inodeprint"
-#: commands.cc:131 commands.cc:233
+#: ../commands.cc:131 ../commands.cc:233
#, c-format
msgid "unknown command '%s'"
msgstr "commande inconnue « %s »"
-#: commands.cc:142
-#, fuzzy, c-format
-msgid "command '%s' has multiple ambiguous expansions:"
+#. more than one matched command
+#: ../commands.cc:142
+#, c-format
+msgid "command '%s' has multiple ambiguous expansions:\n"
msgstr "la commande « %s » a plusieurs expansions ambiguës : \n"
-#: commands.cc:175
+#: ../commands.cc:175
msgid "commands:"
msgstr "commandes :"
-#: commands.cc:252
+#: ../commands.cc:252
msgid "command [ARGS...]"
msgstr "commande [ARGUMENTS...]"
-#: commands.cc:252
+#: ../commands.cc:252
msgid "display command help"
msgstr "afficher l'aide de la commande"
-#: commands.cc:395
+#: ../commands.cc:395
#, c-format
msgid "expanding selection '%s'"
msgstr "expansion de la sélection « %s »"
-#: commands.cc:403
+#: ../commands.cc:403
#, c-format
msgid "no match for selection '%s'"
msgstr "aucune correspondance pour la sélection « %s »"
-#: commands.cc:409
+#: ../commands.cc:409
#, fuzzy, c-format
msgid "expanded to '%s'"
msgstr "expansion à « %s »\n"
-#: commands.cc:426
-#, fuzzy, c-format
-msgid "selection '%s' has multiple ambiguous expansions:"
+#: ../commands.cc:426
+#, c-format
+msgid "selection '%s' has multiple ambiguous expansions: \n"
msgstr "la sélection « %s » a plusieurs expansions ambiguës : \n"
-#: commands.cc:443
+#: ../commands.cc:443
msgid "note: "
msgstr "note : "
-#: commands.cc:444
+#: ../commands.cc:444
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
@@ -1952,72 +2385,74 @@ msgstr ""
"la branche « %s » a plusieurs heads\n"
"vous devriez peut-être lancer « %s merge »"
-#: commands.cc:458
+#: ../commands.cc:458
#, c-format
msgid "--message and --message-file are mutually exclusive"
msgstr "--message et --message-file sont mutuellement exclusifs"
-#: database_check.cc:129
+#: ../database_check.cc:129
#, c-format
msgid "file structure is corrupted; cannot check further"
msgstr ""
"la structure du fichier est corrompue; impossible de faire plus de "
"vérifications"
-#: database_check.cc:140
+#: ../database_check.cc:140
msgid "files"
msgstr "fichiers"
-#: database_check.cc:169
+#: ../database_check.cc:169
msgid "rosters"
msgstr "listes"
-#: database_check.cc:227
+#: ../database_check.cc:227
msgid "markings"
msgstr "marquages"
-#: database_check.cc:298 netsync.cc:2967 rcs_import.cc:1244
+#. xgettext: please use short message and try to avoid multibytes chars
+#: ../database_check.cc:298 ../netsync.cc:2967 ../rcs_import.cc:1244
msgid "revisions"
msgstr "révisions"
-#: database_check.cc:393
+#: ../database_check.cc:393
msgid "ancestry"
msgstr "ancêtre"
-#: database_check.cc:426 netsync.cc:2971
+#. xgettext: please use short message and try to avoid multibytes chars
+#: ../database_check.cc:426 ../netsync.cc:2971
msgid "keys"
msgstr "clefs"
-#: database_check.cc:452
+#: ../database_check.cc:452
msgid "certs"
msgstr "certifs"
-#: database_check.cc:489
+#: ../database_check.cc:489
#, c-format
msgid "file %s missing (%d manifest references)"
msgstr "fichier %s manquant (%d références du manifeste)"
-#: database_check.cc:496
+#: ../database_check.cc:496
#, c-format
msgid "file %s unreferenced"
msgstr "fichier %s non-référencé"
-#: database_check.cc:515
+#: ../database_check.cc:515
#, c-format
msgid "roster %s unreferenced"
msgstr "liste %s non-référencée"
-#: database_check.cc:521
+#: ../database_check.cc:521
#, c-format
msgid "roster %s incomplete (%d missing files)"
msgstr "liste %s incomplète (%d fichiers manquants)"
-#: database_check.cc:528
+#: ../database_check.cc:528
#, c-format
msgid "roster %s incomplete (%d missing revisions)"
msgstr "liste %s incomplète (%d révisions manquantes)"
-#: database_check.cc:553
+#: ../database_check.cc:553
#, c-format
msgid ""
"revision %s missing (%d revision references; %d cert references; %d parent "
@@ -2026,206 +2461,207 @@ msgstr ""
"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)"
-#: database_check.cc:561
+#: ../database_check.cc:561
#, c-format
msgid "revision %s incomplete (%d missing manifests)"
msgstr "révision %s incomplète (%d manifestes manquants)"
-#: database_check.cc:568
+#: ../database_check.cc:568
#, c-format
msgid "revision %s incomplete (%d missing revisions)"
msgstr "révision %s incomplète (%d révisions manquantes)"
-#: database_check.cc:575
+#: ../database_check.cc:575
#, c-format
msgid "revision %s incomplete (missing roster)"
msgstr "révision %s incomplète (la liste manque)"
-#: database_check.cc:581
+#: ../database_check.cc:581
#, c-format
msgid "revision %s mismatched roster and manifest"
msgstr ""
"la liste et la manifeste de la révision %s ne s'entre-correspondent pas"
-#: database_check.cc:587
+#: ../database_check.cc:587
#, c-format
msgid "revision %s incomplete (incomplete roster)"
msgstr "révision %s incomplète (liste incomplète)"
-#: database_check.cc:593
+#: ../database_check.cc:593
#, fuzzy, c-format
msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)"
msgstr ""
"révision %s a des parents non-correspondents (%d parents; %d révision "
"référencées)\n"
-#: database_check.cc:602
+#: ../database_check.cc:602
#, c-format
msgid "revision %s mismatched children (%d ancestry children; %d parents)"
-msgstr "révision %s a des enfants non-correspondant (%d enfants; %d parents)"
+msgstr ""
+"révision %s a des enfants non-correspondant (%d enfants; %d parents)"
-#: database_check.cc:614
+#: ../database_check.cc:614
#, fuzzy, c-format
msgid "revision %s has bad history (%s)"
msgstr "la révision %s a une mauvaise histoire (%s)\n"
-#: database_check.cc:621
+#: ../database_check.cc:621
#, fuzzy, c-format
msgid "revision %s is not parseable (perhaps with unnormalized paths?)"
msgstr ""
"la révision %s n'est pas analysable (peut-être a-t'elle des chemins non "
"normalisé?)\n"
-#: database_check.cc:628
+#: ../database_check.cc:628
#, c-format
msgid "revision %s is not in normalized form"
msgstr "la révision %s n'est pas en forme normalisée"
-#: database_check.cc:652
+#: ../database_check.cc:652
#, c-format
msgid "key %s missing (signed %d certs)"
msgstr "la clef %s est manquante (elle a signé %d certifs)"
-#: database_check.cc:685
+#: ../database_check.cc:685
#, fuzzy, c-format
msgid "revision %s unchecked signature in %s cert from missing key %s"
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:693
+#: ../database_check.cc:693
#, fuzzy, c-format
msgid "revision %s bad signature in %s cert from key %s"
msgstr ""
"la révision %s a une mauvaise signature dans le certif %s, faite avec la "
"clef %s\n"
-#: database_check.cc:708
+#: ../database_check.cc:708
#, fuzzy, c-format
msgid "revision %s missing %s cert"
msgstr "la révision %s manque le certif %s\n"
-#: database_check.cc:717
+#: ../database_check.cc:717
#, fuzzy, c-format
msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)"
msgstr ""
"révision %s a des certifs non-correspondant (%d auteurs %d dates %d entrées "
"de journal)\n"
-#: database_check.cc:797
+#: ../database_check.cc:797
#, c-format
msgid "%d missing files"
msgstr "%d fichiers manquants"
-#: database_check.cc:799
+#: ../database_check.cc:799
#, c-format
msgid "%d unreferenced files"
msgstr "%d fichiers non-référencés"
-#: database_check.cc:802
+#: ../database_check.cc:802
#, c-format
msgid "%d unreferenced rosters"
msgstr "%d listes non-référencées"
-#: database_check.cc:804
+#: ../database_check.cc:804
#, c-format
msgid "%d incomplete rosters"
msgstr "%d listes incomplètes"
-#: database_check.cc:807
+#: ../database_check.cc:807
#, c-format
msgid "%d missing revisions"
msgstr "%d révisions manquantes"
-#: database_check.cc:809
+#: ../database_check.cc:809
#, c-format
msgid "%d incomplete revisions"
msgstr "%d révisions incomplètes"
-#: database_check.cc:811
+#: ../database_check.cc:811
#, c-format
msgid "%d mismatched parents"
msgstr "%d parents non correspondants"
-#: database_check.cc:813
+#: ../database_check.cc:813
#, c-format
msgid "%d mismatched children"
msgstr "%d enfants non correspondants"
-#: database_check.cc:815
+#: ../database_check.cc:815
#, c-format
msgid "%d revisions with bad history"
msgstr "%d révisions avec un mauvais historique"
-#: database_check.cc:817
+#: ../database_check.cc:817
#, c-format
msgid "%d revisions not parseable (perhaps with invalid paths)"
msgstr ""
"%d révisions non analysables (peut-être ont-elles des chemins invalides ?)"
-#: database_check.cc:820
+#: ../database_check.cc:820
#, c-format
msgid "%d revisions not in normalized form"
msgstr "%d révisions non normalisées"
-#: database_check.cc:824
+#: ../database_check.cc:824
#, c-format
msgid "%d missing rosters"
msgstr "%d listes manquantes"
-#: database_check.cc:828
+#: ../database_check.cc:828
#, c-format
msgid "%d missing keys"
msgstr "%d clefs manquantes"
-#: database_check.cc:831
+#: ../database_check.cc:831
#, c-format
msgid "%d missing certs"
msgstr "%d certifs manquants"
-#: database_check.cc:833
+#: ../database_check.cc:833
#, c-format
msgid "%d mismatched certs"
msgstr "%d certifs non correspondants"
-#: database_check.cc:835
+#: ../database_check.cc:835
#, c-format
msgid "%d unchecked signatures due to missing keys"
msgstr "%d signature non contrôlées à cause de clefs manquantes"
-#: database_check.cc:837
+#: ../database_check.cc:837
#, c-format
msgid "%d bad signatures"
msgstr "%d mauvaises signatures"
-#: database_check.cc:861
+#: ../database_check.cc:861
#, c-format
msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs"
msgstr ""
"vérification terminée : %d fichiers; %d listes; %d révisions; %d clefs; %d "
"certifs"
-#: database_check.cc:867
+#: ../database_check.cc:867
#, c-format
msgid "total problems detected: %d (%d serious)"
msgstr "total problèmes détectés: %d (%d sérieux)"
-#: database_check.cc:869
+#: ../database_check.cc:869
#, c-format
msgid "serious problems detected"
msgstr "problèmes sérieux détectés"
-#: database_check.cc:871
+#: ../database_check.cc:871
#, c-format
msgid "minor problems detected"
msgstr "problèmes mineurs détectés"
-#: database_check.cc:873
+#: ../database_check.cc:873
#, c-format
msgid "database is good"
msgstr "la base de données est bonne"
-#: database.cc:158
+#: ../database.cc:158
#, c-format
msgid ""
"layout of database %s doesn't match this version of monotone\n"
@@ -2240,12 +2676,12 @@ msgstr ""
"(cette opération est irréversible; vous voudrez probablement prendre une "
"copie d'abord)"
-#: database.cc:172
+#: ../database.cc:172
#, c-format
msgid "this database already contains rosters"
msgstr "cette base de données contient déjà des listes"
-#: database.cc:196
+#: ../database.cc:196
#, fuzzy, c-format
msgid ""
"database %s contains old-style revisions\n"
@@ -2264,7 +2700,7 @@ msgstr ""
" récupérez de nouveau dans une nouvelle base de données.\n"
"désolé pour le dérangement."
-#: database.cc:206
+#: ../database.cc:206
#, c-format
msgid ""
"database %s contains manifests but no revisions\n"
@@ -2272,10 +2708,11 @@ msgstr ""
"please see README.changesets for details"
msgstr ""
"la base de données %s contient des manifestes mais aucune révision\n"
-"ceci est un base de données très ancienne; elle a besoin d'être mise à jour\n"
+"ceci est un base de données très ancienne; elle a besoin d'être mise à "
+"jour\n"
"veuillez lire les détails dans README.changesets"
-#: database.cc:217
+#: ../database.cc:217
#, c-format
msgid ""
"database %s contains revisions but no rosters\n"
@@ -2283,19 +2720,19 @@ msgstr ""
"run '%s db regenerate_rosters' to restore use of this database"
msgstr ""
-#: database.cc:256
+#: ../database.cc:256
#, 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:263
+#: ../database.cc:263
#, 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:292 schema_migration.cc:201
+#: ../database.cc:292 ../schema_migration.cc:201
msgid ""
"make sure database and containing directory are writeable\n"
"and you have not run out of disk space"
@@ -2303,7 +2740,8 @@ msgstr ""
"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"
-#: database.cc:298 schema_migration.cc:206
+#. kind of string surgery to avoid ~duplicate strings
+#: ../database.cc:298 ../schema_migration.cc:206
#, c-format
msgid ""
"sqlite error: %s\n"
@@ -2312,12 +2750,12 @@ msgstr ""
"erreur sqlite : %s\n"
"%s"
-#: database.cc:343
+#: ../database.cc:343
#, 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:348
+#: ../database.cc:348
#, c-format
msgid ""
"existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -2325,12 +2763,12 @@ msgstr ""
"cancelling database creation"
msgstr ""
-#: database.cc:498
+#: ../database.cc:498
#, c-format
msgid "cannot create %s; it already exists"
msgstr "impossible de créer %s car ceci existe déjà "
-#: database.cc:575
+#: ../database.cc:575
#, fuzzy, c-format
msgid ""
"schema version : %s\n"
@@ -2354,7 +2792,7 @@ msgid ""
" total : %u\n"
"database:\n"
" page size : %u\n"
-" cache size : %u"
+" cache size : %u\n"
msgstr ""
"version du schéma : %s\n"
"comptes:\n"
@@ -2375,80 +2813,80 @@ msgstr ""
" certifs : %u\n"
" total : %u\n"
-#: database.cc:638
+#: ../database.cc:637
#, c-format
msgid "database schema version: %s"
msgstr "version du schéma de la base de données : %s"
-#: database.cc:715
-#, fuzzy, c-format
-msgid "multiple statements in query: %s"
+#: ../database.cc:714
+#, c-format
+msgid "multiple statements in query: %s\n"
msgstr "plusieurs instructions dans la requête: %s\n"
-#: database.cc:721
+#: ../database.cc:720
#, fuzzy, c-format
msgid "wanted %d columns got %d in query: %s"
msgstr "voulais %d colonnes, reçu %d dans la requête: %s\n"
-#: database.cc:787
+#: ../database.cc:786
#, fuzzy, c-format
msgid "null result in query: %s"
msgstr "la requête donnait aucun résultat: %s\n"
-#: database.cc:805
+#: ../database.cc:804
#, fuzzy, c-format
msgid "wanted %d rows got %d in query: %s"
msgstr "voulais %d rangs, reçu %s dans la requête: %s\n"
-#: database.cc:1952
+#: ../database.cc:1951
#, c-format
msgid "another key with name '%s' already exists"
msgstr "une autre clef nommée « %s » existe déjà "
-#: database.cc:2949
+#: ../database.cc:2948
#, c-format
msgid "no database specified"
msgstr "aucune base de données n'a été spécifiée"
-#: database.cc:2957
+#: ../database.cc:2956
#, c-format
msgid "database %s does not exist"
msgstr "la base de données %s n'existe pas"
-#: database.cc:2958
+#: ../database.cc:2957
#, c-format
msgid "%s is a directory, not a database"
msgstr "%s est un dossier, pas une base de données"
-#: database.cc:2983
+#: ../database.cc:2982
#, c-format
msgid "could not open database '%s': %s"
msgstr "impossible d'ouvrir la base de données « %s » : %s"
-#: diff_patch.cc:614
+#: ../diff_patch.cc:614
#, 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:615
+#: ../diff_patch.cc:615
#, c-format
msgid "'%s' in workspace is a directory, not a file"
msgstr "« %s » est un dossier, pas un fichier"
-#: diff_patch.cc:619
+#: ../diff_patch.cc:619
#, 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:744
-#, fuzzy, c-format
+#: ../diff_patch.cc:744
+#, c-format
msgid ""
"help required for 3-way merge\n"
"[ancestor] %s\n"
"[ left] %s\n"
"[ right] %s\n"
-"[ merged] %s"
+"[ merged] %s\n"
msgstr ""
"aide requise pour la fusion de 3 fichiers\n"
"[ ancêtre] %s\n"
@@ -2456,7 +2894,7 @@ msgstr ""
"[ droite] %s\n"
"[fusionné] %s\n"
-#: file_io.cc:176 file_io.cc:183
+#: ../file_io.cc:176 ../file_io.cc:183
#, c-format
msgid ""
"could not create directory '%s'\n"
@@ -2465,7 +2903,7 @@ msgstr ""
"impossible de créer le dossier « %s »\n"
"car c'est un fichier"
-#: file_io.cc:178
+#: ../file_io.cc:178
#, c-format
msgid ""
"could not create directory '%s'\n"
@@ -2474,17 +2912,17 @@ msgstr ""
"impossible de créer le dossier « %s »\n"
"%s"
-#: file_io.cc:182
+#: ../file_io.cc:182
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le dossier « %s »"
-#: file_io.cc:195
+#: ../file_io.cc:195
#, c-format
msgid "failed to create directory '%s' for '%s'"
msgstr "impossible de créer le dossier « %s » pour « %s »"
-#: file_io.cc:209
+#: ../file_io.cc:209
#, c-format
msgid ""
"could not remove '%s'\n"
@@ -2493,218 +2931,229 @@ msgstr ""
"impossible de supprimer « %s »\n"
"%s"
-#: file_io.cc:219
+#: ../file_io.cc:219
#, c-format
msgid "file to delete '%s' does not exist"
msgstr "le fichier à supprimer « %s » n'existe pas"
-#: file_io.cc:220
+#: ../file_io.cc:220
#, 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:228
+#: ../file_io.cc:228
#, c-format
msgid "directory to delete '%s' does not exist"
msgstr "le dossier à supprimer « %s » n'existe pas"
-#: file_io.cc:229
+#: ../file_io.cc:229
#, 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:236
+#: ../file_io.cc:236
#, c-format
msgid "object to delete, '%s', does not exist"
msgstr "l'objet à supprimer « %s » n'existe pas"
-#: file_io.cc:244
+#: ../file_io.cc:244
#, c-format
msgid "directory to delete, '%s', does not exist"
msgstr "le dossier à supprimer « %s » n'existe pas"
-#: file_io.cc:245
+#: ../file_io.cc:245
#, c-format
msgid "directory to delete, '%s', is a file"
msgstr "le dossier à supprimer « %s » est un fichier"
-#: file_io.cc:254
+#: ../file_io.cc:254
#, c-format
msgid "rename source file '%s' does not exist"
msgstr "le chemin à renommer « %s » n'existe pas"
-#: file_io.cc:255
+#: ../file_io.cc:255
#, 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:258 file_io.cc:271
+#: ../file_io.cc:258 ../file_io.cc:271
#, c-format
msgid "rename target '%s' already exists"
msgstr "le nouveau nom « %s » existe déjà "
-#: file_io.cc:267
+#: ../file_io.cc:267
#, c-format
msgid "rename source dir '%s' does not exist"
msgstr "le dossier à renommer « %s » n'existe pas"
-#: file_io.cc:268
+#: ../file_io.cc:268
#, 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:282
+#: ../file_io.cc:282
#, c-format
msgid "rename source path '%s' does not exist"
msgstr "le chemin à renommer « %s » n'existe pas"
-#: file_io.cc:297
+#: ../file_io.cc:297
#, c-format
msgid "file %s does not exist"
msgstr "le fichier %s n'existe pas"
-#: file_io.cc:298
+#: ../file_io.cc:298
#, 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:302
+#: ../file_io.cc:302
#, c-format
msgid "cannot open file %s for reading"
msgstr "impossible d'ouvrir le fichier %s pour le lire"
-#: file_io.cc:341
+#: ../file_io.cc:341
#, c-format
msgid "Cannot read standard input multiple times"
msgstr "Impossible de lire l'entrée standard plusieurs fois"
-#: file_io.cc:372
+#: ../file_io.cc:372
#, 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:380
+#: ../file_io.cc:380
#, c-format
msgid "cannot open file %s for writing"
msgstr "impossible d'ouvrir le fichier %s pour l'écrire"
-#: file_io.cc:437
+#. This arguably has broken charset handling too...
+#: ../file_io.cc:437
#, c-format
msgid "caught runtime error %s constructing file path for %s"
msgstr ""
"une erreur d'exécution %s est survenue au milieu de la construction du "
"chemin de fichier pour %s"
-#: file_io.cc:530
+#: ../file_io.cc:530
#, c-format
msgid "no such file or directory: '%s'"
msgstr "aucun fichier ou dossier de ce type : « %s »"
-#: keys.cc:102
+#: ../keys.cc:102
#, c-format
msgid "got empty passphrase from get_passphrase() hook"
msgstr "la phrase de passe obtenue depuis get_passphrase() est vide"
-#: keys.cc:118
+#: ../keys.cc:118
#, c-format
msgid "empty passphrase not allowed"
msgstr "la phrase de passe ne doit pas être vide"
-#: keys.cc:125
+#: ../keys.cc:125
#, c-format
msgid "confirm passphrase for key ID [%s]: "
msgstr "confirmez la phrase de passe pour la clef d'ID [%s]Â :"
-#: keys.cc:130
+#: ../keys.cc:130
#, c-format
msgid "empty passphrases not allowed, try again"
msgstr "la phrase de passe ne doit pas être vide, essayez de nouveau"
-#: keys.cc:131 keys.cc:138
+#: ../keys.cc:131 ../keys.cc:138
#, c-format
msgid "too many failed passphrases"
msgstr "trop de phrases de passe incorrectes"
-#: keys.cc:137
+#: ../keys.cc:137
#, c-format
msgid "passphrases do not match, try again"
msgstr "les phrases de passe ne correspondent pas, essayez à nouveau"
-#: keys.cc:144
+#: ../keys.cc:144
#, c-format
msgid "no passphrase given"
msgstr "aucune phrase de passe fournie"
-#: keys.cc:570
+#: ../keys.cc:570
#, c-format
msgid "passphrase for '%s' is incorrect"
msgstr "la phrase de passe pour « %s » est incorrecte"
-#: lua.cc:462 lua.cc:476
+#: ../lua.cc:462 ../lua.cc:476
#, c-format
msgid "%s called with an invalid parameter"
msgstr "%s a été appelé avec un paramètre invalide"
-#: lua.cc:479
+#: ../lua.cc:479
#, c-format
msgid "Directory '%s' does not exist"
msgstr "le dossier « %s » n'existe pas"
-#: lua.cc:480 rcs_import.cc:1235 work.cc:1316
+#: ../lua.cc:480 ../rcs_import.cc:1235 ../work.cc:1316
#, c-format
msgid "'%s' is not a directory"
msgstr "« %s » n'est pas un dossier"
-#: lua.cc:499
+#: ../lua.cc:499
#, c-format
msgid "lua error while loading rcfile '%s'"
msgstr "erreur lua lors du chargement de « %s »"
-#: merge.cc:60
+#: ../merge.cc:60
#, c-format
msgid "resolve non-content conflicts and then try again."
msgstr "résolvez les conflits ne concernant pas le contenu et ré-essayer."
-#: merge.cc:124
-#, fuzzy, c-format
-msgid "merge failed due to unresolved conflicts"
+#: ../merge.cc:124
+#, c-format
+msgid "merge failed due to unresolved conflicts\n"
msgstr "la fusion a échouée à cause de conflits non-résolus\n"
-#: merkle_tree.cc:290
+#: ../merkle_tree.cc:290
#, c-format
msgid "node level is %d, exceeds maximum %d"
msgstr "niveau de nÅud est %d, ce qui dépasse la limite %d"
-#: merkle_tree.cc:325
+#: ../merkle_tree.cc:325
#, 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:154
+#: ../monotone.cc:153
#, c-format
msgid "Invalid escape in --xargs file"
msgstr ""
-#: monotone.cc:686
+#: ../monotone.cc:665
#, c-format
+msgid "%s:\n"
+msgstr "%s :\n"
+
+#: ../monotone.cc:673
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../monotone.cc:683
+#, c-format
msgid "Usage: %s [OPTION...] command [ARG...]"
msgstr "Utilisation : %s [OPTION...] commande [ARGUMENTS...]"
-#: monotone.cc:694
+#: ../monotone.cc:691
#, c-format
msgid "Options specific to '%s %s':"
msgstr "Options spécifiques à « %s %s » :"
-#: mt_version.cc:36
+#: ../mt_version.cc:36
#, c-format
msgid "%s (base revision: %s)"
msgstr "%s (révision de base : %s)"
-#: mt_version.cc:56
+#: ../mt_version.cc:56
#, c-format
msgid ""
"Running on : %s\n"
@@ -2721,17 +3170,17 @@ msgstr ""
"Changements depuis la révision de base :\n"
"%s"
-#: netcmd.cc:43
+#: ../netcmd.cc:43
#, c-format
msgid "unknown item type 0x%x for '%s'"
msgstr "type d'élément inconnu 0x%x pour « %s »"
-#: netcmd.cc:115
+#: ../netcmd.cc:115
#, c-format
msgid "unknown netcmd code 0x%x"
msgstr "code de commande netcmd inconnu 0x%x"
-#: netcmd.cc:120
+#: ../netcmd.cc:120
#, c-format
msgid ""
"protocol version mismatch: wanted '%d' got '%d'\n"
@@ -2740,106 +3189,112 @@ msgstr ""
"discordance de versions de protocoles: attendu « %d », reçu « %d »\n"
"%s"
-#: netcmd.cc:125
+#: ../netcmd.cc:125
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:126
+#: ../netcmd.cc:126
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:136
+#: ../netcmd.cc:136
#, c-format
msgid "oversized payload of '%d' bytes"
msgstr "charge utile sur-dimensionnée de '%d' octets"
-#: netcmd.cc:176
-#, fuzzy, c-format
+#: ../netcmd.cc:176
+#, c-format
msgid ""
"bad HMAC checksum (got %s, wanted %s)\n"
-"this suggests data was corrupted in transit"
+"this suggests data was corrupted in transit\n"
msgstr ""
"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:272 netcmd.cc:318
+#: ../netcmd.cc:272 ../netcmd.cc:318
#, c-format
msgid "unknown role specifier %d"
msgstr "rôle donné %d est inconnu"
-#: netio.hh:41 netio.hh:59
+#: ../netio.hh:41 ../netio.hh:59
#, 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:87 netio.hh:122
+#: ../netio.hh:87 ../netio.hh:122
#, 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:142
+#: ../netio.hh:142
#, 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:278
+#: ../netio.hh:278
#, 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:333
+#: ../netio.hh:333
#, 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:258
+#: ../netsync.cc:258
#, c-format
msgid "check of '%s' failed"
msgstr "la vérification de « %s » a échouée"
-#: netsync.cc:724
+#. xgettext: please use short message and try to avoid multibytes chars
+#: ../netsync.cc:724
msgid "bytes in"
msgstr "octets entrants"
# msgstr "octets â©"
-#: netsync.cc:726
+#. xgettext: please use short message and try to avoid multibytes chars
+#: ../netsync.cc:726
msgid "bytes out"
msgstr "octets sortants"
# msgstr "octets â§"
-#: netsync.cc:730
+#. xgettext: please use short message and try to avoid multibytes chars
+#: ../netsync.cc:730
msgid "certs in"
msgstr "certifs entrants"
# msgstr "certs â©"
-#: netsync.cc:732 netsync.cc:745
+#. xgettext: please use short message and try to avoid multibytes chars
+#: ../netsync.cc:732 ../netsync.cc:745
msgid "revs in"
msgstr "révs entrantes"
# msgstr "révs â©"
-#: netsync.cc:737
+#. xgettext: please use short message and try to avoid multibytes chars
+#: ../netsync.cc:737
msgid "certs out"
msgstr "certifs entrants"
# msgstr "certs â§"
-#: netsync.cc:739 netsync.cc:747
+#. xgettext: please use short message and try to avoid multibytes chars
+#: ../netsync.cc:739 ../netsync.cc:747
msgid "revs out"
msgstr "révs sortantes"
# msgstr "révs â§"
-#: netsync.cc:853
+#: ../netsync.cc:853
#, c-format
msgid "underflow on count of %s items to receive"
msgstr "trop peux d'objets %s à recevoir"
-#: netsync.cc:1201
+#: ../netsync.cc:1201
#, c-format
msgid "received network error: %s"
msgstr "erreur de réception réseau : %s"
-#: netsync.cc:1236
+#: ../netsync.cc:1236
#, c-format
msgid ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -2862,69 +3317,70 @@ msgstr ""
"j'attendais %s\n"
"« %s unset %s %s » pour passer outre cette vérification"
-#: netsync.cc:1246
+#: ../netsync.cc:1246
#, c-format
msgid "server key changed"
msgstr "la clef du serveur a changé"
-#: netsync.cc:1251
-#, fuzzy, c-format
+#: ../netsync.cc:1251
+#, c-format
msgid ""
"first time connecting to server %s\n"
"I'll assume it's really them, but you might want to double-check\n"
-"their key's fingerprint: %s"
+"their key's fingerprint: %s\n"
msgstr ""
"Première connexion au serveur %s\n"
"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:1258
+#: ../netsync.cc:1258
#, c-format
msgid "saving public key for %s to database"
msgstr "enregistrement de la clef publique « %s » dans la base de données"
-#: netsync.cc:1352
+#: ../netsync.cc:1352
#, c-format
msgid "rejected attempt at anonymous connection for write"
msgstr "tentative de connexion anonyme pour écrire rejeté"
-#: netsync.cc:1358
+#: ../netsync.cc:1358
#, fuzzy, c-format
msgid "rejected attempt at anonymous connection while running as sink"
msgstr "tentative de connexion anonyme en étant un puits rejeté"
-#: netsync.cc:1372 netsync.cc:1496
+#: ../netsync.cc:1372 ../netsync.cc:1496
#, c-format
msgid "not serving branch '%s'"
msgstr "la branche « %s » n'est pas servie"
-#: netsync.cc:1377
+#: ../netsync.cc:1377
#, c-format
msgid "anonymous access to branch '%s' denied by server"
msgstr "accès anonyme à la branche « %s » refusé par le serveur"
-#: netsync.cc:1385
+#: ../netsync.cc:1385
#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'"
-msgstr "permission de lecture anonyme accordée pour « %s » en excluant « %s »"
+msgstr ""
+"permission de lecture anonyme accordée pour « %s » en excluant « %s »"
-#: netsync.cc:1391
+#: ../netsync.cc:1391
#, c-format
msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
-msgstr "permission de lecture anonyme accordée pour « %s » en excluant « %s »"
+msgstr ""
+"permission de lecture anonyme accordée pour « %s » en excluant « %s »"
-#: netsync.cc:1447
+#: ../netsync.cc:1447
#, fuzzy, c-format
msgid "detected replay attack in auth netcmd"
-msgstr ""
-"une attaque de type re-jeu a été détectée dans la phase auth de netcmd\n"
+msgstr "une attaque de type re-jeu a été détectée dans la phase auth de netcmd\n"
-#: netsync.cc:1468
+#: ../netsync.cc:1468
#, c-format
msgid "remote public key hash '%s' is unknown"
msgstr "la somme de contrôle « %s » d'une clef publique reçu est inconnue"
-#: netsync.cc:1484
+#: ../netsync.cc:1484
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -2933,7 +3389,7 @@ msgstr ""
"permission de lecture refusée à « %s » pour « %s » en excluant « %s » et en "
"étant un puits pure"
-#: netsync.cc:1501
+#: ../netsync.cc:1501
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
@@ -2941,633 +3397,664 @@ msgstr ""
"permission de lecture refusée à « %s » pour « %s » en excluant « %s » à "
"cause de la branche « %s »"
-#: netsync.cc:1511
+#. If we're source_and_sink_role, continue even with no branches readable
+#. eg. serve --db=empty.db
+#: ../netsync.cc:1511
#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'"
-msgstr "permission de lecture accordée à « %s » pour « %s » en excluant « %s »"
+msgstr ""
+"permission de lecture accordée à « %s » pour « %s » en excluant « %s »"
-#: netsync.cc:1521
+#: ../netsync.cc:1521
#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
"source"
msgstr ""
-"permission d'écriture refusée à « %s » pour « %s » en excluant « %s » en "
-"étant un source pure"
+"permission d'écriture refusée à « %s » pour « %s » en excluant « %s » en étant "
+"un source pure"
-#: netsync.cc:1528
+#: ../netsync.cc:1528
#, c-format
msgid "denied '%s' write permission for '%s' excluding '%s'"
msgstr "permission d'écrire refusée à « %s » pour « %s » en excluant « %s »"
-#: netsync.cc:1532
+#: ../netsync.cc:1532
#, c-format
msgid "allowed '%s' write permission for '%s' excluding '%s'"
msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »"
-#: netsync.cc:1556
+#: ../netsync.cc:1556
#, c-format
msgid "bad client signature"
msgstr "signature du client invalide"
-#: netsync.cc:1572
+#: ../netsync.cc:1572
#, fuzzy, c-format
msgid "Unexpected 'refine' command on non-refined item type"
msgstr "Commande « refine » inattenue pour type d'objet non raffiné\n"
-#: netsync.cc:1669
+#: ../netsync.cc:1669
#, c-format
msgid "unknown bye phase %d received"
msgstr "phase d'aurevoir %d inconnue reçue"
-#: netsync.cc:1684
+#: ../netsync.cc:1684
#, fuzzy, c-format
msgid "Unexpected 'done' command on non-refined item type"
msgstr "Commande « done » inattenue pour type d'objet non raffiné\n"
-#: netsync.cc:1756
+#: ../netsync.cc:1756
#, fuzzy, c-format
msgid "%s 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:1857
+#. 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:1857
#, 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:1875
+#: ../netsync.cc:1875
#, 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:1889
+#: ../netsync.cc:1889
#, 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:1951
+#: ../netsync.cc:1951
#, c-format
msgid "Received warning from usher: %s"
msgstr "Alerte reçu de usher : %s"
-#: netsync.cc:2038 netsync.cc:2069
+#: ../netsync.cc:2038 ../netsync.cc:2069
msgid "source and sink"
msgstr "source et puits"
-#: netsync.cc:2039 netsync.cc:2070
+#: ../netsync.cc:2039 ../netsync.cc:2070
msgid "source"
msgstr "source"
-#: netsync.cc:2039 netsync.cc:2070
+#: ../netsync.cc:2039 ../netsync.cc:2070
msgid "sink"
msgstr "puits"
-#: netsync.cc:2226
-#, fuzzy, c-format
-msgid "input buffer for peer %s is overfull after netcmd dispatch"
+#: ../netsync.cc:2226
+#, c-format
+msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
msgstr ""
"le tampon d'entrée pour le pair %s est plus que plein après la répartition "
"netcmd\n"
-#: netsync.cc:2238 netsync.cc:2337
+#: ../netsync.cc:2238 ../netsync.cc:2337
#, fuzzy, c-format
msgid "protocol error while processing peer %s: '%s'"
msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n"
-#: netsync.cc:2244
+#: ../netsync.cc:2244
#, c-format
msgid "error: %s"
msgstr "erreur : %s"
-#: netsync.cc:2308
+#. FIXME: split into labels and convert to ace here.
+#: ../netsync.cc:2308
#, c-format
msgid "connecting to %s"
msgstr "connexion à %s"
-#: netsync.cc:2352
-#, fuzzy, c-format
-msgid "timed out waiting for I/O with peer %s, disconnecting"
+#: ../netsync.cc:2352
+#, 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:2375
-#, fuzzy, c-format
-msgid "processing failure while talking to peer %s, disconnecting"
+#. 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:2375
+#, c-format
+msgid "processing failure while talking to peer %s, disconnecting\n"
msgstr "échec du traitement pendant le dialogue avec le pair %s, déconnexion\n"
-#: netsync.cc:2392
+#: ../netsync.cc:2392
#, c-format
msgid "successful exchange with %s"
msgstr "échange réussi avec %s"
-#: netsync.cc:2398
+#: ../netsync.cc:2398
#, c-format
msgid "peer %s disconnected after we informed them of error"
msgstr "le pair %s s'est déconnecté après avoir été informé de l'erreur"
-#: netsync.cc:2403
-#, fuzzy, c-format
-msgid "I/O failure while talking to peer %s, disconnecting"
+#: ../netsync.cc:2403
+#, c-format
+msgid "I/O failure while talking to peer %s, disconnecting\n"
msgstr "erreur d'E/S pendant le dialogue avec le pair %s, déconnexion\n"
-#: netsync.cc:2469
+#: ../netsync.cc:2469
#, fuzzy, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad"
msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n"
-#: netsync.cc:2501
+#: ../netsync.cc:2501
#, c-format
msgid "accepted new client connection from %s : %s"
msgstr "nouvelle connexion d'un client acceptée de %s : %s"
-#: netsync.cc:2538
+#: ../netsync.cc:2538
#, fuzzy, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting"
msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n"
-#: netsync.cc:2549
+#: ../netsync.cc:2549
#, c-format
msgid "peer %s read failed in working state (error)"
msgstr ""
-#: netsync.cc:2554
+#: ../netsync.cc:2554
#, c-format
msgid ""
-"peer %s read failed in shutdown state (possibly client misreported error)"
+"peer %s read failed in shutdown state (possibly client misreported error)\n"
msgstr ""
-#: netsync.cc:2560
+#: ../netsync.cc:2560
#, c-format
msgid "peer %s read failed in confirmed state (success)"
msgstr ""
-#: netsync.cc:2581
+#: ../netsync.cc:2581
#, c-format
msgid "peer %s write failed in working state (error)"
msgstr ""
-#: netsync.cc:2586
+#: ../netsync.cc:2586
#, c-format
msgid ""
-"peer %s write failed in shutdown state (possibly client misreported error)"
+"peer %s write failed in shutdown state (possibly client misreported error)\n"
msgstr ""
-#: netsync.cc:2592
+#: ../netsync.cc:2592
#, c-format
msgid "peer %s write failed in confirmed state (success)"
msgstr ""
-#: netsync.cc:2619
+#: ../netsync.cc:2619
#, c-format
msgid "peer %s processing finished, disconnecting"
msgstr "traitement du pair %s terminé, déconnexion"
-#: netsync.cc:2641
+#: ../netsync.cc:2641
#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting"
msgstr "le fd %d (pair %s) est inactif depuis trop longtemps, déconnexion"
-#: netsync.cc:2709
+#: ../netsync.cc:2709
#, c-format
msgid "beginning service on %s : %s"
msgstr "début du service sur %s : %s"
-#: netsync.cc:2710
+#: ../netsync.cc:2710
msgid ""
msgstr ""
-#: netsync.cc:2724
+#: ../netsync.cc:2724
#, c-format
-msgid "session limit %d reached, some connections will be refused"
+msgid "session limit %d reached, some connections will be refused\n"
msgstr ""
-#: netsync.cc:2789
+#: ../netsync.cc:2789
#, c-format
msgid "got OOB from peer %s, disconnecting"
msgstr "reçu des données hors-bande du pair %s, déconnexion"
-#: netsync.cc:2849
+#: ../netsync.cc:2849
#, c-format
msgid "beginning service on %s"
msgstr "début du service sur %s"
-#: netsync.cc:2912
+#: ../netsync.cc:2912
#, c-format
msgid "got some OOB data on fd %d (peer %s), disconnecting"
msgstr "reçu des données hors-bande sur le fd %d (pair %s), déconnexion"
-#: netsync.cc:2961
+#: ../netsync.cc:2961
#, c-format
msgid "finding items to synchronize:"
msgstr "recherche d'éléments à synchroniser :"
-#: netsync.cc:2969
+#. xgettext: please use short message and try to avoid multibytes chars
+#: ../netsync.cc:2969
msgid "certificates"
msgstr "certificats"
-#: netsync.cc:3082
+#: ../netsync.cc:3082
#, c-format
msgid "Cannot find key '%s'"
msgstr "Impossible de trouver la clef « %s »"
-#: netsync.cc:3122
-#, fuzzy, c-format
+#: ../netsync.cc:3122
+#, c-format
msgid ""
"include branch pattern contains a quote character:\n"
-"%s"
+"%s\n"
msgstr ""
"le motif des branches à inclure contient un caractère de citation :\n"
"%s\n"
-#: netsync.cc:3128
-#, fuzzy, c-format
+#: ../netsync.cc:3128
+#, c-format
msgid ""
"exclude branch pattern contains a quote character:\n"
-"%s"
+"%s\n"
msgstr ""
"le motif des branches à exclure contient un caractère de citation :\n"
"%s\n"
-#: netsync.cc:3163 netsync.cc:3167
+#: ../netsync.cc:3163 ../netsync.cc:3167
#, c-format
msgid "network error: %s"
msgstr "erreur réseau : %s"
-#: options_list.hh:2
+#: ../options_list.hh:2
msgid "print debug log to stderr while running"
msgstr "affiche le journal à déboguer sur la sortie d'erreur standard"
-#: options_list.hh:3
+#: ../options_list.hh:3
msgid "file to dump debugging log to, on failure"
msgstr "ficher dans lequel verser le journal à déboguer, en cas d'erreur"
-#: options_list.hh:4
+#: ../options_list.hh:4
msgid "file to write the log to"
msgstr "fichier où écrire le journal"
-#: options_list.hh:5
+#: ../options_list.hh:5
#, fuzzy
msgid "suppress verbose, informational and progress messages"
msgstr "n'affiche pas le journal ou les messages de progrès"
-#: options_list.hh:6
+#: ../options_list.hh:6
#, fuzzy
msgid "suppress warning, verbose, informational and progress messages"
msgstr "n'affiche pas le journal ou les messages de progrès"
-#: options_list.hh:7
+#: ../options_list.hh:7
msgid "display help message"
msgstr "afficher le message d'aide"
-#: options_list.hh:8
+#: ../options_list.hh:8
msgid "print version number, then exit"
msgstr "afficher le numéro de version, puis quitte"
-#: options_list.hh:9
+#: ../options_list.hh:9
msgid "print detailed version number, then exit"
msgstr "afficher le numéro de version détaillée, puis quitte"
-#: options_list.hh:10
+#: ../options_list.hh:10
msgid "insert command line arguments taken from the given file"
msgstr "fourre les arguments pris du fichier donné dans la linge de commande"
-#: options_list.hh:11
+#: ../options_list.hh:11
msgid "set ticker style (count|dot|none)"
msgstr "établis le style d'affichage de progrès (count|dot|none)"
-#: options_list.hh:12
+#: ../options_list.hh:12
msgid "do not load standard lua hooks"
msgstr "ne pas charger les hooks standards lua"
-#: options_list.hh:13
+#: ../options_list.hh:13
msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files"
msgstr ""
"ne pas charger les fichiers lua ~/.monotone/monotonerc ou _MTN/monotonerc"
-#: options_list.hh:14
+#: ../options_list.hh:14
msgid "load extra rc file"
msgstr "charger un fichier rc supplémentaire"
-#: options_list.hh:15
+#: ../options_list.hh:15
msgid "set key for signatures"
msgstr "paramétrer la clef pour les signatures"
-#: options_list.hh:16
+#: ../options_list.hh:16
msgid "set name of database"
msgstr "paramétrer le nom de la base de données"
-#: options_list.hh:17
+#: ../options_list.hh:17
msgid "limit search for workspace to specified root"
msgstr "limite la recherche d'un espace de travail à la racine donnée"
# **** Richard stopped here ****
-#: options_list.hh:18
+#: ../options_list.hh:18
msgid "verbose completion output"
msgstr "affiche plus d'information à la fin de l'exécution"
-#: options_list.hh:19
+#: ../options_list.hh:19
msgid "set location of key store"
msgstr "paramétrer l'emplacement de l'entrepôt des clefs"
-#: options_list.hh:20
+#: ../options_list.hh:20
msgid "set location of configuration directory"
msgstr "paramétrer l'emplacement du dossier de configuration"
-#: options_list.hh:22
+#: ../options_list.hh:22
msgid "override author for commit"
msgstr "supplante l'auteur pour confier"
-#: options_list.hh:23
+#: ../options_list.hh:23
msgid "block size in bytes for \"automate stdio\" output"
msgstr "la taille de bloc en octets pour la sortie « automate stdio »"
-#: options_list.hh:24
+#: ../options_list.hh:24
msgid "address:port to listen on (default :4691)"
msgstr "écouter sur adresse:port (défaut :4691)"
-#: options_list.hh:25
+#: ../options_list.hh:25
msgid "select branch cert for operation"
msgstr "choisi certif de branch pour l'opération"
-#: options_list.hh:26
+#: ../options_list.hh:26
msgid "print a brief version of the normal output"
msgstr "affiche la version courte de l'affichage normale"
-#: options_list.hh:27
+#: ../options_list.hh:27
msgid "use context diff format"
msgstr "utiliser le format diff contextuel"
-#: options_list.hh:28
+#: ../options_list.hh:28
msgid "override date/time for commit"
msgstr "supplante la date/l'heure pour confier"
-#: options_list.hh:29
+#: ../options_list.hh:29
msgid "limit the number of levels of directories to descend"
msgstr "limite le niveau de dossier à descendre"
-#: options_list.hh:30
+#: ../options_list.hh:30
msgid "print diffs along with logs"
msgstr "affiche la différence en affichant le journal"
-#: options_list.hh:31
+#: ../options_list.hh:31
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"
-#: options_list.hh:32
+#: ../options_list.hh:32
msgid "leave out anything described by its argument"
msgstr "exclus tout ce qui est décrit par l'argument"
-#: options_list.hh:33
+#: ../options_list.hh:33
msgid "perform the associated file operation"
msgstr "accomplis les opérations sur les fichiers associés"
-#: options_list.hh:34
+#: ../options_list.hh:34
msgid "use external diff hook for generating diffs"
msgstr ""
"emploie la procédure automatique de « diff » externe pour créer les "
"différences"
-#: options_list.hh:35
+#: ../options_list.hh:35
msgid "argument to pass external diff hook"
msgstr "argument a passer la procédure automatique de « diff » externe"
-#: options_list.hh:36
+#: ../options_list.hh:36
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"
-#: options_list.hh:37
+#: ../options_list.hh:37
msgid "limit log output to the last number of entries"
msgstr "limiter l'affichage du journal au dernier nombre d'entrées spécifié"
-#: options_list.hh:38
+#: ../options_list.hh:38
msgid "set commit changelog message"
msgstr "saisir le message du journal"
-#: options_list.hh:39
+#: ../options_list.hh:39
msgid "perform the operations for files missing from workspace"
msgstr ""
"exécuter les opérations sur les fichiers qui manquent dans l'espace de "
"travail"
-#: options_list.hh:40
+#: ../options_list.hh:40
#, fuzzy
msgid "set filename containing commit changelog message"
msgstr ""
"'etablissez le nom du fichier qui contient l'entrée du journal pour confier"
-#: options_list.hh:41
+#: ../options_list.hh:41
msgid "limit log output to the next number of entries"
msgstr "limiter l'affichage du journal au prochain nombre d'entrées spécifié"
-#: options_list.hh:42
+#: ../options_list.hh:42
msgid "exclude files when printing logs"
msgstr "exclure les fichiers en affichant le journal"
-#: options_list.hh:43
+#: ../options_list.hh:43
msgid "exclude merges when printing logs"
msgstr "exclure les fusions en affichant le journal"
-#: options_list.hh:44
+#: ../options_list.hh:44
msgid "do not show the function containing each block of changes"
msgstr "ne pas afficher la fonction contenant chaque bloc de changement"
-#: options_list.hh:45
+#: ../options_list.hh:45
msgid "disable transport authentication"
msgstr "désactiver l'authentification du transport"
-#: options_list.hh:46
+#: ../options_list.hh:46
msgid "record process id of server"
msgstr "enregistrer l'identifiant du processus serveur"
-#: options_list.hh:47
+#: ../options_list.hh:47
msgid "also operate on the contents of any listed directories"
msgstr ""
-#: options_list.hh:48
+#: ../options_list.hh:48
msgid "select revision id for operation"
msgstr "choisir une révision pour l'opération"
-#: options_list.hh:49
+#: ../options_list.hh:49
msgid "use the current arguments as the future default"
msgstr "emploie les arguments actuels comme défauts futurs"
-#: options_list.hh:50
+#: ../options_list.hh:50
msgid "serve netsync on stdio"
msgstr "servir netsync sur stdio"
-#: options_list.hh:51
+#: ../options_list.hh:51
msgid "use unified diff format"
msgstr "utiliser le format diff unifié"
-#: options_list.hh:52
+#: ../options_list.hh:52
msgid "perform the operations for unknown files from workspace"
msgstr ""
"accomplis les opérations sur les fichiers inconnus dans l'espace de travail"
-#: packet.cc:107
+#: ../packet.cc:107
#, c-format
msgid "file preimage '%s' missing in db"
msgstr "la préimage du fichier « %s » est manquante dans la base de données"
-#: packet.cc:108
+#: ../packet.cc:108
#, c-format
msgid "dropping delta '%s' -> '%s'"
msgstr "supprime le delta « %s » -> « %s »"
-#: packet.cc:139
+#: ../packet.cc:139
#, c-format
msgid "missing prerequisite revision '%s'"
msgstr "la révision prérequise « %s » manque"
-#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175
+#: ../packet.cc:140 ../packet.cc:151 ../packet.cc:167 ../packet.cc:175
#, c-format
msgid "dropping revision '%s'"
msgstr "supprime la révision « %s »"
-#: packet.cc:150
+#: ../packet.cc:150
#, c-format
msgid "missing prerequisite file '%s'"
msgstr "le fichier prérequis « %s » est manquant"
-#: packet.cc:165
+#: ../packet.cc:165
#, fuzzy, c-format
msgid "missing prerequisite file pre-delta '%s'"
msgstr "le fichier préalable « %s » manque\n"
-#: packet.cc:173
+#: ../packet.cc:173
#, fuzzy, c-format
msgid "missing prerequisite file post-delta '%s'"
msgstr "le fichier préalable « %s » manque\n"
-#: packet.cc:201
+#: ../packet.cc:201
#, c-format
msgid "cert revision '%s' does not exist in db"
msgstr "la révision de certif « %s » n'existe pas dans la base de données"
-#: packet.cc:203
+#: ../packet.cc:203
#, c-format
msgid "dropping cert"
msgstr "élimine le certif"
-#: packet.cc:226
+#: ../packet.cc:226
#, c-format
msgid "key '%s' is not equal to key '%s' in database"
msgstr ""
"la clef « %s » n'est pas égale à la clef « %s » dans la base de données"
-#: packet.cc:350
+#: ../packet.cc:350
#, c-format
msgid "malformed packet"
msgstr "paquet malformé"
-#: packet.cc:450
+#: ../packet.cc:450
#, c-format
msgid "unknown packet type: '%s'"
msgstr "type de paquet inconnu : « %s »"
-#: rcs_file.cc:354
+#: ../rcs_file.cc:354
#, c-format
-msgid "parse failure %d:%d: expecting %s, got %s with value '%s'"
+msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n"
msgstr ""
-#: rcs_file.cc:373
+#: ../rcs_file.cc:373
#, c-format
-msgid "parse failure %d:%d: expecting word '%s'"
+msgid "parse failure %d:%d: expecting word '%s'\n"
msgstr ""
-#: rcs_file.cc:388
+#: ../rcs_file.cc:388
#, c-format
-msgid "parse failure %d:%d: expecting word"
+msgid "parse failure %d:%d: expecting word\n"
msgstr ""
-#: rcs_import.cc:721
+#: ../rcs_import.cc:721
#, c-format
msgid "parsing RCS file %s"
msgstr "analyse du fichier RCS %s"
-#: rcs_import.cc:724
+#: ../rcs_import.cc:724
#, c-format
msgid "parsed RCS file %s OK"
msgstr "analyse du fichier RCS %s OK"
-#: rcs_import.cc:913
+#: ../rcs_import.cc:913
#, c-format
msgid "error reading RCS file %s: %s"
msgstr "erreur lors de la lecture du fichier RCS %s : %s"
-#: rcs_import.cc:1210
+#: ../rcs_import.cc:1210
#, c-format
msgid ""
"%s appears to be a CVS repository root directory\n"
"try importing a module instead, with 'cvs_import %s/"
msgstr ""
"%s a l'air d'être la racine d'un dépôt CVS\n"
-"tentative d'importer un module, en employant « cvs_import %s/"
+"tentative d'importer un module, en employant « cvs_import %s/"
-#: rcs_import.cc:1222
+#: ../rcs_import.cc:1222
#, c-format
msgid "need base --branch argument for importing"
msgstr "il faut un argument --branch pour importer"
-#: rcs_import.cc:1234
+#: ../rcs_import.cc:1234
#, c-format
msgid "path %s does not exist"
msgstr "le chemin %s n'existe pas"
-#: rcs_import.cc:1269
+#: ../rcs_import.cc:1269
msgid "tags"
msgstr "étiquettes"
-#: revision.cc:865
+#. 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:865
#, c-format
msgid "scanning for bogus merge edges"
msgstr "recherche des fusions bogguées"
-#: revision.cc:907
+#: ../revision.cc:907
#, c-format
msgid "optimizing out redundant edge %d -> %d"
msgstr ""
-#: revision.cc:916
+#: ../revision.cc:916
#, fuzzy, c-format
msgid "failed to eliminate edge %d -> %d"
msgstr "impossible de créer le dossier « %s » pour « %s »"
-#: revision.cc:927
+#: ../revision.cc:927
#, c-format
msgid "rebuilding %d nodes"
msgstr "reconstruit %d nÅuds"
-#: revision.cc:1132
-#, fuzzy, c-format
-msgid "Path %s added to child roster multiple times"
+#: ../revision.cc:1132
+#, c-format
+msgid "Path %s added to child roster multiple times\n"
msgstr "Le chemin %s a été ajouté à la liste fille plusieurs fois\n"
-#: revision.cc:1145
-#, fuzzy, c-format
-msgid "Directory for path %s cannot be added, as there is a file in the way"
+#: ../revision.cc:1145
+#, c-format
+msgid "Directory for path %s cannot be added, as there is a file in the way\n"
msgstr ""
"Le dossier %s ne peut pas être ajouter car il y a un fichier qui fait "
"obstacle\n"
-#: revision.cc:1156
+#: ../revision.cc:1156
#, c-format
msgid "Path %s cannot be added, as there is a directory in the way"
msgstr "Le chemin %s ne peut être ajouté, un dossier fait obstacle"
-#: revision.cc:1159
-#, fuzzy, c-format
-msgid "Path %s added twice with differing content"
+#: ../revision.cc:1159
+#, c-format
+msgid "Path %s added twice with differing content\n"
msgstr "Le chemin %s a été ajouté deux fois avec des contenus différents\n"
-#: revision.cc:1446
+#: ../revision.cc:1446
#, c-format
msgid ""
"unknown attribute '%s' on path '%s'\n"
@@ -3576,34 +4063,34 @@ msgstr ""
"seriously, if you'd like to keep it, we're happy to figure out how)"
msgstr ""
-#: revision.cc:1559
+#: ../revision.cc:1559
#, fuzzy, c-format
msgid "converting existing revision graph to new roster-style revisions"
msgstr ""
"convertis graphe de révisions présent à des nouvelles révision en style "
"liste\n"
-#: revision.cc:1614
+#: ../revision.cc:1614
#, fuzzy, c-format
msgid "rebuilding revision graph from manifest certs"
msgstr ""
"reconstruit le graphe des révisions à partir des certifs de manifeste\n"
-#: revision.cc:1647
+#: ../revision.cc:1647
#, c-format
msgid "regenerating cached rosters"
msgstr "régénération des listes en cache"
-#: revision.cc:1656
+#: ../revision.cc:1656
#, c-format
msgid "calculating rosters to regenerate"
msgstr "calcul des listes à régénérer"
-#: revision.cc:1660
+#: ../revision.cc:1660
msgid "regenerated"
msgstr "régénéré"
-#: revision.cc:1755
+#: ../revision.cc:1755
#, c-format
msgid ""
"encountered a revision with unknown format, version '%s'\n"
@@ -3614,87 +4101,87 @@ msgstr ""
"je ne comprend que le format version « 1 »\n"
"il faut une version monotone plus nouvelle pour compléter cette opération"
-#: sanity.cc:148
+#: ../sanity.cc:148
#, c-format
msgid "fatal: formatter failed on %s:%d: %s"
msgstr "fatal : le formatteur a échoué à %s:%d : %s"
-#: sanity.cc:222
+#: ../sanity.cc:222
msgid "misuse: "
msgstr "mauvais usage : "
-#: sanity.cc:234
+#: ../sanity.cc:234
msgid "error: "
msgstr "erreur :"
-#: sanity.cc:242
+#: ../sanity.cc:242
#, c-format
msgid "%s:%d: invariant '%s' violated"
msgstr "%s:%d : violation de l'invariant « %s »"
-#: sanity.cc:255
-#, fuzzy, c-format
-msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d"
+#: ../sanity.cc:255
+#, c-format
+msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
msgstr ""
"%s:%d : l'index « %s » = %d dépasse la capacité du vector « %s » dont la "
"taille est %d\n"
-#: sanity.cc:276
-#, fuzzy, c-format
-msgid "Current work set: %i items"
+#: ../sanity.cc:276
+#, c-format
+msgid "Current work set: %i items\n"
msgstr "Ensemble de travail actuel: %i objets\n"
-#: schema_migration.cc:258
+#: ../schema_migration.cc:258
#, c-format
msgid "calculating necessary migration steps"
msgstr "calcule les étapes à passer pour migrer"
-#: schema_migration.cc:270
+#: ../schema_migration.cc:270
#, c-format
msgid "error at transaction BEGIN statement"
msgstr ""
-#: schema_migration.cc:271
+#: ../schema_migration.cc:271
#, c-format
msgid "migrating data"
msgstr "migration des données"
-#: schema_migration.cc:297
+#: ../schema_migration.cc:297
#, c-format
msgid "migration step failed: %s"
msgstr "l'étape de migration a échoué : %s"
-#: schema_migration.cc:311
+#: ../schema_migration.cc:311
#, 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:314
+#: ../schema_migration.cc:314
#, c-format
msgid "committing changes to database"
msgstr "confie les changements à la base de données"
-#: schema_migration.cc:316
+#: ../schema_migration.cc:316
#, c-format
msgid "failure on COMMIT"
msgstr "COMMIT échoué"
-#: schema_migration.cc:318
+#: ../schema_migration.cc:318
#, c-format
msgid "optimizing database"
msgstr "optimisation de la base de données"
-#: schema_migration.cc:320
+#: ../schema_migration.cc:320
#, c-format
msgid "error vacuuming after migration"
msgstr ""
-#: schema_migration.cc:323
+#: ../schema_migration.cc:323
#, c-format
msgid "error running analyze after migration"
msgstr "erreur en analysant après la migration"
-#: schema_migration.cc:332
+#: ../schema_migration.cc:332
#, c-format
msgid ""
"NOTE: because this database was last used by a rather old version\n"
@@ -3702,239 +4189,252 @@ msgstr ""
"see the file UPGRADE for instructions on running '%s db %s'"
msgstr ""
-#: schema_migration.cc:339
+#: ../schema_migration.cc:339
#, c-format
msgid ""
"NOTE: this upgrade cleared the roster cache\n"
"you should now run '%s db regenerate_rosters'"
msgstr ""
-#: schema_migration.cc:352
+#: ../schema_migration.cc:352
#, 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"
-#: schema_migration.cc:357
+#. 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:357
#, fuzzy, c-format
msgid "no migration performed; database schema already up-to-date at %s"
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:916
+#: ../schema_migration.cc:916
#, 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:919
+#: ../schema_migration.cc:919
#, 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:39
+#: ../std_hooks.lua:39
msgid "Press enter"
msgstr "Appuyez sur entrée"
-#: std_hooks.lua:41
+#: ../std_hooks.lua:41
msgid "Press enter when the subprocess has completed"
msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé"
-#: ui.cc:158
+#. xgettext: gibibytes (2^30 bytes)
+#: ../ui.cc:158
#, c-format
msgid "%.1f G"
msgstr "%.1f Gi"
-#: ui.cc:164
+#. xgettext: mebibytes (2^20 bytes)
+#: ../ui.cc:164
#, c-format
msgid "%.1f M"
msgstr "%.1f Mi"
-#: ui.cc:170
+#. xgettext: kibibytes (2^10 bytes)
+#: ../ui.cc:170
#, c-format
msgid "%.1f k"
msgstr "%.1f Ki"
-#: ui.cc:183
+#: ../ui.cc:183
#, c-format
msgid "%d/%d"
msgstr "%d/%d"
-#: ui.cc:188
+#. xgettext: bytes
+#: ../ui.cc:188
#, c-format
msgid "%d"
msgstr "%d"
-#: ui.cc:466
+#: ../ui.cc:466
msgid "warning: "
msgstr "avertissement : "
-#: ui.cc:477
+#: ../ui.cc:477
#, fuzzy, c-format
msgid ""
"fatal: %s\n"
"this is almost certainly a bug in monotone.\n"
"please send this error message, the output of '%s --full-version',\n"
-"and a description of what you were doing to %s."
+"and a description of what you were doing to %s.\n"
msgstr ""
"néfaste: %s\n"
"ceci est presque certainement un bogue dans monotone.\n"
"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:581
+#: ../ui.cc:512
#, c-format
+msgid "%s: %s"
+msgstr "%s : %s"
+
+#: ../ui.cc:581
+#, c-format
msgid "failed to open log file '%s'"
msgstr "Impossible d'ouvrir le fichier journal « %s »"
-#: update.cc:72
+#: ../update.cc:72
#, c-format
msgid "failed to decode boolean testresult cert value '%s'"
msgstr "impossible de décoder la valeur booléenne « %s » du certif testresult"
-#: update.cc:166
+#: ../update.cc:166
#, c-format
msgid "cannot determine branch for update"
msgstr "impossible de déterminer la branche pour la mise à jour"
-#: vocab.cc:67
+#: ../vocab.cc:67
#, c-format
msgid "hex encoded ID '%s' size != %d"
msgstr ""
-#: vocab.cc:71
+#: ../vocab.cc:71
#, c-format
msgid "bad character '%c' in id name '%s'"
msgstr "caractère invalide « %c » dans le nom de l'id « %s »"
-#: vocab.cc:81
+#: ../vocab.cc:81
#, c-format
msgid "bad character '%c' in ace string '%s'"
msgstr "caractère invalide « %c » dans la chaîne ace « %s »"
-#: vocab.cc:92
+#: ../vocab.cc:92
#, c-format
msgid "bad character '%c' in symbol '%s'"
msgstr "caractère invalide « %c » dans le symbole « %s »"
-#: vocab.cc:103
+#: ../vocab.cc:103
#, c-format
msgid "bad character '%c' in cert name '%s'"
msgstr "caractère invalide « %c » dans le nom du certif « %s »"
-#: vocab.cc:113
+#: ../vocab.cc:113
#, c-format
msgid "bad character '%c' in key name '%s'"
msgstr "caractère invalide « %c » dans le nom de la clef « %s »"
-#: vocab.cc:128
+#: ../vocab.cc:128
#, c-format
msgid "Invalid key length of %d bytes"
msgstr "Longueur de clef invalide de %d octets"
-#: vocab.cc:143
+#: ../vocab.cc:143
#, c-format
msgid "Invalid hmac length of %d bytes"
msgstr "Longueur hmac invalide de %d octets"
-#: work.cc:88 work_migration.cc:180 work_migration.cc:200
+#: ../work.cc:88 ../work_migration.cc:180 ../work_migration.cc:200
#, fuzzy, c-format
msgid "workspace is corrupt: reading %s: %s"
msgstr "l'espace de travail est corrompu : %s n'existe pas"
-#: work.cc:150
+#: ../work.cc:150
#, c-format
msgid "base revision %s does not exist in database"
msgstr "la révision de base %s n'existe pas dans la base de données"
-#: work.cc:284
+#: ../work.cc:284
#, c-format
msgid "unrecognized key '%s' in options file %s - ignored"
msgstr ""
-#: work.cc:291
+#: ../work.cc:291
#, fuzzy, c-format
msgid "Failed to read options file %s: %s"
msgstr "La lecture du fichier d'options « %s » a échouée"
-#: work.cc:339
+#: ../work.cc:339
#, fuzzy, c-format
msgid "Failed to write options file %s: %s"
msgstr "L'écriture du fichier d'options « %s » a échouée"
-#: work.cc:539
+#: ../work.cc:539
#, c-format
msgid "skipping ignorable file %s"
msgstr "omission du fichier %s qui peut être ignoré"
-#: work.cc:548
+#: ../work.cc:548
#, 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:559
+#: ../work.cc:559
#, c-format
msgid "adding %s to workspace manifest"
msgstr "ajouter %s au manifeste de l'espace de travail"
-#: work.cc:565
+#: ../work.cc:565
#, c-format
msgid ""
"cannot add %s, because %s is recorded as a file in the workspace manifest"
msgstr ""
-#: work.cc:680
+#: ../work.cc:680
#, c-format
msgid "dropping %s"
msgstr "supprime %s"
-#: work.cc:691 work.cc:702
+#: ../work.cc:691 ../work.cc:702
#, c-format
msgid "path %s already exists"
msgstr "le chemin %s existe déjà "
-#: work.cc:724 work.cc:751
+#: ../work.cc:724 ../work.cc:751
#, c-format
msgid "adding %s"
msgstr "ajout de %s"
-#: work.cc:740
+#: ../work.cc:740
#, c-format
msgid "path '%s' already exists, cannot create"
msgstr "le chemin « %s » existe déjà , ne peux pas le créer"
-#: work.cc:747
+#: ../work.cc:747
#, c-format
msgid "renaming %s to %s"
msgstr "renommage de %s en %s"
-#: work.cc:782
+#: ../work.cc:782
#, c-format
msgid "file '%s' does not exist"
msgstr "le fichier « %s » n'existe pas"
-#: work.cc:783
+#: ../work.cc:783
#, c-format
msgid "file '%s' is a directory"
msgstr "le fichier « %s » est un dossier"
-#: work.cc:788
+#: ../work.cc:788
#, 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:789
+#: ../work.cc:789
#, c-format
msgid "modifying %s"
msgstr "modification de %s"
-#: work.cc:974
+#: ../work.cc:974
#, fuzzy, c-format
msgid "missing %s"
msgstr "modification de %s"
-#: work.cc:980
+#: ../work.cc:980
#, fuzzy, c-format
msgid ""
"%d missing files; use '%s ls missing' to view\n"
@@ -3950,109 +4450,109 @@ msgstr ""
"lancer soit « monotone drop FICHIER » pour le supprimer définitivement,\n"
"soit « monotone revert FICHIER » pour le restaurer\n"
-#: work.cc:1113
+#: ../work.cc:1113
#, c-format
msgid "skipping %s, not currently tracked"
msgstr ""
-#: work.cc:1123
+#: ../work.cc:1123
#, c-format
msgid "cannot remove %s/, it is not empty"
msgstr "impossible de supprimer %s/, il n'est pas vide"
-#: work.cc:1134
+#: ../work.cc:1134
#, c-format
msgid "dropping %s from workspace manifest"
msgstr "supprimer %s du manifeste de l'espace de travail"
-#: work.cc:1187
+#: ../work.cc:1187
#, 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:1190
+#: ../work.cc:1190
#, 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:1200
+#: ../work.cc:1200
#, c-format
msgid "empty path %s is not allowed"
msgstr "le chemin vide %s n'est pas permit"
-#: work.cc:1214
+#: ../work.cc:1214
#, fuzzy, c-format
msgid "%s does not exist in current manifest"
msgstr "%s n'existe pas dans la révision actuelle"
-#: work.cc:1217
+#: ../work.cc:1217
#, fuzzy, c-format
msgid "destination %s already exists in current manifest"
msgstr "la destination %s existe déjà dans la révision actuelle"
-#: work.cc:1223
+#: ../work.cc:1223
#, fuzzy, c-format
msgid "destination directory %s does not exist in current manifest"
msgstr "le dossier de destination %s/ n'existe pas dans la révision actuelle"
-#: work.cc:1225
+#: ../work.cc:1225
#, fuzzy, c-format
msgid "destination directory %s is not a directory"
msgstr "la nouvelle racine proposé « %s » n'est pas un dossier"
-#: work.cc:1234
+#: ../work.cc:1234
#, c-format
msgid "renaming %s to %s in workspace manifest"
msgstr "renomme %s à %s dans le manifeste de l'espace de travail"
-#: work.cc:1262
+#: ../work.cc:1262
#, 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:1266
+#: ../work.cc:1266
#, 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:1296
+#: ../work.cc:1296
#, c-format
msgid "proposed new root directory '%s' is not versioned or does not exist"
msgstr ""
-#: work.cc:1298
+#: ../work.cc:1298
#, 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:1303
+#: ../work.cc:1303
#, 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:1313
+#: ../work.cc:1313
#, 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:1319
+#: ../work.cc:1319
#, c-format
msgid "'%s' is in the way"
msgstr "« %s » fait obstacle"
-#: work_migration.cc:62
+#: ../work_migration.cc:62
#, c-format
msgid "workspace required but not found"
msgstr "espace de travail requis mais pas trouvé"
-#: work_migration.cc:71
+#: ../work_migration.cc:71
#, c-format
msgid "_MTN/format should not exist in a format 1 workspace; corrected"
msgstr ""
"_MTN/format ne devrait pas exister dans un espace de travail au format 1;\n"
"corrigé"
-#: work_migration.cc:108
+#: ../work_migration.cc:108
#, c-format
msgid ""
"this workspace's metadata is in format 0. to use this workspace\n"
@@ -4063,7 +4563,7 @@ msgstr ""
"we apologize for the inconvenience."
msgstr ""
-#: work_migration.cc:117
+#: ../work_migration.cc:117
#, c-format
msgid ""
"to use this workspace with this version of monotone, its metadata\n"
@@ -4073,55 +4573,44 @@ msgstr ""
"with versions of monotone older than %s."
msgstr ""
-#: work_migration.cc:127 work_migration.cc:255
+#: ../work_migration.cc:127 ../work_migration.cc:255
#, c-format
msgid ""
"this version of monotone only understands workspace metadata\n"
"in formats 0 through %d. your workspace is in format %d.\n"
"you need a newer version of monotone to use this workspace."
msgstr ""
-"Cette version de monotone prends en charge uniquement les méta-données "
-"d'espace de travail de format 0 jusqu'Ã %d. Votre espace de travail est au "
-"format %d.\n"
-"Vous avez besoin d'une version plus récente de monotone pour utiliser cet "
-"espace de travail."
+"Cette version de monotone prends en charge uniquement les "
+"méta-données d'espace de travail de format 0 jusqu'à %d. "
+"Votre espace de travail est au format %d.\n"
+"Vous avez besoin d'une version plus récente de monotone pour "
+"utiliser cet espace de travail."
-#: work_migration.cc:156
+#: ../work_migration.cc:156
#, c-format
msgid ""
"it is not possible to migrate from workspace format 0 to any\n"
"later format. you must delete this workspace and check it out\n"
"again. we apologize for the inconvenience."
msgstr ""
-"Il est impossible de migrer cet espace de travail au format 0 vers un autre "
-"format plus récent. Vous devez supprimer cet espace de travail et récupérer "
-"à nouveau les données. Nous nous excusons pour le dérangemente."
+"Il est impossible de migrer cet espace de travail au format 0 vers "
+"un autre format plus récent. Vous devez supprimer cet espace de "
+"travail et récupérer à nouveau les données. Nous nous excusons "
+"pour le dérangemente."
-#: work_migration.cc:208
+#: ../work_migration.cc:208
#, c-format
msgid "workspace is corrupt: %s exists but is not a regular file"
msgstr ""
-"l'espace de travail est corrompu : %s existe mais n'est pas un fichier normal"
+"l'espace de travail est corrompu : %s existe mais n'est pas un fichier "
+"normal"
-#: work_migration.cc:247
+#: ../work_migration.cc:247
#, c-format
msgid "this workspace is in the current format, no migration is necessary."
-msgstr ""
-"cet espace de travail est dans le format actuel, aucune migration n'est "
-"nécessaire"
+msgstr "cet espace de travail est dans le format actuel, aucune migration "
+"n'est nécessaire"
-#~ msgid "[DIRECTORY]\n"
-#~ msgstr "[DOSSIER]\n"
-
-#~ msgid "%s:\n"
-#~ msgstr "%s :\n"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s: %s"
-#~ msgstr "%s : %s"
-
#~ msgid "option %s doesn't exist"
#~ msgstr "l'option %s n'existe pas"
============================================================
--- po/it.po fd5373c57e02ae419eff69fc3ccddd9010a93167
+++ po/it.po 34f197c5aebed81c45c64a413582066a15b50717
@@ -1,8 +1,8 @@ msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: monotone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-13 10:22-0500\n"
+"POT-Creation-Date: 2006-09-23 14:09+0200\n"
"PO-Revision-Date: 2006-10-10 20:10+0100\n"
"Last-Translator: Lapo Luchini \n"
"Language-Team: Lapo Luchini \n"
@@ -64,132 +64,165 @@ msgid "illegal argument to --automate-st
#: app_state.cc:388
#, c-format
msgid "illegal argument to --automate-stdio-size: cannot be zero or negative"
-msgstr ""
-"argomento illegale per â--automate-stdio-sizeâ: non può essere zero o "
-"negativo"
+msgstr "argomento illegale per â--automate-stdio-sizeâ: non può essere zero o negativo"
-#: automate.cc:64
+#: automate.cc:65
msgid "[BRANCH]"
msgstr "[RAMO]"
-#: automate.cc:88 automate.cc:135 automate.cc:1206
+#: automate.cc:89
+#: automate.cc:136
+#: automate.cc:1207
msgid "REV1 [REV2 [REV3 [...]]]"
msgstr "REV_1 [REV_2 [REV_3 [â¦]]]"
-#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
-#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452
-#: automate.cc:1216 cmd_list.cc:661
+#: automate.cc:99
+#: automate.cc:146
+#: automate.cc:190
+#: automate.cc:331
+#: automate.cc:366
+#: automate.cc:370
+#: automate.cc:429
+#: automate.cc:453
+#: automate.cc:1217
+#: cmd_list.cc:661
#, c-format
msgid "No such revision %s"
msgstr "La revisione %s non esiste"
-#: automate.cc:183 automate.cc:324
+#: automate.cc:184
+#: automate.cc:325
msgid "[REV1 [REV2 [REV3 [...]]]]"
msgstr "[REV_1 [REV_2 [REV_3 [â¦]]]]"
-#: automate.cc:215
+#: automate.cc:216
msgid "FILE"
msgstr "FILE"
-#: automate.cc:235
+#: automate.cc:236
#, c-format
msgid "file %s is unknown to the current workspace"
msgstr "il file â%sâ non esiste nello spazio di lavoro"
-#: automate.cc:356
+#: automate.cc:357
msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
msgstr "NUOVA_REV [VECCHIA_REV_1 [VECCHIA_REV_2 [...]]]"
-#: automate.cc:423 automate.cc:447 cmd_list.cc:651
+#: automate.cc:424
+#: automate.cc:448
+#: cmd_list.cc:651
msgid "REV"
msgstr "REV"
-#: automate.cc:524
+#: automate.cc:525
msgid "SELECTOR"
msgstr "SELETTORE"
-#: automate.cc:893 automate.cc:1023
+#: automate.cc:894
+#: automate.cc:1024
msgid "[REVID]"
msgstr "[ID_REV]"
-#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588
-#: automate.cc:1593
+#: automate.cc:923
+#: automate.cc:1046
+#: automate.cc:1530
+#: automate.cc:1589
+#: automate.cc:1594
#, c-format
msgid "no revision %s found in database"
msgstr "nel database non è presente la revisione %s"
-#: automate.cc:1066 automate.cc:1145
+#: automate.cc:1067
+#: automate.cc:1146
msgid "FILEID"
msgstr "ID_FILE"
-#: automate.cc:1073
+#: automate.cc:1074
#, c-format
msgid "no file version %s found in database"
msgstr "nel database non è presente alcun file con versione â%sâ"
-#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845
+#: automate.cc:1093
+#: automate.cc:1119
+#: cmd_merging.cc:845
msgid "REVID"
msgstr "ID_REV"
-#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186
-#: cmd_db.cc:35 cmd_diff_log.cc:385 cmd_diff_log.cc:416 cmd_diff_log.cc:418
-#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677
-#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:461 commands.cc:388
+#: automate.cc:1104
+#: automate.cc:1130
+#: automate.cc:1185
+#: automate.cc:1187
+#: cmd_db.cc:35
+#: cmd_diff_log.cc:385
+#: cmd_diff_log.cc:416
+#: cmd_diff_log.cc:418
+#: cmd_files.cc:138
+#: cmd_files.cc:200
+#: cmd_merging.cc:125
+#: cmd_merging.cc:677
+#: cmd_merging.cc:692
+#: cmd_merging.cc:695
+#: cmd_ws_commit.cc:461
+#: commands.cc:388
#, c-format
msgid "no such revision '%s'"
msgstr "la revisione %s non esiste"
-#: automate.cc:1156
+#: automate.cc:1157
#, c-format
msgid "no such file '%s'"
msgstr "il file â%sâ non esiste"
-#: automate.cc:1172
+#: automate.cc:1173
msgid "OLD_FILE NEW_FILE"
msgstr "VECCHIO_FILE NUOVO_FILE"
-#: automate.cc:1317
+#: automate.cc:1318
msgid "[BRANCH_PATTERN]"
msgstr "[PATTERN_RAMO]"
-#: automate.cc:1413
+#: automate.cc:1414
msgid "KEYID PASSPHRASE"
msgstr "ID_CHIAVE PASSPHRASE"
-#: automate.cc:1431 cmd_key_cert.cc:41
+#: automate.cc:1432
+#: cmd_key_cert.cc:41
#, c-format
msgid "key '%s' already exists"
msgstr "chiave â%sâ già esistente"
-#: automate.cc:1434 cmd_key_cert.cc:44
+#: automate.cc:1435
+#: cmd_key_cert.cc:44
#, c-format
msgid "generating key-pair '%s'"
msgstr "genero la coppia di chiavi â%sâ"
-#: automate.cc:1436 cmd_key_cert.cc:46
+#: automate.cc:1437
+#: cmd_key_cert.cc:46
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "immagazzino la coppia di chiavi â%sâ in â%s/â"
-#: automate.cc:1472
+#: automate.cc:1473
msgid "OPTION"
msgstr "OPZIONE"
-#: automate.cc:1495
+#: automate.cc:1496
#, c-format
msgid "'%s' is not a recognized workspace option"
msgstr ""
-#: automate.cc:1518
+#: automate.cc:1519
msgid "REV FILE"
msgstr "REV FILE"
-#: automate.cc:1535 automate.cc:1599
+#: automate.cc:1536
+#: automate.cc:1600
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "il file â%sâ è sconosciuto per la revisione %s"
-#: automate.cc:1578
+#: automate.cc:1579
msgid "REV1 FILE REV2"
msgstr "REV1 FILE REV2"
@@ -223,7 +256,8 @@ msgstr "l'hash calcolato sul certificato
msgid "calculated cert hash '%s' does not match '%s'"
msgstr "l'hash calcolato sul certificato è â%sâ, non corrisponde a â%sâ"
-#: cert.cc:387 keys.cc:560
+#: cert.cc:387
+#: keys.cc:560
#, c-format
msgid "no key pair '%s' found in key store '%s'"
msgstr "la coppia di chiavi â%sâ non è nel portachiavi â%sâ"
@@ -249,44 +283,33 @@ msgid "no branch found for empty revisio
#: cert.cc:485
#, c-format
msgid "no branch found for empty revision, please provide a branch name"
-msgstr ""
-"nessun ramo trovato per revisione vuota, per favore fornisci un nome di ramo"
+msgstr "nessun ramo trovato per revisione vuota, per favore fornisci un nome di ramo"
#: cert.cc:494
#, c-format
msgid "no branch certs found for revision %s, please provide a branch name"
-msgstr ""
-"nessun certificato di ramo trovato per la revisione %s, per favore inserisci "
-"un nome di ramo"
+msgstr "nessun certificato di ramo trovato per la revisione %s, per favore inserisci un nome di ramo"
#: cert.cc:498
#, c-format
-msgid ""
-"multiple branch certs found for revision %s, please provide a branch name"
-msgstr ""
-"trovati certificati con rami multipli per la revisione %s, per favore "
-"inserisci il nome di un ramo"
+msgid "multiple branch certs found for revision %s, please provide a branch name"
+msgstr "trovati certificati con rami multipli per la revisione %s, per favore inserisci il nome di un ramo"
-#: cmd_automate.cc:157 cmd_automate.cc:226
+#: cmd_automate.cc:206
#, c-format
-msgid "Bad input to automate stdio"
-msgstr "Input non valido per âautomate stdioâ"
-
-#: cmd_automate.cc:176
-#, c-format
msgid "read from client failed with error code: %d"
msgstr "lettura dal client fallita con codice di errore: %d"
-#: cmd_automate.cc:177
-#, fuzzy, c-format
-msgid "Bad input to automate stdio (unexpected EOF)"
+#: cmd_automate.cc:249
+#, c-format
+msgid "Bad input to automate stdio"
msgstr "Input non valido per âautomate stdioâ"
-#: cmd_automate.cc:459
+#: cmd_automate.cc:303
msgid "automation"
msgstr "automazione"
-#: cmd_automate.cc:460
+#: cmd_automate.cc:304
msgid "automation interface"
msgstr "interfaccia di automazione"
@@ -343,7 +366,8 @@ msgstr "L'epoca deve essere di %s caratt
msgid "The epoch must be %s characters"
msgstr "L'epoca deve essere di %s caratteri"
-#: cmd_db.cc:122 cmd_db.cc:138
+#: cmd_db.cc:122
+#: cmd_db.cc:138
msgid "vars"
msgstr "variabili"
@@ -353,8 +377,7 @@ msgid "set the database variable NAME to
#: cmd_db.cc:123
msgid "set the database variable NAME to VALUE, in domain DOMAIN"
-msgstr ""
-"imposta la variabile NOME del database come VALORE, nel dominio DOMINIO"
+msgstr "imposta la variabile NOME del database come VALORE, nel dominio DOMINIO"
#: cmd_db.cc:138
msgid "DOMAIN NAME"
@@ -369,8 +392,14 @@ msgstr "nessuna variabile ha nome â%sâ
msgid "no var with name %s in domain %s"
msgstr "nessuna variabile ha nome â%sâ nel dominio â%sâ"
-#: cmd_db.cc:155 cmd_diff_log.cc:331 cmd_diff_log.cc:541 cmd_files.cc:114
-#: cmd_files.cc:181 cmd_list.cc:457 cmd_merging.cc:614 cmd_ws_commit.cc:355
+#: cmd_db.cc:155
+#: cmd_diff_log.cc:331
+#: cmd_diff_log.cc:541
+#: cmd_files.cc:114
+#: cmd_files.cc:181
+#: cmd_list.cc:457
+#: cmd_merging.cc:614
+#: cmd_ws_commit.cc:355
#: commands.cc:252
msgid "informative"
msgstr "informativo"
@@ -388,8 +417,12 @@ msgstr "cifre non decimali nell'ID parzi
msgid "non-hex digits in partial id"
msgstr "cifre non decimali nell'ID parziale"
-#: cmd_diff_log.cc:331 cmd_ws_commit.cc:66 cmd_ws_commit.cc:242
-#: cmd_ws_commit.cc:276 cmd_ws_commit.cc:355 cmd_ws_commit.cc:661
+#: cmd_diff_log.cc:331
+#: cmd_ws_commit.cc:66
+#: cmd_ws_commit.cc:242
+#: cmd_ws_commit.cc:276
+#: cmd_ws_commit.cc:355
+#: cmd_ws_commit.cc:661
msgid "[PATH]..."
msgstr "[PERCORSOâ¦]"
@@ -436,8 +469,12 @@ msgstr "solo un comando permesso tra â
msgid "only one of --last/--next allowed"
msgstr "solo un comando permesso tra â--lastâ e â--nextâ"
-#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:157
-#: cmd_merging.cc:845 cmd_othervcs.cc:15
+#: cmd_files.cc:28
+#: cmd_files.cc:41
+#: cmd_files.cc:78
+#: cmd_files.cc:157
+#: cmd_merging.cc:845
+#: cmd_othervcs.cc:15
msgid "debug"
msgstr "debug"
@@ -530,7 +567,8 @@ msgstr "copia un file dal database a std
msgid "write file from database to stdout"
msgstr "copia un file dal database a stdout"
-#: cmd_files.cc:212 cmd_files.cc:214
+#: cmd_files.cc:212
+#: cmd_files.cc:214
#, c-format
msgid "no file '%s' found in revision '%s'"
msgstr "nessun file â%sâ trovato nella revisione %s"
@@ -560,12 +598,17 @@ msgstr "Alias per %s"
msgid "Alias for %s"
msgstr "Alias per %s"
-#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90
-#: cmd_key_cert.cc:111 cmd_key_cert.cc:147
+#: cmd_key_cert.cc:26
+#: cmd_key_cert.cc:51
+#: cmd_key_cert.cc:90
+#: cmd_key_cert.cc:111
+#: cmd_key_cert.cc:147
msgid "key and cert"
msgstr "chiavi e cert"
-#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90
+#: cmd_key_cert.cc:26
+#: cmd_key_cert.cc:51
+#: cmd_key_cert.cc:90
msgid "KEYID"
msgstr "IDCHIAVE"
@@ -590,18 +633,12 @@ msgid "public or private key '%s' does n
#: cmd_key_cert.cc:82
#, c-format
msgid "public or private key '%s' does not exist in keystore or database"
-msgstr ""
-"o la chiave pubblica o quella privata â%sâ non esiste nel portachiavi o nel "
-"database"
+msgstr "o la chiave pubblica o quella privata â%sâ non esiste nel portachiavi o nel database"
#: cmd_key_cert.cc:85
#, c-format
-msgid ""
-"public or private key '%s' does not exist in keystore, and no database was "
-"specified"
-msgstr ""
-"o la chiave pubblica o quella privata â%sâ non esiste nel portachiavi, e "
-"nessun database è stato specificato"
+msgid "public or private key '%s' does not exist in keystore, and no database was specified"
+msgstr "o la chiave pubblica o quella privata â%sâ non esiste nel portachiavi, e nessun database è stato specificato"
#: cmd_key_cert.cc:91
msgid "change passphrase of a private RSA key"
@@ -660,8 +697,11 @@ msgstr "NON fidato"
msgid "UNtrusted"
msgstr "NON fidato"
-#: cmd_key_cert.cc:195 cmd_key_cert.cc:208 cmd_key_cert.cc:221
-#: cmd_key_cert.cc:237 cmd_ws_commit.cc:189
+#: cmd_key_cert.cc:195
+#: cmd_key_cert.cc:208
+#: cmd_key_cert.cc:221
+#: cmd_key_cert.cc:237
+#: cmd_ws_commit.cc:189
msgid "review"
msgstr "verifica"
@@ -682,7 +722,8 @@ msgstr "annota i risultati dell'esecuzio
msgid "note the results of running a test on a revision"
msgstr "annota i risultati dell'esecuzione di un test su una revisione"
-#: cmd_key_cert.cc:221 cmd_ws_commit.cc:189
+#: cmd_key_cert.cc:221
+#: cmd_ws_commit.cc:189
msgid "REVISION"
msgstr "REVISIONE"
@@ -713,7 +754,8 @@ msgstr "commento vuoto"
msgid "empty comment"
msgstr "commento vuoto"
-#: cmd_list.cc:64 cmd_list.cc:675
+#: cmd_list.cc:64
+#: cmd_list.cc:675
#, c-format
msgid "no public key '%s' found in database"
msgstr "la chiave pubblica â%sâ non è nel database"
@@ -800,9 +842,15 @@ msgstr ""
"attuale, o i file conosciuti, sconosciuti, intenzionalmente ignorati,\n"
"mancanti o modificati"
-#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:66
-#: cmd_ws_commit.cc:242 cmd_ws_commit.cc:276 cmd_ws_commit.cc:311
-#: cmd_ws_commit.cc:336 cmd_ws_commit.cc:561 cmd_ws_commit.cc:661
+#: cmd_merging.cc:73
+#: cmd_merging.cc:655
+#: cmd_ws_commit.cc:66
+#: cmd_ws_commit.cc:242
+#: cmd_ws_commit.cc:276
+#: cmd_ws_commit.cc:311
+#: cmd_ws_commit.cc:336
+#: cmd_ws_commit.cc:561
+#: cmd_ws_commit.cc:661
msgid "workspace"
msgstr "spazio di lavoro"
@@ -816,17 +864,14 @@ msgstr ""
msgstr ""
"aggiorna spazio di lavoro.\n"
"Questo comando modifica il tuo spazio di lavoro affinché sia basato su di\n"
-"una differente versione, preservando nel contempo i cambiamenti non "
-"sottomessi.\n"
-"Se è specificata una revisione, aggiorna lo spazio di lavoro a quella "
-"revisione.\n"
+"una differente versione, preservando nel contempo i cambiamenti non sottomessi.\n"
+"Se è specificata una revisione, aggiorna lo spazio di lavoro a quella revisione.\n"
"Altrimenti aggiorna lo spazio di lavoro alla testa del ramo."
#: cmd_merging.cc:95
#, c-format
msgid "this workspace is a new project; cannot update"
-msgstr ""
-"questo spazio di lavoro è un nuovo progetto, non posso fare un âupdateâ"
+msgstr "questo spazio di lavoro è un nuovo progetto, non posso fare un âupdateâ"
#: cmd_merging.cc:102
#, c-format
@@ -917,14 +962,21 @@ msgstr "[destra] %s"
msgid "[right] %s"
msgstr "[destra] %s"
-#: cmd_merging.cc:313 cmd_merging.cc:584
+#: cmd_merging.cc:313
+#: cmd_merging.cc:584
#, c-format
msgid "[merged] %s"
msgstr "[unione] %s"
-#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588
-#: cmd_merging.cc:821 cmd_ws_commit.cc:421 cmd_ws_commit.cc:907
-#: cmd_ws_commit.cc:930 cmd_ws_commit.cc:944
+#: cmd_merging.cc:320
+#: cmd_merging.cc:419
+#: cmd_merging.cc:430
+#: cmd_merging.cc:588
+#: cmd_merging.cc:821
+#: cmd_ws_commit.cc:421
+#: cmd_ws_commit.cc:907
+#: cmd_ws_commit.cc:930
+#: cmd_ws_commit.cc:944
msgid "tree"
msgstr "albero"
@@ -932,12 +984,16 @@ msgstr "fa il âmergeâ delle teste di
msgid "merge unmerged heads of branch"
msgstr "fa il âmergeâ delle teste di un ramo"
-#: cmd_merging.cc:330 cmd_merging.cc:829
+#: cmd_merging.cc:330
+#: cmd_merging.cc:829
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "specifica un ramo, con â--branch=RAMOâ"
-#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834
+#: cmd_merging.cc:335
+#: cmd_merging.cc:469
+#: cmd_merging.cc:472
+#: cmd_merging.cc:834
#: cmd_ws_commit.cc:445
#, c-format
msgid "branch '%s' is empty"
@@ -955,7 +1011,8 @@ msgstr[1] "%d teste sul ramo â%sâ"
msgstr[0] "%d testa sul ramo â%sâ"
msgstr[1] "%d teste sul ramo â%sâ"
-#: cmd_merging.cc:363 cmd_merging.cc:408
+#: cmd_merging.cc:363
+#: cmd_merging.cc:408
#, c-format
msgid "merge %d / %d:"
msgstr "merge %d / %d:"
@@ -986,7 +1043,8 @@ msgstr "âmergeâ di un ramo in una so
msgid "merge one branch into a subdirectory in another branch"
msgstr "âmergeâ di un ramo in una sottodirectory di un altro ramo"
-#: cmd_merging.cc:470 cmd_merging.cc:473
+#: cmd_merging.cc:470
+#: cmd_merging.cc:473
#, c-format
msgid "branch '%s' is not merged"
msgstr "il ramo â%sâ è separato"
@@ -1032,16 +1090,15 @@ msgid "merge two explicitly given revisi
#: cmd_merging.cc:590
msgid "merge two explicitly given revisions, placing result in given branch"
-msgstr ""
-"unisce due revisioni specificate, mettendo il risultato in un ramo "
-"specificato"
+msgstr "unisce due revisioni specificate, mettendo il risultato in un ramo specificato"
#: cmd_merging.cc:605
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s e %s sono la stessa revisione, annullo"
-#: cmd_merging.cc:607 cmd_merging.cc:609
+#: cmd_merging.cc:607
+#: cmd_merging.cc:609
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s è già antenato di %s"
@@ -1051,13 +1108,11 @@ msgstr "REV REV"
msgstr "REV REV"
#: cmd_merging.cc:615
-msgid ""
-"Show what conflicts would need to be resolved to merge the given revisions."
-msgstr ""
-"Mostra quali conflitti andrebbero risolto per fare il âmergeâ di due "
-"revisioni specificate."
+msgid "Show what conflicts would need to be resolved to merge the given revisions."
+msgstr "Mostra quali conflitti andrebbero risolto per fare il âmergeâ di due revisioni specificate."
-#: cmd_merging.cc:625 cmd_merging.cc:627
+#: cmd_merging.cc:625
+#: cmd_merging.cc:627
#, c-format
msgid "%s is an ancestor of %s; no merge is needed."
msgstr "â%sâ è un antenato di â%sâ: il merge non è necessario."
@@ -1176,7 +1231,8 @@ msgstr "nessun server specificato e ness
msgid "no server given and no default server set"
msgstr "nessun server specificato e nessun server di default impostato"
-#: cmd_netsync.cc:78 cmd_netsync.cc:98
+#: cmd_netsync.cc:78
+#: cmd_netsync.cc:98
#, c-format
msgid "no branch pattern given"
msgstr "nessun pattern di ramo specificato"
@@ -1194,38 +1250,37 @@ msgid "no branch pattern given and no de
#: cmd_netsync.cc:100
#, c-format
msgid "no branch pattern given and no default pattern set"
-msgstr ""
-"nessun pattern di ramo specificato e nessun pattern di default impostato"
+msgstr "nessun pattern di ramo specificato e nessun pattern di default impostato"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144 cmd_netsync.cc:188
+#: cmd_netsync.cc:116
+#: cmd_netsync.cc:129
+#: cmd_netsync.cc:144
+#: cmd_netsync.cc:188
msgid "network"
msgstr "rete"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144
+#: cmd_netsync.cc:116
+#: cmd_netsync.cc:129
+#: cmd_netsync.cc:144
msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
msgstr "[INDIRIZZO[:NUMERO_PORTA] [PATTERN]]"
#: cmd_netsync.cc:117
msgid "push branches matching PATTERN to netsync server at ADDRESS"
-msgstr ""
-"invia i rami che corrispondono a PATTERN al server netsync presso INDIRIZZO"
+msgstr "invia i rami che corrispondono a PATTERN al server netsync presso INDIRIZZO"
#: cmd_netsync.cc:130
msgid "pull branches matching PATTERN from netsync server at ADDRESS"
-msgstr ""
-"riceve i rami che corrispondono a PATTERN dal server netsync presso INDIRIZZO"
+msgstr "riceve i rami che corrispondono a PATTERN dal server netsync presso INDIRIZZO"
#: cmd_netsync.cc:138
#, c-format
msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
-msgstr ""
-"eseguo âpullâ anonimo; utilizza â-k NOMECHIAVEâ se necessiti di "
-"autenticazione"
+msgstr "eseguo âpullâ anonimo; utilizza â-k NOMECHIAVEâ se necessiti di autenticazione"
#: cmd_netsync.cc:145
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
-msgstr ""
-"sync dei rami che corrispondono a PATTERN con server netsync presso INDIRIZZO"
+msgstr "sync dei rami che corrispondono a PATTERN con server netsync presso INDIRIZZO"
#: cmd_netsync.cc:164
#, c-format
@@ -1247,18 +1302,13 @@ msgstr ""
#: cmd_netsync.cc:205
#, c-format
-msgid ""
-"need permission to store persistent passphrase (see hook persist_phrase_ok())"
-msgstr ""
-"è necessario un permesso per ricordare la passphrase (vedi hook "
-"âpersist_phrase_ok()â)"
+msgid "need permission to store persistent passphrase (see hook persist_phrase_ok())"
+msgstr "è necessario un permesso per ricordare la passphrase (vedi hook âpersist_phrase_ok()â)"
#: cmd_netsync.cc:211
#, c-format
-msgid ""
-"The --no-transport-auth option is only permitted in combination with --stdio"
-msgstr ""
-"L'opzione â--no-transport-authâ è permessa solo in combinazione con â--stdioâ"
+msgid "The --no-transport-auth option is only permitted in combination with --stdio"
+msgstr "L'opzione â--no-transport-authâ è permessa solo in combinazione con â--stdioâ"
#: cmd_othervcs.cc:15
msgid "RCSFILE..."
@@ -1267,8 +1317,7 @@ msgid ""
#: cmd_othervcs.cc:16
msgid ""
"parse versions in RCS files\n"
-"this command doesn't reconstruct or import revisions.you probably want "
-"cvs_import"
+"this command doesn't reconstruct or import revisions.you probably want cvs_import"
msgstr ""
#: cmd_othervcs.cc:32
@@ -1283,11 +1332,14 @@ msgstr "importa tutte le versioni di un
msgid "import all versions in CVS repository"
msgstr "importa tutte le versioni di un repository CVS"
-#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69
+#: cmd_packet.cc:21
+#: cmd_packet.cc:50
+#: cmd_packet.cc:69
msgid "packet i/o"
msgstr "i/o pacchetti"
-#: cmd_packet.cc:21 cmd_packet.cc:50
+#: cmd_packet.cc:21
+#: cmd_packet.cc:50
msgid "ID"
msgstr "ID"
@@ -1460,7 +1512,8 @@ msgstr ""
" rinominato %s\n"
" in %s"
-#: cmd_ws_commit.cc:409 cmd_ws_commit.cc:413
+#: cmd_ws_commit.cc:409
+#: cmd_ws_commit.cc:413
#, c-format
msgid " added %s"
msgstr " aggiunto %s"
@@ -1470,7 +1523,9 @@ msgstr " modificato %s"
msgid " patched %s"
msgstr " modificato %s"
-#: cmd_ws_commit.cc:421 cmd_ws_commit.cc:907 cmd_ws_commit.cc:930
+#: cmd_ws_commit.cc:421
+#: cmd_ws_commit.cc:907
+#: cmd_ws_commit.cc:930
msgid "[DIRECTORY]"
msgstr "[DIRECTORY]"
@@ -1484,16 +1539,13 @@ msgstr ""
"estrae una revisione dal database in una directory.\n"
"Se viene specificata una revisione, sarà quella ad essere estratta.\n"
"Altrimenti sarà la testa del ramo (specificato o implicito).\n"
-"Se nessuna directory è specificata, il nome del ramo sarà usato come "
-"directory"
+"Se nessuna directory è specificata, il nome del ramo sarà usato come directory"
# TODO: âestrarreâ non mi convince?
#: cmd_ws_commit.cc:440
#, c-format
msgid "use --revision or --branch to specify what to checkout"
-msgstr ""
-"utilizza â--revisionâ o â--branchâ per specificare cosa estrarre con il "
-"checkout"
+msgstr "utilizza â--revisionâ o â--branchâ per specificare cosa estrarre con il checkout"
#: cmd_ws_commit.cc:448
#, c-format
@@ -1523,8 +1575,7 @@ msgid "checkout directory '%s' already e
#: cmd_ws_commit.cc:509
#, c-format
msgid "checkout directory '%s' already exists"
-msgstr ""
-"la directory â%sâ esiste già , non può essere utilizzata per il âcheckoutâ"
+msgstr "la directory â%sâ esiste già , non può essere utilizzata per il âcheckoutâ"
#: cmd_ws_commit.cc:543
#, c-format
@@ -1586,8 +1637,7 @@ msgstr ""
"perhaps move or delete _MTN/log,\n"
"or remove --message/--message-file from the command line?"
msgstr ""
-"â_MTN/logâ non è vuoto e un messaggio di log è stato specificato sulla riga "
-"di comando\n"
+"â_MTN/logâ non è vuoto e un messaggio di log è stato specificato sulla riga di comando\n"
"forse vuoi muovere o cancellare â_MTN/logâ oppure\n"
"togliere â--messageâ/â--message-fileâ dalla riga di comando?"
@@ -1606,7 +1656,8 @@ msgstr "la revisione %s è già nel data
msgid "revision %s already in database"
msgstr "la revisione %s è già nel database"
-#: cmd_ws_commit.cc:806 cmd_ws_commit.cc:836
+#: cmd_ws_commit.cc:806
+#: cmd_ws_commit.cc:836
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "file â%sâ modificato durante il commit, abbandono"
@@ -1632,9 +1683,7 @@ msgid "setup a new workspace directory,
#: cmd_ws_commit.cc:908
msgid "setup a new workspace directory, default to current"
-msgstr ""
-"imposta una nuova directory come spazio di lavoro, il default è quella "
-"attuale"
+msgstr "imposta una nuova directory come spazio di lavoro, il default è quella attuale"
#: cmd_ws_commit.cc:914
#, c-format
@@ -1642,16 +1691,15 @@ msgstr "per il âsetupâ è necessario
msgstr "per il âsetupâ è necessario un argomento â--branch=RAMOâ"
#: cmd_ws_commit.cc:931
-msgid ""
-"migrate a workspace directory's metadata to the latest format; defaults to "
-"the current workspace"
+msgid "migrate a workspace directory's metadata to the latest format; defaults to the current workspace"
msgstr ""
#: cmd_ws_commit.cc:944
msgid "refresh the inodeprint cache"
msgstr "aggiorna la cache degli inodeprint"
-#: commands.cc:131 commands.cc:233
+#: commands.cc:131
+#: commands.cc:233
#, c-format
msgid "unknown command '%s'"
msgstr "comando â%sâ sconosciuto"
@@ -1728,7 +1776,9 @@ msgstr "contrassegni"
msgid "markings"
msgstr "contrassegni"
-#: database_check.cc:298 netsync.cc:2967 rcs_import.cc:1244
+#: database_check.cc:298
+#: netsync.cc:2967
+#: rcs_import.cc:1244
msgid "revisions"
msgstr "revisioni"
@@ -1736,7 +1786,8 @@ msgstr "ascendenza"
msgid "ancestry"
msgstr "ascendenza"
-#: database_check.cc:426 netsync.cc:2971
+#: database_check.cc:426
+#: netsync.cc:2971
msgid "keys"
msgstr "chiavi"
@@ -1771,13 +1822,8 @@ msgstr "roster â%sâ incompleto (%d r
#: database_check.cc:553
#, c-format
-msgid ""
-"revision %s missing (%d revision references; %d cert references; %d parent "
-"references; %d child references; %d roster references)"
-msgstr ""
-"revisione %s mancante (%d riferimenti alla revisione; %d riferimenti al "
-"certificato; %d riferimenti al genitore; %d riferimenti al figlio; %d "
-"riferimenti al roster)"
+msgid "revision %s missing (%d revision references; %d cert references; %d parent references; %d child references; %d roster references)"
+msgstr "revisione %s mancante (%d riferimenti alla revisione; %d riferimenti al certificato; %d riferimenti al genitore; %d riferimenti al figlio; %d riferimenti al roster)"
#: database_check.cc:561
#, c-format
@@ -1808,16 +1854,13 @@ msgid "revision %s mismatched parents (%
#: database_check.cc:593
#, c-format
msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)"
-msgstr ""
-"la revisione %s non corrisponde ai genitori (%d stirpi di genitori; %d "
-"riferimenti alla revisione)"
+msgstr "la revisione %s non corrisponde ai genitori (%d stirpi di genitori; %d riferimenti alla revisione)"
# TODO: stirpi?
#: database_check.cc:602
#, c-format
msgid "revision %s mismatched children (%d ancestry children; %d parents)"
-msgstr ""
-"la revisione %s non corrisponde ai figli (%d stirpi di figli; %d genitori)"
+msgstr "la revisione %s non corrisponde ai figli (%d stirpi di figli; %d genitori)"
#: database_check.cc:614
#, c-format
@@ -1828,8 +1871,7 @@ msgid "revision %s is not parseable (per
#: database_check.cc:621
#, c-format
msgid "revision %s is not parseable (perhaps with unnormalized paths?)"
-msgstr ""
-"revisione %s non comprensibile (forse a causa di percorsi non normalizzati)"
+msgstr "revisione %s non comprensibile (forse a causa di percorsi non normalizzati)"
#: database_check.cc:628
#, c-format
@@ -1844,9 +1886,7 @@ msgid "revision %s unchecked signature i
#: database_check.cc:685
#, c-format
msgid "revision %s unchecked signature in %s cert from missing key %s"
-msgstr ""
-"revisione %s firma non controllata nel certificato â%sâ per chiave â%sâ "
-"mancante"
+msgstr "revisione %s firma non controllata nel certificato â%sâ per chiave â%sâ mancante"
#: database_check.cc:693
#, c-format
@@ -1861,9 +1901,7 @@ msgid "revision %s mismatched certs (%d
#: database_check.cc:717
#, c-format
msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)"
-msgstr ""
-"la revisione %s non corrisponde ai certificati (%d autori %d date %d "
-"changelogs)"
+msgstr "la revisione %s non corrisponde ai certificati (%d autori %d date %d changelogs)"
#: database_check.cc:797
#, c-format
@@ -1953,9 +1991,7 @@ msgid "check complete: %d files; %d rost
#: database_check.cc:861
#, c-format
msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs"
-msgstr ""
-"controllo completo: %d file; %d roster; %d revisioni; %d chiavi; %d "
-"certificati"
+msgstr "controllo completo: %d file; %d roster; %d revisioni; %d chiavi; %d certificati"
#: database_check.cc:867
#, c-format
@@ -2042,10 +2078,10 @@ msgid "database %s is not an sqlite vers
#: database.cc:263
#, c-format
msgid "database %s is not an sqlite version 3 file, try dump and reload"
-msgstr ""
-"il database â%sâ non è un file SQLite versione 3, prova âdumpâ e âreloadâ"
+msgstr "il database â%sâ non è un file SQLite versione 3, prova âdumpâ e âreloadâ"
-#: database.cc:292 schema_migration.cc:201
+#: database.cc:292
+#: schema_migration.cc:201
msgid ""
"make sure database and containing directory are writeable\n"
"and you have not run out of disk space"
@@ -2053,7 +2089,8 @@ msgstr ""
"assicurati che il database e la directory che lo contiene siano\n"
"scrivibili e che tu non abbia esaurito lo spazio su disco"
-#: database.cc:298 schema_migration.cc:206
+#: database.cc:298
+#: schema_migration.cc:206
#, c-format
msgid ""
"sqlite error: %s\n"
@@ -2070,8 +2107,7 @@ msgid ""
#: database.cc:348
#, c-format
msgid ""
-"existing (possibly stale) journal file '%s' has same stem as new database '%"
-"s'\n"
+"existing (possibly stale) journal file '%s' has same stem as new database '%s'\n"
"cancelling database creation"
msgstr ""
@@ -2209,7 +2245,8 @@ msgstr ""
"[ destra] %s\n"
"[ unione] %s"
-#: file_io.cc:176 file_io.cc:183
+#: file_io.cc:176
+#: file_io.cc:183
#, c-format
msgid ""
"could not create directory '%s'\n"
@@ -2289,10 +2326,10 @@ msgid "rename source file '%s' is a dire
#: file_io.cc:255
#, c-format
msgid "rename source file '%s' is a directory -- bug in monotone?"
-msgstr ""
-"il file sorgente da rinominare â%sâ è una directory -- bug in monotone?"
+msgstr "il file sorgente da rinominare â%sâ è una directory -- bug in monotone?"
-#: file_io.cc:258 file_io.cc:271
+#: file_io.cc:258
+#: file_io.cc:271
#, c-format
msgid "rename target '%s' already exists"
msgstr "esiste già un'altra chiave con nome â%sâ"
@@ -2372,7 +2409,8 @@ msgstr "le passphrase non può essere vu
msgid "empty passphrases not allowed, try again"
msgstr "le passphrase non può essere vuota, riprova"
-#: keys.cc:131 keys.cc:138
+#: keys.cc:131
+#: keys.cc:138
#, c-format
msgid "too many failed passphrases"
msgstr "troppe passphrase errate"
@@ -2392,7 +2430,8 @@ msgstr "passphrase incorretta per â%sâ
msgid "passphrase for '%s' is incorrect"
msgstr "passphrase incorretta per â%sâ"
-#: lua.cc:462 lua.cc:476
+#: lua.cc:462
+#: lua.cc:476
#, c-format
msgid "%s called with an invalid parameter"
msgstr "â%sâ chiamato con un parametro non valido"
@@ -2402,7 +2441,9 @@ msgstr "La directory â%sâ non esiste
msgid "Directory '%s' does not exist"
msgstr "La directory â%sâ non esiste"
-#: lua.cc:480 rcs_import.cc:1235 work.cc:1316
+#: lua.cc:480
+#: rcs_import.cc:1235
+#: work.cc:1316
#, c-format
msgid "'%s' is not a directory"
msgstr "â%sâ non è una directory"
@@ -2434,17 +2475,17 @@ msgstr "l'hash del nodo non corrisponde:
msgstr "l'hash del nodo non corrisponde: è %s ma era atteso %s"
# TODO: è giusta? verificare che file sia associato a xargs
-#: monotone.cc:154
+#: monotone.cc:153
#, c-format
msgid "Invalid escape in --xargs file"
msgstr "Escape non validi in â--xargs fileâ"
-#: monotone.cc:686
+#: monotone.cc:683
#, c-format
msgid "Usage: %s [OPTION...] command [ARG...]"
msgstr "Uso: %s [OPZIONIâ¦] comando [ARGOMENTIâ¦]"
-#: monotone.cc:694
+#: monotone.cc:691
#, c-format
msgid "Options specific to '%s %s':"
msgstr "Opzioni specifiche per â%s %sâ:"
@@ -2492,15 +2533,11 @@ msgid "the remote side has a newer, inco
#: netcmd.cc:125
msgid "the remote side has a newer, incompatible version of monotone"
-msgstr ""
-"all'altro capo c'è una versione più nuova di monotone, non compatibile con "
-"questa"
+msgstr "all'altro capo c'è una versione più nuova di monotone, non compatibile con questa"
#: netcmd.cc:126
msgid "the remote side has an older, incompatible version of monotone"
-msgstr ""
-"all'altro capo c'è una versione più vecchia di monotone, non compatibile con "
-"questa"
+msgstr "all'altro capo c'è una versione più vecchia di monotone, non compatibile con questa"
#: netcmd.cc:136
#, c-format
@@ -2514,18 +2551,21 @@ msgstr ""
"this suggests data was corrupted in transit"
msgstr ""
-#: netcmd.cc:272 netcmd.cc:318
+#: netcmd.cc:272
+#: netcmd.cc:318
#, c-format
msgid "unknown role specifier %d"
msgstr "specificatore di ruolo %d sconosciuto"
-#: netio.hh:41 netio.hh:59
+#: netio.hh:41
+#: netio.hh:59
#, c-format
msgid "need %d bytes to decode %s at %d, only have %d"
msgstr ""
# TODO: come tradurre "datum"? o "overflow"?
-#: netio.hh:87 netio.hh:122
+#: netio.hh:87
+#: netio.hh:122
#, fuzzy, c-format
msgid "uleb128 decode for '%s' into %d-byte datum overflowed"
msgstr "la decodifica uleb128 per â%sâ in ***datum*** %d-byte ***overflow***"
@@ -2538,9 +2578,7 @@ msgid "decoding variable length string o
#: netio.hh:278
#, c-format
msgid "decoding variable length string of %d bytes for '%s', maximum is %d"
-msgstr ""
-"decodifica in corso della stringa a lungheza variabile di %d byte per â%sâ, "
-"il massimo è %d"
+msgstr "decodifica in corso della stringa a lungheza variabile di %d byte per â%sâ, il massimo è %d"
#: netio.hh:333
#, c-format
@@ -2564,7 +2602,8 @@ msgstr "cert. â"
msgid "certs in"
msgstr "cert. â"
-#: netsync.cc:732 netsync.cc:745
+#: netsync.cc:732
+#: netsync.cc:745
msgid "revs in"
msgstr "rev. â"
@@ -2572,7 +2611,8 @@ msgstr "cert. â"
msgid "certs out"
msgstr "cert. â"
-#: netsync.cc:739 netsync.cc:747
+#: netsync.cc:739
+#: netsync.cc:747
msgid "revs out"
msgstr "rev. â"
@@ -2638,7 +2678,8 @@ msgstr "rifiutato un tentativo di connes
msgid "rejected attempt at anonymous connection while running as sink"
msgstr "rifiutato un tentativo di connessione anonima funzionando come pozzo"
-#: netsync.cc:1372 netsync.cc:1496
+#: netsync.cc:1372
+#: netsync.cc:1496
#, c-format
msgid "not serving branch '%s'"
msgstr "il ramo â%sâ non è servito"
@@ -2656,8 +2697,7 @@ msgid "allowed anonymous read/write perm
#: netsync.cc:1391
#, c-format
msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
-msgstr ""
-"concessi permessi di lettura/scrittura anonime a â%sâ con esclusione di â%sâ"
+msgstr "concessi permessi di lettura/scrittura anonime a â%sâ con esclusione di â%sâ"
#: netsync.cc:1447
#, c-format
@@ -2671,20 +2711,13 @@ msgstr "l'hash â%sâ della chiave pub
#: netsync.cc:1484
#, c-format
-msgid ""
-"denied '%s' read permission for '%s' excluding '%s' while running as pure "
-"sink"
-msgstr ""
-"negato a â%sâ il permesso di lettura a â%sâ con esclusione di â%sâ nel ruolo "
-"di pozzo"
+msgid "denied '%s' read permission for '%s' excluding '%s' while running as pure sink"
+msgstr "negato a â%sâ il permesso di lettura a â%sâ con esclusione di â%sâ nel ruolo di pozzo"
#: netsync.cc:1501
#, c-format
-msgid ""
-"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
-msgstr ""
-"negato a â%sâ il permesso di lettura a â%sâ con esclusione di â%sâ a causa "
-"del ramo â%sâ"
+msgid "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
+msgstr "negato a â%sâ il permesso di lettura a â%sâ con esclusione di â%sâ a causa del ramo â%sâ"
#: netsync.cc:1511
#, c-format
@@ -2693,12 +2726,8 @@ msgstr "concessi a â%sâ permessi di
#: netsync.cc:1521
#, c-format
-msgid ""
-"denied '%s' write permission for '%s' excluding '%s' while running as pure "
-"source"
-msgstr ""
-"negato a â%sâ il permesso di scrittura a â%sâ con esclusione di â%sâ nel "
-"ruolo di sorgente"
+msgid "denied '%s' write permission for '%s' excluding '%s' while running as pure source"
+msgstr "negato a â%sâ il permesso di scrittura a â%sâ con esclusione di â%sâ nel ruolo di sorgente"
#: netsync.cc:1528
#, c-format
@@ -2738,16 +2767,12 @@ msgid "Mismatched epoch on branch %s. Se
#: netsync.cc:1857
#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
-msgstr ""
-"Epoca non corrispondente sul ramo â%sâ: il server usa â%sâ, il client usa â%"
-"sâ."
+msgstr "Epoca non corrispondente sul ramo â%sâ: il server usa â%sâ, il client usa â%sâ."
#: netsync.cc:1875
#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
-msgstr ""
-"verifica dell'hash fallita per la chiave pubblica â%sâ (%s); atteso â%sâ, "
-"ottenuto â%sâ"
+msgstr "verifica dell'hash fallita per la chiave pubblica â%sâ (%s); atteso â%sâ, ottenuto â%sâ"
#: netsync.cc:1889
#, c-format
@@ -2759,15 +2784,18 @@ msgstr "Ricevuto avvertimento dall'uscie
msgid "Received warning from usher: %s"
msgstr "Ricevuto avvertimento dall'usciere: %s"
-#: netsync.cc:2038 netsync.cc:2069
+#: netsync.cc:2038
+#: netsync.cc:2069
msgid "source and sink"
msgstr "sorgente e pozzo"
-#: netsync.cc:2039 netsync.cc:2070
+#: netsync.cc:2039
+#: netsync.cc:2070
msgid "source"
msgstr "sorgente"
-#: netsync.cc:2039 netsync.cc:2070
+#: netsync.cc:2039
+#: netsync.cc:2070
msgid "sink"
msgstr "pozzo"
@@ -2776,7 +2804,8 @@ msgstr ""
msgid "input buffer for peer %s is overfull after netcmd dispatch"
msgstr ""
-#: netsync.cc:2238 netsync.cc:2337
+#: netsync.cc:2238
+#: netsync.cc:2337
#, c-format
msgid "protocol error while processing peer %s: '%s'"
msgstr "errore di protocollo processando il peer %s: â%sâ"
@@ -2820,8 +2849,7 @@ msgid "protocol error while processing p
#: netsync.cc:2469
#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad"
-msgstr ""
-"errore di protocollo processando peer â%sâ: â%sâ, marcato come invalido"
+msgstr "errore di protocollo processando peer â%sâ: â%sâ, marcato come invalido"
#: netsync.cc:2501
#, c-format
@@ -2840,8 +2868,7 @@ msgstr ""
#: netsync.cc:2554
#, c-format
-msgid ""
-"peer %s read failed in shutdown state (possibly client misreported error)"
+msgid "peer %s read failed in shutdown state (possibly client misreported error)"
msgstr ""
#: netsync.cc:2560
@@ -2856,8 +2883,7 @@ msgstr ""
#: netsync.cc:2586
#, c-format
-msgid ""
-"peer %s write failed in shutdown state (possibly client misreported error)"
+msgid "peer %s write failed in shutdown state (possibly client misreported error)"
msgstr ""
#: netsync.cc:2592
@@ -2888,9 +2914,7 @@ msgid "session limit %d reached, some co
#: netsync.cc:2724
#, c-format
msgid "session limit %d reached, some connections will be refused"
-msgstr ""
-"numero limite di sessioni (%d) raggiunto, alcune connessioni verrano "
-"rifiutate"
+msgstr "numero limite di sessioni (%d) raggiunto, alcune connessioni verrano rifiutate"
#: netsync.cc:2789
#, c-format
@@ -2936,7 +2960,8 @@ msgstr ""
"%s"
msgstr ""
-#: netsync.cc:3163 netsync.cc:3167
+#: netsync.cc:3163
+#: netsync.cc:3167
#, c-format
msgid "network error: %s"
msgstr "errore di rete: %s"
@@ -3156,7 +3181,10 @@ msgstr "manca un requisito: la revisione
msgid "missing prerequisite revision '%s'"
msgstr "manca un requisito: la revisione %s"
-#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175
+#: packet.cc:140
+#: packet.cc:151
+#: packet.cc:167
+#: packet.cc:175
#, c-format
msgid "dropping revision '%s'"
msgstr "elimino la revisione %s"
@@ -3206,8 +3234,7 @@ msgid "parse failure %d:%d: expecting %s
#: rcs_file.cc:354
#, c-format
msgid "parse failure %d:%d: expecting %s, got %s with value '%s'"
-msgstr ""
-"errore sintattico %d:%d: mi aspettavo %s, ho ricevuto %s con valore â%sâ"
+msgstr "errore sintattico %d:%d: mi aspettavo %s, ho ricevuto %s con valore â%sâ"
#: rcs_file.cc:373
#, c-format
@@ -3286,16 +3313,12 @@ msgid "Directory for path %s cannot be a
#: revision.cc:1145
#, c-format
msgid "Directory for path %s cannot be added, as there is a file in the way"
-msgstr ""
-"La cartella per il percorso â%sâ non può essere aggiunta, dato che c'è già "
-"un file con lo stesso nome"
+msgstr "La cartella per il percorso â%sâ non può essere aggiunta, dato che c'è già un file con lo stesso nome"
#: revision.cc:1156
#, c-format
msgid "Path %s cannot be added, as there is a directory in the way"
-msgstr ""
-"Il percorso â%sâ non può essere aggiunto, dato che c'è già una directory con "
-"lo stesso nome"
+msgstr "Il percorso â%sâ non può essere aggiunto, dato che c'è già una directory con lo stesso nome"
#: revision.cc:1159
#, c-format
@@ -3314,8 +3337,7 @@ msgid "converting existing revision grap
#: revision.cc:1559
#, c-format
msgid "converting existing revision graph to new roster-style revisions"
-msgstr ""
-"converto il grafo esistente delle revisioni al nuovo formato con roster"
+msgstr "converto il grafo esistente delle revisioni al nuovo formato con roster"
#: revision.cc:1614
#, c-format
@@ -3396,9 +3418,7 @@ msgid "mismatched result of migration, g
#: schema_migration.cc:311
#, c-format
msgid "mismatched result of migration, got %s, wanted %s"
-msgstr ""
-"risultati della migrazione diversi da quanto previsto: ho ottenuto â%sâ e mi "
-"aspettavo â%sâ"
+msgstr "risultati della migrazione diversi da quanto previsto: ho ottenuto â%sâ e mi aspettavo â%sâ"
#: schema_migration.cc:314
#, c-format
@@ -3454,9 +3474,7 @@ msgid "no migration performed; database
#: schema_migration.cc:357
#, c-format
msgid "no migration performed; database schema already up-to-date at %s"
-msgstr ""
-"nessuna migrazione effettuata: lo schema del database era già aggiornato a â%"
-"sâ"
+msgstr "nessuna migrazione effettuata: lo schema del database era già aggiornato a â%sâ"
#: schema_migration.cc:916
#, c-format
@@ -3515,8 +3533,7 @@ msgstr ""
msgstr ""
"errore fatale: %s\n"
"questo è quasi sicuramente un bug in monotone.\n"
-"per favore invia questo messaggio di errore, l'output di â%s --full-"
-"versionâ\n"
+"per favore invia questo messaggio di errore, l'output di â%s --full-versionâ\n"
"e una descrizione di quello che stavi facendo a â%sâ."
#: ui.cc:581
@@ -3528,8 +3545,7 @@ msgid "failed to decode boolean testresu
#: update.cc:72
#, c-format
msgid "failed to decode boolean testresult cert value '%s'"
-msgstr ""
-"è fallita la decodifica del valore booleano del certificato testresult â%sâ"
+msgstr "è fallita la decodifica del valore booleano del certificato testresult â%sâ"
#: update.cc:166
#, c-format
@@ -3577,7 +3593,9 @@ msgstr "HMAC di lunghezza non valida (%d
msgid "Invalid hmac length of %d bytes"
msgstr "HMAC di lunghezza non valida (%d byte)"
-#: work.cc:88 work_migration.cc:180 work_migration.cc:200
+#: work.cc:88
+#: work_migration.cc:180
+#: work_migration.cc:200
#, c-format
msgid "workspace is corrupt: reading %s: %s"
msgstr "lo spazio di lavoro è corrotto: leggendo â%sâ: %s"
@@ -3619,8 +3637,7 @@ msgstr "aggiungo â%sâ al manifesto d
#: work.cc:565
#, c-format
-msgid ""
-"cannot add %s, because %s is recorded as a file in the workspace manifest"
+msgid "cannot add %s, because %s is recorded as a file in the workspace manifest"
msgstr ""
#: work.cc:680
@@ -3628,12 +3645,14 @@ msgstr "sto cancellando â%sâ"
msgid "dropping %s"
msgstr "sto cancellando â%sâ"
-#: work.cc:691 work.cc:702
+#: work.cc:691
+#: work.cc:702
#, c-format
msgid "path %s already exists"
msgstr "il percorso â%sâ esiste già "
-#: work.cc:724 work.cc:751
+#: work.cc:724
+#: work.cc:751
#, c-format
msgid "adding %s"
msgstr "aggiungo â%sâ"
@@ -3790,9 +3809,7 @@ msgid "_MTN/format should not exist in a
#: work_migration.cc:71
#, c-format
msgid "_MTN/format should not exist in a format 1 workspace; corrected"
-msgstr ""
-"â_MTN/formatâ non dovrebbe esistere in uno spazio di lavoro con formato 1; "
-"corretto"
+msgstr "â_MTN/formatâ non dovrebbe esistere in uno spazio di lavoro con formato 1; corretto"
#: work_migration.cc:108
#, c-format
@@ -3815,16 +3832,14 @@ msgstr ""
"with versions of monotone older than %s."
msgstr ""
-#: work_migration.cc:127 work_migration.cc:255
+#: work_migration.cc:127
+#: work_migration.cc:255
#, c-format
msgid ""
"this version of monotone only understands workspace metadata\n"
"in formats 0 through %d. your workspace is in format %d.\n"
"you need a newer version of monotone to use this workspace."
-msgstr ""
-"questa versione di monotone capisce gli spazi di lavoro con metadatinei "
-"formati da 0 a %d. il tuo spazio di lavoro è in formato %d.ti serve una "
-"versione di monotone più recente per usarlo."
+msgstr "questa versione di monotone capisce gli spazi di lavoro con metadatinei formati da 0 a %d. il tuo spazio di lavoro è in formato %d.ti serve una versione di monotone più recente per usarlo."
#: work_migration.cc:156
#, c-format
@@ -3845,5 +3860,5 @@ msgid "this workspace is in the current
#: work_migration.cc:247
#, c-format
msgid "this workspace is in the current format, no migration is necessary."
+msgstr "questo spazio di lavoro è nel formato attuale, non è necessario migrare."
+
-msgstr ""
-"questo spazio di lavoro è nel formato attuale, non è necessario migrare."
============================================================
--- po/ja.po 4fd53c6e28c82080558367050d653e55452cbd5f
+++ po/ja.po 8f094a686a4c59a86202b127f910d0f6efbb0572
@@ -7,7 +7,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: monotone HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-13 10:22-0500\n"
+"POT-Creation-Date: 2006-08-02 16:49-0700\n"
"PO-Revision-Date: 2006-08-24 13:11+0200\n"
"Last-Translator: Satoru SATOH \n"
"Language-Team: Japanese \n"
@@ -16,189 +16,64 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: app_state.cc:151
+#: app_state.cc:141
#, c-format
msgid "workspace required but not found%s%s"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ãå¿
è¦ã§ããã¿ã¤ããã¾ããã§ãã%s%s"
-#: app_state.cc:159
+#: app_state.cc:149
#, c-format
msgid "invalid directory ''"
msgstr "ç¡å¹ãªãã£ã¬ã¯ã㪠''"
-#: app_state.cc:167
+#: app_state.cc:157
#, fuzzy, c-format
msgid "monotone bookkeeping directory '%s' already exists in '%s'"
msgstr "monotone è¨é²ç°¿ç¨ãã£ã¬ã¯ã㪠'%s' ã¯æ¢ã« '%s' å
ã«åå¨ãã¦ãã¾ã\n"
-#: app_state.cc:245
+#: app_state.cc:238
#, c-format
msgid "search root '%s' does not exist"
msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯åå¨ãã¾ãã"
-#: app_state.cc:246
-#, fuzzy, c-format
-msgid "search root '%s' is not a directory"
+#: app_state.cc:239
+#, c-format
+msgid "search root '%s' is not a directory\n"
msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã\n"
-#: app_state.cc:280
+#: app_state.cc:273
#, c-format
msgid "failed to parse date string '%s': %s"
msgstr "ãã¼ã¿æåå '%s' ã®è§£æã«å¤±æ: %s"
-#: app_state.cc:295
-#, fuzzy, c-format
-msgid "negative depth not allowed"
-msgstr "æ·±ãã®å¤ãè² ã«ãããã¨ã¯ã§ãã¾ãã\n"
-
-#: app_state.cc:303
+#: app_state.cc:288
#, c-format
-msgid "illegal argument to --last: cannot be zero or negative"
-msgstr ""
+msgid "negative depth not allowed\n"
+msgstr "æ·±ãã®å¤ãè² ã«ãããã¨ã¯ã§ãã¾ãã\n"
-#: app_state.cc:311
+#: app_state.cc:296
#, c-format
-msgid "illegal argument to --next: cannot be zero or negative"
+msgid "illegal argument to --last: cannot be zero or negative\n"
msgstr ""
-#: app_state.cc:388
+#: app_state.cc:304
#, c-format
-msgid "illegal argument to --automate-stdio-size: cannot be zero or negative"
+msgid "illegal argument to --next: cannot be zero or negative\n"
msgstr ""
-#: automate.cc:64
-msgid "[BRANCH]"
-msgstr ""
-
-#: automate.cc:88 automate.cc:135 automate.cc:1206
-msgid "REV1 [REV2 [REV3 [...]]]"
-msgstr ""
-
-#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
-#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452
-#: automate.cc:1216 cmd_list.cc:661
-#, fuzzy, c-format
-msgid "No such revision %s"
-msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
-
-#: automate.cc:183 automate.cc:324
-msgid "[REV1 [REV2 [REV3 [...]]]]"
-msgstr ""
-
-#: automate.cc:215
-#, fuzzy
-msgid "FILE"
-msgstr "FILENAME"
-
-#: automate.cc:235
-#, fuzzy, c-format
-msgid "file %s is unknown to the current workspace"
-msgstr "ãã¡ã¤ã« '%s' ã¯ã¯ã¼ã¯ã¹ãã¼ã¹å
ã«åå¨ãã¾ãã"
-
-#: automate.cc:356
-msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
-msgstr ""
-
-#: automate.cc:423 automate.cc:447 cmd_list.cc:651
-#, fuzzy
-msgid "REV"
-msgstr "REVID"
-
-#: automate.cc:524
-msgid "SELECTOR"
-msgstr ""
-
-#: automate.cc:893 automate.cc:1023
-#, fuzzy
-msgid "[REVID]"
-msgstr "REVID"
-
-#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588
-#: automate.cc:1593
-#, fuzzy, c-format
-msgid "no revision %s found in database"
-msgstr "ãã¼ã¸ã§ã³ %s ã®ãã¡ã¤ã«ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ãã (対象: %s)"
-
-#: automate.cc:1066 automate.cc:1145
-msgid "FILEID"
-msgstr ""
-
-#: automate.cc:1073
-#, fuzzy, c-format
-msgid "no file version %s found in database"
-msgstr "ãã¼ã¸ã§ã³ %s ã®ãã¡ã¤ã«ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ãã (対象: %s)"
-
-#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845
-msgid "REVID"
-msgstr "REVID"
-
-#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186
-#: cmd_db.cc:35 cmd_diff_log.cc:385 cmd_diff_log.cc:416 cmd_diff_log.cc:418
-#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677
-#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:461 commands.cc:388
+#: app_state.cc:440
#, c-format
-msgid "no such revision '%s'"
-msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
+msgid "Failed to read options file %s"
+msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®è§£æã«å¤±æ"
-#: automate.cc:1156
-#, fuzzy, c-format
-msgid "no such file '%s'"
-msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
-
-#: automate.cc:1172
-msgid "OLD_FILE NEW_FILE"
-msgstr ""
-
-#: automate.cc:1317
-msgid "[BRANCH_PATTERN]"
-msgstr ""
-
-#: automate.cc:1413
-msgid "KEYID PASSPHRASE"
-msgstr ""
-
-#: automate.cc:1431 cmd_key_cert.cc:41
+#: app_state.cc:457
#, c-format
-msgid "key '%s' already exists"
-msgstr "éµ '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
+msgid "Failed to write options file %s"
+msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®æ¸ãè¾¼ã¿ã«å¤±æ"
-#: automate.cc:1434 cmd_key_cert.cc:44
-#, c-format
-msgid "generating key-pair '%s'"
-msgstr "éµå¯¾ '%s' ãçæãã¦ãã¾ã"
-
-#: automate.cc:1436 cmd_key_cert.cc:46
-#, c-format
-msgid "storing key-pair '%s' in %s/"
-msgstr "éµå¯¾ '%s' ã %s/ ã«ä¿åãã¦ãã¾ã"
-
-#: automate.cc:1472
-msgid "OPTION"
-msgstr ""
-
-#: automate.cc:1495
-#, c-format
-msgid "'%s' is not a recognized workspace option"
-msgstr ""
-
-#: automate.cc:1518
-#, fuzzy
-msgid "REV FILE"
-msgstr "REV REV"
-
-#: automate.cc:1535 automate.cc:1599
-#, fuzzy, c-format
-msgid "file %s is unknown for revision %s"
-msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã§ã³ '%s' ã«ã¯ããã¾ããã§ãã\n"
-
-#: automate.cc:1578
-#, fuzzy
-msgid "REV1 FILE REV2"
-msgstr "REV REV"
-
#: basic_io.cc:33
-#, fuzzy, c-format
-msgid "parsing a %s at %d:%d:E: %s"
+#, c-format
+msgid "error in %s:%d:%d:E: %s"
msgstr "ã¨ã©ã¼ %s:%d:%d:E: %s"
#: cert.cc:83
@@ -226,12 +101,12 @@ msgstr "è¨ç®ãã証æããã·ã¥ '
msgid "calculated cert hash '%s' does not match '%s'"
msgstr "è¨ç®ãã証æããã·ã¥ '%s' 㯠'%s' ã¨ä¸è´ãã¾ãã"
-#: cert.cc:387 keys.cc:560
+#: cert.cc:379 keys.cc:554
#, c-format
msgid "no key pair '%s' found in key store '%s'"
msgstr "éµå¯¾ '%s' ã¯éµã®ä¿åå ´æ '%s' ã«ã¯ããã¾ãã"
-#: cert.cc:465
+#: cert.cc:457
#, c-format
msgid ""
"you have no private key to make signatures with\n"
@@ -240,7 +115,7 @@ msgstr ""
"ç½²åããããã®ç§å¯éµãããã¾ããã\n"
"ãããã 'genkey <ããªãã®ã¡ã¼ã«ã¢ãã¬ã¹>' ã¨ããå¿
è¦ãããã¾ãã"
-#: cert.cc:468
+#: cert.cc:460
#, c-format
msgid ""
"you have multiple private keys\n"
@@ -249,46 +124,48 @@ msgstr ""
"è¤æ°ã®ç§å¯éµãããã¾ãã\n"
"'-k' ãã³ãã³ãã«è¿½å ãã¦ç½²åã«ä½¿ããã®ãé¸æãã¦ä¸ããã"
-#: cert.cc:485
+#: cert.cc:478
#, c-format
msgid "no branch found for empty revision, please provide a branch name"
msgstr "ãªãã¸ã§ã³ã空ã®ãã©ã³ãã¯ããã¾ãã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: cert.cc:494
+#: cert.cc:487
#, c-format
msgid "no branch certs found for revision %s, please provide a branch name"
msgstr ""
"ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æãã¿ã¤ããã¾ãã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: cert.cc:498
+#: cert.cc:491
#, c-format
msgid ""
"multiple branch certs found for revision %s, please provide a branch name"
msgstr "ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æã¯è¤æ°ããã¾ã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: cmd_automate.cc:157 cmd_automate.cc:226
-#, fuzzy, c-format
-msgid "Bad input to automate stdio"
-msgstr "parse_basic_io ã«å¯¾ãä¸æ£ãªå
¥å"
-
-#: cmd_automate.cc:176
+#: cmd_automate.cc:205
#, c-format
msgid "read from client failed with error code: %d"
msgstr ""
-#: cmd_automate.cc:177
+#: cmd_automate.cc:248
#, fuzzy, c-format
-msgid "Bad input to automate stdio (unexpected EOF)"
+msgid "Bad input to automate stdio"
msgstr "parse_basic_io ã«å¯¾ãä¸æ£ãªå
¥å"
-#: cmd_automate.cc:459
+#: cmd_automate.cc:301
msgid "automation"
msgstr "èªåå"
-#: cmd_automate.cc:460
+#: cmd_automate.cc:302
msgid "automation interface"
msgstr "èªååã¤ã³ã¿ã¼ãã§ã¼ã¹"
+#: cmd_db.cc:35 cmd_diff_log.cc:387 cmd_diff_log.cc:419 cmd_diff_log.cc:421
+#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:146 cmd_merging.cc:699
+#: cmd_merging.cc:714 cmd_merging.cc:717 cmd_ws_commit.cc:453 commands.cc:393
+#, c-format
+msgid "no such revision '%s'"
+msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
+
#: cmd_db.cc:41
#, c-format
msgid "revision %s already has children. We cannot kill it."
@@ -299,7 +176,6 @@ msgstr "ãã¼ã¿ãã¼ã¹"
msgstr "ãã¼ã¿ãã¼ã¹"
#: cmd_db.cc:47
-#, fuzzy
msgid ""
"init\n"
"info\n"
@@ -314,7 +190,6 @@ msgid ""
"check\n"
"changesetify\n"
"rosterify\n"
-"regenerate_rosters\n"
"set_epoch BRANCH EPOCH\n"
msgstr ""
"init\n"
@@ -332,61 +207,61 @@ msgstr ""
"rosterify\n"
"set_epoch BRANCH EPOCH\n"
-#: cmd_db.cc:62
+#: cmd_db.cc:61
msgid "manipulate database state"
msgstr "ãã¼ã¿ãã¼ã¹ã®ç¶æ
ãæä½"
-#: cmd_db.cc:111
+#: cmd_db.cc:108
#, c-format
msgid "The epoch must be %s characters"
msgstr "epoch 㯠%s æåã§ãªããã°ããã¾ãã"
-#: cmd_db.cc:122 cmd_db.cc:138
+#: cmd_db.cc:119 cmd_db.cc:135
msgid "vars"
msgstr "å¤æ°"
-#: cmd_db.cc:122
+#: cmd_db.cc:119
msgid "DOMAIN NAME VALUE"
msgstr "DOMAIN NAME VALUE"
-#: cmd_db.cc:123
+#: cmd_db.cc:120
msgid "set the database variable NAME to VALUE, in domain DOMAIN"
msgstr "ãã¡ã¤ã³ DOMAIN ã®ãã¼ã¿ãã¼ã¹å¤æ° NAME ã VALUE ã«è¨å®"
-#: cmd_db.cc:138
+#: cmd_db.cc:135
msgid "DOMAIN NAME"
msgstr "DOMAIN NAME"
-#: cmd_db.cc:139
+#: cmd_db.cc:136
msgid "remove the database variable NAME in domain DOMAIN"
msgstr "ãã¡ã¤ã³ DOMAIN ã®ãã¼ã¿ãã¼ã¹å¤æ° NAME ãæ¶å»"
-#: cmd_db.cc:151
+#: cmd_db.cc:148
#, c-format
msgid "no var with name %s in domain %s"
msgstr "%s ã¨ããå¤æ°ã¯ãã¡ã¤ã³ %s å
ã«ã¯ããã¾ãã"
-#: cmd_db.cc:155 cmd_diff_log.cc:331 cmd_diff_log.cc:541 cmd_files.cc:114
-#: cmd_files.cc:181 cmd_list.cc:457 cmd_merging.cc:614 cmd_ws_commit.cc:355
-#: commands.cc:252
+#: cmd_db.cc:152 cmd_diff_log.cc:331 cmd_diff_log.cc:543 cmd_files.cc:114
+#: cmd_files.cc:181 cmd_list.cc:448 cmd_merging.cc:636 cmd_ws_commit.cc:328
+#: commands.cc:248
msgid "informative"
msgstr "æ
å ±"
-#: cmd_db.cc:155
+#: cmd_db.cc:152
msgid "(revision|file|key) PARTIAL-ID"
msgstr "(revision|file|key) PARTIAL-ID"
-#: cmd_db.cc:156
+#: cmd_db.cc:153
msgid "complete partial id"
msgstr "é¨å ID ãè£å®"
-#: cmd_db.cc:165
+#: cmd_db.cc:162
#, c-format
msgid "non-hex digits in partial id"
msgstr "é¨å ID ã«åå
é²æ°ãå«ã¾ãã¦ãã¾ãã"
-#: cmd_diff_log.cc:331 cmd_ws_commit.cc:66 cmd_ws_commit.cc:242
-#: cmd_ws_commit.cc:276 cmd_ws_commit.cc:355 cmd_ws_commit.cc:661
+#: cmd_diff_log.cc:331 cmd_ws_commit.cc:53 cmd_ws_commit.cc:222
+#: cmd_ws_commit.cc:250 cmd_ws_commit.cc:328 cmd_ws_commit.cc:620
msgid "[PATH]..."
msgstr "[PATH]..."
@@ -395,15 +270,16 @@ msgid ""
msgid ""
"show current diffs on stdout.\n"
"If one revision is given, the diff between the workspace and\n"
-"that revision is shown. If two revisions are given, the diff between\n"
-"them is given. If no format is specified, unified is used by default."
+"that revision is shown. If two revisions are given, the diff\n"
+"between them is given. If no format is specified, unified\n"
+"is used by default."
msgstr ""
"ç¾å¨ã®å·®åãæ¨æºåºåã«è¡¨ç¤º\n"
"ãªãã¸ã§ã³ãä¸ã¤æå®ããã¦ããã°ãã¯ã¼ã¯ã¹ãã¼ã¹ã¨ãã®ãªãã¸ã§ã³ã®\n"
"å·®åããäºã¤æå®ããã¦ããã°ããããªãã¸ã§ã³éã®å·®åã表示ãã¾ãã\n"
"å½¢å¼ãæå®ããã¦ããªããã°ãããã©ã«ãã§ã¯ unified å½¢å¼ã使ç¨ãã¾ãã"
-#: cmd_diff_log.cc:345
+#: cmd_diff_log.cc:347
#, c-format
msgid ""
"--diff-args requires --external\n"
@@ -412,30 +288,30 @@ msgstr ""
"--diff-args 㯠--external ãå¿
è¦ã¨ãã¾ãã\n"
"--external ã追å ãããã--diff-args ãçãã¦ã¿ã¦ã¯ã©ãã§ãã?"
-#: cmd_diff_log.cc:477
+#: cmd_diff_log.cc:479
msgid "no changes"
msgstr "å¤æ´ãªã"
-#: cmd_diff_log.cc:541
+#: cmd_diff_log.cc:543
msgid "[FILE] ..."
msgstr "[FILE] ..."
-#: cmd_diff_log.cc:542
+#: cmd_diff_log.cc:544
#, fuzzy
msgid ""
-"print history in reverse order (filtering by 'FILE'). If one or more\n"
+"print history in reverse order (filtering by 'FILE'). If one or more "
"revisions are given, use them as a starting point."
msgstr ""
"éé ã§å±¥æ´ã表示 ('FILE' ã§ãã£ã«ã¿)ãä¸ã¤ä»¥ä¸ã®ãªãã¸ã§ã³ãæå®ããã¦\n"
"ããã°ãããéå§ç¹ã¨ãã¦å©ç¨ã"
-#: cmd_diff_log.cc:604
+#: cmd_diff_log.cc:607
#, c-format
msgid "only one of --last/--next allowed"
msgstr "--last/--next ã®ã©ã¡ããã®ã¿ã許ããã¦ãã¾ã"
#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:157
-#: cmd_merging.cc:845 cmd_othervcs.cc:15
+#: cmd_merging.cc:864 cmd_othervcs.cc:15
msgid "debug"
msgstr "ãããã°"
@@ -534,64 +410,74 @@ msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã
msgid "no file '%s' found in revision '%s'"
msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã§ã³ '%s' ã«ã¯ããã¾ããã§ãã\n"
-#: cmd.hh:108
+#: cmd.hh:97
#, c-format
msgid "non-hex digits in id"
msgstr "ID ã«åå
é²æ°ãå«ã¾ãã¦ãã¾ãã"
-#: cmd.hh:117
+#: cmd.hh:106
#, c-format
msgid "partial id '%s' does not have an expansion"
msgstr "é¨å ID '%s' ãä¸ã¤ã® ID ã«å±éãããã¨ã¯ã§ãã¾ãã"
-#: cmd.hh:121
-#, fuzzy, c-format
-msgid "partial id '%s' has multiple ambiguous expansions:"
+#: cmd.hh:110
+#, c-format
+msgid "partial id '%s' has multiple ambiguous expansions:\n"
msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ãã ID ã®åè£ã¯è¤æ°ããã¾ã:\n"
-#: cmd.hh:129
+#: cmd.hh:118
#, fuzzy, c-format
msgid "expanded partial id '%s' to '%s'"
msgstr "é¨å ID '%s' ã '%s' ã«å±é\n"
-#: cmd.hh:212
-#, c-format
-msgid "Alias for %s"
-msgstr ""
-
-#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90
-#: cmd_key_cert.cc:111 cmd_key_cert.cc:147
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:149
msgid "key and cert"
msgstr "éµã¨è¨¼æ"
-#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
msgid "KEYID"
msgstr "KEYID"
-#: cmd_key_cert.cc:26
+#: cmd_key_cert.cc:27
msgid "generate an RSA key-pair"
msgstr "éµå¯¾ãçæ"
-#: cmd_key_cert.cc:51
+#: cmd_key_cert.cc:42
+#, c-format
+msgid "key '%s' already exists"
+msgstr "éµ '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
+
+#: cmd_key_cert.cc:45
+#, c-format
+msgid "generating key-pair '%s'"
+msgstr "éµå¯¾ '%s' ãçæãã¦ãã¾ã"
+
+#: cmd_key_cert.cc:47
+#, c-format
+msgid "storing key-pair '%s' in %s/"
+msgstr "éµå¯¾ '%s' ã %s/ ã«ä¿åãã¦ãã¾ã"
+
+#: cmd_key_cert.cc:53
msgid "drop a public and private key"
msgstr "å
¬ééµã¨ç§å¯éµãç ´æ£"
-#: cmd_key_cert.cc:65
+#: cmd_key_cert.cc:67
#, fuzzy, c-format
msgid "dropping public key '%s' from database"
msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£ãã¦ãã¾ã\n"
-#: cmd_key_cert.cc:75
+#: cmd_key_cert.cc:77
#, fuzzy, c-format
msgid "dropping key pair '%s' from keystore"
msgstr "éµå¯¾ '%s' ãéµã®ä¿åå ´æããç ´æ£ãã¦ãã¾ã\n"
-#: cmd_key_cert.cc:82
+#: cmd_key_cert.cc:84
#, c-format
msgid "public or private key '%s' does not exist in keystore or database"
msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯éµã®ä¿åå ´æã«ããã¼ã¿ãã¼ã¹å
ã«ãåå¨ãã¾ãã"
-#: cmd_key_cert.cc:85
+#: cmd_key_cert.cc:87
#, c-format
msgid ""
"public or private key '%s' does not exist in keystore, and no database was "
@@ -600,46 +486,46 @@ msgstr ""
"å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯éµã®ä¿åå ´æã«ã¯åå¨ããããã¼ã¿ãã¼ã¹ãæå®ããã¦ã"
"ã¾ããã"
-#: cmd_key_cert.cc:91
+#: cmd_key_cert.cc:93
msgid "change passphrase of a private RSA key"
msgstr "ç§å¯ RSA éµã®ãã¹ãã¬ã¼ãºãå¤æ´"
-#: cmd_key_cert.cc:101
+#: cmd_key_cert.cc:103
#, c-format
msgid "key '%s' does not exist in the keystore"
msgstr "éµ '%s' ã¯éµã®ä¿åå ´æã«ããã¾ãã"
-#: cmd_key_cert.cc:108
+#: cmd_key_cert.cc:110
#, fuzzy, c-format
msgid "passphrase changed"
msgstr "ãã¹ãã¬ã¼ãºãå¤æ´ãã¾ãã\n"
-#: cmd_key_cert.cc:111
+#: cmd_key_cert.cc:113
msgid "REVISION CERTNAME [CERTVAL]"
msgstr "REVISION CERTNAME [CERTVAL]"
-#: cmd_key_cert.cc:112
+#: cmd_key_cert.cc:114
msgid "create a cert for a revision"
msgstr "ãªãã¸ã§ã³ã®è¨¼æãä½æ"
-#: cmd_key_cert.cc:148
+#: cmd_key_cert.cc:150
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
-#: cmd_key_cert.cc:149
+#: cmd_key_cert.cc:151
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
msgstr "ç¾å¨ã®è¨å®ã§ä»®æ³è¨¼æãä¿¡é ¼å¯è½ããã¹ã"
-#: cmd_key_cert.cc:182
-#, fuzzy, c-format
+#: cmd_key_cert.cc:184
+#, c-format
msgid ""
"if a cert on: %s\n"
"with key: %s\n"
"and value: %s\n"
"was signed by: %s\n"
-"it would be: %s"
+"it would be: %s\n"
msgstr ""
"証æ : %s\n"
"éµ : %s\n"
@@ -647,67 +533,67 @@ msgstr ""
"ç½²åè
: %s\n"
"ãã£ã¦ãããã %s ã§ããã\n"
-#: cmd_key_cert.cc:191
+#: cmd_key_cert.cc:193
msgid "trusted"
msgstr "trusted"
-#: cmd_key_cert.cc:191
+#: cmd_key_cert.cc:193
msgid "UNtrusted"
msgstr "UNtrusted"
-#: cmd_key_cert.cc:195 cmd_key_cert.cc:208 cmd_key_cert.cc:221
-#: cmd_key_cert.cc:237 cmd_ws_commit.cc:189
+#: cmd_key_cert.cc:196 cmd_key_cert.cc:209 cmd_key_cert.cc:222
+#: cmd_key_cert.cc:238 cmd_ws_commit.cc:169
msgid "review"
msgstr "ã¬ãã¥ã¼"
-#: cmd_key_cert.cc:195
+#: cmd_key_cert.cc:196
msgid "REVISION TAGNAME"
msgstr "REVISION TAGNAME"
-#: cmd_key_cert.cc:196
+#: cmd_key_cert.cc:197
msgid "put a symbolic tag cert on a revision"
msgstr "è¨å·çãªã¿ã°è¨¼æããªãã¸ã§ã³ã«ä»å "
-#: cmd_key_cert.cc:208
+#: cmd_key_cert.cc:209
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr "ID (pass|fail|true|false|yes|no|1|0)"
-#: cmd_key_cert.cc:209
+#: cmd_key_cert.cc:210
msgid "note the results of running a test on a revision"
msgstr "ãªãã¸ã§ã³ã®ãã¹ãã®å®è¡çµæãè¨é²"
-#: cmd_key_cert.cc:221 cmd_ws_commit.cc:189
+#: cmd_key_cert.cc:222 cmd_ws_commit.cc:169
msgid "REVISION"
msgstr "REVISION"
-#: cmd_key_cert.cc:222
+#: cmd_key_cert.cc:223
msgid "approve of a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ãæ¿èª"
-#: cmd_key_cert.cc:233
+#: cmd_key_cert.cc:234
#, c-format
msgid "need --branch argument for approval"
msgstr "æ¿èªã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: cmd_key_cert.cc:237
+#: cmd_key_cert.cc:238
msgid "REVISION [COMMENT]"
msgstr "REVISION [COMMENT]"
-#: cmd_key_cert.cc:238
+#: cmd_key_cert.cc:239
msgid "comment on a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ã«ã³ã¡ã³ã"
-#: cmd_key_cert.cc:250
+#: cmd_key_cert.cc:249
#, c-format
msgid "edit comment failed"
msgstr "ã³ã¡ã³ãç·¨éã«å¤±æ"
-#: cmd_key_cert.cc:255
+#: cmd_key_cert.cc:252
#, c-format
msgid "empty comment"
msgstr "空ã®ã³ã¡ã³ã"
-#: cmd_list.cc:64 cmd_list.cc:675
+#: cmd_list.cc:64 cmd_list.cc:666
#, c-format
msgid "no public key '%s' found in database"
msgstr "ãã¼ã¿ãã¼ã¹å
ã«å
¬ééµ '%s' ã¯ããã¾ãã"
@@ -757,7 +643,7 @@ msgstr "ãã©ã³ã %s 㯠epoch ãæ
msgid "no epoch for branch %s"
msgstr "ãã©ã³ã %s 㯠epoch ãæã¡ã¾ãã\n"
-#: cmd_list.cc:458
+#: cmd_list.cc:449
#, fuzzy
msgid ""
"certs ID\n"
@@ -784,7 +670,7 @@ msgstr ""
"missing\n"
"changed"
-#: cmd_list.cc:469
+#: cmd_list.cc:460
#, fuzzy
msgid ""
"show database objects, or the current workspace manifest, \n"
@@ -794,13 +680,23 @@ msgstr ""
"ãã¼ã¿ãã¼ã¹ãªãã¸ã§ã¯ããç¾å¨ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãã\n"
"æ¢ç¥ã¾ãã¯ä¸æãªãæå³çã«ç¡è¦ãã¾ãã¯å¤±ãªãããç¶æ
ã®ãã¡ã¤ã«ã表示"
-#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:66
-#: cmd_ws_commit.cc:242 cmd_ws_commit.cc:276 cmd_ws_commit.cc:311
-#: cmd_ws_commit.cc:336 cmd_ws_commit.cc:561 cmd_ws_commit.cc:661
+#: cmd_list.cc:642
+#, fuzzy
+msgid "REV"
+msgstr "REVID"
+
+#: cmd_list.cc:652
+#, fuzzy, c-format
+msgid "No such revision %s"
+msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
+
+#: cmd_merging.cc:94 cmd_merging.cc:677 cmd_ws_commit.cc:53
+#: cmd_ws_commit.cc:222 cmd_ws_commit.cc:250 cmd_ws_commit.cc:284
+#: cmd_ws_commit.cc:309 cmd_ws_commit.cc:522 cmd_ws_commit.cc:620
msgid "workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹"
-#: cmd_merging.cc:74
+#: cmd_merging.cc:95
msgid ""
"update workspace.\n"
"This command modifies your workspace to be based off of a\n"
@@ -813,17 +709,17 @@ msgstr ""
"ã³ãããããã¦ããªãå¤æ´ã¯ãã®ã¾ã¾ã«ããã¾ãããªãã¸ã§ã³ãæå®ãã¦\n"
"ããã°ãã®ãªãã¸ã§ã³ã«ãæªæå®ãªãææ°ç (HEAD) ã«æ´æ°ãã¾ãã"
-#: cmd_merging.cc:95
+#: cmd_merging.cc:116
#, c-format
msgid "this workspace is a new project; cannot update"
msgstr "ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã¯æ°è¦ã®ããã¸ã§ã¯ãã§ã; æ´æ°ã§ãã¾ããã"
-#: cmd_merging.cc:102
+#: cmd_merging.cc:123
#, fuzzy, c-format
msgid "updating along branch '%s'"
msgstr "ãã©ã³ã '%s' ã«æ²¿ã£ã¦æ´æ°ãã¦ãã¾ã..."
-#: cmd_merging.cc:106
+#: cmd_merging.cc:127
#, fuzzy, c-format
msgid ""
"your request matches no descendents of the current revision\n"
@@ -834,37 +730,37 @@ msgstr ""
"ãããããã --revision=<ä»ã®ãã©ã³ãã®ãªãã¸ã§ã³> ã¨ãããã®ã§ã¯\n"
"ããã¾ããã?"
-#: cmd_merging.cc:112
+#: cmd_merging.cc:133
#, c-format
msgid "multiple update candidates:"
msgstr "è¤æ°ã®æ´æ°åè£:"
-#: cmd_merging.cc:116
+#: cmd_merging.cc:137
#, c-format
msgid "choose one with '%s update -r'"
msgstr "'%s update -r' ã¨ãã¦ä¸ã¤é¸æ"
-#: cmd_merging.cc:117
+#: cmd_merging.cc:138
#, c-format
msgid "multiple update candidates remain after selection"
msgstr "é¸æå¾ãè¤æ°ã®åè£ãæ®ã£ã¦ãã¾ã"
-#: cmd_merging.cc:136
+#: cmd_merging.cc:157
#, fuzzy, c-format
msgid "already up to date at %s"
msgstr "%s ã¯æ¢ã«ææ°ã§ã\n"
-#: cmd_merging.cc:144
+#: cmd_merging.cc:165
#, fuzzy, c-format
msgid "selected update target %s"
msgstr "é¸æãããæ´æ°ã¿ã¼ã²ãã %s\n"
-#: cmd_merging.cc:171
+#: cmd_merging.cc:192
#, fuzzy, c-format
msgid "target revision is not in current branch"
msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã«ã¯ç¥å
ãããã¾ãã"
-#: cmd_merging.cc:179
+#: cmd_merging.cc:200
#, fuzzy, c-format
msgid ""
"target revision is in multiple branches:%s\n"
@@ -876,213 +772,213 @@ msgstr ""
"\n"
"æ示çã« --branch ãæå®ãã¦å試è¡ãã¦ä¸ããã"
-#: cmd_merging.cc:187
+#: cmd_merging.cc:208
#, fuzzy, c-format
msgid "switching to branch %s"
msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ãããéå§\n"
-#: cmd_merging.cc:192
+#: cmd_merging.cc:213
#, c-format
msgid ""
"target revision not in any branch\n"
"next commit will use branch %s"
msgstr ""
-#: cmd_merging.cc:262
+#: cmd_merging.cc:284
#, c-format
msgid "switched branch; next commit will use branch %s"
msgstr ""
-#: cmd_merging.cc:263
+#: cmd_merging.cc:285
#, fuzzy, c-format
msgid "updated to base revision %s"
msgstr "åºæºãªãã¸ã§ã³ %s ã«æ´æ°\n"
-#: cmd_merging.cc:301
+#: cmd_merging.cc:323
#, fuzzy, c-format
msgid "[left] %s"
msgstr "[å
] %s\n"
-#: cmd_merging.cc:302
+#: cmd_merging.cc:324
#, fuzzy, c-format
msgid "[right] %s"
msgstr "[å
] %s\n"
-#: cmd_merging.cc:313 cmd_merging.cc:584
+#: cmd_merging.cc:335 cmd_merging.cc:606
#, fuzzy, c-format
msgid "[merged] %s"
msgstr "[çµ±åæ¸ã¿] %s\n"
-#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588
-#: cmd_merging.cc:821 cmd_ws_commit.cc:421 cmd_ws_commit.cc:907
-#: cmd_ws_commit.cc:930 cmd_ws_commit.cc:944
+#: cmd_merging.cc:342 cmd_merging.cc:441 cmd_merging.cc:452 cmd_merging.cc:610
+#: cmd_merging.cc:840 cmd_ws_commit.cc:392 cmd_ws_commit.cc:859
+#: cmd_ws_commit.cc:880
msgid "tree"
msgstr "ããªã¼"
-#: cmd_merging.cc:320
+#: cmd_merging.cc:342
msgid "merge unmerged heads of branch"
msgstr "çµ±åããã¦ããªããã©ã³ãã®è¤æ°ã®ææ°çãçµ±å"
-#: cmd_merging.cc:330 cmd_merging.cc:829
+#: cmd_merging.cc:352 cmd_merging.cc:848
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "--branch=BRANCH ã¨ããããã«ãã©ã³ããæå®ãã¦ä¸ãã"
-#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834
-#: cmd_ws_commit.cc:445
+#: cmd_merging.cc:357 cmd_merging.cc:491 cmd_merging.cc:494 cmd_merging.cc:853
+#: cmd_ws_commit.cc:437
#, c-format
msgid "branch '%s' is empty"
msgstr "ãã©ã³ã '%s' ã¯ç©ºã§ã"
-#: cmd_merging.cc:338
+#: cmd_merging.cc:360
#, fuzzy, c-format
msgid "branch '%s' is already merged"
msgstr "ãã©ã³ã '%s' ã¯æ¢ã«çµ±åæ¸ã¿ã§ã\n"
-#: cmd_merging.cc:342
+#: cmd_merging.cc:364
#, fuzzy, c-format
msgid "%d head on branch '%s'"
msgid_plural "%d heads on branch '%s'"
msgstr[0] "ãã©ã³ã '%s' ã«æ²¿ã£ã¦æ´æ°ãã¦ãã¾ã..."
-#: cmd_merging.cc:363 cmd_merging.cc:408
+#: cmd_merging.cc:385 cmd_merging.cc:430
#, fuzzy, c-format
msgid "merge %d / %d:"
msgstr "[çµ±åæ¸ã¿] %s\n"
-#: cmd_merging.cc:364
+#: cmd_merging.cc:386
#, c-format
msgid "calculating best pair of heads to merge next"
msgstr ""
-#: cmd_merging.cc:416
+#: cmd_merging.cc:438
#, fuzzy, c-format
msgid "note: your workspaces have not been updated"
msgstr "注æ: ã¯ã¼ã¯ã¹ãã¼ã¹ã¯æ´æ°ããã¦ãã¾ãã\n"
-#: cmd_merging.cc:419
+#: cmd_merging.cc:441
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr "SOURCE-BRANCH DEST-BRANCH"
-#: cmd_merging.cc:420
+#: cmd_merging.cc:442
msgid "merge from one branch to another asymmetrically"
msgstr "ä¸æ¹ã®ãã©ã³ããä»æ¹ã«éåæã«çµ±å"
-#: cmd_merging.cc:430
+#: cmd_merging.cc:452
msgid "SOURCE-BRANCH DEST-BRANCH DIR"
msgstr "SOURCE-BRANCH DEST-BRANCH DIR"
-#: cmd_merging.cc:431
+#: cmd_merging.cc:453
msgid "merge one branch into a subdirectory in another branch"
msgstr "ãã©ã³ããä»ã®ãã©ã³ãã®ãµããã£ã¬ã¯ããªã«çµ±å"
-#: cmd_merging.cc:470 cmd_merging.cc:473
+#: cmd_merging.cc:492 cmd_merging.cc:495
#, fuzzy, c-format
msgid "branch '%s' is not merged"
msgstr "ãã©ã³ã '%s' ã¯çµ±åããã¦ãã¾ãã\n"
-#: cmd_merging.cc:478
+#: cmd_merging.cc:500
#, fuzzy, c-format
msgid "propagating %s -> %s"
msgstr "ä¼æä¸ %s -> %s\n"
-#: cmd_merging.cc:479
+#: cmd_merging.cc:501
#, fuzzy, c-format
msgid "[source] %s"
msgstr "[å
] %s\n"
-#: cmd_merging.cc:480
+#: cmd_merging.cc:502
#, fuzzy, c-format
msgid "[target] %s"
msgstr "[å
] %s\n"
-#: cmd_merging.cc:485
+#: cmd_merging.cc:507
#, fuzzy, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'"
msgstr "ãã©ã³ã '%s' ã¯ãã©ã³ã '%s' ã«å¯¾ãã¦ææ°ã§ã\n"
-#: cmd_merging.cc:487
+#: cmd_merging.cc:509
#, fuzzy, c-format
msgid "no action taken"
msgstr "ä½ããã¾ãã\n"
-#: cmd_merging.cc:491
+#: cmd_merging.cc:513
#, fuzzy, c-format
msgid "no merge necessary; putting %s in branch '%s'"
msgstr "çµ±åã¯å¿
è¦ããã¾ãã. %s ããã©ã³ã '%s' å
ã«åãè¾¼ã¿ä¸\n"
-#: cmd_merging.cc:529
+#: cmd_merging.cc:551
#, c-format
msgid "Path %s not found in destination tree."
msgstr "ãã¹ %s ã¯å
ã®ããªã¼å
ã«ã¿ã¤ããã¾ãã"
-#: cmd_merging.cc:589
+#: cmd_merging.cc:611
msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
msgstr "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
-#: cmd_merging.cc:590
+#: cmd_merging.cc:612
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr "æ示çã«æå®ããäºã¤ã®ãªãã¸ã§ã³ãçµ±åãçµæã¯æå®ãã©ã³ãã¸ã"
-#: cmd_merging.cc:605
+#: cmd_merging.cc:627
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s 㨠%s ã¯åããªãã¸ã§ã³ã§ã. ä¸æ¢ãã¾ã"
-#: cmd_merging.cc:607 cmd_merging.cc:609
+#: cmd_merging.cc:629 cmd_merging.cc:631
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s ã¯æ¢ã« %s ã®ç¥å
ã¨ãªã£ã¦ãã¾ã"
-#: cmd_merging.cc:614
+#: cmd_merging.cc:636
msgid "REV REV"
msgstr "REV REV"
-#: cmd_merging.cc:615
+#: cmd_merging.cc:637
msgid ""
"Show what conflicts would need to be resolved to merge the given revisions."
msgstr "æå®ã®ãªãã¸ã§ã³ãçµ±åããã®ã«è§£æ±ºãå¿
è¦ãªè¡çªã表示"
-#: cmd_merging.cc:625 cmd_merging.cc:627
+#: cmd_merging.cc:647 cmd_merging.cc:649
#, fuzzy, c-format
msgid "%s is an ancestor of %s; no merge is needed."
msgstr "%s 㯠%s ã®ç¥å
; çµ±åã¯å¿
è¦ããã¾ãã"
-#: cmd_merging.cc:641
+#: cmd_merging.cc:663
#, c-format
msgid "There are %s node_name_conflicts."
msgstr "%s node_name_conflicts ãããã¾ã"
-#: cmd_merging.cc:643
+#: cmd_merging.cc:665
#, c-format
msgid "There are %s file_content_conflicts."
msgstr "%s file_content_conflicts ãããã¾ã"
-#: cmd_merging.cc:645
+#: cmd_merging.cc:667
#, c-format
msgid "There are %s node_attr_conflicts."
msgstr "%s node_attr_conflicts ãããã¾ã"
-#: cmd_merging.cc:647
+#: cmd_merging.cc:669
#, c-format
msgid "There are %s orphaned_node_conflicts."
msgstr "%s orphaned_node_conflicts ãããã¾ã"
-#: cmd_merging.cc:649
+#: cmd_merging.cc:671
#, c-format
msgid "There are %s rename_target_conflicts."
msgstr "%s rename_target_conflicts ãããã¾ã"
-#: cmd_merging.cc:651
+#: cmd_merging.cc:673
#, c-format
msgid "There are %s directory_loop_conflicts."
msgstr "%s directory_loop_conflicts ãããã¾ã"
-#: cmd_merging.cc:655
+#: cmd_merging.cc:677
msgid "[-r FROM] -r TO [PATH...]"
msgstr ""
-#: cmd_merging.cc:656
+#: cmd_merging.cc:678
msgid ""
"Apply changes made at arbitrary places in history to current workspace.\n"
"This command takes changes made at any point in history, and\n"
@@ -1098,7 +994,7 @@ msgstr ""
"first revision to the second."
msgstr ""
-#: cmd_merging.cc:681
+#: cmd_merging.cc:703
#, c-format
msgid ""
"revision %s is a merge\n"
@@ -1106,123 +1002,117 @@ msgstr ""
" %s pluck -r PARENT -r %s"
msgstr ""
-#: cmd_merging.cc:702
+#: cmd_merging.cc:724
#, fuzzy, c-format
msgid "no changes to apply"
msgstr "ã³ãããããå¤æ´ãããã¾ãã\n"
-#: cmd_merging.cc:759
+#: cmd_merging.cc:816
#, fuzzy, c-format
-msgid "no changes to be applied"
-msgstr "ã³ãããããå¤æ´ãããã¾ãã\n"
-
-#: cmd_merging.cc:786
-#, fuzzy, c-format
-msgid "no changes were applied"
-msgstr "ã³ãããããå¤æ´ãããã¾ãã\n"
-
-#: cmd_merging.cc:789
-#, fuzzy, c-format
msgid "applied changes to workspace"
msgstr "ãã¡ã¤ã«ãã¯ã¼ã¯ã¹ãã¼ã¹ã«è¿½å "
-#: cmd_merging.cc:821
+#: cmd_merging.cc:840
msgid "show unmerged head revisions of branch"
msgstr "ãã©ã³ãã®çµ±åããã¦ããªãææ°ãªãã¸ã§ã³ã表示"
-#: cmd_merging.cc:836
+#: cmd_merging.cc:855
#, fuzzy, c-format
msgid "branch '%s' is currently merged:"
msgstr "ãã©ã³ã '%s' ã¯ç¾å¨çµ±åæ¸ã¿ã§ã:\n"
-#: cmd_merging.cc:838
+#: cmd_merging.cc:857
#, fuzzy, c-format
msgid "branch '%s' is currently unmerged:"
msgstr "ãã©ã³ã '%s' ã¯ç¾å¨æªçµ±åã§ã:\n"
-#: cmd_merging.cc:846
+#: cmd_merging.cc:864
+msgid "REVID"
+msgstr "REVID"
+
+#: cmd_merging.cc:865
msgid "dump the roster associated with the given REVID"
msgstr "æå®ã® REVID ã«ã¤ãã¦é¢é£ã¥ããããåç°¿ããã³ã"
-#: cmd_netsync.cc:42
+#: cmd_netsync.cc:40
#, fuzzy, c-format
msgid "setting default server to %s"
msgstr "ããã©ã«ãã®ãµã¼ãã¼ã %s ã«è¨å®\n"
-#: cmd_netsync.cc:48
+#: cmd_netsync.cc:46
#, c-format
msgid "no hostname given"
msgstr "ãã¹ãåãæå®ãã¦ä¸ãã"
-#: cmd_netsync.cc:50
+#: cmd_netsync.cc:48
#, c-format
msgid "no server given and no default server set"
msgstr "ãµã¼ããæªæå®ã§ãããããã©ã«ãã®ãµã¼ãã¼ãè¨å®ããã¦ãã¾ãã"
-#: cmd_netsync.cc:78 cmd_netsync.cc:98
+#: cmd_netsync.cc:59 cmd_netsync.cc:79
#, c-format
msgid "no branch pattern given"
msgstr "ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: cmd_netsync.cc:86
+#: cmd_netsync.cc:67
#, fuzzy, c-format
msgid "setting default branch include pattern to '%s'"
msgstr "ãã©ã³ãåã«å«ããããã©ã«ããã¿ã¼ã³ã '%s' ã«è¨å®\n"
-#: cmd_netsync.cc:92
+#: cmd_netsync.cc:73
#, fuzzy, c-format
msgid "setting default branch exclude pattern to '%s'"
msgstr "ãã©ã³ãåã«å«ããªãããã©ã«ããã¿ã¼ã³ã '%s' ã«è¨å®\n"
-#: cmd_netsync.cc:100
+#: cmd_netsync.cc:81
#, c-format
msgid "no branch pattern given and no default pattern set"
msgstr "ãã©ã³ããã¿ã¼ã³ãæªæå®ããã¤ããã©ã«ããã¿ã¼ã³ãè¨å®ããã¦ãã¾ãã"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144 cmd_netsync.cc:188
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173
msgid "network"
msgstr "ãããã¯ã¼ã¯"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126
msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]"
-#: cmd_netsync.cc:117
+#: cmd_netsync.cc:98
msgid "push branches matching PATTERN to netsync server at ADDRESS"
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ã«ããã·ã¥"
-#: cmd_netsync.cc:130
+#: cmd_netsync.cc:113
msgid "pull branches matching PATTERN from netsync server at ADDRESS"
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ããåãè¾¼ã¿"
-#: cmd_netsync.cc:138
+#: cmd_netsync.cc:120
#, fuzzy, c-format
msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
msgstr "å¿åã§åãè¾¼ãã§ãã¾ã; èªè¨¼ãå¿
è¦ãªå ´å㯠-kKEYNAME ã使ã£ã¦ä¸ãã\n"
-#: cmd_netsync.cc:145
+#: cmd_netsync.cc:127
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ã¨åæ"
-#: cmd_netsync.cc:164
+#: cmd_netsync.cc:149
#, c-format
msgid "pid file '%s' already exists"
msgstr "PID ãã¡ã¤ã« '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: cmd_netsync.cc:166
+#: cmd_netsync.cc:151
#, fuzzy, c-format
msgid "failed to create pid file '%s'"
msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®è§£æã«å¤±æ"
-#: cmd_netsync.cc:188
+#: cmd_netsync.cc:173
msgid "PATTERN ..."
msgstr "PATTERN..."
-#: cmd_netsync.cc:189
+#: cmd_netsync.cc:174
msgid "serve the branches specified by PATTERNs to connecting clients"
msgstr "PATTERNs ã§æå®ãããã©ã³ããæ¥ç¶ã¯ã©ã¤ã¢ã³ãã«æä¾"
-#: cmd_netsync.cc:205
+#: cmd_netsync.cc:189
#, c-format
msgid ""
"need permission to store persistent passphrase (see hook persist_phrase_ok())"
@@ -1230,7 +1120,7 @@ msgstr ""
"ãã¹ãã¬ã¼ãºããã£ã¨ä¿åãã¦ããããã®ãªã権éãå¿
è¦ã§ãã (ãã㯠"
"persist_phrase_ok() ãåç
§)"
-#: cmd_netsync.cc:211
+#: cmd_netsync.cc:195
#, c-format
msgid ""
"The --no-transport-auth option is only permitted in combination with --stdio"
@@ -1311,72 +1201,71 @@ msgstr[1] "%d ãã±ããèªã¿è¾¼ã¿"
msgstr[0] "%d ãã±ããèªã¿è¾¼ã¿"
msgstr[1] "%d ãã±ããèªã¿è¾¼ã¿"
-#: cmd_ws_commit.cc:45
-#, fuzzy
+#: cmd_ws_commit.cc:42
msgid ""
"Enter a description of this change.\n"
-"Lines beginning with `MTN:' are removed automatically."
+"Lines beginning with `MTN:' are removed automatically.\n"
msgstr ""
"ãã®å¤æ´ã®èª¬æãå
¥åãã¦ä¸ãã\n"
"'MTN:' ã§å§ã¾ãè¡ã¯èªåçã«åé¤ããã¾ã\n"
-#: cmd_ws_commit.cc:62
+#: cmd_ws_commit.cc:50
#, c-format
msgid "edit of log message failed"
msgstr "ãã°ã¡ãã»ã¼ã¸ã®ç·¨éã«å¤±æãã¾ãã"
-#: cmd_ws_commit.cc:67
+#: cmd_ws_commit.cc:54
msgid "revert file(s), dir(s) or entire workspace (\".\")"
msgstr "ãã¡ã¤ã«ããã£ã¬ã¯ããªã¾ãã¯å®å
¨ãªã¯ã¼ã¯ã¹ãã¼ã¹ (\".\") ã®å¤æ´ãç ´æ£"
-#: cmd_ws_commit.cc:75
+#: cmd_ws_commit.cc:62
#, c-format
msgid "you must pass at least one path to 'revert' (perhaps '.')"
msgstr ""
-#: cmd_ws_commit.cc:95
+#: cmd_ws_commit.cc:81
#, fuzzy, c-format
msgid "no missing files to revert"
msgstr "ã¿ã¤ãããªããã¡ã¤ã«: %d\n"
-#: cmd_ws_commit.cc:150
+#: cmd_ws_commit.cc:135
#, c-format
msgid "reverting %s"
msgstr "%s ãæ»ãã¦ãã¾ã"
-#: cmd_ws_commit.cc:154
+#: cmd_ws_commit.cc:139
#, c-format
msgid "no file version %s found in database for %s"
msgstr "ãã¼ã¸ã§ã³ %s ã®ãã¡ã¤ã«ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ãã (対象: %s)"
-#: cmd_ws_commit.cc:167
+#: cmd_ws_commit.cc:152
#, c-format
msgid "recreating %s/"
msgstr "%s/ ãæ»ãã¦ãã¾ã"
-#: cmd_ws_commit.cc:190
+#: cmd_ws_commit.cc:170
msgid "disapprove of a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ãéæ¿èª"
-#: cmd_ws_commit.cc:203
-#, fuzzy, c-format
-msgid "revision %s has %d changesets, cannot invert"
+#: cmd_ws_commit.cc:183
+#, c-format
+msgid "revision '%s' has %d changesets, cannot invert\n"
msgstr "ãªãã¸ã§ã³ '%s' ã«ã¯ %d åã®å¤æ´ã»ããããããå転ã§ãã¾ãã\n"
-#: cmd_ws_commit.cc:207
+#: cmd_ws_commit.cc:187
#, c-format
msgid "need --branch argument for disapproval"
msgstr "éæ¿èªã¨ããã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: cmd_ws_commit.cc:243
+#: cmd_ws_commit.cc:223
msgid "add files to workspace"
msgstr "ãã¡ã¤ã«ãã¯ã¼ã¯ã¹ãã¼ã¹ã«è¿½å "
-#: cmd_ws_commit.cc:277
+#: cmd_ws_commit.cc:251
msgid "drop files from workspace"
msgstr "ãã¡ã¤ã«ãã¯ã¼ã¯ã¹ãã¼ã¹ããåé¤"
-#: cmd_ws_commit.cc:312
+#: cmd_ws_commit.cc:285
msgid ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
@@ -1384,15 +1273,15 @@ msgstr ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
-#: cmd_ws_commit.cc:314
+#: cmd_ws_commit.cc:287
msgid "rename entries in the workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã®ã¨ã³ããªã®å称ãå¤æ´"
-#: cmd_ws_commit.cc:336
+#: cmd_ws_commit.cc:309
msgid "NEW_ROOT PUT_OLD"
msgstr "NEW_ROOT PUT_OLD"
-#: cmd_ws_commit.cc:337
+#: cmd_ws_commit.cc:310
msgid ""
"rename the root directory\n"
"after this command, the directory that currently has the name NEW_ROOT\n"
@@ -1405,53 +1294,16 @@ msgstr ""
"ãã£ã¬ã¯ããªã¨ãPUT_OLD ã¨ããååã®ç¾å¨ã®ã«ã¼ããã£ã¬ã¯ããªãæå®ãã¾ãã\n"
"--execute ã®ä½¿ç¨ãå¼·ãæ¨å¥¨ãã¾ãã"
-#: cmd_ws_commit.cc:355
+#: cmd_ws_commit.cc:329
msgid "show status of workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ç¶æ
ã表示"
-#: cmd_ws_commit.cc:384
-#, fuzzy, c-format
-msgid "Current branch: %s"
-msgstr "ãã©ã³ã '%s' ã«æ²¿ã£ã¦æ´æ°ãã¦ãã¾ã..."
+#: cmd_ws_commit.cc:392
+msgid "[DIRECTORY]\n"
+msgstr "[DIRECTORY]\n"
-#: cmd_ws_commit.cc:390
-#, c-format
-msgid "Changes against parent %s"
-msgstr ""
-
-#: cmd_ws_commit.cc:395
-#, fuzzy, c-format
-msgid " no changes"
-msgstr "å¤æ´ãªã"
-
-#: cmd_ws_commit.cc:399
-#, fuzzy, c-format
-msgid " dropped %s"
-msgstr "%s ãç ´æ£ãã¦ãã¾ã"
-
-#: cmd_ws_commit.cc:404
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:393
msgid ""
-" renamed %s\n"
-" to %s"
-msgstr "%s ãã %s ã«å称å¤æ´ãã¦ãã¾ã"
-
-#: cmd_ws_commit.cc:409 cmd_ws_commit.cc:413
-#, c-format
-msgid " added %s"
-msgstr ""
-
-#: cmd_ws_commit.cc:417
-#, c-format
-msgid " patched %s"
-msgstr ""
-
-#: cmd_ws_commit.cc:421 cmd_ws_commit.cc:907 cmd_ws_commit.cc:930
-msgid "[DIRECTORY]"
-msgstr "[DIRECTORY]"
-
-#: cmd_ws_commit.cc:422
-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"
"Otherwise, it will be the head of the branch (given or implicit).\n"
@@ -1463,47 +1315,42 @@ msgstr ""
"åãåºãã¾ãããã£ã¬ã¯ããªãæªæå®ãªããã£ã¬ã¯ããªåã¨ãã¦\n"
"ãã©ã³ãåã使ãã¾ã"
-#: cmd_ws_commit.cc:440
+#: cmd_ws_commit.cc:413 cmd_ws_commit.cc:432
#, c-format
-msgid "use --revision or --branch to specify what to checkout"
-msgstr ""
+msgid "need --branch argument for branch-based checkout"
+msgstr "ãã©ã³ããåºæºã«ãããã§ãã¯ã¢ã¦ãã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: cmd_ws_commit.cc:448
+#: cmd_ws_commit.cc:426
#, c-format
+msgid "checkout directory '%s' already exists"
+msgstr "åãåºããã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
+
+#: cmd_ws_commit.cc:440
+#, c-format
msgid "branch %s has multiple heads:"
msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãåå¨ãã¦ãã¾ã:"
-#: cmd_ws_commit.cc:451
+#: cmd_ws_commit.cc:443
#, c-format
msgid "choose one with '%s checkout -r'"
msgstr "'%s update -r' ã§ä¸ã¤ãé¸æãã¦ä¸ãã"
-#: cmd_ws_commit.cc:452
+#: cmd_ws_commit.cc:444
#, c-format
msgid "branch %s has multiple heads"
msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãåå¨ãã¦ãã¾ã"
-#: cmd_ws_commit.cc:479
+#: cmd_ws_commit.cc:471
#, fuzzy, c-format
msgid "revision %s is not a member of branch %s"
msgstr "ãªãã¸ã§ã³ %s ã¯ãã©ã³ã %s ã«ã¯å±ãã¦ãã¾ãã\n"
-#: cmd_ws_commit.cc:496
+#: cmd_ws_commit.cc:504
#, c-format
-msgid "you must specify a destination directory"
-msgstr ""
-
-#: cmd_ws_commit.cc:509
-#, c-format
-msgid "checkout directory '%s' already exists"
-msgstr "åãåºããã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-
-#: cmd_ws_commit.cc:543
-#, c-format
msgid "no file %s found in database for %s"
msgstr "ãã¡ã¤ã« %s (対象 %s)ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¯ã¿ã¤ããã¾ãã"
-#: cmd_ws_commit.cc:561
+#: cmd_ws_commit.cc:522
msgid ""
"set PATH ATTR VALUE\n"
"get PATH [ATTR]\n"
@@ -1513,45 +1360,45 @@ msgstr ""
"get PATH [ATTR]\n"
"drop PATH [ATTR]"
-#: cmd_ws_commit.cc:562
+#: cmd_ws_commit.cc:523
msgid "set, get or drop file attributes"
msgstr "ãã¡ã¤ã«å±æ§ãè¨å®/åå¾/åé¤"
-#: cmd_ws_commit.cc:579
+#: cmd_ws_commit.cc:540
#, c-format
msgid "Unknown path '%s'"
msgstr "ä¸æãªãã¹ '%s'"
-#: cmd_ws_commit.cc:608
-#, fuzzy, c-format
-msgid "Path '%s' does not have attribute '%s'"
+#: cmd_ws_commit.cc:569
+#, c-format
+msgid "Path '%s' does not have attribute '%s'\n"
msgstr "ãã¹ '%s' ã«ã¯å±æ§ '%s' ãããã¾ãã\n"
-#: cmd_ws_commit.cc:638
+#: cmd_ws_commit.cc:597
#, c-format
msgid "No attributes for '%s'"
msgstr "'%s' ã«ã¤ãã¦å±æ§ã¯ããã¾ãã"
-#: cmd_ws_commit.cc:649
+#: cmd_ws_commit.cc:608
#, c-format
msgid "No attribute '%s' on path '%s'"
msgstr "ãã¹ '%s' ã«ã¤ã㦠'%s' ã¨ããå±æ§ã¯ããã¾ãã"
-#: cmd_ws_commit.cc:662
+#: cmd_ws_commit.cc:621
msgid "commit workspace to database"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ããã¼ã¿ãã¼ã¹ã«ã³ããã"
-#: cmd_ws_commit.cc:693
+#: cmd_ws_commit.cc:656
#, fuzzy, c-format
msgid "no changes to commit"
msgstr "ã³ãããããå¤æ´ãããã¾ãã\n"
-#: cmd_ws_commit.cc:713
+#: cmd_ws_commit.cc:670
#, fuzzy, c-format
msgid "beginning commit on branch '%s'"
msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ãããéå§\n"
-#: cmd_ws_commit.cc:722
+#: cmd_ws_commit.cc:679
#, c-format
msgid ""
"_MTN/log is non-empty and log message was specified on command line\n"
@@ -1562,37 +1409,37 @@ msgstr ""
"_MTN/log ã移å/åé¤ããããã³ãã³ãè¡ãã --message/--message-file ã\n"
"æ¶ãã¦ä¸ããã"
-#: cmd_ws_commit.cc:737
+#: cmd_ws_commit.cc:694
#, c-format
msgid "empty log message; commit canceled"
msgstr "空ã®ãã°ã¡ãã»ã¼ã¸; ã³ãããã¯åãæ¶ããã¾ãã"
-#: cmd_ws_commit.cc:759
+#: cmd_ws_commit.cc:715
#, fuzzy, c-format
-msgid "log message rejected by hook: %s"
+msgid "log message rejected: %s"
msgstr "ãã°ã¡ãã»ã¼ã¸ãæå¦: %s\n"
-#: cmd_ws_commit.cc:767
+#: cmd_ws_commit.cc:723
#, fuzzy, c-format
msgid "revision %s already in database"
msgstr "ãªãã¸ã§ã³ %s ã¯æ¢ã«ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¦ãã¾ã\n"
-#: cmd_ws_commit.cc:806 cmd_ws_commit.cc:836
+#: cmd_ws_commit.cc:762 cmd_ws_commit.cc:792
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "ãã¡ã¤ã« '%s' 㯠commit åã«å¤æ´ããã¾ãã. ä¸æ¢ãã¾ã"
-#: cmd_ws_commit.cc:818
+#: cmd_ws_commit.cc:774
#, fuzzy, c-format
-msgid "Your database is missing version %s of file '%s'"
+msgid "Your database is missing version %1% of file '%2%'"
msgstr "ãã¡ã¤ã« %s å
ã®ãã¼ã¿ãã¼ã¹ãã¼ã¸ã§ã³ãæ¤åºã§ãã¾ããã§ãã"
-#: cmd_ws_commit.cc:868
+#: cmd_ws_commit.cc:820
#, fuzzy, c-format
msgid "committed revision %s"
msgstr "ãªãã¸ã§ã³ %s ãã³ããã\n"
-#: cmd_ws_commit.cc:874
+#: cmd_ws_commit.cc:826
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1601,72 +1448,70 @@ msgstr ""
"注æ: ãã®ãªãã¸ã§ã³ã«ãã£ã¦åå²ãçãã¾ã\n"
"注æ: åå²ãæã¾ãªããªã '%s merge' ãå®è¡ãã¦ä¸ãã"
-#: cmd_ws_commit.cc:908
+#: cmd_ws_commit.cc:859
+msgid "[DIRECTORY]"
+msgstr "[DIRECTORY]"
+
+#: cmd_ws_commit.cc:860
msgid "setup a new workspace directory, default to current"
msgstr "æ°ããã¯ã¼ã¯ã¹ãã¼ã¹ãã£ã¬ã¯ããªãä½æ (ããã©ã«ã: ç¾å¨ã®å ´æ)"
-#: cmd_ws_commit.cc:914
+#: cmd_ws_commit.cc:866
#, c-format
msgid "need --branch argument for setup"
msgstr "ä½æã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: cmd_ws_commit.cc:931
-msgid ""
-"migrate a workspace directory's metadata to the latest format; defaults to "
-"the current workspace"
-msgstr ""
-
-#: cmd_ws_commit.cc:944
+#: cmd_ws_commit.cc:881
msgid "refresh the inodeprint cache"
msgstr "i-node 表示ãã£ãã·ã¥ãæ´æ°"
-#: commands.cc:131 commands.cc:233
+#: commands.cc:125 commands.cc:227
#, fuzzy, c-format
msgid "unknown command '%s'"
msgstr "ä¸æãªã³ãã³ã '%s'\n"
-#: commands.cc:142
-#, fuzzy, c-format
-msgid "command '%s' has multiple ambiguous expansions:"
+#: commands.cc:136
+#, c-format
+msgid "command '%s' has multiple ambiguous expansions:\n"
msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããã³ãã³ãåè£ã¯è¤æ°ããã¾ã:\n"
-#: commands.cc:175
+#: commands.cc:169
msgid "commands:"
msgstr "ã³ãã³ã:"
-#: commands.cc:252
+#: commands.cc:248
msgid "command [ARGS...]"
msgstr "command [ARGS...]"
-#: commands.cc:252
+#: commands.cc:248
msgid "display command help"
msgstr "ã³ãã³ããã«ãã表示"
-#: commands.cc:395
+#: commands.cc:400
#, fuzzy, c-format
msgid "expanding selection '%s'"
msgstr "ã»ã¬ã¯ã·ã§ã³ '%s' ãå±é\n"
-#: commands.cc:403
+#: commands.cc:408
#, c-format
msgid "no match for selection '%s'"
msgstr "ã»ã¬ã¯ã·ã§ã³ '%s' ã«ä¸è´ãããã®ãããã¾ãã"
-#: commands.cc:409
+#: commands.cc:414
#, fuzzy, c-format
msgid "expanded to '%s'"
msgstr "'%s' ã«å±é\n"
-#: commands.cc:426
-#, fuzzy, c-format
-msgid "selection '%s' has multiple ambiguous expansions:"
+#: commands.cc:431
+#, c-format
+msgid "selection '%s' has multiple ambiguous expansions: \n"
msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããã»ã¬ã¯ã·ã§ã³ã®åè£ã¯è¤æ°ããã¾ã: \n"
-#: commands.cc:443
+#: commands.cc:448
msgid "note: "
msgstr "ãã¼ã: "
-#: commands.cc:444
+#: commands.cc:449
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
@@ -1675,71 +1520,81 @@ msgstr ""
"ãã©ã³ã '%s' ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãããã¾ã\n"
"â%s merge' ãå®è¡ããæ¹ãããã§ããã"
-#: commands.cc:458
+#: commands.cc:467
#, c-format
msgid "--message and --message-file are mutually exclusive"
msgstr "--message 㨠--message-file ãåæã«æå®ãããã¨ã¯ã§ãã¾ãã"
-#: database_check.cc:129
+#: database_check.cc:133
#, c-format
msgid "file structure is corrupted; cannot check further"
msgstr ""
-#: database_check.cc:140
+#: database_check.cc:144
msgid "files"
msgstr "ãã¡ã¤ã«"
-#: database_check.cc:169
+#: database_check.cc:173
msgid "rosters"
msgstr "åç°¿"
-#: database_check.cc:227
+#: database_check.cc:240
msgid "markings"
msgstr "å°"
-#: database_check.cc:298 netsync.cc:2967 rcs_import.cc:1244
+#: database_check.cc:338 netsync.cc:2967 rcs_import.cc:1244
msgid "revisions"
msgstr "ãªãã¸ã§ã³"
-#: database_check.cc:393
+#: database_check.cc:437
msgid "ancestry"
msgstr "ç¥å
"
-#: database_check.cc:426 netsync.cc:2971
+#: database_check.cc:470 netsync.cc:2971
msgid "keys"
msgstr "éµ"
-#: database_check.cc:452
+#: database_check.cc:496
msgid "certs"
msgstr "証æ"
-#: database_check.cc:489
+#: database_check.cc:533
#, fuzzy, c-format
msgid "file %s missing (%d manifest references)"
msgstr "ãã¡ã¤ã« %s ãããã¾ãã (ãããã§ã¹ãåç
§: %d)\n"
-#: database_check.cc:496
+#: database_check.cc:540
#, fuzzy, c-format
msgid "file %s unreferenced"
msgstr "ãã¡ã¤ã« %s ã¯åç
§ããã¦ãã¾ãã\n"
-#: database_check.cc:515
+#: database_check.cc:561
#, fuzzy, c-format
msgid "roster %s unreferenced"
msgstr "åç°¿ %s ã¯åç
§ããã¦ãã¾ãã\n"
-#: database_check.cc:521
+#: database_check.cc:567
#, fuzzy, c-format
msgid "roster %s incomplete (%d missing files)"
msgstr "åç°¿ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããã¡ã¤ã«: %d)\n"
-#: database_check.cc:528
+#: database_check.cc:574
#, fuzzy, c-format
msgid "roster %s incomplete (%d missing revisions)"
msgstr "åç°¿ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããªãã¸ã§ã³: %d)\n"
-#: database_check.cc:553
+#: database_check.cc:581
#, fuzzy, c-format
+msgid "roster %s is not parseable (perhaps with unnormalized paths?)"
+msgstr "åç°¿ %s ã解æã§ãã¾ãã (ãã¹ãæ£è¦åããã¦ããªãã®ã§ã¯?)\n"
+
+#: database_check.cc:588
+#, fuzzy, c-format
+msgid "roster %s is not in normalized form"
+msgstr "åç°¿ %s ã¯æ£è¦åãããå½¢å¼ã«ãªã£ã¦ãã¾ãã\n"
+
+#: database_check.cc:613
+#, fuzzy, c-format
msgid ""
"revision %s missing (%d revision references; %d cert references; %d parent "
"references; %d child references; %d roster references)"
@@ -1747,194 +1602,214 @@ msgstr ""
"ãªãã¸ã§ã³ %s ãããã¾ãã (ãªãã¸ã§ã³åç
§: %d, 証æåç
§: %d, 親åç
§: %d, å"
"åç
§: %d, åç°¿åç
§: %d)\n"
-#: database_check.cc:561
+#: database_check.cc:621
#, fuzzy, c-format
msgid "revision %s incomplete (%d missing manifests)"
msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããããã§ã¹ã: %d)\n"
-#: database_check.cc:568
+#: database_check.cc:628
#, fuzzy, c-format
msgid "revision %s incomplete (%d missing revisions)"
msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããªãã¸ã§ã³: %d)\n"
-#: database_check.cc:575
+#: database_check.cc:635
#, fuzzy, c-format
+msgid "revision %s incomplete (missing roster link)"
+msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ã®ãªã³ã¯ãããã¾ãã)\n"
+
+#: database_check.cc:641
+#, fuzzy, c-format
msgid "revision %s incomplete (missing roster)"
msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ãããã¾ãã)\n"
-#: database_check.cc:581
+#: database_check.cc:647
#, fuzzy, c-format
msgid "revision %s mismatched roster and manifest"
msgstr "ãªãã¸ã§ã³ %s ã®åç°¿ã¨ãããã§ã¹ããä¸è´ãã¦ãã¾ãã\n"
-#: database_check.cc:587
+#: database_check.cc:653
#, fuzzy, c-format
msgid "revision %s incomplete (incomplete roster)"
msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ãä¸å®å
¨)\n"
-#: database_check.cc:593
+#: database_check.cc:659
#, fuzzy, c-format
msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)"
msgstr "ãªãã¸ã§ã³ %s ã¯è¦ªã¨ä¸ä¸è´ã§ã (親: %d; ãªãã¸ã§ã³åç
§: %d)\n"
-#: database_check.cc:602
+#: database_check.cc:668
#, fuzzy, c-format
msgid "revision %s mismatched children (%d ancestry children; %d parents)"
msgstr "ãªãã¸ã§ã³ %s ã¯åã¨ä¸ä¸è´ã§ã (å: %d; 親: %d)\n"
-#: database_check.cc:614
+#: database_check.cc:680
#, fuzzy, c-format
msgid "revision %s has bad history (%s)"
msgstr "ãªãã¸ã§ã³ %s ã¯ä¸æ£ãªå±¥æ´ (%s) ãæã£ã¦ãã¾ã\n"
-#: database_check.cc:621
+#: database_check.cc:687
#, fuzzy, c-format
msgid "revision %s is not parseable (perhaps with unnormalized paths?)"
msgstr "ãªãã¸ã§ã³ %s ã解æã§ãã¾ãã (ãã¹ãæ£è¦åããã¦ããªãã®ã§ã¯?)\n"
-#: database_check.cc:628
+#: database_check.cc:694
#, fuzzy, c-format
msgid "revision %s is not in normalized form"
msgstr "ãªãã¸ã§ã³ %s ã¯æ£è¦åãããå½¢å¼ã§ã¯ããã¾ãã\n"
-#: database_check.cc:652
+#: database_check.cc:718
#, fuzzy, c-format
msgid "key %s missing (signed %d certs)"
msgstr "éµ %s ãããã¾ãã (%d åã®è¨¼æãç½²å)\n"
-#: database_check.cc:685
+#: database_check.cc:751
#, fuzzy, c-format
msgid "revision %s unchecked signature in %s cert from missing key %s"
msgstr ""
"ãªãã¸ã§ã³ %s ã® %s 証æ(失ãããéµ %s) ã®ç½²åã¯æ¤è¨¼ããããã®ã§ã¯ããã¾ã"
"ã\n"
-#: database_check.cc:693
+#: database_check.cc:759
#, fuzzy, c-format
msgid "revision %s bad signature in %s cert from key %s"
msgstr "ãªãã¸ã§ã³ %s ã® %s 証æ (éµ %s) ã®ä¸æ£ãªç½²åãç¡è¦ãã¾ã\n"
-#: database_check.cc:708
+#: database_check.cc:774
#, fuzzy, c-format
-msgid "revision %s missing %s cert"
+msgid "revision %1% missing %2% cert"
msgstr "ãªãã¸ã§ã³ %s 㯠%s 証æãæ¬ ãã¦ãã¾ã\n"
-#: database_check.cc:717
+#: database_check.cc:783
#, fuzzy, c-format
msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)"
msgstr "ãªãã¸ã§ã³ %s ã¯è¨¼æã«åè´ãã¾ãã (%d ä½è
%d æ¥æ %d å¤æ´ãã°)\n"
-#: database_check.cc:797
+#: database_check.cc:870
#, fuzzy, c-format
msgid "%d missing files"
msgstr "ã¿ã¤ãããªããã¡ã¤ã«: %d\n"
-#: database_check.cc:799
+#: database_check.cc:872
#, fuzzy, c-format
msgid "%d unreferenced files"
msgstr "åç
§ããã¦ããªããã¡ã¤ã«: %d\n"
-#: database_check.cc:802
+#: database_check.cc:875
#, fuzzy, c-format
msgid "%d unreferenced rosters"
msgstr "åç
§ããã¦ããªãåç°¿: %d\n"
-#: database_check.cc:804
+#: database_check.cc:877
#, fuzzy, c-format
msgid "%d incomplete rosters"
msgstr "ä¸å®å
¨ãªåç°¿: %d\n"
-#: database_check.cc:807
+#: database_check.cc:879
#, fuzzy, c-format
+msgid "%d rosters not parseable (perhaps with invalid paths)"
+msgstr "解æã§ããªãåç°¿ (ãã¹ãä¸é©åãªã®ã§ã¯?): %d\n"
+
+#: database_check.cc:882
+#, fuzzy, c-format
+msgid "%d rosters not in normalized form"
+msgstr "æ£è¦åãããå½¢å¼ã«ãªã£ã¦ããªãåç°¿: %d\n"
+
+#: database_check.cc:885
+#, fuzzy, c-format
msgid "%d missing revisions"
msgstr "ã¿ã¤ãããªããªãã¸ã§ã³: %d\n"
-#: database_check.cc:809
+#: database_check.cc:887
#, fuzzy, c-format
msgid "%d incomplete revisions"
msgstr "ä¸å®å
¨ãªãªãã¸ã§ã³: %d\n"
-#: database_check.cc:811
+#: database_check.cc:889
#, fuzzy, c-format
msgid "%d mismatched parents"
msgstr "ä¸è´ããªã親: %d\n"
-#: database_check.cc:813
+#: database_check.cc:891
#, fuzzy, c-format
msgid "%d mismatched children"
msgstr "ä¸è´ããªãå: %d\n"
-#: database_check.cc:815
+#: database_check.cc:893
#, fuzzy, c-format
msgid "%d revisions with bad history"
msgstr "ä¸æ£ãªå±¥æ´ãæã¤ãªãã¸ã§ã³: %d\n"
-#: database_check.cc:817
+#: database_check.cc:895
#, fuzzy, c-format
msgid "%d revisions not parseable (perhaps with invalid paths)"
msgstr "解æã§ããªããªãã¸ã§ã³ (ãã¹ãä¸é©åãªã®ã§ã¯?): %d\n"
-#: database_check.cc:820
+#: database_check.cc:898
#, fuzzy, c-format
msgid "%d revisions not in normalized form"
msgstr "æ£è¦åãããå½¢å¼ã«ãªã£ã¦ããªããªãã¸ã§ã³: %d\n"
-#: database_check.cc:824
+#: database_check.cc:902
#, fuzzy, c-format
+msgid "%d unreferenced roster links"
+msgstr "åç
§ããã¦ããªãåç°¿ãªã³ã¯: %d\n"
+
+#: database_check.cc:905
+#, fuzzy, c-format
msgid "%d missing rosters"
msgstr "ã¿ã¤ãããªãåç°¿: %d\n"
-#: database_check.cc:828
+#: database_check.cc:909
#, fuzzy, c-format
msgid "%d missing keys"
msgstr "ã¿ã¤ãããªãéµ: %d\n"
-#: database_check.cc:831
+#: database_check.cc:912
#, fuzzy, c-format
msgid "%d missing certs"
msgstr "ã¿ã¤ãããªã証æ: %d\n"
-#: database_check.cc:833
+#: database_check.cc:914
#, fuzzy, c-format
msgid "%d mismatched certs"
msgstr "ä¸è´ããªã証æ: %d\n"
-#: database_check.cc:835
+#: database_check.cc:916
#, fuzzy, c-format
msgid "%d unchecked signatures due to missing keys"
msgstr "éµãã¿ã¤ãããªãããã«æ¤è¨¼ããã¦ããªãç½²å: %d\n"
-#: database_check.cc:837
+#: database_check.cc:918
#, fuzzy, c-format
msgid "%d bad signatures"
msgstr "ä¸æ£ãªç½²å: %d\n"
-#: database_check.cc:861
+#: database_check.cc:944
#, fuzzy, c-format
msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs"
msgstr "æ¤è¨¼å®äº: ãã¡ã¤ã«: %d, åç°¿: %d, ãªãã¸ã§ã³: %d, éµ: %d, 証æ: %d\n"
-#: database_check.cc:867
+#: database_check.cc:950
#, fuzzy, c-format
msgid "total problems detected: %d (%d serious)"
msgstr "æ¤åºããé害ç·è¨: %d (æ·±å»: %d)\n"
-#: database_check.cc:869
+#: database_check.cc:952
#, c-format
msgid "serious problems detected"
msgstr "æ·±å»ãªåé¡ãæ¤åºãã¾ãã"
-#: database_check.cc:871
+#: database_check.cc:954
#, fuzzy, c-format
msgid "minor problems detected"
msgstr "軽微ãªåé¡ãæ¤åºãã¾ãã\n"
-#: database_check.cc:873
+#: database_check.cc:956
#, fuzzy, c-format
msgid "database is good"
msgstr "ãã¼ã¿ãã¼ã¹ã¯æ£å¸¸ã§ã\n"
-#: database.cc:158
+#: database.cc:156
#, c-format
msgid ""
"layout of database %s doesn't match this version of monotone\n"
@@ -1947,15 +1822,15 @@ msgstr ""
"'%s db migrate' ã¨ãã¦æ´æ°ãã¦ã¿ã¦ä¸ãã\n"
"(ããã¯ä¸å¯éã§ãã®ã§ãã¾ãããã¯ã¢ãããã¨ã£ãæ¹ãããã§ããã)"
-#: database.cc:172
+#: database.cc:170
#, c-format
msgid "this database already contains rosters"
msgstr "ãã®ãã¼ã¿ãã¼ã¹ã«ã¯æ¢ã«åç°¿ãå«ã¾ãã¦ãã¾ã"
-#: database.cc:196
-#, fuzzy, c-format
+#: database.cc:190
+#, c-format
msgid ""
-"database %s contains old-style revisions\n"
+"database %s contains revisions but no rosters\n"
"if you are a project leader or doing local testing:\n"
" see the file UPGRADE for instructions on upgrading.\n"
"if you are not a project leader:\n"
@@ -1970,7 +1845,7 @@ msgstr ""
"çµ±åããæ°ãããã¼ã¿ãã¼ã¹ã«åãè¾¼ãã®ãå¾
ã£ã¦ä¸ããã\n"
"ä¸ä¾¿ã§ãã¿ã¾ããã"
-#: database.cc:206
+#: database.cc:209
#, c-format
msgid ""
"database %s contains manifests but no revisions\n"
@@ -1981,27 +1856,19 @@ msgstr ""
"ãã®ãã¼ã¿ãã¼ã¹ã¯å¤ãããã®ã§ã¢ããã°ã¬ã¼ãããå¿
è¦ãããã¾ã\n"
"詳細ã«ã¤ãã¦ã¯ README.changesets ãåç
§ãã¦ä¸ãã"
-#: database.cc:217
+#: database.cc:245
#, c-format
-msgid ""
-"database %s contains revisions but no rosters\n"
-"probably this is because an upgrade cleared the roster cache\n"
-"run '%s db regenerate_rosters' to restore use of this database"
-msgstr ""
-
-#: database.cc:256
-#, c-format
msgid "unable to probe database version in file %s"
msgstr "ãã¡ã¤ã« %s å
ã®ãã¼ã¿ãã¼ã¹ãã¼ã¸ã§ã³ãæ¤åºã§ãã¾ããã§ãã"
-#: database.cc:263
+#: database.cc:252
#, c-format
msgid "database %s is not an sqlite version 3 file, try dump and reload"
msgstr ""
"ãã¼ã¿ãã¼ã¹ %s 㯠SQLite ver. 3 ã®ãã¡ã¤ã«ã§ã¯ããã¾ããããã³ãããå¾å度èª"
"ã¿è¾¼ãã§ã¿ã¦ä¸ãã"
-#: database.cc:292 schema_migration.cc:201
+#: database.cc:281 schema_migration.cc:200
msgid ""
"make sure database and containing directory are writeable\n"
"and you have not run out of disk space"
@@ -2009,7 +1876,7 @@ msgstr ""
"ãã¼ã¿ãã¼ã¹ã¨ãããå«ããã£ã¬ã¯ããªãæ¸ãè¾¼ã¿å¯è½ã§ãããã\n"
"ããã¦ãã£ã¹ã¯å®¹éãä¸è¶³ãã¦ããªãã確èªãã¦ä¸ãã"
-#: database.cc:298 schema_migration.cc:206
+#: database.cc:287 schema_migration.cc:205
#, c-format
msgid ""
"sqlite error: %s\n"
@@ -2018,12 +1885,12 @@ msgstr ""
"sqlite ã¨ã©ã¼: %s\n"
"%s"
-#: database.cc:343
+#: database.cc:332
#, c-format
msgid "could not initialize database: %s: already exists"
msgstr "ãã¼ã¿ãã¼ã¹ãåæåã§ãã¾ããã§ãã: %s: æ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:348
+#: database.cc:337
#, c-format
msgid ""
"existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -2034,12 +1901,12 @@ msgstr ""
"ãå¹¹ãæã£ã¦ãã¾ã\n"
"ãã¼ã¿ãã¼ã¹ä½æãä¸æ¢ãã¾ã"
-#: database.cc:498
+#: database.cc:487
#, c-format
msgid "cannot create %s; it already exists"
msgstr "%s ãä½æã§ãã¾ãã; æ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:575
+#: database.cc:564
#, fuzzy, c-format
msgid ""
"schema version : %s\n"
@@ -2063,7 +1930,7 @@ msgid ""
" total : %u\n"
"database:\n"
" page size : %u\n"
-" cache size : %u"
+" cache size : %u\n"
msgstr ""
"ã¹ãã¼ããã¼ã¸ã§ã³ : %s\n"
"åæ°:\n"
@@ -2087,80 +1954,80 @@ msgstr ""
" ãã¼ã¸ãµã¤ãº : %u\n"
" ãã£ãã·ã¥ãµã¤ãº : %u\n"
-#: database.cc:638
+#: database.cc:626
#, c-format
msgid "database schema version: %s"
msgstr "åºæºã¹ãã¼ããã¼ã¸ã§ã³: %s"
-#: database.cc:715
-#, fuzzy, c-format
-msgid "multiple statements in query: %s"
+#: database.cc:703
+#, c-format
+msgid "multiple statements in query: %s\n"
msgstr "ã¯ã¨ãªä¸ã«è¤æ°ã®ã¹ãã¼ãã¡ã³ã: %s\n"
-#: database.cc:721
+#: database.cc:709
#, fuzzy, c-format
msgid "wanted %d columns got %d in query: %s"
msgstr "ã¯ã¨ãªã§ %d åè¦æ±ãã¾ãããå¾ãã®ã¯ %d åã§ã: %s\n"
-#: database.cc:787
+#: database.cc:768
#, fuzzy, c-format
msgid "null result in query: %s"
msgstr "ã¯ã¨ãªä¸ã«çµæ null ãå«ã¾ãã¦ãã¾ã: %s\n"
-#: database.cc:805
+#: database.cc:786
#, fuzzy, c-format
msgid "wanted %d rows got %d in query: %s"
msgstr "ã¯ã¨ãªã§ %d è¡è¦æ±ãã¾ãããå¾ãã®ã¯ %s ã§ã: %s\n"
-#: database.cc:1952
+#: database.cc:1926
#, c-format
msgid "another key with name '%s' already exists"
msgstr "'%s' ã¨ããååã®ä»ã®éµãæ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:2949
+#: database.cc:2958
#, c-format
msgid "no database specified"
msgstr "ãã¼ã¿ãã¼ã¹æªæå®"
-#: database.cc:2957
+#: database.cc:2966
#, c-format
msgid "database %s does not exist"
msgstr "ãã¼ã¿ãã¼ã¹ %s ã¯åå¨ãã¾ãã"
-#: database.cc:2958
+#: database.cc:2967
#, c-format
msgid "%s is a directory, not a database"
msgstr "%s ã¯ãã¼ã¿ãã¼ã¹ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
-#: database.cc:2983
+#: database.cc:2992
#, c-format
msgid "could not open database '%s': %s"
msgstr "ãã¼ã¿ãã¼ã¹ '%s': %s ãéãã¾ããã§ãã"
-#: diff_patch.cc:614
+#: diff_patch.cc:608
#, c-format
msgid "file '%s' does not exist in workspace"
msgstr "ãã¡ã¤ã« '%s' ã¯ã¯ã¼ã¯ã¹ãã¼ã¹å
ã«åå¨ãã¾ãã"
-#: diff_patch.cc:615
+#: diff_patch.cc:609
#, c-format
msgid "'%s' in workspace is a directory, not a file"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã® '%s' ã¯ãã¡ã¤ã«ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
-#: diff_patch.cc:619
+#: diff_patch.cc:613
#, c-format
msgid "file %s in workspace has id %s, wanted %s"
msgstr ""
"ã¯ã¼ã¯ã¹ãã¼ã¹å
ã®ãã¡ã¤ã« %s ã® ID 㯠%s ã§ãããæå¾
ãããã®ã¯ %s ã§ã"
-#: diff_patch.cc:744
-#, fuzzy, c-format
+#: diff_patch.cc:734
+#, c-format
msgid ""
"help required for 3-way merge\n"
"[ancestor] %s\n"
"[ left] %s\n"
"[ right] %s\n"
-"[ merged] %s"
+"[ merged] %s\n"
msgstr ""
"ä¸å
çµ±åã«ã¯æå©ããå¿
è¦ã§ã\n"
"[ ç¥å
] %s\n"
@@ -2310,42 +2177,42 @@ msgstr "ãã®ãããªãã¡ã¤ã«ã¾ã
msgid "no such file or directory: '%s'"
msgstr "ãã®ãããªãã¡ã¤ã«ã¾ãã¯ãã£ã¬ã¯ããªã¯ããã¾ãã: '%s'"
-#: keys.cc:102
+#: keys.cc:99
#, c-format
msgid "got empty passphrase from get_passphrase() hook"
msgstr "get_passphrase() ããã¯ã¯ç©ºã®ãã¹ãã¬ã¼ãºãè¿ãã¾ãã"
-#: keys.cc:118
+#: keys.cc:115
#, c-format
msgid "empty passphrase not allowed"
msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«ã§ãã¾ãã"
-#: keys.cc:125
+#: keys.cc:122
#, c-format
msgid "confirm passphrase for key ID [%s]: "
msgstr "éµ ID [%s] ã®ãã¹ãã¬ã¼ãºã確èª: "
-#: keys.cc:130
+#: keys.cc:127
#, fuzzy, c-format
msgid "empty passphrases not allowed, try again"
msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«ã§ãã¾ãã. å度試ãã¦ä¸ãã\n"
-#: keys.cc:131 keys.cc:138
+#: keys.cc:128 keys.cc:135
#, fuzzy, c-format
msgid "too many failed passphrases"
msgstr "ãã¹ãã¬ã¼ãºã®å
¥åãã¹ãå¤ããã¾ã\n"
-#: keys.cc:137
+#: keys.cc:134
#, fuzzy, c-format
msgid "passphrases do not match, try again"
msgstr "ãã¹ãã¬ã¼ãºãä¸è´ãã¾ãããå度試ãã¦ä¸ãã\n"
-#: keys.cc:144
+#: keys.cc:141
#, c-format
msgid "no passphrase given"
msgstr "ãã¹ãã¬ã¼ãºãæå®ãã¦ä¸ãã"
-#: keys.cc:570
+#: keys.cc:564
#, c-format
msgid "passphrase for '%s' is incorrect"
msgstr "'%s' ã«å¯¾ãããã¹ãã¬ã¼ãºãééã£ã¦ãã¾ã"
@@ -2360,7 +2227,7 @@ msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯åå
msgid "Directory '%s' does not exist"
msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯åå¨ãã¾ãã"
-#: lua.cc:480 rcs_import.cc:1235 work.cc:1316
+#: lua.cc:480 rcs_import.cc:1235 work.cc:480
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
@@ -2370,15 +2237,13 @@ msgstr "åæåãã¡ã¤ã« '%s' ãèª
msgid "lua error while loading rcfile '%s'"
msgstr "åæåãã¡ã¤ã« '%s' ãèªã¿è¾¼ã¿ä¸ã« lua ã®ã¨ã©ã¼"
-#: merge.cc:60
-#, c-format
-msgid "resolve non-content conflicts and then try again."
-msgstr ""
+#: main.cc:326
+msgid "interrupted"
+msgstr "å²è¾¼ã¿"
-#: merge.cc:124
-#, c-format
-msgid "merge failed due to unresolved conflicts"
-msgstr ""
+#: main.cc:330
+msgid "terminated by signal"
+msgstr "ã·ã°ãã«ã§çµäº"
#: merkle_tree.cc:290
#, c-format
@@ -2390,18 +2255,235 @@ msgstr "ä¸è´ããªããã¼ãããã
msgid "mismatched node hash value %s, expected %s"
msgstr "ä¸è´ããªããã¼ãããã·ã¥å¤ %sãæå¾
ãããã®ã¯ %s ã§ã"
-#: monotone.cc:154
-#, c-format
-msgid "Invalid escape in --xargs file"
+#: monotone.cc:65
+msgid "select branch cert for operation"
+msgstr "æä½ã®ããã®ãã©ã³ã証æãé¸æ"
+
+#: monotone.cc:66
+msgid "select revision id for operation"
+msgstr "æä½ã®ããã®ãªãã¸ã§ã³ ID ãé¸æ"
+
+#: monotone.cc:67
+msgid "set commit changelog message"
+msgstr "ã³ãããå¤æ´è¨é²ã¡ãã»ã¼ã¸ãè¨å®"
+
+#: monotone.cc:68
+msgid "set filename containing commit changelog message"
+msgstr "ã³ãããå¤æ´è¨é²ã¡ãã»ã¼ã¸ãå«ããã¡ã¤ã«ãè¨å®"
+
+#: monotone.cc:69
+msgid "override date/time for commit"
+msgstr "ã³ãããæã®æ¥æãä¸æ¸ãæå®"
+
+#: monotone.cc:70
+msgid "override author for commit"
+msgstr "ã³ãããæã®ä½æè
ãä¸æ¸ãæå®"
+
+#: monotone.cc:71
+msgid "limit the number of levels of directories to descend"
+msgstr "éä¸ãããã£ã¬ã¯ããªã®æ·±ããå¶é"
+
+#: monotone.cc:72
+msgid "limit log output to the last number of entries"
+msgstr "ãã°åºåã®ã¨ã³ããªæ°(æè¿)ãå¶é"
+
+#: monotone.cc:73
+msgid "limit log output to the next number of entries"
+msgstr "ãã°åºåã®ã¨ã³ããªæ°(次)ãå¶é"
+
+#: monotone.cc:74
+msgid "record process id of server"
+msgstr "ãµã¼ãã¼ã®ããã»ã¹ ID ãè¨é²"
+
+#: monotone.cc:75
+msgid "print a brief version of the normal output"
+msgstr "é常åºåã®ç°¡åãªãã¼ã¸ã§ã³ã表示"
+
+#: monotone.cc:76
+msgid "print diffs along with logs"
+msgstr "ãã°ã¨å
±ã«å·®åã表示"
+
+#: monotone.cc:77
+msgid "exclude merges when printing logs"
+msgstr "ãã°ã表示ããéã«çµ±åã«ã¤ãã¦ã¯çç¥"
+
+#: monotone.cc:78
+msgid "use the current arguments as the future default"
+msgstr "ç¾å¨ã®å¼æ°ãå°æ¥ã®ããã©ã«ãã¨ãã¦ä½¿ç¨"
+
+#: monotone.cc:79
+msgid "leave out anything described by its argument"
+msgstr "å¼æ°ã«ãã£ã¦èª¬æããããã¹ã¦ãçã"
+
+#: monotone.cc:80
+msgid "use unified diff format"
+msgstr "unified diff å½¢å¼ã使ç¨"
+
+#: monotone.cc:81
+msgid "use context diff format"
+msgstr "context diff å½¢å¼ã使ç¨"
+
+#: monotone.cc:82
+msgid "use external diff hook for generating diffs"
+msgstr "å·®åã®çæã«å¤é¨ diff ããã¯ã使ç¨"
+
+#: monotone.cc:83
+msgid "argument to pass external diff hook"
+msgstr "å¤é¨ diff ããã¯ã«æ¸¡ãå¼æ°"
+
+#: monotone.cc:84
+msgid "do not show the function containing each block of changes"
msgstr ""
-#: monotone.cc:686
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION...] command [ARG...]"
+#: monotone.cc:85
+msgid "another name for --no-show-encloser (for compatibility with GNU diff)"
+msgstr ""
+
+#: monotone.cc:86
+msgid "perform the associated file operation"
+msgstr "é¢é£ä»ãããããã¡ã¤ã«æä½ãå®è¡"
+
+#: monotone.cc:87
+msgid "address:port to listen on (default :4691)"
+msgstr "å¾
æ©ãã ã¢ãã¬ã¹:ãã¼ã (ããã©ã«ã: 4691)"
+
+#: monotone.cc:88
+msgid "perform the operations for files missing from workspace"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã§ã¯ã¿ã¤ãããªããã¡ã¤ã«ã«ã¤ãã¦æä½ãå®è¡"
+
+#: monotone.cc:89
+msgid "perform the operations for unknown files from workspace"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã§ã¯ä¸æãªãã¡ã¤ã«ã«ã¤ãã¦æä½ãå®è¡"
+
+#: monotone.cc:90
+msgid "push the specified key even if it hasn't signed anything"
+msgstr "æå®ã®éµã«ã¤ãã¦ç½²åã®æç¡ã«ãããããåãè¾¼ã¿"
+
+#: monotone.cc:91
+msgid "serve netsync on stdio"
+msgstr ""
+
+#: monotone.cc:92
+msgid "disable transport authentication"
+msgstr ""
+
+#: monotone.cc:93
+msgid "when rosterifying, drop attrs entries with the given key"
+msgstr "åç°¿ä½æä¸ã«æå®ã®éµã®ã¨ã³ããªã®å±æ§ãç ´æ£"
+
+#: monotone.cc:94
+msgid "exclude files when printing logs"
+msgstr "ãã°ã表示ããéã«ãã¡ã¤ã«ã«ã¤ãã¦ã¯çç¥"
+
+#: monotone.cc:95
+msgid "also operate on the contents of any listed directories"
+msgstr "ä¸è¦§ã®ãã£ã¬ã¯ããªã®å
容ã«ã¤ãã¦ãå¦ç"
+
+#: monotone.cc:104
+msgid "print debug log to stderr while running"
+msgstr "å®è¡æãæ¨æºã¨ã©ã¼åºåã«ãããã°ãã°ã表示"
+
+#: monotone.cc:105
+msgid "file to dump debugging log to, on failure"
+msgstr "失ææã«ãããã°ãã°ãåºåãããã¡ã¤ã«"
+
+#: monotone.cc:106
+msgid "file to write the log to"
+msgstr "ãã°ãæ¸ãè¾¼ããã¡ã¤ã«"
+
+#: monotone.cc:107
+#, fuzzy
+msgid "suppress verbose, informational and progress messages"
+msgstr "ãã°ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
+
+#: monotone.cc:108
+#, fuzzy
+msgid "suppress warning, verbose, informational and progress messages"
+msgstr "ãã°ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
+
+#: monotone.cc:109
+msgid "display help message"
+msgstr "ãã«ãã¡ãã»ã¼ã¸ã表示"
+
+#: monotone.cc:110
+msgid "print version number, then exit"
+msgstr "ãã¼ã¸ã§ã³çªå·ã表示ããçµäº"
+
+#: monotone.cc:111
+msgid "print detailed version number, then exit"
+msgstr "詳細ãªãã¼ã¸ã§ã³çªå·ã表示ããçµäº"
+
+#: monotone.cc:112
+msgid "insert command line arguments taken from the given file"
+msgstr "æå®ã®ãã¡ã¤ã«ã®å
容ãã³ãã³ãè¡å¼æ°ã«æ¿å
¥"
+
+#: monotone.cc:113
+msgid "set ticker style (count|dot|none)"
+msgstr "ãã£ãã«ã¼ã®ã¹ã¿ã¤ã«ãè¨å® (count|dot|none)"
+
+#: monotone.cc:114
+msgid "do not load standard lua hooks"
+msgstr "æ¨æº lua ããã¯ãèªã¿è¾¼ã¾ãªã"
+
+#: monotone.cc:115
+msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files"
+msgstr ""
+"~/.monotone/monotonerc ã¾ã㯠_MTN/monotonerc lua ãã¡ã¤ã«ãèªã¿è¾¼ã¾ãªã"
+
+#: monotone.cc:116
+msgid "load extra rc file"
+msgstr "å¥ã®åæåãã¡ã¤ã«ãèªã¿è¾¼ã"
+
+#: monotone.cc:117
+msgid "set key for signatures"
+msgstr "ç½²åã®éµãè¨å®"
+
+#: monotone.cc:118
+msgid "set name of database"
+msgstr "ãã¼ã¿ãã¼ã¹åãè¨å®"
+
+#: monotone.cc:119
+msgid "limit search for workspace to specified root"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®æ¤ç´¢ãæå®ã®ã«ã¼ãä¸ã«å¶é"
+
+#: monotone.cc:120
+msgid "verbose completion output"
+msgstr "åé·ãªå®äºã¡ãã»ã¼ã¸"
+
+#: monotone.cc:121
+msgid "set location of key store"
+msgstr "éµã®ä¿åå ´æãè¨å®"
+
+#: monotone.cc:122
+msgid "set location of configuration directory"
+msgstr "è¨å®ç¨ã®ãã£ã¬ã¯ããªã®å ´æãè¨å®"
+
+#: monotone.cc:226
+#, c-format
+msgid "problem parsing arguments from file %s: %s"
+msgstr "ãã¡ã¤ã« %s ããã®å¼æ°ã解æä¸ã«åé¡çºç: %s"
+
+#: monotone.cc:235
+#, c-format
+msgid "weird error when stuffing arguments read from %s: %s\n"
+msgstr "%s ããå¼æ°ãèªã¿åãä¸ã«äºæãã¬ã¨ã©ã¼çºç: %s\n"
+
+#: monotone.cc:331
+msgid "[OPTION...] command [ARGS...]\n"
msgstr "[OPTION...] command [ARGS...]\n"
-#: monotone.cc:694
+#: monotone.cc:600
#, c-format
+msgid "syntax error near the \"%s\" option: %s"
+msgstr "\"%s\" ãªãã·ã§ã³ã®è¿ãã«æ§æã¨ã©ã¼: %s"
+
+#: monotone.cc:639
+#, fuzzy, c-format
+msgid "%s %s doesn't use the option %s"
+msgstr "monotone %s ã«ã¯ãªãã·ã§ã³ %s ã¯ä½¿ãã¾ãã"
+
+#: monotone.cc:673
+#, c-format
msgid "Options specific to '%s %s':"
msgstr "'%s %s' ã«ç¹åãããªãã·ã§ã³:"
@@ -2463,10 +2545,10 @@ msgstr "'%d' ãã¤ãã®é·ãè¶
éã®
msgstr "'%d' ãã¤ãã®é·ãè¶
éã®ãã¤ãã¼ã"
#: netcmd.cc:176
-#, fuzzy, c-format
+#, c-format
msgid ""
"bad HMAC checksum (got %s, wanted %s)\n"
-"this suggests data was corrupted in transit"
+"this suggests data was corrupted in transit\n"
msgstr ""
"ä¸æ£ãª HMAC ãã§ãã¯ãµã (è¨ç®å¤ %s / æå¾
å¤ %s)\n"
"ããã¯è»¢éä¸ã«ãã¼ã¿ãå£ãããã¨ã示åãã¦ãã¾ã\n"
@@ -2567,11 +2649,11 @@ msgstr "ãµã¼ãã¼éµãå¤æ´ããã
msgstr "ãµã¼ãã¼éµãå¤æ´ããã¾ãã"
#: netsync.cc:1251
-#, fuzzy, c-format
+#, c-format
msgid ""
"first time connecting to server %s\n"
"I'll assume it's really them, but you might want to double-check\n"
-"their key's fingerprint: %s"
+"their key's fingerprint: %s\n"
msgstr ""
"ãµã¼ãã¼ %s ã«æ¥ç¶ããã®ã¯åãã¦ã§ã\n"
"å½ç©ã§ãªãã¨ã¯æãã¾ãããéµã®æç´ãäºéã«ãã§ãã¯ãã¦ã¿ãã¨ããã§ããã: %"
@@ -2722,8 +2804,8 @@ msgstr "ã·ã³ã¯"
msgstr "ã·ã³ã¯"
#: netsync.cc:2226
-#, fuzzy, c-format
-msgid "input buffer for peer %s is overfull after netcmd dispatch"
+#, c-format
+msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
msgstr "netcmd dispatch ã®å¾ã§ãã¼ã¢ %s ã®å
¥åãããã¡ãããµãã¾ãã\n"
#: netsync.cc:2238 netsync.cc:2337
@@ -2742,13 +2824,13 @@ msgstr "%s ã«æ¥ç¶ä¸\n"
msgstr "%s ã«æ¥ç¶ä¸\n"
#: netsync.cc:2352
-#, fuzzy, c-format
-msgid "timed out waiting for I/O with peer %s, disconnecting"
+#, c-format
+msgid "timed out waiting for I/O with peer %s, disconnecting\n"
msgstr "ãã¼ã¢ %s ã® I/O ãå¾
ã£ã¦ããéã«ã¿ã¤ã ã¢ã¦ã, åæä¸\n"
#: netsync.cc:2375
-#, fuzzy, c-format
-msgid "processing failure while talking to peer %s, disconnecting"
+#, c-format
+msgid "processing failure while talking to peer %s, disconnecting\n"
msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã«å¦çã失æããåæä¸\n"
#: netsync.cc:2392
@@ -2762,8 +2844,8 @@ msgstr "ãã¼ã¢ %s ã«ã¨ã©ã¼ãå ±å
msgstr "ãã¼ã¢ %s ã«ã¨ã©ã¼ãå ±åå¾ã«åæããã¾ãã\n"
#: netsync.cc:2403
-#, fuzzy, c-format
-msgid "I/O failure while talking to peer %s, disconnecting"
+#, c-format
+msgid "I/O failure while talking to peer %s, disconnecting\n"
msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã« I/O ã®å¤±æãåæä¸\n"
#: netsync.cc:2469
@@ -2787,9 +2869,9 @@ msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ã
msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æ (ã¨ã©ã¼)\n"
#: netsync.cc:2554
-#, fuzzy, c-format
+#, c-format
msgid ""
-"peer %s read failed in shutdown state (possibly client misreported error)"
+"peer %s read failed in shutdown state (possibly client misreported error)\n"
msgstr ""
"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æ (ããããã¯ã©ã¤ã¢ã³"
"ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)\n"
@@ -2805,9 +2887,9 @@ msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ã
msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æ (ã¨ã©ã¼)\n"
#: netsync.cc:2586
-#, fuzzy, c-format
+#, c-format
msgid ""
-"peer %s write failed in shutdown state (possibly client misreported error)"
+"peer %s write failed in shutdown state (possibly client misreported error)\n"
msgstr ""
"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æ (ããããã¯ã©ã¤ã¢ã³"
"ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)\n"
@@ -2837,8 +2919,8 @@ msgstr "<ãã¹ã¦ã®ã¤ã³ã¿ã¼ãã§ã
msgstr "<ãã¹ã¦ã®ã¤ã³ã¿ã¼ãã§ã¼ã¹>"
#: netsync.cc:2724
-#, fuzzy, c-format
-msgid "session limit %d reached, some connections will be refused"
+#, c-format
+msgid "session limit %d reached, some connections will be refused\n"
msgstr "ã»ãã·ã§ã³å¶é %d ã«éãã¾ãããããã¤ãã®æ¥ç¶ã¯æå¦ããã¾ã\n"
#: netsync.cc:2789
@@ -2871,231 +2953,28 @@ msgstr "éµ '%s' ãã¿ã¤ãããã¨ã
msgstr "éµ '%s' ãã¿ã¤ãããã¨ãã§ãã¾ãã"
#: netsync.cc:3122
-#, fuzzy, c-format
+#, c-format
msgid ""
"include branch pattern contains a quote character:\n"
-"%s"
+"%s\n"
msgstr ""
"å¼ç¨ç¬¦ãå«ããã©ã³ããã¿ã¼ã³ãå«ãã:\n"
"%s\n"
#: netsync.cc:3128
-#, fuzzy, c-format
+#, c-format
msgid ""
"exclude branch pattern contains a quote character:\n"
-"%s"
+"%s\n"
msgstr ""
"å¼ç¨ç¬¦ãå«ããã©ã³ããã¿ã¼ã³ãå«ããªã:\n"
"%s\n"
-#: netsync.cc:3163 netsync.cc:3167
+#: netsync.cc:3160 netsync.cc:3164
#, c-format
msgid "network error: %s"
msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼: %s"
-#: options_list.hh:2
-msgid "print debug log to stderr while running"
-msgstr "å®è¡æãæ¨æºã¨ã©ã¼åºåã«ãããã°ãã°ã表示"
-
-#: options_list.hh:3
-msgid "file to dump debugging log to, on failure"
-msgstr "失ææã«ãããã°ãã°ãåºåãããã¡ã¤ã«"
-
-#: options_list.hh:4
-msgid "file to write the log to"
-msgstr "ãã°ãæ¸ãè¾¼ããã¡ã¤ã«"
-
-#: options_list.hh:5
-#, fuzzy
-msgid "suppress verbose, informational and progress messages"
-msgstr "ãã°ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
-
-#: options_list.hh:6
-#, fuzzy
-msgid "suppress warning, verbose, informational and progress messages"
-msgstr "ãã°ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
-
-#: options_list.hh:7
-msgid "display help message"
-msgstr "ãã«ãã¡ãã»ã¼ã¸ã表示"
-
-#: options_list.hh:8
-msgid "print version number, then exit"
-msgstr "ãã¼ã¸ã§ã³çªå·ã表示ããçµäº"
-
-#: options_list.hh:9
-msgid "print detailed version number, then exit"
-msgstr "詳細ãªãã¼ã¸ã§ã³çªå·ã表示ããçµäº"
-
-#: options_list.hh:10
-msgid "insert command line arguments taken from the given file"
-msgstr "æå®ã®ãã¡ã¤ã«ã®å
容ãã³ãã³ãè¡å¼æ°ã«æ¿å
¥"
-
-#: options_list.hh:11
-msgid "set ticker style (count|dot|none)"
-msgstr "ãã£ãã«ã¼ã®ã¹ã¿ã¤ã«ãè¨å® (count|dot|none)"
-
-#: options_list.hh:12
-msgid "do not load standard lua hooks"
-msgstr "æ¨æº lua ããã¯ãèªã¿è¾¼ã¾ãªã"
-
-#: options_list.hh:13
-msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files"
-msgstr ""
-"~/.monotone/monotonerc ã¾ã㯠_MTN/monotonerc lua ãã¡ã¤ã«ãèªã¿è¾¼ã¾ãªã"
-
-#: options_list.hh:14
-msgid "load extra rc file"
-msgstr "å¥ã®åæåãã¡ã¤ã«ãèªã¿è¾¼ã"
-
-#: options_list.hh:15
-msgid "set key for signatures"
-msgstr "ç½²åã®éµãè¨å®"
-
-#: options_list.hh:16
-msgid "set name of database"
-msgstr "ãã¼ã¿ãã¼ã¹åãè¨å®"
-
-#: options_list.hh:17
-msgid "limit search for workspace to specified root"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®æ¤ç´¢ãæå®ã®ã«ã¼ãä¸ã«å¶é"
-
-#: options_list.hh:18
-msgid "verbose completion output"
-msgstr "åé·ãªå®äºã¡ãã»ã¼ã¸"
-
-#: options_list.hh:19
-msgid "set location of key store"
-msgstr "éµã®ä¿åå ´æãè¨å®"
-
-#: options_list.hh:20
-msgid "set location of configuration directory"
-msgstr "è¨å®ç¨ã®ãã£ã¬ã¯ããªã®å ´æãè¨å®"
-
-#: options_list.hh:22
-msgid "override author for commit"
-msgstr "ã³ãããæã®ä½æè
ãä¸æ¸ãæå®"
-
-#: options_list.hh:23
-msgid "block size in bytes for \"automate stdio\" output"
-msgstr ""
-
-#: options_list.hh:24
-msgid "address:port to listen on (default :4691)"
-msgstr "å¾
æ©ãã ã¢ãã¬ã¹:ãã¼ã (ããã©ã«ã: 4691)"
-
-#: options_list.hh:25
-msgid "select branch cert for operation"
-msgstr "æä½ã®ããã®ãã©ã³ã証æãé¸æ"
-
-#: options_list.hh:26
-msgid "print a brief version of the normal output"
-msgstr "é常åºåã®ç°¡åãªãã¼ã¸ã§ã³ã表示"
-
-#: options_list.hh:27
-msgid "use context diff format"
-msgstr "context diff å½¢å¼ã使ç¨"
-
-#: options_list.hh:28
-msgid "override date/time for commit"
-msgstr "ã³ãããæã®æ¥æãä¸æ¸ãæå®"
-
-#: options_list.hh:29
-msgid "limit the number of levels of directories to descend"
-msgstr "éä¸ãããã£ã¬ã¯ããªã®æ·±ããå¶é"
-
-#: options_list.hh:30
-msgid "print diffs along with logs"
-msgstr "ãã°ã¨å
±ã«å·®åã表示"
-
-#: options_list.hh:31
-msgid "when rosterifying, drop attrs entries with the given key"
-msgstr "åç°¿ä½æä¸ã«æå®ã®éµã®ã¨ã³ããªã®å±æ§ãç ´æ£"
-
-#: options_list.hh:32
-msgid "leave out anything described by its argument"
-msgstr "å¼æ°ã«ãã£ã¦èª¬æããããã¹ã¦ãçã"
-
-#: options_list.hh:33
-msgid "perform the associated file operation"
-msgstr "é¢é£ä»ãããããã¡ã¤ã«æä½ãå®è¡"
-
-#: options_list.hh:34
-msgid "use external diff hook for generating diffs"
-msgstr "å·®åã®çæã«å¤é¨ diff ããã¯ã使ç¨"
-
-#: options_list.hh:35
-msgid "argument to pass external diff hook"
-msgstr "å¤é¨ diff ããã¯ã«æ¸¡ãå¼æ°"
-
-#: options_list.hh:36
-msgid "push the specified key even if it hasn't signed anything"
-msgstr "æå®ã®éµã«ã¤ãã¦ç½²åã®æç¡ã«ãããããåãè¾¼ã¿"
-
-#: options_list.hh:37
-msgid "limit log output to the last number of entries"
-msgstr "ãã°åºåã®ã¨ã³ããªæ°(æè¿)ãå¶é"
-
-#: options_list.hh:38
-msgid "set commit changelog message"
-msgstr "ã³ãããå¤æ´è¨é²ã¡ãã»ã¼ã¸ãè¨å®"
-
-#: options_list.hh:39
-msgid "perform the operations for files missing from workspace"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã§ã¯ã¿ã¤ãããªããã¡ã¤ã«ã«ã¤ãã¦æä½ãå®è¡"
-
-#: options_list.hh:40
-msgid "set filename containing commit changelog message"
-msgstr "ã³ãããå¤æ´è¨é²ã¡ãã»ã¼ã¸ãå«ããã¡ã¤ã«ãè¨å®"
-
-#: options_list.hh:41
-msgid "limit log output to the next number of entries"
-msgstr "ãã°åºåã®ã¨ã³ããªæ°(次)ãå¶é"
-
-#: options_list.hh:42
-msgid "exclude files when printing logs"
-msgstr "ãã°ã表示ããéã«ãã¡ã¤ã«ã«ã¤ãã¦ã¯çç¥"
-
-#: options_list.hh:43
-msgid "exclude merges when printing logs"
-msgstr "ãã°ã表示ããéã«çµ±åã«ã¤ãã¦ã¯çç¥"
-
-#: options_list.hh:44
-msgid "do not show the function containing each block of changes"
-msgstr ""
-
-#: options_list.hh:45
-msgid "disable transport authentication"
-msgstr ""
-
-#: options_list.hh:46
-msgid "record process id of server"
-msgstr "ãµã¼ãã¼ã®ããã»ã¹ ID ãè¨é²"
-
-#: options_list.hh:47
-msgid "also operate on the contents of any listed directories"
-msgstr "ä¸è¦§ã®ãã£ã¬ã¯ããªã®å
容ã«ã¤ãã¦ãå¦ç"
-
-#: options_list.hh:48
-msgid "select revision id for operation"
-msgstr "æä½ã®ããã®ãªãã¸ã§ã³ ID ãé¸æ"
-
-#: options_list.hh:49
-msgid "use the current arguments as the future default"
-msgstr "ç¾å¨ã®å¼æ°ãå°æ¥ã®ããã©ã«ãã¨ãã¦ä½¿ç¨"
-
-#: options_list.hh:50
-msgid "serve netsync on stdio"
-msgstr ""
-
-#: options_list.hh:51
-msgid "use unified diff format"
-msgstr "unified diff å½¢å¼ã使ç¨"
-
-#: options_list.hh:52
-msgid "perform the operations for unknown files from workspace"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã§ã¯ä¸æãªãã¡ã¤ã«ã«ã¤ãã¦æä½ãå®è¡"
-
#: packet.cc:107
#, c-format
msgid "file preimage '%s' missing in db"
@@ -3157,18 +3036,18 @@ msgstr "ä¸æãªãã±ããå: '%s'"
msgstr "ä¸æãªãã±ããå: '%s'"
#: rcs_file.cc:354
-#, fuzzy, c-format
-msgid "parse failure %d:%d: expecting %s, got %s with value '%s'"
+#, c-format
+msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n"
msgstr "解æ失æ %d:%d: æå¾
å¤ %sãåå¾ %s (å¤ '%s')\n"
#: rcs_file.cc:373
-#, fuzzy, c-format
-msgid "parse failure %d:%d: expecting word '%s'"
+#, c-format
+msgid "parse failure %d:%d: expecting word '%s'\n"
msgstr "解æ失æ %d:%d: æå¾
ãããèªå¥ '%s'\n"
#: rcs_file.cc:388
-#, fuzzy, c-format
-msgid "parse failure %d:%d: expecting word"
+#, c-format
+msgid "parse failure %d:%d: expecting word\n"
msgstr "解æ失æ %d:%d: æå¾
ãããèªå¥\n"
#: rcs_import.cc:721
@@ -3209,48 +3088,48 @@ msgstr "ã¿ã°"
msgid "tags"
msgstr "ã¿ã°"
-#: revision.cc:865
+#: revision.cc:730
#, fuzzy, c-format
msgid "scanning for bogus merge edges"
msgstr "å½ãã®çµ±åå
端ãèµ°æ»ä¸\n"
-#: revision.cc:907
+#: revision.cc:772
#, fuzzy, c-format
msgid "optimizing out redundant edge %d -> %d"
msgstr "åé·ãªå
端 %d -> %d ãæé©åä¸\n"
-#: revision.cc:916
+#: revision.cc:781
#, fuzzy, c-format
msgid "failed to eliminate edge %d -> %d"
msgstr "å
端 %d -> %d ã®é¤å»ã«å¤±æ\n"
-#: revision.cc:927
+#: revision.cc:792
#, fuzzy, c-format
msgid "rebuilding %d nodes"
msgstr "åæ§ç¯ä¸: %d ãã¼ã\n"
-#: revision.cc:1132
-#, fuzzy, c-format
-msgid "Path %s added to child roster multiple times"
+#: revision.cc:997
+#, c-format
+msgid "Path %s added to child roster multiple times\n"
msgstr "ãã¹ %s ãåã®åç°¿ã«è¤æ°å追å ããã¾ãã\n"
-#: revision.cc:1145
-#, fuzzy, c-format
-msgid "Directory for path %s cannot be added, as there is a file in the way"
+#: revision.cc:1010
+#, c-format
+msgid "Directory for path %s cannot be added, as there is a file in the way\n"
msgstr ""
"éªéã«ãªã£ã¦ãããã¡ã¤ã«ãããã®ã§ããã¹ %s ã®ãã£ã¬ã¯ããªã追å ã§ãã¾ãã\n"
-#: revision.cc:1156
+#: revision.cc:1021
#, fuzzy, c-format
msgid "Path %s cannot be added, as there is a directory in the way"
msgstr "éªéã«ãªã£ã¦ãããã£ã¬ã¯ããªãããã®ã§ ãã¹ %s ã追å ã§ãã¾ãã\n"
-#: revision.cc:1159
-#, fuzzy, c-format
-msgid "Path %s added twice with differing content"
+#: revision.cc:1024
+#, c-format
+msgid "Path %s added twice with differing content\n"
msgstr "ç°ãªãå
容ã§ãã¹ %s ãäºå追å ãã¦ãã¾ã\n"
-#: revision.cc:1446
+#: revision.cc:1311
#, c-format
msgid ""
"unknown attribute '%s' on path '%s'\n"
@@ -3263,33 +3142,19 @@ msgstr ""
"(ããåã«å
ã«é²ã¿ããã®ãªã --drop-attr ã¹ã¦ã£ããã«ã¤ãã¦åç
§ãã¦ä¸ããã\n"
"ãããæ¬å½ã®ã¨ãããã®ã¾ã¾ã«ãã¦ããã¦ãããæ¹ã解決ã«ã¯å½¹ç«ã¡ã¾ãã)"
-#: revision.cc:1559
+#: revision.cc:1423
#, fuzzy, c-format
msgid "converting existing revision graph to new roster-style revisions"
msgstr ""
"æ¢åã®ãªãã¸ã§ã³ã®ã°ã©ããæ°ããåç°¿ã¹ã¿ã¤ã«ã®ãªãã¸ã§ã³ã«å¤æãã¦ãã¾ã\n"
-#: revision.cc:1614
+#: revision.cc:1478
#, fuzzy, c-format
msgid "rebuilding revision graph from manifest certs"
msgstr "ãããã§ã¹ã証æãããªãã¸ã§ã³ã°ã©ããå度æ§æä¸\n"
-#: revision.cc:1647
-#, fuzzy, c-format
-msgid "regenerating cached rosters"
-msgstr "åç
§ããã¦ããªãåç°¿: %d\n"
-
-#: revision.cc:1656
+#: revision.cc:1587
#, c-format
-msgid "calculating rosters to regenerate"
-msgstr ""
-
-#: revision.cc:1660
-msgid "regenerated"
-msgstr ""
-
-#: revision.cc:1755
-#, c-format
msgid ""
"encountered a revision with unknown format, version '%s'\n"
"I only know how to understand the version '1' format\n"
@@ -3299,170 +3164,155 @@ msgstr ""
"ç解ã§ããã®ã¯ãã¼ã¸ã§ã³ '1' å½¢å¼ã ãã§ãã\n"
"ãã®æä½ãå®äºããã«ã¯ããæ°ãããã¼ã¸ã§ã³ã® monotone ãå¿
è¦ã§ã"
-#: sanity.cc:148
+#: sanity.cc:126
#, c-format
msgid "fatal: formatter failed on %s:%d: %s"
msgstr "è´å½ç: ãã©ã¼ããã¿å¤±æ %s:%d: %s"
-#: sanity.cc:222
+#: sanity.cc:200
msgid "misuse: "
msgstr "誤ã: "
-#: sanity.cc:234
+#: sanity.cc:212
msgid "error: "
msgstr "ã¨ã©ã¼: "
-#: sanity.cc:242
+#: sanity.cc:220
#, c-format
msgid "%s:%d: invariant '%s' violated"
msgstr "%s:%d: invariant '%s' violated"
-#: sanity.cc:255
-#, fuzzy, c-format
-msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d"
+#: sanity.cc:233
+#, c-format
+msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
msgstr "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
-#: sanity.cc:276
-#, fuzzy, c-format
-msgid "Current work set: %i items"
+#: sanity.cc:254
+#, c-format
+msgid "Current work set: %i items\n"
msgstr "ç¾å¨ã®ä½æ¥ã»ãã: %i ã¢ã¤ãã \n"
-#: schema_migration.cc:258
+#: schema_migration.cc:241
#, c-format
msgid "calculating necessary migration steps"
msgstr "å¿
è¦ãªçµ±åã¹ããããè¦ç©ã£ã¦ãã¾ã"
-#: schema_migration.cc:270
+#: schema_migration.cc:251
#, c-format
msgid "error at transaction BEGIN statement"
msgstr "ãã©ã³ã¶ã¯ã·ã§ã³ BEGIN æã§ã¨ã©ã¼"
-#: schema_migration.cc:271
+#: schema_migration.cc:252
#, c-format
msgid "migrating data"
msgstr "ãã¼ã¿ãçµ±åãã¦ãã¾ã"
-#: schema_migration.cc:297
+#: schema_migration.cc:278
#, c-format
msgid "migration step failed: %s"
msgstr "çµ±åã¹ããã失æ: %s"
-#: schema_migration.cc:311
+#: schema_migration.cc:292
#, c-format
msgid "mismatched result of migration, got %s, wanted %s"
msgstr "çµ±åã®çµæã®ä¸ä¸è´: çµæ %s, æå¾
%s"
-#: schema_migration.cc:314
+#: schema_migration.cc:295
#, c-format
msgid "committing changes to database"
msgstr "å¤æ´ããã¼ã¿ãã¼ã¹ã«ã³ããããã¦ãã¾ã"
-#: schema_migration.cc:316
+#: schema_migration.cc:297
#, c-format
msgid "failure on COMMIT"
msgstr "COMMIT 失æ"
-#: schema_migration.cc:318
+#: schema_migration.cc:299
#, c-format
msgid "optimizing database"
msgstr "ãã¼ã¿ãã¼ã¹ãæé©åãã¦ãã¾ã"
-#: schema_migration.cc:320
+#: schema_migration.cc:301
#, c-format
msgid "error vacuuming after migration"
msgstr "çµ±åå¾ã®ããã¥ã¼ã å¦çä¸ã«ã¨ã©ã¼"
-#: schema_migration.cc:323
+#: schema_migration.cc:304
#, c-format
msgid "error running analyze after migration"
msgstr "çµ±åå¾ã«è§£æå®è¡ä¸ã«ã¨ã©ã¼"
-#: schema_migration.cc:332
+#: schema_migration.cc:311
#, c-format
-msgid ""
-"NOTE: because this database was last used by a rather old version\n"
-"of monotone, you're not done yet. If you're a project leader, then\n"
-"see the file UPGRADE for instructions on running '%s db %s'"
-msgstr ""
-
-#: schema_migration.cc:339
-#, c-format
-msgid ""
-"NOTE: this upgrade cleared the roster cache\n"
-"you should now run '%s db regenerate_rosters'"
-msgstr ""
-
-#: schema_migration.cc:352
-#, c-format
msgid "database schema %s is unknown; cannot perform migration"
msgstr "ä¸æãªãã¼ã¿ãã¼ã¹ã¹ãã¼ã %s; çµ±åã§ãã¾ãã"
-#: schema_migration.cc:357
+#: schema_migration.cc:316
#, fuzzy, c-format
msgid "no migration performed; database schema already up-to-date at %s"
msgstr "çµ±åãã¾ãã; ãã¼ã¿ãã¼ã¹ã¹ãã¼ãã¯æ¢ã«ææ°ã«ãªã£ã¦ãã¾ã: %s\n"
-#: schema_migration.cc:916
+#: schema_migration.cc:866
#, c-format
msgid "public and private keys for %s don't match"
msgstr "%s ã®å
¬ééµã¨ç§å¯éµãä¸è´ãã¾ãã"
-#: schema_migration.cc:919
+#: schema_migration.cc:869
#, c-format
msgid "moving key '%s' from database to %s"
msgstr "éµ '%s' ããã¼ã¿ãã¼ã¹ãã %s ã«ç§»åãã¦ãã¾ã"
-#: std_hooks.lua:39
+#: std_hooks.lua:37
msgid "Press enter"
msgstr ""
-#: std_hooks.lua:41
+#: std_hooks.lua:39
msgid "Press enter when the subprocess has completed"
msgstr "ãµãããã»ã¹ãå®äºããã [Enter] ãæ¼ãã¦ä¸ãã"
-#: ui.cc:158
+#: ui.cc:126
#, c-format
msgid "%.1f G"
msgstr "%.1f G"
-#: ui.cc:164
+#: ui.cc:132
#, c-format
msgid "%.1f M"
msgstr "%.1f M"
-#: ui.cc:170
+#: ui.cc:138
#, c-format
msgid "%.1f k"
msgstr "%.1f k"
-#: ui.cc:183
+#: ui.cc:151
#, c-format
msgid "%d/%d"
msgstr "%d/%d"
-#: ui.cc:188
+#: ui.cc:156
#, c-format
msgid "%d"
msgstr "%d"
-#: ui.cc:466
+#: ui.cc:423
msgid "warning: "
msgstr ""
-#: ui.cc:477
-#, fuzzy, c-format
+#: ui.cc:432
+#, c-format
msgid ""
"fatal: %s\n"
"this is almost certainly a bug in monotone.\n"
"please send this error message, the output of '%s --full-version',\n"
-"and a description of what you were doing to %s."
+"and a description of what you were doing to %s.\n"
msgstr ""
"æ·±å»: %s\n"
"ããã¯ã»ã¼ç¢ºå®ã« monotone ã®ãã°ã§ãããã\n"
"ãã®ã¨ã©ã¼ã¡ãã»ã¼ã¸ã¨ '%s --full-version' ã®çµæ㨠%s ã«ã¤ãã¦\n"
"ä½ãããã説æãæ·»ãã¦å ±åãã¦ä¸ãã\n"
-#: ui.cc:581
+#: ui.cc:493
#, fuzzy, c-format
msgid "failed to open log file '%s'"
msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®è§£æã«å¤±æ"
@@ -3477,360 +3327,210 @@ msgstr "æ´æ°ãããã©ã³ãã決å®
msgid "cannot determine branch for update"
msgstr "æ´æ°ãããã©ã³ãã決å®ã§ãã¾ãã"
-#: vocab.cc:67
+#: vocab.cc:65
#, c-format
msgid "hex encoded ID '%s' size != %d"
msgstr "åå
é²ã¨ã³ã³ã¼ã ID '%s' ãµã¤ãº != %d"
-#: vocab.cc:71
+#: vocab.cc:69
#, c-format
msgid "bad character '%c' in id name '%s'"
msgstr "ä¸æ£ãªæå '%c' (ID å '%s' å
)"
-#: vocab.cc:81
+#: vocab.cc:82
#, c-format
msgid "bad character '%c' in ace string '%s'"
msgstr "ä¸æ£ãªæå '%c' (ace æåå '%s' å
)"
-#: vocab.cc:92
+#: vocab.cc:96
#, fuzzy, c-format
msgid "bad character '%c' in symbol '%s'"
msgstr "ä¸æ£ãªæå '%c' (ãã¼å '%s' å
)"
-#: vocab.cc:103
+#: vocab.cc:110
#, c-format
msgid "bad character '%c' in cert name '%s'"
msgstr "ä¸æ£ãªæå '%c' (証æ '%s' å
)"
-#: vocab.cc:113
+#: vocab.cc:123
#, c-format
msgid "bad character '%c' in key name '%s'"
msgstr "ä¸æ£ãªæå '%c' (ãã¼å '%s' å
)"
-#: vocab.cc:128
+#: vocab.cc:141
#, c-format
msgid "Invalid key length of %d bytes"
msgstr "ä¸æ£ãªéµé· %d ãã¤ã"
-#: vocab.cc:143
+#: vocab.cc:159
#, c-format
msgid "Invalid hmac length of %d bytes"
msgstr "ä¸æ£ãª HMAC é· %d ãã¤ã"
-#: work.cc:88 work_migration.cc:180 work_migration.cc:200
-#, fuzzy, c-format
-msgid "workspace is corrupt: reading %s: %s"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
-
-#: work.cc:150
-#, fuzzy, c-format
-msgid "base revision %s does not exist in database"
-msgstr "ãã¼ã¿ãã¼ã¹ã«åºæºãªãã¸ã§ã³ %s ã¯å«ã¾ãã¦ãã¾ãã\n"
-
-#: work.cc:284
+#: work.cc:178
#, c-format
-msgid "unrecognized key '%s' in options file %s - ignored"
-msgstr ""
-
-#: work.cc:291
-#, fuzzy, c-format
-msgid "Failed to read options file %s: %s"
-msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®è§£æã«å¤±æ"
-
-#: work.cc:339
-#, fuzzy, c-format
-msgid "Failed to write options file %s: %s"
-msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®æ¸ãè¾¼ã¿ã«å¤±æ"
-
-#: work.cc:539
-#, c-format
msgid "skipping ignorable file %s"
msgstr "ç¡è¦ã§ãããã¡ã¤ã« %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:548
+#: work.cc:187
#, c-format
msgid "skipping %s, already accounted for in workspace"
msgstr "æ¢ã«ã¯ã¼ã¯ã¹ãã¼ã¹ã§æ°ã«å
¥ãããã¦ãã %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:559
+#: work.cc:191
#, c-format
msgid "adding %s to workspace manifest"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãã« %s ã追å ãã¦ãã¾ã"
-#: work.cc:565
+#: work.cc:281
#, c-format
-msgid ""
-"cannot add %s, because %s is recorded as a file in the workspace manifest"
-msgstr ""
-
-#: work.cc:680
-#, c-format
-msgid "dropping %s"
-msgstr "%s ãç ´æ£ãã¦ãã¾ã"
-
-#: work.cc:691 work.cc:702
-#, c-format
-msgid "path %s already exists"
-msgstr "ãã¹ %s ã¯æ¢ã«ããã¾ã"
-
-#: work.cc:724 work.cc:751
-#, c-format
-msgid "adding %s"
-msgstr "%s ã追å ãã¦ãã¾ã"
-
-#: work.cc:740
-#, c-format
-msgid "path '%s' already exists, cannot create"
-msgstr "ãã¹ '%s' ã¯æ¢ã«ããã¾ãã®ã§ä½æã§ãã¾ãã"
-
-#: work.cc:747
-#, c-format
-msgid "renaming %s to %s"
-msgstr "%s ãã %s ã«å称å¤æ´ãã¦ãã¾ã"
-
-#: work.cc:782
-#, c-format
-msgid "file '%s' does not exist"
-msgstr "ãã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-
-#: work.cc:783
-#, c-format
-msgid "file '%s' is a directory"
-msgstr "ãã¡ã¤ã« '%s' ã¯ãã£ã¬ã¯ããªã§ã"
-
-#: work.cc:788
-#, c-format
-msgid "content of file '%s' has changed, not overwriting"
-msgstr "ãã¡ã¤ã« '%s' ã®å
容ã¯å¤æ´ããã¦ããã®ã§ä¸æ¸ããã¾ãã"
-
-#: work.cc:789
-#, fuzzy, c-format
-msgid "modifying %s"
-msgstr "%s ã追å ãã¦ãã¾ã"
-
-#: work.cc:974
-#, fuzzy, c-format
-msgid "missing %s"
-msgstr "%s ã追å ãã¦ãã¾ã"
-
-#: work.cc:980
-#, c-format
-msgid ""
-"%d missing files; use '%s ls missing' to view\n"
-"To restore consistency, on each missing file run either\n"
-" '%s drop FILE' to remove it permanently, or\n"
-" '%s revert FILE' to restore it.\n"
-"To handle all at once, simply use\n"
-" '%s drop --missing' or\n"
-" '%s revert --missing'"
-msgstr ""
-
-#: work.cc:1113
-#, c-format
msgid "skipping %s, not currently tracked"
msgstr "追跡ããã¦ããªã %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:1123
+#: work.cc:291
#, c-format
msgid "cannot remove %s/, it is not empty"
msgstr "空ã§ã¯ãªãã®ã§ %s/ ãåé¤ã§ãã¾ãã"
-#: work.cc:1134
+#: work.cc:302
#, c-format
msgid "dropping %s from workspace manifest"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ããã %s ãç ´æ£ãã¦ãã¾ã"
-#: work.cc:1187
+#: work.cc:365
#, c-format
msgid "destination dir %s/ does not exist in current revision"
msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã«ãã£ã¬ã¯ã㪠%s/ ã¯ããã¾ãã"
-#: work.cc:1190
+#: work.cc:368
#, c-format
msgid "destination %s is an existing file in current revision"
msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã« %s ã¯ããã¾ãã"
-#: work.cc:1200
+#: work.cc:378
#, c-format
msgid "empty path %s is not allowed"
msgstr "ãã¹ %s ã¯ç©ºã«ã§ãã¾ãã"
-#: work.cc:1214
-#, fuzzy, c-format
-msgid "%s does not exist in current manifest"
+#: work.cc:392
+#, c-format
+msgid "%s does not exist in current revision"
msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã« %s ã¯ããã¾ãã"
-#: work.cc:1217
-#, fuzzy, c-format
-msgid "destination %s already exists in current manifest"
+#: work.cc:395
+#, c-format
+msgid "destination %s already exists in current revision"
msgstr "%s ã¯æ¢ã«ç¾å¨ã®ãªãã¸ã§ã³ã«ããã¾ã"
-#: work.cc:1223
-#, fuzzy, c-format
-msgid "destination directory %s does not exist in current manifest"
-msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã«ãã£ã¬ã¯ã㪠%s/ ã¯ããã¾ãã"
-
-#: work.cc:1225
-#, fuzzy, c-format
-msgid "destination directory %s is not a directory"
-msgstr "ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-
-#: work.cc:1234
+#: work.cc:404
#, c-format
msgid "renaming %s to %s in workspace manifest"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãå
ã® %s ã %s ã«å¤æ´ãã¦ãã¾ã"
-#: work.cc:1262
+#: work.cc:429
#, c-format
msgid "%s doesn't exist in workspace, skipping"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã« %s ã¯ããã¾ããã®ã§ãã¹ããããã¾ã"
-#: work.cc:1266
+#: work.cc:433
#, c-format
msgid "destination %s already exists in workspace, skipping"
msgstr "ãªãã¸ã§ã³ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ãã®ã§ãã¹ããããã¾ã"
-#: work.cc:1296
+#: work.cc:460
#, c-format
msgid "proposed new root directory '%s' is not versioned or does not exist"
msgstr ""
"ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã¼ã¸ã§ã³ä»ãããã¦ããªãããåå¨"
"ãã¾ãã"
-#: work.cc:1298
+#: work.cc:462
#, c-format
msgid "proposed new root directory '%s' is not a directory"
msgstr "ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-#: work.cc:1303
+#: work.cc:467
#, c-format
msgid "proposed new root directory '%s' contains illegal path %s"
msgstr ""
"ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã«ã¯ä¸æ£ãªãã¹ %s ãå«ã¾ãã¦ãã¾ã"
-#: work.cc:1313
+#: work.cc:477
#, c-format
msgid "directory '%s' is not versioned or does not exist"
msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯ãã¼ã¸ã§ã³ä»ãããã¦ããªãããåå¨ãã¾ãã"
-#: work.cc:1319
+#: work.cc:483
#, c-format
msgid "'%s' is in the way"
msgstr "'%s' ãéªéã«ãªã£ã¦ãã¾ã"
-#: work_migration.cc:62
-#, fuzzy, c-format
-msgid "workspace required but not found"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ãå¿
è¦ã§ããã¿ã¤ããã¾ããã§ãã%s%s"
-
-#: work_migration.cc:71
+#: work.cc:578
#, c-format
-msgid "_MTN/format should not exist in a format 1 workspace; corrected"
-msgstr ""
+msgid "workspace is corrupt: %s does not exist"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
-#: work_migration.cc:108
+#: work.cc:579
#, c-format
-msgid ""
-"this workspace's metadata is in format 0. to use this workspace\n"
-"with this version of monotone, you must delete it and check it\n"
-"out again (migration from format 0 is not possible).\n"
-"once you have done this, you will not be able to use the workspace\n"
-"with versions of monotone older than %s.\n"
-"we apologize for the inconvenience."
-msgstr ""
+msgid "workspace is corrupt: %s is a directory"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
-#: work_migration.cc:117
+#: work.cc:589
#, c-format
-msgid ""
-"to use this workspace with this version of monotone, its metadata\n"
-"must be migrated from format %d to format %d, using the command\n"
-"'%s migrate_workspace'.\n"
-"once you have done this, you will not be able to use the workspace\n"
-"with versions of monotone older than %s."
-msgstr ""
+msgid "Problem with workspace: %s is unreadable"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã«åé¡ãããã¾ã: %s ãèªã¿è¾¼ãã¾ãã"
-#: work_migration.cc:127 work_migration.cc:255
-#, c-format
-msgid ""
-"this version of monotone only understands workspace metadata\n"
-"in formats 0 through %d. your workspace is in format %d.\n"
-"you need a newer version of monotone to use this workspace."
-msgstr ""
-
-#: work_migration.cc:156
-#, c-format
-msgid ""
-"it is not possible to migrate from workspace format 0 to any\n"
-"later format. you must delete this workspace and check it out\n"
-"again. we apologize for the inconvenience."
-msgstr ""
-
-#: work_migration.cc:208
+#: work.cc:615
#, fuzzy, c-format
-msgid "workspace is corrupt: %s exists but is not a regular file"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
+msgid "base revision %s does not exist in database"
+msgstr "ãã¼ã¿ãã¼ã¹ã«åºæºãªãã¸ã§ã³ %s ã¯å«ã¾ãã¦ãã¾ãã\n"
-#: work_migration.cc:247
+#: work.cc:924
#, c-format
-msgid "this workspace is in the current format, no migration is necessary."
-msgstr ""
+msgid "dropping %s"
+msgstr "%s ãç ´æ£ãã¦ãã¾ã"
-#~ msgid "[DIRECTORY]\n"
-#~ msgstr "[DIRECTORY]\n"
+#: work.cc:935 work.cc:946
+#, c-format
+msgid "path %s already exists"
+msgstr "ãã¹ %s ã¯æ¢ã«ããã¾ã"
-#~ msgid "need --branch argument for branch-based checkout"
-#~ msgstr "ãã©ã³ããåºæºã«ãããã§ãã¯ã¢ã¦ãã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
+#: work.cc:968 work.cc:995
+#, c-format
+msgid "adding %s"
+msgstr "%s ã追å ãã¦ãã¾ã"
-#, fuzzy
-#~ msgid "roster %s is not parseable (perhaps with unnormalized paths?)"
-#~ msgstr "åç°¿ %s ã解æã§ãã¾ãã (ãã¹ãæ£è¦åããã¦ããªãã®ã§ã¯?)\n"
+#: work.cc:984
+#, c-format
+msgid "path '%s' already exists, cannot create"
+msgstr "ãã¹ '%s' ã¯æ¢ã«ããã¾ãã®ã§ä½æã§ãã¾ãã"
-#, fuzzy
-#~ msgid "roster %s is not in normalized form"
-#~ msgstr "åç°¿ %s ã¯æ£è¦åãããå½¢å¼ã«ãªã£ã¦ãã¾ãã\n"
+#: work.cc:991
+#, c-format
+msgid "renaming %s to %s"
+msgstr "%s ãã %s ã«å称å¤æ´ãã¦ãã¾ã"
-#, fuzzy
-#~ msgid "revision %s incomplete (missing roster link)"
-#~ msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ã®ãªã³ã¯ãããã¾ãã)\n"
+#: work.cc:1026
+#, c-format
+msgid "file '%s' does not exist"
+msgstr "ãã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-#, fuzzy
-#~ msgid "%d rosters not parseable (perhaps with invalid paths)"
-#~ msgstr "解æã§ããªãåç°¿ (ãã¹ãä¸é©åãªã®ã§ã¯?): %d\n"
+#: work.cc:1027
+#, c-format
+msgid "file '%s' is a directory"
+msgstr "ãã¡ã¤ã« '%s' ã¯ãã£ã¬ã¯ããªã§ã"
-#, fuzzy
-#~ msgid "%d rosters not in normalized form"
-#~ msgstr "æ£è¦åãããå½¢å¼ã«ãªã£ã¦ããªãåç°¿: %d\n"
+#: work.cc:1032
+#, c-format
+msgid "content of file '%s' has changed, not overwriting"
+msgstr "ãã¡ã¤ã« '%s' ã®å
容ã¯å¤æ´ããã¦ããã®ã§ä¸æ¸ããã¾ãã"
-#, fuzzy
-#~ msgid "%d unreferenced roster links"
-#~ msgstr "åç
§ããã¦ããªãåç°¿ãªã³ã¯: %d\n"
+#: work.cc:1033
+#, fuzzy, c-format
+msgid "modifying %s"
+msgstr "%s ã追å ãã¦ãã¾ã"
-#~ msgid "interrupted"
-#~ msgstr "å²è¾¼ã¿"
-
-#~ msgid "terminated by signal"
-#~ msgstr "ã·ã°ãã«ã§çµäº"
-
-#~ msgid "problem parsing arguments from file %s: %s"
-#~ msgstr "ãã¡ã¤ã« %s ããã®å¼æ°ã解æä¸ã«åé¡çºç: %s"
-
-#~ msgid "weird error when stuffing arguments read from %s: %s\n"
-#~ msgstr "%s ããå¼æ°ãèªã¿åãä¸ã«äºæãã¬ã¨ã©ã¼çºç: %s\n"
-
-#~ msgid "syntax error near the \"%s\" option: %s"
-#~ msgstr "\"%s\" ãªãã·ã§ã³ã®è¿ãã«æ§æã¨ã©ã¼: %s"
-
#, fuzzy
-#~ msgid "%s %s doesn't use the option %s"
-#~ msgstr "monotone %s ã«ã¯ãªãã·ã§ã³ %s ã¯ä½¿ãã¾ãã"
-
-#~ msgid "workspace is corrupt: %s is a directory"
-#~ msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
-
-#~ msgid "Problem with workspace: %s is unreadable"
-#~ msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã«åé¡ãããã¾ã: %s ãèªã¿è¾¼ãã¾ãã"
-
-#, fuzzy
#~ msgid "starting with revision 1 / %d"
#~ msgstr "ãªãã¸ã§ã³ 1 / %d ã«ã¤ãã¦ä½æ¥éå§\n"
============================================================
--- po/pt_BR.po a415e5684da84f68e42fe4e0d83883785f5eafb0
+++ po/pt_BR.po 93faea1bf7b31258690772da4f60a49982c5b81c
@@ -7,7 +7,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: Monotone 0.29\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-13 10:22-0500\n"
+"POT-Creation-Date: 2006-09-19 09:14-0300\n"
"PO-Revision-Date: 2006-10-05 14:21-0300\n"
"Last-Translator: Alex Sandro Queiroz e Silva \n"
"Language-Team: Alex Sandro Queiroz e Silva \n"
@@ -37,8 +37,8 @@ msgstr "raiz de procura '%s' não existe
msgstr "raiz de procura '%s' não existe"
#: app_state.cc:246
-#, fuzzy, c-format
-msgid "search root '%s' is not a directory"
+#, c-format
+msgid "search root '%s' is not a directory\n"
msgstr "raiz de procura '%s' não é um diretório\n"
#: app_state.cc:280
@@ -47,91 +47,91 @@ msgstr "erro lendo string de data '%s':
msgstr "erro lendo string de data '%s': %s"
#: app_state.cc:295
-#, fuzzy, c-format
-msgid "negative depth not allowed"
+#, c-format
+msgid "negative depth not allowed\n"
msgstr "profundidade negativa não permitida\n"
#: app_state.cc:303
-#, fuzzy, c-format
-msgid "illegal argument to --last: cannot be zero or negative"
+#, c-format
+msgid "illegal argument to --last: cannot be zero or negative\n"
msgstr "argumento ilegal para --last: não pode ser zero ou negativo\n"
#: app_state.cc:311
-#, fuzzy, c-format
-msgid "illegal argument to --next: cannot be zero or negative"
+#, c-format
+msgid "illegal argument to --next: cannot be zero or negative\n"
msgstr "argumento ilegal para --next: não pode ser zero ou negativo\n"
#: app_state.cc:388
-#, fuzzy, c-format
-msgid "illegal argument to --automate-stdio-size: cannot be zero or negative"
+#, c-format
+msgid "illegal argument to --automate-stdio-size: cannot be zero or negative\n"
msgstr ""
"argumento ilegal para --automate-stdio-size: não pode ser\n"
"zero ou negativo\n"
-#: automate.cc:64
+#: automate.cc:65
msgid "[BRANCH]"
msgstr "[RAMO]"
-#: automate.cc:88 automate.cc:135 automate.cc:1206
+#: automate.cc:89 automate.cc:136 automate.cc:1202
msgid "REV1 [REV2 [REV3 [...]]]"
msgstr "VER1 [VER2 [VER3 [...]]]"
-#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
-#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452
-#: automate.cc:1216 cmd_list.cc:661
+#: automate.cc:99 automate.cc:146 automate.cc:190 automate.cc:331
+#: automate.cc:366 automate.cc:370 automate.cc:429 automate.cc:453
+#: automate.cc:1212 cmd_list.cc:661
#, c-format
msgid "No such revision %s"
msgstr "versão '%s' não existe"
-#: automate.cc:183 automate.cc:324
+#: automate.cc:184 automate.cc:325
msgid "[REV1 [REV2 [REV3 [...]]]]"
msgstr "[VER1 [VER2 [VER3 [...]]]]"
-#: automate.cc:215
+#: automate.cc:216
msgid "FILE"
msgstr "ARQUIVO"
-#: automate.cc:235
+#: automate.cc:236
#, c-format
msgid "file %s is unknown to the current workspace"
msgstr "arquivo '%s' é desconhecido para a área de trabalho atual"
-#: automate.cc:356
+#: automate.cc:357
msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
msgstr "VERSÃO_NOVA [VERSÃO_VELHA1 [VERSÃO_VELHA2 [...]]]"
-#: automate.cc:423 automate.cc:447 cmd_list.cc:651
+#: automate.cc:424 automate.cc:448 cmd_list.cc:651
msgid "REV"
msgstr "VERSÃO"
-#: automate.cc:524
+#: automate.cc:525
msgid "SELECTOR"
msgstr "SELETOR"
-#: automate.cc:893 automate.cc:1023
+#: automate.cc:889 automate.cc:1019
msgid "[REVID]"
msgstr "[VERSÃO]"
-#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588
-#: automate.cc:1593
+#: automate.cc:918 automate.cc:1041 automate.cc:1525 automate.cc:1584
+#: automate.cc:1589
#, c-format
msgid "no revision %s found in database"
msgstr "nenhuma versão %s encontrada no banco de dados"
-#: automate.cc:1066 automate.cc:1145
+#: automate.cc:1062 automate.cc:1141
msgid "FILEID"
msgstr "ID-ARQUIVO"
-#: automate.cc:1073
+#: automate.cc:1069
#, c-format
msgid "no file version %s found in database"
msgstr "nenhuma versão %s do arquivo achada no banco de dados"
-#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845
+#: automate.cc:1088 automate.cc:1114 cmd_merging.cc:845
msgid "REVID"
msgstr "VERSÃO"
-#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186
+#: automate.cc:1099 automate.cc:1125 automate.cc:1180 automate.cc:1182
#: cmd_db.cc:35 cmd_diff_log.cc:385 cmd_diff_log.cc:416 cmd_diff_log.cc:418
#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677
#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:461 commands.cc:388
@@ -139,57 +139,57 @@ msgstr "versão '%s' não existe"
msgid "no such revision '%s'"
msgstr "versão '%s' não existe"
-#: automate.cc:1156
+#: automate.cc:1152
#, c-format
msgid "no such file '%s'"
msgstr "arquivo '%s' não existe"
-#: automate.cc:1172
+#: automate.cc:1168
msgid "OLD_FILE NEW_FILE"
msgstr "ARQUIVO_VELHO NOVO_ARQUIVO"
-#: automate.cc:1317
+#: automate.cc:1313
msgid "[BRANCH_PATTERN]"
msgstr "[PADRÃO_DO_RAMOS]"
-#: automate.cc:1413
+#: automate.cc:1409
msgid "KEYID PASSPHRASE"
msgstr "CHAVE FRASE-CHAVE"
-#: automate.cc:1431 cmd_key_cert.cc:41
+#: automate.cc:1427 cmd_key_cert.cc:41
#, c-format
msgid "key '%s' already exists"
msgstr "chave '%s' já existe"
-#: automate.cc:1434 cmd_key_cert.cc:44
+#: automate.cc:1430 cmd_key_cert.cc:44
#, c-format
msgid "generating key-pair '%s'"
msgstr "gerando par de chaves '%s'"
-#: automate.cc:1436 cmd_key_cert.cc:46
+#: automate.cc:1432 cmd_key_cert.cc:46
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "salvando par de chaves '%s' em %s/"
-#: automate.cc:1472
+#: automate.cc:1468
msgid "OPTION"
msgstr "OPÃÃO"
-#: automate.cc:1495
+#: automate.cc:1491
#, c-format
msgid "'%s' is not a recognized workspace option"
msgstr "'%s' não é uma opção conhecida para área de trabalho"
-#: automate.cc:1518
+#: automate.cc:1514
msgid "REV FILE"
msgstr "VERSÃO ARQUIVO"
-#: automate.cc:1535 automate.cc:1599
+#: automate.cc:1531 automate.cc:1595
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "arquivo %s é desconhecido para a versão %s"
-#: automate.cc:1578
+#: automate.cc:1574
msgid "REV1 FILE REV2"
msgstr "VER1 ARQUIVO VER2"
@@ -273,26 +273,21 @@ msgstr ""
"vários certificados de ramo encontrados para a versão %s, por favor forneça "
"o nome de um ramo"
-#: cmd_automate.cc:157 cmd_automate.cc:226
+#: cmd_automate.cc:206
#, c-format
-msgid "Bad input to automate stdio"
-msgstr "Entrada inválida para automate stdio"
-
-#: cmd_automate.cc:176
-#, c-format
msgid "read from client failed with error code: %d"
msgstr "leitura do cliente falhou com código de erro: %d"
-#: cmd_automate.cc:177
-#, fuzzy, c-format
-msgid "Bad input to automate stdio (unexpected EOF)"
+#: cmd_automate.cc:249
+#, c-format
+msgid "Bad input to automate stdio"
msgstr "Entrada inválida para automate stdio"
-#: cmd_automate.cc:459
+#: cmd_automate.cc:303
msgid "automation"
msgstr "automação"
-#: cmd_automate.cc:460
+#: cmd_automate.cc:304
msgid "automation interface"
msgstr "interface de automação"
@@ -551,8 +546,8 @@ msgstr "id parcial '%s' não tem uma exp
msgstr "id parcial '%s' não tem uma expansão"
#: cmd.hh:121
-#, fuzzy, c-format
-msgid "partial id '%s' has multiple ambiguous expansions:"
+#, c-format
+msgid "partial id '%s' has multiple ambiguous expansions:\n"
msgstr "id parcial '%s' tem múltiplas expansões possÃveis:\n"
#: cmd.hh:129
@@ -642,13 +637,13 @@ msgstr ""
"baseado nos parâmetros atuais"
#: cmd_key_cert.cc:182
-#, fuzzy, c-format
+#, c-format
msgid ""
"if a cert on: %s\n"
"with key: %s\n"
"and value: %s\n"
"was signed by: %s\n"
-"it would be: %s"
+"it would be: %s\n"
msgstr ""
"se um certificado sobre: %s\n"
"com chave: %s\n"
@@ -664,54 +659,54 @@ msgstr "NÃO-confiável"
msgid "UNtrusted"
msgstr "NÃO-confiável"
-#: cmd_key_cert.cc:195 cmd_key_cert.cc:208 cmd_key_cert.cc:221
-#: cmd_key_cert.cc:237 cmd_ws_commit.cc:189
+#: cmd_key_cert.cc:194 cmd_key_cert.cc:207 cmd_key_cert.cc:220
+#: cmd_key_cert.cc:236 cmd_ws_commit.cc:189
msgid "review"
msgstr "revisão"
-#: cmd_key_cert.cc:195
+#: cmd_key_cert.cc:194
msgid "REVISION TAGNAME"
msgstr "VERSÃO ETIQUETA"
-#: cmd_key_cert.cc:196
+#: cmd_key_cert.cc:195
msgid "put a symbolic tag cert on a revision"
msgstr "põe um certificado de etiqueta simbólica em uma versão"
-#: cmd_key_cert.cc:208
+#: cmd_key_cert.cc:207
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr "ID (pass|fail|true|false|yes|no|1|0)"
-#: cmd_key_cert.cc:209
+#: cmd_key_cert.cc:208
msgid "note the results of running a test on a revision"
msgstr "anota os resultados de executar um teste sobre uma versão"
-#: cmd_key_cert.cc:221 cmd_ws_commit.cc:189
+#: cmd_key_cert.cc:220 cmd_ws_commit.cc:189
msgid "REVISION"
msgstr "VERSÃO"
-#: cmd_key_cert.cc:222
+#: cmd_key_cert.cc:221
msgid "approve of a particular revision"
msgstr "aprova a versão especificada"
-#: cmd_key_cert.cc:233
+#: cmd_key_cert.cc:232
#, c-format
msgid "need --branch argument for approval"
msgstr "argumento --branch necessário para aprovação"
-#: cmd_key_cert.cc:237
+#: cmd_key_cert.cc:236
msgid "REVISION [COMMENT]"
msgstr "VERSÃO [COMENTÃRIO]"
-#: cmd_key_cert.cc:238
+#: cmd_key_cert.cc:237
msgid "comment on a particular revision"
msgstr "comenta a versão especificada"
-#: cmd_key_cert.cc:250
+#: cmd_key_cert.cc:249
#, c-format
msgid "edit comment failed"
msgstr "edição de comentário falhou"
-#: cmd_key_cert.cc:255
+#: cmd_key_cert.cc:254
#, c-format
msgid "empty comment"
msgstr "comentário vazio"
@@ -924,8 +919,8 @@ msgstr "[combinado] %s"
msgstr "[combinado] %s"
#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588
-#: cmd_merging.cc:821 cmd_ws_commit.cc:421 cmd_ws_commit.cc:907
-#: cmd_ws_commit.cc:930 cmd_ws_commit.cc:944
+#: cmd_merging.cc:821 cmd_ws_commit.cc:421 cmd_ws_commit.cc:901
+#: cmd_ws_commit.cc:924 cmd_ws_commit.cc:938
msgid "tree"
msgstr "árvore"
@@ -1172,88 +1167,88 @@ msgstr "exibe conteúdo do roster associ
msgid "dump the roster associated with the given REVID"
msgstr "exibe conteúdo do roster associado com VERSÃO"
-#: cmd_netsync.cc:42
+#: cmd_netsync.cc:40
#, c-format
msgid "setting default server to %s"
msgstr "configurando servidor padrão para %s"
-#: cmd_netsync.cc:48
+#: cmd_netsync.cc:46
#, c-format
msgid "no hostname given"
msgstr "nenhum nome de host dado"
-#: cmd_netsync.cc:50
+#: cmd_netsync.cc:48
#, c-format
msgid "no server given and no default server set"
msgstr "nenhum servidor dado e nenhum servidor padrão configurado"
-#: cmd_netsync.cc:78 cmd_netsync.cc:98
+#: cmd_netsync.cc:59 cmd_netsync.cc:79
#, c-format
msgid "no branch pattern given"
msgstr "nenhum padrão de ramos dado"
-#: cmd_netsync.cc:86
+#: cmd_netsync.cc:67
#, c-format
msgid "setting default branch include pattern to '%s'"
msgstr "configurando padrão de inclusão de ramos para '%s'"
-#: cmd_netsync.cc:92
+#: cmd_netsync.cc:73
#, c-format
msgid "setting default branch exclude pattern to '%s'"
msgstr "configurando padrão de exclusão de ramos para '%s'"
-#: cmd_netsync.cc:100
+#: cmd_netsync.cc:81
#, c-format
msgid "no branch pattern given and no default pattern set"
msgstr "nenhum padrão de ramo dado e nenhum configurado"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144 cmd_netsync.cc:188
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173
msgid "network"
msgstr "rede"
-#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126
msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
msgstr "[ENDEREÃO[:PORTA] [PADRÃO]]"
-#: cmd_netsync.cc:117
+#: cmd_netsync.cc:98
msgid "push branches matching PATTERN to netsync server at ADDRESS"
msgstr "envia ramos que combinam com PADRÃO para servidor netsync em ENDEREÃO"
-#: cmd_netsync.cc:130
+#: cmd_netsync.cc:113
msgid "pull branches matching PATTERN from netsync server at ADDRESS"
msgstr "recebe ramos que combinam com PADRÃO do servidor netsync em ENDEREÃO"
-#: cmd_netsync.cc:138
+#: cmd_netsync.cc:120
#, c-format
msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
msgstr ""
"recebendo dados anonimamente; use -kNOMEDACHAVE se for necessária "
"autenticação"
-#: cmd_netsync.cc:145
+#: cmd_netsync.cc:127
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
msgstr ""
"sincroniza ramos que combinam com PADRÃO com o servidor netsync em ENDEREÃO"
-#: cmd_netsync.cc:164
+#: cmd_netsync.cc:149
#, c-format
msgid "pid file '%s' already exists"
msgstr "arquivo pid '%s' já existe"
-#: cmd_netsync.cc:166
+#: cmd_netsync.cc:151
#, c-format
msgid "failed to create pid file '%s'"
msgstr "erro criando arquivo de PID '%s'"
-#: cmd_netsync.cc:188
+#: cmd_netsync.cc:173
msgid "PATTERN ..."
msgstr "PADRÃO..."
-#: cmd_netsync.cc:189
+#: cmd_netsync.cc:174
msgid "serve the branches specified by PATTERNs to connecting clients"
msgstr "serve os ramos especificados por PADRÃO para clientes"
-#: cmd_netsync.cc:205
+#: cmd_netsync.cc:190
#, c-format
msgid ""
"need permission to store persistent passphrase (see hook persist_phrase_ok())"
@@ -1261,7 +1256,7 @@ msgstr ""
"é necessária permissão para salvar frase-passe persistentemente (veja gancho "
"persist_phrase_ok())"
-#: cmd_netsync.cc:211
+#: cmd_netsync.cc:196
#, c-format
msgid ""
"The --no-transport-auth option is only permitted in combination with --stdio"
@@ -1389,8 +1384,8 @@ msgstr "desaprova a versão especificada
msgstr "desaprova a versão especificada"
#: cmd_ws_commit.cc:203
-#, fuzzy, c-format
-msgid "revision %s has %d changesets, cannot invert"
+#, c-format
+msgid "revision '%s' has %d changesets, cannot invert\n"
msgstr "versão '%s' tem %d mudanças, não é possÃvel inverter\n"
#: cmd_ws_commit.cc:207
@@ -1479,9 +1474,9 @@ msgstr " %s foi modificado"
msgid " patched %s"
msgstr " %s foi modificado"
-#: cmd_ws_commit.cc:421 cmd_ws_commit.cc:907 cmd_ws_commit.cc:930
-msgid "[DIRECTORY]"
-msgstr "[DIRETÃRIO]"
+#: cmd_ws_commit.cc:421
+msgid "[DIRECTORY]\n"
+msgstr "[DIRETÃRIO]\n"
#: cmd_ws_commit.cc:422
msgid ""
@@ -1556,8 +1551,8 @@ msgstr "caminho desconhecido '%s'"
msgstr "caminho desconhecido '%s'"
#: cmd_ws_commit.cc:608
-#, fuzzy, c-format
-msgid "Path '%s' does not have attribute '%s'"
+#, c-format
+msgid "Path '%s' does not have attribute '%s'\n"
msgstr "caminho '%s' não tem atributo '%s'\n"
#: cmd_ws_commit.cc:638
@@ -1579,12 +1574,12 @@ msgstr "nenhuma mudança para gravar"
msgid "no changes to commit"
msgstr "nenhuma mudança para gravar"
-#: cmd_ws_commit.cc:713
+#: cmd_ws_commit.cc:707
#, c-format
msgid "beginning commit on branch '%s'"
msgstr "iniciando gravação do ramo '%s'"
-#: cmd_ws_commit.cc:722
+#: cmd_ws_commit.cc:716
#, c-format
msgid ""
"_MTN/log is non-empty and log message was specified on command line\n"
@@ -1596,37 +1591,37 @@ msgstr ""
"considere mover ou apagar _MTN/log,\n"
"ou remova --message/--message-from-file da linha de comando"
-#: cmd_ws_commit.cc:737
+#: cmd_ws_commit.cc:731
#, c-format
msgid "empty log message; commit canceled"
msgstr "entrada no registro vazia, gravação cancelada"
-#: cmd_ws_commit.cc:759
+#: cmd_ws_commit.cc:753
#, c-format
msgid "log message rejected by hook: %s"
msgstr "entrada no registro rejeitada pelo hook: %s"
-#: cmd_ws_commit.cc:767
+#: cmd_ws_commit.cc:761
#, c-format
msgid "revision %s already in database"
msgstr "versão %s já está no banco de dados"
-#: cmd_ws_commit.cc:806 cmd_ws_commit.cc:836
+#: cmd_ws_commit.cc:800 cmd_ws_commit.cc:830
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "arquivo '%s' modificado durante gravação, abortando"
-#: cmd_ws_commit.cc:818
+#: cmd_ws_commit.cc:812
#, c-format
msgid "Your database is missing version %s of file '%s'"
msgstr "O seu banco de dados não tem a versão %s do arquivo '%s'"
-#: cmd_ws_commit.cc:868
+#: cmd_ws_commit.cc:862
#, c-format
msgid "committed revision %s"
msgstr "versão %s gravada"
-#: cmd_ws_commit.cc:874
+#: cmd_ws_commit.cc:868
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1635,16 +1630,20 @@ msgstr ""
"nota: esta versão cria divergência\n"
"nota: talvez você queira executar '%s merge'"
-#: cmd_ws_commit.cc:908
+#: cmd_ws_commit.cc:901 cmd_ws_commit.cc:924
+msgid "[DIRECTORY]"
+msgstr "[DIRETÃRIO]"
+
+#: cmd_ws_commit.cc:902
msgid "setup a new workspace directory, default to current"
msgstr "configura um novo diretório como área de trabalho, o padrão é o atual"
-#: cmd_ws_commit.cc:914
+#: cmd_ws_commit.cc:908
#, c-format
msgid "need --branch argument for setup"
msgstr "argumento --branch é necessário para configuração"
-#: cmd_ws_commit.cc:931
+#: cmd_ws_commit.cc:925
msgid ""
"migrate a workspace directory's metadata to the latest format; defaults to "
"the current workspace"
@@ -1652,7 +1651,7 @@ msgstr ""
"migra os metadados de uma área de trabalho para o último formato; a área de "
"trabalho atual é usada por omissão"
-#: cmd_ws_commit.cc:944
+#: cmd_ws_commit.cc:938
msgid "refresh the inodeprint cache"
msgstr "atualiza o cache de inodeprint"
@@ -1662,8 +1661,8 @@ msgstr "comando desconhecido '%s'"
msgstr "comando desconhecido '%s'"
#: commands.cc:142
-#, fuzzy, c-format
-msgid "command '%s' has multiple ambiguous expansions:"
+#, c-format
+msgid "command '%s' has multiple ambiguous expansions:\n"
msgstr "comando '%s' tem várias expansões possÃveis:\n"
#: commands.cc:175
@@ -1694,8 +1693,8 @@ msgstr "expandido para '%s'"
msgstr "expandido para '%s'"
#: commands.cc:426
-#, fuzzy, c-format
-msgid "selection '%s' has multiple ambiguous expansions:"
+#, c-format
+msgid "selection '%s' has multiple ambiguous expansions: \n"
msgstr "seleção '%s' tem múltiplas expansões possÃveis: \n"
#: commands.cc:443
@@ -2084,7 +2083,7 @@ msgstr "erro criando %s; já existe"
msgstr "erro criando %s; já existe"
#: database.cc:575
-#, fuzzy, c-format
+#, c-format
msgid ""
"schema version : %s\n"
"counts:\n"
@@ -2107,7 +2106,7 @@ msgid ""
" total : %u\n"
"database:\n"
" page size : %u\n"
-" cache size : %u"
+" cache size : %u\n"
msgstr ""
"versão do esquema : %s\n"
"contagens:\n"
@@ -2132,52 +2131,52 @@ msgstr ""
" tamanho da página: %u\n"
" tamanho do cache : %u\n"
-#: database.cc:638
+#: database.cc:637
#, c-format
msgid "database schema version: %s"
msgstr "versão do esquema do banco de dados: %s"
-#: database.cc:715
-#, fuzzy, c-format
-msgid "multiple statements in query: %s"
+#: database.cc:714
+#, c-format
+msgid "multiple statements in query: %s\n"
msgstr "múltiplos comandos na consulta: %s\n"
-#: database.cc:721
+#: database.cc:720
#, c-format
msgid "wanted %d columns got %d in query: %s"
msgstr "%d colunas pedidas, %d colunas obtidas da consulta: %s"
-#: database.cc:787
+#: database.cc:786
#, c-format
msgid "null result in query: %s"
msgstr "resultado vazio da consulta: %s"
-#: database.cc:805
+#: database.cc:804
#, c-format
msgid "wanted %d rows got %d in query: %s"
msgstr "%d linhas pedidas, %d linhas obtidas da consulta: %s"
-#: database.cc:1952
+#: database.cc:1951
#, c-format
msgid "another key with name '%s' already exists"
msgstr "outra chave com nome '%s' já existe"
-#: database.cc:2949
+#: database.cc:2948
#, c-format
msgid "no database specified"
msgstr "nenhum banco de dados especificado"
-#: database.cc:2957
+#: database.cc:2956
#, c-format
msgid "database %s does not exist"
msgstr "banco de dados %s não existe"
-#: database.cc:2958
+#: database.cc:2957
#, c-format
msgid "%s is a directory, not a database"
msgstr "%s é um diretório, não um banco de dados"
-#: database.cc:2983
+#: database.cc:2982
#, c-format
msgid "could not open database '%s': %s"
msgstr "erro abrindo banco de dados '%s': %s"
@@ -2198,13 +2197,13 @@ msgstr "arquivo %s na área de trabalho
msgstr "arquivo %s na área de trabalho tem id %s, pedido %s"
#: diff_patch.cc:744
-#, fuzzy, c-format
+#, c-format
msgid ""
"help required for 3-way merge\n"
"[ancestor] %s\n"
"[ left] %s\n"
"[ right] %s\n"
-"[ merged] %s"
+"[ merged] %s\n"
msgstr ""
"ajuda necessária para combinação 3 caminhos\n"
"[ancestral] %s\n"
@@ -2420,8 +2419,8 @@ msgstr "resolva os conflitos que não sÃ
msgstr "resolva os conflitos que não são de conteúdo e tente de novo"
#: merge.cc:124
-#, fuzzy, c-format
-msgid "merge failed due to unresolved conflicts"
+#, c-format
+msgid "merge failed due to unresolved conflicts\n"
msgstr "a combinação falhou devido a conflitos não resolvidos\n"
#: merkle_tree.cc:290
@@ -2434,17 +2433,27 @@ msgstr "valor do hash do nó %s errado,
msgid "mismatched node hash value %s, expected %s"
msgstr "valor do hash do nó %s errado, %s esperado"
-#: monotone.cc:154
+#: monotone.cc:153
#, c-format
msgid "Invalid escape in --xargs file"
msgstr "Código de escape inválido em arquivo passado a --xargs"
-#: monotone.cc:686
+#: monotone.cc:665
#, c-format
+msgid "%s:\n"
+msgstr "%s:\n"
+
+#: monotone.cc:673
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: monotone.cc:683
+#, c-format
msgid "Usage: %s [OPTION...] command [ARG...]"
msgstr "Uso: %s [OPÃÃO...] comando [ARG...]"
-#: monotone.cc:694
+#: monotone.cc:691
#, c-format
msgid "Options specific to '%s %s':"
msgstr "Opções especÃficas para '%s %s':"
@@ -2504,10 +2513,10 @@ msgstr "conteúdo do pacote com um taman
msgstr "conteúdo do pacote com um tamanho maior de '%d' bytes"
#: netcmd.cc:176
-#, fuzzy, c-format
+#, c-format
msgid ""
"bad HMAC checksum (got %s, wanted %s)\n"
-"this suggests data was corrupted in transit"
+"this suggests data was corrupted in transit\n"
msgstr ""
"verificação HMAC errada (obti %s, queria %s)\n"
"isto sugere que dados foram corrompidos em trânsito\n"
@@ -2612,11 +2621,11 @@ msgstr "a chave do servidor mudou"
msgstr "a chave do servidor mudou"
#: netsync.cc:1251
-#, fuzzy, c-format
+#, c-format
msgid ""
"first time connecting to server %s\n"
"I'll assume it's really them, but you might want to double-check\n"
-"their key's fingerprint: %s"
+"their key's fingerprint: %s\n"
msgstr ""
"primeira vez conectando ao servidor %s\n"
"vou supor que é mesmo ele, mas você pode querer verificar\n"
@@ -2774,8 +2783,8 @@ msgstr "saÃda"
msgstr "saÃda"
#: netsync.cc:2226
-#, fuzzy, c-format
-msgid "input buffer for peer %s is overfull after netcmd dispatch"
+#, c-format
+msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
msgstr ""
"buffer de entrada do par %s está cheio após despacho de\n"
"comando de rede\n"
@@ -2796,13 +2805,13 @@ msgstr "conectando a %s"
msgstr "conectando a %s"
#: netsync.cc:2352
-#, fuzzy, c-format
-msgid "timed out waiting for I/O with peer %s, disconnecting"
+#, c-format
+msgid "timed out waiting for I/O with peer %s, disconnecting\n"
msgstr "tempo expirou esperando por E/S com par %s, desconectando\n"
#: netsync.cc:2375
-#, fuzzy, c-format
-msgid "processing failure while talking to peer %s, disconnecting"
+#, c-format
+msgid "processing failure while talking to peer %s, disconnecting\n"
msgstr "erro de processamento durante comunicação com par %s, desconectando\n"
#: netsync.cc:2392
@@ -2816,8 +2825,8 @@ msgstr "par %s desconectou após nós o
msgstr "par %s desconectou após nós o termos informado de um erro"
#: netsync.cc:2403
-#, fuzzy, c-format
-msgid "I/O failure while talking to peer %s, disconnecting"
+#, c-format
+msgid "I/O failure while talking to peer %s, disconnecting\n"
msgstr "erro de E/S comunicando com par %s, desconectando\n"
#: netsync.cc:2469
@@ -2843,9 +2852,9 @@ msgstr "leitura do par %s falhou no esta
msgstr "leitura do par %s falhou no estado trabalhando (erro)"
#: netsync.cc:2554
-#, fuzzy, c-format
+#, c-format
msgid ""
-"peer %s read failed in shutdown state (possibly client misreported error)"
+"peer %s read failed in shutdown state (possibly client misreported error)\n"
msgstr ""
"leitura do par %s falhou no estado de encerramento (provavelmente o\n"
"cliente reportou o erro erroneamente)\n"
@@ -2861,9 +2870,9 @@ msgstr "escrita no par %s falhou no esta
msgstr "escrita no par %s falhou no estado trabalhando (erro)"
#: netsync.cc:2586
-#, fuzzy, c-format
+#, c-format
msgid ""
-"peer %s write failed in shutdown state (possibly client misreported error)"
+"peer %s write failed in shutdown state (possibly client misreported error)\n"
msgstr ""
"escrita no par %s falhou no estado de encerramento (provavelmente o\n"
"cliente reportou o erro erroneamente)\n"
@@ -2893,8 +2902,8 @@ msgstr ""
msgstr ""
#: netsync.cc:2724
-#, fuzzy, c-format
-msgid "session limit %d reached, some connections will be refused"
+#, c-format
+msgid "session limit %d reached, some connections will be refused\n"
msgstr "limite da sessão %d alcançado, algumas conexões serão recusadas\n"
#: netsync.cc:2789
@@ -2927,19 +2936,19 @@ msgstr "ImpossÃvel achar chave '%s'"
msgstr "ImpossÃvel achar chave '%s'"
#: netsync.cc:3122
-#, fuzzy, c-format
+#, c-format
msgid ""
"include branch pattern contains a quote character:\n"
-"%s"
+"%s\n"
msgstr ""
"padrão de inclusão de ramos contém um caractere de aspas:\n"
"%s\n"
#: netsync.cc:3128
-#, fuzzy, c-format
+#, c-format
msgid ""
"exclude branch pattern contains a quote character:\n"
-"%s"
+"%s\n"
msgstr ""
"padrão de exclusão de ramos contém um caractere de aspas:\n"
"%s\n"
@@ -3212,18 +3221,18 @@ msgstr "tipo de pacote desconhecido: '%s
msgstr "tipo de pacote desconhecido: '%s'"
#: rcs_file.cc:354
-#, fuzzy, c-format
-msgid "parse failure %d:%d: expecting %s, got %s with value '%s'"
+#, c-format
+msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n"
msgstr "falha de leitura %d:%d: esperando %s, veio %s com valor '%s'\n"
#: rcs_file.cc:373
-#, fuzzy, c-format
-msgid "parse failure %d:%d: expecting word '%s'"
+#, c-format
+msgid "parse failure %d:%d: expecting word '%s'\n"
msgstr "falha de leitura %d:%d: palavra '%s' esperada\n"
#: rcs_file.cc:388
-#, fuzzy, c-format
-msgid "parse failure %d:%d: expecting word"
+#, c-format
+msgid "parse failure %d:%d: expecting word\n"
msgstr "falha de leitura %d:%d: palavra esperada\n"
#: rcs_import.cc:721
@@ -3285,13 +3294,13 @@ msgstr "reconstruindo %d nós"
msgstr "reconstruindo %d nós"
#: revision.cc:1132
-#, fuzzy, c-format
-msgid "Path %s added to child roster multiple times"
+#, c-format
+msgid "Path %s added to child roster multiple times\n"
msgstr "Caminho %s adicionado ao inventório-filho múltiplas vezes\n"
#: revision.cc:1145
-#, fuzzy, c-format
-msgid "Directory for path %s cannot be added, as there is a file in the way"
+#, c-format
+msgid "Directory for path %s cannot be added, as there is a file in the way\n"
msgstr ""
"Diretório com caminho %s não pode ser adicionado, porque há\n"
"um arquivo no caminho\n"
@@ -3302,8 +3311,8 @@ msgstr "Caminho %s não pode ser adicion
msgstr "Caminho %s não pode ser adicionado, há um diretório no caminho"
#: revision.cc:1159
-#, fuzzy, c-format
-msgid "Path %s added twice with differing content"
+#, c-format
+msgid "Path %s added twice with differing content\n"
msgstr "Caminho %s adicionado duas vezes com conteúdos diferentes\n"
#: revision.cc:1446
@@ -3373,13 +3382,13 @@ msgstr "%s:%d: invariante '%s' violada"
msgstr "%s:%d: invariante '%s' violada"
#: sanity.cc:255
-#, fuzzy, c-format
-msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d"
+#, c-format
+msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
msgstr "%s:%d: Ãndice '%s' = %d estourou vetor '%s' com tamanho %d\n"
#: sanity.cc:276
-#, fuzzy, c-format
-msgid "Current work set: %i items"
+#, c-format
+msgid "Current work set: %i items\n"
msgstr "Conjunto de trabalho atual: %i itens\n"
#: schema_migration.cc:258
@@ -3510,18 +3519,23 @@ msgstr "aviso: "
msgstr "aviso: "
#: ui.cc:477
-#, fuzzy, c-format
+#, c-format
msgid ""
"fatal: %s\n"
"this is almost certainly a bug in monotone.\n"
"please send this error message, the output of '%s --full-version',\n"
-"and a description of what you were doing to %s."
+"and a description of what you were doing to %s.\n"
msgstr ""
"fatal: %s\n"
"isto é quase certamente um defeito em monotone.\n"
"por favor envie esta mensagem de erro, a saÃda de '%s --full-version',\n"
"e uma descrição do que você estava fazendo para %s.\n"
+#: ui.cc:512
+#, c-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
#: ui.cc:581
#, c-format
msgid "failed to open log file '%s'"
@@ -3861,15 +3875,3 @@ msgstr ""
msgid "this workspace is in the current format, no migration is necessary."
msgstr ""
"esta área de trabalho está no formato atual, nenhuma migração é necessária"
-
-#~ msgid "[DIRECTORY]\n"
-#~ msgstr "[DIRETÃRIO]\n"
-
-#~ msgid "%s:\n"
-#~ msgstr "%s:\n"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
============================================================
--- po/sv.po ff4a43e6a4c159add684ef3247cc597eee603d19
+++ po/sv.po 931ea57daac9e163c978aca94246b8015e03dda3
@@ -146,7 +146,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: monotone 0.26pre1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-13 10:22-0500\n"
+"POT-Creation-Date: 2006-10-09 00:32+0200\n"
"PO-Revision-Date: 2006-10-09 00:36+0200\n"
"Last-Translator: Joel Rosdahl \n"
"Language-Team: Richard Levitte \n"
@@ -203,74 +203,72 @@ msgid "illegal argument to --automate-st
#: app_state.cc:388
#, c-format
msgid "illegal argument to --automate-stdio-size: cannot be zero or negative"
-msgstr ""
-"felaktigt argument till --automate-stdio-size: får ej vara noll eller "
-"negativt"
+msgstr "felaktigt argument till --automate-stdio-size: får ej vara noll eller negativt"
-#: automate.cc:64
+#: automate.cc:65
msgid "[BRANCH]"
msgstr "[GREN]"
-#: automate.cc:88 automate.cc:135 automate.cc:1206
+#: automate.cc:89 automate.cc:136 automate.cc:1207
msgid "REV1 [REV2 [REV3 [...]]]"
msgstr "REV1 [REV2 [REV3 [...]]]"
-#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
-#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452
-#: automate.cc:1216 cmd_list.cc:661
+#: automate.cc:99 automate.cc:146 automate.cc:190 automate.cc:331
+#: automate.cc:366 automate.cc:370 automate.cc:429 automate.cc:453
+#: automate.cc:1217 cmd_list.cc:661
#, c-format
msgid "No such revision %s"
msgstr "det finns ingen revision med identiteten %s"
-#: automate.cc:183 automate.cc:324
+#: automate.cc:184 automate.cc:325
msgid "[REV1 [REV2 [REV3 [...]]]]"
msgstr "[REV1 [REV2 [REV3 [...]]]]"
-#: automate.cc:215
+#: automate.cc:216
msgid "FILE"
msgstr "FIL"
-#: automate.cc:235
+#: automate.cc:236
#, c-format
msgid "file %s is unknown to the current workspace"
msgstr "filen '%s' är okänd i denna arbetskopia"
-#: automate.cc:356
+#: automate.cc:357
msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
msgstr "NY_REV [GAMMAL_REV1 [GAMMAL_REV2 [...]]]"
-#: automate.cc:423 automate.cc:447 cmd_list.cc:651
+#: automate.cc:424 automate.cc:448 cmd_list.cc:651
msgid "REV"
msgstr "REV"
-#: automate.cc:524
+#: automate.cc:525
msgid "SELECTOR"
msgstr "VÃLJARE"
-#: automate.cc:893 automate.cc:1023
+#: automate.cc:894 automate.cc:1024
msgid "[REVID]"
msgstr "[REVID]"
-#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588
-#: automate.cc:1593
+#: automate.cc:923 automate.cc:1046 automate.cc:1530 automate.cc:1589
+#: automate.cc:1594
#, c-format
msgid "no revision %s found in database"
msgstr "revisionen %s finns inte i i databasen"
-#: automate.cc:1066 automate.cc:1145
+#: automate.cc:1067 automate.cc:1146
msgid "FILEID"
msgstr "FILID"
-#: automate.cc:1073
+#: automate.cc:1074
#, c-format
msgid "no file version %s found in database"
msgstr "filversionen %s finns inte i databasen"
-#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845
+#: automate.cc:1093 automate.cc:1119 cmd_merging.cc:845
msgid "REVID"
msgstr "REVID"
-#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186
+#: automate.cc:1104 automate.cc:1130 automate.cc:1185 automate.cc:1187
#: cmd_db.cc:35 cmd_diff_log.cc:385 cmd_diff_log.cc:416 cmd_diff_log.cc:418
#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677
#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:461 commands.cc:388
@@ -278,57 +276,57 @@ msgstr "det finns ingen revision med ide
msgid "no such revision '%s'"
msgstr "det finns ingen revision med identiteten '%s'"
-#: automate.cc:1156
+#: automate.cc:1157
#, c-format
msgid "no such file '%s'"
msgstr "filen '%s' finns inte"
-#: automate.cc:1172
+#: automate.cc:1173
msgid "OLD_FILE NEW_FILE"
msgstr "GAMMAL_FIL NYTT_FIL"
-#: automate.cc:1317
+#: automate.cc:1318
msgid "[BRANCH_PATTERN]"
msgstr "[GREN_MÃNSTER]"
-#: automate.cc:1413
+#: automate.cc:1414
msgid "KEYID PASSPHRASE"
msgstr "NYCKELID LÃSENFRAS"
-#: automate.cc:1431 cmd_key_cert.cc:41
+#: automate.cc:1432 cmd_key_cert.cc:41
#, c-format
msgid "key '%s' already exists"
msgstr "nyckeln '%s' finns redan"
-#: automate.cc:1434 cmd_key_cert.cc:44
+#: automate.cc:1435 cmd_key_cert.cc:44
#, c-format
msgid "generating key-pair '%s'"
msgstr "skapar nyckelparet '%s'"
-#: automate.cc:1436 cmd_key_cert.cc:46
+#: automate.cc:1437 cmd_key_cert.cc:46
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "lagrar nyckelparet '%s' i %s/"
-#: automate.cc:1472
+#: automate.cc:1473
msgid "OPTION"
msgstr "FLAGGA"
-#: automate.cc:1495
+#: automate.cc:1496
#, c-format
msgid "'%s' is not a recognized workspace option"
msgstr "'%s' är en okänd inställning i arbetskopians metadata"
-#: automate.cc:1518
+#: automate.cc:1519
msgid "REV FILE"
msgstr "REV FIL"
-#: automate.cc:1535 automate.cc:1599
+#: automate.cc:1536 automate.cc:1600
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "filen %s är okänd i revision %s"
-#: automate.cc:1578
+#: automate.cc:1579
msgid "REV1 FILE REV2"
msgstr "REV1 FIL REV2"
@@ -402,26 +400,21 @@ msgstr "flera grencert funna för revisi
"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"
-#: cmd_automate.cc:157 cmd_automate.cc:226
+#: cmd_automate.cc:206
#, c-format
-msgid "Bad input to automate stdio"
-msgstr "felaktigt indata till automate stdio"
-
-#: cmd_automate.cc:176
-#, c-format
msgid "read from client failed with error code: %d"
msgstr "läsning från klienten misslyckades med följande felkod: %d"
-#: cmd_automate.cc:177
-#, fuzzy, c-format
-msgid "Bad input to automate stdio (unexpected EOF)"
+#: cmd_automate.cc:249
+#, c-format
+msgid "Bad input to automate stdio"
msgstr "felaktigt indata till automate stdio"
-#: cmd_automate.cc:459
+#: cmd_automate.cc:303
msgid "automation"
msgstr "automatisering"
-#: cmd_automate.cc:460
+#: cmd_automate.cc:304
msgid "automation interface"
msgstr "automatiseringsgränssnitt"
@@ -2563,17 +2556,17 @@ msgstr "nodens kontrollsumma %s stämmer
msgid "mismatched node hash value %s, expected %s"
msgstr "nodens kontrollsumma %s stämmer inte, %s förväntad"
-#: monotone.cc:154
+#: monotone.cc:153
#, c-format
msgid "Invalid escape in --xargs file"
msgstr "Otillåten \\ i filen given med --xargs"
-#: monotone.cc:686
+#: monotone.cc:683
#, c-format
msgid "Usage: %s [OPTION...] command [ARG...]"
msgstr "Användning: %s [FLAGGOR...] kommando [ARGUMENT...]"
-#: monotone.cc:694
+#: monotone.cc:691
#, c-format
msgid "Options specific to '%s %s':"
msgstr "Specifika flaggor för '%s %s':"
@@ -2972,9 +2965,7 @@ msgid ""
#, c-format
msgid ""
"peer %s read failed in shutdown state (possibly client misreported error)"
-msgstr ""
-"läsning från %s fallerade i tillståndet \"shutdown\" (klienten kan felaktigt "
-"ha rapporterat ett fel)"
+msgstr "läsning från %s fallerade i tillståndet \"shutdown\" (klienten kan felaktigt ha rapporterat ett fel)"
#: netsync.cc:2560
#, c-format
@@ -2990,9 +2981,7 @@ msgid ""
#, c-format
msgid ""
"peer %s write failed in shutdown state (possibly client misreported error)"
-msgstr ""
-"skrivning till %s fallerade i tillståndet \"shutdown\" (klienten kan "
-"felaktigt ha rapporterat ett fel)"
+msgstr "skrivning till %s fallerade i tillståndet \"shutdown\" (klienten kan felaktigt ha rapporterat ett fel)"
#: netsync.cc:2592
#, c-format
@@ -3021,9 +3010,7 @@ msgid "session limit %d reached, some co
#: netsync.cc:2724
#, c-format
msgid "session limit %d reached, some connections will be refused"
-msgstr ""
-"gränsen för antalet sessioner, %d, är nådd, en del uppkopplingar kommer att "
-"nekas"
+msgstr "gränsen för antalet sessioner, %d, är nådd, en del uppkopplingar kommer att nekas"
#: netsync.cc:2789
#, c-format