From a2774e26a9e3a4fe04f554aee6acd19413946272 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 9 Jan 2022 01:50:30 +0000
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"
---
 .../org.kde.kwin_rules_dialog.desktop         | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop b/src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop
index 3a38d26e90..598ede7e51 100644
--- a/src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop
+++ b/src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop
@@ -1,6 +1,68 @@
 [Desktop Entry]
 Type=Application
 Name=Window Rules
+Name[ar]=قواعد النوافذ
+Name[az]=Pəncərə qaydaları
+Name[bg]=Правила за прозорци
+Name[bs]=Pravila prozora
+Name[ca]=Regles de les finestres
+Name[ca@valencia]=Regles de les finestres
+Name[cs]=Pravidla oken
+Name[da]=Vinduesregler
+Name[de]=Fensterregeln
+Name[el]=Κανόνες παραθύρου
+Name[en_GB]=Window Rules
+Name[es]=Reglas de las ventanas
+Name[et]=Akna reeglid
+Name[eu]=Leihoaren arauak
+Name[fi]=Ikkunasäännöt
+Name[fr]=Règles de la fenêtre
+Name[ga]=Rialacha Fuinneog
+Name[gl]=Regras da xanela
+Name[gu]=વિન્ડો નિયમો
+Name[he]=כללי חלון
+Name[hi]=विंडो नियम
+Name[hr]=Pravila prozora
+Name[hu]=Ablakszabályok
+Name[ia]=Regulas de fenestra
+Name[id]=Peraturan Window
+Name[is]=Gluggahegðunarreglur
+Name[it]=Regole delle finestre
+Name[ja]=ウィンドウルール
+Name[kk]=Терезе тәртібі
+Name[km]=ក្បួន​បង្អួច
+Name[kn]=ವಿಂಡೋ ನಿಯಮಗಳು
+Name[ko]=창 규칙
+Name[lt]=Langų taisyklės
+Name[lv]=Loga noteikumi
+Name[mr]=चौकट नियम
+Name[nb]=Vindusregler
+Name[nds]=Finsterbedregen
+Name[nl]=Vensterregels
+Name[nn]=Vindaugsreglar
+Name[pa]=ਵਿੰਡੋ ਨਿਯਮ
+Name[pl]=Zasady okien
+Name[pt]=Regras das Janelas
+Name[pt_BR]=Regras das janelas
+Name[ro]=Reguli ferestre
+Name[ru]=Особые параметры окон
+Name[si]=කවුළු නීති
+Name[sk]=Pravidlá okien
+Name[sl]=Pravila za okna
+Name[sr]=Правила прозора
+Name[sr@ijekavian]=Правила прозора
+Name[sr@ijekavianlatin]=Pravila prozora
+Name[sr@latin]=Pravila prozora
+Name[sv]=Fönsterregler
+Name[th]=กฎต่าง ๆ ของหน้าต่าง
+Name[tr]=Pencere Kuralları
+Name[ug]=كۆزنەك بەلگىلىمىسى
+Name[uk]=Правила вікон
+Name[vi]=Luật cửa sổ
+Name[wa]=Rîles des finiesses
+Name[x-test]=xxWindow Rulesxx
+Name[zh_CN]=窗口规则
+Name[zh_TW]=視窗規則
 NoDisplay=true
 Exec=kwin_rules_dialog
 Icon=preferences-system-windows-actions