From cd4f98e3d9cb062e1fdc1dfcd127299f6ffcb500 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Sep 2024 01:25:06 +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/cellularnetwork/kcm_cellular_network.json | 1 + kcms/info/kcm_mobile_info.json | 1 + kcms/mobileshell/kcm_mobileshell.json | 1 + kcms/powermanagement/kcm_mobile_power.json | 1 + kcms/time/kcm_mobile_time.json | 1 + kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json | 1 + kcms/wifi/kcm_mobile_wifi.json | 1 + 7 files changed, 7 insertions(+) diff --git a/kcms/cellularnetwork/kcm_cellular_network.json b/kcms/cellularnetwork/kcm_cellular_network.json index 8176b461..5eef470f 100644 --- a/kcms/cellularnetwork/kcm_cellular_network.json +++ b/kcms/cellularnetwork/kcm_cellular_network.json @@ -88,6 +88,7 @@ "X-KDE-Keywords[it]": "mobile,dati,rete", "X-KDE-Keywords[ka]": "mobile,data,network,მობილური ინტერნეტი,ქსელი", "X-KDE-Keywords[nl]": "mobiel,gegevens,netwerk", + "X-KDE-Keywords[pl]": "komórkowa,mobilna,dane,sieć", "X-KDE-Keywords[sl]": "mobilnik,podatki,omrežje", "X-KDE-Keywords[sv]": "mobil,data,nätverk", "X-KDE-Keywords[tr]": "mobil,cep,taşınabilir,veri,ağ", diff --git a/kcms/info/kcm_mobile_info.json b/kcms/info/kcm_mobile_info.json index ef54018b..67296e95 100644 --- a/kcms/info/kcm_mobile_info.json +++ b/kcms/info/kcm_mobile_info.json @@ -91,6 +91,7 @@ "X-KDE-Keywords[it]": "info,distribuzione,sistema", "X-KDE-Keywords[ka]": "info, distro, system, ინფორმაცია, დისტრიბუტივი, სისტემა", "X-KDE-Keywords[nl]": "informatie, distributie, systeem", + "X-KDE-Keywords[pl]": "info, distro, system", "X-KDE-Keywords[sl]": "informacije,distribucija,sistem", "X-KDE-Keywords[sv]": "information, distribution, system", "X-KDE-Keywords[tr]": "bilgi,dağıtım,distro,sistem", diff --git a/kcms/mobileshell/kcm_mobileshell.json b/kcms/mobileshell/kcm_mobileshell.json index 908d533c..afbbe14e 100644 --- a/kcms/mobileshell/kcm_mobileshell.json +++ b/kcms/mobileshell/kcm_mobileshell.json @@ -150,6 +150,7 @@ "X-KDE-Keywords[nl]": "systeem,shell,paneel", "X-KDE-Keywords[nn]": "system,skal,shell,panel", "X-KDE-Keywords[pa]": "ਸਿਸਟਮ,ਸ਼ੈੱਲ,ਪੈਨਲ", + "X-KDE-Keywords[pl]": "system,powłoka,panel", "X-KDE-Keywords[pt_BR]": "sistema,shell,painel", "X-KDE-Keywords[ro]": "sistem,interpretor,panou", "X-KDE-Keywords[sk]": "systém,shell,panel", diff --git a/kcms/powermanagement/kcm_mobile_power.json b/kcms/powermanagement/kcm_mobile_power.json index 895a61f9..7d675148 100644 --- a/kcms/powermanagement/kcm_mobile_power.json +++ b/kcms/powermanagement/kcm_mobile_power.json @@ -89,6 +89,7 @@ "X-KDE-Keywords[it]": "video,monitor,grafica,timeout,sospensione,blocco,blocco dello schermo,salvaschermo", "X-KDE-Keywords[ka]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, ეკრანის შემნახველი, ვიდეო, ეკრანი, გრაფიკა, მოლოდინის დრო, ძილი", "X-KDE-Keywords[nl]": "video, monitor, grafische elementen, timeout, slapen, vergrendeling, schermvergrendeling, schermbeveiliging", + "X-KDE-Keywords[pl]": "video, monitor, grafika, timeout, uśpij, zablokuj, blokada ekranu, wygaszacz ekranu", "X-KDE-Keywords[sl]": "video, monitor, grafika, časovna omejitev, spanje, zaklepanje, zaklepanje zaslona, ​​ohranjevalnik zaslona", "X-KDE-Keywords[sv]": "video, bildskärm, grafik, tidsgräns, viloläge, lår, skärmlåsning, skärmsläckare", "X-KDE-Keywords[tr]": "video,monitör,ekran,görüntü,grafik,zaman aşımı,uyku,kilit,ekran kilidi,ekran koruyucusu", diff --git a/kcms/time/kcm_mobile_time.json b/kcms/time/kcm_mobile_time.json index 1082dfe9..e75b060b 100644 --- a/kcms/time/kcm_mobile_time.json +++ b/kcms/time/kcm_mobile_time.json @@ -91,6 +91,7 @@ "X-KDE-Keywords[it]": "tema, aspetto", "X-KDE-Keywords[ka]": "theme, look, feel, თემა, გარეგნობა", "X-KDE-Keywords[nl]": "thema, uiterlijk, gedrag", + "X-KDE-Keywords[pl]": "wystrój, wygląd, odczucia, wrażenia", "X-KDE-Keywords[sl]": "tema, videz, občutek", "X-KDE-Keywords[sv]": "tema, utseende, känsla", "X-KDE-Keywords[tr]": "tema,görünüm,görünüş,his,bakış", diff --git a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json index ddec3426..e3bc5ca4 100644 --- a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json +++ b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json @@ -130,6 +130,7 @@ "X-KDE-Keywords[it]": "onscreen,osk,tastiera virtuale,tastiera", "X-KDE-Keywords[ka]": "onscreen,osk,virtualkeyboard,keyboard,ეკრანზე, კლავიატურა ეკრანზე, კლავიატურა", "X-KDE-Keywords[nl]": "op-scherm,osk,virtueel toetsenbord,toetsenbord", + "X-KDE-Keywords[pl]": "klawiatura ekranowa,osk,klawiatura wirtualna,klawiatura", "X-KDE-Keywords[sl]": "na zaslonu,osk,virtualna tipkovnica,tipkovnica", "X-KDE-Keywords[sv]": "på skärmen,virtuellt tangentbord,tangentbord", "X-KDE-Keywords[tr]": "ekran üzeri,ekran,osk,osd,sanal klavye,klavye,düğme", diff --git a/kcms/wifi/kcm_mobile_wifi.json b/kcms/wifi/kcm_mobile_wifi.json index 5ae49828..296ae442 100644 --- a/kcms/wifi/kcm_mobile_wifi.json +++ b/kcms/wifi/kcm_mobile_wifi.json @@ -96,6 +96,7 @@ "X-KDE-Keywords[it]": "wifi,rete", "X-KDE-Keywords[ka]": "wifi,network, ქსელი", "X-KDE-Keywords[nl]": "wifi,netwerk", + "X-KDE-Keywords[pl]": "wifi,sieć", "X-KDE-Keywords[sl]": "wifi,omrežje", "X-KDE-Keywords[sv]": "wifi,nätverk", "X-KDE-Keywords[tr]": "wifi,wi-fi,ağ",