1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr1914'

This commit is contained in:
tux3 2015-06-28 18:23:50 +02:00
commit 4f0a517531
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
6 changed files with 367 additions and 281 deletions

View File

@ -28,7 +28,7 @@ namespace Ui {
class AboutSettings;
}
class AboutForm final : public GenericForm
class AboutForm : public GenericForm
{
Q_OBJECT
public:

View File

@ -28,7 +28,7 @@ namespace Ui {
class AdvancedSettings;
}
class AdvancedForm final : public GenericForm
class AdvancedForm : public GenericForm
{
Q_OBJECT
public:

View File

@ -33,7 +33,7 @@ class AVSettings;
class CameraSource;
class VideoSurface;
class AVForm final : public GenericForm
class AVForm : public GenericForm
{
Q_OBJECT
public:

View File

@ -28,7 +28,7 @@ class GeneralSettings;
class SettingsWidget;
class GeneralForm final : public GenericForm
class GeneralForm : public GenericForm
{
Q_OBJECT
public:

View File

@ -26,7 +26,7 @@ namespace Ui {
class PrivacySettings;
}
class PrivacyForm final : public GenericForm
class PrivacyForm : public GenericForm
{
Q_OBJECT
public:

638
translations/ru.ts vendored

File diff suppressed because it is too large Load Diff