#
#
# patch "ChangeLog"
# from [cdf79136b6e6114dde54e55b1e3dd26b1a52a8ee]
# to [a6404175608584988a7d6d3aa09910a4bc33ce99]
#
# patch "po/ja.po"
# from [636a1ccfd6ffff4fc79244bbffb117ed3eea7d52]
# to [be680168510cd01818f1886624d49d8bff014123]
#
============================================================
--- ChangeLog cdf79136b6e6114dde54e55b1e3dd26b1a52a8ee
+++ ChangeLog a6404175608584988a7d6d3aa09910a4bc33ce99
@@ -1,3 +1,7 @@
+2006-04-07 Satoru SATOH
+
+ * po/ja.po: Updated Japanese translation.
+
2006-04-06 Richard Levitte
* ui.cc (user_interface::output_prefix): Move the invariant
============================================================
--- po/ja.po 636a1ccfd6ffff4fc79244bbffb117ed3eea7d52
+++ po/ja.po be680168510cd01818f1886624d49d8bff014123
@@ -1,14 +1,14 @@
# ja.po for monotone
# Copyright (C) 2005 Graydon Hoare
# This file is distributed under the same license as the monotone package.
-# Satoru SATOH , 2005.
+# Satoru SATOH , 2005, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: monotone HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-29 14:41-0800\n"
-"PO-Revision-Date: 2005-09-21 14:55+0900\n"
+"POT-Creation-Date: 2006-04-06 22:39+0900\n"
+"PO-Revision-Date: 2006-04-06 22:47+0900\n"
"Last-Translator: Satoru SATOH \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
@@ -16,136 +16,71 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app_state.cc:66
+#: app_state.cc:119
#, c-format
-msgid "initializing from directory %s\n"
-msgstr "ãã£ã¬ã¯ã㪠%s ããåæåä¸\n"
+msgid "workspace required but not found%s%s"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ãå¿
è¦ã§ããã¿ã¤ããã¾ããã§ãã%s%s"
-#: app_state.cc:87
+#: app_state.cc:127
#, c-format
-msgid "branch name is '%s'\n"
-msgstr "ãã©ã³ãå㯠'%s' ã§ã\n"
-
-#: app_state.cc:94
-#, c-format
-msgid "setting dump path to %s\n"
-msgstr "ãã³ããã¹ã %s ã«è¨å®\n"
-
-#: app_state.cc:108
-#, c-format
-msgid "working copy directory required but not found%s%s"
-msgstr "ä½æ¥ã³ãã¼ãã£ã¬ã¯ããªãå¿
è¦ã§ãããã¿ã¤ããã¾ããã§ãã: %s%s"
-
-#: app_state.cc:116
-#, c-format
msgid "invalid directory ''"
msgstr "ç¡å¹ãªãã£ã¬ã¯ã㪠''"
-#: app_state.cc:118
+#: app_state.cc:135
#, c-format
-msgid "creating working copy in %s\n"
-msgstr "%s å
ã«ä½æ¥ã³ãã¼ãä½æ\n"
-
-#: app_state.cc:124
-#, c-format
msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
msgstr "monotone è¨é²ç°¿ç¨ãã£ã¬ã¯ã㪠'%s' ã¯æ¢ã« '%s' å
ã«åå¨ãã¦ãã¾ã\n"
-#: app_state.cc:127
+#: app_state.cc:174 app_state.cc:189
#, c-format
-msgid "creating bookkeeping directory '%s' for working copy in '%s'\n"
-msgstr "ä½æ¥ã³ãã¼ã®è¨é²ç°¿ç¨ãã£ã¬ã¯ã㪠'%s' ã '%s' å
ã«ä½æ\n"
-
-#: app_state.cc:158
-#, c-format
-msgid "'%s' ignored by restricted path set\n"
-msgstr "'%s' ã¯å¶éãã¹ã»ããã«ãã£ã¦ç¡è¦ããã¾ãã\n"
-
-#: app_state.cc:163 app_state.cc:181
-#, c-format
msgid "unknown path '%s'\n"
msgstr "ä¸æãªãã¹ '%s'\n"
-#: app_state.cc:165
+#: app_state.cc:350
#, c-format
-msgid "'%s' added to restricted path set\n"
-msgstr "'%s' ãå¶éãã¹ã»ããã«è¿½å ãã¾ãã\n"
-
-#: app_state.cc:176
-#, c-format
-msgid "'%s' ignored by excluded path set\n"
-msgstr "'%s' ã¯é¤å¤ãã¹ã»ããã«ãã£ã¦ç¡è¦ããã¾ãã\n"
-
-#: app_state.cc:183
-#, c-format
-msgid "'%s' added to excluded path set\n"
-msgstr "'%s' ãé¤å¤ãã¹ã»ããã«è¿½å ãã¾ãã\n"
-
-#: app_state.cc:210
-#, c-format
-msgid "checking excluded path set for '%s'\n"
-msgstr "'%s' ã«ã¤ãã¦é¤å¤ãã¹ã»ããã調ã¹ã¦ãã¾ã\n"
-
-#: app_state.cc:217 app_state.cc:250
-#, c-format
-msgid "path '%s' found in excluded path set; '%s' excluded\n"
-msgstr "ãã¹ '%s' ã¯é¤å¤ãã¹ã»ããã«å«ã¾ãã¦ãã¾ã; '%s' ã¯é¤å¤ããã¾ã\n"
-
-#: app_state.cc:236
-#, c-format
-msgid "checking restricted path set for '%s'\n"
-msgstr "'%s' ã«ã¤ãã¦å¶éãã¹ã»ããã調ã¹ã¦ãã¾ã\n"
-
-#: app_state.cc:244
-#, c-format
-msgid "path '%s' found in restricted path set; '%s' included\n"
-msgstr "ãã¹ '%s' ã¯å¶éãã¹ã»ããã«å«ã¾ãã¦ãã¾ã; '%s' ã¯å«ãããã¾ã\n"
-
-#: app_state.cc:332
-#, c-format
msgid "search root '%s' does not exist"
msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯åå¨ãã¾ãã"
-#: app_state.cc:333
+#: app_state.cc:351
#, c-format
msgid "search root '%s' is not a directory\n"
msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã\n"
-#: app_state.cc:335
+#: app_state.cc:386
#, c-format
-msgid "set search root to %s\n"
-msgstr "æ¤ç´¢ã«ã¼ãã %s ã«è¨å®\n"
+msgid "failed to parse date string '%s': %s"
+msgstr "ãã¼ã¿æåå '%s' ã®è§£æã«å¤±æ: %s"
-#: app_state.cc:366
+#: app_state.cc:400
#, c-format
msgid "negative depth not allowed\n"
msgstr "æ·±ãã®å¤ãè² ã«ãããã¨ã¯ã§ãã¾ãã\n"
-#: app_state.cc:374
+#: app_state.cc:408
#, c-format
msgid "negative or zero last not allowed\n"
msgstr "æçµå¤ãè² ã¾ãã¯é¶ã«ãããã¨ã¯ã§ãã¾ãã\n"
-#: app_state.cc:497
+#: app_state.cc:416
#, c-format
+msgid "negative or zero next not allowed\n"
+msgstr "次ã®å¤ãè² ã¾ãã¯é¶ã«ãããã¨ã¯ã§ãã¾ãã\n"
+
+#: app_state.cc:552
+#, c-format
msgid "Failed to read options file %s"
msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®è§£æã«å¤±æ"
-#: app_state.cc:514
+#: app_state.cc:569
#, c-format
msgid "Failed to write options file %s"
msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®æ¸ãè¾¼ã¿ã«å¤±æ"
-#: basic_io.cc:26 basic_io.cc:27
+#: basic_io.cc:27
#, c-format
msgid "error in %s:%d:%d:E: %s"
msgstr "ã¨ã©ã¼ %s:%d:%d:E: %s"
-#: cert.cc:51
-#, c-format
-msgid "cert ok\n"
-msgstr "証æ OK\n"
-
#: cert.cc:58
#, c-format
msgid "ignoring bad signature by '%s' on '%s'\n"
@@ -156,21 +91,11 @@
msgid "ignoring unknown signature by '%s' on '%s'\n"
msgstr "'%s' ã«ãã '%s' ã¸ã®ä¸æãªç½²åãç¡è¦ãã¾ã\n"
-#: cert.cc:123
-#, c-format
-msgid "trust function liked %d signers of %s cert on manifest %s\n"
-msgstr "trust function liked %d signers of %s cert on manifest %s\n"
-
#: cert.cc:129
#, c-format
msgid "trust function disliked %d signers of %s cert on manifest %s\n"
msgstr "trust function disliked %d signers of %s cert on manifest %s\n"
-#: cert.cc:176
-#, c-format
-msgid "trust function liked %d signers of %s cert on revision %s\n"
-msgstr "trust function liked %d signers of %s cert on revision %s\n"
-
#: cert.cc:182
#, c-format
msgid "trust function disliked %d signers of %s cert on revision %s\n"
@@ -181,393 +106,158 @@
msgid "calculated cert hash '%s' does not match '%s'"
msgstr "è¨ç®ãã証æããã·ã¥ '%s' 㯠'%s' ã¨ä¸è´ãã¾ãã"
-#: cert.cc:305
+#: cert.cc:347 keys.cc:532
#, c-format
-msgid "cert: signable text %s\n"
-msgstr "証æ: ç½²åããã¹ã %s\n"
+msgid "no key pair '%s' found in key store '%s'"
+msgstr "éµå¯¾ '%s' ã¯éµã®ä¿åå ´æ '%s' ã«ã¯ããã¾ãã"
-#: cert.cc:365
-#, fuzzy, c-format
-msgid "no private key '%s' found in key store or get_priv_key hook"
-msgstr ""
-"ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«ã get_priv_key ããã¯å
ã«ãã¿ã¤ããã¾ãã"
-
-#: cert.cc:375
-#, fuzzy, c-format
-msgid "mismatch between key '%s' in key store and get_key_pair hook"
-msgstr ""
-"ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã®ãã®ã¨ get_priv_key ããã¯å
ã®ãã®ãä¸è´ãã¦ã"
-"ã¾ãã"
-
-#: cert.cc:461
+#: cert.cc:424
#, c-format
msgid ""
"you have no private key to make signatures with\n"
"perhaps you need to 'genkey '"
msgstr ""
+"ç½²åããããã®ç§å¯éµãããã¾ããã\n"
+"ãããã 'genkey <ããªãã®ã¡ã¼ã«ã¢ãã¬ã¹>' ã¨ããå¿
è¦ãããã¾ãã"
-#: cert.cc:464
+#: cert.cc:427
#, c-format
msgid ""
"you have multiple private keys\n"
"pick one to use for signatures by adding '-k' to your command"
msgstr ""
+"è¤æ°ã®ç§å¯éµãããã¾ãã\n"
+"'-k' ãã³ãã³ãã«è¿½å ãã¦ç½²åã«ä½¿ããã®ãé¸æãã¦ä¸ããã"
-#: cert.cc:481
+#: cert.cc:444
#, c-format
msgid "no branch found for empty revision, please provide a branch name"
msgstr "ãªãã¸ã§ã³ã空ã®ãã©ã³ãã¯ããã¾ãã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: cert.cc:490
+#: cert.cc:453
#, c-format
msgid "no branch certs found for revision %s, please provide a branch name"
msgstr ""
"ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æãã¿ã¤ããã¾ãã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: cert.cc:494
+#: cert.cc:457
#, c-format
msgid ""
"multiple branch certs found for revision %s, please provide a branch name"
msgstr "ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æã¯è¤æ°ããã¾ã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: change_set.cc:289
+#: commands.cc:164
#, c-format
-msgid "tid %d: parent %d, type %s, name %s\n"
-msgstr "tid %d: 親 %dãã¿ã¤ã %sãåå %s\n"
-
-#: change_set.cc:315
-#, c-format
-msgid "%d -> %d\n"
-msgstr "%d -> %d\n"
-
-#: change_set.cc:1540
-#, c-format
-msgid "concatenating change sets\n"
-msgstr "å¤æ´ã»ãããçµåä¸\n"
-
-#: change_set.cc:1563
-#, c-format
-msgid "concatenating %d and %d deltas\n"
-msgstr "%d 㨠%d ã®å·®åãçµåä¸\n"
-
-#: change_set.cc:1573
-#, c-format
-msgid "processing delta on %s\n"
-msgstr "%s ã®å·®åãå¦çä¸\n"
-
-#: change_set.cc:1577
-#, c-format
-msgid "delta on %s in first changeset renamed to %s\n"
-msgstr "æåã®å¤æ´ã»ããå
ã® %s ã«ã¤ãã¦ã®å·®å㯠%s ã¸ã®å称å¤æ´ã§ã\n"
-
-#: change_set.cc:1582
-#, c-format
-msgid "discarding delta [%s]->[%s] for deleted file '%s'\n"
-msgstr "å·®å [%s]->[%s] (対象ã¯åé¤ããããã¡ã¤ã« '%s') ãç ´æ£\n"
-
-#: change_set.cc:1600
-#, c-format
-msgid "fusing deltas on %s : %s -> %s and %s -> %s\n"
-msgstr "%s ã®å·®åãèåä¸: %s -> %s 㨠%s -> %s\n"
-
-#: change_set.cc:1614
-#, c-format
-msgid "delta on %s in second changeset copied forward\n"
-msgstr "第äºã®å¤æ´ã»ããå
ã® %s ã®å·®åã®ã³ãã¼ã転éãã¾ãã\n"
-
-#: change_set.cc:1628
-#, c-format
-msgid "finished concatenation\n"
-msgstr "çµåçµäº\n"
-
-#: change_set.cc:1734 change_set.cc:1741
-#, c-format
-msgid "delete of %s dominates rename to %s\n"
-msgstr "%s ã®åé¤ã¯ %s ã¸ã®å称å¤æ´ã決å®ä»ãã¾ã\n"
-
-#: change_set.cc:1751
-#, c-format
-msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'"
-msgstr "ãã¡ã¤ã«ã®ç«¶å '%s' -> '%s' 対 '%s' ã解決ã§ãã¾ãã"
-
-#: change_set.cc:1755
-#, c-format
-msgid "unable to resolve dir conflict '%s' -> '%s' vs. '%s'"
-msgstr "ãã£ã¬ã¯ããªã®ç«¶å '%s' -> '%s' 対 '%s' ã解決ã§ãã¾ãã"
-
-#: change_set.cc:1760
-#, c-format
-msgid "illegal conflict resolution '%s', wanted '%s' or '%s'\n"
-msgstr "ä¸æ³ãªç«¶åã®è§£æ±º '%s'. '%s' ã¾ã㯠'%s' ã§ããã¹ãã§ã\n"
-
-#: change_set.cc:1816
-#, c-format
-msgid "tid %d (%s) clobbered tid %d (%s)\n"
-msgstr "tid %d (%s) 㯠tid %d (%s) ãä¸æ¸ããã¾ã\n"
-
-#: change_set.cc:1852
-#, c-format
-msgid "skipping common change on %s (tid %d)\n"
-msgstr "%s (tid %d) ã¸ã®å
±éã®å¤æ´ãã¹ããã\n"
-
-#: change_set.cc:1857
-#, c-format
-msgid "skipping neutral change of %s -> %s (tid %d)\n"
-msgstr "ä¸ç«ã®å¤æ´ %s -> %s (tid %d) ãã¹ããã\n"
-
-#: change_set.cc:1864
-#, c-format
-msgid "propagating change on %s -> %s (tid %d)\n"
-msgstr "å¤æ´ãä¼æä¸: %s -> %s (tid %d)\n"
-
-#: change_set.cc:1880
-#, c-format
-msgid "conflict detected, resolved in A's favour\n"
-msgstr "競åãæ¤åº. A ãã¬ã¼ãã§è§£æ±º\n"
-
-#: change_set.cc:1886
-#, c-format
-msgid "conflict detected, resolved in B's favour\n"
-msgstr "競åãæ¤åº. B ãã¬ã¼ãã§è§£æ±º\n"
-
-#: change_set.cc:2053
-#, c-format
-msgid "reusing merge resolution '%s' : '%s' -> '%s'\n"
-msgstr "çµ±åè§£æ±ºæ¡ '%s' ãåå©ç¨ : '%s' -> '%s'\n"
-
-#: change_set.cc:2062
-#, c-format
-msgid "merge of '%s' : '%s' vs. '%s' (no common ancestor) failed"
-msgstr "'%s' ã®çµ±åã«å¤±æ: '%s' 㨠'%s' ãå¯¾ç« (å
±éã®ç¥å
ãªã)"
-
-#: change_set.cc:2069
-#, c-format
-msgid "merge of '%s' : '%s' -> '%s' vs '%s' failed"
-msgstr "'%s' ã®çµ±åã«å¤±æ: '%s' -> '%s' 㨠'%s' ã対ç«"
-
-#: change_set.cc:2073
-#, c-format
-msgid "merge of '%s' : '%s' -> '%s' vs '%s' resolved to '%s'\n"
-msgstr "'%s' ã®çµ±å: '%s' -> '%s' 㨠'%s' ã®å¯¾ç«ã '%s' ã«è§£æ±º\n"
-
-#: change_set.cc:2131
-#, c-format
-msgid "skipping delta '%s'->'%s' on deleted file '%s'\n"
-msgstr "å·®å '%s'->'%s' (対象=åé¤ããããã¡ã¤ã« '%s') ãã¹ããã\n"
-
-#: change_set.cc:2139
-#, c-format
-msgid "merge is copying delta '%s' : '%s' -> '%s'\n"
-msgstr "çµ±åã¯å·®å '%s' : '%s' -> '%s' ã®ã³ãã¼ã§ã\n"
-
-#: change_set.cc:2163
-#, c-format
-msgid "propagating new file addition delta on '%s' : '%s' -> '%s'\n"
-msgstr "'%s' ã®æ°è¦ãã¡ã¤ã«è¿½å å·®åãä¼æä¸: '%s' -> '%s'\n"
-
-#: change_set.cc:2175
-#, c-format
-msgid "skipping new file addition delta on '%s' : '' -> '%s'\n"
-msgstr "'%s' ã®æ°è¦ãã¡ã¤ã«è¿½å å·®åãã¹ããã: '' -> '%s'\n"
-
-#: change_set.cc:2183
-#, c-format
-msgid "skipping common delta '%s' : '%s' -> '%s'\n"
-msgstr "å
±éã®å·®å '%s' ãã¹ããã: '%s' -> '%s'\n"
-
-#: change_set.cc:2189
-#, c-format
-msgid "skipping neutral delta on '%s' : %s -> %s\n"
-msgstr "ä¸ç«ã®å·®å '%s' ãã¹ããã: '%s' -> '%s'\n"
-
-#: change_set.cc:2197
-#, c-format
-msgid "propagating unperturbed delta on '%s' : '%s' -> '%s'\n"
-msgstr "'%s' ã®æåãåããªãå·®åãä¼æä¸: '%s' -> '%s'\n"
-
-#: change_set.cc:2207
-#, c-format
-msgid "merging delta '%s' : '%s' -> '%s' vs. '%s'\n"
-msgstr "å·®å '%s' ãçµ±åä¸: '%s' -> '%s' 対 '%s'\n"
-
-#: change_set.cc:2220
-#, c-format
-msgid "resolved merge to '%s' : '%s' -> '%s'\n"
-msgstr "'%s' ã¸ã®çµ±åã解決ãã¾ãã: '%s' -> '%s'\n"
-
-#: change_set.cc:2249
-#, c-format
-msgid "merging change sets\n"
-msgstr "å¤æ´ã»ãããçµ±åä¸\n"
-
-#: change_set.cc:2311
-#, c-format
-msgid "finished merge\n"
-msgstr "çµ±åçµäº\n"
-
-#: change_set.cc:2330
-#, c-format
-msgid "inverting change set\n"
-msgstr "å¤æ´ã»ãããå転ä¸\n"
-
-#: change_set.cc:2360
-#, c-format
-msgid "converted 'delete %s' to 'add as %s' in inverse\n"
-msgstr "'%s ã®åé¤' ã '%s ã®è¿½å ' (éæ¹å)ã«å¤æãã¾ãã\n"
-
-#: change_set.cc:2369
-#, c-format
-msgid "converted add %s to delete in inverse\n"
-msgstr "%s ã®è¿½å ãåé¤(éæ¹å)ã«å¤æãã¾ãã\n"
-
-#: change_set.cc:2379
-#, c-format
-msgid "converting delta %s -> %s on %s\n"
-msgstr "å·®å %s -> %s (対象 %s) ãå¤æ\n"
-
-#: change_set.cc:2381
-#, c-format
-msgid "inverse is delta %s -> %s on %s\n"
-msgstr "éæ¹åã®å·®å㯠%s -> %s (対象=%s) ã§ã\n"
-
-#: change_set.cc:2447 change_set.cc:2495
-#, c-format
-msgid "moving file %s -> %s\n"
-msgstr "ãã¡ã¤ã«ã移å %s -> %s\n"
-
-#: change_set.cc:2454 change_set.cc:2503
-#, c-format
-msgid "moving dir %s -> %s\n"
-msgstr "ãã£ã¬ã¯ããªã移å %s -> %s\n"
-
-#: commands.cc:136
-#, c-format
-msgid "expanding command '%s'\n"
-msgstr "ã³ãã³ã '%s' ãå±é\n"
-
-#: commands.cc:153
-#, c-format
-msgid "expanded command to '%s'\n"
-msgstr "ã³ãã³ãã '%s' ã«å±é\n"
-
-#: commands.cc:158
-#, c-format
msgid "command '%s' has multiple ambiguous expansions:\n"
msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããã³ãã³ãåè£ã¯è¤æ°ããã¾ã:\n"
-#: commands.cc:201
+#: commands.cc:207
msgid "commands:"
msgstr "ã³ãã³ã:"
-#: commands.cc:246
+#: commands.cc:264
#, c-format
-msgid "executing command '%s'\n"
-msgstr "ã³ãã³ã '%s' ãå®è¡ä¸\n"
-
-#: commands.cc:252
-#, c-format
msgid "unknown command '%s'\n"
msgstr "ä¸æãªã³ãã³ã '%s'\n"
-#: commands.cc:299
+#: commands.cc:326
#, c-format
msgid "pid file '%s' already exists"
msgstr "PID ãã¡ã¤ã« '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: commands.cc:323 commands.cc:1275 commands.cc:1355 commands.cc:1720
-#: commands.cc:2674 commands.cc:3362 commands.cc:3582 commands.cc:3619
+#: commands.cc:350 commands.cc:1359 commands.cc:1429 commands.cc:1865
+#: commands.cc:2711 commands.cc:3364 commands.cc:3599 commands.cc:3638
+#: commands.cc:3983
msgid "informative"
msgstr "æ
å ±"
-#: commands.cc:323
-#, fuzzy
+#: commands.cc:350
msgid "command [ARGS...]"
-msgstr "[OPTION...] command [ARGS...]\n"
+msgstr "command [ARGS...]"
-#: commands.cc:323
-#, fuzzy
+#: commands.cc:350
msgid "display command help"
-msgstr "ãã«ãã¡ãã»ã¼ã¸ã表示"
+msgstr "ã³ãã³ããã«ãã表示"
-#: commands.cc:382
+#: commands.cc:429
msgid ""
"Enter a description of this change.\n"
-"Lines beginning with `MT:' are removed automatically.\n"
+"Lines beginning with `MTN:' are removed automatically.\n"
msgstr ""
"ãã®å¤æ´ã®èª¬æãå
¥åãã¦ä¸ãã\n"
-"'MT:' ã§å§ã¾ãè¡ã¯èªåçã«åé¤ããã¾ã\n"
+"'MTN:' ã§å§ã¾ãè¡ã¯èªåçã«åé¤ããã¾ã\n"
-#: commands.cc:389
+#: commands.cc:436
#, c-format
msgid "edit of log message failed"
msgstr "ãã°ã¡ãã»ã¼ã¸ã®ç·¨éã«å¤±æãã¾ãã"
-#: commands.cc:398
+#: commands.cc:445
msgid "note: "
msgstr "ãã¼ã: "
-#: commands.cc:399
+#: commands.cc:446
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
-"perhaps consider 'monotone merge'"
+"perhaps consider '%s merge'"
msgstr ""
-"ãã©ã³ã '%s' ã«ã¯è¤æ°ã®ææ°çãããã¾ã\n"
-"âmonotone merge' ãå®è¡ããæ¹ãããã§ããã"
+"ãã©ã³ã '%s' ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãããã¾ã\n"
+"â%s merge' ãå®è¡ããæ¹ãããã§ããã"
-#: commands.cc:459 commands.cc:715 commands.cc:1374 commands.cc:1446
-#: commands.cc:1831 commands.cc:2721 commands.cc:2736 commands.cc:2739
-#: commands.cc:2937 commands.cc:3601
+#: commands.cc:507 commands.cc:783 commands.cc:1447 commands.cc:1531
+#: commands.cc:2761 commands.cc:2789 commands.cc:2792 commands.cc:2929
+#: commands.cc:3621
#, c-format
msgid "no such revision '%s'"
msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
-#: commands.cc:466
+#: commands.cc:514
#, c-format
msgid "expanding selection '%s'\n"
msgstr "ã»ã¬ã¯ã·ã§ã³ '%s' ãå±é\n"
-#: commands.cc:474
+#: commands.cc:522
#, c-format
msgid "no match for selection '%s'"
msgstr "ã»ã¬ã¯ã·ã§ã³ '%s' ã«ä¸è´ãããã®ãããã¾ãã"
-#: commands.cc:477
+#: commands.cc:528
#, c-format
-msgid "selection '%s' has multiple ambiguous expansions: \n"
-msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããã»ã¬ã¯ã·ã§ã³ã®åè£ã¯è¤æ°ããã¾ã: \n"
+msgid "expanded to '%s'\n"
+msgstr "'%s' ã«å±é\n"
-#: commands.cc:484
+#: commands.cc:545
#, c-format
-msgid "expanded to '%s'\n"
-msgstr "'%s' ã«å±é\n"
+msgid "selection '%s' has multiple ambiguous expansions: \n"
+msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããã»ã¬ã¯ã·ã§ã³ã®åè£ã¯è¤æ°ããã¾ã: \n"
-#: commands.cc:495
+#: commands.cc:563
#, c-format
msgid "non-hex digits in id"
msgstr "ID ã«åå
é²æ°ãå«ã¾ãã¦ãã¾ãã"
-#: commands.cc:504
+#: commands.cc:572
#, c-format
msgid "partial id '%s' does not have an expansion"
msgstr "é¨å ID '%s' ãä¸ã¤ã® ID ã«å±éãããã¨ã¯ã§ãã¾ãã"
-#: commands.cc:507
+#: commands.cc:575
#, c-format
msgid "partial id '%s' has multiple ambiguous expansions:\n"
msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ãã ID ã®åè£ã¯è¤æ°ããã¾ã:\n"
-#: commands.cc:514
+#: commands.cc:582
#, c-format
msgid "expanded partial id '%s' to '%s'\n"
msgstr "é¨å ID '%s' ã '%s' ã«å±é\n"
-#: commands.cc:541 netsync.cc:1942
+#: commands.cc:609 netsync.cc:1749
#, c-format
msgid "no public key '%s' found in database"
msgstr "ãã¼ã¿ãã¼ã¹å
ã«å
¬ééµ '%s' ã¯ããã¾ãã"
-#: commands.cc:551
+#: commands.cc:619
#, c-format
msgid ""
"Key : %s\n"
@@ -580,125 +270,127 @@
"åå : %s\n"
"å¤ : %s\n"
-#: commands.cc:585
+#: commands.cc:653
msgid "ok"
msgstr "OK"
-#: commands.cc:588
+#: commands.cc:656
msgid "bad"
msgstr "NG"
-#: commands.cc:591
+#: commands.cc:659
msgid "unknown"
msgstr "ä¸æ"
-#: commands.cc:678
+#: commands.cc:746
#, c-format
msgid "(*) - only in %s/"
-msgstr ""
+msgstr "(*) - %s/ å
ã«ã®ã¿åå¨"
-#: commands.cc:701
+#: commands.cc:769
#, c-format
msgid "no keys found\n"
msgstr "éµãã¿ã¤ããã¾ããã§ãã\n"
-#: commands.cc:703
+#: commands.cc:771
#, c-format
msgid "no keys found matching '%s'\n"
msgstr "'%s' ã«ä¸è´ããéµã¯ã¿ã¤ããã¾ããã§ãã\n"
-#: commands.cc:721
+#: commands.cc:789
#, c-format
msgid "revision %s already has children. We cannot kill it."
msgstr "ãªãã¸ã§ã³ %s ã¯æ¢ã«åãæã£ã¦ãã¦åé¤ã§ãã¾ãã"
-#: commands.cc:851 commands.cc:875 commands.cc:912 commands.cc:933
-#: commands.cc:969
+#: commands.cc:929 commands.cc:953 commands.cc:990 commands.cc:1011
+#: commands.cc:1047
msgid "key and cert"
msgstr "éµã¨è¨¼æ"
-#: commands.cc:851 commands.cc:875 commands.cc:912
+#: commands.cc:929 commands.cc:953 commands.cc:990
msgid "KEYID"
msgstr "KEYID"
-#: commands.cc:851
+#: commands.cc:929
msgid "generate an RSA key-pair"
msgstr "éµå¯¾ãçæ"
-#: commands.cc:866
-#, fuzzy, c-format
+#: commands.cc:944
+#, c-format
msgid "key '%s' already exists"
-msgstr "PID ãã¡ã¤ã« '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
+msgstr "éµ '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: commands.cc:869
-#, fuzzy, c-format
+#: commands.cc:947
+#, c-format
msgid "generating key-pair '%s'"
-msgstr "éµå¯¾ '%s' ãçæ\n"
+msgstr "éµå¯¾ '%s' ãçæãã¦ãã¾ã"
-#: commands.cc:871
-#, fuzzy, c-format
+#: commands.cc:949
+#, c-format
msgid "storing key-pair '%s' in %s/"
-msgstr "éµå¯¾ '%s' ããã¼ã¿ãã¼ã¹ã«ä¿å\n"
+msgstr "éµå¯¾ '%s' ã %s/ ã«ä¿åãã¦ãã¾ã"
-#: commands.cc:875
+#: commands.cc:953
msgid "drop a public and private key"
msgstr "å
¬ééµã¨ç§å¯éµãç ´æ£"
-#: commands.cc:889
+#: commands.cc:967
#, c-format
msgid "dropping public key '%s' from database\n"
-msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£\n"
+msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£ãã¦ãã¾ã\n"
-#: commands.cc:899
-#, fuzzy, c-format
+#: commands.cc:977
+#, c-format
msgid "dropping key pair '%s' from keystore\n"
-msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£\n"
+msgstr "éµå¯¾ '%s' ãéµã®ä¿åå ´æããç ´æ£ãã¦ãã¾ã\n"
-#: commands.cc:906
-#, fuzzy, c-format
+#: commands.cc:984
+#, c-format
msgid "public or private key '%s' does not exist in keystore or database"
-msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
+msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯éµã®ä¿åå ´æã«ããã¼ã¿ãã¼ã¹å
ã«ãåå¨ãã¾ãã"
-#: commands.cc:908
-#, fuzzy, c-format
+#: commands.cc:986
+#, c-format
msgid ""
"public or private key '%s' does not exist in keystore, and no database was "
"specified"
-msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
+msgstr ""
+"å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯éµã®ä¿åå ´æã«ã¯åå¨ããããã¼ã¿ãã¼ã¹ãæå®ããã¦ã"
+"ã¾ããã"
-#: commands.cc:913
+#: commands.cc:991
msgid "change passphrase of a private RSA key"
msgstr "ç§å¯ RSA éµã®ãã¹ãã¬ã¼ãºãå¤æ´"
-#: commands.cc:923
-#, fuzzy, c-format
+#: commands.cc:1001
+#, c-format
msgid "key '%s' does not exist in the keystore"
-msgstr "éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«ããã¾ãã"
+msgstr "éµ '%s' ã¯éµã®ä¿åå ´æã«ããã¾ãã"
-#: commands.cc:930
+#: commands.cc:1008
#, c-format
msgid "passphrase changed\n"
msgstr "ãã¹ãã¬ã¼ãºãå¤æ´ãã¾ãã\n"
-#: commands.cc:933
+#: commands.cc:1011
msgid "REVISION CERTNAME [CERTVAL]"
msgstr "REVISION CERTNAME [CERTVAL]"
-#: commands.cc:934
+#: commands.cc:1012
msgid "create a cert for a revision"
msgstr "ãªãã¸ã§ã³ã®è¨¼æãä½æ"
-#: commands.cc:969
+#: commands.cc:1047
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
-#: commands.cc:970
+#: commands.cc:1048
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
msgstr "ç¾å¨ã®è¨å®ã§ä»®æ³è¨¼æãä¿¡é ¼å¯è½ããã¹ã"
-#: commands.cc:1003
+#: commands.cc:1081
#, c-format
msgid ""
"if a cert on: %s\n"
@@ -713,183 +405,199 @@
"ç½²åè
: %s\n"
"ãã£ã¦ãããã %s ã§ããã\n"
-#: commands.cc:1012
+#: commands.cc:1090
msgid "trusted"
msgstr "trusted"
-#: commands.cc:1012
+#: commands.cc:1090
msgid "UNtrusted"
msgstr "UNtrusted"
-#: commands.cc:1015 commands.cc:1028 commands.cc:1040 commands.cc:1057
-#: commands.cc:1103
+#: commands.cc:1093 commands.cc:1106 commands.cc:1119 commands.cc:1136
+#: commands.cc:1187
msgid "review"
msgstr "ã¬ãã¥ã¼"
-#: commands.cc:1015
+#: commands.cc:1093
msgid "REVISION TAGNAME"
msgstr "REVISION TAGNAME"
-#: commands.cc:1016
-msgid "put a symbolic tag cert on a revision version"
-msgstr "象徴çãªã¿ã°è¨¼æããªãã¸ã§ã³ãã¼ã¸ã§ã³ã«ä»å "
+#: commands.cc:1094
+msgid "put a symbolic tag cert on a revision"
+msgstr "è¨å·çãªã¿ã°è¨¼æããªãã¸ã§ã³ã«ä»å "
-#: commands.cc:1028
+#: commands.cc:1106
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr "ID (pass|fail|true|false|yes|no|1|0)"
-#: commands.cc:1029
+#: commands.cc:1107
msgid "note the results of running a test on a revision"
msgstr "ãªãã¸ã§ã³ã®ãã¹ãã®å®è¡çµæãè¨é²"
-#: commands.cc:1040 commands.cc:1057
+#: commands.cc:1119 commands.cc:1136
msgid "REVISION"
msgstr "REVISION"
-#: commands.cc:1041
+#: commands.cc:1120
msgid "approve of a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ãæ¿èª"
-#: commands.cc:1052
+#: commands.cc:1131
#, c-format
msgid "need --branch argument for approval"
msgstr "æ¿èªã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: commands.cc:1058
+#: commands.cc:1137
msgid "disapprove of a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ãéæ¿èª"
-#: commands.cc:1071
+#: commands.cc:1150
#, c-format
msgid "revision '%s' has %d changesets, cannot invert\n"
msgstr "ãªãã¸ã§ã³ '%s' ã«ã¯ %d åã®å¤æ´ã»ããããããå転ã§ãã¾ãã\n"
-#: commands.cc:1075
+#: commands.cc:1154
#, c-format
msgid "need --branch argument for disapproval"
msgstr "éæ¿èªã¨ããã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: commands.cc:1103
+#: commands.cc:1187
msgid "REVISION [COMMENT]"
msgstr "REVISION [COMMENT]"
-#: commands.cc:1104
+#: commands.cc:1188
msgid "comment on a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ã«ã³ã¡ã³ã"
-#: commands.cc:1114
+#: commands.cc:1198
#, c-format
msgid "edit comment failed"
msgstr "ã³ã¡ã³ãç·¨éã«å¤±æ"
-#: commands.cc:1117
+#: commands.cc:1201
#, c-format
msgid "empty comment"
msgstr "空ã®ã³ã¡ã³ã"
-#: commands.cc:1129 commands.cc:1166 commands.cc:1200 commands.cc:1332
-#: commands.cc:2198 commands.cc:2321 commands.cc:2886 commands.cc:3419
-msgid "working copy"
-msgstr "ä½æ¥ã³ãã¼"
+#: commands.cc:1214 commands.cc:1243 commands.cc:1268 commands.cc:1293
+#: commands.cc:2212 commands.cc:2330 commands.cc:2864 commands.cc:3412
+msgid "workspace"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹"
-#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2321
-#: commands.cc:2674 commands.cc:3419
+#: commands.cc:1214 commands.cc:1243 commands.cc:1359 commands.cc:2330
+#: commands.cc:2711 commands.cc:3412
msgid "[PATH]..."
msgstr "[PATH]..."
-#: commands.cc:1130
-msgid "add files to working copy"
-msgstr "ãã¡ã¤ã«ãä½æ¥ã³ãã¼ã«è¿½å "
+#: commands.cc:1215
+msgid "add files to workspace"
+msgstr "ãã¡ã¤ã«ãã¯ã¼ã¯ã¹ãã¼ã¹ã«è¿½å "
-#: commands.cc:1167
-msgid "drop files from working copy"
-msgstr "ãã¡ã¤ã«ãä½æ¥ã³ãã¼ããåé¤"
+#: commands.cc:1244
+msgid "drop files from workspace"
+msgstr "ãã¡ã¤ã«ãã¯ã¼ã¯ã¹ãã¼ã¹ããåé¤"
-#: commands.cc:1200
-msgid "SRC DST"
-msgstr "SRC DST"
+#: commands.cc:1269
+msgid ""
+"SRC DEST\n"
+"SRC1 [SRC2 [...]] DEST_DIR"
+msgstr ""
+"SRC DEST\n"
+"SRC1 [SRC2 [...]] DEST_DIR"
-#: commands.cc:1201
-msgid "rename entries in the working copy"
-msgstr "ä½æ¥ã³ãã¼å
ã®ã¨ã³ããªã®å称ãå¤æ´"
+#: commands.cc:1271
+msgid "rename entries in the workspace"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã®ã¨ã³ããªã®å称ãå¤æ´"
-#: commands.cc:1229 commands.cc:1242 commands.cc:2807 commands.cc:2824
-#: commands.cc:3502
+#: commands.cc:1293
+msgid "NEW_ROOT PUT_OLD"
+msgstr "NEW_ROOT PUT_OLD"
+
+#: commands.cc:1294
+msgid ""
+"rename the root directory\n"
+"after this command, the directory that currently has the name NEW_ROOT\n"
+"will be the root directory, and the directory that is currently the root\n"
+"directory will have name PUT_OLD.\n"
+"Using --execute is strongly recommended."
+msgstr ""
+"ã«ã¼ããã£ã¬ã¯ããªã®å¤æ´\n"
+"ãã®ã³ãã³ãã®å¾ã«ãNEW_ROOT ã¨ããååã§ã«ã¼ããã£ã¬ã¯ããªã«ãªãäºå®ã®\n"
+"ãã£ã¬ã¯ããªã¨ãPUT_OLD ã¨ããååã®ç¾å¨ã®ã«ã¼ããã£ã¬ã¯ããªãæå®ãã¾ãã\n"
+"--execute ã®ä½¿ç¨ãå¼·ãæ¨å¥¨ãã¾ãã"
+
+#: commands.cc:1313 commands.cc:1326 commands.cc:1406 commands.cc:3519
+#: commands.cc:3964
msgid "debug"
msgstr "ãããã°"
-#: commands.cc:1229
+#: commands.cc:1313
msgid "load file contents into db"
msgstr "ãã¡ã¤ã«ã®å
容ããã¼ã¿ãã¼ã¹ã«èªã¿è¾¼ã¿"
-#: commands.cc:1242
+#: commands.cc:1326
msgid " "
msgstr "<親> <å·¦> <å³>"
-#: commands.cc:1243
+#: commands.cc:1327
msgid "merge 3 files and output result"
msgstr "ä¸ã¤ã®ãã¡ã¤ã«ãçµ±åãçµæãåºå"
-#: commands.cc:1253
+#: commands.cc:1337
#, c-format
msgid "ancestor file id does not exist"
msgstr "ç¥å
ã®ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
-#: commands.cc:1256
+#: commands.cc:1340
#, c-format
msgid "left file id does not exist"
msgstr "å·¦ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
-#: commands.cc:1259
+#: commands.cc:1343
#, c-format
msgid "right file id does not exist"
msgstr "å³ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
-#: commands.cc:1270
+#: commands.cc:1354
#, c-format
msgid "merge failed"
msgstr "çµ±å失æ"
-#: commands.cc:1275
-msgid "show status of working copy"
-msgstr "ä½æ¥ã³ãã¼ã®ç¶æ
ã表示"
+#: commands.cc:1359
+msgid "show status of workspace"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ç¶æ
ã表示"
-#: commands.cc:1332
+#: commands.cc:1406
msgid "[PATH]"
msgstr "[PATH]"
-#: commands.cc:1333
+#: commands.cc:1407
msgid "calculate identity of PATH or stdin"
msgstr "PATH ã¾ãã¯æ¨æºå
¥åãèå¥"
-#: commands.cc:1356
+#: commands.cc:1430
msgid "FILENAME"
msgstr "FILENAME"
-#: commands.cc:1357
+#: commands.cc:1431
msgid "write file from database to stdout"
msgstr "ãã¼ã¿ãã¼ã¹ã®ãã¡ã¤ã«ãæ¨æºåºåã«æ¸ãåºã"
-#: commands.cc:1385
+#: commands.cc:1459 commands.cc:1461 commands.cc:3630
#, c-format
msgid "no file '%s' found in revision '%s'\n"
msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã§ã³ '%s' ã«ã¯ããã¾ããã§ãã\n"
-#: commands.cc:1389
-#, c-format
-msgid "dumping file '%s'\n"
-msgstr "ãã¡ã¤ã« '%s' ããã³ã\n"
-
-#: commands.cc:1397 commands.cc:1505 commands.cc:3162 commands.cc:3211
-#: commands.cc:3296 commands.cc:3303 commands.cc:3787
+#: commands.cc:1473 commands.cc:1602 commands.cc:3097 commands.cc:3150
+#: commands.cc:3161 commands.cc:3311 commands.cc:3319 commands.cc:3873
msgid "tree"
msgstr "ããªã¼"
-#: commands.cc:1397
+#: commands.cc:1473
msgid "[DIRECTORY]\n"
msgstr "[DIRECTORY]\n"
-#: commands.cc:1398
+#: commands.cc:1474
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"
@@ -902,82 +610,76 @@
"åãåºãã¾ãããã£ã¬ã¯ããªãæªæå®ãªããã£ã¬ã¯ããªåã¨ãã¦\n"
"ãã©ã³ãåã使ãã¾ã"
-#: commands.cc:1415 commands.cc:1434
+#: commands.cc:1493 commands.cc:1512
#, c-format
msgid "need --branch argument for branch-based checkout"
msgstr "ãã©ã³ããåºæºã«ãããã§ãã¯ã¢ã¦ãã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: commands.cc:1428
+#: commands.cc:1506
#, c-format
msgid "checkout directory '%s' already exists"
msgstr "åãåºããã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: commands.cc:1437 commands.cc:1518 commands.cc:3175 commands.cc:3245
-#: commands.cc:3248
+#: commands.cc:1515
#, c-format
-msgid "branch '%s' is empty\n"
-msgstr "ãã©ã³ã '%s' ã¯ç©ºã§ã\n"
+msgid "branch '%s' is empty"
+msgstr "ãã©ã³ã '%s' ã¯ç©ºã§ã"
-#: commands.cc:1438
+#: commands.cc:1518
#, c-format
-msgid "branch %s has multiple heads"
-msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°çãåå¨ãã¦ãã¾ã"
+msgid "branch %s has multiple heads:"
+msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãåå¨ãã¦ãã¾ã:"
-#: commands.cc:1459
+#: commands.cc:1521
#, c-format
-msgid "found %d %s branch certs on revision %s\n"
-msgstr "%d %s ãã©ã³ã証æããªãã¸ã§ã³ %s ã§ã¿ã¤ããã¾ãã\n"
+msgid "choose one with '%s checkout -r'"
+msgstr "'%s update -r' ã§ä¸ã¤ãé¸æãã¦ä¸ãã"
-#: commands.cc:1464
+#: commands.cc:1522
#, c-format
-msgid "revision %s is not a member of branch %s\n"
-msgstr "ãªãã¸ã§ã³ %s ã¯ãã©ã³ã %s ã«ã¯å±ãã¦ãã¾ãã\n"
+msgid "branch %s has multiple heads"
+msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãåå¨ãã¦ãã¾ã"
-#: commands.cc:1480
+#: commands.cc:1549
#, c-format
-msgid "no manifest %s found in database"
-msgstr "ãããã§ã¹ã %s ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¯ã¿ã¤ããã¾ãã"
+msgid "revision %s is not a member of branch %s\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ãã©ã³ã %s ã«ã¯å±ãã¦ãã¾ãã\n"
-#: commands.cc:1482
+#: commands.cc:1583
#, c-format
-msgid "checking out revision %s to directory %s\n"
-msgstr "ãªãã¸ã§ã³ %s ããã£ã¬ã¯ã㪠%s ã«åãåºãä¸\n"
-
-#: commands.cc:1488
-#, c-format
msgid "no file %s found in database for %s"
msgstr "ãã¡ã¤ã« %s (対象 %s)ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¯ã¿ã¤ããã¾ãã"
-#: commands.cc:1492 commands.cc:3489
-#, c-format
-msgid "writing file %s to %s\n"
-msgstr "ãã¡ã¤ã« %s ã %s ã«æ¸ãè¾¼ã¿ä¸\n"
-
-#: commands.cc:1505
+#: commands.cc:1602
msgid "show unmerged head revisions of branch"
msgstr "ãã©ã³ãã®çµ±åããã¦ããªãææ°ãªãã¸ã§ã³ã表示"
-#: commands.cc:1513 commands.cc:3171
+#: commands.cc:1610 commands.cc:3106
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "--branch=BRANCH ã¨ããããã«ãã©ã³ããæå®ãã¦ä¸ãã"
-#: commands.cc:1520
+#: commands.cc:1615 commands.cc:3110 commands.cc:3199 commands.cc:3202
#, c-format
+msgid "branch '%s' is empty\n"
+msgstr "ãã©ã³ã '%s' ã¯ç©ºã§ã\n"
+
+#: commands.cc:1617
+#, c-format
msgid "branch '%s' is currently merged:\n"
msgstr "ãã©ã³ã '%s' ã¯ç¾å¨çµ±åæ¸ã¿ã§ã:\n"
-#: commands.cc:1522
+#: commands.cc:1619
#, c-format
msgid "branch '%s' is currently unmerged:\n"
msgstr "ãã©ã³ã '%s' ã¯ç¾å¨æªçµ±åã§ã:\n"
-#: commands.cc:1561
+#: commands.cc:1658
#, c-format
msgid "no epoch for branch %s\n"
msgstr "ãã©ã³ã %s 㯠epoch ãæã¡ã¾ãã\n"
-#: commands.cc:1721
+#: commands.cc:1866
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -988,7 +690,8 @@
"known\n"
"unknown\n"
"ignored\n"
-"missing"
+"missing\n"
+"changed"
msgstr ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -999,209 +702,147 @@
"known\n"
"unknown\n"
"ignored\n"
-"missing"
+"missing\n"
+"changed"
-#: commands.cc:1731
+#: commands.cc:1877
msgid ""
-"show database objects, or the current working copy manifest,\n"
-"or unknown, intentionally ignored, or missing state files"
+"show database objects, or the current workspace manifest, or known,\n"
+"unknown, intentionally ignored, missing, or changed state files"
msgstr ""
-"ãã¼ã¿ãã¼ã¹ãªãã¸ã§ã¯ããç¾å¨ã®ä½æ¥ã³ãã¼ã®ãããã§ã¹ãã\n"
-"ä¸æãªãç¡è¦ããããã¾ãã¯å¤±ãªãããç¶æ
ã®ãã¡ã¤ã«ã表示"
+"ãã¼ã¿ãã¼ã¹ãªãã¸ã§ã¯ããç¾å¨ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãã\n"
+"æ¢ç¥ã¾ãã¯ä¸æãªãæå³çã«ç¡è¦ãã¾ãã¯å¤±ãªãããç¶æ
ã®ãã¡ã¤ã«ã表示"
-#: commands.cc:1768 commands.cc:1794 commands.cc:1818 commands.cc:1836
-#: commands.cc:1855 commands.cc:1874 commands.cc:1892 commands.cc:1920
-#: commands.cc:1938
+#: commands.cc:1915 commands.cc:1943 commands.cc:1961
msgid "packet i/o"
msgstr "ãã±ãã I/O"
-#: commands.cc:1768 commands.cc:1794
-msgid "OLDID NEWID"
-msgstr "OLDID NEWID"
-
-#: commands.cc:1769
-msgid "write manifest delta packet to stdout"
-msgstr "ãããã§ã¹ãå·®åãã±ãããæ¨æºåºåã«åºå"
-
-#: commands.cc:1783 commands.cc:1785 commands.cc:1849
-#, c-format
-msgid "no such manifest '%s'"
-msgstr "ãããã§ã¹ã '%s' ã¯åå¨ãã¾ãã"
-
-#: commands.cc:1795
-msgid "write file delta packet to stdout"
-msgstr "ãã¡ã¤ã«å·®åãã±ãããæ¨æºåºåã«åºå"
-
-#: commands.cc:1809 commands.cc:1811 commands.cc:1868 commands.cc:2219
-#, c-format
-msgid "no such file '%s'"
-msgstr "ãã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-
-#: commands.cc:1818 commands.cc:1836 commands.cc:1855 commands.cc:1874
-#: commands.cc:1892 commands.cc:1920
+#: commands.cc:1915 commands.cc:1943
msgid "ID"
msgstr "ID"
-#: commands.cc:1818
-msgid "write revision data packet to stdout"
-msgstr "ãªãã¸ã§ã³ãã¼ã¿ãã±ãããæ¨æºåºåã«åºå"
-
-#: commands.cc:1836
-msgid "write manifest data packet to stdout"
-msgstr "ãããã§ã¹ããã¼ã¿ãã±ãããæ¨æºåºåã«åºå"
-
-#: commands.cc:1855
-msgid "write file data packet to stdout"
-msgstr "ãã¡ã¤ã«ãã¼ã¿ãã±ãããæ¨æºåºåã«åºå"
-
-#: commands.cc:1874
-msgid "write cert packets to stdout"
-msgstr "証æãã±ãããæ¨æºåºåã«åºå"
-
-#: commands.cc:1892
+#: commands.cc:1915
msgid "write public key packet to stdout"
msgstr "å
¬ééµãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1914
-#, fuzzy, c-format
+#: commands.cc:1937
+#, c-format
msgid "public key '%s' does not exist"
-msgstr "å
¬ééµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
+msgstr "å
¬ééµ '%s' ã¯åå¨ãã¾ãã"
-#: commands.cc:1920
+#: commands.cc:1943
msgid "write private key packet to stdout"
msgstr "ç§å¯éµãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1928
-#, fuzzy, c-format
+#: commands.cc:1951
+#, c-format
msgid "public and private key '%s' do not exist in keystore"
-msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
+msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯éµã®ä¿åå ´æã«åå¨ãã¾ãã"
-#: commands.cc:1939
+#: commands.cc:1962
msgid "read packets from files or stdin"
msgstr "ãã¡ã¤ã«ã¾ãã¯æ¨æºå
¥åãããã±ãããèªã¿è¾¼ã¿"
-#: commands.cc:1947
+#: commands.cc:1970
#, c-format
msgid "no packets found on stdin"
msgstr "æ¨æºå
¥åã«ãã±ãããã¿ã¤ãããã¨ãã§ãã¾ããã§ãã"
-#: commands.cc:1958
+#: commands.cc:1981
#, c-format
msgid "no packets found in given file"
msgid_plural "no packets found in given files"
msgstr[0] "ãã¡ã¤ã«å
ã«ãã±ããã¯å«ã¾ãã¦ãã¾ãã"
msgstr[1] "ãã¡ã¤ã«å
ã«ãã±ããã¯å«ã¾ãã¦ãã¾ãã"
-#: commands.cc:1962
+#: commands.cc:1985
#, c-format
msgid "read %d packet"
msgid_plural "read %d packets"
msgstr[0] "%d ãã±ããèªã¿è¾¼ã¿"
msgstr[1] "%d ãã±ããèªã¿è¾¼ã¿"
-#: commands.cc:1966 commands.cc:2060 commands.cc:2075 commands.cc:2089
-#: commands.cc:2104
-msgid "network"
-msgstr "ãããã¯ã¼ã¯"
-
-#: commands.cc:1967
-msgid "rebuild the indices used to sync over the network"
-msgstr "ãããã¯ã¼ã¯ãä»ãã¦åæããã®ã«ä½¿ãç´¢å¼ãåæ§ç¯"
-
-#: commands.cc:2004
+#: commands.cc:2014
#, c-format
msgid "setting default server to %s\n"
msgstr "ããã©ã«ãã®ãµã¼ãã¼ã %s ã«è¨å®\n"
-#: commands.cc:2010
+#: commands.cc:2020
#, c-format
msgid "no hostname given"
msgstr "ãã¹ãåãæå®ãã¦ä¸ãã"
-#: commands.cc:2012
+#: commands.cc:2022
#, c-format
msgid "no server given and no default server set"
msgstr "ãµã¼ããæªæå®ã§ãããããã©ã«ãã®ãµã¼ãã¼ãè¨å®ããã¦ãã¾ãã"
-#: commands.cc:2016
+#: commands.cc:2040
#, c-format
-msgid "using default server address: %s\n"
-msgstr "ããã©ã«ãã®ãµã¼ãã¼ã¢ãã¬ã¹ãå©ç¨: %s\n"
-
-#: commands.cc:2030
-#, c-format
msgid "setting default branch include pattern to '%s'\n"
msgstr "ãã©ã³ãåã«å«ããããã©ã«ããã¿ã¼ã³ã '%s' ã«è¨å®\n"
-#: commands.cc:2036
+#: commands.cc:2046
#, c-format
msgid "setting default branch exclude pattern to '%s'\n"
msgstr "ãã©ã³ãåã«å«ããªãããã©ã«ããã¿ã¼ã³ã '%s' ã«è¨å®\n"
-#: commands.cc:2042
+#: commands.cc:2052
#, c-format
msgid "no branch pattern given"
msgstr "ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: commands.cc:2044
+#: commands.cc:2054
#, c-format
msgid "no branch pattern given and no default pattern set"
msgstr "ãã©ã³ããã¿ã¼ã³ãæªæå®ããã¤ããã©ã«ããã¿ã¼ã³ãè¨å®ããã¦ãã¾ãã"
-#: commands.cc:2048
-#, c-format
-msgid "using default branch include pattern: '%s'\n"
-msgstr "ãã©ã³ãåã«å«ããããã©ã«ãã®ãã¿ã¼ã³ãå©ç¨: '%s'\n"
+#: commands.cc:2070 commands.cc:2085 commands.cc:2099 commands.cc:2114
+msgid "network"
+msgstr "ãããã¯ã¼ã¯"
-#: commands.cc:2056
-#, c-format
-msgid "excluding: %s\n"
-msgstr "é¤å¤: %s\n"
-
-#: commands.cc:2060 commands.cc:2075 commands.cc:2089
+#: commands.cc:2070 commands.cc:2085 commands.cc:2099
msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]"
-#: commands.cc:2061
+#: commands.cc:2071
msgid "push branches matching PATTERN to netsync server at ADDRESS"
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ã«ããã·ã¥"
-#: commands.cc:2076
+#: commands.cc:2086
msgid "pull branches matching PATTERN from netsync server at ADDRESS"
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ããåãè¾¼ã¿"
-#: commands.cc:2083
+#: commands.cc:2093
#, c-format
msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
msgstr "å¿åã§åãè¾¼ãã§ãã¾ã; èªè¨¼ãå¿
è¦ãªå ´å㯠-kKEYNAME ã使ã£ã¦ä¸ãã\n"
-#: commands.cc:2090
+#: commands.cc:2100
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ã¨åæ"
-#: commands.cc:2104
-#, fuzzy
+#: commands.cc:2114
msgid "PATTERN ..."
-msgstr "PATH..."
+msgstr "PATTERN..."
-#: commands.cc:2105
-#, fuzzy
+#: commands.cc:2115
msgid "serve the branches specified by PATTERNs to connecting clients"
-msgstr "ADDRESS ã§å¾
æ©ããæå®ãã©ã³ããæ¥ç¶ã¯ã©ã¤ã¢ã³ãã«æä¾"
+msgstr "PATTERNs ã§æå®ãããã©ã³ããæ¥ç¶ã¯ã©ã¤ã¢ã³ãã«æä¾"
-#: commands.cc:2118
+#: commands.cc:2128
#, c-format
msgid ""
"need permission to store persistent passphrase (see hook persist_phrase_ok())"
msgstr ""
-"æ°¸ç¶çã«ãã¹ãã¬ã¼ãºãä¿åãã¦ããããã®ãªã権éãå¿
è¦ã§ã (ãã㯠"
-"persist_phrase_ok() ãåç
§ãã¦ä¸ãã)"
+"ãã¹ãã¬ã¼ãºããã£ã¨ä¿åãã¦ããããã®ãªã権éãå¿
è¦ã§ãã (ãã㯠"
+"persist_phrase_ok() ãåç
§)"
-#: commands.cc:2130
+#: commands.cc:2140
msgid "database"
msgstr "ãã¼ã¿ãã¼ã¹"
-#: commands.cc:2131
+#: commands.cc:2141
msgid ""
"init\n"
"info\n"
@@ -1215,7 +856,7 @@
"kill_tag_locally TAG\n"
"check\n"
"changesetify\n"
-"rebuild\n"
+"rosterify\n"
"set_epoch BRANCH EPOCH\n"
msgstr ""
"init\n"
@@ -1230,164 +871,129 @@
"kill_tag_locally TAG\n"
"check\n"
"changesetify\n"
-"rebuild\n"
+"rosterify\n"
"set_epoch BRANCH EPOCH\n"
-#: commands.cc:2145
+#: commands.cc:2155
msgid "manipulate database state"
msgstr "ãã¼ã¿ãã¼ã¹ã®ç¶æ
ãæä½"
-#: commands.cc:2198
+#: commands.cc:2202
+#, c-format
+msgid "The epoch must be %s characters"
+msgstr "epoch 㯠%s æåã§ãªããã°ããã¾ãã"
+
+#: commands.cc:2212
msgid ""
-"set FILE ATTR VALUE\n"
-"get FILE [ATTR]\n"
-"drop FILE"
+"set PATH ATTR VALUE\n"
+"get PATH [ATTR]\n"
+"drop PATH [ATTR]"
msgstr ""
-"set FILE ATTR VALUE\n"
-"get FILE [ATTR]\n"
-"drop FILE"
+"set PATH ATTR VALUE\n"
+"get PATH [ATTR]\n"
+"drop PATH [ATTR]"
-#: commands.cc:2199
+#: commands.cc:2213
msgid "set, get or drop file attributes"
msgstr "ãã¡ã¤ã«å±æ§ãè¨å®/åå¾/åé¤"
-#: commands.cc:2287 work.cc:113
+#: commands.cc:2229
#, c-format
-msgid "registering %s file in working copy\n"
-msgstr "ä½æ¥ã³ãã¼å
ã® %s ãã¡ã¤ã«ãç»é²\n"
+msgid "Unknown path '%s'"
+msgstr "ä¸æãªãã¹ '%s'"
-#: commands.cc:2316
+#: commands.cc:2258
#, c-format
-msgid "failed to parse date string '%s': %s"
-msgstr "ãã¼ã¿æåå '%s' ã®è§£æã«å¤±æ: %s"
+msgid "Path '%s' does not have attribute '%s'\n"
+msgstr "ãã¹ '%s' ã«ã¯å±æ§ '%s' ãããã¾ãã\n"
-#: commands.cc:2322
-msgid "commit working copy to database"
-msgstr "ä½æ¥ã³ãã¼ããã¼ã¿ãã¼ã¹ã«ã³ããã"
-
-#: commands.cc:2340
+#: commands.cc:2284
#, c-format
-msgid "no changes to commit\n"
-msgstr "ã³ããããã¹ãå¤æ´ãããã¾ãã\n"
+msgid "No attributes for '%s'"
+msgstr "'%s' ã«ã¤ãã¦å±æ§ã¯ããã¾ãã"
-#: commands.cc:2354
+#: commands.cc:2293
#, c-format
-msgid "beginning commit on branch '%s'\n"
-msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ãããéå§\n"
+msgid "No attribute '%s' on path '%s'"
+msgstr "ãã¹ '%s' ã«ã¤ã㦠'%s' ã¨ããå±æ§ã¯ããã¾ãã"
-#: commands.cc:2355
+#: commands.cc:2312
#, c-format
-msgid ""
-"new manifest '%s'\n"
-"new revision '%s'\n"
-msgstr ""
-"æ°è¦ãããã§ã¹ã '%s'\n"
-"æ°è¦ãªãã¸ã§ã³ '%s'\n"
-
-#: commands.cc:2362
-#, c-format
msgid "--message and --message-file are mutually exclusive"
msgstr "--message 㨠--message-file ãåæã«æå®ãããã¨ã¯ã§ãã¾ãã"
-#: commands.cc:2365
+#: commands.cc:2331
+msgid "commit workspace to database"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ããã¼ã¿ãã¼ã¹ã«ã³ããã"
+
+#: commands.cc:2349
#, c-format
-msgid ""
-"MT/log is non-empty and --message supplied\n"
-"perhaps move or delete MT/log,\n"
-"or remove --message from the command line?"
-msgstr ""
-"MT/log ã¯ç©ºã§ã¯ãªãã --message ãæå®ããã¦ãã¾ã.\n"
-"ãããããã MT/log ã移å/åé¤ããããã³ãã³ã\n"
-"è¡ãã --message ãåé¤ããã®ã§ã¯ããã¾ããã?"
+msgid "no changes to commit\n"
+msgstr "ã³ãããããå¤æ´ãããã¾ãã\n"
-#: commands.cc:2370
+#: commands.cc:2363
#, c-format
+msgid "beginning commit on branch '%s'\n"
+msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ãããéå§\n"
+
+#: commands.cc:2372
+#, c-format
msgid ""
-"MT/log is non-empty and --message-file supplied\n"
-"perhaps move or delete MT/log,\n"
-"or remove --message-file from the command line?"
+"_MTN/log is non-empty and log message was specified on command line\n"
+"perhaps move or delete _MTN/log,\n"
+"or remove --message/--message-file from the command line?"
msgstr ""
-"MT/log ã¯ç©ºã§ã¯ãªãã --message-file ãæå®ããã¦ãã¾ã.\n"
-"ãããããã MT/log ã移å/åé¤ããããã³ãã³ã\n"
-"è¡ãã --message-file ãåé¤ããã®ã§ã¯ããã¾ããã?"
+"_MTN/log ã¯ç©ºã§ã¯ãªããã³ãã³ãè¡ã§ãã°ã¡ãã»ã¼ã¸ãæå®ãã¦ãã¾ãã\n"
+"_MTN/log ã移å/åé¤ããããã³ãã³ãè¡ãã --message/--message-file ã\n"
+"æ¶ãã¦ä¸ããã"
-#: commands.cc:2388
+#: commands.cc:2384
#, c-format
msgid "empty log message; commit canceled"
msgstr "空ã®ãã°ã¡ãã»ã¼ã¸; ã³ãããã¯åãæ¶ããã¾ãã"
-#: commands.cc:2400
+#: commands.cc:2403
#, c-format
-msgid "revision %s already in database\n"
-msgstr "ãªãã¸ã§ã³ %s ã¯æ¢ã«ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¦ãã¾ã\n"
+msgid "log message rejected: %s\n"
+msgstr "ãã°ã¡ãã»ã¼ã¸ãæå¦: %s\n"
-#: commands.cc:2405
+#: commands.cc:2411
#, c-format
-msgid "inserting new revision %s\n"
-msgstr "æ°è¦ãªãã¸ã§ã³ %s ãæ¿å
¥ä¸\n"
+msgid "revision %s already in database\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯æ¢ã«ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¦ãã¾ã\n"
-#: commands.cc:2414
+#: commands.cc:2449 commands.cc:2466 commands.cc:2485
#, c-format
-msgid "skipping manifest %s, already in database\n"
-msgstr "æ¢ã«ãã¼ã¿ãã¼ã¹ã«ãããããã§ã¹ã %s ãã¹ããã\n"
-
-#: commands.cc:2418
-#, c-format
-msgid "inserting manifest delta %s -> %s\n"
-msgstr "ãããã§ã¹ãå·®å %s -> %s ãæ¿å
¥ä¸\n"
-
-#: commands.cc:2429
-#, c-format
-msgid "inserting full manifest %s\n"
-msgstr "å®å
¨ãããã§ã¹ã %s ãæ¿å
¥ä¸\n"
-
-#: commands.cc:2442
-#, c-format
-msgid "skipping file delta %s, already in database\n"
-msgstr "æ¢ã«ãã¼ã¿ãã¼ã¹ã«ãããã¡ã¤ã«å·®å %s ãã¹ããã\n"
-
-#: commands.cc:2448
-#, c-format
-msgid "inserting delta %s -> %s\n"
-msgstr "å·®å %s -> %s ãæ¿å
¥ä¸\n"
-
-#: commands.cc:2458 commands.cc:2475
-#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "ãã¡ã¤ã« '%s' 㯠commit åã«å¤æ´ããã¾ãã. ä¸æ¢ãã¾ã"
-#: commands.cc:2468
+#: commands.cc:2511
#, c-format
-msgid "inserting full version %s\n"
-msgstr "å®å
¨ãªãã¼ã¸ã§ã³ %s ãæ¿å
¥ä¸\n"
-
-#: commands.cc:2502
-#, c-format
msgid "committed revision %s\n"
msgstr "ãªãã¸ã§ã³ %s ãã³ããã\n"
-#: commands.cc:2508
+#: commands.cc:2517
#, c-format
msgid ""
"note: this revision creates divergence\n"
-"note: you may (or may not) wish to run 'monotone merge'"
+"note: you may (or may not) wish to run '%s merge'"
msgstr ""
"注æ: ãã®ãªãã¸ã§ã³ã«ãã£ã¦åå²ãçãã¾ã\n"
-"注æ: åå²ãæã¾ãªããªã 'monotone merge' ãå®è¡ãã¦ä¸ãã"
+"注æ: åå²ãæã¾ãªããªã '%s merge' ãå®è¡ãã¦ä¸ãã"
-#: commands.cc:2675
+#: commands.cc:2712
msgid ""
"show current diffs on stdout.\n"
-"If one revision is given, the diff between the working directory and\n"
+"If one revision is given, the diff between the workspace and\n"
"that revision is shown. If two revisions are given, the diff between\n"
"them is given. If no format is specified, unified is used by default."
msgstr ""
"ç¾å¨ã®å·®åãæ¨æºåºåã«è¡¨ç¤º\n"
-"ãªãã¸ã§ã³ãä¸ã¤æå®ããã¦ããã°ä½æ¥ãã£ã¬ã¯ããªã¨ãã®ãªãã¸ã§ã³ã®\n"
+"ãªãã¸ã§ã³ãä¸ã¤æå®ããã¦ããã°ãã¯ã¼ã¯ã¹ãã¼ã¹ã¨ãã®ãªãã¸ã§ã³ã®\n"
"å·®åããäºã¤æå®ããã¦ããã°ããããªãã¸ã§ã³éã®å·®åã表示ãã¾ãã\n"
-"å½¢å¼ãæå®ããã¦ããªããã°ãããã©ã«ãã§ã¯ unified å½¢å¼ã使ç¨ããã¾ãã"
+"å½¢å¼ãæå®ããã¦ããªããã°ãããã©ã«ãã§ã¯ unified å½¢å¼ã使ç¨ãã¾ãã"
-#: commands.cc:2691
+#: commands.cc:2728
#, c-format
msgid ""
"--diff-args requires --external\n"
@@ -1396,63 +1002,40 @@
"--diff-args 㯠--external ãå¿
è¦ã¨ãã¾ãã\n"
"--external ã追å ãããã--diff-args ãçãã¦ã¿ã¦ã¯ã©ãã§ãã?"
-#: commands.cc:2725
+#: commands.cc:2770
#, c-format
msgid "current revision has no ancestor"
msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã«ã¯ç¥å
ãããã¾ãã"
-#: commands.cc:2764
-#, c-format
-msgid "no common ancestor for %s and %s"
-msgstr "%s 㨠%s ã«ã¯å
±éã®ç¥å
ãããã¾ãã"
+#: commands.cc:2833
+msgid "no changes"
+msgstr "å¤æ´ãªã"
-#: commands.cc:2770
-#, c-format
-msgid "concatenating un-committed changeset to composite\n"
-msgstr "åæã®ããã«ã³ãããããã¦ããªãå¤æ´ã»ãããé£çµ\n"
-
-#: commands.cc:2807 commands.cc:2824
-msgid "LEFT RIGHT"
-msgstr "LEFT RIGHT"
-
-#: commands.cc:2807
-msgid "print least common ancestor"
-msgstr "æãè¿ãç¥å
ã表示"
-
-#: commands.cc:2820
-msgid "no common ancestor found"
-msgstr "å
±éã®ç¥å
ã¯ããã¾ããã§ãã"
-
-#: commands.cc:2824
-msgid "print least common ancestor / dominator"
-msgstr "æãè¿ãç¥å
/ æ¯é
è
ã表示"
-
-#: commands.cc:2838
-msgid "no common ancestor/dominator found"
-msgstr "å
±éã®ç¥å
/ æ¯é
è
ãã¿ã¤ããã¾ãã"
-
-#: commands.cc:2863
-#, fuzzy, c-format
-msgid "updating %s to %s"
-msgstr "%s ã %s ã«æ´æ°ä¸\n"
-
-#: commands.cc:2887
+#: commands.cc:2865
msgid ""
-"update working copy.\n"
-"If a revision is given, base the update on that revision. If not,\n"
-"base the update on the head of the branch (given or implicit)."
+"update workspace.\n"
+"This command modifies your workspace to be based off of a\n"
+"different revision, preserving uncommitted changes as it does so.\n"
+"If a revision is given, update the workspace to that revision.\n"
+"If not, update the workspace to the head of the branch."
msgstr ""
-"ä½æ¥ã³ãã¼ãæ´æ°ã\n"
-"ãªãã¸ã§ã³ãæå®ããã¦ããã°ããã«åºã¥ãã¦ãæå®ããã¦ããªããã°\n"
-"æ示çã¾ãã¯æé»ã«æå®ããããã©ã³ãã®ææ°çã«åºã¥ãã¦æ´æ°ãã¾ãã"
+"ã¯ã¼ã¯ã¹ãã¼ã¹ãæ´æ°\n"
+"ãã®ã³ãã³ãã¯å¥ã®ãªãã¸ã§ã³ã«åºã¥ãã¦ã¯ã¼ã¯ã¹ãã¼ã¹ãå¤æ´ãã¾ãã\n"
+"ã³ãããããã¦ããªãå¤æ´ã¯ãã®ã¾ã¾ã«ããã¾ãããªãã¸ã§ã³ãæå®ãã¦\n"
+"ããã°ãã®ãªãã¸ã§ã³ã«ãæªæå®ãªãææ°ç (HEAD) ã«æ´æ°ãã¾ãã"
-#: commands.cc:2912
+#: commands.cc:2903
#, c-format
-msgid "this working directory is a new project; cannot update"
-msgstr "ãã®ä½æ¥ãã£ã¬ã¯ããªã¯æ°è¦ã®ããã¸ã§ã¯ãã§ã; æ´æ°ã§ãã¾ãã"
+msgid "this workspace is a new project; cannot update"
+msgstr "ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã¯æ°è¦ã®ããã¸ã§ã¯ãã§ã; æ´æ°ã§ãã¾ããã"
-#: commands.cc:2919
+#: commands.cc:2907
#, c-format
+msgid "updating along branch '%s'..."
+msgstr "ãã©ã³ã '%s' ã«æ²¿ã£ã¦æ´æ°ãã¦ãã¾ã..."
+
+#: commands.cc:2911
+#, c-format
msgid ""
"your request matches no descendents of the current revision\n"
"in fact, it doesn't even match the current revision\n"
@@ -1462,217 +1045,212 @@
"ãããããã --revision=<ä»ã®ãã©ã³ãã®ãªãã¸ã§ã³> ã¨ãããã®ã§ã¯\n"
"ããã¾ããã?"
-#: commands.cc:2924
+#: commands.cc:2916
#, c-format
-msgid "multiple update candidates:\n"
-msgstr "è¤æ°ã®æ´æ°åè£:\n"
+msgid "multiple update candidates:"
+msgstr "è¤æ°ã®æ´æ°åè£:"
-#: commands.cc:2928
+#: commands.cc:2920
#, c-format
-msgid "choose one with 'monotone update -r'\n"
-msgstr "'monotone update -r' ã¨ãã¦ä¸ã¤é¸æ\n"
+msgid "choose one with '%s update -r'"
+msgstr "'%s update -r' ã¨ãã¦ä¸ã¤é¸æ"
-#: commands.cc:2929
+#: commands.cc:2921
#, c-format
-msgid "multiple candidates remain after selection"
-msgstr "é¸æãããã®ããå¾ã«è¤æ°ã®åè£ãæ®ã£ã¦ãã¾ã"
+msgid "multiple update candidates remain after selection"
+msgstr "é¸æå¾ãè¤æ°ã®åè£ãæ®ã£ã¦ãã¾ã"
-#: commands.cc:2944
+#: commands.cc:2936
#, c-format
msgid "already up to date at %s\n"
msgstr "%s ã¯æ¢ã«ææ°ã§ã\n"
-#: commands.cc:2952
+#: commands.cc:2944
#, c-format
msgid "selected update target %s\n"
msgstr "é¸æãããæ´æ°ã¿ã¼ã²ãã %s\n"
-#: commands.cc:2964
+#: commands.cc:2974
#, c-format
msgid ""
-"revision %s is not a member of branch %s\n"
-"try again with explicit --branch\n"
+"revision %s is a member of multiple branches:\n"
+"%s\n"
+"\n"
+"try again with explicit --branch"
msgstr ""
-"ãªãã¸ã§ã³ %s ã¯ãã©ã³ã %s ã«å±ãã¦ãã¾ãã\n"
-"æ示çã« --branch ãæå®ãã¦å試è¡ãã¦ä¸ãã\n"
+"ãªãã¸ã§ã³ %s ã¯è¤æ°ã®ãã©ã³ãã«å±ãã¦ãã¾ã:\n"
+"%s\n"
+"\n"
+"æ示çã« --branch ãæå®ãã¦å試è¡ãã¦ä¸ããã"
-#: commands.cc:2979
+#: commands.cc:2980
#, c-format
-msgid "updating along chosen edge %s -> %s\n"
-msgstr "é¸æããå
端 %s -> %s ã«å¾ã£ã¦æ´æ°ä¸\n"
+msgid ""
+"revision %s is a member of\n"
+"%s, updating workspace branch"
+msgstr ""
+"ãªãã¸ã§ã³ %s 㯠%s ã«å±ãã¦ãã¾ã\n"
+"ã¯ã¼ã¯ã¹ãã¼ã¹ãã©ã³ããæ´æ°ãã¦ãã¾ã"
-#: commands.cc:2990
+#: commands.cc:2986
#, c-format
-msgid "merging working copy with chosen edge %s -> %s\n"
-msgstr "ä½æ¥ã³ãã¼ãé¸æããå
端 %s -> %s ã¨çµ±åä¸\n"
+msgid ""
+"revision %s is a member of no branches,\n"
+"using branch %s for workspace"
+msgstr ""
+"ãªãã¸ã§ã³ %s ã¯ãã©ã³ãã«ã¯å±ãã¦ãã¾ããã®ã§ã\n"
+"ã¯ã¼ã¯ã¹ãã¼ã¹ã« %s ã使ãã¾ã"
-#: commands.cc:3039
+#: commands.cc:3087
#, c-format
msgid "updated to base revision %s\n"
msgstr "åºæºãªãã¸ã§ã³ %s ã«æ´æ°\n"
-#: commands.cc:3105
-#, c-format
-msgid ""
-"common ancestor %s found\n"
-"trying 3-way merge\n"
-msgstr ""
-"å
±éã®ç¥å
%s ãçºè¦\n"
-"3æ¹çµåã試ã¿ã¦ãã¾ã\n"
-
-#: commands.cc:3116
-#, c-format
-msgid "no common ancestor found, synthesizing edges\n"
-msgstr "å
±éã®ç¥å
ãããã¾ããã§ããã®ã§ãå
端å士ãåæä¸\n"
-
-#: commands.cc:3162
+#: commands.cc:3097
msgid "merge unmerged heads of branch"
msgstr "çµ±åããã¦ããªããã©ã³ãã®è¤æ°ã®ææ°çãçµ±å"
-#: commands.cc:3176
+#: commands.cc:3113
#, c-format
-msgid "branch '%s' is merged\n"
-msgstr "ãã©ã³ã '%s' ãçµ±å\n"
+msgid "branch '%s' is already merged\n"
+msgstr "ãã©ã³ã '%s' ã¯æ¢ã«çµ±åæ¸ã¿ã§ã\n"
-#: commands.cc:3182
+#: commands.cc:3121
#, c-format
msgid "starting with revision 1 / %d\n"
msgstr "ãªãã¸ã§ã³ 1 / %d ã«ã¤ãã¦ä½æ¥éå§\n"
-#: commands.cc:3186
+#: commands.cc:3125
#, c-format
msgid "merging with revision %d / %d\n"
msgstr "ãªãã¸ã§ã³ %d / %d ã«ã¤ãã¦çµ±åä¸\n"
-#: commands.cc:3187 commands.cc:3188 commands.cc:3255 commands.cc:3339
-#: commands.cc:3340
+#: commands.cc:3126 commands.cc:3127 commands.cc:3209 commands.cc:3342
+#: commands.cc:3343
#, c-format
msgid "[source] %s\n"
msgstr "[å
] %s\n"
-#: commands.cc:3205 commands.cc:3292 commands.cc:3359
+#: commands.cc:3144 commands.cc:3307 commands.cc:3361
#, c-format
msgid "[merged] %s\n"
msgstr "[çµ±åæ¸ã¿] %s\n"
-#: commands.cc:3208
+#: commands.cc:3147
#, c-format
-msgid "note: your working copies have not been updated\n"
-msgstr "注æ: ä½æ¥ã³ãã¼ã¯æ´æ°ããã¦ãã¾ãã\n"
+msgid "note: your workspaces have not been updated\n"
+msgstr "注æ: ã¯ã¼ã¯ã¹ãã¼ã¹ã¯æ´æ°ããã¦ãã¾ãã\n"
-#: commands.cc:3211
+#: commands.cc:3150
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr "SOURCE-BRANCH DEST-BRANCH"
-#: commands.cc:3212
+#: commands.cc:3151
msgid "merge from one branch to another asymmetrically"
msgstr "ä¸æ¹ã®ãã©ã³ããä»æ¹ã«éåæã«çµ±å"
-#: commands.cc:3246 commands.cc:3249
+#: commands.cc:3161
+msgid "SOURCE-BRANCH DEST-BRANCH DIR"
+msgstr "SOURCE-BRANCH DEST-BRANCH DIR"
+
+#: commands.cc:3162
+msgid "merge one branch into a subdirectory in another branch"
+msgstr "ãã©ã³ããä»ã®ãã©ã³ãã®ãµããã£ã¬ã¯ããªã«çµ±å"
+
+#: commands.cc:3200 commands.cc:3203
#, c-format
msgid "branch '%s' is not merged\n"
msgstr "ãã©ã³ã '%s' ã¯çµ±åããã¦ãã¾ãã\n"
-#: commands.cc:3254
+#: commands.cc:3208
#, c-format
msgid "propagating %s -> %s\n"
msgstr "ä¼æä¸ %s -> %s\n"
-#: commands.cc:3256
+#: commands.cc:3210
#, c-format
msgid "[target] %s\n"
msgstr "[å
] %s\n"
-#: commands.cc:3261
+#: commands.cc:3215
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
msgstr "ãã©ã³ã '%s' ã¯ãã©ã³ã '%s' ã«å¯¾ãã¦ææ°ã§ã\n"
-#: commands.cc:3263
+#: commands.cc:3217
#, c-format
msgid "no action taken\n"
msgstr "ä½ããã¾ãã\n"
-#: commands.cc:3267
+#: commands.cc:3221
#, c-format
msgid "no merge necessary; putting %s in branch '%s'\n"
msgstr "çµ±åã¯å¿
è¦ããã¾ãã. %s ããã©ã³ã '%s' å
ã«åãè¾¼ã¿ä¸\n"
-#: commands.cc:3296
+#: commands.cc:3257
+#, c-format
+msgid "Path %s not found in destination tree."
+msgstr "ãã¹ %s ã¯å
ã®ããªã¼å
ã«ã¿ã¤ããã¾ãã"
+
+#: commands.cc:3311
msgid "refresh the inodeprint cache"
msgstr "i-node 表示ãã£ãã·ã¥ãæ´æ°"
-#: commands.cc:3304
-msgid ""
-"LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
-"LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH"
-msgstr ""
-"LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
-"LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH"
+#: commands.cc:3320
+msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
+msgstr "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
-#: commands.cc:3306
+#: commands.cc:3321
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr "æ示çã«æå®ããäºã¤ã®ãªãã¸ã§ã³ãçµ±åãçµæã¯æå®ãã©ã³ãã¸ã"
-#: commands.cc:3321 commands.cc:3323
+#: commands.cc:3335
#, c-format
-msgid "%s is not an ancestor of %s"
-msgstr "%s 㯠%s ã®ç¥å
ã§ã¯ããã¾ãã"
-
-#: commands.cc:3332
-#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s 㨠%s ã¯åããªãã¸ã§ã³ã§ã. ä¸æ¢ãã¾ã"
-#: commands.cc:3334 commands.cc:3336
+#: commands.cc:3337 commands.cc:3339
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s ã¯æ¢ã« %s ã®ç¥å
ã¨ãªã£ã¦ãã¾ã"
-#: commands.cc:3362
-msgid "(revision|manifest|file|key) PARTIAL-ID"
-msgstr "(revision|manifest|file|key) PARTIAL-ID"
+#: commands.cc:3364
+msgid "(revision|file|key) PARTIAL-ID"
+msgstr "(revision|file|key) PARTIAL-ID"
-#: commands.cc:3363
+#: commands.cc:3365
msgid "complete partial id"
msgstr "é¨å ID ãè£å®"
-#: commands.cc:3372
+#: commands.cc:3374
#, c-format
msgid "non-hex digits in partial id"
msgstr "é¨å ID ã«åå
é²æ°ãå«ã¾ãã¦ãã¾ãã"
-#: commands.cc:3420
-#, fuzzy
-msgid "revert file(s), dir(s) or entire working copy (\".\")"
-msgstr "ãã¡ã¤ã«ããã£ã¬ã¯ããªã¾ãã¯å®å
¨ãªä½æ¥ã³ãã¼ã®å¤æ´ãç ´æ£"
+#: commands.cc:3413
+msgid "revert file(s), dir(s) or entire workspace (\".\")"
+msgstr "ãã¡ã¤ã«ããã£ã¬ã¯ããªã¾ãã¯å®å
¨ãªã¯ã¼ã¯ã¹ãã¼ã¹ (\".\") ã®å¤æ´ãç ´æ£"
-#: commands.cc:3448
+#: commands.cc:3490
#, c-format
-msgid "revert adding find_missing entries to %d original args elements\n"
-msgstr ""
+msgid "reverting %s"
+msgstr "%s ãæ»ãã¦ãã¾ã"
-#: commands.cc:3457
+#: commands.cc:3494
#, c-format
-msgid ""
-"after adding everything from find_missing, revert args_copy has %d elements\n"
-msgstr ""
-
-#: commands.cc:3481
-#, fuzzy, c-format
-msgid "reverting %s to %s"
-msgstr "%s ã %s ãã %s ã¸æ»ãã¦ãã¾ã\n"
-
-#: commands.cc:3485
-#, c-format
msgid "no file version %s found in database for %s"
msgstr "ãã¼ã¸ã§ã³ %s ã®ãã¡ã¤ã«ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ãã (対象: %s)"
-#: commands.cc:3502
+#: commands.cc:3507
+#, c-format
+msgid "recreating %s/"
+msgstr "%s/ ãæ»ãã¦ãã¾ã"
+
+#: commands.cc:3519
msgid "RCSFILE..."
msgstr "RCSFILE..."
-#: commands.cc:3503
+#: commands.cc:3520
msgid ""
"parse versions in RCS files\n"
"this command doesn't reconstruct or import revisions.you probably want "
@@ -1682,51 +1260,36 @@
"ãã®ã³ãã³ã㯠(CVS ã®) ãªãã¸ã§ã³ãåæ§ç¯ã¾ãã¯åãè¾¼ã¿ã¯ãã¾ããããããã"
"ããªãã®æå¾
ãã¦ããã®ã¯ cvs_import ã§ãããã"
-#: commands.cc:3519
+#: commands.cc:3536
msgid "rcs"
msgstr "RCS é¢é£"
-#: commands.cc:3519
+#: commands.cc:3536
msgid "CVSROOT"
msgstr "CVSROOT"
-#: commands.cc:3519
+#: commands.cc:3536
msgid "import all versions in CVS repository"
msgstr "CVS ãªãã¸ããªå
ã®ãã¹ã¦ã®ãã¼ã¸ã§ã³ãåãè¾¼ã"
-#: commands.cc:3582
+#: commands.cc:3599
msgid "PATH"
msgstr "PATH"
-#: commands.cc:3583
+#: commands.cc:3600
msgid "print annotated copy of the file from REVISION"
msgstr "REVISION ã®æ³¨éä»ãã®ãã¡ã¤ã«ã®ã³ãã¼ã表示"
-#: commands.cc:3600
+#: commands.cc:3620
#, c-format
msgid "no revision for file '%s' in database"
msgstr "ãã¡ã¤ã« '%s' ã«å¯¾ãããªãã¸ã§ã³ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ããã§ãã"
-#: commands.cc:3603
-#, c-format
-msgid "annotate file file_path '%s'\n"
-msgstr "注éãã¡ã¤ã« file_path '%s'\n"
+#: commands.cc:3638
+msgid "[FILE] ..."
+msgstr "[FILE] ..."
-#: commands.cc:3612
-#, c-format
-msgid "no such file '%s' in revision '%s'\n"
-msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã§ã³ %s å
ã«ã¯ããã¾ãã\n"
-
-#: commands.cc:3614
-#, c-format
-msgid "annotate for file_id %s\n"
-msgstr "file_id %s ã«å¯¾ãã注é\n"
-
-#: commands.cc:3619
-msgid "[FILE]"
-msgstr "[FILE]"
-
-#: commands.cc:3620
+#: commands.cc:3639
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
"revisions are given, use them as a starting point."
@@ -1734,35 +1297,34 @@
"éé ã§å±¥æ´ã表示 ('FILE' ã§ãã£ã«ã¿)ãä¸ã¤ä»¥ä¸ã®ãªãã¸ã§ã³ãæå®ããã¦\n"
"ããã°ãããéå§ç¹ã¨ãã¦å©ç¨ã"
-#: commands.cc:3680
+#: commands.cc:3687
#, c-format
-msgid "revision %s does not exist in db, skipping\n"
-msgstr "ãªãã¸ã§ã³ %s 㯠db å
ã«ããã¾ãã. ã¹ããããã¾ã\n"
+msgid "Unknown file '%s' for log command"
+msgstr "ãã°ã³ãã³ãã«å¯¾ãã¦ä¸æãªãã¡ã¤ã« '%s'"
-#: commands.cc:3713
+#: commands.cc:3705
#, c-format
-msgid "revision '%s' in '%s' maps to '%s' in %s\n"
-msgstr "ãªãã¸ã§ã³ '%s' ('%s' å
) ã '%s' (%s å
) ã«ããã\n"
+msgid "only one of --last/--next allowed"
+msgstr "--last/--next ã®ã©ã¡ããã®ã¿ã許ããã¦ãã¾ã"
-#: commands.cc:3787
-msgid "DIRECTORY"
-msgstr "DIRECTORY"
+#: commands.cc:3873
+msgid "[DIRECTORY]"
+msgstr "[DIRECTORY]"
-#: commands.cc:3787
-msgid "setup a new working copy directory"
-msgstr "æ°è¦ä½æ¥ã³ãã¼ãã£ã¬ã¯ããªãä½æ"
+#: commands.cc:3873
+msgid "setup a new workspace directory, default to current"
+msgstr "æ°ããã¯ã¼ã¯ã¹ãã¼ã¹ãã£ã¬ã¯ããªãä½æ (ããã©ã«ã: ç¾å¨ã®å ´æ)"
-#: commands.cc:3793
+#: commands.cc:3879
#, c-format
msgid "need --branch argument for setup"
msgstr "ä½æã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: commands.cc:3802
+#: commands.cc:3893
msgid "automation"
msgstr "èªåå"
-#: commands.cc:3803
-#, fuzzy
+#: commands.cc:3894
msgid ""
"interface_version\n"
"heads [BRANCH]\n"
@@ -1780,9 +1342,13 @@
"stdio\n"
"certs REV\n"
"select SELECTOR\n"
-"get_file ID\n"
-"get_manifest [ID]\n"
-"get_revision [ID]\n"
+"get_file FILEID\n"
+"get_manifest_of [REVID]\n"
+"get_revision [REVID]\n"
+"packet_for_rdata REVID\n"
+"packets_for_certs REVID\n"
+"packet_for_fdata FILEID\n"
+"packet_for_fdelta OLD_FILE NEW_FILE\n"
"keys\n"
msgstr ""
"interface_version\n"
@@ -1801,401 +1367,458 @@
"stdio\n"
"certs REV\n"
"select SELECTOR\n"
-"get_file ID\n"
-"get_manifest [ID]\n"
-"get_revision [ID]\n"
+"get_file FILEID\n"
+"get_manifest_of [REVID]\n"
+"get_revision [REVID]\n"
+"packet_for_rdata REVID\n"
+"packets_for_certs REVID\n"
+"packet_for_fdata FILEID\n"
+"packet_for_fdelta OLD_FILE NEW_FILE\n"
+"keys\n"
-#: commands.cc:3823
+#: commands.cc:3918
msgid "automation interface"
msgstr "èªååã¤ã³ã¿ã¼ãã§ã¼ã¹"
-#: commands.cc:3837 commands.cc:3853
+#: commands.cc:3932 commands.cc:3948
msgid "vars"
msgstr "å¤æ°"
-#: commands.cc:3837
+#: commands.cc:3932
msgid "DOMAIN NAME VALUE"
msgstr "DOMAIN NAME VALUE"
-#: commands.cc:3838
+#: commands.cc:3933
msgid "set the database variable NAME to VALUE, in domain DOMAIN"
msgstr "ãã¡ã¤ã³ DOMAIN ã®ãã¼ã¿ãã¼ã¹å¤æ° NAME ã VALUE ã«è¨å®"
-#: commands.cc:3853
+#: commands.cc:3948
msgid "DOMAIN NAME"
msgstr "DOMAIN NAME"
-#: commands.cc:3854
+#: commands.cc:3949
msgid "remove the database variable NAME in domain DOMAIN"
msgstr "ãã¡ã¤ã³ DOMAIN ã®ãã¼ã¿ãã¼ã¹å¤æ° NAME ãæ¶å»"
-#: commands.cc:3865
+#: commands.cc:3960
#, c-format
msgid "no var with name %s in domain %s"
msgstr "%s ã¨ããå¤æ°ã¯ãã¡ã¤ã³ %s å
ã«ã¯ããã¾ãã"
-#: database_check.cc:109
-#, c-format
-msgid "checking %d files\n"
-msgstr "%d åã®ãã¡ã¤ã«ãæ¤è¨¼ä¸\n"
+#: commands.cc:3964
+msgid "REVID"
+msgstr "REVID"
-#: database_check.cc:111
-msgid "files"
-msgstr "ãã¡ã¤ã«"
+#: commands.cc:3965
+msgid "dump the roster associated with the given REVID"
+msgstr "æå®ã® REVID ã«ã¤ãã¦é¢é£ã¥ããããåç°¿ããã³ã"
-#: database_check.cc:116
-#, c-format
-msgid "checking file %s\n"
-msgstr "ãã¡ã¤ã« %s ãæ¤è¨¼ä¸\n"
+#: commands.cc:3983
+msgid "REV REV"
+msgstr "REV REV"
-#: database_check.cc:134
+#: commands.cc:3983
+msgid ""
+"Show what conflicts would need to be resolved to merge the given revisions."
+msgstr "æå®ã®ãªãã¸ã§ã³ãçµ±åããã®ã«è§£æ±ºãå¿
è¦ãªè¡çªã表示"
+
+#: commands.cc:3992 commands.cc:3994
#, c-format
-msgid "checking %d manifests\n"
-msgstr "%d åã®ãããã§ã¹ããæ¤è¨¼ä¸\n"
+msgid "%s in an ancestor of %s; no merge is needed."
+msgstr "%s 㯠%s ã®ç¥å
; çµ±åã¯å¿
è¦ããã¾ãã"
-#: database_check.cc:136 rcs_import.cc:1258
-msgid "manifests"
-msgstr "ãããã§ã¹ã"
-
-#: database_check.cc:141
+#: commands.cc:4008
#, c-format
-msgid "checking manifest %s\n"
-msgstr "ãããã§ã¹ã %s ãæ¤è¨¼ä¸\n"
+msgid "There are %s node_name_conflicts."
+msgstr "%s node_name_conflicts ãããã¾ã"
-#: database_check.cc:153
+#: commands.cc:4009
#, c-format
-msgid "error parsing manifest %s: %s"
-msgstr "ãããã§ã¹ã %s: %s ã解æä¸ã«ã¨ã©ã¼"
+msgid "There are %s file_content_conflicts."
+msgstr "%s file_content_conflicts ãããã¾ã"
-#: database_check.cc:190
+#: commands.cc:4010
#, c-format
-msgid "checking %d revisions\n"
-msgstr "%d åã®ãªãã¸ã§ã³ãæ¤è¨¼ä¸\n"
+msgid "There are %s node_attr_conflicts."
+msgstr "%s node_attr_conflicts ãããã¾ã"
-#: database_check.cc:192 database_check.cc:380 netsync.cc:3497
-#: rcs_import.cc:1257
-msgid "revisions"
-msgstr "ãªãã¸ã§ã³"
-
-#: database_check.cc:197
+#: commands.cc:4011
#, c-format
-msgid "checking revision %s\n"
-msgstr "ãªãã¸ã§ã³ %s ãæ¤è¨¼ä¸\n"
+msgid "There are %s orphaned_node_conflicts."
+msgstr "%s orphaned_node_conflicts ãããã¾ã"
-#: database_check.cc:209
+#: commands.cc:4012
#, c-format
-msgid "error parsing revision %s: %s"
-msgstr "ãªãã¸ã§ã³ %s: %s ã解æä¸ã«ã¨ã©ã¼"
+msgid "There are %s rename_target_conflicts."
+msgstr "%s rename_target_conflicts ãããã¾ã"
-#: database_check.cc:277
+#: commands.cc:4013
#, c-format
-msgid "checked %d revisions after starting with %d\n"
-msgstr "%d åã®ãªãã¸ã§ã³ã %d ããã¯ããã¦æ¤è¨¼ãã¾ãã\n"
+msgid "There are %s directory_loop_conflicts."
+msgstr "%s directory_loop_conflicts ãããã¾ã"
-#: database_check.cc:289
-#, c-format
-msgid "checking %d ancestry edges\n"
-msgstr "%d åã®ç¥å
ã®ç«¯ãæ¤è¨¼ä¸\n"
+#: database_check.cc:125
+msgid "files"
+msgstr "ãã¡ã¤ã«"
-#: database_check.cc:291
+#: database_check.cc:154
+msgid "rosters"
+msgstr "åç°¿"
+
+#: database_check.cc:221
+msgid "markings"
+msgstr "å°"
+
+#: database_check.cc:319 netsync.cc:2782 rcs_import.cc:1226
+msgid "revisions"
+msgstr "ãªãã¸ã§ã³"
+
+#: database_check.cc:418
msgid "ancestry"
msgstr "ç¥å
"
-#: database_check.cc:322
-#, c-format
-msgid "checking %d public keys\n"
-msgstr "%d åã®å
¬ééµãæ¤è¨¼ä¸\n"
-
-#: database_check.cc:324 netsync.cc:3501
+#: database_check.cc:451 netsync.cc:2786
msgid "keys"
msgstr "éµ"
-#: database_check.cc:348
-#, c-format
-msgid "checking %d revision certs\n"
-msgstr "%d åã®ãªãã¸ã§ã³è¨¼æãæ¤è¨¼ä¸\n"
-
-#: database_check.cc:350 netsync.cc:3499
+#: database_check.cc:477
msgid "certs"
msgstr "証æ"
-#: database_check.cc:378
+#: database_check.cc:514
#, c-format
-msgid "checking local history of %d revisions\n"
-msgstr "%d åã®ãªãã¸ã§ã³ã®ãã¼ã«ã«ã®å±¥æ´ãæ¤è¨¼ä¸\n"
-
-#: database_check.cc:413
-#, c-format
msgid "file %s missing (%d manifest references)\n"
msgstr "ãã¡ã¤ã« %s ãããã¾ãã (ãããã§ã¹ãåç
§: %d)\n"
-#: database_check.cc:420
+#: database_check.cc:521
#, c-format
msgid "file %s unreferenced\n"
msgstr "ãã¡ã¤ã« %s ã¯åç
§ããã¦ãã¾ãã\n"
-#: database_check.cc:442
+#: database_check.cc:542
#, c-format
-msgid "manifest %s missing (%d revision references)\n"
-msgstr "ãããã§ã¹ã %s ãããã¾ãã (ãªãã¸ã§ã³åç
§: %d)\n"
+msgid "roster %s unreferenced\n"
+msgstr "åç°¿ %s ã¯åç
§ããã¦ãã¾ãã\n"
-#: database_check.cc:449
+#: database_check.cc:548
#, c-format
-msgid "manifest %s unreferenced\n"
-msgstr "ãããã§ã¹ã %s ã¯åç
§ããã¦ãã¾ãã\n"
+msgid "roster %s incomplete (%d missing files)\n"
+msgstr "åç°¿ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããã¡ã¤ã«: %d)\n"
-#: database_check.cc:455
+#: database_check.cc:555
#, c-format
-msgid "manifest %s incomplete (%d missing files)\n"
-msgstr "ãããã§ã¹ã %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããã¡ã¤ã«: %d)\n"
+msgid "roster %s incomplete (%d missing revisions)\n"
+msgstr "åç°¿ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããªãã¸ã§ã³: %d)\n"
-#: database_check.cc:462
+#: database_check.cc:562
#, c-format
-msgid "manifest %s is not parseable (perhaps with unnormalized paths?)\n"
-msgstr "ãããã§ã¹ã %s ã解æã§ãã¾ãã (ãã¹ãæ£è¦åããã¦ããªãã®ã§ã¯?)\n"
+msgid "roster %s is not parseable (perhaps with unnormalized paths?)\n"
+msgstr "åç°¿ %s ã解æã§ãã¾ãã (ãã¹ãæ£è¦åããã¦ããªãã®ã§ã¯?)\n"
-#: database_check.cc:469
+#: database_check.cc:569
#, c-format
-msgid "manifest %s is not in normalized form\n"
-msgstr "ãããã§ã¹ã %s ã¯æ£è¦åãããå½¢å¼ã«ãªã£ã¦ãã¾ãã\n"
+msgid "roster %s is not in normalized form\n"
+msgstr "åç°¿ %s ã¯æ£è¦åãããå½¢å¼ã«ãªã£ã¦ãã¾ãã\n"
-#: database_check.cc:493
+#: database_check.cc:594
#, c-format
-msgid "revision %s missing (%d revision references; %d cert references)\n"
-msgstr "ãªãã¸ã§ã³ %s ãããã¾ãã (ãªãã¸ã§ã³åç
§: %d, 証æåç
§: %d)\n"
+msgid ""
+"revision %s missing (%d revision references; %d cert references; %d parent "
+"references; %d child references; %d roster references)\n"
+msgstr ""
+"ãªãã¸ã§ã³ %s ãããã¾ãã (ãªãã¸ã§ã³åç
§: %d, 証æåç
§: %d, 親åç
§: %d, å"
+"åç
§: %d, åç°¿åç
§: %d)\n"
-#: database_check.cc:500
+#: database_check.cc:602
#, c-format
msgid "revision %s incomplete (%d missing manifests)\n"
msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããããã§ã¹ã: %d)\n"
-#: database_check.cc:507
+#: database_check.cc:609
#, c-format
msgid "revision %s incomplete (%d missing revisions)\n"
msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããªãã¸ã§ã³: %d)\n"
-#: database_check.cc:514
+#: database_check.cc:616
#, c-format
-msgid "revision %s incomplete (%d incomplete manifests)\n"
-msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (ä¸å®å
¨ãªãããã§ã¹ã: %d)\n"
+msgid "revision %s incomplete (missing roster link)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ã®ãªã³ã¯ãããã¾ãã)\n"
-#: database_check.cc:521
+#: database_check.cc:622
#, c-format
+msgid "revision %s incomplete (missing roster)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ãããã¾ãã)\n"
+
+#: database_check.cc:628
+#, c-format
+msgid "revision %s mismatched roster and manifest\n"
+msgstr "ãªãã¸ã§ã³ %s ã®åç°¿ã¨ãããã§ã¹ããä¸è´ãã¦ãã¾ãã\n"
+
+#: database_check.cc:634
+#, c-format
+msgid "revision %s incomplete (incomplete roster)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ãä¸å®å
¨)\n"
+
+#: database_check.cc:640
+#, c-format
msgid ""
"revision %s mismatched parents (%d ancestry parents; %d revision refs)\n"
msgstr "ãªãã¸ã§ã³ %s ã¯è¦ªã¨ä¸ä¸è´ã§ã (親: %d; ãªãã¸ã§ã³åç
§: %d)\n"
-#: database_check.cc:530
+#: database_check.cc:649
#, c-format
msgid "revision %s mismatched children (%d ancestry children; %d parents)\n"
msgstr "ãªãã¸ã§ã³ %s ã¯åã¨ä¸ä¸è´ã§ã (å: %d; 親: %d)\n"
-#: database_check.cc:542
+#: database_check.cc:661
#, c-format
msgid "revision %s has bad history (%s)\n"
msgstr "ãªãã¸ã§ã³ %s ã¯ä¸æ£ãªå±¥æ´ (%s) ãæã£ã¦ãã¾ã\n"
-#: database_check.cc:549
+#: database_check.cc:668
#, c-format
msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n"
msgstr "ãªãã¸ã§ã³ %s ã解æã§ãã¾ãã (ãã¹ãæ£è¦åããã¦ããªãã®ã§ã¯?)\n"
-#: database_check.cc:556
+#: database_check.cc:675
#, c-format
msgid "revision %s is not in normalized form\n"
msgstr "ãªãã¸ã§ã³ %s ã¯æ£è¦åãããå½¢å¼ã§ã¯ããã¾ãã\n"
-#: database_check.cc:573
+#: database_check.cc:699
#, c-format
-msgid "key %s signed %d certs\n"
-msgstr "éµ %s 㯠%d åã®è¨¼æã®ç½²åã«ä½¿ããã¦ãã¾ã\n"
-
-#: database_check.cc:580
-#, c-format
msgid "key %s missing (signed %d certs)\n"
msgstr "éµ %s ãããã¾ãã (%d åã®è¨¼æãç½²å)\n"
-#: database_check.cc:613
+#: database_check.cc:732
#, c-format
msgid "revision %s unchecked signature in %s cert from missing key %s\n"
msgstr ""
"ãªãã¸ã§ã³ %s ã® %s 証æ(失ãããéµ %s) ã®ç½²åã¯æ¤è¨¼ããããã®ã§ã¯ããã¾ã"
"ã\n"
-#: database_check.cc:621
+#: database_check.cc:740
#, c-format
msgid "revision %s bad signature in %s cert from key %s\n"
msgstr "ãªãã¸ã§ã³ %s ã® %s 証æ (éµ %s) ã®ä¸æ£ãªç½²åãç¡è¦ãã¾ã\n"
-#: database_check.cc:636
+#: database_check.cc:755
#, c-format
msgid "revision %s missing %s cert\n"
msgstr "ãªãã¸ã§ã³ %s 㯠%s 証æãæ¬ ãã¦ãã¾ã\n"
-#: database_check.cc:645
+#: database_check.cc:764
#, c-format
msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n"
msgstr "ãªãã¸ã§ã³ %s ã¯è¨¼æã«åè´ãã¾ãã (%d ä½è
%d æ¥æ %d å¤æ´ãã°)\n"
-#: database_check.cc:717
+#: database_check.cc:844
#, c-format
msgid "%d missing files\n"
msgstr "ã¿ã¤ãããªããã¡ã¤ã«: %d\n"
-#: database_check.cc:719
+#: database_check.cc:846
#, c-format
msgid "%d unreferenced files\n"
msgstr "åç
§ããã¦ããªããã¡ã¤ã«: %d\n"
-#: database_check.cc:722
+#: database_check.cc:849
#, c-format
-msgid "%d missing manifests\n"
-msgstr "ã¿ã¤ãããªããããã§ã¹ã: %d\n"
+msgid "%d unreferenced rosters\n"
+msgstr "åç
§ããã¦ããªãåç°¿: %d\n"
-#: database_check.cc:724
+#: database_check.cc:851
#, c-format
-msgid "%d unreferenced manifests\n"
-msgstr "åç
§ããã¦ããªããããã§ã¹ã: %d\n"
+msgid "%d incomplete rosters\n"
+msgstr "ä¸å®å
¨ãªåç°¿: %d\n"
-#: database_check.cc:726
+#: database_check.cc:853
#, c-format
-msgid "%d incomplete manifests\n"
-msgstr "ä¸å®å
¨ãªãããã§ã¹ã: %d\n"
+msgid "%d rosters not parseable (perhaps with invalid paths)\n"
+msgstr "解æã§ããªãåç°¿ (ãã¹ãä¸é©åãªã®ã§ã¯?): %d\n"
-#: database_check.cc:728
+#: database_check.cc:856
#, c-format
-msgid "%d manifests not parseable (perhaps with invalid paths)\n"
-msgstr "解æã§ããªããããã§ã¹ã(ä¸é©åãªãã¹ãæå®ãã¦ãã¾ããã?): %d\n"
+msgid "%d rosters not in normalized form\n"
+msgstr "æ£è¦åãããå½¢å¼ã«ãªã£ã¦ããªãåç°¿: %d\n"
-#: database_check.cc:731
+#: database_check.cc:859
#, c-format
-msgid "%d manifests not in normalized form\n"
-msgstr "æ£è¦åãããå½¢å¼ã«ãªã£ã¦ããªããããã§ã¹ã: %d\n"
-
-#: database_check.cc:734
-#, c-format
msgid "%d missing revisions\n"
msgstr "ã¿ã¤ãããªããªãã¸ã§ã³: %d\n"
-#: database_check.cc:736
+#: database_check.cc:861
#, c-format
msgid "%d incomplete revisions\n"
msgstr "ä¸å®å
¨ãªãªãã¸ã§ã³: %d\n"
-#: database_check.cc:738
+#: database_check.cc:863
#, c-format
msgid "%d mismatched parents\n"
msgstr "ä¸è´ããªã親: %d\n"
-#: database_check.cc:740
+#: database_check.cc:865
#, c-format
msgid "%d mismatched children\n"
msgstr "ä¸è´ããªãå: %d\n"
-#: database_check.cc:742
+#: database_check.cc:867
#, c-format
msgid "%d revisions with bad history\n"
msgstr "ä¸æ£ãªå±¥æ´ãæã¤ãªãã¸ã§ã³: %d\n"
-#: database_check.cc:744
+#: database_check.cc:869
#, c-format
msgid "%d revisions not parseable (perhaps with invalid paths)\n"
msgstr "解æã§ããªããªãã¸ã§ã³ (ãã¹ãä¸é©åãªã®ã§ã¯?): %d\n"
-#: database_check.cc:747
+#: database_check.cc:872
#, c-format
msgid "%d revisions not in normalized form\n"
msgstr "æ£è¦åãããå½¢å¼ã«ãªã£ã¦ããªããªãã¸ã§ã³: %d\n"
-#: database_check.cc:750
+#: database_check.cc:876
#, c-format
+msgid "%d unreferenced roster links\n"
+msgstr "åç
§ããã¦ããªãåç°¿ãªã³ã¯: %d\n"
+
+#: database_check.cc:879
+#, c-format
+msgid "%d missing rosters\n"
+msgstr "ã¿ã¤ãããªãåç°¿: %d\n"
+
+#: database_check.cc:883
+#, c-format
msgid "%d missing keys\n"
msgstr "ã¿ã¤ãããªãéµ: %d\n"
-#: database_check.cc:753
+#: database_check.cc:886
#, c-format
msgid "%d missing certs\n"
msgstr "ã¿ã¤ãããªã証æ: %d\n"
-#: database_check.cc:755
+#: database_check.cc:888
#, c-format
msgid "%d mismatched certs\n"
msgstr "ä¸è´ããªã証æ: %d\n"
-#: database_check.cc:757
+#: database_check.cc:890
#, c-format
msgid "%d unchecked signatures due to missing keys\n"
msgstr "éµãã¿ã¤ãããªãããã«æ¤è¨¼ããã¦ããªãç½²å: %d\n"
-#: database_check.cc:759
+#: database_check.cc:892
#, c-format
msgid "%d bad signatures\n"
msgstr "ä¸æ£ãªç½²å: %d\n"
-#: database_check.cc:784
+#: database_check.cc:918
#, c-format
-msgid ""
-"check complete: %d files; %d manifests; %d revisions; %d keys; %d certs\n"
-msgstr ""
-"æ¤è¨¼å®äº: %d ãã¡ã¤ã«; %d ãããã§ã¹ã; %d ãªãã¸ã§ã³; %d éµ; %d 証æ\n"
+msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs\n"
+msgstr "æ¤è¨¼å®äº: ãã¡ã¤ã«: %d, åç°¿: %d, ãªãã¸ã§ã³: %d, éµ: %d, 証æ: %d\n"
-#: database_check.cc:790
+#: database_check.cc:924
#, c-format
msgid "total problems detected: %d (%d serious)\n"
msgstr "æ¤åºããé害ç·è¨: %d (æ·±å»: %d)\n"
-#: database_check.cc:792
+#: database_check.cc:926
#, c-format
msgid "serious problems detected"
msgstr "æ·±å»ãªåé¡ãæ¤åºãã¾ãã"
-#: database_check.cc:794
+#: database_check.cc:928
#, c-format
msgid "minor problems detected\n"
msgstr "軽微ãªåé¡ãæ¤åºãã¾ãã\n"
-#: database_check.cc:796
+#: database_check.cc:930
#, c-format
msgid "database is good\n"
msgstr "ãã¼ã¿ãã¼ã¹ã¯æ£å¸¸ã§ã\n"
-#: database.cc:86
+#: database.cc:141
#, c-format
msgid ""
"layout of database %s doesn't match this version of monotone\n"
"wanted schema %s, got %s\n"
-"try 'monotone db migrate' to upgrade\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"
+"(ããã¯ä¸å¯éã§ãã®ã§ãã¾ãããã¯ã¢ãããã¨ã£ãæ¹ãããã§ããã)"
-#: database.cc:147
+#: database.cc:155
#, c-format
+msgid "this database already contains rosters"
+msgstr "ãã®ãã¼ã¿ãã¼ã¹ã«ã¯æ¢ã«åç°¿ãå«ã¾ãã¦ãã¾ã"
+
+#: database.cc:175
+#, c-format
+msgid ""
+"database %s contains revisions but no rosters\n"
+"if you are a project leader or doing local testing:\n"
+" see the file UPGRADE for instructions on upgrading.\n"
+"if you are not a project leader:\n"
+" wait for a leader to migrate project data, and then\n"
+" pull into a fresh database.\n"
+"sorry about the inconvenience."
+msgstr ""
+"ãã¼ã¿ãã¼ã¹ %s ã«ã¯ãªãã¸ã§ã³ã¯ããã¾ããåç°¿ãããã¾ãã\n"
+"ããªããããã¸ã§ã¯ããªã¼ãã¼ã¾ãã¯ãã¼ã«ã«ã§ãã¹ãä¸ã§ãããªã\n"
+"ãã¡ã¤ã« UPGRADE ã®æ示ã«å¾ã£ã¦ã¢ããã°ã¬ã¼ããã¦ä¸ããã\n"
+"ããã¸ã§ã¯ããªã¼ãã¼ã§ã¯ãªãã®ãªããªã¼ãã¼ãããã¸ã§ã¯ãã®ãã¼ã¿ã\n"
+"çµ±åããæ°ãããã¼ã¿ãã¼ã¹ã«åãè¾¼ãã®ãå¾
ã£ã¦ä¸ããã\n"
+"ä¸ä¾¿ã§ãã¿ã¾ããã"
+
+#: database.cc:194
+#, c-format
+msgid ""
+"database %s contains manifests but no revisions\n"
+"this is a very old database; it needs to be upgraded\n"
+"please see README.changesets for details"
+msgstr ""
+"ãã¼ã¿ãã¼ã¹ %s ã«ã¯ãããã§ã¹ãã¯ããã¾ãããªãã¸ã§ã³ãããã¾ãã\n"
+"ãã®ãã¼ã¿ãã¼ã¹ã¯å¤ãããã®ã§ã¢ããã°ã¬ã¼ãããå¿
è¦ãããã¾ã\n"
+"詳細ã«ã¤ãã¦ã¯ README.changesets ãåç
§ãã¦ä¸ãã"
+
+#: database.cc:230
+#, c-format
msgid "unable to probe database version in file %s"
msgstr "ãã¡ã¤ã« %s å
ã®ãã¼ã¿ãã¼ã¹ãã¼ã¸ã§ã³ãæ¤åºã§ãã¾ããã§ãã"
-#: database.cc:154
+#: database.cc:237
#, c-format
msgid "database %s is not an sqlite version 3 file, try dump and reload"
msgstr ""
"ãã¼ã¿ãã¼ã¹ %s 㯠SQLite ver. 3 ã®ãã¡ã¤ã«ã§ã¯ããã¾ããããã³ãããå¾å度èª"
"ã¿è¾¼ãã§ã¿ã¦ä¸ãã"
-#: database.cc:176 database.cc:187
-#, c-format
-msgid "sqlite error: %d: %s"
-msgstr "SQLite ã¨ã©ã¼: %d: %s"
+#: database.cc:266 schema_migration.cc:187
+msgid ""
+"make sure database and containing directory are writeable\n"
+"and you have not run out of disk space"
+msgstr ""
+"ãã¼ã¿ãã¼ã¹ã¨ãããå«ããã£ã¬ã¯ããªãæ¸ãè¾¼ã¿å¯è½ã§ãããã\n"
+"ããã¦ãã£ã¹ã¯å®¹éãä¸è¶³ãã¦ããªãã確èªãã¦ä¸ãã"
-#: database.cc:181
-msgid "make sure database and containing directory are writeable"
+#: database.cc:272 schema_migration.cc:192
+#, c-format
+msgid ""
+"sqlite error: %s\n"
+"%s"
msgstr ""
-"ãã¼ã¿ãã¼ã¹ã¨ãããå«ããã£ã¬ã¯ããªãæ¸ãè¾¼ã¿å¯è½ã§ããã確èªãã¦ä¸ãã"
+"sqlite ã¨ã©ã¼: %s\n"
+"%s"
-#: database.cc:226
+#: database.cc:318
#, c-format
msgid "could not initialize database: %s: already exists"
msgstr "ãã¼ã¿ãã¼ã¹ãåæåã§ãã¾ããã§ãã: %s: æ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:231
+#: database.cc:323
#, c-format
msgid ""
"existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -2206,304 +1829,126 @@
"ãå¹¹ãæã£ã¦ãã¾ã\n"
"ãã¼ã¿ãã¼ã¹ä½æãä¸æ¢ãã¾ã"
-#: database.cc:353
+#: database.cc:473
#, c-format
msgid "cannot create %s; it already exists"
msgstr "%s ãä½æã§ãã¾ãã; æ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:417
+#: database.cc:537
#, c-format
msgid ""
"schema version : %s\n"
"counts:\n"
-" full manifests : %u\n"
-" manifest deltas : %u\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"
"bytes:\n"
-" full manifests : %u\n"
-" manifest deltas : %u\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"
" total : %u\n"
+"database:\n"
+" page size : %u\n"
+" cache size : %u\n"
msgstr ""
"ã¹ãã¼ããã¼ã¸ã§ã³ : %s\n"
"åæ°:\n"
-" å®å
¨ãªãããã§ã¹ã: %u\n"
-" ãããã§ã¹ãå·®å : %u\n"
+" å®å
¨ãªåç°¿ : %u\n"
+" å簿詳細 : %u\n"
" å®å
¨ãªãã¡ã¤ã« : %u\n"
" ãã¡ã¤ã«å·®å : %u\n"
" ãªãã¸ã§ã³ : %u\n"
" ç¥å
ã®å
端 : %u\n"
" 証æ : %u\n"
"ãã¤ãæ°:\n"
-" å®å
¨ãªãããã§ã¹ã: %u\n"
-" ãããã§ã¹ãå·®å : %u\n"
+" å®å
¨ãªåç°¿ : %u\n"
+" å簿詳細 : %u\n"
" å®å
¨ãªãã¡ã¤ã« : %u\n"
" ãã¡ã¤ã«å·®å : %u\n"
" ãªãã¸ã§ã³ : %u\n"
" ãã£ãã·ã¥æ¸ã®ç¥å
: %u\n"
" 証æ : %u\n"
" ç·è¨ : %u\n"
+"ãã¼ã¿ãã¼ã¹:\n"
+" ãã¼ã¸ãµã¤ãº : %u\n"
+" ãã£ãã·ã¥ãµã¤ãº : %u\n"
-#: database.cc:471
+#: database.cc:597
#, c-format
msgid "database schema version: %s"
msgstr "åºæºã¹ãã¼ããã¼ã¸ã§ã³: %s"
-#: database.cc:490
-msgid "mcerts"
-msgstr "mcerts"
-
-#: database.cc:491
-msgid "pubkeys"
-msgstr "å
¬ééµ"
-
-#: database.cc:492
-msgid "privkeys"
-msgstr "ç§å¯éµ"
-
-#: database.cc:536
+#: database.cc:674
#, c-format
-msgid "statement cache statistics\n"
-msgstr "ã¹ãã¼ãã¡ã³ããã£ãã·ã¥çµ±è¨\n"
-
-#: database.cc:537
-#, c-format
-msgid "prepared %d statements\n"
-msgstr "%d åã®ããªãã¢ã¼ãã¹ãã¼ãã¡ã³ã\n"
-
-#: database.cc:541
-#, c-format
-msgid "%d executions of %s\n"
-msgstr "%d å®è¡ (%s)\n"
-
-#: database.cc:594
-#, c-format
-msgid "prepared statement %s\n"
-msgstr "ããªãã¢ã¼ãã¹ãã¼ãã¡ã³ã %s\n"
-
-#: database.cc:598
-#, c-format
msgid "multiple statements in query: %s\n"
msgstr "ã¯ã¨ãªä¸ã«è¤æ°ã®ã¹ãã¼ãã¡ã³ã: %s\n"
-#: database.cc:604
+#: database.cc:680
#, c-format
msgid "wanted %d columns got %d in query: %s\n"
msgstr "ã¯ã¨ãªã§ %d åè¦æ±ãã¾ãããå¾ãã®ã¯ %d åã§ã: %s\n"
-#: database.cc:610
+#: database.cc:739
#, c-format
-msgid "binding %d parameters for %s\n"
-msgstr "%d å¤æ°ã %s ã«ãã¤ã³ã\n"
-
-#: database.cc:624
-#, c-format
-msgid "binding %d with value '%s'\n"
-msgstr "%d ãå¤ '%s' ã«ãã¤ã³ã\n"
-
-#: database.cc:640
-#, c-format
msgid "null result in query: %s\n"
msgstr "ã¯ã¨ãªä¸ã«çµæ null ãå«ã¾ãã¦ãã¾ã: %s\n"
-#: database.cc:658
+#: database.cc:757
#, c-format
msgid "wanted %d rows got %s in query: %s\n"
msgstr "ã¯ã¨ãªã§ %d è¡è¦æ±ãã¾ãããå¾ãã®ã¯ %s ã§ã: %s\n"
-#: database.cc:668
+#: database.cc:1777
#, c-format
-msgid "cannot change filename to %s while db is open"
-msgstr "ãã¼ã¿ãã¼ã¹ã使ç¨ä¸ãªã®ã§ãã¡ã¤ã«åã %s ã«å¤æ´ãããã¨ãã§ãã¾ãã"
-
-#: database.cc:686
-#, c-format
-msgid ""
-"Attempt to start exclusive transaction within non-exclusive transaction."
-msgstr ""
-
-#: database.cc:880
-#, c-format
-msgid "version cache expiring %s\n"
-msgstr "ãã¼ã¸ã§ã³ãã£ãã·ã¥ã®æå¹æéãåãã¦ãã¾ã: %s\n"
-
-#: database.cc:902
-#, c-format
-msgid "version cache hit on %s\n"
-msgstr "ãã¼ã¸ã§ã³ãã£ãã·ã¥ããã: %s\n"
-
-#: database.cc:971
-#, c-format
-msgid "reconstructing %s in %s\n"
-msgstr "%s (%s å
)ãåæ§ç¯ä¸\n"
-
-#: database.cc:1077
-#, c-format
-msgid "following delta %s -> %s\n"
-msgstr "ç¶ãå·®å %s -> %s\n"
-
-#: database.cc:1499
-#, c-format
-msgid "Killing revision %s locally\n"
-msgstr "ãã¼ã«ã«ã«ãªãã¸ã§ã³ %s ãåé¤\n"
-
-#: database.cc:1511
-#, c-format
-msgid "Deleting all references to branch %s\n"
-msgstr "ãã©ã³ã %s ã¸ã®ãã¹ã¦ã®åç
§ãåé¤\n"
-
-#: database.cc:1524
-#, c-format
-msgid "Deleting all references to tag %s\n"
-msgstr "ã¿ã° %s ã¸ã®ãã¹ã¦ã®ãªãã¡ã¬ã³ã¹ãåé¤\n"
-
-#: database.cc:1625
-#, c-format
msgid "another key with name '%s' already exists"
msgstr "'%s' ã¨ããååã®ä»ã®éµãæ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:2253
-#, fuzzy, c-format
-msgid "after get_branch_heads for %s, heads has %d entries\n"
-msgstr "ãã©ã³ã %s ã«ã¯ %d åã®ã¨ã³ããªãããã¾ã\n"
-
-#: database.cc:2276
+#: database.cc:2833
#, c-format
-msgid "processing selector type %d with i->second '%s'\n"
-msgstr ""
-
-#: database.cc:2283
-#, fuzzy, c-format
-msgid "limiting to current branch '%s'\n"
-msgstr "ãã©ã³ã %s ã¸ã®ãã¹ã¦ã®åç
§ãåé¤\n"
-
-#: database.cc:2513
-#, c-format
msgid "no database specified"
msgstr "ãã¼ã¿ãã¼ã¹æªæå®"
-#: database.cc:2521
+#: database.cc:2841
#, c-format
msgid "database %s does not exist"
msgstr "ãã¼ã¿ãã¼ã¹ %s ã¯åå¨ãã¾ãã"
-#: database.cc:2522
+#: database.cc:2842
#, c-format
msgid "%s is a directory, not a database"
msgstr "%s ã¯ãã¼ã¿ãã¼ã¹ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
-#: database.cc:2547
+#: database.cc:2867
#, c-format
msgid "could not open database '%s': %s"
msgstr "ãã¼ã¿ãã¼ã¹ '%s': %s ãéãã¾ããã§ãã"
-#: database.cc:2592
+#: diff_patch.cc:590
#, c-format
-msgid "attempting to rollback and close %d databases"
-msgstr ""
+msgid "file '%s' does not exist in workspace"
+msgstr "ãã¡ã¤ã« '%s' ã¯ã¯ã¼ã¯ã¹ãã¼ã¹å
ã«åå¨ãã¾ãã"
-#: database.cc:2601
+#: diff_patch.cc:591
#, c-format
-msgid "exec_err = %d, close_err = %d"
-msgstr ""
+msgid "'%s' in workspace is a directory, not a file"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã® '%s' ã¯ãã¡ã¤ã«ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
-#: diff_patch.cc:209
+#: diff_patch.cc:595
#, c-format
-msgid "exchanging preserved extent [%d+%d] with changed extent [%d+%d]\n"
+msgid "file %s in workspace has id %s, wanted %s"
msgstr ""
-"åã«ç¢ºä¿ããã¨ã¯ã¹ãã³ã [%d+%d] ãå¤æ´ãããã¨ã¯ã¹ãã³ã [%d+%d] ã«ç½®ãæã"
-"ã¦ãã¾ã\n"
+"ã¯ã¼ã¯ã¹ãã¼ã¹å
ã®ãã¡ã¤ã« %s ã® ID 㯠%s ã§ãããæå¾
ãããã®ã¯ %s ã§ã"
-#: diff_patch.cc:300
+#: diff_patch.cc:716
#, c-format
-msgid "conflicting edits: %s %d[%d] '%s' vs. %s %d[%d] '%s'\n"
-msgstr "競åããç·¨éç®æ: %s %d[%d] '%s' 対 %s %d[%d] '%s'\n"
-
-#: diff_patch.cc:328
-#, c-format
-msgid "conflicting edits: [%s %d %d] vs. [%s %d %d]\n"
-msgstr "競åããç·¨éç®æ: [%s %d %d] 対 [%s %d %d]\n"
-
-#: diff_patch.cc:376
-#, c-format
-msgid "calculating left edit script on %d -> %d lines\n"
-msgstr "%d -> %d è¡ã«ã¤ãã¦å·¦å´ãç·¨éããã¹ã¯ãªãããè¨ç®ä¸\n"
-
-#: diff_patch.cc:384
-#, c-format
-msgid "calculating right edit script on %d -> %d lines\n"
-msgstr "%d -> %d è¡ã«ã¤ãã¦å³å´ãç·¨éããã¹ã¯ãªãããè¨ç®ä¸\n"
-
-#: diff_patch.cc:392
-#, c-format
-msgid "calculating left extents on %d edits\n"
-msgstr "%d ç·¨éç®æã«ã¤ãã¦å·¦ã¨ã¯ã¹ãã³ããè¨ç®ä¸\n"
-
-#: diff_patch.cc:397
-#, c-format
-msgid "calculating right extents on %d edits\n"
-msgstr "%d ç·¨éç®æã«ã¤ãã¦å³ã¨ã¯ã¹ãã³ããè¨ç®ä¸\n"
-
-#: diff_patch.cc:402
-#, c-format
-msgid "normalizing %d right extents\n"
-msgstr "%d å³ã¨ã¯ã¹ãã³ããæ£è¦å\n"
-
-#: diff_patch.cc:405
-#, c-format
-msgid "normalizing %d left extents\n"
-msgstr "%d å·¦ã¨ã¯ã¹ãã³ããæ£è¦å\n"
-
-#: diff_patch.cc:411
-#, c-format
-msgid "conflicting prefixes\n"
-msgstr "競åãããã¬ãã£ã¯ã¹\n"
-
-#: diff_patch.cc:417
-#, c-format
-msgid "conflicting suffixes\n"
-msgstr "競åãããµãã£ãã¯ã¹\n"
-
-#: diff_patch.cc:421
-#, c-format
-msgid "merging %d left, %d right extents\n"
-msgstr "%d å·¦, %d å³ã¨ã¯ã¹ãã³ããçµ±å\n"
-
-#: diff_patch.cc:452
-#, c-format
-msgid "conflict detected. no merge.\n"
-msgstr "競åãæ¤åºãçµ±åãã¾ãã\n"
-
-#: diff_patch.cc:472
-#, c-format
-msgid "recording successful merge of %s <-> %s into %s\n"
-msgstr "%s <-> %s ãã %s ã¸ã®æåããçµ±åãè¨é²\n"
-
-#: diff_patch.cc:530
-#, c-format
-msgid "trying to merge %s <-> %s (ancestor: %s)\n"
-msgstr "%s <-> %s (ç¥å
: %s) ã®çµ±åã試ãã¦ãã¾ã\n"
-
-#: diff_patch.cc:535 diff_patch.cc:640
-#, c-format
-msgid "files are identical\n"
-msgstr "ãã¡ã¤ã«ã¯å
¨ãåãã§ã\n"
-
-#: diff_patch.cc:577
-#, c-format
-msgid "internal 3-way merged ok\n"
-msgstr "å
é¨ä¸å
çµ±åå®äº\n"
-
-#: diff_patch.cc:591
-#, c-format
msgid ""
"help required for 3-way merge\n"
"[ancestor] %s\n"
@@ -2517,54 +1962,6 @@
"[ å³] %s\n"
"[çµ±åæ¸] %s\n"
-#: diff_patch.cc:608
-#, c-format
-msgid "lua merge3 hook merged ok\n"
-msgstr "lua merge3 ããã¯çµ±åå®äº\n"
-
-#: diff_patch.cc:635
-#, c-format
-msgid "trying to merge %s <-> %s\n"
-msgstr "%s <-> %s ã®çµ±åã試ãã¦ãã¾ã\n"
-
-#: diff_patch.cc:651
-#, c-format
-msgid ""
-"help required for 2-way merge\n"
-"[ left] %s\n"
-"[ right] %s\n"
-"[ merged] %s\n"
-msgstr ""
-"äºå
çµ±åã«ã¯æå©ããå¿
è¦ã§ã\n"
-"[ å·¦] %s\n"
-"[ å³] %s\n"
-"[çµ±åæ¸] %s\n"
-
-#: diff_patch.cc:665
-#, c-format
-msgid "lua merge2 hook merged ok\n"
-msgstr "lua merge2 ããã¯çµ±åå®äº\n"
-
-#: diff_patch.cc:696
-#, c-format
-msgid "temporarily recording merge of %s <-> %s into %s\n"
-msgstr "ä¸æçã« %s <-> %s ãã %s ã¸ã®çµ±åãè¨é²\n"
-
-#: diff_patch.cc:713
-#, c-format
-msgid "file '%s' does not exist in working copy"
-msgstr "ãã¡ã¤ã« '%s' ã¯ä½æ¥ã³ãã¼ä¸ã«ã¯ããã¾ãã"
-
-#: diff_patch.cc:714
-#, c-format
-msgid "'%s' in working copy is a directory, not a file"
-msgstr "ä½æ¥ã³ãã¼å
ã® '%s' ã¯ãã¡ã¤ã«ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
-
-#: diff_patch.cc:718
-#, c-format
-msgid "file %s in working copy has id %s, wanted %s"
-msgstr "ä½æ¥ã³ãã¼å
ã®ãã¡ã¤ã« %s ã® ID 㯠%s ã§ããã欲ããã®ã¯ %s ã§ã"
-
#: file_io.cc:116
#, c-format
msgid "expected file '%s', but it is a directory."
@@ -2598,596 +1995,484 @@
msgid "failed to create directory '%s' for '%s'"
msgstr "ãã£ã¬ã¯ã㪠'%s' ('%s' ã®ããã®)ã®ä½æã«å¤±æãã¾ãã"
-#: file_io.cc:213
+#: file_io.cc:219
#, c-format
+msgid ""
+"could not remove '%s'\n"
+"%s"
+msgstr ""
+"'%s' ãåé¤ã§ãã¾ããã§ãã\n"
+"%s"
+
+#: file_io.cc:229
+#, c-format
msgid "file to delete '%s' does not exist"
msgstr "åé¤ãããã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-#: file_io.cc:214
+#: file_io.cc:230
#, c-format
msgid "file to delete, '%s', is not a file but a directory"
msgstr "åé¤ãããã¡ã¤ã« '%s' ã¯ãã¡ã¤ã«ã§ãªãããã£ã¬ã¯ããªã§ã"
-#: file_io.cc:222
+#: file_io.cc:238
#, c-format
+msgid "directory to delete '%s' does not exist"
+msgstr "åé¤ãããã£ã¬ã¯ã㪠'%s' ã¯åå¨ãã¾ãã"
+
+#: file_io.cc:239
+#, c-format
+msgid "directory to delete, '%s', is not a directory but a file"
+msgstr "åé¤ãããã£ã¬ã¯ã㪠'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ãªããã¡ã¤ã«ã§ã"
+
+#: file_io.cc:246
+#, c-format
+msgid "object to delete, '%s', does not exist"
+msgstr "åé¤ãããªãã¸ã§ã¯ã '%s' ã¯åå¨ãã¾ãã"
+
+#: file_io.cc:254
+#, c-format
msgid "directory to delete, '%s', does not exist"
msgstr "åé¤ãããã£ã¬ã¯ã㪠'%s' ã¯åå¨ãã¾ãã"
-#: file_io.cc:223
+#: file_io.cc:255
#, c-format
msgid "directory to delete, '%s', is a file"
msgstr "åé¤ãããã£ã¬ã¯ã㪠'%s' ã¯ãã¡ã¤ã«ã§ã"
-#: file_io.cc:232
+#: file_io.cc:264
#, c-format
msgid "rename source file '%s' does not exist"
msgstr "å称å¤æ´ããå
ã®ãã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-#: file_io.cc:233
+#: file_io.cc:265
#, c-format
msgid "rename source file '%s' is a directory -- bug in monotone?"
msgstr "å称å¤æ´å
ã®ãã¡ã¤ã« '%s' ã¯ãã£ã¬ã¯ããªã§ã -- monotone ã®ãã°?"
-#: file_io.cc:236 file_io.cc:249
+#: file_io.cc:268 file_io.cc:281
#, c-format
msgid "rename target '%s' already exists"
msgstr "å称å¤æ´ã¿ã¼ã²ãã '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: file_io.cc:245
+#: file_io.cc:277
#, c-format
msgid "rename source dir '%s' does not exist"
msgstr "å称å¤æ´å
ã®ãã£ã¬ã¯ã㪠'%s' ã¯åå¨ãã¾ãã"
-#: file_io.cc:246
+#: file_io.cc:278
#, c-format
msgid "rename source dir '%s' is a file -- bug in monotone?"
msgstr "å称å¤æ´å
ã®ãã£ã¬ã¯ã㪠'%s' ã¯ãã¡ã¤ã«ã§ã -- monotone ã®ãã°?"
-#: file_io.cc:260
+#: file_io.cc:292
#, c-format
msgid "rename source path '%s' does not exist"
msgstr "å称å¤æ´å
ã®ãã¹ '%s' ã¯åå¨ãã¾ãã"
-#: file_io.cc:275
+#: file_io.cc:307
#, c-format
msgid "file %s does not exist"
msgstr "ãã¡ã¤ã« %s ã¯åå¨ãã¾ãã"
-#: file_io.cc:276
+#: file_io.cc:308
#, c-format
msgid "file %s cannot be read as data; it is a directory"
msgstr "'%s' ã¯æå¾
ãã¦ãããã¡ã¤ã«ã§ã¯ãªãããã£ã¬ã¯ããªã§ã"
-#: file_io.cc:280
+#: file_io.cc:312
#, c-format
msgid "cannot open file %s for reading"
msgstr "ãã¡ã¤ã« %s ãèªã¿è¾¼ã¿ã®ããã«éããã¨ãã§ãã¾ãã"
-#: file_io.cc:347
+#: file_io.cc:381
#, c-format
msgid "Cannot read standard input multiple times"
msgstr "æ¨æºå
¥åãä½åº¦ãèªã¿è¾¼ããã¨ã¯ã§ãã¾ãã"
-#: file_io.cc:378
+#: file_io.cc:412
#, c-format
msgid "file '%s' cannot be overwritten as data; it is a directory"
msgstr "'%s' ã«ãã¼ã¿ãä¸æ¸ãã§ãã¾ããããã£ã¬ã¯ããªã§ã"
-#: file_io.cc:386
+#: file_io.cc:420
#, c-format
msgid "cannot open file %s for writing"
msgstr "ãã¡ã¤ã« %s ãæ¸ãè¾¼ã¿ã®ããã«éããã¨ãã§ãã¾ãã"
-#: file_io.cc:477
+#: file_io.cc:530
#, c-format
-msgid "ignoring book keeping entry %s\n"
-msgstr "è¨é²ç°¿ç¨ã¨ã³ã㪠%s ãç¡è¦ãã¾ã\n"
-
-#: file_io.cc:497
-#, c-format
msgid "caught runtime error %s constructing file path for %s\n"
msgstr "%s ã«ã¤ãã¦ãã¡ã¤ã«ãã¹ä½æä¸ã«å®è¡æã¨ã©ã¼ %s çºç\n"
-#: file_io.cc:521
+#: file_io.cc:569
#, c-format
msgid "no such file or directory: '%s'"
msgstr "ãã®ãããªãã¡ã¤ã«ã¾ãã¯ãã£ã¬ã¯ããªã¯ããã¾ãã: '%s'"
-#: keys.cc:42
+#: keys.cc:77
#, c-format
-msgid "running arc4 process on %d bytes of data\n"
-msgstr "ãã¼ã¿ %d ãã¤ãç®ã«ã¤ã㦠arc4 ããã»ã¹ãå®è¡ä¸\n"
-
-#: keys.cc:76
-#, c-format
msgid "got empty passphrase from get_passphrase() hook"
msgstr "get_passphrase() ããã¯ã¯ç©ºã®ãã¹ãã¬ã¼ãºãè¿ãã¾ãã"
-#: keys.cc:92
+#: keys.cc:93
#, c-format
msgid "empty passphrase not allowed"
msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«ã§ãã¾ãã"
-#: keys.cc:99
+#: keys.cc:100
#, c-format
msgid "confirm passphrase for key ID [%s]: "
msgstr "éµ ID [%s] ã®ãã¹ãã¬ã¼ãºã確èª: "
-#: keys.cc:104
+#: keys.cc:105
#, c-format
msgid "empty passphrases not allowed, try again\n"
msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«ã§ãã¾ãã. å度試ãã¦ä¸ãã\n"
-#: keys.cc:105 keys.cc:112
+#: keys.cc:106 keys.cc:113
#, c-format
msgid "too many failed passphrases\n"
msgstr "ãã¹ãã¬ã¼ãºã®å
¥åãã¹ãå¤ããã¾ã\n"
-#: keys.cc:111
+#: keys.cc:112
#, c-format
msgid "passphrases do not match, try again\n"
msgstr "ãã¹ãã¬ã¼ãºãä¸è´ãã¾ãããå度試ãã¦ä¸ãã\n"
-#: keys.cc:118
+#: keys.cc:119
#, c-format
msgid "no passphrase given"
msgstr "ãã¹ãã¬ã¼ãºãæå®ãã¦ä¸ãã"
-#: keys.cc:177
-#, c-format
-msgid ""
-"generated %d-byte public key\n"
-"generated %d-byte (encrypted) private key\n"
-msgstr ""
-"%d ãã¤ãã®å
¬ééµãçæ\n"
-"%d ãã¤ãã®(æå·åããã)ç§å¯éµãçæ\n"
-
-#: keys.cc:194
-#, c-format
-msgid "base64-decoding %d-byte private key\n"
-msgstr "%d ãã¤ãç§å¯éµã® base64 ãã³ã¼ã\n"
-
-#: keys.cc:199
-#, fuzzy, c-format
-msgid "have %d-byte encrypted private key\n"
-msgstr "%d ãã¤ãã®å¾©å·åãããç§å¯éµããç½²åãä½æä¸\n"
-
-#: keys.cc:244
-#, fuzzy, c-format
-msgid "base64-decoding %d-byte old private key\n"
-msgstr "%d ãã¤ãç§å¯éµã® base64 ãã³ã¼ã\n"
-
-#: keys.cc:255
-#, c-format
-msgid "building signer from %d-byte decrypted private key\n"
-msgstr "%d ãã¤ãã®å¾©å·åãããç§å¯éµããç½²åãä½æä¸\n"
-
-#: keys.cc:355
-#, c-format
-msgid "produced %d-byte signature\n"
-msgstr "%d ãã¤ãã®ç½²åãä½æ\n"
-
-#: keys.cc:383
-#, c-format
-msgid "building verifier for %d-byte pub key\n"
-msgstr "%d ãã¤ãã®å
¬ééµã«ã¤ãã¦èå¥åãæ§ç¯ä¸\n"
-
-#: keys.cc:405
-#, c-format
-msgid "checking %d-byte (%d decoded) signature\n"
-msgstr "%d ãã¤ã (%d ãã³ã¼ã)ã®ç½²åãæ¤è¨¼ä¸\n"
-
-#: keys.cc:531
-#, fuzzy, c-format
-msgid "no key pair '%s' found in key store or get_priv_key hook"
-msgstr ""
-"ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«ã get_priv_key ããã¯å
ã«ãã¿ã¤ããã¾ãã"
-
#: keys.cc:542
#, c-format
msgid "passphrase for '%s' is incorrect"
msgstr "'%s' ã«å¯¾ãããã¹ãã¬ã¼ãºãééã£ã¦ãã¾ã"
-#: lua.cc:119
+#: lua.cc:539 lua.cc:568 lua.cc:583
#, c-format
-msgid "lua failure: %s; stack = %s\n"
-msgstr "lua 失æ: %s; ã¹ã¿ã㯠= %s\n"
-
-#: lua.cc:126
-#, fuzzy, c-format
-msgid "Lua::ok(): failed"
-msgstr "Lua::ok(): 失æ = %i"
-
-#: lua.cc:135
-#, c-format
-msgid "lua stack: %s"
-msgstr "lua ã¹ã¿ãã¯: %s"
-
-#: lua.cc:215
-#, c-format
-msgid "lua: extracted string = %s"
-msgstr "lua: æ½åºæåå = %s"
-
-#: lua.cc:228
-#, c-format
-msgid "lua: extracted int = %i"
-msgstr "lua: æ½åº int = %i"
-
-#: lua.cc:241
-#, c-format
-msgid "lua: extracted double = %i"
-msgstr "lua: æ½åº double = %i"
-
-#: lua.cc:255
-#, c-format
-msgid "lua: extracted bool = %i"
-msgstr "lua: æ½åº bool = %i"
-
-#: lua.cc:375
-#, c-format
-msgid "loading lua hook %s"
-msgstr "lua ãã㯠%s ãèªã¿è¾¼ã¿ä¸"
-
-#: lua.cc:538 lua.cc:567 lua.cc:582
-#, fuzzy, c-format
msgid "%s called with an invalid parameter"
-msgstr "Include å¼åºãæã®å¤æ°ãä¸é©åã§ã"
+msgstr "%s å¼åºãæã®å¼æ°ãä¸é©åã§ã"
-#: lua.cc:585
+#: lua.cc:586
#, c-format
msgid "Directory '%s' does not exists"
msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯åå¨ãã¾ãã"
-#: lua.cc:586 rcs_import.cc:1248
+#: lua.cc:587 rcs_import.cc:1217 work.cc:420
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-#: lua.cc:605 lua.cc:900
+#: lua.cc:606 lua.cc:908
#, c-format
msgid "lua error while loading rcfile '%s'"
msgstr "åæåãã¡ã¤ã« '%s' ãèªã¿è¾¼ã¿ä¸ã« lua ã®ã¨ã©ã¼"
-#: lua.cc:897 lua.cc:910
+#: lua.cc:705
#, c-format
-msgid "opening rcfile '%s' ...\n"
-msgstr "åæåãã¡ã¤ã« '%s' ãéãã¦ãã¾ã...\n"
+msgid "bad input to parse_basic_io"
+msgstr "parse_basic_io ã«å¯¾ãä¸æ£ãªå
¥å"
-#: lua.cc:901 lua.cc:913
+#: lua.cc:920
#, c-format
-msgid "'%s' is ok\n"
-msgstr "'%s' OK\n"
-
-#: lua.cc:912
-#, c-format
msgid "lua error while loading '%s'"
msgstr "lua '%s' ãèªã¿è¾¼ã¿ä¸ã«ã¨ã©ã¼"
-#: lua.cc:917
+#: lua.cc:925
#, c-format
msgid "rcfile '%s' does not exist"
msgstr "åæåãã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-#: lua.cc:918
-#, c-format
-msgid "skipping nonexistent rcfile '%s'\n"
-msgstr "åå¨ããªãåæåãã¡ã¤ã« '%s' ãã¹ããã\n"
-
-#: lua.cc:1363
-#, c-format
-msgid "calling attr_init_function for %s"
-msgstr "%s ã«ã¤ã㦠attr_init_function ãå¼åºã"
-
-#: lua.cc:1367
-#, c-format
-msgid " calling an attr_init_function for %s"
-msgstr " %s ã«ã¤ã㦠attr_init_function ãå¼åºã"
-
-#: lua.cc:1380
-#, c-format
-msgid " added attr %s = %s"
-msgstr " å±æ§ %s = %s ã追å "
-
-#: lua.cc:1384
-#, c-format
-msgid " no attr added"
-msgstr " å±æ§è¿½å ãªã"
-
#: main.cc:325
-#, fuzzy
msgid "interrupted"
-msgstr "trusted"
+msgstr "å²è¾¼ã¿"
#: main.cc:329
msgid "terminated by signal"
-msgstr ""
+msgstr "ã·ã°ãã«ã§çµäº"
-#: manifest.cc:55
+#: merkle_tree.cc:276
#, c-format
-msgid "scanning file %s\n"
-msgstr "ãã¡ã¤ã« %s ãèµ°æ»ä¸\n"
-
-#: manifest.cc:188
-#, c-format
-msgid "missing %s"
-msgstr "%s ãã¿ã¤ããã¾ãã"
-
-#: manifest.cc:201
-#, fuzzy, c-format
-msgid ""
-"%d missing files\n"
-"to restore consistency, on each missing file run either\n"
-"'monotone drop FILE' to remove it permanently, or\n"
-"'monotone revert FILE' to restore it\n"
-"or to handle all at once, simple 'monotone drop --missing'\n"
-"or 'monotone revert --missing'"
-msgstr ""
-"ä¸è²«æ§ãä¿ã¤ããã«å¿
è¦ãª\n"
-"ãã¡ã¤ã«ã %d åã¿ã¤ããã¾ãããåã
ã®ãã¡ã¤ã«ã«ã¤ãã¦\n"
-"'monotone drop FILE' ã¨ãã¦æä¹
çã«ãã¡ã¤ã«ãåé¤ãããã\n"
-"'monotone revert FILE' ã¨ãã¦å¾©æ´»ããã¦ä¸ããã\n"
-
-#: merkle_tree.cc:281
-#, c-format
msgid "node level is %d, exceeds maximum %d"
msgstr "ãã¼ãã¬ãã« %d ã¯æ大å¶é %d ãè¶ãã¦ãã¾ã"
-#: merkle_tree.cc:317
+#: merkle_tree.cc:311
#, c-format
msgid "mismatched node hash value %s, expected %s"
msgstr "ä¸è´ããªããã¼ãããã·ã¥å¤ %sãæå¾
ãããã®ã¯ %s ã§ã"
-#: monotone.cc:51
+#: monotone.cc:53
msgid "select branch cert for operation"
msgstr "æä½ã®ããã®ãã©ã³ã証æãé¸æ"
-#: monotone.cc:52
+#: monotone.cc:54
msgid "select revision id for operation"
msgstr "æä½ã®ããã®ãªãã¸ã§ã³ ID ãé¸æ"
-#: monotone.cc:53
+#: monotone.cc:55
msgid "set commit changelog message"
msgstr "ã³ãããå¤æ´è¨é²ã¡ãã»ã¼ã¸ãè¨å®"
-#: monotone.cc:54
+#: monotone.cc:56
msgid "set filename containing commit changelog message"
msgstr "ã³ãããå¤æ´è¨é²ã¡ãã»ã¼ã¸ãå«ããã¡ã¤ã«ãè¨å®"
-#: monotone.cc:55
+#: monotone.cc:57
msgid "override date/time for commit"
msgstr "ã³ãããæã®æ¥æãä¸æ¸ãæå®"
-#: monotone.cc:56
+#: monotone.cc:58
msgid "override author for commit"
msgstr "ã³ãããæã®ä½æè
ãä¸æ¸ãæå®"
-#: monotone.cc:57
+#: monotone.cc:59
msgid "limit the number of levels of directories to descend"
msgstr "éä¸ãããã£ã¬ã¯ããªã®æ·±ããå¶é"
-#: monotone.cc:58
-msgid "limit the log output to the given number of entries"
-msgstr "ãã°åºåã®ã¨ã³ããªã®æ°ãå¶é"
+#: monotone.cc:60
+msgid "limit log output to the last number of entries"
+msgstr "ãã°åºåã®ã¨ã³ããªæ°(æè¿)ãå¶é"
-#: monotone.cc:59
+#: monotone.cc:61
+msgid "limit log output to the next number of entries"
+msgstr "ãã°åºåã®ã¨ã³ããªæ°(次)ãå¶é"
+
+#: monotone.cc:62
msgid "record process id of server"
msgstr "ãµã¼ãã¼ã®ããã»ã¹ ID ãè¨é²"
-#: monotone.cc:60
+#: monotone.cc:63
msgid "print a brief version of the normal output"
msgstr "é常åºåã®ç°¡åãªãã¼ã¸ã§ã³ã表示"
-#: monotone.cc:61
+#: monotone.cc:64
msgid "print diffs along with logs"
msgstr "ãã°ã¨å
±ã«å·®åã表示"
-#: monotone.cc:62
-msgid "skip merges when printing logs"
+#: monotone.cc:65
+msgid "exclude merges when printing logs"
msgstr "ãã°ã表示ããéã«çµ±åã«ã¤ãã¦ã¯çç¥"
-#: monotone.cc:63
+#: monotone.cc:66
msgid "use the current arguments as the future default"
msgstr "ç¾å¨ã®å¼æ°ãå°æ¥ã®ããã©ã«ãã¨ãã¦ä½¿ç¨"
-#: monotone.cc:64
+#: monotone.cc:67
msgid "leave out anything described by its argument"
msgstr "å¼æ°ã«ãã£ã¦èª¬æããããã¹ã¦ãçã"
-#: monotone.cc:65
+#: monotone.cc:68
msgid "use unified diff format"
msgstr "unified diff å½¢å¼ã使ç¨"
-#: monotone.cc:66
+#: monotone.cc:69
msgid "use context diff format"
msgstr "context diff å½¢å¼ã使ç¨"
-#: monotone.cc:67
+#: monotone.cc:70
msgid "use external diff hook for generating diffs"
msgstr "å·®åã®çæã«å¤é¨ diff ããã¯ã使ç¨"
-#: monotone.cc:68
+#: monotone.cc:71
msgid "argument to pass external diff hook"
msgstr "å¤é¨ diff ããã¯ã«æ¸¡ãå¼æ°"
-#: monotone.cc:69
+#: monotone.cc:72
msgid "use least common ancestor as ancestor for merge"
msgstr "æãè¿ãå
±éã®ç¥å
ãçµ±åã®ç¥å
ã¨ãã¦ä½¿ç¨"
-#: monotone.cc:70
+#: monotone.cc:73
msgid "perform the associated file operation"
msgstr "é¢é£ä»ãããããã¡ã¤ã«æä½ãå®è¡"
-#: monotone.cc:71
+#: monotone.cc:74
msgid "address:port to listen on (default :4691)"
-msgstr ""
+msgstr "å¾
æ©ãã ã¢ãã¬ã¹:ãã¼ã (ããã©ã«ã: 4691)"
-#: monotone.cc:72
-msgid "perform the operations for files missing from working directory"
-msgstr ""
+#: monotone.cc:75
+msgid "perform the operations for files missing from workspace"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã§ã¯ã¿ã¤ãããªããã¡ã¤ã«ã«ã¤ãã¦æä½ãå®è¡"
-#: monotone.cc:73
-msgid "perform the operations for unknown files from working directory"
-msgstr ""
+#: monotone.cc:76
+msgid "perform the operations for unknown files from workspace"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã§ã¯ä¸æãªãã¡ã¤ã«ã«ã¤ãã¦æä½ãå®è¡"
-#: monotone.cc:74
+#: monotone.cc:77
msgid "push the specified key even if it hasn't signed anything"
-msgstr ""
+msgstr "æå®ã®éµã«ã¤ãã¦ç½²åã®æç¡ã«ãããããåãè¾¼ã¿"
-#: monotone.cc:83
+#: monotone.cc:78
+msgid "when rosterifying, drop attrs entries with the given key"
+msgstr "åç°¿ä½æä¸ã«æå®ã®éµã®ã¨ã³ããªã®å±æ§ãç ´æ£"
+
+#: monotone.cc:79
+msgid "exclude files when printing logs"
+msgstr "ãã°ã表示ããéã«ãã¡ã¤ã«ã«ã¤ãã¦ã¯çç¥"
+
+#: monotone.cc:80
+msgid "also operate on the contents of any listed directories"
+msgstr "ä¸è¦§ã®ãã£ã¬ã¯ããªã®å
容ã«ã¤ãã¦ãå¦ç"
+
+#: monotone.cc:89
msgid "print debug log to stderr while running"
msgstr "å®è¡æãæ¨æºã¨ã©ã¼åºåã«ãããã°ãã°ã表示"
-#: monotone.cc:84
+#: monotone.cc:90
msgid "file to dump debugging log to, on failure"
msgstr "失ææã«ãããã°ãã°ãåºåãããã¡ã¤ã«"
-#: monotone.cc:85
+#: monotone.cc:91
+msgid "file to write the log to"
+msgstr "ãã°ãæ¸ãè¾¼ããã¡ã¤ã«"
+
+#: monotone.cc:92
msgid "suppress log and progress messages"
msgstr "ãã°ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
-#: monotone.cc:86
+#: monotone.cc:93
msgid "display help message"
msgstr "ãã«ãã¡ãã»ã¼ã¸ã表示"
-#: monotone.cc:87
+#: monotone.cc:94
msgid "print version number, then exit"
msgstr "ãã¼ã¸ã§ã³çªå·ã表示ããçµäº"
-#: monotone.cc:88
+#: monotone.cc:95
msgid "print detailed version number, then exit"
msgstr "詳細ãªãã¼ã¸ã§ã³çªå·ã表示ããçµäº"
-#: monotone.cc:89
+#: monotone.cc:96
msgid "insert command line arguments taken from the given file"
msgstr "æå®ã®ãã¡ã¤ã«ã®å
容ãã³ãã³ãè¡å¼æ°ã«æ¿å
¥"
-#: monotone.cc:90
+#: monotone.cc:97
msgid "set ticker style (count|dot|none)"
msgstr "ãã£ãã«ã¼ã®ã¹ã¿ã¤ã«ãè¨å® (count|dot|none)"
-#: monotone.cc:91
+#: monotone.cc:98
msgid "do not load standard lua hooks"
msgstr "æ¨æº lua ããã¯ãèªã¿è¾¼ã¾ãªã"
-#: monotone.cc:92
-msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files"
+#: monotone.cc:99
+msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files"
msgstr ""
-"$HOME/.monotone/monotonerc ã¾ã㯠MT/monotonerc lua ãã¡ã¤ã«ãèªã¿è¾¼ã¾ãªã"
+"~/.monotone/monotonerc ã¾ã㯠_MTN/monotonerc lua ãã¡ã¤ã«ãèªã¿è¾¼ã¾ãªã"
-#: monotone.cc:93
+#: monotone.cc:100
msgid "load extra rc file"
msgstr "å¥ã®åæåãã¡ã¤ã«ãèªã¿è¾¼ã"
-#: monotone.cc:94
+#: monotone.cc:101
msgid "set key for signatures"
msgstr "ç½²åã®éµãè¨å®"
-#: monotone.cc:95
+#: monotone.cc:102
msgid "set name of database"
msgstr "ãã¼ã¿ãã¼ã¹åãè¨å®"
-#: monotone.cc:96
-msgid "limit search for working copy to specified root"
-msgstr "ä½æ¥ã³ãã¼ã®æ¤ç´¢ãæå®ã®ã«ã¼ãä¸ã«å¶é"
+#: monotone.cc:103
+msgid "limit search for workspace to specified root"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®æ¤ç´¢ãæå®ã®ã«ã¼ãä¸ã«å¶é"
-#: monotone.cc:97
+#: monotone.cc:104
msgid "verbose completion output"
msgstr "åé·ãªå®äºã¡ãã»ã¼ã¸"
-#: monotone.cc:98
+#: monotone.cc:105
msgid "set location of key store"
-msgstr ""
+msgstr "éµã®ä¿åå ´æãè¨å®"
-#: monotone.cc:99
+#: monotone.cc:106
msgid "set location of configuration directory"
-msgstr ""
+msgstr "è¨å®ç¨ã®ãã£ã¬ã¯ããªã®å ´æãè¨å®"
-#: monotone.cc:203
+#: monotone.cc:210
#, c-format
msgid "problem parsing arguments from file %s: %s"
msgstr "ãã¡ã¤ã« %s ããã®å¼æ°ã解æä¸ã«åé¡çºç: %s"
-#: monotone.cc:212
+#: monotone.cc:219
#, c-format
msgid "weird error when stuffing arguments read from %s: %s\n"
msgstr "%s ããå¼æ°ãèªã¿åãä¸ã«äºæãã¬ã¨ã©ã¼çºç: %s\n"
-#: monotone.cc:261
-#, c-format
-msgid "command line: %s\n"
-msgstr "ã³ãã³ãè¡: %s\n"
-
-#: monotone.cc:264
-#, c-format
-msgid "set locale: LC_ALL=%s\n"
-msgstr "ãã«ã¼ã«è¨å®: LC_ALL=%s\n"
-
-#: monotone.cc:292
+#: monotone.cc:311
msgid "[OPTION...] command [ARGS...]\n"
msgstr "[OPTION...] command [ARGS...]\n"
-#: monotone.cc:522
+#: monotone.cc:563
#, c-format
msgid "syntax error near the \"%s\" option: %s"
msgstr "\"%s\" ãªãã·ã§ã³ã®è¿ãã«æ§æã¨ã©ã¼: %s"
-#: monotone.cc:561
+#: monotone.cc:605
#, c-format
msgid "monotone %s doesn't use the option %s"
msgstr "monotone %s ã«ã¯ãªãã·ã§ã³ %s ã¯ä½¿ãã¾ãã"
-#: monotone.cc:583
+#: monotone.cc:640
#, c-format
-msgid "Removed 'hidden' from option # %d\n"
-msgstr "ãªãã·ã§ã³ # %d ãã 'hidden' ãåé¤\n"
+msgid "Options specific to '%s %s':"
+msgstr "'%s %s' ã«ç¹åãããªãã·ã§ã³:"
-#: monotone.cc:589 monotone.cc:600
+#: mt_version.cc:27
#, c-format
-msgid "Added 'hidden' to option # %d\n"
-msgstr "ãªãã·ã§ã³ # %d ã« 'hidden' ã追å \n"
-
-#: monotone.cc:596
-#, c-format
-msgid "Options specific to 'monotone %s':"
-msgstr "'monotone %s' ã«ç¹åãããªãã·ã§ã³:"
-
-#: mt_version.cc:23
-#, c-format
msgid "%s (base revision: %s)"
msgstr "%s (åºæºãªãã¸ã§ã³ %s)"
-#: mt_version.cc:34
+#: mt_version.cc:47
#, c-format
msgid ""
-"Running on: %s\n"
-"Changes since base revision: %s\n"
-msgstr ""
-"%s ä¸ã§å®è¡\n"
-"åºæºãªãã¸ã§ã³ %s ããã®å¤æ´\n"
+"Running on : %s\n"
+"C++ compiler : %s\n"
+"C++ standard library: %s\n"
+"Boost version : %s\n"
+"Changes since base revision:\n"
+"%s"
+msgstr "å®è¡ç°å¢ : %s\n"
+"C++ ã³ã³ãã¤ã© : %s\n"
+"C++ æ¨æºã©ã¤ãã©ãª : %s\n"
+"Boost ãã¼ã¸ã§ã³ : %s\n"
+"åºåºãªãã¸ã§ã³ããã®å¤æ´:\n"
+"%s"
-#: netcmd.cc:42
+#: netcmd.cc:40
#, c-format
msgid "unknown item type 0x%x for '%s'"
msgstr "ä¸æãªã¢ã¤ãã ã¿ã¤ã 0x%x (対象 '%s')"
-#: netcmd.cc:94
+#: netcmd.cc:112
#, c-format
-msgid "protocol version mismatch: wanted '%d' got '%d'"
+msgid "unknown netcmd code 0x%x"
+msgstr "ä¸æ㪠netcmd ã³ã¼ã 0x%x"
+
+#: netcmd.cc:117
+#, c-format
+msgid ""
+"protocol version mismatch: wanted '%d' got '%d'\n"
+"%s"
msgstr ""
"ãããã³ã«ãã¼ã¸ã§ã³ãä¸è´ãã¾ãã: æå¾
ããã®ã¯ '%d' ã§ããå¾ãã®ã¯ '%d' ã§"
-"ã"
+"ã\n"
+"%s"
-#: netcmd.cc:119
-#, c-format
-msgid "unknown netcmd code 0x%x"
-msgstr "ä¸æ㪠netcmd ã³ã¼ã 0x%x"
+#: netcmd.cc:122
+msgid "the remote side has a newer, incompatible version of monotone"
+msgstr ""
+"monotone ã®ãã¼ã¸ã§ã³ã«äºææ§ãããã¾ãã (ãªã¢ã¼ãå´ãããæ°ãããã®ã§ã)"
-#: netcmd.cc:130
+#: netcmd.cc:123
+msgid "the remote side has an older, incompatible version of monotone"
+msgstr ""
+"monotone ã®ãã¼ã¸ã§ã³ã«äºææ§ãããã¾ãã (ãªã¢ã¼ãå´ãããå¤ããã®ã§ã)"
+
+#: netcmd.cc:133
#, c-format
msgid "oversized payload of '%d' bytes"
msgstr "'%d' ãã¤ãã®é·ãè¶
éã®ãã¤ãã¼ã"
-#: netcmd.cc:159
+#: netcmd.cc:162
#, c-format
msgid ""
"bad HMAC checksum (got %s, wanted %s)\n"
@@ -3196,7 +2481,7 @@
"ä¸æ£ãª HMAC ãã§ãã¯ãµã (è¨ç®å¤ %s / æå¾
å¤ %s)\n"
"ããã¯è»¢éä¸ã«ãã¼ã¿ãå£ãããã¨ã示åãã¦ãã¾ã\n"
-#: netcmd.cc:235 netcmd.cc:281
+#: netcmd.cc:257 netcmd.cc:303
#, c-format
msgid "unknown role specifier %d"
msgstr "ä¸æãªå½¹å²æå®å %d"
@@ -3226,251 +2511,48 @@
msgid "expected %s to end at %d, have %d bytes"
msgstr "%s ã«ã¤ãã¦çµç«¯ %dã容é %d ãã¤ãã§ãããã¨ãæå¾
"
-#: netsync.cc:243
+#: netsync.cc:245
#, c-format
msgid "check of '%s' failed"
msgstr "'%s' ã®æ¤è¨¼ã«å¤±æ"
-#: netsync.cc:696
+#: netsync.cc:708
msgid "bytes in"
msgstr "ãã¤ã (å
¥)"
-#: netsync.cc:698
+#: netsync.cc:710
msgid "bytes out"
msgstr "ãã¤ã (åº)"
-#: netsync.cc:702 netsync.cc:719
-msgid "revs written"
-msgstr "æ¸ãè¾¼ãã ãªãã¸ã§ã³"
-
-#: netsync.cc:704
+#: netsync.cc:714
msgid "certs in"
msgstr "証æ (å
¥)"
-#: netsync.cc:706 netsync.cc:721
+#: netsync.cc:716 netsync.cc:729
msgid "revs in"
msgstr "ãªãã¸ã§ã³ (å
¥)"
-#: netsync.cc:711
+#: netsync.cc:721
msgid "certs out"
msgstr "証æ (åº)"
-#: netsync.cc:713 netsync.cc:723
+#: netsync.cc:723 netsync.cc:731
msgid "revs out"
msgstr "ãªãã¸ã§ã³ (åº)"
-#: netsync.cc:781
+#: netsync.cc:837
#, c-format
-msgid "all epochs processed, opening database valve\n"
-msgstr "ãã¹ã¦ã® epoch ãå¦çãã¾ããããã¼ã¿ãã¼ã¹ãã«ããéãã¦ãã¾ã\n"
+msgid "underflow on count of %s items to receive"
+msgstr "åãåã %s ã¢ã¤ãã ã«ã¤ãã¦åæ°ãã¢ã³ãã¼ããã¼"
-#: netsync.cc:878
-#, c-format
-msgid "dropping outgoing netcmd (because we're in error unwind mode)\n"
-msgstr "ã¨ã©ã¼å復ãå¯è½ãªã¢ã¼ãã§ãã®ã§ãå¤åãã® netcmd ãç ´æ£ãã¾ã\n"
-
-#: netsync.cc:902
-#, c-format
-msgid "error: %s\n"
-msgstr "ã¨ã©ã¼: %s\n"
-
-#: netsync.cc:910
-#, c-format
-msgid "analyzing %d entries in manifest\n"
-msgstr "ãããã§ã¹ãå
ã® %d ã¨ã³ããªã解æä¸\n"
-
-#: netsync.cc:949
-#, c-format
-msgid "analyzing %d ancestry edges\n"
-msgstr "%d åã®ç³»ã®ç«¯ã解æä¸\n"
-
-#: netsync.cc:971
-#, c-format
-msgid "intermediate set_difference heads size %d"
-msgstr ""
-
-#: netsync.cc:1007
-#, c-format
-msgid "Dropping branch certs for unwanted branch %s"
-msgstr "å¸æããªããã©ã³ã %s ã®ãã©ã³ã証æãåé¤"
-
-#: netsync.cc:1024
-#, c-format
-msgid "after step 2, heads size %d"
-msgstr ""
-
-#: netsync.cc:1048
-#, c-format
-msgid "after step 3, heads size %d"
-msgstr ""
-
-#: netsync.cc:1068
-#, fuzzy, c-format
-msgid "analyze_ancestry_graph"
-msgstr "%d åã®ç³»ã®ç«¯ã解æä¸\n"
-
-#: netsync.cc:1071
-#, c-format
-msgid "not all done in analyze_ancestry_graph"
-msgstr ""
-
-#: netsync.cc:1077
-#, c-format
-msgid "already analyzed_ancestry in analyze_ancestry_graph"
-msgstr ""
-
-#: netsync.cc:1081
-#, c-format
-msgid "analyze_ancestry_graph fetching"
-msgstr ""
-
-#: netsync.cc:1116
-#, c-format
-msgid "read %d bytes from fd %d (peer %s)\n"
-msgstr "%d ãã¤ã fd %d (ãã¼ã¢ %s) ããèªã¿è¾¼ã¿\n"
-
-#: netsync.cc:1119
-#, c-format
-msgid "in error unwind mode, so throwing them into the bit bucket\n"
-msgstr "ã¨ã©ã¼å復å¯è½ã¢ã¼ãã§ãã®ã§ãããããããããã±ããä¸ã«æ¨ã¦ã¾ã\n"
-
-#: netsync.cc:1151
-#, c-format
-msgid "wrote %d bytes to fd %d (peer %s)\n"
-msgstr "%d ãã¤ã fd %d (ãã¼ã¢ %s) ã¸æ¸ãè¾¼ã¿\n"
-
-#: netsync.cc:1159
-#, c-format
-msgid "finished flushing output queue in error unwind mode, disconnecting\n"
-msgstr "ã¨ã©ã¼å復å¯è½ã¢ã¼ãã§åºåãã¥ã¼ããã©ãã·ã¥å®äºãåæä¸\n"
-
-#: netsync.cc:1173
-#, c-format
-msgid "queueing 'bye' command\n"
-msgstr "'bye' ã³ãã³ãããã¥ã¼ã«è¿½å \n"
-
#: netsync.cc:1183
#, c-format
-msgid "queueing 'error' command\n"
-msgstr "'error' ã³ãã³ãããã¥ã¼ã«è¿½å \n"
-
-#: netsync.cc:1196
-#, c-format
-msgid "queueing 'done' command for %s level %s\n"
-msgstr "'%s' (ã¬ãã« %s) ã«ã¤ã㦠'done' ã³ãã³ãããã¥ã¼ã«è¿½å \n"
-
-#: netsync.cc:1265
-#, c-format
-msgid "queueing request for refinement of %s node '%s', level %d\n"
-msgstr "%s ãã¼ã '%s', ã¬ãã« %d ã®å¾®èª¿æ´è¦æ±ããã¥ã¼ã«è¿½å \n"
-
-#: netsync.cc:1283
-#, c-format
-msgid "not queueing request for %s '%s' as we are in pure source role\n"
-msgstr ""
-"ç´ç²ãªã½ã¼ã¹ã®å½¹å²ãæãã¦ããã®ã§ %s '%s' ã®è¦æ±ã¯ãã¥ã¼ã«è¿½å ãã¾ãã\n"
-
-#: netsync.cc:1290
-#, c-format
-msgid "not queueing request for %s '%s' as we already requested it\n"
-msgstr "æ¢ã«è¦æ±æ¸ã¿ã® %s '%s' ã¯ãã¥ã¼ã«è¿½å ãã¾ãã\n"
-
-#: netsync.cc:1295
-#, c-format
-msgid "queueing request for data of %s item '%s'\n"
-msgstr "%s ã¢ã¤ãã '%s' ã®ãã¼ã¿è¦æ±ããã¥ã¼ã«è¿½å \n"
-
-#: netsync.cc:1319
-#, c-format
-msgid ""
-"not queueing request for %s delta '%s' -> '%s' as we are in pure source "
-"role\n"
-msgstr ""
-"ç´ç²ãªã½ã¼ã¹ã®å½¹å²ãæãã¦ããã®ã§ %s å·®å '%s' -> '%s' ã®è¦æ±ããã¥ã¼ã«è¿½å "
-"ãã¾ãã\n"
-
-#: netsync.cc:1326
-#, c-format
-msgid ""
-"not queueing request for %s delta '%s' -> '%s' as we already requested the "
-"target\n"
-msgstr "æ¢ã«è¦æ±æ¸ã¿ãªã®ã§ %s å·®å '%s' -> '%s' ã®è¦æ±ããã¥ã¼ã«è¿½å ãã¾ãã\n"
-
-#: netsync.cc:1331
-#, c-format
-msgid "queueing request for contents of %s delta '%s' -> '%s'\n"
-msgstr "%s å·®å '%s' -> '%s' ã®å
容ã«ã¤ãã¦è¦æ±ããã¥ã¼ã«è¿½å \n"
-
-#: netsync.cc:1351
-#, c-format
-msgid "not queueing %s data for '%s' as we are in pure sink role\n"
-msgstr ""
-"ç´ç²ãªã·ã³ã¯ã®å½¹å²ãæãã¦ããã®ã§ %s ãã¼ã¿ (対象: '%s' )ããã¥ã¼ã«è¿½å ãã¾"
-"ãã\n"
-
-#: netsync.cc:1356
-#, c-format
-msgid "queueing %d bytes of data for %s item '%s'\n"
-msgstr "%d ãã¤ã (%s ã¢ã¤ãã '%s' ã®ãã¼ã¿)ããã¥ã¼ã«è¿½å \n"
-
-#: netsync.cc:1390
-#, c-format
-msgid "not queueing %s delta '%s' -> '%s' as we are in pure sink role\n"
-msgstr ""
-"ç´ç²ãªã·ã³ã¯ã®å½¹å²ãæãã¦ããã®ã§ %s å·®å '%s' -> '%s' ããã¥ã¼ã«è¿½å ãã¾ã"
-"ã\n"
-
-#: netsync.cc:1395
-#, c-format
-msgid "queueing %s delta '%s' -> '%s'\n"
-msgstr "%s å·®å '%s' -> '%s' ããã¥ã¼ã«è¿½å \n"
-
-#: netsync.cc:1413
-#, c-format
-msgid ""
-"not queueing note of nonexistence of %s item '%s' as we are in pure sink "
-"role\n"
-msgstr ""
-"ç´ç²ãªã·ã³ã¯ã®å½¹å²ãæãã¦ããã®ã§ %s ã¢ã¤ãã '%s' ããªããã¨ã«ã¤ãã¦ãã¼ã"
-"ããã¥ã¼ã«è¿½å ãã¾ãã\n"
-
-#: netsync.cc:1418
-#, c-format
-msgid "queueing note of nonexistance of %s item '%s'\n"
-msgstr "%s ã¢ã¤ãã '%s' ããªããã¨ã«ã¤ãã¦ãã¼ãããã¥ã¼ã«è¿½å \n"
-
-#: netsync.cc:1430
-#, c-format
-msgid "received 'bye' netcmd\n"
-msgstr "'bye' netcmd ãåä¿¡\n"
-
-#: netsync.cc:1438
-#, c-format
msgid "received network error: %s"
msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼ãåä¿¡: %s"
-#: netsync.cc:1455
+#: netsync.cc:1215
#, c-format
-msgid "received 'done' for empty %s level %d, marking as complete\n"
-msgstr "空㮠%s ã¬ãã« %d ã«ã¤ã㦠'done' åä¿¡, å®äºã¨ãã¦ãã¼ã¯\n"
-
-#: netsync.cc:1477
-#, c-format
msgid ""
-"received 'done' for %s level %d, which had refinements; sending echo of done "
-"for level %d\n"
-msgstr ""
-"微調æ´ãå«ã %s ã¬ãã« %d ã«ã¤ã㦠'done' åä¿¡;ã¬ãã« %d ã®å 'done' ã«ã¤ãã¦"
-"éä¿¡\n"
-
-#: netsync.cc:1510
-#, c-format
-msgid "server key has name %s, hash %s\n"
-msgstr "ãµã¼ãã¼éµã®åå %sãããã·ã¥ %s\n"
-
-#: netsync.cc:1518
-#, c-format
-msgid ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
"@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n"
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -3478,7 +2560,7 @@
"it is also possible that the server key has just been changed\n"
"remote host sent key %s\n"
"I expected %s\n"
-"'monotone unset %s %s' overrides this check\n"
+"'%s unset %s %s' overrides this check\n"
msgstr ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
"@ è¦å: ãµã¼ãã¼ã®èå¥ ID ãå¤æ´ããã¦ãã¾ã @\n"
@@ -3487,14 +2569,14 @@
"ã¾ããã ãµã¼ãã¼ã®éµãå¤æ´ãããã ãã®å¯è½æ§ãããã¾ãã\n"
"ãªã¢ã¼ããã¹ãéµ %s\n"
"æå¾
å¤ %s\n"
-"'monotone unset %s %s' ã¨ããã¨æ¤è¨¼çµæãç¡è¦ããããã«ãªãã¾ã\n"
+"'%s unset %s %s' ã¨ããã¨æ¤è¨¼çµæãç¡è¦ããããã«ãªãã¾ã\n"
-#: netsync.cc:1528
+#: netsync.cc:1225
#, c-format
msgid "server key changed"
msgstr "ãµã¼ãã¼éµãå¤æ´ããã¾ãã"
-#: netsync.cc:1533
+#: netsync.cc:1230
#, c-format
msgid ""
"first time connecting to server %s\n"
@@ -3502,49 +2584,50 @@
"their key's fingerprint: %s\n"
msgstr ""
"ãµã¼ãã¼ %s ã«æ¥ç¶ããã®ã¯åãã¦ã§ã\n"
-"å½ç©ã§ãªãã¨ã¯æãã¾ãããéµã®æç´ãäºéãã§ãã¯ãã¦ã¿ãã¨ããã§ããã: %s\n"
+"å½ç©ã§ãªãã¨ã¯æãã¾ãããéµã®æç´ãäºéã«ãã§ãã¯ãã¦ã¿ãã¨ããã§ããã: %"
+"s\n"
-#: netsync.cc:1540
+#: netsync.cc:1237
#, c-format
msgid "saving public key for %s to database\n"
msgstr "%s ã®å
¬ééµããã¼ã¿ãã¼ã¹ã«ä¿åä¸\n"
-#: netsync.cc:1547
+#: netsync.cc:1325
#, c-format
-msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n"
-msgstr "ãµã¼ãã¼ '%s' ãã nonce '%s' ã¨ä¸ç·ã« 'hello' netcmd ãåä¿¡\n"
-
-#: netsync.cc:1628
-#, c-format
msgid "rejected attempt at anonymous connection for write\n"
msgstr "å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦\n"
-#: netsync.cc:1635
+#: netsync.cc:1332
#, c-format
msgid "rejected attempt at anonymous connection while running as sink\n"
msgstr "ã·ã³ã¯ã¨ãã¦å®è¡ä¸ã®å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦\n"
-#: netsync.cc:1652
+#: netsync.cc:1347 netsync.cc:1444
#, c-format
+msgid "not serving branch '%s'"
+msgstr "ãã©ã³ã '%s' ã¯æä¾ãã¦ãã¾ãã"
+
+#: netsync.cc:1352
+#, c-format
msgid "anonymous access to branch '%s' denied by server"
msgstr "ãã©ã³ã '%s' ã¸ã®å¿åã¢ã¯ã»ã¹ã¯ãµã¼ãã¼ã«ãã£ã¦æå¦ããã¾ãã"
-#: netsync.cc:1657
+#: netsync.cc:1359
#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
msgstr "å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã\n"
-#: netsync.cc:1689
+#: netsync.cc:1391
#, c-format
msgid "detected replay attack in auth netcmd\n"
msgstr "auth netcmd ä¸ã«ç¹°ãè¿ãæ»æãæ¤åº\n"
-#: netsync.cc:1714
+#: netsync.cc:1413
#, c-format
msgid "remote public key hash '%s' is unknown\n"
msgstr "ãªã¢ã¼ãã®å
¬ééµããã·ã¥ '%s' ã¯ä¸æãªãã®ã§ã\n"
-#: netsync.cc:1731
+#: netsync.cc:1430
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -3553,24 +2636,24 @@
"ç´ç²ã·ã³ã¯ã¨ãã¦å®è¡ä¸ã® '%s' ã® '%s' ('%s' ãé¤ã) ã®èªã¿è¾¼ã¿ãæå¦ãã¾ã"
"ã\n"
-#: netsync.cc:1747
+#: netsync.cc:1450
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
msgstr ""
"'%s' ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ããã©ã³ã '%s' ã®ããã«æå¦ãã¾ãã\n"
-#: netsync.cc:1749
+#: netsync.cc:1453
#, c-format
msgid "access to branch '%s' denied by server"
msgstr "ãã©ã³ã '%s' ã¸ã®ã¢ã¯ã»ã¹ã¯ãµã¼ãã¼ã«ãã£ã¦æå¦ããã¾ãã"
-#: netsync.cc:1757
+#: netsync.cc:1463
#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
msgstr "'%s' ã®å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã\n"
-#: netsync.cc:1766
+#: netsync.cc:1472
#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
@@ -3579,688 +2662,322 @@
"ç´ç²ã½ã¼ã¹ã¨ãã¦å®è¡ä¸ã® '%s' ã® '%s' ('%s' ãé¤ã) ã¸ã®æ¸ãè¾¼ã¿ãæå¦ãã¾ã"
"ã\n"
-#: netsync.cc:1774
+#: netsync.cc:1480
#, c-format
msgid "denied '%s' write permission for '%s' excluding '%s'\n"
msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ãæå¦ãã¾ãã\n"
-#: netsync.cc:1780
+#: netsync.cc:1486
#, c-format
msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ã許å¯ãã¾ãã\n"
-#: netsync.cc:1795
+#: netsync.cc:1526
#, c-format
-msgid "client signature OK, accepting authentication\n"
-msgstr "ã¯ã©ã¤ã¢ã³ãç½²å OKãèªè¨¼å®äº\n"
-
-#: netsync.cc:1817
-#, c-format
msgid "bad client signature\n"
msgstr "ä¸æ£ãªã¯ã©ã¤ã¢ã³ãç½²å\n"
-#: netsync.cc:1832
+#: netsync.cc:1542
#, c-format
-msgid ""
-"received 'confirm' netcmd from server '%s' for pattern '%s' exclude '%s' in %"
-"s mode\n"
-msgstr ""
-"ãµã¼ãã¼ '%s' ãããã¿ã¼ã³ '%s' ('%s' ãé¤ã; %s ã¢ã¼ã)ã¸ã® 'confirm' "
-"netcmd ãåä¿¡ãã¾ãã\n"
+msgid "Unexpected 'refine' command on non-refined item type\n"
+msgstr "refine ããã¦ããªãã¢ã¤ãã åã«ã¤ãã¦äºæããªã 'refine' ã³ãã³ã\n"
-#: netsync.cc:1834 netsync.cc:2831 netsync.cc:2862
-msgid "source and sink"
-msgstr ""
-
-#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863
-msgid "sink"
-msgstr ""
-
-#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863
-#, fuzzy
-msgid "source"
-msgstr "[å
] %s\n"
-
-#: netsync.cc:1848
+#: netsync.cc:1639
#, c-format
-msgid "server signature OK, accepting authentication\n"
-msgstr "ãµã¼ãã¼ç½²å OKãèªè¨¼å®äº\n"
+msgid "unknown bye phase %d received"
+msgstr "ä¸æ㪠bye ãã§ã¼ãº %d ãåä¿¡"
-#: netsync.cc:1853
+#: netsync.cc:1654
#, c-format
-msgid "bad server signature\n"
-msgstr "ä¸æ£ãªãµã¼ãã¼ç½²å\n"
+msgid "Unexpected 'done' command on non-refined item type\n"
+msgstr "refine ããã¦ããªãã¢ã¤ãã åã«ã¤ãã¦äºæããªã 'done' ã³ãã³ã\n"
-#: netsync.cc:1858
+#: netsync.cc:1734
#, c-format
-msgid "unknown server key\n"
-msgstr "ä¸æãªãµã¼ãã¼éµ\n"
-
-#: netsync.cc:1927
-#, c-format
msgid "epoch with hash '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ããã·ã¥ '%s' ã® epoch ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:1937
+#: netsync.cc:1763
#, c-format
-msgid "public key '%s' is also called '%s'\n"
-msgstr "å
¬ééµ '%s' ã®å¥å㯠'%s' ã§ã\n"
-
-#: netsync.cc:1956
-#, c-format
msgid "revision '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ãªãã¸ã§ã³ '%s' ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:1970
+#: netsync.cc:1777
#, c-format
-msgid "manifest '%s' does not exist in our database"
-msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ãããã§ã¹ã '%s' ã¯å«ã¾ãã¦ãã¾ãã"
-
-#: netsync.cc:1984
-#, c-format
msgid "file '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ãã¡ã¤ã« '%s' ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:1998
+#: netsync.cc:1791
#, c-format
msgid "cert '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯è¨¼æ '%s' ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:2017
+#: netsync.cc:1843
#, c-format
-msgid "received 'refine' netcmd on %s node '%s', level %d\n"
-msgstr "%s ãã¼ã '%s'ãã¬ãã« %d 㧠'refine' netcmd ãåä¿¡\n"
-
-#: netsync.cc:2022
-#, c-format
-msgid "no corresponding %s merkle node for prefix '%s', level %d\n"
-msgstr ""
-"ç¸å½ãã %s merkle ãã¼ã(対象: ãã¬ãã£ã¯ã¹ '%s'ãã¬ãã« %d) ãæã£ã¦ãã¾ã"
-"ã\n"
-
-#: netsync.cc:2077
-#, c-format
-msgid "found corresponding %s merkle node for prefix '%s', level %d\n"
-msgstr ""
-"ç¸å½ãã %s merkle ãã¼ã (対象: ãã¬ãã£ã¯ã¹ '%s', ã¬ãã« %d) ãã¿ã¤ãã¾ã"
-"ã\n"
-
-#: netsync.cc:2408
-#, c-format
-msgid "received 'send_data' netcmd requesting %s '%s'\n"
-msgstr "%s '%s' ãè¦æ±ãã 'send_data' netcmd ãåä¿¡\n"
-
-#: netsync.cc:2436
-#, c-format
-msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n"
-msgstr "%s å
端 '%s' -> '%s' ãè¦æ±ãã 'send_delta' netcmd ãåä¿¡\n"
-
-#: netsync.cc:2490
-#, c-format
-msgid "delta requested for item type %s\n"
-msgstr "ã¢ã¤ãã ã¿ã¤ã %s ã«ã¤ãã¦è¦æ±ãããå·®å\n"
-
-#: netsync.cc:2513
-#, c-format
-msgid "epoch '%s' already exists in our database\n"
-msgstr "epoch '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-
-#: netsync.cc:2520
-#, c-format
-msgid "received epoch %s for branch %s\n"
-msgstr "epoch %s (ãã©ã³ã %s) ãåä¿¡\n"
-
-#: netsync.cc:2527
-#, c-format
-msgid "branch %s has no epoch; setting epoch to %s\n"
-msgstr "ãã©ã³ã %s ã«ã¯ epoch ã¯ããã¾ããã®ã§ãepoch ã %s ã«è¨å®ãã¾ã\n"
-
-#: netsync.cc:2533
-#, c-format
-msgid "branch %s already has an epoch; checking\n"
-msgstr "ãã©ã³ã %s ã«ã¯æ¢ã« epoch ãããã¾ããæ¤è¨¼ä¸\n"
-
-#: netsync.cc:2544
-#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
msgstr ""
"ãã©ã³ã %s ã«ã¤ã㦠epoch ãä¸è´ãã¾ããããµã¼ãã¼å´ '%s', ã¯ã©ã¤ã¢ã³ãå´ '%"
"s'"
-#: netsync.cc:2555
+#: netsync.cc:1864
#, c-format
-msgid "public key '%s' already exists in our database\n"
-msgstr "å
¬ééµ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-
-#: netsync.cc:2564
-#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
msgstr "å
¬ééµ '%s' (%s) ã«ã¤ãã¦ããã·ã¥æ¤è¨¼ã«å¤±æãæå¾
å¤ '%s'ãè¨ç®å¤ '%s'"
-#: netsync.cc:2573
+#: netsync.cc:1881
#, c-format
-msgid "cert '%s' already exists in our database\n"
-msgstr "証æ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-
-#: netsync.cc:2581
-#, c-format
msgid "hash check failed for revision cert '%s'"
msgstr "ãªãã¸ã§ã³è¨¼æ '%s' ã«ã¤ãã¦ããã·ã¥æ¤è¨¼ã«å¤±æ"
-#: netsync.cc:2597
+#: netsync.cc:1956
#, c-format
-msgid "revision '%s' already exists in our database\n"
-msgstr "ãªãã¸ã§ã³ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-
-#: netsync.cc:2600
-#, c-format
-msgid "received revision '%s'\n"
-msgstr "ãªãã¸ã§ã³ '%s' ãåä¿¡\n"
-
-#: netsync.cc:2619
-#, c-format
-msgid "manifest version '%s' already exists in our database\n"
-msgstr "ãã¼ã¸ã§ã³ '%s' ã®ãããã§ã¹ãã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-
-#: netsync.cc:2634
-#, c-format
-msgid "file version '%s' already exists in our database\n"
-msgstr "ãã¼ã¸ã§ã³ '%s' ã®ãã¡ã¤ã«ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-
-#: netsync.cc:2720
-#, c-format
-msgid "ignoring delta received for item type %s\n"
-msgstr "ã¢ã¤ãã ã¿ã¤ã %s ã«ã¤ãã¦åä¿¡ããå·®åãç¡è¦\n"
-
-#: netsync.cc:2734
-#, c-format
-msgid "received 'nonexistant' netcmd for %s '%s'\n"
-msgstr "%s '%s' ã«ã¤ã㦠'nonexistant' netcmd ãåä¿¡\n"
-
-#: netsync.cc:2746
-#, c-format
msgid "Received warning from usher: %s"
msgstr "éçªããè¦åãåä¿¡: %s"
-#: netsync.cc:2748
-#, c-format
-msgid "Received greeting from usher: %s"
-msgstr "éçªããåãå
¥ãæ¨æ¶ãåä¿¡: %s"
+#: netsync.cc:2043 netsync.cc:2074
+msgid "source and sink"
+msgstr "ã½ã¼ã¹ã¨ã·ã³ã¯"
-#: netsync.cc:2753
-#, c-format
-msgid "Sent reply."
-msgstr "å¿çãéä¿¡"
+#: netsync.cc:2044 netsync.cc:2075
+msgid "source"
+msgstr "ã½ã¼ã¹"
-#: netsync.cc:2828
-#, c-format
-msgid ""
-"received 'anonymous' netcmd from client for pattern '%s' excluding '%s' in %"
-"s mode\n"
-msgstr ""
-"ã¯ã©ã¤ã¢ã³ããããã¿ã¼ã³ '%s' ('%s' ãé¤ã; %s ã¢ã¼ã)ã¸ã® 'anonymous' "
-"netcmd ãåä¿¡\n"
+#: netsync.cc:2044 netsync.cc:2075
+msgid "sink"
+msgstr "ã·ã³ã¯"
-#: netsync.cc:2859
+#: netsync.cc:2229
#, c-format
-msgid ""
-"received 'auth(hmac)' netcmd from client '%s' for pattern '%s' exclude '%s' "
-"in %s mode with nonce1 '%s'\n"
-msgstr ""
-"ã¯ã©ã¤ã¢ã³ã '%s' ãããã¿ã¼ã³ '%s' ('%s' ãé¤ã; ã¢ã¼ã %s) ã«ã¤ã㦠nonce1 "
-"'%s' ã¨ã¨ãã« 'auth(hmac)' netcmd ãåä¿¡\n"
-
-#: netsync.cc:3031
-#, c-format
-msgid "processing %d byte input buffer from peer %s\n"
-msgstr "%d ãã¤ãã®å
¥åãããã¡ (éä¿¡å
: ãã¼ã¢ %s) ãå¦çä¸\n"
-
-#: netsync.cc:3034
-#, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
msgstr "netcmd dispatch ã®å¾ã§ãã¼ã¢ %s ã®å
¥åãããã¡ãããµãã¾ãã\n"
-#: netsync.cc:3038
-#, fuzzy, c-format
-msgid "failed to process '%s' packet"
-msgstr "ãã¼ã¿æåå '%s' ã®è§£æã«å¤±æ: %s"
-
-#: netsync.cc:3043 netsync.cc:3083 netsync.cc:3110
+#: netsync.cc:2241 netsync.cc:2298
#, c-format
msgid "protocol error while processing peer %s: '%s'\n"
msgstr "ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºç\n"
-#: netsync.cc:3068
+#: netsync.cc:2247
#, c-format
+msgid "error: %s\n"
+msgstr "ã¨ã©ã¼: %s\n"
+
+#: netsync.cc:2277
+#, c-format
msgid "connecting to %s\n"
msgstr "%s ã«æ¥ç¶ä¸\n"
-#: netsync.cc:3096
+#: netsync.cc:2313
#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting\n"
msgstr "ãã¼ã¢ %s ã® I/O ãå¾
ã£ã¦ããéã«ã¿ã¤ã ã¢ã¦ã, åæä¸\n"
-#: netsync.cc:3118
+#: netsync.cc:2328
#, c-format
-msgid "read from fd %d (peer %s) closed OK after goodbye\n"
-msgstr "fd %d (ãã¼ã¢ %s) ããã®èªã¿è¾¼ã¿ã¯ goodbye ã®å¾ã§åé¡ãªãéãã¾ãã\n"
+msgid "got OOB data from peer %s, disconnecting\n"
+msgstr "ãã¼ã¢ %s ãã OOB ãã¼ã¿ãåä¿¡ããåæä¸\n"
-#: netsync.cc:3120
+#: netsync.cc:2343
#, c-format
-msgid "read from fd %d (peer %s) failed, disconnecting\n"
-msgstr "fd %d (ãã¼ã¢ %s) ããã®èªã¿è¾¼ã¿ã«å¤±æ, åæä¸\n"
+msgid "processing failure while talking to peer %s, disconnecting\n"
+msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã«å¦çã失æããåæä¸\n"
-#: netsync.cc:3130
+#: netsync.cc:2360
#, c-format
-msgid "write on fd %d (peer %s) closed OK after goodbye\n"
-msgstr "fd %d (ãã¼ã¢ %s) ã¸ã®æ¸ãè¾¼ã¿ã¯ goodbye ã®å¾ã§åé¡ãªãéãã¾ãã\n"
-
-#: netsync.cc:3132
-#, c-format
-msgid "write on fd %d (peer %s) failed, disconnecting\n"
-msgstr "fd %d (ãã¼ã¢ %s) ããã®æ¸ãè¾¼ã¿ã«å¤±æãåæä¸\n"
-
-#: netsync.cc:3139
-#, c-format
-msgid "got OOB data on fd %d (peer %s), disconnecting\n"
-msgstr "fd %d (ãã¼ã¢ %s) 㧠OOB ãã¼ã¿ãåä¿¡ãåæä¸\n"
-
-#: netsync.cc:3148
-#, c-format
-msgid "terminated exchange with %s\n"
-msgstr "%s ã¨ã®äº¤æãåæ\n"
-
-#: netsync.cc:3156
-#, c-format
msgid "successful exchange with %s\n"
msgstr "%s ã¨ã®äº¤æã«æå\n"
-#: netsync.cc:3177
+#: netsync.cc:2366
#, c-format
-msgid "fd %d is armed\n"
-msgstr "fd %d: armed\n"
+msgid "peer %s disconnected after we informed them of error\n"
+msgstr "ãã¼ã¢ %s ã«ã¨ã©ã¼ãå ±åå¾ã«åæããã¾ãã\n"
-#: netsync.cc:3184
+#: netsync.cc:2371
#, c-format
+msgid "I/O failure while talking to peer %s, disconnecting\n"
+msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã« I/O ã®å¤±æãåæä¸\n"
+
+#: netsync.cc:2400
+#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad\n"
msgstr "ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçã誤ãã¨ãã¦å°ä»ã\n"
-#: netsync.cc:3206
-#, fuzzy, c-format
-msgid "accepting new connection on %s : %s\n"
-msgstr "%s : %d ã§ã®æ°ããæ¥ç¶ãåç\n"
-
-#: netsync.cc:3212
+#: netsync.cc:2432
#, c-format
-msgid "accept() returned a dead client\n"
-msgstr "accept() ã¯æ»ãã ã¯ã©ã¤ã¢ã³ããè¿ãã¾ãã\n"
-
-#: netsync.cc:3216
-#, fuzzy, c-format
msgid "accepted new client connection from %s : %s\n"
-msgstr "%s ããã®æ°ããã¯ã©ã¤ã¢ã³ãæ¥ç¶ãåç\n"
+msgstr "%s : %s ããã®æ°ããã¯ã©ã¤ã¢ã³ãæ¥ç¶ãåç\n"
-#: netsync.cc:3244
+#: netsync.cc:2466
#, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting\n"
msgstr "ãã¼ã¢ %s: '%s' ãããå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçãåæä¸\n"
-#: netsync.cc:3252
+#: netsync.cc:2477
#, c-format
-msgid "fd %d (peer %s) read failed, disconnecting\n"
-msgstr "fd %d (ãã¼ã¢ %s) èªã¿è¾¼ã¿å¤±æãåæä¸\n"
+msgid "peer %s read failed in working state (error)\n"
+msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æ (ã¨ã©ã¼)\n"
-#: netsync.cc:3268
+#: netsync.cc:2482
#, c-format
-msgid "fd %d (peer %s) write failed, disconnecting\n"
-msgstr "fd %d (ãã¼ã¢ %s) æ¸ãè¾¼ã¿å¤±æãåæä¸\n"
-
-#: netsync.cc:3292
-#, c-format
-msgid "fd %d (peer %s) processing finished, disconnecting\n"
-msgstr "fd %d (ãã¼ã¢ %s) å¦ççµäºãåæä¸\n"
-
-#: netsync.cc:3314
-#, c-format
-msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
-msgstr "fd %d (ãã¼ã¢ %s) ã¯ã¢ã¤ãã«æéãé·ããã¾ããåæä¸\n"
-
-#: netsync.cc:3320
-#, c-format
-msgid "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n"
-msgstr "fd %d (ãã¼ã¢ %s) 㯠goodbye ã交ãåºåããã©ãã·ã¥ãã¾ãããåæä¸\n"
-
-#: netsync.cc:3366
-#, fuzzy, c-format
-msgid "beginning service on %s : %s\n"
-msgstr "%s : %d ã§ãµã¼ãã¹ãéå§\n"
-
-#: netsync.cc:3378
-#, c-format
-msgid "session limit %d reached, some connections will be refused\n"
-msgstr "ã»ãã·ã§ã³å¶é %d ã«éã£ãã¾ãããããã¤ãã®æ¥ç¶ã¯æå¦ããã¾ã\n"
-
-#: netsync.cc:3384
-#, c-format
-msgid "i/o probe with %d armed\n"
-msgstr "%d armed 㧠I/O ããã¼ã\n"
-
-#: netsync.cc:3394
-#, fuzzy, c-format
-msgid "timed out waiting for I/O (listening on %s : %s)\n"
-msgstr "I/O (%s : %d ã§ãªã¹ã³ä¸) å¾
æ©ä¸ã«ã¿ã¤ã ã¢ã¦ã\n"
-
-#: netsync.cc:3410
-#, c-format
-msgid "got woken up for action on unknown fd %d\n"
-msgstr "ä¸æ㪠fd %d ã¯ã¢ã¯ã·ã§ã³ã®ããã«èµ·ãããã¾ãã\n"
-
-#: netsync.cc:3425
-#, c-format
-msgid "got some OOB data on fd %d (peer %s), disconnecting\n"
-msgstr "fd %d (ãã¼ã¢ %s) 㧠OOB ãã¼ã¿ãåä¿¡ããåæä¸\n"
-
-#: netsync.cc:3487
-#, c-format
-msgid "finding items to synchronize:\n"
-msgstr "åæã¢ã¤ãã ãæ¤ç´¢ä¸:\n"
-
-#: netsync.cc:3490
-#, c-format
-msgid "including branch %s"
-msgstr "ãã©ã³ã %s ãå«ãã¾ã"
-
-#: netsync.cc:3549
-#, c-format
-msgid "setting epoch on %s to zero\n"
-msgstr "%s ã® epoch ãé¶ã«è¨å®\n"
-
-#: netsync.cc:3598
-#, fuzzy, c-format
-msgid "Cannot find key '%s'"
-msgstr "注éãã¡ã¤ã« file_path '%s'\n"
-
-#: netsync.cc:3652 netsync.cc:3656
-#, c-format
-msgid "network error: %s"
-msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼: %s"
-
-#: netsync.cc:3710
-#, c-format
-msgid "ancestry_fetcher: got %d heads"
+msgid ""
+"peer %s read failed in shutdown state (possibly client misreported error)\n"
msgstr ""
+"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æ (ããããã¯ã©ã¤ã¢ã³"
+"ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)\n"
-#: netsync.cc:3820
-#, fuzzy, c-format
-msgid "traversing head %s"
-msgstr "ææ°ç %s ãä¿åãã¦ãã¾ã\n"
-
-#: packet.cc:330
+#: netsync.cc:2488
#, c-format
-msgid "writing delayed revision data packet for %s\n"
-msgstr "%s ã«ã¤ãã¦é
延ãããªãã¸ã§ã³ãã¼ã¿ãã±ãããæ¸ãè¾¼ã¿ä¸\n"
+msgid "peer %s read failed in confirmed state (success)\n"
+msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ç¢ºèªã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æ (æå)\n"
-#: packet.cc:337
+#: netsync.cc:2509
#, c-format
-msgid "discarding revision data packet %s with unmet dependencies\n"
-msgstr "ä¾åé¢ä¿ãæºãããªããªãã¸ã§ã³ãã¼ã¿ãã±ãã %s ãç ´æ£\n"
+msgid "peer %s write failed in working state (error)\n"
+msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æ (ã¨ã©ã¼)\n"
-#: packet.cc:343
+#: netsync.cc:2514
#, c-format
-msgid "writing delayed manifest data packet for %s\n"
-msgstr "%s ã«ã¤ãã¦é
延ãããããã§ã¹ããã¼ã¿ãã±ãããæ¸ãè¾¼ã¿ä¸\n"
+msgid ""
+"peer %s write failed in shutdown state (possibly client misreported error)\n"
+msgstr ""
+"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æ (ããããã¯ã©ã¤ã¢ã³"
+"ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)\n"
-#: packet.cc:350
+#: netsync.cc:2520
#, c-format
-msgid "discarding manifest data packet %s with unmet dependencies\n"
-msgstr "ä¾åé¢ä¿ãæºãããªããããã§ã¹ããã¼ã¿ãã±ãã %s ãç ´æ£\n"
+msgid "peer %s write failed in confirmed state (success)\n"
+msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ç¢ºèªã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æ (æå)\n"
-#: packet.cc:356
+#: netsync.cc:2547
#, c-format
-msgid "writing delayed file data packet for %s\n"
-msgstr "%s ã«ã¤ãã¦é
延ãã¡ã¤ã«ãã¼ã¿ãã±ãããæ¸ãè¾¼ã¿ä¸\n"
+msgid "peer %s processing finished, disconnecting\n"
+msgstr "ãã¼ã¢ %s å¦ççµäºãåæä¸\n"
-#: packet.cc:369
-#, fuzzy, c-format
-msgid "writing delayed manifest %s packet for %s -> %s%s\n"
-msgstr "é
延ãããã§ã¹ã %s ãã±ãã(%s -> %s)ãæ¸ãè¾¼ã¿ä¸\n"
-
-#: packet.cc:383
+#: netsync.cc:2569
#, c-format
-msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n"
-msgstr "ä¾åé¢ä¿ãæºãããªããããã§ã¹ãå·®åãã±ãã %s -> %s ãç ´æ£\n"
+msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
+msgstr "fd %d (ãã¼ã¢ %s) ã¯ã¢ã¤ãã«æéãé·ããã¾ããåæä¸\n"
-#: packet.cc:390
-#, fuzzy, c-format
-msgid "writing delayed file %s packet for %s -> %s%s\n"
-msgstr "é
延ãããã¡ã¤ã« %s ãã±ãã(%s -> %s)ãæ¸ãè¾¼ã¿ä¸\n"
-
-#: packet.cc:404
+#: netsync.cc:2637
#, c-format
-msgid "discarding file delta packet %s -> %s with unmet dependencies\n"
-msgstr "ä¾åé¢ä¿ãæºãããªããã¡ã¤ã«å·®åãã±ãã %s -> %s ãç ´æ£\n"
+msgid "beginning service on %s : %s\n"
+msgstr "%s : %s ã§ãµã¼ãã¹ãéå§\n"
-#: packet.cc:411
-#, c-format
-msgid "writing delayed revision cert on %s\n"
-msgstr "%s ã®é
延ãªãã¸ã§ã³è¨¼æãæ¸ãè¾¼ã¿ä¸\n"
+#: netsync.cc:2638
+msgid ""
+msgstr "<ãã¹ã¦ã®ã¤ã³ã¿ã¼ãã§ã¼ã¹>"
-#: packet.cc:418
+#: netsync.cc:2652
#, c-format
-msgid "discarding revision cert packet %s with unmet dependencies\n"
-msgstr "ä¾åé¢ä¿ãæºãããªããªãã¸ã§ã³è¨¼æãã±ãã %s ãç ´æ£\n"
+msgid "session limit %d reached, some connections will be refused\n"
+msgstr "ã»ãã·ã§ã³å¶é %d ã«éãã¾ãããããã¤ãã®æ¥ç¶ã¯æå¦ããã¾ã\n"
-#: packet.cc:425
+#: netsync.cc:2707
#, c-format
-msgid "writing delayed public key %s\n"
-msgstr "é
延å
¬ééµ %s ãæ¸ãè¾¼ã¿ä¸\n"
+msgid "got OOB from peer %s, disconnecting\n"
+msgstr "ãã¼ã¢ %s ãã OOB ãã¼ã¿ãåä¿¡ãåæä¸\n"
-#: packet.cc:438
+#: netsync.cc:2776
#, c-format
-msgid "writing delayed private key %s\n"
-msgstr "é
延ç§å¯éµ %s ãæ¸ãè¾¼ã¿ä¸\n"
+msgid "finding items to synchronize:\n"
+msgstr "åæã¢ã¤ãã ãæ¤ç´¢ä¸:\n"
-#: packet.cc:608
-#, c-format
-msgid "noting acceptence of revision %s\n"
-msgstr "ãªãã¸ã§ã³ %s ã«ã¤ãã¦åçãããã®ã¯ããã¾ãã\n"
+#: netsync.cc:2784
+msgid "certificates"
+msgstr "証ææ¸"
-#: packet.cc:621
+#: netsync.cc:2893
#, c-format
-msgid "noting acceptence of manifest %s\n"
-msgstr "ãããã§ã¹ã %s ã«ã¤ãã¦åçãããã®ã¯ããã¾ãã\n"
+msgid "Cannot find key '%s'"
+msgstr "éµ '%s' ãã¿ã¤ãããã¨ãã§ãã¾ãã"
-#: packet.cc:634
+#: netsync.cc:2933
#, c-format
-msgid "noting acceptence of file %s\n"
-msgstr "ãã¡ã¤ã« %s ã«ã¤ãã¦åçãããã®ã¯ããã¾ãã\n"
-
-#: packet.cc:656
-#, c-format
-msgid "skipping existing file version %s\n"
-msgstr "æ¢åã®ãã¡ã¤ã«ããã¼ã¸ã§ã³ %s ãã¹ããã\n"
-
-#: packet.cc:696
-#, c-format
-msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
+msgid ""
+"include branch pattern contains a quote character:\n"
+"%s\n"
msgstr ""
-"å·®å '%s' -> '%s' ããåæ§ç¯ããããã¡ã¤ã«ã® ID '%s' ã¯ä¸æ£ãªãã®ã§ã\n"
+"å¼ç¨ç¬¦ãå«ããã©ã³ããã¿ã¼ã³ãå«ãã:\n"
+"%s\n"
-#: packet.cc:702
+#: netsync.cc:2939
#, c-format
-msgid "delaying file delta %s -> %s for preimage\n"
-msgstr "äºåã¤ã¡ã¼ã¸ã®ããã®ãã¡ã¤ã«å·®å %s -> %s ãé
延\n"
-
-#: packet.cc:712
-#, c-format
-msgid "skipping delta to existing file version %s\n"
-msgstr "æ¢åã®ãã¡ã¤ã«ããã¼ã¸ã§ã³ %s ã¸ã®å·®åãã¹ããã\n"
-
-#: packet.cc:740
-#, c-format
-msgid "reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\n"
-msgstr ""
-"éæ¹åã®å·®å '%s' -> '%s' ããåæ§ç¯ããããã¡ã¤ã«ã® ID '%s' ã¯ä¸æ£ãªãã®ã§"
-"ã\n"
-
-#: packet.cc:746
-#, c-format
-msgid "delaying reverse file delta %s -> %s for preimage\n"
-msgstr "äºåã¤ã¡ã¼ã¸ã®ããã®éæ¹åã®ãã¡ã¤ã«å·®å %s -> %s ãé
延\n"
-
-#: packet.cc:756
-#, c-format
-msgid "skipping reverse delta to existing file version %s\n"
-msgstr "æ¢åã®ãã¡ã¤ã«ããã¼ã¸ã§ã³ %s ã¸ã®éæ¹åã®å·®åãã¹ããã\n"
-
-#: packet.cc:773
-#, c-format
-msgid "skipping existing manifest version %s\n"
-msgstr "æ¢åã®ãããã§ã¹ãããã¼ã¸ã§ã³ %s ãã¹ããã\n"
-
-#: packet.cc:814
-#, c-format
-msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n"
-msgstr ""
-"å·®å '%s' -> '%s' ããåæ§ç¯ããããããã§ã¹ãã® ID '%s' ã¯ä¸æ£ãªãã®ã§ã\n"
-
-#: packet.cc:820
-#, c-format
-msgid "delaying manifest delta %s -> %s for preimage\n"
-msgstr "äºåã¤ã¡ã¼ã¸ã®ããã®éæ¹åã®ãã¡ã¤ã«å·®å %s -> %s ãé
延\n"
-
-#: packet.cc:830
-#, c-format
-msgid "skipping delta to existing manifest version %s\n"
-msgstr "æ¢åã®ãããã§ã¹ããã¼ã¸ã§ã³ %s ã¸ã®å·®åãã¹ããã\n"
-
-#: packet.cc:858
-#, c-format
msgid ""
-"reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n"
+"exclude branch pattern contains a quote character:\n"
+"%s\n"
msgstr ""
-"éæ¹åã®å·®å '%s' -> '%s' ããåæ§ç¯ããããããã§ã¹ãã® ID '%s' ã¯ä¸æ£ãªãã®"
-"ã§ã\n"
+"å¼ç¨ç¬¦ãå«ããã©ã³ããã¿ã¼ã³ãå«ããªã:\n"
+"%s\n"
-#: packet.cc:864
+#: netsync.cc:2962 netsync.cc:2966
#, c-format
-msgid "delaying manifest reverse delta %s -> %s for preimage\n"
-msgstr "äºåã¤ã¡ã¼ã¸ã®ããã®ãããã§ã¹ãã®éæ¹åã®å·®å %s -> %s ãé
延\n"
+msgid "network error: %s"
+msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼: %s"
-#: packet.cc:874
+#: packet.cc:94
#, c-format
-msgid "skipping reverse delta to existing manifest version %s\n"
-msgstr "æ¢åã®ãããã§ã¹ãããã¼ã¸ã§ã³ %s ã¸ã®éæ¹åã®å·®åãã¹ããã\n"
+msgid "file preimage '%s' missing in db"
+msgstr "ãã¡ã¤ã«ã®ãã¬ã¤ã¡ã¼ã¸ '%s' ããã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ãã"
-#: packet.cc:896
+#: packet.cc:95
#, c-format
-msgid "delaying revision %s for new manifest %s\n"
-msgstr "ãªãã¸ã§ã³ %s (æ°ãããããã§ã¹ã %s) ãé
延\n"
+msgid "dropping delta '%s' -> '%s'"
+msgstr "å·®å '%s' -> '%s' ãç ´æ£ãã¦ãã¾ã"
-#: packet.cc:910
+#: packet.cc:109
#, c-format
-msgid "delaying revision %s for old manifest %s\n"
-msgstr "ãªãã¸ã§ã³ %s (å¤ããããã§ã¹ã %s) ãé
延\n"
+msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
+msgstr ""
+"å·®å '%s' -> '%s' ããåæ§ç¯ããããã¡ã¤ã«ã® ID '%s' ã¯ä¸æ£ãªãã®ã§ã\n"
-#: packet.cc:920
+#: packet.cc:138
#, c-format
-msgid "delaying revision %s for old revision %s\n"
-msgstr "ãªãã¸ã§ã³ %s (å¤ããªãã¸ã§ã³ %s) ãé
延\n"
+msgid "missing prerequisite revision '%s'\n"
+msgstr "å¿
é æ¡ä»¶ã¨ãªããªãã¸ã§ã³ '%s' ãã¿ã¤ããã¾ãã\n"
-#: packet.cc:933
+#: packet.cc:139 packet.cc:150 packet.cc:166 packet.cc:174
#, c-format
-msgid "delaying revision %s for old file %s\n"
-msgstr "ãªãã¸ã§ã³ %s (å¤ããã¡ã¤ã« %s) ãé
延\n"
+msgid "dropping revision '%s'\n"
+msgstr "ãªãã¸ã§ã³ '%s' ãç ´æ£ãã¦ãã¾ã\n"
-#: packet.cc:943
+#: packet.cc:149
#, c-format
-msgid "delaying revision %s for new file %s\n"
-msgstr "ãªãã¸ã§ã³ %s (æ°ãããã¡ã¤ã« %s) ãé
延\n"
+msgid "missing prerequisite file '%s'\n"
+msgstr "å¿
é ã¨ãªããã¡ã¤ã« '%s' ãã¿ã¤ããã¾ãã\n"
-#: packet.cc:961
+#: packet.cc:164
#, c-format
-msgid "skipping existing revision %s\n"
-msgstr "æ¢åã®ãªãã¸ã§ã³ %s ãã¹ããã\n"
+msgid "missing prerequisite file pre-delta '%s'\n"
+msgstr "å¿
é ã¨ãªããã¡ã¤ã«ã®ãã¬å·®å '%s' ãã¿ã¤ããã¾ãã\n"
-#: packet.cc:979
+#: packet.cc:172
#, c-format
-msgid "delaying revision cert on %s\n"
-msgstr "%s ã®ãªãã¸ã§ã³è¨¼æãé
延\n"
+msgid "missing prerequisite file post-delta '%s'\n"
+msgstr "å¿
é ã¨ãªããã¡ã¤ã«ã®ãã¹ãå·®å '%s' ãã¿ã¤ããã¾ãã\n"
-#: packet.cc:992
+#: packet.cc:200
#, c-format
-msgid "skipping existing revision cert %s\n"
-msgstr "æ¢åã®ãªãã¸ã§ã³è¨¼æ %s ãã¹ããã\n"
+msgid "cert revision '%s' does not exist in db\n"
+msgstr "ãã¼ã¿ãã¼ã¹ã«è¨¼æãªãã¸ã§ã³ '%s' ã¯å«ã¾ãã¦ãã¾ãã\n"
-#: packet.cc:1006
+#: packet.cc:202
#, c-format
-msgid "skipping prohibited public key %s\n"
-msgstr "ç¦æ¢ãããå
¬ééµ %s ãã¹ããã\n"
+msgid "dropping cert\n"
+msgstr "証æãç ´æ£ãã¦ãã¾ã\n"
-#: packet.cc:1019
+#: packet.cc:225
#, c-format
msgid "key '%s' is not equal to key '%s' in database\n"
msgstr "éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã®éµ '%s' ã¨ä¸è´ãã¾ãã\n"
-#: packet.cc:1020
+#: packet.cc:349
#, c-format
-msgid "skipping existing public key %s\n"
-msgstr "æ¢åã®å
¬ééµ %s ãã¹ããã\n"
-
-#: packet.cc:1033
-#, fuzzy, c-format
-msgid "skipping prohibited key pair %s\n"
-msgstr "ç¦æ¢ãããå
¬ééµ %s ãã¹ããã\n"
-
-#: packet.cc:1042
-#, fuzzy, c-format
-msgid "skipping existing key pair %s\n"
-msgstr "æ¢åã®å
¬ééµ %s ãã¹ããã\n"
-
-#: packet.cc:1078
-#, c-format
-msgid "packet valve opened\n"
-msgstr "ãã±ãããã«ã: é\n"
-
-#: packet.cc:1090
-#, c-format
-msgid "wrote %i queued packets\n"
-msgstr "%i ãã¥ã¼ãã±ããæ¸ãè¾¼ã¿\n"
-
-#: packet.cc:1362
-#, fuzzy, c-format
msgid "malformed packet"
-msgstr "%d ãã±ããèªã¿è¾¼ã¿"
+msgstr "å£ãããã±ãã"
-#: packet.cc:1378
-#, fuzzy, c-format
-msgid "read data packet"
-msgstr "ãã¼ã¿ãã±ããèªã¿è¾¼ã¿\n"
-
-#: packet.cc:1398
-#, fuzzy, c-format
-msgid "read delta packet"
-msgstr "å·®åãã±ããèªã¿è¾¼ã¿\n"
-
-#: packet.cc:1429
-#, fuzzy, c-format
-msgid "read cert packet"
-msgstr "証æãã±ããèªã¿è¾¼ã¿\n"
-
-#: packet.cc:1449 packet.cc:1468
-#, fuzzy, c-format
-msgid "read pubkey data packet"
-msgstr "éµãã¼ã¿ãã±ããèªã¿è¾¼ã¿\n"
-
-#: packet.cc:1458
-#, fuzzy, c-format
-msgid "read keypair data packet"
-msgstr "éµãã¼ã¿ãã±ããèªã¿è¾¼ã¿\n"
-
-#: packet.cc:1481
-#, fuzzy, c-format
+#: packet.cc:449
+#, c-format
msgid "unknown packet type: '%s'"
-msgstr "ä¸æãªãã¹ '%s'\n"
+msgstr "ä¸æãªãã±ããå: '%s'"
#: rcs_file.cc:343
#, c-format
@@ -4277,138 +2994,23 @@
msgid "parse failure %d:%d: expecting word\n"
msgstr "解æ失æ %d:%d: æå¾
ãããèªå¥\n"
-#: rcs_import.cc:247
+#: rcs_import.cc:703
#, c-format
-msgid "Calculating time of %s\n"
-msgstr "%s ã®æéãè¨ç®ãã¦ãã¾ã\n"
-
-#: rcs_import.cc:281
-#, c-format
-msgid "version %s -> tag %s\n"
-msgstr "ãã¼ã¸ã§ã³ %s - ã¿ã° %s\n"
-
-#: rcs_import.cc:448
-#, c-format
-msgid "skipping identity file edge\n"
-msgstr "èå¥ãã¡ã¤ã«ã®å
端ãã¹ããã\n"
-
-#: rcs_import.cc:456 rcs_import.cc:482
-#, c-format
-msgid "existing path to %s found, skipping\n"
-msgstr "%s ã¸ã®æ¢åã®ãã¹ãçºè¦ãã¹ããã\n"
-
-#: rcs_import.cc:474
-#, c-format
-msgid "skipping identity manifest edge\n"
-msgstr "èå¥ãããã§ã¹ãã®å
端ãã¹ããã\n"
-
-#: rcs_import.cc:592
-#, c-format
-msgid "version %s has %d lines\n"
-msgstr "ãã¼ã¸ã§ã³ %s ã«ã¯ %d è¡ããã¾ã\n"
-
-#: rcs_import.cc:605
-#, c-format
-msgid "following RCS edge %s -> %s\n"
-msgstr "次㮠RCS å
端 %s -> %s\n"
-
-#: rcs_import.cc:608
-#, c-format
-msgid "constructed RCS version %s, inserting into database\n"
-msgstr "æ§ç¯ããã RCS ãã¼ã¸ã§ã³ %s ããã¼ã¿ãã¼ã¹ã«æ¿å
¥\n"
-
-#: rcs_import.cc:651
-#, c-format
-msgid "following RCS branch %s = '%s'\n"
-msgstr "次㮠RCS ãã©ã³ã %s = '%s' ã追跡\n"
-
-#: rcs_import.cc:661
-#, c-format
-msgid "finished RCS branch %s = '%s'\n"
-msgstr "RCS ãã©ã³ã %s ='%s' ãçµäº\n"
-
-#: rcs_import.cc:682 rcs_import.cc:730
-#, c-format
msgid "parsing RCS file %s\n"
msgstr "RCS ãã¡ã¤ã« %s ã解æä¸\n"
-#: rcs_import.cc:684 rcs_import.cc:733
+#: rcs_import.cc:706
#, c-format
msgid "parsed RCS file %s OK\n"
msgstr "解æãã RCS ãã¡ã¤ã« %s: OK\n"
-#: rcs_import.cc:773
+#: rcs_import.cc:895
#, c-format
-msgid "importing file '%s'\n"
-msgstr "ãã¡ã¤ã« '%s' ãåãè¾¼ã¿ä¸\n"
-
-#: rcs_import.cc:845
-#, c-format
-msgid "first version in branch %s would be %s\n"
-msgstr "ãã©ã³ã %s å
ã®æåã®ãã¼ã¸ã§ã³ã¯ %s ã§ããã\n"
-
-#: rcs_import.cc:852
-#, c-format
-msgid "file branchpoint for %s at %s\n"
-msgstr "%s ã®ãã¡ã¤ã«ãã©ã³ãç¹ %s\n"
-
-#: rcs_import.cc:922
-#, c-format
msgid "error reading RCS file %s: %s\n"
msgstr "RCS ãã¡ã¤ã« %s ãèªã¿è¾¼ã¿ä¸ã«ã¨ã©ã¼: %s\n"
-#: rcs_import.cc:926
+#: rcs_import.cc:1192
#, c-format
-msgid "skipping non-RCS file %s\n"
-msgstr "é RCS ãã¡ã¤ã« %s ãã¹ããã\n"
-
-#: rcs_import.cc:1105
-#, c-format
-msgid "examining next commit [t:%d] [p:%s] [a:%s] [c:%s]\n"
-msgstr "次ã®ã³ããã [t:%d] [p:%s] [a:%s] [c:%s] ãæ¤æ»ä¸\n"
-
-#: rcs_import.cc:1118
-#, c-format
-msgid "expiring cluster\n"
-msgstr "ã¯ã©ã¹ã¿ãçµäºä¸\n"
-
-#: rcs_import.cc:1134
-#, c-format
-msgid "examining cluster %d to see if it touched %d\n"
-msgstr "ã¯ã©ã¹ã¿ %d ã %d ã«ãµãã¦ããã調ã¹ã¦ãã¾ã\n"
-
-#: rcs_import.cc:1142
-#, c-format
-msgid "found cluster touching %d: [t:%d] [a:%d] [c:%d]\n"
-msgstr "%d: [t:%d] [a:%d] [c:%d] ã«ãµãã¦ããã¯ã©ã¹ã¿ãã¿ã¤ãã¾ãã\n"
-
-#: rcs_import.cc:1150
-#, c-format
-msgid "last modification time is %d\n"
-msgstr "æçµæ´æ°æ¥æ㯠%d ã§ã\n"
-
-#: rcs_import.cc:1166
-#, c-format
-msgid "picked existing cluster [t:%d] [a:%d] [c:%d]\n"
-msgstr "æ¢åã®ã¯ã©ã¹ã¿ [t:%d] [a:%d] [c:%d] ãé¸æ\n"
-
-#: rcs_import.cc:1180
-#, c-format
-msgid "building new cluster [t:%d] [a:%d] [c:%d]\n"
-msgstr "æ°ããã¯ã©ã¹ã¿ [t:%d] [a:%d] [c:%d] ãä½æä¸\n"
-
-#: rcs_import.cc:1205
-#, c-format
-msgid "finished branch commits, writing all pending clusters\n"
-msgstr "ãã©ã³ãã³ããããçµäºãããã¹ã¦ã®å¾
æ©ä¸ã®ã¯ã©ã¹ã¿ãæ¸ãè¾¼ãã§ãã¾ã\n"
-
-#: rcs_import.cc:1211
-#, c-format
-msgid "finished writing pending clusters\n"
-msgstr "å¾
æ©ä¸ã®ã¯ã©ã¹ã¿ã¸ã®æ¸ãè¾¼ã¿ãå®äº\n"
-
-#: rcs_import.cc:1223
-#, c-format
msgid ""
"%s appears to be a CVS repository root directory\n"
"try importing a module instead, with 'cvs_import %s/"
@@ -4416,1141 +3018,449 @@
"%s 㯠CVS ãªãã¸ããªã®ã«ã¼ããã£ã¬ã¯ããªã®ããã§ãã\n"
"代ãã« 'cvs_import %s/<ã¢ã¸ã¥ã¼ã«å>' ã§åãè¾¼ãã§ã¿ã¦ä¸ãã"
-#: rcs_import.cc:1235
+#: rcs_import.cc:1204
#, c-format
msgid "need base --branch argument for importing"
msgstr "åãè¾¼ã¿ã«ã¯åºæº --branch å¼æ°ãå¿
è¦ã§ã"
-#: rcs_import.cc:1247
+#: rcs_import.cc:1216
#, c-format
msgid "path %s does not exist"
msgstr "ãã¹ %s ã¯åå¨ãã¾ãã"
-#: rcs_import.cc:1266
-#, c-format
-msgid "branch %s has %d entries\n"
-msgstr "ãã©ã³ã %s ã«ã¯ %d åã®ã¨ã³ããªãããã¾ã\n"
-
-#: rcs_import.cc:1276
-#, c-format
-msgid "trunk has %d entries\n"
-msgstr "trunk ã«ã¯ %d åã®ã¨ã³ããªãããã¾ã\n"
-
-#: rcs_import.cc:1283
+#: rcs_import.cc:1251
msgid "tags"
msgstr "ã¿ã°"
-#: rcs_import.cc:1329
+#: revision.cc:700
#, c-format
-msgid "initial cluster on branch %s has %d live entries\n"
-msgstr "ãã©ã³ã %s ã®åæã¯ã©ã¹ã¿ã«ã¯ %d åã®çããã¨ã³ããªãããã¾ã\n"
+msgid "scanning for bogus merge edges\n"
+msgstr "å½ãã®çµ±åå
端ãèµ°æ»ä¸\n"
-#: rcs_import.cc:1336
+#: revision.cc:742
#, c-format
-msgid "initial cluster contains %s at %s\n"
-msgstr "åæã¯ã©ã¹ã¿ã¯ %s ã %s ã«å«ãã§ãã¾ã\n"
+msgid "optimizing out redundant edge %d -> %d\n"
+msgstr "åé·ãªå
端 %d -> %d ãæé©åä¸\n"
-#: rcs_import.cc:1382
+#: revision.cc:751
#, c-format
-msgid "storing manifest '%s' (base %s)\n"
-msgstr "ãããã§ã¹ã '%s' (åºæº %s) ãä¿åãã¦ãã¾ã\n"
+msgid "failed to eliminate edge %d -> %d\n"
+msgstr "å
端 %d -> %d ã®é¤å»ã«å¤±æ\n"
-#: rcs_import.cc:1387
+#: revision.cc:762
#, c-format
-msgid "storing head %s\n"
-msgstr "ææ°ç %s ãä¿åãã¦ãã¾ã\n"
-
-#: rcs_import.cc:1402
-#, c-format
-msgid "skipping delta to null manifest\n"
-msgstr "空ãããã§ã¹ãã«ã¤ãã¦ã®å·®åãã¹ããã\n"
-
-#: rcs_import.cc:1414
-#, c-format
-msgid "skipping cyclical manifest delta %s -> %s\n"
-msgstr "ãããã§ã¹ãã®å¾ªç°å·®å %s -> %s ãã¹ããã\n"
-
-#: rcs_import.cc:1420
-#, c-format
-msgid "writing full manifest %s\n"
-msgstr "å®å
¨ãªãããã§ã¹ã %s ãæ¸ãè¾¼ã¿ä¸\n"
-
-#: rcs_import.cc:1430
-#, c-format
-msgid "storing manifest delta %s -> %s\n"
-msgstr "ãããã§ã¹ãå·®å %s -> %s ãä¿åä¸\n"
-
-#: rcs_import.cc:1492
-#, c-format
-msgid "adding entry state '%s' on '%s'\n"
-msgstr "ã¨ã³ããªç¶æ
'%s' ('%s') ã追å \n"
-
-#: rcs_import.cc:1499
-#, c-format
-msgid "applying state delta on '%s' : '%s' -> '%s'\n"
-msgstr "'%s' : '%s' -> '%s' ã®ç¶æ
å·®åãé©ç¨ä¸\n"
-
-#: rcs_import.cc:1510
-#, c-format
-msgid "deleting entry state '%s' on '%s'\n"
-msgstr "ã¨ã³ããªç¶æ
'%s' ('%s') ãåé¤ãã¦ãã¾ã\n"
-
-#: rcs_import.cc:1529
-#, c-format
-msgid "BEGIN consume_cluster()\n"
-msgstr "BEGIN consume_cluster()\n"
-
-#: rcs_import.cc:1549
-#, c-format
-msgid "END consume_cluster('%s') (parent '%s')\n"
-msgstr "END consume_cluster('%s') (親 '%s')\n"
-
-#: revision.cc:126
-#, c-format
-msgid "verifying new revisions (this may take a while)\n"
-msgstr "æ°ãããªãã¸ã§ã³ãæ¤è¨¼ä¸ (ãã°ãã御å¾
ã¡ä¸ãã)\n"
-
-#: revision.cc:128
-#, c-format
-msgid "Verifying revision %s has sane history (to depth %i)\n"
-msgstr "ãªãã¸ã§ã³ %s ã®å±¥æ´ãæ£ãããæ¤è¨¼ãã¦ãã¾ã (æ·±ã %i)\n"
-
-#: revision.cc:166
-#, c-format
-msgid "Examining %s -> %s\n"
-msgstr "%s -> %s ãæ¤è¨ä¸\n"
-
-#: revision.cc:243
-#, c-format
-msgid "%s and %s have no common ancestor, so done\n"
-msgstr "%s 㨠%s ã«ã¯å
±éã®ç¥å
ã¯ããã¾ãããå®äº\n"
-
-#: revision.cc:249
-#, c-format
-msgid "already checked common ancestor, so done\n"
-msgstr "æ¢ã«ãã§ãã¯æ¸ã®å
±éã®ç¥å
ãå®äº\n"
-
-#: revision.cc:252
-#, c-format
-msgid "%s is a merge; verifying paths to common ancestor %s are sane\n"
-msgstr "%s ã¯çµ±åã§ããå
±éã®ç¥å
%s ã¸ã®ãã¹ãé©åãªãã®ãæ¤è¨¼ãã¦ãã¾ã\n"
-
-#: revision.cc:310
-#, c-format
-msgid "loading parents for node %d\n"
-msgstr "ãã¼ã %d ã®è¦ªãèªã¿è¾¼ã¿ä¸\n"
-
-#: revision.cc:332
-#, c-format
-msgid "parent %s -> node %d\n"
-msgstr "親 %s -> ãã¼ã %d\n"
-
-#: revision.cc:482
-#, c-format
-msgid "found %d intersecting nodes\n"
-msgstr "%d åã®äº¤å·®ãã¼ããã¿ã¤ããã¾ãã\n"
-
-#: revision.cc:535
-#, c-format
-msgid "searching for common ancestor, left=%s right=%s\n"
-msgstr "å·¦=%s å³=%s ã®å
±éã®ç¥å
ãæ¤ç´¢ä¸\n"
-
-#: revision.cc:540
-#, c-format
-msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n"
-msgstr "å
±éã®ç¥å
ãèµ°æ» [親=%d,ç¥å
=%d,æ¯é
=%d]\n"
-
-#: revision.cc:545
-#, c-format
-msgid "found node %d, ancestor of left %s and dominating right %s\n"
-msgstr "ã¿ã¤ãã£ããã¼ã %d ã¯å·¦ %s ã¨æ¯é
ãã¦ããå³ %s ã®ç¥å
ã§ã\n"
-
-#: revision.cc:552
-#, c-format
-msgid "found node %d, ancestor of right %s and dominating left %s\n"
-msgstr "ã¿ã¤ãã£ããã¼ã %d ã¯å³ %s ã¨æ¯é
ãã¦ããå·¦ %s ã®ç¥å
ã§ã\n"
-
-#: revision.cc:589
-#, c-format
-msgid "searching for least common ancestor, left=%s right=%s\n"
-msgstr "æå°å
¬åã®ç¥å
ãæ¤ç´¢ä¸, å·¦=%s å³=%s\n"
-
-#: revision.cc:593
-#, c-format
-msgid "least common ancestor scan [par=%d,anc=%d]\n"
-msgstr "æãè¿ãç¥å
ãèµ°æ» [親=%d,ç¥å
=%d]\n"
-
-#: revision.cc:598
-#, c-format
-msgid "found node %d, ancestor of left %s and right %s\n"
-msgstr "ã¿ã¤ãã£ããã¼ã %d ã¯å·¦ %sãå³ %s ã®ç¥å
ã§ã\n"
-
-#: revision.cc:652
-#, c-format
-msgid "checking whether %s is an ancestor of %s\n"
-msgstr "%s ã %s ã®ç¥å
ãã©ããæ¤è¨¼ãã¦ãã¾ã\n"
-
-#: revision.cc:764
-#, c-format
-msgid "new root: %s\n"
-msgstr "æ°è¦ã«ã¼ã: %s\n"
-
-#: revision.cc:779
-#, c-format
-msgid "new leaf: %s\n"
-msgstr "æ°è¦ãªã¼ã: %s\n"
-
-#: revision.cc:921
-#, c-format
-msgid "exploring changesets from parents of %s, seeking towards %s\n"
-msgstr "%s ã®è¦ªãã %s ã«åã£ã¦å¤æ´ã»ããã調æ»ä¸\n"
-
-#: revision.cc:934
-#, c-format
-msgid "considering parent %s of %s\n"
-msgstr "親 %s (%s) ã«ã¤ãã¦æ¤è¨ä¸\n"
-
-#: revision.cc:960
-#, c-format
-msgid "revision %s is relevant, composing with edge to %s\n"
-msgstr "ãªãã¸ã§ã³ %s 㯠%s ã¸ã®å
端ã¨é¢é£ãè¤åãã¦ãã¾ã\n"
-
-#: revision.cc:967
-#, c-format
-msgid "parent %s of %s is not relevant\n"
-msgstr "親 %s (%s) ã¯é¢é£ãã¦ãã¾ãã\n"
-
-#: revision.cc:1003
-#, c-format
-msgid "adding parents of %s to subgraph\n"
-msgstr "%s ã®è¦ªããµãã°ã©ãã«è¿½å \n"
-
-#: revision.cc:1013
-#, c-format
-msgid "found parent %s of %s\n"
-msgstr "親 %s (%s) ãçºè¦\n"
-
-#: revision.cc:1017
-#, c-format
-msgid "adding parent %s to next frontier\n"
-msgstr "親 %s ã次ã®å
端ã«è¿½å \n"
-
-#: revision.cc:1032
-#, c-format
-msgid "calculating composite changeset between %s and %s\n"
-msgstr "%s 㨠%s ã®éã®è¤åå¤æ´ã»ãããè¦ç©ã£ã¦ãã¾ã\n"
-
-#: revision.cc:1050
-#, c-format
-msgid "calculating changeset from %s to %s\n"
-msgstr "%s ãã %s ã¸ã®å¤æ´ã»ãããè¦ç©ã£ã¦ãã¾ã\n"
-
-#: revision.cc:1054
-#, c-format
-msgid "no common ancestor for %s and %s\n"
-msgstr "%s 㨠%s ã®å
±éã®ç¥å
ã¯ããã¾ãã\n"
-
-#: revision.cc:1055
-#, c-format
-msgid "common ancestor is %s\n"
-msgstr "å
±éã®ç¥å
㯠%s ã§ã\n"
-
-#: revision.cc:1086
-#, c-format
-msgid "analyzing manifest changes from '%s' -> '%s'\n"
-msgstr "'%s' -> '%s' ãããããã§ã¹ãã®å¤æ´ã解æä¸\n"
-
-#: revision.cc:1099
-#, c-format
-msgid "splitting ancestry for file %s\n"
-msgstr "ãã¡ã¤ã« %s ã®ç³»çµ±ãåé¢ä¸\n"
-
-#: revision.cc:1166
-#, c-format
-msgid "noting ancestry from child %d -> parent %d\n"
-msgstr "å %d -> 親 %d ã®ç³»çµ±ã¯ããã¾ãã\n"
-
-#: revision.cc:1199
-#, c-format
-msgid "setting epoch for %s to %s\n"
-msgstr "%s ã® epoch ã %s ã«è¨å®\n"
-
-#: revision.cc:1255
-#, c-format
-msgid "scanning for nodes with 3+ parents\n"
-msgstr "3 å以ä¸ã®è¦ªãæã¤ãã¼ããèµ°æ»ä¸\n"
-
-#: revision.cc:1296
-#, c-format
-msgid "optimizing out redundant edge %i -> %i\n"
-msgstr "åé·ãªå
端 %i -> %i ãæé©åä¸\n"
-
-#: revision.cc:1323
-#, c-format
msgid "rebuilding %d nodes\n"
msgstr "åæ§ç¯ä¸: %d ãã¼ã\n"
-#: revision.cc:1360
+#: revision.cc:967
#, c-format
-msgid "node %d = manifest %s\n"
-msgstr "ãã¼ã %d = ãããã§ã¹ã %s\n"
+msgid "Path %s added to child roster multiple times\n"
+msgstr "ãã¹ %s ãåã®åç°¿ã«è¤æ°å追å ããã¾ãã\n"
-#: revision.cc:1371
+#: revision.cc:980
#, c-format
-msgid "loaded '%s' manifest cert for node %s\n"
-msgstr "'%s' ãããã§ã¹ã証æ (ãã¼ã %s) ãèªã¿è¾¼ã¿ã¾ãã\n"
+msgid "Directory for path %s cannot be added, as there is a file in the way\n"
+msgstr ""
+"éªéã«ãªã£ã¦ãããã¡ã¤ã«ãããã®ã§ããã¹ %s ã®ãã£ã¬ã¯ããªã追å ã§ãã¾ãã\n"
-#: revision.cc:1399
+#: revision.cc:991
#, c-format
-msgid "node %d = revision %s = manifest %s\n"
-msgstr "ãã¼ã %d = ãªãã¸ã§ã³ %s = ãããã§ã¹ã %s\n"
+msgid "Path %s cannot be added, as there is a directory in the way\n"
+msgstr "éªéã«ãªã£ã¦ãããã£ã¬ã¯ããªãããã®ã§ ãã¹ %s ã追å ã§ãã¾ãã\n"
-#: revision.cc:1411
+#: revision.cc:994
#, c-format
-msgid "loaded '%s' revision cert for node %s\n"
-msgstr "'%s' ãªãã¸ã§ã³è¨¼æ (ãã¼ã %s) ãèªã¿è¾¼ã¿ã¾ãã\n"
+msgid "Path %s added twice with differing content\n"
+msgstr "ç°ãªãå
容ã§ãã¹ %s ãäºå追å ãã¦ãã¾ã\n"
-#: revision.cc:1435
+#: revision.cc:1281
#, c-format
-msgid "processing node %d\n"
-msgstr "ãã¼ã %d ãå¦çä¸\n"
+msgid ""
+"unknown attribute '%s' on path '%s'\n"
+"please contact %s so we can work out the right way to migrate this\n"
+"(if you just want it to go away, see the switch --drop-attr, but\n"
+"seriously, if you'd like to keep it, we're happy to figure out how)"
+msgstr ""
+"ä¸æãªå±æ§ '%s' (ãã¹ä¸ '%s')\n"
+"%s ã«é£çµ¡ãã¦ä¸ãããããããã°ãããçµ±åããæ£ããæ¹æ³ãã¿ã¤ãããã¾ãã\n"
+"(ããåã«å
ã«é²ã¿ããã®ãªã --drop-attr ã¹ã¦ã£ããã«ã¤ãã¦åç
§ãã¦ä¸ããã\n"
+"ãããæ¬å½ã®ã¨ãããã®ã¾ã¾ã«ãã¦ããã¦ãããæ¹ã解決ã«ã¯å½¹ç«ã¡ã¾ãã)"
-#: revision.cc:1439
+#: revision.cc:1393
#, c-format
-msgid "node %d already processed, skipping\n"
-msgstr "ãã¼ã %d ãã¹ããã (æ¢ã«å¦çæ¸ã¿)\n"
+msgid "converting existing revision graph to new roster-style revisions\n"
+msgstr ""
+"æ¢åã®ãªãã¸ã§ã³ã®ã°ã©ããæ°ããåç°¿ã¹ã¿ã¤ã«ã®ãªãã¸ã§ã³ã«å¤æãã¦ãã¾ã\n"
-#: revision.cc:1453
+#: revision.cc:1448
#, c-format
-msgid "node %d is a root node\n"
-msgstr "ãã¼ã %d ã¯ã«ã¼ããã¼ãã§ã\n"
-
-#: revision.cc:1469 revision.cc:1552
-#, c-format
-msgid "parent node %d = revision %s\n"
-msgstr "親ãã¼ã %d = ãªãã¸ã§ã³ %s\n"
-
-#: revision.cc:1531
-#, c-format
-msgid "processing edge from child %d -> parent %d\n"
-msgstr "å %d -> 親 %d ããå
端ãå¦çä¸\n"
-
-#: revision.cc:1569
-#, c-format
-msgid "mapped node %d to revision %s\n"
-msgstr "ãã¼ã %d ããªãã¸ã§ã³ %s ã¸å²ãå½ã¦ã¾ãã\n"
-
-#: revision.cc:1575
-#, c-format
-msgid "skipping already existing revision %s\n"
-msgstr "æ¢åã®ãªãã¸ã§ã³ %s ãã¹ããã\n"
-
-#: revision.cc:1587
-#, c-format
-msgid "rebuilding revision graph from existing graph\n"
-msgstr "æ¢åã®ã°ã©ããããªãã¸ã§ã³ã°ã©ããå度æ§æä¸\n"
-
-#: revision.cc:1619
-#, c-format
msgid "rebuilding revision graph from manifest certs\n"
msgstr "ãããã§ã¹ã証æãããªãã¸ã§ã³ã°ã©ããå度æ§æä¸\n"
-#: sanity.cc:38
+#: revision.cc:1551
#, c-format
-msgid "started up on %s\n"
-msgstr "%s ã§éå§\n"
-
-#: sanity.cc:54
-#, c-format
-msgid "wrote debugging log to %sif reporting a bug, please include this file"
+msgid ""
+"encountered a revision with unknown format, version '%s'\n"
+"I only know how to understand the version '1' format\n"
+"a newer version of monotone is required to complete this operation"
msgstr ""
+"ä¸æãªå½¢å¼ã®ãªãã¸ã§ã³ (ãã¼ã¸ã§ã³ '%s') ã«ééãã¾ããã\n"
+"ç解ã§ããã®ã¯ãã¼ã¸ã§ã³ '1' å½¢å¼ã ãã§ãã\n"
+"ãã®æä½ãå®äºããã«ã¯ããæ°ãããã¼ã¸ã§ã³ã® monotone ãå¿
è¦ã§ã"
-#: sanity.cc:59
-#, fuzzy, c-format
-msgid "failed to write debugging log to %s\n"
-msgstr "%s ã¸ã®ãããã°ãã°ã®æ¸ãè¾¼ã¿ã«å¤±æãã¾ãã"
-
-#: sanity.cc:110
+#: sanity.cc:117
#, c-format
msgid "fatal: formatter failed on %s:%d: %s"
msgstr "è´å½ç: ãã©ã¼ããã¿å¤±æ %s:%d: %s"
-#: sanity.cc:184
+#: sanity.cc:191
msgid "misuse: "
msgstr "誤ã: "
-#: sanity.cc:196
+#: sanity.cc:203
msgid "error: "
msgstr "ã¨ã©ã¼: "
-#: sanity.cc:234
+#: sanity.cc:211
#, c-format
-msgid "ignoring request to give last gasp; already in process of dumping\n"
-msgstr "æå¾ã®å¤æ´è¦è«ãç¡è¦ãã¾ããæ¢ã«ãã³ãå¦çä¸ã§ã\n"
+msgid "%s:%d: invariant '%s' violated"
+msgstr "%s:%d: invariant '%s' violated"
-#: sanity.cc:238
+#: sanity.cc:224
#, c-format
-msgid "saving current work set: %i items"
-msgstr "ç¾å¨ã®ä½æ¥ã»ãããä¿åä¸: %i ã¢ã¤ãã "
+msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
+msgstr "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
-#: sanity.cc:240
+#: sanity.cc:245
#, c-format
msgid "Current work set: %i items\n"
msgstr "ç¾å¨ã®ä½æ¥ã»ãã: %i ã¢ã¤ãã \n"
-#: sanity.cc:254 sanity.cc:260
+#: schema_migration.cc:228
#, c-format
-msgid "ignoring error trigged by saving work set to debug log"
-msgstr "ä½æ¥ã»ããã®ä¿åã«ãã£ã¦å¼ãèµ·ããããããã°ãã°ã¸ã®ã¨ã©ã¼ãç¡è¦ãã¾ã"
+msgid "calculating necessary migration steps"
+msgstr "å¿
è¦ãªçµ±åã¹ããããè¦ç©ã£ã¦ãã¾ã"
-#: sanity.cc:264
+#: schema_migration.cc:238
#, c-format
-msgid "finished saving work set"
-msgstr "ä½æ¥ã»ããã®ä¿åçµäº"
+msgid "error at transaction BEGIN statement"
+msgstr "ãã©ã³ã¶ã¯ã·ã§ã³ BEGIN æã§ã¨ã©ã¼"
-#: schema_migration.cc:47
-#, fuzzy, c-format
-msgid "executing SQL '%s'"
-msgstr "ã³ãã³ã '%s' ãå®è¡ä¸\n"
-
-#: schema_migration.cc:49
+#: schema_migration.cc:239
#, c-format
-msgid "result: %i (%s)"
-msgstr ""
+msgid "migrating data"
+msgstr "ãã¼ã¿ãçµ±åãã¦ãã¾ã"
-#: schema_migration.cc:51
-#, fuzzy, c-format
-msgid "errmsg: %s"
-msgstr "ã¨ã©ã¼: %s\n"
-
-#: schema_migration.cc:184
+#: schema_migration.cc:265
#, c-format
-msgid "failure extracting schema from sqlite_master"
-msgstr ""
-
-#: schema_migration.cc:227
-#, c-format
-msgid "error at transaction BEGIN statement"
-msgstr ""
-
-#: schema_migration.cc:254
-#, c-format
msgid "migration step failed: %s"
-msgstr ""
+msgstr "çµ±åã¹ããã失æ: %s"
-#: schema_migration.cc:268
+#: schema_migration.cc:279
#, c-format
msgid "mismatched result of migration, got %s, wanted %s"
-msgstr ""
+msgstr "çµ±åã®çµæã®ä¸ä¸è´: çµæ %s, æå¾
%s"
-#: schema_migration.cc:271
-#, fuzzy, c-format
+#: schema_migration.cc:282
+#, c-format
msgid "committing changes to database"
-msgstr "ä½æ¥ã³ãã¼ããã¼ã¿ãã¼ã¹ã«ã³ããã"
+msgstr "å¤æ´ããã¼ã¿ãã¼ã¹ã«ã³ããããã¦ãã¾ã"
-#: schema_migration.cc:273
+#: schema_migration.cc:284
#, c-format
msgid "failure on COMMIT"
-msgstr ""
+msgstr "COMMIT 失æ"
-#: schema_migration.cc:275
-#, fuzzy, c-format
+#: schema_migration.cc:286
+#, c-format
msgid "optimizing database"
-msgstr "ä½æ¥ã³ãã¼ããã¼ã¿ãã¼ã¹ã«ã³ããã"
+msgstr "ãã¼ã¿ãã¼ã¹ãæé©åãã¦ãã¾ã"
-#: schema_migration.cc:277
+#: schema_migration.cc:288
#, c-format
msgid "error vacuuming after migration"
-msgstr ""
+msgstr "çµ±åå¾ã®ããã¥ã¼ã å¦çä¸ã«ã¨ã©ã¼"
-#: schema_migration.cc:280
+#: schema_migration.cc:291
#, c-format
msgid "error running analyze after migration"
-msgstr ""
+msgstr "çµ±åå¾ã«è§£æå®è¡ä¸ã«ã¨ã©ã¼"
-#: schema_migration.cc:287
+#: schema_migration.cc:298
#, c-format
msgid "database schema %s is unknown; cannot perform migration"
msgstr "ä¸æãªãã¼ã¿ãã¼ã¹ã¹ãã¼ã %s; çµ±åã§ãã¾ãã"
-#: schema_migration.cc:292
+#: schema_migration.cc:303
#, c-format
msgid "no migration performed; database schema already up-to-date at %s\n"
msgstr "çµ±åãã¾ãã; ãã¼ã¿ãã¼ã¹ã¹ãã¼ãã¯æ¢ã«ææ°ã«ãªã£ã¦ãã¾ã: %s\n"
-#: schema_migration.cc:842
-#, fuzzy, c-format
+#: schema_migration.cc:853
+#, c-format
msgid "public and private keys for %s don't match"
-msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
+msgstr "%s ã®å
¬ééµã¨ç§å¯éµãä¸è´ãã¾ãã"
-#: schema_migration.cc:845
-#, fuzzy, c-format
+#: schema_migration.cc:856
+#, c-format
msgid "moving key '%s' from database to %s"
-msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£\n"
+msgstr "éµ '%s' ããã¼ã¿ãã¼ã¹ãã %s ã«ç§»åãã¦ãã¾ã"
#: std_hooks.lua:28
msgid "Press enter when the subprocess has completed"
-msgstr ""
+msgstr "ãµãããã»ã¹ãå®äºããã [Enter] ãæ¼ãã¦ä¸ãã"
-#: std_hooks.lua:211
+#: transforms.cc:510
#, c-format
-msgid "Error running editor '%s' to enter log message\n"
-msgstr ""
-
-#: std_hooks.lua:553
-#, fuzzy
-msgid "executing external 2-way merge command\n"
-msgstr "å
é¨ä¸å
çµ±åå®äº\n"
-
-#: std_hooks.lua:661
-#, fuzzy
-msgid "executing external 3-way merge command\n"
-msgstr "å
é¨ä¸å
çµ±åå®äº\n"
-
-#: transforms.cc:521
-#, c-format
-msgid "converting %d bytes from %s to %s\n"
-msgstr "%d ãã¤ã: %s ãã %s ã¸å¤æä¸\n"
-
-#: transforms.cc:527
-#, c-format
msgid "failed to convert string from %s to %s: '%s'"
msgstr "æååã®å¤æ (%s ãã %s: '%s' ã¸) ã«å¤±æãã¾ãã"
-#: transforms.cc:667
+#: transforms.cc:741 transforms.cc:755
#, c-format
-msgid "converting %d bytes from IDNA ACE to UTF-8\n"
-msgstr "IDNA ACE ãã UTF-8 ã¸å¤æä¸ (%d ãã¤ã)\n"
-
-#: transforms.cc:670 transforms.cc:684
-#, c-format
msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
msgstr "UTF-8 ãã IDNA ACE ã¸å¤æä¸ã«ã¨ã©ã¼(%d ãã¤ã): %s"
-#: transforms.cc:681
+#: ui.cc:108
#, c-format
-msgid "converting %d bytes from UTF-8 to IDNA ACE\n"
-msgstr "UTF-8 ãã IDNA ACE ã¸å¤æä¸ (%d ãã¤ã)\n"
+msgid "%.1f G"
+msgstr "%.1f G"
-#: transforms.cc:829
+#: ui.cc:114
#, c-format
-msgid "doing linesep conversion to %s\n"
-msgstr "%s ã«ã¤ãã¦è¡æ«ãå¤æä¸\n"
-
-#: ui.cc:120
-#, c-format
msgid "%.1f M"
msgstr "%.1f M"
-#: ui.cc:125
+#: ui.cc:120
#, c-format
msgid "%.1f k"
msgstr "%.1f k"
-#: ui.cc:134
+#: ui.cc:137 ui.cc:139
#, c-format
+msgid "%d/%d"
+msgstr "%d/%d"
+
+#: ui.cc:146
+#, c-format
msgid "%d"
msgstr "%d"
-#: ui.cc:326
+#: ui.cc:369
#, c-format
msgid ""
"fatal: %s\n"
"this is almost certainly a bug in monotone.\n"
-"please send this error message, the output of 'monotone --full-version',\n"
+"please send this error message, the output of '%s --full-version',\n"
"and a description of what you were doing to %s.\n"
-msgstr ""
-"æ·±å»: %s\n"
+msgstr "æ·±å»: %s\n"
"ããã¯ã»ã¼ç¢ºå®ã« monotone ã®ãã°ã§ãããã\n"
-"ãã®ã¨ã©ã¼ã¡ãã»ã¼ã¸ã¨ 'monotone --full-version' ã®çµæãããã« %s ã«ã¤ãã¦\n"
+"ãã®ã¨ã©ã¼ã¡ãã»ã¼ã¸ã¨ '%s --full-version' ã®çµæ㨠%s ã«ã¤ãã¦\n"
"ä½ãããã説æãæ·»ãã¦å ±åãã¦ä¸ãã\n"
-#: ui.cc:369
-msgid "monotone: "
-msgstr "monotone: "
-
-#: update.cc:66
+#: update.cc:65
#, c-format
msgid "failed to decode boolean testresult cert value '%s'\n"
msgstr "ãã¹ãçµæçå½å¤ã®è¨¼æå¤ '%s' ã®ãã³ã¼ãã«å¤±æãã¾ãã\n"
-#: update.cc:78
+#: update.cc:159
#, c-format
-msgid "Considering update target %s\n"
-msgstr "ã¿ã¼ã²ãã %s ã®æ´æ°ã«ã¤ãã¦è¨ç®ä¸\n"
-
-#: update.cc:88
-#, c-format
-msgid "%s not in branch %s\n"
-msgstr "%s ã¯ãã©ã³ã %s å
ã«ã¯ããã¾ãã\n"
-
-#: update.cc:97
-#, c-format
-msgid "%s is acceptable update candidate\n"
-msgstr "%s ã¯åãå
¥ãå¯è½ãªæ´æ°åè£ã§ã\n"
-
-#: update.cc:102
-#, c-format
-msgid "%s has unacceptable test results\n"
-msgstr "%s ã¯åãå
¥ããããªããã¹ãçµæã§ã\n"
-
-#: update.cc:160
-#, c-format
msgid "cannot determine branch for update"
msgstr "æ´æ°ãããã©ã³ãã決å®ã§ãã¾ãã"
-#: vocab.cc:53
+#: vocab.cc:68
#, c-format
msgid "hex encoded ID '%s' size != %d"
msgstr "åå
é²ã¨ã³ã³ã¼ã ID '%s' ãµã¤ãº != %d"
-#: vocab.cc:56
+#: vocab.cc:72
#, c-format
msgid "bad character '%c' in id name '%s'"
msgstr "ä¸æ£ãªæå '%c' (ID å '%s' å
)"
-#: vocab.cc:69
+#: vocab.cc:85
#, c-format
msgid "bad character '%c' in ace string '%s'"
msgstr "ä¸æ£ãªæå '%c' (ace æåå '%s' å
)"
-#: vocab.cc:83
+#: vocab.cc:99
#, c-format
msgid "bad character '%c' in cert name '%s'"
msgstr "ä¸æ£ãªæå '%c' (証æ '%s' å
)"
-#: vocab.cc:96
+#: vocab.cc:112
#, c-format
msgid "bad character '%c' in key name '%s'"
msgstr "ä¸æ£ãªæå '%c' (ãã¼å '%s' å
)"
-#: vocab.cc:114
+#: vocab.cc:130
#, c-format
msgid "Invalid key length of %d bytes"
msgstr "ä¸æ£ãªéµé· %d ãã¤ã"
-#: vocab.cc:132
+#: vocab.cc:148
#, c-format
msgid "Invalid hmac length of %d bytes"
msgstr "ä¸æ£ãª HMAC é· %d ãã¤ã"
-#: work.cc:64
+#: work.cc:118
#, c-format
-msgid "skipping ignorable file %s\n"
-msgstr "ç¡è¦å¯è½ãªãã¡ã¤ã« %s ãã¹ããã\n"
+msgid "skipping ignorable file %s"
+msgstr "ç¡è¦ã§ãããã¡ã¤ã« %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:70
+#: work.cc:127
#, c-format
-msgid "skipping %s, already accounted for in working copy\n"
-msgstr "æ¢ã«ä½æ¥ã³ãã¼ã«è¿½å ããã¦ãã %s ãã¹ããã\n"
+msgid "skipping %s, already accounted for in workspace"
+msgstr "æ¢ã«ã¯ã¼ã¯ã¹ãã¼ã¹ã§æ°ã«å
¥ãããã¦ãã %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:74
+#: work.cc:131
#, c-format
-msgid "adding %s to working copy add set\n"
-msgstr "ä½æ¥ã³ãã¼è¿½å ã»ããã« %s ã追å \n"
+msgid "adding %s to workspace manifest"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãã« %s ã追å ãã¦ãã¾ã"
-#: work.cc:136
+#: work.cc:221
#, c-format
-msgid "adding attribute '%s' on file %s to %s\n"
-msgstr "å±æ§ '%s' (ãã¡ã¤ã« %s ã®)ã %s ã«è¿½å \n"
+msgid "skipping %s, not currently tracked"
+msgstr "追跡ããã¦ããªã %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:203
+#: work.cc:231
#, c-format
-msgid "invalid path ''"
-msgstr "ä¸é©åãªãã¹ ''"
+msgid "cannot remove %s/, it is not empty"
+msgstr "空ã§ã¯ãªãã®ã§ %s/ ãåé¤ã§ãã¾ãã"
-#: work.cc:207
+#: work.cc:242
#, c-format
-msgid "skipping %s, not currently tracked\n"
-msgstr "ç¾å¨è¿½è·¡å¯¾è±¡ã§ã¯ãªã %s ãã¹ããã\n"
+msgid "dropping %s from workspace manifest"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ããã %s ãç ´æ£ãã¦ãã¾ã"
-#: work.cc:211
+#: work.cc:305
#, c-format
-msgid "adding %s to working copy delete set\n"
-msgstr "%s ãä½æ¥ã³ãã¼åé¤ã»ããã«è¿½å \n"
+msgid "destination dir %s/ does not exist in current revision"
+msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã«ãã£ã¬ã¯ã㪠%s/ ã¯ããã¾ãã"
-#: work.cc:215
+#: work.cc:308
#, c-format
-msgid ""
-"sorry -- 'drop ' is currently broken.\n"
-"try 'find %s -type f | monotone drop address@hidden'\n"
-msgstr ""
-"ç³ãåãããã¾ããã 'drop <ãã£ã¬ã¯ããª>' ã¯ä½¿ãã¾ãã.\n"
-"代ãã« 'find %s -type f | monotone drop address@hidden' ã試ãã¦ã¿ã¦ä¸ãã.\n"
+msgid "destination %s is an existing file in current revision"
+msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã« %s ã¯ããã¾ãã"
-#: work.cc:227
+#: work.cc:318
#, c-format
-msgid "dropped attributes for file %s from %s\n"
-msgstr "ãã¡ã¤ã« %s ã®å±æ§ã %s ããåé¤ãã¾ãã\n"
+msgid "empty path %s is not allowed"
+msgstr "ãã¹ %s ã¯ç©ºã«ã§ãã¾ãã"
-#: work.cc:253
+#: work.cc:332
#, c-format
-msgid "invalid source path ''"
-msgstr "ä¸é©åãªã½ã¼ã¹ãã¹ ''"
+msgid "%s does not exist in current revision"
+msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã« %s ã¯ããã¾ãã"
-#: work.cc:254
+#: work.cc:335
#, c-format
-msgid "invalid destination path ''"
-msgstr "ä¸é©åãªæ¹åãã¹ ''"
+msgid "destination %s already exists in current revision"
+msgstr "%s ã¯æ¢ã«ç¾å¨ã®ãªãã¸ã§ã³ã«ããã¾ã"
-#: work.cc:265
+#: work.cc:344
#, c-format
-msgid "%s does not exist in current revision\n"
-msgstr "ãã¡ã¤ã« %s ã¯ç¾å¨ã®ãªãã¸ã§ã³å
ã«ã¯ããã¾ãã\n"
+msgid "renaming %s to %s in workspace manifest"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãå
ã® %s ã %s ã«å¤æ´ãã¦ãã¾ã"
-#: work.cc:268
+#: work.cc:369
#, c-format
-msgid "%s already exists in current revision\n"
-msgstr "%s ã¯ç¾å¨ã®ãªãã¸ã§ã³å
ã«åå¨ãã¦ãã¾ã\n"
+msgid "%s doesn't exist in workspace, skipping"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã« %s ã¯ããã¾ããã®ã§ãã¹ããããã¾ã"
-#: work.cc:270
+#: work.cc:373
#, c-format
-msgid "adding %s -> %s to working copy rename set\n"
-msgstr "%s -> %s ãä½æ¥ã³ãã¼å称å¤æ´ã»ããã«è¿½å \n"
+msgid "destination %s already exists in workspace, skipping"
+msgstr "ãªãã¸ã§ã³ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ãã®ã§ãã¹ããããã¾ã"
-#: work.cc:293
+#: work.cc:400
#, c-format
-msgid "%s has existing attributes in %s; clean them up first"
-msgstr "%s ã¯æ¢åã® %s å
ã«å±æ§ãæã£ã¦ãã¾ã; ã¾ããããåé¤ãã¦ä¸ãã"
+msgid "proposed new root directory '%s' is not versioned or does not exist"
+msgstr ""
+"ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã¼ã¸ã§ã³ä»ãããã¦ããªãããåå¨"
+"ãã¾ãã"
-#: work.cc:302
+#: work.cc:402
#, c-format
-msgid "moving attributes for %s to %s\n"
-msgstr "%s ã®å±æ§ã %s ã«ç§»åä¸\n"
+msgid "proposed new root directory '%s' is not a directory"
+msgstr "ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-#: work.cc:321
+#: work.cc:407
#, c-format
-msgid "work path is %s\n"
-msgstr "ä½æ¥ãã¹ã¯ %s ã§ã\n"
+msgid "proposed new root directory '%s' contains illegal path %s"
+msgstr ""
+"ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã«ã¯ä¸æ£ãªãã¹ %s ãå«ã¾ãã¦ãã¾ã"
-#: work.cc:330
+#: work.cc:417
#, c-format
-msgid "checking for un-committed work file %s\n"
-msgstr "æªã³ãããã®ä½æ¥ãã¡ã¤ã« %s ãæ¤è¨¼ä¸\n"
+msgid "directory '%s' is not versioned or does not exist"
+msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯ãã¼ã¸ã§ã³ä»ãããã¦ããªãããåå¨ãã¾ãã"
-#: work.cc:334
+#: work.cc:423
#, c-format
-msgid "read rearrangement from %s\n"
-msgstr "%s ããå調æ´èªã¿åã\n"
+msgid "'%s' is in the way"
+msgstr "'%s' ãéªéã«ãªã£ã¦ãã¾ã"
-#: work.cc:338
+#: work.cc:520
#, c-format
-msgid "no un-committed work file %s\n"
-msgstr "æªã³ãããã®ä½æ¥ãã¡ã¤ã« %s ã¯ããã¾ãã\n"
+msgid "workspace is corrupt: %s does not exist"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
-#: work.cc:375
+#: work.cc:521
#, c-format
-msgid "revision path is %s\n"
-msgstr "ãªãã¸ã§ã³ãã¹ã¯ %s ã§ã\n"
+msgid "workspace is corrupt: %s is a directory"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
-#: work.cc:385
+#: work.cc:531
#, c-format
-msgid "working copy is corrupt: %s does not exist"
-msgstr "ä½æ¥ã³ãã¼ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
+msgid "Problem with workspace: %s is unreadable"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã«åé¡ãããã¾ã: %s ãèªã¿è¾¼ãã¾ãã"
-#: work.cc:386
+#: work.cc:557
#, c-format
-msgid "working copy is corrupt: %s is a directory"
-msgstr "ä½æ¥ã³ãã¼ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
-
-#: work.cc:389
-#, c-format
-msgid "loading revision id from %s\n"
-msgstr "%s ãããªãã¸ã§ã³ ID ãèªã¿è¾¼ã¿\n"
-
-#: work.cc:396
-#, c-format
-msgid "Problem with working directory: %s is unreadable"
-msgstr "ä½æ¥ãã£ã¬ã¯ããªã«åé¡ãããã¾ã: %s ãèªã¿è¾¼ãã¾ãã"
-
-#: work.cc:405
-#, c-format
-msgid "writing revision id to %s\n"
-msgstr "ãªãã¸ã§ã³ ID ã %s ã«æ¸ãè¾¼ã¿ä¸\n"
-
-#: work.cc:424
-#, c-format
msgid "base revision %s does not exist in database\n"
msgstr "ãã¼ã¿ãã¼ã¹ã«åºæºãªãã¸ã§ã³ %s ã¯å«ã¾ãã¦ãã¾ãã\n"
-#: work.cc:427
+#: work.cc:894
#, c-format
-msgid "old manifest is %s\n"
-msgstr "å¤ã manifest 㯠%s ã§ã\n"
+msgid "dropping %s"
+msgstr "%s ãç ´æ£ãã¦ãã¾ã"
-#: work.cc:430
+#: work.cc:905 work.cc:916
#, c-format
-msgid "base manifest %s does not exist in database\n"
-msgstr "ãã¼ã¿ãã¼ã¹ã«åºæºãããã§ã¹ã %s ã¯å«ã¾ãã¦ãã¾ãã\n"
+msgid "path %s already exists"
+msgstr "ãã¹ %s ã¯æ¢ã«ããã¾ã"
-#: work.cc:435
+#: work.cc:938 work.cc:965
#, c-format
-msgid "old manifest has %d entries\n"
-msgstr "å¤ããããã§ã¹ãã«ã¯ %d åã®ã¨ã³ããªãããã¾ã\n"
+msgid "adding %s"
+msgstr "%s ã追å ãã¦ãã¾ã"
-#: work.cc:456
+#: work.cc:954
#, c-format
-msgid "user log path is %s\n"
-msgstr "ã¦ã¼ã¶ã¼ãã°ãã¹ã¯ %s ã§ã\n"
+msgid "path '%s' already exists, cannot create"
+msgstr "ãã¹ '%s' ã¯æ¢ã«ããã¾ãã®ã§ä½æã§ãã¾ãã"
-#: work.cc:505
+#: work.cc:961
#, c-format
-msgid "options path is %s\n"
-msgstr "ãªãã·ã§ã³ãã¹ã¯ %s ã§ã\n"
+msgid "renaming %s to %s"
+msgstr "%s ãã %s ã«å称å¤æ´ãã¦ãã¾ã"
-#: work.cc:552
+#: work.cc:996
#, c-format
-msgid "local dump path is %s\n"
-msgstr "ãã¼ã«ã«ã®ãã³ããã¹ã¯ %s ã§ã\n"
+msgid "file '%s' does not exist"
+msgstr "ãã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-#: work.cc:604
+#: work.cc:997
#, c-format
-msgid "attribute map path is %s\n"
-msgstr "å±æ§ããããã¹ã¯ %s ã§ã\n"
+msgid "file '%s' is a directory"
+msgstr "ãã¡ã¤ã« '%s' ã¯ãã£ã¬ã¯ããªã§ã"
-#: xdelta.cc:345
+#: work.cc:1002
#, c-format
-msgid "computing binary delta instructions\n"
-msgstr "ãã¤ããªå·®åå½ä»¤ãè¨ç®ä¸\n"
+msgid "content of file '%s' has changed, not overwriting"
+msgstr "ãã¡ã¤ã« '%s' ã®å
容ã¯å¤æ´ããã¦ããã®ã§ä¸æ¸ããã¾ãã"
-#: xdelta.cc:347
+#: work.cc:1003
#, c-format
+msgid "updating %s"
+msgstr "%s ãæ´æ°ãã¦ãã¾ã"
-msgid "computed binary delta instructions\n"
-msgstr "ãã¤ããªå·®åå½ä»¤ã®è¨ç®çµæ\n"
-
-#~ msgid "no unique private key for cert construction"
-#~ msgstr "証æä½æã®ããã®åºæã®ç§å¯éµãããã¾ãã"
-
-#~ msgid "no default author name for branch '%s'"
-#~ msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ããã©ã«ãã®ä½æè
åãããã¾ãã"
-
-#~ msgid "key '%s' already exists in database"
-#~ msgstr "éµ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¦ãã¾ã"
-
-#~ msgid ""
-#~ "dropping private key '%s' from database\n"
-#~ "\n"
-#~ msgstr ""
-#~ "ç§å¯éµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "the private key data may not have been erased from the\n"
-#~ "database. it is recommended that you use 'db dump' and\n"
-#~ "'db load' to be sure."
-#~ msgstr ""
-#~ "ç§å¯éµãã¼ã¿ã¯ãã¼ã¿ãã¼ã¹ããåé¤ããã¦ããªã\n"
-#~ "ããããã¾ããã'db dump' 㨠'db load' ã§ç¢ºããããã¨ã\n"
-#~ "ãå§ããã¾ã"
-
-#~ msgid "no unique private key found, and no key specified"
-#~ msgstr "åºæã®ç§å¯éµãã¿ã¤ãããããã¤éµãæå®ããã¦ãã¾ãã"
-
-#~ msgid "branch %s is empty"
-#~ msgstr "ãã©ã³ã %s ã¯ç©ºã§ã"
-
-#~ msgid "could not guess default signing key"
-#~ msgstr "ããã©ã«ãã®ç½²åéµãæ¨æ¸¬ã§ãã¾ããã§ãã"
-
-#~ msgid "ADDRESS[:PORTNUMBER] PATTERN ..."
-#~ msgstr "ADDRESS[:PORTNUMBER] PATTERN ..."
-
-#~ msgid ""
-#~ "database schemas do not match: wanted %s, got %s. try migrating database"
-#~ msgstr ""
-#~ "ãã¼ã¿ãã¼ã¹ã¹ãã¼ããä¸è´ãã¾ãã: çµæã¯æå¾
ãã %s ã§ã¯ãªã%sããã¼ã¿"
-#~ "ãã¼ã¹ãçµ±åãã¦ã¿ã¦ä¸ãã"
-
-#~ msgid "inserting edge: %s <- %s\n"
-#~ msgstr "å
端ãæ¿å
¥: %s <- %s\n"
-
-#~ msgid "skipping merge edge %s <- %s\n"
-#~ msgstr "å
端ã®çµ±å %s <- %s ãã¹ããã\n"
-
-#~ msgid "removing %s failed"
-#~ msgstr "%s ã®åé¤ã«å¤±æ"
-
-#~ msgid "revision %s is attached via database\n"
-#~ msgstr "ãªãã¸ã§ã³ %s ã¯ãã¼ã¿ãã¼ã¹ãä»ãã¦æ·»ä»ããã¦ãã¾ã\n"
-
-#~ msgid "checking attachment of %s in ancestry\n"
-#~ msgstr "系統å
ã® %s ã®æ·»ä»ãæ¤è¨¼ä¸\n"
-
-#~ msgid "checking attachment of %s in parent %s\n"
-#~ msgstr "%s ã®æ·»ä»(親 %s å
)ãæ¤è¨¼ä¸\n"
-
-#~ msgid "revision %s is attached via parent %s\n"
-#~ msgstr "ãªãã¸ã§ã³ %s ã¯è¦ª %s ãä»ãã¦æ·»ä»ããã¦ãã¾ã\n"
-
-#~ msgid "decided that revision '%s' is attached\n"
-#~ msgstr "ãªãã¸ã§ã³ '%s' ã¯æ·»ä»ããããã®ã¨æ±ºå®\n"
-
-#~ msgid "decided that revision '%s' is not attached\n"
-#~ msgstr "ãªãã¸ã§ã³ '%s' ã¯æ·»ä»ãããªããã®ã¨æ±ºå®\n"
-
-#~ msgid ""
-#~ "not requesting (in reverse) initial manifest %s as we already have it\n"
-#~ msgstr "åæãããã§ã¹ã %s ã¯æ¢ã«ããã®ã§ (éæ¹åã«) è¦æ±ãã¾ãã\n"
-
-#~ msgid "requesting (in reverse) initial manifest data %s\n"
-#~ msgstr "åæãããã§ã¹ããã¼ã¿ %s ã (éæ¹åã«) è¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "not requesting (in reverse) manifest delta to %s as we already have it\n"
-#~ msgstr "%s ã®ãããã§ã¹ãå·®åã¯æ¢ã«ããã®ã§(éæ¹åã«)è¦æ±ãã¾ãã\n"
-
-#~ msgid "requesting (in reverse) manifest delta %s -> %s\n"
-#~ msgstr "ãããã§ã¹ãå·®å %s -> %s ã(éæ¹åã«)è¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid "not requesting (in reverse) initial file %s as we already have it\n"
-#~ msgstr "åæåãã¡ã¤ã« %s ã¯æ¢ã«ããã®ã§ (éæ¹åã«)è¦æ±ãã¾ãã\n"
-
-#~ msgid "requesting (in reverse) initial file data %s\n"
-#~ msgstr "åæåãã¡ã¤ã«ãã¼ã¿ %s ã(éæ¹åã«)è¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid "not requesting (in reverse) file delta to %s as we already have it\n"
-#~ msgstr "%s ã¸ã®ãã¡ã¤ã«å·®åã¯æ¢ã«ããã®ã§ (éæ¹åã«)è¦æ±ãã¾ãã\n"
-
-#~ msgid "requesting (in reverse) file delta %s -> %s on %s\n"
-#~ msgstr "ãã¡ã¤ã«å·®å %s -> %s (対象: %s)ã(éæ¹åã«)è¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid "visiting revision '%s' for forward deltas\n"
-#~ msgstr "é æ¹åã®å·®åã«ã¤ãã¦ãªãã¸ã§ã³ '%s' ãè¦ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "not requesting forward manifest delta to '%s' as we already have it\n"
-#~ msgstr "'%s' ã¸ã®é æ¹åã®ãããã§ã¹ãå·®åã¯æ¢ã«ããã®ã§è¦æ±ãã¾ãã\n"
-
-#~ msgid "requesting full manifest data %s\n"
-#~ msgstr "å®å
¨ãªãããã§ã¹ããã¼ã¿ %s ãè¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid "requesting forward manifest delta %s -> %s\n"
-#~ msgstr "é æ¹åã®ãããã§ã¹ãå·®å %s -> %s ãè¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "not requesting forward delta %s -> %s on file %s as we already have it\n"
-#~ msgstr ""
-#~ "é æ¹åã®å·®å %s -> %s (対象ãã¡ã¤ã« %s) ã¯æ¢ã«ããã®ã§è¦æ±ãã¾ãã\n"
-
-#~ msgid "requesting full file data %s\n"
-#~ msgstr "å®å
¨ãªãã¡ã¤ã«ãã¼ã¿ %s ãè¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid "requesting forward delta %s -> %s on file %s\n"
-#~ msgstr "åæ¹åã®å·®å %s -> %s (対象ãã¡ã¤ã« %s) ãè¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid "isolated %d heads\n"
-#~ msgstr "å¤ç«ãã %d åã®ææ°ç\n"
-
-#~ msgid "requesting attached ancestry of revision '%s'\n"
-#~ msgstr "ãªãã¸ã§ã³ '%s' ã«ä»éãã系統ãè¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid "requesting detached ancestry of revision '%s'\n"
-#~ msgstr "ãªãã¸ã§ã³ '%s' ããéé¢ãã系統ãè¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not "
-#~ "have)\n"
-#~ msgstr ""
-#~ "(#0) ãã¡ãã«ã¯ãªã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ãæã£ã¦"
-#~ "ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#0) they have a live leaf at slot %d (in a %s node '%s', level %d, we do "
-#~ "not have)\n"
-#~ msgstr ""
-#~ "(#0) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ã«çãããªã¼"
-#~ "ããæã£ã¦ãã¾ã\n"
-
-#~ msgid "(#0) requesting their %s leaf %s\n"
-#~ msgstr "(#0) %s ãªã¼ã %s ãè¦æ±ãã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#0) they have a dead leaf at slot %d (in a %s node '%s', level %d, we do "
-#~ "not have)\n"
-#~ msgstr ""
-#~ "(#0) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s å
, ã¬ãã« %d) ã«æ»ãã ãªã¼"
-#~ "ããããã¾ã\n"
-
-#~ msgid ""
-#~ "(#0) they have a subtree at slot %d (in a %s node '%s', level %d, we do "
-#~ "not have)\n"
-#~ msgstr ""
-#~ "(#0) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ã«ãµãããªã¼"
-#~ "ãæã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#1) they have an empty slot %d in %s node '%s', level %d, and so do we\n"
-#~ msgstr ""
-#~ "(#1) ãã¡ãã«ããã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ãæã£ã¦"
-#~ "ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#2) they have an empty slot %d in %s node '%s', level %d, we have a live "
-#~ "leaf\n"
-#~ msgstr ""
-#~ "(#2) ãã¡ãå´ã§ã¯çãããªã¼ãã®ãã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
,ã¬ã"
-#~ "ã« %d) ãæã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#3) they have an empty slot %d in %s node '%s', level %d, we have a dead "
-#~ "leaf\n"
-#~ msgstr ""
-#~ "(#3) ãã¡ãå´ã§ã¯æ»ãã ãªã¼ãã®ãã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
, ã¬"
-#~ "ãã« %d) ãæã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#4) they have an empty slot %d in %s node '%s', level %d, we have a "
-#~ "subtree\n"
-#~ msgstr ""
-#~ "(#4) ãã¡ãã§ã¯ãµãããªã¼ã®ãã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« "
-#~ "%d) ãæã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#5) they have a live leaf at slot %d in %s node '%s', level %d, we have "
-#~ "nothing\n"
-#~ msgstr ""
-#~ "(#5) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ã«çãããªã¼"
-#~ "ããæã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#6) they have a live leaf at slot %d in %s node '%s', and so do we\n"
-#~ msgstr ""
-#~ "(#6) ãã¡ãã«ãããã¹ããã %d (%s ãã¼ã '%s' å
) ã«çãããªã¼ããæã£ã¦"
-#~ "ãã¾ã\n"
-
-#~ msgid "(#6) we both have live %s leaf '%s'\n"
-#~ msgstr "(#6) 両æ¹ã¨ãçãã %s ãªã¼ã '%s' ãæã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#7) they have a live leaf at slot %d in %s node %s, level %d, we have a "
-#~ "dead one\n"
-#~ msgstr ""
-#~ "(#7) ãã¡ãå´ã§ã¯çãã¦ããªããçãããªã¼ããã¹ããã %d (%s ãã¼ã %sãã¬"
-#~ "ãã« %d) ã«æã£ã¦ãã¾ã\n"
-
-#~ msgid "(#7) it's the same %s leaf '%s', but ours is dead\n"
-#~ msgstr "(#7) åã %s ãªã¼ã '%s' ã§ãããã¡ãã®ãã®ã¯æ»ãã§ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#8) they have a live leaf in slot %d of %s node '%s', level %d, we have "
-#~ "a subtree\n"
-#~ msgstr ""
-#~ "(#8) ãã¡ãã§ã¯ãµãããªã¼ãæã¤ãçãããªã¼ããã¹ããã %d (%s ãã¼ã %sã"
-#~ "ã¬ãã« %d) ã«æã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#8) we have a copy of their live leaf '%s' in slot %d of %s node '%s', "
-#~ "level %d\n"
-#~ msgstr ""
-#~ "(#8) çãããªã¼ã '%s' (ã¹ããã %d, %s ãã¼ã '%s'ãã¬ãã« %d) ã®ã³ãã¼ã"
-#~ "æã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#8) requesting a copy of their live leaf '%s' in slot %d of %s node '%"
-#~ "s', level %d\n"
-#~ msgstr ""
-#~ "(#8) çãããªã¼ã '%s' (ã¹ããã %d, %s ãã¼ã '%s'ãã¬ãã« %d) ã®ã³ãã¼ã"
-#~ "ãªã¯ã¨ã¹ããã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#8) sending our subtree for refinement, in slot %d of %s node '%s', "
-#~ "level %d\n"
-#~ msgstr ""
-#~ "(#8) å調æ´ã®ããã«ã¹ããã %d (%s ãã¼ã '%s', ã¬ãã« %d) ã®ãµãããªã¼ã"
-#~ "éä¿¡ãã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#9) they have a dead leaf at slot %d in %s node '%s', level %d, we have "
-#~ "nothing\n"
-#~ msgstr ""
-#~ "(#9) ãã¡ãã«ã¯ãªããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« "
-#~ "%d) ã«æã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#10) they have a dead leaf at slot %d in %s node '%s', level %d, we have "
-#~ "a live one\n"
-#~ msgstr ""
-#~ "(#10) ãã¡ãã§ã¯çãã¦ãããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
ã"
-#~ "ã¬ãã« %d)ã«æã£ã¦ãã¾ã\n"
-
-#~ msgid "(#10) we both have %s leaf %s, theirs is dead\n"
-#~ msgstr ""
-#~ "(#10) åæ¹ã¨ã %s ãªã¼ã %s ãæã£ã¦ãã¾ãããå½¼ãã®ãã®ã¯æ»ãã§ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#11) they have a dead leaf at slot %d in %s node '%s', level %d, so do "
-#~ "we\n"
-#~ msgstr ""
-#~ "(#11) ãã¡ãã«ããããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ã"
-#~ "ã« %d)ã«æã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#12) they have a dead leaf in slot %d of %s node '%s', we have a "
-#~ "subtree\n"
-#~ msgstr ""
-#~ "(#12) ãµãããªã¼ãæã£ã¦ãããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' "
-#~ "å
)ã«æã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#13) they have a subtree at slot %d in %s node '%s', level %d, we have "
-#~ "nothing\n"
-#~ msgstr ""
-#~ "(#13) ãã¡ãã«ã¯ãªããµãããªã¼ãã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« %d)"
-#~ "ã«æã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#14) they have a subtree at slot %d in %s node '%s', level %d, we have a "
-#~ "live leaf\n"
-#~ msgstr ""
-#~ "(#14) ãã¡ãã«ã¯çãããªã¼ãã®ãããµãããªã¼ãã¹ããã %d (%s ãã¼ã '%s' "
-#~ "å
ãã¬ãã« %d) ã«æã£ã¦ãã¾ã\n"
-
-#~ msgid "(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n"
-#~ msgstr ""
-#~ "(#14) ãã¡ãã®ãªã¼ã '%s' ãä»®ã®ãµãããªã¼ã¹ããã %dãã¬ãã« %d ã«æ¿å
¥\n"
-
-#~ msgid ""
-#~ "(#15) they have a subtree at slot %d in %s node '%s', level %d, we have a "
-#~ "dead leaf\n"
-#~ msgstr ""
-#~ "(#15) ãã¡ãã«ã¯æ»ãã ãªã¼ãã®ãããµãããªã¼ããã¹ããã %d (%s ãã¼ã '%"
-#~ "s'ãã¬ãã« %d) ã«æã£ã¦ãã¾ã\n"
-
-#~ msgid ""
-#~ "(#16) they have a subtree at slot %d in %s node '%s', level %d, and so do "
-#~ "we\n"
-#~ msgstr ""
-#~ "(#16) ãã¡ãã«ããããµãããªã¼ãã¹ããã %d (%s ãã¼ã '%s'ãã¬ãã« %d)ã«"
-#~ "æã£ã¦ãã¾ã\n"
-
-#~ msgid "(#16) we both have %s subtree '%s'\n"
-#~ msgstr "(#16) åæ¹ã¨ã %s ãµãããªã¼ '%s' ãæã£ã¦ãã¾ã\n"
-
-#~ msgid "(#16) %s subtrees at slot %d differ, refining ours\n"
-#~ msgstr ""
-#~ "(#16) %s ãµãããªã¼ (ã¹ããã %d) ã¯éã£ã¦ãã¾ãããã¡ãå´ã®ãã®ã調æ´ãã¾"
-#~ "ã\n"
-
-#~ msgid "skipping prohibited private key %s\n"
-#~ msgstr "ç¦æ¢ãããç§å¯éµ %s ãã¹ããã\n"
-
-#~ msgid "skipping existing private key %s\n"
-#~ msgstr "æ¢åã®ç§å¯éµ %s ãã¹ããã\n"
-
-#~ msgid "wrote debugging log to %s"
-#~ msgstr "%s ã«ãããã°ãã°ãæ¸ãè¾¼ã¿"
-
-#~ msgid "address@hidden:%s]"
-#~ msgstr "address@hidden:%s]"
-
-#~ msgid "database %s is a directory"
-#~ msgstr "ãã¼ã¿ãã¼ã¹ %s ã¯ãã£ã¬ã¯ããªã§ã"
-
-#~ msgid "guess_binary called with an invalid parameter"
-#~ msgstr "guess_binary å¼åºãæã®å¤æ°ãä¸é©åã§ã"
-
-#~ msgid "IncludeDir called with an invalid parameter"
-#~ msgstr "IncludeDir å¼åºãæã®å¤æ°ãä¸é©åã§ã"
-
-#~ msgid "path %s is not a directory"
-#~ msgstr "ãã¹ %s ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"