From 93f70563d8e0de4c77301e30bbf1b4debee0730d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 12 Jun 2022 01:45:35 +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"
---
 kcms/colors/accentColorService/accentColorService.json | 2 +-
 kcms/users/kcm_users.desktop                           | 1 +
 wallpapers/image/setaswallpaper.desktop.in             | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/kcms/colors/accentColorService/accentColorService.json b/kcms/colors/accentColorService/accentColorService.json
index fa0867247..1fbd36864 100644
--- a/kcms/colors/accentColorService/accentColorService.json
+++ b/kcms/colors/accentColorService/accentColorService.json
@@ -12,7 +12,7 @@
         "Description[id]": "Menerapkan warna aksen yang diekstrak dari wallpaper pada permintaan dbus",
         "Description[it]": "Applica il colore secondario estratto dallo sfondo su richiesta dbus",
         "Description[ko]": "D-Bus 요청을 받았을 때 배경 그림에서 추출한 강조색 적용",
-        "Description[nl]": "Past de uitgepakte accentkleur uit achtergrondafbeelding toe op dbus-verzoek",
+        "Description[nl]": "Past de uitgepakte accentueringskleur uit achtergrondafbeelding toe op dbus-verzoek",
         "Description[pl]": "Stosuje wydobytą barwę akcentu z tapety na żądanie dbus",
         "Description[pt]": "Aplica a cor acentuada extraída do papel de parede no pedido de DBus",
         "Description[ro]": "Aplică culoarea de accent extrasă din tapet la cerere dbus",
diff --git a/kcms/users/kcm_users.desktop b/kcms/users/kcm_users.desktop
index f3d0cb8dd..1f310bbe8 100644
--- a/kcms/users/kcm_users.desktop
+++ b/kcms/users/kcm_users.desktop
@@ -25,6 +25,7 @@ Name[ko]=사용자
 Name[lt]=Naudotojai
 Name[nl]=Gebruikers
 Name[nn]=Brukarar
+Name[pa]=ਵਰਤੋਂਕਾਰ
 Name[pl]=Użytkownicy
 Name[pt]=Utilizadores
 Name[pt_BR]=Usuários
diff --git a/wallpapers/image/setaswallpaper.desktop.in b/wallpapers/image/setaswallpaper.desktop.in
index 09a75597c..2e1875ff1 100644
--- a/wallpapers/image/setaswallpaper.desktop.in
+++ b/wallpapers/image/setaswallpaper.desktop.in
@@ -27,6 +27,7 @@ Name[ka]=ფონის სურათად დაყენება
 Name[ko]=배경 그림으로 설정
 Name[nl]=Als achtergrondafbeelding instellen
 Name[nn]=Bruk som bakgrunns­bilete
+Name[pa]=ਵਾਲਪੇਪਰ ਲਾਓ
 Name[pl]=Ustaw jako tapetę
 Name[pt]=Definir como Papel de Parede
 Name[pt_BR]=Definir como papel de parede