Commit dfb43d85 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 b18c39b8
......@@ -3,7 +3,10 @@ Type=Theme
Name=Default Theme (Dark variant)
Name[ca]=Tema predeterminat (variant fosca)
Name[ca@valencia]=Tema predeterminat (variant fosca)
Name[de]=Standard-Design (Dunkle Variante)
Name[el]=Προκαθορισμένο θέμα (Σκοτεινή παραλλαγή)
Name[en_GB]=Default Theme (Dark variant)
Name[es]=Tema predeterminado (Variante oscura)
Name[fr]=Thème par défaut (Variant de « Dark »)
Name[nl]=Standaardthema (donkere variant)
Name[pt]=Tema Predefinido (variante Escura)
......
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