From 9c23a2d1fe8fa5590047ed022b7a117861df65d8 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 17 Sep 2006 05:03:59 +0000
Subject: [PATCH] Punt on problem of svn version in about box changing: comment
 in makefile, and make it the last string.

---
 palm/Makefile              | 14 ++++++++++----
 palm/l10n/StrRes_en_US.pre | 33 ++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/palm/Makefile b/palm/Makefile
index 80434944f..ce54b3b46 100644
--- a/palm/Makefile
+++ b/palm/Makefile
@@ -224,9 +224,9 @@ CFLAGS +=  -Wall -DAPPID=\'$(APPID)\' $(MYDEFS_68K) $(INCLUDES)
 $(TARGET): $(PLATFORM)/objs.prc $(PLATFORM)/res.prc 
 	$(PAR) -c -a 'resource|backup' -v 4 $@ $(NAME) $(TYPE) $(APPID) $^
 ifdef XW_UPLOAD_CMD
-	zip $(TARGET).zip $(TARGET)
-	$(XW_UPLOAD_CMD) $(TARGET)
-	$(XW_UPLOAD_CMD) $(TARGET).zip
+# 	zip $(TARGET).zip $(TARGET)
+# 	$(XW_UPLOAD_CMD) $(TARGET)
+# 	$(XW_UPLOAD_CMD) $(TARGET).zip
 endif
 
 solo:
@@ -278,7 +278,13 @@ xwords4.rcp: l10n/xwords4_$(LANG).rcp.pre xwords4defines.h $(BITMAP_RSRCS)
 	gcc -x c -E -P $(INCLUDES) $(MYDEFS_68K) $(DEBUG) \
 		-DICONTEXT=\"$(ICONTEXT)\" $< > $@
 
-LocalizedStrIncludes.h StrL03e8.bin: ./l10n/StrRes_$(LANG).pre ./l10n/mkstrsres.c
+# LocalizedStrIncludes.h: SVN_REV can change, but I don't have a way
+# to express a dependency on it.  If it does change, strings can wind
+# up with offsets out of sync with the .h file.  Not sure what to do
+# about this....  Clean builds are probably a safe fallback.
+
+LocalizedStrIncludes.h StrL03e8.bin: \
+		./l10n/StrRes_$(LANG).pre ./l10n/mkstrsres.c svn_stamp
 	gcc $(CFLAGS) $(FORMATDEFINES) \
 		-DLANGSTRFILE=\"$<\" ./l10n/mkstrsres.c \
 		-o mkstrsres
diff --git a/palm/l10n/StrRes_en_US.pre b/palm/l10n/StrRes_en_US.pre
index 5edaa32c8..79e53fdde 100644
--- a/palm/l10n/StrRes_en_US.pre
+++ b/palm/l10n/StrRes_en_US.pre
@@ -49,23 +49,6 @@
 { "STR_OK",			"Ok" },
 { "STR_ABOUT_TITLE",		"About Crosswords" },
 { "STR_DEFAULT_NAME",		"Player %d" },
-{ "STR_ABOUT_CONTENT", 
-      "Crosswords " XW_PALM_VERSION_STRING " (rev. " SVN_REV ").\n" \
-      "Copyright 1998-2006 by Eric House.  "\
-      "Released under the GNU Public License.\n\n"\
-
-      "See the manual at xwords.sourceforge.net\n\n" \
-
-      "This program is postcardware. If you like it " \
-      "please mail a postcard to:\n" \
-      "The Houses\n" \
-      "1610 NW 14th Place\n" \
-      "Corvallis, OR 97330 USA\n\n"
-
-      "Developed on Debian GNU/Linux using the prc-tools "\
-      "suite." \
-      },
-
 { "STR_CONFIRM_END_GAME",	"Are you sure you want to end the game now?"},
 { "STR_CONFIRM_TRADE",		"Are you sure you want to use your " \
 				"turn trading tiles?" },
@@ -148,3 +131,19 @@
                                "connection." },
 { "STR_RELAY_GENERIC",         "Relay error: something's wrong." },
 #endif
+{ "STR_ABOUT_CONTENT", 
+      "Crosswords " XW_PALM_VERSION_STRING " (rev. " SVN_REV ").\n" \
+      "Copyright 1998-2006 by Eric House.  "\
+      "Released under the GNU Public License.\n\n"\
+
+      "See the manual at xwords.sourceforge.net\n\n" \
+
+      "This program is postcardware. If you like it " \
+      "please mail a postcard to:\n" \
+      "The Houses\n" \
+      "1610 NW 14th Place\n" \
+      "Corvallis, OR 97330 USA\n\n"
+
+      "Developed on Debian GNU/Linux using the prc-tools "\
+      "suite." \
+      },