| Some other answers you should consider accepting: 'WW1/First World War/World War One (same for WW2), NSDAP, and maybe just Vienna.
Also although he did marry Eva Braun, this was less than 48 hours before their suicide, and has been disputed, therefore something along the lines of 'long time partner' may be a more appropriate clue. |