diff --git a/app/SysTray-X/languages/SysTray-X.bg.ts b/app/SysTray-X/languages/SysTray-X.bg.ts index 1c55118..07b45bf 100644 --- a/app/SysTray-X/languages/SysTray-X.bg.ts +++ b/app/SysTray-X/languages/SysTray-X.bg.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,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 5b9bbca..64757b8 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 1c42f44..0ab85b8 100644 --- a/app/SysTray-X/languages/SysTray-X.de.ts +++ b/app/SysTray-X/languages/SysTray-X.de.ts @@ -152,6 +152,11 @@ Windows Fenster + + + Close + Schließen + Minimize @@ -173,74 +178,92 @@ 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 - Minimize on close - Beim Fensterschließen, Minimieren + 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 - - + + + Minimize to tray + Hauptfenster minimieren + + + + Open Image Bild öffnen - - + + Image Files (*.png *.jpg *.bmp) Bilddateien (*.png *.jpg *.bmp) @@ -248,27 +271,27 @@ SysTrayX - + &Show/Hide &Anzeigen/Verbergen - + &Preferences &Einstellungen - + &About &Über - + &Quit &Beenden - + Close Schließen diff --git a/app/SysTray-X/languages/SysTray-X.en_US.qm b/app/SysTray-X/languages/SysTray-X.en_US.qm index f633bc9..3068509 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 index 668e1d2..962696b 100644 --- a/app/SysTray-X/languages/SysTray-X.en_US.ts +++ b/app/SysTray-X/languages/SysTray-X.en_US.ts @@ -156,6 +156,11 @@ Windows Windows + + + Close + Close + Minimize @@ -177,74 +182,92 @@ 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 - Minimize on close - Minimize on close + 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 - - + + + Minimize to tray + Minimize to tray + + + + Open Image Open Image - - + + Image Files (*.png *.jpg *.bmp) Image Files (*.png *.jpg *.bmp) @@ -252,27 +275,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.ts b/app/SysTray-X/languages/SysTray-X.es_AR.ts index 0cf9829..efc527b 100644 --- a/app/SysTray-X/languages/SysTray-X.es_AR.ts +++ b/app/SysTray-X/languages/SysTray-X.es_AR.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,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 c1160a8..8bdc0fa 100644 --- a/app/SysTray-X/languages/SysTray-X.fr.ts +++ b/app/SysTray-X/languages/SysTray-X.fr.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,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 d0dde71..be4cd31 100644 --- a/app/SysTray-X/languages/SysTray-X.hr.ts +++ b/app/SysTray-X/languages/SysTray-X.hr.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,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 1fd4a4e..8f58ccd 100644 --- a/app/SysTray-X/languages/SysTray-X.it.ts +++ b/app/SysTray-X/languages/SysTray-X.it.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.nl.qm b/app/SysTray-X/languages/SysTray-X.nl.qm index 04369b2..0e3a052 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 4d17c12..332b742 100644 --- a/app/SysTray-X/languages/SysTray-X.nl.ts +++ b/app/SysTray-X/languages/SysTray-X.nl.ts @@ -156,6 +156,11 @@ Windows Vensters + + + Close + Sluiten + Minimize @@ -177,74 +182,92 @@ 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 - Minimize on close - Minimaliseren bij sluiten + 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 - - + + + Minimize to tray + Minimaliseer naar systeemvak + + + + Open Image Open afbeelding - - + + Image Files (*.png *.jpg *.bmp) Afbeeldingsbestanden (*.png *.jpg *.bmp) @@ -252,27 +275,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 dff1d99..e178fa4 100644 --- a/app/SysTray-X/languages/SysTray-X.pl.ts +++ b/app/SysTray-X/languages/SysTray-X.pl.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.pt_BR.ts b/app/SysTray-X/languages/SysTray-X.pt_BR.ts index 67d78ee..15dd0d7 100644 --- a/app/SysTray-X/languages/SysTray-X.pt_BR.ts +++ b/app/SysTray-X/languages/SysTray-X.pt_BR.ts @@ -154,6 +154,11 @@ Windows Janela + + + Close + Fechar + Minimize @@ -177,74 +182,92 @@ Minimizar para a tray, método 2 - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized Iniciar aplicação minimizada - Minimize on close - Minimizar ao fechar + 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 - - + + + Minimize to tray + + + + + Open Image Abrir imagem - - + + Image Files (*.png *.jpg *.bmp) Arquivo de imagem (*.png *.jpg *.bmp) @@ -252,27 +275,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.ts b/app/SysTray-X/languages/SysTray-X.ru_RU.ts index e3f3f97..83822ac 100644 --- a/app/SysTray-X/languages/SysTray-X.ru_RU.ts +++ b/app/SysTray-X/languages/SysTray-X.ru_RU.ts @@ -153,6 +153,11 @@ Windows Окна + + + Close + Закрыть + Minimize @@ -175,74 +180,92 @@ Свернуть в трей, вариант 2 - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized Запуск приложения свернутым - Minimize on close - Сворачивать при закрытии + Сворачивать при закрытии - + Number properties Настройки индикатора кол-ва - + Display unread message count Показывать кол-во непрочитанных писем - + Number color Цвет шрифта - + Number size Размер шрифта - + Count type Вариант подсчета - + Unread Непрочитанные - + New Новые - + Display debug window Показать окно отладки - Save - Сохранить + Сохранить - Cancel - Отменить + Отменить - - + + + Minimize to tray + + + + + Open Image Открыть изображение - - + + Image Files (*.png *.jpg *.bmp) Файлы изображений (*.png *.jpg *.bmp @@ -250,28 +273,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 dff948c..5da0eef 100644 --- a/app/SysTray-X/languages/SysTray-X.sk.ts +++ b/app/SysTray-X/languages/SysTray-X.sk.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,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 8a726b5..89b67d6 100644 --- a/app/SysTray-X/languages/SysTray-X.uk.ts +++ b/app/SysTray-X/languages/SysTray-X.uk.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.zh_CN.ts b/app/SysTray-X/languages/SysTray-X.zh_CN.ts index 054ac58..c5eb2d1 100644 --- a/app/SysTray-X/languages/SysTray-X.zh_CN.ts +++ b/app/SysTray-X/languages/SysTray-X.zh_CN.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.zh_TW.ts b/app/SysTray-X/languages/SysTray-X.zh_TW.ts index 741dfd5..6b612ee 100644 --- a/app/SysTray-X/languages/SysTray-X.zh_TW.ts +++ b/app/SysTray-X/languages/SysTray-X.zh_TW.ts @@ -157,6 +157,11 @@ Minimize + + + Close + + Default minimize @@ -173,74 +178,80 @@ - + + Default close + + + + + Minimize main, close children + + + + + Minimize all windows + + + + Start application minimized - - Minimize on close - - - - + Number properties - + Display unread message count - + Number color - + Number size - + Count type - + Unread - + New - + Display debug window - - Save + + + Minimize to tray - - Cancel - - - - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -248,27 +259,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/preferences.ui b/app/SysTray-X/preferences.ui index af30a2f..b1d9c3c 100644 --- a/app/SysTray-X/preferences.ui +++ b/app/SysTray-X/preferences.ui @@ -271,7 +271,7 @@ - Minimize action + Minimize @@ -320,9 +320,22 @@ - Close action + Close + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -546,10 +559,10 @@ - - - + + + diff --git a/app/SysTray-X/preferencesdialog.cpp b/app/SysTray-X/preferencesdialog.cpp index 1bd6a58..69fa1b7 100644 --- a/app/SysTray-X/preferencesdialog.cpp +++ b/app/SysTray-X/preferencesdialog.cpp @@ -46,7 +46,7 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi #ifdef Q_OS_WIN - m_ui->minimizeMethod1RadioButton->setText( "Minimize to tray" ); + m_ui->minimizeMethod1RadioButton->setText( tr( "Minimize to tray" ) ); m_ui->minimizeMethod2RadioButton->hide(); m_ui->hideDefaultIconCheckBox->hide(); @@ -55,7 +55,7 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi #ifdef Q_OS_LINUX - m_ui->minimizeMethod1RadioButton->setText( "Minimize to tray" ); + m_ui->minimizeMethod1RadioButton->setText( tr( "Minimize to tray" ) ); m_ui->minimizeMethod2RadioButton->hide(); #endif @@ -111,8 +111,8 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi */ connect( m_ui->chooseCustomDefaultIconButton, &QPushButton::clicked, this, &PreferencesDialog::slotDefaultFileSelect ); connect( m_ui->chooseCustomButton, &QPushButton::clicked, this, &PreferencesDialog::slotFileSelect ); - connect( m_ui->savePushButton, &QPushButton::clicked, this, &PreferencesDialog::slotAccept ); - connect( m_ui->cancelPushButton, &QPushButton::clicked, this, &PreferencesDialog::slotReject ); + connect( m_ui->buttonBox, &QDialogButtonBox::accepted, this, &PreferencesDialog::slotAccept ); + connect( m_ui->buttonBox, &QDialogButtonBox::rejected, this, &PreferencesDialog::slotReject ); connect( m_ui->numberColorPushButton, &QPushButton::clicked, this, &PreferencesDialog::slotColorSelect ); /* @@ -127,18 +127,6 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi } -/* - * Handle the language change event - */ -void PreferencesDialog::changeEvent( QEvent* event ) -{ - if( event->type() == QEvent::LanguageChange ) - { - m_ui->retranslateUi( this ); - } -} - - /* * Set the debug state */ @@ -370,31 +358,6 @@ void PreferencesDialog::slotReject() * Close it */ // QDialog::reject(); - - /* - * Restore values - */ - setDefaultIconType( m_pref->getDefaultIconType() ); - setDefaultIcon( m_pref->getDefaultIconMime(), m_pref->getDefaultIconData() ); - setHideDefaultIcon( m_pref->getHideDefaultIcon() ); - - setIconType( m_pref->getIconType() ); - setIcon( m_pref->getIconMime(), m_pref->getIconData() ); - - setMinimizeType( m_pref->getMinimizeType() ); - setStartMinimized( m_pref->getStartMinimized() ); - setMinimizeOnClose( m_pref->getMinimizeOnClose() ); - - setShowNumber( m_pref->getShowNumber() ); - setNumberColor( m_pref->getNumberColor() ); - setNumberSize( m_pref->getNumberSize() ); - setCountType( m_pref->getCountType() ); - - setDebug( m_pref->getDebug() ); - - /* - * Hide it - */ hide(); } diff --git a/app/SysTray-X/preferencesdialog.h b/app/SysTray-X/preferencesdialog.h index 44481b2..17171c9 100644 --- a/app/SysTray-X/preferencesdialog.h +++ b/app/SysTray-X/preferencesdialog.h @@ -39,13 +39,6 @@ class PreferencesDialog : public QDialog */ PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWidget *parent = nullptr ); - /** - * @brief changeEvent. Override the change event. - * - * @param event The event. - */ - void changeEvent( QEvent *event ); - private: /** diff --git a/webext/_locales/de/messages.json b/webext/_locales/de/messages.json index 669025c..e3d9f26 100644 --- a/webext/_locales/de/messages.json +++ b/webext/_locales/de/messages.json @@ -41,17 +41,37 @@ "windows_min_default": { "message": "Standard Minimieren", - "description": "Minimize option 1" + "description": "Minimize option 0" }, "windows_min_to_tray_1": { "message": "In Systemleiste verbergen, Methode 1", - "description": "Minimize option 2" + "description": "Minimize option 1" }, "windows_min_to_tray_2": { "message": "In Systemleiste verbergen, Methode 2", - "description": "Minimize option 3" + "description": "Minimize option 2" + }, + + "windows_close_options": { + "message": "Schließen", + "description": "Caption for Close options" + }, + + "windows_close_default": { + "message": "Standard schließen", + "description": "Close option 0" + }, + + "windows_close_to_tray_1": { + "message": "Hauptfenster minimieren, Kinderfenster schließen", + "description": "Close option 1" + }, + + "windows_close_to_tray_2": { + "message": "Alle Fenster minimieren", + "description": "Close option 2" }, "windows_start_min": { @@ -59,11 +79,6 @@ "description": "Start minimized" }, - "windows_min_close": { - "message": "Beim Fensterschließen, Minimieren", - "description": "Minimize on close" - }, - "icons": { "message": "Symbole", "description": "Title for Icons options" diff --git a/webext/_locales/en_US/messages.json b/webext/_locales/en_US/messages.json index 1cc0e93..9efe955 100644 --- a/webext/_locales/en_US/messages.json +++ b/webext/_locales/en_US/messages.json @@ -41,17 +41,37 @@ "windows_min_default": { "message": "Default minimize", - "description": "Minimize option 1" + "description": "Minimize option 0" }, "windows_min_to_tray_1": { "message": "Minimize to tray, method 1", - "description": "Minimize option 2" + "description": "Minimize option 1" }, "windows_min_to_tray_2": { "message": "Minimize to tray, method 2", - "description": "Minimize option 3" + "description": "Minimize option 2" + }, + + "windows_close_options": { + "message": "Close", + "description": "Caption for Close options" + }, + + "windows_close_default": { + "message": "Default close", + "description": "Close option 0" + }, + + "windows_close_to_tray_1": { + "message": "Minimize main, close children", + "description": "Close option 1" + }, + + "windows_close_to_tray_2": { + "message": "Minimize all windows", + "description": "Close option 2" }, "windows_start_min": { @@ -59,11 +79,6 @@ "description": "Start minimized" }, - "windows_min_close": { - "message": "Minimize on close", - "description": "Minimize on close" - }, - "icons": { "message": "Icons", "description": "Title for Icons options" diff --git a/webext/_locales/nl/messages.json b/webext/_locales/nl/messages.json index 7d003bc..cfe71c1 100644 --- a/webext/_locales/nl/messages.json +++ b/webext/_locales/nl/messages.json @@ -41,17 +41,37 @@ "windows_min_default": { "message": "Standaard minimalisatie", - "description": "Minimize option 1" + "description": "Minimize option 0" }, "windows_min_to_tray_1": { "message": "Minimaliseer naar systeemvak, methode 1", - "description": "Minimize option 2" + "description": "Minimize option 1" }, "windows_min_to_tray_2": { "message": "Minimaliseer naar systeemvak, methode 2", - "description": "Minimize option 3" + "description": "Minimize option 2" + }, + + "windows_close_options": { + "message": "Sluiten", + "description": "Caption for Close options" + }, + + "windows_close_default": { + "message": "Standaard sluiting", + "description": "Close option 0" + }, + + "windows_close_to_tray_1": { + "message": "Minimaliseer hoofdvenster, sluit kindvensters", + "description": "Close option 1" + }, + + "windows_close_to_tray_2": { + "message": "Minimaliseer alle vensters", + "description": "Close option 2" }, "windows_start_min": { @@ -59,11 +79,6 @@ "description": "Start minimized" }, - "windows_min_close": { - "message": "Minimaliseren bij sluiten", - "description": "Minimize on close" - }, - "icons": { "message": "Pictogrammen", "description": "Title for Icons options" diff --git a/webext/_locales/pt_BR/messages.json b/webext/_locales/pt_BR/messages.json index 13861e1..ff3986f 100644 --- a/webext/_locales/pt_BR/messages.json +++ b/webext/_locales/pt_BR/messages.json @@ -41,17 +41,37 @@ "windows_min_default": { "message": "Comportamento padrão", - "description": "Minimize option 1" + "description": "Minimize option 0" }, "windows_min_to_tray_1": { "message": "Minimizar para a tray, método 1", - "description": "Minimize option 2" + "description": "Minimize option 1" }, "windows_min_to_tray_2": { "message": "Minimizar para a tray, método 2", - "description": "Minimize option 3" + "description": "Minimize option 2" + }, + + "windows_close_options": { + "message": "Close", + "description": "Caption for Close options" + }, + + "windows_close_default": { + "message": "Default close", + "description": "Close option 0" + }, + + "windows_close_to_tray_1": { + "message": "Minimize main, close children", + "description": "Close option 1" + }, + + "windows_close_to_tray_2": { + "message": "Minimize all windows", + "description": "Close option 2" }, "windows_start_min": { @@ -59,11 +79,6 @@ "description": "Start minimized" }, - "windows_min_close": { - "message": "Minimizar ao fechar", - "description": "Minimize on close" - }, - "icons": { "message": "Ícones", "description": "Title for Icons options" diff --git a/webext/_locales/ru_RU/messages.json b/webext/_locales/ru_RU/messages.json index 72428d1..ec909c0 100644 --- a/webext/_locales/ru_RU/messages.json +++ b/webext/_locales/ru_RU/messages.json @@ -41,17 +41,37 @@ "windows_min_default": { "message": "Свернуть окно", - "description": "Minimize option 1" + "description": "Minimize option 0" }, "windows_min_to_tray_1": { "message": "Свернуть в трей, вариант 1", - "description": "Minimize option 2" + "description": "Minimize option 1" }, "windows_min_to_tray_2": { "message": "Свернуть в трей, вариант 2", - "description": "Minimize option 3" + "description": "Minimize option 2" + }, + + "windows_close_options": { + "message": "Close", + "description": "Caption for Close options" + }, + + "windows_close_default": { + "message": "Default close", + "description": "Close option 0" + }, + + "windows_close_to_tray_1": { + "message": "Minimize main, close children", + "description": "Close option 1" + }, + + "windows_close_to_tray_2": { + "message": "Minimize all windows", + "description": "Close option 2" }, "windows_start_min": { @@ -59,11 +79,6 @@ "description": "Start minimized" }, - "windows_min_close": { - "message": "Сворачивать при закрытии", - "description": "Minimize on close" - }, - "icons": { "message": "Иконка", "description": "Title for Icons options" diff --git a/webext/options.html b/webext/options.html index 3566c97..64a1ba5 100644 --- a/webext/options.html +++ b/webext/options.html @@ -35,11 +35,7 @@

__MSG_windows__

-<<<<<<< HEAD - Minimize action -======= __MSG_windows_min_options__ ->>>>>>> ec8398d... Update locale
@@ -74,12 +70,13 @@ @@ -87,7 +84,7 @@ @@ -95,7 +92,7 @@
- Close action + __MSG_windows_close_options__
-  __MSG_windows_close_default__
 __MSG_windows_close_1__
 __MSG_windows_close_2__