r3690 - in packages/trunk/hex-a-hop/debian: . i18n patches

Jens Seidel jseidel-guest at alioth.debian.org
Wed Aug 15 13:11:25 UTC 2007


Author: jseidel-guest
Date: 2007-08-15 13:11:25 +0000 (Wed, 15 Aug 2007)
New Revision: 3690

Modified:
   packages/trunk/hex-a-hop/debian/changelog
   packages/trunk/hex-a-hop/debian/control
   packages/trunk/hex-a-hop/debian/i18n/de.po
   packages/trunk/hex-a-hop/debian/i18n/es.po
   packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch
   packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch
Log:
Covert text to UTF-8. Works now for all encodings. But is it portable?
Added myself to Uploaders:.


Modified: packages/trunk/hex-a-hop/debian/changelog
===================================================================
--- packages/trunk/hex-a-hop/debian/changelog	2007-08-15 08:56:25 UTC (rev 3689)
+++ packages/trunk/hex-a-hop/debian/changelog	2007-08-15 13:11:25 UTC (rev 3690)
@@ -16,8 +16,10 @@
   * Fixed all compiler warnings and use e.g. -Wall -Wextra
     default. Closes: #437313
   * Use the SDLPango library for font handling. This is a first
-    draft and behaves differently for English and translations. It
-    also assumes a UTF-8 locale. It partely addresses #436469.
+    draft and behaves differently for English and translations.
+    Closes: #436469.
+  * debian/control:
+    + Added myself to the uploader list.
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Wed,  8 Aug 2007 16:34:41 +0200
 

Modified: packages/trunk/hex-a-hop/debian/control
===================================================================
--- packages/trunk/hex-a-hop/debian/control	2007-08-15 08:56:25 UTC (rev 3689)
+++ packages/trunk/hex-a-hop/debian/control	2007-08-15 13:11:25 UTC (rev 3690)
@@ -2,7 +2,7 @@
 Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org> 
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Jens Seidel <jensseidel at users.sf.net>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
 Build-Depends: debhelper (>= 5), quilt, gettext, libsdl1.2-dev, libsdl-pango-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/hex-a-hop/

Modified: packages/trunk/hex-a-hop/debian/i18n/de.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/de.po	2007-08-15 08:56:25 UTC (rev 3689)
+++ packages/trunk/hex-a-hop/debian/i18n/de.po	2007-08-15 13:11:25 UTC (rev 3690)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: hex-a-hop\n"
 "Report-Msgid-Bugs-To: hex-a-hop at packages.debian.org\n"
-"POT-Creation-Date: 2007-08-15 02:43+0200\n"
+"POT-Creation-Date: 2007-08-15 15:15+0200\n"
 "PO-Revision-Date: 2007-08-07 18:54+0200\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -14,130 +14,134 @@
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hex_puzzzle.cpp:1582
+#: gfx.cpp:182 hex_puzzzle.cpp:473 menus.h:199
+msgid "Press any key"
+msgstr "Beliebige Taste drücken"
+
+#: hex_puzzzle.cpp:1612
 #, c-format
 msgid "Complete 1  more level  to unlock!"
 msgstr "Einen weiteren Level zum Entsperren abschließen!"
 
-#: hex_puzzzle.cpp:1584
+#: hex_puzzzle.cpp:1614
 #, c-format
 msgid "Complete %d  more levels  to unlock!"
 msgstr "%d weitere Level zum Entsperren abschließen!"
 
-#: hex_puzzzle.cpp:1591
+#: hex_puzzzle.cpp:1621
 msgid "<<NO NAME>>"
 msgstr "<<KEIN NAME>>"
 
-#: hex_puzzzle.cpp:2629
+#: hex_puzzzle.cpp:2659
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr "Anti-Eis: %d"
 
-#: hex_puzzzle.cpp:2630
+#: hex_puzzzle.cpp:2660
 #, c-format
 msgid "Jumps: %d"
 msgstr "Sprünge: %d"
 
-#: hex_puzzzle.cpp:2631
+#: hex_puzzzle.cpp:2661
 #, c-format
 msgid "Score: %d (%d)"
 msgstr "Punktzahl: %d (%d)"
 
-#: hex_puzzzle.cpp:2632
+#: hex_puzzzle.cpp:2662
 #, c-format
 msgid "Par:   %d"
 msgstr "Erwartet:   %d"
 
-#: hex_puzzzle.cpp:2633
+#: hex_puzzzle.cpp:2663
 #, c-format
 msgid "Diff:  %d"
 msgstr "Diff:  %d"
 
-#: hex_puzzzle.cpp:2636
+#: hex_puzzzle.cpp:2666
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr " Erwartet: %d   Derzeit: %d"
 
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2669
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr " Anti-Eis: %d"
 
-#: hex_puzzzle.cpp:2641
+#: hex_puzzzle.cpp:2671
 #, c-format
 msgid " Jumps: %d"
 msgstr " Sprünge: %d"
 
-#: hex_puzzzle.cpp:2647
+#: hex_puzzzle.cpp:2677
 #, c-format
 msgid "Points: %d"
 msgstr "Punkte: %d"
 
-#: hex_puzzzle.cpp:2648
+#: hex_puzzzle.cpp:2678
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr "Entdeckt: %d%% (%d/%d)"
 
-#: hex_puzzzle.cpp:2649
+#: hex_puzzzle.cpp:2679
 #, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "Komplett: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2650
+#: hex_puzzzle.cpp:2680
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr "Gemeistert: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2653
+#: hex_puzzzle.cpp:2683
 #, c-format
 msgid " %d%% Mastered"
 msgstr " %d%% gemeistert"
 
-#: hex_puzzzle.cpp:2655
+#: hex_puzzzle.cpp:2685
 #, c-format
 msgid " %d%% Complete"
 msgstr " %d%% komplett"
 
-#: hex_puzzzle.cpp:2707
+#: hex_puzzzle.cpp:2737
 #, c-format
 msgid "Best:% 3d"
 msgstr "Bestwert:% 3d"
 
-#: hex_puzzzle.cpp:2708
+#: hex_puzzzle.cpp:2738
 #, c-format
 msgid "Par:% 3d"
 msgstr "Erwartet:% 3d"
 
-#: hex_puzzzle.cpp:2711
+#: hex_puzzzle.cpp:2741
 msgid "Completed"
 msgstr "Erledigt"
 
-#: hex_puzzzle.cpp:2714
+#: hex_puzzzle.cpp:2744
 msgid "Incomplete"
 msgstr "Nicht erledigt"
 
-#: hex_puzzzle.cpp:2755 menus.h:520
+#: hex_puzzzle.cpp:2785 menus.h:520
 msgid "Level Complete!"
 msgstr "Level erledigt!"
 
-#: hex_puzzzle.cpp:2875
+#: hex_puzzzle.cpp:2905
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr "Spezial(%d,%d): %s (%d)"
 
-#: hex_puzzzle.cpp:2875
+#: hex_puzzzle.cpp:2905
 msgid "<None>"
 msgstr "<Keine>"
 
-#: hex_puzzzle.cpp:3020
+#: hex_puzzzle.cpp:3050
 msgid "Select level"
 msgstr "Level auswählen"
 
-#: hex_puzzzle.cpp:4073
+#: hex_puzzzle.cpp:4103
 msgid "Save level"
 msgstr "Level speichern"
 
-#: hex_puzzzle.cpp:4079
+#: hex_puzzzle.cpp:4109
 msgid "Open level"
 msgstr "Level öffnen"
 
@@ -304,10 +308,6 @@
 "zu  scrollen. Weitere Seiten werden dargestellt,  je nachdem, wie Sie das "
 "Spiel durchlaufen."
 
-#: menus.h:199
-msgid "Press any key"
-msgstr "Beliebige Taste drücken"
-
 #: menus.h:286
 #, c-format
 msgid "Help (Page %d/%d)"

Modified: packages/trunk/hex-a-hop/debian/i18n/es.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/es.po	2007-08-15 08:56:25 UTC (rev 3689)
+++ packages/trunk/hex-a-hop/debian/i18n/es.po	2007-08-15 13:11:25 UTC (rev 3690)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: levels.es\n"
 "Report-Msgid-Bugs-To: hex-a-hop at packages.debian.org\n"
-"POT-Creation-Date: 2007-08-15 02:43+0200\n"
+"POT-Creation-Date: 2007-08-15 15:15+0200\n"
 "PO-Revision-Date: 2007-08-05 10:42+0200\n"
 "Last-Translator: Miriam Ruiz <little_miry at yahoo.es>\n"
 "Language-Team: Español <es at li.org>\n"
@@ -17,131 +17,135 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: hex_puzzzle.cpp:1582
+#: gfx.cpp:182 hex_puzzzle.cpp:473 menus.h:199
+msgid "Press any key"
+msgstr "Pulsa una tecla"
+
+#: hex_puzzzle.cpp:1612
 #, fuzzy, c-format
 msgid "Complete 1  more level  to unlock!"
 msgstr "Completa __ niveles para desbloquear"
 
-#: hex_puzzzle.cpp:1584
+#: hex_puzzzle.cpp:1614
 #, fuzzy, c-format
 msgid "Complete %d  more levels  to unlock!"
 msgstr "Completa __ niveles para desbloquear"
 
-#: hex_puzzzle.cpp:1591
+#: hex_puzzzle.cpp:1621
 msgid "<<NO NAME>>"
 msgstr ""
 
-#: hex_puzzzle.cpp:2629
+#: hex_puzzzle.cpp:2659
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2630
+#: hex_puzzzle.cpp:2660
 #, c-format
 msgid "Jumps: %d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2631
+#: hex_puzzzle.cpp:2661
 #, c-format
 msgid "Score: %d (%d)"
 msgstr ""
 
-#: hex_puzzzle.cpp:2632
+#: hex_puzzzle.cpp:2662
 #, c-format
 msgid "Par:   %d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2633
+#: hex_puzzzle.cpp:2663
 #, c-format
 msgid "Diff:  %d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2636
+#: hex_puzzzle.cpp:2666
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2669
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2641
+#: hex_puzzzle.cpp:2671
 #, c-format
 msgid " Jumps: %d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2647
+#: hex_puzzzle.cpp:2677
 #, c-format
 msgid "Points: %d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2648
+#: hex_puzzzle.cpp:2678
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr ""
 
-#: hex_puzzzle.cpp:2649
+#: hex_puzzzle.cpp:2679
 #, fuzzy, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "Nivel terminado"
 
-#: hex_puzzzle.cpp:2650
+#: hex_puzzzle.cpp:2680
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr ""
 
-#: hex_puzzzle.cpp:2653
+#: hex_puzzzle.cpp:2683
 #, c-format
 msgid " %d%% Mastered"
 msgstr ""
 
-#: hex_puzzzle.cpp:2655
+#: hex_puzzzle.cpp:2685
 #, fuzzy, c-format
 msgid " %d%% Complete"
 msgstr "Nivel terminado"
 
-#: hex_puzzzle.cpp:2707
+#: hex_puzzzle.cpp:2737
 #, c-format
 msgid "Best:% 3d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2708
+#: hex_puzzzle.cpp:2738
 #, c-format
 msgid "Par:% 3d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2711
+#: hex_puzzzle.cpp:2741
 #, fuzzy
 msgid "Completed"
 msgstr "Nivel terminado"
 
-#: hex_puzzzle.cpp:2714
+#: hex_puzzzle.cpp:2744
 msgid "Incomplete"
 msgstr ""
 
-#: hex_puzzzle.cpp:2755 menus.h:520
+#: hex_puzzzle.cpp:2785 menus.h:520
 msgid "Level Complete!"
 msgstr "Nivel terminado"
 
-#: hex_puzzzle.cpp:2875
+#: hex_puzzzle.cpp:2905
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr ""
 
-#: hex_puzzzle.cpp:2875
+#: hex_puzzzle.cpp:2905
 msgid "<None>"
 msgstr ""
 
-#: hex_puzzzle.cpp:3020
+#: hex_puzzzle.cpp:3050
 msgid "Select level"
 msgstr ""
 
-#: hex_puzzzle.cpp:4073
+#: hex_puzzzle.cpp:4103
 msgid "Save level"
 msgstr ""
 
-#: hex_puzzzle.cpp:4079
+#: hex_puzzzle.cpp:4109
 msgid "Open level"
 msgstr ""
 
@@ -255,10 +259,6 @@
 "help pages. More pages will be  added as you progress through the game."
 msgstr ""
 
-#: menus.h:199
-msgid "Press any key"
-msgstr "Pulsa una tecla"
-
 #: menus.h:286
 #, c-format
 msgid "Help (Page %d/%d)"

Modified: packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch	2007-08-15 08:56:25 UTC (rev 3689)
+++ packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch	2007-08-15 13:11:25 UTC (rev 3690)
@@ -4,8 +4,8 @@
 Index: hex-a-hop.svn/i18n.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ hex-a-hop.svn/i18n.h	2007-08-14 19:37:48.000000000 +0200
-@@ -0,0 +1,42 @@
++++ hex-a-hop.svn/i18n.h	2007-08-15 13:40:50.000000000 +0200
+@@ -0,0 +1,43 @@
 +// (c) 2007 Miriam Ruiz <little_miry at yahoo.es>
 +//
 +// This library is free software; you can redistribute it and/or
@@ -37,6 +37,7 @@
 +		static bool IsInit;
 +	public:
 +		GetTextInit();
++		const char *GetEncoding() const;
 +};
 +
 +static GetTextInit gettext_init;
@@ -50,8 +51,8 @@
 +#endif
 Index: hex-a-hop.svn/hex_puzzzle.cpp
 ===================================================================
---- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-08-14 19:37:45.000000000 +0200
-+++ hex-a-hop.svn/hex_puzzzle.cpp	2007-08-14 19:39:17.000000000 +0200
+--- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-08-15 12:55:12.000000000 +0200
++++ hex-a-hop.svn/hex_puzzzle.cpp	2007-08-15 13:40:01.000000000 +0200
 @@ -16,6 +16,7 @@
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
@@ -192,8 +193,8 @@
  		}
 Index: hex-a-hop.svn/level_list.h
 ===================================================================
---- hex-a-hop.svn.orig/level_list.h	2007-07-06 16:18:54.000000000 +0200
-+++ hex-a-hop.svn/level_list.h	2007-08-14 19:37:48.000000000 +0200
+--- hex-a-hop.svn.orig/level_list.h	2007-08-15 04:43:31.000000000 +0200
++++ hex-a-hop.svn/level_list.h	2007-08-15 12:55:13.000000000 +0200
 @@ -22,112 +22,112 @@
  	const char *file, *name;
  } levelNames[] = {
@@ -415,8 +416,8 @@
  };
 Index: hex-a-hop.svn/gfx.cpp
 ===================================================================
---- hex-a-hop.svn.orig/gfx.cpp	2007-08-14 19:37:45.000000000 +0200
-+++ hex-a-hop.svn/gfx.cpp	2007-08-14 19:40:04.000000000 +0200
+--- hex-a-hop.svn.orig/gfx.cpp	2007-08-15 12:55:12.000000000 +0200
++++ hex-a-hop.svn/gfx.cpp	2007-08-15 13:40:00.000000000 +0200
 @@ -16,6 +16,8 @@
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
@@ -429,8 +430,8 @@
 Index: hex-a-hop.svn/i18n.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ hex-a-hop.svn/i18n.cpp	2007-08-14 19:37:48.000000000 +0200
-@@ -0,0 +1,40 @@
++++ hex-a-hop.svn/i18n.cpp	2007-08-15 13:41:09.000000000 +0200
+@@ -0,0 +1,49 @@
 +// (c) 2007 Miriam Ruiz <little_miry at yahoo.es>
 +//
 +// This library is free software; you can redistribute it and/or
@@ -454,6 +455,7 @@
 +
 +#include <libintl.h>
 +#include <locale.h>
++#include <langinfo.h>
 +
 +GetTextInit::GetTextInit()
 +{
@@ -470,11 +472,19 @@
 +
 +bool GetTextInit::IsInit = false;
 +
++const char *GetTextInit::GetEncoding() const
++{
++	// See http://svn.xiph.org/trunk/vorbis-tools/intl/localcharset.c
++	// if nl_langinfo isn't found
++	char *locale_enc = nl_langinfo(CODESET);
++	return locale_enc;
++}
++
 +#endif
 Index: hex-a-hop.svn/menus.h
 ===================================================================
---- hex-a-hop.svn.orig/menus.h	2007-07-06 16:18:54.000000000 +0200
-+++ hex-a-hop.svn/menus.h	2007-08-14 19:37:48.000000000 +0200
+--- hex-a-hop.svn.orig/menus.h	2007-08-15 04:43:31.000000000 +0200
++++ hex-a-hop.svn/menus.h	2007-08-15 13:40:01.000000000 +0200
 @@ -84,61 +84,61 @@
  const char * hint[] = {
  	
@@ -772,8 +782,8 @@
  		
 Index: hex-a-hop.svn/Makefile
 ===================================================================
---- hex-a-hop.svn.orig/Makefile	2007-08-14 19:37:45.000000000 +0200
-+++ hex-a-hop.svn/Makefile	2007-08-14 19:37:48.000000000 +0200
+--- hex-a-hop.svn.orig/Makefile	2007-08-15 12:55:12.000000000 +0200
++++ hex-a-hop.svn/Makefile	2007-08-15 13:40:00.000000000 +0200
 @@ -5,7 +5,7 @@
  DATA_DIR="."
  CXXFLAGS		+= -g

Modified: packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch	2007-08-15 08:56:25 UTC (rev 3689)
+++ packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch	2007-08-15 13:11:25 UTC (rev 3690)
@@ -1,7 +1,7 @@
 Index: hex-a-hop.svn/gfx.cpp
 ===================================================================
---- hex-a-hop.svn.orig/gfx.cpp	2007-08-15 03:04:57.000000000 +0200
-+++ hex-a-hop.svn/gfx.cpp	2007-08-15 04:41:18.000000000 +0200
+--- hex-a-hop.svn.orig/gfx.cpp	2007-08-15 12:55:15.000000000 +0200
++++ hex-a-hop.svn/gfx.cpp	2007-08-15 12:55:16.000000000 +0200
 @@ -30,6 +30,14 @@
  	#undef USE_BBTABLET
  #endif
@@ -97,17 +97,20 @@
  }
 Index: hex-a-hop.svn/hex_puzzzle.cpp
 ===================================================================
---- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-08-15 03:01:37.000000000 +0200
-+++ hex-a-hop.svn/hex_puzzzle.cpp	2007-08-15 04:32:43.000000000 +0200
-@@ -17,6 +17,7 @@
+--- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-08-15 12:55:15.000000000 +0200
++++ hex-a-hop.svn/hex_puzzzle.cpp	2007-08-15 13:37:36.000000000 +0200
+@@ -17,6 +17,10 @@
  */
  
  #include "i18n.h"
 +#include <string>
++#include <iostream>
++#include <errno.h>
++#include <iconv.h>
  
  //////////////////////////////////////////////////////
  // Config
-@@ -406,6 +407,7 @@
+@@ -406,6 +410,7 @@
  	}
  }
  
@@ -115,7 +118,7 @@
  void Print(int x, int y, const char * string, ...)
  {
  	va_list marker;
-@@ -427,6 +429,7 @@
+@@ -427,6 +432,7 @@
  	return w;
  }
  
@@ -123,7 +126,7 @@
  void PrintR(int x, int y, const char * string, ...)
  {
  	va_list marker;
-@@ -440,16 +443,32 @@
+@@ -440,16 +446,39 @@
  	va_end( marker );              /* Reset variable arguments.      */
  }
  
@@ -138,14 +141,21 @@
  	va_start( marker, string );     /* Initialize variable arguments. */
  
 -	char tmp[1000];
-+	char tmp[1000]; // FIXME: Check this limit
++	char tmp[1000], tmp_utf8[5000]; // FIXME: Check this limit
  	vsprintf((char*)tmp, string, marker);
  
 -	char* scan = tmp;
 -	while (1)
-+  const char *tmp_utf8 = tmp;
-+  // TODO: convert tmp (from current locale encoding) to UTF-8
-+  // How? using iconv? Is this portable?
++  // Is this portable?
++  size_t tmp_length = std::string(tmp).length()+1, tmp_utf8_length = 5000;
++  errno = 0;
++	 static const char *locale_enc = gettext_init.GetEncoding();
++  iconv_t cd = iconv_open("UTF-8", locale_enc);
++  char *in_buf = &tmp[0], *out_buf = &tmp_utf8[0];
++  iconv(cd, &in_buf, &tmp_length, &out_buf, &tmp_utf8_length);
++  iconv_close(cd);
++  if (errno != 0)
++    std::cerr << "An error occurred recoding " << tmp << " to UTF8" << std::endl;
 +
 +  if (std::string(_("Press any key")) != std::string("Press any key"))
 +    split = false; // TODO: Let's ignore linebreaks in translations for now
@@ -159,7 +169,7 @@
  	{
  		char * end = split ? strstr(scan,"  ") : 0;
  		if (!end)
-@@ -465,6 +484,7 @@
+@@ -465,6 +494,7 @@
  			y += FONT_SPACING;
  		}
  	}
@@ -169,8 +179,8 @@
  }
 Index: hex-a-hop.svn/Makefile
 ===================================================================
---- hex-a-hop.svn.orig/Makefile	2007-08-15 03:13:30.000000000 +0200
-+++ hex-a-hop.svn/Makefile	2007-08-15 03:13:47.000000000 +0200
+--- hex-a-hop.svn.orig/Makefile	2007-08-15 12:55:15.000000000 +0200
++++ hex-a-hop.svn/Makefile	2007-08-15 12:55:16.000000000 +0200
 @@ -19,7 +19,7 @@
  	$(GCC) $(CXXFLAGS) -D_VERSION=\"$(VERSION)\" -DDATA_DIR=\"$(DATA_DIR)\" `sdl-config --cflags`  -c -o $@ $<
  	




More information about the Pkg-games-commits mailing list