Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
This commit is contained in:
commit
42bedb16f5
|
@ -27,6 +27,8 @@
|
||||||
<string name="sv_lang" translatable="false">Swedish</string>
|
<string name="sv_lang" translatable="false">Swedish</string>
|
||||||
<string name="tr_lang" translatable="false">Turkish</string>
|
<string name="tr_lang" translatable="false">Turkish</string>
|
||||||
|
|
||||||
|
<string name="key_email_for_crash_report" translatable="false">email_for_crash_report</string>
|
||||||
|
|
||||||
<string name="treatmentssafety_title">Treatments safety</string>
|
<string name="treatmentssafety_title">Treatments safety</string>
|
||||||
<string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
|
<string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
|
||||||
<string name="treatmentssafety_maxcarbs_title">Max allowed carbs [g]</string>
|
<string name="treatmentssafety_maxcarbs_title">Max allowed carbs [g]</string>
|
||||||
|
@ -1243,7 +1245,6 @@
|
||||||
<string name="cannula">Cannula</string>
|
<string name="cannula">Cannula</string>
|
||||||
<string name="userentry">User entry</string>
|
<string name="userentry">User entry</string>
|
||||||
<string name="common_values">Use values of your largest food you usually eat\n</string>
|
<string name="common_values">Use values of your largest food you usually eat\n</string>
|
||||||
<string name="key_email_for_crash_report">email_for_crash_report</string>
|
|
||||||
<string name="summary_email_for_crash_report">This email address will attached to crash reports so we can contact you in urgent cases. It\'s optional.</string>
|
<string name="summary_email_for_crash_report">This email address will attached to crash reports so we can contact you in urgent cases. It\'s optional.</string>
|
||||||
<string name="email_address">Email address</string>
|
<string name="email_address">Email address</string>
|
||||||
<string name="privacy_settings">Privacy setting</string>
|
<string name="privacy_settings">Privacy setting</string>
|
||||||
|
|
Loading…
Reference in a new issue