From 4de010b1a270868faa04069297f0b87ebcba0a7e Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Thu, 19 Oct 2017 16:03:07 +0200
Subject: [PATCH] Strings reuse for pumps.

---
 .../plugins/Overview/OverviewFragment.java    |  4 +-
 app/src/main/res/layout/danar_fragment.xml    | 14 +++---
 .../main/res/layout/danar_statsactivity.xml   |  2 +-
 .../layout/overview_newtempbasal_dialog.xml   |  2 +-
 .../main/res/layout/vitualpump_fragment.xml   |  4 +-
 app/src/main/res/values-bg/strings.xml        | 14 +++---
 app/src/main/res/values-cs/strings.xml        | 14 +++---
 app/src/main/res/values-de/strings.xml        | 14 +++---
 app/src/main/res/values-es/strings.xml        | 10 ++--
 app/src/main/res/values-it/strings.xml        | 14 +++---
 app/src/main/res/values-ko/strings.xml        | 48 ++++++++++++++++---
 app/src/main/res/values-nl/strings.xml        | 14 +++---
 app/src/main/res/values-ru/strings.xml        | 14 +++---
 app/src/main/res/values-sv/strings.xml        | 12 ++---
 app/src/main/res/values/strings.xml           | 14 +++---
 15 files changed, 114 insertions(+), 80 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index 589e887678..0328b95d2b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -1053,9 +1053,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             baseBasalView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    String fullText = MainApp.sResources.getString(R.string.virtualpump_basebasalrate_label) + ": " + DecimalFormatter.to2Decimal(MainApp.getConfigBuilder().getProfile().getBasal()) + "U/h\n";
+                    String fullText = MainApp.sResources.getString(R.string.pump_basebasalrate_label) + ": " + DecimalFormatter.to2Decimal(MainApp.getConfigBuilder().getProfile().getBasal()) + "U/h\n";
                     if (activeTemp != null) {
-                        fullText += MainApp.sResources.getString(R.string.virtualpump_tempbasal_label) + ": " + activeTemp.toStringFull();
+                        fullText += MainApp.sResources.getString(R.string.pump_tempbasal_label) + ": " + activeTemp.toStringFull();
                     }
                     OKDialog.show(getActivity(), MainApp.sResources.getString(R.string.basal), fullText, null);
                 }
diff --git a/app/src/main/res/layout/danar_fragment.xml b/app/src/main/res/layout/danar_fragment.xml
index 29c9398a04..028f065ae0 100644
--- a/app/src/main/res/layout/danar_fragment.xml
+++ b/app/src/main/res/layout/danar_fragment.xml
@@ -97,7 +97,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/danar_bluetooth_status"
+                        android:text="@string/pump_bluetooth_status"
                         android:textSize="14sp" />
 
                     <TextView
@@ -190,7 +190,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/virtualpump_lastconnection_label"
+                        android:text="@string/pump_lastconnection_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -235,7 +235,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/danar_lastbolus"
+                        android:text="@string/pump_lastbolus_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -325,7 +325,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/virtualpump_basebasalrate_label"
+                        android:text="@string/pump_basebasalrate_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -370,7 +370,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/virtualpump_tempbasal_label"
+                        android:text="@string/pump_tempbasal_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -711,7 +711,7 @@
                     android:drawableTop="@drawable/icon_danarhistory"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/danar_history" />
+                    android:text="@string/pump_history" />
 
                 <Button
                     android:id="@+id/danar_stats"
@@ -722,7 +722,7 @@
                     android:drawableTop="@drawable/icon_danarstats"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/danar_stats" />
+                    android:text="@string/pump_stats" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/danar_statsactivity.xml b/app/src/main/res/layout/danar_statsactivity.xml
index 2657edb86b..aef72532fc 100644
--- a/app/src/main/res/layout/danar_statsactivity.xml
+++ b/app/src/main/res/layout/danar_statsactivity.xml
@@ -34,7 +34,7 @@
                 android:gravity="center_horizontal"
                 android:textColor="@color/mdtp_white"
                 android:background="@drawable/pillborder"
-                android:text="@string/danar_stats" />
+                android:text="@string/pump_stats" />
 
             <TableLayout
                 android:stretchColumns="0,1,2,3,4"
diff --git a/app/src/main/res/layout/overview_newtempbasal_dialog.xml b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
index 6ecf267615..e4cf51b987 100644
--- a/app/src/main/res/layout/overview_newtempbasal_dialog.xml
+++ b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
@@ -21,7 +21,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:text="@string/virtualpump_tempbasal_label"
+                android:text="@string/pump_tempbasal_label"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/vitualpump_fragment.xml b/app/src/main/res/layout/vitualpump_fragment.xml
index cd73777ec7..81218b564b 100644
--- a/app/src/main/res/layout/vitualpump_fragment.xml
+++ b/app/src/main/res/layout/vitualpump_fragment.xml
@@ -33,7 +33,7 @@
                     android:layout_weight="1"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/virtualpump_basebasalrate_label"
+                    android:text="@string/pump_basebasalrate_label"
                     android:textSize="14sp" />
 
                 <TextView
@@ -77,7 +77,7 @@
                     android:layout_weight="1"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/virtualpump_tempbasal_label"
+                    android:text="@string/pump_tempbasal_label"
                     android:textSize="14sp" />
 
                 <TextView
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 98969b41c0..386321b55c 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -47,13 +47,13 @@
     <string name="treatments_wizard_bolusiob_label">IOB от болуси</string>
     <string name="treatments_wizard_total_label">ОБШО</string>
     <string name="openapsma_run">Старт сега</string>
-    <string name="virtualpump_basebasalrate_label">Базова базална стойност</string>
+    <string name="pump_basebasalrate_label">Базова базална стойност</string>
     <string name="virtualpump_battery_label">Батерия</string>
     <string name="virtualpump_extendedbolus_label">Удължен болус</string>
     <string name="virtualpump_reservoir_label">Резервоар</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="virtualpump_sqlerror">Грешка в базата данни</string>
-    <string name="virtualpump_tempbasal_label">Временен базал</string>
+    <string name="pump_tempbasal_label">Временен базал</string>
     <string name="vitualpump_label">ВИРТУАЛНА ПОМПА</string>
     <string name="openapsma_lastrun_label">Последно изпълнение</string>
     <string name="openapsma_inputparameters_label">Параметри на входа</string>
@@ -226,7 +226,7 @@
     <string name="connectionerror">Грешка при свързване с помпата</string>
     <string name="danar_iob_label">IOB на помпата</string>
     <string name="danar_dailyunits">Инсулин за деня</string>
-    <string name="danar_lastbolus">Последен болус:</string>
+    <string name="pump_lastbolus_label">Последен болус:</string>
     <string name="hoursago">ч по-рано</string>
     <string name="danar_invalidinput">Грешни входящи данни</string>
     <string name="danar_valuenotsetproperly">Неправилна стойност</string>
@@ -260,7 +260,7 @@
     <string name="danarprofile_dia">DIA (Време на действие на инсулина) ч.:</string>
     <string name="danarprofile_dia_summary">Време на действие на инсулина</string>
     <string name="failedupdatebasalprofile">Неуспешно обноввяване на базалния профил</string>
-    <string name="danar_history">История</string>
+    <string name="pump_history">История</string>
     <string name="danar_historyreload">Презареди</string>
     <string name="uploading">Качване</string>
     <string name="danar_ebolus">E болус</string>
@@ -401,7 +401,7 @@
     <string name="eatingsoon">Преди хранене</string>
     <string name="activity">Физ.активност</string>
     <string name="removerecord">Премахни запис:</string>
-    <string name="danar_stats">DanaR статистика</string>
+    <string name="pump_stats">DanaR статистика</string>
     <string name="danar_stats_cumulative_tdd">Комулативна TDD</string>
     <string name="danar_stats_expweight">Експоненциално претеглена TDD</string>
     <string name="danar_stats_basalrate">Базал</string>
@@ -547,8 +547,8 @@
     <string name="predictionshortlabel">PRE</string>
     <string name="basalshortlabel">BAS</string>
     <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="virtualpump_lastconnection_label">Последно свързване</string>
-    <string name="danar_bluetooth_status">Bluetooh статус</string>
+    <string name="pump_lastconnection_label">Последно свързване</string>
+    <string name="pump_bluetooth_status">Bluetooh статус</string>
     <string name="nav_about">За приложението</string>
     <string name="smscommunicator_missingsmspermission">Missing SMS permission</string>
     <string name="dev">DEV</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index beb7c370e4..67af52d3d9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -153,13 +153,13 @@
     <string name="treatmentssafety_title">Bezpečnost zadání ošetřeni</string>
     <string name="unsupportedclientver">Nepodporovaná verze NSClient</string>
     <string name="virtualpump">Virtualní pumpa</string>
-    <string name="virtualpump_basebasalrate_label">Základní hodnota bazálu</string>
+    <string name="pump_basebasalrate_label">Základní hodnota bazálu</string>
     <string name="virtualpump_battery_label">Baterie</string>
     <string name="virtualpump_extendedbolus_label">Prodloužený bolus</string>
     <string name="virtualpump_reservoir_label">Zásobník</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="virtualpump_sqlerror">Chyba databáze</string>
-    <string name="virtualpump_tempbasal_label">Dočasný bazál</string>
+    <string name="pump_tempbasal_label">Dočasný bazál</string>
     <string name="vitualpump_label">VIRTUÁLNÍ PUMPA</string>
     <string name="xdrip">xDrip</string>
     <string name="overview_extendedbolus_button">Prodloužený bolus</string>
@@ -200,7 +200,7 @@
     <string name="danar_dailyunits">Jednotek za den</string>
     <string name="danar_invalidinput">Chybná vstupní data</string>
     <string name="danar_iob_label">IOB z pumpy</string>
-    <string name="danar_lastbolus">Poslední bolus</string>
+    <string name="pump_lastbolus_label">Poslední bolus</string>
     <string name="danar_valuenotsetproperly">Hodnota nenastavena správně</string>
     <string name="danar_viewprofile">Zobrazit profil</string>
     <string name="devicenotfound">Vybrané zařízení nenalezeno</string>
@@ -213,7 +213,7 @@
     <string name="reloadprofile">Obnovit profil</string>
     <string name="save">Uložit</string>
     <string name="success">Úspěch</string>
-    <string name="virtualpump_lastconnection_label">Poslední spojení</string>
+    <string name="pump_lastconnection_label">Poslední spojení</string>
     <string name="canceltemp">Zrušit dočasný bazál</string>
     <string name="bolusdelivered" formatted="false">Bolus %.2fU aplikován úspěšně</string>
     <string name="smscommunicator_bolusfailed">Chyba při aplikování bolusu</string>
@@ -239,7 +239,7 @@
     <string name="danar_ebolus">E bolus</string>
     <string name="danar_error">chyba</string>
     <string name="danar_glucose">glykémie</string>
-    <string name="danar_history">Historie</string>
+    <string name="pump_history">Historie</string>
     <string name="danar_history_alarm">Alarmy</string>
     <string name="danar_history_basalhours">Hodinové bazály</string>
     <string name="danar_history_bolus">Bolusy</string>
@@ -402,7 +402,7 @@
     <string name="advancedsettings_title">Rozšířené nastavení</string>
     <string name="always_use_shortavg">Vždy používat krátkodobý průměrný rozdíl glykémií místo rozdílu posledních 2 hodnot</string>
     <string name="always_use_shortavg_summary">Výhodné, pokud data z xDripu obsahují velký šum</string>
-    <string name="danar_stats">Statistika z pumpy</string>
+    <string name="pump_stats">Statistika z pumpy</string>
     <string name="danar_stats_amount_days">Dní</string>
     <string name="danar_stats_cumulative_tdd">Kumulativní TDD</string>
     <string name="danar_stats_expweight">Exponenciálně vážené TDD</string>
@@ -610,7 +610,7 @@
     <string name="sensitivityweightedaverage">Sensitivita vážený průměr</string>
     <string name="openaps">OpenAPS</string>
     <string name="openaps_short">OAPS</string>
-    <string name="danar_bluetooth_status">Bluetooth status</string>
+    <string name="pump_bluetooth_status">Bluetooth status</string>
     <string name="careportal_activity_label">AKTIVITA &amp; ZPĚTNÁ VAZBA</string>
     <string name="basalmissing">Chybějící bazál v profilu. Použita výchozí hodnota</string>
     <string name="basal_step">Krok bazálu</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c01c25b549..eb5322c910 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -97,9 +97,9 @@
     <string name="vitualpump_label">VIRTUELLE PUMPE</string>
     <string name="virtualpump_sqlerror">SQL Error</string>
     <string name="virtualpump_extendedbolus_label">Extended bolus</string>
-    <string name="virtualpump_tempbasal_label">Temp basal</string>
+    <string name="pump_tempbasal_label">Temp basal</string>
     <string name="visible">Sichtbar</string>
-    <string name="virtualpump_basebasalrate_label">Basis Basalrate</string>
+    <string name="pump_basebasalrate_label">Basis Basalrate</string>
     <string name="treatments_wizard_total_label">TOTAL</string>
     <string name="unsupportedclientver">Nicht unterstützte Version von NSClient</string>
     <string name="treatments_wizard_bg_label">BZ</string>
@@ -208,8 +208,8 @@
     <string name="reloadprofile">Profil neuladen</string>
     <string name="save">Speichern</string>
     <string name="success">Erfolgreich</string>
-    <string name="virtualpump_lastconnection_label">Letzte Verbindung</string>
-    <string name="danar_lastbolus">Letzter Bolus:</string>
+    <string name="pump_lastconnection_label">Letzte Verbindung</string>
+    <string name="pump_lastbolus_label">Letzter Bolus:</string>
     <string name="danar_viewprofile">Profil anzeigen</string>
     <string name="danarprofile">DanaR Profil Einstellungen</string>
     <string name="danarprofile_dia">DIA [h]</string>
@@ -242,7 +242,7 @@
     <string name="danar_carbohydrate">Kohlenhydrate</string>
     <string name="danar_error">Fehler</string>
     <string name="danar_glucose">Glucose</string>
-    <string name="danar_history">Historie</string>
+    <string name="pump_history">Historie</string>
     <string name="danar_history_alarm">Alarme</string>
     <string name="danar_history_bolus">Bolus</string>
     <string name="danar_history_carbohydrates">Kohlenhydrate</string>
@@ -334,7 +334,7 @@
     <string name="clearlog">Logs leeren</string>
     <string name="copied_to_clipboard">In den Zwischenspeicher kopiert</string>
     <string name="copy_to_clipboard">In den Zwischenspeicher kopieren</string>
-    <string name="danar_bluetooth_status">Bluetooth-Status</string>
+    <string name="pump_bluetooth_status">Bluetooth-Status</string>
     <string name="danar_stats_cumulative_tdd">Kumulative TDD</string>
     <string name="danar_stats_date">Datum</string>
     <string name="danar_stats_expweight">Exponentiell Gewichtete TDD</string>
@@ -404,7 +404,7 @@
     <string name="cpp_sync_setting_missing">Aktivierung wird benötigt um Werte an die Pumpe zu senden!</string>
     <string name="cpp_valuesnotstored">Werte nicht gespeichert!</string>
     <string name="danar_enableextendedbolus">Aktiviere Extended Bolus in der Pumpe</string>
-    <string name="danar_stats">DanaR Stats</string>
+    <string name="pump_stats">DanaR Stats</string>
     <string name="danar_stats_amount_days"># Tage</string>
     <string name="danar_stats_basalrate">Basal</string>
     <string name="danar_stats_bolus">Bolus</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 71e911402b..c6abd9d330 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -46,8 +46,8 @@
     <string name="treatments_wizard_total_label">TOTAL</string>
     <string name="openapsma_run">Ejecutar ahora</string>
     <string name="vitualpump_label">BOMBA VIRTUAL</string>
-    <string name="virtualpump_basebasalrate_label">Dosis Basal Base</string>
-    <string name="virtualpump_tempbasal_label">Basal Temporal</string>
+    <string name="pump_basebasalrate_label">Dosis Basal Base</string>
+    <string name="pump_tempbasal_label">Basal Temporal</string>
     <string name="virtualpump_extendedbolus_label">Bolo extendido</string>
     <string name="virtualpump_battery_label">Batería</string>
     <string name="virtualpump_reservoir_label">Depósito:</string>
@@ -211,10 +211,10 @@
     <string name="nobtadapter">No se encuentra adaptador Bluetooth</string>
     <string name="devicenotfound">El dispositivo seleccionado no se encuentra</string>
     <string name="connectionerror">Error de conexión de la bomba</string>
-    <string name="virtualpump_lastconnection_label">Última conexión</string>
+    <string name="pump_lastconnection_label">Última conexión</string>
     <string name="danar_iob_label">Bomba IOB</string>
     <string name="danar_dailyunits">Unidades diarias</string>
-    <string name="danar_lastbolus">Último bolo:</string>
+    <string name="pump_lastbolus_label">Último bolo:</string>
     <string name="hoursago">h antes</string>
     <string name="danar_invalidinput">Datos invalidos</string>
     <string name="danar_valuenotsetproperly">Valor no establecido correctamente</string>
@@ -243,7 +243,7 @@
     <string name="danarprofile">Configuración perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="failedupdatebasalprofile">No se pudo actualizar el perfil basal</string>
-    <string name="danar_history">Historial</string>
+    <string name="pump_history">Historial</string>
     <string name="danar_historyreload">Recargar</string>
     <string name="uploading">Subiendo</string>
     <string name="danar_ebolus">E bolo</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e4ed325e18..85b31608df 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -91,7 +91,7 @@
     <string name="constraints_violation">Vincolo Violato</string>
     <string name="danar_alarm">Allarme</string>
     <string name="danar_basalhour">Basale Oraria</string>
-    <string name="danar_bluetooth_status">Stato Bluetooh</string>
+    <string name="pump_bluetooth_status">Stato Bluetooh</string>
     <string name="danar_bt_name_title">Dispositivo Bluetooh DanaR</string>
     <string name="danar_carbohydrate">Carboidrati</string>
     <string name="danar_dailyunits">Unita\' giornaliera</string>
@@ -101,7 +101,7 @@
     <string name="danar_enableextendedbolus">Bolo esteso abilitato</string>
     <string name="danar_error">Errore</string>
     <string name="danar_glucose">Glucosio</string>
-    <string name="danar_history">Storia</string>
+    <string name="pump_history">Storia</string>
     <string name="danar_history_alarm">Allarmi</string>
     <string name="danar_history_basalhours">Basale oraria</string>
     <string name="danar_history_bolus">Boli</string>
@@ -115,12 +115,12 @@
     <string name="danar_historyreload">Ricaricare</string>
     <string name="danar_invalidinput">Data Errata</string>
     <string name="danar_iob_label">IOB Microinfusore</string>
-    <string name="danar_lastbolus">Ultimo Bolo</string>
+    <string name="pump_lastbolus_label">Ultimo Bolo</string>
     <string name="danar_password_title">Password Microinfusore</string>
     <string name="danar_pump_settings">Setting Micro</string>
     <string name="danar_refill">ricarica</string>
     <string name="danar_sbolus">Bolo S</string>
-    <string name="danar_stats">Stato DanaR</string>
+    <string name="pump_stats">Stato DanaR</string>
     <string name="danar_stats_amount_days"># Days</string>
     <string name="danar_stats_basalrate">Basale</string>
     <string name="danar_stats_bolus">Bolo</string>
@@ -413,7 +413,7 @@
     <string name="objectives_6_objective">Abilitazione di funzioni aggiuntive per l\'uso quotidiano, ad esempio assistenza avanzata del pasto</string>
     <string name="objectives_manualenacts"></string>
     <string name="virtualpump_sqlerror">Errore SQL</string>
-    <string name="virtualpump_tempbasal_label">Basale temporale</string>
+    <string name="pump_tempbasal_label">Basale temporale</string>
     <string name="visible">Visibile</string>
     <string name="vitualpump_label">Pompa Virtuale</string>
     <string name="waitingforpump">In attesa del micro</string>
@@ -440,11 +440,11 @@
     <string name="virtualpump_settings">Impostazioni del Micro virtuale</string>
     <string name="virtualpump_resultok">ok</string>
     <string name="virtualpump_reservoir_label">Serbatoio</string>
-    <string name="virtualpump_lastconnection_label">Ultima conessione</string>
+    <string name="pump_lastconnection_label">Ultima conessione</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="virtualpump_extendedbolus_label">Bolo Esteso</string>
     <string name="virtualpump_battery_label">Batteria</string>
-    <string name="virtualpump_basebasalrate_label">Base basale</string>
+    <string name="pump_basebasalrate_label">Base basale</string>
     <string name="virtualpump">Micro Virtuale</string>
     <string name="uploading">UpLoading</string>
     <string name="updatingbasalrates">Aggiornamento basale</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a591ac5c27..7e83fd9946 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -48,8 +48,8 @@
     <string name="treatments_wizard_total_label">총</string>
     <string name="openapsma_run">지금 실행</string>
     <string name="vitualpump_label">가상 펌프</string>
-    <string name="virtualpump_basebasalrate_label">기본 기초주입량</string>
-    <string name="virtualpump_tempbasal_label">임시기초주입</string>
+    <string name="pump_basebasalrate_label">기본 기초주입량</string>
+    <string name="pump_tempbasal_label">임시기초주입</string>
     <string name="virtualpump_extendedbolus_label">확장식사주입</string>
     <string name="virtualpump_battery_label">배터리</string>
     <string name="virtualpump_reservoir_label">인슐린 잔량</string>
@@ -225,7 +225,7 @@
     <string name="connectionerror">펌프 연결 에러</string>
     <string name="danar_iob_label">펌프 IOB</string>
     <string name="danar_dailyunits">일 인슐린 총량</string>
-    <string name="danar_lastbolus">최근 식사주입:</string>
+    <string name="pump_lastbolus_label">최근 식사주입:</string>
     <string name="hoursago">시간 전</string>
     <string name="danar_invalidinput">사용할수 없는 입력 데이터</string>
     <string name="danar_valuenotsetproperly">값이 제대로 설정되지 않았습니다</string>
@@ -259,7 +259,7 @@
     <string name="danarprofile_dia">인슐린활동시간(DIA) [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
     <string name="failedupdatebasalprofile">기초주입 프로파일 갱신 실패</string>
-    <string name="danar_history">과거기록</string>
+    <string name="pump_history">과거기록</string>
     <string name="danar_historyreload">새로고침</string>
     <string name="uploading">업로드중</string>
     <string name="danar_ebolus">E bolus</string>
@@ -401,7 +401,7 @@
     <string name="eatingsoon">Eating Soon</string>
     <string name="activity">Activity</string>
     <string name="removerecord">Remove record:</string>
-    <string name="danar_stats">DanaR 통계</string>
+    <string name="pump_stats">DanaR 통계</string>
     <string name="danar_stats_cumulative_tdd">누적 일총량</string>
     <string name="danar_stats_expweight">지수가중 일총량</string>
     <string name="danar_stats_basalrate">기초주입</string>
@@ -555,8 +555,8 @@
     <string name="predictionshortlabel">PRE</string>
     <string name="basalshortlabel">BAS</string>
     <string name="virtualpump_firmware_label">펌웨어</string>
-    <string name="virtualpump_lastconnection_label">최근 연결</string>
-    <string name="danar_bluetooth_status">블루투스 상태</string>
+    <string name="pump_lastconnection_label">최근 연결</string>
+    <string name="pump_bluetooth_status">블루투스 상태</string>
     <string name="nav_about">About</string>
     <string name="smscommunicator_missingsmspermission">SMS 권한 누락</string>
     <string name="dev">DEV</string>
@@ -648,5 +648,39 @@
     <string name="activate_profile">ACTIVATE PROFILE</string>
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>
+
+    <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>
+    <string name="remaininsulinalert">남은 인슐린 양</string>
+    <string name="danarspump">다나RS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="selectedpump">선택된 펌프</string>
+    <string name="pairpump">새 펌프와 연동</string>
+    <string name="bolusspeed">식사주입 속도</string>
+    <string name="danar_setbasalstep001">기초주입 단위를 0.01 U/h로 설정하세요</string>
+    <string name="serialnumber">시리얼번호</string>
+    <string name="careportal_newnstreatment_percentage_label">퍼센트</string>
+    <string name="careportal_newnstreatment_timeshift_label">시간 이동</string>
+    <string name="default_temptargets">임시목표 기본값</string>
+    <string name="eatingsoon_duration">eatingsoon 기간</string>
+    <string name="eatingsoon_target">eatingsoon 목표</string>
+    <string name="activity_duration">activity 기간</string>
+    <string name="activity_target">activity 목표</string>
+    <string name="danar_history_prime">교체</string>
+    <string name="gettingextendedbolusstatus">확장식사주입 상태 가져오는중</string>
+    <string name="gettingbolusstatus">식사주입상태 가져오는중</string>
+    <string name="gettingtempbasalstatus">임시기초주입상태 가져오는중</string>
+    <string name="gettingpumpsettings">펌프설정 가져오는중</string>
+    <string name="gettingpumptime">펌프시간 가져오는중</string>
+    <string name="reuse">재사용</string>
+    <string name="wearcontrol_title">워치로 작동하기</string>
+    <string name="wearcontrol_summary">임시목표와 관리입력을 워치로 설정합니다.</string>
+    <string name="connectiontimedout">연결시간초과</string>
+
     <string name="app_name">AndroidAPS</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index eb6b45b33a..b7988b10a1 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -41,13 +41,13 @@
     <string name="vitualpump_label">VIRTUELE POMP</string>
     <string name="visible">Toon</string>
     <string name="virtualpump_uploadstatus_title">Upload status naar NS</string>
-    <string name="virtualpump_tempbasal_label">Tijdelijk basaal</string>
+    <string name="pump_tempbasal_label">Tijdelijk basaal</string>
     <string name="virtualpump_sqlerror">SQL Storing</string>
     <string name="virtualpump_shortname">VP</string>
     <string name="virtualpump_settings">Virtuele pomp instellingen</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="virtualpump_reservoir_label">Reservoir</string>
-    <string name="virtualpump_lastconnection_label">Laatste verbinding</string>
+    <string name="pump_lastconnection_label">Laatste verbinding</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="virtualpump_extendedbolus_label_short">EXT</string>
     <string name="virtualpump_extendedbolus_label">Vertraagde bolus</string>
@@ -168,7 +168,7 @@
     <string name="cs_lang">Čeština</string>
     <string name="danar_alarm">Alarm</string>
     <string name="danar_basalhour">Basaal uur</string>
-    <string name="danar_bluetooth_status">Bluetooh status</string>
+    <string name="pump_bluetooth_status">Bluetooh status</string>
     <string name="danar_bt_name_title">DanaR Bluetooth toestel</string>
     <string name="danar_carbohydrate">Koolhydraten</string>
     <string name="danar_dailyunits">Dag totaal</string>
@@ -176,7 +176,7 @@
     <string name="danar_enableextendedbolus">Activeer vertraagde bolussen op de pomp</string>
     <string name="danar_error">Storing</string>
     <string name="danar_glucose">glucose</string>
-    <string name="danar_history">Geschiedenis</string>
+    <string name="pump_history">Geschiedenis</string>
     <string name="danar_history_alarm">Alarm</string>
     <string name="restart">Herstart</string>
     <string name="result">Resultaat</string>
@@ -276,7 +276,7 @@
     <string name="openaps">OpenAPS</string>
     <string name="openaps_short">OAPS</string>
     <string name="openapsama">OpenAPS AMA</string>
-    <string name="danar_lastbolus">Laatste bolus</string>
+    <string name="pump_lastbolus_label">Laatste bolus</string>
     <string name="danar_password_title">Pomp wachtwoord</string>
     <string name="danar_pump_settings">DanaR pomp instellingen</string>
     <string name="danar_refill">Hervullen</string>
@@ -455,7 +455,7 @@
     <string name="openapsma_maxiob_title">Maximaal basaal IOB OpenAPS kan toedienen [E]</string>
     <string name="openapsma_profile_label">Profiel</string>
     <string name="openapsma_valueoutofrange">Waarde %s is buiten de toegestane limieten</string>
-    <string name="virtualpump_basebasalrate_label">Basis basale dosis</string>
+    <string name="pump_basebasalrate_label">Basis basale dosis</string>
     <string name="openapsma_lastrun_label">Laatse berekening</string>
     <string name="openapsma_lastenact_label">Laatste uitvoering</string>
     <string name="openapsma_glucosestatus_label">Glucose gegevens</string>
@@ -527,7 +527,7 @@
     <string name="carbsconstraintapplied">KH limiet ingesteld</string>
     <string name="circadian_percentage_profile">CircadianPercentageProfiel</string>
     <string name="danar_sbolus">S Bolus</string>
-    <string name="danar_stats">DanaR Statistiek</string>
+    <string name="pump_stats">DanaR Statistiek</string>
     <string name="danar_stats_cumulative_tdd">Cumulative TDD</string>
     <string name="danar_stats_expweight">Exponentieel verhoogt TDD</string>
     <string name="danar_stats_ratio">Ratio</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1492740232..e1e5447b81 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -111,7 +111,7 @@
     <string name="cs_lang">чешский</string>
     <string name="danar_alarm">внимание!</string>
     <string name="danar_basalhour">почасовой базал</string>
-    <string name="danar_bluetooth_status">статус блутус</string>
+    <string name="pump_bluetooth_status">статус блутус</string>
     <string name="danar_bt_name_title">устройство блутус danaR</string>
     <string name="danar_carbohydrate">углеводы</string>
     <string name="danar_dailyunits">суточные единицы</string>
@@ -122,7 +122,7 @@
     <string name="danar_enableextendedbolus">активировать увеличенные болюсы на помпе</string>
     <string name="danar_error">ошибка</string>
     <string name="danar_glucose">гликемия</string>
-    <string name="danar_history">история</string>
+    <string name="pump_history">история</string>
     <string name="danar_history_alarm">оповещения об опасности</string>
     <string name="danar_history_basalhours">почасовые базалы</string>
     <string name="danar_history_bolus">болюсы</string>
@@ -136,13 +136,13 @@
     <string name="danar_historyreload">замена</string>
     <string name="danar_invalidinput">введенные данные неверны</string>
     <string name="danar_iob_label">активный инсулин на помпе</string>
-    <string name="danar_lastbolus">предыдущий болюс</string>
+    <string name="pump_lastbolus_label">предыдущий болюс</string>
     <string name="danar_model" formatted="false">модель: %02X протокол: %02X код: %02X</string>
     <string name="danar_password_title">пароль помпы</string>
     <string name="danar_pump_settings">настройки помпы DanaR</string>
     <string name="danar_refill">дозаправка</string>
     <string name="danar_sbolus">болюс S</string>
-    <string name="danar_stats">статистика DanaR</string>
+    <string name="pump_stats">статистика DanaR</string>
     <string name="danar_stats_amount_days">количество дней</string>
     <string name="danar_stats_basalrate">базал</string>
     <string name="danar_stats_bolus">болюс</string>
@@ -528,17 +528,17 @@
     <string name="updatingbasalrates">обновление значений базала</string>
     <string name="uploading">передача данных</string>
     <string name="virtualpump">виртуальная помпа</string>
-    <string name="virtualpump_basebasalrate_label">базовая величина базала</string>
+    <string name="pump_basebasalrate_label">базовая величина базала</string>
     <string name="virtualpump_battery_label">батарея</string>
     <string name="virtualpump_extendedbolus_label">продленный болюс</string>
     <string name="virtualpump_firmware_label">прошивка</string>
-    <string name="virtualpump_lastconnection_label">прошлое соединение</string>
+    <string name="pump_lastconnection_label">прошлое соединение</string>
     <string name="virtualpump_reservoir_label">резервуар</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="virtualpump_settings">настройки вирт помпы</string>
     <string name="virtualpump_shortname">ВиртПомпа</string>
     <string name="virtualpump_sqlerror">ошибка SQL</string>
-    <string name="virtualpump_tempbasal_label">врем базал</string>
+    <string name="pump_tempbasal_label">врем базал</string>
     <string name="virtualpump_uploadstatus_title">статус передачи данных в NS</string>
     <string name="visible">виден</string>
     <string name="vitualpump_label">ВИРТУАЛЬНАЯ ПОМПА</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 03ac2aee36..cac70caf70 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -112,7 +112,7 @@
     <string name="cs_lang">CZ</string>
     <string name="danar_alarm">Alarm</string>
     <string name="danar_basalhour">basal tim</string>
-    <string name="danar_bluetooth_status">Bluetooth Status</string>
+    <string name="pump_bluetooth_status">Bluetooth Status</string>
     <string name="danar_bt_name_title">DanaR Bluetooth Pump</string>
     <string name="danar_carbohydrate">kolhydrat</string>
     <string name="danar_dailyunits">Enheter/Dag</string>
@@ -120,7 +120,7 @@
     <string name="danar_enableextendedbolus">Aktivera förlängd bolus i pump</string>
     <string name="danar_error">Fel</string>
     <string name="danar_glucose">Glukos</string>
-    <string name="danar_history">Historia</string>
+    <string name="pump_history">Historia</string>
     <string name="danar_history_alarm">Larm</string>
     <string name="danar_history_basalhours">Basal Timmar</string>
     <string name="danar_history_bolus">Bolusar</string>
@@ -134,7 +134,7 @@
     <string name="danar_historyreload">Ladda om</string>
     <string name="danar_invalidinput">Fel på inlagd data</string>
     <string name="danar_iob_label">Pump IOB</string>
-    <string name="danar_lastbolus">Sista bolus</string>
+    <string name="pump_lastbolus_label">Sista bolus</string>
     <string name="danar_password_title">Lösenord Pump</string>
     <string name="danar_pump_settings">DanaR pump inställningar</string>
     <string name="danar_refill">Påfyllnad</string>
@@ -308,17 +308,17 @@
     <string name="vitualpump_label">Virtuell</string>
     <string name="visible">Synlig</string>
     <string name="virtualpump_uploadstatus_title">Ladda upp till NS</string>
-    <string name="virtualpump_tempbasal_label">Temp basal</string>
+    <string name="pump_tempbasal_label">Temp basal</string>
     <string name="virtualpump_sqlerror">SQL Error</string>
     <string name="virtualpump_shortname">VPUMP</string>
     <string name="virtualpump_settings">Virtuell pump inställningar</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="virtualpump_reservoir_label">Reservoir</string>
-    <string name="virtualpump_lastconnection_label">Sista kontakt</string>
+    <string name="pump_lastconnection_label">Sista kontakt</string>
     <string name="virtualpump_firmware_label">Programversion</string>
     <string name="virtualpump_extendedbolus_label">Förlängd bolus</string>
     <string name="virtualpump_battery_label">Batteri</string>
-    <string name="virtualpump_basebasalrate_label">Grund basal hastighet</string>
+    <string name="pump_basebasalrate_label">Grund basal hastighet</string>
     <string name="virtualpump">Virtuell Pump</string>
     <string name="uploading">Uppladdning</string>
     <string name="updatingbasalrates">Uppdaterar basal hastigheter</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ab19fdc4d..9e0cbbdf10 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,8 +50,8 @@
     <string name="treatments_wizard_total_label">TOTAL</string>
     <string name="openapsma_run">Run now</string>
     <string name="vitualpump_label">VIRTUAL PUMP</string>
-    <string name="virtualpump_basebasalrate_label">Base basal rate</string>
-    <string name="virtualpump_tempbasal_label">Temp basal</string>
+    <string name="pump_basebasalrate_label">Base basal rate</string>
+    <string name="pump_tempbasal_label">Temp basal</string>
     <string name="virtualpump_extendedbolus_label">Extended bolus</string>
     <string name="virtualpump_battery_label">Battery</string>
     <string name="virtualpump_reservoir_label">Reservoir</string>
@@ -235,7 +235,7 @@
     <string name="connectionerror">Pump connection error</string>
     <string name="danar_iob_label">Pump IOB</string>
     <string name="danar_dailyunits">Daily units</string>
-    <string name="danar_lastbolus">Last bolus:</string>
+    <string name="pump_lastbolus_label">Last bolus</string>
     <string name="hoursago">h ago</string>
     <string name="danar_invalidinput">Invalid input data</string>
     <string name="danar_valuenotsetproperly">Value not set properly</string>
@@ -269,7 +269,7 @@
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
     <string name="failedupdatebasalprofile">Failed to update basal profile</string>
-    <string name="danar_history">History</string>
+    <string name="pump_history">History</string>
     <string name="danar_historyreload">Reload</string>
     <string name="uploading">Uploading</string>
     <string name="danar_ebolus">E bolus</string>
@@ -412,7 +412,7 @@
     <string name="eatingsoon">Eating Soon</string>
     <string name="activity">Activity</string>
     <string name="removerecord">Remove record:</string>
-    <string name="danar_stats">DanaR Stats</string>
+    <string name="pump_stats">Stats</string>
     <string name="danar_stats_cumulative_tdd">Cumulative TDD</string>
     <string name="danar_stats_expweight">Exponentially Weighted TDD</string>
     <string name="danar_stats_basalrate">Basal</string>
@@ -592,8 +592,8 @@
     <string name="predictionshortlabel">PRE</string>
     <string name="basalshortlabel">BAS</string>
     <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="virtualpump_lastconnection_label">Last connection</string>
-    <string name="danar_bluetooth_status">Bluetooh status</string>
+    <string name="pump_lastconnection_label">Last connection</string>
+    <string name="pump_bluetooth_status">Bluetooh status</string>
     <string name="nav_about">About</string>
     <string name="smscommunicator_missingsmspermission">Missing SMS permission</string>
     <string name="dev">DEV</string>