#
#
# patch "po/ja.po"
# from [6ce6f16773523b6b303d32c39a6a56a321444100]
# to [40f17e4ffff8058a0314fbd030f7975476730ce3]
#
============================================================
--- po/ja.po 6ce6f16773523b6b303d32c39a6a56a321444100
+++ po/ja.po 40f17e4ffff8058a0314fbd030f7975476730ce3
@@ -1,25 +1,25 @@
# ja.po for monotone
# Copyright (C) 2005 Graydon Hoare
-# This file is distributed under the same license as the monotone package.
+# This file is distributed under GPL v2.
# Satoru SATOH , 2005, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: monotone HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-15 00:27+0100\n"
-"PO-Revision-Date: 2006-08-24 13:11+0200\n"
+"POT-Creation-Date: 2007-01-03 19:00+0900\n"
+"PO-Revision-Date: 2007-01-03 18:53+0900\n"
"Last-Translator: Satoru SATOH \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n>1;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: app_state.cc:129
#, c-format
msgid "workspace required but not found%s%s"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ãå¿
è¦ã§ããã¿ã¤ããã¾ããã§ãã%s%s"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ãå¿
è¦ã§ããã¿ã¤ããã¾ãã%s%s"
#: app_state.cc:137
#, c-format
@@ -27,9 +27,9 @@ msgstr "ç¡å¹ãªãã£ã¬ã¯ã㪠''"
msgstr "ç¡å¹ãªãã£ã¬ã¯ã㪠''"
#: app_state.cc:145
-#, fuzzy, c-format
+#, c-format
msgid "monotone bookkeeping directory '%s' already exists in '%s'"
-msgstr "monotone è¨é²ç°¿ç¨ãã£ã¬ã¯ã㪠'%s' ã¯æ¢ã« '%s' å
ã«åå¨ãã¦ãã¾ã\n"
+msgstr "monotone è¨é²ç°¿ç¨ãã£ã¬ã¯ã㪠'%s' ã¯æ¢ã« '%s' å
ã«åå¨ãã¦ãã¾ã"
#: app_state.cc:201
#, c-format
@@ -37,187 +37,184 @@ msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯åå¨ã
msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯åå¨ãã¾ãã"
#: app_state.cc:202
-#, fuzzy, c-format
+#, c-format
msgid "search root '%s' is not a directory"
-msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã\n"
+msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
#: automate.cc:64
msgid "[BRANCH]"
-msgstr ""
+msgstr "[ãã©ã³ã]"
#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218
#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529
-#: automate.cc:898 automate.cc:1028 automate.cc:1072 automate.cc:1098
-#: automate.cc:1125 automate.cc:1152 automate.cc:1186 automate.cc:1297
-#: automate.cc:1394 automate.cc:1453 automate.cc:1499 automate.cc:1559
-#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:656
+#: automate.cc:905 automate.cc:1035 automate.cc:1079 automate.cc:1105
+#: automate.cc:1132 automate.cc:1159 automate.cc:1193 automate.cc:1304
+#: automate.cc:1401 automate.cc:1460 automate.cc:1506 automate.cc:1566
+#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:676
#, c-format
msgid "wrong argument count"
-msgstr ""
+msgstr "å¼æ°ã®æ°ãééã£ã¦ãã¾ã"
-#: automate.cc:88 automate.cc:135 automate.cc:1183
+#: automate.cc:88 automate.cc:135 automate.cc:1190
msgid "REV1 [REV2 [REV3 [...]]]"
-msgstr ""
+msgstr "REV1 [REV2 [REV3 [...]]]"
#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330
#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454
-#: automate.cc:1193 cmd_list.cc:663 revision.cc:1705
-#, fuzzy, c-format
+#: automate.cc:1200 cmd_list.cc:683 revision.cc:1705
+#, c-format
msgid "No such revision %s"
msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
#: automate.cc:183 automate.cc:324
msgid "[REV1 [REV2 [REV3 [...]]]]"
-msgstr ""
+msgstr "[REV1 [REV2 [REV3 [...]]]]"
#: automate.cc:215
-#, fuzzy
msgid "FILE"
-msgstr "FILENAME"
+msgstr "ãã¡ã¤ã«"
#: automate.cc:235
-#, fuzzy, c-format
+#, c-format
msgid "file %s is unknown to the current workspace"
-msgstr "ãã¡ã¤ã« '%s' ã¯ã¯ã¼ã¯ã¹ãã¼ã¹å
ã«åå¨ãã¾ãã"
+msgstr "ãã¡ã¤ã« %s ã¯ç¾å¨ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã§ã¯æªç¥ã®ãã¡ã¤ã«ã§ã"
#: automate.cc:356
msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
-msgstr ""
+msgstr "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"
-#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:942
-#: automate.cc:963 automate.cc:1249 cmd_automate.cc:78 cmd_automate.cc:332
-#: cmd_list.cc:564
+#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:949
+#: automate.cc:970 automate.cc:1256 cmd_automate.cc:78 cmd_automate.cc:332
+#: cmd_list.cc:584
#, c-format
msgid "no arguments needed"
-msgstr ""
+msgstr "å¼æ°ã¯å¿
è¦ããã¾ãã"
-#: automate.cc:423 automate.cc:448 cmd_list.cc:653 revision.cc:1699
-#, fuzzy
+#: automate.cc:423 automate.cc:448 cmd_list.cc:673 revision.cc:1699
msgid "REV"
-msgstr "REVID"
+msgstr "REV"
#: automate.cc:526
msgid "SELECTOR"
-msgstr ""
+msgstr "SELECTOR"
-#: automate.cc:895 automate.cc:1025
-#, fuzzy
+#: automate.cc:902 automate.cc:1032
msgid "[REVID]"
-msgstr "REVID"
+msgstr "[REVID]"
-#: automate.cc:924 automate.cc:1047 automate.cc:1507 automate.cc:1566
-#: automate.cc:1571
-#, fuzzy, c-format
+#: automate.cc:931 automate.cc:1054 automate.cc:1514 automate.cc:1573
+#: automate.cc:1578
+#, c-format
msgid "no revision %s found in database"
-msgstr "ãã¼ã¸ã§ã³ %s ã®ãã¡ã¤ã«ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ãã (対象: %s)"
+msgstr "ãã¼ã¿ãã¼ã¹ã« %s ã¨ãããªãã¸ã§ã³ã¯ããã¾ãã"
-#: automate.cc:1069 automate.cc:1095 cmd_merging.cc:845
+#: automate.cc:1076 automate.cc:1102 cmd_merging.cc:845
msgid "REVID"
msgstr "REVID"
-#: automate.cc:1080 automate.cc:1106 automate.cc:1161 automate.cc:1163
+#: automate.cc:1087 automate.cc:1113 automate.cc:1168 automate.cc:1170
#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419
#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:677
-#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:535
-#: cmd_ws_commit.cc:1023 commands.cc:413
+#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:523
+#: cmd_ws_commit.cc:1011 commands.cc:413
#, c-format
msgid "no such revision '%s'"
-msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
+msgstr "'%s' ã¨ãããªãã¸ã§ã³ã¯ããã¾ãã"
-#: automate.cc:1122 cmd_files.cc:250
+#: automate.cc:1129 cmd_files.cc:250
msgid "FILEID"
-msgstr ""
+msgstr "FILEID"
-#: automate.cc:1133
-#, fuzzy, c-format
+#: automate.cc:1140
+#, c-format
msgid "no such file '%s'"
-msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
+msgstr "'%s' ã¨ãããã¡ã¤ã«ã¯ããã¾ãã"
-#: automate.cc:1149
+#: automate.cc:1156
msgid "OLD_FILE NEW_FILE"
-msgstr ""
+msgstr "OLD_FILE NEW_FILE"
-#: automate.cc:1294
+#: automate.cc:1301
msgid "[BRANCH_PATTERN]"
-msgstr ""
+msgstr "[ãã©ã³ããã¿ã¼ã³]"
-#: automate.cc:1391
+#: automate.cc:1398
msgid "KEYID PASSPHRASE"
-msgstr ""
+msgstr "éµID ãã¹ãã¬ã¼ãº"
-#: automate.cc:1409 cmd_key_cert.cc:42
+#: automate.cc:1416 cmd_key_cert.cc:42
#, c-format
msgid "key '%s' already exists"
-msgstr "éµ '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
+msgstr "éµ '%s' ã¯æ¢ã«ããã¾ã"
-#: automate.cc:1412 cmd_key_cert.cc:45
+#: automate.cc:1419 cmd_key_cert.cc:45
#, c-format
msgid "generating key-pair '%s'"
msgstr "éµå¯¾ '%s' ãçæãã¦ãã¾ã"
-#: automate.cc:1414 cmd_key_cert.cc:47
+#: automate.cc:1421 cmd_key_cert.cc:47
#, c-format
msgid "storing key-pair '%s' in %s/"
msgstr "éµå¯¾ '%s' ã %s/ ã«ä¿åãã¦ãã¾ã"
-#: automate.cc:1450
+#: automate.cc:1457
msgid "OPTION"
-msgstr ""
+msgstr "ãªãã·ã§ã³"
-#: automate.cc:1473
+#: automate.cc:1480
#, c-format
msgid "'%s' is not a recognized workspace option"
-msgstr ""
+msgstr "'%s' ã¨ããã¯ã¼ã¯ã¹ãã¼ã¹ãªãã·ã§ã³ã¯ããã¾ãã"
-#: automate.cc:1496
-#, fuzzy
+#: automate.cc:1503
msgid "REV FILE"
-msgstr "REV REV"
+msgstr "REV FILE"
-#: automate.cc:1513 automate.cc:1577
-#, fuzzy, c-format
+#: automate.cc:1520 automate.cc:1584
+#, c-format
msgid "file %s is unknown for revision %s"
-msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã§ã³ '%s' ã«ã¯ããã¾ããã§ãã\n"
+msgstr "%s ã¨ãããã¡ã¤ã«ã¯ãªãã¸ã§ã³ %s ã«ã¯å«ã¾ãã¦ãã¾ãã"
-#: automate.cc:1556
-#, fuzzy
+#: automate.cc:1563
msgid "REV1 FILE REV2"
-msgstr "REV REV"
+msgstr "REV1 FILE REV2"
#: basic_io.cc:33
-#, fuzzy, c-format
+#, c-format
msgid "parsing a %s at %d:%d:E: %s"
-msgstr "ã¨ã©ã¼ %s:%d:%d:E: %s"
+msgstr "%s ã解æãã¦ãã¾ã: %d:%d:E: %s"
#: cert.cc:83
-#, fuzzy, c-format
+#, c-format
msgid "ignoring bad signature by '%s' on '%s'"
-msgstr "'%s' ã«ãã '%s' ã¸ã®ä¸æ£ãªç½²åãç¡è¦ãã¾ã\n"
+msgstr "'%s' ã«ãã '%s' ã¸ã®ä¸æ£ãªç½²åãç¡è¦ãã¾ã"
#: cert.cc:91
-#, fuzzy, c-format
+#, c-format
msgid "ignoring unknown signature by '%s' on '%s'"
-msgstr "'%s' ã«ãã '%s' ã¸ã®ä¸æãªç½²åãç¡è¦ãã¾ã\n"
+msgstr "'%s' ã«ãã '%s' ã¸ã®ä¸æãªç½²åãç¡è¦ãã¾ã"
+# FIXME: How to translate 'disliked ...'
#: cert.cc:157
-#, fuzzy, c-format
+#, c-format
msgid "trust function disliked %d signers of %s cert on manifest %s"
-msgstr "trust function disliked %d signers of %s cert on manifest %s\n"
+msgstr "trust function disliked %d signers of %s cert on manifest %s"
+# FIXME: How to translate 'disliked ...'
#: cert.cc:214
-#, fuzzy, c-format
+#, c-format
msgid "trust function disliked %d signers of %s cert on revision %s"
-msgstr "trust function disliked %d signers of %s cert on revision %s\n"
+msgstr "trust function disliked %d signers of %s cert on revision %s"
#: cert.cc:303
#, c-format
msgid "calculated cert hash '%s' does not match '%s'"
msgstr "è¨ç®ãã証æããã·ã¥ '%s' 㯠'%s' ã¨ä¸è´ãã¾ãã"
-#: cert.cc:387 keys.cc:560
+#: cert.cc:387 keys.cc:561
#, c-format
msgid "no key pair '%s' found in key store '%s'"
-msgstr "éµå¯¾ '%s' ã¯éµã®ä¿åå ´æ '%s' ã«ã¯ããã¾ãã"
+msgstr "'%s' ã¨ããéµå¯¾ã¯éµã®ä¿åå ´æ '%s' ã«ã¯ããã¾ãã"
#: cert.cc:465
#, c-format
@@ -235,49 +232,51 @@ msgstr ""
"pick one to use for signatures by adding '-k' to your command"
msgstr ""
"è¤æ°ã®ç§å¯éµãããã¾ãã\n"
-"'-k' ãã³ãã³ãã«è¿½å ãã¦ç½²åã«ä½¿ããã®ãé¸æãã¦ä¸ããã"
+"'-k<éµå>' ãã³ãã³ãã«è¿½å ãã¦ã使ç¨ããç½²åãé¸æãã¦ä¸ããã"
#: cert.cc:485
#, c-format
msgid "no branch found for empty revision, please provide a branch name"
-msgstr "ãªãã¸ã§ã³ã空ã®ãã©ã³ãã¯ããã¾ãã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
+msgstr "空ã®ãªãã¸ã§ã³ã®ãã©ã³ãã¯ããã¾ããããã©ã³ãåãæå®ãã¦ä¸ããã"
#: cert.cc:494
#, c-format
msgid "no branch certs found for revision %s, please provide a branch name"
msgstr ""
-"ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æãã¿ã¤ããã¾ãã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
+"ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æãã¿ã¤ããã¾ããããã©ã³ãåãæå®ãã¦ä¸ããã"
#: cert.cc:498
#, c-format
msgid ""
"multiple branch certs found for revision %s, please provide a branch name"
-msgstr "ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æã¯è¤æ°ããã¾ã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
+msgstr ""
+"ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æã¯è¤æ°ããã¾ãããã©ã³ãåãæå®ãã¦ä¸ããã"
#: cmd_automate.cc:150
-#, fuzzy, c-format
+#, c-format
msgid "Bad input to automate stdio: expected ':' after string size"
-msgstr "parse_basic_io ã«å¯¾ãä¸æ£ãªå
¥å"
+msgstr ""
+"automate æ¨æºå
¥åã«å¯¾ããä¸æ£ãªå
¥å: æåãµã¤ãºã®å¾ã«ã¯ ':' ãæ¥ãã¯ãã§ãã"
#: cmd_automate.cc:169
-#, fuzzy, c-format
+#, c-format
msgid "Bad input to automate stdio: unexpected EOF"
-msgstr "parse_basic_io ã«å¯¾ãä¸æ£ãªå
¥å"
+msgstr "automate stdio ã«å¯¾ãä¸æ£ãªå
¥å: äºæããªã EOF"
#: cmd_automate.cc:197
-#, fuzzy, c-format
+#, c-format
msgid "Bad input to automate stdio: unknown start token '%c'"
-msgstr "parse_basic_io ã«å¯¾ãä¸æ£ãªå
¥å"
+msgstr "automate stdio ã«å¯¾ãä¸æ£ãªå
¥å: ä¸æãªéå§ãã¼ã¯ã³ '%c'"
#: cmd_automate.cc:219
-#, fuzzy, c-format
+#, c-format
msgid "Bad input to automate stdio: expected '%c' token"
-msgstr "parse_basic_io ã«å¯¾ãä¸æ£ãªå
¥å"
+msgstr "automate stdio ã«å¯¾ãä¸æ£ãªå
¥å: ãã¼ã¯ã³ '%c' ãæ¥ãã¯ãã§ã"
#: cmd_automate.cc:344
-#, fuzzy, c-format
+#, c-format
msgid "Bad input to automate stdio: command name is missing"
-msgstr "parse_basic_io ã«å¯¾ãä¸æ£ãªå
¥å"
+msgstr "automate stdio ã«å¯¾ãä¸æ£ãªå
¥å: ã³ãã³ãåãããã¾ãã"
#: cmd_automate.cc:373
msgid "automation"
@@ -297,7 +296,6 @@ msgstr "ãã¼ã¿ãã¼ã¹"
msgstr "ãã¼ã¿ãã¼ã¹"
#: cmd_db.cc:47
-#, fuzzy
msgid ""
"init\n"
"info\n"
@@ -323,12 +321,13 @@ msgstr ""
"migrate\n"
"execute\n"
"kill_rev_locally ID\n"
-"kill_branch_certs_locally BRANCH\n"
-"kill_tag_locally TAG\n"
+"kill_branch_certs_locally ãã©ã³ã\n"
+"kill_tag_locally ã¿ã°\n"
"check\n"
"changesetify\n"
"rosterify\n"
-"set_epoch BRANCH EPOCH\n"
+"regenerate_caches\n"
+"set_epoch ãã©ã³ã ã¨ããã¯\n"
#: cmd_db.cc:62
msgid "manipulate database state"
@@ -365,7 +364,7 @@ msgstr "%s ã¨ããå¤æ°ã¯ãã¡ã¤ã
msgstr "%s ã¨ããå¤æ°ã¯ãã¡ã¤ã³ %s å
ã«ã¯ããã¾ãã"
#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114
-#: cmd_files.cc:220 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:429
+#: cmd_files.cc:220 cmd_list.cc:478 cmd_merging.cc:614 cmd_ws_commit.cc:417
#: commands.cc:275
msgid "informative"
msgstr "æ
å ±"
@@ -386,15 +385,14 @@ msgid "more than two revisions given"
#: cmd_diff_log.cc:356
#, c-format
msgid "more than two revisions given"
-msgstr ""
+msgstr "è¤æ°ã®ãªãã¸ã§ã³ãæå®ãã¦ãã¾ã"
#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308
-#: cmd_ws_commit.cc:349 cmd_ws_commit.cc:429 cmd_ws_commit.cc:735
+#: cmd_ws_commit.cc:343 cmd_ws_commit.cc:417 cmd_ws_commit.cc:723
msgid "[PATH]..."
-msgstr "[PATH]..."
+msgstr "[ãã¹]..."
#: cmd_diff_log.cc:466
-#, fuzzy
msgid ""
"show current diffs on stdout.\n"
"If one revision is given, the diff between the workspace and\n"
@@ -420,24 +418,22 @@ msgstr "å¤æ´ãªã"
msgstr "å¤æ´ãªã"
#: cmd_diff_log.cc:520
-#, fuzzy
msgid "[FILE [...]]"
-msgstr "[FILE] ..."
+msgstr "[FILE [...]]"
#: cmd_diff_log.cc:603
msgid "[FILE] ..."
msgstr "[FILE] ..."
#: cmd_diff_log.cc:604
-#, fuzzy
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
"revisions are given, use them as a starting point."
msgstr ""
"éé ã§å±¥æ´ã表示 ('FILE' ã§ãã£ã«ã¿)ãä¸ã¤ä»¥ä¸ã®ãªãã¸ã§ã³ãæå®ããã¦\n"
-"ããã°ãããéå§ç¹ã¨ãã¦å©ç¨ã"
+"ããã°ãããéå§ç¹ã¨ãã¦å©ç¨ãã¾ãã"
-#: cmd_diff_log.cc:617
+#: cmd_diff_log.cc:618
#, c-format
msgid "only one of --last/--next allowed"
msgstr "--last/--next ã®ã©ã¡ããã®ã¿ã許ããã¦ãã¾ã"
@@ -481,22 +477,21 @@ msgid "SRCNAME DESTNAME SRCID DESTID"
#: cmd_files.cc:78
msgid "SRCNAME DESTNAME SRCID DESTID"
-msgstr ""
+msgstr "SRCNAME DESTNAME SRCID DESTID"
#: cmd_files.cc:79
-#, fuzzy
msgid "diff 2 files and output result"
-msgstr "ä¸ã¤ã®ãã¡ã¤ã«ãçµ±åãçµæãåºå"
+msgstr "äºã¤ã®ãã¡ã¤ã«ã®å·®åãåºå"
#: cmd_files.cc:96
-#, fuzzy, c-format
+#, c-format
msgid "source file id does not exist"
-msgstr "ç¥å
ã®ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
+msgstr "å
ã®ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
#: cmd_files.cc:99
-#, fuzzy, c-format
+#, c-format
msgid "destination file id does not exist"
-msgstr "ç¥å
ã®ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
+msgstr "å
æ¹ã®ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
#: cmd_files.cc:114
msgid "PATH"
@@ -512,14 +507,14 @@ msgstr "ãã¡ã¤ã« '%s' ã«å¯¾ããã
msgstr "ãã¡ã¤ã« '%s' ã«å¯¾ãããªãã¸ã§ã³ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ããã§ãã"
#: cmd_files.cc:147
-#, fuzzy, c-format
+#, c-format
msgid "no such file '%s' in revision '%s'"
-msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã§ã³ '%s' ã«ã¯ããã¾ããã§ãã\n"
+msgstr "'%s' ã¨ãããã¡ã¤ã«ã¯ãªãã¸ã§ã³ '%s' ã«ã¯ããã¾ãã"
#: cmd_files.cc:150
-#, fuzzy, c-format
+#, c-format
msgid "'%s' in revision '%s' is not a file"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã® '%s' ã¯ãã¡ã¤ã«ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
+msgstr "'%s' (ãªãã¸ã§ã³ '%s' å
) ã¯ãã¡ã¤ã«ã§ã¯ããã¾ãã"
#: cmd_files.cc:157
msgid "[PATH]"
@@ -530,14 +525,14 @@ msgstr "PATH ã¾ãã¯æ¨æºå
¥åãè
msgstr "PATH ã¾ãã¯æ¨æºå
¥åãèå¥"
#: cmd_files.cc:185
-#, fuzzy, c-format
+#, c-format
msgid "no file version %s found in database"
-msgstr "ãã¼ã¸ã§ã³ %s ã®ãã¡ã¤ã«ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ãã (対象: %s)"
+msgstr "%s ã¨ãããã¡ã¤ã«ã®ãã¼ã¸ã§ã³ã¯ãã¼ã¿ãã¼ã¹ã«ã¯å«ã¾ãã¦ãã¾ãã"
#: cmd_files.cc:210 cmd_files.cc:214
-#, fuzzy, c-format
+#, c-format
msgid "no file '%s' found in revision '%s'"
-msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã§ã³ '%s' ã«ã¯ããã¾ããã§ãã\n"
+msgstr "%s ã¨ãããã¡ã¤ã«ã¯ãªãã¸ã§ã³ '%s' ã«ã¯å«ã¾ãã¦ãã¾ãã"
#: cmd_files.cc:221 cmd_files.cc:273
msgid "FILENAME"
@@ -547,30 +542,35 @@ msgstr "ãã¼ã¿ãã¼ã¹ã®ãã¡ã¤ã
msgid "write file from database to stdout"
msgstr "ãã¼ã¿ãã¼ã¹ã®ãã¡ã¤ã«ãæ¨æºåºåã«æ¸ãåºã"
-#: cmd.hh:89
+#: cmd.hh:61
#, c-format
+msgid "ignored bookkeeping path '%s'"
+msgstr "è¨é²ç°¿ãã¹ '%s' ãç¡è¦ãã¾ãã"
+
+#: cmd.hh:94
+#, c-format
msgid "non-hex digits in id"
msgstr "ID ã«åå
é²æ°ãå«ã¾ãã¦ãã¾ãã"
-#: cmd.hh:98
+#: cmd.hh:103
#, c-format
msgid "partial id '%s' does not have an expansion"
msgstr "é¨å ID '%s' ãä¸ã¤ã® ID ã«å±éãããã¨ã¯ã§ãã¾ãã"
-#: cmd.hh:102
-#, fuzzy, c-format
+#: cmd.hh:107
+#, c-format
msgid "partial id '%s' has multiple ambiguous expansions:"
-msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ãã ID ã®åè£ã¯è¤æ°ããã¾ã:\n"
+msgstr "é¨å ID '%s' ããå±éã§ãã ID ã®åè£ã¯è¤æ°ããã¾ã:"
-#: cmd.hh:110
-#, fuzzy, c-format
+#: cmd.hh:115
+#, c-format
msgid "expanded partial id '%s' to '%s'"
-msgstr "é¨å ID '%s' ã '%s' ã«å±é\n"
+msgstr "é¨å ID '%s' ã '%s' ã«å±éãã¾ãã"
-#: cmd.hh:195
+#: cmd.hh:200
#, c-format
msgid "Alias for %s"
-msgstr ""
+msgstr "%s ã®å¥å"
#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
#: cmd_key_cert.cc:113 cmd_key_cert.cc:149
@@ -590,14 +590,14 @@ msgstr "å
¬ééµã¨ç§å¯éµãç ´æ£"
msgstr "å
¬ééµã¨ç§å¯éµãç ´æ£"
#: cmd_key_cert.cc:67
-#, fuzzy, c-format
+#, c-format
msgid "dropping public key '%s' from database"
-msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£ãã¦ãã¾ã\n"
+msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£ãã¦ãã¾ã"
#: cmd_key_cert.cc:77
-#, fuzzy, c-format
+#, c-format
msgid "dropping key pair '%s' from keystore"
-msgstr "éµå¯¾ '%s' ãéµã®ä¿åå ´æããç ´æ£ãã¦ãã¾ã\n"
+msgstr "éµå¯¾ '%s' ãéµã®ä¿åå ´æããç ´æ£ãã¦ãã¾ã"
#: cmd_key_cert.cc:84
#, c-format
@@ -623,9 +623,9 @@ msgstr "éµ '%s' ã¯éµã®ä¿åå ´æã
msgstr "éµ '%s' ã¯éµã®ä¿åå ´æã«ããã¾ãã"
#: cmd_key_cert.cc:110
-#, fuzzy, c-format
+#, c-format
msgid "passphrase changed"
-msgstr "ãã¹ãã¬ã¼ãºãå¤æ´ãã¾ãã\n"
+msgstr "ãã¹ãã¬ã¼ãºãå¤æ´ãã¾ãã"
#: cmd_key_cert.cc:113
msgid "REVISION CERTNAME [CERTVAL]"
@@ -646,7 +646,7 @@ msgstr "ç¾å¨ã®è¨å®ã§ä»®æ³è¨¼æã
msgstr "ç¾å¨ã®è¨å®ã§ä»®æ³è¨¼æãä¿¡é ¼å¯è½ããã¹ã"
#: cmd_key_cert.cc:184
-#, fuzzy, c-format
+#, c-format
msgid ""
"if a cert on: %s\n"
"with key: %s\n"
@@ -658,7 +658,7 @@ msgstr ""
"éµ : %s\n"
"å¤ : %s\n"
"ç½²åè
: %s\n"
-"ãã£ã¦ãããã %s ã§ããã\n"
+"ãã£ã¦ãããã %s ã§ããã"
#: cmd_key_cert.cc:193
msgid "trusted"
@@ -720,7 +720,7 @@ msgstr "空ã®ã³ã¡ã³ã"
msgid "empty comment"
msgstr "空ã®ã³ã¡ã³ã"
-#: cmd_list.cc:64 cmd_list.cc:677
+#: cmd_list.cc:64 cmd_list.cc:697
#, c-format
msgid "no public key '%s' found in database"
msgstr "ãã¼ã¿ãã¼ã¹å
ã«å
¬ééµ '%s' ã¯ããã¾ãã"
@@ -756,22 +756,21 @@ msgstr "(*) - %s/ å
ã«ã®ã¿åå¨"
msgstr "(*) - %s/ å
ã«ã®ã¿åå¨"
#: cmd_list.cc:226
-#, fuzzy, c-format
+#, c-format
msgid "no keys found"
-msgstr "éµãã¿ã¤ããã¾ããã§ãã\n"
+msgstr "éµãã¿ã¤ããã¾ããã§ãã"
#: cmd_list.cc:228
-#, fuzzy, c-format
+#, c-format
msgid "no keys found matching '%s'"
-msgstr "'%s' ã«ä¸è´ããéµã¯ã¿ã¤ããã¾ããã§ãã\n"
+msgstr "'%s' ã«ä¸è´ããéµã¯ã¿ã¤ããã¾ããã§ãã"
#: cmd_list.cc:275
-#, fuzzy, c-format
+#, c-format
msgid "no epoch for branch %s"
-msgstr "ãã©ã³ã %s 㯠epoch ãæã¡ã¾ãã\n"
+msgstr "ãã©ã³ã %s ã«ã¯ epoch ã¯ããã¾ãã"
-#: cmd_list.cc:459
-#, fuzzy
+#: cmd_list.cc:479
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -786,31 +785,30 @@ msgstr ""
"changed"
msgstr ""
"certs ID\n"
-"keys [PATTERN]\n"
-"branches\n"
-"epochs [BRANCH [...]]\n"
+"keys [ãã¿ã¼ã³]\n"
+"branches [ãã¿ã¼ã³]\n"
+"epochs [ãã©ã³ã [...]]\n"
"tags\n"
-"vars [DOMAIN]\n"
+"vars [ãã¡ã¤ã³]\n"
"known\n"
"unknown\n"
"ignored\n"
"missing\n"
"changed"
-#: cmd_list.cc:470
-#, fuzzy
+#: cmd_list.cc:490
msgid ""
"show database objects, or the current workspace manifest, \n"
"or known, unknown, intentionally ignored, missing, or \n"
"changed-state files"
msgstr ""
"ãã¼ã¿ãã¼ã¹ãªãã¸ã§ã¯ããç¾å¨ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãã\n"
-"æ¢ç¥ã¾ãã¯ä¸æãªãæå³çã«ç¡è¦ãã¾ãã¯å¤±ãªãããç¶æ
ã®ãã¡ã¤ã«ã表示"
+"æ¢ç¥ã¾ãã¯ä¸æãªãæå³çã«ç¡è¦ã失ãªãããã¾ãã¯å¤æ´ããããã¡ã¤ã«ã表示"
#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:79
-#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:349
-#: cmd_ws_commit.cc:385 cmd_ws_commit.cc:410 cmd_ws_commit.cc:635
-#: cmd_ws_commit.cc:735
+#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:343
+#: cmd_ws_commit.cc:373 cmd_ws_commit.cc:398 cmd_ws_commit.cc:623
+#: cmd_ws_commit.cc:723
msgid "workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹"
@@ -833,20 +831,19 @@ msgstr "ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã¯æ
msgstr "ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã¯æ°è¦ã®ããã¸ã§ã¯ãã§ã; æ´æ°ã§ãã¾ããã"
#: cmd_merging.cc:102
-#, fuzzy, c-format
+#, c-format
msgid "updating along branch '%s'"
-msgstr "ãã©ã³ã '%s' ã«æ²¿ã£ã¦æ´æ°ãã¦ãã¾ã..."
+msgstr "ãã©ã³ã '%s' ã«æ²¿ã£ã¦æ´æ°ãã¦ãã¾ã"
#: cmd_merging.cc:106
-#, fuzzy, c-format
+#, c-format
msgid ""
"your request matches no descendents of the current revision\n"
"in fact, it doesn't even match the current revision\n"
"maybe you want something like --revision=h:%s"
msgstr ""
"ç¾å¨ã®ãªãã¸ã§ã³ã«ããã®åå«ã«ããå¸æã«æ²¿ããã®ã¯ããã¾ãã.\n"
-"ãããããã --revision=<ä»ã®ãã©ã³ãã®ãªãã¸ã§ã³> ã¨ãããã®ã§ã¯\n"
-"ããã¾ããã?"
+"ãããããã --revision=h:%s ã¨ãããã®ã§ã¯ããã¾ããã?"
#: cmd_merging.cc:112
#, c-format
@@ -864,36 +861,35 @@ msgstr "é¸æå¾ãè¤æ°ã®åè£ãæ®
msgstr "é¸æå¾ãè¤æ°ã®åè£ãæ®ã£ã¦ãã¾ã"
#: cmd_merging.cc:136
-#, fuzzy, c-format
+#, c-format
msgid "already up to date at %s"
-msgstr "%s ã¯æ¢ã«ææ°ã§ã\n"
+msgstr "æ¢ã«ææ°ã§ã: %s"
#: cmd_merging.cc:144
-#, fuzzy, c-format
+#, c-format
msgid "selected update target %s"
-msgstr "é¸æãããæ´æ°ã¿ã¼ã²ãã %s\n"
+msgstr "é¸æãããæ´æ°ã¿ã¼ã²ãã %s"
#: cmd_merging.cc:171
-#, fuzzy, c-format
+#, c-format
msgid "target revision is not in current branch"
-msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã«ã¯ç¥å
ãããã¾ãã"
+msgstr "ç®æ¨ã®ãªãã¸ã§ã³ã¯ç¾å¨ã®ãã©ã³ãã«ã¯å«ã¾ãã¦ãã¾ãã"
#: cmd_merging.cc:179
-#, fuzzy, c-format
+#, c-format
msgid ""
"target revision is in multiple branches:%s\n"
"\n"
"try again with explicit --branch"
msgstr ""
-"ãªãã¸ã§ã³ %s ã¯è¤æ°ã®ãã©ã³ãã«å±ãã¦ãã¾ã:\n"
-"%s\n"
+"ç®æ¨ã®ãªãã¸ã§ã³ã¯è¤æ°ã®ãã©ã³ãã«å±ãã¦ãã¾ã:%s\n"
"\n"
"æ示çã« --branch ãæå®ãã¦å試è¡ãã¦ä¸ããã"
#: cmd_merging.cc:187
-#, fuzzy, c-format
+#, c-format
msgid "switching to branch %s"
-msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ãããéå§\n"
+msgstr "ãã©ã³ã %s ã«åãæ¿ãã¦ãã¾ã"
#: cmd_merging.cc:192
#, c-format
@@ -901,35 +897,37 @@ msgstr ""
"target revision not in any branch\n"
"next commit will use branch %s"
msgstr ""
+"ã¿ã¼ã²ãããªãã¸ã§ã³ãå«ã¾ãããã©ã³ããããã¾ããã\n"
+"次åã³ãããæã«ã¯ãã©ã³ã %s ã使ç¨ãã¾ãã"
#: cmd_merging.cc:262
#, c-format
msgid "switched branch; next commit will use branch %s"
-msgstr ""
+msgstr "ãã©ã³ããåãæ¿ãã¾ããã次åã³ãããæã«ã¯ãã©ã³ã %s ã使ç¨ãã¾ãã"
#: cmd_merging.cc:263
-#, fuzzy, c-format
+#, c-format
msgid "updated to base revision %s"
-msgstr "åºæºãªãã¸ã§ã³ %s ã«æ´æ°\n"
+msgstr "åºæºãªãã¸ã§ã³ %s ã«æ´æ°ãã¾ãã"
#: cmd_merging.cc:301
-#, fuzzy, c-format
+#, c-format
msgid "[left] %s"
-msgstr "[å
] %s\n"
+msgstr "[å·¦] %s"
#: cmd_merging.cc:302
-#, fuzzy, c-format
+#, c-format
msgid "[right] %s"
-msgstr "[å
] %s\n"
+msgstr "[å³] %s"
#: cmd_merging.cc:313 cmd_merging.cc:584
-#, fuzzy, c-format
+#, c-format
msgid "[merged] %s"
-msgstr "[çµ±åæ¸ã¿] %s\n"
+msgstr "[çµ±åæ¸ã¿] %s"
#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588
-#: cmd_merging.cc:821 cmd_ws_commit.cc:495 cmd_ws_commit.cc:981
-#: cmd_ws_commit.cc:1004 cmd_ws_commit.cc:1105 cmd_ws_commit.cc:1119
+#: cmd_merging.cc:821 cmd_ws_commit.cc:483 cmd_ws_commit.cc:969
+#: cmd_ws_commit.cc:992 cmd_ws_commit.cc:1102 cmd_ws_commit.cc:1116
msgid "tree"
msgstr "ããªã¼"
@@ -943,36 +941,36 @@ msgstr "--branch=BRANCH ã¨ããããã
msgstr "--branch=BRANCH ã¨ããããã«ãã©ã³ããæå®ãã¦ä¸ãã"
#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834
-#: cmd_ws_commit.cc:519
+#: cmd_ws_commit.cc:507
#, c-format
msgid "branch '%s' is empty"
msgstr "ãã©ã³ã '%s' ã¯ç©ºã§ã"
#: cmd_merging.cc:338
-#, fuzzy, c-format
+#, c-format
msgid "branch '%s' is already merged"
-msgstr "ãã©ã³ã '%s' ã¯æ¢ã«çµ±åæ¸ã¿ã§ã\n"
+msgstr "ãã©ã³ã '%s' ã¯æ¢ã«çµ±åæ¸ã¿ã§ã"
#: cmd_merging.cc:342
-#, fuzzy, c-format
+#, c-format
msgid "%d head on branch '%s'"
msgid_plural "%d heads on branch '%s'"
-msgstr[0] "ãã©ã³ã '%s' ã«æ²¿ã£ã¦æ´æ°ãã¦ãã¾ã..."
+msgstr[0] "ææ° %d å (ãã©ã³ã '%s' ä¸)"
#: cmd_merging.cc:363 cmd_merging.cc:408
-#, fuzzy, c-format
+#, c-format
msgid "merge %d / %d:"
-msgstr "[çµ±åæ¸ã¿] %s\n"
+msgstr "çµ±åæ¸ã¿ %d / %d"
#: cmd_merging.cc:364
#, c-format
msgid "calculating best pair of heads to merge next"
-msgstr ""
+msgstr "次ã«çµ±åããææ°ãªãã¸ã§ã³ã®æé©ãªçµãè¨ç®ãã¦ãã¾ã"
#: cmd_merging.cc:416
-#, fuzzy, c-format
+#, c-format
msgid "note: your workspaces have not been updated"
-msgstr "注æ: ã¯ã¼ã¯ã¹ãã¼ã¹ã¯æ´æ°ããã¦ãã¾ãã\n"
+msgstr "注æ: ã¯ã¼ã¯ã¹ãã¼ã¹ã¯æ´æ°ããã¦ãã¾ãã"
#: cmd_merging.cc:419
msgid "SOURCE-BRANCH DEST-BRANCH"
@@ -991,44 +989,44 @@ msgstr "ãã©ã³ããä»ã®ãã©ã³ã
msgstr "ãã©ã³ããä»ã®ãã©ã³ãã®ãµããã£ã¬ã¯ããªã«çµ±å"
#: cmd_merging.cc:470 cmd_merging.cc:473
-#, fuzzy, c-format
+#, c-format
msgid "branch '%s' is not merged"
-msgstr "ãã©ã³ã '%s' ã¯çµ±åããã¦ãã¾ãã\n"
+msgstr "ãã©ã³ã '%s' ã¯çµ±åããã¦ãã¾ãã"
#: cmd_merging.cc:478
-#, fuzzy, c-format
+#, c-format
msgid "propagating %s -> %s"
-msgstr "ä¼æä¸ %s -> %s\n"
+msgstr "ä¼æãã¦ãã¾ã: %s -> %s"
#: cmd_merging.cc:479
-#, fuzzy, c-format
+#, c-format
msgid "[source] %s"
-msgstr "[å
] %s\n"
+msgstr "[å
] %s"
#: cmd_merging.cc:480
-#, fuzzy, c-format
+#, c-format
msgid "[target] %s"
-msgstr "[å
] %s\n"
+msgstr "[å
] %s"
#: cmd_merging.cc:485
-#, fuzzy, c-format
+#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'"
-msgstr "ãã©ã³ã '%s' ã¯ãã©ã³ã '%s' ã«å¯¾ãã¦ææ°ã§ã\n"
+msgstr "ãã©ã³ã '%s' ã¯ãã©ã³ã '%s' ã«å¯¾ãã¦ææ°ã§ã"
#: cmd_merging.cc:487
-#, fuzzy, c-format
+#, c-format
msgid "no action taken"
-msgstr "ä½ããã¾ãã\n"
+msgstr "ä½ããã¾ãã"
#: cmd_merging.cc:491
-#, fuzzy, c-format
+#, c-format
msgid "no merge necessary; putting %s in branch '%s'"
-msgstr "çµ±åã¯å¿
è¦ããã¾ãã. %s ããã©ã³ã '%s' å
ã«åãè¾¼ã¿ä¸\n"
+msgstr "çµ±åã¯å¿
è¦ããã¾ããã%s ããã©ã³ã '%s' å
ã«åãè¾¼ãã§ãã¾ãã"
#: cmd_merging.cc:529
#, c-format
msgid "Path %s not found in destination tree."
-msgstr "ãã¹ %s ã¯å
ã®ããªã¼å
ã«ã¿ã¤ããã¾ãã"
+msgstr "%s ã¨ãããã¹ã¯å
ã®ããªã¼å
ã«ã¯ã¿ã¤ããã¾ãã"
#: cmd_merging.cc:589
msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
@@ -1058,43 +1056,43 @@ msgstr "æå®ã®ãªãã¸ã§ã³ãçµ±å
msgstr "æå®ã®ãªãã¸ã§ã³ãçµ±åããã®ã«è§£æ±ºãå¿
è¦ãªè¡çªã表示"
#: cmd_merging.cc:625 cmd_merging.cc:627
-#, fuzzy, c-format
+#, c-format
msgid "%s is an ancestor of %s; no merge is needed."
-msgstr "%s 㯠%s ã®ç¥å
; çµ±åã¯å¿
è¦ããã¾ãã"
+msgstr "%s 㯠%s ã®ç¥å
ã§ããçµ±åã¯å¿
è¦ããã¾ããã"
#: cmd_merging.cc:641
#, c-format
msgid "There are %s node_name_conflicts."
-msgstr "%s node_name_conflicts ãããã¾ã"
+msgstr "%s node_name_conflicts ãããã¾ãã"
#: cmd_merging.cc:643
#, c-format
msgid "There are %s file_content_conflicts."
-msgstr "%s file_content_conflicts ãããã¾ã"
+msgstr "%s file_content_conflicts ãããã¾ãã"
#: cmd_merging.cc:645
#, c-format
msgid "There are %s node_attr_conflicts."
-msgstr "%s node_attr_conflicts ãããã¾ã"
+msgstr "%s node_attr_conflicts ãããã¾ãã"
#: cmd_merging.cc:647
#, c-format
msgid "There are %s orphaned_node_conflicts."
-msgstr "%s orphaned_node_conflicts ãããã¾ã"
+msgstr "%s orphaned_node_conflicts ãããã¾ãã"
#: cmd_merging.cc:649
#, c-format
msgid "There are %s rename_target_conflicts."
-msgstr "%s rename_target_conflicts ãããã¾ã"
+msgstr "%s rename_target_conflicts ãããã¾ãã"
#: cmd_merging.cc:651
#, c-format
msgid "There are %s directory_loop_conflicts."
-msgstr "%s directory_loop_conflicts ãããã¾ã"
+msgstr "%s directory_loop_conflicts ãããã¾ãã"
#: cmd_merging.cc:655
msgid "[-r FROM] -r TO [PATH...]"
-msgstr ""
+msgstr "[-r FROM] -r TO [PATH...]"
#: cmd_merging.cc:656
msgid ""
@@ -1111,6 +1109,15 @@ msgstr ""
"If two revisions are given, applies the changes made to get from the\n"
"first revision to the second."
msgstr ""
+"å±¥æ´ã®ä»»æã®ç¹ã§ç¾å¨ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã«å¤æ´ãé©ç¨ãã¾ãã\n"
+"ãã®ã³ãã³ãã¯å±¥æ´ã®ä»»æã®ç¹ã§ã®å¤æ´ãã¨ããç¾å¨ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã«\n"
+"ãã®å¤æ´ãå«ã¾ããããã«ç·¨éãã¾ãããã®ã³ãã³ã㯠monotone ã®\n"
+"çµ±åæ©è½ã使ãã®ã§ãå称å¤æ´ã競åãªã©ãããè³¢ãæ±ããã¨ãé¤ãã°ã\n"
+"çµæ㯠'mtn diff -r FROM -r TO | patch -p0' ã¨åãã§ãã\n"
+"\n"
+"ãªãã¸ã§ã³ãä¸ã¤æå®ããã¦ããã°ãç¾å¨ã¨æ¯è¼ããå¤æ´ãé©ç¨ãã¾ãã\n"
+"\n"
+"ãªãã¸ã§ã³ãäºã¤æå®ããã¦ããã°ãäºçªç®ã«å¯¾ããä¸çªç®ã®å¤æ´ãé©ç¨ãã¾ãã"
#: cmd_merging.cc:681
#, c-format
@@ -1119,49 +1126,52 @@ msgstr ""
"to apply the changes relative to one of its parents, use:\n"
" %s pluck -r PARENT -r %s"
msgstr ""
+"ãªãã¸ã§ã³ %s ã¯\n"
+"親ã®ä¸ã¤ã«å¯¾ããå¤æ´ã®é©ç¨ã§ãã\n"
+"%s pluck -r PARENT -r %s ã使ç¨ãã¦ãã ããã"
#: cmd_merging.cc:702
-#, fuzzy, c-format
+#, c-format
msgid "no changes to apply"
-msgstr "ã³ãããããå¤æ´ãããã¾ãã\n"
+msgstr "é©ç¨ããå¤æ´ã¯ããã¾ãã"
#: cmd_merging.cc:759
-#, fuzzy, c-format
+#, c-format
msgid "no changes to be applied"
-msgstr "ã³ãããããå¤æ´ãããã¾ãã\n"
+msgstr "é©ç¨ãããã¹ãå¤æ´ã¯ããã¾ãã"
#: cmd_merging.cc:786
-#, fuzzy, c-format
+#, c-format
msgid "no changes were applied"
-msgstr "ã³ãããããå¤æ´ãããã¾ãã\n"
+msgstr "é©ç¨ãããå¤æ´ã¯ããã¾ãã"
#: cmd_merging.cc:789
-#, fuzzy, c-format
+#, c-format
msgid "applied changes to workspace"
-msgstr "ãã¡ã¤ã«ãã¯ã¼ã¯ã¹ãã¼ã¹ã«è¿½å "
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã«å¤æ´ãé©ç¨ãã¾ãã"
#: cmd_merging.cc:821
msgid "show unmerged head revisions of branch"
msgstr "ãã©ã³ãã®çµ±åããã¦ããªãææ°ãªãã¸ã§ã³ã表示"
#: cmd_merging.cc:836
-#, fuzzy, c-format
+#, c-format
msgid "branch '%s' is currently merged:"
-msgstr "ãã©ã³ã '%s' ã¯ç¾å¨çµ±åæ¸ã¿ã§ã:\n"
+msgstr "ç¾å¨ãã©ã³ã '%s' ã¯çµ±åæ¸ã¿ã§ã:"
#: cmd_merging.cc:838
-#, fuzzy, c-format
+#, c-format
msgid "branch '%s' is currently unmerged:"
-msgstr "ãã©ã³ã '%s' ã¯ç¾å¨æªçµ±åã§ã:\n"
+msgstr "ç¾å¨ãã©ã³ã '%s' ã¯æªçµ±åã§ã:"
#: cmd_merging.cc:846
msgid "dump the roster associated with the given REVID"
msgstr "æå®ã® REVID ã«ã¤ãã¦é¢é£ã¥ããããåç°¿ããã³ã"
#: cmd_netsync.cc:33
-#, fuzzy, c-format
+#, c-format
msgid "setting default server to %s"
-msgstr "ããã©ã«ãã®ãµã¼ãã¼ã %s ã«è¨å®\n"
+msgstr "ããã©ã«ãã®ãµã¼ãã¼ã %s ã«è¨å®ãã¦ãã¾ã"
#: cmd_netsync.cc:40
#, c-format
@@ -1174,14 +1184,14 @@ msgstr "ãã©ã³ãåãæå®ãã¦ä¸
msgstr "ãã©ã³ãåãæå®ãã¦ä¸ãã"
#: cmd_netsync.cc:80
-#, fuzzy, c-format
+#, c-format
msgid "setting default branch include pattern to '%s'"
-msgstr "ãã©ã³ãåã«å«ããããã©ã«ããã¿ã¼ã³ã '%s' ã«è¨å®\n"
+msgstr "ãã©ã³ãåã«å«ãããã¿ã¼ã³ã®ããã©ã«ãã '%s' ã«è¨å®ãã¦ãã¾ã"
#: cmd_netsync.cc:86
-#, fuzzy, c-format
+#, c-format
msgid "setting default branch exclude pattern to '%s'"
-msgstr "ãã©ã³ãåã«å«ããªãããã©ã«ããã¿ã¼ã³ã '%s' ã«è¨å®\n"
+msgstr "ãã©ã³ãåã«å«ããªããã¿ã¼ã³ã®ããã©ã«ãã '%s' ã«è¨å®ãã¦ãã¾ã"
#: cmd_netsync.cc:93
#, c-format
@@ -1193,8 +1203,8 @@ msgstr "ãããã¯ã¼ã¯"
msgstr "ãããã¯ã¼ã¯"
#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138
-msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
-msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]"
+msgid "[ADDRESS[:PORTNUMBER] [PATTERN ...]]"
+msgstr "[ADDRESS[:PORTNUMBER] [PATTERN ...]]"
#: cmd_netsync.cc:110
msgid "push branches matching PATTERN to netsync server at ADDRESS"
@@ -1205,9 +1215,9 @@ msgstr "PATTERN ã«åããã©ã³ãã
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ããåãè¾¼ã¿"
#: cmd_netsync.cc:132
-#, fuzzy, c-format
+#, c-format
msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
-msgstr "å¿åã§åãè¾¼ãã§ãã¾ã; èªè¨¼ãå¿
è¦ãªå ´å㯠-kKEYNAME ã使ã£ã¦ä¸ãã\n"
+msgstr "å¿åã§åãè¾¼ãã§ãã¾ããèªè¨¼ãå¿
è¦ãªå ´å㯠-kKEYNAME ã使ã£ã¦ä¸ããã"
#: cmd_netsync.cc:139
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
@@ -1219,14 +1229,13 @@ msgstr "PID ãã¡ã¤ã« '%s' ã¯æ¢ã«å
msgstr "PID ãã¡ã¤ã« '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
#: cmd_netsync.cc:162
-#, fuzzy, c-format
+#, c-format
msgid "failed to create pid file '%s'"
-msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®è§£æã«å¤±æ"
+msgstr "PID ãã¡ã¤ã« '%s' ã®ä½æã«å¤±æãã¾ãã"
#: cmd_netsync.cc:185
-#, fuzzy
msgid "serve the database to connecting clients"
-msgstr "PATTERNs ã§æå®ãããã©ã³ããæ¥ç¶ã¯ã©ã¤ã¢ã³ãã«æä¾"
+msgstr "æ¥ç¶ã¯ã©ã¤ã¢ã³ãã«ãã¼ã¿ãã¼ã¹ãæä¾"
#: cmd_netsync.cc:201
#, c-format
@@ -1241,6 +1250,8 @@ msgstr ""
msgid ""
"The --no-transport-auth option is only permitted in combination with --stdio"
msgstr ""
+"--no-transport-auth ãªãã·ã§ã³ã¯ --stdio ã¨çµã¿åãããå ´åã«ã®ã¿å©ç¨ã§ãã¾"
+"ãã"
#: cmd_othervcs.cc:15
msgid "RCSFILE..."
@@ -1308,27 +1319,24 @@ msgstr[0] "ãã¡ã¤ã«å
ã«ãã±ãã
msgid "no packets found in given file"
msgid_plural "no packets found in given files"
msgstr[0] "ãã¡ã¤ã«å
ã«ãã±ããã¯å«ã¾ãã¦ãã¾ãã"
-msgstr[1] "ãã¡ã¤ã«å
ã«ãã±ããã¯å«ã¾ãã¦ãã¾ãã"
#: cmd_packet.cc:94
#, c-format
msgid "read %d packet"
msgid_plural "read %d packets"
msgstr[0] "%d ãã±ããèªã¿è¾¼ã¿"
-msgstr[1] "%d ãã±ããèªã¿è¾¼ã¿"
#: cmd_ws_commit.cc:43
msgid "*****DELETE THIS LINE TO CONFIRM YOUR COMMIT*****"
-msgstr ""
+msgstr "*****ã³ããã確èªã®ããã«ãã®è¡ãåé¤ãã¾ã*****"
#: cmd_ws_commit.cc:46
-#, fuzzy
msgid ""
"Enter a description of this change.\n"
"Lines beginning with `MTN:' are removed automatically."
msgstr ""
-"ãã®å¤æ´ã®èª¬æãå
¥åãã¦ä¸ãã\n"
-"'MTN:' ã§å§ã¾ãè¡ã¯èªåçã«åé¤ããã¾ã\n"
+"ãã®å¤æ´ã®èª¬æãå
¥åãã¦ä¸ããã\n"
+"'MTN:' ã§å§ã¾ãè¡ã¯èªåçã«åé¤ããã¾ãã"
#: cmd_ws_commit.cc:71
#, c-format
@@ -1336,9 +1344,9 @@ msgstr "ãã°ã¡ãã»ã¼ã¸ã®ç·¨éã
msgstr "ãã°ã¡ãã»ã¼ã¸ã®ç·¨éã«å¤±æãã¾ãã"
#: cmd_ws_commit.cc:74
-#, fuzzy, c-format
+#, c-format
msgid "failed to remove magic line; commit cancelled"
-msgstr "空ã®ãã°ã¡ãã»ã¼ã¸; ã³ãããã¯åãæ¶ããã¾ãã"
+msgstr "ãã¸ãã¯è¡ã®åé¤ã«å¤±æããã³ããããåãæ¶ãã¾ãã"
#: cmd_ws_commit.cc:80
msgid "revert file(s), dir(s) or entire workspace (\".\")"
@@ -1348,11 +1356,13 @@ msgstr ""
#, c-format
msgid "you must pass at least one path to 'revert' (perhaps '.')"
msgstr ""
+"'revert' ã«ã¯å°ãªãã¨ãä¸ã¤ãã¹ ('.' ã§ãããã§ã) ãæå®ããªããã°ããã¾ã"
+"ãã"
#: cmd_ws_commit.cc:108
-#, fuzzy, c-format
+#, c-format
msgid "no missing files to revert"
-msgstr "ã¿ã¤ãããªããã¡ã¤ã«: %d\n"
+msgstr "å¤æ´ãç ´æ£ããã¹ã失ããããã¡ã¤ã«ã¯ããã¾ãã"
#: cmd_ws_commit.cc:163
#, c-format
@@ -1374,9 +1384,9 @@ msgstr "ç¹å®ã®ãªãã¸ã§ã³ãéæ
msgstr "ç¹å®ã®ãªãã¸ã§ã³ãéæ¿èª"
#: cmd_ws_commit.cc:219
-#, fuzzy, c-format
+#, c-format
msgid "revision %s has %d changesets, cannot invert"
-msgstr "ãªãã¸ã§ã³ '%s' ã«ã¯ %d åã®å¤æ´ã»ããããããå転ã§ãã¾ãã\n"
+msgstr "ãªãã¸ã§ã³ '%s' ã«ã¯ %d åã®å¤æ´ã»ããããããå転ã§ãã¾ãã"
#: cmd_ws_commit.cc:223
#, c-format
@@ -1384,24 +1394,22 @@ msgstr "éæ¿èªã¨ããã«ã¯ --branc
msgstr "éæ¿èªã¨ããã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
#: cmd_ws_commit.cc:264
-#, fuzzy
msgid "[DIRECTORY...]"
-msgstr "[DIRECTORY]"
+msgstr "[DIRECTORY...]"
#: cmd_ws_commit.cc:265
-#, fuzzy
msgid "create one or more directories and add them to the workspace"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã®ã¨ã³ããªã®å称ãå¤æ´"
+msgstr "ä¸ã¤ä»¥ä¸ã®ãã£ã¬ã¯ããªãä½æããã¯ã¼ã¯ã¹ãã¼ã¹ã«è¿½å ãã¾ã"
#: cmd_ws_commit.cc:285
-#, fuzzy, c-format
+#, c-format
msgid "directory '%s' already exists"
-msgstr "åãåºããã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
+msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
#: cmd_ws_commit.cc:292
#, c-format
msgid "ignoring directory '%s' [see .mtn-ignore]"
-msgstr ""
+msgstr "ãã£ã¬ã¯ã㪠'%s' ãç¡è¦ãã¦ãã¾ã [.mtn-ignore ãåç
§]"
#: cmd_ws_commit.cc:309
msgid "add files to workspace"
@@ -1410,18 +1418,18 @@ msgid "cannot set '--unknown' and '--rec
#: cmd_ws_commit.cc:316
#, c-format
msgid "cannot set '--unknown' and '--recursive' at the same time"
-msgstr ""
+msgstr "'--unknown' 㨠'--recursive' ã¯åæã«æå®ã§ãã¾ãã"
#: cmd_ws_commit.cc:318
#, c-format
msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time"
-msgstr ""
+msgstr "'--unknown' 㨠'--no-respect-ignore' ã¯åæã«æå®ã§ãã¾ãã"
-#: cmd_ws_commit.cc:350
+#: cmd_ws_commit.cc:344
msgid "drop files from workspace"
msgstr "ãã¡ã¤ã«ãã¯ã¼ã¯ã¹ãã¼ã¹ããåé¤"
-#: cmd_ws_commit.cc:386
+#: cmd_ws_commit.cc:374
msgid ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
@@ -1429,15 +1437,15 @@ msgstr ""
"SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"
-#: cmd_ws_commit.cc:388
+#: cmd_ws_commit.cc:376
msgid "rename entries in the workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã®ã¨ã³ããªã®å称ãå¤æ´"
-#: cmd_ws_commit.cc:410
+#: cmd_ws_commit.cc:398
msgid "NEW_ROOT PUT_OLD"
msgstr "NEW_ROOT PUT_OLD"
-#: cmd_ws_commit.cc:411
+#: cmd_ws_commit.cc:399
msgid ""
"rename the root directory\n"
"after this command, the directory that currently has the name NEW_ROOT\n"
@@ -1450,52 +1458,54 @@ msgstr ""
"ãã£ã¬ã¯ããªã¨ãPUT_OLD ã¨ããååã®ç¾å¨ã®ã«ã¼ããã£ã¬ã¯ããªãæå®ãã¾ãã\n"
"--execute ã®ä½¿ç¨ãå¼·ãæ¨å¥¨ãã¾ãã"
-#: cmd_ws_commit.cc:429
+#: cmd_ws_commit.cc:417
msgid "show status of workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ç¶æ
ã表示"
-#: cmd_ws_commit.cc:458
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:446
+#, c-format
msgid "Current branch: %s"
-msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ãããéå§\n"
+msgstr "ç¾å¨ã®ãã©ã³ã: %s"
-#: cmd_ws_commit.cc:464
+#: cmd_ws_commit.cc:452
#, c-format
msgid "Changes against parent %s"
-msgstr ""
+msgstr "親 %s ã«å¯¾ããå¤æ´"
-#: cmd_ws_commit.cc:469
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:457
+#, c-format
msgid " no changes"
-msgstr "å¤æ´ãªã"
+msgstr " å¤æ´ãªã"
-#: cmd_ws_commit.cc:473
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:461
+#, c-format
msgid " dropped %s"
-msgstr "%s ãç ´æ£ãã¦ãã¾ã"
+msgstr " %s ãç ´æ£"
-#: cmd_ws_commit.cc:478
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:466
+#, c-format
msgid ""
" renamed %s\n"
" to %s"
-msgstr "%s ãã %s ã«å称å¤æ´ãã¦ãã¾ã"
+msgstr ""
+" %s ã\n"
+" %s ã«å称å¤æ´"
-#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:487
+#: cmd_ws_commit.cc:471 cmd_ws_commit.cc:475
#, c-format
msgid " added %s"
-msgstr ""
+msgstr " %s ã追å "
-#: cmd_ws_commit.cc:491
+#: cmd_ws_commit.cc:479
#, c-format
msgid " patched %s"
-msgstr ""
+msgstr " %s ã«ãããé©ç¨"
-#: cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 cmd_ws_commit.cc:1105
+#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:969 cmd_ws_commit.cc:1102
msgid "[DIRECTORY]"
msgstr "[DIRECTORY]"
-#: cmd_ws_commit.cc:496
+#: cmd_ws_commit.cc:484
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"
@@ -1508,47 +1518,47 @@ msgstr ""
"åãåºãã¾ãããã£ã¬ã¯ããªãæªæå®ãªããã£ã¬ã¯ããªåã¨ãã¦\n"
"ãã©ã³ãåã使ãã¾ã"
-#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1048
+#: cmd_ws_commit.cc:502 cmd_ws_commit.cc:1036
#, c-format
msgid "use --revision or --branch to specify what to checkout"
-msgstr ""
+msgstr "--revision ã¾ã㯠--branch ã§ãã§ãã¯ã¢ã¦ãã®å¯¾è±¡ãæå®ãã¦ãã ãã"
-#: cmd_ws_commit.cc:522 cmd_ws_commit.cc:1054
+#: cmd_ws_commit.cc:510 cmd_ws_commit.cc:1042
#, c-format
msgid "branch %s has multiple heads:"
msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãåå¨ãã¦ãã¾ã:"
-#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:1057
+#: cmd_ws_commit.cc:513 cmd_ws_commit.cc:1045
#, c-format
msgid "choose one with '%s checkout -r'"
msgstr "'%s update -r' ã§ä¸ã¤ãé¸æãã¦ä¸ãã"
-#: cmd_ws_commit.cc:526 cmd_ws_commit.cc:1058
+#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1046
#, c-format
msgid "branch %s has multiple heads"
msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°ç (HEAD) ãåå¨ãã¦ãã¾ã"
-#: cmd_ws_commit.cc:553 cmd_ws_commit.cc:1041
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:541 cmd_ws_commit.cc:1029
+#, c-format
msgid "revision %s is not a member of branch %s"
-msgstr "ãªãã¸ã§ã³ %s ã¯ãã©ã³ã %s ã«ã¯å±ãã¦ãã¾ãã\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ãã©ã³ã %s ã«ã¯å±ãã¦ãã¾ãã"
-#: cmd_ws_commit.cc:570
+#: cmd_ws_commit.cc:558
#, c-format
msgid "you must specify a destination directory"
-msgstr ""
+msgstr "対象ã®ãã£ã¬ã¯ããªãæå®ããªããã°ããã¾ãã"
-#: cmd_ws_commit.cc:583
+#: cmd_ws_commit.cc:571
#, c-format
msgid "checkout directory '%s' already exists"
msgstr "åãåºããã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: cmd_ws_commit.cc:617
+#: cmd_ws_commit.cc:605
#, c-format
msgid "no file %s found in database for %s"
msgstr "ãã¡ã¤ã« %s (対象 %s)ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¯ã¿ã¤ããã¾ãã"
-#: cmd_ws_commit.cc:635
+#: cmd_ws_commit.cc:623
msgid ""
"set PATH ATTR VALUE\n"
"get PATH [ATTR]\n"
@@ -1558,45 +1568,45 @@ msgstr ""
"get PATH [ATTR]\n"
"drop PATH [ATTR]"
-#: cmd_ws_commit.cc:636
+#: cmd_ws_commit.cc:624
msgid "set, get or drop file attributes"
msgstr "ãã¡ã¤ã«å±æ§ãè¨å®/åå¾/åé¤"
-#: cmd_ws_commit.cc:653
+#: cmd_ws_commit.cc:641
#, c-format
msgid "Unknown path '%s'"
msgstr "ä¸æãªãã¹ '%s'"
-#: cmd_ws_commit.cc:682
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:670
+#, c-format
msgid "Path '%s' does not have attribute '%s'"
-msgstr "ãã¹ '%s' ã«ã¯å±æ§ '%s' ãããã¾ãã\n"
+msgstr "ãã¹ '%s' ã«ã¯ '%s' ã¨ããå±æ§ã¯ããã¾ãã"
-#: cmd_ws_commit.cc:712
+#: cmd_ws_commit.cc:700
#, c-format
msgid "No attributes for '%s'"
-msgstr "'%s' ã«ã¤ãã¦å±æ§ã¯ããã¾ãã"
+msgstr "'%s' ã«ã¯å±æ§ã¯ããã¾ãã"
-#: cmd_ws_commit.cc:723
+#: cmd_ws_commit.cc:711
#, c-format
msgid "No attribute '%s' on path '%s'"
msgstr "ãã¹ '%s' ã«ã¤ã㦠'%s' ã¨ããå±æ§ã¯ããã¾ãã"
-#: cmd_ws_commit.cc:736
+#: cmd_ws_commit.cc:724
msgid "commit workspace to database"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ããã¼ã¿ãã¼ã¹ã«ã³ããã"
-#: cmd_ws_commit.cc:767
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:755
+#, c-format
msgid "no changes to commit"
-msgstr "ã³ãããããå¤æ´ãããã¾ãã\n"
+msgstr "ã³ãããããå¤æ´ãããã¾ãã"
-#: cmd_ws_commit.cc:787
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:775
+#, c-format
msgid "beginning commit on branch '%s'"
-msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ãããéå§\n"
+msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ããããéå§ãã¾ã"
-#: cmd_ws_commit.cc:796
+#: cmd_ws_commit.cc:784
#, c-format
msgid ""
"_MTN/log is non-empty and log message was specified on command line\n"
@@ -1607,37 +1617,37 @@ msgstr ""
"_MTN/log ã移å/åé¤ããããã³ãã³ãè¡ãã --message/--message-file ã\n"
"æ¶ãã¦ä¸ããã"
-#: cmd_ws_commit.cc:811
+#: cmd_ws_commit.cc:799
#, c-format
msgid "empty log message; commit canceled"
msgstr "空ã®ãã°ã¡ãã»ã¼ã¸; ã³ãããã¯åãæ¶ããã¾ãã"
-#: cmd_ws_commit.cc:833
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:821
+#, c-format
msgid "log message rejected by hook: %s"
-msgstr "ãã°ã¡ãã»ã¼ã¸ãæå¦: %s\n"
+msgstr "ããã¯ã«ãã£ã¦ãã°ã¡ãã»ã¼ã¸ã¯æå¦ããã¾ãã: %s"
-#: cmd_ws_commit.cc:841
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:829
+#, c-format
msgid "revision %s already in database"
-msgstr "ãªãã¸ã§ã³ %s ã¯æ¢ã«ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¦ãã¾ã\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã"
-#: cmd_ws_commit.cc:880 cmd_ws_commit.cc:910
+#: cmd_ws_commit.cc:868 cmd_ws_commit.cc:898
#, c-format
msgid "file '%s' modified during commit, aborting"
-msgstr "ãã¡ã¤ã« '%s' 㯠commit åã«å¤æ´ããã¾ãã. ä¸æ¢ãã¾ã"
+msgstr "ãã¡ã¤ã« '%s' ã¯ã³ãããä¸ã«å¤æ´ããã¾ãããå¦çãä¸æ¢ãã¾ãã"
-#: cmd_ws_commit.cc:892
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:880
+#, c-format
msgid "Your database is missing version %s of file '%s'"
-msgstr "ãã¡ã¤ã« %s å
ã®ãã¼ã¿ãã¼ã¹ãã¼ã¸ã§ã³ãæ¤åºã§ãã¾ããã§ãã"
+msgstr "ãã¼ã¿ãã¼ã¹ã«ãã¼ã¸ã§ã³ %s (ãã¡ã¤ã« '%s') ã¯å«ã¾ãã¦ãã¾ãã"
-#: cmd_ws_commit.cc:942
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:930
+#, c-format
msgid "committed revision %s"
-msgstr "ãªãã¸ã§ã³ %s ãã³ããã\n"
+msgstr "ãªãã¸ã§ã³ %s ãã³ããããã¾ãã"
-#: cmd_ws_commit.cc:948
+#: cmd_ws_commit.cc:936
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1646,60 +1656,59 @@ msgstr ""
"注æ: ãã®ãªãã¸ã§ã³ã«ãã£ã¦åå²ãçãã¾ã\n"
"注æ: åå²ãæã¾ãªããªã '%s merge' ãå®è¡ãã¦ä¸ãã"
-#: cmd_ws_commit.cc:982
+#: cmd_ws_commit.cc:970
msgid "setup a new workspace directory, default to current"
msgstr "æ°ããã¯ã¼ã¯ã¹ãã¼ã¹ãã£ã¬ã¯ããªãä½æ (ããã©ã«ã: ç¾å¨ã®å ´æ)"
-#: cmd_ws_commit.cc:988
+#: cmd_ws_commit.cc:976
#, c-format
msgid "need --branch argument for setup"
msgstr "ä½æã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: cmd_ws_commit.cc:1004
-#, fuzzy
+#: cmd_ws_commit.cc:992
msgid "DIRECTORY"
-msgstr "[DIRECTORY]"
+msgstr "DIRECTORY"
-#: cmd_ws_commit.cc:1005
+#: cmd_ws_commit.cc:993
msgid "import the contents of the given directory tree into a given branch"
-msgstr ""
+msgstr "æå®ã®ãã£ã¬ã¯ããªããªã¼ã®å
容ãæå®ã®ãã©ã³ãã« import"
-#: cmd_ws_commit.cc:1016
+#: cmd_ws_commit.cc:1004
#, c-format
msgid "you must specify a directory to import"
-msgstr ""
+msgstr "import ãããã£ã¬ã¯ããªãæå®ããªããã°ããã¾ãã"
-#: cmd_ws_commit.cc:1067
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:1055
+#, c-format
msgid "import directory '%s' doesn't exists"
-msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯åå¨ãã¾ãã"
+msgstr "import ããã¹ã '%s' ã¨ãããã£ã¬ã¯ããªã¯åå¨ãã¾ãã"
-#: cmd_ws_commit.cc:1068
-#, fuzzy, c-format
+#: cmd_ws_commit.cc:1056
+#, c-format
msgid "import directory '%s' is a file"
-msgstr ""
-"ãã£ã¬ã¯ã㪠'%s' ãä½æã§ãã¾ããã§ãã\n"
-"ãã¡ã¤ã«ã§ã"
+msgstr "import ãããã¨ãã¦ãã '%s' ã¯ãã£ã¬ã¯ããªã§ã¯ãªããã¡ã¤ã«ã§ã"
-#: cmd_ws_commit.cc:1106
+#: cmd_ws_commit.cc:1103
msgid ""
"migrate a workspace directory's metadata to the latest format; defaults to "
"the current workspace"
msgstr ""
+"ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãã£ã¬ã¯ããªã®ã¡ã¿ãã¼ã¿ãææ°å½¢å¼ã«ç§»è¡ãã¾ãã対象ã®ããã©"
+"ã«ãã¯ç¾å¨ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã§ãã"
-#: cmd_ws_commit.cc:1119
+#: cmd_ws_commit.cc:1116
msgid "refresh the inodeprint cache"
msgstr "i-node 表示ãã£ãã·ã¥ãæ´æ°"
#: commands.cc:139 commands.cc:241
-#, fuzzy, c-format
+#, c-format
msgid "unknown command '%s'"
-msgstr "ä¸æãªã³ãã³ã '%s'\n"
+msgstr "ä¸æãªã³ãã³ã '%s'"
#: commands.cc:150
-#, fuzzy, c-format
+#, c-format
msgid "command '%s' has multiple ambiguous expansions:"
-msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããã³ãã³ãåè£ã¯è¤æ°ããã¾ã:\n"
+msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããã³ãã³ãåè£ã¯è¤æ°ããã¾ã:"
#: commands.cc:183
msgid "commands:"
@@ -1714,24 +1723,24 @@ msgstr "ã³ãã³ããã«ãã表示"
msgstr "ã³ãã³ããã«ãã表示"
#: commands.cc:420
-#, fuzzy, c-format
+#, c-format
msgid "expanding selection '%s'"
-msgstr "ã»ã¬ã¯ã·ã§ã³ '%s' ãå±é\n"
+msgstr "é¸æ '%s' ãå±éãã¾ã"
#: commands.cc:428
#, c-format
msgid "no match for selection '%s'"
-msgstr "ã»ã¬ã¯ã·ã§ã³ '%s' ã«ä¸è´ãããã®ãããã¾ãã"
+msgstr "é¸æ '%s' ã«ä¸è´ãããã®ãããã¾ãã"
#: commands.cc:434
-#, fuzzy, c-format
+#, c-format
msgid "expanded to '%s'"
-msgstr "'%s' ã«å±é\n"
+msgstr "'%s' ã«å±éãã¾ãã"
#: commands.cc:451
-#, fuzzy, c-format
+#, c-format
msgid "selection '%s' has multiple ambiguous expansions:"
-msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããã»ã¬ã¯ã·ã§ã³ã®åè£ã¯è¤æ°ããã¾ã: \n"
+msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããåè£ã¯è¤æ°ããã¾ã:"
#: commands.cc:468
msgid "note: "
@@ -1754,7 +1763,7 @@ msgid "file structure is corrupted; cann
#: database_check.cc:137
#, c-format
msgid "file structure is corrupted; cannot check further"
-msgstr ""
+msgstr "ãã¡ã¤ã«æ§é ãå£ãã¦ãã¾ãããã以ä¸ãã§ãã¯ã§ãã¾ããã"
#: database_check.cc:148
msgid "files"
@@ -1784,251 +1793,253 @@ msgstr "証æ"
msgid "certs"
msgstr "証æ"
+# FIXME
#: database_check.cc:504
msgid "heights"
-msgstr ""
+msgstr "é«ã"
+# FIXME
#: database_check.cc:548
msgid "height relations"
-msgstr ""
+msgstr "é¢é£ã®é«ã"
#: database_check.cc:594
-#, fuzzy, c-format
+#, c-format
msgid "file %s missing (%d manifest references)"
-msgstr "ãã¡ã¤ã« %s ãããã¾ãã (ãããã§ã¹ãåç
§: %d)\n"
+msgstr "ãã¡ã¤ã« %s ãããã¾ãã (ãããã§ã¹ãåç
§: %d)"
#: database_check.cc:601
-#, fuzzy, c-format
+#, c-format
msgid "file %s unreferenced"
-msgstr "ãã¡ã¤ã« %s ã¯åç
§ããã¦ãã¾ãã\n"
+msgstr "ãã¡ã¤ã« %s ã¯åç
§ããã¦ãã¾ãã"
#: database_check.cc:620
-#, fuzzy, c-format
+#, c-format
msgid "roster %s unreferenced"
-msgstr "åç°¿ %s ã¯åç
§ããã¦ãã¾ãã\n"
+msgstr "åç°¿ %s ã¯åç
§ããã¦ãã¾ãã"
#: database_check.cc:626
-#, fuzzy, c-format
+#, c-format
msgid "roster %s incomplete (%d missing files)"
-msgstr "åç°¿ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããã¡ã¤ã«: %d)\n"
+msgstr "åç°¿ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããã¡ã¤ã«: %d)"
#: database_check.cc:633
-#, fuzzy, c-format
+#, c-format
msgid "roster %s incomplete (%d missing revisions)"
-msgstr "åç°¿ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããªãã¸ã§ã³: %d)\n"
+msgstr "åç°¿ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããªãã¸ã§ã³: %d)"
#: database_check.cc:658
-#, fuzzy, c-format
+#, c-format
msgid ""
"revision %s missing (%d revision references; %d cert references; %d parent "
"references; %d child references; %d roster references)"
msgstr ""
-"ãªãã¸ã§ã³ %s ãããã¾ãã (ãªãã¸ã§ã³åç
§: %d, 証æåç
§: %d, 親åç
§: %d, å"
-"åç
§: %d, åç°¿åç
§: %d)\n"
+"%s ã¨ãããªãã¸ã§ã³ã¯ããã¾ãã (ãªãã¸ã§ã³åç
§: %d, 証æåç
§: %d, 親åç
§: %"
+"d, ååç
§: %d, åç°¿åç
§: %d)"
#: database_check.cc:666
-#, fuzzy, c-format
+#, c-format
msgid "revision %s incomplete (%d missing manifests)"
-msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããããã§ã¹ã: %d)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããããã§ã¹ã: %d)"
#: database_check.cc:673
-#, fuzzy, c-format
+#, c-format
msgid "revision %s incomplete (%d missing revisions)"
-msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããªãã¸ã§ã³: %d)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (ã¿ã¤ãããªããªãã¸ã§ã³: %d)"
#: database_check.cc:680
-#, fuzzy, c-format
+#, c-format
msgid "revision %s incomplete (missing roster)"
-msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ãããã¾ãã)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ãããã¾ãã)"
#: database_check.cc:686
-#, fuzzy, c-format
+#, c-format
msgid "revision %s mismatched roster and manifest"
-msgstr "ãªãã¸ã§ã³ %s ã®åç°¿ã¨ãããã§ã¹ããä¸è´ãã¦ãã¾ãã\n"
+msgstr "ãªãã¸ã§ã³ %s ã®åç°¿ã¨ãããã§ã¹ããä¸è´ãã¦ãã¾ãã"
#: database_check.cc:692
-#, fuzzy, c-format
+#, c-format
msgid "revision %s incomplete (incomplete roster)"
-msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ãä¸å®å
¨)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ãä¸å®å
¨)"
#: database_check.cc:698
-#, fuzzy, c-format
+#, c-format
msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)"
-msgstr "ãªãã¸ã§ã³ %s ã¯è¦ªã¨ä¸ä¸è´ã§ã (親: %d; ãªãã¸ã§ã³åç
§: %d)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯è¦ªã¨ä¸ä¸è´ã§ã (親: %d; ãªãã¸ã§ã³åç
§: %d)"
#: database_check.cc:707
-#, fuzzy, c-format
+#, c-format
msgid "revision %s mismatched children (%d ancestry children; %d parents)"
-msgstr "ãªãã¸ã§ã³ %s ã¯åã¨ä¸ä¸è´ã§ã (å: %d; 親: %d)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯åã¨ä¸ä¸è´ã§ã (å: %d; 親: %d)"
#: database_check.cc:719
-#, fuzzy, c-format
+#, c-format
msgid "revision %s has bad history (%s)"
-msgstr "ãªãã¸ã§ã³ %s ã¯ä¸æ£ãªå±¥æ´ (%s) ãæã£ã¦ãã¾ã\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯ä¸æ£ãªå±¥æ´ (%s) ãããã¾ã"
#: database_check.cc:726
-#, fuzzy, c-format
+#, c-format
msgid "revision %s is not parseable (perhaps with unnormalized paths?)"
-msgstr "ãªãã¸ã§ã³ %s ã解æã§ãã¾ãã (ãã¹ãæ£è¦åããã¦ããªãã®ã§ã¯?)\n"
+msgstr "ãªãã¸ã§ã³ %s ã解æã§ãã¾ãã (ãã¹ãæ£è¦åããã¦ããªãã®ã§ã¯?)"
#: database_check.cc:733
-#, fuzzy, c-format
+#, c-format
msgid "revision %s is not in normalized form"
-msgstr "ãªãã¸ã§ã³ %s ã¯æ£è¦åãããå½¢å¼ã§ã¯ããã¾ãã\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯æ£è¦åãããå½¢å¼ã§ã¯ããã¾ãã"
#: database_check.cc:757
-#, fuzzy, c-format
+#, c-format
msgid "key %s missing (signed %d certs)"
-msgstr "éµ %s ãããã¾ãã (%d åã®è¨¼æãç½²å)\n"
+msgstr "%s ã¨ããéµã¯ããã¾ãã (%d åã®è¨¼æãç½²å)"
#: database_check.cc:790
-#, fuzzy, c-format
+#, c-format
msgid "revision %s unchecked signature in %s cert from missing key %s"
msgstr ""
-"ãªãã¸ã§ã³ %s ã® %s 証æ(失ãããéµ %s) ã®ç½²åã¯æ¤è¨¼ããããã®ã§ã¯ããã¾ã"
-"ã\n"
+"ãªãã¸ã§ã³ %s ã® %s 証æ(失ãããéµ %s) ã®ç½²åã¯æ¤è¨¼ããããã®ã§ã¯ããã¾ãã"
#: database_check.cc:798
-#, fuzzy, c-format
+#, c-format
msgid "revision %s bad signature in %s cert from key %s"
-msgstr "ãªãã¸ã§ã³ %s ã® %s 証æ (éµ %s) ã®ä¸æ£ãªç½²åãç¡è¦ãã¾ã\n"
+msgstr "ãªãã¸ã§ã³ %s ã® %s 証æ (éµ %s) ã®ä¸æ£ãªç½²åãç¡è¦ãã¾ã"
#: database_check.cc:813
-#, fuzzy, c-format
+#, c-format
msgid "revision %s missing %s cert"
-msgstr "ãªãã¸ã§ã³ %s 㯠%s 証æãæ¬ ãã¦ãã¾ã\n"
+msgstr "ãªãã¸ã§ã³ %s 㯠%s 証æãæ¬ ãã¦ãã¾ã"
#: database_check.cc:822
-#, fuzzy, c-format
+#, c-format
msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)"
-msgstr "ãªãã¸ã§ã³ %s ã¯è¨¼æã«åè´ãã¾ãã (%d ä½è
%d æ¥æ %d å¤æ´ãã°)\n"
+msgstr "ãªãã¸ã§ã³ %s ã¯è¨¼æã«åè´ãã¾ãã (%d ä½è
%d æ¥æ %d å¤æ´ãã°)"
#: database_check.cc:846
-#, fuzzy, c-format
+#, c-format
msgid "height missing for revision %s"
-msgstr "ã¿ã¤ãããªããªãã¸ã§ã³: %d\n"
+msgstr "ãªãã¸ã§ã³ %s ã«ã¤ãã¦é«ããããã¾ãã"
#: database_check.cc:853
-#, fuzzy, c-format
+#, c-format
msgid "duplicate height for revision %s"
-msgstr "åºæºãªãã¸ã§ã³ %s ã«æ´æ°\n"
+msgstr "ãªãã¸ã§ã³ %s ã«ã¤ãã¦é«ããéè¤ãã¦ãã¾ã"
#: database_check.cc:859
#, c-format
msgid "height of revision %s not greater than that of parent"
-msgstr ""
+msgstr "ãªãã¸ã§ã³ %s ã®é«ãã¯è¦ªã®ãããããé«ãããã¾ãã"
#: database_check.cc:944
-#, fuzzy, c-format
+#, c-format
msgid "%d missing files"
-msgstr "ã¿ã¤ãããªããã¡ã¤ã«: %d\n"
+msgstr "ã¿ã¤ãããªããã¡ã¤ã«: %d"
#: database_check.cc:946
-#, fuzzy, c-format
+#, c-format
msgid "%d unreferenced files"
-msgstr "åç
§ããã¦ããªããã¡ã¤ã«: %d\n"
+msgstr "åç
§ããã¦ããªããã¡ã¤ã«: %d"
#: database_check.cc:949
-#, fuzzy, c-format
+#, c-format
msgid "%d unreferenced rosters"
-msgstr "åç
§ããã¦ããªãåç°¿: %d\n"
+msgstr "åç
§ããã¦ããªãåç°¿: %d"
#: database_check.cc:951
-#, fuzzy, c-format
+#, c-format
msgid "%d incomplete rosters"
-msgstr "ä¸å®å
¨ãªåç°¿: %d\n"
+msgstr "ä¸å®å
¨ãªåç°¿: %d"
#: database_check.cc:954
-#, fuzzy, c-format
+#, c-format
msgid "%d missing revisions"
-msgstr "ã¿ã¤ãããªããªãã¸ã§ã³: %d\n"
+msgstr "ã¿ã¤ãããªããªãã¸ã§ã³: %d"
#: database_check.cc:956
-#, fuzzy, c-format
+#, c-format
msgid "%d incomplete revisions"
-msgstr "ä¸å®å
¨ãªãªãã¸ã§ã³: %d\n"
+msgstr "ä¸å®å
¨ãªãªãã¸ã§ã³: %d"
#: database_check.cc:958
-#, fuzzy, c-format
+#, c-format
msgid "%d mismatched parents"
-msgstr "ä¸è´ããªã親: %d\n"
+msgstr "ä¸è´ããªã親: %d"
#: database_check.cc:960
-#, fuzzy, c-format
+#, c-format
msgid "%d mismatched children"
-msgstr "ä¸è´ããªãå: %d\n"
+msgstr "ä¸è´ããªãå: %d"
#: database_check.cc:962
-#, fuzzy, c-format
+#, c-format
msgid "%d revisions with bad history"
-msgstr "ä¸æ£ãªå±¥æ´ãæã¤ãªãã¸ã§ã³: %d\n"
+msgstr "ä¸æ£ãªå±¥æ´ãæã¤ãªãã¸ã§ã³: %d"
#: database_check.cc:964
-#, fuzzy, c-format
+#, c-format
msgid "%d revisions not parseable (perhaps with invalid paths)"
-msgstr "解æã§ããªããªãã¸ã§ã³ (ãã¹ãä¸é©åãªã®ã§ã¯?): %d\n"
+msgstr "解æã§ããªããªãã¸ã§ã³ (ãã¹ãä¸é©åãªã®ã§ã¯?): %d"
#: database_check.cc:967
-#, fuzzy, c-format
+#, c-format
msgid "%d revisions not in normalized form"
-msgstr "æ£è¦åãããå½¢å¼ã«ãªã£ã¦ããªããªãã¸ã§ã³: %d\n"
+msgstr "æ£è¦åãããå½¢å¼ã«ãªã£ã¦ããªããªãã¸ã§ã³: %d"
#: database_check.cc:971
-#, fuzzy, c-format
+#, c-format
msgid "%d missing rosters"
-msgstr "ã¿ã¤ãããªãåç°¿: %d\n"
+msgstr "ã¿ã¤ãããªãåç°¿: %d"
#: database_check.cc:975
-#, fuzzy, c-format
+#, c-format
msgid "%d missing keys"
-msgstr "ã¿ã¤ãããªãéµ: %d\n"
+msgstr "ã¿ã¤ãããªãéµ: %d"
#: database_check.cc:978
-#, fuzzy, c-format
+#, c-format
msgid "%d missing certs"
-msgstr "ã¿ã¤ãããªã証æ: %d\n"
+msgstr "ã¿ã¤ãããªã証æ: %d"
#: database_check.cc:980
-#, fuzzy, c-format
+#, c-format
msgid "%d mismatched certs"
-msgstr "ä¸è´ããªã証æ: %d\n"
+msgstr "ä¸è´ããªã証æ: %d"
#: database_check.cc:982
-#, fuzzy, c-format
+#, c-format
msgid "%d unchecked signatures due to missing keys"
-msgstr "éµãã¿ã¤ãããªãããã«æ¤è¨¼ããã¦ããªãç½²å: %d\n"
+msgstr "éµãã¿ã¤ãããªãããã«æ¤è¨¼ããã¦ããªãç½²å: %d"
#: database_check.cc:984
-#, fuzzy, c-format
+#, c-format
msgid "%d bad signatures"
-msgstr "ä¸æ£ãªç½²å: %d\n"
+msgstr "ä¸æ£ãªç½²å: %d"
#: database_check.cc:987
-#, fuzzy, c-format
+#, c-format
msgid "%d missing heights"
-msgstr "ã¿ã¤ãããªã証æ: %d\n"
+msgstr "ã¿ã¤ãããªã証æ: %d"
#: database_check.cc:989
#, c-format
msgid "%d duplicate heights"
-msgstr ""
+msgstr "éè¤ããé«ã: %d"
#: database_check.cc:991
-#, fuzzy, c-format
+#, c-format
msgid "%d incorrect heights"
-msgstr "ä¸å®å
¨ãªãªãã¸ã§ã³: %d\n"
+msgstr "ééã£ãé«ã: %d"
#: database_check.cc:1017
-#, fuzzy, c-format
+#, c-format
msgid ""
"check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d "
"heights"
-msgstr "æ¤è¨¼å®äº: ãã¡ã¤ã«: %d, åç°¿: %d, ãªãã¸ã§ã³: %d, éµ: %d, 証æ: %d\n"
+msgstr ""
+"æ¤è¨¼å®äº: ãã¡ã¤ã«: %d, åç°¿: %d, ãªãã¸ã§ã³: %d, éµ: %d, 証æ: %d, é«ã: %d"
#: database_check.cc:1024
-#, fuzzy, c-format
+#, c-format
msgid "total problems detected: %d (%d serious)"
-msgstr "æ¤åºããé害ç·è¨: %d (æ·±å»: %d)\n"
+msgstr "æ¤åºããåé¡ç·è¨: %d (æ·±å»: %d)"
#: database_check.cc:1026
#, c-format
@@ -2036,14 +2047,14 @@ msgstr "æ·±å»ãªåé¡ãæ¤åºãã¾ã
msgstr "æ·±å»ãªåé¡ãæ¤åºãã¾ãã"
#: database_check.cc:1028
-#, fuzzy, c-format
+#, c-format
msgid "minor problems detected"
-msgstr "軽微ãªåé¡ãæ¤åºãã¾ãã\n"
+msgstr "軽微ãªåé¡ãæ¤åºãã¾ãã"
#: database_check.cc:1030
-#, fuzzy, c-format
+#, c-format
msgid "database is good"
-msgstr "ãã¼ã¿ãã¼ã¹ã¯æ£å¸¸ã§ã\n"
+msgstr "ãã¼ã¿ãã¼ã¹ã¯æ£å¸¸ã§ã"
#: database.cc:159
#, c-format
@@ -2064,7 +2075,7 @@ msgstr "ãã®ãã¼ã¿ãã¼ã¹ã«ã¯æ
msgstr "ãã®ãã¼ã¿ãã¼ã¹ã«ã¯æ¢ã«åç°¿ãå«ã¾ãã¦ãã¾ã"
#: database.cc:200
-#, fuzzy, c-format
+#, c-format
msgid ""
"database %s contains old-style revisions\n"
"if you are a project leader or doing local testing:\n"
@@ -2074,11 +2085,12 @@ msgstr ""
" pull into a fresh database.\n"
"sorry about the inconvenience."
msgstr ""
-"ãã¼ã¿ãã¼ã¹ %s ã«ã¯ãªãã¸ã§ã³ã¯ããã¾ããåç°¿ãããã¾ãã\n"
-"ããªããããã¸ã§ã¯ããªã¼ãã¼ã¾ãã¯ãã¼ã«ã«ã§ãã¹ãä¸ã§ãããªã\n"
-"ãã¡ã¤ã« UPGRADE ã®æ示ã«å¾ã£ã¦ã¢ããã°ã¬ã¼ããã¦ä¸ããã\n"
-"ããã¸ã§ã¯ããªã¼ãã¼ã§ã¯ãªãã®ãªããªã¼ãã¼ãããã¸ã§ã¯ãã®ãã¼ã¿ã\n"
-"çµ±åããæ°ãããã¼ã¿ãã¼ã¹ã«åãè¾¼ãã®ãå¾
ã£ã¦ä¸ããã\n"
+"ãã¼ã¿ãã¼ã¹ %s ã«ã¯å¤ãå½¢å¼ã®ãªãã¸ã§ã³ãå«ã¾ãã¦ãã¾ãã\n"
+"ããªããããã¸ã§ã¯ããªã¼ãã¼ãããã¯ãã¼ã«ã«ã«ãã¹ããã¦ããã®ãªã\n"
+"UPGRADE ã®æ´æ°ã®èª¬æãè¦ã¦ä¸ããã\n"
+"ããã¸ã§ã¯ããªã¼ãã¼ã§ã¯ãªãã®ãªã\n"
+"ãªã¼ãã¼ãããã¸ã§ã¯ãã®ãã¼ã¿ã移è¡ããæ°ãããã¼ã¿ãã¼ã¹ã«åãè¾¼ãã¾ã§\n"
+"ãå¾
ã¡ä¸ããã\n"
"ä¸ä¾¿ã§ãã¿ã¾ããã"
#: database.cc:210
@@ -2098,6 +2110,8 @@ msgstr ""
"database %s misses some cached data\n"
"run '%s db regenerate_caches' to restore use of this database"
msgstr ""
+"ãã¼ã¿ãã¼ã¹ %s ã«ã¯ããã¤ãã®ãã£ãã·ã¥ãã¼ã¿ãå«ã¾ãã¦ãã¾ããã\n"
+"'%s db regenerate_caches' ãå®è¡ãã¦å¾©æ´»ããã¾ãã"
#: database.cc:259
#, c-format
@@ -2149,8 +2163,8 @@ msgstr "%s ãä½æã§ãã¾ãã; æ¢
msgid "cannot create %s; it already exists"
msgstr "%s ãä½æã§ãã¾ãã; æ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:574
-#, fuzzy, c-format
+#: database.cc:573
+#, c-format
msgid ""
"schema version : %s\n"
"counts:\n"
@@ -2179,71 +2193,73 @@ 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"
+" ãã£ãã·ã¥ãµã¤ãº : %u"
-#: database.cc:639
+#: database.cc:638
#, c-format
msgid "database schema version: %s"
msgstr "åºæºã¹ãã¼ããã¼ã¸ã§ã³: %s"
-#: database.cc:716
-#, fuzzy, c-format
+#: database.cc:715
+#, c-format
msgid "multiple statements in query: %s"
-msgstr "ã¯ã¨ãªä¸ã«è¤æ°ã®ã¹ãã¼ãã¡ã³ã: %s\n"
+msgstr "ã¯ã¨ãªä¸ã«è¤æ°ã®ã¹ãã¼ãã¡ã³ã: %s"
-#: database.cc:722
-#, fuzzy, c-format
+#: database.cc:721
+#, c-format
msgid "wanted %d columns got %d in query: %s"
-msgstr "ã¯ã¨ãªã§ %d åè¦æ±ãã¾ãããå¾ãã®ã¯ %d åã§ã: %s\n"
+msgstr "ã¯ã¨ãªã§ %d åè¦æ±ãã¾ãããå¾ãã®ã¯ %d åã§ã: %s"
-#: database.cc:788
-#, fuzzy, c-format
+#: database.cc:787
+#, c-format
msgid "null result in query: %s"
-msgstr "ã¯ã¨ãªä¸ã«çµæ null ãå«ã¾ãã¦ãã¾ã: %s\n"
+msgstr "ã¯ã¨ãªä¸ã«çµæ null ãå«ã¾ãã¦ãã¾ã: %s"
-#: database.cc:806
-#, fuzzy, c-format
+#: database.cc:805
+#, c-format
msgid "wanted %d rows got %d in query: %s"
-msgstr "ã¯ã¨ãªã§ %d è¡è¦æ±ãã¾ãããå¾ãã®ã¯ %s ã§ã: %s\n"
+msgstr "ã¯ã¨ãªã§ %d è¡è¦æ±ãã¾ãããå¾ãã®ã¯ %d ã§ã: %s"
-#: database.cc:2043
+#: database.cc:2042
#, c-format
msgid "another key with name '%s' already exists"
msgstr "'%s' ã¨ããååã®ä»ã®éµãæ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:3041
+#: database.cc:3040
#, c-format
msgid "no database specified"
msgstr "ãã¼ã¿ãã¼ã¹æªæå®"
-#: database.cc:3049
+#: database.cc:3048
#, c-format
msgid "database %s does not exist"
msgstr "ãã¼ã¿ãã¼ã¹ %s ã¯åå¨ãã¾ãã"
-#: database.cc:3050
+#: database.cc:3049
#, c-format
msgid "%s is a directory, not a database"
msgstr "%s ã¯ãã¼ã¿ãã¼ã¹ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
-#: database.cc:3075
+#: database.cc:3074
#, c-format
msgid "could not open database '%s': %s"
msgstr "ãã¼ã¿ãã¼ã¹ '%s': %s ãéãã¾ããã§ãã"
@@ -2265,7 +2281,7 @@ msgstr ""
"ã¯ã¼ã¯ã¹ãã¼ã¹å
ã®ãã¡ã¤ã« %s ã® ID 㯠%s ã§ãããæå¾
ãããã®ã¯ %s ã§ã"
#: diff_patch.cc:744
-#, fuzzy, c-format
+#, c-format
msgid ""
"help required for 3-way merge\n"
"[ancestor] %s\n"
@@ -2277,7 +2293,7 @@ msgstr ""
"[ ç¥å
] %s\n"
"[ å·¦] %s\n"
"[ å³] %s\n"
-"[çµ±åæ¸] %s\n"
+"[çµ±åæ¸] %s"
#: file_io.cc:194 file_io.cc:201
#, c-format
@@ -2412,51 +2428,51 @@ msgstr "ãã¡ã¤ã« %s ãæ¸ãè¾¼ã¿ã
msgstr "ãã¡ã¤ã« %s ãæ¸ãè¾¼ã¿ã®ããã«éããã¨ãã§ãã¾ãã"
#: file_io.cc:455
-#, fuzzy, c-format
+#, c-format
msgid "caught runtime error %s constructing file path for %s"
-msgstr "%s ã«ã¤ãã¦ãã¡ã¤ã«ãã¹ä½æä¸ã«å®è¡æã¨ã©ã¼ %s çºç\n"
+msgstr "%s ã«ã¤ãã¦ãã¡ã¤ã«ãã¹ä½æä¸ã«å®è¡æã¨ã©ã¼ %s çºç"
-#: file_io.cc:548 work.cc:1079
+#: file_io.cc:548 work.cc:1103
#, c-format
msgid "no such file or directory: '%s'"
msgstr "ãã®ãããªãã¡ã¤ã«ã¾ãã¯ãã£ã¬ã¯ããªã¯ããã¾ãã: '%s'"
-#: keys.cc:102
+#: keys.cc:103
#, c-format
msgid "got empty passphrase from get_passphrase() hook"
msgstr "get_passphrase() ããã¯ã¯ç©ºã®ãã¹ãã¬ã¼ãºãè¿ãã¾ãã"
-#: keys.cc:118
+#: keys.cc:119
#, c-format
msgid "empty passphrase not allowed"
msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«ã§ãã¾ãã"
-#: keys.cc:125
+#: keys.cc:126
#, c-format
msgid "confirm passphrase for key ID [%s]: "
msgstr "éµ ID [%s] ã®ãã¹ãã¬ã¼ãºã確èª: "
-#: keys.cc:130
-#, fuzzy, c-format
+#: keys.cc:131
+#, c-format
msgid "empty passphrases not allowed, try again"
-msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«ã§ãã¾ãã. å度試ãã¦ä¸ãã\n"
+msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«ã§ãã¾ãã. å度試ãã¦ä¸ãã"
-#: keys.cc:131 keys.cc:138
-#, fuzzy, c-format
+#: keys.cc:132 keys.cc:139
+#, c-format
msgid "too many failed passphrases"
-msgstr "ãã¹ãã¬ã¼ãºã®å
¥åãã¹ãå¤ããã¾ã\n"
+msgstr "ãã¹ãã¬ã¼ãºã®å
¥åãã¹ãå¤ããã¾ã"
-#: keys.cc:137
-#, fuzzy, c-format
+#: keys.cc:138
+#, c-format
msgid "passphrases do not match, try again"
-msgstr "ãã¹ãã¬ã¼ãºãä¸è´ãã¾ãããå度試ãã¦ä¸ãã\n"
+msgstr "ãã¹ãã¬ã¼ãºãä¸è´ãã¾ãããå度試ãã¦ä¸ãã"
-#: keys.cc:144
+#: keys.cc:145
#, c-format
msgid "no passphrase given"
msgstr "ãã¹ãã¬ã¼ãºãæå®ãã¦ä¸ãã"
-#: keys.cc:570
+#: keys.cc:571
#, c-format
msgid "passphrase for '%s' is incorrect"
msgstr "'%s' ã«å¯¾ãããã¹ãã¬ã¼ãºãééã£ã¦ãã¾ã"
@@ -2467,11 +2483,11 @@ msgstr "%s å¼åºãæã®å¼æ°ãä¸é
msgstr "%s å¼åºãæã®å¼æ°ãä¸é©åã§ã"
#: lua.cc:480 lua.cc:515
-#, fuzzy, c-format
+#, c-format
msgid "Directory '%s' does not exist"
-msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯åå¨ãã¾ãã"
+msgstr "'%s' ã¨ãããã£ã¬ã¯ããªã¯ããã¾ãã"
-#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1334
+#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1358
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
@@ -2484,12 +2500,12 @@ msgid "resolve non-content conflicts and
#: merge.cc:60
#, c-format
msgid "resolve non-content conflicts and then try again."
-msgstr ""
+msgstr "å
容以å¤ã®ç«¶åã解決ããå度試ãã¦ä¸ããã"
#: merge.cc:124
#, c-format
msgid "merge failed due to unresolved conflicts"
-msgstr ""
+msgstr "æªè§£æ±ºã®ç«¶åã®ããã§çµ±åã«å¤±æãã¾ãã"
#: merkle_tree.cc:290
#, c-format
@@ -2501,12 +2517,12 @@ msgstr "ä¸è´ããªããã¼ãããã
msgid "mismatched node hash value %s, expected %s"
msgstr "ä¸è´ããªããã¼ãããã·ã¥å¤ %sãæå¾
ãããã®ã¯ %s ã§ã"
-#: monotone.cc:274
-#, fuzzy, c-format
+#: monotone.cc:275
+#, c-format
msgid "Usage: %s [OPTION...] command [ARG...]"
-msgstr "[OPTION...] command [ARGS...]\n"
+msgstr "使ãæ¹: %s [OPTION...] command [ARGS...]"
-#: monotone.cc:282
+#: monotone.cc:283
#, c-format
msgid "Options specific to '%s %s':"
msgstr "'%s %s' ã«ç¹åãããªãã·ã§ã³:"
@@ -2569,13 +2585,13 @@ msgstr "'%d' ãã¤ãã®é·ãè¶
éã®
msgstr "'%d' ãã¤ãã®é·ãè¶
éã®ãã¤ãã¼ã"
#: netcmd.cc:176
-#, fuzzy, c-format
+#, c-format
msgid ""
"bad HMAC checksum (got %s, wanted %s)\n"
"this suggests data was corrupted in transit"
msgstr ""
"ä¸æ£ãª HMAC ãã§ãã¯ãµã (è¨ç®å¤ %s / æå¾
å¤ %s)\n"
-"ããã¯è»¢éä¸ã«ãã¼ã¿ãå£ãããã¨ã示åãã¦ãã¾ã\n"
+"ããã¯è»¢éä¸ã«ãã¼ã¿ãå£ãããã¨ã示åãã¦ãã¾ã"
#: netcmd.cc:272 netcmd.cc:318
#, c-format
@@ -2647,7 +2663,7 @@ msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼ãå
msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼ãåä¿¡: %s"
#: netsync.cc:1304
-#, fuzzy, c-format
+#, c-format
msgid ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
"@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n"
@@ -2665,7 +2681,7 @@ msgstr ""
"ã¾ããã ãµã¼ãã¼ã®éµãå¤æ´ãããã ãã®å¯è½æ§ãããã¾ãã\n"
"ãªã¢ã¼ããã¹ãéµ %s\n"
"æå¾
å¤ %s\n"
-"'%s unset %s %s' ã¨ããã¨æ¤è¨¼çµæãç¡è¦ããããã«ãªãã¾ã\n"
+"'%s unset %s %s' ã¨ããã¨æ¤è¨¼çµæãç¡è¦ããããã«ãªãã¾ã"
#: netsync.cc:1314
#, c-format
@@ -2673,30 +2689,29 @@ msgstr "ãµã¼ãã¼éµãå¤æ´ããã
msgstr "ãµã¼ãã¼éµãå¤æ´ããã¾ãã"
#: netsync.cc:1319
-#, fuzzy, c-format
+#, c-format
msgid ""
"first time connecting to server %s\n"
"I'll assume it's really them, but you might want to double-check\n"
"their key's fingerprint: %s"
msgstr ""
"ãµã¼ãã¼ %s ã«æ¥ç¶ããã®ã¯åãã¦ã§ã\n"
-"å½ç©ã§ãªãã¨ã¯æãã¾ãããéµã®æç´ãäºéã«ãã§ãã¯ãã¦ã¿ãã¨ããã§ããã: %"
-"s\n"
+"å½ç©ã§ãªãã¨ã¯æãã¾ãããéµã®æç´ãäºéã«ãã§ãã¯ãã¦ã¿ãã¨ããã§ããã: %s"
#: netsync.cc:1326
-#, fuzzy, c-format
+#, c-format
msgid "saving public key for %s to database"
-msgstr "%s ã®å
¬ééµããã¼ã¿ãã¼ã¹ã«ä¿åä¸\n"
+msgstr "%s ã®å
¬ééµããã¼ã¿ãã¼ã¹ã«ä¿åãã¦ãã¾ã"
#: netsync.cc:1429
-#, fuzzy, c-format
+#, c-format
msgid "rejected attempt at anonymous connection for write"
-msgstr "å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦\n"
+msgstr "å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦ãã¾ãã"
#: netsync.cc:1436
-#, fuzzy, c-format
+#, c-format
msgid "rejected attempt at anonymous connection while running as sink"
-msgstr "ã·ã³ã¯ã¨ãã¦å®è¡ä¸ã®å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦\n"
+msgstr "ã·ã³ã¯ã¨ãã¦å®è¡ä¸ã®å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦ãã¾ãã"
#: netsync.cc:1452
#, c-format
@@ -2704,89 +2719,89 @@ msgstr "ãã©ã³ã '%s' ã¸ã®å¿åã
msgstr "ãã©ã³ã '%s' ã¸ã®å¿åã¢ã¯ã»ã¹ã¯ãµã¼ãã¼ã«ãã£ã¦æå¦ããã¾ãã"
#: netsync.cc:1460
-#, fuzzy, c-format
+#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'"
-msgstr "å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã\n"
+msgstr "å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã"
#: netsync.cc:1466
-#, fuzzy, c-format
+#, c-format
msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
-msgstr "å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã\n"
+msgstr "å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã"
#: netsync.cc:1531
-#, fuzzy, c-format
+#, c-format
msgid "remote public key hash '%s' is unknown"
-msgstr "ãªã¢ã¼ãã®å
¬ééµããã·ã¥ '%s' ã¯ä¸æãªãã®ã§ã\n"
+msgstr "ãªã¢ã¼ãã®å
¬ééµããã·ã¥ '%s' ã¯ä¸æãªãã®ã§ã"
#: netsync.cc:1549
-#, fuzzy, c-format
+#, c-format
msgid "detected replay attack in auth netcmd"
-msgstr "auth netcmd ä¸ã«ç¹°ãè¿ãæ»æãæ¤åº\n"
+msgstr "auth netcmd ä¸ã«ç¹°ãè¿ãæ»æãæ¤åºãã¾ãã"
#: netsync.cc:1571
-#, fuzzy, c-format
+#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
"sink"
msgstr ""
-"ç´ç²ã·ã³ã¯ã¨ãã¦å®è¡ä¸ã® '%s' ã® '%s' ('%s' ãé¤ã) ã®èªã¿è¾¼ã¿ãæå¦ãã¾ã"
-"ã\n"
+"ç´ç²ãªã·ã³ã¯ã¨ãã¦å®è¡ä¸ã® '%s' ã® '%s' ('%s' ãé¤ã) ã®èªã¿è¾¼ã¿ãæå¦ãã¾ã"
+"ã"
#: netsync.cc:1584
-#, fuzzy, c-format
+#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
msgstr ""
-"'%s' ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ããã©ã³ã '%s' ã®ããã«æå¦ãã¾ãã\n"
+"'%s' ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ããã©ã³ã '%s' ã®ããã«æå¦ãã¾ãã"
#: netsync.cc:1594
-#, fuzzy, c-format
+#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'"
-msgstr "'%s' ã®å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã\n"
+msgstr "'%s' ã®å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã"
#: netsync.cc:1605
-#, fuzzy, c-format
+#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
"source"
msgstr ""
"ç´ç²ã½ã¼ã¹ã¨ãã¦å®è¡ä¸ã® '%s' ã® '%s' ('%s' ãé¤ã) ã¸ã®æ¸ãè¾¼ã¿ãæå¦ãã¾ã"
-"ã\n"
+"ã"
#: netsync.cc:1613
-#, fuzzy, c-format
+#, c-format
msgid "denied '%s' write permission for '%s' excluding '%s'"
-msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ãæå¦ãã¾ãã\n"
+msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ãæå¦ãã¾ãã"
#: netsync.cc:1617
-#, fuzzy, c-format
+#, c-format
msgid "allowed '%s' write permission for '%s' excluding '%s'"
-msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ã許å¯ãã¾ãã\n"
+msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ã許å¯ãã¾ãã"
#: netsync.cc:1641
-#, fuzzy, c-format
+#, c-format
msgid "bad client signature"
-msgstr "ä¸æ£ãªã¯ã©ã¤ã¢ã³ãç½²å\n"
+msgstr "ä¸æ£ãªã¯ã©ã¤ã¢ã³ãç½²å"
#: netsync.cc:1657
-#, fuzzy, c-format
+#, c-format
msgid "Unexpected 'refine' command on non-refined item type"
-msgstr "refine ããã¦ããªãã¢ã¤ãã åã«ã¤ãã¦äºæããªã 'refine' ã³ãã³ã\n"
+msgstr "refine ããã¦ããªãã¢ã¤ãã åã«ã¤ãã¦äºæããªã 'refine' ã³ãã³ã"
#: netsync.cc:1754
#, c-format
msgid "unknown bye phase %d received"
-msgstr "ä¸æ㪠bye ãã§ã¼ãº %d ãåä¿¡"
+msgstr "ä¸æ㪠bye ãã§ã¼ãº %d ãåä¿¡ãã¾ãã"
#: netsync.cc:1769
-#, fuzzy, c-format
+#, c-format
msgid "Unexpected 'done' command on non-refined item type"
-msgstr "refine ããã¦ããªãã¢ã¤ãã åã«ã¤ãã¦äºæããªã 'done' ã³ãã³ã\n"
+msgstr "refine ããã¦ããªãã¢ã¤ãã åã«ã¤ãã¦äºæããªã 'done' ã³ãã³ã"
#: netsync.cc:1841
-#, fuzzy, c-format
+#, c-format
msgid "%s with hash '%s' does not exist in our database"
-msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ããã·ã¥ '%s' ã® epoch ã¯å«ã¾ãã¦ãã¾ãã"
+msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ %s (ããã·ã¥ '%s') ã¯å«ã¾ãã¦ãã¾ãã"
#: netsync.cc:1945
#, c-format
@@ -2823,149 +2838,150 @@ msgstr "ã·ã³ã¯"
msgstr "ã·ã³ã¯"
#: netsync.cc:2314
-#, fuzzy, c-format
+#, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch"
-msgstr "netcmd dispatch ã®å¾ã§ãã¼ã¢ %s ã®å
¥åãããã¡ãããµãã¾ãã\n"
+msgstr "netcmd dispatch ã®å¾ã§ãã¼ã¢ %s ã®å
¥åãããã¡ãããµãã¾ãã"
#: netsync.cc:2326 netsync.cc:2425
-#, fuzzy, c-format
+#, c-format
msgid "protocol error while processing peer %s: '%s'"
-msgstr "ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºç\n"
+msgstr "ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºç"
#: netsync.cc:2332
-#, fuzzy, c-format
+#, c-format
msgid "error: %s"
-msgstr "ã¨ã©ã¼: %s\n"
+msgstr "ã¨ã©ã¼: %s"
#: netsync.cc:2396
-#, fuzzy, c-format
+#, c-format
msgid "connecting to %s"
-msgstr "%s ã«æ¥ç¶ä¸\n"
+msgstr "%s ã«æ¥ç¶ãã¦ãã¾ã"
#: netsync.cc:2440
-#, fuzzy, c-format
+#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting"
-msgstr "ãã¼ã¢ %s ã® I/O ãå¾
ã£ã¦ããéã«ã¿ã¤ã ã¢ã¦ã, åæä¸\n"
+msgstr "ãã¼ã¢ %s ã® I/O ãå¾
ã£ã¦ããéã«ã¿ã¤ã ã¢ã¦ã, åæãã¦ãã¾ã"
#: netsync.cc:2463
-#, fuzzy, c-format
+#, c-format
msgid "processing failure while talking to peer %s, disconnecting"
-msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã«å¦çã失æããåæä¸\n"
+msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã«å¦çã失æããåæãã¦ãã¾ã"
#: netsync.cc:2480
-#, fuzzy, c-format
+#, c-format
msgid "successful exchange with %s"
-msgstr "%s ã¨ã®äº¤æã«æå\n"
+msgstr "%s ã¨ã®äº¤æã«æå"
#: netsync.cc:2486
-#, fuzzy, c-format
+#, c-format
msgid "peer %s disconnected after we informed them of error"
-msgstr "ãã¼ã¢ %s ã«ã¨ã©ã¼ãå ±åå¾ã«åæããã¾ãã\n"
+msgstr "ãã¼ã¢ %s ã«ã¨ã©ã¼ãå ±åå¾ã«åæããã¾ãã"
#: netsync.cc:2491
-#, fuzzy, c-format
+#, c-format
msgid "I/O failure while talking to peer %s, disconnecting"
-msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã« I/O ã®å¤±æãåæä¸\n"
+msgstr "ãã¼ã¢ %s ã¨éä¿¡ä¸ã« I/O ã®å¤±æãåæãã¦ãã¾ã"
#: netsync.cc:2557
-#, fuzzy, c-format
+#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad"
-msgstr "ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçã誤ãã¨ãã¦å°ä»ã\n"
+msgstr ""
+"ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçã誤ãã¨ãã¦å°ä»ããã¦ãã¾ã"
#: netsync.cc:2589
-#, fuzzy, c-format
+#, c-format
msgid "accepted new client connection from %s : %s"
-msgstr "%s : %s ããã®æ°ããã¯ã©ã¤ã¢ã³ãæ¥ç¶ãåç\n"
+msgstr "%s : %s ããã®æ°ããã¯ã©ã¤ã¢ã³ãæ¥ç¶ãåçãã¾ãã"
#: netsync.cc:2626
-#, fuzzy, c-format
+#, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting"
-msgstr "ãã¼ã¢ %s: '%s' ãããå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçãåæä¸\n"
+msgstr "ãã¼ã¢ %s: '%s' ãããå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçãåæãã¦ãã¾ã"
#: netsync.cc:2637
-#, fuzzy, c-format
+#, c-format
msgid "peer %s read failed in working state (error)"
-msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æ (ã¨ã©ã¼)\n"
+msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æãã¾ãã (ã¨ã©ã¼)"
#: netsync.cc:2642
-#, fuzzy, c-format
+#, c-format
msgid ""
"peer %s read failed in shutdown state (possibly client misreported error)"
msgstr ""
-"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æ (ããããã¯ã©ã¤ã¢ã³"
-"ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)\n"
+"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æãã¾ãã (ããããã¯"
+"ã©ã¤ã¢ã³ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)"
#: netsync.cc:2648
-#, fuzzy, c-format
+#, c-format
msgid "peer %s read failed in confirmed state (success)"
-msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ç¢ºèªã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æ (æå)\n"
+msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ç¢ºèªã¹ãã¼ãã§èªã¿è¾¼ã¿ã«å¤±æãã¾ãã (æå)"
#: netsync.cc:2669
-#, fuzzy, c-format
+#, c-format
msgid "peer %s write failed in working state (error)"
-msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æ (ã¨ã©ã¼)\n"
+msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ã¯ã¼ãã³ã°ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æãã¾ãã (ã¨ã©ã¼)"
#: netsync.cc:2674
-#, fuzzy, c-format
+#, c-format
msgid ""
"peer %s write failed in shutdown state (possibly client misreported error)"
msgstr ""
-"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æ (ããããã¯ã©ã¤ã¢ã³"
-"ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)\n"
+"ãã¼ã¢ %s ã«ã¤ãã¦ã·ã£ãããã¦ã³ã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æãã¾ãã (ããããã¯"
+"ã©ã¤ã¢ã³ãã®èª¤ã£ãã¨ã©ã¼å ±åã§ã)"
#: netsync.cc:2680
-#, fuzzy, c-format
+#, c-format
msgid "peer %s write failed in confirmed state (success)"
-msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ç¢ºèªã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æ (æå)\n"
+msgstr "ãã¼ã¢ %s ã«ã¤ãã¦ç¢ºèªã¹ãã¼ãã§æ¸ãè¾¼ã¿ã«å¤±æãã¾ãã (æå)"
#: netsync.cc:2707
-#, fuzzy, c-format
+#, c-format
msgid "peer %s processing finished, disconnecting"
-msgstr "ãã¼ã¢ %s å¦ççµäºãåæä¸\n"
+msgstr "ãã¼ã¢ %s å¦ççµäºãåæãã¦ãã¾ã"
#: netsync.cc:2729
-#, fuzzy, c-format
+#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting"
-msgstr "fd %d (ãã¼ã¢ %s) ã¯ã¢ã¤ãã«æéãé·ããã¾ããåæä¸\n"
+msgstr "fd %d (ãã¼ã¢ %s) ã¯ã¢ã¤ãã«æéãé·ããã¾ããåæãã¦ãã¾ã"
#: netsync.cc:2797
-#, fuzzy, c-format
+#, c-format
msgid "beginning service on %s : %s"
-msgstr "%s : %s ã§ãµã¼ãã¹ãéå§\n"
+msgstr "%s : %s ã§ãµã¼ãã¹ãéå§ãã¦ãã¾ã"
#: netsync.cc:2798
msgid ""
msgstr "<ãã¹ã¦ã®ã¤ã³ã¿ã¼ãã§ã¼ã¹>"
#: netsync.cc:2812
-#, fuzzy, c-format
+#, c-format
msgid "session limit %d reached, some connections will be refused"
-msgstr "ã»ãã·ã§ã³å¶é %d ã«éãã¾ãããããã¤ãã®æ¥ç¶ã¯æå¦ããã¾ã\n"
+msgstr "ã»ãã·ã§ã³å¶é %d ã«éãã¾ãããããã¤ãã®æ¥ç¶ã¯æå¦ããã¾ã"
#: netsync.cc:2879
-#, fuzzy, c-format
+#, c-format
msgid "Network error on peer %s, disconnecting"
-msgstr "ãã¼ã¢ %s ãã OOB ãã¼ã¿ãåä¿¡ãåæä¸\n"
+msgstr "ãã¼ã¢ %s ã§ãããã¯ã¼ã¯ã¨ã©ã¼ãåæãã¦ãã¾ã"
#: netsync.cc:2885
-#, fuzzy, c-format
+#, c-format
msgid "got OOB from peer %s, disconnecting"
-msgstr "ãã¼ã¢ %s ãã OOB ãã¼ã¿ãåä¿¡ãåæä¸\n"
+msgstr "ãã¼ã¢ %s ãã OOB ãã¼ã¿ãåä¿¡ãåæãã¦ãã¾ã"
#: netsync.cc:2945
-#, fuzzy, c-format
+#, c-format
msgid "beginning service on %s"
-msgstr "%s : %s ã§ãµã¼ãã¹ãéå§\n"
+msgstr "%s ã§ãµã¼ãã¹ãéå§ãã¦ãã¾ã"
#: netsync.cc:3008
-#, fuzzy, c-format
+#, c-format
msgid "got some OOB data on fd %d (peer %s), disconnecting"
-msgstr "ãã¼ã¢ %s ãã OOB ãã¼ã¿ãåä¿¡ããåæä¸\n"
+msgstr "fd %d (ãã¼ã¢ %s) 㧠OOB ãã¼ã¿ãåä¿¡ãåæãã¦ãã¾ã"
#: netsync.cc:3057
-#, fuzzy, c-format
+#, c-format
msgid "finding items to synchronize:"
-msgstr "åæã¢ã¤ãã ãæ¤ç´¢ä¸:\n"
+msgstr "åæã¢ã¤ãã ãæ¤ç´¢ãã¦ãã¾ã:"
#: netsync.cc:3065
msgid "certificates"
@@ -2977,22 +2993,22 @@ msgstr "éµ '%s' ãã¿ã¤ãããã¨ã
msgstr "éµ '%s' ãã¿ã¤ãããã¨ãã§ãã¾ãã"
#: netsync.cc:3218
-#, fuzzy, c-format
+#, c-format
msgid ""
"include branch pattern contains a quote character:\n"
"%s"
msgstr ""
"å¼ç¨ç¬¦ãå«ããã©ã³ããã¿ã¼ã³ãå«ãã:\n"
-"%s\n"
+"%s"
#: netsync.cc:3224
-#, fuzzy, c-format
+#, c-format
msgid ""
"exclude branch pattern contains a quote character:\n"
"%s"
msgstr ""
-"å¼ç¨ç¬¦ãå«ããã©ã³ããã¿ã¼ã³ãå«ããªã:\n"
-"%s\n"
+"å¼ç¨ç¬¦ãå«ããã©ã³ããã¿ã¼ã³ãé¤å¤:\n"
+"%s"
#: netsync.cc:3259 netsync.cc:3263
#, c-format
@@ -3005,24 +3021,24 @@ msgid "block size in bytes for \"automat
#: options_list.hh:27
msgid "block size in bytes for \"automate stdio\" output"
-msgstr ""
+msgstr "\"automate stdio\" ã«ã¤ãã¦ãããã¯ãµã¤ãºããã¤ãã§åºå"
#: options_list.hh:32 options_list.hh:317 options_list.hh:360
#, c-format
msgid "cannot be zero or negative"
-msgstr ""
+msgstr "ã¼ãã¾ãã¯è² ã«ã¯ã§ãã¾ãã"
#: options_list.hh:43
msgid "address:port to listen on (default :4691)"
-msgstr "å¾
æ©ãã ã¢ãã¬ã¹:ãã¼ã (ããã©ã«ã: 4691)"
+msgstr "å¾
æ©ãããã¢ãã¬ã¹:ãã¼ã (ããã©ã«ã: 4691)"
#: options_list.hh:80
msgid "disable transport authentication"
-msgstr ""
+msgstr "ãã©ã³ã¹ãã¼ãèªè¨¼ãç¡å¹ã«ãã"
#: options_list.hh:87
msgid "serve netsync on stdio"
-msgstr ""
+msgstr "stdio 㧠netsync ãæä¾"
#: options_list.hh:96
msgid "select branch cert for operation"
@@ -3055,7 +3071,7 @@ msgid "cannot be negative"
#: options_list.hh:164
#, c-format
msgid "cannot be negative"
-msgstr ""
+msgstr "è² ã«ã¯ã§ãã¾ãã"
#: options_list.hh:173
msgid "argument to pass external diff hook"
@@ -3075,7 +3091,7 @@ msgid "do not show the function containi
#: options_list.hh:204
msgid "do not show the function containing each block of changes"
-msgstr ""
+msgstr "å¤æ´ã®åãããã¯ãå«ãé¢æ°ã表示ããªã"
#: options_list.hh:211
msgid "print diffs along with logs"
@@ -3087,7 +3103,7 @@ msgid "don't perform the operation, just
#: options_list.hh:228
msgid "don't perform the operation, just show what would have happened"
-msgstr ""
+msgstr "æä½ãå®è¡ãããåã«ä½ãèµ·ãããã示ã"
#: options_list.hh:236
msgid "file to dump debugging log to, on failure"
@@ -3110,9 +3126,8 @@ msgstr "ãã«ãã¡ãã»ã¼ã¸ã表ç¤
msgstr "ãã«ãã¡ãã»ã¼ã¸ã表示"
#: options_list.hh:277
-#, fuzzy
msgid "include anything described by its argument"
-msgstr "å¼æ°ã«ãã£ã¦èª¬æããããã¹ã¦ãçã"
+msgstr "å¼æ°ã«ãã£ã¦èª¬æããããã¹ã¦ãå«ãã"
#: options_list.hh:285
msgid "set key for signatures"
@@ -3156,7 +3171,7 @@ msgid "do not ignore any files"
#: options_list.hh:373
msgid "do not ignore any files"
-msgstr ""
+msgstr "ã©ã®ãã¡ã¤ã«ãç¡è¦ããªã"
#: options_list.hh:381
msgid "exclude merges when printing logs"
@@ -3176,18 +3191,16 @@ msgstr "ãµã¼ãã¼ã®ããã»ã¹ ID ã
msgstr "ãµã¼ãã¼ã®ããã»ã¹ ID ãè¨é²"
#: options_list.hh:413
-#, fuzzy
msgid "suppress verbose, informational and progress messages"
-msgstr "ãã°ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
+msgstr "åé·ãæ
å ±ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
#: options_list.hh:423
msgid "load extra rc file"
msgstr "å¥ã®åæåãã¡ã¤ã«ãèªã¿è¾¼ã"
#: options_list.hh:431
-#, fuzzy
msgid "suppress warning, verbose, informational and progress messages"
-msgstr "ãã°ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
+msgstr "è¦åãåé·ãæ
å ±ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
#: options_list.hh:441
msgid "also operate on the contents of any listed directories"
@@ -3212,25 +3225,29 @@ msgid "argument must be 'none', 'dot', o
#: options_list.hh:485
#, c-format
msgid "argument must be 'none', 'dot', or 'count'"
-msgstr ""
+msgstr "å¼æ°ã¯ 'none' ã¾ã㯠'dot'ã'count' ã§ãªããã°ããã¾ãã"
#: options_list.hh:489
+msgid "revision(s) to start logging at"
+msgstr "ãã°åå¾ãéå§ãããªãã¸ã§ã³"
+
+#: options_list.hh:496
msgid "revision(s) to stop logging at"
-msgstr ""
+msgstr "ãã°åå¾ãåæ¢ãããªãã¸ã§ã³"
-#: options_list.hh:497
+#: options_list.hh:504
msgid "perform the operations for unknown files from workspace"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã§ã¯ä¸æãªãã¡ã¤ã«ã«ã¤ãã¦æä½ãå®è¡"
-#: options_list.hh:506
+#: options_list.hh:513
msgid "verbose completion output"
msgstr "åé·ãªå®äºã¡ãã»ã¼ã¸"
-#: options_list.hh:514
+#: options_list.hh:521
msgid "print version number, then exit"
msgstr "ãã¼ã¸ã§ã³çªå·ã表示ããçµäº"
-#: options_list.hh:522
+#: options_list.hh:529
msgid "insert command line arguments taken from the given file"
msgstr "æå®ã®ãã¡ã¤ã«ã®å
容ãã³ãã³ãè¡å¼æ°ã«æ¿å
¥"
@@ -3245,44 +3262,44 @@ msgstr "å·®å '%s' -> '%s' ãç ´æ£ã
msgstr "å·®å '%s' -> '%s' ãç ´æ£ãã¦ãã¾ã"
#: packet.cc:139
-#, fuzzy, c-format
+#, c-format
msgid "missing prerequisite revision '%s'"
-msgstr "å¿
é æ¡ä»¶ã¨ãªããªãã¸ã§ã³ '%s' ãã¿ã¤ããã¾ãã\n"
+msgstr "å¿
é æ¡ä»¶ã¨ãªããªãã¸ã§ã³ '%s' ãã¿ã¤ããã¾ãã"
#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175
-#, fuzzy, c-format
+#, c-format
msgid "dropping revision '%s'"
-msgstr "ãªãã¸ã§ã³ '%s' ãç ´æ£ãã¦ãã¾ã\n"
+msgstr "ãªãã¸ã§ã³ '%s' ãç ´æ£ãã¦ãã¾ã"
#: packet.cc:150
-#, fuzzy, c-format
+#, c-format
msgid "missing prerequisite file '%s'"
-msgstr "å¿
é ã¨ãªããã¡ã¤ã« '%s' ãã¿ã¤ããã¾ãã\n"
+msgstr "å¿
é ã¨ãªããã¡ã¤ã« '%s' ãã¿ã¤ããã¾ãã"
#: packet.cc:165
-#, fuzzy, c-format
+#, c-format
msgid "missing prerequisite file pre-delta '%s'"
-msgstr "å¿
é ã¨ãªããã¡ã¤ã«ã®ãã¬å·®å '%s' ãã¿ã¤ããã¾ãã\n"
+msgstr "å¿
é ã¨ãªããã¡ã¤ã«ã®ãã¬å·®å '%s' ãã¿ã¤ããã¾ãã"
#: packet.cc:173
-#, fuzzy, c-format
+#, c-format
msgid "missing prerequisite file post-delta '%s'"
-msgstr "å¿
é ã¨ãªããã¡ã¤ã«ã®ãã¹ãå·®å '%s' ãã¿ã¤ããã¾ãã\n"
+msgstr "å¿
é ã¨ãªããã¡ã¤ã«ã®ãã¹ãå·®å '%s' ãã¿ã¤ããã¾ãã"
#: packet.cc:201
-#, fuzzy, c-format
+#, c-format
msgid "cert revision '%s' does not exist in db"
-msgstr "ãã¼ã¿ãã¼ã¹ã«è¨¼æãªãã¸ã§ã³ '%s' ã¯å«ã¾ãã¦ãã¾ãã\n"
+msgstr "ãã¼ã¿ãã¼ã¹ã«è¨¼æãªãã¸ã§ã³ '%s' ã¯å«ã¾ãã¦ãã¾ãã"
#: packet.cc:203
-#, fuzzy, c-format
+#, c-format
msgid "dropping cert"
-msgstr "証æãç ´æ£ãã¦ãã¾ã\n"
+msgstr "証æãç ´æ£ãã¦ãã¾ã"
#: packet.cc:226
-#, fuzzy, c-format
+#, c-format
msgid "key '%s' is not equal to key '%s' in database"
-msgstr "éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã®éµ '%s' ã¨ä¸è´ãã¾ãã\n"
+msgstr "éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã®éµ '%s' ã¨ä¸è´ãã¾ãã"
#: packet.cc:350
#, c-format
@@ -3295,34 +3312,34 @@ msgstr "ä¸æãªãã±ããå: '%s'"
msgstr "ä¸æãªãã±ããå: '%s'"
#: rcs_file.cc:354
-#, fuzzy, c-format
+#, c-format
msgid "parse failure %d:%d: expecting %s, got %s with value '%s'"
-msgstr "解æ失æ %d:%d: æå¾
å¤ %sãåå¾ %s (å¤ '%s')\n"
+msgstr "解æ失æ %d:%d: æå¾
å¤ %sãåå¾ %s (å¤ '%s')"
#: rcs_file.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "parse failure %d:%d: expecting word '%s'"
-msgstr "解æ失æ %d:%d: æå¾
ãããèªå¥ '%s'\n"
+msgstr "解æ失æ %d:%d: æå¾
ãããèªå¥ '%s'"
#: rcs_file.cc:388
-#, fuzzy, c-format
+#, c-format
msgid "parse failure %d:%d: expecting word"
-msgstr "解æ失æ %d:%d: æå¾
ãããèªå¥\n"
+msgstr "解æ失æ %d:%d: æå¾
ãããèªå¥"
#: rcs_import.cc:721
-#, fuzzy, c-format
+#, c-format
msgid "parsing RCS file %s"
-msgstr "RCS ãã¡ã¤ã« %s ã解æä¸\n"
+msgstr "RCS ãã¡ã¤ã« %s ã解æãã¦ãã¾ã"
#: rcs_import.cc:724
-#, fuzzy, c-format
+#, c-format
msgid "parsed RCS file %s OK"
-msgstr "解æãã RCS ãã¡ã¤ã« %s: OK\n"
+msgstr "解æãã RCS ãã¡ã¤ã« %s: OK"
#: rcs_import.cc:913
-#, fuzzy, c-format
+#, c-format
msgid "error reading RCS file %s: %s"
-msgstr "RCS ãã¡ã¤ã« %s ãèªã¿è¾¼ã¿ä¸ã«ã¨ã©ã¼: %s\n"
+msgstr "RCS ãã¡ã¤ã« %s ãèªã¿è¾¼ã¿ä¸ã«ã¨ã©ã¼: %s"
#: rcs_import.cc:1210
#, c-format
@@ -3350,65 +3367,64 @@ msgid "conflicting include/exclude on pa
#: restrictions.cc:60 restrictions.cc:77
#, c-format
msgid "conflicting include/exclude on path '%s'"
-msgstr ""
+msgstr "ãã¹ '%s' ã«ã¤ãã¦å«ãã/é¤å¤ã競åãã¦ãã¾ã"
#: restrictions.cc:103 restrictions.cc:141
-#, fuzzy, c-format
+#, c-format
msgid "restriction includes unknown path '%s'"
-msgstr "ä¸æãªãã¹ '%s'\n"
+msgstr "ä¸æãªãã¹ '%s' ãå«ããå¶ç´"
#: restrictions.cc:114 restrictions.cc:155
-#, fuzzy, c-format
+#, c-format
msgid "restriction excludes unknown path '%s'"
-msgstr "ä¸æãªãã¹ '%s'\n"
+msgstr "ä¸æãªãã¹ '%s' ãé¤å¤ããå¶ç´"
#: restrictions.cc:118 restrictions.cc:159
-#, fuzzy, c-format
+#, c-format
msgid "%d unknown path"
msgid_plural "%d unknown paths"
-msgstr[0] "ä¸æãªãã¹ '%s'\n"
-msgstr[1] "ä¸æãªãã¹ '%s'\n"
+msgstr[0] "ä¸æãªãã¹: %d"
#: revision.cc:841
-#, fuzzy, c-format
+#, c-format
msgid "scanning for bogus merge edges"
-msgstr "å½ãã®çµ±åå
端ãèµ°æ»ä¸\n"
+msgstr "å½ãã®çµ±åå
端ãèµ°æ»ãã¦ãã¾ã"
#: revision.cc:883
-#, fuzzy, c-format
+#, c-format
msgid "optimizing out redundant edge %d -> %d"
-msgstr "åé·ãªå
端 %d -> %d ãæé©åä¸\n"
+msgstr "åé·ãªå
端 %d -> %d ãæé©åãã¦ãã¾ã"
#: revision.cc:892
-#, fuzzy, c-format
+#, c-format
msgid "failed to eliminate edge %d -> %d"
-msgstr "å
端 %d -> %d ã®é¤å»ã«å¤±æ\n"
+msgstr "å
端 %d -> %d ã®é¤å»ã«å¤±æãã¾ãã"
#: revision.cc:903
-#, fuzzy, c-format
+#, c-format
msgid "rebuilding %d nodes"
-msgstr "åæ§ç¯ä¸: %d ãã¼ã\n"
+msgstr "åæ§ç¯ãã¦ãã¾ã: %d ãã¼ã"
#: revision.cc:1108
-#, fuzzy, c-format
+#, c-format
msgid "Path %s added to child roster multiple times"
-msgstr "ãã¹ %s ãåã®åç°¿ã«è¤æ°å追å ããã¾ãã\n"
+msgstr "ãã¹ %s ãåã®åç°¿ã«è¤æ°å追å ããã¾ãã"
#: revision.cc:1121
-#, fuzzy, c-format
+#, c-format
msgid "Directory for path %s cannot be added, as there is a file in the way"
msgstr ""
-"éªéã«ãªã£ã¦ãããã¡ã¤ã«ãããã®ã§ããã¹ %s ã®ãã£ã¬ã¯ããªã追å ã§ãã¾ãã\n"
+"éªéã«ãªã£ã¦ãããã¡ã¤ã«ãããã®ã§ããã¹ %s ã®ãã£ã¬ã¯ããªã追å ã§ãã¾ãã"
#: revision.cc:1132
-#, fuzzy, c-format
+#, c-format
msgid "Path %s cannot be added, as there is a directory in the way"
-msgstr "éªéã«ãªã£ã¦ãããã£ã¬ã¯ããªãããã®ã§ ãã¹ %s ã追å ã§ãã¾ãã\n"
+msgstr "éªéã«ãªã£ã¦ãããã£ã¬ã¯ããªãããã®ã§ ãã¹ %s ã追å ã§ãã¾ãã"
#: revision.cc:1135
-#, fuzzy, c-format
+#, c-format
msgid "Path %s added twice with differing content"
-msgstr "ç°ãªãå
容ã§ãã¹ %s ãäºå追å ãã¦ãã¾ã\n"
+msgstr "ç°ãªãå
容ã§ãã¹ %s ãäºå追å ãã¦ãã¾ã"
#: revision.cc:1422
#, c-format
@@ -3424,34 +3440,34 @@ msgstr ""
"ãããæ¬å½ã®ã¨ãããã®ã¾ã¾ã«ãã¦ããã¦ãããæ¹ã解決ã«ã¯å½¹ç«ã¡ã¾ãã)"
#: revision.cc:1535
-#, fuzzy, c-format
+#, c-format
msgid "converting existing revision graph to new roster-style revisions"
msgstr ""
-"æ¢åã®ãªãã¸ã§ã³ã®ã°ã©ããæ°ããåç°¿ã¹ã¿ã¤ã«ã®ãªãã¸ã§ã³ã«å¤æãã¦ãã¾ã\n"
+"æ¢åã®ãªãã¸ã§ã³ã®ã°ã©ããæ°ããåç°¿ã¹ã¿ã¤ã«ã®ãªãã¸ã§ã³ã«å¤æãã¦ãã¾ã"
#: revision.cc:1590
-#, fuzzy, c-format
+#, c-format
msgid "rebuilding revision graph from manifest certs"
-msgstr "ãããã§ã¹ã証æãããªãã¸ã§ã³ã°ã©ããå度æ§æä¸\n"
+msgstr "ãããã§ã¹ã証æãããªãã¸ã§ã³ã°ã©ããåæ§æãã¦ãã¾ã"
#: revision.cc:1668
#, c-format
msgid "regenerating cached rosters and heights"
-msgstr ""
+msgstr "åç°¿ã¨é«ãã®ãã£ãã·ã¥ãåçæãã¦ãã¾ã"
#: revision.cc:1680
msgid "regenerated"
-msgstr ""
+msgstr "åçæãã¾ãã"
#: revision.cc:1696
#, c-format
msgid "finished regenerating cached rosters and heights"
-msgstr ""
+msgstr "åç°¿ã¨é«ãã®ãã£ãã·ã¥ã®åçæãå®äºãã¾ãã"
#: revision.cc:1708
#, c-format
msgid "cached height: %s"
-msgstr ""
+msgstr "ãã£ãã·ã¥ãããé«ã: %s"
#: revision.cc:1791
#, c-format
@@ -3483,14 +3499,14 @@ msgstr "%s:%d: invariant '%s' violated"
msgstr "%s:%d: invariant '%s' violated"
#: sanity.cc:255
-#, fuzzy, c-format
+#, c-format
msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d"
-msgstr "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
+msgstr "%s:%d: ç´¢å¼ '%s' = %d ãªã¼ãã¼ããã¼ãã¯ã¿ '%s' (ãµã¤ãº %d)"
#: sanity.cc:276
-#, fuzzy, c-format
+#, c-format
msgid "Current work set: %i items"
-msgstr "ç¾å¨ã®ä½æ¥ã»ãã: %i ã¢ã¤ãã \n"
+msgstr "ç¾å¨ã®ä½æ¥ã»ãã: %i ã¢ã¤ãã "
#: schema_migration.cc:258
#, c-format
@@ -3537,49 +3553,49 @@ msgstr "çµ±åå¾ã®ããã¥ã¼ã å¦ç
msgid "error vacuuming after migration"
msgstr "çµ±åå¾ã®ããã¥ã¼ã å¦çä¸ã«ã¨ã©ã¼"
-#: schema_migration.cc:323
+#: schema_migration.cc:329
#, c-format
-msgid "error running analyze after migration"
-msgstr "çµ±åå¾ã«è§£æå®è¡ä¸ã«ã¨ã©ã¼"
-
-#: schema_migration.cc:332
-#, c-format
msgid ""
"NOTE: because this database was last used by a rather old version\n"
"of monotone, you're not done yet. If you're a project leader, then\n"
"see the file UPGRADE for instructions on running '%s db %s'"
msgstr ""
+"注æ: ãã®ãã¼ã¿ãã¼ã¹ããå¤ããã¼ã¸ã§ã³ã® monotone ã§\n"
+"æå¾ã«ä½¿ç¨ããããããæä½ãå®äºãã¦ãã¾ãããããªããããã¸ã§ã¯ã\n"
+"ãªã¼ãã¼ãªãããã¡ã¤ã« UPGRADE ã® '%s db %s' ã®å®è¡ã®èª¬æãè¦ã¦ä¸ããã"
-#: schema_migration.cc:339
+#: schema_migration.cc:336
#, c-format
msgid ""
"NOTE: this upgrade cleared monotone's caches\n"
"you should now run '%s db regenerate_caches'"
msgstr ""
+"注æ: ãã®æ´æ°ã«ãã£ã¦ monotone ã®ãã£ãã·ã¥ã¯ã¯ãªã¢\n"
+"ããã¾ããã'%s db regenerate_caches' ãå®è¡ãã¦ä¸ãã"
-#: schema_migration.cc:352
+#: schema_migration.cc:349
#, c-format
msgid "database schema %s is unknown; cannot perform migration"
msgstr "ä¸æãªãã¼ã¿ãã¼ã¹ã¹ãã¼ã %s; çµ±åã§ãã¾ãã"
-#: schema_migration.cc:357
-#, fuzzy, c-format
+#: schema_migration.cc:354
+#, c-format
msgid "no migration performed; database schema already up-to-date at %s"
-msgstr "çµ±åãã¾ãã; ãã¼ã¿ãã¼ã¹ã¹ãã¼ãã¯æ¢ã«ææ°ã«ãªã£ã¦ãã¾ã: %s\n"
+msgstr "çµ±åãã¾ããããã¼ã¿ãã¼ã¹ã¹ãã¼ãã¯æ¢ã«ææ°ã«ãªã£ã¦ãã¾ã: %s"
-#: schema_migration.cc:916
+#: schema_migration.cc:913
#, c-format
msgid "public and private keys for %s don't match"
msgstr "%s ã®å
¬ééµã¨ç§å¯éµãä¸è´ãã¾ãã"
-#: schema_migration.cc:919
+#: schema_migration.cc:916
#, c-format
msgid "moving key '%s' from database to %s"
msgstr "éµ '%s' ããã¼ã¿ãã¼ã¹ãã %s ã«ç§»åãã¦ãã¾ã"
#: std_hooks.lua:39
msgid "Press enter"
-msgstr ""
+msgstr "[Enter] ãæ¼ãã¦ä¸ãã"
#: std_hooks.lua:41
msgid "Press enter when the subprocess has completed"
@@ -3612,10 +3628,10 @@ msgid "warning: "
#: ui.cc:466
msgid "warning: "
-msgstr ""
+msgstr "è¦å: "
#: ui.cc:477
-#, fuzzy, c-format
+#, c-format
msgid ""
"fatal: %s\n"
"this is almost certainly a bug in monotone.\n"
@@ -3625,22 +3641,22 @@ msgstr ""
"æ·±å»: %s\n"
"ããã¯ã»ã¼ç¢ºå®ã« monotone ã®ãã°ã§ãããã\n"
"ãã®ã¨ã©ã¼ã¡ãã»ã¼ã¸ã¨ '%s --full-version' ã®çµæ㨠%s ã«ã¤ãã¦\n"
-"ä½ãããã説æãæ·»ãã¦å ±åãã¦ä¸ãã\n"
+"ä½ãããã説æãæ·»ãã¦å ±åãã¦ä¸ããã"
#: ui.cc:581
-#, fuzzy, c-format
+#, c-format
msgid "failed to open log file '%s'"
-msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®è§£æã«å¤±æ"
+msgstr "ãã°ãã¡ã¤ã« '%s' ãéãã¾ããã§ãã"
#: uri.cc:63
#, c-format
msgid "The URI syntax is invalid. Maybe you used an URI in scp-style?"
-msgstr ""
+msgstr "URL æ§æãä¸æ£ã§ããscp å½¢å¼ã® URI ã使ã£ã¦ãã¾ããã?"
#: update.cc:72
-#, fuzzy, c-format
+#, c-format
msgid "failed to decode boolean testresult cert value '%s'"
-msgstr "ãã¹ãçµæçå½å¤ã®è¨¼æå¤ '%s' ã®ãã³ã¼ãã«å¤±æãã¾ãã\n"
+msgstr "çå½å¤ã®ãã¹ãçµæã®è¨¼æå¤ '%s' ã®ãã³ã¼ãã«å¤±æãã¾ãã"
#: update.cc:166
#, c-format
@@ -3663,9 +3679,9 @@ msgstr "ä¸æ£ãªæå '%c' (ace æå
msgstr "ä¸æ£ãªæå '%c' (ace æåå '%s' å
)"
#: vocab.cc:92
-#, fuzzy, c-format
+#, c-format
msgid "bad character '%c' in symbol '%s'"
-msgstr "ä¸æ£ãªæå '%c' (ãã¼å '%s' å
)"
+msgstr "ä¸æ£ãªæå '%c' (ã·ã³ãã« '%s' å
)"
#: vocab.cc:103
#, c-format
@@ -3687,63 +3703,65 @@ msgstr "ä¸æ£ãª HMAC é· %d ãã¤ã"
msgid "Invalid hmac length of %d bytes"
msgstr "ä¸æ£ãª HMAC é· %d ãã¤ã"
-#: work.cc:88 work_migration.cc:180 work_migration.cc:200
-#, fuzzy, c-format
+#: work.cc:88 work_migration.cc:188 work_migration.cc:208
+#, c-format
msgid "workspace is corrupt: reading %s: %s"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ãèªã¿è¾¼ã¿ä¸: %s"
-#: work.cc:150
-#, fuzzy, c-format
-msgid "base revision %s does not exist in database"
-msgstr "ãã¼ã¿ãã¼ã¹ã«åºæºãªãã¸ã§ã³ %s ã¯å«ã¾ãã¦ãã¾ãã\n"
+#: work.cc:136
+#, c-format
+msgid "workspace base revision %s does not exist in database"
+msgstr "ãã¼ã¿ãã¼ã¹ã« %s ã¨ããåºæºãªãã¸ã§ã³ã¯å«ã¾ãã¦ãã¾ãã"
-#: work.cc:284
+#: work.cc:282
#, c-format
msgid "unrecognized key '%s' in options file %s - ignored"
-msgstr ""
+msgstr "èªèããã¦ããªãéµ '%s' (ãªãã·ã§ã³ãã¡ã¤ã« %s å
) - ç¡è¦ãã¾ãã"
-#: work.cc:291
-#, fuzzy, c-format
+#: work.cc:289
+#, c-format
msgid "Failed to read options file %s: %s"
-msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®è§£æã«å¤±æ"
+msgstr "ãªãã·ã§ã³ãã¡ã¤ã« %s ãèªã¿è¾¼ãã¾ããã§ãã: %s"
-#: work.cc:339
-#, fuzzy, c-format
+#: work.cc:337
+#, c-format
msgid "Failed to write options file %s: %s"
-msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®æ¸ãè¾¼ã¿ã«å¤±æ"
+msgstr "ãªãã·ã§ã³ãã¡ã¤ã« %s ã«æ¸ãè¾¼ãã¾ããã§ãã: %s"
-#: work.cc:541
+#: work.cc:539
#, c-format
msgid "skipping ignorable file %s"
msgstr "ç¡è¦ã§ãããã¡ã¤ã« %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:550
+#: work.cc:548
#, c-format
msgid "skipping %s, already accounted for in workspace"
msgstr "æ¢ã«ã¯ã¼ã¯ã¹ãã¼ã¹ã§æ°ã«å
¥ãããã¦ãã %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:561
+#: work.cc:559
#, c-format
msgid "adding %s to workspace manifest"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãã« %s ã追å ãã¦ãã¾ã"
-#: work.cc:567
+#: work.cc:565
#, c-format
msgid ""
"cannot add %s, because %s is recorded as a file in the workspace manifest"
msgstr ""
+"%s ã追å ã§ãã¾ããã%s ã¯ã¯ã¼ã¯ã¹ãã¼ã¹ãããã§ã¹ãå
ã«ãã¡ã¤ã«ã¨ãã¦è¨é²ã"
+"ãã¦ãã¾ãã"
-#: work.cc:682
+#: work.cc:680
#, c-format
msgid "dropping %s"
msgstr "%s ãç ´æ£ãã¦ãã¾ã"
-#: work.cc:693 work.cc:704
+#: work.cc:691 work.cc:702
#, c-format
msgid "path %s already exists"
msgstr "ãã¹ %s ã¯æ¢ã«ããã¾ã"
-#: work.cc:726 work.cc:756
+#: work.cc:724 work.cc:756
#, c-format
msgid "adding %s"
msgstr "%s ã追å ãã¦ãã¾ã"
@@ -3758,147 +3776,174 @@ msgstr "%s ãã %s ã«å称å¤æ´ãã
msgid "renaming %s to %s"
msgstr "%s ãã %s ã«å称å¤æ´ãã¦ãã¾ã"
-#: work.cc:787
+#: work.cc:788
#, c-format
msgid "file '%s' does not exist"
msgstr "ãã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-#: work.cc:788
+#: work.cc:789
#, c-format
msgid "file '%s' is a directory"
msgstr "ãã¡ã¤ã« '%s' ã¯ãã£ã¬ã¯ããªã§ã"
-#: work.cc:793
+#: work.cc:794
#, c-format
msgid "content of file '%s' has changed, not overwriting"
msgstr "ãã¡ã¤ã« '%s' ã®å
容ã¯å¤æ´ããã¦ããã®ã§ä¸æ¸ããã¾ãã"
-#: work.cc:794
-#, fuzzy, c-format
+#: work.cc:795
+#, c-format
msgid "modifying %s"
-msgstr "%s ã追å ãã¦ãã¾ã"
+msgstr "%s ãå¤æ´ãã¦ãã¾ã"
-#: work.cc:979
-#, fuzzy, c-format
-msgid "missing %s"
-msgstr "%s ã追å ãã¦ãã¾ã"
+#: work.cc:975
+#, c-format
+msgid "missing directory '%s'"
+msgstr "ã¿ã¤ãããªããã£ã¬ã¯ã㪠'%s'"
-#: work.cc:985
+#: work.cc:980
#, c-format
+msgid "not a directory '%s'"
+msgstr "'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
+
+#: work.cc:993
+#, c-format
+msgid "missing file '%s'"
+msgstr "ã¿ã¤ãããªããã¡ã¤ã« '%s'"
+
+#: work.cc:998
+#, c-format
+msgid "not a file '%s'"
+msgstr "'%s' ã¯ãã¡ã¤ã«ã§ã¯ããã¾ãã"
+
+#: work.cc:1009
+#, c-format
msgid ""
-"%d missing files; use '%s ls missing' to view\n"
-"To restore consistency, on each missing file run either\n"
-" '%s drop FILE' to remove it permanently, or\n"
-" '%s revert FILE' to restore it.\n"
+"%d missing items; use '%s ls missing' to view\n"
+"To restore consistency, on each missing item run either\n"
+" '%s drop ITEM' to remove it permanently, or\n"
+" '%s revert ITEM' to restore it.\n"
"To handle all at once, simply use\n"
" '%s drop --missing' or\n"
" '%s revert --missing'"
msgstr ""
+"ã¢ã¤ãã ã %d åã¿ã¤ããã¾ããã'%s ls missing' ã¨ããã¨\n"
+"ãªã¹ã表示ããã¾ããä¸è²«æ§ã復活ãããã«ã¯ã¿ã¤ãããªãåã
ã®\n"
+"ã¢ã¤ãã ã«ã¤ã㦠'%s drop ITEM' ã¨ãã¦æ°¸ä¹
ã«åé¤ããããã¾ãã¯\n"
+"'%s revert ITEM' ã¨ãã¦å¾©æ´»ããã¦ä¸ããã\n"
+"ä¸åº¦ã«ãã¹ã¦å¦çããã«ã¯ãåç´ã« '%s drop --missing' ã¾ãã¯\n"
+"'%s revert --missing' ã¨ãã¾ãã"
-#: work.cc:1131
+#: work.cc:1155
#, c-format
msgid "skipping %s, not currently tracked"
msgstr "追跡ããã¦ããªã %s ãã¹ããããã¦ãã¾ã"
-#: work.cc:1141
+#: work.cc:1165
#, c-format
msgid "cannot remove %s/, it is not empty"
msgstr "空ã§ã¯ãªãã®ã§ %s/ ãåé¤ã§ãã¾ãã"
-#: work.cc:1152
+#: work.cc:1176
#, c-format
msgid "dropping %s from workspace manifest"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ããã %s ãç ´æ£ãã¦ãã¾ã"
-#: work.cc:1205
-#, fuzzy, c-format
+#: work.cc:1229
+#, c-format
msgid "destination dir %s/ is not versioned (perhaps add it?)"
-msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã«ãã£ã¬ã¯ã㪠%s/ ã¯ããã¾ãã"
+msgstr ""
+"å
æ¹ã®ãã£ã¬ã¯ã㪠%s/ ã¯ãã¼ã¸ã§ã³ä»ãããã¦ãã¾ããã(追å ãã¾ããã?)"
-#: work.cc:1208
+#: work.cc:1232
#, c-format
msgid "destination %s is an existing file in current revision"
msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã« %s ã¯ããã¾ãã"
-#: work.cc:1218
+#: work.cc:1242
#, c-format
msgid "empty path %s is not allowed"
msgstr "ãã¹ %s ã¯ç©ºã«ã§ãã¾ãã"
-#: work.cc:1232
-#, fuzzy, c-format
+#: work.cc:1256
+#, c-format
msgid "%s does not exist in current manifest"
-msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã« %s ã¯ããã¾ãã"
+msgstr "ç¾å¨ã®ãããã§ã¹ãã« %s ã¯ããã¾ãã"
-#: work.cc:1235
-#, fuzzy, c-format
+#: work.cc:1259
+#, c-format
msgid "destination %s already exists in current manifest"
-msgstr "%s ã¯æ¢ã«ç¾å¨ã®ãªãã¸ã§ã³ã«ããã¾ã"
+msgstr "è¡ãå
%s ã¯æ¢ã«ç¾å¨ã®ãããã§ã¹ãã«å«ã¾ãã¦ãã¾ã"
-#: work.cc:1241
-#, fuzzy, c-format
+#: work.cc:1265
+#, c-format
msgid "destination directory %s does not exist in current manifest"
-msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã«ãã£ã¬ã¯ã㪠%s/ ã¯ããã¾ãã"
+msgstr "è¡ãå
ã® %s ã¨ãããã£ã¬ã¯ããªã¯ç¾å¨ã®ãããã§ã¹ãã«ã¯å«ã¾ãã¦ãã¾ãã"
-#: work.cc:1243
-#, fuzzy, c-format
+#: work.cc:1267
+#, c-format
msgid "destination directory %s is not a directory"
-msgstr "ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
+msgstr "è¡ãå
ã® %s ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-#: work.cc:1252
+#: work.cc:1276
#, c-format
msgid "renaming %s to %s in workspace manifest"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã®ãããã§ã¹ãå
ã® %s ã %s ã«å¤æ´ãã¦ãã¾ã"
-#: work.cc:1280
+#: work.cc:1304
#, c-format
msgid "%s doesn't exist in workspace, skipping"
msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹å
ã« %s ã¯ããã¾ããã®ã§ãã¹ããããã¾ã"
-#: work.cc:1284
+#: work.cc:1308
#, c-format
msgid "destination %s already exists in workspace, skipping"
msgstr "ãªãã¸ã§ã³ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ãã®ã§ãã¹ããããã¾ã"
-#: work.cc:1314
+#: work.cc:1338
#, c-format
msgid "proposed new root directory '%s' is not versioned or does not exist"
msgstr ""
"ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã¼ã¸ã§ã³ä»ãããã¦ããªãããåå¨"
"ãã¾ãã"
-#: work.cc:1316
+#: work.cc:1340
#, c-format
msgid "proposed new root directory '%s' is not a directory"
msgstr "ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-#: work.cc:1321
+#: work.cc:1345
#, c-format
msgid "proposed new root directory '%s' contains illegal path %s"
msgstr ""
"ææ¡ãããæ°ããã«ã¼ããã£ã¬ã¯ã㪠'%s' ã«ã¯ä¸æ£ãªãã¹ %s ãå«ã¾ãã¦ãã¾ã"
-#: work.cc:1331
+#: work.cc:1355
#, c-format
msgid "directory '%s' is not versioned or does not exist"
msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯ãã¼ã¸ã§ã³ä»ãããã¦ããªãããåå¨ãã¾ãã"
-#: work.cc:1337
+#: work.cc:1361
#, c-format
msgid "'%s' is in the way"
msgstr "'%s' ãéªéã«ãªã£ã¦ãã¾ã"
#: work_migration.cc:62
-#, fuzzy, c-format
+#, c-format
msgid "workspace required but not found"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ãå¿
è¦ã§ããã¿ã¤ããã¾ããã§ãã%s%s"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ãå¿
è¦ã§ããã¿ã¤ããã¾ãã"
-#: work_migration.cc:71
+#: work_migration.cc:74
#, c-format
+msgid "workspace is corrupt: %s is invalid"
+msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯ä¸æ£ã§ã"
+
+#: work_migration.cc:79
+#, c-format
msgid "_MTN/format should not exist in a format 1 workspace; corrected"
-msgstr ""
+msgstr "_MTN/format ã¯å½¢å¼ #1 ã®ã¯ã¼ã¯ã¹ãã¼ã¹ã«åå¨ããã¯ãã§ããä¿®æ£ãã¾ãã"
-#: work_migration.cc:108
+#: work_migration.cc:116
#, c-format
msgid ""
"this workspace's metadata is in format 0. to use this workspace\n"
@@ -3908,8 +3953,13 @@ msgstr ""
"with versions of monotone older than %s.\n"
"we apologize for the inconvenience."
msgstr ""
+"ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã®ã¡ã¿ãã¼ã¿ã®å½¢å¼ã¯ #0 ã§ãããã®ã¯ã¼ã¯ã¹ãã¼ã¹ã\n"
+"ãã®ãã¼ã¸ã§ã³ã® monotone ã§ä½¿ãã«ã¯ãã¡ã¿ãã¼ã¿ãåé¤ãã¦ãã§ãã¯\n"
+"ã¢ã¦ããç´ããªããã°ããã¾ããã(å½¢å¼ #0 ããã®ç§»è¡ã¯ç¡çã§ã)\n"
+"ä¸åº¦ããããã° %s ããå¤ã monotone ã§ã¯ã¯ã¼ã¯ã¹ãã¼ã¹ã使ããªã\n"
+"ãªãã¾ããä¸ä¾¿ã§æ¸ã¿ã¾ããã"
-#: work_migration.cc:117
+#: work_migration.cc:125
#, c-format
msgid ""
"to use this workspace with this version of monotone, its metadata\n"
@@ -3918,33 +3968,51 @@ msgstr ""
"once you have done this, you will not be able to use the workspace\n"
"with versions of monotone older than %s."
msgstr ""
+"ãã®ãã¼ã¸ã§ã³ã® monotone ã§ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã使ãã«ã¯ããã®\n"
+"ã¡ã¿ãã¼ã¿ãå½¢å¼ #%d ãã #%d ã«ç§»è¡ããªããã°ããã¾ãã (ã³ãã³ã\n"
+" '%s migrate_workspace' ã使ãã¾ã)ã\n"
+"ä¸åº¦ãããã㨠%s ããå¤ã monotone ã§ã¯ã¯ã¼ã¯ã¹ãã¼ã¹ã使ããªã\n"
+"ãªãã¾ãã"
-#: work_migration.cc:127 work_migration.cc:255
+#: work_migration.cc:135 work_migration.cc:263
#, c-format
msgid ""
"this version of monotone only understands workspace metadata\n"
"in formats 0 through %d. your workspace is in format %d.\n"
"you need a newer version of monotone to use this workspace."
msgstr ""
+"ãã®ãã¼ã¸ã§ã³ã® monotone ã¯ã¯ã¼ã¯ã¹ãã¼ã¹ã®ã¡ã¿ãã¼ã¿å½¢å¼ \n"
+"#0 ãã #%d ã¾ã§ã®ã¿ãç解ã§ãã¾ããããªãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å½¢å¼ #%d ã§ãã\n"
+"ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã使ãã«ã¯ããæ°ãããã¼ã¸ã§ã³ã® monotone ãå¿
è¦ã§ãã"
-#: work_migration.cc:156
+#: work_migration.cc:164
#, c-format
msgid ""
"it is not possible to migrate from workspace format 0 to any\n"
"later format. you must delete this workspace and check it out\n"
"again. we apologize for the inconvenience."
msgstr ""
+"ã¯ã¼ã¯ã¹ãã¼ã¹å½¢å¼ #0 ããä»»æã®å¾ã®å½¢å¼ã«ã¯ç§»è¡ã§ãã¾ããã\n"
+"ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ãåé¤ããå度ãã§ãã¯ã¢ã¦ããç´ããªããã°ããã¾ããã\n"
+"ä¸ä¾¿ã§æ¸ã¿ã¾ããã"
-#: work_migration.cc:208
-#, fuzzy, c-format
+#: work_migration.cc:216
+#, c-format
msgid "workspace is corrupt: %s exists but is not a regular file"
-msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
+msgstr ""
+"ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯ããã¾ããæ®éã®ãã¡ã¤ã«ã§ã¯ããã¾ãã"
-#: work_migration.cc:247
+#: work_migration.cc:255
#, c-format
msgid "this workspace is in the current format, no migration is necessary."
-msgstr ""
+msgstr "ãã®ã¯ã¼ã¯ã¹ãã¼ã¹ã¯ç¾å¨ã®å½¢å¼ã§ãã移è¡ã¯å¿
è¦ããã¾ããã"
+#~ msgid "error running analyze after migration"
+#~ msgstr "çµ±åå¾ã«è§£æå®è¡ä¸ã«ã¨ã©ã¼"
+
+#~ msgid "missing %s"
+#~ msgstr "%s ã追å ãã¦ãã¾ã"
+
#~ msgid "no hostname given"
#~ msgstr "ãã¹ãåãæå®ãã¦ä¸ãã"
@@ -3966,27 +4034,21 @@ msgstr ""
#~ msgid "need --branch argument for branch-based checkout"
#~ msgstr "ãã©ã³ããåºæºã«ãããã§ãã¯ã¢ã¦ãã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#, fuzzy
#~ msgid "roster %s is not parseable (perhaps with unnormalized paths?)"
#~ msgstr "åç°¿ %s ã解æã§ãã¾ãã (ãã¹ãæ£è¦åããã¦ããªãã®ã§ã¯?)\n"
-#, fuzzy
#~ msgid "roster %s is not in normalized form"
#~ msgstr "åç°¿ %s ã¯æ£è¦åãããå½¢å¼ã«ãªã£ã¦ãã¾ãã\n"
-#, fuzzy
#~ msgid "revision %s incomplete (missing roster link)"
#~ msgstr "ãªãã¸ã§ã³ %s ã¯ä¸å®å
¨ã§ã (åç°¿ã®ãªã³ã¯ãããã¾ãã)\n"
-#, fuzzy
#~ msgid "%d rosters not parseable (perhaps with invalid paths)"
#~ msgstr "解æã§ããªãåç°¿ (ãã¹ãä¸é©åãªã®ã§ã¯?): %d\n"
-#, fuzzy
#~ msgid "%d rosters not in normalized form"
#~ msgstr "æ£è¦åãããå½¢å¼ã«ãªã£ã¦ããªãåç°¿: %d\n"
-#, fuzzy
#~ msgid "%d unreferenced roster links"
#~ msgstr "åç
§ããã¦ããªãåç°¿ãªã³ã¯: %d\n"
@@ -4005,21 +4067,15 @@ msgstr ""
#~ msgid "syntax error near the \"%s\" option: %s"
#~ msgstr "\"%s\" ãªãã·ã§ã³ã®è¿ãã«æ§æã¨ã©ã¼: %s"
-#, fuzzy
#~ msgid "%s %s doesn't use the option %s"
#~ msgstr "monotone %s ã«ã¯ãªãã·ã§ã³ %s ã¯ä½¿ãã¾ãã"
-#~ msgid "workspace is corrupt: %s is a directory"
-#~ msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã¯å£ãã¦ãã¾ã: %s ã¯åå¨ãã¾ãã"
-
#~ msgid "Problem with workspace: %s is unreadable"
#~ msgstr "ã¯ã¼ã¯ã¹ãã¼ã¹ã«åé¡ãããã¾ã: %s ãèªã¿è¾¼ãã¾ãã"
-#, fuzzy
#~ msgid "starting with revision 1 / %d"
#~ msgstr "ãªãã¸ã§ã³ 1 / %d ã«ã¤ãã¦ä½æ¥éå§\n"
-#, fuzzy
#~ msgid "merging with revision %d / %d"
#~ msgstr "ãªãã¸ã§ã³ %d / %d ã«ã¤ãã¦çµ±åä¸\n"