Commit b30a3a82 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 c5c51cdc
Pipeline #246957 skipped
......@@ -74,7 +74,7 @@ Description[ga]=Úsáid an dath réamhshocraithe do chúlra fuinneog.
Description[gl]=Empregar a cor de fondo predeterminada da xanela.
Description[hi]=पूर्वन्यस्त विंडो पृष्ठभूमि रंग का प्रयोग करें।
Description[hu]=Használja az alapértelmezett ablak hátterét.
Description[id]=Gunakan warna latarbelakang window baku.
Description[id]=Gunakan warna latarbelakang jendela baku.
Description[it]=Usa il colore predefinito per lo sfondo della finestra.
Description[kk]=Әдетті терезе аясының түсін қолдану
Description[km]=ប្រើ​ពណ៌​ផ្ទៃ​ខាង​ក្រោយ​បង្អួច​លំនាំ​ដើម ។
......
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