New Crowdin translations (#2289)

* New translations strings.xml (Czech)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Greek)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Greek)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

app/src/main/res/values-af-rZA/strings.xml

@@ -73,8 +73,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IAB:</string>
     <string name="tempbasals_iobtotal_label_string">Totale IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulin</string>
-    <string name="treatments_newtreatment_carbsamount_label">Karbs</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Karbs</string>
@@ -112,7 +110,6 @@
     <string name="overview">Oorsig</string>
     <string name="nsprofile">Ns Profiel</string>
     <string name="simpleprofile">Maklike profiel</string>
-    <string name="tempbasal">TydelikeBasaal</string>
     <string name="treatments">Behandelings</string>
     <string name="virtualpump">Virtuele Pomp</string>
     <string name="careportal">Careportal</string>
@@ -144,21 +141,17 @@
     <string name="constraints_violation">Beperkings skending</string>
     <string name="treatmentdeliveryerror">Bolus aflewering fout</string>
     <string name="tempbasaldeliveryerror">Tempbasal aflewering fout</string>
-    <string name="overview_newtempbasal_basalpercent">Basale waarde [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = huidig)</string>
     <string name="setbasalquestion">Aanvaar nuwe tydelike basale:</string>
     <string name="overview_treatment_label">Behandeling</string>
     <string name="overview_calculator_label">Rekenaar</string>
     <string name="constraintapllied">Beperking toegepas!</string>
     <string name="confirmation">Bevestiging</string>
-    <string name="entertreatmentquestion">Voer nuwe behandeling in:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basale</string>
     <string name="sms_basal">Basale:</string>
     <string name="carbs">Karbs</string>
     <string name="changeyourinput">Verander jou insette!</string>
-    <string name="setextendedbolusquestion">Stel nuwe verlengde bolus:</string>
     <string name="configbuilder_bgsource">BG bron</string>
     <string name="configbuilder_bgsource_description">Waarvandaan  moet AndroidAPS data kry?</string>
     <string name="xdrip">xDrip</string>
@@ -185,7 +178,6 @@
     <string name="careportal_cgmsensorinsert">CGM Sensor insetsel</string>
     <string name="careportal_cgmsensorstart">CGM Sensor Begin</string>
     <string name="careportal_insulincartridgechange">Insulien stoor verandering</string>
-    <string name="careportal_profileswitch">Profiel wissel</string>
     <string name="careportal_snackbolus">Peuselhappie Bolus</string>
     <string name="careportal_mealbolus">Maaltyd Bolus</string>
     <string name="careportal_correctionbolus">Regstelling Bolus</string>
@@ -206,7 +198,6 @@
     <string name="careportal_newnstreatment_percent_label">Persentasie</string>
     <string name="careportal_newnstreatment_absolute_label">Absolute</string>
     <string name="careportal_newnstreatment_notes_label">Notas</string>
-    <string name="careportal_newnstreatment_eventtime_label">Gebeurtenis tyd</string>
     <string name="careportal_newnstreatment_profile_label">Profiel</string>
     <string name="careportal_newnstreatment_enteredby_title">Ingetik deur</string>
     <string name="careportal_newnstreatment_glucosetype">Glukose tipe</string>
@@ -230,7 +221,6 @@
     <string name="connecting">Koppel</string>
     <string name="connected">Gekoppel</string>
     <string name="disconnected">Ontkoppel</string>
-    <string name="danar_pump_settings">DanaR pump settings</string>
     <string name="end_user_license_agreement">Eindverbruiker Lisensie Ooreenkoms</string>
     <string name="end_user_license_agreement_text">MOET NIE GEBRUIK WORD OM MEDIESE BESLUITE TE MAAK NIE. DAAR IS GEEN WAARBORG DAT DIE PROGRAM, ONDERWORPE AAN TOEPASSELIKE WETTE EN WETGEWING. TENSY ANDERS GEMELD IN TEKS VOORSIEN DIE KOPIEREG-HOUERS EN / OF ANDER PARTYE DIE PROGRAM \"AS IS\" SONDER ËNIGE WAARBORG VAN ENIGE ORDE, UITDRUKKELIK OF IMPLISIET, INKLUSIEF, MAAR NIE BEPERK TOT DIE IMPLISIETE WAARBORG VAN TOEPAASBAARHEID OF NUT VIR EEN SPESIFIEKE DOEL. DIE TOTALE EN ALLE RISIKOVIR DIE KWALITEIT EN PRESTASIE VAN DIE PROGRAM RUS MET JOUSELF. VIR ENIGE PROGRAM DEFEKTIEWE OF FALINGS MOET JY PERSOONLIK DIE KOSTE EN REGSAANSPREEKLIKHEID DRA VAN ALLE NODIGE AKSIES, DIENS, REPARASIES OF KORREKSIES VIR USELF OF ENIGE DERDE PARTYE EN/OF AKSIES, DIENS, REPARASIES OF KORREKSIES WAT DEUR DIE PROGRAM GEDOEN WAS.</string>
     <string name="end_user_license_agreement_i_understand">EK VERSTAAN en STEM IN</string>
@@ -267,8 +257,6 @@
     <string name="glucosetype_finger">Vinger</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Per hand</string>
-    <string name="careportal_temporarytarget">Tydelike teiken</string>
-    <string name="careportal_temporarytargetcancel">Tydelike teiken kanselleer</string>
     <string name="danarprofile">DanaR profiel stellings</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duur van insulien aktiwiteit</string>
@@ -401,7 +389,6 @@
     <string name="eatingsoon">Eet binnekort</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Aktiwiteit</string>
-    <string name="removerecord">Verwyder rekord:</string>
     <string name="danar_stats">DanaR Stats</string>
     <string name="danar_stats_cumulative_tdd">Kumulatiewe TDD</string>
     <string name="danar_stats_expweight">Eksponensiele geweegde TDD</string>
@@ -558,16 +545,12 @@
     <string name="ns_noupload_summary">Alle data na NS gestuur word laat val is gedaal. AAPS is gekoppel aan NS maar geen verandering in NS is gedoen</string>
     <string name="basal_step">Basale Stap</string>
     <string name="bolus_step">Bolus Stap</string>
-    <string name="extendedbolus">VerlengdeBolus</string>
-    <string name="temptarget">TydelikeDoelwit</string>
     <string name="overview_extendedbolus_cancel_button">Kanselleer Verlengde Bolus</string>
     <string name="careportal_sensorage_label">Sensor ouderdom</string>
     <string name="careportal_canulaage_label">Canula tydsduur</string>
     <string name="careportal_insulinage_label">Insulien ouderdom</string>
     <string name="hours">ure</string>
-    <string name="overview_newtempbasal_basaltype_label">Basale tipe</string>
     <string name="invalidprofile">Ongeldige profiel !!!</string>
-    <string name="profileswitch">ProfileSwitch</string>
     <string name="careportal_pbage_label">Pomp battery ouderdom</string>
     <string name="careportal_pumpbatterychange">Pomp Battery Verander</string>
     <string name="ns_alarmoptions">Alarm Opsies</string>
@@ -615,7 +598,6 @@
     <string name="careportal_carbsandbolus_label">KARBS &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">POMP</string>
-    <string name="overview_newtempbasal_basalabsolute">Basale waarde [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Durasie [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -635,7 +617,6 @@
     <string name="waitingforpairing">Wag vir paring op pomp</string>
     <string name="pairingok">Paring OK</string>
     <string name="pairingtimedout">Paring tyd verstreke</string>
-    <string name="pairing">PARING</string>
     <string name="danars_nodeviceavailable">Geen toestel gevind so ver</string>
     <string name="emptyreservoir">Leë stoor</string>
     <string name="bloodsugarmeasurementalert">Bloed suiker meting alarm</string>
@@ -744,7 +725,6 @@
     <string name="bolus_frequency_exceeded">\'n Bolus met dieselfde hoeveelheid was versoek binne die laaste twee minute. Om te waak teen toevallige dubbele boluses en om te waak teen goggas is dit nie toegelaat nie.</string>
     <string name="combo_pump_connected_now">Nou</string>
     <string name="combo_activity_reading_pump_history">Lees pomp geskiedenis</string>
-    <string name="danar_history">pomp geskiedenis</string>
     <string name="combo_activity_setting_basal_profile">Instelling basale profiel</string>
     <string name="combo_pump_cartridge_low_warrning">Pomp kasset vlak is laag</string>
     <string name="combo_pump_battery_low_warrning">Pomp battery is laag</string>
@@ -939,11 +919,7 @@
     <string name="danar_pumpalarm_sound">Klank</string>
     <string name="danar_pumpalarm_vibrate">Vibreer</string>
     <string name="danar_pumpalarm_both">Beide</string>
-    <string name="danar_screentimeout">LCD aantyd [s]</string>
-    <string name="danar_backlight">Agterlig aantyd [s]</string>
     <string name="danar_glucoseunits">Glukose eenhede</string>
-    <string name="danar_shutdown">Staking(ure)</string>
-    <string name="danar_lowreservoir">Lae reserwe (eenhede)</string>
     <string name="danar_saveuseroptions">Stoor opsies te pomp</string>
     <string name="option_on">Aan</string>
     <string name="option_off">Af</string>
@@ -1185,15 +1161,12 @@
     <string name="longitude_short">Lengte:</string>
     <string name="distance_short">Afst [m]:</string>
     <string name="name_short">Naam:</string>
-    <string name="locationis">Ligging is %1$s</string>
     <string name="lastboluslabel">Laaste bolus</string>
     <string name="lastboluscompared">Laaste bolus tyd %1$s %2$s min terug</string>
     <string name="triggercoblabel">KOB</string>
     <string name="cobcompared">KOB %1$s %2$.0f</string>
     <string name="taskname">Aksie naam</string>
     <string name="edit_short">WYSIG</string>
-    <string name="please_choose_an_action_type">Kies asb \'n aksie tipe:</string>
-    <string name="please_choose_a_trigger_type">Kies \'n sneller tipe:</string>
     <string name="triggers">Snellers:</string>
     <string name="remove_label">VERWYDER</string>
     <string name="preconditions">Vereistes:</string>
@@ -1283,7 +1256,6 @@
     <string name="medtronic_error_pump_frequency_invalid">Pomp frekwensie word nie ondersteun.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink Adres ongeldig.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Pomp tipe bespeur en is nie dieselfde as gestelde.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basale Profiele is nie aan op pomp.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basale profiel is verkeerd op pomp (moet STD wees).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde TBR op pomp (Moet Absoluut wees).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Maks Bolus gestel op Pomp(moet %1$.2f wees).</string>
@@ -1334,7 +1306,6 @@
     <string name="automation_trigger_pump_last_connection_description">Laaste konneksie na pomp [minute gelede]</string>
     <string name="automation_trigger_pump_last_connection_compared">Vorige konneksie na pomp %1$s %2$s min terug</string>
     <string name="sendsmsactionlabel">Stuur\'n SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Stuur SMS na alle fone in voorkeure</string>
     <string name="sendsmsactiontext">Stuur\'n SMS met die teks</string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus beperking aangewend: %2$.2fU to %3$.2fU</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>

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

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Инс:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Общо IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Инсулин (ед.):</string>
-    <string name="treatments_newtreatment_carbsamount_label">Въглехидрати (гр.):</string>
     <string name="treatments_wizard_bg_label">КЗ</string>
     <string name="treatments_wizard_tt_label">Вр.цел</string>
     <string name="treatments_wizard_carbs_label">ВХ</string>
@@ -114,7 +112,6 @@
     <string name="overview">Общ</string>
     <string name="nsprofile">NS Профил</string>
     <string name="simpleprofile">Обикновен профил</string>
-    <string name="tempbasal">Временен базал</string>
     <string name="treatments">Лечения</string>
     <string name="virtualpump">Виртуална помпа</string>
     <string name="careportal">Careportal</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">Нарушено ограничение</string>
     <string name="treatmentdeliveryerror">Грешка при подаване на болус</string>
     <string name="tempbasaldeliveryerror">Грешка при подаване на временен базал</string>
-    <string name="overview_newtempbasal_basalpercent">Базална стойност [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = текущ)</string>
+    <string name="overview_newtempbasal_basalpercent">Базална стойност [%]</string>
     <string name="setbasalquestion">Приложи нов временен базал:</string>
     <string name="overview_treatment_label">Болус</string>
     <string name="overview_calculator_label">Калкулатор</string>
     <string name="constraintapllied">Приложено ограничение!</string>
     <string name="confirmation">Потвърждение</string>
-    <string name="entertreatmentquestion">Въведете ново лечение:</string>
     <string name="bolus">Болус</string>
     <string name="sms_bolus">Болус:</string>
     <string name="basal">Базал</string>
     <string name="sms_basal">Базал:</string>
     <string name="carbs">Въглехидрати</string>
     <string name="changeyourinput">Променете данните!</string>
-    <string name="setextendedbolusquestion">Задай нов удължен болус:</string>
     <string name="configbuilder_bgsource">Източник на данни за КЗ</string>
     <string name="configbuilder_bgsource_description">От къде трябва да AndroidAPS да си взима данни?</string>
     <string name="xdrip">xDrip</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">Процент</string>
     <string name="careportal_newnstreatment_absolute_label">Абсолютна</string>
     <string name="careportal_newnstreatment_notes_label">Бележки</string>
-    <string name="careportal_newnstreatment_eventtime_label">Време на събитие</string>
+    <string name="event_time_label">Време</string>
     <string name="careportal_newnstreatment_profile_label">Профил</string>
     <string name="careportal_newnstreatment_enteredby_title">Въведено от</string>
     <string name="careportal_newnstreatment_glucosetype">Тип КЗ</string>
@@ -422,7 +416,7 @@
     <string name="eatingsoon">Преди хранене</string>
     <string name="hypo">Хипоглекимия</string>
     <string name="activity">Физ.активност</string>
-    <string name="removerecord">Премахни запис:</string>
+    <string name="removerecord">Премахни</string>
     <string name="danar_stats">DanaR статистика</string>
     <string name="danar_stats_cumulative_tdd">Комулативна TDD</string>
     <string name="danar_stats_expweight">Експоненциално претеглена TDD</string>
@@ -583,16 +577,12 @@
     <string name="ns_noupload_summary">Всички данни за NS се пропускат. AAPS е свързан с NS, но не прави промени в NS</string>
     <string name="basal_step">Стъпка при базал</string>
     <string name="bolus_step">Стъпка при болус</string>
-    <string name="extendedbolus">Удължен болус</string>
-    <string name="temptarget">Вр. цел</string>
     <string name="overview_extendedbolus_cancel_button">Спри удължен болус</string>
     <string name="careportal_sensorage_label">Възраст на сензора</string>
     <string name="careportal_canulaage_label">Възраст на канюла</string>
     <string name="careportal_insulinage_label">Възраст на инсулина</string>
     <string name="hours">часа</string>
-    <string name="overview_newtempbasal_basaltype_label">Тип базал</string>
     <string name="invalidprofile">Грешен профил !!!</string>
-    <string name="profileswitch">Смяна на профил</string>
     <string name="doprofileswitch">Смени профил</string>
     <string name="careportal_pbage_label">Възраст на батерията на помпата</string>
     <string name="careportal_pumpbatterychange">Смяна на батерия</string>
@@ -642,7 +632,6 @@
     <string name="careportal_carbsandbolus_label">ХРАНА И БОЛУС</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">ПОМПА</string>
-    <string name="overview_newtempbasal_basalabsolute">Базална стойност [Е/ч]</string>
     <string name="careportal_newnstreatment_duration_min_label">Продължителност [мин.]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -662,7 +651,7 @@
     <string name="waitingforpairing">Очаква сдвояване с помпа</string>
     <string name="pairingok">Сдвояване - ОК</string>
     <string name="pairingtimedout">Времето за сдвояване изтече</string>
-    <string name="pairing">СДВОЯВАНЕ</string>
+    <string name="pairing">Сдвояване</string>
     <string name="danars_nodeviceavailable">Все още устройството не е намерено</string>
     <string name="emptyreservoir">Празен резервоар</string>
     <string name="bloodsugarmeasurementalert">Предупреждение за измерване на КЗ</string>
@@ -793,6 +782,7 @@
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">преди</string>
     <string name="format_hours">%1$.2f ч</string>
+    <string name="format_mins">%1$d мин</string>
     <string name="enablesmbalways">Разреши SMB постоянно</string>
     <string name="enablesmbalways_summary">Разрешава SMB постоянно и независимо от болусите. Възможно само с източник на КЗ с добра филтрация като G5  </string>
     <string name="enablesmbaftercarbs">Разреши SMB след въглехидрати</string>
@@ -969,11 +959,11 @@
     <string name="danar_pumpalarm_sound">Звукова</string>
     <string name="danar_pumpalarm_vibrate">Вибрация</string>
     <string name="danar_pumpalarm_both">И двете</string>
-    <string name="danar_screentimeout">Включен екран за [сек]</string>
-    <string name="danar_backlight">Подсветка за [сек]</string>
+    <string name="danar_screentimeout">Включен екран за [seconds]</string>
+    <string name="danar_backlight">Подсветка [seconds]</string>
     <string name="danar_glucoseunits">Единици на КЗ</string>
-    <string name="danar_shutdown">Изключване след(часа)</string>
-    <string name="danar_lowreservoir">Минимален инсулин в резервоара (единици)</string>
+    <string name="danar_shutdown">Изключване след [hours]</string>
+    <string name="danar_lowreservoir">Минимален инсулин в резервоара [Units]</string>
     <string name="danar_saveuseroptions">Запиши опциите в помпата</string>
     <string name="option_on">Вкл</string>
     <string name="option_off">Изкл</string>
@@ -1219,15 +1209,20 @@
     <string name="longitude_short">Дължина:</string>
     <string name="distance_short">Разсt [м]:</string>
     <string name="name_short">Име:</string>
-    <string name="locationis">Местоположението e %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Когато </string>
+    <string name="location_inside">Когато сте в зоната</string>
+    <string name="location_outside">Когато сте извън зоната на</string>
+    <string name="location_going_in">Когато влезе в тази зона</string>
+    <string name="location_going_out">Когато напуснете тази зона</string>
     <string name="lastboluslabel">Последен болус</string>
     <string name="lastboluscompared">Последен болус преди %1$s %2$s минути</string>
     <string name="triggercoblabel">Активни въглехидрати</string>
     <string name="cobcompared">Въгл %1$s %2$.0f</string>
     <string name="taskname">Име на правилото</string>
     <string name="edit_short">РЕД</string>
-    <string name="please_choose_an_action_type">Моля изберете действие:</string>
-    <string name="please_choose_a_trigger_type">Моля изберете условие:</string>
+    <string name="please_choose_an_action_type">Избиране на действие</string>
+    <string name="please_choose_a_trigger_type">Иберете условие</string>
     <string name="triggers">Активиращи условия:</string>
     <string name="remove_label">ИЗТРИИ</string>
     <string name="preconditions">Предварителни условия:</string>
@@ -1320,7 +1315,6 @@
     <string name="medtronic_error_pump_frequency_invalid">Честотата не се поддържа.</string>
     <string name="medtronic_error_rileylink_address_invalid">Грешен RileyLink адрес.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Откритата помпа не е идентична с кокнфигурираната.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Базалните профили не са разрешени в помпата.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Базалния профил в помпата е грешен (трябва да е STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Грешен тип TBR в помпата ( трябва да е Absolute).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Грешен максимален болус в помпата ( трябвба да е %1$.2f).</string>
@@ -1371,7 +1365,7 @@
     <string name="automation_trigger_pump_last_connection_description">Последнa връзкa с помпата [минути]</string>
     <string name="automation_trigger_pump_last_connection_compared">Последна връзка с помпата е %1$s %2$s минути преди</string>
     <string name="sendsmsactionlabel">Изпращане на SMS с текст %1$s</string>
-    <string name="sendsmsactiondescription">Изпрати SMS до всички телефони от настройките</string>
+    <string name="sendsmsactiondescription">Изпратете SMS на всички</string>
     <string name="sendsmsactiontext">Изпрати SMS с текст</string>
     <string name="insulinFromCob"><![CDATA[Въгл срещу АИ: <font color=\'%1$s\'>%2$+.2fг Е</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Ограничение на болуса: %2$.2fЕ на %3$.2fЕ</font>]]></string>
@@ -1439,4 +1433,13 @@
     <string name="randombg">Произволна КЗ</string>
     <string name="description_source_randombg">Генерира произволни захари(демо режим)</string>
     <string name="randombg_short">КЗ</string>
+    <string name="tools">Инструменти</string>
+    <string name="show_calculation">Покажи изчисленията</string>
+    <string name="error">Грешка</string>
+    <string name="timeformat12h">12ч</string>
+    <string name="timeformat24h">24ч</string>
+    <string name="automation_event">Събитие</string>
+    <string name="alreadyset">Вече направено</string>
+    <string name="message">Съобщение</string>
+    <string name="clearqueueconfirm">Изтрий опашка? Всички данни ще се загубят!</string>
 </resources>

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

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Inz:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Celkové IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Množství inzulínu</string>
-    <string name="treatments_newtreatment_carbsamount_label">Množství sacharidů</string>
     <string name="treatments_wizard_bg_label">Glykémie</string>
     <string name="treatments_wizard_tt_label">DC</string>
     <string name="treatments_wizard_carbs_label">Sacharidy</string>
@@ -114,7 +112,6 @@
     <string name="overview">Přehled</string>
     <string name="nsprofile">NS profil</string>
     <string name="simpleprofile">Jednoduchý profil</string>
-    <string name="tempbasal">DočasnýBazál</string>
     <string name="treatments">Ošetření</string>
     <string name="virtualpump">Virtuální pumpa</string>
     <string name="careportal">Péče</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">Mimo povolený rozsah</string>
     <string name="treatmentdeliveryerror">Chyba podání bolusu</string>
     <string name="tempbasaldeliveryerror">Chyba nastavování dočasného bazálu</string>
-    <string name="overview_newtempbasal_basalpercent">Hodnota bazálu [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = současný)</string>
+    <string name="overview_newtempbasal_basalpercent">Hodnota bazálu [%]</string>
     <string name="setbasalquestion">Spustit nový dočasný bazál:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Kalkulačka</string>
     <string name="constraintapllied">Aplikováno omezení!</string>
     <string name="confirmation">Potvrzení</string>
-    <string name="entertreatmentquestion">Aplikovat bolus:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazál</string>
     <string name="sms_basal">Bazál:</string>
     <string name="carbs">Sacharidy</string>
     <string name="changeyourinput">Změňte zadání!</string>
-    <string name="setextendedbolusquestion">Spustit nový prodloužený bolus:</string>
     <string name="configbuilder_bgsource">Zdroj glykémie</string>
     <string name="configbuilder_bgsource_description">Odkud má získávat AndroidAPS glykémie?</string>
     <string name="xdrip">xDrip</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">Procenta</string>
     <string name="careportal_newnstreatment_absolute_label">Absolutní</string>
     <string name="careportal_newnstreatment_notes_label">Poznámky</string>
-    <string name="careportal_newnstreatment_eventtime_label">Čas</string>
+    <string name="event_time_label">Čas</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Zadal</string>
     <string name="careportal_newnstreatment_glucosetype">Zadání glykémie</string>
@@ -233,7 +227,7 @@
     <string name="connecting">Připojuji</string>
     <string name="connected">Připojeno</string>
     <string name="disconnected">Odpojeno</string>
-    <string name="danar_pump_settings">DanaR nastavení</string>
+    <string name="danar_pump_settings">Nastavení pumpy Dana</string>
     <string name="end_user_license_agreement">Licenční ujednání</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">ROZUMÍM A POTVRZUJI</string>
@@ -422,7 +416,7 @@
     <string name="eatingsoon">Před jídlem</string>
     <string name="hypo">Hypoglykémie</string>
     <string name="activity">Aktivita</string>
-    <string name="removerecord">Odstranit záznam:</string>
+    <string name="removerecord">Odstranit záznam</string>
     <string name="danar_stats">Statistika z pumpy</string>
     <string name="danar_stats_cumulative_tdd">Kumulativní TDD</string>
     <string name="danar_stats_expweight">Exponenciálně vážené TDD</string>
@@ -583,16 +577,13 @@
     <string name="ns_noupload_summary">Všechna data odeslaná do NS jsou zahozena. AAPS je připojen k NS, ale nedělá do něj žádné změny</string>
     <string name="basal_step">Krok bazálu</string>
     <string name="bolus_step">Krok bolusu</string>
-    <string name="extendedbolus">ProdlouženýBolus</string>
-    <string name="temptarget">DočasnýCíl</string>
     <string name="overview_extendedbolus_cancel_button">Zrušit prodloužený bolus</string>
     <string name="careportal_sensorage_label">Stáří senzoru</string>
     <string name="careportal_canulaage_label">Stáří kanyly</string>
     <string name="careportal_insulinage_label">Stáří inzulínu</string>
     <string name="hours">hodin</string>
-    <string name="overview_newtempbasal_basaltype_label">Typ bazálu</string>
     <string name="invalidprofile">Chybný profil !!!</string>
-    <string name="profileswitch">Přepnutí profilu</string>
+    <string name="doprofileswitch">Proveďte přepnutí profilu</string>
     <string name="careportal_pbage_label">Stáří baterie v pumpě</string>
     <string name="careportal_pumpbatterychange">Výměna baterie pumpy</string>
     <string name="ns_alarmoptions">Nastavení alarmů</string>
@@ -641,7 +632,6 @@
     <string name="careportal_carbsandbolus_label">SACHARIDY &amp; BOLUSY</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">PUMPA</string>
-    <string name="overview_newtempbasal_basalabsolute">Hodnota bazálu [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Trvání [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -661,7 +651,7 @@
     <string name="waitingforpairing">Čekání na spárování na pumpě</string>
     <string name="pairingok">Spárováno</string>
     <string name="pairingtimedout">Vypršel časový limit pro párování</string>
-    <string name="pairing">PÁROVÁNÍ</string>
+    <string name="pairing">Párování</string>
     <string name="danars_nodeviceavailable">Prozatím žádné zařízení nenalezeno</string>
     <string name="emptyreservoir">Prázdný zásobník</string>
     <string name="bloodsugarmeasurementalert">Výstraha měření glykémie</string>
@@ -772,7 +762,7 @@
     <string name="bolus_frequency_exceeded">Bolus stejné velikosti už byl během poslední minuty požadován. Jako preventivní ochrana před zdvojeným bolusem byla operace zakázána.</string>
     <string name="combo_pump_connected_now">Teď</string>
     <string name="combo_activity_reading_pump_history">Načítání historie pumpy</string>
-    <string name="danar_history">Historie</string>
+    <string name="danar_history">Historie pumpy</string>
     <string name="combo_activity_setting_basal_profile">Nastavení bazálního profilu</string>
     <string name="combo_pump_cartridge_low_warrning">V zásobníku je málo inzulínu</string>
     <string name="combo_pump_battery_low_warrning">Slabá baterie v pumpě</string>
@@ -792,6 +782,7 @@
     <string name="insightpump_shortname">Insight</string>
     <string name="ago">zpět</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
     <string name="enablesmbalways">Vždy povolit SMB</string>
     <string name="enablesmbalways_summary">Povolit SMB nezávisle na bolusech. Možno pouze se zdroji glykémií s dobrým filtrováním dat, jako např. G5</string>
     <string name="enablesmbaftercarbs">Povolit SMB po jídle</string>
@@ -968,11 +959,11 @@
     <string name="danar_pumpalarm_sound">Zvuk</string>
     <string name="danar_pumpalarm_vibrate">Vibrace</string>
     <string name="danar_pumpalarm_both">Oboje</string>
-    <string name="danar_screentimeout">Čas před vypnutím displeje [s]</string>
-    <string name="danar_backlight">Podsvícení [s]</string>
+    <string name="danar_screentimeout">Čas před vypnutím displeje [sekundy]</string>
+    <string name="danar_backlight">Podsvícení [sekundy]</string>
     <string name="danar_glucoseunits">Jednotky</string>
-    <string name="danar_shutdown">Vypnutí [h]</string>
-    <string name="danar_lowreservoir">Nízký stav zásobníku [U]</string>
+    <string name="danar_shutdown">Vypnutí [hodiny]</string>
+    <string name="danar_lowreservoir">Nízký stav zásobníku [Jednotky]</string>
     <string name="danar_saveuseroptions">Uložit do pumpy</string>
     <string name="option_on">ZAP</string>
     <string name="option_off">VYP</string>
@@ -1218,15 +1209,20 @@
     <string name="longitude_short">Zem. délka:</string>
     <string name="distance_short">Vzdálenost [m]:</string>
     <string name="name_short">Jméno:</string>
-    <string name="locationis">Poloha je %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Kdy </string>
+    <string name="location_inside">Když se nacházíte v oblasti</string>
+    <string name="location_outside">Když se nacházíte mimo oblast</string>
+    <string name="location_going_in">Když vstoupíte do oblasti s názvem</string>
+    <string name="location_going_out">Když opustíte oblast s názvem</string>
     <string name="lastboluslabel">Poslední bolus</string>
     <string name="lastboluscompared">Poslední bolus %1$s před %2$s min</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Název úkolu</string>
     <string name="edit_short">EDIT</string>
-    <string name="please_choose_an_action_type">Zvolte typ akce prosím:</string>
-    <string name="please_choose_a_trigger_type">Zvolte typ podmínky:</string>
+    <string name="please_choose_an_action_type">Vyberte akci</string>
+    <string name="please_choose_a_trigger_type">Vyberte podmínku</string>
     <string name="triggers">Podmínky:</string>
     <string name="remove_label">ODSTRANIT</string>
     <string name="preconditions">Nutné podmínky:</string>
@@ -1319,7 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Nepodporovaná frekvence pumpy.</string>
     <string name="medtronic_error_rileylink_address_invalid">Chybná adresa RileyLinku.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Detekovaná pumpa je jiného typu než nakonfigurovaná.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Bazální profily nejsou na pumpě povolené.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Nastavení bazálních profilů/vzorů není na pumpě povoleno. Povolte je na pumpě.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Bazální profil na pumpě je chybný (musí být STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Chybný typ dočasného bazálu na pumpě (musí být absolutní).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Chybný max. bolus na pumpě (musí být %1$.2f).</string>
@@ -1370,7 +1366,7 @@
     <string name="automation_trigger_pump_last_connection_description">Poslední připojení k pumpě před [minutami]</string>
     <string name="automation_trigger_pump_last_connection_compared">Poslední připojení k pumpě %1$s před %2$s minutami</string>
     <string name="sendsmsactionlabel">Poslat SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Odeslat SMS na všechna čísla v předvolbách</string>
+    <string name="sendsmsactiondescription">Poslat SMS na všechna čísla</string>
     <string name="sendsmsactiontext">Odeslat SMS s textem</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Aplikováno omezení bolusu: %2$.2fU na %3$.2fU</font>]]></string>
@@ -1435,4 +1431,16 @@
     <string name="activitymonitor">Monitor aktivity</string>
     <string name="doyouwantresetstats">Chcete resetovat statistiky aktivity?</string>
     <string name="statistics">Statistika</string>
+    <string name="randombg">Náhodná glykémie</string>
+    <string name="description_source_randombg">Generovat náhodná data glykémie (pouze režim Demo)</string>
+    <string name="randombg_short">GLYK</string>
+    <string name="tools">Nástroje</string>
+    <string name="show_calculation">Zobrazit kalkulaci</string>
+    <string name="error">Chyba</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">Událost automatizace</string>
+    <string name="alreadyset">Již nastaveno</string>
+    <string name="message">Zpráva</string>
+    <string name="clearqueueconfirm">Vymazat frontu? Všechna data ve frontě budou ztracena!</string>
 </resources>

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

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Gesamt IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulin-Menge</string>
-    <string name="treatments_newtreatment_carbsamount_label">Kohlenhydrat-Menge</string>
     <string name="treatments_wizard_bg_label">BZ</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Kohlenhydrate</string>
@@ -114,7 +112,6 @@
     <string name="overview">Übersicht</string>
     <string name="nsprofile">Nightscout-Profil</string>
     <string name="simpleprofile">Einfaches Profil</string>
-    <string name="tempbasal">TBR</string>
     <string name="treatments">Behandlungen</string>
     <string name="virtualpump">Virtuelle Pumpe</string>
     <string name="careportal">Careportal</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">Beschränkungen wurden verletzt oder Limit erreicht.</string>
     <string name="treatmentdeliveryerror">Bolus-Abgabefehler</string>
     <string name="tempbasaldeliveryerror">TBR Abgabe-Fehler</string>
-    <string name="overview_newtempbasal_basalpercent">Basal-Wert [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = aktuell)</string>
+    <string name="overview_newtempbasal_basalpercent">Basal-Wert [%]</string>
     <string name="setbasalquestion">Akzeptiere neue TBR:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Rechner</string>
     <string name="constraintapllied">Beschränkungen angewendet!</string>
     <string name="confirmation">Bestätigung</string>
-    <string name="entertreatmentquestion">Gebe neue Behandlung ein:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
     <string name="carbs">Kohlenhydrate</string>
     <string name="changeyourinput">Ändere deine Eingabe!</string>
-    <string name="setextendedbolusquestion">Setze neuen verzögerten Bolus:</string>
     <string name="configbuilder_bgsource">BZ-Quelle</string>
     <string name="configbuilder_bgsource_description">Woher soll AndroidAPS seine Blutzuckerwerte beziehen?</string>
     <string name="xdrip">xDrip</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">Prozent</string>
     <string name="careportal_newnstreatment_absolute_label">Absolut</string>
     <string name="careportal_newnstreatment_notes_label">Notiz</string>
-    <string name="careportal_newnstreatment_eventtime_label">Ereignis-Zeit</string>
+    <string name="event_time_label">Ereignis-Zeit</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Eingegeben durch</string>
     <string name="careportal_newnstreatment_glucosetype">Glukose-Art</string>
@@ -233,7 +227,7 @@
     <string name="connecting">Verbinden</string>
     <string name="connected">Verbunden</string>
     <string name="disconnected">Getrennt</string>
-    <string name="danar_pump_settings">DanaR Pumpen-Einstellungen</string>
+    <string name="danar_pump_settings">Dana Pumpen-Einstellungen</string>
     <string name="end_user_license_agreement">Endbenutzervereinbarung</string>
     <string name="end_user_license_agreement_text">DAS PROGRAMM DARF NICHT FÜR MEDIZINISCHE ENTSCHEIDUNGEN BENUTZT WERDEN. ES GIBT IN DIESEM PROJEKT KEINE GEWÄHRLEISTUNG ODER GARANTIERTE UNTERSTÜTZUNG IN IRGENDEINER ART. WENN DU DICH ENTSCHEIDEST, ES ZU NUTZEN, HÄNGT DIE QUALITÄT UND LEISTUNGSFÄHIGKEIT DIESES PROJEKTES VON DIR SELBST AB. ES WIRD \"WIE BESEHEN\" ZUR VERFÜGUNG GESTELLT. SOLLTE SICH DAS PROGRAMM ALS FEHLERHAFT ERWEISEN, ÜBERNEHMEN SIE ALLE NOTWENDIGEN KRANKHEITSKOSTEN, SERVICELEISTUNGEN, REPARATUREN ODER KORREKTUREN.</string>
     <string name="end_user_license_agreement_i_understand">Ich verstehe und stimme zu.</string>
@@ -422,7 +416,7 @@
     <string name="eatingsoon">Bald essen</string>
     <string name="hypo">Hypo</string>
     <string name="activity">Aktivität</string>
-    <string name="removerecord">Lösche Eintrag:</string>
+    <string name="removerecord">Eintrag löschen</string>
     <string name="danar_stats">DanaR Statistiken</string>
     <string name="danar_stats_cumulative_tdd">Kumulative TDD</string>
     <string name="danar_stats_expweight">Exponentiell gewichtete TDD</string>
@@ -583,16 +577,12 @@
     <string name="ns_noupload_summary">Alle an Nightscout gesendeten Daten werden verworfen. AAPS ist verbunden, aber Nightscout-Daten werden nicht geändert.</string>
     <string name="basal_step">Basal-Schritt</string>
     <string name="bolus_step">Bolus-Schritt</string>
-    <string name="extendedbolus">Verzögerter Bolus</string>
-    <string name="temptarget">Temporäres Ziel</string>
     <string name="overview_extendedbolus_cancel_button">Verzögerten Bolus abbrechen</string>
     <string name="careportal_sensorage_label">Sensoralter</string>
     <string name="careportal_canulaage_label">Katheteralter</string>
     <string name="careportal_insulinage_label">Insulinalter</string>
     <string name="hours">Stunden</string>
-    <string name="overview_newtempbasal_basaltype_label">Basaltyp</string>
     <string name="invalidprofile">Ungültiges oder defektes Profil!</string>
-    <string name="profileswitch">Profilwechsel</string>
     <string name="doprofileswitch">Profilwechsel durchführen</string>
     <string name="careportal_pbage_label">Batteriealter</string>
     <string name="careportal_pumpbatterychange">Pumpenbatterie Wechsel</string>
@@ -642,7 +632,6 @@
     <string name="careportal_carbsandbolus_label">CARBS &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">PUMPE</string>
-    <string name="overview_newtempbasal_basalabsolute">Basal Wert [IE/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Dauer [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -662,7 +651,7 @@
     <string name="waitingforpairing">Auf Verbindung warten</string>
     <string name="pairingok">Pairing OK</string>
     <string name="pairingtimedout">Zeitüberschreitung beim Pairing</string>
-    <string name="pairing">PAIRING</string>
+    <string name="pairing">Koppeln</string>
     <string name="danars_nodeviceavailable">Pumpe noch nicht gefunden</string>
     <string name="emptyreservoir">Reservoir leer</string>
     <string name="bloodsugarmeasurementalert">Alarm BZ-Messung</string>
@@ -773,7 +762,7 @@
     <string name="bolus_frequency_exceeded">Ein gleich großer Bolus wurde in den letzten zwei Minuten angefordert. Dies ist nicht zulässig, um ungewollte Doppelboli zu verhindern und vor eventuellen Bugs zu schützen.</string>
     <string name="combo_pump_connected_now">Jetzt</string>
     <string name="combo_activity_reading_pump_history">Historie wird gelesen</string>
-    <string name="danar_history">Pumpen-Speicher</string>
+    <string name="danar_history">Pumpen Historie</string>
     <string name="combo_activity_setting_basal_profile">BR-Profil wird aktualisiert.</string>
     <string name="combo_pump_cartridge_low_warrning">Das Reservoir in der Pumpe ist fast leer</string>
     <string name="combo_pump_battery_low_warrning">Die Batterie in der Pumpe ist fast leer</string>
@@ -793,6 +782,7 @@
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">her</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d mins</string>
     <string name="enablesmbalways">SMB immer aktivieren</string>
     <string name="enablesmbalways_summary">Aktiviere SMB immer, unabhängig von Boli. Dies ist nur möglich, wenn eine BZ-Quelle genutzt wird, die die Daten besonders gut filtert wie z. B. G5.</string>
     <string name="enablesmbaftercarbs">Aktiviere SMB nach Mahlzeiten.</string>
@@ -969,10 +959,10 @@
     <string name="danar_pumpalarm_sound">Töne</string>
     <string name="danar_pumpalarm_vibrate">Vibration</string>
     <string name="danar_pumpalarm_both">Beides</string>
-    <string name="danar_screentimeout">LCD-Einschaltdauer [s]</string>
-    <string name="danar_backlight">Einschaltdauer der Hintergrundbeleuchtung [s]</string>
+    <string name="danar_screentimeout">LCD-Einschaltdauer [Sek.]</string>
+    <string name="danar_backlight">Einschaltdauer Hintergrundbeleuchtung [Sek.]</string>
     <string name="danar_glucoseunits">BZ-Einheit</string>
-    <string name="danar_shutdown">Abschalten (h)</string>
+    <string name="danar_shutdown">Abschalten (Std.)</string>
     <string name="danar_lowreservoir">Reservoir fast leer (IE)</string>
     <string name="danar_saveuseroptions">In Pumpe speichern</string>
     <string name="option_on">Ein</string>
@@ -1220,15 +1210,20 @@ Unerwartetes Verhalten.</string>
     <string name="longitude_short">Längengrad:</string>
     <string name="distance_short">Umkreis [m]:</string>
     <string name="name_short">Name:</string>
-    <string name="locationis">Standort: %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Wenn </string>
+    <string name="location_inside">Wenn Du innerhalb des Gebietes bist</string>
+    <string name="location_outside">Wenn Du außerhalb des Gebietes bist</string>
+    <string name="location_going_in">Beim Betreten des angegebenen Gebiets</string>
+    <string name="location_going_out">Beim Verlassen des angegebenen Gebiets</string>
     <string name="lastboluslabel">Letzter Bolus vor</string>
     <string name="lastboluscompared">Letzter Bolus vor %1$s %2$s Min</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Name der Aufgabe</string>
     <string name="edit_short">BEARBEITEN</string>
-    <string name="please_choose_an_action_type">Bitte wähle eine Aktion:</string>
-    <string name="please_choose_a_trigger_type">Bitte wähle einen Auslöser:</string>
+    <string name="please_choose_an_action_type">Aktion wählen</string>
+    <string name="please_choose_a_trigger_type">Auslöser wählen</string>
     <string name="triggers">Auslöser:</string>
     <string name="remove_label">ENTFERNEN</string>
     <string name="preconditions">Voraussetzung:</string>
@@ -1321,7 +1316,7 @@ Unerwartetes Verhalten.</string>
     <string name="medtronic_error_pump_frequency_invalid">Pumpen-Frequenz nicht unterstützt.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink Adresse ungültig.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Erkannter Pumpentyp entspricht nicht dem eingestellen Pumpentyp.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basalprofile auf Pumpe nicht aktiviert.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Einstellung für Basalprofile/-muster ist auf der Pumpe nicht aktiviert. Aktiviere es auf der Pumpe.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Das eingestellte Basalprofl der Pumpe ist falsch (muss STD sein).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Falscher TBR-Typ auf der Pumpe (muss \"Absolut\" sein).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Falscher Max-Bolus auf Pumpe eingestellt (muss %1$.2f sein).</string>
@@ -1372,7 +1367,7 @@ Unerwartetes Verhalten.</string>
     <string name="automation_trigger_pump_last_connection_description">Letzte Verbindung zur Pumpe [vor X Minuten]</string>
     <string name="automation_trigger_pump_last_connection_compared">Letzte Verbindung zur Pumpe vor %1$s %2$s Minuten</string>
     <string name="sendsmsactionlabel">SMS senden: %1$s</string>
-    <string name="sendsmsactiondescription">SMS an alle vorgegebenen Nummern senden</string>
+    <string name="sendsmsactiondescription">SMS an alle Nummern senden</string>
     <string name="sendsmsactiontext">SMS mit Text senden</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus-Einschränkung angewendet: %2$.2fIE zu %3$.2fIE</font>]]></string>
@@ -1440,4 +1435,13 @@ Unerwartetes Verhalten.</string>
     <string name="randombg">Zufalls-BZ</string>
     <string name="description_source_randombg">Zufalls-BZ Daten erstellen (nur Demo-Modus)</string>
     <string name="randombg_short">BZ</string>
+    <string name="tools">Tools</string>
+    <string name="show_calculation">Berechnung anzeigen</string>
+    <string name="error">Fehler</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">Automatisierungs-Ereignis</string>
+    <string name="alreadyset">Bereits festgelegt</string>
+    <string name="message">Nachricht</string>
+    <string name="clearqueueconfirm">Warteschlange löschen? Alle Daten in der Warteschlange gehen verloren!</string>
 </resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Συνολική IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Ινσουλίνη</string>
-    <string name="treatments_newtreatment_carbsamount_label">Υδατάνθρακες</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Υδατάνθρακες</string>
@@ -114,7 +112,6 @@
     <string name="overview">Επισκόπηση</string>
     <string name="nsprofile">Προφίλ NS</string>
     <string name="simpleprofile">Απλό Προφίλ</string>
-    <string name="tempbasal">Προσωρινός Ρυθμός</string>
     <string name="treatments">Θεραπείες</string>
     <string name="virtualpump">Εικονική Αντλία</string>
     <string name="careportal">Φροντίδα</string>
@@ -146,21 +143,17 @@
     <string name="constraints_violation">Παραβίαση Περιορισμών</string>
     <string name="treatmentdeliveryerror">Σφάλμα παράδοσης Bolus</string>
     <string name="tempbasaldeliveryerror">Σφάλμα παράδοσης Προσ Ρυθμού</string>
-    <string name="overview_newtempbasal_basalpercent">Τιμή Βασικού [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = τρέχων)</string>
     <string name="setbasalquestion">Αποδοχή νέου Προσ Ρυθμού:</string>
     <string name="overview_treatment_label">Θεραπεία</string>
     <string name="overview_calculator_label">Υπολογιστής</string>
     <string name="constraintapllied">Εφαρμόστηκαν Περιορισμοί!</string>
     <string name="confirmation">Επιβεβαίωση</string>
-    <string name="entertreatmentquestion">Εισάγετε νέα Θεραπεία:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Βασικός Ρυθμός</string>
     <string name="sms_basal">Βασικός Ρυθμός:</string>
     <string name="carbs">Υδατάνθρακες</string>
     <string name="changeyourinput">Αλλάξτε αυτό που εισάγατε!</string>
-    <string name="setextendedbolusquestion">Θέστε νέο εκτεταμμένο bolus:</string>
     <string name="configbuilder_bgsource">Πηγή BG</string>
     <string name="configbuilder_bgsource_description">Από πού πρέπει το AndroidAPS να πάρει τα δεδομένα του;</string>
     <string name="xdrip">xDrip</string>
@@ -187,7 +180,6 @@
     <string name="careportal_cgmsensorinsert">Εισαγωγή Αισθητήρα CGM</string>
     <string name="careportal_cgmsensorstart">Έναρξη Αισθητήρα CGM</string>
     <string name="careportal_insulincartridgechange">Αλλαγή Αμπούλας Ινσουλίνης</string>
-    <string name="careportal_profileswitch">Αλλαγή Προφίλ</string>
     <string name="careportal_snackbolus">Bolus για σνακ</string>
     <string name="careportal_mealbolus">Bolus Γεύματος</string>
     <string name="careportal_correctionbolus">Διορθωτικό Bolus</string>
@@ -208,7 +200,6 @@
     <string name="careportal_newnstreatment_percent_label">Ποσοστό</string>
     <string name="careportal_newnstreatment_absolute_label">Απόλυτο</string>
     <string name="careportal_newnstreatment_notes_label">Σημειώσεις</string>
-    <string name="careportal_newnstreatment_eventtime_label">Ώρα Συμβάντος</string>
     <string name="careportal_newnstreatment_profile_label">Προφίλ</string>
     <string name="careportal_newnstreatment_enteredby_title">Εισαγωγή από</string>
     <string name="careportal_newnstreatment_glucosetype">Τύπος Γλυκόζης</string>
@@ -233,7 +224,6 @@
     <string name="connecting">Συνδέεται</string>
     <string name="connected">Συνδέθηκε</string>
     <string name="disconnected">Αποσυνδέθηκε</string>
-    <string name="danar_pump_settings">Ρυθμίσεις αντλίας DanaR</string>
     <string name="end_user_license_agreement">Άδεια χρήσης τελικού χρήστη</string>
     <string name="end_user_license_agreement_text">ΔΕΝ ΠΡΕΠΕΙ ΝΑ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΓΙΑ ΝΑ ΚΑΝΕΤΕ ΙΑΤΡΙΚΗ ΑΠΟΦΑΣΗ. ΔΕΝ ΥΠΑΡΧΕΙ ΕΓΓΥΗΣΗ ΓΙΑ ΤΟ ΠΡΟΓΡΑΜΜΑ, ΣΤΟ ΒΑΘΜΟ ΠΟΥ ΕΠΙΤΡΕΠΕΤΑΙ ΑΠΟ ΤΟ ΕΦΑΡΜΟΣΤΕΟ ΔΙΚΑΙΟ. ΕΚΤΟΣ ΟΠΟΙΑΣΔΗΠΟΤΕ ΔΙΑΒΑΘΜΙΣΜΕΝΗ ΚΑΤΑ ΤΗΝ ΕΓΓΡΑΦΗ ΤΩΝ ΚΑΤΟΧΟΙ ΠΝΕΥΜΑΤΙΚΩΝ ΔΙΚΑΙΩΜΑΤΩΝ ΚΑΙ/Ή ΑΛΛΑ ΜΕΡΗ ΠΑΡΕΧΟΝΤΑΙ ΤΟ ΠΡΟΓΡΑΜΜΑ \"ΩΣ ΕΧΕΙ\" ΧΩΡΙΣ ΕΓΓΥΗΣΗ ΟΠΟΙΟΥΔΗΠΟΤΕ ΕΙΔΟΥΣ, ΕΞΑΙΡΟΥΜΕΝΕΣ Ή ΣΙΩΠΗΡΕΣ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΕΝΔΕΙΚΤΙΚΑ, ΤΩΝ ΣΙΩΠΗΡΩΝ ΕΓΓΥΗΣΕΩΝ ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ΚΑΙ ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Ο ΟΛΟΚΛΗΡΩΜΕΝΟΣ ΚΙΝΔΥΝΟΣ ΟΣΟΝ ΑΦΟΡΑ ΤΗΝ ΠΟΙΟΤΗΤΑ ΚΑΙ ΤΗΝ ΑΠΟΔΟΣΗ ΤΟΥ ΠΡΟΓΡΑΜΜΑΤΟΣ ΕΙΝΑΙ ΔΙΚΟ ΣΑΣ. ΕΑΝ ΤΟ ΠΡΟΓΡΑΜΜΑ ΔΕΝ ΕΙΝΑΙ ΕΛΑΤΤΩΜΑΤΙΚΟ, ΠΡΕΠΕΙ ΝΑ ΕΞΕΤΑΣΤΕ ΤΟ ΚΟΣΤΟΣ ΟΛΩΝ ΤΩΝ ΑΠΑΡΑΙΤΗΤΩΝ ΣΥΝΤΗΡΗΣΕΩΝ, ΕΠΙΣΚΕΥΩΝ Ή ΔΙΟΡΘΩΣΕΩΝ.</string>
     <string name="end_user_license_agreement_i_understand">ΚΑΤΑΛΑΒΑ ΚΑΙ ΣΥΜΦΩΝΩ</string>
@@ -270,8 +260,6 @@
     <string name="glucosetype_finger">Δάκτυλο</string>
     <string name="glucosetype_sensor">Αισθητήρας</string>
     <string name="manual">Χειροκίνητα</string>
-    <string name="careportal_temporarytarget">Προσωρινός Στόχος</string>
-    <string name="careportal_temporarytargetcancel">Ακύρωση Προσωρινού Στόχου</string>
     <string name="danarprofile">Ρυθμίσεις προφίλ DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Διάρκεια Δράσης Ινσουλίνης</string>
@@ -404,7 +392,6 @@
     <string name="eatingsoon">Γεύμα Σύντομα</string>
     <string name="hypo">Υπογλυκαιμία</string>
     <string name="activity">Άσκηση</string>
-    <string name="removerecord">Διαγραφή εγγραφής:</string>
     <string name="danar_stats">Στατιστικά DanaR</string>
     <string name="danar_stats_cumulative_tdd">Άθροισμα TDD</string>
     <string name="danar_stats_expweight">Εκθετικά Σταθμισμένο TDD</string>
@@ -565,16 +552,12 @@
     <string name="ns_noupload_summary">Όλα τα δεδομένα που αποστέλλονται στην NS έχουν καταργηθεί. Το AAPS συνδέεται με NS, αλλά δεν γίνεται καμία αλλαγή στα NS</string>
     <string name="basal_step">Βήμα Βασικού</string>
     <string name="bolus_step">Βήμα Bolus</string>
-    <string name="extendedbolus">Εκτεταμένο Bolus</string>
-    <string name="temptarget">Στόχος Προσ Ρυθμού</string>
     <string name="overview_extendedbolus_cancel_button">Ακύρωση Εκτεταμμένου bolus</string>
     <string name="careportal_sensorage_label">Χρόνος ζωής Αισθητήρα</string>
     <string name="careportal_canulaage_label">Χρόνος ζωής Κάνουλας</string>
     <string name="careportal_insulinage_label">Χρόνος ζωής Ινσουλίνης</string>
     <string name="hours">ώρες</string>
-    <string name="overview_newtempbasal_basaltype_label">Τύπος Βασικού</string>
     <string name="invalidprofile">Μη έγκυρο προφίλ!!!</string>
-    <string name="profileswitch">Μεταβείτε στο προφίλ</string>
     <string name="careportal_pbage_label">Χρόνος ζωής μπαταρίας αντλίας</string>
     <string name="careportal_pumpbatterychange">Αλλαγή μπαταρίας αντλίας</string>
     <string name="ns_alarmoptions">Επιλογές συναγερμού</string>
@@ -623,7 +606,6 @@
     <string name="careportal_carbsandbolus_label">ΥΔΑΤΑΝΘΡΑΚΕΣ &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">ΑΝΤΛΙΑ</string>
-    <string name="overview_newtempbasal_basalabsolute">Τιμή Βασικού ρυθμού [U/h] </string>
     <string name="careportal_newnstreatment_duration_min_label">Διάρκεια [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -643,7 +625,6 @@
     <string name="waitingforpairing">Περιμένετε για σύζευξη με αντλία</string>
     <string name="pairingok">Σύζευξη ΟΚ</string>
     <string name="pairingtimedout">Τέλος χρόνου σύζευξης</string>
-    <string name="pairing">ΣΥΖΕΥΞΗ</string>
     <string name="danars_nodeviceavailable">Δεν βρέθηκε συσκευή ακόμα</string>
     <string name="emptyreservoir">Άδεια αμπούλα</string>
     <string name="bloodsugarmeasurementalert">Ειδοποίηση υψηλής τιμής σακχάρου</string>
@@ -752,7 +733,6 @@
     <string name="bolus_frequency_exceeded">Ένα bolus με την ίδια ποσότητα ζητήθηκε τα τελευταία 2 λεπτά. Για την αποφυγή κατά λάθους διπλών bolus και για ασφάλεια από λάθος του προγράμματος αυτό απαγορεύεται.</string>
     <string name="combo_pump_connected_now">Τώρα</string>
     <string name="combo_activity_reading_pump_history">Ανάγνωση ιστορικού αντλίας</string>
-    <string name="danar_history">ιστορικό αντλίας</string>
     <string name="combo_activity_setting_basal_profile">Ρύθμιση βασικού προφίλ</string>
     <string name="combo_pump_cartridge_low_warrning">Η στάθμη της αμπούλας της αντλίας είναι χαμηλά</string>
     <string name="combo_pump_battery_low_warrning">Η μπαταρία της αντλίας είναι χαμηλά</string>
@@ -948,11 +928,7 @@
     <string name="danar_pumpalarm_sound">Ήχος</string>
     <string name="danar_pumpalarm_vibrate">Δόνηση</string>
     <string name="danar_pumpalarm_both">Και τα δύο</string>
-    <string name="danar_screentimeout">Χρόνος ενεργής οθόνης [s]</string>
-    <string name="danar_backlight">Χρόνος οπίσθιου φωτισµού [s]</string>
     <string name="danar_glucoseunits">Μονάδες γλυκόζης</string>
-    <string name="danar_shutdown">Απενεργοποίηση(ώρες)</string>
-    <string name="danar_lowreservoir">Χαμηλή αμπούλα (μονάδες)</string>
     <string name="danar_saveuseroptions">Αποθήκευση ρυθμίσεων στην αντλία</string>
     <string name="option_on">Ενεργό</string>
     <string name="option_off">Ανενεργό</string>
@@ -1195,15 +1171,12 @@
     <string name="longitude_short">Lon:</string>
     <string name="distance_short">Αποστ [m]:</string>
     <string name="name_short">Όνομα:</string>
-    <string name="locationis">Η τοποθεσία είναι %1$s</string>
     <string name="lastboluslabel">Τελευταίο Bolus</string>
     <string name="lastboluscompared">Τελευταίο bolus %1$s %2$s λεπτά πριν</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Όνομα εργασίας</string>
     <string name="edit_short">Επεξεργασία</string>
-    <string name="please_choose_an_action_type">Επιλέξτε έναν τύπο δράσης:</string>
-    <string name="please_choose_a_trigger_type">Επιλέξτε έναν τύπο ενεργοποίησης:</string>
     <string name="triggers">Ενεργοποιήσεις:</string>
     <string name="remove_label">ΜΕΤΑΚΙΝΗΣΗ</string>
     <string name="preconditions">Προϋποθέσεις:</string>
@@ -1294,7 +1267,6 @@
     <string name="medtronic_error_pump_frequency_invalid">Συχνότητα Αντλίας δεν υποστηρίζεται.</string>
     <string name="medtronic_error_rileylink_address_invalid">Διεύθυνση RileyLink μη έγκυρη.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Ο τύπος αντλίας που ανιχνεύτηκε δεν είναι ο ίδιος με αυτόν που ορίστηκε.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Τα προφίλ βασικού δεν είναι ενεργοποιημένα στην αντλία.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Το βασικό προφίλ που ορίστηκε στην αντλία είναι λάθoς (πρέπει να είναι STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Λάθος τύπος TBR ορίστηκε στην αντλία (πρέπει να είναι Absolute).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Λάθος μέγιστο bolus ορίστηκε στην αντλία (πρέπει να είναι %1$.2f).</string>
@@ -1345,7 +1317,6 @@
     <string name="automation_trigger_pump_last_connection_description">Τελευταία σύνδεση με αντλία [λεπτά πριν]</string>
     <string name="automation_trigger_pump_last_connection_compared">Τελευταία σύνδεση με αντλία %1$s %2$s λεπτά πριν</string>
     <string name="sendsmsactionlabel">Στείλτε SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Στείλτε SMS προς όλους τους αριθμούς στις Επιλογές</string>
     <string name="sendsmsactiontext">Στείλτε SMS με κείμενο</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus constraint applied: %2$.2fU to %3$.2fU</font>]]></string>

app/src/main/res/values-es-rES/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB (Insulina Activa):</string>
     <string name="tempbasals_iobtotal_label_string">IOB Total:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulina [U]</string>
-    <string name="treatments_newtreatment_carbsamount_label">Carbohidratos [g]</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">OT</string>
     <string name="treatments_wizard_carbs_label">Carbohidratos</string>
@@ -114,7 +112,6 @@
     <string name="overview">Inicio</string>
     <string name="nsprofile">Perfil NS</string>
     <string name="simpleprofile">Perfil simple</string>
-    <string name="tempbasal">Basal temporal</string>
     <string name="treatments">Tratamientos</string>
     <string name="virtualpump">Bomba virtual</string>
     <string name="careportal">Portal de Tratamientos</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">Violación restricciones</string>
     <string name="treatmentdeliveryerror">Error de administración del bolo</string>
     <string name="tempbasaldeliveryerror">Basal Temporal no emitida</string>
-    <string name="overview_newtempbasal_basalpercent">Dosis basal [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = actual)</string>
+    <string name="overview_newtempbasal_basalpercent">Valor basal [%]</string>
     <string name="setbasalquestion">Aceptar nueva basal temporal:</string>
     <string name="overview_treatment_label">Tratamiento</string>
     <string name="overview_calculator_label">Calculadora</string>
     <string name="constraintapllied">Restricción aplicada!</string>
     <string name="confirmation">Confirmación</string>
-    <string name="entertreatmentquestion">Introduzca nuevo tratamiento:</string>
     <string name="bolus">Bolo</string>
     <string name="sms_bolus">Bolo:</string>
     <string name="basal">Dosis Basal</string>
     <string name="sms_basal">Dosis Basal:</string>
     <string name="carbs">Carbohidratos</string>
     <string name="changeyourinput">¡Cambiar datos!</string>
-    <string name="setextendedbolusquestion">Establecer nuevo bolo extendido:</string>
     <string name="configbuilder_bgsource">Origen BG</string>
     <string name="configbuilder_bgsource_description">¿De donde debe AndroidAPS obtener sus datos?</string>
     <string name="xdrip">xDrip</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">Dosis</string>
     <string name="careportal_newnstreatment_absolute_label">Absoluto</string>
     <string name="careportal_newnstreatment_notes_label">Notas</string>
-    <string name="careportal_newnstreatment_eventtime_label">Fecha Hora</string>
+    <string name="event_time_label">Hora del evento</string>
     <string name="careportal_newnstreatment_profile_label">Perfil</string>
     <string name="careportal_newnstreatment_enteredby_title">Introducido por</string>
     <string name="careportal_newnstreatment_glucosetype">Tipo de glucosa</string>
@@ -233,7 +227,7 @@
     <string name="connecting">Conectando</string>
     <string name="connected">Conectado</string>
     <string name="disconnected">Desconectado</string>
-    <string name="danar_pump_settings">Ajustes de la bomba DanaR</string>
+    <string name="danar_pump_settings">Ajustes de la bomba Dana</string>
     <string name="end_user_license_agreement">Acuerdo de licencia de usuario final</string>
     <string name="end_user_license_agreement_text">NO DEBE UTILIZARSE PARA TOMAR DECISIONES MÉDICAS. NO HAY NINGUNA GARANTÍA PARA EL PROGRAMA, EN LA MEDIDA PERMITIDA POR LA LEY APLICABLE. EXCEPTO CUANDO SE INDIQUE LO CONTRARIO POR ESCRITO, LOS TITULARES DE LOS DERECHOS DE AUTOR Y/O OTRAS PARTES PROPORCIONAN EL PROGRAMA \"TAL CUAL\" SIN GARANTÍA DE NINGÚN TIPO, YA SEA EXPRESA O IMPLÍCITA, INCLUIDAS, ENTRE OTRAS, LAS GARANTÍAS IMPLÍCITAS DE COMERCIABILIDAD Y ADECUACIÓN PARA UN PROPÓSITO EN PARTICULAR. TODO EL RIESGO EN CUANTO A LA CALIDAD Y EL RENDIMIENTO DEL PROGRAMA ES SUYA. SI EL PROGRAMA TUVIERA UN ERROR, USTED ASUME EL COSTE DE TODO SERVICIO, REPARACIÓN O CORRECCIÓN NECESARIOS.</string>
     <string name="end_user_license_agreement_i_understand">ENTIENDO Y ACEPTO</string>
@@ -422,7 +416,7 @@
     <string name="eatingsoon">ComidendoPronto</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Actividad</string>
-    <string name="removerecord">Eliminar registro:</string>
+    <string name="removerecord">Eliminar registro</string>
     <string name="danar_stats">Estadísticas de DanaR</string>
     <string name="danar_stats_cumulative_tdd">TDD acumulativa</string>
     <string name="danar_stats_expweight">TDD ampliada exponencialmente</string>
@@ -583,16 +577,12 @@
     <string name="ns_noupload_summary">Todos los datos mandados a NS son borrados. AAPS esta conectado a NS pero no hay cambios en NS</string>
     <string name="basal_step">Nivel base</string>
     <string name="bolus_step">Nivel bolo</string>
-    <string name="extendedbolus">Bolo extendido</string>
-    <string name="temptarget">Objectivo temporal</string>
     <string name="overview_extendedbolus_cancel_button">Cancelar bolo extendido</string>
     <string name="careportal_sensorage_label">Edad sensor</string>
     <string name="careportal_canulaage_label">Edad cánula</string>
     <string name="careportal_insulinage_label">Edad insulina</string>
     <string name="hours">horas</string>
-    <string name="overview_newtempbasal_basaltype_label">Tipo basal</string>
     <string name="invalidprofile">Perfil invalido !!!</string>
-    <string name="profileswitch">Cambio Perfil</string>
     <string name="doprofileswitch">Cambio de perfil</string>
     <string name="careportal_pbage_label">Edad batería bomba</string>
     <string name="careportal_pumpbatterychange">Cambio batería bomba</string>
@@ -642,7 +632,6 @@
     <string name="careportal_carbsandbolus_label">CARBS Y BOLUS</string>
     <string name="careportal_cgm_label">CGM Y OPENAPS</string>
     <string name="careportal_pump_label">BOMBA</string>
-    <string name="overview_newtempbasal_basalabsolute">Dosis basal [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Duración [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -662,7 +651,7 @@
     <string name="waitingforpairing">Esperando para conectar con bomba</string>
     <string name="pairingok">Conexión OK</string>
     <string name="pairingtimedout">Tiempo de Vinculación agotado</string>
-    <string name="pairing">CONECTANDO</string>
+    <string name="pairing">Emparejando</string>
     <string name="danars_nodeviceavailable">Aparato no encontrado</string>
     <string name="emptyreservoir">Deposito vacío</string>
     <string name="bloodsugarmeasurementalert">Alerta de control de BG</string>
@@ -773,7 +762,7 @@
     <string name="bolus_frequency_exceeded">Un bolo de mismo valor ha sido dado durante el pasado minuto. Para evitar bolos dobles y prevenir fallos de programa esto no está permitido.</string>
     <string name="combo_pump_connected_now">Ahora</string>
     <string name="combo_activity_reading_pump_history">Leyendo historia bomba</string>
-    <string name="danar_history">Historial</string>
+    <string name="danar_history">Historial de la bomba</string>
     <string name="combo_activity_setting_basal_profile">Activando perfil base</string>
     <string name="combo_pump_cartridge_low_warrning">Nivel del depósito bajo</string>
     <string name="combo_pump_battery_low_warrning">Batería casi agotada</string>
@@ -793,6 +782,7 @@
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">hace</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
     <string name="enablesmbalways">Habilitar SMB siempre</string>
     <string name="enablesmbalways_summary">Habilitar SMB siempre de forma independiente a los Bolos. Solo posible con fuente BG con buen filtrado de datos como G5</string>
     <string name="enablesmbaftercarbs">Habilitar SMB después de Carbohidratos</string>
@@ -969,11 +959,11 @@
     <string name="danar_pumpalarm_sound">Sonido</string>
     <string name="danar_pumpalarm_vibrate">Vibrar</string>
     <string name="danar_pumpalarm_both">Ambos</string>
-    <string name="danar_screentimeout">Tiempo LCD encendido [s]</string>
-    <string name="danar_backlight">Tiempo luz fondo encendida [s]</string>
+    <string name="danar_screentimeout">Tiempo de encendido de LCD [seconds]</string>
+    <string name="danar_backlight">Tiempo de luz fondo encendida [seconds]</string>
     <string name="danar_glucoseunits">Unidades de glucosa</string>
-    <string name="danar_shutdown">Apagar (horas)</string>
-    <string name="danar_lowreservoir">Deposito bajo (unidades)</string>
+    <string name="danar_shutdown">Apagar [hours]</string>
+    <string name="danar_lowreservoir">Depósito bajo [Units]</string>
     <string name="danar_saveuseroptions">Guardar las opciones en la bomba</string>
     <string name="option_on">Activado</string>
     <string name="option_off">Desactivado</string>
@@ -1219,15 +1209,20 @@
     <string name="longitude_short">Long:</string>
     <string name="distance_short">Dist. [m]:</string>
     <string name="name_short">Nombre:</string>
-    <string name="locationis">La ubicación es %1$s</string>
+    <string name="locationis">%1$s%2$s</string>
+    <string name="location_mode">Cuando </string>
+    <string name="location_inside">Cuando estés dentro de la zona</string>
+    <string name="location_outside">Cuando estés fuera de la zona</string>
+    <string name="location_going_in">Cuando entres en el area llamada</string>
+    <string name="location_going_out">Cuando dejes el área llamada</string>
     <string name="lastboluslabel">Último bolo</string>
     <string name="lastboluscompared">Hora del último bolo: hace %1$s %2$s min</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Nombre de la tarea</string>
     <string name="edit_short">Editar</string>
-    <string name="please_choose_an_action_type">Por favor, elija el tipo de acción:</string>
-    <string name="please_choose_a_trigger_type">Por favor, elija un tipo de activación:</string>
+    <string name="please_choose_an_action_type">Seleccionar un tipo de acción</string>
+    <string name="please_choose_a_trigger_type">Seleccione tipo de activador</string>
     <string name="triggers">Activadores:</string>
     <string name="remove_label">ELIMINAR</string>
     <string name="preconditions">Precondiciones:</string>
@@ -1320,7 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Frecuencia de la infusora no soportada.</string>
     <string name="medtronic_error_rileylink_address_invalid">Dirección de RileyLink no válida.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">El tipo de infusora detectado no es el mismo que el tipo configurado.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Los perfiles basales no están habilitados en la infusora.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Los perfiles de basal/valor de los patrones no están activados en la bomba. Actívalos en la bomba.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">El perfil basal establecido en la infusora es incorrecto (debe ser estándar).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo incorrecto de basal temporal en la infusora (debe ser Absoluto).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Valor máximo incorrecto configurado en la infusora (debe ser %1$.2f).</string>
@@ -1371,7 +1366,7 @@
     <string name="automation_trigger_pump_last_connection_description">Última conexión con la bomba [ minutos atrás]</string>
     <string name="automation_trigger_pump_last_connection_compared">Última conexión con la bomba hace %1$s %2$s min</string>
     <string name="sendsmsactionlabel">Enviar a %1$s</string>
-    <string name="sendsmsactiondescription">Enviar SMS a todos los números en las preferencias</string>
+    <string name="sendsmsactiondescription">Enviar SMS a todos los números</string>
     <string name="sendsmsactiontext">Mandar mensaje SMS</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restricción de bolo aplicada: %2$.2fU a %3$.2fU</font>]]></string>
@@ -1437,5 +1432,15 @@
     <string name="doyouwantresetstats">¿Desea restablecer las estadísticas de actividad?</string>
     <string name="statistics">Estadísticas</string>
     <string name="randombg">BG aleatorio</string>
+    <string name="description_source_randombg">Generar datos aleatorios de BG (solo modo Demo)</string>
     <string name="randombg_short">BG</string>
+    <string name="tools">Herramientas</string>
+    <string name="show_calculation">Mostrar cálculo</string>
+    <string name="error">Error</string>
+    <string name="timeformat12h">12 h</string>
+    <string name="timeformat24h">24 h</string>
+    <string name="automation_event">Automatización de eventos</string>
+    <string name="alreadyset">Set listo</string>
+    <string name="message">Mensaje</string>
+    <string name="clearqueueconfirm">¿Borrar cola? ¡Se perderán todos los datos de la cola!</string>
 </resources>

app/src/main/res/values-fr-rFR/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IA:</string>
     <string name="tempbasals_iobtotal_label_string">IA Totale :</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insuline</string>
-    <string name="treatments_newtreatment_carbsamount_label">Glucides</string>
     <string name="treatments_wizard_bg_label">Gly</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Glucides</string>
@@ -114,7 +112,6 @@
     <string name="overview">Aperçu</string>
     <string name="nsprofile">Profil NS</string>
     <string name="simpleprofile">Profil simple</string>
-    <string name="tempbasal">Basal temporaire</string>
     <string name="treatments">Traitements</string>
     <string name="virtualpump">Pompe virtuelle</string>
     <string name="careportal">Careportal</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">Violation des restrictions</string>
     <string name="treatmentdeliveryerror">Erreur injection bolus</string>
     <string name="tempbasaldeliveryerror">Erreur injection basal temporaire</string>
-    <string name="overview_newtempbasal_basalpercent">Valeur de Basal [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = actuel)</string>
+    <string name="overview_newtempbasal_basalpercent">Valeur Basal [%]</string>
     <string name="setbasalquestion">Accepter nouveau basal temporaire :</string>
     <string name="overview_treatment_label">Traitement</string>
     <string name="overview_calculator_label">Calculatrice</string>
     <string name="constraintapllied">Restriction appliquée !</string>
     <string name="confirmation">Confirmation</string>
-    <string name="entertreatmentquestion">Entrez le nouveau traitement :</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
     <string name="carbs">Glucides</string>
     <string name="changeyourinput">Changez vos entrées !</string>
-    <string name="setextendedbolusquestion">Définir un nouveau bolus étendu</string>
     <string name="configbuilder_bgsource">Source des glycémies</string>
     <string name="configbuilder_bgsource_description">Quelle source de données doit être utilisée par AndroidAPS ?</string>
     <string name="xdrip">xDrip</string>
@@ -187,7 +181,7 @@
     <string name="careportal_cgmsensorinsert">Insertion Capteur MGC</string>
     <string name="careportal_cgmsensorstart">Début Capteur MGC</string>
     <string name="careportal_insulincartridgechange">Changement du Réservoir</string>
-    <string name="careportal_profileswitch">Changement profil</string>
+    <string name="careportal_profileswitch">Changement de profil</string>
     <string name="careportal_snackbolus">Bolus Goûter</string>
     <string name="careportal_mealbolus">Bolus Repas</string>
     <string name="careportal_correctionbolus">Bolus de correction</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">Pourcentage</string>
     <string name="careportal_newnstreatment_absolute_label">Absolu</string>
     <string name="careportal_newnstreatment_notes_label">Notes</string>
-    <string name="careportal_newnstreatment_eventtime_label">Heure de l\'événement</string>
+    <string name="event_time_label">Heure événement</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Entré par</string>
     <string name="careportal_newnstreatment_glucosetype">Source de Glycémie</string>
@@ -233,7 +227,7 @@
     <string name="connecting">Connection en cours</string>
     <string name="connected">Connectée</string>
     <string name="disconnected">Déconnectée</string>
-    <string name="danar_pump_settings">Paramètres pompe DanaR</string>
+    <string name="danar_pump_settings">Paramètres de la pompe Dana</string>
     <string name="end_user_license_agreement">Contrat de Licence pour Utilisateur Final</string>
     <string name="end_user_license_agreement_text">NE DOIT PAS ÊTRE UTILISÉ POUR PRENDRE DES DÉCISIONS MÉDICALES. IL N\'Y A AUCUNE GARANTIE POUR LE PROGRAMME, DANS LA LIMITE PERMISE PAR LA LOI APPLICABLE. SAUF S\'IL EST INDIQUÉ LE CONTRAIRE PAR ÉCRIT. LES TITULAIRES DU DROIT D\'AUTEUR ET / OU D\'AUTRES PARTIES FOURNISSENT LE PROGRAMME «EN L\'ÉTAT» SANS GARANTIE D\'AUCUNE SORTE, EXPLICITE OU IMPLICITE, Y COMPRIS MAIS NON SEULEMENT AUX GARANTIES IMPLICITES DE QUALITÉ MARCHANDE ET D\'ADÉQUATION À UN USAGE PARTICULIER
 L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME SONT DE VOTRE RESPONSABILITÉ. SI LE PROGRAMME EST DÉFECTUEUX, VOUS ASSUMEZ LE COÛT DE TOUS LES SERVICES, RÉPARATIONS OU CORRECTIONS NÉCESSAIRES.</string>
@@ -284,7 +278,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="glucosetype_sensor">Capteur</string>
     <string name="manual">Manuel</string>
     <string name="careportal_temporarytarget">Cible temp.</string>
-    <string name="careportal_temporarytargetcancel">Annulation Cible Temporaire</string>
+    <string name="careportal_temporarytargetcancel">Annuler Cible Temporaire</string>
     <string name="danarprofile">Paramètres du profil DanaR</string>
     <string name="danarprofile_dia">Durée d\'Action [h] </string>
     <string name="danarprofile_dia_summary">Durée d\'Action de l\'Insuline</string>
@@ -423,7 +417,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="eatingsoon">Repas imminent</string>
     <string name="hypo">Hypo</string>
     <string name="activity">Activité</string>
-    <string name="removerecord">Retirer l\'enregistrement :</string>
+    <string name="removerecord">Supprimer l\'enregistrement</string>
     <string name="danar_stats">Dana Stats</string>
     <string name="danar_stats_cumulative_tdd">DTI cumulé</string>
     <string name="danar_stats_expweight">DTI avec Pondération Exponentielle</string>
@@ -584,16 +578,13 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="ns_noupload_summary">Toutes les données envoyées à NS sont abandonnées. AAPS est connecté à NS mais aucun changement n’est fait dans NS</string>
     <string name="basal_step">Incrément Basal</string>
     <string name="bolus_step">Incrément Bolus</string>
-    <string name="extendedbolus">Bolus étendu</string>
-    <string name="temptarget">Cible Temporaire</string>
     <string name="overview_extendedbolus_cancel_button">Annuler Bolus étendu</string>
     <string name="careportal_sensorage_label">Age Capteur</string>
     <string name="careportal_canulaage_label">Age Cathéter</string>
     <string name="careportal_insulinage_label">Age Insuline</string>
     <string name="hours">heures</string>
-    <string name="overview_newtempbasal_basaltype_label">Type du Basal</string>
     <string name="invalidprofile">Profil incorrect !!!</string>
-    <string name="profileswitch">Changement Profil</string>
+    <string name="doprofileswitch">Changer de profil</string>
     <string name="careportal_pbage_label">Age batterie pompe</string>
     <string name="careportal_pumpbatterychange">Nouvelle Batterie Pompe</string>
     <string name="ns_alarmoptions">Options d\'alarme</string>
@@ -617,7 +608,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="sensitivityoref1">Sensibilité Oref1</string>
     <string name="sensitivityaaps">Sensibilité AAPS </string>
     <string name="absorptionsettings_title">Paramètres d’absorption</string>
-    <string name="absorption_maxtime_title">Durée maximale d’absorption pour un repas</string>
+    <string name="absorption_maxtime_title">Durée max d’absorption d\'un repas [h]</string>
     <string name="absorption_maxtime_summary">Le temps estimé en heures pour une absorbption totale des glucides d’un repas</string>
     <string name="danar_visualizeextendedaspercentage_title">Afficher le bolus étendu en %%</string>
     <string name="careportal_sensorage_label_short">AgeC</string>
@@ -642,7 +633,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="careportal_carbsandbolus_label">GLUCIDES et BOLUS</string>
     <string name="careportal_cgm_label">MGC et OPENAPS</string>
     <string name="careportal_pump_label">POMPE</string>
-    <string name="overview_newtempbasal_basalabsolute">Valeur Basal [U/h] </string>
     <string name="careportal_newnstreatment_duration_min_label">Durée [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -662,7 +652,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="waitingforpairing">Attente de l\'appairage de la pompe</string>
     <string name="pairingok">Appairage OK</string>
     <string name="pairingtimedout">Temps d\'appairage dépassé</string>
-    <string name="pairing">APPAIRAGE</string>
+    <string name="pairing">Appairage</string>
     <string name="danars_nodeviceavailable">Jusqu\'à présent aucun appareil n\'a été trouvé</string>
     <string name="emptyreservoir">Réservoir vide</string>
     <string name="bloodsugarmeasurementalert">Alerte de mesure de glycémie</string>
@@ -677,11 +667,11 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="careportal_newnstreatment_percentage_label">Pourcentage</string>
     <string name="careportal_newnstreatment_timeshift_label">Décalage horaire</string>
     <string name="default_temptargets">Cibles Temporaires par défaut</string>
-    <string name="eatingsoon_duration">Durée pour le prochain repas [min]</string>
+    <string name="eatingsoon_duration">durée repas imminent [min]</string>
     <string name="eatingsoon_target">Cible Glyc. pour le prochain repas</string>
     <string name="activity_duration">Durée d\'activité</string>
     <string name="activity_target">Cible Glycémie pour l\'activité</string>
-    <string name="hypo_duration">Durée de période hypo [min]</string>
+    <string name="hypo_duration">durée hypo [min]</string>
     <string name="hypo_target">Cible Glycémie pendant l’hypo</string>
     <string name="danar_history_prime">Amorcer</string>
     <string name="gettingextendedbolusstatus">Obtenir l\'état du bolus étendu</string>
@@ -773,7 +763,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="bolus_frequency_exceeded">Un bolus avec la même quantité d’insuline a été demandé au cours de la dernière minute. Pour prévenir l’administration accidentelle de deux bolus à la fois et pour protéger contre les bugs, ceci (bolus) n\'est pas autorisé.</string>
     <string name="combo_pump_connected_now">Maintenant</string>
     <string name="combo_activity_reading_pump_history">Lecture historique pompe</string>
-    <string name="danar_history">Historique</string>
+    <string name="danar_history">Historique pompe</string>
     <string name="combo_activity_setting_basal_profile">Définir le profil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Niveau réservoir pompe bas</string>
     <string name="combo_pump_battery_low_warrning">Niveau batterie pompe bas</string>
@@ -793,6 +783,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="insightpump_shortname">AC-I</string>
     <string name="ago">passé(e)s</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
     <string name="enablesmbalways">Activer en permanence les SMB</string>
     <string name="enablesmbalways_summary">Activer toujours SMB de manière autonome pour les bolus. Ceci est possible uniquement avec une source de glycémie ayant un très bon filtrage de données comme le G5</string>
     <string name="enablesmbaftercarbs">Activer SMB après ingestion de glucides</string>
@@ -969,11 +960,11 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="danar_pumpalarm_sound">Son</string>
     <string name="danar_pumpalarm_vibrate">Vibration</string>
     <string name="danar_pumpalarm_both">Les deux</string>
-    <string name="danar_screentimeout">Durée allumage écran [s]</string>
-    <string name="danar_backlight">Durée rétroéclairage [s]</string>
+    <string name="danar_screentimeout">Durée affichage LCD [secondes]</string>
+    <string name="danar_backlight">Rétro-éclairage [secondes]</string>
     <string name="danar_glucoseunits">Unités glycémie</string>
-    <string name="danar_shutdown">Arrêt (heures)</string>
-    <string name="danar_lowreservoir">Réservoir bas (Unités)</string>
+    <string name="danar_shutdown">Éteindre [heures]</string>
+    <string name="danar_lowreservoir">Réservoir faible [Unités]</string>
     <string name="danar_saveuseroptions">Enregistrer les options sur la pompe</string>
     <string name="option_on">Activé</string>
     <string name="option_off">Désactivé</string>
@@ -1219,15 +1210,20 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="longitude_short">Long :</string>
     <string name="distance_short">Dist [m]:</string>
     <string name="name_short">Nom :</string>
-    <string name="locationis">La localisation est %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Quand </string>
+    <string name="location_inside">Quand vous êtes à l\'intérieur de la zone</string>
+    <string name="location_outside">Quand vous êtes à l\'extérieur de la zone</string>
+    <string name="location_going_in">Quand vous entrez dans la zone</string>
+    <string name="location_going_out">Quand vous sortez de la zone</string>
     <string name="lastboluslabel">Lors du dernier Bolus</string>
-    <string name="lastboluscompared">Dernièr Bolus %1$s il y a %2$s min</string>
+    <string name="lastboluscompared">Heure du dernier bolus %1$s il y a %2$s min</string>
     <string name="triggercoblabel">GA</string>
     <string name="cobcompared">GA %1$s %2$.0f</string>
     <string name="taskname">Nom de tâche</string>
     <string name="edit_short">ÉDITER</string>
-    <string name="please_choose_an_action_type">Merci de choisir un type d\'action :</string>
-    <string name="please_choose_a_trigger_type">Merci de choisir un type de déclencheur :</string>
+    <string name="please_choose_an_action_type">Choisir un type d\'action</string>
+    <string name="please_choose_a_trigger_type">Choisir un type de déclencheur</string>
     <string name="triggers">Déclencheurs :</string>
     <string name="remove_label">SUPPRIMER</string>
     <string name="preconditions">Conditions préalables :</string>
@@ -1320,7 +1316,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="medtronic_error_pump_frequency_invalid">Fréquence de pompe non pris en charge.</string>
     <string name="medtronic_error_rileylink_address_invalid">Adresse RileyLink invalide.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Le type de pompe détecté n\'est pas le même que le type configuré.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Les profils Basal ne sont pas activés sur la pompe.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Le réglage des profils de basal n\'est pas activé sur la pompe. Activez-le sur la pompe.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Le profil Basal défini sur la pompe est incorrect (doit être STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Mauvais type DBT (TBR) réglé sur la pompe (doit être Absolu).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Mauvais paramètre Max Bolus sur la pompe (doit être %1$.2f).</string>
@@ -1371,7 +1367,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="automation_trigger_pump_last_connection_description">Dernière connexion de pompe [minutes]</string>
     <string name="automation_trigger_pump_last_connection_compared">Dernière connexion à la pompe %1$s il y a %2$s min</string>
     <string name="sendsmsactionlabel">Envoyer SMS : %1$s</string>
-    <string name="sendsmsactiondescription">Envoyer SMS à tous les numéros dans les préférences</string>
+    <string name="sendsmsactiondescription">Envoyer SMS à tous les numéros</string>
     <string name="sendsmsactiontext">Envoyer SMS avec du texte</string>
     <string name="insulinFromCob"><![CDATA[GA vs IA : <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Contraintes de Bolus appliquées : %2$.2fU à %3$.2f</font>]]></string>
@@ -1432,7 +1428,20 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Bas: <b>%2$02d%%</b> Médian: <b>%3$02d%%</b> Haut: <b>%4$02d%%</b>]]></string>
     <string name="average">Moyenne</string>
     <string name="tdd">DTI</string>
+    <string name="tir">TIR</string>
     <string name="activitymonitor">Moniteur d\'activité</string>
     <string name="doyouwantresetstats">Voulez-vous réinitialiser les stats d\'activité ?</string>
     <string name="statistics">Statistiques</string>
+    <string name="randombg">Gly Aléatoire</string>
+    <string name="description_source_randombg">Générer des glycémies aléatoires (mode démo uniquement)</string>
+    <string name="randombg_short">Gly</string>
+    <string name="tools">Outils</string>
+    <string name="show_calculation">Afficher le calcul</string>
+    <string name="error">Erreur</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">Evénement d\'automatisation</string>
+    <string name="alreadyset">Déjà configuré</string>
+    <string name="message">Message</string>
+    <string name="clearqueueconfirm">Effacer la file d\'attente ? Toutes les données en file d\'attente seront perdues !</string>
 </resources>

app/src/main/res/values-it-rIT/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">IOB totale:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulina</string>
-    <string name="treatments_newtreatment_carbsamount_label">CHO</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">CHO</string>
@@ -114,7 +112,6 @@
     <string name="overview">Panoramica</string>
     <string name="nsprofile">Profilo NS</string>
     <string name="simpleprofile">Profilo semplice</string>
-    <string name="tempbasal">Basale temporanea</string>
     <string name="treatments">Trattamenti</string>
     <string name="virtualpump">Micro Virtuale</string>
     <string name="careportal">Portale</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">Violazione dei vincoli</string>
     <string name="treatmentdeliveryerror">Errore erogazione bolo</string>
     <string name="tempbasaldeliveryerror">Errore erogazione basale temporanea</string>
-    <string name="overview_newtempbasal_basalpercent">Valore Basale [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = corrente)</string>
+    <string name="overview_newtempbasal_basalpercent">Valore basale [%]</string>
     <string name="setbasalquestion">Accetta nuova basale temporanea:</string>
     <string name="overview_treatment_label">Trattamento</string>
     <string name="overview_calculator_label">Calcolatore</string>
     <string name="constraintapllied">Vincolo applicato!</string>
     <string name="confirmation">Conferma</string>
-    <string name="entertreatmentquestion">Inserisci nuovo trattamento:</string>
     <string name="bolus">Bolo</string>
     <string name="sms_bolus">Bolo:</string>
     <string name="basal">Basale</string>
     <string name="sms_basal">Basale</string>
     <string name="carbs">CHO</string>
     <string name="changeyourinput">Cambia il tuo input!</string>
-    <string name="setextendedbolusquestion">Imposta nuovo bolo esteso:</string>
     <string name="configbuilder_bgsource">Origine BG</string>
     <string name="configbuilder_bgsource_description">Da dove AndroidAPS dovrebbe ottenere i suoi dati?</string>
     <string name="xdrip">xDrip</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">Percentuale</string>
     <string name="careportal_newnstreatment_absolute_label">Assoluto</string>
     <string name="careportal_newnstreatment_notes_label">Note</string>
-    <string name="careportal_newnstreatment_eventtime_label">Data evento</string>
+    <string name="event_time_label">Ora evento</string>
     <string name="careportal_newnstreatment_profile_label">Profilo</string>
     <string name="careportal_newnstreatment_enteredby_title">Inserito da</string>
     <string name="careportal_newnstreatment_glucosetype">Tipo glicemia</string>
@@ -233,7 +227,7 @@
     <string name="connecting">Connessione</string>
     <string name="connected">Connesso</string>
     <string name="disconnected">Disconnesso</string>
-    <string name="danar_pump_settings">Impostazioni micro DanaR</string>
+    <string name="danar_pump_settings">Impostazioni micro Dana</string>
     <string name="end_user_license_agreement">Contratto di licenza per l\'utente</string>
     <string name="end_user_license_agreement_text">NON DEVE ESSERE UTILIZZATO PER PRENDERE DECISIONI MEDICHE. NON ESISTE ALCUNA GARANZIA PER IL PROGRAMMA, NELLA MISURA CONSENTITA DALLA LEGGE APPLICABILE. TRANNE QUANDO DIVERSAMENTE INDICATO PER ISCRITTO, I DETENTORI DEL COPYRIGHT E/O ALTRE PARTI FORNISCONO IL PROGRAMMA \"COSÌ COM\'È\" SENZA GARANZIA DI ALCUN TIPO, ESPLICITA O IMPLICITA, INCLUSE, MA NON LIMITATAMENTE A, GARANZIE IMPLICITE DI COMMERCIABILITÀ E IDONEITÀ PER UN SCOPO PARTICOLARE. L\'INTERO RISCHIO RIGUARDO LA QUALITÀ E LE PRESTAZIONI DEL PROGRAMMA È TUO. SE IL PROGRAMMA DOVESSE RISULTARE DIFETTOSO, TI ASSUMI IL COSTO DI TUTTE LE NECESSARIE MANUTENZIONI, RIPARAZIONI O CORREZIONI.</string>
     <string name="end_user_license_agreement_i_understand">COMPRENDO E ACCETTO</string>
@@ -422,7 +416,7 @@
     <string name="eatingsoon">Pasto a breve</string>
     <string name="hypo">Ipoglicemia</string>
     <string name="activity">Attività</string>
-    <string name="removerecord">Rimuovi record:</string>
+    <string name="removerecord">Rimuovi record</string>
     <string name="danar_stats">Statistiche DanaR</string>
     <string name="danar_stats_cumulative_tdd">TDD cumulativo</string>
     <string name="danar_stats_expweight">TDD esponenzialmente ponderato</string>
@@ -583,16 +577,12 @@
     <string name="ns_noupload_summary">Tutti i dati inviati a NS vengono rifiutati. AAPS è connesso a NS, ma non vengono apportate modifiche</string>
     <string name="basal_step">Incremento basale</string>
     <string name="bolus_step">Incremento bolo</string>
-    <string name="extendedbolus">Bolo esteso</string>
-    <string name="temptarget">TempTarget</string>
     <string name="overview_extendedbolus_cancel_button">Cancella bolo esteso</string>
     <string name="careportal_sensorage_label">Età sensore</string>
     <string name="careportal_canulaage_label">Età cannula</string>
     <string name="careportal_insulinage_label">Età insulina</string>
     <string name="hours">ore</string>
-    <string name="overview_newtempbasal_basaltype_label">Tipo basale</string>
     <string name="invalidprofile">Profilo non valido !!!</string>
-    <string name="profileswitch">Cambio profilo</string>
     <string name="doprofileswitch">Cambia profilo</string>
     <string name="careportal_pbage_label">Età batteria micro</string>
     <string name="careportal_pumpbatterychange">Cambio batteria micro</string>
@@ -630,7 +620,7 @@
     <string name="virtualpump_extendedbolus_label_short">EXT</string>
     <string name="keep_screen_on_title">Mantieni lo schermo acceso</string>
     <string name="keep_screen_on_summary">Evita che Android disattivi lo schermo. Consumerà molta energia quando non è collegato alla presa di corrente.</string>
-    <string name="sensitivity_warning">Attivando la funzione Autosense, ricorda di dichiarare tutti i carboidrati assunti. Altrimenti le deviazioni di glicemia dovute ai carboidrati saranno identificate erroneamente come variazione di sensibilità !!</string>
+    <string name="sensitivity_warning">Attivando la funzione Autosense, ricorda di inserire tutti i carboidrati assunti. Altrimenti le deviazioni di glicemia dovute ai carboidrati saranno identificate erroneamente come variazione di sensibilità !!</string>
     <string name="sensitivityweightedaverage">Sensibilità WeightedAverage</string>
     <string name="mdtp_ok">OK</string>
     <string name="mdtp_cancel">Annulla</string>
@@ -642,7 +632,6 @@
     <string name="careportal_carbsandbolus_label">CHO &amp; BOLO</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">MICRO</string>
-    <string name="overview_newtempbasal_basalabsolute">Valore basale [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Durata [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -662,7 +651,7 @@
     <string name="waitingforpairing">In attesa di associare il micro</string>
     <string name="pairingok">Associazione OK</string>
     <string name="pairingtimedout">Time out associazione micro</string>
-    <string name="pairing">ASSOCIAZIONE</string>
+    <string name="pairing">Accoppiamento</string>
     <string name="danars_nodeviceavailable">Nessun dispositivo trovato finora</string>
     <string name="emptyreservoir">Serbatoio vuoto</string>
     <string name="bloodsugarmeasurementalert">Avviso misurazione glicemia</string>
@@ -773,7 +762,7 @@
     <string name="bolus_frequency_exceeded">Un bolo con la stessa quantità è stato richiesto negli ultimi due minuti. Questo non è consentito al fine di evitare boli doppi accidentali e a protezione di eventuali \"bug\".</string>
     <string name="combo_pump_connected_now">Adesso</string>
     <string name="combo_activity_reading_pump_history">Lettura storico micro</string>
-    <string name="danar_history">storico micro</string>
+    <string name="danar_history">Storico micro</string>
     <string name="combo_activity_setting_basal_profile">Impostazione profilo basale</string>
     <string name="combo_pump_cartridge_low_warrning">Livello serbatoio basso</string>
     <string name="combo_pump_battery_low_warrning">Livello batteria basso</string>
@@ -793,6 +782,7 @@
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">fa</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
     <string name="enablesmbalways">Abilita SMB sempre</string>
     <string name="enablesmbalways_summary">Abilita SMB sempre, indipendentemente dai boli. Possibile solo con sorgente glicemia con un buon filtraggio dei dati, come G5</string>
     <string name="enablesmbaftercarbs">Abilita SMB dopo i CHO</string>
@@ -969,11 +959,11 @@
     <string name="danar_pumpalarm_sound">Suono</string>
     <string name="danar_pumpalarm_vibrate">Vibrazione</string>
     <string name="danar_pumpalarm_both">Entrambi</string>
-    <string name="danar_screentimeout">LCD acceso [s]</string>
-    <string name="danar_backlight">Retroilluminazione accesa [s]</string>
+    <string name="danar_screentimeout">LCD attivo [seconds]</string>
+    <string name="danar_backlight">Retroilluminazione attiva [seconds]</string>
     <string name="danar_glucoseunits">Unità glucosio</string>
-    <string name="danar_shutdown">Spegnimento(ore)</string>
-    <string name="danar_lowreservoir">Livello serbatoio basso (Unità)</string>
+    <string name="danar_shutdown">Spegnimento [hours]</string>
+    <string name="danar_lowreservoir">Livello serbatoio basso [Units]</string>
     <string name="danar_saveuseroptions">Salva opzioni nel micro</string>
     <string name="option_on">On</string>
     <string name="option_off">Off</string>
@@ -1219,15 +1209,20 @@
     <string name="longitude_short">Lon:</string>
     <string name="distance_short">Dist [m]:</string>
     <string name="name_short">Nome:</string>
-    <string name="locationis">La posizione è %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Quando </string>
+    <string name="location_inside">Quando sei all\'interno dell\'area</string>
+    <string name="location_outside">Quando sei all\'esterno dell\'area</string>
+    <string name="location_going_in">Quando accedi all\'area denominata</string>
+    <string name="location_going_out">Quando lasci l\'area denominata</string>
     <string name="lastboluslabel">Ultimo bolo</string>
     <string name="lastboluscompared">Ora ultimo bolo %1$s %2$s min fa</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Nome task</string>
     <string name="edit_short">MODIFICA</string>
-    <string name="please_choose_an_action_type">Scegli un tipo di azione:</string>
-    <string name="please_choose_a_trigger_type">Scegli un tipo di trigger:</string>
+    <string name="please_choose_an_action_type">Scegli un tipo di azione</string>
+    <string name="please_choose_a_trigger_type">Scegli un tipo di trigger</string>
     <string name="triggers">Trigger:</string>
     <string name="remove_label">RIMUOVI</string>
     <string name="preconditions">Presupposti:</string>
@@ -1320,7 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Frequenza micro non supportata.</string>
     <string name="medtronic_error_rileylink_address_invalid">Indirizzo RileyLink non valido.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Il tipo di micro rilevato non è uguale al tipo configurato.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">I profili basali non sono abilitati nel microinfusore.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">L\'impostazione di modelli/profili basali non è abilitata sul micro. Abilitala sul micro.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Il profilo basale impostato nel micro non è corretto (deve essere STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo TBR errato impostato nel micro (deve essere Assoluto).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Max bolo errato impostato nel micro (deve essere %1$.2f).</string>
@@ -1371,7 +1366,7 @@
     <string name="automation_trigger_pump_last_connection_description">Ultima connessione al micro [minuti fa]</string>
     <string name="automation_trigger_pump_last_connection_compared">Ultima connessione al micro %1$s %2$s min fa</string>
     <string name="sendsmsactionlabel">Invia SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Invia SMS a tutti i numeri nelle preferenze</string>
+    <string name="sendsmsactiondescription">Invia SMS a tutti i numeri</string>
     <string name="sendsmsactiontext">Invia SMS con testo</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Vincolo Bolo applicato: %2$.2fU a %3$.2fU</font>]]></string>
@@ -1439,4 +1434,13 @@
     <string name="randombg">BG casuale</string>
     <string name="description_source_randombg">Genera dati glicemia casuali (solo modalità demo)</string>
     <string name="randombg_short">BG</string>
+    <string name="tools">Strumenti</string>
+    <string name="show_calculation">Mostra calcolo</string>
+    <string name="error">Errore</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">Evento di automazione</string>
+    <string name="alreadyset">Già impostato</string>
+    <string name="message">Messaggio</string>
+    <string name="clearqueueconfirm">Cancellare la coda? Tutti i dati in coda andranno persi!</string>
 </resources>

app/src/main/res/values-ko-rKR/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">인슐린:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">IOB 총량:</string>
-    <string name="treatments_newtreatment_insulinamount_label">인슐린 양</string>
-    <string name="treatments_newtreatment_carbsamount_label">탄수화물 양</string>
     <string name="treatments_wizard_bg_label">혈당</string>
     <string name="treatments_wizard_tt_label">임시목표</string>
     <string name="treatments_wizard_carbs_label">탄수화물</string>
@@ -113,7 +111,6 @@
     <string name="overview">개요</string>
     <string name="nsprofile">NS 프로파일</string>
     <string name="simpleprofile">Simple 프로파일</string>
-    <string name="tempbasal">임시Basal</string>
     <string name="treatments">관리</string>
     <string name="virtualpump">가상펌프</string>
     <string name="careportal">케어포털</string>
@@ -145,21 +142,17 @@
     <string name="constraints_violation">제한 위반</string>
     <string name="treatmentdeliveryerror">Bolus 주입 에러</string>
     <string name="tempbasaldeliveryerror">임시Basal 주입 에러</string>
-    <string name="overview_newtempbasal_basalpercent">Basal 값[%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = 현재)</string>
     <string name="setbasalquestion">새 임시Basal 적용:</string>
     <string name="overview_treatment_label">관리</string>
     <string name="overview_calculator_label">계산기</string>
     <string name="constraintapllied">제한 적용!</string>
     <string name="confirmation">확인</string>
-    <string name="entertreatmentquestion">새 Treatment 입력:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
     <string name="carbs">탄수화물</string>
     <string name="changeyourinput">입력값을 변경하세요!</string>
-    <string name="setextendedbolusquestion">새 확장Bolus 설정:</string>
     <string name="configbuilder_bgsource">혈당 소스</string>
     <string name="configbuilder_bgsource_description">AndroidAPS가 어디에서 데이터를 가져옵니까?</string>
     <string name="xdrip">xDrip</string>
@@ -186,7 +179,6 @@
     <string name="careportal_cgmsensorinsert">CGM 센서 삽입</string>
     <string name="careportal_cgmsensorstart">CGM 센서 시작</string>
     <string name="careportal_insulincartridgechange">인슐린 카트리지 교체</string>
-    <string name="careportal_profileswitch">프로파일 변경</string>
     <string name="careportal_snackbolus">간식Bolus</string>
     <string name="careportal_mealbolus">식사Bolus</string>
     <string name="careportal_correctionbolus">교정Bolus</string>
@@ -207,7 +199,6 @@
     <string name="careportal_newnstreatment_percent_label">퍼센트</string>
     <string name="careportal_newnstreatment_absolute_label">절대값</string>
     <string name="careportal_newnstreatment_notes_label">노트</string>
-    <string name="careportal_newnstreatment_eventtime_label">이벤트 시간</string>
     <string name="careportal_newnstreatment_profile_label">프로파일</string>
     <string name="careportal_newnstreatment_enteredby_title">입력자</string>
     <string name="careportal_newnstreatment_glucosetype">혈당 종류</string>
@@ -231,7 +222,6 @@
     <string name="connecting">연결중</string>
     <string name="connected">연결됨</string>
     <string name="disconnected">연결 끊김</string>
-    <string name="danar_pump_settings">다나R 펌프 설정</string>
     <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>
     <string name="end_user_license_agreement_text">이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.\nMUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">모두 이해하였고 동의합니다.</string>
@@ -268,8 +258,6 @@
     <string name="glucosetype_finger">체혈</string>
     <string name="glucosetype_sensor">센서</string>
     <string name="manual">수동</string>
-    <string name="careportal_temporarytarget">임시목표</string>
-    <string name="careportal_temporarytargetcancel">임시목표 취소</string>
     <string name="danarprofile">DanaR 프로파일 설정</string>
     <string name="danarprofile_dia">인슐린활동시간(DIA) [h]</string>
     <string name="danarprofile_dia_summary">인슐린 활동 기간</string>
@@ -402,7 +390,6 @@
     <string name="eatingsoon">식사직전</string>
     <string name="hypo">저혈당</string>
     <string name="activity">활동</string>
-    <string name="removerecord">기록 삭제:</string>
     <string name="danar_stats">DanaR 통계</string>
     <string name="danar_stats_cumulative_tdd">누적 일총량</string>
     <string name="danar_stats_expweight">지수가중 일총량</string>
@@ -559,16 +546,12 @@
     <string name="ns_noupload_summary">NS로 보낼 모든 데이터가 버려집니다. AAPS는 NS에 연결되어 있지만 NS에는 변화가 없을것입니다.</string>
     <string name="basal_step">Basal 단위</string>
     <string name="bolus_step">Bolus 단위</string>
-    <string name="extendedbolus">확장Bolus</string>
-    <string name="temptarget">임시목표</string>
     <string name="overview_extendedbolus_cancel_button">확장Bolus 취소</string>
     <string name="careportal_sensorage_label">센서 사용기간</string>
     <string name="careportal_canulaage_label">캐뉼라 사용기간</string>
     <string name="careportal_insulinage_label">인슐린 사용기간</string>
     <string name="hours">시간</string>
-    <string name="overview_newtempbasal_basaltype_label">Basal 종류</string>
     <string name="invalidprofile">프로파일이 유효하지 않습니다!!!</string>
-    <string name="profileswitch">프로파일변경</string>
     <string name="careportal_pbage_label">펌프배터리사용기간</string>
     <string name="careportal_pumpbatterychange">펌프 배터리 교체</string>
     <string name="ns_alarmoptions">알람 옵션</string>
@@ -616,7 +599,6 @@
     <string name="careportal_carbsandbolus_label">탄수화물 &amp; Bolus</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">펌프</string>
-    <string name="overview_newtempbasal_basalabsolute">Basal값 [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">기간 [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -636,7 +618,6 @@
     <string name="waitingforpairing">펌프연동 대기중</string>
     <string name="pairingok">연동완료</string>
     <string name="pairingtimedout">연동시간초과</string>
-    <string name="pairing">연동중</string>
     <string name="danars_nodeviceavailable">현재까지 발견된 기기가 없습니다.</string>
     <string name="emptyreservoir">빈 주사기</string>
     <string name="bloodsugarmeasurementalert">혈당측정알람</string>
@@ -745,7 +726,6 @@
     <string name="bolus_frequency_exceeded">2개의 동일한 양의 Bolus 주입이 요청되었습니다. 이중으로 Bolus가 주입 되는 사고를 막고 버그로부터 보호하기 위하여 이는 금지됩니다.</string>
     <string name="combo_pump_connected_now">현재</string>
     <string name="combo_activity_reading_pump_history">펌프 이력 읽기</string>
-    <string name="danar_history">펌프 이력</string>
     <string name="combo_activity_setting_basal_profile">Basal 프로파일 설정</string>
     <string name="combo_pump_cartridge_low_warrning">펌프 카트리지 레벨이 낮습니다.</string>
     <string name="combo_pump_battery_low_warrning">펌프배터리가 부족합니다.</string>
@@ -941,11 +921,7 @@
     <string name="danar_pumpalarm_sound">소리</string>
     <string name="danar_pumpalarm_vibrate">진동</string>
     <string name="danar_pumpalarm_both">모두</string>
-    <string name="danar_screentimeout">LCD 시간[s]</string>
-    <string name="danar_backlight">화면조명 시간[s]</string>
     <string name="danar_glucoseunits">혈당 단위</string>
-    <string name="danar_shutdown">종료(시간)</string>
-    <string name="danar_lowreservoir">낮은 주사기량(단위)</string>
     <string name="danar_saveuseroptions">펌프로 옵션 저장</string>
     <string name="option_on">켜짐</string>
     <string name="option_off">꺼짐</string>
@@ -1188,15 +1164,12 @@
     <string name="longitude_short">경도</string>
     <string name="distance_short">거리 [m]:</string>
     <string name="name_short">이름:</string>
-    <string name="locationis">위치는 %1$s</string>
     <string name="lastboluslabel">마지막 Bolus 전</string>
     <string name="lastboluscompared">마지막 Bolus 시간 %1$s %2$s 분 전</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">작업명</string>
     <string name="edit_short">편집</string>
-    <string name="please_choose_an_action_type">액션 타입을 선택하세요:</string>
-    <string name="please_choose_a_trigger_type">트리거 타입을 선택하세요:</string>
     <string name="triggers">트리거:</string>
     <string name="remove_label">삭제</string>
     <string name="preconditions">전제 조건:</string>
@@ -1286,7 +1259,6 @@
     <string name="medtronic_error_pump_frequency_invalid">지원되지 않는 펌프 주파수입니다.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink 주소가 유효하지 않습니다.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">감지된 펌프타입이 설정된 타입과 다릅니다.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">펌프에서 Basal 프로파일이 활성화되지 않았습니다.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">펌프에 설정된 Basal 프로파일이 올바르지 않습니다 (STD 이어야 합니다).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">펌프에 잘못된 TBR 유형이 설정되었습니다 (절대값이어야합니다).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">펌프에 잘못된 최대 Bolus가 설정되었습니다 (%1$.2f 이어야 합니다.).</string>

app/src/main/res/values-lt-rLT/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">AIO:</string>
     <string name="tempbasals_iobtotal_label_string">Visas AIO:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulinas</string>
-    <string name="treatments_newtreatment_carbsamount_label">AV</string>
     <string name="treatments_wizard_bg_label">KG</string>
     <string name="treatments_wizard_tt_label">LT</string>
     <string name="treatments_wizard_carbs_label">AV</string>
@@ -114,7 +112,6 @@
     <string name="overview">Apžvalga</string>
     <string name="nsprofile">NS profilis</string>
     <string name="simpleprofile">Paprastas profilis</string>
-    <string name="tempbasal">Laikina bazė</string>
     <string name="treatments">Terapija</string>
     <string name="virtualpump">Virtuali pompa</string>
     <string name="careportal">Priežiūra</string>
@@ -146,21 +143,17 @@
     <string name="constraints_violation">Apribojimų pažeidimas</string>
     <string name="treatmentdeliveryerror">Boluso suleidimo klaida</string>
     <string name="tempbasaldeliveryerror">Laikinos bazės suleidimo klaida</string>
-    <string name="overview_newtempbasal_basalpercent">Valandinė bazė [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%%(100%% - pasirinkta)</string>
     <string name="setbasalquestion">Patvirtinti naują laikiną bazę:</string>
     <string name="overview_treatment_label">Terapija</string>
     <string name="overview_calculator_label">Skaičiuotuvas</string>
     <string name="constraintapllied">Taikomas ribojimas!</string>
     <string name="confirmation">Patvirtinimas</string>
-    <string name="entertreatmentquestion">Įvesti naują paskyrimą:</string>
     <string name="bolus">Bolusas</string>
     <string name="sms_bolus">Bolusas:</string>
     <string name="basal">Valandinė bazė</string>
     <string name="sms_basal">Valandinė bazė:</string>
     <string name="carbs">AV</string>
     <string name="changeyourinput">Pakeiskite įvestus duomenis!</string>
-    <string name="setextendedbolusquestion">Nustatyti naują ištęstą bolusą:</string>
     <string name="configbuilder_bgsource">KG šaltinis</string>
     <string name="configbuilder_bgsource_description">Iš kur AndroidAPS gaus duomenis?</string>
     <string name="xdrip">xDrip</string>
@@ -187,7 +180,6 @@
     <string name="careportal_cgmsensorinsert">NGJ sensoriaus įvedimas</string>
     <string name="careportal_cgmsensorstart">NGJ sensoriaus paleidimas</string>
     <string name="careportal_insulincartridgechange">Insulino rezervuaro keitimas</string>
-    <string name="careportal_profileswitch">Profilio keitimas</string>
     <string name="careportal_snackbolus">Bolusas užkandžiui</string>
     <string name="careportal_mealbolus">Bolusas valgiui</string>
     <string name="careportal_correctionbolus">Bolusas korekcijai</string>
@@ -208,7 +200,6 @@
     <string name="careportal_newnstreatment_percent_label">Procentai</string>
     <string name="careportal_newnstreatment_absolute_label">Absoliutus</string>
     <string name="careportal_newnstreatment_notes_label">Pastabos</string>
-    <string name="careportal_newnstreatment_eventtime_label">Įvykio laikas</string>
     <string name="careportal_newnstreatment_profile_label">Profilis</string>
     <string name="careportal_newnstreatment_enteredby_title">Įvedė</string>
     <string name="careportal_newnstreatment_glucosetype">Gliukozės tipas</string>
@@ -233,7 +224,6 @@
     <string name="connecting">Jungiamasi</string>
     <string name="connected">Prisijungta</string>
     <string name="disconnected">Atsijungta</string>
-    <string name="danar_pump_settings">DanaR pompos nustatymai</string>
     <string name="end_user_license_agreement">Licencinė sutartis su vartotoju</string>
     <string name="end_user_license_agreement_text">PROGRAMA NEGALI BŪTI NAUDOJAMA GYDYMO SPRENDIMAMS PRIIMTI. PAGAL GALIOJANČIUS ĮSTATYMUS PROGRAMA NESUTEIKIA JOKIŲ GARANTIJŲ VARTOTOJUI. JEI RAŠTU NENURODYTA KITAIP, PROGRAMOS AUTORINIŲ TEISIŲ TURĖTOJAS IR/AR KITOS ŠALYS PATEIKIA PROGRAMĄ \"KAIP YRA\" BE JOKIŲ GARANTIJŲ, TIEK AKIVAIZDŽIŲ, TIEK NUMANOMŲ, ĮSKAITANT, BET NEAPSIRIBOJANT GALIMYBĘ NAUDOTI PROGRAMĄ KOMERCINIAMS AR KITOKIEMS DALINIAMS TIKSLAMS. RIZIKĄ, KYLANČIĄ NAUDOJANT PROGRAMĄ PRISIIMA PATS VARTOTOJAS. JEI PROGRAMA VEIKIA NETINKAMAI, IŠLAIDOS, SUSIJUSIOS SU PROGRAMOS SERVISU, TAISYMU AR KOREGAVIMU, TENKA VARTOTOJUI.</string>
     <string name="end_user_license_agreement_i_understand">SUPRATAU IR SUTINKU</string>
@@ -272,8 +262,6 @@
     <string name="glucosetype_finger">Iš piršto</string>
     <string name="glucosetype_sensor">Iš sensoriaus</string>
     <string name="manual">Rankiniu būdu</string>
-    <string name="careportal_temporarytarget">Laikinas tikslas</string>
-    <string name="careportal_temporarytargetcancel">Atšaukti laikiną tikslą</string>
     <string name="danarprofile">DanaR profilio nustatymai</string>
     <string name="danarprofile_dia">IVT [h]</string>
     <string name="danarprofile_dia_summary">Insulino veikimo trukmė</string>
@@ -406,7 +394,6 @@
     <string name="eatingsoon">Netrukus valgysiu</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Aktyvumas</string>
-    <string name="removerecord">Ištrinti įrašą:</string>
     <string name="danar_stats">DanaR statistika</string>
     <string name="danar_stats_cumulative_tdd">BPD viso</string>
     <string name="danar_stats_expweight">Eksponentiškai svertinė BPD</string>
@@ -567,16 +554,12 @@
     <string name="ns_noupload_summary">Visi duomenys, kurie gali būti siunčiami į NS, paliekami. AAPS yra susieta su NS, bet jokie pokyčiai NS nedaromi</string>
     <string name="basal_step">Bazės žingsnis</string>
     <string name="bolus_step">Boluso žingsnis</string>
-    <string name="extendedbolus">Ištęstas bolusas</string>
-    <string name="temptarget">Laik.tikslas</string>
     <string name="overview_extendedbolus_cancel_button">Atšaukti ištęstą bolusą</string>
     <string name="careportal_sensorage_label">Sensorius</string>
     <string name="careportal_canulaage_label">Kateteris</string>
     <string name="careportal_insulinage_label">Insulinas</string>
     <string name="hours">valandos</string>
-    <string name="overview_newtempbasal_basaltype_label">Valandinės bazės tipas</string>
     <string name="invalidprofile">Netinkamas profilis!!!</string>
-    <string name="profileswitch">Profilio keitimas</string>
     <string name="careportal_pbage_label">Pompos baterija</string>
     <string name="careportal_pumpbatterychange">Pompos baterijos keitimas</string>
     <string name="ns_alarmoptions">Aliarmų nustatymai</string>
@@ -625,7 +608,6 @@
     <string name="careportal_carbsandbolus_label">ANGLIAVANDENIAI &amp; BOLUSAI</string>
     <string name="careportal_cgm_label">NGJ &amp; OPENAPS</string>
     <string name="careportal_pump_label">POMPA</string>
-    <string name="overview_newtempbasal_basalabsolute">Valandinė bazė [vv/val]</string>
     <string name="careportal_newnstreatment_duration_min_label">Trukmė [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -645,7 +627,6 @@
     <string name="waitingforpairing">Laukiama ryšio su pompa</string>
     <string name="pairingok">Sujungta</string>
     <string name="pairingtimedout">Sujungimui skirtas laikas baigėsi</string>
-    <string name="pairing">SUJUNGIMAS</string>
     <string name="danars_nodeviceavailable">Nerasta jokio prietaiso</string>
     <string name="emptyreservoir">Rezervuaras tuščias</string>
     <string name="bloodsugarmeasurementalert">Gliukozės kiekio kraujyje matavimo perspėjimas</string>
@@ -754,7 +735,6 @@
     <string name="bolus_frequency_exceeded">Tokio paties dydžio bolusas buvo nustatytas per paskutines dvi minutes. Siekiant išvengti atsitiktinio perdozavimo ir programos klaidų, veiksmas neleidžiamas.</string>
     <string name="combo_pump_connected_now">Dabar</string>
     <string name="combo_activity_reading_pump_history">Skaitoma pompos istorija</string>
-    <string name="danar_history">Pompos istorija</string>
     <string name="combo_activity_setting_basal_profile">Nustatyti bazės profilį</string>
     <string name="combo_pump_cartridge_low_warrning">Pompos rezervuaras beveik tuščias</string>
     <string name="combo_pump_battery_low_warrning">Pompos baterija baigia išsikrauti</string>
@@ -950,11 +930,7 @@
     <string name="danar_pumpalarm_sound">Garsas</string>
     <string name="danar_pumpalarm_vibrate">Vibravimas</string>
     <string name="danar_pumpalarm_both">Abu</string>
-    <string name="danar_screentimeout">Ekrano aktyvumo laikas [s]</string>
-    <string name="danar_backlight">Ekrano apšvietimo laikas [s]</string>
     <string name="danar_glucoseunits">KG vienetai</string>
-    <string name="danar_shutdown">Išjungimas (val.)</string>
-    <string name="danar_lowreservoir">Žemas rezervuaro lygis (vv)</string>
     <string name="danar_saveuseroptions">Išsaugoti nustatymus pompoje</string>
     <string name="option_on">Įjungti</string>
     <string name="option_off">Išjungti</string>
@@ -1197,15 +1173,12 @@
     <string name="longitude_short">Ilguma:</string>
     <string name="distance_short">Atstumas [m]:</string>
     <string name="name_short">Vardas:</string>
-    <string name="locationis">Vietovė %1$s</string>
     <string name="lastboluslabel">Paskutinis bolusas</string>
     <string name="lastboluscompared">Paskutinis Bolusas prieš %1$s %2$s min</string>
     <string name="triggercoblabel">AAO</string>
     <string name="cobcompared">AAO %1$s %2$.0f</string>
     <string name="taskname">Užduoties pavadinimas</string>
     <string name="edit_short">Keisti</string>
-    <string name="please_choose_an_action_type">Pasirinkite veiksmo tipą:</string>
-    <string name="please_choose_a_trigger_type">Pasirinkite sąlygos tipą:</string>
     <string name="triggers">Sąlygos:</string>
     <string name="remove_label">PAŠALINTI</string>
     <string name="preconditions">Išankstinės sąlygos:</string>
@@ -1296,7 +1269,6 @@
     <string name="medtronic_error_pump_frequency_invalid">Nepalaikomas pompos dažnis.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink adresas neteisingas.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Aptiktas pompos tipas neatitinka nustatymų.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Pompoje neįjungtas bazės profilis.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Pompoje nustatytas neteisingas bazės profilis (turi būti STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Pompoje nustatytas neteisingas laikinos bazės tipas (turi būti absoliutus).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Pompoje nustatytas neteisingas Max Bolusas (turi būti %1$.2f).</string>
@@ -1347,7 +1319,6 @@
     <string name="automation_trigger_pump_last_connection_description">Paskutinis prijungimas prie pompos [min]</string>
     <string name="automation_trigger_pump_last_connection_compared">Paskutinis prijungimas prie pompos prieš %1$s%2$s min.</string>
     <string name="sendsmsactionlabel">Siųsti SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Siųsti SMS visais nurodytais numeriais</string>
     <string name="sendsmsactiontext">Išsiųsti SMS žinutę su tekstu</string>
     <string name="insulinFromCob"><![CDATA[AAO palyginus su AIO: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Pritaikyti boluso apribojimai: %2$.2fU to %3$.2fU</font>]]></string>

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

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Totale IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insuline hoeveelheid</string>
-    <string name="treatments_newtreatment_carbsamount_label">Koolhydraten hoeveelheid</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Koolhydraten</string>
@@ -114,7 +112,6 @@
     <string name="overview">Overzicht</string>
     <string name="nsprofile">NS Profiel</string>
     <string name="simpleprofile">Eenvoudig profiel</string>
-    <string name="tempbasal">Tijdelijk basaal</string>
     <string name="treatments">Behandelingen</string>
     <string name="virtualpump">Virtuele Pomp</string>
     <string name="careportal">Careportal</string>
@@ -146,21 +143,17 @@
     <string name="constraints_violation">In strijd met beperkingen</string>
     <string name="treatmentdeliveryerror">Bolus toedien storing</string>
     <string name="tempbasaldeliveryerror">Tijdelijk basaal toedien storing</string>
-    <string name="overview_newtempbasal_basalpercent">Basaal waarde [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = huidig)</string>
     <string name="setbasalquestion">Accepteer nieuw tijdelijk basaal:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Bolus wizard</string>
     <string name="constraintapllied">Beperking toegepast!</string>
     <string name="confirmation">Bevestiging</string>
-    <string name="entertreatmentquestion">Nieuwe behandeling ingeven:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basaal</string>
     <string name="sms_basal">Basaal:</string>
     <string name="carbs">Koolhydraten</string>
     <string name="changeyourinput">Wijzig het ingegevene!</string>
-    <string name="setextendedbolusquestion">Stel nieuwe vertraagde bolus in:</string>
     <string name="configbuilder_bgsource">BG bron</string>
     <string name="configbuilder_bgsource_description">Waar moet de AndroidAPS zijn gegevens vandaan halen?</string>
     <string name="xdrip">xDrip</string>
@@ -187,7 +180,6 @@
     <string name="careportal_cgmsensorinsert">CGM Sens. ingebracht</string>
     <string name="careportal_cgmsensorstart">CGM Sens. Start</string>
     <string name="careportal_insulincartridgechange">Insuline ampul wissel</string>
-    <string name="careportal_profileswitch">Profiel wissel</string>
     <string name="careportal_snackbolus">Snack bolus</string>
     <string name="careportal_mealbolus">Maaltijd bolus</string>
     <string name="careportal_correctionbolus">Correctie bolus</string>
@@ -208,7 +200,6 @@
     <string name="careportal_newnstreatment_percent_label">Procent</string>
     <string name="careportal_newnstreatment_absolute_label">Absoluut</string>
     <string name="careportal_newnstreatment_notes_label">Notities</string>
-    <string name="careportal_newnstreatment_eventtime_label">Gebeurtenis tijdstip</string>
     <string name="careportal_newnstreatment_profile_label">Profiel</string>
     <string name="careportal_newnstreatment_enteredby_title">Ingegeven door</string>
     <string name="careportal_newnstreatment_glucosetype">Glucose type</string>
@@ -233,7 +224,6 @@
     <string name="connecting">Verbinden</string>
     <string name="connected">Verbonden</string>
     <string name="disconnected">Niet verbonden</string>
-    <string name="danar_pump_settings">DanaR pomp instellingen</string>
     <string name="end_user_license_agreement">Eind gebruiker overeenkomst</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">Begrepen en goedgekeurd</string>
@@ -282,8 +272,6 @@
     <string name="glucosetype_finger">Vingerprik</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manueel</string>
-    <string name="careportal_temporarytarget">Tijd. streefdoel</string>
-    <string name="careportal_temporarytargetcancel">Tijdelijk streefdoel annuleren</string>
     <string name="danarprofile">DanaR profiel instellingen</string>
     <string name="danarprofile_dia">DIA [uur]</string>
     <string name="danarprofile_dia_summary">Duur van insuline activiteit</string>
@@ -422,7 +410,6 @@
     <string name="eatingsoon">Eet binnenkort</string>
     <string name="hypo">Hypo</string>
     <string name="activity">Activiteit</string>
-    <string name="removerecord">Verwijder record:</string>
     <string name="danar_stats">DanaR Statistiek</string>
     <string name="danar_stats_cumulative_tdd">Cumulatieve TDD</string>
     <string name="danar_stats_expweight">Exponentieel verhoogd TDD</string>
@@ -583,16 +570,12 @@
     <string name="ns_noupload_summary">AAPS is verbonden met NS maar er worden geen wijzigingen uitgevoerd op NS</string>
     <string name="basal_step">Basaal stap</string>
     <string name="bolus_step">Bolus Stap</string>
-    <string name="extendedbolus">Vertraagde bolus</string>
-    <string name="temptarget">Tijdelijk streefdoel</string>
     <string name="overview_extendedbolus_cancel_button">Annuleer vertraagde bolus</string>
     <string name="careportal_sensorage_label">Ouderdom sensor</string>
     <string name="careportal_canulaage_label">Ouderdom infusie set</string>
     <string name="careportal_insulinage_label">Ouderdom insuline</string>
     <string name="hours">uren</string>
-    <string name="overview_newtempbasal_basaltype_label">Basaal type</string>
     <string name="invalidprofile">Ongeldig profiel !!!</string>
-    <string name="profileswitch">Profiel Wissel</string>
     <string name="careportal_pbage_label">Ouderdom batterij</string>
     <string name="careportal_pumpbatterychange">Pomp bat. wissel</string>
     <string name="ns_alarmoptions">Alarm opties</string>
@@ -641,7 +624,6 @@
     <string name="careportal_carbsandbolus_label">KOOLHYDRATEN &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">POMP</string>
-    <string name="overview_newtempbasal_basalabsolute">Basale waarde [E/uur]</string>
     <string name="careportal_newnstreatment_duration_min_label">Tijdsduur [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -661,7 +643,6 @@
     <string name="waitingforpairing">Wachten op koppelen van de pomp</string>
     <string name="pairingok">Koppeling geslaagd</string>
     <string name="pairingtimedout">Koppeling verlopen</string>
-    <string name="pairing">Koppelen</string>
     <string name="danars_nodeviceavailable">Geen toestel gevonden</string>
     <string name="emptyreservoir">Ampul leeg</string>
     <string name="bloodsugarmeasurementalert">Bloed glucose meetpunt alarm</string>
@@ -772,7 +753,6 @@
     <string name="bolus_frequency_exceeded">Een bolus met dezelfde hoeveelheid was gevraagd binnen de afgelopen twee minuten. Om incidentele of door bugs veroorzaakte dubbele bolussen te voorkomen is deze bolus geannuleerd.</string>
     <string name="combo_pump_connected_now">Zojuist</string>
     <string name="combo_activity_reading_pump_history">Lezen van pomp historiek</string>
-    <string name="danar_history">Historiek</string>
     <string name="combo_activity_setting_basal_profile">Instellen van basaal profiel</string>
     <string name="combo_pump_cartridge_low_warrning">Insuline ampul is bijna leeg</string>
     <string name="combo_pump_battery_low_warrning">Batterij pomp is bijna leeg</string>
@@ -968,11 +948,7 @@
     <string name="danar_pumpalarm_sound">Geluid</string>
     <string name="danar_pumpalarm_vibrate">Trillen</string>
     <string name="danar_pumpalarm_both">Beide</string>
-    <string name="danar_screentimeout">LCD on time [s]</string>
-    <string name="danar_backlight">Backlight on time [s]</string>
     <string name="danar_glucoseunits">Glucose units</string>
-    <string name="danar_shutdown">Shutdown(hours)</string>
-    <string name="danar_lowreservoir">Laag reservoir (eenheden)</string>
     <string name="danar_saveuseroptions">Opslaan van de opties om de pomp</string>
     <string name="option_on">Aan</string>
     <string name="option_off">Uit</string>
@@ -1190,6 +1166,7 @@
     <string name="running_invalid_version">We hebben gedetecteerd dat je een ongeldige versie gebruikt. Loop is uitgeschakeld!</string>
     <string name="old_version">oude versie</string>
     <string name="very_old_version">zeer oude versie</string>
+    <string name="new_version_warning">Nieuwe versie al zeker %1$d dagen beschikbaar! Terugval LGS na %2$d dagen, loop zal worden uitgeschakeld na %3$d dagen</string>
     <string name="twohours">2u</string>
     <string name="formatinsulinunits">%1$.2fE</string>
     <string name="dexcom_app_patched">Dexcom App (patched)</string>
@@ -1217,15 +1194,18 @@
     <string name="longitude_short">Leng:</string>
     <string name="distance_short">Afst [m]:</string>
     <string name="name_short">Naam:</string>
-    <string name="locationis">Locatie is %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Wanneer </string>
+    <string name="location_inside">Wanneer u zich in het gebied bevindt</string>
+    <string name="location_outside">Wanneer u zich buiten het gebied bevindt</string>
+    <string name="location_going_in">Wanneer u het gebied met deze naam binnengaat</string>
+    <string name="location_going_out">Wanneer u het gebied met deze naam verlaat</string>
     <string name="lastboluslabel">Laatste bolus</string>
     <string name="lastboluscompared">Laatste bolus %1$s %2$s min geleden</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Taaknaam</string>
     <string name="edit_short">EDIT</string>
-    <string name="please_choose_an_action_type">Kies een type actie:</string>
-    <string name="please_choose_a_trigger_type">Kies een type trigger:</string>
     <string name="triggers">Triggers:</string>
     <string name="remove_label">VERWIJDER</string>
     <string name="preconditions">Voorwaarden:</string>
@@ -1318,7 +1298,6 @@
     <string name="medtronic_error_pump_frequency_invalid">Pomp frequentie niet ondersteund.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink adres ongeldig.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Gedetecteerde pomp type komt niet overeen met ingestelde pomp type.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basaalprofielen zijn niet ingeschakeld op pomp.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basaalprofiel ingesteld op pomp is onjuist (moet STD zijn).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde Tijdelijk Basaal-type ingesteld op pomp (moet Insulinesnelh (E/H) zijn).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Max Bolus ingesteld op pomp (moet %1$.2f zijn).</string>
@@ -1369,7 +1348,6 @@
     <string name="automation_trigger_pump_last_connection_description">Laatste verbinding met pomp [minuten geleden]</string>
     <string name="automation_trigger_pump_last_connection_compared">Laatste verbinding met pomp %1$s %2$s min geleden</string>
     <string name="sendsmsactionlabel">Stuur SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Stuur SMS naar alle nummers in voorkeuren</string>
     <string name="sendsmsactiontext">Stuur SMS met tekst</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus limiet bereikt: %2$.2fU naar %3$.2fU</font>]]></string>
@@ -1394,6 +1372,7 @@
     <string name="profile_name">Profielnaam:</string>
     <string name="selected_profile">Geselecteerd:</string>
     <string name="unitsnosemicolon">Eenheden</string>
+    <string name="doyouwantswitchprofile">Wilt u van profiel wisselen en de wijzigingen in het huidige profiel ongedaan maken?</string>
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">Aan</string>
     <string name="common_off">Uit</string>
@@ -1407,7 +1386,18 @@
     <string name="dia_short">DIA</string>
     <string name="ic_short">KH ratio</string>
     <string name="isf_short">ISF</string>
+    <string name="target_short">DOEL</string>
     <string name="clone_label">Dupliceren</string>
+    <string name="saveorresetchangesfirst">Huidige wijzigingen eerst opslaan of ongedaan maken</string>
     <string name="deletecurrentprofile">Huidige profiel verwijderen?</string>
+    <string name="copytolocalprofile">Nieuw lokaal profiel maken op basis van deze profiel wissel?</string>
+    <string name="profilenamecontainsdot">Profielnaam bevat punten.\nDit wordt niet ondersteund door NS.\nProfiel is niet geüpload naar NS.</string>
+    <string name="low_mark_comment">Laagste waarde in bereik (alleen weergave)</string>
+    <string name="high_mark_comment">Hoogste waarde in bereik (alleen weergave)</string>
     <string name="reorder_label">Sorteren</string>
+    <string name="age">Leeftijd:</string>
+    <string name="weight">Gewicht:</string>
+    <string name="id">ID:</string>
+    <string name="submit">Verzenden</string>
+    <string name="survey_comment">Opmerking: Alleen gegevens die zichtbaar zijn op dit scherm worden anoniem geüpload. ID is toegewezen aan deze installatie van AndroidAPS. U kunt gegevens opnieuw indienen als uw hoofdprofiel wordt gewijzigd, maar laat het ten minste een week draaien om resultaat zichtbaar te maken in de tijd in het bereik. Uw hulp wordt gewaardeerd.</string>
 </resources>

app/src/main/res/values-pl-rPL/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Całkowita IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulina</string>
-    <string name="treatments_newtreatment_carbsamount_label">Węglow.</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Węglow</string>
@@ -114,7 +112,6 @@
     <string name="overview">Przegląd</string>
     <string name="nsprofile">Profil Nightscout</string>
     <string name="simpleprofile">Prosty profil</string>
-    <string name="tempbasal">TymczasowaBaza</string>
     <string name="treatments">Leczenie</string>
     <string name="virtualpump">Pompa wirtualna</string>
     <string name="careportal">PortalOpieki</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">Naruszenie ograniczeń</string>
     <string name="treatmentdeliveryerror">Błąd podania bolusa</string>
     <string name="tempbasaldeliveryerror">Błąd podania bazy tymczasowej</string>
-    <string name="overview_newtempbasal_basalpercent">Wartość bazy [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = aktualny)</string>
+    <string name="overview_newtempbasal_basalpercent">Wartość bazy [%]</string>
     <string name="setbasalquestion">Akceptuj nową bazę tymczasową:</string>
     <string name="overview_treatment_label">Leczenie</string>
     <string name="overview_calculator_label">Kalkulator</string>
     <string name="constraintapllied">Ograniczenie nałożone!</string>
     <string name="confirmation">Potwierdzenie</string>
-    <string name="entertreatmentquestion">Wprowadź nowe leczenie:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Baza</string>
     <string name="sms_basal">Baza:</string>
     <string name="carbs">Węglow.</string>
     <string name="changeyourinput">Zmień wprowadzone dane!</string>
-    <string name="setextendedbolusquestion">Ustaw nowy bolus przedłużony:</string>
     <string name="configbuilder_bgsource">Źródło BG</string>
     <string name="configbuilder_bgsource_description">Skąd AndroidAPS powinien czerpać dane?</string>
     <string name="xdrip">xDrip</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">Procent</string>
     <string name="careportal_newnstreatment_absolute_label">Całkowity</string>
     <string name="careportal_newnstreatment_notes_label">Notatki</string>
-    <string name="careportal_newnstreatment_eventtime_label">Czas zdarzenia</string>
+    <string name="event_time_label">Czas zdarzenia</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Wprowadzone przez</string>
     <string name="careportal_newnstreatment_glucosetype">Typ glukozy</string>
@@ -233,7 +227,7 @@
     <string name="connecting">Łączę</string>
     <string name="connected">Połączono</string>
     <string name="disconnected">Rozłączono</string>
-    <string name="danar_pump_settings">Ustawienia pompy DanaR</string>
+    <string name="danar_pump_settings">Ustawienia pompy Dana</string>
     <string name="end_user_license_agreement">Umowa licencyjna użytkownika końcowego</string>
     <string name="end_user_license_agreement_text">NIE MOŻE BY WYKORZYSTYWANY DO PODEJMOWANIA DECYZJI MEDYCZNYCH. NIE MA ŻADNEJ GWARANCJI NA PROGRAM, W ZAKRESIE DOZWOLONYM PRZEZ OBOWIĄZUJĄCE PRAWO. Z WYJĄTKIEM PRZYPADKÓW, GDY W INNY SPOSÓB PISMO OŚWIADCZENIA PRAW AUTORSKICH I / LUB INNYCH STRON, PRZEDSTAWIAĆ PROGRAM \"W STANIE TAKIM, W JAKIM SIĘ ZNAJDUJE\" BEZ JAKIEJKOLWIEK GWARANCJI, WYRAŹNEJ LUB DOMNIEMANEJ, W TYM MIĘDZY INNYMI DOMNIEMANYCH GWARANCJI PRZYDATNOŚCI HANDLOWEJ I PRZYDATNOŚCI DO OKREŚLONEGO CELU. CAŁKOWITE RYZYKO ZWIĄZANE Z JAKOŚCIĄ I WYNIKIEM PROGRAMU JEST PO PAŃSTWA STRONIE. W PRZYPADKU USZKODZENIA PROGRAMU UŻYTKOWNIK PONOSI KOSZT CAŁEGO NIEZBĘDNEGO SERWISU, NAPRAWY LUB POPRAWEK. W PRZYPADKU NIEPOROZUMIEŃ ZASTOSOWANIE PRAWNE MA UMOWA W ANGIELSKIEJ WERSJI JĘZYKOWEJ!!!</string>
     <string name="end_user_license_agreement_i_understand">ROZUMIEM I WYRAŻAM ZGODĘ</string>
@@ -422,7 +416,7 @@
     <string name="eatingsoon">Wkrótce posiłek</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Ćwiczenia</string>
-    <string name="removerecord">Usuń rekord:</string>
+    <string name="removerecord">Usuń wpis</string>
     <string name="danar_stats">DanaR Statystyki</string>
     <string name="danar_stats_cumulative_tdd">Kumulatywna TDD (dawka dzienna)</string>
     <string name="danar_stats_expweight">Ważona wykładniczo TDD</string>
@@ -584,16 +578,13 @@
  żadnych zmian w NS</string>
     <string name="basal_step">Krok bazy</string>
     <string name="bolus_step">Krok bolusa</string>
-    <string name="extendedbolus">BolusPrzedłużony</string>
-    <string name="temptarget">CelTymczasowy</string>
     <string name="overview_extendedbolus_cancel_button">Anuluj bolus przedłużony </string>
     <string name="careportal_sensorage_label">Czas sensora</string>
     <string name="careportal_canulaage_label">Czas wkłucia</string>
     <string name="careportal_insulinage_label">Czas insuliny</string>
     <string name="hours">godzin</string>
-    <string name="overview_newtempbasal_basaltype_label">Typ bazy</string>
     <string name="invalidprofile">Nieprawidłowy profil !!!</string>
-    <string name="profileswitch">ZmieńProfil</string>
+    <string name="doprofileswitch">Zmień profil</string>
     <string name="careportal_pbage_label">Czas baterii pompy</string>
     <string name="careportal_pumpbatterychange">Zmiana baterii pompy</string>
     <string name="ns_alarmoptions">Opcje alarmu</string>
@@ -642,7 +633,6 @@
     <string name="careportal_carbsandbolus_label">WĘGLOW. &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">POMPA</string>
-    <string name="overview_newtempbasal_basalabsolute">Wartość bazy [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Czas trwania [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -662,7 +652,7 @@
     <string name="waitingforpairing">Oczekiwanie na pompe na sparowanie</string>
     <string name="pairingok">Parowanie OK</string>
     <string name="pairingtimedout">Przekroczono limit czasu parowania</string>
-    <string name="pairing">PAROWANIE</string>
+    <string name="pairing">Parowanie</string>
     <string name="danars_nodeviceavailable">Urządzenie nie zostało znalezione do tej pory</string>
     <string name="emptyreservoir">Pusty zasobnik</string>
     <string name="bloodsugarmeasurementalert">Alarm pomiaru poziomu cukru</string>
@@ -773,7 +763,7 @@
     <string name="bolus_frequency_exceeded">W ciągu ostatnich dwóch minut zażądano bolusa o tej samej wielkości. Z uwagi na zapobieganie przypadkowym podwójnym bolusom i ochronę przed błędami jest to zabronione.</string>
     <string name="combo_pump_connected_now">Teraz</string>
     <string name="combo_activity_reading_pump_history">Sczytuję historię pompy</string>
-    <string name="danar_history">historia pompy</string>
+    <string name="danar_history">Historia pompy</string>
     <string name="combo_activity_setting_basal_profile">Wczytuje profil bazowy</string>
     <string name="combo_pump_cartridge_low_warrning">Poziom zasobnika pompy jest niski</string>
     <string name="combo_pump_battery_low_warrning">Poziom baterii pompy jest niski</string>
@@ -793,6 +783,7 @@
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">temu</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min.</string>
     <string name="enablesmbalways">Włącz SMB (Super Mikro Bolusy) zawsze</string>
     <string name="enablesmbalways_summary">Włącz SMB (Super Mikro Bolusy) zawsze, niezależnie od bolusów. Możliwe jedynie ze źródłem BG (poziomu cukru) z dobrym filtrowaniem, jak aplikacja G5</string>
     <string name="enablesmbaftercarbs">Włącz SMB po węglowodanach</string>
@@ -969,11 +960,11 @@
     <string name="danar_pumpalarm_sound">Dźwięk</string>
     <string name="danar_pumpalarm_vibrate">Wibracja</string>
     <string name="danar_pumpalarm_both">Obie opcje</string>
-    <string name="danar_screentimeout">Czas LCD [s]</string>
-    <string name="danar_backlight">Czas podświetlenia [s]</string>
+    <string name="danar_screentimeout">LCD na czas [sekund]</string>
+    <string name="danar_backlight">Podświetlenie na czas [sekund]</string>
     <string name="danar_glucoseunits">Jednostki glukozy</string>
-    <string name="danar_shutdown">Automatyczne wyłączenie (godziny)</string>
-    <string name="danar_lowreservoir">Niski poziom zbiornika (jednostki)</string>
+    <string name="danar_shutdown">Wyłączenie [godzin]</string>
+    <string name="danar_lowreservoir">Niska zawartość zbiornika [Jednostki]</string>
     <string name="danar_saveuseroptions">Zapisz ustawienia w pompie</string>
     <string name="option_on">Włącz</string>
     <string name="option_off">Wyłącz</string>
@@ -1219,15 +1210,20 @@
     <string name="longitude_short">Długość:</string>
     <string name="distance_short">Odległość [m]:</string>
     <string name="name_short">Nazwa:</string>
-    <string name="locationis">Lokalizacja to %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Gdy </string>
+    <string name="location_inside">Kiedy znajdujesz się wewnątrz obszaru</string>
+    <string name="location_outside">Kiedy znajdujesz się poza obszarem</string>
+    <string name="location_going_in">Kiedy wejdziesz do obszaru o nazwie</string>
+    <string name="location_going_out">Kiedy opuścisz obszar o nazwie</string>
     <string name="lastboluslabel">Przed ostatnim bolusem</string>
     <string name="lastboluscompared">Czas ostatniego bolusa %1$s %2$s min temu</string>
     <string name="triggercoblabel">Węgle</string>
     <string name="cobcompared">Węgle %1$s %2$.0f</string>
     <string name="taskname">Nazwa zadania</string>
     <string name="edit_short">EDYTUJ</string>
-    <string name="please_choose_an_action_type">Proszę wybrać typ akcji:</string>
-    <string name="please_choose_a_trigger_type">Proszę wybrać typ wyzwalacza:</string>
+    <string name="please_choose_an_action_type">Wybierz typ czynności</string>
+    <string name="please_choose_a_trigger_type">Wybierz typ wyzwalacza</string>
     <string name="triggers">Wyzwalacz:</string>
     <string name="remove_label">USUŃ</string>
     <string name="preconditions">Warunki wstępne:</string>
@@ -1320,7 +1316,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Częstotliwość pompy nie wspierana.</string>
     <string name="medtronic_error_rileylink_address_invalid">Adres RileyLink niewłaściwy.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Wykryty typ pompy jest inny niż ustawiony.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Profile bazowe nie są uruchomione na pompie.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Ustawienia bazy/ wzorców nie są włączone w pompie. Włącz je na pompie.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Profil bazowy ustawiony na pompie nie jest właściwy (musi być STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Ustawiony na pompie typ dawki tymczasowej jest niewłaściwy (musi być całkowity - Absolute).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Ustawiony na pompie typ Bolus Maksymalny jest niewłaściwy (musi być %1$.2f).</string>
@@ -1371,7 +1367,7 @@
     <string name="automation_trigger_pump_last_connection_description">Ostatnie połączenie z pompą [minut temu]</string>
     <string name="automation_trigger_pump_last_connection_compared">Ostatnie połączenie z pompą %1$s %2$s min temu</string>
     <string name="sendsmsactionlabel">Wyślij SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Wyślij SMS do wszystkich numerów w preferencjach</string>
+    <string name="sendsmsactiondescription">Wyślij SMS do wszystkich numerów</string>
     <string name="sendsmsactiontext">Wyślij SMS z tekstem</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Wprowadzono ograniczenie bolusa: %2$.2fU to %3$.2fU</font>]]></string>
@@ -1419,4 +1415,33 @@
     <string name="low_mark_comment">Dolna wartość zakresu docelowego (tylko do wyświetlania)</string>
     <string name="high_mark_comment">Górna wartość zakresu docelowego (tylko do wyświetlania)</string>
     <string name="reorder_label">Zmień kolejność</string>
+    <string name="age">Wiek:</string>
+    <string name="weight">Waga:</string>
+    <string name="id">ID:</string>
+    <string name="submit">Wyślij</string>
+    <string name="mostcommonprofile">Najczęściej używany profil:</string>
+    <string name="survey_comment">Uwaga: Tylko dane widoczne na tym ekranie zostaną anonimowo przesłane. Tej instalacji AndroidAPS przypisano ID. Możesz przesłać dane ponownie jeśli twój główny profil ulegnie zmianie, ale pozwól mu działać przez co najmniej tydzień aby zobaczyć jego wpływ na wartość czasu w zakresie. Dziękujemy za wsparcie i pomoc.</string>
+    <string name="nav_survey">Ankieta</string>
+    <string name="invalidage">Nieprawidłowy wpis wieku</string>
+    <string name="invalidweight">Nieprawidłowy wpis wagi</string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Od: <b>%2$02d%%</b> Cel: <b>%3$02d%%</b> Do: <b>%4$02d%%</b>]]></string>
+    <string name="average">Średnio</string>
+    <string name="tdd">TDD</string>
+    <string name="tir">TIR</string>
+    <string name="activitymonitor">Monitor aktywności</string>
+    <string name="doyouwantresetstats">Czy chcesz zresetować statystyki aktywności?</string>
+    <string name="statistics">Statystyki</string>
+    <string name="randombg">Losowa BG</string>
+    <string name="description_source_randombg">Generuj losowe dane BG (tylko tryb demonstracyjny)</string>
+    <string name="randombg_short">BG (poziom cukru)</string>
+    <string name="tools">Narzędzia</string>
+    <string name="show_calculation">Pokaż obliczenia</string>
+    <string name="error">Błąd</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">Zdarzenie automatyzacji</string>
+    <string name="alreadyset">Już ustawiono</string>
+    <string name="message">Wiadomość</string>
+    <string name="clearqueueconfirm">Wyczyścić kolejkę? Wszystkie dane w kolejce zostaną utracone!</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">IOB Total:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulina</string>
-    <string name="treatments_newtreatment_carbsamount_label">Carbos</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Carbos</string>
@@ -114,7 +112,6 @@
     <string name="overview">Visão geral</string>
     <string name="nsprofile">Perfil NS</string>
     <string name="simpleprofile">Perfil simples</string>
-    <string name="tempbasal">BasalTemp</string>
     <string name="treatments">Tratamentos</string>
     <string name="virtualpump">Bomba virtual</string>
     <string name="careportal">Careportal</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">Violação das restrições</string>
     <string name="treatmentdeliveryerror">Erro na entrega do bolus</string>
     <string name="tempbasaldeliveryerror">Erro na entrega da basal temporária</string>
-    <string name="overview_newtempbasal_basalpercent">Valor da Basal [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = atual)</string>
+    <string name="overview_newtempbasal_basalpercent">Valor da Basal [%]</string>
     <string name="setbasalquestion">Aceitar nova basal temporária:</string>
     <string name="overview_treatment_label">Tratamento</string>
     <string name="overview_calculator_label">Calculadora</string>
     <string name="constraintapllied">Restrição aplicada!</string>
     <string name="confirmation">Confirmação</string>
-    <string name="entertreatmentquestion">Introduzir novo tratamento:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
     <string name="carbs">Carboidratos</string>
     <string name="changeyourinput">Altere sua entrada!</string>
-    <string name="setextendedbolusquestion">Definir novo bolus estendido:</string>
     <string name="configbuilder_bgsource">Fonte de BG</string>
     <string name="configbuilder_bgsource_description">De onde o AndroidAPS deve obter os dados?</string>
     <string name="xdrip">xDrip</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">Porcentagem</string>
     <string name="careportal_newnstreatment_absolute_label">Absoluto</string>
     <string name="careportal_newnstreatment_notes_label">Notas</string>
-    <string name="careportal_newnstreatment_eventtime_label">Tempo do evento</string>
+    <string name="event_time_label">Hora do Evento</string>
     <string name="careportal_newnstreatment_profile_label">Perfil</string>
     <string name="careportal_newnstreatment_enteredby_title">Introduzido por</string>
     <string name="careportal_newnstreatment_glucosetype">Tipo de glicose</string>
@@ -233,7 +227,7 @@
     <string name="connecting">Conectando</string>
     <string name="connected">Conectado</string>
     <string name="disconnected">Desconectado</string>
-    <string name="danar_pump_settings">Definições bomba DanaR</string>
+    <string name="danar_pump_settings">Configurações da bomba Dana</string>
     <string name="end_user_license_agreement">Condições de Utilização</string>
     <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
     <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
@@ -282,7 +276,7 @@
     <string name="glucosetype_finger">Dedo</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manual</string>
-    <string name="careportal_temporarytarget">Alvo temporário</string>
+    <string name="careportal_temporarytarget">Alvo Temporário</string>
     <string name="careportal_temporarytargetcancel">Cancelar alvo temporário</string>
     <string name="danarprofile">Definições perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
@@ -422,7 +416,7 @@
     <string name="eatingsoon">Comer em breve</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Atividade</string>
-    <string name="removerecord">Remover registo:</string>
+    <string name="removerecord">Remover registo</string>
     <string name="danar_stats">Estatísticas DanaR</string>
     <string name="danar_stats_cumulative_tdd">Dose diária acumulativa</string>
     <string name="danar_stats_expweight">Dose diária exponencialmente ponderada</string>
@@ -583,16 +577,13 @@
     <string name="ns_noupload_summary">Todos os dados enviados para NS são descartados. AAPS está conectado ao NS, mas não é feita nenhuma alteração no NS</string>
     <string name="basal_step">Valor da Basal</string>
     <string name="bolus_step">Incremento de bolus</string>
-    <string name="extendedbolus">BólusEstendido</string>
-    <string name="temptarget">AlvoTemp</string>
     <string name="overview_extendedbolus_cancel_button">Cancelar Bólus Estendido</string>
     <string name="careportal_sensorage_label">Idade do sensor</string>
     <string name="careportal_canulaage_label">Idade da Canula</string>
     <string name="careportal_insulinage_label">Idade de Insulina</string>
     <string name="hours">horas</string>
-    <string name="overview_newtempbasal_basaltype_label">Tipo de Basal</string>
     <string name="invalidprofile">Perfil inválido !!!</string>
-    <string name="profileswitch">TrocarPerfil</string>
+    <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
     <string name="careportal_pumpbatterychange">Mudança de Bateria</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
@@ -641,7 +632,6 @@
     <string name="careportal_carbsandbolus_label">CARBOS &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">BOMBA</string>
-    <string name="overview_newtempbasal_basalabsolute">Valor da Basal [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Duração [min]</string>
     <string name="openapssmb">SMB OpenAPS</string>
     <string name="smb_shortname">SMB</string>
@@ -661,7 +651,7 @@
     <string name="waitingforpairing">Aguardando emparelhamento na bomba</string>
     <string name="pairingok">Emparelhamento OK</string>
     <string name="pairingtimedout">Tempo emparelhamento excedido</string>
-    <string name="pairing">A EMPARELHAR</string>
+    <string name="pairing">A emparelhar</string>
     <string name="danars_nodeviceavailable">Nenhum dispositivo encontrado até agora</string>
     <string name="emptyreservoir">Reservatório vazio</string>
     <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
@@ -772,7 +762,7 @@
     <string name="bolus_frequency_exceeded">Um bolus com o mesmo valor foi introduzido nos 2 últimos minutos. Para evitar introduções acidentais e segurança contra bugs existentes o bolus foi cancelado.</string>
     <string name="combo_pump_connected_now">Agora</string>
     <string name="combo_activity_reading_pump_history">Lendo histórico da bomba</string>
-    <string name="danar_history">histórico bomba</string>
+    <string name="danar_history">Histórico da Bomba</string>
     <string name="combo_activity_setting_basal_profile">Configurando perfil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Nível cartucho da bomba está baixo</string>
     <string name="combo_pump_battery_low_warrning">Bateria da bomba está fraca</string>
@@ -792,6 +782,7 @@
     <string name="insightpump_shortname">Visão</string>
     <string name="ago">atrás</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d mins</string>
     <string name="enablesmbalways">SMB sempre activado</string>
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbaftercarbs">Ativar SMB após carbos</string>
@@ -968,11 +959,11 @@
     <string name="danar_pumpalarm_sound">Som</string>
     <string name="danar_pumpalarm_vibrate">Vibrar</string>
     <string name="danar_pumpalarm_both">Ambos</string>
-    <string name="danar_screentimeout">Desligar LCD [s]</string>
-    <string name="danar_backlight">Desligar luz de fundo [s]</string>
+    <string name="danar_screentimeout">LCD na hora [segundos]</string>
+    <string name="danar_backlight">Luz de fundo na hora [segundos]</string>
     <string name="danar_glucoseunits">Unidades de Glucose</string>
-    <string name="danar_shutdown">Desligar(horas)</string>
-    <string name="danar_lowreservoir">Reservatório baixo (Unidades)</string>
+    <string name="danar_shutdown">Desligar [horas]</string>
+    <string name="danar_lowreservoir">Reservatório baixo [Unidades]</string>
     <string name="danar_saveuseroptions">Gravar opções para a bomba</string>
     <string name="option_on">Ligado</string>
     <string name="option_off">Desligado</string>
@@ -1218,15 +1209,20 @@
     <string name="longitude_short">Long.:</string>
     <string name="distance_short">Dist [m]:</string>
     <string name="name_short">Nome:</string>
-    <string name="locationis">Localização é %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Quando </string>
+    <string name="location_inside">Quando estiver dentro da área</string>
+    <string name="location_outside">Quando estiver fora da área</string>
+    <string name="location_going_in">Quando entrar na área definida</string>
+    <string name="location_going_out">Quando sair da área definida</string>
     <string name="lastboluslabel">Último bolus atrás</string>
     <string name="lastboluscompared">Última vez do bolus %1$s %2$s atrás</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Nome da Tarefa</string>
     <string name="edit_short">EDITAR</string>
-    <string name="please_choose_an_action_type">Escolha um tipo de acção:</string>
-    <string name="please_choose_a_trigger_type">Escolha um tipo de gatilho:</string>
+    <string name="please_choose_an_action_type">Escolha um tipo de acção</string>
+    <string name="please_choose_a_trigger_type">Escolha um tipo de gatilho</string>
     <string name="triggers">Gatilhos:</string>
     <string name="remove_label">REMOVER</string>
     <string name="preconditions">Precondições:</string>
@@ -1319,7 +1315,6 @@
     <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
     <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Perfis de Basal não estão ativos na Bomba.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
@@ -1370,7 +1365,7 @@
     <string name="automation_trigger_pump_last_connection_description">Última ligação à bomba [minutos atrás]</string>
     <string name="automation_trigger_pump_last_connection_compared">Última ligação à bomba %1$s %2$s min atrás</string>
     <string name="sendsmsactionlabel">Enviar SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Enviar SMS para todos os números nas preferências</string>
+    <string name="sendsmsactiondescription">Enviar SMS para todos os números</string>
     <string name="sendsmsactiontext">Enviar SMS com texto</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restrição de Bolus aplicada: %2$.2fU para %3$.2fU</font>]]></string>
@@ -1435,4 +1430,16 @@
     <string name="activitymonitor">Monitor de actividade</string>
     <string name="doyouwantresetstats">Quer reiniciar as estatísticas de actividade?</string>
     <string name="statistics">Estatísticas</string>
+    <string name="randombg">Glic. Aleatória</string>
+    <string name="description_source_randombg">Gerar dados de Glic. aleatórios (Somente modo de Demonstração)</string>
+    <string name="randombg_short">GLIC</string>
+    <string name="tools">Ferramentas</string>
+    <string name="show_calculation">Mostrar Localização</string>
+    <string name="error">Erro</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">Evento de automação</string>
+    <string name="alreadyset">Já definido</string>
+    <string name="message">Mensagem</string>
+    <string name="clearqueueconfirm">Limpar fila? Todos os dados na fila serão perdidos!</string>
 </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">IOB Total:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulina</string>
-    <string name="treatments_newtreatment_carbsamount_label">Hidratos</string>
     <string name="treatments_wizard_bg_label">GLIC</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Hidratos</string>
@@ -114,7 +112,6 @@
     <string name="overview">Visão geral</string>
     <string name="nsprofile">Perfil NS</string>
     <string name="simpleprofile">Perfil simples</string>
-    <string name="tempbasal">Basal Temporária</string>
     <string name="treatments">Tratamentos</string>
     <string name="virtualpump">Bomba virtual</string>
     <string name="careportal">Careportal</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">Violação das restrições</string>
     <string name="treatmentdeliveryerror">Erro na entrega do bolus</string>
     <string name="tempbasaldeliveryerror">Erro na entrega da basal temporária</string>
-    <string name="overview_newtempbasal_basalpercent">Valor da Basal [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = actual)</string>
+    <string name="overview_newtempbasal_basalpercent">Valor da Basal [%]</string>
     <string name="setbasalquestion">Aceitar nova basal temporária:</string>
     <string name="overview_treatment_label">Tratamento</string>
     <string name="overview_calculator_label">Calculadora</string>
     <string name="constraintapllied">Restrição aplicada!</string>
     <string name="confirmation">Confirmação</string>
-    <string name="entertreatmentquestion">Introduzir novo tratamento:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
     <string name="carbs">Hidratos de Carbono</string>
     <string name="changeyourinput">Altere o seu input!</string>
-    <string name="setextendedbolusquestion">Configure um novo bolus prolongado:</string>
     <string name="configbuilder_bgsource">Origem dos valores de Glucose</string>
     <string name="configbuilder_bgsource_description">De onde deve o AndroidAPS obter os dados?</string>
     <string name="xdrip">xDrip</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">Percentagem</string>
     <string name="careportal_newnstreatment_absolute_label">Absoluto</string>
     <string name="careportal_newnstreatment_notes_label">Notas</string>
-    <string name="careportal_newnstreatment_eventtime_label">Tempo do evento</string>
+    <string name="event_time_label">Hora do Evento</string>
     <string name="careportal_newnstreatment_profile_label">Perfil</string>
     <string name="careportal_newnstreatment_enteredby_title">Inserido por</string>
     <string name="careportal_newnstreatment_glucosetype">Tipo de glicose</string>
@@ -233,7 +227,7 @@
     <string name="connecting">A ligar</string>
     <string name="connected">Ligado</string>
     <string name="disconnected">Desligado</string>
-    <string name="danar_pump_settings">Definições bomba DanaR</string>
+    <string name="danar_pump_settings">Configurações da bomba Dana</string>
     <string name="end_user_license_agreement">Condições de Utilização</string>
     <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
     <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
@@ -282,7 +276,7 @@
     <string name="glucosetype_finger">Dedo</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manual</string>
-    <string name="careportal_temporarytarget">Alvo temporário</string>
+    <string name="careportal_temporarytarget">Alvo Temporário</string>
     <string name="careportal_temporarytargetcancel">Cancelar alvo temporário</string>
     <string name="danarprofile">Definições perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
@@ -422,7 +416,7 @@
     <string name="eatingsoon">Comer brevemente</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Actividade</string>
-    <string name="removerecord">Remover registo:</string>
+    <string name="removerecord">Remover registo</string>
     <string name="danar_stats">Estatísticas DanaR</string>
     <string name="danar_stats_cumulative_tdd">Dose diária acumulativa</string>
     <string name="danar_stats_expweight">Dose diária exponencialmente ponderada</string>
@@ -583,16 +577,12 @@
     <string name="ns_noupload_summary">Todos os dados enviados para NS são descartados. AAPS está conectado ao NS, mas não é feita nenhuma alteração no NS</string>
     <string name="basal_step">Valor da Basal</string>
     <string name="bolus_step">Incremento de bolus</string>
-    <string name="extendedbolus">BólusEstendido</string>
-    <string name="temptarget">AlvoTemp</string>
     <string name="overview_extendedbolus_cancel_button">Cancelar Bólus Estendido</string>
     <string name="careportal_sensorage_label">Idade Sensor</string>
     <string name="careportal_canulaage_label">Idade Canula</string>
     <string name="careportal_insulinage_label">Idade Insulina</string>
     <string name="hours">horas</string>
-    <string name="overview_newtempbasal_basaltype_label">Tipo de Basal</string>
     <string name="invalidprofile">Perfil inválido !!!</string>
-    <string name="profileswitch">TrocaPerfil</string>
     <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
     <string name="careportal_pumpbatterychange">Troca bateria bomba</string>
@@ -642,7 +632,6 @@
     <string name="careportal_carbsandbolus_label">HIDRATOS &amp; BÓLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">BOMBA</string>
-    <string name="overview_newtempbasal_basalabsolute">Valor da Basal [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Duração [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -662,7 +651,7 @@
     <string name="waitingforpairing">Aguardando emparelhamento na bomba</string>
     <string name="pairingok">Emparelhamento OK</string>
     <string name="pairingtimedout">Tempo emparelhamento excedido</string>
-    <string name="pairing">A EMPARELHAR</string>
+    <string name="pairing">A emparelhar</string>
     <string name="danars_nodeviceavailable">Nenhum dispositivo encontrado até agora</string>
     <string name="emptyreservoir">Reservatório vazio</string>
     <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
@@ -773,7 +762,7 @@
     <string name="bolus_frequency_exceeded">Um bolus com o mesmo valor foi introduzido nos 2 últimos minutos. Para evitar introduções acidentais e segurança contra bugs existentes o bolus foi cancelado.</string>
     <string name="combo_pump_connected_now">Agora</string>
     <string name="combo_activity_reading_pump_history">A ler histórico bomba</string>
-    <string name="danar_history">histórico bomba</string>
+    <string name="danar_history">Histórico da Bomba</string>
     <string name="combo_activity_setting_basal_profile">A definir perfil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Nível cartucho da bomba está baixo</string>
     <string name="combo_pump_battery_low_warrning">Bateria da bomba está fraca</string>
@@ -793,6 +782,7 @@
     <string name="insightpump_shortname">Visão</string>
     <string name="ago">atrás</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d mins</string>
     <string name="enablesmbalways">SMB sempre activado</string>
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbaftercarbs">Activar SMB após hidratos</string>
@@ -969,11 +959,11 @@
     <string name="danar_pumpalarm_sound">Som</string>
     <string name="danar_pumpalarm_vibrate">Vibrar</string>
     <string name="danar_pumpalarm_both">Ambos</string>
-    <string name="danar_screentimeout">Desligar LCD [s]</string>
-    <string name="danar_backlight">Desligar luz de fundo [s]</string>
+    <string name="danar_screentimeout">LCD na hora [segundos]</string>
+    <string name="danar_backlight">Luz de fundo na hora [segundos]</string>
     <string name="danar_glucoseunits">Unidades de Glucose</string>
-    <string name="danar_shutdown">Desligar(horas)</string>
-    <string name="danar_lowreservoir">Reservatório baixo (Unidades)</string>
+    <string name="danar_shutdown">Desligar [horas]</string>
+    <string name="danar_lowreservoir">Reservatório baixo [Unidades]</string>
     <string name="danar_saveuseroptions">Gravar opções para a bomba</string>
     <string name="option_on">Ligado</string>
     <string name="option_off">Desligado</string>
@@ -1219,15 +1209,20 @@
     <string name="longitude_short">Long.:</string>
     <string name="distance_short">Dist [m]:</string>
     <string name="name_short">Nome:</string>
-    <string name="locationis">Localização é %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Quando </string>
+    <string name="location_inside">Quando estiver dentro da área</string>
+    <string name="location_outside">Quando estiver fora da área</string>
+    <string name="location_going_in">Quando entrar na área definida</string>
+    <string name="location_going_out">Quando sair da área definida</string>
     <string name="lastboluslabel">Último bolus atrás</string>
     <string name="lastboluscompared">Última vez do bolus %1$s %2$s atrás</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Nome da Tarefa</string>
     <string name="edit_short">EDITAR</string>
-    <string name="please_choose_an_action_type">Escolha um tipo de acção:</string>
-    <string name="please_choose_a_trigger_type">Escolha um tipo de gatilho:</string>
+    <string name="please_choose_an_action_type">Escolha um tipo de acção</string>
+    <string name="please_choose_a_trigger_type">Escolha um tipo de gatilho</string>
     <string name="triggers">Gatilhos:</string>
     <string name="remove_label">REMOVER</string>
     <string name="preconditions">Precondições:</string>
@@ -1320,7 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
     <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Perfis de Basal não estão activos na Bomba.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">A configuração de perfis/padrões da basal não éstá atcivada na bomba. Active-a na bomba.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
@@ -1371,7 +1366,7 @@
     <string name="automation_trigger_pump_last_connection_description">Última ligação à bomba [minutos atrás]</string>
     <string name="automation_trigger_pump_last_connection_compared">Última ligação à bomba %1$s %2$s min atrás</string>
     <string name="sendsmsactionlabel">Enviar SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Enviar SMS para todos os números nas preferências</string>
+    <string name="sendsmsactiondescription">Enviar SMS para todos os números</string>
     <string name="sendsmsactiontext">Enviar SMS com texto</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restrição de Bolus aplicada: %2$.2fU para %3$.2fU</font>]]></string>
@@ -1439,4 +1434,13 @@
     <string name="randombg">Glic. Aleatória</string>
     <string name="description_source_randombg">Gerar dados de Glic. aleatórios (Somente modo de Demonstração)</string>
     <string name="randombg_short">GLIC</string>
+    <string name="tools">Ferramentas</string>
+    <string name="show_calculation">Mostrar Localização</string>
+    <string name="error">Erro</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">Evento de automação</string>
+    <string name="alreadyset">Já definido</string>
+    <string name="message">Mensagem</string>
+    <string name="clearqueueconfirm">Limpar fila? Todos os dados na fila serão perdidos!</string>
 </resources>

app/src/main/res/values-ro-rRO/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">IOB totală:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Cantitatea de insulină</string>
-    <string name="treatments_newtreatment_carbsamount_label">Cantitatea de carbohidrați</string>
     <string name="treatments_wizard_bg_label">Glicemie</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Carbohidrați</string>
@@ -113,7 +111,6 @@
     <string name="overview">Privire de ansamblu</string>
     <string name="nsprofile">Profil NS</string>
     <string name="simpleprofile">Profil simplu</string>
-    <string name="tempbasal">BazalăTemp</string>
     <string name="treatments">Tratamente</string>
     <string name="virtualpump">Pompă virtuală</string>
     <string name="careportal">Careportal</string>
@@ -145,21 +142,17 @@
     <string name="constraints_violation">Încălcare a unei limite</string>
     <string name="treatmentdeliveryerror">Eroare la livrarea bolusului</string>
     <string name="tempbasaldeliveryerror">Eroare la setare bazală temporară</string>
-    <string name="overview_newtempbasal_basalpercent">Valoare bazală [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = curent)</string>
     <string name="setbasalquestion">Acceptă noua bazală temporară:</string>
     <string name="overview_treatment_label">Tratament</string>
     <string name="overview_calculator_label">Calculator</string>
     <string name="constraintapllied">Limitare aplicată!</string>
     <string name="confirmation">Confirmare</string>
-    <string name="entertreatmentquestion">Introduceți tratament nou:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazală</string>
     <string name="sms_basal">Bazală:</string>
     <string name="carbs">Carbohidrați</string>
     <string name="changeyourinput">Schimbați ceea ce ați introdus!</string>
-    <string name="setextendedbolusquestion">Setați un nou bolus extins:</string>
     <string name="configbuilder_bgsource">Sursă glicemie</string>
     <string name="configbuilder_bgsource_description">De unde trebuie să primească AndroidAPS datele?</string>
     <string name="xdrip">xDrip</string>
@@ -186,7 +179,6 @@
     <string name="careportal_cgmsensorinsert">Inserare senzor</string>
     <string name="careportal_cgmsensorstart">Start senzor</string>
     <string name="careportal_insulincartridgechange">Schimbare cartuș insulină</string>
-    <string name="careportal_profileswitch">Schimbare profil</string>
     <string name="careportal_snackbolus">Gustare</string>
     <string name="careportal_mealbolus">Masă</string>
     <string name="careportal_correctionbolus">Bolus de corecție</string>
@@ -207,7 +199,6 @@
     <string name="careportal_newnstreatment_percent_label">Procent</string>
     <string name="careportal_newnstreatment_absolute_label">Absolut</string>
     <string name="careportal_newnstreatment_notes_label">Note</string>
-    <string name="careportal_newnstreatment_eventtime_label">Ora evenimentului</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Introdus de</string>
     <string name="careportal_newnstreatment_glucosetype">Tip glicemie</string>
@@ -232,7 +223,6 @@
     <string name="connecting">Se conectează</string>
     <string name="connected">Conectat</string>
     <string name="disconnected">Deconectat</string>
-    <string name="danar_pump_settings">Setări pompă DanaR</string>
     <string name="end_user_license_agreement">Licență utilizator final</string>
     <string name="end_user_license_agreement_text">NU FOLOSIȚI PENTRU LUAREA DE DECIZII MEDICALE. NU EXISTĂ RĂSPUNDERE LEGALĂ SAU GARANȚIE PENTRU ACEST PROGRAM, ÎN LIMITA APLICABILĂ A LEGII. CU EXCEPTIA CAZURILOR SPECIAL MENȚIONATE, AUTORUL ȘI/SAU ALTE PERSOANE IMPLICATE PUN LA DISPOZIȚIE ACEST PROGRAM FĂRĂ NICIO GARANȚIE, IMPLICITĂ SAU EXPLICITĂ, INCLUZÂND, DAR FĂRĂ A SE LIMITA LA, GARANȚIILE LEGATE DE VĂNZAREA SAU POTRIVIREA PENTRU UN ANUME SCOP. ÎNTREGUL RISC LEGAT DE CALITATEA ȘI PERFORMANȚA ACESTUI PROGRAM CAD ÎN RESPONSABILITATEA DUMNEAVOASTRĂ. DACĂ PROGRAMUL SE DOVEDEȘTE A FI DEFECT, DUMNEAVOASTRĂ VĂ ASUMAȚI ÎNTREAGA RĂSPUNDERE, PRECUM ȘI TOATE COSTURILE LEGATE DE SERVICE, REPARAȚII SAU CORECȚII.</string>
     <string name="end_user_license_agreement_i_understand">ÎNȚELEG ȘI SUNT DE ACORD</string>
@@ -269,8 +259,6 @@
     <string name="glucosetype_finger">Deget</string>
     <string name="glucosetype_sensor">Senzor</string>
     <string name="manual">Manual</string>
-    <string name="careportal_temporarytarget">Țintă temporară</string>
-    <string name="careportal_temporarytargetcancel">Renunțare la ținta temporară</string>
     <string name="danarprofile">Setări de profil DanaR</string>
     <string name="danarprofile_dia">DIA [o]</string>
     <string name="danarprofile_dia_summary">Durata de Acțiune a Insulinei (DIA)</string>
@@ -403,7 +391,6 @@
     <string name="eatingsoon">Masă în curând</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Activitate</string>
-    <string name="removerecord">Șterge înregistrarea:</string>
     <string name="danar_stats">Statistici DanaR</string>
     <string name="danar_stats_cumulative_tdd">TDD cumulat</string>
     <string name="danar_stats_expweight">TDD estimat exponențial</string>
@@ -562,16 +549,12 @@
     <string name="ns_noupload_summary">Toate trimiterile de date către NS sunt oprite. AAPS este conectat la NS dar nu se fac schimbări în NS</string>
     <string name="basal_step">Pas bazală</string>
     <string name="bolus_step">Pas bolus</string>
-    <string name="extendedbolus">BolusExtins</string>
-    <string name="temptarget">ȚintăTemporară</string>
     <string name="overview_extendedbolus_cancel_button">Renunță la bolusul extins</string>
     <string name="careportal_sensorage_label">Vechime senzor</string>
     <string name="careportal_canulaage_label">Vechime canulă</string>
     <string name="careportal_insulinage_label">Vechime insulină</string>
     <string name="hours">ore</string>
-    <string name="overview_newtempbasal_basaltype_label">Tip bazală</string>
     <string name="invalidprofile">Profil invalid!!!</string>
-    <string name="profileswitch">SchimbareProfil</string>
     <string name="careportal_pbage_label">Vechime baterie pompă</string>
     <string name="careportal_pumpbatterychange">Schimbare baterie pompă</string>
     <string name="ns_alarmoptions">Opțiuni alarmare</string>
@@ -620,7 +603,6 @@
     <string name="careportal_carbsandbolus_label">CARBO ȘI BOLUS</string>
     <string name="careportal_cgm_label">CGM ȘI OPENAPS</string>
     <string name="careportal_pump_label">POMPĂ</string>
-    <string name="overview_newtempbasal_basalabsolute">Valoare bazală [U/o]</string>
     <string name="careportal_newnstreatment_duration_min_label">Durată [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -640,7 +622,6 @@
     <string name="waitingforpairing">Se așteaptă conectarea la pompă</string>
     <string name="pairingok">Conectare OK</string>
     <string name="pairingtimedout">Conectare nereușită</string>
-    <string name="pairing">CONECTARE</string>
     <string name="danars_nodeviceavailable">Niciun dispozitiv găsit până acum</string>
     <string name="emptyreservoir">Rezervor gol</string>
     <string name="bloodsugarmeasurementalert">Alertă măsurare glicemie</string>
@@ -749,7 +730,6 @@
     <string name="bolus_frequency_exceeded">Un bolus de aceeași valoare a fost livrat în ultimele două minute. Pentru a preveni bolusarea accidentală dublă și pentru a evita greșelile, acesta nu se va livra.</string>
     <string name="combo_pump_connected_now">Acum</string>
     <string name="combo_activity_reading_pump_history">Se citește istoricul din pompă</string>
-    <string name="danar_history">istoric pompă</string>
     <string name="combo_activity_setting_basal_profile">Se setează profilul bazalei</string>
     <string name="combo_pump_cartridge_low_warrning">Nivelul insulinei din pompă este scăzut</string>
     <string name="combo_pump_battery_low_warrning">Nivelul bateriei pompei este scăzut</string>
@@ -945,11 +925,7 @@
     <string name="danar_pumpalarm_sound">Sunet</string>
     <string name="danar_pumpalarm_vibrate">Vibrație</string>
     <string name="danar_pumpalarm_both">Ambele</string>
-    <string name="danar_screentimeout">LCD în timp [s]</string>
-    <string name="danar_backlight">Timp lumină de fundal [s]</string>
     <string name="danar_glucoseunits">Unități glicemie</string>
-    <string name="danar_shutdown">Oprire (ore)</string>
-    <string name="danar_lowreservoir">Rezervor aproape golit (Unități)</string>
     <string name="danar_saveuseroptions">Salvați opțiunile în pompă</string>
     <string name="option_on">Pornit</string>
     <string name="option_off">Oprit</string>
@@ -1192,15 +1168,12 @@
     <string name="longitude_short">Long:</string>
     <string name="distance_short">Dist [m]:</string>
     <string name="name_short">Nume:</string>
-    <string name="locationis">Localizarea este %1$s</string>
     <string name="lastboluslabel">Ultimul bolus</string>
     <string name="lastboluscompared">Ultimul bolus acum %1$s %2$s min</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Numele acțiunii</string>
     <string name="edit_short">EDITARE</string>
-    <string name="please_choose_an_action_type">Trebuie să alegeți un tip de acțiune:</string>
-    <string name="please_choose_a_trigger_type">Trebuie să alegeți un tip de declanșator:</string>
     <string name="triggers">Declanșatori:</string>
     <string name="remove_label">ȘTERGE</string>
     <string name="preconditions">Condiții pre-existente:</string>
@@ -1291,7 +1264,6 @@
     <string name="medtronic_error_pump_frequency_invalid">Frecvența pompei nesuportată.</string>
     <string name="medtronic_error_rileylink_address_invalid">Adresa RileyLink invalidă.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Tipul de pompă detectat nu corespunde cu cel configurat.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Nu sunt active profile de rată bazală în pompă.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Tipul de profil bazal setat în pompă este incorect (trebuie să fie STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Tip incorect de RBT setat în pompă (trebuie să fie Absolut).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Bolus maxim setat incorect în pompă (trebuie să fie %1$.2f).</string>
@@ -1342,7 +1314,6 @@
     <string name="automation_trigger_pump_last_connection_description">Ultima conexiune la pompă [minute în urmă]</string>
     <string name="automation_trigger_pump_last_connection_compared">Ultima conexiune la pompă %1$s %2$s minute în urmă</string>
     <string name="sendsmsactionlabel">Trimite SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Trimite SMS la toate numerele prestabilite</string>
     <string name="sendsmsactiontext">Trimite SMS cu text</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restricție de bolus aplicată: %2$.2fU la %3$.2fU</font>]]></string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">инс:</string>
     <string name="tempbasals_iob_label_string">IOB: активный инсулин</string>
     <string name="tempbasals_iobtotal_label_string">общий IOB</string>
-    <string name="treatments_newtreatment_insulinamount_label">кол-во инсулина</string>
-    <string name="treatments_newtreatment_carbsamount_label">кол-во углеводов</string>
     <string name="treatments_wizard_bg_label">гликемия</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">углеводы</string>
@@ -114,7 +112,6 @@
     <string name="overview">начало</string>
     <string name="nsprofile">профиль NS</string>
     <string name="simpleprofile">простой профиль</string>
-    <string name="tempbasal">ВремБазал</string>
     <string name="treatments">Терапия</string>
     <string name="virtualpump">виртуальная помпа</string>
     <string name="careportal">Портал лечения / назначений</string>
@@ -146,21 +143,18 @@
     <string name="constraints_violation">ограничение нарушено</string>
     <string name="treatmentdeliveryerror">Ошибка подачи болюса</string>
     <string name="tempbasaldeliveryerror">Ошибка подачи врем базала</string>
-    <string name="overview_newtempbasal_basalpercent">Величина базала [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = текущее)</string>
+    <string name="overview_newtempbasal_basalpercent">Величина базала [%]</string>
     <string name="setbasalquestion">принять новый врем базал:</string>
     <string name="overview_treatment_label">болюс</string>
     <string name="overview_calculator_label">калькулятор</string>
     <string name="constraintapllied">применено ограничение!</string>
     <string name="confirmation">подтверждение</string>
-    <string name="entertreatmentquestion">Ввести новое назначение:</string>
     <string name="bolus">болюс</string>
     <string name="sms_bolus">болюс:</string>
     <string name="basal">базал</string>
     <string name="sms_basal">базал: </string>
     <string name="carbs">углеводы</string>
     <string name="changeyourinput">измените введенные данные</string>
-    <string name="setextendedbolusquestion">Установить новый удлиненный болюс:</string>
     <string name="configbuilder_bgsource">источник СК</string>
     <string name="configbuilder_bgsource_description">Откуда должен получать данные AndroidAPS?</string>
     <string name="xdrip">xdrip</string>
@@ -187,7 +181,7 @@
     <string name="careportal_cgmsensorinsert">Установка сенсора мониторинга глюкозы</string>
     <string name="careportal_cgmsensorstart">старт сенсора</string>
     <string name="careportal_insulincartridgechange">замена картриджа инсулина</string>
-    <string name="careportal_profileswitch">смена профиля</string>
+    <string name="careportal_profileswitch">Смена профиля</string>
     <string name="careportal_snackbolus">болюс на перекус</string>
     <string name="careportal_mealbolus">болюс на еду</string>
     <string name="careportal_correctionbolus">болюс на коррекцию</string>
@@ -208,7 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">процент</string>
     <string name="careportal_newnstreatment_absolute_label">абсолют</string>
     <string name="careportal_newnstreatment_notes_label">заметки</string>
-    <string name="careportal_newnstreatment_eventtime_label">время события</string>
+    <string name="event_time_label">Время события</string>
     <string name="careportal_newnstreatment_profile_label">профиль</string>
     <string name="careportal_newnstreatment_enteredby_title">кем введено</string>
     <string name="careportal_newnstreatment_glucosetype">тип глюкозы</string>
@@ -233,7 +227,7 @@
     <string name="connecting">соединение устанавливается</string>
     <string name="connected">соединение установлено</string>
     <string name="disconnected">Разъединено</string>
-    <string name="danar_pump_settings">настройки помпы DanaR</string>
+    <string name="danar_pump_settings">Настройки помпы DanaR</string>
     <string name="end_user_license_agreement">лицензионное соглашение с пользователем</string>
     <string name="end_user_license_agreement_text">НЕ ДОЛЖНО ИСПОЛЬЗОВАТЬСЯ ДЛЯ ПРИНЯТИЯ МЕДИЦИНСКИХ РЕШЕНИЙ. ПРОГРАММА НЕ ДАЕТ ГАРАНТИЙ В РАМКАХ СУЩЕСТВУЮЩЕГО ЗАКОНОДАТЕЛЬСТВА. ПРЕДОСТАВЛЯЕТСЯ \"КАК ЕСТЬ\" БЕЗ ЯВНЫХ ИЛИ СКРЫТЫХ ГАРАНТИЙ ВКЛЮЧАЯ НО НЕ ОГРАНИЧИВАЯСЬ ВОЗМОЖНОСТЬЮ КОММЕРЧЕСКОГО ИСПОЛЬЗОВАНИ ИЛИ СООТВЕТСТВИЯ КАКИМ-ЛИБО ЦЕЛЯМ. ВСЕ РИСКИ ЛОЖАТСЯ НА ВАС. В СЛУЧАЕ НЕРАБОТОСПОСОБНОСТИ ПРОГРАММЫ ВЫ НЕСЕТЕ ВСЕ РАСХОДЫ СВЯЗАННЫЕ С ОБСЛУЖИВАНИЕМ РЕМОНТОМ ИЛИ КОРРЕКТИРОВКОЙ.  </string>
     <string name="end_user_license_agreement_i_understand">я понимаю и принимаю</string>
@@ -282,8 +276,8 @@
     <string name="glucosetype_finger">палец</string>
     <string name="glucosetype_sensor">сенсор</string>
     <string name="manual">вручную</string>
-    <string name="careportal_temporarytarget">временное целевое значение</string>
-    <string name="careportal_temporarytargetcancel">отмена времнной цели</string>
+    <string name="careportal_temporarytarget">Временные целевые значения</string>
+    <string name="careportal_temporarytargetcancel">Отмена времнной цели</string>
     <string name="danarprofile">настройки профиля DanaR</string>
     <string name="danarprofile_dia">время действия инсулина (ч.):</string>
     <string name="danarprofile_dia_summary">Продолжительность активности инсулина</string>
@@ -422,7 +416,7 @@
     <string name="eatingsoon">Ожидаемый прием пищи</string>
     <string name="hypo">Гипо</string>
     <string name="activity">Нагрузка</string>
-    <string name="removerecord">удалить запись</string>
+    <string name="removerecord">Удалить запись</string>
     <string name="danar_stats">статистика DanaR</string>
     <string name="danar_stats_cumulative_tdd">накопительные TDD</string>
     <string name="danar_stats_expweight">экспоненциально взвешенные TDD</string>
@@ -583,16 +577,13 @@
     <string name="ns_noupload_summary">данные передаваемые в NS не доходят. AAPS соединяется с NS но изменения туда не вносятся</string>
     <string name="basal_step">шаг базала</string>
     <string name="bolus_step">шаг болюса</string>
-    <string name="extendedbolus">Удлиненный болюс</string>
-    <string name="temptarget">ВремЦель</string>
     <string name="overview_extendedbolus_cancel_button">Отмена удлиненного болюса</string>
     <string name="careportal_sensorage_label">сенсор пропаботал</string>
     <string name="careportal_canulaage_label">Катетер помпы проработал</string>
     <string name="careportal_insulinage_label">Инсулин проработал</string>
     <string name="hours">час</string>
-    <string name="overview_newtempbasal_basaltype_label">тип базала</string>
     <string name="invalidprofile">Неверный профиль !!!</string>
-    <string name="profileswitch">смена профиля</string>
+    <string name="doprofileswitch">Переключить профиль</string>
     <string name="careportal_pbage_label">Батарея помпы работает</string>
     <string name="careportal_pumpbatterychange">замена батареи помпы</string>
     <string name="ns_alarmoptions">опции оповещения</string>
@@ -641,7 +632,6 @@
     <string name="careportal_carbsandbolus_label">УГЛЕВОДЫ ; БОЛЮС</string>
     <string name="careportal_cgm_label">МОНИТОРИНГ; OPENAPS</string>
     <string name="careportal_pump_label">ПОМПА</string>
-    <string name="overview_newtempbasal_basalabsolute">значения базала (ед/ч)</string>
     <string name="careportal_newnstreatment_duration_min_label">Длительность (мин)</string>
     <string name="openapssmb">Супер микро болюс OpenAPS</string>
     <string name="smb_shortname">Супер микро болюс SMB</string>
@@ -661,7 +651,7 @@
     <string name="waitingforpairing">Ожидание соединения на помпе</string>
     <string name="pairingok">Соединение OK</string>
     <string name="pairingtimedout">Истекло время ожидания соединения</string>
-    <string name="pairing">Установка соединения</string>
+    <string name="pairing">Сопряжение</string>
     <string name="danars_nodeviceavailable">Устройства пока не найдены</string>
     <string name="emptyreservoir">Резервуар пуст</string>
     <string name="bloodsugarmeasurementalert">Предупреждение при измерении уровня СК</string>
@@ -772,7 +762,7 @@
     <string name="bolus_frequency_exceeded">Болюс с таким же количеством единиц был запрошен за последние две минуты. Для предотвращения случайных двойных болюсов и сбоев операция отменена.</string>
     <string name="combo_pump_connected_now">Сейчас</string>
     <string name="combo_activity_reading_pump_history">Чтение истории помпы</string>
-    <string name="danar_history">история помпы</string>
+    <string name="danar_history">Журнал помпы</string>
     <string name="combo_activity_setting_basal_profile">Установка базального профиля</string>
     <string name="combo_pump_cartridge_low_warrning">Низкий уровень инсулина в картридже помпы</string>
     <string name="combo_pump_battery_low_warrning">Низкий заряд батареи помпы</string>
@@ -792,6 +782,7 @@
     <string name="insightpump_shortname">Поле обзора</string>
     <string name="ago">тому назад</string>
     <string name="format_hours">%1$.2f ч</string>
+    <string name="format_mins">%1$d мин</string>
     <string name="enablesmbalways">Всегда включать супер микро болюс SMB</string>
     <string name="enablesmbalways_summary">Всегда включать супер микро болюс SMB независимо от болюсов. Возможно только для источников СК с хорошей фильтрацией данных вроде G5</string>
     <string name="enablesmbaftercarbs">Активировать супер микро болюс SMB после углеводов</string>
@@ -970,11 +961,11 @@ Context | Edit Context</string>
     <string name="danar_pumpalarm_sound">Звуковой сигнал</string>
     <string name="danar_pumpalarm_vibrate">Вибросигнал</string>
     <string name="danar_pumpalarm_both">Оба</string>
-    <string name="danar_screentimeout">LCD экран на время [s]</string>
-    <string name="danar_backlight">Подсветка на время [s]</string>
+    <string name="danar_screentimeout">Время LCD экрана [seconds]</string>
+    <string name="danar_backlight">Время подсветки [seconds]</string>
     <string name="danar_glucoseunits">Единиц глюкозы</string>
-    <string name="danar_shutdown">(Часов) до выключения помпы</string>
-    <string name="danar_lowreservoir">В резервуаре мало инсулина (ед.)</string>
+    <string name="danar_shutdown">Выключение через [hours]</string>
+    <string name="danar_lowreservoir">В резервуаре мало инсулина [Units]</string>
     <string name="danar_saveuseroptions">Сохранить параметры в помпе</string>
     <string name="option_on">Вкл.</string>
     <string name="option_off">Выкл.</string>
@@ -1220,15 +1211,20 @@ Context | Edit Context</string>
     <string name="longitude_short">Долгота:</string>
     <string name="distance_short">Расст [м]:</string>
     <string name="name_short">Имя:</string>
-    <string name="locationis">Местоположение: %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Когда </string>
+    <string name="location_inside">Когда вы находитесь внутри зоны</string>
+    <string name="location_outside">Когда вы вне зоны</string>
+    <string name="location_going_in">Когда вы входите в названную зону</string>
+    <string name="location_going_out">Когда вы покидаете названную зону</string>
     <string name="lastboluslabel">Предыдущий болюс</string>
     <string name="lastboluscompared">Время болюса %1$s %2$s мин назад</string>
     <string name="triggercoblabel">Активн углеводы</string>
     <string name="cobcompared">Активн углеводы %1$s %2$.0f</string>
     <string name="taskname">Название задачи</string>
     <string name="edit_short">РЕДАКТ</string>
-    <string name="please_choose_an_action_type">Выберите тип действия:</string>
-    <string name="please_choose_a_trigger_type">Выберите тип триггера:</string>
+    <string name="please_choose_an_action_type">Выберите тип действия</string>
+    <string name="please_choose_a_trigger_type">Выберите тип триггера</string>
     <string name="triggers">Триггеры:</string>
     <string name="remove_label">УДАЛИТЬ</string>
     <string name="preconditions">Предусловия:</string>
@@ -1321,7 +1317,7 @@ Context | Edit Context</string>
     <string name="medtronic_error_pump_frequency_invalid">Частота помпы не поддерживается.</string>
     <string name="medtronic_error_rileylink_address_invalid">Недопустимый адрес RileyLink.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Обнаруженный тип помпы не соответствует настроенному.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Профили базала не включены на помпе.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Базальные профили/настройки шаблонов не включены в помпе. Включите их на помпе.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Базовый профиль на помпе неверный (должен быть STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Неверный тип временной скорости базала TBR на помпе (должен быть Absolute).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">На помпе задан неверный макс болюс (должен быть %1$.2f).</string>
@@ -1372,7 +1368,7 @@ Context | Edit Context</string>
     <string name="automation_trigger_pump_last_connection_description">Последняя связь с помпой [ мин. назад]</string>
     <string name="automation_trigger_pump_last_connection_compared">Последняя связь с помпой %1$s %2$sмин. назад</string>
     <string name="sendsmsactionlabel">Отправить SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Отправьте SMS на все настроенные номера</string>
+    <string name="sendsmsactiondescription">Отправить SMS на все номера</string>
     <string name="sendsmsactiontext">Отправить SMS с текстом</string>
     <string name="insulinFromCob"><![CDATA[Активные углеводы COB в сопоставлении с Активным инсулином IOB: <font color=\'%1$s\'>%2$+.2fед</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Применено ограничение на болюс: %2$.2fед до %3$.2fед</font>]]></string>
@@ -1437,4 +1433,16 @@ Context | Edit Context</string>
     <string name="activitymonitor">Монитор активности</string>
     <string name="doyouwantresetstats">Хотите сбросить статистику активности?</string>
     <string name="statistics">Статистика</string>
+    <string name="randombg">Случайные значения ГК</string>
+    <string name="description_source_randombg">Генерировать случайные данные ГК (только демо-режим)</string>
+    <string name="randombg_short">BG/ГК</string>
+    <string name="tools">Инструментарий</string>
+    <string name="show_calculation">Показать расчет</string>
+    <string name="error">Ошибка</string>
+    <string name="timeformat12h">12 ч</string>
+    <string name="timeformat24h">24 ч</string>
+    <string name="automation_event">Автоматизированное событие</string>
+    <string name="alreadyset">Уже установлено</string>
+    <string name="message">Сообщение</string>
+    <string name="clearqueueconfirm">Очистить очередь? Все данные в очереди будут потеряны!</string>
 </resources>

app/src/main/res/values-sk-rSK/strings.xml

@@ -74,8 +74,6 @@
     <string name="tempbasals_netinsulin_label_string">Inz:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Celkový IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Množstvo inzulínu</string>
-    <string name="treatments_newtreatment_carbsamount_label">Množstvo sacharidov</string>
     <string name="treatments_wizard_bg_label">Glykémia</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Sacharidy</string>
@@ -114,7 +112,6 @@
     <string name="overview">Prehľad</string>
     <string name="nsprofile">NS Profil</string>
     <string name="simpleprofile">Jednoduchý profil</string>
-    <string name="tempbasal">DočasnýBazál</string>
     <string name="treatments">Ošetrenia</string>
     <string name="virtualpump">Virtuálna pumpa</string>
     <string name="careportal">Starostlivosť</string>
@@ -146,21 +143,17 @@
     <string name="constraints_violation">Mimo povolený rozsah</string>
     <string name="treatmentdeliveryerror">Chyba podania bolusu</string>
     <string name="tempbasaldeliveryerror">Chyba podávania dočasného bazálu</string>
-    <string name="overview_newtempbasal_basalpercent">Hodnota bazálu [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = aktuálny)</string>
     <string name="setbasalquestion">Povoliť nový dočasný bazál:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Kalkulačka</string>
     <string name="constraintapllied">Aplikované obmedzenie!</string>
     <string name="confirmation">Potvrdenie</string>
-    <string name="entertreatmentquestion">Zadaj nové ošetrenie:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazál</string>
     <string name="sms_basal">Bazál:</string>
     <string name="carbs">Sacharidy</string>
     <string name="changeyourinput">Zmeňte zadanie!</string>
-    <string name="setextendedbolusquestion">Spustiť nový predĺžený bolus:</string>
     <string name="configbuilder_bgsource">Zdroj glykémie</string>
     <string name="configbuilder_bgsource_description">Odkiaľ má AndroidAPS získavať glykémie?</string>
     <string name="xdrip">xDrip</string>
@@ -187,7 +180,6 @@
     <string name="careportal_cgmsensorinsert">Výmena senzora</string>
     <string name="careportal_cgmsensorstart">Spustenie senzora</string>
     <string name="careportal_insulincartridgechange">Výmena inzulínu</string>
-    <string name="careportal_profileswitch">Prepnutie profilu</string>
     <string name="careportal_snackbolus">Bolus na desiatu/olovrant</string>
     <string name="careportal_mealbolus">Bolus na jedlo</string>
     <string name="careportal_correctionbolus">Korekčný bolus</string>
@@ -208,7 +200,6 @@
     <string name="careportal_newnstreatment_percent_label">Percentá</string>
     <string name="careportal_newnstreatment_absolute_label">Absolútne</string>
     <string name="careportal_newnstreatment_notes_label">Poznámky</string>
-    <string name="careportal_newnstreatment_eventtime_label">Čas udalosti</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Zadal</string>
     <string name="careportal_newnstreatment_glucosetype">Zadanie glykémie</string>
@@ -233,7 +224,6 @@
     <string name="connecting">Pripájanie</string>
     <string name="connected">Pripojené</string>
     <string name="disconnected">Odpojené</string>
-    <string name="danar_pump_settings">DanaR nastavenia pumpy</string>
     <string name="end_user_license_agreement">Licenčná zmluva s koncovým používateľom</string>
     <string name="end_user_license_agreement_text">Tento program nemôže byť použitý na medicínske rozhodnutia. Na program neexistuje žiadna záruka, alebo garantovaná podpora v akejkoľvek podobe. Keď už sa rozhodneš pre používanie, tak jeho kvalita a celkové schopnosti tohto projektu závisia len na Tebe samotnom. Ak by sa ukázalo, že je program chybný, preberáš všetky potrebné náklady na liečbu, prípadne náklady na iné servisné služby, opravy, alebo korekcie.</string>
     <string name="end_user_license_agreement_i_understand">ROZUMIEM A POTVRDZUJEM</string>
@@ -282,8 +272,6 @@
     <string name="glucosetype_finger">Prst</string>
     <string name="glucosetype_sensor">Senzor</string>
     <string name="manual">Iný</string>
-    <string name="careportal_temporarytarget">Dočasný cieľ</string>
-    <string name="careportal_temporarytargetcancel">Zrušiť dočasný cieľ</string>
     <string name="danarprofile">DanaR nastavenie profilu</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Celková doba pôsobenia inzulínu</string>
@@ -422,7 +410,6 @@
     <string name="eatingsoon">Pred jedlom</string>
     <string name="hypo">Hypoglykémia</string>
     <string name="activity">Aktivita</string>
-    <string name="removerecord">Odstrániť záznam:</string>
     <string name="danar_stats">DanaR štatistiky</string>
     <string name="danar_stats_cumulative_tdd">Kumulatívny TDD</string>
     <string name="danar_stats_expweight">Exponenciálne vážený TDD</string>
@@ -583,16 +570,12 @@
     <string name="ns_noupload_summary">Všetky dáta odoslané do NS, budú zahodené. AAPS je pripojený k NS, ale nerobí v ňom žiadne zmeny</string>
     <string name="basal_step">Krok bazálu</string>
     <string name="bolus_step">Krok bolusu</string>
-    <string name="extendedbolus">PredĺženýBolus</string>
-    <string name="temptarget">DočasnýCieľ</string>
     <string name="overview_extendedbolus_cancel_button">Zrušiť predĺžený bolus</string>
     <string name="careportal_sensorage_label">Vek senzora</string>
     <string name="careportal_canulaage_label">Vek kanyly</string>
     <string name="careportal_insulinage_label">Vek inzulínu</string>
     <string name="hours">hodín</string>
-    <string name="overview_newtempbasal_basaltype_label">Typ bazálu</string>
     <string name="invalidprofile">Chybný profil !!!</string>
-    <string name="profileswitch">Prepnutie profilu</string>
     <string name="doprofileswitch">Vykonajte zmenu profilu</string>
     <string name="careportal_pbage_label">Vek batérie v pumpe</string>
     <string name="careportal_pumpbatterychange">Výmena batérie v pumpe</string>
@@ -642,7 +625,6 @@
     <string name="careportal_carbsandbolus_label">SACHARIDY &amp; BOLUSY</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">PUMPA</string>
-    <string name="overview_newtempbasal_basalabsolute">Hodnota bazálu [JI/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Trvanie [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -662,7 +644,6 @@
     <string name="waitingforpairing">Čakanie na párovanie na pumpe</string>
     <string name="pairingok">Spárované</string>
     <string name="pairingtimedout">Vypršal časový limit pre párovanie</string>
-    <string name="pairing">PÁROVANIE</string>
     <string name="danars_nodeviceavailable">Zatiaľ nenájdené žiadne zariadenie</string>
     <string name="emptyreservoir">Prázdny zásobník</string>
     <string name="bloodsugarmeasurementalert">Výstraha merania glykémie</string>
@@ -773,7 +754,6 @@
     <string name="bolus_frequency_exceeded">Rovnako veľký bolus už bol v priebehu poslednej minúty požadovaný. Ako preventívna ochrana pred zdvojeným bolusom a ako ochrana pred chybami bola operácia zakázaná.</string>
     <string name="combo_pump_connected_now">Teraz</string>
     <string name="combo_activity_reading_pump_history">Načítavam históriu z pumpy</string>
-    <string name="danar_history">Pamäť pumpy</string>
     <string name="combo_activity_setting_basal_profile">Nastavenie bazálneho profilu</string>
     <string name="combo_pump_cartridge_low_warrning">Zásobník inzulínu v pumpe je takmer prázdny</string>
     <string name="combo_pump_battery_low_warrning">Batéria v pumpe je takmer vybitá</string>
@@ -969,11 +949,7 @@
     <string name="danar_pumpalarm_sound">Zvuk</string>
     <string name="danar_pumpalarm_vibrate">Vibrácie</string>
     <string name="danar_pumpalarm_both">Oboje</string>
-    <string name="danar_screentimeout">Čas pred vypnutím displeja [s]</string>
-    <string name="danar_backlight">Podsvietenie [s]</string>
     <string name="danar_glucoseunits">Jednotky</string>
-    <string name="danar_shutdown">Vypnutie [h]</string>
-    <string name="danar_lowreservoir">Nízky stav zásobníka [U]</string>
     <string name="danar_saveuseroptions">Uložiť do pumpy</string>
     <string name="option_on">ZAP</string>
     <string name="option_off">VYP</string>
@@ -1219,15 +1195,12 @@
     <string name="longitude_short">Lon:</string>
     <string name="distance_short">Vzdial. [m]:</string>
     <string name="name_short">Meno:</string>
-    <string name="locationis">Poloha je %1$s</string>
     <string name="lastboluslabel">Od posledného bolusu</string>
     <string name="lastboluscompared">Čas posledného bolusu: pred %1$s %2$s min </string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Názov úlohy</string>
     <string name="edit_short">EDIT</string>
-    <string name="please_choose_an_action_type">Prosím vyberte typ akcie:</string>
-    <string name="please_choose_a_trigger_type">Zvoľte typ podmienky:</string>
     <string name="triggers">Podmienky:</string>
     <string name="remove_label">VYMAZAŤ</string>
     <string name="preconditions">Predpoklady:</string>
@@ -1320,7 +1293,6 @@
     <string name="medtronic_error_pump_frequency_invalid">Nepodporovaná frekvencia pumpy.</string>
     <string name="medtronic_error_rileylink_address_invalid">Neplatná adresa RileyLinku.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Rozpoznaná pumpa je iného typu než nakonfigurovaná.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Bazálne profily nie sú na pumpe aktivované.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Bazálny profil na pumpe je chybný (musí byť STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Chybný typ dočasného bazálu na pumpe (musí byť absolútny).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Chybný max. bolus na pumpe (musí byť %1$.2f).</string>
@@ -1371,7 +1343,6 @@
     <string name="automation_trigger_pump_last_connection_description">Posledné spojenie s pumpou [pred X minútami]</string>
     <string name="automation_trigger_pump_last_connection_compared">Posledné spojenie s pumpou pred %1$s %2$s minútami</string>
     <string name="sendsmsactionlabel">Poslať SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Odoslať SMS na všetky predvolené čísla</string>
     <string name="sendsmsactiontext">Odoslať SMS s textom</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Aplikované obmedzenie bolusu: %2$.2fJI na %3$.2fJI</font>]]></string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -75,8 +75,6 @@ Eversense-appen.</string>
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">IOB fr basal:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulin</string>
-    <string name="treatments_newtreatment_carbsamount_label">KH</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">KH</string>
@@ -115,7 +113,6 @@ Eversense-appen.</string>
     <string name="overview">Översikt</string>
     <string name="nsprofile">NS-profil</string>
     <string name="simpleprofile">Enkel profil</string>
-    <string name="tempbasal">Temp basal</string>
     <string name="treatments">Behandlingar</string>
     <string name="virtualpump">Virtuell pump</string>
     <string name="careportal">Careportal</string>
@@ -147,21 +144,18 @@ Eversense-appen.</string>
     <string name="constraints_violation">Begränsning nådd</string>
     <string name="treatmentdeliveryerror">Fel vid bolusleverans</string>
     <string name="tempbasaldeliveryerror">Fel vid justering av temp basal</string>
-    <string name="overview_newtempbasal_basalpercent">Basaldos [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = profilens värde)</string>
+    <string name="overview_newtempbasal_basalpercent">Basaldos [%]</string>
     <string name="setbasalquestion">Acceptera ny temp basal:</string>
     <string name="overview_treatment_label">Behandling</string>
     <string name="overview_calculator_label">Kalkylator</string>
     <string name="constraintapllied">Begränsning nådd</string>
     <string name="confirmation">Bekräfta</string>
-    <string name="entertreatmentquestion">Ange ny behandling:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
     <string name="carbs">KH</string>
     <string name="changeyourinput">Ändra inmatning</string>
-    <string name="setextendedbolusquestion">Ställ in ny förlängd bolus:</string>
     <string name="configbuilder_bgsource">BG-källa</string>
     <string name="configbuilder_bgsource_description">Var ska AndroidAPS få sitt data ifrån?</string>
     <string name="xdrip">xDrip</string>
@@ -188,7 +182,7 @@ Eversense-appen.</string>
     <string name="careportal_cgmsensorinsert">Byte CGM-sensor</string>
     <string name="careportal_cgmsensorstart">Start CGM-sensor</string>
     <string name="careportal_insulincartridgechange">Byte insulinreservoar</string>
-    <string name="careportal_profileswitch">Byt profil</string>
+    <string name="careportal_profileswitch">Profilbyte</string>
     <string name="careportal_snackbolus">Mellanmålsbolus</string>
     <string name="careportal_mealbolus">Måltidsbolus</string>
     <string name="careportal_correctionbolus">Korrektionsbolus</string>
@@ -209,7 +203,7 @@ Eversense-appen.</string>
     <string name="careportal_newnstreatment_percent_label">Procent</string>
     <string name="careportal_newnstreatment_absolute_label">Absolut</string>
     <string name="careportal_newnstreatment_notes_label">Anteckning</string>
-    <string name="careportal_newnstreatment_eventtime_label">Tid</string>
+    <string name="event_time_label">Tid för händelse</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Loggat av</string>
     <string name="careportal_newnstreatment_glucosetype">Glukostyp</string>
@@ -283,8 +277,8 @@ Eversense-appen.</string>
     <string name="glucosetype_finger">Finger</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manuell</string>
-    <string name="careportal_temporarytarget">Temp målvärde</string>
-    <string name="careportal_temporarytargetcancel">Temp målvärde avbrutet</string>
+    <string name="careportal_temporarytarget">Temp mål</string>
+    <string name="careportal_temporarytargetcancel">Avbryt temp mål</string>
     <string name="danarprofile">Dana R profilinställningar</string>
     <string name="danarprofile_dia">DIA [tim]</string>
     <string name="danarprofile_dia_summary">Insulinets verkningstid</string>
@@ -370,15 +364,18 @@ Eversense-appen.</string>
     <string name="ns_upload_only_summary">Endast uppladdning till Nightscout. Kommer inte få BG-data om inte lokal källa som xDrip används. Kommer heller inte att kunna hämta basalprofiler från Nightscout.</string>
     <string name="pumpNotInitialized">Pump inte initierad</string>
     <string name="pumpNotInitializedProfileNotSet">Pump inte initierad, ingen profil vald.</string>
-    <string name="primefill">Prime/Fyll</string>
+    <string name="primefill">Förfyllning</string>
     <string name="fillwarning">Försäkra dig om att mängden motsvarar det som är specificerat för just ditt infusionsset.</string>
     <string name="othersettings_title">Övrigt</string>
-    <string name="fillbolus_title">Standardvärden för prime/fyll</string>
+    <string name="fillbolus_title">Standardvärden för förfyllning av slang och kanyl.</string>
     <string name="button1">Knapp 1</string>
     <string name="button2">Knapp 2</string>
     <string name="button3">Knapp 3</string>
+    <string name="units_colon">Enheter:</string>
+    <string name="units">Enheter</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
+    <string name="dia">Duration</string>
     <string name="target_range">Målområde:</string>
     <string name="prefs_range_title">Gränsvärden för visualisering</string>
     <string name="prefs_range_summary">Högt och lågt värde för grafen i Översikt och i klockan</string>
@@ -420,7 +417,7 @@ Eversense-appen.</string>
     <string name="eatingsoon">Äta snart</string>
     <string name="hypo">Hypo</string>
     <string name="activity">Träning</string>
-    <string name="removerecord">Ta bort sparad data:</string>
+    <string name="removerecord">Ta bort post</string>
     <string name="danar_stats">Dana R statistik</string>
     <string name="danar_stats_cumulative_tdd">Kumulativ TDD</string>
     <string name="danar_stats_expweight">Exponentiellt viktad TDD</string>
@@ -581,16 +578,13 @@ Eversense-appen.</string>
     <string name="ns_noupload_summary">Ingen data sänds till Nightscout. AndroidAPS ansluter till Nightscout men inga ändringar görs i Nightscout</string>
     <string name="basal_step">Basalsteg</string>
     <string name="bolus_step">Bolussteg</string>
-    <string name="extendedbolus">Förlängd bolus</string>
-    <string name="temptarget">Temp mål</string>
     <string name="overview_extendedbolus_cancel_button">Stoppa förlängd bolus</string>
     <string name="careportal_sensorage_label">Sensorålder</string>
     <string name="careportal_canulaage_label">Kanylålder</string>
     <string name="careportal_insulinage_label">Insulinålder</string>
     <string name="hours">timmar</string>
-    <string name="overview_newtempbasal_basaltype_label">Basaltyp</string>
     <string name="invalidprofile">Ogiltig profil!</string>
-    <string name="profileswitch">Profilbyte</string>
+    <string name="doprofileswitch">Genomför profilbyte</string>
     <string name="careportal_pbage_label">Pumpbatteri ålder</string>
     <string name="careportal_pumpbatterychange">Byte pumpbatteri</string>
     <string name="ns_alarmoptions">Larminställningar</string>
@@ -639,7 +633,6 @@ Eversense-appen.</string>
     <string name="careportal_carbsandbolus_label">KOLHYDRATER &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; LOGGNING</string>
     <string name="careportal_pump_label">PUMP</string>
-    <string name="overview_newtempbasal_basalabsolute">Basal [E/tim]</string>
     <string name="careportal_newnstreatment_duration_min_label">Duration [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -659,7 +652,7 @@ Eversense-appen.</string>
     <string name="waitingforpairing">Väntar på parkoppling med pump</string>
     <string name="pairingok">Parkopplingen klar</string>
     <string name="pairingtimedout">Parkopplingen tog för lång tid</string>
-    <string name="pairing">PARKOPPLAR</string>
+    <string name="pairing">Parkoppling</string>
     <string name="danars_nodeviceavailable">Ingen enhet funnen ännu</string>
     <string name="emptyreservoir">Tom reservoar</string>
     <string name="bloodsugarmeasurementalert">Varning om blodsockermätning</string>
@@ -790,6 +783,7 @@ Eversense-appen.</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">sedan</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
     <string name="enablesmbalways">Använd alltid SMB</string>
     <string name="enablesmbalways_summary">Använd alltid SMB oberoende av bolus. Endast möjligt med en bra filtrerad BG-källa, t ex Dexcom G5.</string>
     <string name="enablesmbaftercarbs">Använd SMB efter kolhydrater</string>
@@ -966,11 +960,11 @@ Eversense-appen.</string>
     <string name="danar_pumpalarm_sound">Ljud</string>
     <string name="danar_pumpalarm_vibrate">Vibrera</string>
     <string name="danar_pumpalarm_both">Båda</string>
-    <string name="danar_screentimeout">LCD på, tid [s]</string>
-    <string name="danar_backlight">Bakgrundsbelysning på, tid [s]</string>
+    <string name="danar_screentimeout">LCD på, tid [sek]</string>
+    <string name="danar_backlight">Bakgrundsbelysning på, tid [sek]</string>
     <string name="danar_glucoseunits">Glukosenheter</string>
-    <string name="danar_shutdown">Stäng av (timmar)</string>
-    <string name="danar_lowreservoir">Låg nivå reservoar (enheter)</string>
+    <string name="danar_shutdown">Avstängning pump [tim]</string>
+    <string name="danar_lowreservoir">Låg reservoar [Enheter]</string>
     <string name="danar_saveuseroptions">Spara till pump</string>
     <string name="option_on">På</string>
     <string name="option_off">Av</string>
@@ -1188,6 +1182,7 @@ Eversense-appen.</string>
     <string name="running_invalid_version">Du kör en ogiltig version. Loop avstängd!</string>
     <string name="old_version">gammal version</string>
     <string name="very_old_version">väldigt gammal version</string>
+    <string name="new_version_warning">Ny version tillgänglig för %1$d dagar sedan. Systemet kommer att byta läge till \"stopp innan lågt\" efter %2$d dagar och sluta loopa helt efter %3$d dagar</string>
     <string name="twohours">2 tim</string>
     <string name="formatinsulinunits">%1$.2f U</string>
     <string name="dexcom_app_patched">Dexcoms app (modifierad)</string>
@@ -1215,15 +1210,20 @@ Eversense-appen.</string>
     <string name="longitude_short">Lon:</string>
     <string name="distance_short">Dist [m]:</string>
     <string name="name_short">Namn:</string>
-    <string name="locationis">Platsen är %1$s</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">När </string>
+    <string name="location_inside">När du är inne i området</string>
+    <string name="location_outside">När du är utanför området</string>
+    <string name="location_going_in">När du går in i området som heter</string>
+    <string name="location_going_out">När du lämnar området som heter</string>
     <string name="lastboluslabel">Senaste bolus</string>
     <string name="lastboluscompared">Senaste bolus %1$s %2$s min sedan</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Åtgärdsnamn</string>
     <string name="edit_short">ÄNDRA</string>
-    <string name="please_choose_an_action_type">Vänligen välj åtgärdstyp:</string>
-    <string name="please_choose_a_trigger_type">Vänligen välj typ av utlösare:</string>
+    <string name="please_choose_an_action_type">Välj en åtgärd</string>
+    <string name="please_choose_a_trigger_type">Vänligen välj typ av utlösare</string>
     <string name="triggers">Utlösare:</string>
     <string name="remove_label">TA BORT</string>
     <string name="preconditions">Förutsättningar:</string>
@@ -1316,7 +1316,7 @@ Eversense-appen.</string>
     <string name="medtronic_error_pump_frequency_invalid">Pumpfrekvens stöds inte.</string>
     <string name="medtronic_error_rileylink_address_invalid">Riley Link adress felaktig.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Pumptypen verkar inte vara samma som den inställda.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basalprofiler inte aktiverat på pumpen.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basalprofiler är inte aktiverade på pumpen. Aktivera det i pumpens menyer.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Fel basalprofiltyp inställt på pumpen (måste vara STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Fel typ av temp basal på pumpen (måste vara satt till Absolut).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Fel max bolus i pumpen (måste vara %1$.2f).</string>
@@ -1367,7 +1367,7 @@ Eversense-appen.</string>
     <string name="automation_trigger_pump_last_connection_description">Senaste anslutning till pump [min sedan]</string>
     <string name="automation_trigger_pump_last_connection_compared">Senaste anslutning till pump %1$s %2$s min sedan</string>
     <string name="sendsmsactionlabel">Skicka SMS: %1$s</string>
-    <string name="sendsmsactiondescription">Skicka SMS till alla nummer i inställningar</string>
+    <string name="sendsmsactiondescription">Skicka SMS till alla nummer</string>
     <string name="sendsmsactiontext">Skicka SMS med text</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolusbegränsning: %2$.2fU till %3$.2fU</font>]]></string>
@@ -1389,6 +1389,10 @@ Eversense-appen.</string>
     <string name="format_percent">%1$d%%</string>
     <string name="boluswizard">Kalkylator</string>
     <string name="unit_minute_short">min</string>
+    <string name="profile_name">Profilnamn:</string>
+    <string name="selected_profile">Valt:</string>
+    <string name="unitsnosemicolon">Enheter</string>
+    <string name="doyouwantswitchprofile">Vill du byta profil och ta bort ändringar som gjorts i den aktuella profilen?</string>
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">På</string>
     <string name="common_off">Av</string>
@@ -1396,4 +1400,48 @@ Eversense-appen.</string>
     <string name="objectives_button_unstart">Rensa påbörjade</string>
     <string name="timedetection">Tidsdetektering</string>
     <string name="doyouwantresetstart">Vill du starta om målet? Du kan förlora de steg du gjort hittills.</string>
+    <string name="nopumpselected">Ingen pump har valts</string>
+    <string name="setupwizard_units_prompt">Välj enheter du vill visa värden i</string>
+    <string name="ns_ploadlocalprofile">Överför lokala profiländringar till NS</string>
+    <string name="dia_short">DIA</string>
+    <string name="ic_short">IC</string>
+    <string name="isf_short">ISF</string>
+    <string name="target_short">Mål</string>
+    <string name="clone_label">Kopiera</string>
+    <string name="saveorresetchangesfirst">Spara eller återställa aktuella ändringar först</string>
+    <string name="deletecurrentprofile">Ta bort aktuell profil?</string>
+    <string name="copytolocalprofile">Vill du skapa en ny lokal profil från detta profilbyte?</string>
+    <string name="profilenamecontainsdot">Profilnamnet innehåller punkter.\nDetta stöds inte av NS.\nProfil överförs inte till NS.</string>
+    <string name="low_mark_comment">Nedre värdet för målområde (endast visning)</string>
+    <string name="high_mark_comment">Övre värdet för målområde (endast visning)</string>
+    <string name="reorder_label">Ändra ordning</string>
+    <string name="age">Ålder:</string>
+    <string name="weight">Vikt:</string>
+    <string name="id">ID:</string>
+    <string name="submit">Spara</string>
+    <string name="mostcommonprofile">Den vanligaste profilen:</string>
+    <string name="survey_comment">Observera att endast data som visas på den här skärmen kommer att överföras anonymt. ID tilldelas till den här installationen av AndroidAPS. Du kan lämna in data igen om din huvudprofil ändras men låt den köra minst en vecka för att göra resultatet synligt i tid inom intervallet. Din hjälp är uppskattad.</string>
+    <string name="nav_survey">Enkät</string>
+    <string name="invalidage">Ogiltig inmatning (ålder)</string>
+    <string name="invalidweight">Ogiltig inmatning (vikt)</string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Låg: <b>%2$02d%%</b> Mål: <b>%3$02d%%</b> Hög: <b>%4$02d%%</b>]]></string>
+    <string name="average">Medel</string>
+    <string name="tdd">TDD</string>
+    <string name="tir">TIR</string>
+    <string name="activitymonitor">Aktivitetsövervakare</string>
+    <string name="doyouwantresetstats">Vill du återställa aktivitetsstatistiken?</string>
+    <string name="statistics">Statistik</string>
+    <string name="randombg">Slumpgenerator för BG</string>
+    <string name="description_source_randombg">Generera slumpmässiga BG-data (endast demo-läge)</string>
+    <string name="randombg_short">BG</string>
+    <string name="tools">Verktyg</string>
+    <string name="show_calculation">Visa beräkning</string>
+    <string name="error">Fel</string>
+    <string name="timeformat12h">12 tim</string>
+    <string name="timeformat24h">24 tim</string>
+    <string name="automation_event">Automationshändelse</string>
+    <string name="alreadyset">Redan satt</string>
+    <string name="message">Meddelande</string>
+    <string name="clearqueueconfirm">Allt data som inte synkats kommer att kastas bort. Är du säker på att du vill tömma kön?</string>
 </resources>

app/src/main/res/values-tr-rTR/strings.xml

@@ -70,8 +70,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Toplam IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">İnsülin</string>
-    <string name="treatments_newtreatment_carbsamount_label">Karbonhidrat</string>
     <string name="treatments_wizard_bg_label">KŞ</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Karbonhidrat</string>
@@ -109,7 +107,6 @@
     <string name="overview">Genel Bakış</string>
     <string name="nsprofile">Nightscout Profil</string>
     <string name="simpleprofile">Basit Profil</string>
-    <string name="tempbasal">Geçici Bazal</string>
     <string name="treatments">Tedaviler</string>
     <string name="virtualpump">Sanal pompa</string>
     <string name="careportal">Careportal</string>
@@ -146,14 +143,12 @@
     <string name="overview_calculator_label">Hesap makinesi</string>
     <string name="constraintapllied">Sınırlaması uygulanır!</string>
     <string name="confirmation">Onaylama</string>
-    <string name="entertreatmentquestion">Yeni tedavi girin:</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazal</string>
     <string name="sms_basal">Bazal:</string>
     <string name="carbs">Karbonhidrat</string>
     <string name="changeyourinput">Girişinizi değiştirin!</string>
-    <string name="setextendedbolusquestion">Yeni yayım bolusu ayarla:</string>
     <string name="configbuilder_bgsource">KŞ kaynağı</string>
     <string name="configbuilder_bgsource_description">AndroidAPS verilerini nereden alsın?</string>
     <string name="xdrip">xDrip</string>
@@ -180,7 +175,6 @@
     <string name="careportal_cgmsensorinsert">CGM Sensör Yerleştir</string>
     <string name="careportal_cgmsensorstart">CGM sensörü Başlat</string>
     <string name="careportal_insulincartridgechange">İnsülin Kartuş Değişimi</string>
-    <string name="careportal_profileswitch">Profil değiştir</string>
     <string name="careportal_snackbolus">Aperatif Bolusu</string>
     <string name="careportal_mealbolus">Öğün Bolus</string>
     <string name="careportal_correctionbolus">Düzeltme Bolus</string>
@@ -201,7 +195,6 @@
     <string name="careportal_newnstreatment_percent_label">Yüzde</string>
     <string name="careportal_newnstreatment_absolute_label">Mutlak</string>
     <string name="careportal_newnstreatment_notes_label">Notlar</string>
-    <string name="careportal_newnstreatment_eventtime_label">Etkinlik saati</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Tarafından girilen</string>
     <string name="careportal_newnstreatment_glucosetype">Glikoz türü</string>
@@ -225,7 +218,6 @@
     <string name="connecting">Bağlanıyor</string>
     <string name="connected">Bağlanıldı</string>
     <string name="disconnected">Bağlantı kesildi</string>
-    <string name="danar_pump_settings">DanaR pompa ayarları</string>
     <string name="end_user_license_agreement">Son Kullanıcı Lisans Sözleşmesi</string>
     <string name="end_user_license_agreement_text">TIBBİ KARAR VERMEK İÇİN KULLANILMAMALIDIR. UYGULANABİLİR YASANIN İZİN VERDİĞİ ÖLÇÜDE, PROGRAM İÇİN GARANTİ YOKTUR. TELİF HAKKI SAHİPLERİNİN VE / VEYA DİĞER TARAFLARIN YAZILI OLMASINA YÖNELİK BAŞKA HİÇBİR ŞEKİLDE BELİRTİLEN VEYA BELİRLİ BİR AMACA UYGUNLUK İLE İLGİLİ ZIMNİ GARANTİLER DE DAHİL OLMAK ÜZERE ANCAK BUNLARLA SINIRLI OLMAMAK ÜZERE AÇIK VEYA ZIMNİ HİÇBİR GARANTİ OLMAKSIZIN “OLDUĞU GİBİ” SAĞLAMAKTADIR. PROGRAMIN KALİTESİ VE PERFORMANSI İLE İLGİLİ TÜM RİSK SİZE AİTTİR. PROGRAMIN HASARLI OLMASI DURUMUNDA, TÜM GEREKLİ SERVİS, ONARIM VEYA DÜZELTME MALİYETİNİ KABUL ETMİŞ OLURSUNUZ.</string>
     <string name="end_user_license_agreement_i_understand">BEN ANLADIM VE KABUL EDİYORUM</string>
@@ -257,8 +249,6 @@
     <string name="glucosetype_finger">Parmak</string>
     <string name="glucosetype_sensor">Sensör</string>
     <string name="manual">Manuel</string>
-    <string name="careportal_temporarytarget">Geçici hedef</string>
-    <string name="careportal_temporarytargetcancel">Geçici hedef iptal</string>
     <string name="danarprofile">DanaR profil ayarları</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">İnsülin aktivitesinin süresi</string>
@@ -375,7 +365,6 @@
     <string name="eatingsoon">Yakında Öğün</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Eğzersiz</string>
-    <string name="removerecord">Kaydı kaldır:</string>
     <string name="danar_stats">DanaR istatistikleri</string>
     <string name="danar_stats_cumulative_tdd">Toplamsal GTD (Günlük Toplam Doz)</string>
     <string name="danar_stats_expweight">Katlanarak artan ağırlıklı GTD (Günlük Toplam Doz)</string>
@@ -526,16 +515,12 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="ns_noupload_summary">NS\'ye gönderilen tüm veriler düştü. AAPS NS\'ye bağlandı, ancak NS\'de hiçbir değişiklik yapılmadı</string>
     <string name="basal_step">Bazal adım</string>
     <string name="bolus_step">Bolus adım</string>
-    <string name="extendedbolus">Yayım Bolus</string>
-    <string name="temptarget">Geçici hedef</string>
     <string name="overview_extendedbolus_cancel_button">Yayma Bolusu iptal et</string>
     <string name="careportal_sensorage_label">Sensör yaşı</string>
     <string name="careportal_canulaage_label">Kanül yaşı</string>
     <string name="careportal_insulinage_label">İnsülin yaşı</string>
     <string name="hours">saatler</string>
-    <string name="overview_newtempbasal_basaltype_label">Bazal tipi</string>
     <string name="invalidprofile">Geçersiz profil!!!</string>
-    <string name="profileswitch">Profil değiştir</string>
     <string name="careportal_pbage_label">Pompa pil yaşı</string>
     <string name="careportal_pumpbatterychange">Pompa Akü Değişimi</string>
     <string name="ns_alarmoptions">Alarm türleri</string>
@@ -582,7 +567,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="careportal_carbsandbolus_label">KARBONHİDRATLAR &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">PUMP</string>
-    <string name="overview_newtempbasal_basalabsolute">Bazal değer [Ü/s]</string>
     <string name="careportal_newnstreatment_duration_min_label">Süre [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -602,7 +586,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="waitingforpairing">Pompada eşleştirme bekleniyor</string>
     <string name="pairingok">Eşleştirme tamam</string>
     <string name="pairingtimedout">Eşleştirme zaman aşımı</string>
-    <string name="pairing">EŞLEŞTİRME</string>
     <string name="danars_nodeviceavailable">Şu ana kadar hiçbir cihaz bulunamadı</string>
     <string name="emptyreservoir">Rezervuar boş</string>
     <string name="bloodsugarmeasurementalert">Kan şekeri ölçüm uyarısı</string>
@@ -704,7 +687,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="bolus_frequency_exceeded">Son iki dakikada aynı miktarda bir bolus talep edildi. Yanlışlıkla yapılan çift bolusları önlemek ve hatalara karşı koruma sağlamak için buna izin verilmez.</string>
     <string name="combo_pump_connected_now">Şimdi</string>
     <string name="combo_activity_reading_pump_history">Pompa geçmişi okunuyor</string>
-    <string name="danar_history">pompa geçmişi</string>
     <string name="combo_activity_setting_basal_profile">Bazal profil ayarlanıyor</string>
     <string name="combo_pump_cartridge_low_warrning">Pompa rezervuar seviyesi düşük</string>
     <string name="combo_pump_battery_low_warrning">Pompa pili düşük</string>
@@ -893,11 +875,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="danar_pumpalarm_sound">Ses</string>
     <string name="danar_pumpalarm_vibrate">Titreşim</string>
     <string name="danar_pumpalarm_both">İkisi de</string>
-    <string name="danar_screentimeout">LCD ekran saat süresi [s]</string>
-    <string name="danar_backlight">Arka ışık süresi [s]</string>
     <string name="danar_glucoseunits">Glikoz birimleri</string>
-    <string name="danar_shutdown">Kapat(saatler)</string>
-    <string name="danar_lowreservoir">Düşük rezervuar (Ünite)</string>
     <string name="danar_saveuseroptions">Seçenekleri pompaya kaydet</string>
     <string name="option_on">Aç</string>
     <string name="option_off">Kapa</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -72,8 +72,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB活性胰岛素:</string>
     <string name="tempbasals_iobtotal_label_string">总 IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">胰岛素</string>
-    <string name="treatments_newtreatment_carbsamount_label">碳水化合物</string>
     <string name="treatments_wizard_bg_label">血糖</string>
     <string name="treatments_wizard_tt_label">临时目标</string>
     <string name="treatments_wizard_carbs_label">碳水化合物</string>
@@ -111,7 +109,6 @@
     <string name="overview">首页概览</string>
     <string name="nsprofile">NS 配置文件</string>
     <string name="simpleprofile">简单配置文件</string>
-    <string name="tempbasal">临时基础</string>
     <string name="treatments">治疗</string>
     <string name="virtualpump">虚拟泵</string>
     <string name="careportal">护理记录</string>
@@ -143,21 +140,17 @@
     <string name="constraints_violation">违反约束条件</string>
     <string name="treatmentdeliveryerror">大剂量输注错误</string>
     <string name="tempbasaldeliveryerror">临时基础输注错误</string>
-    <string name="overview_newtempbasal_basalpercent">基础率值 [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = 当前)</string>
     <string name="setbasalquestion">接受新的临时基础率</string>
     <string name="overview_treatment_label">治疗</string>
     <string name="overview_calculator_label">计算器</string>
     <string name="constraintapllied">应用约束!</string>
     <string name="confirmation">确认</string>
-    <string name="entertreatmentquestion">输入新的治疗:</string>
     <string name="bolus">大剂量</string>
     <string name="sms_bolus">大剂量:</string>
     <string name="basal">基础率</string>
     <string name="sms_basal">基础率:</string>
     <string name="carbs">碳水化合物</string>
     <string name="changeyourinput">更改您的输入!</string>
-    <string name="setextendedbolusquestion">设定新的扩展大剂量</string>
     <string name="configbuilder_bgsource">血糖来源</string>
     <string name="configbuilder_bgsource_description">AndroidAPS 从何处获取数据？</string>
     <string name="xdrip">xDrip</string>
@@ -184,7 +177,6 @@
     <string name="careportal_cgmsensorinsert">CGM 传感器插入</string>
     <string name="careportal_cgmsensorstart">CGM 传感器启动</string>
     <string name="careportal_insulincartridgechange">更换储药器</string>
-    <string name="careportal_profileswitch">配置文件切换</string>
     <string name="careportal_snackbolus">零食大剂量</string>
     <string name="careportal_mealbolus">餐时大剂量</string>
     <string name="careportal_correctionbolus">矫正大剂量</string>
@@ -205,7 +197,6 @@
     <string name="careportal_newnstreatment_percent_label">百分比</string>
     <string name="careportal_newnstreatment_absolute_label">绝对</string>
     <string name="careportal_newnstreatment_notes_label">备注</string>
-    <string name="careportal_newnstreatment_eventtime_label">事件时间</string>
     <string name="careportal_newnstreatment_profile_label">配置文件</string>
     <string name="careportal_newnstreatment_enteredby_title">输入者是</string>
     <string name="careportal_newnstreatment_glucosetype">血糖类型</string>
@@ -229,7 +220,6 @@
     <string name="connecting">正在连接</string>
     <string name="connected">已连接</string>
     <string name="disconnected">已断开连接</string>
-    <string name="danar_pump_settings">DanaR 泵设置</string>
     <string name="end_user_license_agreement">最终用户许可协议</string>
     <string name="end_user_license_agreement_text">不得用于制定医疗决定。在适用法律允许的范围内，对该程序不作任何保证。除非另有书面授权的版权所有者和/或其他方均按原样提供程序，不附带明示或暗示的任何形式的担保，包括但不限于对适销性和适用于特定用途的默示担保。对您的程序的质量和性能的完整风险。如果程序存在缺陷，您应承担所有必要维修，修理或更正的代价.</string>
     <string name="end_user_license_agreement_i_understand">我理解并同意</string>
@@ -266,8 +256,6 @@
     <string name="glucosetype_finger">手指</string>
     <string name="glucosetype_sensor">传感器</string>
     <string name="manual">手动</string>
-    <string name="careportal_temporarytarget">临时目标</string>
-    <string name="careportal_temporarytargetcancel">临时目标取消</string>
     <string name="danarprofile">DanaR 配置文件设置</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">胰岛素活性持续时间</string>
@@ -400,7 +388,6 @@
     <string name="eatingsoon">很快吃饭</string>
     <string name="hypo">低</string>
     <string name="activity">活动</string>
-    <string name="removerecord">删除记录</string>
     <string name="danar_stats">DanaR 统计</string>
     <string name="danar_stats_cumulative_tdd">累积的每日胰岛素输注的总量</string>
     <string name="danar_stats_expweight">日输注总量指数加权</string>
@@ -555,16 +542,12 @@
     <string name="ns_noupload_summary">所有发送到 NS 的数据都将被丢弃。AAPS 已连接到 NS, 但 NS中没有进行任何更改</string>
     <string name="basal_step">基础率步值</string>
     <string name="bolus_step">大剂量步值</string>
-    <string name="extendedbolus">扩展大剂量</string>
-    <string name="temptarget">临时目标</string>
     <string name="overview_extendedbolus_cancel_button">取消扩展大剂量</string>
     <string name="careportal_sensorage_label">传感器使用时间</string>
     <string name="careportal_canulaage_label">管路使用时间</string>
     <string name="careportal_insulinage_label">胰岛素使用时间</string>
     <string name="hours">小时</string>
-    <string name="overview_newtempbasal_basaltype_label">基础率类型</string>
     <string name="invalidprofile">无效的配置文件!!!</string>
-    <string name="profileswitch">配置文件切换</string>
     <string name="careportal_pbage_label">泵电池使用时间</string>
     <string name="careportal_pumpbatterychange">更换泵电池</string>
     <string name="ns_alarmoptions">报警选项</string>
@@ -612,7 +595,6 @@
     <string name="careportal_carbsandbolus_label">碳水化合物 &amp; 大剂量</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">泵</string>
-    <string name="overview_newtempbasal_basalabsolute">基础率值 [U/小时]</string>
     <string name="careportal_newnstreatment_duration_min_label">持续时间 [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
@@ -632,7 +614,6 @@
     <string name="waitingforpairing">等待泵配对</string>
     <string name="pairingok">配对成功</string>
     <string name="pairingtimedout">配对超时</string>
-    <string name="pairing">正在配对</string>
     <string name="danars_nodeviceavailable">迄今未找到任何设备</string>
     <string name="emptyreservoir">储药器空了</string>
     <string name="bloodsugarmeasurementalert">血糖测量警报</string>
@@ -741,7 +722,6 @@
     <string name="bolus_frequency_exceeded">在最近2分钟内要输注相同数量的大剂量。 为了防止错误地重复打大剂量发生意外，不允许这样操作</string>
     <string name="combo_pump_connected_now">现在</string>
     <string name="combo_activity_reading_pump_history">读取泵历史记录</string>
-    <string name="danar_history">泵历史记录</string>
     <string name="combo_activity_setting_basal_profile">设置基础率配置文件</string>
     <string name="combo_pump_cartridge_low_warrning">泵储药器快没胰岛素了</string>
     <string name="combo_pump_battery_low_warrning">泵电池电量不足</string>
@@ -934,11 +914,7 @@
     <string name="danar_pumpalarm_sound">声音</string>
     <string name="danar_pumpalarm_vibrate">振动</string>
     <string name="danar_pumpalarm_both">两者都</string>
-    <string name="danar_screentimeout">LCD屏幕亮的时间[s]</string>
-    <string name="danar_backlight">背景光开启的时间[s]</string>
     <string name="danar_glucoseunits">血糖单位</string>
-    <string name="danar_shutdown">关机(小时)</string>
-    <string name="danar_lowreservoir">储药器药量低(单位)</string>
     <string name="danar_saveuseroptions">保存选项到泵上</string>
     <string name="option_on">开启</string>
     <string name="option_off">关闭</string>

wear/src/main/res/values-it-rIT/strings.xml

@@ -20,30 +20,46 @@
     <string name="pref_on">On</string>
     <string name="pref_off">Off</string>
     <string name="pref_vibrate_on_bolus">Vibra durante bolo</string>
+    <string name="pref_units_for_actions">Unità per Azioni</string>
     <string name="pref_show_date">Mostra data</string>
     <string name="pref_show_iob">Mostra IOB</string>
     <string name="pref_show_cob">Mostra COB</string>
     <string name="pref_show_delta">Mostra delta</string>
+    <string name="pref_show_avgdelta">Mostra AvgDelta</string>
     <string name="pref_show_phone_battery">Mostra batteria telefono</string>
+    <string name="pref_show_rig_battery">Mostra Batteria Rig</string>
     <string name="pref_show_basal_rate">Mostra velocità basale</string>
     <string name="pref_show_loop_status">Mostra stato loop</string>
     <string name="pref_show_bg">Mostra BG</string>
     <string name="pref_show_direction_arrow">Mostra frecce direzionali</string>
+    <string name="pref_show_ago">Mostra Indietro</string>
     <string name="pref_dark" comment="Enables dark visual theme">Scuro</string>
     <string name="pref_highlight_basals">Evidenzia basali</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Matching divider</string>
+    <string name="pref_chart_timeframe">Timeframe Grafico</string>
     <string name="pref_1_hour">1 ora</string>
     <string name="pref_2_hours">2 ore</string>
     <string name="pref_3_hours">3 ore</string>
     <string name="pref_4_hours">4 ore</string>
     <string name="pref_5_hours">5 ore</string>
+    <string name="pref_input_design">Input Design</string>
+    <string name="pref_default">Default</string>
+    <string name="pref_quick_righty">Quick righty</string>
+    <string name="pref_quick_lefty">Quick lefty</string>
+    <string name="pref_modern_sparse">Modern Sparse</string>
+    <string name="pref_delta_granularity">Delta Granularity (Steampunk)</string>
     <string name="pref_low">Basso</string>
     <string name="pref_medium">Medio</string>
     <string name="pref_high">Alto</string>
     <string name="pref_big_numbers">Numeri grandi</string>
     <string name="pref_ring_history">Storico Ring</string>
+    <string name="pref_light_ring_history">Storico Light Ring</string>
     <string name="pref_animations">Animazioni</string>
     <string name="pref_wizard_in_menu">Wizard in Menu</string>
+    <string name="pref_prime_in_menu">Carica in Menu</string>
     <string name="pref_single_target">Target singolo</string>
+    <string name="pref_wizard_percentage">Percentuale Wizard</string>
+    <string name="pref_complication_tap_action">Complication Tap Action</string>
     <string name="pref_unicode_in_complications">Unicode in Complications</string>
     <string name="pref_version">Versione:</string>
     <string name="menu_tempt">TempT</string>
@@ -53,6 +69,8 @@
     <string name="menu_settings">Impostazioni</string>
     <string name="menu_status">Stato</string>
     <string name="menu_prime_fill">Carica/Riempi</string>
+    <string name="menu_none">Nessuno</string>
+    <string name="menu_default">Default</string>
     <string name="menu_menu">Menu</string>
     <string name="action_duration">durata</string>
     <string name="action_target" comment="In temp target menu, single target value">target</string>
@@ -60,6 +78,7 @@
     <string name="action_high" comment="In temp target menu, higher value from range">alto</string>
     <string name="action_carbs">CHO</string>
     <string name="action_percentage">percentuale</string>
+    <string name="action_start_min">avvio [min]</string>
     <string name="action_duration_h">durata [h]</string>
     <string name="action_insulin">insulina</string>
     <string name="action_preset_1">Preset 1</string>
@@ -67,6 +86,8 @@
     <string name="action_preset_3">Preset 3</string>
     <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Quantità libera</string>
     <string name="action_confirm">CONFERMA</string>
+    <string name="action_status_pump">STATO MICRO</string>
+    <string name="action_status_loop">STATO LOOP</string>
     <string name="action_timeshift">timeshift</string>
     <string name="action_tdd_weighted">TDD ponderato</string>
     <string name="action_bolus">bolo</string>

wear/src/main/res/values-nl-rNL/strings.xml

@@ -1,3 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="msg_warning_old">AAPS gegevens zijn %1$s oud! Controleer je sensor, xDrip+, NS, AAPS instellingen of andere!</string>
+    <string name="pref_on">Aan</string>
+    <string name="pref_off">Uit</string>
+    <string name="pref_vibrate_on_bolus">Trillen bij bolus</string>
+    <string name="pref_units_for_actions">Eenheden voor acties</string>
+    <string name="pref_show_date">Toon datum</string>
+    <string name="pref_show_delta">Toon Delta</string>
+    <string name="pref_show_avgdelta">Toon gemiddelde delta</string>
+    <string name="pref_1_hour">1 uur</string>
+    <string name="pref_2_hours">2 uren</string>
+    <string name="pref_3_hours">3 uren</string>
+    <string name="pref_4_hours">4 uren</string>
+    <string name="pref_5_hours">5 uren</string>
+    <string name="pref_default">Standaard</string>
+</resources>

wear/src/main/res/values-pl-rPL/strings.xml

@@ -8,10 +8,102 @@
     <string name="label_xdrip_big_chart">AAPS(DużyWykres)</string>
     <string name="label_xdrip_no_chart">AAPS(BezWykresu)</string>
     <string name="label_xdrip_circle">AAPS(Koło)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(Kokpit)</string>
+    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
     <string name="label_warning_sync">Brak danych!</string>
     <string name="label_warning_old">Stare dane!</string>
     <string name="label_warning_since">Od %1$s</string>
     <string name="label_warning_sync_aaps">Synchronizuj z AAPS!</string>
     <string name="msg_warning_sync">Nie otrzymano danych od %1$s! Sprawdź czy AAPS na telefonie wysyła dane do zegarka</string>
     <string name="msg_warning_old">Dane z AAPS są %1$s stare! Sprawdź swój sensor, xDrip+, NS, konfigurację AAPS i inne ustawienia!</string>
+    <string name="pref_on">Włącz</string>
+    <string name="pref_off">Wyłącz</string>
+    <string name="pref_vibrate_on_bolus">Wibruj przy Bolusie</string>
+    <string name="pref_units_for_actions">Jednostki dla akcji</string>
+    <string name="pref_show_date">Pokaż Datę</string>
+    <string name="pref_show_iob">Pokaż IOB</string>
+    <string name="pref_show_cob">Pokaż COB</string>
+    <string name="pref_show_delta">Pokaż Deltę</string>
+    <string name="pref_show_avgdelta">Pokaż Śr. Deltę</string>
+    <string name="pref_show_phone_battery">Pokaż Baterię Telefonu</string>
+    <string name="pref_show_rig_battery">Pokaż Baterię Zestawu</string>
+    <string name="pref_show_basal_rate">Pokaż Bazę</string>
+    <string name="pref_show_loop_status">Pokaż Status Pętli</string>
+    <string name="pref_show_bg">Pokaż glikemię</string>
+    <string name="pref_show_direction_arrow">Pokaż strzałkę trendu</string>
+    <string name="pref_show_ago">Pokaż aktualność</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Tryb ciemny</string>
+    <string name="pref_highlight_basals">Podświetl Bazę</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Separator pod kolor</string>
+    <string name="pref_chart_timeframe">Ramy czasowe wykresu</string>
+    <string name="pref_1_hour">1 godzina</string>
+    <string name="pref_2_hours">2 godziny</string>
+    <string name="pref_3_hours">3 godziny</string>
+    <string name="pref_4_hours">4 godziny</string>
+    <string name="pref_5_hours">5 godzin</string>
+    <string name="pref_input_design">Styl wprowadzania</string>
+    <string name="pref_default">Domyślny</string>
+    <string name="pref_quick_righty">Szybki prawy</string>
+    <string name="pref_quick_lefty">Szybki lewy</string>
+    <string name="pref_modern_sparse">Minimalistyczny</string>
+    <string name="pref_delta_granularity">Granularność Delty (Steampunk)</string>
+    <string name="pref_low">Niska</string>
+    <string name="pref_medium">Średnia</string>
+    <string name="pref_high">Wysoka</string>
+    <string name="pref_big_numbers">Duże Cyfry</string>
+    <string name="pref_ring_history">Historia glikemi</string>
+    <string name="pref_light_ring_history">Dyskretniejsza historia</string>
+    <string name="pref_animations">Animacje</string>
+    <string name="pref_wizard_in_menu">Kalkulator w Menu</string>
+    <string name="pref_prime_in_menu">Wypełnianie w menu</string>
+    <string name="pref_single_target">Pojedyńcza wartość Celu</string>
+    <string name="pref_wizard_percentage">Kalkulator z korektą w %</string>
+    <string name="pref_complication_tap_action">Akcja po kliknięciu komplikacji</string>
+    <string name="pref_unicode_in_complications">Unicode w Komplikacjach</string>
+    <string name="pref_version">Wersja:</string>
+    <string name="menu_tempt">CelTymcz.</string>
+    <string name="menu_wizard">Kalkulator</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">eWęgle</string>
+    <string name="menu_settings">Ustawienia</string>
+    <string name="menu_status">Status</string>
+    <string name="menu_prime_fill">Wypełnianie</string>
+    <string name="menu_none">Brak</string>
+    <string name="menu_default">Domyślnie</string>
+    <string name="menu_menu">Menu</string>
+    <string name="action_duration">czas trwania</string>
+    <string name="action_target" comment="In temp target menu, single target value">cel</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">nisko</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">wysoko</string>
+    <string name="action_carbs">węglow.</string>
+    <string name="action_percentage">procent</string>
+    <string name="action_start_min">start [min]</string>
+    <string name="action_duration_h">czas trwania [g]</string>
+    <string name="action_insulin">insulina</string>
+    <string name="action_preset_1">Ustawienie 1</string>
+    <string name="action_preset_2">Ustawienie 2</string>
+    <string name="action_preset_3">Ustawienie 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Podana wartość</string>
+    <string name="action_confirm">POTWIERDŹ</string>
+    <string name="action_status_pump">STATUS POMPY</string>
+    <string name="action_status_loop">STATUS PĘTLI</string>
+    <string name="action_timeshift">przesunięcie czasu</string>
+    <string name="action_tdd_weighted">Ważone TDD</string>
+    <string name="action_bolus">bolus</string>
+    <string name="status_pump">Pompa</string>
+    <string name="status_loop">Pętla</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Węgl.</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">brak statusu</string>
+    <string name="unit_mg_dl">mg/dl</string>
+    <string name="unit_mmol_l">mmol/l</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">U</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">U/g</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">g</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">t</string>
 </resources>

wear/src/main/res/values-ru-rRU/strings.xml

@@ -8,10 +8,102 @@
     <string name="label_xdrip_big_chart">AAPS (Крупный график)</string>
     <string name="label_xdrip_no_chart">AAPS (Без графика)</string>
     <string name="label_xdrip_circle">AAPS (круглый)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS (кабина пилота)</string>
+    <string name="label_xdrip_steampunk">AAPS (Стимпанк)</string>
     <string name="label_warning_sync">Данные не поступают!</string>
     <string name="label_warning_old">Старые данные!</string>
     <string name="label_warning_since">Длится с: %1$s</string>
     <string name="label_warning_sync_aaps">Синхронизация с ААПС!</string>
     <string name="msg_warning_sync">Нет данных начиная с %1$s! Убедитесь, что AAPS на телефоне отправляет данные на часы</string>
     <string name="msg_warning_old">Старые данные AAPS от %1$s! Проверьте сенсор, xDrip +, NS, конфигурацию AAPS, другое!</string>
+    <string name="pref_on">Вкл.</string>
+    <string name="pref_off">Выкл.</string>
+    <string name="pref_vibrate_on_bolus">Вибрировать при болюсе</string>
+    <string name="pref_units_for_actions">Единицы для начала действий</string>
+    <string name="pref_show_date">Показать дату</string>
+    <string name="pref_show_iob">Показать акт инс IOB</string>
+    <string name="pref_show_cob">Показать акт угл COB</string>
+    <string name="pref_show_delta">Показывать дельту</string>
+    <string name="pref_show_avgdelta">Показывать среднюю дельту</string>
+    <string name="pref_show_phone_battery">Показывать заряд батареи телефона</string>
+    <string name="pref_show_rig_battery">Показывать заряд батареи системы</string>
+    <string name="pref_show_basal_rate">Показать базальную скорость</string>
+    <string name="pref_show_loop_status">Показывать состояние цикла</string>
+    <string name="pref_show_bg">Показывать ГК</string>
+    <string name="pref_show_direction_arrow">Показывать стрелку тренда</string>
+    <string name="pref_show_ago">Показывать ретро события</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Тёмная</string>
+    <string name="pref_highlight_basals">Выделить базалы</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Соответствующий делитель</string>
+    <string name="pref_chart_timeframe">Временной диапазон графика</string>
+    <string name="pref_1_hour">1 час</string>
+    <string name="pref_2_hours">2 часа</string>
+    <string name="pref_3_hours">3 часа</string>
+    <string name="pref_4_hours">4 часа</string>
+    <string name="pref_5_hours">5 часов</string>
+    <string name="pref_input_design">Дизайн Ввода</string>
+    <string name="pref_default">По умолчанию</string>
+    <string name="pref_quick_righty">Быстрый правосторонний</string>
+    <string name="pref_quick_lefty">Быстрый левосторонний</string>
+    <string name="pref_modern_sparse">Современный разреженный</string>
+    <string name="pref_delta_granularity">Дельта детально (Стимпанк)</string>
+    <string name="pref_low">Низкий</string>
+    <string name="pref_medium">Средний</string>
+    <string name="pref_high">Высокий</string>
+    <string name="pref_big_numbers">Цифры крупно</string>
+    <string name="pref_ring_history">Показывать историю в кольце</string>
+    <string name="pref_light_ring_history">Показывать историю в кольце менее подробно</string>
+    <string name="pref_animations">Анимация</string>
+    <string name="pref_wizard_in_menu">Мастер в меню</string>
+    <string name="pref_prime_in_menu">Первичное заполнение в меню</string>
+    <string name="pref_single_target">Единичная цель</string>
+    <string name="pref_wizard_percentage">Процент мастера</string>
+    <string name="pref_complication_tap_action">Действия при нажатии кнопки расширений</string>
+    <string name="pref_unicode_in_complications">Юникод в репликации</string>
+    <string name="pref_version">Версия:</string>
+    <string name="menu_tempt">ВремЦ</string>
+    <string name="menu_wizard">Мастер настройки</string>
+    <string name="menu_bolus">Болюс</string>
+    <string name="menu_ecarb">eCarbs/производные углеводы</string>
+    <string name="menu_settings">Настройки</string>
+    <string name="menu_status">Состояние</string>
+    <string name="menu_prime_fill">Прайм/заполнение</string>
+    <string name="menu_none">Не показывать</string>
+    <string name="menu_default">По умолчанию</string>
+    <string name="menu_menu">Menu</string>
+    <string name="action_duration">продолжительность</string>
+    <string name="action_target" comment="In temp target menu, single target value">целевое значение ГК:</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">низкий</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">высокий</string>
+    <string name="action_carbs">углеводы</string>
+    <string name="action_percentage">процент</string>
+    <string name="action_start_min">начало [min]</string>
+    <string name="action_duration_h">продолжительность [h]</string>
+    <string name="action_insulin">инсулин</string>
+    <string name="action_preset_1">Предустановка 1</string>
+    <string name="action_preset_2">Предустановка 2</string>
+    <string name="action_preset_3">Предустановка 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Произвольное количество</string>
+    <string name="action_confirm">ПОДТВЕРДИТЬ</string>
+    <string name="action_status_pump">СОСТОЯНИЕ ПОМПЫ</string>
+    <string name="action_status_loop">СОСТОЯНИЕ ЦИКЛА</string>
+    <string name="action_timeshift">сдвиг по времени</string>
+    <string name="action_tdd_weighted">Суммарная суточная доза TDD-взвешенная</string>
+    <string name="action_bolus">болюс</string>
+    <string name="status_pump">Помпа</string>
+    <string name="status_loop">Замкнутый цикл</string>
+    <string name="status_cpp">Суточный профиль в процентах</string>
+    <string name="status_tdd">TDD/общая суточная доза</string>
+    <string name="activity_carb">Углеводы</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">статус отсутствует</string>
+    <string name="unit_mg_dl">мг/дл</string>
+    <string name="unit_mmol_l">ммоль/л</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">г</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">Ед</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">Ед/ч</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">ч</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">д</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">н</string>
 </resources>

wear/src/main/res/values-sv-rSE/strings.xml

@@ -1,3 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="app_name">AAPS</string>
+    <string name="label_actions_activity">AAPS</string>
+    <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_large">AAPS (Large)</string>
+    <string name="label_xdrip_big_chart">AAPS (BigChart)</string>
+    <string name="label_xdrip_no_chart">AAPS (NoChart)</string>
+    <string name="label_xdrip_circle">AAPS (Circle)</string>
+    <string name="label_xdrip_v2">AAPS v2</string>
+    <string name="label_xdrip_cockpit">AAPS (Cockpit)</string>
+    <string name="label_xdrip_steampunk">AAPS (Steampunk)</string>
+    <string name="label_warning_sync">Inga data!</string>
+    <string name="label_warning_old">Gamla data!</string>
+    <string name="label_warning_since">Sedan %1$s</string>
+    <string name="label_warning_sync_aaps">Synka med AAPS!</string>
+    <string name="msg_warning_sync">Inga data har tagits emot sedan %1$s! Kontrollera om AAPS i telefonen skickar data till klockan</string>
+    <string name="msg_warning_old">AAPS-data är %1$s gammal. Kontrollera sensorn, xDrip+, NS, AAPS-inställning eller något annat!</string>
+    <string name="pref_on">På</string>
+    <string name="pref_off">Av</string>
+    <string name="pref_vibrate_on_bolus">Vibrera vid bolus</string>
+    <string name="pref_units_for_actions">Enheter för åtgärder</string>
+    <string name="pref_show_date">Visa datum</string>
+    <string name="pref_show_iob">Visa IOB</string>
+    <string name="pref_show_cob">Visa COB</string>
+    <string name="pref_show_delta">Visa skillnad</string>
+    <string name="pref_show_avgdelta">Visa genomsnittlig skillnad</string>
+    <string name="pref_show_phone_battery">Visa telefonens batterinivå</string>
+    <string name="pref_show_rig_battery">Visa riggens batterinivå</string>
+    <string name="pref_show_basal_rate">Visa basaldos</string>
+    <string name="pref_show_loop_status">Visa APS-status</string>
+    <string name="pref_show_bg">Visa BG</string>
+    <string name="pref_show_direction_arrow">Visa riktningspil</string>
+    <string name="pref_show_ago">Visa sedan</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Mörkt</string>
+    <string name="pref_highlight_basals">Markera basaler</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Matchande avdelare</string>
+    <string name="pref_chart_timeframe">Tidsspann för diagram</string>
+    <string name="pref_1_hour">1 timme</string>
+    <string name="pref_2_hours">2 timmar</string>
+    <string name="pref_3_hours">3 timmar</string>
+    <string name="pref_4_hours">4 timmar</string>
+    <string name="pref_5_hours">5 timmar</string>
+    <string name="pref_input_design">Inmatningsdesign</string>
+    <string name="pref_default">Standardinställning</string>
+    <string name="pref_quick_righty">Snabb höger</string>
+    <string name="pref_quick_lefty">Snabb vänster</string>
+    <string name="pref_modern_sparse">Modern Sparse</string>
+    <string name="pref_delta_granularity">Precision för skillnad (Steampunk)</string>
+    <string name="pref_low">Låg</string>
+    <string name="pref_medium">Mellan</string>
+    <string name="pref_high">Hög</string>
+    <string name="pref_big_numbers">Stora siffror</string>
+    <string name="pref_ring_history">Ringhistorik</string>
+    <string name="pref_light_ring_history">Ljus ringhistorik</string>
+    <string name="pref_animations">Animationer</string>
+    <string name="pref_wizard_in_menu">Guide i menyn</string>
+    <string name="pref_prime_in_menu">Förfyllning i menyn</string>
+    <string name="pref_single_target">Enkelt målvärde</string>
+    <string name="pref_wizard_percentage">Procent av guiden</string>
+    <string name="pref_complication_tap_action">Åtgärd för komplikation \"tryck\"</string>
+    <string name="pref_unicode_in_complications">Unicode i komplikationer</string>
+    <string name="pref_version">Version:</string>
+    <string name="menu_tempt">Tempmål</string>
+    <string name="menu_wizard">Guide</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">eCarb</string>
+    <string name="menu_settings">Inställningar</string>
+    <string name="menu_status">Status</string>
+    <string name="menu_prime_fill">Förfyllning</string>
+    <string name="menu_none">Ingen</string>
+    <string name="menu_default">Standardinställning</string>
+    <string name="menu_menu">Meny</string>
+    <string name="action_duration">duration</string>
+    <string name="action_target" comment="In temp target menu, single target value">målvärde</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">låg</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">hög</string>
+    <string name="action_carbs">KH</string>
+    <string name="action_percentage">procent</string>
+    <string name="action_start_min">start [min]</string>
+    <string name="action_duration_h">varaktighet [tim]</string>
+    <string name="action_insulin">insulin</string>
+    <string name="action_preset_1">Förinställning 1</string>
+    <string name="action_preset_2">Förinställning 2</string>
+    <string name="action_preset_3">Förinställning 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Valfri mängd</string>
+    <string name="action_confirm">BEKRÄFTA</string>
+    <string name="action_status_pump">STATUS PUMP</string>
+    <string name="action_status_loop">STATUS LOOP</string>
+    <string name="action_timeshift">tidsförskjutning</string>
+    <string name="action_tdd_weighted">TDD viktad</string>
+    <string name="action_bolus">bolus</string>
+    <string name="status_pump">Pump</string>
+    <string name="status_loop">APS</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">KH</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">Ingen Status</string>
+    <string name="unit_mg_dl">mg/dL</string>
+    <string name="unit_mmol_l">mmol/L</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">U</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">U/h</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">t</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">v</string>
+</resources>