[xiph-commits] r16002 - in trunk/planarity: . po

xiphmont at svn.xiph.org xiphmont at svn.xiph.org
Thu May 14 14:20:03 PDT 2009


Author: xiphmont
Date: 2009-05-14 14:20:03 -0700 (Thu, 14 May 2009)
New Revision: 16002

Removed:
   trunk/planarity/po/de.po
Modified:
   trunk/planarity/Makefile
   trunk/planarity/gameboard.c
   trunk/planarity/gameboard.h
   trunk/planarity/gameboard_logic_buttonbar.c
   trunk/planarity/graph.c
   trunk/planarity/graph_generate.c
   trunk/planarity/graph_generate.h
   trunk/planarity/graph_region.c
   trunk/planarity/graph_region.h
   trunk/planarity/graph_score.c
   trunk/planarity/main.h
   trunk/planarity/po/cs.po
   trunk/planarity/po/gPlanarity.pot
   trunk/planarity/timer.c
   trunk/planarity/timer.h
   trunk/planarity/version.h
Log:
Remove bogus/mostly empty german transaltion file
Add Philip White's macro expansion cleanup



Modified: trunk/planarity/Makefile
===================================================================
--- trunk/planarity/Makefile	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/Makefile	2009-05-14 21:20:03 UTC (rev 16002)
@@ -11,12 +11,16 @@
 BINDIR  = $(PREFIX)/bin
 ETCDIR  = /etc/$(TARGET)
 MANDIR  = $(PREFIX)/man
+
 #DISABLE_NLS = true
+# White space delimited list of locales you want to support. Defaults to all
+# available ones.
+#export WANT_LINGUAS := cs
 
-
 # All subdirs with Makefiles
-SUBDIRS =
 
+SUBDIRS = po
+
 # By default, enable NLS
 ifeq ($(origin DISABLE_NLS), undefined)
 export GT_DOMAIN = $(TARGET)

Modified: trunk/planarity/gameboard.c
===================================================================
--- trunk/planarity/gameboard.c	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/gameboard.c	2009-05-14 21:20:03 UTC (rev 16002)
@@ -35,7 +35,7 @@
 #include <time.h>
 #include <string.h>
 
-#include "gettext.h"
+#include "nls.h"
 #include "graph.h"
 #include "gameboard.h"
 #include "levelstate.h"

Modified: trunk/planarity/gameboard.h
===================================================================
--- trunk/planarity/gameboard.h	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/gameboard.h	2009-05-14 21:20:03 UTC (rev 16002)
@@ -30,6 +30,8 @@
 #include <gdk/gdk.h>
 #include <time.h>
 
+#include "nls.h"
+
 #define V_RADIUS 8
 #define V_LINE 2
 #define V_LINE_COLOR         0, 0, 0

Modified: trunk/planarity/gameboard_logic_buttonbar.c
===================================================================
--- trunk/planarity/gameboard_logic_buttonbar.c	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/gameboard_logic_buttonbar.c	2009-05-14 21:20:03 UTC (rev 16002)
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include "gettext.h"
+#include "nls.h"
 #include "graph.h"
 #include "timer.h"
 #include "gameboard.h"

Modified: trunk/planarity/graph.c
===================================================================
--- trunk/planarity/graph.c	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/graph.c	2009-05-14 21:20:03 UTC (rev 16002)
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "gettext.h"
+#include "nls.h"
 #include "graph.h"
 #include "random.h"
 #include "timer.h"

Modified: trunk/planarity/graph_generate.c
===================================================================
--- trunk/planarity/graph_generate.c	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/graph_generate.c	2009-05-14 21:20:03 UTC (rev 16002)
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include "graph.h"
 #include "graph_generate.h"
-#include "gettext.h"
+#include "nls.h"
 
 typedef struct {
   char *class;
@@ -44,112 +44,112 @@
 #define FINITE_LEVELS 79
 static gen_instance i_list[FINITE_LEVELS]={ 
 
-  {"simple",   1, __("A Small Beginning"),                              generate_simple,    1.,4., 1 }, // 1
-  {"simple",   2, __("My First Real Level(tm)"),                        generate_simple,    1.,4., 2 }, // 2
-  {"data",     0, __("My First Mission Impossible(tm)"),                generate_data,     20.,4., 3 }, // 3
-  {"simple",   3, __("Larger But Not Harder"),                          generate_simple,    1.,4., 2 }, // 4
-  {"crest",    5, __("The Trick Is It's Easy"),                         generate_crest,     1.,4., 2 }, // 5
+  {"simple",   1, "A Small Beginning",                              generate_simple,    1.,4., 1 }, // 1
+  {"simple",   2, "My First Real Level(tm)",                        generate_simple,    1.,4., 2 }, // 2
+  {"data",     0, "My First Mission Impossible(tm)",                generate_data,     20.,4., 3 }, // 3
+  {"simple",   3, "Larger But Not Harder",                          generate_simple,    1.,4., 2 }, // 4
+  {"crest",    5, "The Trick Is It's Easy",                         generate_crest,     1.,4., 2 }, // 5
 
-  {"simple",   4, __("Practice Before the Handbasket: One of Three"),   generate_simple,    1.,4., 2 }, // 6
-  {"simple",   5, __("Practice Before the Handbasket: Two of Three"),   generate_simple,    1.,4., 2 }, // 7
-  {"simple",   6, __("Practice Before the Handbasket: Three of Three"), generate_simple,    1.,4., 2 }, // 8
+  {"simple",   4, "Practice Before the Handbasket: One of Three",   generate_simple,    1.,4., 2 }, // 6
+  {"simple",   5, "Practice Before the Handbasket: Two of Three",   generate_simple,    1.,4., 2 }, // 7
+  {"simple",   6, "Practice Before the Handbasket: Three of Three", generate_simple,    1.,4., 2 }, // 8
 
-  {"sparse",   4, __("Tough and Stringy"),                              generate_sparse,    1.2,4., 2 }, // 9
-  {"sparse",   5, __("Threadbare"),                                     generate_sparse,    1.2,4., 2 }, // 10
+  {"sparse",   4, "Tough and Stringy",                              generate_sparse,    1.2,4., 2 }, // 9
+  {"sparse",   5, "Threadbare",                                     generate_sparse,    1.2,4., 2 }, // 10
 
-  {"nasty",    4, __("The Bumpy Circles Are Slightly More Difficult"),  generate_nasty,    1.5,4., 3 }, // 11
-  {"nasty",    5, __("Three is a Magic Number"),                        generate_nasty,    1.5,4., 3 }, // 12
-  {"nasty",    6, __("Last Call For (Sort of) Triangles (For Now)"),    generate_nasty,    1.5,4., 3 }, // 13
+  {"nasty",    4, "The Bumpy Circles Are Slightly More Difficult",  generate_nasty,    1.5,4., 3 }, // 11
+  {"nasty",    5, "Three is a Magic Number",                        generate_nasty,    1.5,4., 3 }, // 12
+  {"nasty",    6, "Last Call For (Sort of) Triangles (For Now)",    generate_nasty,    1.5,4., 3 }, // 13
 
-  {"free",     4, __("Something Only Subtly Different"),                generate_freeform, 1.5,4., 3 }, // 14
-  {"free",     5, __("It Can Roll! Granted, Not Very Well"),            generate_freeform, 1.5,4., 3 }, // 15
-  {"free",     6, __("If You Squint, It's a Round Brick"),              generate_freeform, 1.5,4., 3 }, // 16
+  {"free",     4, "Something Only Subtly Different",                generate_freeform, 1.5,4., 3 }, // 14
+  {"free",     5, "It Can Roll! Granted, Not Very Well",            generate_freeform, 1.5,4., 3 }, // 15
+  {"free",     6, "If You Squint, It's a Round Brick",              generate_freeform, 1.5,4., 3 }, // 16
 
-  {"rogue",    5, __("A New Objective"),                                generate_rogue,    1.6,4., 3 }, // 17
-  {"rogue",    6, __("How Low Can You Go?"),                            generate_rogue,    1.6,4., 3 }, // 18
-  {"rogue",    7, __("Military Industrial Complex"),                    generate_rogue,    1.6,4., 4 }, // 19
+  {"rogue",    5, "A New Objective",                                generate_rogue,    1.6,4., 3 }, // 17
+  {"rogue",    6, "How Low Can You Go?",                            generate_rogue,    1.6,4., 3 }, // 18
+  {"rogue",    7, "Military Industrial Complex",                    generate_rogue,    1.6,4., 4 }, // 19
 
-  {"embed",    4, __("The Hexagon is a Subtle and Wily Beast"),         generate_embed,     2.,4.,  4 }, // 20
-  {"embed",    5, __("No, Really, The Hexagon Puzzles Are Harder"),     generate_embed,     3.,4.,  5 }, // 21
-  {"embed",    6, __("Cursed?  Call 1-800-HEX-A-GON Today!"),           generate_embed,     4.,4.,  6 }, // 22
+  {"embed",    4, "The Hexagon is a Subtle and Wily Beast",         generate_embed,     2.,4.,  4 }, // 20
+  {"embed",    5, "No, Really, The Hexagon Puzzles Are Harder",     generate_embed,     3.,4.,  5 }, // 21
+  {"embed",    6, "Cursed?  Call 1-800-HEX-A-GON Today!",           generate_embed,     4.,4.,  6 }, // 22
 
-  {"simple",   7, __("Round but Straightforward"),                      generate_simple,    1.,4.,  4 }, // 23
+  {"simple",   7, "Round but Straightforward",                      generate_simple,    1.,4.,  4 }, // 23
 
-  {"shape",    0, __("A Star Is Born... Then Solved"),                  generate_shape,    1.,2.,  6 }, // 24
-  {"shape",    1, __("Oh, Rain*bows*..."),                              generate_shape,    1.,2.,  6 }, // 25
-  {"shape",    2, __("Solve Along the Dotted Line"),                    generate_shape,    1.,2.,  6 }, // 26
-  {"shape",    3, __("Using All Available Space"),                      generate_shape,    1.,2.,  6 }, // 27
-  {"shape",    4, __("Brainfreeze"),                                    generate_shape,    1.,2.,  6 }, // 28
-  {"shape",    6, __("Tropical Storm Invest"),                          generate_shape,    1.,2.,  6 }, // 30
+  {"shape",    0, "A Star Is Born... Then Solved",                  generate_shape,    1.,2.,  6 }, // 24
+  {"shape",    1, "Oh, Rain*bows*...",                              generate_shape,    1.,2.,  6 }, // 25
+  {"shape",    2, "Solve Along the Dotted Line",                    generate_shape,    1.,2.,  6 }, // 26
+  {"shape",    3, "Using All Available Space",                      generate_shape,    1.,2.,  6 }, // 27
+  {"shape",    4, "Brainfreeze",                                    generate_shape,    1.,2.,  6 }, // 28
+  {"shape",    6, "Tropical Storm Invest",                          generate_shape,    1.,2.,  6 }, // 30
 
-  {"dense",  8, __("Algorithm: Original/Dense (Order: 8)"), generate_dense,     .8,1., 5 }, // 31
-  {"simple", 8, __("Algorithm: Original (Order: 8)"),       generate_simple,    1.,1., 6 }, // 32
-  {"sparse", 8, __("Algorithm: Original/Sparse (Order: 8)"),generate_sparse,   1.2,1., 7 }, // 33
-  {"nasty",  8, __("Algorithm: Nasty (Order: 8)"),          generate_nasty,    1.5,1., 8 }, // 34
-  {"free",   8, __("Algorithm: Freeform/4 (Order: 8)"),     generate_freeform, 1.5,1., 9 }, // 35
-  {"rogue",  8, __("Algorithm: Rogue (Order: 8)"),          generate_rogue,    1.6,1.,10 }, // 36
-  {"embed",  8, __("Algorithm: Embed (Order: 8)"),          generate_embed,     4.,1.,10 }, // 37
-  {"shape",  7, __("Operator"),                             generate_shape,     1.,2.,10 }, // 38
+  {"dense",  8, "Algorithm: Original/Dense (Order: 8)", generate_dense,     .8,1., 5 }, // 31
+  {"simple", 8, "Algorithm: Original (Order: 8)",       generate_simple,    1.,1., 6 }, // 32
+  {"sparse", 8, "Algorithm: Original/Sparse (Order: 8)",generate_sparse,   1.2,1., 7 }, // 33
+  {"nasty",  8, "Algorithm: Nasty (Order: 8)",          generate_nasty,    1.5,1., 8 }, // 34
+  {"free",   8, "Algorithm: Freeform/4 (Order: 8)",     generate_freeform, 1.5,1., 9 }, // 35
+  {"rogue",  8, "Algorithm: Rogue (Order: 8)",          generate_rogue,    1.6,1.,10 }, // 36
+  {"embed",  8, "Algorithm: Embed (Order: 8)",          generate_embed,     4.,1.,10 }, // 37
+  {"shape",  7, "Operator",                             generate_shape,     1.,2.,10 }, // 38
 
-  {"dense",  9, __("Algorithm: Original/Dense (Order: 9)"), generate_dense,     .8,1., 5 }, // 39
-  {"simple", 9, __("Algorithm: Original (Order: 9)"),       generate_simple,    1.,1., 6 }, // 40
-  {"sparse", 9, __("Algorithm: Original/Sparse (Order: 9)"),generate_sparse,   1.2,1., 7 }, // 41
-  {"nasty",  9, __("Algorithm: Nasty (Order: 9)"),          generate_nasty,    1.5,1., 8 }, // 42
-  {"free",   9, __("Algorithm: Freeform/4 (Order: 9)"),     generate_freeform, 1.5,1., 9 }, // 43
-  {"rogue",  9, __("Algorithm: Rogue (Order: 9)"),          generate_rogue,    1.6,1.,10 }, // 44
-  {"embed",  9, __("Algorithm: Embed (Order: 9)"),          generate_embed,     4.,1.,10 }, // 45
-  {"shape",  8, __("The Inside Is Pointy"),                 generate_shape,     1.,2.,10 }, // 46
+  {"dense",  9, "Algorithm: Original/Dense (Order: 9)", generate_dense,     .8,1., 5 }, // 39
+  {"simple", 9, "Algorithm: Original (Order: 9)",       generate_simple,    1.,1., 6 }, // 40
+  {"sparse", 9, "Algorithm: Original/Sparse (Order: 9)",generate_sparse,   1.2,1., 7 }, // 41
+  {"nasty",  9, "Algorithm: Nasty (Order: 9)",          generate_nasty,    1.5,1., 8 }, // 42
+  {"free",   9, "Algorithm: Freeform/4 (Order: 9)",     generate_freeform, 1.5,1., 9 }, // 43
+  {"rogue",  9, "Algorithm: Rogue (Order: 9)",          generate_rogue,    1.6,1.,10 }, // 44
+  {"embed",  9, "Algorithm: Embed (Order: 9)",          generate_embed,     4.,1.,10 }, // 45
+  {"shape",  8, "The Inside Is Pointy",                 generate_shape,     1.,2.,10 }, // 46
 
-  {"dense", 10, __("Algorithm: Original/Dense (Order: 10)"), generate_dense,     .8,1., 5 }, // 47
-  {"simple",10, __("Algorithm: Original (Order: 10)"),       generate_simple,    1.,1., 6 }, // 48
-  {"sparse",10, __("Algorithm: Original/Sparse (Order: 10)"),generate_sparse,   1.2,1., 7 }, // 49
-  {"nasty", 10, __("Algorithm: Nasty (Order: 10)"),          generate_nasty,    1.5,1., 8 }, // 50
-  {"free",  10, __("Algorithm: Freeform/4 (Order: 10)"),     generate_freeform, 1.5,1., 9 }, // 51
-  {"rogue", 10, __("Algorithm: Rogue (Order: 10)"),          generate_rogue,    1.6,1.,10 }, // 52
-  {"embed", 10, __("Algorithm: Embed (Order: 10)"),          generate_embed,     4.,1.,10 }, // 53
-  {"shape",  9, __("Riches and Good Luck"),                  generate_shape,     1.,2.,10 }, // 54
+  {"dense", 10, "Algorithm: Original/Dense (Order: 10)", generate_dense,     .8,1., 5 }, // 47
+  {"simple",10, "Algorithm: Original (Order: 10)",       generate_simple,    1.,1., 6 }, // 48
+  {"sparse",10, "Algorithm: Original/Sparse (Order: 10)",generate_sparse,   1.2,1., 7 }, // 49
+  {"nasty", 10, "Algorithm: Nasty (Order: 10)",          generate_nasty,    1.5,1., 8 }, // 50
+  {"free",  10, "Algorithm: Freeform/4 (Order: 10)",     generate_freeform, 1.5,1., 9 }, // 51
+  {"rogue", 10, "Algorithm: Rogue (Order: 10)",          generate_rogue,    1.6,1.,10 }, // 52
+  {"embed", 10, "Algorithm: Embed (Order: 10)",          generate_embed,     4.,1.,10 }, // 53
+  {"shape",  9, "Riches and Good Luck",                  generate_shape,     1.,2.,10 }, // 54
 
-  {"dense", 11, __("Algorithm: Original/Dense (Order: 11)"), generate_dense,     .8,1., 5 }, // 55
-  {"simple",11, __("Algorithm: Original (Order: 11)"),       generate_simple,    1.,1., 6 }, // 56
-  {"sparse",11, __("Algorithm: Original/Sparse (Order: 11)"),generate_sparse,   1.2,1., 7 }, // 57
-  {"nasty", 11, __("Algorithm: Nasty (Order: 11)"),          generate_nasty,    1.5,1., 8 }, // 58
-  {"free",  11, __("Algorithm: Freeform/4 (Order: 11)"),     generate_freeform, 1.5,1., 9 }, // 59
-  {"rogue", 11, __("Algorithm: Rogue (Order: 11)"),          generate_rogue,    1.6,1.,10 }, // 60
-  {"embed", 11, __("Algorithm: Embed (Order: 11)"),          generate_embed,     4.,1.,10 }, // 61
-  {"shape", 10, __("Mmmm... Doughnut"),                      generate_shape,     1.,2.,10 }, // 62
+  {"dense", 11, "Algorithm: Original/Dense (Order: 11)", generate_dense,     .8,1., 5 }, // 55
+  {"simple",11, "Algorithm: Original (Order: 11)",       generate_simple,    1.,1., 6 }, // 56
+  {"sparse",11, "Algorithm: Original/Sparse (Order: 11)",generate_sparse,   1.2,1., 7 }, // 57
+  {"nasty", 11, "Algorithm: Nasty (Order: 11)",          generate_nasty,    1.5,1., 8 }, // 58
+  {"free",  11, "Algorithm: Freeform/4 (Order: 11)",     generate_freeform, 1.5,1., 9 }, // 59
+  {"rogue", 11, "Algorithm: Rogue (Order: 11)",          generate_rogue,    1.6,1.,10 }, // 60
+  {"embed", 11, "Algorithm: Embed (Order: 11)",          generate_embed,     4.,1.,10 }, // 61
+  {"shape", 10, "Mmmm... Doughnut",                      generate_shape,     1.,2.,10 }, // 62
 
-  {"dense", 12, __("Algorithm: Original/Dense (Order: 12)"), generate_dense,     .8,1., 5 }, // 63
-  {"simple",12, __("Algorithm: Original (Order: 12)"),       generate_simple,    1.,1., 6 }, // 64
-  {"sparse",12, __("Algorithm: Original/Sparse (Order: 12)"),generate_sparse,   1.2,1., 7 }, // 65
-  {"nasty", 12, __("Algorithm: Nasty (Order: 12)"),          generate_nasty,    1.5,1., 8 }, // 66
-  {"free",  12, __("Algorithm: Freeform/4 (Order: 12)"),     generate_freeform, 1.5,1., 9 }, // 67
-  {"rogue", 12, __("Algorithm: Rogue (Order: 12)"),          generate_rogue,    1.6,1.,10 }, // 68
-  {"embed", 12, __("Algorithm: Embed (Order: 12)"),          generate_embed,     4.,1.,10 }, // 69
-  {"shape", 11, __("Quick and Dirty, or Slow and Steady"),   generate_shape,     1.,1.,10 }, // 70
-  {"shape",  5, __("Little Fluffy Clouds"),                   generate_shape,    1.,2., 6 }, // 29
+  {"dense", 12, "Algorithm: Original/Dense (Order: 12)", generate_dense,     .8,1., 5 }, // 63
+  {"simple",12, "Algorithm: Original (Order: 12)",       generate_simple,    1.,1., 6 }, // 64
+  {"sparse",12, "Algorithm: Original/Sparse (Order: 12)",generate_sparse,   1.2,1., 7 }, // 65
+  {"nasty", 12, "Algorithm: Nasty (Order: 12)",          generate_nasty,    1.5,1., 8 }, // 66
+  {"free",  12, "Algorithm: Freeform/4 (Order: 12)",     generate_freeform, 1.5,1., 9 }, // 67
+  {"rogue", 12, "Algorithm: Rogue (Order: 12)",          generate_rogue,    1.6,1.,10 }, // 68
+  {"embed", 12, "Algorithm: Embed (Order: 12)",          generate_embed,     4.,1.,10 }, // 69
+  {"shape", 11, "Quick and Dirty, or Slow and Steady",   generate_shape,     1.,1.,10 }, // 70
+  {"shape",  5, "Little Fluffy Clouds",                   generate_shape,    1.,2., 6 }, // 29
 
-  {"dense", 13, __("Algorithm: Original/Dense (Order: 13)"), generate_dense,     .8,1., 5 }, // 71
-  {"simple",13, __("Algorithm: Original (Order: 13)"),       generate_simple,    1.,1., 6 }, // 72
-  {"sparse",13, __("Algorithm: Original/Sparse (Order: 13)"),generate_sparse,   1.2,1., 7 }, // 73
-  {"nasty", 13, __("Algorithm: Nasty (Order: 13)"),          generate_nasty,    1.5,1., 8 }, // 74
-  {"free",  13, __("Algorithm: Freeform/4 (Order: 13)"),     generate_freeform, 1.5,1., 9 }, // 75
-  {"rogue", 13, __("Algorithm: Rogue (Order: 13)"),          generate_rogue,    1.6,1.,10 }, // 76
-  {"embed", 13, __("Algorithm: Embed (Order: 13)"),          generate_embed,     4.,1.,10 }, // 77
-  {"shape", 12, __("A Sudden Urge To Go Shopping"),          generate_shape,     1.,1.,10 }, // 78
-  {"shape", 13, __("Sweet Reward"),                          generate_shape,     1.,1.,10 }, // 79
+  {"dense", 13, "Algorithm: Original/Dense (Order: 13)", generate_dense,     .8,1., 5 }, // 71
+  {"simple",13, "Algorithm: Original (Order: 13)",       generate_simple,    1.,1., 6 }, // 72
+  {"sparse",13, "Algorithm: Original/Sparse (Order: 13)",generate_sparse,   1.2,1., 7 }, // 73
+  {"nasty", 13, "Algorithm: Nasty (Order: 13)",          generate_nasty,    1.5,1., 8 }, // 74
+  {"free",  13, "Algorithm: Freeform/4 (Order: 13)",     generate_freeform, 1.5,1., 9 }, // 75
+  {"rogue", 13, "Algorithm: Rogue (Order: 13)",          generate_rogue,    1.6,1.,10 }, // 76
+  {"embed", 13, "Algorithm: Embed (Order: 13)",          generate_embed,     4.,1.,10 }, // 77
+  {"shape", 12, "A Sudden Urge To Go Shopping",          generate_shape,     1.,1.,10 }, // 78
+  {"shape", 13, "Sweet Reward",                          generate_shape,     1.,1.,10 }, // 79
 
 };
 
 #define LOOP_LEVELS 8
 static gen_instance i_list_loop[LOOP_LEVELS]={ 
-  {"dense", 14, __("Algorithm: Original/Dense (Order: %d)"), generate_dense,     .8,1., 5 }, // n
-  {"simple",14, __("Algorithm: Original (Order: %d)"),       generate_simple,    1.,1., 6 }, // n
-  {"sparse",14, __("Algorithm: Original/Sparse (Order: %d)"),generate_sparse,   1.2,1., 7 }, // n
-  {"nasty", 14, __("Algorithm: Nasty (Order: %d)"),          generate_nasty,    1.5,1., 8 }, // n
-  {"free",  14, __("Algorithm: Freeform/4 (Order: %d)"),     generate_freeform, 1.5,1., 9 }, // n
-  {"rogue", 14, __("Algorithm: Rogue (Order: %d)"),          generate_rogue,    1.6,1.,10 }, // n
-  {"embed", 14, __("Algorithm: Embed (Order: %d)"),          generate_embed,     4.,1.,10 }, // n
-  {"shape", 14, __("Algorithm: Region (Order: %d)"),         generate_shape,     1.,2.,10 },
+  {"dense", 14, "Algorithm: Original/Dense (Order: %d)", generate_dense,     .8,1., 5 }, // n
+  {"simple",14, "Algorithm: Original (Order: %d)",       generate_simple,    1.,1., 6 }, // n
+  {"sparse",14, "Algorithm: Original/Sparse (Order: %d)",generate_sparse,   1.2,1., 7 }, // n
+  {"nasty", 14, "Algorithm: Nasty (Order: %d)",          generate_nasty,    1.5,1., 8 }, // n
+  {"free",  14, "Algorithm: Freeform/4 (Order: %d)",     generate_freeform, 1.5,1., 9 }, // n
+  {"rogue", 14, "Algorithm: Rogue (Order: %d)",          generate_rogue,    1.6,1.,10 }, // n
+  {"embed", 14, "Algorithm: Embed (Order: %d)",          generate_embed,     4.,1.,10 }, // n
+  {"shape", 14, "Algorithm: Region (Order: %d)",         generate_shape,     1.,2.,10 },
 };
 
 int generate_find_number(char *id){
@@ -190,7 +190,7 @@
     /* part of the finite list */
 
     gm->num = num;
-    gm->desc = i_list[num].desc;
+    gm->desc = _(i_list[num].desc);
     gm->unlock_plus = i_list[num].unlock+1;
     if(asprintf(&gm->id,"%s %d",i_list[num].class,i_list[num].instancenum)==-1){
       fprintf(stderr,_("Couldn't allocate memory for level name.\n"));

Modified: trunk/planarity/graph_generate.h
===================================================================
--- trunk/planarity/graph_generate.h	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/graph_generate.h	2009-05-14 21:20:03 UTC (rev 16002)
@@ -24,6 +24,8 @@
  * 
  */
 
+#include "nls.h"
+
 extern int generate_find_number(char *id);
 extern int generate_get_meta(int num, graphmeta *gm);
 extern void generate_board(graph *g,int num);

Modified: trunk/planarity/graph_region.c
===================================================================
--- trunk/planarity/graph_region.c	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/graph_region.c	2009-05-14 21:20:03 UTC (rev 16002)
@@ -31,7 +31,7 @@
 
 #include "graph.h"
 #include "graph_region.h"
-#include "gettext.h"
+#include "nls.h"
 
 /* Regions are 'electric fences' for mesh building; used in mesh2 to
    make non-convex shapes */

Modified: trunk/planarity/graph_region.h
===================================================================
--- trunk/planarity/graph_region.h	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/graph_region.h	2009-05-14 21:20:03 UTC (rev 16002)
@@ -24,6 +24,8 @@
  * 
  */
 
+#include "nls.h"
+
 extern void region_init();
 
 extern int region_intersects(edge *e);

Modified: trunk/planarity/graph_score.c
===================================================================
--- trunk/planarity/graph_score.c	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/graph_score.c	2009-05-14 21:20:03 UTC (rev 16002)
@@ -29,7 +29,7 @@
 #include <math.h>
 #include "graph.h"
 #include "timer.h"
-#include "gettext.h"
+#include "nls.h"
 
 static char objective_string[160];
 

Modified: trunk/planarity/main.h
===================================================================
--- trunk/planarity/main.h	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/main.h	2009-05-14 21:20:03 UTC (rev 16002)
@@ -26,23 +26,8 @@
 
 #include <gtk/gtk.h>
 
-#ifdef ENABLE_NLS
-#include <locale.h>
-#include <libintl.h>
+#include "nls.h"
 
-#define GT_DOMAIN X_GT_DOMAIN(UGT_DOMAIN)
-#define X_GT_DOMAIN(x) XX_GT_DOMAIN(x)
-#define XX_GT_DOMAIN(x) #x
-
-#define GT_DIR X_GT_DIR(UGT_DIR)
-#define X_GT_DIR(x) XX_GT_DIR(x)
-#define XX_GT_DIR(x) #x
-
-#define _(x) gettext(x)
-#else
-#define _(x) x
-#endif
-
 extern char *boarddir;
 extern char *statedir;
 extern char *fontface;

Modified: trunk/planarity/po/cs.po
===================================================================
--- trunk/planarity/po/cs.po	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/po/cs.po	2009-05-14 21:20:03 UTC (rev 16002)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gPlanarity 11496\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-15 17:41+0200\n"
+"Report-Msgid-Bugs-To: Monty <monty at xiph.org>\n"
+"POT-Creation-Date: 2009-05-14 17:11-0400\n"
 "PO-Revision-Date: 2007-05-15 17:58+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -15,150 +15,123 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../dialog_finish.c:160
+msgid "exit gPlanarity"
+msgstr "ukončit gPlanarity"
+
+msgid "level selection menu"
+msgstr "nabídka výběru kol"
+
+#, fuzzy
+msgid "play next level!"
+msgstr "hrát kolo!"
+
 msgid "Level Complete!"
 msgstr "Kolo hotovo!"
 
-#: ../dialog_finish.c:164
 #, c-format
 msgid "Elapsed: %s"
 msgstr "Uplynulo: %s"
 
-#: ../dialog_finish.c:168
 #, c-format
 msgid "Base score: %d points"
 msgstr "Základní skóre: %d bodů"
 
-#: ../dialog_finish.c:176
 #, c-format
 msgid "Objective Exceeded! %d%%"
 msgstr "Úkol překonán! %d%%"
 
-#: ../dialog_finish.c:181
 #, c-format
 msgid "Time bonus: %d points"
 msgstr "Časový bonus: %d bodů"
 
-#: ../dialog_finish.c:186
 #, c-format
 msgid "Final score: %d points"
 msgstr "Konečné skóre: %d bodů"
 
-#: ../dialog_finish.c:191
 msgid "A high score!"
 msgstr "Rekord!"
 
-#: ../dialog_finish.c:194
 #, c-format
 msgid "Previous best: %ld points"
 msgstr "Předchozí nejlepší: %ld bodů"
 
-#: ../dialog_finish.c:199
 msgid "Total score to date:"
 msgstr "Celkové skóre k datu:"
 
-#: ../dialog_finish.c:201
 #, c-format
 msgid "%ld points"
 msgstr "%ld bodů"
 
-#: ../dialog_level.c:67 ../dialog_pause.c:67 ../gameboard_logic_buttonbar.c:54
-msgid "exit gPlanarity"
-msgstr "ukončit gPlanarity"
-
-#: ../dialog_level.c:68
 msgid "reset level"
 msgstr "znovu začít kolo"
 
-#: ../dialog_level.c:69
 msgid "play level!"
 msgstr "hrát kolo!"
 
-#: ../dialog_level.c:139
 msgid "Available Levels"
 msgstr "Dostupná kola"
 
-#: ../dialog_level_icons.c:246
 #, c-format
 msgid "Level %d:"
 msgstr "Kolo %d:"
 
-#: ../dialog_level_icons.c:264
 #, c-format
 msgid "[not yet completed]"
 msgstr "[ještě nedokončeno]"
 
-#: ../dialog_level_icons.c:267
 #, c-format
 msgid "level high score: %ld"
 msgstr "rekord pro kolo: %ld"
 
-#: ../dialog_level_icons.c:277
 #, c-format
 msgid "total score all levels: %ld"
 msgstr "celkové skóre za všechna kola: %ld"
 
-#: ../dialog_pause.c:68
 msgid "resume game!"
 msgstr "pokračovat ve hře!"
 
-#: ../dialog_pause.c:131
 msgid "Game Paused"
 msgstr "Hra zastavena"
 
-#: ../dialog_pause.c:134
 msgid "Time Elapsed:"
 msgstr "Uplynulý čas:"
 
-#: ../dialog_pause.c:186
 msgid "gPlanarity"
 msgstr "gPlanarity"
 
-#: ../dialog_pause.c:190
 msgid "Untangle the mess!"
 msgstr "Rozmotejte Å¡modrchanec!"
 
-#: ../dialog_pause.c:194
 msgid "Drag verticies to eliminate crossed lines."
 msgstr "Přesunujte vrcholy, abyste odstranili křížící se čáry."
 
-#: ../dialog_pause.c:195
 msgid "The objective may be a complete solution or"
 msgstr "Zadání může být uplné řešení nebo"
 
-#: ../dialog_pause.c:196
 msgid "getting as close as possible to solving an"
 msgstr "dobrání se podoby co nejblížší řešení"
 
-#: ../dialog_pause.c:197
 msgid "unsolvable puzzle.  Work quickly and"
 msgstr "neřešitelného rébusu. Pracujte rychle a"
 
-#: ../dialog_pause.c:198
 msgid "exceed the objective for bonus points!"
 msgstr "získejte body navíc za překonání zadání!"
 
-#: ../dialog_pause.c:207
 msgid "gPlanarity written by Monty <monty at xiph.org>"
 msgstr "gPlanarity napsal Monty <monty at xiph.org>"
 
-#: ../dialog_pause.c:208
 msgid "as a demonstration of Gtk+/Cairo"
 msgstr "jako demo Gtk+/Caira"
 
-#: ../dialog_pause.c:210
 msgid "Original Flash version of Planarity by"
 msgstr "Původní verzi Planarity ve flashy napsal"
 
-#: ../dialog_pause.c:211
 msgid "John Tantalo <john.tantalo at case.edu>"
 msgstr "John Tantalo <john.tantalo at case.edu>"
 
-#: ../dialog_pause.c:213
 msgid "Original game concept by Mary Radcliffe"
 msgstr "Koncepci hry vymysla Mary Radcliffe."
 
-#: ../gameboard.c:75
 #, c-format
 msgid ""
 "\n"
@@ -176,7 +149,6 @@
 "okna bude poškozená.\n"
 "\n"
 
-#: ../gameboard.c:78 ../gameboard.c:189
 #, c-format
 msgid ""
 "Clipping and/or expanding this board to the current window size...\n"
@@ -185,7 +157,6 @@
 "Lze očekávat oříznutí a/nebo roztažení takové desky na rozměry okna…\n"
 "\n"
 
-#: ../gameboard.c:184
 #, c-format
 msgid ""
 "\n"
@@ -206,82 +177,61 @@
 "(a na veselý vzhled čehokoliv již od teď).\n"
 "\n"
 
-#: ../gameboard_draw_intersection.c:65
 msgid "rather many, really"
 msgstr "raději mnoho, opravdu"
 
-#: ../gameboard_draw_main.c:370
 #, c-format
 msgid "ERROR:  Could not load board icon \"%s\"\n"
 msgstr "CHYBA: Nelze načíst ikonu desky „%s“\n"
 
-#: ../gameboard_draw_main.c:436
 #, c-format
 msgid "ERROR:  Could not save board icon \"%s\"\n"
 msgstr "CHYBA: nelze uložit ikonu desky „%s“\n"
 
-#: ../gameboard_draw_score.c:67
 #, c-format
 msgid "Level %d: %s"
 msgstr "Kolo %d: %s"
 
-#: ../gameboard_draw_score.c:68
 #, c-format
 msgid "Score: %d"
 msgstr "Skóre: %d"
 
-#: ../gameboard_draw_score.c:69
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../gameboard_draw_score.c:70
 #, c-format
 msgid "Intersections: %ld"
 msgstr "Průniků: %ld"
 
-#: ../gameboard_draw_score.c:71
 #, c-format
 msgid "Objective: %s"
 msgstr "Zadání: %s"
 
-#: ../gameboard_logic_buttonbar.c:55
-msgid "level selection menu"
-msgstr "nabídka výběru kol"
-
-#: ../gameboard_logic_buttonbar.c:56
 msgid "reset board"
 msgstr "resetovat desku"
 
-#: ../gameboard_logic_buttonbar.c:57
 msgid "pause"
 msgstr "pauza"
 
-#: ../gameboard_logic_buttonbar.c:58
 msgid "help / about"
 msgstr "nápověda / o programu"
 
-#: ../gameboard_logic_buttonbar.c:59
 msgid "expand"
 msgstr "roztáhnout"
 
-#: ../gameboard_logic_buttonbar.c:60
 msgid "shrink"
 msgstr "smrštit"
 
-#: ../gameboard_logic_buttonbar.c:61
 msgid "hide/show lines"
 msgstr "skrýt/zobrazit čáry"
 
-#: ../gameboard_logic_buttonbar.c:62
 msgid "mark intersections"
 msgstr "označit průniky"
 
-#: ../gameboard_logic_buttonbar.c:63
 msgid "click when finished!"
 msgstr "po dokončení klikněte!"
 
-#: ../gameboard_logic.c:371
 #, c-format
 msgid ""
 "ERROR:  Could not save board state for \"%s\":\n"
@@ -290,7 +240,6 @@
 "CHYBA: Nelze uložit stav desky pro „%s“:\n"
 "\t%s\n"
 
-#: ../gameboard_logic.c:401
 #, c-format
 msgid ""
 "ERROR:  Could not read saved board state for \"%s\":\n"
@@ -299,22 +248,18 @@
 "CHYBA: Nelze načíst uložený stav desky pro „%s“:\n"
 "\t%s\n"
 
-#: ../graph.c:923
 #, c-format
 msgid "WARNING: edge references out of range vertex in save file\n"
 msgstr "VAROVÁNÍ: hrana odkazuje na vrchol mimo rozsah uložený v souboru\n"
 
-#: ../graph_generate.c:196 ../graph_generate.c:215
 #, c-format
 msgid "Couldn't allocate memory for level name.\n"
 msgstr "Nelze vyhradit paměť pro jméno kola.\n"
 
-#: ../graph_generate.c:210
 #, c-format
 msgid "Couldn't allocate memory for level desciption.\n"
 msgstr "Nelze vyhradit paměť pro popis kola.\n"
 
-#: ../graph_region.c:459
 #, c-format
 msgid ""
 "region overlap adjustment failed in arc_arc_adj; \n"
@@ -323,28 +268,22 @@
 "přizpůsobení překrývajících se oblastí selhalo v arc_arc_arj;\n"
 "  Toto je vnitřní chyba a nemělo by k ní nikdy dojít.\n"
 
-#: ../graph_score.c:67
 msgid "zero intersections"
 msgstr "žádné průniky"
 
-#: ../graph_score.c:70
 msgid "1 intersection or fewer"
 msgstr "1 průnik nebo méně"
 
-#: ../graph_score.c:72
 msgid "1 intersection"
 msgstr "1 průnik"
 
-#: ../graph_score.c:75
 #, c-format
 msgid "%d intersections%s"
 msgstr "%d průniků%s"
 
-#: ../graph_score.c:77
 msgid " or fewer"
 msgstr " nebo méně"
 
-#: ../levelstate.c:169
 #, c-format
 msgid ""
 "ERROR:  Could not save game state file \"%s\":\n"
@@ -353,7 +292,6 @@
 "CHYBA:  Nelze uložit soubor se stavem hry „%s“:\n"
 "\t%s\n"
 
-#: ../levelstate.c:216
 #, c-format
 msgid ""
 "ERROR:  Could not read game state file \"%s\":\n"
@@ -362,7 +300,6 @@
 "CHYBA:  Nelze načíst soubor se stavem hry „%s“:\n"
 "\t%s\n"
 
-#: ../main.c:73
 #, c-format
 msgid ""
 "ERROR:  Could not create directory (%s) to save game state:\n"
@@ -371,7 +308,6 @@
 "CHYBA:  Nelze vytvořit adresář (%s) pro ukládání stavu hry:\n"
 "\t%s\n"
 
-#: ../main.c:93
 #, c-format
 msgid ""
 "\n"
@@ -380,7 +316,6 @@
 "\n"
 "Zachycen signál %d; uložím stav a skončím!\n"
 
-#: ../main.c:146
 #, c-format
 msgid ""
 "\n"
@@ -393,23 +328,18 @@
 "Pokračuji, ale výsledek asi bude ošklivý.\n"
 "\n"
 
-#: ../main.c:149 ../main.c:167
 msgid "bold italic"
 msgstr "tučnou kurzívou"
 
-#: ../main.c:149 ../main.c:167
 msgid "italic"
 msgstr "kurzívou"
 
-#: ../main.c:149 ../main.c:167
 msgid "bold"
 msgstr "tučným řezem"
 
-#: ../main.c:149 ../main.c:167
 msgid "medium"
 msgstr "středním řezem"
 
-#: ../main.c:164
 #, c-format
 msgid ""
 "\n"
@@ -424,7 +354,6 @@
 "Pokračuji, ale výsledek bude asi ošklivý\n"
 "\n"
 
-#: ../main.c:288
 #, c-format
 msgid ""
 "No homedir environment variable set!  gPlanarity will be\n"
@@ -434,17 +363,14 @@
 "schopné\n"
 "trvale uložit postup hráče nebo stav hrací desky.\n"
 
-#: ../timer.c:51
 #, c-format
 msgid "%d:%02d:%02d"
 msgstr "%d:%02d:%02d"
 
-#: ../timer.c:53
 #, c-format
 msgid "%d:%02d"
 msgstr "%d:%02d"
 
-#: ../timer.c:55
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"

Deleted: trunk/planarity/po/de.po
===================================================================
--- trunk/planarity/po/de.po	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/po/de.po	2009-05-14 21:20:03 UTC (rev 16002)
@@ -1,943 +0,0 @@
-# German translation for gPlananarity.
-# Copyright (C) 2007 Monty
-# This file is distributed under the same license as the gPlanarity package.
-# Petr Pisar <petr.pisar at atlas.cz>, 2007
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gPlanarity 11496\n"
-"Report-Msgid-Bugs-To: Monty <monty at xiph.org>\n"
-"POT-Creation-Date: 2007-05-21 19:24+0200\n"
-"PO-Revision-Date: 2007-06-03 23:55:00+02\n"
-"Last-Translator: Petr Pisar <petr.pisar at atlas.cz\n"
-"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#
-# File: ../dialog_finish.c, line: 80
-# File: ../dialog_level.c, line: 67
-# File: ../dialog_pause.c, line: 67
-# File: ../gameboard_logic_buttonbar.c, line: 54
-msgid "exit gPlanarity"
-msgstr "schließen gPlanarity"
-
-#
-# File: ../dialog_finish.c, line: 81
-# File: ../gameboard_logic_buttonbar.c, line: 55
-msgid "level selection menu"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 82
-msgid "play next level!"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 160
-msgid "Level Complete!"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 164
-#, c-format
-msgid "Elapsed: %s"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 168
-#, c-format
-msgid "Base score: %d points"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 176
-#, c-format
-msgid "Objective Exceeded! %d%%"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 181
-#, c-format
-msgid "Time bonus: %d points"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 186
-#, c-format
-msgid "Final score: %d points"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 191
-msgid "A high score!"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 194
-#, c-format
-msgid "Previous best: %ld points"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 199
-msgid "Total score to date:"
-msgstr ""
-
-#
-# File: ../dialog_finish.c, line: 201
-#, c-format
-msgid "%ld points"
-msgstr ""
-
-#
-# File: ../dialog_level.c, line: 68
-msgid "reset level"
-msgstr ""
-
-#
-# File: ../dialog_level.c, line: 69
-msgid "play level!"
-msgstr ""
-
-#
-# File: ../dialog_level.c, line: 139
-msgid "Available Levels"
-msgstr ""
-
-#
-# File: ../dialog_level_icons.c, line: 246
-#, c-format
-msgid "Level %d:"
-msgstr ""
-
-#
-# File: ../dialog_level_icons.c, line: 264
-#, c-format
-msgid "[not yet completed]"
-msgstr ""
-
-#
-# File: ../dialog_level_icons.c, line: 267
-#, c-format
-msgid "level high score: %ld"
-msgstr ""
-
-#
-# File: ../dialog_level_icons.c, line: 277
-#, c-format
-msgid "total score all levels: %ld"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 68
-msgid "resume game!"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 131
-msgid "Game Paused"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 134
-msgid "Time Elapsed:"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 186
-msgid "gPlanarity"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 190
-msgid "Untangle the mess!"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 194
-msgid "Drag verticies to eliminate crossed lines."
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 195
-msgid "The objective may be a complete solution or"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 196
-msgid "getting as close as possible to solving an"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 197
-msgid "unsolvable puzzle.  Work quickly and"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 198
-msgid "exceed the objective for bonus points!"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 207
-msgid "gPlanarity written by Monty <monty at xiph.org>"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 208
-msgid "as a demonstration of Gtk+/Cairo"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 210
-msgid "Original Flash version of Planarity by"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 211
-msgid "John Tantalo <john.tantalo at case.edu>"
-msgstr ""
-
-#
-# File: ../dialog_pause.c, line: 213
-msgid "Original game concept by Mary Radcliffe"
-msgstr ""
-
-#
-# File: ../gameboard.c, line: 75
-#, c-format
-msgid ""
-"\n"
-"\n"
-"ERROR: The windowmanager appears to be ignoring resize requests.\n"
-"This stands a pretty good chance of scrambling any saved board larger\n"
-"than the default window size.\n"
-"\n"
-msgstr ""
-
-#
-# File: ../gameboard.c, line: 78
-# File: ../gameboard.c, line: 189
-#, c-format
-msgid ""
-"Clipping and/or expanding this board to the current window size...\n"
-"\n"
-msgstr ""
-
-#
-# File: ../gameboard.c, line: 184
-#, c-format
-msgid ""
-"\n"
-"\n"
-"ERROR: The window size granted by the windowmanager is not the\n"
-"window size gPlanarity requested.  If the windowmanager is\n"
-"configured to ignore application sizing requests, this stands\n"
-"a pretty good chance of scrambling saved boards later (and\n"
-"making everything look funny now).\n"
-"\n"
-msgstr ""
-
-#
-# File: ../gameboard_draw_intersection.c, line: 65
-msgid "rather many, really"
-msgstr ""
-
-#
-# File: ../gameboard_draw_main.c, line: 370
-#, c-format
-msgid "ERROR:  Could not load board icon \"%s\"\n"
-msgstr ""
-
-#
-# File: ../gameboard_draw_main.c, line: 436
-#, c-format
-msgid "ERROR:  Could not save board icon \"%s\"\n"
-msgstr ""
-
-#
-# File: ../gameboard_draw_score.c, line: 67
-#, c-format
-msgid "Level %d: %s"
-msgstr ""
-
-#
-# File: ../gameboard_draw_score.c, line: 68
-#, c-format
-msgid "Score: %d"
-msgstr ""
-
-#
-# File: ../gameboard_draw_score.c, line: 69
-#, c-format
-msgid "%d%%"
-msgstr ""
-
-#
-# File: ../gameboard_draw_score.c, line: 70
-#, c-format
-msgid "Intersections: %ld"
-msgstr ""
-
-#
-# File: ../gameboard_draw_score.c, line: 71
-#, c-format
-msgid "Objective: %s"
-msgstr ""
-
-#
-# File: ../gameboard_logic_buttonbar.c, line: 56
-msgid "reset board"
-msgstr ""
-
-#
-# File: ../gameboard_logic_buttonbar.c, line: 57
-msgid "pause"
-msgstr ""
-
-#
-# File: ../gameboard_logic_buttonbar.c, line: 58
-msgid "help / about"
-msgstr ""
-
-#
-# File: ../gameboard_logic_buttonbar.c, line: 59
-msgid "expand"
-msgstr ""
-
-#
-# File: ../gameboard_logic_buttonbar.c, line: 60
-msgid "shrink"
-msgstr ""
-
-#
-# File: ../gameboard_logic_buttonbar.c, line: 61
-msgid "hide/show lines"
-msgstr ""
-
-#
-# File: ../gameboard_logic_buttonbar.c, line: 62
-msgid "mark intersections"
-msgstr ""
-
-#
-# File: ../gameboard_logic_buttonbar.c, line: 63
-msgid "click when finished!"
-msgstr ""
-
-#
-# File: ../gameboard_logic.c, line: 371
-#, c-format
-msgid ""
-"ERROR:  Could not save board state for \"%s\":\n"
-"\t%s\n"
-msgstr ""
-
-#
-# File: ../gameboard_logic.c, line: 401
-#, c-format
-msgid ""
-"ERROR:  Could not read saved board state for \"%s\":\n"
-"\t%s\n"
-msgstr ""
-
-#
-# File: ../graph.c, line: 923
-#, c-format
-msgid "WARNING: edge references out of range vertex in save file\n"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 47
-msgid "A Small Beginning"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 48
-msgid "My First Real Level(tm)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 49
-msgid "My First Mission Impossible(tm)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 50
-msgid "Larger But Not Harder"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 51
-msgid "The Trick Is It's Easy"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 53
-msgid "Practice Before the Handbasket: One of Three"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 54
-msgid "Practice Before the Handbasket: Two of Three"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 55
-msgid "Practice Before the Handbasket: Three of Three"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 57
-msgid "Tough and Stringy"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 58
-msgid "Threadbare"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 60
-msgid "The Bumpy Circles Are Slightly More Difficult"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 61
-msgid "Three is a Magic Number"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 62
-msgid "Last Call For (Sort of) Triangles (For Now)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 64
-msgid "Something Only Subtly Different"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 65
-msgid "It Can Roll! Granted, Not Very Well"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 66
-msgid "If You Squint, It's a Round Brick"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 68
-msgid "A New Objective"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 69
-msgid "How Low Can You Go?"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 70
-msgid "Military Industrial Complex"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 72
-msgid "The Hexagon is a Subtle and Wily Beast"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 73
-msgid "No, Really, The Hexagon Puzzles Are Harder"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 74
-msgid "Cursed?  Call 1-800-HEX-A-GON Today!"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 76
-msgid "Round but Straightforward"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 78
-msgid "A Star Is Born... Then Solved"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 79
-msgid "Oh, Rain*bows*..."
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 80
-msgid "Solve Along the Dotted Line"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 81
-msgid "Using All Available Space"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 82
-msgid "Brainfreeze"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 83
-msgid "Tropical Storm Invest"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 85
-msgid "Algorithm: Original/Dense (Order: 8)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 86
-msgid "Algorithm: Original (Order: 8)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 87
-msgid "Algorithm: Original/Sparse (Order: 8)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 88
-msgid "Algorithm: Nasty (Order: 8)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 89
-msgid "Algorithm: Freeform/4 (Order: 8)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 90
-msgid "Algorithm: Rogue (Order: 8)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 91
-msgid "Algorithm: Embed (Order: 8)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 92
-msgid "Operator"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 94
-msgid "Algorithm: Original/Dense (Order: 9)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 95
-msgid "Algorithm: Original (Order: 9)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 96
-msgid "Algorithm: Original/Sparse (Order: 9)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 97
-msgid "Algorithm: Nasty (Order: 9)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 98
-msgid "Algorithm: Freeform/4 (Order: 9)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 99
-msgid "Algorithm: Rogue (Order: 9)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 100
-msgid "Algorithm: Embed (Order: 9)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 101
-msgid "The Inside Is Pointy"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 103
-msgid "Algorithm: Original/Dense (Order: 10)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 104
-msgid "Algorithm: Original (Order: 10)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 105
-msgid "Algorithm: Original/Sparse (Order: 10)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 106
-msgid "Algorithm: Nasty (Order: 10)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 107
-msgid "Algorithm: Freeform/4 (Order: 10)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 108
-msgid "Algorithm: Rogue (Order: 10)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 109
-msgid "Algorithm: Embed (Order: 10)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 110
-msgid "Riches and Good Luck"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 112
-msgid "Algorithm: Original/Dense (Order: 11)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 113
-msgid "Algorithm: Original (Order: 11)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 114
-msgid "Algorithm: Original/Sparse (Order: 11)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 115
-msgid "Algorithm: Nasty (Order: 11)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 116
-msgid "Algorithm: Freeform/4 (Order: 11)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 117
-msgid "Algorithm: Rogue (Order: 11)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 118
-msgid "Algorithm: Embed (Order: 11)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 119
-msgid "Mmmm... Doughnut"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 121
-msgid "Algorithm: Original/Dense (Order: 12)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 122
-msgid "Algorithm: Original (Order: 12)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 123
-msgid "Algorithm: Original/Sparse (Order: 12)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 124
-msgid "Algorithm: Nasty (Order: 12)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 125
-msgid "Algorithm: Freeform/4 (Order: 12)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 126
-msgid "Algorithm: Rogue (Order: 12)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 127
-msgid "Algorithm: Embed (Order: 12)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 128
-msgid "Quick and Dirty, or Slow and Steady"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 129
-msgid "Little Fluffy Clouds"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 131
-msgid "Algorithm: Original/Dense (Order: 13)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 132
-msgid "Algorithm: Original (Order: 13)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 133
-msgid "Algorithm: Original/Sparse (Order: 13)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 134
-msgid "Algorithm: Nasty (Order: 13)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 135
-msgid "Algorithm: Freeform/4 (Order: 13)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 136
-msgid "Algorithm: Rogue (Order: 13)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 137
-msgid "Algorithm: Embed (Order: 13)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 138
-msgid "A Sudden Urge To Go Shopping"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 139
-msgid "Sweet Reward"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 145
-#, c-format
-msgid "Algorithm: Original/Dense (Order: %d)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 146
-#, c-format
-msgid "Algorithm: Original (Order: %d)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 147
-#, c-format
-msgid "Algorithm: Original/Sparse (Order: %d)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 148
-#, c-format
-msgid "Algorithm: Nasty (Order: %d)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 149
-#, c-format
-msgid "Algorithm: Freeform/4 (Order: %d)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 150
-#, c-format
-msgid "Algorithm: Rogue (Order: %d)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 151
-#, c-format
-msgid "Algorithm: Embed (Order: %d)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 152
-#, c-format
-msgid "Algorithm: Region (Order: %d)"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 196
-# File: ../graph_generate.c, line: 215
-#, c-format
-msgid "Couldn't allocate memory for level name.\n"
-msgstr ""
-
-#
-# File: ../graph_generate.c, line: 210
-#, c-format
-msgid "Couldn't allocate memory for level desciption.\n"
-msgstr ""
-
-#
-# File: ../graph_region.c, line: 459
-#, c-format
-msgid ""
-"region overlap adjustment failed in arc_arc_adj; \n"
-"  This is an internal error that should never happen.\n"
-msgstr ""
-
-#
-# File: ../graph_score.c, line: 67
-msgid "zero intersections"
-msgstr ""
-
-#
-# File: ../graph_score.c, line: 70
-msgid "1 intersection or fewer"
-msgstr ""
-
-#
-# File: ../graph_score.c, line: 72
-msgid "1 intersection"
-msgstr ""
-
-#
-# File: ../graph_score.c, line: 75
-#, c-format
-msgid "%d intersections%s"
-msgstr ""
-
-#
-# File: ../graph_score.c, line: 77
-msgid " or fewer"
-msgstr ""
-
-#
-# File: ../levelstate.c, line: 169
-#, c-format
-msgid ""
-"ERROR:  Could not save game state file \"%s\":\n"
-"\t%s\n"
-msgstr ""
-
-#
-# File: ../levelstate.c, line: 216
-#, c-format
-msgid ""
-"ERROR:  Could not read game state file \"%s\":\n"
-"\t%s\n"
-msgstr ""
-
-#
-# File: ../main.c, line: 73
-#, c-format
-msgid ""
-"ERROR:  Could not create directory (%s) to save game state:\n"
-"\t%s\n"
-msgstr ""
-
-#
-# File: ../main.c, line: 93
-#, c-format
-msgid ""
-"\n"
-"Trapped signal %d; saving state and exiting!\n"
-msgstr ""
-
-#
-# File: ../main.c, line: 146
-#, c-format
-msgid ""
-"\n"
-"Unable to find any suitable %s fonts!\n"
-"Continuing, but the the results are likely to be poor.\n"
-"\n"
-msgstr ""
-
-#
-# File: ../main.c, line: 149
-# File: ../main.c, line: 167
-msgid "bold italic"
-msgstr ""
-
-#
-# File: ../main.c, line: 149
-# File: ../main.c, line: 167
-msgid "italic"
-msgstr ""
-
-#
-# File: ../main.c, line: 149
-# File: ../main.c, line: 167
-msgid "bold"
-msgstr ""
-
-#
-# File: ../main.c, line: 149
-# File: ../main.c, line: 167
-msgid "medium"
-msgstr ""
-
-#
-# File: ../main.c, line: 164
-#, c-format
-msgid ""
-"\n"
-"Selected %s font \"%s\" is not scalable!  This is almost as bad\n"
-"as not finding any font at all.  Continuing, but this may look\n"
-"very poor indeed.\n"
-"\n"
-msgstr ""
-
-#
-# File: ../main.c, line: 288
-#, c-format
-msgid ""
-"No homedir environment variable set!  gPlanarity will be\n"
-"unable to permanently save any progress or board state.\n"
-msgstr ""
-
-#
-# File: ../timer.c, line: 51
-#, c-format
-msgid "%d:%02d:%02d"
-msgstr ""
-
-#
-# File: ../timer.c, line: 53
-#, c-format
-msgid "%d:%02d"
-msgstr ""
-
-#
-# File: ../timer.c, line: 55
-#, c-format
-msgid "%d seconds"
-msgstr ""

Modified: trunk/planarity/po/gPlanarity.pot
===================================================================
--- trunk/planarity/po/gPlanarity.pot	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/po/gPlanarity.pot	2009-05-14 21:20:03 UTC (rev 16002)
@@ -1,165 +1,177 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) 2007 Monty
+# This file is distributed under the same license as the gPlanarity package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-15 17:41+0200\n"
+"Report-Msgid-Bugs-To: Monty <monty at xiph.org>\n"
+"POT-Creation-Date: 2009-05-14 17:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../dialog_finish.c:160
+#
+# File: ../dialog_finish.c, line: 80
+# File: ../dialog_level.c, line: 67
+# File: ../dialog_pause.c, line: 67
+# File: ../gameboard_logic_buttonbar.c, line: 54
+msgid "exit gPlanarity"
+msgstr ""
+#
+# File: ../dialog_finish.c, line: 81
+# File: ../gameboard_logic_buttonbar.c, line: 55
+msgid "level selection menu"
+msgstr ""
+#
+# File: ../dialog_finish.c, line: 82
+msgid "play next level!"
+msgstr ""
+#
+# File: ../dialog_finish.c, line: 160
 msgid "Level Complete!"
 msgstr ""
-
-#: ../dialog_finish.c:164
+#
+# File: ../dialog_finish.c, line: 164
 #, c-format
 msgid "Elapsed: %s"
 msgstr ""
-
-#: ../dialog_finish.c:168
+#
+# File: ../dialog_finish.c, line: 168
 #, c-format
 msgid "Base score: %d points"
 msgstr ""
-
-#: ../dialog_finish.c:176
+#
+# File: ../dialog_finish.c, line: 176
 #, c-format
 msgid "Objective Exceeded! %d%%"
 msgstr ""
-
-#: ../dialog_finish.c:181
+#
+# File: ../dialog_finish.c, line: 181
 #, c-format
 msgid "Time bonus: %d points"
 msgstr ""
-
-#: ../dialog_finish.c:186
+#
+# File: ../dialog_finish.c, line: 186
 #, c-format
 msgid "Final score: %d points"
 msgstr ""
-
-#: ../dialog_finish.c:191
+#
+# File: ../dialog_finish.c, line: 191
 msgid "A high score!"
 msgstr ""
-
-#: ../dialog_finish.c:194
+#
+# File: ../dialog_finish.c, line: 194
 #, c-format
 msgid "Previous best: %ld points"
 msgstr ""
-
-#: ../dialog_finish.c:199
+#
+# File: ../dialog_finish.c, line: 199
 msgid "Total score to date:"
 msgstr ""
-
-#: ../dialog_finish.c:201
+#
+# File: ../dialog_finish.c, line: 201
 #, c-format
 msgid "%ld points"
 msgstr ""
-
-#: ../dialog_level.c:67 ../dialog_pause.c:67 ../gameboard_logic_buttonbar.c:54
-msgid "exit gPlanarity"
-msgstr ""
-
-#: ../dialog_level.c:68
+#
+# File: ../dialog_level.c, line: 68
 msgid "reset level"
 msgstr ""
-
-#: ../dialog_level.c:69
+#
+# File: ../dialog_level.c, line: 69
 msgid "play level!"
 msgstr ""
-
-#: ../dialog_level.c:139
+#
+# File: ../dialog_level.c, line: 139
 msgid "Available Levels"
 msgstr ""
-
-#: ../dialog_level_icons.c:246
+#
+# File: ../dialog_level_icons.c, line: 246
 #, c-format
 msgid "Level %d:"
 msgstr ""
-
-#: ../dialog_level_icons.c:264
+#
+# File: ../dialog_level_icons.c, line: 264
 #, c-format
 msgid "[not yet completed]"
 msgstr ""
-
-#: ../dialog_level_icons.c:267
+#
+# File: ../dialog_level_icons.c, line: 267
 #, c-format
 msgid "level high score: %ld"
 msgstr ""
-
-#: ../dialog_level_icons.c:277
+#
+# File: ../dialog_level_icons.c, line: 277
 #, c-format
 msgid "total score all levels: %ld"
 msgstr ""
-
-#: ../dialog_pause.c:68
+#
+# File: ../dialog_pause.c, line: 68
 msgid "resume game!"
 msgstr ""
-
-#: ../dialog_pause.c:131
+#
+# File: ../dialog_pause.c, line: 131
 msgid "Game Paused"
 msgstr ""
-
-#: ../dialog_pause.c:134
+#
+# File: ../dialog_pause.c, line: 134
 msgid "Time Elapsed:"
 msgstr ""
-
-#: ../dialog_pause.c:186
+#
+# File: ../dialog_pause.c, line: 186
 msgid "gPlanarity"
 msgstr ""
-
-#: ../dialog_pause.c:190
+#
+# File: ../dialog_pause.c, line: 190
 msgid "Untangle the mess!"
 msgstr ""
-
-#: ../dialog_pause.c:194
+#
+# File: ../dialog_pause.c, line: 194
 msgid "Drag verticies to eliminate crossed lines."
 msgstr ""
-
-#: ../dialog_pause.c:195
+#
+# File: ../dialog_pause.c, line: 195
 msgid "The objective may be a complete solution or"
 msgstr ""
-
-#: ../dialog_pause.c:196
+#
+# File: ../dialog_pause.c, line: 196
 msgid "getting as close as possible to solving an"
 msgstr ""
-
-#: ../dialog_pause.c:197
+#
+# File: ../dialog_pause.c, line: 197
 msgid "unsolvable puzzle.  Work quickly and"
 msgstr ""
-
-#: ../dialog_pause.c:198
+#
+# File: ../dialog_pause.c, line: 198
 msgid "exceed the objective for bonus points!"
 msgstr ""
-
-#: ../dialog_pause.c:207
+#
+# File: ../dialog_pause.c, line: 207
 msgid "gPlanarity written by Monty <monty at xiph.org>"
 msgstr ""
-
-#: ../dialog_pause.c:208
+#
+# File: ../dialog_pause.c, line: 208
 msgid "as a demonstration of Gtk+/Cairo"
 msgstr ""
-
-#: ../dialog_pause.c:210
+#
+# File: ../dialog_pause.c, line: 210
 msgid "Original Flash version of Planarity by"
 msgstr ""
-
-#: ../dialog_pause.c:211
+#
+# File: ../dialog_pause.c, line: 211
 msgid "John Tantalo <john.tantalo at case.edu>"
 msgstr ""
-
-#: ../dialog_pause.c:213
+#
+# File: ../dialog_pause.c, line: 213
 msgid "Original game concept by Mary Radcliffe"
 msgstr ""
-
-#: ../gameboard.c:75
+#
+# File: ../gameboard.c, line: 75
 #, c-format
 msgid ""
 "\n"
@@ -169,15 +181,16 @@
 "than the default window size.\n"
 "\n"
 msgstr ""
-
-#: ../gameboard.c:78 ../gameboard.c:189
+#
+# File: ../gameboard.c, line: 78
+# File: ../gameboard.c, line: 189
 #, c-format
 msgid ""
 "Clipping and/or expanding this board to the current window size...\n"
 "\n"
 msgstr ""
-
-#: ../gameboard.c:184
+#
+# File: ../gameboard.c, line: 184
 #, c-format
 msgid ""
 "\n"
@@ -189,168 +202,165 @@
 "making everything look funny now).\n"
 "\n"
 msgstr ""
-
-#: ../gameboard_draw_intersection.c:65
+#
+# File: ../gameboard_draw_intersection.c, line: 65
 msgid "rather many, really"
 msgstr ""
-
-#: ../gameboard_draw_main.c:370
+#
+# File: ../gameboard_draw_main.c, line: 370
 #, c-format
 msgid "ERROR:  Could not load board icon \"%s\"\n"
 msgstr ""
-
-#: ../gameboard_draw_main.c:436
+#
+# File: ../gameboard_draw_main.c, line: 436
 #, c-format
 msgid "ERROR:  Could not save board icon \"%s\"\n"
 msgstr ""
-
-#: ../gameboard_draw_score.c:67
+#
+# File: ../gameboard_draw_score.c, line: 67
 #, c-format
 msgid "Level %d: %s"
 msgstr ""
-
-#: ../gameboard_draw_score.c:68
+#
+# File: ../gameboard_draw_score.c, line: 68
 #, c-format
 msgid "Score: %d"
 msgstr ""
-
-#: ../gameboard_draw_score.c:69
+#
+# File: ../gameboard_draw_score.c, line: 69
 #, c-format
 msgid "%d%%"
 msgstr ""
-
-#: ../gameboard_draw_score.c:70
+#
+# File: ../gameboard_draw_score.c, line: 70
 #, c-format
 msgid "Intersections: %ld"
 msgstr ""
-
-#: ../gameboard_draw_score.c:71
+#
+# File: ../gameboard_draw_score.c, line: 71
 #, c-format
 msgid "Objective: %s"
 msgstr ""
-
-#: ../gameboard_logic_buttonbar.c:55
-msgid "level selection menu"
-msgstr ""
-
-#: ../gameboard_logic_buttonbar.c:56
+#
+# File: ../gameboard_logic_buttonbar.c, line: 56
 msgid "reset board"
 msgstr ""
-
-#: ../gameboard_logic_buttonbar.c:57
+#
+# File: ../gameboard_logic_buttonbar.c, line: 57
 msgid "pause"
 msgstr ""
-
-#: ../gameboard_logic_buttonbar.c:58
+#
+# File: ../gameboard_logic_buttonbar.c, line: 58
 msgid "help / about"
 msgstr ""
-
-#: ../gameboard_logic_buttonbar.c:59
+#
+# File: ../gameboard_logic_buttonbar.c, line: 59
 msgid "expand"
 msgstr ""
-
-#: ../gameboard_logic_buttonbar.c:60
+#
+# File: ../gameboard_logic_buttonbar.c, line: 60
 msgid "shrink"
 msgstr ""
-
-#: ../gameboard_logic_buttonbar.c:61
+#
+# File: ../gameboard_logic_buttonbar.c, line: 61
 msgid "hide/show lines"
 msgstr ""
-
-#: ../gameboard_logic_buttonbar.c:62
+#
+# File: ../gameboard_logic_buttonbar.c, line: 62
 msgid "mark intersections"
 msgstr ""
-
-#: ../gameboard_logic_buttonbar.c:63
+#
+# File: ../gameboard_logic_buttonbar.c, line: 63
 msgid "click when finished!"
 msgstr ""
-
-#: ../gameboard_logic.c:371
+#
+# File: ../gameboard_logic.c, line: 371
 #, c-format
 msgid ""
 "ERROR:  Could not save board state for \"%s\":\n"
 "\t%s\n"
 msgstr ""
-
-#: ../gameboard_logic.c:401
+#
+# File: ../gameboard_logic.c, line: 401
 #, c-format
 msgid ""
 "ERROR:  Could not read saved board state for \"%s\":\n"
 "\t%s\n"
 msgstr ""
-
-#: ../graph.c:923
+#
+# File: ../graph.c, line: 923
 #, c-format
 msgid "WARNING: edge references out of range vertex in save file\n"
 msgstr ""
-
-#: ../graph_generate.c:196 ../graph_generate.c:215
+#
+# File: ../graph_generate.c, line: 196
+# File: ../graph_generate.c, line: 215
 #, c-format
 msgid "Couldn't allocate memory for level name.\n"
 msgstr ""
-
-#: ../graph_generate.c:210
+#
+# File: ../graph_generate.c, line: 210
 #, c-format
 msgid "Couldn't allocate memory for level desciption.\n"
 msgstr ""
-
-#: ../graph_region.c:459
+#
+# File: ../graph_region.c, line: 459
 #, c-format
 msgid ""
 "region overlap adjustment failed in arc_arc_adj; \n"
 "  This is an internal error that should never happen.\n"
 msgstr ""
-
-#: ../graph_score.c:67
+#
+# File: ../graph_score.c, line: 67
 msgid "zero intersections"
 msgstr ""
-
-#: ../graph_score.c:70
+#
+# File: ../graph_score.c, line: 70
 msgid "1 intersection or fewer"
 msgstr ""
-
-#: ../graph_score.c:72
+#
+# File: ../graph_score.c, line: 72
 msgid "1 intersection"
 msgstr ""
-
-#: ../graph_score.c:75
+#
+# File: ../graph_score.c, line: 75
 #, c-format
 msgid "%d intersections%s"
 msgstr ""
-
-#: ../graph_score.c:77
+#
+# File: ../graph_score.c, line: 77
 msgid " or fewer"
 msgstr ""
-
-#: ../levelstate.c:169
+#
+# File: ../levelstate.c, line: 169
 #, c-format
 msgid ""
 "ERROR:  Could not save game state file \"%s\":\n"
 "\t%s\n"
 msgstr ""
-
-#: ../levelstate.c:216
+#
+# File: ../levelstate.c, line: 216
 #, c-format
 msgid ""
 "ERROR:  Could not read game state file \"%s\":\n"
 "\t%s\n"
 msgstr ""
-
-#: ../main.c:73
+#
+# File: ../main.c, line: 73
 #, c-format
 msgid ""
 "ERROR:  Could not create directory (%s) to save game state:\n"
 "\t%s\n"
 msgstr ""
-
-#: ../main.c:93
+#
+# File: ../main.c, line: 93
 #, c-format
 msgid ""
 "\n"
 "Trapped signal %d; saving state and exiting!\n"
 msgstr ""
-
-#: ../main.c:146
+#
+# File: ../main.c, line: 146
 #, c-format
 msgid ""
 "\n"
@@ -358,24 +368,28 @@
 "Continuing, but the the results are likely to be poor.\n"
 "\n"
 msgstr ""
-
-#: ../main.c:149 ../main.c:167
+#
+# File: ../main.c, line: 149
+# File: ../main.c, line: 167
 msgid "bold italic"
 msgstr ""
-
-#: ../main.c:149 ../main.c:167
+#
+# File: ../main.c, line: 149
+# File: ../main.c, line: 167
 msgid "italic"
 msgstr ""
-
-#: ../main.c:149 ../main.c:167
+#
+# File: ../main.c, line: 149
+# File: ../main.c, line: 167
 msgid "bold"
 msgstr ""
-
-#: ../main.c:149 ../main.c:167
+#
+# File: ../main.c, line: 149
+# File: ../main.c, line: 167
 msgid "medium"
 msgstr ""
-
-#: ../main.c:164
+#
+# File: ../main.c, line: 164
 #, c-format
 msgid ""
 "\n"
@@ -384,25 +398,25 @@
 "very poor indeed.\n"
 "\n"
 msgstr ""
-
-#: ../main.c:288
+#
+# File: ../main.c, line: 288
 #, c-format
 msgid ""
 "No homedir environment variable set!  gPlanarity will be\n"
 "unable to permanently save any progress or board state.\n"
 msgstr ""
-
-#: ../timer.c:51
+#
+# File: ../timer.c, line: 51
 #, c-format
 msgid "%d:%02d:%02d"
 msgstr ""
-
-#: ../timer.c:53
+#
+# File: ../timer.c, line: 53
 #, c-format
 msgid "%d:%02d"
 msgstr ""
-
-#: ../timer.c:55
+#
+# File: ../timer.c, line: 55
 #, c-format
 msgid "%d seconds"
 msgstr ""

Modified: trunk/planarity/timer.c
===================================================================
--- trunk/planarity/timer.c	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/timer.c	2009-05-14 21:20:03 UTC (rev 16002)
@@ -26,7 +26,7 @@
 
 #include <time.h>
 #include "timer.h"
-#include "gettext.h"
+#include "nls.h"
 
 static int paused;
 static time_t begin_time_add;

Modified: trunk/planarity/timer.h
===================================================================
--- trunk/planarity/timer.h	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/timer.h	2009-05-14 21:20:03 UTC (rev 16002)
@@ -29,6 +29,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "nls.h"
+
 extern time_t get_timer();
 extern char *get_timer_string();
 extern void set_timer(time_t off);

Modified: trunk/planarity/version.h
===================================================================
--- trunk/planarity/version.h	2009-05-14 21:04:44 UTC (rev 16001)
+++ trunk/planarity/version.h	2009-05-14 21:20:03 UTC (rev 16002)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Wed May 30 06:58:22 EDT 2007] */
+/* DO NOT EDIT: Automated versioning hack [Thu May 14 17:14:50 EDT 2009] */



More information about the commits mailing list