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

Jens Seidel jseidel-guest at alioth.debian.org
Wed Sep 19 22:46:36 UTC 2007 

Author: jseidel-guest
Date: 2007-09-19 22:46:36 +0000 (Wed, 19 Sep 2007)
New Revision: 4249

Modified:
   packages/trunk/hex-a-hop/debian/changelog
   packages/trunk/hex-a-hop/debian/i18n/de.po
   packages/trunk/hex-a-hop/debian/i18n/ja.po
   packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch
   packages/trunk/hex-a-hop/debian/patches/remove_old_font_handling.patch
Log:
Allow right aligned text in the help dialog for some languages
such as Japanese


Modified: packages/trunk/hex-a-hop/debian/changelog
===================================================================
--- packages/trunk/hex-a-hop/debian/changelog	2007-09-19 21:03:53 UTC (rev 4248)
+++ packages/trunk/hex-a-hop/debian/changelog	2007-09-19 22:46:36 UTC (rev 4249)
@@ -14,8 +14,10 @@
     Piotr. Closes: #443194
   * Fixed a build error on m68k because of a wrong alignment test.
     Closes: #442854
+  * Allow right aligned text in the help dialog for some languages
+    such as Japanese.
 
- -- Jens Seidel <jensseidel at users.sf.net>  Wed, 19 Sep 2007 22:30:00 +0200
+ -- Jens Seidel <jensseidel at users.sf.net>  Thu, 20 Sep 2007 00:30:00 +0200
 
 hex-a-hop (0.0.20070315-5) unstable; urgency=low
 

Modified: packages/trunk/hex-a-hop/debian/i18n/de.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/de.po	2007-09-19 21:03:53 UTC (rev 4248)
+++ packages/trunk/hex-a-hop/debian/i18n/de.po	2007-09-19 22:46:36 UTC (rev 4249)
@@ -37,8 +37,8 @@
 msgstr ""
 "Project-Id-Version: hex-a-hop 0.0.20070315-4\n"
 "Report-Msgid-Bugs-To: hex-a-hop at packages.debian.org\n"
-"POT-Creation-Date: 2007-09-09 20:01+0200\n"
-"PO-Revision-Date: 2007-08-23 18:54+0200\n"
+"POT-Creation-Date: 2007-09-20 00:13+0200\n"
+"PO-Revision-Date: 2007-09-20 00:34+0200\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -46,131 +46,131 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hex_puzzzle.cpp:1560
+#: hex_puzzzle.cpp:1558
 #, c-format
 msgid "Complete 1  more level  to unlock!"
 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:1567
+#: hex_puzzzle.cpp:1565
 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:2650
+#: hex_puzzzle.cpp:2655
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr "Anti-Eis: %d"
 
-#: hex_puzzzle.cpp:2651
+#: hex_puzzzle.cpp:2656
 #, c-format
 msgid "Jumps: %d"
 msgstr "Sprünge: %d"
 
-#: hex_puzzzle.cpp:2652
+#: hex_puzzzle.cpp:2657
 #, 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:2655
+#: hex_puzzzle.cpp:2660
 #, c-format
 msgid "Par:   %d"
 msgstr "Erwartet:   %d"
 
-#: hex_puzzzle.cpp:2656
+#: hex_puzzzle.cpp:2661
 #, c-format
 msgid "Diff:  %d"
 msgstr "Diff:  %d"
 
-#: hex_puzzzle.cpp:2659
+#: hex_puzzzle.cpp:2664
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr " Erwartet: %d   Derzeit: %d"
 
-#: hex_puzzzle.cpp:2662
+#: hex_puzzzle.cpp:2667
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr " Anti-Eis: %d"
 
-#: hex_puzzzle.cpp:2664
+#: hex_puzzzle.cpp:2669
 #, c-format
 msgid " Jumps: %d"
 msgstr " Sprünge: %d"
 
-#: hex_puzzzle.cpp:2670
+#: hex_puzzzle.cpp:2675
 #, c-format
 msgid "Points: %d"
 msgstr "Punkte: %d"
 
-#: hex_puzzzle.cpp:2671
+#: hex_puzzzle.cpp:2676
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr "Entdeckt: %d%% (%d/%d)"
 
-#: hex_puzzzle.cpp:2672
+#: hex_puzzzle.cpp:2677
 #, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "Komplett: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2673
+#: hex_puzzzle.cpp:2678
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr "Gemeistert: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2676
+#: hex_puzzzle.cpp:2681
 #, c-format
 msgid " %d%% Mastered"
 msgstr " %d%% gemeistert"
 
-#: hex_puzzzle.cpp:2678
+#: hex_puzzzle.cpp:2683
 #, c-format
 msgid " %d%% Complete"
 msgstr " %d%% komplett"
 
-#: hex_puzzzle.cpp:2730
+#: hex_puzzzle.cpp:2735
 #, c-format
 msgid "Best:% 3d"
 msgstr "Bestwert:% 3d"
 
-#: hex_puzzzle.cpp:2731
+#: hex_puzzzle.cpp:2736
 #, c-format
 msgid "Par:% 3d"
 msgstr "Erwartet:% 3d"
 
-#: hex_puzzzle.cpp:2734
+#: hex_puzzzle.cpp:2739
 msgid "Completed"
 msgstr "Erledigt"
 
-#: hex_puzzzle.cpp:2737
+#: hex_puzzzle.cpp:2742
 msgid "Incomplete"
 msgstr "Nicht erledigt"
 
-#: hex_puzzzle.cpp:2778 menus.h:563
+#: hex_puzzzle.cpp:2783 menus.h:576
 msgid "Level Complete!"
 msgstr "Level erledigt!"
 
-#: hex_puzzzle.cpp:2894
+#: hex_puzzzle.cpp:2899
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr "Spezial(%d,%d): %s (%d)"
 
-#: hex_puzzzle.cpp:2894
+#: hex_puzzzle.cpp:2899
 msgid "<None>"
 msgstr "<Keine>"
 
-#: hex_puzzzle.cpp:3039
+#: hex_puzzzle.cpp:3044
 msgid "Select level"
 msgstr "Level auswählen"
 
-#: hex_puzzzle.cpp:4092
+#: hex_puzzzle.cpp:4097
 msgid "Save level"
 msgstr "Level speichern"
 
-#: hex_puzzzle.cpp:4098
+#: hex_puzzzle.cpp:4103
 msgid "Open level"
 msgstr "Level öffnen"
 
@@ -366,206 +366,213 @@
 msgid "Press any key"
 msgstr "Beliebige Taste drücken"
 
-#: menus.h:326
+#. TRANSLATORS: This specifies how the text in the help dialog should
+#. be aligned. Do *not* translate the text itself but use one of "left",
+#. "center" or "right" (untranslated!). The default is "center".
+#: menus.h:253
+msgid "text alignment"
+msgstr "center"
+
+#: menus.h:339
 #, c-format
 msgid "Help (Page --)"
 msgstr "Hilfe (Seite --)"
 
-#: menus.h:328
+#: menus.h:341
 #, c-format
 msgid "Help (Page %d/%d)"
 msgstr "Hilfe (Seite %d/%d)"
 
-#: menus.h:415
+#: menus.h:428
 msgid "Resume"
 msgstr "Fortfahren"
 
-#: menus.h:416
+#: menus.h:429
 msgid "Restart Level"
 msgstr "Level neu starten"
 
-#: menus.h:417
+#: menus.h:430
 msgid "Return to Map"
 msgstr "Zur Karte zurückkehren"
 
-#: menus.h:418
+#: menus.h:431
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: menus.h:419
+#: menus.h:432
 msgid "Toggle Fullscreen"
 msgstr "Vollbild umschalten"
 
-#: menus.h:420 menus.h:1095
+#: menus.h:433 menus.h:1108
 msgid "Options"
 msgstr "Optionen"
 
-#: menus.h:421
+#: menus.h:434
 msgid "Quit"
 msgstr "Beenden"
 
-#: menus.h:422
+#: menus.h:435
 msgid "Yes"
 msgstr "Ja"
 
-#: menus.h:423
+#: menus.h:436
 msgid "No"
 msgstr "Nein"
 
-#: menus.h:424
+#: menus.h:437
 msgid "Return to Title"
 msgstr "Zum Titel zurückkehren"
 
-#: menus.h:425
+#: menus.h:438
 msgid "Help"
 msgstr "Hilfe"
 
-#: menus.h:426
+#: menus.h:439
 msgid "Start New Game"
 msgstr "Neues Spiel starten"
 
-#: menus.h:427
+#: menus.h:440
 msgid "Yes, really delete it!"
 msgstr "Ja, lösche es wirklich!"
 
-#: menus.h:428
+#: menus.h:441
 msgid "Don't do it!"
 msgstr "Lass das!"
 
-#: menus.h:429
+#: menus.h:442
 msgid "Undo Last Move"
 msgstr "Letzte Bewegung rückgängig"
 
-#: menus.h:430
+#: menus.h:443
 msgid "OK"
 msgstr "Ok"
 
-#: menus.h:431
+#: menus.h:444
 msgid "View Credits Sequence"
 msgstr "Danksagungssequenz anschauen"
 
-#: menus.h:563
+#: menus.h:576
 msgid "Emi can't swim..."
 msgstr "Emi kann nicht schwimmen ..."
 
-#: menus.h:602
+#: menus.h:615
 #, c-format
 msgid "New Best Score: %d  Par Score: %d  Par Beaten!"
 msgstr "Neue Bestpunktzahl: %d  Erwartete Punktzahl: %d  Erwartung geschlagen!"
 
-#: menus.h:604
+#: menus.h:617
 #, c-format
 msgid "New Best Score: %d  Par Score: %d"
 msgstr "Neue Bestpunktzahl: %d  Erwartete Punktzahl: %d"
 
-#: menus.h:606
+#: menus.h:619
 #, c-format
 msgid "Score: %d  Previous Best: %d  Par Score: %d"
 msgstr "Punktzahl: %d  Bisherige Bestpunktzahl: %d  Erwartete Punktzahl: %d"
 
-#: menus.h:608
+#: menus.h:621
 msgid "Well Done!  Level Completed!"
 msgstr ""
 "Gut gemacht!\n"
 "Level beendet!"
 
-#: menus.h:687
+#: menus.h:700
 msgid " Very Well Done! "
 msgstr " Sehr gut gemacht!"
 
-#: menus.h:692
+#: menus.h:705
 msgid "All Levels Cleared!"
 msgstr "Alle Level geschafft!"
 
-#: menus.h:696
+#: menus.h:709
 msgid "Not a single green hexagon is left unbroken."
 msgstr "Kein einziges grünes Sechseck ist nicht gebrochen."
 
-#: menus.h:698
+#: menus.h:711
 msgid "Truly, you are a master of hexagon hopping!"
 msgstr "Sie sind wirklich ein Meister des Sechseck-Springens!"
 
-#: menus.h:702
+#: menus.h:715
 msgid "Credits"
 msgstr "Danksagungen"
 
-#: menus.h:703
+#: menus.h:716
 msgid "<Design & Direction:"
 msgstr "<Design & Leitung:"
 
-#: menus.h:704
+#: menus.h:717
 msgid "<Programming:"
 msgstr "<Programmierung:"
 
-#: menus.h:705
+#: menus.h:718
 msgid "<Graphics:"
 msgstr "<Graphik:"
 
-#: menus.h:706
+#: menus.h:719
 msgid "<Thanks to:"
 msgstr "<Danke an:"
 
-#: menus.h:708
+#: menus.h:721
 msgid "<Tools and libraries used:"
 msgstr "<Benutzte Werkzeuge und Bibliotheken:"
 
-#: menus.h:709
+#: menus.h:722
 msgid "<Fonts used:"
 msgstr "<Benutzte Schriften:"
 
-#: menus.h:713
+#: menus.h:726
 msgid "Thanks for playing!"
 msgstr "Danke fürs Spielen!"
 
-#: menus.h:717
+#: menus.h:730
 msgid " Absolutely Amazing! "
 msgstr " Unglaublich! "
 
-#: menus.h:722
+#: menus.h:735
 msgid "All Levels Mastered!!"
 msgstr "Alle Level gemeistert!!"
 
-#: menus.h:726
+#: menus.h:739
 msgid "You crushed every last green hexagon with"
 msgstr "Sie haben jedes letzte Sechseck zerstört mit"
 
-#: menus.h:727
+#: menus.h:740
 msgid "breathtaking efficiency!"
 msgstr "atemberaubender Effizienz!"
 
-#: menus.h:729
+#: menus.h:742
 msgid "You truly are a grand master of hexagon hopping!"
 msgstr "Sie sind wirklich ein Großmeister des Sechseck-Springens!"
 
-#: menus.h:878
+#: menus.h:891
 msgid "The End"
 msgstr "Das Ende"
 
-#: menus.h:965
+#: menus.h:978
 #, c-format
 msgid "Continue game %d (All Clear!)"
 msgstr "Spiel fortfahren %d (Alles klar!)"
 
-#: menus.h:967
+#: menus.h:980
 #, c-format
 msgid "Continue game %d (%d%% + %d%%)"
 msgstr "Spiel fortfahren %d (%d%% + %d%%)"
 
-#: menus.h:969
+#: menus.h:982
 #, c-format
 msgid "Continue game %d (%d%% complete)"
 msgstr "Spiel fortfahren %d (%d%% komplett)"
 
-#: menus.h:1008
+#: menus.h:1021
 msgid "Quit: Are you sure?"
 msgstr "Beenden: Sind Sie sicher?"
 
-#: menus.h:1028
+#: menus.h:1041
 #, c-format
 msgid "Really delete game %d?"
 msgstr "Wirklich Spiel %d löschen?"
 
-#: menus.h:1068
+#: menus.h:1081
 msgid "Paused"
 msgstr "Pausiert"
 

Modified: packages/trunk/hex-a-hop/debian/i18n/ja.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/ja.po	2007-09-19 21:03:53 UTC (rev 4248)
+++ packages/trunk/hex-a-hop/debian/i18n/ja.po	2007-09-19 22:46:36 UTC (rev 4249)
@@ -38,8 +38,8 @@
 msgstr ""
 "Project-Id-Version: hex-a-hop\n"
 "Report-Msgid-Bugs-To: hex-a-hop at packages.debian.org\n"
-"POT-Creation-Date: 2007-09-10 21:58+0000\n"
-"PO-Revision-Date: 2007-09-19 23:02+0200\n"
+"POT-Creation-Date: 2007-09-20 00:13+0200\n"
+"PO-Revision-Date: 2007-09-20 00:11+0200\n"
 "Last-Translator: Noritada Kobayashi <nori1 at dolphin.c.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: hex_puzzzle.cpp:1560
+#: hex_puzzzle.cpp:1558
 #, c-format
 msgid "Complete 1  more level  to unlock!"
 msgid_plural "Complete %d  more levels  to unlock!"
@@ -56,125 +56,125 @@
 "クリアすると、\n"
 "鍵が開きます!"
 
-#: hex_puzzzle.cpp:1567
+#: hex_puzzzle.cpp:1565
 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:2650
+#: hex_puzzzle.cpp:2655
 #, c-format
 msgid "Anti-Ice: %d"
 msgstr "防氷剤: %d"
 
-#: hex_puzzzle.cpp:2651
+#: hex_puzzzle.cpp:2656
 #, c-format
 msgid "Jumps: %d"
 msgstr "ジャンプ剤: %d"
 
-#: hex_puzzzle.cpp:2652
+#: hex_puzzzle.cpp:2657
 #, 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:2655
+#: hex_puzzzle.cpp:2660
 #, c-format
 msgid "Par:   %d"
 msgstr "標準スコア: %d"
 
-#: hex_puzzzle.cpp:2656
+#: hex_puzzzle.cpp:2661
 #, c-format
 msgid "Diff:  %d"
 msgstr ""
 
 # The head whitespace seems to be necessary for space between the window edge and text.
-#: hex_puzzzle.cpp:2659
+#: hex_puzzzle.cpp:2664
 #, c-format
 msgid " Par: %d   Current: %d"
 msgstr " 標準: %d   現在: %d"
 
-#: hex_puzzzle.cpp:2662
+#: hex_puzzzle.cpp:2667
 #, c-format
 msgid " Anti-Ice: %d"
 msgstr " 防氷剤: %d"
 
-#: hex_puzzzle.cpp:2664
+#: hex_puzzzle.cpp:2669
 #, c-format
 msgid " Jumps: %d"
 msgstr " ジャンプ剤: %d"
 
-#: hex_puzzzle.cpp:2670
+#: hex_puzzzle.cpp:2675
 #, c-format
 msgid "Points: %d"
 msgstr ""
 
-#: hex_puzzzle.cpp:2671
+#: hex_puzzzle.cpp:2676
 #, c-format
 msgid "Discovered: %d%% (%d/%d)"
 msgstr ""
 
-#: hex_puzzzle.cpp:2672
+#: hex_puzzzle.cpp:2677
 #, c-format
 msgid "Complete: %d%% (%d)"
 msgstr "クリア: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2673
+#: hex_puzzzle.cpp:2678
 #, c-format
 msgid "Mastered: %d%% (%d)"
 msgstr "マスター: %d%% (%d)"
 
-#: hex_puzzzle.cpp:2676
+#: hex_puzzzle.cpp:2681
 #, c-format
 msgid " %d%% Mastered"
 msgstr " %d%% マスター"
 
-#: hex_puzzzle.cpp:2678
+#: hex_puzzzle.cpp:2683
 #, c-format
 msgid " %d%% Complete"
 msgstr " %d%% クリア"
 
-#: hex_puzzzle.cpp:2730
+#: hex_puzzzle.cpp:2735
 #, c-format
 msgid "Best:% 3d"
 msgstr "ベスト:% 3d"
 
-#: hex_puzzzle.cpp:2731
+#: hex_puzzzle.cpp:2736
 #, c-format
 msgid "Par:% 3d"
 msgstr "標準:% 3d"
 
-#: hex_puzzzle.cpp:2734
+#: hex_puzzzle.cpp:2739
 msgid "Completed"
 msgstr "クリア済み"
 
-#: hex_puzzzle.cpp:2737
+#: hex_puzzzle.cpp:2742
 msgid "Incomplete"
 msgstr "未クリア"
 
-#: hex_puzzzle.cpp:2778 menus.h:563
+#: hex_puzzzle.cpp:2783 menus.h:576
 msgid "Level Complete!"
 msgstr "レベルクリア!"
 
-#: hex_puzzzle.cpp:2894
+#: hex_puzzzle.cpp:2899
 #, c-format
 msgid "Special(%d,%d): %s (%d)"
 msgstr ""
 
-#: hex_puzzzle.cpp:2894
+#: hex_puzzzle.cpp:2899
 msgid "<None>"
 msgstr ""
 
-#: hex_puzzzle.cpp:3039
+#: hex_puzzzle.cpp:3044
 msgid "Select level"
 msgstr ""
 
-#: hex_puzzzle.cpp:4092
+#: hex_puzzzle.cpp:4097
 msgid "Save level"
 msgstr ""
 
-#: hex_puzzzle.cpp:4098
+#: hex_puzzzle.cpp:4103
 msgid "Open level"
 msgstr ""
 
@@ -367,208 +367,219 @@
 msgid "Welcome to "
 msgstr ""
 
+#: menus.h:199
+msgid "Info:"
+msgstr ""
+
 #: menus.h:231
 msgid "Press any key"
 msgstr "いずれかのキーを押してください"
 
-#: menus.h:326
+#. TRANSLATORS: This specifies how the text in the help dialog should
+#. be aligned. Do *not* translate the text itself but use one of "left",
+#. "center" or "right" (untranslated!). The default is "center".
+#: menus.h:253
+msgid "text alignment"
+msgstr "right"
+
+#: menus.h:339
 #, c-format
 msgid "Help (Page --)"
 msgstr "ヘルプ (--ページ)"
 
-#: menus.h:328
+#: menus.h:341
 #, c-format
 msgid "Help (Page %d/%d)"
 msgstr "ヘルプ (%d/%dページ)"
 
-#: menus.h:415
+#: menus.h:428
 msgid "Resume"
 msgstr "再開"
 
-#: menus.h:416
+#: menus.h:429
 msgid "Restart Level"
 msgstr "このレベルをやりなおす"
 
-#: menus.h:417
+#: menus.h:430
 msgid "Return to Map"
 msgstr "マップに戻る"
 
-#: menus.h:418
+#: menus.h:431
 msgid "Continue"
 msgstr "続ける"
 
-#: menus.h:419
+#: menus.h:432
 msgid "Toggle Fullscreen"
 msgstr "フルスクリーンモード"
 
-#: menus.h:420 menus.h:1095
+#: menus.h:433 menus.h:1108
 msgid "Options"
 msgstr "オプション"
 
-#: menus.h:421
+#: menus.h:434
 msgid "Quit"
 msgstr "終了"
 
-#: menus.h:422
+#: menus.h:435
 msgid "Yes"
 msgstr "はい"
 
-#: menus.h:423
+#: menus.h:436
 msgid "No"
 msgstr "いいえ"
 
-#: menus.h:424
+#: menus.h:437
 msgid "Return to Title"
 msgstr "タイトルに戻る"
 
-#: menus.h:425
+#: menus.h:438
 msgid "Help"
 msgstr "ヘルプ"
 
-#: menus.h:426
+#: menus.h:439
 msgid "Start New Game"
 msgstr "新たにゲームを開始"
 
-#: menus.h:427
+#: menus.h:440
 msgid "Yes, really delete it!"
 msgstr "はい、本当に削除してください!"
 
-#: menus.h:428
+#: menus.h:441
 msgid "Don't do it!"
 msgstr ""
 
-#: menus.h:429
+#: menus.h:442
 msgid "Undo Last Move"
 msgstr "最後の移動を取り消す"
 
-#: menus.h:430
+#: menus.h:443
 msgid "OK"
 msgstr "OK"
 
-#: menus.h:431
+#: menus.h:444
 msgid "View Credits Sequence"
 msgstr ""
 
-#: menus.h:563
+#: menus.h:576
 msgid "Emi can't swim..."
 msgstr "Emiは泳げないのです……"
 
-#: menus.h:602
+#: menus.h:615
 #, c-format
 msgid "New Best Score: %d  Par Score: %d  Par Beaten!"
 msgstr "新しいベストスコア: %d  標準スコア: %d  標準スコアを達成しました!"
 
-#: menus.h:604
+#: menus.h:617
 #, c-format
 msgid "New Best Score: %d  Par Score: %d"
 msgstr "新しいベストスコア: %d  標準スコア: %d"
 
-#: menus.h:606
+#: menus.h:619
 #, c-format
 msgid "Score: %d  Previous Best: %d  Par Score: %d"
 msgstr "スコア: %d  以前のベストスコア: %d  標準スコア: %d"
 
-#: menus.h:608
+#: menus.h:621
 msgid "Well Done!  Level Completed!"
 msgstr "よくできました!  このレベルをクリアしました!"
 
-#: menus.h:687
+#: menus.h:700
 msgid " Very Well Done! "
 msgstr " 大変よくできました! "
 
-#: menus.h:692
+#: menus.h:705
 msgid "All Levels Cleared!"
 msgstr "すべてのレベルをクリアしました!"
 
-#: menus.h:696
+#: menus.h:709
 msgid "Not a single green hexagon is left unbroken."
 msgstr "壊されずに残った緑色の六角形は1枚もありません。"
 
-#: menus.h:698
+#: menus.h:711
 msgid "Truly, you are a master of hexagon hopping!"
 msgstr ""
 
-#: menus.h:702
+#: menus.h:715
 msgid "Credits"
 msgstr "クレジット"
 
-#: menus.h:703
+#: menus.h:716
 msgid "<Design & Direction:"
 msgstr "<デザイン・監督:"
 
-#: menus.h:704
+#: menus.h:717
 msgid "<Programming:"
 msgstr "<プログラミング:"
 
-#: menus.h:705
+#: menus.h:718
 msgid "<Graphics:"
 msgstr "<グラフィック:"
 
-#: menus.h:706
+#: menus.h:719
 msgid "<Thanks to:"
 msgstr ""
 
-#: menus.h:708
+#: menus.h:721
 msgid "<Tools and libraries used:"
 msgstr "<使用しているツールおよびライブラリ:"
 
-#: menus.h:709
+#: menus.h:722
 msgid "<Fonts used:"
 msgstr "<使用しているフォント:"
 
-#: menus.h:713
+#: menus.h:726
 msgid "Thanks for playing!"
 msgstr "遊んでくれてありがとう!"
 
-#: menus.h:717
+#: menus.h:730
 msgid " Absolutely Amazing! "
 msgstr "なんということでしょう!"
 
-#: menus.h:722
+#: menus.h:735
 msgid "All Levels Mastered!!"
 msgstr "すべてのレベルをマスターしました!!"
 
-#: menus.h:726
+#: menus.h:739
 msgid "You crushed every last green hexagon with"
 msgstr ""
 
-#: menus.h:727
+#: menus.h:740
 msgid "breathtaking efficiency!"
 msgstr ""
 
-#: menus.h:729
+#: menus.h:742
 msgid "You truly are a grand master of hexagon hopping!"
 msgstr ""
 
-#: menus.h:878
+#: menus.h:891
 msgid "The End"
 msgstr ""
 
-#: menus.h:965
+#: menus.h:978
 #, c-format
 msgid "Continue game %d (All Clear!)"
 msgstr "ゲーム%dを再開 (完全にクリア!)"
 
-#: menus.h:967
+#: menus.h:980
 #, c-format
 msgid "Continue game %d (%d%% + %d%%)"
 msgstr "ゲーム%dを再開 (%d%% + %d%%)"
 
-#: menus.h:969
+#: menus.h:982
 #, c-format
 msgid "Continue game %d (%d%% complete)"
 msgstr "ゲーム%dを再開 (%d%%クリア)"
 
-#: menus.h:1008
+#: menus.h:1021
 msgid "Quit: Are you sure?"
 msgstr "本当に終了しますか?"
 
-#: menus.h:1028
+#: menus.h:1041
 #, c-format
 msgid "Really delete game %d?"
 msgstr "ゲーム%dを本当に消去しますか?"
 
-#: menus.h:1068
+#: menus.h:1081
 msgid "Paused"
 msgstr "一時中断"
 

Modified: packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch	2007-09-19 21:03:53 UTC (rev 4248)
+++ packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch	2007-09-19 22:46:36 UTC (rev 4249)
@@ -3,8 +3,8 @@
 
 Index: hex-a-hop.svn/gfx.cpp
 ===================================================================
---- hex-a-hop.svn.orig/gfx.cpp	2007-09-10 00:24:24.000000000 +0200
-+++ hex-a-hop.svn/gfx.cpp	2007-09-10 00:24:28.000000000 +0200
+--- hex-a-hop.svn.orig/gfx.cpp	2007-09-20 00:10:07.000000000 +0200
++++ hex-a-hop.svn/gfx.cpp	2007-09-20 00:11:28.000000000 +0200
 @@ -19,6 +19,7 @@
  #include "i18n.h"
  
@@ -36,7 +36,7 @@
  
  extern State* MakeWorld();
  
-@@ -157,6 +167,78 @@
+@@ -157,6 +167,89 @@
  }
  String base_path;
  
@@ -77,7 +77,7 @@
 +	SDL_FreeSurface(surface);
 +}
 +
-+/** \brief Display the specified UTF-8 text horizontally centered around (x,y)
++/** \brief Display the specified UTF-8 text according to the alignment
 + *
 + *  If line breaks are already properly set (manually) the will be respected
 + *  and no new line breaks will be added. This assumes that th text is not too
@@ -87,8 +87,9 @@
 + *  \param y the displayed text starts at y
 + *  \param width background window size into which the text needs to fit
 + *  \param text_utf8 the text to be displayed, in UTF8 encoding
++ *  \param align=1: horizontally centered around (x,y)
 + * */
-+void PrintC_Pango(int x, int y, int width, const std::string &text_utf8)
++void Print_Pango_Aligned(int x, int y, int width, const std::string &text_utf8, int align)
 +{
 +	// Workaround for possible crash, see
 +	// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439071
@@ -103,11 +104,21 @@
 +	if (real_width>width)
 +		SDLPango_SetMinimumSize(context, real_width, 0);
 +
++  SDLPango_Alignment alignment;
++  if (align==0)
++    alignment = SDLPANGO_ALIGN_LEFT;
++  else if (align==2) {
++    alignment = SDLPANGO_ALIGN_RIGHT;
++    x -= width;
++  } else {
++    alignment = SDLPANGO_ALIGN_CENTER;
++    x -= width/2;
++  }
 +	// SDLPango_SetText_GivenAlignment is not (yet?) part of the official Pango
 +	// distribution, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437865
-+	SDLPango_SetText_GivenAlignment(context, text_utf8.c_str(), -1, SDLPANGO_ALIGN_CENTER);
++	SDLPango_SetText_GivenAlignment(context, text_utf8.c_str(), -1, alignment);
 +	SDL_Surface *surface = SDLPango_CreateSurfaceDraw(context);
-+	SDL_Rect dst = {x-width/2, y, 1, 1};
++	SDL_Rect dst = {x, y, 1, 1};
 +	SDL_BlitSurface(surface, NULL, screen, &dst);
 +	SDL_FreeSurface(surface);
 +}
@@ -115,7 +126,7 @@
  int TickTimer()
  {
  	static int time = SDL_GetTicks();
-@@ -204,6 +286,10 @@
+@@ -204,6 +297,10 @@
  */
  
  	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
@@ -126,7 +137,7 @@
  
  	SDL_Surface* icon = SDL_LoadBMP("graphics/icon.bmp");
  	if (icon)
-@@ -378,7 +464,7 @@
+@@ -378,7 +475,7 @@
  						if (!td.isValid())
  							 printf("No tablet/driver found\n");
  					#endif
@@ -135,7 +146,7 @@
  				if (m->msg == WM_DROPFILES)
  				{
  					HDROP h = (HDROP)m->wParam;
-@@ -476,6 +562,7 @@
+@@ -476,6 +573,7 @@
  		}
  	}
  
@@ -145,8 +156,8 @@
  }
 Index: hex-a-hop.svn/hex_puzzzle.cpp
 ===================================================================
---- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-09-10 00:24:24.000000000 +0200
-+++ hex-a-hop.svn/hex_puzzzle.cpp	2007-09-10 00:24:28.000000000 +0200
+--- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-09-20 00:10:07.000000000 +0200
++++ hex-a-hop.svn/hex_puzzzle.cpp	2007-09-20 00:11:31.000000000 +0200
 @@ -17,6 +17,11 @@
  */
  
@@ -159,7 +170,7 @@
  
  //////////////////////////////////////////////////////
  // Config
-@@ -397,15 +402,37 @@
+@@ -401,15 +406,37 @@
  	}
  }
  
@@ -180,7 +191,7 @@
 +
 +int SDLPangoTextWidth(const std::string &text_utf8);
 +void Print_Pango(int x, int y, const std::string &text_utf8);
-+void PrintC_Pango(int x, int y, int width, const std::string &text_utf8);
++void Print_Pango_Aligned(int x, int y, int width, const std::string &text_utf8, int align);
 +
 +/// Prints a left aligned string (a single line) beginning at (x,y)
 +// TODO: Check that the maximal text width is already set
@@ -199,7 +210,7 @@
  
  	va_end( marker );              /* Reset variable arguments.      */
  }
-@@ -418,29 +445,42 @@
+@@ -422,29 +449,38 @@
  	return w;
  }
  
@@ -226,37 +237,34 @@
 + *
 + *  "  " in the string is interpreted as linebreak
 +*/
-+void PrintC(bool split, int x, int y, int width, const char * string, ...)
++void Print_Aligned(bool split, int x, int y, int width, const char * string, int align)
  {
- 	va_list marker;
- 	va_start( marker, string );     /* Initialize variable arguments. */
+-	va_list marker;
+-	va_start( marker, string );     /* Initialize variable arguments. */
++	char tmp_utf8[5000]; // FIXME: Check this limit
  
 -	char tmp[1000];
-+	char tmp[1000], tmp_utf8[5000]; // FIXME: Check this limit
- 	vsprintf((char*)tmp, string, marker);
+-	vsprintf((char*)tmp, string, marker);
++	ConvertToUTF8(string, tmp_utf8, sizeof(tmp_utf8)/sizeof(char));
  
 -	char* scan = tmp;
 -	while (1)
-+	ConvertToUTF8(tmp, tmp_utf8, sizeof(tmp_utf8)/sizeof(char));
-+
 +	std::string msg(tmp_utf8);
 +	while (split && msg.find("  ") != std::string::npos)
 +		msg.replace(msg.find("  "), 2, "\n");
 +
-+	PrintC_Pango(x, y, width, msg);
++	Print_Pango_Aligned(x, y, width, msg, align);
 +  /*
  	{
  		char * end = split ? strstr(scan,"  ") : 0;
  		if (!end)
-@@ -456,10 +496,30 @@
+@@ -460,10 +496,28 @@
  			y += FONT_SPACING;
  		}
  	}
 +  */
- 
- 	va_end( marker );              /* Reset variable arguments.      */
- }
- 
++}
++
 +void PrintC(bool split, int x, int y, const char * string, ...)
 +{
 +	va_list marker;
@@ -264,9 +272,10 @@
 +
 +	char tmp[1000]; // FIXME: Check this limit
 +	vsprintf((char*)tmp, string, marker);
-+
-+	va_end( marker );              /* Reset variable arguments.      */
-+
+ 
+ 	va_end( marker );              /* Reset variable arguments.      */
+-}
+ 
 +	static bool print = true; // avoid flickering!
 +	if (print) {
 +		std::cerr << "Warning: don't know window width for message:\n" << tmp << "\n";
@@ -274,15 +283,15 @@
 +			if (!std::isspace(tmp[i]))
 +				print = false;
 +	}
-+	PrintC(split, x, y, 2*std::min(x, SCREEN_W-x), "%s", tmp);
++	Print_Aligned(split, x, y, 2*std::min(x, SCREEN_W-x), tmp, 1);
 +}
  
  #include "savestate.h"
  #include "menus.h"
 Index: hex-a-hop.svn/Makefile
 ===================================================================
---- hex-a-hop.svn.orig/Makefile	2007-09-10 00:24:24.000000000 +0200
-+++ hex-a-hop.svn/Makefile	2007-09-10 00:24:28.000000000 +0200
+--- hex-a-hop.svn.orig/Makefile	2007-09-20 00:10:07.000000000 +0200
++++ hex-a-hop.svn/Makefile	2007-09-20 00:11:30.000000000 +0200
 @@ -19,7 +19,7 @@
  	$(GCC) $(CXXFLAGS) -D_VERSION=\"$(VERSION)\" -DDATA_DIR=\"$(DATA_DIR)\" `sdl-config --cflags`  -c -o $@ $<
  	
@@ -294,8 +303,8 @@
  clean :
 Index: hex-a-hop.svn/menus.h
 ===================================================================
---- hex-a-hop.svn.orig/menus.h	2007-09-10 00:24:24.000000000 +0200
-+++ hex-a-hop.svn/menus.h	2007-09-10 00:24:28.000000000 +0200
+--- hex-a-hop.svn.orig/menus.h	2007-09-20 00:10:07.000000000 +0200
++++ hex-a-hop.svn/menus.h	2007-09-20 00:12:48.000000000 +0200
 @@ -16,11 +16,14 @@
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
@@ -367,7 +376,7 @@
  	}
  
  	virtual void Render()
-@@ -205,17 +228,26 @@
+@@ -205,17 +228,35 @@
  		Render(0, y);
  		
  		if (!state && time>0.2)
@@ -395,11 +404,20 @@
 -		Print(r.x+FONT_SPACING/4, y-FONT_SPACING, title);
 -		PrintC(true, x+SCREEN_W/2, y+FONT_SPACING/2, msg);
 +		Print(OuterTextWindowRect.x+FONT_SPACING/4, y-FONT_SPACING, "%s", title);
-+		PrintC(true, x+SCREEN_W/2, y+FONT_SPACING/2, InnerTextWindowRect.w - 2*FONT_SPACING, "%s", msg);
++		/* TRANSLATORS: This specifies how the text in the help dialog should
++		   be aligned. Do *not* translate the text itself but use one of "left",
++       "center" or "right" (untranslated!). The default is "center". */
++		std::string alignment = _("text alignment");
++		if (alignment == "right")
++			Print_Aligned(true, InnerTextWindowRect.x + InnerTextWindowRect.w - FONT_SPACING, y+FONT_SPACING/2, InnerTextWindowRect.w - 2*FONT_SPACING, msg, 2);
++		else if (alignment == "left")
++			Print_Aligned(true, InnerTextWindowRect.x + FONT_SPACING, y+FONT_SPACING/2, InnerTextWindowRect.w - 2*FONT_SPACING, msg, 0);
++		else
++			Print_Aligned(true, x+SCREEN_W/2, y+FONT_SPACING/2, InnerTextWindowRect.w - 2*FONT_SPACING, msg, 1);
  	}
  
  	virtual void Mouse(int /*x*/, int /*y*/, int /*dx*/, int /*dy*/, int buttons_pressed, int /*buttons_released*/, int /*buttons*/) 
-@@ -265,7 +297,8 @@
+@@ -265,7 +306,8 @@
  		{
  			if (y < SCREEN_H/4-FONT_SPACING+2)
  				Move(-1);
@@ -409,7 +427,7 @@
  				Move(1);
  			else
  				Cancel();
-@@ -304,7 +337,8 @@
+@@ -304,7 +346,8 @@
  		//if (!noMouse)
  		{
  			PrintC(false, SCREEN_W/2, y-FONT_SPACING*2, "^");

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-09-19 21:03:53 UTC (rev 4248)
+++ packages/trunk/hex-a-hop/debian/patches/remove_old_font_handling.patch	2007-09-19 22:46:36 UTC (rev 4249)
@@ -3,9 +3,9 @@
 
 Index: hex-a-hop.svn/hex_puzzzle.cpp
 ===================================================================
---- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-09-10 00:24:28.000000000 +0200
-+++ hex-a-hop.svn/hex_puzzzle.cpp	2007-09-10 00:24:31.000000000 +0200
-@@ -303,7 +303,6 @@
+--- hex-a-hop.svn.orig/hex_puzzzle.cpp	2007-09-19 23:52:38.000000000 +0200
++++ hex-a-hop.svn/hex_puzzzle.cpp	2007-09-19 23:53:58.000000000 +0200
+@@ -307,7 +307,6 @@
  
  #define MAX_DIR 6
  
@@ -13,7 +13,7 @@
  SDL_Rect tile[2][70];
  short tileOffset[2][70][2];
  int Peek(SDL_Surface* i, int x, int y)
-@@ -334,45 +333,7 @@
+@@ -338,45 +337,7 @@
  				return false;
  	return true;
  }
@@ -59,7 +59,7 @@
  void MakeTileInfo()
  {
  	for (int i=0; i<140; i++)
-@@ -392,16 +353,6 @@
+@@ -396,16 +357,6 @@
  	}
  }
  
@@ -76,7 +76,7 @@
  void ConvertToUTF8(const std::string &text_locally_encoded, char *text_utf8, size_t text_utf8_length)
  {
  	// Is this portable?
-@@ -437,14 +388,6 @@
+@@ -441,14 +392,6 @@
  	va_end( marker );              /* Reset variable arguments.      */
  }
  
@@ -94,7 +94,7 @@
 @@ -480,23 +423,6 @@
  		msg.replace(msg.find("  "), 2, "\n");
  
- 	PrintC_Pango(x, y, width, msg);
+ 	Print_Pango_Aligned(x, y, width, msg, align);
 -  /*
 -	{
 -		char * end = split ? strstr(scan,"  ") : 0;
@@ -112,10 +112,10 @@
 -		}
 -	}
 -  */
+ }
  
- 	va_end( marker );              /* Reset variable arguments.      */
- }
-@@ -4192,7 +4118,6 @@
+ void PrintC(bool split, int x, int y, const char * string, ...)
+@@ -4194,7 +4120,6 @@
  		if (first)
  		{
  			first = false;
@@ -125,9 +125,9 @@
  
 Index: hex-a-hop.svn/menus.h
 ===================================================================
---- hex-a-hop.svn.orig/menus.h	2007-09-10 00:24:28.000000000 +0200
-+++ hex-a-hop.svn/menus.h	2007-09-10 00:24:31.000000000 +0200
-@@ -469,8 +469,8 @@
+--- hex-a-hop.svn.orig/menus.h	2007-09-19 23:47:07.000000000 +0200
++++ hex-a-hop.svn/menus.h	2007-09-19 23:53:14.000000000 +0200
+@@ -470,8 +470,8 @@
  		int y = r2.y + FONT_SPACING/2 + int(FONT_SPACING * 1.5) * o;
  		if (left_align)
  		{
@@ -138,7 +138,7 @@
  			if (select==o)
  			{
  				//x += int( sin(time*9)*2.5 );
-@@ -540,7 +540,7 @@
+@@ -541,7 +541,7 @@
  	void RenderTitle()
  	{
  		if (left_align)
@@ -149,8 +149,8 @@
  	}
 Index: hex-a-hop.svn/gfx_list.h
 ===================================================================
---- hex-a-hop.svn.orig/gfx_list.h	2007-09-10 00:24:24.000000000 +0200
-+++ hex-a-hop.svn/gfx_list.h	2007-09-10 00:24:31.000000000 +0200
+--- hex-a-hop.svn.orig/gfx_list.h	2007-09-19 23:29:12.000000000 +0200
++++ hex-a-hop.svn/gfx_list.h	2007-09-19 23:53:14.000000000 +0200
 @@ -17,7 +17,7 @@
  */

More information about the Pkg-games-commits mailing list