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

[Miriam Ruiz]

Author: miriam
Date: 2009-08-24 23:04:42 +0000 (Mon, 24 Aug 2009)
New Revision: 10208

Modified:
   packages/branches/zaz/miriam-i18n/debian/i18n/es.po
   packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch
   packages/branches/zaz/miriam-i18n/debian/patches/no_music.patch
   packages/branches/zaz/miriam-i18n/debian/patches/series
Log:
Translate level names



Modified: packages/branches/zaz/miriam-i18n/debian/i18n/es.po
===================================================================
--- packages/branches/zaz/miriam-i18n/debian/i18n/es.po	2009-08-24 22:51:39 UTC (rev 10207)
+++ packages/branches/zaz/miriam-i18n/debian/i18n/es.po	2009-08-24 23:04:42 UTC (rev 10208)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 00:47+0200\n"
-"PO-Revision-Date: 2009-08-25 00:51+0200\n"
+"POT-Creation-Date: 2009-08-25 01:01+0200\n"
+"PO-Revision-Date: 2009-08-25 01:04+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"
@@ -81,6 +81,20 @@
 msgid "[remigiusz.dybka at gmail.com]"
 msgstr ""
 
+#: src/mainmenu.cpp:272
+msgid "music:"
+msgstr "música"
+
+#: src/mainmenu.cpp:273
+msgid "Nine Inch Nails"
+msgstr ""
+
+#: src/mainmenu.cpp:274
+msgid ""
+"[http://nin.com] Released under Creative Commons Attribution Non-Commercial "
+"Share Alike License"
+msgstr "[http://nin.com] Publicado bajo la licencia Creative Commons Reconocimiento-No comercial-Compartir bajo la misma licencia"
+
 #: src/gameloop.cpp:56 src/gameloop.cpp:62
 msgid "End game"
 msgstr "Terminar el juego"

Modified: packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch
===================================================================
--- packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch	2009-08-24 22:51:39 UTC (rev 10207)
+++ packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch	2009-08-24 23:04:42 UTC (rev 10208)
@@ -140,19 +140,27 @@
          glPopMatrix();
  
          float y = 35;
-@@ -265,9 +265,9 @@
+@@ -265,13 +265,13 @@
      if (showCredits)
      {
          glColor4f(1.0, 1.0, 1.0, 1.0);
 -        CenterMsg("code, gfx, snd & design:", 46, font, 0.08);
 -        CenterMsg("Remigiusz Dybka", 43.5, font, 0.1);
 -        CenterMsg("[remigiusz.dybka at gmail.com]", 41.5, font, 0.08);
+-
+-        CenterMsg("music:", 37, font, 0.08);
+-        CenterMsg("Nine Inch Nails", 34.5, font, 0.1);
+-        CenterMsg("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License", 32.5, font, 0.08);
 +        CenterMsg(_("code, gfx, snd & design:"), 46, font, 0.08);
 +        CenterMsg(_("Remigiusz Dybka"), 43.5, font, 0.1);
 +        CenterMsg(_("[remigiusz.dybka at gmail.com]"), 41.5, font, 0.08);
++
++        CenterMsg(_("music:"), 37, font, 0.08);
++        CenterMsg(_("Nine Inch Nails"), 34.5, font, 0.1);
++        CenterMsg(_("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License"), 32.5, font, 0.08);
  
-         //CenterMsg("music:", 37, font, 0.08);
-         //CenterMsg("Nine Inch Nails", 34.5, font, 0.1);
+ 		glLoadIdentity();                    
+ 	    glEnable(GL_TEXTURE_2D);
 --- zaz-0.2.6.orig/src/gameloop.cpp
 +++ zaz-0.2.6/src/gameloop.cpp
 @@ -53,22 +53,22 @@
@@ -257,3 +265,12 @@
          double tw = b.Upper().X() / 5;
  
          glTranslated((100 - tw) / 2, 50, 5);
+@@ -502,7 +502,7 @@
+         glColor4d(1.0, 1.0, 1.0, alpha);
+ 
+         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+-        font3->Render(level.name.c_str());
++        font3->Render(gettext(level.name.c_str()));
+         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ 
+         glPopMatrix();

Modified: packages/branches/zaz/miriam-i18n/debian/patches/no_music.patch
===================================================================
--- packages/branches/zaz/miriam-i18n/debian/patches/no_music.patch	2009-08-24 22:51:39 UTC (rev 10207)
+++ packages/branches/zaz/miriam-i18n/debian/patches/no_music.patch	2009-08-24 23:04:42 UTC (rev 10208)
@@ -25,15 +25,15 @@
  
  void MainMenu::StopMusic()
 @@ -269,9 +269,9 @@
-         CenterMsg("Remigiusz Dybka", 43.5, font, 0.1);
-         CenterMsg("[remigiusz.dybka at gmail.com]", 41.5, font, 0.08);
+         CenterMsg(_("Remigiusz Dybka"), 43.5, font, 0.1);
+         CenterMsg(_("[remigiusz.dybka at gmail.com]"), 41.5, font, 0.08);
  
--        CenterMsg("music:", 37, font, 0.08);
--        CenterMsg("Nine Inch Nails", 34.5, font, 0.1);
--        CenterMsg("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License", 32.5, font, 0.08);
-+        //CenterMsg("music:", 37, font, 0.08);
-+        //CenterMsg("Nine Inch Nails", 34.5, font, 0.1);
-+        //CenterMsg("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License", 32.5, font, 0.08);
+-        CenterMsg(_("music:"), 37, font, 0.08);
+-        CenterMsg(_("Nine Inch Nails"), 34.5, font, 0.1);
+-        CenterMsg(_("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License"), 32.5, font, 0.08);
++        //CenterMsg(_("music:"), 37, font, 0.08);
++        //CenterMsg(_("Nine Inch Nails"), 34.5, font, 0.1);
++        //CenterMsg(_("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License"), 32.5, font, 0.08);
  
  		glLoadIdentity();                    
  	    glEnable(GL_TEXTURE_2D);

Modified: packages/branches/zaz/miriam-i18n/debian/patches/series
===================================================================
--- packages/branches/zaz/miriam-i18n/debian/patches/series	2009-08-24 22:51:39 UTC (rev 10207)
+++ packages/branches/zaz/miriam-i18n/debian/patches/series	2009-08-24 23:04:42 UTC (rev 10208)
@@ -1,3 +1,3 @@
 configure_miss.patch
+add_gettext.patch
 no_music.patch
-add_gettext.patch