diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-30 01:34:16 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:00:07 +0100 |
commit | 1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch) | |
tree | 68d15ccb015d58aeb5797ffd06efca3e55997c24 /po | |
parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
parent | 955a7613d1fe116fe5e1da07a222b6849b3c885c (diff) | |
download | mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2 mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip |
Merged with Aethyra master as of 2009-01-27
Conflicts:
Almost everywhere.
Diffstat (limited to 'po')
-rw-r--r-- | po/POTFILES.in | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 4207012b..f338e665 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,8 +5,12 @@ src/gui/buysell.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp +src/gui/colour.cpp src/gui/confirm_dialog.cpp src/gui/connection.cpp +src/gui/emotecontainer.cpp +src/gui/emoteshortcutcontainer.cpp +src/gui/emotewindow.cpp src/gui/equipmentwindow.cpp src/gui/help.cpp src/gui/inventorywindow.cpp @@ -14,7 +18,9 @@ src/gui/item_amount.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp +src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp +src/gui/npcstringdialog.cpp src/gui/npc_text.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp @@ -22,13 +28,24 @@ src/gui/register.cpp src/gui/sell.cpp src/gui/setup_audio.cpp src/gui/setup.cpp +src/gui/setup_colours.cpp src/gui/setup_joystick.cpp src/gui/setup_keyboard.cpp src/gui/setup_players.cpp src/gui/setup_video.cpp src/gui/skill.cpp +src/gui/speechbubble.cpp src/gui/status.cpp src/gui/trade.cpp src/gui/updatewindow.cpp +src/net/playerhandler.cpp +src/net/tradehandler.cpp +src/resources/colordb.cpp +src/resources/emotedb.cpp src/resources/itemdb.cpp +src/resources/monsterdb.cpp +src/resources/npcdb.cpp +src/being.cpp +src/game.cpp src/main.cpp +src/party.cpp |