diff --git a/translations/de.ts b/translations/de.ts
index 42adc68f9..f8b790182 100644
--- a/translations/de.ts
+++ b/translations/de.ts
@@ -4,10 +4,23 @@
AVPage
-
+
+
+
+
+
+ On a button
+
+
+
+
+
+ On a button
+
+
AddFriendForm
@@ -227,41 +240,41 @@
GeneralPage
-
+
-
+
Text on a checkbox to enable IPv6
IPv6 aktivieren (empfohlen)
-
+
Text on a checkbox to enable translations
-
+
Text on a checkbox to make qTox a portable application
-
+
describes makeToxPortable checkbox
-
+
-
+
@@ -322,29 +335,29 @@
IdentityPage
-
+
-
+
Username/nick
Benutzername
-
+
Status message
Status
-
+
Tox ID
-
+
@@ -409,42 +422,42 @@
SettingsDialog
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/translations/fr.ts b/translations/fr.ts
index 2f61287cb..53b39e179 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -4,10 +4,23 @@
AVPage
-
+
+
+
+
+
+ On a button
+
+
+
+
+
+ On a button
+
+
AddFriendForm
@@ -227,41 +240,41 @@
GeneralPage
-
+
-
+
Text on a checkbox to enable IPv6
Activer IPv6 (recommandé)
-
+
Text on a checkbox to enable translations
-
+
Text on a checkbox to make qTox a portable application
-
+
describes makeToxPortable checkbox
-
+
-
+
@@ -322,29 +335,29 @@
IdentityPage
-
+
-
+
Username/nick
Nom
-
+
Status message
Status
-
+
ID Tox
-
+
@@ -409,42 +422,42 @@
SettingsDialog
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/translations/it.ts b/translations/it.ts
index a7c3f39c0..35b4c928d 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -4,10 +4,23 @@
AVPage
-
+
+
+
+
+
+ On a button
+
+
+
+
+
+ On a button
+
+
AddFriendForm
@@ -197,41 +210,41 @@
GeneralPage
-
+
-
+
Text on a checkbox to enable IPv6
Abilita IPv6 (consigliato)
-
+
Text on a checkbox to enable translations
Abilita traduzioni
-
+
Text on a checkbox to make qTox a portable application
Rendi qTox portabile
-
+
describes makeToxPortable checkbox
Slava le impostazioni nella directory di lavoro corrente, invece della directory di default
-
+
-
+
Emoticons
@@ -288,29 +301,29 @@
IdentityPage
-
+
-
+
Username/nick
Nome
-
+
Status message
Stato
-
+
Tox ID
-
+
@@ -375,42 +388,42 @@
SettingsDialog
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/translations/mannol.ts b/translations/mannol.ts
index a1856348e..ccc08ff82 100644
--- a/translations/mannol.ts
+++ b/translations/mannol.ts
@@ -4,10 +4,23 @@
AVPage
-
+
+
+
+
+
+ On a button
+
+
+
+
+
+ On a button
+
+
AddFriendForm
@@ -197,41 +210,41 @@
GeneralPage
-
+
-
+
Text on a checkbox to enable IPv6
-
+
Text on a checkbox to enable translations
-
+
Text on a checkbox to make qTox a portable application
-
+
describes makeToxPortable checkbox
-
+
-
+
@@ -288,29 +301,29 @@
IdentityPage
-
+
-
+
Username/nick
-
+
Status message
-
+
-
+
@@ -375,42 +388,42 @@
SettingsDialog
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/translations/pl.ts b/translations/pl.ts
index 6aaa4e6d6..edff773c3 100644
--- a/translations/pl.ts
+++ b/translations/pl.ts
@@ -1,13 +1,26 @@
-
+
AVPage
-
+
Ustawienia wideo
+
+
+
+
+ On a button
+
+
+
+
+
+ On a button
+
+
AddFriendForm
@@ -199,41 +212,41 @@
GeneralPage
-
+
Główne ustawienia
-
+
Text on a checkbox to enable IPv6
Użyj IPv6 (rekomendowane)
-
+
Text on a checkbox to enable translations
Użyj tłumaczenia
-
+
Text on a checkbox to make qTox a portable application
Zrób Tox przenośnym
-
+
describes makeToxPortable checkbox
Zamiast domyślnego katalogu użyj obecnego do zapisania ustawień
-
+
Motyw
-
+
needs better translation
Paczka uśmiechów
@@ -291,29 +304,29 @@
IdentityPage
-
+
Informacja publiczna
-
+
Username/nick
Nick
-
+
Status message
Status
-
+
Tox ID
-
+
Twój Tox ID
@@ -379,42 +392,42 @@
SettingsDialog
-
+
qTox – Ustawienia
-
+
Główne
-
+
Tożsamość
-
+
Prywatność
-
+
Audio/Wideo
-
+
Ok
-
+
Anuluj
-
+
Zastosuj
diff --git a/translations/ru.ts b/translations/ru.ts
index 87c52b238..56c4aaebf 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -4,10 +4,23 @@
AVPage
-
+
Настройки видео
+
+
+
+
+ On a button
+
+
+
+
+
+ On a button
+
+
AddFriendForm
@@ -246,41 +259,41 @@
GeneralPage
-
+
Основные настройки
-
+
Text on a checkbox to enable IPv6
Включить IPv6 (рекомендуется)
-
+
Text on a checkbox to enable translations
Русскоязычный интерфейс
-
+
Text on a checkbox to make qTox a portable application
Портативный режим
-
+
describes makeToxPortable checkbox
Сохранять настройки в рабочую директорию вместо страндартной директории настроек
-
+
Тема
-
+
Набор смайликов
@@ -341,29 +354,29 @@
IdentityPage
-
+
Публичные данные
-
+
Username/nick
Имя
-
+
Status message
Статус
-
+
Tox ID
-
+
Ваш Tox ID
@@ -432,42 +445,42 @@
Диалог настроек
-
+
-
+
Основное
-
+
Личные данные
-
+
Безопасность
-
+
Аудио и видео
-
+
ОК
-
+
Отмена
-
+
Применить
diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index 05ce3c165..d81973286 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -23,6 +23,7 @@
//========================================
class GeneralPage : public QWidget
{
+ Q_OBJECT
public:
GeneralPage(QWidget *parent = 0) :
QWidget(parent)
@@ -72,6 +73,7 @@ public:
class IdentityPage : public QWidget
{
+ Q_OBJECT
public:
IdentityPage(QWidget* parent = 0) :
QWidget(parent)
@@ -131,7 +133,7 @@ public:
camView = new SelfCamView(parent->getWidget()->getCamera());
camView->hide(); // hide by default
- testVideo = new QPushButton("Show video preview");
+ testVideo = new QPushButton(tr("Show video preview","On a button"));
connect(testVideo, SIGNAL(clicked()), this, SLOT(onTestVideoPressed()));
QVBoxLayout *vLayout = new QVBoxLayout();
@@ -152,13 +154,13 @@ public:
void showTestVideo()
{
- testVideo->setText("Hide video preview");
+ testVideo->setText(tr("Hide video preview","On a button"));
camView->show();
}
void closeTestVideo()
{
- testVideo->setText("Show video preview");
+ testVideo->setText(tr("Show video preview","On a button"));
camView->close();
}