Commit bf2faaeb 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 f1dec109
......@@ -3,6 +3,7 @@ Name=Facebook Events
Name[ca]=Esdeveniments de Facebook
Name[ca@valencia]=Esdeveniments de Facebook
Name[es]=Eventos de Facebook
Name[fr]=Évènements Facebook
Name[it]=Eventi di Facebook
Name[pt]=Eventos do Facebook
......@@ -17,6 +18,7 @@ Comment=Access your Facebook events from KDE
Comment[ca]=Accediu als esdeveniments de Facebook des del KDE
Comment[ca@valencia]=Accediu als esdeveniments de Facebook des del KDE
Comment[es]=Acceda a sus eventos de Facebook desde KDE
Comment[fr]=Accès à vos évènements Facebook depuis KDE
Comment[it]=Accedi ai tuoi eventi di Facebook da KDE
Comment[nl]=Heb toegang tot uw Facebook gebeurtenissen vanuit KDE
Comment[pt]=Aceda aos seus eventos do Facebook a partir do KDE
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