Re: [Freeciv-Dev] (PR#39749) [Bug] battle groups keys don't work (Belgium and French)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39749 As discussed, changed to F1 through F4. Fn+control assign group Fn+control+shift add to assigned group Fn+shift select previously assigned group Unmodified F1 through F4 continue to show reports. To be honest though, on MacOS they don't always do these things. Various Fn do expose, and control+F1 always turns on/off the other control+Fn features. No matter what, somebody is going to be disappointed Better not to document until key redefinition has been implemented! Committed as part of S2_1 revision 14164. Committed as part of S2_2 revision 14165. Committed as part of trunk revision 14166. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39927) consistent UI - Map - shortcut F4 in 2.1 - F1 in 2.2
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39927 Trying to be all things to all people Committed as part of S2_1 revision 14164. Committed as part of S2_2 revision 14165. Committed as part of trunk revision 14166. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39966) BUG: GTK2 new game screen, _Ruleset conflicts with _Ready (and Not _ready) and _Release player, etc.
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39966 Committed as part of S2_1 revision 14164. Committed as part of S2_2 revision 14165. Committed as part of trunk revision 14166. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39967) BUG: GTK2 menu _Reports: _Players conflicts with S_paceship
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39967 Committed as part of S2_1 revision 14164. Committed as part of S2_2 revision 14165. Committed as part of trunk revision 14166. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39968) Tracking 2.1.2 release
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39968 Time to give a heads up to translators, and do general testing. Mostly cosmetic UI fixes this time around Should be ready in a week? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39969) i18n issues
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39969 Forwarding a batch of i18n issues from the mailing list, leaving out some unrelated stuff. -- Forwarded message -- From: Sini Ruohomaa [EMAIL PROTECTED] Date: Dec 8, 2007 9:25 AM Subject: [Freeciv-i18n] Finnish translation to upload to trunk stables To: [EMAIL PROTECTED] Hi, [snippet...] By the way, could we get an up-to-date freeciv.pot somewhere on the wiki or in the svn po directory again? One less than a month old would be ok, downloading the entire source is just rather a waste of sever bandwidth and random translation update time. ;) I think we maybe used to have translation status somewhere, or maybe that was just the Launchpad Ubuntu translation which doesn't seem to be there anymore. (The Freeciv I've gotten from Ubuntu does have some vaguely unfamiliar translations that might originate from the Launchpad translation project though.) I logged some things that might want internationalization bugs filed on them below, feel free to do what you want with them. There seems to be a general problem with starting sentences in the middle of a msgstr with a %s that English wants to have capitalized (e.g. English) and Finnish and other languages want to have in non-caps in any mid-sentence position (englantilaisten). We need some kind of capitalize-string parameter for %ss in gettext! (%^s or something.) --Sini returns to the other world now #: client/gui-sdl/helpdlg.c:1001 msgid ( with #: client/gui-sdl/helpdlg.c:1004 msgid ) #: client/gui-sdl/mapctrl.c:1589 msgid or Don't split strings like this, and provide more context! #: client/gui-sdl/mapview.c:884 msgid Press I guess this is like Press Enter. Shouldn't it be Press %s? A translator comment to not confuse this with the press would be nice. #: client/gui-sdl/menu.c:1066 #, c-format msgid Form Traderoute with %s ( %d RG + %d trade ) (R) RG, (R)? Translator comments. #: client/gui-sdl/menu.c:1087 msgid Cut Down to Translator comment. #: client/gui-sdl/repodlgs.c:1527 #, c-format msgid We have %d of %s\n (total value is : %d)\n We can sell %d of them for %d gold. %d of what? Translator comment. #: client/gui-sdl/spaceshipdlg.c:142 #, c-format msgid %s's SpaceShip If internationalizers find themselves using 's genetives (and they do, quite a bit), it means we need a real separate genetive in rulesets. Most languages can't use 's for that meaning. #: client/gui-sdl/wldlg.c:1386 #, c-format msgid %d gold per turn Should have plural handling. wldlg.c also has a series of %s%d%s%d%ss which have no explanation. Can't really translate them to anything else than whatever the original is with this information. #: data/civ1/game.ruleset:98 data/civ2/game.ruleset:98 #: data/default/game.ruleset:126 msgid Team 0 ... up to Team 31... Why, oh why? (Getting all these obsoleted eventually is going to be almost as depressing as getting 32 messages unfuzzed by putting numbers into these strings.) ___ Freeciv-i18n mailing list [EMAIL PROTECTED] https://mail.gna.org/listinfo/freeciv-i18n ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39968) Tracking 2.1.2 release
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39968 I'll send a notice to freeciv-i18n and give preliminary release date as next Sunday. On 12/16/07, William Allen Simpson [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39968 Time to give a heads up to translators, and do general testing. Mostly cosmetic UI fixes this time around Should be ready in a week? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39749) [Bug] battle groups keys don't work
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39749 On Tue, 11 Dec 2007 08:35:09 -0800 William Allen Simpson wrote: Yes, but the question is whether control-F1 and control-shift-F1 would fix the problem on your keyboard? The code is easy Is it ok for laptops? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39927) consistent UI - Map - shortcut F4 in 2.1 - F1 in 2.2
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39927
Forgot to attach the final patches for posterity.
Here's the shorter S2_2:
Index: data/helpdata.txt
===
--- data/helpdata.txt (revision 14164)
+++ data/helpdata.txt (working copy)
@@ -495,7 +495,6 @@
Ctrl-N: show city names on/off\n\
Ctrl-R: show city growth on/off\n\
Ctrl-P: show city production on/off\n\
- t: show city workers (mouse over or near city)\n\
), _(\
Main Map (Mouse):\n\
=\n\
@@ -510,6 +509,7 @@
\n\
Shift-Control-Left-click:Adjust city workers\n\
Control-Center-click:Wake up sentried units\n\
+ Shift-Control-Right-click: Show city workers (mouse over or near city)\n\
\n\
Area Selection mode (GTK):\n\
==\n\
@@ -523,11 +523,12 @@
), _(\
Dialogs and Reports:\n\
\n\
- F1: open City Report\n\
+ F1: show Map View\n\
F2: open Unit Report\n\
- F3: open Players dialog\n\
+ F3: open Nations Report\n\
+ F4: open City Report\n\
F5: open Economy Report\n\
- F6: open Science Report\n\
+ F6: open Research Report\n\
F7: open World Wonders\n\
F8: open Top Five Cities\n\
F9: open Messages dialog\n\
Index: data/scenario/tutorial.sav
===
--- data/scenario/tutorial.sav (revision 14164)
+++ data/scenario/tutorial.sav (working copy)
@@ -95,7 +95,7 @@
notify.event(city.owner, city.tile, E.TUTORIAL,
_(As the number of cities in your empire grows, it becomes harder to\n\
manage individual cities. This is where the city report becomes\n\
-useful. Press F1 to bring it up. This report shows a list of cities\n\
+useful. Press F4 to bring it up. This report shows a list of cities\n\
with various statistics about each. Play around with it a bit if you\n\
like (return to the map view by clicking on the Map tab). With a bit\n\
of practice it is possible to control almost every aspect of the cities\n\
Index: client/gui-gtk-2.0/repodlgs.c
===
--- client/gui-gtk-2.0/repodlgs.c (revision 14164)
+++ client/gui-gtk-2.0/repodlgs.c (working copy)
@@ -293,7 +293,7 @@
GtkWidget *science_diagram;
gui_dialog_new(science_dialog_shell, GTK_NOTEBOOK(top_notebook), NULL);
- gui_dialog_set_title(science_dialog_shell, _(Science));
+ gui_dialog_set_title(science_dialog_shell, _(Research));
gui_dialog_add_button(science_dialog_shell,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
Index: client/gui-gtk-2.0/gui_main.c
===
--- client/gui-gtk-2.0/gui_main.c (revision 14164)
+++ client/gui-gtk-2.0/gui_main.c (working copy)
@@ -385,6 +385,17 @@
/**
...
**/
+gboolean map_canvas_focus(void)
+{
+ gtk_window_present(GTK_WINDOW(toplevel));
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(top_notebook), 0);
+ gtk_widget_grab_focus(map_canvas);
+ return TRUE;
+}
+
+/**
+...
+**/
gboolean inputline_handler(GtkWidget *w, GdkEventKey *ev)
{
void *data = NULL;
@@ -496,59 +507,55 @@
}
assert(MAX_NUM_BATTLEGROUPS == 4);
-#define BATTLEGROUP_SHIFT_CASE(num)\
- if (ev-state GDK_CONTROL_MASK) { \
-key_unit_assign_battlegroup((num), TRUE); \
- } else { \
-key_unit_select_battlegroup((num), FALSE); \
- }
if ((ev-state GDK_CONTROL_MASK)) {
switch (ev-keyval) {
-case GDK_1:
- key_unit_assign_battlegroup(0, FALSE);
+case GDK_F1:
+ key_unit_assign_battlegroup(0, (ev-state GDK_SHIFT_MASK));
return TRUE;
-case GDK_2:
- key_unit_assign_battlegroup(1, FALSE);
+case GDK_F2:
+ key_unit_assign_battlegroup(1, (ev-state GDK_SHIFT_MASK));
return TRUE;
-case GDK_3:
- key_unit_assign_battlegroup(2, FALSE);
+case GDK_F3:
+ key_unit_assign_battlegroup(2, (ev-state GDK_SHIFT_MASK));
return TRUE;
-case GDK_4:
- key_unit_assign_battlegroup(3, FALSE);
+case GDK_F4:
+ key_unit_assign_battlegroup(3, (ev-state GDK_SHIFT_MASK));
return TRUE;
default:
break;
};
- }
+ } else if ((ev-state GDK_SHIFT_MASK)) {
+switch (ev-keyval) {
- switch (ev-keyval) {
+case GDK_F1:
+ key_unit_select_battlegroup(0, FALSE);
+ return TRUE;
- case GDK_exclam:
-/* Shift + 1 */
-
[Freeciv-Dev] (PR#39970) BUG: makes fuzzy msgstr with c-format, when the msgid doesn't have any
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39970 For a long time, I've been fixing these as I see them, but that's only where they are affected by something else I'm doing. Here's some recent examples: --- po/cs.po(revision 14163) #: client/gui-gtk-2.0/gui_main.c:1490 #, fuzzy -msgid _Do not observe -msgstr %s nynà pozoruje %s +msgid Do not _observe +msgstr nynà _pozoruje --- po/pt_BR.po (revision 14163) #: client/gui-gtk-2.0/pages.c:1437 #, fuzzy -msgid _AI Skill Level: -msgstr NÃvel de depuração \%s\ incorrecto.\n +msgid AI Skill _Level: +msgstr NÃvel de _depuração: As you can see, this was fuzzy before I touched it, with %s in the msgstr, while the msgid has none! Presumably, there was an old msgid somewhere, and po scripts matched strictly on the number of matching characters, without regard to the msgid c-format. As you all know, when this message pops up, it would look for pointers for the strings, and crash! I've also seen this with %d from time to time. Are these the most recent po scripts? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39971) BUG: i18n possessive problems
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39971 Most of these are SDL issues, and SDL was only recently added to the translations and isn't finished. But a couple things leap to the eye: #: client/gui-sdl/spaceshipdlg.c:142 #, c-format msgid %s's SpaceShip This is a continuing problem. This pattern should never be used! Many times, it's not even correct English. (How do you adjust the ' when the word ends in s, especially for a proper name?) #: server/citytools.c:541 #, c-format msgid %s from %s lost in transfer to %s's %s #: server/cityturn.c:864 #, c-format msgid %s's worklist is now empty. #: server/diplhand.c:407 #, c-format msgid You receive %s's worldmap. #: server/diplhand.c:415 #, c-format msgid You receive %s's seamap. #: server/diplhand.c:469 server/diplhand.c:478 #, c-format msgid You agree on an armistice with %s. In %d turn it will turn into a peace treaty. Move your units out of %s's territory. msgid_plural You agree on an armistice with %s. In %d turns it will turn into a peace treaty. Move your units out of %s's territory. #: server/diplomats.c:332 #, c-format msgid Your %s could not sabotage %s's %s. #: server/diplomats.c:354 #, c-format msgid Your %s succeeded in sabotaging %s's %s. #: server/diplomats.c:421 #, c-format msgid You don't have enough gold to bribe %s's %s. #: server/diplomats.c:457 #, c-format msgid Your %s succeeded in bribing %s's %s and became more experienced. #: server/diplomats.c:464 #, c-format msgid Your %s succeeded in bribing %s's %s. #: server/diplomats.c:613 #, c-format msgid %s's %s failed to steal technology from %s. #: server/diplomats.c:1264 #, c-format msgid You have caused an incident while bribing %s's %s. #: server/plrhand.c:1723 #, c-format msgid The capture of %s's capital and the destruction of the empire's administrative\n structures have sparked a civil war. Opportunists have flocked to the rebel cause,\n and the upstart %s now holds power in %d rebel provinces. #. TRANS: Minor error message. #: server/savegame.c:4065 #, c-format msgid Illegal alliance structure detected: %s's alliance to %s reduced to peace treaty. #: server/stdinhand.c:2380 server/stdinhand.c:2410 #, c-format msgid %s's %s no longer debugged. #: server/stdinhand.c:2385 server/stdinhand.c:2415 #, c-format msgid %s's %s debugged. #: server/unithand.c:902 #, c-format msgid Your %s%s survived the pathetic attack from %s's %s and became more experienced! #: server/unithand.c:912 #, c-format msgid Your %s%s survived the pathetic attack from %s's %s. #: server/unithand.c:923 #, c-format msgid Your attacking %s failed against %s's %s%s! #: server/unittools.c:1608 #, c-format msgid Your attacking %s succeeded against %s's %s%s and became more experienced! #: server/unittools.c:1617 #, c-format msgid Your attacking %s succeeded against %s's %s%s! #: server/unittools.c:1625 #, c-format msgid %s lost to an attack by %s's %s%s. #: server/unittools.c:1660 #, c-format msgid Your attacking %s succeeded against %s's %s (and %d other unit)%s and became more experienced! msgid_plural Your attacking %s succeeded against %s's %s (and %d other units)%s and became more experienced! #: server/unittools.c:1673 #, c-format msgid Your attacking %s succeeded against %s's %s (and %d other unit)%s! msgid_plural Your attacking %s succeeded against %s's %s (and %d other units)%s! #. TRANS: Cannon lost to an attack from John's #. * Destroyer. #: server/unittools.c:1698 #, c-format msgid %s lost to an attack from %s's %s. #. TRANS: Cannon lost when John's Destroyer #. * attacked Mark's Musketeers. #: server/unittools.c:1707 #, c-format msgid %s lost when %s's %s attacked %s's %s. #. TRANS: Musketeers (and Cannon) lost to an #. * attack from John's Destroyer. #: server/unittools.c:1722 #, c-format msgid %s (and %s) lost to an attack from %s's %s. #. TRANS: Musketeers and 3 other units lost to #. * an attack from John's Destroyer. (only happens #. * with at least 2 other units) #: server/unittools.c:1732 #, c-format msgid %s and %d other unit lost to an attack from %s's %s. msgid_plural %s and %d other units lost to an attack from %s's %s. #. TRANS: 2 units lost when John's Destroyer #. * attacked Mark's Musketeers. (only happens #. * with at least 2 other units) #: server/unittools.c:1746 #, c-format msgid %d unit lost when %s's %s attacked %s's %s. msgid_plural %d units lost when %s's %s attacked %s's %s. #: server/unittools.c:2016 #, c-format msgid %s's %s was nuked. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39972) i18n team number problems
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39972 #: data/civ1/game.ruleset:98 data/civ2/game.ruleset:98 #: data/default/game.ruleset:126 msgid Team 0 ... up to Team 31... Why, oh why? (Getting all these obsoleted eventually is going to be almost as depressing as getting 32 messages unfuzzed by putting numbers into these strings.) I understand why the old names were changed to numbers: (PR#13145) completely new design for teams (PR#13689) put team names in the ruleset I disagree with Per recently change from 1 through 32 (to 0 through 31), but have done my part to clean up afterward. (PR#39343) 2.1.0-beta4 team numbers (PR#39773) [Clean Up] Team number It would have been easier to change the programming index to subtract 1. Most humans don't assign things starting from 0! ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39973) i18n get_location_str() problems
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39973 In PR#39971, there are quite a few messages of the form: ... %s's %s%s The %s%s turns out to use a function called get_location_str_at() or get_location_str_in(). About 18 uses in 2.1.1. at %s in %s outside %s near %s Those %s are city names. This is hard to discern in English, and I expect it is a nightmare in another language! Can we always assume the prepositional phrase occurs after a noun in every language? I'm pretty sure the i18n guidelines say *no* sentence fragments. This will be hard to fix, and certainly not in time for 2.1.2. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39971) BUG: i18n possessive problems
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39971 An answer to much of the problem might be to use nation names instead of player (ruler) names. That would lose some flavor, but it's better to use something that's uniform. That would easily change: You receive %s's worldmap. to You receive the %s worldmap. This would better match elsewhere in the client: my_snprintf(buf, bufsiz, _(The %s give their worldmap), nation_plural_translation(pclause-from-nation)); But this already seems to be abused. For example, notify_conn(NULL, NULL, E_NATION_SELECTED, _(%s is the %s ruler %s.), pplayer-username, nation_name_translation(new_nation), pplayer-name); That's not really a noun use, that's an adjective. We really need to ensure and document that the nation name is adjectival, and then ensure that all uses are consistent. We really have singular adjective, and plural noun. That's not documented. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39971) BUG: i18n possessive problems
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39971 On Dec 17, 2007 7:15 AM, William Allen Simpson [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39971 Daniel Markstedt wrote: Agreed. This was actually discussed last year or early this year, but nothing came out of it at the time. Using the nation name would also have the benefit of making it easier to figure out what player the message is about. As it stands, unless the leader is famous enough or unless you're a serious history buff, it can often be hard to associate leader name and nation. I searched for possessive in the subject lines in RT, and the body of the past two years of messages, but didn't find anything. PR#? This is probably important since leader names are not translated. The closest thing I could find was #19049 -- thanks to gmail's inbox search. :) Unfortunately, despite my best efforts, player-name is one of the many remaining things without an access function, so they'll have to be fixed on an /ad hoc/ basis as they are found I'll add new access functions for them (as found). This is something I can do for 2.1.2 this week. In the scope of S2_1? I made an extensive overhaul of all nationsets about two years ago and standardized on singular-adjective and plural-noun. Something could have been overlooked, though, so feel free to verify. OK. Since nation_name_translation() and nation_plural_translation() *are* only used via access functions (because I made an extensive overhaul 6 months ago), I'll check all uses for grammar. Sorry, when I was fixing the many misuses of translation or non-translation, I wasn't also checking each context for grammar, and was trying very hard not to make changes to any translation strings (mostly un-marking strings in freelog() calls). This is something I can do for 2.1.2 this evening, so that translators can look for any mistakes this week. Fine, but please communicate with the translators if you end up fuzzying a bunch of strings. I told them yesterday that they have about a dozen fuzzies to resolve for 2.1.2. It is documented in fact, in doc/README.nations under 'Nation naming'. I guess it would be worth mentioning it in the wiki too, though. I meant in the code, too To be honest, I didn't even think to look in doc/README.nations or the wiki for code writing, and it's changed since last time I'd added a nation. The code actually says single and plural. I'll change it to specify adjective. Anyway, good work! Sounds like a good idea to clarify this in code. In any case, this is an area where a major overhaul is needed. Looking at my native Swedish I have noted several shortcomings with the current system, for example in the areas of capitalization and gender. The former Swedish translator proposed the following solution over seven years ago: http://lists.complete.org/freeciv-dev%40freeciv.org/2000/08/msg00493.html.gz ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
