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 2016-12-05 05:13:10 +01:00
parent ae5df024b1
commit 23e500a273
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/cube/cubeslide_config.desktop
View file

@ -50,7 +50,7 @@ Name[nds]=Animeert Wörpel-Schriefdisch
Name[nl]=Animatie met bureaubladkubus
Name[nn]=Kubeskifte av skrivebord
Name[pa]=ਡੈਸਕਟਾਪ ਘਣ ਐਨੀਮੇਸ਼ਨ
Name[pl]=Animacja sześcianu pulpitu
Name[pl]=Animacja sześcianu pulpitów
Name[pt]=Animação do Cubo de Ecrãs
Name[pt_BR]=Animação do cubo de áreas de trabalho
Name[ro]=Animație Cub de birou

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

@ -110,7 +110,7 @@ Comment[nds]=Bi't Wesseln de Schriefdischen överenanner blennen
Comment[nl]=Laat virtuele bureaubladen vervagen en opkomen bij het wisselen
Comment[nn]=Ton inn og ut ved veksling mellom virtuelle skrivebord
Comment[pa]=ਜਦੋਂ ਵੁਰਚੁਅਲ ਡੈਸਕਟਾਪ ਵਿੱਚ ਬਦਲਣਾ ਹੋਵੇ ਤਾਂ ਉਹਨਾਂ ਨੂੰ ਫਿੱਕਾ ਕਰੋ
Comment[pl]=Przenikanie wirtualnych pulpitów podczas przełączania między nimi
Comment[pl]=Przenikanie wirtualnych pulpitów przy przełączaniu między nimi
Comment[pt]=Desvanece entre os ecrãs virtuais, ao circular entre eles
Comment[pt_BR]=Desaparece entre as áreas de trabalho virtuais, ao alternar entre elas
Comment[ro]=Estompare între birourile virtuale la comutarea între ele