diff --git a/app/SysTray-X/SysTray-X.pro b/app/SysTray-X/SysTray-X.pro index 82296b7..b2d9ecc 100644 --- a/app/SysTray-X/SysTray-X.pro +++ b/app/SysTray-X/SysTray-X.pro @@ -33,22 +33,22 @@ TEMPLATE = app # Translations # TRANSLATIONS = \ - languages/$${TARGET}.en_US.ts \ + languages/$${TARGET}.en-US.ts \ languages/$${TARGET}.bg.ts \ languages/$${TARGET}.de.ts \ languages/$${TARGET}.el.ts \ - languages/$${TARGET}.es_AR.ts \ + languages/$${TARGET}.es-AR.ts \ languages/$${TARGET}.fr.ts \ languages/$${TARGET}.hr.ts \ languages/$${TARGET}.it.ts \ languages/$${TARGET}.nl.ts \ languages/$${TARGET}.pl.ts \ - languages/$${TARGET}.pt_BR.ts \ - languages/$${TARGET}.ru_RU.ts \ + languages/$${TARGET}.pt-BR.ts \ + languages/$${TARGET}.ru.ts \ languages/$${TARGET}.sk.ts \ languages/$${TARGET}.uk.ts \ - languages/$${TARGET}.zh_CN.ts \ - languages/$${TARGET}.zh_TW.ts + languages/$${TARGET}.zh-CN.ts \ + languages/$${TARGET}.zh-TW.ts # The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings diff --git a/app/SysTray-X/SysTray-X.qrc b/app/SysTray-X/SysTray-X.qrc index 772fdd2..00f0cd2 100644 --- a/app/SysTray-X/SysTray-X.qrc +++ b/app/SysTray-X/SysTray-X.qrc @@ -12,20 +12,21 @@ files/icons/mail-unread.png files/icons/help-about.png files/icons/dialog-warning.png - languages/SysTray-X.en_US.qm languages/SysTray-X.nl.qm languages/SysTray-X.bg.qm languages/SysTray-X.de.qm - languages/SysTray-X.es_AR.qm languages/SysTray-X.fr.qm languages/SysTray-X.hr.qm languages/SysTray-X.it.qm languages/SysTray-X.pl.qm - languages/SysTray-X.pt_BR.qm - languages/SysTray-X.ru_RU.qm languages/SysTray-X.sk.qm languages/SysTray-X.uk.qm - languages/SysTray-X.zh_CN.qm - languages/SysTray-X.zh_TW.qm + languages/SysTray-X.ru.qm + languages/SysTray-X.en-US.qm + languages/SysTray-X.es-AR.qm + languages/SysTray-X.pt-BR.qm + languages/SysTray-X.pt-BR.ts + languages/SysTray-X.zh-CN.qm + languages/SysTray-X.zh-TW.qm diff --git a/app/SysTray-X/languages/SysTray-X.bg.ts b/app/SysTray-X/languages/SysTray-X.bg.ts index 7676915..c86960f 100644 --- a/app/SysTray-X/languages/SysTray-X.bg.ts +++ b/app/SysTray-X/languages/SysTray-X.bg.ts @@ -112,13 +112,13 @@ - + Custom icon - + Choose @@ -133,107 +133,107 @@ - + Blank icon - + New mail icon - + No icon - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 1 - + Minimize to tray, method 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window @@ -244,14 +244,24 @@ - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.de.qm b/app/SysTray-X/languages/SysTray-X.de.qm index 64757b8..9813ee0 100644 Binary files a/app/SysTray-X/languages/SysTray-X.de.qm and b/app/SysTray-X/languages/SysTray-X.de.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.de.ts b/app/SysTray-X/languages/SysTray-X.de.ts index 44fce2f..b58bc5e 100644 --- a/app/SysTray-X/languages/SysTray-X.de.ts +++ b/app/SysTray-X/languages/SysTray-X.de.ts @@ -112,13 +112,13 @@ - + Custom icon Benutzerdefiniert Symbol - + Choose Wählen @@ -133,67 +133,67 @@ E-Mail-Benachrichtigung Symbol - + Blank icon Leeres Symbol - + New mail icon Neue Nachricht Symbol - + No icon Kein Symbol - + Windows Fenster - + Close Schließen - + Minimize Minimieren - + Default minimize Standard Minimieren - + Minimize to tray, method 1 In Systemleiste verbergen, Methode 1 - + Minimize to tray, method 2 In Systemleiste verbergen, Methode 2 - + Default close Standard Schließen - + Minimize main, close children Hauptfenster minimieren, Kinderfenster schließen - + Minimize all windows Alle Fenster minimieren - + Start application minimized Anwendung minimiert starten @@ -202,52 +202,54 @@ Beim Fensterschließen, Minimieren - + Number properties Nummereigenschaften - + Display unread message count Anzahl neuer Nachrichten anzeigen - + Number color Nummerfarbe - + Number size Nummergröße - + Count type E-Mail-Benachrichtigungstyp - + Unread Ungelesene Nachrichten - + New Neue Nachrichten - + Display debug window Debug-Fenster anzeigen + Save - Speichern + Speichern + Cancel - Annullieren + Annullieren @@ -256,14 +258,14 @@ Hauptfenster minimieren - - + + Open Image Bild öffnen - - + + Image Files (*.png *.jpg *.bmp) Bilddateien (*.png *.jpg *.bmp) @@ -271,27 +273,27 @@ SysTrayX - + &Show/Hide &Anzeigen/Verbergen - + &Preferences &Einstellungen - + &About &Über - + &Quit &Beenden - + Close Schließen diff --git a/app/SysTray-X/languages/SysTray-X.el.ts b/app/SysTray-X/languages/SysTray-X.el.ts index dec5bfd..738fa35 100644 --- a/app/SysTray-X/languages/SysTray-X.el.ts +++ b/app/SysTray-X/languages/SysTray-X.el.ts @@ -112,13 +112,13 @@ - + Custom icon Προσαρμοσμένο εικονίδιο - + Choose Επιλέξτε @@ -133,107 +133,107 @@ Εικονίδιο μη-αναγνωσμένης αλληλογραφίας - + Blank icon Κενό εικονίδιο - + New mail icon Εικονίδιο νέας αλληλογραφίας - + No icon Χωρίς εικονίδιο - + Windows Παράθυρα - + Minimize Ελαχιστοποίηση - + Default minimize Προεπιλεγμένη ελαχιστοποίηση - + Minimize to tray, method 1 Μέθοδος 1 - + Minimize to tray, method 2 Μέθοδος 2 - + Close Κλείσιμο - + Default close Προεπιλεγμένο κλείσιμο - + Minimize main, close children Ελαχιστοποίηση κυρίως παραθύρου, κλείσιμο θυγατρικών - + Minimize all windows Ελαχιστοποίηση όλων των παραθύρων - + Start application minimized Ελαχιστοποιημένη εκκίνηση της εφαρμογής - + Number properties Αριθμός - + Display unread message count Προβολή μετρητή μη-αναγνωσμένης αλληλογραφίας - + Number color Χρώμα μετρητή: - + Number size Μέγεθος μετρητή: - + Count type Τύπος μετρητή μηνυμάτων - + Unread Μη αναγνωσμένα - + New Νέα - + Display debug window Προβολή παραθύρου αποσφαλμάτωσης @@ -244,14 +244,24 @@ Ελαχιστοποίηση στην περιοχή ειδοποιήσεων - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close Κλείσιμο diff --git a/app/SysTray-X/languages/SysTray-X.en_US.qm b/app/SysTray-X/languages/SysTray-X.en-US.qm similarity index 73% rename from app/SysTray-X/languages/SysTray-X.en_US.qm rename to app/SysTray-X/languages/SysTray-X.en-US.qm index 3068509..ee83c9d 100644 Binary files a/app/SysTray-X/languages/SysTray-X.en_US.qm and b/app/SysTray-X/languages/SysTray-X.en-US.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.en_US.ts b/app/SysTray-X/languages/SysTray-X.en-US.ts similarity index 82% rename from app/SysTray-X/languages/SysTray-X.en_US.ts rename to app/SysTray-X/languages/SysTray-X.en-US.ts index c84aaad..7b5470e 100644 --- a/app/SysTray-X/languages/SysTray-X.en_US.ts +++ b/app/SysTray-X/languages/SysTray-X.en-US.ts @@ -116,13 +116,13 @@ - + Custom icon Custom icon - + Choose Choose @@ -137,67 +137,67 @@ Mail notification icon - + Blank icon Blank icon - + New mail icon New mail icon - + No icon No icon - + Windows Windows - + Close Close - + Minimize Minimize - + Default minimize Default minimize - + Minimize to tray, method 1 Minimize to tray, method 1 - + Minimize to tray, method 2 Minimize to tray, method 2 - + Default close Default close - + Minimize main, close children Minimize main, close children - + Minimize all windows Minimize all windows - + Start application minimized Start application minimized @@ -206,52 +206,54 @@ Minimize on close - + Number properties Number properties - + Display unread message count Display unread message count - + Number color Number color - + Number size Number size - + Count type Count type - + Unread Unread - + New New - + Display debug window Display debug window + Save - Save + Save + Cancel - Cancel + Cancel @@ -260,14 +262,14 @@ Minimize to tray - - + + Open Image Open Image - - + + Image Files (*.png *.jpg *.bmp) Image Files (*.png *.jpg *.bmp) @@ -275,27 +277,27 @@ SysTrayX - + &Show/Hide &Show/Hide - + &Preferences &Preferences - + &About &About - + &Quit &Quit - + Close Close diff --git a/app/SysTray-X/languages/SysTray-X.es_AR.qm b/app/SysTray-X/languages/SysTray-X.es-AR.qm similarity index 100% rename from app/SysTray-X/languages/SysTray-X.es_AR.qm rename to app/SysTray-X/languages/SysTray-X.es-AR.qm diff --git a/app/SysTray-X/languages/SysTray-X.es_AR.ts b/app/SysTray-X/languages/SysTray-X.es-AR.ts similarity index 80% rename from app/SysTray-X/languages/SysTray-X.es_AR.ts rename to app/SysTray-X/languages/SysTray-X.es-AR.ts index 2fef294..a07c022 100644 --- a/app/SysTray-X/languages/SysTray-X.es_AR.ts +++ b/app/SysTray-X/languages/SysTray-X.es-AR.ts @@ -112,13 +112,13 @@ - + Custom icon - + Choose @@ -133,107 +133,107 @@ - + Blank icon - + New mail icon - + No icon - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 1 - + Minimize to tray, method 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window @@ -244,14 +244,24 @@ - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.fr.ts b/app/SysTray-X/languages/SysTray-X.fr.ts index 56a74f3..fd00627 100644 --- a/app/SysTray-X/languages/SysTray-X.fr.ts +++ b/app/SysTray-X/languages/SysTray-X.fr.ts @@ -112,13 +112,13 @@ - + Custom icon - + Choose @@ -133,107 +133,107 @@ - + Blank icon - + New mail icon - + No icon - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 1 - + Minimize to tray, method 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window @@ -244,14 +244,24 @@ - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.hr.ts b/app/SysTray-X/languages/SysTray-X.hr.ts index 5ea66d5..c9def59 100644 --- a/app/SysTray-X/languages/SysTray-X.hr.ts +++ b/app/SysTray-X/languages/SysTray-X.hr.ts @@ -112,13 +112,13 @@ - + Custom icon - + Choose @@ -133,107 +133,107 @@ - + Blank icon - + New mail icon - + No icon - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 1 - + Minimize to tray, method 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window @@ -244,14 +244,24 @@ - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.it.ts b/app/SysTray-X/languages/SysTray-X.it.ts index a7d4b3f..f8e618f 100644 --- a/app/SysTray-X/languages/SysTray-X.it.ts +++ b/app/SysTray-X/languages/SysTray-X.it.ts @@ -113,13 +113,13 @@ - + Custom icon Icona personalizzata - + Choose Scegli @@ -134,107 +134,107 @@ Icona notifica posta - + Blank icon Icona vuota - + New mail icon Icona nuova posta - + No icon Nessuna icona - + Windows Finestre - + Minimize Minimizza - + Close Chiudi - + Default minimize Minimizzazione predefinita - + Minimize to tray, method 1 Minimizza nel vassoio, metodo 1 - + Minimize to tray, method 2 Minimizza nel vassoio, metodo 2 - + Default close Chiusura predefinita - + Minimize main, close children Minimizza principale, chiudi sottofinestre - + Minimize all windows Minimizza tutte le finestre - + Start application minimized Avvia applicazione minimizzata - + Number properties Proprietà numero - + Display unread message count Mostra numero di messaggi non letti - + Number color Colore numero - + Number size Dimensione numero - + Count type Tipo conteggio - + Unread Non letti - + New Nuovi - + Display debug window Mostra finestra di debug @@ -245,14 +245,24 @@ Minimizza nel vassoio - - + + Save + + + + + Cancel + + + + + Open Image Apri immagine - - + + Image Files (*.png *.jpg *.bmp) File immagine (*.png *.jpg *.bmp) @@ -260,27 +270,27 @@ SysTrayX - + &Show/Hide &Mostra/Nascondi - + &Preferences &Preferenze - + &About &Informazioni - + &Quit &Esci - + Close Chiudi diff --git a/app/SysTray-X/languages/SysTray-X.nl.qm b/app/SysTray-X/languages/SysTray-X.nl.qm index 0e3a052..88ff0a1 100644 Binary files a/app/SysTray-X/languages/SysTray-X.nl.qm and b/app/SysTray-X/languages/SysTray-X.nl.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.nl.ts b/app/SysTray-X/languages/SysTray-X.nl.ts index 221713e..ed6005f 100644 --- a/app/SysTray-X/languages/SysTray-X.nl.ts +++ b/app/SysTray-X/languages/SysTray-X.nl.ts @@ -116,13 +116,13 @@ - + Custom icon Aangepast pictogram - + Choose Kies @@ -137,67 +137,67 @@ Berichten notificatie pictogram - + Blank icon Leeg pictogram - + New mail icon Nieuw bericht pictogram - + No icon Geen pictogram - + Windows Vensters - + Close Sluiten - + Minimize Minimaliseren - + Default minimize Standaard minimalisatie - + Minimize to tray, method 1 Minimaliseer naar systeemvak, methode 1 - + Minimize to tray, method 2 Minimaliseer naar systeemvak, methode 2 - + Default close Standaard sluiting - + Minimize main, close children Minimaliseer hoofdvenster, sluit kindvensters - + Minimize all windows Minimaliseer alle vensters - + Start application minimized Start programma geminimaliseerd @@ -206,52 +206,54 @@ Minimaliseren bij sluiten - + Number properties Nummer opties - + Display unread message count Aantal ongelezen berichten weergeven - + Number color Nummer kleur - + Number size Nummer grootte - + Count type Type berichttelling - + Unread Ongelezen - + New Nieuw - + Display debug window Toon debug venster + Save - Bewaren + Bewaren + Cancel - Annnuleren + Annnuleren @@ -260,14 +262,14 @@ Minimaliseer naar systeemvak - - + + Open Image Open afbeelding - - + + Image Files (*.png *.jpg *.bmp) Afbeeldingsbestanden (*.png *.jpg *.bmp) @@ -275,27 +277,27 @@ SysTrayX - + &Show/Hide &Tonen/Verbergen - + &Preferences &Opties - + &About O&ver - + &Quit &Afsluiten - + Close Sluiten diff --git a/app/SysTray-X/languages/SysTray-X.pl.ts b/app/SysTray-X/languages/SysTray-X.pl.ts index 93ccb29..3f5502f 100644 --- a/app/SysTray-X/languages/SysTray-X.pl.ts +++ b/app/SysTray-X/languages/SysTray-X.pl.ts @@ -112,13 +112,13 @@ - + Custom icon - + Choose @@ -133,107 +133,107 @@ - + Blank icon - + New mail icon - + No icon - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 1 - + Minimize to tray, method 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window @@ -244,14 +244,24 @@ - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.pt_BR.qm b/app/SysTray-X/languages/SysTray-X.pt-BR.qm similarity index 52% rename from app/SysTray-X/languages/SysTray-X.pt_BR.qm rename to app/SysTray-X/languages/SysTray-X.pt-BR.qm index ed6d6c7..ca8babf 100644 Binary files a/app/SysTray-X/languages/SysTray-X.pt_BR.qm and b/app/SysTray-X/languages/SysTray-X.pt-BR.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.pt_BR.ts b/app/SysTray-X/languages/SysTray-X.pt-BR.ts similarity index 82% rename from app/SysTray-X/languages/SysTray-X.pt_BR.ts rename to app/SysTray-X/languages/SysTray-X.pt-BR.ts index f31bf07..2be05a0 100644 --- a/app/SysTray-X/languages/SysTray-X.pt_BR.ts +++ b/app/SysTray-X/languages/SysTray-X.pt-BR.ts @@ -114,13 +114,13 @@ - + Custom icon Ícone personalizado - + Choose Escolher @@ -135,69 +135,69 @@ Ícone de notificação - + Blank icon Ícone branco - + New mail icon Ícone de novo e-mail - + No icon Nenhum ícone - + Windows Janela - + Close Fechar - + Minimize Miminizar - + Default minimize Comportamento padrão - + Minimize to tray, method 1 Minimizar para à área de notificações? (muito grande) Minimizar para a tray, método 1 - + Minimize to tray, method 2 Minimizar para à área de notificações? (muito grande) Minimizar para a tray, método 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized Iniciar aplicação minimizada @@ -206,52 +206,54 @@ Minimizar ao fechar - + Number properties Propriedades do número - + Display unread message count Exibir contador de mensagens não lidas - + Number color Cor do número - + Number size Tamanho do número - + Count type Tipo do contador - + Unread Não lidos - + New Novos - + Display debug window Mostrar janela de depuração + Save - Salvar + Salvar + Cancel - Cancelar + Cancelar @@ -260,14 +262,14 @@ - - + + Open Image Abrir imagem - - + + Image Files (*.png *.jpg *.bmp) Arquivo de imagem (*.png *.jpg *.bmp) @@ -275,27 +277,27 @@ SysTrayX - + &Show/Hide &Exibir/Ocultar - + &Preferences &Preferências - + &About &Sobre - + &Quit &Sair - + Close Fechar diff --git a/app/SysTray-X/languages/SysTray-X.ru_RU.qm b/app/SysTray-X/languages/SysTray-X.ru.qm similarity index 72% rename from app/SysTray-X/languages/SysTray-X.ru_RU.qm rename to app/SysTray-X/languages/SysTray-X.ru.qm index 58414a0..7c296bc 100644 Binary files a/app/SysTray-X/languages/SysTray-X.ru_RU.qm and b/app/SysTray-X/languages/SysTray-X.ru.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.ru_RU.ts b/app/SysTray-X/languages/SysTray-X.ru.ts similarity index 83% rename from app/SysTray-X/languages/SysTray-X.ru_RU.ts rename to app/SysTray-X/languages/SysTray-X.ru.ts index 1c4cb2d..66e618d 100644 --- a/app/SysTray-X/languages/SysTray-X.ru_RU.ts +++ b/app/SysTray-X/languages/SysTray-X.ru.ts @@ -113,13 +113,13 @@ - + Custom icon Своя иконка - + Choose Выбрать @@ -134,68 +134,68 @@ Иконка уведомления - + Blank icon Пустая иконка (квадрат) - + New mail icon Иконка "Новые письма" - + No icon Без иконки (только цифры) - + Windows Окна - + Close При закрытии - + Minimize Свернуть - + Default minimize Need documentation what methods do... Свернуть окно - + Minimize to tray, method 1 Свернуть в трей, вариант 1 - + Minimize to tray, method 2 Свернуть в трей, вариант 2 - + Default close Закрыть - + Minimize main, close children Свернуть главное окно, закрыть другие - + Minimize all windows Свернуть все окна - + Start application minimized Запуск приложения свернутым @@ -204,52 +204,54 @@ Сворачивать при закрытии - + Number properties Настройки индикатора кол-ва - + Display unread message count Показывать кол-во непрочитанных писем - + Number color Цвет шрифта - + Number size Размер шрифта - + Count type Вариант подсчета - + Unread Непрочитанные - + New Новые - + Display debug window Показать окно отладки + Save - Сохранить + Сохранить + Cancel - Отменить + Отменить @@ -258,14 +260,14 @@ Свернуть в трей - - + + Open Image Открыть изображение - - + + Image Files (*.png *.jpg *.bmp) Файлы изображений (*.png *.jpg *.bmp @@ -273,28 +275,28 @@ SysTrayX - + &Show/Hide Not sure how hotkeys work Показать/Скр&ыть - + &Preferences Настройки - + &About О приложении - + &Quit Выход - + Close Закрыть diff --git a/app/SysTray-X/languages/SysTray-X.sk.ts b/app/SysTray-X/languages/SysTray-X.sk.ts index aab3ed0..4d8c2b8 100644 --- a/app/SysTray-X/languages/SysTray-X.sk.ts +++ b/app/SysTray-X/languages/SysTray-X.sk.ts @@ -112,13 +112,13 @@ - + Custom icon - + Choose @@ -133,107 +133,107 @@ - + Blank icon - + New mail icon - + No icon - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 1 - + Minimize to tray, method 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window @@ -244,14 +244,24 @@ - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.uk.ts b/app/SysTray-X/languages/SysTray-X.uk.ts index c827f64..3853cfb 100644 --- a/app/SysTray-X/languages/SysTray-X.uk.ts +++ b/app/SysTray-X/languages/SysTray-X.uk.ts @@ -112,13 +112,13 @@ - + Custom icon - + Choose @@ -133,107 +133,107 @@ - + Blank icon - + New mail icon - + No icon - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 1 - + Minimize to tray, method 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window @@ -244,14 +244,24 @@ - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.zh_CN.qm b/app/SysTray-X/languages/SysTray-X.zh-CN.qm similarity index 100% rename from app/SysTray-X/languages/SysTray-X.zh_CN.qm rename to app/SysTray-X/languages/SysTray-X.zh-CN.qm diff --git a/app/SysTray-X/languages/SysTray-X.zh_CN.ts b/app/SysTray-X/languages/SysTray-X.zh-CN.ts similarity index 80% rename from app/SysTray-X/languages/SysTray-X.zh_CN.ts rename to app/SysTray-X/languages/SysTray-X.zh-CN.ts index ef649a4..7cb667c 100644 --- a/app/SysTray-X/languages/SysTray-X.zh_CN.ts +++ b/app/SysTray-X/languages/SysTray-X.zh-CN.ts @@ -112,13 +112,13 @@ - + Custom icon - + Choose @@ -133,107 +133,107 @@ - + Blank icon - + New mail icon - + No icon - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 1 - + Minimize to tray, method 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window @@ -244,14 +244,24 @@ - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.zh_TW.qm b/app/SysTray-X/languages/SysTray-X.zh-TW.qm similarity index 100% rename from app/SysTray-X/languages/SysTray-X.zh_TW.qm rename to app/SysTray-X/languages/SysTray-X.zh-TW.qm diff --git a/app/SysTray-X/languages/SysTray-X.zh_TW.ts b/app/SysTray-X/languages/SysTray-X.zh-TW.ts similarity index 80% rename from app/SysTray-X/languages/SysTray-X.zh_TW.ts rename to app/SysTray-X/languages/SysTray-X.zh-TW.ts index 66927ab..183e96a 100644 --- a/app/SysTray-X/languages/SysTray-X.zh_TW.ts +++ b/app/SysTray-X/languages/SysTray-X.zh-TW.ts @@ -112,13 +112,13 @@ - + Custom icon - + Choose @@ -133,107 +133,107 @@ - + Blank icon - + New mail icon - + No icon - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 1 - + Minimize to tray, method 2 - + Default close - + Minimize main, close children - + Minimize all windows - + Start application minimized - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window @@ -244,14 +244,24 @@ - - + + Save + + + + + Cancel + + + + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -259,27 +269,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/preferences.ui b/app/SysTray-X/preferences.ui index 5824576..3280d86 100644 --- a/app/SysTray-X/preferences.ui +++ b/app/SysTray-X/preferences.ui @@ -7,7 +7,7 @@ 0 0 511 - 640 + 666 @@ -112,6 +112,19 @@ Mail notification icon + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -292,7 +305,7 @@ - Minimize to tray, method 1 + Minimize to tray true @@ -516,7 +529,7 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Cancel|QDialogButtonBox::Save @@ -546,10 +559,10 @@ - - - + + + diff --git a/app/SysTray-X/preferencesdialog.cpp b/app/SysTray-X/preferencesdialog.cpp index de8882c..b835943 100644 --- a/app/SysTray-X/preferencesdialog.cpp +++ b/app/SysTray-X/preferencesdialog.cpp @@ -44,10 +44,14 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi m_ui->minimizeTypeGroup->setId( m_ui->minimizeMethod1RadioButton, Preferences::PREF_MINIMIZE_METHOD_1 ); m_ui->minimizeTypeGroup->setId( m_ui->minimizeMethod2RadioButton, Preferences::PREF_MINIMIZE_METHOD_2 ); + m_ui->minimizeMethod2RadioButton->hide(); + #ifdef Q_OS_WIN +#ifdef OBSOLETE m_ui->minimizeMethod1RadioButton->setText( tr( "Minimize to tray" ) ); m_ui->minimizeMethod2RadioButton->hide(); +#endif m_ui->hideDefaultIconCheckBox->hide(); @@ -55,8 +59,10 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi #ifdef Q_OS_LINUX +#ifdef OBSOLETE m_ui->minimizeMethod1RadioButton->setText( tr( "Minimize to tray" ) ); m_ui->minimizeMethod2RadioButton->hide(); +#endif #endif @@ -100,6 +106,12 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi m_ui->defaultIconTypeGroup->setId( m_ui->lookThroughDefaultIconRadioButton, Preferences::PREF_DEFAULT_ICON_HIDE ); m_ui->defaultIconTypeGroup->setId( m_ui->customDefaultIconRadioButton, Preferences::PREF_DEFAULT_ICON_CUSTOM ); + /* + * Translate the buttonbox + */ + m_ui->buttonBox->button( QDialogButtonBox::Save )->setText( tr( "Save" ) ); + m_ui->buttonBox->button( QDialogButtonBox::Cancel )->setText( tr( "Cancel" ) ); + /* * Set icon type defaults */ diff --git a/app/SysTray-X/systrayx.cpp b/app/SysTray-X/systrayx.cpp index 7306c0c..3f389cd 100644 --- a/app/SysTray-X/systrayx.cpp +++ b/app/SysTray-X/systrayx.cpp @@ -164,8 +164,11 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) getPreferences(); /* + //slotLoadLanguage( "en-US" ); + //slotLoadLanguage( "it" ); slotLoadLanguage( "nl" ); - //slotLoadLanguage( "en_US" ); + //slotLoadLanguage( "pt-BR" ); + //slotLoadLanguage( "ru" ); slotSelectIconObject( false ); */ } diff --git a/webext/_locales/en_US/messages.json b/webext/_locales/en-US/messages.json similarity index 100% rename from webext/_locales/en_US/messages.json rename to webext/_locales/en-US/messages.json diff --git a/webext/_locales/pt_BR/messages.json b/webext/_locales/pt-BR/messages.json similarity index 100% rename from webext/_locales/pt_BR/messages.json rename to webext/_locales/pt-BR/messages.json diff --git a/webext/_locales/ru_RU/messages.json b/webext/_locales/ru/messages.json similarity index 100% rename from webext/_locales/ru_RU/messages.json rename to webext/_locales/ru/messages.json