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-11-06 06:01:41 +01:00
parent b6fe7dc115
commit 6ce1152243
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@ Icon=preferences-system-windows-effect-scale
Comment=Make windows smoothly scale in and out when they are shown or hidden
Comment[ca]=Fa que les finestres entrin o surtin volant quan es mostren o s'oculten
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[gl]=Facer que as xanelas crezan ou decrezan suavemente cando se mostran ou agochan
Comment[id]=Buat jendela menskala besar atau kecil secara mulus ketika ia ditampilkan atau disembunyikan
Comment[nl]=Laat vensters vloeiend kleiner en groter schalen als ze worden getoond of verborgen