I can specify a Caption for a photograph

Summary: This should probably be possible both at upload time and editing later, which suggests that the Upload Image and View Image dialogs should be unified in some fashion.