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-19 09:28:04 +00:00
parent cb3c6a4780
commit 7ac1b02d15
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,18 @@
[Desktop Entry] [Desktop Entry]
Comment=Cross fade animation when Tooltips or Notifications change their geometry 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[pt]=Animar o desvanecimento quando as dicas ou notificações mudarem de tamanho
Comment[sv]=Övertona animering när verktygstips eller underrättelser ändrar storlek
Comment[uk]=Анімація зі зміною освітленості під час зміни геометрії панелей підказок і сповіщень
Comment[x-test]=xxCross fade animation when Tooltips or Notifications change their geometryxx
Encoding=UTF-8 Encoding=UTF-8
Icon=preferences-system-windows-effect-morphingpopups Icon=preferences-system-windows-effect-morphingpopups
Name=Morphing popups Name=Morphing popups
Name[ca]=Missatges emergents en metamorfosi
Name[pt]=Mensagens com mudança de forma
Name[sv]=Föränderliga meddelanderutor
Name[uk]=Аморфні контекстні панелі
Name[x-test]=xxMorphing popupsxx
Type=Service Type=Service
X-KDE-ParentApp= X-KDE-ParentApp=
X-KDE-PluginInfo-Author=Marco Martin X-KDE-PluginInfo-Author=Marco Martin