Commit 9e190fc0 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 26b874dc
[Icon Theme]
Name=Ikona
Name[ca]=Ikona
Name[it]=Ikona
Name[nl]=Ikona
Name[pt]=Ikona
Name[ru]=Ikona
......@@ -9,6 +10,7 @@ Name[uk]=Ikona
Name[x-test]=xxIkonaxx
Comment=Ikona internal icon theme
Comment[ca]=Tema d'icones intern de l'Ikona
Comment[it]=Tema di icone interno di Ikona
Comment[nl]=Ikona intern pictogramthema
Comment[pt]=Tema de ícones interno do Ikona
Comment[sk]=Vnútorná téma ikon Ikona
......
......@@ -2,6 +2,7 @@
Type=Application
Name=Ikona
Name[ca]=Ikona
Name[it]=Ikona
Name[nl]=Ikona
Name[pt]=Ikona
Name[ru]=Ikona
......@@ -11,6 +12,7 @@ Name[x-test]=xxIkonaxx
Exec=ikona
Comment=Utility for viewing Icons
Comment[ca]=Utilitat per a visualitzar icones
Comment[it]=Programma per visualizzare le icone
Comment[nl]=Hulpprogramma voor het bekijken van pictogrammen
Comment[pt]=Utilitário de visualização de ícones
Comment[sk]=Nástroj na prehliadanie ikon
......@@ -19,6 +21,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[it]=Programma per l'anteprima di icone
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
......
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