Cleanup for merge.

app/widget/menu/menushared.cpp

@@ -163,7 +163,7 @@ void MenuShared::AddItemsForClipEditMenu(Menu *m)
 void MenuShared::AddItemsForTimeRulerMenu(Menu *m, const rational& timebase)
 {
   // If a menu is already created (such as the view menu) we need to remove the instance
-  // of dropfram or non-dropframe timecode that is already there to avoid double displays
+  // of dropframe or non-dropframe timecode that is already there to avoid double displays
 
   if (m->actions().contains(view_timecode_view_dropframe_item_)) {
     m->removeAction(view_timecode_view_dropframe_item_);