diff --git a/kdegames-4.3.1-trademarks.patch b/kdegames-4.3.1-trademarks.patch
index 2605ca4..17815b6 100644
--- a/kdegames-4.3.1-trademarks.patch
+++ b/kdegames-4.3.1-trademarks.patch
@@ -1,6 +1,6 @@
-diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/doc/kbattleship/index.docbook
---- kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks 2009-02-26 03:11:22.000000000 -0600
-+++ kdegames-4.3.1/doc/kbattleship/index.docbook 2009-09-10 08:37:49.503073182 -0500
+diff -ur kdegames-4.3.1/doc/kbattleship/index.docbook kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook
+--- kdegames-4.3.1/doc/kbattleship/index.docbook 2009-02-26 10:11:22.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook 2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
-@@ -85,14 +86,14 @@ ships in turns without knowing where the
+@@ -85,14 +86,14 @@
How to Play
Objective:Sink all of the opponent’s ships before the opponent sink all the ships of your own.
@@ -66,7 +66,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/
you want. The predefined port should be ok. However, if you encounter
problems, you can choose any other free port above 1024.
-@@ -186,10 +187,10 @@ The first player to destroy all their op
+@@ -186,10 +187,10 @@
Multiplayer support
@@ -80,7 +80,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/
game client. If a GGZ core client is installed, you can try
out GGZ by visiting the community site.
-@@ -197,7 +198,7 @@ out GGZ by visiting the
Credits and Licenses
@@ -134,9 +134,9 @@ diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/
Authors
-diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/ktron/index.docbook
---- kdegames-4.3.1/doc/ktron/index.docbook.trademarks 2009-02-26 03:11:14.000000000 -0600
-+++ kdegames-4.3.1/doc/ktron/index.docbook 2009-09-10 08:37:49.514322450 -0500
+diff -ur kdegames-4.3.1/doc/ktron/index.docbook kdegames-4.3.1-trademarks/doc/ktron/index.docbook
+--- kdegames-4.3.1/doc/ktron/index.docbook 2009-02-26 10:11:14.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/ktron/index.docbook 2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
-@@ -69,11 +69,12 @@ play alone or against a friend.
+@@ -69,11 +69,12 @@
KDE
kdegames
@@ -169,7 +169,7 @@ diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/kt
-@@ -81,7 +82,7 @@ play alone or against a friend.
+@@ -81,7 +82,7 @@
Introduction
@@ -178,9 +178,9 @@ diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/kt
K Desktop Environment. You can play
&kappname; against the computer or a friend.
The aim of the game is to live longer than your opponent. To do that,
-diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.desktop
---- kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks 2009-07-21 10:20:37.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/kbattleship.desktop 2009-09-10 08:37:49.518088014 -0500
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.desktop kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop
+--- kdegames-4.3.1/kbattleship/src/kbattleship.desktop 2009-07-21 17:20:37.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop 2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,5 @@
[Desktop Entry]
-Name=KBattleship
@@ -189,7 +189,7 @@ diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-
Name[be]=Марскі бой
Name[bn]=কে-ব্যাটেলশীপ
Name[cs]=Lodě
-@@ -14,17 +13,16 @@ Name[pa]=ਕੇ-ਜੰਗੀ ਜਹਾ�
+@@ -14,17 +13,16 @@
Name[ro]=Bătălie navală
Name[sr]=К‑подморнице
Name[sr@latin]=K‑podmornice
@@ -210,7 +210,7 @@ diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-
GenericName[be]=Гульня ў марскі бой
GenericName[bn]=ব্যাটেলশীপ খেলা
GenericName[ca]=Joc d'enfonsar la flota
-@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lodí
+@@ -32,7 +30,6 @@
GenericName[cy]=Gêm Longau Rhyfel
GenericName[da]=Sænke slagskibe-spil
GenericName[de]=Schiffe versenken
@@ -218,7 +218,7 @@ diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-
GenericName[eo]=Batalŝipa ludo
GenericName[es]=Juego de la batalla de naves
GenericName[et]=Laevade pommitamise mäng
-@@ -40,7 +37,6 @@ GenericName[eu]=Ontzi-guda jokoa
+@@ -40,7 +37,6 @@
GenericName[fa]=بازی جنگ کشتیها
GenericName[fi]=Meritaistelupeli
GenericName[fr]=Jeu de bataille navale
@@ -226,7 +226,7 @@ diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-
GenericName[gl]=Xogo de batalla naval
GenericName[he]=משחק צוללות
GenericName[hne]=बेटलसिप खेल
-@@ -74,7 +70,7 @@ GenericName[ta]=போர்த்தள
+@@ -74,7 +70,7 @@
GenericName[tr]=Amiral Battı Oyunu
GenericName[uk]=Гра в морський бій
GenericName[wa]=Djeu di batreye di bateas
@@ -235,10 +235,10 @@ diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-
GenericName[zh_CN]=舰艇对战游戏
GenericName[zh_TW]=戰艦遊戲
Terminal=false
-diff -up kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.protocol
---- kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks 2009-07-29 06:11:24.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/kbattleship.protocol 2009-09-10 08:37:49.519074173 -0500
-@@ -5,34 +5,34 @@ input=none
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.protocol kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol
+--- kdegames-4.3.1/kbattleship/src/kbattleship.protocol 2009-07-29 13:11:24.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol 2009-09-12 19:38:42.000000000 +0200
+@@ -5,34 +5,34 @@
output=none
Icon=kbattleship
@@ -298,9 +298,9 @@ diff -up kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks kdegames
#exec=kbattleship %u
helper=true
-diff -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbattleship/src/main.cpp
---- kdegames-4.3.1/kbattleship/src/main.cpp.trademarks 2009-08-27 03:16:58.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/main.cpp 2009-09-10 08:37:49.520074161 -0500
+diff -ur kdegames-4.3.1/kbattleship/src/main.cpp kdegames-4.3.1-trademarks/kbattleship/src/main.cpp
+--- kdegames-4.3.1/kbattleship/src/main.cpp 2009-08-27 10:16:58.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/main.cpp 2009-09-12 19:38:42.000000000 +0200
@@ -21,7 +21,7 @@
int main(int argc, char** argv)
@@ -310,7 +310,7 @@ diff -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbatt
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)
+@@ -48,7 +48,7 @@
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineOptions options;
@@ -319,48 +319,67 @@ diff -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbatt
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app;
KGlobal::locale()->insertCatalog("libkdegames");
-diff -up kdegames-4.3.1/ktron/ktron.desktop.trademarks kdegames-4.3.1/ktron/ktron.desktop
---- kdegames-4.3.1/ktron/ktron.desktop.trademarks 2009-07-29 06:11:19.000000000 -0500
-+++ kdegames-4.3.1/ktron/ktron.desktop 2009-09-10 08:46:38.445074891 -0500
-@@ -3,7 +3,7 @@ Type=Application
+diff -ur kdegames-4.3.1/ktron/ktron.desktop kdegames-4.3.1-trademarks/ktron/ktron.desktop
+--- kdegames-4.3.1/ktron/ktron.desktop 2009-07-29 13:11:19.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/ktron.desktop 2009-09-12 19:41:54.000000000 +0200
+@@ -3,46 +3,14 @@
Exec=ktron -caption "%c" %i
Icon=ktron
DocPath=ktron/index.html
-GenericName=Tron-like Game
-+GenericName=Snake Duel Game
- GenericName[ca]=Joc similar al Tron
- GenericName[cs]=Hra typu Tron
- GenericName[da]=Tron-lignende spil
-@@ -29,20 +29,20 @@ GenericName[sr]=Игра налик на
- GenericName[sr@latin]=Igra nalik na tron
- GenericName[sv]=Tron-liknande spel
- GenericName[uk]=Гра, схожа на Tron
+-GenericName[ca]=Joc similar al Tron
+-GenericName[cs]=Hra typu Tron
+-GenericName[da]=Tron-lignende spil
+-GenericName[de]=„Tron“-Spiel
+-GenericName[el]=Παιχνίδι παρόμοιο με το Tron
+-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[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[pt]=Jogo Semelhante ao Tron
+-GenericName[pt_BR]=Jogo semelhante ao Tron
+-GenericName[ru]=Игра в стиле «Трон»
+-GenericName[sl]=Igra podobna Tronu
+-GenericName[sr]=Игра налик на трон
+-GenericName[sr@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
- GenericName[zh_CN]=类似 Tron 的游戏
- GenericName[zh_TW]=類似 Tron 遊戲
Terminal=false
-Name=KTron
-Name[af]=Ktron
-+Name=KSnakeDuel
-+Name[af]=KSnakeDuel
- Name[bn]=কে-ট্রন
- Name[ru]=Трон
- Name[sr]=К‑трон
- Name[sr@latin]=K‑tron
+-Name[bn]=কে-ট্রন
+-Name[ru]=Трон
+-Name[sr]=К‑трон
+-Name[sr@latin]=K‑tron
-Name[sv]=Ktron
-+Name[sv]=KsnakeDuel
- Name[ta]=Kட்ரான்
- Name[tg]=KТрон
+-Name[ta]=Kட்ரான்
+-Name[tg]=KТрон
-Name[x-test]=xxKTronxx
++Name=KSnakeDuel
+Name[x-test]=xxKSnakeDuelxx
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Qt;KDE;Game;ArcadeGame;
-diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
---- kdegames-4.3.1/ktron/main.cpp.trademarks 2009-02-26 03:11:10.000000000 -0600
-+++ kdegames-4.3.1/ktron/main.cpp 2009-09-10 08:37:49.521074148 -0500
-@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
+diff -ur kdegames-4.3.1/ktron/main.cpp kdegames-4.3.1-trademarks/ktron/main.cpp
+--- kdegames-4.3.1/ktron/main.cpp 2009-02-26 10:11:10.000000000 +0100
++++ kdegames-4.3.1-trademarks/ktron/main.cpp 2009-09-12 19:38:42.000000000 +0200
+@@ -41,7 +41,7 @@
int main(int argc, char* argv[])
{
@@ -369,7 +388,7 @@ diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
KTRON_VERSION, description, KAboutData::License_GPL, notice);
aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer@gmx.de");
aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron@meyerhome.net");
-@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
+@@ -50,7 +50,8 @@
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineOptions options;
@@ -379,10 +398,10 @@ diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
options.add("snake", ki18n("Start in KSnake mode"));
KCmdLineArgs::addCmdLineOptions(options);
-diff -up kdegames-4.3.1/ktron/player.cpp.trademarks kdegames-4.3.1/ktron/player.cpp
---- kdegames-4.3.1/ktron/player.cpp.trademarks 2009-04-05 14:59:49.000000000 -0500
-+++ kdegames-4.3.1/ktron/player.cpp 2009-09-10 08:37:49.523074403 -0500
-@@ -92,7 +92,7 @@ QString Player::getName()
+diff -ur kdegames-4.3.1/ktron/player.cpp kdegames-4.3.1-trademarks/ktron/player.cpp
+--- kdegames-4.3.1/ktron/player.cpp 2009-04-05 21:59:49.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/player.cpp 2009-09-12 19:38:42.000000000 +0200
+@@ -92,7 +92,7 @@
{
if (isComputer())
{
@@ -391,10 +410,10 @@ diff -up kdegames-4.3.1/ktron/player.cpp.trademarks kdegames-4.3.1/ktron/player.
}
else
{
-diff -up kdegames-4.3.1/README.trademarks kdegames-4.3.1/README
---- kdegames-4.3.1/README.trademarks 2009-01-16 09:09:32.000000000 -0600
-+++ kdegames-4.3.1/README 2009-09-10 08:37:49.529084945 -0500
-@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
+diff -ur kdegames-4.3.1/README kdegames-4.3.1-trademarks/README
+--- kdegames-4.3.1/README 2009-01-16 16:09:32.000000000 +0100
++++ kdegames-4.3.1-trademarks/README 2009-09-12 19:38:42.000000000 +0200
+@@ -25,9 +25,6 @@
Play backgammon against a local human player, via a game server or
against GNU Backgammon (not included)
@@ -404,7 +423,7 @@ diff -up kdegames-4.3.1/README.trademarks kdegames-4.3.1/README
* 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
+@@ -70,6 +67,15 @@
* kshisen
Patience game where you take away all pieces.
diff --git a/kdegames.spec b/kdegames.spec
index e73de68..a7adcd5 100644
--- a/kdegames.spec
+++ b/kdegames.spec
@@ -3,12 +3,19 @@ Name: kdegames
Summary: K Desktop Environment 4 - Games
Epoch: 6
Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?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
+# 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
+# Description. (The other strings don't contain "battleship".)
+# 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.1-trademarks.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -223,6 +230,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Sep 12 2009 Kevin Kofler - 4.3.1-4
+- also fix ktron.desktop rebranding for non-US locales
+
* Thu Sep 10 2009 Than Ngo - 4.3.1-3
- drop ktron/kbattleship in RHEL