Merge branch 'dev' into AMA

This commit is contained in:
Milos Kozak 2017-01-09 17:34:49 +01:00
commit 74afdb6874
3 changed files with 7 additions and 0 deletions

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">AndroidAPS</string>
</resources>

View file

@ -17,6 +17,7 @@
<item>@string/bg_lang</item>
<item>@string/es_lang</item>
<item>@string/ko_lang</item>
<item>@string/el_lang</item>
</string-array>
<string-array name="languagesValues" translatable="false">
<item>en</item>
@ -25,5 +26,6 @@
<item>bg</item>
<item>es</item>
<item>ko</item>
<item>el</item>
</string-array>
</resources>

View file

@ -206,6 +206,7 @@
<string name="nav_import">Import settings</string>
<string name="de_lang">German</string>
<string name="es_lang">Spanish</string>
<string name="el_lang">Greek</string>
<string name="openapsma_low_summary">The minimum BG value to be in range.</string>
<string name="openapsma_high_summary">The maximum BG value to be in range.</string>
<string name="openapsma_maxbasal_summary">Max U/hr a Temp Basal can be set to</string>