Commit ea1b6b94 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent ea762c25
[Desktop Entry]
Name=Facebook Events
Name[ca]=Esdeveniments de Facebook
Name[nl]=Facebookgebeurtenissen
Name[pt]=Eventos do Facebook
Name[sv]=Facebook-händelser
Name[uk]=Події Facebook
Name[x-test]=xxFacebook Eventsxx
Comment=Access your Facebook events from KDE
Comment[ca]=Accediu als esdeveniments de Facebook des del KDE
Comment[nl]=Heb toegang tot uw Facebook gebeurtenissen vanuit KDE
Comment[pt]=Aceda aos seus eventos do Facebook a partir do KDE
Comment[sv]=Kom åt Facebook-händelser från KDE
Comment[uk]=Доступ до ваших записів подій Facebook з KDE
Comment[x-test]=xxAccess your Facebook events from KDExx
Type=AkonadiResource
Exec=akonadi_facebook_resource
X-Akonadi-MimeTypes=text/calendar,application/x-vnd.akonadi.calendar.event
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment