Merge pull request #1 from MilosKozak/dev

Dev

app/src/main/java/info/nightscout/androidaps/data/Profile.java

@@ -256,7 +256,7 @@ public class Profile {
     private String format_HH_MM(Integer timeAsSeconds) {
         String time;
         int hour = timeAsSeconds / 60 / 60;
-        int minutes = timeAsSeconds - hour * 60 * 60;
+        int minutes = (timeAsSeconds - hour * 60 * 60) / 60;
         DecimalFormat df = new DecimalFormat("00");
         time = df.format(hour) + ":" + df.format(minutes);
         return time;

app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java

@@ -961,7 +961,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
     }
 
     public String getProfileUnits() {
-        return activeProfile.getUnits();
+        return getProfile().getUnits();
     }
 
     public Profile getProfile(long time) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java

@@ -32,6 +32,7 @@ import com.squareup.otto.Subscribe;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.mozilla.javascript.tools.debugger.Main;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -401,15 +402,11 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
         ArrayList<CharSequence> profileList;
         profileList = profileStore.getProfileList();
+        profileList.add(0, MainApp.sResources.getString(R.string.active));
         ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(getContext(),
                 R.layout.spinner_centered, profileList);
 
         profileSpinner.setAdapter(adapter);
-        // set selected to actual profile
-        for (int p = 0; p < profileList.size(); p++) {
-            if (profileList.get(p).equals(MainApp.getConfigBuilder().getProfileName()))
-                profileSpinner.setSelection(p);
-        }
 
         String units = profile.getUnits();
         bgUnits.setText(units);
@@ -451,7 +448,11 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         if (profileSpinner == null || profileSpinner.getSelectedItem() == null)
             return; // not initialized yet
         String selectedAlternativeProfile = profileSpinner.getSelectedItem().toString();
-        Profile specificProfile = profile.getSpecificProfile(selectedAlternativeProfile);
+        Profile specificProfile;
+        if (selectedAlternativeProfile.equals(MainApp.sResources.getString(R.string.active)))
+            specificProfile = MainApp.getConfigBuilder().getProfile();
+        else
+            specificProfile = profile.getSpecificProfile(selectedAlternativeProfile);
 
         // Entered values
         Double c_bg = SafeParse.stringToDouble(editBg.getText());

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java

@@ -49,6 +49,7 @@ import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.plugins.PumpDanaRS.events.EventDanaRSDeviceChange;
 import info.nightscout.androidaps.plugins.PumpDanaRS.services.DanaRSService;
 import info.nightscout.utils.DateUtil;
+import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
 
@@ -218,7 +219,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
             connect(from);
     }
 
-    public static synchronized void connect(String from) {
+    public static void connect(String from) {
         log.debug("RS connect from: " + from);
         if (danaRSService != null && !mDeviceAddress.equals("") && !mDeviceName.equals("")) {
             final Object o = new Object();
@@ -375,7 +376,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     @Override
-    public int setNewBasalProfile(Profile profile) {
+    public synchronized int setNewBasalProfile(Profile profile) {
         if (danaRSService == null) {
             log.error("setNewBasalProfile sExecutionService is null");
             return FAILED;
@@ -426,7 +427,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     @Override
-    public void refreshDataFromPump(String reason) {
+    public synchronized void refreshDataFromPump(String reason) {
         log.debug("Refreshing data from pump");
         if (!isConnected() && !isConnecting()) {
             connect(reason);
@@ -440,7 +441,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     @Override
-    public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
+    public synchronized PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
         ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
         detailedBolusInfo.insulin = configBuilderPlugin.applyBolusConstraints(detailedBolusInfo.insulin);
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
@@ -504,7 +505,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
 
     // This is called from APS
     @Override
-    public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, boolean enforceNew) {
+    public synchronized PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, boolean enforceNew) {
         // Recheck pump status if older than 30 min
         if (pump.lastConnection.getTime() + 30 * 60 * 1000L < System.currentTimeMillis()) {
             connect("setTempBasalAbsolute old data");
@@ -581,7 +582,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
+    public synchronized PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
         PumpEnactResult result = new PumpEnactResult();
         ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
         percent = configBuilderPlugin.applyBasalConstraints(percent);
@@ -632,7 +633,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
         return result;
     }
 
-    public PumpEnactResult setHighTempBasalPercent(Integer percent) {
+    public synchronized PumpEnactResult setHighTempBasalPercent(Integer percent) {
         PumpEnactResult result = new PumpEnactResult();
         connectIfNotConnected("hightempbasal");
         boolean connectionOK = danaRSService.highTempBasal(percent);
@@ -656,7 +657,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     @Override
-    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
+    public synchronized PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
         ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
         insulin = configBuilderPlugin.applyBolusConstraints(insulin);
         // needs to be rounded
@@ -699,7 +700,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     @Override
-    public PumpEnactResult cancelTempBasal(boolean force) {
+    public synchronized PumpEnactResult cancelTempBasal(boolean force) {
         PumpEnactResult result = new PumpEnactResult();
         TemporaryBasal runningTB =  MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
         if (runningTB != null) {
@@ -725,7 +726,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     @Override
-    public PumpEnactResult cancelExtendedBolus() {
+    public synchronized PumpEnactResult cancelExtendedBolus() {
         PumpEnactResult result = new PumpEnactResult();
         ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
         if (runningEB != null) {
@@ -808,7 +809,28 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
 
     @Override
     public String shortStatus(boolean veryShort) {
-        return null;
+        String ret = "";
+        if (pump.lastConnection.getTime() != 0) {
+            Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
+            int agoMin = (int) (agoMsec / 60d / 1000d);
+            ret += "LastConn: " + agoMin + " minago\n";
+        }
+        if (pump.lastBolusTime.getTime() != 0) {
+            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.lastBolusTime) + "\n";
+        }
+        if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
+            ret += "Temp: " + MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull() + "\n";
+        }
+        if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
+            ret += "Extended: " + MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString() + "\n";
+        }
+        if (!veryShort) {
+            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
+        }
+        ret += "IOB: " + pump.iob + "U\n";
+        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
+        ret += "Batt: " + pump.batteryRemaining + "\n";
+        return ret;
     }
 
     @Override

app/src/main/res/values-bg/strings.xml

@@ -11,7 +11,7 @@
     <string name="reset_db_confirm">Сигурни ли сте че искате да изтриете всички данни?</string>
     <string name="nav_exit">Изход</string>
     <string name="danar_useextended_title">Използвай удължен болус за над 200%</string>
-	<string name="danar_bt_name_title">DanaR Bluetooth устройство</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth устройство</string>
 	<string name="ns_sync_use_absolute_title">Използване на абсолютни стойности за базал</string>
     <string name="alert_dialog_storage_permission_text">Рестартирайте телефона или AndroidAPS от системните настройки или Android APS няма да записва проблемите (което е важно за работата на алгоритъма)!</string>
     <string name="objectives_objective_label_string">Цел:</string>
@@ -71,10 +71,10 @@
     <string name="rate">Стойност</string>
     <string name="duration">Срок</string>
     <string name="reason">Основание</string>
-    <string name="glucose">КЗ</string>
-    <string name="delta">Промяна</string>
+    <string name="glucose">Кръвна захар</string>
+    <string name="delta">Изменение (Δ)</string>
     <string name="sms_delta">Delta:</string>
-    <string name="avgdelta">Средна промяна</string>
+    <string name="avgdelta">Средно изменение (Δ),</string>
     <string name="configbuilder">Конфигурация</string>
     <string name="objectives">Цели</string>
     <string name="openapsma">OpenAPS MA</string>
@@ -85,8 +85,6 @@
     <string name="treatments">Лечения</string>
     <string name="virtualpump">Виртуална помпа</string>
     <string name="careportal">Careportal</string>
-
-
     <string name="configbuilder_pump">Помпа</string>
     <string name="configbuilder_treatments">Treatments</string>
     <string name="configbuilder_tempbasals">Временен базал</string>
@@ -140,7 +138,7 @@
     <string name="unsupportednsversion">Несъвместима версия на Nightscout</string>
     <string name="nsclientnotinstalled">NSClient не е открит. Записът е загубен!</string>
     <string name="objectives_bgavailableinns">КЗ да се вижда в NS</string>
-    <string name="objectives_pumpstatusavailableinns">Статуса на помпа да е достъпен в NS</string>
+    <string name="objectives_pumpstatusavailableinns">Статуса на помпата да е достъпен в NS</string>
     <string name="objectives_manualenacts">Ръчно приложени</string>
     <string name="loopdisabled">LOOP Е СПРЯН ОТ ОГРАНИЧЕНИЯТА</string>
     <string name="cs_lang">Czech</string>
@@ -370,7 +368,7 @@
     <string name="open_settings_on_wear">Отвори настройките на часовника</string>
     <string name="pumperror">Грешка в промпата</string>
     <string name="lowbattery">Изтощена батерия</string>
-    <string name="pumpshutdown">Помпа изключена</string>
+    <string name="pumpshutdown">Помпата е изключена</string>
     <string name="batterydischarged">Батерията на помпата е изтощена</string>
     <string name="danarkoreanpump">DanaR Korean</string>
     <string name="wrongpumpdriverselected">Избран е грешен тип помпа</string>
@@ -448,7 +446,7 @@
     <string name="openapsama_autosens_adjusttargets_summary">По подразбиране: разрешено\nТова позволява на autosens да променя и целевите КЗ(освен чувствителност и базал).</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">По подразбиране: 2\nBolus snooze се активира след като поставите болус за основно хранене, така Loop няма да пуснка/намаля базалите веднага след като сте се хранили. Примерът тук е с 2; така при 3 часа DIA това ще означава че bolus snooze ще бъде внимателно изместен 1.5 часа (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">По подразбиране: 3.0\nТова е настройка на количеството на покачване на КЗ при усвояване на въглехидратите за всеки 5 минути. По подразбиране 3мг/дл/5мин. Това се отразява на това колко бързо се усвояват COB според алгоритъма, и как това се отразява в предвиждането на КЗ, когато тя не се покачва или пада с различен темп от очакваното.</string>
-    <string name="openapsama_link_to_preferncejson_doc_txt">Attention!\nNormally you do not have to change these values below. Please CLICK HERE and READ the text and make sure you UNDERSTAND it before change any of these values.</string>
+    <string name="openapsama_link_to_preferncejson_doc_txt">Внимание! Обикновено Вие не трябва да променяте тези стойности. Моля НАТИСНЕТЕ ТУК, прочетете текста и бъдете сигурни, че го РАЗБИРАТЕ преди да направите каквито и да е промени!</string>
     <string name="openapsama_link_to_preferncejson_doc">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
     <string name="error_only_numeric_digits_allowed">Позволени са само числа</string>
     <string name="error_only_numeric_digits_range_allowed" formatted="false">Позволени са числа между %1$s - %2$s</string>
@@ -529,7 +527,7 @@
     <string name="smscommunicator_wrongduration">Wrong duration</string>
     <string name="smscommunicator_loopsuspended">Loop suspended</string>
     <string name="smscommunicator_loopresumed">Loop resumed</string>
-    <string name="treatments_wizard_bgtrend_label">промяна за 15мин</string>
+    <string name="treatments_wizard_bgtrend_label">Δ за 15мин</string>
     <string name="treatments_wizard_cob_label">COB</string>
     <string name="superbolus">Суперболус</string>
     <string name="ns_logappstartedevent">Записвай всяко стартиране на AndroidAPS в NS</string>
@@ -649,4 +647,36 @@
     <string name="sv_lang">Swedish</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="ultrarapid_oref">Ултра бързодействащ по Oref</string>
+    <string name="activity_duration">време за физ. активност</string>
+    <string name="activity_target">Целева КЗ при физ. активност</string>
+    <string name="bolusspeed">Скорост на болус</string>
+    <string name="careportal_newnstreatment_percentage_label">% на изменение</string>
+    <string name="careportal_newnstreatment_timeshift_label">Време на отместване</string>
+    <string name="danars_nodeviceavailable">Все още устройството не е намерено</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="default_temptargets">Временна цел по подразбиране</string>
+    <string name="eatingsoon_duration">Време за \"Преди хранене\"</string>
+    <string name="eatingsoon_target">Цел за \"Преди хранене\"</string>
+    <string name="emptyreservoir">Празен резервоар</string>
+    <string name="gettingbolusstatus">Получава болус статус</string>
+    <string name="gettingextendedbolusstatus">Получава статус на удължен болус</string>
+    <string name="gettingpumpsettings">Получава настройките на помпата</string>
+    <string name="gettingpumptime">Получава времето на помпата</string>
+    <string name="gettingtempbasalstatus">Получава статус на временен базал</string>
+    <string name="pairing">СДВОЯВАНЕ</string>
+    <string name="pairingok">Сдвоени</string>
+    <string name="pairingtimedout">Времето за сдвояване изтече</string>
+    <string name="pairpump">Сдвояване с нова помпа</string>
+    <string name="reuse">опитва отново</string>
+    <string name="selectedpump">Избрана помпа</string>
+    <string name="serialnumber">Сериен номер</string>
+    <string name="treatments_wizard_tt_label">ЛЕЧ</string>
+    <string name="waitingforpairing">Очаква сдвояване с помпа</string>
+    <string name="connectiontimedout">Времето за връзка изтече</string>
+    <string name="wear_overviewnotifications">Преглед на известията</string>
+    <string name="wear_overviewnotifications_summary">Изпращай известията като съобщения към часовника</string>
+    <string name="wear_settings">Настройки на часовник</string>
+    <string name="wearcontrol_summary">Задаване временни цели и въвеждане Лечения от часовник Android wear</string>
+    <string name="wearcontrol_title">Контролиране от часовник</string>
 </resources>

app/src/main/res/values-cs/strings.xml

@@ -659,4 +659,8 @@
     <string name="wearcontrol_summary">Nastavování dočasných cílů a vkládání ošetření na hodinkách Wear</string>
     <string name="wearcontrol_title">Řízení z hodinek Wear</string>
     <string name="danar_model" formatted="false">Model: %02X Protokol: %02X Kód: %02X</string>
+    <string name="active"><![CDATA[<Aktivní>]]></string>
+    <string name="bloodsugarmeasurementalert">Výstraha měření glykémie</string>
+    <string name="connectiontimedout">Vypršel čas připojování</string>
+    <string name="treatments_wizard_tt_label">DC</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -165,7 +165,7 @@
     <string name="loopdisabled">LOOP DEAKTIVIERT DURCH DIE BESCHRÄNKUNG</string>
     <string name="loop_constraintsprocessed_label">Nach Beschränkungen</string>
     <string name="loop">Loop</string>
-    <string name="objectives_manualenacts">Manual enacts</string>
+    <string name="objectives_manualenacts">Manuelle Eingriffe</string>
     <string name="carbsconstraintapplied">Kohlenhydrate Beschränkung erreicht</string>
     <string name="nav_resetdb">Reset Datenbanken</string>
     <string name="objectives_minimalduration">Minimale Dauer</string>
@@ -231,7 +231,7 @@
     <string name="nobtadapter">Kein Bluetoothadapter gefunden</string>
     <string name="smscommunicator_remotebolusnotallowed">Remote Bolus ist nicht erlaubt</string>
     <string formatted="false" name="smscommunicator_bolusreplywithcode">Um Bolus %.2fU bitte mit  %s antworten</string>
-    <string name="ko_lang">Koreanisch</string>
+    <string name="ko_lang">Korean</string>
     <string name="youareonallowedlimit">Limit erreicht</string>
     <string name="wrongpumppassword">Falsches Pumpen-Passwort!</string>
     <string name="waitingforpumpclicktorefresh">Warte auf Pumpe. Klicke zum aktualisieren.</string>
@@ -314,8 +314,8 @@
     <string name="loop_shortname">LOOP</string>
     <string name="localprofile_shortname">LP</string>
     <string name="danarpump_shortname">DANA</string>
-    <string name="configbuilder_shortname">"CONF"</string>
-    <string name="circadian_percentage_profile_shortname">"CPP"</string>
+    <string name="configbuilder_shortname">CONF</string>
+    <string name="circadian_percentage_profile_shortname">CPP</string>
     <string name="careportal_shortname">CP</string>
     <string name="error_only_numeric_digits_allowed">Bitte verwenden Sie nur Ziffern.</string>
     <string name="error_field_must_not_be_empty">Pflichtfeld</string>
@@ -591,7 +591,7 @@
     <string name="configbuilder_sensitivity">Empfindlichkeitserkennung</string>
     <string name="cob">COB</string>
     <string name="enablesuperbolus_summary">Aktiviere die SuperBolus-Funktion im Wizard. Nicht aktivieren, wenn du nicht weißt, was es macht! ES KANN ZU EINER ÜBERDOSIERUNG AN INSULIN KOMMEN, WENN DU ES BLIND BENUTZT!</string>
-    <string name="objectives_2_objective">"Verstehen des OpenLoops und der Temp-Basal-Empfehlungen</string>
+    <string name="objectives_2_objective">Verstehen des OpenLoops und der Temp-Basal-Empfehlungen</string>
     <string name="openapsama_useautosens">Verwende AMA Autosense</string>
     <string formatted="false" name="smscommunicator_basalreplywithcode">Um Basal mit %.2fU/h zu starten, antworte mit dem Code %s</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>

app/src/main/res/values-nl/strings.xml

@@ -649,4 +649,36 @@
     <string name="rapid_acting_oref">Snel-werkende Oref</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+    <string name="activity_duration">Periode van inspanning</string>
+    <string name="activity_target">Activiteits doel</string>
+    <string name="bloodsugarmeasurementalert">Bloed glucose meetpunt alarm</string>
+    <string name="bolusspeed">Bolus snelheid</string>
+    <string name="careportal_newnstreatment_percentage_label">Percentage</string>
+    <string name="careportal_newnstreatment_timeshift_label">Tijd verschuiving</string>
+    <string name="connectiontimedout">Connectie verlopen</string>
+    <string name="danar_history_prime">Vullen</string>
+    <string name="danar_setbasalstep001">Zet de basale stap op 0,01 E/u</string>
+    <string name="danars_nodeviceavailable">Geen toestel gevonden</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="default_temptargets">Standaart tijdelijk basaal</string>
+    <string name="eatingsoon_duration">Eet binnenkort periode</string>
+    <string name="eatingsoon_target">Eet binnenkort doel</string>
+    <string name="gettingbolusstatus">Bolus status ophalen</string>
+    <string name="gettingextendedbolusstatus">Vertraagde bolus status ophalen</string>
+    <string name="gettingpumpsettings">Pomp instellingen ophalen</string>
+    <string name="gettingpumptime">Pomp tijd ophalen</string>
+    <string name="gettingtempbasalstatus">Ophalen van tijdelijke basaal status</string>
+    <string name="pairing">Koppelen</string>
+    <string name="pairingok">Koppeling geslaagd</string>
+    <string name="pairingtimedout">Koppeling verlopen</string>
+    <string name="pairpump">Koppel nieuwe pomp</string>
+    <string name="remaininsulinalert">Resterende insuline hoeveelheid</string>
+    <string name="reuse">Herbruik</string>
+    <string name="selectedpump">Geselecteerde pomp</string>
+    <string name="serialnumber">Serie nummer</string>
+    <string name="wearcontrol_summary">Stel tijdelijke doelen en bolussen in vanop je horloge.</string>
+    <string name="wearcontrol_title">Bedieningen via horloge</string>
+    <string name="emptyreservoir">Ampull leeg</string>
+    <string name="waitingforpairing">Wachten op koppelen van de pomp</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -746,5 +746,6 @@
     <string name="wearcontrol_title">Controls from Watch</string>
     <string name="wearcontrol_summary">Set Temp-Targets and enter Treatments from the watch.</string>
     <string name="connectiontimedout">Connection timed out</string>
+    <string name="active"><![CDATA[<Active>]]></string>
 </resources>