From 5131546336b47a8024878597660baf1131ce6eaa Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 17 Jun 2020 14:13:18 +0200
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"
---
 applets/activities/metadata.desktop              | 2 --
 applets/clock/metadata.desktop                   | 2 --
 applets/krunner/metadata.desktop                 | 2 --
 bin/plasma-mobile.desktop.cmake                  | 2 --
 containments/homescreen/package/metadata.desktop | 1 -
 containments/panel/package/metadata.desktop      | 1 -
 containments/taskpanel/package/metadata.desktop  | 1 -
 kwinmultitasking/metadata.desktop                | 2 --
 look-and-feel/metadata.desktop                   | 3 ---
 shell/metadata.desktop                           | 2 --
 touchscreentest/org.kde.touchtest.desktop        | 2 --
 wallpaper/metadata.desktop                       | 1 -
 12 files changed, 21 deletions(-)

diff --git a/applets/activities/metadata.desktop b/applets/activities/metadata.desktop
index 53b66dfe..e2b83a3d 100644
--- a/applets/activities/metadata.desktop
+++ b/applets/activities/metadata.desktop
@@ -30,7 +30,6 @@ Name[sl]=Opravila telefona
 Name[sv]=Telefonaktiviteter
 Name[tr]=Telefon Etkinlikleri
 Name[uk]=Простори дій телефону
-Name[x-test]=xxPhone Activitiesxx
 Name[zh_CN]=手机活动
 Name[zh_TW]=手機活動
 
@@ -62,7 +61,6 @@ Comment[sl]=Preklop opravil za telefon
 Comment[sv]=Aktivitetsbyte för telefonen
 Comment[tr]=Telefon için etkinlik değiştirici
 Comment[uk]=Перемикач дій для телефону
-Comment[x-test]=xxActivity switcher for the phonexx
 Comment[zh_CN]=手机的活动切换器
 Comment[zh_TW]=手機的活動切換器
 Icon=preferences-activities
diff --git a/applets/clock/metadata.desktop b/applets/clock/metadata.desktop
index e02ff109..ea2be9ad 100644
--- a/applets/clock/metadata.desktop
+++ b/applets/clock/metadata.desktop
@@ -31,7 +31,6 @@ Name[sl]=Ura
 Name[sv]=Klocka
 Name[tr]=Saat
 Name[uk]=Годинник
-Name[x-test]=xxClockxx
 Name[zh_CN]=时钟
 Name[zh_TW]=時鐘
 
@@ -65,7 +64,6 @@ Comment[sl]=Čas prikazan v digitalnem formatu
 Comment[sv]=Tid visad med digitalformat
 Comment[tr]=Saati, sayısal biçimde göster
 Comment[uk]=Час, показаний у цифровому форматі
-Comment[x-test]=xxTime displayed in a digital formatxx
 Comment[zh_CN]=已数字格式显示时间
 Comment[zh_TW]=以數位格式顯示時間
 
diff --git a/applets/krunner/metadata.desktop b/applets/krunner/metadata.desktop
index 9d28dc49..a1041cd9 100644
--- a/applets/krunner/metadata.desktop
+++ b/applets/krunner/metadata.desktop
@@ -22,7 +22,6 @@ Name[sk]=Hľadať a Spustiť
 Name[sl]=Poišči in poženi
 Name[sv]=Sök och kör
 Name[uk]=Пошук і запуск
-Name[x-test]=xxSearch And Runxx
 Name[zh_CN]=搜索和运行
 Name[zh_TW]=搜尋並執行
 
@@ -48,7 +47,6 @@ Comment[sk]=Hľadať a spustiť Aplikácie a služby
 Comment[sl]=Poišči in poženi program in storitve
 Comment[sv]=Sök och kör program och tjänster
 Comment[uk]=Пошук і запуск програм і служб
-Comment[x-test]=xxSearch and run Applications and servicesxx
 Comment[zh_CN]=搜索和运行应用程序及服务
 Comment[zh_TW]=搜尋並執行應用程式及服務
 
diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake
index 6ae7688c..54d8e179 100644
--- a/bin/plasma-mobile.desktop.cmake
+++ b/bin/plasma-mobile.desktop.cmake
@@ -31,7 +31,6 @@ Name[sk]=Plasma Mobile
 Name[sl]=Plasma Mobile
 Name[sv]=Plasma mobil
 Name[uk]=Мобільна Плазма
-Name[x-test]=xxPlasma Mobilexx
 Name[zh_CN]=Plasma Mobile
 Name[zh_TW]=Plasma 行動
 Comment=Plasma Mobile by KDE
@@ -63,7 +62,6 @@ Comment[sk]=Plasma Mobile od KDE
 Comment[sl]=Plasma Mobile od KDE
 Comment[sv]=Plasma mobil av KDE
 Comment[uk]=Мобільна Плазма від KDE
-Comment[x-test]=xxPlasma Mobile by KDExx
 Comment[zh_CN]=KDE Plasma Mobile
 Comment[zh_TW]=來自 KDE 的 Plasma 行動作業系統
 X-KDE-PluginInfo-Version=${PROJECT_VERSION}
diff --git a/containments/homescreen/package/metadata.desktop b/containments/homescreen/package/metadata.desktop
index 6b9bcb11..2df167b9 100644
--- a/containments/homescreen/package/metadata.desktop
+++ b/containments/homescreen/package/metadata.desktop
@@ -29,7 +29,6 @@ Name[sl]=Domači zaslon telefona
 Name[sv]=Telefonens hemskärm
 Name[tr]=Telefon Ana Ekranı
 Name[uk]=Домашня сторінка телефону
-Name[x-test]=xxPhone Homescreenxx
 Name[zh_CN]=手机主屏幕
 Name[zh_TW]=手機的主畫面
 Type=Service
diff --git a/containments/panel/package/metadata.desktop b/containments/panel/package/metadata.desktop
index db05da87..5385ce59 100644
--- a/containments/panel/package/metadata.desktop
+++ b/containments/panel/package/metadata.desktop
@@ -30,7 +30,6 @@ Name[sl]=Kontrolna plošča telefona
 Name[sv]=Telefonpanel
 Name[tr]=Telefon Panosu
 Name[uk]=Панель телефону
-Name[x-test]=xxPhone Panelxx
 Name[zh_CN]=手机面板
 Name[zh_TW]=手機面板
 Type=Service
diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop
index 2398d2a9..113e3e28 100644
--- a/containments/taskpanel/package/metadata.desktop
+++ b/containments/taskpanel/package/metadata.desktop
@@ -28,7 +28,6 @@ Name[sl]=Kontrolna plošča opravil telefona
 Name[sv]=Telefonaktivitetspanel
 Name[tr]=Telefon İş panosu
 Name[uk]=Панель завдань телефону
-Name[x-test]=xxPhone Task panelxx
 Name[zh_CN]=手机任务面板
 Name[zh_TW]=手機工作列
 Type=Service
diff --git a/kwinmultitasking/metadata.desktop b/kwinmultitasking/metadata.desktop
index 289495c2..156b318f 100644
--- a/kwinmultitasking/metadata.desktop
+++ b/kwinmultitasking/metadata.desktop
@@ -26,7 +26,6 @@ Name[sl]=Večopravilni telefon
 Name[sv]=Flera uppgifter på telefonen
 Name[tr]=Telefon çoklu görev
 Name[uk]=Багатозадачний телефон
-Name[x-test]=xxPhone multitaskxx
 Name[zh_CN]=手机多任务
 Name[zh_TW]=手機多工
 Comment=Multitasking user interface for Phone devices
@@ -56,7 +55,6 @@ Comment[sl]=Večopravilni uporabniški vmesnik za telefonske naprave
 Comment[sv]=Användargränssnitt med flera uppgifter för telefoner
 Comment[tr]=Telefon aygıtları için çoklu görev kullanıcı arayüzü
 Comment[uk]=Багатозадачний інтерфейс користувача для телефонних пристроїв
-Comment[x-test]=xxMultitasking user interface for Phone devicesxx
 Comment[zh_CN]=为手机设备设计的多任务用户界面
 Comment[zh_TW]=手機裝置的多工使用者介面
 
diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop
index b943466b..20012ae2 100644
--- a/look-and-feel/metadata.desktop
+++ b/look-and-feel/metadata.desktop
@@ -27,7 +27,6 @@ Name[sl]=Plasma Phone
 Name[sv]=Plasma telefon
 Name[tr]=Plasma Telefonu
 Name[uk]=Телефон Плазми
-Name[x-test]=xxPlasma Phonexx
 Name[zh_CN]=Plasma Phone
 Name[zh_TW]=Plasma 電話
 Comment=Plasma workspace for smartphones
@@ -58,7 +57,6 @@ Comment[sl]=Plasmin delovni prostor za pametne telefone
 Comment[sv]=Plasma arbetsyta för smarta telefoner
 Comment[tr]=Akıllı telefonlar için Plasma çalışma alanı
 Comment[uk]=Робочий простір Плазми для смартфонів
-Comment[x-test]=xxPlasma workspace for smartphonesxx
 Comment[zh_CN]=为手机定制的 Plasma 工作空间
 Comment[zh_TW]=智慧型手機的 Plasma 工作空間
 Keywords=Phone, Workspace, Look and Feel
@@ -89,7 +87,6 @@ Keywords[sl]=Telefon, delovni prostor, videz in izkušnja
 Keywords[sv]=Telefon, arbetsyta, utseende och känsla
 Keywords[tr]=Telefon, Çalışma alanı, Görünüm
 Keywords[uk]=Телефон, Робочий простір, Вигляд і поведінка
-Keywords[x-test]=xxPhone, Workspace, Look and Feelxx
 Keywords[zh_CN]=Phone, Workspace, Look and Feel, 手机, 工作空间, 观感
 Keywords[zh_TW]=電話、工作空間、外觀與感覺
 Type=Service
diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index 8f11dba4..dcb78c8c 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -30,7 +30,6 @@ Name[sl]=Telefon
 Name[sv]=Telefon
 Name[tr]=Telefon
 Name[uk]=Телефон
-Name[x-test]=xxPhonexx
 Name[zh_CN]=手机
 Name[zh_TW]=電話
 Comment=Plasma shell for phones
@@ -61,7 +60,6 @@ Comment[sk]=Plasma shell pre telefóny
 Comment[sl]=Plasma shell za telefone
 Comment[sv]=Plasma skal för telefoner
 Comment[uk]=Оболонка Плазми для телефонів
-Comment[x-test]=xxPlasma shell for phonesxx
 Comment[zh_CN]=适配手机的 Plasma 外壳
 Comment[zh_TW]=適用於手機的 Plasma Shell
 Type=Service
diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop
index 076cb616..ecc824ab 100755
--- a/touchscreentest/org.kde.touchtest.desktop
+++ b/touchscreentest/org.kde.touchtest.desktop
@@ -28,7 +28,6 @@ Name[sl]=Preizkus dotikov
 Name[sv]=Beröringsprov
 Name[tr]=Dokunma Testi
 Name[uk]=Тестування дотику
-Name[x-test]=xxTouch Testxx
 Name[zh_CN]=触摸测试
 Name[zh_TW]=觸控測試
 
@@ -65,7 +64,6 @@ GenericName[sl]=Terminal
 GenericName[sv]=Terminal
 GenericName[tr]=Uçbirim
 GenericName[uk]=Термінал
-GenericName[x-test]=xxTerminalxx
 GenericName[zh_CN]=终端
 GenericName[zh_TW]=終端機
 Icon=input-touchpad
diff --git a/wallpaper/metadata.desktop b/wallpaper/metadata.desktop
index fcda3dee..e3212067 100644
--- a/wallpaper/metadata.desktop
+++ b/wallpaper/metadata.desktop
@@ -26,7 +26,6 @@ Name[sl]=Plasmini zaklepi telefona
 Name[sv]=Plasma telefonskåp
 Name[tr]=Plasma Telefon Kilidi
 Name[uk]=Блокувальники телефону Плазми
-Name[x-test]=xxPlasma Phone Lockersxx
 Name[zh_CN]=Plasma Phone 锁屏
 Name[zh_TW]=Plasma 手機鎖定程式