Commit 6402aeef authored by Script Kiddy's avatar Script Kiddy
Browse files

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 38ff9810
{
"KPlugin": {
"Description": "Watch for messages from local users sent with write(1) or wall(1)",
"Description[ca]": "Vigila els missatges dels usuaris locals enviats amb write(1) o wall(1)",
"Description[es]": "Esperar mensajes de usuarios locales enviados con write(1) o wall(1)",
"Description[nl]": "Observeer berichten van lokale gebruikers verzonden met write(1) of wall(1)",
"Description[pt]": "Vigia as mensagens dos utilizadores locais enviadas com o write(1) ou o wall(1)",
"Description[pt_BR]": "Monitora as mensagens dos usuários locais, enviadas com o write(1) ou o wall(1)",
"Description[uk]": "Спостереження за  повідомленнями від локальних користувачів, відісланих через write(1) або wall(1)",
"Description[x-test]": "xxWatch for messages from local users sent with write(1) or wall(1)xx",
"Name": "Write Daemon",
"Name[ca]": "Dimoni d'escriptura",
"Name[es]": "Demonio de «write»",
"Name[nl]": "Write-daemon",
"Name[pt]": "Servidor do Write",
"Name[pt_BR]": "Servidor do Write",
"Name[uk]": "Фонова служба запису",
"Name[x-test]": "xxWrite Daemonxx",
"ServiceTypes": [
"KDEDModule"
]
......
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