#
#
# patch "ChangeLog"
# from [482740ac1c38ea409af30122be4b06921e5878f3]
# to [fb56db4f8ba48106024ca822622c428afe19d4d3]
#
# patch "database.cc"
# from [f0fea1672a7803f2725c81e0b2eeebb1c47e2f15]
# to [d5e2d122590a729849b51b12e1d5e31e5c5f766b]
#
# patch "po/de.po"
# from [debf33baab8ab07a0c3aa55541c11cc253de90f4]
# to [2957646f9a55f95ca54dc4f27ffa7374c4e22753]
#
# patch "po/es.po"
# from [be5b1736cddab6c30e79a8ac37cd9578805b3f47]
# to [6fa971ade6dba66406802bb17b8859de94b72b4c]
#
# patch "po/fr.po"
# from [7837e341823decadddae131fd0fbfaa920cc428e]
# to [15008ff2f6c77b715ac251062bc007f4cf592926]
#
# patch "po/it.po"
# from [5ed171e04465385f095ed761487f988916b2b37a]
# to [a4b7c50e902533c127e1ce5e638079f190480ed8]
#
# patch "po/ja.po"
# from [40f17e4ffff8058a0314fbd030f7975476730ce3]
# to [b2d342cfdad23bc57acf7f51d5344e2cbd4068cd]
#
# patch "po/pt_BR.po"
# from [315fbac01e0fbe3ae0bf45cc10d877db84d0427c]
# to [d10fda0e74e1d66ea0165354eb83373df20e53e5]
#
# patch "po/sv.po"
# from [c87549f438485fb45e1639623a6c876bd6c9ccb9]
# to [b619fd2916f7e6a70b5024d8e75a1590e5e449b7]
#
============================================================
--- ChangeLog 482740ac1c38ea409af30122be4b06921e5878f3
+++ ChangeLog fb56db4f8ba48106024ca822622c428afe19d4d3
@@ -1,3 +1,10 @@
+2007-01-23 Zack Weinberg
+
+ * database.cc (format_sqlite_error_for_info): Look for translated
+ version of "sqlite error: " too. Problem found by tommyd on IRC.
+ * po/*.po: Define the translation of this string, using the
+ existing translation of "sqlite error: %s\n%s".
+
2007-01-21 Derek Scherger
* (read_directory): use 'entry.' instead of 'di->' for consistency
@@ -88,7 +95,7 @@ 2007-01-18 Derek Scherger
* m4/boost.m4: Check for another possible library suffix used on
============================================================
--- database.cc f0fea1672a7803f2725c81e0b2eeebb1c47e2f15
+++ database.cc d5e2d122590a729849b51b12e1d5e31e5c5f766b
@@ -485,7 +485,7 @@ format_sqlite_error_for_info(informative
{
string err(e.what());
string prefix = _("error: ");
- prefix.append("sqlite error: ");
+ prefix.append(_("sqlite error: "));
if (err.find(prefix) != 0)
throw;
============================================================
--- po/de.po debf33baab8ab07a0c3aa55541c11cc253de90f4
+++ po/de.po 2957646f9a55f95ca54dc4f27ffa7374c4e22753
@@ -33,7 +33,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-22 09:17+0100\n"
+"POT-Creation-Date: 2007-01-23 08:09-0800\n"
"PO-Revision-Date: 2007-01-10 14:58+0100\n"
"Last-Translator: Thomas Keller \n"
"Language-Team: Deutsch \n"
@@ -2200,6 +2200,10 @@ msgstr "Fehler: "
msgid "error: "
msgstr "Fehler: "
+#: database.cc:488
+msgid "sqlite error: "
+msgstr "SQLite-Fehler: "
+
#: database.cc:512
msgid "not set"
msgstr "nicht gesetzt"
@@ -2498,7 +2502,7 @@ msgstr "Laufzeitfehler %s während der E
msgid "caught runtime error %s constructing file path for %s"
msgstr "Laufzeitfehler %s während der Erstellung des Dateipfades für %s"
-#: file_io.cc:547 work.cc:1112
+#: file_io.cc:540 work.cc:1112
#, c-format
msgid "no such file or directory: '%s'"
msgstr "Datei oder Verzeichnis unbekannt: '%s'"
============================================================
--- po/es.po be5b1736cddab6c30e79a8ac37cd9578805b3f47
+++ po/es.po 6fa971ade6dba66406802bb17b8859de94b72b4c
@@ -57,7 +57,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: Monotone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-29 15:28-0400\n"
+"POT-Creation-Date: 2007-01-23 08:09-0800\n"
"PO-Revision-Date: 2006-12-29 15:39-0400\n"
"Last-Translator: Nicolas Ruiz \n"
"Language-Team: \n"
@@ -67,27 +67,27 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: app_state.cc:129
+#: app_state.cc:130
#, c-format
msgid "workspace required but not found%s%s"
msgstr "Ãrea de trabajo requerida pero no encontrada%s%s"
-#: app_state.cc:137
+#: app_state.cc:138
#, c-format
msgid "invalid directory ''"
msgstr "directorio inválido ''"
-#: app_state.cc:145
+#: app_state.cc:146
#, c-format
msgid "monotone bookkeeping directory '%s' already exists in '%s'"
msgstr "directorio de servicio de monotone '%s' ya existe en '%s'"
-#: app_state.cc:201
+#: app_state.cc:208
#, c-format
msgid "search root '%s' does not exist"
msgstr "la raiz de búsqueda '%s' no existe"
-#: app_state.cc:202
+#: app_state.cc:209
#, c-format
msgid "search root '%s' is not a directory"
msgstr "la raiz de búsqueda '%s' no es un directorio"
@@ -99,9 +99,9 @@ msgstr "[RAMA]"
#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218
#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529
#: automate.cc:905 automate.cc:1035 automate.cc:1079 automate.cc:1105
-#: automate.cc:1132 automate.cc:1159 automate.cc:1193 automate.cc:1304
-#: automate.cc:1401 automate.cc:1460 automate.cc:1506 automate.cc:1566
-#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:676
+#: automate.cc:1132 automate.cc:1159 automate.cc:1193 automate.cc:1305
+#: automate.cc:1395 automate.cc:1454 automate.cc:1500 automate.cc:1560
+#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:669
#, c-format
msgid "wrong argument count"
msgstr "conteo de argumentos incorrecto"
@@ -112,7 +112,7 @@ msgstr "REV1 [REV2 [REV3 [...]]]"
#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454
-#: automate.cc:1200 cmd_list.cc:683 revision.cc:1705
+#: automate.cc:1200 cmd_list.cc:676 revision.cc:1705
#, c-format
msgid "No such revision %s"
msgstr "La revisión %s no existe"
@@ -136,12 +136,12 @@ msgstr "REV_NUEVA [REV_VIEJA1 [REV_VIEJA
#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:949
#: automate.cc:970 automate.cc:1256 cmd_automate.cc:78 cmd_automate.cc:332
-#: cmd_list.cc:584
+#: cmd_list.cc:577
#, c-format
msgid "no arguments needed"
msgstr "no se requieren argumentos"
-#: automate.cc:423 automate.cc:448 cmd_list.cc:673 revision.cc:1699
+#: automate.cc:423 automate.cc:448 cmd_list.cc:666 revision.cc:1699
msgid "REV"
msgstr "REV"
@@ -153,21 +153,21 @@ msgstr "[ID_REV]"
msgid "[REVID]"
msgstr "[ID_REV]"
-#: automate.cc:931 automate.cc:1054 automate.cc:1514 automate.cc:1573
-#: automate.cc:1578
+#: automate.cc:931 automate.cc:1054 automate.cc:1508 automate.cc:1567
+#: automate.cc:1572
#, c-format
msgid "no revision %s found in database"
msgstr "no se encontró una revisión %s en la base de datos"
-#: automate.cc:1076 automate.cc:1102 cmd_merging.cc:845
+#: automate.cc:1076 automate.cc:1102 cmd_merging.cc:837
msgid "REVID"
msgstr "ID_REV"
#: automate.cc:1087 automate.cc:1113 automate.cc:1168 automate.cc:1170
#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419
-#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:677
-#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:523
-#: cmd_ws_commit.cc:1011 commands.cc:413
+#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:669
+#: cmd_merging.cc:684 cmd_merging.cc:687 cmd_ws_commit.cc:517
+#: cmd_ws_commit.cc:987 commands.cc:411
#, c-format
msgid "no such revision '%s'"
msgstr "la revisión '%s' no existe"
@@ -185,48 +185,48 @@ msgstr "ARCHIVO_VIEJO ARCHIVO_NUEVO"
msgid "OLD_FILE NEW_FILE"
msgstr "ARCHIVO_VIEJO ARCHIVO_NUEVO"
-#: automate.cc:1301
+#: automate.cc:1302
msgid "[BRANCH_PATTERN]"
msgstr "[PATRÃN_RAMO]"
-#: automate.cc:1398
+#: automate.cc:1392
msgid "KEYID PASSPHRASE"
msgstr "ID_LLAVE FRASE_CLAVE"
-#: automate.cc:1416 cmd_key_cert.cc:42
+#: automate.cc:1410 cmd_key_cert.cc:42
#, c-format
msgid "key '%s' already exists"
msgstr "llave '%s' ya existe"
-#: automate.cc:1419 cmd_key_cert.cc:45
+#: automate.cc:1413 cmd_key_cert.cc:45
#, c-format
msgid "generating key-pair '%s'"
msgstr "generando el par de llaves '%s'"
-#: automate.cc:1421 cmd_key_cert.cc:47
+#: automate.cc:1415 cmd_key_cert.cc:47
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "guardando el par de llaves '%s' en %s/"
-#: automate.cc:1457
+#: automate.cc:1451
msgid "OPTION"
msgstr "OPCIÃN"
-#: automate.cc:1480
+#: automate.cc:1474
#, c-format
msgid "'%s' is not a recognized workspace option"
msgstr "'%s' no es una opción reconocida para el área de trabajo"
-#: automate.cc:1503
+#: automate.cc:1497
msgid "REV FILE"
msgstr "REV ARCHIVO"
-#: automate.cc:1520 automate.cc:1584
+#: automate.cc:1514 automate.cc:1578
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "el archivo %s es desconocido para la revisión %s"
-#: automate.cc:1563
+#: automate.cc:1557
msgid "REV1 FILE REV2"
msgstr "REV1 ARCHIVO REV2"
@@ -235,41 +235,41 @@ msgstr "analizando léxicamente un %s en
msgid "parsing a %s at %d:%d:E: %s"
msgstr "analizando léxicamente un %s en %d:%d:E: %s"
-#: cert.cc:83
+#: cert.cc:82
#, c-format
msgid "ignoring bad signature by '%s' on '%s'"
msgstr "ignorando una firma inválida de '%s' en '%s'"
-#: cert.cc:91
+#: cert.cc:90
#, c-format
msgid "ignoring unknown signature by '%s' on '%s'"
msgstr "ignorando una firma desconocida de '%s' en '%s'"
-#: cert.cc:157
+#: cert.cc:156
#, c-format
msgid "trust function disliked %d signers of %s cert on manifest %s"
msgstr ""
"función de confianza no aceptó %d signatarios de %s certificados en el "
"manifiesto %s"
-#: cert.cc:214
+#: cert.cc:213
#, c-format
msgid "trust function disliked %d signers of %s cert on revision %s"
msgstr ""
"función de confianza no aceptó %d signatarios de %s certificados en la "
"revisión %s"
-#: cert.cc:303
+#: cert.cc:302
#, c-format
msgid "calculated cert hash '%s' does not match '%s'"
msgstr "el hash calculado sobre el certificado '%s' no concuerda con '%s'"
-#: cert.cc:387 keys.cc:561
+#: cert.cc:386 keys.cc:561
#, c-format
msgid "no key pair '%s' found in key store '%s'"
msgstr "no se encontró el par de llaves '%s' en el llavero '%s'"
-#: cert.cc:465
+#: cert.cc:464
#, c-format
msgid ""
"you have no private key to make signatures with\n"
@@ -278,7 +278,7 @@ msgstr ""
"Ud. no tiene una llave privada con la que firmar\n"
"puede generarla ejecutando 'genkey '"
-#: cert.cc:468
+#: cert.cc:467
#, c-format
msgid ""
"you have multiple private keys\n"
@@ -287,21 +287,23 @@ msgstr ""
"Ud. tiene múltiples llaves privadas\n"
"elija cual utilizar para firmar agregando '-k' a su comando"
-#: cert.cc:485
+#: cert.cc:484
#, c-format
msgid "no branch found for empty revision, please provide a branch name"
-msgstr "no se encontró rama para revisión vacia, por favor indique un nombre de rama"
+msgstr ""
+"no se encontró rama para revisión vacia, por favor indique un nombre de rama"
-#: cert.cc:494
+#: cert.cc:491
#, c-format
msgid "no branch certs found for revision %s, please provide a branch name"
msgstr ""
"no se encontraron certificados para la revisión %s, por favor indique un "
"nombre de rama"
-#: cert.cc:498
+#: cert.cc:495
#, c-format
-msgid "multiple branch certs found for revision %s, please provide a branch name"
+msgid ""
+"multiple branch certs found for revision %s, please provide a branch name"
msgstr ""
"se encontraron múltiples certificados de ramas para la revisión %s, por "
"favor indique un nombre de rama"
@@ -328,16 +330,16 @@ msgstr "Input inválido a 'automate stdi
msgid "Bad input to automate stdio: expected '%c' token"
msgstr "Input inválido a 'automate stdio': se esperaba token '%c'"
-#: cmd_automate.cc:344
+#: cmd_automate.cc:348
#, c-format
msgid "Bad input to automate stdio: command name is missing"
msgstr "Input inválido para 'automate stdio': nombre de comando faltante"
-#: cmd_automate.cc:373
+#: cmd_automate.cc:377
msgid "automation"
msgstr "automatización"
-#: cmd_automate.cc:374
+#: cmd_automate.cc:378
msgid "automation interface"
msgstr "interface de automatización"
@@ -420,8 +422,8 @@ msgstr "ninguna variable tiene nombre %s
msgid "no var with name %s in domain %s"
msgstr "ninguna variable tiene nombre %s en el dominino %s"
-#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114
-#: cmd_files.cc:220 cmd_list.cc:478 cmd_merging.cc:614 cmd_ws_commit.cc:417
+#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:602 cmd_files.cc:114
+#: cmd_files.cc:220 cmd_list.cc:471 cmd_merging.cc:606 cmd_ws_commit.cc:411
#: commands.cc:275
msgid "informative"
msgstr "informativo"
@@ -444,8 +446,8 @@ msgstr "se indicaron más de dos revisio
msgid "more than two revisions given"
msgstr "se indicaron más de dos revisiones"
-#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308
-#: cmd_ws_commit.cc:343 cmd_ws_commit.cc:417 cmd_ws_commit.cc:723
+#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:302
+#: cmd_ws_commit.cc:337 cmd_ws_commit.cc:411 cmd_ws_commit.cc:707
msgid "[PATH]..."
msgstr "[CAMINO]..."
@@ -479,11 +481,11 @@ msgstr "[ARCHIVO [...]]"
msgid "[FILE [...]]"
msgstr "[ARCHIVO [...]]"
-#: cmd_diff_log.cc:603
+#: cmd_diff_log.cc:602
msgid "[FILE] ..."
msgstr "[ARCHIVO]..."
-#: cmd_diff_log.cc:604
+#: cmd_diff_log.cc:603
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
"revisions are given, use them as a starting point."
@@ -491,13 +493,13 @@ msgstr ""
"imprime la historia en orden reverso (filtrado por 'ARCHIVO'). Si una\n"
"o más revisiones son especificadas, se utilizan estas como punto de partida."
-#: cmd_diff_log.cc:618
+#: cmd_diff_log.cc:617
#, c-format
msgid "only one of --last/--next allowed"
msgstr "solo se permite una de las opciones --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:837 cmd_othervcs.cc:15
msgid "debug"
msgstr "debug"
@@ -631,7 +633,7 @@ msgstr "Alias para %s"
msgstr "Alias para %s"
#: 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
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:143
msgid "key and cert"
msgstr "llave y certificado"
@@ -660,7 +662,8 @@ msgid "public or private key '%s' does n
#: cmd_key_cert.cc:84
#, c-format
msgid "public or private key '%s' does not exist in keystore or database"
-msgstr "o la llave pública o la privada '%s' no existe en el llavero o base de datos"
+msgstr ""
+"o la llave pública o la privada '%s' no existe en el llavero o base de datos"
#: cmd_key_cert.cc:87
#, c-format
@@ -693,11 +696,11 @@ msgstr "crea un certificado para una rev
msgid "create a cert for a revision"
msgstr "crea un certificado para una revisión"
-#: cmd_key_cert.cc:150
+#: cmd_key_cert.cc:144
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr "REVISIÃN NOMBER VALOR SIGNATARIO1 [SIGNATARIO2 [...]]"
-#: cmd_key_cert.cc:151
+#: cmd_key_cert.cc:145
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
@@ -705,7 +708,7 @@ msgstr ""
"verifica si un certificado hipotético seria confiable según\n"
"la configuración actual"
-#: cmd_key_cert.cc:184
+#: cmd_key_cert.cc:178
#, c-format
msgid ""
"if a cert on: %s\n"
@@ -720,72 +723,72 @@ msgstr ""
"fué firmado por: %s\n"
"seria: %s"
-#: cmd_key_cert.cc:193
+#: cmd_key_cert.cc:187
msgid "trusted"
msgstr "confiable"
-#: cmd_key_cert.cc:193
+#: cmd_key_cert.cc:187
msgid "UNtrusted"
msgstr "NO confiable"
-#: cmd_key_cert.cc:197 cmd_key_cert.cc:210 cmd_key_cert.cc:223
-#: cmd_key_cert.cc:239 cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:191 cmd_key_cert.cc:204 cmd_key_cert.cc:217
+#: cmd_key_cert.cc:233 cmd_ws_commit.cc:202
msgid "review"
msgstr "verifica"
-#: cmd_key_cert.cc:197
+#: cmd_key_cert.cc:191
msgid "REVISION TAGNAME"
msgstr "REVISIÃN NOMBRE_ETIQUETA"
-#: cmd_key_cert.cc:198
+#: cmd_key_cert.cc:192
msgid "put a symbolic tag cert on a revision"
msgstr "coloca una etiqueta simbólica en una revisión"
-#: cmd_key_cert.cc:210
+#: cmd_key_cert.cc:204
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr "ID (pass|fail|true|false|yes|no|1|0)"
-#: cmd_key_cert.cc:211
+#: cmd_key_cert.cc:205
msgid "note the results of running a test on a revision"
msgstr "anota los resultados de correr un test sobre una versión"
-#: cmd_key_cert.cc:223 cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:217 cmd_ws_commit.cc:202
msgid "REVISION"
msgstr "REVISIÃN"
-#: cmd_key_cert.cc:224
+#: cmd_key_cert.cc:218
msgid "approve of a particular revision"
msgstr "aprueba una revisión particular"
-#: cmd_key_cert.cc:235
+#: cmd_key_cert.cc:229
#, c-format
msgid "need --branch argument for approval"
msgstr "necesita el argumento '--branch'para aprobar"
-#: cmd_key_cert.cc:239
+#: cmd_key_cert.cc:233
msgid "REVISION [COMMENT]"
msgstr "REVISIÃN [COMENTARIO]"
-#: cmd_key_cert.cc:240
+#: cmd_key_cert.cc:234
msgid "comment on a particular revision"
msgstr "comentario sobre una revisión particular"
-#: cmd_key_cert.cc:252
+#: cmd_key_cert.cc:246
#, c-format
msgid "edit comment failed"
msgstr "falló la edición del comentario"
-#: cmd_key_cert.cc:257
+#: cmd_key_cert.cc:251
#, c-format
msgid "empty comment"
msgstr "comentario vacio"
-#: cmd_list.cc:64 cmd_list.cc:697
+#: cmd_list.cc:67 cmd_list.cc:693
#, c-format
msgid "no public key '%s' found in database"
msgstr "llave pública '%s' no se encontró en la base de datos"
-#: cmd_list.cc:74
+#: cmd_list.cc:77
#, c-format
msgid ""
"Key : %s\n"
@@ -798,39 +801,39 @@ msgstr ""
"Nombre : %s\n"
"Valor : %s\n"
-#: cmd_list.cc:108
+#: cmd_list.cc:111
msgid "ok"
msgstr "ok"
-#: cmd_list.cc:111
+#: cmd_list.cc:114
msgid "bad"
msgstr "inválido"
-#: cmd_list.cc:114
+#: cmd_list.cc:117
msgid "unknown"
msgstr "desconocido"
-#: cmd_list.cc:202
+#: cmd_list.cc:205
#, c-format
msgid "(*) - only in %s/"
msgstr "(*) - solo en %s/"
-#: cmd_list.cc:226
+#: cmd_list.cc:229
#, c-format
msgid "no keys found"
msgstr "no se encontró ninguna llave"
-#: cmd_list.cc:228
+#: cmd_list.cc:231
#, c-format
msgid "no keys found matching '%s'"
msgstr "no se encontró ninguna llave que concuerde con '%s'"
-#: cmd_list.cc:275
+#: cmd_list.cc:281
#, c-format
msgid "no epoch for branch %s"
msgstr "no se encontró ninguna época para la rama %s"
-#: cmd_list.cc:479
+#: cmd_list.cc:472
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -856,7 +859,7 @@ msgstr ""
"missing\n"
"changed"
-#: cmd_list.cc:490
+#: cmd_list.cc:483
msgid ""
"show database objects, or the current workspace manifest, \n"
"or known, unknown, intentionally ignored, missing, or \n"
@@ -866,10 +869,10 @@ msgstr ""
"trabajo actual, o archivos conocidos, desconocidos, intencionalmente\n"
"ignorados, faltantes, o que han cambiado de estado"
-#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:79
-#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:343
-#: cmd_ws_commit.cc:373 cmd_ws_commit.cc:398 cmd_ws_commit.cc:623
-#: cmd_ws_commit.cc:723
+#: cmd_merging.cc:73 cmd_merging.cc:647 cmd_ws_commit.cc:79
+#: cmd_ws_commit.cc:258 cmd_ws_commit.cc:302 cmd_ws_commit.cc:337
+#: cmd_ws_commit.cc:367 cmd_ws_commit.cc:392 cmd_ws_commit.cc:607
+#: cmd_ws_commit.cc:707
msgid "workspace"
msgstr "área de trabajo"
@@ -933,12 +936,12 @@ msgstr "actualización destino %s selecc
msgid "selected update target %s"
msgstr "actualización destino %s seleccionado"
-#: cmd_merging.cc:171
+#: cmd_merging.cc:161
#, c-format
msgid "target revision is not in current branch"
msgstr "revisión destino no está en la rama actual"
-#: cmd_merging.cc:179
+#: cmd_merging.cc:169
#, c-format
msgid ""
"target revision is in multiple branches:%s\n"
@@ -949,12 +952,12 @@ msgstr ""
"\n"
"intentelo nuevamente con un '--branch' explÃcito"
-#: cmd_merging.cc:187
+#: cmd_merging.cc:177
#, c-format
msgid "switching to branch %s"
msgstr "cambiandose a la rama %s"
-#: cmd_merging.cc:192
+#: cmd_merging.cc:182
#, c-format
msgid ""
"target revision not in any branch\n"
@@ -963,205 +966,206 @@ msgstr ""
"revisión destino no está en ninguna rama\n"
"el siguiente 'commit' utilizará la rama '%s'"
-#: cmd_merging.cc:262
+#: cmd_merging.cc:252
#, c-format
msgid "switched branch; next commit will use branch %s"
msgstr "cambió de rama; el siguiente 'commit' utilizará la rama %s"
-#: cmd_merging.cc:263
+#: cmd_merging.cc:253
#, c-format
msgid "updated to base revision %s"
msgstr "actualizado a la revisión base %s"
-#: cmd_merging.cc:301
+#: cmd_merging.cc:291
#, c-format
msgid "[left] %s"
msgstr "[izquierdo] %s"
-#: cmd_merging.cc:302
+#: cmd_merging.cc:292
#, c-format
msgid "[right] %s"
msgstr "[derecho] %s"
-#: cmd_merging.cc:313 cmd_merging.cc:584
+#: cmd_merging.cc:305 cmd_merging.cc:576
#, c-format
msgid "[merged] %s"
msgstr "[merged] %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:483 cmd_ws_commit.cc:969
-#: cmd_ws_commit.cc:992 cmd_ws_commit.cc:1102 cmd_ws_commit.cc:1116
+#: cmd_merging.cc:312 cmd_merging.cc:411 cmd_merging.cc:422 cmd_merging.cc:580
+#: cmd_merging.cc:813 cmd_ws_commit.cc:477 cmd_ws_commit.cc:945
+#: cmd_ws_commit.cc:968 cmd_ws_commit.cc:1068 cmd_ws_commit.cc:1082
msgid "tree"
msgstr "árbol"
-#: cmd_merging.cc:320
+#: cmd_merging.cc:312
msgid "merge unmerged heads of branch"
msgstr "fusiona diferentes cabezas de una rama"
-#: cmd_merging.cc:330 cmd_merging.cc:829
+#: cmd_merging.cc:322 cmd_merging.cc:821
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "por favor especifice una rama, con --branch=RAMA"
-#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834
-#: cmd_ws_commit.cc:507
+#: cmd_merging.cc:327 cmd_merging.cc:461 cmd_merging.cc:464 cmd_merging.cc:826
+#: cmd_ws_commit.cc:501
#, c-format
msgid "branch '%s' is empty"
msgstr "rama '%s' está vacia"
-#: cmd_merging.cc:338
+#: cmd_merging.cc:330
#, c-format
msgid "branch '%s' is already merged"
msgstr "rama '%s' ya ha sido combinada"
-#: cmd_merging.cc:342
+#: cmd_merging.cc:334
#, c-format
msgid "%d head on branch '%s'"
msgid_plural "%d heads on branch '%s'"
msgstr[0] "%d cabeza en la rama '%s'"
msgstr[1] "%d cabezas en la rama '%s'"
-#: cmd_merging.cc:363 cmd_merging.cc:408
+#: cmd_merging.cc:355 cmd_merging.cc:400
#, c-format
msgid "merge %d / %d:"
msgstr "combina %d / %d:"
-#: cmd_merging.cc:364
+#: cmd_merging.cc:356
#, c-format
msgid "calculating best pair of heads to merge next"
msgstr "calculando el mejor par de cabezas a combinar a continuación"
-#: cmd_merging.cc:416
+#: cmd_merging.cc:408
#, c-format
msgid "note: your workspaces have not been updated"
msgstr "nota: sus areas de trabajo no han sido actualizadas"
-#: cmd_merging.cc:419
+#: cmd_merging.cc:411
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr "RAMA-ORIGEN RAMA-DESTINO"
-#: cmd_merging.cc:420
+#: cmd_merging.cc:412
msgid "merge from one branch to another asymmetrically"
msgstr "combina de una rama a otra asimétricamente"
-#: cmd_merging.cc:430
+#: cmd_merging.cc:422
msgid "SOURCE-BRANCH DEST-BRANCH DIR"
msgstr "RAMA-ORIGEN RAMA-DESTINO DIRECTORIO"
-#: cmd_merging.cc:431
+#: cmd_merging.cc:423
msgid "merge one branch into a subdirectory in another branch"
msgstr "combina una rama en un subdirectorio en otra rama"
-#: cmd_merging.cc:470 cmd_merging.cc:473
+#: cmd_merging.cc:462 cmd_merging.cc:465
#, c-format
msgid "branch '%s' is not merged"
msgstr "rama '%s' no ha sido combinada"
-#: cmd_merging.cc:478
+#: cmd_merging.cc:470
#, c-format
msgid "propagating %s -> %s"
msgstr "propagando %s -> %s"
-#: cmd_merging.cc:479
+#: cmd_merging.cc:471
#, c-format
msgid "[source] %s"
msgstr "[origen] %s"
-#: cmd_merging.cc:480
+#: cmd_merging.cc:472
#, c-format
msgid "[target] %s"
msgstr "[objetivo] %s"
-#: cmd_merging.cc:485
+#: cmd_merging.cc:477
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'"
msgstr "rama '%s' está al dÃa con respecto a la rama '%s'"
-#: cmd_merging.cc:487
+#: cmd_merging.cc:479
#, c-format
msgid "no action taken"
msgstr "ninguna acción tomada"
-#: cmd_merging.cc:491
+#: cmd_merging.cc:483
#, c-format
msgid "no merge necessary; putting %s in branch '%s'"
msgstr "no es necesaria una combinación: colocando %s en rama '%s'"
-#: cmd_merging.cc:529
+#: cmd_merging.cc:521
#, c-format
msgid "Path %s not found in destination tree."
msgstr "Camino %s no encontrado en el árbol de destino"
-#: cmd_merging.cc:589
+#: cmd_merging.cc:581
msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
msgstr "REVISIÃN-IZQUIERDA REVISIÃN-DERECHA RAMA-DESTINO"
-#: cmd_merging.cc:590
+#: cmd_merging.cc:582
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr ""
"combina dos revisiónes especificadas explicitamente, colocando el resultado "
"en una rama dada"
-#: cmd_merging.cc:605
+#: cmd_merging.cc:597
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s y %s son la misma revisión, abortando"
-#: cmd_merging.cc:607 cmd_merging.cc:609
+#: cmd_merging.cc:599 cmd_merging.cc:601
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s ya es un ancestro de %s"
-#: cmd_merging.cc:614
+#: cmd_merging.cc:606
msgid "REV REV"
msgstr "REV REV"
-#: cmd_merging.cc:615
-msgid "Show what conflicts would need to be resolved to merge the given revisions."
+#: cmd_merging.cc:607
+msgid ""
+"Show what conflicts would need to be resolved to merge the given revisions."
msgstr ""
"Muestra que conflictos necesitarian ser resueltos para combinar las "
"revisiones dadas."
-#: cmd_merging.cc:625 cmd_merging.cc:627
+#: cmd_merging.cc:617 cmd_merging.cc:619
#, c-format
msgid "%s is an ancestor of %s; no merge is needed."
msgstr "%s es un ancestro de %s; no es necesaria una combinación."
-#: cmd_merging.cc:641
+#: cmd_merging.cc:633
#, c-format
msgid "There are %s node_name_conflicts."
msgstr "Hay %s conflictos del tipo node_name_conflicts."
-#: cmd_merging.cc:643
+#: cmd_merging.cc:635
#, c-format
msgid "There are %s file_content_conflicts."
msgstr "Hay %s conflictos del tipo file_content_conflicts."
-#: cmd_merging.cc:645
+#: cmd_merging.cc:637
#, c-format
msgid "There are %s node_attr_conflicts."
msgstr "Hay %s node_attr_conflicts."
-#: cmd_merging.cc:647
+#: cmd_merging.cc:639
#, c-format
msgid "There are %s orphaned_node_conflicts."
msgstr "Hay %s conflictos del tipo orphaned_node_conflicts."
-#: cmd_merging.cc:649
+#: cmd_merging.cc:641
#, c-format
msgid "There are %s rename_target_conflicts."
msgstr "Hay %s conflictos del tipo rename_target_conflicts."
-#: cmd_merging.cc:651
+#: cmd_merging.cc:643
#, c-format
msgid "There are %s directory_loop_conflicts."
msgstr "Hay %s conflictos del tipo directory_loop_conflicts."
-#: cmd_merging.cc:655
+#: cmd_merging.cc:647
msgid "[-r FROM] -r TO [PATH...]"
msgstr "[-r DE] -r A [CAMINO...]"
-#: cmd_merging.cc:656
+#: cmd_merging.cc:648
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"
@@ -1189,7 +1193,7 @@ msgstr ""
"Si se especifican dos revisiones, aplica lo scambios hechos para ir de\n"
"la primera revisión a la segunda."
-#: cmd_merging.cc:681
+#: cmd_merging.cc:673
#, c-format
msgid ""
"revision %s is a merge\n"
@@ -1200,41 +1204,41 @@ msgstr ""
"para aplicar los cambios relativos a uno de sus padres, use:\n"
" %s pluck -r PADRE -r %s"
-#: cmd_merging.cc:702
+#: cmd_merging.cc:694
#, c-format
msgid "no changes to apply"
msgstr "no hay cambios que aplicar"
-#: cmd_merging.cc:759
+#: cmd_merging.cc:751
#, c-format
msgid "no changes to be applied"
msgstr "no hay cambios que aplicar"
-#: cmd_merging.cc:786
+#: cmd_merging.cc:778
#, c-format
msgid "no changes were applied"
msgstr "ningún cambio fué aplicado"
-#: cmd_merging.cc:789
+#: cmd_merging.cc:781
#, c-format
msgid "applied changes to workspace"
msgstr "cambios aplicados al área de trabajo"
-#: cmd_merging.cc:821
+#: cmd_merging.cc:813
msgid "show unmerged head revisions of branch"
msgstr "muestra las revisiones cabeza no combinadas de una rama"
-#: cmd_merging.cc:836
+#: cmd_merging.cc:828
#, c-format
msgid "branch '%s' is currently merged:"
msgstr "rama '%s' está actualmente combinada:"
-#: cmd_merging.cc:838
+#: cmd_merging.cc:830
#, c-format
msgid "branch '%s' is currently unmerged:"
msgstr "rama '%s' está actualmente no combinada:"
-#: cmd_merging.cc:846
+#: cmd_merging.cc:838
msgid "dump the roster associated with the given REVID"
msgstr "descarga el roster asociado con el ID_REVISIÃN dado"
@@ -1295,7 +1299,8 @@ msgid "sync branches matching PATTERN wi
#: cmd_netsync.cc:139
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
-msgstr "sincroniza ramas que concuerden con PATRÃN con servidor netsync en DIRECCIÃN"
+msgstr ""
+"sincroniza ramas que concuerden con PATRÃN con servidor netsync en DIRECCIÃN"
#: cmd_netsync.cc:160
#, c-format
@@ -1313,15 +1318,18 @@ msgstr "sirve la base de datos a los cli
#: cmd_netsync.cc:201
#, c-format
-msgid "need permission to store persistent passphrase (see hook persist_phrase_ok())"
+msgid ""
+"need permission to store persistent passphrase (see hook persist_phrase_ok())"
msgstr ""
"necesita permisos para guardar persistentemente la frase clave (vea el hook "
"persist_phrase_ok())"
#: cmd_netsync.cc:207
#, c-format
-msgid "The --no-transport-auth option is only permitted in combination with --stdio"
-msgstr "La opción '--no-transport-auth' solo se permite en combinación con '--stdio'"
+msgid ""
+"The --no-transport-auth option is only permitted in combination with --stdio"
+msgstr ""
+"La opción '--no-transport-auth' solo se permite en combinación con '--stdio'"
#: cmd_othervcs.cc:15
msgid "RCSFILE..."
@@ -1465,43 +1473,44 @@ msgstr "necesita argumento '--branch' pa
msgid "need --branch argument for disapproval"
msgstr "necesita argumento '--branch' para desaprobar"
-#: cmd_ws_commit.cc:264
+#: cmd_ws_commit.cc:258
msgid "[DIRECTORY...]"
msgstr "[DIRECTORIO...]"
-#: cmd_ws_commit.cc:265
+#: cmd_ws_commit.cc:259
msgid "create one or more directories and add them to the workspace"
msgstr "crea uno o más directorios y los agrega al área de trabajo"
-#: cmd_ws_commit.cc:285
+#: cmd_ws_commit.cc:279
#, c-format
msgid "directory '%s' already exists"
msgstr "directorio '%s' ya existe"
-#: cmd_ws_commit.cc:292
+#: cmd_ws_commit.cc:286
#, c-format
msgid "ignoring directory '%s' [see .mtn-ignore]"
msgstr "ignorando directorio '%s' [vea .mtn-ignore]"
-#: cmd_ws_commit.cc:309
+#: cmd_ws_commit.cc:303
msgid "add files to workspace"
msgstr "agrega archivos al área de trabajo"
-#: cmd_ws_commit.cc:316
+#: cmd_ws_commit.cc:310
#, c-format
msgid "cannot set '--unknown' and '--recursive' at the same time"
msgstr "no puede especificar '--unknown' y '--recursive' simultaneamente"
-#: cmd_ws_commit.cc:318
+#: cmd_ws_commit.cc:312
#, c-format
msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time"
-msgstr "no puede especificar '--unknown' y '--no-respect-ignore' simultaneamente"
+msgstr ""
+"no puede especificar '--unknown' y '--no-respect-ignore' simultaneamente"
-#: cmd_ws_commit.cc:344
+#: cmd_ws_commit.cc:338
msgid "drop files from workspace"
msgstr "descarta archivos del área de trabajo"
-#: cmd_ws_commit.cc:374
+#: cmd_ws_commit.cc:368
msgid ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
@@ -1509,15 +1518,15 @@ msgstr ""
"ORIGEN DESTINO\n"
"ORIGEN1 [ORIGEN2 [...]] DIRECTORIO_DESTINO"
-#: cmd_ws_commit.cc:376
+#: cmd_ws_commit.cc:370
msgid "rename entries in the workspace"
msgstr "renombra entradas en el área de trabajo"
-#: cmd_ws_commit.cc:398
+#: cmd_ws_commit.cc:392
msgid "NEW_ROOT PUT_OLD"
msgstr "NUEVA_RAIZ COLOCAR_ANTIGUO"
-#: cmd_ws_commit.cc:399
+#: cmd_ws_commit.cc:393
msgid ""
"rename the root directory\n"
"after this command, the directory that currently has the name NEW_ROOT\n"
@@ -1531,31 +1540,31 @@ msgstr ""
"directorio raiz se llamará COLOCAR_ANTIGUO.\n"
"Es altamente recomendado utilizar '--execute'."
-#: cmd_ws_commit.cc:417
+#: cmd_ws_commit.cc:411
msgid "show status of workspace"
msgstr "muestra el status del área de trabajo"
-#: cmd_ws_commit.cc:446
+#: cmd_ws_commit.cc:440
#, c-format
msgid "Current branch: %s"
msgstr "Rama actual: %s"
-#: cmd_ws_commit.cc:452
+#: cmd_ws_commit.cc:446
#, c-format
msgid "Changes against parent %s"
msgstr "Cambios con respecto al padre %s"
-#: cmd_ws_commit.cc:457
+#: cmd_ws_commit.cc:451
#, c-format
msgid " no changes"
msgstr " sin cambios"
-#: cmd_ws_commit.cc:461
+#: cmd_ws_commit.cc:455
#, c-format
msgid " dropped %s"
msgstr " descartado %s"
-#: cmd_ws_commit.cc:466
+#: cmd_ws_commit.cc:460
#, c-format
msgid ""
" renamed %s\n"
@@ -1564,21 +1573,21 @@ msgstr ""
" renombrado %s\n"
" a %s"
-#: cmd_ws_commit.cc:471 cmd_ws_commit.cc:475
+#: cmd_ws_commit.cc:465 cmd_ws_commit.cc:469
#, c-format
msgid " added %s"
msgstr " agregado %s"
-#: cmd_ws_commit.cc:479
+#: cmd_ws_commit.cc:473
#, c-format
msgid " patched %s"
msgstr " parchado %s"
-#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:969 cmd_ws_commit.cc:1102
+#: cmd_ws_commit.cc:477 cmd_ws_commit.cc:945 cmd_ws_commit.cc:1068
msgid "[DIRECTORY]"
msgstr "[DIRECTORIO]"
-#: cmd_ws_commit.cc:484
+#: cmd_ws_commit.cc:478
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"
@@ -1590,47 +1599,47 @@ msgstr ""
"De lo contrario, será la cabeza de la rama (explicita o implicita).\n"
"Si no se indica un directorio, el nombre de la rama se usará como directorio"
-#: cmd_ws_commit.cc:502 cmd_ws_commit.cc:1036
+#: cmd_ws_commit.cc:496 cmd_ws_commit.cc:1002
#, c-format
msgid "use --revision or --branch to specify what to checkout"
msgstr "use '--revision' o '--branch' para especificar que chequear"
-#: cmd_ws_commit.cc:510 cmd_ws_commit.cc:1042
+#: cmd_ws_commit.cc:504 cmd_ws_commit.cc:1008
#, c-format
msgid "branch %s has multiple heads:"
msgstr "rama %s tiene múltiples cabezas:"
-#: cmd_ws_commit.cc:513 cmd_ws_commit.cc:1045
+#: cmd_ws_commit.cc:507 cmd_ws_commit.cc:1011
#, c-format
msgid "choose one with '%s checkout -r'"
msgstr "elija una con '%s checkout -r'"
-#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1046
+#: cmd_ws_commit.cc:508 cmd_ws_commit.cc:1012
#, c-format
msgid "branch %s has multiple heads"
msgstr "rama %s tiene múltiples cabezas"
-#: cmd_ws_commit.cc:541 cmd_ws_commit.cc:1029
+#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:995
#, c-format
msgid "revision %s is not a member of branch %s"
msgstr "revisión %s no es un miembro de la rama %s"
-#: cmd_ws_commit.cc:558
+#: cmd_ws_commit.cc:542
#, c-format
msgid "you must specify a destination directory"
msgstr "ud. debe especificar un directorio destino"
-#: cmd_ws_commit.cc:571
+#: cmd_ws_commit.cc:555
#, c-format
msgid "checkout directory '%s' already exists"
msgstr "directorio '%s' ya existe, no puede ser utilizado para el 'checkout'"
-#: cmd_ws_commit.cc:605
+#: cmd_ws_commit.cc:589
#, c-format
msgid "no file %s found in database for %s"
msgstr "no se encontró archivo %s para %s en la base de datos"
-#: cmd_ws_commit.cc:623
+#: cmd_ws_commit.cc:607
msgid ""
"set PATH ATTR VALUE\n"
"get PATH [ATTR]\n"
@@ -1640,45 +1649,45 @@ msgstr ""
"get CAMINO [ATRIBUTO]\n"
"drop CAMINO [ATRIBUTO]"
-#: cmd_ws_commit.cc:624
+#: cmd_ws_commit.cc:608
msgid "set, get or drop file attributes"
msgstr "configura, lee o descarta atributos de archivos"
-#: cmd_ws_commit.cc:641
+#: cmd_ws_commit.cc:625
#, c-format
msgid "Unknown path '%s'"
msgstr "Camino desconocido '%s'"
-#: cmd_ws_commit.cc:670
+#: cmd_ws_commit.cc:654
#, c-format
msgid "Path '%s' does not have attribute '%s'"
msgstr "Camino '%s' no tiene atributo '%s'"
-#: cmd_ws_commit.cc:700
+#: cmd_ws_commit.cc:684
#, c-format
msgid "No attributes for '%s'"
msgstr "No hay atributos para '%s'"
-#: cmd_ws_commit.cc:711
+#: cmd_ws_commit.cc:695
#, c-format
msgid "No attribute '%s' on path '%s'"
msgstr "No hay '%s' en el camino '%s'"
-#: cmd_ws_commit.cc:724
+#: cmd_ws_commit.cc:708
msgid "commit workspace to database"
msgstr "guarda el área de trabajo en la base de datos"
-#: cmd_ws_commit.cc:755
+#: cmd_ws_commit.cc:739
#, c-format
msgid "no changes to commit"
msgstr "no hay cambios que guardar"
-#: cmd_ws_commit.cc:775
+#: cmd_ws_commit.cc:759
#, c-format
msgid "beginning commit on branch '%s'"
msgstr "comenzando 'commit' en rama '%s'"
-#: cmd_ws_commit.cc:784
+#: cmd_ws_commit.cc:768
#, c-format
msgid ""
"_MTN/log is non-empty and log message was specified on command line\n"
@@ -1689,37 +1698,37 @@ msgstr ""
"linea de comandos, considere mover o eliminar _MTN/log,\n"
"o remueva '--message/--message-file de la linea de comandos?"
-#: cmd_ws_commit.cc:799
+#: cmd_ws_commit.cc:783
#, c-format
msgid "empty log message; commit canceled"
msgstr "mensaje de registro vacio; 'commit' cancelado"
-#: cmd_ws_commit.cc:821
+#: cmd_ws_commit.cc:805
#, c-format
msgid "log message rejected by hook: %s"
msgstr "mensaje de registro cancelado por el hook: %s"
-#: cmd_ws_commit.cc:829
+#: cmd_ws_commit.cc:813
#, c-format
msgid "revision %s already in database"
msgstr "revisión %s ya está en la base de datos"
-#: cmd_ws_commit.cc:868 cmd_ws_commit.cc:898
+#: cmd_ws_commit.cc:852 cmd_ws_commit.cc:882
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "archivo '%s' modificado durante el 'commit', abortando"
-#: cmd_ws_commit.cc:880
+#: cmd_ws_commit.cc:864
#, c-format
msgid "Your database is missing version %s of file '%s'"
msgstr "A su base de datos le falta la versión %s del archivo '%s'"
-#: cmd_ws_commit.cc:930
+#: cmd_ws_commit.cc:906
#, c-format
msgid "committed revision %s"
msgstr "guardada revisión %s"
-#: cmd_ws_commit.cc:936
+#: cmd_ws_commit.cc:912
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1728,39 +1737,39 @@ msgstr ""
"nota: esta revisión crea divergencia\n"
"nota: quizas (o quizas no) quiera ejecutar '%s merge'"
-#: cmd_ws_commit.cc:970
+#: cmd_ws_commit.cc:946
msgid "setup a new workspace directory, default to current"
msgstr "configura una nueva área de trabajo, por omisión el directorio actual"
-#: cmd_ws_commit.cc:976
+#: cmd_ws_commit.cc:952
#, c-format
msgid "need --branch argument for setup"
msgstr "necesita el argumento '--branch' para 'setup'"
-#: cmd_ws_commit.cc:992
+#: cmd_ws_commit.cc:968
msgid "DIRECTORY"
msgstr "DIRECTORIO"
-#: cmd_ws_commit.cc:993
+#: cmd_ws_commit.cc:969
msgid "import the contents of the given directory tree into a given branch"
msgstr "importa los contenidos del directorio especificado a una rama dada"
-#: cmd_ws_commit.cc:1004
+#: cmd_ws_commit.cc:980
#, c-format
msgid "you must specify a directory to import"
msgstr "ud. debe especificar un directorio a importar"
-#: cmd_ws_commit.cc:1055
+#: cmd_ws_commit.cc:1021
#, c-format
msgid "import directory '%s' doesn't exists"
msgstr "Directorio a importar '%s' no existe"
-#: cmd_ws_commit.cc:1056
+#: cmd_ws_commit.cc:1022
#, c-format
msgid "import directory '%s' is a file"
msgstr "Directorio a importar '%s' es un archivo"
-#: cmd_ws_commit.cc:1103
+#: cmd_ws_commit.cc:1069
msgid ""
"migrate a workspace directory's metadata to the latest format; defaults to "
"the current workspace"
@@ -1768,7 +1777,7 @@ msgstr ""
"migra la metadata del directorio área de trabajo al formato más reciente; "
"por omisión el área de trabajo actual"
-#: cmd_ws_commit.cc:1116
+#: cmd_ws_commit.cc:1082
msgid "refresh the inodeprint cache"
msgstr "refresca el cache inodeprint"
@@ -1794,31 +1803,31 @@ msgstr "muestra la ayuda del comando"
msgid "display command help"
msgstr "muestra la ayuda del comando"
-#: commands.cc:420
+#: commands.cc:418
#, c-format
msgid "expanding selection '%s'"
msgstr "expandiendo selección '%s'"
-#: commands.cc:428
+#: commands.cc:426
#, c-format
msgid "no match for selection '%s'"
msgstr "no hay concordancia para la selección '%s'"
-#: commands.cc:434
+#: commands.cc:432
#, c-format
msgid "expanded to '%s'"
msgstr "expandido a '%s'"
-#: commands.cc:451
+#: commands.cc:449
#, c-format
msgid "selection '%s' has multiple ambiguous expansions:"
msgstr "selección '%s' tiene múltiple expansiones ambiguas:"
-#: commands.cc:468
+#: commands.cc:466
msgid "note: "
msgstr "nota: "
-#: commands.cc:469
+#: commands.cc:467
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
@@ -1827,7 +1836,7 @@ msgstr ""
"rama '%s' tiene múltiples cabezas\n"
"considere utilizar '%s merge'"
-#: commands.cc:484
+#: commands.cc:482
#, c-format
msgid "--message and --message-file are mutually exclusive"
msgstr "'--message' y '--message-file' son mutuamente exclusivos"
@@ -1849,7 +1858,7 @@ msgstr "marcas"
msgid "markings"
msgstr "marcas"
-#: database_check.cc:306 netsync.cc:3063 rcs_import.cc:1244
+#: database_check.cc:306 netsync.cc:3053 rcs_import.cc:1245
msgid "revisions"
msgstr "revisiones"
@@ -1857,7 +1866,7 @@ msgstr "ascendencia"
msgid "ancestry"
msgstr "ascendencia"
-#: database_check.cc:434 netsync.cc:3067
+#: database_check.cc:434 netsync.cc:3057
msgid "keys"
msgstr "llaves"
@@ -2137,27 +2146,23 @@ msgstr "base de datos está bien"
msgid "database is good"
msgstr "base de datos está bien"
-#: database.cc:159
+#: database.cc:151
#, c-format
+msgid "this database already contains rosters"
+msgstr "esta base de datos ya contiene rosters"
+
+#: database.cc:177
+#, fuzzy, c-format
msgid ""
-"layout of database %s doesn't match this version of monotone\n"
-"wanted schema %s, got %s\n"
-"try '%s db migrate' to upgrade\n"
-"(this is irreversible; you may want to make a backup copy first)"
+"database %s lacks some cached data\n"
+"run '%s db regenerate_caches' to restore use of this database"
msgstr ""
-"organización de la base de datos %s no concuerda con esta versión de "
-"monotone\n"
-"esquema requerido %s, obtuvo %s\n"
-"pruebe '%s db migrate' para actualizarla\n"
-"(esto es irreversible, primero haga una copia de seguridad)"
+"faltan algunos datos cache en la base de datos %s\n"
+"ejecute '%s db regenerate_caches' para restablecer el uso de esta base de "
+"datos"
-#: database.cc:173
+#: database.cc:194
#, c-format
-msgid "this database already contains rosters"
-msgstr "esta base de datos ya contiene rosters"
-
-#: database.cc:200
-#, c-format
msgid ""
"database %s contains old-style revisions\n"
"if you are a project leader or doing local testing:\n"
@@ -2175,7 +2180,7 @@ msgstr ""
" hale la data a una nueva base de datos.\n"
"disculpe por el inconveniente."
-#: database.cc:210
+#: database.cc:204
#, c-format
msgid ""
"database %s contains manifests but no revisions\n"
@@ -2186,92 +2191,56 @@ msgstr ""
"esta es una base de datos muy vieja; necesita ser actualizada\n"
"por favor lea los detalles en README.changesets"
-#: database.cc:221
-#, c-format
-msgid ""
-"database %s misses some cached data\n"
-"run '%s db regenerate_caches' to restore use of this database"
-msgstr ""
-"faltan algunos datos cache en la base de datos %s\n"
-"ejecute '%s db regenerate_caches' para restablecer el uso de esta base de "
-"datos"
+#: database.cc:487 sanity.cc:234 schema_migration.cc:58
+msgid "error: "
+msgstr "error: "
-#: database.cc:259
-#, c-format
-msgid "unable to probe database version in file %s"
-msgstr "incapaz de determinar la versión de la base de datos en el archivo %s"
+#: database.cc:488
+msgid "sqlite error: "
+msgstr "error sqlite: "
-#: database.cc:266
-#, c-format
-msgid "database %s is not an sqlite version 3 file, try dump and reload"
-msgstr ""
-"base de datos %s no es un archivo sqlite versión 3,\n"
-"intente un 'dump' y 'reload'"
+#: database.cc:512
+#, fuzzy
+msgid "not set"
+msgstr "nota: "
-#: database.cc:293 schema_migration.cc:201
-msgid ""
-"make sure database and containing directory are writeable\n"
-"and you have not run out of disk space"
-msgstr ""
-"asegurese que la base de datos y el directorio que la contiene tengan\n"
-"permiso de escritura y que no se haya quedado sin espacio en disco"
+#: database.cc:525
+#, fuzzy
+msgid " (not a monotone database)"
+msgstr "configura el nombre de la base de datos"
-#: database.cc:297 schema_migration.cc:206
+#: database.cc:573 database.cc:604 database.cc:1046 database.cc:1066
#, c-format
-msgid ""
-"sqlite error: %s\n"
-"%s"
+msgid "%u"
msgstr ""
-"error sqlite: %s\n"
-"%s"
-#: database.cc:342
-#, c-format
-msgid "could not initialize database: %s: already exists"
-msgstr "no puede inicializar la base de datos: %s: ya existe"
-
-#: database.cc:347
-#, c-format
+#: database.cc:623
+#, fuzzy, c-format
msgid ""
-"existing (possibly stale) journal file '%s' has same stem as new database '%"
-"s'\n"
-"cancelling database creation"
-msgstr ""
-"archivo journal existente (posiblemente obsoleto) '%s' tiene la misma\n"
-"raiz que la nueva base de datos '%s'\n"
-"cancelando la creación de la base de datos"
-
-#: database.cc:497
-#, c-format
-msgid "cannot create %s; it already exists"
-msgstr "no puede crear %s; ya existe"
-
-#: database.cc:573
-#, c-format
-msgid ""
+"creator code : %s\n"
"schema version : %s\n"
"counts:\n"
-" full rosters : %u\n"
-" roster deltas : %u\n"
-" full files : %u\n"
-" file deltas : %u\n"
-" revisions : %u\n"
-" ancestry edges : %u\n"
-" certs : %u\n"
-" logical files : %u\n"
+" full rosters : %s\n"
+" roster deltas : %s\n"
+" full files : %s\n"
+" file deltas : %s\n"
+" revisions : %s\n"
+" ancestry edges : %s\n"
+" certs : %s\n"
+" logical files : %s\n"
"bytes:\n"
-" full rosters : %u\n"
-" roster deltas : %u\n"
-" full files : %u\n"
-" file deltas : %u\n"
-" revisions : %u\n"
-" cached ancestry : %u\n"
-" certs : %u\n"
-" heights : %u\n"
-" total : %u\n"
+" full rosters : %s\n"
+" roster deltas : %s\n"
+" full files : %s\n"
+" file deltas : %s\n"
+" revisions : %s\n"
+" cached ancestry : %s\n"
+" certs : %s\n"
+" heights : %s\n"
+" total : %s\n"
"database:\n"
-" page size : %u\n"
-" cache size : %u"
+" page size : %s\n"
+" cache size : %s"
msgstr ""
"versión esquema : %s\n"
"número:\n"
@@ -2297,55 +2266,66 @@ msgstr ""
" tamaño de página : %u\n"
" tamaño del cache : %u"
-#: database.cc:638
+#: database.cc:668
#, c-format
msgid "database schema version: %s"
msgstr "versión del esquema de la base de datos: %s"
-#: database.cc:715
+#: database.cc:756
#, c-format
msgid "multiple statements in query: %s"
msgstr "múltiples statements en el query: %s"
-#: database.cc:721
+#: database.cc:762
#, c-format
msgid "wanted %d columns got %d in query: %s"
msgstr "queria %d columnas y obtuvo %d en el query: %s"
-#: database.cc:787
+#: database.cc:828
#, c-format
msgid "null result in query: %s"
msgstr "resultado nulo en el query: %s"
-#: database.cc:805
+#: database.cc:846
#, c-format
msgid "wanted %d rows got %d in query: %s"
msgstr "queria %d filas y obtuvo %d en el query: %s"
-#: database.cc:2042
+#: database.cc:2103
#, c-format
msgid "another key with name '%s' already exists"
msgstr "ya existe otra llave con nombre '%s'"
-#: database.cc:3040
+#: database.cc:3121
#, c-format
msgid "no database specified"
msgstr "no se especificó base de datos"
-#: database.cc:3048
+#: database.cc:3129
#, c-format
msgid "database %s does not exist"
msgstr "base de datos %s inexistente"
-#: database.cc:3049
+#: database.cc:3130
#, c-format
msgid "%s is a directory, not a database"
msgstr "%s es un directorio, no una base de datos"
-#: database.cc:3074
+#: database.cc:3137
+#, fuzzy, c-format
+msgid "database %s already exists"
+msgstr "camino %s ya existe"
+
+#: database.cc:3142
#, c-format
-msgid "could not open database '%s': %s"
-msgstr "no puede abrir base de datos '%s': %s"
+msgid ""
+"existing (possibly stale) journal file '%s' has same stem as new database '%"
+"s'\n"
+"cancelling database creation"
+msgstr ""
+"archivo journal existente (posiblemente obsoleto) '%s' tiene la misma\n"
+"raiz que la nueva base de datos '%s'\n"
+"cancelando la creación de la base de datos"
#: diff_patch.cc:614
#, c-format
@@ -2516,7 +2496,7 @@ msgstr ""
"se recibió un error en tiempo de ejecución %s construyendo el camino del "
"archivo para %s"
-#: file_io.cc:548 work.cc:1103
+#: file_io.cc:540 work.cc:1112
#, c-format
msgid "no such file or directory: '%s'"
msgstr "no existe el archivo o directorio: '%s'"
@@ -2571,7 +2551,7 @@ msgstr "Directorio '%s' no existe"
msgid "Directory '%s' does not exist"
msgstr "Directorio '%s' no existe"
-#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1358
+#: lua.cc:481 lua.cc:516 rcs_import.cc:1236 work.cc:1367
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' no es un directorio"
@@ -2584,7 +2564,8 @@ msgid "resolve non-content conflicts and
#: merge.cc:60
#, c-format
msgid "resolve non-content conflicts and then try again."
-msgstr "resuelva los conflictos no relacionados con contenido e intentelo nuevamente"
+msgstr ""
+"resuelva los conflictos no relacionados con contenido e intentelo nuevamente"
#: merge.cc:124
#, c-format
@@ -2611,6 +2592,10 @@ msgstr "Opciones especificas a '%s %s':"
msgid "Options specific to '%s %s':"
msgstr "Opciones especificas a '%s %s':"
+#: monotone.cc:307
+msgid "error: memory exhausted"
+msgstr ""
+
#: mt_version.cc:36
#, c-format
msgid "%s (base revision: %s)"
@@ -2694,7 +2679,8 @@ 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 "no hay suficientes bytes leyendo valor uleb128 para '%s' en la posición %d"
+msgstr ""
+"no hay suficientes bytes leyendo valor uleb128 para '%s' en la posición %d"
#: netio.hh:278
#, c-format
@@ -2743,12 +2729,12 @@ msgstr "conteo insuficiente de %s items
msgid "underflow on count of %s items to receive"
msgstr "conteo insuficiente de %s items a recibir"
-#: netsync.cc:1261 netsync.cc:1269
+#: netsync.cc:1260 netsync.cc:1268
#, c-format
msgid "received network error: %s"
msgstr "error de red recibido: %s"
-#: netsync.cc:1304
+#: netsync.cc:1296
#, c-format
msgid ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -2769,12 +2755,12 @@ msgstr ""
"Yo esperaba %s\n"
"'%s unset %s %s' para forzar este chequeo"
-#: netsync.cc:1314
+#: netsync.cc:1306
#, c-format
msgid "server key changed"
msgstr "cambió la llave del servidor"
-#: netsync.cc:1319
+#: netsync.cc:1311
#, c-format
msgid ""
"first time connecting to server %s\n"
@@ -2785,48 +2771,49 @@ msgstr ""
"Asumiré que es realmente el, pero ud. debe verificar\n"
"La impresión digital de la llave: %s"
-#: netsync.cc:1326
+#: netsync.cc:1318
#, c-format
msgid "saving public key for %s to database"
msgstr "guardando la llave pública de %s en la base de datos"
-#: netsync.cc:1429
+#: netsync.cc:1420
#, c-format
msgid "rejected attempt at anonymous connection for write"
msgstr "rechazado intento de conexión anónima para escritura"
# TODO: Que carajo es "running as sink"?
-#: netsync.cc:1436
+#: netsync.cc:1427
#, c-format
msgid "rejected attempt at anonymous connection while running as sink"
msgstr "rechazado intento de conexión anónima operando como servidor"
-#: netsync.cc:1452
+#: netsync.cc:1442
#, c-format
msgid "anonymous access to branch '%s' denied by server"
msgstr "acceso anónimo a la rama '%s' rechazado por el servidor"
-#: netsync.cc:1460
+#: netsync.cc:1450
#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'"
msgstr "permiso de lectura anónima autorizada para '%s' excluyendo '%s'"
-#: netsync.cc:1466
+#: netsync.cc:1456
#, c-format
msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
-msgstr "permiso de lectura/escritura anónima autorizada para '%s' excluyendo '%s'"
+msgstr ""
+"permiso de lectura/escritura anónima autorizada para '%s' excluyendo '%s'"
-#: netsync.cc:1531
+#: netsync.cc:1519
#, c-format
msgid "remote public key hash '%s' is unknown"
msgstr "hash de la llave pública remota '%s' es desconocido"
-#: netsync.cc:1549
+#: netsync.cc:1537
#, c-format
msgid "detected replay attack in auth netcmd"
msgstr "detectado un ataque 'replay' en el netcmd de autenticación"
-#: netsync.cc:1571
+#: netsync.cc:1559
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -2835,19 +2822,20 @@ msgstr ""
"denegado a '%s' el permiso de lectura para '%s' excluyendo a '%s' mientras "
"ejecuta como pura lectura"
-#: netsync.cc:1584
+#: netsync.cc:1574
#, 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 ""
"denegado a '%s' permiso de lectura para '%s' excluyendo '%s' a causa de la "
"rama '%s'"
-#: netsync.cc:1594
+#: netsync.cc:1584
#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'"
msgstr "aprobado a '%s' el permiso de lectura para '%s' excluyendo '%s'"
-#: netsync.cc:1605
+#: netsync.cc:1595
#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
@@ -2856,231 +2844,235 @@ msgstr ""
"denegado a '%s' el permiso de escritura para '%s' excluyendo '%s' al "
"ejecutar como fuente pura"
-#: netsync.cc:1613
+#: netsync.cc:1603
#, c-format
msgid "denied '%s' write permission for '%s' excluding '%s'"
msgstr "denegado a '%s' permiso de escritura para '%s' excluyendo '%s'"
-#: netsync.cc:1617
+#: netsync.cc:1607
#, c-format
msgid "allowed '%s' write permission for '%s' excluding '%s'"
msgstr "aprobado a '%s' permiso de escritura para '%s' excluyendo '%s'"
-#: netsync.cc:1641
+#: netsync.cc:1631
#, c-format
msgid "bad client signature"
msgstr "firma del cliente incorrecta"
-#: netsync.cc:1657
+#: netsync.cc:1647
#, c-format
msgid "Unexpected 'refine' command on non-refined item type"
msgstr "comando 'refine' inesperado en un item de tipo no refinado"
-#: netsync.cc:1754
+#: netsync.cc:1744
#, c-format
msgid "unknown bye phase %d received"
msgstr "recibida fase de despedida %d desconocida"
-#: netsync.cc:1769
+#: netsync.cc:1759
#, c-format
msgid "Unexpected 'done' command on non-refined item type"
msgstr "Comando 'done' inesperado en item de tipo no refinado"
-#: netsync.cc:1841
+#: netsync.cc:1831
#, c-format
msgid "%s with hash '%s' does not exist in our database"
msgstr "%s con hash '%s' no existe en nuestra base de datos"
-#: netsync.cc:1945
+#: netsync.cc:1935
#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
-msgstr "Epoca no concordante en rama %s. Servidor tiene '%s', cliente tiene '%s'."
+msgstr ""
+"Epoca no concordante en rama %s. Servidor tiene '%s', cliente tiene '%s'."
-#: netsync.cc:1963
+#: netsync.cc:1953
#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
msgstr ""
"chequeo del hash falló para la llave pública '%s' (%s); esperaba '%s' obtuvo "
"'%s'"
-#: netsync.cc:1977
+#: netsync.cc:1967
#, c-format
msgid "hash check failed for revision cert '%s'"
msgstr "chequeo del hash falló para el certificado de revisión '%s'"
-#: netsync.cc:2039
+#: netsync.cc:2029
#, c-format
msgid "Received warning from usher: %s"
msgstr "Recibió advertencia de 'usher': %s"
# TODO: que tal "productor y consumidor"
-#: netsync.cc:2126 netsync.cc:2157
+#: netsync.cc:2116 netsync.cc:2147
msgid "source and sink"
msgstr "fuente y destino"
-#: netsync.cc:2127 netsync.cc:2158
+#: netsync.cc:2117 netsync.cc:2148
msgid "source"
msgstr "fuente"
-#: netsync.cc:2127 netsync.cc:2158
+#: netsync.cc:2117 netsync.cc:2148
msgid "sink"
msgstr "destino"
-#: netsync.cc:2314
+#: netsync.cc:2304
#, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch"
-msgstr "bufer de entrada para el peer %s está rebasado despues del netcmd 'dispatch'"
+msgstr ""
+"bufer de entrada para el peer %s está rebasado despues del netcmd 'dispatch'"
-#: netsync.cc:2326 netsync.cc:2425
+#: netsync.cc:2316 netsync.cc:2415
#, c-format
msgid "protocol error while processing peer %s: '%s'"
msgstr "error de protocolo procesando el peer %s: '%s'"
-#: netsync.cc:2332
+#: netsync.cc:2322
#, c-format
msgid "error: %s"
msgstr "error: %s"
-#: netsync.cc:2396
+#: netsync.cc:2386
#, c-format
msgid "connecting to %s"
msgstr "conectandose a %s"
-#: netsync.cc:2440
+#: netsync.cc:2430
#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting"
msgstr "tiempo expiró esperando or E/S con el peer %s, desconectando"
-#: netsync.cc:2463
+#: netsync.cc:2453
#, c-format
msgid "processing failure while talking to peer %s, disconnecting"
msgstr "falla de procesamiento hablando con peer %s, desconectando"
-#: netsync.cc:2480
+#: netsync.cc:2470
#, c-format
msgid "successful exchange with %s"
msgstr "intercambio exitoso con %s"
-#: netsync.cc:2486
+#: netsync.cc:2476
#, c-format
msgid "peer %s disconnected after we informed them of error"
msgstr "peer %s desconectado despues de ser informado de error"
-#: netsync.cc:2491
+#: netsync.cc:2481
#, c-format
msgid "I/O failure while talking to peer %s, disconnecting"
msgstr "falla de E/S hablando con el peer %s, desconectando"
-#: netsync.cc:2557
+#: netsync.cc:2547
#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad"
msgstr ""
"error de protocolo mientras se procesaba peer %s: '%s', marcado como "
"incorrecto"
-#: netsync.cc:2589
+#: netsync.cc:2579
#, c-format
msgid "accepted new client connection from %s : %s"
msgstr "nueva conexión de cliente aceptada desde %s : %s"
-#: netsync.cc:2626
+#: netsync.cc:2616
#, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting"
msgstr "error de protocolo mientras se procesaba peer %s: '%s', desconectando"
-#: netsync.cc:2637
+#: netsync.cc:2627
#, c-format
msgid "peer %s read failed in working state (error)"
msgstr "lectura del peer %s falló en estado 'working' (error)"
-#: netsync.cc:2642
+#: netsync.cc:2632
#, 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 ""
"lectura del peer %s falló en estado 'shutdown' (posiblemente el cliente "
"reportó incorrectamente un error)"
-#: netsync.cc:2648
+#: netsync.cc:2638
#, c-format
msgid "peer %s read failed in confirmed state (success)"
msgstr "lectura del peer %s falló en estado 'confirmed' (éxito)"
-#: netsync.cc:2669
+#: netsync.cc:2659
#, c-format
msgid "peer %s write failed in working state (error)"
msgstr "escritura del peer '%s' falló en estado 'working' (error)"
-#: netsync.cc:2674
+#: netsync.cc:2664
#, 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 ""
"escritura del peer %s falló en estado 'shutdown' (posiblemente el cliente "
"reportó incorrectamente el error)"
-#: netsync.cc:2680
+#: netsync.cc:2670
#, c-format
msgid "peer %s write failed in confirmed state (success)"
msgstr "escritura del peer %s falló en estado 'confirmed' (éxito)"
-#: netsync.cc:2707
+#: netsync.cc:2697
#, c-format
msgid "peer %s processing finished, disconnecting"
msgstr "procesado del peer %s concluido, desconectando"
-#: netsync.cc:2729
+#: netsync.cc:2719
#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting"
msgstr "fd %d (peer %s) inactivo por demasiado tiempo, desconectando"
-#: netsync.cc:2797
+#: netsync.cc:2787
#, c-format
msgid "beginning service on %s : %s"
msgstr "comenzando servicio en %s : %s"
-#: netsync.cc:2798
+#: netsync.cc:2788
msgid ""
msgstr ""
-#: netsync.cc:2812
+#: netsync.cc:2802
#, c-format
msgid "session limit %d reached, some connections will be refused"
msgstr "limite de sesiones %d alcanzado, algunas conexiones serán rechazadas"
-#: netsync.cc:2879
+#: netsync.cc:2869
#, c-format
msgid "Network error on peer %s, disconnecting"
msgstr "error de red en el peer %s, desconectando"
-#: netsync.cc:2885
+#: netsync.cc:2875
#, c-format
msgid "got OOB from peer %s, disconnecting"
msgstr "OOB recibido del peer %s, desconectando"
-#: netsync.cc:2945
+#: netsync.cc:2935
#, c-format
msgid "beginning service on %s"
msgstr "comenzando servicio en %s"
-#: netsync.cc:3008
+#: netsync.cc:2998
#, c-format
msgid "got some OOB data on fd %d (peer %s), disconnecting"
msgstr "data OOB recibida via el fd %d (peer %s), desconectando"
-#: netsync.cc:3057
+#: netsync.cc:3047
#, c-format
msgid "finding items to synchronize:"
msgstr "buscando items que sincronizar:"
-#: netsync.cc:3065
+#: netsync.cc:3055
msgid "certificates"
msgstr "certificados"
-#: netsync.cc:3178
+#: netsync.cc:3164
#, c-format
msgid "Cannot find key '%s'"
msgstr "No puedo encontrar llave '%s'"
-#: netsync.cc:3218
+#: netsync.cc:3204
#, c-format
msgid ""
"include branch pattern contains a quote character:\n"
@@ -3089,7 +3081,7 @@ msgstr ""
"patrón de inclusión de rama contiene comillas:\n"
"%s"
-#: netsync.cc:3224
+#: netsync.cc:3210
#, c-format
msgid ""
"exclude branch pattern contains a quote character:\n"
@@ -3098,7 +3090,7 @@ msgstr ""
"patrón de exclusión de rama contiene comillas:\n"
"%s"
-#: netsync.cc:3259 netsync.cc:3263
+#: netsync.cc:3245 netsync.cc:3249
#, c-format
msgid "network error: %s"
msgstr "error de red: %s"
@@ -3173,7 +3165,8 @@ msgid "use external diff hook for genera
#: options_list.hh:189
msgid "use external diff hook for generating diffs"
-msgstr "usa un hook de 'diff' externo para general las diferencias entre archivos"
+msgstr ""
+"usa un hook de 'diff' externo para general las diferencias entre archivos"
#: options_list.hh:196
msgid "use unified diff format"
@@ -3189,7 +3182,8 @@ msgid "when rosterifying, drop attrs ent
#: options_list.hh:220
msgid "when rosterifying, drop attrs entries with the given key"
-msgstr "al generar los rosters, descarta entradas de atributos con la llave dada"
+msgstr ""
+"al generar los rosters, descarta entradas de atributos con la llave dada"
#: options_list.hh:228
msgid "don't perform the operation, just show what would have happened"
@@ -3246,7 +3240,8 @@ msgid "set filename containing commit ch
#: options_list.hh:339
msgid "set filename containing commit changelog message"
-msgstr "configura el archivo que contiene el mensaje de 'changelog' del 'commit'"
+msgstr ""
+"configura el archivo que contiene el mensaje de 'changelog' del 'commit'"
#: options_list.hh:347
msgid "perform the operations for files missing from workspace"
@@ -3290,7 +3285,8 @@ msgid "suppress warning, verbose, inform
#: options_list.hh:431
msgid "suppress warning, verbose, informational and progress messages"
-msgstr "suprime mensajes adicionales, de advertencia, informacionales y de progreso"
+msgstr ""
+"suprime mensajes adicionales, de advertencia, informacionales y de progreso"
#: options_list.hh:441
msgid "also operate on the contents of any listed directories"
@@ -3418,22 +3414,22 @@ msgstr "error sintáctico %d:%d: esperab
msgid "parse failure %d:%d: expecting word"
msgstr "error sintáctico %d:%d: esperaba palabra"
-#: rcs_import.cc:721
+#: rcs_import.cc:722
#, c-format
msgid "parsing RCS file %s"
msgstr "analizando archivo RCS %s"
-#: rcs_import.cc:724
+#: rcs_import.cc:725
#, c-format
msgid "parsed RCS file %s OK"
msgstr "archivo RCS %s analizado correctamente"
-#: rcs_import.cc:913
+#: rcs_import.cc:914
#, c-format
msgid "error reading RCS file %s: %s"
msgstr "error leyendo archvio RCS %s: %s"
-#: rcs_import.cc:1210
+#: rcs_import.cc:1211
#, c-format
msgid ""
"%s appears to be a CVS repository root directory\n"
@@ -3442,17 +3438,17 @@ msgstr ""
"%s parece ser el directorio raiz de un repositorio CVS\n"
"intente más bien importando un módulo, con 'cvs_import %s/"
-#: rcs_import.cc:1222
+#: rcs_import.cc:1223
#, c-format
msgid "need base --branch argument for importing"
msgstr "necesita el argumento '--branch' para poder importar"
-#: rcs_import.cc:1234
+#: rcs_import.cc:1235
#, c-format
msgid "path %s does not exist"
msgstr "camino %s no existe"
-#: rcs_import.cc:1269
+#: rcs_import.cc:1270
msgid "tags"
msgstr "etiquetas"
@@ -3588,10 +3584,6 @@ msgstr "abuso: "
msgid "misuse: "
msgstr "abuso: "
-#: sanity.cc:234
-msgid "error: "
-msgstr "error: "
-
#: sanity.cc:242
#, c-format
msgid "%s:%d: invariant '%s' violated"
@@ -3607,54 +3599,157 @@ msgstr "Conjunto de trabajo actual: %i e
msgid "Current work set: %i items"
msgstr "Conjunto de trabajo actual: %i elementos"
-#: schema_migration.cc:258
+#: selectors.cc:43
+#, fuzzy, c-format
+msgid "expanded selector '%s' -> '%s'"
+msgstr "expandiendo selección '%s'"
+
+#: selectors.cc:80
+#, fuzzy, c-format
+msgid "unknown selector type: %c"
+msgstr "tipo de paquete desconocido: '%s'"
+
+#: selectors.cc:89
+#, fuzzy, c-format
+msgid "selector '%s' is not a valid date\n"
+msgstr "la raiz de búsqueda '%s' no es un directorio"
+
+#: selectors.cc:95
#, c-format
-msgid "calculating necessary migration steps"
-msgstr "calculando los pasos necesarios para migración"
+msgid "selector '%s' is not a valid date (%s)"
+msgstr ""
-#: schema_migration.cc:270
+#: selectors.cc:98
+#, fuzzy, c-format
+msgid "expanded date '%s' -> '%s'\n"
+msgstr "id parcial expandida de '%s' a '%s'"
+
+#: schema_migration.cc:78
+msgid ""
+"make sure database and containing directory are writeable\n"
+"and you have not run out of disk space"
+msgstr ""
+"asegurese que la base de datos y el directorio que la contiene tengan\n"
+"permiso de escritura y que no se haya quedado sin espacio en disco"
+
+#: schema_migration.cc:88
+msgid ""
+"(if this is a database last used by monotone 0.16 or older,\n"
+"you must follow a special procedure to make it usable again.\n"
+"see the file UPGRADE, in the distribution, for instructions.)"
+msgstr ""
+
+#: schema_migration.cc:97
#, c-format
-msgid "error at transaction BEGIN statement"
-msgstr "error en el comando BEGIN de la transacción"
+msgid ""
+"sqlite error: %s\n"
+"%s"
+msgstr ""
+"error sqlite: %s\n"
+"%s"
-#: schema_migration.cc:271
+#: schema_migration.cc:511
#, c-format
-msgid "migrating data"
-msgstr "migrando data"
+msgid "public and private keys for %s don't match"
+msgstr "llaves pública y privada de %s no concuerdan"
-#: schema_migration.cc:297
+#: schema_migration.cc:513
#, c-format
-msgid "migration step failed: %s"
-msgstr "migración fallo en el paso: %s"
+msgid "moving key '%s' from database to %s"
+msgstr "moviendo llave '%s' de la base de datos a %s"
-#: schema_migration.cc:311
+#: schema_migration.cc:889
#, c-format
-msgid "mismatched result of migration, got %s, wanted %s"
-msgstr "resultado no concordante en la migración, obtuvo %s, esperaba %s"
+msgid "%s (usable)"
+msgstr ""
-#: schema_migration.cc:314
+#: schema_migration.cc:891
#, c-format
-msgid "committing changes to database"
-msgstr "guardando cambios en la base de datos"
+msgid "%s (migration needed)"
+msgstr ""
-#: schema_migration.cc:316
+#: schema_migration.cc:893
#, c-format
-msgid "failure on COMMIT"
-msgstr "falla en el COMMIT"
+msgid "%s (too new, cannot use)"
+msgstr ""
-#: schema_migration.cc:318
+#: schema_migration.cc:895
+#, fuzzy, c-format
+msgid "%s (not a monotone database)"
+msgstr "configura el nombre de la base de datos"
+
+#: schema_migration.cc:897
#, c-format
-msgid "optimizing database"
-msgstr "optimizando la base de datos"
+msgid "%s (database has no tables!)"
+msgstr ""
-#: schema_migration.cc:320
+#: schema_migration.cc:910
#, c-format
-msgid "error vacuuming after migration"
-msgstr "error limpiando despues de la migración"
+msgid ""
+"cannot use the empty sqlite database %s\n"
+"(monotone databases must be created with '%s db init')"
+msgstr ""
-#: schema_migration.cc:329
+#: schema_migration.cc:915
+#, fuzzy, c-format
+msgid "%s does not appear to be a monotone database\n"
+msgstr "llave '%s' no es igual a la llave '%s' en la base de datos"
+
+#: schema_migration.cc:919
#, c-format
msgid ""
+"%s appears to be a monotone database, but this version of\n"
+"monotone does not recognize its schema.\n"
+"you probably need a newer version of monotone."
+msgstr ""
+
+#: schema_migration.cc:938
+#, fuzzy, c-format
+msgid ""
+"database %s is laid out according to an old schema\n"
+"try '%s db migrate' to upgrade\n"
+"(this is irreversible; you may want to make a backup copy first)"
+msgstr ""
+"organización de la base de datos %s no concuerda con esta versión de "
+"monotone\n"
+"esquema requerido %s, obtuvo %s\n"
+"pruebe '%s db migrate' para actualizarla\n"
+"(esto es irreversible, primero haga una copia de seguridad)"
+
+#: schema_migration.cc:960
+#, fuzzy, c-format
+msgid "calculating migration..."
+msgstr "calculando los pasos necesarios para migración"
+
+#: schema_migration.cc:973
+#, fuzzy, c-format
+msgid "no migration performed; database schema already up-to-date"
+msgstr ""
+"no se realizó migración; esquema de la base de datos ya está al dia en %s"
+
+#: schema_migration.cc:980
+#, fuzzy, c-format
+msgid "migrating data..."
+msgstr "migrando data"
+
+#: schema_migration.cc:1002
+#, fuzzy, c-format
+msgid "migrated to schema %s"
+msgstr "migración fallo en el paso: %s"
+
+#: schema_migration.cc:1005
+#, c-format
+msgid "committing changes to database"
+msgstr "guardando cambios en la base de datos"
+
+#: schema_migration.cc:1009
+#, c-format
+msgid "optimizing database"
+msgstr "optimizando la base de datos"
+
+#: schema_migration.cc:1019
+#, 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'"
@@ -3664,7 +3759,7 @@ msgstr ""
"el lider de proyecto, revise en el archivo UPGRADE instrucciones para\n"
"ejecutar '%s db %s'"
-#: schema_migration.cc:336
+#: schema_migration.cc:1026
#, c-format
msgid ""
"NOTE: this upgrade cleared monotone's caches\n"
@@ -3673,26 +3768,21 @@ msgstr ""
"NOTA: esta actualización limpió el cache de monotone\n"
"ud. debe ahora ejecutar '%s db regenerate_caches'"
-#: schema_migration.cc:349
+#: schema_migration.cc:1057
#, c-format
-msgid "database schema %s is unknown; cannot perform migration"
-msgstr "esquema de la base de datos %s es desconocido; no se puede realizar migración"
+msgid "cannot test migration from unknown schema %s"
+msgstr ""
-#: schema_migration.cc:354
+#: schema_migration.cc:1060
#, c-format
-msgid "no migration performed; database schema already up-to-date at %s"
-msgstr "no se realizó migración; esquema de la base de datos ya está al dia en %s"
+msgid "schema %s is up to date"
+msgstr ""
-#: schema_migration.cc:913
-#, c-format
-msgid "public and private keys for %s don't match"
-msgstr "llaves pública y privada de %s no concuerdan"
+#: schema_migration.cc:1071
+#, fuzzy, c-format
+msgid "successful migration to schema %s"
+msgstr "intercambio exitoso con %s"
-#: schema_migration.cc:916
-#, c-format
-msgid "moving key '%s' from database to %s"
-msgstr "moviendo llave '%s' de la base de datos a %s"
-
#: std_hooks.lua:39
msgid "Press enter"
msgstr "Presione Entrar"
@@ -3701,6 +3791,16 @@ msgstr "Presione Entrar cuando el subpro
msgid "Press enter when the subprocess has completed"
msgstr "Presione Entrar cuando el subproceso haya terminado"
+#: transforms.cc:91
+#, c-format
+msgid ""
+"%s\n"
+"this may be due to a memory glitch, data corruption during\n"
+"a network transfer, corruption of your database or workspace,\n"
+"or a bug in monotone. if the error persists, please contact\n"
+"%s for assistance.\n"
+msgstr ""
+
#: ui.cc:158
#, c-format
msgid "%.1f G"
@@ -3753,12 +3853,13 @@ msgstr "La sintaxis URI es inválida. Us
msgid "The URI syntax is invalid. Maybe you used an URI in scp-style?"
msgstr "La sintaxis URI es inválida. Uso ud. un URI estilo 'scp'?"
-#: update.cc:72
+#: update.cc:71
#, c-format
msgid "failed to decode boolean testresult cert value '%s'"
-msgstr "no se pudo decodificar el valor del certificado 'testresult' booleano '%s'"
+msgstr ""
+"no se pudo decodificar el valor del certificado 'testresult' booleano '%s'"
-#: update.cc:166
+#: update.cc:160
#, c-format
msgid "cannot determine branch for update"
msgstr "no se pudo determinar rama para hacer actualización"
@@ -3847,7 +3948,8 @@ msgstr "agregando %s al manifiesto del Ã
#: 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 ""
"no se pudo agregar %s, porque %s esta registrado como un archivo en el "
"manifiesto del área de trabajo"
@@ -3897,27 +3999,27 @@ msgstr "modificando %s"
msgid "modifying %s"
msgstr "modificando %s"
-#: work.cc:975
+#: work.cc:984
#, c-format
msgid "missing directory '%s'"
msgstr "directorio faltante '%s'"
-#: work.cc:980
+#: work.cc:989
#, c-format
msgid "not a directory '%s'"
msgstr "no es un directorio '%s'"
-#: work.cc:993
+#: work.cc:1002
#, c-format
msgid "missing file '%s'"
msgstr "archivo faltante '%s'"
-#: work.cc:998
+#: work.cc:1007
#, c-format
msgid "not a file '%s'"
msgstr "no es un archivo '%s'"
-#: work.cc:1009
+#: work.cc:1018
#, c-format
msgid ""
"%d missing items; use '%s ls missing' to view\n"
@@ -3936,92 +4038,92 @@ msgstr ""
" '%s drop --missing' o\n"
" '%s revert --missing'"
-#: work.cc:1155
+#: work.cc:1164
#, c-format
msgid "skipping %s, not currently tracked"
msgstr "saltandose %s, no está versionado actualmente"
-#: work.cc:1165
+#: work.cc:1174
#, c-format
msgid "cannot remove %s/, it is not empty"
msgstr "no puede borrar %s/, no esta vacio"
-#: work.cc:1176
+#: work.cc:1185
#, c-format
msgid "dropping %s from workspace manifest"
msgstr "eliminando %s del manifiesto del área de trabajo"
-#: work.cc:1229
+#: work.cc:1238
#, c-format
msgid "destination dir %s/ is not versioned (perhaps add it?)"
msgstr "directorio de destino %s/ no esta versionado (quizas deba agregarlo)"
-#: work.cc:1232
+#: work.cc:1241
#, c-format
msgid "destination %s is an existing file in current revision"
msgstr "destino %s es un archivo existente en la revisión actual"
-#: work.cc:1242
+#: work.cc:1251
#, c-format
msgid "empty path %s is not allowed"
msgstr "camino vacio %s no esta permitido"
-#: work.cc:1256
+#: work.cc:1265
#, c-format
msgid "%s does not exist in current manifest"
msgstr "%s no existe en el manifiesto actual"
-#: work.cc:1259
+#: work.cc:1268
#, c-format
msgid "destination %s already exists in current manifest"
msgstr "destino %s ya existe en el manifiesto actual"
-#: work.cc:1265
+#: work.cc:1274
#, c-format
msgid "destination directory %s does not exist in current manifest"
msgstr "directorio de destino %s no existe en el manifiesto actual"
-#: work.cc:1267
+#: work.cc:1276
#, c-format
msgid "destination directory %s is not a directory"
msgstr "directorio de destino %s no es un directorio"
-#: work.cc:1276
+#: work.cc:1285
#, c-format
msgid "renaming %s to %s in workspace manifest"
msgstr "renombrando %s a %s en el manifiesto del área de trabajo"
-#: work.cc:1304
+#: work.cc:1313
#, c-format
msgid "%s doesn't exist in workspace, skipping"
msgstr "%s no existe en el área de trabajo, ignorada"
-#: work.cc:1308
+#: work.cc:1317
#, c-format
msgid "destination %s already exists in workspace, skipping"
msgstr "destino %s ya existe en el área de trabajo, ignorado"
-#: work.cc:1338
+#: work.cc:1347
#, c-format
msgid "proposed new root directory '%s' is not versioned or does not exist"
msgstr "nuevo directorio raiz propuesto '%s' no esta versionado o no existe"
-#: work.cc:1340
+#: work.cc:1349
#, c-format
msgid "proposed new root directory '%s' is not a directory"
msgstr "nuevo directorio raiz propuesto '%s' no es un directorio"
-#: work.cc:1345
+#: work.cc:1354
#, c-format
msgid "proposed new root directory '%s' contains illegal path %s"
msgstr "nuevo directorio raiz propuesto '%s' contiene camino ilegal %s"
-#: work.cc:1355
+#: work.cc:1364
#, c-format
msgid "directory '%s' is not versioned or does not exist"
msgstr "directorio '%s' no está versionado o no existe"
-#: work.cc:1361
+#: work.cc:1370
#, c-format
msgid "'%s' is in the way"
msgstr "'%s' está en el camino"
@@ -4106,3 +4208,37 @@ msgstr "esta área de trabajo está en e
msgid "this workspace is in the current format, no migration is necessary."
msgstr "esta área de trabajo está en el formato actual, no es necesario migrar"
+#~ msgid "unable to probe database version in file %s"
+#~ msgstr ""
+#~ "incapaz de determinar la versión de la base de datos en el archivo %s"
+
+#~ msgid "database %s is not an sqlite version 3 file, try dump and reload"
+#~ msgstr ""
+#~ "base de datos %s no es un archivo sqlite versión 3,\n"
+#~ "intente un 'dump' y 'reload'"
+
+#~ msgid "could not initialize database: %s: already exists"
+#~ msgstr "no puede inicializar la base de datos: %s: ya existe"
+
+#~ msgid "cannot create %s; it already exists"
+#~ msgstr "no puede crear %s; ya existe"
+
+#~ msgid "could not open database '%s': %s"
+#~ msgstr "no puede abrir base de datos '%s': %s"
+
+#~ msgid "error at transaction BEGIN statement"
+#~ msgstr "error en el comando BEGIN de la transacción"
+
+#~ msgid "mismatched result of migration, got %s, wanted %s"
+#~ msgstr "resultado no concordante en la migración, obtuvo %s, esperaba %s"
+
+#~ msgid "failure on COMMIT"
+#~ msgstr "falla en el COMMIT"
+
+#~ msgid "error vacuuming after migration"
+#~ msgstr "error limpiando despues de la migración"
+
+#~ msgid "database schema %s is unknown; cannot perform migration"
+#~ msgstr ""
+#~ "esquema de la base de datos %s es desconocido; no se puede realizar "
+#~ "migración"
============================================================
--- po/fr.po 7837e341823decadddae131fd0fbfaa920cc428e
+++ po/fr.po 15008ff2f6c77b715ac251062bc007f4cf592926
@@ -243,7 +243,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: monotone 0.28\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-15 00:27+0100\n"
+"POT-Creation-Date: 2007-01-23 08:09-0800\n"
"PO-Revision-Date: 2006-09-22 23:40+0200\n"
"Last-Translator: Benoît Dejean \n"
"Language-Team: Benoît Dejean \n"
@@ -252,27 +252,27 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: app_state.cc:129
+#: app_state.cc:130
#, c-format
msgid "workspace required but not found%s%s"
msgstr "espace de travail requis mais pas trouvé%s%s"
-#: app_state.cc:137
+#: app_state.cc:138
#, c-format
msgid "invalid directory ''"
msgstr "dossier pas valable «»"
-#: app_state.cc:145
+#: app_state.cc:146
#, 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:201
+#: app_state.cc:208
#, c-format
msgid "search root '%s' does not exist"
msgstr "le racine de l'espace de travail « %s » n'existe pas"
-#: app_state.cc:202
+#: app_state.cc:209
#, fuzzy, c-format
msgid "search root '%s' is not a directory"
msgstr "le racine de l'espace de travail « %s » n'est pas un dossier\n"
@@ -283,21 +283,21 @@ msgstr "[BRANCHE]"
#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218
#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529
-#: automate.cc:898 automate.cc:1028 automate.cc:1072 automate.cc:1098
-#: automate.cc:1125 automate.cc:1152 automate.cc:1186 automate.cc:1297
-#: automate.cc:1394 automate.cc:1453 automate.cc:1499 automate.cc:1559
-#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:656
+#: automate.cc:905 automate.cc:1035 automate.cc:1079 automate.cc:1105
+#: automate.cc:1132 automate.cc:1159 automate.cc:1193 automate.cc:1305
+#: automate.cc:1395 automate.cc:1454 automate.cc:1500 automate.cc:1560
+#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:669
#, c-format
msgid "wrong argument count"
msgstr ""
-#: automate.cc:88 automate.cc:135 automate.cc:1183
+#: automate.cc:88 automate.cc:135 automate.cc:1190
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:429 automate.cc:454
-#: automate.cc:1193 cmd_list.cc:663 revision.cc:1705
+#: automate.cc:1200 cmd_list.cc:676 revision.cc:1705
#, c-format
msgid "No such revision %s"
msgstr "Aucune révision « %s »"
@@ -319,14 +319,14 @@ msgstr "NOUVELLE_RÃV [ANCIENNE_RÃV1 [A
msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
msgstr "NOUVELLE_RÃV [ANCIENNE_RÃV1 [ANCIENNE_RÃV2 [...]]]"
-#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:942
-#: automate.cc:963 automate.cc:1249 cmd_automate.cc:78 cmd_automate.cc:332
-#: cmd_list.cc:564
+#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:949
+#: automate.cc:970 automate.cc:1256 cmd_automate.cc:78 cmd_automate.cc:332
+#: cmd_list.cc:577
#, c-format
msgid "no arguments needed"
msgstr ""
-#: automate.cc:423 automate.cc:448 cmd_list.cc:653 revision.cc:1699
+#: automate.cc:423 automate.cc:448 cmd_list.cc:666 revision.cc:1699
msgid "REV"
msgstr "RÃV"
@@ -334,84 +334,84 @@ msgstr "SÃLECTEUR"
msgid "SELECTOR"
msgstr "SÃLECTEUR"
-#: automate.cc:895 automate.cc:1025
+#: automate.cc:902 automate.cc:1032
msgid "[REVID]"
msgstr "[ID_RÃV]"
-#: automate.cc:924 automate.cc:1047 automate.cc:1507 automate.cc:1566
-#: automate.cc:1571
+#: automate.cc:931 automate.cc:1054 automate.cc:1508 automate.cc:1567
+#: automate.cc:1572
#, 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:1069 automate.cc:1095 cmd_merging.cc:845
+#: automate.cc:1076 automate.cc:1102 cmd_merging.cc:837
msgid "REVID"
msgstr "ID_RÃVISION"
-#: automate.cc:1080 automate.cc:1106 automate.cc:1161 automate.cc:1163
+#: automate.cc:1087 automate.cc:1113 automate.cc:1168 automate.cc:1170
#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419
-#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:677
-#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:535
-#: cmd_ws_commit.cc:1023 commands.cc:413
+#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:669
+#: cmd_merging.cc:684 cmd_merging.cc:687 cmd_ws_commit.cc:517
+#: cmd_ws_commit.cc:987 commands.cc:411
#, c-format
msgid "no such revision '%s'"
msgstr "aucune révision « %s »"
-#: automate.cc:1122 cmd_files.cc:250
+#: automate.cc:1129 cmd_files.cc:250
msgid "FILEID"
msgstr "ID_FICHIER"
-#: automate.cc:1133
+#: automate.cc:1140
#, c-format
msgid "no such file '%s'"
msgstr "aucun fichier « %s »"
-#: automate.cc:1149
+#: automate.cc:1156
msgid "OLD_FILE NEW_FILE"
msgstr "ANCIEN_FICHIER NOUVEL_FICHIER"
-#: automate.cc:1294
+#: automate.cc:1302
msgid "[BRANCH_PATTERN]"
msgstr "[MOTIF_DE_BRANCHE]"
-#: automate.cc:1391
+#: automate.cc:1392
msgid "KEYID PASSPHRASE"
msgstr "ID_CLEF PHRASE_DE_PASSE"
-#: automate.cc:1409 cmd_key_cert.cc:42
+#: automate.cc:1410 cmd_key_cert.cc:42
#, c-format
msgid "key '%s' already exists"
msgstr "la clef « %s » existe déjà "
-#: automate.cc:1412 cmd_key_cert.cc:45
+#: automate.cc:1413 cmd_key_cert.cc:45
#, c-format
msgid "generating key-pair '%s'"
msgstr "génération de la paire de clef « %s »"
-#: automate.cc:1414 cmd_key_cert.cc:47
+#: automate.cc:1415 cmd_key_cert.cc:47
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "enregistrement de la paire de clefs « %s » dans %s/"
-#: automate.cc:1450
+#: automate.cc:1451
msgid "OPTION"
msgstr "OPTION"
-#: automate.cc:1473
+#: automate.cc:1474
#, 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:1496
+#: automate.cc:1497
msgid "REV FILE"
msgstr "RÃV FICHIER"
-#: automate.cc:1513 automate.cc:1577
+#: automate.cc:1514 automate.cc:1578
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "le fichier « %s » est inconnu pour la révision %s"
-#: automate.cc:1556
+#: automate.cc:1557
msgid "REV1 FILE REV2"
msgstr "RÃV1 FICHIER RÃV2"
@@ -420,43 +420,43 @@ msgstr "erreur dans %s:%d:%d:EÂ : %s"
msgid "parsing a %s at %d:%d:E: %s"
msgstr "erreur dans %s:%d:%d:EÂ : %s"
-#: cert.cc:83
+#: cert.cc:82
#, 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:90
#, 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:156
#, 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:213
#, 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:302
#, 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:386 keys.cc:561
#, 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:464
#, c-format
msgid ""
"you have no private key to make signatures with\n"
@@ -465,7 +465,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:467
#, c-format
msgid ""
"you have multiple private keys\n"
@@ -475,21 +475,21 @@ msgstr ""
"choisissez-en une à utiliser pour vos signatures en ajoutant « -"
"k » à votre commande"
-#: cert.cc:485
+#: cert.cc:484
#, 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:491
#, 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:495
#, c-format
msgid ""
"multiple branch certs found for revision %s, please provide a branch name"
@@ -517,16 +517,16 @@ msgstr "mauvaise donnée en entrée à p
msgid "Bad input to automate stdio: expected '%c' token"
msgstr "mauvaise donnée en entrée à parse_basic_io"
-#: cmd_automate.cc:344
+#: cmd_automate.cc:348
#, fuzzy, c-format
msgid "Bad input to automate stdio: command name is missing"
msgstr "mauvaise donnée en entrée à parse_basic_io"
-#: cmd_automate.cc:373
+#: cmd_automate.cc:377
msgid "automation"
msgstr "automatisation"
-#: cmd_automate.cc:374
+#: cmd_automate.cc:378
msgid "automation interface"
msgstr "interface d'automatisation"
@@ -610,8 +610,8 @@ msgstr "aucune variable nommée %s dans
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:465 cmd_diff_log.cc:603 cmd_files.cc:114
-#: cmd_files.cc:220 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:429
+#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:602 cmd_files.cc:114
+#: cmd_files.cc:220 cmd_list.cc:471 cmd_merging.cc:606 cmd_ws_commit.cc:411
#: commands.cc:275
msgid "informative"
msgstr "information"
@@ -634,8 +634,8 @@ msgstr ""
msgid "more than two revisions given"
msgstr ""
-#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308
-#: cmd_ws_commit.cc:349 cmd_ws_commit.cc:429 cmd_ws_commit.cc:735
+#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:302
+#: cmd_ws_commit.cc:337 cmd_ws_commit.cc:411 cmd_ws_commit.cc:707
msgid "[PATH]..."
msgstr "[CHEMIN]..."
@@ -671,11 +671,11 @@ msgstr "[FICHIER] ..."
msgid "[FILE [...]]"
msgstr "[FICHIER] ..."
-#: cmd_diff_log.cc:603
+#: cmd_diff_log.cc:602
msgid "[FILE] ..."
msgstr "[FICHIER] ..."
-#: cmd_diff_log.cc:604
+#: cmd_diff_log.cc:603
#, fuzzy
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
@@ -690,7 +690,7 @@ msgstr "seul un de --last et --next est
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
+#: cmd_merging.cc:837 cmd_othervcs.cc:15
msgid "debug"
msgstr "débogue"
@@ -794,33 +794,38 @@ msgstr "écrire un fichier de la base de
msgid "write file from database to stdout"
msgstr "écrire un fichier de la base de donnée sur la sortie standard"
-#: cmd.hh:89
+#: cmd.hh:61
#, c-format
+msgid "ignored bookkeeping path '%s'"
+msgstr ""
+
+#: cmd.hh:94
+#, c-format
msgid "non-hex digits in id"
msgstr "chiffre non-héxadécimal dans l'id"
-#: cmd.hh:98
+#: cmd.hh:103
#, c-format
msgid "partial id '%s' does not have an expansion"
msgstr "l'identité partielle « %s » n'a pas d'expansions"
-#: cmd.hh:102
+#: cmd.hh:107
#, fuzzy, c-format
msgid "partial id '%s' has multiple ambiguous expansions:"
msgstr "l'identité partielle « %s » a plusieurs expansions ambiguës : \n"
-#: cmd.hh:110
+#: cmd.hh:115
#, c-format
msgid "expanded partial id '%s' to '%s'"
msgstr "développement de l'identité partielle « %s » de « %s »"
-#: cmd.hh:195
+#: cmd.hh:200
#, c-format
msgid "Alias for %s"
msgstr "Synonyme pour %s"
#: 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
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:143
msgid "key and cert"
msgstr "clef et certif"
@@ -882,11 +887,11 @@ msgstr "créer un certif pour une révis
msgid "create a cert for a revision"
msgstr "créer un certif pour une révision"
-#: cmd_key_cert.cc:150
+#: cmd_key_cert.cc:144
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr "RÃVISION NOM VALEUR SIGNATAIRE1 [SIGNATAIRE2 [...]]"
-#: cmd_key_cert.cc:151
+#: cmd_key_cert.cc:145
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
@@ -894,7 +899,7 @@ msgstr ""
"test s'il est possible d'avoir confiance en un certif hypothétique\n"
"avec les paramètres actuels"
-#: cmd_key_cert.cc:184
+#: cmd_key_cert.cc:178
#, fuzzy, c-format
msgid ""
"if a cert on: %s\n"
@@ -909,72 +914,72 @@ msgstr ""
"était signé par : %s\n"
"il serait : %s\n"
-#: cmd_key_cert.cc:193
+#: cmd_key_cert.cc:187
msgid "trusted"
msgstr "fiable"
-#: cmd_key_cert.cc:193
+#: cmd_key_cert.cc:187
msgid "UNtrusted"
msgstr "NON-fiable"
-#: cmd_key_cert.cc:197 cmd_key_cert.cc:210 cmd_key_cert.cc:223
-#: cmd_key_cert.cc:239 cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:191 cmd_key_cert.cc:204 cmd_key_cert.cc:217
+#: cmd_key_cert.cc:233 cmd_ws_commit.cc:202
msgid "review"
msgstr "examination"
-#: cmd_key_cert.cc:197
+#: cmd_key_cert.cc:191
msgid "REVISION TAGNAME"
msgstr "RÃVISION ÃTIQUETTE"
-#: cmd_key_cert.cc:198
+#: cmd_key_cert.cc:192
msgid "put a symbolic tag cert on a revision"
msgstr "mettre une certif-étiquette symbolique sur une révision"
-#: cmd_key_cert.cc:210
+#: cmd_key_cert.cc:204
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr "ID (pass|fail|true|false|yes|no|1|0)"
-#: cmd_key_cert.cc:211
+#: cmd_key_cert.cc:205
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:223 cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:217 cmd_ws_commit.cc:202
msgid "REVISION"
msgstr "RÃVISION"
-#: cmd_key_cert.cc:224
+#: cmd_key_cert.cc:218
msgid "approve of a particular revision"
msgstr "approuver une révision particulière"
-#: cmd_key_cert.cc:235
+#: cmd_key_cert.cc:229
#, c-format
msgid "need --branch argument for approval"
msgstr "il faut un argument --branch pour approuver"
-#: cmd_key_cert.cc:239
+#: cmd_key_cert.cc:233
msgid "REVISION [COMMENT]"
msgstr "RÃVISION [COMMENTAIRE]"
-#: cmd_key_cert.cc:240
+#: cmd_key_cert.cc:234
msgid "comment on a particular revision"
msgstr "commenter une révision en particulier"
-#: cmd_key_cert.cc:252
+#: cmd_key_cert.cc:246
#, c-format
msgid "edit comment failed"
msgstr "l'édition du commentaire a échoué"
-#: cmd_key_cert.cc:257
+#: cmd_key_cert.cc:251
#, c-format
msgid "empty comment"
msgstr "commentaire vide"
-#: cmd_list.cc:64 cmd_list.cc:677
+#: cmd_list.cc:67 cmd_list.cc:693
#, 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:77
#, c-format
msgid ""
"Key : %s\n"
@@ -987,39 +992,39 @@ msgstr ""
"Nom : %s\n"
"Valeur : %s\n"
-#: cmd_list.cc:108
+#: cmd_list.cc:111
msgid "ok"
msgstr "0K"
-#: cmd_list.cc:111
+#: cmd_list.cc:114
msgid "bad"
msgstr "mauvais"
-#: cmd_list.cc:114
+#: cmd_list.cc:117
msgid "unknown"
msgstr "inconnu"
-#: cmd_list.cc:202
+#: cmd_list.cc:205
#, c-format
msgid "(*) - only in %s/"
msgstr "(*) - uniquement dans %s/"
-#: cmd_list.cc:226
+#: cmd_list.cc:229
#, c-format
msgid "no keys found"
msgstr "aucune clef trouvée"
-#: cmd_list.cc:228
+#: cmd_list.cc:231
#, c-format
msgid "no keys found matching '%s'"
msgstr "aucune clef correspondant à « %s »"
-#: cmd_list.cc:275
+#: cmd_list.cc:281
#, c-format
msgid "no epoch for branch %s"
msgstr "la branche %s n'a pas d'époque"
-#: cmd_list.cc:459
+#: cmd_list.cc:472
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -1045,7 +1050,7 @@ msgstr ""
"missing\n"
"changed"
-#: cmd_list.cc:470
+#: cmd_list.cc:483
#, fuzzy
msgid ""
"show database objects, or the current workspace manifest, \n"
@@ -1056,10 +1061,10 @@ 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:79
-#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:349
-#: cmd_ws_commit.cc:385 cmd_ws_commit.cc:410 cmd_ws_commit.cc:635
-#: cmd_ws_commit.cc:735
+#: cmd_merging.cc:73 cmd_merging.cc:647 cmd_ws_commit.cc:79
+#: cmd_ws_commit.cc:258 cmd_ws_commit.cc:302 cmd_ws_commit.cc:337
+#: cmd_ws_commit.cc:367 cmd_ws_commit.cc:392 cmd_ws_commit.cc:607
+#: cmd_ws_commit.cc:707
msgid "workspace"
msgstr "espace de travail"
@@ -1125,12 +1130,12 @@ msgstr "sélection de la cible %s pour l
msgid "selected update target %s"
msgstr "sélection de la cible %s pour la mise à jour"
-#: cmd_merging.cc:171
+#: cmd_merging.cc:161
#, 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:169
#, fuzzy, c-format
msgid ""
"target revision is in multiple branches:%s\n"
@@ -1140,218 +1145,218 @@ 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:177
#, fuzzy, c-format
msgid "switching to branch %s"
msgstr "commence à confier sur la branche « %s »\n"
-#: cmd_merging.cc:192
+#: cmd_merging.cc:182
#, c-format
msgid ""
"target revision not in any branch\n"
"next commit will use branch %s"
msgstr ""
-#: cmd_merging.cc:262
+#: cmd_merging.cc:252
#, 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:253
#, c-format
msgid "updated to base revision %s"
msgstr "mise à jour vers la révision de base %s"
-#: cmd_merging.cc:301
+#: cmd_merging.cc:291
#, c-format
msgid "[left] %s"
msgstr "[gauche] %s"
-#: cmd_merging.cc:302
+#: cmd_merging.cc:292
#, c-format
msgid "[right] %s"
msgstr "[droite] %s"
-#: cmd_merging.cc:313 cmd_merging.cc:584
+#: cmd_merging.cc:305 cmd_merging.cc:576
#, 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:495 cmd_ws_commit.cc:981
-#: cmd_ws_commit.cc:1004 cmd_ws_commit.cc:1105 cmd_ws_commit.cc:1119
+#: cmd_merging.cc:312 cmd_merging.cc:411 cmd_merging.cc:422 cmd_merging.cc:580
+#: cmd_merging.cc:813 cmd_ws_commit.cc:477 cmd_ws_commit.cc:945
+#: cmd_ws_commit.cc:968 cmd_ws_commit.cc:1068 cmd_ws_commit.cc:1082
msgid "tree"
msgstr "arborescence"
-#: cmd_merging.cc:320
+#: cmd_merging.cc:312
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:322 cmd_merging.cc:821
#, 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:519
+#: cmd_merging.cc:327 cmd_merging.cc:461 cmd_merging.cc:464 cmd_merging.cc:826
+#: cmd_ws_commit.cc:501
#, c-format
msgid "branch '%s' is empty"
msgstr "la branche « %s » est vide"
-#: cmd_merging.cc:338
+#: cmd_merging.cc:330
#, c-format
msgid "branch '%s' is already merged"
msgstr "la branche « %s » est déjà fusionnée"
-#: cmd_merging.cc:342
+#: cmd_merging.cc:334
#, 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:355 cmd_merging.cc:400
#, c-format
msgid "merge %d / %d:"
msgstr "fusionné %d / %d :"
-#: cmd_merging.cc:364
+#: cmd_merging.cc:356
#, c-format
msgid "calculating best pair of heads to merge next"
msgstr ""
-#: cmd_merging.cc:416
+#: cmd_merging.cc:408
#, 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:411
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION"
-#: cmd_merging.cc:420
+#: cmd_merging.cc:412
msgid "merge from one branch to another asymmetrically"
msgstr "fusion d'une branche à une autre asymétriquement"
-#: cmd_merging.cc:430
+#: cmd_merging.cc:422
msgid "SOURCE-BRANCH DEST-BRANCH DIR"
msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION DOSSIER"
-#: cmd_merging.cc:431
+#: cmd_merging.cc:423
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:462 cmd_merging.cc:465
#, c-format
msgid "branch '%s' is not merged"
msgstr "la branche « %s » n'est pas fusionnée"
-#: cmd_merging.cc:478
+#: cmd_merging.cc:470
#, c-format
msgid "propagating %s -> %s"
msgstr "propage %s -> %s"
-#: cmd_merging.cc:479
+#: cmd_merging.cc:471
#, c-format
msgid "[source] %s"
msgstr "[source] %s"
-#: cmd_merging.cc:480
+#: cmd_merging.cc:472
#, c-format
msgid "[target] %s"
msgstr "[cible] %s"
-#: cmd_merging.cc:485
+#: cmd_merging.cc:477
#, 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:479
#, c-format
msgid "no action taken"
msgstr "rien n'a été fait"
-#: cmd_merging.cc:491
+#: cmd_merging.cc:483
#, 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:521
#, 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:581
msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
msgstr "RÃVISION-GAUCHE RÃVISION-DROITE BRANCHE-DESTINATION"
-#: cmd_merging.cc:590
+#: cmd_merging.cc:582
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:597
#, 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:599 cmd_merging.cc:601
#, 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:606
msgid "REV REV"
msgstr "RÃV RÃV"
-#: cmd_merging.cc:615
+#: cmd_merging.cc:607
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:617 cmd_merging.cc:619
#, 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:633
#, c-format
msgid "There are %s node_name_conflicts."
msgstr "Il y a %s node_name_conflicts."
-#: cmd_merging.cc:643
+#: cmd_merging.cc:635
#, c-format
msgid "There are %s file_content_conflicts."
msgstr "Il y a %s file_content_conflicts."
-#: cmd_merging.cc:645
+#: cmd_merging.cc:637
#, c-format
msgid "There are %s node_attr_conflicts."
msgstr "Il y a %s node_attr_conflicts."
-#: cmd_merging.cc:647
+#: cmd_merging.cc:639
#, c-format
msgid "There are %s orphaned_node_conflicts."
msgstr "Il y a %s orphaned_node_conflicts."
-#: cmd_merging.cc:649
+#: cmd_merging.cc:641
#, c-format
msgid "There are %s rename_target_conflicts."
msgstr "Il y a %s rename_target_conflicts."
-#: cmd_merging.cc:651
+#: cmd_merging.cc:643
#, c-format
msgid "There are %s directory_loop_conflicts."
msgstr "Il y a %s directory_loop_conflicts."
-#: cmd_merging.cc:655
+#: cmd_merging.cc:647
msgid "[-r FROM] -r TO [PATH...]"
msgstr "[-r DEPUIS] -r VERS [CHEMIN...]"
-#: cmd_merging.cc:656
+#: cmd_merging.cc:648
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"
@@ -1367,7 +1372,7 @@ msgstr ""
"first revision to the second."
msgstr ""
-#: cmd_merging.cc:681
+#: cmd_merging.cc:673
#, c-format
msgid ""
"revision %s is a merge\n"
@@ -1378,41 +1383,41 @@ 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:694
#, c-format
msgid "no changes to apply"
msgstr "aucun changement à appliquer"
-#: cmd_merging.cc:759
+#: cmd_merging.cc:751
#, c-format
msgid "no changes to be applied"
msgstr "aucun changement à appliquer"
-#: cmd_merging.cc:786
+#: cmd_merging.cc:778
#, c-format
msgid "no changes were applied"
msgstr "aucun changement n'ont été appliqués"
-#: cmd_merging.cc:789
+#: cmd_merging.cc:781
#, 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:813
msgid "show unmerged head revisions of branch"
msgstr "affiche les entrées non fusionné de la branche"
-#: cmd_merging.cc:836
+#: cmd_merging.cc:828
#, c-format
msgid "branch '%s' is currently merged:"
msgstr "la branche « %s » est actuellement fusionnée :"
-#: cmd_merging.cc:838
+#: cmd_merging.cc:830
#, 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:838
msgid "dump the roster associated with the given REVID"
msgstr "décharge la list associée avec l'ID_RÃV donnée"
@@ -1451,7 +1456,8 @@ msgstr "réseau"
msgstr "réseau"
#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138
-msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
+#, fuzzy
+msgid "[ADDRESS[:PORTNUMBER] [PATTERN ...]]"
msgstr "[ADRESSE[:PORT] [MOTIF]]"
#: cmd_netsync.cc:110
@@ -1651,45 +1657,45 @@ msgstr "il faut un argument --branch pou
msgid "need --branch argument for disapproval"
msgstr "il faut un argument --branch pour désapprouver"
-#: cmd_ws_commit.cc:264
+#: cmd_ws_commit.cc:258
#, fuzzy
msgid "[DIRECTORY...]"
msgstr "[DOSSIER]"
-#: cmd_ws_commit.cc:265
+#: cmd_ws_commit.cc:259
#, fuzzy
msgid "create one or more directories and add them to the workspace"
msgstr "renommer des entrées dans l'espace de travail"
-#: cmd_ws_commit.cc:285
+#: cmd_ws_commit.cc:279
#, fuzzy, c-format
msgid "directory '%s' already exists"
msgstr "le fichier « %s » existe déjà "
-#: cmd_ws_commit.cc:292
+#: cmd_ws_commit.cc:286
#, c-format
msgid "ignoring directory '%s' [see .mtn-ignore]"
msgstr ""
-#: cmd_ws_commit.cc:309
+#: cmd_ws_commit.cc:303
msgid "add files to workspace"
msgstr "ajouter des fichiers à l'espace de travail"
-#: cmd_ws_commit.cc:316
+#: cmd_ws_commit.cc:310
#, c-format
msgid "cannot set '--unknown' and '--recursive' at the same time"
msgstr ""
-#: cmd_ws_commit.cc:318
+#: cmd_ws_commit.cc:312
#, c-format
msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time"
msgstr ""
-#: cmd_ws_commit.cc:350
+#: cmd_ws_commit.cc:338
msgid "drop files from workspace"
msgstr "supprimer des fichiers de l'espace de travail"
-#: cmd_ws_commit.cc:386
+#: cmd_ws_commit.cc:368
msgid ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
@@ -1697,15 +1703,15 @@ msgstr ""
"SOURCE DESTINATION\n"
"SOURCE1 [SOURCE2 [...]] DOSSIER_DESTINATION"
-#: cmd_ws_commit.cc:388
+#: cmd_ws_commit.cc:370
msgid "rename entries in the workspace"
msgstr "renommer des entrées dans l'espace de travail"
-#: cmd_ws_commit.cc:410
+#: cmd_ws_commit.cc:392
msgid "NEW_ROOT PUT_OLD"
msgstr "RACINE_NOUVELLE PLACE_ANCIENNE"
-#: cmd_ws_commit.cc:411
+#: cmd_ws_commit.cc:393
msgid ""
"rename the root directory\n"
"after this command, the directory that currently has the name NEW_ROOT\n"
@@ -1719,31 +1725,31 @@ msgstr ""
"deviendra le dossier appelé PLACE_ANCIENNE.\n"
"Il est fortement recommandé d'employer --execute."
-#: cmd_ws_commit.cc:429
+#: cmd_ws_commit.cc:411
msgid "show status of workspace"
msgstr "afficher l'état de l'espace de travail"
-#: cmd_ws_commit.cc:458
+#: cmd_ws_commit.cc:440
#, c-format
msgid "Current branch: %s"
msgstr "Branche actuelle : %s"
-#: cmd_ws_commit.cc:464
+#: cmd_ws_commit.cc:446
#, c-format
msgid "Changes against parent %s"
msgstr "Changement par rapport au parent %s"
-#: cmd_ws_commit.cc:469
+#: cmd_ws_commit.cc:451
#, c-format
msgid " no changes"
msgstr " aucun changement"
-#: cmd_ws_commit.cc:473
+#: cmd_ws_commit.cc:455
#, c-format
msgid " dropped %s"
msgstr " supprime %s"
-#: cmd_ws_commit.cc:478
+#: cmd_ws_commit.cc:460
#, c-format
msgid ""
" renamed %s\n"
@@ -1752,21 +1758,21 @@ msgstr ""
" renomme %s\n"
" en %s"
-#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:487
+#: cmd_ws_commit.cc:465 cmd_ws_commit.cc:469
#, c-format
msgid " added %s"
msgstr " ajoute %s"
-#: cmd_ws_commit.cc:491
+#: cmd_ws_commit.cc:473
#, c-format
msgid " patched %s"
msgstr " modifie %s"
-#: cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 cmd_ws_commit.cc:1105
+#: cmd_ws_commit.cc:477 cmd_ws_commit.cc:945 cmd_ws_commit.cc:1068
msgid "[DIRECTORY]"
msgstr "[DOSSIER]"
-#: cmd_ws_commit.cc:496
+#: cmd_ws_commit.cc:478
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"
@@ -1780,47 +1786,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:514 cmd_ws_commit.cc:1048
+#: cmd_ws_commit.cc:496 cmd_ws_commit.cc:1002
#, 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:522 cmd_ws_commit.cc:1054
+#: cmd_ws_commit.cc:504 cmd_ws_commit.cc:1008
#, c-format
msgid "branch %s has multiple heads:"
msgstr "la branche %s a plusieurs entrées :"
-#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:1057
+#: cmd_ws_commit.cc:507 cmd_ws_commit.cc:1011
#, fuzzy, c-format
msgid "choose one with '%s checkout -r'"
msgstr "choisissez en un avec « %s update -r »\n"
-#: cmd_ws_commit.cc:526 cmd_ws_commit.cc:1058
+#: cmd_ws_commit.cc:508 cmd_ws_commit.cc:1012
#, c-format
msgid "branch %s has multiple heads"
msgstr "la branche %s a plusieurs entrées"
-#: cmd_ws_commit.cc:553 cmd_ws_commit.cc:1041
+#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:995
#, 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:570
+#: cmd_ws_commit.cc:542
#, c-format
msgid "you must specify a destination directory"
msgstr "vous devez préciser un dossier de destination"
-#: cmd_ws_commit.cc:583
+#: cmd_ws_commit.cc:555
#, fuzzy, c-format
msgid "checkout directory '%s' already exists"
msgstr "le fichier « %s » existe déjà "
-#: cmd_ws_commit.cc:617
+#: cmd_ws_commit.cc:589
#, 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:635
+#: cmd_ws_commit.cc:607
msgid ""
"set PATH ATTR VALUE\n"
"get PATH [ATTR]\n"
@@ -1830,45 +1836,45 @@ msgstr ""
"get CHEMIN [ATTR]\n"
"drop CHEMIN [ATTR]"
-#: cmd_ws_commit.cc:636
+#: cmd_ws_commit.cc:608
msgid "set, get or drop file attributes"
msgstr "établis, obtiens ou supprime des attributs de fichiers"
-#: cmd_ws_commit.cc:653
+#: cmd_ws_commit.cc:625
#, c-format
msgid "Unknown path '%s'"
msgstr "Chemin inconnu « %s »"
-#: cmd_ws_commit.cc:682
+#: cmd_ws_commit.cc:654
#, fuzzy, c-format
msgid "Path '%s' does not have attribute '%s'"
msgstr "Le chemin « %s » n'a pas d'attribut « %s »\n"
-#: cmd_ws_commit.cc:712
+#: cmd_ws_commit.cc:684
#, c-format
msgid "No attributes for '%s'"
msgstr "Pas d'attributs pour « %s »"
-#: cmd_ws_commit.cc:723
+#: cmd_ws_commit.cc:695
#, c-format
msgid "No attribute '%s' on path '%s'"
msgstr "Pas d'attribut « %s » pour le chemin « %s »"
-#: cmd_ws_commit.cc:736
+#: cmd_ws_commit.cc:708
msgid "commit workspace to database"
msgstr "confie un espace de travail à la base de données"
-#: cmd_ws_commit.cc:767
+#: cmd_ws_commit.cc:739
#, c-format
msgid "no changes to commit"
msgstr "aucun changement à confier"
-#: cmd_ws_commit.cc:787
+#: cmd_ws_commit.cc:759
#, fuzzy, c-format
msgid "beginning commit on branch '%s'"
msgstr "commence à confier sur la branche « %s »\n"
-#: cmd_ws_commit.cc:796
+#: cmd_ws_commit.cc:768
#, fuzzy, c-format
msgid ""
"_MTN/log is non-empty and log message was specified on command line\n"
@@ -1880,37 +1886,37 @@ msgstr ""
"veuillez déplacé ou supprimer MT/log,\n"
"ou supprimer --message/--message-file de la linge de commande"
-#: cmd_ws_commit.cc:811
+#: cmd_ws_commit.cc:783
#, fuzzy, c-format
msgid "empty log message; commit canceled"
msgstr "message du journal vide; confidence arrêtée"
-#: cmd_ws_commit.cc:833
+#: cmd_ws_commit.cc:805
#, c-format
msgid "log message rejected by hook: %s"
msgstr "entrée du journal rejetée par le hook : %s"
-#: cmd_ws_commit.cc:841
+#: cmd_ws_commit.cc:813
#, 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:880 cmd_ws_commit.cc:910
+#: cmd_ws_commit.cc:852 cmd_ws_commit.cc:882
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "le fichier « %s » a été modifié pendant le commit, interruption"
-#: cmd_ws_commit.cc:892
+#: cmd_ws_commit.cc:864
#, 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:942
+#: cmd_ws_commit.cc:906
#, c-format
msgid "committed revision %s"
msgstr "révision %s commitée"
-#: cmd_ws_commit.cc:948
+#: cmd_ws_commit.cc:912
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1919,49 +1925,49 @@ 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:982
+#: cmd_ws_commit.cc:946
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:988
+#: cmd_ws_commit.cc:952
#, c-format
msgid "need --branch argument for setup"
msgstr "setup a besoin d'un argument pour --branch"
-#: cmd_ws_commit.cc:1004
+#: cmd_ws_commit.cc:968
msgid "DIRECTORY"
msgstr "DOSSIER"
-#: cmd_ws_commit.cc:1005
+#: cmd_ws_commit.cc:969
msgid "import the contents of the given directory tree into a given branch"
msgstr ""
-#: cmd_ws_commit.cc:1016
+#: cmd_ws_commit.cc:980
#, fuzzy, c-format
msgid "you must specify a directory to import"
msgstr "vous devez préciser un dossier de destination"
-#: cmd_ws_commit.cc:1067
+#: cmd_ws_commit.cc:1021
#, fuzzy, c-format
msgid "import directory '%s' doesn't exists"
msgstr "le dossier « %s » n'existe pas"
-#: cmd_ws_commit.cc:1068
+#: cmd_ws_commit.cc:1022
#, fuzzy, c-format
msgid "import directory '%s' is a file"
msgstr ""
"impossible de créer le dossier « %s »\n"
"car c'est un fichier"
-#: cmd_ws_commit.cc:1106
+#: cmd_ws_commit.cc:1069
msgid ""
"migrate a workspace directory's metadata to the latest format; defaults to "
"the current workspace"
msgstr ""
-#: cmd_ws_commit.cc:1119
+#: cmd_ws_commit.cc:1082
msgid "refresh the inodeprint cache"
msgstr "rafraîchir le cache d'inodeprint"
@@ -1987,31 +1993,31 @@ msgstr "afficher l'aide de la commande"
msgid "display command help"
msgstr "afficher l'aide de la commande"
-#: commands.cc:420
+#: commands.cc:418
#, c-format
msgid "expanding selection '%s'"
msgstr "expansion de la sélection « %s »"
-#: commands.cc:428
+#: commands.cc:426
#, c-format
msgid "no match for selection '%s'"
msgstr "aucune correspondance pour la sélection « %s »"
-#: commands.cc:434
+#: commands.cc:432
#, fuzzy, c-format
msgid "expanded to '%s'"
msgstr "expansion à « %s »\n"
-#: commands.cc:451
+#: commands.cc:449
#, fuzzy, c-format
msgid "selection '%s' has multiple ambiguous expansions:"
msgstr "la sélection « %s » a plusieurs expansions ambiguës : \n"
-#: commands.cc:468
+#: commands.cc:466
msgid "note: "
msgstr "note : "
-#: commands.cc:469
+#: commands.cc:467
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
@@ -2020,7 +2026,7 @@ msgstr ""
"la branche « %s » a plusieurs heads\n"
"vous devriez peut-être lancer « %s merge »"
-#: commands.cc:484
+#: commands.cc:482
#, c-format
msgid "--message and --message-file are mutually exclusive"
msgstr "--message et --message-file sont mutuellement exclusifs"
@@ -2044,7 +2050,7 @@ msgstr "marquages"
msgid "markings"
msgstr "marquages"
-#: database_check.cc:306 netsync.cc:3063 rcs_import.cc:1244
+#: database_check.cc:306 netsync.cc:3053 rcs_import.cc:1245
msgid "revisions"
msgstr "révisions"
@@ -2052,7 +2058,7 @@ msgstr "ancêtre"
msgid "ancestry"
msgstr "ancêtre"
-#: database_check.cc:434 netsync.cc:3067
+#: database_check.cc:434 netsync.cc:3057
msgid "keys"
msgstr "clefs"
@@ -2333,27 +2339,19 @@ msgstr "la base de données est bonne"
msgid "database is good"
msgstr "la base de données est bonne"
-#: database.cc:159
+#: database.cc:151
#, c-format
-msgid ""
-"layout of database %s doesn't match this version of monotone\n"
-"wanted schema %s, got %s\n"
-"try '%s db migrate' to upgrade\n"
-"(this is irreversible; you may want to make a backup copy first)"
-msgstr ""
-"la disposition de la base de données %s ne correspond pas a cette version de "
-"monotone\n"
-"voulais le schéma %s, trouvais %s\n"
-"essayez « %s db migrate » pour mettre la base de données à niveau\n"
-"(cette opération est irréversible; vous voudrez probablement prendre une "
-"copie d'abord)"
+msgid "this database already contains rosters"
+msgstr "cette base de données contient déjà des listes"
-#: database.cc:173
+#: database.cc:177
#, c-format
-msgid "this database already contains rosters"
-msgstr "cette base de données contient déjà des listes"
+msgid ""
+"database %s lacks some cached data\n"
+"run '%s db regenerate_caches' to restore use of this database"
+msgstr ""
-#: database.cc:200
+#: database.cc:194
#, fuzzy, c-format
msgid ""
"database %s contains old-style revisions\n"
@@ -2372,7 +2370,7 @@ msgstr ""
" récupérez de nouveau dans une nouvelle base de données.\n"
"désolé pour le dérangement."
-#: database.cc:210
+#: database.cc:204
#, c-format
msgid ""
"database %s contains manifests but no revisions\n"
@@ -2383,86 +2381,56 @@ msgstr ""
"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:221
-#, c-format
-msgid ""
-"database %s misses some cached data\n"
-"run '%s db regenerate_caches' to restore use of this database"
-msgstr ""
+#: database.cc:487 sanity.cc:234 schema_migration.cc:58
+msgid "error: "
+msgstr "erreur :"
-#: database.cc:259
-#, 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:488
+msgid "sqlite error: "
+msgstr "erreur sqlite : "
-#: database.cc:266
-#, 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:512
+#, fuzzy
+msgid "not set"
+msgstr "note : "
-#: database.cc:293 schema_migration.cc:201
-msgid ""
-"make sure database and containing directory are writeable\n"
-"and you have not run out of disk space"
-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:525
+#, fuzzy
+msgid " (not a monotone database)"
+msgstr "paramétrer le nom de la base de données"
-#: database.cc:297 schema_migration.cc:206
+#: database.cc:573 database.cc:604 database.cc:1046 database.cc:1066
#, c-format
-msgid ""
-"sqlite error: %s\n"
-"%s"
+msgid "%u"
msgstr ""
-"erreur sqlite : %s\n"
-"%s"
-#: database.cc:342
-#, 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:347
-#, c-format
-msgid ""
-"existing (possibly stale) journal file '%s' has same stem as new database '%"
-"s'\n"
-"cancelling database creation"
-msgstr ""
-
-#: database.cc:497
-#, c-format
-msgid "cannot create %s; it already exists"
-msgstr "impossible de créer %s car ceci existe déjà "
-
-#: database.cc:574
+#: database.cc:623
#, fuzzy, c-format
msgid ""
+"creator code : %s\n"
"schema version : %s\n"
"counts:\n"
-" full rosters : %u\n"
-" roster deltas : %u\n"
-" full files : %u\n"
-" file deltas : %u\n"
-" revisions : %u\n"
-" ancestry edges : %u\n"
-" certs : %u\n"
-" logical files : %u\n"
+" full rosters : %s\n"
+" roster deltas : %s\n"
+" full files : %s\n"
+" file deltas : %s\n"
+" revisions : %s\n"
+" ancestry edges : %s\n"
+" certs : %s\n"
+" logical files : %s\n"
"bytes:\n"
-" full rosters : %u\n"
-" roster deltas : %u\n"
-" full files : %u\n"
-" file deltas : %u\n"
-" revisions : %u\n"
-" cached ancestry : %u\n"
-" certs : %u\n"
-" heights : %u\n"
-" total : %u\n"
+" full rosters : %s\n"
+" roster deltas : %s\n"
+" full files : %s\n"
+" file deltas : %s\n"
+" revisions : %s\n"
+" cached ancestry : %s\n"
+" certs : %s\n"
+" heights : %s\n"
+" total : %s\n"
"database:\n"
-" page size : %u\n"
-" cache size : %u"
+" page size : %s\n"
+" cache size : %s"
msgstr ""
"version du schéma : %s\n"
"comptes:\n"
@@ -2483,55 +2451,63 @@ msgstr ""
" certifs : %u\n"
" total : %u\n"
-#: database.cc:639
+#: database.cc:668
#, c-format
msgid "database schema version: %s"
msgstr "version du schéma de la base de données : %s"
-#: database.cc:716
+#: database.cc:756
#, fuzzy, c-format
msgid "multiple statements in query: %s"
msgstr "plusieurs instructions dans la requête: %s\n"
-#: database.cc:722
+#: database.cc:762
#, 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:788
+#: database.cc:828
#, fuzzy, c-format
msgid "null result in query: %s"
msgstr "la requête donnait aucun résultat: %s\n"
-#: database.cc:806
+#: database.cc:846
#, 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:2043
+#: database.cc:2103
#, c-format
msgid "another key with name '%s' already exists"
msgstr "une autre clef nommée « %s » existe déjà "
-#: database.cc:3041
+#: database.cc:3121
#, c-format
msgid "no database specified"
msgstr "aucune base de données n'a été spécifiée"
-#: database.cc:3049
+#: database.cc:3129
#, c-format
msgid "database %s does not exist"
msgstr "la base de données %s n'existe pas"
-#: database.cc:3050
+#: database.cc:3130
#, c-format
msgid "%s is a directory, not a database"
msgstr "%s est un dossier, pas une base de données"
-#: database.cc:3075
+#: database.cc:3137
+#, fuzzy, c-format
+msgid "database %s already exists"
+msgstr "le chemin %s existe déjà "
+
+#: database.cc:3142
#, c-format
-msgid "could not open database '%s': %s"
-msgstr "impossible d'ouvrir la base de données « %s » : %s"
+msgid ""
+"existing (possibly stale) journal file '%s' has same stem as new database '%"
+"s'\n"
+"cancelling database creation"
+msgstr ""
#: diff_patch.cc:614
#, c-format
@@ -2707,47 +2683,47 @@ msgstr ""
"une erreur d'exécution %s est survenue au milieu de la construction du "
"chemin de fichier pour %s"
-#: file_io.cc:548 work.cc:1079
+#: file_io.cc:540 work.cc:1112
#, c-format
msgid "no such file or directory: '%s'"
msgstr "aucun fichier ou dossier de ce type : « %s »"
-#: keys.cc:102
+#: keys.cc:103
#, 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:119
#, c-format
msgid "empty passphrase not allowed"
msgstr "la phrase de passe ne doit pas être vide"
-#: keys.cc:125
+#: keys.cc:126
#, 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:131
#, 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:132 keys.cc:139
#, c-format
msgid "too many failed passphrases"
msgstr "trop de phrases de passe incorrectes"
-#: keys.cc:137
+#: keys.cc:138
#, c-format
msgid "passphrases do not match, try again"
msgstr "les phrases de passe ne correspondent pas, essayez à nouveau"
-#: keys.cc:144
+#: keys.cc:145
#, c-format
msgid "no passphrase given"
msgstr "aucune phrase de passe fournie"
-#: keys.cc:570
+#: keys.cc:571
#, c-format
msgid "passphrase for '%s' is incorrect"
msgstr "la phrase de passe pour « %s » est incorrecte"
@@ -2762,7 +2738,7 @@ msgstr "le dossier « %s » n'existe p
msgid "Directory '%s' does not exist"
msgstr "le dossier « %s » n'existe pas"
-#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1334
+#: lua.cc:481 lua.cc:516 rcs_import.cc:1236 work.cc:1367
#, c-format
msgid "'%s' is not a directory"
msgstr "« %s » n'est pas un dossier"
@@ -2792,16 +2768,20 @@ msgstr "la somme de contrôle %s ne corr
msgid "mismatched node hash value %s, expected %s"
msgstr "la somme de contrôle %s ne correspond pas à la valeur attendue %s"
-#: monotone.cc:274
+#: monotone.cc:275
#, c-format
msgid "Usage: %s [OPTION...] command [ARG...]"
msgstr "Utilisation : %s [OPTION...] commande [ARGUMENTS...]"
-#: monotone.cc:282
+#: monotone.cc:283
#, c-format
msgid "Options specific to '%s %s':"
msgstr "Options spécifiques à « %s %s » :"
+#: monotone.cc:307
+msgid "error: memory exhausted"
+msgstr ""
+
#: mt_version.cc:36
#, c-format
msgid "%s (base revision: %s)"
@@ -2937,12 +2917,12 @@ msgstr "trop peux d'objets %s à recevoi
msgid "underflow on count of %s items to receive"
msgstr "trop peux d'objets %s à recevoir"
-#: netsync.cc:1261 netsync.cc:1269
+#: netsync.cc:1260 netsync.cc:1268
#, c-format
msgid "received network error: %s"
msgstr "erreur de réception réseau : %s"
-#: netsync.cc:1304
+#: netsync.cc:1296
#, c-format
msgid ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -2965,12 +2945,12 @@ msgstr ""
"j'attendais %s\n"
"« %s unset %s %s » pour passer outre cette vérification"
-#: netsync.cc:1314
+#: netsync.cc:1306
#, c-format
msgid "server key changed"
msgstr "la clef du serveur a changé"
-#: netsync.cc:1319
+#: netsync.cc:1311
#, fuzzy, c-format
msgid ""
"first time connecting to server %s\n"
@@ -2981,48 +2961,48 @@ msgstr ""
"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:1326
+#: netsync.cc:1318
#, 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:1429
+#: netsync.cc:1420
#, c-format
msgid "rejected attempt at anonymous connection for write"
msgstr "tentative de connexion anonyme pour écrire rejeté"
-#: netsync.cc:1436
+#: netsync.cc:1427
#, 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:1452
+#: netsync.cc:1442
#, c-format
msgid "anonymous access to branch '%s' denied by server"
msgstr "accès anonyme à la branche « %s » refusé par le serveur"
-#: netsync.cc:1460
+#: netsync.cc:1450
#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'"
msgstr "permission de lecture anonyme accordée pour « %s » en excluant « %s »"
-#: netsync.cc:1466
+#: netsync.cc:1456
#, c-format
msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
msgstr "permission de lecture anonyme accordée pour « %s » en excluant « %s »"
-#: netsync.cc:1531
+#: netsync.cc:1519
#, 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:1549
+#: netsync.cc:1537
#, 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"
-#: netsync.cc:1571
+#: netsync.cc:1559
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -3031,7 +3011,7 @@ msgstr ""
"permission de lecture refusée à « %s » pour « %s » en excluant « %s » et en "
"étant un puits pure"
-#: netsync.cc:1584
+#: netsync.cc:1574
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
@@ -3039,12 +3019,12 @@ msgstr ""
"permission de lecture refusée à « %s » pour « %s » en excluant « %s » à "
"cause de la branche « %s »"
-#: netsync.cc:1594
+#: netsync.cc:1584
#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'"
msgstr "permission de lecture accordée à « %s » pour « %s » en excluant « %s »"
-#: netsync.cc:1605
+#: netsync.cc:1595
#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
@@ -3053,233 +3033,233 @@ msgstr ""
"permission d'écriture refusée à « %s » pour « %s » en excluant « %s » en "
"étant un source pure"
-#: netsync.cc:1613
+#: netsync.cc:1603
#, 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:1617
+#: netsync.cc:1607
#, 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:1641
+#: netsync.cc:1631
#, c-format
msgid "bad client signature"
msgstr "signature du client invalide"
-#: netsync.cc:1657
+#: netsync.cc:1647
#, 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:1754
+#: netsync.cc:1744
#, c-format
msgid "unknown bye phase %d received"
msgstr "phase d'aurevoir %d inconnue reçue"
-#: netsync.cc:1769
+#: netsync.cc:1759
#, 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:1841
+#: netsync.cc:1831
#, 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:1945
+#: netsync.cc:1935
#, 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:1963
+#: netsync.cc:1953
#, 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:1977
+#: netsync.cc:1967
#, 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:2039
+#: netsync.cc:2029
#, c-format
msgid "Received warning from usher: %s"
msgstr "Alerte reçu de usher : %s"
-#: netsync.cc:2126 netsync.cc:2157
+#: netsync.cc:2116 netsync.cc:2147
msgid "source and sink"
msgstr "source et puits"
-#: netsync.cc:2127 netsync.cc:2158
+#: netsync.cc:2117 netsync.cc:2148
msgid "source"
msgstr "source"
-#: netsync.cc:2127 netsync.cc:2158
+#: netsync.cc:2117 netsync.cc:2148
msgid "sink"
msgstr "puits"
-#: netsync.cc:2314
+#: netsync.cc:2304
#, fuzzy, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch"
msgstr ""
"le tampon d'entrée pour le pair %s est plus que plein après la répartition "
"netcmd\n"
-#: netsync.cc:2326 netsync.cc:2425
+#: netsync.cc:2316 netsync.cc:2415
#, 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:2332
+#: netsync.cc:2322
#, c-format
msgid "error: %s"
msgstr "erreur : %s"
-#: netsync.cc:2396
+#: netsync.cc:2386
#, c-format
msgid "connecting to %s"
msgstr "connexion à %s"
-#: netsync.cc:2440
+#: netsync.cc:2430
#, fuzzy, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting"
msgstr "temps mort en attendant E/S du pair %s, déconnexion\n"
-#: netsync.cc:2463
+#: netsync.cc:2453
#, fuzzy, c-format
msgid "processing failure while talking to peer %s, disconnecting"
msgstr "échec du traitement pendant le dialogue avec le pair %s, déconnexion\n"
-#: netsync.cc:2480
+#: netsync.cc:2470
#, c-format
msgid "successful exchange with %s"
msgstr "échange réussi avec %s"
-#: netsync.cc:2486
+#: netsync.cc:2476
#, 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:2491
+#: netsync.cc:2481
#, fuzzy, c-format
msgid "I/O failure while talking to peer %s, disconnecting"
msgstr "erreur d'E/S pendant le dialogue avec le pair %s, déconnexion\n"
-#: netsync.cc:2557
+#: netsync.cc:2547
#, 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:2589
+#: netsync.cc:2579
#, c-format
msgid "accepted new client connection from %s : %s"
msgstr "nouvelle connexion d'un client acceptée de %s : %s"
-#: netsync.cc:2626
+#: netsync.cc:2616
#, 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:2637
+#: netsync.cc:2627
#, c-format
msgid "peer %s read failed in working state (error)"
msgstr ""
-#: netsync.cc:2642
+#: netsync.cc:2632
#, c-format
msgid ""
"peer %s read failed in shutdown state (possibly client misreported error)"
msgstr ""
-#: netsync.cc:2648
+#: netsync.cc:2638
#, c-format
msgid "peer %s read failed in confirmed state (success)"
msgstr ""
-#: netsync.cc:2669
+#: netsync.cc:2659
#, c-format
msgid "peer %s write failed in working state (error)"
msgstr ""
-#: netsync.cc:2674
+#: netsync.cc:2664
#, c-format
msgid ""
"peer %s write failed in shutdown state (possibly client misreported error)"
msgstr ""
-#: netsync.cc:2680
+#: netsync.cc:2670
#, c-format
msgid "peer %s write failed in confirmed state (success)"
msgstr ""
-#: netsync.cc:2707
+#: netsync.cc:2697
#, c-format
msgid "peer %s processing finished, disconnecting"
msgstr "traitement du pair %s terminé, déconnexion"
-#: netsync.cc:2729
+#: netsync.cc:2719
#, 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:2797
+#: netsync.cc:2787
#, c-format
msgid "beginning service on %s : %s"
msgstr "début du service sur %s : %s"
-#: netsync.cc:2798
+#: netsync.cc:2788
msgid ""
msgstr ""
-#: netsync.cc:2812
+#: netsync.cc:2802
#, c-format
msgid "session limit %d reached, some connections will be refused"
msgstr ""
-#: netsync.cc:2879
+#: netsync.cc:2869
#, fuzzy, c-format
msgid "Network error on peer %s, disconnecting"
msgstr "reçu des données hors-bande du pair %s, déconnexion"
-#: netsync.cc:2885
+#: netsync.cc:2875
#, c-format
msgid "got OOB from peer %s, disconnecting"
msgstr "reçu des données hors-bande du pair %s, déconnexion"
-#: netsync.cc:2945
+#: netsync.cc:2935
#, c-format
msgid "beginning service on %s"
msgstr "début du service sur %s"
-#: netsync.cc:3008
+#: netsync.cc:2998
#, 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:3057
+#: netsync.cc:3047
#, c-format
msgid "finding items to synchronize:"
msgstr "recherche d'éléments à synchroniser :"
-#: netsync.cc:3065
+#: netsync.cc:3055
msgid "certificates"
msgstr "certificats"
-#: netsync.cc:3178
+#: netsync.cc:3164
#, c-format
msgid "Cannot find key '%s'"
msgstr "Impossible de trouver la clef « %s »"
-#: netsync.cc:3218
+#: netsync.cc:3204
#, fuzzy, c-format
msgid ""
"include branch pattern contains a quote character:\n"
@@ -3288,7 +3268,7 @@ msgstr ""
"le motif des branches à inclure contient un caractère de citation :\n"
"%s\n"
-#: netsync.cc:3224
+#: netsync.cc:3210
#, fuzzy, c-format
msgid ""
"exclude branch pattern contains a quote character:\n"
@@ -3297,7 +3277,7 @@ msgstr ""
"le motif des branches à exclure contient un caractère de citation :\n"
"%s\n"
-#: netsync.cc:3259 netsync.cc:3263
+#: netsync.cc:3245 netsync.cc:3249
#, c-format
msgid "network error: %s"
msgstr "erreur réseau : %s"
@@ -3525,24 +3505,28 @@ msgstr ""
msgstr ""
#: options_list.hh:489
+msgid "revision(s) to start logging at"
+msgstr ""
+
+#: options_list.hh:496
msgid "revision(s) to stop logging at"
msgstr ""
-#: options_list.hh:497
+#: options_list.hh:504
msgid "perform the operations for unknown files from workspace"
msgstr ""
"accomplis les opérations sur les fichiers inconnus dans l'espace de travail"
# **** Richard stopped here ****
-#: options_list.hh:506
+#: options_list.hh:513
msgid "verbose completion output"
msgstr "affiche plus d'information à la fin de l'exécution"
-#: options_list.hh:514
+#: options_list.hh:521
msgid "print version number, then exit"
msgstr "afficher le numéro de version, puis quitte"
-#: options_list.hh:522
+#: options_list.hh:529
msgid "insert command line arguments taken from the given file"
msgstr "fourre les arguments pris du fichier donné dans la linge de commande"
@@ -3622,22 +3606,22 @@ msgstr ""
msgid "parse failure %d:%d: expecting word"
msgstr ""
-#: rcs_import.cc:721
+#: rcs_import.cc:722
#, c-format
msgid "parsing RCS file %s"
msgstr "analyse du fichier RCS %s"
-#: rcs_import.cc:724
+#: rcs_import.cc:725
#, c-format
msgid "parsed RCS file %s OK"
msgstr "analyse du fichier RCS %s OK"
-#: rcs_import.cc:913
+#: rcs_import.cc:914
#, 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:1211
#, c-format
msgid ""
"%s appears to be a CVS repository root directory\n"
@@ -3646,17 +3630,17 @@ 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/"
-#: rcs_import.cc:1222
+#: rcs_import.cc:1223
#, c-format
msgid "need base --branch argument for importing"
msgstr "il faut un argument --branch pour importer"
-#: rcs_import.cc:1234
+#: rcs_import.cc:1235
#, c-format
msgid "path %s does not exist"
msgstr "le chemin %s n'existe pas"
-#: rcs_import.cc:1269
+#: rcs_import.cc:1270
msgid "tags"
msgstr "étiquettes"
@@ -3785,10 +3769,6 @@ msgstr "mauvais usage : "
msgid "misuse: "
msgstr "mauvais usage : "
-#: sanity.cc:234
-msgid "error: "
-msgstr "erreur :"
-
#: sanity.cc:242
#, c-format
msgid "%s:%d: invariant '%s' violated"
@@ -3806,95 +3786,187 @@ msgstr "Ensemble de travail actuel: %i o
msgid "Current work set: %i items"
msgstr "Ensemble de travail actuel: %i objets\n"
-#: schema_migration.cc:258
+#: selectors.cc:43
+#, fuzzy, c-format
+msgid "expanded selector '%s' -> '%s'"
+msgstr "expansion de la sélection « %s »"
+
+#: selectors.cc:80
+#, fuzzy, c-format
+msgid "unknown selector type: %c"
+msgstr "type de paquet inconnu : « %s »"
+
+#: selectors.cc:89
+#, fuzzy, c-format
+msgid "selector '%s' is not a valid date\n"
+msgstr "le racine de l'espace de travail « %s » n'est pas un dossier\n"
+
+#: selectors.cc:95
#, c-format
-msgid "calculating necessary migration steps"
-msgstr "calcule les étapes à passer pour migrer"
+msgid "selector '%s' is not a valid date (%s)"
+msgstr ""
-#: schema_migration.cc:270
+#: selectors.cc:98
+#, fuzzy, c-format
+msgid "expanded date '%s' -> '%s'\n"
+msgstr "développement de l'identité partielle « %s » de « %s »"
+
+#: schema_migration.cc:78
+msgid ""
+"make sure database and containing directory are writeable\n"
+"and you have not run out of disk space"
+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"
+
+#: schema_migration.cc:88
+msgid ""
+"(if this is a database last used by monotone 0.16 or older,\n"
+"you must follow a special procedure to make it usable again.\n"
+"see the file UPGRADE, in the distribution, for instructions.)"
+msgstr ""
+
+#: schema_migration.cc:97
#, c-format
-msgid "error at transaction BEGIN statement"
+msgid ""
+"sqlite error: %s\n"
+"%s"
msgstr ""
+"erreur sqlite : %s\n"
+"%s"
-#: schema_migration.cc:271
+#: schema_migration.cc:511
#, c-format
-msgid "migrating data"
-msgstr "migration des données"
+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:297
+#: schema_migration.cc:513
#, c-format
-msgid "migration step failed: %s"
-msgstr "l'étape de migration a échoué : %s"
+msgid "moving key '%s' from database to %s"
+msgstr "déplace la clef « %s » de la base de données à %s"
-#: schema_migration.cc:311
+#: schema_migration.cc:889
#, c-format
-msgid "mismatched result of migration, got %s, wanted %s"
-msgstr "discordance de résultats de la migration, reçu %s, voulais %s"
+msgid "%s (usable)"
+msgstr ""
-#: schema_migration.cc:314
+#: schema_migration.cc:891
#, c-format
-msgid "committing changes to database"
-msgstr "confie les changements à la base de données"
+msgid "%s (migration needed)"
+msgstr ""
-#: schema_migration.cc:316
+#: schema_migration.cc:893
#, c-format
-msgid "failure on COMMIT"
-msgstr "COMMIT échoué"
+msgid "%s (too new, cannot use)"
+msgstr ""
-#: schema_migration.cc:318
+#: schema_migration.cc:895
+#, fuzzy, c-format
+msgid "%s (not a monotone database)"
+msgstr "paramétrer le nom de la base de données"
+
+#: schema_migration.cc:897
#, c-format
-msgid "optimizing database"
-msgstr "optimisation de la base de données"
+msgid "%s (database has no tables!)"
+msgstr ""
-#: schema_migration.cc:320
+#: schema_migration.cc:910
#, c-format
-msgid "error vacuuming after migration"
+msgid ""
+"cannot use the empty sqlite database %s\n"
+"(monotone databases must be created with '%s db init')"
msgstr ""
-#: schema_migration.cc:323
+#: schema_migration.cc:915
+#, fuzzy, c-format
+msgid "%s does not appear to be a monotone database\n"
+msgstr ""
+"la clef « %s » n'est pas égale à la clef « %s » dans la base de données"
+
+#: schema_migration.cc:919
#, c-format
-msgid "error running analyze after migration"
-msgstr "erreur en analysant après la migration"
+msgid ""
+"%s appears to be a monotone database, but this version of\n"
+"monotone does not recognize its schema.\n"
+"you probably need a newer version of monotone."
+msgstr ""
-#: schema_migration.cc:332
+#: schema_migration.cc:938
+#, fuzzy, c-format
+msgid ""
+"database %s is laid out according to an old schema\n"
+"try '%s db migrate' to upgrade\n"
+"(this is irreversible; you may want to make a backup copy first)"
+msgstr ""
+"la disposition de la base de données %s ne correspond pas a cette version de "
+"monotone\n"
+"voulais le schéma %s, trouvais %s\n"
+"essayez « %s db migrate » pour mettre la base de données à niveau\n"
+"(cette opération est irréversible; vous voudrez probablement prendre une "
+"copie d'abord)"
+
+#: schema_migration.cc:960
+#, fuzzy, c-format
+msgid "calculating migration..."
+msgstr "calcule les étapes à passer pour migrer"
+
+#: schema_migration.cc:973
+#, fuzzy, c-format
+msgid "no migration performed; database schema already up-to-date"
+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:980
+#, fuzzy, c-format
+msgid "migrating data..."
+msgstr "migration des données"
+
+#: schema_migration.cc:1002
+#, fuzzy, c-format
+msgid "migrated to schema %s"
+msgstr "l'étape de migration a échoué : %s"
+
+#: schema_migration.cc:1005
#, c-format
+msgid "committing changes to database"
+msgstr "confie les changements à la base de données"
+
+#: schema_migration.cc:1009
+#, c-format
+msgid "optimizing database"
+msgstr "optimisation de la base de données"
+
+#: schema_migration.cc:1019
+#, 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
+#: schema_migration.cc:1026
#, c-format
msgid ""
"NOTE: this upgrade cleared monotone's caches\n"
"you should now run '%s db regenerate_caches'"
msgstr ""
-#: schema_migration.cc:352
+#: schema_migration.cc:1057
#, c-format
-msgid "database schema %s is unknown; cannot perform migration"
+msgid "cannot test migration from unknown schema %s"
msgstr ""
-"le schéma de la base de données %s est inconnu; impossible d'effectuer la "
-"migration"
-#: schema_migration.cc:357
-#, fuzzy, c-format
-msgid "no migration performed; database schema already up-to-date at %s"
+#: schema_migration.cc:1060
+#, c-format
+msgid "schema %s is up to date"
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
-#, 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:1071
+#, fuzzy, c-format
+msgid "successful migration to schema %s"
+msgstr "échange réussi avec %s"
-#: 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
msgid "Press enter"
msgstr "Appuyez sur entrée"
@@ -3903,6 +3975,16 @@ msgstr "Appuyez sur [Entrée] quand le s
msgid "Press enter when the subprocess has completed"
msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé"
+#: transforms.cc:91
+#, c-format
+msgid ""
+"%s\n"
+"this may be due to a memory glitch, data corruption during\n"
+"a network transfer, corruption of your database or workspace,\n"
+"or a bug in monotone. if the error persists, please contact\n"
+"%s for assistance.\n"
+msgstr ""
+
#: ui.cc:158
#, c-format
msgid "%.1f G"
@@ -3955,12 +4037,12 @@ msgstr ""
msgid "The URI syntax is invalid. Maybe you used an URI in scp-style?"
msgstr ""
-#: update.cc:72
+#: update.cc:71
#, 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:160
#, c-format
msgid "cannot determine branch for update"
msgstr "impossible de déterminer la branche pour la mise à jour"
@@ -4005,63 +4087,63 @@ msgstr "Longueur hmac invalide de %d oct
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:188 work_migration.cc:208
#, fuzzy, c-format
msgid "workspace is corrupt: reading %s: %s"
msgstr "l'espace de travail est corrompu : %s n'existe pas"
-#: work.cc:150
-#, c-format
-msgid "base revision %s does not exist in database"
+#: work.cc:136
+#, fuzzy, c-format
+msgid "workspace 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:282
#, c-format
msgid "unrecognized key '%s' in options file %s - ignored"
msgstr ""
-#: work.cc:291
+#: work.cc:289
#, 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:337
#, fuzzy, c-format
msgid "Failed to write options file %s: %s"
msgstr "L'écriture du fichier d'options « %s » a échouée"
-#: work.cc:541
+#: work.cc:539
#, c-format
msgid "skipping ignorable file %s"
msgstr "omission du fichier %s qui peut être ignoré"
-#: work.cc:550
+#: 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:561
+#: work.cc:559
#, c-format
msgid "adding %s to workspace manifest"
msgstr "ajouter %s au manifeste de l'espace de travail"
-#: work.cc:567
+#: work.cc:565
#, c-format
msgid ""
"cannot add %s, because %s is recorded as a file in the workspace manifest"
msgstr ""
-#: work.cc:682
+#: work.cc:680
#, c-format
msgid "dropping %s"
msgstr "supprime %s"
-#: work.cc:693 work.cc:704
+#: work.cc:691 work.cc:702
#, c-format
msgid "path %s already exists"
msgstr "le chemin %s existe déjà "
-#: work.cc:726 work.cc:756
+#: work.cc:724 work.cc:756
#, c-format
msgid "adding %s"
msgstr "ajout de %s"
@@ -4076,38 +4158,53 @@ msgstr "renommage de %s en %s"
msgid "renaming %s to %s"
msgstr "renommage de %s en %s"
-#: work.cc:787
+#: work.cc:788
#, c-format
msgid "file '%s' does not exist"
msgstr "le fichier « %s » n'existe pas"
-#: work.cc:788
+#: work.cc:789
#, c-format
msgid "file '%s' is a directory"
msgstr "le fichier « %s » est un dossier"
-#: work.cc:793
+#: work.cc:794
#, 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:794
+#: work.cc:795
#, c-format
msgid "modifying %s"
msgstr "modification de %s"
-#: work.cc:979
+#: work.cc:984
#, fuzzy, c-format
-msgid "missing %s"
-msgstr "modification de %s"
+msgid "missing directory '%s'"
+msgstr "dossier pas valable «»"
-#: work.cc:985
+#: work.cc:989
#, fuzzy, c-format
+msgid "not a directory '%s'"
+msgstr "impossible de créer le dossier « %s »"
+
+#: work.cc:1002
+#, fuzzy, c-format
+msgid "missing file '%s'"
+msgstr "%d fichiers manquants"
+
+#: work.cc:1007
+#, fuzzy, c-format
+msgid "not a file '%s'"
+msgstr "aucun fichier « %s »"
+
+#: work.cc:1018
+#, fuzzy, 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"
+"%d missing items; use '%s ls missing' to view\n"
+"To restore consistency, on each missing item run either\n"
+" '%s drop ITEM' to remove it permanently, or\n"
+" '%s revert ITEM' to restore it.\n"
"To handle all at once, simply use\n"
" '%s drop --missing' or\n"
" '%s revert --missing'"
@@ -4117,92 +4214,92 @@ msgstr ""
"lancer soit « monotone drop FICHIER » pour le supprimer définitivement,\n"
"soit « monotone revert FICHIER » pour le restaurer\n"
-#: work.cc:1131
+#: work.cc:1164
#, c-format
msgid "skipping %s, not currently tracked"
msgstr ""
-#: work.cc:1141
+#: work.cc:1174
#, c-format
msgid "cannot remove %s/, it is not empty"
msgstr "impossible de supprimer %s/, il n'est pas vide"
-#: work.cc:1152
+#: work.cc:1185
#, c-format
msgid "dropping %s from workspace manifest"
msgstr "supprimer %s du manifeste de l'espace de travail"
-#: work.cc:1205
+#: work.cc:1238
#, fuzzy, c-format
msgid "destination dir %s/ is not versioned (perhaps add it?)"
msgstr "le dossier de destination %s/ n'existe pas dans la révision actuelle"
-#: work.cc:1208
+#: work.cc:1241
#, 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:1218
+#: work.cc:1251
#, c-format
msgid "empty path %s is not allowed"
msgstr "le chemin vide %s n'est pas permit"
-#: work.cc:1232
+#: work.cc:1265
#, fuzzy, c-format
msgid "%s does not exist in current manifest"
msgstr "%s n'existe pas dans la révision actuelle"
-#: work.cc:1235
+#: work.cc:1268
#, 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:1241
+#: work.cc:1274
#, 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:1243
+#: work.cc:1276
#, fuzzy, c-format
msgid "destination directory %s is not a directory"
msgstr "la nouvelle racine proposé « %s » n'est pas un dossier"
-#: work.cc:1252
+#: work.cc:1285
#, c-format
msgid "renaming %s to %s in workspace manifest"
msgstr "renomme %s à %s dans le manifeste de l'espace de travail"
-#: work.cc:1280
+#: work.cc:1313
#, 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:1284
+#: work.cc:1317
#, 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:1314
+#: work.cc:1347
#, c-format
msgid "proposed new root directory '%s' is not versioned or does not exist"
msgstr ""
-#: work.cc:1316
+#: work.cc:1349
#, 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:1321
+#: work.cc:1354
#, 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:1331
+#: work.cc:1364
#, 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:1337
+#: work.cc:1370
#, c-format
msgid "'%s' is in the way"
msgstr "« %s » fait obstacle"
@@ -4212,14 +4309,19 @@ msgstr "espace de travail requis mais pa
msgid "workspace required but not found"
msgstr "espace de travail requis mais pas trouvé"
-#: work_migration.cc:71
+#: work_migration.cc:74
+#, fuzzy, c-format
+msgid "workspace is corrupt: %s is invalid"
+msgstr "l'espace de travail est corrompue : %s est un dossier"
+
+#: work_migration.cc:79
#, 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:116
#, c-format
msgid ""
"this workspace's metadata is in format 0. to use this workspace\n"
@@ -4230,7 +4332,7 @@ msgstr ""
"we apologize for the inconvenience."
msgstr ""
-#: work_migration.cc:117
+#: work_migration.cc:125
#, c-format
msgid ""
"to use this workspace with this version of monotone, its metadata\n"
@@ -4240,7 +4342,7 @@ msgstr ""
"with versions of monotone older than %s."
msgstr ""
-#: work_migration.cc:127 work_migration.cc:255
+#: work_migration.cc:135 work_migration.cc:263
#, c-format
msgid ""
"this version of monotone only understands workspace metadata\n"
@@ -4253,7 +4355,7 @@ msgstr ""
"Vous avez besoin d'une version plus récente de monotone pour utiliser cet "
"espace de travail."
-#: work_migration.cc:156
+#: work_migration.cc:164
#, c-format
msgid ""
"it is not possible to migrate from workspace format 0 to any\n"
@@ -4264,19 +4366,55 @@ msgstr ""
"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:216
#, 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"
-#: work_migration.cc:247
+#: work_migration.cc:255
#, 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"
+#~ 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"
+
+#~ 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"
+
+#~ msgid "could not initialize database: %s: already exists"
+#~ msgstr "impossible d'initialiser la base de données : %s : elle existe déjà "
+
+#~ msgid "cannot create %s; it already exists"
+#~ msgstr "impossible de créer %s car ceci existe déjà "
+
+#~ msgid "could not open database '%s': %s"
+#~ msgstr "impossible d'ouvrir la base de données « %s » : %s"
+
+#~ msgid "mismatched result of migration, got %s, wanted %s"
+#~ msgstr "discordance de résultats de la migration, reçu %s, voulais %s"
+
+#~ msgid "failure on COMMIT"
+#~ msgstr "COMMIT échoué"
+
+#~ msgid "error running analyze after migration"
+#~ msgstr "erreur en analysant après la migration"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "missing %s"
+#~ msgstr "modification de %s"
+
#~ msgid "read from client failed with error code: %d"
#~ msgstr "la lecture depuis le client a échoué avec le code d'erreur : %d"
@@ -4347,9 +4485,6 @@ msgstr ""
#~ msgid "%d unreferenced roster links"
#~ msgstr "%d liens à liste non-référencés"
-#~ msgid "workspace is corrupt: %s is a directory"
-#~ msgstr "l'espace de travail est corrompue : %s est un dossier"
-
#~ msgid "Problem with workspace: %s is unreadable"
#~ msgstr "Problème avec l'espace de travail: %s n'est pas lisible"
============================================================
--- po/it.po 5ed171e04465385f095ed761487f988916b2b37a
+++ po/it.po a4b7c50e902533c127e1ce5e638079f190480ed8
@@ -1,8 +1,8 @@ msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: monotone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-15 00:27+0100\n"
+"POT-Creation-Date: 2007-01-23 08:09-0800\n"
"PO-Revision-Date: 2007-01-22 08:19+0100\n"
"Last-Translator: Lapo Luchini \n"
"Language-Team: Lapo Luchini \n"
@@ -44,56 +44,28 @@ msgstr "[RAMO]"
msgid "[BRANCH]"
msgstr "[RAMO]"
-#: automate.cc:67
-#: automate.cc:91
-#: automate.cc:138
-#: automate.cc:218
-#: automate.cc:359
-#: automate.cc:426
-#: automate.cc:451
-#: automate.cc:529
-#: automate.cc:905
-#: automate.cc:1035
-#: automate.cc:1079
-#: automate.cc:1105
-#: automate.cc:1132
-#: automate.cc:1159
-#: automate.cc:1193
-#: automate.cc:1305
-#: automate.cc:1395
-#: automate.cc:1454
-#: automate.cc:1500
-#: automate.cc:1560
-#: cmd_files.cc:253
-#: cmd_files.cc:276
-#: cmd_list.cc:669
+#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218
+#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529
+#: automate.cc:905 automate.cc:1035 automate.cc:1079 automate.cc:1105
+#: automate.cc:1132 automate.cc:1159 automate.cc:1193 automate.cc:1305
+#: automate.cc:1395 automate.cc:1454 automate.cc:1500 automate.cc:1560
+#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:669
#, c-format
msgid "wrong argument count"
msgstr "numero errato di argomenti"
-#: automate.cc:88
-#: automate.cc:135
-#: automate.cc:1190
+#: automate.cc:88 automate.cc:135 automate.cc:1190
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:429
-#: automate.cc:454
-#: automate.cc:1200
-#: cmd_list.cc:676
-#: revision.cc:1705
+#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
+#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454
+#: automate.cc:1200 cmd_list.cc:676 revision.cc:1705
#, c-format
msgid "No such revision %s"
msgstr "La revisione %s non esiste"
-#: automate.cc:183
-#: automate.cc:324
+#: automate.cc:183 automate.cc:324
msgid "[REV1 [REV2 [REV3 [...]]]]"
msgstr "[REV_1 [REV_2 [REV_3 [â¦]]]]"
@@ -110,23 +82,14 @@ msgstr "NUOVA_REV [VECCHIA_REV_1 [VECCHI
msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
msgstr "NUOVA_REV [VECCHIA_REV_1 [VECCHIA_REV_2 [...]]]"
-#: automate.cc:398
-#: automate.cc:486
-#: automate.cc:711
-#: automate.cc:949
-#: automate.cc:970
-#: automate.cc:1256
-#: cmd_automate.cc:78
-#: cmd_automate.cc:332
+#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:949
+#: automate.cc:970 automate.cc:1256 cmd_automate.cc:78 cmd_automate.cc:332
#: cmd_list.cc:577
#, c-format
msgid "no arguments needed"
msgstr "nessun argomento richiesto"
-#: automate.cc:423
-#: automate.cc:448
-#: cmd_list.cc:666
-#: revision.cc:1699
+#: automate.cc:423 automate.cc:448 cmd_list.cc:666 revision.cc:1699
msgid "REV"
msgstr "REV"
@@ -134,49 +97,30 @@ msgstr "SELETTORE"
msgid "SELECTOR"
msgstr "SELETTORE"
-#: automate.cc:902
-#: automate.cc:1032
+#: automate.cc:902 automate.cc:1032
msgid "[REVID]"
msgstr "[ID_REV]"
-#: automate.cc:931
-#: automate.cc:1054
-#: automate.cc:1508
-#: automate.cc:1567
+#: automate.cc:931 automate.cc:1054 automate.cc:1508 automate.cc:1567
#: automate.cc:1572
#, c-format
msgid "no revision %s found in database"
msgstr "nel database non è presente la revisione %s"
-#: automate.cc:1076
-#: automate.cc:1102
-#: cmd_merging.cc:837
+#: automate.cc:1076 automate.cc:1102 cmd_merging.cc:837
msgid "REVID"
msgstr "ID_REV"
-#: automate.cc:1087
-#: automate.cc:1113
-#: automate.cc:1168
-#: automate.cc:1170
-#: cmd_db.cc:35
-#: cmd_diff_log.cc:386
-#: cmd_diff_log.cc:417
-#: cmd_diff_log.cc:419
-#: cmd_files.cc:138
-#: cmd_files.cc:197
-#: cmd_merging.cc:125
-#: cmd_merging.cc:669
-#: cmd_merging.cc:684
-#: cmd_merging.cc:687
-#: cmd_ws_commit.cc:517
-#: cmd_ws_commit.cc:987
-#: commands.cc:411
+#: automate.cc:1087 automate.cc:1113 automate.cc:1168 automate.cc:1170
+#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419
+#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:669
+#: cmd_merging.cc:684 cmd_merging.cc:687 cmd_ws_commit.cc:517
+#: cmd_ws_commit.cc:987 commands.cc:411
#, c-format
msgid "no such revision '%s'"
msgstr "la revisione %s non esiste"
-#: automate.cc:1129
-#: cmd_files.cc:250
+#: automate.cc:1129 cmd_files.cc:250
msgid "FILEID"
msgstr "ID_FILE"
@@ -197,20 +141,17 @@ msgstr "ID_CHIAVE PASSPHRASE"
msgid "KEYID PASSPHRASE"
msgstr "ID_CHIAVE PASSPHRASE"
-#: automate.cc:1410
-#: cmd_key_cert.cc:42
+#: automate.cc:1410 cmd_key_cert.cc:42
#, c-format
msgid "key '%s' already exists"
msgstr "chiave â%sâ già esistente"
-#: automate.cc:1413
-#: cmd_key_cert.cc:45
+#: automate.cc:1413 cmd_key_cert.cc:45
#, c-format
msgid "generating key-pair '%s'"
msgstr "genero la coppia di chiavi â%sâ"
-#: automate.cc:1415
-#: cmd_key_cert.cc:47
+#: automate.cc:1415 cmd_key_cert.cc:47
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "immagazzino la coppia di chiavi â%sâ in â%s/â"
@@ -228,8 +169,7 @@ msgstr "REV FILE"
msgid "REV FILE"
msgstr "REV FILE"
-#: automate.cc:1514
-#: automate.cc:1578
+#: automate.cc:1514 automate.cc:1578
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "il file â%sâ è sconosciuto per la revisione %s"
@@ -268,8 +208,7 @@ 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:386
-#: keys.cc:561
+#: cert.cc:386 keys.cc:561
#, c-format
msgid "no key pair '%s' found in key store '%s'"
msgstr "la coppia di chiavi â%sâ non è nel portachiavi â%sâ"
@@ -295,22 +234,30 @@ msgid "no branch found for empty revisio
#: cert.cc:484
#, 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:491
#, 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:495
#, 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:150
#, c-format
msgid "Bad input to automate stdio: expected ':' after string size"
-msgstr "Input non valido per âautomate stdioâ: atteso â:â dopo la dimensione di una stringa"
+msgstr ""
+"Input non valido per âautomate stdioâ: atteso â:â dopo la dimensione di una "
+"stringa"
#: cmd_automate.cc:169
#, c-format
@@ -320,7 +267,8 @@ msgid "Bad input to automate stdio: unkn
#: cmd_automate.cc:197
#, c-format
msgid "Bad input to automate stdio: unknown start token '%c'"
-msgstr "Input non valido per âautomate stdioâ: il token iniziale â%câ è sconosciuto"
+msgstr ""
+"Input non valido per âautomate stdioâ: il token iniziale â%câ è sconosciuto"
#: cmd_automate.cc:219
#, c-format
@@ -393,8 +341,7 @@ 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"
@@ -404,7 +351,8 @@ 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"
@@ -419,14 +367,8 @@ 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:465
-#: cmd_diff_log.cc:602
-#: cmd_files.cc:114
-#: cmd_files.cc:220
-#: cmd_list.cc:471
-#: cmd_merging.cc:606
-#: cmd_ws_commit.cc:411
+#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:602 cmd_files.cc:114
+#: cmd_files.cc:220 cmd_list.cc:471 cmd_merging.cc:606 cmd_ws_commit.cc:411
#: commands.cc:275
msgid "informative"
msgstr "informativo"
@@ -449,12 +391,8 @@ msgstr "selezionate più di due revision
msgid "more than two revisions given"
msgstr "selezionate più di due revisioni"
-#: cmd_diff_log.cc:465
-#: cmd_ws_commit.cc:79
-#: cmd_ws_commit.cc:302
-#: cmd_ws_commit.cc:337
-#: cmd_ws_commit.cc:411
-#: cmd_ws_commit.cc:707
+#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:302
+#: cmd_ws_commit.cc:337 cmd_ws_commit.cc:411 cmd_ws_commit.cc:707
msgid "[PATH]..."
msgstr "[PERCORSOâ¦]"
@@ -505,12 +443,8 @@ 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:837
-#: cmd_othervcs.cc:15
+#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:157
+#: cmd_merging.cc:837 cmd_othervcs.cc:15
msgid "debug"
msgstr "debug"
@@ -600,14 +534,12 @@ msgstr "nel database non è presente alc
msgid "no file version %s found in database"
msgstr "nel database non è presente alcun file con versione â%sâ"
-#: cmd_files.cc:210
-#: cmd_files.cc:214
+#: cmd_files.cc:210 cmd_files.cc:214
#, c-format
msgid "no file '%s' found in revision '%s'"
msgstr "nessun file â%sâ trovato nella revisione %s"
-#: cmd_files.cc:221
-#: cmd_files.cc:273
+#: cmd_files.cc:221 cmd_files.cc:273
msgid "FILENAME"
msgstr "NOMEFILE"
@@ -645,17 +577,12 @@ msgstr "Alias per %s"
msgid "Alias for %s"
msgstr "Alias per %s"
-#: cmd_key_cert.cc:26
-#: cmd_key_cert.cc:52
-#: cmd_key_cert.cc:92
-#: cmd_key_cert.cc:113
-#: cmd_key_cert.cc:143
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:143
msgid "key and cert"
msgstr "chiavi e cert"
-#: cmd_key_cert.cc:26
-#: cmd_key_cert.cc:52
-#: cmd_key_cert.cc:92
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
msgid "KEYID"
msgstr "IDCHIAVE"
@@ -680,12 +607,18 @@ msgid "public or private key '%s' does n
#: cmd_key_cert.cc:84
#, 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:87
#, 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:93
msgid "change passphrase of a private RSA key"
@@ -744,11 +677,8 @@ msgstr "NON fidato"
msgid "UNtrusted"
msgstr "NON fidato"
-#: cmd_key_cert.cc:191
-#: cmd_key_cert.cc:204
-#: cmd_key_cert.cc:217
-#: cmd_key_cert.cc:233
-#: cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:191 cmd_key_cert.cc:204 cmd_key_cert.cc:217
+#: cmd_key_cert.cc:233 cmd_ws_commit.cc:202
msgid "review"
msgstr "verifica"
@@ -769,8 +699,7 @@ 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:217
-#: cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:217 cmd_ws_commit.cc:202
msgid "REVISION"
msgstr "REVISIONE"
@@ -801,8 +730,7 @@ msgstr "commento vuoto"
msgid "empty comment"
msgstr "commento vuoto"
-#: cmd_list.cc:67
-#: cmd_list.cc:693
+#: cmd_list.cc:67 cmd_list.cc:693
#, c-format
msgid "no public key '%s' found in database"
msgstr "la chiave pubblica â%sâ non è nel database"
@@ -889,15 +817,9 @@ msgstr ""
"attuale, o i file conosciuti, sconosciuti, intenzionalmente ignorati,\n"
"mancanti o modificati"
-#: cmd_merging.cc:73
-#: cmd_merging.cc:647
-#: cmd_ws_commit.cc:79
-#: cmd_ws_commit.cc:258
-#: cmd_ws_commit.cc:302
-#: cmd_ws_commit.cc:337
-#: cmd_ws_commit.cc:367
-#: cmd_ws_commit.cc:392
-#: cmd_ws_commit.cc:607
+#: cmd_merging.cc:73 cmd_merging.cc:647 cmd_ws_commit.cc:79
+#: cmd_ws_commit.cc:258 cmd_ws_commit.cc:302 cmd_ws_commit.cc:337
+#: cmd_ws_commit.cc:367 cmd_ws_commit.cc:392 cmd_ws_commit.cc:607
#: cmd_ws_commit.cc:707
msgid "workspace"
msgstr "spazio di lavoro"
@@ -920,7 +842,8 @@ msgid "this workspace is a new project;
#: 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
@@ -1011,22 +934,14 @@ msgstr "[destra] %s"
msgid "[right] %s"
msgstr "[destra] %s"
-#: cmd_merging.cc:305
-#: cmd_merging.cc:576
+#: cmd_merging.cc:305 cmd_merging.cc:576
#, c-format
msgid "[merged] %s"
msgstr "[unione] %s"
-#: cmd_merging.cc:312
-#: cmd_merging.cc:411
-#: cmd_merging.cc:422
-#: cmd_merging.cc:580
-#: cmd_merging.cc:813
-#: cmd_ws_commit.cc:477
-#: cmd_ws_commit.cc:945
-#: cmd_ws_commit.cc:968
-#: cmd_ws_commit.cc:1068
-#: cmd_ws_commit.cc:1082
+#: cmd_merging.cc:312 cmd_merging.cc:411 cmd_merging.cc:422 cmd_merging.cc:580
+#: cmd_merging.cc:813 cmd_ws_commit.cc:477 cmd_ws_commit.cc:945
+#: cmd_ws_commit.cc:968 cmd_ws_commit.cc:1068 cmd_ws_commit.cc:1082
msgid "tree"
msgstr "albero"
@@ -1034,16 +949,12 @@ 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:322
-#: cmd_merging.cc:821
+#: cmd_merging.cc:322 cmd_merging.cc:821
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "specifica un ramo, con â--branch=RAMOâ"
-#: cmd_merging.cc:327
-#: cmd_merging.cc:461
-#: cmd_merging.cc:464
-#: cmd_merging.cc:826
+#: cmd_merging.cc:327 cmd_merging.cc:461 cmd_merging.cc:464 cmd_merging.cc:826
#: cmd_ws_commit.cc:501
#, c-format
msgid "branch '%s' is empty"
@@ -1061,8 +972,7 @@ msgstr[1] "%d teste sul ramo â%sâ"
msgstr[0] "%d testa sul ramo â%sâ"
msgstr[1] "%d teste sul ramo â%sâ"
-#: cmd_merging.cc:355
-#: cmd_merging.cc:400
+#: cmd_merging.cc:355 cmd_merging.cc:400
#, c-format
msgid "merge %d / %d:"
msgstr "merge %d / %d:"
@@ -1093,8 +1003,7 @@ 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:462
-#: cmd_merging.cc:465
+#: cmd_merging.cc:462 cmd_merging.cc:465
#, c-format
msgid "branch '%s' is not merged"
msgstr "il ramo â%sâ è separato"
@@ -1140,15 +1049,16 @@ msgid "merge two explicitly given revisi
#: cmd_merging.cc:582
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:597
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s e %s sono la stessa revisione, annullo"
-#: cmd_merging.cc:599
-#: cmd_merging.cc:601
+#: cmd_merging.cc:599 cmd_merging.cc:601
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s è già antenato di %s"
@@ -1158,11 +1068,13 @@ msgstr "REV REV"
msgstr "REV REV"
#: cmd_merging.cc:607
-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:617
-#: cmd_merging.cc:619
+#: cmd_merging.cc:617 cmd_merging.cc:619
#, c-format
msgid "%s is an ancestor of %s; no merge is needed."
msgstr "â%sâ è un antenato di â%sâ: il merge non è necessario."
@@ -1294,37 +1206,38 @@ msgid "no branch pattern given and no de
#: cmd_netsync.cc:93
#, 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:109
-#: cmd_netsync.cc:123
-#: cmd_netsync.cc:138
-#: cmd_netsync.cc:184
+#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 cmd_netsync.cc:184
msgid "network"
msgstr "rete"
-#: cmd_netsync.cc:109
-#: cmd_netsync.cc:123
-#: cmd_netsync.cc:138
+#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138
msgid "[ADDRESS[:PORTNUMBER] [PATTERN ...]]"
msgstr "[INDIRIZZO[:NUMERO_PORTA] [PATTERN â¦]]"
#: cmd_netsync.cc:110
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:124
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:132
#, 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:139
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:160
#, c-format
@@ -1343,13 +1256,18 @@ msgstr ""
#: cmd_netsync.cc:201
#, 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:207
#, 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..."
@@ -1358,7 +1276,8 @@ 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
@@ -1373,14 +1292,11 @@ 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"
@@ -1521,7 +1437,8 @@ msgid "cannot set '--unknown' and '--no-
#: cmd_ws_commit.cc:312
#, c-format
msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time"
-msgstr "non si può selezionare contemporaneamente â--unknownâ e â--no-respect-ignoreâ"
+msgstr ""
+"non si può selezionare contemporaneamente â--unknownâ e â--no-respect-ignoreâ"
#: cmd_ws_commit.cc:338
msgid "drop files from workspace"
@@ -1590,8 +1507,7 @@ msgstr ""
" rinominato %s\n"
" in %s"
-#: cmd_ws_commit.cc:465
-#: cmd_ws_commit.cc:469
+#: cmd_ws_commit.cc:465 cmd_ws_commit.cc:469
#, c-format
msgid " added %s"
msgstr " aggiunto %s"
@@ -1601,9 +1517,7 @@ msgstr " modificato %s"
msgid " patched %s"
msgstr " modificato %s"
-#: cmd_ws_commit.cc:477
-#: cmd_ws_commit.cc:945
-#: cmd_ws_commit.cc:1068
+#: cmd_ws_commit.cc:477 cmd_ws_commit.cc:945 cmd_ws_commit.cc:1068
msgid "[DIRECTORY]"
msgstr "[DIRECTORY]"
@@ -1617,35 +1531,33 @@ 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:496
-#: cmd_ws_commit.cc:1002
+#: cmd_ws_commit.cc:496 cmd_ws_commit.cc:1002
#, 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:504
-#: cmd_ws_commit.cc:1008
+#: cmd_ws_commit.cc:504 cmd_ws_commit.cc:1008
#, c-format
msgid "branch %s has multiple heads:"
msgstr "il ramo â%sâ ha più teste:"
-#: cmd_ws_commit.cc:507
-#: cmd_ws_commit.cc:1011
+#: cmd_ws_commit.cc:507 cmd_ws_commit.cc:1011
#, c-format
msgid "choose one with '%s checkout -r'"
msgstr "scegline una con â%s checkout -râ"
-#: cmd_ws_commit.cc:508
-#: cmd_ws_commit.cc:1012
+#: cmd_ws_commit.cc:508 cmd_ws_commit.cc:1012
#, c-format
msgid "branch %s has multiple heads"
msgstr "il ramo â%sâ ha più teste"
-#: cmd_ws_commit.cc:525
-#: cmd_ws_commit.cc:995
+#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:995
#, c-format
msgid "revision %s is not a member of branch %s"
msgstr "la revisione %s non fa parte del ramo â%sâ"
@@ -1658,7 +1570,8 @@ msgid "checkout directory '%s' already e
#: cmd_ws_commit.cc:555
#, 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:589
#, c-format
@@ -1720,7 +1633,8 @@ 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?"
@@ -1739,8 +1653,7 @@ msgstr "la revisione %s è già nel data
msgid "revision %s already in database"
msgstr "la revisione %s è già nel database"
-#: cmd_ws_commit.cc:852
-#: cmd_ws_commit.cc:882
+#: cmd_ws_commit.cc:852 cmd_ws_commit.cc:882
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "file â%sâ modificato durante il commit, abbandono"
@@ -1766,7 +1679,9 @@ msgid "setup a new workspace directory,
#: cmd_ws_commit.cc:946
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:952
#, c-format
@@ -1799,15 +1714,16 @@ msgstr ""
"è un file"
#: cmd_ws_commit.cc:1069
-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:1082
msgid "refresh the inodeprint cache"
msgstr "aggiorna la cache degli inodeprint"
-#: commands.cc:139
-#: commands.cc:241
+#: commands.cc:139 commands.cc:241
#, c-format
msgid "unknown command '%s'"
msgstr "comando â%sâ sconosciuto"
@@ -1884,9 +1800,7 @@ msgstr "contrassegni"
msgid "markings"
msgstr "contrassegni"
-#: database_check.cc:306
-#: netsync.cc:3053
-#: rcs_import.cc:1245
+#: database_check.cc:306 netsync.cc:3053 rcs_import.cc:1245
msgid "revisions"
msgstr "revisioni"
@@ -1894,8 +1808,7 @@ msgstr "ascendenza"
msgid "ancestry"
msgstr "ascendenza"
-#: database_check.cc:434
-#: netsync.cc:3057
+#: database_check.cc:434 netsync.cc:3057
msgid "keys"
msgstr "chiavi"
@@ -1938,8 +1851,13 @@ msgstr "roster â%sâ incompleto (%d r
#: database_check.cc:658
#, 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:666
#, c-format
@@ -1970,13 +1888,16 @@ msgid "revision %s mismatched parents (%
#: database_check.cc:698
#, 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:707
#, 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:719
#, c-format
@@ -1987,7 +1908,8 @@ msgid "revision %s is not parseable (per
#: database_check.cc:726
#, 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:733
#, c-format
@@ -2002,7 +1924,9 @@ msgid "revision %s unchecked signature i
#: database_check.cc:790
#, 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:798
#, c-format
@@ -2017,7 +1941,9 @@ msgid "revision %s mismatched certs (%d
#: database_check.cc:822
#, 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:846
#, c-format
@@ -2136,8 +2062,12 @@ msgstr "%d altezze errate"
#: database_check.cc:1017
#, c-format
-msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d heights"
-msgstr "controllo completo: %d file; %d roster; %d revisioni; %d chiavi; %d certificati; %d altezze"
+msgid ""
+"check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d "
+"heights"
+msgstr ""
+"controllo completo: %d file; %d roster; %d revisioni; %d chiavi; %d "
+"certificati; %d altezze"
#: database_check.cc:1024
#, c-format
@@ -2201,12 +2131,14 @@ msgstr ""
"è un database molto vecchio; ha bisogno di essere aggiornato\n"
"prego vedi README.changesets per dettagli"
-#: database.cc:487
-#: sanity.cc:234
-#: schema_migration.cc:58
+#: database.cc:487 sanity.cc:234 schema_migration.cc:58
msgid "error: "
msgstr "errore: "
+#: database.cc:488
+msgid "sqlite error: "
+msgstr "errore sqlite: "
+
#: database.cc:512
#, fuzzy
msgid "not set"
@@ -2217,10 +2149,7 @@ msgstr "imposta il nome del database"
msgid " (not a monotone database)"
msgstr "imposta il nome del database"
-#: database.cc:573
-#: database.cc:604
-#: database.cc:1046
-#: database.cc:1066
+#: database.cc:573 database.cc:604 database.cc:1046 database.cc:1066
#, c-format
msgid "%u"
msgstr "%u"
@@ -2331,7 +2260,8 @@ msgid ""
#: database.cc:3142
#, 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 ""
@@ -2365,8 +2295,7 @@ msgstr ""
"[ destra] %s\n"
"[ unione] %s"
-#: file_io.cc:194
-#: file_io.cc:201
+#: file_io.cc:194 file_io.cc:201
#, c-format
msgid ""
"could not create directory '%s'\n"
@@ -2446,10 +2375,10 @@ msgid "rename source file '%s' is a dire
#: file_io.cc:273
#, 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:276
-#: file_io.cc:289
+#: file_io.cc:276 file_io.cc:289
#, c-format
msgid "rename target '%s' already exists"
msgstr "esiste già un'altra chiave con nome â%sâ"
@@ -2504,8 +2433,7 @@ msgstr ""
msgid "caught runtime error %s constructing file path for %s"
msgstr ""
-#: file_io.cc:547
-#: work.cc:1112
+#: file_io.cc:540 work.cc:1112
#, c-format
msgid "no such file or directory: '%s'"
msgstr "nessun file o directory con nome â%sâ"
@@ -2530,8 +2458,7 @@ msgstr "le passphrase non può essere vu
msgid "empty passphrases not allowed, try again"
msgstr "le passphrase non può essere vuota, riprova"
-#: keys.cc:132
-#: keys.cc:139
+#: keys.cc:132 keys.cc:139
#, c-format
msgid "too many failed passphrases"
msgstr "troppe passphrase errate"
@@ -2551,29 +2478,22 @@ msgstr "passphrase incorretta per â%sâ
msgid "passphrase for '%s' is incorrect"
msgstr "passphrase incorretta per â%sâ"
-#: lua.cc:463
-#: lua.cc:477
-#: lua.cc:512
+#: lua.cc:463 lua.cc:477 lua.cc:512
#, c-format
msgid "%s called with an invalid parameter"
msgstr "â%sâ chiamato con un parametro non valido"
-#: lua.cc:480
-#: lua.cc:515
+#: lua.cc:480 lua.cc:515
#, c-format
msgid "Directory '%s' does not exist"
msgstr "La directory â%sâ non esiste"
-#: lua.cc:481
-#: lua.cc:516
-#: rcs_import.cc:1236
-#: work.cc:1367
+#: lua.cc:481 lua.cc:516 rcs_import.cc:1236 work.cc:1367
#, c-format
msgid "'%s' is not a directory"
msgstr "â%sâ non è una directory"
-#: lua.cc:500
-#: lua.cc:538
+#: lua.cc:500 lua.cc:538
#, c-format
msgid "lua error while loading rcfile '%s'"
msgstr "errore lua caricando il file rc â%sâ"
@@ -2656,11 +2576,15 @@ 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
@@ -2676,21 +2600,18 @@ msgstr ""
"valore HMAC errato (ottenuto %s, atteso %s)\n"
"questo indica che i dati ricevuti sono corrotti"
-#: 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"?
-#: 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 "la decodifica uleb128 per â%sâ in ***datum*** %d-byte ha dato overflow"
@@ -2703,7 +2624,9 @@ 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
@@ -2727,8 +2650,7 @@ msgstr "cert. â"
msgid "certs in"
msgstr "cert. â"
-#: netsync.cc:768
-#: netsync.cc:781
+#: netsync.cc:768 netsync.cc:781
msgid "revs in"
msgstr "rev. â"
@@ -2736,8 +2658,7 @@ msgstr "cert. â"
msgid "certs out"
msgstr "cert. â"
-#: netsync.cc:775
-#: netsync.cc:783
+#: netsync.cc:775 netsync.cc:783
msgid "revs out"
msgstr "rev. â"
@@ -2746,8 +2667,7 @@ msgstr "underflow del numero di elementi
msgid "underflow on count of %s items to receive"
msgstr "underflow del numero di elementi %s da ricevere"
-#: netsync.cc:1260
-#: netsync.cc:1268
+#: netsync.cc:1260 netsync.cc:1268
#, c-format
msgid "received network error: %s"
msgstr "ricevuto errore di rete: %s"
@@ -2817,7 +2737,8 @@ msgid "allowed anonymous read/write perm
#: netsync.cc:1456
#, 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:1519
#, c-format
@@ -2831,13 +2752,20 @@ msgstr "individuato attacco replay nell'
#: netsync.cc:1559
#, 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:1574
#, 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:1584
#, c-format
@@ -2846,8 +2774,12 @@ msgstr "concessi a â%sâ permessi di
#: netsync.cc:1595
#, 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:1603
#, c-format
@@ -2887,12 +2819,16 @@ msgid "Mismatched epoch on branch %s. Se
#: netsync.cc:1935
#, 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:1953
#, 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:1967
#, c-format
@@ -2904,18 +2840,15 @@ msgstr "Ricevuto avvertimento dall'uscie
msgid "Received warning from usher: %s"
msgstr "Ricevuto avvertimento dall'usciere: %s"
-#: netsync.cc:2116
-#: netsync.cc:2147
+#: netsync.cc:2116 netsync.cc:2147
msgid "source and sink"
msgstr "sorgente e pozzo"
-#: netsync.cc:2117
-#: netsync.cc:2148
+#: netsync.cc:2117 netsync.cc:2148
msgid "source"
msgstr "sorgente"
-#: netsync.cc:2117
-#: netsync.cc:2148
+#: netsync.cc:2117 netsync.cc:2148
msgid "sink"
msgstr "pozzo"
@@ -2924,8 +2857,7 @@ msgstr ""
msgid "input buffer for peer %s is overfull after netcmd dispatch"
msgstr ""
-#: netsync.cc:2316
-#: netsync.cc:2415
+#: netsync.cc:2316 netsync.cc:2415
#, c-format
msgid "protocol error while processing peer %s: '%s'"
msgstr "errore di protocollo processando il peer %s: â%sâ"
@@ -2968,7 +2900,8 @@ msgid "protocol error while processing p
#: netsync.cc:2547
#, 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:2579
#, c-format
@@ -2987,7 +2920,8 @@ msgstr ""
#: netsync.cc:2632
#, 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:2638
@@ -3002,7 +2936,8 @@ msgstr ""
#: netsync.cc:2664
#, 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:2670
@@ -3033,7 +2968,9 @@ msgid "session limit %d reached, some co
#: netsync.cc:2802
#, 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:2869
#, c-format
@@ -3084,8 +3021,7 @@ msgstr ""
"%s"
msgstr ""
-#: netsync.cc:3245
-#: netsync.cc:3249
+#: netsync.cc:3245 netsync.cc:3249
#, c-format
msgid "network error: %s"
msgstr "errore di rete: %s"
@@ -3098,9 +3034,7 @@ msgstr "dimensione di blocco per l'outpu
msgid "block size in bytes for \"automate stdio\" output"
msgstr "dimensione di blocco per l'output di âautomate stdioâ (in byte)"
-#: options_list.hh:32
-#: options_list.hh:317
-#: options_list.hh:360
+#: options_list.hh:32 options_list.hh:317 options_list.hh:360
#, c-format
msgid "cannot be zero or negative"
msgstr "non può essere zero o negativo"
@@ -3176,7 +3110,9 @@ msgid "when rosterifying, drop attrs ent
#: options_list.hh:220
msgid "when rosterifying, drop attrs entries with the given key"
-msgstr "durante la conversione al formato con roster, elimina gli attributi con una chiave specificata"
+msgstr ""
+"durante la conversione al formato con roster, elimina gli attributi con una "
+"chiave specificata"
#: options_list.hh:228
msgid "don't perform the operation, just show what would have happened"
@@ -3342,10 +3278,7 @@ 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"
@@ -3395,7 +3328,8 @@ 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
@@ -3445,26 +3379,22 @@ msgstr "etichette"
msgid "tags"
msgstr "etichette"
-#: restrictions.cc:60
-#: restrictions.cc:77
+#: restrictions.cc:60 restrictions.cc:77
#, c-format
msgid "conflicting include/exclude on path '%s'"
msgstr ""
-#: restrictions.cc:103
-#: restrictions.cc:141
+#: restrictions.cc:103 restrictions.cc:141
#, c-format
msgid "restriction includes unknown path '%s'"
msgstr ""
-#: restrictions.cc:114
-#: restrictions.cc:155
+#: restrictions.cc:114 restrictions.cc:155
#, c-format
msgid "restriction excludes unknown path '%s'"
msgstr ""
-#: restrictions.cc:118
-#: restrictions.cc:159
+#: restrictions.cc:118 restrictions.cc:159
#, fuzzy, c-format
msgid "%d unknown path"
msgid_plural "%d unknown paths"
@@ -3500,12 +3430,16 @@ msgid "Directory for path %s cannot be a
#: revision.cc:1121
#, 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:1132
#, 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:1135
#, c-format
@@ -3524,7 +3458,8 @@ msgid "converting existing revision grap
#: revision.cc:1535
#, 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:1590
#, c-format
@@ -3709,7 +3644,9 @@ msgid "no migration performed; database
#: schema_migration.cc:973
#, fuzzy, c-format
msgid "no migration performed; database schema already up-to-date"
-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:980
#, c-format
@@ -3824,7 +3761,8 @@ 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
@@ -3841,7 +3779,8 @@ msgid "failed to decode boolean testresu
#: update.cc:71
#, 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:160
#, c-format
@@ -3889,9 +3828,7 @@ 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:188
-#: work_migration.cc:208
+#: work.cc:88 work_migration.cc:188 work_migration.cc:208
#, c-format
msgid "workspace is corrupt: reading %s: %s"
msgstr "lo spazio di lavoro è corrotto: leggendo â%sâ: %s"
@@ -3933,7 +3870,8 @@ 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
@@ -3941,14 +3879,12 @@ msgstr "cancello â%sâ"
msgid "dropping %s"
msgstr "cancello â%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:756
+#: work.cc:724 work.cc:756
#, c-format
msgid "adding %s"
msgstr "aggiungo â%sâ"
@@ -4040,7 +3976,8 @@ msgid "destination dir %s/ is not versio
#: work.cc:1238
#, c-format
msgid "destination dir %s/ is not versioned (perhaps add it?)"
-msgstr "la directory di destinazione â%s/â non è versionata (in caso, usare âaddâ)"
+msgstr ""
+"la directory di destinazione â%s/â non è versionata (in caso, usare âaddâ)"
#: work.cc:1241
#, c-format
@@ -4125,7 +4062,9 @@ msgid "_MTN/format should not exist in a
#: work_migration.cc:79
#, 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:116
#, c-format
@@ -4148,14 +4087,16 @@ msgstr ""
"with versions of monotone older than %s."
msgstr ""
-#: work_migration.cc:135
-#: work_migration.cc:263
+#: work_migration.cc:135 work_migration.cc:263
#, 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:164
#, c-format
@@ -4176,5 +4117,5 @@ msgid "this workspace is in the current
#: work_migration.cc:255
#, 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 40f17e4ffff8058a0314fbd030f7975476730ce3
+++ po/ja.po b2d342cfdad23bc57acf7f51d5344e2cbd4068cd
@@ -7,7 +7,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: monotone HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-03 19:00+0900\n"
+"POT-Creation-Date: 2007-01-23 08:09-0800\n"
"PO-Revision-Date: 2007-01-03 18:53+0900\n"
"Last-Translator: Satoru SATOH \n"
"Language-Team: Japanese \n"
@@ -16,27 +16,27 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app_state.cc:129
+#: app_state.cc:130
#, c-format
msgid "workspace required but not found%s%s"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ãå¿
è¦ã§ããã¿ã¤ããã¾ãã%s%s"
-#: app_state.cc:137
+#: app_state.cc:138
#, c-format
msgid "invalid directory ''"
msgstr "ç¡å¹ãªãã£ã¬ã¯ã㪠''"
-#: app_state.cc:145
+#: app_state.cc:146
#, c-format
msgid "monotone bookkeeping directory '%s' already exists in '%s'"
msgstr "monotone è¨é²ç°¿ç¨ãã£ã¬ã¯ã㪠'%s' ã¯æ¢ã« '%s' å
ã«åå¨ãã¦ãã¾ã"
-#: app_state.cc:201
+#: app_state.cc:208
#, c-format
msgid "search root '%s' does not exist"
msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯åå¨ãã¾ãã"
-#: app_state.cc:202
+#: app_state.cc:209
#, c-format
msgid "search root '%s' is not a directory"
msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
@@ -48,9 +48,9 @@ msgstr "[ãã©ã³ã]"
#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218
#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529
#: automate.cc:905 automate.cc:1035 automate.cc:1079 automate.cc:1105
-#: automate.cc:1132 automate.cc:1159 automate.cc:1193 automate.cc:1304
-#: automate.cc:1401 automate.cc:1460 automate.cc:1506 automate.cc:1566
-#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:676
+#: automate.cc:1132 automate.cc:1159 automate.cc:1193 automate.cc:1305
+#: automate.cc:1395 automate.cc:1454 automate.cc:1500 automate.cc:1560
+#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:669
#, c-format
msgid "wrong argument count"
msgstr "å¼æ°ã®æ°ãééã£ã¦ãã¾ã"
@@ -61,7 +61,7 @@ msgstr "REV1 [REV2 [REV3 [...]]]"
#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454
-#: automate.cc:1200 cmd_list.cc:683 revision.cc:1705
+#: automate.cc:1200 cmd_list.cc:676 revision.cc:1705
#, c-format
msgid "No such revision %s"
msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
@@ -85,12 +85,12 @@ msgstr "NEW_REV [OLD_REV1 [OLD_REV2 [...
#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:949
#: automate.cc:970 automate.cc:1256 cmd_automate.cc:78 cmd_automate.cc:332
-#: cmd_list.cc:584
+#: cmd_list.cc:577
#, c-format
msgid "no arguments needed"
msgstr "å¼æ°ã¯å¿
è¦ããã¾ãã"
-#: automate.cc:423 automate.cc:448 cmd_list.cc:673 revision.cc:1699
+#: automate.cc:423 automate.cc:448 cmd_list.cc:666 revision.cc:1699
msgid "REV"
msgstr "REV"
@@ -102,21 +102,21 @@ msgstr "[REVID]"
msgid "[REVID]"
msgstr "[REVID]"
-#: automate.cc:931 automate.cc:1054 automate.cc:1514 automate.cc:1573
-#: automate.cc:1578
+#: automate.cc:931 automate.cc:1054 automate.cc:1508 automate.cc:1567
+#: automate.cc:1572
#, c-format
msgid "no revision %s found in database"
msgstr "ãã¼ã¿ãã¼ã¹ã« %s ã¨ãããªãã¸ã§ã³ã¯ããã¾ãã"
-#: automate.cc:1076 automate.cc:1102 cmd_merging.cc:845
+#: automate.cc:1076 automate.cc:1102 cmd_merging.cc:837
msgid "REVID"
msgstr "REVID"
#: automate.cc:1087 automate.cc:1113 automate.cc:1168 automate.cc:1170
#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419
-#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:677
-#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:523
-#: cmd_ws_commit.cc:1011 commands.cc:413
+#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:669
+#: cmd_merging.cc:684 cmd_merging.cc:687 cmd_ws_commit.cc:517
+#: cmd_ws_commit.cc:987 commands.cc:411
#, c-format
msgid "no such revision '%s'"
msgstr "'%s' ã¨ãããªãã¸ã§ã³ã¯ããã¾ãã"
@@ -134,48 +134,48 @@ msgstr "OLD_FILE NEW_FILE"
msgid "OLD_FILE NEW_FILE"
msgstr "OLD_FILE NEW_FILE"
-#: automate.cc:1301
+#: automate.cc:1302
msgid "[BRANCH_PATTERN]"
msgstr "[ãã©ã³ããã¿ã¼ã³]"
-#: automate.cc:1398
+#: automate.cc:1392
msgid "KEYID PASSPHRASE"
msgstr "éµID ãã¹ãã¬ã¼ãº"
-#: automate.cc:1416 cmd_key_cert.cc:42
+#: automate.cc:1410 cmd_key_cert.cc:42
#, c-format
msgid "key '%s' already exists"
msgstr "éµ '%s' ã¯æ¢ã«ããã¾ã"
-#: automate.cc:1419 cmd_key_cert.cc:45
+#: automate.cc:1413 cmd_key_cert.cc:45
#, c-format
msgid "generating key-pair '%s'"
msgstr "éµå¯¾ '%s' ãçæãã¦ãã¾ã"
-#: automate.cc:1421 cmd_key_cert.cc:47
+#: automate.cc:1415 cmd_key_cert.cc:47
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "éµå¯¾ '%s' ã %s/ ã«ä¿åãã¦ãã¾ã"
-#: automate.cc:1457
+#: automate.cc:1451
msgid "OPTION"
msgstr "ãªãã·ã§ã³"
-#: automate.cc:1480
+#: automate.cc:1474
#, c-format
msgid "'%s' is not a recognized workspace option"
msgstr "'%s' ã¨ããã¯ã¼ã¯ã¹ãã¼ã¹ãªãã·ã§ã³ã¯ããã¾ãã"
-#: automate.cc:1503
+#: automate.cc:1497
msgid "REV FILE"
msgstr "REV FILE"
-#: automate.cc:1520 automate.cc:1584
+#: automate.cc:1514 automate.cc:1578
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "%s ã¨ãããã¡ã¤ã«ã¯ãªãã¸ã§ã³ %s ã«ã¯å«ã¾ãã¦ãã¾ãã"
-#: automate.cc:1563
+#: automate.cc:1557
msgid "REV1 FILE REV2"
msgstr "REV1 FILE REV2"
@@ -184,39 +184,39 @@ msgstr "%s ã解æãã¦ãã¾ã: %d:
msgid "parsing a %s at %d:%d:E: %s"
msgstr "%s ã解æãã¦ãã¾ã: %d:%d:E: %s"
-#: cert.cc:83
+#: cert.cc:82
#, c-format
msgid "ignoring bad signature by '%s' on '%s'"
msgstr "'%s' ã«ãã '%s' ã¸ã®ä¸æ£ãªç½²åãç¡è¦ãã¾ã"
-#: cert.cc:91
+#: cert.cc:90
#, c-format
msgid "ignoring unknown signature by '%s' on '%s'"
msgstr "'%s' ã«ãã '%s' ã¸ã®ä¸æãªç½²åãç¡è¦ãã¾ã"
# FIXME: How to translate 'disliked ...'
-#: cert.cc:157
+#: cert.cc:156
#, c-format
msgid "trust function disliked %d signers of %s cert on manifest %s"
msgstr "trust function disliked %d signers of %s cert on manifest %s"
# FIXME: How to translate 'disliked ...'
-#: cert.cc:214
+#: cert.cc:213
#, c-format
msgid "trust function disliked %d signers of %s cert on revision %s"
msgstr "trust function disliked %d signers of %s cert on revision %s"
-#: cert.cc:303
+#: cert.cc:302
#, c-format
msgid "calculated cert hash '%s' does not match '%s'"
msgstr "è¨ç®ãã証æããã·ã¥ '%s' 㯠'%s' ã¨ä¸è´ãã¾ãã"
-#: cert.cc:387 keys.cc:561
+#: cert.cc:386 keys.cc:561
#, c-format
msgid "no key pair '%s' found in key store '%s'"
msgstr "'%s' ã¨ããéµå¯¾ã¯éµã®ä¿åå ´æ '%s' ã«ã¯ããã¾ãã"
-#: cert.cc:465
+#: cert.cc:464
#, c-format
msgid ""
"you have no private key to make signatures with\n"
@@ -225,7 +225,7 @@ msgstr ""
"ç½²åããããã®ç§å¯éµãããã¾ããã\n"
"ãããã 'genkey <ããªãã®ã¡ã¼ã«ã¢ãã¬ã¹>' ã¨ããå¿
è¦ãããã¾ãã"
-#: cert.cc:468
+#: cert.cc:467
#, c-format
msgid ""
"you have multiple private keys\n"
@@ -234,18 +234,18 @@ msgstr ""
"è¤æ°ã®ç§å¯éµãããã¾ãã\n"
"'-k<éµå>' ãã³ãã³ãã«è¿½å ãã¦ã使ç¨ããç½²åãé¸æãã¦ä¸ããã"
-#: cert.cc:485
+#: cert.cc:484
#, c-format
msgid "no branch found for empty revision, please provide a branch name"
msgstr "空ã®ãªãã¸ã§ã³ã®ãã©ã³ãã¯ããã¾ããããã©ã³ãåãæå®ãã¦ä¸ããã"
-#: cert.cc:494
+#: cert.cc:491
#, c-format
msgid "no branch certs found for revision %s, please provide a branch name"
msgstr ""
"ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æãã¿ã¤ããã¾ããããã©ã³ãåãæå®ãã¦ä¸ããã"
-#: cert.cc:498
+#: cert.cc:495
#, c-format
msgid ""
"multiple branch certs found for revision %s, please provide a branch name"
@@ -273,16 +273,16 @@ msgstr "automate stdio ã«å¯¾ãä¸æ£ã
msgid "Bad input to automate stdio: expected '%c' token"
msgstr "automate stdio ã«å¯¾ãä¸æ£ãªå
¥å: ãã¼ã¯ã³ '%c' ãæ¥ãã¯ãã§ã"
-#: cmd_automate.cc:344
+#: cmd_automate.cc:348
#, c-format
msgid "Bad input to automate stdio: command name is missing"
msgstr "automate stdio ã«å¯¾ãä¸æ£ãªå
¥å: ã³ãã³ãåãããã¾ãã"
-#: cmd_automate.cc:373
+#: cmd_automate.cc:377
msgid "automation"
msgstr "èªåå"
-#: cmd_automate.cc:374
+#: cmd_automate.cc:378
msgid "automation interface"
msgstr "èªååã¤ã³ã¿ã¼ãã§ã¼ã¹"
@@ -363,8 +363,8 @@ msgstr "%s ã¨ããå¤æ°ã¯ãã¡ã¤ã
msgid "no var with name %s in domain %s"
msgstr "%s ã¨ããå¤æ°ã¯ãã¡ã¤ã³ %s å
ã«ã¯ããã¾ãã"
-#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114
-#: cmd_files.cc:220 cmd_list.cc:478 cmd_merging.cc:614 cmd_ws_commit.cc:417
+#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:602 cmd_files.cc:114
+#: cmd_files.cc:220 cmd_list.cc:471 cmd_merging.cc:606 cmd_ws_commit.cc:411
#: commands.cc:275
msgid "informative"
msgstr "æ
å ±"
@@ -387,8 +387,8 @@ msgstr "è¤æ°ã®ãªãã¸ã§ã³ãæå®
msgid "more than two revisions given"
msgstr "è¤æ°ã®ãªãã¸ã§ã³ãæå®ãã¦ãã¾ã"
-#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308
-#: cmd_ws_commit.cc:343 cmd_ws_commit.cc:417 cmd_ws_commit.cc:723
+#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:302
+#: cmd_ws_commit.cc:337 cmd_ws_commit.cc:411 cmd_ws_commit.cc:707
msgid "[PATH]..."
msgstr "[ãã¹]..."
@@ -421,11 +421,11 @@ msgstr "[FILE [...]]"
msgid "[FILE [...]]"
msgstr "[FILE [...]]"
-#: cmd_diff_log.cc:603
+#: cmd_diff_log.cc:602
msgid "[FILE] ..."
msgstr "[FILE] ..."
-#: cmd_diff_log.cc:604
+#: cmd_diff_log.cc:603
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
"revisions are given, use them as a starting point."
@@ -433,13 +433,13 @@ msgstr ""
"éé ã§å±¥æ´ã表示 ('FILE' ã§ãã£ã«ã¿)ãä¸ã¤ä»¥ä¸ã®ãªãã¸ã§ã³ãæå®ããã¦\n"
"ããã°ãããéå§ç¹ã¨ãã¦å©ç¨ãã¾ãã"
-#: cmd_diff_log.cc:618
+#: cmd_diff_log.cc:617
#, 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:837 cmd_othervcs.cc:15
msgid "debug"
msgstr "ãããã°"
@@ -573,7 +573,7 @@ msgstr "%s ã®å¥å"
msgstr "%s ã®å¥å"
#: 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
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:143
msgid "key and cert"
msgstr "éµã¨è¨¼æ"
@@ -635,17 +635,17 @@ msgstr "ãªãã¸ã§ã³ã®è¨¼æãä½æ
msgid "create a cert for a revision"
msgstr "ãªãã¸ã§ã³ã®è¨¼æãä½æ"
-#: cmd_key_cert.cc:150
+#: cmd_key_cert.cc:144
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
-#: cmd_key_cert.cc:151
+#: cmd_key_cert.cc:145
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
msgstr "ç¾å¨ã®è¨å®ã§ä»®æ³è¨¼æãä¿¡é ¼å¯è½ããã¹ã"
-#: cmd_key_cert.cc:184
+#: cmd_key_cert.cc:178
#, c-format
msgid ""
"if a cert on: %s\n"
@@ -660,72 +660,72 @@ msgstr ""
"ç½²åè
: %s\n"
"ãã£ã¦ãããã %s ã§ããã"
-#: cmd_key_cert.cc:193
+#: cmd_key_cert.cc:187
msgid "trusted"
msgstr "trusted"
-#: cmd_key_cert.cc:193
+#: cmd_key_cert.cc:187
msgid "UNtrusted"
msgstr "UNtrusted"
-#: cmd_key_cert.cc:197 cmd_key_cert.cc:210 cmd_key_cert.cc:223
-#: cmd_key_cert.cc:239 cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:191 cmd_key_cert.cc:204 cmd_key_cert.cc:217
+#: cmd_key_cert.cc:233 cmd_ws_commit.cc:202
msgid "review"
msgstr "ã¬ãã¥ã¼"
-#: cmd_key_cert.cc:197
+#: cmd_key_cert.cc:191
msgid "REVISION TAGNAME"
msgstr "REVISION TAGNAME"
-#: cmd_key_cert.cc:198
+#: cmd_key_cert.cc:192
msgid "put a symbolic tag cert on a revision"
msgstr "è¨å·çãªã¿ã°è¨¼æããªãã¸ã§ã³ã«ä»å "
-#: cmd_key_cert.cc:210
+#: cmd_key_cert.cc:204
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr "ID (pass|fail|true|false|yes|no|1|0)"
-#: cmd_key_cert.cc:211
+#: cmd_key_cert.cc:205
msgid "note the results of running a test on a revision"
msgstr "ãªãã¸ã§ã³ã®ãã¹ãã®å®è¡çµæãè¨é²"
-#: cmd_key_cert.cc:223 cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:217 cmd_ws_commit.cc:202
msgid "REVISION"
msgstr "REVISION"
-#: cmd_key_cert.cc:224
+#: cmd_key_cert.cc:218
msgid "approve of a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ãæ¿èª"
-#: cmd_key_cert.cc:235
+#: cmd_key_cert.cc:229
#, c-format
msgid "need --branch argument for approval"
msgstr "æ¿èªã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: cmd_key_cert.cc:239
+#: cmd_key_cert.cc:233
msgid "REVISION [COMMENT]"
msgstr "REVISION [COMMENT]"
-#: cmd_key_cert.cc:240
+#: cmd_key_cert.cc:234
msgid "comment on a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ã«ã³ã¡ã³ã"
-#: cmd_key_cert.cc:252
+#: cmd_key_cert.cc:246
#, c-format
msgid "edit comment failed"
msgstr "ã³ã¡ã³ãç·¨éã«å¤±æ"
-#: cmd_key_cert.cc:257
+#: cmd_key_cert.cc:251
#, c-format
msgid "empty comment"
msgstr "空ã®ã³ã¡ã³ã"
-#: cmd_list.cc:64 cmd_list.cc:697
+#: cmd_list.cc:67 cmd_list.cc:693
#, c-format
msgid "no public key '%s' found in database"
msgstr "ãã¼ã¿ãã¼ã¹å
ã«å
¬ééµ '%s' ã¯ããã¾ãã"
-#: cmd_list.cc:74
+#: cmd_list.cc:77
#, c-format
msgid ""
"Key : %s\n"
@@ -738,39 +738,39 @@ msgstr ""
"åå : %s\n"
"å¤ : %s\n"
-#: cmd_list.cc:108
+#: cmd_list.cc:111
msgid "ok"
msgstr "OK"
-#: cmd_list.cc:111
+#: cmd_list.cc:114
msgid "bad"
msgstr "NG"
-#: cmd_list.cc:114
+#: cmd_list.cc:117
msgid "unknown"
msgstr "ä¸æ"
-#: cmd_list.cc:202
+#: cmd_list.cc:205
#, c-format
msgid "(*) - only in %s/"
msgstr "(*) - %s/ å
ã«ã®ã¿åå¨"
-#: cmd_list.cc:226
+#: cmd_list.cc:229
#, c-format
msgid "no keys found"
msgstr "éµãã¿ã¤ããã¾ããã§ãã"
-#: cmd_list.cc:228
+#: cmd_list.cc:231
#, c-format
msgid "no keys found matching '%s'"
msgstr "'%s' ã«ä¸è´ããéµã¯ã¿ã¤ããã¾ããã§ãã"
-#: cmd_list.cc:275
+#: cmd_list.cc:281
#, c-format
msgid "no epoch for branch %s"
msgstr "ãã©ã³ã %s ã«ã¯ epoch ã¯ããã¾ãã"
-#: cmd_list.cc:479
+#: cmd_list.cc:472
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -796,7 +796,7 @@ msgstr ""
"missing\n"
"changed"
-#: cmd_list.cc:490
+#: cmd_list.cc:483
msgid ""
"show database objects, or the current workspace manifest, \n"
"or known, unknown, intentionally ignored, missing, or \n"
@@ -805,10 +805,10 @@ msgstr ""
"ãã¼ã¿ãã¼ã¹ãªãã¸ã§ã¯ããç¾å¨ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãã\n"
"æ¢ç¥ã¾ãã¯ä¸æãªãæå³çã«ç¡è¦ã失ãªãããã¾ãã¯å¤æ´ããããã¡ã¤ã«ã表示"
-#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:79
-#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:343
-#: cmd_ws_commit.cc:373 cmd_ws_commit.cc:398 cmd_ws_commit.cc:623
-#: cmd_ws_commit.cc:723
+#: cmd_merging.cc:73 cmd_merging.cc:647 cmd_ws_commit.cc:79
+#: cmd_ws_commit.cc:258 cmd_ws_commit.cc:302 cmd_ws_commit.cc:337
+#: cmd_ws_commit.cc:367 cmd_ws_commit.cc:392 cmd_ws_commit.cc:607
+#: cmd_ws_commit.cc:707
msgid "workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹"
@@ -870,12 +870,12 @@ msgstr "é¸æãããæ´æ°ã¿ã¼ã²ã
msgid "selected update target %s"
msgstr "é¸æãããæ´æ°ã¿ã¼ã²ãã %s"
-#: cmd_merging.cc:171
+#: cmd_merging.cc:161
#, c-format
msgid "target revision is not in current branch"
msgstr "ç®æ¨ã®ãªãã¸ã§ã³ã¯ç¾å¨ã®ãã©ã³ãã«ã¯å«ã¾ãã¦ãã¾ãã"
-#: cmd_merging.cc:179
+#: cmd_merging.cc:169
#, c-format
msgid ""
"target revision is in multiple branches:%s\n"
@@ -886,12 +886,12 @@ msgstr ""
"\n"
"æ示çã« --branch ãæå®ãã¦å試è¡ãã¦ä¸ããã"
-#: cmd_merging.cc:187
+#: cmd_merging.cc:177
#, c-format
msgid "switching to branch %s"
msgstr "ãã©ã³ã %s ã«åãæ¿ãã¦ãã¾ã"
-#: cmd_merging.cc:192
+#: cmd_merging.cc:182
#, c-format
msgid ""
"target revision not in any branch\n"
@@ -900,201 +900,201 @@ msgstr ""
"ã¿ã¼ã²ãããªãã¸ã§ã³ãå«ã¾ãããã©ã³ããããã¾ããã\n"
"次åã³ãããæã«ã¯ãã©ã³ã %s ã使ç¨ãã¾ãã"
-#: cmd_merging.cc:262
+#: cmd_merging.cc:252
#, c-format
msgid "switched branch; next commit will use branch %s"
msgstr "ãã©ã³ããåãæ¿ãã¾ããã次åã³ãããæã«ã¯ãã©ã³ã %s ã使ç¨ãã¾ãã"
-#: cmd_merging.cc:263
+#: cmd_merging.cc:253
#, c-format
msgid "updated to base revision %s"
msgstr "åºæºãªãã¸ã§ã³ %s ã«æ´æ°ãã¾ãã"
-#: cmd_merging.cc:301
+#: cmd_merging.cc:291
#, c-format
msgid "[left] %s"
msgstr "[å·¦] %s"
-#: cmd_merging.cc:302
+#: cmd_merging.cc:292
#, c-format
msgid "[right] %s"
msgstr "[å³] %s"
-#: cmd_merging.cc:313 cmd_merging.cc:584
+#: cmd_merging.cc:305 cmd_merging.cc:576
#, c-format
msgid "[merged] %s"
msgstr "[çµ±åæ¸ã¿] %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:483 cmd_ws_commit.cc:969
-#: cmd_ws_commit.cc:992 cmd_ws_commit.cc:1102 cmd_ws_commit.cc:1116
+#: cmd_merging.cc:312 cmd_merging.cc:411 cmd_merging.cc:422 cmd_merging.cc:580
+#: cmd_merging.cc:813 cmd_ws_commit.cc:477 cmd_ws_commit.cc:945
+#: cmd_ws_commit.cc:968 cmd_ws_commit.cc:1068 cmd_ws_commit.cc:1082
msgid "tree"
msgstr "ããªã¼"
-#: cmd_merging.cc:320
+#: cmd_merging.cc:312
msgid "merge unmerged heads of branch"
msgstr "çµ±åããã¦ããªããã©ã³ãã®è¤æ°ã®ææ°çãçµ±å"
-#: cmd_merging.cc:330 cmd_merging.cc:829
+#: cmd_merging.cc:322 cmd_merging.cc:821
#, 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:507
+#: cmd_merging.cc:327 cmd_merging.cc:461 cmd_merging.cc:464 cmd_merging.cc:826
+#: cmd_ws_commit.cc:501
#, c-format
msgid "branch '%s' is empty"
msgstr "ãã©ã³ã '%s' ã¯ç©ºã§ã"
-#: cmd_merging.cc:338
+#: cmd_merging.cc:330
#, c-format
msgid "branch '%s' is already merged"
msgstr "ãã©ã³ã '%s' ã¯æ¢ã«çµ±åæ¸ã¿ã§ã"
-#: cmd_merging.cc:342
+#: cmd_merging.cc:334
#, c-format
msgid "%d head on branch '%s'"
msgid_plural "%d heads on branch '%s'"
msgstr[0] "ææ° %d å (ãã©ã³ã '%s' ä¸)"
-#: cmd_merging.cc:363 cmd_merging.cc:408
+#: cmd_merging.cc:355 cmd_merging.cc:400
#, c-format
msgid "merge %d / %d:"
msgstr "çµ±åæ¸ã¿ %d / %d"
-#: cmd_merging.cc:364
+#: cmd_merging.cc:356
#, c-format
msgid "calculating best pair of heads to merge next"
msgstr "次ã«çµ±åããææ°ãªãã¸ã§ã³ã®æé©ãªçµãè¨ç®ãã¦ãã¾ã"
-#: cmd_merging.cc:416
+#: cmd_merging.cc:408
#, c-format
msgid "note: your workspaces have not been updated"
msgstr "注æ: ã¯ã¼ã¯ã¹ãã¼ã¹ã¯æ´æ°ããã¦ãã¾ãã"
-#: cmd_merging.cc:419
+#: cmd_merging.cc:411
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr "SOURCE-BRANCH DEST-BRANCH"
-#: cmd_merging.cc:420
+#: cmd_merging.cc:412
msgid "merge from one branch to another asymmetrically"
msgstr "ä¸æ¹ã®ãã©ã³ããä»æ¹ã«éåæã«çµ±å"
-#: cmd_merging.cc:430
+#: cmd_merging.cc:422
msgid "SOURCE-BRANCH DEST-BRANCH DIR"
msgstr "SOURCE-BRANCH DEST-BRANCH DIR"
-#: cmd_merging.cc:431
+#: cmd_merging.cc:423
msgid "merge one branch into a subdirectory in another branch"
msgstr "ãã©ã³ããä»ã®ãã©ã³ãã®ãµããã£ã¬ã¯ããªã«çµ±å"
-#: cmd_merging.cc:470 cmd_merging.cc:473
+#: cmd_merging.cc:462 cmd_merging.cc:465
#, c-format
msgid "branch '%s' is not merged"
msgstr "ãã©ã³ã '%s' ã¯çµ±åããã¦ãã¾ãã"
-#: cmd_merging.cc:478
+#: cmd_merging.cc:470
#, c-format
msgid "propagating %s -> %s"
msgstr "ä¼æãã¦ãã¾ã: %s -> %s"
-#: cmd_merging.cc:479
+#: cmd_merging.cc:471
#, c-format
msgid "[source] %s"
msgstr "[å
] %s"
-#: cmd_merging.cc:480
+#: cmd_merging.cc:472
#, c-format
msgid "[target] %s"
msgstr "[å
] %s"
-#: cmd_merging.cc:485
+#: cmd_merging.cc:477
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'"
msgstr "ãã©ã³ã '%s' ã¯ãã©ã³ã '%s' ã«å¯¾ãã¦ææ°ã§ã"
-#: cmd_merging.cc:487
+#: cmd_merging.cc:479
#, c-format
msgid "no action taken"
msgstr "ä½ããã¾ãã"
-#: cmd_merging.cc:491
+#: cmd_merging.cc:483
#, c-format
msgid "no merge necessary; putting %s in branch '%s'"
msgstr "çµ±åã¯å¿
è¦ããã¾ããã%s ããã©ã³ã '%s' å
ã«åãè¾¼ãã§ãã¾ãã"
-#: cmd_merging.cc:529
+#: cmd_merging.cc:521
#, c-format
msgid "Path %s not found in destination tree."
msgstr "%s ã¨ãããã¹ã¯å
ã®ããªã¼å
ã«ã¯ã¿ã¤ããã¾ãã"
-#: cmd_merging.cc:589
+#: cmd_merging.cc:581
msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
msgstr "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
-#: cmd_merging.cc:590
+#: cmd_merging.cc:582
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr "æ示çã«æå®ããäºã¤ã®ãªãã¸ã§ã³ãçµ±åãçµæã¯æå®ãã©ã³ãã¸ã"
-#: cmd_merging.cc:605
+#: cmd_merging.cc:597
#, 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:599 cmd_merging.cc:601
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s ã¯æ¢ã« %s ã®ç¥å
ã¨ãªã£ã¦ãã¾ã"
-#: cmd_merging.cc:614
+#: cmd_merging.cc:606
msgid "REV REV"
msgstr "REV REV"
-#: cmd_merging.cc:615
+#: cmd_merging.cc:607
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:617 cmd_merging.cc:619
#, c-format
msgid "%s is an ancestor of %s; no merge is needed."
msgstr "%s 㯠%s ã®ç¥å
ã§ããçµ±åã¯å¿
è¦ããã¾ããã"
-#: cmd_merging.cc:641
+#: cmd_merging.cc:633
#, c-format
msgid "There are %s node_name_conflicts."
msgstr "%s node_name_conflicts ãããã¾ãã"
-#: cmd_merging.cc:643
+#: cmd_merging.cc:635
#, c-format
msgid "There are %s file_content_conflicts."
msgstr "%s file_content_conflicts ãããã¾ãã"
-#: cmd_merging.cc:645
+#: cmd_merging.cc:637
#, c-format
msgid "There are %s node_attr_conflicts."
msgstr "%s node_attr_conflicts ãããã¾ãã"
-#: cmd_merging.cc:647
+#: cmd_merging.cc:639
#, c-format
msgid "There are %s orphaned_node_conflicts."
msgstr "%s orphaned_node_conflicts ãããã¾ãã"
-#: cmd_merging.cc:649
+#: cmd_merging.cc:641
#, c-format
msgid "There are %s rename_target_conflicts."
msgstr "%s rename_target_conflicts ãããã¾ãã"
-#: cmd_merging.cc:651
+#: cmd_merging.cc:643
#, c-format
msgid "There are %s directory_loop_conflicts."
msgstr "%s directory_loop_conflicts ãããã¾ãã"
-#: cmd_merging.cc:655
+#: cmd_merging.cc:647
msgid "[-r FROM] -r TO [PATH...]"
msgstr "[-r FROM] -r TO [PATH...]"
-#: cmd_merging.cc:656
+#: cmd_merging.cc:648
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"
@@ -1119,7 +1119,7 @@ msgstr ""
"\n"
"ãªãã¸ã§ã³ãäºã¤æå®ããã¦ããã°ãäºçªç®ã«å¯¾ããä¸çªç®ã®å¤æ´ãé©ç¨ãã¾ãã"
-#: cmd_merging.cc:681
+#: cmd_merging.cc:673
#, c-format
msgid ""
"revision %s is a merge\n"
@@ -1130,41 +1130,41 @@ msgstr ""
"親ã®ä¸ã¤ã«å¯¾ããå¤æ´ã®é©ç¨ã§ãã\n"
"%s pluck -r PARENT -r %s ã使ç¨ãã¦ãã ããã"
-#: cmd_merging.cc:702
+#: cmd_merging.cc:694
#, c-format
msgid "no changes to apply"
msgstr "é©ç¨ããå¤æ´ã¯ããã¾ãã"
-#: cmd_merging.cc:759
+#: cmd_merging.cc:751
#, c-format
msgid "no changes to be applied"
msgstr "é©ç¨ãããã¹ãå¤æ´ã¯ããã¾ãã"
-#: cmd_merging.cc:786
+#: cmd_merging.cc:778
#, c-format
msgid "no changes were applied"
msgstr "é©ç¨ãããå¤æ´ã¯ããã¾ãã"
-#: cmd_merging.cc:789
+#: cmd_merging.cc:781
#, c-format
msgid "applied changes to workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã«å¤æ´ãé©ç¨ãã¾ãã"
-#: cmd_merging.cc:821
+#: cmd_merging.cc:813
msgid "show unmerged head revisions of branch"
msgstr "ãã©ã³ãã®çµ±åããã¦ããªãææ°ãªãã¸ã§ã³ã表示"
-#: cmd_merging.cc:836
+#: cmd_merging.cc:828
#, c-format
msgid "branch '%s' is currently merged:"
msgstr "ç¾å¨ãã©ã³ã '%s' ã¯çµ±åæ¸ã¿ã§ã:"
-#: cmd_merging.cc:838
+#: cmd_merging.cc:830
#, c-format
msgid "branch '%s' is currently unmerged:"
msgstr "ç¾å¨ãã©ã³ã '%s' ã¯æªçµ±åã§ã:"
-#: cmd_merging.cc:846
+#: cmd_merging.cc:838
msgid "dump the roster associated with the given REVID"
msgstr "æå®ã® REVID ã«ã¤ãã¦é¢é£ã¥ããããåç°¿ããã³ã"
@@ -1393,43 +1393,43 @@ msgstr "éæ¿èªã¨ããã«ã¯ --branc
msgid "need --branch argument for disapproval"
msgstr "éæ¿èªã¨ããã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: cmd_ws_commit.cc:264
+#: cmd_ws_commit.cc:258
msgid "[DIRECTORY...]"
msgstr "[DIRECTORY...]"
-#: cmd_ws_commit.cc:265
+#: cmd_ws_commit.cc:259
msgid "create one or more directories and add them to the workspace"
msgstr "ä¸ã¤ä»¥ä¸ã®ãã£ã¬ã¯ããªãä½æããã¯ã¼ã¯ã¹ãã¼ã¹ã«è¿½å ãã¾ã"
-#: cmd_ws_commit.cc:285
+#: cmd_ws_commit.cc:279
#, c-format
msgid "directory '%s' already exists"
msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: cmd_ws_commit.cc:292
+#: cmd_ws_commit.cc:286
#, c-format
msgid "ignoring directory '%s' [see .mtn-ignore]"
msgstr "ãã£ã¬ã¯ã㪠'%s' ãç¡è¦ãã¦ãã¾ã [.mtn-ignore ãåç
§]"
-#: cmd_ws_commit.cc:309
+#: cmd_ws_commit.cc:303
msgid "add files to workspace"
msgstr "ãã¡ã¤ã«ãã¯ã¼ã¯ã¹ãã¼ã¹ã«è¿½å "
-#: cmd_ws_commit.cc:316
+#: cmd_ws_commit.cc:310
#, c-format
msgid "cannot set '--unknown' and '--recursive' at the same time"
msgstr "'--unknown' 㨠'--recursive' ã¯åæã«æå®ã§ãã¾ãã"
-#: cmd_ws_commit.cc:318
+#: cmd_ws_commit.cc:312
#, c-format
msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time"
msgstr "'--unknown' 㨠'--no-respect-ignore' ã¯åæã«æå®ã§ãã¾ãã"
-#: cmd_ws_commit.cc:344
+#: cmd_ws_commit.cc:338
msgid "drop files from workspace"
msgstr "ãã¡ã¤ã«ãã¯ã¼ã¯ã¹ãã¼ã¹ããåé¤"
-#: cmd_ws_commit.cc:374
+#: cmd_ws_commit.cc:368
msgid ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
@@ -1437,15 +1437,15 @@ msgstr ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
-#: cmd_ws_commit.cc:376
+#: cmd_ws_commit.cc:370
msgid "rename entries in the workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã®ã¨ã³ããªã®å称ãå¤æ´"
-#: cmd_ws_commit.cc:398
+#: cmd_ws_commit.cc:392
msgid "NEW_ROOT PUT_OLD"
msgstr "NEW_ROOT PUT_OLD"
-#: cmd_ws_commit.cc:399
+#: cmd_ws_commit.cc:393
msgid ""
"rename the root directory\n"
"after this command, the directory that currently has the name NEW_ROOT\n"
@@ -1458,31 +1458,31 @@ msgstr ""
"ãã£ã¬ã¯ããªã¨ãPUT_OLD ã¨ããååã®ç¾å¨ã®ã«ã¼ããã£ã¬ã¯ããªãæå®ãã¾ãã\n"
"--execute ã®ä½¿ç¨ãå¼·ãæ¨å¥¨ãã¾ãã"
-#: cmd_ws_commit.cc:417
+#: cmd_ws_commit.cc:411
msgid "show status of workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ç¶æ
ã表示"
-#: cmd_ws_commit.cc:446
+#: cmd_ws_commit.cc:440
#, c-format
msgid "Current branch: %s"
msgstr "ç¾å¨ã®ãã©ã³ã: %s"
-#: cmd_ws_commit.cc:452
+#: cmd_ws_commit.cc:446
#, c-format
msgid "Changes against parent %s"
msgstr "親 %s ã«å¯¾ããå¤æ´"
-#: cmd_ws_commit.cc:457
+#: cmd_ws_commit.cc:451
#, c-format
msgid " no changes"
msgstr " å¤æ´ãªã"
-#: cmd_ws_commit.cc:461
+#: cmd_ws_commit.cc:455
#, c-format
msgid " dropped %s"
msgstr " %s ãç ´æ£"
-#: cmd_ws_commit.cc:466
+#: cmd_ws_commit.cc:460
#, c-format
msgid ""
" renamed %s\n"
@@ -1491,21 +1491,21 @@ msgstr ""
" %s ã\n"
" %s ã«å称å¤æ´"
-#: cmd_ws_commit.cc:471 cmd_ws_commit.cc:475
+#: cmd_ws_commit.cc:465 cmd_ws_commit.cc:469
#, c-format
msgid " added %s"
msgstr " %s ã追å "
-#: cmd_ws_commit.cc:479
+#: cmd_ws_commit.cc:473
#, c-format
msgid " patched %s"
msgstr " %s ã«ãããé©ç¨"
-#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:969 cmd_ws_commit.cc:1102
+#: cmd_ws_commit.cc:477 cmd_ws_commit.cc:945 cmd_ws_commit.cc:1068
msgid "[DIRECTORY]"
msgstr "[DIRECTORY]"
-#: cmd_ws_commit.cc:484
+#: cmd_ws_commit.cc:478
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"
@@ -1518,47 +1518,47 @@ msgstr ""
"åãåºãã¾ãããã£ã¬ã¯ããªãæªæå®ãªããã£ã¬ã¯ããªåã¨ãã¦\n"
"ãã©ã³ãåã使ãã¾ã"
-#: cmd_ws_commit.cc:502 cmd_ws_commit.cc:1036
+#: cmd_ws_commit.cc:496 cmd_ws_commit.cc:1002
#, c-format
msgid "use --revision or --branch to specify what to checkout"
msgstr "--revision ã¾ã㯠--branch ã§ãã§ãã¯ã¢ã¦ãã®å¯¾è±¡ãæå®ãã¦ãã ãã"
-#: cmd_ws_commit.cc:510 cmd_ws_commit.cc:1042
+#: cmd_ws_commit.cc:504 cmd_ws_commit.cc:1008
#, c-format
msgid "branch %s has multiple heads:"
msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãåå¨ãã¦ãã¾ã:"
-#: cmd_ws_commit.cc:513 cmd_ws_commit.cc:1045
+#: cmd_ws_commit.cc:507 cmd_ws_commit.cc:1011
#, c-format
msgid "choose one with '%s checkout -r'"
msgstr "'%s update -r' ã§ä¸ã¤ãé¸æãã¦ä¸ãã"
-#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1046
+#: cmd_ws_commit.cc:508 cmd_ws_commit.cc:1012
#, c-format
msgid "branch %s has multiple heads"
msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãåå¨ãã¦ãã¾ã"
-#: cmd_ws_commit.cc:541 cmd_ws_commit.cc:1029
+#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:995
#, c-format
msgid "revision %s is not a member of branch %s"
msgstr "ãªãã¸ã§ã³ %s ã¯ãã©ã³ã %s ã«ã¯å±ãã¦ãã¾ãã"
-#: cmd_ws_commit.cc:558
+#: cmd_ws_commit.cc:542
#, c-format
msgid "you must specify a destination directory"
msgstr "対象ã®ãã£ã¬ã¯ããªãæå®ããªããã°ããã¾ãã"
-#: cmd_ws_commit.cc:571
+#: cmd_ws_commit.cc:555
#, c-format
msgid "checkout directory '%s' already exists"
msgstr "åãåºããã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: cmd_ws_commit.cc:605
+#: cmd_ws_commit.cc:589
#, c-format
msgid "no file %s found in database for %s"
msgstr "ãã¡ã¤ã« %s (対象 %s)ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¯ã¿ã¤ããã¾ãã"
-#: cmd_ws_commit.cc:623
+#: cmd_ws_commit.cc:607
msgid ""
"set PATH ATTR VALUE\n"
"get PATH [ATTR]\n"
@@ -1568,45 +1568,45 @@ msgstr ""
"get PATH [ATTR]\n"
"drop PATH [ATTR]"
-#: cmd_ws_commit.cc:624
+#: cmd_ws_commit.cc:608
msgid "set, get or drop file attributes"
msgstr "ãã¡ã¤ã«å±æ§ãè¨å®/åå¾/åé¤"
-#: cmd_ws_commit.cc:641
+#: cmd_ws_commit.cc:625
#, c-format
msgid "Unknown path '%s'"
msgstr "ä¸æãªãã¹ '%s'"
-#: cmd_ws_commit.cc:670
+#: cmd_ws_commit.cc:654
#, c-format
msgid "Path '%s' does not have attribute '%s'"
msgstr "ãã¹ '%s' ã«ã¯ '%s' ã¨ããå±æ§ã¯ããã¾ãã"
-#: cmd_ws_commit.cc:700
+#: cmd_ws_commit.cc:684
#, c-format
msgid "No attributes for '%s'"
msgstr "'%s' ã«ã¯å±æ§ã¯ããã¾ãã"
-#: cmd_ws_commit.cc:711
+#: cmd_ws_commit.cc:695
#, c-format
msgid "No attribute '%s' on path '%s'"
msgstr "ãã¹ '%s' ã«ã¤ã㦠'%s' ã¨ããå±æ§ã¯ããã¾ãã"
-#: cmd_ws_commit.cc:724
+#: cmd_ws_commit.cc:708
msgid "commit workspace to database"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ããã¼ã¿ãã¼ã¹ã«ã³ããã"
-#: cmd_ws_commit.cc:755
+#: cmd_ws_commit.cc:739
#, c-format
msgid "no changes to commit"
msgstr "ã³ãããããå¤æ´ãããã¾ãã"
-#: cmd_ws_commit.cc:775
+#: cmd_ws_commit.cc:759
#, c-format
msgid "beginning commit on branch '%s'"
msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ããããéå§ãã¾ã"
-#: cmd_ws_commit.cc:784
+#: cmd_ws_commit.cc:768
#, c-format
msgid ""
"_MTN/log is non-empty and log message was specified on command line\n"
@@ -1617,37 +1617,37 @@ msgstr ""
"_MTN/log ã移å/åé¤ããããã³ãã³ãè¡ãã --message/--message-file ã\n"
"æ¶ãã¦ä¸ããã"
-#: cmd_ws_commit.cc:799
+#: cmd_ws_commit.cc:783
#, c-format
msgid "empty log message; commit canceled"
msgstr "空ã®ãã°ã¡ãã»ã¼ã¸; ã³ãããã¯åãæ¶ããã¾ãã"
-#: cmd_ws_commit.cc:821
+#: cmd_ws_commit.cc:805
#, c-format
msgid "log message rejected by hook: %s"
msgstr "ããã¯ã«ãã£ã¦ãã°ã¡ãã»ã¼ã¸ã¯æå¦ããã¾ãã: %s"
-#: cmd_ws_commit.cc:829
+#: cmd_ws_commit.cc:813
#, c-format
msgid "revision %s already in database"
msgstr "ãªãã¸ã§ã³ %s ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã"
-#: cmd_ws_commit.cc:868 cmd_ws_commit.cc:898
+#: cmd_ws_commit.cc:852 cmd_ws_commit.cc:882
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "ãã¡ã¤ã« '%s' ã¯ã³ãããä¸ã«å¤æ´ããã¾ãããå¦çãä¸æ¢ãã¾ãã"
-#: cmd_ws_commit.cc:880
+#: cmd_ws_commit.cc:864
#, c-format
msgid "Your database is missing version %s of file '%s'"
msgstr "ãã¼ã¿ãã¼ã¹ã«ãã¼ã¸ã§ã³ %s (ãã¡ã¤ã« '%s') ã¯å«ã¾ãã¦ãã¾ãã"
-#: cmd_ws_commit.cc:930
+#: cmd_ws_commit.cc:906
#, c-format
msgid "committed revision %s"
msgstr "ãªãã¸ã§ã³ %s ãã³ããããã¾ãã"
-#: cmd_ws_commit.cc:936
+#: cmd_ws_commit.cc:912
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1656,39 +1656,39 @@ msgstr ""
"注æ: ãã®ãªãã¸ã§ã³ã«ãã£ã¦åå²ãçãã¾ã\n"
"注æ: åå²ãæã¾ãªããªã '%s merge' ãå®è¡ãã¦ä¸ãã"
-#: cmd_ws_commit.cc:970
+#: cmd_ws_commit.cc:946
msgid "setup a new workspace directory, default to current"
msgstr "æ°ããã¯ã¼ã¯ã¹ãã¼ã¹ãã£ã¬ã¯ããªãä½æ (ããã©ã«ã: ç¾å¨ã®å ´æ)"
-#: cmd_ws_commit.cc:976
+#: cmd_ws_commit.cc:952
#, c-format
msgid "need --branch argument for setup"
msgstr "ä½æã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: cmd_ws_commit.cc:992
+#: cmd_ws_commit.cc:968
msgid "DIRECTORY"
msgstr "DIRECTORY"
-#: cmd_ws_commit.cc:993
+#: cmd_ws_commit.cc:969
msgid "import the contents of the given directory tree into a given branch"
msgstr "æå®ã®ãã£ã¬ã¯ããªããªã¼ã®å
容ãæå®ã®ãã©ã³ãã« import"
-#: cmd_ws_commit.cc:1004
+#: cmd_ws_commit.cc:980
#, c-format
msgid "you must specify a directory to import"
msgstr "import ãããã£ã¬ã¯ããªãæå®ããªããã°ããã¾ãã"
-#: cmd_ws_commit.cc:1055
+#: cmd_ws_commit.cc:1021
#, c-format
msgid "import directory '%s' doesn't exists"
msgstr "import ããã¹ã '%s' ã¨ãããã£ã¬ã¯ããªã¯åå¨ãã¾ãã"
-#: cmd_ws_commit.cc:1056
+#: cmd_ws_commit.cc:1022
#, c-format
msgid "import directory '%s' is a file"
msgstr "import ãããã¨ãã¦ãã '%s' ã¯ãã£ã¬ã¯ããªã§ã¯ãªããã¡ã¤ã«ã§ã"
-#: cmd_ws_commit.cc:1103
+#: cmd_ws_commit.cc:1069
msgid ""
"migrate a workspace directory's metadata to the latest format; defaults to "
"the current workspace"
@@ -1696,7 +1696,7 @@ msgstr ""
"ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãã£ã¬ã¯ããªã®ã¡ã¿ãã¼ã¿ãææ°å½¢å¼ã«ç§»è¡ãã¾ãã対象ã®ããã©"
"ã«ãã¯ç¾å¨ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã§ãã"
-#: cmd_ws_commit.cc:1116
+#: cmd_ws_commit.cc:1082
msgid "refresh the inodeprint cache"
msgstr "i-node 表示ãã£ãã·ã¥ãæ´æ°"
@@ -1722,31 +1722,31 @@ msgstr "ã³ãã³ããã«ãã表示"
msgid "display command help"
msgstr "ã³ãã³ããã«ãã表示"
-#: commands.cc:420
+#: commands.cc:418
#, c-format
msgid "expanding selection '%s'"
msgstr "é¸æ '%s' ãå±éãã¾ã"
-#: commands.cc:428
+#: commands.cc:426
#, c-format
msgid "no match for selection '%s'"
msgstr "é¸æ '%s' ã«ä¸è´ãããã®ãããã¾ãã"
-#: commands.cc:434
+#: commands.cc:432
#, c-format
msgid "expanded to '%s'"
msgstr "'%s' ã«å±éãã¾ãã"
-#: commands.cc:451
+#: commands.cc:449
#, c-format
msgid "selection '%s' has multiple ambiguous expansions:"
msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããåè£ã¯è¤æ°ããã¾ã:"
-#: commands.cc:468
+#: commands.cc:466
msgid "note: "
msgstr "ãã¼ã: "
-#: commands.cc:469
+#: commands.cc:467
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
@@ -1755,7 +1755,7 @@ msgstr ""
"ãã©ã³ã '%s' ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãããã¾ã\n"
"â%s merge' ãå®è¡ããæ¹ãããã§ããã"
-#: commands.cc:484
+#: commands.cc:482
#, c-format
msgid "--message and --message-file are mutually exclusive"
msgstr "--message 㨠--message-file ãåæã«æå®ãããã¨ã¯ã§ãã¾ãã"
@@ -1777,7 +1777,7 @@ msgstr "å°"
msgid "markings"
msgstr "å°"
-#: database_check.cc:306 netsync.cc:3063 rcs_import.cc:1244
+#: database_check.cc:306 netsync.cc:3053 rcs_import.cc:1245
msgid "revisions"
msgstr "ãªãã¸ã§ã³"
@@ -1785,7 +1785,7 @@ msgstr "ç¥å
"
msgid "ancestry"
msgstr "ç¥å
"
-#: database_check.cc:434 netsync.cc:3067
+#: database_check.cc:434 netsync.cc:3057
msgid "keys"
msgstr "éµ"
@@ -2056,26 +2056,22 @@ msgstr "ãã¼ã¿ãã¼ã¹ã¯æ£å¸¸ã§ã
msgid "database is good"
msgstr "ãã¼ã¿ãã¼ã¹ã¯æ£å¸¸ã§ã"
-#: database.cc:159
+#: database.cc:151
#, c-format
+msgid "this database already contains rosters"
+msgstr "ãã®ãã¼ã¿ãã¼ã¹ã«ã¯æ¢ã«åç°¿ãå«ã¾ãã¦ãã¾ã"
+
+#: database.cc:177
+#, fuzzy, c-format
msgid ""
-"layout of database %s doesn't match this version of monotone\n"
-"wanted schema %s, got %s\n"
-"try '%s db migrate' to upgrade\n"
-"(this is irreversible; you may want to make a backup copy first)"
+"database %s lacks some cached data\n"
+"run '%s db regenerate_caches' to restore use of this database"
msgstr ""
-"ãã¼ã¿ãã¼ã¹ %s ã®ã¬ã¤ã¢ã¦ãã¯ãã®ãã¼ã¸ã§ã³ã® monotone ãæå¾
ããã¹ãã¼ã %"
-"s ã¨ã¯éãã¾ã (%s ã§ã)\n"
-"'%s db migrate' ã¨ãã¦æ´æ°ãã¦ã¿ã¦ä¸ãã\n"
-"(ããã¯ä¸å¯éã§ãã®ã§ãã¾ãããã¯ã¢ãããã¨ã£ãæ¹ãããã§ããã)"
+"ãã¼ã¿ãã¼ã¹ %s ã«ã¯ããã¤ãã®ãã£ãã·ã¥ãã¼ã¿ãå«ã¾ãã¦ãã¾ããã\n"
+"'%s db regenerate_caches' ãå®è¡ãã¦å¾©æ´»ããã¾ãã"
-#: database.cc:173
+#: database.cc:194
#, c-format
-msgid "this database already contains rosters"
-msgstr "ãã®ãã¼ã¿ãã¼ã¹ã«ã¯æ¢ã«åç°¿ãå«ã¾ãã¦ãã¾ã"
-
-#: database.cc:200
-#, c-format
msgid ""
"database %s contains old-style revisions\n"
"if you are a project leader or doing local testing:\n"
@@ -2093,7 +2089,7 @@ msgstr ""
"ãå¾
ã¡ä¸ããã\n"
"ä¸ä¾¿ã§ãã¿ã¾ããã"
-#: database.cc:210
+#: database.cc:204
#, c-format
msgid ""
"database %s contains manifests but no revisions\n"
@@ -2104,91 +2100,56 @@ msgstr ""
"ãã®ãã¼ã¿ãã¼ã¹ã¯å¤ãããã®ã§ã¢ããã°ã¬ã¼ãããå¿
è¦ãããã¾ã\n"
"詳細ã«ã¤ãã¦ã¯ README.changesets ãåç
§ãã¦ä¸ãã"
-#: database.cc:221
-#, c-format
-msgid ""
-"database %s misses some cached data\n"
-"run '%s db regenerate_caches' to restore use of this database"
-msgstr ""
-"ãã¼ã¿ãã¼ã¹ %s ã«ã¯ããã¤ãã®ãã£ãã·ã¥ãã¼ã¿ãå«ã¾ãã¦ãã¾ããã\n"
-"'%s db regenerate_caches' ãå®è¡ãã¦å¾©æ´»ããã¾ãã"
+#: database.cc:487 sanity.cc:234 schema_migration.cc:58
+msgid "error: "
+msgstr "ã¨ã©ã¼: "
-#: database.cc:259
-#, c-format
-msgid "unable to probe database version in file %s"
-msgstr "ãã¡ã¤ã« %s å
ã®ãã¼ã¿ãã¼ã¹ãã¼ã¸ã§ã³ãæ¤åºã§ãã¾ããã§ãã"
+#: database.cc:488
+msgid "sqlite error: "
+msgstr "sqlite ã¨ã©ã¼: "
-#: database.cc:266
-#, c-format
-msgid "database %s is not an sqlite version 3 file, try dump and reload"
-msgstr ""
-"ãã¼ã¿ãã¼ã¹ %s 㯠SQLite ver. 3 ã®ãã¡ã¤ã«ã§ã¯ããã¾ããããã³ãããå¾å度èª"
-"ã¿è¾¼ãã§ã¿ã¦ä¸ãã"
+#: database.cc:512
+#, fuzzy
+msgid "not set"
+msgstr "ãã¼ã: "
-#: database.cc:293 schema_migration.cc:201
-msgid ""
-"make sure database and containing directory are writeable\n"
-"and you have not run out of disk space"
-msgstr ""
-"ãã¼ã¿ãã¼ã¹ã¨ãããå«ããã£ã¬ã¯ããªãæ¸ãè¾¼ã¿å¯è½ã§ãããã\n"
-"ããã¦ãã£ã¹ã¯å®¹éãä¸è¶³ãã¦ããªãã確èªãã¦ä¸ãã"
+#: database.cc:525
+#, fuzzy
+msgid " (not a monotone database)"
+msgstr "ãã¼ã¿ãã¼ã¹åãè¨å®"
-#: database.cc:297 schema_migration.cc:206
+#: database.cc:573 database.cc:604 database.cc:1046 database.cc:1066
#, c-format
-msgid ""
-"sqlite error: %s\n"
-"%s"
+msgid "%u"
msgstr ""
-"sqlite ã¨ã©ã¼: %s\n"
-"%s"
-#: database.cc:342
-#, c-format
-msgid "could not initialize database: %s: already exists"
-msgstr "ãã¼ã¿ãã¼ã¹ãåæåã§ãã¾ããã§ãã: %s: æ¢ã«åå¨ãã¦ãã¾ã"
-
-#: database.cc:347
-#, c-format
+#: database.cc:623
+#, fuzzy, c-format
msgid ""
-"existing (possibly stale) journal file '%s' has same stem as new database '%"
-"s'\n"
-"cancelling database creation"
-msgstr ""
-"æ¢åã® (ããããå¤ã) ã¸ã£ã¼ãã«ãã¡ã¤ã« '%s' ã¯æ°ãããã¼ã¿ãã¼ã¹ '%s' ã¨å"
-"ãå¹¹ãæã£ã¦ãã¾ã\n"
-"ãã¼ã¿ãã¼ã¹ä½æãä¸æ¢ãã¾ã"
-
-#: database.cc:497
-#, c-format
-msgid "cannot create %s; it already exists"
-msgstr "%s ãä½æã§ãã¾ãã; æ¢ã«åå¨ãã¦ãã¾ã"
-
-#: database.cc:573
-#, c-format
-msgid ""
+"creator code : %s\n"
"schema version : %s\n"
"counts:\n"
-" full rosters : %u\n"
-" roster deltas : %u\n"
-" full files : %u\n"
-" file deltas : %u\n"
-" revisions : %u\n"
-" ancestry edges : %u\n"
-" certs : %u\n"
-" logical files : %u\n"
+" full rosters : %s\n"
+" roster deltas : %s\n"
+" full files : %s\n"
+" file deltas : %s\n"
+" revisions : %s\n"
+" ancestry edges : %s\n"
+" certs : %s\n"
+" logical files : %s\n"
"bytes:\n"
-" full rosters : %u\n"
-" roster deltas : %u\n"
-" full files : %u\n"
-" file deltas : %u\n"
-" revisions : %u\n"
-" cached ancestry : %u\n"
-" certs : %u\n"
-" heights : %u\n"
-" total : %u\n"
+" full rosters : %s\n"
+" roster deltas : %s\n"
+" full files : %s\n"
+" file deltas : %s\n"
+" revisions : %s\n"
+" cached ancestry : %s\n"
+" certs : %s\n"
+" heights : %s\n"
+" total : %s\n"
"database:\n"
-" page size : %u\n"
-" cache size : %u"
+" page size : %s\n"
+" cache size : %s"
msgstr ""
"ã¹ãã¼ããã¼ã¸ã§ã³ : %s\n"
"åæ°:\n"
@@ -2214,55 +2175,66 @@ msgstr ""
" ãã¼ã¸ãµã¤ãº : %u\n"
" ãã£ãã·ã¥ãµã¤ãº : %u"
-#: database.cc:638
+#: database.cc:668
#, c-format
msgid "database schema version: %s"
msgstr "åºæºã¹ãã¼ããã¼ã¸ã§ã³: %s"
-#: database.cc:715
+#: database.cc:756
#, c-format
msgid "multiple statements in query: %s"
msgstr "ã¯ã¨ãªä¸ã«è¤æ°ã®ã¹ãã¼ãã¡ã³ã: %s"
-#: database.cc:721
+#: database.cc:762
#, c-format
msgid "wanted %d columns got %d in query: %s"
msgstr "ã¯ã¨ãªã§ %d åè¦æ±ãã¾ãããå¾ãã®ã¯ %d åã§ã: %s"
-#: database.cc:787
+#: database.cc:828
#, c-format
msgid "null result in query: %s"
msgstr "ã¯ã¨ãªä¸ã«çµæ null ãå«ã¾ãã¦ãã¾ã: %s"
-#: database.cc:805
+#: database.cc:846
#, c-format
msgid "wanted %d rows got %d in query: %s"
msgstr "ã¯ã¨ãªã§ %d è¡è¦æ±ãã¾ãããå¾ãã®ã¯ %d ã§ã: %s"
-#: database.cc:2042
+#: database.cc:2103
#, c-format
msgid "another key with name '%s' already exists"
msgstr "'%s' ã¨ããååã®ä»ã®éµãæ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:3040
+#: database.cc:3121
#, c-format
msgid "no database specified"
msgstr "ãã¼ã¿ãã¼ã¹æªæå®"
-#: database.cc:3048
+#: database.cc:3129
#, c-format
msgid "database %s does not exist"
msgstr "ãã¼ã¿ãã¼ã¹ %s ã¯åå¨ãã¾ãã"
-#: database.cc:3049
+#: database.cc:3130
#, c-format
msgid "%s is a directory, not a database"
msgstr "%s ã¯ãã¼ã¿ãã¼ã¹ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
-#: database.cc:3074
+#: database.cc:3137
+#, fuzzy, c-format
+msgid "database %s already exists"
+msgstr "ãã¹ %s ã¯æ¢ã«ããã¾ã"
+
+#: database.cc:3142
#, c-format
-msgid "could not open database '%s': %s"
-msgstr "ãã¼ã¿ãã¼ã¹ '%s': %s ãéãã¾ããã§ãã"
+msgid ""
+"existing (possibly stale) journal file '%s' has same stem as new database '%"
+"s'\n"
+"cancelling database creation"
+msgstr ""
+"æ¢åã® (ããããå¤ã) ã¸ã£ã¼ãã«ãã¡ã¤ã« '%s' ã¯æ°ãããã¼ã¿ãã¼ã¹ '%s' ã¨å"
+"ãå¹¹ãæã£ã¦ãã¾ã\n"
+"ãã¼ã¿ãã¼ã¹ä½æãä¸æ¢ãã¾ã"
#: diff_patch.cc:614
#, c-format
@@ -2432,7 +2404,7 @@ msgstr "%s ã«ã¤ãã¦ãã¡ã¤ã«ãã
msgid "caught runtime error %s constructing file path for %s"
msgstr "%s ã«ã¤ãã¦ãã¡ã¤ã«ãã¹ä½æä¸ã«å®è¡æã¨ã©ã¼ %s çºç"
-#: file_io.cc:548 work.cc:1103
+#: file_io.cc:540 work.cc:1112
#, c-format
msgid "no such file or directory: '%s'"
msgstr "ãã®ãããªãã¡ã¤ã«ã¾ãã¯ãã£ã¬ã¯ããªã¯ããã¾ãã: '%s'"
@@ -2487,7 +2459,7 @@ msgstr "'%s' ã¨ãããã£ã¬ã¯ããª
msgid "Directory '%s' does not exist"
msgstr "'%s' ã¨ãããã£ã¬ã¯ããªã¯ããã¾ãã"
-#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1358
+#: lua.cc:481 lua.cc:516 rcs_import.cc:1236 work.cc:1367
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
@@ -2527,6 +2499,10 @@ msgstr "'%s %s' ã«ç¹åãããªãã·
msgid "Options specific to '%s %s':"
msgstr "'%s %s' ã«ç¹åãããªãã·ã§ã³:"
+#: monotone.cc:307
+msgid "error: memory exhausted"
+msgstr ""
+
#: mt_version.cc:36
#, c-format
msgid "%s (base revision: %s)"
@@ -2657,12 +2633,12 @@ msgstr "åãåã %s ã¢ã¤ãã ã«ã
msgid "underflow on count of %s items to receive"
msgstr "åãåã %s ã¢ã¤ãã ã«ã¤ãã¦åæ°ãã¢ã³ãã¼ããã¼"
-#: netsync.cc:1261 netsync.cc:1269
+#: netsync.cc:1260 netsync.cc:1268
#, c-format
msgid "received network error: %s"
msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼ãåä¿¡: %s"
-#: netsync.cc:1304
+#: netsync.cc:1296
#, c-format
msgid ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -2683,12 +2659,12 @@ msgstr ""
"æå¾
å¤ %s\n"
"'%s unset %s %s' ã¨ããã¨æ¤è¨¼çµæãç¡è¦ããããã«ãªãã¾ã"
-#: netsync.cc:1314
+#: netsync.cc:1306
#, c-format
msgid "server key changed"
msgstr "ãµã¼ãã¼éµãå¤æ´ããã¾ãã"
-#: netsync.cc:1319
+#: netsync.cc:1311
#, c-format
msgid ""
"first time connecting to server %s\n"
@@ -2698,47 +2674,47 @@ msgstr ""
"ãµã¼ãã¼ %s ã«æ¥ç¶ããã®ã¯åãã¦ã§ã\n"
"å½ç©ã§ãªãã¨ã¯æãã¾ãããéµã®æç´ãäºéã«ãã§ãã¯ãã¦ã¿ãã¨ããã§ããã: %s"
-#: netsync.cc:1326
+#: netsync.cc:1318
#, c-format
msgid "saving public key for %s to database"
msgstr "%s ã®å
¬ééµããã¼ã¿ãã¼ã¹ã«ä¿åãã¦ãã¾ã"
-#: netsync.cc:1429
+#: netsync.cc:1420
#, c-format
msgid "rejected attempt at anonymous connection for write"
msgstr "å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦ãã¾ãã"
-#: netsync.cc:1436
+#: netsync.cc:1427
#, c-format
msgid "rejected attempt at anonymous connection while running as sink"
msgstr "ã·ã³ã¯ã¨ãã¦å®è¡ä¸ã®å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦ãã¾ãã"
-#: netsync.cc:1452
+#: netsync.cc:1442
#, c-format
msgid "anonymous access to branch '%s' denied by server"
msgstr "ãã©ã³ã '%s' ã¸ã®å¿åã¢ã¯ã»ã¹ã¯ãµã¼ãã¼ã«ãã£ã¦æå¦ããã¾ãã"
-#: netsync.cc:1460
+#: netsync.cc:1450
#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'"
msgstr "å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã"
-#: netsync.cc:1466
+#: netsync.cc:1456
#, c-format
msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
msgstr "å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã"
-#: netsync.cc:1531
+#: netsync.cc:1519
#, c-format
msgid "remote public key hash '%s' is unknown"
msgstr "ãªã¢ã¼ãã®å
¬ééµããã·ã¥ '%s' ã¯ä¸æãªãã®ã§ã"
-#: netsync.cc:1549
+#: netsync.cc:1537
#, c-format
msgid "detected replay attack in auth netcmd"
msgstr "auth netcmd ä¸ã«ç¹°ãè¿ãæ»æãæ¤åºãã¾ãã"
-#: netsync.cc:1571
+#: netsync.cc:1559
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -2747,19 +2723,19 @@ msgstr ""
"ç´ç²ãªã·ã³ã¯ã¨ãã¦å®è¡ä¸ã® '%s' ã® '%s' ('%s' ãé¤ã) ã®èªã¿è¾¼ã¿ãæå¦ãã¾ã"
"ã"
-#: netsync.cc:1584
+#: netsync.cc:1574
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
msgstr ""
"'%s' ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ããã©ã³ã '%s' ã®ããã«æå¦ãã¾ãã"
-#: netsync.cc:1594
+#: netsync.cc:1584
#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'"
msgstr "'%s' ã®å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã"
-#: netsync.cc:1605
+#: netsync.cc:1595
#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
@@ -2768,142 +2744,142 @@ msgstr ""
"ç´ç²ã½ã¼ã¹ã¨ãã¦å®è¡ä¸ã® '%s' ã® '%s' ('%s' ãé¤ã) ã¸ã®æ¸ãè¾¼ã¿ãæå¦ãã¾ã"
"ã"
-#: netsync.cc:1613
+#: netsync.cc:1603
#, c-format
msgid "denied '%s' write permission for '%s' excluding '%s'"
msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ãæå¦ãã¾ãã"
-#: netsync.cc:1617
+#: netsync.cc:1607
#, c-format
msgid "allowed '%s' write permission for '%s' excluding '%s'"
msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ã許å¯ãã¾ãã"
-#: netsync.cc:1641
+#: netsync.cc:1631
#, c-format
msgid "bad client signature"
msgstr "ä¸æ£ãªã¯ã©ã¤ã¢ã³ãç½²å"
-#: netsync.cc:1657
+#: netsync.cc:1647
#, c-format
msgid "Unexpected 'refine' command on non-refined item type"
msgstr "refine ããã¦ããªãã¢ã¤ãã åã«ã¤ãã¦äºæããªã 'refine' ã³ãã³ã"
-#: netsync.cc:1754
+#: netsync.cc:1744
#, c-format
msgid "unknown bye phase %d received"
msgstr "ä¸æ㪠bye ãã§ã¼ãº %d ãåä¿¡ãã¾ãã"
-#: netsync.cc:1769
+#: netsync.cc:1759
#, c-format
msgid "Unexpected 'done' command on non-refined item type"
msgstr "refine ããã¦ããªãã¢ã¤ãã åã«ã¤ãã¦äºæããªã 'done' ã³ãã³ã"
-#: netsync.cc:1841
+#: netsync.cc:1831
#, c-format
msgid "%s with hash '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ %s (ããã·ã¥ '%s') ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:1945
+#: netsync.cc:1935
#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
msgstr ""
"ãã©ã³ã %s ã«ã¤ã㦠epoch ãä¸è´ãã¾ããããµã¼ãã¼å´ '%s', ã¯ã©ã¤ã¢ã³ãå´ '%"
"s'"
-#: netsync.cc:1963
+#: netsync.cc:1953
#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
msgstr "å
¬ééµ '%s' (%s) ã«ã¤ãã¦ããã·ã¥æ¤è¨¼ã«å¤±æãæå¾
å¤ '%s'ãè¨ç®å¤ '%s'"
-#: netsync.cc:1977
+#: netsync.cc:1967
#, c-format
msgid "hash check failed for revision cert '%s'"
msgstr "ãªãã¸ã§ã³è¨¼æ '%s' ã«ã¤ãã¦ããã·ã¥æ¤è¨¼ã«å¤±æ"
-#: netsync.cc:2039
+#: netsync.cc:2029
#, c-format
msgid "Received warning from usher: %s"
msgstr "éçªããè¦åãåä¿¡: %s"
-#: netsync.cc:2126 netsync.cc:2157
+#: netsync.cc:2116 netsync.cc:2147
msgid "source and sink"
msgstr "ã½ã¼ã¹ã¨ã·ã³ã¯"
-#: netsync.cc:2127 netsync.cc:2158
+#: netsync.cc:2117 netsync.cc:2148
msgid "source"
msgstr "ã½ã¼ã¹"
-#: netsync.cc:2127 netsync.cc:2158
+#: netsync.cc:2117 netsync.cc:2148
msgid "sink"
msgstr "ã·ã³ã¯"
-#: netsync.cc:2314
+#: netsync.cc:2304
#, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch"
msgstr "netcmd dispatch ã®å¾ã§ãã¼ã¢ %s ã®å
¥åãããã¡ãããµãã¾ãã"
-#: netsync.cc:2326 netsync.cc:2425
+#: netsync.cc:2316 netsync.cc:2415
#, c-format
msgid "protocol error while processing peer %s: '%s'"
msgstr "ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºç"
-#: netsync.cc:2332
+#: netsync.cc:2322
#, c-format
msgid "error: %s"
msgstr "ã¨ã©ã¼: %s"
-#: netsync.cc:2396
+#: netsync.cc:2386
#, c-format
msgid "connecting to %s"
msgstr "%s ã«æ¥ç¶ãã¦ãã¾ã"
-#: netsync.cc:2440
+#: netsync.cc:2430
#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting"
msgstr "ãã¼ã¢ %s ã® I/O ãå¾
ã£ã¦ããéã«ã¿ã¤ã ã¢ã¦ã, åæãã¦ãã¾ã"
-#: netsync.cc:2463
+#: netsync.cc:2453
#, c-format
msgid "processing failure while talking to peer %s, disconnecting"
msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã«å¦çã失æããåæãã¦ãã¾ã"
-#: netsync.cc:2480
+#: netsync.cc:2470
#, c-format
msgid "successful exchange with %s"
msgstr "%s ã¨ã®äº¤æã«æå"
-#: netsync.cc:2486
+#: netsync.cc:2476
#, c-format
msgid "peer %s disconnected after we informed them of error"
msgstr "ãã¼ã¢ %s ã«ã¨ã©ã¼ãå ±åå¾ã«åæããã¾ãã"
-#: netsync.cc:2491
+#: netsync.cc:2481
#, c-format
msgid "I/O failure while talking to peer %s, disconnecting"
msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã« I/O ã®å¤±æãåæãã¦ãã¾ã"
-#: netsync.cc:2557
+#: netsync.cc:2547
#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad"
msgstr ""
"ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçã誤ãã¨ãã¦å°ä»ããã¦ãã¾ã"
-#: netsync.cc:2589
+#: netsync.cc:2579
#, c-format
msgid "accepted new client connection from %s : %s"
msgstr "%s : %s ããã®æ°ããã¯ã©ã¤ã¢ã³ãæ¥ç¶ãåçãã¾ãã"
-#: netsync.cc:2626
+#: netsync.cc:2616
#, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting"
msgstr "ãã¼ã¢ %s: '%s' ãããå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçãåæãã¦ãã¾ã"
-#: netsync.cc:2637
+#: netsync.cc:2627
#, c-format
msgid "peer %s read failed in working state (error)"
msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æãã¾ãã (ã¨ã©ã¼)"
-#: netsync.cc:2642
+#: netsync.cc:2632
#, c-format
msgid ""
"peer %s read failed in shutdown state (possibly client misreported error)"
@@ -2911,17 +2887,17 @@ msgstr ""
"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æãã¾ãã (ããããã¯"
"ã©ã¤ã¢ã³ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)"
-#: netsync.cc:2648
+#: netsync.cc:2638
#, c-format
msgid "peer %s read failed in confirmed state (success)"
msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ç¢ºèªã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æãã¾ãã (æå)"
-#: netsync.cc:2669
+#: netsync.cc:2659
#, c-format
msgid "peer %s write failed in working state (error)"
msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æãã¾ãã (ã¨ã©ã¼)"
-#: netsync.cc:2674
+#: netsync.cc:2664
#, c-format
msgid ""
"peer %s write failed in shutdown state (possibly client misreported error)"
@@ -2929,70 +2905,70 @@ msgstr ""
"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æãã¾ãã (ããããã¯"
"ã©ã¤ã¢ã³ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)"
-#: netsync.cc:2680
+#: netsync.cc:2670
#, c-format
msgid "peer %s write failed in confirmed state (success)"
msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ç¢ºèªã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æãã¾ãã (æå)"
-#: netsync.cc:2707
+#: netsync.cc:2697
#, c-format
msgid "peer %s processing finished, disconnecting"
msgstr "ãã¼ã¢ %s å¦ççµäºãåæãã¦ãã¾ã"
-#: netsync.cc:2729
+#: netsync.cc:2719
#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting"
msgstr "fd %d (ãã¼ã¢ %s) ã¯ã¢ã¤ãã«æéãé·ããã¾ããåæãã¦ãã¾ã"
-#: netsync.cc:2797
+#: netsync.cc:2787
#, c-format
msgid "beginning service on %s : %s"
msgstr "%s : %s ã§ãµã¼ãã¹ãéå§ãã¦ãã¾ã"
-#: netsync.cc:2798
+#: netsync.cc:2788
msgid ""
msgstr "<ãã¹ã¦ã®ã¤ã³ã¿ã¼ãã§ã¼ã¹>"
-#: netsync.cc:2812
+#: netsync.cc:2802
#, c-format
msgid "session limit %d reached, some connections will be refused"
msgstr "ã»ãã·ã§ã³å¶é %d ã«éãã¾ãããããã¤ãã®æ¥ç¶ã¯æå¦ããã¾ã"
-#: netsync.cc:2879
+#: netsync.cc:2869
#, c-format
msgid "Network error on peer %s, disconnecting"
msgstr "ãã¼ã¢ %s ã§ãããã¯ã¼ã¯ã¨ã©ã¼ãåæãã¦ãã¾ã"
-#: netsync.cc:2885
+#: netsync.cc:2875
#, c-format
msgid "got OOB from peer %s, disconnecting"
msgstr "ãã¼ã¢ %s ãã OOB ãã¼ã¿ãåä¿¡ãåæãã¦ãã¾ã"
-#: netsync.cc:2945
+#: netsync.cc:2935
#, c-format
msgid "beginning service on %s"
msgstr "%s ã§ãµã¼ãã¹ãéå§ãã¦ãã¾ã"
-#: netsync.cc:3008
+#: netsync.cc:2998
#, c-format
msgid "got some OOB data on fd %d (peer %s), disconnecting"
msgstr "fd %d (ãã¼ã¢ %s) 㧠OOB ãã¼ã¿ãåä¿¡ãåæãã¦ãã¾ã"
-#: netsync.cc:3057
+#: netsync.cc:3047
#, c-format
msgid "finding items to synchronize:"
msgstr "åæã¢ã¤ãã ãæ¤ç´¢ãã¦ãã¾ã:"
-#: netsync.cc:3065
+#: netsync.cc:3055
msgid "certificates"
msgstr "証ææ¸"
-#: netsync.cc:3178
+#: netsync.cc:3164
#, c-format
msgid "Cannot find key '%s'"
msgstr "éµ '%s' ãã¿ã¤ãããã¨ãã§ãã¾ãã"
-#: netsync.cc:3218
+#: netsync.cc:3204
#, c-format
msgid ""
"include branch pattern contains a quote character:\n"
@@ -3001,7 +2977,7 @@ msgstr ""
"å¼ç¨ç¬¦ãå«ããã©ã³ããã¿ã¼ã³ãå«ãã:\n"
"%s"
-#: netsync.cc:3224
+#: netsync.cc:3210
#, c-format
msgid ""
"exclude branch pattern contains a quote character:\n"
@@ -3010,7 +2986,7 @@ msgstr ""
"å¼ç¨ç¬¦ãå«ããã©ã³ããã¿ã¼ã³ãé¤å¤:\n"
"%s"
-#: netsync.cc:3259 netsync.cc:3263
+#: netsync.cc:3245 netsync.cc:3249
#, c-format
msgid "network error: %s"
msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼: %s"
@@ -3326,22 +3302,22 @@ msgstr "解æ失æ %d:%d: æå¾
ãã
msgid "parse failure %d:%d: expecting word"
msgstr "解æ失æ %d:%d: æå¾
ãããèªå¥"
-#: rcs_import.cc:721
+#: rcs_import.cc:722
#, c-format
msgid "parsing RCS file %s"
msgstr "RCS ãã¡ã¤ã« %s ã解æãã¦ãã¾ã"
-#: rcs_import.cc:724
+#: rcs_import.cc:725
#, c-format
msgid "parsed RCS file %s OK"
msgstr "解æãã RCS ãã¡ã¤ã« %s: OK"
-#: rcs_import.cc:913
+#: rcs_import.cc:914
#, c-format
msgid "error reading RCS file %s: %s"
msgstr "RCS ãã¡ã¤ã« %s ãèªã¿è¾¼ã¿ä¸ã«ã¨ã©ã¼: %s"
-#: rcs_import.cc:1210
+#: rcs_import.cc:1211
#, c-format
msgid ""
"%s appears to be a CVS repository root directory\n"
@@ -3350,17 +3326,17 @@ msgstr ""
"%s 㯠CVS ãªãã¸ããªã®ã«ã¼ããã£ã¬ã¯ããªã®ããã§ãã\n"
"代ãã« 'cvs_import %s/<ã¢ã¸ã¥ã¼ã«å>' ã§åãè¾¼ãã§ã¿ã¦ä¸ãã"
-#: rcs_import.cc:1222
+#: rcs_import.cc:1223
#, c-format
msgid "need base --branch argument for importing"
msgstr "åãè¾¼ã¿ã«ã¯åºæº --branch å¼æ°ãå¿
è¦ã§ã"
-#: rcs_import.cc:1234
+#: rcs_import.cc:1235
#, c-format
msgid "path %s does not exist"
msgstr "ãã¹ %s ã¯åå¨ãã¾ãã"
-#: rcs_import.cc:1269
+#: rcs_import.cc:1270
msgid "tags"
msgstr "ã¿ã°"
@@ -3489,10 +3465,6 @@ msgstr "誤ã: "
msgid "misuse: "
msgstr "誤ã: "
-#: sanity.cc:234
-msgid "error: "
-msgstr "ã¨ã©ã¼: "
-
#: sanity.cc:242
#, c-format
msgid "%s:%d: invariant '%s' violated"
@@ -3508,54 +3480,155 @@ msgstr "ç¾å¨ã®ä½æ¥ã»ãã: %i ã¢
msgid "Current work set: %i items"
msgstr "ç¾å¨ã®ä½æ¥ã»ãã: %i ã¢ã¤ãã "
-#: schema_migration.cc:258
+#: selectors.cc:43
+#, fuzzy, c-format
+msgid "expanded selector '%s' -> '%s'"
+msgstr "é¸æ '%s' ãå±éãã¾ã"
+
+#: selectors.cc:80
+#, fuzzy, c-format
+msgid "unknown selector type: %c"
+msgstr "ä¸æãªãã±ããå: '%s'"
+
+#: selectors.cc:89
+#, fuzzy, c-format
+msgid "selector '%s' is not a valid date\n"
+msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
+
+#: selectors.cc:95
#, c-format
-msgid "calculating necessary migration steps"
-msgstr "å¿
è¦ãªçµ±åã¹ããããè¦ç©ã£ã¦ãã¾ã"
+msgid "selector '%s' is not a valid date (%s)"
+msgstr ""
-#: schema_migration.cc:270
+#: selectors.cc:98
+#, fuzzy, c-format
+msgid "expanded date '%s' -> '%s'\n"
+msgstr "é¨å ID '%s' ã '%s' ã«å±éãã¾ãã"
+
+#: schema_migration.cc:78
+msgid ""
+"make sure database and containing directory are writeable\n"
+"and you have not run out of disk space"
+msgstr ""
+"ãã¼ã¿ãã¼ã¹ã¨ãããå«ããã£ã¬ã¯ããªãæ¸ãè¾¼ã¿å¯è½ã§ãããã\n"
+"ããã¦ãã£ã¹ã¯å®¹éãä¸è¶³ãã¦ããªãã確èªãã¦ä¸ãã"
+
+#: schema_migration.cc:88
+msgid ""
+"(if this is a database last used by monotone 0.16 or older,\n"
+"you must follow a special procedure to make it usable again.\n"
+"see the file UPGRADE, in the distribution, for instructions.)"
+msgstr ""
+
+#: schema_migration.cc:97
#, c-format
-msgid "error at transaction BEGIN statement"
-msgstr "ãã©ã³ã¶ã¯ã·ã§ã³ BEGIN æã§ã¨ã©ã¼"
+msgid ""
+"sqlite error: %s\n"
+"%s"
+msgstr ""
+"sqlite ã¨ã©ã¼: %s\n"
+"%s"
-#: schema_migration.cc:271
+#: schema_migration.cc:511
#, c-format
-msgid "migrating data"
-msgstr "ãã¼ã¿ãçµ±åãã¦ãã¾ã"
+msgid "public and private keys for %s don't match"
+msgstr "%s ã®å
¬ééµã¨ç§å¯éµãä¸è´ãã¾ãã"
-#: schema_migration.cc:297
+#: schema_migration.cc:513
#, c-format
-msgid "migration step failed: %s"
-msgstr "çµ±åã¹ããã失æ: %s"
+msgid "moving key '%s' from database to %s"
+msgstr "éµ '%s' ããã¼ã¿ãã¼ã¹ãã %s ã«ç§»åãã¦ãã¾ã"
-#: schema_migration.cc:311
+#: schema_migration.cc:889
#, c-format
-msgid "mismatched result of migration, got %s, wanted %s"
-msgstr "çµ±åã®çµæã®ä¸ä¸è´: çµæ %s, æå¾
%s"
+msgid "%s (usable)"
+msgstr ""
-#: schema_migration.cc:314
+#: schema_migration.cc:891
#, c-format
-msgid "committing changes to database"
-msgstr "å¤æ´ããã¼ã¿ãã¼ã¹ã«ã³ããããã¦ãã¾ã"
+msgid "%s (migration needed)"
+msgstr ""
-#: schema_migration.cc:316
+#: schema_migration.cc:893
#, c-format
-msgid "failure on COMMIT"
-msgstr "COMMIT 失æ"
+msgid "%s (too new, cannot use)"
+msgstr ""
-#: schema_migration.cc:318
+#: schema_migration.cc:895
+#, fuzzy, c-format
+msgid "%s (not a monotone database)"
+msgstr "ãã¼ã¿ãã¼ã¹åãè¨å®"
+
+#: schema_migration.cc:897
#, c-format
-msgid "optimizing database"
-msgstr "ãã¼ã¿ãã¼ã¹ãæé©åãã¦ãã¾ã"
+msgid "%s (database has no tables!)"
+msgstr ""
-#: schema_migration.cc:320
+#: schema_migration.cc:910
#, c-format
-msgid "error vacuuming after migration"
-msgstr "çµ±åå¾ã®ããã¥ã¼ã å¦çä¸ã«ã¨ã©ã¼"
+msgid ""
+"cannot use the empty sqlite database %s\n"
+"(monotone databases must be created with '%s db init')"
+msgstr ""
-#: schema_migration.cc:329
+#: schema_migration.cc:915
+#, fuzzy, c-format
+msgid "%s does not appear to be a monotone database\n"
+msgstr "éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã®éµ '%s' ã¨ä¸è´ãã¾ãã"
+
+#: schema_migration.cc:919
#, c-format
msgid ""
+"%s appears to be a monotone database, but this version of\n"
+"monotone does not recognize its schema.\n"
+"you probably need a newer version of monotone."
+msgstr ""
+
+#: schema_migration.cc:938
+#, fuzzy, c-format
+msgid ""
+"database %s is laid out according to an old schema\n"
+"try '%s db migrate' to upgrade\n"
+"(this is irreversible; you may want to make a backup copy first)"
+msgstr ""
+"ãã¼ã¿ãã¼ã¹ %s ã®ã¬ã¤ã¢ã¦ãã¯ãã®ãã¼ã¸ã§ã³ã® monotone ãæå¾
ããã¹ãã¼ã %"
+"s ã¨ã¯éãã¾ã (%s ã§ã)\n"
+"'%s db migrate' ã¨ãã¦æ´æ°ãã¦ã¿ã¦ä¸ãã\n"
+"(ããã¯ä¸å¯éã§ãã®ã§ãã¾ãããã¯ã¢ãããã¨ã£ãæ¹ãããã§ããã)"
+
+#: schema_migration.cc:960
+#, fuzzy, c-format
+msgid "calculating migration..."
+msgstr "å¿
è¦ãªçµ±åã¹ããããè¦ç©ã£ã¦ãã¾ã"
+
+#: schema_migration.cc:973
+#, fuzzy, c-format
+msgid "no migration performed; database schema already up-to-date"
+msgstr "çµ±åãã¾ããããã¼ã¿ãã¼ã¹ã¹ãã¼ãã¯æ¢ã«ææ°ã«ãªã£ã¦ãã¾ã: %s"
+
+#: schema_migration.cc:980
+#, fuzzy, c-format
+msgid "migrating data..."
+msgstr "ãã¼ã¿ãçµ±åãã¦ãã¾ã"
+
+#: schema_migration.cc:1002
+#, fuzzy, c-format
+msgid "migrated to schema %s"
+msgstr "çµ±åã¹ããã失æ: %s"
+
+#: schema_migration.cc:1005
+#, c-format
+msgid "committing changes to database"
+msgstr "å¤æ´ããã¼ã¿ãã¼ã¹ã«ã³ããããã¦ãã¾ã"
+
+#: schema_migration.cc:1009
+#, c-format
+msgid "optimizing database"
+msgstr "ãã¼ã¿ãã¼ã¹ãæé©åãã¦ãã¾ã"
+
+#: schema_migration.cc:1019
+#, 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'"
@@ -3564,7 +3637,7 @@ msgstr ""
"æå¾ã«ä½¿ç¨ããããããæä½ãå®äºãã¦ãã¾ãããããªããããã¸ã§ã¯ã\n"
"ãªã¼ãã¼ãªãããã¡ã¤ã« UPGRADE ã® '%s db %s' ã®å®è¡ã®èª¬æãè¦ã¦ä¸ããã"
-#: schema_migration.cc:336
+#: schema_migration.cc:1026
#, c-format
msgid ""
"NOTE: this upgrade cleared monotone's caches\n"
@@ -3573,26 +3646,21 @@ msgstr ""
"注æ: ãã®æ´æ°ã«ãã£ã¦ monotone ã®ãã£ãã·ã¥ã¯ã¯ãªã¢\n"
"ããã¾ããã'%s db regenerate_caches' ãå®è¡ãã¦ä¸ãã"
-#: schema_migration.cc:349
+#: schema_migration.cc:1057
#, c-format
-msgid "database schema %s is unknown; cannot perform migration"
-msgstr "ä¸æãªãã¼ã¿ãã¼ã¹ã¹ãã¼ã %s; çµ±åã§ãã¾ãã"
+msgid "cannot test migration from unknown schema %s"
+msgstr ""
-#: schema_migration.cc:354
+#: schema_migration.cc:1060
#, c-format
-msgid "no migration performed; database schema already up-to-date at %s"
-msgstr "çµ±åãã¾ããããã¼ã¿ãã¼ã¹ã¹ãã¼ãã¯æ¢ã«ææ°ã«ãªã£ã¦ãã¾ã: %s"
+msgid "schema %s is up to date"
+msgstr ""
-#: schema_migration.cc:913
-#, c-format
-msgid "public and private keys for %s don't match"
-msgstr "%s ã®å
¬ééµã¨ç§å¯éµãä¸è´ãã¾ãã"
+#: schema_migration.cc:1071
+#, fuzzy, c-format
+msgid "successful migration to schema %s"
+msgstr "%s ã¨ã®äº¤æã«æå"
-#: schema_migration.cc:916
-#, c-format
-msgid "moving key '%s' from database to %s"
-msgstr "éµ '%s' ããã¼ã¿ãã¼ã¹ãã %s ã«ç§»åãã¦ãã¾ã"
-
#: std_hooks.lua:39
msgid "Press enter"
msgstr "[Enter] ãæ¼ãã¦ä¸ãã"
@@ -3601,6 +3669,16 @@ msgstr "ãµãããã»ã¹ãå®äºãã
msgid "Press enter when the subprocess has completed"
msgstr "ãµãããã»ã¹ãå®äºããã [Enter] ãæ¼ãã¦ä¸ãã"
+#: transforms.cc:91
+#, c-format
+msgid ""
+"%s\n"
+"this may be due to a memory glitch, data corruption during\n"
+"a network transfer, corruption of your database or workspace,\n"
+"or a bug in monotone. if the error persists, please contact\n"
+"%s for assistance.\n"
+msgstr ""
+
#: ui.cc:158
#, c-format
msgid "%.1f G"
@@ -3653,12 +3731,12 @@ msgstr "URL æ§æãä¸æ£ã§ããscp
msgid "The URI syntax is invalid. Maybe you used an URI in scp-style?"
msgstr "URL æ§æãä¸æ£ã§ããscp å½¢å¼ã® URI ã使ã£ã¦ãã¾ããã?"
-#: update.cc:72
+#: update.cc:71
#, c-format
msgid "failed to decode boolean testresult cert value '%s'"
msgstr "çå½å¤ã®ãã¹ãçµæã®è¨¼æå¤ '%s' ã®ãã³ã¼ãã«å¤±æãã¾ãã"
-#: update.cc:166
+#: update.cc:160
#, c-format
msgid "cannot determine branch for update"
msgstr "æ´æ°ãããã©ã³ãã決å®ã§ãã¾ãã"
@@ -3796,27 +3874,27 @@ msgstr "%s ãå¤æ´ãã¦ãã¾ã"
msgid "modifying %s"
msgstr "%s ãå¤æ´ãã¦ãã¾ã"
-#: work.cc:975
+#: work.cc:984
#, c-format
msgid "missing directory '%s'"
msgstr "ã¿ã¤ãããªããã£ã¬ã¯ã㪠'%s'"
-#: work.cc:980
+#: work.cc:989
#, c-format
msgid "not a directory '%s'"
msgstr "'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-#: work.cc:993
+#: work.cc:1002
#, c-format
msgid "missing file '%s'"
msgstr "ã¿ã¤ãããªããã¡ã¤ã« '%s'"
-#: work.cc:998
+#: work.cc:1007
#, c-format
msgid "not a file '%s'"
msgstr "'%s' ã¯ãã¡ã¤ã«ã§ã¯ããã¾ãã"
-#: work.cc:1009
+#: work.cc:1018
#, c-format
msgid ""
"%d missing items; use '%s ls missing' to view\n"
@@ -3834,96 +3912,96 @@ msgstr ""
"ä¸åº¦ã«ãã¹ã¦å¦çããã«ã¯ãåç´ã« '%s drop --missing' ã¾ãã¯\n"
"'%s revert --missing' ã¨ãã¾ãã"
-#: work.cc:1155
+#: work.cc:1164
#, c-format
msgid "skipping %s, not currently tracked"
msgstr "追跡ããã¦ããªã %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:1165
+#: work.cc:1174
#, c-format
msgid "cannot remove %s/, it is not empty"
msgstr "空ã§ã¯ãªãã®ã§ %s/ ãåé¤ã§ãã¾ãã"
-#: work.cc:1176
+#: work.cc:1185
#, c-format
msgid "dropping %s from workspace manifest"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ããã %s ãç ´æ£ãã¦ãã¾ã"
-#: work.cc:1229
+#: work.cc:1238
#, c-format
msgid "destination dir %s/ is not versioned (perhaps add it?)"
msgstr ""
"å
æ¹ã®ãã£ã¬ã¯ã㪠%s/ ã¯ãã¼ã¸ã§ã³ä»ãããã¦ãã¾ããã(追å ãã¾ããã?)"
-#: work.cc:1232
+#: work.cc:1241
#, c-format
msgid "destination %s is an existing file in current revision"
msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã« %s ã¯ããã¾ãã"
-#: work.cc:1242
+#: work.cc:1251
#, c-format
msgid "empty path %s is not allowed"
msgstr "ãã¹ %s ã¯ç©ºã«ã§ãã¾ãã"
-#: work.cc:1256
+#: work.cc:1265
#, c-format
msgid "%s does not exist in current manifest"
msgstr "ç¾å¨ã®ãããã§ã¹ãã« %s ã¯ããã¾ãã"
-#: work.cc:1259
+#: work.cc:1268
#, c-format
msgid "destination %s already exists in current manifest"
msgstr "è¡ãå
%s ã¯æ¢ã«ç¾å¨ã®ãããã§ã¹ãã«å«ã¾ãã¦ãã¾ã"
-#: work.cc:1265
+#: work.cc:1274
#, c-format
msgid "destination directory %s does not exist in current manifest"
msgstr "è¡ãå
ã® %s ã¨ãããã£ã¬ã¯ããªã¯ç¾å¨ã®ãããã§ã¹ãã«ã¯å«ã¾ãã¦ãã¾ãã"
-#: work.cc:1267
+#: work.cc:1276
#, c-format
msgid "destination directory %s is not a directory"
msgstr "è¡ãå
ã® %s ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-#: work.cc:1276
+#: work.cc:1285
#, c-format
msgid "renaming %s to %s in workspace manifest"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãå
ã® %s ã %s ã«å¤æ´ãã¦ãã¾ã"
-#: work.cc:1304
+#: work.cc:1313
#, c-format
msgid "%s doesn't exist in workspace, skipping"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã« %s ã¯ããã¾ããã®ã§ãã¹ããããã¾ã"
-#: work.cc:1308
+#: work.cc:1317
#, c-format
msgid "destination %s already exists in workspace, skipping"
msgstr "ãªãã¸ã§ã³ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ãã®ã§ãã¹ããããã¾ã"
-#: work.cc:1338
+#: work.cc:1347
#, c-format
msgid "proposed new root directory '%s' is not versioned or does not exist"
msgstr ""
"ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã¼ã¸ã§ã³ä»ãããã¦ããªãããåå¨"
"ãã¾ãã"
-#: work.cc:1340
+#: work.cc:1349
#, c-format
msgid "proposed new root directory '%s' is not a directory"
msgstr "ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-#: work.cc:1345
+#: work.cc:1354
#, c-format
msgid "proposed new root directory '%s' contains illegal path %s"
msgstr ""
"ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã«ã¯ä¸æ£ãªãã¹ %s ãå«ã¾ãã¦ãã¾ã"
-#: work.cc:1355
+#: work.cc:1364
#, c-format
msgid "directory '%s' is not versioned or does not exist"
msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯ãã¼ã¸ã§ã³ä»ãããã¦ããªãããåå¨ãã¾ãã"
-#: work.cc:1361
+#: work.cc:1370
#, c-format
msgid "'%s' is in the way"
msgstr "'%s' ãéªéã«ãªã£ã¦ãã¾ã"
@@ -4007,6 +4085,38 @@ msgstr "ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã¯ç
msgid "this workspace is in the current format, no migration is necessary."
msgstr "ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã¯ç¾å¨ã®å½¢å¼ã§ãã移è¡ã¯å¿
è¦ããã¾ããã"
+#~ msgid "unable to probe database version in file %s"
+#~ msgstr "ãã¡ã¤ã« %s å
ã®ãã¼ã¿ãã¼ã¹ãã¼ã¸ã§ã³ãæ¤åºã§ãã¾ããã§ãã"
+
+#~ msgid "database %s is not an sqlite version 3 file, try dump and reload"
+#~ msgstr ""
+#~ "ãã¼ã¿ãã¼ã¹ %s 㯠SQLite ver. 3 ã®ãã¡ã¤ã«ã§ã¯ããã¾ããããã³ãããå¾å"
+#~ "度èªã¿è¾¼ãã§ã¿ã¦ä¸ãã"
+
+#~ msgid "could not initialize database: %s: already exists"
+#~ msgstr "ãã¼ã¿ãã¼ã¹ãåæåã§ãã¾ããã§ãã: %s: æ¢ã«åå¨ãã¦ãã¾ã"
+
+#~ msgid "cannot create %s; it already exists"
+#~ msgstr "%s ãä½æã§ãã¾ãã; æ¢ã«åå¨ãã¦ãã¾ã"
+
+#~ msgid "could not open database '%s': %s"
+#~ msgstr "ãã¼ã¿ãã¼ã¹ '%s': %s ãéãã¾ããã§ãã"
+
+#~ msgid "error at transaction BEGIN statement"
+#~ msgstr "ãã©ã³ã¶ã¯ã·ã§ã³ BEGIN æã§ã¨ã©ã¼"
+
+#~ msgid "mismatched result of migration, got %s, wanted %s"
+#~ msgstr "çµ±åã®çµæã®ä¸ä¸è´: çµæ %s, æå¾
%s"
+
+#~ msgid "failure on COMMIT"
+#~ msgstr "COMMIT 失æ"
+
+#~ msgid "error vacuuming after migration"
+#~ msgstr "çµ±åå¾ã®ããã¥ã¼ã å¦çä¸ã«ã¨ã©ã¼"
+
+#~ msgid "database schema %s is unknown; cannot perform migration"
+#~ msgstr "ä¸æãªãã¼ã¿ãã¼ã¹ã¹ãã¼ã %s; çµ±åã§ãã¾ãã"
+
#~ msgid "error running analyze after migration"
#~ msgstr "çµ±åå¾ã«è§£æå®è¡ä¸ã«ã¨ã©ã¼"
============================================================
--- po/pt_BR.po 315fbac01e0fbe3ae0bf45cc10d877db84d0427c
+++ po/pt_BR.po d10fda0e74e1d66ea0165354eb83373df20e53e5
@@ -7,7 +7,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: Monotone 0.32\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-27 13:34-0200\n"
+"POT-Creation-Date: 2007-01-23 08:09-0800\n"
"PO-Revision-Date: 2006-12-27 13:35-0300\n"
"Last-Translator: Alex Sandro Queiroz e Silva \n"
"Language-Team: Alex Sandro Queiroz e Silva \n"
@@ -16,27 +16,27 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: app_state.cc:129
+#: app_state.cc:130
#, c-format
msgid "workspace required but not found%s%s"
msgstr "área de trabalho necessária mas não encontrada%s%s"
-#: app_state.cc:137
+#: app_state.cc:138
#, c-format
msgid "invalid directory ''"
msgstr "diretório inválido ''"
-#: app_state.cc:145
+#: app_state.cc:146
#, c-format
msgid "monotone bookkeeping directory '%s' already exists in '%s'"
msgstr "diretório '%s' de manutenção do monotone já existe em '%s'"
-#: app_state.cc:201
+#: app_state.cc:208
#, c-format
msgid "search root '%s' does not exist"
msgstr "raiz de procura '%s' não existe"
-#: app_state.cc:202
+#: app_state.cc:209
#, c-format
msgid "search root '%s' is not a directory"
msgstr "raiz da procura '%s' não é um diretório"
@@ -48,9 +48,9 @@ msgstr "[RAMO]"
#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218
#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529
#: automate.cc:905 automate.cc:1035 automate.cc:1079 automate.cc:1105
-#: automate.cc:1132 automate.cc:1159 automate.cc:1193 automate.cc:1304
-#: automate.cc:1401 automate.cc:1460 automate.cc:1506 automate.cc:1566
-#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:676
+#: automate.cc:1132 automate.cc:1159 automate.cc:1193 automate.cc:1305
+#: automate.cc:1395 automate.cc:1454 automate.cc:1500 automate.cc:1560
+#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:669
#, c-format
msgid "wrong argument count"
msgstr ""
@@ -61,7 +61,7 @@ msgstr "VER1 [VER2 [VER3 [...]]]"
#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454
-#: automate.cc:1200 cmd_list.cc:683 revision.cc:1705
+#: automate.cc:1200 cmd_list.cc:676 revision.cc:1705
#, c-format
msgid "No such revision %s"
msgstr "versão '%s' não existe"
@@ -85,12 +85,12 @@ msgstr "VERSÃO_NOVA [VERSÃO_VELHA1 [VE
#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:949
#: automate.cc:970 automate.cc:1256 cmd_automate.cc:78 cmd_automate.cc:332
-#: cmd_list.cc:584
+#: cmd_list.cc:577
#, c-format
msgid "no arguments needed"
msgstr ""
-#: automate.cc:423 automate.cc:448 cmd_list.cc:673 revision.cc:1699
+#: automate.cc:423 automate.cc:448 cmd_list.cc:666 revision.cc:1699
msgid "REV"
msgstr "VERSÃO"
@@ -102,21 +102,21 @@ msgstr "[VERSÃO]"
msgid "[REVID]"
msgstr "[VERSÃO]"
-#: automate.cc:931 automate.cc:1054 automate.cc:1514 automate.cc:1573
-#: automate.cc:1578
+#: automate.cc:931 automate.cc:1054 automate.cc:1508 automate.cc:1567
+#: automate.cc:1572
#, c-format
msgid "no revision %s found in database"
msgstr "nenhuma versão %s encontrada no banco de dados"
-#: automate.cc:1076 automate.cc:1102 cmd_merging.cc:845
+#: automate.cc:1076 automate.cc:1102 cmd_merging.cc:837
msgid "REVID"
msgstr "VERSÃO"
#: automate.cc:1087 automate.cc:1113 automate.cc:1168 automate.cc:1170
#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419
-#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:677
-#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:523
-#: cmd_ws_commit.cc:1011 commands.cc:413
+#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:669
+#: cmd_merging.cc:684 cmd_merging.cc:687 cmd_ws_commit.cc:517
+#: cmd_ws_commit.cc:987 commands.cc:411
#, c-format
msgid "no such revision '%s'"
msgstr "versão '%s' não existe"
@@ -134,48 +134,48 @@ msgstr "ARQUIVO_VELHO NOVO_ARQUIVO"
msgid "OLD_FILE NEW_FILE"
msgstr "ARQUIVO_VELHO NOVO_ARQUIVO"
-#: automate.cc:1301
+#: automate.cc:1302
msgid "[BRANCH_PATTERN]"
msgstr "[PADRÃO_DO_RAMOS]"
-#: automate.cc:1398
+#: automate.cc:1392
msgid "KEYID PASSPHRASE"
msgstr "CHAVE FRASE-CHAVE"
-#: automate.cc:1416 cmd_key_cert.cc:42
+#: automate.cc:1410 cmd_key_cert.cc:42
#, c-format
msgid "key '%s' already exists"
msgstr "chave '%s' já existe"
-#: automate.cc:1419 cmd_key_cert.cc:45
+#: automate.cc:1413 cmd_key_cert.cc:45
#, c-format
msgid "generating key-pair '%s'"
msgstr "gerando par de chaves '%s'"
-#: automate.cc:1421 cmd_key_cert.cc:47
+#: automate.cc:1415 cmd_key_cert.cc:47
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "salvando par de chaves '%s' em %s/"
-#: automate.cc:1457
+#: automate.cc:1451
msgid "OPTION"
msgstr "OPÃÃO"
-#: automate.cc:1480
+#: automate.cc:1474
#, c-format
msgid "'%s' is not a recognized workspace option"
msgstr "'%s' não é uma opção conhecida para área de trabalho"
-#: automate.cc:1503
+#: automate.cc:1497
msgid "REV FILE"
msgstr "VERSÃO ARQUIVO"
-#: automate.cc:1520 automate.cc:1584
+#: automate.cc:1514 automate.cc:1578
#, c-format
msgid "file %s is unknown for revision %s"
msgstr "arquivo %s é desconhecido para a versão %s"
-#: automate.cc:1563
+#: automate.cc:1557
msgid "REV1 FILE REV2"
msgstr "VER1 ARQUIVO VER2"
@@ -184,41 +184,41 @@ msgstr "lendo um %s em %d:%d:E: %s"
msgid "parsing a %s at %d:%d:E: %s"
msgstr "lendo um %s em %d:%d:E: %s"
-#: cert.cc:83
+#: cert.cc:82
#, c-format
msgid "ignoring bad signature by '%s' on '%s'"
msgstr "ignorando assinatura inválida por '%s' sobre '%s'"
-#: cert.cc:91
+#: cert.cc:90
#, c-format
msgid "ignoring unknown signature by '%s' on '%s'"
msgstr "ignorando assinatura desconhecida por '%s' sobre '%s'"
-#: cert.cc:157
+#: cert.cc:156
#, c-format
msgid "trust function disliked %d signers of %s cert on manifest %s"
msgstr ""
"função de confiança rejeitou %d assinantes do certificado %s sobre o "
"manifesto %s"
-#: cert.cc:214
+#: cert.cc:213
#, c-format
msgid "trust function disliked %d signers of %s cert on revision %s"
msgstr ""
"função de confiança rejeitou %d assinantes do certificado %s sobre a revisão "
"%s"
-#: cert.cc:303
+#: cert.cc:302
#, c-format
msgid "calculated cert hash '%s' does not match '%s'"
msgstr "hash '%s' calculado do certificado não combina com '%s'"
-#: cert.cc:387 keys.cc:561
+#: cert.cc:386 keys.cc:561
#, c-format
msgid "no key pair '%s' found in key store '%s'"
msgstr "nenhum par de chaves '%s' encontrado na coleção '%s'"
-#: cert.cc:465
+#: cert.cc:464
#, c-format
msgid ""
"you have no private key to make signatures with\n"
@@ -227,7 +227,7 @@ msgstr ""
"você não tem chave privada para fazer assinaturas\n"
"talvez você precise fazer 'genkey '"
-#: cert.cc:468
+#: cert.cc:467
#, c-format
msgid ""
"you have multiple private keys\n"
@@ -237,21 +237,21 @@ msgstr ""
"escolha uma para usar na assinatura adicionando '-k' ao seu "
"comando"
-#: cert.cc:485
+#: cert.cc:484
#, c-format
msgid "no branch found for empty revision, please provide a branch name"
msgstr ""
"nenhum ramo encontrado para revisão vazia, por favor forneça o nome de um "
"ramo"
-#: cert.cc:494
+#: cert.cc:491
#, c-format
msgid "no branch certs found for revision %s, please provide a branch name"
msgstr ""
"nenhum certificado de ramo encontrado para revisão %s, por favor forneça o "
"nome de um ramo"
-#: cert.cc:498
+#: cert.cc:495
#, c-format
msgid ""
"multiple branch certs found for revision %s, please provide a branch name"
@@ -260,11 +260,13 @@ msgstr ""
"o nome de um ramo"
#: cmd_automate.cc:150
+#, c-format
msgid "Bad input to automate stdio: expected ':' after string size"
msgstr ""
"Entrada inválida para automate stdio: ':' esperado após tamanho da cadeia"
#: cmd_automate.cc:169
+#, c-format
msgid "Bad input to automate stdio: unexpected EOF"
msgstr "Entrada inválida para automate stdio: EOF não esperado"
@@ -278,16 +280,16 @@ msgstr "Entrada inválida para automate
msgid "Bad input to automate stdio: expected '%c' token"
msgstr "Entrada inválida para automate stdio: token '%c' esperado"
-#: cmd_automate.cc:344
+#: cmd_automate.cc:348
#, c-format
msgid "Bad input to automate stdio: command name is missing"
msgstr "Entrada inválida para automate stdio: nome do comando faltando"
-#: cmd_automate.cc:373
+#: cmd_automate.cc:377
msgid "automation"
msgstr "automação"
-#: cmd_automate.cc:374
+#: cmd_automate.cc:378
msgid "automation interface"
msgstr "interface de automação"
@@ -369,8 +371,8 @@ msgstr "nenhuma variável com nome %s no
msgid "no var with name %s in domain %s"
msgstr "nenhuma variável com nome %s no domÃnio %s"
-#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114
-#: cmd_files.cc:220 cmd_list.cc:478 cmd_merging.cc:614 cmd_ws_commit.cc:417
+#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:602 cmd_files.cc:114
+#: cmd_files.cc:220 cmd_list.cc:471 cmd_merging.cc:606 cmd_ws_commit.cc:411
#: commands.cc:275
msgid "informative"
msgstr "informativo"
@@ -393,8 +395,8 @@ msgstr ""
msgid "more than two revisions given"
msgstr ""
-#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308
-#: cmd_ws_commit.cc:343 cmd_ws_commit.cc:417 cmd_ws_commit.cc:723
+#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:302
+#: cmd_ws_commit.cc:337 cmd_ws_commit.cc:411 cmd_ws_commit.cc:707
msgid "[PATH]..."
msgstr "[CAMINHO]..."
@@ -428,11 +430,11 @@ msgstr "[ARQUIVO [...]]"
msgid "[FILE [...]]"
msgstr "[ARQUIVO [...]]"
-#: cmd_diff_log.cc:603
+#: cmd_diff_log.cc:602
msgid "[FILE] ..."
msgstr "[ARQUIVO] ..."
-#: cmd_diff_log.cc:604
+#: cmd_diff_log.cc:603
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
"revisions are given, use them as a starting point."
@@ -440,13 +442,13 @@ msgstr ""
"imprime histórico em ordem inversa (filtrado por 'ARQUIVO'). Se uma ou mais\n"
"versões forem dadas, usa-as como ponto de partida."
-#: cmd_diff_log.cc:618
+#: cmd_diff_log.cc:617
#, c-format
msgid "only one of --last/--next allowed"
msgstr "apenas ou --last ou --next é permitido"
#: 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:837 cmd_othervcs.cc:15
msgid "debug"
msgstr "depuração"
@@ -580,7 +582,7 @@ msgstr "Apelido para %s"
msgstr "Apelido para %s"
#: 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
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:143
msgid "key and cert"
msgstr "chave e certificado"
@@ -643,11 +645,11 @@ msgstr "cria um certificado para uma ver
msgid "create a cert for a revision"
msgstr "cria um certificado para uma versão"
-#: cmd_key_cert.cc:150
+#: cmd_key_cert.cc:144
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr "VERSÃO NOME VALOR ASSINANTE1 [ASSINANTE2 [...]]"
-#: cmd_key_cert.cc:151
+#: cmd_key_cert.cc:145
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
@@ -655,7 +657,7 @@ msgstr ""
"verifica se um certificado hipotético teria confiança\n"
"baseado nos parâmetros atuais"
-#: cmd_key_cert.cc:184
+#: cmd_key_cert.cc:178
#, c-format
msgid ""
"if a cert on: %s\n"
@@ -670,72 +672,72 @@ msgstr ""
"fosse assinado por: %s\n"
"ele seria: %s"
-#: cmd_key_cert.cc:193
+#: cmd_key_cert.cc:187
msgid "trusted"
msgstr "confiável"
-#: cmd_key_cert.cc:193
+#: cmd_key_cert.cc:187
msgid "UNtrusted"
msgstr "NÃO-confiável"
-#: cmd_key_cert.cc:197 cmd_key_cert.cc:210 cmd_key_cert.cc:223
-#: cmd_key_cert.cc:239 cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:191 cmd_key_cert.cc:204 cmd_key_cert.cc:217
+#: cmd_key_cert.cc:233 cmd_ws_commit.cc:202
msgid "review"
msgstr "revisão"
-#: cmd_key_cert.cc:197
+#: cmd_key_cert.cc:191
msgid "REVISION TAGNAME"
msgstr "VERSÃO ETIQUETA"
-#: cmd_key_cert.cc:198
+#: cmd_key_cert.cc:192
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:210
+#: cmd_key_cert.cc:204
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr "ID (pass|fail|true|false|yes|no|1|0)"
-#: cmd_key_cert.cc:211
+#: cmd_key_cert.cc:205
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:223 cmd_ws_commit.cc:202
+#: cmd_key_cert.cc:217 cmd_ws_commit.cc:202
msgid "REVISION"
msgstr "VERSÃO"
-#: cmd_key_cert.cc:224
+#: cmd_key_cert.cc:218
msgid "approve of a particular revision"
msgstr "aprova a versão especificada"
-#: cmd_key_cert.cc:235
+#: cmd_key_cert.cc:229
#, c-format
msgid "need --branch argument for approval"
msgstr "argumento --branch necessário para aprovação"
-#: cmd_key_cert.cc:239
+#: cmd_key_cert.cc:233
msgid "REVISION [COMMENT]"
msgstr "VERSÃO [COMENTÃRIO]"
-#: cmd_key_cert.cc:240
+#: cmd_key_cert.cc:234
msgid "comment on a particular revision"
msgstr "comenta a versão especificada"
-#: cmd_key_cert.cc:252
+#: cmd_key_cert.cc:246
#, c-format
msgid "edit comment failed"
msgstr "edição de comentário falhou"
-#: cmd_key_cert.cc:257
+#: cmd_key_cert.cc:251
#, c-format
msgid "empty comment"
msgstr "comentário vazio"
-#: cmd_list.cc:64 cmd_list.cc:697
+#: cmd_list.cc:67 cmd_list.cc:693
#, c-format
msgid "no public key '%s' found in database"
msgstr "chave pública '%s' não encontrada no banco de dados"
-#: cmd_list.cc:74
+#: cmd_list.cc:77
#, c-format
msgid ""
"Key : %s\n"
@@ -748,39 +750,39 @@ msgstr ""
"Nome : %s\n"
"Valor : %s\n"
-#: cmd_list.cc:108
+#: cmd_list.cc:111
msgid "ok"
msgstr "ok"
-#: cmd_list.cc:111
+#: cmd_list.cc:114
msgid "bad"
msgstr "inválido"
-#: cmd_list.cc:114
+#: cmd_list.cc:117
msgid "unknown"
msgstr "desconhecido"
-#: cmd_list.cc:202
+#: cmd_list.cc:205
#, c-format
msgid "(*) - only in %s/"
msgstr "(*) - apenas em %s/"
-#: cmd_list.cc:226
+#: cmd_list.cc:229
#, c-format
msgid "no keys found"
msgstr "nenhuma chave encontrada"
-#: cmd_list.cc:228
+#: cmd_list.cc:231
#, c-format
msgid "no keys found matching '%s'"
msgstr "nenhuma chave de '%s' encontrada"
-#: cmd_list.cc:275
+#: cmd_list.cc:281
#, c-format
msgid "no epoch for branch %s"
msgstr "nenhuma era para ramo %s"
-#: cmd_list.cc:479
+#: cmd_list.cc:472
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -806,7 +808,7 @@ msgstr ""
"missing\n"
"changed"
-#: cmd_list.cc:490
+#: cmd_list.cc:483
msgid ""
"show database objects, or the current workspace manifest, \n"
"or known, unknown, intentionally ignored, missing, or \n"
@@ -816,10 +818,10 @@ msgstr ""
"ou arquivos conhecidos, desconhecidos, intencionalmente ignorados,\n"
"faltando ou que mudaram de estado"
-#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:79
-#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:343
-#: cmd_ws_commit.cc:373 cmd_ws_commit.cc:398 cmd_ws_commit.cc:623
-#: cmd_ws_commit.cc:723
+#: cmd_merging.cc:73 cmd_merging.cc:647 cmd_ws_commit.cc:79
+#: cmd_ws_commit.cc:258 cmd_ws_commit.cc:302 cmd_ws_commit.cc:337
+#: cmd_ws_commit.cc:367 cmd_ws_commit.cc:392 cmd_ws_commit.cc:607
+#: cmd_ws_commit.cc:707
msgid "workspace"
msgstr "área de trabalho"
@@ -883,12 +885,12 @@ msgstr "selecionado alvo %s para atualiz
msgid "selected update target %s"
msgstr "selecionado alvo %s para atualização"
-#: cmd_merging.cc:171
+#: cmd_merging.cc:161
#, c-format
msgid "target revision is not in current branch"
msgstr "versão alvo não está no ramo atual"
-#: cmd_merging.cc:179
+#: cmd_merging.cc:169
#, c-format
msgid ""
"target revision is in multiple branches:%s\n"
@@ -899,12 +901,12 @@ msgstr ""
"\n"
"tente de novo com --branch"
-#: cmd_merging.cc:187
+#: cmd_merging.cc:177
#, c-format
msgid "switching to branch %s"
msgstr "atualizando segundo ramo %s"
-#: cmd_merging.cc:192
+#: cmd_merging.cc:182
#, c-format
msgid ""
"target revision not in any branch\n"
@@ -913,205 +915,205 @@ msgstr ""
"a versão-alvo não está em nenhum ramo\n"
"a próxima gravação usará ramo %s"
-#: cmd_merging.cc:262
+#: cmd_merging.cc:252
#, c-format
msgid "switched branch; next commit will use branch %s"
msgstr "ramos trocados, próxima gravação usará ramo %s"
-#: cmd_merging.cc:263
+#: cmd_merging.cc:253
#, c-format
msgid "updated to base revision %s"
msgstr "atualizado para versão-base %s"
-#: cmd_merging.cc:301
+#: cmd_merging.cc:291
#, c-format
msgid "[left] %s"
msgstr "[esquerda] %s"
-#: cmd_merging.cc:302
+#: cmd_merging.cc:292
#, c-format
msgid "[right] %s"
msgstr "[direita] %s"
-#: cmd_merging.cc:313 cmd_merging.cc:584
+#: cmd_merging.cc:305 cmd_merging.cc:576
#, c-format
msgid "[merged] %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:483 cmd_ws_commit.cc:969
-#: cmd_ws_commit.cc:992 cmd_ws_commit.cc:1102 cmd_ws_commit.cc:1116
+#: cmd_merging.cc:312 cmd_merging.cc:411 cmd_merging.cc:422 cmd_merging.cc:580
+#: cmd_merging.cc:813 cmd_ws_commit.cc:477 cmd_ws_commit.cc:945
+#: cmd_ws_commit.cc:968 cmd_ws_commit.cc:1068 cmd_ws_commit.cc:1082
msgid "tree"
msgstr "árvore"
-#: cmd_merging.cc:320
+#: cmd_merging.cc:312
msgid "merge unmerged heads of branch"
msgstr "combina diferentes frentes do ramo"
-#: cmd_merging.cc:330 cmd_merging.cc:829
+#: cmd_merging.cc:322 cmd_merging.cc:821
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "por favor especifique um ramo com --branch=RAMO"
-#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834
-#: cmd_ws_commit.cc:507
+#: cmd_merging.cc:327 cmd_merging.cc:461 cmd_merging.cc:464 cmd_merging.cc:826
+#: cmd_ws_commit.cc:501
#, c-format
msgid "branch '%s' is empty"
msgstr "ramo '%s' está vazio"
-#: cmd_merging.cc:338
+#: cmd_merging.cc:330
#, c-format
msgid "branch '%s' is already merged"
msgstr "ramo '%s' já está combinado"
-#: cmd_merging.cc:342
+#: cmd_merging.cc:334
#, c-format
msgid "%d head on branch '%s'"
msgid_plural "%d heads on branch '%s'"
msgstr[0] "%d frente no ramo '%s'"
msgstr[1] "%d frentes no ramo '%s'"
-#: cmd_merging.cc:363 cmd_merging.cc:408
+#: cmd_merging.cc:355 cmd_merging.cc:400
#, c-format
msgid "merge %d / %d:"
msgstr "combinado %d / %d:"
-#: cmd_merging.cc:364
+#: cmd_merging.cc:356
#, c-format
msgid "calculating best pair of heads to merge next"
msgstr "calculando melhor par de frentes para combinar a seguir"
-#: cmd_merging.cc:416
+#: cmd_merging.cc:408
#, c-format
msgid "note: your workspaces have not been updated"
msgstr "nota: suas áreas de trabalho não foram atualizadas"
-#: cmd_merging.cc:419
+#: cmd_merging.cc:411
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr "RAMO-FONTE RAMO-DESTINO"
-#: cmd_merging.cc:420
+#: cmd_merging.cc:412
msgid "merge from one branch to another asymmetrically"
msgstr "combina dois ramos de forma assimétrica"
-#: cmd_merging.cc:430
+#: cmd_merging.cc:422
msgid "SOURCE-BRANCH DEST-BRANCH DIR"
msgstr "RAMO-FONTE RAMO-DESTINO DIRETÃRIO"
-#: cmd_merging.cc:431
+#: cmd_merging.cc:423
msgid "merge one branch into a subdirectory in another branch"
msgstr "combina um ramo com um sibdiretório de outro ramo"
-#: cmd_merging.cc:470 cmd_merging.cc:473
+#: cmd_merging.cc:462 cmd_merging.cc:465
#, c-format
msgid "branch '%s' is not merged"
msgstr "ramo '%s' não está combinado"
-#: cmd_merging.cc:478
+#: cmd_merging.cc:470
#, c-format
msgid "propagating %s -> %s"
msgstr "propagando %s -> %s"
-#: cmd_merging.cc:479
+#: cmd_merging.cc:471
#, c-format
msgid "[source] %s"
msgstr "[fonte] %s"
-#: cmd_merging.cc:480
+#: cmd_merging.cc:472
#, c-format
msgid "[target] %s"
msgstr "[alvo] %s"
-#: cmd_merging.cc:485
+#: cmd_merging.cc:477
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'"
msgstr "ramo '%s' está atualizado em relação ao ramo '%s'"
-#: cmd_merging.cc:487
+#: cmd_merging.cc:479
#, c-format
msgid "no action taken"
msgstr "nenhuma ação tomada"
-#: cmd_merging.cc:491
+#: cmd_merging.cc:483
#, c-format
msgid "no merge necessary; putting %s in branch '%s'"
msgstr "não há necessidade de combinação; colocando %s no ramo '%s'"
-#: cmd_merging.cc:529
+#: cmd_merging.cc:521
#, c-format
msgid "Path %s not found in destination tree."
msgstr "Caminho %s não foi encontrado na árvore de destino."
-#: cmd_merging.cc:589
+#: cmd_merging.cc:581
msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
msgstr "VERSÃO-ESQUERDA VERSÃO-DIREITA RAMO-DESTINO"
-#: cmd_merging.cc:590
+#: cmd_merging.cc:582
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr ""
"combina duas versões dadas explicitamente colocando o resuldado no ramo dado"
-#: cmd_merging.cc:605
+#: cmd_merging.cc:597
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s e %s são a mesma versão, abortando"
-#: cmd_merging.cc:607 cmd_merging.cc:609
+#: cmd_merging.cc:599 cmd_merging.cc:601
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s já é um ancestral de %s"
-#: cmd_merging.cc:614
+#: cmd_merging.cc:606
msgid "REV REV"
msgstr "VERSÃO VERSÃO"
-#: cmd_merging.cc:615
+#: cmd_merging.cc:607
msgid ""
"Show what conflicts would need to be resolved to merge the given revisions."
msgstr ""
"Mostra que conflitos precisariam ser resolvidos para combinar as\n"
"duas versões."
-#: cmd_merging.cc:625 cmd_merging.cc:627
+#: cmd_merging.cc:617 cmd_merging.cc:619
#, c-format
msgid "%s is an ancestor of %s; no merge is needed."
msgstr "%s é um ancestral de %s; nenhuma combinação é necessária."
-#: cmd_merging.cc:641
+#: cmd_merging.cc:633
#, c-format
msgid "There are %s node_name_conflicts."
msgstr "Há %s conflitos nos nomes dos nós."
-#: cmd_merging.cc:643
+#: cmd_merging.cc:635
#, c-format
msgid "There are %s file_content_conflicts."
msgstr "Há %s conflitos nos conteúdos dos arquivos."
-#: cmd_merging.cc:645
+#: cmd_merging.cc:637
#, c-format
msgid "There are %s node_attr_conflicts."
msgstr "Há %s conflitos nos atributos dos nós."
-#: cmd_merging.cc:647
+#: cmd_merging.cc:639
#, c-format
msgid "There are %s orphaned_node_conflicts."
msgstr "Há %s conflitos de nós órfãos."
-#: cmd_merging.cc:649
+#: cmd_merging.cc:641
#, c-format
msgid "There are %s rename_target_conflicts."
msgstr "Há %s conflitos de alvos de renomeação."
-#: cmd_merging.cc:651
+#: cmd_merging.cc:643
#, c-format
msgid "There are %s directory_loop_conflicts."
msgstr "Há %s conflitos de laços de diretório."
-#: cmd_merging.cc:655
+#: cmd_merging.cc:647
msgid "[-r FROM] -r TO [PATH...]"
msgstr "[-r DE] -r PARA [CAMINHO...]"
-#: cmd_merging.cc:656
+#: cmd_merging.cc:648
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"
@@ -1138,7 +1140,7 @@ msgstr ""
"Se duas versões forem dadas, aplica as mudanças feitas para chegar à \n"
"segunda revisão a partir da primeira."
-#: cmd_merging.cc:681
+#: cmd_merging.cc:673
#, c-format
msgid ""
"revision %s is a merge\n"
@@ -1149,41 +1151,41 @@ msgstr ""
"para aplicar as mudanças relativas a um de seus pais, use:\n"
" %s pluck -r PAI -r %s"
-#: cmd_merging.cc:702
+#: cmd_merging.cc:694
#, c-format
msgid "no changes to apply"
msgstr "nenhuma mudança a aplicar"
-#: cmd_merging.cc:759
+#: cmd_merging.cc:751
#, c-format
msgid "no changes to be applied"
msgstr "nenhuma mudança a aplicar"
-#: cmd_merging.cc:786
+#: cmd_merging.cc:778
#, c-format
msgid "no changes were applied"
msgstr "nenhuma mudança foi aplicada"
-#: cmd_merging.cc:789
+#: cmd_merging.cc:781
#, c-format
msgid "applied changes to workspace"
msgstr "mudanças aplicadas à área de trabalho"
-#: cmd_merging.cc:821
+#: cmd_merging.cc:813
msgid "show unmerged head revisions of branch"
msgstr "mostra frentes não combinadas do ramo"
-#: cmd_merging.cc:836
+#: cmd_merging.cc:828
#, c-format
msgid "branch '%s' is currently merged:"
msgstr "ramo '%s' está atualmente combinado:"
-#: cmd_merging.cc:838
+#: cmd_merging.cc:830
#, c-format
msgid "branch '%s' is currently unmerged:"
msgstr "ramo '%s' não está combinado atualmente:"
-#: cmd_merging.cc:846
+#: cmd_merging.cc:838
msgid "dump the roster associated with the given REVID"
msgstr "exibe conteúdo do roster associado com VERSÃO"
@@ -1366,6 +1368,7 @@ msgstr "edição de mensagem de registro
msgstr "edição de mensagem de registro falhou"
#: cmd_ws_commit.cc:74
+#, c-format
msgid "failed to remove magic line; commit cancelled"
msgstr "erro removendo linha mágica; gravação cancelada"
@@ -1412,43 +1415,43 @@ msgstr "argumento --branch necessário p
msgid "need --branch argument for disapproval"
msgstr "argumento --branch necessário para desaprovação"
-#: cmd_ws_commit.cc:264
+#: cmd_ws_commit.cc:258
msgid "[DIRECTORY...]"
msgstr "[DIRETÃRIO...]"
-#: cmd_ws_commit.cc:265
+#: cmd_ws_commit.cc:259
msgid "create one or more directories and add them to the workspace"
msgstr "cria um ou mais diretórios e os adiciona à área de trabalho"
-#: cmd_ws_commit.cc:285
+#: cmd_ws_commit.cc:279
#, c-format
msgid "directory '%s' already exists"
msgstr "diretório '%s' já existe"
-#: cmd_ws_commit.cc:292
+#: cmd_ws_commit.cc:286
#, c-format
msgid "ignoring directory '%s' [see .mtn-ignore]"
msgstr "ignorando diretório '%s' [veja .mtn-ignore]"
-#: cmd_ws_commit.cc:309
+#: cmd_ws_commit.cc:303
msgid "add files to workspace"
msgstr "adiciona arquivos à área de trabalho"
-#: cmd_ws_commit.cc:316
+#: cmd_ws_commit.cc:310
#, c-format
msgid "cannot set '--unknown' and '--recursive' at the same time"
msgstr ""
-#: cmd_ws_commit.cc:318
+#: cmd_ws_commit.cc:312
#, c-format
msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time"
msgstr ""
-#: cmd_ws_commit.cc:344
+#: cmd_ws_commit.cc:338
msgid "drop files from workspace"
msgstr "remove arquivos da área de trabalho"
-#: cmd_ws_commit.cc:374
+#: cmd_ws_commit.cc:368
msgid ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
@@ -1456,15 +1459,15 @@ msgstr ""
"ORIGEM DESTINO\n"
"ORIGEM1 [ORIGEM2 [...]] DIRETÃRIO_DESTINO"
-#: cmd_ws_commit.cc:376
+#: cmd_ws_commit.cc:370
msgid "rename entries in the workspace"
msgstr "renomeia entradas na área de trabalho"
-#: cmd_ws_commit.cc:398
+#: cmd_ws_commit.cc:392
msgid "NEW_ROOT PUT_OLD"
msgstr "NOVA_RAIZ COLOCAR_O_ANTIGO"
-#: cmd_ws_commit.cc:399
+#: cmd_ws_commit.cc:393
msgid ""
"rename the root directory\n"
"after this command, the directory that currently has the name NEW_ROOT\n"
@@ -1478,31 +1481,31 @@ msgstr ""
"COLOCAR_O_ANTIGO.\n"
"Usar --execute é altamente recomendado."
-#: cmd_ws_commit.cc:417
+#: cmd_ws_commit.cc:411
msgid "show status of workspace"
msgstr "mostra status da área de trabalho"
-#: cmd_ws_commit.cc:446
+#: cmd_ws_commit.cc:440
#, c-format
msgid "Current branch: %s"
msgstr "Ramo atual: %s"
-#: cmd_ws_commit.cc:452
+#: cmd_ws_commit.cc:446
#, c-format
msgid "Changes against parent %s"
msgstr "Diferenças entre o pai %s"
-#: cmd_ws_commit.cc:457
+#: cmd_ws_commit.cc:451
#, c-format
msgid " no changes"
msgstr " sem mudanças"
-#: cmd_ws_commit.cc:461
+#: cmd_ws_commit.cc:455
#, c-format
msgid " dropped %s"
msgstr " %s descartado"
-#: cmd_ws_commit.cc:466
+#: cmd_ws_commit.cc:460
#, c-format
msgid ""
" renamed %s\n"
@@ -1511,21 +1514,21 @@ msgstr ""
" %s foi renomeado\n"
" para %s"
-#: cmd_ws_commit.cc:471 cmd_ws_commit.cc:475
+#: cmd_ws_commit.cc:465 cmd_ws_commit.cc:469
#, c-format
msgid " added %s"
msgstr " %s foi adicionado"
-#: cmd_ws_commit.cc:479
+#: cmd_ws_commit.cc:473
#, c-format
msgid " patched %s"
msgstr " %s foi modificado"
-#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:969 cmd_ws_commit.cc:1102
+#: cmd_ws_commit.cc:477 cmd_ws_commit.cc:945 cmd_ws_commit.cc:1068
msgid "[DIRECTORY]"
msgstr "[DIRETÃRIO]"
-#: cmd_ws_commit.cc:484
+#: cmd_ws_commit.cc:478
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"
@@ -1538,47 +1541,47 @@ msgstr ""
"Se nenhum nome de diretório for dado, o nome do ramo será usado como\n"
"diretório"
-#: cmd_ws_commit.cc:502 cmd_ws_commit.cc:1036
+#: cmd_ws_commit.cc:496 cmd_ws_commit.cc:1002
#, c-format
msgid "use --revision or --branch to specify what to checkout"
msgstr "use --revision ou --branch para especificar o que será extraÃdo"
-#: cmd_ws_commit.cc:510 cmd_ws_commit.cc:1042
+#: cmd_ws_commit.cc:504 cmd_ws_commit.cc:1008
#, c-format
msgid "branch %s has multiple heads:"
msgstr "ramo %s tem frentes múltiplas:"
-#: cmd_ws_commit.cc:513 cmd_ws_commit.cc:1045
+#: cmd_ws_commit.cc:507 cmd_ws_commit.cc:1011
#, c-format
msgid "choose one with '%s checkout -r'"
msgstr "escolha um com '%s update -r'"
-#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1046
+#: cmd_ws_commit.cc:508 cmd_ws_commit.cc:1012
#, c-format
msgid "branch %s has multiple heads"
msgstr "ramo %s tem frentes múltiplas"
-#: cmd_ws_commit.cc:541 cmd_ws_commit.cc:1029
+#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:995
#, c-format
msgid "revision %s is not a member of branch %s"
msgstr "versão %s não é um membro do ramo %s"
-#: cmd_ws_commit.cc:558
+#: cmd_ws_commit.cc:542
#, c-format
msgid "you must specify a destination directory"
msgstr "um diretório de destino deve ser especificado"
-#: cmd_ws_commit.cc:571
+#: cmd_ws_commit.cc:555
#, c-format
msgid "checkout directory '%s' already exists"
msgstr "diretório de saÃda '%s' já existe"
-#: cmd_ws_commit.cc:605
+#: cmd_ws_commit.cc:589
#, c-format
msgid "no file %s found in database for %s"
msgstr "nenhum arquivo %s encontrado no banco de dados para %s"
-#: cmd_ws_commit.cc:623
+#: cmd_ws_commit.cc:607
msgid ""
"set PATH ATTR VALUE\n"
"get PATH [ATTR]\n"
@@ -1588,45 +1591,45 @@ msgstr ""
"get CAMINHO [ATRIBUTO]\n"
"drop CAMINHO [ATRIBUTO]"
-#: cmd_ws_commit.cc:624
+#: cmd_ws_commit.cc:608
msgid "set, get or drop file attributes"
msgstr "configura, lê ou descarta atributos de arquivos"
-#: cmd_ws_commit.cc:641
+#: cmd_ws_commit.cc:625
#, c-format
msgid "Unknown path '%s'"
msgstr "caminho desconhecido '%s'"
-#: cmd_ws_commit.cc:670
+#: cmd_ws_commit.cc:654
#, c-format
msgid "Path '%s' does not have attribute '%s'"
msgstr "Caminho '%s' não tem atributo '%s'"
-#: cmd_ws_commit.cc:700
+#: cmd_ws_commit.cc:684
#, c-format
msgid "No attributes for '%s'"
msgstr "Nenhum atributo para '%s'"
-#: cmd_ws_commit.cc:711
+#: cmd_ws_commit.cc:695
#, c-format
msgid "No attribute '%s' on path '%s'"
msgstr "Nenhum atributo '%s' no caminho '%s'"
-#: cmd_ws_commit.cc:724
+#: cmd_ws_commit.cc:708
msgid "commit workspace to database"
msgstr "grava mudanças da área de trabalho no banco de dados"
-#: cmd_ws_commit.cc:755
+#: cmd_ws_commit.cc:739
#, c-format
msgid "no changes to commit"
msgstr "nenhuma mudança para gravar"
-#: cmd_ws_commit.cc:775
+#: cmd_ws_commit.cc:759
#, c-format
msgid "beginning commit on branch '%s'"
msgstr "iniciando gravação do ramo '%s'"
-#: cmd_ws_commit.cc:784
+#: cmd_ws_commit.cc:768
#, c-format
msgid ""
"_MTN/log is non-empty and log message was specified on command line\n"
@@ -1638,37 +1641,37 @@ msgstr ""
"considere mover ou apagar _MTN/log,\n"
"ou remova --message/--message-from-file da linha de comando"
-#: cmd_ws_commit.cc:799
+#: cmd_ws_commit.cc:783
#, c-format
msgid "empty log message; commit canceled"
msgstr "entrada no registro vazia, gravação cancelada"
-#: cmd_ws_commit.cc:821
+#: cmd_ws_commit.cc:805
#, c-format
msgid "log message rejected by hook: %s"
msgstr "entrada no registro rejeitada pelo hook: %s"
-#: cmd_ws_commit.cc:829
+#: cmd_ws_commit.cc:813
#, c-format
msgid "revision %s already in database"
msgstr "versão %s já está no banco de dados"
-#: cmd_ws_commit.cc:868 cmd_ws_commit.cc:898
+#: cmd_ws_commit.cc:852 cmd_ws_commit.cc:882
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "arquivo '%s' modificado durante gravação, abortando"
-#: cmd_ws_commit.cc:880
+#: cmd_ws_commit.cc:864
#, 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:930
+#: cmd_ws_commit.cc:906
#, c-format
msgid "committed revision %s"
msgstr "versão %s gravada"
-#: cmd_ws_commit.cc:936
+#: cmd_ws_commit.cc:912
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1677,38 +1680,39 @@ msgstr ""
"nota: esta versão cria divergência\n"
"nota: talvez você queira executar '%s merge'"
-#: cmd_ws_commit.cc:970
+#: cmd_ws_commit.cc:946
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:976
+#: cmd_ws_commit.cc:952
#, c-format
msgid "need --branch argument for setup"
msgstr "argumento --branch é necessário para configuração"
-#: cmd_ws_commit.cc:992
+#: cmd_ws_commit.cc:968
msgid "DIRECTORY"
msgstr "DIRETÃRIO"
-#: cmd_ws_commit.cc:993
+#: cmd_ws_commit.cc:969
msgid "import the contents of the given directory tree into a given branch"
msgstr ""
-#: cmd_ws_commit.cc:1004
+#: cmd_ws_commit.cc:980
+#, c-format
msgid "you must specify a directory to import"
msgstr "você deve especificar um diretório para ser importado"
-#: cmd_ws_commit.cc:1055
+#: cmd_ws_commit.cc:1021
#, c-format
msgid "import directory '%s' doesn't exists"
msgstr "Diretório a ser importado '%s' não existe"
-#: cmd_ws_commit.cc:1056
+#: cmd_ws_commit.cc:1022
#, c-format
msgid "import directory '%s' is a file"
msgstr "Diretório a ser importado '%s' é um arquivo"
-#: cmd_ws_commit.cc:1103
+#: cmd_ws_commit.cc:1069
msgid ""
"migrate a workspace directory's metadata to the latest format; defaults to "
"the current workspace"
@@ -1716,7 +1720,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:1116
+#: cmd_ws_commit.cc:1082
msgid "refresh the inodeprint cache"
msgstr "atualiza o cache de inodeprint"
@@ -1742,31 +1746,31 @@ msgstr "exibe ajuda de comando"
msgid "display command help"
msgstr "exibe ajuda de comando"
-#: commands.cc:420
+#: commands.cc:418
#, c-format
msgid "expanding selection '%s'"
msgstr "expandindo seleção '%s'"
-#: commands.cc:428
+#: commands.cc:426
#, c-format
msgid "no match for selection '%s'"
msgstr "sem equivalente para seleção '%s'"
-#: commands.cc:434
+#: commands.cc:432
#, c-format
msgid "expanded to '%s'"
msgstr "expandido para '%s'"
-#: commands.cc:451
+#: commands.cc:449
#, c-format
msgid "selection '%s' has multiple ambiguous expansions:"
msgstr "seleção '%s' tem múltiplas expansões:"
-#: commands.cc:468
+#: commands.cc:466
msgid "note: "
msgstr "nota: "
-#: commands.cc:469
+#: commands.cc:467
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
@@ -1775,7 +1779,7 @@ msgstr ""
"ramo '%s' tem múltiplas frentes\n"
"considere usar '%s merge'"
-#: commands.cc:484
+#: commands.cc:482
#, c-format
msgid "--message and --message-file are mutually exclusive"
msgstr "--message e --message-file são mutuamente exclusivos"
@@ -1797,7 +1801,7 @@ msgstr "marcas"
msgid "markings"
msgstr "marcas"
-#: database_check.cc:306 netsync.cc:3063 rcs_import.cc:1244
+#: database_check.cc:306 netsync.cc:3053 rcs_import.cc:1245
msgid "revisions"
msgstr "versões"
@@ -1805,7 +1809,7 @@ msgstr "descendência"
msgid "ancestry"
msgstr "descendência"
-#: database_check.cc:434 netsync.cc:3067
+#: database_check.cc:434 netsync.cc:3057
msgid "keys"
msgstr "chaves"
@@ -2079,26 +2083,22 @@ msgstr "o banco de dados está bem"
msgid "database is good"
msgstr "o banco de dados está bem"
-#: database.cc:159
+#: database.cc:151
#, c-format
+msgid "this database already contains rosters"
+msgstr "este banco de dados já contém inventórios"
+
+#: database.cc:177
+#, fuzzy, c-format
msgid ""
-"layout of database %s doesn't match this version of monotone\n"
-"wanted schema %s, got %s\n"
-"try '%s db migrate' to upgrade\n"
-"(this is irreversible; you may want to make a backup copy first)"
+"database %s lacks some cached data\n"
+"run '%s db regenerate_caches' to restore use of this database"
msgstr ""
-"o leiaute do banco de dados %s não combina com esta versão do monotone\n"
-"pedido esquema %s, conseguido %s\n"
-"tente '%s db migrate' para atualizar\n"
-"(isto é irreversÃvel, uma cópia de segurança pode ser necessária)"
+"o banco de dados %s necessita de alguns dados em cache\n"
+"execute '%s regenerate_caches' para restaurar estes dados"
-#: database.cc:173
+#: database.cc:194
#, c-format
-msgid "this database already contains rosters"
-msgstr "este banco de dados já contém inventórios"
-
-#: database.cc:200
-#, c-format
msgid ""
"database %s contains old-style revisions\n"
"if you are a project leader or doing local testing:\n"
@@ -2116,7 +2116,7 @@ msgstr ""
" então puxe as versões para um novo banco de dados.\n"
"lamentamos pela incoveniência."
-#: database.cc:210
+#: database.cc:204
#, c-format
msgid ""
"database %s contains manifests but no revisions\n"
@@ -2127,89 +2127,56 @@ msgstr ""
"este é um banco de dados muito velho; ele precisa ser atualizado\n"
"por favor leia README.changesets para detalhes"
-#: database.cc:221
-#, c-format
-msgid ""
-"database %s misses some cached data\n"
-"run '%s db regenerate_caches' to restore use of this database"
-msgstr ""
-"o banco de dados %s necessita de alguns dados em cache\n"
-"execute '%s regenerate_caches' para restaurar estes dados"
+#: database.cc:487 sanity.cc:234 schema_migration.cc:58
+msgid "error: "
+msgstr "erro:"
-#: database.cc:259
-#, c-format
-msgid "unable to probe database version in file %s"
-msgstr "incapaz de verificar a versão do banco de dados no arquivo %s"
+#: database.cc:488
+msgid "sqlite error: "
+msgstr "erro da sqlite: "
-#: database.cc:266
-#, c-format
-msgid "database %s is not an sqlite version 3 file, try dump and reload"
-msgstr ""
-"banco de dados %s não é um arquivo sqlite versão 3, tente dump e reload"
+#: database.cc:512
+#, fuzzy
+msgid "not set"
+msgstr "nota: "
-#: database.cc:293 schema_migration.cc:201
-msgid ""
-"make sure database and containing directory are writeable\n"
-"and you have not run out of disk space"
-msgstr ""
-"certifique-se de que o banco de dados e o diretório continente podem\n"
-"ser escritos e você ainda tem espaço livre do disco"
+#: database.cc:525
+#, fuzzy
+msgid " (not a monotone database)"
+msgstr "configura nome do banco de dados"
-#: database.cc:297 schema_migration.cc:206
+#: database.cc:573 database.cc:604 database.cc:1046 database.cc:1066
#, c-format
-msgid ""
-"sqlite error: %s\n"
-"%s"
+msgid "%u"
msgstr ""
-"erro da sqlite: %s\n"
-"%s"
-#: database.cc:342
-#, c-format
-msgid "could not initialize database: %s: already exists"
-msgstr "erro inicializando banco de dados: %s: já existe"
-
-#: database.cc:347
-#, c-format
+#: database.cc:623
+#, fuzzy, c-format
msgid ""
-"existing (possibly stale) journal file '%s' has same stem as new database '%"
-"s'\n"
-"cancelling database creation"
-msgstr ""
-"arquivo de jornal '%s' existente tem a mesma raiz que novo banco de dados\n"
-"%s, cancelando criação"
-
-#: database.cc:497
-#, c-format
-msgid "cannot create %s; it already exists"
-msgstr "erro criando %s; já existe"
-
-#: database.cc:573
-#, c-format
-msgid ""
+"creator code : %s\n"
"schema version : %s\n"
"counts:\n"
-" full rosters : %u\n"
-" roster deltas : %u\n"
-" full files : %u\n"
-" file deltas : %u\n"
-" revisions : %u\n"
-" ancestry edges : %u\n"
-" certs : %u\n"
-" logical files : %u\n"
+" full rosters : %s\n"
+" roster deltas : %s\n"
+" full files : %s\n"
+" file deltas : %s\n"
+" revisions : %s\n"
+" ancestry edges : %s\n"
+" certs : %s\n"
+" logical files : %s\n"
"bytes:\n"
-" full rosters : %u\n"
-" roster deltas : %u\n"
-" full files : %u\n"
-" file deltas : %u\n"
-" revisions : %u\n"
-" cached ancestry : %u\n"
-" certs : %u\n"
-" heights : %u\n"
-" total : %u\n"
+" full rosters : %s\n"
+" roster deltas : %s\n"
+" full files : %s\n"
+" file deltas : %s\n"
+" revisions : %s\n"
+" cached ancestry : %s\n"
+" certs : %s\n"
+" heights : %s\n"
+" total : %s\n"
"database:\n"
-" page size : %u\n"
-" cache size : %u"
+" page size : %s\n"
+" cache size : %s"
msgstr ""
"versão do esquema : %s\n"
"contagens:\n"
@@ -2235,55 +2202,65 @@ msgstr ""
" tamanho da página: %u\n"
" tamanho do cache : %u"
-#: database.cc:638
+#: database.cc:668
#, c-format
msgid "database schema version: %s"
msgstr "versão do esquema do banco de dados: %s"
-#: database.cc:715
+#: database.cc:756
#, c-format
msgid "multiple statements in query: %s"
msgstr "múltiplos comandos na consulta: %s"
-#: database.cc:721
+#: database.cc:762
#, 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:828
#, c-format
msgid "null result in query: %s"
msgstr "resultado vazio da consulta: %s"
-#: database.cc:805
+#: database.cc:846
#, c-format
msgid "wanted %d rows got %d in query: %s"
msgstr "%d linhas pedidas, %d linhas obtidas da consulta: %s"
-#: database.cc:2042
+#: database.cc:2103
#, c-format
msgid "another key with name '%s' already exists"
msgstr "outra chave com nome '%s' já existe"
-#: database.cc:3040
+#: database.cc:3121
#, c-format
msgid "no database specified"
msgstr "nenhum banco de dados especificado"
-#: database.cc:3048
+#: database.cc:3129
#, c-format
msgid "database %s does not exist"
msgstr "banco de dados %s não existe"
-#: database.cc:3049
+#: database.cc:3130
#, c-format
msgid "%s is a directory, not a database"
msgstr "%s é um diretório, não um banco de dados"
-#: database.cc:3074
+#: database.cc:3137
+#, fuzzy, c-format
+msgid "database %s already exists"
+msgstr "caminho '%s' já existe"
+
+#: database.cc:3142
#, c-format
-msgid "could not open database '%s': %s"
-msgstr "erro abrindo banco de dados '%s': %s"
+msgid ""
+"existing (possibly stale) journal file '%s' has same stem as new database '%"
+"s'\n"
+"cancelling database creation"
+msgstr ""
+"arquivo de jornal '%s' existente tem a mesma raiz que novo banco de dados\n"
+"%s, cancelando criação"
#: diff_patch.cc:614
#, c-format
@@ -2452,7 +2429,7 @@ msgstr "erro de execução %s capturado
msgid "caught runtime error %s constructing file path for %s"
msgstr "erro de execução %s capturado construindo caminho do arquivo %s"
-#: file_io.cc:548 work.cc:1083
+#: file_io.cc:540 work.cc:1112
#, c-format
msgid "no such file or directory: '%s'"
msgstr "arquivo ou diretório inexistente: '%s'"
@@ -2507,7 +2484,7 @@ msgstr "Diretório '%s' não existe"
msgid "Directory '%s' does not exist"
msgstr "Diretório '%s' não existe"
-#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1338
+#: lua.cc:481 lua.cc:516 rcs_import.cc:1236 work.cc:1367
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' não é um diretório"
@@ -2547,6 +2524,10 @@ msgstr "Opções especÃficas para '%s %
msgid "Options specific to '%s %s':"
msgstr "Opções especÃficas para '%s %s':"
+#: monotone.cc:307
+msgid "error: memory exhausted"
+msgstr ""
+
#: mt_version.cc:36
#, c-format
msgid "%s (base revision: %s)"
@@ -2678,12 +2659,12 @@ msgstr "contagem insuficiente de %s iten
msgid "underflow on count of %s items to receive"
msgstr "contagem insuficiente de %s itens a receber"
-#: netsync.cc:1261 netsync.cc:1269
+#: netsync.cc:1260 netsync.cc:1268
#, c-format
msgid "received network error: %s"
msgstr "erro de rede recebido: %s"
-#: netsync.cc:1304
+#: netsync.cc:1296
#, c-format
msgid ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -2704,12 +2685,12 @@ msgstr ""
"Eu esperava %s\n"
"'%s unset %s %s' sobrecarrega este teste"
-#: netsync.cc:1314
+#: netsync.cc:1306
#, c-format
msgid "server key changed"
msgstr "a chave do servidor mudou"
-#: netsync.cc:1319
+#: netsync.cc:1311
#, c-format
msgid ""
"first time connecting to server %s\n"
@@ -2720,53 +2701,53 @@ msgstr ""
"vou supor que é mesmo ele, mas você pode querer verificar\n"
"a impressão digital da chave deles: %s"
-#: netsync.cc:1326
+#: netsync.cc:1318
#, c-format
msgid "saving public key for %s to database"
msgstr "gravando chave pública de %s no banco de dados"
-#: netsync.cc:1429
+#: netsync.cc:1420
#, c-format
msgid "rejected attempt at anonymous connection for write"
msgstr "tentativa de conexão anônima para gravação foi rejeitada"
-#: netsync.cc:1436
+#: netsync.cc:1427
#, c-format
msgid "rejected attempt at anonymous connection while running as sink"
msgstr ""
"tentativa de conexão anônima enquanto executando como\n"
"sorvedouro foi rejeitada"
-#: netsync.cc:1452
+#: netsync.cc:1442
#, c-format
msgid "anonymous access to branch '%s' denied by server"
msgstr "acesso anônimo ao ramo '%s' negado pelo servidor"
-#: netsync.cc:1460
+#: netsync.cc:1450
#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'"
msgstr ""
"permissão de leitura anônima para '%s' foi dada\n"
"com exclusão de '%s'"
-#: netsync.cc:1466
+#: netsync.cc:1456
#, c-format
msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
msgstr ""
"permissão de leitura/escrita anônima para '%s' foi dada\n"
"com exclusão de '%s'"
-#: netsync.cc:1531
+#: netsync.cc:1519
#, c-format
msgid "remote public key hash '%s' is unknown"
msgstr "hash da chave remota '%s' é desconhecido"
-#: netsync.cc:1549
+#: netsync.cc:1537
#, c-format
msgid "detected replay attack in auth netcmd"
msgstr "detectado ataque de repetição no comando de autenticação"
-#: netsync.cc:1571
+#: netsync.cc:1559
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -2775,7 +2756,7 @@ msgstr ""
"negada a '%s' permissão de leitura para '%s' excluindo '%s'\n"
"enquanto executando como saÃda pura"
-#: netsync.cc:1584
+#: netsync.cc:1574
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
@@ -2783,12 +2764,12 @@ msgstr ""
"negada a '%s' permissão de leitura para '%s' excluindo '%s' por causa\n"
"do ramo '%s'"
-#: netsync.cc:1594
+#: netsync.cc:1584
#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'"
msgstr "permitida a '%s' permissão de leitura para '%s' excluindo '%s'"
-#: netsync.cc:1605
+#: netsync.cc:1595
#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
@@ -2797,144 +2778,144 @@ msgstr ""
"negada a '%s' permissão de escrita para '%s' excluindo '%s' durante\n"
"execução como fonte puro"
-#: netsync.cc:1613
+#: netsync.cc:1603
#, c-format
msgid "denied '%s' write permission for '%s' excluding '%s'"
msgstr "negada a '%s' permissão de escrita para '%s' excluindo '%s'"
-#: netsync.cc:1617
+#: netsync.cc:1607
#, c-format
msgid "allowed '%s' write permission for '%s' excluding '%s'"
msgstr "permitida a '%s' permissão de escrita para '%s' excluindo '%s'"
-#: netsync.cc:1641
+#: netsync.cc:1631
#, c-format
msgid "bad client signature"
msgstr "assinatura do cliente inválida"
-#: netsync.cc:1657
+#: netsync.cc:1647
#, c-format
msgid "Unexpected 'refine' command on non-refined item type"
msgstr "Comando 'refinar' não esperado em tipo de item não-refinado"
-#: netsync.cc:1754
+#: netsync.cc:1744
#, c-format
msgid "unknown bye phase %d received"
msgstr "fase de despedida desconhecida %d recebida"
-#: netsync.cc:1769
+#: netsync.cc:1759
#, c-format
msgid "Unexpected 'done' command on non-refined item type"
msgstr "Comando 'feito' inesperado em tipo de item não-refinado"
-#: netsync.cc:1841
+#: netsync.cc:1831
#, c-format
msgid "%s with hash '%s' does not exist in our database"
msgstr "%s com hash '%s' não existe no banco de dados"
-#: netsync.cc:1945
+#: netsync.cc:1935
#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
msgstr "Ãpocas não combinam no ramo %s. Servidor tem '%s', cliente tem '%s'."
-#: netsync.cc:1963
+#: netsync.cc:1953
#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
msgstr ""
"teste de hash falhou para chave pública '%s' (%s);\n"
"esperado '%s', recebido '%s'"
-#: netsync.cc:1977
+#: netsync.cc:1967
#, c-format
msgid "hash check failed for revision cert '%s'"
msgstr "verificação do hash falhou para o certificado '%s' da versão"
-#: netsync.cc:2039
+#: netsync.cc:2029
#, c-format
msgid "Received warning from usher: %s"
msgstr "Recebido aviso do usher: %s"
-#: netsync.cc:2126 netsync.cc:2157
+#: netsync.cc:2116 netsync.cc:2147
msgid "source and sink"
msgstr "entrada e saÃda"
-#: netsync.cc:2127 netsync.cc:2158
+#: netsync.cc:2117 netsync.cc:2148
msgid "source"
msgstr "entrada"
-#: netsync.cc:2127 netsync.cc:2158
+#: netsync.cc:2117 netsync.cc:2148
msgid "sink"
msgstr "saÃda"
-#: netsync.cc:2314
+#: netsync.cc:2304
#, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch"
msgstr ""
"buffer de entrada do par %s está cheio após despacho de comando de rede"
-#: netsync.cc:2326 netsync.cc:2425
+#: netsync.cc:2316 netsync.cc:2415
#, c-format
msgid "protocol error while processing peer %s: '%s'"
msgstr "erro de protocolo durante processamento do par %s: '%s'"
-#: netsync.cc:2332
+#: netsync.cc:2322
#, c-format
msgid "error: %s"
msgstr "erro: %s"
-#: netsync.cc:2396
+#: netsync.cc:2386
#, c-format
msgid "connecting to %s"
msgstr "conectando a %s"
-#: netsync.cc:2440
+#: netsync.cc:2430
#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting"
msgstr "tempo expirou esperando por E/S com par %s, desconectando"
-#: netsync.cc:2463
+#: netsync.cc:2453
#, c-format
msgid "processing failure while talking to peer %s, disconnecting"
msgstr "erro de processamento durante comunicação com par %s, desconectando"
-#: netsync.cc:2480
+#: netsync.cc:2470
#, c-format
msgid "successful exchange with %s"
msgstr "comunicação feita com sucesso com %s"
-#: netsync.cc:2486
+#: netsync.cc:2476
#, c-format
msgid "peer %s disconnected after we informed them of error"
msgstr "par %s desconectou após nós o termos informado de um erro"
-#: netsync.cc:2491
+#: netsync.cc:2481
#, c-format
msgid "I/O failure while talking to peer %s, disconnecting"
msgstr "erro de E/S comunicando com par %s, desconectando"
-#: netsync.cc:2557
+#: netsync.cc:2547
#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad"
msgstr "erro de protocolo processando par %s: '%s', marcado como inválido"
-#: netsync.cc:2589
+#: netsync.cc:2579
#, c-format
msgid "accepted new client connection from %s : %s"
msgstr "nova conexão do cliente %s aceita: %s"
-#: netsync.cc:2626
+#: netsync.cc:2616
#, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting"
msgstr ""
"erro do protocolo durante o processamento do par %s:\n"
"'%s', desconectando"
-#: netsync.cc:2637
+#: netsync.cc:2627
#, c-format
msgid "peer %s read failed in working state (error)"
msgstr "leitura do par %s falhou no estado trabalhando (erro)"
-#: netsync.cc:2642
+#: netsync.cc:2632
#, c-format
msgid ""
"peer %s read failed in shutdown state (possibly client misreported error)"
@@ -2942,17 +2923,17 @@ msgstr ""
"leitura do par %s falhou no estado de encerramento (provavelmente o\n"
"cliente reportou o erro erroneamente)"
-#: netsync.cc:2648
+#: netsync.cc:2638
#, c-format
msgid "peer %s read failed in confirmed state (success)"
msgstr "leitura do par %s falhou no estado confirmado (sucesso)"
-#: netsync.cc:2669
+#: netsync.cc:2659
#, c-format
msgid "peer %s write failed in working state (error)"
msgstr "escrita no par %s falhou no estado trabalhando (erro)"
-#: netsync.cc:2674
+#: netsync.cc:2664
#, c-format
msgid ""
"peer %s write failed in shutdown state (possibly client misreported error)"
@@ -2960,70 +2941,70 @@ msgstr ""
"escrita no par %s falhou no estado de encerramento (provavelmente o\n"
"cliente reportou o erro erroneamente)"
-#: netsync.cc:2680
+#: netsync.cc:2670
#, c-format
msgid "peer %s write failed in confirmed state (success)"
msgstr "escrita no par %s falhou em um estado confirmado (sucesso)"
-#: netsync.cc:2707
+#: netsync.cc:2697
#, c-format
msgid "peer %s processing finished, disconnecting"
msgstr "processamento do par %s terminou, desconectando"
-#: netsync.cc:2729
+#: netsync.cc:2719
#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting"
msgstr "fd %d (par %s) tem estado parado por muito tempo, desconectando"
-#: netsync.cc:2797
+#: netsync.cc:2787
#, c-format
msgid "beginning service on %s : %s"
msgstr "iniciando serviço em %s : %s"
-#: netsync.cc:2798
+#: netsync.cc:2788
msgid ""
msgstr ""
-#: netsync.cc:2812
+#: netsync.cc:2802
#, c-format
msgid "session limit %d reached, some connections will be refused"
msgstr "limite %d da sessão alcançado, algumas conexões serão recusadas"
-#: netsync.cc:2879
+#: netsync.cc:2869
#, c-format
msgid "Network error on peer %s, disconnecting"
msgstr "Erro de rede no par %s, desconectando"
-#: netsync.cc:2885
+#: netsync.cc:2875
#, c-format
msgid "got OOB from peer %s, disconnecting"
msgstr "recebido OOB do par %s, desconectando"
-#: netsync.cc:2945
+#: netsync.cc:2935
#, c-format
msgid "beginning service on %s"
msgstr "iniciando serviço em %s"
-#: netsync.cc:3008
+#: netsync.cc:2998
#, c-format
msgid "got some OOB data on fd %d (peer %s), disconnecting"
msgstr "recebidos alguns dados OOB no fd %d (par %s), desconectando"
-#: netsync.cc:3057
+#: netsync.cc:3047
#, c-format
msgid "finding items to synchronize:"
msgstr "encontrando itens para sincronizar:"
-#: netsync.cc:3065
+#: netsync.cc:3055
msgid "certificates"
msgstr "certificados"
-#: netsync.cc:3178
+#: netsync.cc:3164
#, c-format
msgid "Cannot find key '%s'"
msgstr "ImpossÃvel achar chave '%s'"
-#: netsync.cc:3218
+#: netsync.cc:3204
#, c-format
msgid ""
"include branch pattern contains a quote character:\n"
@@ -3032,7 +3013,7 @@ msgstr ""
"padrão de inclusão de ramos contém um caractere de aspas:\n"
"%s"
-#: netsync.cc:3224
+#: netsync.cc:3210
#, c-format
msgid ""
"exclude branch pattern contains a quote character:\n"
@@ -3041,7 +3022,7 @@ msgstr ""
"padrão de exclusão de ramos contém um caractere de aspas:\n"
"%s"
-#: netsync.cc:3259 netsync.cc:3263
+#: netsync.cc:3245 netsync.cc:3249
#, c-format
msgid "network error: %s"
msgstr "erro de rede: %s"
@@ -3358,22 +3339,22 @@ msgstr "falha de leitura %d:%d: palavra
msgid "parse failure %d:%d: expecting word"
msgstr "falha de leitura %d:%d: palavra esperada"
-#: rcs_import.cc:721
+#: rcs_import.cc:722
#, c-format
msgid "parsing RCS file %s"
msgstr "lendo arquivo RCS %s"
-#: rcs_import.cc:724
+#: rcs_import.cc:725
#, c-format
msgid "parsed RCS file %s OK"
msgstr "arquivo RCS %s lido OK"
-#: rcs_import.cc:913
+#: rcs_import.cc:914
#, c-format
msgid "error reading RCS file %s: %s"
msgstr "erro lendo arquivo RCS %s: %s"
-#: rcs_import.cc:1210
+#: rcs_import.cc:1211
#, c-format
msgid ""
"%s appears to be a CVS repository root directory\n"
@@ -3382,17 +3363,17 @@ msgstr ""
"%s aparenta ser um diretório raiz do CVS\n"
"tente ao invés importar um módulo com cvs_import %s/"
-#: rcs_import.cc:1222
+#: rcs_import.cc:1223
#, c-format
msgid "need base --branch argument for importing"
msgstr "opção --branch necessária para importação"
-#: rcs_import.cc:1234
+#: rcs_import.cc:1235
#, c-format
msgid "path %s does not exist"
msgstr "caminho %s não existe"
-#: rcs_import.cc:1269
+#: rcs_import.cc:1270
msgid "tags"
msgstr "etiquetas"
@@ -3522,10 +3503,6 @@ msgstr "mal-uso:"
msgid "misuse: "
msgstr "mal-uso:"
-#: sanity.cc:234
-msgid "error: "
-msgstr "erro:"
-
#: sanity.cc:242
#, c-format
msgid "%s:%d: invariant '%s' violated"
@@ -3541,54 +3518,155 @@ msgstr "Conjunto de trabalho atual: %i i
msgid "Current work set: %i items"
msgstr "Conjunto de trabalho atual: %i itens"
-#: schema_migration.cc:258
+#: selectors.cc:43
+#, fuzzy, c-format
+msgid "expanded selector '%s' -> '%s'"
+msgstr "expandindo seleção '%s'"
+
+#: selectors.cc:80
+#, fuzzy, c-format
+msgid "unknown selector type: %c"
+msgstr "tipo de pacote desconhecido: '%s'"
+
+#: selectors.cc:89
+#, fuzzy, c-format
+msgid "selector '%s' is not a valid date\n"
+msgstr "raiz da procura '%s' não é um diretório"
+
+#: selectors.cc:95
#, c-format
-msgid "calculating necessary migration steps"
-msgstr "calculando passos necessários para migração"
+msgid "selector '%s' is not a valid date (%s)"
+msgstr ""
-#: schema_migration.cc:270
+#: selectors.cc:98
+#, fuzzy, c-format
+msgid "expanded date '%s' -> '%s'\n"
+msgstr "id parcial '%s' expandido para '%s'"
+
+#: schema_migration.cc:78
+msgid ""
+"make sure database and containing directory are writeable\n"
+"and you have not run out of disk space"
+msgstr ""
+"certifique-se de que o banco de dados e o diretório continente podem\n"
+"ser escritos e você ainda tem espaço livre do disco"
+
+#: schema_migration.cc:88
+msgid ""
+"(if this is a database last used by monotone 0.16 or older,\n"
+"you must follow a special procedure to make it usable again.\n"
+"see the file UPGRADE, in the distribution, for instructions.)"
+msgstr ""
+
+#: schema_migration.cc:97
#, c-format
-msgid "error at transaction BEGIN statement"
-msgstr "erro no comando BEGIN da transação"
+msgid ""
+"sqlite error: %s\n"
+"%s"
+msgstr ""
+"erro da sqlite: %s\n"
+"%s"
-#: schema_migration.cc:271
+#: schema_migration.cc:511
#, c-format
-msgid "migrating data"
-msgstr "migrando dados"
+msgid "public and private keys for %s don't match"
+msgstr "chaves pública e privada de %s não combinam"
-#: schema_migration.cc:297
+#: schema_migration.cc:513
#, c-format
-msgid "migration step failed: %s"
-msgstr "passo da migração falhou: %s"
+msgid "moving key '%s' from database to %s"
+msgstr "movendo chave '%s' do banco de dados para %s"
-#: schema_migration.cc:311
+#: schema_migration.cc:889
#, c-format
-msgid "mismatched result of migration, got %s, wanted %s"
-msgstr "resultado da migração está errado, recebido %s, o esperado era %s"
+msgid "%s (usable)"
+msgstr ""
-#: schema_migration.cc:314
+#: schema_migration.cc:891
#, c-format
-msgid "committing changes to database"
-msgstr "gravando mudanças no banco de dados"
+msgid "%s (migration needed)"
+msgstr ""
-#: schema_migration.cc:316
+#: schema_migration.cc:893
#, c-format
-msgid "failure on COMMIT"
-msgstr "erro em COMMIT"
+msgid "%s (too new, cannot use)"
+msgstr ""
-#: schema_migration.cc:318
+#: schema_migration.cc:895
+#, fuzzy, c-format
+msgid "%s (not a monotone database)"
+msgstr "configura nome do banco de dados"
+
+#: schema_migration.cc:897
#, c-format
-msgid "optimizing database"
-msgstr "otimizando banco de dados"
+msgid "%s (database has no tables!)"
+msgstr ""
-#: schema_migration.cc:320
+#: schema_migration.cc:910
#, c-format
-msgid "error vacuuming after migration"
-msgstr "erro fazendo limpeza após migração"
+msgid ""
+"cannot use the empty sqlite database %s\n"
+"(monotone databases must be created with '%s db init')"
+msgstr ""
-#: schema_migration.cc:329
+#: schema_migration.cc:915
+#, fuzzy, c-format
+msgid "%s does not appear to be a monotone database\n"
+msgstr "chave '%s' não é igual à chave '%s' no banco de dados"
+
+#: schema_migration.cc:919
#, c-format
msgid ""
+"%s appears to be a monotone database, but this version of\n"
+"monotone does not recognize its schema.\n"
+"you probably need a newer version of monotone."
+msgstr ""
+
+#: schema_migration.cc:938
+#, fuzzy, c-format
+msgid ""
+"database %s is laid out according to an old schema\n"
+"try '%s db migrate' to upgrade\n"
+"(this is irreversible; you may want to make a backup copy first)"
+msgstr ""
+"o leiaute do banco de dados %s não combina com esta versão do monotone\n"
+"pedido esquema %s, conseguido %s\n"
+"tente '%s db migrate' para atualizar\n"
+"(isto é irreversÃvel, uma cópia de segurança pode ser necessária)"
+
+#: schema_migration.cc:960
+#, fuzzy, c-format
+msgid "calculating migration..."
+msgstr "calculando passos necessários para migração"
+
+#: schema_migration.cc:973
+#, fuzzy, c-format
+msgid "no migration performed; database schema already up-to-date"
+msgstr "migração não executada, esquema do banco de dados já atualizado com %s"
+
+#: schema_migration.cc:980
+#, fuzzy, c-format
+msgid "migrating data..."
+msgstr "migrando dados"
+
+#: schema_migration.cc:1002
+#, fuzzy, c-format
+msgid "migrated to schema %s"
+msgstr "passo da migração falhou: %s"
+
+#: schema_migration.cc:1005
+#, c-format
+msgid "committing changes to database"
+msgstr "gravando mudanças no banco de dados"
+
+#: schema_migration.cc:1009
+#, c-format
+msgid "optimizing database"
+msgstr "otimizando banco de dados"
+
+#: schema_migration.cc:1019
+#, 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'"
@@ -3597,7 +3675,7 @@ msgstr ""
"antiga de monotone, não acabou ainda. SE você é o lÃder do projeto, então\n"
"veja o arquivo UPGRADE para instruções sobre executar '%s db %s'"
-#: schema_migration.cc:336
+#: schema_migration.cc:1026
#, c-format
msgid ""
"NOTE: this upgrade cleared monotone's caches\n"
@@ -3606,26 +3684,21 @@ msgstr ""
"NOTA: esta atualização limpou o cache do monotone\n"
"você deve executar agora '%s db regenerate_caches'"
-#: schema_migration.cc:349
+#: schema_migration.cc:1057
#, c-format
-msgid "database schema %s is unknown; cannot perform migration"
-msgstr "esquema do banco de dados %s desconhecido; impossÃvel migrar"
+msgid "cannot test migration from unknown schema %s"
+msgstr ""
-#: schema_migration.cc:354
+#: schema_migration.cc:1060
#, c-format
-msgid "no migration performed; database schema already up-to-date at %s"
-msgstr "migração não executada, esquema do banco de dados já atualizado com %s"
+msgid "schema %s is up to date"
+msgstr ""
-#: schema_migration.cc:913
-#, c-format
-msgid "public and private keys for %s don't match"
-msgstr "chaves pública e privada de %s não combinam"
+#: schema_migration.cc:1071
+#, fuzzy, c-format
+msgid "successful migration to schema %s"
+msgstr "comunicação feita com sucesso com %s"
-#: schema_migration.cc:916
-#, c-format
-msgid "moving key '%s' from database to %s"
-msgstr "movendo chave '%s' do banco de dados para %s"
-
#: std_hooks.lua:39
msgid "Press enter"
msgstr "Pressione enter"
@@ -3634,6 +3707,16 @@ msgstr "Por favor pressione quan
msgid "Press enter when the subprocess has completed"
msgstr "Por favor pressione quando o subprocesso terminar"
+#: transforms.cc:91
+#, c-format
+msgid ""
+"%s\n"
+"this may be due to a memory glitch, data corruption during\n"
+"a network transfer, corruption of your database or workspace,\n"
+"or a bug in monotone. if the error persists, please contact\n"
+"%s for assistance.\n"
+msgstr ""
+
#: ui.cc:158
#, c-format
msgid "%.1f G"
@@ -3686,12 +3769,12 @@ msgstr ""
msgid "The URI syntax is invalid. Maybe you used an URI in scp-style?"
msgstr ""
-#: update.cc:72
+#: update.cc:71
#, c-format
msgid "failed to decode boolean testresult cert value '%s'"
msgstr "erro decodificando o valor booleano do certificado testresult '%s'"
-#: update.cc:166
+#: update.cc:160
#, c-format
msgid "cannot determine branch for update"
msgstr "impossÃvel determinar ramo para atualização"
@@ -3829,18 +3912,33 @@ msgstr "modificando %s"
msgid "modifying %s"
msgstr "modificando %s"
-#: work.cc:983
-#, c-format
-msgid "missing %s"
-msgstr "%s está faltando"
+#: work.cc:984
+#, fuzzy, c-format
+msgid "missing directory '%s'"
+msgstr "diretório inválido ''"
#: work.cc:989
-#, c-format
+#, fuzzy, c-format
+msgid "not a directory '%s'"
+msgstr "não foi possÃvel criar diretório '%s'"
+
+#: work.cc:1002
+#, fuzzy, c-format
+msgid "missing file '%s'"
+msgstr "%d arquivos desaparecidos"
+
+#: work.cc:1007
+#, fuzzy, c-format
+msgid "not a file '%s'"
+msgstr "arquivo '%s' não existe"
+
+#: work.cc:1018
+#, fuzzy, 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"
+"%d missing items; use '%s ls missing' to view\n"
+"To restore consistency, on each missing item run either\n"
+" '%s drop ITEM' to remove it permanently, or\n"
+" '%s revert ITEM' to restore it.\n"
"To handle all at once, simply use\n"
" '%s drop --missing' or\n"
" '%s revert --missing'"
@@ -3853,92 +3951,92 @@ msgstr ""
" '%s drop --missing' ou\n"
" '%s revert --missing'"
-#: work.cc:1135
+#: work.cc:1164
#, c-format
msgid "skipping %s, not currently tracked"
msgstr "pulando %s, não é versionado atualmente"
-#: work.cc:1145
+#: work.cc:1174
#, c-format
msgid "cannot remove %s/, it is not empty"
msgstr "impossÃvel remover %s/, não está vazio"
-#: work.cc:1156
+#: work.cc:1185
#, c-format
msgid "dropping %s from workspace manifest"
msgstr "removendo %s da listagem da área de trabalho"
-#: work.cc:1209
+#: work.cc:1238
#, c-format
msgid "destination dir %s/ is not versioned (perhaps add it?)"
msgstr "diretório de destino %s/ não está versionado (adicione-o?)"
-#: work.cc:1212
+#: work.cc:1241
#, c-format
msgid "destination %s is an existing file in current revision"
msgstr "destino %s é um arquivo existente na versão atual"
-#: work.cc:1222
+#: work.cc:1251
#, c-format
msgid "empty path %s is not allowed"
msgstr "caminho vazio %s não permitido"
-#: work.cc:1236
+#: work.cc:1265
#, c-format
msgid "%s does not exist in current manifest"
msgstr "%s não existe na listagem atual"
-#: work.cc:1239
+#: work.cc:1268
#, c-format
msgid "destination %s already exists in current manifest"
msgstr "destino %s já existe na listagem atual"
-#: work.cc:1245
+#: work.cc:1274
#, c-format
msgid "destination directory %s does not exist in current manifest"
msgstr "diretório de destino %s não existe na listagem atual"
-#: work.cc:1247
+#: work.cc:1276
#, c-format
msgid "destination directory %s is not a directory"
msgstr "diretório de destino %s não é um diretório"
-#: work.cc:1256
+#: work.cc:1285
#, c-format
msgid "renaming %s to %s in workspace manifest"
msgstr "renomeando %s para %s na listagem da área de trabalho"
-#: work.cc:1284
+#: work.cc:1313
#, c-format
msgid "%s doesn't exist in workspace, skipping"
msgstr "%s não existe na área de trabalho, pulando"
-#: work.cc:1288
+#: work.cc:1317
#, c-format
msgid "destination %s already exists in workspace, skipping"
msgstr "destino %s já existe na área de trabalho, pulando"
-#: work.cc:1318
+#: work.cc:1347
#, c-format
msgid "proposed new root directory '%s' is not versioned or does not exist"
msgstr "novo diretório raiz proposto '%s' não está versionado ou não existe"
-#: work.cc:1320
+#: work.cc:1349
#, c-format
msgid "proposed new root directory '%s' is not a directory"
msgstr "novo diretório raiz proposto '%s' não é um diretório"
-#: work.cc:1325
+#: work.cc:1354
#, c-format
msgid "proposed new root directory '%s' contains illegal path %s"
msgstr "novo diretório raiz proposto '%s' contém caminho ilegal %s"
-#: work.cc:1335
+#: work.cc:1364
#, c-format
msgid "directory '%s' is not versioned or does not exist"
msgstr "diretório '%s' não está versionado ou não existe"
-#: work.cc:1341
+#: work.cc:1370
#, c-format
msgid "'%s' is in the way"
msgstr "'%s' está no caminho"
@@ -4026,3 +4124,36 @@ msgstr ""
msgstr ""
"esta área de trabalho está no formato atual, nenhuma migração é necessária"
+#~ msgid "unable to probe database version in file %s"
+#~ msgstr "incapaz de verificar a versão do banco de dados no arquivo %s"
+
+#~ msgid "database %s is not an sqlite version 3 file, try dump and reload"
+#~ msgstr ""
+#~ "banco de dados %s não é um arquivo sqlite versão 3, tente dump e reload"
+
+#~ msgid "could not initialize database: %s: already exists"
+#~ msgstr "erro inicializando banco de dados: %s: já existe"
+
+#~ msgid "cannot create %s; it already exists"
+#~ msgstr "erro criando %s; já existe"
+
+#~ msgid "could not open database '%s': %s"
+#~ msgstr "erro abrindo banco de dados '%s': %s"
+
+#~ msgid "error at transaction BEGIN statement"
+#~ msgstr "erro no comando BEGIN da transação"
+
+#~ msgid "mismatched result of migration, got %s, wanted %s"
+#~ msgstr "resultado da migração está errado, recebido %s, o esperado era %s"
+
+#~ msgid "failure on COMMIT"
+#~ msgstr "erro em COMMIT"
+
+#~ msgid "error vacuuming after migration"
+#~ msgstr "erro fazendo limpeza após migração"
+
+#~ msgid "database schema %s is unknown; cannot perform migration"
+#~ msgstr "esquema do banco de dados %s desconhecido; impossÃvel migrar"
+
+#~ msgid "missing %s"
+#~ msgstr "%s está faltando"
============================================================
--- po/sv.po c87549f438485fb45e1639623a6c876bd6c9ccb9
+++ po/sv.po b619fd2916f7e6a70b5024d8e75a1590e5e449b7
@@ -147,7 +147,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: monotone 0.26pre1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-22 08:15+0100\n"
+"POT-Creation-Date: 2007-01-23 08:09-0800\n"
"PO-Revision-Date: 2007-01-22 08:22+0100\n"
"Last-Translator: Joel Rosdahl \n"
"Language-Team: Richard Levitte \n"
@@ -2258,6 +2258,10 @@ msgstr "fel: "
msgid "error: "
msgstr "fel: "
+#: database.cc:488
+msgid "sqlite error: "
+msgstr "sqlite-fel: "
+
#: database.cc:512
msgid "not set"
msgstr "ej tilldelat "
@@ -2554,7 +2558,7 @@ msgstr "fick felet %s när sökväg för
msgid "caught runtime error %s constructing file path for %s"
msgstr "fick felet %s när sökväg för %s byggdes"
-#: file_io.cc:547 work.cc:1112
+#: file_io.cc:540 work.cc:1112
#, c-format
msgid "no such file or directory: '%s'"
msgstr "ingen sådan fil eller katalog: '%s'"