caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge again

Browse source
This commit is contained in:
Markus M. May 2018-07-30 19:42:18 +02:00
commit 61dba0633a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/values/strings.xml
View file

@ -1166,11 +1166,11 @@
<string name="allow_hardware_pump_text">Attention: If you activate and connect to a hardware pump, AndroidAPS will copy the basal settings from the profile to the pump, overwriting the existing basal rate stored on the pump. Make sure you have the correct basal setting in AndroidAPS. If you are not sure or don\'t want to overwrite the basal settings on your pump, press cancel and repeat switching to the pump at a later time.</string> <string name="allow_hardware_pump_text">Attention: If you activate and connect to a hardware pump, AndroidAPS will copy the basal settings from the profile to the pump, overwriting the existing basal rate stored on the pump. Make sure you have the correct basal setting in AndroidAPS. If you are not sure or don\'t want to overwrite the basal settings on your pump, press cancel and repeat switching to the pump at a later time.</string>
<string name="error_adding_treatment_title">Treatment data incomplete</string> <string name="error_adding_treatment_title">Treatment data incomplete</string>
<string name="maintenance_settings">Maintenance Settings</string> <string name="maintenance_settings">Maintenance Settings</string>
<string name="logshipper_email">Email</string> <string name="maintenance_email">Email</string>
<string name="key_maintenance_logs_email" translatable="false">email</string> <string name="key_maintenance_logs_email" translatable="false">email</string>
<string name="invalid_email_message">Invalid Email</string> <string name="invalid_email_message">Invalid Email</string>
<string name="key_maintenance_logs_amount" translatable="false">amount of logs to send</string> <string name="key_maintenance_logs_amount" translatable="false">amount of logs to send</string>
<string name="logshipper_amount">No of Logs to send</string> <string name="maintenance_amount">No of Logs to send</string>
<string name="maintenance">Wartung</string> <string name="maintenance">Wartung</string>
<string name="maintenance_shortname">MAINT</string> <string name="maintenance_shortname">MAINT</string>
<string name="description_maintenance">Provides several functions for maintenance (eg. log sending, log deletion).</string> <string name="description_maintenance">Provides several functions for maintenance (eg. log sending, log deletion).</string>

6
app/src/main/res/xml/pref_maintenance.xml
View file

@ -8,11 +8,11 @@
<com.andreabaccega.widget.ValidatingEditTextPreference <com.andreabaccega.widget.ValidatingEditTextPreference
android:defaultValue="logs@androidaps.org" android:defaultValue="logs@androidaps.org"
android:dialogMessage="@string/logshipper_email" android:dialogMessage="@string/maintenance_email"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
android:key="@string/key_maintenance_logs_email" android:key="@string/key_maintenance_logs_email"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:title="@string/nsclientinternal_url_title" android:title="@string/maintenance_email"
validatingEditText:emptyAllowed="false" validatingEditText:emptyAllowed="false"
validatingEditText:testErrorString="@string/invalid_email_message" validatingEditText:testErrorString="@string/invalid_email_message"
validatingEditText:testType="email"/> validatingEditText:testType="email"/>
@ -21,7 +21,7 @@
android:defaultValue="2" android:defaultValue="2"
android:inputType="number" android:inputType="number"
android:key="@string/key_maintenance_logs_amount" android:key="@string/key_maintenance_logs_amount"
android:title="@string/logshipper_amount"> android:title="@string/maintenance_amount">
</EditTextPreference> </EditTextPreference>