[Freeciv-Dev] (PR#11134) Small fixes in i18n and help

["Christian Knoke" <chrisk@xxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=11134 >


Hello,

the attached patch fixes some small problems in S2:

- "space" (for the key) i18n'ed in both GTK clients
  But problem: the _() is not evaluated in the code. Can somebody fix this?

- Put client/gui-gtk-2.0/gui_stuff.c in POTFILES.in

- "Ctrl" i18n'ed for GTK2
  But still needs to be done for /utility/ftwl/common_types.c (cannot test)

- Plural added in City: %s (%s, %d turns ceasefire) client/text.c
  ("s" was missing in 2 places)

- Added helptext entry for shift-U order

Christian

-- 
Christian Knoke            * * *            http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.

diff -Nur --exclude='*~' --exclude=de.po --exclude=freeciv.pot 
../s20/freeciv/client/gui-gtk/menu.c ./client/gui-gtk/menu.c
--- ../s20/freeciv/client/gui-gtk/menu.c        2004-10-28 10:51:26.000000000 
+0200
+++ ./client/gui-gtk/menu.c     2004-11-21 21:27:51.000000000 +0100
@@ -756,7 +756,7 @@
        NULL,                   0,                                      
"<Separator>"   },
   { "/" N_("_Orders") "/" N_("_Wait"),                 "w",
        orders_menu_callback,   MENU_ORDER_WAIT                                 
        },
-  { "/" N_("_Orders") "/" N_("Done"),                  "space",
+  { "/" N_("_Orders") "/" N_("Done"),                  N_("?key:space"),
        orders_menu_callback,   MENU_ORDER_DONE                                 
        },
   /* Reports menu ... */
   { "/" N_("_Reports"),                                        NULL,
diff -Nur --exclude='*~' --exclude=de.po --exclude=freeciv.pot 
../s20/freeciv/client/gui-gtk-2.0/gui_stuff.c ./client/gui-gtk-2.0/gui_stuff.c
--- ../s20/freeciv/client/gui-gtk-2.0/gui_stuff.c       2004-11-14 
11:14:27.000000000 +0100
+++ ./client/gui-gtk-2.0/gui_stuff.c    2004-11-21 20:41:24.000000000 +0100
@@ -445,7 +445,7 @@
       g_signal_connect_swapped(button, "clicked",
          G_CALLBACK(gui_dialog_destroy), dlg);
 
-      my_snprintf(buf, sizeof(buf), _("Close Tab:\n%s"), "Ctrl+W");
+      my_snprintf(buf, sizeof(buf), _("Close Tab:\n%s"), _("Ctrl+W"));
       gtk_tooltips_set_tip(main_tips, button, buf, "");
 
       image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
diff -Nur --exclude='*~' --exclude=de.po --exclude=freeciv.pot 
../s20/freeciv/client/gui-gtk-2.0/menu.c ./client/gui-gtk-2.0/menu.c
--- ../s20/freeciv/client/gui-gtk-2.0/menu.c    2004-11-14 11:14:27.000000000 
+0100
+++ ./client/gui-gtk-2.0/menu.c 2004-11-21 21:40:33.000000000 +0100
@@ -807,7 +807,7 @@
        NULL,                   0,                                      
"<Separator>"   },
   { "/" N_("Orders") "/" N_("_Wait"),                  "w",
        orders_menu_callback,   MENU_ORDER_WAIT                                 
        },
-  { "/" N_("Orders") "/" N_("Done"),                   "space",
+  { "/" N_("Orders") "/" N_("Done"),                   N_("?key:space"),
        orders_menu_callback,   MENU_ORDER_DONE                                 
        },
   /* Reports menu ... */
   { "/" N_("_Reports"),                                        NULL,
diff -Nur --exclude='*~' --exclude=de.po --exclude=freeciv.pot 
../s20/freeciv/client/text.c ./client/text.c
--- ../s20/freeciv/client/text.c        2004-11-14 11:14:26.000000000 +0100
+++ ./client/text.c     2004-11-21 21:16:17.000000000 +0100
@@ -167,7 +167,7 @@
 
        /* TRANS: "Polish territory (5 turn ceasefire)" */
        add_line(PL_("%s territory (%d turn ceasefire)",
-                    "%s territory (%d turn ceasefire)",
+                    "%s territory (%d turns ceasefire)",
                     turns),
                 get_nation_name(owner->nation), turns);
       } else {
@@ -198,7 +198,7 @@
 
        /* TRANS:  "City: Warsaw (Polish, 5 turn ceasefire)" */
         add_line(PL_("City: %s (%s, %d turn ceasefire)",
-                                      "City: %s (%s, %d turn ceasefire)",
+                                      "City: %s (%s, %d turns ceasefire)",
                                       turns),
                 pcity->name,
                 get_nation_name(owner->nation),
diff -Nur --exclude='*~' --exclude=de.po --exclude=freeciv.pot 
../s20/freeciv/data/helpdata.txt ./data/helpdata.txt
--- ../s20/freeciv/data/helpdata.txt    2004-07-19 16:06:48.000000000 +0200
+++ ./data/helpdata.txt 2004-11-21 21:22:53.000000000 +0100
@@ -489,7 +489,8 @@
   s: (s)entry unit\n\
   t: show (t)iles city is using  (mouse over or near city)\n\
   T: open (T)ax/Lux/Sci Rates dialog\n\
-  u: (u)nload boat\n\
+  u: (u)nload unit\n\
+  U: (U)nload all units from a boat\n\
   w: (w)ait until later in turn\n\
   W: (W)ake up other units on tile\n\
   x: auto-e(x)plore\n\
diff -Nur --exclude='*~' --exclude=de.po --exclude=freeciv.pot 
../s20/freeciv/po/POTFILES.in ./po/POTFILES.in
--- ../s20/freeciv/po/POTFILES.in       2004-10-28 10:51:36.000000000 +0200
+++ ./po/POTFILES.in    2004-11-21 20:45:40.000000000 +0100
@@ -76,6 +76,7 @@
 client/gui-gtk-2.0/gamedlgs.c
 client/gui-gtk-2.0/gotodlg.c
 client/gui-gtk-2.0/gui_main.c
+client/gui-gtk-2.0/gui_stuff.c
 client/gui-gtk-2.0/happiness.c
 client/gui-gtk-2.0/helpdlg.c
 client/gui-gtk-2.0/inputdlg.c