Merge branch 'develop' into improvement/readme-study

res/buzzbot.desktop

@@ -1,12 +1,13 @@
 [Desktop Entry]
 Comment[en_US]=A beer/liquor/wine drink tracker
 Comment=A beer/liquor/wine drink tracker
-Exec=BuzzBot
+Exec=$HOME/.local/bin/BuzzBot
 GenericName[en_US]=
 Icon=big_sur_icon
 Name[en_US]=BuzzBot
 Name=BuzzBot
 StartupNotify=true
 Terminal=false
 Type=Application
-X-KDE-SubstituteUID=false
+X-KDE-SubstituteUID=false
+StartupWMClass = BuzzBot

src/drink_standards.cpp

@@ -6,27 +6,30 @@
 
 // Std drink sizes are all stored in Oz. Data are all from Wikipedia:
 // https://en.wikipedia.org/wiki/Standard_drink
+// Double values are in ounces.
 const std::map<std::string , double> std_drink_standards = {
         {"Australia", 0.43},
         {"Austria", 0.86},
         {"Canada", 0.57},
-        {"Denmark", 0.52},
-        {"Finland", 0.52},
+        {"Denmark", 0.51},
+        {"Finland", 0.51},
         {"France", 0.43},
         {"Germany", 0.47},
         {"Hong Kong", 0.43},
         {"Hungary", 0.73},
         {"Iceland", 0.34},
         {"Ireland", 0.43},
         {"Italy", 0.43},
-        {"Japan", 0.85},
+        {"Japan (MHLW)", 0.85},
+        {"Japan (WHO)", 0.43},
         {"Netherlands", 0.43},
         {"New Zealand", 0.43},
+        {"Norway", 0.50},
         {"Poland", 0.43},
         {"Portugal", 0.47},
         {"Spain", 0.43},
         {"Sweden", 0.51},
-        {"Switzerland", 0.52},
+        {"Switzerland", 0.51},
         {"United Kingdom", 0.34},
         {"United States", 0.60}
 };