<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39977 >

This is a follow-up to PR#39967.

gui-win32 has the same problem.
gui-xaw should have the same menu items for consistency.

Much to my surprise, gui-sdl already has some entires with "Research F6"
and others with "Science F6".  Make consistent.

Also, gui-sdl has two reports from the same button, named "Players" and
"Nations". Leave them in place, but I'm noting that my changes for GTK2
seem to have precedent elsewhere, or are a return to a previous state!

Added TRANS: comments about these, as apparently some uses of "Research"
are imperative verbs, while these are report titles and actions.

Fixed a couple of mistakes in the repair of conflicts (PR#39976).

Index: data/Freeciv.in
===================================================================
--- data/Freeciv.in     (revision 14177)
+++ data/Freeciv.in     (working copy)
@@ -1363,7 +1363,7 @@
 !
 ! Science report dialog
 !
-Freeciv*sciencepopup.title:   _("Science")
+Freeciv*sciencepopup.title:   _("Research")
 Freeciv*sciencepopup.allowShellResize: True
 Freeciv*scienceform.resizable: True
 
@@ -3189,8 +3189,8 @@
 !
 ! players dialog
 !
-Freeciv*playerspopup.title:  _("Players")
-Freeciv*playerspopup.iconName:   _("Players")
+Freeciv*playerspopup.title:  _("Nations")
+Freeciv*playerspopup.iconName:   _("Nations")
 Freeciv*playerspopup.allowShellResize: True
 
 Freeciv*playersform.resizable:           true
Index: po/no.po
===================================================================
--- po/no.po    (revision 14177)
+++ po/no.po    (working copy)
@@ -13880,11 +13880,11 @@
 #: client/gui-sdl/mapview.c:335 client/gui-sdl/mapview.c:340
 #, fuzzy
 msgid "Research"
-msgstr "Fors_ker på"
+msgstr "Forsker på"
 
 #, fuzzy
 msgid "_Research"
-msgstr "_Fors_ker på"
+msgstr "_Forsker på"
 
 #: client/gui-sdl/mapctrl.c:1424 client/gui-sdl/mapview.c:312
 #: client/gui-sdl/mapview.c:315 client/gui-xaw/menu.c:131
Index: po/ja.po
===================================================================
--- po/ja.po    (revision 14177)
+++ po/ja.po    (working copy)
@@ -14677,7 +14677,7 @@
 
 #, fuzzy
 msgid "_Research"
-msgstr "_研究"
+msgstr "研究(_R)"
 
 #: client/gui-sdl/mapctrl.c:1424 client/gui-sdl/mapview.c:312
 #: client/gui-sdl/mapview.c:315 client/gui-xaw/menu.c:131
Index: client/gui-gtk-2.0/repodlgs.c
===================================================================
--- client/gui-gtk-2.0/repodlgs.c       (revision 14177)
+++ client/gui-gtk-2.0/repodlgs.c       (working copy)
@@ -279,6 +279,7 @@
   GtkWidget *science_diagram;
 
   gui_dialog_new(&science_dialog_shell, GTK_NOTEBOOK(top_notebook), NULL);
+  /* TRANS: Research report title */
   gui_dialog_set_title(science_dialog_shell, _("Research"));
 
   gui_dialog_add_button(science_dialog_shell,
Index: client/gui-gtk-2.0/plrdlg.c
===================================================================
--- client/gui-gtk-2.0/plrdlg.c (revision 14177)
+++ client/gui-gtk-2.0/plrdlg.c (working copy)
@@ -345,6 +345,7 @@
   GtkWidget *menubar, *menu, *item, *vbox;
 
   gui_dialog_new(&players_dialog_shell, GTK_NOTEBOOK(top_notebook), NULL);
+  /* TRANS: Nations report title */
   gui_dialog_set_title(players_dialog_shell, _("Nations"));
 
   gui_dialog_add_button(players_dialog_shell,
Index: client/gui-xaw/repodlgs.c
===================================================================
--- client/gui-xaw/repodlgs.c   (revision 14177)
+++ client/gui-xaw/repodlgs.c   (working copy)
@@ -270,7 +270,8 @@
                                         science_dialog_shell,
                                         NULL);   
   my_snprintf(rate_text, sizeof(rate_text), "\ntext not set yet");
-  report_title=get_report_title_plus(_("Science"), rate_text);
+  /* TRANS: Research report title */
+  report_title=get_report_title_plus(_("Research"), rate_text);
   science_label = XtVaCreateManagedWidget("sciencelabel", 
                                          labelWidgetClass, 
                                          science_form,
@@ -480,7 +481,8 @@
     const char *report_title;
     struct player_research* research = get_player_research(game.player_ptr);
     
-    report_title = get_report_title_plus(_("Science"), science_dialog_text());
+    /* TRANS: Research report title */
+    report_title = get_report_title_plus(_("Research"), science_dialog_text());
     xaw_set_label(science_label, report_title);
     free((void *) report_title);
 
Index: client/gui-xaw/menu.c
===================================================================
--- client/gui-xaw/menu.c       (revision 14177)
+++ client/gui-xaw/menu.c       (working copy)
@@ -217,9 +217,11 @@
 static struct MenuEntry reports_menu_entries[]={
     { { N_("Cities"), 0               },    "F1", MENU_REPORT_CITIES, 0 },
     { { N_("Units"), 0                },    "F2", MENU_REPORT_UNITS, 0 },
-    { { N_("Players"), 0              },    "F3", MENU_REPORT_PLAYERS, 0 },
+    /* TRANS: Nations report action */
+    { { N_("Nations"), 0              },    "F3", MENU_REPORT_PLAYERS, 0 },
     { { N_("Economy"), 0              },    "F5", MENU_REPORT_ECONOMY, 0 },
-    { { N_("Science"), 0              },    "F6", MENU_REPORT_SCIENCE, 0 },
+    /* TRANS: Research report action */
+    { { N_("Research"), 0             },    "F6", MENU_REPORT_SCIENCE, 0 },
     { { 0                             },      "", MENU_SEPARATOR_LINE, 0 },
     { { N_("Wonders of the World"), 0 },    "F7", MENU_REPORT_WOW, 0 },
     { { N_("Top Five Cities"), 0      },    "F8", MENU_REPORT_TOP_CITIES, 0 },
Index: client/gui-win32/repodlgs.c
===================================================================
--- client/gui-win32/repodlgs.c (revision 14177)
+++ client/gui-win32/repodlgs.c (working copy)
@@ -89,7 +89,8 @@
   int hist, id, steps;
 
   if (!science_dlg) return;            
-  sz_strlcpy(text, get_report_title(_("Science")));
+  /* TRANS: Research report title */
+  sz_strlcpy(text, get_report_title(_("Research")));
   sz_strlcat(text, science_dialog_text());
 
   SetWindowText(GetDlgItem(science_dlg, ID_SCIENCE_TOP), text);
@@ -268,7 +269,8 @@
       struct fcwin_box *vbox;
       struct fcwin_box *hbox;
       science_dlg=fcwin_create_layouted_window(science_proc,
-                                              _("Science Report"),
+                                              /* TRANS: Research report title 
*/
+                                              _("Research"),
                                               WS_OVERLAPPEDWINDOW,
                                               CW_USEDEFAULT,CW_USEDEFAULT,
                                               root_window,
Index: client/gui-win32/menu.c
===================================================================
--- client/gui-win32/menu.c     (revision 14177)
+++ client/gui-win32/menu.c     (working copy)
@@ -398,15 +398,17 @@
   {N_("_Reports"),                             IDM_SUBMENU},
   {N_("_Cities")               "\tF1",         IDM_REPORTS_CITIES},
   {N_("_Units")                        "\tF2",         IDM_REPORTS_UNITS},
-  {N_("_Players")              "\tF3",         IDM_REPORTS_PLAYERS},
+  /* TRANS: Nations report action */
+  {N_("_Nations")              "\tF3",         IDM_REPORTS_PLAYERS},
   {N_("_Economy")              "\tF5",         IDM_REPORTS_ECONOMY},
-  {N_("_Science")              "\tF6",         IDM_REPORTS_SCIENCE},
+  /* TRANS: Research report action */
+  {N_("_Research")             "\tF6",         IDM_REPORTS_SCIENCE},
   {"", IDM_SEPARATOR},
   {N_("_Wonders of the World") "\tF7",         IDM_REPORTS_WONDERS},
   {N_("_Top Five Cities")      "\tF8",         IDM_REPORTS_TOP_CITIES},
   {N_("_Messages")             "\tF10",        IDM_REPORTS_MESSAGES},
   {N_("_Demographics")         "\tF11",        IDM_REPORTS_DEMOGRAPHICS},
-  {N_("S_paceship")            "\tF12",        IDM_REPORTS_SPACESHIP},
+  {N_("_Spaceship")            "\tF12",        IDM_REPORTS_SPACESHIP},
   {NULL, 0},
 
 
Index: client/gui-win32/plrdlg.c
===================================================================
--- client/gui-win32/plrdlg.c   (revision 14177)
+++ client/gui-win32/plrdlg.c   (working copy)
@@ -338,7 +338,10 @@
     };
   struct fcwin_box *vbox;
   struct fcwin_box *hbox;
-  players_dialog=fcwin_create_layouted_window(players_proc,_("Players"),
+
+  players_dialog=fcwin_create_layouted_window(players_proc,
+                                             /* TRANS: Nations report title */
+                                             _("Nations"),
                                              WS_OVERLAPPEDWINDOW,
                                              CW_USEDEFAULT,CW_USEDEFAULT,
                                              root_window,NULL,
Index: client/gui-sdl/mapview.c
===================================================================
--- client/gui-sdl/mapview.c    (revision 14177)
+++ client/gui-sdl/mapview.c    (working copy)
@@ -329,14 +329,17 @@
   pBuf = get_research_widget();
   
   if (!game.player_ptr) {
+    /* TRANS: Research report action */
     my_snprintf(cBuf, sizeof(cBuf), "%s (%s)\n%s (%d/%d)", _("Research"), "F6",
                                     "None", 0, 0);
   } else if (get_player_research(game.player_ptr)->researching != A_UNSET) {  
+    /* TRANS: Research report action */
     my_snprintf(cBuf, sizeof(cBuf), "%s (%s)\n%s (%d/%d)", _("Research"), "F6",
                advance_name_researching(game.player_ptr),
                get_player_research(game.player_ptr)->bulbs_researched,
                total_bulbs_required(game.player_ptr));
   } else {
+    /* TRANS: Research report action */
     my_snprintf(cBuf, sizeof(cBuf), "%s (%s)\n%s (%d/%d)", _("Research"), "F6",
                advance_name_researching(game.player_ptr),
                get_player_research(game.player_ptr)->bulbs_researched,
Index: client/gui-sdl/repodlgs.c
===================================================================
--- client/gui-sdl/repodlgs.c   (revision 14177)
+++ client/gui-sdl/repodlgs.c   (working copy)
@@ -3256,7 +3256,8 @@
   
   pScienceDlg = fc_calloc(1, sizeof(struct SMALL_DLG));
     
-  pStr = create_str16_from_char(_("Science"), adj_font(12));
+  /* TRANS: Research report title */
+  pStr = create_str16_from_char(_("Research"), adj_font(12));
   pStr->style |= TTF_STYLE_BOLD;
   
 #ifdef SMALL_SCREEN
Index: client/gui-sdl/mapctrl.c
===================================================================
--- client/gui-sdl/mapctrl.c    (revision 14177)
+++ client/gui-sdl/mapctrl.c    (working copy)
@@ -1409,6 +1409,7 @@
   /* research button */
   pWidget = create_icon2(adj_surf(GET_SURF(client_research_sprite())), 
pUnits_Info_Window->dst, WF_FREE_GFX
                       | WF_WIDGET_HAS_INFO_LABEL | WF_RESTORE_BACKGROUND | 
WF_FREE_THEME);
+  /* TRANS: Research report action */
   my_snprintf(buf, sizeof(buf), "%s (%s)", _("Research"), "F6");               
        
   pWidget->string16 = create_str16_from_char(buf, adj_font(12));
   pWidget->action = research_callback;
@@ -1575,7 +1576,8 @@
   /* players button */
   pWidget = create_themeicon(pTheme->PLAYERS_Icon, pMiniMap_Window->dst,
                             WF_WIDGET_HAS_INFO_LABEL | WF_RESTORE_BACKGROUND);
-  my_snprintf(buf, sizeof(buf), "%s (%s)", _("Players"), "F3");
+  /* TRANS: Nations report action */
+  my_snprintf(buf, sizeof(buf), "%s (%s)", _("Nations"), "F3");
   pWidget->string16 = create_str16_from_char(buf, adj_font(12));
   pWidget->action = players_action_callback;
   pWidget->key = SDLK_F3;
Index: client/gui-sdl/plrdlg.c
===================================================================
--- client/gui-sdl/plrdlg.c     (revision 14177)
+++ client/gui-sdl/plrdlg.c     (working copy)
@@ -604,6 +604,7 @@
      
   pShort_Players_Dlg = fc_calloc(1, sizeof(struct ADVANCED_DLG));
   
+  /* TRANS: Nations report title */
   pStr = create_str16_from_char(_("Nations") , adj_font(12));
   pStr->style |= TTF_STYLE_BOLD;
   
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to