From bec589fedc883d26a9e04954b8553362213b45e6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 3 Dec 2018 05:36:39 +0100
Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve
 ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 effects/dimscreen/package/metadata.desktop    | 2 ++
 effects/fadingpopups/package/metadata.desktop | 4 ++++
 effects/scale/package/metadata.desktop        | 1 +
 3 files changed, 7 insertions(+)

diff --git a/effects/dimscreen/package/metadata.desktop b/effects/dimscreen/package/metadata.desktop
index a8f452b74e..140a83779e 100644
--- a/effects/dimscreen/package/metadata.desktop
+++ b/effects/dimscreen/package/metadata.desktop
@@ -55,6 +55,7 @@ Comment[uk]=Притлумлює кольори усього екрана, ко
 Comment[vi]=Làm tối toàn màn hình khi yêu cầu quyền quản trị
 Comment[wa]=Fwait pus noer li waitroûle etire cwand on dmande les droets da root
 Comment[x-test]=xxDarkens the entire screen when requesting root privilegesxx
+Comment[zh_TW]=當要求 root 權限時將整個螢幕變暗
 Icon=preferences-system-windows-effect-dimscreen
 Name=Dim Screen for Administrator Mode
 Name[af]=Verdof vir Administrateurmodus
@@ -114,6 +115,7 @@ Name[uk]=Притлумлення кольорів у режимі адміні
 Name[vi]=Làm tối màn hình cho chế độ quản trị
 Name[wa]=Fé pus noere li waitroûle pol môde Manaedjeu
 Name[x-test]=xxDim Screen for Administrator Modexx
+Name[zh_TW]=為管理員模式暗化螢幕
 
 Type=Service
 X-KDE-ParentApp=
diff --git a/effects/fadingpopups/package/metadata.desktop b/effects/fadingpopups/package/metadata.desktop
index d36ca5be3f..391d3876d5 100644
--- a/effects/fadingpopups/package/metadata.desktop
+++ b/effects/fadingpopups/package/metadata.desktop
@@ -2,6 +2,7 @@
 Name=Fading Popups
 Name[ca]=Missatges emergents esvaïts
 Name[ca@valencia]=Missatges emergents esvaïts
+Name[en_GB]=Fading Popups
 Name[fi]=Hiipuvat ponnahdusikkunat
 Name[gl]=Xanelas emerxentes que esvaen
 Name[id]=Fading Popups
@@ -13,10 +14,12 @@ Name[ru]=Растворяющиеся всплывающие окна
 Name[sv]=Borttonande meddelanderutor
 Name[uk]=Інтерактивні контекстні панелі
 Name[x-test]=xxFading Popupsxx
+Name[zh_TW]=淡化彈出視窗
 Icon=preferences-system-windows-effect-fadingpopups
 Comment=Make popups smoothly fade in and out when they are shown or hidden
 Comment[ca]=Fa que els missatges emergents s'encenguin o s'apaguin de manera gradual quan es mostren o s'oculten
 Comment[ca@valencia]=Fa que els missatges emergents s'encenguin o s'apaguin de manera gradual quan es mostren o s'oculten
+Comment[en_GB]=Make popups smoothly fade in and out when they are shown or hidden
 Comment[fi]=Ponnahdusikkunat tulevat näkyviin tai poistuvat näkyvistä pehmeästi häivyttäen
 Comment[gl]=Esvae e fai opacas as xanelas emerxentes con suavidade ao mostralas ou agochadas
 Comment[id]=Buat sembulan secara halus lesap-masuk dan lesap-keluar ketika ia ditampilkan atau disembunyikan
@@ -28,6 +31,7 @@ Comment[ru]=Всплывающие окна при закрытии будут 
 Comment[sv]=Gör att meddelanderutor mjukt tonas in eller ut när de visas eller döljs
 Comment[uk]=Поступова поява або зникнення контекстних вікон вікон при відкритті чи закритті
 Comment[x-test]=xxMake popups smoothly fade in and out when they are shown or hiddenxx
+Comment[zh_TW]=當彈出視窗出現或消失時，讓彈出視窗滑順的淡入和淡出
 
 Type=Service
 X-KDE-ServiceTypes=KWin/Effect
diff --git a/effects/scale/package/metadata.desktop b/effects/scale/package/metadata.desktop
index 3c6a3802bc..d175484c98 100644
--- a/effects/scale/package/metadata.desktop
+++ b/effects/scale/package/metadata.desktop
@@ -32,6 +32,7 @@ Comment=Make windows smoothly scale in and out when they are shown or hidden
 Comment[ca]=Fa que les finestres entrin o surtin volant quan es mostren o s'oculten
 Comment[ca@valencia]=Fa que les finestres entrin o isquen volant quan es mostren o s'oculten
 Comment[de]=Ändert die Fenstergröße langsam beim Ein- oder Ausblenden
+Comment[en_GB]=Make windows smoothly scale in and out when they are shown or hidden
 Comment[fi]=Ikkunat ilmestyvät näkyviin tai poistuvat näkyvistä hiljalleen
 Comment[gl]=Facer que as xanelas crezan ou decrezan suavemente cando se mostran ou agochan
 Comment[id]=Buat window menskala besar atau kecil secara mulus ketika ia ditampilkan atau disembunyikan