Commit b50f1ead 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 eebaf389
......@@ -5,4 +5,16 @@ X-KDE-Library=krita_script_starter
Name=Krita Script Starter
Name[ca]=Iniciador de scripts del Krita
Name[nl]=Script-starter van Krita
Name[pt]=Inicialização do Programa do Krita
Name[sv]=Krita skriptstart
Name[uk]=Створення скрипту Krita
Name[x-test]=xxKrita Script Starterxx
Comment=Create the metadata and file structure for a new Krita script
Comment[ca]=Crea les metadades i l'estructura de fitxers d'un script nou del Krita
Comment[nl]=Maak de metagegevens en bestandsstructuur voor een nieuw Krita-script
Comment[pt]=Cria os meta-dados e a estrutura de ficheiros para um novo programa do Krita
Comment[sv]=Skapa metadata och filstruktur för ett nytt Krita-skript
Comment[uk]=Створення метаданих і структури файлів для нового скрипту Krita
Comment[x-test]=xxCreate the metadata and file structure for a new Krita scriptxx
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