diff -u tuxtype-1.5.17.dfsg1/debian/changelog tuxtype-1.5.17.dfsg1/debian/changelog --- tuxtype-1.5.17.dfsg1/debian/changelog +++ tuxtype-1.5.17.dfsg1/debian/changelog @@ -1,3 +1,13 @@ +tuxtype (1.5.17.dfsg1-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable. (LP: #261991) remaining changes: + - add X-Ubuntu-Gettext-Domain=tuxtype and + Categories=GNOME;Application;Game; to .desktop file + - add XSBC-Original-Maintainer field + - merge conflicting greek and malayalam translations + + -- Stefan Ebner Wed, 27 Aug 2008 22:11:15 +0100 + tuxtype (1.5.17.dfsg1-3) unstable; urgency=low * Include patches from Patrick Winnertz which prevent tuxtype from crashing @@ -15,6 +25,16 @@ -- Holger Levsen Wed, 25 Jun 2008 21:08:30 +0000 +tuxtype (1.5.17.dfsg1-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - add X-Ubuntu-Gettext-Domain=tuxtype and + Categories=GNOME;Application;Game; to .desktop file + - add XSBC-Original-Maintainer field + - merge conflicting greek and malayalam translations + + -- Oliver Grawert Thu, 23 Jun 2008 16:04:01 +0200 + tuxtype (1.5.17.dfsg1-1) unstable; urgency=low * New upstream version (Closes: #469941, #217448) with a new Nepali theme @@ -28,6 +48,15 @@ -- Holger Levsen Wed, 18 Jun 2008 11:54:08 +0000 +tuxtype (1.5.16.dfsg1-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - add X-Ubuntu-Gettext-Domain=tuxtype and + Categories=GNOME;Application;Game; to .desktop file + - add XSBC-Original-Maintainer field + + -- Oliver Grawert Thu, 08 May 2008 14:41:01 +0100 + tuxtype (1.5.16.dfsg1-1) unstable; urgency=low * new upstream version, containing new Wolof and Czech themes and a fixed @@ -46,6 +75,18 @@ -- Holger Levsen Sun, 17 Feb 2008 16:37:51 +0000 +tuxtype (1.5.15.dfsg1-3ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - keep xdg compliance changes + + add a .desktop file with X-Ubuntu-Gettext-Domain=tuxtype and + Categories=GNOME;Application;Game; + + add a uuencoded .png + + add sharutils to build deps for uudecoding the png + - add XSBC-Original-Maintainer field + + -- Oliver Grawert Wed, 21 Nov 2007 18:16:05 +0000 + tuxtype (1.5.15.dfsg1-3) unstable; urgency=low * tuxmath.desktop: now in the category Games/KidsGame @@ -74,6 +115,30 @@ -- Holger Levsen Mon, 17 Sep 2007 15:14:22 +0200 +tuxtype (1.5.6.dfsg1-3ubuntu4) feisty; urgency=low + + * update the Replaces: line for tuxtype data as well (closes 81003) + + -- Oliver Grawert Wed, 24 Jan 2007 12:15:29 +0100 + +tuxtype (1.5.6.dfsg1-3ubuntu3) feisty; urgency=low + + * fix duplicated make install in debian rules (merge bug) + + -- Oliver Grawert Mon, 22 Jan 2007 18:14:02 +0100 + +tuxtype (1.5.6.dfsg1-3ubuntu2) feisty; urgency=low + + * fix upgrade file overwrite problem (lp: #78975) + + -- Michael Vogt Mon, 15 Jan 2007 16:06:40 +0100 + +tuxtype (1.5.6.dfsg1-3ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + + -- Oliver Grawert Mon, 30 Oct 2006 13:48:49 +0000 + tuxtype (1.5.6.dfsg1-3) unstable; urgency=low * fix debian rules, so binary-indep target is only build when that target is @@ -140,6 +205,16 @@ -- Fabio Brito Fri, 15 Jul 2005 16:26:31 -0300 +tuxtype (1.0-5ubuntu1) breezy; urgency=low + + * added .desktop file and icon (from tuxtype2) + * added copying of config.{sub,guess} to the clean target + * bumped standards version to 3.6.1 + * fixed 2 unquoted strings in the menu file + * changed descrption synopsis to lowercase to make lintian happy + + -- Oliver Grawert Thu, 16 Jun 2005 20:21:49 +0200 + tuxtype (1.0-4) unstable; urgency=medium * Updated Build-Depends: to include automake, autoconf and m4 (Closes: @@ -274,0 +350 @@ + diff -u tuxtype-1.5.17.dfsg1/debian/control tuxtype-1.5.17.dfsg1/debian/control --- tuxtype-1.5.17.dfsg1/debian/control +++ tuxtype-1.5.17.dfsg1/debian/control @@ -1,7 +1,8 @@ Source: tuxtype Section: games Priority: optional -Maintainer: Holger Levsen +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Holger Levsen Standards-Version: 3.8.0 Build-Depends: debhelper (>=5.0.42), libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-pango-dev, quilt, automake Homepage: http://tux4kids.alioth.debian.org diff -u tuxtype-1.5.17.dfsg1/debian/tuxtype.desktop tuxtype-1.5.17.dfsg1/debian/tuxtype.desktop --- tuxtype-1.5.17.dfsg1/debian/tuxtype.desktop +++ tuxtype-1.5.17.dfsg1/debian/tuxtype.desktop @@ -8 +8,2 @@ -Categories=Game;KidsGame +Categories=GNOME;Application;Game; +X-Ubuntu-Gettext-Domain=tuxtype only in patch2: unchanged: --- tuxtype-1.5.17.dfsg1.orig/tuxtype/data/themes/svenska/lang.po +++ tuxtype-1.5.17.dfsg1/tuxtype/data/themes/svenska/lang.po @@ -67,7 +67,7 @@ msgid "Commander" msgstr "Kommendör" -#levels for Cascade game: +# levels for Cascade game: msgid "Easy" msgstr "Lätt" @@ -77,14 +77,14 @@ msgid "Hard" msgstr "Svårt" -#types of games +# types of games msgid "Comet Zap" msgstr "Pricka kometer" msgid "Fish Cascade" msgstr "Fiskregn" -#general stuff +# general stuff msgid "Practice" msgstr "Övning" @@ -109,7 +109,7 @@ msgid "Setup Language" msgstr "Ställ in språk" -#work in progress stuff +# work in progress stuff msgid "Work In Progress!" msgstr "Arbete pågår!" only in patch2: unchanged: --- tuxtype-1.5.17.dfsg1.orig/tuxtype/data/themes/malayalam/lang.po +++ tuxtype-1.5.17.dfsg1/tuxtype/data/themes/malayalam/lang.po @@ -1,164 +1,131 @@ -# Malayalam translation of tuxtype typing tutor. -# Copyright (C) 2008 THE tuxtype'S COPYRIGHT HOLDER -# This file is distributed under the same license as the tuxtype package. -# Mobin M , 2008. -# Reviewed by Praveen|പ്രവീണ്‍ A|എ , 2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: tuxtype svn\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-02-12 13:12+0100\n" -"PO-Revision-Date: 2008-03-07 20:43+0530\n" -"Last-Translator: Mobin M \n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -"Language-Team: \n" msgid "Sound Effects Volume" msgstr "ശബ്ദം" msgid "Music Volume" -msgstr "പാട്ടിന്റെ ശബ്ദം" - +msgstr "" # msgid "Sound & Music Disabled" -msgstr "ശബ്ദവും പാട്ടും പ്രവര്‍ത്തനരഹിതമാക്കിയിരിയ്ക്കുന്നു" - +msgstr "ശബ്ദം പാട്ട് ഇല്ല" # msgid "Paused!" -msgstr "തടസ്സം!" +msgstr "തടസ്സം" msgid "Press escape again to return to menu" -msgstr "മെനുവിലേയ്ക്കു് തിരിച്ചു് പോകാന്‍ വീണ്ടും Esc കീ അമര്‍ത്തുക" - +msgstr "പുറത്തോട്ടുപോകാന്‍ വീണ്ടും Esc കീ അമര്‍ത്തുക" # msgid "Press space bar to return to game" msgstr "കളിയില്‍ തിരിച്ചെത്താന്‍ സ്പെയ്സ് കീ അടിക്കുക" - # msgid "Level" -msgstr "നില" - +msgstr "തട്ട്" # msgid "Lives" -msgstr "ആയുസ്സു്" - +msgstr "ആയുസ്സ്" # msgid "Fish" -msgstr "മീന്‍" - +msgstr "മത്സ്യം" # msgid "Easy" msgstr "എളുപ്പം" - # msgid "Medium" msgstr "ഇടത്തരം" - # msgid "Hard" -msgstr "ബുദ്ധിമുട്ടുള്ളതു്" - +msgstr "ബുദ്ധിമുട്ടുള്ളത്" # msgid "Practice" msgstr "പരിശീലനം" - # msgid "Congratulations" msgstr "കൊള്ളാലോ!!!" - # msgid "Oh No!" msgstr "അയ്യോ!.." - # msgid "Work In Progress!" -msgstr "പണി നടക്കുന്നുണ്ടല്ലോ!" - +msgstr "പണി നടക്കുന്നുണ്ടല്ലോ" # +msgid "This feature is not ready yet" +msgstr "ഇത് ഇതുവരെ ശരിയാക്കിയിട്ടില്ല." # msgid "Discuss the future of TuxTyping at" msgstr "ടക്സ് ടൈപ്പിന്റെ ഭാവി ചര്‍ച്ചചെയ്യാനായി ഇവിടെ പോകുക" - # msgid "Alphabet" msgstr "അക്ഷരം" - # msgid "Short Words" -msgstr "ചെറിയ വാക്കു്" - - +msgstr "ചെറിയ വാക്ക്" +# msgid "Medium Words" -msgstr "ഇടത്തരം വാക്കു്" - +msgstr "ഇടത്തരം വാക്ക്" # msgid "Long Words" -msgstr "വലിയ വാക്കു്" - +msgstr "വലിയ വാക്ക്" # msgid "Fish Cascade" -msgstr "വീഴുന്ന മീനുകള്‍" - +msgstr "വീഴുന്ന മത്സ്യങ്ങള്‍" # msgid "Space Cadet" -msgstr "ആകാശ പറവകള്‍" - +msgstr "ആകാശ പറവകള്‍ " # msgid "Edit Word Lists" -msgstr "വാക്കുകളുടെ ശേഖരം തിരുത്തുക" - +msgstr "വാക്കുകളുടെ ശേഖരം" # msgid "Comet Zap" -msgstr "വാല്‍ നക്ഷത്രത്തെ പിടിയ്ക്കുക" - +msgstr "വാല്‍ നക്ഷത്രത്തെ പിടിക്കുക" # msgid "Pilot" msgstr "ആദ്യ പരിശീലനം" - # msgid "Lessons" msgstr "പാഠങ്ങള്‍" - # msgid "Ace" msgstr "എയ്സ്" - # msgid "Project Info" msgstr "കളിയുടെ വിവരങ്ങള്‍" - # msgid "Options" msgstr "ഐച്ഛികങ്ങള്‍" - # msgid "Instructions" -msgstr "നിര്‍‌ദ്ദേശങ്ങള്‍" - +msgstr "നിര്‍‌ദ്ദേശങ്ങള്‍ " # msgid "Commander" msgstr "കമാന്‍ഡര്‍" - # msgid "Setup Language" msgstr "ഭാഷ മാറ്റുക" - # msgid "Quit" -msgstr "പുറത്തുകടക്കുക" - +msgstr "പുറത്തു കടക്കുക" # msgid "Main Menu" -msgstr "പ്രധാന മെനു" - +msgstr "പ്രധാന മെനു" # msgid "Next letter:" -msgstr "അടുത്തതു്:" - +msgstr "അടുത്തത് :" # msgid "Great!" msgstr "അഭിനന്ദനങ്ങള്‍!" - only in patch2: unchanged: --- tuxtype-1.5.17.dfsg1.orig/tuxtype/data/themes/greek/lang.po +++ tuxtype-1.5.17.dfsg1/tuxtype/data/themes/greek/lang.po @@ -50,7 +50,7 @@ # "Ace" is level 3 in comet zap msgid "Ace" -msgstr "3. Άσσος" +msgstr "3. ’σσος" # "Commander" is level 4 in comet zap msgid "Commander" @@ -108,8 +108,3 @@ msgid "Discuss the future of TuxTyping at" msgstr "Σχόλια για το TuxTyping" -msgid "Great!" -msgstr "Μπράβο!" - -msgid "Project Info" -msgstr "Πληροφορίες προγράμματος"