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"
This commit is contained in:
l10n daemon script 2025-03-02 01:28:49 +00:00
parent bbac7e98b4
commit b4af02e227

View file

@ -4,7 +4,44 @@
"Authors": [ "Authors": [
{ {
"Email": "devin@kde.org", "Email": "devin@kde.org",
"Name": "Devin Lin" "Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[eo]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[gl]": "Devin Lin",
"Name[he]": "דווין לין",
"Name[hu]": "Devin Lin",
"Name[ia]": "Devin Lin",
"Name[is]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[ko]": "Devin Lin",
"Name[lv]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[nn]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[ru]": "Devin Lin",
"Name[sa]": "डेविन् लिन्",
"Name[sk]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
} }
], ],
"Category": "Window Management", "Category": "Window Management",
@ -41,9 +78,9 @@
"Description[x-test]": "xxAllows you to switch between running tasks with a mobile interface.xx", "Description[x-test]": "xxAllows you to switch between running tasks with a mobile interface.xx",
"Description[zh_CN]": "允许您使用移动界面在正在运行的任务之间切换。", "Description[zh_CN]": "允许您使用移动界面在正在运行的任务之间切换。",
"Description[zh_TW]": "讓您用手機介面在執行中的工作項目之間切換。", "Description[zh_TW]": "讓您用手機介面在執行中的工作項目之間切換。",
"EnabledByDefault": false,
"Icon": "preferences-system-windows", "Icon": "preferences-system-windows",
"Id": "mobiletaskswitcher", "Id": "mobiletaskswitcher",
"EnabledByDefault": false,
"License": "GPL-2.0-or-later", "License": "GPL-2.0-or-later",
"Name": "Mobile Task Switcher", "Name": "Mobile Task Switcher",
"Name[ca@valencia]": "Commutador de tasques del mòbil", "Name[ca@valencia]": "Commutador de tasques del mòbil",
@ -80,7 +117,7 @@
"Name[zh_CN]": "移动任务切换", "Name[zh_CN]": "移动任务切换",
"Name[zh_TW]": "行動工作切換器" "Name[zh_TW]": "行動工作切換器"
}, },
"X-KWin-Border-Activate": true,
"X-KDE-Ordering": 60, "X-KDE-Ordering": 60,
"X-KWin-Border-Activate": true,
"X-Plasma-API": "declarativescript" "X-Plasma-API": "declarativescript"
} }