Commit 2fa92a18 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 17afc0b2
...@@ -18,7 +18,7 @@ Name[es]=KIPIPlugin ...@@ -18,7 +18,7 @@ Name[es]=KIPIPlugin
Name[et]=KIPI plugin Name[et]=KIPI plugin
Name[eu]=KIPIPlugin Name[eu]=KIPIPlugin
Name[fi]=KIPIPlugin Name[fi]=KIPIPlugin
Name[fr]=Module externe KIPI Name[fr]=Module externe « KIPI »
Name[ga]=KIPIPlugin Name[ga]=KIPIPlugin
Name[gl]=KIPIPlugin Name[gl]=KIPIPlugin
Name[hi]=KIPIPlugin Name[hi]=KIPIPlugin
...@@ -78,7 +78,7 @@ Comment[es]=Un complemento para KIPI ...@@ -78,7 +78,7 @@ Comment[es]=Un complemento para KIPI
Comment[et]=KIPI plugin Comment[et]=KIPI plugin
Comment[eu]=KIPI plugina Comment[eu]=KIPI plugina
Comment[fi]=KIPI-liitännäinen Comment[fi]=KIPI-liitännäinen
Comment[fr]=Un module externe KIPI Comment[fr]=Un module externe « KIPI »
Comment[ga]=Breiseán KIPI Comment[ga]=Breiseán KIPI
Comment[gl]=Un complemento de KIPI Comment[gl]=Un complemento de KIPI
Comment[hi]=एक KIPI प्लगइन Comment[hi]=एक KIPI प्लगइन
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