Commit ac477f63 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 ef9c27b5
......@@ -5,7 +5,7 @@ X-KDE-Library=highpass
Name=Highpass Filter
Name[ca]=Filtre passaalt
Name[ca@valencia]=Filtre passa-alt
Name[ca@valencia]=Filtre passaalt
Name[cs]=Filtr s horní propustí
Name[en_GB]=Highpass Filter
......@@ -23,7 +23,7 @@ Name[zh_CN]=高通滤镜
Comment=Highpass Filter, based on
Comment[ca]=Filtre passaalt, basat en el
Comment[ca@valencia]=Filtre passa-alt, basat en el
Comment[ca@valencia]=Filtre passaalt, basat en el
Comment[cs]=Filtr s horní propustí založený na
Comment[en_GB]=Highpass Filter, based on
Comment[es]=Filtro paso alto, basado en
......@@ -6,14 +6,18 @@ X-Python-2-Compatible=false
Name=Krita Script Starter
Name[ca]=Iniciador de scripts del Krita
Name[ca@valencia]=Iniciador de scripts del Krita
Name[cs]=Spouštěč skriptů Krita
Name[nl]=Script-starter van Krita
Name[pt]=Introdução ao Programa do Krita
Name[uk]=Створення скрипту Krita
Name[x-test]=xxKrita Script Starterxx
Name[zh_CN]=Krita 空脚本生成器
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[ca@valencia]=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 estrutura de ficheiros de um novo programa do Krita
Comment[uk]=Створення метаданих і структури файлів для нового скрипту Krita
Comment[x-test]=xxCreate the metadata and file structure for a new Krita scriptxx
Comment[zh_CN]=给一个新 Krita 脚本创建元数据及文件结构
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