Commit 3aeb0778 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 eb9e8a8f
......@@ -109,6 +109,7 @@ GenericName[nn]=Mahjongg-brettspel frå Kina
GenericName[pl]=Gra przy użyciu Mahjong z Chin
GenericName[pt]=Jogo de peças de Mahjong da China
GenericName[pt_BR]=Jogo de peças Mahjong da China
GenericName[ru]=Китайская игра маджонг
GenericName[sk]=Mahjong, dlaždicová hra z Číny
GenericName[sl]=Mahjong namizna kitajska igra
GenericName[sv]=Mahjong-brickspel från Kina
......
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