diff --git a/po/es.po b/po/es.po
index 0564d73..3c23de3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 05:42-0400\n"
+"POT-Creation-Date: 2023-10-23 02:25-0400\n"
 "PO-Revision-Date: 2023-10-22 20:31+0000\n"
 "Last-Translator: Óscar Fernández Díaz <oscfdezdz@tuta.io>\n"
 "Language-Team: Spanish <https://weblate.fyralabs.com/projects/flattool/"
@@ -67,7 +67,7 @@ msgstr "Encuentre y elimine los datos de usuario sobrantes"
 msgid "Reinstall apps that have leftover data"
 msgstr "Reinstale las aplicaciones que tengan datos sobrantes"
 
-#: src/main.py:86
+#: src/main.py:87
 msgid "Flatpaks"
 msgstr "Flatpaks"
 
@@ -96,27 +96,31 @@ msgstr "Configuración y datos de la aplicación"
 msgid "Keep"
 msgstr "Mantener"
 
-#: src/window.py:167 src/window.py:240
-msgid "Allow restoring app settings and content"
+#: src/window.py:167
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring these apps' settings and content"
 msgstr "Permitir restaurar la configuración y el contenido de la aplicación"
 
 #: src/window.py:168 src/window.py:241 src/orphans.blp:70
 msgid "Trash"
 msgstr "Borrar"
 
-#: src/window.py:168 src/window.py:241
-msgid "Send app settings and content to the trash"
+#: src/window.py:168
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send these apps' settings and content to the trash"
 msgstr "Enviar la configuración y el contenido de la aplicación a la papelera"
 
-#: src/window.py:195 src/window.py:259 src/window.py:495 src/window.py:654
-#: src/properties_window.py:84 src/remotes_window.py:59
-#: src/remotes_window.py:138 src/remotes_window.py:285
+#: src/window.py:195 src/window.py:259 src/window.py:426 src/window.py:457
+#: src/window.py:551 src/window.py:710 src/properties_window.py:87
+#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
 #: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
 #: src/downgrade.blp:16
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/window.py:196 src/window.py:260
+#: src/window.py:196 src/window.py:260 src/window.py:354
 msgid "Uninstall"
 msgstr "Desinstalar"
 
@@ -133,201 +137,287 @@ msgstr "¿Desinstalar {}?"
 msgid "It will not be possible to use {} after removal."
 msgstr "No será posible usar {} después de la eliminación."
 
-#: src/window.py:300 src/window.py:304
-msgid "EOL"
-msgstr "EOL"
+#: src/window.py:240
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring this app's settings and content"
+msgstr "Permitir restaurar la configuración y el contenido de la aplicación"
 
-#: src/window.py:300 src/properties_window.py:19
+#: src/window.py:241
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send this app's settings and content to the trash"
+msgstr "Enviar la configuración y el contenido de la aplicación a la papelera"
+
+#: src/window.py:300
+#, fuzzy
+#| msgid "App ID"
+msgid "App EOL"
+msgstr "ID de la aplicación"
+
+#: src/window.py:300 src/properties_window.py:26
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
 msgid ""
-"This Flatpak has reached its End of Life and will not receive any security "
+"{} has reached its End of Life and will not receive any security updates"
+msgstr ""
+"Esta Flatpak ha llegado al final de su vida útil y no recibirá "
+"actualizaciones de seguridad"
+
+#: src/window.py:304
+#, fuzzy
+#| msgid "Runtime"
+msgid "Runtime EOL"
+msgstr "Tiempo de ejecución"
+
+#: src/window.py:304 src/properties_window.py:27
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
+msgid ""
+"{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 "Esta Flatpak ha llegado al final de su vida útil y no recibirá "
 "actualizaciones de seguridad"
 
-#: src/window.py:304 src/properties_window.py:20
-msgid ""
-"The runtime used by this app has reached its End of Life and will not "
-"receive any security updates"
+#: src/window.py:308
+msgid "Updates Disabled"
 msgstr ""
-"El tiempo de ejecución usado por esta aplicación ha llegado al final de su "
-"vida útil y no recibirá actualizaciones de seguridad"
 
-#: src/window.py:308
-msgid "Masked"
-msgstr "Restringir"
-
-#: src/window.py:308
-msgid "This Flatpak is masked and will not be updated"
+#: src/window.py:308 src/properties_window.py:28
+#, fuzzy
+#| msgid "This Flatpak is masked and will not be updated"
+msgid "{} is masked and will not be updated"
 msgstr "Este Flatpak está restringido y no recibirá actualizaciones"
 
-#: src/window.py:314 src/properties_window.py:156
+#. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
+#: src/window.py:313 src/properties_window.py:159
 msgid "View Properties"
 msgstr "Ver propiedades"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:339
+#: src/window.py:334
 msgid "Copied name"
 msgstr "Nombre copiado"
 
-#: src/window.py:340
+#: src/window.py:335
 msgid "Copy Name"
 msgstr "Copiar nombre"
 
-#: src/window.py:342
+#: src/window.py:337
 msgid "Copied ID"
 msgstr "ID copiada"
 
-#: src/window.py:343
+#: src/window.py:338
 msgid "Copy ID"
 msgstr "Copiar ID"
 
-#: src/window.py:345
+#: src/window.py:340
 msgid "Copied ref"
 msgstr "Ref copiada"
 
-#: src/window.py:346
+#: src/window.py:341
 msgid "Copy Ref"
 msgstr "Copiar Ref"
 
-#: src/window.py:348
+#: src/window.py:343
 msgid "Copied launch command"
 msgstr "Comando de lanzamiento copiado"
 
-#: src/window.py:349
+#: src/window.py:344
 msgid "Copy Launch Command"
 msgstr "Copiar comando de lanzamiento"
 
-#: src/window.py:351 src/window.py:418
+#: src/window.py:346 src/window.py:474
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/window.py:353
+#: src/window.py:349
 msgid "Opened {}"
 msgstr "Abierto {}"
 
-#: src/window.py:354
-msgid "Open {}"
+#: src/window.py:350
+#, fuzzy
+#| msgid "Open {}"
+msgid "Open"
 msgstr "Abrir {}"
 
-#: src/window.py:359
-msgid "Toggle Mask"
-msgstr "Conmutar restricción"
+#: src/window.py:358 src/window.py:459 src/downgrade.blp:40
+msgid "Disable Updates"
+msgstr ""
 
-#: src/window.py:368
-msgid "Uninstall {}"
-msgstr "Desinstalar {}"
+#: src/window.py:363 src/properties_window.py:187
+msgid "Enable Updates"
+msgstr ""
 
-#: src/window.py:372 src/downgrade_window.py:142
-msgid "Downgrade {}"
-msgstr "Revertir {}"
+#: src/window.py:377 src/properties_window.py:134
+#, fuzzy
+#| msgid "Open the User Data Folder"
+msgid "Open User Data Folder"
+msgstr "Abrir la carpeta de datos de usuario"
 
-#: src/window.py:396
-msgid "Could not toggle {}'s mask"
-msgstr "No se ha podido conmutar la restricción de {}"
+#: src/window.py:382 src/properties_window.py:139
+#, fuzzy
+#| msgid "Trashed user data"
+msgid "Trash User Data"
+msgstr "Datos de usuario borrados"
 
-#: src/window.py:417
-msgid "Could not Run App"
-msgstr "No se puede ejecutar la aplicación"
+#: src/window.py:389 src/downgrade.blp:21
+msgid "Downgrade"
+msgstr "Revertir"
 
-#: src/window.py:423
-msgid "OK"
-msgstr "De acuerdo"
+#: src/window.py:410 src/properties_window.py:98 src/orphans_window.py:171
+#, fuzzy
+#| msgid "Can't open folder"
+msgid "Could not open folder"
+msgstr "No se puede abrir la carpeta"
 
-#: src/window.py:441
-msgid "List refreshed"
-msgstr "Lista actualizada"
+#: src/window.py:418 src/window.py:543
+#, fuzzy
+#| msgid "Could not manage data"
+msgid "Could not trash user data"
+msgstr "No se pueden gestionar los datos"
 
-#: src/window.py:484
-msgid "No user data for {}"
-msgstr "No hay datos de usuario para {}"
-
-#: src/window.py:487
-msgid "Can't trash user data for {}"
-msgstr "No se pueden borrar los datos de usuario de {}"
-
-#: src/window.py:489 src/properties_window.py:74
+#: src/window.py:422 src/window.py:545 src/properties_window.py:77
 msgid "Trashed user data"
 msgstr "Datos de usuario borrados"
 
-#: src/window.py:493
-msgid "Trash Selected Apps' User Data?"
-msgstr "¿Eliminar los datos de usuario de las aplicaciones seleccionadas?"
+#: src/window.py:424
+#, fuzzy
+#| msgid "Send {}'s User Data to the Trash?"
+msgid "Send {}'s User Data to the trash?"
+msgstr "¿Enviar los datos de usuario de {} a la papelera?"
 
-#: src/window.py:493
-msgid "Your files and data for these apps will be sent to the trash."
-msgstr "Sus archivos y datos de estas aplicaciones se enviarán a la papelera."
+#: src/window.py:425 src/properties_window.py:85
+msgid "Your files and data for this app will be sent to the trash."
+msgstr "Sus archivos y datos de esta aplicación se enviarán a la papelera."
 
-#: src/window.py:496 src/properties_window.py:85
+#: src/window.py:428 src/window.py:552 src/properties_window.py:88
 msgid "Trash Data"
 msgstr "Borrar datos"
 
-#: src/window.py:547
+#: src/window.py:440 src/downgrade_window.py:108
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Could disable updates for {}"
+msgstr "No hay datos de usuario para {}"
+
+#: src/window.py:455
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Disable Updates for {}?"
+msgstr "No hay datos de usuario para {}"
+
+#: src/window.py:456
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
+msgid ""
+"This will mask {} ensuring it will never recieve any feature or security "
+"updates."
+msgstr ""
+"Esta Flatpak ha llegado al final de su vida útil y no recibirá "
+"actualizaciones de seguridad"
+
+#: src/window.py:473
+msgid "Could not Run App"
+msgstr "No se puede ejecutar la aplicación"
+
+#: src/window.py:479
+msgid "OK"
+msgstr "De acuerdo"
+
+#: src/window.py:497
+msgid "List refreshed"
+msgstr "Lista actualizada"
+
+#: src/window.py:540
+msgid "No user data for {}"
+msgstr "No hay datos de usuario para {}"
+
+#: src/window.py:549
+msgid "Trash Selected Apps' User Data?"
+msgstr "¿Eliminar los datos de usuario de las aplicaciones seleccionadas?"
+
+#: src/window.py:549
+msgid "Your files and data for these apps will be sent to the trash."
+msgstr "Sus archivos y datos de estas aplicaciones se enviarán a la papelera."
+
+#: src/window.py:603
 msgid "Copied selected app names"
 msgstr "Copiados los nombres de las aplicaciones seleccionadas"
 
-#: src/window.py:555
+#: src/window.py:611
 msgid "Copied selected app IDs"
 msgstr "Copiados los ID de las aplicaciones seleccionadas"
 
-#: src/window.py:563
+#: src/window.py:619
 msgid "Copied selected app refs"
 msgstr "Copiadas las refs de las aplicaciones seleccionadas"
 
-#: src/window.py:624 src/orphans_window.py:76
+#: src/window.py:680 src/orphans_window.py:76
 msgid "Installed successfully"
 msgstr "Instalado correctamente"
 
-#: src/window.py:627
+#: src/window.py:683
 msgid "Could not install app"
 msgstr "No se ha podido instalar la aplicación"
 
-#: src/window.py:652
+#: src/window.py:708
 msgid "Install {}?"
 msgstr "¿Instalar {}?"
 
-#: src/window.py:655 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:711 src/orphans_window.py:109 src/orphans.blp:75
 msgid "Install"
 msgstr "Instalar"
 
-#: src/window.py:662 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:718 src/remotes_window.py:212 src/remotes_window.py:296
 msgid "User"
 msgstr "Usuario"
 
-#: src/window.py:662
+#: src/window.py:718
 msgid "The app will be available to only you"
 msgstr "La aplicación solo estará disponible para usted"
 
-#: src/window.py:663 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:719 src/remotes_window.py:218 src/remotes_window.py:297
 msgid "System"
 msgstr "Sistema"
 
-#: src/window.py:663
+#: src/window.py:719
 msgid "The app will be available to every user on the system"
 msgstr "La aplicación estará disponible para todos los usuarios del sistema"
 
-#: src/window.py:692
+#: src/window.py:748
 msgid "File type not supported"
 msgstr "Tipo de archivo no compatible"
 
 #: src/window.blp:12
-msgid "Refresh the List of Installed Apps"
+#, fuzzy
+#| msgid "Refresh the List of Installed Apps"
+msgid "Refresh the List"
 msgstr "Refrescar la lista de aplicaciones instaladas"
 
 #: src/window.blp:18 src/orphans.blp:14
-msgid "Search for an Installed App"
-msgstr "Buscar una aplicación instalada"
+msgid "Search the List"
+msgstr ""
 
 #: src/window.blp:24
-msgid "Filter Apps List"
+#, fuzzy
+#| msgid "Filter Apps List"
+msgid "Filter the List"
 msgstr "Filtrar la lista de aplicaciones"
 
 #: src/window.blp:30
 msgid "Main Menu"
 msgstr "Menú principal"
 
-#: src/window.blp:37
+#: src/window.blp:37 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "Conmutar modo de selección"
 
@@ -343,226 +433,201 @@ msgstr ""
 "No hay Flatpaks que coincidan con el filtro actual, Warehouse no puede ver "
 "la lista de Flatpaks instaladas o el sistema no tiene Flatpaks instaladas."
 
-#. label: _("Uninstall");
-#: src/window.blp:92
+#: src/window.blp:85 src/orphans.blp:66
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: src/window.blp:90
 msgid "Uninstall Selected Apps"
 msgstr "Desinstalar aplicaciones seleccionadas"
 
-#. label: _("Trash User Data");
-#: src/window.blp:98
+#: src/window.blp:95
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "Enviar a la papelera los datos de las aplicaciones seleccionadas"
 
-#: src/window.blp:103
+#: src/window.blp:100
 msgid "Open Copy Menu"
 msgstr "Abrir el menú para copiar datos"
 
-#: src/window.blp:114
+#: src/window.blp:111 src/gtk/help-overlay.blp:47
 msgid "Install From File"
 msgstr "Instalar desde archivo"
 
-#: src/window.blp:119 src/orphans_window.py:24
+#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
 msgid "Manage Leftover Data"
 msgstr "Gestionar los datos sobrantes"
 
-#: src/window.blp:129 src/remotes_window.py:349
+#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
 msgid "Manage Remotes"
 msgstr "Gestionar los repositorios remotos"
 
-#: src/window.blp:134
+#: src/window.blp:131
 msgid "_Keyboard Shortcuts"
 msgstr "Atajos del _teclado"
 
-#: src/window.blp:139
+#: src/window.blp:136
 msgid "_About Warehouse"
 msgstr "_Acerca de Warehouse"
 
-#: src/window.blp:148
+#: src/window.blp:145
 msgid "Copy Names"
 msgstr "Copiar nombres"
 
-#: src/window.blp:153
+#: src/window.blp:150
 msgid "Copy IDs"
 msgstr "Copiar IDs"
 
-#: src/window.blp:158
+#: src/window.blp:155
 msgid "Copy Refs"
 msgstr "Copiar refs"
 
-#: src/window.blp:167
+#: src/window.blp:164
 msgid "Open app"
 msgstr "Abrir app"
 
 #: src/gtk/help-overlay.blp:11
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "App Management"
 msgid "App Management"
 msgstr "Gestión de aplicaciones"
 
 #: src/gtk/help-overlay.blp:14
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Search"
 msgid "Search"
 msgstr "Buscar"
 
-#: src/gtk/help-overlay.blp:19
-msgctxt "shortcut window"
-msgid "Set a Filter"
-msgstr "Establecer un filtro"
+#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+msgid "Set Filters"
+msgstr "Establecer filtros"
 
 #: src/gtk/help-overlay.blp:24
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Refresh"
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/gtk/help-overlay.blp:29
-msgctxt "shortcut window"
-msgid "Toggle Selection Mode"
-msgstr "Conmutar modo de selección"
-
 #: src/gtk/help-overlay.blp:34
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "More Functions"
 msgid "More Functions"
 msgstr "Más funciones"
 
-#: src/gtk/help-overlay.blp:37
-msgctxt "shortcut window"
-msgid "Manage Leftover Data"
-msgstr "Gestionar los datos sobrantes"
-
-#: src/gtk/help-overlay.blp:42
-msgctxt "shortcut window"
-msgid "Manage Remotes"
-msgstr "Gestionar los repositorios remotos"
-
-#: src/gtk/help-overlay.blp:47
-msgctxt "shortcut window"
-msgid "Install From File"
-msgstr "Instalar desde archivo"
-
 #: src/gtk/help-overlay.blp:52
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "General"
 msgid "General"
 msgstr "General"
 
 #: src/gtk/help-overlay.blp:55
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Open Menu"
 msgid "Open Menu"
 msgstr "Abrir menú"
 
 #: src/gtk/help-overlay.blp:60
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Show Shortcuts"
 msgid "Show Shortcuts"
 msgstr "Mostrar atajos"
 
 #: src/gtk/help-overlay.blp:65
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Quit"
 msgid "Quit"
 msgstr "Salir"
 
-#: src/properties_window.py:7
+#: src/properties_window.py:14
 msgid "{} Properties"
 msgstr "Propiedades de {}"
 
-#: src/properties_window.py:21
-msgid "This Flatpak has been masked and will not be updated"
-msgstr "Esta Flatpak ha sido restringida y no será actualizada"
-
-#: src/properties_window.py:52
+#: src/properties_window.py:60
 msgid "Show Apps Using this Runtime"
 msgstr "Mostrar aplicaciones que usan este tiempo de ejecución"
 
-#: src/properties_window.py:78
-msgid "Can't trash data"
-msgstr "No se pueden eliminar los datos"
-
 #: src/properties_window.py:81
+#, fuzzy
+#| msgid "Could not manage data"
+msgid "Could not trash data"
+msgstr "No se pueden gestionar los datos"
+
+#: src/properties_window.py:84
 msgid "Send {}'s User Data to the Trash?"
 msgstr "¿Enviar los datos de usuario de {} a la papelera?"
 
-#: src/properties_window.py:82
-msgid "Your files and data for this app will be sent to the trash."
-msgstr "Sus archivos y datos de esta aplicación se enviarán a la papelera."
-
-#: src/properties_window.py:95 src/orphans_window.py:171
-msgid "Can't open folder"
-msgstr "No se puede abrir la carpeta"
-
-#: src/properties_window.py:99 src/remotes_window.py:72
+#: src/properties_window.py:102 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "Copiado {}"
 
-#: src/properties_window.py:131
-msgid "Open Data Folder"
-msgstr "Abrir carpeta de datos"
-
-#: src/properties_window.py:136
-msgid "Send User Data to the Trash"
-msgstr "Enviar datos de usuario a la papelera"
-
-#: src/properties_window.py:143 src/remotes_window.py:197
+#: src/properties_window.py:146 src/remotes_window.py:197
 #: src/remotes_window.py:294
 msgid "Name"
 msgstr "Nombre"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Description"
 msgstr "Descripción"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "App ID"
 msgstr "ID de la aplicación"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Version"
 msgstr "Versión"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Branch"
 msgstr "Rama"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Arch"
 msgstr "Arquitectura"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Origin"
 msgstr "Origen"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installation"
 msgstr "Instalación"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Ref"
 msgstr "Ref"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Active Commit"
 msgstr "Versión en uso"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Latest Commit"
 msgstr "Última versión"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installed Size"
 msgstr "Tamaño de instalación"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Options"
 msgstr "Opciones"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Runtime"
 msgstr "Tiempo de ejecución"
 
-#: src/properties_window.py:151
+#: src/properties_window.py:154
 msgid "Copy {}"
 msgstr "Copiar {}"
 
-#: src/properties_window.py:183
-msgid "Unmask"
-msgstr "Activar"
-
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
 msgstr "No se ha podido eliminar {}"
@@ -668,7 +733,9 @@ msgstr ""
 "añadidos"
 
 #: src/popular_remotes_window.py:31
-msgid "Flatpaks Repos"
+#, fuzzy
+#| msgid "Flatpaks Repos"
+msgid "Flatpak Repos"
 msgstr "Repositorios Flatpaks"
 
 #: src/popular_remotes.blp:18
@@ -688,11 +755,15 @@ msgid "Add a Custom Remote"
 msgstr "Añadir un remoto personalizado"
 
 #: src/orphans_window.py:78
-msgid "Some apps didn't install"
-msgstr "Algunas aplicaciones no se han instalado"
+#, fuzzy
+#| msgid "Could not uninstall some apps"
+msgid "Could not install some apps"
+msgstr "No se pueden desinstalar algunas aplicaciones"
 
 #: src/orphans_window.py:81
-msgid "Installing... This could take a while"
+#, fuzzy
+#| msgid "Installing... This could take a while"
+msgid "Installing… This could take a while"
 msgstr "Instalando… Esto podría tardar un poco"
 
 #. Make window unable to close
@@ -730,22 +801,14 @@ msgstr "No se pueden gestionar los datos"
 msgid "Open the User Data Folder"
 msgstr "Abrir la carpeta de datos de usuario"
 
-#: src/orphans.blp:57 src/filter.blp:85
+#: src/orphans.blp:57
 msgid "No Leftover Data"
 msgstr "No hay datos sobrantes"
 
-#: src/orphans.blp:58 src/filter.blp:86
+#: src/orphans.blp:58
 msgid "There is no leftover user data"
 msgstr "No hay datos de usuario sobrantes"
 
-#: src/orphans.blp:66
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: src/filter.blp:7
-msgid "Set Filters"
-msgstr "Establecer filtros"
-
 #: src/filter.blp:21
 msgid "Apply"
 msgstr "Aplicar"
@@ -766,10 +829,6 @@ msgstr "Filtrar apps por remotos"
 msgid "Filter Apps by Runtime"
 msgstr "Filtrar apps por tiempos de ejecución"
 
-#: src/filter.blp:76
-msgid "Clear Filters"
-msgstr "Limpiar filtros"
-
 #: src/downgrade_window.py:76
 msgid "Commit Hash: {}"
 msgstr "Hash de la confirmación: {}"
@@ -778,39 +837,112 @@ msgstr "Hash de la confirmación: {}"
 msgid "Could not downgrade {}"
 msgstr "No se pudo revertir {}"
 
-#: src/downgrade_window.py:108
-msgid "Could not mask {}"
-msgstr "No se pudo restringir {}"
-
 #: src/downgrade_window.py:116
-msgid "Downgrading..."
+#, fuzzy
+#| msgid "Downgrading..."
+msgid "Downgrading…"
 msgstr "Revirtiendo..."
 
+#: src/downgrade_window.py:142
+msgid "Downgrade {}"
+msgstr "Revertir {}"
+
 #: src/downgrade_window.py:153
-msgid "Fetching Releases..."
+#, fuzzy
+#| msgid "Fetching Releases..."
+msgid "Fetching Releases…"
 msgstr "Obteniendo versiones..."
 
-#: src/downgrade.blp:21
-msgid "Downgrade"
-msgstr "Revertir"
-
-#: src/downgrade.blp:40
-msgid "Mask this Flatpak"
-msgstr "Restringir este Flatpak"
-
-#: src/downgrade.blp:41
-msgid "Ensure that the flatpak will never be updated to a newer version"
+#: src/downgrade_window.py:155
+#, fuzzy
+#| msgid "Ensure that the flatpak will never be updated to a newer version"
+msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 "Garantizar que el Flatpak nunca se actualizará a una versión más reciente"
 
-#: src/downgrade.blp:47
+#: src/downgrade.blp:46
 msgid "Select a Release"
 msgstr "Seleccionar una versión"
 
-#: src/downgrade.blp:48
+#: src/downgrade.blp:47
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
 msgstr ""
 "Esto desinstalará la versión actual e instalará la elegida en su lugar. "
 "Tenga en cuenta que la desinstalación puede causar problemas."
+
+#~ msgid "EOL"
+#~ msgstr "EOL"
+
+#~ msgid ""
+#~ "The runtime used by this app has reached its End of Life and will not "
+#~ "receive any security updates"
+#~ msgstr ""
+#~ "El tiempo de ejecución usado por esta aplicación ha llegado al final de "
+#~ "su vida útil y no recibirá actualizaciones de seguridad"
+
+#~ msgid "Masked"
+#~ msgstr "Restringir"
+
+#~ msgid "Toggle Mask"
+#~ msgstr "Conmutar restricción"
+
+#~ msgid "Uninstall {}"
+#~ msgstr "Desinstalar {}"
+
+#~ msgid "Could not toggle {}'s mask"
+#~ msgstr "No se ha podido conmutar la restricción de {}"
+
+#~ msgid "Can't trash user data for {}"
+#~ msgstr "No se pueden borrar los datos de usuario de {}"
+
+#~ msgid "Search for an Installed App"
+#~ msgstr "Buscar una aplicación instalada"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Set a Filter"
+#~ msgstr "Establecer un filtro"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Toggle Selection Mode"
+#~ msgstr "Conmutar modo de selección"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Manage Leftover Data"
+#~ msgstr "Gestionar los datos sobrantes"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Manage Remotes"
+#~ msgstr "Gestionar los repositorios remotos"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Install From File"
+#~ msgstr "Instalar desde archivo"
+
+#~ msgid "This Flatpak has been masked and will not be updated"
+#~ msgstr "Esta Flatpak ha sido restringida y no será actualizada"
+
+#~ msgid "Can't trash data"
+#~ msgstr "No se pueden eliminar los datos"
+
+#~ msgid "Open Data Folder"
+#~ msgstr "Abrir carpeta de datos"
+
+#~ msgid "Send User Data to the Trash"
+#~ msgstr "Enviar datos de usuario a la papelera"
+
+#~ msgid "Unmask"
+#~ msgstr "Activar"
+
+#~ msgid "Some apps didn't install"
+#~ msgstr "Algunas aplicaciones no se han instalado"
+
+#~ msgid "Clear Filters"
+#~ msgstr "Limpiar filtros"
+
+#~ msgid "Could not mask {}"
+#~ msgstr "No se pudo restringir {}"
+
+#~ msgid "Mask this Flatpak"
+#~ msgstr "Restringir este Flatpak"
diff --git a/po/fr.po b/po/fr.po
index dd37ae8..bb027e9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 05:42-0400\n"
+"POT-Creation-Date: 2023-10-23 02:25-0400\n"
 "PO-Revision-Date: 2023-10-22 06:04+0000\n"
 "Last-Translator: Maxim Therrien <maxim@acerspyro.ca>\n"
 "Language-Team: French <https://weblate.fyralabs.com/projects/flattool/"
@@ -67,7 +67,7 @@ msgstr "Trouver et supprimer les données utilisateur résiduelles"
 msgid "Reinstall apps that have leftover data"
 msgstr "Réinstaller les applications ayant des données résiduelles"
 
-#: src/main.py:86
+#: src/main.py:87
 msgid "Flatpaks"
 msgstr "Flatpaks"
 
@@ -97,33 +97,39 @@ msgstr "Paramètres et données de l'application"
 msgid "Keep"
 msgstr "Garder"
 
-#: src/window.py:167 src/window.py:240
-msgid "Allow restoring app settings and content"
-msgstr "Permettre la restauration des paramètres et du contenu de l'application"
+#: src/window.py:167
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring these apps' settings and content"
+msgstr ""
+"Permettre la restauration des paramètres et du contenu de l'application"
 
 #: src/window.py:168 src/window.py:241 src/orphans.blp:70
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/window.py:168 src/window.py:241
-msgid "Send app settings and content to the trash"
+#: src/window.py:168
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send these apps' settings and content to the trash"
 msgstr "Envoyer les paramètres et le contenu de l'application à la corbeille"
 
-#: src/window.py:195 src/window.py:259 src/window.py:495 src/window.py:654
-#: src/properties_window.py:84 src/remotes_window.py:59
-#: src/remotes_window.py:138 src/remotes_window.py:285
+#: src/window.py:195 src/window.py:259 src/window.py:426 src/window.py:457
+#: src/window.py:551 src/window.py:710 src/properties_window.py:87
+#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
 #: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
 #: src/downgrade.blp:16
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/window.py:196 src/window.py:260
+#: src/window.py:196 src/window.py:260 src/window.py:354
 msgid "Uninstall"
 msgstr "Désinstaller"
 
 #: src/window.py:202
 msgid "Cannot uninstall while already uninstalling"
-msgstr "Impossible de désinstaller lorsqu'une désinstallation est déjà en cours"
+msgstr ""
+"Impossible de désinstaller lorsqu'une désinstallation est déjà en cours"
 
 #. Create Widgets
 #: src/window.py:233
@@ -134,204 +140,285 @@ msgstr "Désinstaller {} ?"
 msgid "It will not be possible to use {} after removal."
 msgstr "Il ne sera pas possible d'utiliser {} après sa désinstallation."
 
-#: src/window.py:300 src/window.py:304
-msgid "EOL"
-msgstr "Fin de vie"
+#: src/window.py:240
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring this app's settings and content"
+msgstr ""
+"Permettre la restauration des paramètres et du contenu de l'application"
 
-#: src/window.py:300 src/properties_window.py:19
+#: src/window.py:241
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send this app's settings and content to the trash"
+msgstr "Envoyer les paramètres et le contenu de l'application à la corbeille"
+
+#: src/window.py:300
+msgid "App EOL"
+msgstr ""
+
+#: src/window.py:300 src/properties_window.py:26
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
 msgid ""
-"This Flatpak has reached its End of Life and will not receive any security "
+"{} has reached its End of Life and will not receive any security updates"
+msgstr ""
+"Ce Flatpak a atteint sa fin de vie et ne recevera plus de mises à jour de "
+"sécurité"
+
+#: src/window.py:304
+msgid "Runtime EOL"
+msgstr ""
+
+#: src/window.py:304 src/properties_window.py:27
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
+msgid ""
+"{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 "Ce Flatpak a atteint sa fin de vie et ne recevera plus de mises à jour de "
 "sécurité"
 
-#: src/window.py:304 src/properties_window.py:20
-msgid ""
-"The runtime used by this app has reached its End of Life and will not "
-"receive any security updates"
+#: src/window.py:308
+msgid "Updates Disabled"
 msgstr ""
-"Le runtime utilisé par cette application a atteint sa fin de vie et ne "
-"recevra plus de mises à jour de sécurité"
 
-#: src/window.py:308
-msgid "Masked"
-msgstr "Masqué"
-
-#: src/window.py:308
-msgid "This Flatpak is masked and will not be updated"
+#: src/window.py:308 src/properties_window.py:28
+#, fuzzy
+#| msgid "This Flatpak is masked and will not be updated"
+msgid "{} is masked and will not be updated"
 msgstr "Ce Flatpak est masqué et ne sera pas mis à jour"
 
-#: src/window.py:314 src/properties_window.py:156
+#. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
+#: src/window.py:313 src/properties_window.py:159
 msgid "View Properties"
 msgstr "Voir les propriétés"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:339
+#: src/window.py:334
 msgid "Copied name"
 msgstr "Nom copié"
 
-#: src/window.py:340
+#: src/window.py:335
 msgid "Copy Name"
 msgstr "Copier le nom"
 
-#: src/window.py:342
+#: src/window.py:337
 msgid "Copied ID"
 msgstr "ID copié"
 
-#: src/window.py:343
+#: src/window.py:338
 msgid "Copy ID"
 msgstr "Copier l'ID"
 
-#: src/window.py:345
+#: src/window.py:340
 msgid "Copied ref"
 msgstr "Réf copiée"
 
-#: src/window.py:346
+#: src/window.py:341
 msgid "Copy Ref"
 msgstr "Copier la réf"
 
-#: src/window.py:348
+#: src/window.py:343
 msgid "Copied launch command"
 msgstr "Commande de démarrage copiée"
 
-#: src/window.py:349
+#: src/window.py:344
 msgid "Copy Launch Command"
 msgstr "Copier la commande de démarrage"
 
-#: src/window.py:351 src/window.py:418
+#: src/window.py:346 src/window.py:474
 msgid "Copy"
 msgstr "Copier"
 
-#: src/window.py:353
+#: src/window.py:349
 msgid "Opened {}"
 msgstr "{} ouvert"
 
-#: src/window.py:354
-msgid "Open {}"
+#: src/window.py:350
+#, fuzzy
+#| msgid "Open {}"
+msgid "Open"
 msgstr "Ouvrir {}"
 
-#: src/window.py:359
-msgid "Toggle Mask"
-msgstr "Basculer le masquage"
+#: src/window.py:358 src/window.py:459 src/downgrade.blp:40
+msgid "Disable Updates"
+msgstr ""
 
-#: src/window.py:368
-msgid "Uninstall {}"
-msgstr "Désinstaller {}"
+#: src/window.py:363 src/properties_window.py:187
+msgid "Enable Updates"
+msgstr ""
 
-#: src/window.py:372 src/downgrade_window.py:142
-msgid "Downgrade {}"
-msgstr "Rétrograder {}"
+#: src/window.py:377 src/properties_window.py:134
+msgid "Open User Data Folder"
+msgstr ""
 
-#: src/window.py:396
-msgid "Could not toggle {}'s mask"
-msgstr "Le masquage de {} n'a pas pu être basculé"
+#: src/window.py:382 src/properties_window.py:139
+#, fuzzy
+#| msgid "Trashed user data"
+msgid "Trash User Data"
+msgstr "Données d'utilisateur envoyées à la corbeille"
 
-#: src/window.py:417
-msgid "Could not Run App"
+#: src/window.py:389 src/downgrade.blp:21
+msgid "Downgrade"
+msgstr ""
+
+#: src/window.py:410 src/properties_window.py:98 src/orphans_window.py:171
+#, fuzzy
+#| msgid "Could not Run App"
+msgid "Could not open folder"
 msgstr "Impossible de lancer l'application"
 
-#: src/window.py:423
-msgid "OK"
-msgstr "OK"
-
-#: src/window.py:441
-msgid "List refreshed"
-msgstr "Liste rafraîchie"
-
-#: src/window.py:484
-msgid "No user data for {}"
-msgstr "Aucune donnée utilisateur pour {}"
-
-#: src/window.py:487
-msgid "Can't trash user data for {}"
+#: src/window.py:418 src/window.py:543
+#, fuzzy
+#| msgid "Can't trash user data for {}"
+msgid "Could not trash user data"
 msgstr "Impossible d'envoyer les données utilisateur pour {} à la corbeille"
 
-#: src/window.py:489 src/properties_window.py:74
+#: src/window.py:422 src/window.py:545 src/properties_window.py:77
 msgid "Trashed user data"
 msgstr "Données d'utilisateur envoyées à la corbeille"
 
-#: src/window.py:493
+#: src/window.py:424
+#, fuzzy
+#| msgid "Send Selected Apps' Data to the Trash"
+msgid "Send {}'s User Data to the trash?"
+msgstr "Envoyer les données des applications sélectionnées à la corbeille"
+
+#: src/window.py:425 src/properties_window.py:85
+msgid "Your files and data for this app will be sent to the trash."
+msgstr ""
+
+#: src/window.py:428 src/window.py:552 src/properties_window.py:88
+msgid "Trash Data"
+msgstr "Envoyer les données à la corbeille"
+
+#: src/window.py:440 src/downgrade_window.py:108
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Could disable updates for {}"
+msgstr "Aucune donnée utilisateur pour {}"
+
+#: src/window.py:455
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Disable Updates for {}?"
+msgstr "Aucune donnée utilisateur pour {}"
+
+#: src/window.py:456
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
+msgid ""
+"This will mask {} ensuring it will never recieve any feature or security "
+"updates."
+msgstr ""
+"Ce Flatpak a atteint sa fin de vie et ne recevera plus de mises à jour de "
+"sécurité"
+
+#: src/window.py:473
+msgid "Could not Run App"
+msgstr "Impossible de lancer l'application"
+
+#: src/window.py:479
+msgid "OK"
+msgstr "OK"
+
+#: src/window.py:497
+msgid "List refreshed"
+msgstr "Liste rafraîchie"
+
+#: src/window.py:540
+msgid "No user data for {}"
+msgstr "Aucune donnée utilisateur pour {}"
+
+#: src/window.py:549
 msgid "Trash Selected Apps' User Data?"
 msgstr ""
 "Envoyer les données utilisateur des applications sélectionnées à la "
 "corbeille ?"
 
-#: src/window.py:493
+#: src/window.py:549
 msgid "Your files and data for these apps will be sent to the trash."
 msgstr ""
 "Vos fichiers et données pour ces applications seront envoyés à la corbeille."
 
-#: src/window.py:496 src/properties_window.py:85
-msgid "Trash Data"
-msgstr "Envoyer les données à la corbeille"
-
-#: src/window.py:547
+#: src/window.py:603
 msgid "Copied selected app names"
 msgstr "Noms des applications sélectionnées copiés"
 
-#: src/window.py:555
+#: src/window.py:611
 msgid "Copied selected app IDs"
 msgstr "IDs des applications sélectionnées copiés"
 
-#: src/window.py:563
+#: src/window.py:619
 msgid "Copied selected app refs"
 msgstr "Réfs des applications sélectionnées copiés"
 
-#: src/window.py:624 src/orphans_window.py:76
+#: src/window.py:680 src/orphans_window.py:76
 msgid "Installed successfully"
 msgstr "Installé avec succès"
 
-#: src/window.py:627
+#: src/window.py:683
 msgid "Could not install app"
 msgstr "L'application n'a pas pu être installée"
 
-#: src/window.py:652
+#: src/window.py:708
 msgid "Install {}?"
 msgstr "Installer {} ?"
 
-#: src/window.py:655 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:711 src/orphans_window.py:109 src/orphans.blp:75
 msgid "Install"
 msgstr "Installer"
 
-#: src/window.py:662 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:718 src/remotes_window.py:212 src/remotes_window.py:296
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/window.py:662
+#: src/window.py:718
 msgid "The app will be available to only you"
 msgstr "L'application ne sera disponible que pour vous"
 
-#: src/window.py:663 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:719 src/remotes_window.py:218 src/remotes_window.py:297
 msgid "System"
 msgstr "Système"
 
-#: src/window.py:663
+#: src/window.py:719
 msgid "The app will be available to every user on the system"
 msgstr "L'application sera disponible pour tous les utilisateurs du système"
 
-#: src/window.py:692
+#: src/window.py:748
 msgid "File type not supported"
 msgstr "Type de fichier non pris en charge"
 
 #: src/window.blp:12
-msgid "Refresh the List of Installed Apps"
+#, fuzzy
+#| msgid "Refresh the List of Installed Apps"
+msgid "Refresh the List"
 msgstr "Rafraîchir la liste des applications installées"
 
 #: src/window.blp:18 src/orphans.blp:14
-msgid "Search for an Installed App"
-msgstr "Chercher pour une application installée"
+msgid "Search the List"
+msgstr ""
 
 #: src/window.blp:24
-msgid "Filter Apps List"
+#, fuzzy
+#| msgid "Filter Apps List"
+msgid "Filter the List"
 msgstr "Filtrer la liste des applications"
 
 #: src/window.blp:30
 msgid "Main Menu"
 msgstr "Menu principal"
 
-#: src/window.blp:37
+#: src/window.blp:37 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "Basculer le mode sélection"
 
@@ -348,227 +435,193 @@ msgstr ""
 "peut pas voir la liste des Flatpaks installés ou bien le système n'a pas de "
 "Flatpaks installés."
 
-#. label: _("Uninstall");
-#: src/window.blp:92
+#: src/window.blp:85 src/orphans.blp:66
+msgid "Select All"
+msgstr ""
+
+#: src/window.blp:90
 msgid "Uninstall Selected Apps"
 msgstr "Désinstaller les applications sélectionnées"
 
-#. label: _("Trash User Data");
-#: src/window.blp:98
+#: src/window.blp:95
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "Envoyer les données des applications sélectionnées à la corbeille"
 
-#: src/window.blp:103
+#: src/window.blp:100
 msgid "Open Copy Menu"
 msgstr "Ouvrir le menu de copie"
 
-#: src/window.blp:114
+#: src/window.blp:111 src/gtk/help-overlay.blp:47
 msgid "Install From File"
 msgstr "Installer à partir d'un fichier"
 
-#: src/window.blp:119 src/orphans_window.py:24
+#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
 msgid "Manage Leftover Data"
 msgstr "Gérer les données résiduelles"
 
-#: src/window.blp:129 src/remotes_window.py:349
+#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
 msgid "Manage Remotes"
 msgstr "Gérer les sources"
 
-#: src/window.blp:134
+#: src/window.blp:131
 #, fuzzy
 msgid "_Keyboard Shortcuts"
 msgstr "Raccourcis _Clavier"
 
-#: src/window.blp:139
+#: src/window.blp:136
 msgid "_About Warehouse"
 msgstr "_À propos de Warehouse"
 
-#: src/window.blp:148
+#: src/window.blp:145
 msgid "Copy Names"
 msgstr "Copier les noms"
 
-#: src/window.blp:153
+#: src/window.blp:150
 msgid "Copy IDs"
 msgstr "Copier les IDs"
 
-#: src/window.blp:158
+#: src/window.blp:155
 msgid "Copy Refs"
 msgstr "Copier les réfs"
 
-#: src/window.blp:167
+#: src/window.blp:164
 msgid "Open app"
 msgstr "Ouvrir l'application"
 
 #: src/gtk/help-overlay.blp:11
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "App Management"
 msgid "App Management"
 msgstr "Gestion d'applications"
 
 #: src/gtk/help-overlay.blp:14
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Search"
 msgid "Search"
 msgstr "Recherche"
 
-#: src/gtk/help-overlay.blp:19
-msgctxt "shortcut window"
-msgid "Set a Filter"
-msgstr "Définir un filtre"
+#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+msgid "Set Filters"
+msgstr ""
 
 #: src/gtk/help-overlay.blp:24
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Refresh"
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/gtk/help-overlay.blp:29
-msgctxt "shortcut window"
-msgid "Toggle Selection Mode"
-msgstr "Basculer le mode sélection"
-
 #: src/gtk/help-overlay.blp:34
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "More Functions"
 msgid "More Functions"
 msgstr "Plus de fonctions"
 
-#: src/gtk/help-overlay.blp:37
-msgctxt "shortcut window"
-msgid "Manage Leftover Data"
-msgstr "Gérer les données résiduelles"
-
-#: src/gtk/help-overlay.blp:42
-msgctxt "shortcut window"
-msgid "Manage Remotes"
-msgstr "Gérer les sources"
-
-#: src/gtk/help-overlay.blp:47
-msgctxt "shortcut window"
-msgid "Install From File"
-msgstr "Installer à partir d'un fichier"
-
 #: src/gtk/help-overlay.blp:52
-msgctxt "shortcut window"
 msgid "General"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:55
-msgctxt "shortcut window"
+#, fuzzy
+#| msgid "Open Copy Menu"
 msgid "Open Menu"
-msgstr ""
+msgstr "Ouvrir le menu de copie"
 
 #: src/gtk/help-overlay.blp:60
-msgctxt "shortcut window"
+#, fuzzy
 msgid "Show Shortcuts"
-msgstr ""
+msgstr "Raccourcis _Clavier"
 
 #: src/gtk/help-overlay.blp:65
-msgctxt "shortcut window"
 msgid "Quit"
 msgstr ""
 
-#: src/properties_window.py:7
+#: src/properties_window.py:14
 msgid "{} Properties"
 msgstr ""
 
-#: src/properties_window.py:21
-msgid "This Flatpak has been masked and will not be updated"
-msgstr ""
-
-#: src/properties_window.py:52
+#: src/properties_window.py:60
 msgid "Show Apps Using this Runtime"
 msgstr ""
 
-#: src/properties_window.py:78
-msgid "Can't trash data"
-msgstr ""
-
 #: src/properties_window.py:81
+#, fuzzy
+#| msgid "Could not install app"
+msgid "Could not trash data"
+msgstr "L'application n'a pas pu être installée"
+
+#: src/properties_window.py:84
 msgid "Send {}'s User Data to the Trash?"
 msgstr ""
 
-#: src/properties_window.py:82
-msgid "Your files and data for this app will be sent to the trash."
-msgstr ""
-
-#: src/properties_window.py:95 src/orphans_window.py:171
-msgid "Can't open folder"
-msgstr ""
-
-#: src/properties_window.py:99 src/remotes_window.py:72
+#: src/properties_window.py:102 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:131
-msgid "Open Data Folder"
-msgstr ""
-
-#: src/properties_window.py:136
-msgid "Send User Data to the Trash"
-msgstr ""
-
-#: src/properties_window.py:143 src/remotes_window.py:197
+#: src/properties_window.py:146 src/remotes_window.py:197
 #: src/remotes_window.py:294
 msgid "Name"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Description"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "App ID"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Version"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Branch"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Arch"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Origin"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installation"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Ref"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installed Size"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Options"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Runtime"
 msgstr ""
 
-#: src/properties_window.py:151
+#: src/properties_window.py:154
 msgid "Copy {}"
 msgstr ""
 
-#: src/properties_window.py:183
-msgid "Unmask"
-msgstr ""
-
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
 msgstr ""
@@ -668,8 +721,10 @@ msgid ""
 msgstr ""
 
 #: src/popular_remotes_window.py:31
-msgid "Flatpaks Repos"
-msgstr ""
+#, fuzzy
+#| msgid "Flatpaks"
+msgid "Flatpak Repos"
+msgstr "Flatpaks"
 
 #: src/popular_remotes.blp:18
 msgid "Add a Remote"
@@ -688,11 +743,13 @@ msgid "Add a Custom Remote"
 msgstr ""
 
 #: src/orphans_window.py:78
-msgid "Some apps didn't install"
-msgstr ""
+#, fuzzy
+#| msgid "Could not uninstall some apps"
+msgid "Could not install some apps"
+msgstr "Certaines applications n'ont pas pu être désinstallées"
 
 #: src/orphans_window.py:81
-msgid "Installing... This could take a while"
+msgid "Installing… This could take a while"
 msgstr ""
 
 #. Make window unable to close
@@ -728,22 +785,14 @@ msgstr ""
 msgid "Open the User Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57 src/filter.blp:85
+#: src/orphans.blp:57
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58 src/filter.blp:86
+#: src/orphans.blp:58
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/orphans.blp:66
-msgid "Select All"
-msgstr ""
-
-#: src/filter.blp:7
-msgid "Set Filters"
-msgstr ""
-
 #: src/filter.blp:21
 msgid "Apply"
 msgstr ""
@@ -764,10 +813,6 @@ msgstr ""
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/filter.blp:76
-msgid "Clear Filters"
-msgstr ""
-
 #: src/downgrade_window.py:76
 msgid "Commit Hash: {}"
 msgstr ""
@@ -776,36 +821,75 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
-#: src/downgrade_window.py:108
-msgid "Could not mask {}"
-msgstr ""
-
 #: src/downgrade_window.py:116
-msgid "Downgrading..."
-msgstr ""
+#, fuzzy
+#| msgid "Downgrade {}"
+msgid "Downgrading…"
+msgstr "Rétrograder {}"
+
+#: src/downgrade_window.py:142
+msgid "Downgrade {}"
+msgstr "Rétrograder {}"
 
 #: src/downgrade_window.py:153
-msgid "Fetching Releases..."
+msgid "Fetching Releases…"
 msgstr ""
 
-#: src/downgrade.blp:21
-msgid "Downgrade"
+#: src/downgrade_window.py:155
+msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:40
-msgid "Mask this Flatpak"
-msgstr ""
-
-#: src/downgrade.blp:41
-msgid "Ensure that the flatpak will never be updated to a newer version"
-msgstr ""
-
-#: src/downgrade.blp:47
+#: src/downgrade.blp:46
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:48
+#: src/downgrade.blp:47
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
 msgstr ""
+
+#~ msgid "EOL"
+#~ msgstr "Fin de vie"
+
+#~ msgid ""
+#~ "The runtime used by this app has reached its End of Life and will not "
+#~ "receive any security updates"
+#~ msgstr ""
+#~ "Le runtime utilisé par cette application a atteint sa fin de vie et ne "
+#~ "recevra plus de mises à jour de sécurité"
+
+#~ msgid "Masked"
+#~ msgstr "Masqué"
+
+#~ msgid "Toggle Mask"
+#~ msgstr "Basculer le masquage"
+
+#~ msgid "Uninstall {}"
+#~ msgstr "Désinstaller {}"
+
+#~ msgid "Could not toggle {}'s mask"
+#~ msgstr "Le masquage de {} n'a pas pu être basculé"
+
+#~ msgid "Search for an Installed App"
+#~ msgstr "Chercher pour une application installée"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Set a Filter"
+#~ msgstr "Définir un filtre"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Toggle Selection Mode"
+#~ msgstr "Basculer le mode sélection"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Manage Leftover Data"
+#~ msgstr "Gérer les données résiduelles"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Manage Remotes"
+#~ msgstr "Gérer les sources"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Install From File"
+#~ msgstr "Installer à partir d'un fichier"
diff --git a/po/hu.po b/po/hu.po
index c246583..9bba0c2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 05:42-0400\n"
+"POT-Creation-Date: 2023-10-23 02:25-0400\n"
 "PO-Revision-Date: 2023-10-21 10:58+0000\n"
 "Last-Translator: kramo <login@kramo.hu>\n"
 "Language-Team: Hungarian <https://weblate.fyralabs.com/projects/flattool/"
@@ -66,7 +66,7 @@ msgstr "Maradék felhasználói adatok törlése"
 msgid "Reinstall apps that have leftover data"
 msgstr "Applikációk újratelepítése, amelyeknek van maradék adatuk"
 
-#: src/main.py:86
+#: src/main.py:87
 msgid "Flatpaks"
 msgstr "Flatpak-ek"
 
@@ -95,8 +95,10 @@ msgstr "App beállítások & adatok"
 msgid "Keep"
 msgstr "Megtart"
 
-#: src/window.py:167 src/window.py:240
-msgid "Allow restoring app settings and content"
+#: src/window.py:167
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring these apps' settings and content"
 msgstr ""
 "Engedélyezi az applikáció beállításainak és tartalmának helyreállítását"
 
@@ -104,19 +106,21 @@ msgstr ""
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/window.py:168 src/window.py:241
-msgid "Send app settings and content to the trash"
+#: src/window.py:168
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send these apps' settings and content to the trash"
 msgstr "Az applikáció beállításainak és tartalmának kukázása"
 
-#: src/window.py:195 src/window.py:259 src/window.py:495 src/window.py:654
-#: src/properties_window.py:84 src/remotes_window.py:59
-#: src/remotes_window.py:138 src/remotes_window.py:285
+#: src/window.py:195 src/window.py:259 src/window.py:426 src/window.py:457
+#: src/window.py:551 src/window.py:710 src/properties_window.py:87
+#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
 #: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
 #: src/downgrade.blp:16
 msgid "Cancel"
 msgstr "Mégse"
 
-#: src/window.py:196 src/window.py:260
+#: src/window.py:196 src/window.py:260 src/window.py:354
 msgid "Uninstall"
 msgstr "Eltávolítás"
 
@@ -133,199 +137,282 @@ msgstr "Eltávolítja a következőt: {}?"
 msgid "It will not be possible to use {} after removal."
 msgstr "Nem lesz lehetséges a(z) {} használata az eltávolítás után."
 
-#: src/window.py:300 src/window.py:304
-msgid "EOL"
-msgstr "Elavult"
+#: src/window.py:240
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring this app's settings and content"
+msgstr ""
+"Engedélyezi az applikáció beállításainak és tartalmának helyreállítását"
 
-#: src/window.py:300 src/properties_window.py:19
+#: src/window.py:241
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send this app's settings and content to the trash"
+msgstr "Az applikáció beállításainak és tartalmának kukázása"
+
+#: src/window.py:300
+#, fuzzy
+#| msgid "App ID"
+msgid "App EOL"
+msgstr "Azonosító"
+
+#: src/window.py:300 src/properties_window.py:26
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
 msgid ""
-"This Flatpak has reached its End of Life and will not receive any security "
+"{} has reached its End of Life and will not receive any security updates"
+msgstr "Ez a Flatpak elavult és nem fog többé biztonsági frissítéseket kapni"
+
+#: src/window.py:304
+#, fuzzy
+#| msgid "Runtime"
+msgid "Runtime EOL"
+msgstr "Futtatókörnyezet"
+
+#: src/window.py:304 src/properties_window.py:27
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
+msgid ""
+"{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr "Ez a Flatpak elavult és nem fog többé biztonsági frissítéseket kapni"
 
-#: src/window.py:304 src/properties_window.py:20
-msgid ""
-"The runtime used by this app has reached its End of Life and will not "
-"receive any security updates"
+#: src/window.py:308
+msgid "Updates Disabled"
 msgstr ""
-"A Flatpak által használt futtatókörnyezet elavult és nem fog többé "
-"biztonsági frissítéseket kapni"
 
-#: src/window.py:308
-msgid "Masked"
-msgstr "Maszkolva"
-
-#: src/window.py:308
-msgid "This Flatpak is masked and will not be updated"
+#: src/window.py:308 src/properties_window.py:28
+#, fuzzy
+#| msgid "This Flatpak is masked and will not be updated"
+msgid "{} is masked and will not be updated"
 msgstr "Ez a Flatpak maszkolva van és nem lesz frissítve"
 
-#: src/window.py:314 src/properties_window.py:156
+#. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
+#: src/window.py:313 src/properties_window.py:159
 msgid "View Properties"
 msgstr "Tulajdonságok"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:339
+#: src/window.py:334
 msgid "Copied name"
 msgstr "Név másolva"
 
-#: src/window.py:340
+#: src/window.py:335
 msgid "Copy Name"
 msgstr "Név másolása"
 
-#: src/window.py:342
+#: src/window.py:337
 msgid "Copied ID"
 msgstr "Azonosító másolva"
 
-#: src/window.py:343
+#: src/window.py:338
 msgid "Copy ID"
 msgstr "Azonosító másolása"
 
-#: src/window.py:345
+#: src/window.py:340
 msgid "Copied ref"
 msgstr "Hivatkozás másolva"
 
-#: src/window.py:346
+#: src/window.py:341
 msgid "Copy Ref"
 msgstr "Hivatkozás másolása"
 
-#: src/window.py:348
+#: src/window.py:343
 msgid "Copied launch command"
 msgstr "Indítási parancs másolva"
 
-#: src/window.py:349
+#: src/window.py:344
 msgid "Copy Launch Command"
 msgstr "Indítási parancs másolása"
 
-#: src/window.py:351 src/window.py:418
+#: src/window.py:346 src/window.py:474
 msgid "Copy"
 msgstr "Másol"
 
-#: src/window.py:353
+#: src/window.py:349
 msgid "Opened {}"
 msgstr "{} megnyitva"
 
-#: src/window.py:354
-msgid "Open {}"
+#: src/window.py:350
+#, fuzzy
+#| msgid "Open {}"
+msgid "Open"
 msgstr "{} megnyitása"
 
-#: src/window.py:359
-msgid "Toggle Mask"
-msgstr "Maszk átváltása"
+#: src/window.py:358 src/window.py:459 src/downgrade.blp:40
+msgid "Disable Updates"
+msgstr ""
 
-#: src/window.py:368
-msgid "Uninstall {}"
-msgstr "{} eltávolítása"
+#: src/window.py:363 src/properties_window.py:187
+msgid "Enable Updates"
+msgstr ""
 
-#: src/window.py:372 src/downgrade_window.py:142
-msgid "Downgrade {}"
-msgstr "{} visszafejlesztése"
+#: src/window.py:377 src/properties_window.py:134
+#, fuzzy
+#| msgid "Open the User Data Folder"
+msgid "Open User Data Folder"
+msgstr "Adatmappa megnyitása"
 
-#: src/window.py:396
-msgid "Could not toggle {}'s mask"
-msgstr "A(z) {} maszkját nem lehetett átváltani"
+#: src/window.py:382 src/properties_window.py:139
+#, fuzzy
+#| msgid "Trashed user data"
+msgid "Trash User Data"
+msgstr "Felhasználói adatok kukázva"
 
-#: src/window.py:417
-msgid "Could not Run App"
-msgstr "Az applikációt nem lehetett futtatni"
+#: src/window.py:389 src/downgrade.blp:21
+msgid "Downgrade"
+msgstr "Visszafejlesztés"
 
-#: src/window.py:423
-msgid "OK"
-msgstr "Rendben"
+#: src/window.py:410 src/properties_window.py:98 src/orphans_window.py:171
+#, fuzzy
+#| msgid "Can't open folder"
+msgid "Could not open folder"
+msgstr "Nem lehet megnyitni a mappát"
 
-#: src/window.py:441
-msgid "List refreshed"
-msgstr "Lista frissítve"
+#: src/window.py:418 src/window.py:543
+#, fuzzy
+#| msgid "Could not manage data"
+msgid "Could not trash user data"
+msgstr "Az adatok kezelése sikertelen"
 
-#: src/window.py:484
-msgid "No user data for {}"
-msgstr "A(z) {} nem tartalmaz felhasználói adatokat"
-
-#: src/window.py:487
-msgid "Can't trash user data for {}"
-msgstr "Nem lehet a(z) {} felhasználói adatait törölni"
-
-#: src/window.py:489 src/properties_window.py:74
+#: src/window.py:422 src/window.py:545 src/properties_window.py:77
 msgid "Trashed user data"
 msgstr "Felhasználói adatok kukázva"
 
-#: src/window.py:493
-msgid "Trash Selected Apps' User Data?"
-msgstr "Kukázza a kijelölt applikációk adatait?"
+#: src/window.py:424
+#, fuzzy
+#| msgid "Send {}'s User Data to the Trash?"
+msgid "Send {}'s User Data to the trash?"
+msgstr "Kukázza a(z) {} adatait?"
 
-#: src/window.py:493
-msgid "Your files and data for these apps will be sent to the trash."
+#: src/window.py:425 src/properties_window.py:85
+msgid "Your files and data for this app will be sent to the trash."
 msgstr "Az adatai a kukába lesznek helyezve."
 
-#: src/window.py:496 src/properties_window.py:85
+#: src/window.py:428 src/window.py:552 src/properties_window.py:88
 msgid "Trash Data"
 msgstr "Adatok kukázása"
 
-#: src/window.py:547
+#: src/window.py:440 src/downgrade_window.py:108
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Could disable updates for {}"
+msgstr "A(z) {} nem tartalmaz felhasználói adatokat"
+
+#: src/window.py:455
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Disable Updates for {}?"
+msgstr "A(z) {} nem tartalmaz felhasználói adatokat"
+
+#: src/window.py:456
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
+msgid ""
+"This will mask {} ensuring it will never recieve any feature or security "
+"updates."
+msgstr "Ez a Flatpak elavult és nem fog többé biztonsági frissítéseket kapni"
+
+#: src/window.py:473
+msgid "Could not Run App"
+msgstr "Az applikációt nem lehetett futtatni"
+
+#: src/window.py:479
+msgid "OK"
+msgstr "Rendben"
+
+#: src/window.py:497
+msgid "List refreshed"
+msgstr "Lista frissítve"
+
+#: src/window.py:540
+msgid "No user data for {}"
+msgstr "A(z) {} nem tartalmaz felhasználói adatokat"
+
+#: src/window.py:549
+msgid "Trash Selected Apps' User Data?"
+msgstr "Kukázza a kijelölt applikációk adatait?"
+
+#: src/window.py:549
+msgid "Your files and data for these apps will be sent to the trash."
+msgstr "Az adatai a kukába lesznek helyezve."
+
+#: src/window.py:603
 msgid "Copied selected app names"
 msgstr "A kiválasztott applikációk neve másolva"
 
-#: src/window.py:555
+#: src/window.py:611
 msgid "Copied selected app IDs"
 msgstr "A kiválasztott applikációk azonosítója másolva"
 
-#: src/window.py:563
+#: src/window.py:619
 msgid "Copied selected app refs"
 msgstr "A kiválasztott applikációk hivatkozása másolva"
 
-#: src/window.py:624 src/orphans_window.py:76
+#: src/window.py:680 src/orphans_window.py:76
 msgid "Installed successfully"
 msgstr "Sikeresen telepítve"
 
-#: src/window.py:627
+#: src/window.py:683
 msgid "Could not install app"
 msgstr "Az applikáció telepítése sikertelen"
 
-#: src/window.py:652
+#: src/window.py:708
 msgid "Install {}?"
 msgstr "{} telepítése?"
 
-#: src/window.py:655 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:711 src/orphans_window.py:109 src/orphans.blp:75
 msgid "Install"
 msgstr "Telepítés"
 
-#: src/window.py:662 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:718 src/remotes_window.py:212 src/remotes_window.py:296
 msgid "User"
 msgstr "Felhasználó"
 
-#: src/window.py:662
+#: src/window.py:718
 msgid "The app will be available to only you"
 msgstr "Az applikáció csak önnek lesz elérhető"
 
-#: src/window.py:663 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:719 src/remotes_window.py:218 src/remotes_window.py:297
 msgid "System"
 msgstr "Rendszer"
 
-#: src/window.py:663
+#: src/window.py:719
 msgid "The app will be available to every user on the system"
 msgstr "Az applikáció minden felhasználó számára elérhető lesz"
 
-#: src/window.py:692
+#: src/window.py:748
 msgid "File type not supported"
 msgstr "A fájl típus nem támogatott"
 
 #: src/window.blp:12
-msgid "Refresh the List of Installed Apps"
+#, fuzzy
+#| msgid "Refresh the List of Installed Apps"
+msgid "Refresh the List"
 msgstr "Telepített applikációk listájának frissítése"
 
 #: src/window.blp:18 src/orphans.blp:14
-msgid "Search for an Installed App"
-msgstr "Telepített app keresése"
+msgid "Search the List"
+msgstr ""
 
 #: src/window.blp:24
-msgid "Filter Apps List"
+#, fuzzy
+#| msgid "Filter Apps List"
+msgid "Filter the List"
 msgstr "Lista szűrése"
 
 #: src/window.blp:30
 msgid "Main Menu"
 msgstr "Főmenü"
 
-#: src/window.blp:37
+#: src/window.blp:37 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "Kiválasztási mód váltása"
 
@@ -341,226 +428,201 @@ msgstr ""
 "Vagy egy Flatpak sem felel meg a jelenlegi szűrőnek, vagy az applikáció nem "
 "látja a Flatpak-ek listáját, nincs egy Flatpak se telepítve."
 
-#. label: _("Uninstall");
-#: src/window.blp:92
+#: src/window.blp:85 src/orphans.blp:66
+msgid "Select All"
+msgstr "Összes kiválasztása"
+
+#: src/window.blp:90
 msgid "Uninstall Selected Apps"
 msgstr "Kiválasztott applikációk eltávolítása"
 
-#. label: _("Trash User Data");
-#: src/window.blp:98
+#: src/window.blp:95
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "Kiválasztott applikációk adatainak kukázása"
 
-#: src/window.blp:103
+#: src/window.blp:100
 msgid "Open Copy Menu"
 msgstr "Másolás menü megnyitása"
 
-#: src/window.blp:114
+#: src/window.blp:111 src/gtk/help-overlay.blp:47
 msgid "Install From File"
 msgstr "Fájlból való telepítés"
 
-#: src/window.blp:119 src/orphans_window.py:24
+#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
 msgid "Manage Leftover Data"
 msgstr "Maradék adatok kezelése"
 
-#: src/window.blp:129 src/remotes_window.py:349
+#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
 msgid "Manage Remotes"
 msgstr "Tárolók kezelése"
 
-#: src/window.blp:134
+#: src/window.blp:131
 msgid "_Keyboard Shortcuts"
 msgstr "_Billentyűparancsok"
 
-#: src/window.blp:139
+#: src/window.blp:136
 msgid "_About Warehouse"
 msgstr "_A Raktárról"
 
-#: src/window.blp:148
+#: src/window.blp:145
 msgid "Copy Names"
 msgstr "Nevek másolása"
 
-#: src/window.blp:153
+#: src/window.blp:150
 msgid "Copy IDs"
 msgstr "Azonosítók másolása"
 
-#: src/window.blp:158
+#: src/window.blp:155
 msgid "Copy Refs"
 msgstr "Hivatkozások másolása"
 
-#: src/window.blp:167
+#: src/window.blp:164
 msgid "Open app"
 msgstr "Applikáció megnyitása"
 
 #: src/gtk/help-overlay.blp:11
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "App Management"
 msgid "App Management"
 msgstr "Applikációkezelés"
 
 #: src/gtk/help-overlay.blp:14
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Search"
 msgid "Search"
 msgstr "Keresés"
 
-#: src/gtk/help-overlay.blp:19
-msgctxt "shortcut window"
-msgid "Set a Filter"
-msgstr "Szűrő beállítása"
+#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+msgid "Set Filters"
+msgstr "Szűrők beállítása"
 
 #: src/gtk/help-overlay.blp:24
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Refresh"
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: src/gtk/help-overlay.blp:29
-msgctxt "shortcut window"
-msgid "Toggle Selection Mode"
-msgstr "Kiválasztási mód váltása"
-
 #: src/gtk/help-overlay.blp:34
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "More Functions"
 msgid "More Functions"
 msgstr "Több funkció"
 
-#: src/gtk/help-overlay.blp:37
-msgctxt "shortcut window"
-msgid "Manage Leftover Data"
-msgstr "Maradék adatok kezelése"
-
-#: src/gtk/help-overlay.blp:42
-msgctxt "shortcut window"
-msgid "Manage Remotes"
-msgstr "Tárolók kezelése"
-
-#: src/gtk/help-overlay.blp:47
-msgctxt "shortcut window"
-msgid "Install From File"
-msgstr "Fájlból való telepítés"
-
 #: src/gtk/help-overlay.blp:52
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "General"
 msgid "General"
 msgstr "Általános"
 
 #: src/gtk/help-overlay.blp:55
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Open Menu"
 msgid "Open Menu"
 msgstr "Menü megnyitása"
 
 #: src/gtk/help-overlay.blp:60
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Show Shortcuts"
 msgid "Show Shortcuts"
 msgstr "Billentyűparancsok megjelenítése"
 
 #: src/gtk/help-overlay.blp:65
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Quit"
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/properties_window.py:7
+#: src/properties_window.py:14
 msgid "{} Properties"
 msgstr "{} tulajdonságai"
 
-#: src/properties_window.py:21
-msgid "This Flatpak has been masked and will not be updated"
-msgstr "Ez a Flatpak maszkolva van és nem lesz frissítve"
-
-#: src/properties_window.py:52
+#: src/properties_window.py:60
 msgid "Show Apps Using this Runtime"
 msgstr "Applikációk megjelenítése, amelyek ezt a futtatókörnyezetet használják"
 
-#: src/properties_window.py:78
-msgid "Can't trash data"
-msgstr "Az adatok kukázása sikertelen"
-
 #: src/properties_window.py:81
+#, fuzzy
+#| msgid "Could not manage data"
+msgid "Could not trash data"
+msgstr "Az adatok kezelése sikertelen"
+
+#: src/properties_window.py:84
 msgid "Send {}'s User Data to the Trash?"
 msgstr "Kukázza a(z) {} adatait?"
 
-#: src/properties_window.py:82
-msgid "Your files and data for this app will be sent to the trash."
-msgstr "Az adatai a kukába lesznek helyezve."
-
-#: src/properties_window.py:95 src/orphans_window.py:171
-msgid "Can't open folder"
-msgstr "Nem lehet megnyitni a mappát"
-
-#: src/properties_window.py:99 src/remotes_window.py:72
+#: src/properties_window.py:102 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "{} másolva"
 
-#: src/properties_window.py:131
-msgid "Open Data Folder"
-msgstr "Adatmappa megnyitása"
-
-#: src/properties_window.py:136
-msgid "Send User Data to the Trash"
-msgstr "Felhasználói adatok kukázása"
-
-#: src/properties_window.py:143 src/remotes_window.py:197
+#: src/properties_window.py:146 src/remotes_window.py:197
 #: src/remotes_window.py:294
 msgid "Name"
 msgstr "Név"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Description"
 msgstr "Leírás"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "App ID"
 msgstr "Azonosító"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Version"
 msgstr "Verzió"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Branch"
 msgstr "Ág"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Arch"
 msgstr "Architektúra"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Origin"
 msgstr "Eredet"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installation"
 msgstr "Telepítés"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Ref"
 msgstr "Hivatkozás"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Active Commit"
 msgstr "Aktív véglegesítő"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Latest Commit"
 msgstr "Legutóbbi véglegesítő"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installed Size"
 msgstr "Telepítés mérete"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Options"
 msgstr "Beállítások"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Runtime"
 msgstr "Futtatókörnyezet"
 
-#: src/properties_window.py:151
+#: src/properties_window.py:154
 msgid "Copy {}"
 msgstr "{} másolása"
 
-#: src/properties_window.py:183
-msgid "Unmask"
-msgstr "Maszk levétele"
-
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
 msgstr "Nem lehet eltávolítani a következőt: {}"
@@ -621,7 +683,8 @@ msgstr "Hozzáadja a {} tárolót?"
 #. [Name to show in GUI, Name of remote for system, Link to repo to add, Description of remote]
 #: src/remotes_window.py:322
 msgid "The open source, pay-what-you-want app store from elementary"
-msgstr "Az elementary nyílt forráskódú, fizessen-amennyit-akar alkalmazásüzlete"
+msgstr ""
+"Az elementary nyílt forráskódú, fizessen-amennyit-akar alkalmazásüzlete"
 
 #: src/remotes_window.py:323
 msgid "Central repository of Flatpak applications"
@@ -662,7 +725,9 @@ msgstr ""
 "A Raktár nem látja a tárolók listáját, vagy nincs egy tároló se a rendszeren"
 
 #: src/popular_remotes_window.py:31
-msgid "Flatpaks Repos"
+#, fuzzy
+#| msgid "Flatpaks Repos"
+msgid "Flatpak Repos"
 msgstr "Flatpak tárolók"
 
 #: src/popular_remotes.blp:18
@@ -682,11 +747,15 @@ msgid "Add a Custom Remote"
 msgstr "Egyedi tároló hozzáadása"
 
 #: src/orphans_window.py:78
-msgid "Some apps didn't install"
-msgstr "Pár appot nem lehetett telepíteni"
+#, fuzzy
+#| msgid "Could not uninstall some apps"
+msgid "Could not install some apps"
+msgstr "Pár applikációt nem lehetett eltávolítani"
 
 #: src/orphans_window.py:81
-msgid "Installing... This could take a while"
+#, fuzzy
+#| msgid "Installing... This could take a while"
+msgid "Installing… This could take a while"
 msgstr "Telepítés… Ez eltarthat egy ideig"
 
 #. Make window unable to close
@@ -724,22 +793,14 @@ msgstr "Az adatok kezelése sikertelen"
 msgid "Open the User Data Folder"
 msgstr "Adatmappa megnyitása"
 
-#: src/orphans.blp:57 src/filter.blp:85
+#: src/orphans.blp:57
 msgid "No Leftover Data"
 msgstr "Nincsenek maradék adatok"
 
-#: src/orphans.blp:58 src/filter.blp:86
+#: src/orphans.blp:58
 msgid "There is no leftover user data"
 msgstr "Nincsenek maradék adatok"
 
-#: src/orphans.blp:66
-msgid "Select All"
-msgstr "Összes kiválasztása"
-
-#: src/filter.blp:7
-msgid "Set Filters"
-msgstr "Szűrők beállítása"
-
 #: src/filter.blp:21
 msgid "Apply"
 msgstr "Alkalmaz"
@@ -760,10 +821,6 @@ msgstr "Applikációk szűrése tároló alapján"
 msgid "Filter Apps by Runtime"
 msgstr "Applikációk szűrése futtatókörnyezet alapján"
 
-#: src/filter.blp:76
-msgid "Clear Filters"
-msgstr "Szűrők törlése"
-
 #: src/downgrade_window.py:76
 msgid "Commit Hash: {}"
 msgstr "Véglegesítő hash: {}"
@@ -772,38 +829,111 @@ msgstr "Véglegesítő hash: {}"
 msgid "Could not downgrade {}"
 msgstr "A(z) {} visszafejlesztése sikertelen"
 
-#: src/downgrade_window.py:108
-msgid "Could not mask {}"
-msgstr "A(z) {} maszkolása sikertelen"
-
 #: src/downgrade_window.py:116
-msgid "Downgrading..."
+#, fuzzy
+#| msgid "Downgrading..."
+msgid "Downgrading…"
 msgstr "Visszafejlesztés…"
 
+#: src/downgrade_window.py:142
+msgid "Downgrade {}"
+msgstr "{} visszafejlesztése"
+
 #: src/downgrade_window.py:153
-msgid "Fetching Releases..."
+#, fuzzy
+#| msgid "Fetching Releases..."
+msgid "Fetching Releases…"
 msgstr "Kiadások lekérése…"
 
-#: src/downgrade.blp:21
-msgid "Downgrade"
-msgstr "Visszafejlesztés"
-
-#: src/downgrade.blp:40
-msgid "Mask this Flatpak"
-msgstr "Flatpak maszkolása"
-
-#: src/downgrade.blp:41
-msgid "Ensure that the flatpak will never be updated to a newer version"
+#: src/downgrade_window.py:155
+#, fuzzy
+#| msgid "Ensure that the flatpak will never be updated to a newer version"
+msgid "Ensure that {} will never be updated to a newer version"
 msgstr "Biztosátja, hogy a Flatpak sose lesz frissítve"
 
-#: src/downgrade.blp:47
+#: src/downgrade.blp:46
 msgid "Select a Release"
 msgstr "Kiadás kiválasztása"
 
-#: src/downgrade.blp:48
+#: src/downgrade.blp:47
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
 msgstr ""
 "Eltávolítja a jelenlegi kiadást és telepíti a kiválasztottat. A "
 "visszafejlesztés problémákkal járhat."
+
+#~ msgid "EOL"
+#~ msgstr "Elavult"
+
+#~ msgid ""
+#~ "The runtime used by this app has reached its End of Life and will not "
+#~ "receive any security updates"
+#~ msgstr ""
+#~ "A Flatpak által használt futtatókörnyezet elavult és nem fog többé "
+#~ "biztonsági frissítéseket kapni"
+
+#~ msgid "Masked"
+#~ msgstr "Maszkolva"
+
+#~ msgid "Toggle Mask"
+#~ msgstr "Maszk átváltása"
+
+#~ msgid "Uninstall {}"
+#~ msgstr "{} eltávolítása"
+
+#~ msgid "Could not toggle {}'s mask"
+#~ msgstr "A(z) {} maszkját nem lehetett átváltani"
+
+#~ msgid "Can't trash user data for {}"
+#~ msgstr "Nem lehet a(z) {} felhasználói adatait törölni"
+
+#~ msgid "Search for an Installed App"
+#~ msgstr "Telepített app keresése"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Set a Filter"
+#~ msgstr "Szűrő beállítása"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Toggle Selection Mode"
+#~ msgstr "Kiválasztási mód váltása"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Manage Leftover Data"
+#~ msgstr "Maradék adatok kezelése"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Manage Remotes"
+#~ msgstr "Tárolók kezelése"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Install From File"
+#~ msgstr "Fájlból való telepítés"
+
+#~ msgid "This Flatpak has been masked and will not be updated"
+#~ msgstr "Ez a Flatpak maszkolva van és nem lesz frissítve"
+
+#~ msgid "Can't trash data"
+#~ msgstr "Az adatok kukázása sikertelen"
+
+#~ msgid "Open Data Folder"
+#~ msgstr "Adatmappa megnyitása"
+
+#~ msgid "Send User Data to the Trash"
+#~ msgstr "Felhasználói adatok kukázása"
+
+#~ msgid "Unmask"
+#~ msgstr "Maszk levétele"
+
+#~ msgid "Some apps didn't install"
+#~ msgstr "Pár appot nem lehetett telepíteni"
+
+#~ msgid "Clear Filters"
+#~ msgstr "Szűrők törlése"
+
+#~ msgid "Could not mask {}"
+#~ msgstr "A(z) {} maszkolása sikertelen"
+
+#~ msgid "Mask this Flatpak"
+#~ msgstr "Flatpak maszkolása"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 52996f1..15358bf 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 05:42-0400\n"
+"POT-Creation-Date: 2023-10-23 02:25-0400\n"
 "PO-Revision-Date: 2023-10-21 22:37+0000\n"
 "Last-Translator: Runar <runarcn@proton.me>\n"
 "Language-Team: Norwegian Bokmål <https://weblate.fyralabs.com/projects/"
@@ -67,7 +67,7 @@ msgstr "Find og slett gjenværende brukerdata"
 msgid "Reinstall apps that have leftover data"
 msgstr "Re-installer programmene som har gjenværende data"
 
-#: src/main.py:86
+#: src/main.py:87
 msgid "Flatpaks"
 msgstr "Flatpak-er"
 
@@ -96,8 +96,10 @@ msgstr "Programinnstillinger & Data"
 msgid "Keep"
 msgstr "Behold"
 
-#: src/window.py:167 src/window.py:240
-msgid "Allow restoring app settings and content"
+#: src/window.py:167
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring these apps' settings and content"
 msgstr "Tillat gjenopprettelse av programinnstillinger og innhold"
 
 #: src/window.py:168 src/window.py:241 src/orphans.blp:70
@@ -105,19 +107,21 @@ msgstr "Tillat gjenopprettelse av programinnstillinger og innhold"
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: src/window.py:168 src/window.py:241
-msgid "Send app settings and content to the trash"
+#: src/window.py:168
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send these apps' settings and content to the trash"
 msgstr "Slett programinnstillinger og programinnhold"
 
-#: src/window.py:195 src/window.py:259 src/window.py:495 src/window.py:654
-#: src/properties_window.py:84 src/remotes_window.py:59
-#: src/remotes_window.py:138 src/remotes_window.py:285
+#: src/window.py:195 src/window.py:259 src/window.py:426 src/window.py:457
+#: src/window.py:551 src/window.py:710 src/properties_window.py:87
+#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
 #: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
 #: src/downgrade.blp:16
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/window.py:196 src/window.py:260
+#: src/window.py:196 src/window.py:260 src/window.py:354
 msgid "Uninstall"
 msgstr "Avinstaller"
 
@@ -134,197 +138,255 @@ msgstr "Avinstaller {}?"
 msgid "It will not be possible to use {} after removal."
 msgstr "Det vil ikke være mulig å bruke {} etter fjerning."
 
-#: src/window.py:300 src/window.py:304
-msgid "EOL"
+#: src/window.py:240
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring this app's settings and content"
+msgstr "Tillat gjenopprettelse av programinnstillinger og innhold"
+
+#: src/window.py:241
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send this app's settings and content to the trash"
+msgstr "Slett programinnstillinger og programinnhold"
+
+#: src/window.py:300
+msgid "App EOL"
 msgstr ""
 
-#: src/window.py:300 src/properties_window.py:19
+#: src/window.py:300 src/properties_window.py:26
 msgid ""
-"This Flatpak has reached its End of Life and will not receive any security "
+"{} has reached its End of Life and will not receive any security updates"
+msgstr ""
+
+#: src/window.py:304
+msgid "Runtime EOL"
+msgstr ""
+
+#: src/window.py:304 src/properties_window.py:27
+msgid ""
+"{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 
-#: src/window.py:304 src/properties_window.py:20
-msgid ""
-"The runtime used by this app has reached its End of Life and will not "
-"receive any security updates"
-msgstr ""
-
 #: src/window.py:308
-msgid "Masked"
+msgid "Updates Disabled"
 msgstr ""
 
-#: src/window.py:308
-msgid "This Flatpak is masked and will not be updated"
+#: src/window.py:308 src/properties_window.py:28
+msgid "{} is masked and will not be updated"
 msgstr ""
 
-#: src/window.py:314 src/properties_window.py:156
+#. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
+#: src/window.py:313 src/properties_window.py:159
 msgid "View Properties"
 msgstr "Vis Egenskaper"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:339
+#: src/window.py:334
 msgid "Copied name"
 msgstr "Navnet er kopiert"
 
-#: src/window.py:340
+#: src/window.py:335
 msgid "Copy Name"
 msgstr "Kopier navn"
 
-#: src/window.py:342
+#: src/window.py:337
 msgid "Copied ID"
 msgstr "ID-en er kopiert"
 
-#: src/window.py:343
+#: src/window.py:338
 msgid "Copy ID"
 msgstr "Kopier ID"
 
-#: src/window.py:345
+#: src/window.py:340
 msgid "Copied ref"
 msgstr ""
 
-#: src/window.py:346
+#: src/window.py:341
 msgid "Copy Ref"
 msgstr ""
 
-#: src/window.py:348
+#: src/window.py:343
 msgid "Copied launch command"
 msgstr ""
 
-#: src/window.py:349
+#: src/window.py:344
 msgid "Copy Launch Command"
 msgstr ""
 
-#: src/window.py:351 src/window.py:418
+#: src/window.py:346 src/window.py:474
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/window.py:353
+#: src/window.py:349
 msgid "Opened {}"
 msgstr "Åpnet {}"
 
-#: src/window.py:354
-msgid "Open {}"
+#: src/window.py:350
+#, fuzzy
+#| msgid "Open {}"
+msgid "Open"
 msgstr "Åpne {}"
 
-#: src/window.py:359
-msgid "Toggle Mask"
+#: src/window.py:358 src/window.py:459 src/downgrade.blp:40
+msgid "Disable Updates"
 msgstr ""
 
-#: src/window.py:368
-msgid "Uninstall {}"
-msgstr "Avinstaller {}"
-
-#: src/window.py:372 src/downgrade_window.py:142
-msgid "Downgrade {}"
-msgstr "Nedgrader {}"
-
-#: src/window.py:396
-msgid "Could not toggle {}'s mask"
+#: src/window.py:363 src/properties_window.py:187
+msgid "Enable Updates"
 msgstr ""
 
-#: src/window.py:417
-msgid "Could not Run App"
+#: src/window.py:377 src/properties_window.py:134
+msgid "Open User Data Folder"
 msgstr ""
 
-#: src/window.py:423
-msgid "OK"
-msgstr "OK"
+#: src/window.py:382 src/properties_window.py:139
+#, fuzzy
+#| msgid "Trashed user data"
+msgid "Trash User Data"
+msgstr "Slettet brukerdata"
 
-#: src/window.py:441
-msgid "List refreshed"
+#: src/window.py:389 src/downgrade.blp:21
+msgid "Downgrade"
 msgstr ""
 
-#: src/window.py:484
-msgid "No user data for {}"
-msgstr "Ingen brukerdata funnet for {}"
+#: src/window.py:410 src/properties_window.py:98 src/orphans_window.py:171
+msgid "Could not open folder"
+msgstr ""
 
-#: src/window.py:487
-msgid "Can't trash user data for {}"
+#: src/window.py:418 src/window.py:543
+#, fuzzy
+#| msgid "Can't trash user data for {}"
+msgid "Could not trash user data"
 msgstr "Kan ikke slette brukerdata for {}"
 
-#: src/window.py:489 src/properties_window.py:74
+#: src/window.py:422 src/window.py:545 src/properties_window.py:77
 msgid "Trashed user data"
 msgstr "Slettet brukerdata"
 
-#: src/window.py:493
-msgid "Trash Selected Apps' User Data?"
-msgstr "Slett Valgte Programmers Brukerdata?"
+#: src/window.py:424
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send {}'s User Data to the trash?"
+msgstr "Slett programinnstillinger og programinnhold"
 
-#: src/window.py:493
-msgid "Your files and data for these apps will be sent to the trash."
-msgstr "Dine filer og dataer for disse programmene vil bli slettet."
+#: src/window.py:425 src/properties_window.py:85
+msgid "Your files and data for this app will be sent to the trash."
+msgstr ""
 
-#: src/window.py:496 src/properties_window.py:85
+#: src/window.py:428 src/window.py:552 src/properties_window.py:88
 msgid "Trash Data"
 msgstr "Slett Data"
 
-#: src/window.py:547
+#: src/window.py:440 src/downgrade_window.py:108
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Could disable updates for {}"
+msgstr "Ingen brukerdata funnet for {}"
+
+#: src/window.py:455
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Disable Updates for {}?"
+msgstr "Ingen brukerdata funnet for {}"
+
+#: src/window.py:456
+msgid ""
+"This will mask {} ensuring it will never recieve any feature or security "
+"updates."
+msgstr ""
+
+#: src/window.py:473
+msgid "Could not Run App"
+msgstr ""
+
+#: src/window.py:479
+msgid "OK"
+msgstr "OK"
+
+#: src/window.py:497
+msgid "List refreshed"
+msgstr ""
+
+#: src/window.py:540
+msgid "No user data for {}"
+msgstr "Ingen brukerdata funnet for {}"
+
+#: src/window.py:549
+msgid "Trash Selected Apps' User Data?"
+msgstr "Slett Valgte Programmers Brukerdata?"
+
+#: src/window.py:549
+msgid "Your files and data for these apps will be sent to the trash."
+msgstr "Dine filer og dataer for disse programmene vil bli slettet."
+
+#: src/window.py:603
 msgid "Copied selected app names"
 msgstr ""
 
-#: src/window.py:555
+#: src/window.py:611
 msgid "Copied selected app IDs"
 msgstr ""
 
-#: src/window.py:563
+#: src/window.py:619
 msgid "Copied selected app refs"
 msgstr ""
 
-#: src/window.py:624 src/orphans_window.py:76
+#: src/window.py:680 src/orphans_window.py:76
 msgid "Installed successfully"
 msgstr ""
 
-#: src/window.py:627
+#: src/window.py:683
 msgid "Could not install app"
 msgstr ""
 
-#: src/window.py:652
+#: src/window.py:708
 msgid "Install {}?"
 msgstr ""
 
-#: src/window.py:655 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:711 src/orphans_window.py:109 src/orphans.blp:75
 msgid "Install"
 msgstr ""
 
-#: src/window.py:662 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:718 src/remotes_window.py:212 src/remotes_window.py:296
 msgid "User"
 msgstr ""
 
-#: src/window.py:662
+#: src/window.py:718
 msgid "The app will be available to only you"
 msgstr ""
 
-#: src/window.py:663 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:719 src/remotes_window.py:218 src/remotes_window.py:297
 msgid "System"
 msgstr ""
 
-#: src/window.py:663
+#: src/window.py:719
 msgid "The app will be available to every user on the system"
 msgstr ""
 
-#: src/window.py:692
+#: src/window.py:748
 msgid "File type not supported"
 msgstr ""
 
 #: src/window.blp:12
-msgid "Refresh the List of Installed Apps"
+msgid "Refresh the List"
 msgstr ""
 
 #: src/window.blp:18 src/orphans.blp:14
-msgid "Search for an Installed App"
+msgid "Search the List"
 msgstr ""
 
 #: src/window.blp:24
-msgid "Filter Apps List"
+msgid "Filter the List"
 msgstr ""
 
 #: src/window.blp:30
 msgid "Main Menu"
 msgstr ""
 
-#: src/window.blp:37
+#: src/window.blp:37 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr ""
 
@@ -338,226 +400,179 @@ msgid ""
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
 
-#. label: _("Uninstall");
-#: src/window.blp:92
+#: src/window.blp:85 src/orphans.blp:66
+msgid "Select All"
+msgstr ""
+
+#: src/window.blp:90
 msgid "Uninstall Selected Apps"
 msgstr ""
 
-#. label: _("Trash User Data");
-#: src/window.blp:98
+#: src/window.blp:95
 msgid "Send Selected Apps' Data to the Trash"
 msgstr ""
 
-#: src/window.blp:103
+#: src/window.blp:100
 msgid "Open Copy Menu"
 msgstr ""
 
-#: src/window.blp:114
+#: src/window.blp:111 src/gtk/help-overlay.blp:47
 msgid "Install From File"
 msgstr ""
 
-#: src/window.blp:119 src/orphans_window.py:24
+#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
 msgid "Manage Leftover Data"
 msgstr ""
 
-#: src/window.blp:129 src/remotes_window.py:349
+#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
 msgid "Manage Remotes"
 msgstr ""
 
-#: src/window.blp:134
+#: src/window.blp:131
 msgid "_Keyboard Shortcuts"
 msgstr ""
 
-#: src/window.blp:139
+#: src/window.blp:136
 msgid "_About Warehouse"
 msgstr ""
 
-#: src/window.blp:148
+#: src/window.blp:145
 msgid "Copy Names"
 msgstr ""
 
-#: src/window.blp:153
+#: src/window.blp:150
 msgid "Copy IDs"
 msgstr ""
 
-#: src/window.blp:158
+#: src/window.blp:155
 msgid "Copy Refs"
 msgstr ""
 
-#: src/window.blp:167
+#: src/window.blp:164
 msgid "Open app"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:11
-msgctxt "shortcut window"
 msgid "App Management"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:14
-msgctxt "shortcut window"
 msgid "Search"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:19
-msgctxt "shortcut window"
-msgid "Set a Filter"
+#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+msgid "Set Filters"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:24
-msgctxt "shortcut window"
 msgid "Refresh"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:29
-msgctxt "shortcut window"
-msgid "Toggle Selection Mode"
-msgstr ""
-
 #: src/gtk/help-overlay.blp:34
-msgctxt "shortcut window"
 msgid "More Functions"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:37
-msgctxt "shortcut window"
-msgid "Manage Leftover Data"
-msgstr ""
-
-#: src/gtk/help-overlay.blp:42
-msgctxt "shortcut window"
-msgid "Manage Remotes"
-msgstr ""
-
-#: src/gtk/help-overlay.blp:47
-msgctxt "shortcut window"
-msgid "Install From File"
-msgstr ""
-
 #: src/gtk/help-overlay.blp:52
-msgctxt "shortcut window"
 msgid "General"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:55
-msgctxt "shortcut window"
+#, fuzzy
+#| msgid "Open {}"
 msgid "Open Menu"
-msgstr ""
+msgstr "Åpne {}"
 
 #: src/gtk/help-overlay.blp:60
-msgctxt "shortcut window"
 msgid "Show Shortcuts"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:65
-msgctxt "shortcut window"
 msgid "Quit"
 msgstr ""
 
-#: src/properties_window.py:7
+#: src/properties_window.py:14
 msgid "{} Properties"
 msgstr ""
 
-#: src/properties_window.py:21
-msgid "This Flatpak has been masked and will not be updated"
-msgstr ""
-
-#: src/properties_window.py:52
+#: src/properties_window.py:60
 msgid "Show Apps Using this Runtime"
 msgstr ""
 
-#: src/properties_window.py:78
-msgid "Can't trash data"
-msgstr ""
-
 #: src/properties_window.py:81
+#, fuzzy
+#| msgid "Could not uninstall some apps"
+msgid "Could not trash data"
+msgstr "Klarte ikke å avinstallere noen programmer"
+
+#: src/properties_window.py:84
 msgid "Send {}'s User Data to the Trash?"
 msgstr ""
 
-#: src/properties_window.py:82
-msgid "Your files and data for this app will be sent to the trash."
-msgstr ""
-
-#: src/properties_window.py:95 src/orphans_window.py:171
-msgid "Can't open folder"
-msgstr ""
-
-#: src/properties_window.py:99 src/remotes_window.py:72
+#: src/properties_window.py:102 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:131
-msgid "Open Data Folder"
-msgstr ""
-
-#: src/properties_window.py:136
-msgid "Send User Data to the Trash"
-msgstr ""
-
-#: src/properties_window.py:143 src/remotes_window.py:197
+#: src/properties_window.py:146 src/remotes_window.py:197
 #: src/remotes_window.py:294
 msgid "Name"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Description"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "App ID"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Version"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Branch"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Arch"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Origin"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installation"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Ref"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installed Size"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Options"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Runtime"
 msgstr ""
 
-#: src/properties_window.py:151
+#: src/properties_window.py:154
 msgid "Copy {}"
 msgstr ""
 
-#: src/properties_window.py:183
-msgid "Unmask"
-msgstr ""
-
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
 msgstr ""
@@ -657,8 +672,10 @@ msgid ""
 msgstr ""
 
 #: src/popular_remotes_window.py:31
-msgid "Flatpaks Repos"
-msgstr ""
+#, fuzzy
+#| msgid "Flatpaks"
+msgid "Flatpak Repos"
+msgstr "Flatpak-er"
 
 #: src/popular_remotes.blp:18
 msgid "Add a Remote"
@@ -677,11 +694,13 @@ msgid "Add a Custom Remote"
 msgstr ""
 
 #: src/orphans_window.py:78
-msgid "Some apps didn't install"
-msgstr ""
+#, fuzzy
+#| msgid "Could not uninstall some apps"
+msgid "Could not install some apps"
+msgstr "Klarte ikke å avinstallere noen programmer"
 
 #: src/orphans_window.py:81
-msgid "Installing... This could take a while"
+msgid "Installing… This could take a while"
 msgstr ""
 
 #. Make window unable to close
@@ -717,22 +736,14 @@ msgstr ""
 msgid "Open the User Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57 src/filter.blp:85
+#: src/orphans.blp:57
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58 src/filter.blp:86
+#: src/orphans.blp:58
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/orphans.blp:66
-msgid "Select All"
-msgstr ""
-
-#: src/filter.blp:7
-msgid "Set Filters"
-msgstr ""
-
 #: src/filter.blp:21
 msgid "Apply"
 msgstr ""
@@ -753,10 +764,6 @@ msgstr ""
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/filter.blp:76
-msgid "Clear Filters"
-msgstr ""
-
 #: src/downgrade_window.py:76
 msgid "Commit Hash: {}"
 msgstr ""
@@ -765,36 +772,33 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
-#: src/downgrade_window.py:108
-msgid "Could not mask {}"
-msgstr ""
-
 #: src/downgrade_window.py:116
-msgid "Downgrading..."
-msgstr ""
+#, fuzzy
+#| msgid "Downgrade {}"
+msgid "Downgrading…"
+msgstr "Nedgrader {}"
+
+#: src/downgrade_window.py:142
+msgid "Downgrade {}"
+msgstr "Nedgrader {}"
 
 #: src/downgrade_window.py:153
-msgid "Fetching Releases..."
+msgid "Fetching Releases…"
 msgstr ""
 
-#: src/downgrade.blp:21
-msgid "Downgrade"
+#: src/downgrade_window.py:155
+msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:40
-msgid "Mask this Flatpak"
-msgstr ""
-
-#: src/downgrade.blp:41
-msgid "Ensure that the flatpak will never be updated to a newer version"
-msgstr ""
-
-#: src/downgrade.blp:47
+#: src/downgrade.blp:46
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:48
+#: src/downgrade.blp:47
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
 msgstr ""
+
+#~ msgid "Uninstall {}"
+#~ msgstr "Avinstaller {}"
diff --git a/po/pl.po b/po/pl.po
index 02679df..094248f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 05:42-0400\n"
+"POT-Creation-Date: 2023-10-23 02:25-0400\n"
 "PO-Revision-Date: 2023-10-21 09:35+0000\n"
 "Last-Translator: eryn <hericiumvevo@getcryst.al>\n"
 "Language-Team: Polish <https://weblate.fyralabs.com/projects/flattool/"
@@ -70,7 +70,7 @@ msgstr "Znajdź i przenieś do kosza pozostałe dane użytkownika"
 msgid "Reinstall apps that have leftover data"
 msgstr "Zainstaluj ponownie aplikacje których danych pozostały na systemie"
 
-#: src/main.py:86
+#: src/main.py:87
 msgid "Flatpaks"
 msgstr "Flatpaki"
 
@@ -99,27 +99,27 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: src/window.py:167 src/window.py:240
-msgid "Allow restoring app settings and content"
+#: src/window.py:167
+msgid "Allow restoring these apps' settings and content"
 msgstr ""
 
 #: src/window.py:168 src/window.py:241 src/orphans.blp:70
 msgid "Trash"
 msgstr ""
 
-#: src/window.py:168 src/window.py:241
-msgid "Send app settings and content to the trash"
+#: src/window.py:168
+msgid "Send these apps' settings and content to the trash"
 msgstr ""
 
-#: src/window.py:195 src/window.py:259 src/window.py:495 src/window.py:654
-#: src/properties_window.py:84 src/remotes_window.py:59
-#: src/remotes_window.py:138 src/remotes_window.py:285
+#: src/window.py:195 src/window.py:259 src/window.py:426 src/window.py:457
+#: src/window.py:551 src/window.py:710 src/properties_window.py:87
+#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
 #: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
 #: src/downgrade.blp:16
 msgid "Cancel"
 msgstr ""
 
-#: src/window.py:196 src/window.py:260
+#: src/window.py:196 src/window.py:260 src/window.py:354
 msgid "Uninstall"
 msgstr ""
 
@@ -136,197 +136,241 @@ msgstr ""
 msgid "It will not be possible to use {} after removal."
 msgstr ""
 
-#: src/window.py:300 src/window.py:304
-msgid "EOL"
+#: src/window.py:240
+msgid "Allow restoring this app's settings and content"
 msgstr ""
 
-#: src/window.py:300 src/properties_window.py:19
+#: src/window.py:241
+msgid "Send this app's settings and content to the trash"
+msgstr ""
+
+#: src/window.py:300
+msgid "App EOL"
+msgstr ""
+
+#: src/window.py:300 src/properties_window.py:26
 msgid ""
-"This Flatpak has reached its End of Life and will not receive any security "
+"{} has reached its End of Life and will not receive any security updates"
+msgstr ""
+
+#: src/window.py:304
+msgid "Runtime EOL"
+msgstr ""
+
+#: src/window.py:304 src/properties_window.py:27
+msgid ""
+"{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr ""
 
-#: src/window.py:304 src/properties_window.py:20
-msgid ""
-"The runtime used by this app has reached its End of Life and will not "
-"receive any security updates"
-msgstr ""
-
 #: src/window.py:308
-msgid "Masked"
+msgid "Updates Disabled"
 msgstr ""
 
-#: src/window.py:308
-msgid "This Flatpak is masked and will not be updated"
+#: src/window.py:308 src/properties_window.py:28
+msgid "{} is masked and will not be updated"
 msgstr ""
 
-#: src/window.py:314 src/properties_window.py:156
+#. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
+#: src/window.py:313 src/properties_window.py:159
 msgid "View Properties"
 msgstr ""
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:339
+#: src/window.py:334
 msgid "Copied name"
 msgstr ""
 
-#: src/window.py:340
+#: src/window.py:335
 msgid "Copy Name"
 msgstr ""
 
-#: src/window.py:342
+#: src/window.py:337
 msgid "Copied ID"
 msgstr ""
 
-#: src/window.py:343
+#: src/window.py:338
 msgid "Copy ID"
 msgstr ""
 
-#: src/window.py:345
+#: src/window.py:340
 msgid "Copied ref"
 msgstr ""
 
-#: src/window.py:346
+#: src/window.py:341
 msgid "Copy Ref"
 msgstr ""
 
-#: src/window.py:348
+#: src/window.py:343
 msgid "Copied launch command"
 msgstr ""
 
-#: src/window.py:349
+#: src/window.py:344
 msgid "Copy Launch Command"
 msgstr ""
 
-#: src/window.py:351 src/window.py:418
+#: src/window.py:346 src/window.py:474
 msgid "Copy"
 msgstr ""
 
-#: src/window.py:353
+#: src/window.py:349
 msgid "Opened {}"
 msgstr ""
 
-#: src/window.py:354
-msgid "Open {}"
+#: src/window.py:350
+msgid "Open"
 msgstr ""
 
-#: src/window.py:359
-msgid "Toggle Mask"
+#: src/window.py:358 src/window.py:459 src/downgrade.blp:40
+msgid "Disable Updates"
 msgstr ""
 
-#: src/window.py:368
-msgid "Uninstall {}"
+#: src/window.py:363 src/properties_window.py:187
+msgid "Enable Updates"
 msgstr ""
 
-#: src/window.py:372 src/downgrade_window.py:142
-msgid "Downgrade {}"
+#: src/window.py:377 src/properties_window.py:134
+msgid "Open User Data Folder"
 msgstr ""
 
-#: src/window.py:396
-msgid "Could not toggle {}'s mask"
+#: src/window.py:382 src/properties_window.py:139
+msgid "Trash User Data"
 msgstr ""
 
-#: src/window.py:417
-msgid "Could not Run App"
+#: src/window.py:389 src/downgrade.blp:21
+msgid "Downgrade"
 msgstr ""
 
-#: src/window.py:423
-msgid "OK"
+#: src/window.py:410 src/properties_window.py:98 src/orphans_window.py:171
+msgid "Could not open folder"
 msgstr ""
 
-#: src/window.py:441
-msgid "List refreshed"
-msgstr ""
+#: src/window.py:418 src/window.py:543
+#, fuzzy
+#| msgid "Find and trash leftover user data"
+msgid "Could not trash user data"
+msgstr "Znajdź i przenieś do kosza pozostałe dane użytkownika"
 
-#: src/window.py:484
-msgid "No user data for {}"
-msgstr ""
-
-#: src/window.py:487
-msgid "Can't trash user data for {}"
-msgstr ""
-
-#: src/window.py:489 src/properties_window.py:74
+#: src/window.py:422 src/window.py:545 src/properties_window.py:77
 msgid "Trashed user data"
 msgstr ""
 
-#: src/window.py:493
-msgid "Trash Selected Apps' User Data?"
+#: src/window.py:424
+msgid "Send {}'s User Data to the trash?"
 msgstr ""
 
-#: src/window.py:493
-msgid "Your files and data for these apps will be sent to the trash."
+#: src/window.py:425 src/properties_window.py:85
+msgid "Your files and data for this app will be sent to the trash."
 msgstr ""
 
-#: src/window.py:496 src/properties_window.py:85
+#: src/window.py:428 src/window.py:552 src/properties_window.py:88
 msgid "Trash Data"
 msgstr ""
 
-#: src/window.py:547
+#: src/window.py:440 src/downgrade_window.py:108
+msgid "Could disable updates for {}"
+msgstr ""
+
+#: src/window.py:455
+msgid "Disable Updates for {}?"
+msgstr ""
+
+#: src/window.py:456
+msgid ""
+"This will mask {} ensuring it will never recieve any feature or security "
+"updates."
+msgstr ""
+
+#: src/window.py:473
+msgid "Could not Run App"
+msgstr ""
+
+#: src/window.py:479
+msgid "OK"
+msgstr ""
+
+#: src/window.py:497
+msgid "List refreshed"
+msgstr ""
+
+#: src/window.py:540
+msgid "No user data for {}"
+msgstr ""
+
+#: src/window.py:549
+msgid "Trash Selected Apps' User Data?"
+msgstr ""
+
+#: src/window.py:549
+msgid "Your files and data for these apps will be sent to the trash."
+msgstr ""
+
+#: src/window.py:603
 msgid "Copied selected app names"
 msgstr ""
 
-#: src/window.py:555
+#: src/window.py:611
 msgid "Copied selected app IDs"
 msgstr ""
 
-#: src/window.py:563
+#: src/window.py:619
 msgid "Copied selected app refs"
 msgstr ""
 
-#: src/window.py:624 src/orphans_window.py:76
+#: src/window.py:680 src/orphans_window.py:76
 msgid "Installed successfully"
 msgstr ""
 
-#: src/window.py:627
+#: src/window.py:683
 msgid "Could not install app"
 msgstr ""
 
-#: src/window.py:652
+#: src/window.py:708
 msgid "Install {}?"
 msgstr ""
 
-#: src/window.py:655 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:711 src/orphans_window.py:109 src/orphans.blp:75
 msgid "Install"
 msgstr ""
 
-#: src/window.py:662 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:718 src/remotes_window.py:212 src/remotes_window.py:296
 msgid "User"
 msgstr ""
 
-#: src/window.py:662
+#: src/window.py:718
 msgid "The app will be available to only you"
 msgstr ""
 
-#: src/window.py:663 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:719 src/remotes_window.py:218 src/remotes_window.py:297
 msgid "System"
 msgstr ""
 
-#: src/window.py:663
+#: src/window.py:719
 msgid "The app will be available to every user on the system"
 msgstr ""
 
-#: src/window.py:692
+#: src/window.py:748
 msgid "File type not supported"
 msgstr ""
 
 #: src/window.blp:12
-msgid "Refresh the List of Installed Apps"
+msgid "Refresh the List"
 msgstr ""
 
 #: src/window.blp:18 src/orphans.blp:14
-msgid "Search for an Installed App"
+msgid "Search the List"
 msgstr ""
 
 #: src/window.blp:24
-msgid "Filter Apps List"
+msgid "Filter the List"
 msgstr ""
 
 #: src/window.blp:30
 msgid "Main Menu"
 msgstr ""
 
-#: src/window.blp:37
+#: src/window.blp:37 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr ""
 
@@ -340,226 +384,175 @@ msgid ""
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
 
-#. label: _("Uninstall");
-#: src/window.blp:92
+#: src/window.blp:85 src/orphans.blp:66
+msgid "Select All"
+msgstr ""
+
+#: src/window.blp:90
 msgid "Uninstall Selected Apps"
 msgstr ""
 
-#. label: _("Trash User Data");
-#: src/window.blp:98
+#: src/window.blp:95
 msgid "Send Selected Apps' Data to the Trash"
 msgstr ""
 
-#: src/window.blp:103
+#: src/window.blp:100
 msgid "Open Copy Menu"
 msgstr ""
 
-#: src/window.blp:114
+#: src/window.blp:111 src/gtk/help-overlay.blp:47
 msgid "Install From File"
 msgstr ""
 
-#: src/window.blp:119 src/orphans_window.py:24
+#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
 msgid "Manage Leftover Data"
 msgstr ""
 
-#: src/window.blp:129 src/remotes_window.py:349
+#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
 msgid "Manage Remotes"
 msgstr ""
 
-#: src/window.blp:134
+#: src/window.blp:131
 msgid "_Keyboard Shortcuts"
 msgstr ""
 
-#: src/window.blp:139
+#: src/window.blp:136
 msgid "_About Warehouse"
 msgstr ""
 
-#: src/window.blp:148
+#: src/window.blp:145
 msgid "Copy Names"
 msgstr ""
 
-#: src/window.blp:153
+#: src/window.blp:150
 msgid "Copy IDs"
 msgstr ""
 
-#: src/window.blp:158
+#: src/window.blp:155
 msgid "Copy Refs"
 msgstr ""
 
-#: src/window.blp:167
+#: src/window.blp:164
 msgid "Open app"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:11
-msgctxt "shortcut window"
 msgid "App Management"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:14
-msgctxt "shortcut window"
 msgid "Search"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:19
-msgctxt "shortcut window"
-msgid "Set a Filter"
+#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+msgid "Set Filters"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:24
-msgctxt "shortcut window"
 msgid "Refresh"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:29
-msgctxt "shortcut window"
-msgid "Toggle Selection Mode"
-msgstr ""
-
 #: src/gtk/help-overlay.blp:34
-msgctxt "shortcut window"
 msgid "More Functions"
 msgstr ""
 
-#: src/gtk/help-overlay.blp:37
-msgctxt "shortcut window"
-msgid "Manage Leftover Data"
-msgstr ""
-
-#: src/gtk/help-overlay.blp:42
-msgctxt "shortcut window"
-msgid "Manage Remotes"
-msgstr ""
-
-#: src/gtk/help-overlay.blp:47
-msgctxt "shortcut window"
-msgid "Install From File"
-msgstr ""
-
 #: src/gtk/help-overlay.blp:52
-msgctxt "shortcut window"
 msgid "General"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:55
-msgctxt "shortcut window"
 msgid "Open Menu"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:60
-msgctxt "shortcut window"
 msgid "Show Shortcuts"
 msgstr ""
 
 #: src/gtk/help-overlay.blp:65
-msgctxt "shortcut window"
 msgid "Quit"
 msgstr ""
 
-#: src/properties_window.py:7
+#: src/properties_window.py:14
 msgid "{} Properties"
 msgstr ""
 
-#: src/properties_window.py:21
-msgid "This Flatpak has been masked and will not be updated"
-msgstr ""
-
-#: src/properties_window.py:52
+#: src/properties_window.py:60
 msgid "Show Apps Using this Runtime"
 msgstr ""
 
-#: src/properties_window.py:78
-msgid "Can't trash data"
+#: src/properties_window.py:81
+msgid "Could not trash data"
 msgstr ""
 
-#: src/properties_window.py:81
+#: src/properties_window.py:84
 msgid "Send {}'s User Data to the Trash?"
 msgstr ""
 
-#: src/properties_window.py:82
-msgid "Your files and data for this app will be sent to the trash."
-msgstr ""
-
-#: src/properties_window.py:95 src/orphans_window.py:171
-msgid "Can't open folder"
-msgstr ""
-
-#: src/properties_window.py:99 src/remotes_window.py:72
+#: src/properties_window.py:102 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr ""
 
-#: src/properties_window.py:131
-msgid "Open Data Folder"
-msgstr ""
-
-#: src/properties_window.py:136
-msgid "Send User Data to the Trash"
-msgstr ""
-
-#: src/properties_window.py:143 src/remotes_window.py:197
+#: src/properties_window.py:146 src/remotes_window.py:197
 #: src/remotes_window.py:294
 msgid "Name"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Description"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "App ID"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Version"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Branch"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Arch"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Origin"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installation"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Ref"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Active Commit"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Latest Commit"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installed Size"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Options"
 msgstr ""
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Runtime"
 msgstr ""
 
-#: src/properties_window.py:151
+#: src/properties_window.py:154
 msgid "Copy {}"
 msgstr ""
 
-#: src/properties_window.py:183
-msgid "Unmask"
-msgstr ""
-
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
 msgstr ""
@@ -659,8 +652,10 @@ msgid ""
 msgstr ""
 
 #: src/popular_remotes_window.py:31
-msgid "Flatpaks Repos"
-msgstr ""
+#, fuzzy
+#| msgid "Flatpaks"
+msgid "Flatpak Repos"
+msgstr "Flatpaki"
 
 #: src/popular_remotes.blp:18
 msgid "Add a Remote"
@@ -679,11 +674,11 @@ msgid "Add a Custom Remote"
 msgstr ""
 
 #: src/orphans_window.py:78
-msgid "Some apps didn't install"
+msgid "Could not install some apps"
 msgstr ""
 
 #: src/orphans_window.py:81
-msgid "Installing... This could take a while"
+msgid "Installing… This could take a while"
 msgstr ""
 
 #. Make window unable to close
@@ -719,22 +714,14 @@ msgstr ""
 msgid "Open the User Data Folder"
 msgstr ""
 
-#: src/orphans.blp:57 src/filter.blp:85
+#: src/orphans.blp:57
 msgid "No Leftover Data"
 msgstr ""
 
-#: src/orphans.blp:58 src/filter.blp:86
+#: src/orphans.blp:58
 msgid "There is no leftover user data"
 msgstr ""
 
-#: src/orphans.blp:66
-msgid "Select All"
-msgstr ""
-
-#: src/filter.blp:7
-msgid "Set Filters"
-msgstr ""
-
 #: src/filter.blp:21
 msgid "Apply"
 msgstr ""
@@ -755,10 +742,6 @@ msgstr ""
 msgid "Filter Apps by Runtime"
 msgstr ""
 
-#: src/filter.blp:76
-msgid "Clear Filters"
-msgstr ""
-
 #: src/downgrade_window.py:76
 msgid "Commit Hash: {}"
 msgstr ""
@@ -767,35 +750,27 @@ msgstr ""
 msgid "Could not downgrade {}"
 msgstr ""
 
-#: src/downgrade_window.py:108
-msgid "Could not mask {}"
+#: src/downgrade_window.py:116
+msgid "Downgrading…"
 msgstr ""
 
-#: src/downgrade_window.py:116
-msgid "Downgrading..."
+#: src/downgrade_window.py:142
+msgid "Downgrade {}"
 msgstr ""
 
 #: src/downgrade_window.py:153
-msgid "Fetching Releases..."
+msgid "Fetching Releases…"
 msgstr ""
 
-#: src/downgrade.blp:21
-msgid "Downgrade"
+#: src/downgrade_window.py:155
+msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/downgrade.blp:40
-msgid "Mask this Flatpak"
-msgstr ""
-
-#: src/downgrade.blp:41
-msgid "Ensure that the flatpak will never be updated to a newer version"
-msgstr ""
-
-#: src/downgrade.blp:47
+#: src/downgrade.blp:46
 msgid "Select a Release"
 msgstr ""
 
-#: src/downgrade.blp:48
+#: src/downgrade.blp:47
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
diff --git a/po/th.po b/po/th.po
index c47cd3a..7a87ba3 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 05:42-0400\n"
+"POT-Creation-Date: 2023-10-23 02:25-0400\n"
 "PO-Revision-Date: 2023-10-21 10:14+0000\n"
 "Last-Translator: Amy/Atius <www.dappertransformer@proton.me>\n"
 "Language-Team: Thai <https://weblate.fyralabs.com/projects/flattool/"
@@ -65,7 +65,7 @@ msgstr "หาและทิ้งข้อมูลที่เหลือ"
 msgid "Reinstall apps that have leftover data"
 msgstr "ติดตั้งแอปที่ยังมีข้อมูลเหลือ"
 
-#: src/main.py:86
+#: src/main.py:87
 msgid "Flatpaks"
 msgstr "Flatpaks"
 
@@ -94,27 +94,31 @@ msgstr "การตั้งค่าแอปและข้อมูล"
 msgid "Keep"
 msgstr "เก็บไว้"
 
-#: src/window.py:167 src/window.py:240
-msgid "Allow restoring app settings and content"
+#: src/window.py:167
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring these apps' settings and content"
 msgstr "อนุญาตให้กู้คืนการตั้งค่าแอปและเนื้อหา"
 
 #: src/window.py:168 src/window.py:241 src/orphans.blp:70
 msgid "Trash"
 msgstr "ทิ้ง"
 
-#: src/window.py:168 src/window.py:241
-msgid "Send app settings and content to the trash"
+#: src/window.py:168
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send these apps' settings and content to the trash"
 msgstr "ส่งการตั้งค่าแอปและเนื้อหาไปที่ถังขยะ"
 
-#: src/window.py:195 src/window.py:259 src/window.py:495 src/window.py:654
-#: src/properties_window.py:84 src/remotes_window.py:59
-#: src/remotes_window.py:138 src/remotes_window.py:285
+#: src/window.py:195 src/window.py:259 src/window.py:426 src/window.py:457
+#: src/window.py:551 src/window.py:710 src/properties_window.py:87
+#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285
 #: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17
 #: src/downgrade.blp:16
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: src/window.py:196 src/window.py:260
+#: src/window.py:196 src/window.py:260 src/window.py:354
 msgid "Uninstall"
 msgstr "ถอนการติดตั้ง"
 
@@ -131,197 +135,281 @@ msgstr "ถอนการติดตั้ง {}?"
 msgid "It will not be possible to use {} after removal."
 msgstr "คุณจะไม่สามารถใช้ {} ได้หลังจากถอนการติดตั้ง"
 
-#: src/window.py:300 src/window.py:304
-msgid "EOL"
-msgstr "EOL"
+#: src/window.py:240
+#, fuzzy
+#| msgid "Allow restoring app settings and content"
+msgid "Allow restoring this app's settings and content"
+msgstr "อนุญาตให้กู้คืนการตั้งค่าแอปและเนื้อหา"
 
-#: src/window.py:300 src/properties_window.py:19
+#: src/window.py:241
+#, fuzzy
+#| msgid "Send app settings and content to the trash"
+msgid "Send this app's settings and content to the trash"
+msgstr "ส่งการตั้งค่าแอปและเนื้อหาไปที่ถังขยะ"
+
+#: src/window.py:300
+#, fuzzy
+#| msgid "App ID"
+msgid "App EOL"
+msgstr "ไอดีชองแอป"
+
+#: src/window.py:300 src/properties_window.py:26
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
 msgid ""
-"This Flatpak has reached its End of Life and will not receive any security "
+"{} has reached its End of Life and will not receive any security updates"
+msgstr "แอปนี้ได้ถึงการจบอัปเดตและจะไม่ได้รับอัปเดต"
+
+#: src/window.py:304
+#, fuzzy
+#| msgid "Runtime"
+msgid "Runtime EOL"
+msgstr "รันไทม์"
+
+#: src/window.py:304 src/properties_window.py:27
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
+msgid ""
+"{}'s runtime has reached its End of Life and will not receive any security "
 "updates"
 msgstr "แอปนี้ได้ถึงการจบอัปเดตและจะไม่ได้รับอัปเดต"
 
-#: src/window.py:304 src/properties_window.py:20
-msgid ""
-"The runtime used by this app has reached its End of Life and will not "
-"receive any security updates"
-msgstr "รันไทม์นี้ได้ถึงการจบอัปเดตและจะไม่ได้รับอัปเดต"
-
 #: src/window.py:308
-msgid "Masked"
-msgstr "มาสก์"
+msgid "Updates Disabled"
+msgstr ""
 
-#: src/window.py:308
-msgid "This Flatpak is masked and will not be updated"
+#: src/window.py:308 src/properties_window.py:28
+#, fuzzy
+#| msgid "This Flatpak is masked and will not be updated"
+msgid "{} is masked and will not be updated"
 msgstr "แอปนี้ได้ถูกระยับยั้งอัปเดต"
 
-#: src/window.py:314 src/properties_window.py:156
+#. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not
+#: src/window.py:313 src/properties_window.py:159
 msgid "View Properties"
 msgstr "ดูคุณสมบัติ"
 
 #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model}
 #.
-#: src/window.py:339
+#: src/window.py:334
 msgid "Copied name"
 msgstr "คัดลอกชื่อแล้ว"
 
-#: src/window.py:340
+#: src/window.py:335
 msgid "Copy Name"
 msgstr "คัดลอกชื่อ"
 
-#: src/window.py:342
+#: src/window.py:337
 msgid "Copied ID"
 msgstr "คัดลอก ID แล้ว"
 
-#: src/window.py:343
+#: src/window.py:338
 msgid "Copy ID"
 msgstr "คัดลอก ID"
 
-#: src/window.py:345
+#: src/window.py:340
 msgid "Copied ref"
 msgstr "คัดลอก ref แล้ว"
 
-#: src/window.py:346
+#: src/window.py:341
 msgid "Copy Ref"
 msgstr "คัดลอก Ref"
 
-#: src/window.py:348
+#: src/window.py:343
 msgid "Copied launch command"
 msgstr "คัดลอกคำสั่งเปิดแล้ว"
 
-#: src/window.py:349
+#: src/window.py:344
 msgid "Copy Launch Command"
 msgstr "คัดลอกคำสั่งเปิด"
 
-#: src/window.py:351 src/window.py:418
+#: src/window.py:346 src/window.py:474
 msgid "Copy"
 msgstr "คัดลอก"
 
-#: src/window.py:353
+#: src/window.py:349
 msgid "Opened {}"
 msgstr "เปิด {} แล้ว"
 
-#: src/window.py:354
-msgid "Open {}"
+#: src/window.py:350
+#, fuzzy
+#| msgid "Open {}"
+msgid "Open"
 msgstr "เปิด {} แล้ว"
 
-#: src/window.py:359
-msgid "Toggle Mask"
-msgstr "สลับมาสก์"
+#: src/window.py:358 src/window.py:459 src/downgrade.blp:40
+msgid "Disable Updates"
+msgstr ""
 
-#: src/window.py:368
-msgid "Uninstall {}"
-msgstr "ถอนการติดตั้ง {}"
+#: src/window.py:363 src/properties_window.py:187
+msgid "Enable Updates"
+msgstr ""
 
-#: src/window.py:372 src/downgrade_window.py:142
-msgid "Downgrade {}"
-msgstr "ย้อนหลัง {}"
+#: src/window.py:377 src/properties_window.py:134
+#, fuzzy
+#| msgid "Open the User Data Folder"
+msgid "Open User Data Folder"
+msgstr "เปิดโฟลเดอร์ข้อมูลผู้ใช้"
 
-#: src/window.py:396
-msgid "Could not toggle {}'s mask"
-msgstr "ไม่สามารถสลับ {} มาสก์ได้"
+#: src/window.py:382 src/properties_window.py:139
+#, fuzzy
+#| msgid "Trashed user data"
+msgid "Trash User Data"
+msgstr "ทิ้งข้อมูลแล้ว"
 
-#: src/window.py:417
-msgid "Could not Run App"
-msgstr "ไม่สามารถเปิดแอปได้"
+#: src/window.py:389 src/downgrade.blp:21
+msgid "Downgrade"
+msgstr "ดาวน์เกรด"
 
-#: src/window.py:423
-msgid "OK"
-msgstr "โอเค"
+#: src/window.py:410 src/properties_window.py:98 src/orphans_window.py:171
+#, fuzzy
+#| msgid "Can't open folder"
+msgid "Could not open folder"
+msgstr "ไม่สามารถเปิดโฟลเดอร์ได้"
 
-#: src/window.py:441
-msgid "List refreshed"
-msgstr "รีเฟรชรายการแล้ว"
+#: src/window.py:418 src/window.py:543
+#, fuzzy
+#| msgid "Could not manage data"
+msgid "Could not trash user data"
+msgstr "ไม่สามารถจัดการข้อมูลได้"
 
-#: src/window.py:484
-msgid "No user data for {}"
-msgstr "ไม่มีข้อมูลของ {}"
-
-#: src/window.py:487
-msgid "Can't trash user data for {}"
-msgstr "ไม่สามารถทิ้งข้อมูลของ {} ได้"
-
-#: src/window.py:489 src/properties_window.py:74
+#: src/window.py:422 src/window.py:545 src/properties_window.py:77
 msgid "Trashed user data"
 msgstr "ทิ้งข้อมูลแล้ว"
 
-#: src/window.py:493
-msgid "Trash Selected Apps' User Data?"
-msgstr "ทิ้งข้อมูลของแอปที่เลือก?"
+#: src/window.py:424
+#, fuzzy
+#| msgid "Send {}'s User Data to the Trash?"
+msgid "Send {}'s User Data to the trash?"
+msgstr "ลบข้อมูลผู้ใช้ของ {} ไปในถังขยะหรือไม่?"
 
-#: src/window.py:493
-msgid "Your files and data for these apps will be sent to the trash."
-msgstr "โฟลเดอร์ของคุณจะถูกในไปไว้ในถังขยะ"
+#: src/window.py:425 src/properties_window.py:85
+msgid "Your files and data for this app will be sent to the trash."
+msgstr "ไฟล์ของคุณและข้อมูลสำหรับแอปนี้จะถูกในไปไว้ในถังขยะ"
 
-#: src/window.py:496 src/properties_window.py:85
+#: src/window.py:428 src/window.py:552 src/properties_window.py:88
 msgid "Trash Data"
 msgstr "ทิ้งข้อมูล"
 
-#: src/window.py:547
+#: src/window.py:440 src/downgrade_window.py:108
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Could disable updates for {}"
+msgstr "ไม่มีข้อมูลของ {}"
+
+#: src/window.py:455
+#, fuzzy
+#| msgid "No user data for {}"
+msgid "Disable Updates for {}?"
+msgstr "ไม่มีข้อมูลของ {}"
+
+#: src/window.py:456
+#, fuzzy
+#| msgid ""
+#| "This Flatpak has reached its End of Life and will not receive any "
+#| "security updates"
+msgid ""
+"This will mask {} ensuring it will never recieve any feature or security "
+"updates."
+msgstr "แอปนี้ได้ถึงการจบอัปเดตและจะไม่ได้รับอัปเดต"
+
+#: src/window.py:473
+msgid "Could not Run App"
+msgstr "ไม่สามารถเปิดแอปได้"
+
+#: src/window.py:479
+msgid "OK"
+msgstr "โอเค"
+
+#: src/window.py:497
+msgid "List refreshed"
+msgstr "รีเฟรชรายการแล้ว"
+
+#: src/window.py:540
+msgid "No user data for {}"
+msgstr "ไม่มีข้อมูลของ {}"
+
+#: src/window.py:549
+msgid "Trash Selected Apps' User Data?"
+msgstr "ทิ้งข้อมูลของแอปที่เลือก?"
+
+#: src/window.py:549
+msgid "Your files and data for these apps will be sent to the trash."
+msgstr "โฟลเดอร์ของคุณจะถูกในไปไว้ในถังขยะ"
+
+#: src/window.py:603
 msgid "Copied selected app names"
 msgstr "คัดลอกชื่อแอปที่เลือกแล้ว"
 
-#: src/window.py:555
+#: src/window.py:611
 msgid "Copied selected app IDs"
 msgstr "คัดลอก ID แอปที่เลือกแล้ว"
 
-#: src/window.py:563
+#: src/window.py:619
 msgid "Copied selected app refs"
 msgstr "คัดลอก refs แอปที่เลือกแล้ว"
 
-#: src/window.py:624 src/orphans_window.py:76
+#: src/window.py:680 src/orphans_window.py:76
 msgid "Installed successfully"
 msgstr "ติดตั้งสำเหร็จ"
 
-#: src/window.py:627
+#: src/window.py:683
 msgid "Could not install app"
 msgstr "ไม่สามารถติดตั้งแอป"
 
-#: src/window.py:652
+#: src/window.py:708
 msgid "Install {}?"
 msgstr "ติดตั้ง {}?"
 
-#: src/window.py:655 src/orphans_window.py:109 src/orphans.blp:75
+#: src/window.py:711 src/orphans_window.py:109 src/orphans.blp:75
 msgid "Install"
 msgstr "ติดตั้ง"
 
-#: src/window.py:662 src/remotes_window.py:212 src/remotes_window.py:296
+#: src/window.py:718 src/remotes_window.py:212 src/remotes_window.py:296
 msgid "User"
 msgstr "ผู้ใช้"
 
-#: src/window.py:662
+#: src/window.py:718
 msgid "The app will be available to only you"
 msgstr "แอปนี้จะใช้ได้สำหรับคุณเท่านั้น"
 
-#: src/window.py:663 src/remotes_window.py:218 src/remotes_window.py:297
+#: src/window.py:719 src/remotes_window.py:218 src/remotes_window.py:297
 msgid "System"
 msgstr "ระบบ"
 
-#: src/window.py:663
+#: src/window.py:719
 msgid "The app will be available to every user on the system"
 msgstr "แอปจะพร้อมใช้งานสำหรับผู้ใช้ทุกคนในระบบ"
 
-#: src/window.py:692
+#: src/window.py:748
 msgid "File type not supported"
 msgstr "ไม่รองรับประเภทไฟล์"
 
 #: src/window.blp:12
-msgid "Refresh the List of Installed Apps"
+#, fuzzy
+#| msgid "Refresh the List of Installed Apps"
+msgid "Refresh the List"
 msgstr "รีเฟรชรายการแอปที่ติดตั้ง"
 
 #: src/window.blp:18 src/orphans.blp:14
-msgid "Search for an Installed App"
-msgstr "ค้นหาแอปที่ติดตั้ง"
+msgid "Search the List"
+msgstr ""
 
 #: src/window.blp:24
-msgid "Filter Apps List"
+#, fuzzy
+#| msgid "Filter Apps List"
+msgid "Filter the List"
 msgstr "กรองรายการแอป"
 
 #: src/window.blp:30
 msgid "Main Menu"
 msgstr "เมนูหลัก"
 
-#: src/window.blp:37
+#: src/window.blp:37 src/gtk/help-overlay.blp:29
 msgid "Toggle Selection Mode"
 msgstr "สลับโหมดการเลือก"
 
@@ -334,229 +422,204 @@ msgid ""
 "There are either no Flatpaks that match the current filter, Warehouse cannot "
 "see the list of installed Flatpaks, or the system has no Flatpaks installed."
 msgstr ""
-"ไม่มีแอปที่ตรงกับฟิลเตอร์ของคุณ หรือ แวร์เฮาส์ "
-"ไม่สามารถดูรายการแอปที่ติดตั้งไว้ หรือระบบไม่ได้ติดตั้งแอปใดๆ"
+"ไม่มีแอปที่ตรงกับฟิลเตอร์ของคุณ หรือ แวร์เฮาส์ ไม่สามารถดูรายการแอปที่ติดตั้งไว้ "
+"หรือระบบไม่ได้ติดตั้งแอปใดๆ"
 
-#. label: _("Uninstall");
-#: src/window.blp:92
+#: src/window.blp:85 src/orphans.blp:66
+msgid "Select All"
+msgstr "เลือกทั้งหมด"
+
+#: src/window.blp:90
 msgid "Uninstall Selected Apps"
 msgstr "ถอนการติดตั้งแอปที่เลือกไว้"
 
-#. label: _("Trash User Data");
-#: src/window.blp:98
+#: src/window.blp:95
 msgid "Send Selected Apps' Data to the Trash"
 msgstr "ลบแอปที่เลือกไว้ไปที่ถังขยะ"
 
-#: src/window.blp:103
+#: src/window.blp:100
 msgid "Open Copy Menu"
 msgstr "เปิดเมนูคัดลอก"
 
-#: src/window.blp:114
+#: src/window.blp:111 src/gtk/help-overlay.blp:47
 msgid "Install From File"
 msgstr "ติดตั้งแอปจากไฟล์"
 
-#: src/window.blp:119 src/orphans_window.py:24
+#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24
 msgid "Manage Leftover Data"
 msgstr "จัดการข้อมูลหลงเหลือ"
 
-#: src/window.blp:129 src/remotes_window.py:349
+#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349
 msgid "Manage Remotes"
 msgstr "จัดการรีโมต"
 
-#: src/window.blp:134
+#: src/window.blp:131
 msgid "_Keyboard Shortcuts"
 msgstr "_คีย์ลัด"
 
-#: src/window.blp:139
+#: src/window.blp:136
 msgid "_About Warehouse"
 msgstr "_เกี่ยวกับแวร์เฮาส์"
 
-#: src/window.blp:148
+#: src/window.blp:145
 msgid "Copy Names"
 msgstr "คัดลอกชื่อ"
 
-#: src/window.blp:153
+#: src/window.blp:150
 msgid "Copy IDs"
 msgstr "คัดลอด ID"
 
-#: src/window.blp:158
+#: src/window.blp:155
 msgid "Copy Refs"
 msgstr "คัดลอก Refs"
 
-#: src/window.blp:167
+#: src/window.blp:164
 msgid "Open app"
 msgstr "เปิดแอป"
 
 #: src/gtk/help-overlay.blp:11
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "App Management"
 msgid "App Management"
 msgstr "การจัดการของแอป"
 
 #: src/gtk/help-overlay.blp:14
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Search"
 msgid "Search"
 msgstr "ค้นหา"
 
-#: src/gtk/help-overlay.blp:19
-msgctxt "shortcut window"
-msgid "Set a Filter"
-msgstr "กำหนดฟิลเตอร์"
+#: src/gtk/help-overlay.blp:19 src/filter.blp:7
+msgid "Set Filters"
+msgstr "เพิ่มตัวกรอง"
 
 #: src/gtk/help-overlay.blp:24
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Refresh"
 msgid "Refresh"
 msgstr "รีเฟรช"
 
-#: src/gtk/help-overlay.blp:29
-msgctxt "shortcut window"
-msgid "Toggle Selection Mode"
-msgstr "เปิดโหมด Selection"
-
 #: src/gtk/help-overlay.blp:34
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "More Functions"
 msgid "More Functions"
 msgstr "ฟังค์ชั่นเพิ่มเติม"
 
-#: src/gtk/help-overlay.blp:37
-msgctxt "shortcut window"
-msgid "Manage Leftover Data"
-msgstr "จัดการข้อมูลที่หลงเหลืออยู่"
-
-#: src/gtk/help-overlay.blp:42
-msgctxt "shortcut window"
-msgid "Manage Remotes"
-msgstr "จัดการรีโมต"
-
-#: src/gtk/help-overlay.blp:47
-msgctxt "shortcut window"
-msgid "Install From File"
-msgstr "ติดตั้งจากไฟล์"
-
 #: src/gtk/help-overlay.blp:52
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "General"
 msgid "General"
 msgstr "ทั่วไป"
 
 #: src/gtk/help-overlay.blp:55
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Open Menu"
 msgid "Open Menu"
 msgstr "เปิดเมนู"
 
 #: src/gtk/help-overlay.blp:60
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Show Shortcuts"
 msgid "Show Shortcuts"
 msgstr "แสดงชอร์ตคัท"
 
 #: src/gtk/help-overlay.blp:65
-msgctxt "shortcut window"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Quit"
 msgid "Quit"
 msgstr "ออก"
 
-#: src/properties_window.py:7
+#: src/properties_window.py:14
 msgid "{} Properties"
 msgstr "เกี่ยวกับ {}"
 
-#: src/properties_window.py:21
-msgid "This Flatpak has been masked and will not be updated"
-msgstr "แอปนี้ได้ถูกมาสก์ไว้และจะไม่ถูกอัพเดท"
-
-#: src/properties_window.py:52
+#: src/properties_window.py:60
 msgid "Show Apps Using this Runtime"
 msgstr "แสดงแอปที่ใช้รันไทม์นี้"
 
-#: src/properties_window.py:78
-msgid "Can't trash data"
-msgstr "ไม่สามารถลบข้อมูลไปที่ถังขยะได้"
-
 #: src/properties_window.py:81
+#, fuzzy
+#| msgid "Could not manage data"
+msgid "Could not trash data"
+msgstr "ไม่สามารถจัดการข้อมูลได้"
+
+#: src/properties_window.py:84
 msgid "Send {}'s User Data to the Trash?"
 msgstr "ลบข้อมูลผู้ใช้ของ {} ไปในถังขยะหรือไม่?"
 
-#: src/properties_window.py:82
-msgid "Your files and data for this app will be sent to the trash."
-msgstr "ไฟล์ของคุณและข้อมูลสำหรับแอปนี้จะถูกในไปไว้ในถังขยะ"
-
-#: src/properties_window.py:95 src/orphans_window.py:171
-msgid "Can't open folder"
-msgstr "ไม่สามารถเปิดโฟลเดอร์ได้"
-
-#: src/properties_window.py:99 src/remotes_window.py:72
+#: src/properties_window.py:102 src/remotes_window.py:72
 msgid "Copied {}"
 msgstr "คัดลอก {} แล้ว"
 
-#: src/properties_window.py:131
-msgid "Open Data Folder"
-msgstr "เปิดโฟลเดอร์ข้อมูล"
-
-#: src/properties_window.py:136
-msgid "Send User Data to the Trash"
-msgstr "ลบข้อมูลไปถังขยะ"
-
-#: src/properties_window.py:143 src/remotes_window.py:197
+#: src/properties_window.py:146 src/remotes_window.py:197
 #: src/remotes_window.py:294
 msgid "Name"
 msgstr "ชื่อ"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Description"
 msgstr "คำอธิบาย"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "App ID"
 msgstr "ไอดีชองแอป"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Version"
 msgstr "เวอร์ชั่น"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Branch"
 msgstr "บรานช์"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Arch"
 msgstr "Arch"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Origin"
 msgstr "ที่มา"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installation"
 msgstr "การติดตั้ง"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Ref"
 msgstr "Ref"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Active Commit"
 msgstr "Commit ที่แอ็กทิฟ"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Latest Commit"
 msgstr "Commit ล่าสุด"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Installed Size"
 msgstr "ขนาดแอป"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Options"
 msgstr "ตัวเลือก"
 
-#: src/properties_window.py:143
+#: src/properties_window.py:146
 msgid "Runtime"
 msgstr "รันไทม์"
 
-#: src/properties_window.py:151
+#: src/properties_window.py:154
 msgid "Copy {}"
 msgstr "คัดลอก {}"
 
-#: src/properties_window.py:183
-msgid "Unmask"
-msgstr "ยกเลิกการมาสก์"
-
 #: src/remotes_window.py:48
 msgid "Could not remove {}"
 msgstr "ไม่สามารถถอนการติดตั้ง {}"
@@ -656,7 +719,9 @@ msgid ""
 msgstr "แวร์เฮาส์ไม่สามารถค้นหารายการของรีโมตได้ หรือ ระบบไม่มีรีโมตใดๆที่ได้ติดตั้งไว้"
 
 #: src/popular_remotes_window.py:31
-msgid "Flatpaks Repos"
+#, fuzzy
+#| msgid "Flatpaks Repos"
+msgid "Flatpak Repos"
 msgstr "Repo ของแอป"
 
 #: src/popular_remotes.blp:18
@@ -676,11 +741,15 @@ msgid "Add a Custom Remote"
 msgstr "เพิ่มรีโมต"
 
 #: src/orphans_window.py:78
-msgid "Some apps didn't install"
-msgstr "บางแอปติดตั้งไม่สำเร็จ"
+#, fuzzy
+#| msgid "Could not uninstall some apps"
+msgid "Could not install some apps"
+msgstr "ไม่สามารถถอนการติดตั้งได้บางแอป"
 
 #: src/orphans_window.py:81
-msgid "Installing... This could take a while"
+#, fuzzy
+#| msgid "Installing... This could take a while"
+msgid "Installing… This could take a while"
 msgstr "กำลังติดตั้ง... อาจจะใช้เวลาระยะหนึ่ง"
 
 #. Make window unable to close
@@ -716,22 +785,14 @@ msgstr "ไม่สามารถจัดการข้อมูลได้
 msgid "Open the User Data Folder"
 msgstr "เปิดโฟลเดอร์ข้อมูลผู้ใช้"
 
-#: src/orphans.blp:57 src/filter.blp:85
+#: src/orphans.blp:57
 msgid "No Leftover Data"
 msgstr "ไม่มีข้อมูลเหลืออยู่"
 
-#: src/orphans.blp:58 src/filter.blp:86
+#: src/orphans.blp:58
 msgid "There is no leftover user data"
 msgstr "ไม่มีข้อมูลผู้ใช้เหลืออยู่"
 
-#: src/orphans.blp:66
-msgid "Select All"
-msgstr "เลือกทั้งหมด"
-
-#: src/filter.blp:7
-msgid "Set Filters"
-msgstr "เพิ่มตัวกรอง"
-
 #: src/filter.blp:21
 msgid "Apply"
 msgstr "เซ็ตการตั้งค่า"
@@ -752,10 +813,6 @@ msgstr "กรองแอปตามรีโมต"
 msgid "Filter Apps by Runtime"
 msgstr "กรองแอปตามสถานะการทำงาน"
 
-#: src/filter.blp:76
-msgid "Clear Filters"
-msgstr "ล้างฟิลเตอร์"
-
 #: src/downgrade_window.py:76
 msgid "Commit Hash: {}"
 msgstr "เพิ่มแฮช {}"
@@ -764,35 +821,33 @@ msgstr "เพิ่มแฮช {}"
 msgid "Could not downgrade {}"
 msgstr "ไม่สามารถดาวน์เกรด {}"
 
-#: src/downgrade_window.py:108
-msgid "Could not mask {}"
-msgstr "ไม่สามารถมาสก์ {}"
-
 #: src/downgrade_window.py:116
-msgid "Downgrading..."
+#, fuzzy
+#| msgid "Downgrading..."
+msgid "Downgrading…"
 msgstr "กำลังดาวน์เกรด"
 
+#: src/downgrade_window.py:142
+msgid "Downgrade {}"
+msgstr "ย้อนหลัง {}"
+
 #: src/downgrade_window.py:153
-msgid "Fetching Releases..."
+#, fuzzy
+#| msgid "Fetching Releases..."
+msgid "Fetching Releases…"
 msgstr "กำลังค้นหารุ่น"
 
-#: src/downgrade.blp:21
-msgid "Downgrade"
-msgstr "ดาวน์เกรด"
-
-#: src/downgrade.blp:40
-msgid "Mask this Flatpak"
-msgstr "มาสก์แอปนี้"
-
-#: src/downgrade.blp:41
-msgid "Ensure that the flatpak will never be updated to a newer version"
+#: src/downgrade_window.py:155
+#, fuzzy
+#| msgid "Ensure that the flatpak will never be updated to a newer version"
+msgid "Ensure that {} will never be updated to a newer version"
 msgstr "แอปจะไม่ได้รับการอัพเดตเป็นเวอร์ชันที่ใหม่กว่า"
 
-#: src/downgrade.blp:47
+#: src/downgrade.blp:46
 msgid "Select a Release"
 msgstr "เลือกรุ่นที่ต้องการ"
 
-#: src/downgrade.blp:48
+#: src/downgrade.blp:47
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
@@ -800,6 +855,79 @@ msgstr ""
 "การดำเนินการนี้จะถอนการติดตั้งเวอร์ชันปัจจุบันและติดตั้งเวอร์ชันที่เลือกแทน "
 "โปรดทราบว่าการดาวน์เกรดอาจทำให้เกิดปัญหาได้"
 
+#~ msgid "EOL"
+#~ msgstr "EOL"
+
+#~ msgid ""
+#~ "The runtime used by this app has reached its End of Life and will not "
+#~ "receive any security updates"
+#~ msgstr "รันไทม์นี้ได้ถึงการจบอัปเดตและจะไม่ได้รับอัปเดต"
+
+#~ msgid "Masked"
+#~ msgstr "มาสก์"
+
+#~ msgid "Toggle Mask"
+#~ msgstr "สลับมาสก์"
+
+#~ msgid "Uninstall {}"
+#~ msgstr "ถอนการติดตั้ง {}"
+
+#~ msgid "Could not toggle {}'s mask"
+#~ msgstr "ไม่สามารถสลับ {} มาสก์ได้"
+
+#~ msgid "Can't trash user data for {}"
+#~ msgstr "ไม่สามารถทิ้งข้อมูลของ {} ได้"
+
+#~ msgid "Search for an Installed App"
+#~ msgstr "ค้นหาแอปที่ติดตั้ง"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Set a Filter"
+#~ msgstr "กำหนดฟิลเตอร์"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Toggle Selection Mode"
+#~ msgstr "เปิดโหมด Selection"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Manage Leftover Data"
+#~ msgstr "จัดการข้อมูลที่หลงเหลืออยู่"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Manage Remotes"
+#~ msgstr "จัดการรีโมต"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Install From File"
+#~ msgstr "ติดตั้งจากไฟล์"
+
+#~ msgid "This Flatpak has been masked and will not be updated"
+#~ msgstr "แอปนี้ได้ถูกมาสก์ไว้และจะไม่ถูกอัพเดท"
+
+#~ msgid "Can't trash data"
+#~ msgstr "ไม่สามารถลบข้อมูลไปที่ถังขยะได้"
+
+#~ msgid "Open Data Folder"
+#~ msgstr "เปิดโฟลเดอร์ข้อมูล"
+
+#~ msgid "Send User Data to the Trash"
+#~ msgstr "ลบข้อมูลไปถังขยะ"
+
+#~ msgid "Unmask"
+#~ msgstr "ยกเลิกการมาสก์"
+
+#~ msgid "Some apps didn't install"
+#~ msgstr "บางแอปติดตั้งไม่สำเร็จ"
+
+#~ msgid "Clear Filters"
+#~ msgstr "ล้างฟิลเตอร์"
+
+#~ msgid "Could not mask {}"
+#~ msgstr "ไม่สามารถมาสก์ {}"
+
+#~ msgid "Mask this Flatpak"
+#~ msgstr "มาสก์แอปนี้"
+
 #~ msgid "The main list of Flatpaks is now sorted by name instead of ID"
 #~ msgstr "Flatpak เรียงตามชื่อแทน ID"