|
From: Tapio V. <aa...@us...> - 2010-05-20 13:27:51
|
Module: performous
Branch: master
Commit: 1e38a29a1cbe2f2b03b1da70c5ffe17a3ca948c9
Author: Tapio Vierros <tap...@gm...>
Date: Thu May 20 16:27:06 2010 +0300
Localize popup texts (and some others) + update FI translation.
---
game/dancegraph.cc | 2 +-
game/guitargraph.cc | 12 +++---
game/instrumentgraph.hh | 1 +
lang/fi.po | 95 ++++++++++++++++++++++++++++++----------------
4 files changed, 70 insertions(+), 40 deletions(-)
diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 94c5efb..10b76bf 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -237,7 +237,7 @@ void DanceGraph::engine() {
// Check if a long streak goal has been reached
if (m_streak >= getNextBigStreak(m_bigStreak)) {
m_bigStreak = getNextBigStreak(m_bigStreak);
- m_popups.push_back(Popup(boost::lexical_cast<std::string>(unsigned(m_bigStreak)) + "\nStreak!",
+ m_popups.push_back(Popup(boost::lexical_cast<std::string>(unsigned(m_bigStreak)) + "\n" + _("Streak!"),
glutil::Color(1.0f, 0.0, 0.0), 1.0, m_popupText.get()));
}
}
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 8653379..059ac59 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -302,7 +302,7 @@ void GuitarGraph::engine() {
if (m_streak >= getNextBigStreak(m_bigStreak)) {
m_bigStreak = getNextBigStreak(m_bigStreak);
m_starmeter += streakStarBonus;
- m_popups.push_back(Popup(boost::lexical_cast<std::string>(unsigned(m_bigStreak)) + "\nStreak!",
+ m_popups.push_back(Popup(boost::lexical_cast<std::string>(unsigned(m_bigStreak)) + "\n" + _("Streak!"),
glutil::Color(1.0f, 0.0f, 0.0f), 1.0, m_popupText.get()));
}
// During GodMode, correctness is full, no matter what
@@ -319,8 +319,8 @@ void GuitarGraph::activateStarpower() {
if (canActivateStarpower()) {
m_starmeter = 0;
m_starpower.setValue(1.0);
- m_popups.push_back(Popup("God Mode\nActivated!",
- glutil::Color(0.3f, 0.0f, 1.0f), 0.666, m_popupText.get(), "Mistakes ignored!", &m_text));
+ m_popups.push_back(Popup(_("God Mode\nActivated!"),
+ glutil::Color(0.3f, 0.0f, 1.0f), 0.666, m_popupText.get(), _("Mistakes ignored!"), &m_text));
}
}
@@ -950,13 +950,13 @@ void GuitarGraph::drawInfo(double time, double offsetX, Dimensions dimensions) {
float a = std::abs(std::fmod(time, 1.0) - 0.5f) * 2.0f;
m_text.dimensions.screenBottom(-0.02).middle(-0.12 + offsetX);
if (m_drums && m_dfIt != m_drumfills.end() && time >= m_dfIt->begin && time <= m_dfIt->end)
- m_text.draw(" Drum Fill! ", a);
- else m_text.draw("God Mode Ready!", a);
+ m_text.draw(_("Drum Fill!"), a);
+ else m_text.draw(_("God Mode Ready!"), a);
} else if (m_solo) {
// Solo
float a = std::abs(std::fmod(time, 1.0) - 0.5f) * 2.0f;
m_text.dimensions.screenBottom(-0.02).middle(-0.03 + offsetX);
- m_text.draw("Solo!", a);
+ m_text.draw(_("Solo!"), a);
}
drawPopups(offsetX);
}
diff --git a/game/instrumentgraph.hh b/game/instrumentgraph.hh
index 87064c6..f1cbf86 100644
--- a/game/instrumentgraph.hh
+++ b/game/instrumentgraph.hh
@@ -11,6 +11,7 @@
#include "3dobject.hh"
#include "glutil.hh"
#include "fs.hh"
+#include "i18n.hh"
/// Represents popup messages
diff --git a/lang/fi.po b/lang/fi.po
index 0ca815c..2fd9807 100644
--- a/lang/fi.po
+++ b/lang/fi.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Performous\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-15 12:07+0200\n"
+"POT-Creation-Date: 2010-05-20 16:24+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Tapio Vierros <tap...@gm...>\n"
"Language-Team: \n"
@@ -73,60 +73,60 @@ msgstr "Kappale on rikki!"
msgid "Song contains broken tracks!"
msgstr "Kappaleessa on rikkinäisiä osia!"
-#: ../game/screen_sing.cc:330
+#: ../game/screen_sing.cc:386
msgid " ENTER to skip instrumental break"
msgstr " ENTER hypätäksesi lauluosaan"
-#: ../game/screen_sing.cc:331
+#: ../game/screen_sing.cc:387
msgid " Remember to wait for grading!"
msgstr " Muista odottaa arvostelua!"
-#: ../game/screen_sing.cc:419
+#: ../game/screen_sing.cc:475
msgid "No player!"
msgstr "Pelaajia ei löytynyt!"
-#: ../game/screen_sing.cc:428
+#: ../game/screen_sing.cc:484
msgid "Hit singer"
msgstr "Tähti"
-#: ../game/screen_sing.cc:429
+#: ../game/screen_sing.cc:485
msgid "Lead singer"
msgstr "Solisti"
-#: ../game/screen_sing.cc:430
-#: ../game/screen_sing.cc:436
-#: ../game/screen_sing.cc:442
+#: ../game/screen_sing.cc:486
+#: ../game/screen_sing.cc:492
+#: ../game/screen_sing.cc:498
msgid "Rising star"
msgstr "Harrastaja"
-#: ../game/screen_sing.cc:431
-#: ../game/screen_sing.cc:437
-#: ../game/screen_sing.cc:443
+#: ../game/screen_sing.cc:487
+#: ../game/screen_sing.cc:493
+#: ../game/screen_sing.cc:499
msgid "Amateur"
msgstr "Amatööri"
-#: ../game/screen_sing.cc:432
-#: ../game/screen_sing.cc:444
+#: ../game/screen_sing.cc:488
+#: ../game/screen_sing.cc:500
msgid "Tone deaf"
msgstr "Lahjaton"
-#: ../game/screen_sing.cc:434
+#: ../game/screen_sing.cc:490
msgid "Maniac"
msgstr "Maanikko"
-#: ../game/screen_sing.cc:435
+#: ../game/screen_sing.cc:491
msgid "Hoofer"
msgstr "Ekspertti"
-#: ../game/screen_sing.cc:438
+#: ../game/screen_sing.cc:494
msgid "Loser"
msgstr "Luuseri"
-#: ../game/screen_sing.cc:440
+#: ../game/screen_sing.cc:496
msgid "Virtuoso"
msgstr "Virtuoosi"
-#: ../game/screen_sing.cc:441
+#: ../game/screen_sing.cc:497
msgid "Rocker"
msgstr "Rokkari"
@@ -158,11 +158,11 @@ msgstr "järjestetty polun mukaan"
msgid "sorted by language"
msgstr "järjestetty kielen mukaan"
-#: ../game/screen_songs.cc:187
+#: ../game/screen_songs.cc:195
msgid "No songs found!"
msgstr "Kappaleita ei löytynyt!"
-#: ../game/screen_songs.cc:188
+#: ../game/screen_songs.cc:196
msgid ""
"Visit performous.org\n"
"for free songs"
@@ -170,18 +170,22 @@ msgstr ""
"Hae ilmaista musiikkia\n"
"osoitteesta performous.org"
-#: ../game/screen_songs.cc:190
+#: ../game/screen_songs.cc:198
msgid "no songs match search"
msgstr "yksikään kappale ei vastannut hakuasi"
-#: ../game/screen_songs.cc:198
+#: ../game/screen_songs.cc:206
msgid "(press END to view hiscores)"
msgstr "(paina END nähdäksesi ennätykset)"
-#: ../game/screen_songs.cc:199
+#: ../game/screen_songs.cc:207
msgid "<type in to search>"
msgstr "<kirjoita etsiäksesi>"
+#: ../game/screen_songs.cc:212
+msgid "Hiscore for "
+msgstr "Ennätykset kappaleelle "
+
#: ../game/screen_players.cc:110
msgid "No players found!"
msgstr "Pelaajia ei löytynyt!"
@@ -214,33 +218,58 @@ msgstr "Kirjoita etsiäksesi tai luodaksesi uuden pelaajan."
msgid "Search Text:"
msgstr "Etsi:"
-#: ../game/main.cc:154
+#: ../game/main.cc:159
msgid "Audio capture..."
msgstr "Ãänen kaappaus..."
-#: ../game/main.cc:156
+#: ../game/main.cc:161
msgid "Audio playback..."
msgstr "Ãänentoisto..."
-#: ../game/main.cc:159
+#: ../game/main.cc:164
msgid "Miscellaneous..."
msgstr "Sekalaista..."
-#: ../game/main.cc:174
+#: ../game/main.cc:178
msgid "Main menu..."
msgstr "Päävalikko..."
-#: ../game/main.cc:185
+#: ../game/main.cc:189
msgid "Screenshot taken!"
msgstr "Kuvakaappaus tallennettu!"
-#: ../game/main.cc:188
+#: ../game/main.cc:192
msgid "Screenshot failed!"
msgstr "Kuvakaappaus epäonnistui!"
-#: ../game/screen_hiscore.cc:88
-msgid "Hiscore for "
-msgstr "Ennätykset kappaleelle "
+#: ../game/guitargraph.cc:305
+#: ../game/dancegraph.cc:240
+msgid "Streak!"
+msgstr "Sarja!"
+
+#: ../game/guitargraph.cc:322
+msgid ""
+"God Mode\n"
+"Activated!"
+msgstr ""
+"Jumalmoodi\n"
+"Aktivoitu!"
+
+#: ../game/guitargraph.cc:323
+msgid "Mistakes ignored!"
+msgstr "Virheitä ei huomioida!"
+
+#: ../game/guitargraph.cc:953
+msgid "Drum Fill!"
+msgstr "Rumpufilli!"
+
+#: ../game/guitargraph.cc:954
+msgid "God Mode Ready!"
+msgstr "Jumalmoodi valmis!"
+
+#: ../game/guitargraph.cc:959
+msgid "Solo!"
+msgstr "Soolo!"
#: ../game/database.cc:107
msgid "No Items up to now."
|