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-02-22 10:55:49 +00:00
parent 9eeef2d9ca
commit 53bc6b803b
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/morphingpopups/package/metadata.desktop
View file

@ -2,6 +2,7 @@
Comment=Cross fade animation when Tooltips or Notifications change their geometry
Comment[ca]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seva geometria
Comment[ca@valencia]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seua geometria
Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their geometry
Comment[nl]=Verwissel animatie van opkomen/vervagen wanneer tekstballonnen of meldingen hun geometrie wijzigen
Comment[pl]=Animacja zanikania przy zmianie geometrii wskazówek lub powiadomień
Comment[pt]=Animar o desvanecimento quando as dicas ou notificações mudarem de tamanho
@ -19,6 +20,7 @@ Icon=preferences-system-windows-effect-morphingpopups
Name=Morphing popups
Name[ca]=Missatges emergents en metamorfosi
Name[ca@valencia]=Missatges emergents en metamorfosi
Name[en_GB]=Morphing popups
Name[nl]=Morphing popups
Name[pl]=Morfing elementów wysuwnych
Name[pt]=Mensagens com mudança de forma