[GRASS-SVN] r46602 - grass/branches/releasebranch_6_4/lib/init

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-06-08 01:44:19 -0700 (Wed, 08 Jun 2011)
New Revision: 46602

Modified:
   grass/branches/releasebranch_6_4/lib/init/Makefile
   grass/branches/releasebranch_6_4/lib/init/lock.c
Log:
lock.c: add missing header, define PACKAGE name
	(merge r46601 from trunk)


Modified: grass/branches/releasebranch_6_4/lib/init/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/Makefile	2011-06-08 08:41:34 UTC (rev 46601)
+++ grass/branches/releasebranch_6_4/lib/init/Makefile	2011-06-08 08:44:19 UTC (rev 46602)
@@ -20,6 +20,9 @@
 include $(MODULE_TOPDIR)/include/Make/Grass.make
 include $(MODULE_TOPDIR)/include/Make/Rules.make
 
+#for i18N support
+PACKAGE ="grasslibs"
+
 START_UP=grass$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
 
 EXTRA_CFLAGS = -DD_LOCATION_NAME=\"$(DEFAULT_LOCATION)\" -DD_GISDBASE=\"$(DEFAULT_DATABASE)\" -DGRASS_VERSION_NUMBER=\"'$(GRASS_VERSION_NUMBER)'\" -DGRASS_VERSION_UPDATE_PKG=\"'$(GRASS_VERSION_UPDATE_PKG)'\"

Modified: grass/branches/releasebranch_6_4/lib/init/lock.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/lock.c	2011-06-08 08:41:34 UTC (rev 46601)
+++ grass/branches/releasebranch_6_4/lib/init/lock.c	2011-06-08 08:44:19 UTC (rev 46602)
@@ -7,6 +7,7 @@
 #include <signal.h>
 #include "local_proto.h"
 #include <grass/gis.h>
+#include <grass/glocale.h>
 
 /******************************************************************
 *lock file pid
@@ -34,7 +35,7 @@
     int locked;
 
     if (argc != 3 || sscanf(argv[2], "%d", &lockpid) != 1)
-	G_fatal_error("usage: %s file pid", argv[0]);
+	G_fatal_error(_("Usage: %s file pid"), argv[0]);
 #define file argv[1]
 
 #ifdef __MINGW32__
@@ -56,8 +57,8 @@
 	G_fatal_error("%s: ", argv[0]);
     }
     if (write(lock, &lockpid, sizeof lockpid) != sizeof lockpid)
-	G_fatal_error("%s: can't write lockfile %s (disk full? Permissions?)",
-		      argv[0], file);
+	G_fatal_error(_("Unable to write lockfile %s (disk full? Permissions?)"),
+		      file);
     close(lock);
     exit(0);
 #endif