Commit 34ddd2fe 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 478bd44b
......@@ -4,6 +4,7 @@ Exec=khangman -caption %c %i
Icon=khangman
X-DocPath=khangman/index.html
Comment=KDE Hangman Game
Comment[ast]=Xuegu del aforcáu de KDE
Comment[be]=Гульня "Віселіца" для KDE
Comment[bg]=Игра на бесеница
Comment[bn]=কে.ডি.ই. উপস্থাপিত হ্যাংম্যান খেলা
......@@ -65,6 +66,7 @@ Comment[zh_CN]=KDE 吊颈人游戏
Comment[zh_TW]=KDE 劊子手(hangman)遊戲
GenericName=Hangman Game
GenericName[af]=Hangman Speletjie
GenericName[ast]=Xuegu del aforcáu
GenericName[be]=Гульня "Віселіца"
GenericName[bg]=Игра на бесеница
GenericName[bn]=হ্যাংম্যান খেলা
......@@ -134,6 +136,7 @@ GenericName[zh_TW]=劊子手(hangman)遊戲
Terminal=false
Name=KHangMan
Name[af]=K-hangman
Name[ast]=KHangMan
Name[be]=KHangMan
Name[bg]=KHangMan
Name[bn]=কে-হ্যাংম্যান
......
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