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-08-14 05:54:05 +02:00
parent 4a38f15d90
commit af34144f7f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
effects/scale/scale_config.desktop
View file

@ -6,3 +6,9 @@ X-KDE-Library=kwin_scale_config
X-KDE-ParentComponents=scale
Name=Scale
Name[ca]=Escala
Name[eu]=Eskalatu
Name[nl]=Schalen
Name[pt]=Escala
Name[uk]=Масштабування
Name[x-test]=xxScalexx