[Freeciv-Dev] [bug #19646] Typos in nation legends
Follow-up Comment #4, bug #19646 (project freeciv): I am not Asturian myself, and in fact, I had to look it up to make sure that Cuadonga was indeed Covadonga. I think that your reasoning with Moskva would be good if there were an English equivalent for Cuadonga; since there is none, the original name should be kept. But then, it would be quite reasonable for the Spanish translation to have Covadonga instead of Cuadonga. That would have the paradoxical effect that, since we have no Asturian translation, the whole world would see the original Asturian names, except for Asturians themselves, who probably play in Spanish. Duh. Hard to say. Any Asturians in the room? ___ Reply to this item at: http://gna.org/bugs/?19646 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #19646] Typos in nation legends
Follow-up Comment #1, bug #19646 (project freeciv): Revision 21132 by mixcoatl fixed quite a few errors in nation legends, but it introduced a typo in boer.ruleset. Also, it changed the names Cuadonga and Uvieu (in Asturian language, see http://ast.wikipedia.org/wiki/Cuadonga and http://ast.wikipedia.org/wiki/Uvi%C3%A9u) by their Spanish equivalents, Covadonga and Oviedo. From what I've seen, the policy is to keep the original language , if possible. I am attaching a Patch with some translator comments. Also, I think that most of the fixes in 21132 should be propagated to the 2.4 branch. (file #15568) ___ Additional Item Attachment: File name: nations.diff Size:1 KB ___ Reply to this item at: http://gna.org/bugs/?19646 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #19646] Typos in nation legends
Update of bug #19646 (project freeciv): Severity: 3 - Normal = 2 - Minor ___ Reply to this item at: http://gna.org/bugs/?19646 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #19647] Conflict in c-format string
URL: http://gna.org/bugs/?19647 Summary: Conflict in c-format string Project: Freeciv Submitted by: jcreus Submitted on: Sun Apr 15 18:29:26 2012 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: trunk Discussion Lock: Any Operating System: Any Planned Release: ___ Details: In line 282 of manual/civmanual.c, there is a string % of Road Bonus. Since this is c-format, it's causing a conflict when translating, and I believe the % won't show up, even in English. It should be %% of Road Bonus, or some rephrasing, right? ___ Reply to this item at: http://gna.org/bugs/?19647 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18942] Sundry typos and grammar mistakes, and a request for translator notes
Follow-up Comment #3, bug #18942 (project freeciv): One more thing, though. The examples show that it's possible to specify: show=all show=each show=none But the specification only explains: show=plrname|plrbv|plrid Unless this is contained in the string generated under the explanation of the 'show' command. ___ Reply to this item at: http://gna.org/bugs/?18942 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18942] Sundry typos and grammar mistakes, and a request for translator notes
Follow-up Comment #2, bug #18942 (project freeciv): The help text is much better now. The version I had didn't have the intro, and I hadn't noticed the examples at the bottom of the string, so the whole thing was pretty confusing. The translator comments are OK, too. ___ Reply to this item at: http://gna.org/bugs/?18942 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18940] More typos in nation legends
URL: http://gna.org/bugs/?18940 Summary: More typos in nation legends Project: Freeciv Submitted by: jcreus Submitted on: Sun 06 Nov 2011 03:50:51 PM GMT Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.4, trunk Discussion Lock: Any Operating System: Any Planned Release: ___ Details: I have found a few more typos in nation legends. The goldenhorde.ruleset file had extra ^M chars at the end of the line, so I have removed them, too, apart from the word years after 1375. Patch included. ___ File Attachments: --- Date: Sun 06 Nov 2011 03:50:51 PM GMT Name: corr.diff Size: 14kB By: jcreus http://gna.org/bugs/download.php?file_id=14451 ___ Reply to this item at: http://gna.org/bugs/?18940 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18940] More typos in nation legends
Follow-up Comment #1, bug #18940 (project freeciv): I'm posting a new file to include another correction in the experimental buildings.ruleset that has just been fixed in 2.3 but not in trunk or 2.4. corr2.diff includes all the changes in corr.diff, too. (file #14453) ___ Additional Item Attachment: File name: corr2.diff Size:14 KB ___ Reply to this item at: http://gna.org/bugs/?18940 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18942] Sundry typos and grammar mistakes, and a request for translator notes
URL: http://gna.org/bugs/?18942 Summary: Sundry typos and grammar mistakes, and a request for translator notes Project: Freeciv Submitted by: jcreus Submitted on: Sun 06 Nov 2011 06:29:14 PM GMT Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.4, trunk Discussion Lock: Any Operating System: Any Planned Release: ___ Details: These are some mistakes I have found in the code during translation. I am proposing some minimal changes in the included file, but feel free to rework some sentences. I would like to ask for some translator notes in the following spots: The string Build %s (%s) %d %s in client/gui-sdl/menu.c (several lines) The string in common/mapimg.c:656. I think that words in angle brackets should be translated and the words in the left column shouldn't, but it would be good to make sure. Also, an example would be good for users. ___ File Attachments: --- Date: Sun 06 Nov 2011 06:29:14 PM GMT Name: typos.diff Size: 9kB By: jcreus http://gna.org/bugs/download.php?file_id=14454 ___ Reply to this item at: http://gna.org/bugs/?18942 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18891] Can't play at all in Kubuntu Oneiric
Follow-up Comment #10, bug #18891 (project freeciv): The workaround mentioned in bug #18243 works for me. Instead of starting ./civ, you do: GDK_NATIVE_WINDOWS=1 ./civ and everything looks fine. ___ Reply to this item at: http://gna.org/bugs/?18891 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18891] Can't play at all in Kubuntu Oneiric
Follow-up Comment #9, bug #18891 (project freeciv): My installation is Kubuntu (i.e., Ubuntu with KDE). I haven't played long on 2.2.7, but it looks right. ___ Reply to this item at: http://gna.org/bugs/?18891 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18549] Sanity check fails on city in swamp
Follow-up Comment #30, bug #18549 (project freeciv): OK, now I don't get any errors. However, I can't play long. Since I upgraded Ubuntu, I just can't see anything on the map view. I must have a problem with GTK. I will open a separate bug for that, but this one looks OK. Before this late patch, I got assertions just by starting the game, and every time I clicked Turn Done. ___ Reply to this item at: http://gna.org/bugs/?18549 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18891] Can't play at all in Kubuntu Oneiric
URL: http://gna.org/bugs/?18891 Summary: Can't play at all in Kubuntu Oneiric Project: Freeciv Submitted by: jcreus Submitted on: Sun Oct 30 23:01:24 2011 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: None Planned Release: ___ Details: I just upgraded my system to kubuntu Oneiric. It was a painful upgrade, because of problems with the graphic card's proprietary drivers. To make a long story short, I did a clean install, so I had to reinstall everything required by Freeciv to compile. autogen.sh worked beautifully, and everything compiles just fine, but now, when I start Freeciv, I get a black map screen, with no decorations, and no menu. I'm attaching a desktop capture. There must be a problem with GTK? This is the output of dpkg --list | grep gtk ii appmenu-gtk 0.3.0-0ubuntu1 Export GTK menus over DBus ii appmenu-gtk3 0.3.0-0ubuntu1 Export GTK menus over DBus ii avidemux-plugins-gtk 1:2.5.4-0ubuntu7.1 a free video editor - GTK plugins ii freeciv-client-gtk2.2.7-2ubuntu1 Civilization turn based strategy game (GTK+ client) ii gtk2-engines-oxygen 1.1.2-1ubuntu1 Oxygen widget theme for GTK+-based applications ii kde-config-gtk2:0.5.3-1ubuntu2 Configuration module for GTK+ appearance in KDE ii libdbusmenu-gtk3-40.5.0-0ubuntu3 library for passing menus over DBus - GTK+ version ii libdbusmenu-gtk4 0.5.0-0ubuntu3 library for passing menus over DBus - GTK+ version ii libgpod4-nogtk0.8.0-3build1 library to read and write songs to an iPod ii libgtk-3-03.2.0-0ubuntu3 GTK+ graphical user interface library ii libgtk-3-bin 3.2.0-0ubuntu3 programs for the GTK+ graphical user interface library ii libgtk-3-common 3.2.0-0ubuntu3 common files for the GTK+ graphical user interface library ii libgtk2.0-0 2.24.6-0ubuntu5 The GTK+ graphical user interface library ii libgtk2.0-0:i386 2.24.6-0ubuntu5 The GTK+ graphical user interface library ii libgtk2.0-bin 2.24.6-0ubuntu5 The programs for the GTK+ graphical user interface library ii libgtk2.0-common 2.24.6-0ubuntu5 Common files for the GTK+ graphical user interface library ii libgtk2.0-dev 2.24.6-0ubuntu5 Development files for the GTK+ library ii libgtkglext1 1.2.0-1.2fakesync1 OpenGL Extension to GTK+ (shared libraries) ii libwebkitgtk-1.0-01.4.3-0ubuntu3 Web content engine library for Gtk+ ii libwebkitgtk-1.0-common 1.4.3-0ubuntu3 Web content engine library for Gtk+ - data files ii libwxgtk2.8-0 2.8.11.0-0ubuntu10 wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime) ii python-gtk2 2.24.0-2 Python bindings for the GTK+ widget set ___ File Attachments: --- Date: Sun Oct 30 23:01:24 2011 Name: screenshot.png Size: 105kB By: jcreus http://gna.org/bugs/download.php?file_id=14330 ___ Reply to this item at: http://gna.org/bugs/?18891 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18549] Sanity check fails on city in swamp
Follow-up Comment #33, bug #18549 (project freeciv): According to dpkg, I have Gtk 2.24.6. I've opened bug #18891 ___ Reply to this item at: http://gna.org/bugs/?18549 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18891] Can't play at all in Kubuntu Oneiric
Follow-up Comment #4, bug #18891 (project freeciv): For what it's worth, I can run Freeciv 2.2.7 from the Ubuntu menus, and everything looks fine. ___ Reply to this item at: http://gna.org/bugs/?18891 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18891] Can't play at all in Kubuntu Oneiric
Follow-up Comment #6, bug #18891 (project freeciv): Yes, all your assumptions are correct. However, I have tried the wrapper scripts, and the effect is exactly the same (in fact, they end up calling the same executables I did). I have re-run autogen.sh with the --enable-debug flag, and again, same problem. ___ Reply to this item at: http://gna.org/bugs/?18891 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18549] Sanity check fails on city in swamp
Follow-up Comment #25, bug #18549 (project freeciv): No, it kept happening all the time, when moving units, and when pressing Turn Done. However, I haven't been able to test for a few days because of problems during the kubuntu update. I finally managed to get a working system late yesterday. I tried to make clean and recompile, but got a compilation error. I'll try again tonight (CET), and report back. ___ Reply to this item at: http://gna.org/bugs/?18549 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18549] Sanity check fails on city in swamp
Follow-up Comment #27, bug #18549 (project freeciv): Yes, I'm reproducing them again. I also don't get the map view right, or the window decoration, but then it must be something I've done wrong when recompiling or when installing the required libraries. The assertions seem to come from the helper function from the patch on the other bug. ___ Reply to this item at: http://gna.org/bugs/?18549 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18549] Sanity check fails on city in swamp
Follow-up Comment #21, bug #18549 (project freeciv): OK, now I can compile. I have applied only the second file in patch #2957 and both of the patches in this bug. The original assertion doesn't show up any more. But there's a new one. Now, almost every unit generates an assert error like 1: in tile_virtual_check() [tile.c::917]: assertion '0 = tindex tindex map_num_tiles()' failed. I could add savegames, but it really happens all the time. ___ Reply to this item at: http://gna.org/bugs/?18549 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18837] Several typos in nation descriptions
URL: http://gna.org/bugs/?18837 Summary: Several typos in nation descriptions Project: Freeciv Submitted by: jcreus Submitted on: Sat Oct 22 10:26:55 2011 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: 2.4.0 ___ Details: During translation, I have found a few typos in nation descriptions. They are all in trunk, so it would be good to fix them before branching. Patch included. ___ File Attachments: --- Date: Sat Oct 22 10:26:55 2011 Name: corr.diff Size: 4kB By: jcreus Patches for nation typos http://gna.org/bugs/download.php?file_id=14235 ___ Reply to this item at: http://gna.org/bugs/?18837 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18549] Sanity check fails on city in swamp
Follow-up Comment #19, bug #18549 (project freeciv): Sorry for the delay. I didn't realise this was a different patch. I have reverted the previous one, and tested the new one, but I get a linking error: ../common/.libs/libfreeciv.a(tile.o): In function `tile_set_terrain': /home/joanc/freeciv/freeciv-2.3/common/tile.c:128: undefined reference to `tile_virtual_check' I must be doing something wrong... I have even run autogen.sh again, just in case, but I still get the same error. ___ Reply to this item at: http://gna.org/bugs/?18549 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18549] Sanity check fails on city in swamp
Follow-up Comment #17, bug #18549 (project freeciv): I have just tested the patch, and the assertion has disappeared, so it seems to work. However, this is the only difference I have noticed. Before applying the patch, the city tile couldn't be transformed to ocean, even by Engineers. ___ Reply to this item at: http://gna.org/bugs/?18549 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18598] Assertion failed in tile_set_terrain()
URL: http://gna.org/bugs/?18598 Summary: Assertion failed in tile_set_terrain() Project: Freeciv Submitted by: jcreus Submitted on: Sat Sep 3 22:20:00 2011 Category: client Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.3.0+ Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I get the following errors on the client side, when playing Freeciv on the 2.3 SVN branch: 1: in tile_set_terrain() [tile.c::127]: assertion 'NULL == pterrain || !terrain_has_flag(pterrain, TER_NO_CITIES) || NULL == tile_city(ptile)' failed. 1: At (62, 13), the terrain Ocean (nb 1) doesn't support cities, whereas Tarragona (nb 136) is built there. Gameplay doesn't seem to be affected. Units can be moved in and out of the city. ___ File Attachments: --- Date: Sat Sep 3 22:20:00 2011 Name: venenpirates.sav.gz Size: 47kB By: jcreus Savegame that reproduces the problem http://gna.org/bugs/download.php?file_id=14025 ___ Reply to this item at: http://gna.org/bugs/?18598 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18549] Sanity check fails on city in swamp
Follow-up Comment #10, bug #18549 (project freeciv): I have a way to reproduce the problem. The assertion fails whenever the focus moves to a unit inside the problematic city. If the city is empty, nothing happens. If you move a unit into it (or if a unit is built inside the city), the message appears. You can try the savegame I'm adjoining. Just go to Tarragona, change production from Settlers to Warriors, and Turn Done. The focus will pass several units, and when the newly built warriors get the focus, the assertion fails. If the unit goes into sentry, the problem disappears. (file #14028) ___ Additional Item Attachment: File name: freeciv-T0010-Y-3500-auto.sav.gz Size:26 KB ___ Reply to this item at: http://gna.org/bugs/?18549 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Freeciv.org not working
Sorry if it's already been reported, but the HTTP redirection from www.freeciv.org to freeciv.wikia.com isn't working. Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17728] assertion 'ai-phase_is_initialized' failed
Follow-up Comment #7, bug #17728 (project freeciv): Yes, I can confirm that all the errors have disappeared (apart from the n_cols assertion from bug #17608) ___ Reply to this item at: http://gna.org/bugs/?17728 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17728] assertion 'ai-phase_is_initialized' failed
URL: http://gna.org/bugs/?17728 Summary: assertion 'ai-phase_is_initialized' failed Project: Freeciv Submitted by: jcreus Submitted on: Sun Feb 13 18:37:25 2011 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.3.0 beta3 Discussion Lock: Any Operating System: None Planned Release: ___ Details: When loading a savegame, I get the following error: in ai_data_get() [advdata.c::786]: assertion 'ai-phase_is_initialized' failed. Please report So, I'm doing that. After pressing Start, the following message appears on the terminal where I started civ: (freeciv-gtk2:27440): Gtk-CRITICAL **: IA__gtk_table_resize: assertion `n_cols 0 n_cols = 65535' failed From here on, I can play normally, but all the games I save give the same message. Please note that I started playing this game in trunk, so it may be some error propagated from there. ___ File Attachments: --- Date: Sun Feb 13 18:37:25 2011 Name: dominem.sav.gz Size: 81kB By: jcreus http://gna.org/bugs/download.php?file_id=12430 ___ Reply to this item at: http://gna.org/bugs/?17728 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17504] Translator comments needed
URL: http://gna.org/bugs/?17504 Summary: Translator comments needed Project: Freeciv Submitted by: jcreus Submitted on: Sun Jan 16 16:46:29 2011 Category: None Severity: 2 - Minor Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.3 Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I have a doubt on the translation of a couple of strings in helpdlg.c (both for gtk and xaw). I have tried to display the help text where these strings show up, to see the context, but it's been impossible. Can you help me? The strings are in client/gui-gtk-2.0/helpdlg.c:116: Build: client/gui-xaw/helpdlg.c:1078 :Build: %d MP\n I suspect this Build is meant for a city, but it could also be an improvement. ___ Reply to this item at: http://gna.org/bugs/?17504 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17504] Translator comments needed for base help
Update of bug #17504 (project freeciv): Status: Ready For Test = None Planned Release: 2.3.0-beta2 = ___ Follow-up Comment #2: I can see it now, thank you. Isn't MP for movement points a bit ambiguous for users, though? This is clear in the translator comments, but users don't see that. This is what we usually call worker-turns, isn't it? ___ Reply to this item at: http://gna.org/bugs/?17504 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17507] Oceanic terrain class name not localized
URL: http://gna.org/bugs/?17507 Summary: Oceanic terrain class name not localized Project: Freeciv Submitted by: jcreus Submitted on: Sun Jan 16 21:15:35 2011 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.3 Discussion Lock: Any Operating System: None Planned Release: ___ Details: The Oceanic string for the terrain class name doesn't appear in freeciv.pot (it was there in 2.2). And since we are at it, would it be possible to have a qualified string for Land? I would like to use different words to translate Land unit and Land terrain class. ___ Reply to this item at: http://gna.org/bugs/?17507 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17507] Oceanic terrain class name not localized
Follow-up Comment #2, bug #17507 (project freeciv): I've seen it in client/helpdata.c:532, the help for bases mentioned in bug #17504. The string is Requires %s terrain class on the tile.n. For the Buoy, this terrain class is Oceanic. There's also Requires %s terrain class on an adjacent tile.n as the next string, and %s can't build %s from the worklist; %s terrain class is required. in cityturn.c ___ Reply to this item at: http://gna.org/bugs/?17507 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17509] Qualify string Land for i18n (unit vs terrain class)
Follow-up Comment #1, bug #17509 (project freeciv): That's just fine, thanks. ___ Reply to this item at: http://gna.org/bugs/?17509 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17161] Article missing
URL: http://gna.org/bugs/?17161 Summary: Article missing Project: Freeciv Submitted by: jcreus Submitted on: Saturday 11/27/10 at 19:33 Category: None Severity: 3 - Normal Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.2, 2.3, trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I think that the new enhanced strings for diplomatic actions lack an article, as in Eliminated ba/b French Spy while infiltrating... or Your Diplomat eliminated ba/b Polish Diplomat while ... There's a problem in English if the nation starts with a vowel, but the missing article is altogether worse. ___ File Attachments: --- Date: Saturday 11/27/10 at 19:33 Name: dipl.diff Size: 3kB By: jcreus Suggested patch http://gna.org/bugs/download.php?file_id=11399 ___ Reply to this item at: http://gna.org/bugs/?17161 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17163] String corrections
URL: http://gna.org/bugs/?17163 Summary: String corrections Project: Freeciv Submitted by: jcreus Submitted on: Saturday 11/27/10 at 21:26 Category: None Severity: 3 - Normal Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: None Planned Release: ___ Details: The allied victory string had a grammar mistake, and I have rephrased it. I think it's clearer now. There was another problem in stdinhand.c ___ File Attachments: --- Date: Saturday 11/27/10 at 21:26 Name: sett.diff Size: 1kB By: jcreus Patch with corrections http://gna.org/bugs/download.php?file_id=11401 ___ Reply to this item at: http://gna.org/bugs/?17163 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17163] String corrections
Follow-up Comment #2, bug #17163 (project freeciv): OK, then, what about if this option is turned on and all the players still able to win the game ... ___ Reply to this item at: http://gna.org/bugs/?17163 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17078] Corrections to the celtiberian ruleset
URL: http://gna.org/bugs/?17078 Summary: Corrections to the celtiberian ruleset Project: Freeciv Submitted by: jcreus Submitted on: Sunday 11/14/10 at 13:51 Category: None Severity: 3 - Normal Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.3, trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I think the celtiberians shouldn't be described as coming from Eastern Spain. See http://en.wikipedia.org/wiki/File:Ethnographic_Iberia_200_BCE.PNG. They lived in Central Spain or, at most, East-Central Spain. I have done some language corrections, too. ___ File Attachments: --- Date: Sunday 11/14/10 at 13:51 Name: celt.diff Size: 754B By: jcreus Patch for the celtiberian ruleset http://gna.org/bugs/download.php?file_id=11213 ___ Reply to this item at: http://gna.org/bugs/?17078 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17079] Help text wrong, I think
URL: http://gna.org/bugs/?17079 Summary: Help text wrong, I think Project: Freeciv Submitted by: jcreus Submitted on: Sunday 11/14/10 at 13:58 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.3, trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: When describing the Citizen Governor, you get the following text: Use 'Game' -- 'Save Settings' to store your presets permanently. I think this is wrong, at least in the GTK version. It should be 'Game' - 'Options' - 'Save Options Now'. Is this right? ___ Reply to this item at: http://gna.org/bugs/?17079 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #17034] Several typos in nations and settings
URL: http://gna.org/bugs/?17034 Summary: Several typos in nations and settings Project: Freeciv Submitted by: jcreus Submitted on: Sunday 11/07/10 at 19:05 Category: None Severity: 2 - Minor Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I have found a few typographic errors in new nations. The only remarkable change is in the uzbek ruleset, where I have changed ancestors to descendants. I think it makes more sense. ___ File Attachments: --- Date: Sunday 11/07/10 at 19:05 Name: typos.diff Size: 5kB By: jcreus Corrections patch http://gna.org/bugs/download.php?file_id=11145 ___ Reply to this item at: http://gna.org/bugs/?17034 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16896] Indonesian ordinal numbers
Follow-up Comment #7, bug #16896 (project freeciv): Pepeto's solution works for Indonesian (you would translate all strings like %sst, %snd,... as ke-%s), but, as he points out, it will be hard to accomodate all languages, and the current coding is English-centric. Catalan is similar to French, but we have 1 to 4 as special cases. Probably the only way around that will suit most languages is the ranked %d approach, as coded in Daniel's patch. ___ Reply to this item at: http://gna.org/bugs/?16896 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16894] Non-ASCII string at mordvin.ruleset
Follow-up Comment #2, bug #16894 (project freeciv): Just for the record, I have done an octal dump of the file, and the c at the word Finnic was in fact characters 0xD1 and 0x81 (the octal dump translated them as a capital Q and a SOH character which is what you get if you drop the high order bit). Strange what some keyboards can do. ___ Reply to this item at: http://gna.org/bugs/?16894 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16881] Sundry corrections, mostly in new nations
URL: http://gna.org/bugs/?16881 Summary: Sundry corrections, mostly in new nations Project: Freeciv Submitted by: jcreus Submitted on: Sunday 10/17/10 at 10:32 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: trunk Discussion Lock: Any Operating System: None Planned Release: ___ Details: I have found a few more typos and grammar mistakes, mostly in new nations. I have also removed the ^M's in the teutonic ruleset, which makes it hard to find the corrections. The fix is Franconia for Franconian, and the removal of the space after Baden-. Patch attached. ___ File Attachments: --- Date: Sunday 10/17/10 at 10:32 Name: nations.diff Size: 15kB By: jcreus Corrections patch http://gna.org/bugs/download.php?file_id=10814 ___ Reply to this item at: http://gna.org/bugs/?16881 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16881] Sundry corrections, mostly in new nations
Follow-up Comment #1, bug #16881 (project freeciv): In the southamerican ruleset, the female title for Comandante should be Comandanta instead of Comananta. (file #10815) ___ Additional Item Attachment: File name: southam.diff Size:1 KB ___ Reply to this item at: http://gna.org/bugs/?16881 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16884] What is a Quincy, anyway?
Update of bug #16884 (project freeciv): Severity: 3 - Normal = 1 - Wish ___ Reply to this item at: http://gna.org/bugs/?16884 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16884] What is a Quincy, anyway?
URL: http://gna.org/bugs/?16884 Summary: What is a Quincy, anyway? Project: Freeciv Submitted by: jcreus Submitted on: Sunday 10/17/10 at 17:11 Category: None Severity: 3 - Normal Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: None Planned Release: ___ Details: The multiplayer ruleset has a lot of team names, and they are supposed to be translated. The theme for the names is colors, and some of them are quite unusual (Xanadu!), but, hey, that's what Google is for. One of them beats me, though: Quincy. Am I missing something? Can someone add a translator note, or just remove it? ___ Reply to this item at: http://gna.org/bugs/?16884 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16878] Some strings can't be translated
URL: http://gna.org/bugs/?16878 Summary: Some strings can't be translated Project: Freeciv Submitted by: jcreus Submitted on: Saturday 10/16/10 at 23:21 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: The buildings.ruleset in experimental and multiplayer have a few strings with percent signs that lack the no-c-format directive. The attached patch also corrects a frequent typo in continent. ___ File Attachments: --- Date: Saturday 10/16/10 at 23:21 Name: cformat.diff Size: 2kB By: jcreus Patch for experimental and multiplayer rulesets http://gna.org/bugs/download.php?file_id=10812 ___ Reply to this item at: http://gna.org/bugs/?16878 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16799] String in freeciv.pot can't be translated
Follow-up Comment #2, bug #16799 (project freeciv): Two more rulesets? Only the default one is in POTFILES.in, though. Perhaps we should add the multiplayer and experimental stuff in POTFILES.in? ___ Reply to this item at: http://gna.org/bugs/?16799 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16799] String in freeciv.pot can't be translated
URL: http://gna.org/bugs/?16799 Summary: String in freeciv.pot can't be translated Project: Freeciv Submitted by: jcreus Submitted on: Saturday 10/02/10 at 10:56 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: The new string (generated after the recent string split in trunk) Under Despotism the city containing the palace gains a +75% production bonus, and under Monarchy a +50% production bonus. contains the percent sign, but lacks the no-c-format directive, which confuses gettext. Patch attached. ___ File Attachments: --- Date: Saturday 10/02/10 at 10:56 Name: buildings.diff Size: 599B By: jcreus Patch for buildings.diff http://gna.org/bugs/download.php?file_id=10545 ___ Reply to this item at: http://gna.org/bugs/?16799 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16662] Some more string corrections
Follow-up Comment #2, bug #16662 (project freeciv): I am adding a few more corrections for new nations. (file #10427) ___ Additional Item Attachment: File name: morenations.diff Size:6 KB ___ Reply to this item at: http://gna.org/bugs/?16662 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16750] Visigothic nation breaks freeciv.pot
URL: http://gna.org/bugs/?16750 Summary: Visigothic nation breaks freeciv.pot Project: Freeciv Submitted by: jcreus Submitted on: Thursday 09/23/10 at 18:28 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: The Monarchy name for the visigothic nation (on line 40) contains a strange character that breaks the compilation of freeciv.pot. ___ Reply to this item at: http://gna.org/bugs/?16750 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16662] Some more string corrections
URL: http://gna.org/bugs/?16662 Summary: Some more string corrections Project: Freeciv Submitted by: jcreus Submitted on: Tuesday 09/07/10 at 21:18 Category: None Severity: 2 - Minor Priority: 4 Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I have found a few more typos, grammar and punctuation mistakes, mostly in the new batch of nations, but also in the server settings. In the case of the Crimean Tatars, I don't like my own proposal very much. Perhaps a full rewrite should be better. Patches attached, just for trunk. 2.2 is not affected. ___ File Attachments: --- Date: Tuesday 09/07/10 at 21:18 Name: nations.diff Size: 5kB By: jcreus Patches for trunk http://gna.org/bugs/download.php?file_id=10233 --- Date: Tuesday 09/07/10 at 21:18 Name: settings.diff Size: 698B By: jcreus Patches for trunk http://gna.org/bugs/download.php?file_id=10234 ___ Reply to this item at: http://gna.org/bugs/?16662 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16543] Grammar mistake
URL: http://gna.org/bugs/?16543 Summary: Grammar mistake Project: Freeciv Submitted by: jcreus Submitted on: Thursday 08/26/10 at 15:59 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I have found a grammar mistake in options.c, both in trunk and in 2.2. If the string freeze is not final, can we squeeze it into 2.2.3? Patches attached. ___ File Attachments: --- Date: Thursday 08/26/10 at 15:59 Name: options.diff Size: 750B By: jcreus Patches for 2.2 and trunk http://gna.org/bugs/download.php?file_id=10019 --- Date: Thursday 08/26/10 at 15:59 Name: optionstrunk.diff Size: 752B By: jcreus Patches for 2.2 and trunk http://gna.org/bugs/download.php?file_id=10020 ___ Reply to this item at: http://gna.org/bugs/?16543 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16514] Several typos detected
URL: http://gna.org/bugs/?16514 Summary: Several typos detected Project: Freeciv Submitted by: jcreus Submitted on: Sunday 08/22/10 at 13:28 Category: general Severity: 2 - Minor Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I have found a few more typos during translation, mostly in new nations, and one in the client options. Everything is in trunk; 2.2 is not affected. Patches attached. ___ File Attachments: --- Date: Sunday 08/22/10 at 13:28 Name: nations.diff Size: 3kB By: jcreus Patches for trunk http://gna.org/bugs/download.php?file_id=9977 --- Date: Sunday 08/22/10 at 13:28 Name: options.diff Size: 839B By: jcreus Patches for trunk http://gna.org/bugs/download.php?file_id=9978 ___ Reply to this item at: http://gna.org/bugs/?16514 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16401] Typos, mostly in new nations
URL: http://gna.org/bugs/?16401 Summary: Typos, mostly in new nations Project: Freeciv Submitted by: jcreus Submitted on: Tuesday 08/10/10 at 20:26 Category: general Severity: 3 - Normal Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I have found a few more typos. One seems to be a forgotten because in edithand.c (it used to be there in 2.2), and the others are several mistakes in nation legends. I have taken the liberty to replace situated by located in the cypriot ruleset. I am not a native English speaker, but situated sounds like a literal translation from some romance language. Only one mistake is in 2.2; the rest are just for trunk. I am including three separate patches: one for server/edithand.c, another for the trunk rulesets and the other for the laotian ruleset in 2.2. ___ File Attachments: --- Date: Tuesday 08/10/10 at 20:26 Name: edithand.diff Size: 520B By: jcreus Patches http://gna.org/bugs/download.php?file_id=9783 --- Date: Tuesday 08/10/10 at 20:26 Name: laotian.diff Size: 575B By: jcreus Patches http://gna.org/bugs/download.php?file_id=9784 --- Date: Tuesday 08/10/10 at 20:26 Name: nations.diff Size: 4kB By: jcreus Patches http://gna.org/bugs/download.php?file_id=9785 ___ Reply to this item at: http://gna.org/bugs/?16401 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16374] Typos in
URL: http://gna.org/bugs/?16374 Summary: Typos in Project: Freeciv Submitted by: jcreus Submitted on: Friday 08/06/10 at 20:57 Category: general Severity: 3 - Normal Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: I have found a few typos while translating. Most are invalid plurals, and also a non-capitalized Freeciv. Patches attached for trunk (these strings don't appear in 2.2). ___ File Attachments: --- Date: Friday 08/06/10 at 20:57 Name: settings.diff Size: 3kB By: jcreus Patches proposed http://gna.org/bugs/download.php?file_id=9723 --- Date: Friday 08/06/10 at 20:57 Name: techtools.diff Size: 991B By: jcreus Patches proposed http://gna.org/bugs/download.php?file_id=9724 --- Date: Friday 08/06/10 at 20:57 Name: stdinhand.diff Size: 762B By: jcreus Patches proposed http://gna.org/bugs/download.php?file_id=9725 ___ Reply to this item at: http://gna.org/bugs/?16374 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16374] Typos in
Additional Item Attachment, bug #16374 (project freeciv): File name: all.diff Size:4 KB ___ Reply to this item at: http://gna.org/bugs/?16374 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15890] Typo in settings.c
URL: http://gna.org/bugs/?15890 Summary: Typo in settings.c Project: Freeciv Submitted by: jcreus Submitted on: Friday 04/16/10 at 22:43 Category: None Severity: 2 - Minor Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.2.0 Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: In one of the new help texts, there is a non instead of none. Furthermore, careful is spelt with two l's. There is also a plural form after none. There are lots of discussions concerning this last plural form, but it seems that formal English requires singular (although many speakers will use plural informally). See http://forum.wordreference.com/showthread.php?t=91606 Patch attached. ___ File Attachments: --- Date: Friday 04/16/10 at 22:43 Name: settings.diff Size: 837B By: jcreus Patch suggested http://gna.org/bugs/download.php?file_id=8991 ___ Reply to this item at: http://gna.org/bugs/?15890 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15324] Line feed not escaped in help text
URL: http://gna.org/bugs/?15324 Summary: Line feed not escaped in help text Project: Freeciv Submitted by: jcreus Submitted on: Tuesday 02/09/10 at 23:05 Category: general Severity: 3 - Normal Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.2.0beta Discussion Lock: Any Operating System: GNU/Linux Planned Release: 2.2.0 ___ Details: A backslash is missing at the end of a line, which makes the string incomplete, in helpdata.txt Patch included. ___ File Attachments: --- Date: Tuesday 02/09/10 at 23:05 Name: helpdata.diff Size: 540B By: jcreus Patch suggested http://gna.org/bugs/download.php?file_id=8035 ___ Reply to this item at: http://gna.org/bugs/?15324 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected
Follow-up Comment #14, bug #15092 (project freeciv): I have tested the patch and it works just fine. Up to now the best trade route I had was 3 and it became 9. Other intercontinental trade routes range between 5 and 8. Good for me. ___ Reply to this item at: http://gna.org/bugs/?15092 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected
Follow-up Comment #12, bug #15092 (project freeciv): The bonus for trade routes spanning different empires has always been there, and for a good reason: if both cities belong to you, each city gets half the revenue, but the empire gets it twice. So, yes, if you lose a city, the trade for the remaining city will double (but you will lose all the trade from the other). The bonus for different continents has also been there forever, and it reflects the added difficulty of having to carry the caravan overseas. It does have an historical analogy: think the Silk Route or the gold trade with America. Trade with other continents brings more valuable stuff and traders get richer. As for the factor of 6 vs. 8, we should really do some simulations and choose whatever is closer to 2.1. Do you really ever get 5 revenue on the same island in 2.1, even in large islands? I'm afraid that, as game progresses, and trade routes span really large distances, we will have absurdly large revenues if the division factor is too low. I would start with 8 in beta 3, and perhaps try 6 in beta 4, then take a final decision before release. This will give my empire a much-needed economic boost in its war against cheating AIs :-). ___ Reply to this item at: http://gna.org/bugs/?15092 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected
Follow-up Comment #8, bug #15092 (project freeciv): In 2.1, it is already difficult to rapture on your own island. I think that distance should be a major factor in the revenue of a given trade route. It already is for the initial payout, isn't it? Anyway, from what I've seen, the goal of this change wasn't to decrease the power of Caravans: it looks like this reduction is the unintended side-effect of a change that intended to simplify trade computations and savegame complexity, breaking the circularity of having trade depend on trade routes and trade routes depend on trade. So, the challenge is to come up with a formula that doesn't use trade as an input, and gets a similar result to the old one. The old formula is basically (Trade1+Trade2+4)/16. This is doubled if cities are in different continents, and/or if cities belong to different players. Pepeto's proposal could be seen as an approximation of the old formula, if we think that trade is twice the size of the city. Then (Trade1+Trade2)/16 ~ 2*(Size1+Size2)/16 = (size1+size2)/8. The big difference is that other trade routes don't influence the final result, so they don't multiply. To compensate for that, we add the distance_between_cities parameter. I think it's good enough. Sure, at the beginning of the game on a single island, trade routes won't amount to much, but as game progresses, if you get a good railroad and transport network, the distance parameter may shoot up, resulting in astronomic revenues. Since we are in a beta, we might as well try it, and keep an eye on it, listen to feedback, and perhaps change it again before the final release (perhaps the distance_between_cities parameter should be divided by 16 instead of 8, I don't know). We should always check that the revenue is at least 1, to prevent short trade routes from giving 0 revenue. ___ Reply to this item at: http://gna.org/bugs/?15092 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected
URL: http://gna.org/bugs/?15092 Summary: Trade route revenue lower than expected Project: Freeciv Submitted by: jcreus Submitted on: Sunday 01/10/10 at 14:40 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.2 beta 2 Discussion Lock: Any Operating System: GNU/Linux Planned Release: 2.2 ___ Details: I am playing a game against cheating AIs. I have noticed that all my trade routes give a revenue of 2 or lower. For instance, a trade route between two cities with 39 and 21 trade points, on different continents, half a world apart, gives only 2 points. According to the formula in http://freeciv.wikia.com/wiki/Trade_route_revenue#Trade that should be 8 (39+21+4)/8 I am attaching a savegame. There are lots of trade routes, but you may look at the ones in Montserrat, on a small island north of the Catalan nation. ___ File Attachments: --- Date: Sunday 01/10/10 at 14:40 Name: creix.sav.gz Size: 84kB By: jcreus Savegame showing low-revenue trade routes http://gna.org/bugs/download.php?file_id=7647 ___ Reply to this item at: http://gna.org/bugs/?15092 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15093] Hut messages not localized
URL: http://gna.org/bugs/?15093 Summary: Hut messages not localized Project: Freeciv Submitted by: jcreus Submitted on: Sunday 01/10/10 at 15:28 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.2 beta 2 Discussion Lock: Any Operating System: None Planned Release: 2.2 ___ Details: I have noticed that the messages you get when exploring a hut are not translated. In most .po files, the strings still exist, but they have been commented out. These strings are defined in data/default/default.lua, but this file doesn't appear in the Makefile, or in POTFILES.in It would be interesting to make un update-po after fixing POTFILES.in, so most translations will be recovered. Patch attached. ___ File Attachments: --- Date: Sunday 01/10/10 at 15:28 Name: potfiles.diff Size: 362B By: jcreus http://gna.org/bugs/download.php?file_id=7648 ___ Reply to this item at: http://gna.org/bugs/?15093 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15094] Small typo in server/commands.c
URL: http://gna.org/bugs/?15094 Summary: Small typo in server/commands.c Project: Freeciv Submitted by: jcreus Submitted on: Sunday 01/10/10 at 15:33 Category: None Severity: 2 - Minor Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.2 beta 2 Discussion Lock: Any Operating System: GNU/Linux Planned Release: 2.2 ___ Details: There is a space missing in the server options help text. Patch attached. ___ File Attachments: --- Date: Sunday 01/10/10 at 15:33 Name: commands.diff Size: 622B By: jcreus diff file http://gna.org/bugs/download.php?file_id=7649 ___ Reply to this item at: http://gna.org/bugs/?15094 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected
Follow-up Comment #3, bug #15092 (project freeciv): With this algorithm, in one of the routes, the distance is about 30, city sizes are 11 and 6, and they are both mine. So, we get (30+11+6)/16 = 2.93. I get 2 revenue. Damn, at least we could round it up! This is one major change. It's a lot harder to make cities celebrate. Plus, trade route revenue doesn't depend on how commercial a city is or on which continent they are. Is this the goal? Were trade routes too advantageous to humans over AIs? I see that the change was done in March 2007, but there wasn't much discussion about its chilling effects on world trade. Maybe it's time to debate it now? My opinion is that it's too drastic, and most other users will complain loudly. At least, we should change the division factor from 16 to 8 or more. It will still be half of what it used to be, but right now, making trade routes is not that attractive any more. ___ Reply to this item at: http://gna.org/bugs/?15092 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected
Follow-up Comment #5, bug #15092 (project freeciv): I think in this case, the same-player quality cancels out the different-continent, so it would be (30+11+6)/8 = 5,87. If we round it instead of truncating, a 6. It would be lower than usual, but this is OK. I think trade routes are possibly too much of an advantage. Anyway, I think this issue has strong effects on gameplay and deserves some more feedback from the community. Any more opinions? One more question: will trade route revenues get updated as cities grow? ___ Reply to this item at: http://gna.org/bugs/?15092 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14898] Copy/paste typo in helpdata
URL: http://gna.org/bugs/?14898 Summary: Copy/paste typo in helpdata Project: Freeciv Submitted by: jcreus Submitted on: Monday 12/07/09 at 16:02 Category: docs Severity: 2 - Minor Priority: 3 - Low Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: GNU/Linux Planned Release: 2.2.0 ___ Details: In the help for links to units in the chat window there is a reference to cities, probably because it's been pasted from the previous lines. I am including a patch. ___ File Attachments: --- Date: Monday 12/07/09 at 16:02 Name: helpdata.diff Size: 563B By: jcreus http://gna.org/bugs/download.php?file_id=7462 ___ Reply to this item at: http://gna.org/bugs/?14898 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14898] Copy/paste typo in helpdata
Follow-up Comment #1, bug #14898 (project freeciv): Now that we are at it, how can you get the id of a city or a unit? ___ Reply to this item at: http://gna.org/bugs/?14898 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14814] Typos in help and in some server files
Follow-up Comment #7, bug #14814 (project freeciv): Looks good to me. With this patch the translation of commands gets settled for good. ___ Reply to this item at: http://gna.org/bugs/?14814 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14813] Several typos in options.c
URL: http://gna.org/bugs/?14813 Summary: Several typos in options.c Project: Freeciv Submitted by: jcreus Submitted on: Saturday 11/21/09 at 15:16 Category: client Severity: 2 - Minor Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.2 Discussion Lock: Any Operating System: GNU/Linux Planned Release: 2.2.0 ___ Details: I have found a few mistakes in the new options for 2.2. I am including a diff file with my corrections. ___ File Attachments: --- Date: Saturday 11/21/09 at 15:16 Name: options.diff Size: 4kB By: jcreus http://gna.org/bugs/download.php?file_id=7355 ___ Reply to this item at: http://gna.org/bugs/?14813 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14814] Typos in help and in some server files
URL: http://gna.org/bugs/?14814 Summary: Typos in help and in some server files Project: Freeciv Submitted by: jcreus Submitted on: Saturday 11/21/09 at 15:46 Category: general Severity: 2 - Minor Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.2 Discussion Lock: Any Operating System: None Planned Release: 2.2.0 ___ Details: This is my last typo submission (at least, for a while). I am including corrections which I'm not much sure of. In client/helpdata.c, there's a strange sentence about a requirement to play a given nation; also, I don't think the word you should be capitalized in the help system. Also, in the server/commands.c file, the reset command shouldn't be translated. Right now, it's asking to, and this may confuse translators. Finally, in server/stdinhand.c, I think the verb tense in that sentence should be Present Perfect, instead of Simple Past. ___ File Attachments: --- Date: Saturday 11/21/09 at 15:46 Name: helpdata.c.diff Size: 1kB By: jcreus http://gna.org/bugs/download.php?file_id=7356 --- Date: Saturday 11/21/09 at 15:46 Name: stdinhand.c.diff Size: 426B By: jcreus http://gna.org/bugs/download.php?file_id=7357 --- Date: Saturday 11/21/09 at 15:46 Name: commands.c.diff Size: 817B By: jcreus http://gna.org/bugs/download.php?file_id=7358 ___ Reply to this item at: http://gna.org/bugs/?14814 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14813] Several typos in options.c
Follow-up Comment #2, bug #14813 (project freeciv): You are right. I have deleted the old patch and I am including an up-to-date one. (file #7360) ___ Additional Item Attachment: File name: options2.diff Size:3 KB ___ Reply to this item at: http://gna.org/bugs/?14813 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [patch #1238] Add nation: Toulousain
Follow-up Comment #2, patch #1238 (project freeciv): I am not Occitan, nor an expert in Occitan history, but I think this ruleset has a few problems: - The county of Toulouse was one of several independent counties and duchies that existed in today's southern France. They shared a common language, but were never united under a single ruler. Some counties were intertwined with each other as fiefs, so this complicates the issue a little more. So, Foix and Carcasonne, although technically fiefs of Toulouse, were also de facto independent, quite powerful (and even waged war on Toulouse). - So, I would remove cities like Foix, and several villages around Foix, as well as Carcasonne. - The names of the rulers are incorrect. If given in French, they should be Raymond; in Occitan, they should be Raimon; the women should be Felipa and Joana. - Some cities do not belong at all here, not even as Occitan. Perpignan wasn't French until 1659, and belonged to the Kingdom of Catalonia-Aragon during all the Medieval period. Also, there are several Prades in the area, but the largest one is also Catalan. (There is a Prades near Foix, but it's only got 50 inhabitants) I haven't found a Carol, but if it means La Tour-de-Carol, that is also Catalan. - The ruleset uses the current official names of the cities, in French. I think that we should respect the original names, in Occitan: Tolosa, Montpelhièr, Besièrs, Cassanhas, ... At least, this is how they were called in the heyday of the Occitan counties. In short, if this ruleset is to be just Toulousain, it should use only cities that had belonged to the County of Toulouse. If we keep the list, then most of them (and a few rulers) could be merged with the Occitan ruleset. ___ Reply to this item at: http://gna.org/patch/?1238 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [patch #1238] Add nation: Toulousain
Follow-up Comment #4, patch #1238 (project freeciv): I agree that it's hard to define the boundaries of these counties. In fact, the map of the County of Toulouse shown in the French wikipedia shows the county of Roussillon as part of the county of Toulouse in 1154. I have found no other source that confirms this. As far as I know, it was an independent county that became part of the kingdom of Aragon in 1172. Before the formal annexion, it had been the birthplace of the first Catalan count, and that's why it's always considered Catalan. This goes for Perpignan. But the Prades you mention is indeed Occitan. Daniel is the expert, here, but I believe that, for non-modern nations, it's OK in Freeciv to include cities that have been part of the empire at some point in time. I agree that it would be a good thing to include some women as rulers. I am not sure that Joana is considered a good queen for Occitans,though, since she is the one that sold out to the French King. If we expand the scope to all the Occitan counties and duchies, there is another excellent candidate, though: Alienòr d'Aquitània (Eleanor of Aquitaine), who must have been an extraordinary woman, who actually ruled as a duchess of Aquitaine, became Queen of France, divorced, married an English prince and became the mother of two English Kings (Richard the Lionheart and John Lackland). During her extremely long rule as Duchess (from the age of 15 until her death at 82) she had a very important role in European politics. So, if you want to add rulers or cities to the Occitan ruleset, feel free. Or I can do it for you, as you like. ___ Reply to this item at: http://gna.org/patch/?1238 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40744) Slight error in new strings
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40744 You're right. If you consider %d turn as a determinant to cease-fire, it makes grammatical sense, and the PL_ is good for languages such as mine. OK, then. Joan 2009/3/8 Madeline Book madeline.b...@gmail.com URL: http://bugs.freeciv.org/Ticket/Display.html?id=40744 [book - Sat Mar 07 20:30:02 2009]: [joan.cr...@gmail.com - Sat Mar 07 18:28:20 2009]: While updating my translation, I have noticed that a few new strings in text.c had a double singular/plural form, but the plural one was the same as the singular. The sentences were about %d turns cease-fire Patch included, in case you feel it should be committed. Freeciv.pot should be updated, too. Thanks for noticing the typos and making a patch. I must have made the mistakes when copying the new code; I'll commit your fix as soon as possible. I checked the original (before my recent popit text patch) and it too had N turn cease-fire (N 1). I think in English saying 5 turn cease-fire is grammatically fine, at least I gather as much from my gut instinct. I assume the reason this string was wrapped in PL_() was for other languages for which some part of the phrase might need to be modified for N 1. So unless someone can convince me that indeed 5 turns cease-fire is more correct according to some rule of English grammar, I will keep the current strings as they are. --- 文法屋が町を出たという噂を聞きましたか。 Youre right.If you consider %d turn as a determinant to cease-fire, it makes grammatical sense, and the PL_ is good for languages such as mine. OK, then. Joan 2009/3/8 Madeline Book madeline.b...@gmail.com URL: http://bugs.freeciv.org/Ticket/Display.html?id=40744 [book - Sat Mar 07 20:30:02 2009]: [joan.cr...@gmail.com - Sat Mar 07 18:28:20 2009]: While updating my translation, I have noticed that a few new strings in text.c had a double singular/plural form, but the plural one was the same as the singular. The sentences were about %d turns cease-fire Patch included, in case you feel it should be committed. Freeciv.pot should be updated, too. Thanks for noticing the typos and making a patch. I must have made the mistakes when copying the new code; Ill commit your fix as soon as possible.I checked the original (before my recent popit text patch)and it too had N turn cease-fire (N 1). I think inEnglish saying 5 turn cease-fire is grammatically fine, at least I gather as much from my gut instinct. I assumethe reason this string was wrapped in PL_() was for otherlanguages for which some part of the phrase might need tobe modified for N 1.So unless someone can convince me that indeed 5 turns cease-fire is more correct according to some rule ofEnglish grammar, I will keep the current strings as theyare.---文法屋が町を出たという噂を聞きましたか。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40305) G++ not tested in autogen.sh
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40305 I have uninstalled g++, applied the patch, called make, and now the checks warn of the missing compiler. Here is the relevant output: checking for gawk... (cached) mawk checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for g++... no checking for c++... no checking for gpp... no checking for aCC... no checking for CC... no checking for cxx... no checking for cc++... no checking for cl.exe... no checking for FCC... no checking for KCC... no checking for RCC... no checking for xlC_r... no checking for xlC... no checking whether we are using the GNU C++ compiler... no checking whether g++ accepts -g... no checking dependency style of g++... none checking whether the C++ compiler works... no configure: error: no acceptable C++ compiler found in $PATH See `config.log' for more details. make: *** [config.status] Error 1 Thanks a lot! Joan 2009/3/4 Christian Prochaska cp.ml.freeciv@googlemail.com URL: http://bugs.freeciv.org/Ticket/Display.html?id=40305 [joan.cr...@gmail.com - Sun Jun 22 15:36:48 2008]: I can't build version 2.2, because g++ is not installed. The error message is: ../../../../bootstrap/depcomp: line 470: exec: g++: not found make[5]: *** [toluaxx.bind.o] Error 127 I can install g++, sure, but perhaps autogen.sh should have checked g++'s existence before? Right now, autogen doesn't report any problems. Joan Patch attached. AC_PROG_CXX does not abort when no C++ compiler is found, it just sets CXX to g++ in this case. So a separate check is needed. I have uninstalled g++, applied the patch, called make, and now the checks warn of the missing compiler. Here is the relevant output:checking for gawk... (cached) mawkchecking for gcc... (cached) gccchecking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yeschecking for gcc option to accept ISO C89... (cached) none neededchecking dependency style of gcc... (cached) gcc3checking how to run the C preprocessor... gcc -E checking for g++... nochecking for c++... nochecking for gpp... nochecking for aCC... nochecking for CC... nochecking for cxx... nochecking for cc++... nochecking for cl.exe... nochecking for FCC... no checking for KCC... nochecking for RCC... nochecking for xlC_r... nochecking for xlC... nochecking whether we are using the GNU C++ compiler... nochecking whether g++ accepts -g... nochecking dependency style of g++... none checking whether the C++ compiler works... noconfigure: error: no acceptable C++ compiler found in $PATHSee `config.log for more details.make: *** [config.status] Error 1Thanks a lot!Joan 2009/3/4 Christian Prochaska cp.ml.freeciv@googlemail.com URL: http://bugs.freeciv.org/Ticket/Display.html?id=40305 [joan.cr...@gmail.com - Sun Jun 22 15:36:48 2008]: I cant build version 2.2, because g++ is not installed. The error message is: ../../../../bootstrap/depcomp: line 470: exec: g++: not found make[5]: *** [toluaxx.bind.o] Error 127 I can install g++, sure, but perhaps autogen.sh should have checked g++s existence before? Right now, autogen doesnt report any problems. Joan Patch attached. AC_PROG_CXX does not abort when no C++ compiler is found, it just sets CXX to g++ in this case. So a separate check is needed. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40744) Slight error in new strings
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40744
This transaction appears to have no content
While updating my translation, I have noticed that a few new strings in
text.c had a double singular/plural form, but the plural one was the same as
the singular.
The sentences were about %d turns cease-fire
Patch included, in case you feel it should be committed. Freeciv.pot should
be updated, too.
Joan
While updating my translation, I have noticed that a few new strings in text.c had a double singular/plural form, but the plural one was the same as the singular.The sentences were about %d turns cease-fire
Patch included, in case you feel it should be committed. Freeciv.pot should be updated, too.Joan
Index: text.c
===
--- text.c (revision 15569)
+++ text.c (working copy)
@@ -184,7 +184,7 @@
* (number turn cease-fire) */
astr_add_line(str,
PL_(Territory of %s (%s) (%d turn cease-fire),
- Territory of %s (%s) (%d turn cease-fire),
+ Territory of %s (%s) (%d turns cease-fire),
turns),
username, nation, turns);
} else {
@@ -222,7 +222,7 @@
/* TRANS: City: city name | username
* (nation + team, number turn cease-fire) */
astr_add_line(str, PL_(City: %s | %s (%s, %d turn cease-fire),
-City: %s | %s (%s, %d turn cease-fire),
+City: %s | %s (%s, %d turns cease-fire),
turns),
city_name(pcity), username, nation, turns);
} else {
@@ -303,7 +303,7 @@
/* TRANS: Unit: unit type | username (nation + team,
* number turn cease-fire) */
astr_add_line(str, PL_(Unit: %s | %s (%s, %d turn cease-fire),
-Unit: %s | %s (%s, %d turn cease-fire),
+Unit: %s | %s (%s, %d turns cease-fire),
turns),
utype_name_translation(ptype),
username, nation, turns);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40517) Can't load savegames in 2.2
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517
I have applied the patch, and started a new game. It didn't make any
difference, and I still couldn't load any of the saved files.
Then I have started ./civ with the --log option, and the problem was in
fact:
3: Could not find readable file
/home/joanc/.freeciv/saves/anemdeconya.sav..sav in data path.
3: Could not find readable file
/home/joanc/.freeciv/saves/anemdeconya.sav..sav.gz in data path.
So most of the problem is really the way the filename to open gets
generated. Your patch may still fix the problem that generated all the
popups, I suppose.
Thanks,
Joan
2008/10/9 Egor Vyscrebentsov [EMAIL PROTECTED]
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517
On Thu, 9 Oct 2008 Egor Vyscrebentsov wrote:
On Thu, 9 Oct 2008 Egor Vyscrebentsov wrote:
Quickest (not the best) fix is
- } else if (base_buf) {
+ } else if (base_buf base_buf[j] != '?') {
at server/savegame.c:1862
After some thoughts I've decided that this fix is proper.
And after some more thoughts I've decided opposite...
Patch with more or less accurate workaround is attached.
There should be some action after each of two added LOG_ERRORs.
One variant is to abort civserver. Opinions?
--
Thanks, evyscr
I have applied the patch, and started a new game. It didnt make any difference, and I still couldnt load any of the saved files.Then I have started ./civ with the --log option, and the problem was in fact:
3: Could not find readable file /home/joanc/.freeciv/saves/anemdeconya.sav..sav in data path.3: Could not find readable file /home/joanc/.freeciv/saves/anemdeconya.sav..sav.gz in data path.
So most of the problem is really the way the filename to open gets generated. Your patch may still fix the problem that generated all the popups, I suppose.Thanks,Joan
2008/10/9 Egor Vyscrebentsov [EMAIL PROTECTED]
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517
On Thu, 9 Oct 2008 Egor Vyscrebentsov wrote:
On Thu, 9 Oct 2008 Egor Vyscrebentsov wrote:
Quickest (not the best) fix is
- } else if (base_buf) {
+ } else if (base_buf base_buf[j] != ?) {
at server/savegame.c:1862
After some thoughts Ive decided that this fix is proper.
And after some more thoughts Ive decided opposite...
Patch with more or less accurate workaround is attached.
There should be some action after each of two added LOG_ERRORs.
One variant is to abort civserver. Opinions?
--
Thanks, evyscr
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40517) Can't load savegames in 2.2
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517 2008/10/7 Egor Vyscrebentsov [EMAIL PROTECTED] URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517 base_list (and therefore base_buf) for archers at [39,40] (line 1278) is ��x�ſ-�\017\b\214�ſ �\b��. Most of these symbols are illegal. What are your system/encoding? It's a kubuntu 8.04, up-to date, on an Acer Travelmate 290. My encoding is ca_ES.UTF-8. Is there a previous savegame that loads normally? This was the first time I was playing 2.2. No game saved under 2.2 can be loaded, neither by 2.2 or 2.1. 2.2 can't load any savegame, even the ones created under 2.1 that can be loaded by 2.1. Furthermore, there's one file that generates that series of popups. activity_list for same unit is . Wonder if this was one more out-of-pointer'ing? Phalanx at [45,45] (line 1279) has the same problems. Looks like these units are the only that have base_list and activity_list differ from '-'. orders_list and dir_list also look strange. It looks like the problem my be in the saving rather than in the loading? Error message may be improved. I guess that telling wrong element/line of savegame might be useful when working with scenario. Well, this is not supposed to happen when the game is released, right? I wouldn't worry about this too much. Thanks, Joan 2008/10/7 Egor Vyscrebentsov [EMAIL PROTECTED] URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517 base_list (and therefore base_buf) for archers at [39,40] (line 1278) is ��x�ſ-�\017\b\214�ſ �\b��. Most of these symbols are illegal. What are your system/encoding?Its a kubuntu 8.04, up-to date, on an Acer Travelmate 290. My encoding is ca_ES.UTF-8. Is there a previous savegame that loads normally?This was the first time I was playing 2.2. No game saved under 2.2 can be loaded, neither by 2.2 or 2.1. 2.2 cant load any savegame, even the ones created under 2.1 that can be loaded by 2.1. Furthermore, theres one file that generates that series of popups. activity_list for same unit is . Wonder if this was one more out-of-pointering? Phalanx at [45,45] (line 1279) has the same problems. Looks like these units are the only that have base_list and activity_list differ from -. orders_list and dir_list also look strange. It looks like the problem my be in the saving rather than in the loading? Error message may be improved. I guess that telling wrong element/line of savegame might be useful when working with scenario.Well, this is not supposed to happen when the game is released, right? I wouldnt worry about this too much. Thanks, Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40305) G++ not tested in autogen.sh
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40305 I can't build version 2.2, because g++ is not installed. The error message is: ../../../../bootstrap/depcomp: line 470: exec: g++: not found make[5]: *** [toluaxx.bind.o] Error 127 I can install g++, sure, but perhaps autogen.sh should have checked g++'s existence before? Right now, autogen doesn't report any problems. Joan I cant build version 2.2, because g++ is not installed. The error message is:../../../../bootstrap/depcomp: line 470: exec: g++: not foundmake[5]: *** [toluaxx.bind.o] Error 127I can install g++, sure, but perhaps autogen.sh should have checked g++s existence before? Right now, autogen doesnt report any problems. Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40187) Configure fails in 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40187 It worked like a charm. Thanks Joan 2008/4/5, Marko Lindqvist [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40187 On 05/04/2008, Joan Creus wrote: ./configure: line 2074: syntax error near unexpected token ` Copyright (C) 2004 Freeciv team ' ./configure: line 2074: `FREECIV_VERSION_COMMENT( Copyright (C) 2004 Freeciv team )' Can you test if attached patch helps? - ML It worked like a charm. ThanksJoan2008/4/5, Marko Lindqvist [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40187 On 05/04/2008, Joan Creuswrote: ./configure: line 2074: syntax error near unexpected token `Copyright (C) 2004 Freeciv team ./configure: line 2074: `FREECIV_VERSION_COMMENT(Copyright (C) 2004 Freeciv team ) Canyou test if attached patch helps? - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40025) Happiness plurals
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40025 I have been playing a game lately, and watching what happens as the size of my empire increases. I believe this effect of additional unhappy citizens didn't happen in 2.0 (at least, that would explain why, when I imported an almost perfect saved game from 2.0 into 2.1, half my cities where in turmoil). I have reached 80 cities in democracy now, and I have more unhappy citizens (5) than initial content citizens (4). I don't know whether this is a bug or a feature, but William is right that the message should be more informative, and perhaps the help texts should be improved, too. What I would like to see here is some info about the total number of cities, how many content citizens have cities by default, and a warning on when this figure will change. Maybe something like: 40 cities, 10 above the limit of 30, 4 below 44. First 2 citizens content, next 2 unhappy. 80 cities, on the limit of 80, 14 below 94. First 4 citizens unhappy, next 1 angry. I'm not sure I have grasped the rule, though, and the figures are more or less invented. The only explanation I have found of this rule in the help texts is in some governments, and in the help for the variables cityfactor and unhappysize. It doesn't make much sense, though. My cityfactor is 14; however the help for Democracy says for each 16 additional cities another unhappy citizen will appear. Furthermore, for Communism there is no mention of this rule (why? all the others have it) Cheers, Joan 2008/1/23, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40025 Committed S2_2 revision 14284. Committed trunk revision 14285. Still open awaiting win32 verification. Also hoping for better sentences for 2.2 and later. I have been playing a game lately, and watching what happens as the size of my empire increases. I believe this effect of additional unhappy citizens didnt happen in 2.0 (at least, that would explain why, when I imported an almost perfect saved game from 2.0 into 2.1, half my cities where in turmoil). I have reached 80 cities in democracy now, and I have more unhappy citizens (5) than initial content citizens (4). I dont know whether this is a bug or a feature, but William is right that the message should be more informative, and perhaps the help texts should be improved, too. What I would like to see here is some info about the total number of cities, how many content citizens have cities by default, and a warning on when this figure will change. Maybe something like:40 cities, 10 above the limit of 30, 4 below 44. First 2 citizens content, next 2 unhappy. 80 cities, on the limit of 80, 14 below 94. First 4 citizens unhappy, next 1 angry.Im not sure I have grasped the rule, though, and the figures are more or less invented.The only explanation I have found of this rule in the help texts is in some governments, and in the help for the variables cityfactor and unhappysize. It doesnt make much sense, though. My cityfactor is 14; however the help for Democracy says for each 16 additional cities another unhappy citizen will appear. Furthermore, for Communism there is no mention of this rule (why? all the others have it)Cheers,Joan2008/1/23, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40025 Committed S2_2 revision 14284.Committed trunk revision 14285.Still open awaiting win32 verification. Also hoping for better sentences for 2.2 and later. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40025) Happiness plurals
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40025 2008/2/3, Christian Knoke [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40025 This is in there since some time of 2.1. Something has been changed intendedly, I don't remember what it was. I have noticed this earlier and complained about. It is impossible now to grow large empires (with happiness), and it may be very hard to at least manage them. It is indeed more challenging. By now, I am doing fine against the hard IAs with 80 cities in democracy. I always build ports when I can, and lots of Markets and trade routes. Michelangelo's and J.S. Bach's are essential, of course. I could probably win soon by building the spaceship, but I'll try to take over all the cities and see whether I can prevent revolutions. Joan 2008/2/3, Christian Knoke [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40025 This is in there since some time of 2.1. Something has been changedintendedly, I dont remember what it was. I have noticed this earlier and complained about. It is impossiblenow to grow large empires (with happiness), and it may be very hard toat least manage them.It is indeed more challenging. By now, I am doing fine against the hard IAs with 80 cities in democracy. I always build ports when I can, and lots of Markets and trade routes. Michelangelos and J.S. Bachs are essential, of course. I could probably win soon by building the spaceship, but Ill try to take over all the cities and see whether I can prevent revolutions. Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40054) Percentages in client/helpdata.c
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40054 Yes, it's fixed now. Joan 2008/1/28, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40054 Committed as part of trunk revision 14337. Committed as part of S2_2 revision 14338. Yes, its fixed now.Joan2008/1/28, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40054 Committed as part of trunk revision 14337.Committed as part of S2_2 revision 14338. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40054) Percentages in helpdata.c
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40054 I've noticed that, in the last remodelation of helpdata.c, for trunk and 2.2, three strings which contained 50%% have been changed to 50%. But two of them are still flagged as c-format, and msgfmt doesn't like them (The format specifications of argument 1 in msgid and msgstr are not the same, and msgstr is not a valid conversion specifier). The problematic strings are: * May be disbanded in a city to recover 50% of the production cost.\n * May fortify, granting a 50% defensive bonus.\n How do you remove the c-format? Joan Ive noticed that, in the last remodelation of helpdata.c, for trunk and 2.2, three strings which contained 50%% have been changed to 50%. But two of them are still flagged as c-format, and msgfmt doesnt like them (The format specifications of argument 1 in msgid and msgstr are not the same, and msgstr is not a valid conversion specifier). The problematic strings are:* May be disbanded in a city to recover 50% of the production cost.\n* May fortify, granting a 50% defensive bonus.\nHow do you remove the c-format? Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40049) Losing message is not shown
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40049 I have noticed lately that, for failed attacks, the usual message Your attacking whatever failed against the %s %s doesn't appear. I don't see why, because it even happens in squares that have other units (who should be able to see the fight and report to the supreme leader). I have checked both trunk and 2.1, and both seem to have this behaviour. I have even tried an old saved game (from 2.0) with the same results. Is it on purpose? Joan I have noticed lately that, for failed attacks, the usual message Your attacking whatever failed against the %s %s doesnt appear. I dont see why, because it even happens in squares that have other units (who should be able to see the fight and report to the supreme leader). I have checked both trunk and 2.1, and both seem to have this behaviour. I have even tried an old saved game (from 2.0) with the same results. Is it on purpose?Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40049) Losing message is not shown
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40049 2008/1/26, Marko Lindqvist [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40049 Have you checked that you have correct message display settings for this event (Attack Failed)? I think that I had to fix it myself at some point. Right on target. I don't remember ever changing that, though. Please, close the ticket. I'm ashamed. Joan 2008/1/26, Marko Lindqvist [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40049 Have you checked that you have correct message display settings for this event (Attack Failed)? I think that I had to fix it myself atsome point.Right on target. I dont remember ever changing that, though. Please, close the ticket. Im ashamed. Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39788) translations not displaying
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39788 No. It was a problem in my setup, and Freeciv got the wrong .gmo file. Joan 2008/1/17, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39788 Are you still experiencing this problem? No.It was a problem in my setup, and Freeciv got the wrong .gmo file. Joan 2008/1/17, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39788 Are you still experiencing this problem? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40025) One more plural to fix
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40025 I see William has been adding plural translations lately. Well, here's another: In #: client/gui-gtk-2.0/happiness.c:252 client/gui-win32/happiness.c:204 the sentence is: %d additional unhappy citizens. %d is 1 in the default ruleset, so it would be good to have an option here. Not a showstopper bug, really, but since we are at it ... Joan I see William has been adding plural translations lately. Well, heres another:In #: client/gui-gtk-2.0/happiness.c:252 client/gui-win32/happiness.c:204the sentence is:%d additional unhappy citizens. %d is 1 in the default ruleset, so it would be good to have an option here.Not a showstopper bug, really, but since we are at it ...Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 This transaction appears to have no content So, last patch (for now) for catalan.ruleset in 2.1. Basically, it's the same as the current ruleset, with no translatable strings changed, and: - two more rulers. - removed portuguese from civilwar_nations (they are too far) and added french, which actually makes historical sense (several Catalan cities became French after a war) in the XVII century. - modified the comment to reflect that it corresponds to lands settled by Catalans, where Catalan is still spoken today. There is also a historical basis (of lands ruled by Catalans) but is not limited to the current definition of Catalonia. - added a few cities, including some Andorran ones, and removed the Occitan city of Tolosa. About medieval or not, your call. I'd leave it, since the Middle Ages is usually considered the time of splendour of the Catalan empire. Cheers, Joan 2008/1/8, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Daniel Markstedt wrote: Very enlightening discussion. Thanks everyone. Yeah, it was kinda fun spending several hours learning something entirely new to me There are a lot of parallels to arguments over Romans and Greeks and Kurds and Armenians, among others. I propose keeping the Catalan nation in its current Països Catalans form while removing it from the 'medieval' group, leaving it simply European. Investigation showed the Catalans *were* medieval, the cities listed (with one exception) are properly from the medieval areas. The Països Catalans are merely an attempt to reunite the culturally related areas. (Being of Scottish ancestry, and in communication with Scottish 2nd and 3rd cousins, I understand and sympathize.) The silly idea that the label Crown of ... is more important is confusing heraldic precedence with reality. The Aragonese princess was a child bride, the dominate dynasty was Catalan, the capital was Catalan. Aragonese culture wasn't the primary culture that was spread, and the present language distribution demonstrates the reality We've seen this before with Greeks. Alexander the Great wasn't Greek (unless you subscribe to the theory that all French and Spanish are actually Italian because the language root is the same). He *conquered* the Greeks. The Empire was officially Macedonian. But the era is called Hellenic, because the Hellenic culture was spread. In a truly civilization spanning game, it's helpful to pay more attention to scientific archaeological and anthropological analysis instead of partisan bickering that the existence of Catalan is somehow insulting to the Spanish Creating a 'cultural' group is a great idea - I'd like to introduce it in 2.2 where we will have a lot more of this kind of nation in the default ruleset. Good idea. But I'd add it in addition to the medieval, etc. After all, it's just a group label. So, last patch (for now) for catalan.ruleset in 2.1.Basically, its the same as the current ruleset, with no translatable strings changed, and:- two more rulers.- removed portuguese from civilwar_nations (they are too far) and added french, which actually makes historical sense (several Catalan cities became French after a war) in the XVII century. - modified the comment to reflect that it corresponds to lands settled by Catalans, where Catalan is still spoken today. There is also a historical basis (of lands ruled by Catalans) but is not limited to the current definition of Catalonia. - added a few cities, including some Andorran ones, and removed the Occitan city of Tolosa.About medieval or not, your call. Id leave it, since the Middle Ages is usually considered the time of splendour of the Catalan empire. Cheers, Joan2008/1/8, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Daniel Markstedt wrote: Very enlightening discussion. Thanks everyone.Yeah, it was kinda fun spending several hours learning something entirelynew to meThere are a lot of parallels to arguments over Romans and Greeks and Kurds and Armenians, among others. I propose keeping the Catalan nation in its current Països Catalans form while removing it from the medieval group, leaving it simply European. Investigation showed the Catalans *were* medieval, the cities listed (withone exception) are properly from the medieval areas.The Països Catalansare merely an attempt to reunite the culturally related areas. (Being of Scottish ancestry, and in communication with Scottish 2nd and 3rdcousins, I understand and sympathize.)The silly idea that the label Crown of ... is more important is confusing heraldic precedence with reality.The Aragonese princess was a child bride,the dominate dynasty was Catalan, the capital was Catalan.Aragonese culture wasnt the primary culture that was spread, and the present
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 This transaction appears to have no content You're right. There you go. Joan 2008/1/15, [EMAIL PROTECTED] [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 On Jan 14, 2008 9:33 PM, Joan Creus [EMAIL PROTECTED] wrote: So, last patch (for now) for catalan.ruleset in 2.1. Basically, it's the same as the current ruleset, with no translatable strings changed, and: [...] It's almost perfect. You forgot to add (ocean) to both Guardamar cities. :-) -- Miguel Farah [EMAIL PROTECTED] Youre right. There you go.Joan2008/1/15, [EMAIL PROTECTED] [EMAIL PROTECTED] :URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 On Jan 14, 2008 9:33 PM, Joan Creus [EMAIL PROTECTED] wrote: So, last patch (for now) for catalan.ruleset in 2.1. Basically, its the same as the current ruleset, with no translatable strings changed, and:[...]Its almost perfect. You forgot to add (ocean) to both Guardamar cities. :-) --Miguel Farah[EMAIL PROTECTED] Index: catalan.ruleset === --- catalan.ruleset (revision 14236) +++ catalan.ruleset (working copy) @@ -10,10 +10,12 @@ Ramon Berenguer IV, Jaume I, Pere II, - Lluis Companys, + Pau Claris, + Francesc Macià, + Lluís Companys, Josep Tarradellas leader_sex=Male, Male, Male, Male, - Male, Male + Male, Male, Male, Male flag=catalan flag_alt = - city_style = Classical @@ -31,28 +33,120 @@ init_government=Despotism init_units= -civilwar_nations = spanish, portuguese +civilwar_nations = spanish, french ; This city list does not actually correspond to medieval Catalonia, -; but rather to the Països Catalans of modern ethnolinguistic +; but rather to all lands settled by Catalans, where Catalan is still spoken +; nowadays. It corresponds to the Països Catalans of modern ethnolinguistic ; nationalists. cities = - Barcelona, Tarragona, Lleida, Girona, Perpinyà, Valencia, - Tolosa, Ripoll, Vic, La Seu d'Urgell, Cardona, Tortosa, - Montserrat (hills), Poblet, Santes Creus, - Vallbona de les Monges, Balaguer, Manresa, Terrassa, - Sabadell, Palma de Mallorca, Eivissa, Alacant, Elx, - Castelló de la Plana, Montblanc (hills), Igualada, Cervera, - Berga, Dénia, Reus, Granollers, Mataró, Figueres, Olot, - Badalona, Tàrrega, Amposta, El Bruc, Valls, - Vilafranca del Penedés, Manacor, Alcúdia, Sóller, Artà, - Llucmajor, Felanitx, Andratx, Ciutadella, Penyiscola, - Sitges, Vilanova i la Geltrú, Viella, L'Alguer, Perelló, - Torelló, Sant Cugat, Portbou (ocean), Palafrugell, Manlleu, - Sallent, Puigcerdà, Bellver, Sant Boi de Llobregat, - Vandellós, Cornellà, Tremp, Palamós, El Vendrell, - Sant Feliu de Guíxols, Sant Celoni, Martorell, L'Hospitalet, - Mollet del Vallès, Banyoles, Blanes, Lloret de mar (ocean), - Malgrat de mar (ocean), Canet de mar (ocean), Molins de Rei, - Pons, Súria, Llívia, La Bisbal d'Empurdà, Prada, Elna, - Ceret, Cadaqués, Begur, Olesa de Montserrat (hills) + Barcelona, + Tarragona, + Lleida, + Girona, + Perpinyà, + València, + Ripoll, + Vic, + La Seu d'Urgell, + Cardona, + Tortosa, + Montserrat (hills), + Poblet, + Santes Creus, + Vallbona de les Monges, + Balaguer, + Manresa, + Terrassa, + Sabadell, + Palma de Mallorca, + Eivissa, + Alacant, + Elx, + Maó, + Castelló de la Plana, + Montblanc (hills), + Igualada, + Cervera, + Berga, + Dénia, + Alcoi, + Reus, + Granollers, + Salses, + Mataró, + Figueres, + Xàtiva, + Olot, + Cadaqués, + Badalona, + Tàrrega, + Amposta, + El Bruc, + Valls, + Sant Fruitós de Bages, + Vilafranca del Penedès, + Manacor, + Alcúdia, + Sóller, + Guardamar del Segura (ocean), + Artà, + Llucmajor, + Felanitx, + Andratx, + Andorra la Vella, + Ciutadella, + Peníscola (hills, ocean), + Sant Salvador de Guardiola, + Fraga, + Almacelles, + Sitges, + Vilanova i la Geltrú, + Vielha, + L'Alguer, + El Perelló, + Torelló, + Sant Cugat, + Portbou (ocean), + Palafrugell, + Prada, + Manlleu, + Sallent, + Puigcerdà, + Bellver, + Sant Boi de Llobregat, + Vandellòs, + Cornellà, + Tremp, + Palamós, + El Vendrell, + Sant Feliu de Guíxols, + Sant Celoni, + Martorell, + L'Hospitalet, + Mollet del Vallès, + Banyoles, + Blanes, + Sant Julià de Lòria, + Lloret de mar (ocean), + Malgrat de mar (ocean), + Canet de mar (ocean), + Molins de Rei, + Ponts, + Encamp, + Súria, + Llívia, + La Bisbal d'Empordà, + Elna, + Ceret, + Roses, + Calonge, + Treumal, + Cambrils, + Tossa de Mar (ocean), + Solsona, + Agramunt, + Begur, + Guardamar de la Safor (ocean), + Olesa de Montserrat (hills), + Soldeu ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Fwd: (PR#39687) Typos in nation rulesets
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39687 This transaction appears to have no content This fix got forgotten in my mailbox. I have the fix with the same changes, except I now keep the devolved in the purhepecha.ruleset. Joan -- Forwarded message -- From: Joan Creus [EMAIL PROTECTED] Date: 09/09/2007 14:22 Subject: Re: [Freeciv-Dev] (PR#39687) Typos in nation rulesets To: [EMAIL PROTECTED] You are right. It sounded strange to me, and I looked it up, but I didn't find the third meaning that says: grow worse; Her condition deteriorated.Yep, devolve is fine. Joan 2007/9/8, Daniel Markstedt [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39687 On 9/8/07, Joan Creus [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39687 This transaction appears to have no content I think I have found a few typos in several nations; check them out, particularly two that are in proper nouns, one in khwarezmian and the other in breton.ruleset Joan They look like good fixes. Except one in purhepecha.ruleset - I do think devolved into violence is proper English. ~Daniel This fix got forgotten in my mailbox. I have the fix with the same changes, except I now keep the devolved in the purhepecha.ruleset.Joan-- Forwarded message -- From: Joan Creus [EMAIL PROTECTED]Date: 09/09/2007 14:22Subject: Re: [Freeciv-Dev] (PR#39687) Typos in nation rulesetsTo: [EMAIL PROTECTED]You are right. It sounded strange to me, and I looked it up, but I didnt find the third meaning that says: grow worse; Her condition deteriorated. Yep, devolve is fine.Joan2007/9/8, Daniel Markstedt [EMAIL PROTECTED]:URL: http://bugs.freeciv.org/Ticket/Display.html?id=39687 On 9/8/07, Joan Creus [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39687 This transaction appears to have no content I think I have found a few typos in several nations; check them out, particularly two that are in proper nouns, one in khwarezmian and the other in breton.ruleset JoanThey look like good fixes. Except one in purhepecha.ruleset - I dothink devolved into violence is proper English. ~Daniel Index: phoenician.ruleset === --- phoenician.ruleset (revision 14228) +++ phoenician.ruleset (working copy) @@ -7,9 +7,9 @@ coastal regions of Lebanon and Syria. They spoke a Canaanite language\ related to Hebrew and were famed mariners. Their alphabet served as the\ source of the Greek alphabet, and from there evolved into the Etruscan\ - and Latin alphabets as well. The Greeks and Romans new them for their\ + and Latin alphabets as well. The Greeks and Romans knew them for their\ manufacture of purple dye from the myrex shell, which gave them their\ - Greek and Latin names. They refered to themselves a Kan'ani and thier\ + Greek and Latin names. They refered to themselves a Kan'ani and their\ Punic (Carthaginian) descendents in St. Augustine's day called themselves\ Chanani.) leader= Index: chola.ruleset === --- chola.ruleset (revision 14228) +++ chola.ruleset (working copy) @@ -4,7 +4,7 @@ plural=_(?plural:Cholas) groups=Asian, Ancient -legend=_(The Cholas were a Tamil dynasty in centered in southern India and\ +legend=_(The Cholas were a Tamil dynasty centered in southern India and\ were rare in their level of influence in northern India. They began as a\ tributary state to the Pallavas, but in the 9th century their power began\ to grow. During the 11th century, they lead expeditions against other\ Index: laotian.ruleset === --- laotian.ruleset (revision 14228) +++ laotian.ruleset (working copy) @@ -9,7 +9,7 @@ century, Laos became part of French Indochina.\ French rule ended with independence in 1946 followed\ by 30 years of civil war. In 1975 the communist Pathet\ - Lao established strict solicalist regime. However,\ + Lao established a strict socialist regime. However,\ in 1986 the liberalization and a gradual return to\ private enterpise started.) Index: khwarezmian.ruleset === --- khwarezmian.ruleset (revision 14228) +++ khwarezmian.ruleset (working copy) @@ -9,8 +9,8 @@ controlling portions of the Silk Road. It was loosely controlled as a\ satrapy under the Achaemenid and Sassanid Persian dynasties and was mythic\ homeland of Zarathustra, the founder of Zoroastrianism. Following the\ - introduction of Islam, Khwarezm tended to be devided into two seperate\ - kingdoms, but was united under the Turkic Anushtegihidy dynasty, which\ + introduction of Islam, Khwarezm tended to be divided into two separate\ + kingdoms, but was united under the Turkic Anushtiginid dynasty, which\ lasted from 1097 until Chinggis
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 And from the point of view of someone who actually has to put up with this kind of historical distortions on a regular basis, it's refreshing to see that dispassionate persons with the will to understand facts can see through all the troll's propaganda. Miguel's excellent summary of Iberian history should be taught in all schools. From that solid base, we may have had slight disagreements on Freeciv concepts and rules, but the discussion was honest and intelligent. You made my day. Joan On 1/8/08, William Allen Simpson [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Daniel Markstedt wrote: Very enlightening discussion. Thanks everyone. Yeah, it was kinda fun spending several hours learning something entirely new to me There are a lot of parallels to arguments over Romans and Greeks and Kurds and Armenians, among others. I propose keeping the Catalan nation in its current Països Catalans form while removing it from the 'medieval' group, leaving it simply European. Investigation showed the Catalans *were* medieval, the cities listed (with one exception) are properly from the medieval areas. The Països Catalans are merely an attempt to reunite the culturally related areas. (Being of Scottish ancestry, and in communication with Scottish 2nd and 3rd cousins, I understand and sympathize.) The silly idea that the label Crown of ... is more important is confusing heraldic precedence with reality. The Aragonese princess was a child bride, the dominate dynasty was Catalan, the capital was Catalan. Aragonese culture wasn't the primary culture that was spread, and the present language distribution demonstrates the reality We've seen this before with Greeks. Alexander the Great wasn't Greek (unless you subscribe to the theory that all French and Spanish are actually Italian because the language root is the same). He *conquered* the Greeks. The Empire was officially Macedonian. But the era is called Hellenic, because the Hellenic culture was spread. In a truly civilization spanning game, it's helpful to pay more attention to scientific archaeological and anthropological analysis instead of partisan bickering that the existence of Catalan is somehow insulting to the Spanish Creating a 'cultural' group is a great idea - I'd like to introduce it in 2.2 where we will have a lot more of this kind of nation in the default ruleset. Good idea. But I'd add it in addition to the medieval, etc. After all, it's just a group label. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Trolling indeed, and it's not strange for Spanish radical nationalists to deny Catalonia's nationhood. Having its own dinasty and laws for hundreds of years, and speaking a different language even today doesn't seem to be enough. In fact, the wikipedia article he quotes is quite enlightening. Countries, in the Middle Ages, were not what we think of nowadays. With poor communications and a weak central power, nations (as we think of them now) were just being built. The frontiers we see in the maps are mostly what certain dinasties ruled. It was common for a king to rule over different nations. What he calls the Crown of Aragon was a real thing. It started when Ramiro II, King of Aragon, who had no male son and wanted to retire, agreed with Ramon Berenguer IV (of Freeciv fame) to give him the hand of his one-year-old daughter (wow!) and his kingdom. From then on, Ramon Berenguer's Dinasty were kings of Aragon and Counts of Barcelona. The kings lived mainly in Barcelona and Montblanc (both Catalan cities), and they had to respect the laws of both Aragon and Catalonia. The Aragonese people didn't speak Catalan, so they probably translated the king's name into their language (as is their prerrogative). When the empire expanded (notably into the Balearic Islands and the Kingdom of Valencia), the new lands were settled by Catalan-speaking people. The internal organization of the kingdom was confederacy-like. Majorca, Valencia, Aragon and Catalonia were considered separate kingdoms under the same Crown. The wikipedia states that it was a Maritime Empire, so it's easy to guess that the weight of the empire was not in landlocked Aragon, although it bore its name. As for the names of the kings, Jaume I (who is in the ruleset), and who, by the way, would celebrate his 800th birthday this year, wrote his autobiography. http://en.wikipedia.org/wiki/Llibre_dels_fets As you can see in the wikipedia, it is written in Catalan, and the name is Jacme (which is ancient Catalan for James). So, the ruleset (in its original form, I haven't made any significant changes to it) tries to reflect a very real (and powerful) medieval nation. After the dynastic union with Castille in 1479, the four kingdoms kept their own laws and institutions, and it wasn't until the XVIII century and the Spanish succession war that these laws and institutions were revoked. In fact, the Wikipedia listshttp://en.wikipedia.org/wiki/List_of_countries_by_formation_dates1714 as the date of birth of Spain. So, what does the ruleset mean, historically?: the part of the Crown of Aragon settled by Catalan-speaking people (the three maritime kingdoms: Catalonia, Valencia and the Balearic Islands), who have thus the same cultural background. If we added Aragonese cities (and cities like Naples, Athens, and so on), we could have a perfectly valid Crown of Aragon ruleset, that would reflect the possessions of these kings (who, again, were based in Catalonia). Nothing against that. The present ruleset reflects a territory with a similar culture and language. As for territorial claims, this is quite another story. The desire for independence from Spain exists in very different degrees in each of the territories, so it's not likely that this ruleset will become modern without any changes. Cheers, Joan 2008/1/6, Daniel Markstedt [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 While we're on the topic, I'd like to discuss this: http://forum.freeciv.org/viewtopic.php?t=4216 The poster is mainly trolling, but he brings up the legit question of whether the Catalonia described in our ruleset existed in the middle ages or not. From Freeciv's nations policy: a nation listed as ancient or medieval should have had an independent dynasty or state in ancient or medieval times respectively ( http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.nations?rev=14172view=auto ) I'm not well versed in Iberian history, so please educate me on the issue. :) ~Daniel Trolling indeed, and its not strange for Spanish radical nationalists to deny Catalonias nationhood. Having its own dinasty and laws for hundreds of years, and speaking a different language even today doesnt seem to be enough. In fact, the wikipedia article he quotes is quite enlightening. Countries, in the Middle Ages, were not what we think of nowadays. With poor communications and a weak central power, nations (as we think of them now) were just being built. The frontiers we see in the maps are mostly what certain dinasties ruled. It was common for a king to rule over different nations. What he calls the Crown of Aragon was a real thing. It started when Ramiro II, King of Aragon, who had no male son and wanted to retire, agreed with Ramon Berenguer IV (of Freeciv fame) to give him the hand of his one-year-old daughter (wow!) and his kingdom. From then on, Ramon Berenguers
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 2008/1/6, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 [EMAIL PROTECTED] wrote: Yeah, but the city list in the ruleset DOES contain cities that have never been part of the Principality of Catalonia, or the Region of Catalonia or the current Autonomy. Which ones? Do they speak Catalan? How did they end up speaking Catalan without ever being part of Catalonia? Autonomous colonies? You might call it like that. There is an ambiguity here. Catalans settled the kingdoms of Valencia and the Balearic Islands, so people there ended up speaking Catalan. However, they were considered different territories (although, they had the same king). Option 3: create an aragonese ruleset for the CROWN of Aragon. I'm against this for the reasons stated in my previous message. An Aragonese ruleset for the landlocked kingdom might be OK. A Crown of Aragon ruleset would be politically accurate. I'm not against it being created, although I wouldn't do it. It shouldn't replace catalan.ruleset, of course. They are different things. As for the Catalan ruleset, I would leave it like it is. I don't like any of Miguel's options: restricting to just cities inside present-day Catalonia cripples a pretty cool ruleset, and forgets a rich history of Mediterranean expansion. If Catalonia alone becomes independent in the future, this will be a must for the nation to be considered modern. In the meantime, there is no reason for it. As William says, the English ruleset could perfectly have Boston, Philadelphia (and even Bombay). The cities listed have all been at some time ruled by a king who spoke Catalan. As for changing the classification to fictional, I think that it is too drastic. Fictional is for literary, joke or impossible nations: like martians, antarctic penguins, or the old Middle-Earth nations. Political questions aside, there are strong cultural ties between this list of cities. Heck, there is even an Internet top level domain (.cat) for sites related to Catalan culture, and it's used in Catalonia, València, Majorca, Southern France (AKA Northern Catalonia), ... And there are a few people who think all these territories should become an independent state. Cheers, Joan 2008/1/6, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 [EMAIL PROTECTED] wrote: Yeah, but the city list in the ruleset DOES contain cities that have never been part of the Principality of Catalonia, or the Region of Catalonia or the current Autonomy.Which ones?Do they speak Catalan?How did they end up speaking Catalan without ever being part of Catalonia?Autonomous colonies?You might call it like that. There is an ambiguity here. Catalans settled the kingdoms of Valencia and the Balearic Islands, so people there ended up speaking Catalan. However, they were considered different territories (although, they had the same king). Option 3: create an aragonese ruleset for the CROWN of Aragon. Im against this for the reasons stated in my previous message.An Aragonese ruleset for the landlocked kingdom might be OK.A Crown of Aragon ruleset would be politically accurate. Im not against it being created, although I wouldnt do it. It shouldnt replace catalan.ruleset, of course. They are different things.As for the Catalan ruleset, I would leave it like it is. I dont like any of Miguels options: restricting to just cities inside present-day Catalonia cripples a pretty cool ruleset, and forgets a rich history of Mediterranean expansion. If Catalonia alone becomes independent in the future, this will be a must for the nation to be considered modern. In the meantime, there is no reason for it. As William says, the English ruleset could perfectly have Boston, Philadelphia (and even Bombay). The cities listed have all been at some time ruled by a king who spoke Catalan. As for changing the classification to fictional, I think that it is too drastic. Fictional is for literary, joke or impossible nations: like martians, antarctic penguins, or the old Middle-Earth nations. Political questions aside, there are strong cultural ties between this list of cities. Heck, there is even an Internet top level domain (.cat) for sites related to Catalan culture, and its used in Catalonia, València, Majorca, Southern France (AKA Northern Catalonia), ... And there are a few people who think all these territories should become an independent state. Cheers,Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 We basically agree. I think the key here is the definition of medieval and catalan. As I understand, medieval in Freeciv is used for a nation that existed at some time, but isn't independent nowadays. Since there isn't a cultural category (after all, culture and language is what all these cities have in common), medieval is the closest we have. And, indeed, during the Middle Ages these cities formed a nation (at least culturally, and, to some degree, also politically). Sure, there are a few cities in the ruleset that are not Catalan, but the King of the Crown of Aragon, who happened to live in Barcelona, ruled them. And the language spoken there is Catalan or some variant of it (I don't like the word dialect because it implies some hierarchy among different variants) Joan 2008/1/6, [EMAIL PROTECTED] [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 On Jan 6, 2008 12:47 PM, William Allen Simpson [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 William Allen Simpson wrote: Which ones? Do they speak Catalan? How did they end up speaking Catalan without ever being part of Catalonia? Autonomous colonies? To clarify my question, our current rule is: An _ancient_ or _medieval_ nation may list any city that it at some point controlled. For the purposes of this ticket, I opine that it is OK for historically Catalan-speaking cities to be included, as former Catalan colonies, whether founded under the Principality or a larger Empire (Crown). I understand. But... if we were to keep catalan.ruleset as medieval, it would necessarily refer to the Principality of Catalonia, so the only cities it could contain would be the ones from Catalonia proper, Catalonia Nord and perhaps the Franja Ponent (see my previous post). Valencia and Majorca were never part of the principality, nor were colonies in the strict sense, so they can't be included if this is the criteria to be used (nor Andorra, an independent entity). -- Miguel Farah [EMAIL PROTECTED] We basically agree. I think the key here is the definition of medieval and catalan. As I understand, medieval in Freeciv is used for a nation that existed at some time, but isnt independent nowadays. Since there isnt a cultural category (after all, culture and language is what all these cities have in common), medieval is the closest we have. And, indeed, during the Middle Ages these cities formed a nation (at least culturally, and, to some degree, also politically). Sure, there are a few cities in the ruleset that are not Catalan, but the King of the Crown of Aragon, who happened to live in Barcelona, ruled them. And the language spoken there is Catalan or some variant of it (I dont like the word dialect because it implies some hierarchy among different variants) Joan2008/1/6, [EMAIL PROTECTED] [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 On Jan 6, 2008 12:47 PM, William Allen Simpson [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 William Allen Simpson wrote: Which ones?Do they speak Catalan?How did they end up speaking Catalan without ever being part of Catalonia?Autonomous colonies? To clarify my question, our current rule is: An _ancient_ or _medieval_ nation may list any city that it at somepoint controlled. For the purposes of this ticket, I opine that it is OK for historically Catalan-speaking cities to be included, as former Catalan colonies, whether founded under the Principality or a larger Empire (Crown).I understand. But... if we were to keep catalan.ruleset as medieval,it would necessarily refer to the Principality of Catalonia, so the only cities it could contain would be the ones from Catalonia proper,Catalonia Nord and perhaps the Franja Ponent (see my previous post).Valencia and Majorca were never part of the principality, nor werecolonies in the strict sense, so they cant be included if this is the criteria to be used (nor Andorra, an independent entity).--Miguel Farah[EMAIL PROTECTED] ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 2008/1/6, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 [EMAIL PROTECTED] wrote: And then's the Sardinian city of Alghero (L'Alguer), which was resettled in the 14th century by catalans. Cool. Try what I did for Illyrian, adding dates and alternative names: Scodra (hills, plains, river, !ocean), ;-400 42:04N 19:30E ; |Scutari|Shkodra|Shkoder (If I were doing it today, I'd make that 3 lines instead, for readability.) That looks pretty cool. Is the syntax documented in the wiki? Finally, Andorra (a catalan speaking country), doesn't have any cities represented in the ruleset (Andorra la Vella, Sant Julià de Lòria, Encamp and Soldeu could be added). Under our rules, sounds like they should! They must have been controlled or colonized by Catalans in the past. As mentioned earlier, it's OK for the same city to be in multiple nations. Dates of founding and alternative names would be good here, too. If somebody adds Andorran, can have it as a civil-war nation for Catalan. That's fun. There's a joke that says that, in order to gain independence, Catalonia should declare war on Andorra, and then surrender. With such brilliant strategists, it's no wonder we are not independent any more. More seriously, yes, there is no reason not to have Andorran cities in the ruleset, although Andorra has always been independent, as far as I know. They speak Catalan because it's what was spoken in their area, not because any one conquered or settled them. An Andorran ruleset would be quite short of cities (Andorra is really small), but it could be done. According to catalan nationalists, in order for a city or county or whatever to be a part of the Països Catalans, it must be a catalan-speaking area. Well, this isn't a political organization. We're more interested in using historical information to make the game itself interesting! We should include formerly catalan-speaking areas, too, not only modern ones Right, let's forget about present-day politics or the whole thing will get really complicated. History is what it is. Let's leave it like that. If everybody agrees, I'll add a couple Andorran cities to the ruleset. That was a good idea. Joan 2008/1/6, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 [EMAIL PROTECTED] wrote: And thens the Sardinian city of Alghero (LAlguer), which was resettled in the 14th century by catalans.Cool.Try what I did for Illyrian, adding dates and alternative names: Scodra (hills, plains, river, !ocean), ;-400 42:04N 19:30E ; |Scutari|Shkodra|Shkoder(If I were doing it today, Id make that 3 lines instead, for readability.)That looks pretty cool. Is the syntax documented in the wiki? Finally, Andorra (a catalan speaking country), doesnt have any cities represented in the ruleset (Andorra la Vella, Sant Julià de Lòria, Encamp and Soldeu could be added).Under our rules, sounds like they should!They must have been controlled or colonized by Catalans in the past.As mentioned earlier, its OK forthe same city to be in multiple nations.Dates of founding and alternativenames would be good here, too.If somebody adds Andorran, can have it as a civil-war nation for Catalan. Thats fun. Theres a joke that says that, in order to gain independence, Catalonia should declare war on Andorra, and then surrender. With such brilliant strategists, its no wonder we are not independent any more. More seriously, yes, there is no reason not to have Andorran cities in the ruleset, although Andorra has always been independent, as far as I know. They speak Catalan because its what was spoken in their area, not because any one conquered or settled them. An Andorran ruleset would be quite short of cities (Andorra is really small), but it could be done. According to catalan nationalists, in order for a city or county or whatever to be a part of the Països Catalans, it must be a catalan-speaking area.Well, this isnt a political organization.Were more interested in using historical information to make the game itself interesting!We shouldinclude formerly catalan-speaking areas, too, not only modern onesRight, lets forget about present-day politics or the whole thing will get really complicated. History is what it is. Lets leave it like that. If everybody agrees, Ill add a couple Andorran cities to the ruleset. That was a good idea.Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Yes, it's fascinating how Andorrans manage to navigate the balance of power and remain independent. They have two heads of state (the co-princes): one still is the Bishop of Urgell, and the other is the President of France (Nicolas Sarkozy, now), as successor of the kings of France, who succeeded the Counts of Foix. They are the largest country in the world whose head of state is a priest (that may change, though, if Huckabee wins the U.S. presidency B-)). I'll try to write a ruleset for Andorra. I have also noticed that one of the cities in the catalan list is not really Catalan. Tolosa (Toulouse, in its French name) was Occitan. Occitans and Catalans were traditional allies, and there were lots of ties between the two nations, but they never had the same ruler. In fact, Vielha is another city of Occitan culture, but it has been administratively Catalan for centuries, and now Catalan, Spanish and Occitan are spoken there. So, Vielha stays. By the way, Occitania is another nation worth including in Freeciv: full of legends about the Holy Grail; where troubadours flourished and spread the Occitan poems all over Europe, ... BTW, thanks everybody for a great discussion. Joan 2008/1/6, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Joan Creus wrote: ... yes, there is no reason not to have Andorran cities in the ruleset, although Andorra has always been independent, as far as I know. They speak Catalan because it's what was spoken in their area, not because any one conquered or settled them. To be honest, on this side of the pond, we only know that Andorra is one of the few remaining micro-states over there. But they do seem to have been both conquered and settled repeatedly (long ago). According to http://en.wikipedia.org/wiki/History_of_Andorra they speak Catalan because they were conquered back in 8th century, were ruled by catalans (the Count of Urgell, Bishop of Urgell, the Lord of Caboet), and were briefly annexed to the Crown of Aragon twice, in 1396 and 1512. It's interesting that many of the local toponyms are Iberian-Basque. Yes, its fascinating how Andorrans manage to navigate the balance of power and remain independent. They have two heads of state (the co-princes): one still is the Bishop of Urgell, and the other is the President of France (Nicolas Sarkozy, now), as successor of the kings of France, who succeeded the Counts of Foix. They are the largest country in the world whose head of state is a priest (that may change, though, if Huckabee wins the U.S. presidency B-)).Ill try to write a ruleset for Andorra.I have also noticed that one of the cities in the catalan list is not really Catalan. Tolosa (Toulouse, in its French name) was Occitan. Occitans and Catalans were traditional allies, and there were lots of ties between the two nations, but they never had the same ruler. In fact, Vielha is another city of Occitan culture, but it has been administratively Catalan for centuries, and now Catalan, Spanish and Occitan are spoken there. So, Vielha stays. By the way, Occitania is another nation worth including in Freeciv: full of legends about the Holy Grail; where troubadours flourished and spread the Occitan poems all over Europe, ...BTW, thanks everybody for a great discussion. Joan2008/1/6, William Allen Simpson [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Joan Creus wrote: ... yes, there is no reason not to have Andorran cities in the ruleset, although Andorra has always been independent, as far as I know. They speak Catalan because its what was spoken in their area, not because any one conquered or settled them. To be honest, on this side of the pond, we only know that Andorra is one ofthe few remaining micro-states over there.But they do seem to have beenboth conquered and settled repeatedly (long ago).According to http://en.wikipedia.org/wiki/History_of_Andorra they speakCatalan because they were conquered back in 8th century, were ruled bycatalans (the Count of Urgell, Bishop of Urgell, the Lord of Caboet), and were briefly annexed to the Crown of Aragon twice, in 1396 and 1512.Its interesting that many of the local toponyms are Iberian-Basque. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 This transaction appears to have no content You call that being negative? No way! On the contrary, it's great to get good feedback, particularly from the original author of the ruleset. Guardamar is Guardamar del Segura, one of the four traditional extreme points where the Catalan language is spoken (along with Salses, Fraga and Maó, with permission from l'Alguer). I didn't even know there was a Guardamar in la Safor, but I will add it. Sant Fruitós natives never use de Bages to refer to their own town (I know, I'm one), but you're right, we should have the whole name. I will do the same with Guardiola (Sant Salvador de Guardiola, actually). As for the geographical features, I didn't know about this criterion. It makes sense, though. I didn't feel much comfortable with geographical indications just for a few cities. I will add both hills and ocean for Peníscola. Yes, only hills is justified by the name, but I can't resist having ocean for a place like that. So, here you are, version two. Joan 2008/1/5, [EMAIL PROTECTED] [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Thanks, Joan, for improving on the ruleset I worked on quite some time ago. Adding Pau Claris, Salses and Fraga were nice touches, I think. Now, I hate to be negative, BUT... IIRC, the geographic features (hills, ocean, etc.) were supposed to be added when the city name explicitly states it, so a city name like Montserrat (meaning Serrated Mount) can get the (hills) designation, but Barcelona can't have (ocean) even if the real-life city is coastal. At least, that's the criteria I used back then. So, I think the added geographical features added to Amposta, Barcelona, Begur, Blanes, Cadaqués, Lleida, Maó (newly added), Palma de Mallorca, Tarragona and València have to be removed. By the way, the first time around, we forgot to add (hills) to Peníscola (it's name derives from peña, meaning bouldery hill). I'd complete the name of newly added Sant Fruitós: Sant Fruitós de Bages. I'm not sure whether the newly added city name of Guardamar refers to Guardamar de la Safor or to Guardamar del Segura. Let's add both! :-) In both cases, the (ocean) designation is warranted, and the latter might deserve the (river) designation as well. On Jan 4, 2008 11:29 AM, Joan Creus [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 This transaction appears to have no content The catalan ruleset has a few typos in city names. In the attached patch, I have fixed them, added a few more cities, and added a couple new (long dead) rulers for good measure. No translatable string has been changed, for inclusion in 2.1. Thanks, Joan -- Miguel Farah [EMAIL PROTECTED] You call that being negative? No way! On the contrary, its great to get good feedback, particularly from the original author of the ruleset.Guardamar is Guardamar del Segura, one of the four traditional extreme points where the Catalan language is spoken (along with Salses, Fraga and Maó, with permission from lAlguer). I didnt even know there was a Guardamar in la Safor, but I will add it. Sant Fruitós natives never use de Bages to refer to their own town (I know, Im one), but youre right, we should have the whole name. I will do the same with Guardiola (Sant Salvador de Guardiola, actually). As for the geographical features, I didnt know about this criterion. It makes sense, though. I didnt feel much comfortable with geographical indications just for a few cities. I will add both hills and ocean for Peníscola. Yes, only hills is justified by the name, but I cant resist having ocean for a place like that. So, here you are, version two.Joan2008/1/5, [EMAIL PROTECTED] [EMAIL PROTECTED] :URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Thanks, Joan, for improving on the ruleset I worked on quite some timeago. Adding Pau Claris, Salses and Fraga were nice touches, I think.Now, I hate to be negative, BUT... IIRC, the geographic features (hills, ocean, etc.) were supposed to be added when the city name explicitlystates it, so a city name like Montserrat (meaning Serrated Mount) canget the (hills) designation, but Barcelona cant have (ocean) even if the real-life city is coastal. At least, thats the criteria I usedback then.So, I think the added geographical features added to Amposta, Barcelona,Begur, Blanes, Cadaqués, Lleida, Maó (newly added), Palma de Mallorca, Tarragona and València have to be removed.By the way, the first time around, we forgot to add (hills) toPeníscola (its name derives from peña, meaning bouldery hill). Id complete the name of newly added Sant Fruitós: Sant Fruitós deBages.Im not sure whether the newly added city name of Guardamar refers toGuardamar de la Safor or to Guardamar del Segura. Lets add both! :-) In both cases, the (ocean) designation is warranted
[Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 This transaction appears to have no content The catalan ruleset has a few typos in city names. In the attached patch, I have fixed them, added a few more cities, and added a couple new (long dead) rulers for good measure. No translatable string has been changed, for inclusion in 2.1. Thanks, Joan The catalan ruleset has a few typos in city names. In the attached patch, I have fixed them, added a few more cities, and added a couple new (long dead) rulers for good measure. No translatable string has been changed, for inclusion in 2.1.Thanks,Joan Index: catalan.ruleset === --- catalan.ruleset (revision 14221) +++ catalan.ruleset (working copy) @@ -10,10 +10,12 @@ Ramon Berenguer IV, Jaume I, Pere II, - Lluis Companys, + Pau Claris, + Francesc Macià, + Lluís Companys, Josep Tarradellas leader_sex=Male, Male, Male, Male, - Male, Male + Male, Male, Male, Male flag=catalan flag_alt = - city_style = Classical @@ -37,22 +39,102 @@ ; but rather to the Països Catalans of modern ethnolinguistic ; nationalists. cities = - Barcelona, Tarragona, Lleida, Girona, Perpinyà, Valencia, - Tolosa, Ripoll, Vic, La Seu d'Urgell, Cardona, Tortosa, - Montserrat (hills), Poblet, Santes Creus, - Vallbona de les Monges, Balaguer, Manresa, Terrassa, - Sabadell, Palma de Mallorca, Eivissa, Alacant, Elx, - Castelló de la Plana, Montblanc (hills), Igualada, Cervera, - Berga, Dénia, Reus, Granollers, Mataró, Figueres, Olot, - Badalona, Tàrrega, Amposta, El Bruc, Valls, - Vilafranca del Penedés, Manacor, Alcúdia, Sóller, Artà, - Llucmajor, Felanitx, Andratx, Ciutadella, Penyiscola, - Sitges, Vilanova i la Geltrú, Viella, L'Alguer, Perelló, - Torelló, Sant Cugat, Portbou (ocean), Palafrugell, Manlleu, - Sallent, Puigcerdà, Bellver, Sant Boi de Llobregat, - Vandellós, Cornellà, Tremp, Palamós, El Vendrell, - Sant Feliu de Guíxols, Sant Celoni, Martorell, L'Hospitalet, - Mollet del Vallès, Banyoles, Blanes, Lloret de mar (ocean), - Malgrat de mar (ocean), Canet de mar (ocean), Molins de Rei, - Pons, Súria, Llívia, La Bisbal d'Empurdà, Prada, Elna, - Ceret, Cadaqués, Begur, Olesa de Montserrat (hills) + Barcelona (ocean), + Tarragona (ocean), + Lleida (!ocean), + Girona, + Perpinyà, + València (ocean), + Tolosa, + Ripoll, + Vic, + La Seu d'Urgell, + Cardona, + Tortosa, + Montserrat (hills), + Poblet, + Santes Creus, + Vallbona de les Monges, + Balaguer, + Manresa, + Terrassa, + Sabadell, + Palma de Mallorca (ocean), + Eivissa, + Alacant, + Elx, + Maó (ocean), + Castelló de la Plana, + Montblanc (hills), + Igualada, + Cervera, + Berga, + Dénia, + Alcoi, + Reus, + Granollers, + Salses, + Mataró, + Figueres, + Xàtiva, + Olot, + Badalona, + Tàrrega, + Amposta (river), + El Bruc, + Valls, + Sant Fruitós, + Vilafranca del Penedès, + Manacor, + Alcúdia, + Sóller, + Guardamar, + Artà, + Llucmajor, + Felanitx, + Andratx, + Ciutadella, + Peníscola, + Guardiola, + Fraga, + Almacelles, + Sitges, + Vilanova i la Geltrú, + Vielha, + L'Alguer, + El Perelló, + Torelló, + Sant Cugat, + Portbou (ocean), + Palafrugell, + Manlleu, + Sallent, + Puigcerdà, + Bellver, + Sant Boi de Llobregat, + Vandellòs, + Cornellà, + Tremp, + Palamós, + El Vendrell, + Sant Feliu de Guíxols, + Sant Celoni, + Martorell, + L'Hospitalet, + Mollet del Vallès, + Banyoles, + Blanes (ocean), + Lloret de mar (ocean), + Malgrat de mar (ocean), + Canet de mar (ocean), + Molins de Rei, + Ponts, + Súria, + Llívia, + La Bisbal d'Empordà, + Prada, + Elna, + Ceret, + Cadaqués (ocean), + Begur (ocean), + Olesa de Montserrat (hills) ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39831) Training and combat
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39831
This transaction appears to have no content
Good. Promoted sounds perfect in this context.
Joan
2007/11/11, William Allen Simpson [EMAIL PROTECTED]:
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39831
Joan Creus wrote:
For land units, except Diplomats and Spies:
* Will be built as a veteran in cities with appropriate training
facilities
(see Barracks and Sun Tzu.) May also become veteran if it defeats an
enemy
unit.
In this message, and all that follow, should be veteran after or
veteran when -- or transposed to:
If it defeats an enemy unit, may be promoted to veteran.
Good. Promoted sounds perfect in this context.Joan2007/11/11, William Allen Simpson [EMAIL PROTECTED]
:URL:
http://bugs.freeciv.org/Ticket/Display.html?id=39831 Joan Creus wrote: For land units, except Diplomats and Spies: * Will be built as a veteran in cities with appropriate training facilities
(see Barracks and Sun Tzu.) May also become veteran if it defeats an enemy unit.In this message, and all that follow, should be veteran after orveteran when -- or transposed to:
If it defeats an enemy unit, may be promoted to veteran.
Index: helpdata.c
===
--- helpdata.c (revision 13940)
+++ helpdata.c (working copy)
@@ -1010,8 +1010,32 @@
sprintf(buf + strlen(buf),
_(* Will never achieve veteran status.\n));
} else {
-sprintf(buf + strlen(buf),
- _(* May become veteran through training or combat.\n));
+switch(utype_move_type(utype)) {
+ case AIR_MOVING:
+ case HELI_MOVING:
+ sprintf(buf + strlen(buf),
+ _(* Will be built as a veteran in cities with appropriate training facilities (see Airport.) If it defeats an enemy unit, may be promoted to veteran.\n));
+ break;
+ case LAND_MOVING:
+if (utype_has_flag(utype, F_DIPLOMAT)||utype_has_flag(utype, F_SPY)) {
+ sprintf(buf + strlen(buf),
+ _(* Will be built as a veteran under communist governments. May also become veteran after a successful mission.\n));
+} else {
+ sprintf(buf + strlen(buf),
+ _(* Will be built as a veteran in cities with appropriate training facilities (see Barracks and Sun Tzu.) If it defeats an enemy unit, may be promoted to veteran.\n));
+}
+break;
+ case SEA_MOVING:
+sprintf(buf + strlen(buf),
+ _(* Will be built as a veteran in cities with appropriate training facilities (see Port Facility and Lighthouse). If it defeats an enemy unit, may be promoted to veteran.\n));
+if (utype_has_flag(utype, F_TRIREME))
+ sprintf(buf + strlen(buf),
+_(* May become veteran if it survives in the high seas.\n));
+break;
+ default: /* should never happen in default rulesets */
+ sprintf(buf + strlen(buf),
+ _(* May become veteran through combat or training\n));
+}
}
if (utype_has_flag(utype, F_TRIREME)) {
sprintf(buf + strlen(buf),
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
