Commit c21a1c30 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 19c0f6da
......@@ -5,6 +5,7 @@ Name[ca]=Ikona
Name[cs]=Ikona
Name[it]=Ikona
Name[nl]=Ikona
Name[pl]=Ikona
Name[pt]=Ikona
Name[ru]=Ikona
Name[sk]=Ikona
......@@ -17,6 +18,7 @@ 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[pl]=Narzędzie do oglądania ikon
Comment[pt]=Utilitário de visualização de ícones
Comment[sk]=Nástroj na prehliadanie ikon
Comment[sv]=Verktyg för att visa ikoner
......@@ -28,6 +30,7 @@ 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[pl]=Narzędzie do podglądu ikon
GenericName[pt]=Utilitário de Antevisão de Ícones
GenericName[sk]=Nástroj na náhľady Ikona
GenericName[sv]=Ikonförhandsgranskningsverktyg
......
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