Commit 4456e38d 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 f7735f39
......@@ -45,7 +45,7 @@ Comment[en_GB]=Akonadi Management and Debugging Console
Comment[es]=Consola de gestión y depuración de Akonadi
Comment[et]=Akonadi haldamise ja silumise konsool
Comment[fi]=Akonadin hallinta- ja virheenpaikannuskonsoli
Comment[fr]=Console de gestion et de déboguage pour Akonadi
Comment[fr]=Console de gestion et de débogage pour Akonadi
Comment[gl]=Consola de xestión e depuración de Akonadi.
Comment[ia]=Consol de Akonadi pro gestion e cribrar
Comment[it]=Console di gestione e debugging di Akonadi
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