From 468c4eb56599266775d154bd04291dc14e409e33 Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Fri, 13 Dec 2019 23:45:59 +0100
Subject: [PATCH 1/3] Transifex pt nl

---
 common/src/main/res/values-nl-rNL/strings.xml | 33 ++++++++-----------
 common/src/main/res/values-pt-rBR/strings.xml | 20 +----------
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/common/src/main/res/values-nl-rNL/strings.xml b/common/src/main/res/values-nl-rNL/strings.xml
index 81345777b..a3d7e4e5e 100644
--- a/common/src/main/res/values-nl-rNL/strings.xml
+++ b/common/src/main/res/values-nl-rNL/strings.xml
@@ -120,7 +120,7 @@
   <string name="Configure_accounts">Accounts bewerken</string>
   <string name="Refresh">Veversen</string>
   <string name="Age">Leeftijd</string>
-  <string name="Synchronizing">Bezig met synchroniseren:</string>
+  <string name="Synchronizing">Bezig met synchroniseren</string>
   <string name="synchronizing_feed">bezig met synchroniseren van feed…</string>
   <string name="OK">Oké</string>
   <string name="accounts_category_connected">Verbindingen beheren</string>
@@ -169,12 +169,9 @@
   <string name="Downloadeditremove_workouts">Trainingen downloaden/bewerken/verwijderen</string>
   <string name="Note_you_need_to_connect_to_the_account_too">Je moet een RunnerUp Live-account koppelen</string>
   <string name="Use_your_headset_to_startpauseresume_RunnerUp">Gebruik je headset om RunnerUp te starten/pauzeren/hervatten</string>
-  <string name="Convert_reststep_with_type_distance_to_recoverystep_for_Intervaltab">Omzetten rust-stap met type afstand tot herstel-stap voor Interval-tabblad</string>
-  <string name="Convert_reststep_with_type_distance_to_recoverystep_for_Advancedtab">Omzetten rust-stap met type afstand tot herstel-stap voor Geavanceerde-tabblad</string>
   <string name="Export_database_to_sdcard_eg_for_upgrade">Databank exporteren naar externe opslag</string>
   <string name="Import_database_from_sdcard_eg_after_upgrade">Databank importeren uit externe opslag</string>
   <string name="Coach_to_help_you_reach_target_if_having_set_target">Coach om je te helpen je doel te bereiken (indien ingesteld)</string>
-  <string name="Keep_silent_when_workout_startpauseresumestop">Stil blijven wanneer de training start/pauzeert/hervat/stopt</string>
   <string name="Test_audio_cue">Auditief signaal testen</string>
   <string name="Accounts">Accounts</string>
   <string name="Audio_cues">Auditieve signalen</string>
@@ -185,7 +182,6 @@
   <string name="Autopause">Automatisch pauzeren</string>
   <string name="Enable_RunnerUpLive">RunnerUp Live inschakelen</string>
   <string name="Headset_key_startstop">Headset-toets start/stop</string>
-  <string name="Activity_countdown">Aftellen naar activiteit</string>
   <string name="Countdown_time_s">Afteltijd (s)</string>
   <string name="Unit_preference">Eenheidsvoorkeur</string>
   <string name="Auto_start_GPS">GPS automatisch starten</string>
@@ -194,12 +190,9 @@
   <string name="RunnerUp_live_address">RunnerUp Live-adres</string>
   <string name="Autopause_after_s">Automatisch pauzeren na (s)</string>
   <string name="Autopause_min_pace_minkm">Automatische pauze min tempo na (min/km)</string>
-  <string name="Convert_rest_on_Interval_tab">Omzetten rust op Interval tabblad</string>
-  <string name="Convert_rest_on_Advanced_tab">Omzetten rust op Geavanceerde tabblad</string>
-  <string name="Target_pace_moving_average_seconds">Doeltempo voortschrijdend gemiddelde in seconden</string>
-  <string name="Target_pace_grace_seconds">Doeltempo sierlijkheid in seconden</string>
-  <string name="Autolap_during_intervals">Automatische rondetijd tijdens intervallen</string>
-  <string name="Add_countdown_after_step_that_ends_with_user_press">Aftelling toevoegen na stappen die stopt na een druk van de gebruiker</string>
+  <string name="Convert_rest_on_Interval_tab">Intervalruststappen</string>
+  <string name="Autolap_during_intervals">Automatische ronde in trainingen</string>
+  <string name="Add_countdown_after_step_that_ends_with_user_press">Aftellen na indrukken toets</string>
   <string name="Step_countdown_time_s">Aftellen tot staptijd (s)</string>
   <string name="Smooth_pace_graph">Gladde tempo grafiek</string>
   <string name="Smooth_pace_filters">Gladde tempo filter(s)</string>
@@ -213,11 +206,13 @@
   <string name="Mock_HRM_devices">Nep-HRM-apparaten</string>
   <string name="About_RunnerUp">Over RunnerUp</string>
   <string name="Triggers">Triggers</string>
-  <string name="Time_triggered_audio_cue">Tijd getriggerde auditieve signaal</string>
+  <string name="Time_triggered_audio_cue">Tijdtrigger</string>
+  <string name="Time_triggered_audio_cue_summary">Periodieke feedback</string>
   <string name="Cue_interval_s">Signaal interval (s)</string>
-  <string name="Distance_triggered_audio_cue">Aftstand getriggerde auditieve signaal</string>
+  <string name="Distance_triggered_audio_cue">Afstandstrigger</string>
+  <string name="Distance_triggered_audio_cue_summary">Periodieke feedback</string>
   <string name="Cue_intervall_m">Signaalinterval (m)</string>
-  <string name="End_of_lap_audio_cue">Einde ronde auditieve signaal</string>
+  <string name="End_of_lap_audio_cue">Einde van ronde</string>
   <string name="Mute_music_during_audio_cues">Muziek dempen tijdens auditieve signalen</string>
   <string name="Cue_information">Signaalinformatie</string>
   <string name="Total_distance">Totale afstand</string>
@@ -283,15 +278,15 @@
   <string name="Include_map_in_post">Kaart ook meenemen</string>
   <string name="Clear_uploads_from_phone">Uploads verwijderen (van de telefoon)</string>
   <string name="my_phone">Mijn telefoon</string>
-  <string name="Failed_to_import">Importeren mislukt:</string>
-  <string name="Import_workout">Training importeren:</string>
-  <string name="Saving_as">Bezig met opslaan als</string>
+  <string name="Failed_to_import">Importeren is mislukt</string>
+  <string name="Import_workout">Importeer workout</string>
+  <string name="Saving_as">Sla op als</string>
   <string name="Overwrite_existing">Bestaande overschrijven</string>
   <string name="Create_new_workout">Nieuwe training creëren</string>
   <string name="Set_workout_name">Naam van training</string>
   <string name="Downloading_1s_will_overwrite_2_workout_with_same_name">Door %1$s te downloaden wordt %2$s overschreven met dezelfde naam</string>
-  <string name="Delete_workout">Training verwijderen</string>
-  <string name="RunnerUp_workout">RunnerUp-training:</string>
+  <string name="Delete_workout">Verwijder workout</string>
+  <string name="RunnerUp_workout">RunnerUp-workout</string>
   <string name="HinHere_is_a_workout_I_think_you_might_like">Halllo\nHier is een training die je waarschijnlijk leuk zult vinden.</string>
   <string name="Share_workout">Training delen…</string>
   <string name="New_audio_scheme">Nieuw audioschema</string>
diff --git a/common/src/main/res/values-pt-rBR/strings.xml b/common/src/main/res/values-pt-rBR/strings.xml
index 8ca729266..4218c1d85 100644
--- a/common/src/main/res/values-pt-rBR/strings.xml
+++ b/common/src/main/res/values-pt-rBR/strings.xml
@@ -120,7 +120,7 @@
   <string name="Configure_accounts">Configurar contas</string>
   <string name="Refresh">Atualizar</string>
   <string name="Age">Idade</string>
-  <string name="Synchronizing">Sincronismo:</string>
+  <string name="Synchronizing">Sincronizando</string>
   <string name="synchronizing_feed">sincronizando feed..</string>
   <string name="OK">OK</string>
   <string name="accounts_category_connected">Gerenciar conexões</string>
@@ -169,12 +169,9 @@
   <string name="Downloadeditremove_workouts">Baixar/editar/remover exercícios</string>
   <string name="Note_you_need_to_connect_to_the_account_too">Anotações, você precisa se conectar à conta também</string>
   <string name="Use_your_headset_to_startpauseresume_RunnerUp">Usar o seu headset para iniciar/pausar/recomeçar o RunnerUp</string>
-  <string name="Convert_reststep_with_type_distance_to_recoverystep_for_Intervaltab">Converter passada de descanso com tipo de distância para passada de recuperação, na aba Intervalo</string>
-  <string name="Convert_reststep_with_type_distance_to_recoverystep_for_Advancedtab">Converter passada de descanso com tipo de distância para passada de recuperação, na aba Avançado</string>
   <string name="Export_database_to_sdcard_eg_for_upgrade">Exporta banco de dados para o cartão SD (por exemplo, para atualização)</string>
   <string name="Import_database_from_sdcard_eg_after_upgrade">Importar banco de dados do cartão SD (por exemplo, após atualização)</string>
   <string name="Coach_to_help_you_reach_target_if_having_set_target">Treinador para ajudá-lo a atingir a meta (caso tenha definido a meta)</string>
-  <string name="Keep_silent_when_workout_startpauseresumestop">Manter em silêncio quando o exercício iniciar/pausar/recomeçar/parar</string>
   <string name="Test_audio_cue">Testar aviso de áudio</string>
   <string name="Accounts">Contas</string>
   <string name="Audio_cues">Avisos de áudio</string>
@@ -185,7 +182,6 @@
   <string name="Autopause">Pausa automática</string>
   <string name="Enable_RunnerUpLive">Ativar Live</string>
   <string name="Headset_key_startstop">Chave do headset inicia/para</string>
-  <string name="Activity_countdown">Contagem regressiva de atividade</string>
   <string name="Countdown_time_s">Tempo da contagem regressiva (s)</string>
   <string name="Unit_preference">Preferência de unidade</string>
   <string name="Auto_start_GPS">Início automático do gps</string>
@@ -194,12 +190,6 @@
   <string name="RunnerUp_live_address">Endereço do RunnerUp live</string>
   <string name="Autopause_after_s">Pausa automática após (s)</string>
   <string name="Autopause_min_pace_minkm">Pausa automática no ritmo mínimo (min/km)</string>
-  <string name="Convert_rest_on_Interval_tab">Converter descanso na aba Intervalo</string>
-  <string name="Convert_rest_on_Advanced_tab">Converter descanso na aba Avançado</string>
-  <string name="Target_pace_moving_average_seconds">Média em segundos em movimento do pace alvo</string>
-  <string name="Target_pace_grace_seconds">Tolerância em segundos do pace alvo</string>
-  <string name="Autolap_during_intervals">Volta automática durante os intervalos</string>
-  <string name="Add_countdown_after_step_that_ends_with_user_press">Adicionar contagem regressiva após a passada que terminar com o pressionamento do usuário</string>
   <string name="Step_countdown_time_s">Tempo da contagem regressiva após a passada (s)</string>
   <string name="Smooth_pace_graph">Gráfico do ritmo suave</string>
   <string name="Smooth_pace_filters">Filtro(s) do ritmo suave</string>
@@ -213,11 +203,8 @@
   <string name="Mock_HRM_devices">Dispos. HRM simulados</string>
   <string name="About_RunnerUp">Sobre o RunnerUp</string>
   <string name="Triggers">Acionadores</string>
-  <string name="Time_triggered_audio_cue">Aviso acionado pelo tempo</string>
   <string name="Cue_interval_s">Intervalo do aviso (s)</string>
-  <string name="Distance_triggered_audio_cue">Aviso acionado pela distância</string>
   <string name="Cue_intervall_m">Intervalo do aviso (m)</string>
-  <string name="End_of_lap_audio_cue">Aviso de final da volta</string>
   <string name="Mute_music_during_audio_cues">Silenciar música durante avisos de áudio</string>
   <string name="Cue_information">Informação do aviso</string>
   <string name="Total_distance">Distância total</string>
@@ -283,15 +270,10 @@
   <string name="Include_map_in_post">Incluir mapa na postagem</string>
   <string name="Clear_uploads_from_phone">Apagar envios (do telefone)</string>
   <string name="my_phone">Meu telefone</string>
-  <string name="Failed_to_import">Falha ao importar</string>
-  <string name="Import_workout">Importar exercício:</string>
-  <string name="Saving_as">Guardar como</string>
   <string name="Overwrite_existing">Substituir existente</string>
   <string name="Create_new_workout">Criar novo exercício</string>
   <string name="Set_workout_name">Definir nome do exercício</string>
   <string name="Downloading_1s_will_overwrite_2_workout_with_same_name">Downloading %1$s will overwrite %2$s workout with same name</string>
-  <string name="Delete_workout">Excluir treinos</string>
-  <string name="RunnerUp_workout">Exercício do RunnerUp:</string>
   <string name="HinHere_is_a_workout_I_think_you_might_like">Olá\nAqui está um exercício que eu acho que você pode gostar.</string>
   <string name="Share_workout">Compartilhar exercício…</string>
   <string name="New_audio_scheme">Novo esquema de áudio</string>

From 182fd84ae2cd26dea7d0da9f4646bb3ca4e099d6 Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Sat, 14 Dec 2019 20:55:49 +0100
Subject: [PATCH 2/3] Manually retain changed strings

---
 common/src/main/res/values-nl-rNL/strings.xml |  7 +++++++
 common/src/main/res/values-pt-rBR/strings.xml | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/common/src/main/res/values-nl-rNL/strings.xml b/common/src/main/res/values-nl-rNL/strings.xml
index a3d7e4e5e..64c5968af 100644
--- a/common/src/main/res/values-nl-rNL/strings.xml
+++ b/common/src/main/res/values-nl-rNL/strings.xml
@@ -169,9 +169,12 @@
   <string name="Downloadeditremove_workouts">Trainingen downloaden/bewerken/verwijderen</string>
   <string name="Note_you_need_to_connect_to_the_account_too">Je moet een RunnerUp Live-account koppelen</string>
   <string name="Use_your_headset_to_startpauseresume_RunnerUp">Gebruik je headset om RunnerUp te starten/pauzeren/hervatten</string>
+  <string name="Convert_reststep_with_type_distance_to_recoverystep_for_Intervaltab">Omzetten rust-stap met type afstand tot herstel-stap voor Interval-tabblad</string>
+  <string name="Convert_reststep_with_type_distance_to_recoverystep_for_Advancedtab">Omzetten rust-stap met type afstand tot herstel-stap voor Geavanceerde-tabblad</string>
   <string name="Export_database_to_sdcard_eg_for_upgrade">Databank exporteren naar externe opslag</string>
   <string name="Import_database_from_sdcard_eg_after_upgrade">Databank importeren uit externe opslag</string>
   <string name="Coach_to_help_you_reach_target_if_having_set_target">Coach om je te helpen je doel te bereiken (indien ingesteld)</string>
+  <string name="Keep_silent_when_workout_startpauseresumestop">Stil blijven wanneer de training start/pauzeert/hervat/stopt</string>
   <string name="Test_audio_cue">Auditief signaal testen</string>
   <string name="Accounts">Accounts</string>
   <string name="Audio_cues">Auditieve signalen</string>
@@ -182,6 +185,7 @@
   <string name="Autopause">Automatisch pauzeren</string>
   <string name="Enable_RunnerUpLive">RunnerUp Live inschakelen</string>
   <string name="Headset_key_startstop">Headset-toets start/stop</string>
+  <string name="Activity_countdown">Aftellen naar activiteit</string>
   <string name="Countdown_time_s">Afteltijd (s)</string>
   <string name="Unit_preference">Eenheidsvoorkeur</string>
   <string name="Auto_start_GPS">GPS automatisch starten</string>
@@ -191,6 +195,9 @@
   <string name="Autopause_after_s">Automatisch pauzeren na (s)</string>
   <string name="Autopause_min_pace_minkm">Automatische pauze min tempo na (min/km)</string>
   <string name="Convert_rest_on_Interval_tab">Intervalruststappen</string>
+  <string name="Convert_rest_on_Advanced_tab">Omzetten rust op Geavanceerde tabblad</string>
+  <string name="Target_pace_moving_average_seconds">Doeltempo voortschrijdend gemiddelde in seconden</string>
+  <string name="Target_pace_grace_seconds">Doeltempo sierlijkheid in seconden</string>
   <string name="Autolap_during_intervals">Automatische ronde in trainingen</string>
   <string name="Add_countdown_after_step_that_ends_with_user_press">Aftellen na indrukken toets</string>
   <string name="Step_countdown_time_s">Aftellen tot staptijd (s)</string>
diff --git a/common/src/main/res/values-pt-rBR/strings.xml b/common/src/main/res/values-pt-rBR/strings.xml
index 4218c1d85..4f4631587 100644
--- a/common/src/main/res/values-pt-rBR/strings.xml
+++ b/common/src/main/res/values-pt-rBR/strings.xml
@@ -169,9 +169,12 @@
   <string name="Downloadeditremove_workouts">Baixar/editar/remover exercícios</string>
   <string name="Note_you_need_to_connect_to_the_account_too">Anotações, você precisa se conectar à conta também</string>
   <string name="Use_your_headset_to_startpauseresume_RunnerUp">Usar o seu headset para iniciar/pausar/recomeçar o RunnerUp</string>
+  <string name="Convert_reststep_with_type_distance_to_recoverystep_for_Intervaltab">Converter passada de descanso com tipo de distância para passada de recuperação, na aba Intervalo</string>
+  <string name="Convert_reststep_with_type_distance_to_recoverystep_for_Advancedtab">Converter passada de descanso com tipo de distância para passada de recuperação, na aba Avançado</string>
   <string name="Export_database_to_sdcard_eg_for_upgrade">Exporta banco de dados para o cartão SD (por exemplo, para atualização)</string>
   <string name="Import_database_from_sdcard_eg_after_upgrade">Importar banco de dados do cartão SD (por exemplo, após atualização)</string>
   <string name="Coach_to_help_you_reach_target_if_having_set_target">Treinador para ajudá-lo a atingir a meta (caso tenha definido a meta)</string>
+  <string name="Keep_silent_when_workout_startpauseresumestop">Manter em silêncio quando o exercício iniciar/pausar/recomeçar/parar</string>
   <string name="Test_audio_cue">Testar aviso de áudio</string>
   <string name="Accounts">Contas</string>
   <string name="Audio_cues">Avisos de áudio</string>
@@ -182,6 +185,7 @@
   <string name="Autopause">Pausa automática</string>
   <string name="Enable_RunnerUpLive">Ativar Live</string>
   <string name="Headset_key_startstop">Chave do headset inicia/para</string>
+  <string name="Activity_countdown">Contagem regressiva de atividade</string>
   <string name="Countdown_time_s">Tempo da contagem regressiva (s)</string>
   <string name="Unit_preference">Preferência de unidade</string>
   <string name="Auto_start_GPS">Início automático do gps</string>
@@ -190,6 +194,12 @@
   <string name="RunnerUp_live_address">Endereço do RunnerUp live</string>
   <string name="Autopause_after_s">Pausa automática após (s)</string>
   <string name="Autopause_min_pace_minkm">Pausa automática no ritmo mínimo (min/km)</string>
+  <string name="Convert_rest_on_Interval_tab">Converter descanso na aba Intervalo</string>
+  <string name="Convert_rest_on_Advanced_tab">Converter descanso na aba Avançado</string>
+  <string name="Target_pace_moving_average_seconds">Média em segundos em movimento do pace alvo</string>
+  <string name="Target_pace_grace_seconds">Tolerância em segundos do pace alvo</string>
+  <string name="Autolap_during_intervals">Volta automática durante os intervalos</string>
+  <string name="Add_countdown_after_step_that_ends_with_user_press">Adicionar contagem regressiva após a passada que terminar com o pressionamento do usuário</string>
   <string name="Step_countdown_time_s">Tempo da contagem regressiva após a passada (s)</string>
   <string name="Smooth_pace_graph">Gráfico do ritmo suave</string>
   <string name="Smooth_pace_filters">Filtro(s) do ritmo suave</string>
@@ -203,8 +213,11 @@
   <string name="Mock_HRM_devices">Dispos. HRM simulados</string>
   <string name="About_RunnerUp">Sobre o RunnerUp</string>
   <string name="Triggers">Acionadores</string>
+  <string name="Time_triggered_audio_cue">Aviso acionado pelo tempo</string>
   <string name="Cue_interval_s">Intervalo do aviso (s)</string>
+  <string name="Distance_triggered_audio_cue">Aviso acionado pela distância</string>
   <string name="Cue_intervall_m">Intervalo do aviso (m)</string>
+  <string name="End_of_lap_audio_cue">Aviso de final da volta</string>
   <string name="Mute_music_during_audio_cues">Silenciar música durante avisos de áudio</string>
   <string name="Cue_information">Informação do aviso</string>
   <string name="Total_distance">Distância total</string>
@@ -270,10 +283,15 @@
   <string name="Include_map_in_post">Incluir mapa na postagem</string>
   <string name="Clear_uploads_from_phone">Apagar envios (do telefone)</string>
   <string name="my_phone">Meu telefone</string>
+  <string name="Failed_to_import">Falha ao importar</string>
+  <string name="Import_workout">Importar exercício:</string>
+  <string name="Saving_as">Guardar como</string>
   <string name="Overwrite_existing">Substituir existente</string>
   <string name="Create_new_workout">Criar novo exercício</string>
   <string name="Set_workout_name">Definir nome do exercício</string>
   <string name="Downloading_1s_will_overwrite_2_workout_with_same_name">Downloading %1$s will overwrite %2$s workout with same name</string>
+  <string name="Delete_workout">Excluir treinos</string>
+  <string name="RunnerUp_workout">Exercício do RunnerUp:</string>
   <string name="HinHere_is_a_workout_I_think_you_might_like">Olá\nAqui está um exercício que eu acho que você pode gostar.</string>
   <string name="Share_workout">Compartilhar exercício…</string>
   <string name="New_audio_scheme">Novo esquema de áudio</string>

From 228f3234f132fa3a397452933f07a00591896ca4 Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Sat, 14 Dec 2019 23:20:28 +0100
Subject: [PATCH 3/3] Manually adjusted arrays

Set non-translatable arrays
---
 common/src/main/res/values-bs/array.xml     |  4 ----
 common/src/main/res/values-ca/array.xml     |  4 ----
 common/src/main/res/values-de/array.xml     |  8 --------
 common/src/main/res/values-de/strings.xml   | 16 +++++++++-------
 common/src/main/res/values-en-rNL/array.xml |  4 ----
 common/src/main/res/values-es/array.xml     |  4 ----
 common/src/main/res/values-fa/array.xml     |  4 ----
 common/src/main/res/values-fi/array.xml     |  4 ----
 common/src/main/res/values-fr/array.xml     |  4 ----
 common/src/main/res/values-hu/array.xml     |  4 ----
 common/src/main/res/values-in/array.xml     |  4 ----
 common/src/main/res/values-it/array.xml     |  4 ----
 common/src/main/res/values-ja/array.xml     |  4 ----
 common/src/main/res/values-lt/array.xml     |  4 ----
 common/src/main/res/values-nb-rNO/array.xml |  4 ----
 common/src/main/res/values-nl-rNL/array.xml |  4 ----
 common/src/main/res/values-nl/array.xml     |  4 ----
 common/src/main/res/values-pl/array.xml     |  4 ----
 common/src/main/res/values-pt-rBR/array.xml |  4 ----
 common/src/main/res/values-pt/array.xml     |  4 ----
 common/src/main/res/values-ru/array.xml     |  4 ----
 common/src/main/res/values-sv/array.xml     |  6 +++---
 common/src/main/res/values-sv/strings.xml   |  3 ++-
 common/src/main/res/values/array.xml        |  4 ++--
 24 files changed, 16 insertions(+), 97 deletions(-)

diff --git a/common/src/main/res/values-bs/array.xml b/common/src/main/res/values-bs/array.xml
index 434c62ea5..1755ce55f 100644
--- a/common/src/main/res/values-bs/array.xml
+++ b/common/src/main/res/values-bs/array.xml
@@ -4,10 +4,6 @@
     <item>Milje</item>
     <item>Kilometri</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Zagrijavanje</item>
diff --git a/common/src/main/res/values-ca/array.xml b/common/src/main/res/values-ca/array.xml
index 11c6e6cfb..d04b8b6a2 100644
--- a/common/src/main/res/values-ca/array.xml
+++ b/common/src/main/res/values-ca/array.xml
@@ -4,10 +4,6 @@
     <item>Milles</item>
     <item>Kilòmetres</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Escalfament</item>
diff --git a/common/src/main/res/values-de/array.xml b/common/src/main/res/values-de/array.xml
index aa597421e..5bfb408b9 100644
--- a/common/src/main/res/values-de/array.xml
+++ b/common/src/main/res/values-de/array.xml
@@ -4,18 +4,10 @@
     <item>Meilen</item>
     <item>Kilometer</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <string-array name="speedUnitEntries">
     <item>Pace</item>
     <item>Geschwindigkeit</item>
   </string-array>
-  <string-array name="speedUnitValues">
-    <item>pace</item>
-    <item>speed</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Aufwärmen</item>
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index 8b23d57c3..00f9f2ebd 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -211,11 +211,13 @@
   <string name="Mock_HRM_devices">Herzfrequenzzähler-Attrappe</string>
   <string name="About_RunnerUp">Über RunnerUp</string>
   <string name="Triggers">Auslöser</string>
-  <string name="Time_triggered_audio_cue">Zeitgesteuerter Audiohinweis</string>
+  <string name="Time_triggered_audio_cue">Zeitauslöser</string>
+  <string name="Time_triggered_audio_cue_summary">Regelmäßige Rückmeldung</string>
   <string name="Cue_interval_s">Hinweisintervall (s)</string>
-  <string name="Distance_triggered_audio_cue">Distanzgesteuerter Audiohinweis</string>
+  <string name="Distance_triggered_audio_cue">Entfernungsauslöser</string>
+  <string name="Distance_triggered_audio_cue_summary">Regelmäßige Rückmeldung</string>
   <string name="Cue_intervall_m">Hinweisintervall (m)</string>
-  <string name="End_of_lap_audio_cue">Audiohinweis am Rundenende</string>
+  <string name="End_of_lap_audio_cue">Ende der Runde</string>
   <string name="Mute_music_during_audio_cues">Musik während Audiohinweisen stummschalten</string>
   <string name="Cue_information">Hinweisinformation</string>
   <string name="Total_distance">Gesamtdistanz</string>
@@ -282,14 +284,14 @@
   <string name="Clear_uploads_from_phone">Alle Uploads (vom Telefon) löschen</string>
   <string name="my_phone">Mein Telefon</string>
   <string name="Failed_to_import">Fehler beim Importieren: </string>
-  <string name="Import_workout">Trainingseinheit importieren: </string>
-  <string name="Saving_as">Speichern als </string>
+  <string name="Import_workout">Trainingseinheit importieren</string>
+  <string name="Saving_as">Speichern als</string>
   <string name="Overwrite_existing">Vorhandene überschreiben</string>
   <string name="Create_new_workout">Neue Trainingseinheit erstellen</string>
   <string name="Set_workout_name">Trainingsname festlegen</string>
   <string name="Downloading_1s_will_overwrite_2_workout_with_same_name">Der Download von %1$s wird das Training %2$s mit demselben Namen überschreiben</string>
-  <string name="Delete_workout">Trainingseinheit löschen </string>
-  <string name="RunnerUp_workout">RunnerUp-Trainingseinheit: </string>
+  <string name="Delete_workout">Trainingseinheit löschen</string>
+  <string name="RunnerUp_workout">RunnerUp-Trainingseinheit</string>
   <string name="HinHere_is_a_workout_I_think_you_might_like">Hallo\nHier ist ein Training, dass dir vielleicht gefallen könnte.</string>
   <string name="Share_workout">Trainingseinheit teilen…</string>
   <string name="New_audio_scheme">Neues Audioschema</string>
diff --git a/common/src/main/res/values-en-rNL/array.xml b/common/src/main/res/values-en-rNL/array.xml
index 7bde79169..8c3045658 100644
--- a/common/src/main/res/values-en-rNL/array.xml
+++ b/common/src/main/res/values-en-rNL/array.xml
@@ -4,10 +4,6 @@
     <item>Mijlen</item>
     <item>Kilometers</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Warming-up</item>
diff --git a/common/src/main/res/values-es/array.xml b/common/src/main/res/values-es/array.xml
index 01a70f0cd..6ffaecced 100644
--- a/common/src/main/res/values-es/array.xml
+++ b/common/src/main/res/values-es/array.xml
@@ -4,10 +4,6 @@
     <item>Millas</item>
     <item>Kilómetros</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Calentamiento</item>
diff --git a/common/src/main/res/values-fa/array.xml b/common/src/main/res/values-fa/array.xml
index 95211adfd..fb1017c38 100644
--- a/common/src/main/res/values-fa/array.xml
+++ b/common/src/main/res/values-fa/array.xml
@@ -4,10 +4,6 @@
     <item>مایل</item>
     <item>کیلومتر</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>مایل</item>
-    <item>کیلومتر</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>گرم کردن</item>
diff --git a/common/src/main/res/values-fi/array.xml b/common/src/main/res/values-fi/array.xml
index 691a732b8..8561808c8 100644
--- a/common/src/main/res/values-fi/array.xml
+++ b/common/src/main/res/values-fi/array.xml
@@ -4,10 +4,6 @@
     <item>Mailit</item>
     <item>Kilometrit</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Lämmittely</item>
diff --git a/common/src/main/res/values-fr/array.xml b/common/src/main/res/values-fr/array.xml
index b64a45234..c8fb55cb9 100644
--- a/common/src/main/res/values-fr/array.xml
+++ b/common/src/main/res/values-fr/array.xml
@@ -4,10 +4,6 @@
     <item>Milles</item>
     <item>Kilomètres</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Échauffement</item>
diff --git a/common/src/main/res/values-hu/array.xml b/common/src/main/res/values-hu/array.xml
index 3d2111bf0..4a72d5b1d 100644
--- a/common/src/main/res/values-hu/array.xml
+++ b/common/src/main/res/values-hu/array.xml
@@ -4,10 +4,6 @@
     <item>Mérföld</item>
     <item>Kilométer</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Bemelegítés</item>
diff --git a/common/src/main/res/values-in/array.xml b/common/src/main/res/values-in/array.xml
index 9d22ef404..4fdcaec86 100644
--- a/common/src/main/res/values-in/array.xml
+++ b/common/src/main/res/values-in/array.xml
@@ -4,10 +4,6 @@
     <item>Mil</item>
     <item>Kilometer</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mil</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Pemanasan</item>
diff --git a/common/src/main/res/values-it/array.xml b/common/src/main/res/values-it/array.xml
index f3742243a..0064967ae 100644
--- a/common/src/main/res/values-it/array.xml
+++ b/common/src/main/res/values-it/array.xml
@@ -4,10 +4,6 @@
     <item>Miglia</item>
     <item>Chilometri</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Riscaldamento</item>
diff --git a/common/src/main/res/values-ja/array.xml b/common/src/main/res/values-ja/array.xml
index a2a1c817a..e492f3ae9 100644
--- a/common/src/main/res/values-ja/array.xml
+++ b/common/src/main/res/values-ja/array.xml
@@ -4,10 +4,6 @@
     <item>マイル</item>
     <item>キロメートル</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>ウォームアップ</item>
diff --git a/common/src/main/res/values-lt/array.xml b/common/src/main/res/values-lt/array.xml
index 296ff4de2..5eb3ad1da 100644
--- a/common/src/main/res/values-lt/array.xml
+++ b/common/src/main/res/values-lt/array.xml
@@ -4,10 +4,6 @@
     <item>Mylios</item>
     <item>Kilometrai</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Apšilimas</item>
diff --git a/common/src/main/res/values-nb-rNO/array.xml b/common/src/main/res/values-nb-rNO/array.xml
index 3c71de9bb..3d1a8a468 100644
--- a/common/src/main/res/values-nb-rNO/array.xml
+++ b/common/src/main/res/values-nb-rNO/array.xml
@@ -4,10 +4,6 @@
     <item>Mil</item>
     <item>Kilometer</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Oppvarming</item>
diff --git a/common/src/main/res/values-nl-rNL/array.xml b/common/src/main/res/values-nl-rNL/array.xml
index a699c727f..c97fd42fb 100644
--- a/common/src/main/res/values-nl-rNL/array.xml
+++ b/common/src/main/res/values-nl-rNL/array.xml
@@ -4,10 +4,6 @@
     <item>Mijlen</item>
     <item>Kilometers</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Warming-up</item>
diff --git a/common/src/main/res/values-nl/array.xml b/common/src/main/res/values-nl/array.xml
index d1156b382..8446e67e0 100644
--- a/common/src/main/res/values-nl/array.xml
+++ b/common/src/main/res/values-nl/array.xml
@@ -4,10 +4,6 @@
     <item>Mijlen</item>
     <item>Kilometers</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Warming-up</item>
diff --git a/common/src/main/res/values-pl/array.xml b/common/src/main/res/values-pl/array.xml
index 3be6d3c47..e24b87085 100644
--- a/common/src/main/res/values-pl/array.xml
+++ b/common/src/main/res/values-pl/array.xml
@@ -4,10 +4,6 @@
     <item>Mile</item>
     <item>Kilometry</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Rozgrzewka</item>
diff --git a/common/src/main/res/values-pt-rBR/array.xml b/common/src/main/res/values-pt-rBR/array.xml
index 983406daa..8f41d35f1 100644
--- a/common/src/main/res/values-pt-rBR/array.xml
+++ b/common/src/main/res/values-pt-rBR/array.xml
@@ -4,10 +4,6 @@
     <item>Milhas</item>
     <item>Quilômetros</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Aquecimento</item>
diff --git a/common/src/main/res/values-pt/array.xml b/common/src/main/res/values-pt/array.xml
index d389ee3bf..c5b55ac55 100644
--- a/common/src/main/res/values-pt/array.xml
+++ b/common/src/main/res/values-pt/array.xml
@@ -4,10 +4,6 @@
     <item>Milhas</item>
     <item>Quilómetros</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Aquecimento</item>
diff --git a/common/src/main/res/values-ru/array.xml b/common/src/main/res/values-ru/array.xml
index e6ba09e22..15c6b5416 100644
--- a/common/src/main/res/values-ru/array.xml
+++ b/common/src/main/res/values-ru/array.xml
@@ -4,10 +4,6 @@
     <item>Мили</item>
     <item>Километры</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>Миль</item>
-    <item>Км</item>
-  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Разминка</item>
diff --git a/common/src/main/res/values-sv/array.xml b/common/src/main/res/values-sv/array.xml
index f28192c8d..9413890cf 100644
--- a/common/src/main/res/values-sv/array.xml
+++ b/common/src/main/res/values-sv/array.xml
@@ -4,9 +4,9 @@
     <item>Miles</item>
     <item>Kilometer</item>
   </string-array>
-  <string-array name="unitValues">
-    <item>mi</item>
-    <item>km</item>
+  <string-array name="speedUnitEntries">
+    <item>Tempo</item>
+    <item>Hastighet</item>
   </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
diff --git a/common/src/main/res/values-sv/strings.xml b/common/src/main/res/values-sv/strings.xml
index 7be9f4cb3..188633b79 100644
--- a/common/src/main/res/values-sv/strings.xml
+++ b/common/src/main/res/values-sv/strings.xml
@@ -189,7 +189,8 @@
   <string name="Activity_countdown">Nedräkning till aktivitet start</string>
   <string name="Activity_countdown_summary">Lägg till nedräkning till aktivitetsstart för standard pass</string>
   <string name="Countdown_time_s">Nedräkningstid (s)</string>
-  <string name="Unit_preference">Måttenhet</string>
+  <string name="Unit_preference">Distansenhet</string>
+  <string name="Unit_preference_title">Måttenheter</string>
   <string name="Auto_start_GPS">Autostarta GPS</string>
   <string name="Advanced_options">Avancerade inställningar</string>
   <string name="Mapbox_default_style">Mapbox stil</string>
diff --git a/common/src/main/res/values/array.xml b/common/src/main/res/values/array.xml
index b2603b3dd..e2c4a6702 100644
--- a/common/src/main/res/values/array.xml
+++ b/common/src/main/res/values/array.xml
@@ -20,7 +20,7 @@
     <item>Miles</item>
     <item>Kilometers</item>
   </string-array>
-  <string-array name="unitValues">
+  <string-array name="unitValues" translatable="false">
     <item>mi</item>
     <item>km</item>
   </string-array>
@@ -28,7 +28,7 @@
     <item>Pace</item>
     <item>Speed</item>
   </string-array>
-  <string-array name="speedUnitValues">
+  <string-array name="speedUnitValues" translatable="false">
     <item>pace</item>
     <item>speed</item>
   </string-array>