diff --git a/general/g.mapset/main.c b/general/g.mapset/main.c index dc70b1fbc41..0ebb4379d27 100644 --- a/general/g.mapset/main.c +++ b/general/g.mapset/main.c @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) G_add_keyword(_("settings")); module->label = _("Changes/reports current mapset."); module->description = _("Optionally create new mapset or list available " - "mapsets in given location."); + "mapsets in given project (location)."); opt.mapset = G_define_standard_option(G_OPT_M_MAPSET); opt.mapset->required = YES; diff --git a/general/g.mapsets/main.c b/general/g.mapsets/main.c index 55c8c81f646..d346829722f 100644 --- a/general/g.mapsets/main.c +++ b/general/g.mapsets/main.c @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) G_add_keyword(_("search path")); module->label = _("Modifies/prints the user's current mapset search path."); module->description = _("Affects the user's access to data existing " - "under the other mapsets in the current location."); + "under the other mapsets in the current project."); opt.mapset = G_define_standard_option(G_OPT_M_MAPSET); opt.mapset->required = YES; diff --git a/general/g.proj/create.c b/general/g.proj/create.c index 3240c87198b..c2c693f7aa1 100644 --- a/general/g.proj/create.c +++ b/general/g.proj/create.c @@ -13,18 +13,18 @@ void create_location(const char *location) ret = G_make_location_crs(location, &cellhd, projinfo, projunits, projsrid, projwkt); if (ret == 0) - G_message(_("Location <%s> created"), location); + G_message(_("Project <%s> created"), location); else if (ret == -1) - G_fatal_error(_("Unable to create location <%s>: %s"), location, + G_fatal_error(_("Unable to create project <%s>: %s"), location, strerror(errno)); else if (ret == -2) G_fatal_error(_("Unable to create projection files: %s"), strerror(errno)); else /* Shouldn't happen */ - G_fatal_error(_("Unable to create location <%s>"), location); + G_fatal_error(_("Unable to create project <%s>"), location); - G_message(_("You can switch to the new location by\n`%s=%s`"), + G_message(_("You can switch to the new project by\n`%s=%s`"), "g.mapset mapset=PERMANENT project", location); } @@ -36,7 +36,8 @@ void modify_projinfo(void) if (strcmp(mapset, "PERMANENT") != 0) G_fatal_error( _("You must select the PERMANENT mapset before updating the " - "current location's projection (current mapset is <%s>)"), + "current project's coordinate reference system" + " (current mapset is <%s>)"), mapset); /* Read projection information from current location first */ diff --git a/general/g.region/printwindow.c b/general/g.region/printwindow.c index dc2b8b3de55..d35ed167926 100644 --- a/general/g.region/printwindow.c +++ b/general/g.region/printwindow.c @@ -248,15 +248,15 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) /* read current projection info */ if ((in_proj_info = G_get_projinfo()) == NULL) G_fatal_error( - _("Can't get projection info of current location")); + _("Can't get projection info of current project")); if ((in_unit_info = G_get_projunits()) == NULL) G_fatal_error( - _("Can't get projection units of current location")); + _("Can't get projection units of current project")); if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0) G_fatal_error( - _("Can't get projection key values of current location")); + _("Can't get projection key values of current project")); G_free_key_value(in_proj_info); G_free_key_value(in_unit_info); @@ -399,7 +399,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) _("You are already in Lat/Long. Use the -p flag instead.")); else G_message( - _("You are in a simple XY location, projection to Lat/Lon " + _("You are in a simple XY project, projection to Lat/Lon " "is not possible. Use the -p flag instead.")); } } @@ -493,15 +493,15 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) /* read current projection info */ if ((in_proj_info = G_get_projinfo()) == NULL) G_fatal_error( - _("Can't get projection info of current location")); + _("Can't get projection info of current project")); if ((in_unit_info = G_get_projunits()) == NULL) G_fatal_error( - _("Can't get projection units of current location")); + _("Can't get projection units of current project")); if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0) G_fatal_error( - _("Can't get projection key values of current location")); + _("Can't get projection key values of current project")); G_free_key_value(in_proj_info); G_free_key_value(in_unit_info); @@ -567,7 +567,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) /* read current projection info */ if ((in_proj_info = G_get_projinfo()) == NULL) G_fatal_error( - _("Can't get projection info of current location")); + _("Can't get projection info of current project")); /* do not wrap to -180, 180, otherwise east can be < west */ /* TODO: for PROJ 6+, the +over switch must be added to the * transformation pipeline if authority:name or WKt are used @@ -576,11 +576,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if ((in_unit_info = G_get_projunits()) == NULL) G_fatal_error( - _("Can't get projection units of current location")); + _("Can't get projection units of current project")); if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0) G_fatal_error( - _("Can't get projection key values of current location")); + _("Can't get projection key values of current project")); /* output projection to lat/long and wgs84 ellipsoid */ out_proj_info = G_create_key_value(); @@ -594,7 +594,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) /* PROJ6+ has its own datum transformation parameters */ if (G_get_datumparams_from_projinfo(in_proj_info, buff, dum) < 0) G_fatal_error(_( - "WGS84 output not possible as this location does not " + "WGS84 output not possible as this project does not " "contain " "datum transformation parameters. Try running g.setproj.")); else diff --git a/misc/m.measure/main.c b/misc/m.measure/main.c index 8f7d3a4a3ef..45af6f14255 100644 --- a/misc/m.measure/main.c +++ b/misc/m.measure/main.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) units = G_define_standard_option(G_OPT_M_UNITS); units->label = _("Units"); - units->description = _("Default: location map units"); + units->description = _("Default: project map units"); shell = G_define_flag(); shell->key = 'g'; diff --git a/raster/r.carve/main.c b/raster/r.carve/main.c index 37c237ba5cf..a242d3e6f16 100644 --- a/raster/r.carve/main.c +++ b/raster/r.carve/main.c @@ -204,7 +204,7 @@ static int init_projection(struct Cell_head *window, int *wrap_ncols) *wrap_ncols = (360.0 - (window->east - window->west)) / window->ew_res + 1.1; #else - G_fatal_error(_("Lat/Long location is not supported by %s. Please " + G_fatal_error(_("Lat/Long project is not supported by %s. Please " "reproject map first."), G_program_name()); #endif diff --git a/raster/r.external/window.c b/raster/r.external/window.c index d8adadfba44..7d627488d94 100644 --- a/raster/r.external/window.c +++ b/raster/r.external/window.c @@ -91,7 +91,7 @@ void update_default_window(struct Cell_head *cellhd) if (strcmp(G_mapset(), "PERMANENT") == 0) { G_put_element_window(&cur_wind, "", "DEFAULT_WIND"); - G_message(_("Default region for this location updated")); + G_message(_("Default region for this project updated")); } G_put_window(&cur_wind); G_message(_("Region for the current mapset updated")); diff --git a/raster/r.gwflow/main.c b/raster/r.gwflow/main.c index 3cf5131b4b7..a3106563606 100644 --- a/raster/r.gwflow/main.c +++ b/raster/r.gwflow/main.c @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) /* Make sure that the current projection is not lat/long */ if ((G_projection() == PROJECTION_LL)) - G_fatal_error(_("Lat/Long location is not supported by %s. Please " + G_fatal_error(_("Lat/Long project is not supported by %s. Please " "reproject map first."), G_program_name()); diff --git a/raster/r.in.lidar/projection.c b/raster/r.in.lidar/projection.c index a3c4ff057b2..4bb3799a764 100644 --- a/raster/r.in.lidar/projection.c +++ b/raster/r.in.lidar/projection.c @@ -35,7 +35,7 @@ void projection_mismatch_report(struct Cell_head cellhd, /* TODO: output this info sorted by key: */ if (loc_wind.proj != cellhd.proj || err != -2) { if (loc_proj_info != NULL) { - strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n")); + strcat(error_msg, _("GRASS project PROJ_INFO is:\n")); for (i_value = 0; i_value < loc_proj_info->nitems; i_value++) sprintf(error_msg + strlen(error_msg), "%s: %s\n", loc_proj_info->key[i_value], diff --git a/raster/r.in.pdal/projection.c b/raster/r.in.pdal/projection.c index 25e6da8e25e..206234d07a8 100644 --- a/raster/r.in.pdal/projection.c +++ b/raster/r.in.pdal/projection.c @@ -33,7 +33,7 @@ void projection_mismatch_report(struct Cell_head cellhd, /* TODO: output this info sorted by key: */ if (loc_wind.proj != cellhd.proj || err != -2) { if (loc_proj_info != NULL) { - strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n")); + strcat(error_msg, _("GRASS project PROJ_INFO is:\n")); for (i_value = 0; i_value < loc_proj_info->nitems; i_value++) sprintf(error_msg + strlen(error_msg), "%s: %s\n", loc_proj_info->key[i_value], @@ -68,7 +68,7 @@ void projection_mismatch_report(struct Cell_head cellhd, } else { if (loc_proj_units != NULL) { - strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n"); + strcat(error_msg, "GRASS project PROJ_UNITS is:\n"); for (i_value = 0; i_value < loc_proj_units->nitems; i_value++) sprintf(error_msg + strlen(error_msg), "%s: %s\n", loc_proj_units->key[i_value], diff --git a/raster/r.param.scale/main.c b/raster/r.param.scale/main.c index 51fe02d8b05..095344ac999 100644 --- a/raster/r.param.scale/main.c +++ b/raster/r.param.scale/main.c @@ -36,7 +36,7 @@ int main(int argc, char **argv) /* Make sure that the current projection is not lat/long */ if ((G_projection() == PROJECTION_LL)) - G_fatal_error(_("Lat/Long locations are not supported by this module")); + G_fatal_error(_("Lat/Long projects are not supported by this module")); open_files(); diff --git a/raster/r.profile/main.c b/raster/r.profile/main.c index 6298ed7cc35..2a0701398e8 100644 --- a/raster/r.profile/main.c +++ b/raster/r.profile/main.c @@ -99,8 +99,8 @@ int main(int argc, char *argv[]) parm.units->options = "meters,kilometers,feet,miles"; parm.units->label = parm.units->description; parm.units->description = - _("If units are not specified, current location units are used. " - "Meters are used by default in geographic (latlon) locations."); + _("If units are not specified, current project units are used. " + "Meters are used by default in geographic (latlon) projects."); if (G_parser(argc, argv)) exit(EXIT_FAILURE); diff --git a/raster/r.report/header.c b/raster/r.report/header.c index 5606ac1d6cf..1d0437c4c27 100644 --- a/raster/r.report/header.c +++ b/raster/r.report/header.c @@ -36,7 +36,7 @@ int header(int unit1, int unit2) if (page == 1 && with_headers) { lcr("", "RASTER MAP CATEGORY REPORT", "", buf, page_width - 2); pbuf(buf); - sprintf(tbuf1, "LOCATION: %s", G_location()); + sprintf(tbuf1, "PROJECT: %s", G_location()); if (with_headers && (page_length > 0)) sprintf(tbuf2, "Page %d", page); else diff --git a/raster/r.report/r.report.html b/raster/r.report/r.report.html index e2355899746..d4706471e3e 100644 --- a/raster/r.report/r.report.html +++ b/raster/r.report/r.report.html @@ -59,7 +59,7 @@

EXAMPLE

 +-----------------------------------------------------------------------------+
 |                         RASTER MAP CATEGORY REPORT                          |
-|LOCATION: nc_spm_08_grass7                           Fri Dec  6 17:00:21 2013|
+|PROJECT: nc_spm_08_grass7                            Fri Dec  6 17:00:21 2013|
 |-----------------------------------------------------------------------------|
 |          north: 279073.97546639    east: 798143.31179672                    |
 |REGION    south: 113673.97546639    west: 595143.31179672                    |
@@ -96,7 +96,7 @@ 

EXAMPLE

 +-----------------------------------------------------------------------------+
 |                         RASTER MAP CATEGORY REPORT                          |
-|LOCATION: nc_spm_08_latest                           Tue Feb 11 10:10:46 2014|
+|PROJECT: nc_spm_08_latest                            Tue Feb 11 10:10:46 2014|
 |-----------------------------------------------------------------------------|
 |          north: 228527.25    east: 644971                                   |
 |REGION    south: 215018.25    west: 629980                                   |
diff --git a/raster/r.solute.transport/main.c b/raster/r.solute.transport/main.c
index e699a19a93f..322b108910a 100644
--- a/raster/r.solute.transport/main.c
+++ b/raster/r.solute.transport/main.c
@@ -240,7 +240,7 @@ int main(int argc, char *argv[])
 
     /* Make sure that the current projection is not lat/long */
     if ((G_projection() == PROJECTION_LL))
-        G_fatal_error(_("Lat/Long location is not supported by %s. Please "
+        G_fatal_error(_("Lat/Long project is not supported by %s. Please "
                         "reproject map first."),
                       G_program_name());
 
diff --git a/raster/r.sun/main.c b/raster/r.sun/main.c
index 30cd8af9b10..2b8babfe348 100644
--- a/raster/r.sun/main.c
+++ b/raster/r.sun/main.c
@@ -801,14 +801,14 @@ int main(int argc, char *argv[])
         struct Key_Value *in_proj_info, *in_unit_info;
 
         if ((in_proj_info = G_get_projinfo()) == NULL)
-            G_fatal_error(_("Can't get projection info of current location"));
+            G_fatal_error(_("Can't get projection info of current project"));
 
         if ((in_unit_info = G_get_projunits()) == NULL)
-            G_fatal_error(_("Can't get projection units of current location"));
+            G_fatal_error(_("Can't get projection units of current project"));
 
         if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0)
             G_fatal_error(
-                _("Can't get projection key values of current location"));
+                _("Can't get projection key values of current project"));
 
         G_free_key_value(in_proj_info);
         G_free_key_value(in_unit_info);
@@ -822,7 +822,7 @@ int main(int argc, char *argv[])
 
     if ((latin != NULL || longin != NULL) && (G_projection() == PROJECTION_LL))
         G_warning(_("latin and longin raster maps have no effect when in a "
-                    "Lat/Lon location"));
+                    "Lat/Lon project"));
     /* true about longin= when civiltime is used? */
     /* civiltime needs longin= but not latin= for non-LL projections -
        better would be it just use pj_proj() if it needs those?? */
diff --git a/raster/r.sunhours/main.c b/raster/r.sunhours/main.c
index fbf0bd6393f..b866a365b2f 100644
--- a/raster/r.sunhours/main.c
+++ b/raster/r.sunhours/main.c
@@ -218,14 +218,14 @@ int main(int argc, char *argv[])
 
         /* read current projection info */
         if ((in_proj_info = G_get_projinfo()) == NULL)
-            G_fatal_error(_("Cannot get projection info of current location"));
+            G_fatal_error(_("Cannot get projection info of current project"));
 
         if ((in_unit_info = G_get_projunits()) == NULL)
-            G_fatal_error(_("Cannot get projection units of current location"));
+            G_fatal_error(_("Cannot get projection units of current project"));
 
         if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0)
             G_fatal_error(
-                _("Cannot get projection key values of current location"));
+                _("Cannot get projection key values of current project"));
 
         G_free_key_value(in_proj_info);
         G_free_key_value(in_unit_info);
diff --git a/raster/r.sunmask/g_solposition.c b/raster/r.sunmask/g_solposition.c
index 8c79ad0dc5d..46033adc68a 100644
--- a/raster/r.sunmask/g_solposition.c
+++ b/raster/r.sunmask/g_solposition.c
@@ -64,7 +64,7 @@ long calc_solar_position(double longitude, double latitude, double timezone,
     /* we don't like to run G_calc_solar_position in xy locations */
     if (window.proj == 0)
         G_fatal_error(
-            _("Unable to calculate sun position in un-projected locations. "
+            _("Unable to calculate sun position in projects without CRS. "
               "Specify sunposition directly."));
 
     pdat = &pd; /* point to the structure for convenience */
@@ -98,21 +98,21 @@ long calc_solar_position(double longitude, double latitude, double timezone,
         /* read current projection info */
         if ((in_proj_info = G_get_projinfo()) == NULL)
             G_fatal_error(
-                _("Unable to get projection info of current location"));
+                _("Unable to get projection info of current project"));
 
         if ((in_unit_info = G_get_projunits()) == NULL)
             G_fatal_error(
-                _("Unable to get projection units of current location"));
+                _("Unable to get projection units of current project"));
 
         if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0)
             G_fatal_error(
-                _("Unable to get projection key values of current location"));
+                _("Unable to get projection key values of current project"));
 
         G_free_key_value(in_proj_info);
         G_free_key_value(in_unit_info);
 
         /* Try using pj_print_proj_params() instead of all this */
-        G_debug(1, "Projection found in location:");
+        G_debug(1, "Projection found in project:");
         G_debug(1, "IN: meter: %f zone: %i proj: %s (iproj struct)",
                 iproj.meters, iproj.zone, iproj.proj);
         G_debug(1, "IN coord: longitude: %f, latitude: %f", longitude,
diff --git a/raster/r.topidx/main.c b/raster/r.topidx/main.c
index fb6ccada890..e3a6b6ab75e 100644
--- a/raster/r.topidx/main.c
+++ b/raster/r.topidx/main.c
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
 
     /* Make sure that the current projection is not lat/long */
     if (G_projection() == PROJECTION_LL)
-        G_fatal_error(_("Lat/Long location is not supported by %s. Please "
+        G_fatal_error(_("Lat/Long project is not supported by %s. Please "
                         "reproject map first."),
                       G_program_name());
 
diff --git a/vector/v.in.lidar/projection.c b/vector/v.in.lidar/projection.c
index aba51081b91..ab1b4a7fcd4 100644
--- a/vector/v.in.lidar/projection.c
+++ b/vector/v.in.lidar/projection.c
@@ -33,7 +33,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
     /* TODO: output this info sorted by key: */
     if (loc_wind.proj != cellhd.proj || err != -2) {
         if (loc_proj_info != NULL) {
-            strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n"));
+            strcat(error_msg, _("GRASS project PROJ_INFO is:\n"));
             for (i_value = 0; i_value < loc_proj_info->nitems; i_value++)
                 sprintf(error_msg + strlen(error_msg), "%s: %s\n",
                         loc_proj_info->key[i_value],
@@ -68,7 +68,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
     }
     else {
         if (loc_proj_units != NULL) {
-            strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n");
+            strcat(error_msg, "GRASS project PROJ_UNITS is:\n");
             for (i_value = 0; i_value < loc_proj_units->nitems; i_value++)
                 sprintf(error_msg + strlen(error_msg), "%s: %s\n",
                         loc_proj_units->key[i_value],
diff --git a/vector/v.in.ogr/v.in.ogr.html b/vector/v.in.ogr/v.in.ogr.html
index 91f0cdf5ac2..3a461969663 100644
--- a/vector/v.in.ogr/v.in.ogr.html
+++ b/vector/v.in.ogr/v.in.ogr.html
@@ -452,7 +452,7 @@ 

Projection errors

Here you need to create or use a project whose CRS matches that -of the vector data you wish to import. Try using location parameter to +of the vector data you wish to import. Try using project parameter to create a new project based upon the CRS information in the file. If desired, you can then reproject it to another project with v.proj. diff --git a/vector/v.in.pdal/projection.c b/vector/v.in.pdal/projection.c index aa811a0a409..e1c79a599b0 100644 --- a/vector/v.in.pdal/projection.c +++ b/vector/v.in.pdal/projection.c @@ -33,7 +33,7 @@ void projection_mismatch_report(struct Cell_head cellhd, /* TODO: output this info sorted by key: */ if (loc_wind.proj != cellhd.proj || err != -2) { if (loc_proj_info != NULL) { - strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n")); + strcat(error_msg, _("GRASS project PROJ_INFO is:\n")); for (i_value = 0; i_value < loc_proj_info->nitems; i_value++) sprintf(error_msg + strlen(error_msg), "%s: %s\n", loc_proj_info->key[i_value], @@ -68,7 +68,7 @@ void projection_mismatch_report(struct Cell_head cellhd, } else { if (loc_proj_units != NULL) { - strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n"); + strcat(error_msg, "GRASS project PROJ_UNITS is:\n"); for (i_value = 0; i_value < loc_proj_units->nitems; i_value++) sprintf(error_msg + strlen(error_msg), "%s: %s\n", loc_proj_units->key[i_value], diff --git a/vector/v.net.alloc/main.c b/vector/v.net.alloc/main.c index 6cf7a4341e6..1d0a6165c3a 100644 --- a/vector/v.net.alloc/main.c +++ b/vector/v.net.alloc/main.c @@ -143,7 +143,7 @@ int main(int argc, char **argv) geo_f = G_define_flag(); geo_f->key = 'g'; geo_f->description = - _("Use geodesic calculation for longitude-latitude locations"); + _("Use geodesic calculation for longitude-latitude projects"); ucat_f = G_define_flag(); ucat_f->key = 'u'; diff --git a/vector/v.net.allpairs/main.c b/vector/v.net.allpairs/main.c index a1390307e32..d3b78db4633 100644 --- a/vector/v.net.allpairs/main.c +++ b/vector/v.net.allpairs/main.c @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) geo_f = G_define_flag(); geo_f->key = 'g'; geo_f->description = - _("Use geodesic calculation for longitude-latitude locations"); + _("Use geodesic calculation for longitude-latitude projects"); /* options and flags parser */ if (G_parser(argc, argv)) diff --git a/vector/v.net.centrality/main.c b/vector/v.net.centrality/main.c index fc1abc0ee27..64e4c996507 100644 --- a/vector/v.net.centrality/main.c +++ b/vector/v.net.centrality/main.c @@ -185,7 +185,7 @@ int main(int argc, char *argv[]) geo_f = G_define_flag(); geo_f->key = 'g'; geo_f->description = - _("Use geodesic calculation for longitude-latitude locations"); + _("Use geodesic calculation for longitude-latitude projects"); add_f = G_define_flag(); add_f->key = 'a'; diff --git a/vector/v.net.distance/main.c b/vector/v.net.distance/main.c index 6344ea65bf7..71e7d05e966 100644 --- a/vector/v.net.distance/main.c +++ b/vector/v.net.distance/main.c @@ -158,7 +158,7 @@ int main(int argc, char *argv[]) geo_f = G_define_flag(); geo_f->key = 'g'; geo_f->description = - _("Use geodesic calculation for longitude-latitude locations"); + _("Use geodesic calculation for longitude-latitude projects"); segments_f = G_define_flag(); #if 0 diff --git a/vector/v.net.iso/main.c b/vector/v.net.iso/main.c index 47819d196cb..5e711c22823 100644 --- a/vector/v.net.iso/main.c +++ b/vector/v.net.iso/main.c @@ -166,7 +166,7 @@ int main(int argc, char **argv) geo_f = G_define_flag(); geo_f->key = 'g'; geo_f->description = - _("Use geodesic calculation for longitude-latitude locations"); + _("Use geodesic calculation for longitude-latitude projects"); ucat_f = G_define_flag(); ucat_f->key = 'u'; diff --git a/vector/v.net.path/main.c b/vector/v.net.path/main.c index c2a75c1a0d2..db27395e598 100644 --- a/vector/v.net.path/main.c +++ b/vector/v.net.path/main.c @@ -128,7 +128,7 @@ int main(int argc, char **argv) geo_f = G_define_flag(); geo_f->key = 'g'; geo_f->description = - _("Use geodesic calculation for longitude-latitude locations"); + _("Use geodesic calculation for longitude-latitude projects"); segments_f = G_define_flag(); segments_f->key = 's'; diff --git a/vector/v.net.salesman/main.c b/vector/v.net.salesman/main.c index 694c6d0c742..c1e26073548 100644 --- a/vector/v.net.salesman/main.c +++ b/vector/v.net.salesman/main.c @@ -206,7 +206,7 @@ int main(int argc, char **argv) geo_f = G_define_flag(); geo_f->key = 'g'; geo_f->description = - _("Use geodesic calculation for longitude-latitude locations"); + _("Use geodesic calculation for longitude-latitude projects"); if (G_parser(argc, argv)) exit(EXIT_FAILURE); diff --git a/vector/v.net.spanningtree/main.c b/vector/v.net.spanningtree/main.c index cfdd78731b0..f9af1952d41 100644 --- a/vector/v.net.spanningtree/main.c +++ b/vector/v.net.spanningtree/main.c @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) geo_f = G_define_flag(); geo_f->key = 'g'; geo_f->description = - _("Use geodesic calculation for longitude-latitude locations"); + _("Use geodesic calculation for longitude-latitude projects"); /* options and flags parser */ if (G_parser(argc, argv)) diff --git a/vector/v.net.steiner/main.c b/vector/v.net.steiner/main.c index 9b324136ce2..00a0cd71d77 100644 --- a/vector/v.net.steiner/main.c +++ b/vector/v.net.steiner/main.c @@ -403,7 +403,7 @@ int main(int argc, char **argv) geo_f = G_define_flag(); geo_f->key = 'g'; geo_f->description = - _("Use geodesic calculation for longitude-latitude locations"); + _("Use geodesic calculation for longitude-latitude projects"); if (G_parser(argc, argv)) exit(EXIT_FAILURE); diff --git a/vector/v.out.postgis/create.c b/vector/v.out.postgis/create.c index 6447024e315..bfff7823279 100644 --- a/vector/v.out.postgis/create.c +++ b/vector/v.out.postgis/create.c @@ -75,7 +75,7 @@ char *create_pgfile(const char *dsn, const char *schema, const char *olink, if (strcmp(tokens[0], "srid") == 0 && (epsg && strcmp(tokens[1], epsg) != 0)) - G_warning(_("EPSG code defined for current location (%s) is " + G_warning(_("EPSG code defined for current project (%s) is " "overridden by %s"), epsg, tokens[1]); diff --git a/vector/v.rectify/env.c b/vector/v.rectify/env.c index 80990ad8bfc..f2d69f64d2a 100644 --- a/vector/v.rectify/env.c +++ b/vector/v.rectify/env.c @@ -35,7 +35,7 @@ int select_target_env(void) int show_env(void) { - fprintf(stderr, "env(%d) switch to LOCATION %s, MAPSET %s\n", which_env, + fprintf(stderr, "env(%d) switch to project %s, mapset %s\n", which_env, G_getenv_nofatal("LOCATION_NAME") == NULL ? "?" : G_getenv_nofatal("LOCATION_NAME"), diff --git a/vector/v.rectify/main.c b/vector/v.rectify/main.c index b91ad5efcbe..b02630c88ae 100644 --- a/vector/v.rectify/main.c +++ b/vector/v.rectify/main.c @@ -202,7 +202,7 @@ int main(int argc, char *argv[]) if (G_find_vector2(out_opt->answer, G_mapset())) { G_warning(_("The vector map <%s> already exists in"), out_opt->answer); - G_warning(_("target LOCATION %s, MAPSET %s:"), G_location(), + G_warning(_("target project %s, mapset %s:"), G_location(), G_mapset()); G_fatal_error(_("Rectification cancelled.")); } diff --git a/vector/v.rectify/target.c b/vector/v.rectify/target.c index e5bf3ce41e6..3714f25866d 100644 --- a/vector/v.rectify/target.c +++ b/vector/v.rectify/target.c @@ -26,7 +26,7 @@ int get_target(char *group) sprintf(buf, "%s/%s", G_gisdbase(), location); if (access(buf, 0) != 0) { - sprintf(buf, _("Target location <%s> not found"), location); + sprintf(buf, _("Target project <%s> not found"), location); goto error; } select_target_env(); @@ -37,7 +37,7 @@ int get_target(char *group) select_current_env(); return 1; } - sprintf(buf, _("Mapset <%s> in target location <%s> - "), mapset, location); + sprintf(buf, _("Mapset <%s> in target project <%s> - "), mapset, location); strcat(buf, stat == 0 ? _("permission denied") : _("not found")); error: strcat(buf, _("Please run i.target for group."));