rpms/kdegames/devel kdegames-4.3.3-trademarks.patch, NONE, 1.1 kdegames.spec, 1.149, 1.150 kdegames-4.3.2-trademarks.patch, 1.2, NONE
Than Ngo
than at fedoraproject.org
Wed Nov 11 11:41:28 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11869
Modified Files:
kdegames.spec
Added Files:
kdegames-4.3.3-trademarks.patch
Removed Files:
kdegames-4.3.2-trademarks.patch
Log Message:
add kdegames-4.3.3-trademarks
kdegames-4.3.3-trademarks.patch:
README | 12 +++-
doc/kbattleship/index.docbook | 37 +++++++-------
doc/ktron/index.docbook | 11 ++--
kbattleship/src/kbattleship.desktop | 88 +++++++++++++++++------------------
kbattleship/src/kbattleship.protocol | 56 +++++++++++-----------
kbattleship/src/main.cpp | 4 -
ktron/ktron.desktop | 87 ++--------------------------------
ktron/main.cpp | 5 +
ktron/player.cpp | 2
9 files changed, 118 insertions(+), 184 deletions(-)
--- NEW FILE kdegames-4.3.3-trademarks.patch ---
diff -up kdegames-4.3.3/doc/kbattleship/index.docbook.trademarks kdegames-4.3.3/doc/kbattleship/index.docbook
--- kdegames-4.3.3/doc/kbattleship/index.docbook.trademarks 2009-02-26 10:11:22.000000000 +0100
+++ kdegames-4.3.3/doc/kbattleship/index.docbook 2009-11-11 12:33:59.000000000 +0100
@@ -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>KSinkShips</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,16 +57,17 @@
<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>
<keyword>KDE</keyword>
<keyword>kdegames</keyword>
-<keyword>kbattleship</keyword>
+<keyword>ksinkships</keyword>
<keyword>game</keyword>
-<keyword>battleship</keyword>
-<keyword>battle</keyword>
+<keyword>sinkships</keyword>
+<keyword>sink</keyword>
+<keyword>ships</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 @@ ships in turns without knowing where the
<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 @@ The first player to destroy all their op
<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 @@ out GGZ by visiting the <ulink url="ggz:
<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 @@ differently from the computer player inc
</term>
<listitem>
<para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
</para>
</listitem>
</varlistentry>
@@ -394,7 +395,7 @@ default is on.
</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 @@ default is on.
</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 @@ I'm not sure where to shoot, can I get a
</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 @@ No, the theme is not changeable.
<chapter id="credits">
<title>Credits and Licenses</title>
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
<itemizedlist>
<title>Authors</title>
diff -up kdegames-4.3.3/doc/ktron/index.docbook.trademarks kdegames-4.3.3/doc/ktron/index.docbook
--- kdegames-4.3.3/doc/ktron/index.docbook.trademarks 2009-02-26 10:11:14.000000000 +0100
+++ kdegames-4.3.3/doc/ktron/index.docbook 2009-11-11 12:33:59.000000000 +0100
@@ -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>
@@ -69,11 +69,12 @@ play alone or against a friend.
<keywordset>
<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 +82,7 @@ play alone or against a friend.
<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,
diff -up kdegames-4.3.3/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.3/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.3/kbattleship/src/kbattleship.desktop.trademarks 2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.3/kbattleship/src/kbattleship.desktop 2009-11-11 12:33:59.000000000 +0100
@@ -1,64 +1,63 @@
[Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=KSinkShips
Name[be]=Марскі бой
Name[bn]=কে-ব্যাটেলশীপ
-Name[br]=KBattleship
-Name[ca]=KBattleship
+Name[br]=KSinkShips
+Name[ca]=KSinkShips
Name[cs]=Lodě
-Name[cy]=KBattleship
-Name[da]=KBattleship
-Name[de]=KBattleship
-Name[el]=KBattleship
-Name[en_GB]=KBattleship
-Name[eo]=KBattleship
-Name[es]=KBattleship
-Name[et]=KBattleship
-Name[eu]=KBattleship
+Name[cy]=KSinkShips
+Name[da]=KSinkShips
+Name[de]=KSinkShips
+Name[el]=KSinkShips
+Name[en_GB]=KSinkShips
+Name[eo]=KSinkShips
+Name[es]=KSinkShips
+Name[et]=KSinkShips
+Name[eu]=KSinkShips
Name[fa]=نبرد کشتیها
-Name[fi]=KBattleship
-Name[fr]=KBattleship
-Name[ga]=KBattleship
-Name[gl]=KBattleship
-Name[he]=KBattleship
+Name[fi]=KSinkShips
+Name[fr]=KSinkShips
+Name[ga]=KSinkShips
+Name[gl]=KSinkShips
+Name[he]=KSinkShips
Name[hne]=के-बैटलसिप
Name[hr]=KPotapanje brodova
-Name[hu]=KBattleship
+Name[hu]=KSinkShips
Name[is]=KSjóorrusta
-Name[it]=KBattleship
-Name[ja]=KBattleship
-Name[km]=KBattleship
-Name[ko]=KBattleship
-Name[lt]=KBattleship
-Name[lv]=KBattleship
-Name[mk]=KBattleship
-Name[nb]=KBattleship
+Name[it]=KSinkShips
+Name[ja]=KSinkShips
+Name[km]=KSinkShips
+Name[ko]=KSinkShips
+Name[lt]=KSinkShips
+Name[lv]=KSinkShips
+Name[mk]=KSinkShips
+Name[nb]=KSinkShips
Name[nds]=Scheep versenken
Name[ne]=केडीई ब्याटलसीप
-Name[nl]=KBattleship
-Name[nn]=KBattleship
+Name[nl]=KSinkShips
+Name[nn]=KSinkShips
Name[pa]=ਕੇ-ਜੰਗੀ ਜਹਾਜ਼
-Name[pl]=KBattleship
-Name[pt]=KBattleship
-Name[pt_BR]=KBattleship
+Name[pl]=KSinkShips
+Name[pt]=KSinkShips
+Name[pt_BR]=KSinkShips
Name[ro]=Bătălie navală
-Name[ru]=KBattleship
-Name[se]=KBattleship
-Name[sk]=KBattleship
-Name[sl]=KBattleship
+Name[ru]=KSinkShips
+Name[se]=KSinkShips
+Name[sk]=KSinkShips
+Name[sl]=KSinkShips
Name[sr]=К‑подморнице
Name[sr at latin]=K‑podmornice
Name[sv]=Kbattleship
Name[ta]=கேபாட்டில்ஷிப்
Name[tg]=KҶанги Киштиҳо
-Name[tr]=KBattleship
+Name[tr]=KSinkShips
Name[uk]=Морський бій
-Name[vi]=KBattleship
-Name[wa]=KBattleship
-Name[xh]=KBattleship
-Name[x-test]=xxKBattleshipxx
-Name[zh_CN]=KBattleship
-Name[zh_TW]=KBattleship 戰艦
+Name[vi]=KSinkShips
+Name[wa]=KSinkShips
+Name[xh]=KSinkShips
+Name[x-test]=xxKSinkShipsxx
+Name[zh_CN]=KSinkShips
+Name[zh_TW]=KSinkShips 戰艦
Exec=kbattleship -caption "%c"
Icon=kbattleship
Type=Application
@@ -80,7 +79,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]=बेटलसिप खेल
@@ -114,7 +112,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.3/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.3/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.3/kbattleship/src/kbattleship.protocol.trademarks 2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.3/kbattleship/src/kbattleship.protocol 2009-11-11 12:33:59.000000000 +0100
@@ -5,37 +5,37 @@ 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[en_GB]=A protocol for the game 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[hu]=Protokoll a KBattleship játékhoz
-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[pl]=Protokół gry 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[en_GB]=A protocol for the game 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[hu]=Protokoll a KSinkShips játékhoz
+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[pl]=Protokół gry 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 at 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.3/kbattleship/src/main.cpp.trademarks kdegames-4.3.3/kbattleship/src/main.cpp
--- kdegames-4.3.3/kbattleship/src/main.cpp.trademarks 2009-08-27 10:16:58.000000000 +0200
+++ kdegames-4.3.3/kbattleship/src/main.cpp 2009-11-11 12:33:59.000000000 +0100
@@ -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;
KGlobal::locale()->insertCatalog("libkdegames");
diff -up kdegames-4.3.3/ktron/ktron.desktop.trademarks kdegames-4.3.3/ktron/ktron.desktop
--- kdegames-4.3.3/ktron/ktron.desktop.trademarks 2009-10-30 13:29:51.000000000 +0100
+++ kdegames-4.3.3/ktron/ktron.desktop 2009-11-11 12:37:28.000000000 +0100
@@ -3,87 +3,14 @@ Type=Application
Exec=ktron -caption "%c" %i
Icon=ktron
DocPath=ktron/index.html
-GenericName=Tron-like Game
-GenericName[ca]=Joc similar al Tron
-GenericName[cs]=Hra typu Tron
-GenericName[da]=Tron-lignende spil
-GenericName[de]=„Tron“-Spiel
-GenericName[el]=Παιχνίδι παρόμοιο με το Tron
-GenericName[en_GB]=Tron-like Game
-GenericName[es]=Juego similar a Tron
-GenericName[et]=Troni moodi mäng
-GenericName[eu]=Tron-en antzeko jokoa
-GenericName[fr]=Jeu dans le style de Tron
-GenericName[ga]=Cluiche Cosúil le Tron
-GenericName[hu]=Tron-szerű játék
-GenericName[it]=Un gioco simile a Tron
-GenericName[ja]=Tron のようなゲーム
-GenericName[km]=ល្បែងដូចនឹង Tron
-GenericName[lv]=Tron līdzīga spēle
-GenericName[nds]=Tron-liek Speel
-GenericName[nl]=Tron-achtig spel
-GenericName[nn]=Tron-liknande spel
-GenericName[pl]=Gra podobna do Tron
-GenericName[pt]=Jogo Semelhante ao Tron
-GenericName[pt_BR]=Jogo semelhante ao Tron
-GenericName[ru]=Игра в стиле «Трон»
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=Игра налик на трон
-GenericName[sr at latin]=Igra nalik na tron
-GenericName[sv]=Tron-liknande spel
-GenericName[uk]=Гра, схожа на Tron
-GenericName[x-test]=xxTron-like Gamexx
-GenericName[zh_CN]=类似 Tron 的游戏
-GenericName[zh_TW]=類似 Tron 遊戲
+GenericName=Snake Duel Game
+GenericName[de]=Schlangenduell-Spiel
+GenericName[fr]=Jeu de duel de serpents
+GenericName[it]=Gioco di duello di serpenti
+GenericName[x-test]=xxSnake Duel Gamexx
Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[bn]=কে-ট্রন
-Name[br]=KTron
-Name[ca]=KTron
-Name[cs]=KTron
-Name[cy]=KTron
-Name[da]=KTron
-Name[de]=KTron
-Name[el]=KTron
-Name[en_GB]=KTron
-Name[es]=KTron
-Name[et]=KTron
-Name[eu]=KTron
-Name[fr]=KTron
-Name[ga]=KTron
-Name[he]=KTron
-Name[hr]=KTron
-Name[hu]=KTron
-Name[is]=KTron
-Name[it]=KTron
-Name[ja]=KTron
-Name[km]=KTron
-Name[lv]=KTron
-Name[mk]=KTron
-Name[nds]=KTron
-Name[nl]=KTron
-Name[nn]=KTron
-Name[pl]=KTron
-Name[pt]=KTron
-Name[pt_BR]=KTron
-Name[ro]=KTron
-Name[ru]=Трон
-Name[sk]=KTron
-Name[sl]=KTron
-Name[sr]=К‑трон
-Name[sr at latin]=K‑tron
-Name[sv]=Ktron
-Name[ta]=Kட்ரான்
-Name[tg]=KТрон
-Name[tr]=KTron
-Name[uk]=KTron
-Name[vi]=KTron
-Name[wa]=KTron
-Name[xh]=KTron
-Name[x-test]=xxKTronxx
-Name[zh_CN]=KTron
-Name[zh_TW]=KTron
+Name=KSnakeDuel
+Name[x-test]=xxKSnakeDuelxx
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Qt;KDE;Game;ArcadeGame;
diff -up kdegames-4.3.3/ktron/main.cpp.trademarks kdegames-4.3.3/ktron/main.cpp
--- kdegames-4.3.3/ktron/main.cpp.trademarks 2009-02-26 10:11:10.000000000 +0100
+++ kdegames-4.3.3/ktron/main.cpp 2009-11-11 12:33:59.000000000 +0100
@@ -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 at gmx.de");
aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at 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.3/ktron/player.cpp.trademarks kdegames-4.3.3/ktron/player.cpp
--- kdegames-4.3.3/ktron/player.cpp.trademarks 2009-04-05 21:59:49.000000000 +0200
+++ kdegames-4.3.3/ktron/player.cpp 2009-11-11 12:33:59.000000000 +0100
@@ -92,7 +92,7 @@ QString Player::getName()
{
if (isComputer())
{
- return i18n("KTron");
+ return i18n("KSnakeDuel");
}
else
{
diff -up kdegames-4.3.3/README.trademarks kdegames-4.3.3/README
--- kdegames-4.3.3/README.trademarks 2009-01-16 16:09:32.000000000 +0100
+++ kdegames-4.3.3/README 2009-11-11 12:33:59.000000000 +0100
@@ -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.
Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- kdegames.spec 31 Oct 2009 22:47:13 -0000 1.149
+++ kdegames.spec 11 Nov 2009 11:41:28 -0000 1.150
@@ -3,7 +3,7 @@ Name: kdegames
Summary: K Desktop Environment 4 - Games
Epoch: 6
Version: 4.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
URL: http://www.kde.org/
@@ -11,7 +11,6 @@ Group: Amusements/Games
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-## FIXME, rebase for 4.3.3
# Please be careful when rebasing this one! If you accidentally drop parts of
# it, Legal is going to kick our ass. ;-)
# In kbattleship.desktop, s/KBattleship/KSinkShips/ in all translations of
@@ -19,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
# In ktron.desktop, just remove all the translations containing "Tron" or
# "KTron". Use my translations of GenericName for de, fr, it, feel free to add
# more, but don't use "Tron" in them! -- Kevin
-Patch0: kdegames-4.3.2-trademarks.patch
+Patch0: kdegames-4.3.3-trademarks.patch
# KSnakeDuel moved here from kdegames3
Conflicts: kdegames3 < 3.5.10-6
@@ -231,6 +230,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-2
+- rebase kdegames-4.3.3-trademarks.patch
+
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3
--- kdegames-4.3.2-trademarks.patch DELETED ---
More information about the fedora-extras-commits
mailing list