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-10-31 01:53:33 +00:00
parent 8417492781
commit 365dfaa4c0
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/src/kwindecoration.desktop
View file

@ -35,7 +35,7 @@ Comment[mr]=के-विन चौकट सजावट
Comment[nb]=KWin Vinduspynt
Comment[nds]=KWin-Finsterdekoratschoon
Comment[nl]=KWin vensterdecoratie
Comment[nn]=KWin vindaugsdekorasjon
Comment[nn]=KWin vindaugspynt
Comment[pa]=KWin ਵਿੰਡੋ ਸਜਾਵਟ
Comment[pl]=Wygląd okien KWin
Comment[pt]=Decoração das Janelas do KWin