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 2023-11-26 02:32:13 +00:00
parent 80d12a8a3c
commit 835c00af94
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kwin/mobiletaskswitcher/mobiletaskswitcher.json
View file

@ -49,7 +49,7 @@
"Name[pl]": "Przenośny przełącznik zadań",
"Name[sk]": "Mobilný prepínač úloh",
"Name[sl]": "Preklopnik mobilnih opravil",
"Name[tr]": "Taşınabilir Görev Değiştirici",
"Name[tr]": "Taşınabilir Görev Değiştiricisi",
"Name[uk]": "Мобільний перемикач завдань",
"Name[x-test]": "xxMobile Task Switcherxx",
"Name[zh_CN]": "移动任务切换"