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-05-11 02:19:24 +00:00
parent d7bc385013
commit debf06ea87
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/scripts/convergentwindows/metadata.json
View file

@ -9,7 +9,7 @@
"Name[ca]": "Plata Hill",
"Name[cs]": "Plata Hill",
"Name[en_GB]": "Plata Hill",
"Name[eo]": "Plata Monteto",
"Name[eo]": "Plata Hill",
"Name[es]": "Plata Hill",
"Name[eu]": "Plata Hill",
"Name[fi]": "Plata Hill",