[kde-doc-english] [knavalbattle] /: Solved merge conflicts in .desktop file.

[Roney Gomes]

Git commit 760506de583fc72bb6cadc66f631876903193643 by Roney Gomes.
Committed on 22/07/2013 at 03:09.
Pushed by roneygomes into branch 'master'.

Solved merge conflicts in .desktop file.

M  +1    -1    doc/index.docbook
M  +4    -4    src/knavalbattle.desktop

http://commits.kde.org/knavalbattle/760506de583fc72bb6cadc66f631876903193643

diff --cc src/knavalbattle.desktop
index fab3d06,b155356..6444998
--- a/src/knavalbattle.desktop
+++ b/src/knavalbattle.desktop
@@@ -41,11 -41,11 +41,11 @@@ Name[uk]=Морський бі�
  Name[x-test]=xxNaval Battlexx
  Name[zh_CN]=Naval Battle
  Name[zh_TW]=海上戰爭
- Exec=kbattleship -caption %c %U
- MimeType=inode/vnd.kde.service.kbattleship;
- Icon=kbattleship
 -Exec=knavalbattle -caption "%c" %U
++Exec=knavalbattle -caption %c %U
+ MimeType=inode/vnd.kde.service.knavalbattle;
+ Icon=knavalbattle
  Type=Application
- X-DocPath=kbattleship/index.html
+ X-DocPath=knavalbattle/index.html
  GenericName=Ship Sinking Game
  GenericName[bs]=Igra potapanja brodova
  GenericName[ca]=Joc d'enfonsar vaixells