diff --git a/README.md b/README.md
index 145b0886..c8cf5b21 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,17 @@ MediTrak is an Android application designed to make it easier for users to keep
 
 ## Languages
 
- - English (default)
- - German by [uDEV2019](https://github.com/uDEV2019)
- - Spanish by [zaovb](https://github.com/zaovb)
+ - English
+ - German by [uDEV2019](https://github.com/uDEV2019)<sup>1,2</sup>
+ - Spanish by [zaovb](https://github.com/zaovb)<sup>1,3</sup>
+ - Italian<sup>4</sup>
+
+<div style="font-size: 0.8em;">
+1. Translated by native speaker.<br>
+2. Additional translations provided by non-native speaker through a machine translator.<br>
+3. Additional translations provided by non-native speaker.<br>
+4. Translated by a non-native speaker.
+</div>
 
 ## Building the App
 
diff --git a/app/build.gradle b/app/build.gradle
index 253f8c1f..ea688bd4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,12 +13,12 @@ android {
     defaultConfig {
         applicationId "projects.medicationtracker"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
         compileSdk 34
 
         versionCode 26
         versionName "0.12.7"
-        resourceConfigurations += ['en', 'de', 'es']
+        resourceConfigurations += ['en', 'de', 'es', 'it']
 
 
         ndk {
diff --git a/app/src/main/java/projects/medicationtracker/AddMedication.java b/app/src/main/java/projects/medicationtracker/AddMedication.java
index 55ece87b..378538a5 100644
--- a/app/src/main/java/projects/medicationtracker/AddMedication.java
+++ b/app/src/main/java/projects/medicationtracker/AddMedication.java
@@ -1502,7 +1502,7 @@ private String createChangesNote(Medication child, Medication parent) {
         }
 
         if (medication.getInstructions() != null && !medication.getInstructions().isEmpty()) {
-            note += getString(R.string.instrucations_added, medication.getInstructions());
+            note += getString(R.string.instructions_added, medication.getInstructions());
         }
 
         return note;
diff --git a/app/src/main/java/projects/medicationtracker/Helpers/DBHelper.java b/app/src/main/java/projects/medicationtracker/Helpers/DBHelper.java
index fd21b55c..2d0b8737 100644
--- a/app/src/main/java/projects/medicationtracker/Helpers/DBHelper.java
+++ b/app/src/main/java/projects/medicationtracker/Helpers/DBHelper.java
@@ -88,6 +88,13 @@ public static class DateFormats {
         public static final String DD_MM_YYYY = "dd/MM/yyyy";
     }
 
+    public static class Languages {
+        public static final String ENGLISH = "en";
+        public static final String GERMAN = "de";
+        public static final String SPANISH = "es";
+        public static final String ITALIAN = "it";
+    }
+
     private NativeDbHelper nativeHelper;
 
     public DBHelper(@Nullable Context context) {
diff --git a/app/src/main/java/projects/medicationtracker/Settings.java b/app/src/main/java/projects/medicationtracker/Settings.java
index dbefed2c..39e380ad 100644
--- a/app/src/main/java/projects/medicationtracker/Settings.java
+++ b/app/src/main/java/projects/medicationtracker/Settings.java
@@ -12,6 +12,7 @@
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
@@ -33,6 +34,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.os.LocaleListCompat;
 
 import com.google.android.material.textfield.MaterialAutoCompleteTextView;
 
@@ -92,6 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setThemeMenu();
         setDateFormatMenu();
         setTimeFormatMenu();
+        setLanguageMenu();
 
         chooseFileLauncher = registerForActivityResult(
                 new ActivityResultContracts.StartActivityForResult(),
@@ -381,6 +384,72 @@ private void setTimeFormatMenu() {
         });
     }
 
+    /**
+     * Creates menu allow language change
+     */
+    private void setLanguageMenu() {
+        MaterialAutoCompleteTextView langSelector = findViewById(R.id.language_selector);
+        String[] langOpts = { "Deutsch", "English", "Español", "Italiano" };
+        String[] langCodes = {"de", "en", "es", "it"};
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(
+            this,
+            android.R.layout.simple_dropdown_item_1line,
+            langOpts
+        );
+
+        Configuration config = getResources().getConfiguration();
+
+        langSelector.setAdapter(adapter);
+
+        String langCode = config.getLocales().get(0).getLanguage();
+
+        switch (langCode) {
+            case "de":
+                langSelector.setText(langOpts[0], false);
+                break;
+            case "en":
+            default:
+                langSelector.setText(langOpts[1], false);
+                break;
+            case "es":
+                langSelector.setText(langOpts[2], false);
+                break;
+            case "it":
+                langSelector.setText(langOpts[3], false);
+                break;
+        }
+
+        langSelector.setOnItemClickListener((parent, view, position, id) -> {
+            LocaleListCompat locale = LocaleListCompat.forLanguageTags(langCodes[position]);
+            AppCompatDelegate.setApplicationLocales(locale);
+
+            langSelector.clearFocus();
+        });
+
+        langSelector.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                setThemeMenu();
+                setTimeFormatMenu();
+                setDateFormatMenu();
+
+                langSelector.setAdapter(
+                    new ArrayAdapter<>(
+                        langSelector.getContext(),
+                        android.R.layout.simple_dropdown_item_1line,
+                        langOpts
+                    )
+                );
+            }
+        });
+    }
+
     /**
      * Creates array adapter for themes selector
      * @return ArrayAdapter of theme options
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index eb1520c8..bea1feea 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -141,6 +141,22 @@
                             android:inputType="none" />
                     </com.google.android.material.textfield.TextInputLayout>
 
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="15dp"
+                        android:hint="@string/language"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu">
+
+                        <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                            android:id="@+id/language_selector"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
                     <Button
                         android:id="@+id/enableNotifications"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6bed2176..d9ff9998 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -120,31 +120,21 @@
     <string name="taken_at">Eingenommen um</string>
     <string name="unit_of_time">Zeiteinheit</string>
     <string name="custom_frequency">Benutzerdefinierte Häufigkeit</string>
-    <string name="at_n_n_tap_to_set_time">Hier tippen, um die Uhrzeit einzustellen</string>
     <string name="times_per_day">Zeiten pro Tag</string>
-    <string name="atThisTime">Hier tippen, um die Uhrzeit einzustellen</string>
     <string name="starting">Beginnend:</string>
     <string name="alias_for_medication">Alias für Medikamente</string>
-    <string name="alias_for_medication_displays_notification">Alias für Medikamentenbenachrichtigung</string>
-    <string name="medication_alias_displays_in_notification">Medikamentenalias wird in der Benachrichtigung angezeigt</string>
-    <string name="place_holder_tap_again_then_hit_cancel">PPlatzhalter, tippen Sie erneut und klicken Sie dann auf Abbrechen</string>
     <string name="yourMedications">Deine Medikamente:</string>
     <string name="no_notes_for_this_medication">Für dieses Medikament liegen keine Hinweise vor</string>
     <string name="unitExample">z.B. mg, g, Tropfen</string>
     <string name="patient_name">Patientenname:</string>
     <string name="no_alias">Keine Aliase</string>
-    <string name="tap_to_set_date">Tippen, um das Datum einzustellen</string>
     <string name="at">Um:</string>
-    <string name="tap_to_set_time">Tippen, um die Zeit einzustellen</string>
     <string name="apply_retroactive">Änderungen rückwirkend anwenden</string>
     <string name="retroactive_warning">Warnung: Änderungen der Häufigkeit können dazu führen, dass zuvor eingenommene Dosen nicht mehr im Zeitplan sichtbar sind.</string>
     <string name="would_like_apply_retroactively">Änderungen der Dosierung und Häufigkeit können rückwirkend ab der vorherigen Änderung angewendet werden. Möchten Sie diese Änderungen rückwirkend anwenden?</string>
-    <string name="apply_changes_as_of">Änderungen übernehmen ab:</string>
-    <string name="from_med_last_change">Letzte Bearbeitung</string>
-    <string name="from_med_start">Beginn der Medikamenteneinnahme</string>
     <string name="instructions">Anweisungen</string>
     <string name="instructions_optional">Anweisungen (Optional)</string>
-    <string name="instrucations_added">Zusätzliche Anweisungen: %1$s</string>
+    <string name="instructions_added">Zusätzliche Anweisungen: %1$s</string>
 
     <!-- MyMedications -->
     <string name="my_medications">Meine Medikamente</string>
@@ -155,7 +145,6 @@
     <string name="alias_lbl">Alias</string>
     <string name="taken_since">Eingenommen, seit: %1$s</string>
     <string name="taken_as_needed">Nach Bedarf eingenommen.</string>
-    <string name="all_previous_edits_overridden">Alle vorherigen Änderungen wurden überschrieben.</string>
 
     <!-- Notes -->
     <string name="notes">Notizen</string>
@@ -177,14 +166,12 @@
 
         Dieses Programm wird in der Hoffnung verbreitet, dass es nützlich sein wird,
         aber OHNE JEGLICHE GARANTIE; ohne die stillschweigende Garantie von
-
         MARKTGÄNGIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. Siehe die
-        weiteren Informationen zur GNU General Public License
+        weiteren Informationen zur GNU General Public License.
     </string>
     <string name="copyOfGPL2">
         Sie sollten eine Kopie der GNU General Public License erhalten haben
-        zusammen mit diesem Programm; Wenn nicht, schreiben Sie an die Free Software
-        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+        zusammen mit diesem Programm; Wenn nicht, siehe https://www.gnu.org/licenses/.
     </string>
     <string name="cannot_take_medication_more_than">Kann Medikamente nicht mehr einnehmen als</string>
     <string name="hours_in_advance">Stunden im Voraus</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 57cdb3d1..4b088055 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -72,7 +72,7 @@
         proporcionar asesoramiento médico y ninguna información proporcionada por esta aplicación debe ser malinterpretada
         como tal. Los creadores de esta aplicación no se responsabilizan por ninguna
         dosis perdida de sus medicamentos bajo ningún motivo. Si necesita asistencia médica, póngase en contacto con un médico profesional.
-        Al utilizar esta aplicación, usted acepta los términos antes mencionados, así como los de la licencia GPL2 bajo 
+        Al utilizar esta aplicación, usted acepta los términos antes mencionados, así como los de la licencia GPL versión 2.0 bajo
         la que se publica. \n\n
 
         Esta aplicación está publicada bajo la Licencia Pública GNU Versión 2, ver más abajo para más detalles:
@@ -108,7 +108,7 @@
     <string name="daily">Diario</string>
     <string name="weekly">Semanal</string>
     <string name="monthly">Mensual</string>
-    <string name="medication_name_amp_dosage"><![CDATA[Nombre del medicamento y dosis]]></string>
+    <string name="medication_name_amp_dosage"><![CDATA[Nombre y dosis del medicamento]]></string>
     <string name="who_takes_this_medication">¿Quién toma este medicamento?</string>
     <string name="someone_else">Alguien más</string>
     <string name="what_is_the_medication_s_name_amp_how_much_is_taken"><![CDATA[¿Cuál es el nombre del medicamento y cuánto se toma?]]></string>
@@ -118,31 +118,21 @@
     <string name="taken_at">Tomado a las</string>
     <string name="unit_of_time">Unidad de tiempo</string>
     <string name="custom_frequency">Frecuencia personalizada</string>
-    <string name="at_n_n_tap_to_set_time">A las: \n\n Presione para ajustar la hora</string>
     <string name="times_per_day">Veces por día</string>
-    <string name="atThisTime">A las: Presione para ajustar la hora</string>
     <string name="starting">Inicio:</string>
     <string name="alias_for_medication">Alias para el medicamento</string>
-    <string name="alias_for_medication_displays_notification">Alias para la notifiación de medicamentos</string>
-    <string name="medication_alias_displays_in_notification">Alias del medicamento que aparece en la notificación</string>
-    <string name="place_holder_tap_again_then_hit_cancel">Coloca el marcador, toca de nuevo y luego presiona cancelar</string>
     <string name="yourMedications">Tus medicamentos:</string>
     <string name="no_notes_for_this_medication">Notas para este medicamento</string>
     <string name="unitExample">P. Ej. mg, g, gotas</string>
     <string name="patient_name">Nombre del paciente:</string>
     <string name="no_alias">Sin alias</string>
-    <string name="tap_to_set_date">Toca para establecer la fecha</string>
     <string name="at">A las:</string>
-    <string name="tap_to_set_time">Toca para establecer la hora</string>
     <string name="apply_retroactive">Aplicar cambios retroactivamente</string>
     <string name="retroactive_warning">Atención: Los cambios en la frecuencia pueden hacer que las dosis tomadas anteriormente ya no sean visibles en el horario.</string>
     <string name="would_like_apply_retroactively">Los cambios de dosis y frecuencia pueden aplicarse retroactivamente a partir del cambio anterior. ¿Desea aplicar estos cambios retroactivamente?</string>
-    <string name="apply_changes_as_of">Aplicar los cambios a partir de:</string>
-    <string name="from_med_last_change">Último cambio</string>
-    <string name="from_med_start">Inicio de medicación</string>
     <string name="instructions">Instrucciones</string>
     <string name="instructions_optional">Instrucciones (Opcional)</string>
-    <string name="instrucations_added">Instrucciones añadidas: %1$s</string>
+    <string name="instructions_added">Instrucciones añadidas: %1$s</string>
 
     <!-- MyMedications -->
     <string name="my_medications">Mis medicamentos</string>
@@ -153,7 +143,6 @@
     <string name="alias_lbl">Alias</string>
     <string name="taken_since">Tomado desde: %1$s</string>
     <string name="taken_as_needed">Tomado según necesidad.</string>
-    <string name="all_previous_edits_overridden">Anulados todos los cambios anteriores.</string>
 
     <!-- Notes -->
     <string name="notes">Notas</string>
@@ -166,7 +155,7 @@
     <string name="license">Licencia</string>
     <string name="purpose">MediTrak es una aplicación gratuita, libre y de código abierto diseñada para ayudarte a llevar un registro de tus medicamentos, para que puedas responder más fácilmente a la pregunta \"¿tomé mi medicamento ayer?\"</string>
     <string name="copyright">Copyright © 2022 Adam Guidarini</string>
-    <string name="licenseInfo">MediTrak es software libre y puede ser redistribuido y/o modificado bajo los términos de la Licencia Pública General de GNU publicada por la Free software foundation, ya sea la versión 2 o (a su elección) posterior.</string>
+    <string name="licenseInfo">MediTrak es software libre y puede ser redistribuido y/o modificado bajo los términos de la Licencia Pública General de GNU publicada por la Free Software Foundation, ya sea la versión 2 o (a su elección) posterior.</string>
     <string name="warranty">
         Este programa es de software libre; puede redistribuirlo y/o
         modificarlo bajo los términos de la Licencia Pública General de GNU
@@ -175,16 +164,14 @@
 
         Este programa se distribuye con la esperanza de que sea útil,
         pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de
-
         COMERCIABILIDAD o IDONEIDAD PARA UN PROPÓSITO PARTICULAR.  Consulte la
-        Licencia Pública General GNU para más detalles
+        Licencia Pública General GNU para más detalles.
     </string>
     <string name="copyOfGPL2">
         Debería haber recibido una copia de la Licencia Pública General de GNU
-        junto con este programa; si no es así, escriba a la Free Software 
-        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+        junto con este programa; si no es así, vea https://www.gnu.org/licenses/.
     </string>
-    <string name="cannot_take_medication_more_than">Ya no puede tomar el medicamento</string>
+    <string name="cannot_take_medication_more_than">No puede tomar el medicamento más de</string>
     <string name="hours_in_advance">horas de antelación</string>
     <string name="title_activity_settings">Configuración</string>
     <string name="delete_all">Eliminar todo</string>
@@ -239,7 +226,7 @@
     <string name="mark_as_taken">Tomado</string>
     <string name="snooze_message">Posponer</string>
     <string name="its_time_your_med">Es hora de tomar tu %1$s de %2$s</string>
-    <string name="time_for_other_med">Es la hora de %1$s de %2$s de %3$s</string>
+    <string name="time_for_other_med">Es la hora de los %2$s de %3$s de %1$s</string>
     <string name="add_dose">Añadir dosis</string>
 
     <!-- Med History -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 00000000..c332d127
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,240 @@
+<resources>
+    <!-- Common -->
+    <string name="yes">Sì</string>
+    <string name="no">No</string>
+    <string name="close">Chiudere</string>
+    <string name="cancel">Cancellare</string>
+    <string name="app_name">MediTrak</string>
+    <string name="edit">Editare</string>
+    <string name="submit">Presentare</string>
+    <string name="save_changes">Salvare le modifiche</string>
+    <string name="save">Salvare</string>
+    <string name="you">Tu</string>
+    <string name="your">Il tuo</string>
+    <string name="ok">OK</string>
+    <string name="delete">Eliminare</string>
+    <string name="i_agree">Sono d\'accordo</string>
+
+    <!-- Filters -->
+    <string name="clear">Pulire</string>
+    <string name="apply">Applicare</string>
+    <string name="before">Prima</string>
+    <string name="after">Dopo</string>
+    <string name="on">Nel</string>
+
+    <!-- Errors -->
+    <string name="invalid_value">Valore inserito non valido</string>
+    <string name="must_be_positive_int">Il valore deve essere un intero positivo</string>
+    <string name="val_too_big">Il valore fornito è troppo grande</string>
+    <string name="cannot_exceed_50">Il valore fornito non può superare 50</string>
+    <string name="must_be_greater_than_0">Il value fornito non può essere inferiore a 0</string>
+    <string name="provided_name_invalid">Il nome fornito non è valido</string>
+    <string name="err_provide_name">Per favore, fornisci un nome</string>
+    <string name="err_enter_dosage">Per favore, fornisci un dosaggio</string>
+    <string name="err_units_for_med">Per favore, fornisci una unità per questo farmaco</string>
+    <string name="err_select_frequency">Per favore, scegli un tipo di frequenza</string>
+    <string name="err_select_time">Per favore, scegli un\'ora</string>
+    <string name="err_select_start_date">Per favore, scegli una data d\'inizio</string>
+    <string name="err_enter_num_timers_per_day">Per favore, fornisci il numero di volte per giorno che si prende questo farmaco</string>
+    <string name="err_enter_med_freq">Per favore, fornisci quanto spesso si prende questo farmaco.</string>
+    <string name="err_enter_time_unit">Per favore, scegli una unità di tempo.</string>
+    <string name="err_name_for_med">Per favore, fornisci il nome del farmaco</string>
+    <string name="err_missing_file_name">Manca il nome del file</string>
+    <string name="err_file_must_be_json">Il file di esportazione deve avere l\'estensione .json</string>
+    <string name="err_required">Obbligatorio</string>
+
+    <!-- Time formats -->
+    <string name="date_format">Mmm dd, yyyy</string>
+    <string name="time_format_hh_mm_aa">hh:mm aa</string>
+
+    <!-- Time -->
+    <string name="sunday">Domenica</string>
+    <string name="monday">Lunedì</string>
+    <string name="tuesday">Martedì</string>
+    <string name="wednesday">Mercoledì</string>
+    <string name="thursday">Giovedì</string>
+    <string name="friday">Venerdì</string>
+    <string name="saturday">Sabato</string>
+    <string name="minutes">Minuti</string>
+    <string name="hours">Ore</string>
+    <string name="days">Giorni</string>
+    <string name="weeks">Settimane</string>
+
+    <!-- MainActivity -->
+    <string name="no_medications_found">Nessun farmaco trovato</string>
+    <string name="med_schedule">Programma di farmaci</string>
+    <string name="no_meds_for_day">Nessun farmaco trovato per %1$s</string>
+    <string name="cannot_take_more_than_hours">Non si può prendere farmaci più di %1$d ore in anticipo</string>
+    <string name="as_needed_dose">Dosaggio secondo necessità</string>
+    <string name="welcome">Benvenuto a MediTrak!</string>
+    <string name="warranty_info">
+        Questa applicazione ha lo scopo di aiutarLa a tenere il conto dei Suoi faramci. Non ha lo scopo di
+        fornire consigli di tipo medico e nessuna informazione fornita da questa applicazione dovrebbe essere
+        erroneamente interpretata di per sé. I creatori di questa applicazione non sono resposnabili per nessun
+        dosaggio dimenticato per qualsiasi motivo. Se ha bisogno di assistenza medica, per favore contattare
+        un medico professionale.
+        Con l\'utilizzo di questa applicazione, acconsenti ai termini e condizioni predetti così come quelli
+        della licenza GPL versione 2.0 in cui è pubblicata. \n\n
+
+        Questa applicazione è pubblicata sotto la GNU General Public License Versione 2.0, vedi sotto per maggiori dettagli:
+    </string>
+
+    <!-- Add/EditMedication -->
+    <string name="add_medication">Aggiungere farmaco</string>
+    <string name="edit_medication">Editare farmaco</string>
+    <string name="delete_medication">Eliminare farmaco</string>
+    <string name="note_timestamp">Data: %1$s alle: %2$s</string>
+    <string name="note_edit_timestamp">Editato: %1$s alle: %2$s</string>
+    <string name="patient_changed">Paziente cambiata da %1$s a %2$s\n</string>
+    <string name="name_changed">Nome cambiato da %1$s a %2$s\n</string>
+    <string name="removed_alias">Alias %1$s removed\n</string>
+    <string name="added_alias">Alias %1$s aggiunto\n</string>
+    <string name="changed_alias">Alias cambiato da %1$s a %2$s\n</string>
+    <string name="changed_dosage">Dosaggio cambiato da %1$s a %2$s\n</string>
+    <string name="frequency_changed">Frequenza cambiata da %1$s a %2$s\n</string>
+    <string name="times_per">Volte al</string>
+    <string name="patientIsMe">Io</string>
+    <string name="patient">Paziente</string>
+    <string name="other">Altro</string>
+    <string name="name">Nome</string>
+    <string name="medication_name">Nome del farmaco</string>
+    <string name="medication_dosage">Dosaggio</string>
+    <string name="medication_frequency">Frequenza</string>
+    <string name="taken_every">Preso ogni</string>
+    <string name="units">Unità di dosaggio</string>
+    <string name="taken">Preso</string>
+    <string name="frequency">Frequenza</string>
+    <string name="multiple_times_per_day">Più volte al giorno</string>
+    <string name="as_needed">Secondo necessità</string>
+    <string name="daily">Giornalmente</string>
+    <string name="weekly">Settimanalmente</string>
+    <string name="monthly">Mensile</string>
+    <string name="medication_name_amp_dosage"><![CDATA[Nome & Dosaggio del Farmaco]]></string>
+    <string name="who_takes_this_medication">Chi prende questo farmaco?</string>
+    <string name="someone_else">Qualcun altro</string>
+    <string name="what_is_the_medication_s_name_amp_how_much_is_taken"><![CDATA[qual è il nome del farmaco & quanto se ne prende?]]></string>
+    <string name="alias_for_notifications">Alias per le notifiche</string>
+    <string name="how_often_is_the_medication_taken">Quanto spesso si prende questo farmaco?</string>
+    <string name="start_date">Data d\'inizio</string>
+    <string name="taken_at">Preso alle</string>
+    <string name="unit_of_time">Unità di tempo</string>
+    <string name="custom_frequency">Frequenza personalizzata</string>
+    <string name="times_per_day">Volte al giorno</string>
+    <string name="starting">Inizio:</string>
+    <string name="alias_for_medication">Alias per il farmaco</string>
+    <string name="yourMedications">I tuoi farmaci:</string>
+    <string name="no_notes_for_this_medication">Nessun appunto per questo farmaco</string>
+    <string name="unitExample">Es. mg, g, drops</string>
+    <string name="patient_name">Nome del paziente:</string>
+    <string name="no_alias">Nessun alias</string>
+    <string name="at">Alle:</string>
+    <string name="apply_retroactive">Applicare le modifiche con effetto retroattivo</string>
+    <string name="retroactive_warning">Avviso: Le modifiche alla frequenza possono rendere le dosi precedentemente prese non sono più visibili nel programma.</string>
+    <string name="would_like_apply_retroactively">Le modifiche al dosaggio si possono applicare con effetto retroattivo a partire all\'ultima modifica. Vorrersti applicare queste modifiche con effetto retroattivo?</string>
+    <string name="instructions">Istruzioni</string>
+    <string name="instructions_optional">Istruzioni (Opzionali)</string>
+    <string name="instructions_added">Istruzioni aggiunte: %1$s</string>
+
+    <!-- MyMedications -->
+    <string name="my_medications">I miei farmaci</string>
+    <string name="med_name">Nome del farmaco: %1$s</string>
+    <string name="dosage">Dosaggio: %1$s %2$s</string>
+    <string name="taken_daily_at">Preso giornalmente alle </string>
+    <string name="taken_every_lbl">Preso ogni </string>
+    <string name="alias_lbl">Alias</string>
+    <string name="taken_since">Preso dal: %1$s</string>
+    <string name="taken_as_needed">Preso secondo necessità.</string>
+
+    <!-- Notes -->
+    <string name="notes">Appunti</string>
+    <string name="add_note">Creare Appunto</string>
+    <string name="edit_note">Editare Appunto</string>
+
+    <!-- Settings Activity -->
+    <string name="settings">Configurazioni</string>
+    <string name="options">Opzioni</string>
+    <string name="license">Licenza</string>
+    <string name="purpose">MediTrak è una applicazione libero e open source progettata per aiutarti a tenere traccia dei tuoi faramci, così puoi rispondere più facilmente alla domanda \"ho preso il mio faramco ieri?\"</string>
+    <string name="copyright">Copyright © 2022 Adam Guidarini</string>
+    <string name="licenseInfo">MediTrak è software gratuita e può essere ridistribuito e/o modificato secondo i termini della Licenza Pubblica Generica GNU come pubblicato dalla Free Software Foundation, o la versione 2 o (a propria scelta) più tardi.</string>
+    <string name="warranty">
+        Questo programma è software libero; è possibile ridistribuirlo e/o
+        modificarlo secondo i termini della licenza GNU General Public License,
+        come pubblicata dalla Free Software Foundation; versione 2 della licenza,
+        o (a scelta) una versione più recente.
+
+        Questo programma è distribuito nella speranza che sia utile, ma,
+        ma SENZA ALCUNA GARANZIA; senza neppure la garanzia implicita di
+        COMMERCIABILITÀ o IDONEITÀ PER UNO SCOPO PARTICOLARE. Vedi il
+        GNU General Public License per maggiori dettagli.
+    </string>
+    <string name="copyOfGPL2">
+        Dovresti aver ricevuto una copia della GNU General Public License
+        insieme a questo programma se no, vedi https://www.gnu.org/licenses/.
+    </string>
+    <string name="cannot_take_medication_more_than">Non puoi prendere il farmaco più di</string>
+    <string name="hours_in_advance">ore in anticipo</string>
+    <string name="title_activity_settings">Configurazioni</string>
+    <string name="delete_all">Eliminare tutto</string>
+    <string name="pause_medication">mettere in pausa farmaco</string>
+    <string name="resume_medication">Riprendere farmaco</string>
+    <string name="pause_message">Sei sicuro di voler mettere in pausa %1$s? Non apparirà più nel tuo programma, ma puoi riprenderlo in qualsiasi momento.</string>
+    <string name="resume_message">Riprendere %1$s lo ristabilirà al tuo programma. Sei sicuro di voler procedere?</string>
+    <string name="enable_notifications">Abilitare le Notifiche</string>
+    <string name="disable_time_before_dose_requirement">Disattivare limite di tempo in anticipo</string>
+    <string name="theme">Tema</string>
+    <string name="light_mode">Modalità luce</string>
+    <string name="dark_mode">Modalità scura</string>
+    <string name="match_system_theme">System default</string>
+    <string name="number_of_hours_before_dose_can_be_taken">Limite prima di cui il farmaco non può essere preso:</string>
+    <string name="export">Esportare</string>
+    <string name="importData">Importare</string>
+    <string name="data">Dati</string>
+    <string name="export_directory">Cartella di esportazione</string>
+    <string name="export_file_name">Nome del file di esportazione</string>
+    <string name="downloads">Scaricamenti</string>
+    <string name="documents">Documenti</string>
+    <string name="export_data">Dati sulle esportazioni</string>
+    <string name="successful_export">Dati esportati con successo: %1$s?</string>
+    <string name="import_success">Dati importati con successo</string>
+    <string name="failed_export">Data could not be exported</string>
+    <string name="failed_import">Non è stato possibile esportare i dati</string>
+    <string name="could_not_retrieve_file">Impossibile recuperare il file di importazione</string>
+    <string name="notifications_already_enabled">Le notifiche sono già abilitate</string>
+    <string name="date_format_title">Formato di data</string>
+    <string name="date_format_mm_dd_yyyy">MM/DD/YYYY</string>
+    <string name="date_format_dd_mm_yyyy">DD/MM/YYYY</string>
+    <string name="time_format">Formato di tempo</string>
+    <string name="hour_12">12 ore</string>
+    <string name="hour_24">24 ore</string>
+    <string name="language">Lingua</string>
+
+    <!-- Dose Info dialog -->
+    <string name="not_taken_yet">Ancora non si ha preso</string>
+    <string name="not_taken">Non preso</string>
+    <string name="marked_taken_at">Segnato preso alle</string>
+    <string name="dose_information">Informazioni della dose</string>
+    <string name="time_taken">Ora presa</string>
+    <string name="date_taken">Data presa</string>
+    <string name="this_dose">Questa dose</string>
+
+    <!-- Delete Everything -->
+    <string name="delete_all_data">Eliminare tutti i dati salvati</string>
+    <string name="delete_all_data_cannot_be_undone">Eliminare tutti i dati salvati? Questa azione non si può disfare.</string>
+    <string name="all_data_deleted">Tutti i dati sono stati eliminati</string>
+
+    <!-- Notifications -->
+    <string name="mark_as_taken">Preso</string>
+    <string name="snooze_message">Sospendere</string>
+    <string name="its_time_your_med">È ora di prendere il tuo %1$s di %2$s</string>
+    <string name="time_for_other_med">È il momento dei %2$s di %3$s  di %1$s</string>
+    <string name="add_dose">Aggiungere dose</string>
+
+    <!-- Med History -->
+    <string name="history">Storia</string>
+    <string name="scheduled">Programma</string>
+    <string name="dosage_hist">Dosaggio</string>
+    <string name="filter">Filtrare</string>
+    <string name="export_csv">Esporta CSV</string>
+    <string name="no_records">Nessun registro</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ee39fc22..45924598 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,7 +72,7 @@
         to provide medical advice and no information provided by this application should be misconstrued
         as such. The creators of this application are not responsible for any missed
         doses of your medications for any reason. If you require medical assistance, please contact a medical professional.
-        By using this application, you are agreeing to the aforementioned terms as well as those of the GPL2 license under
+        By using this application, you are agreeing to the aforementioned terms as well as those of the GPL version 2.0 license under
         which it is released. \n\n
 
         This application is released under the GNU Public License Version 2, see below for more details:
@@ -118,31 +118,21 @@
     <string name="taken_at">Taken at</string>
     <string name="unit_of_time">Unit of Time</string>
     <string name="custom_frequency">Custom Frequency</string>
-    <string name="at_n_n_tap_to_set_time">At: \n\n Tap to set time</string>
     <string name="times_per_day">Times per day</string>
-    <string name="atThisTime">At: Tap to set time</string>
     <string name="starting">Starting:</string>
     <string name="alias_for_medication">Alias for medication</string>
-    <string name="alias_for_medication_displays_notification">Alias for medication displays notification</string>
-    <string name="medication_alias_displays_in_notification">Medication alias displays in notification</string>
-    <string name="place_holder_tap_again_then_hit_cancel">Place holder, tap again then hit cancel</string>
     <string name="yourMedications">Your Medications:</string>
     <string name="no_notes_for_this_medication">No notes for this medication</string>
     <string name="unitExample">Ex. mg, g, drops</string>
     <string name="patient_name">Patient Name:</string>
     <string name="no_alias">No alias</string>
-    <string name="tap_to_set_date">Tap to set date</string>
     <string name="at">At:</string>
-    <string name="tap_to_set_time">Tap to set Time</string>
     <string name="apply_retroactive">Apply Changes Retroactively</string>
     <string name="retroactive_warning">Warning: Changes to frequency may cause previously taken doses to no longer be visible in the schedule.</string>
     <string name="would_like_apply_retroactively">Changes to dosage and frequency can be applied retroactively as of the previous change. Would you like to apply these changes retroactively?</string>
-    <string name="apply_changes_as_of">Apply changes as of:</string>
-    <string name="from_med_last_change">Last change</string>
-    <string name="from_med_start">Start of medication</string>
     <string name="instructions">Instructions</string>
     <string name="instructions_optional">Instructions (Optional)</string>
-    <string name="instrucations_added">Added instructions: %1$s</string>
+    <string name="instructions_added">Added instructions: %1$s</string>
 
     <!-- MyMedications -->
     <string name="my_medications">My Medications</string>
@@ -153,7 +143,6 @@
     <string name="alias_lbl">Alias</string>
     <string name="taken_since">Taken since: %1$s</string>
     <string name="taken_as_needed">Taken as needed.</string>
-    <string name="all_previous_edits_overridden">All previous changes overridden.</string>
 
     <!-- Notes -->
     <string name="notes">Notes</string>
@@ -166,7 +155,7 @@
     <string name="license">License</string>
     <string name="purpose">MediTrak is a free and open source application designed to help you keep track of your medications, so you can more easily answer the question \"did I take my medication yesterday?\"</string>
     <string name="copyright">Copyright © 2022 Adam Guidarini</string>
-    <string name="licenseInfo">MediTrak is free software and may be redistributed and/or modified under the terms of the GNU General Public License as published by the Free software foundation, either version 2 or (at your option) later.</string>
+    <string name="licenseInfo">MediTrak is free software and may be redistributed and/or modified under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 or (at your option) later.</string>
     <string name="warranty">
         This program is free software; you can redistribute it and/or
         modify it under the terms of the GNU General Public License
@@ -175,14 +164,12 @@
 
         This program is distributed in the hope that it will be useful,
         but WITHOUT ANY WARRANTY; without even the implied warranty of
-
         MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        GNU General Public License for more details
+        GNU General Public License for more details.
     </string>
     <string name="copyOfGPL2">
         You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+        along with this program; if not, see https://www.gnu.org/licenses/.
     </string>
     <string name="cannot_take_medication_more_than">Cannot take medication more than</string>
     <string name="hours_in_advance">hours in advance</string>
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index 7f4b8c68..fa7b862e 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -3,4 +3,5 @@
     <locale android:name="en"/>
     <locale android:name="de"/>
     <locale android:name="es"/>
+    <locale android:name="it"/>
 </locale-config>
diff --git a/build.gradle b/build.gradle
index b5f22c0d..28fb1e70 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 91b72aab..eba8abc8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip