Commit 595cae4c 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 26238c9d
[Icon Theme]
Name=Ikona
Name[ca]=Ikona
Name[cs]=Ikona
Name[it]=Ikona
Name[nl]=Ikona
Name[pt]=Ikona
......
......@@ -2,6 +2,7 @@
Type=Application
Name=Ikona
Name[ca]=Ikona
Name[cs]=Ikona
Name[it]=Ikona
Name[nl]=Ikona
Name[pt]=Ikona
......@@ -12,6 +13,7 @@ Name[x-test]=xxIkonaxx
Exec=ikona
Comment=Utility for viewing Icons
Comment[ca]=Utilitat per a visualitzar icones
Comment[cs]=Nástroj pro prohlížení ikon
Comment[it]=Programma per visualizzare le icone
Comment[nl]=Hulpprogramma voor het bekijken van pictogrammen
Comment[pt]=Utilitário de visualização de ícones
......@@ -21,6 +23,7 @@ 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[cs]=Nástroj pro prohlížení ikon
GenericName[it]=Programma per l'anteprima di icone
GenericName[nl]=Hulpprogramma voor voorvertoning van pictogrammen
GenericName[pt]=Utilitário de Antevisão de Ícones
......
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