Merged branch dev into dev

This commit is contained in:
viktoria 2017-01-26 00:39:28 +01:00
commit 2f8b2a382d

View file

@ -94,7 +94,7 @@
<string name="treatments_wizard_basaliob_label">Basal IOB</string> <string name="treatments_wizard_basaliob_label">Basal IOB</string>
<string name="treatments_wizard_unit_label">U</string> <string name="treatments_wizard_unit_label">U</string>
<string name="up">Up</string> <string name="up">Up</string>
<string name="virtualpump">Vituelle Pumpe</string> <string name="virtualpump">Virtuelle Pumpe</string>
<string name="virtualpump_reservoir_label">Reservoir:</string> <string name="virtualpump_reservoir_label">Reservoir:</string>
<string name="xdrip">xDrip</string> <string name="xdrip">xDrip</string>
<string name="vitualpump_label">VIRTUELLE PUMPE</string> <string name="vitualpump_label">VIRTUELLE PUMPE</string>