i18n (sync w devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33635 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.geodesic/main.c

@@ -7,7 +7,7 @@
  *               Bernhard Reiter <bernhard intevation.de>, 
  *               Eric G. Miller <egm2 jps.net>, 
  *               Glynn Clements <glynn gclements.plus.com>, 
- *               Hamish Bowman <hamish_nospam yahoo.com>, 
+ *               Hamish Bowman <hamish_b yahoo.com>, 
  *               Jan-Oliver Wagner <jan intevation.de>
  * PURPOSE:      displays a geodesic line in the active frame on the user's 
  *               graphics monitor
@@ -43,22 +43,22 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("display");
     module->description =
-	"Displays a geodesic line, tracing the shortest distance "
+	_("Displays a geodesic line, tracing the shortest distance "
 	"between two geographic points along a great circle, in "
-	"a longitude/latitude data set.";
+	"a longitude/latitude data set.");
 
     parm.coor = G_define_option();
     parm.coor->key = "coor";
     parm.coor->key_desc = "lon1,lat1,lon2,lat2";
     parm.coor->type = TYPE_STRING;
     parm.coor->required = YES;
-    parm.coor->description = "Starting and ending coordinates";
+    parm.coor->description = _("Starting and ending coordinates");
 
     parm.lcolor = G_define_option();
     parm.lcolor->key = "lcolor";
     parm.lcolor->type = TYPE_STRING;
     parm.lcolor->required = NO;
-    parm.lcolor->description = "Line color";
+    parm.lcolor->description = _("Line color");
     parm.lcolor->gisprompt = GISPROMPT_COLOR;
     parm.lcolor->answer = DEFAULT_FG_COLOR;
 
@@ -66,37 +66,34 @@ int main(int argc, char *argv[])
     parm.tcolor->key = "tcolor";
     parm.tcolor->type = TYPE_STRING;
     parm.tcolor->required = NO;
-    parm.tcolor->description = "Text color or \"none\"";
+    parm.tcolor->description = _("Text color or \"none\"");
     parm.tcolor->gisprompt = GISPROMPT_COLOR;
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
+
     if (G_projection() != PROJECTION_LL)
-	G_fatal_error(_("Database is not a %s"), G__projection_name(PROJECTION_LL));
+	G_fatal_error(_("Location is not %s"), G__projection_name(PROJECTION_LL));
 
     if (parm.coor->answers[0] == NULL)
-	G_fatal_error("No coordinates given");
-
-    if (!G_scan_easting(parm.coor->answers[0], &lon1, G_projection())) {
-	G_usage();
-	G_fatal_error("%s - illegal longitude", parm.coor->answers[0]);
-    }
-    if (!G_scan_northing(parm.coor->answers[1], &lat1, G_projection())) {
-	G_usage();
-	G_fatal_error("%s - illegal longitude", parm.coor->answers[1]);
-    }
-    if (!G_scan_easting(parm.coor->answers[2], &lon2, G_projection())) {
-	G_usage();
-	G_fatal_error("%s - illegal longitude", parm.coor->answers[2]);
-    }
-    if (!G_scan_northing(parm.coor->answers[3], &lat2, G_projection())) {
-	G_usage();
-	G_fatal_error("%s - illegal longitude", parm.coor->answers[3]);
-    }
+	G_fatal_error(_("No coordinates given");
+
+    if (!G_scan_easting(parm.coor->answers[0], &lon1, G_projection()))
+	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[0]);
+
+    if (!G_scan_northing(parm.coor->answers[1], &lat1, G_projection()))
+	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[1]);
+
+    if (!G_scan_easting(parm.coor->answers[2], &lon2, G_projection()))
+	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[2]);
+
+    if (!G_scan_northing(parm.coor->answers[3], &lat2, G_projection()))
+	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
+
 
     if (R_open_driver() != 0)
-	G_fatal_error("No graphics device selected");
+	G_fatal_error(_("No graphics device selected"));
 
     line_color = D_translate_color(parm.lcolor->answer);
     if (!line_color)

display/d.rhumbline/main.c

@@ -7,7 +7,7 @@
  *               Bernhard Reiter <bernhard intevation.de>, 
  *               Eric G. Miller <egm2 jps.net>, 
  *               Glynn Clements <glynn gclements.plus.com>, 
- *               Hamish Bowman <hamish_nospam yahoo.com>, 
+ *               Hamish Bowman <hamish_b yahoo.com>, 
  *               Jan-Oliver Wagner <jan intevation.de>
  * PURPOSE:      displays the rhumbline joining two user-specified points
  * COPYRIGHT:    (C) 1999-2006 by the GRASS Development Team
@@ -43,21 +43,21 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("display");
     module->description =
-	"Displays the rhumbline joining two user-specified "
-	"points, in the active frame on the user's graphics monitor.";
+	_("Displays the rhumbline joining two user-specified "
+	"points, in the active frame on the user's graphics monitor.");
 
     parm.coor = G_define_option();
     parm.coor->key = "coor";
     parm.coor->key_desc = "lon1,lat1,lon2,lat2";
     parm.coor->type = TYPE_STRING;
     parm.coor->required = YES;
-    parm.coor->description = "Starting and ending coordinates";
+    parm.coor->description = _("Starting and ending coordinates");
 
     parm.lcolor = G_define_option();
     parm.lcolor->key = "lcolor";
     parm.lcolor->type = TYPE_STRING;
     parm.lcolor->required = NO;
-    parm.lcolor->description = "Line color";
+    parm.lcolor->description = _("Line color");
     parm.lcolor->gisprompt = GISPROMPT_COLOR;
     parm.lcolor->answer = DEFAULT_FG_COLOR;
 
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     parm.tcolor->key = "tcolor";
     parm.tcolor->type = TYPE_STRING;
     parm.tcolor->required = NO;
-    parm.tcolor->description = "Text color";
+    parm.tcolor->description = _("Text color");
     parm.tcolor->gisprompt = GISPROMPT_COLOR;
 #endif
 
@@ -74,32 +74,27 @@ int main(int argc, char *argv[])
 	exit(EXIT_FAILURE);
 
     if (G_projection() != PROJECTION_LL)
-	G_fatal_error("%s: database is not a %s database",
-		      argv[0], G__projection_name(PROJECTION_LL));
+	G_fatal_error(_("Location is not %s"),
+		      G__projection_name(PROJECTION_LL));
 
     if (parm.coor->answers[0] == NULL)
-	G_fatal_error("No coordinates given");
-
-    if (!G_scan_easting(parm.coor->answers[0], &lon1, G_projection())) {
-	G_usage();
-	G_fatal_error("%s - illegal longitude", parm.coor->answers[0]);
-    }
-    if (!G_scan_northing(parm.coor->answers[1], &lat1, G_projection())) {
-	G_usage();
-	G_fatal_error("%s - illegal longitude", parm.coor->answers[1]);
-
-    }
-    if (!G_scan_easting(parm.coor->answers[2], &lon2, G_projection())) {
-	G_usage();
-	G_fatal_error("%s - illegal longitude", parm.coor->answers[2]);
-    }
-    if (!G_scan_northing(parm.coor->answers[3], &lat2, G_projection())) {
-	G_usage();
-	G_fatal_error("%s - illegal longitude", parm.coor->answers[3]);
-    }
+	G_fatal_error(_("No coordinates given");
+
+    if (!G_scan_easting(parm.coor->answers[0], &lon1, G_projection()))
+	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[0]);
+
+    if (!G_scan_northing(parm.coor->answers[1], &lat1, G_projection()))
+	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[1]);
+
+    if (!G_scan_easting(parm.coor->answers[2], &lon2, G_projection()))
+	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[2]);
+
+    if (!G_scan_northing(parm.coor->answers[3], &lat2, G_projection()))
+	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
+
 
     if (R_open_driver() != 0)
-	G_fatal_error("No graphics device selected");
+	G_fatal_error(_("No graphics device selected"));
 
     line_color = D_translate_color(parm.lcolor->answer);
     if (!line_color)