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-02-25 01:16:02 +00:00
parent 0e280a94ca
commit d059a063b2
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
kded/autodetectapn/kded_plasma_mobile_autodetectapn.json
View file

@ -1,7 +1,25 @@
{ {
"KPlugin": { "KPlugin": {
"Description": "Autodetect cellular APNs in Plasma Mobile", "Description": "Autodetect cellular APNs in Plasma Mobile",
"Name": "Plasma Mobile Autodetect APNs" "Description[eo]": "Aŭtomate detekti ĉelretajn APN en Plasma-Mobile",
"Description[es]": "Detección automática de APN móviles en Plasma Mobile",
"Description[ko]": "Plasma 모바일에서 셀룰러 APN 자동 감지",
"Description[nl]": "Cellulaire APN's automatisch in Plasma Mobile detecteren",
"Description[pl]": "Sam wykryj komórkowe APNy na Przenośnej Plazmie",
"Description[sl]": "Samodejno zaznavaj celične APN v Plasma Mobile",
"Description[tr]": "Plasma Cep’teki erişim noktası adlarını kendiliğinden algıla",
"Description[uk]": "Автоматично виявляти стільникові точки доступу у Мобільній Плазмі",
"Description[x-test]": "xxAutodetect cellular APNs in Plasma Mobilexx",
"Name": "Plasma Mobile Autodetect APNs",
"Name[eo]": "Atomata APN-Ekkono de Plasma-Mobile",
"Name[es]": "Detección automática de APN en Plasma Mobile",
"Name[ko]": "Plasma 모바일 APN 자동 감지",
"Name[nl]": "Plasma Mobile automatisch APN's detecteren",
"Name[pl]": "Sam wykryj APNy na Przenośnej Plazmie",
"Name[sl]": "Plasma Mobile je samodejno zaznala APN",
"Name[tr]": "Plasma Cep Erişim Noktası Adlarını Kendiliğinden Algıla",
"Name[uk]": "Автоматичне виявлення точок доступу у Мобільній Плазмі",
"Name[x-test]": "xxPlasma Mobile Autodetect APNsxx"
}, },
"OnlyShowIn": "KDE;", "OnlyShowIn": "KDE;",
"X-KDE-Kded-autoload": true, "X-KDE-Kded-autoload": true,

2
kded/start/kded_plasma_mobile_start.json
View file

@ -32,7 +32,7 @@
"Name[ca]": "Inici del Plasma Mobile", "Name[ca]": "Inici del Plasma Mobile",
"Name[cs]": "Spuštění Plasma Mobile", "Name[cs]": "Spuštění Plasma Mobile",
"Name[en_GB]": "Plasma Mobile Start", "Name[en_GB]": "Plasma Mobile Start",
"Name[eo]": "Plasma Poŝtelefono Komenco", "Name[eo]": "Plasma-Mobile Komenco",
"Name[es]": "Inicio de Plasma Mobile", "Name[es]": "Inicio de Plasma Mobile",
"Name[eu]": "Plasma Mugikorraren abioa", "Name[eu]": "Plasma Mugikorraren abioa",
"Name[fi]": "Plasma Mobilen käynnistys", "Name[fi]": "Plasma Mobilen käynnistys",