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-04 05:56:51 +02:00
parent 1c6927f64f
commit d6e4096d76
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/showpaint/showpaint_config.desktop
View file

@ -48,8 +48,10 @@ Name[nl]=Intekening tonen
Name[pa]=ਪੇਂਟ ਵੇਖੋ
Name[pl]=Pokaż rysowane
Name[pt]=Mostrar a Pintura
Name[pt_BR]=Mostrar pintura
Name[ro]=Afișează desenele
Name[ru]=Подсвечивать отрисовку
Name[se]=Čájet málema
Name[si]=ඇඳීම් පෙන්වන්න
Name[sk]=Zobraziť kresbu
Name[sl]=Izrisovanje

1
packageplugins/effect/kwin-packagestructure-effect.desktop
View file

@ -6,6 +6,7 @@ Name[es]=Efecto de KWin
Name[it]=Effetto di KWin
Name[nl]=KWin-effect
Name[pt]=Efeito do KWin
Name[pt_BR]=Efeito do KWin
Name[sv]=Kwin-effekt
Name[uk]=Ефект KWin
Name[x-test]=xxKWin Effectxx