1 files changed, 164 insertions, 116 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 71e4b946..035a2654 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Price: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Confirm"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Create Character"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Select Character"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "New"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Previous"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Next"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Unregister"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Password:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Money: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Create Character"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Name:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Hair Colour:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Hair Style:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Create"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Strength:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Agility:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Vitality:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Willpower:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Charisma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
@@ -192,11 +208,11 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -204,28 +220,23 @@ msgstr "Equipment"
 msgid "Unequip"
 msgstr "Unequip"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventory"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Use"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Total Weight: %d - Maximum Weight: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Equip"
 
@@ -241,35 +252,39 @@ msgstr "Select amount of items to drop."
 msgid "Select amount of items to split."
 msgstr "Select amount of items to split."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Keep"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Skills"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Setup"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Trade With %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Attack %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Talk To NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancel@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Pick Up %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Equip@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Drop@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Split@@"
 
@@ -365,7 +390,7 @@ msgstr "The password needs to be less than %d characters long."
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Sell"
 
@@ -389,39 +414,43 @@ msgstr "Please type both the address and the port of a server."
 msgid "Sound"
 msgstr "Sound"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Sfx volume"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Music volume"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Calibrate"
 
@@ -429,71 +458,75 @@ msgstr "Calibrate"
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Rotate the stick"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Full screen"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Scroll laziness"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "off"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "low"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "high"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Switching to full screen"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Changing OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
@@ -522,22 +555,37 @@ msgstr "You give:"
 msgid "Change"
 msgstr "Change"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Attack %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Defense %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirm"
+
+#~ msgid "Select Character"
+#~ msgstr "Select Character"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Total Weight: %d - Maximum Weight: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Keep"