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-05-06 01:17:47 +00:00
parent 8f8bcfd8be
commit 1d8c1f9c38
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kded/autodetectapn/kded_plasma_mobile_autodetectapn.json
View file

@ -23,6 +23,7 @@
"Description[uk]": "Автоматично виявляти стільникові точки доступу у Мобільній Плазмі",
"Description[x-test]": "xxAutodetect cellular APNs in Plasma Mobilexx",
"Description[zh_CN]": "在 Plasma Mobile 中自动检测蜂窝网络 APN",
"Description[zh_TW]": "在 Plasma 行動中自動偵測行動 APN",
"Name": "Plasma Mobile Autodetect APNs",
"Name[ca@valencia]": "Detecció automàtica dels APN de Plasma Mobile",
"Name[ca]": "Detecció automàtica dels APN del Plasma Mobile",
@ -45,7 +46,8 @@
"Name[tr]": "Plasma Cep Erişim Noktası Adlarını Kendiliğinden Algıla",
"Name[uk]": "Автоматичне виявлення точок доступу у Мобільній Плазмі",
"Name[x-test]": "xxPlasma Mobile Autodetect APNsxx",
"Name[zh_CN]": "Plasma Mobile 自动检测 APN"
"Name[zh_CN]": "Plasma Mobile 自动检测 APN",
"Name[zh_TW]": "Plasma 行動自動偵測 APN"
},
"OnlyShowIn": "KDE;",
"X-KDE-Kded-autoload": true,