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-10-07 08:03:19 +02:00
parent 0b7778f964
commit dc707c5c4e
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/scale/scale_config.desktop
View file

@ -22,6 +22,7 @@ Name[nn]=Skalering
Name[pl]=Skala Name[pl]=Skala
Name[pt]=Escala Name[pt]=Escala
Name[pt_BR]=Escala Name[pt_BR]=Escala
Name[ru]=Масштабирование
Name[sk]=Škálovať Name[sk]=Škálovať
Name[sv]=Skala Name[sv]=Skala
Name[uk]=Масштабування Name[uk]=Масштабування