Fix merge

This commit is contained in:
Ximi1970
2023-12-03 23:09:42 +01:00
parent 3493094249
commit ccb6411f32
7 changed files with 469 additions and 1596 deletions

View File

@@ -102,15 +102,15 @@
<translation>SysTray-X Einstellungen</translation>
</message>
<message>
<location filename="../preferences.ui" line="294"/>
<location filename="../preferences.ui" line="297"/>
<source>Default icon</source>
<translation>Standardsymbol</translation>
</message>
<message>
<location filename="../preferences.ui" line="237"/>
<location filename="../preferences.ui" line="288"/>
<location filename="../preferences.ui" line="300"/>
<location filename="../preferences.ui" line="386"/>
<location filename="../preferences.ui" line="240"/>
<location filename="../preferences.ui" line="291"/>
<location filename="../preferences.ui" line="303"/>
<location filename="../preferences.ui" line="389"/>
<source>Icon</source>
<translation>Symbol</translation>
</message>
@@ -125,50 +125,50 @@
<translation>Alle Fenster in Systemleiste verbergen</translation>
</message>
<message>
<location filename="../preferences.ui" line="308"/>
<location filename="../preferences.ui" line="518"/>
<location filename="../preferences.ui" line="311"/>
<location filename="../preferences.ui" line="521"/>
<source>Default Thunderbird</source>
<translation>Thunderbird Symbol</translation>
</message>
<message>
<location filename="../preferences.ui" line="321"/>
<location filename="../preferences.ui" line="324"/>
<source>Lookthrough icon</source>
<translation>Unsichtbares Symbol</translation>
</message>
<message>
<location filename="../preferences.ui" line="333"/>
<location filename="../preferences.ui" line="460"/>
<location filename="../preferences.ui" line="336"/>
<location filename="../preferences.ui" line="463"/>
<source>Custom icon</source>
<translation>Benutzerdefiniert Symbol</translation>
</message>
<message>
<location filename="../preferences.ui" line="350"/>
<location filename="../preferences.ui" line="477"/>
<location filename="../preferences.ui" line="353"/>
<location filename="../preferences.ui" line="480"/>
<source>Choose</source>
<translation>Wählen</translation>
</message>
<message>
<location filename="../preferences.ui" line="367"/>
<location filename="../preferences.ui" line="370"/>
<source>KDE integration (Hide)</source>
<translation>KDE integration (Verbergen)</translation>
</message>
<message>
<location filename="../preferences.ui" line="380"/>
<location filename="../preferences.ui" line="383"/>
<source>Mail notification icon</source>
<translation>E-Mail-Benachrichtigung Symbol</translation>
</message>
<message>
<location filename="../preferences.ui" line="397"/>
<location filename="../preferences.ui" line="400"/>
<source>Blank icon</source>
<translation>Leeres Symbol</translation>
</message>
<message>
<location filename="../preferences.ui" line="430"/>
<location filename="../preferences.ui" line="433"/>
<source>New mail icon</source>
<translation>Neue Nachricht Symbol</translation>
</message>
<message>
<location filename="../preferences.ui" line="491"/>
<location filename="../preferences.ui" line="494"/>
<source>No icon</source>
<translation>Kein Symbol</translation>
</message>
@@ -195,23 +195,23 @@
<translation>Schließen</translation>
</message>
<message>
<location filename="../preferences.ui" line="155"/>
<location filename="../preferences.ui" line="158"/>
<source>Restore startup positions</source>
<translation>Fensterpositionen wiederherstellen beim Start</translation>
</message>
<message>
<location filename="../preferences.ui" line="192"/>
<location filename="../preferences.ui" line="195"/>
<source>Minimize</source>
<translation>Minimieren</translation>
</message>
<message>
<location filename="../preferences.ui" line="198"/>
<location filename="../preferences.ui" line="243"/>
<location filename="../preferences.ui" line="201"/>
<location filename="../preferences.ui" line="246"/>
<source>Default minimize</source>
<translation>Standard Minimieren</translation>
</message>
<message>
<location filename="../preferences.ui" line="224"/>
<location filename="../preferences.ui" line="227"/>
<source>Minimize to tray, method 2</source>
<translation>In Systemleiste verbergen, Methode 2</translation>
</message>
@@ -231,21 +231,17 @@
<translation>Alle Fenster minimieren</translation>
</message>
<message>
<location filename="../preferences.ui" line="129"/>
<location filename="../preferences.ui" line="132"/>
<source>Start application minimized</source>
<translation>Anwendung minimiert starten</translation>
</message>
<message>
<location filename="../preferences.ui" line="546"/>
<location filename="../preferences.ui" line="549"/>
<source>Invert icon</source>
<translation>Symbol umkehren</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="683"/>
=======
<location filename="../preferences.ui" line="652"/>
>>>>>>> develop
<location filename="../preferences.ui" line="686"/>
<source>Number properties</source>
<translation>Nummereigenschaften</translation>
</message>
@@ -254,119 +250,67 @@
<translation type="vanished">Anzahl neuer Nachrichten anzeigen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="736"/>
=======
<location filename="../preferences.ui" line="705"/>
>>>>>>> develop
<location filename="../preferences.ui" line="739"/>
<source>Number color</source>
<translation>Nummerfarbe</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="757"/>
=======
<location filename="../preferences.ui" line="726"/>
>>>>>>> develop
<location filename="../preferences.ui" line="760"/>
<source>Number size</source>
<translation>Nummergröße</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="781"/>
=======
<location filename="../preferences.ui" line="750"/>
>>>>>>> develop
<location filename="../preferences.ui" line="784"/>
<source>Alignment</source>
<translation>Nummernausrichtung</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="792"/>
=======
<location filename="../preferences.ui" line="761"/>
>>>>>>> develop
<location filename="../preferences.ui" line="795"/>
<source>Top left</source>
<translation>Oben links</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="797"/>
=======
<location filename="../preferences.ui" line="766"/>
>>>>>>> develop
<location filename="../preferences.ui" line="800"/>
<source>Top centre</source>
<translation>Oben in der Mitte</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="802"/>
=======
<location filename="../preferences.ui" line="771"/>
>>>>>>> develop
<location filename="../preferences.ui" line="805"/>
<source>Top right</source>
<translation>Oben rechts</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="807"/>
=======
<location filename="../preferences.ui" line="776"/>
>>>>>>> develop
<location filename="../preferences.ui" line="810"/>
<source>Middle left</source>
<translation>Mitte links</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="812"/>
=======
<location filename="../preferences.ui" line="781"/>
>>>>>>> develop
<location filename="../preferences.ui" line="815"/>
<source>Middle centre</source>
<translation>Mittleres Zentrum</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="817"/>
=======
<location filename="../preferences.ui" line="786"/>
>>>>>>> develop
<location filename="../preferences.ui" line="820"/>
<source>Middle right</source>
<translation>Mitte rechts</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="822"/>
=======
<location filename="../preferences.ui" line="791"/>
>>>>>>> develop
<location filename="../preferences.ui" line="825"/>
<source>Bottom left</source>
<translation>Unten links</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="827"/>
=======
<location filename="../preferences.ui" line="796"/>
>>>>>>> develop
<location filename="../preferences.ui" line="830"/>
<source>Bottom centre</source>
<translation>Unten in der Mitte</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="832"/>
=======
<location filename="../preferences.ui" line="801"/>
>>>>>>> develop
<location filename="../preferences.ui" line="835"/>
<source>Bottom right</source>
<translation>Unten rechts</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="691"/>
=======
<location filename="../preferences.ui" line="660"/>
>>>>>>> develop
<location filename="../preferences.ui" line="694"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Ränder (links, oben, rechts, unten):</translation>
</message>
@@ -381,238 +325,153 @@
<translation>Standardstart</translation>
</message>
<message>
<location filename="../preferences.ui" line="139"/>
<location filename="../preferences.ui" line="142"/>
<source>Start application in tray</source>
<translation>Anwendung in Systemleiste starten</translation>
</message>
<message>
<location filename="../preferences.ui" line="596"/>
<location filename="../preferences.ui" line="599"/>
<source>Count</source>
<translation>Zähler</translation>
</message>
<message>
<location filename="../preferences.ui" line="604"/>
<location filename="../preferences.ui" line="607"/>
<source>Show message count</source>
<translation>Anzahl Nachrichten anzeigen</translation>
</message>
<message>
<location filename="../preferences.ui" line="614"/>
<location filename="../preferences.ui" line="617"/>
<source>Show new indicator</source>
<translation>Indikator für neue Nachrichten anzeigen</translation>
</message>
<message>
<location filename="../preferences.ui" line="623"/>
<location filename="../preferences.ui" line="626"/>
<source>Startup delay</source>
<translation>Startverzögerung</translation>
</message>
<message>
<location filename="../preferences.ui" line="647"/>
<location filename="../preferences.ui" line="650"/>
<source>Count type</source>
<translation>E-Mail-Benachrichtigungstyp</translation>
</message>
<message>
<location filename="../preferences.ui" line="655"/>
<location filename="../preferences.ui" line="658"/>
<source>Unread</source>
<translation>Ungelesene Nachrichten</translation>
</message>
<message>
<location filename="../preferences.ui" line="668"/>
<location filename="../preferences.ui" line="671"/>
<source>New</source>
<translation>Neue Nachrichten</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="847"/>
=======
<location filename="../preferences.ui" line="816"/>
>>>>>>> develop
<location filename="../preferences.ui" line="850"/>
<source>New indicator</source>
<translation>Neu Indikator</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="855"/>
=======
<location filename="../preferences.ui" line="824"/>
>>>>>>> develop
<location filename="../preferences.ui" line="858"/>
<source>Icon round</source>
<translation>Symbol rund</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="865"/>
=======
<location filename="../preferences.ui" line="834"/>
>>>>>>> develop
<location filename="../preferences.ui" line="868"/>
<source>Icon star</source>
<translation>Symbol Stern</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="877"/>
=======
<location filename="../preferences.ui" line="846"/>
>>>>>>> develop
<location filename="../preferences.ui" line="880"/>
<source>Shade</source>
<translation>Schattierung</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="956"/>
=======
<location filename="../preferences.ui" line="925"/>
>>>>>>> develop
<location filename="../preferences.ui" line="959"/>
<source>Special options</source>
<translation>Sonderoptionen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="962"/>
=======
<location filename="../preferences.ui" line="931"/>
>>>>>>> develop
<location filename="../preferences.ui" line="965"/>
<source>API count method</source>
<translation>API-Zählmethode</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="986"/>
=======
<location filename="../preferences.ui" line="955"/>
>>>>>>> develop
<location filename="../preferences.ui" line="989"/>
<source>Apps</source>
<translation>Anwendungen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="994"/>
=======
<location filename="../preferences.ui" line="963"/>
>>>>>>> develop
<location filename="../preferences.ui" line="997"/>
<source>Close application</source>
<translation>Stopanwendung</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1007"/>
<location filename="../preferences.ui" line="1048"/>
=======
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1010"/>
<location filename="../preferences.ui" line="1051"/>
<source>Browse...</source>
<translation>Durchsuche...</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1018"/>
<location filename="../preferences.ui" line="1059"/>
=======
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1021"/>
<location filename="../preferences.ui" line="1062"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1035"/>
=======
<location filename="../preferences.ui" line="1004"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1038"/>
<source>Start application</source>
<translation>Startanwendung</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1092"/>
=======
<location filename="../preferences.ui" line="1061"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1095"/>
<source>Mail</source>
<translation>Nachrichten</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1098"/>
=======
<location filename="../preferences.ui" line="1067"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1101"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Verwenden Sie den Einstellungsdialog in Thunderbird, um die Konten und Ordner auszuwählen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1135"/>
=======
<location filename="../preferences.ui" line="1104"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1138"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1141"/>
=======
<location filename="../preferences.ui" line="1110"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1144"/>
<source>Display debug window</source>
<translation>Debug-Fenster anzeigen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1202"/>
=======
<location filename="../preferences.ui" line="1171"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1205"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1195"/>
=======
<location filename="../preferences.ui" line="1164"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1198"/>
<source>Cancel</source>
<translation>Annullieren</translation>
</message>
<message>
<location filename="../preferences.ui" line="211"/>
<location filename="../preferences.ui" line="256"/>
<location filename="../preferences.ui" line="214"/>
<location filename="../preferences.ui" line="259"/>
<source>Minimize to tray</source>
<translation>Hauptfenster minimieren</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Open Image</source>
<translation>Bild öffnen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Bilddateien (*.png *.jpg *.bmp)</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="763"/>
<location filename="../preferencesdialog.cpp" line="777"/>
=======
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
>>>>>>> develop
<source>Select application</source>
<translation>Anwendung auswählen</translation>
</message>
@@ -620,47 +479,27 @@
<context>
<name>SysTrayX</name>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="246"/>
=======
<location filename="../systrayx.cpp" line="243"/>
>>>>>>> develop
<source>&amp;Show/Hide</source>
<translation>&amp;Anzeigen/Verbergen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="250"/>
=======
<location filename="../systrayx.cpp" line="247"/>
>>>>>>> develop
<source>&amp;Preferences</source>
<translation>&amp;Einstellungen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="254"/>
=======
<location filename="../systrayx.cpp" line="251"/>
>>>>>>> develop
<source>&amp;About</source>
<translation>&amp;Über</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="258"/>
=======
<location filename="../systrayx.cpp" line="255"/>
>>>>>>> develop
<source>&amp;Quit</source>
<translation>&amp;Beenden</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="692"/>
=======
<location filename="../systrayx.cpp" line="689"/>
>>>>>>> develop
<source>Close</source>
<translation>Schließen</translation>
</message>

View File

@@ -102,63 +102,63 @@
<translation>Προτιμήσεις SysTray-X</translation>
</message>
<message>
<location filename="../preferences.ui" line="294"/>
<location filename="../preferences.ui" line="297"/>
<source>Default icon</source>
<translation>Προεπιλεγμένο εικονίδιο</translation>
</message>
<message>
<location filename="../preferences.ui" line="237"/>
<location filename="../preferences.ui" line="288"/>
<location filename="../preferences.ui" line="300"/>
<location filename="../preferences.ui" line="386"/>
<location filename="../preferences.ui" line="240"/>
<location filename="../preferences.ui" line="291"/>
<location filename="../preferences.ui" line="303"/>
<location filename="../preferences.ui" line="389"/>
<source>Icon</source>
<translation>Εικονίδιο</translation>
</message>
<message>
<location filename="../preferences.ui" line="308"/>
<location filename="../preferences.ui" line="518"/>
<location filename="../preferences.ui" line="311"/>
<location filename="../preferences.ui" line="521"/>
<source>Default Thunderbird</source>
<translation>Προεπιλογή Thunderbird</translation>
</message>
<message>
<location filename="../preferences.ui" line="321"/>
<location filename="../preferences.ui" line="324"/>
<source>Lookthrough icon</source>
<translation>Διαφανές εικονίδιο</translation>
</message>
<message>
<location filename="../preferences.ui" line="333"/>
<location filename="../preferences.ui" line="460"/>
<location filename="../preferences.ui" line="336"/>
<location filename="../preferences.ui" line="463"/>
<source>Custom icon</source>
<translation>Προσαρμοσμένο εικονίδιο</translation>
</message>
<message>
<location filename="../preferences.ui" line="350"/>
<location filename="../preferences.ui" line="477"/>
<location filename="../preferences.ui" line="353"/>
<location filename="../preferences.ui" line="480"/>
<source>Choose</source>
<translation>Επιλέξτε</translation>
</message>
<message>
<location filename="../preferences.ui" line="367"/>
<location filename="../preferences.ui" line="370"/>
<source>KDE integration (Hide)</source>
<translation>Ενσωμάτωση στον KDE (Απόκρυψη)</translation>
</message>
<message>
<location filename="../preferences.ui" line="380"/>
<location filename="../preferences.ui" line="383"/>
<source>Mail notification icon</source>
<translation>Εικονίδιο ειδοποίησης αλληλογραφίας</translation>
</message>
<message>
<location filename="../preferences.ui" line="397"/>
<location filename="../preferences.ui" line="400"/>
<source>Blank icon</source>
<translation>Κενό εικονίδιο</translation>
</message>
<message>
<location filename="../preferences.ui" line="430"/>
<location filename="../preferences.ui" line="433"/>
<source>New mail icon</source>
<translation>Εικονίδιο νέας αλληλογραφίας</translation>
</message>
<message>
<location filename="../preferences.ui" line="491"/>
<location filename="../preferences.ui" line="494"/>
<source>No icon</source>
<translation>Χωρίς εικονίδιο</translation>
</message>
@@ -180,18 +180,18 @@
<translation>Παράθυρα</translation>
</message>
<message>
<location filename="../preferences.ui" line="192"/>
<location filename="../preferences.ui" line="195"/>
<source>Minimize</source>
<translation>Ελαχιστοποίηση</translation>
</message>
<message>
<location filename="../preferences.ui" line="198"/>
<location filename="../preferences.ui" line="243"/>
<location filename="../preferences.ui" line="201"/>
<location filename="../preferences.ui" line="246"/>
<source>Default minimize</source>
<translation>Προεπιλεγμένη ελαχιστοποίηση</translation>
</message>
<message>
<location filename="../preferences.ui" line="224"/>
<location filename="../preferences.ui" line="227"/>
<source>Minimize to tray, method 2</source>
<translation>Μέθοδος 2</translation>
</message>
@@ -226,26 +226,22 @@
<translation>Ελαχιστοποίηση όλων των παραθύρων</translation>
</message>
<message>
<location filename="../preferences.ui" line="129"/>
<location filename="../preferences.ui" line="132"/>
<source>Start application minimized</source>
<translation>Ελαχιστοποιημένη εκκίνηση της εφαρμογής</translation>
</message>
<message>
<location filename="../preferences.ui" line="155"/>
<location filename="../preferences.ui" line="158"/>
<source>Restore startup positions</source>
<translation>Επαναφορά θέσεων παραθύρου κατά την εκκίνηση</translation>
</message>
<message>
<location filename="../preferences.ui" line="546"/>
<location filename="../preferences.ui" line="549"/>
<source>Invert icon</source>
<translation>Αντιστρέψτε εικονίδιο</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="683"/>
=======
<location filename="../preferences.ui" line="652"/>
>>>>>>> develop
<location filename="../preferences.ui" line="686"/>
<source>Number properties</source>
<translation>Ιδιότητες αριθμών</translation>
</message>
@@ -254,119 +250,67 @@
<translation type="vanished">Προβολή μετρητή μη-αναγνωσμένης αλληλογραφίας</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="736"/>
=======
<location filename="../preferences.ui" line="705"/>
>>>>>>> develop
<location filename="../preferences.ui" line="739"/>
<source>Number color</source>
<translation>Χρώμα μετρητή</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="757"/>
=======
<location filename="../preferences.ui" line="726"/>
>>>>>>> develop
<location filename="../preferences.ui" line="760"/>
<source>Number size</source>
<translation>Μέγεθος μετρητή</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="781"/>
=======
<location filename="../preferences.ui" line="750"/>
>>>>>>> develop
<location filename="../preferences.ui" line="784"/>
<source>Alignment</source>
<translation>Ευθυγραμμία</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="792"/>
=======
<location filename="../preferences.ui" line="761"/>
>>>>>>> develop
<location filename="../preferences.ui" line="795"/>
<source>Top left</source>
<translation>Κορυφαίο αριστερά</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="797"/>
=======
<location filename="../preferences.ui" line="766"/>
>>>>>>> develop
<location filename="../preferences.ui" line="800"/>
<source>Top centre</source>
<translation>Κορυφαίο κέντρο</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="802"/>
=======
<location filename="../preferences.ui" line="771"/>
>>>>>>> develop
<location filename="../preferences.ui" line="805"/>
<source>Top right</source>
<translation>Κορυφαίο δεξιά</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="807"/>
=======
<location filename="../preferences.ui" line="776"/>
>>>>>>> develop
<location filename="../preferences.ui" line="810"/>
<source>Middle left</source>
<translation>Μέση αριστερά</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="812"/>
=======
<location filename="../preferences.ui" line="781"/>
>>>>>>> develop
<location filename="../preferences.ui" line="815"/>
<source>Middle centre</source>
<translation>Μεσαίο κέντρο</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="817"/>
=======
<location filename="../preferences.ui" line="786"/>
>>>>>>> develop
<location filename="../preferences.ui" line="820"/>
<source>Middle right</source>
<translation>Μέση δεξιά</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="822"/>
=======
<location filename="../preferences.ui" line="791"/>
>>>>>>> develop
<location filename="../preferences.ui" line="825"/>
<source>Bottom left</source>
<translation>Κάτω αριστερά</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="827"/>
=======
<location filename="../preferences.ui" line="796"/>
>>>>>>> develop
<location filename="../preferences.ui" line="830"/>
<source>Bottom centre</source>
<translation>Κάτω κέντρο</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="832"/>
=======
<location filename="../preferences.ui" line="801"/>
>>>>>>> develop
<location filename="../preferences.ui" line="835"/>
<source>Bottom right</source>
<translation>Κάτω δεξιά</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="691"/>
=======
<location filename="../preferences.ui" line="660"/>
>>>>>>> develop
<location filename="../preferences.ui" line="694"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Περιθώρια (αριστερά, Κορυφαίο, δεξιά, Κάτω):</translation>
</message>
@@ -381,238 +325,153 @@
<translation>Προεπιλεγμένη εκκίνηση</translation>
</message>
<message>
<location filename="../preferences.ui" line="139"/>
<location filename="../preferences.ui" line="142"/>
<source>Start application in tray</source>
<translation>Εκκινήστε την εφαρμογή στο δίσκο συστήματος</translation>
</message>
<message>
<location filename="../preferences.ui" line="596"/>
<location filename="../preferences.ui" line="599"/>
<source>Count</source>
<translation>Μετρητής</translation>
</message>
<message>
<location filename="../preferences.ui" line="604"/>
<location filename="../preferences.ui" line="607"/>
<source>Show message count</source>
<translation>Προβολή μετρητή αλληλογραφίας</translation>
</message>
<message>
<location filename="../preferences.ui" line="614"/>
<location filename="../preferences.ui" line="617"/>
<source>Show new indicator</source>
<translation>Εμφάνιση νέας ένδειξης</translation>
</message>
<message>
<location filename="../preferences.ui" line="623"/>
<location filename="../preferences.ui" line="626"/>
<source>Startup delay</source>
<translation>Καθυστέρηση έναρξης</translation>
</message>
<message>
<location filename="../preferences.ui" line="647"/>
<location filename="../preferences.ui" line="650"/>
<source>Count type</source>
<translation>Τύπος μετρητή μηνυμάτων</translation>
</message>
<message>
<location filename="../preferences.ui" line="655"/>
<location filename="../preferences.ui" line="658"/>
<source>Unread</source>
<translation>Μη αναγνωσμένα</translation>
</message>
<message>
<location filename="../preferences.ui" line="668"/>
<location filename="../preferences.ui" line="671"/>
<source>New</source>
<translation>Νέα</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="847"/>
=======
<location filename="../preferences.ui" line="816"/>
>>>>>>> develop
<location filename="../preferences.ui" line="850"/>
<source>New indicator</source>
<translation>Νέος δείκτης</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="855"/>
=======
<location filename="../preferences.ui" line="824"/>
>>>>>>> develop
<location filename="../preferences.ui" line="858"/>
<source>Icon round</source>
<translation>Στρογγυλό εικονίδιο</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="865"/>
=======
<location filename="../preferences.ui" line="834"/>
>>>>>>> develop
<location filename="../preferences.ui" line="868"/>
<source>Icon star</source>
<translation>Αστέρι εικονίδιο</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="877"/>
=======
<location filename="../preferences.ui" line="846"/>
>>>>>>> develop
<location filename="../preferences.ui" line="880"/>
<source>Shade</source>
<translation>Απόχρωση</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="956"/>
=======
<location filename="../preferences.ui" line="925"/>
>>>>>>> develop
<location filename="../preferences.ui" line="959"/>
<source>Special options</source>
<translation>Ειδικές επιλογές</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="962"/>
=======
<location filename="../preferences.ui" line="931"/>
>>>>>>> develop
<location filename="../preferences.ui" line="965"/>
<source>API count method</source>
<translation>Μέθοδος καταμέτρησης API</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="994"/>
=======
<location filename="../preferences.ui" line="963"/>
>>>>>>> develop
<location filename="../preferences.ui" line="997"/>
<source>Close application</source>
<translation>Κλείσιμο αίτησης</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1007"/>
<location filename="../preferences.ui" line="1048"/>
=======
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1010"/>
<location filename="../preferences.ui" line="1051"/>
<source>Browse...</source>
<translation>ξεφυλλίζω...</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1018"/>
<location filename="../preferences.ui" line="1059"/>
=======
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1021"/>
<location filename="../preferences.ui" line="1062"/>
<source>Arguments:</source>
<translation>Επιχειρήματα:</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1092"/>
=======
<location filename="../preferences.ui" line="1061"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1095"/>
<source>Mail</source>
<translation>Αλληλογραφία</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1098"/>
=======
<location filename="../preferences.ui" line="1067"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1101"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Χρησιμοποιήστε το παράθυρο διαλόγου Προτιμήσεις Thunderbird για να επιλέξετε λογαριασμούς και φακέλους</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1135"/>
=======
<location filename="../preferences.ui" line="1104"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1138"/>
<source>Debug</source>
<translation>Αποσφαλμάτωση</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1141"/>
=======
<location filename="../preferences.ui" line="1110"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1144"/>
<source>Display debug window</source>
<translation>Προβολή παραθύρου αποσφαλμάτωσης</translation>
</message>
<message>
<location filename="../preferences.ui" line="211"/>
<location filename="../preferences.ui" line="256"/>
<location filename="../preferences.ui" line="214"/>
<location filename="../preferences.ui" line="259"/>
<source>Minimize to tray</source>
<translation>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="986"/>
=======
<location filename="../preferences.ui" line="955"/>
>>>>>>> develop
<location filename="../preferences.ui" line="989"/>
<source>Apps</source>
<translation>Εφαρμογές</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1035"/>
=======
<location filename="../preferences.ui" line="1004"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1038"/>
<source>Start application</source>
<translation>Εφαρμογή εκκίνησης</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1202"/>
=======
<location filename="../preferences.ui" line="1171"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1205"/>
<source>Save</source>
<translation>Αποθήκευση</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1195"/>
=======
<location filename="../preferences.ui" line="1164"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1198"/>
<source>Cancel</source>
<translation>Άκυρο</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Open Image</source>
<translation>Άνοιγμα εικόνας</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Αρχεία εικόνας (*.png *.jpg *.bmp)</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="763"/>
<location filename="../preferencesdialog.cpp" line="777"/>
=======
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
>>>>>>> develop
<source>Select application</source>
<translation>επιλέξτε εφαρμογή</translation>
</message>
@@ -620,47 +479,27 @@
<context>
<name>SysTrayX</name>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="246"/>
=======
<location filename="../systrayx.cpp" line="243"/>
>>>>>>> develop
<source>&amp;Show/Hide</source>
<translation>&amp;Εμφάνιση/Απόκρυψη</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="250"/>
=======
<location filename="../systrayx.cpp" line="247"/>
>>>>>>> develop
<source>&amp;Preferences</source>
<translation>&amp;Προτιμήσεις</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="254"/>
=======
<location filename="../systrayx.cpp" line="251"/>
>>>>>>> develop
<source>&amp;About</source>
<translation>&amp;Σχετικά</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="258"/>
=======
<location filename="../systrayx.cpp" line="255"/>
>>>>>>> develop
<source>&amp;Quit</source>
<translation>&amp;Έξοδος</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="692"/>
=======
<location filename="../systrayx.cpp" line="689"/>
>>>>>>> develop
<source>Close</source>
<translation>Κλείσιμο</translation>
</message>

View File

@@ -107,15 +107,15 @@
<translation>SysTray-X Preferences</translation>
</message>
<message>
<location filename="../preferences.ui" line="294"/>
<location filename="../preferences.ui" line="297"/>
<source>Default icon</source>
<translation>Default icon</translation>
</message>
<message>
<location filename="../preferences.ui" line="237"/>
<location filename="../preferences.ui" line="288"/>
<location filename="../preferences.ui" line="300"/>
<location filename="../preferences.ui" line="386"/>
<location filename="../preferences.ui" line="240"/>
<location filename="../preferences.ui" line="291"/>
<location filename="../preferences.ui" line="303"/>
<location filename="../preferences.ui" line="389"/>
<source>Icon</source>
<translation>Icon</translation>
</message>
@@ -130,50 +130,50 @@
<translation>Minimize all windows to tray</translation>
</message>
<message>
<location filename="../preferences.ui" line="308"/>
<location filename="../preferences.ui" line="518"/>
<location filename="../preferences.ui" line="311"/>
<location filename="../preferences.ui" line="521"/>
<source>Default Thunderbird</source>
<translation>Default Thunderbird</translation>
</message>
<message>
<location filename="../preferences.ui" line="321"/>
<location filename="../preferences.ui" line="324"/>
<source>Lookthrough icon</source>
<translation>Lookthrough icon</translation>
</message>
<message>
<location filename="../preferences.ui" line="333"/>
<location filename="../preferences.ui" line="460"/>
<location filename="../preferences.ui" line="336"/>
<location filename="../preferences.ui" line="463"/>
<source>Custom icon</source>
<translation>Custom icon</translation>
</message>
<message>
<location filename="../preferences.ui" line="350"/>
<location filename="../preferences.ui" line="477"/>
<location filename="../preferences.ui" line="353"/>
<location filename="../preferences.ui" line="480"/>
<source>Choose</source>
<translation>Choose</translation>
</message>
<message>
<location filename="../preferences.ui" line="367"/>
<location filename="../preferences.ui" line="370"/>
<source>KDE integration (Hide)</source>
<translation>KDE integration (Hide)</translation>
</message>
<message>
<location filename="../preferences.ui" line="380"/>
<location filename="../preferences.ui" line="383"/>
<source>Mail notification icon</source>
<translation>Mail notification icon</translation>
</message>
<message>
<location filename="../preferences.ui" line="397"/>
<location filename="../preferences.ui" line="400"/>
<source>Blank icon</source>
<translation>Blank icon</translation>
</message>
<message>
<location filename="../preferences.ui" line="430"/>
<location filename="../preferences.ui" line="433"/>
<source>New mail icon</source>
<translation>New mail icon</translation>
</message>
<message>
<location filename="../preferences.ui" line="491"/>
<location filename="../preferences.ui" line="494"/>
<source>No icon</source>
<translation>No icon</translation>
</message>
@@ -200,23 +200,23 @@
<translation>Close</translation>
</message>
<message>
<location filename="../preferences.ui" line="155"/>
<location filename="../preferences.ui" line="158"/>
<source>Restore startup positions</source>
<translation>Restore window positions on startup</translation>
</message>
<message>
<location filename="../preferences.ui" line="192"/>
<location filename="../preferences.ui" line="195"/>
<source>Minimize</source>
<translation>Minimize</translation>
</message>
<message>
<location filename="../preferences.ui" line="198"/>
<location filename="../preferences.ui" line="243"/>
<location filename="../preferences.ui" line="201"/>
<location filename="../preferences.ui" line="246"/>
<source>Default minimize</source>
<translation>Default minimize</translation>
</message>
<message>
<location filename="../preferences.ui" line="224"/>
<location filename="../preferences.ui" line="227"/>
<source>Minimize to tray, method 2</source>
<translation>Minimize to tray, method 2</translation>
</message>
@@ -236,21 +236,17 @@
<translation>Minimize all windows</translation>
</message>
<message>
<location filename="../preferences.ui" line="129"/>
<location filename="../preferences.ui" line="132"/>
<source>Start application minimized</source>
<translation>Start application minimized</translation>
</message>
<message>
<location filename="../preferences.ui" line="546"/>
<location filename="../preferences.ui" line="549"/>
<source>Invert icon</source>
<translation>Invert icon</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="683"/>
=======
<location filename="../preferences.ui" line="652"/>
>>>>>>> develop
<location filename="../preferences.ui" line="686"/>
<source>Number properties</source>
<translation>Number properties</translation>
</message>
@@ -259,119 +255,67 @@
<translation type="vanished">Display unread message count</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="736"/>
=======
<location filename="../preferences.ui" line="705"/>
>>>>>>> develop
<location filename="../preferences.ui" line="739"/>
<source>Number color</source>
<translation>Number color</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="757"/>
=======
<location filename="../preferences.ui" line="726"/>
>>>>>>> develop
<location filename="../preferences.ui" line="760"/>
<source>Number size</source>
<translation>Number size</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="781"/>
=======
<location filename="../preferences.ui" line="750"/>
>>>>>>> develop
<location filename="../preferences.ui" line="784"/>
<source>Alignment</source>
<translation>Alignment</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="792"/>
=======
<location filename="../preferences.ui" line="761"/>
>>>>>>> develop
<location filename="../preferences.ui" line="795"/>
<source>Top left</source>
<translation>Top left</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="797"/>
=======
<location filename="../preferences.ui" line="766"/>
>>>>>>> develop
<location filename="../preferences.ui" line="800"/>
<source>Top centre</source>
<translation>Top centre</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="802"/>
=======
<location filename="../preferences.ui" line="771"/>
>>>>>>> develop
<location filename="../preferences.ui" line="805"/>
<source>Top right</source>
<translation>Top right</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="807"/>
=======
<location filename="../preferences.ui" line="776"/>
>>>>>>> develop
<location filename="../preferences.ui" line="810"/>
<source>Middle left</source>
<translation>Middle left</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="812"/>
=======
<location filename="../preferences.ui" line="781"/>
>>>>>>> develop
<location filename="../preferences.ui" line="815"/>
<source>Middle centre</source>
<translation>Middle centre</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="817"/>
=======
<location filename="../preferences.ui" line="786"/>
>>>>>>> develop
<location filename="../preferences.ui" line="820"/>
<source>Middle right</source>
<translation>Middle right</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="822"/>
=======
<location filename="../preferences.ui" line="791"/>
>>>>>>> develop
<location filename="../preferences.ui" line="825"/>
<source>Bottom left</source>
<translation>Bottom left</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="827"/>
=======
<location filename="../preferences.ui" line="796"/>
>>>>>>> develop
<location filename="../preferences.ui" line="830"/>
<source>Bottom centre</source>
<translation>Bottom centre</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="832"/>
=======
<location filename="../preferences.ui" line="801"/>
>>>>>>> develop
<location filename="../preferences.ui" line="835"/>
<source>Bottom right</source>
<translation>Bottom right</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="691"/>
=======
<location filename="../preferences.ui" line="660"/>
>>>>>>> develop
<location filename="../preferences.ui" line="694"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Margins (left, top, right, bottom):</translation>
</message>
@@ -386,238 +330,153 @@
<translation>Default startup</translation>
</message>
<message>
<location filename="../preferences.ui" line="139"/>
<location filename="../preferences.ui" line="142"/>
<source>Start application in tray</source>
<translation>Start application in tray</translation>
</message>
<message>
<location filename="../preferences.ui" line="596"/>
<location filename="../preferences.ui" line="599"/>
<source>Count</source>
<translation>Count</translation>
</message>
<message>
<location filename="../preferences.ui" line="604"/>
<location filename="../preferences.ui" line="607"/>
<source>Show message count</source>
<translation>Show message count</translation>
</message>
<message>
<location filename="../preferences.ui" line="614"/>
<location filename="../preferences.ui" line="617"/>
<source>Show new indicator</source>
<translation>Show new messages indicator</translation>
</message>
<message>
<location filename="../preferences.ui" line="623"/>
<location filename="../preferences.ui" line="626"/>
<source>Startup delay</source>
<translation>Startup delay</translation>
</message>
<message>
<location filename="../preferences.ui" line="647"/>
<location filename="../preferences.ui" line="650"/>
<source>Count type</source>
<translation>Count type</translation>
</message>
<message>
<location filename="../preferences.ui" line="655"/>
<location filename="../preferences.ui" line="658"/>
<source>Unread</source>
<translation>Unread</translation>
</message>
<message>
<location filename="../preferences.ui" line="668"/>
<location filename="../preferences.ui" line="671"/>
<source>New</source>
<translation>New</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="847"/>
=======
<location filename="../preferences.ui" line="816"/>
>>>>>>> develop
<location filename="../preferences.ui" line="850"/>
<source>New indicator</source>
<translation>New indicator</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="855"/>
=======
<location filename="../preferences.ui" line="824"/>
>>>>>>> develop
<location filename="../preferences.ui" line="858"/>
<source>Icon round</source>
<translation>Icon round</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="865"/>
=======
<location filename="../preferences.ui" line="834"/>
>>>>>>> develop
<location filename="../preferences.ui" line="868"/>
<source>Icon star</source>
<translation>Icon star</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="877"/>
=======
<location filename="../preferences.ui" line="846"/>
>>>>>>> develop
<location filename="../preferences.ui" line="880"/>
<source>Shade</source>
<translation>Shade</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="956"/>
=======
<location filename="../preferences.ui" line="925"/>
>>>>>>> develop
<location filename="../preferences.ui" line="959"/>
<source>Special options</source>
<translation>Special options</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="962"/>
=======
<location filename="../preferences.ui" line="931"/>
>>>>>>> develop
<location filename="../preferences.ui" line="965"/>
<source>API count method</source>
<translation>API count method</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="986"/>
=======
<location filename="../preferences.ui" line="955"/>
>>>>>>> develop
<location filename="../preferences.ui" line="989"/>
<source>Apps</source>
<translation>Apps</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="994"/>
=======
<location filename="../preferences.ui" line="963"/>
>>>>>>> develop
<location filename="../preferences.ui" line="997"/>
<source>Close application</source>
<translation>Close application</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1007"/>
<location filename="../preferences.ui" line="1048"/>
=======
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1010"/>
<location filename="../preferences.ui" line="1051"/>
<source>Browse...</source>
<translation>Browse...</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1018"/>
<location filename="../preferences.ui" line="1059"/>
=======
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1021"/>
<location filename="../preferences.ui" line="1062"/>
<source>Arguments:</source>
<translation>Arguments:</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1035"/>
=======
<location filename="../preferences.ui" line="1004"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1038"/>
<source>Start application</source>
<translation>Start application</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1092"/>
=======
<location filename="../preferences.ui" line="1061"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1095"/>
<source>Mail</source>
<translation>Mail</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1098"/>
=======
<location filename="../preferences.ui" line="1067"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1101"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Use the preferences dialog in Thunderbird to select the accounts and folders</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1135"/>
=======
<location filename="../preferences.ui" line="1104"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1138"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1141"/>
=======
<location filename="../preferences.ui" line="1110"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1144"/>
<source>Display debug window</source>
<translation>Display debug window</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1202"/>
=======
<location filename="../preferences.ui" line="1171"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1205"/>
<source>Save</source>
<translation>Save</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1195"/>
=======
<location filename="../preferences.ui" line="1164"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1198"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
<message>
<location filename="../preferences.ui" line="211"/>
<location filename="../preferences.ui" line="256"/>
<location filename="../preferences.ui" line="214"/>
<location filename="../preferences.ui" line="259"/>
<source>Minimize to tray</source>
<translation>Minimize to tray</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Open Image</source>
<translation>Open Image</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Image Files (*.png *.jpg *.bmp)</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="763"/>
<location filename="../preferencesdialog.cpp" line="777"/>
=======
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
>>>>>>> develop
<source>Select application</source>
<translation>Select application</translation>
</message>
@@ -625,47 +484,27 @@
<context>
<name>SysTrayX</name>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="246"/>
=======
<location filename="../systrayx.cpp" line="243"/>
>>>>>>> develop
<source>&amp;Show/Hide</source>
<translation>&amp;Show/Hide</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="250"/>
=======
<location filename="../systrayx.cpp" line="247"/>
>>>>>>> develop
<source>&amp;Preferences</source>
<translation>&amp;Preferences</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="254"/>
=======
<location filename="../systrayx.cpp" line="251"/>
>>>>>>> develop
<source>&amp;About</source>
<translation>&amp;About</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="258"/>
=======
<location filename="../systrayx.cpp" line="255"/>
>>>>>>> develop
<source>&amp;Quit</source>
<translation>&amp;Quit</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="692"/>
=======
<location filename="../systrayx.cpp" line="689"/>
>>>>>>> develop
<source>Close</source>
<translation>Close</translation>
</message>

View File

@@ -103,63 +103,63 @@
<translation>Preferenze di SysTray-X</translation>
</message>
<message>
<location filename="../preferences.ui" line="294"/>
<location filename="../preferences.ui" line="297"/>
<source>Default icon</source>
<translation>Icona predefinita</translation>
</message>
<message>
<location filename="../preferences.ui" line="237"/>
<location filename="../preferences.ui" line="288"/>
<location filename="../preferences.ui" line="300"/>
<location filename="../preferences.ui" line="386"/>
<location filename="../preferences.ui" line="240"/>
<location filename="../preferences.ui" line="291"/>
<location filename="../preferences.ui" line="303"/>
<location filename="../preferences.ui" line="389"/>
<source>Icon</source>
<translation>Icona</translation>
</message>
<message>
<location filename="../preferences.ui" line="308"/>
<location filename="../preferences.ui" line="518"/>
<location filename="../preferences.ui" line="311"/>
<location filename="../preferences.ui" line="521"/>
<source>Default Thunderbird</source>
<translation>Predefinita di Thunderbird</translation>
</message>
<message>
<location filename="../preferences.ui" line="321"/>
<location filename="../preferences.ui" line="324"/>
<source>Lookthrough icon</source>
<translation>Icona trasparente</translation>
</message>
<message>
<location filename="../preferences.ui" line="333"/>
<location filename="../preferences.ui" line="460"/>
<location filename="../preferences.ui" line="336"/>
<location filename="../preferences.ui" line="463"/>
<source>Custom icon</source>
<translation>Icona personalizzata</translation>
</message>
<message>
<location filename="../preferences.ui" line="350"/>
<location filename="../preferences.ui" line="477"/>
<location filename="../preferences.ui" line="353"/>
<location filename="../preferences.ui" line="480"/>
<source>Choose</source>
<translation>Scegli</translation>
</message>
<message>
<location filename="../preferences.ui" line="367"/>
<location filename="../preferences.ui" line="370"/>
<source>KDE integration (Hide)</source>
<translation>Integrazione KDE (Nascondi)</translation>
</message>
<message>
<location filename="../preferences.ui" line="380"/>
<location filename="../preferences.ui" line="383"/>
<source>Mail notification icon</source>
<translation>Icona notifica posta</translation>
</message>
<message>
<location filename="../preferences.ui" line="397"/>
<location filename="../preferences.ui" line="400"/>
<source>Blank icon</source>
<translation>Icona vuota</translation>
</message>
<message>
<location filename="../preferences.ui" line="430"/>
<location filename="../preferences.ui" line="433"/>
<source>New mail icon</source>
<translation>Icona nuova posta</translation>
</message>
<message>
<location filename="../preferences.ui" line="491"/>
<location filename="../preferences.ui" line="494"/>
<source>No icon</source>
<translation>Nessuna icona</translation>
</message>
@@ -181,7 +181,7 @@
<translation>Finestre</translation>
</message>
<message>
<location filename="../preferences.ui" line="192"/>
<location filename="../preferences.ui" line="195"/>
<source>Minimize</source>
<translation>Minimizza</translation>
</message>
@@ -191,13 +191,13 @@
<translation>Chiudi</translation>
</message>
<message>
<location filename="../preferences.ui" line="198"/>
<location filename="../preferences.ui" line="243"/>
<location filename="../preferences.ui" line="201"/>
<location filename="../preferences.ui" line="246"/>
<source>Default minimize</source>
<translation>Minimizzazione predefinita</translation>
</message>
<message>
<location filename="../preferences.ui" line="224"/>
<location filename="../preferences.ui" line="227"/>
<source>Minimize to tray, method 2</source>
<translation>Minimizza nel vassoio, metodo 2</translation>
</message>
@@ -227,26 +227,22 @@
<translation>Minimizza tutte le finestre</translation>
</message>
<message>
<location filename="../preferences.ui" line="129"/>
<location filename="../preferences.ui" line="132"/>
<source>Start application minimized</source>
<translation>Avvia applicazione minimizzata</translation>
</message>
<message>
<location filename="../preferences.ui" line="155"/>
<location filename="../preferences.ui" line="158"/>
<source>Restore startup positions</source>
<translation>Ripristina le posizioni della finestra all&apos;avvio</translation>
</message>
<message>
<location filename="../preferences.ui" line="546"/>
<location filename="../preferences.ui" line="549"/>
<source>Invert icon</source>
<translation>Icona inverti</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="683"/>
=======
<location filename="../preferences.ui" line="652"/>
>>>>>>> develop
<location filename="../preferences.ui" line="686"/>
<source>Number properties</source>
<translation>Proprietà numero</translation>
</message>
@@ -255,119 +251,67 @@
<translation type="vanished">Mostra numero di messaggi non letti</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="736"/>
=======
<location filename="../preferences.ui" line="705"/>
>>>>>>> develop
<location filename="../preferences.ui" line="739"/>
<source>Number color</source>
<translation>Colore numero</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="757"/>
=======
<location filename="../preferences.ui" line="726"/>
>>>>>>> develop
<location filename="../preferences.ui" line="760"/>
<source>Number size</source>
<translation>Dimensione numero</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="781"/>
=======
<location filename="../preferences.ui" line="750"/>
>>>>>>> develop
<location filename="../preferences.ui" line="784"/>
<source>Alignment</source>
<translation>Allineamento</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="792"/>
=======
<location filename="../preferences.ui" line="761"/>
>>>>>>> develop
<location filename="../preferences.ui" line="795"/>
<source>Top left</source>
<translation>A sinistra in alto</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="797"/>
=======
<location filename="../preferences.ui" line="766"/>
>>>>>>> develop
<location filename="../preferences.ui" line="800"/>
<source>Top centre</source>
<translation>In alto al centro</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="802"/>
=======
<location filename="../preferences.ui" line="771"/>
>>>>>>> develop
<location filename="../preferences.ui" line="805"/>
<source>Top right</source>
<translation>In alto a destra</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="807"/>
=======
<location filename="../preferences.ui" line="776"/>
>>>>>>> develop
<location filename="../preferences.ui" line="810"/>
<source>Middle left</source>
<translation>Al centro a sinistra</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="812"/>
=======
<location filename="../preferences.ui" line="781"/>
>>>>>>> develop
<location filename="../preferences.ui" line="815"/>
<source>Middle centre</source>
<translation>Centro centrale</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="817"/>
=======
<location filename="../preferences.ui" line="786"/>
>>>>>>> develop
<location filename="../preferences.ui" line="820"/>
<source>Middle right</source>
<translation>In mezzo a destra</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="822"/>
=======
<location filename="../preferences.ui" line="791"/>
>>>>>>> develop
<location filename="../preferences.ui" line="825"/>
<source>Bottom left</source>
<translation>In basso a sinistra</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="827"/>
=======
<location filename="../preferences.ui" line="796"/>
>>>>>>> develop
<location filename="../preferences.ui" line="830"/>
<source>Bottom centre</source>
<translation>In basso al centro</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="832"/>
=======
<location filename="../preferences.ui" line="801"/>
>>>>>>> develop
<location filename="../preferences.ui" line="835"/>
<source>Bottom right</source>
<translation>In basso a destra</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="691"/>
=======
<location filename="../preferences.ui" line="660"/>
>>>>>>> develop
<location filename="../preferences.ui" line="694"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Margini (sinistra, in alto, destra, in basso):</translation>
</message>
@@ -382,238 +326,153 @@
<translation>Avvio predefinito</translation>
</message>
<message>
<location filename="../preferences.ui" line="139"/>
<location filename="../preferences.ui" line="142"/>
<source>Start application in tray</source>
<translation>Minimizza principale nel vassoio</translation>
</message>
<message>
<location filename="../preferences.ui" line="596"/>
<location filename="../preferences.ui" line="599"/>
<source>Count</source>
<translation>Conteggio</translation>
</message>
<message>
<location filename="../preferences.ui" line="604"/>
<location filename="../preferences.ui" line="607"/>
<source>Show message count</source>
<translation>Mostra numero di messaggi</translation>
</message>
<message>
<location filename="../preferences.ui" line="614"/>
<location filename="../preferences.ui" line="617"/>
<source>Show new indicator</source>
<translation>Mostra nuovo indicatore</translation>
</message>
<message>
<location filename="../preferences.ui" line="623"/>
<location filename="../preferences.ui" line="626"/>
<source>Startup delay</source>
<translation>Ritardo all&apos;avvio</translation>
</message>
<message>
<location filename="../preferences.ui" line="647"/>
<location filename="../preferences.ui" line="650"/>
<source>Count type</source>
<translation>Tipo conteggio</translation>
</message>
<message>
<location filename="../preferences.ui" line="655"/>
<location filename="../preferences.ui" line="658"/>
<source>Unread</source>
<translation>Non letti</translation>
</message>
<message>
<location filename="../preferences.ui" line="668"/>
<location filename="../preferences.ui" line="671"/>
<source>New</source>
<translation>Nuovi</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="847"/>
=======
<location filename="../preferences.ui" line="816"/>
>>>>>>> develop
<location filename="../preferences.ui" line="850"/>
<source>New indicator</source>
<translation>Nuovo indicatore</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="855"/>
=======
<location filename="../preferences.ui" line="824"/>
>>>>>>> develop
<location filename="../preferences.ui" line="858"/>
<source>Icon round</source>
<translation>Icona rotonda</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="865"/>
=======
<location filename="../preferences.ui" line="834"/>
>>>>>>> develop
<location filename="../preferences.ui" line="868"/>
<source>Icon star</source>
<translation>Stella icona</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="877"/>
=======
<location filename="../preferences.ui" line="846"/>
>>>>>>> develop
<location filename="../preferences.ui" line="880"/>
<source>Shade</source>
<translation>Sfumatura</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="956"/>
=======
<location filename="../preferences.ui" line="925"/>
>>>>>>> develop
<location filename="../preferences.ui" line="959"/>
<source>Special options</source>
<translation>Opzioni speciali</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="962"/>
=======
<location filename="../preferences.ui" line="931"/>
>>>>>>> develop
<location filename="../preferences.ui" line="965"/>
<source>API count method</source>
<translation>Metodo di conteggio API</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="994"/>
=======
<location filename="../preferences.ui" line="963"/>
>>>>>>> develop
<location filename="../preferences.ui" line="997"/>
<source>Close application</source>
<translation>Applicazione alla chiusura</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1007"/>
<location filename="../preferences.ui" line="1048"/>
=======
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1010"/>
<location filename="../preferences.ui" line="1051"/>
<source>Browse...</source>
<translation>Sfogliare...</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1018"/>
<location filename="../preferences.ui" line="1059"/>
=======
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1021"/>
<location filename="../preferences.ui" line="1062"/>
<source>Arguments:</source>
<translation>Argomenti:</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1092"/>
=======
<location filename="../preferences.ui" line="1061"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1095"/>
<source>Mail</source>
<translation>Messaggi</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1098"/>
=======
<location filename="../preferences.ui" line="1067"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1101"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Usa la finestra di dialogo delle preferenze in Thunderbird per selezionare account e cartelle</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1135"/>
=======
<location filename="../preferences.ui" line="1104"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1138"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1141"/>
=======
<location filename="../preferences.ui" line="1110"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1144"/>
<source>Display debug window</source>
<translation>Mostra finestra di debug</translation>
</message>
<message>
<location filename="../preferences.ui" line="211"/>
<location filename="../preferences.ui" line="256"/>
<location filename="../preferences.ui" line="214"/>
<location filename="../preferences.ui" line="259"/>
<source>Minimize to tray</source>
<translation>Minimizza nel vassoio</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="986"/>
=======
<location filename="../preferences.ui" line="955"/>
>>>>>>> develop
<location filename="../preferences.ui" line="989"/>
<source>Apps</source>
<translation>Applicazioni</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1035"/>
=======
<location filename="../preferences.ui" line="1004"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1038"/>
<source>Start application</source>
<translation>Applicazione di avvio</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1202"/>
=======
<location filename="../preferences.ui" line="1171"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1205"/>
<source>Save</source>
<translation>Salva</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1195"/>
=======
<location filename="../preferences.ui" line="1164"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1198"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Open Image</source>
<translation>Apri immagine</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>File immagine (*.png *.jpg *.bmp)</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="763"/>
<location filename="../preferencesdialog.cpp" line="777"/>
=======
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
>>>>>>> develop
<source>Select application</source>
<translation>Selezionare l&apos;applicazione</translation>
</message>
@@ -621,47 +480,27 @@
<context>
<name>SysTrayX</name>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="246"/>
=======
<location filename="../systrayx.cpp" line="243"/>
>>>>>>> develop
<source>&amp;Show/Hide</source>
<translation>&amp;Mostra/Nascondi</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="250"/>
=======
<location filename="../systrayx.cpp" line="247"/>
>>>>>>> develop
<source>&amp;Preferences</source>
<translation>&amp;Preferenze</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="254"/>
=======
<location filename="../systrayx.cpp" line="251"/>
>>>>>>> develop
<source>&amp;About</source>
<translation>&amp;Informazioni</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="258"/>
=======
<location filename="../systrayx.cpp" line="255"/>
>>>>>>> develop
<source>&amp;Quit</source>
<translation>&amp;Esci</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="692"/>
=======
<location filename="../systrayx.cpp" line="689"/>
>>>>>>> develop
<source>Close</source>
<translation>Chiudi</translation>
</message>

View File

@@ -106,15 +106,15 @@
<translation>SysTray-X Opties</translation>
</message>
<message>
<location filename="../preferences.ui" line="294"/>
<location filename="../preferences.ui" line="297"/>
<source>Default icon</source>
<translation>Standaard pictogram</translation>
</message>
<message>
<location filename="../preferences.ui" line="237"/>
<location filename="../preferences.ui" line="288"/>
<location filename="../preferences.ui" line="300"/>
<location filename="../preferences.ui" line="386"/>
<location filename="../preferences.ui" line="240"/>
<location filename="../preferences.ui" line="291"/>
<location filename="../preferences.ui" line="303"/>
<location filename="../preferences.ui" line="389"/>
<source>Icon</source>
<translation>Pictogram</translation>
</message>
@@ -129,50 +129,50 @@
<translation>Minimaliseer alle vensters</translation>
</message>
<message>
<location filename="../preferences.ui" line="308"/>
<location filename="../preferences.ui" line="518"/>
<location filename="../preferences.ui" line="311"/>
<location filename="../preferences.ui" line="521"/>
<source>Default Thunderbird</source>
<translation>Standaard Thunderbird</translation>
</message>
<message>
<location filename="../preferences.ui" line="321"/>
<location filename="../preferences.ui" line="324"/>
<source>Lookthrough icon</source>
<translation>Doorzichtig pictogram</translation>
</message>
<message>
<location filename="../preferences.ui" line="333"/>
<location filename="../preferences.ui" line="460"/>
<location filename="../preferences.ui" line="336"/>
<location filename="../preferences.ui" line="463"/>
<source>Custom icon</source>
<translation>Aangepast pictogram</translation>
</message>
<message>
<location filename="../preferences.ui" line="350"/>
<location filename="../preferences.ui" line="477"/>
<location filename="../preferences.ui" line="353"/>
<location filename="../preferences.ui" line="480"/>
<source>Choose</source>
<translation>Kies</translation>
</message>
<message>
<location filename="../preferences.ui" line="367"/>
<location filename="../preferences.ui" line="370"/>
<source>KDE integration (Hide)</source>
<translation>KDE integratie (Verbergen)</translation>
</message>
<message>
<location filename="../preferences.ui" line="380"/>
<location filename="../preferences.ui" line="383"/>
<source>Mail notification icon</source>
<translation>Berichten notificatie pictogram</translation>
</message>
<message>
<location filename="../preferences.ui" line="397"/>
<location filename="../preferences.ui" line="400"/>
<source>Blank icon</source>
<translation>Leeg pictogram</translation>
</message>
<message>
<location filename="../preferences.ui" line="430"/>
<location filename="../preferences.ui" line="433"/>
<source>New mail icon</source>
<translation>Nieuw bericht pictogram</translation>
</message>
<message>
<location filename="../preferences.ui" line="491"/>
<location filename="../preferences.ui" line="494"/>
<source>No icon</source>
<translation>Geen pictogram</translation>
</message>
@@ -199,23 +199,23 @@
<translation>Sluiten</translation>
</message>
<message>
<location filename="../preferences.ui" line="155"/>
<location filename="../preferences.ui" line="158"/>
<source>Restore startup positions</source>
<translation>Herstel vensterposities bij opstarten</translation>
</message>
<message>
<location filename="../preferences.ui" line="192"/>
<location filename="../preferences.ui" line="195"/>
<source>Minimize</source>
<translation>Minimaliseren</translation>
</message>
<message>
<location filename="../preferences.ui" line="198"/>
<location filename="../preferences.ui" line="243"/>
<location filename="../preferences.ui" line="201"/>
<location filename="../preferences.ui" line="246"/>
<source>Default minimize</source>
<translation>Standaard minimalisatie</translation>
</message>
<message>
<location filename="../preferences.ui" line="224"/>
<location filename="../preferences.ui" line="227"/>
<source>Minimize to tray, method 2</source>
<translation>Minimaliseer naar systeemvak, methode 2</translation>
</message>
@@ -235,21 +235,17 @@
<translation>Minimaliseer alle vensters</translation>
</message>
<message>
<location filename="../preferences.ui" line="129"/>
<location filename="../preferences.ui" line="132"/>
<source>Start application minimized</source>
<translation>Start programma geminimaliseerd</translation>
</message>
<message>
<location filename="../preferences.ui" line="546"/>
<location filename="../preferences.ui" line="549"/>
<source>Invert icon</source>
<translation>Inverteer pictogram</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="683"/>
=======
<location filename="../preferences.ui" line="652"/>
>>>>>>> develop
<location filename="../preferences.ui" line="686"/>
<source>Number properties</source>
<translation>Nummer opties</translation>
</message>
@@ -258,119 +254,67 @@
<translation type="vanished">Aantal ongelezen berichten weergeven</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="736"/>
=======
<location filename="../preferences.ui" line="705"/>
>>>>>>> develop
<location filename="../preferences.ui" line="739"/>
<source>Number color</source>
<translation>Nummer kleur</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="757"/>
=======
<location filename="../preferences.ui" line="726"/>
>>>>>>> develop
<location filename="../preferences.ui" line="760"/>
<source>Number size</source>
<translation>Nummer grootte</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="781"/>
=======
<location filename="../preferences.ui" line="750"/>
>>>>>>> develop
<location filename="../preferences.ui" line="784"/>
<source>Alignment</source>
<translation>Uitlijning</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="792"/>
=======
<location filename="../preferences.ui" line="761"/>
>>>>>>> develop
<location filename="../preferences.ui" line="795"/>
<source>Top left</source>
<translation>Linksboven</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="797"/>
=======
<location filename="../preferences.ui" line="766"/>
>>>>>>> develop
<location filename="../preferences.ui" line="800"/>
<source>Top centre</source>
<translation>Middenboven</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="802"/>
=======
<location filename="../preferences.ui" line="771"/>
>>>>>>> develop
<location filename="../preferences.ui" line="805"/>
<source>Top right</source>
<translation>Rechtsboven</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="807"/>
=======
<location filename="../preferences.ui" line="776"/>
>>>>>>> develop
<location filename="../preferences.ui" line="810"/>
<source>Middle left</source>
<translation>Midden links</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="812"/>
=======
<location filename="../preferences.ui" line="781"/>
>>>>>>> develop
<location filename="../preferences.ui" line="815"/>
<source>Middle centre</source>
<translation>Midden midden</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="817"/>
=======
<location filename="../preferences.ui" line="786"/>
>>>>>>> develop
<location filename="../preferences.ui" line="820"/>
<source>Middle right</source>
<translation>Midden rechts</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="822"/>
=======
<location filename="../preferences.ui" line="791"/>
>>>>>>> develop
<location filename="../preferences.ui" line="825"/>
<source>Bottom left</source>
<translation>Linksonder</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="827"/>
=======
<location filename="../preferences.ui" line="796"/>
>>>>>>> develop
<location filename="../preferences.ui" line="830"/>
<source>Bottom centre</source>
<translation>Middenonder</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="832"/>
=======
<location filename="../preferences.ui" line="801"/>
>>>>>>> develop
<location filename="../preferences.ui" line="835"/>
<source>Bottom right</source>
<translation>Rechtsonder</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="691"/>
=======
<location filename="../preferences.ui" line="660"/>
>>>>>>> develop
<location filename="../preferences.ui" line="694"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Marges (links, boven, rechts, onder):</translation>
</message>
@@ -385,238 +329,153 @@
<translation>Standaard opstarten</translation>
</message>
<message>
<location filename="../preferences.ui" line="139"/>
<location filename="../preferences.ui" line="142"/>
<source>Start application in tray</source>
<translation>Start in systeemvak</translation>
</message>
<message>
<location filename="../preferences.ui" line="596"/>
<location filename="../preferences.ui" line="599"/>
<source>Count</source>
<translation>Teller</translation>
</message>
<message>
<location filename="../preferences.ui" line="604"/>
<location filename="../preferences.ui" line="607"/>
<source>Show message count</source>
<translation>Aantal berichten weergeven</translation>
</message>
<message>
<location filename="../preferences.ui" line="614"/>
<location filename="../preferences.ui" line="617"/>
<source>Show new indicator</source>
<translation>Indicator voor nieuwe berichten</translation>
</message>
<message>
<location filename="../preferences.ui" line="623"/>
<location filename="../preferences.ui" line="626"/>
<source>Startup delay</source>
<translation>Opstartvertraging</translation>
</message>
<message>
<location filename="../preferences.ui" line="647"/>
<location filename="../preferences.ui" line="650"/>
<source>Count type</source>
<translation>Type berichttelling</translation>
</message>
<message>
<location filename="../preferences.ui" line="655"/>
<location filename="../preferences.ui" line="658"/>
<source>Unread</source>
<translation>Ongelezen</translation>
</message>
<message>
<location filename="../preferences.ui" line="668"/>
<location filename="../preferences.ui" line="671"/>
<source>New</source>
<translation>Nieuw</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="847"/>
=======
<location filename="../preferences.ui" line="816"/>
>>>>>>> develop
<location filename="../preferences.ui" line="850"/>
<source>New indicator</source>
<translation>Nieuw indicator</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="855"/>
=======
<location filename="../preferences.ui" line="824"/>
>>>>>>> develop
<location filename="../preferences.ui" line="858"/>
<source>Icon round</source>
<translation>Rond icoon</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="865"/>
=======
<location filename="../preferences.ui" line="834"/>
>>>>>>> develop
<location filename="../preferences.ui" line="868"/>
<source>Icon star</source>
<translation>Ster icoon</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="877"/>
=======
<location filename="../preferences.ui" line="846"/>
>>>>>>> develop
<location filename="../preferences.ui" line="880"/>
<source>Shade</source>
<translation>Tint</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="956"/>
=======
<location filename="../preferences.ui" line="925"/>
>>>>>>> develop
<location filename="../preferences.ui" line="959"/>
<source>Special options</source>
<translation>Speciale opties</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="962"/>
=======
<location filename="../preferences.ui" line="931"/>
>>>>>>> develop
<location filename="../preferences.ui" line="965"/>
<source>API count method</source>
<translation>API tel methode</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="986"/>
=======
<location filename="../preferences.ui" line="955"/>
>>>>>>> develop
<location filename="../preferences.ui" line="989"/>
<source>Apps</source>
<translation>Apps</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="994"/>
=======
<location filename="../preferences.ui" line="963"/>
>>>>>>> develop
<location filename="../preferences.ui" line="997"/>
<source>Close application</source>
<translation>Stop programma</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1007"/>
<location filename="../preferences.ui" line="1048"/>
=======
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1010"/>
<location filename="../preferences.ui" line="1051"/>
<source>Browse...</source>
<translation>Bestand zoeken...</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1018"/>
<location filename="../preferences.ui" line="1059"/>
=======
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1021"/>
<location filename="../preferences.ui" line="1062"/>
<source>Arguments:</source>
<translation>Argumenten:</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1035"/>
=======
<location filename="../preferences.ui" line="1004"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1038"/>
<source>Start application</source>
<translation>Start programma</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1092"/>
=======
<location filename="../preferences.ui" line="1061"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1095"/>
<source>Mail</source>
<translation>Berichten</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1098"/>
=======
<location filename="../preferences.ui" line="1067"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1101"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Gebruik het voorkeurenvenster in Thunderbird om de accounts en mappen te selecteren</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1135"/>
=======
<location filename="../preferences.ui" line="1104"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1138"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1141"/>
=======
<location filename="../preferences.ui" line="1110"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1144"/>
<source>Display debug window</source>
<translation>Toon debug venster</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1202"/>
=======
<location filename="../preferences.ui" line="1171"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1205"/>
<source>Save</source>
<translation>Bewaren</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1195"/>
=======
<location filename="../preferences.ui" line="1164"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1198"/>
<source>Cancel</source>
<translation>Annnuleren</translation>
</message>
<message>
<location filename="../preferences.ui" line="211"/>
<location filename="../preferences.ui" line="256"/>
<location filename="../preferences.ui" line="214"/>
<location filename="../preferences.ui" line="259"/>
<source>Minimize to tray</source>
<translation>Minimaliseer naar systeemvak</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Open Image</source>
<translation>Open afbeelding</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Afbeeldingsbestanden (*.png *.jpg *.bmp)</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="763"/>
<location filename="../preferencesdialog.cpp" line="777"/>
=======
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
>>>>>>> develop
<source>Select application</source>
<translation>Selecteer programma</translation>
</message>
@@ -624,47 +483,27 @@
<context>
<name>SysTrayX</name>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="246"/>
=======
<location filename="../systrayx.cpp" line="243"/>
>>>>>>> develop
<source>&amp;Show/Hide</source>
<translation>&amp;Tonen/Verbergen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="250"/>
=======
<location filename="../systrayx.cpp" line="247"/>
>>>>>>> develop
<source>&amp;Preferences</source>
<translation>&amp;Opties</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="254"/>
=======
<location filename="../systrayx.cpp" line="251"/>
>>>>>>> develop
<source>&amp;About</source>
<translation>O&amp;ver</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="258"/>
=======
<location filename="../systrayx.cpp" line="255"/>
>>>>>>> develop
<source>&amp;Quit</source>
<translation>&amp;Afsluiten</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="692"/>
=======
<location filename="../systrayx.cpp" line="689"/>
>>>>>>> develop
<source>Close</source>
<translation>Sluiten</translation>
</message>

View File

@@ -105,15 +105,15 @@
<translation>SysTray-X Preferências</translation>
</message>
<message>
<location filename="../preferences.ui" line="294"/>
<location filename="../preferences.ui" line="297"/>
<source>Default icon</source>
<translation>Ícone padrão</translation>
</message>
<message>
<location filename="../preferences.ui" line="237"/>
<location filename="../preferences.ui" line="288"/>
<location filename="../preferences.ui" line="300"/>
<location filename="../preferences.ui" line="386"/>
<location filename="../preferences.ui" line="240"/>
<location filename="../preferences.ui" line="291"/>
<location filename="../preferences.ui" line="303"/>
<location filename="../preferences.ui" line="389"/>
<source>Icon</source>
<translation>Ícone</translation>
</message>
@@ -128,50 +128,50 @@
<translation>Minimize todas as janelas para a tray</translation>
</message>
<message>
<location filename="../preferences.ui" line="308"/>
<location filename="../preferences.ui" line="518"/>
<location filename="../preferences.ui" line="311"/>
<location filename="../preferences.ui" line="521"/>
<source>Default Thunderbird</source>
<translation>Padrão do Thunderbird</translation>
</message>
<message>
<location filename="../preferences.ui" line="321"/>
<location filename="../preferences.ui" line="324"/>
<source>Lookthrough icon</source>
<translation>Ícone transparente</translation>
</message>
<message>
<location filename="../preferences.ui" line="333"/>
<location filename="../preferences.ui" line="460"/>
<location filename="../preferences.ui" line="336"/>
<location filename="../preferences.ui" line="463"/>
<source>Custom icon</source>
<translation>Ícone personalizado</translation>
</message>
<message>
<location filename="../preferences.ui" line="350"/>
<location filename="../preferences.ui" line="477"/>
<location filename="../preferences.ui" line="353"/>
<location filename="../preferences.ui" line="480"/>
<source>Choose</source>
<translation>Escolher</translation>
</message>
<message>
<location filename="../preferences.ui" line="367"/>
<location filename="../preferences.ui" line="370"/>
<source>KDE integration (Hide)</source>
<translation>Integração com o KDE (oculta o ícone)</translation>
</message>
<message>
<location filename="../preferences.ui" line="380"/>
<location filename="../preferences.ui" line="383"/>
<source>Mail notification icon</source>
<translation>Ícone de notificação</translation>
</message>
<message>
<location filename="../preferences.ui" line="397"/>
<location filename="../preferences.ui" line="400"/>
<source>Blank icon</source>
<translation>Ícone branco</translation>
</message>
<message>
<location filename="../preferences.ui" line="430"/>
<location filename="../preferences.ui" line="433"/>
<source>New mail icon</source>
<translation>Ícone de novo e-mail</translation>
</message>
<message>
<location filename="../preferences.ui" line="491"/>
<location filename="../preferences.ui" line="494"/>
<source>No icon</source>
<translation>Nenhum ícone</translation>
</message>
@@ -198,23 +198,23 @@
<translation>Fechar</translation>
</message>
<message>
<location filename="../preferences.ui" line="155"/>
<location filename="../preferences.ui" line="158"/>
<source>Restore startup positions</source>
<translation>Restaurar posições da janela na inicialização</translation>
</message>
<message>
<location filename="../preferences.ui" line="192"/>
<location filename="../preferences.ui" line="195"/>
<source>Minimize</source>
<translation>Miminizar</translation>
</message>
<message>
<location filename="../preferences.ui" line="198"/>
<location filename="../preferences.ui" line="243"/>
<location filename="../preferences.ui" line="201"/>
<location filename="../preferences.ui" line="246"/>
<source>Default minimize</source>
<translation>Comportamento padrão</translation>
</message>
<message>
<location filename="../preferences.ui" line="224"/>
<location filename="../preferences.ui" line="227"/>
<source>Minimize to tray, method 2</source>
<translatorcomment>Minimizar para à área de notificações? (muito grande)</translatorcomment>
<translation>Minimizar para a tray, método 2</translation>
@@ -235,21 +235,17 @@
<translation>Minimize todas as janelas</translation>
</message>
<message>
<location filename="../preferences.ui" line="129"/>
<location filename="../preferences.ui" line="132"/>
<source>Start application minimized</source>
<translation>Iniciar aplicação minimizada</translation>
</message>
<message>
<location filename="../preferences.ui" line="546"/>
<location filename="../preferences.ui" line="549"/>
<source>Invert icon</source>
<translation>Ícone inverter</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="683"/>
=======
<location filename="../preferences.ui" line="652"/>
>>>>>>> develop
<location filename="../preferences.ui" line="686"/>
<source>Number properties</source>
<translation>Propriedades do número</translation>
</message>
@@ -258,119 +254,67 @@
<translation type="vanished">Exibir contador de mensagens não lidas</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="736"/>
=======
<location filename="../preferences.ui" line="705"/>
>>>>>>> develop
<location filename="../preferences.ui" line="739"/>
<source>Number color</source>
<translation>Cor do número</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="757"/>
=======
<location filename="../preferences.ui" line="726"/>
>>>>>>> develop
<location filename="../preferences.ui" line="760"/>
<source>Number size</source>
<translation>Tamanho do número</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="781"/>
=======
<location filename="../preferences.ui" line="750"/>
>>>>>>> develop
<location filename="../preferences.ui" line="784"/>
<source>Alignment</source>
<translation>Alinhamento</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="792"/>
=======
<location filename="../preferences.ui" line="761"/>
>>>>>>> develop
<location filename="../preferences.ui" line="795"/>
<source>Top left</source>
<translation>Canto superior esquerdo</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="797"/>
=======
<location filename="../preferences.ui" line="766"/>
>>>>>>> develop
<location filename="../preferences.ui" line="800"/>
<source>Top centre</source>
<translation>Centro superior</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="802"/>
=======
<location filename="../preferences.ui" line="771"/>
>>>>>>> develop
<location filename="../preferences.ui" line="805"/>
<source>Top right</source>
<translation>Canto superior direito</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="807"/>
=======
<location filename="../preferences.ui" line="776"/>
>>>>>>> develop
<location filename="../preferences.ui" line="810"/>
<source>Middle left</source>
<translation>Meio esquerdo</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="812"/>
=======
<location filename="../preferences.ui" line="781"/>
>>>>>>> develop
<location filename="../preferences.ui" line="815"/>
<source>Middle centre</source>
<translation>Centro médio</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="817"/>
=======
<location filename="../preferences.ui" line="786"/>
>>>>>>> develop
<location filename="../preferences.ui" line="820"/>
<source>Middle right</source>
<translation>Meio à direita</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="822"/>
=======
<location filename="../preferences.ui" line="791"/>
>>>>>>> develop
<location filename="../preferences.ui" line="825"/>
<source>Bottom left</source>
<translation>Canto inferior esquerdo</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="827"/>
=======
<location filename="../preferences.ui" line="796"/>
>>>>>>> develop
<location filename="../preferences.ui" line="830"/>
<source>Bottom centre</source>
<translation>Centro inferior</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="832"/>
=======
<location filename="../preferences.ui" line="801"/>
>>>>>>> develop
<location filename="../preferences.ui" line="835"/>
<source>Bottom right</source>
<translation>Canto inferior direito</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="691"/>
=======
<location filename="../preferences.ui" line="660"/>
>>>>>>> develop
<location filename="../preferences.ui" line="694"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Margens (esquerdo, superior, direito, inferior):</translation>
</message>
@@ -385,238 +329,153 @@
<translation>Inicialização padrão</translation>
</message>
<message>
<location filename="../preferences.ui" line="139"/>
<location filename="../preferences.ui" line="142"/>
<source>Start application in tray</source>
<translation>Inicie o aplicativo na bandeja</translation>
</message>
<message>
<location filename="../preferences.ui" line="596"/>
<location filename="../preferences.ui" line="599"/>
<source>Count</source>
<translation>Contador</translation>
</message>
<message>
<location filename="../preferences.ui" line="604"/>
<location filename="../preferences.ui" line="607"/>
<source>Show message count</source>
<translation>Exibir contador de mensagens</translation>
</message>
<message>
<location filename="../preferences.ui" line="614"/>
<location filename="../preferences.ui" line="617"/>
<source>Show new indicator</source>
<translation>Mostrar novo indicador</translation>
</message>
<message>
<location filename="../preferences.ui" line="623"/>
<location filename="../preferences.ui" line="626"/>
<source>Startup delay</source>
<translation>Atraso de inicialização</translation>
</message>
<message>
<location filename="../preferences.ui" line="647"/>
<location filename="../preferences.ui" line="650"/>
<source>Count type</source>
<translation>Tipo do contador</translation>
</message>
<message>
<location filename="../preferences.ui" line="655"/>
<location filename="../preferences.ui" line="658"/>
<source>Unread</source>
<translation>Não lidos</translation>
</message>
<message>
<location filename="../preferences.ui" line="668"/>
<location filename="../preferences.ui" line="671"/>
<source>New</source>
<translation>Novos</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="847"/>
=======
<location filename="../preferences.ui" line="816"/>
>>>>>>> develop
<location filename="../preferences.ui" line="850"/>
<source>New indicator</source>
<translation>Novo indicador</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="855"/>
=======
<location filename="../preferences.ui" line="824"/>
>>>>>>> develop
<location filename="../preferences.ui" line="858"/>
<source>Icon round</source>
<translation>Ícone redondo</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="865"/>
=======
<location filename="../preferences.ui" line="834"/>
>>>>>>> develop
<location filename="../preferences.ui" line="868"/>
<source>Icon star</source>
<translation>Ícone de estrela</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="877"/>
=======
<location filename="../preferences.ui" line="846"/>
>>>>>>> develop
<location filename="../preferences.ui" line="880"/>
<source>Shade</source>
<translation>Matiz</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="956"/>
=======
<location filename="../preferences.ui" line="925"/>
>>>>>>> develop
<location filename="../preferences.ui" line="959"/>
<source>Special options</source>
<translation>Opções especiais</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="962"/>
=======
<location filename="../preferences.ui" line="931"/>
>>>>>>> develop
<location filename="../preferences.ui" line="965"/>
<source>API count method</source>
<translation>Método de contagem de API</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="986"/>
=======
<location filename="../preferences.ui" line="955"/>
>>>>>>> develop
<location filename="../preferences.ui" line="989"/>
<source>Apps</source>
<translation>Aplicativos</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="994"/>
=======
<location filename="../preferences.ui" line="963"/>
>>>>>>> develop
<location filename="../preferences.ui" line="997"/>
<source>Close application</source>
<translation>Fechando aplicativo</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1007"/>
<location filename="../preferences.ui" line="1048"/>
=======
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1010"/>
<location filename="../preferences.ui" line="1051"/>
<source>Browse...</source>
<translation>Procurar...</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1018"/>
<location filename="../preferences.ui" line="1059"/>
=======
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1021"/>
<location filename="../preferences.ui" line="1062"/>
<source>Arguments:</source>
<translation>Argumentos:</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1035"/>
=======
<location filename="../preferences.ui" line="1004"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1038"/>
<source>Start application</source>
<translation>Aplicativo de inicialização</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1092"/>
=======
<location filename="../preferences.ui" line="1061"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1095"/>
<source>Mail</source>
<translation>E-mail</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1098"/>
=======
<location filename="../preferences.ui" line="1067"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1101"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Use a janela de preferências no Thunderbird para selecionar as contas e pastas</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1135"/>
=======
<location filename="../preferences.ui" line="1104"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1138"/>
<source>Debug</source>
<translation>Depuração</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1141"/>
=======
<location filename="../preferences.ui" line="1110"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1144"/>
<source>Display debug window</source>
<translation>Mostrar janela de depuração</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1202"/>
=======
<location filename="../preferences.ui" line="1171"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1205"/>
<source>Save</source>
<translation>Salvar</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1195"/>
=======
<location filename="../preferences.ui" line="1164"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1198"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
<location filename="../preferences.ui" line="211"/>
<location filename="../preferences.ui" line="256"/>
<location filename="../preferences.ui" line="214"/>
<location filename="../preferences.ui" line="259"/>
<source>Minimize to tray</source>
<translation>Minimizar para a tray</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Open Image</source>
<translation>Abrir imagem</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Arquivo de imagem (*.png *.jpg *.bmp)</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="763"/>
<location filename="../preferencesdialog.cpp" line="777"/>
=======
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
>>>>>>> develop
<source>Select application</source>
<translation>Selecione o aplicativo</translation>
</message>
@@ -624,47 +483,27 @@
<context>
<name>SysTrayX</name>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="246"/>
=======
<location filename="../systrayx.cpp" line="243"/>
>>>>>>> develop
<source>&amp;Show/Hide</source>
<translation>&amp;Exibir/Ocultar</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="250"/>
=======
<location filename="../systrayx.cpp" line="247"/>
>>>>>>> develop
<source>&amp;Preferences</source>
<translation>&amp;Preferências</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="254"/>
=======
<location filename="../systrayx.cpp" line="251"/>
>>>>>>> develop
<source>&amp;About</source>
<translation>&amp;Sobre</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="258"/>
=======
<location filename="../systrayx.cpp" line="255"/>
>>>>>>> develop
<source>&amp;Quit</source>
<translation>&amp;Sair</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="692"/>
=======
<location filename="../systrayx.cpp" line="689"/>
>>>>>>> develop
<source>Close</source>
<translation>Fechar</translation>
</message>

View File

@@ -102,15 +102,15 @@
<translation>Настройки SysTray-X</translation>
</message>
<message>
<location filename="../preferences.ui" line="294"/>
<location filename="../preferences.ui" line="297"/>
<source>Default icon</source>
<translation>Иконка по умолчанию</translation>
</message>
<message>
<location filename="../preferences.ui" line="237"/>
<location filename="../preferences.ui" line="288"/>
<location filename="../preferences.ui" line="300"/>
<location filename="../preferences.ui" line="386"/>
<location filename="../preferences.ui" line="240"/>
<location filename="../preferences.ui" line="291"/>
<location filename="../preferences.ui" line="303"/>
<location filename="../preferences.ui" line="389"/>
<source>Icon</source>
<translation>Иконка</translation>
</message>
@@ -125,50 +125,50 @@
<translation>Свернуть все окна в трей</translation>
</message>
<message>
<location filename="../preferences.ui" line="308"/>
<location filename="../preferences.ui" line="518"/>
<location filename="../preferences.ui" line="311"/>
<location filename="../preferences.ui" line="521"/>
<source>Default Thunderbird</source>
<translation>Стандартная Thunderbird</translation>
</message>
<message>
<location filename="../preferences.ui" line="321"/>
<location filename="../preferences.ui" line="324"/>
<source>Lookthrough icon</source>
<translation>Прозрачная иконка</translation>
</message>
<message>
<location filename="../preferences.ui" line="333"/>
<location filename="../preferences.ui" line="460"/>
<location filename="../preferences.ui" line="336"/>
<location filename="../preferences.ui" line="463"/>
<source>Custom icon</source>
<translation>Своя иконка</translation>
</message>
<message>
<location filename="../preferences.ui" line="350"/>
<location filename="../preferences.ui" line="477"/>
<location filename="../preferences.ui" line="353"/>
<location filename="../preferences.ui" line="480"/>
<source>Choose</source>
<translation>Выбрать</translation>
</message>
<message>
<location filename="../preferences.ui" line="367"/>
<location filename="../preferences.ui" line="370"/>
<source>KDE integration (Hide)</source>
<translation>Интеграция с KDE (Скрыть)</translation>
</message>
<message>
<location filename="../preferences.ui" line="380"/>
<location filename="../preferences.ui" line="383"/>
<source>Mail notification icon</source>
<translation>Иконка уведомления</translation>
</message>
<message>
<location filename="../preferences.ui" line="397"/>
<location filename="../preferences.ui" line="400"/>
<source>Blank icon</source>
<translation>Пустая иконка</translation>
</message>
<message>
<location filename="../preferences.ui" line="430"/>
<location filename="../preferences.ui" line="433"/>
<source>New mail icon</source>
<translation>Иконка &quot;Новые письма&quot;</translation>
</message>
<message>
<location filename="../preferences.ui" line="491"/>
<location filename="../preferences.ui" line="494"/>
<source>No icon</source>
<translation>Без иконки (только цифры)</translation>
</message>
@@ -195,24 +195,24 @@
<translation>При закрытии</translation>
</message>
<message>
<location filename="../preferences.ui" line="155"/>
<location filename="../preferences.ui" line="158"/>
<source>Restore startup positions</source>
<translation>Восстановить положение окон при запуске</translation>
</message>
<message>
<location filename="../preferences.ui" line="192"/>
<location filename="../preferences.ui" line="195"/>
<source>Minimize</source>
<translation>Свернуть</translation>
</message>
<message>
<location filename="../preferences.ui" line="198"/>
<location filename="../preferences.ui" line="243"/>
<location filename="../preferences.ui" line="201"/>
<location filename="../preferences.ui" line="246"/>
<source>Default minimize</source>
<translatorcomment>Need documentation what methods do...</translatorcomment>
<translation>Свернуть окно</translation>
</message>
<message>
<location filename="../preferences.ui" line="224"/>
<location filename="../preferences.ui" line="227"/>
<source>Minimize to tray, method 2</source>
<translation>Свернуть в трей, вариант 2</translation>
</message>
@@ -232,21 +232,17 @@
<translation>Свернуть все окна</translation>
</message>
<message>
<location filename="../preferences.ui" line="129"/>
<location filename="../preferences.ui" line="132"/>
<source>Start application minimized</source>
<translation>Запуск приложения свернутым</translation>
</message>
<message>
<location filename="../preferences.ui" line="546"/>
<location filename="../preferences.ui" line="549"/>
<source>Invert icon</source>
<translation>Инвертировать значок</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="683"/>
=======
<location filename="../preferences.ui" line="652"/>
>>>>>>> develop
<location filename="../preferences.ui" line="686"/>
<source>Number properties</source>
<translation>Настройки индикатора кол-ва</translation>
</message>
@@ -255,119 +251,67 @@
<translation type="vanished">Показывать кол-во непрочитанных писем</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="736"/>
=======
<location filename="../preferences.ui" line="705"/>
>>>>>>> develop
<location filename="../preferences.ui" line="739"/>
<source>Number color</source>
<translation>Цвет числа</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="757"/>
=======
<location filename="../preferences.ui" line="726"/>
>>>>>>> develop
<location filename="../preferences.ui" line="760"/>
<source>Number size</source>
<translation>Размер числа</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="781"/>
=======
<location filename="../preferences.ui" line="750"/>
>>>>>>> develop
<location filename="../preferences.ui" line="784"/>
<source>Alignment</source>
<translation>Выравнивание</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="792"/>
=======
<location filename="../preferences.ui" line="761"/>
>>>>>>> develop
<location filename="../preferences.ui" line="795"/>
<source>Top left</source>
<translation>Верхний левый</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="797"/>
=======
<location filename="../preferences.ui" line="766"/>
>>>>>>> develop
<location filename="../preferences.ui" line="800"/>
<source>Top centre</source>
<translation>Верхний центр</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="802"/>
=======
<location filename="../preferences.ui" line="771"/>
>>>>>>> develop
<location filename="../preferences.ui" line="805"/>
<source>Top right</source>
<translation>Верхний правый</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="807"/>
=======
<location filename="../preferences.ui" line="776"/>
>>>>>>> develop
<location filename="../preferences.ui" line="810"/>
<source>Middle left</source>
<translation>Средний левый</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="812"/>
=======
<location filename="../preferences.ui" line="781"/>
>>>>>>> develop
<location filename="../preferences.ui" line="815"/>
<source>Middle centre</source>
<translation>Средний центральный</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="817"/>
=======
<location filename="../preferences.ui" line="786"/>
>>>>>>> develop
<location filename="../preferences.ui" line="820"/>
<source>Middle right</source>
<translation>Средний правый</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="822"/>
=======
<location filename="../preferences.ui" line="791"/>
>>>>>>> develop
<location filename="../preferences.ui" line="825"/>
<source>Bottom left</source>
<translation>Нижний левый</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="827"/>
=======
<location filename="../preferences.ui" line="796"/>
>>>>>>> develop
<location filename="../preferences.ui" line="830"/>
<source>Bottom centre</source>
<translation>Нижний центральный</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="832"/>
=======
<location filename="../preferences.ui" line="801"/>
>>>>>>> develop
<location filename="../preferences.ui" line="835"/>
<source>Bottom right</source>
<translation>Нижний правый</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="691"/>
=======
<location filename="../preferences.ui" line="660"/>
>>>>>>> develop
<location filename="../preferences.ui" line="694"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Отступ (левый, Верхний, правый, Нижний):</translation>
</message>
@@ -382,238 +326,153 @@
<translation>Запуск по умолчанию</translation>
</message>
<message>
<location filename="../preferences.ui" line="139"/>
<location filename="../preferences.ui" line="142"/>
<source>Start application in tray</source>
<translation>Запустить приложение в трее</translation>
</message>
<message>
<location filename="../preferences.ui" line="596"/>
<location filename="../preferences.ui" line="599"/>
<source>Count</source>
<translation>счетчик</translation>
</message>
<message>
<location filename="../preferences.ui" line="604"/>
<location filename="../preferences.ui" line="607"/>
<source>Show message count</source>
<translation>Показать количество писем</translation>
</message>
<message>
<location filename="../preferences.ui" line="614"/>
<location filename="../preferences.ui" line="617"/>
<source>Show new indicator</source>
<translation>Показать новый индикатор</translation>
</message>
<message>
<location filename="../preferences.ui" line="623"/>
<location filename="../preferences.ui" line="626"/>
<source>Startup delay</source>
<translation>Задержка запуска</translation>
</message>
<message>
<location filename="../preferences.ui" line="647"/>
<location filename="../preferences.ui" line="650"/>
<source>Count type</source>
<translation>Алгоритм подсчета</translation>
</message>
<message>
<location filename="../preferences.ui" line="655"/>
<location filename="../preferences.ui" line="658"/>
<source>Unread</source>
<translation>Непрочитанные</translation>
</message>
<message>
<location filename="../preferences.ui" line="668"/>
<location filename="../preferences.ui" line="671"/>
<source>New</source>
<translation>Новые</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="847"/>
=======
<location filename="../preferences.ui" line="816"/>
>>>>>>> develop
<location filename="../preferences.ui" line="850"/>
<source>New indicator</source>
<translation>Новый индикатор</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="855"/>
=======
<location filename="../preferences.ui" line="824"/>
>>>>>>> develop
<location filename="../preferences.ui" line="858"/>
<source>Icon round</source>
<translation>Круглый значок</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="865"/>
=======
<location filename="../preferences.ui" line="834"/>
>>>>>>> develop
<location filename="../preferences.ui" line="868"/>
<source>Icon star</source>
<translation>Значок звезды</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="877"/>
=======
<location filename="../preferences.ui" line="846"/>
>>>>>>> develop
<location filename="../preferences.ui" line="880"/>
<source>Shade</source>
<translation>Оттенок</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="956"/>
=======
<location filename="../preferences.ui" line="925"/>
>>>>>>> develop
<location filename="../preferences.ui" line="959"/>
<source>Special options</source>
<translation>Специальные опции</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="962"/>
=======
<location filename="../preferences.ui" line="931"/>
>>>>>>> develop
<location filename="../preferences.ui" line="965"/>
<source>API count method</source>
<translation>Метод подсчета API</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="986"/>
=======
<location filename="../preferences.ui" line="955"/>
>>>>>>> develop
<location filename="../preferences.ui" line="989"/>
<source>Apps</source>
<translation>Программы</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="994"/>
=======
<location filename="../preferences.ui" line="963"/>
>>>>>>> develop
<location filename="../preferences.ui" line="997"/>
<source>Close application</source>
<translation>Заявление о закрытии</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1007"/>
<location filename="../preferences.ui" line="1048"/>
=======
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1010"/>
<location filename="../preferences.ui" line="1051"/>
<source>Browse...</source>
<translation>просматривать...</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1018"/>
<location filename="../preferences.ui" line="1059"/>
=======
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1021"/>
<location filename="../preferences.ui" line="1062"/>
<source>Arguments:</source>
<translation>аргументы:</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1035"/>
=======
<location filename="../preferences.ui" line="1004"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1038"/>
<source>Start application</source>
<translation>Приложение при запуске</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1092"/>
=======
<location filename="../preferences.ui" line="1061"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1095"/>
<source>Mail</source>
<translation>Письма</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1098"/>
=======
<location filename="../preferences.ui" line="1067"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1101"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Используйте диалоговое окно настроек в Thunderbird, чтобы выбрать учетные записи и папки</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1135"/>
=======
<location filename="../preferences.ui" line="1104"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1138"/>
<source>Debug</source>
<translation>Отладка</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1141"/>
=======
<location filename="../preferences.ui" line="1110"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1144"/>
<source>Display debug window</source>
<translation>Показывать окно отладки</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1202"/>
=======
<location filename="../preferences.ui" line="1171"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1205"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferences.ui" line="1195"/>
=======
<location filename="../preferences.ui" line="1164"/>
>>>>>>> develop
<location filename="../preferences.ui" line="1198"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
<message>
<location filename="../preferences.ui" line="211"/>
<location filename="../preferences.ui" line="256"/>
<location filename="../preferences.ui" line="214"/>
<location filename="../preferences.ui" line="259"/>
<source>Minimize to tray</source>
<translation>Свернуть в трей</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Open Image</source>
<translation>Открыть изображение</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="684"/>
<location filename="../preferencesdialog.cpp" line="708"/>
=======
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
>>>>>>> develop
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Файлы изображений (*.png *.jpg *.bmp)</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../preferencesdialog.cpp" line="763"/>
<location filename="../preferencesdialog.cpp" line="777"/>
=======
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
>>>>>>> develop
<source>Select application</source>
<translation>выберите приложение</translation>
</message>
@@ -621,47 +480,27 @@
<context>
<name>SysTrayX</name>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="246"/>
=======
<location filename="../systrayx.cpp" line="243"/>
>>>>>>> develop
<source>&amp;Show/Hide</source>
<translation>&amp;Показать/Скрыть</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="250"/>
=======
<location filename="../systrayx.cpp" line="247"/>
>>>>>>> develop
<source>&amp;Preferences</source>
<translation>&amp;Настройки</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="254"/>
=======
<location filename="../systrayx.cpp" line="251"/>
>>>>>>> develop
<source>&amp;About</source>
<translation>&amp;О приложении</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="258"/>
=======
<location filename="../systrayx.cpp" line="255"/>
>>>>>>> develop
<source>&amp;Quit</source>
<translation>&amp;Выход</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../systrayx.cpp" line="692"/>
=======
<location filename="../systrayx.cpp" line="689"/>
>>>>>>> develop
<source>Close</source>
<translation>Закрыть</translation>
</message>