caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fix dutch translation for Combo's last bolus, minor cleanup.

Browse source 
(cherry picked from commit c0cf06a)
This commit is contained in:
Johannes Mockenhaupt 2018-02-07 22:50:58 +01:00
parent 46ea4be4eb
commit 483ecadede
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
4 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/utils/DateUtil.java
View file

@ -124,12 +124,12 @@ public class DateUtil {
public static String minAgo(long time) { public static String minAgo(long time) {
int mins = (int) ((System.currentTimeMillis() - time) / 1000 / 60); int mins = (int) ((System.currentTimeMillis() - time) / 1000 / 60);
return String.format(MainApp.sResources.getString(R.string.minago), mins); return MainApp.gs(R.string.minago, mins);
} }
public static String hourAgo(long time) { public static String hourAgo(long time) {
double hours = (System.currentTimeMillis() - time) / 1000d / 60 / 60; double hours = (System.currentTimeMillis() - time) / 1000d / 60 / 60;
return String.format(MainApp.sResources.getString(R.string.hoursago), hours); return MainApp.gs(R.string.hoursago, hours);
} }
private static LongSparseArray<String> timeStrings = new LongSparseArray<>(); private static LongSparseArray<String> timeStrings = new LongSparseArray<>();

1
app/src/main/res/values-de/strings.xml
View file

@ -722,7 +722,6 @@
<string name="combo_pump_action_bolusing">Bolus (%.1f IE) wird abgegeben</string> <string name="combo_pump_action_bolusing">Bolus (%.1f IE) wird abgegeben</string>
<string name="alert_dialog_storage_permission_text">Bitte starte dein Telefon neu oder starte AndroidAPS in den System-Einstellungen neu. Andernfalls wird AndroidAPS nicht protokolliert (wichtig zum Nachverfolgen und Verifizieren, dass der Algorithmus korrekt funktioniert)</string> <string name="alert_dialog_storage_permission_text">Bitte starte dein Telefon neu oder starte AndroidAPS in den System-Einstellungen neu. Andernfalls wird AndroidAPS nicht protokolliert (wichtig zum Nachverfolgen und Verifizieren, dass der Algorithmus korrekt funktioniert)</string>
<string name="pump_tempbasal_label">TBR</string> <string name="pump_tempbasal_label">TBR</string>
<string name="combo_last_bolus">%.1f %s (%s)</string>
<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="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_activity_reading_pump_history">Historie wird gelesen</string> <string name="combo_activity_reading_pump_history">Historie wird gelesen</string>
<string name="combo_activity_setting_basal_profile">Basalratenprofil wird aktualisiert</string> <string name="combo_activity_setting_basal_profile">Basalratenprofil wird aktualisiert</string>

1
app/src/main/res/values-es/strings.xml
View file

@ -750,7 +750,6 @@
<string name="combo_pump_activity_label">Actividad</string> <string name="combo_pump_activity_label">Actividad</string>
<string name="combo_no_pump_connection" formatted="false">Ninguna coneccnion por %d min</string> <string name="combo_no_pump_connection" formatted="false">Ninguna coneccnion por %d min</string>
<string name="combo_tbr_remaining" formatted="false">%d%% (%d min restan)</string> <string name="combo_tbr_remaining" formatted="false">%d%% (%d min restan)</string>
<string name="combo_last_bolus" formatted="false">%.1f U (%s, %s)</string>
<string name="combo_pump_action_initializing">Iniciando</string> <string name="combo_pump_action_initializing">Iniciando</string>
<string name="combo_pump_state_disconnected">Desconectado</string> <string name="combo_pump_state_disconnected">Desconectado</string>
<string name="combo_pump_state_suspended_due_to_error">Apagado por error</string> <string name="combo_pump_state_suspended_due_to_error">Apagado por error</string>

1
app/src/main/res/values-nl/strings.xml
View file

@ -738,7 +738,6 @@
<string name="combo_pump_state_label">Status</string> <string name="combo_pump_state_label">Status</string>
<string name="combo_no_pump_connection">Geen verbinding gedurende %d minuten</string> <string name="combo_no_pump_connection">Geen verbinding gedurende %d minuten</string>
<string name="combo_tbr_remaining">%d%% (%d min resterend)</string> <string name="combo_tbr_remaining">%d%% (%d min resterend)</string>
<string name="combo_last_bolus">%.1f E (%s, %s)</string>
<string name="combo_pump_state_initializing">Initialiseren</string> <string name="combo_pump_state_initializing">Initialiseren</string>
<string name="combo_pump_state_disconnected">Verbinding verbroken</string> <string name="combo_pump_state_disconnected">Verbinding verbroken</string>
<string name="combo_error_bolus_recovery_progress">Herstel van verbroken verbindng</string> <string name="combo_error_bolus_recovery_progress">Herstel van verbroken verbindng</string>