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 2019-01-11 05:41:32 +01:00
parent b55d276994
commit 8f12ba90b9
3 changed files with 5 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

@ -3,6 +3,7 @@ Name=Fading Popups
Name[ca]=Missatges emergents esvaïts
Name[ca@valencia]=Missatges emergents esvaïts
Name[en_GB]=Fading Popups
Name[es]=Desvanecer ventanas emergentes
Name[fi]=Hiipuvat ponnahdusikkunat
Name[gl]=Xanelas emerxentes que esvaen
Name[id]=Fading Popups
@ -22,6 +23,7 @@ Comment=Make popups smoothly fade in and out when they are shown or hidden
Comment[ca]=Fa que els missatges emergents s'encenguin o s'apaguin de manera gradual quan es mostren o s'oculten
Comment[ca@valencia]=Fa que els missatges emergents s'encenguin o s'apaguin de manera gradual quan es mostren o s'oculten
Comment[en_GB]=Make popups smoothly fade in and out when they are shown or hidden
Comment[es]=Hace que las ventanas emergentes aparezcan o se desvanezcan suavemente al mostrarlas u ocultarlas
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

1
effects/scale/package/metadata.desktop
View file

@ -34,6 +34,7 @@ Comment[ca]=Fa que les finestres entrin o surtin volant quan es mostren o s'ocul
Comment[ca@valencia]=Fa que les finestres entrin o isquen volant quan es mostren o s'oculten
Comment[de]=Ändert die Fenstergröße langsam beim Ein- oder Ausblenden
Comment[en_GB]=Make windows smoothly scale in and out when they are shown or hidden
Comment[es]=Hace que las ventanas se agranden o se encojan suavemente al mostrarlas u ocultarlas
Comment[fi]=Ikkunat ilmestyvät näkyviin tai poistuvat näkyvistä hiljalleen
Comment[gl]=Facer que as xanelas crezan ou decrezan suavemente cando se mostran ou agochan
Comment[id]=Buat window menskala besar atau kecil secara mulus ketika ia ditampilkan atau disembunyikan

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

@ -3,6 +3,7 @@ Comment=Squash windows when they are minimized
Comment[ca]=Amuntega les finestres quan estan minimitzades
Comment[ca@valencia]=Amuntega les finestres quan estan minimitzades
Comment[en_GB]=Squash windows when they are minimised
Comment[es]=Aplastar las ventanas al minimizarlas
Comment[fi]=Litistä ikkunat, kun ne pienennetään
Comment[gl]=Xuntar as xanelas cando estean minimizadas
Comment[id]=Sesakkan window ketika mereka diminimalkan
@ -22,6 +23,7 @@ Name=Squash
Name[ca]=Amuntega
Name[ca@valencia]=Amuntega
Name[en_GB]=Squash
Name[es]=Aplastar
Name[fi]=Litistä
Name[gl]=Xuntar
Name[id]=Squash