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-02-16 01:49:32 +00:00
parent a3b5266175
commit 648b2a5bf3
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/kdecorations/aurorae/themes/plastik/package/metadata.desktop
View file

@ -85,7 +85,7 @@ Name[uz@cyrillic]=Пластик
Name[vi]=Plastik
Name[wa]=Plastike
Name[x-test]=xxPlastikxx
Name[zh_CN]=Plastik 塑料
Name[zh_CN]=Plastik 百相
Name[zh_TW]=Plastik
Comment=The classic theme known from KDE 3
Comment[ar]=السّمة الكلاسيكيّة المعروفة من كدي 3