Commit a30f92ba 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 d8fe068d
[Icon Theme]
Name=Ikona
Name[ca]=Ikona
Name[nl]=Ikona
Name[pt]=Ikona
Name[sk]=Ikona
Name[uk]=Ikona
Name[x-test]=xxIkonaxx
Comment=Ikona internal icon theme
Comment[ca]=Tema d'icones intern de l'Ikona
Comment[nl]=Ikona intern pictogramthema
Comment[pt]=Tema de ícones interno do Ikona
Comment[sk]=Vnútorná téma ikon Ikona
Comment[uk]=Вбудована тема піктограм Ikona
Comment[x-test]=xxIkona internal icon themexx
Hidden=true
Inherits=breeze,hicolor,oxygen
FollowsColorScheme=true
......
[Desktop Entry]
Type=Application
Name=Ikona
Name[ca]=Ikona
Name[nl]=Ikona
Name[pt]=Ikona
Name[sk]=Ikona
Name[uk]=Ikona
Name[x-test]=xxIkonaxx
Exec=ikona
Comment=Utility for viewing Icons
Comment[ca]=Utilitat per a visualitzar icones
Comment[nl]=Hulpprogramma voor het bekijken van pictogrammen
Comment[pt]=Utilitário de visualização de ícones
Comment[sk]=Nástroj na prehliadanie ikon
Comment[uk]=Програма для перегляду піктограм
Comment[x-test]=xxUtility for viewing Iconsxx
Categories=Qt;System;Documentation
GenericName=Icon Preview Utility
GenericName[ca]=Utilitat per a la vista prèvia de les icones
GenericName[nl]=Hulpprogramma voor voorvertoning van pictogrammen
GenericName[pt]=Utilitário de Antevisão de Ícones
GenericName[sk]=Nástroj na náhľady Ikona
GenericName[uk]=Програма для перегляду піктограм
GenericName[x-test]=xxIcon Preview Utilityxx
MimeType=image/svg+xml
Icon=org.kde.Ikona
\ No newline at end of file
Icon=org.kde.Ikona
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