[Freeciv-Dev] [bug #14745] UI for management of trade routes non-obvious or non-existant
Update of bug #14745 (project freeciv): Status:None = Ready For Test Assigned to:None = pepeto Planned Release:None = 2.1.10 ___ Follow-up Comment #3: I'm not an English native-speaker, so I cannot know if trade route is more appropriated than traderoute. For warclient/warserver, I renamed it trade route in the past, but I never could unsure it was correct. Anyway, the string would need to be translated, so it cannot be modified in stable branches. The attached patch fixes that the trade routes (or traderoutes :) ) with no bonus are displayed in the list. (file #7291) ___ Additional Item Attachment: File name: trunk_S2_2_S2_1_traderoute_info.diff Size:1 KB ___ Reply to this item at: http://gna.org/bugs/?14745 ___ Message posté via/par Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14745] UI for management of trade routes non-obvious or non-existant
Follow-up Comment #4, bug #14745 (project freeciv): The correct English would be 'trade routes.' But 'traderoutes' doesn't cause any confusion... ___ Reply to this item at: http://gna.org/bugs/?14745 ___ 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 #14749] Freeciv desktop files contain wrong entries
URL: http://gna.org/bugs/?14749 Summary: Freeciv desktop files contain wrong entries Project: Freeciv Submitted by: evyscr Submitted on: Четверг 12.11.2009 at 19:46 Category: bootstrap Severity: 3 - Normal Priority: 5 - Normal Status: Ready For Test Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: None Planned Release: 2.1.10 ___ Details: Good day! From ALT Linux repocop tests: === desktop-file-validate utility printed the following message(s): /usr/share/applications/freeciv.desktop: warning: key Encoding in group Desktop Entry is deprecated; /usr/share/applications/freeciv.desktop: warning: value freeciv-client.png for key Icon in group Desktop Entry is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path; desktop-file-validate utility printed the following message(s): /usr/share/applications/freeciv-server.desktop: warning: key Encoding in group Desktop Entry is deprecated; === So our desktop files have violations of current fd.o specification. Patches for S2_1 and both S2_2 and trunk are attached. -- Thanks, evyscr ___ File Attachments: --- Date: Четверг 12.11.2009 at 19:46 Name: S2_1-desktops.diff Size: 941B By: evyscr http://gna.org/bugs/download.php?file_id=7292 --- Date: Четверг 12.11.2009 at 19:46 Name: S2_2-desktops.diff Size: 946B By: evyscr http://gna.org/bugs/download.php?file_id=7293 ___ Reply to this item at: http://gna.org/bugs/?14749 ___ 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 #14745] UI for management of trade routes non-obvious or non-existant
Update of bug #14745 (project freeciv): Status: Ready For Test = In Progress ___ Reply to this item at: http://gna.org/bugs/?14745 ___ Message posté via/par Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14750] Translation issue in 2.1.10. %%
URL: http://gna.org/bugs/?14750 Summary: Translation issue in 2.1.10. %% Project: Freeciv Submitted by: joedalton Submitted on: Thursday 11/12/2009 at 19:13 Category: general Severity: 2 - Minor Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.1.10 Discussion Lock: Any Operating System: GNU/Linux Planned Release: 2.1.10 ___ Details: Translation issue in 2.1.10. Some strings has two %%, but not all, ingame seems to be fine. i looked at, but didn't found anything to explain this. http://codecodex.com/wiki/Escape_sequences_and_escape_characters this one has only one %. #: data/helpdata.txt:640 #, no-c-format msgid Keep in mind that with some types of government, military units inside or outside cities can reduce or create unhappiness. Also remember that when a unit is inside a city, it gets a 50% defensive bonus, as if fortified. When a new city is built, the city starts to build the best available defensive unit from the above list. Why 2 %% i these strings ? #: client/helpdata.c:840 #, c-format msgid * May be disbanded in a city to recover 50%% of the production cost.\n #: client/helpdata.c:904 #, c-format msgid * May fortify, granting a 50%% defensive bonus.\n #: client/helpdata.c:904 #, c-format msgid * May fortify, granting a 50%% defensive bonus.\n msgstr * Kan befæste sig, og dermed opnå en 50 % forsvarsbonus.\n #: client/helpdata.c:1006 #, c-format msgid * Must end turn in a city or next to land, or has a 50%% risk of being lost at sea.\n msgstr * Skal afslutte runden i en by eller ved kysten, ellers har den en 50 % risiko for at gå tabt på havet.\n #: data/scenario/tutorial.sav:145 #, c-format msgid Now your city has grown to size five. As cities get larger unrest\n becomes a problem. A city of this size will usually have one unhappy\n citizen unless pacifying effects are used; meaning one entertainer\n specialist is required to keep your citizens content. This is basically\n a wasted citizen.\n \n There are several things that can be done about this. One quick fix\n is to build a temple (or other cultural building) that will make an\n unhappy citizen content (see the help on buildings for specs\n on each building type). As you get more large cities, it may pay off\n to change your tax rates (by pressing shift-T) to dedicate some of\n your taxes directly to luxuries (every two luxuries will pacify one\n citizen). Building a marketplace enhances the benefit from this\n by providing +50%% luxuries to the city. #: client/helpdata.c:1010 #, c-format msgid * The discovery of %s reduces the risk to 25%%.\n msgstr * Opdagelsen af %s reducerer risikoen til 25%%.\n #: client/helpdata.c:1015 #, c-format msgid * %s reduces the risk to 12%%.\n msgstr * %s reducerer risikoen til 12 %.\n #: client/helpdata.c:1164 #, c-format msgid * Reduces the chance of losing boats on the high seas to 25%%.\n msgstr * Reducerer risikoen for at miste skibe på det dybe ocean til 25%%.\n #: client/helpdata.c:1167 #, c-format msgid * Reduces the chance of losing boats on the high seas to 12%%.\n msgstr * Reducerer risikoen for at miste skibe på det dybe ocean til 12%%.\n bye Joe ___ Reply to this item at: http://gna.org/bugs/?14750 ___ 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 #14751] configure fails to detect SDL_mixer
URL: http://gna.org/bugs/?14751 Summary: configure fails to detect SDL_mixer Project: Freeciv Submitted by: kernigh Submitted on: Thursday 11/12/2009 at 21:15 Category: client Severity: 2 - Minor Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: 2.1.9 Discussion Lock: Any Operating System: *BSD Planned Release: None ___ Details: When I build freeciv-2.1.9 from source, the configure script fails to detect SDL_mixer, so civclient has no sound. I build the GTK+ 2 client. My operating system is OpenBSD. My configure arguments were --prefix=/home/kernigh/prefix CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib The detection fails because the AC_CHECK_LIB in m4/sound.m4 forgets to use SDL_LIBS (the output of sdl-config --libs) when checking SDL_mixer. For my OpenBSD system, sdl-config --libs provides some extra flags that are always necessary when linking to SDL, or to any library that requires SDL. $ sdl-config --cflags -I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/us r/X11R6/include -DXTHREADS $ sdl-config --libs -L/usr/local/lib -lSDL -pthread -L/usr/X11R6/lib -R/usr/X11R6/lib (OpenBSD system gcc is not searching /usr/local by default. OpenBSD has X11R7 in /usr/X11R6.) So I modified m4/sound.m4 to use SDL_CFLAGS and SDL_LIBS when checking SDL_mixer (similar to how m4/sdl-client.m4 uses SDL_CFLAGS and SDL_LIBS when checking SDL_image). I have attached a patch. I also changed the header check in m4/sound.m4. The check is for 'SDL_mixer.h' and *not* 'SDL/SDL_mixer.h', because 'SDL_mixer.h' is the correct way to include the file (and because client/audio_sdl.c includes 'SDL_mixer.h'). After I modified m4/sound.m4, I ran 'aclocal -I m4' and 'autoconf' to regenerate configure, then I rebuilt and reinstalled freeciv. I _immediately_ encountered another bug. My civclient, linked with SDL_mixer, dumped core at startup. $ civclient civclient:/usr/local/lib/libSDL_mixer.so.3.0: civclient : WARNING: symbol(curren t_filename) size mismatch, relink your program Segmentation fault (core dumped) I found two global variables named 'current_filename': one in civclient (an ELF executable) and one in SDL_mixer (an ELF shared library). The 'WARNING:' line comes from /usr/libexec/ld.so, the dynamic linker for ELF shared libraries. ELF seems to have one level of symbol resolution, so 'current_filename' can be only one variable. To solve the conflict, I must rename one of the two variables. In civclient, client/connectdlg_common.[ch] declares a global variable named 'current_filename', sized 4 bytes. My libSDL_mixer.so.3.0 declares a different global variable also named 'current_filename', sized 1024 bytes. $ readelf -s /usr/local/lib/libSDL_mixer.so.3.0 | fgrep current_filename 234: 0008fe10 1024 OBJECT GLOBAL DEFAULT 27 current_filename I think that my libSDL_mixer.so.3.0 is wrong to export 'current_filename', but I am too lazy to fix and rebuild SDL_mixer. So I instead added a '#define current_filename freeciv_current_filename' to client/connectdlg_common.h in freeciv. Then I rebuilt and reinstalled freeciv, and the civclient had perfect sound! The attached freeciv-detect-sdl-mixer.patch edits both m4/sound.m4 and client/connectdlg_common.h. This allows configure to detect SDL_mixer, and prevents the 'current_filename' conflict. Remember to run 'aclocal -I m4' and 'autoconf' after applying the patch. Please fix this bug in the next version of freeciv. ___ File Attachments: --- Date: Thursday 11/12/2009 at 21:15 Name: freeciv-detect-sdl-mixer.patch Size: 1kB By: kernigh diff for both m4/sound.m4 and client/connectdlg_common.h http://gna.org/bugs/download.php?file_id=7297 ___ Reply to this item at: http://gna.org/bugs/?14751 ___ 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 #14750] Translation issue in 2.1.10. %%
Follow-up Comment #1, bug #14750 (project freeciv): Normal strings needs only 1 '%'. However, string used as printf-style format, must have 2 '%' to don't interpret the '%' as the start of an escape sentence. See '$ man 3 printf' for more explanation. In the po files, you can guess the normal number of '%' thanks to the format information: * _no-c-format_ means normal string (so '%' needed). * _c-format_ means format string (so 2 '%' needed). Is that enough as explanation? ___ Reply to this item at: http://gna.org/bugs/?14750 ___ Message posté via/par Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
