Merge branch 'master' into master

This commit is contained in:
Lars Brubaker 2016-12-15 15:11:24 -08:00 committed by GitHub
commit 575369ba2f
14 changed files with 86 additions and 31 deletions

View file

@ -1448,7 +1448,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
else
{
string message = String.Format(removeFromQueueMessage, pathAndFile);
StyledMessageBox.ShowMessageBox(onRemoveMessageConfirm, message, itemNotFoundMessage, StyledMessageBox.MessageType.YES_NO);
StyledMessageBox.ShowMessageBox(onRemoveMessageConfirm, message, itemNotFoundMessage, StyledMessageBox.MessageType.YES_NO, "Remove".Localize(), "Cancel".Localize());
}
}
}