Author: cazfi
Date: Thu Feb  4 19:55:57 2016
New Revision: 31752

URL: http://svn.gna.org/viewcvs/freeciv?rev=31752&view=rev
Log:
Give string "Players" qualification that depends on situation.

See patch #6893

Modified:
    branches/S2_5/client/gui-gtk-2.0/pages.c
    branches/S2_5/client/gui-gtk-3.0/pages.c
    branches/S2_5/client/gui-qt/menu.cpp
    branches/S2_5/client/gui-qt/pages.cpp
    branches/S2_5/client/gui-qt/plrdlg.cpp
    branches/S2_5/client/gui-sdl/connectdlg.c
    branches/S2_5/client/gui-sdl/plrdlg.c

Modified: branches/S2_5/client/gui-gtk-2.0/pages.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/pages.c?rev=31752&r1=31751&r2=31752&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-2.0/pages.c    (original)
+++ branches/S2_5/client/gui-gtk-2.0/pages.c    Thu Feb  4 19:55:57 2016
@@ -1150,7 +1150,7 @@
   add_treeview_column(view, _("Port"), G_TYPE_INT, 1);
   add_treeview_column(view, _("Version"), G_TYPE_STRING, 2);
   add_treeview_column(view, _("Status"), G_TYPE_STRING, 3);
-  add_treeview_column(view, _("Players"), G_TYPE_INT, 4);
+  add_treeview_column(view, Q_("?count:Players"), G_TYPE_INT, 4);
   add_treeview_column(view, _("Humans"), G_TYPE_STRING, 5);
   add_treeview_column(view, _("Comment"), G_TYPE_STRING, 6);
 
@@ -1193,7 +1193,7 @@
   add_treeview_column(view, _("Port"), G_TYPE_INT, 1);
   add_treeview_column(view, _("Version"), G_TYPE_STRING, 2);
   add_treeview_column(view, _("Status"), G_TYPE_STRING, 3);
-  add_treeview_column(view, _("Players"), G_TYPE_INT, 4);
+  add_treeview_column(view, Q_("?count:Players"), G_TYPE_INT, 4);
   add_treeview_column(view, _("Humans"), G_TYPE_STRING, 5);
   add_treeview_column(view, _("Comment"), G_TYPE_STRING, 6);
 

Modified: branches/S2_5/client/gui-gtk-3.0/pages.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/pages.c?rev=31752&r1=31751&r2=31752&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-3.0/pages.c    (original)
+++ branches/S2_5/client/gui-gtk-3.0/pages.c    Thu Feb  4 19:55:57 2016
@@ -1222,7 +1222,7 @@
   add_treeview_column(view, _("Port"), G_TYPE_INT, 1);
   add_treeview_column(view, _("Version"), G_TYPE_STRING, 2);
   add_treeview_column(view, _("Status"), G_TYPE_STRING, 3);
-  add_treeview_column(view, _("Players"), G_TYPE_INT, 4);
+  add_treeview_column(view, Q_("?count:Players"), G_TYPE_INT, 4);
   add_treeview_column(view, _("Humans"), G_TYPE_STRING, 5);
   add_treeview_column(view, _("Comment"), G_TYPE_STRING, 6);
 
@@ -1267,7 +1267,7 @@
   add_treeview_column(view, _("Port"), G_TYPE_INT, 1);
   add_treeview_column(view, _("Version"), G_TYPE_STRING, 2);
   add_treeview_column(view, _("Status"), G_TYPE_STRING, 3);
-  add_treeview_column(view, _("Players"), G_TYPE_INT, 4);
+  add_treeview_column(view, Q_("?count:Players"), G_TYPE_INT, 4);
   add_treeview_column(view, _("Humans"), G_TYPE_STRING, 5);
   add_treeview_column(view, _("Comment"), G_TYPE_STRING, 6);
 

Modified: branches/S2_5/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/menu.cpp?rev=31752&r1=31751&r2=31752&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/menu.cpp        (original)
+++ branches/S2_5/client/gui-qt/menu.cpp        Thu Feb  4 19:55:57 2016
@@ -787,7 +787,8 @@
   act->setShortcut(QKeySequence(tr("F2")));
   connect(act, SIGNAL(triggered()), this, SLOT(slot_show_units_report()));
 
-  act = menu->addAction(_("Players"));
+  /* TRANS: Also menu item, but 'headers' should be good enough. */
+  act = menu->addAction(Q_("?header:Players"));
   act->setShortcut(QKeySequence(tr("F3")));
   connect(act, SIGNAL(triggered()), this, SLOT(slot_show_nations()));
 

Modified: branches/S2_5/client/gui-qt/pages.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/pages.cpp?rev=31752&r1=31751&r2=31752&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/pages.cpp       (original)
+++ branches/S2_5/client/gui-qt/pages.cpp       Thu Feb  4 19:55:57 2016
@@ -278,7 +278,7 @@
 
   QStringList servers_list;
   servers_list << _("Server Name") << _("Port") << _("Version")
-               << _("Status") << _("Players") << _("Comment");
+               << _("Status") << Q_("?count:Players") << _("Comment");
   QStringList server_info;
   server_info << _("Name") << _("Type") << _("Host") << _("Nation");
 
@@ -1275,7 +1275,7 @@
   qvar2 = 0;
 
   player_item = new QTreeWidgetItem();
-  player_item->setText(0, _("Players"));
+  player_item->setText(0, Q_("?header:Players"));
   player_item->setData(0, Qt::UserRole, qvar2);
 
   i = 0;

Modified: branches/S2_5/client/gui-qt/plrdlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/plrdlg.cpp?rev=31752&r1=31751&r2=31752&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/plrdlg.cpp      (original)
+++ branches/S2_5/client/gui-qt/plrdlg.cpp      Thu Feb  4 19:55:57 2016
@@ -607,7 +607,7 @@
 void plr_report::init()
 {
   gui()->gimme_place(this, "PLR");
-  index = gui()->add_game_tab(this, _("Players"));
+  index = gui()->add_game_tab(this, Q_("?header:Players"));
   gui()->game_tab_widget->setCurrentIndex(index);
 }
 

Modified: branches/S2_5/client/gui-sdl/connectdlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/connectdlg.c?rev=31752&r1=31751&r2=31752&view=diff
==============================================================================
--- branches/S2_5/client/gui-sdl/connectdlg.c   (original)
+++ branches/S2_5/client/gui-sdl/connectdlg.c   Thu Feb  4 19:55:57 2016
@@ -327,7 +327,7 @@
      * [server message]" */
     fc_snprintf(cBuf, sizeof(cBuf), _("%s Port %d Ver: %s %s %s %d\n%s"),
        pServer->host, pServer->port, pServer->version, _(pServer->state),
-               _("Players"), pServer->nplayers, pServer->message);
+               Q_("?count:Players"), pServer->nplayers, pServer->message);
 
     pNewWidget = create_iconlabel_from_chars(NULL, pWindow->dst, cBuf, 
adj_font(10),
        WF_FREE_STRING|WF_DRAW_TEXT_LABEL_WITH_SPACE|WF_RESTORE_BACKGROUND);

Modified: branches/S2_5/client/gui-sdl/plrdlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/plrdlg.c?rev=31752&r1=31751&r2=31752&view=diff
==============================================================================
--- branches/S2_5/client/gui-sdl/plrdlg.c       (original)
+++ branches/S2_5/client/gui-sdl/plrdlg.c       Thu Feb  4 19:55:57 2016
@@ -328,15 +328,15 @@
     n++;
   } players_iterate_end;
 
-  if(n < 2) {
+  if (n < 2) {
     return;
   }
-    
+
   pPlayers_Dlg = fc_calloc(1, sizeof(struct SMALL_DLG));
-  
-  pStr = create_str16_from_char(_("Players"), adj_font(12));
+
+  pStr = create_str16_from_char(Q_("?header:Players"), adj_font(12));
   pStr->style |= TTF_STYLE_BOLD;
-  
+
   pWindow = create_window_skeleton(NULL, pStr, 0);
     
   pWindow->action = players_window_dlg_callback;


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to