diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts
index 2ca7876..6c9a214 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts
@@ -241,7 +241,11 @@
Symbol umkehren
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number properties
Nummereigenschaften
@@ -250,67 +254,119 @@
Anzahl neuer Nachrichten anzeigen
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number color
Nummerfarbe
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number size
Nummergröße
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Alignment
Nummernausrichtung
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top left
Oben links
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top centre
Oben in der Mitte
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top right
Oben rechts
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle left
Mitte links
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle centre
Mittleres Zentrum
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle right
Mitte rechts
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom left
Unten links
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom centre
Unten in der Mitte
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom right
Unten rechts
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Margins (left, top, right, bottom):
Ränder (links, oben, rechts, unten):
@@ -365,89 +421,159 @@
Neue Nachrichten
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
New indicator
Neu Indikator
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon round
Symbol rund
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon star
Symbol Stern
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Shade
Schattierung
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Special options
Sonderoptionen
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
API count method
API-Zählmethode
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Apps
Anwendungen
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close application
Stopanwendung
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Browse...
Durchsuche...
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Arguments:
Argumente:
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Start application
Startanwendung
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Mail
Nachrichten
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Use the preferences dialog in Thunderbird to select the accounts and folders
Verwenden Sie den Einstellungsdialog in Thunderbird, um die Konten und Ordner auszuwählen
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Debug
Debug
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Display debug window
Debug-Fenster anzeigen
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Save
Speichern
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Cancel
Annullieren
@@ -458,20 +584,35 @@
Hauptfenster minimieren
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Open Image
Bild öffnen
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Image Files (*.png *.jpg *.bmp)
Bilddateien (*.png *.jpg *.bmp)
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Select application
Anwendung auswählen
@@ -479,27 +620,47 @@
SysTrayX
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Show/Hide
&Anzeigen/Verbergen
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Preferences
&Einstellungen
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&About
&Über
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Quit
&Beenden
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close
Schließen
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts
index 32a4eef..80501a3 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts
@@ -241,7 +241,11 @@
Αντιστρέψτε εικονίδιο
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number properties
Ιδιότητες αριθμών
@@ -250,67 +254,119 @@
Προβολή μετρητή μη-αναγνωσμένης αλληλογραφίας
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number color
Χρώμα μετρητή
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number size
Μέγεθος μετρητή
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Alignment
Ευθυγραμμία
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top left
Κορυφαίο αριστερά
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top centre
Κορυφαίο κέντρο
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top right
Κορυφαίο δεξιά
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle left
Μέση αριστερά
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle centre
Μεσαίο κέντρο
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle right
Μέση δεξιά
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom left
Κάτω αριστερά
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom centre
Κάτω κέντρο
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom right
Κάτω δεξιά
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Margins (left, top, right, bottom):
Περιθώρια (αριστερά, Κορυφαίο, δεξιά, Κάτω):
@@ -365,69 +421,123 @@
Νέα
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
New indicator
Νέος δείκτης
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon round
Στρογγυλό εικονίδιο
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon star
Αστέρι εικονίδιο
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Shade
Απόχρωση
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Special options
Ειδικές επιλογές
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
API count method
Μέθοδος καταμέτρησης API
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close application
Κλείσιμο αίτησης
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Browse...
ξεφυλλίζω...
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Arguments:
Επιχειρήματα:
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Mail
Αλληλογραφία
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Use the preferences dialog in Thunderbird to select the accounts and folders
Χρησιμοποιήστε το παράθυρο διαλόγου Προτιμήσεις Thunderbird για να επιλέξετε λογαριασμούς και φακέλους
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Debug
Αποσφαλμάτωση
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Display debug window
Προβολή παραθύρου αποσφαλμάτωσης
@@ -438,40 +548,71 @@
Ελαχιστοποίηση στην περιοχή ειδοποιήσεων
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Apps
Εφαρμογές
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Start application
Εφαρμογή εκκίνησης
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Save
Αποθήκευση
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Cancel
Άκυρο
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Open Image
Άνοιγμα εικόνας
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Image Files (*.png *.jpg *.bmp)
Αρχεία εικόνας (*.png *.jpg *.bmp)
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Select application
επιλέξτε εφαρμογή
@@ -479,27 +620,47 @@
SysTrayX
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Show/Hide
&Εμφάνιση/Απόκρυψη
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Preferences
&Προτιμήσεις
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&About
&Σχετικά
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Quit
&Έξοδος
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close
Κλείσιμο
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts
index 89ee09f..d04f18a 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts
@@ -246,7 +246,11 @@
Invert icon
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number properties
Number properties
@@ -255,67 +259,119 @@
Display unread message count
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number color
Number color
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number size
Number size
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Alignment
Alignment
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top left
Top left
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top centre
Top centre
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top right
Top right
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle left
Middle left
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle centre
Middle centre
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle right
Middle right
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom left
Bottom left
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom centre
Bottom centre
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom right
Bottom right
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Margins (left, top, right, bottom):
Margins (left, top, right, bottom):
@@ -370,89 +426,159 @@
New
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
New indicator
New indicator
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon round
Icon round
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon star
Icon star
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Shade
Shade
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Special options
Special options
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
API count method
API count method
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Apps
Apps
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close application
Close application
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Browse...
Browse...
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Arguments:
Arguments:
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Start application
Start application
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Mail
Mail
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Use the preferences dialog in Thunderbird to select the accounts and folders
Use the preferences dialog in Thunderbird to select the accounts and folders
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Debug
Debug
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Display debug window
Display debug window
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Save
Save
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Cancel
Cancel
@@ -463,20 +589,35 @@
Minimize to tray
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Open Image
Open Image
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Image Files (*.png *.jpg *.bmp)
Image Files (*.png *.jpg *.bmp)
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Select application
Select application
@@ -484,27 +625,47 @@
SysTrayX
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Show/Hide
&Show/Hide
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Preferences
&Preferences
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&About
&About
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Quit
&Quit
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close
Close
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts
index 587595c..91492c8 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts
@@ -242,7 +242,11 @@
Icona inverti
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number properties
Proprietà numero
@@ -251,67 +255,119 @@
Mostra numero di messaggi non letti
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number color
Colore numero
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number size
Dimensione numero
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Alignment
Allineamento
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top left
A sinistra in alto
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top centre
In alto al centro
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top right
In alto a destra
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle left
Al centro a sinistra
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle centre
Centro centrale
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle right
In mezzo a destra
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom left
In basso a sinistra
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom centre
In basso al centro
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom right
In basso a destra
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Margins (left, top, right, bottom):
Margini (sinistra, in alto, destra, in basso):
@@ -366,69 +422,123 @@
Nuovi
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
New indicator
Nuovo indicatore
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon round
Icona rotonda
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon star
Stella icona
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Shade
Sfumatura
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Special options
Opzioni speciali
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
API count method
Metodo di conteggio API
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close application
Applicazione alla chiusura
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Browse...
Sfogliare...
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Arguments:
Argomenti:
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Mail
Messaggi
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Use the preferences dialog in Thunderbird to select the accounts and folders
Usa la finestra di dialogo delle preferenze in Thunderbird per selezionare account e cartelle
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Debug
Debug
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Display debug window
Mostra finestra di debug
@@ -439,40 +549,71 @@
Minimizza nel vassoio
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Apps
Applicazioni
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Start application
Applicazione di avvio
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Save
Salva
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Cancel
Annulla
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Open Image
Apri immagine
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Image Files (*.png *.jpg *.bmp)
File immagine (*.png *.jpg *.bmp)
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Select application
Selezionare l'applicazione
@@ -480,27 +621,47 @@
SysTrayX
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Show/Hide
&Mostra/Nascondi
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Preferences
&Preferenze
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&About
&Informazioni
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Quit
&Esci
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close
Chiudi
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts
index 177f886..49935b5 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts
@@ -245,7 +245,11 @@
Inverteer pictogram
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number properties
Nummer opties
@@ -254,67 +258,119 @@
Aantal ongelezen berichten weergeven
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number color
Nummer kleur
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number size
Nummer grootte
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Alignment
Uitlijning
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top left
Linksboven
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top centre
Middenboven
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top right
Rechtsboven
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle left
Midden links
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle centre
Midden midden
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle right
Midden rechts
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom left
Linksonder
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom centre
Middenonder
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom right
Rechtsonder
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Margins (left, top, right, bottom):
Marges (links, boven, rechts, onder):
@@ -369,89 +425,159 @@
Nieuw
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
New indicator
Nieuw indicator
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon round
Rond icoon
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon star
Ster icoon
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Shade
Tint
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Special options
Speciale opties
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
API count method
API tel methode
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Apps
Apps
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close application
Stop programma
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Browse...
Bestand zoeken...
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Arguments:
Argumenten:
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Start application
Start programma
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Mail
Berichten
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Use the preferences dialog in Thunderbird to select the accounts and folders
Gebruik het voorkeurenvenster in Thunderbird om de accounts en mappen te selecteren
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Debug
Debug
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Display debug window
Toon debug venster
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Save
Bewaren
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Cancel
Annnuleren
@@ -462,20 +588,35 @@
Minimaliseer naar systeemvak
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Open Image
Open afbeelding
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Image Files (*.png *.jpg *.bmp)
Afbeeldingsbestanden (*.png *.jpg *.bmp)
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Select application
Selecteer programma
@@ -483,27 +624,47 @@
SysTrayX
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Show/Hide
&Tonen/Verbergen
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Preferences
&Opties
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&About
O&ver
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Quit
&Afsluiten
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close
Sluiten
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts
index 0d99cf2..9a40fd8 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts
@@ -245,7 +245,11 @@
Ícone inverter
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number properties
Propriedades do número
@@ -254,67 +258,119 @@
Exibir contador de mensagens não lidas
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number color
Cor do número
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number size
Tamanho do número
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Alignment
Alinhamento
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top left
Canto superior esquerdo
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top centre
Centro superior
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top right
Canto superior direito
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle left
Meio esquerdo
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle centre
Centro médio
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle right
Meio à direita
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom left
Canto inferior esquerdo
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom centre
Centro inferior
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom right
Canto inferior direito
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Margins (left, top, right, bottom):
Margens (esquerdo, superior, direito, inferior):
@@ -369,89 +425,159 @@
Novos
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
New indicator
Novo indicador
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon round
Ícone redondo
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon star
Ícone de estrela
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Shade
Matiz
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Special options
Opções especiais
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
API count method
Método de contagem de API
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Apps
Aplicativos
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close application
Fechando aplicativo
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Browse...
Procurar...
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Arguments:
Argumentos:
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Start application
Aplicativo de inicialização
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Mail
E-mail
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Use the preferences dialog in Thunderbird to select the accounts and folders
Use a janela de preferências no Thunderbird para selecionar as contas e pastas
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Debug
Depuração
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Display debug window
Mostrar janela de depuração
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Save
Salvar
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Cancel
Cancelar
@@ -462,20 +588,35 @@
Minimizar para a tray
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Open Image
Abrir imagem
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Image Files (*.png *.jpg *.bmp)
Arquivo de imagem (*.png *.jpg *.bmp)
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Select application
Selecione o aplicativo
@@ -483,27 +624,47 @@
SysTrayX
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Show/Hide
&Exibir/Ocultar
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Preferences
&Preferências
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&About
&Sobre
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Quit
&Sair
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close
Fechar
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts
index 788e370..43fd1d4 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts
@@ -242,7 +242,11 @@
Инвертировать значок
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number properties
Настройки индикатора кол-ва
@@ -251,67 +255,119 @@
Показывать кол-во непрочитанных писем
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number color
Цвет числа
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Number size
Размер числа
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Alignment
Выравнивание
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top left
Верхний левый
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top centre
Верхний центр
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Top right
Верхний правый
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle left
Средний левый
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle centre
Средний центральный
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Middle right
Средний правый
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom left
Нижний левый
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom centre
Нижний центральный
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Bottom right
Нижний правый
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Margins (left, top, right, bottom):
Отступ (левый, Верхний, правый, Нижний):
@@ -366,89 +422,159 @@
Новые
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
New indicator
Новый индикатор
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon round
Круглый значок
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Icon star
Значок звезды
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Shade
Оттенок
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Special options
Специальные опции
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
API count method
Метод подсчета API
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Apps
Программы
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close application
Заявление о закрытии
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Browse...
просматривать...
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Arguments:
аргументы:
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Start application
Приложение при запуске
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Mail
Письма
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Use the preferences dialog in Thunderbird to select the accounts and folders
Используйте диалоговое окно настроек в Thunderbird, чтобы выбрать учетные записи и папки
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Debug
Отладка
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Display debug window
Показывать окно отладки
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Save
Сохранить
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Cancel
Отменить
@@ -459,20 +585,35 @@
Свернуть в трей
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Open Image
Открыть изображение
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Image Files (*.png *.jpg *.bmp)
Файлы изображений (*.png *.jpg *.bmp)
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> develop
Select application
выберите приложение
@@ -480,27 +621,47 @@
SysTrayX
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Show/Hide
&Показать/Скрыть
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Preferences
&Настройки
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&About
&О приложении
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
&Quit
&Выход
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
Close
Закрыть
diff --git a/app/SysTray-X/SysTray-X-app/preferences.ui b/app/SysTray-X/SysTray-X-app/preferences.ui
index 8e99b94..d764434 100644
--- a/app/SysTray-X/SysTray-X-app/preferences.ui
+++ b/app/SysTray-X/SysTray-X-app/preferences.ui
@@ -27,7 +27,7 @@
-
- 0
+ 2
diff --git a/app/SysTray-X/SysTray-X-app/systrayx.cpp b/app/SysTray-X/SysTray-X-app/systrayx.cpp
index 6178c49..6bdfa15 100644
--- a/app/SysTray-X/SysTray-X-app/systrayx.cpp
+++ b/app/SysTray-X/SysTray-X-app/systrayx.cpp
@@ -206,7 +206,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
*/
getPreferences();
-/*
+
m_preferences->setBrowserVersion( "115.1.0" );
// m_preferences->setBrowserVersion( "102.2.3" );
slotLoadLanguage( "en-US" );
@@ -217,7 +217,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
slotSelectIconObject( true );
slotMailCount( 10, 1 );
-*/
+
// m_preferences->setStartApp( "/home/maxime/test.sh" );
// m_preferences->setStartAppArgs( "/home/maxime/startup.txt StartupString" );
// slotStartApp();
diff --git a/create_linux_gnome_installers.sh b/create_linux_gnome_installers.sh
index 11c6629..a29fd2e 100755
--- a/create_linux_gnome_installers.sh
+++ b/create_linux_gnome_installers.sh
@@ -31,9 +31,6 @@ OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="15.5/x86_64 "
OBS_RPM_PKS+="lp155 "
OBS_RPM_GNOME_EXT+="v53 "
-OBS_RPM_ARCHS+="Fedora_36/x86_64 "
-OBS_RPM_PKS+="fed36 "
-OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
OBS_RPM_PKS+="fed37 "
OBS_RPM_GNOME_EXT+="v53 "
diff --git a/create_linux_kde_installers.sh b/create_linux_kde_installers.sh
index 463424e..ed72de6 100755
--- a/create_linux_kde_installers.sh
+++ b/create_linux_kde_installers.sh
@@ -23,8 +23,6 @@ OBS_RPM_ARCHS+="15.4/x86_64 "
OBS_RPM_PKS+="lp154 "
OBS_RPM_ARCHS+="15.5/x86_64 "
OBS_RPM_PKS+="lp155 "
-OBS_RPM_ARCHS+="Fedora_36/x86_64 "
-OBS_RPM_PKS+="fed36 "
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
OBS_RPM_PKS+="fed37 "
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
diff --git a/create_linux_minimal_installers.sh b/create_linux_minimal_installers.sh
index 316b59e..10f37d6 100755
--- a/create_linux_minimal_installers.sh
+++ b/create_linux_minimal_installers.sh
@@ -23,8 +23,6 @@ OBS_RPM_ARCHS+="15.4/x86_64 "
OBS_RPM_PKS+="lp154 "
OBS_RPM_ARCHS+="15.5/x86_64 "
OBS_RPM_PKS+="lp155 "
-OBS_RPM_ARCHS+="Fedora_36/x86_64 "
-OBS_RPM_PKS+="fed36 "
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
OBS_RPM_PKS+="fed37 "
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
diff --git a/create_linux_staging_gnome_installers.sh b/create_linux_staging_gnome_installers.sh
index 3be390b..df703b3 100755
--- a/create_linux_staging_gnome_installers.sh
+++ b/create_linux_staging_gnome_installers.sh
@@ -31,9 +31,6 @@ OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="15.5/x86_64 "
OBS_RPM_PKS+="lp155 "
OBS_RPM_GNOME_EXT+="v53 "
-OBS_RPM_ARCHS+="Fedora_36/x86_64 "
-OBS_RPM_PKS+="fed36 "
-OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
OBS_RPM_PKS+="fed37 "
OBS_RPM_GNOME_EXT+="v53 "
diff --git a/create_linux_staging_kde_installers.sh b/create_linux_staging_kde_installers.sh
index 6901f36..3d95324 100755
--- a/create_linux_staging_kde_installers.sh
+++ b/create_linux_staging_kde_installers.sh
@@ -23,8 +23,6 @@ OBS_RPM_ARCHS+="15.4/x86_64 "
OBS_RPM_PKS+="lp154 "
OBS_RPM_ARCHS+="15.5/x86_64 "
OBS_RPM_PKS+="lp155 "
-OBS_RPM_ARCHS+="Fedora_36/x86_64 "
-OBS_RPM_PKS+="fed36 "
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
OBS_RPM_PKS+="fed37 "
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
diff --git a/create_linux_staging_minimal_installers.sh b/create_linux_staging_minimal_installers.sh
index abbdbc5..1e27d07 100755
--- a/create_linux_staging_minimal_installers.sh
+++ b/create_linux_staging_minimal_installers.sh
@@ -23,8 +23,6 @@ OBS_RPM_ARCHS+="15.4/x86_64 "
OBS_RPM_PKS+="lp154 "
OBS_RPM_ARCHS+="15.5/x86_64 "
OBS_RPM_PKS+="lp155 "
-OBS_RPM_ARCHS+="Fedora_36/x86_64 "
-OBS_RPM_PKS+="fed36 "
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
OBS_RPM_PKS+="fed37 "
OBS_RPM_ARCHS+="Fedora_38/x86_64 "