Commit bdfdc1f6 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 6ee416c0
[Desktop Entry]
Name=PIM Setting Exporter
Name[ar]=مصدّر إعدادات PIM
Name[ast]=Esportador d'axustes PIM
Name[bs]=Izvoženje PIM postavki
Name[ca]=Exportador de la configuració PIM
......@@ -47,6 +48,7 @@ Exec=pimsettingexporter
Type=Application
Icon=kontact
Comment=PIM Setting Exporter allows to save all data from PIM apps and restore them in other system.
Comment[ar]=يتيح لك «مصدّر إعدادات PIM» حفظ كلّ البيانات من تطبيقات PIM واسترجاعها في الأنظمة الأخرى.
Comment[bs]=PIM izvoznik postavki vam omogućava da spremite sve podatke iz PIM aplikacija i vratite ih u drugi sistem.
Comment[ca]=L'exportador de la configuració PIM permet desar totes les dades de les aplicacions PIM i restaura-les en un altre sistema.
Comment[ca@valencia]=L'exportador de la configuració PIM permet guardar totes les dades de les aplicacions PIM i restaura-les en un altre sistema.
......
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