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 2018-09-04 06:05:23 +02:00
parent f92d806343
commit ce31ac08d4
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/cube/cube_config.desktop
View file

@ -60,7 +60,7 @@ Name[pl]=Sześcian pulpitu
Name[pt]=Cubo de Ecrãs
Name[pt_BR]=Cubo de áreas de trabalho
Name[ro]=Cub de birou
Name[ru]=Куб с рабочими столами
Name[ru]=Куб рабочих столов
Name[si]=වැඩතල ඝනකය
Name[sk]=Plochy na kocke
Name[sl]=Kocka z namizji