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-12-02 05:29:39 +01:00
parent 37060a6dd9
commit 64cf1afa9f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@ Name[ca@valencia]=Missatges emergents esvaïts
Name[fi]=Hiipuvat ponnahdusikkunat
Name[gl]=Xanelas emerxentes que esvaen
Name[id]=Fading Popups
Name[it]=Finestre a comparsa che si dissolvono
Name[nl]=Vervagende pop-ups
Name[nn]=Inn- og uttoning av sprettoppvindauge
Name[pt]=Mensagens Desvanecentes
@ -19,6 +20,7 @@ Comment[ca@valencia]=Fa que els missatges emergents s'encenguin o s'apaguin de m
Comment[fi]=Ponnahdusikkunat tulevat näkyviin tai poistuvat näkyvistä pehmeästi häivyttäen
Comment[gl]=Esvae e fai opacas as xanelas emerxentes con suavidade ao mostralas ou agochadas
Comment[id]=Buat sembulan secara halus lesap-masuk dan lesap-keluar ketika ia ditampilkan atau disembunyikan
Comment[it]=Fai dissolvere e comparire gradualmente le finestre a comparsa quando vengono mostrate o nascoste
Comment[nl]=Laat pop-ups vloeiend opkomen/vervagen als ze worden weergegeven of verborgen
Comment[nn]=Ton sprettoppvindauge gradvis inn og ut når dei vert viste eller gøymde
Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas