Commit 861ece43 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 3c8a97a3
......@@ -115,7 +115,7 @@ Comment[es]=Esquema de color de las aplicaciones
Comment[eu]=Aplikazioen kolore-eskema
Comment[fi]=Ohjelmien väriteema
Comment[fr]=Thème de couleur des applications
Comment[gl]=Esquema de cores do programa
Comment[gl]=Esquema de cores do aplicativo
Comment[he]=ערכות צבעים של יישומים
Comment[hu]=Alkalmazások színsémái
Comment[it]=Schema di colore delle applicazioni
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