Commit faf02ba7 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 da048c27
......@@ -86,6 +86,7 @@ Name[de]=Öffnet eine Sitzung
Name[el]=Άνοιγμα συνεδρίας
Name[en_GB]=Open a Session
Name[es]=Abrir una sesión
Name[et]=Seansi avamine
Name[fr]=Ouvrir une session
Name[gl]=Abrir unha sesión
Name[it]=Apri una sessione
......
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