Author: cazfi Date: Thu Feb 4 19:55:44 2016 New Revision: 31750 URL: http://svn.gna.org/viewcvs/freeciv?rev=31750&view=rev Log: Give string "Players" qualification that depends on situation.
See patch #6893 Modified: trunk/client/gui-gtk-2.0/pages.c trunk/client/gui-gtk-3.0/pages.c trunk/client/gui-qt/menu.cpp trunk/client/gui-qt/pages.cpp trunk/client/gui-qt/plrdlg.cpp trunk/client/gui-sdl2/connectdlg.c trunk/client/gui-sdl2/plrdlg.c Modified: trunk/client/gui-gtk-2.0/pages.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/pages.c?rev=31750&r1=31749&r2=31750&view=diff ============================================================================== --- trunk/client/gui-gtk-2.0/pages.c (original) +++ trunk/client/gui-gtk-2.0/pages.c Thu Feb 4 19:55:44 2016 @@ -1140,7 +1140,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); @@ -1183,7 +1183,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: trunk/client/gui-gtk-3.0/pages.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/pages.c?rev=31750&r1=31749&r2=31750&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/pages.c (original) +++ trunk/client/gui-gtk-3.0/pages.c Thu Feb 4 19:55:44 2016 @@ -1212,7 +1212,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); @@ -1257,7 +1257,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: trunk/client/gui-qt/menu.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=31750&r1=31749&r2=31750&view=diff ============================================================================== --- trunk/client/gui-qt/menu.cpp (original) +++ trunk/client/gui-qt/menu.cpp Thu Feb 4 19:55:44 2016 @@ -1047,7 +1047,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: trunk/client/gui-qt/pages.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/pages.cpp?rev=31750&r1=31749&r2=31750&view=diff ============================================================================== --- trunk/client/gui-qt/pages.cpp (original) +++ trunk/client/gui-qt/pages.cpp Thu Feb 4 19:55:44 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"); @@ -1276,7 +1276,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: trunk/client/gui-qt/plrdlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/plrdlg.cpp?rev=31750&r1=31749&r2=31750&view=diff ============================================================================== --- trunk/client/gui-qt/plrdlg.cpp (original) +++ trunk/client/gui-qt/plrdlg.cpp Thu Feb 4 19:55:44 2016 @@ -613,7 +613,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: trunk/client/gui-sdl2/connectdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/connectdlg.c?rev=31750&r1=31749&r2=31750&view=diff ============================================================================== --- trunk/client/gui-sdl2/connectdlg.c (original) +++ trunk/client/gui-sdl2/connectdlg.c Thu Feb 4 19:55:44 2016 @@ -325,11 +325,11 @@ /* servers */ server_list_iterate(pServer_list, pServer) { - /* TRANS: "host.example.com Port 5556 Ver: 2.2.0 Running Players 3\n + /* TRANS: "host.example.com Port 5556 Ver: 2.6.0 Running Players 3\n * [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_("?header: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: trunk/client/gui-sdl2/plrdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/plrdlg.c?rev=31750&r1=31749&r2=31750&view=diff ============================================================================== --- trunk/client/gui-sdl2/plrdlg.c (original) +++ trunk/client/gui-sdl2/plrdlg.c Thu Feb 4 19:55:44 2016 @@ -376,7 +376,7 @@ pPlayers_Dlg = fc_calloc(1, sizeof(struct SMALL_DLG)); - pstr = create_utf8_from_char(_("Players"), adj_font(12)); + pstr = create_utf8_from_char(Q_("?header:Players"), adj_font(12)); pstr->style |= TTF_STYLE_BOLD; pWindow = create_window_skeleton(NULL, pstr, 0); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits