Commit 09f5754a 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 f805f699
......@@ -14,6 +14,7 @@ Name[it]=Calcolatrice
Name[ko]=계산기
Name[nl]=Rekenmachine
Name[nn]=Kalkulator
Name[pl]=Kalkulator
Name[pt]=Calculadora
Name[pt_BR]=Calculadora
Name[sk]=Kalkulačka
......@@ -36,6 +37,7 @@ Comment[it]=Una calcolatrice in Kirigami.
Comment[ko]=Kirigami 기반 계산기입니다.
Comment[nl]=Een rekenmachine in Kirigami.
Comment[nn]=Ein kalkulator i Kirigami
Comment[pl]=Kalkulator w Kirigami.
Comment[pt]=Uma calculadora feita com o Kirigami.
Comment[pt_BR]=Uma calculadora feito com o Kirigami.
Comment[sk]=Kalkulačka v 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