mirror of
https://github.com/Ximi1970/systray-x.git
synced 2026-01-30 19:09:03 +01:00
Merge branch 'develop' into feature-fix-multi-window
This commit is contained in:
Ximi1970
@@ -241,7 +241,11 @@
|
||||
<translation>Symbol umkehren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="683"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="652"/>
|
||||
>>>>>>> develop
|
||||
<source>Number properties</source>
|
||||
<translation>Nummereigenschaften</translation>
|
||||
</message>
|
||||
@@ -250,67 +254,119 @@
|
||||
<translation type="vanished">Anzahl neuer Nachrichten anzeigen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="736"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="705"/>
|
||||
>>>>>>> develop
|
||||
<source>Number color</source>
|
||||
<translation>Nummerfarbe</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="757"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="726"/>
|
||||
>>>>>>> develop
|
||||
<source>Number size</source>
|
||||
<translation>Nummergröße</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="750"/>
|
||||
>>>>>>> develop
|
||||
<source>Alignment</source>
|
||||
<translation>Nummernausrichtung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="792"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="761"/>
|
||||
>>>>>>> develop
|
||||
<source>Top left</source>
|
||||
<translation>Oben links</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="797"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="766"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Top right</source>
|
||||
<translation>Oben rechts</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="807"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="776"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle left</source>
|
||||
<translation>Mitte links</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="812"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle centre</source>
|
||||
<translation>Mittleres Zentrum</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="817"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="786"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle right</source>
|
||||
<translation>Mitte rechts</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="822"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="791"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom left</source>
|
||||
<translation>Unten links</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="827"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="796"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Bottom right</source>
|
||||
<translation>Unten rechts</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="691"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="660"/>
|
||||
>>>>>>> develop
|
||||
<source>Margins (left, top, right, bottom):</source>
|
||||
<translation>Ränder (links, oben, rechts, unten):</translation>
|
||||
</message>
|
||||
@@ -365,89 +421,159 @@
|
||||
<translation>Neue Nachrichten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="847"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="816"/>
|
||||
>>>>>>> develop
|
||||
<source>New indicator</source>
|
||||
<translation>Neu Indikator</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="855"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="824"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon round</source>
|
||||
<translation>Symbol rund</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="865"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="834"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon star</source>
|
||||
<translation>Symbol Stern</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="877"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="846"/>
|
||||
>>>>>>> develop
|
||||
<source>Shade</source>
|
||||
<translation>Schattierung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="956"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="925"/>
|
||||
>>>>>>> develop
|
||||
<source>Special options</source>
|
||||
<translation>Sonderoptionen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="962"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="931"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Apps</source>
|
||||
<translation>Anwendungen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="994"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="963"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<source>Arguments:</source>
|
||||
<translation>Argumente:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1035"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1004"/>
|
||||
>>>>>>> develop
|
||||
<source>Start application</source>
|
||||
<translation>Startanwendung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1092"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1061"/>
|
||||
>>>>>>> develop
|
||||
<source>Mail</source>
|
||||
<translation>Nachrichten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1098"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1067"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Debug</source>
|
||||
<translation>Debug</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1141"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1110"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Save</source>
|
||||
<translation>Speichern</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1195"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1164"/>
|
||||
>>>>>>> develop
|
||||
<source>Cancel</source>
|
||||
<translation>Annullieren</translation>
|
||||
</message>
|
||||
@@ -458,20 +584,35 @@
|
||||
<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>
|
||||
@@ -479,27 +620,47 @@
|
||||
<context>
|
||||
<name>SysTrayX</name>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="246"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="243"/>
|
||||
>>>>>>> develop
|
||||
<source>&Show/Hide</source>
|
||||
<translation>&Anzeigen/Verbergen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="250"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="247"/>
|
||||
>>>>>>> develop
|
||||
<source>&Preferences</source>
|
||||
<translation>&Einstellungen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="254"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="251"/>
|
||||
>>>>>>> develop
|
||||
<source>&About</source>
|
||||
<translation>&Über</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="258"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="255"/>
|
||||
>>>>>>> develop
|
||||
<source>&Quit</source>
|
||||
<translation>&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>
|
||||
|
||||
@@ -241,7 +241,11 @@
|
||||
<translation>Αντιστρέψτε εικονίδιο</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="683"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="652"/>
|
||||
>>>>>>> develop
|
||||
<source>Number properties</source>
|
||||
<translation>Ιδιότητες αριθμών</translation>
|
||||
</message>
|
||||
@@ -250,67 +254,119 @@
|
||||
<translation type="vanished">Προβολή μετρητή μη-αναγνωσμένης αλληλογραφίας</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="736"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="705"/>
|
||||
>>>>>>> develop
|
||||
<source>Number color</source>
|
||||
<translation>Χρώμα μετρητή</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="757"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="726"/>
|
||||
>>>>>>> develop
|
||||
<source>Number size</source>
|
||||
<translation>Μέγεθος μετρητή</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="750"/>
|
||||
>>>>>>> develop
|
||||
<source>Alignment</source>
|
||||
<translation>Ευθυγραμμία</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="792"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="761"/>
|
||||
>>>>>>> develop
|
||||
<source>Top left</source>
|
||||
<translation>Κορυφαίο αριστερά</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="797"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="766"/>
|
||||
>>>>>>> develop
|
||||
<source>Top centre</source>
|
||||
<translation>Κορυφαίο κέντρο</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="802"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="771"/>
|
||||
>>>>>>> develop
|
||||
<source>Top right</source>
|
||||
<translation>Κορυφαίο δεξιά</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="807"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="776"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle left</source>
|
||||
<translation>Μέση αριστερά</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="812"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle centre</source>
|
||||
<translation>Μεσαίο κέντρο</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="817"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="786"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle right</source>
|
||||
<translation>Μέση δεξιά</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="822"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="791"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom left</source>
|
||||
<translation>Κάτω αριστερά</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="827"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="796"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom centre</source>
|
||||
<translation>Κάτω κέντρο</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="832"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="801"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom right</source>
|
||||
<translation>Κάτω δεξιά</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="691"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="660"/>
|
||||
>>>>>>> develop
|
||||
<source>Margins (left, top, right, bottom):</source>
|
||||
<translation>Περιθώρια (αριστερά, Κορυφαίο, δεξιά, Κάτω):</translation>
|
||||
</message>
|
||||
@@ -365,69 +421,123 @@
|
||||
<translation>Νέα</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="847"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="816"/>
|
||||
>>>>>>> develop
|
||||
<source>New indicator</source>
|
||||
<translation>Νέος δείκτης</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="855"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="824"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon round</source>
|
||||
<translation>Στρογγυλό εικονίδιο</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="865"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="834"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon star</source>
|
||||
<translation>Αστέρι εικονίδιο</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="877"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="846"/>
|
||||
>>>>>>> develop
|
||||
<source>Shade</source>
|
||||
<translation>Απόχρωση</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="956"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="925"/>
|
||||
>>>>>>> develop
|
||||
<source>Special options</source>
|
||||
<translation>Ειδικές επιλογές</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="962"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="931"/>
|
||||
>>>>>>> develop
|
||||
<source>API count method</source>
|
||||
<translation>Μέθοδος καταμέτρησης API</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="994"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="963"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<source>Arguments:</source>
|
||||
<translation>Επιχειρήματα:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1092"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1061"/>
|
||||
>>>>>>> develop
|
||||
<source>Mail</source>
|
||||
<translation>Αλληλογραφία</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1098"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1067"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Debug</source>
|
||||
<translation>Αποσφαλμάτωση</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1141"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1110"/>
|
||||
>>>>>>> develop
|
||||
<source>Display debug window</source>
|
||||
<translation>Προβολή παραθύρου αποσφαλμάτωσης</translation>
|
||||
</message>
|
||||
@@ -438,40 +548,71 @@
|
||||
<translation>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="986"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="955"/>
|
||||
>>>>>>> develop
|
||||
<source>Apps</source>
|
||||
<translation>Εφαρμογές</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1035"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1004"/>
|
||||
>>>>>>> develop
|
||||
<source>Start application</source>
|
||||
<translation>Εφαρμογή εκκίνησης</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1202"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1171"/>
|
||||
>>>>>>> develop
|
||||
<source>Save</source>
|
||||
<translation>Αποθήκευση</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1195"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1164"/>
|
||||
>>>>>>> develop
|
||||
<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>
|
||||
@@ -479,27 +620,47 @@
|
||||
<context>
|
||||
<name>SysTrayX</name>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="246"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="243"/>
|
||||
>>>>>>> develop
|
||||
<source>&Show/Hide</source>
|
||||
<translation>&Εμφάνιση/Απόκρυψη</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="250"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="247"/>
|
||||
>>>>>>> develop
|
||||
<source>&Preferences</source>
|
||||
<translation>&Προτιμήσεις</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="254"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="251"/>
|
||||
>>>>>>> develop
|
||||
<source>&About</source>
|
||||
<translation>&Σχετικά</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="258"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="255"/>
|
||||
>>>>>>> develop
|
||||
<source>&Quit</source>
|
||||
<translation>&Έξοδος</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="692"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="689"/>
|
||||
>>>>>>> develop
|
||||
<source>Close</source>
|
||||
<translation>Κλείσιμο</translation>
|
||||
</message>
|
||||
|
||||
@@ -246,7 +246,11 @@
|
||||
<translation>Invert icon</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="683"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="652"/>
|
||||
>>>>>>> develop
|
||||
<source>Number properties</source>
|
||||
<translation>Number properties</translation>
|
||||
</message>
|
||||
@@ -255,67 +259,119 @@
|
||||
<translation type="vanished">Display unread message count</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="736"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="705"/>
|
||||
>>>>>>> develop
|
||||
<source>Number color</source>
|
||||
<translation>Number color</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="757"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="726"/>
|
||||
>>>>>>> develop
|
||||
<source>Number size</source>
|
||||
<translation>Number size</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="750"/>
|
||||
>>>>>>> develop
|
||||
<source>Alignment</source>
|
||||
<translation>Alignment</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="792"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="761"/>
|
||||
>>>>>>> develop
|
||||
<source>Top left</source>
|
||||
<translation>Top left</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="797"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="766"/>
|
||||
>>>>>>> develop
|
||||
<source>Top centre</source>
|
||||
<translation>Top centre</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="802"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="771"/>
|
||||
>>>>>>> develop
|
||||
<source>Top right</source>
|
||||
<translation>Top right</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="807"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="776"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle left</source>
|
||||
<translation>Middle left</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="812"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle centre</source>
|
||||
<translation>Middle centre</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="817"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="786"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle right</source>
|
||||
<translation>Middle right</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="822"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="791"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom left</source>
|
||||
<translation>Bottom left</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="827"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="796"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom centre</source>
|
||||
<translation>Bottom centre</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="832"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="801"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom right</source>
|
||||
<translation>Bottom right</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="691"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="660"/>
|
||||
>>>>>>> develop
|
||||
<source>Margins (left, top, right, bottom):</source>
|
||||
<translation>Margins (left, top, right, bottom):</translation>
|
||||
</message>
|
||||
@@ -370,89 +426,159 @@
|
||||
<translation>New</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="847"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="816"/>
|
||||
>>>>>>> develop
|
||||
<source>New indicator</source>
|
||||
<translation>New indicator</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="855"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="824"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon round</source>
|
||||
<translation>Icon round</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="865"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="834"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon star</source>
|
||||
<translation>Icon star</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="877"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="846"/>
|
||||
>>>>>>> develop
|
||||
<source>Shade</source>
|
||||
<translation>Shade</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="956"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="925"/>
|
||||
>>>>>>> develop
|
||||
<source>Special options</source>
|
||||
<translation>Special options</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="962"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="931"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Apps</source>
|
||||
<translation>Apps</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="994"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="963"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<source>Arguments:</source>
|
||||
<translation>Arguments:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1035"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1004"/>
|
||||
>>>>>>> develop
|
||||
<source>Start application</source>
|
||||
<translation>Start application</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1092"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1061"/>
|
||||
>>>>>>> develop
|
||||
<source>Mail</source>
|
||||
<translation>Mail</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1098"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1067"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Debug</source>
|
||||
<translation>Debug</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1141"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1110"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Save</source>
|
||||
<translation>Save</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1195"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1164"/>
|
||||
>>>>>>> develop
|
||||
<source>Cancel</source>
|
||||
<translation>Cancel</translation>
|
||||
</message>
|
||||
@@ -463,20 +589,35 @@
|
||||
<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>
|
||||
@@ -484,27 +625,47 @@
|
||||
<context>
|
||||
<name>SysTrayX</name>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="246"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="243"/>
|
||||
>>>>>>> develop
|
||||
<source>&Show/Hide</source>
|
||||
<translation>&Show/Hide</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="250"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="247"/>
|
||||
>>>>>>> develop
|
||||
<source>&Preferences</source>
|
||||
<translation>&Preferences</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="254"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="251"/>
|
||||
>>>>>>> develop
|
||||
<source>&About</source>
|
||||
<translation>&About</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="258"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="255"/>
|
||||
>>>>>>> develop
|
||||
<source>&Quit</source>
|
||||
<translation>&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>
|
||||
|
||||
@@ -242,7 +242,11 @@
|
||||
<translation>Icona inverti</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="683"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="652"/>
|
||||
>>>>>>> develop
|
||||
<source>Number properties</source>
|
||||
<translation>Proprietà numero</translation>
|
||||
</message>
|
||||
@@ -251,67 +255,119 @@
|
||||
<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
|
||||
<source>Number color</source>
|
||||
<translation>Colore numero</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="757"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="726"/>
|
||||
>>>>>>> develop
|
||||
<source>Number size</source>
|
||||
<translation>Dimensione numero</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="750"/>
|
||||
>>>>>>> develop
|
||||
<source>Alignment</source>
|
||||
<translation>Allineamento</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="792"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="761"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<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
|
||||
<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
|
||||
<source>Middle centre</source>
|
||||
<translation>Centro centrale</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="817"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="786"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<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
|
||||
<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
|
||||
<source>Margins (left, top, right, bottom):</source>
|
||||
<translation>Margini (sinistra, in alto, destra, in basso):</translation>
|
||||
</message>
|
||||
@@ -366,69 +422,123 @@
|
||||
<translation>Nuovi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="847"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="816"/>
|
||||
>>>>>>> develop
|
||||
<source>New indicator</source>
|
||||
<translation>Nuovo indicatore</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="855"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="824"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon round</source>
|
||||
<translation>Icona rotonda</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="865"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="834"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon star</source>
|
||||
<translation>Stella icona</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="877"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="846"/>
|
||||
>>>>>>> develop
|
||||
<source>Shade</source>
|
||||
<translation>Sfumatura</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="956"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="925"/>
|
||||
>>>>>>> develop
|
||||
<source>Special options</source>
|
||||
<translation>Opzioni speciali</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="962"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="931"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<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
|
||||
<source>Arguments:</source>
|
||||
<translation>Argomenti:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1092"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1061"/>
|
||||
>>>>>>> develop
|
||||
<source>Mail</source>
|
||||
<translation>Messaggi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1098"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1067"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Debug</source>
|
||||
<translation>Debug</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1141"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1110"/>
|
||||
>>>>>>> develop
|
||||
<source>Display debug window</source>
|
||||
<translation>Mostra finestra di debug</translation>
|
||||
</message>
|
||||
@@ -439,40 +549,71 @@
|
||||
<translation>Minimizza nel vassoio</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="986"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="955"/>
|
||||
>>>>>>> develop
|
||||
<source>Apps</source>
|
||||
<translation>Applicazioni</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1035"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1004"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Save</source>
|
||||
<translation>Salva</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1195"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1164"/>
|
||||
>>>>>>> develop
|
||||
<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'applicazione</translation>
|
||||
</message>
|
||||
@@ -480,27 +621,47 @@
|
||||
<context>
|
||||
<name>SysTrayX</name>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="246"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="243"/>
|
||||
>>>>>>> develop
|
||||
<source>&Show/Hide</source>
|
||||
<translation>&Mostra/Nascondi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="250"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="247"/>
|
||||
>>>>>>> develop
|
||||
<source>&Preferences</source>
|
||||
<translation>&Preferenze</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="254"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="251"/>
|
||||
>>>>>>> develop
|
||||
<source>&About</source>
|
||||
<translation>&Informazioni</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="258"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="255"/>
|
||||
>>>>>>> develop
|
||||
<source>&Quit</source>
|
||||
<translation>&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>
|
||||
|
||||
@@ -245,7 +245,11 @@
|
||||
<translation>Inverteer pictogram</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="683"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="652"/>
|
||||
>>>>>>> develop
|
||||
<source>Number properties</source>
|
||||
<translation>Nummer opties</translation>
|
||||
</message>
|
||||
@@ -254,67 +258,119 @@
|
||||
<translation type="vanished">Aantal ongelezen berichten weergeven</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="736"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="705"/>
|
||||
>>>>>>> develop
|
||||
<source>Number color</source>
|
||||
<translation>Nummer kleur</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="757"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="726"/>
|
||||
>>>>>>> develop
|
||||
<source>Number size</source>
|
||||
<translation>Nummer grootte</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="750"/>
|
||||
>>>>>>> develop
|
||||
<source>Alignment</source>
|
||||
<translation>Uitlijning</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="792"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="761"/>
|
||||
>>>>>>> develop
|
||||
<source>Top left</source>
|
||||
<translation>Linksboven</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="797"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="766"/>
|
||||
>>>>>>> develop
|
||||
<source>Top centre</source>
|
||||
<translation>Middenboven</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="802"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="771"/>
|
||||
>>>>>>> develop
|
||||
<source>Top right</source>
|
||||
<translation>Rechtsboven</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="807"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="776"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle left</source>
|
||||
<translation>Midden links</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="812"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle centre</source>
|
||||
<translation>Midden midden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="817"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="786"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle right</source>
|
||||
<translation>Midden rechts</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="822"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="791"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom left</source>
|
||||
<translation>Linksonder</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="827"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="796"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom centre</source>
|
||||
<translation>Middenonder</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="832"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="801"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom right</source>
|
||||
<translation>Rechtsonder</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="691"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="660"/>
|
||||
>>>>>>> develop
|
||||
<source>Margins (left, top, right, bottom):</source>
|
||||
<translation>Marges (links, boven, rechts, onder):</translation>
|
||||
</message>
|
||||
@@ -369,89 +425,159 @@
|
||||
<translation>Nieuw</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="847"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="816"/>
|
||||
>>>>>>> develop
|
||||
<source>New indicator</source>
|
||||
<translation>Nieuw indicator</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="855"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="824"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon round</source>
|
||||
<translation>Rond icoon</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="865"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="834"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon star</source>
|
||||
<translation>Ster icoon</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="877"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="846"/>
|
||||
>>>>>>> develop
|
||||
<source>Shade</source>
|
||||
<translation>Tint</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="956"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="925"/>
|
||||
>>>>>>> develop
|
||||
<source>Special options</source>
|
||||
<translation>Speciale opties</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="962"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="931"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Apps</source>
|
||||
<translation>Apps</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="994"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="963"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<source>Arguments:</source>
|
||||
<translation>Argumenten:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1035"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1004"/>
|
||||
>>>>>>> develop
|
||||
<source>Start application</source>
|
||||
<translation>Start programma</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1092"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1061"/>
|
||||
>>>>>>> develop
|
||||
<source>Mail</source>
|
||||
<translation>Berichten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1098"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1067"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Debug</source>
|
||||
<translation>Debug</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1141"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1110"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Save</source>
|
||||
<translation>Bewaren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1195"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1164"/>
|
||||
>>>>>>> develop
|
||||
<source>Cancel</source>
|
||||
<translation>Annnuleren</translation>
|
||||
</message>
|
||||
@@ -462,20 +588,35 @@
|
||||
<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>
|
||||
@@ -483,27 +624,47 @@
|
||||
<context>
|
||||
<name>SysTrayX</name>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="246"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="243"/>
|
||||
>>>>>>> develop
|
||||
<source>&Show/Hide</source>
|
||||
<translation>&Tonen/Verbergen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="250"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="247"/>
|
||||
>>>>>>> develop
|
||||
<source>&Preferences</source>
|
||||
<translation>&Opties</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="254"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="251"/>
|
||||
>>>>>>> develop
|
||||
<source>&About</source>
|
||||
<translation>O&ver</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="258"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="255"/>
|
||||
>>>>>>> develop
|
||||
<source>&Quit</source>
|
||||
<translation>&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>
|
||||
|
||||
@@ -245,7 +245,11 @@
|
||||
<translation>Ícone inverter</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="683"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="652"/>
|
||||
>>>>>>> develop
|
||||
<source>Number properties</source>
|
||||
<translation>Propriedades do número</translation>
|
||||
</message>
|
||||
@@ -254,67 +258,119 @@
|
||||
<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
|
||||
<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
|
||||
<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
|
||||
<source>Alignment</source>
|
||||
<translation>Alinhamento</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="792"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="761"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Top centre</source>
|
||||
<translation>Centro superior</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="802"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="771"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Middle left</source>
|
||||
<translation>Meio esquerdo</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="812"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Middle right</source>
|
||||
<translation>Meio à direita</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="822"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="791"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Bottom centre</source>
|
||||
<translation>Centro inferior</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="832"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="801"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Margins (left, top, right, bottom):</source>
|
||||
<translation>Margens (esquerdo, superior, direito, inferior):</translation>
|
||||
</message>
|
||||
@@ -369,89 +425,159 @@
|
||||
<translation>Novos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="847"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="816"/>
|
||||
>>>>>>> develop
|
||||
<source>New indicator</source>
|
||||
<translation>Novo indicador</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="855"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="824"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon round</source>
|
||||
<translation>Ícone redondo</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="865"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="834"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Shade</source>
|
||||
<translation>Matiz</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="956"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="925"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<source>Apps</source>
|
||||
<translation>Aplicativos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="994"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="963"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<source>Arguments:</source>
|
||||
<translation>Argumentos:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1035"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1004"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Mail</source>
|
||||
<translation>E-mail</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1098"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1067"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Debug</source>
|
||||
<translation>Depuração</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1141"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1110"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Save</source>
|
||||
<translation>Salvar</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1195"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1164"/>
|
||||
>>>>>>> develop
|
||||
<source>Cancel</source>
|
||||
<translation>Cancelar</translation>
|
||||
</message>
|
||||
@@ -462,20 +588,35 @@
|
||||
<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>
|
||||
@@ -483,27 +624,47 @@
|
||||
<context>
|
||||
<name>SysTrayX</name>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="246"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="243"/>
|
||||
>>>>>>> develop
|
||||
<source>&Show/Hide</source>
|
||||
<translation>&Exibir/Ocultar</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="250"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="247"/>
|
||||
>>>>>>> develop
|
||||
<source>&Preferences</source>
|
||||
<translation>&Preferências</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="254"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="251"/>
|
||||
>>>>>>> develop
|
||||
<source>&About</source>
|
||||
<translation>&Sobre</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="258"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="255"/>
|
||||
>>>>>>> develop
|
||||
<source>&Quit</source>
|
||||
<translation>&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>
|
||||
|
||||
@@ -242,7 +242,11 @@
|
||||
<translation>Инвертировать значок</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="683"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="652"/>
|
||||
>>>>>>> develop
|
||||
<source>Number properties</source>
|
||||
<translation>Настройки индикатора кол-ва</translation>
|
||||
</message>
|
||||
@@ -251,67 +255,119 @@
|
||||
<translation type="vanished">Показывать кол-во непрочитанных писем</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="736"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="705"/>
|
||||
>>>>>>> develop
|
||||
<source>Number color</source>
|
||||
<translation>Цвет числа</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="757"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="726"/>
|
||||
>>>>>>> develop
|
||||
<source>Number size</source>
|
||||
<translation>Размер числа</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="750"/>
|
||||
>>>>>>> develop
|
||||
<source>Alignment</source>
|
||||
<translation>Выравнивание</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="792"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="761"/>
|
||||
>>>>>>> develop
|
||||
<source>Top left</source>
|
||||
<translation>Верхний левый</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="797"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="766"/>
|
||||
>>>>>>> develop
|
||||
<source>Top centre</source>
|
||||
<translation>Верхний центр</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="802"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="771"/>
|
||||
>>>>>>> develop
|
||||
<source>Top right</source>
|
||||
<translation>Верхний правый</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="807"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="776"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle left</source>
|
||||
<translation>Средний левый</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="812"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="781"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle centre</source>
|
||||
<translation>Средний центральный</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="817"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="786"/>
|
||||
>>>>>>> develop
|
||||
<source>Middle right</source>
|
||||
<translation>Средний правый</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="822"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="791"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom left</source>
|
||||
<translation>Нижний левый</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="827"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="796"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom centre</source>
|
||||
<translation>Нижний центральный</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="832"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="801"/>
|
||||
>>>>>>> develop
|
||||
<source>Bottom right</source>
|
||||
<translation>Нижний правый</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="691"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="660"/>
|
||||
>>>>>>> develop
|
||||
<source>Margins (left, top, right, bottom):</source>
|
||||
<translation>Отступ (левый, Верхний, правый, Нижний):</translation>
|
||||
</message>
|
||||
@@ -366,89 +422,159 @@
|
||||
<translation>Новые</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="847"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="816"/>
|
||||
>>>>>>> develop
|
||||
<source>New indicator</source>
|
||||
<translation>Новый индикатор</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="855"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="824"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon round</source>
|
||||
<translation>Круглый значок</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="865"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="834"/>
|
||||
>>>>>>> develop
|
||||
<source>Icon star</source>
|
||||
<translation>Значок звезды</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="877"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="846"/>
|
||||
>>>>>>> develop
|
||||
<source>Shade</source>
|
||||
<translation>Оттенок</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="956"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="925"/>
|
||||
>>>>>>> develop
|
||||
<source>Special options</source>
|
||||
<translation>Специальные опции</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="962"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="931"/>
|
||||
>>>>>>> develop
|
||||
<source>API count method</source>
|
||||
<translation>Метод подсчета API</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="986"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="955"/>
|
||||
>>>>>>> develop
|
||||
<source>Apps</source>
|
||||
<translation>Программы</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="994"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="963"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<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
|
||||
<source>Arguments:</source>
|
||||
<translation>аргументы:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1035"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1004"/>
|
||||
>>>>>>> develop
|
||||
<source>Start application</source>
|
||||
<translation>Приложение при запуске</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1092"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1061"/>
|
||||
>>>>>>> develop
|
||||
<source>Mail</source>
|
||||
<translation>Письма</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1098"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1067"/>
|
||||
>>>>>>> develop
|
||||
<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
|
||||
<source>Debug</source>
|
||||
<translation>Отладка</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1141"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1110"/>
|
||||
>>>>>>> develop
|
||||
<source>Display debug window</source>
|
||||
<translation>Показывать окно отладки</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1202"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1171"/>
|
||||
>>>>>>> develop
|
||||
<source>Save</source>
|
||||
<translation>Сохранить</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../preferences.ui" line="1195"/>
|
||||
=======
|
||||
<location filename="../preferences.ui" line="1164"/>
|
||||
>>>>>>> develop
|
||||
<source>Cancel</source>
|
||||
<translation>Отменить</translation>
|
||||
</message>
|
||||
@@ -459,20 +585,35 @@
|
||||
<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>
|
||||
@@ -480,27 +621,47 @@
|
||||
<context>
|
||||
<name>SysTrayX</name>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="246"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="243"/>
|
||||
>>>>>>> develop
|
||||
<source>&Show/Hide</source>
|
||||
<translation>&Показать/Скрыть</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="250"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="247"/>
|
||||
>>>>>>> develop
|
||||
<source>&Preferences</source>
|
||||
<translation>&Настройки</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="254"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="251"/>
|
||||
>>>>>>> develop
|
||||
<source>&About</source>
|
||||
<translation>&О приложении</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="258"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="255"/>
|
||||
>>>>>>> develop
|
||||
<source>&Quit</source>
|
||||
<translation>&Выход</translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../systrayx.cpp" line="692"/>
|
||||
=======
|
||||
<location filename="../systrayx.cpp" line="689"/>
|
||||
>>>>>>> develop
|
||||
<source>Close</source>
|
||||
<translation>Закрыть</translation>
|
||||
</message>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<item row="0" column="0">
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>2</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tabWindows">
|
||||
<attribute name="title">
|
||||
|
||||
@@ -206,7 +206,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
|
||||
*/
|
||||
getPreferences();
|
||||
|
||||
/*
|
||||
|
||||
m_preferences->setBrowserVersion( "115.1.0" );
|
||||
// m_preferences->setBrowserVersion( "102.2.3" );
|
||||
slotLoadLanguage( "en-US" );
|
||||
@@ -217,7 +217,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
|
||||
slotSelectIconObject( true );
|
||||
|
||||
slotMailCount( 10, 1 );
|
||||
*/
|
||||
|
||||
// m_preferences->setStartApp( "/home/maxime/test.sh" );
|
||||
// m_preferences->setStartAppArgs( "/home/maxime/startup.txt StartupString" );
|
||||
// slotStartApp();
|
||||
|
||||
@@ -31,9 +31,6 @@ OBS_RPM_GNOME_EXT+="v53 "
|
||||
OBS_RPM_ARCHS+="15.5/x86_64 "
|
||||
OBS_RPM_PKS+="lp155 "
|
||||
OBS_RPM_GNOME_EXT+="v53 "
|
||||
OBS_RPM_ARCHS+="Fedora_36/x86_64 "
|
||||
OBS_RPM_PKS+="fed36 "
|
||||
OBS_RPM_GNOME_EXT+="v53 "
|
||||
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
||||
OBS_RPM_PKS+="fed37 "
|
||||
OBS_RPM_GNOME_EXT+="v53 "
|
||||
|
||||
@@ -23,8 +23,6 @@ OBS_RPM_ARCHS+="15.4/x86_64 "
|
||||
OBS_RPM_PKS+="lp154 "
|
||||
OBS_RPM_ARCHS+="15.5/x86_64 "
|
||||
OBS_RPM_PKS+="lp155 "
|
||||
OBS_RPM_ARCHS+="Fedora_36/x86_64 "
|
||||
OBS_RPM_PKS+="fed36 "
|
||||
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
||||
OBS_RPM_PKS+="fed37 "
|
||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||
|
||||
@@ -23,8 +23,6 @@ OBS_RPM_ARCHS+="15.4/x86_64 "
|
||||
OBS_RPM_PKS+="lp154 "
|
||||
OBS_RPM_ARCHS+="15.5/x86_64 "
|
||||
OBS_RPM_PKS+="lp155 "
|
||||
OBS_RPM_ARCHS+="Fedora_36/x86_64 "
|
||||
OBS_RPM_PKS+="fed36 "
|
||||
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
||||
OBS_RPM_PKS+="fed37 "
|
||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||
|
||||
@@ -31,9 +31,6 @@ OBS_RPM_GNOME_EXT+="v53 "
|
||||
OBS_RPM_ARCHS+="15.5/x86_64 "
|
||||
OBS_RPM_PKS+="lp155 "
|
||||
OBS_RPM_GNOME_EXT+="v53 "
|
||||
OBS_RPM_ARCHS+="Fedora_36/x86_64 "
|
||||
OBS_RPM_PKS+="fed36 "
|
||||
OBS_RPM_GNOME_EXT+="v53 "
|
||||
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
||||
OBS_RPM_PKS+="fed37 "
|
||||
OBS_RPM_GNOME_EXT+="v53 "
|
||||
|
||||
@@ -23,8 +23,6 @@ OBS_RPM_ARCHS+="15.4/x86_64 "
|
||||
OBS_RPM_PKS+="lp154 "
|
||||
OBS_RPM_ARCHS+="15.5/x86_64 "
|
||||
OBS_RPM_PKS+="lp155 "
|
||||
OBS_RPM_ARCHS+="Fedora_36/x86_64 "
|
||||
OBS_RPM_PKS+="fed36 "
|
||||
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
||||
OBS_RPM_PKS+="fed37 "
|
||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||
|
||||
@@ -23,8 +23,6 @@ OBS_RPM_ARCHS+="15.4/x86_64 "
|
||||
OBS_RPM_PKS+="lp154 "
|
||||
OBS_RPM_ARCHS+="15.5/x86_64 "
|
||||
OBS_RPM_PKS+="lp155 "
|
||||
OBS_RPM_ARCHS+="Fedora_36/x86_64 "
|
||||
OBS_RPM_PKS+="fed36 "
|
||||
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
||||
OBS_RPM_PKS+="fed37 "
|
||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||
|
||||
Reference in New Issue
Block a user