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 2025-09-27 01:34:50 +00:00
parent 71836b1073
commit 067ac6372f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quicksettings/mobiledata/metadata.json
View file

@ -116,7 +116,7 @@
"Name[sl]": "Mobilni podatki", "Name[sl]": "Mobilni podatki",
"Name[sv]": "Mobildata", "Name[sv]": "Mobildata",
"Name[ta]": "கைபேசி தரவு", "Name[ta]": "கைபேசி தரவு",
"Name[tr]": "Taşınabilir Veri", "Name[tr]": "Hücresel Veri",
"Name[uk]": "Мобільні дані", "Name[uk]": "Мобільні дані",
"Name[zh_CN]": "移动数据", "Name[zh_CN]": "移动数据",
"Name[zh_TW]": "行動資料", "Name[zh_TW]": "行動資料",