[GRASS-SVN] r38443 - grass/trunk/general/g.proj

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-07-16 17:16:28 -0400 (Thu, 16 Jul 2009)
New Revision: 38443

Modified:
   grass/trunk/general/g.proj/main.c
Log:
g.proj: cosmetics in guisection, i18n
       (merge from devbr6, r38441)


Modified: grass/trunk/general/g.proj/main.c
===================================================================
--- grass/trunk/general/g.proj/main.c	2009-07-16 21:03:05 UTC (rev 38442)
+++ grass/trunk/general/g.proj/main.c	2009-07-16 21:16:28 UTC (rev 38443)
@@ -58,36 +58,39 @@
 
     module = G_define_module();
     G_add_keyword(_("general"));
-    module->description =
+    G_add_keyword(_("projection"));
 #ifdef HAVE_OGR
+    module->label =
 	_("Converts co-ordinate system descriptions (i.e. projection "
-	  "information) between various formats (including GRASS format). "
-	  "Can also be used to create GRASS locations.");
+	  "information) between various formats (including GRASS format).");
+    module->description =
+	_("Can also be used to create GRASS locations.");
 #else
+    module->description =
 	_("Prints and manipulates GRASS projection information files.");
 #endif
 
     printinfo = G_define_flag();
     printinfo->key = 'p';
-    printinfo->guisection = "Printed_Output";
+    printinfo->guisection = _("Print");
     printinfo->description =
 	_("Print projection information (in conventional GRASS format)");
 
     datuminfo = G_define_flag();
     datuminfo->key = 'd';
-    datuminfo->guisection = "Printed_Output";
+    datuminfo->guisection = _("Print");
     datuminfo->description =
 	_("Verify datum information and print transformation parameters");
 
     printproj4 = G_define_flag();
     printproj4->key = 'j';
-    printproj4->guisection = "Printed_Output";
+    printproj4->guisection = _("Print");
     printproj4->description =
 	_("Print projection information in PROJ.4 format");
 
     dontprettify = G_define_flag();
     dontprettify->key = 'f';
-    dontprettify->guisection = "Printed_Output";
+    dontprettify->guisection = _("Print");
     dontprettify->description =
 	_("Print 'flat' output with no linebreaks (applies to "
 #ifdef HAVE_OGR
@@ -98,21 +101,21 @@
 #ifdef HAVE_OGR
     printwkt = G_define_flag();
     printwkt->key = 'w';
-    printwkt->guisection = "Printed_Output";
+    printwkt->guisection = _("Print");
     printwkt->description = _("Print projection information in WKT format");
 
     esristyle = G_define_flag();
     esristyle->key = 'e';
-    esristyle->guisection = "Printed_Output";
+    esristyle->guisection = _("Print");
     esristyle->description =
 	_("Use ESRI-style format (applies to WKT output only)");
-
+    
     ingeo = G_define_option();
     ingeo->key = "georef";
     ingeo->type = TYPE_STRING;
     ingeo->key_desc = "file";
     ingeo->required = NO;
-    ingeo->guisection = "Input";
+    ingeo->guisection = _("Input");
     ingeo->description = _("Georeferenced data file to read projection "
 			   "information from");
 
@@ -121,7 +124,7 @@
     inwkt->type = TYPE_STRING;
     inwkt->key_desc = "file";
     inwkt->required = NO;
-    inwkt->guisection = "Input";
+    inwkt->guisection = _("Input");
     inwkt->description = _("ASCII file containing a WKT projection "
 			   "description (- for stdin)");
 
@@ -130,7 +133,7 @@
     inproj4->type = TYPE_STRING;
     inproj4->key_desc = "params";
     inproj4->required = NO;
-    inproj4->guisection = "Input";
+    inproj4->guisection = _("Input");
     inproj4->description = _("PROJ.4 projection description (- for stdin)");
 
     inepsg = G_define_option();
@@ -138,7 +141,7 @@
     inepsg->type = TYPE_INTEGER;
     inepsg->required = NO;
     inepsg->options = "1-1000000";
-    inepsg->guisection = "Input";
+    inepsg->guisection = _("Input");
     inepsg->description = _("EPSG projection code");
 #endif
 
@@ -148,21 +151,21 @@
     dtrans->required = NO;
     dtrans->options = "-1-100";
     dtrans->answer = "0";
-    dtrans->guisection = "Datum_Trans";
-    dtrans->description =
-	_("Index number of datum transform parameters, \"0\" "
-	  "for unspecified or \"-1\" to list and exit");
+    dtrans->guisection = _("Datum");
+    dtrans->label =
+	_("Index number of datum transform parameters");
+    dtrans->description = ("\"0\" for unspecified or \"-1\" to list and exit");
 
     forcedatumtrans = G_define_flag();
     forcedatumtrans->key = 't';
-    forcedatumtrans->guisection = "Datum_Trans";
+    forcedatumtrans->guisection = _("Datum");
     forcedatumtrans->description =
 	_("Force override of datum transformation information in input "
 	  "co-ordinate system");
 
     create = G_define_flag();
     create->key = 'c';
-    create->guisection = "Create/Edit_Locations";
+    create->guisection = _("Create/Edit");
     create->description = _("Create new projection files (modifies current "
 			    "location unless 'location' option specified)");
 
@@ -171,9 +174,9 @@
     location->type = TYPE_STRING;
     location->key_desc = "name";
     location->required = NO;
-    location->guisection = "Create/Edit_Locations";
+    location->guisection = _("Create/Edit");
     location->description = _("Name of new location to create");
-
+    
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);