diff --git a/menu_screenshot.png b/menu_screenshot.png index bc97c99..5883184 100644 Binary files a/menu_screenshot.png and b/menu_screenshot.png differ diff --git a/messagingmenu@lauinger-clan.de/extension.js b/messagingmenu@lauinger-clan.de/extension.js index 6be7877..b35f36f 100644 --- a/messagingmenu@lauinger-clan.de/extension.js +++ b/messagingmenu@lauinger-clan.de/extension.js @@ -19,6 +19,9 @@ const ExtensionUtils = imports.misc.extensionUtils; const Me = ExtensionUtils.getCurrentExtension(); const ICON_SIZE = 22; +const _rgbToHex = (r, g, b) => + "#" + [r, g, b].map((x) => x.toString(16).padStart(2, "0")).join(""); + let _indicator; let originalUpdateCount; let originalStyle; @@ -478,10 +481,26 @@ function _checkNotifyMBlog(source) { return result; } +function isSupported() { + let current_version = Config.PACKAGE_VERSION.split("."); + return current_version[0] >= 42 ? true : false; +} + function _changeStatusIcon(newMessage) { // Change Status Icon in Panel if (newMessage && !iconChanged) { - let color = settings.get_string("color"); + let color; + if (isSupported) { + let strcolor = settings.get_string("color-rgba"); + let arrColor = strcolor.replace("rgb(", "").replace(")", "").split(","); + color = _rgbToHex( + parseInt(arrColor[0]), + parseInt(arrColor[1]), + parseInt(arrColor[2]) + ); + } else { + color = settings.get_string("color"); + } iconBox.set_style("color: " + color + ";"); iconChanged = true; } else if (!newMessage && iconChanged) { diff --git a/messagingmenu@lauinger-clan.de/metadata.json b/messagingmenu@lauinger-clan.de/metadata.json index eeff89b..3497684 100644 --- a/messagingmenu@lauinger-clan.de/metadata.json +++ b/messagingmenu@lauinger-clan.de/metadata.json @@ -11,6 +11,6 @@ "gettext-domain": "messagingmenu", "description": "A Messaging Menu for the Gnome Shell. All Email and Chat Applications in one Place.", "url": "https://github.com/ChrisLauinger77/messagingmenu", -"version": 28, +"version": 29, "settings-schema": "org.gnome.shell.extensions.messagingmenu" } diff --git a/messagingmenu@lauinger-clan.de/prefs.js b/messagingmenu@lauinger-clan.de/prefs.js index 4d69ecc..8e99e2b 100644 --- a/messagingmenu@lauinger-clan.de/prefs.js +++ b/messagingmenu@lauinger-clan.de/prefs.js @@ -1,10 +1,12 @@ const ExtensionUtils = imports.misc.extensionUtils; -const GObject = imports.gi.GObject; -const { Gtk } = imports.gi; +const { Gtk, Gdk, GObject, Gio } = imports.gi; const Me = ExtensionUtils.getCurrentExtension(); const Gettext = imports.gettext.domain("messagingmenu"); const _ = Gettext.gettext; +//only here to be catched by translation +const strFix1 = _("Notification Color (RGB):"); + let settings; function createColorSettingWidget() { @@ -138,27 +140,35 @@ function fillPreferencesWindow(window) { window.add(page); let email_setting_switch = builder.get_object("email_setting_switch"); - email_setting_switch.set_active(settings.get_boolean("notify-email")); - email_setting_switch.connect("notify::active", function (button1) { - settings.set_boolean("notify-email", button1.active); - }); + settings.bind( + "notify-email", + email_setting_switch, + "active", + Gio.SettingsBindFlags.DEFAULT + ); let chat_setting_switch = builder.get_object("chat_setting_switch"); - chat_setting_switch.set_active(settings.get_boolean("notify-chat")); - chat_setting_switch.connect("notify::active", function (button2) { - settings.set_boolean("notify-chat", button2.active); - }); + settings.bind( + "notify-chat", + chat_setting_switch, + "active", + Gio.SettingsBindFlags.DEFAULT + ); let mblogging_setting_switch = builder.get_object("mblogging_setting_switch"); - mblogging_setting_switch.set_active(settings.get_boolean("notify-mblogging")); - mblogging_setting_switch.connect("notify::active", function (button3) { - settings.set_boolean("notify-mblogging", button3.active); - }); - let color_setting_string = builder.get_object("color_setting_string"); - color_setting_string.set_text(settings.get_string("color")); - color_setting_string.connect("notify::text", function (entry) { - // only save correct color hexcode - if (entry.text.length == 7 && entry.text.charAt(0) == "#") { - settings.set_string("color", entry.text); - } + settings.bind( + "notify-mblogging", + mblogging_setting_switch, + "active", + Gio.SettingsBindFlags.DEFAULT + ); + let color_setting_button = builder.get_object("color_setting_button"); + let mycolor = new Gdk.RGBA(); + mycolor.parse(settings.get_string("color-rgba")); + color_setting_button.set_rgba(mycolor); + color_setting_button.connect("color-set", function (color_setting_button) { + settings.set_string( + "color-rgba", + color_setting_button.get_rgba().to_string() + ); }); } diff --git a/messagingmenu@lauinger-clan.de/prefs.ui b/messagingmenu@lauinger-clan.de/prefs.ui index 58d10f3..f677983 100644 --- a/messagingmenu@lauinger-clan.de/prefs.ui +++ b/messagingmenu@lauinger-clan.de/prefs.ui @@ -42,10 +42,10 @@ - Notification Color (Hex): - color_setting_string + Notification Color (RGB) + color_setting_button - + center diff --git a/messagingmenu@lauinger-clan.de/schemas/org.gnome.shell.extensions.messagingmenu.gschema.xml b/messagingmenu@lauinger-clan.de/schemas/org.gnome.shell.extensions.messagingmenu.gschema.xml index 29538de..4629c59 100644 --- a/messagingmenu@lauinger-clan.de/schemas/org.gnome.shell.extensions.messagingmenu.gschema.xml +++ b/messagingmenu@lauinger-clan.de/schemas/org.gnome.shell.extensions.messagingmenu.gschema.xml @@ -1,5 +1,5 @@ - true @@ -23,8 +23,13 @@ '#ff0000' - Notification Color - The color used to paint the Icon + Notification Color HEX + The color used to paint the Icon(old version since GNOME 41) + + + 'rgba(255,0,0,1)' + Notification Color RGBA + The color used to paint the Icon(new version since GNOME 42) diff --git a/po/af.po b/po/af.po index 8f72686..6ac84c2 100644 --- a/po/af.po +++ b/po/af.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-11 14:44+0100\n" -"PO-Revision-Date: 2022-11-11 14:46+0100\n" +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 22:58+0100\n" "Last-Translator: Christian Lauinger \n" "Language-Team: \n" "Language: af\n" @@ -30,19 +30,23 @@ msgstr "Kontakte" msgid "Settings" msgstr "Instellings" -#: messagingmenu@lauinger-clan.de/prefs.js:18 +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Kennisgewing Kleur (RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 msgid "Notification Color (Hex):" msgstr "Kennisgewing Kleur (Hex):" -#: messagingmenu@lauinger-clan.de/prefs.js:51 +#: messagingmenu@lauinger-clan.de/prefs.js:53 msgid "Email Notification:" msgstr "E-pos Kennisgewing:" -#: messagingmenu@lauinger-clan.de/prefs.js:73 +#: messagingmenu@lauinger-clan.de/prefs.js:75 msgid "Chat Notification:" msgstr "Chat Kennisgewing:" -#: messagingmenu@lauinger-clan.de/prefs.js:95 +#: messagingmenu@lauinger-clan.de/prefs.js:97 msgid "Micro Blogging Notification:" msgstr "Mikro Blog Kennisgewing:" diff --git a/po/cz.po b/po/cz.po index 7494e7b..0365b38 100644 --- a/po/cz.po +++ b/po/cz.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-11 14:49+0100\n" -"PO-Revision-Date: 2022-11-11 15:26+0100\n" +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 22:58+0100\n" "Last-Translator: Christian Lauinger \n" "Language-Team: Czech\n" "Language: cz\n" @@ -30,19 +30,23 @@ msgstr "Kontakty" msgid "Settings" msgstr "Nastavení" -#: messagingmenu@lauinger-clan.de/prefs.js:18 +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Barva upozornění (RGB)" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 msgid "Notification Color (Hex):" msgstr "Barva upozornění (Hex)" -#: messagingmenu@lauinger-clan.de/prefs.js:51 +#: messagingmenu@lauinger-clan.de/prefs.js:53 msgid "Email Notification:" msgstr "Upozornění na email:" -#: messagingmenu@lauinger-clan.de/prefs.js:73 +#: messagingmenu@lauinger-clan.de/prefs.js:75 msgid "Chat Notification:" msgstr "Upozornění na zprávu v chatu:" -#: messagingmenu@lauinger-clan.de/prefs.js:95 +#: messagingmenu@lauinger-clan.de/prefs.js:97 msgid "Micro Blogging Notification:" msgstr "Upozornění na příspěvek na micro-blogu:" diff --git a/po/de.po b/po/de.po index a0bc4e3..09a8ef8 100644 --- a/po/de.po +++ b/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-11 14:44+0100\n" -"PO-Revision-Date: 2022-11-11 14:45+0100\n" +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 22:58+0100\n" "Last-Translator: Christian Lauinger \n" "Language-Team: \n" "Language: de\n" @@ -30,19 +30,23 @@ msgstr "Kontakte" msgid "Settings" msgstr "Einstellungen" -#: messagingmenu@lauinger-clan.de/prefs.js:18 +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Benachrichtigungsfarbe (RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 msgid "Notification Color (Hex):" msgstr "Benachrichtigungsfarbe (Hex):" -#: messagingmenu@lauinger-clan.de/prefs.js:51 +#: messagingmenu@lauinger-clan.de/prefs.js:53 msgid "Email Notification:" msgstr "Epost-Benachrichtigung:" -#: messagingmenu@lauinger-clan.de/prefs.js:73 +#: messagingmenu@lauinger-clan.de/prefs.js:75 msgid "Chat Notification:" msgstr "Chat-Benachrichtigung:" -#: messagingmenu@lauinger-clan.de/prefs.js:95 +#: messagingmenu@lauinger-clan.de/prefs.js:97 msgid "Micro Blogging Notification:" msgstr "Mikroblog-Benachrichtigung:" diff --git a/po/es.po b/po/es.po index fca0c3d..0723d17 100644 --- a/po/es.po +++ b/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-11 14:49+0100\n" -"PO-Revision-Date: 2022-11-11 15:26+0100\n" +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 22:58+0100\n" "Last-Translator: Christian Lauinger \n" "Language-Team: Spanish\n" "Language: es\n" @@ -30,19 +30,23 @@ msgstr "Contactos" msgid "Settings" msgstr "Ajustes" -#: messagingmenu@lauinger-clan.de/prefs.js:18 +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Color de la Notificación (RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 msgid "Notification Color (Hex):" msgstr "Color de la Notificación (Hex):" -#: messagingmenu@lauinger-clan.de/prefs.js:51 +#: messagingmenu@lauinger-clan.de/prefs.js:53 msgid "Email Notification:" msgstr "Correo de Notificación:" -#: messagingmenu@lauinger-clan.de/prefs.js:73 +#: messagingmenu@lauinger-clan.de/prefs.js:75 msgid "Chat Notification:" msgstr "Notificación Chat:" -#: messagingmenu@lauinger-clan.de/prefs.js:95 +#: messagingmenu@lauinger-clan.de/prefs.js:97 msgid "Micro Blogging Notification:" msgstr "Notificación Microblog:" diff --git a/po/fr.po b/po/fr.po index 4796c4f..b172cf6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-11 14:49+0100\n" -"PO-Revision-Date: 2022-11-11 15:30+0100\n" +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 22:59+0100\n" "Last-Translator: Christian Lauinger \n" "Language-Team: French\n" "Language: fr\n" @@ -30,19 +30,23 @@ msgstr "Contacts" msgid "Settings" msgstr "Reglages" -#: messagingmenu@lauinger-clan.de/prefs.js:18 +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Couleur de la Notification (RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 msgid "Notification Color (Hex):" msgstr "Couleur de la Notification (Hex):" -#: messagingmenu@lauinger-clan.de/prefs.js:51 +#: messagingmenu@lauinger-clan.de/prefs.js:53 msgid "Email Notification:" msgstr "Email de Notification:" -#: messagingmenu@lauinger-clan.de/prefs.js:73 +#: messagingmenu@lauinger-clan.de/prefs.js:75 msgid "Chat Notification:" msgstr "Notification de Chat:" -#: messagingmenu@lauinger-clan.de/prefs.js:95 +#: messagingmenu@lauinger-clan.de/prefs.js:97 msgid "Micro Blogging Notification:" msgstr "Notification Microblog:" diff --git a/po/hu.po b/po/hu.po index 04538d6..663b7be 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2022-11-11 14:49+0100\n" "PO-Revision-Date: 2022-11-11 15:27+0100\n" +======= +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 22:59+0100\n" +>>>>>>> e868b24... Color chooser "Last-Translator: Christian Lauinger \n" "Language-Team: Hungarian\n" "Language: hu\n" @@ -30,6 +35,7 @@ msgstr "Kapcsolatok" msgid "Settings" msgstr "Beállítások" +<<<<<<< HEAD #: messagingmenu@lauinger-clan.de/prefs.js:18 msgid "Notification Color (Hex):" msgstr "Értesítési szín (Hex):" @@ -43,6 +49,25 @@ msgid "Chat Notification:" msgstr "Chat értesítés:" #: messagingmenu@lauinger-clan.de/prefs.js:95 +======= +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Értesítési szín (RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 +msgid "Notification Color (Hex):" +msgstr "Értesítési szín (Hex):" + +#: messagingmenu@lauinger-clan.de/prefs.js:53 +msgid "Email Notification:" +msgstr "Email értesítés:" + +#: messagingmenu@lauinger-clan.de/prefs.js:75 +msgid "Chat Notification:" +msgstr "Chat értesítés:" + +#: messagingmenu@lauinger-clan.de/prefs.js:97 +>>>>>>> e868b24... Color chooser msgid "Micro Blogging Notification:" msgstr "Mikro-blogging értesítés:" diff --git a/po/it.po b/po/it.po index bc5a1e7..c155222 100644 --- a/po/it.po +++ b/po/it.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2022-11-11 14:49+0100\n" "PO-Revision-Date: 2022-11-11 15:28+0100\n" +======= +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 22:59+0100\n" +>>>>>>> e868b24... Color chooser "Last-Translator: Christian Lauinger \n" "Language-Team: Italian\n" "Language: it\n" @@ -30,6 +35,7 @@ msgstr "Contatti" msgid "Settings" msgstr "Impostazioni" +<<<<<<< HEAD #: messagingmenu@lauinger-clan.de/prefs.js:18 msgid "Notification Color (Hex):" msgstr "Colore della Notifica (Hex):" @@ -43,6 +49,25 @@ msgid "Chat Notification:" msgstr "Notifica Chat:" #: messagingmenu@lauinger-clan.de/prefs.js:95 +======= +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Colore della Notifica (RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 +msgid "Notification Color (Hex):" +msgstr "Colore della Notifica (Hex):" + +#: messagingmenu@lauinger-clan.de/prefs.js:53 +msgid "Email Notification:" +msgstr "Email di Notifica:" + +#: messagingmenu@lauinger-clan.de/prefs.js:75 +msgid "Chat Notification:" +msgstr "Notifica Chat:" + +#: messagingmenu@lauinger-clan.de/prefs.js:97 +>>>>>>> e868b24... Color chooser msgid "Micro Blogging Notification:" msgstr "Notifica Microblog:" diff --git a/po/messagingmenu.pot b/po/messagingmenu.pot index ea7d0fd..1b7d1fd 100644 --- a/po/messagingmenu.pot +++ b/po/messagingmenu.pot @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2022-11-11 14:49+0100\n" +======= +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +>>>>>>> e868b24... Color chooser "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,6 +33,7 @@ msgstr "" msgid "Settings" msgstr "" +<<<<<<< HEAD #: messagingmenu@lauinger-clan.de/prefs.js:18 msgid "Notification Color (Hex):" msgstr "" @@ -42,5 +47,24 @@ msgid "Chat Notification:" msgstr "" #: messagingmenu@lauinger-clan.de/prefs.js:95 +======= +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 +msgid "Notification Color (Hex):" +msgstr "" + +#: messagingmenu@lauinger-clan.de/prefs.js:53 +msgid "Email Notification:" +msgstr "" + +#: messagingmenu@lauinger-clan.de/prefs.js:75 +msgid "Chat Notification:" +msgstr "" + +#: messagingmenu@lauinger-clan.de/prefs.js:97 +>>>>>>> e868b24... Color chooser msgid "Micro Blogging Notification:" msgstr "" diff --git a/po/nl.po b/po/nl.po index c02dc0e..df8e57f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2022-11-11 14:49+0100\n" "PO-Revision-Date: 2022-11-11 15:28+0100\n" +======= +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 22:59+0100\n" +>>>>>>> e868b24... Color chooser "Last-Translator: Christian Lauinger \n" "Language-Team: \n" "Language: nl\n" @@ -25,6 +30,7 @@ msgstr "Bericht opstellen" #: messagingmenu@lauinger-clan.de/extension.js:148 msgid "Contacts" msgstr "Contactpersonen" +<<<<<<< HEAD #: messagingmenu@lauinger-clan.de/extension.js:298 msgid "Settings" @@ -43,6 +49,30 @@ msgid "Chat Notification:" msgstr "Chatmelding:" #: messagingmenu@lauinger-clan.de/prefs.js:95 +======= + +#: messagingmenu@lauinger-clan.de/extension.js:298 +msgid "Settings" +msgstr "Instellingen" + +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Meldingskleur (in RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 +msgid "Notification Color (Hex):" +msgstr "Meldingskleur (in hex):" + +#: messagingmenu@lauinger-clan.de/prefs.js:53 +msgid "Email Notification:" +msgstr "E-mailmelding:" + +#: messagingmenu@lauinger-clan.de/prefs.js:75 +msgid "Chat Notification:" +msgstr "Chatmelding:" + +#: messagingmenu@lauinger-clan.de/prefs.js:97 +>>>>>>> e868b24... Color chooser msgid "Micro Blogging Notification:" msgstr "Socialemediamelding:" diff --git a/po/pl.po b/po/pl.po index 09c5b6e..5b642f7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2022-11-11 14:49+0100\n" "PO-Revision-Date: 2022-11-11 15:28+0100\n" +======= +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 22:59+0100\n" +>>>>>>> e868b24... Color chooser "Last-Translator: Christian Lauinger \n" "Language-Team: Polish\n" "Language: pl\n" @@ -31,6 +36,7 @@ msgstr "Kontakty" msgid "Settings" msgstr "Ustawienia" +<<<<<<< HEAD #: messagingmenu@lauinger-clan.de/prefs.js:18 msgid "Notification Color (Hex):" msgstr "Kolor notyfikacji (Hex):" @@ -44,6 +50,25 @@ msgid "Chat Notification:" msgstr "Powiadomienia czatu:" #: messagingmenu@lauinger-clan.de/prefs.js:95 +======= +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Kolor notyfikacji (RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 +msgid "Notification Color (Hex):" +msgstr "Kolor notyfikacji (Hex):" + +#: messagingmenu@lauinger-clan.de/prefs.js:53 +msgid "Email Notification:" +msgstr "Powiadomienia poczty e-mail:" + +#: messagingmenu@lauinger-clan.de/prefs.js:75 +msgid "Chat Notification:" +msgstr "Powiadomienia czatu:" + +#: messagingmenu@lauinger-clan.de/prefs.js:97 +>>>>>>> e868b24... Color chooser msgid "Micro Blogging Notification:" msgstr "Powiadomienia z mikroblogu:" diff --git a/po/pt_BR.po b/po/pt_BR.po index b99d1bc..9ee7589 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2022-11-11 14:49+0100\n" +======= +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +>>>>>>> e868b24... Color chooser "PO-Revision-Date: 2022-11-11 15:31+0100\n" "Last-Translator: Christian Lauinger \n" "Language-Team: Brazilian Portuguese\n" @@ -30,6 +34,7 @@ msgstr "Contatos" msgid "Settings" msgstr "Definicoes" +<<<<<<< HEAD #: messagingmenu@lauinger-clan.de/prefs.js:18 msgid "Notification Color (Hex):" msgstr "" @@ -46,3 +51,24 @@ msgstr "" msgid "Micro Blogging Notification:" msgstr "" +======= +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 +msgid "Notification Color (Hex):" +msgstr "" + +#: messagingmenu@lauinger-clan.de/prefs.js:53 +msgid "Email Notification:" +msgstr "" + +#: messagingmenu@lauinger-clan.de/prefs.js:75 +msgid "Chat Notification:" +msgstr "" + +#: messagingmenu@lauinger-clan.de/prefs.js:97 +msgid "Micro Blogging Notification:" +msgstr "" +>>>>>>> e868b24... Color chooser diff --git a/po/ru.po b/po/ru.po index f7c1f44..1a85d59 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,13 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2022-11-11 14:49+0100\n" "PO-Revision-Date: 2022-11-11 15:29+0100\n" +======= +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 23:00+0100\n" +>>>>>>> e868b24... Color chooser "Last-Translator: Christian Lauinger \n" "Language-Team: Russian\n" "Language: ru\n" @@ -31,6 +36,7 @@ msgstr "Контакты" msgid "Settings" msgstr "Настройки" +<<<<<<< HEAD #: messagingmenu@lauinger-clan.de/prefs.js:18 msgid "Notification Color (Hex):" msgstr "Цвет Уведомления (Гекс):" @@ -44,6 +50,25 @@ msgid "Chat Notification:" msgstr "Уведомление о Чате:" #: messagingmenu@lauinger-clan.de/prefs.js:95 +======= +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Цвет Уведомления (RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 +msgid "Notification Color (Hex):" +msgstr "Цвет Уведомления (Гекс):" + +#: messagingmenu@lauinger-clan.de/prefs.js:53 +msgid "Email Notification:" +msgstr "Уведомление по Электронной Почте:" + +#: messagingmenu@lauinger-clan.de/prefs.js:75 +msgid "Chat Notification:" +msgstr "Уведомление о Чате:" + +#: messagingmenu@lauinger-clan.de/prefs.js:97 +>>>>>>> e868b24... Color chooser msgid "Micro Blogging Notification:" msgstr "Уведомление из Микроблоггинга:" diff --git a/po/tr.po b/po/tr.po index 3b70330..ec03daa 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Messaging Menu Version 4\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2022-11-11 14:49+0100\n" "PO-Revision-Date: 2022-11-11 15:29+0100\n" +======= +"POT-Creation-Date: 2022-11-14 22:57+0100\n" +"PO-Revision-Date: 2022-11-14 23:00+0100\n" +>>>>>>> e868b24... Color chooser "Last-Translator: Christian Lauinger \n" "Language-Team: Turkish <>\n" "Language: tr\n" @@ -30,6 +35,7 @@ msgstr "Kişiler" msgid "Settings" msgstr "Ayarlar" +<<<<<<< HEAD #: messagingmenu@lauinger-clan.de/prefs.js:18 msgid "Notification Color (Hex):" msgstr "Bildirim Rengi (Hex):" @@ -43,6 +49,25 @@ msgid "Chat Notification:" msgstr "Sohbet Bildirimi:" #: messagingmenu@lauinger-clan.de/prefs.js:95 +======= +#: messagingmenu@lauinger-clan.de/prefs.js:8 +msgid "Notification Color (RGB):" +msgstr "Bildirim Rengi (RGB):" + +#: messagingmenu@lauinger-clan.de/prefs.js:20 +msgid "Notification Color (Hex):" +msgstr "Bildirim Rengi (Hex):" + +#: messagingmenu@lauinger-clan.de/prefs.js:53 +msgid "Email Notification:" +msgstr "Eposta Bildirimi:" + +#: messagingmenu@lauinger-clan.de/prefs.js:75 +msgid "Chat Notification:" +msgstr "Sohbet Bildirimi:" + +#: messagingmenu@lauinger-clan.de/prefs.js:97 +>>>>>>> e868b24... Color chooser msgid "Micro Blogging Notification:" msgstr "Mikroblog Bildirimi:"