diff -u ceferino-0.97.8/debian/rules ceferino-0.97.8/debian/rules --- ceferino-0.97.8/debian/rules +++ ceferino-0.97.8/debian/rules @@ -23,9 +23,9 @@ $(MAKE) -f /usr/share/quilt/quilt.make patch autopoint --force - aclocal-1.10 --force + aclocal --force autoheader --force - automake-1.10 --add-missing --force-missing + automake --add-missing --force-missing autoconf --force ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games \ @@ -40,6 +40,9 @@ $(MAKE) #docbook-to-man debian/ceferino.sgml > ceferino.1 + msgfmt po/ca.po -o po/ca.gmo + msgfmt po/fr.po -o po/fr.gmo + msgfmt po/es.po -o po/es.gmo touch $@ @@ -51,7 +54,8 @@ clean: dh_testdir dh_testroot - rm -f build-stamp config.log + rm -f build-stamp config.log + find ./po/ -name '*.gmo' -exec rm {} \; [ ! -f Makefile ] || $(MAKE) distclean ifneq ($(wildcard $(AUTOJUNK)),) @@ -108,7 +112,6 @@ dh_installexamples -a dh_install --sourcedir=$(CURDIR)/debian/tmp -a dh_installmenu -a - dh_desktop dh_installman -a debian/ceferino.6 dh_link -a dh_strip -a diff -u ceferino-0.97.8/debian/watch ceferino-0.97.8/debian/watch --- ceferino-0.97.8/debian/watch +++ ceferino-0.97.8/debian/watch @@ -3 +3 @@ -http://www.losersjuegos.com.ar/juegos/ceferino/descargas/ceferino-([\d.]+)\.tar\.gz +http://www.losersjuegos.com.ar/juegos/ceferino /_media/juegos/ceferino/descargas/ceferino-([\d.]+)\.tar\.gz\?cache= diff -u ceferino-0.97.8/debian/changelog ceferino-0.97.8/debian/changelog --- ceferino-0.97.8/debian/changelog +++ ceferino-0.97.8/debian/changelog @@ -1,8 +1,34 @@ -ceferino (0.97.8-2ubuntu1) karmic; urgency=low +ceferino (0.97.8-3ubuntu1) lucid; urgency=low - * Fix FTBFS, added patches/03_gcc4.4.1.patch (LP: #447994) + * Build test - -- Joao Pinto Sat, 10 Oct 2009 13:33:17 +0100 + -- Bhavani Shankar Fri, 25 Dec 2009 17:24:30 +0530 + +ceferino (0.97.8-3) unstable; urgency=low + + [ Roland Clobus ] + * 03_fix_typo.diff: Contents moved to 03_english_texts.patch + * 03_english_texts.patch: Change english texts (grammar/spelling) + (Closes: #514727) + * 04_align_high_scores.patch: Move high scores a little bit to the left + + [ Gonéri Le Bouder ] + * Remove myself from uploaders. + * Drop the versioned build dependency on automake1.10 + * Standards-Version: 3.8.3, add a README.source file + * 03_fix_typo.diff changes all the .po files to fix the typo (quite/quiet) + * clean: remove the .gmo files since they are regenerated from the up dated + .po files + + [ Evgeni Golov ] + * Update watchfile. + + [ Barry deFreese ] + * Update my e-mail address. + * Don't call specific autotools versions in rules if we aren't b-d them. + * 07_gcc_4.4.patch - Fix FTBFS on gcc-4.4. (Closes: #560521). + + -- Barry deFreese Sat, 12 Dec 2009 10:01:33 -0500 ceferino (0.97.8-2) unstable; urgency=low diff -u ceferino-0.97.8/debian/control ceferino-0.97.8/debian/control --- ceferino-0.97.8/debian/control +++ ceferino-0.97.8/debian/control @@ -1,13 +1,12 @@ Source: ceferino Section: games Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Games Team -Uploaders: Miriam Ruiz , Barry deFreese , - Bas Wijnen , Gonéri Le Bouder -Build-Depends: debhelper (>= 5.0.37.2), automake1.10, autoconf (>= 2.53), +Maintainer: Debian Games Team +Uploaders: Miriam Ruiz , Barry deFreese , + Bas Wijnen +Build-Depends: debhelper (>= 5.0.37.2), automake, autoconf (>= 2.53), gettext, quilt, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, cvs -Standards-Version: 3.7.3 +Standards-Version: 3.8.3 Homepage: http://www.losersjuegos.com.ar/juegos/ceferino/ceferino.php Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ceferino/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ceferino/?op=log reverted: --- ceferino-0.97.8/debian/patches/03_gcc4.4.1.patch +++ ceferino-0.97.8.orig/debian/patches/03_gcc4.4.1.patch @@ -1,13 +0,0 @@ -Index: ceferino-0.97.8/src/nivel.h -=================================================================== ---- ceferino-0.97.8.orig/src/nivel.h 2009-10-10 12:43:22.187243990 +0000 -+++ ceferino-0.97.8/src/nivel.h 2009-10-10 12:43:20.566519577 +0000 -@@ -34,7 +34,7 @@ - class nivel - { - public: -- void iniciar(juego *_pjuego, grafico *grafico, grafico *pfondos, SDL_Surface *fondo); -+ void iniciar(juego *_pjuego, grafico *ingrafico, grafico *pfondos, SDL_Surface *fondo); - int avanzar_nivel(int salto = 1); - int reiniciar_nivel(void); - int get_dist_suelo(int x, int y, int max); reverted: --- ceferino-0.97.8/debian/patches/03_fix_typo.diff +++ ceferino-0.97.8.orig/debian/patches/03_fix_typo.diff @@ -1,11 +0,0 @@ ---- ceferino-0.97.8.orig/src/intro.cc -+++ ceferino-0.97.8/src/intro.cc -@@ -206,7 +206,7 @@ - - case SENTADO: - strcpy(mensaje,_("the cowboy Don Ceferino lived "\ -- "very happy in his quite and modest "\ -+ "very happy in his quiet and modest "\ - "house in the countryside")); - break; - diff -u ceferino-0.97.8/debian/patches/series ceferino-0.97.8/debian/patches/series --- ceferino-0.97.8/debian/patches/series +++ ceferino-0.97.8/debian/patches/series @@ -1,4 +1,6 @@ -#01_es_translation.patch -p1 -03_fix_typo.diff 02_configure.patch -03_gcc4.4.1.patch +03_english_texts.patch +04_align_high_scores.patch +05_force_latin1.patch +06_show_loading_of_font_at_right_time.patch +07_gcc_4.4.patch only in patch2: unchanged: --- ceferino-0.97.8.orig/debian/README.source +++ ceferino-0.97.8/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt for patch management, for more information see +the file /usr/share/doc/quilt/README.source in the quilt package. only in patch2: unchanged: --- ceferino-0.97.8.orig/debian/patches/03_english_texts.patch +++ ceferino-0.97.8/debian/patches/03_english_texts.patch @@ -0,0 +1,1633 @@ +diff -r -u ../ceferino-0.97.8.orig/po/ca.po ./po/ca.po +--- ceferino-0.97.8.orig/po/ca.po 2007-07-15 00:21:06.000000000 +0200 ++++ ceferino-0.97.8/po/ca.po 2009-02-10 13:04:14.000000000 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: ceferino-0.97\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-07-14 19:21-0300\n" ++"POT-Creation-Date: 2009-02-10 13:04+0100\n" + "PO-Revision-Date: 2006-02-02 02:36+0100\n" + "Last-Translator: Raül Cambeiro \n" + "Language-Team: Catalan \n" +@@ -21,18 +21,18 @@ + msgstr "+ S'està iniciant el sistema d'àudio: " + + #: src/audio.cc:79 +-#, c-format +-msgid "- Audio system disable from options\n" ++#, fuzzy, c-format ++msgid "- Audio system disabled from options\n" + msgstr "- Sistema d'àudio inhabilitat des de les opcions\n" + + #: src/audio.cc:87 +-#, c-format +-msgid "- Sound system disable from options\n" ++#, fuzzy, c-format ++msgid "- Sound system disabled from options\n" + msgstr "- Sistema de so inhabilitat des de les opcions\n" + + #: src/audio.cc:96 +-#, c-format +-msgid "- Music system disable from options\n" ++#, fuzzy, c-format ++msgid "- Music system disabled from options\n" + msgstr "- Sistema de música inhabilitat des de les opcions\n" + + #: src/audio.cc:142 +@@ -46,8 +46,8 @@ + msgstr "No es pot obrir '%s': %s\n" + + #: src/audio.cc:156 +-#, c-format +-msgid "- Disable sound system because of errors\n" ++#, fuzzy, c-format ++msgid "- Disabled sound system because of errors\n" + msgstr "- S'està inhabilitant el sistema de so a causa dels errors\n" + + #: src/audio.cc:175 +@@ -56,8 +56,8 @@ + msgstr "+ S'estan carregant els fitxers de música: " + + #: src/audio.cc:190 +-#, c-format +-msgid "- Disable music system because of errors\n" ++#, fuzzy, c-format ++msgid "- Disabled music system because of errors\n" + msgstr "- S'està inhabilitant el sistema de música a causa dels errors\n" + + #: src/comojugar.cc:37 src/menu.cc:86 +@@ -99,9 +99,10 @@ + " Javier Da Silva" + + #: src/creditos.cc:189 ++#, fuzzy + msgid "" +-"You can know more about what we are doing visitting the web site of the " +-"Losers Proyect:\n" ++"You can know more about what we are doing visiting the web site of the " ++"Losers Project:\n" + "\n" + "www.losersjuegos.com.ar" + msgstr "" +@@ -111,11 +112,12 @@ + "www.losersjuegos.com.ar" + + #: src/creditos.cc:197 ++#, fuzzy + msgid "" + "License:\n" + "\n" +-"This program is free software and is distributed under theterms of the GPL " +-"license. please read the copying file to obtain more information." ++"This program is free software and is distributed under the terms of the GPL " ++"license. Please read the file COPYING to obtain more information." + msgstr "" + "Llicència:\n" + "\n" +@@ -123,8 +125,8 @@ + "llicència GPL. Llegiu el fitxer 'COPYING' per a més informació." + + #: src/final.cc:71 +-#, c-format +-msgid "+ Loading final: " ++#, fuzzy, c-format ++msgid "+ Loading finale: " + msgstr "+ S'està carregant el final: " + + #: src/final.cc:87 src/intro.cc:89 +@@ -133,15 +135,18 @@ + msgstr "\t No es pot carregar '%s': '%s'\n" + + #: src/final.cc:186 +-msgid "Good job !, Don Ceferino arribe to spaceship ..." ++#, fuzzy ++msgid "Good job! Don Ceferino arrives at the spaceship..." + msgstr "Ben fet! Don Ceferino arriba a la nau..." + + #: src/final.cc:190 +-msgid "uses a Mate (a drink) loaded with powder." ++#, fuzzy ++msgid "drinks a Mate (a drink) loaded with powder." + msgstr "usa un mate carregat amb pólvora..." + + #: src/final.cc:194 +-msgid "he escape with the spaceship rescuing the cow." ++#, fuzzy ++msgid "He escapes with the spaceship rescuing the cow." + msgstr "escapa de la nau i rescata la vaca." + + #: src/final.cc:198 +@@ -149,12 +154,14 @@ + msgstr "Sembla que tot torna a la normalitat." + + #: src/final.cc:202 ++#, fuzzy + msgid "" +-"Though it seems like don ceferino is very hungry after all this action..." ++"Though it seems like Don Ceferino is very hungry after all this action..." + msgstr "Però potser Don Ceferino té gana després de tanta acció..." + + #: src/final.cc:206 +-msgid "At the end. Thanks for playing this game." ++#, fuzzy ++msgid "The end. Thanks for playing this game." + msgstr "En fi. Gràcies per jugar!" + + #: src/fuente2.cc:49 src/grafico.cc:74 +@@ -163,8 +170,8 @@ + msgstr "Error: error en redimensionar la imatge: '%s' " + + #: src/fuente2.cc:61 +-#, c-format +-msgid "+ loading: %s\n" ++#, fuzzy, c-format ++msgid "+ Loading: %s\n" + msgstr "+ S'està carregant: %s\n" + + #: src/fuente2.cc:107 +@@ -173,8 +180,8 @@ + msgstr "bpp no vàlid: %d\n" + + #: src/fuente2.cc:164 +-#, c-format +-msgid "Found %d fonts in bitmap\n" ++#, fuzzy, c-format ++msgid "Found %d characters in bitmap\n" + msgstr "S'han trobat %d caràcters al mapa de bits\n" + + #: src/fuente2.cc:209 +@@ -193,8 +200,8 @@ + msgstr "No es pot mostrar el gràfic %d\n" + + #: src/intro.cc:44 +-#, c-format +-msgid "- Loading presentation: " ++#, fuzzy, c-format ++msgid "+ Loading presentation: " + msgstr "- S'està carregant la presentació: " + + #: src/intro.cc:73 +@@ -203,37 +210,43 @@ + msgstr "+ S'està carregant la introducció: " + + #: src/intro.cc:204 +-msgid "Presents ..." ++#, fuzzy ++msgid "Presents..." + msgstr "Presenta..." + + #: src/intro.cc:208 ++#, fuzzy + msgid "" +-"the cowboy Don Ceferino lived very happy in his quite and modest house in " +-"the countryside" ++"The cowboy Don Ceferino lived very happily in his quiet and modest house in " ++"the countryside," + msgstr "" + "El gautxo Don Ceferino vivia molt feliç al seu tranquil i humil ranxo, al " + "camp." + + #: src/intro.cc:214 ++#, fuzzy + msgid "" +-"but one day he reades in the newspaper that aliens were kidnaping all the " ++"but one day he read in the newspaper that aliens were kidnapping all the " + "cows around" + msgstr "" + "Però un dia llegeix al diari que els extraterrestres estaven segrestant " + "totes les vaques de la zona." + + #: src/intro.cc:220 +-msgid "whith not exception. The aliens arrive at the farm of don ceferino..." ++#, fuzzy ++msgid "with no exception. The aliens arrived at the farm of Don Ceferino..." + msgstr "" + "Com era d'esperar, els extraterrestres arriben a la granja de Don Ceferino..." + + #: src/intro.cc:226 ++#, fuzzy + msgid "and kidnapped his only cow." + msgstr "i segresten la seva única vaca." + + #: src/intro.cc:230 ++#, fuzzy + msgid "" +-"but this doesn't end here.Don Ceferino is determinat to recover his precious " ++"But it doesn't end here. Don Ceferino is determined to recover his precious " + "cow." + msgstr "Però això no acaba aquí. Don Ceferino està disposat a recuperar-la." + +@@ -260,8 +273,8 @@ + msgstr "Nivell complet" + + #: src/juego.cc:890 src/juego.cc:972 src/marcas.cc:149 +-#, c-format +-msgid "Can't open the marcs file\n" ++#, fuzzy, c-format ++msgid "Can't open the scores file\n" + msgstr "No es pot obrir el fitxer de puntuacions\n" + + #: src/juego.cc:924 +@@ -295,8 +308,8 @@ + msgstr "No es pot continuar\n" + + #: src/libgrafico.cc:116 +-#, c-format +-msgid "+ Loading and reshapping images: " ++#, fuzzy, c-format ++msgid "+ Loading and reshaping images: " + msgstr "+ S'estan carregant i redimensionant les imatges: " + + #: src/libgrafico.cc:118 +@@ -325,7 +338,8 @@ + "\n" + + #: src/marcas.cc:104 +-msgid "best point" ++#, fuzzy ++msgid "highest scores" + msgstr "Millors puntuacions" + + #: src/menu.cc:73 +@@ -359,8 +373,8 @@ + msgstr "+ S'està iniciant la biblioteca SDL: " + + #: src/mundo.cc:287 +-#, c-format +-msgid "It doesn't exist the configuration file '%s',execute 'ceferinosetup':\n" ++#, fuzzy, c-format ++msgid "The configuration file '%s' does not exist, execute 'ceferinosetup':\n" + msgstr "" + "El fitxer de configuració '%s' no existeix. Executeu 'ceferinosetup':\n" + +@@ -370,8 +384,8 @@ + msgstr "Paràmetre incorrecte: '%s'\n" + + #: src/mundo.cc:387 +-#, c-format +-msgid "Error at changing scene\n" ++#, fuzzy, c-format ++msgid "Error while changing scene\n" + msgstr "Error en canviar l'escena\n" + + #: src/mundo.cc:429 +@@ -390,25 +404,25 @@ + msgstr "No es pot obrir el fitxer '%s'" + + #: src/nivel.cc:360 +-#, c-format +-msgid "error: there is 2 cowboys in the same level\n" ++#, fuzzy, c-format ++msgid "error: there are 2 cowboys in the same level\n" + msgstr "Error: hi ha 2 gautxos en el mateix nivell\n" + + #: src/nivel.cc:387 +-#, c-format ++#, fuzzy, c-format + msgid "" +-"error, the actual level does't define the posicionof the object 'gaucho'\n" ++"error, the actual level doesn't define the position of the object 'gaucho'\n" + msgstr "Error: el nivell actual no defineix la posició de l'objecte 'gaucho'\n" + + #: src/nivel.cc:391 +-#, c-format +-msgid "error, no enemy was created in this level, you musthave at least one\n" ++#, fuzzy, c-format ++msgid "error, no enemy was created in this level, you must have at least one\n" + msgstr "" + "Error: no hi ha enemics en aquest nivell; n'hi ha d'haver com a mínim un\n" + + #: src/procesos.cc:70 +-#, c-format +-msgid "error, already exist a cowboy in the scene, verify the level created\n" ++#, fuzzy, c-format ++msgid "error, a cowboy already exist in the scene, verify the level created\n" + msgstr "Error: ja existeix un gautxo a l'escena; verifiqueu el nivell creat\n" + + #: src/tiro.cc:142 +@@ -422,21 +436,26 @@ + msgstr "No es pot copiar la imatge\n" + + #: src/utils.cc:327 +-#, c-format +-msgid "Creating the marcs file '%s'\n" ++#, fuzzy, c-format ++msgid "Creating the scores file '%s'\n" + msgstr "S'està creant el fitxer de puntuacions '%s'\n" + + #: src/utils.cc:332 +-#, c-format +-msgid "Can't create the marcs file '%s'\n" ++#, fuzzy, c-format ++msgid "Can't create the scores file '%s'\n" + msgstr "No es pot crear el fitxer de puntuacions '%s'\n" + + #: src/opciones.cc:74 ++#, fuzzy + msgid "" +-"This feature has been temporaly disabled, please run 'ceferinosetup' instead." ++"This feature has been temporarily disabled, please run 'ceferinosetup' " ++"instead." + msgstr "" + "Aquesta característica ha estat inhabilitada temporalment. Executeu " + "'ceferinosetup' en el seu lloc." + ++#~ msgid "best point" ++#~ msgstr "Millors puntuacions" ++ + #~ msgid "here" + #~ msgstr "aquí" +diff -r -u ../ceferino-0.97.8.orig/po/ceferino.pot ./po/ceferino.pot +--- ceferino-0.97.8.orig/po/ceferino.pot 2007-07-15 00:21:04.000000000 +0200 ++++ ceferino-0.97.8/po/ceferino.pot 2009-02-10 13:04:14.000000000 +0100 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-07-14 19:21-0300\n" ++"POT-Creation-Date: 2009-02-10 13:04+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language-Team: LANGUAGE \n" +@@ -23,17 +23,17 @@ + + #: src/audio.cc:79 + #, c-format +-msgid "- Audio system disable from options\n" ++msgid "- Audio system disabled from options\n" + msgstr "" + + #: src/audio.cc:87 + #, c-format +-msgid "- Sound system disable from options\n" ++msgid "- Sound system disabled from options\n" + msgstr "" + + #: src/audio.cc:96 + #, c-format +-msgid "- Music system disable from options\n" ++msgid "- Music system disabled from options\n" + msgstr "" + + #: src/audio.cc:142 +@@ -48,7 +48,7 @@ + + #: src/audio.cc:156 + #, c-format +-msgid "- Disable sound system because of errors\n" ++msgid "- Disabled sound system because of errors\n" + msgstr "" + + #: src/audio.cc:175 +@@ -58,7 +58,7 @@ + + #: src/audio.cc:190 + #, c-format +-msgid "- Disable music system because of errors\n" ++msgid "- Disabled music system because of errors\n" + msgstr "" + + #: src/comojugar.cc:37 src/menu.cc:86 +@@ -92,8 +92,8 @@ + + #: src/creditos.cc:189 + msgid "" +-"You can know more about what we are doing visitting the web site of the " +-"Losers Proyect:\n" ++"You can know more about what we are doing visiting the web site of the " ++"Losers Project:\n" + "\n" + "www.losersjuegos.com.ar" + msgstr "" +@@ -102,13 +102,13 @@ + msgid "" + "License:\n" + "\n" +-"This program is free software and is distributed under theterms of the GPL " +-"license. please read the copying file to obtain more information." ++"This program is free software and is distributed under the terms of the GPL " ++"license. Please read the file COPYING to obtain more information." + msgstr "" + + #: src/final.cc:71 + #, c-format +-msgid "+ Loading final: " ++msgid "+ Loading finale: " + msgstr "" + + #: src/final.cc:87 src/intro.cc:89 +@@ -117,15 +117,15 @@ + msgstr "" + + #: src/final.cc:186 +-msgid "Good job !, Don Ceferino arribe to spaceship ..." ++msgid "Good job! Don Ceferino arrives at the spaceship..." + msgstr "" + + #: src/final.cc:190 +-msgid "uses a Mate (a drink) loaded with powder." ++msgid "drinks a Mate (a drink) loaded with powder." + msgstr "" + + #: src/final.cc:194 +-msgid "he escape with the spaceship rescuing the cow." ++msgid "He escapes with the spaceship rescuing the cow." + msgstr "" + + #: src/final.cc:198 +@@ -134,11 +134,11 @@ + + #: src/final.cc:202 + msgid "" +-"Though it seems like don ceferino is very hungry after all this action..." ++"Though it seems like Don Ceferino is very hungry after all this action..." + msgstr "" + + #: src/final.cc:206 +-msgid "At the end. Thanks for playing this game." ++msgid "The end. Thanks for playing this game." + msgstr "" + + #: src/fuente2.cc:49 src/grafico.cc:74 +@@ -148,7 +148,7 @@ + + #: src/fuente2.cc:61 + #, c-format +-msgid "+ loading: %s\n" ++msgid "+ Loading: %s\n" + msgstr "" + + #: src/fuente2.cc:107 +@@ -158,7 +158,7 @@ + + #: src/fuente2.cc:164 + #, c-format +-msgid "Found %d fonts in bitmap\n" ++msgid "Found %d characters in bitmap\n" + msgstr "" + + #: src/fuente2.cc:209 +@@ -178,7 +178,7 @@ + + #: src/intro.cc:44 + #, c-format +-msgid "- Loading presentation: " ++msgid "+ Loading presentation: " + msgstr "" + + #: src/intro.cc:73 +@@ -187,23 +187,23 @@ + msgstr "" + + #: src/intro.cc:204 +-msgid "Presents ..." ++msgid "Presents..." + msgstr "" + + #: src/intro.cc:208 + msgid "" +-"the cowboy Don Ceferino lived very happy in his quite and modest house in " +-"the countryside" ++"The cowboy Don Ceferino lived very happily in his quiet and modest house in " ++"the countryside," + msgstr "" + + #: src/intro.cc:214 + msgid "" +-"but one day he reades in the newspaper that aliens were kidnaping all the " ++"but one day he read in the newspaper that aliens were kidnapping all the " + "cows around" + msgstr "" + + #: src/intro.cc:220 +-msgid "whith not exception. The aliens arrive at the farm of don ceferino..." ++msgid "with no exception. The aliens arrived at the farm of Don Ceferino..." + msgstr "" + + #: src/intro.cc:226 +@@ -212,7 +212,7 @@ + + #: src/intro.cc:230 + msgid "" +-"but this doesn't end here.Don Ceferino is determinat to recover his precious " ++"But it doesn't end here. Don Ceferino is determined to recover his precious " + "cow." + msgstr "" + +@@ -240,7 +240,7 @@ + + #: src/juego.cc:890 src/juego.cc:972 src/marcas.cc:149 + #, c-format +-msgid "Can't open the marcs file\n" ++msgid "Can't open the scores file\n" + msgstr "" + + #: src/juego.cc:924 +@@ -275,7 +275,7 @@ + + #: src/libgrafico.cc:116 + #, c-format +-msgid "+ Loading and reshapping images: " ++msgid "+ Loading and reshaping images: " + msgstr "" + + #: src/libgrafico.cc:118 +@@ -299,7 +299,7 @@ + msgstr "" + + #: src/marcas.cc:104 +-msgid "best point" ++msgid "highest scores" + msgstr "" + + #: src/menu.cc:73 +@@ -334,7 +334,7 @@ + + #: src/mundo.cc:287 + #, c-format +-msgid "It doesn't exist the configuration file '%s',execute 'ceferinosetup':\n" ++msgid "The configuration file '%s' does not exist, execute 'ceferinosetup':\n" + msgstr "" + + #: src/mundo.cc:318 +@@ -344,7 +344,7 @@ + + #: src/mundo.cc:387 + #, c-format +-msgid "Error at changing scene\n" ++msgid "Error while changing scene\n" + msgstr "" + + #: src/mundo.cc:429 +@@ -364,23 +364,23 @@ + + #: src/nivel.cc:360 + #, c-format +-msgid "error: there is 2 cowboys in the same level\n" ++msgid "error: there are 2 cowboys in the same level\n" + msgstr "" + + #: src/nivel.cc:387 + #, c-format + msgid "" +-"error, the actual level does't define the posicionof the object 'gaucho'\n" ++"error, the actual level doesn't define the position of the object 'gaucho'\n" + msgstr "" + + #: src/nivel.cc:391 + #, c-format +-msgid "error, no enemy was created in this level, you musthave at least one\n" ++msgid "error, no enemy was created in this level, you must have at least one\n" + msgstr "" + + #: src/procesos.cc:70 + #, c-format +-msgid "error, already exist a cowboy in the scene, verify the level created\n" ++msgid "error, a cowboy already exist in the scene, verify the level created\n" + msgstr "" + + #: src/tiro.cc:142 +@@ -395,15 +395,16 @@ + + #: src/utils.cc:327 + #, c-format +-msgid "Creating the marcs file '%s'\n" ++msgid "Creating the scores file '%s'\n" + msgstr "" + + #: src/utils.cc:332 + #, c-format +-msgid "Can't create the marcs file '%s'\n" ++msgid "Can't create the scores file '%s'\n" + msgstr "" + + #: src/opciones.cc:74 + msgid "" +-"This feature has been temporaly disabled, please run 'ceferinosetup' instead." ++"This feature has been temporarily disabled, please run 'ceferinosetup' " ++"instead." + msgstr "" +diff -r -u ../ceferino-0.97.8.orig/po/es.po ./po/es.po +--- ceferino-0.97.8.orig/po/es.po 2007-07-15 00:21:05.000000000 +0200 ++++ ceferino-0.97.8/po/es.po 2009-02-10 13:04:14.000000000 +0100 +@@ -5,7 +5,7 @@ + msgstr "" + "Project-Id-Version: ceferino\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-07-14 19:21-0300\n" ++"POT-Creation-Date: 2009-02-10 13:04+0100\n" + "PO-Revision-Date: 2006-1-7 HO:MI+ZONE\n" + "Last-Translator: Hugo Ruscitti \n" + "Language-Team: Spanish \n" +@@ -19,18 +19,18 @@ + msgstr "+ Iniciando sistema de audio: " + + #: src/audio.cc:79 +-#, c-format +-msgid "- Audio system disable from options\n" ++#, fuzzy, c-format ++msgid "- Audio system disabled from options\n" + msgstr "+ Sistema de audio deshabilidado desde opciones\n" + + #: src/audio.cc:87 +-#, c-format +-msgid "- Sound system disable from options\n" ++#, fuzzy, c-format ++msgid "- Sound system disabled from options\n" + msgstr "- Sistema de sonido deshabilitado desde opciones\n" + + #: src/audio.cc:96 +-#, c-format +-msgid "- Music system disable from options\n" ++#, fuzzy, c-format ++msgid "- Music system disabled from options\n" + msgstr "- Sistema de músicas deshabilidato desde opciones\n" + + #: src/audio.cc:142 +@@ -44,8 +44,8 @@ + msgstr "No se puede abrir '%s': %s\n" + + #: src/audio.cc:156 +-#, c-format +-msgid "- Disable sound system because of errors\n" ++#, fuzzy, c-format ++msgid "- Disabled sound system because of errors\n" + msgstr "- Deshabilitando el sistema de sonido a causa de errores\n" + + #: src/audio.cc:175 +@@ -54,8 +54,8 @@ + msgstr "+ Cargando los archivos de música: " + + #: src/audio.cc:190 +-#, c-format +-msgid "- Disable music system because of errors\n" ++#, fuzzy, c-format ++msgid "- Disabled music system because of errors\n" + msgstr "- Deshabilitando el sistema se musicas a causa de errores\n" + + #: src/comojugar.cc:37 src/menu.cc:86 +@@ -97,9 +97,10 @@ + " Javier Da Silva" + + #: src/creditos.cc:189 ++#, fuzzy + msgid "" +-"You can know more about what we are doing visitting the web site of the " +-"Losers Proyect:\n" ++"You can know more about what we are doing visiting the web site of the " ++"Losers Project:\n" + "\n" + "www.losersjuegos.com.ar" + msgstr "" +@@ -109,19 +110,20 @@ + "www.losersjuegos.com.ar" + + #: src/creditos.cc:197 ++#, fuzzy + msgid "" + "License:\n" + "\n" +-"This program is free software and is distributed under theterms of the GPL " +-"license. please read the copying file to obtain more information." ++"This program is free software and is distributed under the terms of the GPL " ++"license. Please read the file COPYING to obtain more information." + msgstr "" + "Licencia:\n" + "Este programa es software libre y se distribuye bajo los términos de la " + "licencia GPL. Por favor lea el archivo copying para obtener mas información." + + #: src/final.cc:71 +-#, c-format +-msgid "+ Loading final: " ++#, fuzzy, c-format ++msgid "+ Loading finale: " + msgstr "+ Cargando la final: " + + #: src/final.cc:87 src/intro.cc:89 +@@ -130,16 +132,19 @@ + msgstr "\t No se puede leer '%s' : '%s'\n" + + #: src/final.cc:186 +-msgid "Good job !, Don Ceferino arribe to spaceship ..." ++#, fuzzy ++msgid "Good job! Don Ceferino arrives at the spaceship..." + msgstr "¡Buen trabajo!, Don Ceferino pudo llegar a la nave ..." + + #: src/final.cc:190 +-msgid "uses a Mate (a drink) loaded with powder." ++#, fuzzy ++msgid "drinks a Mate (a drink) loaded with powder." + msgstr "" + "utiliza un recipiente de Mate (una bebida) cargada con pólvora explosiva." + + #: src/final.cc:194 +-msgid "he escape with the spaceship rescuing the cow." ++#, fuzzy ++msgid "He escapes with the spaceship rescuing the cow." + msgstr "Así, se escapa de la nave rescantando a su vaca" + + #: src/final.cc:198 +@@ -147,14 +152,16 @@ + msgstr "parece que todo vuelve a la normalidad." + + #: src/final.cc:202 ++#, fuzzy + msgid "" +-"Though it seems like don ceferino is very hungry after all this action..." ++"Though it seems like Don Ceferino is very hungry after all this action..." + msgstr "" + "Aunque, al parecer, Don Ceferino tiene mucha hambre después de tanta " + "acción ..." + + #: src/final.cc:206 +-msgid "At the end. Thanks for playing this game." ++#, fuzzy ++msgid "The end. Thanks for playing this game." + msgstr "En fin. Gracias por jugar a este juego." + + #: src/fuente2.cc:49 src/grafico.cc:74 +@@ -163,8 +170,8 @@ + msgstr "error : error al reescalar imagen : '%s' " + + #: src/fuente2.cc:61 +-#, c-format +-msgid "+ loading: %s\n" ++#, fuzzy, c-format ++msgid "+ Loading: %s\n" + msgstr "+ cargando: %s\n" + + #: src/fuente2.cc:107 +@@ -173,8 +180,8 @@ + msgstr "bpp inválido: %d\n" + + #: src/fuente2.cc:164 +-#, c-format +-msgid "Found %d fonts in bitmap\n" ++#, fuzzy, c-format ++msgid "Found %d characters in bitmap\n" + msgstr "Se encontraron %d fuentes en el grafico\n" + + #: src/fuente2.cc:209 +@@ -193,8 +200,8 @@ + msgstr "No se puede mostrar el gráfico %d\n" + + #: src/intro.cc:44 +-#, c-format +-msgid "- Loading presentation: " ++#, fuzzy, c-format ++msgid "+ Loading presentation: " + msgstr "- Cargando la presentación: " + + #: src/intro.cc:73 +@@ -203,38 +210,44 @@ + msgstr "+ Cargando la introducción: " + + #: src/intro.cc:204 +-msgid "Presents ..." ++#, fuzzy ++msgid "Presents..." + msgstr "Presentan ..." + + #: src/intro.cc:208 ++#, fuzzy + msgid "" +-"the cowboy Don Ceferino lived very happy in his quite and modest house in " +-"the countryside" ++"The cowboy Don Ceferino lived very happily in his quiet and modest house in " ++"the countryside," + msgstr "" + "el gaucho don ceferino vivia muy contento en su tranquila y humilde casa de " + "campo" + + #: src/intro.cc:214 ++#, fuzzy + msgid "" +-"but one day he reades in the newspaper that aliens were kidnaping all the " ++"but one day he read in the newspaper that aliens were kidnapping all the " + "cows around" + msgstr "" + "pero un dia lee en el periódico que unos extraterrestres estaban " + "secuestrando a todas las vacas de la zona." + + #: src/intro.cc:220 +-msgid "whith not exception. The aliens arrive at the farm of don ceferino..." ++#, fuzzy ++msgid "with no exception. The aliens arrived at the farm of Don Ceferino..." + msgstr "" + "como era de esperar. Los extraterrestres llegan a la granja de don " + "ceferino ..." + + #: src/intro.cc:226 ++#, fuzzy + msgid "and kidnapped his only cow." + msgstr "y raptan a su única vaca." + + #: src/intro.cc:230 ++#, fuzzy + msgid "" +-"but this doesn't end here.Don Ceferino is determinat to recover his precious " ++"But it doesn't end here. Don Ceferino is determined to recover his precious " + "cow." + msgstr "pero esto no termina aqui. Don ceferino esta dispuesto a recuperarla." + +@@ -261,8 +274,8 @@ + msgstr "nivel completado" + + #: src/juego.cc:890 src/juego.cc:972 src/marcas.cc:149 +-#, c-format +-msgid "Can't open the marcs file\n" ++#, fuzzy, c-format ++msgid "Can't open the scores file\n" + msgstr "No se puede abrir el archivo de marcas\n" + + #: src/juego.cc:924 +@@ -296,8 +309,8 @@ + msgstr "no se puede continuar\n" + + #: src/libgrafico.cc:116 +-#, c-format +-msgid "+ Loading and reshapping images: " ++#, fuzzy, c-format ++msgid "+ Loading and reshaping images: " + msgstr "+ Cargando y reescalando imágenes: " + + #: src/libgrafico.cc:118 +@@ -326,7 +339,8 @@ + "\n" + + #: src/marcas.cc:104 +-msgid "best point" ++#, fuzzy ++msgid "highest scores" + msgstr "mejores puntajes" + + #: src/menu.cc:73 +@@ -360,8 +374,8 @@ + msgstr "+ Iniciando la biblioteca SDL:" + + #: src/mundo.cc:287 +-#, c-format +-msgid "It doesn't exist the configuration file '%s',execute 'ceferinosetup':\n" ++#, fuzzy, c-format ++msgid "The configuration file '%s' does not exist, execute 'ceferinosetup':\n" + msgstr "No existe el archivo de configuración '%s', ejecute 'ceferinosetup':\n" + + #: src/mundo.cc:318 +@@ -370,8 +384,8 @@ + msgstr "Parámetro incorrecto: '%s'\n" + + #: src/mundo.cc:387 +-#, c-format +-msgid "Error at changing scene\n" ++#, fuzzy, c-format ++msgid "Error while changing scene\n" + msgstr "Error al intercambiar de escena\n" + + #: src/mundo.cc:429 +@@ -390,24 +404,24 @@ + msgstr "No se puede abrir el archivo '%s'" + + #: src/nivel.cc:360 +-#, c-format +-msgid "error: there is 2 cowboys in the same level\n" ++#, fuzzy, c-format ++msgid "error: there are 2 cowboys in the same level\n" + msgstr "error: hay 2 gauchos en el mismo nivel\n" + + #: src/nivel.cc:387 +-#, c-format ++#, fuzzy, c-format + msgid "" +-"error, the actual level does't define the posicionof the object 'gaucho'\n" ++"error, the actual level doesn't define the position of the object 'gaucho'\n" + msgstr "error, el nivel actual no define la posición del objeto 'gaucho'\n" + + #: src/nivel.cc:391 +-#, c-format +-msgid "error, no enemy was created in this level, you musthave at least one\n" ++#, fuzzy, c-format ++msgid "error, no enemy was created in this level, you must have at least one\n" + msgstr "error, no hay enemigos en este nivel, debe haber al menos 1\n" + + #: src/procesos.cc:70 +-#, c-format +-msgid "error, already exist a cowboy in the scene, verify the level created\n" ++#, fuzzy, c-format ++msgid "error, a cowboy already exist in the scene, verify the level created\n" + msgstr "error, ya existe un gaucho en escena, verifique el nivel creado\n" + + #: src/tiro.cc:142 +@@ -421,22 +435,27 @@ + msgstr "No se puede copiar la imagen\n" + + #: src/utils.cc:327 +-#, c-format +-msgid "Creating the marcs file '%s'\n" ++#, fuzzy, c-format ++msgid "Creating the scores file '%s'\n" + msgstr "Creando el archivo de marcas '%s'\n" + + #: src/utils.cc:332 +-#, c-format +-msgid "Can't create the marcs file '%s'\n" ++#, fuzzy, c-format ++msgid "Can't create the scores file '%s'\n" + msgstr "No se puede crear el archivo de marcas '%s'\n" + + #: src/opciones.cc:74 ++#, fuzzy + msgid "" +-"This feature has been temporaly disabled, please run 'ceferinosetup' instead." ++"This feature has been temporarily disabled, please run 'ceferinosetup' " ++"instead." + msgstr "" + "Esta escena ha sido deshabilitada de manera temporal, por favor ejecute " + "'ceferinosetup' en su lugar." + ++#~ msgid "best point" ++#~ msgstr "mejores puntajes" ++ + #~ msgid "here" + #~ msgstr "aquí" + +diff -r -u ../ceferino-0.97.8.orig/po/fr.po ./po/fr.po +--- ceferino-0.97.8.orig/po/fr.po 2007-07-15 00:21:06.000000000 +0200 ++++ ceferino-0.97.8/po/fr.po 2009-02-10 13:04:14.000000000 +0100 +@@ -6,7 +6,7 @@ + msgstr "" + "Project-Id-Version: Ceferino\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-07-14 19:21-0300\n" ++"POT-Creation-Date: 2009-02-10 13:04+0100\n" + "PO-Revision-Date: 2006-1-14 HO:MI+ZONE\n" + "Last-Translator: YBSAR \n" + "Language-Team: French\n" +@@ -21,18 +21,18 @@ + msgstr "+ Lancement du son : " + + #: src/audio.cc:79 +-#, c-format +-msgid "- Audio system disable from options\n" ++#, fuzzy, c-format ++msgid "- Audio system disabled from options\n" + msgstr "+ Son désactivé par les options\n" + + #: src/audio.cc:87 +-#, c-format +-msgid "- Sound system disable from options\n" ++#, fuzzy, c-format ++msgid "- Sound system disabled from options\n" + msgstr "- Bruitages désactivés par les options\n" + + #: src/audio.cc:96 +-#, c-format +-msgid "- Music system disable from options\n" ++#, fuzzy, c-format ++msgid "- Music system disabled from options\n" + msgstr "- Musiques désactivées par les options\n" + + #: src/audio.cc:142 +@@ -46,8 +46,8 @@ + msgstr "Ne peut pas charger '%s' : %s\n" + + #: src/audio.cc:156 +-#, c-format +-msgid "- Disable sound system because of errors\n" ++#, fuzzy, c-format ++msgid "- Disabled sound system because of errors\n" + msgstr "- Désactive les bruitages à cause d'erreurs\n" + + #: src/audio.cc:175 +@@ -56,8 +56,8 @@ + msgstr "+ Chargement des musiques : " + + #: src/audio.cc:190 +-#, c-format +-msgid "- Disable music system because of errors\n" ++#, fuzzy, c-format ++msgid "- Disabled music system because of errors\n" + msgstr "- Désactive les musiques à cause d'erreurs\n" + + #: src/comojugar.cc:37 src/menu.cc:86 +@@ -99,9 +99,10 @@ + " Javier Da Silva" + + #: src/creditos.cc:189 ++#, fuzzy + msgid "" +-"You can know more about what we are doing visitting the web site of the " +-"Losers Proyect:\n" ++"You can know more about what we are doing visiting the web site of the " ++"Losers Project:\n" + "\n" + "www.losersjuegos.com.ar" + msgstr "" +@@ -110,11 +111,12 @@ + "www.losersjuegos.com.ar" + + #: src/creditos.cc:197 ++#, fuzzy + msgid "" + "License:\n" + "\n" +-"This program is free software and is distributed under theterms of the GPL " +-"license. please read the copying file to obtain more information." ++"This program is free software and is distributed under the terms of the GPL " ++"license. Please read the file COPYING to obtain more information." + msgstr "" + "Licence :\n" + "\n" +@@ -123,8 +125,8 @@ + "obtenir plus d'informations." + + #: src/final.cc:71 +-#, c-format +-msgid "+ Loading final: " ++#, fuzzy, c-format ++msgid "+ Loading finale: " + msgstr "+ Chargement du final : " + + #: src/final.cc:87 src/intro.cc:89 +@@ -133,15 +135,18 @@ + msgstr "\t Ne peut pas charger '%s' : '%s'\n" + + #: src/final.cc:186 +-msgid "Good job !, Don Ceferino arribe to spaceship ..." ++#, fuzzy ++msgid "Good job! Don Ceferino arrives at the spaceship..." + msgstr "bon travail ..., Don Ceferino arrive à la navette..." + + #: src/final.cc:190 +-msgid "uses a Mate (a drink) loaded with powder." ++#, fuzzy ++msgid "drinks a Mate (a drink) loaded with powder." + msgstr "utilise un mâle chargé de poudre à canon." + + #: src/final.cc:194 +-msgid "he escape with the spaceship rescuing the cow." ++#, fuzzy ++msgid "He escapes with the spaceship rescuing the cow." + msgstr "s'échappe de la navette pour secourir la vache." + + #: src/final.cc:198 +@@ -149,13 +154,15 @@ + msgstr "Il semble que tout redevienne normal." + + #: src/final.cc:202 ++#, fuzzy + msgid "" +-"Though it seems like don ceferino is very hungry after all this action..." ++"Though it seems like Don Ceferino is very hungry after all this action..." + msgstr "" + "bien qu'il semble don ceferino est très affamé après tout cette action..." + + #: src/final.cc:206 +-msgid "At the end. Thanks for playing this game." ++#, fuzzy ++msgid "The end. Thanks for playing this game." + msgstr "enfin. merci d'avoir joué à ce jeu." + + #: src/fuente2.cc:49 src/grafico.cc:74 +@@ -164,9 +171,9 @@ + msgstr "erreur : erreur pendant la redimension de l'image : '%s' " + + #: src/fuente2.cc:61 +-#, c-format +-msgid "+ loading: %s\n" +-msgstr "" ++#, fuzzy, c-format ++msgid "+ Loading: %s\n" ++msgstr "+ Chargement de l'introduction : " + + #: src/fuente2.cc:107 + #, c-format +@@ -175,7 +182,7 @@ + + #: src/fuente2.cc:164 + #, c-format +-msgid "Found %d fonts in bitmap\n" ++msgid "Found %d characters in bitmap\n" + msgstr "" + + #: src/fuente2.cc:209 +@@ -194,8 +201,8 @@ + msgstr "Ne peut pas afficher les graphismes %d\n" + + #: src/intro.cc:44 +-#, c-format +-msgid "- Loading presentation: " ++#, fuzzy, c-format ++msgid "+ Loading presentation: " + msgstr "- Chargement de la présentation : " + + #: src/intro.cc:73 +@@ -204,37 +211,43 @@ + msgstr "+ Chargement de l'introduction : " + + #: src/intro.cc:204 +-msgid "Presents ..." ++#, fuzzy ++msgid "Presents..." + msgstr "Presente ..." + + #: src/intro.cc:208 ++#, fuzzy + msgid "" +-"the cowboy Don Ceferino lived very happy in his quite and modest house in " +-"the countryside" ++"The cowboy Don Ceferino lived very happily in his quiet and modest house in " ++"the countryside," + msgstr "" + "le vacher don ceferino vivait heureux dans sa tranquille et modeste maison " + "dans la campagne" + + #: src/intro.cc:214 ++#, fuzzy + msgid "" +-"but one day he reades in the newspaper that aliens were kidnaping all the " ++"but one day he read in the newspaper that aliens were kidnapping all the " + "cows around" + msgstr "" + "mais un jour il lut dans le journal que des extraterrestres avaient kidnappé " + "toutes les vaches des environs." + + #: src/intro.cc:220 +-msgid "whith not exception. The aliens arrive at the farm of don ceferino..." ++#, fuzzy ++msgid "with no exception. The aliens arrived at the farm of Don Ceferino..." + msgstr "" + "sans exception. les extraterrestres arrivèrent à la ferme de don ceferino..." + + #: src/intro.cc:226 ++#, fuzzy + msgid "and kidnapped his only cow." + msgstr "et kidnappèrent son unique vache." + + #: src/intro.cc:230 ++#, fuzzy + msgid "" +-"but this doesn't end here.Don Ceferino is determinat to recover his precious " ++"But it doesn't end here. Don Ceferino is determined to recover his precious " + "cow." + msgstr "" + "mais ce n'est pas fini. don ceferino est déterminé à récupérer sa précieuse " +@@ -264,8 +277,8 @@ + msgstr "niveau terminé" + + #: src/juego.cc:890 src/juego.cc:972 src/marcas.cc:149 +-#, c-format +-msgid "Can't open the marcs file\n" ++#, fuzzy, c-format ++msgid "Can't open the scores file\n" + msgstr "Ne peut ouvrir le fichier de scores\n" + + #: src/juego.cc:924 +@@ -300,8 +313,8 @@ + msgstr "ne peut pas continuer\n" + + #: src/libgrafico.cc:116 +-#, c-format +-msgid "+ Loading and reshapping images: " ++#, fuzzy, c-format ++msgid "+ Loading and reshaping images: " + msgstr "+ Chargement et redimensionnement des images : " + + #: src/libgrafico.cc:118 +@@ -328,8 +341,9 @@ + "\n" + + #: src/marcas.cc:104 +-msgid "best point" +-msgstr "meilleur score" ++#, fuzzy ++msgid "highest scores" ++msgstr "meilleurs scores" + + #: src/menu.cc:73 + #, c-format +@@ -363,8 +377,8 @@ + msgstr "+ Lancement de la bibliothèque SDL:" + + #: src/mundo.cc:287 +-#, c-format +-msgid "It doesn't exist the configuration file '%s',execute 'ceferinosetup':\n" ++#, fuzzy, c-format ++msgid "The configuration file '%s' does not exist, execute 'ceferinosetup':\n" + msgstr "" + "Il n'existe pas de fichier de configuration '%s', exécute 'ceferinosetup':\n" + +@@ -374,8 +388,8 @@ + msgstr "Paramètre incorrect : '%s'\n" + + #: src/mundo.cc:387 +-#, c-format +-msgid "Error at changing scene\n" ++#, fuzzy, c-format ++msgid "Error while changing scene\n" + msgstr "Erreur pendant le changement de scène\n" + + #: src/mundo.cc:429 +@@ -394,27 +408,27 @@ + msgstr "Ne peut pas ouvrir le fichier '%s'" + + #: src/nivel.cc:360 +-#, c-format +-msgid "error: there is 2 cowboys in the same level\n" ++#, fuzzy, c-format ++msgid "error: there are 2 cowboys in the same level\n" + msgstr "erreur : il y a 2 vachers dans le même niveau\n" + + #: src/nivel.cc:387 +-#, c-format ++#, fuzzy, c-format + msgid "" +-"error, the actual level does't define the posicionof the object 'gaucho'\n" ++"error, the actual level doesn't define the position of the object 'gaucho'\n" + msgstr "" + "erreur, le niveau actuel ne définit pas la position de l'objet 'gaucho'\n" + + #: src/nivel.cc:391 +-#, c-format +-msgid "error, no enemy was created in this level, you musthave at least one\n" ++#, fuzzy, c-format ++msgid "error, no enemy was created in this level, you must have at least one\n" + msgstr "" + "erreur, aucune ennemi n'a été créé dans ce niveau, vous devez en avoir au " + "moins 1\n" + + #: src/procesos.cc:70 +-#, c-format +-msgid "error, already exist a cowboy in the scene, verify the level created\n" ++#, fuzzy, c-format ++msgid "error, a cowboy already exist in the scene, verify the level created\n" + msgstr "" + "erreur, il existe déjà un vacher dans cette scène, vérifié le niveau créé\n" + +@@ -429,16 +443,20 @@ + msgstr "Ne peut pas copier l'image\n" + + #: src/utils.cc:327 +-#, c-format +-msgid "Creating the marcs file '%s'\n" ++#, fuzzy, c-format ++msgid "Creating the scores file '%s'\n" + msgstr "Création du fichier de scores '%s'\n" + + #: src/utils.cc:332 +-#, c-format +-msgid "Can't create the marcs file '%s'\n" ++#, fuzzy, c-format ++msgid "Can't create the scores file '%s'\n" + msgstr "Ne peut pas créer de fichier de scores '%s'\n" + + #: src/opciones.cc:74 + msgid "" +-"This feature has been temporaly disabled, please run 'ceferinosetup' instead." ++"This feature has been temporarily disabled, please run 'ceferinosetup' " ++"instead." + msgstr "" ++ ++#~ msgid "best point" ++#~ msgstr "meilleur score" +diff -r -u ../ceferino-0.97.8.orig/src/audio.cc ./src/audio.cc +--- ceferino-0.97.8.orig/src/audio.cc 2005-12-16 18:13:26.000000000 +0100 ++++ ceferino-0.97.8/src/audio.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -76,7 +76,7 @@ + } + else + { +- printf(_("- Audio system disable from options\n")); ++ printf(_("- Audio system disabled from options\n")); + return; + } + +@@ -84,7 +84,7 @@ + if (hab_sonido) + cargar_sonidos(); + else +- printf(_("- Sound system disable from options\n")); ++ printf(_("- Sound system disabled from options\n")); + + + if (hab_musica) +@@ -93,7 +93,7 @@ + cargar_musicas(); + } + else +- printf(_("- Music system disable from options\n")); ++ printf(_("- Music system disabled from options\n")); + } + + +@@ -153,7 +153,7 @@ + imprimir_error(); + printf(_("Can't load '%s': %s\n"), nombres[i],\ + SDL_GetError()); +- printf(_("- Disable sound system because of"\ ++ printf(_("- Disabled sound system because of"\ + " errors\n")); + hab_sonido=0; + return; +@@ -187,7 +187,7 @@ + printf(_("Can't load '%s': %s\n"), nombres[i], \ + SDL_GetError()); + +- printf(_("- Disable music system because of errors\n")); ++ printf(_("- Disabled music system because of errors\n")); + hab_musica=0; + return; + } +diff -r -u ../ceferino-0.97.8.orig/src/creditos.cc ./src/creditos.cc +--- ceferino-0.97.8.orig/src/creditos.cc 2007-07-14 23:06:59.000000000 +0200 ++++ ceferino-0.97.8/src/creditos.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -187,16 +187,16 @@ + case WEB: + strcpy(mensaje,\ + _(\ +-"You can know more about what we are doing visitting the web site of the "\ +-"Losers Proyect:\n\nwww.losersjuegos.com.ar")); ++"You can know more about what we are doing visiting the web site of the "\ ++"Losers Project:\n\nwww.losersjuegos.com.ar")); + + break; + + case GPL: + strcpy(mensaje,\ + _(\ +-"License:\n\nThis program is free software and is distributed under the"\ +-"terms of the GPL license. please read the copying file "\ ++"License:\n\nThis program is free software and is distributed under the "\ ++"terms of the GPL license. Please read the file COPYING "\ + "to obtain more information.")); + break; + +diff -r -u ../ceferino-0.97.8.orig/src/final.cc ./src/final.cc +--- ceferino-0.97.8.orig/src/final.cc 2006-01-07 22:47:28.000000000 +0100 ++++ ceferino-0.97.8/src/final.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -68,7 +68,7 @@ + strcpy(base, DATADIR "/ima/"); + modo_video = _modo_video; + +- printf(_("+ Loading final: ")); ++ printf(_("+ Loading finale: ")); + + + // carga todas las imagenes +@@ -183,15 +183,15 @@ + switch (etapa) + { + case F1: +- strcpy(mensaje,_("Good job !, Don Ceferino arribe to spaceship ...")); ++ strcpy(mensaje,_("Good job! Don Ceferino arrives at the spaceship...")); + break; + + case F2: +- strcpy(mensaje,_("uses a Mate (a drink) loaded with powder.")); ++ strcpy(mensaje,_("drinks a Mate (a drink) loaded with powder.")); + break; + + case F3: +- strcpy(mensaje,_("he escape with the spaceship rescuing the cow.")); ++ strcpy(mensaje,_("He escapes with the spaceship rescuing the cow.")); + break; + + case F4: +@@ -199,11 +199,11 @@ + break; + + case F5: +- strcpy(mensaje,_("Though it seems like don ceferino is very hungry after all this action...")); ++ strcpy(mensaje,_("Though it seems like Don Ceferino is very hungry after all this action...")); + break; + + case F6: +- strcpy(mensaje,_("At the end. Thanks for playing this game.")); ++ strcpy(mensaje,_("The end. Thanks for playing this game.")); + break; + + +diff -r -u ../ceferino-0.97.8.orig/src/fuente2.cc ./src/fuente2.cc +--- ceferino-0.97.8.orig/src/fuente2.cc 2007-07-14 23:14:23.000000000 +0200 ++++ ceferino-0.97.8/src/fuente2.cc 2009-02-10 13:02:36.000000000 +0100 +@@ -58,7 +58,7 @@ + + cargar_identificar_recs (); + +- printf (_("+ loading: %s\n"), ruta); ++ printf (_("+ Loading: %s\n"), ruta); + } + + +@@ -161,7 +161,7 @@ + } + + letras = indice; +- printf (_("Found %d fonts in bitmap\n"), indice); ++ printf (_("Found %d characters in bitmap\n"), indice); + } + + fuente2 :: ~fuente2 () +diff -r -u ../ceferino-0.97.8.orig/src/intro.cc ./src/intro.cc +--- ceferino-0.97.8.orig/src/intro.cc 2006-01-07 22:47:42.000000000 +0100 ++++ ceferino-0.97.8/src/intro.cc 2009-02-10 12:41:20.000000000 +0100 +@@ -41,7 +41,7 @@ + + intro :: ~intro(void) + { +- printf(_("- Loading presentation: ")); ++ printf(_("+ Loading presentation: ")); + + for (int i=0; i<6; i++) + SDL_FreeSurface(imas[i]); +@@ -201,25 +201,25 @@ + switch (etapa) + { + case PRESENTA: +- strcpy(mensaje,_("Presents ...")); ++ strcpy(mensaje,_("Presents...")); + break; + + case SENTADO: +- strcpy(mensaje,_("the cowboy Don Ceferino lived "\ +- "very happy in his quite and modest "\ +- "house in the countryside")); ++ strcpy(mensaje,_("The cowboy Don Ceferino lived "\ ++ "very happily in his quiet and modest "\ ++ "house in the countryside,")); + break; + + case LEE: +- strcpy(mensaje,_("but one day he reades in the "\ ++ strcpy(mensaje,_("but one day he read in the "\ + "newspaper that aliens were "\ +- "kidnaping all the cows around")); ++ "kidnapping all the cows around")); + break; + + case ASOMBRO: +- strcpy(mensaje,_("whith not exception. The aliens "\ +- "arrive at the farm of "\ +- "don ceferino...")); ++ strcpy(mensaje,_("with no exception. The aliens "\ ++ "arrived at the farm of "\ ++ "Don Ceferino...")); + break; + + case RAPTO: +@@ -227,9 +227,9 @@ + break; + + case VS: +- strcpy(mensaje,_("but this doesn't end here."\ ++ strcpy(mensaje,_("But it doesn't end here. "\ + "Don Ceferino is "\ +- "determinat to recover "\ ++ "determined to recover "\ + "his precious cow.")); + break; + } +diff -r -u ../ceferino-0.97.8.orig/src/juego.cc ./src/juego.cc +--- ceferino-0.97.8.orig/src/juego.cc 2007-07-15 00:19:34.000000000 +0200 ++++ ceferino-0.97.8/src/juego.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -887,7 +887,7 @@ + + if (arch == NULL) + { +- printf(_("Can't open the marcs file\n")); ++ printf(_("Can't open the scores file\n")); + cargar_marcas_estandar(); + arch = fopen(ruta_completa, "rb"); + } +@@ -969,7 +969,7 @@ + + if (arch == NULL) + { +- printf(_("Can't open the marcs file\n")); ++ printf(_("Can't open the scores file\n")); + return; + } + else +diff -r -u ../ceferino-0.97.8.orig/src/libgrafico.cc ./src/libgrafico.cc +--- ceferino-0.97.8.orig/src/libgrafico.cc 2006-01-28 00:18:23.000000000 +0100 ++++ ceferino-0.97.8/src/libgrafico.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -113,7 +113,7 @@ + int libgrafico :: cargar_imagenes(void) + { + if (modo_video) +- printf(_("+ Loading and reshapping images: ")); ++ printf(_("+ Loading and reshaping images: ")); + else + printf(_("+ Loading images: ")); + +diff -r -u ../ceferino-0.97.8.orig/src/marcas.cc ./src/marcas.cc +--- ceferino-0.97.8.orig/src/marcas.cc 2007-07-14 22:43:38.000000000 +0200 ++++ ceferino-0.97.8/src/marcas.cc 2009-02-10 12:49:57.000000000 +0100 +@@ -101,7 +101,7 @@ + void marcas :: imprimir_puntajes (void) + { + pmundo->fuente->myprintf (screen, 320, 0, NULL, NULL, false, \ +- CENTRADO, _("best point")); ++ CENTRADO, _("highest scores")); + + for (int i = 0; i < 7; i ++) + { +@@ -146,7 +146,7 @@ + + if (!arch) + { +- printf(_("Can't open the marcs file\n")); ++ printf(_("Can't open the scores file\n")); + cargar_marcas_estandar(); + arch = fopen(ruta_completa, "rb"); + } +diff -r -u ../ceferino-0.97.8.orig/src/mundo.cc ./src/mundo.cc +--- ceferino-0.97.8.orig/src/mundo.cc 2007-07-14 22:57:12.000000000 +0200 ++++ ceferino-0.97.8/src/mundo.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -284,7 +284,7 @@ + + if ((arch = fopen(ruta_completa, "rt")) == NULL) + { +- printf(_("It doesn't exist the configuration file '%s',"\ ++ printf(_("The configuration file '%s' does not exist, "\ + "execute 'ceferinosetup':\n"),\ + ruta_completa); + opciones.musica=1; +@@ -384,7 +384,7 @@ + + if (actual->iniciar(this, opciones.modo_video, screen)) + { +- printf(_("Error at changing scene\n")); ++ printf(_("Error while changing scene\n")); + terminar(); + } + +diff -r -u ../ceferino-0.97.8.orig/src/nivel.cc ./src/nivel.cc +--- ceferino-0.97.8.orig/src/nivel.cc 2006-01-26 20:54:06.000000000 +0100 ++++ ceferino-0.97.8/src/nivel.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -357,7 +357,7 @@ + case 'a': + if (hay_gaucho == 1) + { +- printf(_("error: there is 2 cowboys in the same level\n")); ++ printf(_("error: there are 2 cowboys in the same level\n")); + return 0; + } + else +@@ -384,12 +384,12 @@ + return 1; + + if (!hay_gaucho) +- printf(_("error, the actual level does't define the posicion"\ +- "of the object 'gaucho'\n")); ++ printf(_("error, the actual level doesn't define the position"\ ++ " of the object 'gaucho'\n")); + + if (!hay_pelota) + printf(_("error, no enemy was created in this level, you must"\ +- "have at least one\n")); ++ " have at least one\n")); + + return 0; + } +diff -r -u ../ceferino-0.97.8.orig/src/opciones.cc ./src/opciones.cc +--- ceferino-0.97.8.orig/src/opciones.cc 2006-01-15 01:13:13.000000000 +0100 ++++ ceferino-0.97.8/src/opciones.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -71,7 +71,7 @@ + + + pmundo->fuente->myprintf (screen, 0, 50, NULL, NULL, false, CONSALTO, \ +- _("This feature has been temporaly disabled, please run 'ceferinosetup' instead.")); ++ _("This feature has been temporarily disabled, please run 'ceferinosetup' instead.")); + + imprimir_pie (); + +diff -r -u ../ceferino-0.97.8.orig/src/procesos.cc ./src/procesos.cc +--- ceferino-0.97.8.orig/src/procesos.cc 2006-01-14 18:13:59.000000000 +0100 ++++ ceferino-0.97.8/src/procesos.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -67,7 +67,7 @@ + { + if (gaucho != NULL) + { +- printf(_("error, already exist a cowboy in the scene, "\ ++ printf(_("error, a cowboy already exist in the scene, "\ + "verify the level created\n")); + exit(-1); + } +diff -r -u ../ceferino-0.97.8.orig/src/utils.cc ./src/utils.cc +--- ceferino-0.97.8.orig/src/utils.cc 2006-01-07 19:48:47.000000000 +0100 ++++ ceferino-0.97.8/src/utils.cc 2009-01-20 20:10:41.000000000 +0100 +@@ -324,11 +324,11 @@ + + if (arch) + { +- printf(_("Creating the marcs file '%s'\n"), ruta_completa); ++ printf(_("Creating the scores file '%s'\n"), ruta_completa); + fwrite(vec_marcas, sizeof(struct entrada), 7, arch); + fclose(arch); + } + else +- printf(_("Can't create the marcs file '%s'\n"), ruta_completa); ++ printf(_("Can't create the scores file '%s'\n"), ruta_completa); + + } only in patch2: unchanged: --- ceferino-0.97.8.orig/debian/patches/04_align_high_scores.patch +++ ceferino-0.97.8/debian/patches/04_align_high_scores.patch @@ -0,0 +1,12 @@ +diff -r -u ../ceferino-0.97.8.orig/src/marcas.cc ./src/marcas.cc +--- ceferino-0.97.8.orig/src/marcas.cc 2007-07-14 22:43:38.000000000 +0200 ++++ ceferino-0.97.8/src/marcas.cc 2009-02-10 12:49:57.000000000 +0100 +@@ -116,7 +116,7 @@ + puntos[3] = (vec_marcas [i].puntos) % 10 + '0'; + puntos[4] = '\0'; + +- pmundo->fuente->myprintf (screen, 520, 60 + i * 50, NULL, \ ++ pmundo->fuente->myprintf (screen, 500, 60 + i * 50, NULL, \ + NULL, false, NINGUNO, puntos); + } + only in patch2: unchanged: --- ceferino-0.97.8.orig/debian/patches/06_show_loading_of_font_at_right_time.patch +++ ceferino-0.97.8/debian/patches/06_show_loading_of_font_at_right_time.patch @@ -0,0 +1,20 @@ +diff -u ceferino-0.97.8.orig/src/fuente2.cc ceferino-0.97.8/src/fuente2.cc +--- ceferino-0.97.8.orig/src/fuente2.cc 2009-05-05 18:59:27.000000000 +0200 ++++ ceferino-0.97.8/src/fuente2.cc 2009-05-05 19:00:48.000000000 +0200 +@@ -35,6 +35,7 @@ + { + char ruta [1024] = DATADIR "/ima/fuente_2.png"; + ++ printf (_("+ Loading: %s\n"), ruta); + ima = IMG_Load (ruta); + + if (ima == NULL) +@@ -57,8 +58,6 @@ + letras = 0; + + cargar_identificar_recs (); +- +- printf (_("+ Loading: %s\n"), ruta); + } + + only in patch2: unchanged: --- ceferino-0.97.8.orig/debian/patches/05_force_latin1.patch +++ ceferino-0.97.8/debian/patches/05_force_latin1.patch @@ -0,0 +1,69 @@ +diff -u ceferino-0.97.8.orig/src/fuente2.cc ceferino-0.97.8/src/fuente2.cc +--- ceferino-0.97.8.orig/src/fuente2.cc 2009-02-10 13:02:36.000000000 +0100 ++++ ceferino-0.97.8/src/fuente2.cc 2009-03-23 08:05:18.000000000 +0100 +@@ -173,14 +173,7 @@ + SDL_Rect fuente2 :: obtener_referencia (char letra, bool transparente) + { + static SDL_Rect src; +- static char letras [] = \ +- "!\"#$%&'()*+,-./0123456789:;<=>?" \ +- "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`" \ +- "abcdefghijklmnopqrstuvwxyz" \ +- "{|}~¡¢£€¥Š§š©ª«¬­®¯°±²³Žµ¶·ž¹º»ŒœŸ¿" \ +- "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäå" \ +- "æçèéêëìíîïðñòóôõö÷øùúûüýþÿ"; +- "àèìòùâêîôû"; ++ unsigned char l = (unsigned char)letra; + + if (letra == ' ' || letra == '\0' || letra == '\n') + { +@@ -188,26 +181,18 @@ + return src; + } + +- for (int i = 0; letras [i] != '\0'; i ++) +- { +- if (letras [i] == letra) +- { +- if (transparente) +- { +- src = rects [i]; +- src.y += src.h; +- return src; +- } +- else +- { +- src = rects [i]; +- return src; +- } +- } ++ /* latin1: 0x21-0x7E, 0xA1-0xFF */ ++ if (l >= 33 && l <= 126) { ++ src = rects[l - 33]; ++ } else if (l >= 161) { ++ src = rects[l - 67]; ++ } else { ++ src = rects[0]; ++ printf (_("Character %u not found in font tiles\n"), (unsigned)l); ++ } ++ if (transparente) { ++ src.y += src.h; + } +- +- printf (_("'%c' not found in font tiles\n"), letra); +- src = rects [0]; + return src; + } + +diff -u ceferino-0.97.8.orig/src/main.cc ceferino-0.97.8/src/main.cc +--- ceferino-0.97.8.orig/src/main.cc 2006-01-14 21:04:13.000000000 +0100 ++++ ceferino-0.97.8/src/main.cc 2009-03-12 07:55:30.000000000 +0100 +@@ -42,7 +42,7 @@ + #ifdef ENABLE_NLS + printf ("Locale: %s\n", setlocale (LC_ALL, "")); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); +- bind_textdomain_codeset (GETTEXT_PACKAGE, ""); ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "latin1"); + textdomain (GETTEXT_PACKAGE); + #else + printf ("Locale: disabled\n"); only in patch2: unchanged: --- ceferino-0.97.8.orig/debian/patches/07_gcc_4.4.patch +++ ceferino-0.97.8/debian/patches/07_gcc_4.4.patch @@ -0,0 +1,14 @@ +Description: Fix nivel class to user proper var. +Index: ceferino-0.97.8/src/nivel.h +=================================================================== +--- ceferino-0.97.8.orig/src/nivel.h 2009-12-12 10:03:36.000000000 -0500 ++++ ceferino-0.97.8/src/nivel.h 2009-12-12 10:04:23.000000000 -0500 +@@ -34,7 +34,7 @@ + class nivel + { + public: +- void iniciar(juego *_pjuego, grafico *grafico, grafico *pfondos, SDL_Surface *fondo); ++ void iniciar(juego *_pjuego, grafico *ingrafico, grafico *pfondos, SDL_Surface *fondo); + int avanzar_nivel(int salto = 1); + int reiniciar_nivel(void); + int get_dist_suelo(int x, int y, int max);