diff -up kdegames-4.3.0/doc/kbattleship/index.docbook.trademarks kdegames-4.3.0/doc/kbattleship/index.docbook --- kdegames-4.3.0/doc/kbattleship/index.docbook.trademarks 2009-02-26 10:11:22.000000000 +0100 +++ kdegames-4.3.0/doc/kbattleship/index.docbook 2009-07-31 23:01:31.000000000 +0200 @@ -1,6 +1,6 @@ + KSinkShips"> @@ -8,7 +8,7 @@ -The &kbattleship; Handbook +The &kappname; Handbook @@ -57,16 +57,17 @@ -&kbattleship; is a network-enabled implementation of the famous Battle Ship game for &kde;. +&kappname; is a network-enabled implementation of the famous ship sinking game for &kde;. KDE kdegames -kbattleship +ksinkships game -battleship -battle +sinkships +sink +ships @@ -76,7 +77,7 @@ Gametype:Strategy, Board Number of possible players:Two -&kbattleship; is a Battle Ship game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others +&kappname; is a ship sinking game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others ships in turns without knowing where they are placed. The first player to destroy all ships wins the game. @@ -85,14 +86,14 @@ ships in turns without knowing where the How to Play Objective:Sink all of the opponent’s ships before the opponent sink all the ships of your own. -If you want to play &kbattleship;, you will need two players, either play +If you want to play &kappname;, you will need two players, either play against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select Single player on the welcome screen, or directly on the Game menu. To start a network game, one player has to host the game by selecting Host network game on the welcome screen, or choosing Game Host Game.... A dialog box opens which asks for a Nickname: and Port:. Normally, -&kbattleship; will suggest your full name, but you can enter any string +&kappname; will suggest your full name, but you can enter any string you want. The predefined port should be ok. However, if you encounter problems, you can choose any other free port above 1024. @@ -186,10 +187,10 @@ The first player to destroy all their op Multiplayer support -&kbattleship; can be played online on any GGZ Gaming Zone site. You can +&kappname; can be played online on any GGZ Gaming Zone site. You can find other players there, and compete against them. Just enter one -of the available Battleship rooms with any GGZ core client, such as -kggz, and &kbattleship; will be offered to you as your favourite +of the available rooms with any GGZ core client, such as +kggz, and &kappname; will be offered to you as your favourite game client. If a GGZ core client is installed, you can try out GGZ by visiting the community site. @@ -197,7 +198,7 @@ out GGZ by visiting the Credits and Licenses -&kbattleship; Copyright 2000-2007 +&kappname; Copyright 2000-2007 Authors diff -up kdegames-4.3.0/doc/ktron/index.docbook.trademarks kdegames-4.3.0/doc/ktron/index.docbook --- kdegames-4.3.0/doc/ktron/index.docbook.trademarks 2009-02-26 10:11:14.000000000 +0100 +++ kdegames-4.3.0/doc/ktron/index.docbook 2009-07-31 23:01:31.000000000 +0200 @@ -1,6 +1,6 @@ + KSnakeDuel"> @@ -61,7 +61,7 @@ -&kappname; is a simple Tron clone for &kde;, which you can +&kappname; is a simple snake duel game for &kde;, which you can play alone or against a friend. @@ -69,11 +69,12 @@ play alone or against a friend. KDE kdegames -KTron +KSnakeDuel game -tron +snakeduel KSnake snake +duel @@ -81,7 +82,7 @@ play alone or against a friend. Introduction -&kappname; is a simple Tron-Clone for the +&kappname; is a simple snake duel game for the K Desktop Environment. You can play &kappname; against the computer or a friend. The aim of the game is to live longer than your opponent. To do that, diff -up kdegames-4.3.0/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.0/kbattleship/src/kbattleship.desktop --- kdegames-4.3.0/kbattleship/src/kbattleship.desktop.trademarks 2009-07-21 17:20:37.000000000 +0200 +++ kdegames-4.3.0/kbattleship/src/kbattleship.desktop 2009-07-31 23:01:31.000000000 +0200 @@ -1,6 +1,5 @@ [Desktop Entry] -Name=KBattleship -Name[af]=Kbattleship +Name=KSinkShips Name[be]=Марскі бой Name[bn]=কে-ব্যাটেলশীপ Name[cs]=Lodě @@ -14,17 +13,16 @@ Name[pa]=ਕੇ-ਜੰਗੀ ਜਹਾ Name[ro]=Bătălie navală Name[sr]=К‑подморнице Name[sr@latin]=K‑podmornice -Name[sv]=Kbattleship Name[ta]=கேபாட்டில்ஷிப் Name[tg]=KҶанги Киштиҳо Name[uk]=Морський бій -Name[x-test]=xxKBattleshipxx -Name[zh_TW]=KBattleship 戰艦 +Name[x-test]=xxKSinkShipsxx +Name[zh_TW]=KSinkShips 戰艦 Exec=kbattleship -caption "%c" Icon=kbattleship Type=Application X-DocPath=kbattleship/index.html -GenericName=Battleship Game +GenericName=Ship Sinking Game GenericName[be]=Гульня ў марскі бой GenericName[bn]=ব্যাটেলশীপ খেলা GenericName[ca]=Joc d'enfonsar la flota @@ -32,7 +30,6 @@ GenericName[cs]=Bitva lodí GenericName[cy]=Gêm Longau Rhyfel GenericName[da]=Sænke slagskibe-spil GenericName[de]=Schiffe versenken -GenericName[el]=Παιχνίδι Battleship GenericName[eo]=Batalŝipa ludo GenericName[es]=Juego de la batalla de naves GenericName[et]=Laevade pommitamise mäng @@ -40,7 +37,6 @@ GenericName[eu]=Ontzi-guda jokoa GenericName[fa]=بازی جنگ کشتی‌ها GenericName[fi]=Meritaistelupeli GenericName[fr]=Jeu de bataille navale -GenericName[ga]=Cluiche cosúil le "Battleship" GenericName[gl]=Xogo de batalla naval GenericName[he]=משחק צוללות GenericName[hne]=बेटलसिप खेल @@ -74,7 +70,7 @@ GenericName[ta]=போர்த்தள GenericName[tr]=Amiral Battı Oyunu GenericName[uk]=Гра в морський бій GenericName[wa]=Djeu di batreye di bateas -GenericName[x-test]=xxBattleship Gamexx +GenericName[x-test]=xxShip Sinking Gamexx GenericName[zh_CN]=舰艇对战游戏 GenericName[zh_TW]=戰艦遊戲 Terminal=false diff -up kdegames-4.3.0/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.0/kbattleship/src/kbattleship.protocol --- kdegames-4.3.0/kbattleship/src/kbattleship.protocol.trademarks 2009-07-29 13:11:24.000000000 +0200 +++ kdegames-4.3.0/kbattleship/src/kbattleship.protocol 2009-07-31 23:15:48.000000000 +0200 @@ -5,34 +5,34 @@ input=none output=none Icon=kbattleship -Description=A protocol for the game KBattleship -Description[ca]=Un protocol pel joc KBattleship -Description[da]=En protokol for spillet KBattleship -Description[de]=Ein Protokoll für das KBattleship-Spiel. -Description[el]=Ένα πρωτόκολλο για το παιχνίδι KBattleship -Description[es]=Un protocolo para el juego KBattleship -Description[et]=KBattleshipi protokoll -Description[eu]=KBattleship jokoaren protokoloa -Description[fr]=Un protocole pour le jeu KBattleship -Description[ga]=Prótacal le haghaidh an chluiche KBattleship -Description[gl]=Un protocolo para o xogo KBattleship -Description[it]=Un protocollo per KBattleship -Description[km]=ពិធីការ​សម្រាប់​ល្បែង KBattleship -Description[lv]=Protokols spēlei KBattleship -Description[nds]=En Protokoll för dat Speel "KBattleship" -Description[nl]=Een protocol voor het spel KBattleship -Description[nn]=Protokoll for KBattleship -Description[pt]=Um protocolo para o jogo KBattleship -Description[pt_BR]=Um protocolo para o jogo KBattleship -Description[ru]=Протокол для игры KBattleship -Description[sl]=Protokol za igro KBattleship +Description=A protocol for the game KSinkShips +Description[ca]=Un protocol pel joc KSinkShips +Description[da]=En protokol for spillet KSinkShips +Description[de]=Ein Protokoll für das KSinkShips-Spiel. +Description[el]=Ένα πρωτόκολλο για το παιχνίδι KSinkShips +Description[es]=Un protocolo para el juego KSinkShips +Description[et]=KSinkShipsi protokoll +Description[eu]=KSinkShips jokoaren protokoloa +Description[fr]=Un protocole pour le jeu KSinkShips +Description[ga]=Prótacal le haghaidh an chluiche KSinkShips +Description[gl]=Un protocolo para o xogo KSinkShips +Description[it]=Un protocollo per KSinkShips +Description[km]=ពិធីការ​សម្រាប់​ល្បែង KSinkShips +Description[lv]=Protokols spēlei KSinkShips +Description[nds]=En Protokoll för dat Speel "KSinkShips" +Description[nl]=Een protocol voor het spel KSinkShips +Description[nn]=Protokoll for KSinkShips +Description[pt]=Um protocolo para o jogo KSinkShips +Description[pt_BR]=Um protocolo para o jogo KSinkShips +Description[ru]=Протокол для игры KSinkShips +Description[sl]=Protokol za igro KSinkShips Description[sr]=Протокол за К‑подморнице Description[sr@latin]=Protokol za K‑podmornice Description[sv]=Ett protokoll för spelet Sänka fartyg -Description[uk]=Протокол для гри KBattleship -Description[x-test]=xxA protocol for the game KBattleshipxx -Description[zh_CN]=KBattleship 的游戏用协议 -Description[zh_TW]=KBattleship 遊戲使用的協定 +Description[uk]=Протокол для гри KSinkShips +Description[x-test]=xxA protocol for the game KSinkShipsxx +Description[zh_CN]=KSinkShips 的游戏用协议 +Description[zh_TW]=KSinkShips 遊戲使用的協定 #exec=kbattleship %u helper=true diff -up kdegames-4.3.0/kbattleship/src/main.cpp.trademarks kdegames-4.3.0/kbattleship/src/main.cpp --- kdegames-4.3.0/kbattleship/src/main.cpp.trademarks 2009-03-18 10:57:42.000000000 +0100 +++ kdegames-4.3.0/kbattleship/src/main.cpp 2009-07-31 23:01:31.000000000 +0200 @@ -21,7 +21,7 @@ int main(int argc, char** argv) { - KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", + KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", ki18n("The KDE Battleship clone"), KAboutData::License_GPL, ki18n("(c) 2000-2005 Nikolas Zimmermann, Daniel Molkentin\n" "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" ); @@ -48,7 +48,7 @@ int main(int argc, char** argv) KCmdLineArgs::init(argc, argv, &aboutData); KCmdLineOptions options; - options.add("!+[URL]", ki18n("URL of a KBattleship game server to connect to after startup")); + options.add("!+[URL]", ki18n("URL of a KSinkShips game server to connect to after startup")); KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; diff -up kdegames-4.3.0/ktron/main.cpp.trademarks kdegames-4.3.0/ktron/main.cpp --- kdegames-4.3.0/ktron/main.cpp.trademarks 2009-02-26 10:11:10.000000000 +0100 +++ kdegames-4.3.0/ktron/main.cpp 2009-07-31 23:01:31.000000000 +0200 @@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n(" int main(int argc, char* argv[]) { - KAboutData aboutData( "ktron", 0, ki18n("KTron"), + KAboutData aboutData( "ktron", 0, ki18n("KSnakeDuel"), KTRON_VERSION, description, KAboutData::License_GPL, notice); aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer@gmx.de"); aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron@meyerhome.net"); @@ -50,7 +50,8 @@ int main(int argc, char* argv[]) KCmdLineArgs::init( argc, argv, &aboutData ); KCmdLineOptions options; - options.add("ktron", ki18n("Start in KTron mode")); + // This is the default anyway, why does this need an option? -- Kevin Kofler + // options.add("ktron", ki18n("Start in KTron mode")); options.add("snake", ki18n("Start in KSnake mode")); KCmdLineArgs::addCmdLineOptions(options); diff -up kdegames-4.3.0/ktron/player.cpp.trademarks kdegames-4.3.0/ktron/player.cpp --- kdegames-4.3.0/ktron/player.cpp.trademarks 2009-04-05 21:59:49.000000000 +0200 +++ kdegames-4.3.0/ktron/player.cpp 2009-07-31 23:01:31.000000000 +0200 @@ -92,7 +92,7 @@ QString Player::getName() { if (isComputer()) { - return i18n("KTron"); + return i18n("KSnakeDuel"); } else { diff -up kdegames-4.3.0/README.trademarks kdegames-4.3.0/README --- kdegames-4.3.0/README.trademarks 2009-01-16 16:09:32.000000000 +0100 +++ kdegames-4.3.0/README 2009-07-31 23:01:31.000000000 +0200 @@ -25,9 +25,6 @@ This is a compilation of more than 20 va Play backgammon against a local human player, via a game server or against GNU Backgammon (not included) -* kbattleship - Sink battleship of your opponents, with built-in game server. - * kblackbox Find the balls hidden in the black box by shooting laser beams! @@ -70,6 +67,15 @@ This is a compilation of more than 20 va * kshisen Patience game where you take away all pieces. +* ksinkships + Sink ships of your opponents, with built-in game server. + +* ksnake + Don't bite yourself, eat apples! + +* ksnakeduel + Like ksnake, but without fruits. + * kspaceduel Two player game with shooting spaceships flying around a sun.