Commit 795894a9 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 47aa4451
...@@ -6,6 +6,7 @@ Name[cs]=Kalkulačka ...@@ -6,6 +6,7 @@ Name[cs]=Kalkulačka
Name[de]=Rechner Name[de]=Rechner
Name[en_GB]=Calculator Name[en_GB]=Calculator
Name[es]=Calculadora Name[es]=Calculadora
Name[fr]=Calculatrice Name[fr]=Calculatrice
Name[hu]=Számológép Name[hu]=Számológép
Name[it]=Calcolatrice Name[it]=Calcolatrice
...@@ -26,6 +27,7 @@ Comment[cs]=Kalkulačka v Kirigami. ...@@ -26,6 +27,7 @@ Comment[cs]=Kalkulačka v Kirigami.
Comment[de]=Ein Rechner in Krigami. Comment[de]=Ein Rechner in Krigami.
Comment[en_GB]=A Calculator in Kirigami. Comment[en_GB]=A Calculator in Kirigami.
Comment[es]=Una calculadora en Kirigami. Comment[es]=Una calculadora en Kirigami.
Comment[eu]=Kirigami-rekin egindako kalkulagailu bat.
Comment[fr]=Une calculatrice dans Kirigami. Comment[fr]=Une calculatrice dans Kirigami.
Comment[hu]=Számológép Kirigamiban. Comment[hu]=Számológép Kirigamiban.
Comment[it]=Una calcolatrice in Kirigami. Comment[it]=Una calcolatrice in 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