widelands

Merge lp:~hjd/widelands/capital-Random into lp:widelands

  1. capital-Random
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 6007
Proposed branch: lp:~hjd/widelands/capital-Random
Merge into: lp:widelands
Diff against target: 43 lines (+4/-4)
2 files modified
src/wui/multiplayersetupgroup.cc (+2/-2)
src/wui/playerdescrgroup.cc (+2/-2)
To merge this branch: bzr merge lp:~hjd/widelands/capital-Random
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+77825@code.launchpad.net

Description of the change

Use capital letters in "Random" to make it more consistent with the other tribe names and AI types, since they all start with capital letters.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/wui/multiplayersetupgroup.cc'
2--- src/wui/multiplayersetupgroup.cc 2011-09-19 17:48:27 +0000
3+++ src/wui/multiplayersetupgroup.cc 2011-10-02 14:40:05 +0000
4@@ -294,7 +294,7 @@
5 } else {
6 title = _("AI: ");
7 if (player.random_ai) {
8- title += _("random");
9+ title += _("Random");
10 pic += "ai_Random.png";
11 } else {
12 title += _(player.ai);
13@@ -308,7 +308,7 @@
14 type->set_tooltip(title.c_str());
15 type->set_pic(g_gr->get_picture(PicMod_UI, pic));
16 if (player.random_tribe) {
17- std::string random = _("random");
18+ std::string random = _("Random");
19 if (!m_tribenames["random"].size())
20 m_tribepics[random] = g_gr->get_picture(PicMod_UI, "pics/random.png");
21 tribe->set_tooltip(random.c_str());
22
23=== modified file 'src/wui/playerdescrgroup.cc'
24--- src/wui/playerdescrgroup.cc 2011-09-19 17:48:27 +0000
25+++ src/wui/playerdescrgroup.cc 2011-10-02 14:40:05 +0000
26@@ -171,7 +171,7 @@
27 else {
28 title = _("AI: ");
29 if (player.random_ai) {
30- title += _("random");
31+ title += _("Random");
32 } else {
33 title += _(player.ai);
34 }
35@@ -189,7 +189,7 @@
36 m_tribenames[player.tribe] = global.get_safe_string("name");
37 }
38 if (player.random_tribe) {
39- d->btnPlayerTribe->set_title(_("random"));
40+ d->btnPlayerTribe->set_title(_("Random"));
41 } else {
42 d->btnPlayerTribe->set_title(m_tribenames[player.tribe]);
43 }

Subscribers

People subscribed via source and target branches

to status/vote changes: