From e93d47d6a30a0e6884839665c2e4f329e2bba99a Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:02:15 +0200
Subject: [PATCH 01/21] Add files via upload

A new icon more pretty than a text
---
 v3.dev/data/popup/icons/read.png | Bin 0 -> 421 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 v3.dev/data/popup/icons/read.png

diff --git a/v3.dev/data/popup/icons/read.png b/v3.dev/data/popup/icons/read.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3e77dadd3404a51c857d6920ea5640e103643fa
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq001Ze001Zm0ssI21Dr2900009a7bBm003M@
z003M@0Th%&K>z>&S4l)cRCwC$*guMdFcb#x+`uDv1;uh2OFM1sEG=!s(#G1x(njzG
zHeNskZy|UT_k+N)>zIF<?6BZhXWq}eJR=O*KNRx7a#@xoj$=Ydk|gW8{sr9k{p<B2
zzY|5#JkO@!s;US#zV8pipbbVR(=;X0@jS2Vx?Au#jzJKxfGo?fhVx8yT`R*))3~n7
zs#uogVLgX`UwjVddCqAge-j*@wucGdJT@V(04oiuke7lT$5DMX--99-cRWqgH4@Ws
ztJMguMkNx{py7<aQxt`e#57<GIYq9(G;Q0Sl9&dJq44KYFsIhfgU5x6FU09G4ECX>
z6wL1)J$QT*IV7v56fB$<4yggAIekMoq&Aoam%b#a8K%LdFC>k?@_FC~e&El+Cc=a*
z%QC0hw#|gYFf<3FI1}Es&CsS%7R8w`wee_Zi^dM4;6dH@fA^2T1FPo?L2YSpUhTy)
P00000NkvXXu0mjfPZ7Ah

literal 0
HcmV?d00001


From 035fee2c92b9455d8be951f051508b1abb327447 Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:04:38 +0200
Subject: [PATCH 02/21] Update messages.json V3 (fr) version

the french part or my PR
---
 v3.classic/_locales/fr/messages.json | 1343 +++++++++++---------------
 1 file changed, 586 insertions(+), 757 deletions(-)

diff --git a/v3.classic/_locales/fr/messages.json b/v3.classic/_locales/fr/messages.json
index 0561ca7b..fe77e558 100644
--- a/v3.classic/_locales/fr/messages.json
+++ b/v3.classic/_locales/fr/messages.json
@@ -1,758 +1,587 @@
 {
-    "toolbar_label": {
-        "message": "Notifier for Gmail™",
-        "description": ""
-    },
-    "tooltip_1": {
-        "message": "Clic gauche : Ouvrir Gmail ou le panneau de prévisualisation d'e-mail",
-        "description": ""
-    },
-    "tooltip_2": {
-        "message": "Clic milieu (ou Ctrl+clic gauche) : Rafraîchir tous les comptes",
-        "description": ""
-    },
-    "tooltip_3": {
-        "message": "Clic droit : Sélections des comptes",
-        "description": ""
-    },
-    "description": {
-        "message": "Notifieur multi-comptes et multi-libellés pour Google Mail (Gmail)",
-        "description": ""
-    },
-    "log_in_to_your_account": {
-        "message": "Veuillez vous connecter à votre compte Gmail",
-        "description": ""
-    },
-    "msg_1": {
-        "message": "Un onglet est déjà ouvert. Cliquez sur le bouton de la barre d'outils pour ouvrir Gmail dans un nouvel onglet, ou pour basculer sur un onglet Gmail existant.",
-        "description": ""
-    },
-    "msg_2": {
-        "message": "Le lien est copié dans le presse-papiers.",
-        "description": ""
-    },
-    "msg_3": {
-        "message": "Le texte sélectionné est copié dans le presse-papiers.",
-        "description": ""
-    },
-    "msg_4": {
-        "message": "Note : Pour que le notifieur fonctionne correctement, vous devez être connecté à votre compte Google.",
-        "description": ""
-    },
-    "msg_5": {
-        "message": "Select an audio sound file",
-        "description": ""
-    },
-    "label_1": {
-        "message": "Rafraîchir",
-        "description": ""
-    },
-    "label_2": {
-        "message": "Paramètres",
-        "description": ""
-    },
-    "label_3": {
-        "message": "Désactiver toutes les notifications",
-        "description": ""
-    },
-    "label_4": {
-        "message": "Pour 5 min",
-        "description": ""
-    },
-    "label_5": {
-        "message": "Pour 15 min",
-        "description": ""
-    },
-    "label_6": {
-        "message": "Pour 30 min",
-        "description": ""
-    },
-    "label_7": {
-        "message": "Pour 1 heure",
-        "description": ""
-    },
-    "label_8": {
-        "message": "Pour 2 heures",
-        "description": ""
-    },
-    "label_9": {
-        "message": "Pour 5 heures",
-        "description": ""
-    },
-    "label_13": {
-        "message": "For a custom time period",
-        "description": ""
-    },
-    "label_10": {
-        "message": "Enable notifications (session)",
-        "description": ""
-    },
-    "label_11": {
-        "message": "Rédiger un e-mail",
-        "description": ""
-    },
-    "label_12": {
-        "message": "Open FAQs",
-        "description": ""
-    },
-    "label_14": {
-        "message": "Logged-in accounts",
-        "description": ""
-    },
-    "unknown": {
-        "message": "inconnu",
-        "description": ""
-    },
-    "and": {
-        "message": "et",
-        "description": ""
-    },
-    "log_into_your_account": {
-        "message": "Veuillez vous connecter à votre compte",
-        "description": ""
-    },
-    "notification": {
-        "message": "De : [author_email][break]Objet : [title][break]Résumé : [summary]",
-        "description": ""
-    },
-    "options_title": {
-        "message": "Options - Gmail™ Notifier",
-        "description": ""
-    },
-    "options_inshort": {
-        "message": "Notifieur multi-comptes et multi-libellés pour Google Mail (Gmail).",
-        "description": ""
-    },
-    "options_donation": {
-        "message": "Support Development",
-        "description": ""
-    },
-    "options_timings": {
-        "message": "Timings:",
-        "description": ""
-    },
-    "options_timings_l1": {
-        "message": "Relever les nouveaux e-mails tous les (en secondes) :",
-        "description": ""
-    },
-    "options_timings_l2": {
-        "message": "La période minimum est de 10 secondes.",
-        "description": ""
-    },
-    "options_timings_l3": {
-        "message": "Rappeler les e-mails non lus toutes les (en minutes) :",
-        "description": ""
-    },
-    "options_timings_l4": {
-        "message": "Positionner la valeur à zéro pour tous les rappels non périodiques.",
-        "description": ""
-    },
-    "options_timings_l5": {
-        "message": "La période minimum est de 5 minutes.",
-        "description": ""
-    },
-    "options_timings_l6": {
-        "message": "Une valeur non nulle déclenche une notification sur le bureau et une alerte sonore (similaire à l'arrivée d'un nouvel e-mail) de façon perpétuelle si vous avez un ou plusieurs e-mails non lus.",
-        "description": ""
-    },
-    "options_timings_l7": {
-        "message": "Ne pas relever les nouveaux e-mails au démarrage avant (en secondes) :",
-        "description": ""
-    },
-    "options_timings_l8": {
-        "message": "Positionner la valeur à zéro pour éviter le relevé d'e-mails jusqu'au premier rafraîchissement manuel [Non disponible sous Safari].",
-        "description": ""
-    },
-    "options_gmail": {
-        "message": "Gmail :",
-        "description": ""
-    },
-    "options_gmail_1": {
-        "message": "Compte principal (/mail/u/0/)",
-        "description": ""
-    },
-    "options_gmail_2": {
-        "message": "Séparer les libellés par \",\" (Virgule).",
-        "description": ""
-    },
-    "options_gmail_3": {
-        "message": "2ème compte (/mail/u/1/)",
-        "description": ""
-    },
-    "options_gmail_4": {
-        "message": "3ème compte (/mail/u/2/)",
-        "description": ""
-    },
-    "options_gmail_5": {
-        "message": "4ème compte (/mail/u/3/)",
-        "description": ""
-    },
-    "options_gmail_6": {
-        "message": "5ème compte (/mail/u/4/)",
-        "description": ""
-    },
-    "options_gmail_7": {
-        "message": "6ème compte (/mail/u/5/)",
-        "description": ""
-    },
-    "options_gmail_8": {
-        "message": "Marquer le message comme lu en l'archivant",
-        "description": ""
-    },
-    "options_gmail_15": {
-        "message": "Some popular labels:",
-        "description": ""
-    },
-    "options_gmail_10": {
-        "message": "Recevoir les notifications pour les libellés et comptes suivants :",
-        "description": ""
-    },
-    "options_gmail_11": {
-        "message": "Flux personnalisés :",
-        "description": ""
-    },
-    "options_gmail_12": {
-        "message": "Séparer les flux par \",\" (Virgule). Exemple de flux : https://mail.google.com/mail/u/0/feed/atom/inbox",
-        "description": ""
-    },
-    "options_gmail_13": {
-        "message": "Note: maximum number for all labels except \"inbox\" is 20 (Google feeds only supply the 20 newest entries)",
-        "description": ""
-    },
-    "options_gmail_14": {
-        "message": "Note: for the Notifier to listen for more than 5 accounts, add feeds URLs to the \"Custom feeds\" field. For instance to listen to the 6 and 7th accounts add:  https://mail.google.com/mail/u/6/feed/atom/inbox,  https://mail.google.com/mail/u/7/feed/atom/inbox",
-        "description": ""
-    },
-    "options_notifications": {
-        "message": "Notifications :",
-        "description": ""
-    },
-    "options_notifications_1": {
-        "message": "Afficher la notification sur le bureau pour les nouveaux e-mails",
-        "description": ""
-    },
-    "options_notifications_2": {
-        "message": "Présenter la notification de bureau pendant (en secondes) :",
-        "description": ""
-    },
-    "options_notifications_3": {
-        "message": "Cette option peut ne pas fonctionner sur votre système d'exploitation.",
-        "description": ""
-    },
-    "options_notifications_4": {
-        "message": "Format de notification",
-        "description": ""
-    },
-    "options_notifications_5": {
-        "message": "Variables disponibles :",
-        "description": ""
-    },
-    "options_notifications_6": {
-        "message": "Tronquer les notifications plus longues que",
-        "description": ""
-    },
-    "options_notifications_7": {
-        "message": "caractères pour les champs [objet] et [résumé].",
-        "description": ""
-    },
-    "options_notifications_8": {
-        "message": "Pour ne pas tronquer avec des points de suspension, utiliser un nombre élevé.",
-        "description": ""
-    },
-    "options_notifications_9": {
-        "message": "Jouer l'alerte sonore pour les nouveaux e-mails",
-        "description": ""
-    },
-    "options_notifications_10": {
-        "message": "Note pour les utilisateurs de Mac. Depuis Firefox 28.0, toutes les notifications de bureau sont gérées par le \"Notification Center\" Mac qui provoque une alerte sonore supplémentaire. Vous devez désactiver soit cette notification sonore, soit celle générée par le \"Notification Center\".",
-        "description": ""
-    },
-    "options_notifications_11": {
-        "message": "Afficher la notification dans la barre de tâches Windows ou dans le dock Mac OS",
-        "description": ""
-    },
-    "options_notifications_12": {
-        "message": "Les notifications dans la barre de tâches ne sont pas supportées sous Linux pour le moment.",
-        "description": ""
-    },
-    "options_notifications_13": {
-        "message": "Ouvrir le panneau de la barre d'outils sur clic de l'icône de notification dans la barre de tâches (uniquement sous Windows, beta)",
-        "description": ""
-    },
-    "options_notifications_14": {
-        "message": "Cette fonctionnalité est hautement expérimentale et pourrait rendre instable votre navigateur Firefox. [Rédemarrage nécessaire].",
-        "description": ""
-    },
-    "options_notifications_15": {
-        "message": "Default sound notification is",
-        "description": ""
-    },
-    "options_notifications_16": {
-        "message": "Alerte par défaut Gmail Notifier",
-        "description": ""
-    },
-    "options_notifications_17": {
-        "message": "Alerte sonore \"Bell\" de l'extension \"Checker Plus\" pour Google Chrome",
-        "description": ""
-    },
-    "options_notifications_18": {
-        "message": "Alerte sonore \"Ding\" de l'extension \"Checker Plus\" pour Google Chrome",
-        "description": ""
-    },
-    "options_notifications_19": {
-        "message": "Alerte e-mail Windows",
-        "description": ""
-    },
-    "options_notifications_20": {
-        "message": "Son défini par l'utilisateur",
-        "description": ""
-    },
-    "options_notifications_21": {
-        "message": "La notification sonore définie par l'utilisateur est",
-        "description": ""
-    },
-    "options_notifications_22": {
-        "message": "If your browser is not playing the custom notification sound, try to convert it into a plain WAV format using an online conversion tool.",
-        "description": ""
-    },
-    "options_notifications_35": {
-        "message": "To select a new custom sound, select a built-in sound first and then change the option to custom sound",
-        "description": ""
-    },
-    "options_notifications_23": {
-        "message": "Le volume de la notification sonore est",
-        "description": ""
-    },
-    "options_notifications_24": {
-        "message": "Le volume est un nombre entre 0 et 100 où 100 est le volume le plus fort (défaut).",
-        "description": ""
-    },
-    "options_notifications_25": {
-        "message": "Dans Safari, il est probable que les notfications sonores par défaut ne soient pas jouées correctement. Si c'est le cas, utilisez un fichier son personnel comme notification.",
-        "description": ""
-    },
-    "options_notifications_26": {
-        "message": "Toujours afficher la notification dans la zone de notification système (uniquement sous Windows)",
-        "description": ""
-    },
-    "options_notifications_27": {
-        "message": "La notification dans la zone de notification système sera affichée même si tous les messages sont lus.",
-        "description": ""
-    },
-    "options_notifications_28": {
-        "message": "Disable all notifications for a custom time period (in minutes):",
-        "description": ""
-    },
-    "options_notifications_29": {
-        "message": "This option is related to the right click menu on the toolbar button -> disable all notifications -> custom time period.",
-        "description": ""
-    },
-    "options_notifications_30": {
-        "message": "Combine all concurrent desktop notifications into a single notification",
-        "description": ""
-    },
-    "options_notifications_31": {
-        "message": "Custom sound notification",
-        "description": ""
-    },
-    "options_notifications_32": {
-        "message": "name or email contains",
-        "description": ""
-    },
-    "options_notifications_33": {
-        "message": "email title contains",
-        "description": ""
-    },
-    "options_notifications_34": {
-        "message": "email summary contains",
-        "description": ""
-    },
-    "options_notifications_36": {
-        "message": "Ask Gmail to prevent 'inbox.google.com' redirection",
-        "description": ""
-    },
-    "options_notifications_37": {
-        "message": "Display Badge number",
-        "description": ""
-    },
-    "options_notifications_38": {
-        "message": "Faster actions (mark as read, delete, ...) (Consider actions to be resolved when headers are received)",
-        "description": ""
-    },
-    "options_notifications_40": {
-        "message": "Allow quick actions from notification box (maximum two actions) (Chrome only)",
-        "description": ""
-    },
-    "options_notifications_41": {
-        "message": "Mark as Read",
-        "description": ""
-    },
-    "options_notifications_42": {
-        "message": "Archive",
-        "description": ""
-    },
-    "options_notifications_43": {
-        "message": "Trash",
-        "description": ""
-    },
-    "options_tab": {
-        "message": "Ouverture d'onglet :",
-        "description": ""
-    },
-    "options_tab_1": {
-        "message": "Chercher un compte Gmail ouvert seulement dans la fenêtre active",
-        "description": ""
-    },
-    "options_tab_2": {
-        "message": "Ne pas chercher les comptes Gmail ouverts dans les autres fenêtres du navigateur. Si Gmail n'est pas ouvert dans la fenêtre active, ouvrir un nouvel onglet.",
-        "description": ""
-    },
-    "options_tab_3": {
-        "message": "Ouvrir un nouveau compte Gmail à côté de l'onglet actif",
-        "description": ""
-    },
-    "options_tab_4": {
-        "message": "Ouvrir un compte Gmail dans l'onglet actif",
-        "description": ""
-    },
-    "options_tab_5": {
-        "message": "Ouvrir un compte Gmail dans un onglet d'arrière-plan",
-        "description": ""
-    },
-    "options_tab_6": {
-        "message": "Ouvrir un compte Gmail dans une nouvelle fenêtre",
-        "description": ""
-    },
-    "options_tab_7": {
-        "message": "Toujours utiliser des onglets vierges au lieu d'ouvrir un nouvel onglet quand ouvrir dans un onglet est activé.",
-        "description": ""
-    },
-    "options_tab_8": {
-        "message": "Ignore opened Gmail tabs",
-        "description": ""
-    },
-    "options_tab_9": {
-        "message": "When unchecked, Gmail Notifier checks either active window or all open windows for open instance of Gmail and switch to the tab when tab opening is requested.",
-        "description": ""
-    },
-    "options_tab_10": {
-        "message": "Open emails in basic HTML mode",
-        "description": ""
-    },
-    "options_toolbar": {
-        "message": "Barre d'outils :",
-        "description": ""
-    },
-    "options_toolbar_1": {
-        "message": "Comportement du bouton de la barre d'outils",
-        "description": ""
-    },
-    "options_toolbar_2": {
-        "message": "Toujours ouvrir le panneau de prévisualisation d'e-mail",
-        "description": ""
-    },
-    "options_toolbar_3": {
-        "message": "Ouvrir un compte Gmail si un seul compte est connecté",
-        "description": ""
-    },
-    "options_toolbar_18": {
-        "message": "Open Gmail account (forced)",
-        "description": ""
-    },
-    "options_toolbar_4": {
-        "message": "Mode du panneau de la barre d'outils",
-        "description": ""
-    },
-    "options_toolbar_5": {
-        "message": "Afficher le résumé uniquement",
-        "description": ""
-    },
-    "options_toolbar_6": {
-        "message": "Afficher la totalité du contenu",
-        "description": ""
-    },
-    "options_toolbar_7": {
-        "message": "La largeur du panneau de la barre d'outils dans le mode \"contenu total\" est (en pixels) :",
-        "description": ""
-    },
-    "options_toolbar_8": {
-        "message": "La largeur minimale est de 500 pixels.",
-        "description": ""
-    },
-    "options_toolbar_9": {
-        "message": "La hauteur du panneau de la barre d'outils dans le mode \"contenu total\" est (en pixels) :",
-        "description": ""
-    },
-    "options_toolbar_10": {
-        "message": "La hauteur minimale est de 500 pixels.",
-        "description": ""
-    },
-    "options_toolbar_11": {
-        "message": "Support des raccourcis clavier dans le panneau de la barre d'outils",
-        "description": ""
-    },
-    "options_toolbar_12": {
-        "message": "! : Signaler comme spam, # : Mettre à la corbeille, e : Archiver, Shift + i : Marquer comme lu.",
-        "description": ""
-    },
-    "options_toolbar_13": {
-        "message": "Rendre les e-mails en HTML dans le mode \"contenu total\"",
-        "description": ""
-    },
-    "options_toolbar_14": {
-        "message": "Si vous préférez le rendu \"texte uniquement\" dans le mode \"contenu total\", décochez cette case.",
-        "description": ""
-    },
-    "options_toolbar_15": {
-        "message": "Cliquer avec le bouton du milieu sur bouton de la barre d'outils pour",
-        "description": ""
-    },
-    "options_toolbar_16": {
-        "message": "Rafraîchir tous les comptes",
-        "description": ""
-    },
-    "options_toolbar_17": {
-        "message": "Ouvrir le premier compte Gmail",
-        "description": ""
-    },
-    "options_misc": {
-        "message": "Divers :",
-        "description": ""
-    },
-    "options_misc_1": {
-        "message": "Trier les comptes par ordre alphabétique",
-        "description": ""
-    },
-    "options_misc_2": {
-        "message": "Le type de tri par défaut respecte l'ordre de connexions.",
-        "description": ""
-    },
-    "options_misc_3": {
-        "message": "La légende de la barre d'outils est",
-        "description": ""
-    },
-    "options_misc_4": {
-        "message": "Couleur gris pour \"Tous lus\" et couleur bleu pour \"Déconnecté\"",
-        "description": ""
-    },
-    "options_misc_5": {
-        "message": "Couleur bleu pour \"Tous lus\" et couleur gris pour \"Déconnecté\"",
-        "description": ""
-    },
-    "options_misc_9": {
-        "message": "Couleur rouge pour \"Tous lus\" et couleur gris pour \"Déconnecté\"",
-        "description": ""
-    },
-    "options_misc_6": {
-        "message": "Show desktop notification to warn that Gmail is already opened in the active tab",
-        "description": ""
-    },
-    "options_misc_7": {
-        "message": "Afficher la page de bienvenue après une mise à jour",
-        "description": ""
-    },
-    "options_misc_8": {
-        "message": "Réinitialiser tous les paramètres aux valeurs par défaut",
-        "description": ""
-    },
-    "options_misc_10": {
-        "message": "Déclencher uniquement les notifications sonores et de bureau quand un e-mail est arrivé depuis moins de (en minutes) :",
-        "description": ""
-    },
-    "options_misc_11": {
-        "message": "En positionnant cette préférence à zéro, vous ne recevrez ni de notifications de bureau ni de notifications sonores ; néanmoins, vous recevrez toujours une notification de badge.",
-        "description": ""
-    },
-    "options_misc_12": {
-        "message": "Ne pas inclure de détails d'identifiant dans la bulle textuelle",
-        "description": ""
-    },
-    "options_misc_13": {
-        "message": "Par défaut, le notifieur met à jour la bulle textuelle du bouton de la barre d'outils avec des infos d'identifiant. En désactivant cette option, la bulle textuelle restera à sa valeur par défaut.",
-        "description": ""
-    },
-    "options_misc_14": {
-        "message": "Ne pas afficher le nombre badge exact quand le nombre d'e-mails non lus est supérieur à 999",
-        "description": ""
-    },
-    "options_misc_15": {
-        "message": "Open FAQs page on updates",
-        "description": ""
-    },
-    "options_plugins": {
-        "message": "Plug-ins:",
-        "description": ""
-    },
-    "options_plugins_1": {
-        "message": "Gmail labels and star button (experimental)",
-        "description": ""
-    },
-    "options_plugins_2": {
-        "message": "This plugin displays the star button as well as thread's labels in the popup (expanded mode only).",
-        "description": ""
-    },
-    "options_px": {
-        "message": "pixel(s)",
-        "description": ""
-    },
-    "options_empty": {
-        "message": "non défini",
-        "description": ""
-    },
-    "options_button_test": {
-        "message": "Play",
-        "description": ""
-    },
-    "options_button_reset": {
-        "message": "Reset Preferences",
-        "description": ""
-    },
-    "popup_settings": {
-        "message": "paramètres",
-        "description": ""
-    },
-    "popup_of": {
-        "message": "sur",
-        "description": ""
-    },
-    "popup_wait": {
-        "message": "Patientez...",
-        "description": ""
-    },
-    "popup_date_format": {
-        "message": "%dd %mm %yy",
-        "description": ""
-    },
-    "popup_no_subject": {
-        "message": "(aucun objet)",
-        "description": ""
-    },
-    "popup_open_settings": {
-        "message": "Ouvrir les paramètres",
-        "description": ""
-    },
-    "popup_open_inbox": {
-        "message": "Ouvrir la boîte de réception",
-        "description": ""
-    },
-    "popup_archive": {
-        "message": "Archive",
-        "description": ""
-    },
-    "popup_spam": {
-        "message": "Spam",
-        "description": ""
-    },
-    "popup_trash": {
-        "message": "Corbeille",
-        "description": ""
-    },
-    "popup_refresh": {
-        "message": "Rafraîchir",
-        "description": ""
-    },
-    "popup_read": {
-        "message": "Marquer comme lu",
-        "description": ""
-    },
-    "popup_read_all": {
-        "message": "Tout marquer comme lu",
-        "description": ""
-    },
-    "popup_msg_1": {
-        "message": "à l'instant",
-        "description": ""
-    },
-    "popup_msg_2": {
-        "message": "1 minute plus tôt",
-        "description": ""
-    },
-    "popup_msg_3_format": {
-        "message": "%d minutes plus tôt",
-        "description": ""
-    },
-    "popup_msg_4": {
-        "message": "1 heure plus tôt",
-        "description": ""
-    },
-    "popup_msg_5": {
-        "message": "heures plus tôt",
-        "description": ""
-    },
-    "popup_msg_6": {
-        "message": "Hier",
-        "description": ""
-    },
-    "popup_msg_7_format": {
-        "message": "%d jours plus tôt",
-        "description": ""
-    },
-    "popup_msg_8_format": {
-        "message": "%d semaines plus tôt",
-        "description": ""
-    },
-    "popup_msg_9_format": {
-        "message": "%d mois plus tôt",
-        "description": ""
-    },
-    "popup_msg_10": {
-        "message": "Janvier",
-        "description": ""
-    },
-    "popup_msg_11": {
-        "message": "Février",
-        "description": ""
-    },
-    "popup_msg_12": {
-        "message": "Mars",
-        "description": ""
-    },
-    "popup_msg_13": {
-        "message": "Avril",
-        "description": ""
-    },
-    "popup_msg_14": {
-        "message": "Mai",
-        "description": ""
-    },
-    "popup_msg_15": {
-        "message": "Juin",
-        "description": ""
-    },
-    "popup_msg_16": {
-        "message": "Juillet",
-        "description": ""
-    },
-    "popup_msg_17": {
-        "message": "Août",
-        "description": ""
-    },
-    "popup_msg_18": {
-        "message": "Septembre",
-        "description": ""
-    },
-    "popup_msg_19": {
-        "message": "Octobre",
-        "description": ""
-    },
-    "popup_msg_20": {
-        "message": "Novembre",
-        "description": ""
-    },
-    "popup_msg_21": {
-        "message": "Décembre",
-        "description": ""
-    },
-    "settings_open_title": {
-        "message": "Open options (settings) page",
-        "description": ""
-    },
-    "settings_open_label": {
-        "message": "Open Options",
-        "description": ""
-    },
-    "gmail": {
-        "message": "Notifier for Gmail™",
-        "description": ""
-    }
-}
\ No newline at end of file
+  "gmail": {
+    "message": "Notifieur Gmail™"
+  },
+  "toolbar_label": {
+    "message": "Notifieur Gmail™"
+  },
+  "description": {
+    "message": "Notifieur multi-comptes et multi-libellés pour Google Mail (Gmail™)"
+  },
+  "log_in_to_your_account": {
+    "message": "Veuillez vous connecter à votre compte Gmail™"
+  },
+  "msg_1": {
+    "message": "L’onglet est déjà ouvert. Cliquez sur le bouton de la barre d’outils pour ouvrir Gmail™ dans un nouvel onglet ou pour passer à un onglet Gmail™ existant."
+  },
+  "msg_2": {
+    "message": "Le lien a été copié dans le presse-papiers."
+  },
+  "msg_3": {
+    "message": "Le texte sélectionné a été copié dans le presse-papiers."
+  },
+  "msg_4": {
+    "message": "Remarque : pour que le notifieur fonctionne correctement, vous devez être connecté à votre compte Google."
+  },
+  "msg_5": {
+    "message": "Choisir un fichier son audio"
+  },
+  "label_1": {
+    "message": "Rafraîchir"
+  },
+  "label_2": {
+    "message": "Paramètres"
+  },
+  "label_3": {
+    "message": "Désactiver toutes les notifications"
+  },
+  "label_4": {
+    "message": "Pour 5 min"
+  },
+  "label_5": {
+    "message": "Pour 15 min"
+  },
+  "label_6": {
+    "message": "Pour 30 min"
+  },
+  "label_7": {
+    "message": "Pour 1 heure"
+  },
+  "label_8": {
+    "message": "Pour 2 heures"
+  },
+  "label_9": {
+    "message": "Pour 5 heures"
+  },
+  "label_13": {
+    "message": "Pour la période de temps personnalisée"
+  },
+  "label_10": {
+    "message": "Activer les notifications (session)"
+  },
+  "label_11": {
+    "message": "Rédiger un e-mail"
+  },
+  "label_12": {
+    "message": "Ouvrir la FAQ"
+  },
+  "label_14": {
+    "message": "Compte(s) connecté(s) :"
+  },
+  "unknown": {
+    "message": "inconnu"
+  },
+  "and": {
+    "message": "et"
+  },
+  "log_into_your_account": {
+    "message": "Veuillez vous connecter à votre compte"
+  },
+  "notification": {
+    "message": "De : [author_email][break] Objet : [title][break] Résumé : [summary]"
+  },
+  "options_title": {
+    "message": "Options - Gmail™ Notifier"
+  },
+  "options_inshort": {
+    "message": "Notifieur multi-comptes et multi-libellés pour Google Mail (Gmail™)."
+  },
+  "options_donation": {
+    "message": "Faire un don €"
+  },
+  "options_timings": {
+    "message": "Temporisations"
+  },
+  "options_timings_l1": {
+    "message": "Relever les nouveaux e-mails toutes les (en secondes) :"
+  },
+  "options_timings_l2": {
+    "message": "La période minimum est de 10 secondes."
+  },
+  "options_timings_l3": {
+    "message": "Rappeler les e-mails non lus toutes les (en minutes) :"
+  },
+  "options_timings_l4": {
+    "message": "Positionner la valeur à zéro pour tous les rappels non périodiques."
+  },
+  "options_timings_l5": {
+    "message": "La période minimum est de 5 minutes."
+  },
+  "options_timings_l6": {
+    "message": "Une valeur non nulle déclenche une notification sur le bureau et une alerte sonore (similaire à l’arrivée d’un nouvel e-mail) de façon perpétuelle, si vous avez un ou plusieurs e-mails non lus."
+  },
+  "options_timings_l7": {
+    "message": "Ne pas relever les nouveaux e-mails au démarrage avant (en secondes) :"
+  },
+  "options_timings_l8": {
+    "message": "Positionner la valeur à zéro pour éviter le relevé d’e-mails jusqu’au premier rafraîchissement manuel [Non disponible avec Safari]."
+  },
+  "options_gmail": {
+    "message": "Gmail™"
+  },
+  "options_gmail_1": {
+    "message": "Compte principal (/mail/u/0/)"
+  },
+  "options_gmail_2": {
+    "message": "Séparer les libellés par des \",\" (virgules)."
+  },
+  "options_gmail_3": {
+    "message": "2ème compte (/mail/u/1/)"
+  },
+  "options_gmail_4": {
+    "message": "3ème compte (/mail/u/2/)"
+  },
+  "options_gmail_5": {
+    "message": "4ème compte (/mail/u/3/)"
+  },
+  "options_gmail_6": {
+    "message": "5ème compte (/mail/u/4/)"
+  },
+  "options_gmail_7": {
+    "message": "6ème compte (/mail/u/5/)"
+  },
+  "options_gmail_8": {
+    "message": "Marquer les messages comme lus en les archivant"
+  },
+  "options_gmail_15": {
+    "message": "Quelques libellés populaires :"
+  },
+  "options_gmail_10": {
+    "message": "Recevoir les notifications pour les libellés et comptes suivants :"
+  },
+  "options_gmail_11": {
+    "message": "Flux personnalisés :"
+  },
+  "options_gmail_12": {
+    "message": "Séparer les flux par des \",\" (virgules). Exemple de flux : https://mail.google.com/mail/u/0/feed/atom/inbox"
+  },
+  "options_gmail_13": {
+    "message": "Remarque : le nombre maximal pour tous les libellés sauf «Boîte de réception» est de 20 (les flux Google ne fournissent que les 20 entrées les plus récentes)."
+  },
+  "options_gmail_14": {
+    "message": "Remarque : pour que le notifieur écoute plus de 5 comptes, ajoutez les URL des flux au champ «Flux personnalisés». Par exemple, pour écouter les 6e et 7e comptes, ajoutez : https://mail.google.com/mail/u/6/feed/atom/inbox, https://mail.google.com/mail/u/7/feed/atom/inbox"
+  },
+  "options_notifications": {
+    "message": "Notifications"
+  },
+  "options_notifications_1": {
+    "message": "Afficher la notification sur le bureau pour les nouveaux e-mails"
+  },
+  "options_notifications_2": {
+    "message": "Présenter la notification de bureau pendant (en secondes) :"
+  },
+  "options_notifications_3": {
+    "message": "Cette option peut ne pas fonctionner sur votre système d’exploitation."
+  },
+  "options_notifications_4": {
+    "message": "Format de notification :"
+  },
+  "options_notifications_5": {
+    "message": "Variables disponibles :"
+  },
+  "options_notifications_6": {
+    "message": "Tronquer les notifications plus longues que"
+  },
+  "options_notifications_7": {
+    "message": "caractères pour les champs [objet] et [résumé]."
+  },
+  "options_notifications_8": {
+    "message": "Pour ne pas tronquer avec des points de suspension, utiliser un nombre élevé."
+  },
+  "options_notifications_9": {
+    "message": "Jouer l’alerte sonore pour les nouveaux e-mails"
+  },
+  "options_notifications_10": {
+    "message": "Remarque : pour les utilisateurs de Mac. Depuis la version 28.0 de Firefox, toutes les notifications de bureau sont gérées par le «Centre de notifications» Mac qui provoque une alerte sonore supplémentaire. Vous devez désactiver soit cette notification sonore, soit celle générée par le «Centre de notifications»."
+  },
+  "options_notifications_11": {
+    "message": "Afficher la notification dans la barre de tâches Windows™ ou dans le dock Mac OS"
+  },
+  "options_notifications_12": {
+    "message": "Les notifications dans la barre de tâches ne sont pas supportées sous Linux pour le moment."
+  },
+  "options_notifications_13": {
+    "message": "Ouvrir le panneau de la barre d’outils par un clic sur  l’icône de notification dans la barre de tâches (uniquement sous Windows™, beta)"
+  },
+  "options_notifications_14": {
+    "message": "Cette fonctionnalité est hautement expérimentale et pourrait rendre instable votre navigateur Firefox. [Redémarrage nécessaire]."
+  },
+  "options_notifications_15": {
+    "message": "Notification sonore par défaut :"
+  },
+  "options_notifications_16": {
+    "message": "Alerte par défaut de Gmail™ Notifier"
+  },
+  "options_notifications_17": {
+    "message": "Alerte «Bell» de Chrome «Checker Plus»"
+  },
+  "options_notifications_18": {
+    "message": "Alerte «Ding» de Chrome «Checker Plus»"
+  },
+  "options_notifications_19": {
+    "message": "Alerte sonore Windows™ Mail "
+  },
+  "options_notifications_20": {
+    "message": "Son défini par l’utilisateur"
+  },
+  "options_notifications_21": {
+    "message": "Notification sonore définie par l’utilisateur :"
+  },
+  "options_notifications_22": {
+    "message": "Si votre navigateur ne lit pas le son de notification personnalisé, essayez de le convertir en un format WAV simple à l’aide d’un outil de conversion en ligne."
+  },
+  "options_notifications_35": {
+    "message": "Pour sélectionner un nouveau son personnalisé, sélectionnez d’abord un son intégré, puis modifiez le choix de l’option en son personnalisé."
+  },
+  "options_notifications_23": {
+    "message": "Le Volume de la notification sonore (en %) :"
+  },
+  "options_notifications_24": {
+    "message": "Le volume est un nombre entre 0 et 100 (%). 100 % est le volume le plus fort (par défaut)."
+  },
+  "options_notifications_25": {
+    "message": "Dans Safari, il est probable que les notifications sonores par défaut ne soient pas jouées correctement. Si c’est le cas, utilisez un fichier son personnel comme notification."
+  },
+  "options_notifications_26": {
+    "message": "Toujours afficher la notification dans la barre des taches (uniquement sous Windows™)"
+  },
+  "options_notifications_27": {
+    "message": "La notification dans la barre des taches sera affichée même si tous les messages sont lus."
+  },
+  "options_notifications_28": {
+    "message": "Désactiver toutes les notifications pendant une période de temps personnalisée (en minutes) :"
+  },
+  "options_notifications_29": {
+    "message": "Cette option est liée au menu contextuel du bouton de la barre d’outils -> Désactiver toutes les notifications -> Période de temps personnalisée"
+  },
+  "options_notifications_30": {
+    "message": "Combiner toutes les notifications simultanées de bureau en une seule notification"
+  },
+  "options_notifications_31": {
+    "message": "Son personnalisé pour :"
+  },
+  "options_notifications_32": {
+    "message": "nom ou contenus d’e-mail"
+  },
+  "options_notifications_33": {
+    "message": "titre des contenus d’e-mail"
+  },
+  "options_notifications_34": {
+    "message": "sommaire de contenus d’e-mail"
+  },
+  "options_notifications_36": {
+    "message": "Demander à Gmail™ d’empêcher la redirection «inbox.google.com»"
+  },
+  "options_notifications_37": {
+    "message": "Afficher le nombre d’e-mail non lus sur le badge (et choisir la couleur du badge)"
+  },
+  "options_notifications_38": {
+    "message": "Pour Chrome uniquement : autoriser les actions plus rapides (marquer comme lu, supprimer, ...) (Considérer les actions à résoudre lorsque les en-têtes sont reçus)"
+  },
+  "options_notifications_40": {
+    "message": "Pour Chrome uniquement et si les actions rapides sont autorisées pour la boîte de notification (choisir 2 actions au maximum) :"
+  },
+  "options_notifications_41": {
+    "message": "Marquer comme lu"
+  },
+  "options_notifications_42": {
+    "message": "Archiver"
+  },
+  "options_notifications_43": {
+    "message": "Supprimer"
+  },
+  "options_tab": {
+    "message": "Ouverture d’onglet"
+  },
+  "options_tab_1": {
+    "message": "Ne chercher un compte Gmail™ ouvert, que dans la fenêtre active"
+  },
+  "options_tab_2": {
+    "message": "Ne pas chercher les comptes Gmail™ ouverts dans les autres fenêtres du navigateur. Si Gmail™ n’est pas ouvert dans la fenêtre active, ouvrir un nouvel onglet."
+  },
+  "options_tab_3": {
+    "message": "Ouvrir le nouveau compte Gmail™ à côté de l’onglet actif"
+  },
+  "options_tab_4": {
+    "message": "Ouvrir le compte Gmail™ dans l’onglet actif"
+  },
+  "options_tab_5": {
+    "message": "Ouvrir le compte Gmail™ dans un onglet d’arrière-plan"
+  },
+  "options_tab_6": {
+    "message": "Ouvrir le compte Gmail™ dans une nouvelle fenêtre"
+  },
+  "options_tab_7": {
+    "message": "Toujours utiliser des onglets vierges au lieu d’ouvrir un nouvel onglet quand l’option ouvrir dans un onglet est activé"
+  },
+  "options_tab_8": {
+    "message": "Ignorer les onglets Gmail™ ouverts"
+  },
+  "options_tab_9": {
+    "message": "Lorsque cette case est cochée, le notificateur ouvre les e-mails dans de nouveaux onglets du navigateur. Lorsque cette case n'est pas cochée, il recherchera d'abord dans la fenêtre active un onglet Gmail™ existant et y basculera. S'il n'est pas trouvé, il recherchera d'autres fenêtres ouvertes avant d'ouvrir un nouvel onglet."
+  },
+  "options_tab_10": {
+    "message": "Ouvrir les e-mails en mode HTML basique"
+  },
+  "options_tab_11": {
+    "message": "Cliquer sur le titre d'un e-mail non lu ouvre Gmail™ sur l'e-mail lui-même au lieu d’ouvrir le dossier «Boîte de réception»"
+  },
+  "options_toolbar": {
+    "message": "Barre d’outils"
+  },
+  "options_toolbar_1": {
+    "message": "Comportement du bouton de la barre d’outils :"
+  },
+  "options_toolbar_2": {
+    "message": "Toujours ouvrir le panneau de prévisualisation d’e-mail"
+  },
+  "options_toolbar_3": {
+    "message": "Ouvrir le compte Gmail™ si un seul compte est connecté"
+  },
+  "options_toolbar_18": {
+    "message": "Ouvrir le compte Gmail™ (mode forcé)"
+  },
+  "options_toolbar_4": {
+    "message": "Mode d’affichage du panneau de la barre d’outils :"
+  },
+  "options_toolbar_5": {
+    "message": "Afficher le résumé uniquement"
+  },
+  "options_toolbar_6": {
+    "message": "Afficher la totalité du contenu"
+  },
+  "options_toolbar_7": {
+    "message": "Largeur du panneau de la barre d’outils dans le mode  «contenu total» (en pixels) :"
+  },
+  "options_toolbar_8": {
+    "message": "La largeur minimale est de 500 pixels."
+  },
+  "options_toolbar_9": {
+    "message": "Hauteur du panneau de la barre d’outils dans le mode «contenu total» (en pixels) :"
+  },
+  "options_toolbar_10": {
+    "message": "La hauteur minimale est de 500 pixels."
+  },
+  "options_toolbar_11": {
+    "message": "Supporter les raccourcis clavier dans le panneau de la barre d’outils"
+  },
+  "options_toolbar_12": {
+    "message": "Signaler comme spam : < ! >, Supprimer : < # >, Archiver  : < e >, Marquer comme lu : < Shift + i >."
+  },
+  "options_toolbar_13": {
+    "message": "Afficher les e-mails en rendu HTML dans le mode «contenu total»"
+  },
+  "options_toolbar_14": {
+    "message": "Si vous préférez le rendu «texte uniquement» dans le mode «contenu total», décochez cette case."
+  },
+  "options_toolbar_15": {
+    "message": "Cliquer avec le bouton du milieu sur l’icône de la barre d’outils pour"
+  },
+  "options_toolbar_16": {
+    "message": "Rafraîchir tous les comptes"
+  },
+  "options_toolbar_17": {
+    "message": "Ouvrir le compte Gmail™ principal"
+  },
+  "options_misc": {
+    "message": "Divers"
+  },
+  "options_misc_1": {
+    "message": "Trier les comptes par ordre alphabétique"
+  },
+  "options_misc_2": {
+    "message": "Le type de tri par défaut respecte l’ordre de connexions."
+  },
+  "options_misc_3": {
+    "message": "Légende des couleurs du bouton de la barre d’outils :"
+  },
+  "options_misc_4": {
+    "message": "Gris pour «Tous lus» et Bleu pour «Déconnecté»"
+  },
+  "options_misc_5": {
+    "message": "Bleu pour «Tous lus» et Gris pour «Déconnecté»"
+  },
+  "options_misc_9": {
+    "message": "Rouge pour «Tous lus» et Gris pour «Déconnecté»"
+  },
+  "options_misc_6": {
+    "message": "Afficher une notification sur le bureau pour avertir que Gmail™ est déjà ouvert dans l’onglet actif"
+  },
+  "options_misc_7": {
+    "message": "Afficher la page de bienvenue après une mise à jour"
+  },
+  "options_misc_8": {
+    "message": "Réinitialiser tous les paramètres à leurs valeurs par défaut"
+  },
+  "options_misc_10": {
+    "message": "Ne déclencher les notifications de bureau et  les notifications sonores que lorsqu’un e-mail est arrivé depuis moins de (en minutes) : "
+  },
+  "options_misc_11": {
+    "message": "En positionnant cette préférence à zéro, vous ne recevrez ni notifications de bureau ni notifications sonores ;          malgré tout, la notification de badge continuera de se mettre à jour."
+  },
+  "options_misc_12": {
+    "message": "Ne pas inclure de détails d’identifiant dans la bulle textuelle"
+  },
+  "options_misc_13": {
+    "message": "Par défaut, le notifieur met à jour la bulle textuelle du bouton de la barre d’outils avec des infos d’identifiant. En désactivant cette option, la bulle textuelle restera à sa valeur par défaut."
+  },
+  "options_misc_14": {
+    "message": "Ne pas afficher le nombre badge exact quand le nombre d’e-mails non lus est supérieur à 999"
+  },
+  "options_misc_15": {
+    "message": "Ouvrir la page FAQ sur les mises à jour"
+  },
+  "options_misc_16": {
+    "message": "Thème de couleur par défaut du panneau :"
+  },
+  "options_misc_17": {
+    "message": "Thème clair"
+  },
+  "options_misc_18": {
+    "message": "Thème sombre"
+  },
+  "options_misc_19": {
+    "message": "Thème système"
+  },
+  "options_plugins": {
+    "message": "Plug-ins"
+  },
+  "options_plugins_1": {
+    "message": "Libellés Gmail™ et bouton étoile (expérimental)"
+  },
+  "options_plugins_2": {
+    "message": "Ce plugin affiche le bouton étoile ainsi que les libellés des fils de discussion dans la fenêtre contextuelle (mode étendu uniquement)."
+  },
+  "options_px": {
+    "message": "pixel(s)"
+  },
+  "options_empty": {
+    "message": "non défini"
+  },
+  "options_button_test": {
+    "message": "Jouer le son ►"
+  },
+  "options_button_reset": {
+    "message": "    <=    Remise à zéro des préférences    =>    "
+  },
+  "popup_settings": {
+    "message": "Paramètres"
+  },
+  "popup_of": {
+    "message": "sur"
+  },
+  "popup_wait": {
+    "message": "Patientez..."
+  },
+  "popup_date_format": {
+    "message": "%mm %jj %aa"
+  },
+  "popup_no_subject": {
+    "message": "(aucun objet)"
+  },
+  "popup_open_settings": {
+    "message": "Paramètres"
+  },
+  "popup_open_inbox": {
+    "message": "Boîte de réception"
+  },
+  "popup_archive": {
+    "message": "Archiver"
+  },
+  "popup_spam": {
+    "message": "Spam !"
+  },
+  "popup_trash": {
+    "message": "Supprimer"
+  },
+  "popup_refresh": {
+    "message": "Rafraîchir"
+  },
+  "popup_read": {
+    "message": "Marquer comme lu"
+  },
+  "popup_read_all": {
+    "message": "Tout marquer comme lu"
+  },
+  "popup_toggle_dark": {
+    "message": "Thème sombre <==> Thème clair"
+  },
+  "popup_expand": {
+    "message": "Agrandir <==> Réduire"
+  },
+  "popup_previous": {
+    "message": "E-mail précédent"
+  },
+  "popup_next": {
+    "message": "E-mail suivant"
+  },
+  "popup_msg_1": {
+    "message": "à l’instant"
+  },
+  "popup_msg_2": {
+    "message": "1 minute plus tôt"
+  },
+  "popup_msg_3_format": {
+    "message": "%d minutes plus tôt"
+  },
+  "popup_msg_4": {
+    "message": "1 heure plus tôt"
+  },
+  "popup_msg_5": {
+    "message": "heures plus tôt"
+  },
+  "popup_msg_6": {
+    "message": "Hier"
+  },
+  "popup_msg_7_format": {
+    "message": "%d jours plus tôt"
+  },
+  "popup_msg_8_format": {
+    "message": "%d semaines plus tôt"
+  },
+  "popup_msg_9_format": {
+    "message": "%d mois plus tôt"
+  },
+  "popup_msg_10": {
+    "message": "Janvier"
+  },
+  "popup_msg_11": {
+    "message": "Février"
+  },
+  "popup_msg_12": {
+    "message": "Mars"
+  },
+  "popup_msg_13": {
+    "message": "Avril"
+  },
+  "popup_msg_14": {
+    "message": "Mai"
+  },
+  "popup_msg_15": {
+    "message": "Juin"
+  },
+  "popup_msg_16": {
+    "message": "Juillet"
+  },
+  "popup_msg_17": {
+    "message": "Août"
+  },
+  "popup_msg_18": {
+    "message": "Septembre"
+  },
+  "popup_msg_19": {
+    "message": "Octobre"
+  },
+  "popup_msg_20": {
+    "message": "Novembre"
+  },
+  "popup_msg_21": {
+    "message": "Décembre"
+  },
+  "settings_open_title": {
+    "message": "Ouvrir la page des options (paramètres)"
+  },
+  "settings_open_label": {
+    "message": "Ouvrir les options"
+  }
+}

From 05fe4565e0170ab8e4272e13ddaac07f965888c7 Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:06:07 +0200
Subject: [PATCH 03/21] Update messages.json V3 (en) version

The English part of my PR
---
 v3.classic/_locales/en/messages.json | 122 ++++++++++++++-------------
 1 file changed, 65 insertions(+), 57 deletions(-)

diff --git a/v3.classic/_locales/en/messages.json b/v3.classic/_locales/en/messages.json
index 92727de7..d596d83c 100644
--- a/v3.classic/_locales/en/messages.json
+++ b/v3.classic/_locales/en/messages.json
@@ -5,23 +5,14 @@
   "toolbar_label": {
     "message": "Notifier for Gmail™"
   },
-  "tooltip_1": {
-    "message": "Left click: Open Gmail or mail preview panel"
-  },
-  "tooltip_2": {
-    "message": "Middle (or Ctrl+Left) click: Refresh all accounts"
-  },
-  "tooltip_3": {
-    "message": "Right click: Account selections"
-  },
   "description": {
-    "message": "Multiple label and account notifier for Google Mail (Gmail)"
+    "message": "Multiple label and account notifier for Google Mail (Gmail™)"
   },
   "log_in_to_your_account": {
-    "message": "Please sign-in to your Gmail account"
+    "message": "Please sign-in to your Gmail™ account"
   },
   "msg_1": {
-    "message": "Tab is already open. Click on the toolbar button to open Gmail in a new tab, or to switch to an existing Gmail tab."
+    "message": "Tab is already open. Click on the toolbar button to open Gmail™ in a new tab, or to switch to an existing Gmail™ tab."
   },
   "msg_2": {
     "message": "Link is copied to the clipboard."
@@ -35,7 +26,6 @@
   "msg_5": {
     "message": "Select an audio sound file"
   },
-
   "label_1": {
     "message": "Refresh"
   },
@@ -64,7 +54,7 @@
     "message": "For 5 hours"
   },
   "label_13": {
-    "message": "For a custom time period"
+    "message": "For the custom time period"
   },
   "label_10": {
     "message": "Enable notifications (session)"
@@ -78,7 +68,6 @@
   "label_14": {
     "message": "Logged-in accounts"
   },
-
   "unknown": {
     "message": "unknown"
   },
@@ -89,17 +78,16 @@
     "message": "Please log into your account"
   },
   "notification": {
-    "message": "From: [author_email][break]Title: [title][break]Summary: [summary]"
+    "message": "From: [author_email][break] Title: [title][break] Summary: [summary]"
   },
-
   "options_title": {
-    "message": "Options - Gmail™ Notifier"
+    "message": "Options Page - Gmail™ Notifier"
   },
   "options_inshort": {
-    "message": "Multiple label and account notifier for Google Mail (Gmail)."
+    "message": "Multiple label and account notifier for Google Mail (Gmail™)."
   },
   "options_donation": {
-    "message": "Support Development"
+    "message": "Support Development $"
   },
   "options_timings": {
     "message": "Timings"
@@ -111,7 +99,7 @@
     "message": "Minimum period is 10 seconds."
   },
   "options_timings_l3": {
-    "message": "Remind for all unread emails every (in minutes):"
+    "message": "Remind you of all unread emails every (in minutes):"
   },
   "options_timings_l4": {
     "message": "Set the value to zero for none-periodic reminders."
@@ -129,7 +117,7 @@
     "message": "Set the value to zero for no email check until the first manual refresh [Not available on Safari]."
   },
   "options_gmail": {
-    "message": "Gmail"
+    "message": "Gmail™"
   },
   "options_gmail_1": {
     "message": "Primary account (/mail/u/0/)"
@@ -153,7 +141,7 @@
     "message": "Senary account (/mail/u/5/)"
   },
   "options_gmail_8": {
-    "message": "Mark message as read when archiving it"
+    "message": "Mark messages as read when archiving them"
   },
   "options_gmail_15": {
     "message": "Some popular labels:"
@@ -204,25 +192,25 @@
     "message": "Play alert sound for new emails"
   },
   "options_notifications_10": {
-    "message": "Note for Mac users. From Firefox 28.0, all desktop notifications are handled by Mac Notification Center which causes an extra sound alert. You need to either uncheck this sound notification or the one that is generated by the Notification Center."
+    "message": "Note for Mac users. From Firefox version 28.0, all desktop notifications are handled by Mac Notification Center which causes an extra sound alert. You need to either uncheck this sound notification or the one that is generated by the Notification Center."
   },
   "options_notifications_11": {
-    "message": "Display \"Windows taskbar notification\" or \"Mac OS Dock notification\""
+    "message": "Display \"Windows™ taskbar notification\" or \"Mac OS Dock notification\""
   },
   "options_notifications_12": {
     "message": "Taskbar notifications are not supported on Linux OS at the moment."
   },
   "options_notifications_13": {
-    "message": "Open toolbar panel when click on the taskbar notification icon (Windows only, beta)"
+    "message": "Open toolbar panel when click on the taskbar notification icon (Windows™ only, beta)"
   },
   "options_notifications_14": {
     "message": "This feature is highly experimental and might make your Firefox browser unstable. [Restart required]."
   },
   "options_notifications_15": {
-    "message": "Default sound notification is"
+    "message": "Default sound notification:"
   },
   "options_notifications_16": {
-    "message": "Gmail Notifier default alert"
+    "message": "Gmail™ Notifier default alert"
   },
   "options_notifications_17": {
     "message": "Checker Plus bell alert"
@@ -231,13 +219,13 @@
     "message": "Checker Plus ding alert"
   },
   "options_notifications_19": {
-    "message": "Windows email alert"
+    "message": "Windows™ email alert"
   },
   "options_notifications_20": {
     "message": "User defined sound"
   },
   "options_notifications_21": {
-    "message": "User defined notification sound is"
+    "message": "User defined notification sound:"
   },
   "options_notifications_22": {
     "message": "If your browser is not playing the custom notification sound, try to convert it into a plain WAV format using an online conversion tool."
@@ -246,7 +234,7 @@
     "message": "To select a new custom sound, select a built-in sound first and then change the option to custom sound"
   },
   "options_notifications_23": {
-    "message": "Volume of the sound notification is"
+    "message": "Volume of the sound notification (in %):"
   },
   "options_notifications_24": {
     "message": "Volume is a number between 0 to 100 where 100 is the highest volume (default)."
@@ -255,7 +243,7 @@
     "message": "In safari most likely the default sound notifications are not playing properly, if so use a custom sound file as your notification."
   },
   "options_notifications_26": {
-    "message": "Always show tray notification (Windows only)"
+    "message": "Always show tray notification (Windows™ only)"
   },
   "options_notifications_27": {
     "message": "Tray notification will be shown even if there is no unread message."
@@ -270,7 +258,7 @@
     "message": "Combine all concurrent desktop notifications into a single notification"
   },
   "options_notifications_31": {
-    "message": "Custom sound notification"
+    "message": "Custom sound notification for"
   },
   "options_notifications_32": {
     "message": "name or email contains"
@@ -282,16 +270,16 @@
     "message": "email summary contains"
   },
   "options_notifications_36": {
-    "message": "Ask Gmail to prevent 'inbox.google.com' redirection"
+    "message": "Ask Gmail™ to prevent 'inbox.google.com' redirection"
   },
   "options_notifications_37": {
-    "message": "Display Badge number"
+    "message": "Show unread email count on badge (and choose badge color)"
   },
   "options_notifications_38": {
     "message": "Faster actions (mark as read, delete, ...) (Consider actions to be resolved when headers are received)"
   },
   "options_notifications_40": {
-    "message": "Allow quick actions from notification box (maximum two actions) (Chrome only)"
+    "message": "Allow quick actions from notification box (maximum two actions, for Chrome only)"
   },
   "options_notifications_41": {
     "message": "Mark as Read"
@@ -306,37 +294,37 @@
     "message": "Tab Opening"
   },
   "options_tab_1": {
-    "message": "Search for an open Gmail account only on the active window"
+    "message": "Search for an open Gmail™ account, only on the active window"
   },
   "options_tab_2": {
-    "message": "Do not search other browser windows for open Gmail accounts. If Gmail is not open in the active window, open a new tab."
+    "message": "Do not search other browser windows for open Gmail™ accounts. If Gmail™ is not open in the active window, open a new tab."
   },
   "options_tab_3": {
-    "message": "Open new Gmail account next to the active tab"
+    "message": "Open new Gmail™ account next to the active tab"
   },
   "options_tab_4": {
-    "message": "Open Gmail account in the active tab"
+    "message": "Open Gmail™ account in the active tab"
   },
   "options_tab_5": {
-    "message": "Open Gmail account in a background tab"
+    "message": "Open Gmail™ account in a background tab"
   },
   "options_tab_6": {
-    "message": "Open Gmail account in a new window"
+    "message": "Open Gmail™ account in a new window"
   },
   "options_tab_7": {
     "message": "Always use blank tabs instead of opening a new tab when open in tab is activated"
   },
   "options_tab_8": {
-    "message": "Ignore opened Gmail tabs"
+    "message": "Ignore opened Gmail™ tabs"
   },
   "options_tab_9": {
-    "message": "When unchecked, Gmail Notifier checks either active window or all open windows for open instance of Gmail and switch to the tab when tab opening is requested."
+    "message": "When checked, the notifier open emails in new browser tabs. When unchecked, it will first search the active window for an existing Gmail™ tab and switch to it. If not found, it will search other open windows before opening a new tab."
   },
   "options_tab_10": {
     "message": "Open emails in basic HTML mode"
   },
   "options_tab_11": {
-    "message": "Open the newest unread email instead of opening the INBOX folder"
+    "message": "Clicking on the title of an unread email opens Gmail™ to the email itself instead of opening to the INBOX folder"
   },
   "options_toolbar": {
     "message": "Toolbar"
@@ -348,10 +336,10 @@
     "message": "Always open email preview panel"
   },
   "options_toolbar_3": {
-    "message": "Open Gmail account if only one account is logged-in"
+    "message": "Open Gmail™ account if only one account is logged-in"
   },
   "options_toolbar_18": {
-    "message": "Open Gmail account (forced)"
+    "message": "Open Gmail™ account (forced)"
   },
   "options_toolbar_4": {
     "message": "Toolbar panel mode"
@@ -363,13 +351,13 @@
     "message": "Show full content"
   },
   "options_toolbar_7": {
-    "message": "Toolbar panel width in the full-content view mode is (in pixels):"
+    "message": "Toolbar panel width in the full-content view mode (in pixels):"
   },
   "options_toolbar_8": {
     "message": "Minimum width is 500px."
   },
   "options_toolbar_9": {
-    "message": "Toolbar panel height in the full-content view mode is (in pixels):"
+    "message": "Toolbar panel height in the full-content view mode (in pixels):"
   },
   "options_toolbar_10": {
     "message": "Minimum height is 500px."
@@ -378,7 +366,7 @@
     "message": "Support keyboard shortcuts on the toolbar panel"
   },
   "options_toolbar_12": {
-    "message": "!: Report as spam, #: Trash, e: Archive, Shift + i: Mark as read."
+    "message": "Report as spam: <!>, Trash: <#>, Archive: <e>, Mark as read: <Shift + i>."
   },
   "options_toolbar_13": {
     "message": "Render emails as HTML in full-content mode"
@@ -393,7 +381,7 @@
     "message": "Refresh all accounts"
   },
   "options_toolbar_17": {
-    "message": "Open primary Gmail account"
+    "message": "Open primary Gmail™ account"
   },
   "options_misc": {
     "message": "Miscellaneous"
@@ -405,7 +393,7 @@
     "message": "The default order type is logged-in order."
   },
   "options_misc_3": {
-    "message": "Toolbar color pattern is"
+    "message": "Toolbar button color pattern:"
   },
   "options_misc_4": {
     "message": "Gray color for \"No Unread\" and blue color for \"Disconnected\""
@@ -417,7 +405,7 @@
     "message": "Red color for \"No Unread\" and gray color for \"Disconnected\""
   },
   "options_misc_6": {
-    "message": "Show desktop notification to warn that Gmail is already opened in the active tab"
+    "message": "Show desktop notification to warn that Gmail™ is already opened in the active tab"
   },
   "options_misc_7": {
     "message": "Show welcome page on upgrade"
@@ -443,11 +431,23 @@
   "options_misc_15": {
     "message": "Open FAQs page on updates"
   },
+  "options_misc_16": {
+    "message": "Color theme of panel:"
+  },
+  "options_misc_17": {
+    "message": "Light theme"
+  },
+  "options_misc_18": {
+    "message": "Dark theme"
+  },
+  "options_misc_19": {
+    "message": "System theme"
+  },
   "options_plugins": {
     "message": "Plug-ins"
   },
   "options_plugins_1": {
-    "message": "Gmail labels and star button (experimental)"
+    "message": "Gmail™ labels and star button (experimental)"
   },
   "options_plugins_2": {
     "message": "This plugin displays the star button as well as thread's labels in the popup (expanded mode only)."
@@ -459,13 +459,13 @@
     "message": "not defined"
   },
   "options_button_test": {
-    "message": "Play"
+    "message": "Play sound ►"
   },
   "options_button_reset": {
     "message": "Reset Preferences"
   },
   "popup_settings": {
-    "message": "settings"
+    "message": "Settings"
   },
   "popup_of": {
     "message": "of"
@@ -506,6 +506,15 @@
   "popup_toggle_dark": {
     "message": "Toggle dark theme on and off"
   },
+  "popup_expand": {
+    "message": "Expand <==> Reduce"
+  },
+  "popup_previous": {
+    "message": "Previous email"
+  },
+  "popup_next": {
+    "message": "Next email"
+  },
   "popup_msg_1": {
     "message": "just now"
   },
@@ -569,7 +578,6 @@
   "popup_msg_21": {
     "message": "December"
   },
-
   "settings_open_title": {
     "message": "Open options (settings) page"
   },

From 35ceedf07e2fae075333d08a49a5a5c864fade0a Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:12:27 +0200
Subject: [PATCH 04/21] Update index.html

---
 v3.classic/data/options/index.html | 73 ++++++++++++++++++------------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/v3.classic/data/options/index.html b/v3.classic/data/options/index.html
index 85361273..9b9be396 100644
--- a/v3.classic/data/options/index.html
+++ b/v3.classic/data/options/index.html
@@ -15,13 +15,13 @@
       <div type="description" data-l10n-id="options_inshort"></div>
     </div>
     <div hbox flex="1" pack="center" align="center">
-      <a id=donation><input type="button" data-l10n-id="options_donation" data-l10n-value="value"/></a>
+      <a id=donation target="_blank"><input type="button" data-l10n-id="options_donation" data-l10n-value="value"/></a>
     </div>
     <div class="browser">
       <ul>
         <li><a target="_blank" href="https://addons.mozilla.org/firefox/addon/gmail-notifier-restartless/"><img src="/data/icons/browsers/firefox.png"></img></a></li>
         <li><a target="_blank" href="https://microsoftedge.microsoft.com/addons/detail/cmhmeappbhdaifkknkhdnmogalbnhloa"><img src="/data/icons/browsers/edge.png"></img></a></li>
-        <li><a target="_blank" href="https://chrome.google.com/webstore/detail/gmail-notifier/dcjichoefijpinlfnjghokpkojhlhkgl"><img src="/data/icons/browsers/chrome.png"></img></a></li>
+        <li><a target="_blank" href="https://chromewebstore.google.com/detail/notifier-for-gmail/dcjichoefijpinlfnjghokpkojhlhkgl"><img src="/data/icons/browsers/chrome.png"></img></a></li>
         <li><a target="_blank" href="https://addons.opera.com/extensions/details/gmail-notifier/"><img src="/data/icons/browsers/opera.png"></img></a></li>
       </ul>
     </div>
@@ -40,9 +40,11 @@
           <span data-l10n-id="options_timings_l3"></span>
           <input id="resetPeriod" type="number" min="0" required></input>
         </div>
-        <p class="note" data-l10n-id="options_timings_l4"></p>
-        <p class="note" data-l10n-id="options_timings_l5"></p>
-        <p class="note" data-l10n-id="options_timings_l6"></p>
+        <div class="note">
+          <span data-l10n-id="options_timings_l4"></span>
+          <span data-l10n-id="options_timings_l5"></span>
+          <span data-l10n-id="options_timings_l6"></span>
+        </div>
         <div class="fm">
           <span data-l10n-id="options_timings_l7"></span>
           <input id="initialPeriod" type="number" min="0" required></input>
@@ -55,37 +57,39 @@
       <div flex="1" class="content">
         <p data-l10n-id="options_gmail_10"></p>
         <div class="mf">
-          <div data-l10n-id="options_gmail_1"></div>
+          <div data-l10n-id="options_gmail_1" class="nwap"></div>
           <input type="text" id="feeds_0" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_3"></div>
+          <div data-l10n-id="options_gmail_3" class="nwap"></div>
           <input type="text" id="feeds_1" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_4"></div>
+          <div data-l10n-id="options_gmail_4" class="nwap"></div>
           <input type="text" id="feeds_2" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_5"></div>
+          <div data-l10n-id="options_gmail_5" class="nwap"></div>
           <input type="text" id="feeds_3" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_6"></div>
+          <div data-l10n-id="options_gmail_6" class="nwap"></div>
           <input type="text" id="feeds_4" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_7"></div>
+          <div data-l10n-id="options_gmail_7" class="nwap"></div>
           <input type="text" id="feeds_5" placeholder="e.g.: inbox, important"/>
 
 
         </div>
-        <p class="note" data-l10n-id="options_gmail_2"></p>
-        <p class="note">
+        <div class="note">
+          <span data-l10n-id="options_gmail_2"></span>
           <span data-l10n-id="options_gmail_15"></span>
           <pre style="font-size: 85%; color: #652e2e; white-space: pre-line; margin: 0">
             inbox, important, all, unread
             ^sq_ig_i_personal (Inbox Primary), ^sq_ig_i_social (Inbox Social), ^sq_ig_i_promo (Inbox Promotions), ^sq_ig_i_notification (Inbox Updates), ^sq_ig_i_group (Inbox Forums)
             ^smartlabel_personal, ^smartlabel_newsletter, ^smartlabel_notification, ^smartlabel_group
           </pre>
-        </p>
+        </div>
         <div class="mf">
-          <div data-l10n-id="options_gmail_11"></div>
+          <div data-l10n-id="options_gmail_11" class="nwap"></div>
           <input type="text" id="feeds_custom" placeholder="https://mail.google.com/mail/u/6/feed/atom/inbox"/>
         </div>
-        <p class="note" data-l10n-id="options_gmail_12"></p>
-        <p class="note" data-l10n-id="options_gmail_13"></p>
-        <p class="note" data-l10n-id="options_gmail_14"></p>
+        <div class="note">
+          <span data-l10n-id="options_gmail_12"></span>
+          <span data-l10n-id="options_gmail_13"></span>
+          <span data-l10n-id="options_gmail_14"></span>
+        </div>
       </div>
     </div>
     <div hbox>
@@ -107,17 +111,17 @@
 
         <p class="note" data-l10n-id="options_notifications_3"></p>
         <div class="mf">
-          <div data-l10n-id="options_notifications_4"></div>
+          <div data-l10n-id="options_notifications_4" class="nwap"></div>
           <input type="text" id="notificationFormat" required/>
         </div>
-        <p class="note"><span data-l10n-id="options_notifications_5"></span> [author_name], [author_email], [title] <span data-l10n-id="and"></span> [summary].</p>
-        <div align="center">
+        <p class="note gap" hbox><span data-l10n-id="options_notifications_5"></span> [author_name], [author_email], [title] <span data-l10n-id="and"></span> [summary].</p>
+        <div align="center" class="gap wrap">
           <span data-l10n-id="options_notifications_6"></span>
-          <input id="notificationTruncate" type="number" min="20" required></input>
+          <input id="notificationTruncate" type="number" min="20" max="200" required></input>
           <span data-l10n-id="options_notifications_7"></span>
         </div>
         <p class="note" data-l10n-id="options_notifications_8"></p>
-        <label class="mf">
+        <label class="nf">
           <span data-l10n-id="options_notifications_40"></span>
           <ul class="frt">
             <li><label><input type="checkbox" id="notification.buttons.markasread"> <span data-l10n-id="options_notifications_41"></span></label></li>
@@ -229,10 +233,11 @@
           <label class="browse">Browse<input type="file" id="notification.sound.media.custom4.file"></input></label>
         </div>
 
-        <p class="note only-safari" data-l10n-id="options_notifications_25"></p>
-
-        <p class="note" data-l10n-id="options_notifications_22"></p>
-        <p class="note" data-l10n-id="options_notifications_35"></p>
+        <div class="note">
+          <span class="only-safari" data-l10n-id="options_notifications_25"></span>
+          <span data-l10n-id="options_notifications_22"></span>
+          <span data-l10n-id="options_notifications_35"></span>
+        </div>
         <div>
 
         </div>
@@ -365,18 +370,26 @@
         </label>
         <p class="note" data-l10n-id="options_misc_2"></p>
         <div class="mf">
-          <div data-l10n-id="options_misc_3"></div>
+          <div data-l10n-id="options_misc_3" class="nwap"></div>
           <select id="clrPattern">
             <option value="0" data-l10n-id="options_misc_4"></option>
             <option value="1" data-l10n-id="options_misc_5"></option>
             <option value="2" data-l10n-id="options_misc_9"></option>
           </select>
         </div>
+        <div class="mf">
+          <div data-l10n-id="options_misc_16" class="nwap"></div>
+          <select id="dark">
+            <option value="false" data-l10n-id="options_misc_17"></option>
+            <option value="true" data-l10n-id="options_misc_18"></option>
+            <option value="auto" data-l10n-id="options_misc_19"></option>
+          </select>
+        </div>
         <label class="mf">
            <input type="checkbox" id="onGmailNotification">
            <span data-l10n-id="options_misc_6"></span>
         </label>
-        <div align="center">
+        <div class="fm">
           <span data-l10n-id="options_misc_10"></span>
           <input id="threatAsNew" type="number" min="0"></input>
         </div>
@@ -389,7 +402,7 @@
           <input type="checkbox" id="welcome">
           <span data-l10n-id="options_misc_15"></span>
         </label>
-        <div class="mf">
+        <div class="nf">
           <span data-l10n-id="options_misc_8"></span>
           <input type="button" id="reset" data-l10n-id="options_button_reset" data-l10n-value="value">
         </div>

From 472bc094dae7db07267791843270361173a0a866 Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:16:08 +0200
Subject: [PATCH 05/21] Update data/options/ index.html


From 53c52af5a46349fea2955b2617e2219464156e3b Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:21:40 +0200
Subject: [PATCH 06/21] Update data/options/ index.css

---
 v3.classic/data/options/index.css | 53 ++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/v3.classic/data/options/index.css b/v3.classic/data/options/index.css
index 6ef7407d..50858ccf 100644
--- a/v3.classic/data/options/index.css
+++ b/v3.classic/data/options/index.css
@@ -56,12 +56,13 @@ label {
 }
 #content {
   margin: auto;
-  max-width: 800px;
+  max-width: 1200px;
 }
 .fixed {
-  width: 100px;
+  min-width: 18ch;
   background: #f1f1f1;
-  padding: 10px;
+  padding: 10px 0;
+  text-align: center;
 }
 
 @media screen and (max-width: 600px) {
@@ -75,7 +76,6 @@ label {
 }
 
 #content > div:not(:last-child) {
-  border-bottom: solid 1px #e5e5e5;
   padding: 10px 0;
 }
 #content > div:last-child {
@@ -145,6 +145,15 @@ label {
   height: revert;
 }
 
+@media screen and (max-width: 600px) {
+  #donation {
+    display: none;
+  }
+  [type="description"] {
+    display: none;
+  }
+}
+
 input:invalid {
   border-color: red;
   background-color: rgba(255, 0, 0, 0.2);
@@ -179,9 +188,14 @@ input:invalid {
   width: 16px;
 }
 .note {
-  color: #707070;
-  padding: 0;
-  font-size: 90%;
+  font-size: 85%;
+  background: #fff7ee;
+  padding: 10px;
+  line-height: 140%;
+  flex-direction: column;
+}
+.note span:not(:last-child) {
+  margin-bottom: 1ch;
 }
 .browse {
   display: none;
@@ -201,8 +215,26 @@ input:invalid {
   grid-gap: 5px;
   align-items: center;
 }
-.mf > :first-child {
-  width: max-content;
+.nwap {
+  white-space: nowrap;
+}
+.nf {
+  display: grid;
+  grid-template-columns: 1fr min-content;
+  grid-gap: 5px;
+  align-items: center;
+}
+.nf li {
+  white-space: nowrap;
+}
+.gap {
+  gap: 5px;
+}
+.start {
+  text-align: start;
+}
+.wrap {
+  flex-wrap: wrap;
 }
 
 @media screen and (max-width: 600px) {
@@ -241,14 +273,12 @@ input:invalid {
     width: 100%;
   }
 }
-
 .frt {
   list-style: none;
   margin: 0;
   padding: 0;
   justify-self: end;
 }
-
 .fnjh {
   display: flex;
   align-items: center;
@@ -257,7 +287,6 @@ input:invalid {
 .fnjh > :first-child {
   flex: 1;
 }
-
 [hbox] {
   display: flex;
   flex-direction: row;

From 797c27d8f22e0849d5afd32747d1f02c67268035 Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:23:10 +0200
Subject: [PATCH 07/21] Update data/popup/ index.html

---
 v3.classic/data/popup/index.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/v3.classic/data/popup/index.html b/v3.classic/data/popup/index.html
index 1227a919..e27bde17 100644
--- a/v3.classic/data/popup/index.html
+++ b/v3.classic/data/popup/index.html
@@ -11,8 +11,8 @@
     <div class="ellipsis" name="email-container">Email</div>
     <div class="ellipsis" name="stat"><b>-</b> <span data-l10n-id="popup_of"></span> <b>-</b></div>
     <div class="hcenter" name="nav">
-      <div class="btn" name="previous"></div>
-      <div class="btn" name="next"></div>
+      <div class="btn" name="previous" data-l10n-value="title" data-l10n-id="popup_previous"></div>
+      <div class="btn" name="next" data-l10n-value="title" data-l10n-id="popup_next"></div>
     </div>
   </header>
   <div id="content">
@@ -46,7 +46,11 @@
     <span data-l10n-id="popup_spam"></span>
     <span data-l10n-id="popup_trash"></span>
     <span data-l10n-id="popup_refresh"></span>
+    <span data-l10n-id="popup_read"></span>
     <span data-l10n-id="popup_read_all"></span>
+    <span data-l10n-id="popup_expand"></span>
+    <span data-l10n-id="popup_previous"></span>
+    <span data-l10n-id="popup_next"></span>
   </div>
 
   <footer class="hcenter vcenter">
@@ -57,11 +61,11 @@
     <div class="btn tooltip" name="spam" data-l10n-value="title" data-l10n-id="popup_spam"></div>
     <div class="btn tooltip" name="trash" data-l10n-value="title" data-l10n-id="popup_trash"></div>
     <div class="btn tooltip" name="refresh" data-l10n-value="title" data-l10n-id="popup_refresh"></div>
-    <div class="btn vcenter hcenter" name="read"><span data-l10n-id="popup_read"></span></div>
+    <div class="btn tooltip" name="read" data-l10n-value="title" data-l10n-id="popup_read"></div>
     <div class="btn tooltip" name="read-all" data-l10n-value="title" data-l10n-id="popup_read_all"></div>
   </footer>
   <ol id="accounts"></ol>
-  <div class="btn" id="expand"></div>
+  <div class="btn" id="expand" name="expand" data-l10n-value="title" data-l10n-id="popup_expand"></div>
 
   <script src="/data/locale.js"></script>
   <script src="gmail.js"></script>

From 6f01ddf0274cb5a9a2aa3a25e614bc29d1b6578a Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:23:59 +0200
Subject: [PATCH 08/21] Update data/popup/ index.css

---
 v3.classic/data/popup/index.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/v3.classic/data/popup/index.css b/v3.classic/data/popup/index.css
index cce3e5ed..b504a7b0 100644
--- a/v3.classic/data/popup/index.css
+++ b/v3.classic/data/popup/index.css
@@ -250,7 +250,7 @@ footer div[name="refresh"] {
 }
 footer div[name="read"] {
   width: 90px;
-  background-image: none;
+  background-image: url('icons/read.png');
 }
 footer div[name="read-all"] {
   background-image: url('icons/check_all.png');
@@ -258,6 +258,9 @@ footer div[name="read-all"] {
 footer div[name="toggle-dark"] {
   background-image: url('icons/dark.png');
 }
+body[data-dark="auto"] footer div[name="toggle-dark"] {
+  display: none;
+}
 
 #accounts {
   display: none;
@@ -298,8 +301,8 @@ footer div[name="toggle-dark"] {
   position: fixed;
   bottom: 44px;
   left: 9px;
-  width: 40px;
-  height: 12px;
+  width: 20px;
+  height: 24px;
   background-image: url('icons/arrow_drop_down.png');
   background-size: 20px;
 }

From f64d5bdaa7bfbc61543b79dca185d430c0a51b64 Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 12:07:30 +0200
Subject: [PATCH 09/21] Update messages.json (en)

For buttons label
---
 v3.classic/_locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3.classic/_locales/en/messages.json b/v3.classic/_locales/en/messages.json
index d596d83c..43f3dd04 100644
--- a/v3.classic/_locales/en/messages.json
+++ b/v3.classic/_locales/en/messages.json
@@ -507,7 +507,7 @@
     "message": "Toggle dark theme on and off"
   },
   "popup_expand": {
-    "message": "Expand <==> Reduce"
+    "message": ""Toggle expanded view on and off""
   },
   "popup_previous": {
     "message": "Previous email"

From a9de3ab7ad20a96a6f3d8d7f1b9d89a84d46115c Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:51:56 +0200
Subject: [PATCH 10/21] Update messages.json

---
 v3.classic/_locales/en/messages.json | 121 ++++++++++++---------------
 1 file changed, 54 insertions(+), 67 deletions(-)

diff --git a/v3.classic/_locales/en/messages.json b/v3.classic/_locales/en/messages.json
index 43f3dd04..114e2dd4 100644
--- a/v3.classic/_locales/en/messages.json
+++ b/v3.classic/_locales/en/messages.json
@@ -5,14 +5,23 @@
   "toolbar_label": {
     "message": "Notifier for Gmail™"
   },
+  "tooltip_1": {
+    "message": "Left click: Open Gmail or mail preview panel"
+  },
+  "tooltip_2": {
+    "message": "Middle (or Ctrl+Left) click: Refresh all accounts"
+  },
+  "tooltip_3": {
+    "message": "Right click: Account selections"
+  },
   "description": {
-    "message": "Multiple label and account notifier for Google Mail (Gmail™)"
+    "message": "Multiple label and account notifier for Google Mail (Gmail)"
   },
   "log_in_to_your_account": {
-    "message": "Please sign-in to your Gmail™ account"
+    "message": "Please sign-in to your Gmail account"
   },
   "msg_1": {
-    "message": "Tab is already open. Click on the toolbar button to open Gmail™ in a new tab, or to switch to an existing Gmail™ tab."
+    "message": "Tab is already open. Click on the toolbar button to open Gmail in a new tab, or to switch to an existing Gmail tab."
   },
   "msg_2": {
     "message": "Link is copied to the clipboard."
@@ -54,7 +63,7 @@
     "message": "For 5 hours"
   },
   "label_13": {
-    "message": "For the custom time period"
+    "message": "For a custom time period"
   },
   "label_10": {
     "message": "Enable notifications (session)"
@@ -78,16 +87,16 @@
     "message": "Please log into your account"
   },
   "notification": {
-    "message": "From: [author_email][break] Title: [title][break] Summary: [summary]"
+    "message": "From: [author_email][break]Title: [title][break]Summary: [summary]"
   },
   "options_title": {
-    "message": "Options Page - Gmail™ Notifier"
+    "message": "Options - Gmail™ Notifier"
   },
   "options_inshort": {
-    "message": "Multiple label and account notifier for Google Mail (Gmail™)."
+    "message": "Multiple label and account notifier for Google Mail (Gmail)."
   },
   "options_donation": {
-    "message": "Support Development $"
+    "message": "Support Development"
   },
   "options_timings": {
     "message": "Timings"
@@ -99,7 +108,7 @@
     "message": "Minimum period is 10 seconds."
   },
   "options_timings_l3": {
-    "message": "Remind you of all unread emails every (in minutes):"
+    "message": "Remind for all unread emails every (in minutes):"
   },
   "options_timings_l4": {
     "message": "Set the value to zero for none-periodic reminders."
@@ -117,7 +126,7 @@
     "message": "Set the value to zero for no email check until the first manual refresh [Not available on Safari]."
   },
   "options_gmail": {
-    "message": "Gmail™"
+    "message": "Gmail"
   },
   "options_gmail_1": {
     "message": "Primary account (/mail/u/0/)"
@@ -141,7 +150,7 @@
     "message": "Senary account (/mail/u/5/)"
   },
   "options_gmail_8": {
-    "message": "Mark messages as read when archiving them"
+    "message": "Mark message as read when archiving it"
   },
   "options_gmail_15": {
     "message": "Some popular labels:"
@@ -192,25 +201,25 @@
     "message": "Play alert sound for new emails"
   },
   "options_notifications_10": {
-    "message": "Note for Mac users. From Firefox version 28.0, all desktop notifications are handled by Mac Notification Center which causes an extra sound alert. You need to either uncheck this sound notification or the one that is generated by the Notification Center."
+    "message": "Note for Mac users. From Firefox 28.0, all desktop notifications are handled by Mac Notification Center which causes an extra sound alert. You need to either uncheck this sound notification or the one that is generated by the Notification Center."
   },
   "options_notifications_11": {
-    "message": "Display \"Windows™ taskbar notification\" or \"Mac OS Dock notification\""
+    "message": "Display \"Windows taskbar notification\" or \"Mac OS Dock notification\""
   },
   "options_notifications_12": {
     "message": "Taskbar notifications are not supported on Linux OS at the moment."
   },
   "options_notifications_13": {
-    "message": "Open toolbar panel when click on the taskbar notification icon (Windows™ only, beta)"
+    "message": "Open toolbar panel when click on the taskbar notification icon (Windows only, beta)"
   },
   "options_notifications_14": {
     "message": "This feature is highly experimental and might make your Firefox browser unstable. [Restart required]."
   },
   "options_notifications_15": {
-    "message": "Default sound notification:"
+    "message": "Default sound notification is"
   },
   "options_notifications_16": {
-    "message": "Gmail™ Notifier default alert"
+    "message": "Gmail Notifier default alert"
   },
   "options_notifications_17": {
     "message": "Checker Plus bell alert"
@@ -219,13 +228,13 @@
     "message": "Checker Plus ding alert"
   },
   "options_notifications_19": {
-    "message": "Windows™ email alert"
+    "message": "Windows email alert"
   },
   "options_notifications_20": {
     "message": "User defined sound"
   },
   "options_notifications_21": {
-    "message": "User defined notification sound:"
+    "message": "User defined notification sound is"
   },
   "options_notifications_22": {
     "message": "If your browser is not playing the custom notification sound, try to convert it into a plain WAV format using an online conversion tool."
@@ -234,7 +243,7 @@
     "message": "To select a new custom sound, select a built-in sound first and then change the option to custom sound"
   },
   "options_notifications_23": {
-    "message": "Volume of the sound notification (in %):"
+    "message": "Volume of the sound notification is"
   },
   "options_notifications_24": {
     "message": "Volume is a number between 0 to 100 where 100 is the highest volume (default)."
@@ -243,7 +252,7 @@
     "message": "In safari most likely the default sound notifications are not playing properly, if so use a custom sound file as your notification."
   },
   "options_notifications_26": {
-    "message": "Always show tray notification (Windows™ only)"
+    "message": "Always show tray notification (Windows only)"
   },
   "options_notifications_27": {
     "message": "Tray notification will be shown even if there is no unread message."
@@ -258,7 +267,7 @@
     "message": "Combine all concurrent desktop notifications into a single notification"
   },
   "options_notifications_31": {
-    "message": "Custom sound notification for"
+    "message": "Custom sound notification"
   },
   "options_notifications_32": {
     "message": "name or email contains"
@@ -270,16 +279,16 @@
     "message": "email summary contains"
   },
   "options_notifications_36": {
-    "message": "Ask Gmail™ to prevent 'inbox.google.com' redirection"
+    "message": "Ask Gmail to prevent 'inbox.google.com' redirection"
   },
   "options_notifications_37": {
-    "message": "Show unread email count on badge (and choose badge color)"
+    "message": "Display Badge number"
   },
   "options_notifications_38": {
     "message": "Faster actions (mark as read, delete, ...) (Consider actions to be resolved when headers are received)"
   },
   "options_notifications_40": {
-    "message": "Allow quick actions from notification box (maximum two actions, for Chrome only)"
+    "message": "Allow quick actions from notification box (maximum two actions) (Chrome only)"
   },
   "options_notifications_41": {
     "message": "Mark as Read"
@@ -294,37 +303,37 @@
     "message": "Tab Opening"
   },
   "options_tab_1": {
-    "message": "Search for an open Gmail™ account, only on the active window"
+    "message": "Search for an open Gmail account only on the active window"
   },
   "options_tab_2": {
-    "message": "Do not search other browser windows for open Gmail™ accounts. If Gmail™ is not open in the active window, open a new tab."
+    "message": "Do not search other browser windows for open Gmail accounts. If Gmail is not open in the active window, open a new tab."
   },
   "options_tab_3": {
-    "message": "Open new Gmail™ account next to the active tab"
+    "message": "Open new Gmail account next to the active tab"
   },
   "options_tab_4": {
-    "message": "Open Gmail™ account in the active tab"
+    "message": "Open Gmail account in the active tab"
   },
   "options_tab_5": {
-    "message": "Open Gmail™ account in a background tab"
+    "message": "Open Gmail account in a background tab"
   },
   "options_tab_6": {
-    "message": "Open Gmail™ account in a new window"
+    "message": "Open Gmail account in a new window"
   },
   "options_tab_7": {
     "message": "Always use blank tabs instead of opening a new tab when open in tab is activated"
   },
   "options_tab_8": {
-    "message": "Ignore opened Gmail™ tabs"
+    "message": "Ignore opened Gmail tabs"
   },
   "options_tab_9": {
-    "message": "When checked, the notifier open emails in new browser tabs. When unchecked, it will first search the active window for an existing Gmail™ tab and switch to it. If not found, it will search other open windows before opening a new tab."
+    "message": "When unchecked, Gmail Notifier checks either active window or all open windows for open instance of Gmail and switch to the tab when tab opening is requested."
   },
   "options_tab_10": {
     "message": "Open emails in basic HTML mode"
   },
   "options_tab_11": {
-    "message": "Clicking on the title of an unread email opens Gmail™ to the email itself instead of opening to the INBOX folder"
+    "message": "Open the newest unread email instead of opening the INBOX folder"
   },
   "options_toolbar": {
     "message": "Toolbar"
@@ -336,10 +345,10 @@
     "message": "Always open email preview panel"
   },
   "options_toolbar_3": {
-    "message": "Open Gmail™ account if only one account is logged-in"
+    "message": "Open Gmail account if only one account is logged-in"
   },
   "options_toolbar_18": {
-    "message": "Open Gmail™ account (forced)"
+    "message": "Open Gmail account (forced)"
   },
   "options_toolbar_4": {
     "message": "Toolbar panel mode"
@@ -351,13 +360,13 @@
     "message": "Show full content"
   },
   "options_toolbar_7": {
-    "message": "Toolbar panel width in the full-content view mode (in pixels):"
+    "message": "Toolbar panel width in the full-content view mode is (in pixels):"
   },
   "options_toolbar_8": {
     "message": "Minimum width is 500px."
   },
   "options_toolbar_9": {
-    "message": "Toolbar panel height in the full-content view mode (in pixels):"
+    "message": "Toolbar panel height in the full-content view mode is (in pixels):"
   },
   "options_toolbar_10": {
     "message": "Minimum height is 500px."
@@ -366,7 +375,7 @@
     "message": "Support keyboard shortcuts on the toolbar panel"
   },
   "options_toolbar_12": {
-    "message": "Report as spam: <!>, Trash: <#>, Archive: <e>, Mark as read: <Shift + i>."
+    "message": "!: Report as spam, #: Trash, e: Archive, Shift + i: Mark as read."
   },
   "options_toolbar_13": {
     "message": "Render emails as HTML in full-content mode"
@@ -381,7 +390,7 @@
     "message": "Refresh all accounts"
   },
   "options_toolbar_17": {
-    "message": "Open primary Gmail™ account"
+    "message": "Open primary Gmail account"
   },
   "options_misc": {
     "message": "Miscellaneous"
@@ -393,7 +402,7 @@
     "message": "The default order type is logged-in order."
   },
   "options_misc_3": {
-    "message": "Toolbar button color pattern:"
+    "message": "Toolbar color pattern is"
   },
   "options_misc_4": {
     "message": "Gray color for \"No Unread\" and blue color for \"Disconnected\""
@@ -405,7 +414,7 @@
     "message": "Red color for \"No Unread\" and gray color for \"Disconnected\""
   },
   "options_misc_6": {
-    "message": "Show desktop notification to warn that Gmail™ is already opened in the active tab"
+    "message": "Show desktop notification to warn that Gmail is already opened in the active tab"
   },
   "options_misc_7": {
     "message": "Show welcome page on upgrade"
@@ -431,23 +440,11 @@
   "options_misc_15": {
     "message": "Open FAQs page on updates"
   },
-  "options_misc_16": {
-    "message": "Color theme of panel:"
-  },
-  "options_misc_17": {
-    "message": "Light theme"
-  },
-  "options_misc_18": {
-    "message": "Dark theme"
-  },
-  "options_misc_19": {
-    "message": "System theme"
-  },
   "options_plugins": {
     "message": "Plug-ins"
   },
   "options_plugins_1": {
-    "message": "Gmail™ labels and star button (experimental)"
+    "message": "Gmail labels and star button (experimental)"
   },
   "options_plugins_2": {
     "message": "This plugin displays the star button as well as thread's labels in the popup (expanded mode only)."
@@ -459,13 +456,13 @@
     "message": "not defined"
   },
   "options_button_test": {
-    "message": "Play sound ►"
+    "message": "Play"
   },
   "options_button_reset": {
     "message": "Reset Preferences"
   },
   "popup_settings": {
-    "message": "Settings"
+    "message": "settings"
   },
   "popup_of": {
     "message": "of"
@@ -506,19 +503,9 @@
   "popup_toggle_dark": {
     "message": "Toggle dark theme on and off"
   },
-  "popup_expand": {
-    "message": ""Toggle expanded view on and off""
-  },
-  "popup_previous": {
-    "message": "Previous email"
-  },
-  "popup_next": {
-    "message": "Next email"
-  },
   "popup_msg_1": {
     "message": "just now"
-  },
-  "popup_msg_2": {
+  },  "popup_msg_2": {
     "message": "1 minute ago"
   },
   "popup_msg_3_format": {

From 20d8938333946138ca32661cf57d4e045010de39 Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:55:45 +0200
Subject: [PATCH 11/21] Update messages.json

---
 v3.classic/_locales/en/messages.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/v3.classic/_locales/en/messages.json b/v3.classic/_locales/en/messages.json
index 114e2dd4..1c9b8845 100644
--- a/v3.classic/_locales/en/messages.json
+++ b/v3.classic/_locales/en/messages.json
@@ -505,7 +505,8 @@
   },
   "popup_msg_1": {
     "message": "just now"
-  },  "popup_msg_2": {
+  },
+  "popup_msg_2": {
     "message": "1 minute ago"
   },
   "popup_msg_3_format": {

From 0d92702792fa1ee7227883827a5a628c0a1e9eec Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:00:02 +0200
Subject: [PATCH 12/21] Update messages.json

---
 v3.classic/_locales/en/messages.json | 44 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/v3.classic/_locales/en/messages.json b/v3.classic/_locales/en/messages.json
index 1c9b8845..4b474ac2 100644
--- a/v3.classic/_locales/en/messages.json
+++ b/v3.classic/_locales/en/messages.json
@@ -6,7 +6,7 @@
     "message": "Notifier for Gmail™"
   },
   "tooltip_1": {
-    "message": "Left click: Open Gmail or mail preview panel"
+    "message": "Left click: Open Gmail™ or mail preview panel"
   },
   "tooltip_2": {
     "message": "Middle (or Ctrl+Left) click: Refresh all accounts"
@@ -18,10 +18,10 @@
     "message": "Multiple label and account notifier for Google Mail (Gmail)"
   },
   "log_in_to_your_account": {
-    "message": "Please sign-in to your Gmail account"
+    "message": "Please sign-in to your account"
   },
   "msg_1": {
-    "message": "Tab is already open. Click on the toolbar button to open Gmail in a new tab, or to switch to an existing Gmail tab."
+    "message": "Tab is already open. Click on the toolbar button to open Gmail™ in a new tab, or to switch to an existing Gmail™ tab."
   },
   "msg_2": {
     "message": "Link is copied to the clipboard."
@@ -204,13 +204,13 @@
     "message": "Note for Mac users. From Firefox 28.0, all desktop notifications are handled by Mac Notification Center which causes an extra sound alert. You need to either uncheck this sound notification or the one that is generated by the Notification Center."
   },
   "options_notifications_11": {
-    "message": "Display \"Windows taskbar notification\" or \"Mac OS Dock notification\""
+    "message": "Display \"Windows™ taskbar notification\" or \"Mac OS Dock notification\""
   },
   "options_notifications_12": {
     "message": "Taskbar notifications are not supported on Linux OS at the moment."
   },
   "options_notifications_13": {
-    "message": "Open toolbar panel when click on the taskbar notification icon (Windows only, beta)"
+    "message": "Open toolbar panel when click on the taskbar notification icon (Windows™ only, beta)"
   },
   "options_notifications_14": {
     "message": "This feature is highly experimental and might make your Firefox browser unstable. [Restart required]."
@@ -219,7 +219,7 @@
     "message": "Default sound notification is"
   },
   "options_notifications_16": {
-    "message": "Gmail Notifier default alert"
+    "message": "Gmail™ Notifier default alert"
   },
   "options_notifications_17": {
     "message": "Checker Plus bell alert"
@@ -228,7 +228,7 @@
     "message": "Checker Plus ding alert"
   },
   "options_notifications_19": {
-    "message": "Windows email alert"
+    "message": "Windows™ email alert"
   },
   "options_notifications_20": {
     "message": "User defined sound"
@@ -252,7 +252,7 @@
     "message": "In safari most likely the default sound notifications are not playing properly, if so use a custom sound file as your notification."
   },
   "options_notifications_26": {
-    "message": "Always show tray notification (Windows only)"
+    "message": "Always show tray notification (Windows™ only)"
   },
   "options_notifications_27": {
     "message": "Tray notification will be shown even if there is no unread message."
@@ -279,7 +279,7 @@
     "message": "email summary contains"
   },
   "options_notifications_36": {
-    "message": "Ask Gmail to prevent 'inbox.google.com' redirection"
+    "message": "Ask Gmail™ to prevent 'inbox.google.com' redirection"
   },
   "options_notifications_37": {
     "message": "Display Badge number"
@@ -303,31 +303,31 @@
     "message": "Tab Opening"
   },
   "options_tab_1": {
-    "message": "Search for an open Gmail account only on the active window"
+    "message": "Search for an open Gmail™ account only on the active window"
   },
   "options_tab_2": {
-    "message": "Do not search other browser windows for open Gmail accounts. If Gmail is not open in the active window, open a new tab."
+    "message": "Do not search other browser windows for open Gmail™ accounts. If Gmail™ is not open in the active window, open a new tab."
   },
   "options_tab_3": {
-    "message": "Open new Gmail account next to the active tab"
+    "message": "Open new Gmail™ account next to the active tab"
   },
   "options_tab_4": {
-    "message": "Open Gmail account in the active tab"
+    "message": "Open Gmail™ account in the active tab"
   },
   "options_tab_5": {
-    "message": "Open Gmail account in a background tab"
+    "message": "Open Gmail™ account in a background tab"
   },
   "options_tab_6": {
-    "message": "Open Gmail account in a new window"
+    "message": "Open Gmail™ account in a new window"
   },
   "options_tab_7": {
     "message": "Always use blank tabs instead of opening a new tab when open in tab is activated"
   },
   "options_tab_8": {
-    "message": "Ignore opened Gmail tabs"
+    "message": "Ignore opened Gmail™ tabs"
   },
   "options_tab_9": {
-    "message": "When unchecked, Gmail Notifier checks either active window or all open windows for open instance of Gmail and switch to the tab when tab opening is requested."
+    "message": "When unchecked, Gmail™ Notifier checks either active window or all open windows for open instance of Gmail™ and switch to the tab when tab opening is requested."
   },
   "options_tab_10": {
     "message": "Open emails in basic HTML mode"
@@ -345,10 +345,10 @@
     "message": "Always open email preview panel"
   },
   "options_toolbar_3": {
-    "message": "Open Gmail account if only one account is logged-in"
+    "message": "Open Gmail™ account if only one account is logged-in"
   },
   "options_toolbar_18": {
-    "message": "Open Gmail account (forced)"
+    "message": "Open Gmail™ account (forced)"
   },
   "options_toolbar_4": {
     "message": "Toolbar panel mode"
@@ -390,7 +390,7 @@
     "message": "Refresh all accounts"
   },
   "options_toolbar_17": {
-    "message": "Open primary Gmail account"
+    "message": "Open primary Gmail™ account"
   },
   "options_misc": {
     "message": "Miscellaneous"
@@ -414,7 +414,7 @@
     "message": "Red color for \"No Unread\" and gray color for \"Disconnected\""
   },
   "options_misc_6": {
-    "message": "Show desktop notification to warn that Gmail is already opened in the active tab"
+    "message": "Show desktop notification to warn that Gmail™ is already opened in the active tab"
   },
   "options_misc_7": {
     "message": "Show welcome page on upgrade"
@@ -444,7 +444,7 @@
     "message": "Plug-ins"
   },
   "options_plugins_1": {
-    "message": "Gmail labels and star button (experimental)"
+    "message": "Gmail™ labels and star button (experimental)"
   },
   "options_plugins_2": {
     "message": "This plugin displays the star button as well as thread's labels in the popup (expanded mode only)."

From 9fb10fd00f1eb8537686dfcd9f26b495372b4b0c Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:10:04 +0200
Subject: [PATCH 13/21] Update messages.json

---
 v3.classic/_locales/en/messages.json | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/v3.classic/_locales/en/messages.json b/v3.classic/_locales/en/messages.json
index 4b474ac2..c2732939 100644
--- a/v3.classic/_locales/en/messages.json
+++ b/v3.classic/_locales/en/messages.json
@@ -5,20 +5,11 @@
   "toolbar_label": {
     "message": "Notifier for Gmail™"
   },
-  "tooltip_1": {
-    "message": "Left click: Open Gmail™ or mail preview panel"
-  },
-  "tooltip_2": {
-    "message": "Middle (or Ctrl+Left) click: Refresh all accounts"
-  },
-  "tooltip_3": {
-    "message": "Right click: Account selections"
-  },
   "description": {
     "message": "Multiple label and account notifier for Google Mail (Gmail)"
   },
   "log_in_to_your_account": {
-    "message": "Please sign-in to your account"
+    "message": "Please sign-in to your Gmail™ account"
   },
   "msg_1": {
     "message": "Tab is already open. Click on the toolbar button to open Gmail™ in a new tab, or to switch to an existing Gmail™ tab."
@@ -303,7 +294,7 @@
     "message": "Tab Opening"
   },
   "options_tab_1": {
-    "message": "Search for an open Gmail™ account only on the active window"
+    "message": "Search for an open Gmail™ account, only on the active window"
   },
   "options_tab_2": {
     "message": "Do not search other browser windows for open Gmail™ accounts. If Gmail™ is not open in the active window, open a new tab."
@@ -327,7 +318,7 @@
     "message": "Ignore opened Gmail™ tabs"
   },
   "options_tab_9": {
-    "message": "When unchecked, Gmail™ Notifier checks either active window or all open windows for open instance of Gmail™ and switch to the tab when tab opening is requested."
+    "message": "When checked, the notifier open emails in new browser tabs. When unchecked, it will first search the active window for an existing Gmail™ tab and switch to it. If not found, it will search other open windows before opening a new tab."
   },
   "options_tab_10": {
     "message": "Open emails in basic HTML mode"

From dea5950c8b303f8db66a1fff20ff6c3661e81536 Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:16:41 +0200
Subject: [PATCH 14/21] Update index.css

---
 v3.classic/data/options/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3.classic/data/options/index.css b/v3.classic/data/options/index.css
index 50858ccf..ce075685 100644
--- a/v3.classic/data/options/index.css
+++ b/v3.classic/data/options/index.css
@@ -188,7 +188,7 @@ input:invalid {
   width: 16px;
 }
 .note {
-  font-size: 85%;
+  font-size: unset;
   background: #fff7ee;
   padding: 10px;
   line-height: 140%;

From 9bea9a1e308ce37ae27988b15eaef4fd06236e7c Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:19:03 +0200
Subject: [PATCH 15/21] Update index.html

---
 v3.classic/data/options/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3.classic/data/options/index.html b/v3.classic/data/options/index.html
index 9b9be396..d0acb46c 100644
--- a/v3.classic/data/options/index.html
+++ b/v3.classic/data/options/index.html
@@ -389,8 +389,8 @@
            <input type="checkbox" id="onGmailNotification">
            <span data-l10n-id="options_misc_6"></span>
         </label>
-        <div class="fm">
-          <span data-l10n-id="options_misc_10"></span>
+        <div align="center">
+          <span data-l10n-id="options_misc_10" class="start"></span>
           <input id="threatAsNew" type="number" min="0"></input>
         </div>
         <p class="note" data-l10n-id="options_misc_11"></p>

From 4ca6877b4cac901e44bdde09e2ecf75fd38b2fd0 Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:34:33 +0200
Subject: [PATCH 16/21] Update messages.json

---
 v3.classic/_locales/fr/messages.json | 59 ++++++++++++----------------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/v3.classic/_locales/fr/messages.json b/v3.classic/_locales/fr/messages.json
index fe77e558..ae42c1a8 100644
--- a/v3.classic/_locales/fr/messages.json
+++ b/v3.classic/_locales/fr/messages.json
@@ -1,9 +1,9 @@
 {
   "gmail": {
-    "message": "Notifieur Gmail™"
+    "message": "Notifieur pour Gmail™"
   },
   "toolbar_label": {
-    "message": "Notifieur Gmail™"
+    "message": "Notifieur pour Gmail™"
   },
   "description": {
     "message": "Notifieur multi-comptes et multi-libellés pour Google Mail (Gmail™)"
@@ -108,7 +108,7 @@
     "message": "La période minimum est de 5 minutes."
   },
   "options_timings_l6": {
-    "message": "Une valeur non nulle déclenche une notification sur le bureau et une alerte sonore (similaire à l’arrivée d’un nouvel e-mail) de façon perpétuelle, si vous avez un ou plusieurs e-mails non lus."
+    "message": "Une valeur non nulle déclenche une notification sur le bureau et une alerte sonore (similaire à l’arrivée d’un nouvel e-mail) et ce, de façon perpétuelle, si vous avez un ou plusieurs e-mails non lus."
   },
   "options_timings_l7": {
     "message": "Ne pas relever les nouveaux e-mails au démarrage avant (en secondes) :"
@@ -156,7 +156,7 @@
     "message": "Séparer les flux par des \",\" (virgules). Exemple de flux : https://mail.google.com/mail/u/0/feed/atom/inbox"
   },
   "options_gmail_13": {
-    "message": "Remarque : le nombre maximal pour tous les libellés sauf «Boîte de réception» est de 20 (les flux Google ne fournissent que les 20 entrées les plus récentes)."
+    "message": "Remarque : le nombre maximal pour tous les libellés sauf «Boîte de réception» est de 20 (les flux Google ne fournissent que les 20 entrées les plus récentes)"
   },
   "options_gmail_14": {
     "message": "Remarque : pour que le notifieur écoute plus de 5 comptes, ajoutez les URL des flux au champ «Flux personnalisés». Par exemple, pour écouter les 6e et 7e comptes, ajoutez : https://mail.google.com/mail/u/6/feed/atom/inbox, https://mail.google.com/mail/u/7/feed/atom/inbox"
@@ -174,16 +174,16 @@
     "message": "Cette option peut ne pas fonctionner sur votre système d’exploitation."
   },
   "options_notifications_4": {
-    "message": "Format de notification :"
+    "message": "Format de notification"
   },
   "options_notifications_5": {
     "message": "Variables disponibles :"
   },
   "options_notifications_6": {
-    "message": "Tronquer les notifications plus longues que"
+    "message": "Tronquer les notifications plus longues que "
   },
   "options_notifications_7": {
-    "message": "caractères pour les champs [objet] et [résumé]."
+    "message": " caractères pour les champs [objet] et [résumé]."
   },
   "options_notifications_8": {
     "message": "Pour ne pas tronquer avec des points de suspension, utiliser un nombre élevé."
@@ -207,7 +207,7 @@
     "message": "Cette fonctionnalité est hautement expérimentale et pourrait rendre instable votre navigateur Firefox. [Redémarrage nécessaire]."
   },
   "options_notifications_15": {
-    "message": "Notification sonore par défaut :"
+    "message": "La Notification sonore par défaut :"
   },
   "options_notifications_16": {
     "message": "Alerte par défaut de Gmail™ Notifier"
@@ -276,10 +276,10 @@
     "message": "Afficher le nombre d’e-mail non lus sur le badge (et choisir la couleur du badge)"
   },
   "options_notifications_38": {
-    "message": "Pour Chrome uniquement : autoriser les actions plus rapides (marquer comme lu, supprimer, ...) (Considérer les actions à résoudre lorsque les en-têtes sont reçus)"
+    "message": "Actions plus rapides (marquer comme lu, supprimer, ...) (Considérer les actions à résoudre lorsque les en-têtes sont reçus)"
   },
   "options_notifications_40": {
-    "message": "Pour Chrome uniquement et si les actions rapides sont autorisées pour la boîte de notification (choisir 2 actions au maximum) :"
+    "message": "Autoriser les actions rapides depuis la boîte de notification (deux actions maximum, pour Chrome uniquement)"
   },
   "options_notifications_41": {
     "message": "Marquer comme lu"
@@ -330,7 +330,7 @@
     "message": "Barre d’outils"
   },
   "options_toolbar_1": {
-    "message": "Comportement du bouton de la barre d’outils :"
+    "message": "Comportement du bouton de la barre d’outils"
   },
   "options_toolbar_2": {
     "message": "Toujours ouvrir le panneau de prévisualisation d’e-mail"
@@ -342,7 +342,7 @@
     "message": "Ouvrir le compte Gmail™ (mode forcé)"
   },
   "options_toolbar_4": {
-    "message": "Mode d’affichage du panneau de la barre d’outils :"
+    "message": "Mode du panneau de la barre d’outils"
   },
   "options_toolbar_5": {
     "message": "Afficher le résumé uniquement"
@@ -357,19 +357,19 @@
     "message": "La largeur minimale est de 500 pixels."
   },
   "options_toolbar_9": {
-    "message": "Hauteur du panneau de la barre d’outils dans le mode «contenu total» (en pixels) :"
+    "message": "La Hauteur du panneau de la barre d’outils dans le mode «contenu total» (en pixels) :"
   },
   "options_toolbar_10": {
     "message": "La hauteur minimale est de 500 pixels."
   },
   "options_toolbar_11": {
-    "message": "Supporter les raccourcis clavier dans le panneau de la barre d’outils"
+    "message": "Support des raccourcis clavier dans le panneau de la barre d’outils"
   },
   "options_toolbar_12": {
     "message": "Signaler comme spam : < ! >, Supprimer : < # >, Archiver  : < e >, Marquer comme lu : < Shift + i >."
   },
   "options_toolbar_13": {
-    "message": "Afficher les e-mails en rendu HTML dans le mode «contenu total»"
+    "message": "Rendu des e-mails en HTML dans le mode «contenu total»"
   },
   "options_toolbar_14": {
     "message": "Si vous préférez le rendu «texte uniquement» dans le mode «contenu total», décochez cette case."
@@ -393,16 +393,16 @@
     "message": "Le type de tri par défaut respecte l’ordre de connexions."
   },
   "options_misc_3": {
-    "message": "Légende des couleurs du bouton de la barre d’outils :"
+    "message": "Légende de couleur du bouton de la barre d’outils :"
   },
   "options_misc_4": {
-    "message": "Gris pour «Tous lus» et Bleu pour «Déconnecté»"
+    "message": "gris pour «Tous lus» et bleu pour «Déconnecté»"
   },
   "options_misc_5": {
-    "message": "Bleu pour «Tous lus» et Gris pour «Déconnecté»"
+    "message": "bleu pour «Tous lus» et gris pour «Déconnecté»"
   },
   "options_misc_9": {
-    "message": "Rouge pour «Tous lus» et Gris pour «Déconnecté»"
+    "message": "rouge pour «Tous lus» et gris pour «Déconnecté»"
   },
   "options_misc_6": {
     "message": "Afficher une notification sur le bureau pour avertir que Gmail™ est déjà ouvert dans l’onglet actif"
@@ -411,13 +411,13 @@
     "message": "Afficher la page de bienvenue après une mise à jour"
   },
   "options_misc_8": {
-    "message": "Réinitialiser tous les paramètres à leurs valeurs par défaut"
+    "message": "Réinitialiser tous les paramètres aux valeurs par défaut"
   },
   "options_misc_10": {
-    "message": "Ne déclencher les notifications de bureau et  les notifications sonores que lorsqu’un e-mail est arrivé depuis moins de (en minutes) : "
+    "message": "Déclencher uniquement les notifications sonores et de bureau quand un e-mail est arrivé depuis moins de (en minutes) :"
   },
   "options_misc_11": {
-    "message": "En positionnant cette préférence à zéro, vous ne recevrez ni notifications de bureau ni notifications sonores ;          malgré tout, la notification de badge continuera de se mettre à jour."
+    "message": "En positionnant cette préférence à zéro, vous ne recevrez ni notifications de bureau ni notifications sonores ; néanmoins, vous recevrez toujours la notification de badge."
   },
   "options_misc_12": {
     "message": "Ne pas inclure de détails d’identifiant dans la bulle textuelle"
@@ -432,7 +432,7 @@
     "message": "Ouvrir la page FAQ sur les mises à jour"
   },
   "options_misc_16": {
-    "message": "Thème de couleur par défaut du panneau :"
+    "message": "Thème de couleur du panneau :"
   },
   "options_misc_17": {
     "message": "Thème clair"
@@ -462,7 +462,7 @@
     "message": "Jouer le son ►"
   },
   "options_button_reset": {
-    "message": "    <=    Remise à zéro des préférences    =>    "
+    "message": "Remise à zéro des préférences"
   },
   "popup_settings": {
     "message": "Paramètres"
@@ -504,16 +504,7 @@
     "message": "Tout marquer comme lu"
   },
   "popup_toggle_dark": {
-    "message": "Thème sombre <==> Thème clair"
-  },
-  "popup_expand": {
-    "message": "Agrandir <==> Réduire"
-  },
-  "popup_previous": {
-    "message": "E-mail précédent"
-  },
-  "popup_next": {
-    "message": "E-mail suivant"
+    "message": "Thème sombre <=> Thème clair"
   },
   "popup_msg_1": {
     "message": "à l’instant"

From 60db98d39508458f0567b5c50548ff19fc626f44 Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:37:26 +0200
Subject: [PATCH 17/21] Update messages.json

---
 v3.classic/_locales/fr/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3.classic/_locales/fr/messages.json b/v3.classic/_locales/fr/messages.json
index ae42c1a8..5378bb44 100644
--- a/v3.classic/_locales/fr/messages.json
+++ b/v3.classic/_locales/fr/messages.json
@@ -108,7 +108,7 @@
     "message": "La période minimum est de 5 minutes."
   },
   "options_timings_l6": {
-    "message": "Une valeur non nulle déclenche une notification sur le bureau et une alerte sonore (similaire à l’arrivée d’un nouvel e-mail) et ce, de façon perpétuelle, si vous avez un ou plusieurs e-mails non lus."
+    "message": "Une valeur non nulle déclenche une notification sur le bureau et une alerte sonore (similaire à l’arrivée d’un nouvel e-mail) et ce, de façon perpétuelle si vous avez un ou plusieurs e-mails non lus."
   },
   "options_timings_l7": {
     "message": "Ne pas relever les nouveaux e-mails au démarrage avant (en secondes) :"

From 9521e87e68ad5124dad46e3ecf6cc3f8f503f88a Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:47:59 +0200
Subject: [PATCH 18/21] Update index.html

---
 v3.classic/data/options/index.html | 725 ++++++++++++-----------------
 1 file changed, 299 insertions(+), 426 deletions(-)

diff --git a/v3.classic/data/options/index.html b/v3.classic/data/options/index.html
index d0acb46c..ce075685 100644
--- a/v3.classic/data/options/index.html
+++ b/v3.classic/data/options/index.html
@@ -1,436 +1,309 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title data-l10n-id="options_title"></title>
-  <link rel="icon" type="image/png" href="../icons/options/32.png">
-  <link rel="stylesheet" type="text/css" href="index.css">
-</head>
-<body>
-  <div id="header" hbox>
-    <div type="icon"></div>
-    <div flex="1" vbox pack="center" style="overflow: hidden; max-width: 400px">
-      <div type="title" data-l10n-id="options_title"></div>
-      <div type="description" data-l10n-id="options_inshort"></div>
-    </div>
-    <div hbox flex="1" pack="center" align="center">
-      <a id=donation target="_blank"><input type="button" data-l10n-id="options_donation" data-l10n-value="value"/></a>
-    </div>
-    <div class="browser">
-      <ul>
-        <li><a target="_blank" href="https://addons.mozilla.org/firefox/addon/gmail-notifier-restartless/"><img src="/data/icons/browsers/firefox.png"></img></a></li>
-        <li><a target="_blank" href="https://microsoftedge.microsoft.com/addons/detail/cmhmeappbhdaifkknkhdnmogalbnhloa"><img src="/data/icons/browsers/edge.png"></img></a></li>
-        <li><a target="_blank" href="https://chromewebstore.google.com/detail/notifier-for-gmail/dcjichoefijpinlfnjghokpkojhlhkgl"><img src="/data/icons/browsers/chrome.png"></img></a></li>
-        <li><a target="_blank" href="https://addons.opera.com/extensions/details/gmail-notifier/"><img src="/data/icons/browsers/opera.png"></img></a></li>
-      </ul>
-    </div>
-  </div>
+body {
+  margin: 0;
+}
+body,
+table {
+  font-size: 14px;
+  color: #222;
+  font-family: arial, sans-serif;
+}
+select,
+button,
+input[type=submit],
+input[type=button] {
+  height: 28px;
+  color: #444;
+  background-image: linear-gradient(rgb(237, 237, 237), rgb(237, 237, 237) 38%, rgb(222, 222, 222));
+  box-shadow: rgba(0, 0, 0, 0.08) 0 1px 0, rgba(255, 255, 255, 0.75) 0 1px 2px inset;
+  text-shadow: rgb(240, 240, 240) 0 1px 0;
+}
+select,
+button,
+textarea,
+input {
+  border: solid 1px rgba(0, 0, 0, 0.25);
+}
+select,
+input {
+  background-color: #fff;
+}
+select {
+  justify-self: end;
+  max-width: 60vw;
+}
 
-  <div id="content" vbox>
-    <div hbox>
-      <div data-l10n-id="options_timings" class="fixed"></div>
-      <div vbox class="content">
-        <div class="fm">
-          <span data-l10n-id="options_timings_l1"></span>
-          <input id="period" type="number" min="10" required></input>
-        </div>
-        <p class="note" data-l10n-id="options_timings_l2"></p>
-        <div class="fm">
-          <span data-l10n-id="options_timings_l3"></span>
-          <input id="resetPeriod" type="number" min="0" required></input>
-        </div>
-        <div class="note">
-          <span data-l10n-id="options_timings_l4"></span>
-          <span data-l10n-id="options_timings_l5"></span>
-          <span data-l10n-id="options_timings_l6"></span>
-        </div>
-        <div class="fm">
-          <span data-l10n-id="options_timings_l7"></span>
-          <input id="initialPeriod" type="number" min="0" required></input>
-        </div>
-        <p class="note" data-l10n-id="options_timings_l8"></p>
-      </div>
-    </div>
-    <div hbox>
-      <div data-l10n-id="options_gmail" class="fixed"></div>
-      <div flex="1" class="content">
-        <p data-l10n-id="options_gmail_10"></p>
-        <div class="mf">
-          <div data-l10n-id="options_gmail_1" class="nwap"></div>
-          <input type="text" id="feeds_0" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_3" class="nwap"></div>
-          <input type="text" id="feeds_1" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_4" class="nwap"></div>
-          <input type="text" id="feeds_2" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_5" class="nwap"></div>
-          <input type="text" id="feeds_3" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_6" class="nwap"></div>
-          <input type="text" id="feeds_4" placeholder="e.g.: inbox, important"/>
-          <div data-l10n-id="options_gmail_7" class="nwap"></div>
-          <input type="text" id="feeds_5" placeholder="e.g.: inbox, important"/>
+label > input {
+  vertical-align: middle;
+}
+input[type=number],
+input[type=text] {
+  height: 24px;
+  outline: none;
+  padding-inline: 5px;
+}
+input[type=number]:focus,
+input[type=text]:focus {
+  background-color: #defff8;
+}
 
+p {
+  margin: 0 0 10px 0;
+  font-size: 110%;
+}
+label {
+  align-items: center;
+  display: flex;
+}
+#content {
+  margin: auto;
+  max-width: 1200px;
+}
+.fixed {
+  min-width: 18ch;
+  background: #f1f1f1;
+  padding: 10px 0;
+  text-align: center;
+}
 
-        </div>
-        <div class="note">
-          <span data-l10n-id="options_gmail_2"></span>
-          <span data-l10n-id="options_gmail_15"></span>
-          <pre style="font-size: 85%; color: #652e2e; white-space: pre-line; margin: 0">
-            inbox, important, all, unread
-            ^sq_ig_i_personal (Inbox Primary), ^sq_ig_i_social (Inbox Social), ^sq_ig_i_promo (Inbox Promotions), ^sq_ig_i_notification (Inbox Updates), ^sq_ig_i_group (Inbox Forums)
-            ^smartlabel_personal, ^smartlabel_newsletter, ^smartlabel_notification, ^smartlabel_group
-          </pre>
-        </div>
-        <div class="mf">
-          <div data-l10n-id="options_gmail_11" class="nwap"></div>
-          <input type="text" id="feeds_custom" placeholder="https://mail.google.com/mail/u/6/feed/atom/inbox"/>
-        </div>
-        <div class="note">
-          <span data-l10n-id="options_gmail_12"></span>
-          <span data-l10n-id="options_gmail_13"></span>
-          <span data-l10n-id="options_gmail_14"></span>
-        </div>
-      </div>
-    </div>
-    <div hbox>
-      <div data-l10n-id="options_notifications" class="fixed"></div>
-      <div flex="1" class="content">
-        <label class="tds">
-          <input type="checkbox" id="badge">
-          <span data-l10n-id="options_notifications_37"></span>
-          <input type="color" id="backgroundColor">
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="notification">
-          <span data-l10n-id="options_notifications_1"></span>
-        </label>
-        <div class="fm">
-          <span data-l10n-id="options_notifications_2"></span>
-          <input id="notificationTime" type="number" min="3" required></input>
-        </div>
+@media screen and (max-width: 600px) {
+  .fixed {
+    display: none;
+  }
+}
 
-        <p class="note" data-l10n-id="options_notifications_3"></p>
-        <div class="mf">
-          <div data-l10n-id="options_notifications_4" class="nwap"></div>
-          <input type="text" id="notificationFormat" required/>
-        </div>
-        <p class="note gap" hbox><span data-l10n-id="options_notifications_5"></span> [author_name], [author_email], [title] <span data-l10n-id="and"></span> [summary].</p>
-        <div align="center" class="gap wrap">
-          <span data-l10n-id="options_notifications_6"></span>
-          <input id="notificationTruncate" type="number" min="20" max="200" required></input>
-          <span data-l10n-id="options_notifications_7"></span>
-        </div>
-        <p class="note" data-l10n-id="options_notifications_8"></p>
-        <label class="nf">
-          <span data-l10n-id="options_notifications_40"></span>
-          <ul class="frt">
-            <li><label><input type="checkbox" id="notification.buttons.markasread"> <span data-l10n-id="options_notifications_41"></span></label></li>
-            <li><label><input type="checkbox" id="notification.buttons.archive"> <span data-l10n-id="options_notifications_42"></span></label></li>
-            <li><label><input type="checkbox" id="notification.buttons.trash"> <span data-l10n-id="options_notifications_43"></span></label></li>
-          </ul>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="alert">
-          <span data-l10n-id="options_notifications_9"></span>
-        </label>
-        <p class="note only-mac" data-l10n-id="options_notifications_10"></p>
+.browse input {
+  display: none !important;
+}
 
-        <div class="fnjh">
-          <div data-l10n-id="options_notifications_15"></div>
-          <select id="notification.sound.media.default.type">
-            <option value="0" data-l10n-id="options_notifications_16"></option>
-            <option value="1" data-l10n-id="options_notifications_17"></option>
-            <option value="2" data-l10n-id="options_notifications_18"></option>
-            <option value="3" data-l10n-id="options_notifications_19"></option>
-            <option value="4" data-l10n-id="options_notifications_20"></option>
-          </select>
-          <label class="browse">Browse<input type="file" id="notification.sound.media.default.file"></input></label>
-          <input type="button" id="test-play" data-l10n-id="options_button_test" data-l10n-value="value">
-        </div>
-        <div class="fes">
-          <div data-l10n-id="options_notifications_31"></div>
-          <select id="notification.sound.media.custom0.selector">
-            <option value="0" data-l10n-id="options_notifications_32"></option>
-            <option value="1" data-l10n-id="options_notifications_33"></option>
-            <option value="2" data-l10n-id="options_notifications_34"></option>
-          </select>
-          <input type="text" id="notification.sound.media.custom0.filter">
-          <select id="notification.sound.media.custom0.type">
-            <option value="0" data-l10n-id="options_notifications_16"></option>
-            <option value="1" data-l10n-id="options_notifications_17"></option>
-            <option value="2" data-l10n-id="options_notifications_18"></option>
-            <option value="3" data-l10n-id="options_notifications_19"></option>
-            <option value="4" data-l10n-id="options_notifications_20"></option>
-          </select>
-          <label class="browse">Browse<input type="file" id="notification.sound.media.custom0.file"></input></label>
-        </div>
-        <div class="fes">
-          <div data-l10n-id="options_notifications_31"></div>
-          <select id="notification.sound.media.custom1.selector">
-            <option value="0" data-l10n-id="options_notifications_32"></option>
-            <option value="1" data-l10n-id="options_notifications_33"></option>
-            <option value="2" data-l10n-id="options_notifications_34"></option>
-          </select>
-          <input type="text" id="notification.sound.media.custom1.filter">
-          <select id="notification.sound.media.custom1.type">
-            <option value="0" data-l10n-id="options_notifications_16"></option>
-            <option value="1" data-l10n-id="options_notifications_17"></option>
-            <option value="2" data-l10n-id="options_notifications_18"></option>
-            <option value="3" data-l10n-id="options_notifications_19"></option>
-            <option value="4" data-l10n-id="options_notifications_20"></option>
-          </select>
-          <label class="browse">Browse<input type="file" id="notification.sound.media.custom1.file"></input></label>
-        </div>
-        <div class="fes">
-          <div data-l10n-id="options_notifications_31"></div>
-          <select id="notification.sound.media.custom2.selector">
-            <option value="0" data-l10n-id="options_notifications_32"></option>
-            <option value="1" data-l10n-id="options_notifications_33"></option>
-            <option value="2" data-l10n-id="options_notifications_34"></option>
-          </select>
-          <input type="text" id="notification.sound.media.custom2.filter">
-          <select id="notification.sound.media.custom2.type">
-            <option value="0" data-l10n-id="options_notifications_16"></option>
-            <option value="1" data-l10n-id="options_notifications_17"></option>
-            <option value="2" data-l10n-id="options_notifications_18"></option>
-            <option value="3" data-l10n-id="options_notifications_19"></option>
-            <option value="4" data-l10n-id="options_notifications_20"></option>
-          </select>
-          <label class="browse">Browse<input type="file" id="notification.sound.media.custom2.file"></input></label>
-        </div>
-        <div class="fes">
-          <div data-l10n-id="options_notifications_31"></div>
-          <select id="notification.sound.media.custom3.selector">
-            <option value="0" data-l10n-id="options_notifications_32"></option>
-            <option value="1" data-l10n-id="options_notifications_33"></option>
-            <option value="2" data-l10n-id="options_notifications_34"></option>
-          </select>
-          <input type="text" id="notification.sound.media.custom3.filter">
-          <select id="notification.sound.media.custom3.type">
-            <option value="0" data-l10n-id="options_notifications_16"></option>
-            <option value="1" data-l10n-id="options_notifications_17"></option>
-            <option value="2" data-l10n-id="options_notifications_18"></option>
-            <option value="3" data-l10n-id="options_notifications_19"></option>
-            <option value="4" data-l10n-id="options_notifications_20"></option>
-          </select>
-          <label class="browse">Browse<input type="file" id="notification.sound.media.custom3.file"></input></label>
-        </div>
-        <div class="fes">
-          <div data-l10n-id="options_notifications_31"></div>
-          <select id="notification.sound.media.custom4.selector">
-            <option value="0" data-l10n-id="options_notifications_32"></option>
-            <option value="1" data-l10n-id="options_notifications_33"></option>
-            <option value="2" data-l10n-id="options_notifications_34"></option>
-          </select>
-          <input type="text" id="notification.sound.media.custom4.filter">
-          <select id="notification.sound.media.custom4.type">
-            <option value="0" data-l10n-id="options_notifications_16"></option>
-            <option value="1" data-l10n-id="options_notifications_17"></option>
-            <option value="2" data-l10n-id="options_notifications_18"></option>
-            <option value="3" data-l10n-id="options_notifications_19"></option>
-            <option value="4" data-l10n-id="options_notifications_20"></option>
-          </select>
-          <label class="browse">Browse<input type="file" id="notification.sound.media.custom4.file"></input></label>
-        </div>
+#content > div:not(:last-child) {
+  padding: 10px 0;
+}
+#content > div:last-child {
+  padding-top: 10px;
+}
+.content {
+  width: 100%;
+  padding-inline: 10px;
+}
+.content > * {
+  display: flex;
+  margin-bottom: 5px;
+}
 
-        <div class="note">
-          <span class="only-safari" data-l10n-id="options_notifications_25"></span>
-          <span data-l10n-id="options_notifications_22"></span>
-          <span data-l10n-id="options_notifications_35"></span>
-        </div>
-        <div>
+#header {
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #f1f1f1;
+  display: grid;
+  grid-gap: 10px;
+  grid-template-columns: min-content 1fr min-content 48px;
+}
+#header > div > span {
+  padding-left: 105px;
+}
+#header > div:nth-child(1) > span:nth-child(1) {
+  font-size: 140%;
+}
 
-        </div>
-        <div class="fm">
-          <span data-l10n-id="options_notifications_23"></span>
-          <input id="soundVolume" type="number" min="1" max="100" required></input>
-        </div>
-        <p class="note" data-l10n-id="options_notifications_24"></p>
-        <div class="fm">
-          <span data-l10n-id="options_notifications_28"></span>
-          <input id="silentTime" type="number" min="1" max="1000" required list="silentTimeList">
-          <datalist id="silentTimeList">
-            <option value="5">
-            <option value="10">
-            <option value="15">
-            <option value="30">
-            <option value="60">
-            <option value="120">
-            <option value="300">
-          </datalist>
-        </div>
-        <p class="note" data-l10n-id="options_notifications_29"></p>
-        <label class="mf">
-          <input type="checkbox" id="combined">
-          <span data-l10n-id="options_notifications_30"></span>
-        </label>
-      </div>
-    </div>
-    <div hbox>
-      <div data-l10n-id="options_tab" class="fixed"></div>
-      <div flex="1" class="content">
-        <label class="mf">
-          <input type="checkbox" id="searchMode">
-          <span data-l10n-id="options_tab_1"></span>
-        </label>
-        <p class="note" data-l10n-id="options_tab_2"></p>
-        <label class="mf">
-          <input type="checkbox" id="ignoreOpens">
-          <span data-l10n-id="options_tab_8"></span>
-        </label>
-        <p class="note" data-l10n-id="options_tab_9"></p>
-        <label class="mf">
-          <input type="checkbox" id="relatedToCurrent">
-          <span data-l10n-id="options_tab_3"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="currentTab">
-          <span data-l10n-id="options_tab_4"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="background">
-          <span data-l10n-id="options_tab_5"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="useBlankTabs">
-          <span data-l10n-id="options_tab_7"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="newWindow">
-          <span data-l10n-id="options_tab_6"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="basic.html">
-          <span data-l10n-id="options_tab_10"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="smartOpen">
-          <span data-l10n-id="options_tab_11"></span>
-        </label>
-      </div>
-    </div>
-    <div hbox>
-      <div data-l10n-id="options_toolbar" class="fixed"></div>
-      <div flex="1" class="content">
-        <div class="fm">
-            <div data-l10n-id="options_toolbar_1"></div>
-            <select id="oldFashion">
-              <option value="0" data-l10n-id="options_toolbar_2"></option>
-              <option value="1" data-l10n-id="options_toolbar_3"></option>
-              <option value="2" data-l10n-id="options_toolbar_18"></option>
-            </select>
-        </div>
-        <div class="fm">
-          <div data-l10n-id="options_toolbar_4"></div>
-          <select id="size">
-            <option value="0" data-l10n-id="options_toolbar_5"></option>
-            <option value="1" data-l10n-id="options_toolbar_6"></option>
-          </select>
-        </div>
-        <div class="fm">
-          <span data-l10n-id="options_toolbar_7"></span>
-          <input id="fullWidth" type="number" min="500" max="780" required></input>
-        </div>
-        <p class="note" data-l10n-id="options_toolbar_8"></p>
-        <div class="fm">
-          <span data-l10n-id="options_toolbar_9"></span>
-          <input id="fullHeight" type="number" min="500" max="600" required></input>
-        </div>
-        <p class="note" data-l10n-id="options_toolbar_10"></p>
-        <label class="mf">
-          <input type="checkbox" id="keyUp">
-          <span data-l10n-id="options_toolbar_11"></span>
-        </label>
-        <p class="note" data-l10n-id="options_toolbar_12"></p>
-        <label class="mf">
-          <input type="checkbox" id="render">
-          <span data-l10n-id="options_toolbar_13"></span>
-        </label>
-        <p class="note" data-l10n-id="options_toolbar_14"></p>
-      </div>
-    </div>
-    <div hbox>
-      <div data-l10n-id="options_misc" class="fixed"></div>
-      <div flex="1" class="content">
-        <label class="mf">
-          <input type="checkbox" id="doReadOnArchive"/>
-          <span data-l10n-id="options_gmail_8"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="inboxRedirection"/>
-          <span data-l10n-id="options_notifications_36"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="express"/>
-          <span data-l10n-id="options_notifications_38"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="alphabetic">
-          <span data-l10n-id="options_misc_1"></span>
-        </label>
-        <p class="note" data-l10n-id="options_misc_2"></p>
-        <div class="mf">
-          <div data-l10n-id="options_misc_3" class="nwap"></div>
-          <select id="clrPattern">
-            <option value="0" data-l10n-id="options_misc_4"></option>
-            <option value="1" data-l10n-id="options_misc_5"></option>
-            <option value="2" data-l10n-id="options_misc_9"></option>
-          </select>
-        </div>
-        <div class="mf">
-          <div data-l10n-id="options_misc_16" class="nwap"></div>
-          <select id="dark">
-            <option value="false" data-l10n-id="options_misc_17"></option>
-            <option value="true" data-l10n-id="options_misc_18"></option>
-            <option value="auto" data-l10n-id="options_misc_19"></option>
-          </select>
-        </div>
-        <label class="mf">
-           <input type="checkbox" id="onGmailNotification">
-           <span data-l10n-id="options_misc_6"></span>
-        </label>
-        <div align="center">
-          <span data-l10n-id="options_misc_10" class="start"></span>
-          <input id="threatAsNew" type="number" min="0"></input>
-        </div>
-        <p class="note" data-l10n-id="options_misc_11"></p>
-        <label class="mf">
-          <input type="checkbox" id="minimal">
-          <span data-l10n-id="options_misc_14"></span>
-        </label>
-        <label class="mf">
-          <input type="checkbox" id="welcome">
-          <span data-l10n-id="options_misc_15"></span>
-        </label>
-        <div class="nf">
-          <span data-l10n-id="options_misc_8"></span>
-          <input type="button" id="reset" data-l10n-id="options_button_reset" data-l10n-value="value">
-        </div>
-      </div>
-    </div>
+#header [type=icon] {
+  width: 90px;
+  background-image: url(../icons/options/64.png);
+  background-position: right 10px center;
+  background-repeat: no-repeat;
+}
+#header [type=title],
+#header [type=description] {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+}
+#header [type=title] {
+  font-size: 150%;
+  line-height: 150%;
+}
+#header [type=description] {
+  color: #707070 !important;
+}
+#header ul {
+  list-style: none;
+  margin: 0;
+  padding: 10px;
+}
+#donation input[type=button] {
+  background-image: none;
+  text-shadow: none;
+  box-shadow: none;
+  background-color: #f07600;
+  color: #fff;
+  border: 1px solid transparent;
+  border-radius: 0;
+  cursor: pointer;
+  outline: medium none;
+  text-align: center;
+  vertical-align: middle !important;
+  padding: 5px 10px;
+  height: revert;
+}
 
-    <div hbox>
-      <div data-l10n-id="options_plugins" class="fixed"></div>
-      <div flex="1" class="content">
-        <label class="mf">
-          <input type="checkbox" id="plug-in/labels">
-          <span data-l10n-id="options_plugins_1"></span>
-        </label>
-        <p class="note" data-l10n-id="options_plugins_2"></p>
-      </div>
-    </div>
-  </div>
+@media screen and (max-width: 600px) {
+  #donation {
+    display: none;
+  }
+  [type="description"] {
+    display: none;
+  }
+}
 
-  <dialog id="notify">
-    <div flex="1">This is message</div>
-    <div hbox pack=end>
-      <input type="button" data-cmd="no" value="No">
-      <input type="button" data-cmd="yes" value="Yes">
-    </div>
-  </div>
+input:invalid {
+  border-color: red;
+  background-color: rgba(255, 0, 0, 0.2);
+}
 
-  <script src="/data/locale.js"></script>
-  <script src="config.js"></script>
-  <script src="index.js"></script>
-</body>
-</html>
+#notify {
+  width: min(80%, 400px);
+  height: 100px;
+  background-color: #fff;
+  padding: 10px;
+  font-size: 12px;
+}
+#notify[open] {
+  display: grid;
+  grid-template-rows: 1fr min-content;
+}
+#notify input {
+  width: 80px;
+  margin-left: 5px;
+}
+#notify::backdrop {
+  background-color: rgba(0, 0, 0, 0.7);
+}
+
+#donation {
+  text-decoration: none;
+  color: #fff;
+  font-weight: bold;
+}
+
+.browser img {
+  width: 16px;
+}
+.note {
+  font-size: unset;
+  background: #fff7ee;
+  padding: 10px;
+  line-height: 140%;
+  flex-direction: column;
+}
+.note span:not(:last-child) {
+  margin-bottom: 1ch;
+}
+.browse {
+  display: none;
+  font-weight: bold;
+  padding: 0 5px;
+  cursor: pointer;
+}
+.fm {
+  display: grid;
+  grid-template-columns: 1fr 100px;
+  grid-gap: 5px;
+  align-items: center;
+}
+.mf {
+  display: grid;
+  grid-template-columns: min-content 1fr;
+  grid-gap: 5px;
+  align-items: center;
+}
+.nwap {
+  white-space: nowrap;
+}
+.nf {
+  display: grid;
+  grid-template-columns: 1fr min-content;
+  grid-gap: 5px;
+  align-items: center;
+}
+.nf li {
+  white-space: nowrap;
+}
+.gap {
+  gap: 5px;
+}
+.start {
+  text-align: start;
+}
+.wrap {
+  flex-wrap: wrap;
+}
+
+@media screen and (max-width: 600px) {
+  .mf {
+    grid-template-columns: 1fr;
+  }
+  .mf > :first-child {
+    width: unset;
+  }
+  .mf input {
+    justify-self: end;
+  }
+}
+
+.tds {
+  display: grid;
+  grid-template-columns: min-content 1fr min-content;
+  grid-gap: 5px;
+  align-items: center;
+}
+.fes {
+  display: grid;
+  grid-template-columns: min-content min-content 1fr min-content;
+  grid-gap: 5px;
+  align-items: center;
+}
+.fes > :first-child {
+  width: max-content;
+}
+
+@media screen and (max-width: 800px) {
+  .fes {
+    grid-template-columns: 1fr 1fr;
+  }
+  .fes select {
+    width: 100%;
+  }
+}
+.frt {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  justify-self: end;
+}
+.fnjh {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+}
+.fnjh > :first-child {
+  flex: 1;
+}
+[hbox] {
+  display: flex;
+  flex-direction: row;
+}
+[vbox] {
+  display: flex;
+  flex-direction: column;
+}
+[pack=center] {
+  justify-content: center;
+}
+[align=center] {
+  align-items: center;
+}
+[pack=end] {
+  justify-content: flex-end;
+}
+[align=end] {
+  align-items: flex-end;
+}

From fce6bb37a5d8b00f864b159386fd3e2306a8415c Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:49:52 +0200
Subject: [PATCH 19/21] Update index.html

---
 v3.classic/data/options/index.html | 725 +++++++++++++++++------------
 1 file changed, 426 insertions(+), 299 deletions(-)

diff --git a/v3.classic/data/options/index.html b/v3.classic/data/options/index.html
index ce075685..dde75bf7 100644
--- a/v3.classic/data/options/index.html
+++ b/v3.classic/data/options/index.html
@@ -1,309 +1,436 @@
-body {
-  margin: 0;
-}
-body,
-table {
-  font-size: 14px;
-  color: #222;
-  font-family: arial, sans-serif;
-}
-select,
-button,
-input[type=submit],
-input[type=button] {
-  height: 28px;
-  color: #444;
-  background-image: linear-gradient(rgb(237, 237, 237), rgb(237, 237, 237) 38%, rgb(222, 222, 222));
-  box-shadow: rgba(0, 0, 0, 0.08) 0 1px 0, rgba(255, 255, 255, 0.75) 0 1px 2px inset;
-  text-shadow: rgb(240, 240, 240) 0 1px 0;
-}
-select,
-button,
-textarea,
-input {
-  border: solid 1px rgba(0, 0, 0, 0.25);
-}
-select,
-input {
-  background-color: #fff;
-}
-select {
-  justify-self: end;
-  max-width: 60vw;
-}
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title data-l10n-id="options_title"></title>
+  <link rel="icon" type="image/png" href="../icons/options/32.png">
+  <link rel="stylesheet" type="text/css" href="index.css">
+</head>
+<body>
+  <div id="header" hbox>
+    <div type="icon"></div>
+    <div flex="1" vbox pack="center" style="overflow: hidden; max-width: 400px">
+      <div type="title" data-l10n-id="options_title"></div>
+      <div type="description" data-l10n-id="options_inshort"></div>
+    </div>
+    <div hbox flex="1" pack="center" align="center">
+      <a id=donation target="_blank"><input type="button" data-l10n-id="options_donation" data-l10n-value="value"/></a>
+    </div>
+    <div class="browser">
+      <ul>
+        <li><a target="_blank" href="https://addons.mozilla.org/firefox/addon/gmail-notifier-restartless/"><img src="/data/icons/browsers/firefox.png"></img></a></li>
+        <li><a target="_blank" href="https://microsoftedge.microsoft.com/addons/detail/cmhmeappbhdaifkknkhdnmogalbnhloa"><img src="/data/icons/browsers/edge.png"></img></a></li>
+        <li><a target="_blank" href="https://chromewebstore.google.com/detail/notifier-for-gmail/dcjichoefijpinlfnjghokpkojhlhkgl"><img src="/data/icons/browsers/chrome.png"></img></a></li>
+        <li><a target="_blank" href="https://addons.opera.com/extensions/details/gmail-notifier/"><img src="/data/icons/browsers/opera.png"></img></a></li>
+      </ul>
+    </div>
+  </div>
 
-label > input {
-  vertical-align: middle;
-}
-input[type=number],
-input[type=text] {
-  height: 24px;
-  outline: none;
-  padding-inline: 5px;
-}
-input[type=number]:focus,
-input[type=text]:focus {
-  background-color: #defff8;
-}
+  <div id="content" vbox>
+    <div hbox>
+      <div data-l10n-id="options_timings" class="fixed"></div>
+      <div vbox class="content">
+        <div class="fm">
+          <span data-l10n-id="options_timings_l1"></span>
+          <input id="period" type="number" min="10" required></input>
+        </div>
+        <p class="note" data-l10n-id="options_timings_l2"></p>
+        <div class="fm">
+          <span data-l10n-id="options_timings_l3"></span>
+          <input id="resetPeriod" type="number" min="0" required></input>
+        </div>
+        <div class="note">
+          <span data-l10n-id="options_timings_l4"></span>
+          <span data-l10n-id="options_timings_l5"></span>
+          <span data-l10n-id="options_timings_l6"></span>
+        </div>
+        <div class="fm">
+          <span data-l10n-id="options_timings_l7"></span>
+          <input id="initialPeriod" type="number" min="0" required></input>
+        </div>
+        <p class="note" data-l10n-id="options_timings_l8"></p>
+      </div>
+    </div>
+    <div hbox>
+      <div data-l10n-id="options_gmail" class="fixed"></div>
+      <div flex="1" class="content">
+        <p data-l10n-id="options_gmail_10"></p>
+        <div class="mf">
+          <div data-l10n-id="options_gmail_1" class="nwap"></div>
+          <input type="text" id="feeds_0" placeholder="e.g.: inbox, important"/>
+          <div data-l10n-id="options_gmail_3" class="nwap"></div>
+          <input type="text" id="feeds_1" placeholder="e.g.: inbox, important"/>
+          <div data-l10n-id="options_gmail_4" class="nwap"></div>
+          <input type="text" id="feeds_2" placeholder="e.g.: inbox, important"/>
+          <div data-l10n-id="options_gmail_5" class="nwap"></div>
+          <input type="text" id="feeds_3" placeholder="e.g.: inbox, important"/>
+          <div data-l10n-id="options_gmail_6" class="nwap"></div>
+          <input type="text" id="feeds_4" placeholder="e.g.: inbox, important"/>
+          <div data-l10n-id="options_gmail_7" class="nwap"></div>
+          <input type="text" id="feeds_5" placeholder="e.g.: inbox, important"/>
 
-p {
-  margin: 0 0 10px 0;
-  font-size: 110%;
-}
-label {
-  align-items: center;
-  display: flex;
-}
-#content {
-  margin: auto;
-  max-width: 1200px;
-}
-.fixed {
-  min-width: 18ch;
-  background: #f1f1f1;
-  padding: 10px 0;
-  text-align: center;
-}
 
-@media screen and (max-width: 600px) {
-  .fixed {
-    display: none;
-  }
-}
+        </div>
+        <div class="note">
+          <span data-l10n-id="options_gmail_2"></span>
+          <span data-l10n-id="options_gmail_15"></span>
+          <pre style="font-size: 85%; color: #652e2e; white-space: pre-line; margin: 0">
+            inbox, important, all, unread
+            ^sq_ig_i_personal (Inbox Primary), ^sq_ig_i_social (Inbox Social), ^sq_ig_i_promo (Inbox Promotions), ^sq_ig_i_notification (Inbox Updates), ^sq_ig_i_group (Inbox Forums)
+            ^smartlabel_personal, ^smartlabel_newsletter, ^smartlabel_notification, ^smartlabel_group
+          </pre>
+        </div>
+        <div class="mf">
+          <div data-l10n-id="options_gmail_11"></div>
+          <input type="text" id="feeds_custom" placeholder="https://mail.google.com/mail/u/6/feed/atom/inbox"/>
+        </div>
+        <div class="note">
+          <span data-l10n-id="options_gmail_12"></span>
+          <span data-l10n-id="options_gmail_13"></span>
+          <span data-l10n-id="options_gmail_14"></span>
+        </div>
+      </div>
+    </div>
+    <div hbox>
+      <div data-l10n-id="options_notifications" class="fixed"></div>
+      <div flex="1" class="content">
+        <label class="tds">
+          <input type="checkbox" id="badge">
+          <span data-l10n-id="options_notifications_37"></span>
+          <input type="color" id="backgroundColor">
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="notification">
+          <span data-l10n-id="options_notifications_1"></span>
+        </label>
+        <div class="fm">
+          <span data-l10n-id="options_notifications_2"></span>
+          <input id="notificationTime" type="number" min="3" required></input>
+        </div>
 
-.browse input {
-  display: none !important;
-}
+        <p class="note" data-l10n-id="options_notifications_3"></p>
+        <div class="mf">
+          <div data-l10n-id="options_notifications_4" class="nwap"></div>
+          <input type="text" id="notificationFormat" required/>
+        </div>
+        <p class="note gap" hbox><span data-l10n-id="options_notifications_5"></span> [author_name], [author_email], [title] <span data-l10n-id="and"></span> [summary].</p>
+        <div align="center" class="gap wrap">
+          <span data-l10n-id="options_notifications_6"></span>
+          <input id="notificationTruncate" type="number" min="20" required></input>
+          <span data-l10n-id="options_notifications_7"></span>
+        </div>
+        <p class="note" data-l10n-id="options_notifications_8"></p>
+        <label class="nf">
+          <span data-l10n-id="options_notifications_40"></span>
+          <ul class="frt">
+            <li><label><input type="checkbox" id="notification.buttons.markasread"> <span data-l10n-id="options_notifications_41"></span></label></li>
+            <li><label><input type="checkbox" id="notification.buttons.archive"> <span data-l10n-id="options_notifications_42"></span></label></li>
+            <li><label><input type="checkbox" id="notification.buttons.trash"> <span data-l10n-id="options_notifications_43"></span></label></li>
+          </ul>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="alert">
+          <span data-l10n-id="options_notifications_9"></span>
+        </label>
+        <p class="note only-mac" data-l10n-id="options_notifications_10"></p>
 
-#content > div:not(:last-child) {
-  padding: 10px 0;
-}
-#content > div:last-child {
-  padding-top: 10px;
-}
-.content {
-  width: 100%;
-  padding-inline: 10px;
-}
-.content > * {
-  display: flex;
-  margin-bottom: 5px;
-}
+        <div class="fnjh">
+          <div data-l10n-id="options_notifications_15"></div>
+          <select id="notification.sound.media.default.type">
+            <option value="0" data-l10n-id="options_notifications_16"></option>
+            <option value="1" data-l10n-id="options_notifications_17"></option>
+            <option value="2" data-l10n-id="options_notifications_18"></option>
+            <option value="3" data-l10n-id="options_notifications_19"></option>
+            <option value="4" data-l10n-id="options_notifications_20"></option>
+          </select>
+          <label class="browse">Browse<input type="file" id="notification.sound.media.default.file"></input></label>
+          <input type="button" id="test-play" data-l10n-id="options_button_test" data-l10n-value="value">
+        </div>
+        <div class="fes">
+          <div data-l10n-id="options_notifications_31"></div>
+          <select id="notification.sound.media.custom0.selector">
+            <option value="0" data-l10n-id="options_notifications_32"></option>
+            <option value="1" data-l10n-id="options_notifications_33"></option>
+            <option value="2" data-l10n-id="options_notifications_34"></option>
+          </select>
+          <input type="text" id="notification.sound.media.custom0.filter">
+          <select id="notification.sound.media.custom0.type">
+            <option value="0" data-l10n-id="options_notifications_16"></option>
+            <option value="1" data-l10n-id="options_notifications_17"></option>
+            <option value="2" data-l10n-id="options_notifications_18"></option>
+            <option value="3" data-l10n-id="options_notifications_19"></option>
+            <option value="4" data-l10n-id="options_notifications_20"></option>
+          </select>
+          <label class="browse">Browse<input type="file" id="notification.sound.media.custom0.file"></input></label>
+        </div>
+        <div class="fes">
+          <div data-l10n-id="options_notifications_31"></div>
+          <select id="notification.sound.media.custom1.selector">
+            <option value="0" data-l10n-id="options_notifications_32"></option>
+            <option value="1" data-l10n-id="options_notifications_33"></option>
+            <option value="2" data-l10n-id="options_notifications_34"></option>
+          </select>
+          <input type="text" id="notification.sound.media.custom1.filter">
+          <select id="notification.sound.media.custom1.type">
+            <option value="0" data-l10n-id="options_notifications_16"></option>
+            <option value="1" data-l10n-id="options_notifications_17"></option>
+            <option value="2" data-l10n-id="options_notifications_18"></option>
+            <option value="3" data-l10n-id="options_notifications_19"></option>
+            <option value="4" data-l10n-id="options_notifications_20"></option>
+          </select>
+          <label class="browse">Browse<input type="file" id="notification.sound.media.custom1.file"></input></label>
+        </div>
+        <div class="fes">
+          <div data-l10n-id="options_notifications_31"></div>
+          <select id="notification.sound.media.custom2.selector">
+            <option value="0" data-l10n-id="options_notifications_32"></option>
+            <option value="1" data-l10n-id="options_notifications_33"></option>
+            <option value="2" data-l10n-id="options_notifications_34"></option>
+          </select>
+          <input type="text" id="notification.sound.media.custom2.filter">
+          <select id="notification.sound.media.custom2.type">
+            <option value="0" data-l10n-id="options_notifications_16"></option>
+            <option value="1" data-l10n-id="options_notifications_17"></option>
+            <option value="2" data-l10n-id="options_notifications_18"></option>
+            <option value="3" data-l10n-id="options_notifications_19"></option>
+            <option value="4" data-l10n-id="options_notifications_20"></option>
+          </select>
+          <label class="browse">Browse<input type="file" id="notification.sound.media.custom2.file"></input></label>
+        </div>
+        <div class="fes">
+          <div data-l10n-id="options_notifications_31"></div>
+          <select id="notification.sound.media.custom3.selector">
+            <option value="0" data-l10n-id="options_notifications_32"></option>
+            <option value="1" data-l10n-id="options_notifications_33"></option>
+            <option value="2" data-l10n-id="options_notifications_34"></option>
+          </select>
+          <input type="text" id="notification.sound.media.custom3.filter">
+          <select id="notification.sound.media.custom3.type">
+            <option value="0" data-l10n-id="options_notifications_16"></option>
+            <option value="1" data-l10n-id="options_notifications_17"></option>
+            <option value="2" data-l10n-id="options_notifications_18"></option>
+            <option value="3" data-l10n-id="options_notifications_19"></option>
+            <option value="4" data-l10n-id="options_notifications_20"></option>
+          </select>
+          <label class="browse">Browse<input type="file" id="notification.sound.media.custom3.file"></input></label>
+        </div>
+        <div class="fes">
+          <div data-l10n-id="options_notifications_31"></div>
+          <select id="notification.sound.media.custom4.selector">
+            <option value="0" data-l10n-id="options_notifications_32"></option>
+            <option value="1" data-l10n-id="options_notifications_33"></option>
+            <option value="2" data-l10n-id="options_notifications_34"></option>
+          </select>
+          <input type="text" id="notification.sound.media.custom4.filter">
+          <select id="notification.sound.media.custom4.type">
+            <option value="0" data-l10n-id="options_notifications_16"></option>
+            <option value="1" data-l10n-id="options_notifications_17"></option>
+            <option value="2" data-l10n-id="options_notifications_18"></option>
+            <option value="3" data-l10n-id="options_notifications_19"></option>
+            <option value="4" data-l10n-id="options_notifications_20"></option>
+          </select>
+          <label class="browse">Browse<input type="file" id="notification.sound.media.custom4.file"></input></label>
+        </div>
 
-#header {
-  width: 100%;
-  box-sizing: border-box;
-  background-color: #f1f1f1;
-  display: grid;
-  grid-gap: 10px;
-  grid-template-columns: min-content 1fr min-content 48px;
-}
-#header > div > span {
-  padding-left: 105px;
-}
-#header > div:nth-child(1) > span:nth-child(1) {
-  font-size: 140%;
-}
+        <div class="note">
+          <span class="only-safari" data-l10n-id="options_notifications_25"></span>
+          <span data-l10n-id="options_notifications_22"></span>
+          <span data-l10n-id="options_notifications_35"></span>
+        </div>
+        <div>
 
-#header [type=icon] {
-  width: 90px;
-  background-image: url(../icons/options/64.png);
-  background-position: right 10px center;
-  background-repeat: no-repeat;
-}
-#header [type=title],
-#header [type=description] {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: 100%;
-}
-#header [type=title] {
-  font-size: 150%;
-  line-height: 150%;
-}
-#header [type=description] {
-  color: #707070 !important;
-}
-#header ul {
-  list-style: none;
-  margin: 0;
-  padding: 10px;
-}
-#donation input[type=button] {
-  background-image: none;
-  text-shadow: none;
-  box-shadow: none;
-  background-color: #f07600;
-  color: #fff;
-  border: 1px solid transparent;
-  border-radius: 0;
-  cursor: pointer;
-  outline: medium none;
-  text-align: center;
-  vertical-align: middle !important;
-  padding: 5px 10px;
-  height: revert;
-}
+        </div>
+        <div class="fm">
+          <span data-l10n-id="options_notifications_23"></span>
+          <input id="soundVolume" type="number" min="1" max="100" required></input>
+        </div>
+        <p class="note" data-l10n-id="options_notifications_24"></p>
+        <div class="fm">
+          <span data-l10n-id="options_notifications_28"></span>
+          <input id="silentTime" type="number" min="1" max="1000" required list="silentTimeList">
+          <datalist id="silentTimeList">
+            <option value="5">
+            <option value="10">
+            <option value="15">
+            <option value="30">
+            <option value="60">
+            <option value="120">
+            <option value="300">
+          </datalist>
+        </div>
+        <p class="note" data-l10n-id="options_notifications_29"></p>
+        <label class="mf">
+          <input type="checkbox" id="combined">
+          <span data-l10n-id="options_notifications_30"></span>
+        </label>
+      </div>
+    </div>
+    <div hbox>
+      <div data-l10n-id="options_tab" class="fixed"></div>
+      <div flex="1" class="content">
+        <label class="mf">
+          <input type="checkbox" id="searchMode">
+          <span data-l10n-id="options_tab_1"></span>
+        </label>
+        <p class="note" data-l10n-id="options_tab_2"></p>
+        <label class="mf">
+          <input type="checkbox" id="ignoreOpens">
+          <span data-l10n-id="options_tab_8"></span>
+        </label>
+        <p class="note" data-l10n-id="options_tab_9"></p>
+        <label class="mf">
+          <input type="checkbox" id="relatedToCurrent">
+          <span data-l10n-id="options_tab_3"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="currentTab">
+          <span data-l10n-id="options_tab_4"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="background">
+          <span data-l10n-id="options_tab_5"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="useBlankTabs">
+          <span data-l10n-id="options_tab_7"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="newWindow">
+          <span data-l10n-id="options_tab_6"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="basic.html">
+          <span data-l10n-id="options_tab_10"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="smartOpen">
+          <span data-l10n-id="options_tab_11"></span>
+        </label>
+      </div>
+    </div>
+    <div hbox>
+      <div data-l10n-id="options_toolbar" class="fixed"></div>
+      <div flex="1" class="content">
+        <div class="fm">
+            <div data-l10n-id="options_toolbar_1"></div>
+            <select id="oldFashion">
+              <option value="0" data-l10n-id="options_toolbar_2"></option>
+              <option value="1" data-l10n-id="options_toolbar_3"></option>
+              <option value="2" data-l10n-id="options_toolbar_18"></option>
+            </select>
+        </div>
+        <div class="fm">
+          <div data-l10n-id="options_toolbar_4"></div>
+          <select id="size">
+            <option value="0" data-l10n-id="options_toolbar_5"></option>
+            <option value="1" data-l10n-id="options_toolbar_6"></option>
+          </select>
+        </div>
+        <div class="fm">
+          <span data-l10n-id="options_toolbar_7"></span>
+          <input id="fullWidth" type="number" min="500" max="780" required></input>
+        </div>
+        <p class="note" data-l10n-id="options_toolbar_8"></p>
+        <div class="fm">
+          <span data-l10n-id="options_toolbar_9"></span>
+          <input id="fullHeight" type="number" min="500" max="600" required></input>
+        </div>
+        <p class="note" data-l10n-id="options_toolbar_10"></p>
+        <label class="mf">
+          <input type="checkbox" id="keyUp">
+          <span data-l10n-id="options_toolbar_11"></span>
+        </label>
+        <p class="note" data-l10n-id="options_toolbar_12"></p>
+        <label class="mf">
+          <input type="checkbox" id="render">
+          <span data-l10n-id="options_toolbar_13"></span>
+        </label>
+        <p class="note" data-l10n-id="options_toolbar_14"></p>
+      </div>
+    </div>
+    <div hbox>
+      <div data-l10n-id="options_misc" class="fixed"></div>
+      <div flex="1" class="content">
+        <label class="mf">
+          <input type="checkbox" id="doReadOnArchive"/>
+          <span data-l10n-id="options_gmail_8"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="inboxRedirection"/>
+          <span data-l10n-id="options_notifications_36"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="express"/>
+          <span data-l10n-id="options_notifications_38"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="alphabetic">
+          <span data-l10n-id="options_misc_1"></span>
+        </label>
+        <p class="note" data-l10n-id="options_misc_2"></p>
+        <div class="mf">
+          <div data-l10n-id="options_misc_3" class="nwap"></div>
+          <select id="clrPattern">
+            <option value="0" data-l10n-id="options_misc_4"></option>
+            <option value="1" data-l10n-id="options_misc_5"></option>
+            <option value="2" data-l10n-id="options_misc_9"></option>
+          </select>
+        </div>
+        <div class="mf">
+          <div data-l10n-id="options_misc_16" class="nwap"></div>
+          <select id="dark">
+            <option value="false" data-l10n-id="options_misc_17"></option>
+            <option value="true" data-l10n-id="options_misc_18"></option>
+            <option value="auto" data-l10n-id="options_misc_19"></option>
+          </select>
+        </div>
+        <label class="mf">
+           <input type="checkbox" id="onGmailNotification">
+           <span data-l10n-id="options_misc_6"></span>
+        </label>
+        <div align="center">
+          <span data-l10n-id="options_misc_10" class="start"></span>
+          <input id="threatAsNew" type="number" min="0"></input>
+        </div>
+        <p class="note" data-l10n-id="options_misc_11"></p>
+        <label class="mf">
+          <input type="checkbox" id="minimal">
+          <span data-l10n-id="options_misc_14"></span>
+        </label>
+        <label class="mf">
+          <input type="checkbox" id="welcome">
+          <span data-l10n-id="options_misc_15"></span>
+        </label>
+        <div class="nf">
+          <span data-l10n-id="options_misc_8"></span>
+          <input type="button" id="reset" data-l10n-id="options_button_reset" data-l10n-value="value">
+        </div>
+      </div>
+    </div>
 
-@media screen and (max-width: 600px) {
-  #donation {
-    display: none;
-  }
-  [type="description"] {
-    display: none;
-  }
-}
+    <div hbox>
+      <div data-l10n-id="options_plugins" class="fixed"></div>
+      <div flex="1" class="content">
+        <label class="mf">
+          <input type="checkbox" id="plug-in/labels">
+          <span data-l10n-id="options_plugins_1"></span>
+        </label>
+        <p class="note" data-l10n-id="options_plugins_2"></p>
+      </div>
+    </div>
+  </div>
 
-input:invalid {
-  border-color: red;
-  background-color: rgba(255, 0, 0, 0.2);
-}
+  <dialog id="notify">
+    <div flex="1">This is message</div>
+    <div hbox pack=end>
+      <input type="button" data-cmd="no" value="No">
+      <input type="button" data-cmd="yes" value="Yes">
+    </div>
+  </div>
 
-#notify {
-  width: min(80%, 400px);
-  height: 100px;
-  background-color: #fff;
-  padding: 10px;
-  font-size: 12px;
-}
-#notify[open] {
-  display: grid;
-  grid-template-rows: 1fr min-content;
-}
-#notify input {
-  width: 80px;
-  margin-left: 5px;
-}
-#notify::backdrop {
-  background-color: rgba(0, 0, 0, 0.7);
-}
-
-#donation {
-  text-decoration: none;
-  color: #fff;
-  font-weight: bold;
-}
-
-.browser img {
-  width: 16px;
-}
-.note {
-  font-size: unset;
-  background: #fff7ee;
-  padding: 10px;
-  line-height: 140%;
-  flex-direction: column;
-}
-.note span:not(:last-child) {
-  margin-bottom: 1ch;
-}
-.browse {
-  display: none;
-  font-weight: bold;
-  padding: 0 5px;
-  cursor: pointer;
-}
-.fm {
-  display: grid;
-  grid-template-columns: 1fr 100px;
-  grid-gap: 5px;
-  align-items: center;
-}
-.mf {
-  display: grid;
-  grid-template-columns: min-content 1fr;
-  grid-gap: 5px;
-  align-items: center;
-}
-.nwap {
-  white-space: nowrap;
-}
-.nf {
-  display: grid;
-  grid-template-columns: 1fr min-content;
-  grid-gap: 5px;
-  align-items: center;
-}
-.nf li {
-  white-space: nowrap;
-}
-.gap {
-  gap: 5px;
-}
-.start {
-  text-align: start;
-}
-.wrap {
-  flex-wrap: wrap;
-}
-
-@media screen and (max-width: 600px) {
-  .mf {
-    grid-template-columns: 1fr;
-  }
-  .mf > :first-child {
-    width: unset;
-  }
-  .mf input {
-    justify-self: end;
-  }
-}
-
-.tds {
-  display: grid;
-  grid-template-columns: min-content 1fr min-content;
-  grid-gap: 5px;
-  align-items: center;
-}
-.fes {
-  display: grid;
-  grid-template-columns: min-content min-content 1fr min-content;
-  grid-gap: 5px;
-  align-items: center;
-}
-.fes > :first-child {
-  width: max-content;
-}
-
-@media screen and (max-width: 800px) {
-  .fes {
-    grid-template-columns: 1fr 1fr;
-  }
-  .fes select {
-    width: 100%;
-  }
-}
-.frt {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  justify-self: end;
-}
-.fnjh {
-  display: flex;
-  align-items: center;
-  gap: 5px;
-}
-.fnjh > :first-child {
-  flex: 1;
-}
-[hbox] {
-  display: flex;
-  flex-direction: row;
-}
-[vbox] {
-  display: flex;
-  flex-direction: column;
-}
-[pack=center] {
-  justify-content: center;
-}
-[align=center] {
-  align-items: center;
-}
-[pack=end] {
-  justify-content: flex-end;
-}
-[align=end] {
-  align-items: flex-end;
-}
+  <script src="/data/locale.js"></script>
+  <script src="config.js"></script>
+  <script src="index.js"></script>
+</body>
+</html>

From c2fa4fb4a3498ec412c2986928440e43ed3bbe1f Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:51:55 +0200
Subject: [PATCH 20/21] Update index.css

---
 v3.classic/data/popup/index.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/v3.classic/data/popup/index.css b/v3.classic/data/popup/index.css
index b504a7b0..ecb5fbb8 100644
--- a/v3.classic/data/popup/index.css
+++ b/v3.classic/data/popup/index.css
@@ -250,7 +250,7 @@ footer div[name="refresh"] {
 }
 footer div[name="read"] {
   width: 90px;
-  background-image: url('icons/read.png');
+  background-image: none;
 }
 footer div[name="read-all"] {
   background-image: url('icons/check_all.png');
@@ -301,8 +301,8 @@ body[data-dark="auto"] footer div[name="toggle-dark"] {
   position: fixed;
   bottom: 44px;
   left: 9px;
-  width: 20px;
-  height: 24px;
+  width: 40px;
+  height: 12px;
   background-image: url('icons/arrow_drop_down.png');
   background-size: 20px;
 }

From 91accc248ae91cbc4326721de8a89a2cfac52abe Mon Sep 17 00:00:00 2001
From: Curious Insatiable <113294705+Need74@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:53:02 +0200
Subject: [PATCH 21/21] Update index.html

---
 v3.classic/data/popup/index.html | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/v3.classic/data/popup/index.html b/v3.classic/data/popup/index.html
index e27bde17..1227a919 100644
--- a/v3.classic/data/popup/index.html
+++ b/v3.classic/data/popup/index.html
@@ -11,8 +11,8 @@
     <div class="ellipsis" name="email-container">Email</div>
     <div class="ellipsis" name="stat"><b>-</b> <span data-l10n-id="popup_of"></span> <b>-</b></div>
     <div class="hcenter" name="nav">
-      <div class="btn" name="previous" data-l10n-value="title" data-l10n-id="popup_previous"></div>
-      <div class="btn" name="next" data-l10n-value="title" data-l10n-id="popup_next"></div>
+      <div class="btn" name="previous"></div>
+      <div class="btn" name="next"></div>
     </div>
   </header>
   <div id="content">
@@ -46,11 +46,7 @@
     <span data-l10n-id="popup_spam"></span>
     <span data-l10n-id="popup_trash"></span>
     <span data-l10n-id="popup_refresh"></span>
-    <span data-l10n-id="popup_read"></span>
     <span data-l10n-id="popup_read_all"></span>
-    <span data-l10n-id="popup_expand"></span>
-    <span data-l10n-id="popup_previous"></span>
-    <span data-l10n-id="popup_next"></span>
   </div>
 
   <footer class="hcenter vcenter">
@@ -61,11 +57,11 @@
     <div class="btn tooltip" name="spam" data-l10n-value="title" data-l10n-id="popup_spam"></div>
     <div class="btn tooltip" name="trash" data-l10n-value="title" data-l10n-id="popup_trash"></div>
     <div class="btn tooltip" name="refresh" data-l10n-value="title" data-l10n-id="popup_refresh"></div>
-    <div class="btn tooltip" name="read" data-l10n-value="title" data-l10n-id="popup_read"></div>
+    <div class="btn vcenter hcenter" name="read"><span data-l10n-id="popup_read"></span></div>
     <div class="btn tooltip" name="read-all" data-l10n-value="title" data-l10n-id="popup_read_all"></div>
   </footer>
   <ol id="accounts"></ol>
-  <div class="btn" id="expand" name="expand" data-l10n-value="title" data-l10n-id="popup_expand"></div>
+  <div class="btn" id="expand"></div>
 
   <script src="/data/locale.js"></script>
   <script src="gmail.js"></script>