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-03-15 11:53:57 +00:00
parent 5dc6da0bbe
commit 9580cfa746
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
effects/morphingpopups/package/metadata.desktop
View file

@ -5,8 +5,10 @@ Comment[ca@valencia]=Animació d'esvaïment creuat quan els consells d'eines o l
Comment[da]=Crossfade-animation når værktøjstip og bekendtgørelser skifter geometry
Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their geometry
Comment[es]=Animación de transición suave cuando las ayudas emergentes o las notificaciones cambian su geometría
Comment[fi]=Häivytysanimaatio työkaluvihjeiden tai ilmoitusten koon muuttuessa
Comment[it]=Animazione in dissolvenza quando i suggerimenti e le notifiche cambiano la loro geometria
Comment[nl]=Verwissel animatie van opkomen/vervagen wanneer tekstballonnen of meldingen hun geometrie wijzigen
Comment[nn]=Krysstoningsanimasjon når hjelpebobler eller varslingar endrar form
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
Comment[pt_BR]=Animar a transição suave quando as dicas ou notificações mudarem de tamanho
@ -28,8 +30,10 @@ Name[ca@valencia]=Missatges emergents en metamorfosi
Name[da]=Sammensmeltende pop-op'er
Name[en_GB]=Morphing popups
Name[es]=Transformación de ventanas emergentes
Name[fi]=Ponnahdusikkunoiden muodonmuutos
Name[it]=Finestre a comparsa che si trasformano
Name[nl]=Morphing popups
Name[nn]=Formendring for sprettoppvindauge
Name[pl]=Morfing elementów wysuwnych
Name[pt]=Mensagens com mudança de forma
Name[pt_BR]=Mensagens com mudança de forma