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"
2022-04-01 02:01:13 +00:00 · 2022-04-01 02:01:13 +00:00 · cba443dbe3
commit cba443dbe3
parent 63c7f523b0
13 changed files with 14 additions and 14 deletions
--- a/src/effects/kscreen/metadata.json
+++ b/src/effects/kscreen/metadata.json
@ -4,7 +4,7 @@
        "Description": "Helper Effect for KScreen",
        "Description[ar]": "تأثير مساعدة لـشاشة.ك",
        "Description[az]": "KScreen üşün köməkçi effekti",
-        "Description[ca@valencia]": "Efecte auxiliar per al KScreen",
+        "Description[ca@valencia]": "Efecte auxiliar per a KScreen",
        "Description[ca]": "Efecte auxiliar per al KScreen",
        "Description[cs]": "Pomocný efekt pro KScreen",
        "Description[en_GB]": "Helper Effect for KScreen",
--- a/src/effects/kwineffect.desktop
+++ b/src/effects/kwineffect.desktop
@ -12,7 +12,7 @@ Comment[bg]=Ефект KWin
 Comment[bn_IN]=KWin ইফেক্ট
 Comment[bs]=Efekti K‑vina
 Comment[ca]=Efecte del KWin
-Comment[ca@valencia]=Efecte del KWin
+Comment[ca@valencia]=Efecte de KWin
 Comment[cs]=KWin efekt
 Comment[csb]=Efektë òknów
 Comment[da]=KWin-effekt
--- a/src/effects/showfps/metadata.json
+++ b/src/effects/showfps/metadata.json
@ -4,7 +4,7 @@
        "Description": "Display KWin's performance in the corner of the screen",
        "Description[ar]": "اعرض أداء نوافذ.ك في زاوية من زوايا الشاشة",
        "Description[az]": "Ekranın küncündə qrafikanın effektlərin saniyədəki kadrlarının sayını göstərir",
-        "Description[ca@valencia]": "Mostra el rendiment del KWin a la cantonada de la pantalla",
+        "Description[ca@valencia]": "Mostra el rendiment de KWin a la cantonada de la pantalla",
        "Description[ca]": "Mostra el rendiment del KWin a la cantonada de la pantalla",
        "Description[cs]": "Zobrazuje výkon KWin v rohu obrazovky",
        "Description[en_GB]": "Display KWin's performance in the corner of the screen",
--- a/src/kcmkwin/kwinscripts/kwinscripts.desktop
+++ b/src/kcmkwin/kwinscripts/kwinscripts.desktop
@ -44,7 +44,7 @@ Name[ar]=سكرِبتات نوافذك
 Name[az]=KWin Skriptləri
 Name[bs]=KWin skripte
 Name[ca]=Scripts del KWin
-Name[ca@valencia]=Scripts del KWin
+Name[ca@valencia]=Scripts de KWin
 Name[cs]=Skripty KWinu
 Name[da]=KWin-scripts
 Name[de]=KWin-Skripte
@ -97,7 +97,7 @@ Comment[ar]=أدر سكربتات كوين
 Comment[az]=KWin skriptləri meneceri
 Comment[bs]=Podesi KWin skripte
 Comment[ca]=Gestiona els scripts del KWin
-Comment[ca@valencia]=Gestiona els scripts del KWin
+Comment[ca@valencia]=Gestiona els scripts de KWin
 Comment[cs]=Spravovat skripty KWinu
 Comment[da]=Håndtér KWin-scripts
 Comment[de]=KWin-Skripte verwalten
--- a/src/plugins/kdecorations/aurorae/src/kwindecoration.desktop
+++ b/src/plugins/kdecorations/aurorae/src/kwindecoration.desktop
@ -7,7 +7,7 @@ Comment[ar]=زخارف نوافذ «نوافذك»
 Comment[az]=KWin Pəncərə Dekorasiyası
 Comment[bs]=KWin Dekoracije prozora
 Comment[ca]=Decoració de les finestres del KWin
-Comment[ca@valencia]=Decoració de les finestres del KWin
+Comment[ca@valencia]=Decoració de les finestres de KWin
 Comment[cs]=Dekorace oken KWin
 Comment[da]=KWin vinduesdekoration
 Comment[de]=KWin-Fensterdekoration
--- a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
+++ b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
@ -41,7 +41,7 @@
        "Name": "KWin Aurorae",
        "Name[ar]": "أورورا كوين",
        "Name[az]": "KWin Aurorae",
-        "Name[ca@valencia]": "Aurorae del KWin",
+        "Name[ca@valencia]": "Aurorae de KWin",
        "Name[ca]": "Aurorae del KWin",
        "Name[cs]": "KWin Aurorae",
        "Name[en_GB]": "KWin Aurorae",
--- a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
+++ b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
@ -41,7 +41,7 @@
        "Name": "KWin Decoration",
        "Name[ar]": "زخارف نوافذ كوين",
        "Name[az]": "KWin Dekorasiyası",
-        "Name[ca@valencia]": "Decoració del KWin",
+        "Name[ca@valencia]": "Decoració de KWin",
        "Name[ca]": "Decoració del KWin",
        "Name[cs]": "Dekorace KWin",
        "Name[en_GB]": "KWin Decoration",
--- a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json
+++ b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json
@ -41,7 +41,7 @@
        "Name": "KWin Effect",
        "Name[ar]": "تأثيرات كوين",
        "Name[az]": "KWin effekti",
-        "Name[ca@valencia]": "Efecte del KWin",
+        "Name[ca@valencia]": "Efecte de KWin",
        "Name[ca]": "Efecte del KWin",
        "Name[cs]": "Efekt KWinu",
        "Name[en_GB]": "KWin Effect",
--- a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
+++ b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
@ -41,7 +41,7 @@
        "Name": "KWin Script",
        "Name[ar]": "سكربت كوين",
        "Name[az]": "Kwin skripti",
-        "Name[ca@valencia]": "Script del KWin",
+        "Name[ca@valencia]": "Script de KWin",
        "Name[ca]": "Script del KWin",
        "Name[cs]": "Skript KWinu",
        "Name[en_GB]": "KWin Script",
--- a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
+++ b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
@ -41,7 +41,7 @@
        "Name": "KWin Window Switcher",
        "Name[ar]": "مبدل نوافذ كوين",
        "Name[az]": "KWin pəncərə dəyişdiricisi",
-        "Name[ca@valencia]": "Commutador de finestres del KWin",
+        "Name[ca@valencia]": "Commutador de finestres de KWin",
        "Name[ca]": "Commutador de finestres del KWin",
        "Name[cs]": "Přepínač oken KWin",
        "Name[en_GB]": "KWin Window Switcher",
--- a/src/scripting/kwinscript.desktop
+++ b/src/scripting/kwinscript.desktop
@ -7,7 +7,7 @@ Comment[ar]=سكربت كوين
 Comment[az]=Kwin skripti
 Comment[bs]=KWin skripta
 Comment[ca]=Script del KWin
-Comment[ca@valencia]=Script del KWin
+Comment[ca@valencia]=Script de KWin
 Comment[cs]=Skript KWinu
 Comment[da]=KWin-script
 Comment[de]=KWin-Skript
--- a/src/tabbox/kwindesktopswitcher.desktop
+++ b/src/tabbox/kwindesktopswitcher.desktop
@ -7,7 +7,7 @@ Comment[ar]=تخطيط مبدل أسطح المكتب لكوين
 Comment[az]=KWin İş Masası dəyişdiricisi
 Comment[bs]=Izgled KWin prebacivača radnih površina
 Comment[ca]=Disposició del commutador d'escriptoris del KWin
-Comment[ca@valencia]=Disposició del commutador d'escriptoris del KWin
+Comment[ca@valencia]=Disposició del commutador d'escriptoris de KWin
 Comment[cs]=Rozvržení přepínače ploch KWin
 Comment[da]=Layout til KWins skrivebordsskifter
 Comment[de]=Arbeitsflächenwechsler-Layout
--- a/src/tabbox/kwinwindowswitcher.desktop
+++ b/src/tabbox/kwinwindowswitcher.desktop
@ -7,7 +7,7 @@ Comment[ar]=تخطيط مبدل النوافذ لكوين
 Comment[az]=KWin Pəncərə dəyişdiricisi
 Comment[bs]=KWin Prozor Switcher Izgled
 Comment[ca]=Disposició del commutador de finestres del KWin
-Comment[ca@valencia]=Disposició del commutador de finestres del KWin
+Comment[ca@valencia]=Disposició del commutador de finestres de KWin
 Comment[cs]=Rozvržení přepínače oken KWin
 Comment[da]=Layout til KWins vinduesskifter
 Comment[de]=Fensterwechsler-Layout