diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 18:29:15 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 18:29:15 +0100 |
| commit | 83bbc5cc3afeea0f0b248cd755e1011f4760a298 (patch) | |
| tree | 1207131c234ad7c5ae6a5849d1d5d53de45b1b0b /src/resources/itemdb.cpp | |
| parent | 7b3b60f86c545e0c5b6b8cb1ab7b1cbbf22d5e02 (diff) | |
| parent | 38708de52f00689088eda29f9b6ee257ce7038ad (diff) | |
| download | mana-83bbc5cc3afeea0f0b248cd755e1011f4760a298.tar.gz mana-83bbc5cc3afeea0f0b248cd755e1011f4760a298.tar.bz2 mana-83bbc5cc3afeea0f0b248cd755e1011f4760a298.tar.xz mana-83bbc5cc3afeea0f0b248cd755e1011f4760a298.zip | |
Merge commit 'aethyra/master'
Conflicts:
CMakeLists.txt
configure.ac
data/help/header.txt
packaging/windows/setup.nsi
po/POTFILES.in
src/being.cpp
src/being.h
src/game.cpp
src/gui/color.cpp
src/gui/color.h
src/gui/equipmentwindow.h
src/gui/popupmenu.cpp
src/gui/recorder.cpp
src/gui/setup_colors.h
src/gui/setup_keyboard.cpp
src/gui/setup_keyboard.h
src/gui/skill.cpp
src/gui/speechbubble.cpp
src/gui/speechbubble.h
src/gui/table.cpp
src/keyboardconfig.cpp
src/keyboardconfig.h
src/localplayer.cpp
src/main.cpp
src/main.h
src/map.cpp
src/resources/colordb.cpp
src/resources/colordb.h
src/resources/emotedb.cpp
src/resources/emotedb.h
src/text.cpp
src/text.h
src/tmw.rc
src/winver.h
Diffstat (limited to 'src/resources/itemdb.cpp')
| -rw-r--r-- | src/resources/itemdb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 6fa010d4..47538b87 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -62,7 +62,7 @@ void ItemDB::load() if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items")) { - logger->error(_("ItemDB: Error while loading items.xml!")); + logger->error("ItemDB: Error while loading items.xml!"); } for_each_xml_child_node(node, rootNode) |