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 2020-09-09 06:33:22 +02:00
parent 6acf35e4cc
commit 81a9b824cf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/presentwindows/presentwindows_config.desktop
View file

@ -62,7 +62,7 @@ Name[pa]=ਮੌਜੂਦਾ ਵਿੰਡੋਜ਼
Name[pl]=Prezentacja okien Name[pl]=Prezentacja okien
Name[pt]=Apresentar as Janelas Name[pt]=Apresentar as Janelas
Name[pt_BR]=Apresentar janelas Name[pt_BR]=Apresentar janelas
Name[ro]=Ferestre prezente Name[ro]=Prezintă ferestrele
Name[ru]=Все окна Name[ru]=Все окна
Name[se]=Presentere lásiid Name[se]=Presentere lásiid
Name[si]=පවතින කවුළුව Name[si]=පවතින කවුළුව