diff --git a/src/locale/ar_SA/globaltranslations.properties b/src/locale/ar_SA/globaltranslations.properties
index c27b96971f..b34976e381 100644
--- a/src/locale/ar_SA/globaltranslations.properties
+++ b/src/locale/ar_SA/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=An unknown error has occurred while trying to enable
 no_internet_connection_message=Your device is not connected to the Internet. You need an active Internet connection to send e-mails.
 instructions_button_label=Instructions
 configure_button_label=Configure
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/bg_BG/globaltranslations.properties b/src/locale/bg_BG/globaltranslations.properties
index 219e9ff61c..dc49db450b 100644
--- a/src/locale/bg_BG/globaltranslations.properties
+++ b/src/locale/bg_BG/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=An unknown error has occurred while trying to enable
 no_internet_connection_message=Your device is not connected to the Internet. You need an active Internet connection to send e-mails.
 instructions_button_label=Instructions
 configure_button_label=Configure
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/cs_CZ/globaltranslations.properties b/src/locale/cs_CZ/globaltranslations.properties
index 219e9ff61c..dc49db450b 100644
--- a/src/locale/cs_CZ/globaltranslations.properties
+++ b/src/locale/cs_CZ/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=An unknown error has occurred while trying to enable
 no_internet_connection_message=Your device is not connected to the Internet. You need an active Internet connection to send e-mails.
 instructions_button_label=Instructions
 configure_button_label=Configure
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/da_DK/globaltranslations.properties b/src/locale/da_DK/globaltranslations.properties
index 75b945bffd..05e3def1a6 100644
--- a/src/locale/da_DK/globaltranslations.properties
+++ b/src/locale/da_DK/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Der opstod en ukendt fejl under forsøg på at aktive
 no_internet_connection_message=Din enhed er ikke tilsluttet internettet. Du skal have en aktiv internetforbindelse for at sende e-mails.
 instructions_button_label=Instruktioner
 configure_button_label=Konfigurer
+revoke_guide_button_label=Vis tilbagekalds vejledning
diff --git a/src/locale/de_DE/globaltranslations.properties b/src/locale/de_DE/globaltranslations.properties
index aab1a07f6d..382289dfb0 100644
--- a/src/locale/de_DE/globaltranslations.properties
+++ b/src/locale/de_DE/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Beim Versuch, den Zugriff auf die Kamera zu ermöglic
 no_internet_connection_message=Ihr Gerät ist nicht mit dem Internet verbunden. Sie benötigen eine aktive Internetverbindung, um E-Mails zu versenden.
 instructions_button_label=Anleitung
 configure_button_label=Konfigurieren
+revoke_guide_button_label=Zertifikatswiderruf-Guide anzeigen
diff --git a/src/locale/es_ES/globaltranslations.properties b/src/locale/es_ES/globaltranslations.properties
index 3bb05db675..5f8f2e0814 100644
--- a/src/locale/es_ES/globaltranslations.properties
+++ b/src/locale/es_ES/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Ha ocurrido un error desconocido al intentar habilita
 no_internet_connection_message=Su dispositivo no está conectado a Internet. Necesita una conexión a Internet para enviar correos electrónicos.
 instructions_button_label=Instrucciones
 configure_button_label=Configurar
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/fi_FI/globaltranslations.properties b/src/locale/fi_FI/globaltranslations.properties
index 555a7b1462..5281f63001 100644
--- a/src/locale/fi_FI/globaltranslations.properties
+++ b/src/locale/fi_FI/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Tuntematon virhe yritettäessä käyttää kameraa.
 no_internet_connection_message=Laitteesi ei ole yhteydessä internetiin. Sähköpostien lähettämiseen tarvitaan aktiivinen internetyhteys.
 instructions_button_label=Ohjeet
 configure_button_label=Määritä
+revoke_guide_button_label=Näytä kumoamisen korjausopas
diff --git a/src/locale/fi_FI/icloudservice.properties b/src/locale/fi_FI/icloudservice.properties
index fa6d7f8488..e22b52a073 100644
--- a/src/locale/fi_FI/icloudservice.properties
+++ b/src/locale/fi_FI/icloudservice.properties
@@ -1,3 +1,3 @@
 empty_icloud_database_label=Tietokannan iCloud-kopio on tyhjä\!
-non_optimal_backup_settings_warning_message=It is highly recommended that you set automatic iCloud backups to twice-daily in settings > maintenance. This will ensure that you will not lose your data if Apple revokes Spike's Enterprise Certificate and you need to reinstall Spike with a new certificate to be able to continue using the app.
-recent_icloud_backup_found_message=I've found a recent iCloud backup. Do you want me to restore all your previous settings and data from iCloud?
+non_optimal_backup_settings_warning_message=On erittäin suositeltavaa valita automaattinen iCloud-varmuuskopiointi kahdesti päivässä kohdassa Asetukset > Ylläpito. Näin voit varmistaa, ettet menetä tietoja, jos Apple irtisanoo Spiken yritysvarmenteen ja Spike on asennettava uudelleen uudella varmenteella.
+recent_icloud_backup_found_message=Löydettiin äskettäinen iCloud-varmuuskopio. Haluatko palauttaa kaikki aiemmat asetukset ja tiedot iCloudista?
diff --git a/src/locale/fi_FI/maintenancesettingsscreen.properties b/src/locale/fi_FI/maintenancesettingsscreen.properties
index 47faceb6b4..0d32b68cea 100644
--- a/src/locale/fi_FI/maintenancesettingsscreen.properties
+++ b/src/locale/fi_FI/maintenancesettingsscreen.properties
@@ -17,7 +17,7 @@ no_network_connection=Laitteesi ei ole yhteydessä internetiin. Asetusten varmuu
 parse_settings_error=Virhe jäsennettäessä asetuksia\! Yritä uudelleen.
 database_section_label=Tietokannan varmuuskopiointi/palautus
 no_automatic_backup_label=Ei käytössä
-twice_daily_backup_label=Twice-Daily
+twice_daily_backup_label=Kahdesti päivässä
 daily_backup_label=Päivittäin
 weekly_backup_label=Viikoittain
 monthly_backup_label=Kuukausittain
diff --git a/src/locale/fi_FI/sharesettingsscreen.properties b/src/locale/fi_FI/sharesettingsscreen.properties
index 79ed0342e4..37ad16cbfb 100644
--- a/src/locale/fi_FI/sharesettingsscreen.properties
+++ b/src/locale/fi_FI/sharesettingsscreen.properties
@@ -96,4 +96,4 @@ follower_invitation_in_app_instructions=Valitse Spike-seuraajasovelluksessa Aset
 invite_followers_button_label=Kutsu seuraajia
 nightscout_follower_popup_body=Voiko seuraaja lisätä hoitoja Nightscoutiin ja Spike-pääsovellukseen?
 share_profile_with_follower_label=Synkronoidaanko profiili seuraajan kanssa\: insuliinit, ISF, I\:C, jne.?
-scan_qr_code_button_label=Scan QR Code
+scan_qr_code_button_label=Skannaa QR-koodi
diff --git a/src/locale/fi_FI/updateservice.properties b/src/locale/fi_FI/updateservice.properties
index 4a4b9dad05..33c227e5dc 100644
--- a/src/locale/fi_FI/updateservice.properties
+++ b/src/locale/fi_FI/updateservice.properties
@@ -6,4 +6,4 @@ update_dialog_download=Lataa
 update_dialog_remind_later=Muistuta myöhemmin
 update_dialog_changelog=Muutosloki
 update_dialog_update_button_label=Päivitä
-changelog_request_message=Do you want to read the changelog of new features, enhancements and bug fixes available in this newly updated {app_version_do_not_translate_this_word} Spike version?
+changelog_request_message=Haluatko lukea muutoslokin, jossa kerrotaan äskettäin päivitetyn Spike-version {app_version_do_not_translate_this_word} uudet ominaisuudet, parannukset ja bugikorjaukset?
diff --git a/src/locale/fr_FR/globaltranslations.properties b/src/locale/fr_FR/globaltranslations.properties
index 60c57c0291..6fcfb9351e 100644
--- a/src/locale/fr_FR/globaltranslations.properties
+++ b/src/locale/fr_FR/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Une erreur inconnue est survenue lors de l'autorisati
 no_internet_connection_message=Votre appareil n’est pas connecté à Internet. Vous avez besoin d’une connexion Internet active pour envoyer des e-mails.
 instructions_button_label=Instructions
 configure_button_label=Configurer
+revoke_guide_button_label=Afficher Aide pour Certificats Révoqués
diff --git a/src/locale/hu_HU/globaltranslations.properties b/src/locale/hu_HU/globaltranslations.properties
index 219e9ff61c..dc49db450b 100644
--- a/src/locale/hu_HU/globaltranslations.properties
+++ b/src/locale/hu_HU/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=An unknown error has occurred while trying to enable
 no_internet_connection_message=Your device is not connected to the Internet. You need an active Internet connection to send e-mails.
 instructions_button_label=Instructions
 configure_button_label=Configure
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/it_IT/globaltranslations.properties b/src/locale/it_IT/globaltranslations.properties
index 93650c7453..40c8d99db9 100644
--- a/src/locale/it_IT/globaltranslations.properties
+++ b/src/locale/it_IT/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Si è verificato un errore sconosciuto durante il ten
 no_internet_connection_message=Il dispositivo non è connesso a Internet. Avrai bisogno di una connessione Internet attiva per inviare messaggi di posta elettronica.
 instructions_button_label=Istruzioni
 configure_button_label=Configura
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/ja_JP/globaltranslations.properties b/src/locale/ja_JP/globaltranslations.properties
index ca87e68e7d..0da7140858 100644
--- a/src/locale/ja_JP/globaltranslations.properties
+++ b/src/locale/ja_JP/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=An unknown error has occurred while trying to enable
 no_internet_connection_message=Your device is not connected to the Internet. You need an active Internet connection to send e-mails.
 instructions_button_label=Instructions
 configure_button_label=Configure
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/nl_NL/globaltranslations.properties b/src/locale/nl_NL/globaltranslations.properties
index 2cfa6c76da..e4f9b7967e 100644
--- a/src/locale/nl_NL/globaltranslations.properties
+++ b/src/locale/nl_NL/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Er is een onbekende fout opgetreden tijdens activatie
 no_internet_connection_message=Je toestel heeft geen Internet verbinding. Je moet een Internet verbinding hebben om e-mails te versturen.
 instructions_button_label=Instructies
 configure_button_label=Configureren
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/no_NO/chartsettingsscreen.properties b/src/locale/no_NO/chartsettingsscreen.properties
index 62c5ad9d64..3f5e5fea28 100644
--- a/src/locale/no_NO/chartsettingsscreen.properties
+++ b/src/locale/no_NO/chartsettingsscreen.properties
@@ -48,8 +48,8 @@ zt_glucose_predictions_label=BS ZT prognose
 glucose_variability_label=Glukose variasjon
 statistics_settings_title_master=Statistikk
 statistics_settings_title_follower=24t statistikk
-temp_basal_area_color_title=Temp Basal Area
-basal_area_color_title=Basal Area
-basal_line_color_title=Basal Line
-basal_rate_line_color_title=Basal Rate Line
-basal_area_size_settings_label=Basal Area Size (Percentage Of Chart's Height)
+temp_basal_area_color_title=Midl. basalområde
+basal_area_color_title=Basalområde
+basal_line_color_title=Basallinje
+basal_rate_line_color_title=Basal satslinje
+basal_area_size_settings_label=Basalområde høyde (prosent av digram)
diff --git a/src/locale/no_NO/globaltranslations.properties b/src/locale/no_NO/globaltranslations.properties
index 82e02ed188..4b662e0ba1 100644
--- a/src/locale/no_NO/globaltranslations.properties
+++ b/src/locale/no_NO/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=En ukjent feil oppstod mens spike prøvde å få tilg
 no_internet_connection_message=Enheten er ikke koblet til internett. Du må ha en aktiv internett-tilkobling for å sende e-post.
 instructions_button_label=Instruksjoner
 configure_button_label=Konfigurer
+revoke_guide_button_label=Vis tilbaketrukket sertifikat guide
diff --git a/src/locale/no_NO/icloudservice.properties b/src/locale/no_NO/icloudservice.properties
index e0803106a5..aeb24ea352 100644
--- a/src/locale/no_NO/icloudservice.properties
+++ b/src/locale/no_NO/icloudservice.properties
@@ -1,3 +1,3 @@
 empty_icloud_database_label=Kopien av databasen i iCloud er tom\!
-non_optimal_backup_settings_warning_message=It is highly recommended that you set automatic iCloud backups to twice-daily in settings > maintenance. This will ensure that you will not lose your data if Apple revokes Spike's Enterprise Certificate and you need to reinstall Spike with a new certificate to be able to continue using the app.
-recent_icloud_backup_found_message=I've found a recent iCloud backup. Do you want me to restore all your previous settings and data from iCloud?
+non_optimal_backup_settings_warning_message=Det anbefales at du setter på automatisk iCloud sikkerhetskopiering til to ganger daglig i Innstillinger > Vedlikehold. Dette vil sikre at du ikke vil miste data Hvis Apple tilbakekaller Spikes sertifikat, og du må installere Spike med et nytt sertifikat, skal du kunne fortsette å bruke programmet.
+recent_icloud_backup_found_message=Det ble funnet en nylig iCloud-sikkerhetskopi. skal alle tidligere innstillinger og data fra iCloud gjenopprettes?
diff --git a/src/locale/no_NO/iftttsettingsscreen.properties b/src/locale/no_NO/iftttsettingsscreen.properties
index c568fdf103..1036acc400 100644
--- a/src/locale/no_NO/iftttsettingsscreen.properties
+++ b/src/locale/no_NO/iftttsettingsscreen.properties
@@ -58,12 +58,12 @@ pump_battery_added_label=Pumpebatteri lagt til
 pump_battery_updated_label=Pumpebatteri oppdatert
 pump_battery_deleted_label=Pumpebatteri slettet
 glucose_thresholds_separated_by_events_label=Separate IFTTT hendelser for hver glekoseterskel (Kritisk høy, Høy, Innen målet, Lav og Kritisk lav)
-temp_basal_start_added_label=Temp Basal Start Added
-temp_basal_start_updated_label=Temp Basal Start Updated
-temp_basal_start_deleted_label=Temp Basal Start Deleted
-temp_basal_end_added_label=Temp Basal End Added
-temp_basal_end_updated_label=Temp Basal End Updated
-temp_basal_end_deleted_label=Temp Basal End Deleted
-mdi_basal_added_label=Basal Added
-mdi_basal_updated_label=Basal Updated
-mdi_basal_deleted_label=Basal Deleted
+temp_basal_start_added_label=Midldlertidig basal start lagt til
+temp_basal_start_updated_label=Midldlertidig basal start oppdatert
+temp_basal_start_deleted_label=Midldlertidig basal start slettet
+temp_basal_end_added_label=Midldlertidig basal slutt lagt til
+temp_basal_end_updated_label=Midldlertidig basal slutt oppdatert
+temp_basal_end_deleted_label=Midldlertidig basal slutt slettet
+mdi_basal_added_label=Basal lagt til
+mdi_basal_updated_label=Basal oppdatert
+mdi_basal_deleted_label=Basal slettet
diff --git a/src/locale/no_NO/integrationsettingsscreen.properties b/src/locale/no_NO/integrationsettingsscreen.properties
index 4f7e24d1be..8f5e49a48d 100644
--- a/src/locale/no_NO/integrationsettingsscreen.properties
+++ b/src/locale/no_NO/integrationsettingsscreen.properties
@@ -4,5 +4,5 @@ server_section_label=Intern HTTP server
 server_section_sublabel=Loop, Pebble, Garmin, Nightguard... offline modus\!
 ifttt_label=IFTTT
 settings_label=Innstillinger
-workflow_label=Workflow/Shortcuts
+workflow_label=Arbeidsflyt/snarveier
 pebble_label=Pebble
diff --git a/src/locale/no_NO/maintenancesettingsscreen.properties b/src/locale/no_NO/maintenancesettingsscreen.properties
index 553d3e38be..5d0bd6c81e 100644
--- a/src/locale/no_NO/maintenancesettingsscreen.properties
+++ b/src/locale/no_NO/maintenancesettingsscreen.properties
@@ -17,7 +17,7 @@ no_network_connection=Du er ikke koblet til internett. Du må ha internettforbin
 parse_settings_error=Feil ved behandling av innstillingene\! Prøv igjen.
 database_section_label=Backup/gjenopprett database
 no_automatic_backup_label=Deaktivert
-twice_daily_backup_label=Twice-Daily
+twice_daily_backup_label=To ganger daglig
 daily_backup_label=Daglig
 weekly_backup_label=Ukentlig
 monthly_backup_label=Månedlig
diff --git a/src/locale/no_NO/pebblesettingsscreen.properties b/src/locale/no_NO/pebblesettingsscreen.properties
index f573f62633..b1dcf8771e 100644
--- a/src/locale/no_NO/pebblesettingsscreen.properties
+++ b/src/locale/no_NO/pebblesettingsscreen.properties
@@ -1,3 +1,3 @@
-get_pebble_app=Get
-pebble_instructions_title=Instructions
-pebble_instructions_body=Since Pebble has been discontinued, users need to migrate to the Rebble platform. Please head over to http\://rebble.io, create an account and follow instructions on how to connect you Pebble to Rebble.\n\nAfterwards, you will be able to use any of the above apps to add treatments to Spike directly from your watch. Be sure to install these apps directly from the Pebble app on your device. Configure the app to point to the following Nightscout URL address\: http\://127.0.0.1\:1979 (sometimes the app requires you to point it to http\://127.0.0.1\:1979/pebble).\n\nTo be able to see your glucose levels on your Pebble watch please follow the instructions listed on Spike settings > integration > internal HTTP server.
+get_pebble_app=Hent
+pebble_instructions_title=Instruksjoner
+pebble_instructions_body=Siden Pebble er avviklet, må brukere flytte til Rebble plattformen. Gå til http\://rebble.io, opprett en konto og følge instruksjonene om hvordan du kobler du Pebble til Rebble.\n\nEtterpå vil du kunne bruke alle de ovennevnte programmene for å legge behandlinger til Spike direkte fra klokken. Husk å installere disse programmene direkte fra Pebble programmet på enheten. Konfigurere programmet til å peke til følgende Nightscout URL-adresse\: http\://127.0.0.1\:1979 (noen ganger programmet krever at du peker til http\://127.0.0.1\:1979/pebble).\n\nFor å kunne se ditt blodsukker på Pebble klokken, vennligst følg instruksjonene i Spike Innstillinger > Integrering > Intern HTTP-server.
diff --git a/src/locale/no_NO/profilesettingsscreen.properties b/src/locale/no_NO/profilesettingsscreen.properties
index 1927dd77d1..dd58644598 100644
--- a/src/locale/no_NO/profilesettingsscreen.properties
+++ b/src/locale/no_NO/profilesettingsscreen.properties
@@ -58,17 +58,17 @@ insulin_curve_chart_x_label=X-akse\: Tid i minutter
 insulin_curve_chart_y_label=Y-akse\: Prosent insulin brukt pr minutt
 incomplete_profile_warning=OpenAPS (oref0) algoritmen krever at du angir din IF (Insulin Følsomhet) og IK (Insulin til Karbohydratforhold).\n\nVennligst bla helt ned på denne skjermen, sett inn IF- og IK-forhold (pass på å legge inn i alle, hvis du har flere profiler), og prøv å velge OpenAPS (oref0) algoritmen igjen.
 duplicate_profile_label=Feil ved oppretting av profil\! Profil med samme starttid finnes allerede.
-duplicate_basal_rate_label=Error creating basal rate\! Found existing basal rate with the same start time.
-basal_settings_section_label=Basals
-add_basal_rate_label=Add Basal Rate
-edit_basal_rate_label=Edit Basal Rate
-conflicting_basal_rate_label=Basal rate start time already in use. Please select a different time.
-delete_basal_rate_confirmation_label=Are you sure you want to delete this basal rate?\n\nThis can not be undone\!
-basal_rate_label=Rate
-multiple_daily_injections_aka_pen_user_label=MDI/Pen User
-pump_user_label=Pump User
-basal_rates_title=Basal Rates (Units/Hour)
-user_type_section_title=User Type
-pump_or_pen_user_mode=Mode
-total_basal_rate_per_day=Total Daily
-nightscout_offset_user_notification_label=Spike has detected that the master is in a different time zone. Currently there''s a time differentce of {difference_in_hours_do_not_translate} hours between you and the master. This difference will be taken into account when rendering basal rates on the chart.
+duplicate_basal_rate_label=Feil ved oppretting av basal sats\! Fant eksisterende basal sats med samme starttid.
+basal_settings_section_label=Basal
+add_basal_rate_label=Legg til basalsats
+edit_basal_rate_label=Rediger basalsats
+conflicting_basal_rate_label=Starttid for basalsats er allerede i bruk. Vennligst velg et annet tidspunkt.
+delete_basal_rate_confirmation_label=Er du sikker på at du vil slette denne basalsatsan?\n\nDette kan ikke gjøres om\!
+basal_rate_label=Sats
+multiple_daily_injections_aka_pen_user_label=MDI/basal-penn
+pump_user_label=Varsle bruker
+basal_rates_title=Basalsats (Enheter/time)
+user_type_section_title=Brukertype
+pump_or_pen_user_mode=Modus
+total_basal_rate_per_day=Daglig total
+nightscout_offset_user_notification_label=Spike har oppdaget at master-enheten er i en annen tidssone. Det en tidsforskjell på {difference_in_hours_do_not_translate} timer mellom deg og master. Denne forskjellen vil tas i betraktning ved visning av basalsats i diagrammet.
diff --git a/src/locale/no_NO/sharesettingsscreen.properties b/src/locale/no_NO/sharesettingsscreen.properties
index e1b4e0f4c2..84b258bad5 100644
--- a/src/locale/no_NO/sharesettingsscreen.properties
+++ b/src/locale/no_NO/sharesettingsscreen.properties
@@ -96,4 +96,4 @@ follower_invitation_in_app_instructions=På Spike følgerens app, gå til Innsti
 invite_followers_button_label=Invitér følgere
 nightscout_follower_popup_body=Tillate at følgere legger til behandlinger til Nightscout og Spike master?
 share_profile_with_follower_label=Synkronisere profil med følger; insulin, IF, IK, etc?
-scan_qr_code_button_label=Scan QR Code
+scan_qr_code_button_label=Skann QR-kode
diff --git a/src/locale/no_NO/treatments.properties b/src/locale/no_NO/treatments.properties
index 6bad8e669e..f3b577df54 100644
--- a/src/locale/no_NO/treatments.properties
+++ b/src/locale/no_NO/treatments.properties
@@ -18,12 +18,12 @@ workflow_email_subject=Spike behandlingskonfigurasjon
 default_colors_label=Bruk standard farger
 read_instructions_label=Les instruksjoner
 profile_menu_label=Profil
-display_treatments_on_chart_label=Display Treatments on Chart
-display_basals_on_chart_label=Display Basals on Chart
+display_treatments_on_chart_label=Vis behandlinger i diagrammet
+display_basals_on_chart_label=Vis basal i diagrammet
 display_iob_label=Vis IOB
 display_cob_label=Vis COB
 download_ns_treatments_label=Last ned NS behandlinger
-download_ns_basals_label=Download NS Basals
+download_ns_basals_label=Last ned NS basal
 insulin_marker_color_label=Insulin markørfarge
 carbs_marker_color_label=Karbo markørfarge
 bg_check_marker_color_label=BS sjekk markørfarge
@@ -119,17 +119,17 @@ treatment_name_pump_site_change=Pumpested
 treatment_name_pump_battery_change=Pumpebatteri
 non_numeric_duration=Varighet må være nummerisk\!
 exercise_duration_prompt=Varighet (minutter)
-treatment_name_temp_basal=Temp Basal
-treatment_name_temp_basal_start=Temp Basal Start
-treatment_name_temp_basal_end=Temp Basal End
+treatment_name_temp_basal=Midlertidig basal
+treatment_name_temp_basal_start=Midlertidig basal start
+treatment_name_temp_basal_end=Midlertidig basal slutt
 treatment_name_basal=Basal
-treatment_insulin_amount_relative_temp_basal_label=Amount (%)
-basal_amount_absolute_label=Absolute (U)
-basal_amount_absolute_prompt=Amount in Units
-basal_amount_relative_label=Relative (%)
-basal_amount_relative_prompt=Basal Change in %
-basal_amount_label=Amount
-basal_delivery_rate=Rate
-basal_units_per_hour=U/h
-basal_rate=Basal Rate
-delivered_basal=Delivered Basal
+treatment_insulin_amount_relative_temp_basal_label=Mengde (%)
+basal_amount_absolute_label=Absolutt (E)
+basal_amount_absolute_prompt=Mengde i enheter
+basal_amount_relative_label=Relativ (%)
+basal_amount_relative_prompt=Basal endring i %
+basal_amount_label=Mengde
+basal_delivery_rate=Sats
+basal_units_per_hour=E/t
+basal_rate=Basalsats
+delivered_basal=Levert basal
diff --git a/src/locale/no_NO/updateservice.properties b/src/locale/no_NO/updateservice.properties
index ec508cd3ea..e5f1975f25 100644
--- a/src/locale/no_NO/updateservice.properties
+++ b/src/locale/no_NO/updateservice.properties
@@ -6,4 +6,4 @@ update_dialog_download=Last ned
 update_dialog_remind_later=Påminn meg senere
 update_dialog_changelog=Endringslogg
 update_dialog_update_button_label=Oppdater
-changelog_request_message=Do you want to read the changelog of new features, enhancements and bug fixes available in this newly updated {app_version_do_not_translate_this_word} Spike version?
+changelog_request_message=Vil du lese endringsloggen med nye funksjoner, forbedringer og feilrettinger som kommer i denne oppdaterte {app_version_do_not_translate_this_word} Spike versjonen?
diff --git a/src/locale/no_NO/workflowsettingsscreen.properties b/src/locale/no_NO/workflowsettingsscreen.properties
index 332e50b805..83104a5387 100644
--- a/src/locale/no_NO/workflowsettingsscreen.properties
+++ b/src/locale/no_NO/workflowsettingsscreen.properties
@@ -1,7 +1,7 @@
-import_workflow=Import
-alarms_snoozer_workflow=Alarms Snoozer
-alarms_unsnoozer_workflow=Alarms Un-Snoozer
-readings_on_demand_workflow=Readings On-Demand
-workflow_instructions_title=Instructions
-workflow_instruction_body=Make sure you have the Workflow app (if using iOS 11 or lower) or the Shortcuts app (if using iOS 12 or higher) installed on your device. You can get it for free by searching the App Store.\n\nAfter the app is installed on your device, go to your Today View and add the Workflow/Shortcuts Today Widget. If you have an Apple Watch you can also run workflows directly from the watch as long as you install the correspondent app on it. You can do this directly from the Watch app on your device. \n\nTo configure both the Today Widget and Apple Watch press on any of the listed buttons on this screen and a popup will appear, select "Copy to Workflow" or "Copy to Shortcuts" (depending on what app you're installed), press on "Get Shortcut" if you're using Shortcuts (if you're using Workflow this step doesn't exist), then press "Done" on the upper right corner of the screen. The workflow will now be ready to use from your Today Widget / Apple Watch.
-workflow_instruction_apple_watch_disclaimer=Note\: If you're on iOS 12 and using the Shortcuts app, there's still no Apple Watch app available (only a Today Widget). Apple should release the Apple Watch app soon but, for now, it's only available on iOS 11 or lower.
+import_workflow=Importer
+alarms_snoozer_workflow=Alarm slumringer
+alarms_unsnoozer_workflow=Alarm slumrings-stopp
+readings_on_demand_workflow=Avlesning på kommando
+workflow_instructions_title=Instruksjoner
+workflow_instruction_body=Pass på at du har "Workflow" appen (hvis du bruker iOS 11 eller lavere) eller "Snarveier" appen (hvis du bruker iOS 12 eller høyere) installert på enheten. Du kan hente disse gratis ved å søke i AppStore.\n\nNår appen er installert på din enhet, går du til "I dag" visningen (sveip til høyre på hjem-skjermen) og legger til Workflow/Shortcut som Widget/Snarvei. Hvis du har en Apple Watch kan du også kjøre shortcuts på klokken, hvis du har tilsvarende app installert på den. Du kan legge til dette direkte i appen på klokken. \n\nFor å konfigurere både Today Widget og Apple Watch, trykk på en av de listede knappene på skjermen, og velg "Kopier til Workflow" eller "Kopier til snarveier" i popup-menyen, trykk på "Lag snarvei" hvis du bruker Snarveier (hvis du bruker Workflow finnes ikke dette trinnet), trykk så på "Ferdig" øverst til høyre. Denne skal nå være klar til bruk fra Today Widget / Apple Watch.
+workflow_instruction_apple_watch_disclaimer=Merk\: Hvis du bruker iOS 12 og Snarveier, er det foreløpig ingen Apple Watch app tilgjengelig (kun widget). Apple skal slippe Apple Watch Snarveier snart, men akkurat nå er den kun tilgjengelig på iOS 11 eller lavere.
diff --git a/src/locale/pl_PL/globaltranslations.properties b/src/locale/pl_PL/globaltranslations.properties
index f82fab7a1c..53d98731d6 100644
--- a/src/locale/pl_PL/globaltranslations.properties
+++ b/src/locale/pl_PL/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Wystąpił nieznany błąd podczas próby włączenia
 no_internet_connection_message=Twoje urządzenie nie jest połączone z Internetem. Do wysyłania wiadomości e-mail potrzebne jest aktywne połączenie internetowe.
 instructions_button_label=Instrukcja
 configure_button_label=Konfiguracja
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/pt_PT/globaltranslations.properties b/src/locale/pt_PT/globaltranslations.properties
index 31cb5fa9b4..b078dc700c 100644
--- a/src/locale/pt_PT/globaltranslations.properties
+++ b/src/locale/pt_PT/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Ocorreu um erro desconhecido ao tentar activar o aces
 no_internet_connection_message=O seu dispositivo não está conectado à internet. É necessária um ligação à internet para enviar e-mails.
 instructions_button_label=Instruções
 configure_button_label=Configurar
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/ru_RU/chartsettingsscreen.properties b/src/locale/ru_RU/chartsettingsscreen.properties
index 5f79fd79ec..3abaefc2d6 100644
--- a/src/locale/ru_RU/chartsettingsscreen.properties
+++ b/src/locale/ru_RU/chartsettingsscreen.properties
@@ -48,8 +48,8 @@ zt_glucose_predictions_label=BG ZT прогноз
 glucose_variability_label=Изменчивость глюкозы
 statistics_settings_title_master=Статистика
 statistics_settings_title_follower=Статистика за 24 ч
-temp_basal_area_color_title=Temp Basal Area
-basal_area_color_title=Basal Area
-basal_line_color_title=Basal Line
-basal_rate_line_color_title=Basal Rate Line
-basal_area_size_settings_label=Basal Area Size (Percentage Of Chart's Height)
+temp_basal_area_color_title=Временная зона базала
+basal_area_color_title=Зона базала
+basal_line_color_title=Линия базала
+basal_rate_line_color_title=Линия роста базала
+basal_area_size_settings_label=Размер зоны базала (в процентах от высоты графика)
diff --git a/src/locale/ru_RU/globaltranslations.properties b/src/locale/ru_RU/globaltranslations.properties
index 578f23b61d..9a66bf5648 100644
--- a/src/locale/ru_RU/globaltranslations.properties
+++ b/src/locale/ru_RU/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Неизвестная ошибка при попыт
 no_internet_connection_message=Нет подключения к интернету. Для отправки e-mail необходим доступ к интернету.
 instructions_button_label=Инструкции
 configure_button_label=Настроить
+revoke_guide_button_label=Показать руководство по Revoke Fix
diff --git a/src/locale/ru_RU/icloudservice.properties b/src/locale/ru_RU/icloudservice.properties
index a4a59a815e..5cfd57f019 100644
--- a/src/locale/ru_RU/icloudservice.properties
+++ b/src/locale/ru_RU/icloudservice.properties
@@ -1,3 +1,3 @@
 empty_icloud_database_label=Kопия базы данных в iCloud пуста\!
-non_optimal_backup_settings_warning_message=It is highly recommended that you set automatic iCloud backups to twice-daily in settings > maintenance. This will ensure that you will not lose your data if Apple revokes Spike's Enterprise Certificate and you need to reinstall Spike with a new certificate to be able to continue using the app.
-recent_icloud_backup_found_message=I've found a recent iCloud backup. Do you want me to restore all your previous settings and data from iCloud?
+non_optimal_backup_settings_warning_message=Настоятельно рекомендуется установить автоматическое создание резервных копий iCloud два раза в день в Настройках > Обслуживание. Это будет гарантировать, что вы не потеряете ваши данные, если Apple отзывает сертификат Spike, и вам нужно будет переустановить Spike с новым сертификатом, чтобы иметь возможность продолжить использование приложения.
+recent_icloud_backup_found_message=Обнаружена последняя резервная копия в iCloud. Вы хотите восстановить все ваши предыдущие настройки и данные из iCloud?
diff --git a/src/locale/ru_RU/iftttsettingsscreen.properties b/src/locale/ru_RU/iftttsettingsscreen.properties
index 244b9472ef..beeccaf4db 100644
--- a/src/locale/ru_RU/iftttsettingsscreen.properties
+++ b/src/locale/ru_RU/iftttsettingsscreen.properties
@@ -58,12 +58,12 @@ pump_battery_added_label=Батарея помпы добавлена
 pump_battery_updated_label=Батарея помпы обновлена
 pump_battery_deleted_label=Батарея помпы удалена
 glucose_thresholds_separated_by_events_label=Отделить события IFTTT для каждого порога глюкозы (очень высокий, высокий, в норме, низкий и очень низкий)
-temp_basal_start_added_label=Temp Basal Start Added
-temp_basal_start_updated_label=Temp Basal Start Updated
-temp_basal_start_deleted_label=Temp Basal Start Deleted
-temp_basal_end_added_label=Temp Basal End Added
-temp_basal_end_updated_label=Temp Basal End Updated
-temp_basal_end_deleted_label=Temp Basal End Deleted
-mdi_basal_added_label=Basal Added
-mdi_basal_updated_label=Basal Updated
-mdi_basal_deleted_label=Basal Deleted
+temp_basal_start_added_label=Добавлено начало действия базала
+temp_basal_start_updated_label=Обновлено начало действия базала
+temp_basal_start_deleted_label=Удалено начало действия базала
+temp_basal_end_added_label=Добавлено окончание действия базала
+temp_basal_end_updated_label=Обновлено окончание действия базала
+temp_basal_end_deleted_label=Удалено окончание действия базала
+mdi_basal_added_label=Базал добавлен
+mdi_basal_updated_label=Базал обновлен
+mdi_basal_deleted_label=Базал удален
diff --git a/src/locale/ru_RU/maintenancesettingsscreen.properties b/src/locale/ru_RU/maintenancesettingsscreen.properties
index 18adbb15a5..05da4aa311 100644
--- a/src/locale/ru_RU/maintenancesettingsscreen.properties
+++ b/src/locale/ru_RU/maintenancesettingsscreen.properties
@@ -17,7 +17,7 @@ no_network_connection=Нет подключения к интернету. Дл
 parse_settings_error=Ошибка чтения настроек. Повторите попытку.
 database_section_label=Сохр./восст. базы данных
 no_automatic_backup_label=Отключено
-twice_daily_backup_label=Twice-Daily
+twice_daily_backup_label=Дважды в день
 daily_backup_label=Ежедневно
 weekly_backup_label=Еженедельно
 monthly_backup_label=Ежемесячно
diff --git a/src/locale/ru_RU/pebblesettingsscreen.properties b/src/locale/ru_RU/pebblesettingsscreen.properties
index f573f62633..318ae7cc07 100644
--- a/src/locale/ru_RU/pebblesettingsscreen.properties
+++ b/src/locale/ru_RU/pebblesettingsscreen.properties
@@ -1,3 +1,3 @@
-get_pebble_app=Get
-pebble_instructions_title=Instructions
-pebble_instructions_body=Since Pebble has been discontinued, users need to migrate to the Rebble platform. Please head over to http\://rebble.io, create an account and follow instructions on how to connect you Pebble to Rebble.\n\nAfterwards, you will be able to use any of the above apps to add treatments to Spike directly from your watch. Be sure to install these apps directly from the Pebble app on your device. Configure the app to point to the following Nightscout URL address\: http\://127.0.0.1\:1979 (sometimes the app requires you to point it to http\://127.0.0.1\:1979/pebble).\n\nTo be able to see your glucose levels on your Pebble watch please follow the instructions listed on Spike settings > integration > internal HTTP server.
+get_pebble_app=Получить
+pebble_instructions_title=Инструкции
+pebble_instructions_body=Поскольку Pebble больше не выпускается, пользователям необходимо перейти на платформу Rebble. Пожалуйста, зайдите на http\://rebble.io, создайте учетную запись и следуйте инструкциям о том, как подключить вас Pebble к Rebble.\n\nПосле этого вы сможете использовать любое из вышеперечисленных приложений, чтобы добавлять процедуры в Spike прямо со своих часов. Обязательно установите эти приложения прямо из приложения Pebble на вашем устройстве. Настройте приложение так, чтобы оно указывало на следующий URL-адрес Nightscout\: http\://127.0.0.1\:1979 (иногда приложение требует, чтобы вы указали его на http\://127.0.0.1\:1979/pebble).\n\nЧтобы увидеть уровень глюкозы на часах Pebble, следуйте инструкциям, приведенным в разделе Настройки> «Интеграция»> «Внутренний HTTP-сервер».
diff --git a/src/locale/ru_RU/profilesettingsscreen.properties b/src/locale/ru_RU/profilesettingsscreen.properties
index 45a3e9be6e..377a8bcee9 100644
--- a/src/locale/ru_RU/profilesettingsscreen.properties
+++ b/src/locale/ru_RU/profilesettingsscreen.properties
@@ -58,17 +58,17 @@ insulin_curve_chart_x_label=Ось Х\: Время в минутах
 insulin_curve_chart_y_label=Ось Y\: Процент инсулина, использованный за минуту
 incomplete_profile_warning=Алгоритм OpenAPS (oref0) требует, чтобы вы установили ISF (коэффициент чувствительности к инсулину) и I\: C (отношение инсулина к углеводам).\n\nПожалуйста, прокрутите весь экран вниз на этом экране, установите соотношение ISF и I\: C (если у вас есть несколько профилей, будьте уверены, что вы установили их во все), а затем попробуйте снова выбрать алгоритм OpenAPS (oref0).
 duplicate_profile_label=Ошибка при создании профиля\! Найден существующий профиль с тем же временем начала.
-duplicate_basal_rate_label=Error creating basal rate\! Found existing basal rate with the same start time.
-basal_settings_section_label=Basals
-add_basal_rate_label=Add Basal Rate
-edit_basal_rate_label=Edit Basal Rate
-conflicting_basal_rate_label=Basal rate start time already in use. Please select a different time.
-delete_basal_rate_confirmation_label=Are you sure you want to delete this basal rate?\n\nThis can not be undone\!
-basal_rate_label=Rate
+duplicate_basal_rate_label=Ошибка при задании скорости базала. Найден базал с той же скоростью и тем же временем старта.
+basal_settings_section_label=Базалы
+add_basal_rate_label=Добавить шаг базала
+edit_basal_rate_label=Редактировать шаг базала
+conflicting_basal_rate_label=Время начала действия базала уже используется. Выберите другое время.
+delete_basal_rate_confirmation_label=Вы уверены, что хотите удалить скорость этого базала?\n\nЭто действие необратимо\!
+basal_rate_label=Скорость
 multiple_daily_injections_aka_pen_user_label=MDI/Pen User
-pump_user_label=Pump User
-basal_rates_title=Basal Rates (Units/Hour)
-user_type_section_title=User Type
-pump_or_pen_user_mode=Mode
-total_basal_rate_per_day=Total Daily
-nightscout_offset_user_notification_label=Spike has detected that the master is in a different time zone. Currently there''s a time differentce of {difference_in_hours_do_not_translate} hours between you and the master. This difference will be taken into account when rendering basal rates on the chart.
+pump_user_label=Пользователь помпы
+basal_rates_title=Скорость базала (Единиц в час)
+user_type_section_title=Тип пользователя
+pump_or_pen_user_mode=Режим
+total_basal_rate_per_day=Всего за день
+nightscout_offset_user_notification_label=Spike обнаружил, что мастер находится в другом часовом поясе. В настоящее время между вами и мастером существует разница во времени {difference_in_hours_do_not_translate} часов. Эта разница будет учтена при отображении базальных показателей на графике.
diff --git a/src/locale/ru_RU/sharesettingsscreen.properties b/src/locale/ru_RU/sharesettingsscreen.properties
index 9a9384d902..9242f4e21a 100644
--- a/src/locale/ru_RU/sharesettingsscreen.properties
+++ b/src/locale/ru_RU/sharesettingsscreen.properties
@@ -96,4 +96,4 @@ follower_invitation_in_app_instructions=В приложении Spike Follower 
 invite_followers_button_label=Пригласить последователя
 nightscout_follower_popup_body=Позволить последователю добавлять данные терапии в Nightscout и Spike?
 share_profile_with_follower_label=Синхронизировать профиль с последователем\: инсулины, ISF, I\:C, и т.д?
-scan_qr_code_button_label=Scan QR Code
+scan_qr_code_button_label=Отсканировать QR-код
diff --git a/src/locale/ru_RU/treatments.properties b/src/locale/ru_RU/treatments.properties
index 7d363c6c88..6eb2277362 100644
--- a/src/locale/ru_RU/treatments.properties
+++ b/src/locale/ru_RU/treatments.properties
@@ -18,12 +18,12 @@ workflow_email_subject=Настройка данных о лекарствах
 default_colors_label=Цвета по умолчанию
 read_instructions_label=Прочтите инструкции
 profile_menu_label=Профиль
-display_treatments_on_chart_label=Display Treatments on Chart
-display_basals_on_chart_label=Display Basals on Chart
+display_treatments_on_chart_label=Отображать терапию на графике
+display_basals_on_chart_label=Отображать базалы на графике
 display_iob_label=Отображать IOB
 display_cob_label=Отображать COB
 download_ns_treatments_label=Загрузить лекарства из Nightscout
-download_ns_basals_label=Download NS Basals
+download_ns_basals_label=Скачать NS Basals
 insulin_marker_color_label=Цвет маркера инсулина
 carbs_marker_color_label=Цвет маркера углеводов
 bg_check_marker_color_label=Цвет маркера проверки СК
@@ -119,17 +119,17 @@ treatment_name_pump_site_change=Положение помпы
 treatment_name_pump_battery_change=Батарея помпы
 non_numeric_duration=Длительность должна быть числовой\!
 exercise_duration_prompt=Длительность (минуты)
-treatment_name_temp_basal=Temp Basal
-treatment_name_temp_basal_start=Temp Basal Start
-treatment_name_temp_basal_end=Temp Basal End
-treatment_name_basal=Basal
-treatment_insulin_amount_relative_temp_basal_label=Amount (%)
-basal_amount_absolute_label=Absolute (U)
-basal_amount_absolute_prompt=Amount in Units
-basal_amount_relative_label=Relative (%)
-basal_amount_relative_prompt=Basal Change in %
-basal_amount_label=Amount
-basal_delivery_rate=Rate
-basal_units_per_hour=U/h
-basal_rate=Basal Rate
-delivered_basal=Delivered Basal
+treatment_name_temp_basal=Время базала
+treatment_name_temp_basal_start=Начало действия базала
+treatment_name_temp_basal_end=Окончание действия базала
+treatment_name_basal=Базал
+treatment_insulin_amount_relative_temp_basal_label=Кол-во (%)
+basal_amount_absolute_label=Количество (Ед)
+basal_amount_absolute_prompt=Количество в единицах
+basal_amount_relative_label=Относительно (%)
+basal_amount_relative_prompt=Изменение базала в %
+basal_amount_label=Кол-во
+basal_delivery_rate=Скорость
+basal_units_per_hour=Ед/ч
+basal_rate=Шаг базала
+delivered_basal=Веденный базал
diff --git a/src/locale/ru_RU/updateservice.properties b/src/locale/ru_RU/updateservice.properties
index 698d5d0a1a..b31236c1ad 100644
--- a/src/locale/ru_RU/updateservice.properties
+++ b/src/locale/ru_RU/updateservice.properties
@@ -6,4 +6,4 @@ update_dialog_download=Загрузить
 update_dialog_remind_later=Напомнить позже
 update_dialog_changelog=Список изменений
 update_dialog_update_button_label=Обновить
-changelog_request_message=Do you want to read the changelog of new features, enhancements and bug fixes available in this newly updated {app_version_do_not_translate_this_word} Spike version?
+changelog_request_message=Вы хотите прочитать список изменений новых функций, улучшений и исправлений ошибок, доступных в этой новой версии {app_version_do_not_translate_this_word} Spike?
diff --git a/src/locale/ru_RU/workflowsettingsscreen.properties b/src/locale/ru_RU/workflowsettingsscreen.properties
index d7ff4c7200..7a60e3e042 100644
--- a/src/locale/ru_RU/workflowsettingsscreen.properties
+++ b/src/locale/ru_RU/workflowsettingsscreen.properties
@@ -3,5 +3,5 @@ alarms_snoozer_workflow=Отложить будильник
 alarms_unsnoozer_workflow=Возобновить будильник
 readings_on_demand_workflow=Чтение по требованию
 workflow_instructions_title=Инструкции
-workflow_instruction_body=Make sure you have the Workflow app (if using iOS 11 or lower) or the Shortcuts app (if using iOS 12 or higher) installed on your device. You can get it for free by searching the App Store.\n\nAfter the app is installed on your device, go to your Today View and add the Workflow/Shortcuts Today Widget. If you have an Apple Watch you can also run workflows directly from the watch as long as you install the correspondent app on it. You can do this directly from the Watch app on your device. \n\nTo configure both the Today Widget and Apple Watch press on any of the listed buttons on this screen and a popup will appear, select "Copy to Workflow" or "Copy to Shortcuts" (depending on what app you're installed), press on "Get Shortcut" if you're using Shortcuts (if you're using Workflow this step doesn't exist), then press "Done" on the upper right corner of the screen. The workflow will now be ready to use from your Today Widget / Apple Watch.
-workflow_instruction_apple_watch_disclaimer=Note\: If you're on iOS 12 and using the Shortcuts app, there's still no Apple Watch app available (only a Today Widget). Apple should release the Apple Watch app soon but, for now, it's only available on iOS 11 or lower.
+workflow_instruction_body=Убедитесь, что на вашем устройстве установлено приложение Workflow (если используется iOS 11 или ниже) или приложение Shortcuts (если используется iOS 12 или выше). Вы можете получить его бесплатно, выполнив поиск в App Store.\n\nПосле того, как приложение установлено на вашем устройстве, перейдите в вид «Сегодня» и добавьте виджет «Workflow/Shortcuts». Если у вас есть Apple Watch, вы также можете запускать рабочие процессы непосредственно из часов, если на них установлено соответствующее приложение. Вы можете сделать это прямо из приложения Watch на вашем устройстве.\n\nЧтобы настроить виджет «Сегодня» и Apple Watch, нажмите любую из перечисленных кнопок на этом экране, и появится всплывающее окно, выберите «Копировать в Workflow» или «Копировать в Shortcuts» (в зависимости от того, какое приложение установлено), нажмите на «Получить Shortcuts», если вы используете Shortcuts (если вы используете Workflow, этот шаг не существует), затем нажмите «Готово» в правом верхнем углу экрана. Теперь рабочий процесс будет готов к использованию с вашего виджета Сегодня / Apple Watch.
+workflow_instruction_apple_watch_disclaimer=Примечание. Если вы используете iOS 12 и используете приложение Shortcuts, приложение Apple Watch по-прежнему недоступно (только виджет «Сегодня»). Apple должна выпустить приложение Apple Watch в ближайшее время, но пока оно доступно только на iOS 11 или ниже.
diff --git a/src/locale/sv_SE/globaltranslations.properties b/src/locale/sv_SE/globaltranslations.properties
index 525f3dd83c..d4d814dcff 100644
--- a/src/locale/sv_SE/globaltranslations.properties
+++ b/src/locale/sv_SE/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Ett okänt fel inträffade när åtkomst till kameran
 no_internet_connection_message=Din enhet har inte kontakt med Internet. Du behöver en aktiv Internetuppkoppling för att skicka e-post.
 instructions_button_label=Instruktioner
 configure_button_label=Konfigurera
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/tr_TR/globaltranslations.properties b/src/locale/tr_TR/globaltranslations.properties
index c116a41616..ee6a26bc1e 100644
--- a/src/locale/tr_TR/globaltranslations.properties
+++ b/src/locale/tr_TR/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=Kamera erişimi etkinleştirmeye çalışılırken bi
 no_internet_connection_message=Cihazınız İnternet'e bağlı değil. E-posta göndermek için aktif bir İnternet bağlantısına ihtiyacınız var.
 instructions_button_label=Talimatlar
 configure_button_label=Yapılandırma
+revoke_guide_button_label=Show Revoke Fix Guide
diff --git a/src/locale/tr_TR/profilesettingsscreen.properties b/src/locale/tr_TR/profilesettingsscreen.properties
index 7b204541e9..1d51381a4e 100644
--- a/src/locale/tr_TR/profilesettingsscreen.properties
+++ b/src/locale/tr_TR/profilesettingsscreen.properties
@@ -68,7 +68,7 @@ basal_rate_label=Rate
 multiple_daily_injections_aka_pen_user_label=MDI/Pen User
 pump_user_label=Pump User
 basal_rates_title=Basal Rates (Units/Hour)
-user_type_section_title=User Type
-pump_or_pen_user_mode=Mode
-total_basal_rate_per_day=Total Daily
+user_type_section_title=Kullanıcı Tipi
+pump_or_pen_user_mode=Mod
+total_basal_rate_per_day=Toplam Günlük
 nightscout_offset_user_notification_label=Spike has detected that the master is in a different time zone. Currently there''s a time differentce of {difference_in_hours_do_not_translate} hours between you and the master. This difference will be taken into account when rendering basal rates on the chart.
diff --git a/src/locale/tr_TR/sharesettingsscreen.properties b/src/locale/tr_TR/sharesettingsscreen.properties
index afedacdda4..01d2da70c9 100644
--- a/src/locale/tr_TR/sharesettingsscreen.properties
+++ b/src/locale/tr_TR/sharesettingsscreen.properties
@@ -96,4 +96,4 @@ follower_invitation_in_app_instructions=Spike takipçi uygulamasında, Ayarlar>
 invite_followers_button_label=Takipçileri Davet Et
 nightscout_follower_popup_body=Takipçinin Nightscout ve Spike 'a tedaviler eklemesine izin verilsin mi?
 share_profile_with_follower_label=Takipçi ile profili senkronize et\: İnsülin, IHF,I\:K vb?
-scan_qr_code_button_label=Scan QR Code
+scan_qr_code_button_label=QR Kodu Tara
diff --git a/src/locale/tr_TR/treatments.properties b/src/locale/tr_TR/treatments.properties
index 8951953efa..295aae4c38 100644
--- a/src/locale/tr_TR/treatments.properties
+++ b/src/locale/tr_TR/treatments.properties
@@ -18,7 +18,7 @@ workflow_email_subject=Spike Tedavileri Yapılandırması
 default_colors_label=Varsayılan Renkleri Yükle
 read_instructions_label=Talimatları Oku
 profile_menu_label=Profil
-display_treatments_on_chart_label=Display Treatments on Chart
+display_treatments_on_chart_label=Tedavileri Grafikte Görüntüle
 display_basals_on_chart_label=Display Basals on Chart
 display_iob_label=IOB Görüntüle
 display_cob_label=COB Görüntüle
diff --git a/src/locale/tr_TR/workflowsettingsscreen.properties b/src/locale/tr_TR/workflowsettingsscreen.properties
index 332e50b805..476d9bbfb5 100644
--- a/src/locale/tr_TR/workflowsettingsscreen.properties
+++ b/src/locale/tr_TR/workflowsettingsscreen.properties
@@ -1,7 +1,7 @@
-import_workflow=Import
-alarms_snoozer_workflow=Alarms Snoozer
-alarms_unsnoozer_workflow=Alarms Un-Snoozer
+import_workflow=İçeri Aktar
+alarms_snoozer_workflow=Alarm Ertele
+alarms_unsnoozer_workflow=Alarm Erteleme İptali
 readings_on_demand_workflow=Readings On-Demand
-workflow_instructions_title=Instructions
+workflow_instructions_title=Talimatlar
 workflow_instruction_body=Make sure you have the Workflow app (if using iOS 11 or lower) or the Shortcuts app (if using iOS 12 or higher) installed on your device. You can get it for free by searching the App Store.\n\nAfter the app is installed on your device, go to your Today View and add the Workflow/Shortcuts Today Widget. If you have an Apple Watch you can also run workflows directly from the watch as long as you install the correspondent app on it. You can do this directly from the Watch app on your device. \n\nTo configure both the Today Widget and Apple Watch press on any of the listed buttons on this screen and a popup will appear, select "Copy to Workflow" or "Copy to Shortcuts" (depending on what app you're installed), press on "Get Shortcut" if you're using Shortcuts (if you're using Workflow this step doesn't exist), then press "Done" on the upper right corner of the screen. The workflow will now be ready to use from your Today Widget / Apple Watch.
 workflow_instruction_apple_watch_disclaimer=Note\: If you're on iOS 12 and using the Shortcuts app, there's still no Apple Watch app available (only a Today Widget). Apple should release the Apple Watch app soon but, for now, it's only available on iOS 11 or lower.
diff --git a/src/locale/zh_CN/chartsettingsscreen.properties b/src/locale/zh_CN/chartsettingsscreen.properties
index c3297c62a1..d418e147ca 100644
--- a/src/locale/zh_CN/chartsettingsscreen.properties
+++ b/src/locale/zh_CN/chartsettingsscreen.properties
@@ -51,5 +51,5 @@ statistics_settings_title_follower=24小时统计数据
 temp_basal_area_color_title=临时基础率区域
 basal_area_color_title=基础率区域
 basal_line_color_title=基础率线
-basal_rate_line_color_title=Basal Rate Line
+basal_rate_line_color_title=基础率线
 basal_area_size_settings_label=基础率区域大小（图表高度百分比）
diff --git a/src/locale/zh_CN/globaltranslations.properties b/src/locale/zh_CN/globaltranslations.properties
index 1939946783..afd00b0582 100644
--- a/src/locale/zh_CN/globaltranslations.properties
+++ b/src/locale/zh_CN/globaltranslations.properties
@@ -44,3 +44,4 @@ camera_access_unknow_error=尝试启用对照相机的访问时发生未知错
 no_internet_connection_message=你的设备未联网，你需要联网后才能通过电子邮件提交问题报告
 instructions_button_label=说明
 configure_button_label=配置
+revoke_guide_button_label=显示撤销修复指南
diff --git a/src/locale/zh_CN/icloudservice.properties b/src/locale/zh_CN/icloudservice.properties
index 7f92d56ad1..3ea8f41f9e 100644
--- a/src/locale/zh_CN/icloudservice.properties
+++ b/src/locale/zh_CN/icloudservice.properties
@@ -1,3 +1,3 @@
 empty_icloud_database_label=数据库的 iCloud 副本为空\!
-non_optimal_backup_settings_warning_message=It is highly recommended that you set automatic iCloud backups to twice-daily in settings > maintenance. This will ensure that you will not lose your data if Apple revokes Spike's Enterprise Certificate and you need to reinstall Spike with a new certificate to be able to continue using the app.
-recent_icloud_backup_found_message=I've found a recent iCloud backup. Do you want me to restore all your previous settings and data from iCloud?
+non_optimal_backup_settings_warning_message=强烈建议您在设置-维持里设置每天两次自动云备份。如果苹果撤销了spike的证书并且您需要重新安装有着新证书的spike时，这将会保证您不会丢失数据。
+recent_icloud_backup_found_message=我发现了最近的iCloud备份，您想要恢复以前所有的设置和数据吗？
diff --git a/src/locale/zh_CN/maintenancesettingsscreen.properties b/src/locale/zh_CN/maintenancesettingsscreen.properties
index 7648dad205..b6e521594b 100644
--- a/src/locale/zh_CN/maintenancesettingsscreen.properties
+++ b/src/locale/zh_CN/maintenancesettingsscreen.properties
@@ -17,7 +17,7 @@ no_network_connection=您的设备未连接网。您需要一个可用的 Intern
 parse_settings_error=分析设置时出错\! 再试一次。
 database_section_label=数据库备份/恢复
 no_automatic_backup_label=禁用
-twice_daily_backup_label=Twice-Daily
+twice_daily_backup_label=每天两次
 daily_backup_label=每天
 weekly_backup_label=每周一次
 monthly_backup_label=每月一次
diff --git a/src/locale/zh_CN/pebblesettingsscreen.properties b/src/locale/zh_CN/pebblesettingsscreen.properties
index f573f62633..ca8acc4c20 100644
--- a/src/locale/zh_CN/pebblesettingsscreen.properties
+++ b/src/locale/zh_CN/pebblesettingsscreen.properties
@@ -1,3 +1,3 @@
-get_pebble_app=Get
-pebble_instructions_title=Instructions
-pebble_instructions_body=Since Pebble has been discontinued, users need to migrate to the Rebble platform. Please head over to http\://rebble.io, create an account and follow instructions on how to connect you Pebble to Rebble.\n\nAfterwards, you will be able to use any of the above apps to add treatments to Spike directly from your watch. Be sure to install these apps directly from the Pebble app on your device. Configure the app to point to the following Nightscout URL address\: http\://127.0.0.1\:1979 (sometimes the app requires you to point it to http\://127.0.0.1\:1979/pebble).\n\nTo be able to see your glucose levels on your Pebble watch please follow the instructions listed on Spike settings > integration > internal HTTP server.
+get_pebble_app=获取
+pebble_instructions_title=说明
+pebble_instructions_body=由于pebble已经停止使用，用户需要迁移到rebble平台。请前往http\://rebble.io创建一个账户并且按照指示将pebble和rebble连接起来。\n\n然后，您将可以使用一下任何一个app直接从手表向spike添加治疗方案。确保从pebble app平台下载这些app到您的设备上。将应用配置为指向以下nightscoutURL地址：http\://127.0.0.1\:1979（有时应用会要求您指向http\://127.0.0.1\:1979/pebble）\n\n为了能够在pebble手表上看见您的血糖水平，请遵循spike设置-整合-内部HTTP服务器上列出的说明。
diff --git a/src/locale/zh_CN/profilesettingsscreen.properties b/src/locale/zh_CN/profilesettingsscreen.properties
index 9938634edc..445b94076e 100644
--- a/src/locale/zh_CN/profilesettingsscreen.properties
+++ b/src/locale/zh_CN/profilesettingsscreen.properties
@@ -58,17 +58,17 @@ insulin_curve_chart_x_label=X轴：分钟为单位的时间
 insulin_curve_chart_y_label=Y轴：每分钟使用胰岛素的百分比
 incomplete_profile_warning=闭环算法需要您设置胰岛素敏感系数和碳水化合物系数。\n\n请在这个屏幕向下滑动，设置您的胰岛素敏感系数和碳水化合物系数（如果您有多个配置文件，请确保在每一个配置文件中都进行设置），然后尝试再次选择闭环算法。
 duplicate_profile_label=创建配置文件时出错！发现具有相同开始时间的现存配置文件！
-duplicate_basal_rate_label=Error creating basal rate\! Found existing basal rate with the same start time.
-basal_settings_section_label=Basals
-add_basal_rate_label=Add Basal Rate
-edit_basal_rate_label=Edit Basal Rate
-conflicting_basal_rate_label=Basal rate start time already in use. Please select a different time.
-delete_basal_rate_confirmation_label=Are you sure you want to delete this basal rate?\n\nThis can not be undone\!
-basal_rate_label=Rate
-multiple_daily_injections_aka_pen_user_label=MDI/Pen User
-pump_user_label=Pump User
-basal_rates_title=Basal Rates (Units/Hour)
-user_type_section_title=User Type
-pump_or_pen_user_mode=Mode
-total_basal_rate_per_day=Total Daily
-nightscout_offset_user_notification_label=Spike has detected that the master is in a different time zone. Currently there''s a time differentce of {difference_in_hours_do_not_translate} hours between you and the master. This difference will be taken into account when rendering basal rates on the chart.
+duplicate_basal_rate_label=创建基础率时出错！发现具有相同开始时间的基础率。
+basal_settings_section_label=基础率
+add_basal_rate_label=增加基础率
+edit_basal_rate_label=编辑基础率
+conflicting_basal_rate_label=基础率开始时间已经在使用中。请使用一个不同的时间。
+delete_basal_rate_confirmation_label=您确定要删除这个基础率吗？\n\n此操作无法还原！
+basal_rate_label=率
+multiple_daily_injections_aka_pen_user_label=MDI/笔的用户
+pump_user_label=泵的用户
+basal_rates_title=基础率（单位/小时）
+user_type_section_title=用户类型
+pump_or_pen_user_mode=模式
+total_basal_rate_per_day=当日总量
+nightscout_offset_user_notification_label=Spike监测到主机处于不同的时区。目前您与主机之间的时间差为 {difference_in_hours_do_not_translate}。在图表上显示基础率时，会考虑到这个差异。
diff --git a/src/locale/zh_CN/sharesettingsscreen.properties b/src/locale/zh_CN/sharesettingsscreen.properties
index 99484931c0..e2f7bd87eb 100644
--- a/src/locale/zh_CN/sharesettingsscreen.properties
+++ b/src/locale/zh_CN/sharesettingsscreen.properties
@@ -96,4 +96,4 @@ follower_invitation_in_app_instructions=在Spike 共享者app, 进入设置-通
 invite_followers_button_label=邀请关注者
 nightscout_follower_popup_body=是否允许关注者给nightscout 和 spike用户增加治疗？
 share_profile_with_follower_label=是否向关注者同步配置文件：胰岛素，胰岛素敏感因子等？
-scan_qr_code_button_label=Scan QR Code
+scan_qr_code_button_label=扫描二维码
diff --git a/src/locale/zh_CN/treatments.properties b/src/locale/zh_CN/treatments.properties
index 1d9536539a..72cf476687 100644
--- a/src/locale/zh_CN/treatments.properties
+++ b/src/locale/zh_CN/treatments.properties
@@ -18,12 +18,12 @@ workflow_email_subject=Spike 治疗配置
 default_colors_label=加载默认颜色
 read_instructions_label=阅读说明
 profile_menu_label=配置文件
-display_treatments_on_chart_label=Display Treatments on Chart
-display_basals_on_chart_label=Display Basals on Chart
+display_treatments_on_chart_label=在图表上显示治疗方案。
+display_basals_on_chart_label=在图表上显示基础率
 display_iob_label=显示活性胰岛素
 display_cob_label=显示活性碳水化合物
 download_ns_treatments_label=下载Nightscout治疗数据
-download_ns_basals_label=Download NS Basals
+download_ns_basals_label=下载NS基础率
 insulin_marker_color_label=胰岛素标记颜色
 carbs_marker_color_label=碳水化合物标记颜色
 bg_check_marker_color_label=指血检查标记颜色
@@ -119,17 +119,17 @@ treatment_name_pump_site_change=泵管路
 treatment_name_pump_battery_change=泵电池
 non_numeric_duration=持续时间必须是数字！
 exercise_duration_prompt=持续时间（分钟）
-treatment_name_temp_basal=Temp Basal
-treatment_name_temp_basal_start=Temp Basal Start
-treatment_name_temp_basal_end=Temp Basal End
-treatment_name_basal=Basal
-treatment_insulin_amount_relative_temp_basal_label=Amount (%)
-basal_amount_absolute_label=Absolute (U)
-basal_amount_absolute_prompt=Amount in Units
-basal_amount_relative_label=Relative (%)
-basal_amount_relative_prompt=Basal Change in %
-basal_amount_label=Amount
-basal_delivery_rate=Rate
-basal_units_per_hour=U/h
-basal_rate=Basal Rate
-delivered_basal=Delivered Basal
+treatment_name_temp_basal=临时基础率
+treatment_name_temp_basal_start=临时基础率开始
+treatment_name_temp_basal_end=临时基础率结束
+treatment_name_basal=基础率
+treatment_insulin_amount_relative_temp_basal_label=相对数量（百分比）
+basal_amount_absolute_label=绝对数值（单位）
+basal_amount_absolute_prompt=以药量为单位
+basal_amount_relative_label=相对（百分比）
+basal_amount_relative_prompt=以百分比改变基础率
+basal_amount_label=量
+basal_delivery_rate=率
+basal_units_per_hour=单位/小时
+basal_rate=基础率
+delivered_basal=已输入的基础率
diff --git a/src/locale/zh_CN/updateservice.properties b/src/locale/zh_CN/updateservice.properties
index 6bc06e2739..ffb77099a3 100644
--- a/src/locale/zh_CN/updateservice.properties
+++ b/src/locale/zh_CN/updateservice.properties
@@ -6,4 +6,4 @@ update_dialog_download=下载
 update_dialog_remind_later=以后提醒
 update_dialog_changelog=更新日志
 update_dialog_update_button_label=更新
-changelog_request_message=Do you want to read the changelog of new features, enhancements and bug fixes available in this newly updated {app_version_do_not_translate_this_word} Spike version?
+changelog_request_message=您想阅读这个新更新的 {app_version_do_not_translate_this_word} spike 版本中提供的新功能、增强功能和错误修复的更改日志吗？
diff --git a/src/locale/zh_CN/workflowsettingsscreen.properties b/src/locale/zh_CN/workflowsettingsscreen.properties
index 332e50b805..68db89d9ac 100644
--- a/src/locale/zh_CN/workflowsettingsscreen.properties
+++ b/src/locale/zh_CN/workflowsettingsscreen.properties
@@ -1,7 +1,7 @@
-import_workflow=Import
-alarms_snoozer_workflow=Alarms Snoozer
-alarms_unsnoozer_workflow=Alarms Un-Snoozer
-readings_on_demand_workflow=Readings On-Demand
-workflow_instructions_title=Instructions
-workflow_instruction_body=Make sure you have the Workflow app (if using iOS 11 or lower) or the Shortcuts app (if using iOS 12 or higher) installed on your device. You can get it for free by searching the App Store.\n\nAfter the app is installed on your device, go to your Today View and add the Workflow/Shortcuts Today Widget. If you have an Apple Watch you can also run workflows directly from the watch as long as you install the correspondent app on it. You can do this directly from the Watch app on your device. \n\nTo configure both the Today Widget and Apple Watch press on any of the listed buttons on this screen and a popup will appear, select "Copy to Workflow" or "Copy to Shortcuts" (depending on what app you're installed), press on "Get Shortcut" if you're using Shortcuts (if you're using Workflow this step doesn't exist), then press "Done" on the upper right corner of the screen. The workflow will now be ready to use from your Today Widget / Apple Watch.
-workflow_instruction_apple_watch_disclaimer=Note\: If you're on iOS 12 and using the Shortcuts app, there's still no Apple Watch app available (only a Today Widget). Apple should release the Apple Watch app soon but, for now, it's only available on iOS 11 or lower.
+import_workflow=导入
+alarms_snoozer_workflow=警报提示
+alarms_unsnoozer_workflow=警报无提醒
+readings_on_demand_workflow=按需阅读
+workflow_instructions_title=说明
+workflow_instruction_body=确保您的设备上安装了工作流应用 (如果使用 iOS 11 或更低版本) 或快捷方式应用 (如果使用 iOS 12 或更高版本)。您可以通过搜索应用商店免费获得它。\n\n在您的设备上安装应用程序后, 转到您的 "今天视图" 并添加 "今天小工具" 的工作流快捷方式。如果您有 Apple Watch, 只要在手表上安装相应的应用, 您也可以直接从手表上运行工作流。您可以直接从设备上的 "监视" 应用执行此操作。 \n\n要在此屏幕上的任何列出的按钮上配置 "今日小部件" 和 "apple Watch" 按钮, 并将出现弹出窗口, 请选择 "复制到工作流" 或 "复制到快捷方式" (具体取决于您安装的应用), 如果您正在使用 "获取快捷方式", 请按 "获取快捷方式"快捷方式 (如果您使用的是工作流, 则此步骤不存在), 然后按屏幕右上角的 "完成"。工作流程现在可以从您的今日小工具/苹果手表中使用了。
+workflow_instruction_apple_watch_disclaimer=注意：如果您在ios 12上使用快捷方式应用，依旧无法使用apple watch应用（仅限今天小部件）。苹果将会发布手表应用，但现在只能在ios11或更低版本上使用