Menu
▾
▴
[Performous-commit] Tapio Vierros : Use upper case instrument track names, update FI translation.
|
From: Tapio V. <aa...@us...> - 2010-08-22 00:11:08
|
Module: performous
Branch: master
Commit: 70560ac6669b6f5a6f90977e0f4386ec0cc8362c
Author: Tapio Vierros <tap...@gm...>
Date: Sun Aug 22 02:57:03 2010 +0300
Use upper case instrument track names, update FI translation.
---
game/guitargraph.cc | 5 +--
game/i18n.hh | 1 +
game/song.hh | 14 ++++++---
lang/fi.po | 74 ++++++++++++++++++++++++++++----------------------
4 files changed, 53 insertions(+), 41 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 7bf6429..ece2397 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -11,7 +11,6 @@
namespace {
#if 0 // Here is some dummy gettext calls to populate the dictionary
- _("guitar") _("bass") _("drums")
_("Kids") _("Easy") _("Medium") _("Hard") _("Expert")
#endif
struct Diff { std::string name; int basepitch; } diffv[] = {
@@ -173,8 +172,8 @@ void GuitarGraph::setupJoinMenu() {
}
void GuitarGraph::updateJoinMenu() {
- m_trackOpt = _(getTrack().c_str());
- m_difficultyOpt = _(getDifficultyString().c_str());
+ m_trackOpt = getTrack();
+ m_difficultyOpt = getDifficultyString();
std::string s("\n (");
std::string le = m_leftymode.b() ? _("ON") : _("OFF");
m_leftyOpt = _("Toggle lefty-mode") + s + le + ")";
diff --git a/game/i18n.hh b/game/i18n.hh
index 5f7272c..e164d21 100644
--- a/game/i18n.hh
+++ b/game/i18n.hh
@@ -4,6 +4,7 @@
/* Internationalization Dependances */
#include <libintl.h>
#include <locale.h>
+#include "fs.hh"
#define _(x) gettext(x)
#else
#define _(x) (x)
diff --git a/game/song.hh b/game/song.hh
index 37aed1b..d753084 100644
--- a/game/song.hh
+++ b/game/song.hh
@@ -1,6 +1,7 @@
#pragma once
#include "notes.hh"
+#include "i18n.hh"
#include <boost/noncopyable.hpp>
#include <stdexcept>
@@ -20,11 +21,14 @@ struct SongParserException: public std::runtime_error {
class SongParser;
namespace TrackName {
- const std::string GUITAR = "guitar";
- const std::string GUITAR_COOP = "coop guitar";
- const std::string GUITAR_RHYTHM = "rhythm guitar";
- const std::string BASS = "bass";
- const std::string DRUMS = "drums";
+ const std::string GUITAR = "Guitar";
+ const std::string GUITAR_COOP = "Coop guitar";
+ const std::string GUITAR_RHYTHM = "Rhythm guitar";
+ const std::string BASS = "Bass";
+ const std::string DRUMS = "Drums";
+ #if 0 // Here is some dummy gettext calls to populate the dictionary
+ _("Guitar") _("Coop guitar") _("Rhythm guitar") _("Bass") _("Drums")
+ #endif
}
/// class to load and parse songfiles
diff --git a/lang/fi.po b/lang/fi.po
index 475000f..5a4688e 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-08-22 01:29-0000\n"
+"POT-Creation-Date: 2010-08-22 02:47-0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Tapio Vierros <tap...@gm...>\n"
"Language-Team: \n"
@@ -13,6 +13,26 @@ msgstr ""
"X-Poedit-Basepath: .\n"
"X-Poedit-SearchPath-0: ../game\n"
+#: ../game/song.hh:30
+msgid "Guitar"
+msgstr "Kitara"
+
+#: ../game/song.hh:30
+msgid "Coop guitar"
+msgstr "Soolokitara"
+
+#: ../game/song.hh:30
+msgid "Rhythm guitar"
+msgstr "Rytmikitara"
+
+#: ../game/song.hh:30
+msgid "Bass"
+msgstr "Basso"
+
+#: ../game/song.hh:30
+msgid "Drums"
+msgstr "Rummut"
+
#: ../game/screen_songs.cc:195
msgid "No songs found!"
msgstr "Kappaleita ei löytynyt!"
@@ -61,37 +81,37 @@ msgstr "Vaikea"
msgid "Challenge"
msgstr "Haastavin"
-#: ../game/dancegraph.cc:112
+#: ../game/dancegraph.cc:111
msgid "Ready!"
msgstr "Valmis!"
-#: ../game/dancegraph.cc:112
+#: ../game/dancegraph.cc:111
msgid "Start performing!"
msgstr "Aloita esiintyminen!"
-#: ../game/dancegraph.cc:123
+#: ../game/dancegraph.cc:122
msgid "Select track"
msgstr "Valitse pelimuoto"
-#: ../game/dancegraph.cc:139
+#: ../game/dancegraph.cc:138
msgid "Select difficulty"
msgstr "Valitse vaikeusaste"
-#: ../game/dancegraph.cc:142
+#: ../game/dancegraph.cc:141
#: ../game/screen_sing.cc:116
msgid "Quit"
msgstr "Lopeta"
-#: ../game/dancegraph.cc:142
+#: ../game/dancegraph.cc:141
#: ../game/screen_sing.cc:116
msgid "Exit to song browser"
msgstr "Poistu kappale valintaan"
-#: ../game/dancegraph.cc:261
+#: ../game/dancegraph.cc:260
msgid "STOP!"
msgstr "SEIS!"
-#: ../game/dancegraph.cc:336
+#: ../game/dancegraph.cc:335
msgid "Streak!"
msgstr "Sarja!"
@@ -269,42 +289,30 @@ msgid "Search Text:"
msgstr "Etsi:"
#: ../game/guitargraph.cc:14
-msgid "guitar"
-msgstr "kitara"
-
-#: ../game/guitargraph.cc:14
-msgid "bass"
-msgstr "basso"
-
-#: ../game/guitargraph.cc:14
-msgid "drums"
-msgstr "rummut"
-
-#: ../game/guitargraph.cc:15
msgid "Kids"
msgstr "Lapset"
-#: ../game/guitargraph.cc:15
+#: ../game/guitargraph.cc:14
msgid "Expert"
msgstr "Ekspertti"
-#: ../game/guitargraph.cc:168
+#: ../game/guitargraph.cc:169
msgid "Lefty-mode"
msgstr "Vasuritila"
-#: ../game/guitargraph.cc:177
+#: ../game/guitargraph.cc:178
msgid "ON"
msgstr "Päällä"
-#: ../game/guitargraph.cc:177
+#: ../game/guitargraph.cc:178
msgid "OFF"
msgstr "Pois"
-#: ../game/guitargraph.cc:178
+#: ../game/guitargraph.cc:179
msgid "Toggle lefty-mode"
msgstr "Vasenkätisyystila"
-#: ../game/guitargraph.cc:460
+#: ../game/guitargraph.cc:461
msgid ""
"God Mode\n"
"Activated!"
@@ -312,19 +320,19 @@ msgstr ""
"Jumalmoodi\n"
"Aktivoitu!"
-#: ../game/guitargraph.cc:461
+#: ../game/guitargraph.cc:462
msgid "Mistakes ignored!"
msgstr "Virheitä ei huomioida!"
-#: ../game/guitargraph.cc:1094
+#: ../game/guitargraph.cc:1095
msgid "Drum Fill!"
msgstr "Rumpufilli!"
-#: ../game/guitargraph.cc:1095
+#: ../game/guitargraph.cc:1096
msgid "God Mode Ready!"
msgstr "Jumalmoodi valmis!"
-#: ../game/guitargraph.cc:1100
+#: ../game/guitargraph.cc:1101
msgid "Solo!"
msgstr "Soolo!"
@@ -364,11 +372,11 @@ msgstr ""
"\n"
"Säädä ääniasetuksia ennen pelaamista."
-#: ../game/instrumentgraph.cc:40
+#: ../game/instrumentgraph.cc:41
msgid "Rejoin"
msgstr "Liity uudelleen"
-#: ../game/instrumentgraph.cc:40
+#: ../game/instrumentgraph.cc:41
msgid "Change selections"
msgstr "Vaihda valintoja"
|
