diff -Nru kscreen-5.2.1/CMakeLists.txt kscreen-5.2.2/CMakeLists.txt
--- kscreen-5.2.1/CMakeLists.txt	2015-02-21 20:18:30.000000000 +0000
+++ kscreen-5.2.2/CMakeLists.txt	2015-03-19 11:53:32.000000000 +0000
@@ -1,5 +1,5 @@
 project(KScreen)
-set(PROJECT_VERSION "5.2.1")
+set(PROJECT_VERSION "5.2.2")
 
 cmake_minimum_required(VERSION 2.8.12)
 
diff -Nru kscreen-5.2.1/debian/changelog kscreen-5.2.2/debian/changelog
--- kscreen-5.2.1/debian/changelog	2015-02-23 17:40:46.000000000 +0000
+++ kscreen-5.2.2/debian/changelog	2015-03-24 14:21:29.000000000 +0000
@@ -1,3 +1,9 @@
+kscreen (4:5.2.2-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <sgclark@kubuntu.org>  Tue, 24 Mar 2015 07:21:29 -0700
+
 kscreen (4:5.2.1-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff -Nru kscreen-5.2.1/debian/meta/upstream_scm.json kscreen-5.2.2/debian/meta/upstream_scm.json
--- kscreen-5.2.1/debian/meta/upstream_scm.json	2015-02-23 17:40:45.000000000 +0000
+++ kscreen-5.2.2/debian/meta/upstream_scm.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"branch":"Plasma/5.2"}
diff -Nru kscreen-5.2.1/kcm/kcm_kscreen.desktop.cmake kscreen-5.2.2/kcm/kcm_kscreen.desktop.cmake
--- kscreen-5.2.1/kcm/kcm_kscreen.desktop.cmake	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kcm/kcm_kscreen.desktop.cmake	2015-03-19 11:52:32.000000000 +0000
@@ -10,6 +10,7 @@
 X-KDE-PluginInfo-Version=@KSCREEN_VERSION@
 
 Name=Display Configuration
+Name[bs]=Konfiguracija ekrana
 Name[ca]=Configuració de la pantalla
 Name[cs]=Nastavení zobrazení
 Name[de]=Anzeige einrichten
@@ -33,7 +34,9 @@
 Name[uk]=Налаштування дисплея
 Name[x-test]=xxDisplay Configurationxx
 Name[zh_CN]=显示配置
+Name[zh_TW]=顯示設定
 Comment=Manage and configure monitors and displays
+Comment[bs]=Upravljanje i konfiguracija monitora i ekrana
 Comment[ca]=Gestiona i configura els monitors i pantalles
 Comment[cs]=Spravovat a nastavit monitory a zobrazení
 Comment[de]=Verwaltung und Einrichtung vom Monitoren und Anzeigen
@@ -57,3 +60,4 @@
 Comment[uk]=Керування і налаштовування моніторів і дисплеїв
 Comment[x-test]=xxManage and configure monitors and displaysxx
 Comment[zh_CN]=管理和配置显示和监视器
+Comment[zh_TW]=管理與設定螢幕與顯示
diff -Nru kscreen-5.2.1/kcm/src/declarative/qmloutput.cpp kscreen-5.2.2/kcm/src/declarative/qmloutput.cpp
--- kscreen-5.2.1/kcm/src/declarative/qmloutput.cpp	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kcm/src/declarative/qmloutput.cpp	2015-03-19 11:52:32.000000000 +0000
@@ -25,6 +25,7 @@
 #include <QStandardItem>
 #include <QStandardItemModel>
 #include <qquickitem.h>
+#include <QRect>
 
 const static int sMargin = 0;
 const static int sSnapArea = 20;
@@ -102,8 +103,6 @@
 
     m_leftDock = output;
     Q_EMIT leftDockedToChanged();
-
-    update();
 }
 
 QMLOutput *QMLOutput::leftDockedTo() const
@@ -124,8 +123,6 @@
 
     m_topDock = output;
     Q_EMIT topDockedToChanged();
-
-    update();
 }
 
 QMLOutput *QMLOutput::topDockedTo() const
@@ -146,8 +143,6 @@
 
     m_rightDock = output;
     Q_EMIT rightDockedToChanged();
-
-    update();
 }
 
 QMLOutput *QMLOutput::rightDockedTo() const
@@ -168,8 +163,6 @@
 
     m_bottomDock = output;
     Q_EMIT bottomDockedToChanged();
-
-    update();
 }
 
 QMLOutput *QMLOutput::bottomDockedTo() const
@@ -308,6 +301,39 @@
     Q_EMIT isCloneModeChanged();
 }
 
+void QMLOutput::dockToNeighbours()
+{
+    Q_FOREACH (QMLOutput *otherQmlOutput, m_screen->outputs()) {
+        if (otherQmlOutput == this) {
+            continue;
+        }
+
+        if (!otherQmlOutput->output()->isConnected() || !otherQmlOutput->output()->isEnabled()) {
+            continue;
+        }
+
+        const QRect geom = m_output->geometry();
+        const QRect otherGeom = otherQmlOutput->output()->geometry();
+
+        if (geom.left() - 1 == otherGeom.right()) {
+            setLeftDockedTo(otherQmlOutput);
+            continue;
+        }
+        if (geom.right() + 1 == otherGeom.left()) {
+            setRightDockedTo(otherQmlOutput);
+            continue;
+        }
+        if (geom.top() - 1 == otherGeom.bottom()) {
+            setTopDockedTo(otherQmlOutput);
+            continue;
+        }
+        if (geom.bottom() + 1 == otherGeom.top()) {
+            setBottomDockedTo(otherQmlOutput);
+            continue;
+        }
+    }
+}
+
 KScreen::ModePtr QMLOutput::bestMode() const
 {
     if (!m_output) {
@@ -542,12 +568,12 @@
  */
 void QMLOutput::updateRootProperties()
 {
-    const int transformedWidth = (m_output->isHorizontal() ? currentOutputWidth() : currentOutputHeight()) * m_screen->outputScale();
-    const int transformedHeight = (m_output->isHorizontal() ? currentOutputHeight() : currentOutputWidth()) * m_screen->outputScale();
+    const float transformedWidth = (m_output->isHorizontal() ? currentOutputWidth() : currentOutputHeight()) * m_screen->outputScale();
+    const float transformedHeight = (m_output->isHorizontal() ? currentOutputHeight() : currentOutputWidth()) * m_screen->outputScale();
 
-    const int transformedX = x() + (width() / 2) - (transformedWidth / 2);
-    const int transformedY = y() + (height() / 2) - (transformedHeight / 2);
+    const float transformedX = x() + (width() / 2.0) - (transformedWidth / 2.0);
+    const float transformedY = y() + (height() / 2.0) - (transformedHeight / 2.0);
 
-    setPosition(QPoint(transformedX, transformedY));
-    setSize(QSize(transformedWidth, transformedHeight));
+    setPosition(QPointF(transformedX, transformedY));
+    setSize(QSizeF(transformedWidth, transformedHeight));
 }
diff -Nru kscreen-5.2.1/kcm/src/declarative/qmloutput.h kscreen-5.2.2/kcm/src/declarative/qmloutput.h
--- kscreen-5.2.1/kcm/src/declarative/qmloutput.h	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kcm/src/declarative/qmloutput.h	2015-03-19 11:52:32.000000000 +0000
@@ -155,6 +155,8 @@
     void setIsCloneMode(bool isCloneMode);
     bool isCloneMode() const;
 
+    void dockToNeighbours();
+
   public Q_SLOTS:
     void updateRootProperties();
 
diff -Nru kscreen-5.2.1/kcm/src/declarative/qmlscreen.cpp kscreen-5.2.2/kcm/src/declarative/qmlscreen.cpp
--- kscreen-5.2.1/kcm/src/declarative/qmlscreen.cpp	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kcm/src/declarative/qmlscreen.cpp	2015-03-19 11:52:32.000000000 +0000
@@ -84,15 +84,8 @@
             });
     connect(qmloutput, SIGNAL(clicked()),
             this, SLOT(qmlOutputClicked()));
-}
-
-void QMLScreen::loadOutputs()
-{
-    Q_FOREACH (const KScreen::OutputPtr &output, m_config->outputs()) {
-        addOutput(output);
-    }
 
-    updateOutputsPlacement();
+    qmloutput->updateRootProperties();
 }
 
 int QMLScreen::connectedOutputsCount() const
@@ -353,7 +346,17 @@
     m_config = config;
     KScreen::ConfigMonitor::instance()->addConfig(m_config);
 
-    QTimer::singleShot(0, this, SLOT(loadOutputs()));
+    Q_FOREACH (const KScreen::OutputPtr &output, m_config->outputs()) {
+        addOutput(output);
+    }
+
+    updateOutputsPlacement();
+
+    Q_FOREACH (QMLOutput *qmlOutput, m_outputMap) {
+        if (qmlOutput->output()->isConnected() && qmlOutput->output()->isEnabled()) {
+            qmlOutput->dockToNeighbours();
+        }
+    }
 }
 
 void QMLScreen::setEngine(QQmlEngine* engine)
diff -Nru kscreen-5.2.1/kcm/src/declarative/qmlscreen.h kscreen-5.2.2/kcm/src/declarative/qmlscreen.h
--- kscreen-5.2.1/kcm/src/declarative/qmlscreen.h	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kcm/src/declarative/qmlscreen.h	2015-03-19 11:52:32.000000000 +0000
@@ -91,8 +91,6 @@
     void focusedOutputChanged(QMLOutput *output);
 
   private Q_SLOTS:
-    void loadOutputs();
-
     void outputConnectedChanged();
     void outputEnabledChanged();
     void outputPrimaryChanged();
diff -Nru kscreen-5.2.1/kcm/src/kcm_kscreen.cpp kscreen-5.2.2/kcm/src/kcm_kscreen.cpp
--- kscreen-5.2.1/kcm/src/kcm_kscreen.cpp	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kcm/src/kcm_kscreen.cpp	2015-03-19 11:52:32.000000000 +0000
@@ -77,12 +77,14 @@
         return;
     }
 
-    mKScreenWidget = new Widget(this);
-    mKScreenWidget->setConfig(qobject_cast<GetConfigOperation*>(op)->config());
-    layout->addWidget(mKScreenWidget);
+    if (!mKScreenWidget) {
+        mKScreenWidget = new Widget(this);
+        layout->addWidget(mKScreenWidget);
+        connect(mKScreenWidget, SIGNAL(changed()),
+                this, SLOT(changed()));
+    }
 
-    connect(mKScreenWidget, SIGNAL(changed()),
-            this, SLOT(changed()));
+    mKScreenWidget->setConfig(qobject_cast<GetConfigOperation*>(op)->config());
 }
 
 KCMKScreen::~KCMKScreen()
diff -Nru kscreen-5.2.1/kcm/src/resolutionslider.cpp kscreen-5.2.2/kcm/src/resolutionslider.cpp
--- kscreen-5.2.1/kcm/src/resolutionslider.cpp	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kcm/src/resolutionslider.cpp	2015-03-19 11:52:32.000000000 +0000
@@ -147,7 +147,7 @@
         mSlider->blockSignals(true);
         mSlider->setValue(mModes.indexOf(mOutput->currentMode()->size()));
         mSlider->blockSignals(false);
-    } else {
+    } else if (mComboBox) {
         mComboBox->blockSignals(true);
         mComboBox->setCurrentIndex(mModes.indexOf(mOutput->currentMode()->size()));
         mComboBox->blockSignals(false);
diff -Nru kscreen-5.2.1/kded/daemon.cpp kscreen-5.2.2/kded/daemon.cpp
--- kscreen-5.2.1/kded/daemon.cpp	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kded/daemon.cpp	2015-03-19 11:52:32.000000000 +0000
@@ -44,7 +44,7 @@
 KScreenDaemon::KScreenDaemon(QObject* parent, const QList< QVariant >& )
  : KDEDModule(parent)
  , m_monitoredConfig(0)
- , m_iteration(0)
+ , m_iteration(Generator::None)
  , m_monitoring(false)
  , m_changeCompressor(new QTimer())
  , m_buttonTimer(new QTimer())
@@ -193,16 +193,16 @@
 void KScreenDaemon::resetDisplaySwitch()
 {
     qCDebug(KSCREEN_KDED) << "resetDisplaySwitch()";
-    m_iteration = 0;
+    m_iteration = Generator::None;
 }
 
 void KScreenDaemon::applyGenericConfig()
 {
-    if (m_iteration == 5) {
-        m_iteration = 0;
+    if (m_iteration == Generator::ExtendToRight) {
+        m_iteration = Generator::None;
     }
 
-    m_iteration++;
+    m_iteration = Generator::DisplaySwitchAction(static_cast<int>(m_iteration) + 1);
     qCDebug(KSCREEN_KDED) << "displayButton: " << m_iteration;
 
     doApplyConfig(Generator::self()->displaySwitch(m_iteration));
diff -Nru kscreen-5.2.1/kded/daemon.h kscreen-5.2.2/kded/daemon.h
--- kscreen-5.2.1/kded/daemon.h	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kded/daemon.h	2015-03-19 11:52:32.000000000 +0000
@@ -25,6 +25,8 @@
 
 #include <kscreen/config.h>
 
+#include "generator.h"
+
 class QTimer;
 
 namespace KScreen
@@ -68,7 +70,7 @@
         void monitorConnectedChange();
 
         KScreen::ConfigPtr m_monitoredConfig;
-        quint8 m_iteration;
+        Generator::DisplaySwitchAction m_iteration;
         bool m_monitoring;
         QTimer* m_changeCompressor;
         QTimer* m_buttonTimer;
diff -Nru kscreen-5.2.1/kded/generator.cpp kscreen-5.2.2/kded/generator.cpp
--- kscreen-5.2.1/kded/generator.cpp	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kded/generator.cpp	2015-03-19 11:52:32.000000000 +0000
@@ -27,6 +27,19 @@
 
 #include <kscreen/config.h>
 
+#if defined(QT_NO_DEBUG)
+#define ASSERT_OUTPUTS(outputs)
+#else
+#define ASSERT_OUTPUTS(outputs) \
+    while(true) { \
+        Q_ASSERT(!outputs.isEmpty()); \
+        Q_FOREACH (const KScreen::OutputPtr &output, outputs) { \
+            Q_ASSERT(output); \
+            Q_ASSERT(output->isConnected()); \
+        } break; \
+    }
+#endif
+
 Generator* Generator::instance = 0;
 
 bool operator<(const QSize &s1, const QSize &s2)
@@ -77,26 +90,25 @@
 
     disableAllDisconnectedOutputs(config->outputs());
 
-    KScreen::OutputList outputs = config->connectedOutputs();
+    KScreen::OutputList connectedOutputs = config->connectedOutputs();
+    qCDebug(KSCREEN_KDED) << "Connected outputs: " << connectedOutputs.count();
 
-    qCDebug(KSCREEN_KDED) << "Connected outputs: " << outputs.count();
-
-    if (outputs.isEmpty()) {
+    if (connectedOutputs.isEmpty()) {
         return config;
     }
 
-    if (outputs.count() == 1) {
-        singleOutput(outputs);
+    if (connectedOutputs.count() == 1) {
+        singleOutput(connectedOutputs);
         return config;
     }
 
     if (isLaptop()) {
-        laptop(outputs);
+        laptop(connectedOutputs);
         return fallbackIfNeeded(config);
     }
 
     qCDebug(KSCREEN_KDED) << "Extend to Right";
-    extendToRight(outputs);
+    extendToRight(connectedOutputs);
 
     return fallbackIfNeeded(config);
 }
@@ -110,12 +122,15 @@
     //If the ideal config can't be applied, try clonning
     if (!KScreen::Config::canBeApplied(config)) {
         if (isLaptop()) {
-            newConfig = displaySwitch(1);// Try to clone at our best
+            newConfig = displaySwitch(Generator::Clone); // Try to clone at our best
         } else {
             newConfig = config;
-            KScreen::OutputList outputList = config->connectedOutputs();
-            outputList.value(outputList.keys().first())->setPrimary(true);
-            cloneScreens(outputList);
+            KScreen::OutputList connectedOutputs = config->connectedOutputs();
+            if (connectedOutputs.isEmpty()) {
+                return config;
+            }
+            connectedOutputs.value(connectedOutputs.keys().first())->setPrimary(true);
+            cloneScreens(connectedOutputs);
         }
     } else {
         newConfig = config;
@@ -130,91 +145,124 @@
     return config;
 }
 
-KScreen::ConfigPtr Generator::displaySwitch(int iteration)
+KScreen::ConfigPtr Generator::displaySwitch(DisplaySwitchAction action)
 {
 //     KDebug::Block switchBlock("Display Switch");
     KScreen::ConfigPtr config = m_currentConfig;
     Q_ASSERT(config);
 
 
-    KScreen::OutputList outputs = config->connectedOutputs();
+    KScreen::OutputList connectedOutputs = config->connectedOutputs();
 
-    if (outputs.count() < 2) {
-        singleOutput(outputs);
+    // There's not much else we can do with only one output
+    if (connectedOutputs.count() < 2) {
+        singleOutput(connectedOutputs);
         return config;
     }
 
-    if (outputs.count() > 2) {
-        extendToRight(outputs);
+    // We cannot try all possible combinations with two and more outputs
+    if (connectedOutputs.count() > 2) {
+        extendToRight(connectedOutputs);
         return config;
     }
 
-    if (iteration == 1) {
-        qCDebug(KSCREEN_KDED) << "Cloning";
-        embeddedOutput(outputs)->setPrimary(true);
-        cloneScreens(outputs);
-
+    KScreen::OutputPtr embedded, external;
+    embedded = embeddedOutput(connectedOutputs);
+    // If we don't have an embedded output (desktop with two external screens
+    // for instance), then pretend one of them is embedded
+    if (!embedded) {
+        embedded = connectedOutputs.value(connectedOutputs.keys().first());
+    }
+    // Just to be sure
+    if (embedded->modes().isEmpty()) {
         return config;
     }
 
-    KScreen::OutputPtr embedded, external;
-    embedded = embeddedOutput(outputs);
-    outputs.remove(embedded->id());
-    external = outputs.value(outputs.keys().first());
+    if (action == Generator::Clone) {
+        qCDebug(KSCREEN_KDED) << "Cloning";
+        embedded->setPrimary(true);
+        cloneScreens(connectedOutputs);
+        return config;
+    }
 
+    connectedOutputs.remove(embedded->id());
+    external = connectedOutputs.value(connectedOutputs.keys().first());
+    // Just to be sure
+    if (external->modes().isEmpty()) {
+        return config;
+    }
 
-    if (iteration == 2) {
+    switch (action) {
+    case Generator::ExtendToLeft: {
         qCDebug(KSCREEN_KDED) << "Extend to left";
-        external->setEnabled(true);
         external->setPos(QPoint(0,0));
-        external->setCurrentModeId(external->preferredModeId());
+        external->setEnabled(true);
+        const KScreen::ModePtr extMode = bestModeForOutput(external);
+        Q_ASSERT(extMode);
+        external->setCurrentModeId(extMode->id());
 
-        QSize size = external->currentMode()->size();
+        Q_ASSERT(external->currentMode()); // we must have a mode now
+        const QSize size = external->currentMode()->size();
         embedded->setPos(QPoint(size.width(), 0));
         embedded->setEnabled(true);
-        embedded->setCurrentModeId(embedded->preferredModeId());
         embedded->setPrimary(true);
+        const KScreen::ModePtr embeddedMode = bestModeForOutput(embedded);
+        Q_ASSERT(embeddedMode);
+        embedded->setCurrentModeId(embeddedMode->id());
+
         return config;
     }
-
-    if (iteration == 3) {
+    case Generator::TurnOffEmbedded: {
         qCDebug(KSCREEN_KDED) << "Turn off embedded (laptop)";
         embedded->setEnabled(false);
         embedded->setPrimary(false);
 
         external->setEnabled(true);
         external->setPrimary(true);
-        external->setCurrentModeId(external->preferredModeId());
+        const KScreen::ModePtr extMode = bestModeForOutput(external);
+        Q_ASSERT(extMode);
+        external->setCurrentModeId(extMode->id());
         return config;
     }
-
-    if (iteration == 4) {
+    case Generator::TurnOffExternal: {
         qCDebug(KSCREEN_KDED) << "Turn off external screen";
+        embedded->setPos(QPoint(0,0));
         embedded->setEnabled(true);
         embedded->setPrimary(true);
-        embedded->setPos(QPoint(0,0));
-        embedded->setCurrentModeId(embedded->preferredModeId());
+        const KScreen::ModePtr embeddedMode = bestModeForOutput(embedded);
+        Q_ASSERT(embeddedMode);
+        embedded->setCurrentModeId(embeddedMode->id());
 
         external->setEnabled(false);
         external->setPrimary(false);
         return config;
     }
-
-    if (iteration == 5) {
+    case Generator::ExtendToRight: {
         qCDebug(KSCREEN_KDED) << "Extend to the right";
         embedded->setPos(QPoint(0,0));
-        embedded->setCurrentModeId(embedded->preferredModeId());
-        embedded->setPrimary(true);
         embedded->setEnabled(true);
+        embedded->setPrimary(true);
+        const KScreen::ModePtr embeddedMode = bestModeForOutput(embedded);
+        Q_ASSERT(embeddedMode);
+        embedded->setCurrentModeId(embeddedMode->id());
 
-        QSize size = embedded->currentMode()->size();
+
+        Q_ASSERT(embedded->currentMode()); // we must have a mode now
+        const QSize size = embedded->currentMode()->size();
         external->setPos(QPoint(size.width(), 0));
         external->setEnabled(true);
-        external->setCurrentModeId(external->preferredModeId());
         external->setPrimary(false);
+        const KScreen::ModePtr extMode = bestModeForOutput(external);
+        Q_ASSERT(extMode);
+        external->setCurrentModeId(extMode->id());
 
         return config;
     }
+    default:
+        // None: just return config
+        // Clone: handled above
+        break;
+    } // switch
 
     return config;
 }
@@ -224,23 +272,22 @@
     return size.width() * size.height();
 }
 
-void Generator::cloneScreens(KScreen::OutputList& outputs)
+void Generator::cloneScreens(KScreen::OutputList &connectedOutputs)
 {
-    if (outputs.isEmpty()) {
-        qCWarning(KSCREEN_KDED) << "output list to clone is empty";
+    ASSERT_OUTPUTS(connectedOutputs);
+    if (connectedOutputs.isEmpty()) {
         return;
     }
 
     QSet<QSize> commonSizes;
-    const QSize maxSize  = m_currentConfig->screen()->maxSize();
+    const QSize maxScreenSize  = m_currentConfig->screen()->maxSize();
 
-    QList<QSet<QSize> >modes;
-    Q_FOREACH(const KScreen::OutputPtr &output, outputs) {
+    QList<QSet<QSize>> modes;
+    Q_FOREACH(const KScreen::OutputPtr &output, connectedOutputs) {
         QSet<QSize> modeSizes;
-        const KScreen::ModeList modes = output->modes();
-        Q_FOREACH(const KScreen::ModePtr &mode, modes) {
+        Q_FOREACH(const KScreen::ModePtr &mode, output->modes()) {
             const QSize size = mode->size();
-            if (size.width() > maxSize.width() || size.height() > maxSize.height()) {
+            if (size.width() > maxScreenSize.width() || size.height() > maxScreenSize.height()) {
                 continue;
             }
             modeSizes.insert(mode->size());
@@ -258,10 +305,15 @@
     qCDebug(KSCREEN_KDED) << "Common sizes: " << commonSizes;
     //fallback to biggestMode if no commonSizes have been found
     if (commonSizes.isEmpty()) {
-        Q_FOREACH(KScreen::OutputPtr output, outputs) {
+        Q_FOREACH(KScreen::OutputPtr output, connectedOutputs) {
+            if (output->modes().isEmpty()) {
+                continue;
+            }
             output->setEnabled(true);
             output->setPos(QPoint(0, 0));
-            output->setCurrentModeId(biggestMode(output->modes())->id());
+            const KScreen::ModePtr mode = biggestMode(output->modes());
+            Q_ASSERT(mode);
+            output->setCurrentModeId(mode->id());
         }
         return;
     }
@@ -270,39 +322,53 @@
     //At this point, we know we have common sizes, let's get the biggest on
     QList<QSize> commonSizeList = commonSizes.toList();
     qSort(commonSizeList.begin(), commonSizeList.end());
-    QSize biggestSize = commonSizeList.last();
+    const QSize biggestSize = commonSizeList.last();
 
     //Finally, look for the mode with biggestSize and biggest refreshRate and set it
     qCDebug(KSCREEN_KDED) << "Biggest Size: " << biggestSize;
     KScreen::ModePtr bestMode;
-    Q_FOREACH(KScreen::OutputPtr output, outputs) {
+    Q_FOREACH(KScreen::OutputPtr output, connectedOutputs) {
+        if (output->modes().isEmpty()) {
+            continue;
+        }
         bestMode = bestModeForSize(output->modes(), biggestSize);
+        Q_ASSERT(bestMode); // we resolved this mode previously, so it better works
         output->setEnabled(true);
         output->setPos(QPoint(0, 0));
         output->setCurrentModeId(bestMode->id());
     }
 }
 
-void Generator::singleOutput(KScreen::OutputList &outputs)
+void Generator::singleOutput(KScreen::OutputList &connectedOutputs)
 {
-    Q_ASSERT(!outputs.isEmpty());
+    ASSERT_OUTPUTS(connectedOutputs);
+    if (connectedOutputs.isEmpty()) {
+        return;
+    }
 
-    KScreen::OutputPtr output = outputs.take(outputs.keys().first());
-    Q_ASSERT(output);
+    KScreen::OutputPtr output = connectedOutputs.take(connectedOutputs.keys().first());
+    if (output->modes().isEmpty()) {
+        return;
+    }
 
-    output->setCurrentModeId(output->preferredModeId());
+    const KScreen::ModePtr bestMode = bestModeForOutput(output);
+    Q_ASSERT(bestMode);
+    output->setCurrentModeId(bestMode->id());
     output->setEnabled(true);
     output->setPrimary(true);
     output->setPos(QPoint(0,0));
 }
 
-void Generator::laptop(KScreen::OutputList &outputs)
+void Generator::laptop(KScreen::OutputList &connectedOutputs)
 {
-    Q_ASSERT(!outputs.isEmpty());
+    ASSERT_OUTPUTS(connectedOutputs)
+    if (connectedOutputs.isEmpty()) {
+        return;
+    }
 
 //     KDebug::Block laptopBlock("Laptop config");
 
-    KScreen::OutputPtr embedded = embeddedOutput(outputs);
+    KScreen::OutputPtr embedded = embeddedOutput(connectedOutputs);
     /* Apparently older laptops use "VGA-*" as embedded output ID, so embeddedOutput()
      * will fail, because it looks only for modern "LVDS", "EDP", etc. If we
      * fail to detect which output is embedded, just use the one  with the lowest
@@ -310,72 +376,83 @@
      * See bug #318907 for further reference. -- dvratil
      */
     if (!embedded) {
-        QList<int> keys = outputs.keys();
+        QList<int> keys = connectedOutputs.keys();
         qSort(keys);
-        embedded = outputs.value(keys.first());
+        embedded = connectedOutputs.value(keys.first());
     }
-    outputs.remove(embedded->id());
+    connectedOutputs.remove(embedded->id());
 
-    if (outputs.isEmpty()) {
+    if (connectedOutputs.isEmpty() || embedded->modes().isEmpty()) {
         qCWarning(KSCREEN_KDED) << "No external outputs found, going for singleOutput()";
-        outputs.insert(embedded->id(), embedded);
-        return singleOutput(outputs);
+        connectedOutputs.insert(embedded->id(), embedded);
+        return singleOutput(connectedOutputs);
     }
 
-    if (isLidClosed() && outputs.count() == 1) {
+    if (isLidClosed() && connectedOutputs.count() == 1) {
         qCDebug(KSCREEN_KDED) << "With lid closed";
         embedded->setEnabled(false);
         embedded->setPrimary(false);
 
-        KScreen::OutputPtr external = outputs.value(outputs.keys().first());
+        KScreen::OutputPtr external = connectedOutputs.value(connectedOutputs.keys().first());
+        if (external->modes().isEmpty()) {
+            return;
+        }
         external->setEnabled(true);
         external->setPrimary(true);
-        external->setCurrentModeId(external->preferredModeId());
+        const KScreen::ModePtr bestMode = bestModeForOutput(external);
+        Q_ASSERT(bestMode);
+        external->setCurrentModeId(bestMode->id());
         external->setPos(QPoint(0, 0));
 
         return;
     }
 
-    if (isLidClosed() && outputs.count() > 1) {
+    if (isLidClosed() && connectedOutputs.count() > 1) {
         qCDebug(KSCREEN_KDED) << "Lid is closed, and more than one output";
         embedded->setEnabled(false);
         embedded->setPrimary(false);
 
-        extendToRight(outputs);
+        extendToRight(connectedOutputs);
         return;
     }
 
     qCDebug(KSCREEN_KDED) << "Lid is open";
     //If lid is open, laptop screen shuold be primary
     embedded->setPos(QPoint(0,0));
-    embedded->setCurrentModeId(embedded->preferredModeId());
     embedded->setPrimary(true);
     embedded->setEnabled(true);
+    const KScreen::ModePtr embeddedMode = bestModeForOutput(embedded);
+    Q_ASSERT(embeddedMode);
+    embedded->setCurrentModeId(embeddedMode->id());
 
     int globalWidth;
     if (embedded->isHorizontal()) {
-        globalWidth = embedded->preferredMode()->size().width();
+        globalWidth = embedded->currentMode()->size().width();
     } else {
-        globalWidth = embedded->preferredMode()->size().height();
+        globalWidth = embedded->currentMode()->size().height();
     }
-    KScreen::OutputPtr biggest = biggestOutput(outputs);
-    outputs.remove(biggest->id());
+    KScreen::OutputPtr biggest = biggestOutput(connectedOutputs);
+    Q_ASSERT(biggest);
+    connectedOutputs.remove(biggest->id());
 
     biggest->setPos(QPoint(globalWidth, 0));
     biggest->setEnabled(true);
-    biggest->setCurrentModeId(biggest->preferredModeId());
     biggest->setPrimary(false);
+    const KScreen::ModePtr mode = bestModeForOutput(biggest);
+    biggest->setCurrentModeId(mode->id());
 
     if (biggest->isHorizontal()) {
         globalWidth += biggest->currentMode()->size().width();
     } else {
         globalWidth += biggest->currentMode()->size().height();
     }
-    Q_FOREACH(KScreen::OutputPtr output, outputs) {
+    Q_FOREACH(KScreen::OutputPtr output, connectedOutputs) {
         output->setEnabled(true);
-        output->setCurrentModeId(output->preferredModeId());
-        output->setPos(QPoint(globalWidth, 0));
         output->setPrimary(false);
+        output->setPos(QPoint(globalWidth, 0));
+        const KScreen::ModePtr mode = bestModeForOutput(output);
+        Q_ASSERT(mode);
+        output->setCurrentModeId(mode->id());
 
         if (output->isHorizontal()) {
             globalWidth += output->currentMode()->size().width();
@@ -391,20 +468,25 @@
     }
 }
 
-void Generator::extendToRight(KScreen::OutputList &outputs)
+void Generator::extendToRight(KScreen::OutputList &connectedOutputs)
 {
-    Q_ASSERT(!outputs.isEmpty());
+    ASSERT_OUTPUTS(connectedOutputs);
+    if (connectedOutputs.isEmpty()) {
+        return;
+    }
 
     qCDebug(KSCREEN_KDED) << "Extending to the right";
-    KScreen::OutputPtr biggest = biggestOutput(outputs);
+    KScreen::OutputPtr biggest = biggestOutput(connectedOutputs);
     Q_ASSERT(biggest);
 
-    outputs.remove(biggest->id());
+    connectedOutputs.remove(biggest->id());
 
     biggest->setEnabled(true);
     biggest->setPrimary(true);
-    biggest->setCurrentModeId(biggest->preferredModeId());
     biggest->setPos(QPoint(0,0));
+    const KScreen::ModePtr mode = bestModeForOutput(biggest);
+    Q_ASSERT(mode);
+    biggest->setCurrentModeId(mode->id());
 
     int globalWidth;
     if (biggest->isHorizontal()) {
@@ -413,11 +495,13 @@
         globalWidth = biggest->currentMode()->size().height();
     }
 
-    Q_FOREACH(KScreen::OutputPtr output, outputs) {
+    Q_FOREACH(KScreen::OutputPtr output, connectedOutputs) {
         output->setEnabled(true);
         output->setPrimary(false);
-        output->setCurrentModeId(output->preferredModeId());
         output->setPos(QPoint(globalWidth, 0));
+        const KScreen::ModePtr mode = bestModeForOutput(output);
+        Q_ASSERT(mode);
+        output->setCurrentModeId(mode->id());
 
         if (output->isHorizontal()) {
             globalWidth += output->currentMode()->size().width();
@@ -429,6 +513,8 @@
 
 KScreen::ModePtr Generator::biggestMode(const KScreen::ModeList &modes)
 {
+    Q_ASSERT(!modes.isEmpty());
+
     int modeArea, biggestArea = 0;
     KScreen::ModePtr biggestMode;
     Q_FOREACH(const KScreen::ModePtr &mode, modes) {
@@ -472,12 +558,27 @@
     return bestMode;
 }
 
+KScreen::ModePtr Generator::bestModeForOutput(const KScreen::OutputPtr &output)
+{
+    if (output->preferredMode()) {
+        return output->preferredMode();
+    }
+
+    return biggestMode(output->modes());
+}
+
+
 KScreen::OutputPtr Generator::biggestOutput(const KScreen::OutputList &outputs)
 {
+    ASSERT_OUTPUTS(outputs)
+
     int area, total = 0;
     KScreen::OutputPtr biggest;
     Q_FOREACH(const KScreen::OutputPtr &output, outputs) {
-        const KScreen::ModePtr mode = output->preferredMode();
+        const KScreen::ModePtr mode = bestModeForOutput(output);
+        if (!mode) {
+            continue;
+        }
         area = mode->size().width() * mode->size().height();
         if (area <= total) {
             continue;
@@ -567,4 +668,3 @@
 {
     m_forceNotLaptop = force;
 }
-
diff -Nru kscreen-5.2.1/kded/generator.h kscreen-5.2.2/kded/generator.h
--- kscreen-5.2.1/kded/generator.h	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kded/generator.h	2015-03-19 11:52:32.000000000 +0000
@@ -33,19 +33,30 @@
 {
     Q_OBJECT
     public:
+        enum DisplaySwitchAction {
+            None = 0,
+            Clone = 1,
+            ExtendToLeft = 2,
+            TurnOffEmbedded = 3,
+            TurnOffExternal = 4,
+            ExtendToRight = 5,
+        };
+
         static Generator* self();
         static void destroy();
 
         void setCurrentConfig(const KScreen::ConfigPtr &currentConfig);
 
         KScreen::ConfigPtr idealConfig(const KScreen::ConfigPtr &currentConfig);
-        KScreen::ConfigPtr displaySwitch(int iteration);
+        KScreen::ConfigPtr displaySwitch(DisplaySwitchAction iteration);
 
         void setForceLaptop(bool force);
         void setForceLidClosed(bool force);
         void setForceDocked(bool force);
         void setForceNotLaptop(bool force);
 
+        static KScreen::ModePtr biggestMode(const KScreen::ModeList &modes);
+
     Q_SIGNALS:
         void ready();
 
@@ -54,17 +65,18 @@
         virtual ~Generator();
 
         KScreen::ConfigPtr fallbackIfNeeded(const KScreen::ConfigPtr &config);
-        void cloneScreens(KScreen::OutputList& outputs);
 
-        void laptop(KScreen::OutputList& outputs);
+        void cloneScreens(KScreen::OutputList &connectedOutputs);
+        void laptop(KScreen::OutputList &connectedOutputs);
+        void singleOutput(KScreen::OutputList &connectedOutputs);
+        void extendToRight(KScreen::OutputList &connectedOutputs);
 
-        void singleOutput(KScreen::OutputList& outputs);
-        void extendToRight(KScreen::OutputList& outputs);
-        KScreen::ModePtr biggestMode(const KScreen::ModeList &modes);
         KScreen::ModePtr bestModeForSize(const KScreen::ModeList& modes, const QSize &size);
-        KScreen::OutputPtr biggestOutput(const KScreen::OutputList &outputs);
-        KScreen::OutputPtr embeddedOutput(const KScreen::OutputList &outputs);
-        void disableAllDisconnectedOutputs(const KScreen::OutputList &outputs);
+        KScreen::ModePtr bestModeForOutput(const KScreen::OutputPtr &output);
+
+        KScreen::OutputPtr biggestOutput(const KScreen::OutputList &connectedOutputs);
+        KScreen::OutputPtr embeddedOutput(const KScreen::OutputList &connectedOutputs);
+        void disableAllDisconnectedOutputs(const KScreen::OutputList &connectedOutputs);
 
         bool isLaptop();
         bool isLidClosed();
diff -Nru kscreen-5.2.1/kded/kscreen.desktop.cmake kscreen-5.2.2/kded/kscreen.desktop.cmake
--- kscreen-5.2.1/kded/kscreen.desktop.cmake	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kded/kscreen.desktop.cmake	2015-03-19 11:52:32.000000000 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=KScreen 2
+Name[bs]=KScreen 2
 Name[ca]=KScreen 2
 Name[cs]=KScreen 2
 Name[de]=KScreen 2
@@ -23,7 +24,9 @@
 Name[uk]=KScreen 2
 Name[x-test]=xxKScreen 2xx
 Name[zh_CN]=KScreen 2
+Name[zh_TW]=KScreen 2
 Comment=Screen management
+Comment[bs]=Upravljanje ekranom
 Comment[ca]=Gestió de pantalla
 Comment[cs]=Správa obrazovek
 Comment[de]=Bildschirm-Verwaltung
@@ -47,6 +50,7 @@
 Comment[uk]=Керування екраном
 Comment[x-test]=xxScreen managementxx
 Comment[zh_CN]=屏幕管理
+Comment[zh_TW]=螢幕管理
 
 Type=Service
 Icon=preferences-system-power-management
diff -Nru kscreen-5.2.1/kded/serializer.cpp kscreen-5.2.2/kded/serializer.cpp
--- kscreen-5.2.1/kded/serializer.cpp	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/kded/serializer.cpp	2015-03-19 11:52:32.000000000 +0000
@@ -18,6 +18,7 @@
 
 #include "serializer.h"
 #include "debug.h"
+#include "generator.h"
 
 #include <QtCore/QStringList>
 #include <QtCore/QCryptographicHash>
@@ -182,6 +183,7 @@
         qCDebug(KSCREEN_KDED) << "Finding a mode for" << size << "@" << modeInfo["refresh"].toFloat();
 
         KScreen::ModeList modes = output->modes();
+        KScreen::ModePtr matchingMode;
         Q_FOREACH(const KScreen::ModePtr &mode, modes) {
             if (mode->size() != size) {
                 continue;
@@ -191,12 +193,34 @@
             }
 
             qCDebug(KSCREEN_KDED) << "\tFound: " << mode->id() << " " << mode->size() << "@" << mode->refreshRate();
-            output->setCurrentModeId(mode->id());
+            matchingMode = mode;
             break;
         }
+
+        if (!matchingMode) {
+            qCWarning(KSCREEN_KDED) << "\tFailed to find a matching mode - this means that our config is corrupted"
+                                       "or a different device with the same serial number has been connected (very unlikely)."
+                                       "Falling back to preferred modes.";
+            matchingMode = output->preferredMode();
+
+            if (!matchingMode) {
+                qCWarning(KSCREEN_KDED) << "\tFailed to get a preferred mode, falling back to biggest mode.";
+                matchingMode = Generator::biggestMode(modes);
+
+                if (!matchingMode) {
+                    qCWarning(KSCREEN_KDED) << "\tFailed to get biggest mode. Which means there are no modes. Turning off the screen.";
+                    output->setEnabled(false);
+                    return output;
+                }
+            }
+        }
+
+        output->setCurrentModeId(matchingMode->id());
         return output;
     }
 
+    qCWarning(KSCREEN_KDED) << "\tFailed to find a matching output in the current config - this means that our config is corrupted"
+                               "or a different device with the same serial number has been connected (very unlikely).";
     return KScreen::OutputPtr();
 }
 
diff -Nru kscreen-5.2.1/plasma/plasma-applet-kscreen.desktop.cmake kscreen-5.2.2/plasma/plasma-applet-kscreen.desktop.cmake
--- kscreen-5.2.1/plasma/plasma-applet-kscreen.desktop.cmake	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/plasma/plasma-applet-kscreen.desktop.cmake	2015-03-19 11:52:32.000000000 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Quick Display Configuration
+Name[bs]=Brza konfiguracija ekrana
 Name[ca]=Configuració ràpida de la pantalla
 Name[cs]=Rychlé nastavení zobrazení
 Name[de]=Schnelle Anzeige-Einrichtung
@@ -23,7 +24,9 @@
 Name[uk]=Швидке налаштовування дисплея
 Name[x-test]=xxQuick Display Configurationxx
 Name[zh_CN]=快捷显示管理
+Name[zh_TW]=快速顯示設定
 Comment=Quick configuration of a new display
+Comment[bs]=Brza konfiguracija novog ekrana
 Comment[ca]=Configuració ràpida d'una nova pantalla
 Comment[cs]=Rychlé nastavení nového zobrazení
 Comment[de]=Schnelle Einrichtung einer neuen Anzeige
@@ -47,6 +50,7 @@
 Comment[uk]=Швидке налаштовування нового дисплея
 Comment[x-test]=xxQuick configuration of a new displayxx
 Comment[zh_CN]=快捷配置新显示器
+Comment[zh_TW]=快速設定新的顯示
 
 Icon=preferences-desktop-display-randr
 Type=Service
diff -Nru kscreen-5.2.1/po/bs/kcm_displayconfiguration.po kscreen-5.2.2/po/bs/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/bs/kcm_displayconfiguration.po	1970-01-01 00:00:00.000000000 +0000
+++ kscreen-5.2.2/po/bs/kcm_displayconfiguration.po	2015-03-19 11:52:40.000000000 +0000
@@ -0,0 +1,190 @@
+# Bosnian translations for kde package.
+# Copyright (C) 2012 This_file_is_part_of_KDE
+# This file is distributed under the same license as the kde package.
+# Samir Ribic <megaribi@epn.ba>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kde 49i410\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
+"PO-Revision-Date: 2015-01-23 14:43+0100\n"
+"Last-Translator: Samir Ribic <samir.ribic@etf.unsa.ba>\n"
+"Language-Team: Bosnian\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-02-15 06:25+0000\n"
+
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Samir Ribić,Memsud Dedović,Fadil Ademovic"
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""
+"Samir.ribic@etf.unsa.ba,dedovic.memsud94@hotmail.com,fademovic2@etf.unsa.ba"
+
+#: qml/main.qml:82
+msgid "Tip: Hold Ctrl while dragging a display to disable snapping"
+msgstr "Savjet: Držite CTRL dok povlačite zaslon da bi iskljucili slikanje"
+
+#: qml/main.qml:90
+msgid "Warning: There are no active outputs!"
+msgstr "Upozoronje: Nema aktivnih izlaza"
+
+#: qml/main.qml:99
+msgid "Your system only supports up to %1 active screens"
+msgstr "Vaš sistem podržava samo do %1 aktivnih ekrana"
+
+#: qml/main.qml:119
+msgid "Identify outputs"
+msgstr "Indetificirajte izlaze"
+
+#: qml/Output.qml:211 src/unifiedoutputconfig.cpp:83
+msgid "Unified Outputs"
+msgstr "Ujedinjeni izlazi"
+
+#: qml/Output.qml:213 src/utils.cpp:37
+msgid "Laptop Screen"
+msgstr "Ekran laptopa"
+
+#: src/kcm_kscreen.cpp:57
+msgid "Display Configuration"
+msgstr "Konfiguracija ekrana"
+
+#: src/kcm_kscreen.cpp:58
+msgid "Configuration for displays"
+msgstr "Konfiguracija za prikaz"
+
+#: src/kcm_kscreen.cpp:59
+msgid "(c), 2012-2013 Daniel Vrátil"
+msgstr "(c), 2012-2013 Daniel Vrátil"
+
+#: src/kcm_kscreen.cpp:61
+msgid "Daniel Vrátil"
+msgstr "Daniel Vrátil"
+
+#: src/kcm_kscreen.cpp:61
+msgid "Maintainer"
+msgstr "Održava"
+
+#: src/kcm_kscreen.cpp:76
+msgid "No kscreen backend found. Please check your kscreen installation."
+msgstr ""
+"Nije pronađen pozadinski softver za ksccreen. Molimo provjerite kscreen "
+"instalaciju."
+
+#: src/kcm_kscreen.cpp:122
+msgid "Are you sure you want to disable all outputs?"
+msgstr "Da li ste sigurni da zelite iskljuciti sve izlaze?"
+
+#: src/kcm_kscreen.cpp:123
+msgid "Disable all outputs?"
+msgstr "Isključiti sve izlaze?"
+
+#: src/kcm_kscreen.cpp:124
+msgid "&Disable All Outputs"
+msgstr "&Isključi sve izlaze"
+
+#: src/kcm_kscreen.cpp:125
+msgid "&Reconfigure"
+msgstr "&Rekonfiguracija"
+
+#: src/kcm_kscreen.cpp:134
+msgid ""
+"Sorry, your configuration could not be applied.\n"
+"\n"
+"Common reasons are that the overall screen size is too big, or you enabled "
+"more displays than supported by your GPU."
+msgstr ""
+"Nažalost, vaša konfiguracija se ne može primijeniti.\n"
+"\n"
+"Najčešći razlog je da je prosječna veličina ekrana prevelika ili da ste "
+"uključili više ekrana nego što podržava vaš grafički procesor."
+
+#: src/kcm_kscreen.cpp:136
+msgid "Unsupported configuration"
+msgstr "Nepodržana konfiguracija"
+
+#: src/kcm_testapp.cpp:34
+msgid "KCM Test App"
+msgstr "KCM Test App"
+
+#: src/outputconfig.cpp:98
+msgid "Enabled"
+msgstr "Omogućeno"
+
+#: src/outputconfig.cpp:106
+msgid "Display:"
+msgstr "Prikaz:"
+
+#: src/outputconfig.cpp:111 src/unifiedoutputconfig.cpp:93
+msgid "Resolution:"
+msgstr "Rezolucija:"
+
+#: src/outputconfig.cpp:114 src/unifiedoutputconfig.cpp:100
+msgid "Normal"
+msgstr "Normalno"
+
+#: src/outputconfig.cpp:115 src/unifiedoutputconfig.cpp:101
+msgid "90° clockwise"
+msgstr "90° u smjeru kazaljke"
+
+#: src/outputconfig.cpp:116 src/unifiedoutputconfig.cpp:102
+msgid "Upside down"
+msgstr "Naopako"
+
+#: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:103
+msgid "90° counterclockwise"
+msgstr "90° suprotno od kazaljke"
+
+#: src/outputconfig.cpp:122 src/unifiedoutputconfig.cpp:104
+msgid "Orientation:"
+msgstr "Orjentacija:"
+
+#: src/outputconfig.cpp:126
+msgid "Advanced Settings"
+msgstr "Napredne postavke"
+
+#: src/outputconfig.cpp:141
+msgid "Auto"
+msgstr "Automatski"
+
+#: src/outputconfig.cpp:142
+msgid "Refresh Rate:"
+msgstr "stopa osvježenja:"
+
+#: src/resolutionslider.cpp:83
+msgid "No available resolutions"
+msgstr "Nema dostupne rezolucije"
+
+#: src/widget.cpp:86
+msgid "No primary screen"
+msgstr "Nema primarnog ekrana"
+
+#: src/widget.cpp:90
+msgid "Primary display:"
+msgstr "Primarni prikaz:"
+
+#: src/widget.cpp:103
+msgid "Active profile"
+msgstr "Aktivni profil"
+
+#: src/widget.cpp:112
+msgid "Unify outputs"
+msgstr "Ujednači izlaze"
+
+#: src/widget.cpp:217
+msgid "No primary output"
+msgstr "Nema primarnog izlaza"
+
+#: src/widget.cpp:325
+msgid "Unify Outputs"
+msgstr "Ujednači izlaze"
+
+#: src/widget.cpp:365
+msgid "Break unified outputs"
+msgstr "Prekini ujedinjene izlaze"
\ No newline at end of file
diff -Nru kscreen-5.2.1/po/bs/kscreen.po kscreen-5.2.2/po/bs/kscreen.po
--- kscreen-5.2.1/po/bs/kscreen.po	1970-01-01 00:00:00.000000000 +0000
+++ kscreen-5.2.2/po/bs/kscreen.po	2015-03-19 11:52:40.000000000 +0000
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kscreenN\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-01-13 12:16+0000\n"
+"PO-Revision-Date: 2013-10-19 10:53+0000\n"
+"Last-Translator: Samir Ribić <Unknown>\n"
+"Language-Team: bosanski <bs@li.org>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-20 05:03+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
+
+#: daemon.cpp:90
+msgid "Switch Display"
+msgstr "Prebaci ekran"
\ No newline at end of file
diff -Nru kscreen-5.2.1/po/bs/plasma_applet_org.kde.plasma.kscreen.po kscreen-5.2.2/po/bs/plasma_applet_org.kde.plasma.kscreen.po
--- kscreen-5.2.1/po/bs/plasma_applet_org.kde.plasma.kscreen.po	1970-01-01 00:00:00.000000000 +0000
+++ kscreen-5.2.2/po/bs/plasma_applet_org.kde.plasma.kscreen.po	2015-03-19 11:52:40.000000000 +0000
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: plasma\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-01-13 12:16+0000\n"
+"PO-Revision-Date: 2015-02-22 23:30+0100\n"
+"Last-Translator: Samir Ribić <megaribi@epn.ba>\n"
+"Language-Team: bosanski <bs@li.org>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-02-05 07:15+0000\n"
+"X-Generator: Launchpad (build 17331)\n"
+
+#: kscreenapplet.cpp:82
+msgid "Failed to connect to KScreen daemon"
+msgstr "Neuspjelo povezivanje na KScreen demon"
+
+#: kscreenapplet.cpp:96
+msgid "Failed to load root object"
+msgstr "Neuspjelo učitavanje korijenskog objekta"
+
+#: package/contents/ui/main.qml:47
+#, kde-format
+msgctxt "%1 is name of the newly connected display"
+msgid "A new display %1 has been detected"
+msgstr "Novi ekran %1 je bio prepoznat"
+
+#: package/contents/ui/main.qml:91
+msgctxt "Places the newly connected screen right of the existing one"
+msgid "Extend to Right"
+msgstr "Proširi desno"
+
+#: package/contents/ui/main.qml:101
+msgctxt "Places the newly connected screen left of the existing one"
+msgid "Extend to Left"
+msgstr "Proširi lijevo"
+
+#: package/contents/ui/main.qml:111
+msgctxt "Makes the newly conencted screen a clone of the primary one"
+msgid "Clone Primary Output"
+msgstr "Kloniraj primarni izlaz"
+
+#: package/contents/ui/main.qml:121
+msgctxt "Disables the newly connected screen"
+msgid "Disable"
+msgstr "Isključi"
+
+#: package/contents/ui/main.qml:131
+msgid "No Action"
+msgstr "Bez radnje"
+
+#: package/contents/ui/main.qml:141
+msgctxt "Opens KScreen KCM"
+msgid "Advanced Configuration"
+msgstr "Napredna konfiguracija"
\ No newline at end of file
diff -Nru kscreen-5.2.1/po/ca/kcm_displayconfiguration.po kscreen-5.2.2/po/ca/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/ca/kcm_displayconfiguration.po	2015-02-21 20:14:27.000000000 +0000
+++ kscreen-5.2.2/po/ca/kcm_displayconfiguration.po	2015-03-19 11:52:40.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-07-29 16:08+0200\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -79,23 +79,23 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "No s'ha trobat el dorsal kscreen, comproveu la vostra instal·lació."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Esteu segur que voleu desactivar totes les sortides?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Desactivo totes les sortides?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Desactiva totes les sortides"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Reconfigura"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -107,7 +107,7 @@
 "El motiu més normal és que la mida de la pantalla és massa gran, o que heu "
 "activat més pantalles que les que permet la GPU."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Configuració no permesa"
 
diff -Nru kscreen-5.2.1/po/cs/kcm_displayconfiguration.po kscreen-5.2.2/po/cs/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/cs/kcm_displayconfiguration.po	2015-02-21 20:14:28.000000000 +0000
+++ kscreen-5.2.2/po/cs/kcm_displayconfiguration.po	2015-03-19 11:52:41.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-08-27 19:11+0200\n"
 "Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -77,23 +77,23 @@
 msgstr ""
 "Nenalezen žádný kscreen modul. Prosím zkontrolujte svou instalaci kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Opravdu si přejete zakázat všechny výstupy?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Zakázat všechny výstupy?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Zakázat všechny výstupy"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "Z&novu nastavit"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -105,7 +105,7 @@
 "Obvyklé důvody jsou, že celková velikost obrazovky je příliš velká nebo jste "
 "povolili více obrazovek, než vaše grafická karta podporuje."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Nepodporované nastavení"
 
diff -Nru kscreen-5.2.1/po/de/kcm_displayconfiguration.po kscreen-5.2.2/po/de/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/de/kcm_displayconfiguration.po	2015-02-21 20:14:57.000000000 +0000
+++ kscreen-5.2.2/po/de/kcm_displayconfiguration.po	2015-03-19 11:52:44.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-13 19:45+0100\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -77,23 +77,23 @@
 "Es wurde kein KScreen-Backend gefunden. Bitte überprüfen Sie Ihre KScreen-"
 "Installation."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Möchten Sie alle Ausgaben wirklich deaktivieren?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Alle Ausgaben deaktivieren?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "Alle Aus&gaben deaktivieren"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "Neu ein&richten"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -105,7 +105,7 @@
 "Häufige Gründe dafür sind die zu hohe gesamte Größe des Bildschirms oder Sie "
 "haben mehr Anzeigen aktiviert, als Ihre GPU unterstützt,"
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Einrichtung wird nicht unterstützt"
 
diff -Nru kscreen-5.2.1/po/en_GB/kcm_displayconfiguration.po kscreen-5.2.2/po/en_GB/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/en_GB/kcm_displayconfiguration.po	2015-02-21 20:14:53.000000000 +0000
+++ kscreen-5.2.2/po/en_GB/kcm_displayconfiguration.po	2015-03-19 11:52:45.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-18 15:25+0000\n"
 "Last-Translator: \n"
 "Language-Team: British English <kde-l10n-en_gb@kde.org>\n"
@@ -73,23 +73,23 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "No kscreen backend found. Please check your kscreen installation."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Are you sure you want to disable all outputs?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Disable all outputs?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Disable All Outputs"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Reconfigure"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -101,7 +101,7 @@
 "Common reasons are that the overall screen size is too big, or you enabled "
 "more displays than supported by your GPU."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Unsupported configuration"
 
diff -Nru kscreen-5.2.1/po/es/kcm_displayconfiguration.po kscreen-5.2.2/po/es/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/es/kcm_displayconfiguration.po	2015-02-21 20:14:37.000000000 +0000
+++ kscreen-5.2.2/po/es/kcm_displayconfiguration.po	2015-03-19 11:52:47.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-02-03 11:23+0100\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
@@ -79,23 +79,23 @@
 "No se ha encontrado ningún motor de kscreen. Por favor, compruebe la "
 "instalación de kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "¿Seguro que desea desactivar todas las salidas?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "¿Desactivar todas las salidas?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Desactivar todas las salidas"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "Volve&r a configurar"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -107,7 +107,7 @@
 "Las causas más comunes son que el tamaño total de la pantalla es demasiado "
 "grande o que ha activado más pantallas de las que permite su GPU."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Configuración no permitida"
 
diff -Nru kscreen-5.2.1/po/fi/kcm_displayconfiguration.po kscreen-5.2.2/po/fi/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/fi/kcm_displayconfiguration.po	2015-02-21 20:14:54.000000000 +0000
+++ kscreen-5.2.2/po/fi/kcm_displayconfiguration.po	2015-03-19 11:52:54.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-07-30 22:07+0300\n"
 "Last-Translator: Lasse Liehu <lasse.liehu@gmail.com>\n"
 "Language-Team: Finnish <lokalisointi@lists.coss.fi>\n"
@@ -74,23 +74,23 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "Kscreen-taustajärjestelmää ei löydy. Tarkista kscreenin asennus."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Haluatko varmasti poistaa kaikki ulostulot käytöstä?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Poistetaanko kaikki ulostulot käytöstä?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "Poista &kaikki ulostulot käytöstä"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Muuta asetuksia"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -102,7 +102,7 @@
 "Syynä on usein, että näyttöjen yhteiskoko on liian suuri tai että otit "
 "käyttöön enemmän näyttöjä kuin mitä näytönohjain tukee."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Tukemattomat asetukset"
 
diff -Nru kscreen-5.2.1/po/fr/kcm_displayconfiguration.po kscreen-5.2.2/po/fr/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/fr/kcm_displayconfiguration.po	2015-02-21 20:14:54.000000000 +0000
+++ kscreen-5.2.2/po/fr/kcm_displayconfiguration.po	2015-03-19 11:52:55.000000000 +0000
@@ -3,13 +3,13 @@
 # Joëlle Cornavin <jcorn@free.fr>, 2013.
 # xavier <xavier.besnard@neuf.fr>, 2013.
 # Vincent PINON <vincent.pinon@laposte.net>, 2014.
-# Maxime Corteel <mcorteel@gmail.com>, 2014.
+# Maxime Corteel <mcorteel@gmail.com>, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-08-17 15:20+0200\n"
 "Last-Translator: Maxime Corteel <mcorteel@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -83,23 +83,23 @@
 "Aucun moteur trouvé pour kscreen. Merci de vérifier votre installation de "
 "kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Voulez-vous vraiment désactiver toutes les sorties ?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Désactiver toutes les sorties ?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Désactiver toutes les sorties"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Reconfigurer"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -112,7 +112,7 @@
 "grande, ou que vous avez activé plus d'écrans que ce que votre carte "
 "graphique peut prendre en charge."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Configuration non prise en charge"
 
diff -Nru kscreen-5.2.1/po/it/kcm_displayconfiguration.po kscreen-5.2.2/po/it/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/it/kcm_displayconfiguration.po	2015-02-21 20:15:09.000000000 +0000
+++ kscreen-5.2.2/po/it/kcm_displayconfiguration.po	2015-03-19 11:53:01.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-08-02 15:01+0200\n"
 "Last-Translator: Vincenzo Reale <smart2128@baslug.org>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -75,23 +75,23 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "Nessun motore di kscreen trovato. Verifica l'installazione di kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Sei sicuro di voler disabilitare tutte le uscite?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Disabilitare tutte le uscite?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Disabilita tutte le uscite"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Riconfigura"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -103,7 +103,7 @@
 "Tra le cause comuni c'è la dimensione complessiva dello schermo troppo "
 "grande, o hai abilitato più schermi di quanti ne supporti la GPU."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Configurazione non supportata"
 
diff -Nru kscreen-5.2.1/po/ja/kcm_displayconfiguration.po kscreen-5.2.2/po/ja/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/ja/kcm_displayconfiguration.po	1970-01-01 00:00:00.000000000 +0000
+++ kscreen-5.2.2/po/ja/kcm_displayconfiguration.po	2015-03-19 11:53:01.000000000 +0000
@@ -0,0 +1,179 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: kcm_displayconfiguration\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
+"PO-Revision-Date: 2013-01-06 14:35-0800\n"
+"Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
+"Language-Team: Japanese <kde-jp@kde.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""
+
+#: qml/main.qml:82
+msgid "Tip: Hold Ctrl while dragging a display to disable snapping"
+msgstr ""
+
+#: qml/main.qml:90
+msgid "Warning: There are no active outputs!"
+msgstr ""
+
+#: qml/main.qml:99
+msgid "Your system only supports up to %1 active screens"
+msgstr ""
+
+#: qml/main.qml:119
+msgid "Identify outputs"
+msgstr ""
+
+#: qml/Output.qml:211 src/unifiedoutputconfig.cpp:83
+msgid "Unified Outputs"
+msgstr ""
+
+#: qml/Output.qml:213 src/utils.cpp:37
+msgid "Laptop Screen"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:57
+msgid "Display Configuration"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:58
+msgid "Configuration for displays"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:59
+msgid "(c), 2012-2013 Daniel Vrátil"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:61
+msgid "Daniel Vrátil"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:61
+msgid "Maintainer"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:76
+msgid "No kscreen backend found. Please check your kscreen installation."
+msgstr ""
+
+#: src/kcm_kscreen.cpp:122
+msgid "Are you sure you want to disable all outputs?"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:123
+msgid "Disable all outputs?"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:124
+msgid "&Disable All Outputs"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:125
+msgid "&Reconfigure"
+msgstr ""
+
+#: src/kcm_kscreen.cpp:134
+msgid ""
+"Sorry, your configuration could not be applied.\n"
+"\n"
+"Common reasons are that the overall screen size is too big, or you enabled "
+"more displays than supported by your GPU."
+msgstr ""
+
+#: src/kcm_kscreen.cpp:136
+msgid "Unsupported configuration"
+msgstr ""
+
+#: src/kcm_testapp.cpp:34
+msgid "KCM Test App"
+msgstr ""
+
+#: src/outputconfig.cpp:98
+msgid "Enabled"
+msgstr ""
+
+#: src/outputconfig.cpp:106
+msgid "Display:"
+msgstr ""
+
+#: src/outputconfig.cpp:111 src/unifiedoutputconfig.cpp:93
+msgid "Resolution:"
+msgstr ""
+
+#: src/outputconfig.cpp:114 src/unifiedoutputconfig.cpp:100
+msgid "Normal"
+msgstr ""
+
+#: src/outputconfig.cpp:115 src/unifiedoutputconfig.cpp:101
+msgid "90° clockwise"
+msgstr ""
+
+#: src/outputconfig.cpp:116 src/unifiedoutputconfig.cpp:102
+msgid "Upside down"
+msgstr ""
+
+#: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:103
+msgid "90° counterclockwise"
+msgstr ""
+
+#: src/outputconfig.cpp:122 src/unifiedoutputconfig.cpp:104
+msgid "Orientation:"
+msgstr ""
+
+#: src/outputconfig.cpp:126
+msgid "Advanced Settings"
+msgstr ""
+
+#: src/outputconfig.cpp:141
+msgid "Auto"
+msgstr ""
+
+#: src/outputconfig.cpp:142
+msgid "Refresh Rate:"
+msgstr ""
+
+#: src/resolutionslider.cpp:83
+msgid "No available resolutions"
+msgstr ""
+
+#: src/widget.cpp:86
+msgid "No primary screen"
+msgstr ""
+
+#: src/widget.cpp:90
+msgid "Primary display:"
+msgstr ""
+
+#: src/widget.cpp:103
+msgid "Active profile"
+msgstr ""
+
+#: src/widget.cpp:112
+msgid "Unify outputs"
+msgstr ""
+
+#: src/widget.cpp:217
+msgid "No primary output"
+msgstr ""
+
+#: src/widget.cpp:325
+msgid "Unify Outputs"
+msgstr ""
+
+#: src/widget.cpp:365
+msgid "Break unified outputs"
+msgstr ""
\ No newline at end of file
diff -Nru kscreen-5.2.1/po/ja/kscreen.po kscreen-5.2.2/po/ja/kscreen.po
--- kscreen-5.2.1/po/ja/kscreen.po	1970-01-01 00:00:00.000000000 +0000
+++ kscreen-5.2.2/po/ja/kscreen.po	2015-03-19 11:53:01.000000000 +0000
@@ -0,0 +1,19 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: kscreen\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-01-13 12:16+0000\n"
+"PO-Revision-Date: 2013-01-06 14:35-0800\n"
+"Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
+"Language-Team: Japanese <kde-jp@kde.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: daemon.cpp:90
+msgid "Switch Display"
+msgstr ""
\ No newline at end of file
diff -Nru kscreen-5.2.1/po/ja/plasma_applet_org.kde.plasma.kscreen.po kscreen-5.2.2/po/ja/plasma_applet_org.kde.plasma.kscreen.po
--- kscreen-5.2.1/po/ja/plasma_applet_org.kde.plasma.kscreen.po	1970-01-01 00:00:00.000000000 +0000
+++ kscreen-5.2.2/po/ja/plasma_applet_org.kde.plasma.kscreen.po	2015-03-19 11:53:01.000000000 +0000
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: plasma_applet_org.kde.plasma.kscreen\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-01-13 12:16+0000\n"
+"PO-Revision-Date: 2013-04-09 02:51-0700\n"
+"Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
+"Language-Team: Japanese <kde-jp@kde.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: kscreenapplet.cpp:82
+msgid "Failed to connect to KScreen daemon"
+msgstr ""
+
+#: kscreenapplet.cpp:96
+msgid "Failed to load root object"
+msgstr ""
+
+#: package/contents/ui/main.qml:47
+#, kde-format
+msgctxt "%1 is name of the newly connected display"
+msgid "A new display %1 has been detected"
+msgstr ""
+
+#: package/contents/ui/main.qml:91
+msgctxt "Places the newly connected screen right of the existing one"
+msgid "Extend to Right"
+msgstr ""
+
+#: package/contents/ui/main.qml:101
+msgctxt "Places the newly connected screen left of the existing one"
+msgid "Extend to Left"
+msgstr ""
+
+#: package/contents/ui/main.qml:111
+msgctxt "Makes the newly conencted screen a clone of the primary one"
+msgid "Clone Primary Output"
+msgstr ""
+
+#: package/contents/ui/main.qml:121
+msgctxt "Disables the newly connected screen"
+msgid "Disable"
+msgstr ""
+
+#: package/contents/ui/main.qml:131
+msgid "No Action"
+msgstr ""
+
+#: package/contents/ui/main.qml:141
+msgctxt "Opens KScreen KCM"
+msgid "Advanced Configuration"
+msgstr ""
\ No newline at end of file
diff -Nru kscreen-5.2.1/po/nb/kcm_displayconfiguration.po kscreen-5.2.2/po/nb/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/nb/kcm_displayconfiguration.po	2015-02-21 20:16:28.000000000 +0000
+++ kscreen-5.2.2/po/nb/kcm_displayconfiguration.po	2015-03-19 11:53:10.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-01-14 09:32+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-03-15 14:44+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -43,11 +43,11 @@
 msgid "Identify outputs"
 msgstr "Identifiser utganger"
 
-#: qml/Output.qml:207 src/unifiedoutputconfig.cpp:83
+#: qml/Output.qml:211 src/unifiedoutputconfig.cpp:83
 msgid "Unified Outputs"
 msgstr ""
 
-#: qml/Output.qml:209 src/utils.cpp:37
+#: qml/Output.qml:213 src/utils.cpp:37
 msgid "Laptop Screen"
 msgstr ""
 
@@ -71,27 +71,27 @@
 msgid "Maintainer"
 msgstr "Vedlikeholder"
 
-#: src/kcm_kscreen.cpp:74
+#: src/kcm_kscreen.cpp:76
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr ""
 
-#: src/kcm_kscreen.cpp:118
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Er du sikker på at du vil slå av alle utganger?"
 
-#: src/kcm_kscreen.cpp:119
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Slå av alle utganger?"
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Slå av alle utganger"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Sett opp på nytt"
 
-#: src/kcm_kscreen.cpp:130
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -103,7 +103,7 @@
 "Vanlige feil er at skjermstørrelsen er satt for stor, eller du slo på flere "
 "skjermer enn det GPU-en støtter."
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Ikke støttet oppsett"
 
@@ -123,66 +123,66 @@
 msgid "Resolution:"
 msgstr "Oppløsning:"
 
-#: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:100
+#: src/outputconfig.cpp:114 src/unifiedoutputconfig.cpp:100
 msgid "Normal"
 msgstr ""
 
-#: src/outputconfig.cpp:118 src/unifiedoutputconfig.cpp:101
+#: src/outputconfig.cpp:115 src/unifiedoutputconfig.cpp:101
 msgid "90° clockwise"
 msgstr ""
 
-#: src/outputconfig.cpp:119 src/unifiedoutputconfig.cpp:102
+#: src/outputconfig.cpp:116 src/unifiedoutputconfig.cpp:102
 msgid "Upside down"
 msgstr ""
 
-#: src/outputconfig.cpp:120 src/unifiedoutputconfig.cpp:103
+#: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:103
 msgid "90° counterclockwise"
 msgstr ""
 
-#: src/outputconfig.cpp:121 src/unifiedoutputconfig.cpp:104
+#: src/outputconfig.cpp:122 src/unifiedoutputconfig.cpp:104
 msgid "Orientation:"
 msgstr "Retning:"
 
-#: src/outputconfig.cpp:125
+#: src/outputconfig.cpp:126
 msgid "Advanced Settings"
 msgstr "Avanserte innstillinger"
 
-#: src/outputconfig.cpp:140
+#: src/outputconfig.cpp:141
 msgid "Auto"
 msgstr "Auto"
 
-#: src/outputconfig.cpp:141
+#: src/outputconfig.cpp:142
 msgid "Refresh Rate:"
 msgstr ""
 
-#: src/resolutionslider.cpp:82
+#: src/resolutionslider.cpp:83
 msgid "No available resolutions"
 msgstr ""
 
-#: src/widget.cpp:85
+#: src/widget.cpp:86
 msgid "No primary screen"
 msgstr ""
 
-#: src/widget.cpp:89
+#: src/widget.cpp:90
 msgid "Primary display:"
 msgstr ""
 
-#: src/widget.cpp:102
+#: src/widget.cpp:103
 msgid "Active profile"
 msgstr ""
 
-#: src/widget.cpp:111
+#: src/widget.cpp:112
 msgid "Unify outputs"
 msgstr ""
 
-#: src/widget.cpp:216
+#: src/widget.cpp:217
 msgid "No primary output"
 msgstr ""
 
-#: src/widget.cpp:324
+#: src/widget.cpp:325
 msgid "Unify Outputs"
 msgstr ""
 
-#: src/widget.cpp:364
+#: src/widget.cpp:365
 msgid "Break unified outputs"
 msgstr ""
\ No newline at end of file
diff -Nru kscreen-5.2.1/po/nl/kcm_displayconfiguration.po kscreen-5.2.2/po/nl/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/nl/kcm_displayconfiguration.po	2015-02-21 20:16:29.000000000 +0000
+++ kscreen-5.2.2/po/nl/kcm_displayconfiguration.po	2015-03-19 11:53:12.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-07-29 11:12+0200\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -76,23 +76,23 @@
 msgstr ""
 "Geen backend van kscreen gevonden. Controleer de installatie van kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Wilt u alle uitvoer uitschakelen?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Alle uitvoer uitschakelen?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "Alle uitvoer &uitschakelen"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Opnieuw instellen"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -104,7 +104,7 @@
 "Algemene redenen zijn dat de gehele schermgrootte te groot is of u hebt meer "
 "schermen ingeschakeld dan uw GPU ondersteunt."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Niet ondersteunde instelling"
 
diff -Nru kscreen-5.2.1/po/pl/kcm_displayconfiguration.po kscreen-5.2.2/po/pl/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/pl/kcm_displayconfiguration.po	2015-02-21 20:16:43.000000000 +0000
+++ kscreen-5.2.2/po/pl/kcm_displayconfiguration.po	2015-03-19 11:53:15.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-10 09:47+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -76,23 +76,23 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "Nie znaleziono silnika kscreen. Sprawdź swoją instalację kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Czy na pewno wyłączyć wszystkie wyjścia?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Czy wyłączyć wszystkie wyjścia?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Wyłączyć wszystkie wyjścia"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "Usta&w ponownie"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -105,7 +105,7 @@
 "lub włączono więcej wyświetlaczy niż jest obsługiwane przez "
 "twoja kartę graficzną."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Nieobsługiwane ustawienia"
 
diff -Nru kscreen-5.2.1/po/pt/kcm_displayconfiguration.po kscreen-5.2.2/po/pt/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/pt/kcm_displayconfiguration.po	2015-02-21 20:17:10.000000000 +0000
+++ kscreen-5.2.2/po/pt/kcm_displayconfiguration.po	2015-03-19 11:53:15.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-07-29 09:39+0100\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
@@ -74,23 +74,23 @@
 "Não foi encontrada nenhuma infra-estrutura do kscreen. Verifique por favor a "
 "sua instalação do kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Tem a certeza que deseja desactivar todas as saídas?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Desactivar todas as saídas?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Desactivar Todas as Saídas"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Reconfigurar"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -102,7 +102,7 @@
 "As razões mais comuns são que o tamanho global do ecrã é demasiado grande, "
 "ou então que activou mais ecrãs que os suportados pelo seu GPU."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Configuração não suportada"
 
diff -Nru kscreen-5.2.1/po/pt_BR/kcm_displayconfiguration.po kscreen-5.2.2/po/pt_BR/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/pt_BR/kcm_displayconfiguration.po	2015-02-21 20:16:46.000000000 +0000
+++ kscreen-5.2.2/po/pt_BR/kcm_displayconfiguration.po	2015-03-19 11:53:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-09 08:01-0200\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -78,23 +78,23 @@
 "Nenhuma infraestrutura do kscreen encontrada. Verifique a instalação do "
 "kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Deseja realmente desativar todas as saídas?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Desativar todas as saídas?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Desativar todas as saídas"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Reconfigurar"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -106,7 +106,7 @@
 "As razões mais comuns são que o tamanho global da tela é muito grande ou "
 "você ativou mais monitores que os suportados pela sua GPU."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Configuração não suportada"
 
diff -Nru kscreen-5.2.1/po/sk/kcm_displayconfiguration.po kscreen-5.2.2/po/sk/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/sk/kcm_displayconfiguration.po	2015-02-21 20:17:38.000000000 +0000
+++ kscreen-5.2.2/po/sk/kcm_displayconfiguration.po	2015-03-19 11:53:19.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-09 20:21+0100\n"
 "Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
 "Language-Team: Slovak <kde-sk@linux.sk>\n"
@@ -73,23 +73,23 @@
 "Nenašiel sa žiadny backend kscreen. Prosím, skontrolujte vašu inštaláciu "
 "kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Určite chcete zakázať všetky výstupy?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Zakázať všetky výstupy?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "Zakázať všetky výstupy"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "Znovu nastaviť"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -101,7 +101,7 @@
 "Bežné dôvody môžu byť napríklad také, že veľkosť obrazovky je príliš veľká "
 "alebo ste povolili viac obrazoviek, ako podporuje vaše GPU."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Nepodporované nastavenie"
 
diff -Nru kscreen-5.2.1/po/sl/kcm_displayconfiguration.po kscreen-5.2.2/po/sl/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/sl/kcm_displayconfiguration.po	2015-02-21 20:17:11.000000000 +0000
+++ kscreen-5.2.2/po/sl/kcm_displayconfiguration.po	2015-03-19 11:53:19.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-18 12:22+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -74,23 +74,23 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "Ni bilo najdenega zaledja kscreen. Preverite namestitev kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Ali ste prepričani, da želite onemogočiti vse izhode?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Onemogočim vse izhode?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "Onemogoči vse izho&de"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Znova nastavi"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -102,7 +102,7 @@
 "Pogost vzrok je prevelika celokupna velikost prikaza ali pa da ste omogočili "
 "več zaslonov, kot jih podpira vaš grafični pospeševalnik."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Nepodprte nastavitve"
 
diff -Nru kscreen-5.2.1/po/sr/kcm_displayconfiguration.po kscreen-5.2.2/po/sr/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/sr/kcm_displayconfiguration.po	2015-02-21 20:17:47.000000000 +0000
+++ kscreen-5.2.2/po/sr/kcm_displayconfiguration.po	2015-03-19 11:53:20.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-17 13:25+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -75,24 +75,24 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "Није нађена ниједна позадина К‑екрана. Проверите инсталацију."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Желите ли заиста да искључите све излазе?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Искључити све излазе?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Искључи све излазе"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Подеси поново"
 
 # rewrite-msgid: /GPU/graphics card/
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -104,7 +104,7 @@
 "Уобичајени разлози су задавање превелике величине екрана, или више екрана "
 "него што графичка картица подржава."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Неподржана постава"
 
diff -Nru kscreen-5.2.1/po/sr@ijekavian/kcm_displayconfiguration.po kscreen-5.2.2/po/sr@ijekavian/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/sr@ijekavian/kcm_displayconfiguration.po	2015-02-21 20:17:52.000000000 +0000
+++ kscreen-5.2.2/po/sr@ijekavian/kcm_displayconfiguration.po	2015-03-19 11:53:21.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-17 13:25+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -75,24 +75,24 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "Није нађена ниједна позадина К‑екрана. Проверите инсталацију."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Желите ли заиста да искључите све излазе?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Искључити све излазе?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Искључи све излазе"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Подеси поново"
 
 # rewrite-msgid: /GPU/graphics card/
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -104,7 +104,7 @@
 "Уобичајени разлози су задавање превелике величине екрана, или више екрана "
 "него што графичка картица подржава."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Неподржана постава"
 
diff -Nru kscreen-5.2.1/po/sr@ijekavianlatin/kcm_displayconfiguration.po kscreen-5.2.2/po/sr@ijekavianlatin/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/sr@ijekavianlatin/kcm_displayconfiguration.po	2015-02-21 20:17:35.000000000 +0000
+++ kscreen-5.2.2/po/sr@ijekavianlatin/kcm_displayconfiguration.po	2015-03-19 11:53:22.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-17 13:25+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -75,24 +75,24 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "Nije nađena nijedna pozadina K‑ekrana. Proverite instalaciju."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Želite li zaista da isključite sve izlaze?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Isključiti sve izlaze?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Isključi sve izlaze"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Podesi ponovo"
 
 # rewrite-msgid: /GPU/graphics card/
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -104,7 +104,7 @@
 "Uobičajeni razlozi su zadavanje prevelike veličine ekrana, ili više ekrana "
 "nego što grafička kartica podržava."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Nepodržana postava"
 
diff -Nru kscreen-5.2.1/po/sr@latin/kcm_displayconfiguration.po kscreen-5.2.2/po/sr@latin/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/sr@latin/kcm_displayconfiguration.po	2015-02-21 20:17:53.000000000 +0000
+++ kscreen-5.2.2/po/sr@latin/kcm_displayconfiguration.po	2015-03-19 11:53:23.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-17 13:25+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -75,24 +75,24 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "Nije nađena nijedna pozadina K‑ekrana. Proverite instalaciju."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Želite li zaista da isključite sve izlaze?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Isključiti sve izlaze?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Isključi sve izlaze"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Podesi ponovo"
 
 # rewrite-msgid: /GPU/graphics card/
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -104,7 +104,7 @@
 "Uobičajeni razlozi su zadavanje prevelike veličine ekrana, ili više ekrana "
 "nego što grafička kartica podržava."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Nepodržana postava"
 
diff -Nru kscreen-5.2.1/po/sv/kcm_displayconfiguration.po kscreen-5.2.2/po/sv/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/sv/kcm_displayconfiguration.po	2015-02-21 20:17:58.000000000 +0000
+++ kscreen-5.2.2/po/sv/kcm_displayconfiguration.po	2015-03-19 11:53:23.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-07-29 07:11+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
@@ -76,23 +76,23 @@
 msgstr ""
 "Inget kscreen-gränssnitt hittades. Kontrollera installationen av kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Är du säker på att du vill inaktivera alla utgångar?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Inaktivera alla utgångar?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "&Inaktivera alla utgångar"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Konfigurera om"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -104,7 +104,7 @@
 "Vanliga orsaker är att den totala skärmstorleken är för stor, eller att fler "
 "bildskärmar än grafikprocessorn stöder försökte aktiveras."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Konfigurationen stöds inte"
 
diff -Nru kscreen-5.2.1/po/uk/kcm_displayconfiguration.po kscreen-5.2.2/po/uk/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/uk/kcm_displayconfiguration.po	2015-02-21 20:18:04.000000000 +0000
+++ kscreen-5.2.2/po/uk/kcm_displayconfiguration.po	2015-03-19 11:53:28.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: kcm_displayconfiguration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2014-07-29 12:16+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -80,23 +80,23 @@
 "Не знайдено жодного модуля kscreen. Будь ласка, перевірте, чи належним чином "
 "встановлено kscreen."
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "Ви справді хочете вимкнути всі канали виведення даних?"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "Вимкнути всі канали виведення даних?"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "Ви&мкнути всі канали виведення даних"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "&Переналаштувати"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -109,7 +109,7 @@
 "екрана або увімкнено більше дисплеїв, ніж передбачено встановленим графічним "
 "процесором."
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "Непідтримувані налаштування"
 
diff -Nru kscreen-5.2.1/po/zh_CN/kcm_displayconfiguration.po kscreen-5.2.2/po/zh_CN/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/zh_CN/kcm_displayconfiguration.po	2015-02-21 20:18:20.000000000 +0000
+++ kscreen-5.2.2/po/zh_CN/kcm_displayconfiguration.po	2015-03-19 11:53:32.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2015-02-06 10:10+0000\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
 "PO-Revision-Date: 2015-01-14 21:13-0800\n"
 "Last-Translator: Weng Xuetian <wengxt@gmail.com>\n"
 "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n"
@@ -73,23 +73,23 @@
 msgid "No kscreen backend found. Please check your kscreen installation."
 msgstr "未找到 kscreen 后端。请检查您的 kscreen 安装。"
 
-#: src/kcm_kscreen.cpp:120
+#: src/kcm_kscreen.cpp:122
 msgid "Are you sure you want to disable all outputs?"
 msgstr "您确定想要禁用所有输出吗？"
 
-#: src/kcm_kscreen.cpp:121
+#: src/kcm_kscreen.cpp:123
 msgid "Disable all outputs?"
 msgstr "禁用所有输出？"
 
-#: src/kcm_kscreen.cpp:122
+#: src/kcm_kscreen.cpp:124
 msgid "&Disable All Outputs"
 msgstr "禁用所有输出(&D)"
 
-#: src/kcm_kscreen.cpp:123
+#: src/kcm_kscreen.cpp:125
 msgid "&Reconfigure"
 msgstr "重新配置(&R)"
 
-#: src/kcm_kscreen.cpp:132
+#: src/kcm_kscreen.cpp:134
 msgid ""
 "Sorry, your configuration could not be applied.\n"
 "\n"
@@ -100,7 +100,7 @@
 "\n"
 "通常的原因是整体屏幕大小太大了，或者您启用了比 GPU 支持更多的屏幕。"
 
-#: src/kcm_kscreen.cpp:134
+#: src/kcm_kscreen.cpp:136
 msgid "Unsupported configuration"
 msgstr "不支持的配置"
 
diff -Nru kscreen-5.2.1/po/zh_TW/kcm_displayconfiguration.po kscreen-5.2.2/po/zh_TW/kcm_displayconfiguration.po
--- kscreen-5.2.1/po/zh_TW/kcm_displayconfiguration.po	1970-01-01 00:00:00.000000000 +0000
+++ kscreen-5.2.2/po/zh_TW/kcm_displayconfiguration.po	2015-03-19 11:53:32.000000000 +0000
@@ -0,0 +1,185 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Franklin Weng <franklin@goodhorse.idv.tw>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-03-06 10:47+0000\n"
+"PO-Revision-Date: 2015-02-25 09:43+0800\n"
+"Last-Translator: Franklin Weng <franklin@goodhorse.idv.tw>\n"
+"Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
+
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Franklin Weng"
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "franklin@goodhorse.idv.tw"
+
+#: qml/main.qml:82
+msgid "Tip: Hold Ctrl while dragging a display to disable snapping"
+msgstr "提示：拖曳顯示時按住 Ctrl 可以關閉閃爍"
+
+#: qml/main.qml:90
+msgid "Warning: There are no active outputs!"
+msgstr "警告：沒有可用的輸出！"
+
+#: qml/main.qml:99
+msgid "Your system only supports up to %1 active screens"
+msgstr "您的系統只支援最多 %1 個作用中的螢幕"
+
+#: qml/main.qml:119
+msgid "Identify outputs"
+msgstr "識別輸出"
+
+#: qml/Output.qml:211 src/unifiedoutputconfig.cpp:83
+msgid "Unified Outputs"
+msgstr "識別輸出"
+
+#: qml/Output.qml:213 src/utils.cpp:37
+msgid "Laptop Screen"
+msgstr "筆記型電腦螢幕"
+
+#: src/kcm_kscreen.cpp:57
+msgid "Display Configuration"
+msgstr "顯示設定"
+
+#: src/kcm_kscreen.cpp:58
+msgid "Configuration for displays"
+msgstr "設定顯示"
+
+#: src/kcm_kscreen.cpp:59
+msgid "(c), 2012-2013 Daniel Vrátil"
+msgstr "(c), 2012-2013 Daniel Vrátil"
+
+#: src/kcm_kscreen.cpp:61
+msgid "Daniel Vrátil"
+msgstr "Daniel Vrátil"
+
+#: src/kcm_kscreen.cpp:61
+msgid "Maintainer"
+msgstr "維護者"
+
+#: src/kcm_kscreen.cpp:76
+msgid "No kscreen backend found. Please check your kscreen installation."
+msgstr "找不到 kscreen 後端介面。請檢查您的 kscreen 安裝。"
+
+#: src/kcm_kscreen.cpp:122
+msgid "Are you sure you want to disable all outputs?"
+msgstr "您確定要關閉所有的輸出嗎？"
+
+#: src/kcm_kscreen.cpp:123
+msgid "Disable all outputs?"
+msgstr "要關閉所有的輸出嗎？"
+
+#: src/kcm_kscreen.cpp:124
+msgid "&Disable All Outputs"
+msgstr "關閉所有輸出(&D)"
+
+#: src/kcm_kscreen.cpp:125
+msgid "&Reconfigure"
+msgstr "重新設定(&R)"
+
+#: src/kcm_kscreen.cpp:134
+msgid ""
+"Sorry, your configuration could not be applied.\n"
+"\n"
+"Common reasons are that the overall screen size is too big, or you enabled "
+"more displays than supported by your GPU."
+msgstr ""
+"抱歉，您的設定無法套用。\n"
+"\n"
+"通常的原因會是整體的螢幕大小過大，或是您開啟了過多的螢幕，您的 GPU 無法支援。"
+
+#: src/kcm_kscreen.cpp:136
+msgid "Unsupported configuration"
+msgstr "無法支援的設定"
+
+#: src/kcm_testapp.cpp:34
+msgid "KCM Test App"
+msgstr "KCM 測試程式"
+
+#: src/outputconfig.cpp:98
+msgid "Enabled"
+msgstr "已開啟"
+
+#: src/outputconfig.cpp:106
+msgid "Display:"
+msgstr "顯示："
+
+#: src/outputconfig.cpp:111 src/unifiedoutputconfig.cpp:93
+msgid "Resolution:"
+msgstr "解析度："
+
+#: src/outputconfig.cpp:114 src/unifiedoutputconfig.cpp:100
+msgid "Normal"
+msgstr "一般"
+
+#: src/outputconfig.cpp:115 src/unifiedoutputconfig.cpp:101
+msgid "90° clockwise"
+msgstr "順時針轉 90° "
+
+#: src/outputconfig.cpp:116 src/unifiedoutputconfig.cpp:102
+msgid "Upside down"
+msgstr "上下相反"
+
+#: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:103
+msgid "90° counterclockwise"
+msgstr "逆時針轉 90°"
+
+#: src/outputconfig.cpp:122 src/unifiedoutputconfig.cpp:104
+msgid "Orientation:"
+msgstr "方向："
+
+#: src/outputconfig.cpp:126
+msgid "Advanced Settings"
+msgstr "進階設定"
+
+#: src/outputconfig.cpp:141
+msgid "Auto"
+msgstr "自動"
+
+#: src/outputconfig.cpp:142
+msgid "Refresh Rate:"
+msgstr "刷新頻率："
+
+#: src/resolutionslider.cpp:83
+msgid "No available resolutions"
+msgstr "沒有可用的解析度"
+
+#: src/widget.cpp:86
+msgid "No primary screen"
+msgstr "沒有主螢幕"
+
+#: src/widget.cpp:90
+msgid "Primary display:"
+msgstr "主顯示："
+
+#: src/widget.cpp:103
+msgid "Active profile"
+msgstr "作用中的設定檔"
+
+#: src/widget.cpp:112
+msgid "Unify outputs"
+msgstr "識別輸出"
+
+#: src/widget.cpp:217
+msgid "No primary output"
+msgstr "沒有主要輸出"
+
+#: src/widget.cpp:325
+msgid "Unify Outputs"
+msgstr "識別輸出"
+
+#: src/widget.cpp:365
+msgid "Break unified outputs"
+msgstr "中斷識別輸出"
\ No newline at end of file
diff -Nru kscreen-5.2.1/po/zh_TW/kscreen.po kscreen-5.2.2/po/zh_TW/kscreen.po
--- kscreen-5.2.1/po/zh_TW/kscreen.po	1970-01-01 00:00:00.000000000 +0000
+++ kscreen-5.2.2/po/zh_TW/kscreen.po	2015-03-19 11:53:32.000000000 +0000
@@ -0,0 +1,22 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Franklin Weng <franklin@goodhorse.idv.tw>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-01-13 12:16+0000\n"
+"PO-Revision-Date: 2015-02-27 16:15+0800\n"
+"Last-Translator: Franklin Weng <franklin@goodhorse.idv.tw>\n"
+"Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: daemon.cpp:90
+msgid "Switch Display"
+msgstr "切換顯示"
\ No newline at end of file
diff -Nru kscreen-5.2.1/po/zh_TW/plasma_applet_org.kde.plasma.kscreen.po kscreen-5.2.2/po/zh_TW/plasma_applet_org.kde.plasma.kscreen.po
--- kscreen-5.2.1/po/zh_TW/plasma_applet_org.kde.plasma.kscreen.po	1970-01-01 00:00:00.000000000 +0000
+++ kscreen-5.2.2/po/zh_TW/plasma_applet_org.kde.plasma.kscreen.po	2015-03-19 11:53:32.000000000 +0000
@@ -0,0 +1,61 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Franklin Weng <franklin@goodhorse.idv.tw>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-01-13 12:16+0000\n"
+"PO-Revision-Date: 2015-02-27 20:59+0800\n"
+"Last-Translator: Franklin Weng <franklin@goodhorse.idv.tw>\n"
+"Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: kscreenapplet.cpp:82
+msgid "Failed to connect to KScreen daemon"
+msgstr "連線到 KScreen 伺服程式失敗"
+
+#: kscreenapplet.cpp:96
+msgid "Failed to load root object"
+msgstr "載入根物件失敗"
+
+#: package/contents/ui/main.qml:47
+#, kde-format
+msgctxt "%1 is name of the newly connected display"
+msgid "A new display %1 has been detected"
+msgstr "偵測到新的顯示 %1"
+
+#: package/contents/ui/main.qml:91
+msgctxt "Places the newly connected screen right of the existing one"
+msgid "Extend to Right"
+msgstr "延展到右"
+
+#: package/contents/ui/main.qml:101
+msgctxt "Places the newly connected screen left of the existing one"
+msgid "Extend to Left"
+msgstr "延展到左"
+
+#: package/contents/ui/main.qml:111
+msgctxt "Makes the newly conencted screen a clone of the primary one"
+msgid "Clone Primary Output"
+msgstr "複製主要輸出"
+
+#: package/contents/ui/main.qml:121
+msgctxt "Disables the newly connected screen"
+msgid "Disable"
+msgstr "關閉"
+
+#: package/contents/ui/main.qml:131
+msgid "No Action"
+msgstr "沒有動作"
+
+#: package/contents/ui/main.qml:141
+msgctxt "Opens KScreen KCM"
+msgid "Advanced Configuration"
+msgstr "進階設定"
\ No newline at end of file
diff -Nru kscreen-5.2.1/tests/kded/CMakeLists.txt kscreen-5.2.2/tests/kded/CMakeLists.txt
--- kscreen-5.2.1/tests/kded/CMakeLists.txt	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/tests/kded/CMakeLists.txt	2015-03-19 11:52:32.000000000 +0000
@@ -14,7 +14,7 @@
 
     qt5_add_dbus_interface(test_SRCS
         ${CMAKE_SOURCE_DIR}/kded/org.freedesktop.DBus.Properties.xml
-        upower_interface
+        freedesktop_interface
     )
 
     add_executable(${testname} ${test_SRCS})
diff -Nru kscreen-5.2.1/tests/kded/testgenerator.cpp kscreen-5.2.2/tests/kded/testgenerator.cpp
--- kscreen-5.2.1/tests/kded/testgenerator.cpp	2015-02-21 20:14:08.000000000 +0000
+++ kscreen-5.2.2/tests/kded/testgenerator.cpp	2015-03-19 11:52:32.000000000 +0000
@@ -372,7 +372,7 @@
     generator->setForceLidClosed(false);
 
     //Clone all
-    ConfigPtr config = generator->displaySwitch(1);
+    ConfigPtr config = generator->displaySwitch(Generator::Clone);
     OutputPtr laptop = config->outputs().value(1);
     OutputPtr external = config->outputs().value(2);
     QCOMPARE(laptop->currentModeId(), QLatin1String("2"));
@@ -385,7 +385,7 @@
     QCOMPARE(external->pos(), QPoint(0, 0));
 
     //Extend to left
-    config = generator->displaySwitch(2);
+    config = generator->displaySwitch(Generator::ExtendToLeft);
     laptop = config->outputs().value(1);
     external = config->outputs().value(2);
     QCOMPARE(laptop->currentModeId(), QLatin1String("3"));
@@ -398,7 +398,7 @@
     QCOMPARE(external->pos(), QPoint(0, 0));
 
     //Disable embedded,. enable external
-    config = generator->displaySwitch(3);
+    config = generator->displaySwitch(Generator::TurnOffEmbedded);
     laptop = config->outputs().value(1);
     external = config->outputs().value(2);;
     QCOMPARE(laptop->isEnabled(), false);
@@ -408,7 +408,7 @@
     QCOMPARE(external->pos(), QPoint(0, 0));
 
     //Enable embedded, disable external
-    config = generator->displaySwitch(4);
+    config = generator->displaySwitch(Generator::TurnOffExternal);
     laptop = config->outputs().value(1);
     external = config->outputs().value(2);;
     QCOMPARE(laptop->currentModeId(), QLatin1String("3"));
@@ -418,7 +418,7 @@
     QCOMPARE(external->isEnabled(), false);
 
     //Extend to right
-    config = generator->displaySwitch(5);
+    config = generator->displaySwitch(Generator::ExtendToRight);
     laptop = config->outputs().value(1);
     external = config->outputs().value(2);
     QCOMPARE(laptop->currentModeId(), QLatin1String("3"));
@@ -438,7 +438,7 @@
     Generator *generator = Generator::self();
     generator->setCurrentConfig(currentConfig);
     qDebug() << "MEH MOH";
-    ConfigPtr config = generator->displaySwitch(1);
+    ConfigPtr config = generator->displaySwitch(Generator::Clone);
     OutputPtr laptop = config->outputs().value(1);
     OutputPtr external = config->outputs().value(2);