# # # patch "ChangeLog" # from [3c31906c5e2bdafc631757c3abb90bbc623051ae] # to [11160e2f24c8d19b939bfac56e7c6eb443a2bb86] # # patch "po/sv.po" # from [5f266aae529bdbc037431acac2c5fc0178dbade4] # to [6135d5323c6a3b6a79244e4e62d773c5293a3029] # ============================================================ --- ChangeLog 3c31906c5e2bdafc631757c3abb90bbc623051ae +++ ChangeLog 11160e2f24c8d19b939bfac56e7c6eb443a2bb86 @@ -1,5 +1,9 @@ 2006-06-20 Richard Levitte + * po/sv.po: A fuzzy to clear. + +2006-06-20 Richard Levitte + * cmd_automate.cc (AUTOMATE(interface_version),AUTOMATE(stdio)), cmd_list.cc (AUTOMATE(keys)): Don't send an empty string to gettext. Here's what xgettext said: ============================================================ --- po/sv.po 5f266aae529bdbc037431acac2c5fc0178dbade4 +++ po/sv.po 6135d5323c6a3b6a79244e4e62d773c5293a3029 @@ -145,8 +145,8 @@ msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-18 00:28+0200\n" -"PO-Revision-Date: 2006-06-18 00:31+0200\n" +"POT-Creation-Date: 2006-06-20 01:24+0200\n" +"PO-Revision-Date: 2006-06-20 01:23+0200\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -279,85 +279,27 @@ "multiple branch certs found for revision %s, please provide a branch name" msgstr "flera grencert funna för revision %s, var god ange en gren" -#: cmd_automate.cc:203 +#: cmd_automate.cc:205 #, c-format msgid "read from client failed with error code: %d" msgstr "läsning från klienten misslyckades med följande felkod: %d" -#: cmd_automate.cc:246 +#: cmd_automate.cc:248 #, c-format msgid "Bad input to automate stdio" msgstr "felaktigt indata till automate stdio" -#: cmd_automate.cc:294 +#: cmd_automate.cc:296 msgid "automation" msgstr "automatisering" -#: cmd_automate.cc:295 -msgid "" -"interface_version\n" -"heads [BRANCH]\n" -"ancestors REV1 [REV2 [REV3 [...]]]\n" -"attributes [FILE]\n" -"parents REV\n" -"descendents REV1 [REV2 [REV3 [...]]]\n" -"children REV\n" -"graph\n" -"erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n" -"toposort [REV1 [REV2 [REV3 [...]]]]\n" -"ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n" -"common_ancestors REV1 [REV2 [REV3 [...]]]\n" -"leaves\n" -"inventory\n" -"stdio\n" -"certs REV\n" -"select SELECTOR\n" -"get_file FILEID\n" -"get_manifest_of [REVID]\n" -"get_revision [REVID]\n" -"get_base_revision_id\n" -"get_current_revision_id\n" -"packet_for_rdata REVID\n" -"packets_for_certs REVID\n" -"packet_for_fdata FILEID\n" -"packet_for_fdelta OLD_FILE NEW_FILE\n" -"keys\n" -msgstr "" -"interface_version\n" -"heads [GREN]\n" -"ancestors REV1 [REV2 [REV3 [...]]]\n" -"attributes [FIL]\n" -"parents REV\n" -"descendents REV1 [REV2 [REV3 [...]]]\n" -"children REV\n" -"graph\n" -"erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n" -"toposort [REV1 [REV2 [REV3 [...]]]]\n" -"ancestry_difference NY_REV [GAMMAL_REV1 [GAMMAL_REV2 [...]]]\n" -"common_ancestors REV1 [REV2 [REV3 [...]]]\n" -"leaves\n" -"inventory\n" -"stdio\n" -"certs REV\n" -"select VÄLJARE\n" -"get_file FILID\n" -"get_manifest_of [REVID]\n" -"get_revision [REVID]\n" -"get_base_revision_id\n" -"get_current_revision_id\n" -"packet_for_rdata REVID\n" -"packets_for_certs REVID\n" -"packet_for_fdata FILID\n" -"packet_for_fdelta GAMMAL_FIL NY_FIL\n" -"keys\n" - -#: cmd_automate.cc:322 +#: cmd_automate.cc:297 msgid "automation interface" msgstr "automatiseringsgränssnitt" #: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:434 cmd_diff_log.cc:436 #: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446 -#: commands.cc:368 +#: commands.cc:370 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" @@ -439,7 +381,7 @@ #: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:556 cmd_files.cc:78 #: cmd_files.cc:145 cmd_list.cc:436 cmd_merging.cc:569 cmd_ws_commit.cc:322 -#: commands.cc:244 +#: commands.cc:246 msgid "informative" msgstr "informativ" @@ -586,22 +528,22 @@ msgid "no file '%s' found in revision '%s'" msgstr "filen '%s' finns inte i revisionen '%s'" -#: cmd.hh:110 +#: cmd.hh:87 #, c-format msgid "non-hex digits in id" msgstr "något tecken i identiteten är inte hexadecimalt" -#: cmd.hh:119 +#: cmd.hh:96 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "den partiella identiteten '%s' matchar inte befintliga identiteter" -#: cmd.hh:123 +#: cmd.hh:100 #, c-format msgid "partial id '%s' has multiple ambiguous expansions:\n" msgstr "den partiella identiteten '%s' har mer än en uttydning:\n" -#: cmd.hh:131 +#: cmd.hh:108 #, c-format msgid "expanded partial id '%s' to '%s'" msgstr "expanderade partiell identitet '%s' till '%s'" @@ -857,6 +799,10 @@ "visa databasobjekten, arbetskopians manifest, okända filer, kända \n" "filer, medvetet ignorerade filer, saknade filer eller ändrade filer" +#: cmd_list.cc:630 +msgid "REV" +msgstr "REV" + #: cmd_list.cc:640 #, c-format msgid "No such revision %s" @@ -1578,58 +1524,58 @@ msgid "refresh the inodeprint cache" msgstr "uppdatera inodeprint-cachen" -#: commands.cc:114 +#: commands.cc:124 #, c-format msgid "unknown command '%s'\n" msgstr "okänt kommando '%s'\n" -#: commands.cc:125 +#: commands.cc:135 #, c-format msgid "command '%s' has multiple ambiguous expansions:\n" msgstr "kommandot '%s' har mer än en betydelse:\n" -#: commands.cc:166 +#: commands.cc:168 msgid "commands:" msgstr "kommandon:" -#: commands.cc:223 +#: commands.cc:225 #, c-format msgid "unknown command '%s'" msgstr "okänt kommando '%s'" -#: commands.cc:244 +#: commands.cc:246 msgid "command [ARGS...]" msgstr "kommandon [ARGUMENT...]" -#: commands.cc:244 +#: commands.cc:246 msgid "display command help" msgstr "skriv ut hjälptext" -#: commands.cc:375 +#: commands.cc:377 #, c-format msgid "expanding selection '%s'" msgstr "expanderar valet '%s'" -#: commands.cc:383 +#: commands.cc:385 #, c-format msgid "no match for selection '%s'" msgstr "det finns inget som matchar '%s'" -#: commands.cc:389 +#: commands.cc:391 #, c-format msgid "expanded to '%s'" msgstr "expanderar till '%s'" -#: commands.cc:406 +#: commands.cc:408 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "valet '%s' har mer än en möjlig betydelse: \n" -#: commands.cc:423 +#: commands.cc:425 msgid "note: " msgstr "obs: " -#: commands.cc:424 +#: commands.cc:426 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1638,7 +1584,7 @@ "grenen '%s' har mer än ett löv\n" "du kanske borde överväga '%s merge'" -#: commands.cc:442 +#: commands.cc:444 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message och --message-file får inte anges samtidigt" @@ -3671,6 +3617,63 @@ msgid "updating %s" msgstr "uppdaterar %s" +#~ msgid "" +#~ "interface_version\n" +#~ "heads [BRANCH]\n" +#~ "ancestors REV1 [REV2 [REV3 [...]]]\n" +#~ "attributes [FILE]\n" +#~ "parents REV\n" +#~ "descendents REV1 [REV2 [REV3 [...]]]\n" +#~ "children REV\n" +#~ "graph\n" +#~ "erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n" +#~ "toposort [REV1 [REV2 [REV3 [...]]]]\n" +#~ "ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n" +#~ "common_ancestors REV1 [REV2 [REV3 [...]]]\n" +#~ "leaves\n" +#~ "inventory\n" +#~ "stdio\n" +#~ "certs REV\n" +#~ "select SELECTOR\n" +#~ "get_file FILEID\n" +#~ "get_manifest_of [REVID]\n" +#~ "get_revision [REVID]\n" +#~ "get_base_revision_id\n" +#~ "get_current_revision_id\n" +#~ "packet_for_rdata REVID\n" +#~ "packets_for_certs REVID\n" +#~ "packet_for_fdata FILEID\n" +#~ "packet_for_fdelta OLD_FILE NEW_FILE\n" +#~ "keys\n" +#~ msgstr "" +#~ "interface_version\n" +#~ "heads [GREN]\n" +#~ "ancestors REV1 [REV2 [REV3 [...]]]\n" +#~ "attributes [FIL]\n" +#~ "parents REV\n" +#~ "descendents REV1 [REV2 [REV3 [...]]]\n" +#~ "children REV\n" +#~ "graph\n" +#~ "erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n" +#~ "toposort [REV1 [REV2 [REV3 [...]]]]\n" +#~ "ancestry_difference NY_REV [GAMMAL_REV1 [GAMMAL_REV2 [...]]]\n" +#~ "common_ancestors REV1 [REV2 [REV3 [...]]]\n" +#~ "leaves\n" +#~ "inventory\n" +#~ "stdio\n" +#~ "certs REV\n" +#~ "select VÄLJARE\n" +#~ "get_file FILID\n" +#~ "get_manifest_of [REVID]\n" +#~ "get_revision [REVID]\n" +#~ "get_base_revision_id\n" +#~ "get_current_revision_id\n" +#~ "packet_for_rdata REVID\n" +#~ "packets_for_certs REVID\n" +#~ "packet_for_fdata FILID\n" +#~ "packet_for_fdelta GAMMAL_FIL NY_FIL\n" +#~ "keys\n" + #~ msgid "branch '%s' is empty\n" #~ msgstr "grenen '%s' är tom\n"