yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests 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-10-28 02:14:03 +00:00
parent 1e726457e9
commit b7dc3e3698
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/kscreen/metadata.json
View file

@ -58,7 +58,7 @@
"Name[et]": "Kscreen",
"Name[eu]": "Kscreen",
"Name[fi]": "KScreen",
"Name[fr]": "Kscreen",
"Name[fr]": "KScreen",
"Name[hu]": "Kscreen",
"Name[ia]": "Kscreen",
"Name[id]": "KScreen",