Commit 918cecff 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 a652b79f
Pipeline #32570 skipped
[Desktop Entry]
Name=Akonadi Console
Name[ar]=معراض أكونادي
Name[az]=Akonadi Konsolu
Name[ca]=Consola de l'Akonadi
Name[ca@valencia]=Consola de l'Akonadi
Name[cs]=Konzole Akonadi
......@@ -41,6 +42,7 @@ Icon=akonadiconsole
Type=Application
Comment=Akonadi Management and Debugging Console
Comment[ar]=معراض لإدارة وتنقيح «أكونادي»
Comment[az]=Akonadi İdarəetmə və Xəta Sazlama Konsolu
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
......
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