# # # patch "ChangeLog" # from [5f63c31f813db0ee74cc8ce2d6d9cdd814e01286] # to [bac5f21b9f37d9b1d01dffea797c7afe709f1f6c] # # patch "cmd_files.cc" # from [70e0e2c4dc56071a62ca9cbc27b7e4d019ba8ce3] # to [1c5420b0ee4c2466e6cc2e7ab630ead7782ea358] # # patch "po/sv.po" # from [74ee3500f4ad67e8f36c84d129bc558fae64cd4d] # to [a0766e027165d19bcef7652bf12f9e5ea5db4d51] # ============================================================ --- ChangeLog 5f63c31f813db0ee74cc8ce2d6d9cdd814e01286 +++ ChangeLog bac5f21b9f37d9b1d01dffea797c7afe709f1f6c @@ -1,5 +1,11 @@ 2006-07-08 Richard Levitte + * cmd_files.cc (CMD(fdiff)): Make the synopsis match the + convention used in the rest of the commands. + * po/sv.po: Translate the new string. + +2006-07-08 Richard Levitte + * po/sv.po: New string and a few fuzzies. 2006-07-08 Matthew Gregan ============================================================ --- cmd_files.cc 70e0e2c4dc56071a62ca9cbc27b7e4d019ba8ce3 +++ cmd_files.cc 1c5420b0ee4c2466e6cc2e7ab630ead7782ea358 @@ -75,7 +75,7 @@ } -CMD(fdiff, N_("debug"), N_("[-c|-u] [-p] "), +CMD(fdiff, N_("debug"), N_("SRCNAME DESTNAME SRCID DESTID"), N_("diff 2 files and output result"), OPT_CONTEXT_DIFF % OPT_UNIFIED_DIFF) { ============================================================ --- po/sv.po 74ee3500f4ad67e8f36c84d129bc558fae64cd4d +++ po/sv.po a0766e027165d19bcef7652bf12f9e5ea5db4d51 @@ -145,8 +145,8 @@ msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-08 10:15+0200\n" -"PO-Revision-Date: 2006-07-08 10:18+0200\n" +"POT-Creation-Date: 2006-07-08 11:35+0200\n" +"PO-Revision-Date: 2006-07-08 11:35+0200\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -485,8 +485,8 @@ msgstr "ihopslagningen misslyckades" #: cmd_files.cc:78 -msgid "[-c|-u] [-p] " -msgstr "[-c|-u] [-p] " +msgid "SRCNAME DESTNAME SRCID DESTID" +msgstr "KÄLLNAMN MÅLNAMN KÄLLID MÅLID" #: cmd_files.cc:79 msgid "diff 2 files and output result" @@ -3683,6 +3683,9 @@ msgid "modifying %s" msgstr "ändrar %s" +#~ msgid "[-c|-u] [-p] " +#~ msgstr "[-c|-u] [-p] " + #~ msgid "updating %s" #~ msgstr "uppdaterar %s"