[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE_3_3_BRANCH: kdegames/kpoker
From: Inge Wallin <inge () lysator ! liu ! se>
Date: 2004-09-30 22:02:11
Message-ID: 20040930220211.A3C10126C6 () office ! kde ! org
[Download RAW message or body]
CVS commit by ingwa:
Revert the fix to bug 88584 since it involves string changes, and
there is a global string freeze going on.
I will try to get this fix accepted once KDE 3.3.1 is out.
M +8 -1 ChangeLog 1.2.14.2
M +7 -7 kpoker.cpp 1.70.2.2
--- kdegames/kpoker/ChangeLog #1.2.14.1:1.2.14.2
@@ -1,3 +1,10 @@
-2004-09-30 Inge Wallin <inge@lysator.liu.se>
+2004-10-01 Inge Wallin <inge@lysator.liu.se>
+
+ Revert fix to bug 88584: "Use proper poker terminology
+ everywhere", since there is a global string freeze right now.
+ I will try to negotiate with the translators when 3.3.1 is out and
+ see if we can fix this again.
+
+2004-09-30 Inge Wallin <inge@lysator.liu.se>
Basically, copy everything from HEAD, since the bugs are not
--- kdegames/kpoker/kpoker.cpp #1.70.2.1:1.70.2.2
@@ -185,5 +185,5 @@ void kpok::initWindow()
// The draw button
drawButton = new QPushButton(this);
- drawButton->setText(i18n("&Deal"));
+ drawButton->setText(i18n("&Draw"));
connect(drawButton, SIGNAL(clicked()), this, SLOT(drawClick()));
inputLayout->addWidget(drawButton);
@@ -239,5 +239,5 @@ void kpok::initWindow()
// some tips
- QToolTip::add(drawButton, i18n("Continue the round"));
+ QToolTip::add(drawButton, i18n("Draw new cards"));
QToolTip::add(potLabel, i18n("The current pot"));
@@ -309,5 +309,5 @@ void kpok::newGame()
// Activate the Draw button.
- drawButton->setText(i18n("&Deal"));
+ drawButton->setText(i18n("&Draw"));
drawButton->setEnabled(true);
}
@@ -517,5 +517,5 @@ void kpok::out()
- findHumanPlayer()->getCurrentBet());
paintCash();
- drawButton->setText(i18n("&End round"));
+ drawButton->setText(i18n("&Draw"));
}
@@ -792,5 +792,5 @@ void kpok::displayWinner_Computer(PokerP
startBlinking();
- drawButton->setText(i18n("&Deal new round"));
+ drawButton->setText(i18n("&Draw"));
}
@@ -852,5 +852,5 @@ void kpok::drawCardsEvent()
//TODO:
m_game.setState(StateBet);
- drawButton->setText(i18n("&Draw new cards"));
+ //drawButton->setText(i18n("&Draw new cards"));
}
@@ -1039,5 +1039,5 @@ void kpok::displayWin(const QString& han
}
- drawButton->setText(i18n("&Deal new round"));
+ //drawButton->setText(i18n("&Deal new round"));
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic