From d4af45da2d6ea6f1bb044d05272c1b7da824d80b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 21 Apr 2015 14:57:25 +0000
Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file)

---
 effects/eyeonscreen/package/metadata.desktop    | 1 +
 effects/windowaperture/package/metadata.desktop | 1 +
 kcmkwin/kwincompositing/kcmkwineffects.desktop  | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop
index 647c0147e8..9b45e6843f 100644
--- a/effects/eyeonscreen/package/metadata.desktop
+++ b/effects/eyeonscreen/package/metadata.desktop
@@ -7,6 +7,7 @@ Name[gl]=Ollo na pantalla
 Name[nl]=eye On Screen
 Name[pt]=Olho no Ecrã
 Name[pt_BR]=Olho na tela
+Name[ro]=ochi pe ecran
 Name[sk]=oko na obrazovke
 Name[sl]=Oko na zaslonu
 Name[sv]=Ögat på skärmen
diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop
index 93066cc6ae..967f877f37 100644
--- a/effects/windowaperture/package/metadata.desktop
+++ b/effects/windowaperture/package/metadata.desktop
@@ -8,6 +8,7 @@ Name[gl]=Apertura das xanelas
 Name[nl]=Vensteropening
 Name[pt]=Aperto das Janelas
 Name[pt_BR]=Aperto das janelas
+Name[ro]=Diafragmă fereastră
 Name[sk]=Otvor okien
 Name[sl]=Zaslonka okna
 Name[sv]=Fönsteröppning
diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop
index 2c32f65884..7f06022182 100644
--- a/kcmkwin/kwincompositing/kcmkwineffects.desktop
+++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop
@@ -39,6 +39,7 @@ Name[pa]=ਡੈਸਕਟਾਪ ਪਰਭਾਵ
 Name[pl]=Efekty pulpitu
 Name[pt]=Efeitos do Ecrã
 Name[pt_BR]=Efeitos da área de trabalho
+Name[ro]=Efecte de birou
 Name[ru]=Эффекты
 Name[se]=Čállinbeavdeeffeavttat
 Name[sk]=Efekty plochy
@@ -78,6 +79,7 @@ Comment[pa]=ਡੈਸਕਟਾਪ ਪਰਭਾਵ
 Comment[pl]=Efekty pulpitu
 Comment[pt]=Efeitos do Ecrã
 Comment[pt_BR]=Efeitos da Área de Trabalho
+Comment[ro]=Efecte de birou
 Comment[ru]=Настройка эффектов рабочего стола
 Comment[sk]=Efekty plochy
 Comment[sl]=Učinki namizja

From 740be3e8d36172ea7472c2afee0ea6cd5dec9f3d Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Tue, 21 Apr 2015 23:25:37 -0700
Subject: [PATCH 2/2] make sure connect to screen changed signal after screen
 is created

REVIEW: 123461
BUG: 346453
FIXED-IN: 5.3
---
 workspace.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index 8b53169b7d..09ae9a2c11 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -148,9 +148,6 @@ Workspace::Workspace(bool restore)
     // PluginMgr needs access to the config file, so we need to wait for it for finishing
     reparseConfigFuture.waitForFinished();
 
-    // get screen support
-    connect(screens(), SIGNAL(changed()), SLOT(desktopResized()));
-
     options->loadConfig();
     options->loadCompositingConfig(false);
     ColorMapper *colormaps = new ColorMapper(this);
@@ -218,6 +215,8 @@ void Workspace::init()
     KSharedConfigPtr config = KSharedConfig::openConfig();
     kwinApp()->createScreens();
     Screens *screens = Screens::self();
+    // get screen support
+    connect(screens, SIGNAL(changed()), SLOT(desktopResized()));
     screens->setConfig(config);
     screens->reconfigure();
     connect(options, SIGNAL(configChanged()), screens, SLOT(reconfigure()));