r10217 - in packages/branches/zaz/miriam-i18n/debian: i18n patches

[Miriam Ruiz]

Author: miriam
Date: 2009-08-25 23:15:01 +0000 (Tue, 25 Aug 2009)
New Revision: 10217

Modified:
   packages/branches/zaz/miriam-i18n/debian/i18n/es.po
   packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch
Log:
Add missing strings



Modified: packages/branches/zaz/miriam-i18n/debian/i18n/es.po
===================================================================
--- packages/branches/zaz/miriam-i18n/debian/i18n/es.po	2009-08-25 22:47:08 UTC (rev 10216)
+++ packages/branches/zaz/miriam-i18n/debian/i18n/es.po	2009-08-25 23:15:01 UTC (rev 10217)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 00:44+0200\n"
-"PO-Revision-Date: 2009-08-26 00:47+0200\n"
+"POT-Creation-Date: 2009-08-26 01:12+0200\n"
+"PO-Revision-Date: 2009-08-26 01:14+0200\n"
 "Last-Translator: Miriam Ruiz <miriam at debian.org>\n"
 "Language-Team: español <es at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@
 "[http://nin.com] Publicado bajo la licencia Creative Commons Reconocimiento-"
 "No comercial-Compartir bajo la misma licencia"
 
-#: src/gameloop.cpp:57 src/gameloop.cpp:63
+#: src/gameloop.cpp:57 src/gameloop.cpp:63 src/gameloop.cpp:77
 msgid "End game"
 msgstr "Terminar el juego"
 
@@ -109,11 +109,11 @@
 msgid "Next level"
 msgstr "Siguiente nivel"
 
-#: src/gameloop.cpp:64 src/gameloop.cpp:71
+#: src/gameloop.cpp:64 src/gameloop.cpp:71 src/gameloop.cpp:78
 msgid "View replay"
 msgstr "Ver repetición"
 
-#: src/gameloop.cpp:65 src/gameloop.cpp:72
+#: src/gameloop.cpp:65 src/gameloop.cpp:72 src/gameloop.cpp:79
 msgid "Export video"
 msgstr "Exportar vídeo"
 
@@ -121,6 +121,10 @@
 msgid "Restart game"
 msgstr "Volver a empezar"
 
+#: src/gameloop.cpp:76
+msgid "Retry level"
+msgstr "Reintentar nivel"
+
 #: src/gameloop.cpp:474
 #, c-format
 msgid "Lives left: %d"
@@ -160,6 +164,10 @@
 msgid "please enter your name"
 msgstr "por favor, introduce tu nombre"
 
+#: src/game.cpp:613 src/game.cpp:622
+msgid "Time bonus !"
+msgstr "¡Tiempo extra!"
+
 #: data/data/level10.lvl:1
 msgid "The Three Dragonz"
 msgstr "Los tres dragones"
@@ -198,5 +206,5 @@
 
 #: data/data/level9.lvl:1
 msgid "Joker"
-msgstr "Joker"
+msgstr "Bufón"
 

Modified: packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch
===================================================================
--- packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch	2009-08-25 22:47:08 UTC (rev 10216)
+++ packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch	2009-08-25 23:15:01 UTC (rev 10217)
@@ -160,9 +160,25 @@
  
          glLoadIdentity();
          glEnable(GL_TEXTURE_2D);
+@@ -512,13 +512,13 @@
+             double size = 0.08;
+             glLoadIdentity( );
+             glColor4d(1.0, 1.0, 1.0, 1);
+-            FTBBox b = font->BBox(levels[f].lev.name.c_str());
++            FTBBox b = font->BBox(gettext(levels[f].lev.name.c_str()));
+             double txtw = b.Upper().X() / (1.0 / size);
+             glTranslated((xx * tw + spc) + (tw / 2) - (txtw / 2) + xmv, 16, 5);
+             glScaled(size, size, size);
+ 
+             glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+-            font->Render(levels[f].lev.name.c_str());
++            font->Render(gettext(levels[f].lev.name.c_str()));
+             glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ 
+             if (levels[f].locked)
 --- zaz-0.2.8.orig/src/gameloop.cpp
 +++ zaz-0.2.8/src/gameloop.cpp
-@@ -54,22 +54,22 @@
+@@ -54,29 +54,29 @@
          }
      };
  
@@ -195,6 +211,17 @@
  
      gameOverMenu.SetDimensions(30, 40, 40);
  
+-    lifeLostMenu.Add(new GenericMenuItem("Retry level", lifeLostMenuRetryLevelHandler, this));
+-    lifeLostMenu.Add(new GenericMenuItem("End game", pauseMenuEndGameHandler, this));
+-    lifeLostMenu.Add(new GenericMenuItem("View replay", nextLevelMenuViewReplayHandler, this));
+-    lifeLostMenu.Add(new GenericMenuItem("Export video", nextLevelMenuExportVideoHandler, this));
++    lifeLostMenu.Add(new GenericMenuItem(_("Retry level"), lifeLostMenuRetryLevelHandler, this));
++    lifeLostMenu.Add(new GenericMenuItem(_("End game"), pauseMenuEndGameHandler, this));
++    lifeLostMenu.Add(new GenericMenuItem(_("View replay"), nextLevelMenuViewReplayHandler, this));
++    lifeLostMenu.Add(new GenericMenuItem(_("Export video"), nextLevelMenuExportVideoHandler, this));
+ 
+     lifeLostMenu.SetDimensions(30, 40, 40);
+ 
 @@ -471,10 +471,10 @@
          glColor3d(1.0, 1.0, 1.0);
  
@@ -286,3 +313,21 @@
              glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  
              glPopMatrix();
+@@ -610,7 +610,7 @@
+     {
+ 
+         glLoadIdentity( );
+-        FTBBox b = font3->BBox("Time bonus !");
++        FTBBox b = font3->BBox(_("Time bonus !"));
+         double tw = b.Upper().X() / 5;
+ 
+         glTranslated((100 - tw) / 2, 50, 50);
+@@ -619,7 +619,7 @@
+         glColor4d(1.0, 0.0, 0.0, 1.0);
+ 
+         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+-        font3->Render("Time bonus !");
++        font3->Render(_("Time bonus !"));
+         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ 
+         glPopMatrix();