From 04657d2c1da2df8ee764adedf2e9656b48046bd4 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:23:20 +0200
Subject: [PATCH 01/30] added ToxID struct

---
 corestructs.h | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/corestructs.h b/corestructs.h
index ebaab4534..a2bb6f31f 100644
--- a/corestructs.h
+++ b/corestructs.h
@@ -10,6 +10,32 @@ class QTimer;
 
 enum class Status : int {Online = 0, Away, Busy, Offline};
 
+#define TOX_ID_PUBLIC_KEY_LENGTH 64
+#define TOX_ID_NO_SPAM_LENGTH    8
+#define TOX_ID_CHECKSUM_LENGTH   4
+
+struct ToxID
+{
+    QString publicKey;
+    QString noSpam;
+    QString checkSum;
+
+    QString toString() const
+    {
+        return publicKey + noSpam + checkSum;
+    }
+
+    ToxID static fromString(QString id)
+    {
+        ToxID toxID;
+        toxID.publicKey = id.left(TOX_ID_PUBLIC_KEY_LENGTH);
+        toxID.noSpam    = id.mid(TOX_ID_PUBLIC_KEY_LENGTH, TOX_ID_NO_SPAM_LENGTH);
+        toxID.checkSum  = id.right(TOX_ID_CHECKSUM_LENGTH);
+        return toxID;
+    }
+
+};
+
 struct DhtServer
 {
     QString name;

From c3a8cd01f37e4b0530c3b0c1e541328d87ab9e4c Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:32:15 +0200
Subject: [PATCH 02/30] removed settingsform, removed selfcamview from widget

---
 qtox.pro                     |   2 -
 widget/form/settingsform.cpp | 142 -----------------------------------
 widget/form/settingsform.h   |  67 -----------------
 widget/widget.cpp            |  36 +--------
 widget/widget.h              |   6 --
 5 files changed, 1 insertion(+), 252 deletions(-)
 delete mode 100644 widget/form/settingsform.cpp
 delete mode 100644 widget/form/settingsform.h

diff --git a/qtox.pro b/qtox.pro
index 7b52d779c..4bc5bba89 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -79,7 +79,6 @@ win32 {
 HEADERS  += widget/form/addfriendform.h \
     widget/form/chatform.h \
     widget/form/groupchatform.h \
-    widget/form/settingsform.h \
     widget/form/filesform.h \
     widget/tool/chattextedit.h \
     widget/tool/friendrequestdialog.h \
@@ -116,7 +115,6 @@ SOURCES += \
     widget/form/addfriendform.cpp \
     widget/form/chatform.cpp \
     widget/form/groupchatform.cpp \
-    widget/form/settingsform.cpp \
     widget/form/filesform.cpp \
     widget/tool/chattextedit.cpp \
     widget/tool/friendrequestdialog.cpp \
diff --git a/widget/form/settingsform.cpp b/widget/form/settingsform.cpp
deleted file mode 100644
index 3d4a213da..000000000
--- a/widget/form/settingsform.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-    Copyright (C) 2014 by Project Tox <https://tox.im>
-
-    This file is part of qTox, a Qt-based graphical interface for Tox.
-
-    This program is libre software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-    See the COPYING file for more details.
-*/
-
-#include "settingsform.h"
-#include "widget/widget.h"
-#include "settings.h"
-#include "smileypack.h"
-#include "ui_mainwindow.h"
-#include <QFont>
-#include <QClipboard>
-#include <QApplication>
-#include <QFileDialog>
-#include <QDir>
-
-SettingsForm::SettingsForm()
-    : QObject()
-{
-    main = new QWidget(), head = new QWidget();
-    QFont bold, small;
-    bold.setBold(true);
-    small.setPixelSize(13);
-    small.setKerning(false);
-    headLabel.setText(tr("User Settings","\"Headline\" of the window"));
-    headLabel.setFont(bold);
-
-    nameLabel.setText(tr("Name","Username/nick"));
-    statusTextLabel.setText(tr("Status","Status message"));
-    idLabel.setText("Tox ID " + tr("(click here to copy)", "Click on this text to copy TID to clipboard"));
-    id.setFont(small);
-    id.setTextInteractionFlags(Qt::TextSelectableByMouse);
-    id.setReadOnly(true);
-    id.setFrameStyle(QFrame::NoFrame);
-    id.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    id.setFixedHeight(id.document()->size().height()*2);
-
-    videoTest.setText(tr("Test video","Text on a button to test the video/webcam"));
-    enableIPv6.setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
-    enableIPv6.setChecked(Settings::getInstance().getEnableIPv6());
-    useTranslations.setText(tr("Use translations","Text on a checkbox to enable translations"));
-    useTranslations.setChecked(Settings::getInstance().getUseTranslations());
-    makeToxPortable.setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
-    makeToxPortable.setChecked(Settings::getInstance().getMakeToxPortable());
-    makeToxPortable.setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
-
-    smileyPackLabel.setText(tr("Smiley Pack", "Text on smiley pack label"));
-    for (auto entry : SmileyPack::listSmileyPacks())
-        smileyPackBrowser.addItem(entry.first, entry.second);
-    smileyPackBrowser.setCurrentIndex(smileyPackBrowser.findData(Settings::getInstance().getSmileyPack()));
-
-    main->setLayout(&layout);
-    layout.addWidget(&nameLabel);
-    layout.addWidget(&name);
-    layout.addWidget(&statusTextLabel);
-    layout.addWidget(&statusText);
-    layout.addWidget(&idLabel);
-    layout.addWidget(&id);
-    layout.addWidget(&videoTest);
-    layout.addWidget(&enableIPv6);
-    layout.addWidget(&useTranslations);
-    layout.addWidget(&makeToxPortable);
-    layout.addWidget(&smileyPackLabel);
-    layout.addWidget(&smileyPackBrowser);
-    layout.addStretch();
-
-    head->setLayout(&headLayout);
-    headLayout.addWidget(&headLabel);
-
-    connect(&videoTest, SIGNAL(clicked()), this, SLOT(onTestVideoClicked()));
-    connect(&enableIPv6, SIGNAL(stateChanged(int)), this, SLOT(onEnableIPv6Updated()));
-    connect(&useTranslations, SIGNAL(stateChanged(int)), this, SLOT(onUseTranslationUpdated()));
-    connect(&makeToxPortable, SIGNAL(stateChanged(int)), this, SLOT(onMakeToxPortableUpdated()));
-    connect(&idLabel, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
-    connect(&smileyPackBrowser, SIGNAL(currentIndexChanged(int)), this, SLOT(onSmileyBrowserIndexChanged(int)));
-}
-
-SettingsForm::~SettingsForm()
-{
-}
-
-void SettingsForm::setFriendAddress(const QString& friendAddress)
-{
-    QString txt{friendAddress};
-    txt.insert(38,'\n');
-    id.setText(txt);
-}
-
-void SettingsForm::show(Ui::MainWindow &ui)
-{
-    name.setText(ui.nameLabel->text());
-    statusText.setText(ui.statusLabel->text());
-    ui.mainContent->layout()->addWidget(main);
-    ui.mainHead->layout()->addWidget(head);
-    main->show();
-    head->show();
-}
-
-void SettingsForm::onTestVideoClicked()
-{
-     Widget::getInstance()->showTestCamview();
-}
-
-void SettingsForm::onEnableIPv6Updated()
-{
-    Settings::getInstance().setEnableIPv6(enableIPv6.isChecked());
-}
-
-void SettingsForm::copyIdClicked()
-{
-    id.selectAll();
-    QString txt = id.toPlainText();
-    txt.replace('\n',"");
-    QApplication::clipboard()->setText(txt);
-}
-
-void SettingsForm::onUseTranslationUpdated()
-{
-    Settings::getInstance().setUseTranslations(useTranslations.isChecked());
-}
-
-void SettingsForm::onMakeToxPortableUpdated()
-{
-    Settings::getInstance().setMakeToxPortable(makeToxPortable.isChecked());
-}
-
-void SettingsForm::onSmileyBrowserIndexChanged(int index)
-{
-    QString filename = smileyPackBrowser.itemData(index).toString();
-    Settings::getInstance().setSmileyPack(filename);
-}
diff --git a/widget/form/settingsform.h b/widget/form/settingsform.h
deleted file mode 100644
index a081d01fb..000000000
--- a/widget/form/settingsform.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (C) 2014 by Project Tox <https://tox.im>
-
-    This file is part of qTox, a Qt-based graphical interface for Tox.
-
-    This program is libre software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-    See the COPYING file for more details.
-*/
-
-#ifndef SETTINGSFORM_H
-#define SETTINGSFORM_H
-
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QObject>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QTextEdit>
-#include <QComboBox>
-
-#include "widget/croppinglabel.h"
-
-namespace Ui {class MainWindow;}
-class QString;
-
-class SettingsForm : public QObject
-{
-    Q_OBJECT
-public:
-    SettingsForm();
-    ~SettingsForm();
-
-    void show(Ui::MainWindow &ui);
-
-public slots:
-    void setFriendAddress(const QString& friendAddress);
-
-private slots:
-    void onTestVideoClicked();
-    void onEnableIPv6Updated();
-    void onUseTranslationUpdated();
-    void onMakeToxPortableUpdated();
-    void onSmileyBrowserIndexChanged(int index);
-    void copyIdClicked();
-
-private:
-    QLabel headLabel, nameLabel, statusTextLabel, smileyPackLabel;
-    QTextEdit id;
-    CroppingLabel idLabel;
-    QPushButton videoTest;
-    QCheckBox enableIPv6, useTranslations, makeToxPortable;
-    QVBoxLayout layout, headLayout;
-    QWidget *main, *head;
-    QComboBox smileyPackBrowser;
-public:
-    QLineEdit name, statusText;
-};
-
-#endif // SETTINGSFORM_H
diff --git a/widget/widget.cpp b/widget/widget.cpp
index abe14460a..532a47664 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -155,7 +155,6 @@ Widget::Widget(QWidget *parent)
     ui->statusButton->style()->polish(ui->statusButton);
 
     camera = new Camera;
-    camview = new SelfCamView(camera);
 
     // Disable some widgets until we're connected to the DHT
     ui->statusButton->setEnabled(false);
@@ -179,7 +178,6 @@ Widget::Widget(QWidget *parent)
     connect(core, &Core::statusSet, this, &Widget::onStatusSet);
     connect(core, &Core::usernameSet, this, &Widget::setUsername);
     connect(core, &Core::statusMessageSet, this, &Widget::setStatusMessage);
-    connect(core, &Core::friendAddressGenerated, &settingsForm, &SettingsForm::setFriendAddress);
     connect(core, SIGNAL(fileDownloadFinished(const QString&)), &filesForm, SLOT(onFileDownloadComplete(const QString&)));
     connect(core, SIGNAL(fileUploadFinished(const QString&)), &filesForm, SLOT(onFileUploadComplete(const QString&)));
     connect(core, &Core::friendAdded, this, &Widget::addFriend);
@@ -210,8 +208,6 @@ Widget::Widget(QWidget *parent)
     connect(setStatusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
     connect(setStatusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
     connect(setStatusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
-    connect(&settingsForm.name, SIGNAL(editingFinished()), this, SLOT(onUsernameChanged()));
-    connect(&settingsForm.statusText, SIGNAL(editingFinished()), this, SLOT(onStatusMessageChanged()));
     connect(&friendForm, SIGNAL(friendRequested(QString,QString)), this, SIGNAL(friendRequested(QString,QString)));
 
     coreThread->start();
@@ -228,7 +224,6 @@ Widget::~Widget()
     if (!coreThread->isFinished())
         coreThread->terminate();
     delete core;
-    delete camview;
 
     hideMainForms();
 
@@ -338,9 +333,7 @@ void Widget::onTransferClicked()
 
 void Widget::onSettingsClicked()
 {
-    hideMainForms();
-    settingsForm.show(*ui);
-    activeChatroomWidget = nullptr;
+
 }
 
 void Widget::hideMainForms()
@@ -357,20 +350,10 @@ void Widget::hideMainForms()
     }
 }
 
-void Widget::onUsernameChanged()
-{
-    const QString newUsername = settingsForm.name.text();
-    ui->nameLabel->setText(newUsername);
-    ui->nameLabel->setToolTip(newUsername); // for overlength names
-    settingsForm.name.setText(newUsername);
-    core->setUsername(newUsername);
-}
-
 void Widget::onUsernameChanged(const QString& newUsername, const QString& oldUsername)
 {
     ui->nameLabel->setText(oldUsername); // restore old username until Core tells us to set it
     ui->nameLabel->setToolTip(oldUsername); // for overlength names
-    settingsForm.name.setText(oldUsername);
     core->setUsername(newUsername);
 }
 
@@ -378,23 +361,12 @@ void Widget::setUsername(const QString& username)
 {
     ui->nameLabel->setText(username);
     ui->nameLabel->setToolTip(username); // for overlength names
-    settingsForm.name.setText(username);
-}
-
-void Widget::onStatusMessageChanged()
-{
-    const QString newStatusMessage = settingsForm.statusText.text();
-    ui->statusLabel->setText(newStatusMessage);
-    ui->statusLabel->setToolTip(newStatusMessage); // for overlength messsages
-    settingsForm.statusText.setText(newStatusMessage);
-    core->setStatusMessage(newStatusMessage);
 }
 
 void Widget::onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage)
 {
     ui->statusLabel->setText(oldStatusMessage); // restore old status message until Core tells us to set it
     ui->statusLabel->setToolTip(oldStatusMessage); // for overlength messsages
-    settingsForm.statusText.setText(oldStatusMessage);
     core->setStatusMessage(newStatusMessage);
 }
 
@@ -402,7 +374,6 @@ void Widget::setStatusMessage(const QString &statusMessage)
 {
     ui->statusLabel->setText(statusMessage);
     ui->statusLabel->setToolTip(statusMessage); // for overlength messsages
-    settingsForm.statusText.setText(statusMessage);
 }
 
 void Widget::addFriend(int friendId, const QString &userId)
@@ -677,11 +648,6 @@ Group *Widget::createGroup(int groupId)
     return newgroup;
 }
 
-void Widget::showTestCamview()
-{
-    camview->show();
-}
-
 void Widget::onEmptyGroupCreated(int groupId)
 {
     createGroup(groupId);
diff --git a/widget/widget.h b/widget/widget.h
index 1fbecb412..653d72f1f 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -19,7 +19,6 @@
 
 #include <QMainWindow>
 #include "widget/form/addfriendform.h"
-#include "widget/form/settingsform.h"
 #include "widget/form/filesform.h"
 #include "corestructs.h"
 
@@ -54,7 +53,6 @@ public:
     QThread* getCoreThread();
     Camera* getCamera();
     static Widget* getInstance();
-    void showTestCamview();
     void newMessageAlert();
     bool isFriendWidgetCurActiveWidget(Friend* f);
     bool getIsWindowMinimized();
@@ -83,8 +81,6 @@ private slots:
     void onFailedToStartCore();
     void onUsernameChanged(const QString& newUsername, const QString& oldUsername);
     void onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage);
-    void onUsernameChanged();
-    void onStatusMessageChanged();
     void setUsername(const QString& username);
     void setStatusMessage(const QString &statusMessage);
     void addFriend(int friendId, const QString& userId);
@@ -137,12 +133,10 @@ private:
     Core* core;
     QThread* coreThread;
     AddFriendForm friendForm;
-    SettingsForm settingsForm;
     FilesForm filesForm;
     static Widget* instance;
     GenericChatroomWidget* activeChatroomWidget;
     FriendListWidget* contactListWidget;
-    SelfCamView* camview;
     Camera* camera;
     bool notify(QObject *receiver, QEvent *event);
     bool eventFilter(QObject *, QEvent *event);

From 28e8406be9aaad2e3fd523ce356d95b0e5b34f71 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:41:41 +0200
Subject: [PATCH 03/30] added settingsdialog

---
 core.cpp                      |   5 +-
 core.h                        |   2 +-
 qtox.pro                      |   6 +-
 widget/form/addfriendform.cpp |   2 +-
 widget/settingsdialog.cpp     | 355 ++++++++++++++++++++++++++++++++++
 widget/settingsdialog.h       |  64 ++++++
 6 files changed, 427 insertions(+), 7 deletions(-)
 create mode 100644 widget/settingsdialog.cpp
 create mode 100644 widget/settingsdialog.h

diff --git a/core.cpp b/core.cpp
index 876301a63..fe1e3187b 100644
--- a/core.cpp
+++ b/core.cpp
@@ -718,12 +718,11 @@ void Core::setUsername(const QString& username)
     }
 }
 
-QString Core::getSelfId()
+ToxID Core::getSelfId()
 {
     uint8_t friendAddress[TOX_FRIEND_ADDRESS_SIZE];
     tox_get_address(tox, friendAddress);
-
-    return CFriendAddress::toString(friendAddress);
+    return ToxID::fromString(CFriendAddress::toString(friendAddress));
 }
 
 QString Core::getStatusMessage()
diff --git a/core.h b/core.h
index 96ab86d2d..13d051017 100644
--- a/core.h
+++ b/core.h
@@ -49,7 +49,7 @@ public:
     
     QString getUsername();
     QString getStatusMessage();
-    QString getSelfId();
+    ToxID getSelfId();
 
     void increaseVideoBusyness();
     void decreaseVideoBusyness();
diff --git a/qtox.pro b/qtox.pro
index 4bc5bba89..96e609c33 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -109,7 +109,8 @@ HEADERS  += widget/form/addfriendform.h \
     filetransferinstance.h \
     corestructs.h \
     coredefines.h \
-    coreav.h
+    coreav.h \
+    widget/settingsdialog.h
 
 SOURCES += \
     widget/form/addfriendform.cpp \
@@ -145,4 +146,5 @@ SOURCES += \
     widget/tool/chataction.cpp \
     widget/chatareawidget.cpp \
     filetransferinstance.cpp \
-    corestructs.cpp
+    corestructs.cpp \
+    widget/settingsdialog.cpp
diff --git a/widget/form/addfriendform.cpp b/widget/form/addfriendform.cpp
index 3a44ae672..2c9b197b2 100644
--- a/widget/form/addfriendform.cpp
+++ b/widget/form/addfriendform.cpp
@@ -95,7 +95,7 @@ void AddFriendForm::onSendTriggered()
     if (id.isEmpty()) {
         showWarning(tr("Please fill in a valid Tox ID","Tox ID of the friend you're sending a friend request to"));
     } else if (isToxId(id)) {
-        if (id.toUpper() == Core::getInstance()->getSelfId().toUpper())
+        if (id.toUpper() == Core::getInstance()->getSelfId().toString().toUpper())
             showWarning(tr("You can't add yourself as a friend !","When trying to add your own Tox ID as friend"));
         else
             emit friendRequested(id, getMessage());
diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
new file mode 100644
index 000000000..09cb765c1
--- /dev/null
+++ b/widget/settingsdialog.cpp
@@ -0,0 +1,355 @@
+#include "settingsdialog.h"
+#include "settings.h"
+#include "widget.h"
+#include "camera.h"
+#include "selfcamview.h"
+#include "core.h"
+
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QStackedWidget>
+#include <QPushButton>
+#include <QBoxLayout>
+#include <QLabel>
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QLineEdit>
+
+
+// =======================================
+// settings pages
+//========================================
+class GeneralPage : public QWidget
+{
+public:
+    GeneralPage(QWidget *parent = 0) :
+        QWidget(parent)
+    {
+        QGroupBox *group = new QGroupBox(tr("General Settings"), this);
+
+        enableIPv6 = new QCheckBox(this);
+        enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
+        useTranslations = new QCheckBox(this);
+        useTranslations->setText(tr("Use translations","Text on a checkbox to enable translations"));
+        makeToxPortable = new QCheckBox(this);
+        makeToxPortable->setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
+        makeToxPortable->setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
+
+        QVBoxLayout *vLayout = new QVBoxLayout();
+        vLayout->addWidget(enableIPv6);
+        vLayout->addWidget(useTranslations);
+        vLayout->addWidget(makeToxPortable);
+        group->setLayout(vLayout);
+
+        QVBoxLayout *mainLayout = new QVBoxLayout();
+        mainLayout->addWidget(group);
+        mainLayout->addStretch(1);
+        setLayout(mainLayout);
+    }
+
+    QCheckBox* enableIPv6;
+    QCheckBox* useTranslations;
+    QCheckBox* makeToxPortable;
+};
+
+class IdentityPage : public QWidget
+{
+public:
+    IdentityPage(QWidget* parent = 0) :
+        QWidget(parent)
+    {
+        // public
+        QGroupBox *publicGroup = new QGroupBox(tr("Public Information"), this);
+        QLabel* userNameLabel = new QLabel(tr("Name","Username/nick"), this);
+        userName = new QLineEdit(this);
+        QLabel* statusMessageLabel = new QLabel(tr("Status","Status message"), this);
+        statusMessage = new QLineEdit(this);
+        QVBoxLayout *vLayout = new QVBoxLayout();
+        vLayout->addWidget(userNameLabel);
+        vLayout->addWidget(userName);
+        vLayout->addWidget(statusMessageLabel);
+        vLayout->addWidget(statusMessage);
+        publicGroup->setLayout(vLayout);
+
+        // tox
+        QGroupBox* toxGroup = new QGroupBox(tr("Tox ID"), this);
+        QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"), this);
+        toxID = new QLineEdit(this);
+        toxID->setReadOnly(true);
+        QVBoxLayout* toxLayout = new QVBoxLayout();
+        toxLayout->addWidget(toxIdLabel);
+        toxLayout->addWidget(toxID);
+        toxGroup->setLayout(toxLayout);
+
+        QVBoxLayout *mainLayout = new QVBoxLayout();
+        mainLayout->setSpacing(30);
+        mainLayout->addWidget(publicGroup);
+        mainLayout->addWidget(toxGroup);
+        mainLayout->addStretch(1);
+        setLayout(mainLayout);
+    }
+
+    QLineEdit* userName;
+    QLineEdit* statusMessage;
+    QLineEdit* toxID;
+};
+
+class PrivacyPage : public QWidget
+{
+public:
+    PrivacyPage(QWidget* parent = 0) :
+        QWidget(parent)
+    {}
+};
+
+class AVPage : public QWidget
+{
+    Q_OBJECT
+public:
+    AVPage(SettingsDialog* parent = 0) :
+        QWidget(parent)
+    {
+        QGroupBox *group = new QGroupBox(tr("Video Settings"), this);
+
+        camView = new SelfCamView(Camera::getInstance());
+        camView->hide(); // hide by default
+        testVideo = new QPushButton("enable video");
+        connect(testVideo, SIGNAL(clicked()), this, SLOT(onTestVideoPressed()));
+
+        QVBoxLayout *vLayout = new QVBoxLayout();
+        vLayout->addWidget(testVideo);
+        vLayout->addWidget(camView);
+        group->setLayout(vLayout);
+
+        QVBoxLayout *mainLayout = new QVBoxLayout();
+        mainLayout->addWidget(group);
+        mainLayout->addStretch(1);
+        setLayout(mainLayout);
+    }
+
+    ~AVPage()
+    {
+        delete camView;
+    }
+
+    void showTestVideo()
+    {
+        testVideo->setText("disable video");
+        camView->show();
+    }
+
+    void closeTestVideo()
+    {
+        testVideo->setText("enable video");
+        camView->close();
+    }
+
+    QPushButton* testVideo;
+    SelfCamView* camView;
+
+public slots:
+    void onTestVideoPressed()
+    {
+        if (camView->isVisible()) {
+            closeTestVideo();
+        } else {
+            showTestVideo();
+        }
+    }
+};
+
+// allows Q_OBJECT macro inside cpp
+#include "settingsdialog.moc"
+
+
+
+// =======================================
+// settings dialog
+//========================================
+SettingsDialog::SettingsDialog(Widget *parent) :
+    QDialog(parent),
+    widget(parent)
+{
+    createPages();
+    createButtons();
+    createConnections();
+    createLayout();
+    setWindowTitle(tr("Settings Dialog"));
+}
+
+void SettingsDialog::createPages()
+{
+    generalPage  = new GeneralPage(this);
+    identityPage = new IdentityPage(this);
+    privacyPage  = new PrivacyPage(this);
+    avPage       = new AVPage(this);
+
+    contentsWidget = new QListWidget;
+    contentsWidget->setViewMode(QListView::IconMode);
+    contentsWidget->setIconSize(QSize(100, 73));
+    contentsWidget->setMovement(QListView::Static);
+    contentsWidget->setMaximumWidth(110);
+    contentsWidget->setMinimumWidth(110);
+    contentsWidget->setSpacing(0);
+    contentsWidget->setFlow(QListView::TopToBottom);
+
+    pagesWidget = new QStackedWidget;
+    pagesWidget->addWidget(generalPage);
+    pagesWidget->addWidget(identityPage);
+    pagesWidget->addWidget(privacyPage);
+    pagesWidget->addWidget(avPage);
+
+    QListWidgetItem *generalButton = new QListWidgetItem(contentsWidget);
+    generalButton->setIcon(QIcon(":/img/settings/general.png"));
+    generalButton->setText(tr("General"));
+    generalButton->setTextAlignment(Qt::AlignHCenter);
+    generalButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    QListWidgetItem *identity = new QListWidgetItem(contentsWidget);
+    identity->setIcon(QIcon(":/img/settings/identity.png"));
+    identity->setText(tr("Identity"));
+    identity->setTextAlignment(Qt::AlignHCenter);
+    identity->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    QListWidgetItem *privacy = new QListWidgetItem(contentsWidget);
+    privacy->setIcon(QIcon(":/img/settings/privacy.png"));
+    privacy->setText(tr("Privacy"));
+    privacy->setTextAlignment(Qt::AlignHCenter);
+    privacy->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    QListWidgetItem *av = new QListWidgetItem(contentsWidget);
+    av->setIcon(QIcon(":/img/settings/av.png"));
+    av->setText(tr("Audio/Video"));
+    av->setTextAlignment(Qt::AlignHCenter);
+    av->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    contentsWidget->setCurrentRow(0);
+}
+
+void SettingsDialog::createButtons()
+{
+    okButton     = new QPushButton(tr("Ok"), this);
+    cancelButton = new QPushButton(tr("Cancel"), this);
+    applyButton  = new QPushButton(tr("Apply"), this);
+}
+
+void SettingsDialog::createConnections()
+{
+    connect(okButton, SIGNAL(clicked()), this, SLOT(okPressed()));
+    connect(cancelButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(applyButton, SIGNAL(clicked()), this, SLOT(applyPressed()));
+    connect(
+        contentsWidget,
+        SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+        this,
+        SLOT(changePage(QListWidgetItem*,QListWidgetItem*))
+    );
+}
+
+void SettingsDialog::createLayout()
+{
+    setMinimumSize(800, 500);
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout();
+    buttonsLayout->addStretch(1);
+    buttonsLayout->addWidget(okButton);
+    buttonsLayout->addWidget(cancelButton);
+    buttonsLayout->addWidget(applyButton);
+
+    QHBoxLayout *hLayout = new QHBoxLayout();
+    hLayout->addWidget(contentsWidget);
+    hLayout->addWidget(pagesWidget, 1);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout();
+    mainLayout->addLayout(hLayout);
+    mainLayout->addLayout(buttonsLayout);
+    setLayout(mainLayout);
+}
+
+void SettingsDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
+{
+    if (!current) {
+        current = previous;
+    }
+    pagesWidget->setCurrentIndex(contentsWidget->row(current));
+}
+
+void SettingsDialog::okPressed()
+{
+    writeConfig();
+    close();
+}
+
+void SettingsDialog::cancelPressed()
+{
+    close();
+}
+
+void SettingsDialog::applyPressed()
+{
+    writeConfig();
+}
+
+void SettingsDialog::readConfig()
+{
+    Settings& settings = Settings::getInstance();
+    Core* core = widget->getCore();
+
+    generalPage->enableIPv6->setChecked(settings.getEnableIPv6());
+    generalPage->useTranslations->setChecked(settings.getUseTranslations());
+    generalPage->makeToxPortable->setChecked(settings.getMakeToxPortable());
+
+    identityPage->userName->setText(core->getUsername());
+    identityPage->statusMessage->setText(core->getStatusMessage());
+    identityPage->toxID->setText(core->getSelfId().toString());
+}
+
+void SettingsDialog::writeConfig()
+{
+    Settings& settings = Settings::getInstance();
+    Core* core = widget->getCore();
+
+
+    // only save settings if something changed
+    bool saveSettings = false;
+    if (settings.getEnableIPv6() != generalPage->enableIPv6->isChecked()) {
+        settings.setEnableIPv6(generalPage->enableIPv6->isChecked());
+        saveSettings = true;
+    }
+
+    if (settings.getUseTranslations() != generalPage->useTranslations->isChecked()) {
+        settings.setUseTranslations(generalPage->useTranslations->isChecked());
+        saveSettings = true;
+    }
+
+    if (settings.getMakeToxPortable() != generalPage->makeToxPortable->isChecked()) {
+        settings.setMakeToxPortable(generalPage->makeToxPortable->isChecked());
+        saveSettings = true;
+    }
+
+    if (saveSettings) {
+        settings.save();
+    }
+
+
+    // changing core settings will automatically save them
+    QString userName = identityPage->userName->text();
+    if (core->getUsername() != userName) {
+        core->setUsername(userName);
+    }
+
+    QString statusMessage = identityPage->statusMessage->text();
+    if (core->getStatusMessage() != statusMessage) {
+        core->setStatusMessage(statusMessage);
+    }
+}
+
+Widget* SettingsDialog::getWidget()
+{
+    return widget;
+}
+
+void SettingsDialog::closeEvent(QCloseEvent* e){
+    avPage->closeTestVideo();
+    QDialog::closeEvent(e);
+}
diff --git a/widget/settingsdialog.h b/widget/settingsdialog.h
new file mode 100644
index 000000000..55575b447
--- /dev/null
+++ b/widget/settingsdialog.h
@@ -0,0 +1,64 @@
+#ifndef SETTINGSDIALOG_H
+#define SETTINGSDIALOG_H
+
+#include <QWidget>
+#include <QDialog>
+
+class Widget;
+class SelfCamView;
+class Camera;
+class GeneralPage;
+class IdentityPage;
+class PrivacyPage;
+class AVPage;
+
+class QListWidget;
+class QListWidgetItem;
+class QStackedWidget;
+class QPushButton;
+class QCheckBox;
+class QLineEdit;
+
+// =======================================
+// settings dialog
+//========================================
+class SettingsDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit SettingsDialog(Widget *parent);
+
+    void readConfig();
+    void writeConfig();
+    Widget* getWidget();
+    void closeEvent(QCloseEvent *);
+
+public slots:
+    void changePage(QListWidgetItem *current, QListWidgetItem *previous);
+    void okPressed();
+    void cancelPressed();
+    void applyPressed();
+
+private:
+    void createPages();
+    void createButtons();
+    void createConnections();
+    void createLayout();
+
+    Widget* widget;
+
+    // pages
+    GeneralPage*    generalPage;
+    IdentityPage*   identityPage;
+    PrivacyPage*    privacyPage;
+    AVPage*         avPage;
+    QListWidget*    contentsWidget;
+    QStackedWidget* pagesWidget;
+
+    // buttons
+    QPushButton* okButton;
+    QPushButton* cancelButton;
+    QPushButton* applyButton;
+};
+
+#endif // SETTINGSDIALOG_H

From 4e5d1c170b2aa4b2f02986c8ac7fe8fc7dead950 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:45:02 +0200
Subject: [PATCH 04/30] do not use getInstance of camera

---
 widget/settingsdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index 09cb765c1..0f11ee67c 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -111,7 +111,7 @@ public:
     {
         QGroupBox *group = new QGroupBox(tr("Video Settings"), this);
 
-        camView = new SelfCamView(Camera::getInstance());
+        camView = new SelfCamView(parent->getWidget()->getCamera());
         camView->hide(); // hide by default
         testVideo = new QPushButton("enable video");
         connect(testVideo, SIGNAL(clicked()), this, SLOT(onTestVideoPressed()));

From 1b2855e05be699e123f9b220e93207085bf6bfbc Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:46:34 +0200
Subject: [PATCH 05/30] use settings dialog in widget

---
 widget/widget.cpp | 5 ++++-
 widget/widget.h   | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/widget/widget.cpp b/widget/widget.cpp
index 532a47664..36b2c33c1 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -31,6 +31,7 @@
 #include "widget/friendlistwidget.h"
 #include "camera.h"
 #include "widget/form/chatform.h"
+#include "widget/settingsdialog.h"
 #include <QMessageBox>
 #include <QDebug>
 #include <QFile>
@@ -155,6 +156,7 @@ Widget::Widget(QWidget *parent)
     ui->statusButton->style()->polish(ui->statusButton);
 
     camera = new Camera;
+    settingsDialog = new SettingsDialog(this);
 
     // Disable some widgets until we're connected to the DHT
     ui->statusButton->setEnabled(false);
@@ -333,7 +335,8 @@ void Widget::onTransferClicked()
 
 void Widget::onSettingsClicked()
 {
-
+    settingsDialog->readConfig();
+    settingsDialog->show();
 }
 
 void Widget::hideMainForms()
diff --git a/widget/widget.h b/widget/widget.h
index 653d72f1f..035ea2ae0 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -37,6 +37,7 @@ class QMenu;
 class Core;
 class Camera;
 class FriendListWidget;
+class SettingsDialog;
 
 class Widget : public QMainWindow
 {
@@ -134,6 +135,7 @@ private:
     QThread* coreThread;
     AddFriendForm friendForm;
     FilesForm filesForm;
+    SettingsDialog* settingsDialog;
     static Widget* instance;
     GenericChatroomWidget* activeChatroomWidget;
     FriendListWidget* contactListWidget;

From f3ecf4fa0f39b5b80e55b176a6c8e3f4fc5ad4e5 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:50:39 +0200
Subject: [PATCH 06/30] added images

---
 img/settings/av.png       | Bin 0 -> 6360 bytes
 img/settings/general.png  | Bin 0 -> 2902 bytes
 img/settings/identity.png | Bin 0 -> 4771 bytes
 img/settings/privacy.png  | Bin 0 -> 1883 bytes
 res.qrc                   |   4 ++++
 5 files changed, 4 insertions(+)
 create mode 100644 img/settings/av.png
 create mode 100644 img/settings/general.png
 create mode 100644 img/settings/identity.png
 create mode 100644 img/settings/privacy.png

diff --git a/img/settings/av.png b/img/settings/av.png
new file mode 100644
index 0000000000000000000000000000000000000000..f96f88ea84299b2428780a15d29ae37db6601c90
GIT binary patch
literal 6360
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

literal 0
HcmV?d00001

diff --git a/img/settings/general.png b/img/settings/general.png
new file mode 100644
index 0000000000000000000000000000000000000000..61d9e2bf187b9574d83395b34bb9eaad4fd202f6
GIT binary patch
literal 2902
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
A^8f$<

literal 0
HcmV?d00001

diff --git a/img/settings/identity.png b/img/settings/identity.png
new file mode 100644
index 0000000000000000000000000000000000000000..806bb525efc2ea73d087891152331199cf543f99
GIT binary patch
literal 4771
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

literal 0
HcmV?d00001

diff --git a/img/settings/privacy.png b/img/settings/privacy.png
new file mode 100644
index 0000000000000000000000000000000000000000..763478290b8b0592c3f155013ad7d4f4637608d1
GIT binary patch
literal 1883
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
VX$I$XHCO-u002ovPDHLkV1nZng~b2>

literal 0
HcmV?d00001

diff --git a/res.qrc b/res.qrc
index cbf038a58..6a121b0ad 100644
--- a/res.qrc
+++ b/res.qrc
@@ -135,5 +135,9 @@
         <file>ui/fileTransferInstance/emptyRGreenFileButton.png</file>
         <file>ui/fileTransferInstance/emptyRRedFileButton.png</file>
         <file>audio/notification.pcm</file>
+        <file>img/settings/general.png</file>
+        <file>img/settings/identity.png</file>
+        <file>img/settings/privacy.png</file>
+        <file>img/settings/av.png</file>
     </qresource>
 </RCC>

From 7e7cebf6b62f657f180d12ff87d573f90a1ea3b3 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Fri, 12 Sep 2014 19:09:05 +0200
Subject: [PATCH 07/30] added smiley selection to the new settings dialog, new
 default search-

---
 smileypack.cpp            | 36 +++++++++++++++++++++++++-----------
 smileypack.h              |  9 ++++++---
 widget/settingsdialog.cpp | 23 +++++++++++++++++++++++
 3 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/smileypack.cpp b/smileypack.cpp
index 5af07194f..57a754c76 100644
--- a/smileypack.cpp
+++ b/smileypack.cpp
@@ -40,24 +40,38 @@ SmileyPack& SmileyPack::getInstance()
     return smileyPack;
 }
 
-QList<QPair<QString, QString> > SmileyPack::listSmileyPacks(const QString &path)
+QList<QPair<QString, QString> > SmileyPack::listSmileyPacks(const QStringList &paths)
 {
     QList<QPair<QString, QString> > smileyPacks;
 
-    QDir dir(path);
-    foreach (const QString& subdirectory, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
+    for (QString path : paths)
     {
-        dir.cd(subdirectory);
+        if (path.leftRef(1) == "~")
+            path.replace(0, 1, QDir::homePath());
 
-        QFileInfoList entries = dir.entryInfoList(QStringList() << "emoticons.xml", QDir::Files);
-        if (entries.size() > 0) // does it contain a file called emoticons.xml?
+        QDir dir(path);
+        if (!dir.exists())
+            continue;
+
+        for (const QString& subdirectory : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
         {
-            QString packageName = dir.dirName();
-            QString relPath = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(entries[0].absoluteFilePath());
-            smileyPacks << QPair<QString, QString>(packageName, relPath);
+            dir.cd(subdirectory);
+
+            QFileInfoList entries = dir.entryInfoList(QStringList() << "emoticons.xml", QDir::Files);
+            if (entries.size() > 0) // does it contain a file called emoticons.xml?
+            {
+                QString packageName = dir.dirName();
+                QString absPath = entries[0].absoluteFilePath();
+                QString relPath = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(absPath);
+
+                if (relPath.leftRef(2) == "..")
+                    smileyPacks << QPair<QString, QString>(packageName, absPath);
+                else
+                    smileyPacks << QPair<QString, QString>(packageName, relPath); // use relative path for subdirectories
+            }
+
+            dir.cdUp();
         }
-
-        dir.cdUp();
     }
 
     return smileyPacks;
diff --git a/smileypack.h b/smileypack.h
index 9f4ea31ba..1d4c9ef30 100644
--- a/smileypack.h
+++ b/smileypack.h
@@ -22,7 +22,10 @@
 #include <QString>
 #include <QStringList>
 
-#define SMILEYPACK_DEFAULT_PATH "./smileys"
+#define SMILEYPACK_SEARCH_PATHS                                                                                             \
+    {                                                                                                                       \
+        "./smileys", "/usr/share/qtox/smileys", "/usr/share/emoticons", "~/.kde4/share/emoticons", "~/.kde/share/emoticons" \
+    }
 
 //maps emoticons to smileys
 class SmileyPack : public QObject
@@ -30,10 +33,10 @@ class SmileyPack : public QObject
     Q_OBJECT
 public:
     static SmileyPack& getInstance();
-    static QList<QPair<QString, QString>> listSmileyPacks(const QString& path = SMILEYPACK_DEFAULT_PATH);
+    static QList<QPair<QString, QString> > listSmileyPacks(const QStringList& paths = SMILEYPACK_SEARCH_PATHS);
     static bool isValid(const QString& filename);
 
-    bool load(const QString &filename);
+    bool load(const QString& filename);
     QString smileyfied(QString msg);
     QList<QStringList> getEmoticons() const;
     QString getAsRichText(const QString& key);
diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index 0f11ee67c..4f9c26a9b 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -4,6 +4,7 @@
 #include "camera.h"
 #include "selfcamview.h"
 #include "core.h"
+#include "smileypack.h"
 
 #include <QListWidget>
 #include <QListWidgetItem>
@@ -14,6 +15,7 @@
 #include <QGroupBox>
 #include <QCheckBox>
 #include <QLineEdit>
+#include <QComboBox>
 
 
 // =======================================
@@ -41,8 +43,23 @@ public:
         vLayout->addWidget(makeToxPortable);
         group->setLayout(vLayout);
 
+        // theme
+        QGroupBox* themeGroup = new QGroupBox(tr("Theme"));
+        QLabel* smileyLabel = new QLabel(tr("Smiley Pack"));
+        smileyPack = new QComboBox(this);
+
+        auto smileyPacks = SmileyPack::listSmileyPacks();
+        for(auto pack : smileyPacks)
+            smileyPack->addItem(QString("%1 (%2)").arg(pack.first).arg(pack.second), pack.second);
+
+        QVBoxLayout* themeLayout = new QVBoxLayout();
+        themeLayout->addWidget(smileyLabel);
+        themeLayout->addWidget(smileyPack);
+        themeGroup->setLayout(themeLayout);
+
         QVBoxLayout *mainLayout = new QVBoxLayout();
         mainLayout->addWidget(group);
+        mainLayout->addWidget(themeGroup);
         mainLayout->addStretch(1);
         setLayout(mainLayout);
     }
@@ -50,6 +67,7 @@ public:
     QCheckBox* enableIPv6;
     QCheckBox* useTranslations;
     QCheckBox* makeToxPortable;
+    QComboBox* smileyPack;
 };
 
 class IdentityPage : public QWidget
@@ -327,6 +345,11 @@ void SettingsDialog::writeConfig()
         saveSettings = true;
     }
 
+    if (settings.getSmileyPack() != generalPage->smileyPack->currentData().toString()) {
+        settings.setSmileyPack(generalPage->smileyPack->currentData().toString());
+        saveSettings = true;
+    }
+
     if (saveSettings) {
         settings.save();
     }

From 968b46a86bfaa3b1ed86405be45d8af9a81d6bf8 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Sat, 13 Sep 2014 01:54:03 +0700
Subject: [PATCH 08/30] get rid of .setBlockFormat(..) in
 ChatAreaWidget::insertMessage(..) function

---
 widget/chatareawidget.cpp  | 12 ++++++------
 widget/tool/chataction.cpp |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index 203633386..199420e9f 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -44,10 +44,10 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     chatTextTable->format().setCellSpacing(2);
     chatTextTable->format().setWidth(QTextLength(QTextLength::PercentageLength,100));
 
-    nameFormat.setAlignment(Qt::AlignRight);
-    nameFormat.setNonBreakableLines(true);
-    dateFormat.setAlignment(Qt::AlignLeft);
-    dateFormat.setNonBreakableLines(true);
+//    nameFormat.setAlignment(Qt::AlignRight);
+//    nameFormat.setNonBreakableLines(true);
+//    dateFormat.setAlignment(Qt::AlignLeft);
+//    dateFormat.setNonBreakableLines(true);
 
     connect(this, &ChatAreaWidget::anchorClicked, this, &ChatAreaWidget::onAnchorClicked);
     connect(verticalScrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(onSliderRangeChanged()));
@@ -104,8 +104,8 @@ void ChatAreaWidget::insertMessage(ChatAction *msgAction)
     checkSlider();
 
     int row = chatTextTable->rows() - 1;
-    chatTextTable->cellAt(row,0).firstCursorPosition().setBlockFormat(nameFormat);
-    chatTextTable->cellAt(row,2).firstCursorPosition().setBlockFormat(dateFormat);
+//    chatTextTable->cellAt(row,0).firstCursorPosition().setBlockFormat(nameFormat);
+//    chatTextTable->cellAt(row,2).firstCursorPosition().setBlockFormat(dateFormat);
     QTextCursor cur = chatTextTable->cellAt(row,1).firstCursorPosition();
     cur.clearSelection();
     cur.setKeepPositionOnInsert(true);
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
index 0847abdda..3587eb600 100644
--- a/widget/tool/chataction.cpp
+++ b/widget/tool/chataction.cpp
@@ -43,9 +43,9 @@ QString ChatAction::QImage2base64(const QImage &img)
 QString ChatAction::getName()
 {
     if (isMe)
-        return QString("<div class=name_me>" + toHtmlChars(name) + "</div>");
+        return QString("<table width=100% cellspacing=0><tr><td align=right><div class=name_me>" + toHtmlChars(name) + "</div></td></tr></table>");
     else
-        return QString("<div class=name>" + toHtmlChars(name) + "</div>");
+        return QString("<table width=100% cellspacing=0><tr><td align=right><div class=name>" + toHtmlChars(name) + "</div></td></tr></table>");
 }
 
 QString ChatAction::getDate()

From 77b44fde99f13c5dbc03e1699c06bb8a0132eaac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Fri, 12 Sep 2014 23:32:31 +0400
Subject: [PATCH 09/30] update russian translation

---
 translations/ru.qm | Bin 5393 -> 6821 bytes
 translations/ru.ts | 324 ++++++++++++++++++++++++++++++++-------------
 2 files changed, 235 insertions(+), 89 deletions(-)

diff --git a/translations/ru.qm b/translations/ru.qm
index c772943133073ce31997eb21dd0a3a5bdfb10569..be9acca27be53db64295085b086a990c5702861b 100644
GIT binary patch
delta 2933
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
OIR5eFvnvY=ivI;q1%K-R

delta 1472
zcmZWoT})eL7=BB?(?8m>779yg#&P`XNQP?%6k4Fj&wz!<3d?4qmiDkVbUozsu+R%_
z7B|C!k!(lY6cYTIUg*V0Se9-6FrpWR>DA_i8a2@iz0!;MyTs{pPNB%iNzeD4_vd+^
z_j%vG<2(Oow(WXs_xi7k^ItsTS$+1+kG>5N>8=w!6(@2o5PLU6WVlaUpO2_0N;PYh
zM7t8?eZYuJ&r|1=Lc|Qze{i12@iPtizk>fZE&OvA`K7e<42QfT{h{*vi2p^ue(@|3
zeW3sH!aXA6D$8USWjI3Y(#$JFg-_>B>uvUW3%+gj?EN_%fKu#A`7t8<0{gJ)H==?!
z*q;kO0%(Y<ZupMK>f@UF-$r2z*B-Be{SWS?!plVFL)_flIpkGw@6CP!A}@2-F5e~6
zpEXRlZvp>;AuC$D(cv|N_{0bpwHPv^6$o52>UOJyJ~mpaFTx+soz`jN`cE%_&^?px
z^cfH-Fl7hdBH~8OGmBv;mo<Odcaz9cZvNf|qLvBEU$1(h&{CoA4o-cIwYLs+oU7LK
zQ8Zw(jo4z#lL)+Jldql!(7f%ly>}pGFHT4Vj_V6ZFrTw~F2z8o)IK~3$sM!y;n^zy
zykS4$LA-IszC3;v(O)NsiW^p5D>%kw-E0r*W6i9Q`PqKr)i-NnKGwkoOe(YizrwD_
zNkNM6f+R{t)t39#>2W{9s#p-wZO994&nKR$sS&mS^Woi&I4>R*`yeVljtpOxg;*yW
zqJ6nA7=x?{U_pcgSP<4`_|?=_HV98pOAE0<c($l^<*9l%sE&)$$%xEXH}WY_=F?M?
zlcFRGv3-0rlB$*YskFe$ae<HS(mMNJQ_5*aH)raKM`R^qI_xiDZq#fCi;k_@`D(07
zoXn`nPW2KQOA6h|L`)crj0s7l)!bTA+>=NOVJVVIj|-A~G!Z)?$SXH2-{_U!orjer
zXR*@iys5nC=veu|xmTwwmGx&sREN&@qyIKk4QbLfX|i={UH8Hk#JC2aKqoZV!H(+l
z{7UMg$wYL5j|&p|75OMw)~kH2M+8|;q)w!Jpp!O7KXU@Cl_`t%<F;*XWwfaGA<MtT
z7289eE2*v80l9}&Y^bJ=T<v90SuS&VEMXxn^QRz`xPyyQ=@>q+4O?U91=PbU;L}z@
zm7tmVl(nJ~WyxjE+D6iX#BXxhfv=(UKw`hTUKng{>mfMg^g{Lko&nZ^FLepke?map
zYwR$*el($Ot{T53b9vp^lq`!WK9TZ7qH^LC7Hdk9gp{1j$!*9@Ua52ijGOlf*J%F!
xxvMsRf8csDe?MMY^VmkbM%+MQ5@|X=Uwv4dR$JV}{JXRvpW9e=K$&&B{{sPmR$~AF

diff --git a/translations/ru.ts b/translations/ru.ts
index 1e2118770..6273249e8 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -1,77 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation>Настройки видео</translation>
+    </message>
+</context>
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="32"/>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
         <translation>Добавление друзей</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="35"/>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="36"/>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Сообщение</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
         <translatorcomment>Мне не нравится, но другого не придумал, и фейсбук использует это</translatorcomment>
         <translation>Отправить запрос на добавление в друзья</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translatorcomment>Вот таким нехитрым и незамысловатым образом решаются сложные переводчиские проблемы</translatorcomment>
         <translation>Добавь меня, а?</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="93"/>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
         <translation>Пожалуйста, введите корректный Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="110"/>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation>Нельзя добавить самого себя в друзья!</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Нет такого адреса</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="114"/>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Ошибка при просмотре DNS</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
         <translation>Непредвиденное количество текстовых записей</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Непредвиденное количество значений в текстовой записи</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="133"/>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>В ответе DNS ни одного Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>Ответ DNS не содержит корректных Tox ID</translation>
@@ -80,74 +94,87 @@
 <context>
     <name>Camera</name>
     <message>
-        <location filename="../widget/camera.cpp" line="161"/>
         <source>Camera eror</source>
-        <translation>Ошибка камеры</translation>
+        <translation type="obsolete">Ошибка камеры</translation>
     </message>
     <message>
-        <location filename="../widget/camera.cpp" line="162"/>
         <source>Camera format %1 not supported, can&apos;t use the camera</source>
-        <translation>Формат камеры %1 не поддерживается, невозможно использовать камеру</translation>
+        <translation type="obsolete">Формат камеры %1 не поддерживается, невозможно использовать камеру</translation>
     </message>
 </context>
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="283"/>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
         <translation>Отправить файл</translation>
     </message>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="620"/>
-        <location filename="../widget/form/chatform.cpp" line="626"/>
         <source>Save chat log</source>
-        <translation>Сохранить лог чата</translation>
+        <translation type="obsolete">Сохранить лог чата</translation>
     </message>
 </context>
 <context>
     <name>CopyableElideLabel</name>
     <message>
-        <location filename="../widget/tool/copyableelidelabel.cpp" line="29"/>
         <source>Copy</source>
-        <translation>Копировать</translation>
+        <translation type="obsolete">Копировать</translation>
     </message>
 </context>
 <context>
-    <name>FileTransfertWidget</name>
+    <name>FileTransferInstance</name>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="281"/>
+        <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation>Непригодная для записи локация</translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation>У вас нет прав записи в эту локацию. Выберете другую или закройте диалог сохранения.</translation>
+    </message>
+</context>
+<context>
+    <name>FileTransfertWidget</name>
+    <message>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="obsolete">Сохранить файл</translation>
+    </message>
+    <message>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Непригодная для записи локация</translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">У вас нет прав записи в эту локацию. Выберете другую или закройте диалог сохранения.</translation>
     </message>
 </context>
 <context>
     <name>FilesForm</name>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="25"/>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation>Переданные файлы</translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="33"/>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
         <translation>Загрузки</translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="34"/>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
         <translation>Выгрузки</translation>
     </message>
@@ -193,246 +220,365 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="86"/>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Копировать ID друга</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="87"/>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Пригласить в группу</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="97"/>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Удалить друга</translation>
     </message>
 </context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation>Основные настройки</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation>Включить IPv6 (рекомендуется)</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation>Русскоязычный интерфейс</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation>Портативный режим</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation>Сохранять настройки в рабочую директорию вместо страндартной директории настроек</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation>Тема</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation>Набор смайликов</translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation>Сохранить лог чата</translation>
+    </message>
+</context>
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="49"/>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 пользователей в чате</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="146"/>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Неизвестно&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="215"/>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
         <source>%1 users in chat</source>
         <translation>%1 пользователей в чате</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="234"/>
         <source>Save chat log</source>
-        <translation>Сохранить лог чата</translation>
+        <translation type="obsolete">Сохранить лог чата</translation>
     </message>
 </context>
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="84"/>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Покинуть группу</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="54"/>
-        <location filename="../widget/groupwidget.cpp" line="141"/>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
         <source>%1 users in chat</source>
         <translation>%1 пользователей в чате</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="56"/>
-        <location filename="../widget/groupwidget.cpp" line="143"/>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
         <source>0 users in chat</source>
         <translation>Ни одного пользователя в чате</translation>
     </message>
 </context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation>Публичные данные</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation>Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation>Ваш Tox ID</translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.ui" line="20"/>
         <source>qTox</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="1918"/>
         <source>Your name</source>
-        <translation type="unfinished">Ваше имя</translation>
+        <translation>Ваше имя</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2000"/>
         <source>Your status</source>
-        <translation type="unfinished">Ваш статус</translation>
+        <translation>Ваш статус</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2566"/>
         <source>Add friends</source>
-        <translation type="unfinished">Добавить друзей</translation>
+        <translation>Добавить друзей</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2592"/>
         <source>Create a group chat</source>
-        <translation type="unfinished">Создать групповой чат</translation>
+        <translation>Создать групповой чат</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2624"/>
         <source>View completed file transfers</source>
-        <translation type="unfinished"></translation>
+        <translation>Завершённые файлопередачи</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2656"/>
         <source>Change your settings</source>
-        <translation type="unfinished">Изменить ваши настройки</translation>
+        <translation>Изменить ваши настройки</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3238"/>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3241"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished">Ctrl+Q</translation>
+        <translation>Ctrl+Q</translation>
     </message>
 </context>
 <context>
     <name>SelfCamView</name>
     <message>
-        <location filename="../widget/selfcamview.cpp" line="32"/>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
         <translation>Проверка видео</translation>
     </message>
 </context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation>Диалог настроек</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation>Основное</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation>Личные данные</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation>Безопасность</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation>Аудио и видео</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation>Применить</translation>
+    </message>
+</context>
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="34"/>
         <source>User Settings</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation>Пользовательские настройки</translation>
+        <translation type="obsolete">Пользовательские настройки</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="37"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation>Имя</translation>
+        <translation type="obsolete">Имя</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="38"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation>Статус</translation>
+        <translation type="obsolete">Статус</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="39"/>
         <source>(click here to copy)</source>
         <comment>Click on this text to copy TID to clipboard</comment>
-        <translation>(нажмите здесь чтобы скопировать)</translation>
+        <translation type="obsolete">(нажмите здесь чтобы скопировать)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="47"/>
         <source>Test video</source>
         <comment>Text on a button to test the video/webcam</comment>
-        <translation>Проверить видео</translation>
+        <translation type="obsolete">Проверить видео</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="48"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>Включить IPv6 (рекомендуется)</translation>
+        <translation type="obsolete">Включить IPv6 (рекомендуется)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="50"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translatorcomment>Так гораздо понятнее, чем «использовать переводы»</translatorcomment>
-        <translation>Русскоязычный интерфейс</translation>
+        <translation type="obsolete">Русскоязычный интерфейс</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="52"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation>Портативный режим</translation>
+        <translation type="obsolete">Портативный режим</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="54"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Сохранять настройки в рабочую директорию вместо страндартной директории настроек</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="56"/>
         <source>Smiley Pack</source>
         <comment>Text on smiley pack label</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Набор смайликов</translation>
     </message>
 </context>
 <context>
     <name>Widget</name>
     <message>
         <source>Tox</source>
-        <translation type="vanished">Tox</translation>
+        <translation type="obsolete">Tox</translation>
     </message>
     <message>
         <source>Your name</source>
-        <translation type="vanished">Ваше имя</translation>
+        <translation type="obsolete">Ваше имя</translation>
     </message>
     <message>
         <source>Your status</source>
-        <translation type="vanished">Ваш статус</translation>
+        <translation type="obsolete">Ваш статус</translation>
     </message>
     <message>
         <source>Add friends</source>
-        <translation type="vanished">Добавить друзей</translation>
+        <translation type="obsolete">Добавить друзей</translation>
     </message>
     <message>
         <source>Create a group chat</source>
-        <translation type="vanished">Создать групповой чат</translation>
+        <translation type="obsolete">Создать групповой чат</translation>
     </message>
     <message>
         <source>(button inactive currently)</source>
-        <translation type="vanished">(кнопка на данный момент неактивна)</translation>
+        <translation type="obsolete">(кнопка на данный момент неактивна)</translation>
     </message>
     <message>
         <source>Change your settings</source>
-        <translation type="vanished">Изменить ваши настройки</translation>
+        <translation type="obsolete">Изменить ваши настройки</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="vanished">Закрыть</translation>
+        <translation type="obsolete">Закрыть</translation>
     </message>
     <message>
         <source>Ctrl+Q</source>
-        <translation type="vanished">Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="128"/>
+        <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
-        <translation type="unfinished">В сети</translation>
+        <translation>В сети</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="130"/>
+        <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translatorcomment>Вероятно, это не столь долгое путешествие</translatorcomment>
-        <translation type="unfinished">Отошёл</translation>
+        <translation>Отошёл</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="132"/>
+        <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
-        <translation type="unfinished">Занят</translation>
+        <translation>Занят</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation>&lt;Неизвестно&gt;</translation>
     </message>
 </context>
 </TS>

From 7e577359fd64d51983a22f36bf8ec91743875589 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 21:38:38 +0200
Subject: [PATCH 10/30] Improve chat form performance

Should help with #266
---
 widget/chatareawidget.cpp  | 7 +++----
 widget/tool/chataction.cpp | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index 199420e9f..f06ec9534 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -20,6 +20,7 @@
 #include <QDesktopServices>
 #include <QTextTable>
 #include <QAbstractTextDocumentLayout>
+#include <QCoreApplication>
 
 ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     QTextBrowser(parent)
@@ -104,15 +105,13 @@ void ChatAreaWidget::insertMessage(ChatAction *msgAction)
     checkSlider();
 
     int row = chatTextTable->rows() - 1;
-//    chatTextTable->cellAt(row,0).firstCursorPosition().setBlockFormat(nameFormat);
-//    chatTextTable->cellAt(row,2).firstCursorPosition().setBlockFormat(dateFormat);
     QTextCursor cur = chatTextTable->cellAt(row,1).firstCursorPosition();
     cur.clearSelection();
     cur.setKeepPositionOnInsert(true);
+    chatTextTable->appendRows(1);
     chatTextTable->cellAt(row,0).firstCursorPosition().insertHtml(msgAction->getName());
     chatTextTable->cellAt(row,1).firstCursorPosition().insertHtml(msgAction->getMessage());
-    chatTextTable->cellAt(row,2).firstCursorPosition().insertHtml(msgAction->getDate());
-    chatTextTable->appendRows(1);
+    chatTextTable->cellAt(row,2).firstCursorPosition().insertText(msgAction->getDate());
 
     msgAction->setTextCursor(cur);
 
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
index 3587eb600..6625b061f 100644
--- a/widget/tool/chataction.cpp
+++ b/widget/tool/chataction.cpp
@@ -43,14 +43,14 @@ QString ChatAction::QImage2base64(const QImage &img)
 QString ChatAction::getName()
 {
     if (isMe)
-        return QString("<table width=100% cellspacing=0><tr><td align=right><div class=name_me>" + toHtmlChars(name) + "</div></td></tr></table>");
+        return QString("<div class=name_me>" + toHtmlChars(name) + "</div>");
     else
-        return QString("<table width=100% cellspacing=0><tr><td align=right><div class=name>" + toHtmlChars(name) + "</div></td></tr></table>");
+        return QString("<div class=name>" + toHtmlChars(name) + "</div>");
 }
 
 QString ChatAction::getDate()
 {
-    QString res = "<div class=date>" + date + "</div>";
+    QString res = date;
     return res;
 }
 

From 70079015c73e1271eda3d14a78d18ddbdce2d1f4 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 21:57:33 +0200
Subject: [PATCH 11/30] Update translations, add Polish

---
 translations/de.ts | 281 +++++++++++++++++++---------
 translations/fr.ts | 281 +++++++++++++++++++---------
 translations/it.ts | 227 +++++++++++++++++------
 translations/po.ts | 445 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 1013 insertions(+), 221 deletions(-)
 create mode 100644 translations/po.ts

diff --git a/translations/de.ts b/translations/de.ts
index ab61ba9ad..3c2a7284c 100644
--- a/translations/de.ts
+++ b/translations/de.ts
@@ -1,75 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="de_DE">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="32"/>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
         <translation>Freunde hinzufügen</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="35"/>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="36"/>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Nachricht</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
         <translation>Freundschaftseinladung versenden</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translation>Lass uns Toxen!</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="93"/>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
         <translation>Bitte gib eine gültige Tox ID ein</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="110"/>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="114"/>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Fehler beim Auflösen des DNS</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
         <translation>Unererwartete Anzahl von Texteinträgen</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Unerwartete Anzahl von Werten innerhalb des Texteintrages</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="133"/>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>Der DNS Eintrag enthält keine gültige TOX ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>Der DNS Eintrag enthält keine gültige TOX ID</translation>
@@ -78,74 +92,77 @@
 <context>
     <name>Camera</name>
     <message>
-        <location filename="../widget/camera.cpp" line="161"/>
         <source>Camera eror</source>
-        <translation>Kamerafehler</translation>
+        <translation type="vanished">Kamerafehler</translation>
     </message>
     <message>
-        <location filename="../widget/camera.cpp" line="162"/>
         <source>Camera format %1 not supported, can&apos;t use the camera</source>
-        <translation>Kameraformat %1 wird nicht unterstützt. Die Kamera kann nicht verwendet werden</translation>
+        <translation type="vanished">Kameraformat %1 wird nicht unterstützt. Die Kamera kann nicht verwendet werden</translation>
     </message>
 </context>
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="283"/>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
         <translation>Datei versenden</translation>
     </message>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="620"/>
-        <location filename="../widget/form/chatform.cpp" line="626"/>
         <source>Save chat log</source>
-        <translation>Chatverlauf speichern</translation>
+        <translation type="vanished">Chatverlauf speichern</translation>
     </message>
 </context>
 <context>
     <name>CopyableElideLabel</name>
     <message>
-        <location filename="../widget/tool/copyableelidelabel.cpp" line="29"/>
         <source>Copy</source>
-        <translation>Kopieren</translation>
+        <translation type="vanished">Kopieren</translation>
     </message>
 </context>
 <context>
-    <name>FileTransfertWidget</name>
+    <name>FileTransferInstance</name>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="281"/>
+        <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation>Datei speichern</translation>
+        <translation type="unfinished">Datei speichern</translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FileTransfertWidget</name>
+    <message>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="vanished">Datei speichern</translation>
+    </message>
+</context>
 <context>
     <name>FilesForm</name>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="25"/>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="33"/>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="34"/>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -189,69 +206,149 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="86"/>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Tox ID kopieren</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="87"/>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>In Gruppe einladen</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="97"/>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Freund entfernen</translation>
     </message>
 </context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished">IPv6 aktivieren (empfohlen)</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation type="unfinished">Chatverlauf speichern</translation>
+    </message>
+</context>
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="49"/>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 Personen im Chat</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="146"/>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Unbekannt&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="215"/>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
         <source>%1 users in chat</source>
         <translation>%1 Personen im Chat</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="234"/>
         <source>Save chat log</source>
-        <translation>Chatverlauf speichern</translation>
+        <translation type="vanished">Chatverlauf speichern</translation>
     </message>
 </context>
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="54"/>
-        <location filename="../widget/groupwidget.cpp" line="141"/>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
         <source>%1 users in chat</source>
         <translation>%1 Personen im Chat</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="56"/>
-        <location filename="../widget/groupwidget.cpp" line="143"/>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
         <source>0 users in chat</source>
         <translation>0 Personen im Chat</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="84"/>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Gruppe verlassen</translation>
     </message>
 </context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished">Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -303,73 +400,81 @@
 <context>
     <name>SelfCamView</name>
     <message>
-        <location filename="../widget/selfcamview.cpp" line="32"/>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
         <translation>Tox Video testen</translation>
     </message>
 </context>
 <context>
-    <name>SettingsForm</name>
+    <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="34"/>
-        <source>User Settings</source>
-        <comment>&quot;Headline&quot; of the window</comment>
-        <translation>Einstellungen</translation>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="37"/>
-        <source>Name</source>
-        <comment>Username/nick</comment>
-        <translation>Benutzername</translation>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="38"/>
-        <source>Status</source>
-        <comment>Status message</comment>
-        <translation>Status</translation>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="39"/>
-        <source>(click here to copy)</source>
-        <comment>Click on this text to copy TID to clipboard</comment>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="47"/>
-        <source>Test video</source>
-        <comment>Text on a button to test the video/webcam</comment>
-        <translation>Video testen</translation>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="48"/>
-        <source>Enable IPv6 (recommended)</source>
-        <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>IPv6 aktivieren (empfohlen)</translation>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="50"/>
-        <source>Use translations</source>
-        <comment>Text on a checkbox to enable translations</comment>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="52"/>
-        <source>Make Tox portable</source>
-        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="54"/>
-        <source>Save settings to the working directory instead of the usual conf dir</source>
-        <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
+        <source>User Settings</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation type="vanished">Einstellungen</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="56"/>
-        <source>Smiley Pack</source>
-        <comment>Text on smiley pack label</comment>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="vanished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="vanished">Status</translation>
+    </message>
+    <message>
+        <source>Test video</source>
+        <comment>Text on a button to test the video/webcam</comment>
+        <translation type="vanished">Video testen</translation>
+    </message>
+    <message>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="vanished">IPv6 aktivieren (empfohlen)</translation>
     </message>
 </context>
 <context>
@@ -395,22 +500,28 @@
         <translation type="vanished">Strg+Q</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="128"/>
+        <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation type="unfinished">Online</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="130"/>
+        <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation type="unfinished">Abwesend</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="132"/>
+        <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation type="unfinished">Beschäftigt</translation>
     </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished">&lt;Unbekannt&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/fr.ts b/translations/fr.ts
index 435d022c7..50d9b31e1 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -1,75 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="fr_FR">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="32"/>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
         <translation>Ajouter des amis</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="35"/>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
         <translation>ID Tox</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="36"/>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Message</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
         <translation>Envoyer la demande d&apos;ami</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translation>Je souhaiterais vous ajouter à mes contacts</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="93"/>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
         <translation>Merci de remplir un ID Tox valide</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="110"/>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="114"/>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Erreur en consultant le serveur DNS</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
         <translation>Nombre d&apos;entrées texte innatendu</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Nombre d&apos;entrées numériques dans l&apos;entrée texte innatendu</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="133"/>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>La réponse DNS ne contient aucun ID Tox</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>La réponse DNS ne contient pas d&apos;ID Tox valide</translation>
@@ -78,74 +92,77 @@
 <context>
     <name>Camera</name>
     <message>
-        <location filename="../widget/camera.cpp" line="161"/>
         <source>Camera eror</source>
-        <translation>Erreur de caméra</translation>
+        <translation type="vanished">Erreur de caméra</translation>
     </message>
     <message>
-        <location filename="../widget/camera.cpp" line="162"/>
         <source>Camera format %1 not supported, can&apos;t use the camera</source>
-        <translation>Format %1 de la caméra non supporté, impossible de l&apos;utiliser</translation>
+        <translation type="vanished">Format %1 de la caméra non supporté, impossible de l&apos;utiliser</translation>
     </message>
 </context>
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="283"/>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
         <translation>Envoyer un fichier</translation>
     </message>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="620"/>
-        <location filename="../widget/form/chatform.cpp" line="626"/>
         <source>Save chat log</source>
-        <translation>Sauvegarder l&apos;historique de conversation</translation>
+        <translation type="vanished">Sauvegarder l&apos;historique de conversation</translation>
     </message>
 </context>
 <context>
     <name>CopyableElideLabel</name>
     <message>
-        <location filename="../widget/tool/copyableelidelabel.cpp" line="29"/>
         <source>Copy</source>
-        <translation>Copier</translation>
+        <translation type="vanished">Copier</translation>
     </message>
 </context>
 <context>
-    <name>FileTransfertWidget</name>
+    <name>FileTransferInstance</name>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="281"/>
+        <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation>Sauvegarder un fichier</translation>
+        <translation type="unfinished">Sauvegarder un fichier</translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FileTransfertWidget</name>
+    <message>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="vanished">Sauvegarder un fichier</translation>
+    </message>
+</context>
 <context>
     <name>FilesForm</name>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="25"/>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="33"/>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="34"/>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -189,69 +206,149 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="86"/>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Copier l&apos;ID ami</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="87"/>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Inviter dans un groupe</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="97"/>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Supprimer ami</translation>
     </message>
 </context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished">Activer IPv6 (recommandé)</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation type="unfinished">Sauvegarder l&apos;historique de conversation</translation>
+    </message>
+</context>
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="49"/>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="146"/>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Inconnu&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="215"/>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
         <source>%1 users in chat</source>
         <translation>%1 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="234"/>
         <source>Save chat log</source>
-        <translation>Sauvegarder l&apos;historique de conversation</translation>
+        <translation type="vanished">Sauvegarder l&apos;historique de conversation</translation>
     </message>
 </context>
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="54"/>
-        <location filename="../widget/groupwidget.cpp" line="141"/>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
         <source>%1 users in chat</source>
         <translation>%1 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="56"/>
-        <location filename="../widget/groupwidget.cpp" line="143"/>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
         <source>0 users in chat</source>
         <translation>0 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="84"/>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Quitter le groupe</translation>
     </message>
 </context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished">ID Tox</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -303,73 +400,81 @@
 <context>
     <name>SelfCamView</name>
     <message>
-        <location filename="../widget/selfcamview.cpp" line="32"/>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
         <translation>Test vidéo Tox</translation>
     </message>
 </context>
 <context>
-    <name>SettingsForm</name>
+    <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="34"/>
-        <source>User Settings</source>
-        <comment>&quot;Headline&quot; of the window</comment>
-        <translation>Configuration</translation>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="37"/>
-        <source>Name</source>
-        <comment>Username/nick</comment>
-        <translation>Nom</translation>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="38"/>
-        <source>Status</source>
-        <comment>Status message</comment>
-        <translation>Status</translation>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="39"/>
-        <source>(click here to copy)</source>
-        <comment>Click on this text to copy TID to clipboard</comment>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="47"/>
-        <source>Test video</source>
-        <comment>Text on a button to test the video/webcam</comment>
-        <translation>Tester la vidéo</translation>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="48"/>
-        <source>Enable IPv6 (recommended)</source>
-        <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>Activer IPv6 (recommandé)</translation>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="50"/>
-        <source>Use translations</source>
-        <comment>Text on a checkbox to enable translations</comment>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="52"/>
-        <source>Make Tox portable</source>
-        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="54"/>
-        <source>Save settings to the working directory instead of the usual conf dir</source>
-        <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
+        <source>User Settings</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation type="vanished">Configuration</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="56"/>
-        <source>Smiley Pack</source>
-        <comment>Text on smiley pack label</comment>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="vanished">Nom</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="vanished">Status</translation>
+    </message>
+    <message>
+        <source>Test video</source>
+        <comment>Text on a button to test the video/webcam</comment>
+        <translation type="vanished">Tester la vidéo</translation>
+    </message>
+    <message>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="vanished">Activer IPv6 (recommandé)</translation>
     </message>
 </context>
 <context>
@@ -395,22 +500,28 @@
         <translation type="vanished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="128"/>
+        <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation type="unfinished">Connecté</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="130"/>
+        <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation type="unfinished">Indisponnible</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="132"/>
+        <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation type="unfinished">Occupé</translation>
     </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished">&lt;Inconnu&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/it.ts b/translations/it.ts
index 65a34eb9f..dad9d73ca 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -1,75 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="it_IT">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="32"/>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
         <translation>Aggiungi Contatto</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="35"/>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="36"/>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Messaggio</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
         <translation>Invia richiesta d&apos;amicizia</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translation>Permettimi di aggiungerti alla mia lista contatti</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="93"/>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
         <translation>Inserisci un Tox ID valido</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="110"/>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Questo indirizzo non esiste</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="114"/>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Errore nel consultare il server DNS</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
         <translation>Numero inaspettato di text-records</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Numero inaspettato di valori nel text-record</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="133"/>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>La risposta del server DNS non contiene nessun Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>La risposta del server DNS non contiene un Tox ID valido</translation>
@@ -78,7 +92,7 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="73"/>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
         <translation>Invia un file</translation>
     </message>
@@ -86,19 +100,19 @@
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../filetransferinstance.cpp" line="162"/>
+        <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="173"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="173"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation>Non hai sufficienti permessi per scrivere in questa locazione. Scegli un&apos;altra posizione, o annulla il salvataggio.</translation>
@@ -107,18 +121,18 @@
 <context>
     <name>FilesForm</name>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="25"/>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation>Files Trasferiti</translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="33"/>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
         <translation>Ricevuti</translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="34"/>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
         <translation>Inviati</translation>
     </message>
@@ -162,29 +176,71 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="83"/>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Copia Tox ID del contatto</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Invita nel gruppo</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="94"/>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Rimuovi contatto</translation>
     </message>
 </context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished">Abilita IPv6 (consigliato)</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished">Abilita traduzioni</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished">Rendi qTox portabile</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished">Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished">Emoticons</translation>
+    </message>
+</context>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../widget/form/genericchatform.cpp" line="158"/>
-        <location filename="../widget/form/genericchatform.cpp" line="164"/>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
         <source>Save chat log</source>
         <translation>Salva il log della chat</translation>
     </message>
@@ -192,18 +248,18 @@
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="39"/>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 utenti in chat</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="81"/>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Sconosciuto&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="88"/>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
         <source>%1 users in chat</source>
         <translation>%1 utenti in chat</translation>
     </message>
@@ -229,6 +285,36 @@
         <translation>Esci dal gruppo</translation>
     </message>
 </context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished">Stato</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished">Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -280,94 +366,133 @@
 <context>
     <name>SelfCamView</name>
     <message>
-        <location filename="../widget/selfcamview.cpp" line="30"/>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
         <translation>qTox video test</translation>
     </message>
 </context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="34"/>
         <source>User Settings</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation>Impostazioni</translation>
+        <translation type="vanished">Impostazioni</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="37"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation>Nome</translation>
+        <translation type="vanished">Nome</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="38"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation>Stato</translation>
+        <translation type="vanished">Stato</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="39"/>
         <source>(click here to copy)</source>
         <comment>Click on this text to copy TID to clipboard</comment>
-        <translation>(clicca qui per copiare)</translation>
+        <translation type="vanished">(clicca qui per copiare)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="47"/>
         <source>Test video</source>
         <comment>Text on a button to test the video/webcam</comment>
-        <translation>Prova la webcam</translation>
+        <translation type="vanished">Prova la webcam</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="48"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>Abilita IPv6 (consigliato)</translation>
+        <translation type="vanished">Abilita IPv6 (consigliato)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="50"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
-        <translation>Abilita traduzioni</translation>
+        <translation type="vanished">Abilita traduzioni</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="52"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation>Rendi qTox portabile</translation>
+        <translation type="vanished">Rendi qTox portabile</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="54"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation>Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
+        <translation type="vanished">Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="56"/>
         <source>Smiley Pack</source>
         <comment>Text on smiley pack label</comment>
-        <translation>Emoticons</translation>
+        <translation type="vanished">Emoticons</translation>
     </message>
 </context>
 <context>
     <name>Widget</name>
     <message>
-        <location filename="../widget/widget.cpp" line="129"/>
+        <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="131"/>
+        <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation>Assente</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="133"/>
+        <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Occupato</translation>
     </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished">&lt;Sconosciuto&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/po.ts b/translations/po.ts
new file mode 100644
index 000000000..f3a5a3144
--- /dev/null
+++ b/translations/po.ts
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AddFriendForm</name>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
+        <source>Add Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <source>Tox ID</source>
+        <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <source>Message</source>
+        <comment>The message you send in friend requests</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
+        <source>Send friend request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
+        <source>Tox me maybe?</source>
+        <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
+        <source>Please fill in a valid Tox ID</source>
+        <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
+        <source>This address does not exist</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <source>Error while looking up DNS</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <source>Unexpected number of text records</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
+        <source>Unexpected number of values in text record</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
+        <source>The DNS lookup does not contain any Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
+        <source>The DNS lookup does not contain a valid Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChatForm</name>
+    <message>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
+        <source>Send a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileTransferInstance</name>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="191"/>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FilesForm</name>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
+        <source>Transfered Files</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
+        <source>Uploads</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FriendRequestDialog</name>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
+        <source>Friend request</source>
+        <comment>Title of the window to aceept/deny a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
+        <source>Someone wants to make friends with you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
+        <source>User ID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
+        <source>Friend request message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
+        <source>Accept</source>
+        <comment>Accept a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
+        <source>Reject</source>
+        <comment>Reject a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FriendWidget</name>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <source>Copy friend ID</source>
+        <comment>Menu to copy the Tox ID of that friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
+        <source>Invite in group</source>
+        <comment>Menu to invite a friend in a groupchat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
+        <source>Remove friend</source>
+        <comment>Menu to remove the friend from our friendlist</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GroupChatForm</name>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <source>%1 users in chat</source>
+        <comment>Number of users in chat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
+        <source>&lt;Unknown&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GroupWidget</name>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <source>0 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
+        <source>Quit group</source>
+        <comment>Menu to quit a groupchat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="20"/>
+        <source>qTox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1918"/>
+        <source>Your name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2000"/>
+        <source>Your status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2566"/>
+        <source>Add friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2592"/>
+        <source>Create a group chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2624"/>
+        <source>View completed file transfers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2656"/>
+        <source>Change your settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3238"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3241"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelfCamView</name>
+    <message>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
+        <source>Tox video test</source>
+        <comment>Title of the window to test the video/webcam</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <location filename="../widget/widget.cpp" line="133"/>
+        <source>Online</source>
+        <comment>Button to set your status to &apos;Online&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="135"/>
+        <source>Away</source>
+        <comment>Button to set your status to &apos;Away&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="137"/>
+        <source>Busy</source>
+        <comment>Button to set your status to &apos;Busy&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

From e9fa8de43d13555ea36531e362c5786ab4c48ece Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 21:59:49 +0200
Subject: [PATCH 12/30] Enable Polish translation

---
 qtox.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qtox.pro b/qtox.pro
index 96e609c33..19413ea0d 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -32,7 +32,8 @@ CONFIG   += c++11
 TRANSLATIONS = translations/de.ts \
                translations/fr.ts \
                translations/it.ts \
-               translations/ru.ts
+               translations/ru.ts \
+               translations/po.ts
 
 RESOURCES += res.qrc
 

From b6ccbfc62fffd19449114ab0e0f112d9bf6a8b60 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 22:24:29 +0200
Subject: [PATCH 13/30] Fix greentext

Thanks to dewbasaur for reporting the bug
---
 ui/chatArea/innerStyle.css | 4 ++--
 widget/tool/chataction.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index 61380b073..28bcb32c8 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -22,8 +22,8 @@ div.date {
   white-space: nowrap;
 }
 
-div.quote {
-  background-color: #6bc260;
+span.quote {
+  color: #6bc260;
 }
 
 div.green {
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
index 6625b061f..bcd1f1080 100644
--- a/widget/tool/chataction.cpp
+++ b/widget/tool/chataction.cpp
@@ -102,9 +102,9 @@ QString MessageAction::getMessage()
     for (QString& s : messageLines)
     {
         if (QRegExp("^[ ]*&gt;.*").exactMatch(s))
-            message_ += "<div class=quote>" + s.right(s.length()-4) + "</div><br>";
+            message_ += "<span class=quote>>" + s.right(s.length()-4) + "</span><br/>";
         else
-            message_ += s + "<br>";
+            message_ += s + "<br/>";
     }
     message_ = message_.left(message_.length()-4);
 

From 904a584d75ec8d2abed1d3c10f2cf306ff881f1a Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 23:35:44 +0200
Subject: [PATCH 14/30] Change video preview button text

---
 widget/settingsdialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index 4f9c26a9b..c4b764043 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -131,7 +131,7 @@ public:
 
         camView = new SelfCamView(parent->getWidget()->getCamera());
         camView->hide(); // hide by default
-        testVideo = new QPushButton("enable video");
+        testVideo = new QPushButton("Show video preview");
         connect(testVideo, SIGNAL(clicked()), this, SLOT(onTestVideoPressed()));
 
         QVBoxLayout *vLayout = new QVBoxLayout();
@@ -152,13 +152,13 @@ public:
 
     void showTestVideo()
     {
-        testVideo->setText("disable video");
+        testVideo->setText("Hide video preview");
         camView->show();
     }
 
     void closeTestVideo()
     {
-        testVideo->setText("enable video");
+        testVideo->setText("Show video preview");
         camView->close();
     }
 

From 627e5b178b1fe9bac3469b03f5f3136f2b36c3fc Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 23:41:13 +0200
Subject: [PATCH 15/30] Change settings dialog title

---
 widget/settingsdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index c4b764043..05ce3c165 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -192,7 +192,7 @@ SettingsDialog::SettingsDialog(Widget *parent) :
     createButtons();
     createConnections();
     createLayout();
-    setWindowTitle(tr("Settings Dialog"));
+    setWindowTitle(tr("qTox – Settings"));
 }
 
 void SettingsDialog::createPages()

From 5c1ae49f81508dc5ed4daf7c47f63747239f77e8 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 23:55:37 +0200
Subject: [PATCH 16/30] Typo

---
 widget/form/addfriendform.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widget/form/addfriendform.cpp b/widget/form/addfriendform.cpp
index 2c9b197b2..55f5e80dd 100644
--- a/widget/form/addfriendform.cpp
+++ b/widget/form/addfriendform.cpp
@@ -96,7 +96,7 @@ void AddFriendForm::onSendTriggered()
         showWarning(tr("Please fill in a valid Tox ID","Tox ID of the friend you're sending a friend request to"));
     } else if (isToxId(id)) {
         if (id.toUpper() == Core::getInstance()->getSelfId().toString().toUpper())
-            showWarning(tr("You can't add yourself as a friend !","When trying to add your own Tox ID as friend"));
+            showWarning(tr("You can't add yourself as a friend!","When trying to add your own Tox ID as friend"));
         else
             emit friendRequested(id, getMessage());
         this->toxId.setText("");

From 965c76a31545c61303d4485c4326887cc6ba4ba3 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 00:07:25 +0200
Subject: [PATCH 17/30] Add Manol translation

Ayy ! You have mothafucking friend request you little bitch !
---
 qtox.pro               |   3 +-
 translations/de.ts     |   4 +-
 translations/fr.ts     |   4 +-
 translations/it.ts     |   4 +-
 translations/mannol.ts | 445 +++++++++++++++++++++++++++++++++++++++++
 translations/po.ts     |   4 +-
 translations/ru.ts     |  15 +-
 7 files changed, 467 insertions(+), 12 deletions(-)
 create mode 100644 translations/mannol.ts

diff --git a/qtox.pro b/qtox.pro
index 19413ea0d..b733387b8 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -33,7 +33,8 @@ TRANSLATIONS = translations/de.ts \
                translations/fr.ts \
                translations/it.ts \
                translations/ru.ts \
-               translations/po.ts
+               translations/po.ts \
+               translations/mannol.ts
 
 RESOURCES += res.qrc
 
diff --git a/translations/de.ts b/translations/de.ts
index 3c2a7284c..42adc68f9 100644
--- a/translations/de.ts
+++ b/translations/de.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
-        <source>You can&apos;t add yourself as a friend !</source>
+        <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -410,7 +410,7 @@
     <name>SettingsDialog</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
-        <source>Settings Dialog</source>
+        <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/fr.ts b/translations/fr.ts
index 50d9b31e1..2f61287cb 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
-        <source>You can&apos;t add yourself as a friend !</source>
+        <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -410,7 +410,7 @@
     <name>SettingsDialog</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
-        <source>Settings Dialog</source>
+        <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/it.ts b/translations/it.ts
index dad9d73ca..a7c3f39c0 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
-        <source>You can&apos;t add yourself as a friend !</source>
+        <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -376,7 +376,7 @@
     <name>SettingsDialog</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
-        <source>Settings Dialog</source>
+        <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/mannol.ts b/translations/mannol.ts
new file mode 100644
index 000000000..93b9d0c3c
--- /dev/null
+++ b/translations/mannol.ts
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AddFriendForm</name>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
+        <source>Add Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <source>Tox ID</source>
+        <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <source>Message</source>
+        <comment>The message you send in friend requests</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
+        <source>Send friend request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
+        <source>Tox me maybe?</source>
+        <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
+        <source>Please fill in a valid Tox ID</source>
+        <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend!</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
+        <source>This address does not exist</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <source>Error while looking up DNS</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <source>Unexpected number of text records</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
+        <source>Unexpected number of values in text record</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
+        <source>The DNS lookup does not contain any Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
+        <source>The DNS lookup does not contain a valid Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChatForm</name>
+    <message>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
+        <source>Send a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileTransferInstance</name>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="191"/>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FilesForm</name>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
+        <source>Transfered Files</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
+        <source>Uploads</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FriendRequestDialog</name>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
+        <source>Friend request</source>
+        <comment>Title of the window to aceept/deny a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
+        <source>Someone wants to make friends with you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
+        <source>User ID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
+        <source>Friend request message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
+        <source>Accept</source>
+        <comment>Accept a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
+        <source>Reject</source>
+        <comment>Reject a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FriendWidget</name>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <source>Copy friend ID</source>
+        <comment>Menu to copy the Tox ID of that friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
+        <source>Invite in group</source>
+        <comment>Menu to invite a friend in a groupchat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
+        <source>Remove friend</source>
+        <comment>Menu to remove the friend from our friendlist</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GroupChatForm</name>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <source>%1 users in chat</source>
+        <comment>Number of users in chat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
+        <source>&lt;Unknown&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GroupWidget</name>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <source>0 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
+        <source>Quit group</source>
+        <comment>Menu to quit a groupchat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="20"/>
+        <source>qTox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1918"/>
+        <source>Your name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2000"/>
+        <source>Your status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2566"/>
+        <source>Add friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2592"/>
+        <source>Create a group chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2624"/>
+        <source>View completed file transfers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2656"/>
+        <source>Change your settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3238"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3241"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelfCamView</name>
+    <message>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
+        <source>Tox video test</source>
+        <comment>Title of the window to test the video/webcam</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>qTox – Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <location filename="../widget/widget.cpp" line="133"/>
+        <source>Online</source>
+        <comment>Button to set your status to &apos;Online&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="135"/>
+        <source>Away</source>
+        <comment>Button to set your status to &apos;Away&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="137"/>
+        <source>Busy</source>
+        <comment>Button to set your status to &apos;Busy&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/translations/po.ts b/translations/po.ts
index f3a5a3144..93b9d0c3c 100644
--- a/translations/po.ts
+++ b/translations/po.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
-        <source>You can&apos;t add yourself as a friend !</source>
+        <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -376,7 +376,7 @@
     <name>SettingsDialog</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
-        <source>Settings Dialog</source>
+        <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/ru.ts b/translations/ru.ts
index 6273249e8..87c52b238 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -49,9 +49,14 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend!</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>You can&apos;t add yourself as a friend !</source>
         <comment>When trying to add your own Tox ID as friend</comment>
-        <translation>Нельзя добавить самого себя в друзья!</translation>
+        <translation type="vanished">Нельзя добавить самого себя в друзья!</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="116"/>
@@ -423,9 +428,13 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
         <source>Settings Dialog</source>
-        <translation>Диалог настроек</translation>
+        <translation type="vanished">Диалог настроек</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>qTox – Settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="222"/>

From b2c75dbc5116c0299f0e03badd4411671d6831b6 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 00:12:00 +0200
Subject: [PATCH 18/30] Update Mannol translation

---
 translations/mannol.qm | Bin 0 -> 234 bytes
 translations/mannol.ts |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 translations/mannol.qm

diff --git a/translations/mannol.qm b/translations/mannol.qm
new file mode 100644
index 0000000000000000000000000000000000000000..1d4f6d7b644a1b48cc36ba7cefb5673c02d7c4a0
GIT binary patch
literal 234
zcmX9&F%E)25L{!TG*&hi7DwYNY&6CPXe{hRSl|NO1vn)54=Zi_g^jT_BtF46_yxx^
zo4K9YotwMqEf}?*%jxBgAG_=QJtrb((4IHwB!Ooa$B|~#pai+VmNZr9F?n<#2Foxp
zR)^U5l;EnO2%C@!aE1z?3a}gwrV@UE#D7u>k3pq2ZEuy2JiO=pKGFjwYn`!HENV}g
lQWz~VFJTcDl2uTOTAEliy6VF^T-xD^^NLHekY1{z&KDe4II;i$

literal 0
HcmV?d00001

diff --git a/translations/mannol.ts b/translations/mannol.ts
index 93b9d0c3c..a1856348e 100644
--- a/translations/mannol.ts
+++ b/translations/mannol.ts
@@ -148,7 +148,7 @@
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
         <source>Someone wants to make friends with you</source>
-        <translation type="unfinished"></translation>
+        <translation>Ayy ! You have mothafucking friend request you little bitch !</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>

From 1a6d2d925e804d5c6c718db791369ed989287d7d Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zexavexxe@gmail.com>
Date: Fri, 12 Sep 2014 23:21:02 +0100
Subject: [PATCH 19/30] Add Polish translation

---
 translations/{po.ts => pl.ts} | 148 +++++++++++++++++-----------------
 1 file changed, 76 insertions(+), 72 deletions(-)
 rename translations/{po.ts => pl.ts} (75%)

diff --git a/translations/po.ts b/translations/pl.ts
similarity index 75%
rename from translations/po.ts
rename to translations/pl.ts
index 93b9d0c3c..6aaa4e6d6 100644
--- a/translations/po.ts
+++ b/translations/pl.ts
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.0" language="pl_PL">
 <context>
     <name>AVPage</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="130"/>
         <source>Video Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia wideo</translation>
     </message>
 </context>
 <context>
@@ -14,79 +14,79 @@
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj znajomych</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tox ID</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomość</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyślij zapytanie do znajomego</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
-        <translation type="unfinished"></translation>
+        <translation>Może Tox ze mną?</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
-        <translation type="unfinished"></translation>
+        <translation>Proszę wpisać poprawny Tox ID</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
         <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nie możesz dodać siebie jako znajomego!</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ten adres nie istnieje</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
-        <translation type="unfinished"></translation>
+        <translation>Błąd podczas sprawdzania DNS</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nieoczekiwana liczba wpisów tekstowych</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nieoczekiwana liczba wartości we wpisie tekstowym</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
-        <translation type="unfinished"></translation>
+        <translation>DNS nie zawiera żadnego Tox ID</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
         <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
-        <translation type="unfinished"></translation>
+        <translation>DNS nie zawiera poprawnego Tox ID</translation>
     </message>
 </context>
 <context>
@@ -94,7 +94,7 @@
     <message>
         <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyślij plik</translation>
     </message>
 </context>
 <context>
@@ -103,19 +103,19 @@
         <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz plik</translation>
     </message>
     <message>
         <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nie można zapisać w lokacji</translation>
     </message>
     <message>
         <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nie masz uprawnienia by zapisać w tej lokacji. Wybierz inną lub anuluj zapis.</translation>
     </message>
 </context>
 <context>
@@ -124,17 +124,17 @@
         <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation type="unfinished"></translation>
+        <translation>Przesłane pliki</translation>
     </message>
     <message>
         <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobrane</translation>
     </message>
     <message>
         <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysłane</translation>
     </message>
 </context>
 <context>
@@ -143,34 +143,36 @@
         <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
         <source>Friend request</source>
         <comment>Title of the window to aceept/deny a friend request</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>no idea how it shoule be translated</translatorcomment>
+        <translation>Zapytanie znajomego</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
         <source>Someone wants to make friends with you</source>
-        <translation type="unfinished"></translation>
+        <translation>Ktoś chce być twoim znajomym</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
         <source>User ID:</source>
-        <translation type="unfinished"></translation>
+        <translation>ID użytkownika:</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
         <source>Friend request message:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>better wording needed?</translatorcomment>
+        <translation>Wiadomość w zapytaniu do znajomej/go:</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
         <source>Accept</source>
         <comment>Accept a friend request</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zaakceptuj</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
         <source>Reject</source>
         <comment>Reject a friend request</comment>
-        <translation type="unfinished"></translation>
+        <translation>Odrzuć</translation>
     </message>
 </context>
 <context>
@@ -179,19 +181,19 @@
         <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj ID znajomej/go</translation>
     </message>
     <message>
         <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zaproś do grupy</translation>
     </message>
     <message>
         <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
-        <translation type="unfinished"></translation>
+        <translation>Usuń znajomego</translation>
     </message>
 </context>
 <context>
@@ -199,41 +201,42 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="30"/>
         <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Główne ustawienia</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="33"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation type="unfinished"></translation>
+        <translation>Użyj IPv6 (rekomendowane)</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="35"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
-        <translation type="unfinished"></translation>
+        <translation>Użyj tłumaczenia</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="37"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zrób Tox przenośnym</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zamiast domyślnego katalogu użyj obecnego do zapisania ustawień</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="47"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Motyw</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Smiley Pack</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>needs better translation</translatorcomment>
+        <translation>Paczka uśmiechów</translation>
     </message>
 </context>
 <context>
@@ -242,7 +245,7 @@
         <location filename="../widget/form/genericchatform.cpp" line="142"/>
         <location filename="../widget/form/genericchatform.cpp" line="148"/>
         <source>Save chat log</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz historię rozmowy</translation>
     </message>
 </context>
 <context>
@@ -251,17 +254,17 @@
         <location filename="../widget/form/groupchatform.cpp" line="41"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 użytkowników w czacie</translation>
     </message>
     <message>
         <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Nieznany/a&gt;</translation>
     </message>
     <message>
         <location filename="../widget/form/groupchatform.cpp" line="90"/>
         <source>%1 users in chat</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 użytkowników w czacie</translation>
     </message>
 </context>
 <context>
@@ -270,19 +273,19 @@
         <location filename="../widget/groupwidget.cpp" line="58"/>
         <location filename="../widget/groupwidget.cpp" line="100"/>
         <source>%1 users in chat</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 użytkowników w czacie</translation>
     </message>
     <message>
         <location filename="../widget/groupwidget.cpp" line="60"/>
         <location filename="../widget/groupwidget.cpp" line="102"/>
         <source>0 users in chat</source>
-        <translation type="unfinished"></translation>
+        <translation>0 użytkowników w czacie</translation>
     </message>
     <message>
         <location filename="../widget/groupwidget.cpp" line="83"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
-        <translation type="unfinished"></translation>
+        <translation>Opuść grupę</translation>
     </message>
 </context>
 <context>
@@ -290,29 +293,29 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="80"/>
         <source>Public Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacja publiczna</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="81"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nick</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation type="unfinished"></translation>
+        <translation>Status</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="93"/>
         <source>Tox ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Tox ID</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="94"/>
         <source>Your Tox ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Twój Tox ID</translation>
     </message>
 </context>
 <context>
@@ -320,47 +323,48 @@
     <message>
         <location filename="../mainwindow.ui" line="20"/>
         <source>qTox</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="1918"/>
         <source>Your name</source>
-        <translation type="unfinished"></translation>
+        <translation>Twój nick</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2000"/>
         <source>Your status</source>
-        <translation type="unfinished"></translation>
+        <translation>Twój status</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2566"/>
         <source>Add friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj znajomych</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2592"/>
         <source>Create a group chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Utwórz czat grupowy</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2624"/>
         <source>View completed file transfers</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobacz zakończone transfery plików</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2656"/>
         <source>Change your settings</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>translated as &quot;change settings&quot;;  seems to be simpler this way</translatorcomment>
+        <translation>Zmień ustawienia</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3238"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3241"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
 </context>
 <context>
@@ -369,7 +373,7 @@
         <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tox test wideo</translation>
     </message>
 </context>
 <context>
@@ -377,42 +381,42 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
         <source>qTox – Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox – Ustawienia</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="222"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Główne</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="228"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Tożsamość</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="234"/>
         <source>Privacy</source>
-        <translation type="unfinished"></translation>
+        <translation>Prywatność</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="240"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio/Wideo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="249"/>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="250"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Zastosuj</translation>
     </message>
 </context>
 <context>
@@ -421,25 +425,25 @@
         <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
-        <translation type="unfinished"></translation>
+        <translation>Online</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nieobecny/a</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zajęty/a</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="605"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Nieznany/a&gt;</translation>
     </message>
 </context>
 </TS>

From 5e12a5fa3e14c3c2c80a619ffa69875a49894ea6 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 11:49:58 +0200
Subject: [PATCH 20/30] Update translations

---
 qtox.pro           |   2 +-
 translations/de.qm | Bin 4328 -> 3969 bytes
 translations/fr.qm | Bin 4515 -> 3969 bytes
 translations/it.qm | Bin 5964 -> 5820 bytes
 translations/pl.qm | Bin 0 -> 6709 bytes
 translations/ru.qm | Bin 6821 -> 6581 bytes
 6 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 translations/pl.qm

diff --git a/qtox.pro b/qtox.pro
index b733387b8..250d3abc8 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -33,7 +33,7 @@ TRANSLATIONS = translations/de.ts \
                translations/fr.ts \
                translations/it.ts \
                translations/ru.ts \
-               translations/po.ts \
+               translations/pl.ts \
                translations/mannol.ts
 
 RESOURCES += res.qrc
diff --git a/translations/de.qm b/translations/de.qm
index c5132443ed394bc90ef30d8bba13ec0870e60e15..8a6769d20ef422e9932aed64235f71b97cd1ba2b 100644
GIT binary patch
delta 731
zcmZWlOK1~O6g|_tnM^Wordh-ytwkzrt=3kNRumT{!G2X*Yqh!&V=_qx!$gv)F@nUP
zg-8{JQCr&LDhsX97AguVC{&?z<w8U^x`?QtJ3kc{;%y?>;No)LIq%$i&wHP0GV8B-
z(|ur9E&*y9Z0Zi-48*QhKuMtGHv_~k@D1C5V*x!oZUDT((OvZmka`?TV<P~bv(%JD
zzT0d(dmV6{DWdy4o7hF%{fgbaDp21(Hd}QRkZ0KA+HXMFEw((F2huno)-}B)V_Ol`
zcCl@!77!rn+uA8mUc9X2XyK$dJ-R@_=EVECmlVifL?thstb9uPCMm|rFM6cdo<oF(
zox<9cKrfu`x-r6P=hDXu6y$*{WG>SDAFk}w0FFS&xSn-A1e{6NJC%|-pSXYCYynt5
z?`)t!{G1w^J4MO4y13yhy%_4!B<a!{ZQXc?^y6Cp=qv>~t<8n+k$>3$G|&85!7JK|
z+(D(;6Y}OY-VP(G55xmzBCN-|&4d*&gZlhyS#j7S+A*$l>ZTqKMEe2}-TuJ$%H;*Y
z2-?kjryWx(?FPPJ@8*qkUbMe!TX=U!H!Z_T6*`*AH<k*ISiM@Rd@gTP-1`HDIcS)n
zSkkWc)R%D6v$cfhJgp^syLQl?=FMqo&<I6zOK{L%c;LecB%vcgWg;Z6{E$S&e91t{
zxk6UiE8s6!gBZelgkixz1lGSM|8U~JCXQa393`s>T}I8{1yZjWHB5c=iY#4~3Bn&H
C;=F4B

delta 1043
zcmZuuTSyd982-ndnVp^88O;nummJHrNV5bDe5fcdS&EUaMFiF8p1tJm&N6d$b$eN)
z3xY+)R7y$@B|X%G!dg%i6;_0AQEx#7f%a}UBBFnGRkUI_^WVSk`_CCD{aiL&kU9x)
zEC?XK2KIImfPVvAOC5mJ2NlmYVtxzM{$>H}w_s1)1hCD(fgM*duiN&Q`~(mf+w90W
z0C>SB$0_!mU`Ge90Ei@OoiEwz^%%R{?A=QY&P}kBB}Wn8&OR#t0+7nN!G0h6gaC&)
z&(`+<&MIzqupEE^?t*gy2|BntLo+xq&E21PivsrYy~R%vP~$aM6AHe_YmHq<Ec403
zrPw!bXNoKVkL{vo1nc!#>x|fE=g$D-Rtn6(S;YS)q}pym5V$<Y;J6nP1CHk{4*?w2
zjt>$lb0owc*J=US4%fcTNFaZed{Z&Z&q#FoG62^uz1pyV!a<rH!@4jmyGMOUTqt)8
zO`_0*JmsH8p$|gH8c3gF3b<4ew1Nr|AfTi5qYXmXiUbRY$Kz~JBScpfqHDU{%4K85
zhW_|p(;A{g5Ql;S9;m^8AA~UHLobS6529POI7ZZBNr8dRFFdF5RAZ?T+X&i~vJ~h=
z&?tVZVG<SuQV^{8@NYp|kwu8P<rQidSMY0kM5T(SMu}=vG2*dUg{D*Dt5SN@=q9Sf
z4WiH>!N}Tp#j@skv6T}Vf+{uR{6SkDw3@pdg>JS%izThLe9KY0!=x!3@{u;Rn}p3L
z{LX^4&7m;y>T1;R6P+Fj`2vKd*Vvu5^qeR#=8)K&e&^&FlgRC+TRbkgItitrXuxPj
zrRGPW&|Gj8=dVm=uH9vBm)EW5JE=<JhQ+^XF4IzEM&&Y}=p_bK5~xZ0e_Js$;eAIl
zuR!qO!<nZEthzm^%OJY4B;p?&GbL5p`Rs1yJ*lE{(a*@>!3!GnFTaG%tMyw5OZ{`w
Sw&htxuFGAT9mJj-hWP`r)cl74

diff --git a/translations/fr.qm b/translations/fr.qm
index e3d68b2e1a1bf5114c201fee7de16d73986ac815..98e9e1aaa0abc0d733d08a78db17bff6152751da 100644
GIT binary patch
delta 603
zcmZ3i+$cXmq&|RwrMHuTfw!80WzI?<y@i3*!<2!6yO+V_9}5Emn;3&*>0|~5=GP2f
zW>Xm$c;uKprGEj%)0j_9Z)IR$IL}f!r-Xrl^#;p~jwuWboM#|3*A|vpmOwt&AC}eq
zj6i*UEbFBs85lSou<TL!!oa{ZgXR0|#|#Yh48E+Yy7zzz%ONzcE318m3IhWp8*8e8
zE6_prS$nvb04==Ex~lsy&|y1Rw=KB>bdV8*=6=nVEp-4W?#PzU160qd!<O$73ZyI8
z86`jt5M$?3oep%EH~XpQ%|M6j<X~)U0h<4Yvtv#OLj(h3JLeIPT?`ED3pwxe0$s-b
zp6kan69xvBJRWxqpg}zKyeS(BfG)S;J)!g&=wk-nQ?r5M?81C9Gg5%!Gx&nK*8?4t
z#<wAD3sC*<Oa=x%fz6W`4Ol08bNEa?$KfU_;+C0{8d8*)SDcnw<e67ol9-pAx><vh
zmwEDjz9=4U_td=9qQsnl#Prn3XV?ol_`w31$&>qeT_&I95uRMnGY^PmC;#VVoxG2C
z`($l?DIU+1)Vz|+l1i|yKz?;0WC2EIpi6ls7qW;>zQ@ANi>kO%K$V-zH!(9WJTosP
zzkKpi0W}o9x}ZJ^KUUBjg<rtuKluTV7CT#bW=eW$$z)N1%*odUblE$Ab}}(D0suqf
Bs-*w`

delta 1078
zcmZWnT}TvB6h70=%>K>nR{9Y3<CJa|7^&EQAYxis`A}<8y)?SBIy&xbGh=8ki)3h2
zl-*J(Df%I(pn|L@3XFOP2?D9tBnm3(&8R4dzS*@!iObBr=ey_o&UemCcm9=vQ@N>5
zqJ1qyVT<?^M~Ol`#1CJ`{)G5zT|{1vge|Lx<g>K&X#wz!RQ`tt{)Q?$7?I}-)vi7Z
z{F7(v{9i=Ah-Yl@2ob&FyM`U)4e~>MXNUq9GrJ`6=hh*X>iC-{IigfJm%lxK4+<>j
z9~XWjnl;4#IR733JA}xJw?x5Op`xXbh!X{^q#8ymh2z1iC^R74IQ9&@QQ`j8*Dz8h
zw&jgNn2Dx@Jn^1rZmNfYwPM%qeB@1fxp}UU&)z^}5ceC>dy0a+-m#B|A^g(Eb@!mq
zS6^!TWg?;2-!~jZ-0Oe7<q?s8zkfo8LI175&w+9xJ|S&hh63RMId&%r{I~3k^n+)~
zFP2QA0g}hg<K8zOS}+tt;fB!8W4B>69=a1Bfzb(_Xf_wP+sc&)DTS)Z!qTV%Z-rtw
zDbz$NwbN%Hs?Svv@dT^XcFj^1%`z>oi)CWYgYzM(Arsl{;5pz&s5Gl(0GpwRD1qz*
zb~}Z#Ni3J_pkOgT9WpLrW9igLM%q%wm_bEgIKT}&Hg2q}!SX4Canov79VJq#Buq!K
zJCaG$a<o{n(xfJe9Hqn76sJW)gmxr#S}SZMa6s@?wWtp37wgL;s)CCo>P)Y~SDDE!
zmo(QssEvkJZRjy=yV|H3?47tRH>XB7w5X*f?6_t*4SK9ubM97pWe@8KE@Tx_9vctl
zu=O}!3U;%H0b?p&!!Ag3SgX{}^iVCU3+$DpU7F+QiDtV79kK6H{!C!8T+}u_BmE^7
zQ51G<j0mPN%*^x;qKO#BYi5TPh-$W@9E5YzZDxjYS|~5weS+ekHoHH^>0s`ndRw!U
ze>MN(u@51g9hVianCY55ke9N`@VWx`7ZG91q|U4XPt@#8&weWRle{v^TM}9mp3>m@
Jz@6pc{sJaL3BUjV

diff --git a/translations/it.qm b/translations/it.qm
index 890aaaea2f5951d4070983c7a9ca61a7acc417b1..2523c49cbbb5ce0bc93e6891af285cbe0d984d2e 100644
GIT binary patch
delta 568
zcmX@3w?}t^NZ<(umflVV1`#g?mN_edbU6d7hbaStz!C=b><k75;i(KJ|5z9pIKDDC
zmQH41V423?Wj2+8LGS^??7vqS7=#2E=Et)#Fz|#h@n<Ci`TY}f)#~}Sv&`t2!oa}4
zn`M?IkQU%&S>4YFl#OFqFCEFi!2O(MkIEMY2BsA(-)BE&U|{fPRn@%*R9^<6MR-`v
zy%sYt@UgJkXQ(hRF!Hdb8n^;ow~V!idkF&r=N;Bn-G_nZUS!?21n3H8C@sjumMwLF
zL7PD!hAp25sDbq$TfR#u0|T2cJEH{1LEP+Is?&i6N3frI-VF4f|72T6yLw?!p5kzz
zJ2={S-mC9sVBkH@o3fz*=uUUu6H1qXzBL8XpMmaV;5{`PXdIUWpNzf|(AR7EWM-rQ
z)y?EHo*xIaW-4D$0Wg#V8~K8|*8@X~l`mKZsGoz8Z$sJ^pmhf_fu6X`3^YiI!I2>y
z2s0T<87AuraBOB`y39Q}Ryc--+dVZewJ0$sATd34@-bmw6oJjYB7BS}B9k*j4N(OY
z#5_<0HecWkWSXohBE#dElA2eNSyBl$dYPyys=zK*HC_~v%`yUam?nSbGh$~8&rC^A
KEt$MqY$5;?5tuXp

delta 761
zcmZXQOH30{6o&sPbK6>GZcAHCBaPHb5kf!=R^kRjB8ZJd1EL`s6{jN|3r=kdhK*eq
zjRp`&MUj%QkOk@jVvQToNZb(O!dK!#Wn&Br6HR=?m5<XV8e4KRb7s!@&pF?J=c}LA
zTyb_jgE)K%aK3;zd5hw2uogdHuZJld0&Gc?FKndz5Vrmj0rPh>_9X%F8UowK0KSaW
z&sTtzW9ldairyKlCl&f19#zW|QnNUI@hTt(#EI>hI4Ry45vY1toGs}jwJy$=eFF?L
z;*ZpO0DGCQdYN>L)dz0U)_S%hR0aqVQ)`=m;u<zoI1Q|M%SJ|sy2!$A4?Y1L583@`
zq9}N746l1k{U43G)PyRq1*5*R12DE42M&~y@RLb!5r{NlviPn8g)63|m2+gXHR%@`
z5;lhvJ4hVn3)1IJ4@jPngL4s*?UEP0FUf5k#jnH(c_~F>EiUff?4{cZa`$+UbT@e2
z)Dc=Y#@ixvOFY5b250HE7;kq|zgggOC+^X@M;e(qR6v8gXhb(14Sh&|5#AK08*F<F
z=@Q3l!?9XaKtT`H6gpk-;54Z;iV>)YQdFSRw??%nWh%`XG$TFE3Z+L=!k&;CRXuUt
zqv(-=N)r{Nb~PT?PIbqc^=NN$QSOp+Gk)HhmpO0WkRwT7=3L0r%viVNW$xO29sjQq
zGG5nXA93pF&wA;}zRwW%@vOVvfAp69YAo*Q*Mh3Pn)!pZr8oyDJKBZa$+M2qQn@3h
OMm>KwukNl|JNgF{>BDpY

diff --git a/translations/pl.qm b/translations/pl.qm
new file mode 100644
index 0000000000000000000000000000000000000000..d05682dd157ed6c4cdf4f6a3a40d7171139dab1b
GIT binary patch
literal 6709
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

literal 0
HcmV?d00001

diff --git a/translations/ru.qm b/translations/ru.qm
index be9acca27be53db64295085b086a990c5702861b..50ef1c79f7626d2a63376a1e2b030909131555d6 100644
GIT binary patch
delta 573
zcmX9*T}YEr7=E_zoPGPYecv|IX*q>tQa6z>Ee2UAMVk<WC6Q85nOGw<O2Vtrk6_u4
zxN55n44M}%NI?x!qadrXhFxT%f=cMZi-Im%L_yI5yLve1Jn!@Kp0S1*|8Qw!Js>*(
zPXOZTCE_wfavUhPLk1fFcQw>-H&A*F_5TE5T}0rcA8@QiQ(qJiyAV7Z0Lm1!Y`O`Q
zd`0^=&KYG${9OW8RbljyB)`urnx2r?Xm*}B%KNn9DNF$oKnYd;0ko}3HZ}m5%*xx5
zA2f1`{^S|rh=_;gIXEEVgEuJrvxqLIxD(*nbyD2FZlYknn5f(j*dK^_UjZ<$h+l~>
z0B*_J4W9sKu85wL+}v`HI?Zxhw~zj&MtQ7m2OHPREA|wF+?MH~XKbF74^vBwmn)+C
zwajN|SYoz>*F2?h-qPdXoJ?AJwzmP6cGXnDcW0YwtBuj%t~&hkH#d4j&8}SF26tOc
z=Poi>NYhU(Qa_{(CinW-_=UC*oCR!QEk8a+!Da2U&IYzQ+w<uVn-`*wP34ga$LW3S
zV?E&bzHScCb9(1wFZ;Umh0GSRX7x<X8^&uUa(~#VXA_L2y*IoYYxn^f!yE4;zsvBC
z9%S6K(b^j&|FY3KG{KLAvB%4K^_?-<HO;t>j&mo66)IJWDp5DpVUEeE^H!@n`eF5}
E|6D7NYXATM

delta 770
zcmX9+Ye-XJ7=E^WXJ?x`XKGWInjJ;4z-T#_m&}?Ox@81flqJe=n=Z|nmqPk6A_c=D
zaix;RgcP#K3tB%)NXXJg`9n?UM;D3`vIt7LV)Uj54iE3;d7tOJ@3~{@H@E4%X#jT&
z2!8^0@jMVQ0oF4>xCAcG41^4VudD#VVvzEe0qPQ@zcc~b5m*|00Nane)9F<A!M6Ph
zu<i_wej=XOkM5Ouif_YT$^il=D;gXjtsXhEJfQw(a^3MVz^l(tgfEYR9)&gPHwnxr
z0-eo(Os;s|{tZz1Sz}K<<>OeFb)1Zbv96ZOfUbEBgZ=DkI>o^&?A9e2pjWe@s3J0$
z#m3{80r?{P(fy9bcW?<?UQu818b&m6skZCzLY(DxRm79vPR?oE3mEj=g`hq_vzfcu
z`Va_B;_mj%lf9>F7+T6LOp{<}yRtHJf;Qw*dbGq-CMi8RhX_CNG6U6h?|Dr^C!vvV
zoBBn@zw&{_b7b(1N_Mu1j9Jyf$r&#Vc%g3TIY<T`t0(jBk?<e&!azR_s!_idmVuys
znnz<+8qlQq*^xpk{}5!JBUGHw=58WE{S9s1VfsSVXYH57`?UIE!7*Gzyk22)I+J)d
zVLEP(49^nMMv*H7x{0T8i_u%N<LEX=#ON*u5x$Eie+j^6hy^u1x?QAL&^knd5DTMe
zfT}_qc8$^Pth$Y-rsy9@anrgiquKIa&TC^En3?Th`7D(kfW%T*7Td;*ESaUTY?e<M
z3q_ffHL<MK$V~PBoyn`+yV)LM=2IqCMIND~H@?WzAeGsx6YC|r!yz?#8fxpDRW8Y1
zC)p)et=n1ckYagi6fC|}Mabw|UKJw5Fg-~c$qGsNuIZwJb%oCQdUthsos{FYS9!{P
LZHD!}B}3pJHVnEi


From 0ea0d3681a800de4611ac0244ba4bdeea9bce321 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <tux3@users.noreply.github.com>
Date: Sat, 13 Sep 2014 14:00:37 +0200
Subject: [PATCH 21/30] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6358283e..dd7c45fdb 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ However, it is not a fork.
 - Group chats
 - File transfers, with previewing of images
 - Audio calls
-- Video calls (alpha)
+- Video calls
 - Tox DNS
 - Translations in various languages
 

From 54ab54543465aca7948f1c3fae9519b90007d0dd Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 15:03:41 +0200
Subject: [PATCH 22/30] Embed new translations

---
 res.qrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res.qrc b/res.qrc
index 6a121b0ad..f258db6f5 100644
--- a/res.qrc
+++ b/res.qrc
@@ -139,5 +139,7 @@
         <file>img/settings/identity.png</file>
         <file>img/settings/privacy.png</file>
         <file>img/settings/av.png</file>
+        <file>translations/pl.qm</file>
+        <file>translations/mannol.qm</file>
     </qresource>
 </RCC>

From 41261c5379975bc6577c79bfd36e4c9565fca6ef Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 15:15:35 +0200
Subject: [PATCH 23/30] Update translations

---
 translations/de.ts        | 55 ++++++++++++++++++++++---------------
 translations/fr.ts        | 55 ++++++++++++++++++++++---------------
 translations/it.ts        | 55 ++++++++++++++++++++++---------------
 translations/mannol.ts    | 55 ++++++++++++++++++++++---------------
 translations/pl.ts        | 57 ++++++++++++++++++++++++---------------
 translations/ru.ts        | 55 ++++++++++++++++++++++---------------
 widget/settingsdialog.cpp |  8 +++---
 7 files changed, 210 insertions(+), 130 deletions(-)

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 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -227,41 +240,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation type="unfinished">IPv6 aktivieren (empfohlen)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation type="unfinished"></translation>
     </message>
@@ -322,29 +335,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation type="unfinished">Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -409,42 +422,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
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 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -227,41 +240,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation type="unfinished">Activer IPv6 (recommandé)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation type="unfinished"></translation>
     </message>
@@ -322,29 +335,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation type="unfinished">ID Tox</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -409,42 +422,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
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 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -197,41 +210,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation type="unfinished">Abilita IPv6 (consigliato)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation type="unfinished">Abilita traduzioni</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation type="unfinished">Rendi qTox portabile</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation type="unfinished">Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation type="unfinished">Emoticons</translation>
     </message>
@@ -288,29 +301,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation type="unfinished">Stato</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation type="unfinished">Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,42 +388,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
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 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -197,41 +210,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation type="unfinished"></translation>
     </message>
@@ -288,29 +301,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,42 +388,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation>Ustawienia wideo</translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -199,41 +212,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation>Główne ustawienia</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation>Użyj IPv6 (rekomendowane)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation>Użyj tłumaczenia</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation>Zrób Tox przenośnym</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation>Zamiast domyślnego katalogu użyj obecnego do zapisania ustawień</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation>Motyw</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translatorcomment>needs better translation</translatorcomment>
         <translation>Paczka uśmiechów</translation>
@@ -291,29 +304,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation>Informacja publiczna</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation>Nick</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation>Twój Tox ID</translation>
     </message>
@@ -379,42 +392,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation>qTox – Ustawienia</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation>Główne</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation>Tożsamość</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation>Prywatność</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation>Audio/Wideo</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation>Zastosuj</translation>
     </message>
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 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation>Настройки видео</translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -246,41 +259,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation>Основные настройки</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation>Включить IPv6 (рекомендуется)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation>Русскоязычный интерфейс</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation>Портативный режим</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation>Сохранять настройки в рабочую директорию вместо страндартной директории настроек</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation>Набор смайликов</translation>
     </message>
@@ -341,29 +354,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation>Публичные данные</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation>Ваш Tox ID</translation>
     </message>
@@ -432,42 +445,42 @@
         <translation type="vanished">Диалог настроек</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation>Основное</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation>Личные данные</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation>Аудио и видео</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
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();
     }
 

From 1225a513c7cca7ff8aee5a52883331de76b55e34 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 15:24:53 +0200
Subject: [PATCH 24/30] Update French translation

---
 translations/fr.qm | Bin 3969 -> 7085 bytes
 translations/fr.ts |  90 ++++++++++++++++++++++-----------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/translations/fr.qm b/translations/fr.qm
index 98e9e1aaa0abc0d733d08a78db17bff6152751da..278415266881501d4faa330eddeeb5386c01c6cc 100644
GIT binary patch
literal 7085
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
LpF|GU*46wUWTN^K

delta 450
zcmZ2$-Y8#hvm-^~)cZM8&nn97PguD3t`h?TV*mq7Zzlr-Z#4tUoRvU&3j?c%DFXv{
zFN4WH76t}3F$Txd$qWq4uNl0|rZO<_$T53L{{o7qF`t^=%D}*Io~3e52?GP`4VD=l
zQy3UH&p>FdEiAJvfqbq%EUWt&f%^Pd*4Il%GB9vFVA-Scg@J)-2Fv%^kAVjGva0Id
z11c<s(7dj!_8BTbhq1Ay8n^--bf2|{dkN6O>#VD~4+9;xgLT`ID?kSsL1^yRY}rx=
zfZ~p9`8+`NtU7G@E}=lWf}K$U<Nz^tF4gHkhk3KtpL*U5bjeN*#>N()1#dVz=7a$0
zcFrRnyBHYQ7joX`1v-rVJ=c$ECJYQLc|7hKK!bSdc~dqN03B|_dqU|m(7_D6r)C4i
z*@gLJW~2bcXYd7euLn9Pjc-HR7NGjynG6hk0?a^#3Ji`6Sq%9Mr3@tusSHJv9mEti
zcQ7+EZ~n*ji*fQsP9H{{$$Nw(CpUAsZC=Y$%)EKGP%hKtcG0xSSHuh^hlm?a=9j3M
MyiLMq@<XXJ0Gc{_VgLXD

diff --git a/translations/fr.ts b/translations/fr.ts
index 53b39e179..2057d56da 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -6,20 +6,20 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Options vidéo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="136"/>
         <location filename="../widget/settingsdialog.cpp" line="163"/>
         <source>Show video preview</source>
         <comment>On a button</comment>
-        <translation type="unfinished"></translation>
+        <translation>Montrer l&apos;aperçu vidéo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="157"/>
         <source>Hide video preview</source>
         <comment>On a button</comment>
-        <translation type="unfinished"></translation>
+        <translation>Cacher l&apos;aperçu vidéo</translation>
     </message>
 </context>
 <context>
@@ -62,13 +62,13 @@
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
         <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
-        <translation type="unfinished"></translation>
+        <translation>Vous ne pouvez pas vous ajouter vous même en temps qu&apos;ami!</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
-        <translation type="unfinished"></translation>
+        <translation>Cette addresse n&apos;existe pas</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="120"/>
@@ -138,19 +138,19 @@
         <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation type="unfinished">Sauvegarder un fichier</translation>
+        <translation>Sauvegarder un fichier</translation>
     </message>
     <message>
         <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;écrire ici</translation>
     </message>
     <message>
         <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>Vous n&apos;avez pas la permission d&apos;écrire ici. Choisissez un audre endroit, ou annulez.</translation>
     </message>
 </context>
 <context>
@@ -167,17 +167,17 @@
         <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation type="unfinished"></translation>
+        <translation>Transfers</translation>
     </message>
     <message>
         <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation>Téléchargements</translation>
     </message>
     <message>
         <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
-        <translation type="unfinished"></translation>
+        <translation>Envois</translation>
     </message>
 </context>
 <context>
@@ -242,41 +242,41 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Options Générales</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation type="unfinished">Activer IPv6 (recommandé)</translation>
+        <translation>Activer IPv6 (recommandé)</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser les traductions</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation type="unfinished"></translation>
+        <translation>Rendre Tox portable</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarde les options dans le dossier courant au lieu du dossier de configuration habituel</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Thème</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
-        <translation type="unfinished"></translation>
+        <translation>Pack de smileys</translation>
     </message>
 </context>
 <context>
@@ -285,7 +285,7 @@
         <location filename="../widget/form/genericchatform.cpp" line="142"/>
         <location filename="../widget/form/genericchatform.cpp" line="148"/>
         <source>Save chat log</source>
-        <translation type="unfinished">Sauvegarder l&apos;historique de conversation</translation>
+        <translation>Sauvegarder l&apos;historique de conversation</translation>
     </message>
 </context>
 <context>
@@ -337,29 +337,29 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informations Publiques</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation type="unfinished">Nom</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation type="unfinished">Status</translation>
+        <translation>Status</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
-        <translation type="unfinished">ID Tox</translation>
+        <translation>ID Tox</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Votre ID Tox</translation>
     </message>
 </context>
 <context>
@@ -367,47 +367,47 @@
     <message>
         <location filename="../mainwindow.ui" line="20"/>
         <source>qTox</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="1918"/>
         <source>Your name</source>
-        <translation type="unfinished">Votre nom</translation>
+        <translation>Votre nom</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2000"/>
         <source>Your status</source>
-        <translation type="unfinished">Votre status</translation>
+        <translation>Votre status</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2566"/>
         <source>Add friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter des amis</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2592"/>
         <source>Create a group chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Creer un groupe</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2624"/>
         <source>View completed file transfers</source>
-        <translation type="unfinished"></translation>
+        <translation>Voir les transfers de fichiers terminés</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2656"/>
         <source>Change your settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Changer les options</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3238"/>
         <source>Close</source>
-        <translation type="unfinished">Fermer</translation>
+        <translation>Fermer</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3241"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished">Ctrl+Q</translation>
+        <translation>Ctrl+Q</translation>
     </message>
 </context>
 <context>
@@ -424,42 +424,42 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox — Options</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>General</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identité</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
-        <translation type="unfinished"></translation>
+        <translation>Vie Privée</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio/Vidéo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Appliquer</translation>
     </message>
 </context>
 <context>
@@ -516,25 +516,25 @@
         <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
-        <translation type="unfinished">Connecté</translation>
+        <translation>Connecté</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
-        <translation type="unfinished">Indisponnible</translation>
+        <translation>Indisponnible</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
-        <translation type="unfinished">Occupé</translation>
+        <translation>Occupé</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="605"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
-        <translation type="unfinished">&lt;Inconnu&gt;</translation>
+        <translation>&lt;Inconnu&gt;</translation>
     </message>
 </context>
 </TS>

From 59869b4a8771b3ddf14f789a67a544660bfdbf2a Mon Sep 17 00:00:00 2001
From: dubslow <bill@mint>
Date: Sat, 13 Sep 2014 00:55:21 -0500
Subject: [PATCH 25/30] first thing's first, gotta placate the ocd

---
 mainwindow.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index 7f9cd12c5..20e8269cf 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -3124,13 +3124,13 @@ QSplitter:handle{
           <property name="minimumSize">
            <size>
             <width>0</width>
-            <height>60</height>
+            <height>57</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
             <width>16777215</width>
-            <height>60</height>
+            <height>57</height>
            </size>
           </property>
           <property name="mouseTracking">

From e4e36dc946027b603fcb60ff3791e7d6a6625907 Mon Sep 17 00:00:00 2001
From: dubslow <bill@mint>
Date: Sat, 13 Sep 2014 03:32:24 -0500
Subject: [PATCH 26/30] initial new settings widget, subforms not started also
 "filing" some files under misc

---
 core.cpp                              |   6 +-
 main.cpp                              |   2 +-
 cdata.cpp => misc/cdata.cpp           |   0
 cdata.h => misc/cdata.h               |   0
 cstring.cpp => misc/cstring.cpp       |   0
 cstring.h => misc/cstring.h           |   0
 settings.cpp => misc/settings.cpp     |   0
 settings.h => misc/settings.h         |   0
 smileypack.cpp => misc/smileypack.cpp |   0
 smileypack.h => misc/smileypack.h     |   0
 style.cpp => misc/style.cpp           |   0
 style.h => misc/style.h               |   0
 qtox.pro                              |  28 ++---
 widget/emoticonswidget.cpp            |   4 +-
 widget/form/genericchatform.cpp       |   6 +-
 widget/form/settingswidget.cpp        | 164 ++++++++++++++++++++++++++
 widget/form/settingswidget.h          |  62 ++++++++++
 widget/groupwidget.cpp                |   2 +-
 widget/tool/chataction.cpp            |   2 +-
 widget/widget.cpp                     |  11 +-
 widget/widget.h                       |   4 +-
 21 files changed, 258 insertions(+), 33 deletions(-)
 rename cdata.cpp => misc/cdata.cpp (100%)
 rename cdata.h => misc/cdata.h (100%)
 rename cstring.cpp => misc/cstring.cpp (100%)
 rename cstring.h => misc/cstring.h (100%)
 rename settings.cpp => misc/settings.cpp (100%)
 rename settings.h => misc/settings.h (100%)
 rename smileypack.cpp => misc/smileypack.cpp (100%)
 rename smileypack.h => misc/smileypack.h (100%)
 rename style.cpp => misc/style.cpp (100%)
 rename style.h => misc/style.h (100%)
 create mode 100644 widget/form/settingswidget.cpp
 create mode 100644 widget/form/settingswidget.h

diff --git a/core.cpp b/core.cpp
index fe1e3187b..81d022588 100644
--- a/core.cpp
+++ b/core.cpp
@@ -15,9 +15,9 @@
 */
 
 #include "core.h"
-#include "cdata.h"
-#include "cstring.h"
-#include "settings.h"
+#include "misc/cdata.h"
+#include "misc/cstring.h"
+#include "misc/settings.h"
 #include "widget/widget.h"
 
 #include <tox/tox.h>
diff --git a/main.cpp b/main.cpp
index 1cdac827e..8e981baa5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "widget/widget.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include <QApplication>
 #include <QFontDatabase>
 #include <QTranslator>
diff --git a/cdata.cpp b/misc/cdata.cpp
similarity index 100%
rename from cdata.cpp
rename to misc/cdata.cpp
diff --git a/cdata.h b/misc/cdata.h
similarity index 100%
rename from cdata.h
rename to misc/cdata.h
diff --git a/cstring.cpp b/misc/cstring.cpp
similarity index 100%
rename from cstring.cpp
rename to misc/cstring.cpp
diff --git a/cstring.h b/misc/cstring.h
similarity index 100%
rename from cstring.h
rename to misc/cstring.h
diff --git a/settings.cpp b/misc/settings.cpp
similarity index 100%
rename from settings.cpp
rename to misc/settings.cpp
diff --git a/settings.h b/misc/settings.h
similarity index 100%
rename from settings.h
rename to misc/settings.h
diff --git a/smileypack.cpp b/misc/smileypack.cpp
similarity index 100%
rename from smileypack.cpp
rename to misc/smileypack.cpp
diff --git a/smileypack.h b/misc/smileypack.h
similarity index 100%
rename from smileypack.h
rename to misc/smileypack.h
diff --git a/style.cpp b/misc/style.cpp
similarity index 100%
rename from style.cpp
rename to misc/style.cpp
diff --git a/style.h b/misc/style.h
similarity index 100%
rename from style.h
rename to misc/style.h
diff --git a/qtox.pro b/qtox.pro
index 250d3abc8..9112e95c0 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -81,6 +81,7 @@ win32 {
 HEADERS  += widget/form/addfriendform.h \
     widget/form/chatform.h \
     widget/form/groupchatform.h \
+    widget/form/settingswidget.h \
     widget/form/filesform.h \
     widget/tool/chattextedit.h \
     widget/tool/friendrequestdialog.h \
@@ -90,17 +91,17 @@ HEADERS  += widget/form/addfriendform.h \
     friend.h \
     group.h \
     grouplist.h \
-    settings.h \
+    misc/settings.h \
     core.h \
     friendlist.h \
-    cdata.h \
-    cstring.h \
+    misc/cdata.h \
+    misc/cstring.h \
     widget/selfcamview.h \
     widget/camera.h \
     widget/netcamview.h \
-    smileypack.h \
+    misc/smileypack.h \
     widget/emoticonswidget.h \
-    style.h \
+    misc/style.h \
     widget/adjustingscrollarea.h \
     widget/croppinglabel.h \
     widget/friendlistwidget.h \
@@ -111,13 +112,13 @@ HEADERS  += widget/form/addfriendform.h \
     filetransferinstance.h \
     corestructs.h \
     coredefines.h \
-    coreav.h \
-    widget/settingsdialog.h
+    coreav.h
 
 SOURCES += \
     widget/form/addfriendform.cpp \
     widget/form/chatform.cpp \
     widget/form/groupchatform.cpp \
+    widget/form/settingswidget.cpp \
     widget/form/filesform.cpp \
     widget/tool/chattextedit.cpp \
     widget/tool/friendrequestdialog.cpp \
@@ -130,15 +131,15 @@ SOURCES += \
     group.cpp \
     grouplist.cpp \
     main.cpp \
-    settings.cpp \
-    cdata.cpp \
-    cstring.cpp \
+    misc/settings.cpp \
+    misc/cdata.cpp \
+    misc/cstring.cpp \
     widget/selfcamview.cpp \
     widget/camera.cpp \
     widget/netcamview.cpp \
-    smileypack.cpp \
+    misc/smileypack.cpp \
     widget/emoticonswidget.cpp \
-    style.cpp \
+    misc/style.cpp \
     widget/adjustingscrollarea.cpp \
     widget/croppinglabel.cpp \
     widget/friendlistwidget.cpp \
@@ -148,5 +149,4 @@ SOURCES += \
     widget/tool/chataction.cpp \
     widget/chatareawidget.cpp \
     filetransferinstance.cpp \
-    corestructs.cpp \
-    widget/settingsdialog.cpp
+    corestructs.cpp
diff --git a/widget/emoticonswidget.cpp b/widget/emoticonswidget.cpp
index bab7abe8d..b0ffb6028 100644
--- a/widget/emoticonswidget.cpp
+++ b/widget/emoticonswidget.cpp
@@ -15,8 +15,8 @@
 */
 
 #include "emoticonswidget.h"
-#include "smileypack.h"
-#include "style.h"
+#include "misc/smileypack.h"
+#include "misc/style.h"
 
 #include <QPushButton>
 #include <QRadioButton>
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index f5681f1c6..2aff5d2a7 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -17,11 +17,11 @@
 #include "genericchatform.h"
 #include "ui_mainwindow.h"
 #include <QFileDialog>
-#include "smileypack.h"
+#include "misc/smileypack.h"
 #include "widget/emoticonswidget.h"
-#include "style.h"
+#include "misc/style.h"
 #include "widget/widget.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "widget/tool/chataction.h"
 #include "widget/chatareawidget.h"
 #include "widget/tool/chattextedit.h"
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
new file mode 100644
index 000000000..6e2778de8
--- /dev/null
+++ b/widget/form/settingswidget.cpp
@@ -0,0 +1,164 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#include "settingswidget.h"
+#include "widget/widget.h"
+#include "ui_mainwindow.h"
+
+SettingsWidget::SettingsWidget()
+    : QObject()
+{
+    main = new QWidget();
+    // this crap is copied from ui_mainwindow.h... there's no easy way around
+    // just straight up copying it like this... oh well
+    // the layout/icons obviously need to be improved, but it's a working model,
+    // not a pretty one
+    QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    sizePolicy3.setHorizontalStretch(0);
+    sizePolicy3.setVerticalStretch(0);
+    head = new QWidget();
+    head->setObjectName(QStringLiteral("head"));
+    head->setEnabled(true);
+    sizePolicy3.setHeightForWidth(head->sizePolicy().hasHeightForWidth());
+    head->setSizePolicy(sizePolicy3);
+    QPalette palette5;
+    QBrush brush(QColor(255, 255, 255, 255));
+    brush.setStyle(Qt::SolidPattern);
+    QBrush brush1(QColor(28, 28, 28, 255));
+    brush1.setStyle(Qt::SolidPattern);
+    QBrush brush2(QColor(42, 42, 42, 255));
+    brush2.setStyle(Qt::SolidPattern);
+    QBrush brush3(QColor(35, 35, 35, 255));
+    brush3.setStyle(Qt::SolidPattern);
+    QBrush brush4(QColor(14, 14, 14, 255));
+    brush4.setStyle(Qt::SolidPattern);
+    QBrush brush5(QColor(18, 18, 18, 255));
+    brush5.setStyle(Qt::SolidPattern);
+    QBrush brush6(QColor(0, 0, 0, 255));
+    brush6.setStyle(Qt::SolidPattern);
+    QBrush brush7(QColor(255, 255, 220, 255));
+    brush7.setStyle(Qt::SolidPattern);
+    palette5.setBrush(QPalette::Active, QPalette::WindowText, brush);
+    palette5.setBrush(QPalette::Active, QPalette::Button, brush1);
+    palette5.setBrush(QPalette::Active, QPalette::Light, brush2);
+    palette5.setBrush(QPalette::Active, QPalette::Midlight, brush3);
+    palette5.setBrush(QPalette::Active, QPalette::Dark, brush4);
+    palette5.setBrush(QPalette::Active, QPalette::Mid, brush5);
+    palette5.setBrush(QPalette::Active, QPalette::Text, brush);
+    palette5.setBrush(QPalette::Active, QPalette::BrightText, brush);
+    palette5.setBrush(QPalette::Active, QPalette::ButtonText, brush);
+    palette5.setBrush(QPalette::Active, QPalette::Base, brush6);
+    palette5.setBrush(QPalette::Active, QPalette::Window, brush1);
+    palette5.setBrush(QPalette::Active, QPalette::Shadow, brush6);
+    palette5.setBrush(QPalette::Active, QPalette::AlternateBase, brush4);
+    palette5.setBrush(QPalette::Active, QPalette::ToolTipBase, brush7);
+    palette5.setBrush(QPalette::Active, QPalette::ToolTipText, brush6);
+    palette5.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::Button, brush1);
+    palette5.setBrush(QPalette::Inactive, QPalette::Light, brush2);
+    palette5.setBrush(QPalette::Inactive, QPalette::Midlight, brush3);
+    palette5.setBrush(QPalette::Inactive, QPalette::Dark, brush4);
+    palette5.setBrush(QPalette::Inactive, QPalette::Mid, brush5);
+    palette5.setBrush(QPalette::Inactive, QPalette::Text, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::BrightText, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::ButtonText, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::Base, brush6);
+    palette5.setBrush(QPalette::Inactive, QPalette::Window, brush1);
+    palette5.setBrush(QPalette::Inactive, QPalette::Shadow, brush6);
+    palette5.setBrush(QPalette::Inactive, QPalette::AlternateBase, brush4);
+    palette5.setBrush(QPalette::Inactive, QPalette::ToolTipBase, brush7);
+    palette5.setBrush(QPalette::Inactive, QPalette::ToolTipText, brush6);
+    palette5.setBrush(QPalette::Disabled, QPalette::WindowText, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::Button, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::Light, brush2);
+    palette5.setBrush(QPalette::Disabled, QPalette::Midlight, brush3);
+    palette5.setBrush(QPalette::Disabled, QPalette::Dark, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::Mid, brush5);
+    palette5.setBrush(QPalette::Disabled, QPalette::Text, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::BrightText, brush);
+    palette5.setBrush(QPalette::Disabled, QPalette::ButtonText, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::Base, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::Window, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::Shadow, brush6);
+    palette5.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::ToolTipBase, brush7);
+    palette5.setBrush(QPalette::Disabled, QPalette::ToolTipText, brush6);
+    head->setPalette(palette5);
+    head->setAutoFillBackground(true);
+    iconsLayout = new QHBoxLayout(head);
+    iconsLayout->setSpacing(0);
+    iconsLayout->setObjectName(QStringLiteral("iconsLayout"));
+    iconsLayout->setContentsMargins(0, 0, 0, 0);
+
+    generalButton = new QPushButton(head);
+    generalButton->setObjectName(QStringLiteral("generalButton"));
+    generalButton->setMinimumSize(QSize(55, 35));
+    generalButton->setMaximumSize(QSize(55, 35));
+    generalButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon1;
+    icon1.addFile(QStringLiteral(":/img/add.png"), QSize(), QIcon::Normal, QIcon::Off);
+    generalButton->setIcon(icon1);
+    generalButton->setFlat(true);
+    iconsLayout->addWidget(generalButton);
+    
+    identityButton = new QPushButton(head);
+    identityButton->setObjectName(QStringLiteral("identityButton"));
+    identityButton->setMinimumSize(QSize(55, 35));
+    identityButton->setMaximumSize(QSize(55, 35));
+    identityButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon2;
+    icon2.addFile(QStringLiteral(":/img/group.png"), QSize(), QIcon::Normal, QIcon::Off);
+    identityButton->setIcon(icon2);
+    identityButton->setFlat(true);
+    iconsLayout->addWidget(identityButton);
+    
+    privacyButton = new QPushButton(head);
+    privacyButton->setObjectName(QStringLiteral("privacyButton"));
+    privacyButton->setMinimumSize(QSize(55, 35));
+    privacyButton->setMaximumSize(QSize(55, 35));
+    privacyButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon3;
+    icon3.addFile(QStringLiteral(":/img/transfer.png"), QSize(), QIcon::Normal, QIcon::Off);
+    privacyButton->setIcon(icon3);
+    privacyButton->setFlat(true);
+    iconsLayout->addWidget(privacyButton);
+    
+    avButton = new QPushButton(head);
+    avButton->setObjectName(QStringLiteral("avButton"));
+    avButton->setMinimumSize(QSize(55, 35));
+    avButton->setMaximumSize(QSize(55, 35));
+    avButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon4;
+    icon4.addFile(QStringLiteral(":/img/settings.png"), QSize(), QIcon::Normal, QIcon::Off);
+    avButton->setIcon(icon4);
+    avButton->setFlat(true);
+    iconsLayout->addWidget(avButton);
+    
+    head->setLayout(iconsLayout);
+
+}
+
+SettingsWidget::~SettingsWidget()
+{
+}
+
+void SettingsWidget::show(Ui::MainWindow& ui)
+{
+    ui.mainContent->layout()->addWidget(main);
+    ui.mainHead->layout()->addWidget(head);
+    main->show();
+    head->show();
+}
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
new file mode 100644
index 000000000..a1cee909f
--- /dev/null
+++ b/widget/form/settingswidget.h
@@ -0,0 +1,62 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#ifndef SETTINGSWIDGET_H
+#define SETTINGSWIDGET_H
+
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QObject>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QComboBox>
+
+#include "widget/croppinglabel.h"
+
+namespace Ui {class MainWindow;}
+class QString;
+
+class SettingsWidget : public QObject
+{
+    Q_OBJECT
+public:
+    SettingsWidget();
+    ~SettingsWidget();
+
+    void show(Ui::MainWindow &ui);
+
+public slots:
+    //void setFriendAddress(const QString& friendAddress);
+
+private slots:
+
+private:
+    QWidget *main, *head;
+    // the code pertaining to the icons is mostly copied from ui_mainwindow.h
+    QHBoxLayout *iconsLayout;
+    QPushButton *generalButton;
+    QPushButton *identityButton;
+    QPushButton *privacyButton;
+    QPushButton *avButton;
+    
+    // now the actual pages and stuff
+    // ...
+public:
+};
+
+#endif // SETTINGSFORM_H
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index b8c1cbcc0..0c02db3d2 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -17,7 +17,7 @@
 #include "groupwidget.h"
 #include "grouplist.h"
 #include "group.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "widget/form/groupchatform.h"
 #include <QPalette>
 #include <QMenu>
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
index bcd1f1080..c05fd36b9 100644
--- a/widget/tool/chataction.cpp
+++ b/widget/tool/chataction.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "chataction.h"
-#include "smileypack.h"
+#include "misc/smileypack.h"
 #include <QStringList>
 #include <QBuffer>
 #include "filetransferinstance.h"
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 36b2c33c1..f1472bcd6 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -17,7 +17,7 @@
 #include "widget.h"
 #include "ui_mainwindow.h"
 #include "core.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "friend.h"
 #include "friendlist.h"
 #include "widget/tool/friendrequestdialog.h"
@@ -26,12 +26,11 @@
 #include "group.h"
 #include "widget/groupwidget.h"
 #include "widget/form/groupchatform.h"
-#include "style.h"
+#include "misc/style.h"
 #include "selfcamview.h"
 #include "widget/friendlistwidget.h"
 #include "camera.h"
 #include "widget/form/chatform.h"
-#include "widget/settingsdialog.h"
 #include <QMessageBox>
 #include <QDebug>
 #include <QFile>
@@ -156,7 +155,6 @@ Widget::Widget(QWidget *parent)
     ui->statusButton->style()->polish(ui->statusButton);
 
     camera = new Camera;
-    settingsDialog = new SettingsDialog(this);
 
     // Disable some widgets until we're connected to the DHT
     ui->statusButton->setEnabled(false);
@@ -335,8 +333,9 @@ void Widget::onTransferClicked()
 
 void Widget::onSettingsClicked()
 {
-    settingsDialog->readConfig();
-    settingsDialog->show();
+    hideMainForms();
+    settingsWidget.show(*ui);
+    activeChatroomWidget = nullptr;
 }
 
 void Widget::hideMainForms()
diff --git a/widget/widget.h b/widget/widget.h
index 035ea2ae0..9512f00e9 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -19,6 +19,7 @@
 
 #include <QMainWindow>
 #include "widget/form/addfriendform.h"
+#include "widget/form/settingswidget.h"
 #include "widget/form/filesform.h"
 #include "corestructs.h"
 
@@ -37,7 +38,6 @@ class QMenu;
 class Core;
 class Camera;
 class FriendListWidget;
-class SettingsDialog;
 
 class Widget : public QMainWindow
 {
@@ -134,8 +134,8 @@ private:
     Core* core;
     QThread* coreThread;
     AddFriendForm friendForm;
+    SettingsWidget settingsWidget;
     FilesForm filesForm;
-    SettingsDialog* settingsDialog;
     static Widget* instance;
     GenericChatroomWidget* activeChatroomWidget;
     FriendListWidget* contactListWidget;

From e55f15725ec9558bdca588c8a2cfe80f40fef5b7 Mon Sep 17 00:00:00 2001
From: bill <bill@mint>
Date: Sun, 14 Sep 2014 13:42:27 -0500
Subject: [PATCH 27/30] move buttons to bottom

---
 widget/form/settingswidget.cpp | 66 +++++++++++++++++++---------------
 widget/form/settingswidget.h   | 20 +++++------
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index 6e2778de8..fcbd2a981 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -19,9 +19,35 @@
 #include "ui_mainwindow.h"
 
 SettingsWidget::SettingsWidget()
-    : QObject()
+    : QWidget()
 {
+    _main = new QWidget();
     main = new QWidget();
+    head = new QWidget();
+    foot = new QWidget();
+    prepButtons();    
+    foot->setLayout(iconsLayout);
+    _mainLayout = new QVBoxLayout(_main);
+    _mainLayout->addWidget(main);
+    _mainLayout->addWidget(foot);
+    // something something foot size
+    _main->setLayout(_mainLayout);
+}
+
+SettingsWidget::~SettingsWidget()
+{
+}
+
+void SettingsWidget::show(Ui::MainWindow& ui)
+{
+    ui.mainContent->layout()->addWidget(_main);
+    ui.mainHead->layout()->addWidget(head);
+    _main->show();
+    head->show();
+}
+
+void SettingsWidget::prepButtons()
+{
     // this crap is copied from ui_mainwindow.h... there's no easy way around
     // just straight up copying it like this... oh well
     // the layout/icons obviously need to be improved, but it's a working model,
@@ -29,11 +55,9 @@ SettingsWidget::SettingsWidget()
     QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
     sizePolicy3.setHorizontalStretch(0);
     sizePolicy3.setVerticalStretch(0);
-    head = new QWidget();
-    head->setObjectName(QStringLiteral("head"));
-    head->setEnabled(true);
-    sizePolicy3.setHeightForWidth(head->sizePolicy().hasHeightForWidth());
-    head->setSizePolicy(sizePolicy3);
+    foot->setObjectName(QStringLiteral("foot"));
+    foot->setEnabled(true);
+    foot->setSizePolicy(sizePolicy3);
     QPalette palette5;
     QBrush brush(QColor(255, 255, 255, 255));
     brush.setStyle(Qt::SolidPattern);
@@ -96,14 +120,15 @@ SettingsWidget::SettingsWidget()
     palette5.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush1);
     palette5.setBrush(QPalette::Disabled, QPalette::ToolTipBase, brush7);
     palette5.setBrush(QPalette::Disabled, QPalette::ToolTipText, brush6);
-    head->setPalette(palette5);
-    head->setAutoFillBackground(true);
-    iconsLayout = new QHBoxLayout(head);
+    foot->setPalette(palette5);
+    foot->setAutoFillBackground(true);
+    
+    iconsLayout = new QHBoxLayout(foot);
     iconsLayout->setSpacing(0);
     iconsLayout->setObjectName(QStringLiteral("iconsLayout"));
     iconsLayout->setContentsMargins(0, 0, 0, 0);
 
-    generalButton = new QPushButton(head);
+    generalButton = new QPushButton(foot);
     generalButton->setObjectName(QStringLiteral("generalButton"));
     generalButton->setMinimumSize(QSize(55, 35));
     generalButton->setMaximumSize(QSize(55, 35));
@@ -114,7 +139,7 @@ SettingsWidget::SettingsWidget()
     generalButton->setFlat(true);
     iconsLayout->addWidget(generalButton);
     
-    identityButton = new QPushButton(head);
+    identityButton = new QPushButton(foot);
     identityButton->setObjectName(QStringLiteral("identityButton"));
     identityButton->setMinimumSize(QSize(55, 35));
     identityButton->setMaximumSize(QSize(55, 35));
@@ -125,7 +150,7 @@ SettingsWidget::SettingsWidget()
     identityButton->setFlat(true);
     iconsLayout->addWidget(identityButton);
     
-    privacyButton = new QPushButton(head);
+    privacyButton = new QPushButton(foot);
     privacyButton->setObjectName(QStringLiteral("privacyButton"));
     privacyButton->setMinimumSize(QSize(55, 35));
     privacyButton->setMaximumSize(QSize(55, 35));
@@ -136,7 +161,7 @@ SettingsWidget::SettingsWidget()
     privacyButton->setFlat(true);
     iconsLayout->addWidget(privacyButton);
     
-    avButton = new QPushButton(head);
+    avButton = new QPushButton(foot);
     avButton->setObjectName(QStringLiteral("avButton"));
     avButton->setMinimumSize(QSize(55, 35));
     avButton->setMaximumSize(QSize(55, 35));
@@ -146,19 +171,4 @@ SettingsWidget::SettingsWidget()
     avButton->setIcon(icon4);
     avButton->setFlat(true);
     iconsLayout->addWidget(avButton);
-    
-    head->setLayout(iconsLayout);
-
-}
-
-SettingsWidget::~SettingsWidget()
-{
-}
-
-void SettingsWidget::show(Ui::MainWindow& ui)
-{
-    ui.mainContent->layout()->addWidget(main);
-    ui.mainHead->layout()->addWidget(head);
-    main->show();
-    head->show();
 }
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index a1cee909f..c901ce906 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -17,21 +17,15 @@
 #ifndef SETTINGSWIDGET_H
 #define SETTINGSWIDGET_H
 
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QObject>
-#include <QCheckBox>
+#include <QHBoxLayout>
 #include <QPushButton>
-#include <QTextEdit>
-#include <QComboBox>
-
+#include <QObject>
 #include "widget/croppinglabel.h"
 
 namespace Ui {class MainWindow;}
 class QString;
 
-class SettingsWidget : public QObject
+class SettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
@@ -46,7 +40,9 @@ public slots:
 private slots:
 
 private:
-    QWidget *main, *head;
+    QWidget *_main, *main, *head, *foot;
+    // _main consists of main+foot
+    QVBoxLayout *_mainLayout;
     // the code pertaining to the icons is mostly copied from ui_mainwindow.h
     QHBoxLayout *iconsLayout;
     QPushButton *generalButton;
@@ -56,6 +52,10 @@ private:
     
     // now the actual pages and stuff
     // ...
+
+
+
+    void prepButtons(); // just so I can move the crap to the bottom of the file
 public:
 };
 

From 5ec79fc26080eae03350877686336d1caba223a2 Mon Sep 17 00:00:00 2001
From: bill <bill@mint>
Date: Mon, 15 Sep 2014 05:45:59 -0500
Subject: [PATCH 28/30] new settings infrastructure done, though there's a
 double free or something in ~Widget()

---
 qtox.pro                               |  9 ++++
 widget/form/settings/avform.cpp        | 26 ++++++++++
 widget/form/settings/avform.h          | 33 ++++++++++++
 widget/form/settings/generalform.cpp   | 46 ++++++++++++++++
 widget/form/settings/generalform.h     | 41 +++++++++++++++
 widget/form/settings/genericsettings.h | 46 ++++++++++++++++
 widget/form/settings/identityform.cpp  | 38 ++++++++++++++
 widget/form/settings/identityform.h    | 34 ++++++++++++
 widget/form/settings/privacyform.cpp   | 27 ++++++++++
 widget/form/settings/privacyform.h     | 33 ++++++++++++
 widget/form/settingswidget.cpp         | 72 +++++++++++++++++++++++---
 widget/form/settingswidget.h           | 41 +++++++++------
 12 files changed, 423 insertions(+), 23 deletions(-)
 create mode 100644 widget/form/settings/avform.cpp
 create mode 100644 widget/form/settings/avform.h
 create mode 100644 widget/form/settings/generalform.cpp
 create mode 100644 widget/form/settings/generalform.h
 create mode 100644 widget/form/settings/genericsettings.h
 create mode 100644 widget/form/settings/identityform.cpp
 create mode 100644 widget/form/settings/identityform.h
 create mode 100644 widget/form/settings/privacyform.cpp
 create mode 100644 widget/form/settings/privacyform.h

diff --git a/qtox.pro b/qtox.pro
index 9112e95c0..5c550cd1f 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -82,6 +82,11 @@ HEADERS  += widget/form/addfriendform.h \
     widget/form/chatform.h \
     widget/form/groupchatform.h \
     widget/form/settingswidget.h \
+    widget/form/settings/genericsettings.h \
+    widget/form/settings/generalform.h \
+    widget/form/settings/identityform.h \
+    widget/form/settings/privacyform.h \
+    widget/form/settings/avform.h \
     widget/form/filesform.h \
     widget/tool/chattextedit.h \
     widget/tool/friendrequestdialog.h \
@@ -119,6 +124,10 @@ SOURCES += \
     widget/form/chatform.cpp \
     widget/form/groupchatform.cpp \
     widget/form/settingswidget.cpp \
+    widget/form/settings/generalform.cpp \
+    widget/form/settings/identityform.cpp \
+    widget/form/settings/privacyform.cpp \
+    widget/form/settings/avform.cpp \
     widget/form/filesform.cpp \
     widget/tool/chattextedit.cpp \
     widget/tool/friendrequestdialog.cpp \
diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
new file mode 100644
index 000000000..347a1cfbb
--- /dev/null
+++ b/widget/form/settings/avform.cpp
@@ -0,0 +1,26 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#include "avform.h"
+
+AVForm::AVForm()
+{
+    prep();
+}
+
+AVForm::~AVForm()
+{
+}
diff --git a/widget/form/settings/avform.h b/widget/form/settings/avform.h
new file mode 100644
index 000000000..e214e133e
--- /dev/null
+++ b/widget/form/settings/avform.h
@@ -0,0 +1,33 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#ifndef AVFORM_H
+#define AVFORM_H
+
+#include "genericsettings.h"
+
+class AVForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    AVForm();
+    ~AVForm();
+
+private:
+    
+};
+
+#endif
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
new file mode 100644
index 000000000..050d4f7eb
--- /dev/null
+++ b/widget/form/settings/generalform.cpp
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#include "generalform.h"
+#include "widget/form/settingswidget.h"
+
+GeneralForm::GeneralForm()
+{
+    prep();
+    group = new QGroupBox(tr("General Settings"));
+    enableIPv6 = new QCheckBox();
+    enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
+    useTranslations = new QCheckBox();
+    useTranslations->setText(tr("Use translations","Text on a checkbox to enable translations"));
+    makeToxPortable = new QCheckBox();
+    makeToxPortable->setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
+    makeToxPortable->setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
+
+    QVBoxLayout *vLayout = new QVBoxLayout();
+    vLayout->addWidget(enableIPv6);
+    vLayout->addWidget(useTranslations);
+    vLayout->addWidget(makeToxPortable);
+    group->setLayout(vLayout);
+    
+    label.setText(tr("General Settings"));
+    
+    headLayout.addWidget(&label);
+    layout.addWidget(group);
+}
+
+GeneralForm::~GeneralForm()
+{
+}
diff --git a/widget/form/settings/generalform.h b/widget/form/settings/generalform.h
new file mode 100644
index 000000000..c484a436d
--- /dev/null
+++ b/widget/form/settings/generalform.h
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#ifndef GENERALFORM_H
+#define GENERALFORM_H
+
+#include "genericsettings.h"
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QLabel>
+
+
+class GeneralForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    GeneralForm();
+    ~GeneralForm();
+
+private:
+    QGroupBox *group;
+    QCheckBox* enableIPv6;
+    QCheckBox* useTranslations;
+    QCheckBox* makeToxPortable;
+    QLabel label;
+};
+
+#endif
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
new file mode 100644
index 000000000..9353d21df
--- /dev/null
+++ b/widget/form/settings/genericsettings.h
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#ifndef GENERICFORM_H
+#define GENERICFORM_H
+
+#include <QObject>
+#include <QVBoxLayout>
+#include "widget/form/settingswidget.h"
+
+class GenericForm : public QObject
+{
+    Q_OBJECT
+public:
+    virtual void show(SettingsWidget& sw)
+    {
+        sw.body->layout()->addWidget(&body);
+        body.show();
+        sw.head->layout()->addWidget(&head);
+        head.show();
+    }
+
+protected:
+    QVBoxLayout layout, headLayout;
+    QWidget head, body;
+    void prep() // call in subclass constructor
+    {
+        head.setLayout(&headLayout);
+        body.setLayout(&layout);
+    }
+};
+
+#endif
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
new file mode 100644
index 000000000..dbd5574c5
--- /dev/null
+++ b/widget/form/settings/identityform.cpp
@@ -0,0 +1,38 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#include "identityform.h"
+#include "widget/form/settingswidget.h"
+#include <QLabel>
+#include <QLineEdit>
+
+IdentityForm::IdentityForm()
+{
+    prep();
+    toxGroup = new QGroupBox(tr("Tox ID"));
+    QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
+    QLineEdit* toxID = new QLineEdit();
+    toxID->setReadOnly(true);
+    QVBoxLayout* toxLayout = new QVBoxLayout();
+    toxLayout->addWidget(toxIdLabel);
+    toxLayout->addWidget(toxID);
+    toxGroup->setLayout(toxLayout);
+    layout.addWidget(toxGroup);
+}
+
+IdentityForm::~IdentityForm()
+{
+}
diff --git a/widget/form/settings/identityform.h b/widget/form/settings/identityform.h
new file mode 100644
index 000000000..dc616d75e
--- /dev/null
+++ b/widget/form/settings/identityform.h
@@ -0,0 +1,34 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#ifndef IDENTITYFORM_H
+#define IDENTITYFORM_H
+
+#include "genericsettings.h"
+#include <QGroupBox>
+
+class IdentityForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    IdentityForm();
+    ~IdentityForm();
+
+private:
+    QGroupBox* toxGroup;
+};
+
+#endif
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
new file mode 100644
index 000000000..856f64954
--- /dev/null
+++ b/widget/form/settings/privacyform.cpp
@@ -0,0 +1,27 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#include "privacyform.h"
+#include "widget/form/settingswidget.h"
+
+PrivacyForm::PrivacyForm()
+{
+    prep();
+}
+
+PrivacyForm::~PrivacyForm()
+{
+}
diff --git a/widget/form/settings/privacyform.h b/widget/form/settings/privacyform.h
new file mode 100644
index 000000000..ae1e61956
--- /dev/null
+++ b/widget/form/settings/privacyform.h
@@ -0,0 +1,33 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#ifndef PRIVACYFORM_H
+#define PRIVACYFORM_H
+
+#include "genericsettings.h"
+
+class PrivacyForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    PrivacyForm();
+    ~PrivacyForm();
+
+private:
+    
+};
+
+#endif
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index fcbd2a981..3a13c1cdb 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -17,21 +17,41 @@
 #include "settingswidget.h"
 #include "widget/widget.h"
 #include "ui_mainwindow.h"
+#include "widget/form/settings/generalform.h"
+#include "widget/form/settings/identityform.h"
+#include "widget/form/settings/privacyform.h"
+#include "widget/form/settings/avform.h"
 
 SettingsWidget::SettingsWidget()
     : QWidget()
 {
-    _main = new QWidget();
+    generalForm  = new GeneralForm();
+    identityForm = new IdentityForm();
+    privacyForm  = new PrivacyForm();
+    avForm       = new AVForm();
+
     main = new QWidget();
+    body = new QWidget();
     head = new QWidget();
     foot = new QWidget();
+    
+    head->setLayout(new QVBoxLayout());
+    body->setLayout(new QVBoxLayout());
+    
     prepButtons();    
     foot->setLayout(iconsLayout);
-    _mainLayout = new QVBoxLayout(_main);
-    _mainLayout->addWidget(main);
-    _mainLayout->addWidget(foot);
+    mainLayout = new QVBoxLayout(main);
+    mainLayout->addWidget(body);
+    mainLayout->addWidget(foot);
     // something something foot size
-    _main->setLayout(_mainLayout);
+    main->setLayout(mainLayout);
+    
+    connect(generalButton,  &QPushButton::clicked, this, &SettingsWidget::onGeneralClicked);
+    connect(identityButton, &QPushButton::clicked, this, &SettingsWidget::onIdentityClicked);
+    connect(privacyButton,  &QPushButton::clicked, this, &SettingsWidget::onPrivacyClicked);
+    connect(avButton,  &QPushButton::clicked, this, &SettingsWidget::onAVClicked);
+    
+    active = generalForm;
 }
 
 SettingsWidget::~SettingsWidget()
@@ -40,12 +60,50 @@ SettingsWidget::~SettingsWidget()
 
 void SettingsWidget::show(Ui::MainWindow& ui)
 {
-    ui.mainContent->layout()->addWidget(_main);
+    active->show(*this);
+    ui.mainContent->layout()->addWidget(main);
     ui.mainHead->layout()->addWidget(head);
-    _main->show();
+    main->show();
     head->show();
 }
 
+void SettingsWidget::onGeneralClicked()
+{
+    hideSettingsForms();
+    active = generalForm;
+    generalForm->show(*this);
+}
+
+void SettingsWidget::onIdentityClicked()
+{
+    hideSettingsForms();
+    active = identityForm;
+    identityForm->show(*this);
+}
+
+void SettingsWidget::onPrivacyClicked()
+{
+    hideSettingsForms();
+    active = privacyForm;
+    privacyForm->show(*this);
+}
+
+void SettingsWidget::onAVClicked()
+{
+    hideSettingsForms();
+    active = avForm;
+    avForm->show(*this);
+}
+
+void SettingsWidget::hideSettingsForms()
+{
+    QLayoutItem *item;
+    while ((item = head->layout()->takeAt(0)) != 0)
+        item->widget()->hide();
+    while ((item = body->layout()->takeAt(0)) != 0)
+        item->widget()->hide();
+}
+
 void SettingsWidget::prepButtons()
 {
     // this crap is copied from ui_mainwindow.h... there's no easy way around
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index c901ce906..6ee45f90d 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -19,11 +19,12 @@
 
 #include <QHBoxLayout>
 #include <QPushButton>
-#include <QObject>
-#include "widget/croppinglabel.h"
-
-namespace Ui {class MainWindow;}
-class QString;
+class GenericForm;
+class GeneralForm;
+class IdentityForm;
+class PrivacyForm;
+class AVForm;
+namespace Ui {class MainWindow;};
 
 class SettingsWidget : public QWidget
 {
@@ -33,30 +34,38 @@ public:
     ~SettingsWidget();
 
     void show(Ui::MainWindow &ui);
+    
+    QWidget *head, *body; // keep the others private
 
 public slots:
     //void setFriendAddress(const QString& friendAddress);
 
 private slots:
+    void onGeneralClicked();
+    void onIdentityClicked();
+    void onPrivacyClicked();
+    void onAVClicked();
 
 private:
-    QWidget *_main, *main, *head, *foot;
-    // _main consists of main+foot
-    QVBoxLayout *_mainLayout;
+    QWidget *main, *foot;
+    // main consists of body+foot for Ui::MainWindow
+    QVBoxLayout *mainLayout;
+    
+    GenericForm* active;
+    GeneralForm* generalForm;
+    IdentityForm* identityForm;
+    PrivacyForm* privacyForm;
+    AVForm* avForm;
+    void hideSettingsForms();
+    
+    
     // the code pertaining to the icons is mostly copied from ui_mainwindow.h
     QHBoxLayout *iconsLayout;
     QPushButton *generalButton;
     QPushButton *identityButton;
     QPushButton *privacyButton;
     QPushButton *avButton;
-    
-    // now the actual pages and stuff
-    // ...
-
-
-
     void prepButtons(); // just so I can move the crap to the bottom of the file
-public:
 };
 
-#endif // SETTINGSFORM_H
+#endif // SETTINGSWIDGET_H

From 575862f25f1b0f5b18ff4c2698c572a590d26277 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 15 Sep 2014 08:31:42 -0500
Subject: [PATCH 29/30] cosmetics

---
 widget/form/settings/avform.cpp        | 2 ++
 widget/form/settings/generalform.cpp   | 2 ++
 widget/form/settings/genericsettings.h | 8 +++++++-
 widget/form/settings/identityform.cpp  | 2 ++
 widget/form/settings/privacyform.cpp   | 2 ++
 widget/form/settingswidget.cpp         | 2 +-
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
index 347a1cfbb..5c0b38da3 100644
--- a/widget/form/settings/avform.cpp
+++ b/widget/form/settings/avform.cpp
@@ -19,6 +19,8 @@
 AVForm::AVForm()
 {
     prep();
+    icon.addFile(":/img/settings/av.png");
+    label.setText(tr("Audio/Video settings"));
 }
 
 AVForm::~AVForm()
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index 050d4f7eb..a9810c1ae 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -20,6 +20,8 @@
 GeneralForm::GeneralForm()
 {
     prep();
+    icon.addFile(":/img/settings/general.png");
+    label.setText(tr("General settings"));
     group = new QGroupBox(tr("General Settings"));
     enableIPv6 = new QCheckBox();
     enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
index 9353d21df..94f8fe90f 100644
--- a/widget/form/settings/genericsettings.h
+++ b/widget/form/settings/genericsettings.h
@@ -34,13 +34,19 @@ public:
     }
 
 protected:
-    QVBoxLayout layout, headLayout;
+    QVBoxLayout layout;
+    QHBoxLayout headLayout;
+    QIcon icon;
+    QLabel label;
     QWidget head, body;
     void prep() // call in subclass constructor
     {
         head.setLayout(&headLayout);
+        headLayout.addWidget(&icon);
+        headLayout.addWidget(&label);
         body.setLayout(&layout);
     }
+
 };
 
 #endif
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index dbd5574c5..ac89257a9 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -22,6 +22,8 @@
 IdentityForm::IdentityForm()
 {
     prep();
+    icon.addFile(":/img/settings/identity.png");
+    label.setText(tr("Your identity"));
     toxGroup = new QGroupBox(tr("Tox ID"));
     QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
     QLineEdit* toxID = new QLineEdit();
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
index 856f64954..ef7c54c4b 100644
--- a/widget/form/settings/privacyform.cpp
+++ b/widget/form/settings/privacyform.cpp
@@ -20,6 +20,8 @@
 PrivacyForm::PrivacyForm()
 {
     prep();
+    icon.addFile(":/img/settings/privacy.png");
+    label.setText(tr("Privacy settings"));
 }
 
 PrivacyForm::~PrivacyForm()
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index 3a13c1cdb..9b5dc7856 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -110,7 +110,7 @@ void SettingsWidget::prepButtons()
     // just straight up copying it like this... oh well
     // the layout/icons obviously need to be improved, but it's a working model,
     // not a pretty one
-    QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    QSizePolicy sizePolicy3(QSizePolicy::Fixed, QSizePolicy::Fixed);
     sizePolicy3.setHorizontalStretch(0);
     sizePolicy3.setVerticalStretch(0);
     foot->setObjectName(QStringLiteral("foot"));

From 9d36833a8ba0aea01bd0d615ff1e19cf2b62b81a Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 15 Sep 2014 08:48:17 -0500
Subject: [PATCH 30/30] scaling still isn't quite right...

---
 widget/form/settings/avform.cpp        | 2 +-
 widget/form/settings/generalform.cpp   | 2 +-
 widget/form/settings/genericsettings.h | 4 ++--
 widget/form/settings/identityform.cpp  | 2 +-
 widget/form/settings/privacyform.cpp   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
index 5c0b38da3..e0b0773f9 100644
--- a/widget/form/settings/avform.cpp
+++ b/widget/form/settings/avform.cpp
@@ -19,7 +19,7 @@
 AVForm::AVForm()
 {
     prep();
-    icon.addFile(":/img/settings/av.png");
+    icon.setPixmap(QPixmap(":/img/settings/av.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Audio/Video settings"));
 }
 
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index a9810c1ae..7a6734383 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -20,7 +20,7 @@
 GeneralForm::GeneralForm()
 {
     prep();
-    icon.addFile(":/img/settings/general.png");
+    icon.setPixmap(QPixmap(":/img/settings/general.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("General settings"));
     group = new QGroupBox(tr("General Settings"));
     enableIPv6 = new QCheckBox();
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
index 94f8fe90f..760d39cb0 100644
--- a/widget/form/settings/genericsettings.h
+++ b/widget/form/settings/genericsettings.h
@@ -19,6 +19,7 @@
 
 #include <QObject>
 #include <QVBoxLayout>
+#include <QLabel>
 #include "widget/form/settingswidget.h"
 
 class GenericForm : public QObject
@@ -36,8 +37,7 @@ public:
 protected:
     QVBoxLayout layout;
     QHBoxLayout headLayout;
-    QIcon icon;
-    QLabel label;
+    QLabel label, icon;
     QWidget head, body;
     void prep() // call in subclass constructor
     {
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index ac89257a9..696b2141a 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -22,7 +22,7 @@
 IdentityForm::IdentityForm()
 {
     prep();
-    icon.addFile(":/img/settings/identity.png");
+    icon.setPixmap(QPixmap(":/img/settings/identity.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Your identity"));
     toxGroup = new QGroupBox(tr("Tox ID"));
     QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
index ef7c54c4b..e1f737975 100644
--- a/widget/form/settings/privacyform.cpp
+++ b/widget/form/settings/privacyform.cpp
@@ -20,7 +20,7 @@
 PrivacyForm::PrivacyForm()
 {
     prep();
-    icon.addFile(":/img/settings/privacy.png");
+    icon.setPixmap(QPixmap(":/img/settings/privacy.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Privacy settings"));
 }