Commit d9b58c94 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 63db815b
......@@ -51,6 +51,9 @@ Name[zh_TW]=埃及式
Description=An Egyptian style theme for Kolor Lines.
Description[ca]=Un tema d'estil egipci per al Kolor Lines.
Description[cs]=Motiv pro Kolor Lines v egyptském stylu.
Description[nl]=Thema in Egyptische stijl voor Kolor Lines.
Description[pt]=Um tema de estilo Egípcio para o Kolor Lines.
Description[sl]=Egipčanska tema sloga za Kolor Lines.
Description[sv]=Tema med egyptisk stil för Färglinjer.
Description[uk]=Тема у єгипетському стилі для «Кольорових ліній».
Description[x-test]=xxAn Egyptian style theme for Kolor Lines.xx
......
Supports Markdown
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