Commit ae478fd5 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 d94f3feb
......@@ -23,6 +23,7 @@ Name[es]=Estándar
Name[et]=Standardne
Name[fr]=Standard
Name[ga]=Caighdeánach
Name[gl]=Estándar
Name[hu]=Standard
Name[km]=ស្តង់ដារ
Name[mr]=प्रमाणित
......
......@@ -7,6 +7,7 @@ Name[de]=Zeichenketten
Name[es]=Cadenas
Name[et]=Stringid
Name[fr]=Chaîne de caractères
Name[gl]=Cadeas
Name[hu]=Sztringek
Name[km]=ឃ្លា
Name[mr]=स्ट्रिंग्स
......
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