Author: jtn Date: Tue Dec 8 23:00:53 2015 New Revision: 30899 URL: http://svn.gna.org/viewcvs/freeciv?rev=30899&view=rev Log: Fix a few typos and string tweaks.
See gna bug #24143. Modified: trunk/ai/default/advdiplomacy.c trunk/client/gui-gtk-2.0/mapview.c trunk/client/gui-gtk-3.0/mapview.c trunk/client/options.c trunk/data/experimental/game.ruleset trunk/data/nation/animals.ruleset trunk/server/diplomats.c trunk/server/settings.c trunk/server/srv_main.c Modified: trunk/ai/default/advdiplomacy.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/advdiplomacy.c?rev=30899&r1=30898&r2=30899&view=diff ============================================================================== --- trunk/ai/default/advdiplomacy.c (original) +++ trunk/ai/default/advdiplomacy.c Tue Dec 8 23:00:53 2015 @@ -951,7 +951,7 @@ clear_old_treaty(pplayer, aplayer); dai_diplomacy_suggest(pplayer, aplayer, CLAUSE_CEASEFIRE, FALSE, 0); } else { - notify(aplayer, _("*%s (AI)* I found you %s! Now make it worth letting " + notify(aplayer, _("*%s (AI)* I found you %s! Now make it worth my letting " "you live, or get crushed."), player_name(pplayer), player_name(aplayer)); Modified: trunk/client/gui-gtk-2.0/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/mapview.c?rev=30899&r1=30898&r2=30899&view=diff ============================================================================== --- trunk/client/gui-gtk-2.0/mapview.c (original) +++ trunk/client/gui-gtk-2.0/mapview.c Tue Dec 8 23:00:53 2015 @@ -102,11 +102,13 @@ if (current_turn_timeout() > 0) { gtk_widget_set_tooltip_text(timeout_label, _("Time to forced turn change,\n" - "or eta to finish of turn change processing.")); + "or estimated time to finish turn change " + "processing.")); } else { gtk_widget_set_tooltip_text(timeout_label, - _("Turn timeout disabled.\nBetween turns eta to " - "finish of turn change processing.")); + _("Turn timeout disabled.\n" + "Between turns this shows estimated time " + "to finish turn change processing.")); } } Modified: trunk/client/gui-gtk-3.0/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/mapview.c?rev=30899&r1=30898&r2=30899&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/mapview.c (original) +++ trunk/client/gui-gtk-3.0/mapview.c Tue Dec 8 23:00:53 2015 @@ -105,11 +105,13 @@ if (current_turn_timeout() > 0) { gtk_widget_set_tooltip_text(timeout_label, _("Time to forced turn change,\n" - "or eta to finish of turn change processing.")); + "or estimated time to finish turn change " + "processing.")); } else { gtk_widget_set_tooltip_text(timeout_label, - _("Turn timeout disabled.\nBetween turns eta to " - "finish of turn change processing.")); + _("Turn timeout disabled.\n" + "Between turns this shows estimated time " + "to finish turn change processing.")); } } Modified: trunk/client/options.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=30899&r1=30898&r2=30899&view=diff ============================================================================== --- trunk/client/options.c (original) +++ trunk/client/options.c Tue Dec 8 23:00:53 2015 @@ -2807,7 +2807,7 @@ "Sans Serif,10,-1,5,50,1,0,0,0,0", NULL), GEN_STR_OPTION(gui_qt_wakeup_text, N_("Wake up sequence"), - N_("String which will trigger sound in pregame page," + N_("String which will trigger sound in pregame page, " "%1 stands for nick"), COC_INTERFACE, GUI_QT, "Wake up %1", NULL) Modified: trunk/data/experimental/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=30899&r1=30898&r2=30899&view=diff ============================================================================== --- trunk/data/experimental/game.ruleset (original) +++ trunk/data/experimental/game.ruleset Tue Dec 8 23:00:53 2015 @@ -677,15 +677,15 @@ [achievement_spaceship] name = _("Spaceship Launch") type = "Spaceship" -first_msg = _("You're the first one to launch spaceship towards Alpha Centauri!"); -cons_msg = _("You have launched spaceship towards Alpha Centauri!") +first_msg = _("You're the first one to launch a spaceship towards Alpha Centauri!"); +cons_msg = _("You have launched a spaceship towards Alpha Centauri!") [achievement_map_known] name = _("Entire Map Known") type = "Map_Known" value = 100 -first_msg = _("You're the first one to have entire world mapped!") -cons_msg = _("You have entire world mapped!") +first_msg = _("You're the first one to have mapped the entire world!") +cons_msg = _("You have mapped the entire world!") [achievement_map_known_20p] name = _("Map Known 20 pct") @@ -700,8 +700,8 @@ name = _("Land Ahoy") type = "Land_Ahoy" value = 2 -first_msg = _("As the first people in history, your people see foreign continent!") -cons_msg = _("You see foreign island!") +first_msg = _("As the first people in history, your people sight a foreign shore!") +cons_msg = _("You sight your first foreign shore!") ; ; Trade settings Modified: trunk/data/nation/animals.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/nation/animals.ruleset?rev=30899&r1=30898&r2=30899&view=diff ============================================================================== --- trunk/data/nation/animals.ruleset (original) +++ trunk/data/nation/animals.ruleset Tue Dec 8 23:00:53 2015 @@ -6,7 +6,7 @@ plural=_("?plural:Animals") groups="Core" legend=_("Before civilization claimed the lands, ancient man had to \ -survive the wilderness with all kind of dangerous animals.") +survive the wilderness with all kinds of dangerous animals.") leaders = { "name", "sex" Modified: trunk/server/diplomats.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/diplomats.c?rev=30899&r1=30898&r2=30899&view=diff ============================================================================== --- trunk/server/diplomats.c (original) +++ trunk/server/diplomats.c Tue Dec 8 23:00:53 2015 @@ -1273,7 +1273,7 @@ _("Your %s got you %d gold from %s."), unit_link(act_unit), gold_give, tgt_city_link); notify_player(tgt_player, tgt_tile, E_ENEMY_SPY_STEAL_GOLD, ftc_server, - _("The %s is suspect of taking %d gold from %s."), + _("The %s are suspected of taking %d gold from %s."), nation_plural_for_player(act_player), gold_take, tgt_city_link); @@ -1353,7 +1353,7 @@ notify_player(tgt_player, tgt_tile, E_ENEMY_DIPLOMAT_FAILED, ftc_server, _("You caught %s %s attempting to steal" - " parts of you world map in %s!"), + " parts of your world map in %s!"), nation_adjective_for_player(act_player), unit_tile_link(act_unit), tgt_city_link); @@ -1380,7 +1380,7 @@ nation_adjective_for_player(tgt_player), tgt_city_link); notify_player(tgt_player, tgt_tile, E_ENEMY_SPY_STEAL_MAP, ftc_server, - _("The %s are suspect of stealing" + _("The %s are suspected of stealing" " parts of your world map in %s."), nation_plural_for_player(act_player), tgt_city_link); @@ -1473,7 +1473,7 @@ unit_link(act_unit), tgt_city_link); notify_player(tgt_player, tgt_tile, E_ENEMY_SPY_NUKE, ftc_server, - _("The %s are suspect of hiding a nuke in %s."), + _("The %s are suspected of hiding a nuke in %s."), nation_plural_for_player(act_player), tgt_city_link); Modified: trunk/server/settings.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=30899&r1=30898&r2=30899&view=diff ============================================================================== --- trunk/server/settings.c (original) +++ trunk/server/settings.c Tue Dec 8 23:00:53 2015 @@ -2156,7 +2156,7 @@ GEN_BITWISE("victories", game.info.victory_conditions, SSET_RULES_FLEXIBLE, SSET_INTERNAL, SSET_VITAL, SSET_TO_CLIENT, - N_("What kind of victories are possible"), + N_("What kinds of victories are possible"), /* TRANS: The strings between double quotes are also translated * separately (they must match!). The strings between single * quotes are setting names and shouldn't be translated. The Modified: trunk/server/srv_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=30899&r1=30898&r2=30899&view=diff ============================================================================== --- trunk/server/srv_main.c (original) +++ trunk/server/srv_main.c Tue Dec 8 23:00:53 2015 @@ -3259,7 +3259,8 @@ event_cache_clear(); } - log_normal(_("Now accepting new client connections on port %d"), srvarg.port); + log_normal(_("Now accepting new client connections on port %d."), + srvarg.port); /* Remain in S_S_INITIAL until all players are ready. */ while (S_E_FORCE_END_OF_SNIFF != server_sniff_all_input()) { /* When force_end_of_sniff is used in pregame, it means that the server _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits