Commit 71f8cbed 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 60f06e47
......@@ -9,6 +9,7 @@ Name[es]=Calculadora
Name[eu]=Kalkulagailua
Name[fi]=Laskin
Name[fr]=Calculatrice
Name[hi]=गणक
Name[hu]=Számológép
Name[it]=Calcolatrice
Name[ko]=계산기
......@@ -32,6 +33,7 @@ Comment[es]=Una calculadora en Kirigami.
Comment[eu]=Kirigami-rekin egindako kalkulagailu bat.
Comment[fi]=Kirigamilla toteutettu laskin.
Comment[fr]=Une calculatrice dans Kirigami.
Comment[hi]=किरिगामी में एक गणक।
Comment[hu]=Számológép Kirigamiban.
Comment[it]=Una calcolatrice in Kirigami.
Comment[ko]=Kirigami 기반 계산기입니다.
......
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