marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2024-11-29 01:27:27 +00:00
parent 6112b4397c
commit f3da7d632c
6 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcms/cellularnetwork/kcm_cellular_network.json
View file

@ -92,6 +92,7 @@
"X-KDE-Keywords[ia]": "mobile,data,network",
"X-KDE-Keywords[it]": "mobile,dati,rete",
"X-KDE-Keywords[ka]": "mobile,data,network,მობილური ინტერნეტი,ქსელი",
"X-KDE-Keywords[ko]": "mobile,data,network,모바일,데이터,네트워크",
"X-KDE-Keywords[lv]": "mobilie,dati,tīkls",
"X-KDE-Keywords[nl]": "mobiel,gegevens,netwerk",
"X-KDE-Keywords[nn]": "mobil,mobilt,data,nettverk",

1
kcms/info/kcm_mobile_info.json
View file

@ -94,6 +94,7 @@
"X-KDE-Keywords[ia]": "info, distro, system",
"X-KDE-Keywords[it]": "info,distribuzione,sistema",
"X-KDE-Keywords[ka]": "info, distro, system, ინფორმაცია, დისტრიბუტივი, სისტემა",
"X-KDE-Keywords[ko]": "info, distro, system, 정보, 배포판, 시스템",
"X-KDE-Keywords[lv]": "informācija,distribūcija,sistēma",
"X-KDE-Keywords[nl]": "informatie, distributie, systeem",
"X-KDE-Keywords[nn]": "info, distro, distribusjon, system",

1
kcms/powermanagement/kcm_mobile_power.json
View file

@ -92,6 +92,7 @@
"X-KDE-Keywords[ia]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver",
"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[ko]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, 비디오, 모니터, 그래픽, 시간 제한, 절전, 대기, 잠금, 화면 보호기, 화면 잠금",
"X-KDE-Keywords[lv]": "video, monitors, grafika, noildze, iesnaudināšana, slēgšana, ekrāna bloķēšana, bloķēt, ekrāna saudzētājs",
"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",

1
kcms/time/kcm_mobile_time.json
View file

@ -94,6 +94,7 @@
"X-KDE-Keywords[ia]": "thema, semblantia, apparentia",
"X-KDE-Keywords[it]": "tema, aspetto",
"X-KDE-Keywords[ka]": "theme, look, feel, თემა, გარეგნობა",
"X-KDE-Keywords[ko]": "theme, look, feel, 테마, 모습과 느낌",
"X-KDE-Keywords[lv]": "motīvs, izskats, uzvedība",
"X-KDE-Keywords[nl]": "thema, uiterlijk, gedrag",
"X-KDE-Keywords[nn]": "tema, utsjånad, åtferd",

1
kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json
View file

@ -133,6 +133,7 @@
"X-KDE-Keywords[ia]": "onscreen,osk,virtualkeyboard,keyboard",
"X-KDE-Keywords[it]": "onscreen,osk,tastiera virtuale,tastiera",
"X-KDE-Keywords[ka]": "onscreen,osk,virtualkeyboard,keyboard,ეკრანზე, კლავიატურა ეკრანზე, კლავიატურა",
"X-KDE-Keywords[ko]": "onscreen,osk,virtualkeyboard,keyboard,키보드,가상 키보드",
"X-KDE-Keywords[lv]": "ekrānā,osk,virtuālātastatūra,tastatūra",
"X-KDE-Keywords[nl]": "op-scherm,osk,virtueel toetsenbord,toetsenbord",
"X-KDE-Keywords[nn]": "skjermtastatur,virtuelt tastatur,tastatur",

1
kcms/wifi/kcm_mobile_wifi.json
View file

@ -98,6 +98,7 @@
"X-KDE-Keywords[ia]": "wifi,network",
"X-KDE-Keywords[it]": "wifi,rete",
"X-KDE-Keywords[ka]": "wifi,network, ქსელი",
"X-KDE-Keywords[ko]": "wifi,network,네트워크,무선,와이파이",
"X-KDE-Keywords[lv]": "wifi,tīkls",
"X-KDE-Keywords[nl]": "wifi,netwerk",
"X-KDE-Keywords[nn]": "wifi,nettverk,trådlaust",