# # # patch "ChangeLog" # from [02cfb8e6d0b0f1b037b4dc9b500731e3181a0dd9] # to [90ca608980e036b271c4464f361b6208a549093c] # # patch "po/sv.po" # from [598d713094a9a90ff28b2a401eee90356dc89deb] # to [525f7cd71e143a63b3a0fdb531f9092bed172a73] # ============================================================ --- ChangeLog 02cfb8e6d0b0f1b037b4dc9b500731e3181a0dd9 +++ ChangeLog 90ca608980e036b271c4464f361b6208a549093c @@ -1,5 +1,9 @@ 2006-07-06 Richard Levitte + * po/sv.po: Another fuzzy. + +2006-07-06 Richard Levitte + * cmd_merging.cc (CMD(pluck)): A message said 'cherrypatch' when it should say 'pluck'. * po/sv.po: New strings to translate and a few fuzzies that needed ============================================================ --- po/sv.po 598d713094a9a90ff28b2a401eee90356dc89deb +++ po/sv.po 525f7cd71e143a63b3a0fdb531f9092bed172a73 @@ -145,8 +145,8 @@ msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-06 11:38+0200\n" -"PO-Revision-Date: 2006-07-06 11:46+0200\n" +"POT-Creation-Date: 2006-07-06 12:09+0200\n" +"PO-Revision-Date: 2006-07-06 12:09+0200\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -1114,7 +1114,7 @@ msgid "" "revision %s is a merge\n" "to apply the changes relative to one of its parents, use:\n" -" %s cherrypatch -r PARENT -r %s" +" %s pluck -r PARENT -r %s" msgstr "" "revisionen %s är en ihopslagning\n" "för att utföra ändringarna relativt en av dess föräldrar, gör så här:\n"