StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branches 'pr1130' and 'pr1132'

Browse Source
This commit is contained in:
Dubslow 2015-02-09 13:35:30 -06:00
commit 6cbc5ab87c
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
2 changed files with 284 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widget/form/settings/generalform.cpp
View File

@ -52,7 +52,7 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
bodyUI->transComboBox->setCurrentIndex(locales.indexOf(Settings::getInstance().getTranslation())); bodyUI->transComboBox->setCurrentIndex(locales.indexOf(Settings::getInstance().getTranslation()));
bodyUI->cbAutorun->setChecked(Settings::getInstance().getAutorun()); bodyUI->cbAutorun->setChecked(Settings::getInstance().getAutorun());
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
bodyUI->cbAutorun->setEnabled(False); bodyUI->cbAutorun->setEnabled(false);
#endif #endif
bool showSystemTray = Settings::getInstance().getShowSystemTray(); bool showSystemTray = Settings::getInstance().getShowSystemTray();

493
translations/it.ts vendored
View File

File diff suppressed because it is too large Load Diff