[Freeciv-commits] r28552 - in /trunk/translations: freeciv/POTFILES.in nations/POTFILES.skip ruledit/POTFILES.skip
Author: sveinung Date: Sun Mar 15 01:02:38 2015 New Revision: 28552 URL: http://svn.gna.org/viewcvs/freeciv?rev=28552view=rev Log: Add server/actiontools.[c|h] to POTFILES.[in|skip] See bug #23381 Modified: trunk/translations/freeciv/POTFILES.in trunk/translations/nations/POTFILES.skip trunk/translations/ruledit/POTFILES.skip Modified: trunk/translations/freeciv/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/POTFILES.in?rev=28552r1=28551r2=28552view=diff == --- trunk/translations/freeciv/POTFILES.in (original) +++ trunk/translations/freeciv/POTFILES.in Sun Mar 15 01:02:38 2015 @@ -376,6 +376,7 @@ tools/mpgui_gtk3.c tools/mpgui_qt.cpp tools/mpgui_qt_worker.cpp +server/actiontools.c server/aiiface.c server/auth.c server/barbarian.c Modified: trunk/translations/nations/POTFILES.skip URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/nations/POTFILES.skip?rev=28552r1=28551r2=28552view=diff == --- trunk/translations/nations/POTFILES.skip(original) +++ trunk/translations/nations/POTFILES.skipSun Mar 15 01:02:38 2015 @@ -246,6 +246,7 @@ tools/ruledit/tab_tech.cpp tools/ruledit/tab_unit.cpp tools/ruledit/validity.c +server/actiontools.c server/aiiface.c server/auth.c server/barbarian.c Modified: trunk/translations/ruledit/POTFILES.skip URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/ruledit/POTFILES.skip?rev=28552r1=28551r2=28552view=diff == --- trunk/translations/ruledit/POTFILES.skip(original) +++ trunk/translations/ruledit/POTFILES.skipSun Mar 15 01:02:38 2015 @@ -236,6 +236,7 @@ tools/mpgui_gtk3.c tools/mpgui_qt.cpp tools/mpgui_qt_worker.cpp +server/actiontools.c server/aiiface.c server/auth.c server/barbarian.c ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28553 - in /branches/S2_6/translations: freeciv/POTFILES.in nations/POTFILES.skip ruledit/POTFILES.skip
Author: sveinung Date: Sun Mar 15 01:03:06 2015 New Revision: 28553 URL: http://svn.gna.org/viewcvs/freeciv?rev=28553view=rev Log: Add server/actiontools.[c|h] to POTFILES.[in|skip] See bug #23381 Modified: branches/S2_6/translations/freeciv/POTFILES.in branches/S2_6/translations/nations/POTFILES.skip branches/S2_6/translations/ruledit/POTFILES.skip Modified: branches/S2_6/translations/freeciv/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/POTFILES.in?rev=28553r1=28552r2=28553view=diff == --- branches/S2_6/translations/freeciv/POTFILES.in (original) +++ branches/S2_6/translations/freeciv/POTFILES.in Sun Mar 15 01:03:06 2015 @@ -357,6 +357,7 @@ tools/mpgui_gtk3.c tools/mpgui_qt.cpp tools/mpgui_qt_worker.cpp +server/actiontools.c server/aiiface.c server/auth.c server/barbarian.c Modified: branches/S2_6/translations/nations/POTFILES.skip URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/POTFILES.skip?rev=28553r1=28552r2=28553view=diff == --- branches/S2_6/translations/nations/POTFILES.skip(original) +++ branches/S2_6/translations/nations/POTFILES.skipSun Mar 15 01:03:06 2015 @@ -246,6 +246,7 @@ tools/ruledit/tab_tech.cpp tools/ruledit/tab_unit.cpp tools/ruledit/validity.c +server/actiontools.c server/aiiface.c server/auth.c server/barbarian.c Modified: branches/S2_6/translations/ruledit/POTFILES.skip URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/POTFILES.skip?rev=28553r1=28552r2=28553view=diff == --- branches/S2_6/translations/ruledit/POTFILES.skip(original) +++ branches/S2_6/translations/ruledit/POTFILES.skipSun Mar 15 01:03:06 2015 @@ -236,6 +236,7 @@ tools/mpgui_gtk3.c tools/mpgui_qt.cpp tools/mpgui_qt_worker.cpp +server/actiontools.c server/aiiface.c server/auth.c server/barbarian.c ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28554 - /branches/S2_5/client/gui-sdl/diplomat_dialog.c
Author: sveinung
Date: Sun Mar 15 01:18:13 2015
New Revision: 28554
URL: http://svn.gna.org/viewcvs/freeciv?rev=28554view=rev
Log:
SDL clients: close the correct dialog after selecting city sabotage target.
See bug #23296
Modified:
branches/S2_5/client/gui-sdl/diplomat_dialog.c
Modified: branches/S2_5/client/gui-sdl/diplomat_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/diplomat_dialog.c?rev=28554r1=28553r2=28554view=diff
==
--- branches/S2_5/client/gui-sdl/diplomat_dialog.c (original)
+++ branches/S2_5/client/gui-sdl/diplomat_dialog.c Sun Mar 15 01:18:13 2015
@@ -825,7 +825,7 @@
int diplomat_target_id = pWidget-data.cont-id0;
int diplomat_id = pWidget-data.cont-id1;
-popdown_advanced_terrain_dialog();
+popdown_diplomat_dialog();
if(sabotage_improvement == 1000)
{
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28523 - /branches/S2_5/doc/FAQ
Author: jtn Date: Sat Mar 14 13:51:06 2015 New Revision: 28523 URL: http://svn.gna.org/viewcvs/freeciv?rev=28523view=rev Log: Update doc/FAQ manually from wiki. Modified: branches/S2_5/doc/FAQ Modified: branches/S2_5/doc/FAQ URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/FAQ?rev=28523r1=28522r2=28523view=diff == --- branches/S2_5/doc/FAQ (original) +++ branches/S2_5/doc/FAQ Sat Mar 14 13:51:06 2015 @@ -349,8 +349,9 @@ to get help on a particular setting, or /set setting value - to change a setting to a particular value (see article on set). After - the game begins you may still change some settings (but not others). + to change a setting to a particular value (see article on server + options). After the game begins you may still change some settings (but + not others). World maps can be created using the built-in map editor. It is also possible to edit running games: Just enable Editing Mode from the Edit @@ -648,15 +649,17 @@ To start your local server, run freeciv-server. Then type start at the server prompt to begin! mike@localhost:/usr/local/bin$ ./freeciv-server -This is the server for Freeciv version 2.2.3 +This is the server for Freeciv version 2.5.0 You can learn a lot about Freeciv at http://www.freeciv.org/ 2: Loading rulesets -2: AI*1 has been added as Easy level AI-controlled player. -2: AI*2 has been added as Easy level AI-controlled player. -2: AI*3 has been added as Easy level AI-controlled player. -2: AI*4 has been added as Easy level AI-controlled player. -2: AI*5 has been added as Easy level AI-controlled player. +2: AI*1 has been added as Easy level AI-controlled player (classic). +2: AI*2 has been added as Easy level AI-controlled player (classic). +2: AI*3 has been added as Easy level AI-controlled player (classic). +2: AI*4 has been added as Easy level AI-controlled player (classic). +2: AI*5 has been added as Easy level AI-controlled player (classic). 2: Now accepting new client connections. + +For introductory help, type 'help'. start Starting game. @@ -956,6 +959,9 @@ client you use. The recommended client is the Gtk client. This has the most features. + + The Qt client is a newer client using the Qt toolkit. It has a more + immersive main map screen, but still lacks some features. The SDL client provides a more immersive experience, but lags behind somewhat in features. ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28524 - in /branches/S2_5: NEWS NEWS-2.5
Author: jtn Date: Sat Mar 14 13:51:09 2015 New Revision: 28524 URL: http://svn.gna.org/viewcvs/freeciv?rev=28524view=rev Log: Refresh NEWS and NEWS-2.5 files for 2.5.0, from wiki. Modified: branches/S2_5/NEWS branches/S2_5/NEWS-2.5 Modified: branches/S2_5/NEWS URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/NEWS?rev=28524r1=28523r2=28524view=diff == --- branches/S2_5/NEWS (original) +++ branches/S2_5/NEWS Sat Mar 14 13:51:09 2015 @@ -402,34 +402,34 @@ * Failure to load a ruleset no longer causes the server to quit; it now reverts to the previously loaded ruleset, or failing that the default ruleset. GNAPATCH#1449 + * On Windows, the server no longer sets the socket option + SO_REUSEADDR on its listening socket. This may fix some issues with + clients connecting to the wrong server. GNA#21583 + * The default database backend for authentication has changed from + MySQL to SQLite. GNA#19909 * There's no longer support for attempting to save games in formats compatible with previous major releases of Freeciv. The 'saveversion' server option has been removed. GNAPATCH#3188 GNAPATCH#3026 - * On Windows, the server no longer sets the socket option - SO_REUSEADDR on its listening socket. This may fix some issues with - clients connecting to the wrong server. GNA#21583 - * The default database backend has changed from MySQL to SQLite. - GNA#19909 AI There have been some improvements to the standard AI's behavior: * Defense - + The AI should more correctly account for travel time when -assessing danger to cities from enemy units; previously it -treated them as its own, which could be wrong for ZoC, -restrictinfra etc. GNAPATCH#3729 + Autosettlers are smarter about spotting danger: GNAPATCH#3854 o Sea and air units are now considered threats, not just land units. o Military units which can't attack are no longer considered threats. + + Cities needing defense are less prone to building walls before +units. GNAPATCH#4798 + The AI now considers non-land units that can conquer cities (such as Helicopters) a threat to continents it controls. GNA#5 - + Cities needing defense are less prone to building walls before -units. GNAPATCH#4798 + + The AI should more correctly account for travel time when +assessing danger to cities from enemy units; previously it +treated them as its own, which could be wrong for ZoC, +restrictinfra etc. GNAPATCH#3729 + (as of RC1) The city the AI has nominated to build wonders is now permitted to build defensive units instead if necessary. GNAPATCH#5588 @@ -531,8 +531,6 @@ Tilesets / Art - * The icons for entertainers, scientists, and tax collectors now have - both male and female versions. GNAPATCH#4506 * The activity icons shown near units building roads and bases in Cimpletoon, Amplio2, and Trident are now small versions of the extras themselves. GNAPATCH#4059 GNA#20032 GNAPATCH#5856 @@ -541,6 +539,8 @@ GNAPATCH#5856 GNAPATCH#5877 * Improve colors for global warming / nuclear winter progress indicators. GNAPATCH#4827 + * The icons for entertainers, scientists, and tax collectors now have + both male and female versions. GNAPATCH#4506 * Made a few specialist icons available for custom rulesets (worker, farmer, merchant) for use by modpacks. These are not used in the supplied rulesets. GNAPATCH#4467 @@ -552,7 +552,7 @@ * Updated French, Polish, Catalan, Russian, Korean, Scottish Gaelic, British English, traditional Chinese, Spanish, German, Japanese, - and Finnish localizations. + Finnish, and Irish localizations. Build/portability Modified: branches/S2_5/NEWS-2.5 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/NEWS-2.5?rev=28524r1=28523r2=28524view=diff == --- branches/S2_5/NEWS-2.5 (original) +++ branches/S2_5/NEWS-2.5 Sat Mar 14 13:51:09 2015 @@ -1,10 +1,22 @@ - -Welcome to Freeciv 2.5.0-RC2 - + +Welcome to Freeciv 2.5.0 + The changes in the 2.5.x series are summarised below. For changes prior to 2.5, see NEWS. For more detailed changes, see the ChangeLog file. + + +CHANGES FROM 2.5.0-RC2 TO 2.5.0 +--- + + For those who've been trying the betas, these are the changes since the + last release candidate, 2.5.0-RC2: + * Added graphics for
[Freeciv-commits] r28526 - /branches/S2_5/ChangeLog
Author: jtn Date: Sat Mar 14 14:00:53 2015 New Revision: 28526 URL: http://svn.gna.org/viewcvs/freeciv?rev=28526view=rev Log: Update ChangeLog as of S2_5 r28525. Modified: branches/S2_5/ChangeLog Modified: branches/S2_5/ChangeLog URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ChangeLog?rev=28526r1=28525r2=28526view=diff == --- branches/S2_5/ChangeLog (original) +++ branches/S2_5/ChangeLog Sat Mar 14 14:00:53 2015 @@ -1,3 +1,109 @@ + +r28525 | jtn | 2015-03-14 12:51:12 + (Sat, 14 Mar 2015) | 1 line +Changed paths: + M /branches/S2_5/fc_version + +Bump version number to '2.5.0+' for final release. + +r28524 | jtn | 2015-03-14 12:51:09 + (Sat, 14 Mar 2015) | 1 line +Changed paths: + M /branches/S2_5/NEWS + M /branches/S2_5/NEWS-2.5 + +Refresh NEWS and NEWS-2.5 files for 2.5.0, from wiki. + +r28523 | jtn | 2015-03-14 12:51:06 + (Sat, 14 Mar 2015) | 1 line +Changed paths: + M /branches/S2_5/doc/FAQ + +Update doc/FAQ manually from wiki. + +r28522 | jtn | 2015-03-14 12:12:41 + (Sat, 14 Mar 2015) | 3 lines +Changed paths: + M /branches/S2_5/translations/freeciv/es.po + M /branches/S2_5/translations/freeciv/ga.po + M /branches/S2_5/translations/freeciv/ja.po + M /branches/S2_5/translations/nations/ga.po + M /branches/S2_5/translations/nations/ja.po + +Results of running make update-po +in translations/freeciv/ and translations/nations/ + + +r28520 | cazfi | 2015-03-14 05:21:25 + (Sat, 14 Mar 2015) | 4 lines +Changed paths: + M /branches/S2_5/data/wonders/Makefile.am + +Distribute and install internet.png + +See bug #23379 + + +r28515 | jtn | 2015-03-14 00:38:00 + (Sat, 14 Mar 2015) | 2 lines +Changed paths: + M /branches/S2_5/translations/freeciv/es.po + +Updated Spanish translation by Jordi Negrevernis i Font. +freeciv: 98.6%: 6084 translated, 43 fuzzy, 44 untranslated. + +r28509 | jtn | 2015-03-13 10:13:15 + (Fri, 13 Mar 2015) | 5 lines +Changed paths: + M /branches/S2_5/translations/freeciv/ga.po + M /branches/S2_5/translations/nations/ga.po + +Updated Irish translation by Kevin Scannell (kscanne@gna) +merged from S2_4 r28485 using the procedure of patch #4650. +Stats on S2_5: +freeciv: 46%: 2851 translated, 345 fuzzy, 2975 untranslated. +nations: 59%: 1089 translated, 28 fuzzy, 727 untranslated. + +r28480 | jtn | 2015-03-10 08:53:09 + (Tue, 10 Mar 2015) | 3 lines +Changed paths: + A /branches/S2_5/data/graphics/wonders/internet.xcf + M /branches/S2_5/data/misc/buildings.png + M /branches/S2_5/data/misc/buildings.spec + M /branches/S2_5/data/misc/wonders-large.spec + A /branches/S2_5/data/wonders/internet.png + +Graphic for civ2civ3 Internet wonder. + +See gna patch #5806. + +r28475 | cazfi | 2015-03-09 19:39:10 + (Mon, 09 Mar 2015) | 6 lines +Changed paths: + M /branches/S2_5/doc/HACKING + +HACKING: Use in initial network protocol example an packet type that is actually used in initial +protocol. Document what's the logical difference between initial and main protocol though their +content is currently identical. + +See patch #5908 + + +r28465 | jtn | 2015-03-08 08:33:57 + (Sun, 08 Mar 2015) | 5 lines +Changed paths: + M /branches/S2_5/translations/freeciv/ja.po + M /branches/S2_5/translations/nations/ja.po + +Updated Japanese translation by an anonymous contributor. +freeciv: 93%: 5748 translated, 75 fuzzy, 348 untranslated. +nations: 94%: 1731 translated, 12 fuzzy, 101 untranslated. + +See gna bug #23343. + +r28442 | jtn | 2015-03-07 14:00:55 + (Sat, 07 Mar 2015) | 2 lines +Changed paths: + M /branches/S2_5/translations/freeciv/es.po + +Updated Spanish translation by Jordi Negrevernis i Font. +freeciv: 91%: 5599 translated, 357 fuzzy, 215 untranslated. + +r28439 | jtn | 2015-03-07 11:17:56 + (Sat, 07 Mar 2015) | 2 lines +Changed paths: + M /branches/S2_5/ChangeLog + +Update ChangeLog as of S2_5 r28438. + r28438 | jtn | 2015-03-07 11:11:29 + (Sat, 07 Mar 2015) | 1 line Changed paths:
[Freeciv-commits] r28528 - /tags/R2_5_0/fc_version
Author: jtn Date: Sat Mar 14 14:09:24 2015 New Revision: 28528 URL: http://svn.gna.org/viewcvs/freeciv?rev=28528view=rev Log: Strip '+' from version string for release. Modified: tags/R2_5_0/fc_version Modified: tags/R2_5_0/fc_version URL: http://svn.gna.org/viewcvs/freeciv/tags/R2_5_0/fc_version?rev=28528r1=28527r2=28528view=diff == --- tags/R2_5_0/fc_version (original) +++ tags/R2_5_0/fc_version Sat Mar 14 14:09:24 2015 @@ -7,7 +7,7 @@ MAJOR_VERSION=2 MINOR_VERSION=5 PATCH_VERSION=0 -VERSION_LABEL=+ +VERSION_LABEL= # 1) Development until MAJOR and MINOR version numbers are #set to new release series: ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28529 - /branches/S2_4/po/ /branches/S2_5/translations/freeciv/ /branches/S2_5/translations/nations/ /branches/S2_6/transla...
Author: igx31 Date: Sat Mar 14 14:46:51 2015 New Revision: 28529 URL: http://svn.gna.org/viewcvs/freeciv?rev=28529view=rev Log: Updated French translations Modified: branches/S2_4/po/fr.po branches/S2_5/translations/freeciv/fr.po branches/S2_5/translations/nations/fr.po branches/S2_6/translations/freeciv/fr.po trunk/translations/freeciv/fr.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_4/po/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/fr.po?rev=28529r1=28528r2=28529view=diff Modified: branches/S2_5/translations/freeciv/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/fr.po?rev=28529r1=28528r2=28529view=diff Modified: branches/S2_5/translations/nations/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/fr.po?rev=28529r1=28528r2=28529view=diff Modified: branches/S2_6/translations/freeciv/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/fr.po?rev=28529r1=28528r2=28529view=diff Modified: trunk/translations/freeciv/fr.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/fr.po?rev=28529r1=28528r2=28529view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28522 - in /branches/S2_5/translations: freeciv/es.po freeciv/ga.po freeciv/ja.po nations/ga.po nations/ja.po
Author: jtn Date: Sat Mar 14 13:12:41 2015 New Revision: 28522 URL: http://svn.gna.org/viewcvs/freeciv?rev=28522view=rev Log: Results of running make update-po in translations/freeciv/ and translations/nations/ Modified: branches/S2_5/translations/freeciv/es.po branches/S2_5/translations/freeciv/ga.po branches/S2_5/translations/freeciv/ja.po branches/S2_5/translations/nations/ga.po branches/S2_5/translations/nations/ja.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/translations/freeciv/es.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/es.po?rev=28522r1=28521r2=28522view=diff Modified: branches/S2_5/translations/freeciv/ga.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ga.po?rev=28522r1=28521r2=28522view=diff Modified: branches/S2_5/translations/freeciv/ja.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ja.po?rev=28522r1=28521r2=28522view=diff Modified: branches/S2_5/translations/nations/ga.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/ga.po?rev=28522r1=28521r2=28522view=diff Modified: branches/S2_5/translations/nations/ja.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/ja.po?rev=28522r1=28521r2=28522view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28525 - /branches/S2_5/fc_version
Author: jtn Date: Sat Mar 14 13:51:12 2015 New Revision: 28525 URL: http://svn.gna.org/viewcvs/freeciv?rev=28525view=rev Log: Bump version number to '2.5.0+' for final release. Modified: branches/S2_5/fc_version Modified: branches/S2_5/fc_version URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/fc_version?rev=28525r1=28524r2=28525view=diff == --- branches/S2_5/fc_version(original) +++ branches/S2_5/fc_versionSat Mar 14 13:51:12 2015 @@ -7,7 +7,7 @@ MAJOR_VERSION=2 MINOR_VERSION=5 PATCH_VERSION=0 -VERSION_LABEL=-RC2+ +VERSION_LABEL=+ # 1) Development until MAJOR and MINOR version numbers are #set to new release series: ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28527 - /tags/R2_5_0/
Author: jtn Date: Sat Mar 14 14:03:03 2015 New Revision: 28527 URL: http://svn.gna.org/viewcvs/freeciv?rev=28527view=rev Log: Tag 2.5.0 final release. Added: tags/R2_5_0/ - copied from r28526, branches/S2_5/ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28538 - /branches/S2_6/client/helpdata.c
Author: jtn
Date: Sat Mar 14 17:55:06 2015
New Revision: 28538
URL: http://svn.gna.org/viewcvs/freeciv?rev=28538view=rev
Log:
Fix pluralisation issue in technology help.
Reported by Konstantin Vedeneev (konved@gna).
See gna bug #2.
Modified:
branches/S2_6/client/helpdata.c
Modified: branches/S2_6/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/helpdata.c?rev=28538r1=28537r2=28538view=diff
==
--- branches/S2_6/client/helpdata.c (original)
+++ branches/S2_6/client/helpdata.c Sat Mar 14 17:55:06 2015
@@ -4130,22 +4130,34 @@
if (research_invention_state(presearch, i) != TECH_KNOWN) {
if (research_invention_state(presearch, i) == TECH_PREREQS_KNOWN) {
-cat_snprintf(buf, bufsz,
- _(Starting now, researching %s would need %d bulbs.),
- advance_name_translation(vap),
- research_total_bulbs_required(presearch, i, FALSE));
+int bulbs = research_total_bulbs_required(presearch, i, FALSE);
+
+cat_snprintf(buf, bufsz,
+ PL_(Starting now, researching %s would need %d bulb.,
+ Starting now, researching %s would need %d bulbs.,
+ bulbs),
+ advance_name_translation(vap), bulbs);
} else if (research_invention_reachable(presearch, i)) {
-cat_snprintf(buf, bufsz,
+/* Split string into two to allow localization of two pluralizations.
*/
+char buf2[MAX_LEN_MSG];
+int bulbs = research_goal_bulbs_required(presearch, i);
+
+fc_snprintf(buf2, ARRAY_SIZE(buf2),
+/* TRANS: appended to another sentence. Preserve the
+ * leading space. */
+PL_( The whole project will require %d bulb to complete.,
+ The whole project will require %d bulbs to
complete.,
+bulbs),
+bulbs);
+cat_snprintf(buf, bufsz,
+ /* TRANS: last %s is a sentence pluralized separately. */
PL_(To reach %s you need to obtain %d other
- technology first. The whole project
- will require %d bulbs to complete.,
+ technology first.%s,
To reach %s you need to obtain %d other
- technologies first. The whole project
- will require %d bulbs to complete.,
+ technologies first.%s,
research_goal_unknown_techs(presearch, i) - 1),
advance_name_translation(vap),
- research_goal_unknown_techs(presearch, i) - 1,
- research_goal_bulbs_required(presearch, i));
+ research_goal_unknown_techs(presearch, i) - 1, buf2);
} else {
CATLSTR(buf, bufsz,
_(You cannot research this technology.));
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28539 - in /branches/S2_6/data: civ1/ civ2/ classic/ experimental/ multiplayer/
Author: jtn Date: Sat Mar 14 17:55:10 2015 New Revision: 28539 URL: http://svn.gna.org/viewcvs/freeciv?rev=28539view=rev Log: In help for terrain-altering units, rework handwritten text to remove redundancy with autogenerated help. Reported by Marko Lindqvist (cazfi@gna). See gna patch #5858. Modified: branches/S2_6/data/civ1/units.ruleset branches/S2_6/data/civ2/units.ruleset branches/S2_6/data/classic/units.ruleset branches/S2_6/data/experimental/units.ruleset branches/S2_6/data/multiplayer/units.ruleset Modified: branches/S2_6/data/civ1/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/units.ruleset?rev=28539r1=28538r2=28539view=diff == --- branches/S2_6/data/civ1/units.ruleset (original) +++ branches/S2_6/data/civ1/units.ruleset Sat Mar 14 17:55:10 2015 @@ -286,14 +286,14 @@ Settlers are one of the key units in the game, as they are your main \ means of founding new cities, and can also improve terrain.\ ), _(\ -On terrain which supports it, they may build an irrigation system to \ +Building an irrigation system on a suitable tile causes it to \ produce some extra food each turn. This requires a nearby source of \ water: an ocean or river tile, or another tile with an \ irrigation system, must share an edge (not just a corner) with the \ target tile. Once irrigated, land remains so even if the water source \ is removed.\ ), _(\ -Settlers can build mines on some types of terrain, which increases the \ +Building a mine on suitable terrain increases the \ number of production points produced by that tile. However, it is not \ possible to have an irrigation system and a mine on the same tile.\ ), _(\ @@ -302,8 +302,6 @@ to another type; this is usually more expensive. For instance, Swamp \ may be \irrigated\ to yield Grassland. (Terrain conversion with \ the \irrigate\ order does not require a water source.)\ -), _(\ -Settlers can also build roads, railroads, or fortresses.\ ), _(\ See the help on Terrain and Terrain Alterations for the effects of \ these actions.\ Modified: branches/S2_6/data/civ2/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/units.ruleset?rev=28539r1=28538r2=28539view=diff == --- branches/S2_6/data/civ2/units.ruleset (original) +++ branches/S2_6/data/civ2/units.ruleset Sat Mar 14 17:55:10 2015 @@ -289,7 +289,7 @@ Settlers are one of the key units in the game, as they are your main \ means of founding new cities, and can also improve terrain.\ ), _(\ -On terrain which supports it, they may build an irrigation system to \ +Building an irrigation system on a suitable tile causes it to \ produce some extra food each turn. This requires a nearby source of \ water: an ocean or river tile, or another tile with an \ irrigation system, must share an edge (not just a corner) with the \ @@ -298,7 +298,7 @@ upgraded to Farmland by irrigating them a second time; this provides \ more food to a city if it has a Supermarket.\ ), _(\ -Settlers can build mines on some types of terrain, which increases the \ +Building a mine on suitable terrain increases the \ number of production points produced by that tile. However, it is not \ possible to have an irrigation system and a mine on the same tile.\ ), _(\ @@ -307,8 +307,6 @@ to another type; this is usually more expensive. For instance, Swamp \ may be \irrigated\ to yield Grassland. (Terrain conversion with \ the \irrigate\ order does not require a water source.)\ -), _(\ -Settlers can also build roads, railroads, fortresses, or airbases.\ ), _(\ See the help on Terrain and Terrain Alterations for the effects of \ these actions.\ Modified: branches/S2_6/data/classic/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/units.ruleset?rev=28539r1=28538r2=28539view=diff == --- branches/S2_6/data/classic/units.ruleset(original) +++ branches/S2_6/data/classic/units.rulesetSat Mar 14 17:55:10 2015 @@ -409,8 +409,8 @@ Settlers are one of the key units in the game, as they are your main\ means of founding new cities.\ ), _(\ -Settlers can also perform the same terrain alterations as Workers,\ - except for building airbases or buoys.\ +Settlers can also perform some of the same terrain alterations as\ + Workers.\ ), _(\ Upkeep for Settlers is in food as well as production, and a Settler\ can die if its supporting city runs out of food. Settlers in a\ @@ -453,7 +453,7 @@ helptext = _(\ Workers have the ability to improve terrain tiles.\ ), _(\ -On terrain which supports it, they may build an irrigation system to \ +Building an irrigation system on a suitable tile causes it to \ produce some extra food each turn. This requires a nearby source of
[Freeciv-commits] r28536 - in /branches/S2_6: client/helpdata.c data/helpdata.txt
Author: jtn
Date: Sat Mar 14 17:55:00 2015
New Revision: 28536
URL: http://svn.gna.org/viewcvs/freeciv?rev=28536view=rev
Log:
Document that bombardment affects all units on a tile.
See gna patch #5822.
Modified:
branches/S2_6/client/helpdata.c
branches/S2_6/data/helpdata.txt
Modified: branches/S2_6/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/helpdata.c?rev=28536r1=28535r2=28536view=diff
==
--- branches/S2_6/client/helpdata.c (original)
+++ branches/S2_6/client/helpdata.c Sat Mar 14 17:55:00 2015
@@ -3863,10 +3863,13 @@
_(* Gets double firepower when attacking cities.\n));
}
if (utype_has_flag(utype, UTYF_BOMBARDER)) {
+/* FIXME: also they only happen against land units. We leave the
+ * ruleset author to document this. */
cat_snprintf(buf, bufsz,
-_(* Does bombard attacks (%d per turn). These attacks will
- only damage (never kill) the defender, but have no risk
- for the attacker.\n),
+_(* Does bombard attacks (%d per turn). These attacks will
+ only damage (never kill) defenders, but damage all
+defenders on a tile, and have no risk for the
+attacker.\n),
utype-bombard_rate);
}
if (utype_has_flag(utype, UTYF_IGTER)) {
Modified: branches/S2_6/data/helpdata.txt
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/helpdata.txt?rev=28536r1=28535r2=28536view=diff
==
--- branches/S2_6/data/helpdata.txt (original)
+++ branches/S2_6/data/helpdata.txt Sat Mar 14 17:55:00 2015
@@ -1103,9 +1103,12 @@
text = _(\
In standard combat, when one unit attacks another unit, either the \
attacker will be destroyed, or the defender will be destroyed -- \
-never both (unless the attacker was a missile). (Bombardment, in \
-rulesets which have it, works rather differently: the attacker \
-sustains no damage, and the defender cannot be completely destroyed.)\
+never both (unless the attacker was a missile).\
+), _(\
+(In some rulesets, certain units sometimes use a different style of \
+attack called 'bombardment', which works rather differently: the \
+attacker sustains no damage, and damages every unit in the target \
+tile or city, but defenders are never completely destroyed.)\
), _(\
The outcome of combat depends on several factors, including chance.\
), _(\
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28537 - in /branches/S2_6/client: gui-sdl/mapview.c gui-sdl2/mapview.c text.c
Author: jtn
Date: Sat Mar 14 17:55:03 2015
New Revision: 28537
URL: http://svn.gna.org/viewcvs/freeciv?rev=28537view=rev
Log:
Show armistice turn count as well as ceasefire turn count in terrain
info popups.
See gna bug #23303.
Modified:
branches/S2_6/client/gui-sdl/mapview.c
branches/S2_6/client/gui-sdl2/mapview.c
branches/S2_6/client/text.c
Modified: branches/S2_6/client/gui-sdl/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/mapview.c?rev=28537r1=28536r2=28537view=diff
==
--- branches/S2_6/client/gui-sdl/mapview.c (original)
+++ branches/S2_6/client/gui-sdl/mapview.c Sat Mar 14 17:55:03 2015
@@ -571,8 +571,8 @@
if (BORDERS_DISABLED != game.info.borders !pCity) {
const char *diplo_nation_plural_adjectives[DS_LAST] =
-{Q_(?nation:Neutral), Q_(?nation:Hostile),
-/* unused, DS_CEASEFIRE*/,
+ { /* unused, DS_ARMISTICE */, Q_(?nation:Hostile),
+ /* unused, DS_CEASEFIRE */,
Q_(?nation:Peaceful), Q_(?nation:Friendly),
Q_(?nation:Mysterious)};
if (tile_owner(pTile) == client.conn.playing) {
@@ -582,12 +582,18 @@
struct player_diplstate *ds
= player_diplstate_get(client.conn.playing,
tile_owner(pTile));
-if (DS_CEASEFIRE == ds-type){
+if (DS_CEASEFIRE == ds-type) {
int turns = ds-turns_left;
- cat_snprintf(buffer, sizeof(buffer),
- PL_(\n%s territory (%d turn ceasefire),
- \n%s territory (%d turn ceasefire), turns),
- nation_adjective_for_player(tile_owner(pTile)),
turns);
+ cat_snprintf(buffer, sizeof(buffer),
+PL_(\n%s territory (%d turn ceasefire),
+\n%s territory (%d turn ceasefire), turns),
+nation_adjective_for_player(tile_owner(pTile)), turns);
+} else if (DS_ARMISTICE == ds-type) {
+ int turns = ds-turns_left;
+ cat_snprintf(buffer, sizeof(buffer),
+PL_(\n%s territory (%d turn armistice),
+\n%s territory (%d turn armistice), turns),
+nation_adjective_for_player(tile_owner(pTile)), turns);
} else {
cat_snprintf(buffer, sizeof(buffer), _(\nTerritory of the
%s %s),
diplo_nation_plural_adjectives[ds-type],
@@ -605,8 +611,8 @@
struct player *pOwner = city_owner(pCity);
/*bool barrack = FALSE, airport = FALSE, port = FALSE;*/
const char *diplo_city_adjectives[DS_LAST] =
- {Q_(?city:Neutral), Q_(?city:Hostile),
- /*unused, DS_CEASEFIRE */, Q_(?city:Peaceful),
+ {Q_(?city:Neutral), Q_(?city:Hostile),
+ Q_(?city:Neutral), Q_(?city:Peaceful),
Q_(?city:Friendly), Q_(?city:Mysterious)};
cat_snprintf(buffer, sizeof(buffer),
Modified: branches/S2_6/client/gui-sdl2/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/mapview.c?rev=28537r1=28536r2=28537view=diff
==
--- branches/S2_6/client/gui-sdl2/mapview.c (original)
+++ branches/S2_6/client/gui-sdl2/mapview.c Sat Mar 14 17:55:03 2015
@@ -582,8 +582,8 @@
if (BORDERS_DISABLED != game.info.borders !pCity) {
const char *diplo_nation_plural_adjectives[DS_LAST] =
- {Q_(?nation:Neutral), Q_(?nation:Hostile),
-/* unused, DS_CEASEFIRE*/,
+ { /* unused, DS_ARMISTICE */, Q_(?nation:Hostile),
+/* unused, DS_CEASEFIRE */,
Q_(?nation:Peaceful), Q_(?nation:Friendly),
Q_(?nation:Mysterious)};
@@ -595,13 +595,22 @@
= player_diplstate_get(client.conn.playing,
tile_owner(pTile));
-if (DS_CEASEFIRE == ds-type){
+if (DS_CEASEFIRE == ds-type) {
int turns = ds-turns_left;
cat_snprintf(buffer, sizeof(buffer),
PL_(\n%s territory (%d turn ceasefire),
\n%s territory (%d turn ceasefire),
turns),
- nation_adjective_for_player(tile_owner(pTile)),
turns);
+ nation_adjective_for_player(tile_owner(pTile)),
+ turns);
+} else if (DS_ARMISTICE == ds-type) {
+
[Freeciv-commits] r28548 - in /branches/S2_5/data/civ2civ3: techs.ruleset units.ruleset
Author: jtn Date: Sat Mar 14 17:57:45 2015 New Revision: 28548 URL: http://svn.gna.org/viewcvs/freeciv?rev=28548view=rev Log: Mention Migrants in civ2civ3 help for nuclear fallout and Construction tech. See gna bug #23362. Modified: branches/S2_5/data/civ2civ3/techs.ruleset branches/S2_5/data/civ2civ3/units.ruleset Modified: branches/S2_5/data/civ2civ3/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/techs.ruleset?rev=28548r1=28547r2=28548view=diff == --- branches/S2_5/data/civ2civ3/techs.ruleset (original) +++ branches/S2_5/data/civ2civ3/techs.ruleset Sat Mar 14 17:57:45 2015 @@ -242,7 +242,9 @@ flags= graphic = a.construction graphic_alt = - -helptext = _(Allows Settlers, Workers and Engineers to build fortresses.) +helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to build fortresses.\ +) cost = 40 [advance_currency] Modified: branches/S2_5/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=28548r1=28547r2=28548view=diff == --- branches/S2_5/data/civ2civ3/units.ruleset (original) +++ branches/S2_5/data/civ2civ3/units.ruleset Sat Mar 14 17:57:45 2015 @@ -2117,7 +2117,7 @@ Similar to pollution and global warming, the risk of global nuclear\ winter increases with fallout. If nuclear winter occurs, terrain\ across the globe changes into desert, tundra, and ice. Settlers,\ - Workers, and Engineers can clean up nuclear fallout.\ + Migrants, Workers, and Engineers can clean up nuclear fallout.\ ), _(\ TIP 1: Nuking the ocean will not generate fallout, and is a most\ effective (but expensive!!) way of getting rid of enemy\ @@ -2125,10 +2125,10 @@ ), _(\ TIP 2: You may be involved in a situation where you've invaded an\ enemy country en masse, but the enemy cities are too strong.\ - Before using a Nuclear unit, assemble a gang of Settlers, Workers,\ - and/or Engineers next to the city and have them ready to fix\ - the fallout on the same turn it occurs! This minimizes the\ - chance of nuclear winter. Eco-friendly nukes!\ + Before using a Nuclear unit, assemble a gang of cleanup units\ + next to the city and have them ready to fix the fallout on the\ + same turn it occurs! This minimizes the chance of nuclear winter.\ + Eco-friendly nukes!\ ) [unit_diplomat] ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28542 - in /branches/S2_5: client/helpdata.c data/helpdata.txt
Author: jtn
Date: Sat Mar 14 17:57:25 2015
New Revision: 28542
URL: http://svn.gna.org/viewcvs/freeciv?rev=28542view=rev
Log:
Document that bombardment affects all units on a tile.
See gna patch #5822.
Modified:
branches/S2_5/client/helpdata.c
branches/S2_5/data/helpdata.txt
Modified: branches/S2_5/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/helpdata.c?rev=28542r1=28541r2=28542view=diff
==
--- branches/S2_5/client/helpdata.c (original)
+++ branches/S2_5/client/helpdata.c Sat Mar 14 17:57:25 2015
@@ -2744,10 +2744,13 @@
CATLSTR(buf, bufsz, _(* Ignores the effects of city walls.\n));
}
if (utype_has_flag(utype, UTYF_BOMBARDER)) {
+/* FIXME: also they only happen against land units. We leave the
+ * ruleset author to document this. */
cat_snprintf(buf, bufsz,
-_(* Does bombard attacks (%d per turn). These attacks will
- only damage (never kill) the defender, but have no risk
- for the attacker.\n),
+_(* Does bombard attacks (%d per turn). These attacks will
+ only damage (never kill) defenders, but damage all
+defenders on a tile, and have no risk for the
+attacker.\n),
utype-bombard_rate);
}
if (utype_has_flag(utype, UTYF_IGTER)) {
Modified: branches/S2_5/data/helpdata.txt
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/helpdata.txt?rev=28542r1=28541r2=28542view=diff
==
--- branches/S2_5/data/helpdata.txt (original)
+++ branches/S2_5/data/helpdata.txt Sat Mar 14 17:57:25 2015
@@ -1119,9 +1119,12 @@
text = _(\
In standard combat, when one unit attacks another unit, either the \
attacker will be destroyed, or the defender will be destroyed -- \
-never both (unless the attacker was a missile). (Bombardment, in \
-rulesets which have it, works rather differently: the attacker \
-sustains no damage, and the defender cannot be completely destroyed.)\
+never both (unless the attacker was a missile).\
+), _(\
+(In some rulesets, certain units sometimes use a different style of \
+attack called 'bombardment', which works rather differently: the \
+attacker sustains no damage, and damages every unit in the target \
+tile or city, but defenders are never completely destroyed.)\
), _(\
The outcome of combat depends on several factors, including chance.\
), _(\
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28549 - in /branches/S2_5/data: civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Sat Mar 14 17:57:48 2015 New Revision: 28549 URL: http://svn.gna.org/viewcvs/freeciv?rev=28549view=rev Log: Tech help documents which road types it enables. See gna bug #23281. Modified: branches/S2_5/data/civ1/techs.ruleset branches/S2_5/data/civ2/techs.ruleset branches/S2_5/data/civ2civ3/techs.ruleset branches/S2_5/data/classic/techs.ruleset branches/S2_5/data/experimental/techs.ruleset branches/S2_5/data/multiplayer/techs.ruleset Modified: branches/S2_5/data/civ1/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/techs.ruleset?rev=28549r1=28548r2=28549view=diff == --- branches/S2_5/data/civ1/techs.ruleset (original) +++ branches/S2_5/data/civ1/techs.ruleset Sat Mar 14 17:57:48 2015 @@ -466,7 +466,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) Modified: branches/S2_5/data/civ2/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/techs.ruleset?rev=28549r1=28548r2=28549view=diff == --- branches/S2_5/data/civ2/techs.ruleset (original) +++ branches/S2_5/data/civ2/techs.ruleset Sat Mar 14 17:57:48 2015 @@ -592,7 +592,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers and Engineers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) Modified: branches/S2_5/data/civ2civ3/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/techs.ruleset?rev=28549r1=28548r2=28549view=diff == --- branches/S2_5/data/civ2civ3/techs.ruleset (original) +++ branches/S2_5/data/civ2civ3/techs.ruleset Sat Mar 14 17:57:48 2015 @@ -675,6 +675,9 @@ graphic = a.railroad graphic_alt = - helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to upgrade roads to \ +railroads.\ +), _(\ Halves one-time revenue from new trade routes.\ ), _(\ For Despotism or Tribal governments, cancels the penalty to worked \ Modified: branches/S2_5/data/classic/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/techs.ruleset?rev=28549r1=28548r2=28549view=diff == --- branches/S2_5/data/classic/techs.ruleset(original) +++ branches/S2_5/data/classic/techs.rulesetSat Mar 14 17:57:48 2015 @@ -600,7 +600,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) Modified: branches/S2_5/data/experimental/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/techs.ruleset?rev=28549r1=28548r2=28549view=diff == --- branches/S2_5/data/experimental/techs.ruleset (original) +++ branches/S2_5/data/experimental/techs.ruleset Sat Mar 14 17:57:48 2015 @@ -660,7 +660,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) @@ -769,6 +773,9 @@ flags= graphic = a.superconductors graphic_alt = - +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade railroads with maglev.\ +) [advance_tactics] name = _(Tactics) Modified: branches/S2_5/data/multiplayer/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/techs.ruleset?rev=28549r1=28548r2=28549view=diff == --- branches/S2_5/data/multiplayer/techs.ruleset(original) +++ branches/S2_5/data/multiplayer/techs.rulesetSat Mar 14 17:57:48 2015 @@ -608,6 +608,9 @@ flags= graphic = a.railroad graphic_alt = - +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade roads to railroads.\ +) [advance_recycling] name = _(Recycling) ___ Freeciv-commits mailing list Freeciv-commits@gna.org
[Freeciv-commits] r28546 - in /branches/S2_5: client/helpdata.c data/civ2civ3/buildings.ruleset data/civ2civ3/units.ruleset
Author: jtn
Date: Sat Mar 14 17:57:38 2015
New Revision: 28546
URL: http://svn.gna.org/viewcvs/freeciv?rev=28546view=rev
Log:
Typos and i18n fixes.
i18n issues reported by Konstantin Vedeneev (konved@gna).
See gna bug #2.
Modified:
branches/S2_5/client/helpdata.c
branches/S2_5/data/civ2civ3/buildings.ruleset
branches/S2_5/data/civ2civ3/units.ruleset
Modified: branches/S2_5/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/helpdata.c?rev=28546r1=28545r2=28546view=diff
==
--- branches/S2_5/client/helpdata.c (original)
+++ branches/S2_5/client/helpdata.c Sat Mar 14 17:57:38 2015
@@ -2925,22 +2925,34 @@
if (player_invention_state(pplayer, i) != TECH_KNOWN) {
if (player_invention_state(pplayer, i) == TECH_PREREQS_KNOWN) {
+ int bulbs = base_total_bulbs_required(pplayer, i, FALSE);
+
cat_snprintf(buf, bufsz,
- _(Starting now, researching %s would need %d bulbs.),
- advance_name_for_player(pplayer, i),
- base_total_bulbs_required(pplayer, i, FALSE));
+ PL_(Starting now, researching %s would need %d bulb.,
+ Starting now, researching %s would need %d bulbs.,
+ bulbs),
+ advance_name_for_player(pplayer, i), bulbs);
} else if (player_invention_reachable(pplayer, i, TRUE)) {
+ /* Split string into two to allow localization of two pluralizations. */
+ char buf2[MAX_LEN_MSG];
+ int bulbs = total_bulbs_required_for_goal(pplayer, i);
+
+ fc_snprintf(buf2, ARRAY_SIZE(buf2),
+ /* TRANS: appended to another sentence. Preserve the
+ * leading space. */
+ PL_( The whole project will require %d bulb to complete.,
+ The whole project will require %d bulbs to complete.,
+ bulbs),
+ bulbs);
cat_snprintf(buf, bufsz,
+ /* TRANS: last %s is a sentence pluralized separately. */
PL_(To reach %s you need to obtain %d other
-technology first. The whole project
-will require %d bulbs to complete.,
+technology first.%s,
To reach %s you need to obtain %d other
-technologies first. The whole project
-will require %d bulbs to complete.,
+technologies first.%s,
num_unknown_techs_for_goal(pplayer, i) - 1),
advance_name_for_player(pplayer, i),
- num_unknown_techs_for_goal(pplayer, i) - 1,
- total_bulbs_required_for_goal(pplayer, i));
+ num_unknown_techs_for_goal(pplayer, i) - 1, buf2);
} else {
CATLSTR(buf, bufsz,
_(You cannot research this technology.));
@@ -2948,6 +2960,8 @@
if (!techs_have_fixed_costs()
player_invention_reachable(pplayer, i, FALSE)) {
CATLSTR(buf, bufsz,
+ /* TRANS: Appended to another sentence. Preserve the
+ * leading space. */
_( This number may vary depending on what
other players research.\n));
} else {
Modified: branches/S2_5/data/civ2civ3/buildings.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/buildings.ruleset?rev=28546r1=28545r2=28546view=diff
==
--- branches/S2_5/data/civ2civ3/buildings.ruleset (original)
+++ branches/S2_5/data/civ2civ3/buildings.ruleset Sat Mar 14 17:57:38 2015
@@ -1618,7 +1618,7 @@
sound_alt = w_generic
helptext = _(\
With this wonder, City Walls and Courthouses each make one unhappy \
-citizen content in their city, unless that citizens is unhappy about \
+citizen content in their city, unless that citizen is unhappy about \
aggression. Also, none of the owner's cities can be incited to revolt.\
)
Modified: branches/S2_5/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=28546r1=28545r2=28546view=diff
==
--- branches/S2_5/data/civ2civ3/units.ruleset (original)
+++ branches/S2_5/data/civ2civ3/units.ruleset Sat Mar 14 17:57:38 2015
@@ -1542,7 +1542,7 @@
units on water it has a regular attack.\
), _(\
Helicopters can also transport one unit of infantry; while most troops \
-must load or unload in a city or airbase units specialising in mobility \
+must load or unload in a city or airbase units specializing in mobility \
(Paratroopers, Alpine Troops, Marines, Partisans, and Fanatics) can \
embark or disembark at any time.\
), _(\
___
[Freeciv-commits] r28544 - in /branches/S2_5/client: gui-sdl/mapview.c text.c
Author: jtn
Date: Sat Mar 14 17:57:31 2015
New Revision: 28544
URL: http://svn.gna.org/viewcvs/freeciv?rev=28544view=rev
Log:
Show armistice turn count as well as ceasefire turn count in terrain
info popups.
See gna bug #23303.
Modified:
branches/S2_5/client/gui-sdl/mapview.c
branches/S2_5/client/text.c
Modified: branches/S2_5/client/gui-sdl/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/mapview.c?rev=28544r1=28543r2=28544view=diff
==
--- branches/S2_5/client/gui-sdl/mapview.c (original)
+++ branches/S2_5/client/gui-sdl/mapview.c Sat Mar 14 17:57:31 2015
@@ -562,8 +562,8 @@
if (BORDERS_DISABLED != game.info.borders !pCity) {
const char *diplo_nation_plural_adjectives[DS_LAST] =
-{Q_(?nation:Neutral), Q_(?nation:Hostile),
-/* unused, DS_CEASEFIRE*/,
+ { /* unused, DS_ARMISTICE */, Q_(?nation:Hostile),
+ /* unused, DS_CEASEFIRE */,
Q_(?nation:Peaceful), Q_(?nation:Friendly),
Q_(?nation:Mysterious)};
if (tile_owner(pTile) == client.conn.playing) {
@@ -573,12 +573,18 @@
struct player_diplstate *ds
= player_diplstate_get(client.conn.playing,
tile_owner(pTile));
-if (DS_CEASEFIRE == ds-type){
+if (DS_CEASEFIRE == ds-type) {
int turns = ds-turns_left;
- cat_snprintf(buffer, sizeof(buffer),
- PL_(\n%s territory (%d turn ceasefire),
- \n%s territory (%d turn ceasefire), turns),
- nation_adjective_for_player(tile_owner(pTile)),
turns);
+ cat_snprintf(buffer, sizeof(buffer),
+PL_(\n%s territory (%d turn ceasefire),
+\n%s territory (%d turn ceasefire), turns),
+nation_adjective_for_player(tile_owner(pTile)), turns);
+} else if (DS_ARMISTICE == ds-type) {
+ int turns = ds-turns_left;
+ cat_snprintf(buffer, sizeof(buffer),
+PL_(\n%s territory (%d turn armistice),
+\n%s territory (%d turn armistice), turns),
+nation_adjective_for_player(tile_owner(pTile)), turns);
} else {
cat_snprintf(buffer, sizeof(buffer), _(\nTerritory of the
%s %s),
diplo_nation_plural_adjectives[ds-type],
@@ -596,8 +602,8 @@
struct player *pOwner = city_owner(pCity);
/*bool barrack = FALSE, airport = FALSE, port = FALSE;*/
const char *diplo_city_adjectives[DS_LAST] =
- {Q_(?city:Neutral), Q_(?city:Hostile),
- /*unused, DS_CEASEFIRE */, Q_(?city:Peaceful),
+ {Q_(?city:Neutral), Q_(?city:Hostile),
+ Q_(?city:Neutral), Q_(?city:Peaceful),
Q_(?city:Friendly), Q_(?city:Mysterious)};
cat_snprintf(buffer, sizeof(buffer),
Modified: branches/S2_5/client/text.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/text.c?rev=28544r1=28543r2=28544view=diff
==
--- branches/S2_5/client/text.c (original)
+++ branches/S2_5/client/text.c Sat Mar 14 17:57:31 2015
@@ -140,13 +140,13 @@
struct city *pcity = tile_city(ptile);
struct unit *punit = find_visible_unit(ptile);
const char *diplo_nation_plural_adjectives[DS_LAST] =
-{Q_(?nation:Neutral), Q_(?nation:Hostile),
- Q_(?nation:Neutral),
+{ /* unused, DS_ARMISTICE */, Q_(?nation:Hostile),
+ /* unused, DS_CEASEFIRE */,
Q_(?nation:Peaceful), Q_(?nation:Friendly),
Q_(?nation:Mysterious), Q_(?nation:Friendly(team))};
const char *diplo_city_adjectives[DS_LAST] =
-{Q_(?city:Neutral), Q_(?city:Hostile),
- Q_(?nation:Neutral),
+{ /* unused, DS_ARMISTICE */, Q_(?city:Hostile),
+ /* unused, DS_CEASEFIRE */,
Q_(?city:Peaceful), Q_(?city:Friendly), Q_(?city:Mysterious),
Q_(?city:Friendly(team))};
static struct astring str = ASTRING_INIT;
@@ -197,6 +197,16 @@
Territory of %s (%s) (%d turn cease-fire),
turns),
username, nation, turns);
+ } else if (ds-type == DS_ARMISTICE) {
+int turns = ds-turns_left;
+
+astr_add_line(str,
+ /* TRANS: Territory of username (nation + team)
+ * (number turn armistice) */
+ PL_(Territory of %s (%s) (%d turn armistice),
+ Territory of %s (%s) (%d turn armistice),
[Freeciv-commits] r28543 - /branches/S2_5/data/civ2civ3/units.ruleset
Author: jtn Date: Sat Mar 14 17:57:28 2015 New Revision: 28543 URL: http://svn.gna.org/viewcvs/freeciv?rev=28543view=rev Log: civ2civ3: Document Big Land units' weaknesses in unit help. See gna patch #5823. Modified: branches/S2_5/data/civ2civ3/units.ruleset Modified: branches/S2_5/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=28543r1=28542r2=28543view=diff == --- branches/S2_5/data/civ2civ3/units.ruleset (original) +++ branches/S2_5/data/civ2civ3/units.ruleset Sat Mar 14 17:57:28 2015 @@ -1032,9 +1032,11 @@ flags = roles = DefendGood, FirstBuild helptext = _(\ -The Mechanized Infantry has the strongest defensive strength\ - of any land unit, but is only available near the end of the\ - technology tree.\ +The Mechanized Infantry has the strongest inherent defensive strength \ +of any land unit, and is very fast on roads and easy terrain, but it is \ +hindered rather than helped by rough terrain (it cannot move into \ +mountains, swamps, or jungles), and it is only available near the end \ +of the technology tree.\ ) [unit_horsemen] @@ -1098,8 +1100,12 @@ flags = Capturer roles = AttackFast helptext = _(\ -Chariots are horse-pulled war wagons, stronger\ - but more expensive than horsemen.\ +Chariots are horse-pulled war wagons. They have a stronger attack than \ +Horsemen, but their speed comes at a cost: they are more expensive \ +to build, they cannot take advantage of terrain to defend themselves, \ +they cannot move in rough terrain (mountains, swamps, and jungles) \ +without roads, and they cannot be transported by sea using early ships \ +(Triremes and Caravels).\ ) [unit_elephants] @@ -1288,9 +1294,11 @@ flags = roles = DefendOk, AttackFast, Hunter helptext = _(\ -Armors are motorized war wagons that are faster,\ - stronger, and can take more damage than any\ - mounted unit.\ +Armors are motorized war wagons that are faster, stronger, and can take \ +more damage than any mounted unit. However, they are less adaptable to \ +very rough terrain (they cannot move into mountains, swamps, or jungles \ +without roads), and unable to use less rough terrain to improve their \ +defense.\ ) [unit_catapult] @@ -1324,6 +1332,11 @@ Catapults are large rock-throwing machines of war.\ They are very strong attackers but equally weak\ defenders and will need an escort to be effective.\ +), _(\ +While powerful, Catapults (and their successors) are bulky and awkward; \ +they require roads to move in rough terrain (mountains, swamps, and \ +jungles), are difficult to defend, and are too big for early ships \ +(Triremes and Caravels).\ ) [unit_cannon] @@ -1354,10 +1367,10 @@ flags = roles = AttackStrong, BarbarianTech, BarbarianBuildTech helptext = _(\ -Cannons are large firearms that can fire heavy\ - projectiles over long distances. They are very\ - strong attackers but equally weak defenders and\ - will need an escort to be effective.\ +Cannons are large firearms that can fire heavy projectiles over long \ +distances. As with the catapults they replace, they are very strong \ +attackers but equally weak defenders and will need an escort to be \ +effective, and have limited mobility.\ ) [unit_artillery] @@ -1388,9 +1401,9 @@ flags = CityBuster roles = AttackStrong helptext = _(\ -The artillery is an upgraded cannon. It is a very\ - strong attacker but equally weak defender and\ - will need an escort to be effective.\ +The artillery is an upgraded cannon. As with its predecessors, it is a \ +very strong attacker but equally weak defender and will need an escort \ +to be effective, and has limited mobility.\ ) [unit_howitzer] @@ -1421,8 +1434,9 @@ flags = CityBuster roles = AttackStrong helptext = _(\ -Howitzers are upgraded artillery with improved\ - defensive as well as offensive capabilities.\ +Howitzers are upgraded artillery with improved defensive as well as \ +offensive capabilities. However, they still have the limited mobility \ +of their predecessors.\ ) [unit_fighter] ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28545 - /branches/S2_5/data/civ2civ3/units.ruleset
Author: jtn Date: Sat Mar 14 17:57:34 2015 New Revision: 28545 URL: http://svn.gna.org/viewcvs/freeciv?rev=28545view=rev Log: civ2civ3: mention max Engineers veteran bonus. See gna patch #5857. Modified: branches/S2_5/data/civ2civ3/units.ruleset Modified: branches/S2_5/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=28545r1=28544r2=28545view=diff == --- branches/S2_5/data/civ2civ3/units.ruleset (original) +++ branches/S2_5/data/civ2civ3/units.ruleset Sat Mar 14 17:57:34 2015 @@ -579,7 +579,7 @@ helptext = _(\ Engineers are similar to Workers, but they work twice as fast, \ move twice as fast, and may gain experience from work enabling \ -them to work even faster.\ +them to work up to four times faster than Workers.\ ), _(\ With knowledge of Fusion Power, Engineers may also perform more \ radical terrain transformations than Workers, Settlers, or Migrants, \ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28547 - in /branches/S2_5/data: civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Sat Mar 14 17:57:42 2015 New Revision: 28547 URL: http://svn.gna.org/viewcvs/freeciv?rev=28547view=rev Log: In help for terrain-altering units, rework handwritten text to remove redundancy with autogenerated help. Reported by Marko Lindqvist (cazfi@gna). See gna patch #5858. Modified: branches/S2_5/data/civ1/units.ruleset branches/S2_5/data/civ2/units.ruleset branches/S2_5/data/civ2civ3/units.ruleset branches/S2_5/data/classic/units.ruleset branches/S2_5/data/experimental/units.ruleset branches/S2_5/data/multiplayer/units.ruleset Modified: branches/S2_5/data/civ1/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/units.ruleset?rev=28547r1=28546r2=28547view=diff == --- branches/S2_5/data/civ1/units.ruleset (original) +++ branches/S2_5/data/civ1/units.ruleset Sat Mar 14 17:57:42 2015 @@ -287,14 +287,14 @@ Settlers are one of the key units in the game, as they are your main \ means of founding new cities, and can also improve terrain.\ ), _(\ -On terrain which supports it, they may build an irrigation system to \ +Building an irrigation system on a suitable tile causes it to \ produce some extra food each turn. This requires a nearby source of \ water: an ocean or river tile, or another tile with an \ irrigation system, must share an edge (not just a corner) with the \ target tile. Once irrigated, land remains so even if the water source \ is removed.\ ), _(\ -Settlers can build mines on some types of terrain, which increases the \ +Building a mine on suitable terrain increases the \ number of production points produced by that tile. However, it is not \ possible to have an irrigation system and a mine on the same tile.\ ), _(\ @@ -303,8 +303,6 @@ to another type; this is usually more expensive. For instance, Swamp \ may be \irrigated\ to yield Grassland. (Terrain conversion with \ the \irrigate\ order does not require a water source.)\ -), _(\ -Settlers can also build roads, railroads, or fortresses.\ ), _(\ See the help on Terrain and Terrain Alterations for the effects of \ these actions.\ Modified: branches/S2_5/data/civ2/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/units.ruleset?rev=28547r1=28546r2=28547view=diff == --- branches/S2_5/data/civ2/units.ruleset (original) +++ branches/S2_5/data/civ2/units.ruleset Sat Mar 14 17:57:42 2015 @@ -291,7 +291,7 @@ Settlers are one of the key units in the game, as they are your main \ means of founding new cities, and can also improve terrain.\ ), _(\ -On terrain which supports it, they may build an irrigation system to \ +Building an irrigation system on a suitable tile causes it to \ produce some extra food each turn. This requires a nearby source of \ water: an ocean or river tile, or another tile with an \ irrigation system, must share an edge (not just a corner) with the \ @@ -300,7 +300,7 @@ upgraded to Farmland by irrigating them a second time; this provides \ more food to a city if it has a Supermarket.\ ), _(\ -Settlers can build mines on some types of terrain, which increases the \ +Building a mine on suitable terrain increases the \ number of production points produced by that tile. However, it is not \ possible to have an irrigation system and a mine on the same tile.\ ), _(\ @@ -309,8 +309,6 @@ to another type; this is usually more expensive. For instance, Swamp \ may be \irrigated\ to yield Grassland. (Terrain conversion with \ the \irrigate\ order does not require a water source.)\ -), _(\ -Settlers can also build roads, railroads, fortresses, or airbases.\ ), _(\ See the help on Terrain and Terrain Alterations for the effects of \ these actions.\ Modified: branches/S2_5/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=28547r1=28546r2=28547view=diff == --- branches/S2_5/data/civ2civ3/units.ruleset (original) +++ branches/S2_5/data/civ2civ3/units.ruleset Sat Mar 14 17:57:42 2015 @@ -434,8 +434,8 @@ Settlers are one of the key units in the game, as they are your main \ means of founding new cities.\ ), _(\ -Settlers can also perform the same terrain alterations as Workers, \ -except for building airbases or buoys.\ +Settlers can also perform some of the same terrain alterations as \ +Workers.\ ), _(\ TIP: optimal production of Settlers occurs in cities of at most \ size 4, or cities with a Granary of at most size 6.\ @@ -476,8 +476,8 @@ roles = Settlers helptext = _(\ Migrants can be used to transfer population to other cities, but \ -may not found new cities. They can also perform the same terrain \ -alterations as Settlers.\ +may not found new cities. They can also
[Freeciv-commits] r28551 - /branches/S2_4/client/helpdata.c
Author: jtn
Date: Sat Mar 14 18:04:28 2015
New Revision: 28551
URL: http://svn.gna.org/viewcvs/freeciv?rev=28551view=rev
Log:
Fix pluralisation issue in technology help.
Reported by Konstantin Vedeneev (konved@gna).
See gna bug #2.
Modified:
branches/S2_4/client/helpdata.c
Modified: branches/S2_4/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/helpdata.c?rev=28551r1=28550r2=28551view=diff
==
--- branches/S2_4/client/helpdata.c (original)
+++ branches/S2_4/client/helpdata.c Sat Mar 14 18:04:28 2015
@@ -2351,22 +2351,34 @@
if (player_invention_state(pplayer, i) != TECH_KNOWN) {
if (player_invention_state(pplayer, i) == TECH_PREREQS_KNOWN) {
+ int bulbs = base_total_bulbs_required(pplayer, i);
+
cat_snprintf(buf, bufsz,
- _(Starting now, researching %s would need %d bulbs.),
- advance_name_for_player(pplayer, i),
- base_total_bulbs_required(pplayer, i));
+ PL_(Starting now, researching %s would need %d bulb.,
+ Starting now, researching %s would need %d bulbs.,
+ bulbs),
+ advance_name_for_player(pplayer, i), bulbs);
} else if (player_invention_reachable(pplayer, i, TRUE)) {
+ /* Split string into two to allow localization of two pluralizations. */
+ char buf2[MAX_LEN_MSG];
+ int bulbs = total_bulbs_required_for_goal(pplayer, i);
+
+ fc_snprintf(buf2, ARRAY_SIZE(buf2),
+ /* TRANS: appended to another sentence. Preserve the
+ * leading space. */
+ PL_( The whole project will require %d bulb to complete.,
+ The whole project will require %d bulbs to complete.,
+ bulbs),
+ bulbs);
cat_snprintf(buf, bufsz,
+ /* TRANS: last %s is a sentence pluralized separately. */
PL_(To reach %s you need to obtain %d other
-technology first. The whole project
-will require %d bulbs to complete.,
+technology first.%s,
To reach %s you need to obtain %d other
-technologies first. The whole project
-will require %d bulbs to complete.,
+technologies first.%s,
num_unknown_techs_for_goal(pplayer, i) - 1),
advance_name_for_player(pplayer, i),
- num_unknown_techs_for_goal(pplayer, i) - 1,
- total_bulbs_required_for_goal(pplayer, i));
+ num_unknown_techs_for_goal(pplayer, i) - 1, buf2);
} else {
CATLSTR(buf, bufsz,
_(You cannot research this technology.));
@@ -2374,6 +2386,8 @@
if (!techs_have_fixed_costs()
player_invention_reachable(pplayer, i, FALSE)) {
CATLSTR(buf, bufsz,
+ /* TRANS: Appended to another sentence. Preserve the
+ * leading space. */
_( This number may vary depending on what
other players research.\n));
} else {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28550 - in /branches/S2_4/client: gui-sdl/mapview.c text.c
Author: jtn
Date: Sat Mar 14 18:04:25 2015
New Revision: 28550
URL: http://svn.gna.org/viewcvs/freeciv?rev=28550view=rev
Log:
Show armistice turn count as well as ceasefire turn count in terrain
info popups.
See gna bug #23303.
Modified:
branches/S2_4/client/gui-sdl/mapview.c
branches/S2_4/client/text.c
Modified: branches/S2_4/client/gui-sdl/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-sdl/mapview.c?rev=28550r1=28549r2=28550view=diff
==
--- branches/S2_4/client/gui-sdl/mapview.c (original)
+++ branches/S2_4/client/gui-sdl/mapview.c Sat Mar 14 18:04:25 2015
@@ -563,8 +563,8 @@
if (BORDERS_DISABLED != game.info.borders !pCity) {
const char *diplo_nation_plural_adjectives[DS_LAST] =
-{Q_(?nation:Neutral), Q_(?nation:Hostile),
-/* unused, DS_CEASEFIRE*/,
+ { /* unused, DS_ARMISTICE */, Q_(?nation:Hostile),
+ /* unused, DS_CEASEFIRE */,
Q_(?nation:Peaceful), Q_(?nation:Friendly),
Q_(?nation:Mysterious)};
if (tile_owner(pTile) == client.conn.playing) {
@@ -574,12 +574,18 @@
struct player_diplstate *ds
= player_diplstate_get(client.conn.playing,
tile_owner(pTile));
-if (DS_CEASEFIRE == ds-type){
+if (DS_CEASEFIRE == ds-type) {
int turns = ds-turns_left;
- cat_snprintf(buffer, sizeof(buffer),
- PL_(\n%s territory (%d turn ceasefire),
- \n%s territory (%d turn ceasefire), turns),
- nation_adjective_for_player(tile_owner(pTile)),
turns);
+ cat_snprintf(buffer, sizeof(buffer),
+PL_(\n%s territory (%d turn ceasefire),
+\n%s territory (%d turn ceasefire), turns),
+nation_adjective_for_player(tile_owner(pTile)), turns);
+} else if (DS_ARMISTICE == ds-type) {
+ int turns = ds-turns_left;
+ cat_snprintf(buffer, sizeof(buffer),
+PL_(\n%s territory (%d turn armistice),
+\n%s territory (%d turn armistice), turns),
+nation_adjective_for_player(tile_owner(pTile)), turns);
} else {
cat_snprintf(buffer, sizeof(buffer), _(\nTerritory of the
%s %s),
diplo_nation_plural_adjectives[ds-type],
@@ -597,8 +603,8 @@
struct player *pOwner = city_owner(pCity);
/*bool barrack = FALSE, airport = FALSE, port = FALSE;*/
const char *diplo_city_adjectives[DS_LAST] =
- {Q_(?city:Neutral), Q_(?city:Hostile),
- /*unused, DS_CEASEFIRE */, Q_(?city:Peaceful),
+ {Q_(?city:Neutral), Q_(?city:Hostile),
+ Q_(?city:Neutral), Q_(?city:Peaceful),
Q_(?city:Friendly), Q_(?city:Mysterious)};
cat_snprintf(buffer, sizeof(buffer),
Modified: branches/S2_4/client/text.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/text.c?rev=28550r1=28549r2=28550view=diff
==
--- branches/S2_4/client/text.c (original)
+++ branches/S2_4/client/text.c Sat Mar 14 18:04:25 2015
@@ -138,13 +138,13 @@
struct city *pcity = tile_city(ptile);
struct unit *punit = find_visible_unit(ptile);
const char *diplo_nation_plural_adjectives[DS_LAST] =
-{Q_(?nation:Neutral), Q_(?nation:Hostile),
- Q_(?nation:Neutral),
+{ /* unused, DS_ARMISTICE */, Q_(?nation:Hostile),
+ /* unused, DS_CEASEFIRE */,
Q_(?nation:Peaceful), Q_(?nation:Friendly),
Q_(?nation:Mysterious), Q_(?nation:Friendly(team))};
const char *diplo_city_adjectives[DS_LAST] =
-{Q_(?city:Neutral), Q_(?city:Hostile),
- Q_(?nation:Neutral),
+{ /* unused, DS_ARMISTICE */, Q_(?city:Hostile),
+ /* unused, DS_CEASEFIRE */,
Q_(?city:Peaceful), Q_(?city:Friendly), Q_(?city:Mysterious),
Q_(?city:Friendly(team))};
static struct astring str = ASTRING_INIT;
@@ -195,6 +195,16 @@
Territory of %s (%s) (%d turn cease-fire),
turns),
username, nation, turns);
+ } else if (ds-type == DS_ARMISTICE) {
+int turns = ds-turns_left;
+
+astr_add_line(str,
+ /* TRANS: Territory of username (nation + team)
+ * (number turn armistice) */
+ PL_(Territory of %s (%s) (%d turn armistice),
+ Territory of %s (%s) (%d turn armistice),
[Freeciv-commits] r28531 - in /trunk/client: gui-sdl/mapview.c gui-sdl2/mapview.c text.c
Author: jtn
Date: Sat Mar 14 17:49:24 2015
New Revision: 28531
URL: http://svn.gna.org/viewcvs/freeciv?rev=28531view=rev
Log:
Show armistice turn count as well as ceasefire turn count in terrain
info popups.
See gna bug #23303.
Modified:
trunk/client/gui-sdl/mapview.c
trunk/client/gui-sdl2/mapview.c
trunk/client/text.c
Modified: trunk/client/gui-sdl/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/mapview.c?rev=28531r1=28530r2=28531view=diff
==
--- trunk/client/gui-sdl/mapview.c (original)
+++ trunk/client/gui-sdl/mapview.c Sat Mar 14 17:49:24 2015
@@ -571,8 +571,8 @@
if (BORDERS_DISABLED != game.info.borders !pCity) {
const char *diplo_nation_plural_adjectives[DS_LAST] =
-{Q_(?nation:Neutral), Q_(?nation:Hostile),
-/* unused, DS_CEASEFIRE*/,
+ { /* unused, DS_ARMISTICE */, Q_(?nation:Hostile),
+ /* unused, DS_CEASEFIRE */,
Q_(?nation:Peaceful), Q_(?nation:Friendly),
Q_(?nation:Mysterious)};
if (tile_owner(pTile) == client.conn.playing) {
@@ -582,12 +582,18 @@
struct player_diplstate *ds
= player_diplstate_get(client.conn.playing,
tile_owner(pTile));
-if (DS_CEASEFIRE == ds-type){
+if (DS_CEASEFIRE == ds-type) {
int turns = ds-turns_left;
- cat_snprintf(buffer, sizeof(buffer),
- PL_(\n%s territory (%d turn ceasefire),
- \n%s territory (%d turn ceasefire), turns),
- nation_adjective_for_player(tile_owner(pTile)),
turns);
+ cat_snprintf(buffer, sizeof(buffer),
+PL_(\n%s territory (%d turn ceasefire),
+\n%s territory (%d turn ceasefire), turns),
+nation_adjective_for_player(tile_owner(pTile)), turns);
+} else if (DS_ARMISTICE == ds-type) {
+ int turns = ds-turns_left;
+ cat_snprintf(buffer, sizeof(buffer),
+PL_(\n%s territory (%d turn armistice),
+\n%s territory (%d turn armistice), turns),
+nation_adjective_for_player(tile_owner(pTile)), turns);
} else {
cat_snprintf(buffer, sizeof(buffer), _(\nTerritory of the
%s %s),
diplo_nation_plural_adjectives[ds-type],
@@ -605,8 +611,8 @@
struct player *pOwner = city_owner(pCity);
/*bool barrack = FALSE, airport = FALSE, port = FALSE;*/
const char *diplo_city_adjectives[DS_LAST] =
- {Q_(?city:Neutral), Q_(?city:Hostile),
- /*unused, DS_CEASEFIRE */, Q_(?city:Peaceful),
+ {Q_(?city:Neutral), Q_(?city:Hostile),
+ Q_(?city:Neutral), Q_(?city:Peaceful),
Q_(?city:Friendly), Q_(?city:Mysterious)};
cat_snprintf(buffer, sizeof(buffer),
Modified: trunk/client/gui-sdl2/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/mapview.c?rev=28531r1=28530r2=28531view=diff
==
--- trunk/client/gui-sdl2/mapview.c (original)
+++ trunk/client/gui-sdl2/mapview.c Sat Mar 14 17:49:24 2015
@@ -585,8 +585,8 @@
if (BORDERS_DISABLED != game.info.borders !pCity) {
const char *diplo_nation_plural_adjectives[DS_LAST] =
- {Q_(?nation:Neutral), Q_(?nation:Hostile),
-/* unused, DS_CEASEFIRE*/,
+ { /* unused, DS_ARMISTICE */, Q_(?nation:Hostile),
+/* unused, DS_CEASEFIRE */,
Q_(?nation:Peaceful), Q_(?nation:Friendly),
Q_(?nation:Mysterious)};
@@ -598,13 +598,22 @@
= player_diplstate_get(client.conn.playing,
tile_owner(pTile));
-if (DS_CEASEFIRE == ds-type){
+if (DS_CEASEFIRE == ds-type) {
int turns = ds-turns_left;
cat_snprintf(buffer, sizeof(buffer),
PL_(\n%s territory (%d turn ceasefire),
\n%s territory (%d turn ceasefire),
turns),
- nation_adjective_for_player(tile_owner(pTile)),
turns);
+ nation_adjective_for_player(tile_owner(pTile)),
+ turns);
+} else if (DS_ARMISTICE == ds-type) {
+ int turns = ds-turns_left;
+
+ cat_snprintf(buffer,
[Freeciv-commits] r28533 - in /trunk/data: civ1/ civ2/ classic/ experimental/ multiplayer/
Author: jtn Date: Sat Mar 14 17:49:31 2015 New Revision: 28533 URL: http://svn.gna.org/viewcvs/freeciv?rev=28533view=rev Log: In help for terrain-altering units, rework handwritten text to remove redundancy with autogenerated help. Reported by Marko Lindqvist (cazfi@gna). See gna patch #5858. Modified: trunk/data/civ1/units.ruleset trunk/data/civ2/units.ruleset trunk/data/classic/units.ruleset trunk/data/experimental/units.ruleset trunk/data/multiplayer/units.ruleset Modified: trunk/data/civ1/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=28533r1=28532r2=28533view=diff == --- trunk/data/civ1/units.ruleset (original) +++ trunk/data/civ1/units.ruleset Sat Mar 14 17:49:31 2015 @@ -287,14 +287,14 @@ Settlers are one of the key units in the game, as they are your main \ means of founding new cities, and can also improve terrain.\ ), _(\ -On terrain which supports it, they may build an irrigation system to \ +Building an irrigation system on a suitable tile causes it to \ produce some extra food each turn. This requires a nearby source of \ water: an ocean or river tile, or another tile with an \ irrigation system, must share an edge (not just a corner) with the \ target tile. Once irrigated, land remains so even if the water source \ is removed.\ ), _(\ -Settlers can build mines on some types of terrain, which increases the \ +Building a mine on suitable terrain increases the \ number of production points produced by that tile. However, it is not \ possible to have an irrigation system and a mine on the same tile.\ ), _(\ @@ -303,8 +303,6 @@ to another type; this is usually more expensive. For instance, Swamp \ may be \irrigated\ to yield Grassland. (Terrain conversion with \ the \irrigate\ order does not require a water source.)\ -), _(\ -Settlers can also build roads, railroads, or fortresses.\ ), _(\ See the help on Terrain and Terrain Alterations for the effects of \ these actions.\ Modified: trunk/data/civ2/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=28533r1=28532r2=28533view=diff == --- trunk/data/civ2/units.ruleset (original) +++ trunk/data/civ2/units.ruleset Sat Mar 14 17:49:31 2015 @@ -290,7 +290,7 @@ Settlers are one of the key units in the game, as they are your main \ means of founding new cities, and can also improve terrain.\ ), _(\ -On terrain which supports it, they may build an irrigation system to \ +Building an irrigation system on a suitable tile causes it to \ produce some extra food each turn. This requires a nearby source of \ water: an ocean or river tile, or another tile with an \ irrigation system, must share an edge (not just a corner) with the \ @@ -299,7 +299,7 @@ upgraded to Farmland by irrigating them a second time; this provides \ more food to a city if it has a Supermarket.\ ), _(\ -Settlers can build mines on some types of terrain, which increases the \ +Building a mine on suitable terrain increases the \ number of production points produced by that tile. However, it is not \ possible to have an irrigation system and a mine on the same tile.\ ), _(\ @@ -308,8 +308,6 @@ to another type; this is usually more expensive. For instance, Swamp \ may be \irrigated\ to yield Grassland. (Terrain conversion with \ the \irrigate\ order does not require a water source.)\ -), _(\ -Settlers can also build roads, railroads, fortresses, or airbases.\ ), _(\ See the help on Terrain and Terrain Alterations for the effects of \ these actions.\ Modified: trunk/data/classic/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=28533r1=28532r2=28533view=diff == --- trunk/data/classic/units.ruleset(original) +++ trunk/data/classic/units.rulesetSat Mar 14 17:49:31 2015 @@ -407,8 +407,8 @@ Settlers are one of the key units in the game, as they are your main\ means of founding new cities.\ ), _(\ -Settlers can also perform the same terrain alterations as Workers,\ - except for building airbases or buoys.\ +Settlers can also perform some of the same terrain alterations as\ + Workers.\ ), _(\ Upkeep for Settlers is in food as well as production, and a Settler\ can die if its supporting city runs out of food. Settlers in a\ @@ -451,7 +451,7 @@ helptext = _(\ Workers have the ability to improve terrain tiles.\ ), _(\ -On terrain which supports it, they may build an irrigation system to \ +Building an irrigation system on a suitable tile causes it to \ produce some extra food each turn. This requires a nearby source of \ water: an ocean, lake, or river tile, or another tile with an \ irrigation system, must share an edge (not just a corner) with the
[Freeciv-commits] r28535 - in /trunk/data: civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Sat Mar 14 17:49:38 2015 New Revision: 28535 URL: http://svn.gna.org/viewcvs/freeciv?rev=28535view=rev Log: Tech help documents which extra types it enables. See gna bug #23281. Modified: trunk/data/civ1/techs.ruleset trunk/data/civ2/techs.ruleset trunk/data/civ2civ3/techs.ruleset trunk/data/classic/techs.ruleset trunk/data/experimental/techs.ruleset trunk/data/multiplayer/techs.ruleset Modified: trunk/data/civ1/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/techs.ruleset?rev=28535r1=28534r2=28535view=diff == --- trunk/data/civ1/techs.ruleset (original) +++ trunk/data/civ1/techs.ruleset Sat Mar 14 17:49:38 2015 @@ -468,7 +468,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) Modified: trunk/data/civ2/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/techs.ruleset?rev=28535r1=28534r2=28535view=diff == --- trunk/data/civ2/techs.ruleset (original) +++ trunk/data/civ2/techs.ruleset Sat Mar 14 17:49:38 2015 @@ -594,7 +594,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers and Engineers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) @@ -619,6 +623,9 @@ flags= graphic = a.refrigeration graphic_alt = - +helptext = _(\ +Allows Settlers and Engineers to upgrade irrigation systems to farmland.\ +) [advance_robotics] name = _(Robotics) Modified: trunk/data/civ2civ3/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/techs.ruleset?rev=28535r1=28534r2=28535view=diff == --- trunk/data/civ2civ3/techs.ruleset (original) +++ trunk/data/civ2civ3/techs.ruleset Sat Mar 14 17:49:38 2015 @@ -242,7 +242,8 @@ graphic = a.construction graphic_alt = - helptext = _(\ -Allows Settlers, Migrants, Workers and Engineers to build fortresses.\ +Allows Settlers, Migrants, Workers and Engineers to build forts and \ +fortresses.\ ) cost = 40 @@ -656,7 +657,9 @@ flags= graphic = a.radio graphic_alt = - -helptext = _(Allows Workers and Engineers to build airbases and buoys.) +helptext = _(\ +Allows Workers and Engineers to build airstrips, airbases and buoys.\ +) cost = 540 [advance_railroad] @@ -700,6 +703,10 @@ graphic = a.refrigeration graphic_alt = - cost = 350 +helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to upgrade \ +irrigation systems to farmland.\ +) [advance_robotics] name = _(Robotics) Modified: trunk/data/classic/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/techs.ruleset?rev=28535r1=28534r2=28535view=diff == --- trunk/data/classic/techs.ruleset(original) +++ trunk/data/classic/techs.rulesetSat Mar 14 17:49:38 2015 @@ -599,7 +599,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) @@ -624,6 +628,10 @@ flags= graphic = a.refrigeration graphic_alt = - +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade irrigation systems \ +to farmland.\ +) [advance_robotics] name = _(Robotics) Modified: trunk/data/experimental/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/techs.ruleset?rev=28535r1=28534r2=28535view=diff == --- trunk/data/experimental/techs.ruleset (original) +++ trunk/data/experimental/techs.ruleset Sat Mar 14 17:49:38 2015 @@ -659,7 +659,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) @@ -687,6 +691,10 @@ flags= graphic = a.refrigeration graphic_alt = - +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade irrigation systems \ +to farmland.\ +) [advance_robotics] name = _(Robotics) @@
[Freeciv-commits] r28530 - in /trunk: client/helpdata.c data/helpdata.txt
Author: jtn
Date: Sat Mar 14 17:49:20 2015
New Revision: 28530
URL: http://svn.gna.org/viewcvs/freeciv?rev=28530view=rev
Log:
Document that bombardment affects all units on a tile.
See gna patch #5822.
Modified:
trunk/client/helpdata.c
trunk/data/helpdata.txt
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=28530r1=28529r2=28530view=diff
==
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Sat Mar 14 17:49:20 2015
@@ -3863,10 +3863,13 @@
_(* Gets double firepower when attacking cities.\n));
}
if (utype_has_flag(utype, UTYF_BOMBARDER)) {
+/* FIXME: also they only happen against land units. We leave the
+ * ruleset author to document this. */
cat_snprintf(buf, bufsz,
-_(* Does bombard attacks (%d per turn). These attacks will
- only damage (never kill) the defender, but have no risk
- for the attacker.\n),
+_(* Does bombard attacks (%d per turn). These attacks will
+ only damage (never kill) defenders, but damage all
+defenders on a tile, and have no risk for the
+attacker.\n),
utype-bombard_rate);
}
if (utype_has_flag(utype, UTYF_IGTER)) {
Modified: trunk/data/helpdata.txt
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/helpdata.txt?rev=28530r1=28529r2=28530view=diff
==
--- trunk/data/helpdata.txt (original)
+++ trunk/data/helpdata.txt Sat Mar 14 17:49:20 2015
@@ -1103,9 +1103,12 @@
text = _(\
In standard combat, when one unit attacks another unit, either the \
attacker will be destroyed, or the defender will be destroyed -- \
-never both (unless the attacker was a missile). (Bombardment, in \
-rulesets which have it, works rather differently: the attacker \
-sustains no damage, and the defender cannot be completely destroyed.)\
+never both (unless the attacker was a missile).\
+), _(\
+(In some rulesets, certain units sometimes use a different style of \
+attack called 'bombardment', which works rather differently: the \
+attacker sustains no damage, and damages every unit in the target \
+tile or city, but defenders are never completely destroyed.)\
), _(\
The outcome of combat depends on several factors, including chance.\
), _(\
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28532 - /trunk/client/helpdata.c
Author: jtn
Date: Sat Mar 14 17:49:28 2015
New Revision: 28532
URL: http://svn.gna.org/viewcvs/freeciv?rev=28532view=rev
Log:
Fix pluralisation issue in technology help.
Reported by Konstantin Vedeneev (konved@gna).
See gna bug #2.
Modified:
trunk/client/helpdata.c
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=28532r1=28531r2=28532view=diff
==
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Sat Mar 14 17:49:28 2015
@@ -4125,22 +4125,34 @@
if (research_invention_state(presearch, i) != TECH_KNOWN) {
if (research_invention_state(presearch, i) == TECH_PREREQS_KNOWN) {
-cat_snprintf(buf, bufsz,
- _(Starting now, researching %s would need %d bulbs.),
- advance_name_translation(vap),
- research_total_bulbs_required(presearch, i, FALSE));
+int bulbs = research_total_bulbs_required(presearch, i, FALSE);
+
+cat_snprintf(buf, bufsz,
+ PL_(Starting now, researching %s would need %d bulb.,
+ Starting now, researching %s would need %d bulbs.,
+ bulbs),
+ advance_name_translation(vap), bulbs);
} else if (research_invention_reachable(presearch, i)) {
-cat_snprintf(buf, bufsz,
+/* Split string into two to allow localization of two pluralizations.
*/
+char buf2[MAX_LEN_MSG];
+int bulbs = research_goal_bulbs_required(presearch, i);
+
+fc_snprintf(buf2, ARRAY_SIZE(buf2),
+/* TRANS: appended to another sentence. Preserve the
+ * leading space. */
+PL_( The whole project will require %d bulb to complete.,
+ The whole project will require %d bulbs to
complete.,
+bulbs),
+bulbs);
+cat_snprintf(buf, bufsz,
+ /* TRANS: last %s is a sentence pluralized separately. */
PL_(To reach %s you need to obtain %d other
- technology first. The whole project
- will require %d bulbs to complete.,
+ technology first.%s,
To reach %s you need to obtain %d other
- technologies first. The whole project
- will require %d bulbs to complete.,
+ technologies first.%s,
research_goal_unknown_techs(presearch, i) - 1),
advance_name_translation(vap),
- research_goal_unknown_techs(presearch, i) - 1,
- research_goal_bulbs_required(presearch, i));
+ research_goal_unknown_techs(presearch, i) - 1, buf2);
} else {
CATLSTR(buf, bufsz,
_(You cannot research this technology.));
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28534 - in /trunk/data/civ2civ3: techs.ruleset units.ruleset
Author: jtn Date: Sat Mar 14 17:49:35 2015 New Revision: 28534 URL: http://svn.gna.org/viewcvs/freeciv?rev=28534view=rev Log: Mention Migrants in civ2civ3 help for nuclear fallout and techs enabling extras. See gna bug #23362. Modified: trunk/data/civ2civ3/techs.ruleset trunk/data/civ2civ3/units.ruleset Modified: trunk/data/civ2civ3/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/techs.ruleset?rev=28534r1=28533r2=28534view=diff == --- trunk/data/civ2civ3/techs.ruleset (original) +++ trunk/data/civ2civ3/techs.ruleset Sat Mar 14 17:49:35 2015 @@ -241,7 +241,9 @@ flags= graphic = a.construction graphic_alt = - -helptext = _(Allows Settlers, Workers and Engineers to build fortresses.) +helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to build fortresses.\ +) cost = 40 [advance_currency] @@ -664,7 +666,12 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Allows Settlers, Workers and Engineers to build railroads. Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to upgrade roads to \ +railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) cost = 350 [advance_recycling] @@ -774,7 +781,10 @@ flags= graphic = a.superconductors graphic_alt = - -helptext = _(Allows Settlers, Workers and Engineers to build maglevs.) +helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to upgrade railroads \ +with maglev.\ +) cost = 700 [advance_tactics] Modified: trunk/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=28534r1=28533r2=28534view=diff == --- trunk/data/civ2civ3/units.ruleset (original) +++ trunk/data/civ2civ3/units.ruleset Sat Mar 14 17:49:35 2015 @@ -2081,7 +2081,7 @@ Similar to pollution and global warming, the risk of global nuclear\ winter increases with fallout. If nuclear winter occurs, terrain\ across the globe changes into desert, tundra, and ice. Settlers,\ - Workers, and Engineers can clean up nuclear fallout.\ + Migrants, Workers, and Engineers can clean up nuclear fallout.\ ), _(\ TIP 1: Nuking the ocean will not generate fallout, and is a most\ effective (but expensive!!) way of getting rid of enemy\ @@ -2089,10 +2089,10 @@ ), _(\ TIP 2: You may be involved in a situation where you've invaded an\ enemy country en masse, but the enemy cities are too strong.\ - Before using a Nuclear unit, assemble a gang of Settlers, Workers,\ - and/or Engineers next to the city and have them ready to fix\ - the fallout on the same turn it occurs! This minimizes the\ - chance of nuclear winter. Eco-friendly nukes!\ + Before using a Nuclear unit, assemble a gang of cleanup units\ + next to the city and have them ready to fix the fallout on the\ + same turn it occurs! This minimizes the chance of nuclear winter.\ + Eco-friendly nukes!\ ) [unit_diplomat] ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28540 - in /branches/S2_6/data/civ2civ3: techs.ruleset units.ruleset
Author: jtn Date: Sat Mar 14 17:55:14 2015 New Revision: 28540 URL: http://svn.gna.org/viewcvs/freeciv?rev=28540view=rev Log: Mention Migrants in civ2civ3 help for nuclear fallout and techs enabling extras. See gna bug #23362. Modified: branches/S2_6/data/civ2civ3/techs.ruleset branches/S2_6/data/civ2civ3/units.ruleset Modified: branches/S2_6/data/civ2civ3/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/techs.ruleset?rev=28540r1=28539r2=28540view=diff == --- branches/S2_6/data/civ2civ3/techs.ruleset (original) +++ branches/S2_6/data/civ2civ3/techs.ruleset Sat Mar 14 17:55:14 2015 @@ -240,7 +240,9 @@ flags= graphic = a.construction graphic_alt = - -helptext = _(Allows Settlers, Workers and Engineers to build fortresses.) +helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to build fortresses.\ +) cost = 40 [advance_currency] @@ -663,7 +665,12 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Allows Settlers, Workers and Engineers to build railroads. Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to upgrade roads to \ +railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) cost = 350 [advance_recycling] @@ -773,7 +780,10 @@ flags= graphic = a.superconductors graphic_alt = - -helptext = _(Allows Settlers, Workers and Engineers to build maglevs.) +helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to upgrade railroads \ +with maglev.\ +) cost = 700 [advance_tactics] Modified: branches/S2_6/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/units.ruleset?rev=28540r1=28539r2=28540view=diff == --- branches/S2_6/data/civ2civ3/units.ruleset (original) +++ branches/S2_6/data/civ2civ3/units.ruleset Sat Mar 14 17:55:14 2015 @@ -2081,7 +2081,7 @@ Similar to pollution and global warming, the risk of global nuclear\ winter increases with fallout. If nuclear winter occurs, terrain\ across the globe changes into desert, tundra, and ice. Settlers,\ - Workers, and Engineers can clean up nuclear fallout.\ + Migrants, Workers, and Engineers can clean up nuclear fallout.\ ), _(\ TIP 1: Nuking the ocean will not generate fallout, and is a most\ effective (but expensive!!) way of getting rid of enemy\ @@ -2089,10 +2089,10 @@ ), _(\ TIP 2: You may be involved in a situation where you've invaded an\ enemy country en masse, but the enemy cities are too strong.\ - Before using a Nuclear unit, assemble a gang of Settlers, Workers,\ - and/or Engineers next to the city and have them ready to fix\ - the fallout on the same turn it occurs! This minimizes the\ - chance of nuclear winter. Eco-friendly nukes!\ + Before using a Nuclear unit, assemble a gang of cleanup units\ + next to the city and have them ready to fix the fallout on the\ + same turn it occurs! This minimizes the chance of nuclear winter.\ + Eco-friendly nukes!\ ) [unit_diplomat] ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28541 - in /branches/S2_6/data: civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Sat Mar 14 17:55:18 2015 New Revision: 28541 URL: http://svn.gna.org/viewcvs/freeciv?rev=28541view=rev Log: Tech help documents which extra types it enables. See gna bug #23281. Modified: branches/S2_6/data/civ1/techs.ruleset branches/S2_6/data/civ2/techs.ruleset branches/S2_6/data/civ2civ3/techs.ruleset branches/S2_6/data/classic/techs.ruleset branches/S2_6/data/experimental/techs.ruleset branches/S2_6/data/multiplayer/techs.ruleset Modified: branches/S2_6/data/civ1/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/techs.ruleset?rev=28541r1=28540r2=28541view=diff == --- branches/S2_6/data/civ1/techs.ruleset (original) +++ branches/S2_6/data/civ1/techs.ruleset Sat Mar 14 17:55:18 2015 @@ -467,7 +467,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) Modified: branches/S2_6/data/civ2/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/techs.ruleset?rev=28541r1=28540r2=28541view=diff == --- branches/S2_6/data/civ2/techs.ruleset (original) +++ branches/S2_6/data/civ2/techs.ruleset Sat Mar 14 17:55:18 2015 @@ -593,7 +593,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers and Engineers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) @@ -618,6 +622,9 @@ flags= graphic = a.refrigeration graphic_alt = - +helptext = _(\ +Allows Settlers and Engineers to upgrade irrigation systems to farmland.\ +) [advance_robotics] name = _(Robotics) Modified: branches/S2_6/data/civ2civ3/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/techs.ruleset?rev=28541r1=28540r2=28541view=diff == --- branches/S2_6/data/civ2civ3/techs.ruleset (original) +++ branches/S2_6/data/civ2civ3/techs.ruleset Sat Mar 14 17:55:18 2015 @@ -241,7 +241,8 @@ graphic = a.construction graphic_alt = - helptext = _(\ -Allows Settlers, Migrants, Workers and Engineers to build fortresses.\ +Allows Settlers, Migrants, Workers and Engineers to build forts and \ +fortresses.\ ) cost = 40 @@ -655,7 +656,9 @@ flags= graphic = a.radio graphic_alt = - -helptext = _(Allows Workers and Engineers to build airbases and buoys.) +helptext = _(\ +Allows Workers and Engineers to build airstrips, airbases and buoys.\ +) cost = 540 [advance_railroad] @@ -699,6 +702,10 @@ graphic = a.refrigeration graphic_alt = - cost = 350 +helptext = _(\ +Allows Settlers, Migrants, Workers and Engineers to upgrade \ +irrigation systems to farmland.\ +) [advance_robotics] name = _(Robotics) Modified: branches/S2_6/data/classic/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/techs.ruleset?rev=28541r1=28540r2=28541view=diff == --- branches/S2_6/data/classic/techs.ruleset(original) +++ branches/S2_6/data/classic/techs.rulesetSat Mar 14 17:55:18 2015 @@ -598,7 +598,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) @@ -623,6 +627,10 @@ flags= graphic = a.refrigeration graphic_alt = - +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade irrigation systems \ +to farmland.\ +) [advance_robotics] name = _(Robotics) Modified: branches/S2_6/data/experimental/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/techs.ruleset?rev=28541r1=28540r2=28541view=diff == --- branches/S2_6/data/experimental/techs.ruleset (original) +++ branches/S2_6/data/experimental/techs.ruleset Sat Mar 14 17:55:18 2015 @@ -658,7 +658,11 @@ flags= graphic = a.railroad graphic_alt = - -helptext = _(Decreases one-time revenue from new trade routes.) +helptext = _(\ +Allows Settlers, Workers and Engineers to upgrade roads to railroads.\ +), _(\ +Decreases one-time revenue from new trade routes.\ +) [advance_recycling] name = _(Recycling) @@ -686,6 +690,10 @@ flags
