rpms/kdegames/devel kdegames-4.4.95-trademarks.patch, NONE, 1.1 .cvsignore, 1.89, 1.90 kdegames.spec, 1.184, 1.185 sources, 1.91, 1.92 kdegames-4.4.92-trademarks.patch, 1.2, NONE

Than Ngo than at fedoraproject.org
Tue Jul 27 09:59:11 UTC 2010


Author: than

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

Modified Files:
	.cvsignore kdegames.spec sources 
Added Files:
	kdegames-4.4.95-trademarks.patch 
Removed Files:
	kdegames-4.4.92-trademarks.patch 
Log Message:
rebase trademarks patch


kdegames-4.4.95-trademarks.patch:
 README                               |   12 ++
 doc/kbattleship/index.docbook        |   37 ++++----
 doc/ktron/index.docbook              |   11 +-
 kbattleship/src/kbattleship.desktop  |  100 +++++++++++------------
 kbattleship/src/kbattleship.protocol |   61 +++++++-------
 kbattleship/src/main.cpp             |    6 -
 kbattleship/src/message.cpp          |    2 
 kbattleship/src/playfield.cpp        |    2 
 ktron/general.ui                     |    4 
 ktron/ktron.desktop                  |  101 +-----------------------
 ktron/main.cpp                       |    5 -
 ktron/player.cpp                     |    2 
 ktron/themes/default.desktop         |  146 +++++++++++++++++------------------
 ktron/themes/neon.desktop            |  138 ++++++++++++++++-----------------
 14 files changed, 274 insertions(+), 353 deletions(-)

--- NEW FILE kdegames-4.4.95-trademarks.patch ---
diff -Nur kdegames-4.4.95/doc/kbattleship/index.docbook kdegames-4.4.95.me/doc/kbattleship/index.docbook
--- kdegames-4.4.95/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
+++ kdegames-4.4.95.me/doc/kbattleship/index.docbook	2010-07-27 11:34:09.000000000 +0200
@@ -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 @@
 <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>
diff -Nur kdegames-4.4.95/doc/ktron/index.docbook kdegames-4.4.95.me/doc/ktron/index.docbook
--- kdegames-4.4.95/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
+++ kdegames-4.4.95.me/doc/ktron/index.docbook	2010-07-27 11:33:35.000000000 +0200
@@ -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 @@
 <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 @@
 <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 -Nur kdegames-4.4.95/kbattleship/src/kbattleship.desktop kdegames-4.4.95.me/kbattleship/src/kbattleship.desktop
--- kdegames-4.4.95/kbattleship/src/kbattleship.desktop	2010-06-16 14:02:24.000000000 +0200
+++ kdegames-4.4.95.me/kbattleship/src/kbattleship.desktop	2010-07-26 19:06:57.000000000 +0200
@@ -1,73 +1,73 @@
 [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[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 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
@@ -76,8 +76,8 @@
 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
@@ -85,7 +85,7 @@
 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]=बेटलसिप खेल
@@ -121,7 +121,7 @@
 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 -Nur kdegames-4.4.95/kbattleship/src/kbattleship.protocol kdegames-4.4.95.me/kbattleship/src/kbattleship.protocol
--- kdegames-4.4.95/kbattleship/src/kbattleship.protocol	2010-07-23 23:14:48.000000000 +0200
+++ kdegames-4.4.95.me/kbattleship/src/kbattleship.protocol	2010-07-26 19:59:46.000000000 +0200
@@ -5,44 +5,43 @@
 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[km]=ពិធីការ​សម្រាប់​ល្បែង 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[tr]=Amiral Battı oyunu için iletişim kuralları
-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 -Nur kdegames-4.4.95/kbattleship/src/main.cpp kdegames-4.4.95.me/kbattleship/src/main.cpp
--- kdegames-4.4.95/kbattleship/src/main.cpp	2009-08-12 11:59:08.000000000 +0200
+++ kdegames-4.4.95.me/kbattleship/src/main.cpp	2010-07-26 19:06:57.000000000 +0200
@@ -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 @@
     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 -Nur kdegames-4.4.95/kbattleship/src/message.cpp kdegames-4.4.95.me/kbattleship/src/message.cpp
--- kdegames-4.4.95/kbattleship/src/message.cpp	2009-01-16 16:08:44.000000000 +0100
+++ kdegames-4.4.95.me/kbattleship/src/message.cpp	2010-07-26 19:06:57.000000000 +0200
@@ -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 KDE sinking ships game")
 {
 }
 
diff -Nur kdegames-4.4.95/kbattleship/src/playfield.cpp kdegames-4.4.95.me/kbattleship/src/playfield.cpp
--- kdegames-4.4.95/kbattleship/src/playfield.cpp	2009-03-18 10:57:42.000000000 +0100
+++ kdegames-4.4.95.me/kbattleship/src/playfield.cpp	2010-07-26 19:06:57.000000000 +0200
@@ -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 KSinkShips. Note that, according to the rules enforced by old clients, ships cannot be placed adjacent to one another."));
     }
 }
 
diff -Nur kdegames-4.4.95/ktron/general.ui kdegames-4.4.95.me/ktron/general.ui
--- kdegames-4.4.95/ktron/general.ui	2009-05-06 12:13:13.000000000 +0200
+++ kdegames-4.4.95.me/ktron/general.ui	2010-07-26 19:06:57.000000000 +0200
@@ -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 -Nur kdegames-4.4.95/ktron/ktron.desktop kdegames-4.4.95.me/ktron/ktron.desktop
--- kdegames-4.4.95/ktron/ktron.desktop	2010-07-23 23:14:45.000000000 +0200
+++ kdegames-4.4.95.me/ktron/ktron.desktop	2010-07-26 19:09:27.000000000 +0200
@@ -3,101 +3,14 @@
 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[km]=ល្បែង​ដូច​ 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[tr]=Tron-benzeri bir Oyun
-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[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[km]=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
+Name=KSnakeDuel
+Name[x-test]=xxKSnakeDuelxx
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
Binärdateien kdegames-4.4.95/ktron/.ktron.desktop.rej.swp and kdegames-4.4.95.me/ktron/.ktron.desktop.rej.swp sind verschieden.
diff -Nur kdegames-4.4.95/ktron/main.cpp kdegames-4.4.95.me/ktron/main.cpp
--- kdegames-4.4.95/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
+++ kdegames-4.4.95.me/ktron/main.cpp	2010-07-26 19:06:57.000000000 +0200
@@ -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 at gmx.de");
   aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
@@ -50,7 +50,8 @@
   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 -Nur kdegames-4.4.95/ktron/player.cpp kdegames-4.4.95.me/ktron/player.cpp
--- kdegames-4.4.95/ktron/player.cpp	2010-07-07 19:12:05.000000000 +0200
+++ kdegames-4.4.95.me/ktron/player.cpp	2010-07-26 19:06:57.000000000 +0200
@@ -92,7 +92,7 @@
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -Nur kdegames-4.4.95/ktron/themes/default.desktop kdegames-4.4.95.me/ktron/themes/default.desktop
--- kdegames-4.4.95/ktron/themes/default.desktop	2010-06-24 18:30:04.000000000 +0200
+++ kdegames-4.4.95.me/ktron/themes/default.desktop	2010-07-27 11:17:01.000000000 +0200
@@ -1,83 +1,83 @@
 [KGameTheme]
 VersionFormat=1
-Name=KTron Default Theme
-Name[ca]=Tema predeterminat del KTron
-Name[ca at valencia]=Tema predeterminat del KTron
-Name[da]=KTron standardtema
+Name=KSnakeDuel Default Theme
+Name[ca]=Tema predeterminat del KSnakeDuel
+Name[ca at valencia]=Tema predeterminat del KSnakeDuel
+Name[da]=KSnakeDuel standardtema
 Name[de]=Standard
-Name[el]=Προκαθορισμένο θέμα KTron
-Name[en_GB]=KTron Default Theme
-Name[es]=Tema predeterminado para KTron
-Name[et]=KTroni vaiketeema
-Name[eu]=KTron gai lehenetsia
-Name[fr]=Thème par défaut de KTron
-Name[ga]=Téama Réamhshocraithe KTron
-Name[gl]=Tema visual por defecto de KTron
-Name[hu]=Alapértelmezett KTron-téma
-Name[is]=Venjulegt þema í KTron
-Name[it]=Tema predefinito per KTron
-Name[ja]=KTron 標準テーマ
-Name[km]=ស្បែក​លំនាំ​ដើម​របស់ KTron ​
-Name[lv]=KTron noklusējuma tēma
-Name[nb]=Standardtema for KTron
-Name[nds]=KTron-Standardmuster
-Name[nl]=Standaardthema van KTron
-Name[nn]=Standardtema for KTron
-Name[pl]=Domyślny motyw KTron
-Name[pt]=Tema Predefinido do KTron
-Name[pt_BR]=Tema padrão do KTron
-Name[ru]=Оформление по умолчанию для KTron
-Name[sk]=Štandardná téma KTron
-Name[sl]=Privzeta tema za KTron
+Name[el]=Προκαθορισμένο θέμα KSnakeDuel
+Name[en_GB]=KSnakeDuel Default Theme
+Name[es]=Tema predeterminado para KSnakeDuel
+Name[et]=KSnakeDueli vaiketeema
+Name[eu]=KSnakeDuel gai lehenetsia
+Name[fr]=Thème par défaut de KSnakeDuel
+Name[ga]=Téama Réamhshocraithe KSnakeDuel
+Name[gl]=Tema visual por defecto de KSnakeDuel
+Name[hu]=Alapértelmezett KSnakeDuel-téma
+Name[is]=Venjulegt þema í KSnakeDuel
+Name[it]=Tema predefinito per KSnakeDuel
+Name[ja]=KSnakeDuel 標準テーマ
+Name[km]=ស្បែក​លំនាំ​ដើម​របស់ KSnakeDuel ​
+Name[lv]=KSnakeDuel noklusējuma tēma
+Name[nb]=Standardtema for KSnakeDuel
+Name[nds]=KSnakeDuel-Standardmuster
+Name[nl]=Standaardthema van KSnakeDuel
+Name[nn]=Standardtema for KSnakeDuel
+Name[pl]=Domyślny motyw KSnakeDuel
+Name[pt]=Tema Predefinido do KSnakeDuel
+Name[pt_BR]=Tema padrão do KSnakeDuel
+Name[ru]=Оформление по умолчанию для KSnakeDuel
+Name[sk]=Štandardná téma KSnakeDuel
+Name[sl]=Privzeta tema za KSnakeDuel
 Name[sr]=Подразумевана тема К‑трона
 Name[sr at ijekavian]=Подразумијевана тема К‑трона
-Name[sr at ijekavianlatin]=Podrazumijevana tema K‑trona
-Name[sr at latin]=Podrazumevana tema K‑trona
-Name[sv]=Ktron standardtema
-Name[tr]=KTron Öntanımlı Teması
-Name[uk]=Типова тема KTron
-Name[x-test]=xxKTron Default Themexx
-Name[zh_CN]=KTron 默认主题
-Name[zh_TW]=KTron 的預設主題
-Description=Default theme for KTron.
-Description[ca]=Tema predeterminat pel KTron.
-Description[ca at valencia]=Tema predeterminat pel KTron.
-Description[da]=Standardtema for KTron
-Description[de]=Das Standard-Design für KTron.
-Description[el]=Προκαθορισμένο θέμα για το KTron.
-Description[en_GB]=Default theme for KTron.
-Description[es]=Tema predeterminado para KTron.
-Description[et]=KTroni vaiketeema
-Description[eu]=Gai lehenetsia KTron-entzako.
-Description[fr]=Thème par défaut de KTron.
-Description[ga]=Téama réamhshocraithe le haghaidh KTron.
-Description[gl]=Tema visual por defecto de KTron.
-Description[hu]=Alapértelmezett KTron-téma.
-Description[is]=Sjálfgefið þema í KTron
-Description[it]=Il tema predefinito per KTron.
-Description[ja]=KTron の標準テーマ
-Description[km]=ស្បែក​លំនាំ​ដើម​សម្រាប់​ KTron ។​
-Description[lv]=KTron noklusējuma tēma.
-Description[nb]=Standardtema for KTron.
-Description[nds]=Standardmuster för KTron.
-Description[nl]=Standaard thema voor KTron.
-Description[nn]=Standardtema for KTron.
-Description[pl]=Domyślny motyw dla KTron
-Description[pt]=O tema predefinido do KTron.
-Description[pt_BR]=O tema padrão do KTron.
-Description[ru]=Оформление по умолчанию для KTron.
-Description[sk]=Štandardná téma pre KTron.
-Description[sl]=Privzeta tema za KTron.
+Name[sr at ijekavianlatin]=Podrazumijevana tema KsnakeDuel
+Name[sr at latin]=Podrazumevana tema KsnakeDuel
+Name[sv]=KSnakeDuel standardtema
+Name[tr]=KSnakeDuel Öntanımlı Teması
+Name[uk]=Типова тема KSnakeDuel
+Name[x-test]=xxKSnakeDuel Default Themexx
+Name[zh_CN]=KSnakeDuel 默认主题
+Name[zh_TW]=KSnakeDuel 的預設主題
+Description=Default theme for KSnakeDuel.
+Description[ca]=Tema predeterminat pel KSnakeDuel.
+Description[ca at valencia]=Tema predeterminat pel KSnakeDuel.
+Description[da]=Standardtema for KSnakeDuel
+Description[de]=Das Standard-Design für KSnakeDuel.
+Description[el]=Προκαθορισμένο θέμα για το KSnakeDuel.
+Description[en_GB]=Default theme for KSnakeDuel.
+Description[es]=Tema predeterminado para KSnakeDuel.
+Description[et]=KSnakeDueli vaiketeema
+Description[eu]=Gai lehenetsia KSnakeDuel-entzako.
+Description[fr]=Thème par défaut de KSnakeDuel.
+Description[ga]=Téama réamhshocraithe le haghaidh KSnakeDuel.
+Description[gl]=Tema visual por defecto de KSnakeDuel.
+Description[hu]=Alapértelmezett KSnakeDuel-téma.
+Description[is]=Sjálfgefið þema í KSnakeDuel
+Description[it]=Il tema predefinito per KSnakeDuel.
+Description[ja]=KSnakeDuel の標準テーマ
+Description[km]=ស្បែក​លំនាំ​ដើម​សម្រាប់​ KSnakeDuel ។​
+Description[lv]=KSnakeDuel noklusējuma tēma.
+Description[nb]=Standardtema for KSnakeDuel.
+Description[nds]=Standardmuster för KSnakeDuel.
+Description[nl]=Standaard thema voor KSnakeDuel.
+Description[nn]=Standardtema for KSnakeDuel.
+Description[pl]=Domyślny motyw dla KSnakeDuel
+Description[pt]=O tema predefinido do KSnakeDuel.
+Description[pt_BR]=O tema padrão do KSnakeDuel.
+Description[ru]=Оформление по умолчанию для KSnakeDuel.
+Description[sk]=Štandardná téma pre KSnakeDuel.
+Description[sl]=Privzeta tema za KSnakeDuel.
 Description[sr]=Подразумевана тема за К‑трон
 Description[sr at ijekavian]=Подразумијевана тема за К‑трон
-Description[sr at ijekavianlatin]=Podrazumijevana tema za K‑tron
-Description[sr at latin]=Podrazumevana tema za K‑tron
-Description[sv]=Standardtema för Ktron.
-Description[tr]=KTron için öntanımlı tema.
-Description[uk]=Типова тема KTron.
-Description[x-test]=xxDefault theme for KTron.xx
-Description[zh_CN]=为 KTron 设计的默认主题。
-Description[zh_TW]=KTron 的預設主題。
+Description[sr at ijekavianlatin]=Podrazumijevana tema za KsnakeDuel
+Description[sr at latin]=Podrazumevana tema za KsnakeDuel
+Description[sv]=Standardtema för KSnakeDuel.
+Description[tr]=KSnakeDuel için öntanımlı tema.
+Description[uk]=Типова тема KSnakeDuel.
+Description[x-test]=xxDefault theme for KSnakeDuel.xx
+Description[zh_CN]=为 KSnakeDuel 设计的默认主题。
+Description[zh_TW]=KSnakeDuel 的預設主題。
 FileName=default.svgz
 Author=Eugene Trounev
 AuthorEmail=eugene.trounev at gmail.com
diff -Nur kdegames-4.4.95/ktron/themes/neon.desktop kdegames-4.4.95.me/ktron/themes/neon.desktop
--- kdegames-4.4.95/ktron/themes/neon.desktop	2010-07-23 23:14:45.000000000 +0200
+++ kdegames-4.4.95.me/ktron/themes/neon.desktop	2010-07-27 11:17:30.000000000 +0200
@@ -1,81 +1,81 @@
 [KGameTheme]
 VersionFormat=1
-Name=Neon K Tron
-Name[ca]=Neó K Tron
-Name[ca at valencia]=Neó K Tron
-Name[cs]=Neon K Tron
-Name[da]=Neon K Tron
-Name[de]=Leuchtendes KTron
-Name[el]=Neon K Tron
-Name[en_GB]=Neon K Tron
-Name[es]=KTron de neón
-Name[et]=KTroni Neon
-Name[eu]=Neon K Tron
-Name[fr]=K Tron néon
-Name[ga]=K Tron Neoin
-Name[gl]=K Tron en neon
-Name[hu]=Neon K Tron
-Name[is]=Neon KTron
-Name[it]=KTron neon
-Name[km]=Neon K Tron​
-Name[lv]=Neona K Tron
-Name[nb]=Neon K Tron
-Name[nds]=Neon KTron
-Name[nl]=Neon K Tron
-Name[nn]=Neon K Tron
-Name[pl]=Neon K Tron
-Name[pt]=K Tron Néon
-Name[pt_BR]=K Tron Neon
-Name[ru]=Неоновый KTron
-Name[sk]=Neon K Tron
-Name[sl]=Neon K Tron
+Name=Neon KSnakeDuel
+Name[ca]=Neó KSnakeDuel
+Name[ca at valencia]=Neó KSnakeDuel
+Name[cs]=Neon KSnakeDuel
+Name[da]=Neon KSnakeDuel
+Name[de]=Leuchtendes KSnakeDuel
+Name[el]=Neon KSnakeDuel
+Name[en_GB]=Neon KSnakeDuel
+Name[es]=KSnakeDuel de neón
+Name[et]=KSnakeDueli Neon
+Name[eu]=Neon KSnakeDuel
+Name[fr]=KSnakeDuel néon
+Name[ga]=KSnakeDuel Neoin
+Name[gl]=KSnakeDuel en neon
+Name[hu]=Neon KSnakeDuel
+Name[is]=Neon KSnakeDuel
+Name[it]=KSnakeDuel neon
+Name[km]=Neon KSnakeDuel​
+Name[lv]=Neona KSnakeDuel
+Name[nb]=Neon KSnakeDuel
+Name[nds]=Neon KSnakeDuel
+Name[nl]=Neon KSnakeDuel
+Name[nn]=Neon KSnakeDuel
+Name[pl]=Neon KSnakeDuel
+Name[pt]=KSnakeDuel Néon
+Name[pt_BR]=KSnakeDuel Neon
+Name[ru]=Неоновый KSnakeDuel
+Name[sk]=Neon KSnakeDuel
+Name[sl]=Neon KSnakeDuel
 Name[sr]=Неонски К‑трон
 Name[sr at ijekavian]=Неонски К‑трон
-Name[sr at ijekavianlatin]=Neonski K‑tron
-Name[sr at latin]=Neonski K‑tron
-Name[sv]=Neon Ktron
-Name[tr]=Neon KTron
-Name[uk]=Neon K Tron
-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[ca]=Un tema retro pel KTron amb un toc distintiu dels anys 50.
-Description[ca at valencia]=Un tema retro pel KTron amb un toc distintiu dels anys 50.
+Name[sr at ijekavianlatin]=Neonski KsnakeDuel
+Name[sr at latin]=Neonski KsnakeDuel
+Name[sv]=Neon KSnakeDuel
+Name[tr]=Neon KSnakeDuel
+Name[uk]=Neon KSnakeDuel
+Name[x-test]=xxNeon KSnakeDuelxx
+Name[zh_CN]=Neon KSnakeDuel
+Name[zh_TW]=Neon KSnakeDuel
+Description=A retro KSnakeDuel theme with a distinctive touch of early 50s.
+Description[ca]=Un tema retro pel KSnakeDuel amb un toc distintiu dels anys 50.
+Description[ca at valencia]=Un tema retro pel KSnakeDuel amb un toc distintiu dels anys 50.
 Description[da]=Et retro-tema med et karakteristisk træk fra først i halvtredsere.
-Description[de]=Ein Retro-Design für KTron mit einem unverwechselbaren Hauch der 50er Jahre.
-Description[el]=Ένα ρετρό θέμα KTron με μια πινελιά από την αρχή της δεκαετίας του 50.
-Description[en_GB]=A retro KTron theme with a distinctive touch of early 50s.
-Description[es]=Un tema antiguo de KTron con un toque distintivo de los años 50.
-Description[et]=KTroni retroteema 1950. aastate alguse stiilis.
-Description[eu]=Ktron-en Aitzinekoa gaia 50 hamarkadako ukituarekin.
-Description[fr]=Un thème rétro pour KTron, avec une touche du début des années 50.
-Description[ga]=Téama sean-nóis KTron le blas na luath-50í.
-Description[gl]=Un tema retro de KTron cun toque distintivo dos cincuenta.
-Description[hu]=Retró KTron-téma az 50-es évek hangulatával.
-Description[it]=Un tema vecchia-maniera per KTron con il tipico stile degli anni '50.
-Description[km]=ស្បែក​ KTron ថយ​ក្រោយ​ដែល​មាន​បែប​ប៉ះពាល់ប្លែក​នៅ​ដើម​ទសវត្សរ៍ ៥០ ។
-Description[lv]=Retro KTron tēma ar 50-to gadu pieskārienu.
-Description[nb]=Nostalgisk KTron-tema med smak av tidlig 1950-tall.
-Description[nds]=En Nostalgie-Muster för KTron mit utspraken Anlehnen to de fröhen 50er Johren.
-Description[nl]=Een retro KTron thema met een duidelijke toets uit de vroege 50s.
-Description[nn]=Nostalgisk KTron-tema med smak av tidleg 1950-tal.
-Description[pl]=Motyw retro KTrona z lekką nutą wczesnych lat pięćdziesiątych.
-Description[pt]=Um tema retro do KTron com um toque distinto do início dos anos 50.
-Description[pt_BR]=Um tema retrô do KTron com um toque distinto do início dos anos 50.
-Description[ru]=Оформление для KTron в стиле ранних 50-х
-Description[sk]=Retro téma KTron s nádychom začiatku päťdesiatych rokov.
-Description[sl]=Retro tema za KTron z izrazitimi potezami zgodnjih petdesetih.
+Description[de]=Ein Retro-Design für KSnakeDuel mit einem unverwechselbaren Hauch der 50er Jahre.
+Description[el]=Ένα ρετρό θέμα KSnakeDuel με μια πινελιά από την αρχή της δεκαετίας του 50.
+Description[en_GB]=A retro KSnakeDuel theme with a distinctive touch of early 50s.
+Description[es]=Un tema antiguo de KSnakeDuel con un toque distintivo de los años 50.
+Description[et]=KSnakeDueli retroteema 1950. aastate alguse stiilis.
+Description[eu]=KSnakeDuel-en Aitzinekoa gaia 50 hamarkadako ukituarekin.
+Description[fr]=Un thème rétro pour KSnakeDuel, avec une touche du début des années 50.
+Description[ga]=Téama sean-nóis KSnakeDuel le blas na luath-50í.
+Description[gl]=Un tema retro de KSnakeDuel cun toque distintivo dos cincuenta.
+Description[hu]=Retró KSnakeDuel-téma az 50-es évek hangulatával.
+Description[it]=Un tema vecchia-maniera per KSnakeDuel con il tipico stile degli anni '50.
+Description[km]=ស្បែក​ KSnakeDuel ថយ​ក្រោយ​ដែល​មាន​បែប​ប៉ះពាល់ប្លែក​នៅ​ដើម​ទសវត្សរ៍ ៥០ ។
+Description[lv]=Retro KSnakeDuel tēma ar 50-to gadu pieskārienu.
+Description[nb]=Nostalgisk KSnakeDuel-tema med smak av tidlig 1950-tall.
+Description[nds]=En Nostalgie-Muster för KSnakeDuel mit utspraken Anlehnen to de fröhen 50er Johren.
+Description[nl]=Een retro KSnakeDuel thema met een duidelijke toets uit de vroege 50s.
+Description[nn]=Nostalgisk KSnakeDuel-tema med smak av tidleg 1950-tal.
+Description[pl]=Motyw retro KSnakeDuela z lekką nutą wczesnych lat pięćdziesiątych.
+Description[pt]=Um tema retro do KSnakeDuel com um toque distinto do início dos anos 50.
+Description[pt_BR]=Um tema retrô do KSnakeDuel com um toque distinto do início dos anos 50.
+Description[ru]=Оформление для KSnakeDuel в стиле ранних 50-х
+Description[sk]=Retro téma KSnakeDuel s nádychom začiatku päťdesiatych rokov.
+Description[sl]=Retro tema za KSnakeDuel z izrazitimi potezami zgodnjih petdesetih.
 Description[sr]=Ретро тема са нотом раних педесетих.
 Description[sr at ijekavian]=Ретро тема са нотом раних педесетих.
 Description[sr at ijekavianlatin]=Retro tema sa notom ranih pedesetih.
 Description[sr at latin]=Retro tema sa notom ranih pedesetih.
-Description[sv]=Ett gammaldags Ktron tema med en distinkt känsla av tidigt 50-tal.
-Description[tr]=50'lerin tipik dokunuşlarıyla retro bir KTron teması
-Description[uk]=Ретро-тема для KTron з невловимим присмаком ранніх 50-их.
-Description[x-test]=xxA retro KTron theme with a distinctive touch of early 50s.xx
-Description[zh_CN]=KTron 外观的重制版,加上了 50 年代早期的风韵。
-Description[zh_TW]=KTron 外觀主題重新整理,加上 50 年代早期的特色。
+Description[sv]=Ett gammaldags KSnakeDuel tema med en distinkt känsla av tidigt 50-tal.
+Description[tr]=50'lerin tipik dokunuşlarıyla retro bir KSnakeDuel teması
+Description[uk]=Ретро-тема для KSnakeDuel з невловимим присмаком ранніх 50-их.
+Description[x-test]=xxA retro KSnakeDuel theme with a distinctive touch of early 50s.xx
+Description[zh_CN]=KSnakeDuel 外观的重制版,加上了 50 年代早期的风韵。
+Description[zh_TW]=KSnakeDuel 外觀主題重新整理,加上 50 年代早期的特色。
 FileName=neon.svg
 Author=Eugene Trounev
 AuthorEmail=eugene.trounev at gmail.com
diff -Nur kdegames-4.4.95/README kdegames-4.4.95.me/README
--- kdegames-4.4.95/README	2010-03-24 14:19:45.000000000 +0100
+++ kdegames-4.4.95.me/README	2010-07-26 19:06:57.000000000 +0200
@@ -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,15 @@
 * 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore	7 Jul 2010 23:38:00 -0000	1.89
+++ .cvsignore	27 Jul 2010 09:59:10 -0000	1.90
@@ -1 +1,2 @@
 kdegames-4.4.92.tar.bz2
+kdegames-4.4.95.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- kdegames.spec	24 Jul 2010 21:11:40 -0000	1.184
+++ kdegames.spec	27 Jul 2010 09:59:11 -0000	1.185
@@ -3,7 +3,7 @@ Name:    kdegames
 Summary: KDE Games
 Epoch:   6
 Version: 4.4.95
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -21,8 +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
-## FIXME: rebase for 4.4.95 -- Rex
-Patch0: kdegames-4.4.92-trademarks.patch
+Patch0: kdegames-4.4.95-trademarks.patch
 
 # upstream patches from 4.4 trunk
 
@@ -357,6 +356,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 27 2010 Than Ngo <than at redhat.com> - 4.4.95-2
+- rebase trademarks patch
+
 * Sat Jul 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.95-1
 - 4.5 RC3 (4.4.95)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	24 Jul 2010 21:11:40 -0000	1.91
+++ sources	27 Jul 2010 09:59:11 -0000	1.92
@@ -0,0 +1 @@
+71aa289073feabefbd4bb74584f82c84  kdegames-4.4.95.tar.bz2


--- kdegames-4.4.92-trademarks.patch DELETED ---



More information about the scm-commits mailing list