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 2017-06-04 05:39:14 +02:00
parent c5861b99eb
commit 85ede03a57
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/fade/package/metadata.desktop
View file

@ -50,7 +50,7 @@ Name[ne]=फेड
Name[nl]=Opkomen/vervagen
Name[nn]=Ton inn og ut
Name[pa]=ਫਿੱਕਾ
Name[pl]=Znikanie/wyłanianie
Name[pl]=Zanikanie/wyłanianie
Name[pt]=Desvanecer
Name[pt_BR]=Fade
Name[ro]=Decolorare

2
effects/maximize/package/metadata.desktop
View file

@ -27,7 +27,7 @@ Comment[nb]=Animering for et vindu som maksimeres/tilbakestilles fra maksimering
Comment[nds]=Animeren för en Finster, dat maximeert/vun maximeert wedderherstellt warrt
Comment[nl]=Animatie voor een venster dat gaat naar maximaliseren/herstellen vanuit maximaliseren
Comment[nn]=Vindaugsanimasjon i samband med bruk av maksimering/gjenoppretting.
Comment[pl]=Efekt skalowania okien przy ich maksymalizowaniu i powrocie z niego
Comment[pl]=Efekt skalowania okien przy maksymalizowaniu i powrocie z niego
Comment[pt]=Animação para um janela que se vai maximizar/repor da maximização
Comment[pt_BR]=Animação para uma janela a ser maximizada/restaurada
Comment[ro]=Animație pentru o fereastră ce trece la maximizare/restabilire din maximizare