Merge branch 'bdb_dev' into Crowdin

FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings

@@ -1078,6 +1078,9 @@ Enact a temp Basal or a temp target */
 /* Add Protein */
 "Protein" = "Protein";
 
+/* Setting */
+"Fat And Protein Conversion" = "Fat And Protein Conversion";
+
 /* -------------------------------------------------------------------------------------------
   DASH strings
 */

FreeAPS/Sources/Localizations/Main/sv.lproj/Localizable.strings

@@ -1077,6 +1077,9 @@ Enact a temp Basal or a temp target */
 /* Add Protein */
 "Protein" = "Protein";
 
+/* Setting */
+"Fat And Protein Conversion" = "Omvandling av fett och protein";
+
 /* -------------------------------------------------------------------------------------------
   DASH strings
 */