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 2022-07-12 01:49:58 +00:00
parent e9ad2b530b
commit 8d08c31de0
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/kcmkwin/kwindecoration/metadata.json
View file

@ -42,7 +42,7 @@
"Name[ca@valencia]": "Decoració de les finestres",
"Name[ca]": "Decoració de les finestres",
"Name[cs]": "Dekorace oken",
"Name[de]": "Fensterdekorationen",
"Name[de]": "Fensterdekoration",
"Name[es]": "Decoraciones de las ventanas",
"Name[fi]": "Ikkunakoristelu",
"Name[fr]": "Décorations de fenêtres",