[Freeciv-Dev] Re: (PR#4152) String issue in translatable string (S1_14)
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
This is a fix for the orthographic bugs in PR#4152 to PR#4168, for HEAD.
For 4157, I've only corrected the missing "in", not s/have/has/
For 4153, I've added s/!!/!/
Christian
--
Christian Knoke * * * http://www.enter.de/~c.knoke/
* * * * * * * * * Ceterum censeo Microsoft esse dividendum.
diff -Nur -Xdiff_ignore ../../cvs/freeciv/client/agents/cma_core.c
./client/agents/cma_core.c
--- ../../cvs/freeciv/client/agents/cma_core.c Sat Apr 5 10:16:16 2003
+++ ./client/agents/cma_core.c Mon May 5 10:56:57 2003
@@ -600,7 +600,7 @@
create_event(pcity->x, pcity->y, E_CITY_CMA_RELEASE,
_("CMA: %s has changed multiple times. This may be "
- "an error in freeciv or bad luck. Please contact "
+ "an error in Freeciv or bad luck. Please contact "
"<freeciv-dev@xxxxxxxxxxx>. The CMA will detach "
"itself from the city now."), pcity->name);
@@ -608,7 +608,7 @@
#if (IS_DEVEL_VERSION || IS_BETA_VERSION)
die("CMA: %s has changed multiple times. This may be "
- "an error in freeciv or bad luck. Please contact "
+ "an error in Freeciv or bad luck. Please contact "
"<freeciv-dev@xxxxxxxxxxx>. The CMA will detach "
"itself from the city now.", pcity->name);
#endif
diff -Nur -Xdiff_ignore ../../cvs/freeciv/client/audio.c ./client/audio.c
--- ../../cvs/freeciv/client/audio.c Sat Apr 5 10:16:16 2003
+++ ./client/audio.c Mon May 5 10:55:35 2003
@@ -213,7 +213,7 @@
if (num_plugins_used == 1) {
/* We only have the dummy plugin, skip the code but issue an advertise */
freelog(LOG_NORMAL, _("No real audio plugin present, "
- "Proceeding with sound support disabled"));
+ "proceeding with sound support disabled"));
freelog(LOG_NORMAL,
_("For sound support, install either esound or SDL_mixer"));
freelog(LOG_NORMAL,
diff -Nur -Xdiff_ignore ../../cvs/freeciv/client/gui-gtk/mapview.c
./client/gui-gtk/mapview.c
--- ../../cvs/freeciv/client/gui-gtk/mapview.c Thu Apr 24 10:58:29 2003
+++ ./client/gui-gtk/mapview.c Mon May 5 10:59:35 2003
@@ -218,7 +218,7 @@
my_snprintf(buffer, sizeof(buffer),
_("Population: %s\nYear: %s\n"
- "Gold %d\nTax: %d Lux: %d Sci: %d"),
+ "Gold: %d\nTax: %d Lux: %d Sci: %d"),
population_to_text(civ_population(game.player_ptr)),
textyear(game.year), game.player_ptr->economic.gold,
game.player_ptr->economic.tax,
diff -Nur -Xdiff_ignore ../../cvs/freeciv/client/gui-gtk/plrdlg.c
./client/gui-gtk/plrdlg.c
--- ../../cvs/freeciv/client/gui-gtk/plrdlg.c Thu May 1 09:15:31 2003
+++ ./client/gui-gtk/plrdlg.c Mon May 5 11:00:48 2003
@@ -135,7 +135,7 @@
void create_players_dialog(void)
{
static const char *titles_[NUM_COLUMNS] =
- { N_("Name"), N_("Flag"), N_("Nation"), N_("Team"), N_("Ai"),
+ { N_("Name"), N_("Flag"), N_("Nation"), N_("Team"), N_("AI"),
N_("Embassy"), N_("Dipl.State"), N_("Vision"), N_("Reputation"),
N_("State"), N_("Host"), N_("Idle"), N_("Ping")
};
diff -Nur -Xdiff_ignore ../../cvs/freeciv/client/gui-gtk-2.0/mapview.c
./client/gui-gtk-2.0/mapview.c
--- ../../cvs/freeciv/client/gui-gtk-2.0/mapview.c Thu Apr 24 10:58:29 2003
+++ ./client/gui-gtk-2.0/mapview.c Mon May 5 10:58:45 2003
@@ -221,7 +221,7 @@
my_snprintf(buffer, sizeof(buffer),
_("Population: %s\nYear: %s\n"
- "Gold %d\nTax: %d Lux: %d Sci: %d"),
+ "Gold: %d\nTax: %d Lux: %d Sci: %d"),
population_to_text(civ_population(game.player_ptr)),
textyear(game.year), game.player_ptr->economic.gold,
game.player_ptr->economic.tax,
diff -Nur -Xdiff_ignore ../../cvs/freeciv/client/gui-mui/gui_main.c
./client/gui-mui/gui_main.c
--- ../../cvs/freeciv/client/gui-mui/gui_main.c Sun May 4 21:32:16 2003
+++ ./client/gui-mui/gui_main.c Mon May 5 11:02:38 2003
@@ -1309,7 +1309,7 @@
}
else
{
- sz_strlcpy(transtext, _("Transform terrain"));
+ sz_strlcpy(transtext, _("Transform Terrain"));
}
if (map_has_special(punit->x, punit->y, S_ROAD))
diff -Nur -Xdiff_ignore ../../cvs/freeciv/client/gui-mui/mapclass.c
./client/gui-mui/mapclass.c
--- ../../cvs/freeciv/client/gui-mui/mapclass.c Sat Apr 5 10:16:18 2003
+++ ./client/gui-mui/mapclass.c Mon May 5 11:02:59 2003
@@ -1721,7 +1721,7 @@
if (can_unit_do_activity(punit, ACTIVITY_TRANSFORM))
{
static char transtext[64];
- sz_strlcpy(transtext, _("Transform terrain"));
+ sz_strlcpy(transtext, _("Transform Terrain"));
Map_InsertCommand(&list, transtext, PACK_USERDATA(punit,
MENU_ORDER_TRANSFORM));
}
diff -Nur -Xdiff_ignore ../../cvs/freeciv/client/gui-win32/mapview.c
./client/gui-win32/mapview.c
--- ../../cvs/freeciv/client/gui-win32/mapview.c Thu Apr 24 10:58:29 2003
+++ ./client/gui-win32/mapview.c Mon May 5 10:59:58 2003
@@ -318,7 +318,7 @@
char buffer[512];
HDC hdc;
my_snprintf(buffer, sizeof(buffer),
- _("Population: %s\nYear: %s\nGold %d\nTax: %d Lux: %d Sci: %d"),
+ _("Population: %s\nYear: %s\nGold: %d\nTax: %d Lux: %d Sci: %d"),
population_to_text(civ_population(game.player_ptr)),
textyear( game.year ),
game.player_ptr->economic.gold,
diff -Nur -Xdiff_ignore ../../cvs/freeciv/client/gui-win32/plrdlg.c
./client/gui-win32/plrdlg.c
--- ../../cvs/freeciv/client/gui-win32/plrdlg.c Thu May 1 09:15:32 2003
+++ ./client/gui-win32/plrdlg.c Mon May 5 11:01:13 2003
@@ -350,7 +350,7 @@
{
int i;
static char *titles_[NUM_COLUMNS] =
- { N_("Name"), N_("Nation"), N_("Ai"),
+ { N_("Name"), N_("Nation"), N_("AI"),
N_("Embassy"), N_("Dipl.State"), N_("Vision"), N_("Reputation"),
N_("State"), N_("Host"), N_("Idle")
};
diff -Nur -Xdiff_ignore ../../cvs/freeciv/data/civ1/buildings.ruleset
./data/civ1/buildings.ruleset
--- ../../cvs/freeciv/data/civ1/buildings.ruleset Mon Jan 6 09:43:36 2003
+++ ./data/civ1/buildings.ruleset Mon May 5 11:17:40 2003
@@ -779,7 +779,7 @@
sound_alt = "b_generic"
; /* xgettext:no-c-format */
helptext = _("\
-Building a recycling center reduces the amount of pollution\
+Building a Recycling Center reduces the amount of pollution\
generated by production in a city by 66%.\
")
@@ -804,7 +804,7 @@
sound = "b_research_lab"
sound_alt = "b_generic"
helptext = _("\
-Together with a Library , a Research Lab increases the science\
+Together with a Library, a Research Lab increases the science\
production of a city by 100%. \
Together with a Library and a University, a Research Lab increases\
the science production of a city by 150%.\
diff -Nur -Xdiff_ignore ../../cvs/freeciv/data/civ2/buildings.ruleset
./data/civ2/buildings.ruleset
--- ../../cvs/freeciv/data/civ2/buildings.ruleset Wed Feb 5 06:55:32 2003
+++ ./data/civ2/buildings.ruleset Mon May 5 11:17:26 2003
@@ -767,7 +767,7 @@
sound_alt = "b_generic"
; /* xgettext:no-c-format */
helptext = _("\
-Building a recycling center reduces the amount of pollution\
+Building a Recycling Center reduces the amount of pollution\
generated by production in a city by 66%.\
")
@@ -792,7 +792,7 @@
sound = "b_research_lab"
sound_alt = "b_generic"
helptext = _("\
-Together with a Library , a Research Lab increases the science\
+Together with a Library, a Research Lab increases the science\
production of a city by 100%. \
Together with a Library and a University, a Research Lab increases\
the science production of a city by 150%.\
diff -Nur -Xdiff_ignore ../../cvs/freeciv/data/civ2/governments.ruleset
./data/civ2/governments.ruleset
--- ../../cvs/freeciv/data/civ2/governments.ruleset Tue Feb 11 11:09:04 2003
+++ ./data/civ2/governments.ruleset Mon May 5 11:18:57 2003
@@ -496,7 +496,7 @@
\n\n\
Under Fundamentalism, your cities can support up to 10 military\
units without paying shields for upkeep. (Additional units\
- require 1 production shield each. Fanatics units need no upkeep.\
+ require 1 production shield each.) Fanatics units need no upkeep.\
\n\n\
Settlers consume 2 food per turn under Fundamentalism.\
\n\n\
diff -Nur -Xdiff_ignore ../../cvs/freeciv/data/default/buildings.ruleset
./data/default/buildings.ruleset
--- ../../cvs/freeciv/data/default/buildings.ruleset Thu Feb 13 12:30:28 2003
+++ ./data/default/buildings.ruleset Mon May 5 11:17:14 2003
@@ -882,7 +882,7 @@
sound_alt = "b_generic"
; /* xgettext:no-c-format */
helptext = _("\
-Building a recycling center reduces the amount of pollution\
+Building a Recycling Center reduces the amount of pollution\
generated by production in a city by 66%.\
")
@@ -909,7 +909,7 @@
sound = "b_research_lab"
sound_alt = "b_generic"
helptext = _("\
-Together with a Library , a Research Lab increases the science\
+Together with a Library, a Research Lab increases the science\
production of a city by 100%. \
Together with a Library and a University, a Research Lab increases\
the science production of a city by 150%.\
diff -Nur -Xdiff_ignore ../../cvs/freeciv/data/helpdata.txt ./data/helpdata.txt
--- ../../cvs/freeciv/data/helpdata.txt Thu Mar 27 10:00:55 2003
+++ ./data/helpdata.txt Mon May 5 11:13:25 2003
@@ -511,7 +511,7 @@
name = _("Worklist Editor")
text = _("\
The worklist editor is used to edit both worklists for each city (from the \
-city dialog) and global worklists. Using this editor You can create lists \
+city dialog) and global worklists. Using this editor you can create lists \
specifying what to build in the turns to come.\
"), _("\
To add an item to the worklist, double-click the desired item in the list \
@@ -701,7 +701,7 @@
- and Give Gold.\
"), _("\
There is no need to trade like for like, by trading say, \
-an advance or city for gold - you can can consider this \
+an advance or city for gold - you can consider this \
buying and selling.\
"), _("\
A couple of notes:\
diff -Nur -Xdiff_ignore ../../cvs/freeciv/data/history/buildings.ruleset
./data/history/buildings.ruleset
--- ../../cvs/freeciv/data/history/buildings.ruleset Mon Jan 6 09:43:37 2003
+++ ./data/history/buildings.ruleset Mon May 5 11:17:53 2003
@@ -783,7 +783,7 @@
sound_alt = "b_generic"
; /* xgettext:no-c-format */
helptext = _("\
-Building a recycling center reduces the amount of pollution\
+Building a Recycling Center reduces the amount of pollution\
generated by production in a city by 66%.\
")
@@ -808,7 +808,7 @@
sound = "b_research_lab"
sound_alt = "b_generic"
helptext = _("\
-Together with a Library , a Research Lab increases the science\
+Together with a Library, a Research Lab increases the science\
production of a city by 100%. \
Together with a Library and a University, a Research Lab increases\
the science production of a city by 150%.\
diff -Nur -Xdiff_ignore ../../cvs/freeciv/server/cityhand.c ./server/cityhand.c
--- ../../cvs/freeciv/server/cityhand.c Wed Dec 18 20:17:00 2002
+++ ./server/cityhand.c Mon May 5 10:47:54 2003
@@ -139,7 +139,7 @@
sync_cities();
} else {
notify_player_ex(pplayer, pcity->x, pcity->y, E_NOEVENT,
- _("Game: you don't have a worker here."));
+ _("Game: You don't have a worker here."));
}
}
diff -Nur -Xdiff_ignore ../../cvs/freeciv/server/citytools.c
./server/citytools.c
--- ../../cvs/freeciv/server/citytools.c Wed Apr 30 11:41:30 2003
+++ ./server/citytools.c Mon May 5 10:49:19 2003
@@ -1272,8 +1272,8 @@
get_nation_name_plural(pplayer->nation));
} else {
notify_player_ex(pplayer, pcity->x, pcity->y, E_NOEVENT,
- _("Game: You have liberated %s!!"
- " lootings accumulate to %d gold."),
+ _("Game: You have liberated %s!"
+ " Lootings accumulate to %d gold."),
pcity->name, coins);
notify_player_ex(cplayer, pcity->x, pcity->y, E_CITY_LOST,
diff -Nur -Xdiff_ignore ../../cvs/freeciv/server/civserver.c
./server/civserver.c
--- ../../cvs/freeciv/server/civserver.c Sat Apr 5 10:16:20 2003
+++ ./server/civserver.c Mon May 5 10:50:16 2003
@@ -136,7 +136,7 @@
fprintf(stderr, _(" -h, --help\t\tPrint a summary of the options\n"));
fprintf(stderr, _(" -i, --info INFO\tExtra info for the metaserver\n"));
fprintf(stderr, _(" -l, --log FILE\tUse FILE as logfile\n"));
- fprintf(stderr, _(" -m, --meta\t\tnotify metaserver and send server's
info\n"));
+ fprintf(stderr, _(" -m, --meta\t\tNotify metaserver and send server's
info\n"));
fprintf(stderr, _(" -M, --Metaserver ADDR\tSet ADDR as metaserver
address\n"));
fprintf(stderr, _(" -p, --port PORT\tListen for clients on port PORT\n"));
diff -Nur -Xdiff_ignore ../../cvs/freeciv/server/srv_main.c ./server/srv_main.c
--- ../../cvs/freeciv/server/srv_main.c Sat May 3 15:31:33 2003
+++ ./server/srv_main.c Mon May 5 10:51:14 2003
@@ -1290,7 +1290,7 @@
if (!((game.nplayers == old_nplayers+1)
&& strcmp(player_name, pplayer->name)==0)) {
- con_write(C_FAIL, _("Error creating new ai player: %s\n"),
+ con_write(C_FAIL, _("Error creating new AI player: %s\n"),
player_name);
break; /* don't loop forever */
}
diff -Nur -Xdiff_ignore ../../cvs/freeciv/server/stdinhand.c
./server/stdinhand.c
--- ../../cvs/freeciv/server/stdinhand.c Fri Apr 18 10:28:28 2003
+++ ./server/stdinhand.c Mon May 5 10:54:43 2003
@@ -241,7 +241,7 @@
"island (or one\n"
" with three players for an odd number of players), and "
"additional\n"
- " smaller islands.\n"
+ " smaller islands;\n"
"5 = one or more large earthlike continents with some scatter.\n"
"Note: values 2,3 and 4 generate \"fairer\" (but more boring) "
"maps.\n"
@@ -478,7 +478,7 @@
N_("When a player founds a new city, it is checked if there is "
"no other city in citymindist distance. For example, if "
"citymindist is 3, there have to be at least two empty "
- "fields between two cities every direction. If it is set "
+ "fields between two cities in every direction. If it is set "
"to 0 (default), it is overwritten by the current ruleset "
"when the game starts."), NULL,
GAME_MIN_CITYMINDIST, GAME_MAX_CITYMINDIST,
@@ -733,7 +733,7 @@
GEN_INT("netwait", game.netwait, SSET_META, SSET_TO_CLIENT,
N_("Max seconds for TCP buffers to drain"),
- N_("The civserver will wait for upto the value of this "
+ N_("The civserver will wait for up to the value of this "
"parameter in seconds, for all client connection TCP "
"buffers to unblock. Zero means the server will not "
"wait at all."), NULL,
|
|
