From bd836d5da965192fdaf6b3174ad97ed09c650d12 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Sep 2024 01:22:19 +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/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 + 6 files changed, 6 insertions(+) diff --git a/kcms/cellularnetwork/kcm_cellular_network.json b/kcms/cellularnetwork/kcm_cellular_network.json index 5eef470f..9b10fda4 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[nn]": "mobil,mobilt,data,nettverk", "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", diff --git a/kcms/info/kcm_mobile_info.json b/kcms/info/kcm_mobile_info.json index 67296e95..f6132bd1 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[nn]": "info, distro, distribusjon, system", "X-KDE-Keywords[pl]": "info, distro, system", "X-KDE-Keywords[sl]": "informacije,distribucija,sistem", "X-KDE-Keywords[sv]": "information, distribution, system", diff --git a/kcms/powermanagement/kcm_mobile_power.json b/kcms/powermanagement/kcm_mobile_power.json index 7d675148..74b0d395 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[nn]": "video, skjerm, grafikk, tidsavbrot, timeout, sove, lås, låsing, skjermlåsar, pauseskjerm, skjermsparar", "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", diff --git a/kcms/time/kcm_mobile_time.json b/kcms/time/kcm_mobile_time.json index e75b060b..e58c57ac 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[nn]": "tema, utsjånad, åtferd", "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", diff --git a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json index e3bc5ca4..83845ffe 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[nn]": "skjermtastatur,virtuelt tastatur,tastatur", "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", diff --git a/kcms/wifi/kcm_mobile_wifi.json b/kcms/wifi/kcm_mobile_wifi.json index 296ae442..99dd76e3 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[nn]": "wifi,nettverk,trådlaust", "X-KDE-Keywords[pl]": "wifi,sieć", "X-KDE-Keywords[sl]": "wifi,omrežje", "X-KDE-Keywords[sv]": "wifi,nätverk",