Merge branch 'dev' into smb060

This commit is contained in:
Milos Kozak 2018-01-27 13:47:41 +01:00
commit 4af8e14417
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"></string>
</resources>

View file

@ -20,6 +20,7 @@
<item>@string/el_lang</item> <item>@string/el_lang</item>
<item>@string/it_lang</item> <item>@string/it_lang</item>
<item>@string/ko_lang</item> <item>@string/ko_lang</item>
<item>@string/ro_lang</item>
<item>@string/ru_lang</item> <item>@string/ru_lang</item>
<item>@string/sv_lang</item> <item>@string/sv_lang</item>
</string-array> </string-array>
@ -33,6 +34,7 @@
<item>el</item> <item>el</item>
<item>it</item> <item>it</item>
<item>ko</item> <item>ko</item>
<item>ro</item>
<item>ru</item> <item>ru</item>
<item>sv</item> <item>sv</item>
</string-array> </string-array>

View file

@ -209,6 +209,7 @@
<string name="es_lang">Spanish</string> <string name="es_lang">Spanish</string>
<string name="el_lang">Greek</string> <string name="el_lang">Greek</string>
<string name="it_lang">Italian</string> <string name="it_lang">Italian</string>
<string name="ro_lang">Romanian</string>
<string name="ru_lang">Russian</string> <string name="ru_lang">Russian</string>
<string name="sv_lang">Swedish</string> <string name="sv_lang">Swedish</string>
<string name="openapsma_maxbasal_title">Max U/hr a Temp Basal can be set to</string> <string name="openapsma_maxbasal_title">Max U/hr a Temp Basal can be set to</string>