Commit cd2c190b 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 8749142d
......@@ -129,6 +129,7 @@ Comment[da]=Kabale kortspil
Comment[de]=Solitär-Kartenspiel
Comment[en_GB]=Solitaire card game
Comment[es]=Juego de cartas solitario
Comment[et]=Solitaire kaardimäng
Comment[eu]=Bakarkako karta-jokoa
Comment[fi]=Pasianssikorttipeli
Comment[fr]=Jeu de solitaire
......
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