Skip to content

i18n: Fold near-duplicate source strings to reduce translation workload #743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
echoix wants to merge 1 commit into
base: main
Choose a base branch
from
Open

i18n: Fold near-duplicate source strings to reduce translation workload #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions db/db.connect/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ int main(int argc, char *argv[])
}

if (shell->answer) {
G_verbose_message(
_("Flag 'g' is deprecated and will be removed in a future "
"release. Please use format=shell instead."));
G_verbose_message(_("Flag '%c' is deprecated and will be removed in a "
"future release. Use format=%s instead."),
'g', "shell");
if (format == JSON) {
G_fatal_error(_("The -g flag cannot be used with format=json. "
"Please select only one output format."));
Expand Down
2 changes: 1 addition & 1 deletion db/db.execute/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ int main(int argc, char **argv)
if (parms.input && strcmp(parms.input, "-") != 0) {
fd = fopen(parms.input, "r");
if (fd == NULL) {
G_fatal_error(_("Unable to open file <%s>: %s"), parms.input,
G_fatal_error(_("Unable to open file '%s': %s."), parms.input,
strerror(errno));
}
}
Expand Down
12 changes: 6 additions & 6 deletions db/db.select/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ int main(int argc, char **argv)
if (parms.input && strcmp(parms.input, "-") != 0) {
fd = fopen(parms.input, "r");
if (fd == NULL) {
G_fatal_error(_("Unable to open file <%s>: %s"), parms.input,
G_fatal_error(_("Unable to open file '%s': %s."), parms.input,
strerror(errno));
}
}
Expand All @@ -90,7 +90,7 @@ int main(int argc, char **argv)

if (parms.output && strcmp(parms.output, "-") != 0) {
if (NULL == freopen(parms.output, "w", stdout)) {
G_fatal_error(_("Unable to open file <%s> for writing"),
G_fatal_error(_("Unable to open file '%s' for writing."),
parms.output);
}
}
Expand Down Expand Up @@ -534,7 +534,7 @@ void parse_command_line(int argc, char **argv)
// Check for mutually exclusive options
if (parms.format == JSON) {
fatal_error_option_value_excludes_option(
format, fs, _("Separator is part of the format"));
format, fs, _("Separator is part of the format."));
fatal_error_option_value_excludes_option(
format, vs, _("Vertical separator is part of the format"));
fatal_error_option_value_excludes_option(
Expand All @@ -543,9 +543,9 @@ void parse_command_line(int argc, char **argv)
format, c, _("Column names are always included"));
}
if (v->answer) {
G_verbose_message(
_("Flag 'v' is deprecated and will be removed in a future "
"release. Please use format=vertical instead."));
G_verbose_message(_("Flag '%c' is deprecated and will be removed in a "
"future release. Use format=%s instead."),
'v', "vertical");
if (format->answer && parms.format != VERTICAL) {
G_fatal_error(_("Flag 'v' is only allowed with format=vertical."));
}
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/dbf/column.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ int drop_column(int tab, char *name)
/* Check if the column exists */
c = find_column(tab, name);
if (c == -1) {
db_d_append_error(_("Column '%s' does not exist"), name);
db_d_append_error(_("Column <%s> does not exist."), name);
db_d_report_error();
return DB_FAILED;
}
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/dbf/create_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ int db__driver_create_table(dbTable *table)
ret = execute(db_get_string(&sql), NULL);

if (ret == DB_FAILED) {
db_d_append_error(_("Unable to create table"));
db_d_append_error(_("Unable to create table."));
db_d_report_error();
return DB_FAILED;
}
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/dbf/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ cursor *alloc_cursor(void)
/* allocate the cursor */
c = (cursor *)db_malloc(sizeof(cursor));
if (c == NULL) {
db_d_append_error(_("Unable to allocate new cursor"));
db_d_append_error(_("Unable to allocate cursor."));
db_d_report_error();
return c;
}
Expand Down
9 changes: 5 additions & 4 deletions db/drivers/dbf/dbfexe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ int execute(char *sql, cursor *c)
/* find table */
tab = find_table(st->table);
if (tab < 0 && st->command != SQLP_CREATE) {
db_d_append_error(_("Table '%s' doesn't exist."), st->table);
db_d_append_error(_("Table <%s> does not exist."), st->table);
return DB_FAILED;
}

Expand Down Expand Up @@ -109,7 +109,8 @@ int execute(char *sql, cursor *c)
for (i = 0; i < ncols; i++) {
cols[i] = find_column(tab, st->Col[i].s);
if (cols[i] == -1) {
db_d_append_error(_("Column '%s' not found"), st->Col[i].s);
db_d_append_error(_("Column <%s> not found."),
st->Col[i].s);
return DB_FAILED;
}
}
Expand Down Expand Up @@ -178,7 +179,7 @@ int execute(char *sql, cursor *c)

case (SQLP_CREATE):
if (tab >= 0) {
db_d_append_error(_("Table %s already exists"), st->table);
db_d_append_error(_("Table <%s> already exists."), st->table);

return DB_FAILED;
}
Expand Down Expand Up @@ -1019,7 +1020,7 @@ int eval_node_type(SQLPNODE *nptr, int tab)
case SQLP_NODE_COLUMN:
ccol = find_column(tab, nptr->column_name);
if (ccol == -1) {
db_d_append_error(_("Column '%s' not found"), nptr->column_name);
db_d_append_error(_("Column <%s> not found."), nptr->column_name);
return -1;
}
col = &(db.tables[tab].cols[ccol]);
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/dbf/describe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int db__driver_describe_table(dbString *table_name, dbTable **table)

tab = find_table(name);
if (tab == -1) {
db_d_append_error(_("Table '%s' doesn't exist"),
db_d_append_error(_("Table <%s> does not exist."),
db_get_string(table_name));
db_d_report_error();
return DB_FAILED;
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/mysql/describe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ int db__driver_describe_table(dbString *table_name, dbTable **table)
}

if (describe_table(res, table, NULL) == DB_FAILED) {
db_d_append_error(_("Unable to describe table"));
db_d_append_error(_("Unable to describe table."));
db_d_report_error();
mysql_free_result(res);
return DB_FAILED;
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/odbc/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cursor *alloc_cursor(void)
/* allocate the cursor */
c = (cursor *)db_malloc(sizeof(cursor));
if (c == NULL) {
db_d_append_error(_("Unable to allocate cursor"));
db_d_append_error(_("Unable to allocate cursor."));
db_d_report_error();
return c;
}
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/odbc/table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ int db__driver_drop_table(dbString *name)
}

if (nrow == 0) {
db_d_append_error(_("Table %s doesn't exist"), tname);
db_d_append_error(_("Table <%s> does not exist."), tname);
db_d_report_error();

return DB_FAILED;
Expand Down
4 changes: 2 additions & 2 deletions db/drivers/ogr/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ cursor *alloc_cursor(void)
/* allocate the cursor */
c = (cursor *)db_malloc(sizeof(cursor));
if (c == NULL) {
db_d_append_error(_("Unable to allocate cursor"));
db_d_append_error(_("Unable to allocate cursor."));
return NULL;
}

Expand All @@ -70,7 +70,7 @@ cursor *alloc_cursor(void)
/* tokenize it */
c->token = db_new_token(c);
if (c->token < 0) {
db_d_append_error(_("Unable to add new token"));
db_d_append_error(_("Unable to add new token."));
return NULL;
}
return c;
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/postgres/listdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ int db__driver_list_databases(dbString *dbpath, int npaths, dbHandle **dblist,

list = db_alloc_handle_array(rec_num);
if (list == NULL) {
db_d_append_error(_("Out of memory"));
db_d_append_error(_("Out of memory."));
db_d_report_error();
return DB_FAILED;
}
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/postgres/listtab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system)
list = db_alloc_string_array(nrows);

if (list == NULL) {
db_d_append_error(_("Out of memory"));
db_d_append_error(_("Out of memory."));
db_d_report_error();
return DB_FAILED;
}
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/postgres/select.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ int db__driver_open_select_cursor(dbString *sel, dbCursor *dbc, int mode)
G_free(str);

if (describe_table(c->res, &table, c) == DB_FAILED) {
db_d_append_error(_("Unable to describe table"));
db_d_append_error(_("Unable to describe table."));
db_d_report_error();
PQclear(res);
return DB_FAILED;
Expand Down
4 changes: 2 additions & 2 deletions db/drivers/sqlite/listdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ int listdb(dbString *path, int npaths, dbHandle **handles, int *count)
/* count number of dbs */
dirp = opendir(db_get_string(path));
if (dirp == NULL) {
db_d_append_error(_("Unable to open directory '%s'"),
db_d_append_error(_("Unable to open directory '%s'."),
db_get_string(path));
db_d_report_error();
return DB_FAILED;
Expand Down Expand Up @@ -132,7 +132,7 @@ int listdb(dbString *path, int npaths, dbHandle **handles, int *count)
/* allocate handles */
hlist = db_alloc_handle_array(hcount);
if (hlist == NULL) {
db_d_append_error(_("Out of memory"));
db_d_append_error(_("Out of memory."));
db_d_report_error();

freedb(dlist, hcount);
Expand Down
4 changes: 2 additions & 2 deletions display/d.extract/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ int main(int argc, char **argv)
Vect_set_open_level(2);

if (Vect_open_old(&In, input->answer, mapset) < 0)
G_fatal_error(_("Unable to open vector map <%s>"), input->answer);
G_fatal_error(_("Unable to open vector map <%s>."), input->answer);

if (Vect_open_new(&Out, output->answer, Vect_is_3d(&In)) < 0)
G_fatal_error(_("Unable to create vector map <%s>"), output->answer);
G_fatal_error(_("Unable to create vector map <%s>."), output->answer);

Vect_copy_head_data(&In, &Out);
Vect_hist_copy(&In, &Out);
Expand Down
5 changes: 3 additions & 2 deletions display/d.grid/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,14 @@ int main(int argc, char **argv)
/* get grid easting start */
if (!G_scan_easting(opt3->answers[0], &east, G_projection())) {
G_usage();
G_fatal_error(_("Illegal east coordinate <%s>"), opt3->answers[0]);
G_fatal_error(_("Illegal east coordinate <%s>."), opt3->answers[0]);
}

/* get grid northing start */
if (!G_scan_northing(opt3->answers[1], &north, G_projection())) {
G_usage();
G_fatal_error(_("Illegal north coordinate <%s>"), opt3->answers[1]);
G_fatal_error(_("Illegal north coordinate <%s>."),
opt3->answers[1]);
}
}

Expand Down
Loading
Loading