Commit 691fe619 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 2adf4ad6
......@@ -7,6 +7,7 @@ Name[nl]=Ikona
Name[pt]=Ikona
Name[ru]=Ikona
Name[sk]=Ikona
Name[sv]=Ikona
Name[uk]=Ikona
Name[x-test]=xxIkonaxx
Comment=Ikona internal icon theme
......@@ -15,6 +16,7 @@ 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
Comment[sv]=Ikona internt ikontema
Comment[uk]=Вбудована тема піктограм Ikona
Comment[x-test]=xxIkona internal icon themexx
Hidden=true
......
......@@ -8,6 +8,7 @@ Name[nl]=Ikona
Name[pt]=Ikona
Name[ru]=Ikona
Name[sk]=Ikona
Name[sv]=Ikona
Name[uk]=Ikona
Name[x-test]=xxIkonaxx
Exec=ikona
......@@ -18,6 +19,7 @@ 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
Comment[sv]=Verktyg för att visa ikoner
Comment[uk]=Програма для перегляду піктограм
Comment[x-test]=xxUtility for viewing Iconsxx
Categories=Qt;System;Documentation
......@@ -28,6 +30,7 @@ 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
GenericName[sv]=Ikonförhandsgranskningsverktyg
GenericName[uk]=Програма для перегляду піктограм
GenericName[x-test]=xxIcon Preview Utilityxx
MimeType=image/svg+xml
......
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