continued

OSGeo · Apr 26, 2024 · fa7d718 · fa7d718
1 parent 445b48b
commit fa7d718
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -59,7 +59,7 @@ <h2>EXAMPLE</h2>
 <div class="code"><pre>
 +-----------------------------------------------------------------------------+
 |                         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 @@ <h2>EXAMPLE</h2>
 <div class="code"><pre>
 +-----------------------------------------------------------------------------+
 |                         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
@@ -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
@@ -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
@@ -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
@@ -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 un-projected projects. "
               "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
@@ -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
@@ -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
@@ -452,7 +452,7 @@ <h3>Projection errors</h3>
 </pre></div>
 
 Here you need to create or use a project whose CRS matches that
-of the vector data you wish to import. Try using <b>location</b> parameter to
+of the vector data you wish to import. Try using <b>project</b> 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 <em><a href="v.proj.html">v.proj</a></em>.

diff --git 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
@@ -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.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);