Commit b9de7f5a 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 c52f505a
Pipeline #29860 skipped
......@@ -5,6 +5,7 @@ Name[ca]=Consola de l'Akonadi
Name[ca@valencia]=Consola de l'Akonadi
Name[cs]=Konzole Akonadi
Name[de]=Akonadi-Konsole
Name[el]=Κονσόλα Akonadi
Name[en_GB]=Akonadi Console
Name[es]=Consola de Akonadi
Name[et]=Akonadi konsool
......@@ -43,6 +44,7 @@ Comment[ca]=Consola de gestió i depuració per a l'Akonadi
Comment[ca@valencia]=Consola de gestió i depuració per a l'Akonadi
Comment[cs]=Správa Akonadi a ladicí konzole
Comment[de]=Akonadi-Konsole zur Verwaltung und Fehlersuche
Comment[el]=Τερματικό διαχείρισης και αποσφαλμάτωσης Akonadi
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
......
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