Merge remote-tracking branch 'origin/dev' into combo-scripter-v2

* origin/dev:
  Update strings.xml
  Update strings.xml
This commit is contained in:
Johannes Mockenhaupt 2017-12-06 11:34:32 +01:00
commit 32b7df39f9
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1

View file

@ -97,7 +97,7 @@
<string name="vitualpump_label">VIRTUELLE PUMPE</string> <string name="vitualpump_label">VIRTUELLE PUMPE</string>
<string name="virtualpump_sqlerror">SQL Error</string> <string name="virtualpump_sqlerror">SQL Error</string>
<string name="virtualpump_extendedbolus_label">Extended bolus</string> <string name="virtualpump_extendedbolus_label">Extended bolus</string>
<string name="pump_tempbasal_label">Temporäre Basalrate</string> <string name="virtualpump_tempbasal_label">Temp Basal</string>
<string name="visible">Sichtbar</string> <string name="visible">Sichtbar</string>
<string name="pump_basebasalrate_label">Basis Basalrate</string> <string name="pump_basebasalrate_label">Basis Basalrate</string>
<string name="treatments_wizard_total_label">TOTAL</string> <string name="treatments_wizard_total_label">TOTAL</string>
@ -671,6 +671,12 @@
<string name="predictionshortlabel">PRE</string> <string name="predictionshortlabel">PRE</string>
<string name="nsclientinternal_title">Interner NSClient</string> <string name="nsclientinternal_title">Interner NSClient</string>
<string name="nsclientinternal_shortname">NSCI</string> <string name="nsclientinternal_shortname">NSCI</string>
<string name="localalertsettings_title">Lokale Alarme</string>
<string name="raise_notifications_as_android_notifications">Benutze Systemmeldungen für Alarme und Meldungen</string>
<string name="pump_unreachable">Pumpe ist nicht erreichbar</string>
<string name="enable_missed_bg_readings_alert">Alarm wenn keine Glukose Daten empfangen werden</string>
<string name="enable_pump_unreachable_alert">Alarm wenn die Pumpe nicht erreichbar ist</string>
<string name="pump_unreachable_threshold">Pumpe ist nicht erreichbar Grenze [min]</string>
<string name="combo_refresh">Aktualisieren</string> <string name="combo_refresh">Aktualisieren</string>
<string name="combo_pump_activity_label">Aktivität</string> <string name="combo_pump_activity_label">Aktivität</string>
<string name="combo_tbr_remaining">%d%% (%d verbleibend)</string> <string name="combo_tbr_remaining">%d%% (%d verbleibend)</string>