[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegames
From: Rex Dieter <rdieter () math ! unl ! edu>
Date: 2010-11-11 21:50:02
Message-ID: 20101111215002.9C8EFAC89E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1195738 by rdieter:
Rename games that have active trademarks (KTron, KBattleship) per
http://svn.reviewboard.kde.org/r/5804/
M +9 -3 README
M +16 -15 doc/kbattleship/index.docbook
M +6 -3 doc/ktron/index.docbook
M +2 -2 kbattleship/src/kbattleship.desktop
M +1 -1 kbattleship/src/kbattleship.protocol
M +3 -3 kbattleship/src/main.cpp
M +1 -1 kbattleship/src/message.cpp
M +1 -1 kbattleship/src/playfield.cpp
M +2 -2 ktron/general.ui
M +1 -2 ktron/ktron.desktop
M +1 -2 ktron/main.cpp
M +1 -1 ktron/player.cpp
M +2 -2 ktron/themes/default.desktop
M +2 -2 ktron/themes/neon.desktop
--- trunk/KDE/kdegames/README #1195737:1195738
@@ -31,9 +31,6 @@
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!
@@ -76,6 +73,12 @@
* kshisen
Patience game where you take away all pieces.
+* ksnake
+ Don't bite yourself, eat apples!
+
+* ksnakeduel
+ Like ksnake, but without fruits.
+
* kspaceduel
Two player game with shooting spaceships flying around a sun.
@@ -101,6 +104,9 @@
* lskat
Lieutnant skat.
+* naval battle
+ Sink ships of your opponents, with built-in game server.
+
Debugging
---------
You can use -DCMAKE_BUILD_TYPE=debugfull with the cmake command script, if you
--- trunk/KDE/kdegames/doc/kbattleship/index.docbook #1195737:1195738
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kappname "&kbattleship;">
+ <!ENTITY kappname "<application>Naval Battle</application>">
<!ENTITY package "kdegames">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -8,7 +8,7 @@
<book lang="&language;">
<bookinfo>
-<title>The &kbattleship; Handbook</title>
+<title>The &kappname; Handbook</title>
<authorgroup>
<author>
@@ -57,7 +57,7 @@
<abstract>
<para>
-&kbattleship; is a network-enabled implementation of the famous <quote>Battle Ship</quote> game for \
&kde;.</para> +&kappname; is a network-enabled implementation of the famous ship sinking game for \
&kde;.</para> </abstract>
<keywordset>
@@ -67,6 +67,7 @@
<keyword>game</keyword>
<keyword>battleship</keyword>
<keyword>battle</keyword>
+<keyword>naval</keyword>
</keywordset>
</bookinfo>
@@ -76,7 +77,7 @@
<note><title>Gametype:</title><para>Strategy, Board</para></note><!-- Game genre. Use as many as \
necessary. Available game types are: Arcade, Board, Card, Dice, Toys, Logic, Strategy.--> \
<note><title>Number of possible players:</title><para>Two</para></note><!--Number of possible players. It \
can be: One, Two,..., Multiplayer--> <para>
-&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. </para>
</chapter>
@@ -85,14 +86,14 @@
<title>How to Play</title>
<note><title>Objective:</title><para>Sink all of the opponent's ships before the opponent sink all the \
ships of your own.</para></note><!--Describe the objective of the game.--> <para>
-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 <guibutton>Single player</guibutton> \
on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para>
<para>
To start a network game, one player has to host the game by selecting <guilabel>Host network \
game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu> <guimenuitem>Host \
Game...</guimenuitem></menuchoice>. A dialog box opens which asks for a <guilabel>Nickname:</guilabel> \
and <guilabel>Port:</guilabel>. 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.
</para>
@@ -186,10 +187,10 @@
<title>Multiplayer support</title>
<para>
-&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 <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
</para>
@@ -197,7 +198,7 @@
<para>
Remember that when playing online, the opponent might be either a
human player or a computer player. The latter one might behave
-differently from the computer player included in &kbattleship;.
+differently from the computer player included in &kappname;.
</para>
</sect1>
@@ -314,7 +315,7 @@
</term>
<listitem>
<para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
</para>
</listitem>
</varlistentry>
@@ -394,7 +395,7 @@
</term>
<listitem>
<para>
-<action>Configure the keyboard shortcuts used by &kbattleship;.</action>
+<action>Configure the keyboard shortcuts used by &kappname;.</action>
</para>
</listitem>
</varlistentry>
@@ -408,7 +409,7 @@
</term>
<listitem>
<para>
-<action>Configure</action> the toolbars provided by &kbattleship;.
+<action>Configure</action> the toolbars provided by &kappname;.
</para>
</listitem>
</varlistentry>
@@ -437,7 +438,7 @@
</question>
<answer>
<para>
-No, there is no hint system in &kbattleship;.
+No, there is no hint system in &kappname;.
</para>
</answer>
</qandaentry>
@@ -474,7 +475,7 @@
<chapter id="credits">
<title>Credits and Licenses</title>
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
<itemizedlist>
<title>Authors</title>
--- trunk/KDE/kdegames/doc/ktron/index.docbook #1195737:1195738
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kappname "&ktron;">
+ <!ENTITY kappname "<application>KSnakeDuel</application>">
<!ENTITY package "kdegames">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
@@ -61,7 +61,7 @@
<abstract>
<para>
-&kappname; is a simple <quote>Tron</quote> clone for &kde;, which you can
+&kappname; is a simple snake duel game for &kde;, which you can
play alone or against a friend.
</para>
</abstract>
@@ -70,10 +70,13 @@
<keyword>KDE</keyword>
<keyword>kdegames</keyword>
<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
<keyword>game</keyword>
<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
<keyword>KSnake</keyword>
<keyword>snake</keyword>
+<keyword>duel</keyword>
</keywordset>
</bookinfo>
@@ -81,7 +84,7 @@
<title>Introduction</title>
<para>
-&kappname; is a simple Tron-Clone for the
+&kappname; is a simple snake duel game for the
<ulink url="http://www.kde.org">K Desktop Environment</ulink>. 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,
--- trunk/KDE/kdegames/kbattleship/src/kbattleship.desktop #1195737:1195738
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=KBattleship
+Name=Naval Battle
Name[af]=Kbattleship
Name[ast]=KBattleship
Name[be]=Марскі бой
@@ -68,7 +68,7 @@
Icon=kbattleship
Type=Application
X-DocPath=kbattleship/index.html
-GenericName=Battleship Game
+GenericName=Ship Sinking Game
GenericName[ast]=Xuegu de la batalla de naves
GenericName[be]=Гульня ў марскі бой
GenericName[bn]=ব্যাটেলশীপ খেলা
--- trunk/KDE/kdegames/kbattleship/src/kbattleship.protocol #1195737:1195738
@@ -5,7 +5,7 @@
output=none
Icon=kbattleship
-Description=A protocol for the game KBattleship
+Description=A protocol for the game Naval Battle
Description[ast]=Un protocolu pal xuegu KBattleship
Description[ca]=Un protocol pel joc KBattleship
Description[ca@valencia]=Un protocol pel joc KBattleship
--- trunk/KDE/kdegames/kbattleship/src/main.cpp #1195737:1195738
@@ -21,8 +21,8 @@
int main(int argc, char** argv)
{
- KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0",
- ki18n("The KDE Battleship clone"), KAboutData::License_GPL,
+ KAboutData aboutData("kbattleship", 0, ki18n("Naval Battle"), "2.0",
+ ki18n("The KDE ship sinking game"), 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 @@
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 Naval Battle game server to connect to after startup"));
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app;
KGlobal::locale()->insertCatalog( QLatin1String( "libkdegames" ));
--- trunk/KDE/kdegames/kbattleship/src/message.cpp #1195737:1195738
@@ -24,7 +24,7 @@
: m_protocol_version("0.1.0")
, m_client_name("KBattleship")
, m_client_version("4.0")
-, m_client_description("The KDE Battleship clone")
+, m_client_description("The Naval Battle game")
{
}
--- trunk/KDE/kdegames/kbattleship/src/playfield.cpp #1195737:1195738
@@ -251,7 +251,7 @@
void PlayField::setCompatibility(int level)
{
if (level == Entity::COMPAT_KBS3) {
- KMessageBox::information(this, i18n("Your opponent is using a pre-KDE4 version of KBattleship. \
Note that, according to the rules enforced by old clients, ships cannot be placed adjacent to one \
another.")); + KMessageBox::information(this, i18n("Your opponent is using a pre-KDE4 version of \
Naval Battle. Note that, according to the rules enforced by old clients, ships cannot be placed adjacent \
to one another.")); }
}
--- trunk/KDE/kdegames/ktron/general.ui #1195737:1195738
@@ -39,12 +39,12 @@
<widget class="KComboBox" name="kcfg_GameType">
<item>
<property name="text">
- <string>KTron: Player vs Computer</string>
+ <string>KSnakeDuel: Player vs Computer</string>
</property>
</item>
<item>
<property name="text">
- <string>KTron: Player vs Player</string>
+ <string>KSnakeDuel: Player vs Player</string>
</property>
</item>
<item>
--- trunk/KDE/kdegames/ktron/ktron.desktop #1195737:1195738
@@ -3,7 +3,6 @@
Exec=ktron -caption "%c" %i
Icon=ktron
DocPath=ktron/index.html
-GenericName=Tron-like Game
GenericName[ca]=Joc similar al Tron
GenericName[ca@valencia]=Joc similar al Tron
GenericName[cs]=Hra typu Tron
@@ -43,7 +42,7 @@
GenericName[zh_CN]=类似 Tron 的游戏
GenericName[zh_TW]=類似 Tron 遊戲
Terminal=false
-Name=KTron
+Name=KSnakeDuel
Name[af]=Ktron
Name[bn]=কে-ট্রন
Name[br]=KTron
--- trunk/KDE/kdegames/ktron/main.cpp #1195737:1195738
@@ -41,7 +41,7 @@
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,6 @@
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineOptions options;
- options.add("ktron", ki18n("Start in KTron mode"));
options.add("snake", ki18n("Start in KSnake mode"));
KCmdLineArgs::addCmdLineOptions(options);
--- trunk/KDE/kdegames/ktron/player.cpp #1195737:1195738
@@ -92,7 +92,7 @@
{
if (isComputer())
{
- return i18n("KTron");
+ return i18n("KSnakeDuel");
}
else
{
--- trunk/KDE/kdegames/ktron/themes/default.desktop #1195737:1195738
@@ -1,6 +1,6 @@
[KGameTheme]
VersionFormat=1
-Name=KTron Default Theme
+Name=Default Theme
Name[ca]=Tema predeterminat del KTron
Name[ca@valencia]=Tema predeterminat del KTron
Name[da]=KTron standardtema
@@ -39,7 +39,7 @@
Name[x-test]=xxKTron Default Themexx
Name[zh_CN]=KTron 默认主题
Name[zh_TW]=KTron 的 設主題
-Description=Default theme for KTron.
+Description=Default theme.
Description[ca]=Tema predeterminat pel KTron.
Description[ca@valencia]=Tema predeterminat pel KTron.
Description[da]=Standardtema for KTron
--- trunk/KDE/kdegames/ktron/themes/neon.desktop #1195737:1195738
@@ -1,6 +1,6 @@
[KGameTheme]
VersionFormat=1
-Name=Neon K Tron
+Name=Neon
Name[ca]=Neó K Tron
Name[ca@valencia]=Neó K Tron
Name[cs]=Neon K Tron
@@ -39,7 +39,7 @@
Name[x-test]=xxNeon K Tronxx
Name[zh_CN]=Neon K Tron
Name[zh_TW]=Neon K Tron
-Description=A retro KTron theme with a distinctive touch of early 50s.
+Description=A retro theme with a distinctive touch of early 50s.
Description[ca]=Un tema retro pel KTron amb un toc distintiu dels anys 50.
Description[ca@valencia]=Un tema retro pel KTron amb un toc distintiu dels anys 50.
Description[da]=Et retro-tema med et karakteristisk træk fra først i halvtredsere.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic