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

Mon Aug 27 19:14:05 UTC 2007

Author: jseidel-guest
Date: 2007-08-27 19:14:04 +0000 (Mon, 27 Aug 2007)
New Revision: 3891

Modified:
   packages/trunk/hex-a-hop/debian/i18n/bg.po
   packages/trunk/hex-a-hop/debian/i18n/de.po
   packages/trunk/hex-a-hop/debian/i18n/es.po
   packages/trunk/hex-a-hop/debian/i18n/nl.po
   packages/trunk/hex-a-hop/debian/i18n/ru.po
   packages/trunk/hex-a-hop/debian/i18n/vi.po
   packages/trunk/hex-a-hop/debian/patches/array_subscripts_warning.patch
   packages/trunk/hex-a-hop/debian/patches/compiler_warnings.patch
   packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch
   packages/trunk/hex-a-hop/debian/patches/i18n_increase_array_sizes.patch
   packages/trunk/hex-a-hop/debian/patches/mouse_cursor_without_font.patch
   packages/trunk/hex-a-hop/debian/patches/patch-hex-a-hop-better-than-par.diff
   packages/trunk/hex-a-hop/debian/patches/remove_old_font_handling.patch
Log:
Added a ngettext call and unfuzzied translations (#439819).

Thanks to Piotr Engelking <inkerman42 at gmail.com>


Modified: packages/trunk/hex-a-hop/debian/i18n/bg.po
===================================================================

--- packages/trunk/hex-a-hop/debian/i18n/bg.po	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/i18n/bg.po	2007-08-27 19:14:04 UTC (rev 3891)
@@ -47,134 +47,131 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: hex_puzzzle.cpp:1568
+#: hex_puzzzle.cpp:1567
 #, c-format
 msgid "Complete 1  more level  to unlock!"
-msgstr "ÐŸÑ€ÐµÐ¼Ð¸Ð½ÐµÑ‚Ðµ Ð¾Ñ‰Ðµ ÐµÐ´Ð½Ð¾ Ð½Ð¸Ð²Ð¾ Ð·Ð° Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ!"
+msgid_plural "Complete %d  more levels  to unlock!"
+msgstr[0] "ÐŸÑ€ÐµÐ¼Ð¸Ð½ÐµÑ‚Ðµ Ð¾Ñ‰Ðµ ÐµÐ´Ð½Ð¾ Ð½Ð¸Ð²Ð¾ Ð·Ð° Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ!"
+msgstr[1] "ÐŸÑ€ÐµÐ¼Ð¸Ð½ÐµÑ‚Ðµ Ð¾Ñ‰Ðµ %d Ð½Ð¸Ð²Ð° Ð·Ð° Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ!"
 
-#: hex_puzzzle.cpp:1570
-#, c-format
-msgid "Complete %d  more levels  to unlock!"
-msgstr "ÐŸÑ€ÐµÐ¼Ð¸Ð½ÐµÑ‚Ðµ Ð¾Ñ‰Ðµ %d Ð½Ð¸Ð²Ð° Ð·Ð° Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ!"
-
-#: hex_puzzzle.cpp:1577
+#: hex_puzzzle.cpp:1574
 msgid "<<NO NAME>>"
 msgstr "<<Ð‘Ð•Ð— Ð˜ÐœÐ•>>"
 
 #. TRANSLATORS: Anti-Ice are pickups, which turn ice plates into solid
 #. plates once you step on them. Each pickup changes one ice plate
-#: hex_puzzzle.cpp:2617
+#: hex_puzzzle.cpp:2614
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr "ÐšÐ¾Ñ‚ÐºÐ¸: %d"
 
-#: hex_puzzzle.cpp:2618
+#: hex_puzzzle.cpp:2615
 #, c-format
 msgid "Jumps: %d"
 msgstr "ÐŸÑ€ÑƒÐ¶Ð¸Ð½Ð¸: %d"
 
-#: hex_puzzzle.cpp:2619
+#: hex_puzzzle.cpp:2616
 #, c-format
 msgid "Score: %d (%d)"
 msgstr "Ð¢Ð¾Ñ‡ÐºÐ¸: %d (%d)"
 
 #. TRANSLATORS: Par is similar to golf, a pre defined score which you
 #. can attempt to beat
-#: hex_puzzzle.cpp:2622
+#: hex_puzzzle.cpp:2619
 #, c-format
 msgid "Par:   %d"
 msgstr "ÐÐ¾Ñ€Ð¼Ð°: %d"
 
-#: hex_puzzzle.cpp:2623
+#: hex_puzzzle.cpp:2620
 #, c-format
 msgid "Diff:  %d"
 msgstr "Ð Ð°Ð·Ð»Ð¸ÐºÐ°: %d"
 
-#: hex_puzzzle.cpp:2626
+#: hex_puzzzle.cpp:2623
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr "ÐÐ¾Ñ€Ð¼Ð°: %d   Ð¢ÐµÐºÑƒÑ‰Ð¾: %d"
 
-#: hex_puzzzle.cpp:2629
+#: hex_puzzzle.cpp:2626
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr " ÐšÐ¾Ñ‚ÐºÐ¸: %d"
 
-#: hex_puzzzle.cpp:2631
+#: hex_puzzzle.cpp:2628
 #, c-format
 msgid " Jumps: %d"
 msgstr " ÐŸÑ€ÑƒÐ¶Ð¸Ð½Ð¸: %d"
 
-#: hex_puzzzle.cpp:2637
+#: hex_puzzzle.cpp:2634
 #, c-format
 msgid "Points: %d"
 msgstr "Ð¢Ð¾Ñ‡ÐºÐ¸: %d"
 
-#: hex_puzzzle.cpp:2638
+#: hex_puzzzle.cpp:2635
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr "Ð Ð°Ð·ÐºÑ€Ð¸Ñ‚Ð¸: %d%% (%d/%d)"
 
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2636
 #, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "ÐŸÑ€ÐµÐ¼Ð¸Ð½Ð°Ñ‚Ð¸: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2640
+#: hex_puzzzle.cpp:2637
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr "ÐžÐ²Ð»Ð°Ð´ÐµÐ½Ð¸: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2643
+#: hex_puzzzle.cpp:2640
 #, c-format
 msgid " %d%% Mastered"
 msgstr " Ð¾Ð²Ð»Ð°Ð´ÐµÐ½Ð¸ %d%%"
 
-#: hex_puzzzle.cpp:2645
+#: hex_puzzzle.cpp:2642
 #, c-format
 msgid " %d%% Complete"
 msgstr " Ð¿Ñ€ÐµÐ¼Ð¸Ð½Ð°Ñ‚Ð¸ %d%%"
 
-#: hex_puzzzle.cpp:2697
+#: hex_puzzzle.cpp:2694
 #, c-format
 msgid "Best:% 3d"
 msgstr "Ð ÐµÐºÐ¾Ñ€Ð´:% 3d"
 
-#: hex_puzzzle.cpp:2698
+#: hex_puzzzle.cpp:2695
 #, c-format
 msgid "Par:% 3d"
 msgstr "ÐÐ¾Ñ€Ð¼Ð°:% 3d"
 
-#: hex_puzzzle.cpp:2701
+#: hex_puzzzle.cpp:2698
 msgid "Completed"
 msgstr "ÐŸÑ€ÐµÐ¼Ð¸Ð½Ð°Ñ‚Ð¾"
 
-#: hex_puzzzle.cpp:2704
+#: hex_puzzzle.cpp:2701
 msgid "Incomplete"
 msgstr "ÐŸÑ€ÐµÐ´ÑÑ‚Ð¾ÑÑ‰Ð¾"
 
-#: hex_puzzzle.cpp:2745 menus.h:563
+#: hex_puzzzle.cpp:2742 menus.h:563
 msgid "Level Complete!"
 msgstr "ÐÐ¸Ð²Ð¾Ñ‚Ð¾ Ðµ Ð¿Ñ€ÐµÐ¼Ð¸Ð½Ð°Ñ‚Ð¾!"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr "Ð¡Ð¿ÐµÑ†Ð¸Ð°Ð»Ð½Ð¸(%d,%d): %s (%d)"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 msgid "<None>"
 msgstr "<ÐÑÐ¼Ð°>"
 
-#: hex_puzzzle.cpp:3006
+#: hex_puzzzle.cpp:3003
 msgid "Select level"
 msgstr "Ð˜Ð·Ð±Ð¾Ñ€ Ð½Ð° Ð½Ð¸Ð²Ð¾"
 
-#: hex_puzzzle.cpp:4059
+#: hex_puzzzle.cpp:4056
 msgid "Save level"
 msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð½Ð° Ð½Ð¸Ð²Ð¾"
 
-#: hex_puzzzle.cpp:4065
+#: hex_puzzzle.cpp:4062
 msgid "Open level"
 msgstr "ÐžÑ‚Ð²Ð°Ñ€ÑÐ½Ðµ Ð½Ð° Ð½Ð¸Ð²Ð¾"
 

Modified: packages/trunk/hex-a-hop/debian/i18n/de.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/de.po	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/i18n/de.po	2007-08-27 19:14:04 UTC (rev 3891)
@@ -45,134 +45,131 @@
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hex_puzzzle.cpp:1568
+#: hex_puzzzle.cpp:1567
 #, c-format
 msgid "Complete 1  more level  to unlock!"
-msgstr "Einen weiteren Level zum Entsperren abschließen!"
+msgid_plural "Complete %d  more levels  to unlock!"
+msgstr[0] "Einen weiteren Level zum Entsperren abschließen!"
+msgstr[1] "%d weitere Level zum Entsperren abschließen!"
 
-#: hex_puzzzle.cpp:1570
-#, c-format
-msgid "Complete %d  more levels  to unlock!"
-msgstr "%d weitere Level zum Entsperren abschließen!"
-
-#: hex_puzzzle.cpp:1577
+#: hex_puzzzle.cpp:1574
 msgid "<<NO NAME>>"
 msgstr "<<KEIN NAME>>"
 
 #. TRANSLATORS: Anti-Ice are pickups, which turn ice plates into solid
 #. plates once you step on them. Each pickup changes one ice plate
-#: hex_puzzzle.cpp:2617
+#: hex_puzzzle.cpp:2614
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr "Anti-Eis: %d"
 
-#: hex_puzzzle.cpp:2618
+#: hex_puzzzle.cpp:2615
 #, c-format
 msgid "Jumps: %d"
 msgstr "Sprünge: %d"
 
-#: hex_puzzzle.cpp:2619
+#: hex_puzzzle.cpp:2616
 #, c-format
 msgid "Score: %d (%d)"
 msgstr "Punktzahl: %d (%d)"
 
 #. TRANSLATORS: Par is similar to golf, a pre defined score which you
 #. can attempt to beat
-#: hex_puzzzle.cpp:2622
+#: hex_puzzzle.cpp:2619
 #, c-format
 msgid "Par:   %d"
 msgstr "Erwartet:   %d"
 
-#: hex_puzzzle.cpp:2623
+#: hex_puzzzle.cpp:2620
 #, c-format
 msgid "Diff:  %d"
 msgstr "Diff:  %d"
 
-#: hex_puzzzle.cpp:2626
+#: hex_puzzzle.cpp:2623
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr " Erwartet: %d   Derzeit: %d"
 
-#: hex_puzzzle.cpp:2629
+#: hex_puzzzle.cpp:2626
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr " Anti-Eis: %d"
 
-#: hex_puzzzle.cpp:2631
+#: hex_puzzzle.cpp:2628
 #, c-format
 msgid " Jumps: %d"
 msgstr " Sprünge: %d"
 
-#: hex_puzzzle.cpp:2637
+#: hex_puzzzle.cpp:2634
 #, c-format
 msgid "Points: %d"
 msgstr "Punkte: %d"
 
-#: hex_puzzzle.cpp:2638
+#: hex_puzzzle.cpp:2635
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr "Entdeckt: %d%% (%d/%d)"
 
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2636
 #, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "Komplett: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2640
+#: hex_puzzzle.cpp:2637
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr "Gemeistert: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2643
+#: hex_puzzzle.cpp:2640
 #, c-format
 msgid " %d%% Mastered"
 msgstr " %d%% gemeistert"
 
-#: hex_puzzzle.cpp:2645
+#: hex_puzzzle.cpp:2642
 #, c-format
 msgid " %d%% Complete"
 msgstr " %d%% komplett"
 
-#: hex_puzzzle.cpp:2697
+#: hex_puzzzle.cpp:2694
 #, c-format
 msgid "Best:% 3d"
 msgstr "Bestwert:% 3d"
 
-#: hex_puzzzle.cpp:2698
+#: hex_puzzzle.cpp:2695
 #, c-format
 msgid "Par:% 3d"
 msgstr "Erwartet:% 3d"
 
-#: hex_puzzzle.cpp:2701
+#: hex_puzzzle.cpp:2698
 msgid "Completed"
 msgstr "Erledigt"
 
-#: hex_puzzzle.cpp:2704
+#: hex_puzzzle.cpp:2701
 msgid "Incomplete"
 msgstr "Nicht erledigt"
 
-#: hex_puzzzle.cpp:2745 menus.h:563
+#: hex_puzzzle.cpp:2742 menus.h:563
 msgid "Level Complete!"
 msgstr "Level erledigt!"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr "Spezial(%d,%d): %s (%d)"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 msgid "<None>"
 msgstr "<Keine>"
 
-#: hex_puzzzle.cpp:3006
+#: hex_puzzzle.cpp:3003
 msgid "Select level"
 msgstr "Level auswählen"
 
-#: hex_puzzzle.cpp:4059
+#: hex_puzzzle.cpp:4056
 msgid "Save level"
 msgstr "Level speichern"
 
-#: hex_puzzzle.cpp:4065
+#: hex_puzzzle.cpp:4062
 msgid "Open level"
 msgstr "Level öffnen"
 

Modified: packages/trunk/hex-a-hop/debian/i18n/es.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/es.po	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/i18n/es.po	2007-08-27 19:14:04 UTC (rev 3891)
@@ -43,134 +43,131 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: hex_puzzzle.cpp:1568
+#: hex_puzzzle.cpp:1567
 #, c-format
 msgid "Complete 1  more level  to unlock!"
-msgstr "Â¡Completa un  nivel mÃ¡s  para desbloquear!"
+msgid_plural "Complete %d  more levels  to unlock!"
+msgstr[0] "Â¡Completa un  nivel mÃ¡s  para desbloquear!"
+msgstr[1] "Â¡Completa %d  niveles mÃ¡s  para desbloquear!"
 
-#: hex_puzzzle.cpp:1570
-#, c-format
-msgid "Complete %d  more levels  to unlock!"
-msgstr "Â¡Completa %d  niveles mÃ¡s  para desbloquear!"
-
-#: hex_puzzzle.cpp:1577
+#: hex_puzzzle.cpp:1574
 msgid "<<NO NAME>>"
 msgstr "<<SIN NOMBRE>>"
 
 #. TRANSLATORS: Anti-Ice are pickups, which turn ice plates into solid
 #. plates once you step on them. Each pickup changes one ice plate
-#: hex_puzzzle.cpp:2617
+#: hex_puzzzle.cpp:2614
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr "Antihielo: %d"
 
-#: hex_puzzzle.cpp:2618
+#: hex_puzzzle.cpp:2615
 #, c-format
 msgid "Jumps: %d"
 msgstr "Saltos: %d"
 
-#: hex_puzzzle.cpp:2619
+#: hex_puzzzle.cpp:2616
 #, c-format
 msgid "Score: %d (%d)"
 msgstr "PuntuaciÃ³n: %d (%d)"
 
 #. TRANSLATORS: Par is similar to golf, a pre defined score which you
 #. can attempt to beat
-#: hex_puzzzle.cpp:2622
+#: hex_puzzzle.cpp:2619
 #, c-format
 msgid "Par:   %d"
 msgstr "Par:   %d"
 
-#: hex_puzzzle.cpp:2623
+#: hex_puzzzle.cpp:2620
 #, c-format
 msgid "Diff:  %d"
 msgstr "Diferencia:  %d"
 
-#: hex_puzzzle.cpp:2626
+#: hex_puzzzle.cpp:2623
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr " Par: %d   Actual: %d"
 
-#: hex_puzzzle.cpp:2629
+#: hex_puzzzle.cpp:2626
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr " Antihielo: %d"
 
-#: hex_puzzzle.cpp:2631
+#: hex_puzzzle.cpp:2628
 #, c-format
 msgid " Jumps: %d"
 msgstr " Saltos: %d"
 
-#: hex_puzzzle.cpp:2637
+#: hex_puzzzle.cpp:2634
 #, c-format
 msgid "Points: %d"
 msgstr "Puntos: %d"
 
-#: hex_puzzzle.cpp:2638
+#: hex_puzzzle.cpp:2635
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr "Descubierto: %d%% (%d/%d)"
 
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2636
 #, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "Terminado: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2640
+#: hex_puzzzle.cpp:2637
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr "Dominado: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2643
+#: hex_puzzzle.cpp:2640
 #, c-format
 msgid " %d%% Mastered"
 msgstr " %d%% dominado"
 
-#: hex_puzzzle.cpp:2645
+#: hex_puzzzle.cpp:2642
 #, c-format
 msgid " %d%% Complete"
 msgstr " %d%% terminado"
 
-#: hex_puzzzle.cpp:2697
+#: hex_puzzzle.cpp:2694
 #, c-format
 msgid "Best:% 3d"
 msgstr "El mejor:% 3d"
 
-#: hex_puzzzle.cpp:2698
+#: hex_puzzzle.cpp:2695
 #, c-format
 msgid "Par:% 3d"
 msgstr "Par:% 3d"
 
-#: hex_puzzzle.cpp:2701
+#: hex_puzzzle.cpp:2698
 msgid "Completed"
 msgstr "Terminado"
 
-#: hex_puzzzle.cpp:2704
+#: hex_puzzzle.cpp:2701
 msgid "Incomplete"
 msgstr "Incompleto"
 
-#: hex_puzzzle.cpp:2745 menus.h:563
+#: hex_puzzzle.cpp:2742 menus.h:563
 msgid "Level Complete!"
 msgstr "Â¡Nivel terminado!"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr "Especial(%d,%d): %s (%d)"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 msgid "<None>"
 msgstr "<Ninguno>"
 
-#: hex_puzzzle.cpp:3006
+#: hex_puzzzle.cpp:3003
 msgid "Select level"
 msgstr "Seleccionar un nivel"
 
-#: hex_puzzzle.cpp:4059
+#: hex_puzzzle.cpp:4056
 msgid "Save level"
 msgstr "Guardar el nivel"
 
-#: hex_puzzzle.cpp:4065
+#: hex_puzzzle.cpp:4062
 msgid "Open level"
 msgstr "Abrir un nivel"
 

Modified: packages/trunk/hex-a-hop/debian/i18n/nl.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/nl.po	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/i18n/nl.po	2007-08-27 19:14:04 UTC (rev 3891)
@@ -38,134 +38,131 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hex_puzzzle.cpp:1568
+#: hex_puzzzle.cpp:1567
 #, c-format
 msgid "Complete 1  more level  to unlock!"
-msgstr "Los nog 1 puzzel op om te ontgrendelen"
+msgid_plural "Complete %d  more levels  to unlock!"
+msgstr[0] "Los nog 1 puzzel op om te ontgrendelen"
+msgstr[1] "Los nog %d puzzels op om te ontgrendelen"
 
-#: hex_puzzzle.cpp:1570
-#, c-format
-msgid "Complete %d  more levels  to unlock!"
-msgstr "Los nog %d puzzels op om te ontgrendelen"
-
-#: hex_puzzzle.cpp:1577
+#: hex_puzzzle.cpp:1574
 msgid "<<NO NAME>>"
 msgstr "<<NAAMLOOS>>"
 
 #. TRANSLATORS: Anti-Ice are pickups, which turn ice plates into solid
 #. plates once you step on them. Each pickup changes one ice plate
-#: hex_puzzzle.cpp:2617
+#: hex_puzzzle.cpp:2614
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr "Anti-ijs: %d"
 
-#: hex_puzzzle.cpp:2618
+#: hex_puzzzle.cpp:2615
 #, c-format
 msgid "Jumps: %d"
 msgstr "Sprongen: %d"
 
-#: hex_puzzzle.cpp:2619
+#: hex_puzzzle.cpp:2616
 #, c-format
 msgid "Score: %d (%d)"
 msgstr "Score: %d (%d)"
 
 #. TRANSLATORS: Par is similar to golf, a pre defined score which you
 #. can attempt to beat
-#: hex_puzzzle.cpp:2622
+#: hex_puzzzle.cpp:2619
 #, c-format
 msgid "Par:   %d"
 msgstr "Doel: %d"
 
-#: hex_puzzzle.cpp:2623
+#: hex_puzzzle.cpp:2620
 #, c-format
 msgid "Diff:  %d"
 msgstr "Verschil: %d"
 
-#: hex_puzzzle.cpp:2626
+#: hex_puzzzle.cpp:2623
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr "Doel: %d Huidig: %d"
 
-#: hex_puzzzle.cpp:2629
+#: hex_puzzzle.cpp:2626
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr "Anti-ijs: %d"
 
-#: hex_puzzzle.cpp:2631
+#: hex_puzzzle.cpp:2628
 #, c-format
 msgid " Jumps: %d"
 msgstr "Sprongen: %d"
 
-#: hex_puzzzle.cpp:2637
+#: hex_puzzzle.cpp:2634
 #, c-format
 msgid "Points: %d"
 msgstr "Punten: %d"
 
-#: hex_puzzzle.cpp:2638
+#: hex_puzzzle.cpp:2635
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr "Ontdekt: %d%% (%d van %d)"
 
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2636
 #, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "Opgelost: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2640
+#: hex_puzzzle.cpp:2637
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr "Voltooid: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2643
+#: hex_puzzzle.cpp:2640
 #, c-format
 msgid " %d%% Mastered"
 msgstr "%d%% voltooid"
 
-#: hex_puzzzle.cpp:2645
+#: hex_puzzzle.cpp:2642
 #, c-format
 msgid " %d%% Complete"
 msgstr "%d%% opgelost"
 
-#: hex_puzzzle.cpp:2697
+#: hex_puzzzle.cpp:2694
 #, c-format
 msgid "Best:% 3d"
 msgstr "Beste:% 3d"
 
-#: hex_puzzzle.cpp:2698
+#: hex_puzzzle.cpp:2695
 #, c-format
 msgid "Par:% 3d"
 msgstr "Doel:% 3d"
 
-#: hex_puzzzle.cpp:2701
+#: hex_puzzzle.cpp:2698
 msgid "Completed"
 msgstr "Opgelost"
 
-#: hex_puzzzle.cpp:2704
+#: hex_puzzzle.cpp:2701
 msgid "Incomplete"
 msgstr "Niet opgelost"
 
-#: hex_puzzzle.cpp:2745 menus.h:563
+#: hex_puzzzle.cpp:2742 menus.h:563
 msgid "Level Complete!"
 msgstr "Puzzel opgelost!"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr "Optie(%d,%d): %s (%d)"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 msgid "<None>"
 msgstr "<Geen>"
 
-#: hex_puzzzle.cpp:3006
+#: hex_puzzzle.cpp:3003
 msgid "Select level"
 msgstr "Kies puzzel"
 
-#: hex_puzzzle.cpp:4059
+#: hex_puzzzle.cpp:4056
 msgid "Save level"
 msgstr "Bewaar puzzel"
 
-#: hex_puzzzle.cpp:4065
+#: hex_puzzzle.cpp:4062
 msgid "Open level"
 msgstr "Open puzzel"
 

Modified: packages/trunk/hex-a-hop/debian/i18n/ru.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/ru.po	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/i18n/ru.po	2007-08-27 19:14:04 UTC (rev 3891)
@@ -50,134 +50,132 @@
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: hex_puzzzle.cpp:1568
+#: hex_puzzzle.cpp:1567
 #, c-format
 msgid "Complete 1  more level  to unlock!"
-msgstr "ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ Ð¿Ñ€Ð¾Ð¹Ñ‚Ð¸  ÐµÑ‰Ñ‘ Ð¾Ð´Ð¸Ð½!"
+msgid_plural "Complete %d  more levels  to unlock!"
+msgstr[0] "ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ Ð¿Ñ€Ð¾Ð¹Ñ‚Ð¸  ÐµÑ‰Ñ‘ Ð¾Ð´Ð¸Ð½!"
+msgstr[1] "ÐÑƒÐ¶Ð½Ð¾ Ð¿Ñ€Ð¾Ð¹Ñ‚Ð¸  ÐµÑ‰Ñ‘ %d!"
+msgstr[2] "ÐÑƒÐ¶Ð½Ð¾ Ð¿Ñ€Ð¾Ð¹Ñ‚Ð¸  ÐµÑ‰Ñ‘ %d!"
 
-#: hex_puzzzle.cpp:1570
-#, c-format
-msgid "Complete %d  more levels  to unlock!"
-msgstr "ÐÑƒÐ¶Ð½Ð¾ Ð¿Ñ€Ð¾Ð¹Ñ‚Ð¸  ÐµÑ‰Ñ‘ %d!"
-
-#: hex_puzzzle.cpp:1577
+#: hex_puzzzle.cpp:1574
 msgid "<<NO NAME>>"
 msgstr "<<Ð‘Ð•Ð— Ð˜ÐœÐ•ÐÐ˜>>"
 
 #. TRANSLATORS: Anti-Ice are pickups, which turn ice plates into solid
 #. plates once you step on them. Each pickup changes one ice plate
-#: hex_puzzzle.cpp:2617
+#: hex_puzzzle.cpp:2614
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr "ÐÐ½Ñ‚Ð¸-Ð»Ñ‘Ð´: %d"
 
-#: hex_puzzzle.cpp:2618
+#: hex_puzzzle.cpp:2615
 #, c-format
 msgid "Jumps: %d"
 msgstr "ÐŸÑ€Ñ‹Ð¶ÐºÐ¸: %d"
 
-#: hex_puzzzle.cpp:2619
+#: hex_puzzzle.cpp:2616
 #, c-format
 msgid "Score: %d (%d)"
 msgstr "Ð¡Ñ‡Ñ‘Ñ‚: %d (%d)"
 
 #. TRANSLATORS: Par is similar to golf, a pre defined score which you
 #. can attempt to beat
-#: hex_puzzzle.cpp:2622
+#: hex_puzzzle.cpp:2619
 #, c-format
 msgid "Par:   %d"
 msgstr "ÐÐ¾Ð¼Ð¸Ð½Ð°Ð»:   %d"
 
-#: hex_puzzzle.cpp:2623
+#: hex_puzzzle.cpp:2620
 #, c-format
 msgid "Diff:  %d"
 msgstr "Ð Ð°Ð·Ð½Ð¾ÑÑ‚ÑŒ:  %d"
 
-#: hex_puzzzle.cpp:2626
+#: hex_puzzzle.cpp:2623
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr " ÐÐ¾Ð¼Ð¸Ð½Ð°Ð»: %d   Ð¢ÐµÐºÑƒÑ‰Ð¸Ð¹: %d"
 
-#: hex_puzzzle.cpp:2629
+#: hex_puzzzle.cpp:2626
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr " ÐÐ½Ñ‚Ð¸-Ð»Ñ‘Ð´: %d"
 
-#: hex_puzzzle.cpp:2631
+#: hex_puzzzle.cpp:2628
 #, c-format
 msgid " Jumps: %d"
 msgstr " ÐŸÑ€Ñ‹Ð¶ÐºÐ¸: %d"
 
-#: hex_puzzzle.cpp:2637
+#: hex_puzzzle.cpp:2634
 #, c-format
 msgid "Points: %d"
 msgstr "ÐžÑ‡ÐºÐ¸: %d"
 
-#: hex_puzzzle.cpp:2638
+#: hex_puzzzle.cpp:2635
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚Ð¾: %d%% (%d/%d)"
 
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2636
 #, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2640
+#: hex_puzzzle.cpp:2637
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr "ÐœÐ°ÑÑ‚ÐµÑ€ÑÐºÐ¸: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2643
+#: hex_puzzzle.cpp:2640
 #, c-format
 msgid " %d%% Mastered"
 msgstr " Ð¼Ð°ÑÑ‚ÐµÑ€ÑÐºÐ¸ %d%%"
 
-#: hex_puzzzle.cpp:2645
+#: hex_puzzzle.cpp:2642
 #, c-format
 msgid " %d%% Complete"
 msgstr " %d%% Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾"
 
-#: hex_puzzzle.cpp:2697
+#: hex_puzzzle.cpp:2694
 #, c-format
 msgid "Best:% 3d"
 msgstr "Ð›ÑƒÑ‡ÑˆÐ¸Ð¹:% 3d"
 
-#: hex_puzzzle.cpp:2698
+#: hex_puzzzle.cpp:2695
 #, c-format
 msgid "Par:% 3d"
 msgstr "ÐÐ¾Ð¼Ð¸Ð½Ð°Ð»:% 3d"
 
-#: hex_puzzzle.cpp:2701
+#: hex_puzzzle.cpp:2698
 msgid "Completed"
 msgstr "ÐŸÑ€Ð¾Ð¹Ð´ÐµÐ½"
 
-#: hex_puzzzle.cpp:2704
+#: hex_puzzzle.cpp:2701
 msgid "Incomplete"
 msgstr "ÐÐµ Ð¿Ñ€Ð¾Ð¹Ð´ÐµÐ½"
 
-#: hex_puzzzle.cpp:2745 menus.h:563
+#: hex_puzzzle.cpp:2742 menus.h:563
 msgid "Level Complete!"
 msgstr "Ð£Ñ€Ð¾Ð²ÐµÐ½ÑŒ Ð¿Ñ€Ð¾Ð¹Ð´ÐµÐ½!"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr "Ð¡Ð¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ð¾(%d,%d): %s (%d)"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 msgid "<None>"
 msgstr "<ÐÐµÑ‚>"
 
-#: hex_puzzzle.cpp:3006
+#: hex_puzzzle.cpp:3003
 msgid "Select level"
 msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ"
 
-#: hex_puzzzle.cpp:4059
+#: hex_puzzzle.cpp:4056
 msgid "Save level"
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ"
 
-#: hex_puzzzle.cpp:4065
+#: hex_puzzzle.cpp:4062
 msgid "Open level"
 msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ"
 

Modified: packages/trunk/hex-a-hop/debian/i18n/vi.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/vi.po	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/i18n/vi.po	2007-08-27 19:14:04 UTC (rev 3891)
@@ -39,134 +39,130 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b1\n"
 
-#: hex_puzzzle.cpp:1568
+#: hex_puzzzle.cpp:1567
 #, c-format
 msgid "Complete 1  more level  to unlock!"
-msgstr "HoÃ n thÃ nh 1 cáº¥p thÃªm Ä‘á»ƒ bá» khoÃ¡ !"
+msgid_plural "Complete %d  more levels  to unlock!"
+msgstr[0] "HoÃ n thÃ nh %d cáº¥p thÃªm Ä‘á»ƒ bá» khoÃ¡ !"
 
-#: hex_puzzzle.cpp:1570
-#, c-format
-msgid "Complete %d  more levels  to unlock!"
-msgstr "HoÃ n thÃ nh %d cáº¥p thÃªm Ä‘á»ƒ bá» khoÃ¡ !"
-
-#: hex_puzzzle.cpp:1577
+#: hex_puzzzle.cpp:1574
 msgid "<<NO NAME>>"
 msgstr "<<KHÃ”NG TÃŠN>>"
 
 #. TRANSLATORS: Anti-Ice are pickups, which turn ice plates into solid
 #. plates once you step on them. Each pickup changes one ice plate
-#: hex_puzzzle.cpp:2617
+#: hex_puzzzle.cpp:2614
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr "Chá»‘ng bÄƒng: %d"
 
-#: hex_puzzzle.cpp:2618
+#: hex_puzzzle.cpp:2615
 #, c-format
 msgid "Jumps: %d"
 msgstr "Nháº£y: %d"
 
-#: hex_puzzzle.cpp:2619
+#: hex_puzzzle.cpp:2616
 #, c-format
 msgid "Score: %d (%d)"
 msgstr "Äiá»ƒm: %d (%d)"
 
 #. TRANSLATORS: Par is similar to golf, a pre defined score which you
 #. can attempt to beat
-#: hex_puzzzle.cpp:2622
+#: hex_puzzzle.cpp:2619
 #, c-format
 msgid "Par:   %d"
 msgstr "Quy Ä‘á»‹nh:   %d"
 
-#: hex_puzzzle.cpp:2623
+#: hex_puzzzle.cpp:2620
 #, c-format
 msgid "Diff:  %d"
 msgstr "KhÃ¡c biá»‡t:  %d"
 
-#: hex_puzzzle.cpp:2626
+#: hex_puzzzle.cpp:2623
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr " Quy Ä‘á»‹nh: %d   Hiá»‡n táº¡i: %d"
 
-#: hex_puzzzle.cpp:2629
+#: hex_puzzzle.cpp:2626
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr " Chá»‘ng bÄƒng: %d"
 
-#: hex_puzzzle.cpp:2631
+#: hex_puzzzle.cpp:2628
 #, c-format
 msgid " Jumps: %d"
 msgstr " Nháº£y: %d"
 
-#: hex_puzzzle.cpp:2637
+#: hex_puzzzle.cpp:2634
 #, c-format
 msgid "Points: %d"
 msgstr "Äiá»ƒm: %d"
 
-#: hex_puzzzle.cpp:2638
+#: hex_puzzzle.cpp:2635
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr "TÃ¬m ra: %d%% (%d/%d)"
 
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2636
 #, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "HoÃ n táº¥t: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2640
+#: hex_puzzzle.cpp:2637
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr "Kháº¯c phá»¥c: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2643
+#: hex_puzzzle.cpp:2640
 #, c-format
 msgid " %d%% Mastered"
 msgstr " %d%% Kháº¯c phá»¥c"
 
-#: hex_puzzzle.cpp:2645
+#: hex_puzzzle.cpp:2642
 #, c-format
 msgid " %d%% Complete"
 msgstr " %d%% HoÃ n táº¥t"
 
-#: hex_puzzzle.cpp:2697
+#: hex_puzzzle.cpp:2694
 #, c-format
 msgid "Best:% 3d"
 msgstr "Tá»‘t nháº¥t: % 3d"
 
-#: hex_puzzzle.cpp:2698
+#: hex_puzzzle.cpp:2695
 #, c-format
 msgid "Par:% 3d"
 msgstr "Quy Ä‘á»‹nh: % 3d"
 
-#: hex_puzzzle.cpp:2701
+#: hex_puzzzle.cpp:2698
 msgid "Completed"
 msgstr "HoÃ n táº¥t"
 
-#: hex_puzzzle.cpp:2704
+#: hex_puzzzle.cpp:2701
 msgid "Incomplete"
 msgstr "ChÆ°a hoÃ n táº¥t"
 
-#: hex_puzzzle.cpp:2745 menus.h:563
+#: hex_puzzzle.cpp:2742 menus.h:563
 msgid "Level Complete!"
 msgstr "Cáº¥p hoÃ n táº¥t !"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr "Äáº·c biá»‡t (%d,%d): %s (%d)"
 
-#: hex_puzzzle.cpp:2861
+#: hex_puzzzle.cpp:2858
 msgid "<None>"
 msgstr "<KhÃ´ng cÃ³>"
 
-#: hex_puzzzle.cpp:3006
+#: hex_puzzzle.cpp:3003
 msgid "Select level"
 msgstr "Chá»n cáº¥p"
 
-#: hex_puzzzle.cpp:4059
+#: hex_puzzzle.cpp:4056
 msgid "Save level"
 msgstr "LÆ°u cáº¥p"
 
-#: hex_puzzzle.cpp:4065
+#: hex_puzzzle.cpp:4062
 msgid "Open level"
 msgstr "Má»Ÿ cáº¥p"
 

Modified: packages/trunk/hex-a-hop/debian/patches/array_subscripts_warning.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/array_subscripts_warning.patch	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/patches/array_subscripts_warning.patch	2007-08-27 19:14:04 UTC (rev 3891)
@@ -5,7 +5,7 @@
 ===================================================================
 --- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-08-26 22:45:59.000000000 +0200
 +++ hex-a-hop.svn/hex_puzzzle.cpp	2007-08-26 22:46:03.000000000 +0200
-@@ -3784,7 +3784,7 @@
+@@ -3781,7 +3781,7 @@
  
  		if (!isMap && !editMode && undoTime < 0)
  		{
@@ -14,7 +14,7 @@
  			{
  				Undo();
  				return;
-@@ -3793,12 +3793,12 @@
+@@ -3790,12 +3790,12 @@
  		if (isMap && !editMode)
  		{
  
@@ -33,7 +33,7 @@
  			else if ((keyState[SDLK_LEFT]) & 2) keyboardp.x--, keyboardp.y+=keyboardp.x&1;
  			else if (((keyState[SDLK_RIGHT]) & 2)) { if (keyboardp.x < mapRightBound) keyboardp.y-=keyboardp.x&1, keyboardp.x++; }
  			else if ((keyState[SDLK_RETURN] | keyState[SDLK_KP5] | keyState[SDLK_SPACE] | keyState[SDLK_KP_ENTER]) & 2) 
-@@ -3828,12 +3828,12 @@
+@@ -3825,12 +3825,12 @@
  		{
  			static int usedDiag = 0;
  

Modified: packages/trunk/hex-a-hop/debian/patches/compiler_warnings.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/compiler_warnings.patch	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/patches/compiler_warnings.patch	2007-08-27 19:14:04 UTC (rev 3891)
@@ -352,14 +352,7 @@
  	{
  		bool dead = false;
  		double f = speed ? time / speed : 1;
-@@ -1581,13 +1579,13 @@
- 			static char tmp1[100];
- 			static LevelInfo tmp = {0, "", tmp1};
- 			if (t-numComplete==1)
--				sprintf(tmp1, _("Complete 1  more level  to unlock!"), t-numComplete);
-+				sprintf(tmp1, _("Complete 1  more level  to unlock!"));
- 			else
- 				sprintf(tmp1, _("Complete %d  more levels  to unlock!"), t-numComplete);
+@@ -1584,7 +1582,7 @@
  			return &tmp;
  		}
  
@@ -368,7 +361,7 @@
  			if (strcmp(f, levelNames[i].file)==0)
  				return &levelNames[i];
  		static LevelInfo tmp = {0, "", _("<<NO NAME>>")};
-@@ -2594,7 +2592,6 @@
+@@ -2591,7 +2589,6 @@
  					src.w = SCREEN_W;
  					src.h = 1;
  
@@ -376,7 +369,7 @@
  					if (isRenderMap)
  					{
  						src.x += (int)( sin(i*0.9 + time*3.7) * sin(i*0.3 + time*0.7)*4 );
-@@ -3168,7 +3165,7 @@
+@@ -3165,7 +3162,7 @@
  	{
  		static Pos hits[100];
  		static Dir hitDir[100];
@@ -385,7 +378,7 @@
  		if (!recurse)
  			numHits = 0;
  
-@@ -3180,7 +3177,7 @@
+@@ -3177,7 +3174,7 @@
  
  			Pos p = newpos + fd;
  			int range = 0;
@@ -394,7 +387,7 @@
  			{
  				Tile t = GetTile(p);
  				if (tileSolid[t]!=-1)
-@@ -3188,7 +3185,7 @@
+@@ -3185,7 +3182,7 @@
  					if (t!=TRAP)
  						renderer(p).Add(new TileRender(tileSolid[t]==1 ? TILE_WHITE_WALL : TILE_WHITE_TILE, p), fireTime+0.1);
  
@@ -403,7 +396,7 @@
  					for (i=0; i<numHits; i++)
  						if (hits[i]==p)
  							break;
-@@ -3238,9 +3235,9 @@
+@@ -3235,9 +3232,9 @@
  
  		if (!recurse)
  		{
@@ -415,7 +408,7 @@
  			{
  				Pos p = hits[i];
  				Tile t = GetTile(p);
-@@ -3370,8 +3367,6 @@
+@@ -3367,8 +3364,6 @@
  			player_items[1]--;
  		}
  

Modified: packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch	2007-08-27 19:14:04 UTC (rev 3891)
@@ -63,15 +63,12 @@
  
  //////////////////////////////////////////////////////
  // Config
-@@ -1579,14 +1580,17 @@
+@@ -1579,14 +1580,14 @@
  
  			static char tmp1[100];
  			static LevelInfo tmp = {0, "", tmp1};
 -			sprintf(tmp1, "Complete %d  more %s  to unlock!", t-numComplete, t-numComplete==1?"level":"levels");
-+			if (t-numComplete==1)
-+				sprintf(tmp1, _("Complete 1  more level  to unlock!"), t-numComplete);
-+			else
-+				sprintf(tmp1, _("Complete %d  more levels  to unlock!"), t-numComplete);
++			sprintf(tmp1, ngettext("Complete 1  more level  to unlock!", "Complete %d  more levels  to unlock!", t-numComplete), t-numComplete);
  			return &tmp;
  		}
  
@@ -83,7 +80,7 @@
  		return &tmp;
  	}
  
-@@ -2625,33 +2629,37 @@
+@@ -2625,33 +2626,37 @@
  				if (numUndo>1 && time < undo[0].time)
  					v[0]=v[1]=v[2]=0;
  	#ifdef EDIT
@@ -135,7 +132,7 @@
  
  				if (numMastered >= numLevels && progress.general.endSequence < 2)
  				{
-@@ -2703,14 +2711,14 @@
+@@ -2703,14 +2708,14 @@
  						{
  							if (progress.general.scoringOn)
  							{
@@ -154,7 +151,7 @@
  					}
  				}
  			}
-@@ -2751,7 +2759,7 @@
+@@ -2751,7 +2756,7 @@
  				t=1-t;
  				int y = SCREEN_H/3 - FONT_SPACING + 1;
  				y = SCREEN_H + int((y-SCREEN_H)*t);
@@ -163,7 +160,7 @@
  			}
  		}
  
-@@ -2871,7 +2879,7 @@
+@@ -2871,7 +2876,7 @@
  				}
  
  #ifdef EDIT
@@ -172,7 +169,7 @@
  				SDL_WM_SetCaption(tmp, NULL);
  #endif
  			}
-@@ -3016,7 +3024,7 @@
+@@ -3016,7 +3021,7 @@
  
  		if (button_pressed==256)
  		{
@@ -181,7 +178,7 @@
  			if (fn)
  			{
  				char * l = strstr(fn, "Levels");
-@@ -4071,13 +4079,13 @@
+@@ -4071,13 +4076,13 @@
  			Mouse(mousex, mousey, 0, 0, 1024, 0, mouse_buttons);
  
  		else if (key=='s' && (mod & KMOD_CTRL)){

Modified: packages/trunk/hex-a-hop/debian/patches/i18n_increase_array_sizes.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/i18n_increase_array_sizes.patch	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/patches/i18n_increase_array_sizes.patch	2007-08-27 19:14:04 UTC (rev 3891)
@@ -12,8 +12,8 @@
 -			static char tmp1[100];
 +			static char tmp1[1000];
  			static LevelInfo tmp = {0, "", tmp1};
- 			if (t-numComplete==1)
- 				sprintf(tmp1, _("Complete 1  more level  to unlock!"));
+ 			sprintf(tmp1, ngettext("Complete 1  more level  to unlock!", "Complete %d  more levels  to unlock!", t-numComplete), t-numComplete);
+ 			return &tmp;
 Index: hex-a-hop.svn/menus.h
 ===================================================================
 --- hex-a-hop.svn.orig/menus.h	2007-08-26 22:46:03.000000000 +0200

Modified: packages/trunk/hex-a-hop/debian/patches/mouse_cursor_without_font.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/mouse_cursor_without_font.patch	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/patches/mouse_cursor_without_font.patch	2007-08-27 19:14:04 UTC (rev 3891)
@@ -2,7 +2,7 @@
 ===================================================================
 --- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-08-26 22:25:42.000000000 +0200
 +++ hex-a-hop.svn/hex_puzzzle.cpp	2007-08-26 22:25:43.000000000 +0200
-@@ -2756,10 +2756,6 @@
+@@ -2753,10 +2753,6 @@
  			{
  				RenderTile(false, editTile, mousex+scrollX, mousey+scrollY);
  			}
@@ -13,7 +13,7 @@
  		}
  	}
  
-@@ -4094,7 +4090,7 @@
+@@ -4091,7 +4087,7 @@
  	//	};
  	//	static SDL_Cursor * c = SDL_CreateCursor(data, mask, 32, 32, 1, 1);
  	//	SDL_SetCursor(c);

Modified: packages/trunk/hex-a-hop/debian/patches/patch-hex-a-hop-better-than-par.diff
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/patch-hex-a-hop-better-than-par.diff	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/patches/patch-hex-a-hop-better-than-par.diff	2007-08-27 19:14:04 UTC (rev 3891)
@@ -5,7 +5,7 @@
 ===================================================================
 --- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-08-26 22:43:37.000000000 +0200
 +++ hex-a-hop.svn/hex_puzzzle.cpp	2007-08-26 22:44:35.000000000 +0200
-@@ -2194,7 +2194,7 @@
+@@ -2191,7 +2191,7 @@
  
  			int par = GetPar(x);
  			if (progress.general.scoringOn && l->PassesPar( par ))

Modified: packages/trunk/hex-a-hop/debian/patches/remove_old_font_handling.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/remove_old_font_handling.patch	2007-08-27 14:32:56 UTC (rev 3890)
+++ packages/trunk/hex-a-hop/debian/patches/remove_old_font_handling.patch	2007-08-27 19:14:04 UTC (rev 3891)
@@ -115,7 +115,7 @@
  
  	va_end( marker );              /* Reset variable arguments.      */
  }
-@@ -4160,7 +4086,6 @@
+@@ -4157,7 +4083,6 @@
  		if (first)
  		{
  			first = false;


