Commit e715c332 authored by Script Kiddy's avatar Script Kiddy

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 10914f73
......@@ -15,6 +15,7 @@ Name[nl]=Standaardthema (donkere variant)
Name[nn]=Standardtema (mørk variant)
Name[pt]=Tema Predefinido (variante Escura)
Name[pt_BR]=Tema padrão (variação escura)
Name[sk]=Predvolená téma (Tmavý variant)
Name[sv]=Standardtema (mörk variant)
Name[uk]=Типова тема (темний варіант)
Name[x-test]=xxDefault Theme (Dark variant)xx
......
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