0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disabled the translation of all strings. Corrected the copyright header.

Browse source
This commit is contained in:
Fabian Müller 2010-02-01 10:36:53 +00:00
parent 0ae86b9018
commit 1d63f1b977
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gui/dialogs/icon_message.cpp
View file

@ -1,6 +1,6 @@
/* $Id: wml_message.cpp 39955 2009-11-26 05:32:48Z fendrin $ */
/* $Id: icon_message.cpp 39955 2009-11-26 05:32:48Z fendrin $ */
/*
Copyright (C) 2008 - 2009 by Mark de Wever <koraq@xs4all.nl>
Copyright (C) 2009 - 2010 by Fabian Mueller <fabianmueller5@gmx.de>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@ -25,7 +25,7 @@
#include "gui/dialogs/icon_message.hpp"
#include "gettext.hpp"
//#include "gettext.hpp"
#include "font.hpp"
#include "unit.hpp"
#include "foreach.hpp"
@ -82,19 +82,19 @@ void trecall_message_::remove_pressed(CVideo& video, twindow& window) {
//we warn the player about it
std::stringstream message;
if (chosen_unit_->loyal()) {
message << _("My lord, this unit is loyal and requires no upkeep! ")
<< (chosen_unit_->gender() == unit_race::MALE ? _("Do you really want to dismiss him?")
: _("Do you really want to dismiss her?"));
message << /*_*/("My lord, this unit is loyal and requires no upkeep! ")
<< (chosen_unit_->gender() == unit_race::MALE ? /*_*/("Do you really want to dismiss him?")
: /*_*/("Do you really want to dismiss her?"));
} else if (chosen_unit_->level() > 1) {
message
<< _("My lord, this unit is an experienced one, having advanced levels! ")
<< (chosen_unit_->gender() == unit_race::MALE ? _("Do you really want to dismiss him?")
: _("Do you really want to dismiss her?"));
<< /*_*/("My lord, this unit is an experienced one, having advanced levels! ")
<< (chosen_unit_->gender() == unit_race::MALE ? /*_*/("Do you really want to dismiss him?")
: /*_*/("Do you really want to dismiss her?"));
} else if (chosen_unit_->experience() > chosen_unit_->max_experience() / 2) {
message << _("My lord, this unit is close to advancing a level! ")
<< (chosen_unit_->gender() == unit_race::MALE ? _("Do you really want to dismiss him?")
: _("Do you really want to dismiss her?"));
message << /*_*/("My lord, this unit is close to advancing a level! ")
<< (chosen_unit_->gender() == unit_race::MALE ? /*_*/("Do you really want to dismiss him?")
: /*_*/("Do you really want to dismiss her?"));
}
if (!message.str().empty()) {
@ -297,7 +297,7 @@ void tunit_message_::pre_show(CVideo& video, twindow& window) {
gold_color = affordable ? "green" : "red" ;
std::ostringstream cost;
cost << "<span color=\"" << gold_color << "\">" << unit.cost() << " " << _("Gold") << "</span>" ;
cost << "<span color=\"" << gold_color << "\">" << unit.cost() << " " << /*_*/("Gold") << "</span>" ;
// Add the data.
data["cost"]["label"] = cost.str();

12
src/gui/dialogs/icon_message.hpp
View file

@ -1,6 +1,6 @@
/* $Id: wml_message.hpp 39955 2009-11-26 05:32:48Z fendrin $ */
/* $Id: icon_message.hpp 39955 2009-11-26 05:32:48Z fendrin $ */
/*
Copyright (C) 2008 - 2009 by Mark de Wever <koraq@xs4all.nl>
Copyright (C) 2009 - 2010 by Fabian Mueller <fabianmueller5@gmx.de>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@ -15,7 +15,7 @@
#ifndef GUI_DIALOGS_ICON_MESSAGE_HPP_INCLUDED
#define GUI_DIALOGS_ICON_MESSAGE_HPP_INCLUDED
#include "gettext.hpp"
//#include "gettext.hpp"
#include "gui/dialogs/dialog.hpp"
#include "unit.hpp"
#include "menu_events.hpp"
@ -296,8 +296,8 @@ public:
const std::vector<const unit_type*> type_list,
std::string& chosen_type,
int side_num, int gold)
: tunit_message_(_("Recruit")
, _("Select unit:")
: tunit_message_(/*_*/("Recruit")
, /*_*/("Select unit:")
, mirror
, type_list, &unit_, side_num, gold )
, chosen_type_(chosen_type)
@ -383,7 +383,7 @@ public:
const std::vector<unit>& unit_list,
unit* chosen_unit,
events::menu_handler* game_menu_handler)
: tunit_message_(_("Recall"),_("Select Unit:"), mirror, unit_list, chosen_unit)
: tunit_message_(/*_*/("Recall"),/*_*/("Select Unit:"), mirror, unit_list, chosen_unit)
, game_menu_handler_(game_menu_handler)
{
}