rpms/kdegames/devel kdegames-4.4.92-trademarks.patch, 1.1, 1.2 kdegames.spec, 1.182, 1.183

Kevin Kofler kkofler at fedoraproject.org
Fri Jul 9 00:43:04 UTC 2010 

Author: kkofler

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

Modified Files:
	kdegames-4.4.92-trademarks.patch kdegames.spec 
Log Message:
* Fri Jul 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.92-2
- fully rebase trademarks patch (restore some KSinkShips-related translations)

kdegames-4.4.92-trademarks.patch:
 README                               |   12 +++-
 doc/kbattleship/index.docbook        |   37 ++++++------
 doc/ktron/index.docbook              |   11 ++-
 kbattleship/src/kbattleship.desktop  |  100 +++++++++++++++++------------------
 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                  |  100 ++---------------------------------
 ktron/main.cpp                       |    5 +
 ktron/player.cpp                     |    2 
 12 files changed, 132 insertions(+), 209 deletions(-)

Index: kdegames-4.4.92-trademarks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames-4.4.92-trademarks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdegames-4.4.92-trademarks.patch	8 Jul 2010 12:50:58 -0000	1.1
+++ kdegames-4.4.92-trademarks.patch	9 Jul 2010 00:43:03 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up kdegames-4.4.92/doc/kbattleship/index.docbook.trademarks kdegames-4.4.92/doc/kbattleship/index.docbook
---- kdegames-4.4.92/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
-+++ kdegames-4.4.92/doc/kbattleship/index.docbook	2010-07-07 18:29:20.478203579 -0500
+diff -ur kdegames-4.4.92/doc/kbattleship/index.docbook kdegames-4.4.92-trademarks/doc/kbattleship/index.docbook
+--- kdegames-4.4.92/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
++++ kdegames-4.4.92-trademarks/doc/kbattleship/index.docbook	2010-07-09 02:33:15.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" [
@@ -49,7 +49,7 @@ diff -up kdegames-4.4.92/doc/kbattleship
  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
+@@ -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>
@@ -66,7 +66,7 @@ diff -up kdegames-4.4.92/doc/kbattleship
  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
+@@ -186,10 +187,10 @@
  <title>Multiplayer support</title>
  
  <para>
@@ -80,7 +80,7 @@ diff -up kdegames-4.4.92/doc/kbattleship
  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:
+@@ -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
@@ -89,7 +89,7 @@ diff -up kdegames-4.4.92/doc/kbattleship
  </para>
  
  </sect1>
-@@ -314,7 +315,7 @@ differently from the computer player inc
+@@ -314,7 +315,7 @@
  </term>
  <listitem>
  <para>
@@ -98,7 +98,7 @@ diff -up kdegames-4.4.92/doc/kbattleship
  </para>
  </listitem>
  </varlistentry>
-@@ -394,7 +395,7 @@ default is on.
+@@ -394,7 +395,7 @@
  </term>
  <listitem>
  <para>
@@ -107,7 +107,7 @@ diff -up kdegames-4.4.92/doc/kbattleship
  </para>
  </listitem>
  </varlistentry>
-@@ -408,7 +409,7 @@ default is on.
+@@ -408,7 +409,7 @@
  </term>
  <listitem>
  <para>
@@ -116,7 +116,7 @@ diff -up kdegames-4.4.92/doc/kbattleship
  </para>
  </listitem>
  </varlistentry>
-@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
+@@ -437,7 +438,7 @@
  </question>
  <answer>
  <para>
@@ -125,7 +125,7 @@ diff -up kdegames-4.4.92/doc/kbattleship
  </para>
  </answer>
  </qandaentry>
-@@ -474,7 +475,7 @@ No, the theme is not changeable.
+@@ -474,7 +475,7 @@
  <chapter id="credits">
  <title>Credits and Licenses</title>
  
@@ -134,9 +134,9 @@ diff -up kdegames-4.4.92/doc/kbattleship
  
  <itemizedlist>
  <title>Authors</title>
-diff -up kdegames-4.4.92/doc/ktron/index.docbook.trademarks kdegames-4.4.92/doc/ktron/index.docbook
---- kdegames-4.4.92/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
-+++ kdegames-4.4.92/doc/ktron/index.docbook	2010-07-07 18:29:20.477205603 -0500
+diff -ur kdegames-4.4.92/doc/ktron/index.docbook kdegames-4.4.92-trademarks/doc/ktron/index.docbook
+--- kdegames-4.4.92/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
++++ kdegames-4.4.92-trademarks/doc/ktron/index.docbook	2010-07-09 02:33:15.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" [
@@ -154,7 +154,7 @@ diff -up kdegames-4.4.92/doc/ktron/index
  play alone or against a friend.
  </para>
  </abstract>
-@@ -69,11 +69,12 @@ play alone or against a friend.
+@@ -69,11 +69,12 @@
  <keywordset>
  <keyword>KDE</keyword>
  <keyword>kdegames</keyword>
@@ -169,7 +169,7 @@ diff -up kdegames-4.4.92/doc/ktron/index
  </keywordset>
  </bookinfo>
  
-@@ -81,7 +82,7 @@ play alone or against a friend.
+@@ -81,7 +82,7 @@
  <title>Introduction</title>
  
  <para>
@@ -178,19 +178,24 @@ diff -up kdegames-4.4.92/doc/ktron/index
  <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.92/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.4.92/kbattleship/src/kbattleship.desktop
---- kdegames-4.4.92/kbattleship/src/kbattleship.desktop.trademarks	2010-06-16 07:02:24.000000000 -0500
-+++ kdegames-4.4.92/kbattleship/src/kbattleship.desktop	2010-07-08 07:51:29.801621996 -0500
-@@ -1,129 +1,11 @@
+diff -ur kdegames-4.4.92/kbattleship/src/kbattleship.desktop kdegames-4.4.92-trademarks/kbattleship/src/kbattleship.desktop
+--- kdegames-4.4.92/kbattleship/src/kbattleship.desktop	2010-06-16 14:02:24.000000000 +0200
++++ kdegames-4.4.92-trademarks/kbattleship/src/kbattleship.desktop	2010-07-09 02:35:44.000000000 +0200
+@@ -1,73 +1,73 @@
  [Desktop Entry]
 -Name=KBattleship
 -Name[af]=Kbattleship
--Name[be]=Марскі бой
--Name[bn]=কে-ব্যাটেলশীপ
++Name=KSinkShips
++Name[af]=KSinkShips
+ Name[be]=Марскі бой
+ Name[bn]=কে-ব্যাটেলশীপ
 -Name[br]=KBattleship
 -Name[ca]=KBattleship
 -Name[ca at valencia]=KBattleship
--Name[cs]=Lodě
++Name[br]=KSinkShips
++Name[ca]=KSinkShips
++Name[ca at valencia]=KSinkShips
+ Name[cs]=Lodě
 -Name[cy]=KBattleship
 -Name[da]=KBattleship
 -Name[de]=KBattleship
@@ -200,16 +205,31 @@ diff -up kdegames-4.4.92/kbattleship/src
 -Name[es]=KBattleship
 -Name[et]=KBattleship
 -Name[eu]=KBattleship
--Name[fa]=نبرد کشتی‌ها
++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[hne]=के-बैटलसिप
--Name[hr]=KPotapanje brodova
++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[is]=KSjóorrusta
++Name[hu]=KSinkShips
+ Name[is]=KSjóorrusta
 -Name[it]=KBattleship
 -Name[ja]=KBattleship
 -Name[km]=KBattleship​
@@ -218,105 +238,102 @@ diff -up kdegames-4.4.92/kbattleship/src
 -Name[lv]=KBattleship
 -Name[mk]=KBattleship
 -Name[nb]=KBattleship
--Name[nds]=Scheep versenken
--Name[ne]=केडीई ब्याटलसीप
++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[pa]=ਕੇ-ਜੰਗੀ ਜਹਾਜ਼
++Name[nl]=KSinkShips
++Name[nn]=KSinkShips
+ Name[pa]=ਕੇ-ਜੰਗੀ ਜਹਾਜ਼
 -Name[pl]=KBattleship
 -Name[pt]=KBattleship
 -Name[pt_BR]=KBattleship
--Name[ro]=Bătălie navală
++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[sr]=К‑подморнице
--Name[sr at ijekavian]=К‑подморнице
--Name[sr at ijekavianlatin]=K‑podmornice
--Name[sr at latin]=K‑podmornice
++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[ta]=கேபாட்டில்ஷிப்
--Name[tg]=KҶанги Киштиҳо
++Name[sv]=KSinkShips
+ Name[ta]=கேபாட்டில்ஷிப்
+ Name[tg]=KҶанги Киштиҳо
 -Name[tr]=KBattleship
--Name[uk]=Морський бій
++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=KSinkShips
++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[be]=Гульня ў марскі бой
--GenericName[bn]=ব্যাটেলশীপ খেলা
--GenericName[ca]=Joc d'enfonsar la flota
--GenericName[ca at valencia]=Joc d'enfonsar la flota
--GenericName[cs]=Bitva lodí
--GenericName[cy]=Gêm Longau Rhyfel
--GenericName[da]=Sænke slagskibe-spil
--GenericName[de]=Schiffe versenken
++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[eo]=Batalŝipa ludo
--GenericName[es]=Juego de batallas de naves
--GenericName[et]=Laevade pommitamise mäng
--GenericName[eu]=Ontzi-guda jokoa
--GenericName[fa]=بازی جنگ کشتی‌ها
--GenericName[fi]=Meritaistelupeli
--GenericName[fr]=Jeu de bataille navale
++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[gl]=Xogo de batalla naval
--GenericName[he]=משחק צוללות
--GenericName[hne]=बेटलसिप खेल
--GenericName[hr]=Igra potapanja brodova
--GenericName[hu]=Torpedózás
--GenericName[is]=Sjóorustuleikur
--GenericName[it]=Gioco a battaglia navale
--GenericName[ja]=戦艦ゲーム
--GenericName[km]=ល្បែង​នាវា​ចម្បាំង
--GenericName[ko]=전함 게임
--GenericName[lt]=Laivų mūšio žaidimas
--GenericName[lv]=Jūras kaujas spēle
--GenericName[mk]=Игра со потопување бродови
--GenericName[nb]=Slagskip
--GenericName[nds]=Scheep versenken
--GenericName[ne]=ब्याटलसीप खेल
--GenericName[nl]=Zeeslagspel
--GenericName[nn]=Senk slagskipa
--GenericName[pa]=ਜੰਗੀ ਜਹਾਜ਼ ਖੇਡ
--GenericName[pl]=Gra w statki
--GenericName[pt]=Jogo de Batalha Naval
--GenericName[pt_BR]=Jogo de Batalha Naval
--GenericName[ro]=Un joc de bătălie navală
--GenericName[ru]=Морской бой
--GenericName[sk]=Bitka lodí
--GenericName[sl]=Igra potapljanja ladjic
--GenericName[sr]=Игра подморница
--GenericName[sr at ijekavian]=Игра подморница
--GenericName[sr at ijekavianlatin]=Igra podmornica
--GenericName[sr at latin]=Igra podmornica
--GenericName[sv]=Sänka fartyg spel
--GenericName[ta]=போர்த்தள விளையாட்டு
--GenericName[tr]=Amiral Battı Oyunu
--GenericName[uk]=Гра в морський бій
--GenericName[wa]=Djeu di batreye di bateas
++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[zh_CN]=舰艇对战游戏
--GenericName[zh_TW]=戰艦遊戲
-+GenericName=Ship Sinking Game
++GenericName[x-test]=xxShip Sinking Gamexx
+ GenericName[zh_CN]=舰艇对战游戏
+ GenericName[zh_TW]=戰艦遊戲
  Terminal=false
- X-DBUS-StartupType=Multi
- Categories=Qt;KDE;Game;StrategyGame;
-diff -up kdegames-4.4.92/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.4.92/kbattleship/src/kbattleship.protocol
---- kdegames-4.4.92/kbattleship/src/kbattleship.protocol.trademarks	2010-07-06 01:53:54.000000000 -0500
-+++ kdegames-4.4.92/kbattleship/src/kbattleship.protocol	2010-07-08 07:52:51.706612993 -0500
-@@ -5,43 +5,7 @@ input=none
+diff -ur kdegames-4.4.92/kbattleship/src/kbattleship.protocol kdegames-4.4.92-trademarks/kbattleship/src/kbattleship.protocol
+--- kdegames-4.4.92/kbattleship/src/kbattleship.protocol	2010-07-06 08:53:54.000000000 +0200
++++ kdegames-4.4.92-trademarks/kbattleship/src/kbattleship.protocol	2010-07-09 02:36:56.000000000 +0200
+@@ -5,43 +5,43 @@
  output=none
  
  Icon=kbattleship
@@ -334,7 +351,21 @@ diff -up kdegames-4.4.92/kbattleship/src
 -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[is]=Samskiptaregla fyrir Sjóorustuleik
++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
@@ -347,23 +378,38 @@ diff -up kdegames-4.4.92/kbattleship/src
 -Description[ru]=Протокол для игры KBattleship
 -Description[sk]=Protokol hry KBattleship
 -Description[sl]=Protokol za igro KBattleship
--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[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=A protocol for the game KSinkShips 
++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.92/kbattleship/src/main.cpp.trademarks kdegames-4.4.92/kbattleship/src/main.cpp
---- kdegames-4.4.92/kbattleship/src/main.cpp.trademarks	2009-08-12 04:59:08.000000000 -0500
-+++ kdegames-4.4.92/kbattleship/src/main.cpp	2010-07-07 18:29:20.485203509 -0500
+diff -ur kdegames-4.4.92/kbattleship/src/main.cpp kdegames-4.4.92-trademarks/kbattleship/src/main.cpp
+--- kdegames-4.4.92/kbattleship/src/main.cpp	2009-08-12 11:59:08.000000000 +0200
++++ kdegames-4.4.92-trademarks/kbattleship/src/main.cpp	2010-07-09 02:33:15.000000000 +0200
 @@ -21,8 +21,8 @@
  
  int main(int argc, char** argv)
@@ -375,7 +421,7 @@ diff -up kdegames-4.4.92/kbattleship/src
          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;
@@ -384,10 +430,10 @@ diff -up kdegames-4.4.92/kbattleship/src
      KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
      KApplication app;
      KGlobal::locale()->insertCatalog("libkdegames");
-diff -up kdegames-4.4.92/kbattleship/src/message.cpp.trademarks kdegames-4.4.92/kbattleship/src/message.cpp
---- kdegames-4.4.92/kbattleship/src/message.cpp.trademarks	2009-01-16 09:08:44.000000000 -0600
-+++ kdegames-4.4.92/kbattleship/src/message.cpp	2010-07-07 18:29:20.483203439 -0500
-@@ -24,7 +24,7 @@ HeaderMessage::HeaderMessage()
+diff -ur kdegames-4.4.92/kbattleship/src/message.cpp kdegames-4.4.92-trademarks/kbattleship/src/message.cpp
+--- kdegames-4.4.92/kbattleship/src/message.cpp	2009-01-16 16:08:44.000000000 +0100
++++ kdegames-4.4.92-trademarks/kbattleship/src/message.cpp	2010-07-09 02:33:15.000000000 +0200
+@@ -24,7 +24,7 @@
  : m_protocol_version("0.1.0")
  , m_client_name("KBattleship")
  , m_client_version("4.0")
@@ -396,10 +442,10 @@ diff -up kdegames-4.4.92/kbattleship/src
  {
  }
  
-diff -up kdegames-4.4.92/kbattleship/src/playfield.cpp.trademarks kdegames-4.4.92/kbattleship/src/playfield.cpp
---- kdegames-4.4.92/kbattleship/src/playfield.cpp.trademarks	2009-03-18 04:57:42.000000000 -0500
-+++ kdegames-4.4.92/kbattleship/src/playfield.cpp	2010-07-07 18:29:20.485203509 -0500
-@@ -251,7 +251,7 @@ void PlayField::restartRequested()
+diff -ur kdegames-4.4.92/kbattleship/src/playfield.cpp kdegames-4.4.92-trademarks/kbattleship/src/playfield.cpp
+--- kdegames-4.4.92/kbattleship/src/playfield.cpp	2009-03-18 10:57:42.000000000 +0100
++++ kdegames-4.4.92-trademarks/kbattleship/src/playfield.cpp	2010-07-09 02:33:15.000000000 +0200
+@@ -251,7 +251,7 @@
  void PlayField::setCompatibility(int level)
  {
      if (level == Entity::COMPAT_KBS3) {
@@ -408,9 +454,9 @@ diff -up kdegames-4.4.92/kbattleship/src
      }
  }
  
-diff -up kdegames-4.4.92/ktron/general.ui.trademarks kdegames-4.4.92/ktron/general.ui
---- kdegames-4.4.92/ktron/general.ui.trademarks	2009-05-06 05:13:13.000000000 -0500
-+++ kdegames-4.4.92/ktron/general.ui	2010-07-07 18:29:20.480203788 -0500
+diff -ur kdegames-4.4.92/ktron/general.ui kdegames-4.4.92-trademarks/ktron/general.ui
+--- kdegames-4.4.92/ktron/general.ui	2009-05-06 12:13:13.000000000 +0200
++++ kdegames-4.4.92-trademarks/ktron/general.ui	2010-07-09 02:33:15.000000000 +0200
 @@ -39,12 +39,12 @@
            <widget class="KComboBox" name="kcfg_GameType">
             <item>
@@ -426,10 +472,10 @@ diff -up kdegames-4.4.92/ktron/general.u
              </property>
             </item>
             <item>
-diff -up kdegames-4.4.92/ktron/ktron.desktop.trademarks kdegames-4.4.92/ktron/ktron.desktop
---- kdegames-4.4.92/ktron/ktron.desktop.trademarks	2010-07-07 12:12:05.000000000 -0500
-+++ kdegames-4.4.92/ktron/ktron.desktop	2010-07-08 07:48:57.927614570 -0500
-@@ -3,100 +3,14 @@ Type=Application
+diff -ur kdegames-4.4.92/ktron/ktron.desktop kdegames-4.4.92-trademarks/ktron/ktron.desktop
+--- kdegames-4.4.92/ktron/ktron.desktop	2010-07-07 19:12:05.000000000 +0200
++++ kdegames-4.4.92-trademarks/ktron/ktron.desktop	2010-07-09 02:33:15.000000000 +0200
+@@ -3,100 +3,14 @@
  Exec=ktron -caption "%c" %i
  Icon=ktron
  DocPath=ktron/index.html
@@ -537,10 +583,10 @@ diff -up kdegames-4.4.92/ktron/ktron.des
 +GenericName[x-test]=xxSnake Duel Gamexx
 +Name=KSnakeDuel
 +Name[x-test]=xxKSnakeDuelxx
-diff -up kdegames-4.4.92/ktron/main.cpp.trademarks kdegames-4.4.92/ktron/main.cpp
---- kdegames-4.4.92/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
-+++ kdegames-4.4.92/ktron/main.cpp	2010-07-07 18:29:20.480203788 -0500
-@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
+diff -ur kdegames-4.4.92/ktron/main.cpp kdegames-4.4.92-trademarks/ktron/main.cpp
+--- kdegames-4.4.92/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
++++ kdegames-4.4.92-trademarks/ktron/main.cpp	2010-07-09 02:33:15.000000000 +0200
+@@ -41,7 +41,7 @@
  
  int main(int argc, char* argv[])
  {
@@ -549,7 +595,7 @@ diff -up kdegames-4.4.92/ktron/main.cpp.
      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[])
+@@ -50,7 +50,8 @@
    KCmdLineArgs::init( argc, argv, &aboutData );
  
    KCmdLineOptions options;
@@ -559,10 +605,10 @@ diff -up kdegames-4.4.92/ktron/main.cpp.
    options.add("snake", ki18n("Start in KSnake mode"));
    KCmdLineArgs::addCmdLineOptions(options);
  
-diff -up kdegames-4.4.92/ktron/player.cpp.trademarks kdegames-4.4.92/ktron/player.cpp
---- kdegames-4.4.92/ktron/player.cpp.trademarks	2010-07-07 12:12:05.000000000 -0500
-+++ kdegames-4.4.92/ktron/player.cpp	2010-07-07 18:29:20.479203299 -0500
-@@ -92,7 +92,7 @@ QString Player::getName()
+diff -ur kdegames-4.4.92/ktron/player.cpp kdegames-4.4.92-trademarks/ktron/player.cpp
+--- kdegames-4.4.92/ktron/player.cpp	2010-07-07 19:12:05.000000000 +0200
++++ kdegames-4.4.92-trademarks/ktron/player.cpp	2010-07-09 02:33:15.000000000 +0200
+@@ -92,7 +92,7 @@
  {
  	if (isComputer())
  	{
@@ -571,10 +617,10 @@ diff -up kdegames-4.4.92/ktron/player.cp
  	}
  	else
  	{
-diff -up kdegames-4.4.92/README.trademarks kdegames-4.4.92/README
---- kdegames-4.4.92/README.trademarks	2010-03-24 08:19:45.000000000 -0500
-+++ kdegames-4.4.92/README	2010-07-07 18:29:20.475953193 -0500
-@@ -31,9 +31,6 @@ This is a compilation of more than 20 va
+diff -ur kdegames-4.4.92/README kdegames-4.4.92-trademarks/README
+--- kdegames-4.4.92/README	2010-03-24 14:19:45.000000000 +0100
++++ kdegames-4.4.92-trademarks/README	2010-07-09 02:33:15.000000000 +0200
+@@ -31,9 +31,6 @@
      Play backgammon against a local human player, via a game server or
      against GNU Backgammon (not included)
  
@@ -584,7 +630,7 @@ diff -up kdegames-4.4.92/README.trademar
  * 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
+@@ -76,6 +73,15 @@
  * kshisen
      Patience game where you take away all pieces.
  


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- kdegames.spec	8 Jul 2010 12:50:58 -0000	1.182
+++ kdegames.spec	9 Jul 2010 00:43:03 -0000	1.183
@@ -3,7 +3,7 @@ Name:    kdegames
 Summary: KDE Games
 Epoch:   6
 Version: 4.4.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -356,6 +356,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.92-2
+- fully rebase trademarks patch (restore some KSinkShips-related translations)
+
 * Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.92-1
 - 4.5 RC2 (4.4.92)

More information about the scm-commits mailing list