rpms/kdegames/devel kdegames-4.4.85-trademarks.patch, NONE, 1.1 .cvsignore, 1.87, 1.88 kdegames.spec, 1.178, 1.179 sources, 1.88, 1.89 kdegames-4.3.98-trademarks.patch, 1.2, NONE

Rex Dieter rdieter at fedoraproject.org
Wed Jun 9 15:14:54 UTC 2010 

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11759

Modified Files:
	.cvsignore kdegames.spec sources 
Added Files:
	kdegames-4.4.85-trademarks.patch 
Removed Files:
	kdegames-4.3.98-trademarks.patch 
Log Message:
* Wed Jun 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.85-1
- 4.5 Beta 2 (4.2.85)


kdegames-4.4.85-trademarks.patch:
 README                               |   12 +++-
 doc/kbattleship/index.docbook        |   37 ++++++-------
 doc/ktron/index.docbook              |   11 ++-
 kbattleship/src/kbattleship.desktop  |   98 +++++++++++++++++------------------
 kbattleship/src/kbattleship.protocol |   60 ++++++++++-----------
 kbattleship/src/main.cpp             |    6 +-
 kbattleship/src/message.cpp          |    2 
 kbattleship/src/playfield.cpp        |    2 
 ktron/general.ui                     |    4 -
 ktron/ktron.desktop                  |   98 ++---------------------------------
 ktron/main.cpp                       |    5 +
 ktron/player.cpp                     |    2 
 12 files changed, 131 insertions(+), 206 deletions(-)

--- NEW FILE kdegames-4.4.85-trademarks.patch ---
diff -up kdegames-4.4.85/README.trademarks kdegames-4.4.85/README
--- kdegames-4.4.85/README.trademarks	2010-03-24 08:19:45.000000000 -0500
+++ kdegames-4.4.85/README	2010-06-09 10:09:45.000000000 -0500
@@ -31,9 +31,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!
 
@@ -76,6 +73,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.
 
diff -up kdegames-4.4.85/doc/ktron/index.docbook.trademarks kdegames-4.4.85/doc/ktron/index.docbook
--- kdegames-4.4.85/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
+++ kdegames-4.4.85/doc/ktron/index.docbook	2010-06-09 10:09:45.000000000 -0500
@@ -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.4.85/doc/kbattleship/index.docbook.trademarks kdegames-4.4.85/doc/kbattleship/index.docbook
--- kdegames-4.4.85/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
+++ kdegames-4.4.85/doc/kbattleship/index.docbook	2010-06-09 10:09:45.000000000 -0500
@@ -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.4.85/ktron/player.cpp.trademarks kdegames-4.4.85/ktron/player.cpp
--- kdegames-4.4.85/ktron/player.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
+++ kdegames-4.4.85/ktron/player.cpp	2010-06-09 10:09:45.000000000 -0500
@@ -92,7 +92,7 @@ QString Player::getName()
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -up kdegames-4.4.85/ktron/general.ui.trademarks kdegames-4.4.85/ktron/general.ui
--- kdegames-4.4.85/ktron/general.ui.trademarks	2009-05-06 05:13:13.000000000 -0500
+++ kdegames-4.4.85/ktron/general.ui	2010-06-09 10:09:45.000000000 -0500
@@ -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>
diff -up kdegames-4.4.85/ktron/main.cpp.trademarks kdegames-4.4.85/ktron/main.cpp
--- kdegames-4.4.85/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
+++ kdegames-4.4.85/ktron/main.cpp	2010-06-09 10:09:45.000000000 -0500
@@ -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.4.85/ktron/ktron.desktop.trademarks kdegames-4.4.85/ktron/ktron.desktop
--- kdegames-4.4.85/ktron/ktron.desktop.trademarks	2010-06-01 13:12:03.000000000 -0500
+++ kdegames-4.4.85/ktron/ktron.desktop	2010-06-09 10:11:10.000000000 -0500
@@ -3,98 +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[ca at valencia]=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[gl]=Xogo similar ao Tron
-GenericName[hu]=Tron-szerű játék
-GenericName[is]=Leikur líkur Tron
-GenericName[it]=Un gioco simile a Tron
-GenericName[ja]=Tron のようなゲーム
-GenericName[lv]=Tron līdzīga spēle
-GenericName[nb]=Tron-liknende spill
-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[sk]=Hra typu Tron
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=Игра налик на трон
-GenericName[sr at ijekavian]=Игра налик на трон
-GenericName[sr at ijekavianlatin]=Igra nalik na tron
-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 遊戲
 Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[bn]=কে-ট্রন
-Name[br]=KTron
-Name[ca]=KTron
-Name[ca at valencia]=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[gl]=KTron
-Name[he]=KTron
-Name[hr]=KTron
-Name[hu]=KTron
-Name[is]=KTron
-Name[it]=KTron
-Name[ja]=KTron
-Name[lv]=KTron
-Name[mk]=KTron
-Name[nb]=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[si]=KTron
-Name[sk]=KTron
-Name[sl]=KTron
-Name[sr]=К‑трон
-Name[sr at ijekavian]=К‑трон
-Name[sr at ijekavianlatin]=K‑tron
-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
+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
+Name=KSnakeDuel
+Name[x-test]=xxKSnakeDuelxx
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -up kdegames-4.4.85/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.4.85/kbattleship/src/kbattleship.desktop
--- kdegames-4.4.85/kbattleship/src/kbattleship.desktop.trademarks	2010-02-09 08:29:25.000000000 -0600
+++ kdegames-4.4.85/kbattleship/src/kbattleship.desktop	2010-06-09 10:09:45.000000000 -0500
@@ -1,72 +1,72 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=KSinkShips
+Name[af]=KSinkShips
 Name[be]=Марскі бой
 Name[bn]=কে-ব্যাটেলশীপ
-Name[br]=KBattleship
-Name[ca]=KBattleship
-Name[ca at valencia]=KBattleship
+Name[br]=KSinkShips
+Name[ca]=KSinkShips
+Name[ca at valencia]=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[ko]=KBattleship
-Name[lt]=KBattleship
-Name[lv]=KBattleship
-Name[mk]=KBattleship
-Name[nb]=KBattleship
+Name[it]=KSinkShips
+Name[ja]=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 ijekavian]=К‑подморнице
 Name[sr at ijekavianlatin]=K‑podmornice
 Name[sr at latin]=K‑podmornice
-Name[sv]=Kbattleship
+Name[sv]=KSinkShips
 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" %U
 MimeType=inode/vnd.kde.service.kbattleship;
 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
@@ -75,8 +75,8 @@ GenericName[cs]=Bitva lodí
 GenericName[cy]=Gêm Longau Rhyfel
 GenericName[da]=Sænke slagskibe-spil
 GenericName[de]=Schiffe versenken
-GenericName[el]=Παιχνίδι Battleship
-GenericName[en_GB]=Battleship Game
+GenericName[el]=Παιχνίδι SinkShips
+GenericName[en_GB]=Ship Sinking Game
 GenericName[eo]=Batalŝipa ludo
 GenericName[es]=Juego de batallas de naves
 GenericName[et]=Laevade pommitamise mäng
@@ -84,7 +84,7 @@ GenericName[eu]=Ontzi-guda jokoa
 GenericName[fa]=بازی جنگ کشتی‌ها
 GenericName[fi]=Meritaistelupeli
 GenericName[fr]=Jeu de bataille navale
-GenericName[ga]=Cluiche cosúil le "Battleship"
+GenericName[ga]=Cluiche cosúil le "SinkShips"
 GenericName[gl]=Xogo de batalla naval
 GenericName[he]=משחק צוללות
 GenericName[hne]=बेटलसिप खेल
@@ -120,7 +120,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.4.85/kbattleship/src/message.cpp.trademarks kdegames-4.4.85/kbattleship/src/message.cpp
--- kdegames-4.4.85/kbattleship/src/message.cpp.trademarks	2009-01-16 09:08:44.000000000 -0600
+++ kdegames-4.4.85/kbattleship/src/message.cpp	2010-06-09 10:09:45.000000000 -0500
@@ -24,7 +24,7 @@ HeaderMessage::HeaderMessage()
 : 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 KDE sinking ships game")
 {
 }
 
diff -up kdegames-4.4.85/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.4.85/kbattleship/src/kbattleship.protocol
--- kdegames-4.4.85/kbattleship/src/kbattleship.protocol.trademarks	2010-06-01 13:12:04.000000000 -0500
+++ kdegames-4.4.85/kbattleship/src/kbattleship.protocol	2010-06-09 10:12:19.000000000 -0500
@@ -5,42 +5,42 @@ input=none
 output=none
 
 Icon=kbattleship
-Description=A protocol for the game KBattleship
-Description[ca]=Un protocol pel joc KBattleship
-Description[ca at valencia]=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]=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=A protocol for the game KSinkShips
+Description[ca]=Un protocol pel joc KSinkShips
+Description[ca at valencia]=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]=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[is]=Samskiptaregla fyrir Sjóorustuleik
-Description[it]=Un protocollo per KBattleship
-Description[lv]=Protokols spēlei KBattleship
-Description[nb]=En protokoll for KBattleship-spillet
-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[sk]=Protokol hry KBattleship
-Description[sl]=Protokol za igro KBattleship
+Description[it]=Un protocollo per KSinkShips
+Description[lv]=Protokols spēlei KSinkShips
+Description[nb]=En protokoll for KSinkShips-spillet
+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[sk]=Protokol hry KSinkShips
+Description[sl]=Protokol za igro KSinkShips
 Description[sr]=Протокол за К‑подморнице
 Description[sr at ijekavian]=Протокол за К‑подморнице
 Description[sr at ijekavianlatin]=Protokol za K‑podmornice
 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 遊戲使用的協定
 
 helper=true
 Class=:internet
diff -up kdegames-4.4.85/kbattleship/src/main.cpp.trademarks kdegames-4.4.85/kbattleship/src/main.cpp
--- kdegames-4.4.85/kbattleship/src/main.cpp.trademarks	2009-08-12 04:59:08.000000000 -0500
+++ kdegames-4.4.85/kbattleship/src/main.cpp	2010-06-09 10:09:45.000000000 -0500
@@ -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("KSinkShips"), "2.0", 
+        ki18n("The KDE sinking ships 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 @@ 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.4.85/kbattleship/src/playfield.cpp.trademarks kdegames-4.4.85/kbattleship/src/playfield.cpp
--- kdegames-4.4.85/kbattleship/src/playfield.cpp.trademarks	2009-03-18 04:57:42.000000000 -0500
+++ kdegames-4.4.85/kbattleship/src/playfield.cpp	2010-06-09 10:09:45.000000000 -0500
@@ -251,7 +251,7 @@ void PlayField::restartRequested()
 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 KSinkShips. Note that, according to the rules enforced by old clients, ships cannot be placed adjacent to one another."));
     }
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	21 May 2010 12:32:44 -0000	1.87
+++ .cvsignore	9 Jun 2010 15:14:53 -0000	1.88
@@ -1 +1 @@
-kdegames-4.4.80.tar.bz2
+kdegames-4.4.85.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- kdegames.spec	31 May 2010 01:27:19 -0000	1.178
+++ kdegames.spec	9 Jun 2010 15:14:53 -0000	1.179
@@ -2,13 +2,13 @@
 Name:    kdegames
 Summary: KDE Games
 Epoch:   6
-Version: 4.4.80
-Release: 2%{?dist}
+Version: 4.4.85
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegames-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Please be careful when rebasing this one! If you accidentally drop parts of
@@ -21,7 +21,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.98-trademarks.patch
+Patch0: kdegames-4.4.85-trademarks.patch
 
 # upstream patches from 4.4 trunk
 
@@ -356,6 +356,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.85-1
+- 4.5 Beta 2 (4.2.85)
+
 * Sun May 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.80-2
 - fix -minimal pulling in -devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	21 May 2010 12:32:44 -0000	1.88
+++ sources	9 Jun 2010 15:14:54 -0000	1.89
@@ -1 +1 @@
-f97b0be5e9d8d1d5cfb17d3955780ef6  kdegames-4.4.80.tar.bz2
+80b7d17d66de5c3f6c8ab086ae48915a  kdegames-4.4.85.tar.bz2


--- kdegames-4.3.98-trademarks.patch DELETED ---

More information about the scm-commits mailing list